/*
 * Event char devices, giving access to raw input device events.
 *
 * Copyright (c) 1999-2002 Vojtech Pavlik
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 as published by
 * the Free Software Foundation.
 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define EVDEV_MINOR_BASE	64
#define EVDEV_MINORS		32
#define EVDEV_MIN_BUFFER_SIZE	64U
#define EVDEV_BUF_PACKETS	8

#include <linux/poll.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/input/mt.h>
#include <linux/major.h>
#include <linux/device.h>
#include <linux/cdev.h>
#include "input-compat.h"

struct evdev {
	int open;
	struct input_handle handle;
	wait_queue_head_t wait;
	struct evdev_client __rcu *grab;
	struct list_head client_list;
	spinlock_t client_lock; /* protects client_list */
	struct mutex mutex;
	struct device dev;
	struct cdev cdev;
	bool exist;
};

struct evdev_client {
	unsigned int head;
	unsigned int tail;
	unsigned int packet_head; /* [future] position of the first element of next packet */
	spinlock_t buffer_lock; /* protects access to buffer, head and tail */
	struct fasync_struct *fasync;
	struct evdev *evdev;
	struct list_head node;
	int clkid;
	unsigned int bufsize;
	struct input_event buffer[];
};

static void __pass_event(struct evdev_client *client,
			 const struct input_event *event)
{
	client->buffer[client->head++] = *event;
	client->head &= client->bufsize - 1;

	if (unlikely(client->head == client->tail)) {
		/*
		 * This effectively "drops" all unconsumed events, leaving
		 * EV_SYN/SYN_DROPPED plus the newest event in the queue.
		 */
		client->tail = (client->head - 2) & (client->bufsize - 1);

		client->buffer[client->tail].time = event->time;
		client->buffer[client->tail].type = EV_SYN;
		client->buffer[client->tail].code = SYN_DROPPED;
		client->buffer[client->tail].value = 0;

		client->packet_head = client->tail;
	}

	if (event->type == EV_SYN && event->code == SYN_REPORT) {
		client->packet_head = client->head;
		kill_fasync(&client->fasync, SIGIO, POLL_IN);
	}
}

static void evdev_pass_values(struct evdev_client *client,
			const struct input_value *vals, unsigned int count,
			ktime_t mono, ktime_t real)
{
	struct evdev *evdev = client->evdev;
	const struct input_value *v;
	struct input_event event;
	bool wakeup = false;

	event.time = ktime_to_timeval(client->clkid == CLOCK_MONOTONIC ?
				      mono : real);

	/* Interrupts are disabled, just acquire the lock. */
	spin_lock(&client->buffer_lock);

	for (v = vals; v != vals + count; v++) {
		event.type = v->type;
		event.code = v->code;
		event.value = v->value;
		__pass_event(client, &event);
		if (v->type == EV_SYN && v->code == SYN_REPORT)
			wakeup = true;
	}

	spin_unlock(&client->buffer_lock);

	if (wakeup)
		wake_up_interruptible(&evdev->wait);
}

/*
 * Pass incoming events to all connected clients.
 */
static void evdev_events(struct input_handle *handle,
			 const struct input_value *vals, unsigned int count)
{
	struct evdev *evdev = handle->private;
	struct evdev_client *client;
	ktime_t time_mono, time_real;

	time_mono = ktime_get();
	time_real = ktime_sub(time_mono, ktime_get_monotonic_offset());

	rcu_read_lock();

	client = rcu_dereference(evdev->grab);

	if (client)
		evdev_pass_values(client, vals, count, time_mono, time_real);
	else
		list_for_each_entry_rcu(client, &evdev->client_list, node)
			evdev_pass_values(client, vals, count,
					  time_mono, time_real);

	rcu_read_unlock();
}

/*
 * Pass incoming event to all connected clients.
 */
static void evdev_event(struct input_handle *handle,
			unsigned int type, unsigned int code, int value)
{
	struct input_value vals[] = { { type, code, value } };

	evdev_events(handle, vals, 1);
}

static int evdev_fasync(int fd, struct file *file, int on)
{
	struct evdev_client *client = file->private_data;

	return fasync_helper(fd, file, on, &client->fasync);
}

static int evdev_flush(struct file *file, fl_owner_t id)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	int retval;

	retval = mutex_lock_interruptible(&evdev->mutex);
	if (retval)
		return retval;

	if (!evdev->exist)
		retval = -ENODEV;
	else
		retval = input_flush_device(&evdev->handle, file);

	mutex_unlock(&evdev->mutex);
	return retval;
}

static void evdev_free(struct device *dev)
{
	struct evdev *evdev = container_of(dev, struct evdev, dev);

	input_put_device(evdev->handle.dev);
	kfree(evdev);
}

/*
 * Grabs an event device (along with underlying input device).
 * This function is called with evdev->mutex taken.
 */
static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
{
	int error;

	if (evdev->grab)
		return -EBUSY;

	error = input_grab_device(&evdev->handle);
	if (error)
		return error;

	rcu_assign_pointer(evdev->grab, client);

	return 0;
}

static int evdev_ungrab(struct evdev *evdev, struct evdev_client *client)
{
	struct evdev_client *grab = rcu_dereference_protected(evdev->grab,
					lockdep_is_held(&evdev->mutex));

	if (grab != client)
		return  -EINVAL;

	rcu_assign_pointer(evdev->grab, NULL);
	synchronize_rcu();
	input_release_device(&evdev->handle);

	return 0;
}

static void evdev_attach_client(struct evdev *evdev,
				struct evdev_client *client)
{
	spin_lock(&evdev->client_lock);
	list_add_tail_rcu(&client->node, &evdev->client_list);
	spin_unlock(&evdev->client_lock);
}

static void evdev_detach_client(struct evdev *evdev,
				struct evdev_client *client)
{
	spin_lock(&evdev->client_lock);
	list_del_rcu(&client->node);
	spin_unlock(&evdev->client_lock);
	synchronize_rcu();
}

static int evdev_open_device(struct evdev *evdev)
{
	int retval;

	retval = mutex_lock_interruptible(&evdev->mutex);
	if (retval)
		return retval;

	if (!evdev->exist)
		retval = -ENODEV;
	else if (!evdev->open++) {
		retval = input_open_device(&evdev->handle);
		if (retval)
			evdev->open--;
	}

	mutex_unlock(&evdev->mutex);
	return retval;
}

static void evdev_close_device(struct evdev *evdev)
{
	mutex_lock(&evdev->mutex);

	if (evdev->exist && !--evdev->open)
		input_close_device(&evdev->handle);

	mutex_unlock(&evdev->mutex);
}

/*
 * Wake up users waiting for IO so they can disconnect from
 * dead device.
 */
static void evdev_hangup(struct evdev *evdev)
{
	struct evdev_client *client;

	spin_lock(&evdev->client_lock);
	list_for_each_entry(client, &evdev->client_list, node)
		kill_fasync(&client->fasync, SIGIO, POLL_HUP);
	spin_unlock(&evdev->client_lock);

	wake_up_interruptible(&evdev->wait);
}

static int evdev_release(struct inode *inode, struct file *file)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;

	mutex_lock(&evdev->mutex);
	evdev_ungrab(evdev, client);
	mutex_unlock(&evdev->mutex);

	evdev_detach_client(evdev, client);
	kfree(client);

	evdev_close_device(evdev);

	return 0;
}

static unsigned int evdev_compute_buffer_size(struct input_dev *dev)
{
	unsigned int n_events =
		max(dev->hint_events_per_packet * EVDEV_BUF_PACKETS,
		    EVDEV_MIN_BUFFER_SIZE);

	return roundup_pow_of_two(n_events);
}

static int evdev_open(struct inode *inode, struct file *file)
{
	struct evdev *evdev = container_of(inode->i_cdev, struct evdev, cdev);
	unsigned int bufsize = evdev_compute_buffer_size(evdev->handle.dev);
	struct evdev_client *client;
	int error;

	client = kzalloc(sizeof(struct evdev_client) +
				bufsize * sizeof(struct input_event),
			 GFP_KERNEL);
	if (!client)
		return -ENOMEM;

	client->bufsize = bufsize;
	spin_lock_init(&client->buffer_lock);
	client->evdev = evdev;
	evdev_attach_client(evdev, client);

	error = evdev_open_device(evdev);
	if (error)
		goto err_free_client;

	file->private_data = client;
	nonseekable_open(inode, file);

	return 0;

 err_free_client:
	evdev_detach_client(evdev, client);
	kfree(client);
	return error;
}

static ssize_t evdev_write(struct file *file, const char __user *buffer,
			   size_t count, loff_t *ppos)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	struct input_event event;
	int retval = 0;

	if (count != 0 && count < input_event_size())
		return -EINVAL;

	retval = mutex_lock_interruptible(&evdev->mutex);
	if (retval)
		return retval;

	if (!evdev->exist) {
		retval = -ENODEV;
		goto out;
	}

	while (retval + input_event_size() <= count) {

		if (input_event_from_user(buffer + retval, &event)) {
			retval = -EFAULT;
			goto out;
		}
		retval += input_event_size();

		input_inject_event(&evdev->handle,
				   event.type, event.code, event.value);
	}

 out:
	mutex_unlock(&evdev->mutex);
	return retval;
}

static int evdev_fetch_next_event(struct evdev_client *client,
				  struct input_event *event)
{
	int have_event;

	spin_lock_irq(&client->buffer_lock);

	have_event = client->packet_head != client->tail;
	if (have_event) {
		*event = client->buffer[client->tail++];
		client->tail &= client->bufsize - 1;
	}

	spin_unlock_irq(&client->buffer_lock);

	return have_event;
}

static ssize_t evdev_read(struct file *file, char __user *buffer,
			  size_t count, loff_t *ppos)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	struct input_event event;
	size_t read = 0;
	int error;

	if (count != 0 && count < input_event_size())
		return -EINVAL;

	for (;;) {
		if (!evdev->exist)
			return -ENODEV;

		if (client->packet_head == client->tail &&
		    (file->f_flags & O_NONBLOCK))
			return -EAGAIN;

		/*
		 * count == 0 is special - no IO is done but we check
		 * for error conditions (see above).
		 */
		if (count == 0)
			break;

		while (read + input_event_size() <= count &&
		       evdev_fetch_next_event(client, &event)) {

			if (input_event_to_user(buffer + read, &event))
				return -EFAULT;

			read += input_event_size();
		}

		if (read)
			break;

		if (!(file->f_flags & O_NONBLOCK)) {
			error = wait_event_interruptible(evdev->wait,
					client->packet_head != client->tail ||
					!evdev->exist);
			if (error)
				return error;
		}
	}

	return read;
}

/* No kernel lock - fine */
static unsigned int evdev_poll(struct file *file, poll_table *wait)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	unsigned int mask;

	poll_wait(file, &evdev->wait, wait);

	mask = evdev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
	if (client->packet_head != client->tail)
		mask |= POLLIN | POLLRDNORM;

	return mask;
}

#ifdef CONFIG_COMPAT

#define BITS_PER_LONG_COMPAT (sizeof(compat_long_t) * 8)
#define BITS_TO_LONGS_COMPAT(x) ((((x) - 1) / BITS_PER_LONG_COMPAT) + 1)

#ifdef __BIG_ENDIAN
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
			unsigned int maxlen, void __user *p, int compat)
{
	int len, i;

	if (compat) {
		len = BITS_TO_LONGS_COMPAT(maxbit) * sizeof(compat_long_t);
		if (len > maxlen)
			len = maxlen;

		for (i = 0; i < len / sizeof(compat_long_t); i++)
			if (copy_to_user((compat_long_t __user *) p + i,
					 (compat_long_t *) bits +
						i + 1 - ((i % 2) << 1),
					 sizeof(compat_long_t)))
				return -EFAULT;
	} else {
		len = BITS_TO_LONGS(maxbit) * sizeof(long);
		if (len > maxlen)
			len = maxlen;

		if (copy_to_user(p, bits, len))
			return -EFAULT;
	}

	return len;
}
#else
static int bits_to_user(unsigned long *bits, unsigned int maxbit,
			unsigned int maxlen, void __user *p, int compat)
{
	int len = compat ?
			BITS_TO_LONGS_COMPAT(maxbit) * sizeof(compat_long_t) :
			BITS_TO_LONGS(maxbit) * sizeof(long);

	if (len > maxlen)
		len = maxlen;

	return copy_to_user(p, bits, len) ? -EFAULT : len;
}
#endif /* __BIG_ENDIAN */

#else

static int bits_to_user(unsigned long *bits, unsigned int maxbit,
			unsigned int maxlen, void __user *p, int compat)
{
	int len = BITS_TO_LONGS(maxbit) * sizeof(long);

	if (len > maxlen)
		len = maxlen;

	return copy_to_user(p, bits, len) ? -EFAULT : len;
}

#endif /* CONFIG_COMPAT */

static int str_to_user(const char *str, unsigned int maxlen, void __user *p)
{
	int len;

	if (!str)
		return -ENOENT;

	len = strlen(str) + 1;
	if (len > maxlen)
		len = maxlen;

	return copy_to_user(p, str, len) ? -EFAULT : len;
}

#define OLD_KEY_MAX	0x1ff
static int handle_eviocgbit(struct input_dev *dev,
			    unsigned int type, unsigned int size,
			    void __user *p, int compat_mode)
{
	static unsigned long keymax_warn_time;
	unsigned long *bits;
	int len;

	switch (type) {

	case      0: bits = dev->evbit;  len = EV_MAX;  break;
	case EV_KEY: bits = dev->keybit; len = KEY_MAX; break;
	case EV_REL: bits = dev->relbit; len = REL_MAX; break;
	case EV_ABS: bits = dev->absbit; len = ABS_MAX; break;
	case EV_MSC: bits = dev->mscbit; len = MSC_MAX; break;
	case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
	case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
	case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;
	case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;
	default: return -EINVAL;
	}

	/*
	 * Work around bugs in userspace programs that like to do
	 * EVIOCGBIT(EV_KEY, KEY_MAX) and not realize that 'len'
	 * should be in bytes, not in bits.
	 */
	if (type == EV_KEY && size == OLD_KEY_MAX) {
		len = OLD_KEY_MAX;
		if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))
			pr_warning("(EVIOCGBIT): Suspicious buffer size %u, "
				   "limiting output to %zu bytes. See "
				   "http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",
				   OLD_KEY_MAX,
				   BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));
	}

	return bits_to_user(bits, len, size, p, compat_mode);
}
#undef OLD_KEY_MAX

static int evdev_handle_get_keycode(struct input_dev *dev, void __user *p)
{
	struct input_keymap_entry ke = {
		.len	= sizeof(unsigned int),
		.flags	= 0,
	};
	int __user *ip = (int __user *)p;
	int error;

	/* legacy case */
	if (copy_from_user(ke.scancode, p, sizeof(unsigned int)))
		return -EFAULT;

	error = input_get_keycode(dev, &ke);
	if (error)
		return error;

	if (put_user(ke.keycode, ip + 1))
		return -EFAULT;

	return 0;
}

static int evdev_handle_get_keycode_v2(struct input_dev *dev, void __user *p)
{
	struct input_keymap_entry ke;
	int error;

	if (copy_from_user(&ke, p, sizeof(ke)))
		return -EFAULT;

	error = input_get_keycode(dev, &ke);
	if (error)
		return error;

	if (copy_to_user(p, &ke, sizeof(ke)))
		return -EFAULT;

	return 0;
}

static int evdev_handle_set_keycode(struct input_dev *dev, void __user *p)
{
	struct input_keymap_entry ke = {
		.len	= sizeof(unsigned int),
		.flags	= 0,
	};
	int __user *ip = (int __user *)p;

	if (copy_from_user(ke.scancode, p, sizeof(unsigned int)))
		return -EFAULT;

	if (get_user(ke.keycode, ip + 1))
		return -EFAULT;

	return input_set_keycode(dev, &ke);
}

static int evdev_handle_set_keycode_v2(struct input_dev *dev, void __user *p)
{
	struct input_keymap_entry ke;

	if (copy_from_user(&ke, p, sizeof(ke)))
		return -EFAULT;

	if (ke.len > sizeof(ke.scancode))
		return -EINVAL;

	return input_set_keycode(dev, &ke);
}

static int evdev_handle_mt_request(struct input_dev *dev,
				   unsigned int size,
				   int __user *ip)
{
	const struct input_mt *mt = dev->mt;
	unsigned int code;
	int max_slots;
	int i;

	if (get_user(code, &ip[0]))
		return -EFAULT;
	if (!mt || !input_is_mt_value(code))
		return -EINVAL;

	max_slots = (size - sizeof(__u32)) / sizeof(__s32);
	for (i = 0; i < mt->num_slots && i < max_slots; i++) {
		int value = input_mt_get_value(&mt->slots[i], code);
		if (put_user(value, &ip[1 + i]))
			return -EFAULT;
	}

	return 0;
}

static long evdev_do_ioctl(struct file *file, unsigned int cmd,
			   void __user *p, int compat_mode)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	struct input_dev *dev = evdev->handle.dev;
	struct input_absinfo abs;
	struct ff_effect effect;
	int __user *ip = (int __user *)p;
	unsigned int i, t, u, v;
	unsigned int size;
	int error;

	/* First we check for fixed-length commands */
	switch (cmd) {

	case EVIOCGVERSION:
		return put_user(EV_VERSION, ip);

	case EVIOCGID:
		if (copy_to_user(p, &dev->id, sizeof(struct input_id)))
			return -EFAULT;
		return 0;

	case EVIOCGREP:
		if (!test_bit(EV_REP, dev->evbit))
			return -ENOSYS;
		if (put_user(dev->rep[REP_DELAY], ip))
			return -EFAULT;
		if (put_user(dev->rep[REP_PERIOD], ip + 1))
			return -EFAULT;
		return 0;

	case EVIOCSREP:
		if (!test_bit(EV_REP, dev->evbit))
			return -ENOSYS;
		if (get_user(u, ip))
			return -EFAULT;
		if (get_user(v, ip + 1))
			return -EFAULT;

		input_inject_event(&evdev->handle, EV_REP, REP_DELAY, u);
		input_inject_event(&evdev->handle, EV_REP, REP_PERIOD, v);

		return 0;

	case EVIOCRMFF:
		return input_ff_erase(dev, (int)(unsigned long) p, file);

	case EVIOCGEFFECTS:
		i = test_bit(EV_FF, dev->evbit) ?
				dev->ff->max_effects : 0;
		if (put_user(i, ip))
			return -EFAULT;
		return 0;

	case EVIOCGRAB:
		if (p)
			return evdev_grab(evdev, client);
		else
			return evdev_ungrab(evdev, client);

	case EVIOCSCLOCKID:
		if (copy_from_user(&i, p, sizeof(unsigned int)))
			return -EFAULT;
		if (i != CLOCK_MONOTONIC && i != CLOCK_REALTIME)
			return -EINVAL;
		client->clkid = i;
		return 0;

	case EVIOCGKEYCODE:
		return evdev_handle_get_keycode(dev, p);

	case EVIOCSKEYCODE:
		return evdev_handle_set_keycode(dev, p);

	case EVIOCGKEYCODE_V2:
		return evdev_handle_get_keycode_v2(dev, p);

	case EVIOCSKEYCODE_V2:
		return evdev_handle_set_keycode_v2(dev, p);
	}

	size = _IOC_SIZE(cmd);

	/* Now check variable-length commands */
#define EVIOC_MASK_SIZE(nr)	((nr) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT))
	switch (EVIOC_MASK_SIZE(cmd)) {

	case EVIOCGPROP(0):
		return bits_to_user(dev->propbit, INPUT_PROP_MAX,
				    size, p, compat_mode);

	case EVIOCGMTSLOTS(0):
		return evdev_handle_mt_request(dev, size, ip);

	case EVIOCGKEY(0):
		return bits_to_user(dev->key, KEY_MAX, size, p, compat_mode);

	case EVIOCGLED(0):
		return bits_to_user(dev->led, LED_MAX, size, p, compat_mode);

	case EVIOCGSND(0):
		return bits_to_user(dev->snd, SND_MAX, size, p, compat_mode);

	case EVIOCGSW(0):
		return bits_to_user(dev->sw, SW_MAX, size, p, compat_mode);

	case EVIOCGNAME(0):
		return str_to_user(dev->name, size, p);

	case EVIOCGPHYS(0):
		return str_to_user(dev->phys, size, p);

	case EVIOCGUNIQ(0):
		return str_to_user(dev->uniq, size, p);

	case EVIOC_MASK_SIZE(EVIOCSFF):
		if (input_ff_effect_from_user(p, size, &effect))
			return -EFAULT;

		error = input_ff_upload(dev, &effect, file);

		if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
			return -EFAULT;

		return error;
	}

	/* Multi-number variable-length handlers */
	if (_IOC_TYPE(cmd) != 'E')
		return -EINVAL;

	if (_IOC_DIR(cmd) == _IOC_READ) {

		if ((_IOC_NR(cmd) & ~EV_MAX) == _IOC_NR(EVIOCGBIT(0, 0)))
			return handle_eviocgbit(dev,
						_IOC_NR(cmd) & EV_MAX, size,
						p, compat_mode);

		if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCGABS(0))) {

			if (!dev->absinfo)
				return -EINVAL;

			t = _IOC_NR(cmd) & ABS_MAX;
			abs = dev->absinfo[t];

			if (copy_to_user(p, &abs, min_t(size_t,
					size, sizeof(struct input_absinfo))))
				return -EFAULT;

			return 0;
		}
	}

	if (_IOC_DIR(cmd) == _IOC_WRITE) {

		if ((_IOC_NR(cmd) & ~ABS_MAX) == _IOC_NR(EVIOCSABS(0))) {

			if (!dev->absinfo)
				return -EINVAL;

			t = _IOC_NR(cmd) & ABS_MAX;

			if (copy_from_user(&abs, p, min_t(size_t,
					size, sizeof(struct input_absinfo))))
				return -EFAULT;

			if (size < sizeof(struct input_absinfo))
				abs.resolution = 0;

			/* We can't change number of reserved MT slots */
			if (t == ABS_MT_SLOT)
				return -EINVAL;

			/*
			 * Take event lock to ensure that we are not
			 * changing device parameters in the middle
			 * of event.
			 */
			spin_lock_irq(&dev->event_lock);
			dev->absinfo[t] = abs;
			spin_unlock_irq(&dev->event_lock);

			return 0;
		}
	}

	return -EINVAL;
}

static long evdev_ioctl_handler(struct file *file, unsigned int cmd,
				void __user *p, int compat_mode)
{
	struct evdev_client *client = file->private_data;
	struct evdev *evdev = client->evdev;
	int retval;

	retval = mutex_lock_interruptible(&evdev->mutex);
	if (retval)
		return retval;

	if (!evdev->exist) {
		retval = -ENODEV;
		goto out;
	}

	retval = evdev_do_ioctl(file, cmd, p, compat_mode);

 out:
	mutex_unlock(&evdev->mutex);
	return retval;
}

static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
	return evdev_ioctl_handler(file, cmd, (void __user *)arg, 0);
}

#ifdef CONFIG_COMPAT
static long evdev_ioctl_compat(struct file *file,
				unsigned int cmd, unsigned long arg)
{
	return evdev_ioctl_handler(file, cmd, compat_ptr(arg), 1);
}
#endif

static const struct file_operations evdev_fops = {
	.owner		= THIS_MODULE,
	.read		= evdev_read,
	.write		= evdev_write,
	.poll		= evdev_poll,
	.open		= evdev_open,
	.release	= evdev_release,
	.unlocked_ioctl	= evdev_ioctl,
#ifdef CONFIG_COMPAT
	.compat_ioctl	= evdev_ioctl_compat,
#endif
	.fasync		= evdev_fasync,
	.flush		= evdev_flush,
	.llseek		= no_llseek,
};

/*
 * Mark device non-existent. This disables writes, ioctls and
 * prevents new users from opening the device. Already posted
 * blocking reads will stay, however new ones will fail.
 */
static void evdev_mark_dead(struct evdev *evdev)
{
	mutex_lock(&evdev->mutex);
	evdev->exist = false;
	mutex_unlock(&evdev->mutex);
}

static void evdev_cleanup(struct evdev *evdev)
{
	struct input_handle *handle = &evdev->handle;

	evdev_mark_dead(evdev);
	evdev_hangup(evdev);

	cdev_del(&evdev->cdev);

	/* evdev is marked dead so no one else accesses evdev->open */
	if (evdev->open) {
		input_flush_device(handle, NULL);
		input_close_device(handle);
	}
}

/*
 * Create new evdev device. Note that input core serializes calls
 * to connect and disconnect.
 */
static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
			 const struct input_device_id *id)
{
	struct evdev *evdev;
	int minor;
	int dev_no;
	int error;

	minor = input_get_new_minor(EVDEV_MINOR_BASE, EVDEV_MINORS, true);
	if (minor < 0) {
		error = minor;
		pr_err("failed to reserve new minor: %d\n", error);
		return error;
	}

	evdev = kzalloc(sizeof(struct evdev), GFP_KERNEL);
	if (!evdev) {
		error = -ENOMEM;
		goto err_free_minor;
	}

	INIT_LIST_HEAD(&evdev->client_list);
	spin_lock_init(&evdev->client_lock);
	mutex_init(&evdev->mutex);
	init_waitqueue_head(&evdev->wait);
	evdev->exist = true;

	dev_no = minor;
	/* Normalize device number if it falls into legacy range */
	if (dev_no < EVDEV_MINOR_BASE + EVDEV_MINORS)
		dev_no -= EVDEV_MINOR_BASE;
	dev_set_name(&evdev->dev, "event%d", dev_no);

	evdev->handle.dev = input_get_device(dev);
	evdev->handle.name = dev_name(&evdev->dev);
	evdev->handle.handler = handler;
	evdev->handle.private = evdev;

	evdev->dev.devt = MKDEV(INPUT_MAJOR, minor);
	evdev->dev.class = &input_class;
	evdev->dev.parent = &dev->dev;
	evdev->dev.release = evdev_free;
	device_initialize(&evdev->dev);

	error = input_register_handle(&evdev->handle);
	if (error)
		goto err_free_evdev;

	cdev_init(&evdev->cdev, &evdev_fops);
	evdev->cdev.kobj.parent = &evdev->dev.kobj;
	error = cdev_add(&evdev->cdev, evdev->dev.devt, 1);
	if (error)
		goto err_unregister_handle;

	error = device_add(&evdev->dev);
	if (error)
		goto err_cleanup_evdev;

	return 0;

 err_cleanup_evdev:
	evdev_cleanup(evdev);
 err_unregister_handle:
	input_unregister_handle(&evdev->handle);
 err_free_evdev:
	put_device(&evdev->dev);
 err_free_minor:
	input_free_minor(minor);
	return error;
}

static void evdev_disconnect(struct input_handle *handle)
{
	struct evdev *evdev = handle->private;

	device_del(&evdev->dev);
	evdev_cleanup(evdev);
	input_free_minor(MINOR(evdev->dev.devt));
	input_unregister_handle(handle);
	put_device(&evdev->dev);
}

static const struct input_device_id evdev_ids[] = {
	{ .driver_info = 1 },	/* Matches all devices */
	{ },			/* Terminating zero entry */
};

MODULE_DEVICE_TABLE(input, evdev_ids);

static struct input_handler evdev_handler = {
	.event		= evdev_event,
	.events		= evdev_events,
	.connect	= evdev_connect,
	.disconnect	= evdev_disconnect,
	.legacy_minors	= true,
	.minor		= EVDEV_MINOR_BASE,
	.name		= "evdev",
	.id_table	= evdev_ids,
};

static int __init evdev_init(void)
{
	return input_register_handler(&evdev_handler);
}

static void __exit evdev_exit(void)
{
	input_unregister_handler(&evdev_handler);
}

module_init(evdev_init);
module_exit(evdev_exit);

MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
MODULE_DESCRIPTION("Input driver event char devices");
MODULE_LICENSE("GPL");
d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/sysfs.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/aaci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/aaci.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/aaci.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/aaci.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-ac97-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-ac97-lib.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-ac97-regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-ac97-regs.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-ac97.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-pcm-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm-lib.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/arm/pxa2xx-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/atmel/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/atmel/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/atmel/abdac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/abdac.c</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/atmel/ac97c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/ac97c.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/atmel/ac97c.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/ac97c.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/.kunitconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/.kunitconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/Kconfig</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/Makefile</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/compress_offload.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/compress_offload.c</a></td><td class='right'>1550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/control.c</a></td><td class='right'>2239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 88.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/control_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/control_compat.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/control_led.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/control_led.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/ctljack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/ctljack.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/device.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/hrtimer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hrtimer.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hwdep.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/hwdep_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hwdep_compat.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/info.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/info.c</a></td><td class='right'>1055</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/info_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/info_oss.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/init.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/init.c</a></td><td class='right'>1081</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/isadma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/isadma.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/jack.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/memalloc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/memalloc.c</a></td><td class='right'>1192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/memory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/memory.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/misc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/misc.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/io.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/io.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/linear.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/linear.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/mixer_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/mixer_oss.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/mulaw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/mulaw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/pcm_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_oss.c</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/pcm_plugin.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_plugin.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/pcm_plugin.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_plugin.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/rate.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/rate.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/oss/route.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/route.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_compat.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_dmaengine.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_dmaengine.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_drm_eld.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_drm_eld.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_iec958.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_iec958.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_lib.c</a></td><td class='right'>1790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_local.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_memory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_memory.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_misc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_misc.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_native.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_native.c</a></td><td class='right'>3413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 82.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_param_trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_param_trace.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_timer.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/pcm_trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_trace.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/rawmidi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rawmidi.c</a></td><td class='right'>1263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/rawmidi_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rawmidi_compat.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/core/rtctimer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rtctimer.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/Kconfig</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/Makefile</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_device.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_device.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_event.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_event.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_event.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_event.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_init.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_init.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_ioctl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_ioctl.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_midi.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_midi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_readq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_readq.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_readq.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_readq.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_rw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_rw.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_synth.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_synth.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_synth.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_timer.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_timer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_timer.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_writeq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_writeq.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/oss/seq_oss_writeq.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_writeq.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_clientmgr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_clientmgr.c</a></td><td class='right'>2153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_clientmgr.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_clientmgr.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_compat.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_device.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_dummy.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_dummy.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_fifo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_fifo.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_fifo.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_fifo.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_info.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_info.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_info.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_info.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_lock.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_lock.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_lock.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_lock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_memory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_memory.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_memory.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_memory.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_midi_emul.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi_emul.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_midi_event.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi_event.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_ports.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ports.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_ports.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ports.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_prioq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_prioq.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_prioq.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_prioq.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_queue.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_queue.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_queue.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_queue.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_system.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_system.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_system.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_system.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_timer.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_timer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_timer.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_ump_client.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ump_client.c</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_ump_convert.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ump_convert.c</a></td><td class='right'>1305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_ump_convert.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ump_convert.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/seq/seq_virmidi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_virmidi.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/seq_device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq_device.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/core/sgbuf.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sgbuf.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/sound.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sound.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/sound_kunit.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sound_kunit.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/sound_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sound_oss.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/timer.c</a></td><td class='right'>1881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/timer_compat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/timer_compat.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/ump.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/ump.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/core/ump_convert.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/ump_convert.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/core/vmaster.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/vmaster.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/Kconfig</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/aloop.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/aloop.c</a></td><td class='right'>1218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/dummy.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/dummy.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/drivers/ml403-ac97cr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/ml403-ac97cr.c</a></td><td class='right'>1355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/mpu401/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/mpu401/mpu401.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/mpu401.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/mpu401/mpu401_uart.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/mpu401_uart.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/mtpav.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mtpav.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/mts64.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mts64.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_drums.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_drums.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_lib.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_midi.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_oss.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_seq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_seq.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_synth.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl3/opl3_voice.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_voice.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_lib.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_local.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_mixer.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_proc.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_seq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_seq.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/opl4_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_synth.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/opl4/yrw801.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/yrw801.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcm-indirect2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcm-indirect2.c</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcm-indirect2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcm-indirect2.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcmtest.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcmtest.c</a></td><td class='right'>780</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp_input.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_input.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp_input.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_input.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_lib.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/pcsp/pcsp_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_mixer.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/portman2x4.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/portman2x4.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/drivers/serial-generic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/serial-generic.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/serial-u16550.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/serial-u16550.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/virmidi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/virmidi.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_cmd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_cmd.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_cmd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_cmd.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_core.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_hwdep.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_mixer.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_pcm.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/drivers/vx/vx_uer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_uer.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/Kconfig</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/amdtp-am824.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/amdtp-am824.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/amdtp-am824.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/amdtp-am824.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/amdtp-stream-trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/amdtp-stream-trace.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/amdtp-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/amdtp-stream.c</a></td><td class='right'>2160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/amdtp-stream.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/amdtp-stream.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_command.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_command.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_focusrite.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_focusrite.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_hwdep.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_maudio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_maudio.c</a></td><td class='right'>785</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_midi.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_pcm.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_proc.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_stream.c</a></td><td class='right'>987</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_terratec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_terratec.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/bebob/bebob_yamaha_terratec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/bebob/bebob_yamaha_terratec.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/cmp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/cmp.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/cmp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/cmp.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-alesis.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-alesis.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-extension.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-extension.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-focusrite.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-focusrite.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-harman.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-harman.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-hwdep.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-interface.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-interface.h</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-midi.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-mytek.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-mytek.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-pcm.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-presonus.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-presonus.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-proc.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-stream.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-tcelectronic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-tcelectronic.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-teac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-teac.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-transaction.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice-weiss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice-weiss.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/dice/dice.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/dice/dice.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/amdtp-dot.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/amdtp-dot.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-hwdep.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-midi.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-pcm.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-proc.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-stream.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x-transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x-transaction.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/digi00x/digi00x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/digi00x/digi00x.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fcp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fcp.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fcp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fcp.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/amdtp-ff.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/amdtp-ff.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-hwdep.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-midi.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-pcm.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-proc.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-protocol-former.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-protocol-former.c</a></td><td class='right'>733</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-protocol-latter.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-protocol-latter.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-stream.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff-transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff-transaction.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireface/ff.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireface/ff.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks.h</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_command.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_command.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_hwdep.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_midi.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_pcm.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_proc.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_stream.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/fireworks/fireworks_transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/fireworks/fireworks_transaction.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/isight.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/isight.c</a></td><td class='right'>733</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/iso-resources.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/iso-resources.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/iso-resources.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/iso-resources.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/lib.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/lib.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/lib.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/amdtp-motu-trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/amdtp-motu-trace.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/amdtp-motu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/amdtp-motu.c</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-command-dsp-message-parser.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-command-dsp-message-parser.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-hwdep.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-midi.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-pcm.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-proc.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-protocol-v1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-protocol-v1.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-protocol-v2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-protocol-v2.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-protocol-v3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-protocol-v3.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-register-dsp-message-parser.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-register-dsp-message-parser.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-stream.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu-transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu-transaction.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/motu/motu.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/motu/motu.h</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-command.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-command.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-hwdep.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-midi.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-pcm.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-proc.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-scs1x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-scs1x.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-spkr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-spkr.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw-stream.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/oxfw/oxfw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/oxfw/oxfw.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/packets-buffer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/packets-buffer.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/packets-buffer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/packets-buffer.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/amdtp-tascam.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/amdtp-tascam.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-hwdep.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-midi.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-pcm.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-proc.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-stream.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam-transaction.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam-transaction.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/firewire/tascam/tascam.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/firewire/tascam/tascam.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/Kconfig</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/Makefile</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/analog.c</a></td><td class='right'>1176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/ca0110.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/ca0110.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/ca0132.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/ca0132.c</a></td><td class='right'>10078</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 50.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 49.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/ca0132_regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/ca0132_regs.h</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/Kconfig</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/cs420x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/cs420x.c</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/cs421x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/cs421x.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/cs8409-tables.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/cs8409-tables.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/cs8409.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/cs8409.c</a></td><td class='right'>1475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cirrus/cs8409.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cirrus/cs8409.h</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cm9825.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cm9825.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/cmedia.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/cmedia.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/conexant.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/conexant.c</a></td><td class='right'>1333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/generic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/generic.c</a></td><td class='right'>6145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/generic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/generic.h</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/Kconfig</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/atihdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/atihdmi.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/eld.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/eld.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/hdmi.c</a></td><td class='right'>2363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/hdmi_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/hdmi_local.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/intelhdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/intelhdmi.c</a></td><td class='right'>812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/nvhdmi-mcp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/nvhdmi-mcp.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/nvhdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/nvhdmi.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/simplehdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/simplehdmi.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/hdmi/tegrahdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/hdmi/tegrahdmi.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/helpers/hp_x360.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/helpers/hp_x360.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/helpers/ideapad_hotkey_led.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/helpers/ideapad_hotkey_led.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/helpers/ideapad_s740.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/helpers/ideapad_s740.c</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/helpers/thinkpad.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/helpers/thinkpad.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/Kconfig</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc260.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc260.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc262.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc262.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc268.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc268.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc269.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc269.c</a></td><td class='right'>8311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 41.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 58.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc662.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc662.c</a></td><td class='right'>1116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc680.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc680.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc861.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc861.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc861vd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc861vd.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc880.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc880.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/alc882.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/alc882.c</a></td><td class='right'>861</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/realtek.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/realtek.c</a></td><td class='right'>2271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/realtek/realtek.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/realtek/realtek.h</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/senarytech.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/senarytech.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/si3054.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/si3054.c</a> (renamed from sound/pci/hda/patch_si3054.c)</td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/Kconfig</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/Makefile</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cirrus_scodec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cirrus_scodec.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cirrus_scodec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cirrus_scodec.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cirrus_scodec_test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cirrus_scodec_test.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda.c</a></td><td class='right'>2098</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda_property.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda_property.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda_property.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda_property.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l41_hda_spi.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l56_hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l56_hda.c</a></td><td class='right'>1286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l56_hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l56_hda.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/cs35l56_hda_spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/cs35l56_hda_spi.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/hda_component.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/hda_component.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/hda_component.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/hda_component.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/tas2781_hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/tas2781_hda.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/tas2781_hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/tas2781_hda.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/tas2781_hda_i2c.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/side-codecs/tas2781_hda_spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/side-codecs/tas2781_hda_spi.c</a></td><td class='right'>956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/sigmatel.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/sigmatel.c</a></td><td class='right'>5169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/codecs/via.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/codecs/via.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/Kconfig</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/auto_parser.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/auto_parser.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/beep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/beep.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/bind.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/bind.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/codec.c</a></td><td class='right'>4048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/controller.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/controller.c</a></td><td class='right'>1322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/controller_trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/controller_trace.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hda_auto_parser.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hda_auto_parser.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hda_beep.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hda_beep.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hda_controller.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hda_controller.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hda_jack.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hda_jack.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hda_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hda_local.h</a> (renamed from sound/pci/hda/hda_local.h)</td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/hwdep.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/jack.c</a></td><td class='right'>770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/hda/common/proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/proc.c</a> (renamed from sound/pci/hda/hda_proc.c)</td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/common/sysfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/common/sysfs.c</a></td><td class='right'>764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/acpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/acpi.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/intel.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/intel.c</a></td><td class='right'>2834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/intel.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/intel.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/intel_trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/intel_trace.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/controllers/tegra.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/controllers/tegra.c</a></td><td class='right'>652</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/array.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/array.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/bus.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/bus.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/component.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/component.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/controller.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/controller.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/device.c</a></td><td class='right'>1167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/ext/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/ext/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/ext/bus.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/ext/bus.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/ext/controller.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/ext/controller.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/ext/stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/ext/stream.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/hda_bus_type.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/hda_bus_type.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/hdmi_chmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/hdmi_chmap.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/i915.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/i915.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/intel-dsp-config.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/intel-dsp-config.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/intel-nhlt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/intel-nhlt.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/intel-sdw-acpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/intel-sdw-acpi.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/local.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/regmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/regmap.c</a></td><td class='right'>588</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/stream.c</a></td><td class='right'>1004</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/sysfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/sysfs.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/trace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/trace.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/hda/core/trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/hda/core/trace.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/cs8427.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/cs8427.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/i2c.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/ak4113.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4113.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/ak4114.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4114.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/ak4117.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4117.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/ak4xxx-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4xxx-adda.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/pt2258.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/pt2258.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/i2c/other/tea575x-tuner.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/tea575x-tuner.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/i2c/tea6330t.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/tea6330t.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/ad1816a/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/ad1816a/ad1816a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/ad1816a.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/ad1816a/ad1816a_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/ad1816a_lib.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/ad1848/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1848/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/ad1848/ad1848.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1848/ad1848.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/adlib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/adlib.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/als100.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/als100.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/azt2320.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/azt2320.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/isa/cmi8328.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cmi8328.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/cmi8330.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cmi8330.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/cs423x/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/cs423x/cs4231.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4231.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/cs423x/cs4236.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4236.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/cs423x/cs4236_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4236_lib.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/es1688/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/es1688/es1688.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/es1688.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/es1688/es1688_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/es1688_lib.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/es18xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es18xx.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/galaxy/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/galaxy/azt1605.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/azt1605.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/galaxy/azt2316.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/azt2316.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/galaxy/galaxy.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/galaxy.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_dma.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_dram.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_dram.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_instr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_instr.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_io.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_io.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_irq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_irq.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_main.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_mem.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mem.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_mem_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mem_proc.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mixer.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_pcm.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_reset.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_reset.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_tables.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_tables.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_timer.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_uart.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_uart.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gus_volume.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_volume.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gusclassic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusclassic.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gusextreme.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusextreme.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/gusmax.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusmax.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/gus/interwave.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/interwave.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd_classic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_classic.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_midi.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd_pinnacle.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd_pinnacle.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/msnd/msnd_pinnacle_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle_mixer.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/opl3sa2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opl3sa2.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/opti9xx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/opti9xx/miro.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/miro.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/opti9xx/opti92x-ad1848.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/opti92x-ad1848.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000_callback.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_callback.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_local.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000_patch.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_patch.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_pcm.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/emu8000_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_synth.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/jazz16.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/jazz16.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb16.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb16_csp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16_csp.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb16_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16_main.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb8.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb8_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8_main.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb8_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8_midi.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb_common.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sb/sb_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb_mixer.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sc6000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sc6000.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/sscape.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sscape.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wavefront/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wavefront/wavefront.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wavefront/wavefront_fx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_fx.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wavefront/wavefront_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_midi.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wavefront/wavefront_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_synth.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wss/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wss/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/isa/wss/wss_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wss/wss_lib.c</a></td><td class='right'>656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/last.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/last.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/ad1843.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/ad1843.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/mips/au1x00.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/au1x00.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/hal2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/hal2.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/hal2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/hal2.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/mips/sgio2audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/sgio2audio.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/mips/snd-n64.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/snd-n64.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/.gitignore?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/.gitignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/CHANGELOG?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/CHANGELOG</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/Kconfig</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/Makefile</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/README.FIRST?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/README.FIRST</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/ac97_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ac97_codec.c</a></td><td class='right'>1203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/ad1848.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848.c</a></td><td class='right'>3069</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.4%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/ad1848.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/ad1848_mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848_mixer.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/aedsp16.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/aedsp16.c</a></td><td class='right'>1373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/au1550_ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/au1550_ac97.c</a></td><td class='right'>2147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.8%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/audio.c</a></td><td class='right'>985</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/bin2hex.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/bin2hex.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/coproc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/coproc.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/dev_table.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dev_table.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/dev_table.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dev_table.h</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/dmabuf.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmabuf.c</a></td><td class='right'>1268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/dmasound.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/dmasound_atari.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_atari.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/dmasound_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_core.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/dmasound_paula.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_paula.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/oss/dmasound/dmasound_q40.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_q40.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/hex2hex.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/hex2hex.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/kahlua.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/kahlua.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/midi_ctrl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_ctrl.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/midi_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_synth.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/midi_synth.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_synth.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/midibuf.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midibuf.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/mpu401.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/mpu401.c</a></td><td class='right'>1806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.1%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/mpu401.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/mpu401.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd.h</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd_classic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_classic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd_classic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_classic.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd_pinnacle.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_pinnacle.c</a></td><td class='right'>1931</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/msnd_pinnacle.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_pinnacle.h</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/opl3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/opl3.c</a></td><td class='right'>1251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/opl3_hw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/opl3_hw.h</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/os.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/os.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pas2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pas2_card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_card.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pas2_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_midi.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pas2_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_mixer.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pas2_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_pcm.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/pss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pss.c</a></td><td class='right'>1266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_audio.c</a></td><td class='right'>1098</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_card.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_card.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_card.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_common.c</a></td><td class='right'>1292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_ess.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_ess.c</a></td><td class='right'>1831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_ess.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_ess.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_midi.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_mixer.c</a></td><td class='right'>770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sb_mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_mixer.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sequencer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sequencer.c</a></td><td class='right'>1671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.4%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sound_calls.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_calls.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sound_config.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_config.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sound_firmware.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_firmware.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sound_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_timer.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/soundcard.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/soundcard.c</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/soundvers.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/soundvers.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/swarm_cs4297a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/swarm_cs4297a.c</a></td><td class='right'>2768</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.9%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/sys_timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sys_timer.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/trix.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/trix.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/tuning.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/tuning.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/uart401.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/uart401.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/uart6850.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/uart6850.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/ulaw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ulaw.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/v_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/v_midi.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/v_midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/v_midi.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/vidc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/vidc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/vidc_fill.S?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc_fill.S</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/vwsnd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vwsnd.c</a></td><td class='right'>3498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.5%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/waveartist.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/waveartist.c</a></td><td class='right'>2025</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.2%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/oss/waveartist.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/waveartist.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/parisc/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/parisc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/parisc/harmony.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/harmony.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/parisc/harmony.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/harmony.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/Kconfig</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/Makefile</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_codec.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_id.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_id.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_local.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_patch.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_patch.c</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_patch.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_patch.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_pcm.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ac97/ac97_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_proc.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ad1889.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ad1889.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ad1889.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ad1889.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ak4531_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ak4531_codec.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ali5451/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ali5451/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ali5451/ali5451.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ali5451/ali5451.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/als300.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/als300.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/als4000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/als4000.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/asihpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/asihpi.c</a></td><td class='right'>1773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi.h</a></td><td class='right'>1309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi6000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6000.c</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi6000.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6000.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi6205.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6205.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi6205.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6205.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi_internal.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi_internal.h</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpi_version.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi_version.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpicmn.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpicmn.c</a></td><td class='right'>636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpicmn.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpicmn.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpidebug.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidebug.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpidebug.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidebug.h</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpidspcd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidspcd.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpidspcd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidspcd.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpifunc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpifunc.c</a></td><td class='right'>2612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpimsginit.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsginit.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpimsginit.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsginit.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpimsgx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsgx.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpimsgx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsgx.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpioctl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpioctl.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpioctl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpioctl.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpios.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpios.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpios.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpios.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/asihpi/hpipcida.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpipcida.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/atiixp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/atiixp.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/atiixp_modem.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/atiixp_modem.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8810.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8810.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8810.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8810.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8820.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8820.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8820.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8820.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8830.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8830.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au8830.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8830.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_a3d.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3d.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_a3d.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3d.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_a3ddata.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3ddata.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_core.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_eq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eq.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_eq.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eq.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_eqdata.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eqdata.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_game.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_game.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_mixer.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_mpu401.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_mpu401.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_pcm.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_synth.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_wt.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_wt.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_xtalk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_xtalk.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/au88x0/au88x0_xtalk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_xtalk.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/aw2-alsa.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-alsa.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/aw2-saa7146.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-saa7146.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/aw2-saa7146.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-saa7146.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/aw2-tsl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-tsl.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/aw2/saa7146.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/saa7146.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/azt3328.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/azt3328.c</a></td><td class='right'>1591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/azt3328.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/azt3328.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/bt87x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/bt87x.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca0106.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca0106_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_main.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca0106_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_mixer.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca0106_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_proc.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca_midi.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ca0106/ca_midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca_midi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cmipci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cmipci.c</a></td><td class='right'>760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs4281.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs4281.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx.h</a></td><td class='right'>1732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_dsp_scb_types.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_dsp_scb_types.h</a></td><td class='right'>1198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_dsp_spos.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_dsp_spos.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_dsp_task_types.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_dsp_task_types.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_image.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_image.h</a></td><td class='right'>3468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.4%;'/><td class='none' style='width: 82.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_lib.c</a></td><td class='right'>1039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/cs46xx_lib.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_lib.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/dsp_spos.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/dsp_spos.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/dsp_spos_scb_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos_scb_lib.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwc4630.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwc4630.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwcasync.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcasync.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwcbinhack.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcbinhack.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwcdma.asp?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcdma.asp</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwcdma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcdma.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/cs46xx/imgs/cwcsnoop.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcsnoop.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5530.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5530.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/cs5535audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/cs5535audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/cs5535audio_olpc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_olpc.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/cs5535audio_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_pcm.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/cs5535audio/cs5535audio_pm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_pm.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ct20k1reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ct20k1reg.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ct20k2reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ct20k2reg.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctamixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctamixer.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctamixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctamixer.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctatc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctatc.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctatc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctatc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctdaio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctdaio.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctdaio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctdaio.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthardware.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthardware.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthardware.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthardware.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthw20k1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k1.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthw20k1.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k1.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthw20k2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k2.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cthw20k2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k2.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctimap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctimap.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctimap.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctimap.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctmixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctmixer.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctmixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctmixer.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctpcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctpcm.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctpcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctpcm.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctresource.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctresource.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctresource.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctresource.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctsrc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctsrc.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctsrc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctsrc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cttimer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cttimer.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/cttimer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cttimer.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctvmem.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctvmem.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/ctvmem.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctvmem.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ctxfi/xfi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/xfi.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/darla20.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla20.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/darla20_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla20_dsp.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/darla24.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla24.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/darla24_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla24_dsp.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echo3g.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echo3g.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echo3g_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echo3g_dsp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio.c</a></td><td class='right'>1066</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio_3g.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_3g.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_dsp.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio_dsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_dsp.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/echoaudio_gml.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_gml.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/gina20.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina20.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/gina20_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina20_dsp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/gina24.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina24.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/gina24_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina24_dsp.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigo_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo_dsp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigo_express_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo_express_dsp.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigodj.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodj.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigodj_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodj_dsp.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigodjx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodjx.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigodjx_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodjx_dsp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigoio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoio.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigoio_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoio_dsp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigoiox.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoiox.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/indigoiox_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoiox_dsp.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/layla20.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla20.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/layla20_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla20_dsp.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/layla24.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla24.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/layla24_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla24_dsp.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/mia.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mia.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/mia_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mia_dsp.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/midi.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/mona.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mona.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/echoaudio/mona_dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mona_dsp.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1_callback.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_callback.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_main.c</a></td><td class='right'>1370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1_patch.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_patch.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_synth.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1_synth_local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_synth_local.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emu10k1x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1x.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emufx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emufx.c</a></td><td class='right'>1485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emumixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emumixer.c</a></td><td class='right'>2039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emumpu401.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emumpu401.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emupcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emupcm.c</a></td><td class='right'>1375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/emuproc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emuproc.c</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/io.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/io.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/irq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/irq.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/memory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/memory.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/p16v.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p16v.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/p16v.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p16v.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/p17v.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p17v.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/timer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/timer.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/tina2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/tina2.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/emu10k1/voice.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/voice.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ens1370.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ens1370.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/es1938.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/es1938.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/es1968.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/es1968.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/fm801.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/fm801.c</a></td><td class='right'>1170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/Kconfig</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/Makefile</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_beep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_beep.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_beep.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_beep.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_codec.c</a></td><td class='right'>4949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.8%;'/><td class='none' style='width: 75.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_codec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_codec.h</a></td><td class='right'>1048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_eld.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_eld.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_generic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_generic.c</a></td><td class='right'>1083</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_hwdep.c</a></td><td class='right'>818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/hda_intel.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_intel.c</a></td><td class='right'>2843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.3%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_analog.c</a></td><td class='right'>4820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.2%;'/><td class='none' style='width: 75.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_ca0110.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_ca0110.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_cirrus.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_cirrus.c</a></td><td class='right'>1311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_cmedia.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_cmedia.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_conexant.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_conexant.c</a></td><td class='right'>3937</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.7%;'/><td class='none' style='width: 80.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_hdmi.c</a></td><td class='right'>1639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_realtek.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_realtek.c</a></td><td class='right'>19942</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 100.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_sigmatel.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_sigmatel.c</a></td><td class='right'>6431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.2%;'/><td class='none' style='width: 67.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/hda/patch_via.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_via.c</a></td><td class='right'>6058</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 30.4%;'/><td class='none' style='width: 69.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ak4xxx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ak4xxx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/amp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/amp.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/amp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/amp.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/aureon.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/aureon.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/aureon.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/aureon.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/delta.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/delta.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/delta.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/delta.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/envy24ht.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/envy24ht.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ews.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ews.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ews.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ews.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/hoontech.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/hoontech.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/hoontech.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/hoontech.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ice1712.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1712.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ice1712.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1712.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/ice1724.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1724.c</a></td><td class='right'>871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/juli.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/juli.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/juli.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/juli.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/maya44.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/maya44.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/maya44.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/maya44.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/phase.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/phase.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/phase.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/phase.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/pontis.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/pontis.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/pontis.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/pontis.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/prodigy192.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy192.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/prodigy192.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy192.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/prodigy_hifi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy_hifi.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/prodigy_hifi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy_hifi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/psc724.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/psc724.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/psc724.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/psc724.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/quartet.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/quartet.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/quartet.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/quartet.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/revo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/revo.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/revo.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/revo.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/se.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/se.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/se.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/se.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/stac946x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/stac946x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/vt1720_mobo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/vt1720_mobo.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/vt1720_mobo.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/vt1720_mobo.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wm8766.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wm8766.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wm8766.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wm8766.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wm8776.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wm8776.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wm8776.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wm8776.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wtm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wtm.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ice1712/wtm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wtm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/intel8x0.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/intel8x0.c</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/intel8x0m.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/intel8x0m.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/korg1212/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/korg1212/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/korg1212/korg1212.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/korg1212/korg1212.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola.h</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola_clock.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola_clock.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola_mixer.c</a></td><td class='right'>842</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola_pcm.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/lola/lola_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lola/lola_proc.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/lx6464es.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx6464es.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/lx6464es.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx6464es.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/lx_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx_core.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/lx_core.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx_core.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/lx6464es/lx_defs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx_defs.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/maestro3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/maestro3.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_core.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_core.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_core.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_hwdep.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_hwdep.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_hwdep.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_mixer.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/mixart/mixart_mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/mixart/mixart_mixer.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/nm256/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/nm256/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/nm256/nm256.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/nm256/nm256.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/nm256/nm256_coef.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/nm256/nm256_coef.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/ak4396.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/ak4396.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/cm9780.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/cm9780.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/cs2000.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/cs2000.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/cs4245.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/cs4245.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/cs4362a.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/cs4362a.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/cs4398.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/cs4398.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/hifier.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/hifier.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen_io.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen_io.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen_lib.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen_mixer.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen_pcm.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/oxygen_regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/oxygen_regs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/pcm1796.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/pcm1796.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/se6x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/se6x.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/virtuoso.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/virtuoso.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/wm8766.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/wm8766.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/wm8776.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/wm8776.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/wm8785.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/wm8785.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_cs43xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_cs43xx.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_dg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_dg.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_dg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_dg.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_dg_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_dg_mixer.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_hdmi.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_lib.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_pcm179x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_pcm179x.c</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/oxygen/xonar_wm87x6.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/oxygen/xonar_wm87x6.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_core.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_core.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_core.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_hwdep.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_hwdep.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_hwdep.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_mix22.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_mix22.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_mix22.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_mix22.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_mixer.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/pcxhr/pcxhr_mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/pcxhr/pcxhr_mixer.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/riptide/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/riptide/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/riptide/riptide.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/riptide/riptide.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme32.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme32.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme96.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme96.c</a></td><td class='right'>906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme9652/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme9652/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme9652/hdsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme9652/hdsp.c</a></td><td class='right'>2132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme9652/hdspm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme9652/hdspm.c</a></td><td class='right'>6314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.6%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 68.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/rme9652/rme9652.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/rme9652/rme9652.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/sis7019.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/sis7019.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/sis7019.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/sis7019.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/sonicvibes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/sonicvibes.c</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/trident/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/trident/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/trident/trident.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/trident/trident.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/trident/trident.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/trident/trident.h</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/trident/trident_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/trident/trident_main.c</a></td><td class='right'>836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/trident/trident_memory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/trident/trident_memory.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/via82xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/via82xx.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/via82xx_modem.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/via82xx_modem.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/vx222/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/vx222/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/vx222/vx222.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/vx222/vx222.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/vx222/vx222.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/vx222/vx222.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/vx222/vx222_ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/vx222/vx222_ops.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ymfpci/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ymfpci/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ymfpci/ymfpci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ymfpci/ymfpci.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/pci/ymfpci/ymfpci.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ymfpci/ymfpci.h</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pci/ymfpci/ymfpci_main.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ymfpci/ymfpci_main.c</a></td><td class='right'>808</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/pdaudiocf.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/pdaudiocf.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/pdaudiocf_core.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/pdaudiocf_irq.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/vx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/vx/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/vx/vxp_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/vx/vxp_mixer.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/vx/vxp_ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/vx/vxp_ops.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/vx/vxpocket.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/vx/vxpocket.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/pcmcia/vx/vxpocket.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pcmcia/vx/vxpocket.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/Kconfig</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/awacs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/awacs.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/awacs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/awacs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/beep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/beep.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/burgundy.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/burgundy.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/burgundy.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/burgundy.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/daca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/daca.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/keywest.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/keywest.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/pmac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/pmac.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/pmac.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/pmac.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/powermac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/powermac.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/snd_ps3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/snd_ps3.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/snd_ps3.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/snd_ps3.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/snd_ps3_reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/snd_ps3_reg.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/tumbler.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/tumbler.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/ppc/tumbler_volume.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ppc/tumbler_volume.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sh/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sh/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sh/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sh/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sh/aica.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sh/aica.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sh/aica.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sh/aica.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sh/sh_dac_audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sh/sh_dac_audio.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/Kconfig</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/Makefile</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/adi/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/adi/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/adi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/adi/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/adi/axi-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/adi/axi-i2s.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/adi/axi-spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/adi/axi-spdif.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/Kconfig</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp-config.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp-config.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp-da7219-max98357a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp-da7219-max98357a.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp-es8336.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp-es8336.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp-pcm-dma.c</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp-rt5645.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp-rt5645.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp.h</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/Kconfig</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/Makefile</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-i2s.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-legacy-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-legacy-common.c</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-legacy-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-legacy-mach.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-mach-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-mach-common.c</a></td><td class='right'>1803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-mach.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-mach.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-pci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-pci.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-pdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-pdm.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-platform.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-platform.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-rembrandt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-rembrandt.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-renoir.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-renoir.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-sdw-legacy-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-sdw-legacy-mach.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-sdw-mach-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-sdw-mach-common.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-sdw-sof-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-sdw-sof-mach.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp-sof-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp-sof-mach.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp63.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp63.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp70.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp70.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/acp_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/acp_common.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/amd-acp63-acpi-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/amd-acp63-acpi-match.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/amd-acp70-acpi-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/amd-acp70-acpi-match.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/amd-acpi-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/amd-acpi-mach.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/amd-sdw-acpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/amd-sdw-acpi.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/amd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/amd.h</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/chip_offset_byte.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp/soc_amd_sdw_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp/soc_amd_sdw_common.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/acp3x-rt5682-max9836.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/acp3x-rt5682-max9836.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/include/acp_2_2_d.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/include/acp_2_2_d.h</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/include/acp_2_2_enum.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/include/acp_2_2_enum.h</a></td><td class='right'>1068</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/include/acp_2_2_sh_mask.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/include/acp_2_2_sh_mask.h</a></td><td class='right'>2292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/mach-config.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/mach-config.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/acp63.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/acp63.h</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/pci-ps.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/pci-ps.c</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/ps-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/ps-common.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/ps-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/ps-mach.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/ps-pdm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/ps-pdm-dma.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/ps/ps-sdw-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/ps/ps-sdw-dma.c</a></td><td class='right'>804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/acp3x-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/acp3x-i2s.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/acp3x-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/acp3x-pcm-dma.c</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/acp3x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/acp3x.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/chip_offset_byte.h</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/raven/pci-acp3x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/raven/pci-acp3x.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/acp3x-pdm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/acp3x-pdm-dma.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/acp3x-rn.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/acp3x-rn.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/rn-pci-acp3x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/rn-pci-acp3x.c</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/rn_acp3x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/rn_acp3x.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/renoir/rn_chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/renoir/rn_chip_offset_byte.h</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/rpl/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/rpl/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/rpl/rpl-pci-acp6x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/rpl/rpl-pci-acp6x.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/rpl/rpl_acp6x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/rpl/rpl_acp6x.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/acp5x-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/acp5x-i2s.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/acp5x-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/acp5x-mach.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/acp5x-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/acp5x-pcm-dma.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/acp5x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/acp5x.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/pci-acp5x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/pci-acp5x.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/vangogh/vg_chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/vangogh/vg_chip_offset_byte.h</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/acp6x-mach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/acp6x-mach.c</a></td><td class='right'>740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/acp6x-pdm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/acp6x-pdm-dma.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/acp6x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/acp6x.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/acp6x_chip_offset_byte.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/acp6x_chip_offset_byte.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/amd/yc/pci-acp6x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/amd/yc/pci-acp6x.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/apple/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/apple/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/apple/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/apple/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/apple/mca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/apple/mca.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/Kconfig</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/Makefile</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-classd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-classd.c</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-classd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-classd.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-i2s.c</a></td><td class='right'>742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-pcm-dma.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-pcm-pdc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-pcm-pdc.c</a> (renamed from sound/soc/atmel/atmel-pcm.c)</td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-pcm.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-pdmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-pdmic.c</a></td><td class='right'>702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel-pdmic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel-pdmic.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel_ssc_dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel_ssc_dai.c</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel_ssc_dai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel_ssc_dai.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/atmel_wm8904.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/atmel_wm8904.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/mchp-i2s-mcc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/mchp-i2s-mcc.c</a></td><td class='right'>1138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/mchp-pdmc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/mchp-pdmc.c</a></td><td class='right'>1156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/mchp-spdifrx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/mchp-spdifrx.c</a></td><td class='right'>1203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/mchp-spdiftx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/mchp-spdiftx.c</a></td><td class='right'>903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/mikroe-proto.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/mikroe-proto.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/playpaq_wm8510.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/playpaq_wm8510.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/sam9g20_wm8731.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/sam9g20_wm8731.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/sam9x5_wm8731.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/sam9x5_wm8731.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/snd-soc-afeb9260.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/snd-soc-afeb9260.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/atmel/tse850-pcm5142.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/atmel/tse850-pcm5142.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/Kconfig</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/ac97c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/ac97c.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/db1000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/db1000.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/db1200.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/db1200.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/dbdma2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/dbdma2.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/dma.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/i2sc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/i2sc.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/psc-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/psc-ac97.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/psc-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/psc-i2s.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/au1x/psc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/au1x/psc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/bcm2835-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/bcm2835-i2s.c</a></td><td class='right'>931</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/bcm63xx-i2s-whistler.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/bcm63xx-i2s-whistler.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/bcm63xx-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/bcm63xx-i2s.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/bcm63xx-pcm-whistler.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/bcm63xx-pcm-whistler.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/cygnus-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/cygnus-pcm.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/cygnus-ssp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/cygnus-ssp.c</a></td><td class='right'>1405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/bcm/cygnus-ssp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/bcm/cygnus-ssp.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/Kconfig</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ac97-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ac97-pcm.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ac97-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ac97-pcm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ac97.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ac97.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ac97.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ad1836.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ad1836.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ad193x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ad193x.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ad1980.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ad1980.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ad73311.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ad73311.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-i2s-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-i2s-pcm.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-i2s-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-i2s-pcm.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-i2s.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-sport.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-sport.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-sport.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-sport.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-ssm2602.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-ssm2602.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-tdm-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-tdm-pcm.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-tdm-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-tdm-pcm.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-tdm.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/blackfin/bf5xx-tdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/blackfin/bf5xx-tdm.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/cirrus/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/cirrus/Kconfig</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/cirrus/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/cirrus/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/cirrus/ep93xx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/cirrus/ep93xx-i2s.c</a> (renamed from sound/soc/ep93xx/ep93xx-i2s.c)</td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/cirrus/ep93xx-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/cirrus/ep93xx-pcm.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/cirrus/ep93xx-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/cirrus/ep93xx-pcm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/88pm860x-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/88pm860x-codec.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/88pm860x-codec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/88pm860x-codec.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/Kconfig</a></td><td class='right'>2742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/Makefile</a></td><td class='right'>887</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ab8500-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ab8500-codec.c</a></td><td class='right'>2575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ab8500-codec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ab8500-codec.h</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ac97.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad1836.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad1836.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad1836.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad1836.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad193x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad193x-i2c.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad193x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad193x-spi.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad193x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad193x.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad193x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad193x.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad1980.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad1980.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad1980.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad1980.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad73311.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad73311.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ad73311.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ad73311.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau-utils.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau-utils.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau-utils.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1372-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1372-i2c.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1372-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1372-spi.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1372.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1372.c</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1372.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1372.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1373.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1373.c</a></td><td class='right'>1626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1373.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1373.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1701.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1701.c</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1701.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1701.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1761-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1761-i2c.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1761-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1761-spi.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1761.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1761.c</a></td><td class='right'>1024</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1761.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1761.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1781-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1781-i2c.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1781-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1781-spi.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1781.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1781.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1781.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1781.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau17x1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau17x1.c</a></td><td class='right'>1123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau17x1.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau17x1.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1977-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1977-i2c.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1977-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1977-spi.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1977.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1977.c</a></td><td class='right'>1003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau1977.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau1977.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau7002.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau7002.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau7118-hw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau7118-hw.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau7118-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau7118-i2c.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau7118.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau7118.c</a></td><td class='right'>575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adau7118.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adau7118.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adav801.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adav801.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adav803.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adav803.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adav80x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adav80x.c</a></td><td class='right'>882</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/adav80x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/adav80x.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ads117x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ads117x.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ads117x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ads117x.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4104.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4104.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4118.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4118.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4375.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4375.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4458.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4458.c</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4458.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4458.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4535.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4535.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4535.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4535.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4554.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4554.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4613.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4613.c</a></td><td class='right'>927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4619.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4619.c</a></td><td class='right'>912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4641.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4641.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4642.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4642.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4671.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4671.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak4671.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak4671.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak5386.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak5386.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak5558.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak5558.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ak5558.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ak5558.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/alc5623.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/alc5623.c</a></td><td class='right'>1094</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/alc5623.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/alc5623.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/alc5632.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/alc5632.c</a></td><td class='right'>1193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/alc5632.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/alc5632.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/arizona-jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/arizona-jack.c</a></td><td class='right'>1668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/arizona.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/arizona.c</a></td><td class='right'>2857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/arizona.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/arizona.h</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/audio-iio-aux.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/audio-iio-aux.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw8738.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw8738.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw87390.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw87390.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw87390.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw87390.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88081.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88081.c</a></td><td class='right'>1317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88081.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88081.h</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88166.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88166.c</a></td><td class='right'>1815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88166.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88166.h</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88261.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88261.c</a></td><td class='right'>1282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88261.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88261.h</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395.c</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_data_type.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_data_type.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_device.c</a></td><td class='right'>1721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_device.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_device.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_lib.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_lib.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_lib.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88395/aw88395_reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88395/aw88395_reg.h</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88399.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88399.c</a></td><td class='right'>2173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/aw88399.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/aw88399.h</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/bd28623.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/bd28623.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/bt-sco.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/bt-sco.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/chv3-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/chv3-codec.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cirrus_legacy.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cirrus_legacy.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cpcap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cpcap.c</a></td><td class='right'>1884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cq93vc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cq93vc.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cros_ec_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cros_ec_codec.c</a></td><td class='right'>1064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs-amp-lib-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs-amp-lib-test.c</a></td><td class='right'>2451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs-amp-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs-amp-lib.c</a></td><td class='right'>737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l32.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l32.c</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l32.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l32.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l33.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l33.c</a></td><td class='right'>1287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l33.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l33.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l34.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l34.c</a></td><td class='right'>1217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l34.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l34.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l35.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l35.c</a></td><td class='right'>1662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l35.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l35.h</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l36.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l36.c</a></td><td class='right'>1940</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l36.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l36.h</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l41-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l41-i2c.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l41-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l41-lib.c</a></td><td class='right'>1592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l41-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l41-spi.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l41.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l41.c</a></td><td class='right'>1492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l41.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l41.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l45-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l45-i2c.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l45-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l45-spi.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l45-tables.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l45-tables.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l45.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l45.c</a></td><td class='right'>1513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l45.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l45.h</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56-i2c.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56-sdw.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56-shared.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56-shared.c</a></td><td class='right'>1740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56-spi.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56.c</a></td><td class='right'>1814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs35l56.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs35l56.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs40l50-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs40l50-codec.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4234.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4234.c</a></td><td class='right'>917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4234.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4234.h</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4265.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4265.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4265.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4265.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4270.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4270.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4271-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4271-i2c.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4271-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4271-spi.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4271.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4271.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4271.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4271.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l42-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l42-i2c.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l42-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l42-sdw.c</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l42.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l42.c</a></td><td class='right'>2495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l42.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l42.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l43-jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l43-jack.c</a></td><td class='right'>962</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l43-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l43-sdw.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l43.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l43.c</a></td><td class='right'>2476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l43.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l43.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l51-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l51-i2c.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l51.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l51.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l51.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l51.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l52.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l52.c</a></td><td class='right'>1248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l52.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l52.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l56.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l56.c</a></td><td class='right'>1375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l56.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l56.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l73.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l73.c</a></td><td class='right'>1393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l73.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l73.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l83-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l83-i2c.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l84.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l84.c</a></td><td class='right'>1111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42l84.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42l84.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42xx8-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42xx8-i2c.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42xx8.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42xx8.c</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs42xx8.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs42xx8.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs43130.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs43130.c</a></td><td class='right'>2781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs43130.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs43130.h</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4341.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4341.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4349.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4349.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs4349.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs4349.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l15.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l15.c</a></td><td class='right'>1505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l24.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l24.c</a></td><td class='right'>1355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l24.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l24.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l35.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l35.c</a></td><td class='right'>1782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l85.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l85.c</a></td><td class='right'>2733</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l90.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l90.c</a></td><td class='right'>2657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs47l92.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs47l92.c</a></td><td class='right'>2103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs48l32-tables.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs48l32-tables.c</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs48l32.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs48l32.c</a></td><td class='right'>4076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs48l32.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs48l32.h</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs530x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs530x-i2c.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs530x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs530x-spi.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs530x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs530x.c</a></td><td class='right'>1343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs530x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs530x.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs53l30.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs53l30.c</a></td><td class='right'>1107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cs53l30.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cs53l30.h</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cx20442.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cx20442.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cx20442.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cx20442.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cx2072x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cx2072x.c</a></td><td class='right'>1718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/cx2072x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/cx2072x.h</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7210.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7210.c</a></td><td class='right'>1234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7213.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7213.c</a></td><td class='right'>2297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7213.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7213.h</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7218.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7218.c</a></td><td class='right'>3304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7218.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7218.h</a></td><td class='right'>1411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7219-aad.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7219-aad.c</a></td><td class='right'>1080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7219-aad.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7219-aad.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7219.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7219.c</a></td><td class='right'>2735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da7219.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da7219.h</a></td><td class='right'>839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da732x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da732x.c</a></td><td class='right'>1568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da732x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da732x.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da732x_reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da732x_reg.h</a></td><td class='right'>651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/da9055.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/da9055.c</a></td><td class='right'>1543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/dmic.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es7134.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es7134.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es7241.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es7241.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8311.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8311.c</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8311.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8311.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8316.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8316.c</a></td><td class='right'>933</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8316.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8316.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8323.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8323.c</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8323.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8323.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8326.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8326.c</a></td><td class='right'>1374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8326.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8326.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8328-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8328-i2c.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8328-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8328-spi.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8328.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8328.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8328.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8328.h</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8375.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8375.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8375.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8375.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8389.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8389.c</a></td><td class='right'>962</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es8389.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es8389.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es83xx-dsm-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es83xx-dsm-common.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/es83xx-dsm-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/es83xx-dsm-common.h</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/framer-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/framer-codec.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/fs-amp-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/fs-amp-lib.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/fs-amp-lib.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/fs-amp-lib.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/fs210x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/fs210x.c</a></td><td class='right'>1586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/fs210x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/fs210x.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/gtm601.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/gtm601.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hda-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hda-dai.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hda.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hda.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hdac_hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hdac_hda.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hdac_hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hdac_hda.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hdac_hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hdac_hdmi.c</a></td><td class='right'>2048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/hdmi-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/hdmi-codec.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ics43432.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ics43432.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/idt821034.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/idt821034.c</a></td><td class='right'>1183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/inno_rk3036.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/inno_rk3036.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/inno_rk3036.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/inno_rk3036.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/isabelle.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/isabelle.c</a></td><td class='right'>1154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/isabelle.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/isabelle.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/jz4725b.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/jz4725b.c</a></td><td class='right'>667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/jz4740.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/jz4740.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/jz4760.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/jz4760.c</a></td><td class='right'>872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/jz4770.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/jz4770.c</a></td><td class='right'>919</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/l3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/l3.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lm4857.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lm4857.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lm49453.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lm49453.c</a></td><td class='right'>1463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lm49453.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lm49453.h</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lochnagar-sc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lochnagar-sc.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-macro-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-macro-common.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-macro-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-macro-common.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-rx-macro.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-rx-macro.c</a></td><td class='right'>4035</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-tx-macro.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-tx-macro.c</a></td><td class='right'>2543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-va-macro.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-va-macro.c</a></td><td class='right'>1781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-wsa-macro.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-wsa-macro.c</a></td><td class='right'>2939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/lpass-wsa-macro.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/lpass-wsa-macro.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/madera.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/madera.c</a></td><td class='right'>4796</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 76.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/madera.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/madera.h</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9759.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9759.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9768.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9768.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98088.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98088.c</a></td><td class='right'>1653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98088.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98088.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98090.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98090.c</a></td><td class='right'>2723</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98090.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98090.h</a></td><td class='right'>1549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98095.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98095.c</a></td><td class='right'>2167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98095.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98095.h</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98357a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98357a.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98363.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98363.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98363.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98363.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98371.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98371.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98371.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98371.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98373-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98373-i2c.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98373-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98373-sdw.c</a></td><td class='right'>888</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98373-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98373-sdw.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98373.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98373.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98373.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98373.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98388.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98388.c</a></td><td class='right'>1013</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98388.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98388.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98390.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98390.c</a></td><td class='right'>1135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98390.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98390.h</a></td><td class='right'>667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98396.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98396.c</a></td><td class='right'>1914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98396.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98396.h</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9850.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9850.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9850.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9850.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98504.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98504.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98504.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98504.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98520.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98520.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98520.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98520.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9860.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9860.c</a></td><td class='right'>738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9860.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9860.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9867.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9867.c</a></td><td class='right'>718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9867.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9867.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9877.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9877.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max9877.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max9877.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98925.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98925.c</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98925.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98925.h</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98926.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98926.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98926.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98926.h</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98927.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98927.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/max98927.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/max98927.h</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mc13783.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mc13783.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mc13783.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mc13783.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ml26124.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ml26124.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ml26124.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ml26124.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/msm8916-wcd-analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/msm8916-wcd-analog.c</a></td><td class='right'>1280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/msm8916-wcd-digital.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/msm8916-wcd-digital.c</a></td><td class='right'>1249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6351.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6351.c</a></td><td class='right'>1496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6351.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6351.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6357.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6357.c</a></td><td class='right'>1855</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6357.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6357.h</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6358.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6358.c</a></td><td class='right'>2430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6358.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6358.h</a></td><td class='right'>2310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6359-accdet.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6359-accdet.c</a></td><td class='right'>1062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6359-accdet.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6359-accdet.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6359.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6359.c</a></td><td class='right'>2960</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6359.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6359.h</a></td><td class='right'>4289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6660.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6660.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/mt6660.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/mt6660.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8315.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8315.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8325.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8325.c</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8325.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8325.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8540.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8540.c</a></td><td class='right'>993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8540.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8540.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8810.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8810.c</a></td><td class='right'>929</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8810.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8810.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8821.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8821.c</a></td><td class='right'>1984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8821.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8821.h</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8822.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8822.c</a></td><td class='right'>1221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8822.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8822.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8824.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8824.c</a></td><td class='right'>2058</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8824.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8824.h</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8825.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8825.c</a></td><td class='right'>2972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/nau8825.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/nau8825.h</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ntp8835.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ntp8835.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ntp8918.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ntp8918.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ntpfw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ntpfw.c</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ntpfw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ntpfw.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm1681.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm1681.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm1754.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm1754.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm1789-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm1789-i2c.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm1789.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm1789.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm1789.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm1789.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm179x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm179x-i2c.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm179x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm179x-spi.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm179x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm179x.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm179x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm179x.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm186x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm186x-i2c.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm186x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm186x-spi.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm186x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm186x.c</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm186x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm186x.h</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3008.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3008.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3008.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3008.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3060-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3060-i2c.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3060-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3060-spi.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3060.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3060.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3060.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3060.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3168a-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3168a-i2c.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3168a-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3168a-spi.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3168a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3168a.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm3168a.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm3168a.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm5102a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm5102a.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm512x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm512x-i2c.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm512x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm512x-spi.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm512x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm512x.c</a></td><td class='right'>1799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm512x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm512x.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm6240.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm6240.c</a></td><td class='right'>2167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pcm6240.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pcm6240.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/peb2466.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/peb2466.c</a></td><td class='right'>2064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pm4125-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pm4125-sdw.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pm4125.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pm4125.c</a></td><td class='right'>1761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/pm4125.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/pm4125.h</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rk3308_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rk3308_codec.c</a></td><td class='right'>975</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rk3308_codec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rk3308_codec.h</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rk3328_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rk3328_codec.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rk3328_codec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rk3328_codec.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rk817_codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rk817_codec.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rl6231.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rl6231.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rl6231.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rl6231.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rl6347a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rl6347a.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rl6347a.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rl6347a.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt-sdw-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt-sdw-common.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt-sdw-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt-sdw-common.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1011.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1011.c</a></td><td class='right'>2486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1011.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1011.h</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1015.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1015.c</a></td><td class='right'>1190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1015.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1015.h</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1015p.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1015p.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1016.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1016.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1016.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1016.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1017-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1017-sdca-sdw.c</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1017-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1017-sdca-sdw.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1019.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1019.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1019.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1019.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1305.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1305.c</a></td><td class='right'>1179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1305.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1305.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1308-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1308-sdw.c</a></td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1308-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1308-sdw.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1308.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1308.c</a></td><td class='right'>871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1308.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1308.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1316-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1316-sdw.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1316-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1316-sdw.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1318-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1318-sdw.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1318-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1318-sdw.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1318.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1318.c</a></td><td class='right'>1353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1318.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1318.h</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1320-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1320-sdw.c</a></td><td class='right'>1823</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt1320-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt1320-sdw.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt274.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt274.c</a></td><td class='right'>1234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt274.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt274.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt286.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt286.c</a></td><td class='right'>1278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt286.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt286.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt298.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt298.c</a></td><td class='right'>1324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt298.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt298.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5514-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5514-spi.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5514-spi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5514-spi.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5514.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5514.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5514.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5514.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5616.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5616.c</a></td><td class='right'>1414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5616.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5616.h</a></td><td class='right'>1816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5631.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5631.c</a></td><td class='right'>1742</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5631.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5631.h</a></td><td class='right'>702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5640.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5640.c</a></td><td class='right'>3066</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5640.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5640.h</a></td><td class='right'>2193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5645.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5645.c</a></td><td class='right'>4367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5645.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5645.h</a></td><td class='right'>2213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5651.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5651.c</a></td><td class='right'>2292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5651.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5651.h</a></td><td class='right'>2102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5659.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5659.c</a></td><td class='right'>4345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5659.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5659.h</a></td><td class='right'>1821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5660.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5660.c</a></td><td class='right'>1350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5660.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5660.h</a></td><td class='right'>847</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5663.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5663.c</a></td><td class='right'>3756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5663.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5663.h</a></td><td class='right'>1128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5665.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5665.c</a></td><td class='right'>4868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5665.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5665.h</a></td><td class='right'>2002</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5668.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5668.c</a></td><td class='right'>2584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5668.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5668.h</a></td><td class='right'>1312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5670-dsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5670-dsp.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5670.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5670.c</a></td><td class='right'>3345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5670.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5670.h</a></td><td class='right'>2029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5677-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5677-spi.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5677-spi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5677-spi.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5677.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5677.c</a></td><td class='right'>5677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 71.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5677.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5677.h</a></td><td class='right'>1808</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682-i2c.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682-sdw.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682.c</a></td><td class='right'>3191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682.h</a></td><td class='right'>1499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682s.c</a></td><td class='right'>3349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt5682s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt5682s.h</a></td><td class='right'>1492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt700-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt700-sdw.c</a></td><td class='right'>572</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt700-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt700-sdw.h</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt700.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt700.c</a></td><td class='right'>1235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt700.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt700.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdca-sdw.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdca-sdw.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdca.c</a></td><td class='right'>1669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdca.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdca.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdw.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711-sdw.h</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt711.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt711.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca-dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca-dmic.c</a></td><td class='right'>984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca-dmic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca-dmic.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca-sdw.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca-sdw.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca.c</a></td><td class='right'>1926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt712-sdca.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt712-sdca.h</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdca-sdw.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdca-sdw.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdca.c</a></td><td class='right'>1072</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdca.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdca.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdw.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715-sdw.h</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715.c</a></td><td class='right'>1133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt715.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt715.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt721-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt721-sdca-sdw.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt721-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt721-sdca-sdw.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt721-sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt721-sdca.c</a></td><td class='right'>1561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt721-sdca.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt721-sdca.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt722-sdca-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt722-sdca-sdw.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt722-sdca-sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt722-sdca-sdw.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt722-sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt722-sdca.c</a></td><td class='right'>1583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt722-sdca.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt722-sdca.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt9120.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt9120.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt9123.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt9123.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rt9123p.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rt9123p.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rtq9124.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rtq9124.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/rtq9128.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/rtq9128.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sdw-mockup.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sdw-mockup.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sgtl5000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sgtl5000.c</a></td><td class='right'>1839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sgtl5000.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sgtl5000.h</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/si476x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/si476x.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sigmadsp-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sigmadsp-i2c.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sigmadsp-regmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sigmadsp-regmap.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sigmadsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sigmadsp.c</a></td><td class='right'>809</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sigmadsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sigmadsp.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/simple-amplifier.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/simple-amplifier.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/simple-mux.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/simple-mux.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sma1303.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sma1303.c</a></td><td class='right'>1811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sma1303.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sma1303.h</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sma1307.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sma1307.c</a></td><td class='right'>2044</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sma1307.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sma1307.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/spdif_receiver.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/spdif_receiver.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/spdif_transciever.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/spdif_transciever.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/spdif_transmitter.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/spdif_transmitter.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/src4xxx-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/src4xxx-i2c.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/src4xxx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/src4xxx.c</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/src4xxx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/src4xxx.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2305.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2305.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2518.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2518.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2518.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2518.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2602-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2602-i2c.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2602-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2602-spi.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2602.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2602.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm2602.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm2602.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm3515.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm3515.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ssm4567.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ssm4567.c</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sta32x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sta32x.c</a></td><td class='right'>1177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sta32x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sta32x.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sta350.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sta350.c</a></td><td class='right'>1262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sta350.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sta350.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sta529.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sta529.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/stac9766.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/stac9766.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/stac9766.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/stac9766.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/sti-sas.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/sti-sas.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2552.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2552.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2552.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2552.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2562.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2562.c</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2562.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2562.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2764-quirks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2764-quirks.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2764.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2764.c</a></td><td class='right'>950</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2764.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2764.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2770.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2770.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2770.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2770.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2780.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2780.c</a></td><td class='right'>652</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2780.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2780.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2781-comlib-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2781-comlib-i2c.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2781-comlib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2781-comlib.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2781-fmwlib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2781-fmwlib.c</a></td><td class='right'>2618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2781-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2781-i2c.c</a></td><td class='right'>2132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2783-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2783-sdw.c</a></td><td class='right'>1347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas2783.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas2783.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas5086.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas5086.c</a></td><td class='right'>995</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas571x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas571x.c</a></td><td class='right'>1091</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas571x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas571x.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas5720.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas5720.c</a></td><td class='right'>827</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas5720.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas5720.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas5805m.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas5805m.c</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas6424.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas6424.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tas6424.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tas6424.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tda7419.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tda7419.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tfa9879.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tfa9879.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tfa9879.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tfa9879.h</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tfa989x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tfa989x.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320adc3xxx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320adc3xxx.c</a></td><td class='right'>1522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320adcx140.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320adcx140.c</a></td><td class='right'>1215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320adcx140.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320adcx140.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic23-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic23-i2c.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic23-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic23-spi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic23.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic23.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic23.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic23.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic26.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic26.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic26.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic26.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic31xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic31xx.c</a></td><td class='right'>1853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic31xx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic31xx.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic32x4-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic32x4-clk.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic32x4-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic32x4-i2c.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic32x4-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic32x4-spi.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic32x4.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic32x4.c</a></td><td class='right'>1439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic32x4.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic32x4.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic3x-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic3x-i2c.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic3x-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic3x-spi.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic3x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic3x.c</a></td><td class='right'>1655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320aic3x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320aic3x.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320dac33.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320dac33.c</a></td><td class='right'>986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tlv320dac33.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tlv320dac33.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tpa6130a2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tpa6130a2.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tpa6130a2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tpa6130a2.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ts3a227e.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ts3a227e.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/ts3a227e.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/ts3a227e.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tscs42xx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tscs42xx.c</a></td><td class='right'>1512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tscs42xx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tscs42xx.h</a></td><td class='right'>2701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tscs454.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tscs454.c</a></td><td class='right'>3481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/tscs454.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/tscs454.h</a></td><td class='right'>2323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/twl4030.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/twl4030.c</a></td><td class='right'>1279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/twl6040.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/twl6040.c</a></td><td class='right'>1567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/twl6040.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/twl6040.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda1334.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda1334.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda1342.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda1342.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda1342.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda1342.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda134x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda134x.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda134x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda134x.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda1380.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda1380.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/uda1380.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/uda1380.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-clsh-v2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-clsh-v2.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-clsh-v2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-clsh-v2.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-common.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-common.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-mbhc-v2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-mbhc-v2.c</a></td><td class='right'>1647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd-mbhc-v2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd-mbhc-v2.h</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd9335.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd9335.c</a></td><td class='right'>5168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 25.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 74.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd9335.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd9335.h</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd934x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd934x.c</a></td><td class='right'>5919</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 70.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd937x-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd937x-sdw.c</a></td><td class='right'>1115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd937x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd937x.c</a></td><td class='right'>2987</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd937x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd937x.h</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd938x-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd938x-sdw.c</a></td><td class='right'>1279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd938x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd938x.c</a></td><td class='right'>3559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd938x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd938x.h</a></td><td class='right'>686</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd939x-sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd939x-sdw.c</a></td><td class='right'>1477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd939x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd939x.c</a></td><td class='right'>3623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wcd939x.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wcd939x.h</a></td><td class='right'>947</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wl1273.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wl1273.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wl1273.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wl1273.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm0010.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm0010.c</a></td><td class='right'>977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm1250-ev1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm1250-ev1.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm2000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm2000.c</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm2000.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm2000.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm2200.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm2200.c</a></td><td class='right'>2493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm2200.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm2200.h</a></td><td class='right'>3670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5100-tables.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5100-tables.c</a></td><td class='right'>1481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5100.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5100.c</a></td><td class='right'>2691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5100.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5100.h</a></td><td class='right'>5311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5102.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5102.c</a></td><td class='right'>2185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5102.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5102.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5110.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5110.c</a></td><td class='right'>2545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm5110.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm5110.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8350.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8350.c</a></td><td class='right'>577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8350.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8350.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8400.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8400.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8400.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8400.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8510.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8510.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8510.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8510.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8523.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8523.c</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8523.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8523.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8524.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8524.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8580.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8580.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8580.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8580.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8711.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8711.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8711.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8711.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8727.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8727.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8728.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8728.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8728.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8728.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8731-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8731-i2c.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8731-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8731-spi.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8731.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8731.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8731.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8731.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8737.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8737.c</a></td><td class='right'>735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8737.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8737.h</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8741.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8741.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8741.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8741.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8750.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8750.c</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8750.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8750.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8753.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8753.c</a></td><td class='right'>917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8753.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8753.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8770.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8770.c</a></td><td class='right'>701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8770.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8770.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8776.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8776.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8776.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8776.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8782.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8782.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8804-i2c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8804-i2c.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8804-spi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8804-spi.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8804.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8804.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8804.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8804.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8900.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8900.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8900.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8900.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8903.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8903.c</a></td><td class='right'>1912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8903.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8903.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8904.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8904.c</a></td><td class='right'>2049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8904.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8904.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8940.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8940.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8940.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8940.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8955.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8955.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8955.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8955.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8958-dsp2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8958-dsp2.c</a></td><td class='right'>1032</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8960.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8960.c</a></td><td class='right'>1101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8960.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8960.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8961.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8961.c</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8961.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8961.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8962.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8962.c</a></td><td class='right'>4907</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 12.3%;'/><td class='none' style='width: 75.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8962.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8962.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8971.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8971.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8971.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8971.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8974.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8974.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8974.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8974.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8978.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8978.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8978.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8978.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8983.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8983.c</a></td><td class='right'>1112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8983.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8983.h</a></td><td class='right'>1026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8985.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8985.c</a></td><td class='right'>760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8985.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8985.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8988.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8988.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8988.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8988.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8990.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8990.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8990.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8990.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8991.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8991.c</a></td><td class='right'>1335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8991.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8991.h</a></td><td class='right'>815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8993.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8993.c</a></td><td class='right'>1132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8993.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8993.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8994.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8994.c</a></td><td class='right'>5264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.7%;'/><td class='rem' style='width: 11.7%;'/><td class='none' style='width: 73.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8994.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8994.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8995.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8995.c</a></td><td class='right'>2314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8995.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8995.h</a></td><td class='right'>4263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 78.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8996.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8996.c</a></td><td class='right'>3093</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8996.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8996.h</a></td><td class='right'>3717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8997.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8997.c</a></td><td class='right'>1221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8997.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8997.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8998.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8998.c</a></td><td class='right'>1437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm8998.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm8998.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9081.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9081.c</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9081.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9081.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9090.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9090.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9090.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9090.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9705.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9705.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9705.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9705.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9712.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9712.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9712.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9712.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9713.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9713.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm9713.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm9713.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm_adsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm_adsp.c</a></td><td class='right'>2101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm_adsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm_adsp.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm_hubs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm_hubs.c</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wm_hubs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wm_hubs.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wsa881x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wsa881x.c</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wsa883x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wsa883x.c</a></td><td class='right'>1721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/wsa884x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/wsa884x.c</a></td><td class='right'>2181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/codecs/zl38060.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/codecs/zl38060.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/Kconfig</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-evm.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-mcasp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-mcasp.c</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-mcasp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-mcasp.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-pcm.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-pcm.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-sffsdr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-sffsdr.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/davinci/davinci-vcif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/davinci/davinci-vcif.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/dwc/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/dwc/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/dwc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/dwc/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/dwc/dwc-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/dwc/dwc-i2s.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/dwc/dwc-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/dwc/dwc-pcm.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/dwc/local.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/dwc/local.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/ep93xx-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/ep93xx-ac97.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/ep93xx-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/ep93xx-pcm.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/ep93xx-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/ep93xx-pcm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/simone.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/simone.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/ep93xx/snappercl15.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ep93xx/snappercl15.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/Kconfig</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/Makefile</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/efika-audio-fabric.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/efika-audio-fabric.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/eukrea-tlv320.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/eukrea-tlv320.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl-asoc-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl-asoc-card.c</a></td><td class='right'>1112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_asrc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_asrc.c</a></td><td class='right'>1579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_asrc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_asrc.h</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_asrc_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_asrc_common.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_asrc_dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_asrc_dma.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_asrc_m2m.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_asrc_m2m.c</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_aud2htx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_aud2htx.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_aud2htx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_aud2htx.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_audmix.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_audmix.c</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_audmix.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_audmix.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_dma.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_dma.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_easrc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_easrc.c</a></td><td class='right'>2363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_easrc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_easrc.h</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_esai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_esai.c</a></td><td class='right'>1211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_esai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_esai.h</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_micfil.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_micfil.c</a></td><td class='right'>1618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_micfil.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_micfil.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_mqs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_mqs.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_qmc_audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_qmc_audio.c</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_rpmsg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_rpmsg.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_rpmsg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_rpmsg.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_sai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_sai.c</a></td><td class='right'>1872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_sai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_sai.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_spdif.c</a></td><td class='right'>1774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_spdif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_spdif.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_ssi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_ssi.c</a></td><td class='right'>2081</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_ssi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_ssi.h</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_ssi_dbg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_ssi_dbg.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_utils.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_utils.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_utils.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_xcvr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_xcvr.c</a></td><td class='right'>1843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/fsl_xcvr.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/fsl_xcvr.h</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-audio-rpmsg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-audio-rpmsg.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-audmix.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-audmix.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-audmux.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-audmux.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-audmux.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-audmux.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-card.c</a></td><td class='right'>943</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-es8328.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-es8328.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-hdmi.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-pcm-dma.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-pcm-fiq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-pcm-fiq.c</a> (renamed from sound/soc/imx/imx-pcm-fiq.c)</td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-pcm-rpmsg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-pcm-rpmsg.c</a></td><td class='right'>852</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-pcm-rpmsg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-pcm-rpmsg.h</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-pcm.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-rpmsg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-rpmsg.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-sgtl5000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-sgtl5000.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/imx-ssi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/imx-ssi.h</a> (renamed from sound/soc/imx/imx-ssi.h)</td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/lpc3xxx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/lpc3xxx-i2s.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/lpc3xxx-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/lpc3xxx-i2s.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/lpc3xxx-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/lpc3xxx-pcm.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc5200_dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc5200_dma.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc5200_dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc5200_dma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc5200_psc_ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc5200_psc_ac97.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc5200_psc_ac97.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc5200_psc_ac97.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc5200_psc_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc5200_psc_i2s.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/mpc8610_hpcd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/mpc8610_hpcd.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/p1022_ds.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/p1022_ds.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/p1022_rdk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/p1022_rdk.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/fsl/pcm030-audio-fabric.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/fsl/pcm030-audio-fabric.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/Kconfig</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/audio-graph-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/audio-graph-card.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/audio-graph-card2-custom-sample.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/audio-graph-card2-custom-sample.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/audio-graph-card2-custom-sample1.dtsi?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/audio-graph-card2-custom-sample1.dtsi</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/audio-graph-card2-custom-sample2.dtsi?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/audio-graph-card2-custom-sample2.dtsi</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/audio-graph-card2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/audio-graph-card2.c</a></td><td class='right'>1412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/simple-card-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/simple-card-utils.c</a></td><td class='right'>1262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/simple-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/simple-card.c</a></td><td class='right'>837</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/generic/test-component.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/generic/test-component.c</a></td><td class='right'>657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/google/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/google/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/google/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/google/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/google/chv3-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/google/chv3-i2s.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/hisilicon/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/hisilicon/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/hisilicon/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/hisilicon/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/hisilicon/hi6210-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/hisilicon/hi6210-i2s.c</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/hisilicon/hi6210-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/hisilicon/hi6210-i2s.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/img-i2s-in.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/img-i2s-in.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/img-i2s-out.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/img-i2s-out.c</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/img-parallel-out.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/img-parallel-out.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/img-spdif-in.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/img-spdif-in.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/img-spdif-out.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/img-spdif-out.c</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/img/pistachio-internal-dac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/img/pistachio-internal-dac.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/eukrea-tlv320.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/eukrea-tlv320.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/imx-pcm-dma-mx2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/imx-pcm-dma-mx2.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/imx-ssi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/imx-ssi.c</a></td><td class='right'>773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/phycore-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/phycore-ac97.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/imx/wm1133-ev1.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/imx/wm1133-ev1.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/Kconfig</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-atom-controls.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-atom-controls.c</a></td><td class='right'>1577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-atom-controls.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-atom-controls.h</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-mfld-dsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-mfld-dsp.h</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-mfld-platform-compress.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-mfld-platform-compress.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-mfld-platform-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-mfld-platform-pcm.c</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst-mfld-platform.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst-mfld-platform.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst.c</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_acpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_acpi.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_drv_interface.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_drv_interface.c</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_ipc.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_loader.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_pci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_pci.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_pvt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_pvt.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/atom/sst/sst_stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/atom/sst/sst_stream.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/apl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/apl.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/avs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/avs.h</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/board_selection.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/board_selection.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/Kconfig</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/Makefile</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/da7219.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/da7219.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/dmic.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/es8336.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/es8336.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/hdaudio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/hdaudio.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/i2s_test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/i2s_test.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/max98357a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/max98357a.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/max98373.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/max98373.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/max98927.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/max98927.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/nau8825.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/nau8825.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/pcm3168a.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/pcm3168a.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/probe.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/probe.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt274.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt274.c</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt286.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt286.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt298.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt298.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt5514.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt5514.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt5640.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt5640.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt5663.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt5663.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/rt5682.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/rt5682.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/boards/ssm4567.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/boards/ssm4567.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/cldma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/cldma.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/cldma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/cldma.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/cnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/cnl.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/control.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/control.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/control.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/core.c</a></td><td class='right'>959</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/debug.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/debug.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/debugfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/debugfs.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/dsp.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/icl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/icl.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/ipc.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/lnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/lnl.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/loader.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/messages.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/messages.c</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/messages.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/messages.h</a></td><td class='right'>1035</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/mtl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/mtl.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/path.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/path.c</a></td><td class='right'>1608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/path.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/path.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/pcm.c</a></td><td class='right'>1773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/pcm.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/probes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/probes.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/ptl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/ptl.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/registers.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/registers.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/skl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/skl.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/sysfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/sysfs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/tgl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/tgl.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/topology.c</a></td><td class='right'>2247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/topology.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/topology.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/trace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/trace.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/trace.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/utils.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/avs/utils.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/avs/utils.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/Kconfig</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/Makefile</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bdw-rt5650.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bdw-rt5650.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bdw-rt5677.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bdw-rt5677.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bdw_rt286.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bdw_rt286.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcht_cx2072x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcht_cx2072x.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcht_da7213.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcht_da7213.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcht_es8316.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcht_es8316.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcht_nocodec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcht_nocodec.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcr_rt5640.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcr_rt5640.c</a></td><td class='right'>1999</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcr_rt5651.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcr_rt5651.c</a></td><td class='right'>1165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/bytcr_wm5102.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/bytcr_wm5102.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/cht_bsw_max98090_ti.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/cht_bsw_max98090_ti.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/cht_bsw_nau8824.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/cht_bsw_nau8824.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/cht_bsw_rt5645.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/cht_bsw_rt5645.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/cht_bsw_rt5672.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/cht_bsw_rt5672.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/ehl_rt5660.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/ehl_rt5660.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/hda_dsp_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/hda_dsp_common.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/hda_dsp_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/hda_dsp_common.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/hsw_rt5640.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/hsw_rt5640.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/skl_hda_dsp_generic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/skl_hda_dsp_generic.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_board_helpers.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_board_helpers.c</a></td><td class='right'>785</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_board_helpers.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_board_helpers.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_cirrus_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_cirrus_common.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_cirrus_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_cirrus_common.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_cs42l42.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_cs42l42.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_da7219.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_da7219.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_es8336.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_es8336.c</a></td><td class='right'>858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_hdmi_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_hdmi_common.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_maxim_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_maxim_common.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_maxim_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_maxim_common.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_nau8825.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_nau8825.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_nuvoton_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_nuvoton_common.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_nuvoton_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_nuvoton_common.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_pcm512x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_pcm512x.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_realtek_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_realtek_common.c</a></td><td class='right'>689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_realtek_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_realtek_common.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_rt5682.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_rt5682.c</a></td><td class='right'>936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_sdw.c</a></td><td class='right'>1500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_sdw_common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_sdw_common.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_sdw_hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_sdw_hdmi.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_ssp_amp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_ssp_amp.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/boards/sof_wm8804.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/boards/sof_wm8804.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/core.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/core.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/device.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/dsp.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/ipc.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/loader.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/messages.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/messages.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/messages.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/messages.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/pcm.c</a></td><td class='right'>1201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/registers.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/registers.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/sysfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/sysfs.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/catpt/trace.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/catpt/trace.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-adl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-adl-match.c</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-arl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-arl-match.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-bxt-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-bxt-match.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-byt-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-byt-match.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-cfl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-cfl-match.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-cht-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-cht-match.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-cml-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-cml-match.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-cnl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-cnl-match.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-ehl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-ehl-match.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-glk-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-glk-match.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-hda-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-hda-match.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-icl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-icl-match.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-jsl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-jsl-match.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-kbl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-kbl-match.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-lnl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-lnl-match.c</a></td><td class='right'>801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-mtl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-mtl-match.c</a></td><td class='right'>1246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-nvl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-nvl-match.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-ptl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-ptl-match.c</a></td><td class='right'>773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-rpl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-rpl-match.c</a></td><td class='right'>568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-skl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-skl-match.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-ssp-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-ssp-common.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-acpi-intel-tgl-match.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-acpi-intel-tgl-match.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/soc-intel-quirks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/soc-intel-quirks.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/sof-function-topology-lib.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/sof-function-topology-lib.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/common/sof-function-topology-lib.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/common/sof-function-topology-lib.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/keembay/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/keembay/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/keembay/kmb_platform.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/keembay/kmb_platform.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/intel/keembay/kmb_platform.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/intel/keembay/kmb_platform.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/jz4740-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/jz4740-i2s.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/jz4740-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/jz4740-i2s.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/jz4740-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/jz4740-pcm.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/jz4740-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/jz4740-pcm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/jz4740/qi_lb60.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/jz4740/qi_lb60.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/armada-370-db.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/armada-370-db.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/kirkwood-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/kirkwood-dma.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/kirkwood-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/kirkwood-i2s.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/kirkwood-openrd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/kirkwood-openrd.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/kirkwood/kirkwood.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/kirkwood/kirkwood.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/Kconfig</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson1_ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson1_ac97.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_card.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_dma.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_dma.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_i2s.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_i2s.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_i2s_pci.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_i2s_pci.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/loongson/loongson_i2s_plat.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/loongson/loongson_i2s_plat.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/Kconfig</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-afe-fe-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-afe-fe-dai.c</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-afe-fe-dai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-afe-fe-dai.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-afe-platform-driver.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-afe-platform-driver.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-afe-platform-driver.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-afe-platform-driver.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-base-afe.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-base-afe.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-btcvsd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-btcvsd.c</a></td><td class='right'>1410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-dai-adda-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-dai-adda-common.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-dai-adda-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-dai-adda-common.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-dsp-sof-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-dsp-sof-common.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-dsp-sof-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-dsp-sof-common.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-soc-card.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-soc-card.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-soundcard-driver.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-soundcard-driver.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/common/mtk-soundcard-driver.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/common/mtk-soundcard-driver.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-afe-common.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-afe-pcm.c</a></td><td class='right'>1483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-cs42448.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-cs42448.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-reg.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt2701/mt2701-wm8960.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt2701/mt2701-wm8960.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-afe-clk.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-afe-clk.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-afe-common.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-afe-pcm.c</a></td><td class='right'>900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-dai-adda.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-dai-hostless.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-dai-hostless.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-dai-pcm.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-interconnection.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-interconnection.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-mt6351.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-mt6351.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt6797/mt6797-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt6797/mt6797-reg.h</a></td><td class='right'>1015</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/mt7986-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/mt7986-afe-common.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/mt7986-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/mt7986-afe-pcm.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/mt7986-dai-etdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/mt7986-dai-etdm.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/mt7986-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/mt7986-reg.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt7986/mt7986-wm8960.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt7986/mt7986-wm8960.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-afe-common.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-afe-pcm.c</a></td><td class='right'>1241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-max98090.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-max98090.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8173/mt8173-rt5650.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8173/mt8173-rt5650.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-afe-clk.c</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-afe-clk.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-afe-common.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-afe-pcm.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c</a></td><td class='right'>887</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-dai-adda.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-dai-hostless.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-dai-hostless.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-dai-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-dai-i2s.c</a></td><td class='right'>1058</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-dai-pcm.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-dai-tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-dai-tdm.c</a></td><td class='right'>748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-interconnection.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-interconnection.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8183/mt8183-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8183/mt8183-reg.h</a></td><td class='right'>1668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-clk.c</a></td><td class='right'>589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-clk.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-common.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-control.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-gpio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-gpio.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-gpio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-gpio.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-afe-pcm.c</a></td><td class='right'>3005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-audsys-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-audsys-clk.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-audsys-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-audsys-clk.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-adda.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-hostless.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-hostless.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-i2s.c</a></td><td class='right'>1231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-pcm.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-src.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-src.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-dai-tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-dai-tdm.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-interconnection.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-interconnection.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-misc-control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-misc-control.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-mt6366-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-mt6366-common.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-mt6366-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-mt6366-common.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-mt6366.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-mt6366.c</a></td><td class='right'>1377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8186/mt8186-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8186/mt8186-reg.h</a></td><td class='right'>2913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-afe-clk.c</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-afe-clk.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-afe-common.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-afe-pcm.c</a></td><td class='right'>3399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-audsys-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-audsys-clk.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-audsys-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-audsys-clk.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-dai-adda.c</a></td><td class='right'>512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-dai-dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-dai-dmic.c</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-dai-etdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-dai-etdm.c</a></td><td class='right'>2712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-dai-pcm.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-mt6359.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-mt6359.c</a></td><td class='right'>1478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8188/mt8188-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8188/mt8188-reg.h</a></td><td class='right'>3195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-afe-clk.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-afe-clk.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-afe-common.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-afe-pcm.c</a></td><td class='right'>2615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-dai-adda.c</a></td><td class='right'>1228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-dai-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-dai-i2s.c</a></td><td class='right'>1463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-dai-pcm.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-dai-tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-dai-tdm.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-interconnection.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-interconnection.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-nau8825.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-nau8825.c</a></td><td class='right'>1178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8189/mt8189-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8189/mt8189-reg.h</a></td><td class='right'>10773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 54.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 46.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-clk.c</a></td><td class='right'>665</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-clk.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-common.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-control.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-gpio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-gpio.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-gpio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-gpio.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-afe-pcm.c</a></td><td class='right'>2341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-dai-adda.c</a></td><td class='right'>1365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-dai-i2s.c</a></td><td class='right'>2101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-dai-pcm.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-dai-tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-dai-tdm.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-interconnection.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-interconnection.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c</a></td><td class='right'>1239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8192/mt8192-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8192/mt8192-reg.h</a></td><td class='right'>3133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-afe-clk.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-afe-clk.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-afe-common.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-afe-pcm.c</a></td><td class='right'>3206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-audsys-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-audsys-clk.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-audsys-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-audsys-clk.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-audsys-clkid.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-audsys-clkid.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-dai-adda.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-dai-etdm.c</a></td><td class='right'>2778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-dai-pcm.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-mt6359.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-mt6359.c</a></td><td class='right'>1581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8195/mt8195-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8195/mt8195-reg.h</a></td><td class='right'>2797</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-afe-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-afe-clk.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-afe-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-afe-clk.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-afe-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-afe-common.h</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-afe-pcm.c</a></td><td class='right'>2271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-dai-adda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-dai-adda.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-dai-dmic.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-dai-i2s.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-dai-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-dai-pcm.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-mt6357.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-mt6357.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mediatek/mt8365/mt8365-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mediatek/mt8365/mt8365-reg.h</a></td><td class='right'>993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/Kconfig</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/Makefile</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-acodec-ctrl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-acodec-ctrl.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-codec-ctrl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-codec-ctrl.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-encoder-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-encoder-i2s.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-encoder-spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-encoder-spdif.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-fifo-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-fifo-i2s.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-fifo-spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-fifo-spdif.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-fifo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-fifo.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu-fifo.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu-fifo.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/aiu.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/aiu.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-card.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-fifo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-fifo.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-fifo.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-fifo.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-frddr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-frddr.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-pdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-pdm.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-spdifin.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-spdifin.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-spdifout.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-spdifout.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdm-formatter.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdm-formatter.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdm-formatter.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdm-formatter.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdm-interface.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdm-interface.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdm.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdmin.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdmin.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-tdmout.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-tdmout.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/axg-toddr.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/axg-toddr.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/g12a-toacodec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/g12a-toacodec.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/g12a-tohdmitx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/g12a-tohdmitx.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/gx-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/gx-card.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/meson-card-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/meson-card-utils.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/meson-card.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/meson-card.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/meson-codec-glue.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/meson-codec-glue.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/meson-codec-glue.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/meson-codec-glue.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/meson/t9015.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/meson/t9015.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/Kconfig</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/mxs-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/mxs-pcm.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/mxs-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/mxs-pcm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/mxs-saif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/mxs-saif.c</a></td><td class='right'>897</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/mxs-saif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/mxs-saif.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/mxs/mxs-sgtl5000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/mxs/mxs-sgtl5000.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/nuc900-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/nuc900-ac97.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/nuc900-audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/nuc900-audio.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/nuc900-audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/nuc900-audio.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/nuc900/nuc900-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/nuc900/nuc900-pcm.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/Kconfig</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/Makefile</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/am3517evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/am3517evm.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/igep0020.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/igep0020.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/mcpdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/mcpdm.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/mcpdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/mcpdm.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap-mcbsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap-mcbsp.c</a></td><td class='right'>866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap-mcbsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap-mcbsp.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap-mcpdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap-mcpdm.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap-pcm.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap-pcm.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap2evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap2evm.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap3beagle.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap3beagle.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/omap3evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/omap3evm.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/overo.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/overo.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/rx51.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/rx51.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/sdp3430.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/sdp3430.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/sdp4430.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/sdp4430.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/omap/zoom2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/omap/zoom2.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/Kconfig</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/Makefile</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/corgi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/corgi.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/e740_wm9705.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/e740_wm9705.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/e750_wm9705.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/e750_wm9705.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/e800_wm9712.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/e800_wm9712.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/em-x270.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/em-x270.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/imote2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/imote2.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/magician.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/magician.c</a></td><td class='right'>562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/mioa701_wm9713.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/mioa701_wm9713.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/mmp-sspa.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/mmp-sspa.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/mmp-sspa.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/mmp-sspa.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/palm27x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/palm27x.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/poodle.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/poodle.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa-ssp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa-ssp.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa-ssp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa-ssp.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa2xx-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa2xx-ac97.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa2xx-ac97.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa2xx-ac97.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa2xx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa2xx-i2s.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa2xx-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa2xx-i2s.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/pxa2xx-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/pxa2xx-pcm.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/raumfeld.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/raumfeld.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/saarb.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/saarb.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/spitz.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/spitz.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/tavorevb3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/tavorevb3.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/tosa.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/tosa.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/z2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/z2.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/pxa/zylonite.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/pxa/zylonite.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/Kconfig</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/Makefile</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/apq8016_sbc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/apq8016_sbc.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/apq8096.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/apq8096.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/common.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/common.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-apq8016.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-apq8016.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-cdc-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-cdc-dma.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-cpu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-cpu.c</a></td><td class='right'>1303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-hdmi.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-hdmi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-hdmi.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-ipq806x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-ipq806x.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-lpaif-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-lpaif-reg.h</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-platform.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-platform.c</a></td><td class='right'>1396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-sc7180.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-sc7180.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass-sc7280.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass-sc7280.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/lpass.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/lpass.h</a></td><td class='right'>410</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/audioreach.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/audioreach.c</a></td><td class='right'>1339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/audioreach.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/audioreach.h</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6adm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6adm.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6adm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6adm.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6afe-clocks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6afe-clocks.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6afe-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6afe-dai.c</a></td><td class='right'>1147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6afe.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6afe.c</a></td><td class='right'>1941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6afe.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6afe.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6apm-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6apm-dai.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6apm-lpass-dais.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6apm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6apm.c</a></td><td class='right'>828</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6apm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6apm.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6asm-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6asm-dai.c</a></td><td class='right'>1343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6asm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6asm.c</a></td><td class='right'>1676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6asm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6asm.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6core.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6core.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6core.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-common.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-common.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-errno.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-errno.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6prm-clocks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6prm-clocks.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6prm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6prm.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6prm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6prm.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6routing.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6routing.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6routing.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6routing.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/q6usb.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/q6usb.c</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/qdsp6/topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/qdsp6/topology.c</a></td><td class='right'>1340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sc7180.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sc7180.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sc7280.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sc7280.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sc8280xp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sc8280xp.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sdm845.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sdm845.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sdw.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sdw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sdw.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/sm8250.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/sm8250.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/storm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/storm.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/usb_offload_utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/usb_offload_utils.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/usb_offload_utils.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/usb_offload_utils.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/qcom/x1e80100.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/qcom/x1e80100.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/Kconfig</a> (renamed from sound/soc/sh/Kconfig)</td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/Makefile</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/dma-sh7760.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/dma-sh7760.c</a> (renamed from sound/soc/sh/dma-sh7760.c)</td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/fsi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/fsi.c</a></td><td class='right'>2105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/hac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/hac.c</a> (renamed from sound/soc/sh/hac.c)</td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/migor.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/migor.c</a> (renamed from sound/soc/sh/migor.c)</td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/adg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/adg.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/cmd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/cmd.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/core.c</a></td><td class='right'>2080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/ctu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/ctu.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/debugfs.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/debugfs.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/dma.c</a></td><td class='right'>883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/dvc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/dvc.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/gen.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/gen.c</a></td><td class='right'>495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/mix.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/mix.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/msiof.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/msiof.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/rsnd.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/rsnd.h</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/src.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/src.c</a></td><td class='right'>793</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/ssi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/ssi.c</a></td><td class='right'>1252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rcar/ssiu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rcar/ssiu.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/rz-ssi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/rz-ssi.c</a></td><td class='right'>1287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/sh7760-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/sh7760-ac97.c</a> (renamed from sound/soc/sh/sh7760-ac97.c)</td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/siu.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/siu.h</a> (renamed from sound/soc/sh/siu.h)</td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/siu_dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/siu_dai.c</a> (renamed from sound/soc/sh/siu_dai.c)</td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/siu_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/siu_pcm.c</a> (renamed from sound/soc/sh/siu_pcm.c)</td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/renesas/ssi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/renesas/ssi.c</a> (renamed from sound/soc/sh/ssi.c)</td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/Kconfig</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rk3288_hdmi_analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rk3288_hdmi_analog.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rk3399_gru_sound.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rk3399_gru_sound.c</a></td><td class='right'>627</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_i2s.c</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_i2s.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_i2s_tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_i2s_tdm.c</a></td><td class='right'>1435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_i2s_tdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_i2s_tdm.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_max98090.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_max98090.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_pdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_pdm.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_pdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_pdm.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_rt5645.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_rt5645.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_sai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_sai.c</a></td><td class='right'>1529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_sai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_sai.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_spdif.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/rockchip/rockchip_spdif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/rockchip/rockchip_spdif.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/Kconfig</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/Makefile</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/aquila_wm8994.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/aquila_wm8994.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/goni_wm8994.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/goni_wm8994.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/jive_wm8750.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/jive_wm8750.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/lm4857.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/lm4857.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/ln2440sbc_alc650.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/ln2440sbc_alc650.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/neo1973_gta02_wm8753.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/neo1973_gta02_wm8753.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/neo1973_wm8753.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/neo1973_wm8753.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/regs-i2s-v2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/regs-i2s-v2.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/rx1950_uda1380.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/rx1950_uda1380.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-ac97.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-ac97.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-ac97.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-dma.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-dma.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-i2s-v2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-i2s-v2.c</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-i2s-v2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-i2s-v2.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c-pcm.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c2412-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c2412-i2s.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c2412-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c2412-i2s.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx-i2s.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx-i2s.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx_simtec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx_simtec.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx_simtec.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx_simtec.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx_simtec_hermes.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c24xx_uda134x.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c24xx_uda134x.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c64xx-i2s-v4.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c64xx-i2s-v4.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c64xx-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c64xx-i2s.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/s3c64xx-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/s3c64xx-i2s.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/smartq_wm8987.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/smartq_wm8987.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/smdk2443_wm9710.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/smdk2443_wm9710.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/smdk64xx_wm8580.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/smdk64xx_wm8580.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s3c24xx/smdk_wm9713.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s3c24xx/smdk_wm9713.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/s6000-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/s6000-i2s.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/s6000-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/s6000-i2s.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/s6000-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/s6000-pcm.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/s6000-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/s6000-pcm.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/s6000/s6105-ipcam.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/s6000/s6105-ipcam.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/Kconfig</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/Makefile</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/aries_wm8994.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/aries_wm8994.c</a></td><td class='right'>702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/arndale.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/arndale.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/bells.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/bells.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/dma.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/dmaengine.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/dmaengine.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/i2s-regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/i2s-regs.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/i2s.c</a></td><td class='right'>1754</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/i2s.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/idma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/idma.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/idma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/idma.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/littlemill.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/littlemill.c</a></td><td class='right'>360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/lowland.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/lowland.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/midas_wm1811.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/midas_wm1811.c</a></td><td class='right'>775</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/odroid.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/odroid.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/pcm.c</a> (renamed from sound/soc/s3c24xx/s3c-pcm.c)</td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/pcm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/smdk_spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/smdk_spdif.c</a> (renamed from sound/soc/s3c24xx/smdk_spdif.c)</td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/smdk_wm8994.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/smdk_wm8994.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/smdk_wm8994pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/smdk_wm8994pcm.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/snow.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/snow.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/spdif.c</a> (renamed from sound/soc/s3c24xx/spdif.c)</td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/spdif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/spdif.h</a> (renamed from sound/soc/s3c24xx/spdif.h)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/speyside.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/speyside.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/tm2_wm5110.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/tm2_wm5110.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/samsung/tobermory.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/samsung/tobermory.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/Kconfig</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_asoc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_asoc.c</a></td><td class='right'>1559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_class.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_class.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_class.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_class.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_class_function.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_class_function.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_device.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_fdl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_fdl.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_function_device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_function_device.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_function_device.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_function_device.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_functions.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_functions.c</a></td><td class='right'>2282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_hid.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_hid.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_interrupts.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_interrupts.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_regmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_regmap.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdca/sdca_ump.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdca/sdca_ump.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_cs42l42.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_cs42l42.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_cs42l43.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_cs42l43.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_cs42l45.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_cs42l45.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_cs_amp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_cs_amp.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_dmic.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_maxim.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_maxim.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt5682.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt5682.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt700.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt700.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt711.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt711.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt_amp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt_amp.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt_dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt_dmic.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_ti_amp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_ti_amp.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sdw_utils/soc_sdw_utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sdw_utils/soc_sdw_utils.c</a></td><td class='right'>1612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/sh/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sh/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/sh/fsi-ak4642.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sh/fsi-ak4642.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/sh/fsi-da7210.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sh/fsi-da7210.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/sh/fsi-hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sh/fsi-hdmi.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/sh/fsi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sh/fsi.c</a></td><td class='right'>1294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-ac97.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-acpi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-acpi.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-cache.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-cache.c</a></td><td class='right'>726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-card-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-card-test.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-card.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-component.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-component.c</a></td><td class='right'>1300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-compress.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-compress.c</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-core.c</a></td><td class='right'>5643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.4%;'/><td class='rem' style='width: 12.9%;'/><td class='none' style='width: 71.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-dai.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-dapm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-dapm.c</a></td><td class='right'>5228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.9%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 73.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-devres.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-devres.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-generic-dmaengine-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-generic-dmaengine-pcm.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-jack.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-link.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-link.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-ops-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-ops-test.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-ops.c</a></td><td class='right'>843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-pcm.c</a></td><td class='right'>3004</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-topology-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-topology-test.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-topology.c</a></td><td class='right'>2209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-usb.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-usb.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-utils-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-utils-test.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/soc/soc-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/soc-utils.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/Kconfig</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/Makefile</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/Kconfig</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-common.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-dsp-offset.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-dsp-offset.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-ipc.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-loader.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-pcm.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-probes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-probes.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-stream.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp-trace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp-trace.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp.c</a></td><td class='right'>968</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp.h</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp63.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp63.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/acp70.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/acp70.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/pci-acp63.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/pci-acp63.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/pci-acp70.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/pci-acp70.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/pci-rmb.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/pci-rmb.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/pci-rn.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/pci-rn.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/pci-vangogh.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/pci-vangogh.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/rembrandt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/rembrandt.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/renoir.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/renoir.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/amd/vangogh.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/amd/vangogh.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/compress.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/compress.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/control.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/core.c</a></td><td class='right'>843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/debug.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/debug.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/fw-file-profile.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/fw-file-profile.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/imx-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/imx-common.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/imx-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/imx-common.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/imx8.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/imx8.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/imx/imx9.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/imx/imx9.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/Kconfig</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/Makefile</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/apl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/apl.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/atom.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/atom.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/atom.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/atom.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/bdw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/bdw.c</a></td><td class='right'>698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/byt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/byt.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/cnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/cnl.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/ext_manifest.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/ext_manifest.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-bus.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-bus.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-codec.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-common-ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-common-ops.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-ctrl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-ctrl.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-dai-ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-dai-ops.c</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-dai.c</a></td><td class='right'>942</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-dsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-dsp.c</a></td><td class='right'>1635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-ipc.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-ipc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-ipc.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-loader-skl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-loader-skl.c</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-loader.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-mlink.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-mlink.c</a></td><td class='right'>1120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-pcm.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-probes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-probes.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-sdw-bpt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-sdw-bpt.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-stream.c</a></td><td class='right'>1213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda-trace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda-trace.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda.c</a></td><td class='right'>1757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/hda.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/hda.h</a></td><td class='right'>1056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/icl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/icl.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/lnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/lnl.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/lnl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/lnl.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/mtl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/mtl.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/mtl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/mtl.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/nvl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/nvl.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/nvl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/nvl.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-apl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-apl.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-cnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-cnl.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-icl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-icl.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-lnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-lnl.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-mtl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-mtl.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-nvl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-nvl.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-ptl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-ptl.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-skl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-skl.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-tgl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-tgl.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/pci-tng.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/pci-tng.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/ptl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/ptl.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/ptl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/ptl.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/shim.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/shim.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/skl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/skl.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/telemetry.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/telemetry.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/telemetry.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/telemetry.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/tgl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/tgl.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/intel/tracepoints.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/intel/tracepoints.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/iomem-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/iomem-utils.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-control.c</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-dtrace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-dtrace.c</a></td><td class='right'>664</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-loader.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-pcm.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-priv.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-priv.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3-topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3-topology.c</a></td><td class='right'>2713</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc3.c</a></td><td class='right'>1157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-control.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-fw-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-fw-reg.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-loader.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-mtrace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-mtrace.c</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-pcm.c</a></td><td class='right'>1324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-priv.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-priv.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-telemetry.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-telemetry.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-telemetry.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-telemetry.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-topology.c</a></td><td class='right'>3809</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4-topology.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4-topology.h</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ipc4.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ipc4.c</a></td><td class='right'>906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/loader.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/adsp_helper.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/adsp_helper.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/mt8186-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/mt8186-clk.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/mt8186-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/mt8186-clk.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/mt8186-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/mt8186-loader.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/mt8186.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/mt8186.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8186/mt8186.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8186/mt8186.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/mt8195-clk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/mt8195-clk.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/mt8195-clk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/mt8195-clk.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/mt8195-loader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/mt8195-loader.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/mt8195.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/mt8195.c</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mt8195/mt8195.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mt8195/mt8195.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mtk-adsp-common.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mtk-adsp-common.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/mediatek/mtk-adsp-common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/mediatek/mtk-adsp-common.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/nocodec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/nocodec.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ops.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/ops.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/ops.h</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/pcm.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/pm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/pm.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-acpi-dev.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-acpi-dev.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-acpi-dev.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-acpi-dev.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-audio.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-audio.h</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-ipc-flood-test.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-ipc-flood-test.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-ipc-kernel-injector.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-ipc-kernel-injector.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-ipc-msg-injector.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-ipc-msg-injector.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-probes-ipc3.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-probes-ipc3.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-probes-ipc4.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-probes-ipc4.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-probes.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-probes.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client-probes.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client-probes.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-client.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-client.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-of-dev.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-of-dev.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-of-dev.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-of-dev.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-pci-dev.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-pci-dev.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-pci-dev.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-pci-dev.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-priv.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-priv.h</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-utils.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-utils.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/sof-utils.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/sof-utils.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/stream-ipc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/stream-ipc.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/topology.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/topology.c</a></td><td class='right'>2581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/trace.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/trace.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/xtensa/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/xtensa/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/xtensa/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/xtensa/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sof/xtensa/core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sof/xtensa/core.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spacemit/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spacemit/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spacemit/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spacemit/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spacemit/k1_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spacemit/k1_i2s.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spdif_in.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spdif_in.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spdif_in_regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spdif_in_regs.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spdif_out.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spdif_out.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spdif_out_regs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spdif_out_regs.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spear_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spear_pcm.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/spear/spear_pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/spear/spear_pcm.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/sprd-mcdt.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/sprd-mcdt.c</a></td><td class='right'>1006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/sprd-mcdt.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/sprd-mcdt.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/sprd-pcm-compress.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/sprd-pcm-compress.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/sprd-pcm-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/sprd-pcm-dma.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sprd/sprd-pcm-dma.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sprd/sprd-pcm-dma.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/starfive/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/starfive/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/starfive/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/starfive/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/starfive/jh7110_pwmdac.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/starfive/jh7110_pwmdac.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/starfive/jh7110_tdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/starfive/jh7110_tdm.c</a></td><td class='right'>662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/sti_uniperif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/sti_uniperif.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/uniperif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/uniperif.h</a></td><td class='right'>1417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/uniperif_player.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/uniperif_player.c</a></td><td class='right'>1149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sti/uniperif_reader.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sti/uniperif_reader.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_adfsdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_adfsdm.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_i2s.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_sai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_sai.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_sai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_sai.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_sai_sub.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_sai_sub.c</a></td><td class='right'>1799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/stm/stm32_spdifrx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/stm/stm32_spdifrx.c</a></td><td class='right'>1081</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/Kconfig</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun4i-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun4i-codec.c</a></td><td class='right'>2457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun4i-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun4i-i2s.c</a></td><td class='right'>1699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun4i-spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun4i-spdif.c</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun50i-codec-analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun50i-codec-analog.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun50i-dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun50i-dmic.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun8i-adda-pr-regmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun8i-adda-pr-regmap.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun8i-adda-pr-regmap.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun8i-adda-pr-regmap.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun8i-codec-analog.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun8i-codec-analog.c</a></td><td class='right'>853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/sunxi/sun8i-codec.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/sunxi/sun8i-codec.c</a></td><td class='right'>1720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/Kconfig</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/Makefile</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra186_asrc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra186_asrc.c</a></td><td class='right'>1052</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra186_asrc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra186_asrc.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra186_dspk.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra186_dspk.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra186_dspk.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra186_dspk.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_ac97.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_ac97.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_ac97.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_das.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_das.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_i2s.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_i2s.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_spdif.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra20_spdif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra20_spdif.h</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_admaif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_admaif.c</a></td><td class='right'>1045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_admaif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_admaif.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_adx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_adx.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_adx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_adx.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_ahub.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_ahub.c</a></td><td class='right'>2272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_ahub.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_ahub.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_amx.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_amx.c</a></td><td class='right'>801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_amx.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_amx.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_dmic.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_dmic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_dmic.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_i2s.c</a></td><td class='right'>1172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_i2s.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mbdrc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mbdrc.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mbdrc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mbdrc.h</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mixer.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mixer.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mvc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mvc.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_mvc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_mvc.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_ope.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_ope.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_ope.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_ope.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_peq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_peq.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_peq.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_peq.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_sfc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_sfc.c</a></td><td class='right'>3644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra210_sfc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra210_sfc.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra30_ahub.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra30_ahub.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra30_ahub.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra30_ahub.h</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra30_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra30_i2s.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra30_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra30_i2s.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_asoc_machine.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_asoc_machine.c</a></td><td class='right'>1026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_asoc_machine.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_asoc_machine.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_audio_graph_card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_audio_graph_card.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_cif.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_cif.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_isomgr_bw.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_isomgr_bw.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_isomgr_bw.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_isomgr_bw.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_pcm.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_pcm.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/tegra/tegra_wm8903.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/tegra/tegra_wm8903.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/Kconfig</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/Makefile</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/ams-delta.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/ams-delta.c</a> (renamed from sound/soc/omap/ams-delta.c)</td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/davinci-evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/davinci-evm.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/davinci-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/davinci-i2s.c</a> (renamed from sound/soc/davinci/davinci-i2s.c)</td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/davinci-i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/davinci-i2s.h</a> (renamed from sound/soc/davinci/davinci-i2s.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/davinci-mcasp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/davinci-mcasp.c</a></td><td class='right'>2552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/davinci-mcasp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/davinci-mcasp.h</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/edma-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/edma-pcm.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/edma-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/edma-pcm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/j721e-evm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/j721e-evm.c</a></td><td class='right'>938</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/n810.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/n810.c</a> (renamed from sound/soc/omap/n810.c)</td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-abe-twl6040.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-abe-twl6040.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-dmic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-dmic.c</a></td><td class='right'>527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-dmic.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-dmic.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-hdmi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-hdmi.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcbsp-priv.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcbsp-priv.h</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcbsp-st.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcbsp-st.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcbsp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcbsp.c</a></td><td class='right'>1441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcbsp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcbsp.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcpdm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcpdm.c</a></td><td class='right'>605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-mcpdm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-mcpdm.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap-twl4030.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap-twl4030.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/omap3pandora.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/omap3pandora.c</a> (renamed from sound/soc/omap/omap3pandora.c)</td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/osk5912.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/osk5912.c</a> (renamed from sound/soc/omap/osk5912.c)</td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/rx51.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/rx51.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/sdma-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/sdma-pcm.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/sdma-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/sdma-pcm.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/udma-pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/udma-pcm.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ti/udma-pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ti/udma-pcm.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/txx9aclc-ac97.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/txx9aclc-ac97.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/txx9aclc-generic.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/txx9aclc-generic.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/txx9aclc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/txx9aclc.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/soc/txx9/txx9aclc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/txx9/txx9aclc.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-compress.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-compress.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-core.c</a></td><td class='right'>1266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-cpu.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-cpu.c</a></td><td class='right'>832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-dma.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-dma.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-ld11.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-ld11.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-pxs2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-pxs2.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio-reg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio-reg.h</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/aio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/aio.h</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/uniphier/evea.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/uniphier/evea.c</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/mop500.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/mop500.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/mop500_ab8500.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/mop500_ab8500.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/mop500_ab8500.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/mop500_ab8500.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_msp_dai.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_msp_dai.c</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_msp_dai.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_msp_dai.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_msp_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_msp_i2s.c</a></td><td class='right'>667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_msp_i2s.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_msp_i2s.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_pcm.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/ux500/ux500_pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/ux500/ux500_pcm.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xilinx/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xilinx/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xilinx/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xilinx/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xilinx/xlnx_formatter_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xilinx/xlnx_formatter_pcm.c</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xilinx/xlnx_i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xilinx/xlnx_i2s.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xilinx/xlnx_spdif.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xilinx/xlnx_spdif.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xtensa/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xtensa/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xtensa/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xtensa/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/soc/xtensa/xtfpga-i2s.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/soc/xtensa/xtfpga-i2s.c</a></td><td class='right'>650</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sound_core.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sound_core.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/sound_firmware.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sound_firmware.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sparc/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sparc/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sparc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sparc/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sparc/amd7930.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sparc/amd7930.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sparc/cs4231.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sparc/cs4231.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/sparc/dbri.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/sparc/dbri.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/spi/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/spi/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/spi/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/spi/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/spi/at73c213.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/spi/at73c213.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/spi/at73c213.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/spi/at73c213.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/synth/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_effect.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_effect.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_hwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_hwdep.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_nrpn.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_nrpn.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_oss.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_oss.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_proc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_seq.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_seq.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_synth.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_synth.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/emux_voice.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/emux_voice.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/emux/soundfont.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/emux/soundfont.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/synth/util_mem.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/synth/util_mem.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/chip.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/chip.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/chip.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/chip.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/comm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/comm.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/comm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/comm.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/common.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/common.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/control.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/control.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/control.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/firmware.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/firmware.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/firmware.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/firmware.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/midi.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/midi.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/pcm.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/6fire/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/6fire/pcm.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/Kconfig</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/Makefile</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/bcd2000/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/bcd2000/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/bcd2000/bcd2000.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/bcd2000/bcd2000.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/audio.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/audio.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/control.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/control.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/control.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/control.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/device.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/device.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/device.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/device.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/input.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/input.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/input.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/input.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/midi.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/caiaq/midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/caiaq/midi.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/card.c</a></td><td class='right'>1190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/card.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/card.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/clock.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/clock.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/clock.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/clock.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/usb/debug.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/debug.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/endpoint.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/endpoint.c</a></td><td class='right'>2101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/endpoint.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/endpoint.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/fcp.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/fcp.c</a></td><td class='right'>1127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/fcp.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/fcp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/format.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/format.c</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/format.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/format.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/helper.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/helper.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/helper.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/helper.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/hiface/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/hiface/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/hiface/chip.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/hiface/chip.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/hiface/chip.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/hiface/chip.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/hiface/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/hiface/pcm.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/hiface/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/hiface/pcm.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/implicit.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/implicit.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/implicit.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/implicit.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/Kconfig</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/capture.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/capture.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/capture.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/capture.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/driver.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/driver.c</a></td><td class='right'>900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/driver.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/driver.h</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/midi.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/midi.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/midibuf.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/midibuf.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/midibuf.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/midibuf.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/pcm.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/pcm.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/playback.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/playback.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/playback.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/playback.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/pod.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/pod.c</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/podhd.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/podhd.c</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/toneport.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/toneport.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/line6/variax.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/line6/variax.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/media.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/media.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/media.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/media.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/midi.c</a></td><td class='right'>1124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/midi.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/midi.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/midi2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/midi2.c</a></td><td class='right'>1233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/midi2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/midi2.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/misc/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/misc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/misc/ua101.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/misc/ua101.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer.c</a></td><td class='right'>2918</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.2%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_maps.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_maps.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_quirks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_quirks.c</a></td><td class='right'>4467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 21.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 77.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_quirks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_quirks.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_s1810c.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_s1810c.c</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_s1810c.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_s1810c.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_scarlett.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_scarlett.c</a></td><td class='right'>1016</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_scarlett.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_scarlett.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_scarlett2.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_scarlett2.c</a></td><td class='right'>9434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 47.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 52.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_scarlett2.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_scarlett2.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_us16x08.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_us16x08.c</a></td><td class='right'>1413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/mixer_us16x08.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/mixer_us16x08.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/pcm.c</a></td><td class='right'>1823</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/pcm.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/power.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/power.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/power.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/power.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/proc.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/proc.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/proc.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/proc.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/mixer_usb_offload.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/mixer_usb_offload.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/mixer_usb_offload.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/mixer_usb_offload.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/qc_audio_offload.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/qc_audio_offload.c</a></td><td class='right'>1993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/usb_audio_qmi_v01.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/usb_audio_qmi_v01.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/qcom/usb_audio_qmi_v01.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/qcom/usb_audio_qmi_v01.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/quirks-table.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/quirks-table.h</a></td><td class='right'>3925</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 80.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/quirks.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/quirks.c</a></td><td class='right'>2303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 88.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/quirks.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/quirks.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/stream.c</a></td><td class='right'>1292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/stream.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/stream.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/usb/urb.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/urb.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/sound/usb/urb.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/urb.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usbaudio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usbaudio.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us122l.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us122l.c</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us122l.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us122l.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii.h</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_capture.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_capture.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_controls.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_controls.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_midi.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_midi.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_pcm.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_pcm.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/us144mkii_playback.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/us144mkii_playback.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usX2Yhwdep.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usX2Yhwdep.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usX2Yhwdep.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usX2Yhwdep.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usb_stream.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usb_stream.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usb_stream.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usb_stream.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usbus428ctldefs.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usbus428ctldefs.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usbusx2y.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usbusx2y.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usbusx2y.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usbusx2y.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usbusx2yaudio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usbusx2yaudio.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usx2y.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usx2y.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usx2yhwdeppcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usx2yhwdeppcm.c</a></td><td class='right'>770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/sound/usb/usx2y/usx2yhwdeppcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/usx2y/usx2yhwdeppcm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/usb/validate.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/usb/validate.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_card.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_card.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_card.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_card.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_chmap.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_chmap.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_ctl_msg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_ctl_msg.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_ctl_msg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_ctl_msg.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_jack.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_jack.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_kctl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_kctl.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_pcm.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_pcm.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_pcm.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_pcm.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_pcm_msg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_pcm_msg.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/virtio/virtio_pcm_ops.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/virtio/virtio_pcm_ops.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/x86/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/x86/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/x86/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/x86/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/x86/intel_hdmi_audio.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/x86/intel_hdmi_audio.c</a></td><td class='right'>1832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/x86/intel_hdmi_audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/x86/intel_hdmi_audio.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/x86/intel_hdmi_lpe_audio.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/x86/intel_hdmi_lpe_audio.h</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/Kconfig?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/Makefile?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_alsa.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_alsa.c</a></td><td class='right'>833</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_alsa.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_alsa.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_cfg.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_cfg.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_cfg.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_cfg.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_evtchnl.c?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_evtchnl.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/sound/xen/xen_snd_front_evtchnl.h?id2=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/xen/xen_snd_front_evtchnl.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>3207 files changed, 1251919 insertions, 255961 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/sound/Kconfig b/sound/Kconfig<br/>index fcad760f5691..8b40205394fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/Kconfig</a></div><div class='hunk'>@@ -1,27 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> menuconfig SOUND</div><div class='ctx'> 	tristate "Sound card support"</div><div class='del'>-	depends on HAS_IOMEM</div><div class='add'>+	depends on HAS_IOMEM || INDIRECT_IOMEM</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you have a sound card in your computer, i.e. if it can say more</div><div class='del'>-	  than an occasional beep, say Y.  Be sure to have all the information</div><div class='del'>-	  about your sound card and its configuration down (I/O port,</div><div class='del'>-	  interrupt and DMA channel), because you will be asked for it.</div><div class='del'>-</div><div class='del'>-	  You want to read the Sound-HOWTO, available from</div><div class='del'>-	  &lt;http://www.tldp.org/docs.html#howto&gt;. General information about</div><div class='del'>-	  the modular sound system is contained in the files</div><div class='del'>-	  &lt;file:Documentation/sound/oss/Introduction&gt;.  The file</div><div class='del'>-	  &lt;file:Documentation/sound/oss/README.OSS&gt; contains some slightly</div><div class='del'>-	  outdated but still useful information as well.  Newer sound</div><div class='del'>-	  driver documentation is found in &lt;file:Documentation/sound/alsa/*&gt;.</div><div class='del'>-</div><div class='del'>-	  If you have a PnP sound card and you want to configure it at boot</div><div class='del'>-	  time using the ISA PnP tools (read</div><div class='del'>-	  &lt;http://www.roestock.demon.co.uk/isapnptools/&gt;), then you need to</div><div class='del'>-	  compile the sound card support as a module and load that module</div><div class='del'>-	  after the PnP configuration is finished.  To do this, choose M here</div><div class='del'>-	  and read &lt;file:Documentation/sound/oss/README.modules&gt;; the module</div><div class='del'>-	  will be called soundcore.</div><div class='add'>+	  than an occasional beep, say Y.</div><div class='ctx'> </div><div class='ctx'> if SOUND</div><div class='ctx'> </div><div class='hunk'>@@ -52,15 +35,10 @@ config SOUND_OSS_CORE_PRECLAIM</div><div class='ctx'> </div><div class='ctx'> 	  Disabling this allows alternative OSS implementations.</div><div class='ctx'> </div><div class='del'>-	  Please read Documentation/feature-removal-schedule.txt for</div><div class='del'>-	  details.</div><div class='del'>-</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> source "sound/oss/dmasound/Kconfig"</div><div class='ctx'> </div><div class='del'>-if !M68K</div><div class='del'>-</div><div class='ctx'> menuconfig SND</div><div class='ctx'> 	tristate "Advanced Linux Sound Architecture"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -79,8 +57,12 @@ source "sound/isa/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "sound/pci/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "sound/hda/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "sound/ppc/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "sound/ac97/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "sound/aoa/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "sound/arm/Kconfig"</div><div class='hunk'>@@ -97,6 +79,8 @@ source "sound/sh/Kconfig"</div><div class='ctx'> # here assuming USB is defined before ALSA</div><div class='ctx'> source "sound/usb/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "sound/firewire/Kconfig"</div><div class='add'>+</div><div class='ctx'> # the following will depend on the order of config.</div><div class='ctx'> # here assuming PCMCIA is defined before ALSA</div><div class='ctx'> source "sound/pcmcia/Kconfig"</div><div class='hunk'>@@ -107,25 +91,18 @@ source "sound/parisc/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "sound/soc/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif # SND</div><div class='del'>-</div><div class='del'>-menuconfig SOUND_PRIME</div><div class='del'>-	tristate "Open Sound System (DEPRECATED)"</div><div class='del'>-	select SOUND_OSS_CORE</div><div class='del'>-	help</div><div class='del'>-	  Say 'Y' or 'M' to enable Open Sound System drivers.</div><div class='add'>+source "sound/x86/Kconfig"</div><div class='ctx'> </div><div class='del'>-if SOUND_PRIME</div><div class='add'>+source "sound/synth/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "sound/oss/Kconfig"</div><div class='add'>+source "sound/xen/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif # SOUND_PRIME</div><div class='add'>+source "sound/virtio/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif # !M68K</div><div class='add'>+endif # SND</div><div class='ctx'> </div><div class='ctx'> endif # SOUND</div><div class='ctx'> </div><div class='del'>-# AC97_BUS is used from both sound and ucb1400</div><div class='ctx'> config AC97_BUS</div><div class='ctx'> 	tristate</div><div class='ctx'> 	help</div><div class='head'>diff --git a/sound/Makefile b/sound/Makefile<br/>index ec467decfa79..5942311a4232 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/Makefile</a></div><div class='hunk'>@@ -1,19 +1,20 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> # Makefile for the Linux sound card driver</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SOUND) += soundcore.o</div><div class='del'>-obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o</div><div class='del'>-obj-$(CONFIG_SOUND_PRIME) += oss/</div><div class='del'>-obj-$(CONFIG_DMASOUND) += oss/</div><div class='add'>+obj-$(CONFIG_DMASOUND) += oss/dmasound/</div><div class='ctx'> obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \</div><div class='del'>-	sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/</div><div class='add'>+	firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/ x86/ xen/ \</div><div class='add'>+	virtio/</div><div class='ctx'> obj-$(CONFIG_SND_AOA) += aoa/</div><div class='ctx'> </div><div class='ctx'> # This one must be compilable even if sound is configured out</div><div class='ctx'> obj-$(CONFIG_AC97_BUS) += ac97_bus.o</div><div class='add'>+obj-$(CONFIG_AC97_BUS_NEW) += ac97/</div><div class='ctx'> </div><div class='ctx'> ifeq ($(CONFIG_SND),y)</div><div class='ctx'>   obj-y += last.o</div><div class='ctx'> endif</div><div class='ctx'> </div><div class='del'>-soundcore-objs  := sound_core.o</div><div class='add'>+soundcore-y  := sound_core.o</div><div class='head'>diff --git a/sound/ac97/Kconfig b/sound/ac97/Kconfig<br/>new file mode 100644<br/>index 000000000000..f0e31f2bb04d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# AC97 configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+config AC97_BUS_NEW</div><div class='add'>+	tristate</div><div class='add'>+	help</div><div class='add'>+	  This is the new AC97 bus type, successor of AC97_BUS. The ported</div><div class='add'>+	  drivers which benefit from the AC97 automatic probing should "select"</div><div class='add'>+	  this instead of the AC97_BUS.</div><div class='add'>+	  Say Y here if you want to have AC97 devices, which are sound oriented</div><div class='add'>+	  devices around an AC-Link.</div><div class='add'>+</div><div class='add'>+config AC97_BUS_COMPAT</div><div class='add'>+	bool</div><div class='add'>+	depends on AC97_BUS_NEW</div><div class='add'>+	depends on !AC97_BUS</div><div class='head'>diff --git a/sound/ac97/Makefile b/sound/ac97/Makefile<br/>new file mode 100644<br/>index 000000000000..f5efa1ad7e7f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# make for AC97 bus drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_AC97_BUS_NEW)	+= ac97.o</div><div class='add'>+</div><div class='add'>+ac97-y				+= bus.o codec.o</div><div class='add'>+ac97-$(CONFIG_AC97_BUS_COMPAT)	+= snd_ac97_compat.o</div><div class='head'>diff --git a/sound/ac97/ac97_core.h b/sound/ac97/ac97_core.h<br/>new file mode 100644<br/>index 000000000000..5a9677c3d4c3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/ac97_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/ac97_core.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,</div><div class='add'>+				   unsigned int codec_num);</div><div class='add'>+</div><div class='add'>+static inline bool ac97_ids_match(unsigned int id1, unsigned int id2,</div><div class='add'>+				  unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	return (id1 &amp; mask) == (id2 &amp; mask);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c<br/>new file mode 100644<br/>index 000000000000..f4254703d29f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/bus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/bus.c</a></div><div class='hunk'>@@ -0,0 +1,548 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2016 Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;sound/ac97_codec.h&gt;</div><div class='add'>+#include &lt;sound/ac97/codec.h&gt;</div><div class='add'>+#include &lt;sound/ac97/controller.h&gt;</div><div class='add'>+#include &lt;sound/ac97/regs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ac97_core.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Protects ac97_controllers and each ac97_controller structure.</div><div class='add'>+ */</div><div class='add'>+static DEFINE_MUTEX(ac97_controllers_mutex);</div><div class='add'>+static DEFINE_IDR(ac97_adapter_idr);</div><div class='add'>+static LIST_HEAD(ac97_controllers);</div><div class='add'>+</div><div class='add'>+static inline struct ac97_controller*</div><div class='add'>+to_ac97_controller(struct device *ac97_adapter)</div><div class='add'>+{</div><div class='add'>+	return container_of(ac97_adapter, struct ac97_controller, adap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_unbound_ctrl_write(struct ac97_controller *adrv, int slot,</div><div class='add'>+		     unsigned short reg, unsigned short val)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_unbound_ctrl_read(struct ac97_controller *adrv, int slot,</div><div class='add'>+				  unsigned short reg)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ac97_controller_ops ac97_unbound_ctrl_ops = {</div><div class='add'>+	.write = ac97_unbound_ctrl_write,</div><div class='add'>+	.read = ac97_unbound_ctrl_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ac97_controller ac97_unbound_ctrl = {</div><div class='add'>+	.ops = &amp;ac97_unbound_ctrl_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ac97_codec_device *</div><div class='add'>+ac97_codec_find(struct ac97_controller *ac97_ctrl, unsigned int codec_num)</div><div class='add'>+{</div><div class='add'>+	if (codec_num &gt;= AC97_BUS_MAX_CODECS)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	return ac97_ctrl-&gt;codecs[codec_num];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device_node *</div><div class='add'>+ac97_of_get_child_device(struct ac97_controller *ac97_ctrl, int idx,</div><div class='add'>+			 unsigned int vendor_id)</div><div class='add'>+{</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	u32 reg;</div><div class='add'>+	char compat[] = "ac97,0000,0000";</div><div class='add'>+</div><div class='add'>+	snprintf(compat, sizeof(compat), "ac97,%04x,%04x",</div><div class='add'>+		 vendor_id &gt;&gt; 16, vendor_id &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	for_each_child_of_node(ac97_ctrl-&gt;parent-&gt;of_node, node) {</div><div class='add'>+		if ((idx != of_property_read_u32(node, "reg", &amp;reg)) ||</div><div class='add'>+		    !of_device_is_compatible(node, compat))</div><div class='add'>+			continue;</div><div class='add'>+		return node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ac97_codec_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev;</div><div class='add'>+	struct ac97_controller *ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	adev = to_ac97_device(dev);</div><div class='add'>+	ac97_ctrl = adev-&gt;ac97_ctrl;</div><div class='add'>+	ac97_ctrl-&gt;codecs[adev-&gt;num] = NULL;</div><div class='add'>+	of_node_put(dev-&gt;of_node);</div><div class='add'>+	kfree(adev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx,</div><div class='add'>+		   unsigned int vendor_id)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *codec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	codec = kzalloc(sizeof(*codec), GFP_KERNEL);</div><div class='add'>+	if (!codec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ac97_ctrl-&gt;codecs[idx] = codec;</div><div class='add'>+	codec-&gt;vendor_id = vendor_id;</div><div class='add'>+	codec-&gt;dev.release = ac97_codec_release;</div><div class='add'>+	codec-&gt;dev.bus = &amp;ac97_bus_type;</div><div class='add'>+	codec-&gt;dev.parent = &amp;ac97_ctrl-&gt;adap;</div><div class='add'>+	codec-&gt;num = idx;</div><div class='add'>+	codec-&gt;ac97_ctrl = ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;codec-&gt;dev);</div><div class='add'>+	dev_set_name(&amp;codec-&gt;dev, "%s:%u", dev_name(ac97_ctrl-&gt;parent), idx);</div><div class='add'>+	codec-&gt;dev.of_node = ac97_of_get_child_device(ac97_ctrl, idx,</div><div class='add'>+						      vendor_id);</div><div class='add'>+</div><div class='add'>+	ret = device_add(&amp;codec-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		put_device(&amp;codec-&gt;dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,</div><div class='add'>+				   unsigned int codec_num)</div><div class='add'>+{</div><div class='add'>+	unsigned short vid1, vid2;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adrv-&gt;ops-&gt;read(adrv, codec_num, AC97_VENDOR_ID1);</div><div class='add'>+	vid1 = (ret &amp; 0xffff);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = adrv-&gt;ops-&gt;read(adrv, codec_num, AC97_VENDOR_ID2);</div><div class='add'>+	vid2 = (ret &amp; 0xffff);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;adrv-&gt;adap, "%s(codec_num=%u): vendor_id=0x%08x\n",</div><div class='add'>+		__func__, codec_num, AC97_ID(vid1, vid2));</div><div class='add'>+	return AC97_ID(vid1, vid2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_bus_scan(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	unsigned int vendor_id;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AC97_BUS_MAX_CODECS; i++) {</div><div class='add'>+		if (ac97_codec_find(ac97_ctrl, i))</div><div class='add'>+			continue;</div><div class='add'>+		if (!(ac97_ctrl-&gt;slots_available &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+		vendor_id = snd_ac97_bus_scan_one(ac97_ctrl, i);</div><div class='add'>+		if (!vendor_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ac97_codec_add(ac97_ctrl, i, vendor_id);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_bus_reset(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	ac97_ctrl-&gt;ops-&gt;reset(ac97_ctrl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_codec_driver_register - register an AC97 codec driver</div><div class='add'>+ * @drv: AC97 driver codec to register</div><div class='add'>+ *</div><div class='add'>+ * Register an AC97 codec driver to the ac97 bus driver, aka. the AC97 digital</div><div class='add'>+ * controller.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success or error code</div><div class='add'>+ */</div><div class='add'>+int snd_ac97_codec_driver_register(struct ac97_codec_driver *drv)</div><div class='add'>+{</div><div class='add'>+	drv-&gt;driver.bus = &amp;ac97_bus_type;</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_codec_driver_unregister - unregister an AC97 codec driver</div><div class='add'>+ * @drv: AC97 codec driver to unregister</div><div class='add'>+ *</div><div class='add'>+ * Unregister a previously registered ac97 codec driver.</div><div class='add'>+ */</div><div class='add'>+void snd_ac97_codec_driver_unregister(struct ac97_codec_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_codec_get_platdata - get platform_data</div><div class='add'>+ * @adev: the ac97 codec device</div><div class='add'>+ *</div><div class='add'>+ * For legacy platforms, in order to have platform_data in codec drivers</div><div class='add'>+ * available, while ac97 device are auto-created upon probe, this retrieves the</div><div class='add'>+ * platdata which was setup on ac97 controller registration.</div><div class='add'>+ *</div><div class='add'>+ * Returns the platform data pointer</div><div class='add'>+ */</div><div class='add'>+void *snd_ac97_codec_get_platdata(const struct ac97_codec_device *adev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_controller *ac97_ctrl = adev-&gt;ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	return ac97_ctrl-&gt;codecs_pdata[adev-&gt;num];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_codec_get_platdata);</div><div class='add'>+</div><div class='add'>+static void ac97_ctrl_codecs_unregister(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AC97_BUS_MAX_CODECS; i++)</div><div class='add'>+		if (ac97_ctrl-&gt;codecs[i]) {</div><div class='add'>+			ac97_ctrl-&gt;codecs[i]-&gt;ac97_ctrl = &amp;ac97_unbound_ctrl;</div><div class='add'>+			device_unregister(&amp;ac97_ctrl-&gt;codecs[i]-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cold_reset_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, const char *buf,</div><div class='add'>+				size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ac97_controller *ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ac97_controllers_mutex);</div><div class='add'>+	ac97_ctrl = to_ac97_controller(dev);</div><div class='add'>+	ac97_ctrl-&gt;ops-&gt;reset(ac97_ctrl);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_WO(cold_reset);</div><div class='add'>+</div><div class='add'>+static ssize_t warm_reset_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr, const char *buf,</div><div class='add'>+				size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ac97_controller *ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ac97_controllers_mutex);</div><div class='add'>+	ac97_ctrl = to_ac97_controller(dev);</div><div class='add'>+	ac97_ctrl-&gt;ops-&gt;warm_reset(ac97_ctrl);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_WO(warm_reset);</div><div class='add'>+</div><div class='add'>+static struct attribute *ac97_controller_device_attrs[] = {</div><div class='add'>+	&amp;dev_attr_cold_reset.attr,</div><div class='add'>+	&amp;dev_attr_warm_reset.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group ac97_adapter_attr_group = {</div><div class='add'>+	.name	= "ac97_operations",</div><div class='add'>+	.attrs	= ac97_controller_device_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *ac97_adapter_groups[] = {</div><div class='add'>+	&amp;ac97_adapter_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ac97_del_adapter(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	scoped_guard(mutex, &amp;ac97_controllers_mutex) {</div><div class='add'>+		ac97_ctrl_codecs_unregister(ac97_ctrl);</div><div class='add'>+		list_del(&amp;ac97_ctrl-&gt;controllers);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	device_unregister(&amp;ac97_ctrl-&gt;adap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ac97_adapter_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_controller *ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	ac97_ctrl = to_ac97_controller(dev);</div><div class='add'>+	idr_remove(&amp;ac97_adapter_idr, ac97_ctrl-&gt;nr);</div><div class='add'>+	dev_dbg(&amp;ac97_ctrl-&gt;adap, "adapter unregistered by %s\n",</div><div class='add'>+		dev_name(ac97_ctrl-&gt;parent));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct device_type ac97_adapter_type = {</div><div class='add'>+	.groups		= ac97_adapter_groups,</div><div class='add'>+	.release	= ac97_adapter_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ac97_controllers_mutex);</div><div class='add'>+	ret = idr_alloc(&amp;ac97_adapter_idr, ac97_ctrl, 0, 0, GFP_KERNEL);</div><div class='add'>+	ac97_ctrl-&gt;nr = ret;</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		dev_set_name(&amp;ac97_ctrl-&gt;adap, "ac97-%d", ret);</div><div class='add'>+		ac97_ctrl-&gt;adap.type = &amp;ac97_adapter_type;</div><div class='add'>+		ac97_ctrl-&gt;adap.parent = ac97_ctrl-&gt;parent;</div><div class='add'>+		ret = device_register(&amp;ac97_ctrl-&gt;adap);</div><div class='add'>+		if (ret)</div><div class='add'>+			put_device(&amp;ac97_ctrl-&gt;adap);</div><div class='add'>+	}</div><div class='add'>+	if (!ret) {</div><div class='add'>+		list_add(&amp;ac97_ctrl-&gt;controllers, &amp;ac97_controllers);</div><div class='add'>+		dev_dbg(&amp;ac97_ctrl-&gt;adap, "adapter registered by %s\n",</div><div class='add'>+			dev_name(ac97_ctrl-&gt;parent));</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_controller_register - register an ac97 controller</div><div class='add'>+ * @ops: the ac97 bus operations</div><div class='add'>+ * @dev: the device providing the ac97 DC function</div><div class='add'>+ * @slots_available: mask of the ac97 codecs that can be scanned and probed</div><div class='add'>+ *                   bit0 =&gt; codec 0, bit1 =&gt; codec 1 ... bit 3 =&gt; codec 3</div><div class='add'>+ * @codecs_pdata: codec platform data</div><div class='add'>+ *</div><div class='add'>+ * Register a digital controller which can control up to 4 ac97 codecs. This is</div><div class='add'>+ * the controller side of the AC97 AC-link, while the slave side are the codecs.</div><div class='add'>+ *</div><div class='add'>+ * Returns a valid controller upon success, negative pointer value upon error</div><div class='add'>+ */</div><div class='add'>+struct ac97_controller *snd_ac97_controller_register(</div><div class='add'>+	const struct ac97_controller_ops *ops, struct device *dev,</div><div class='add'>+	unsigned short slots_available, void **codecs_pdata)</div><div class='add'>+{</div><div class='add'>+	struct ac97_controller *ac97_ctrl;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ac97_ctrl = kzalloc(sizeof(*ac97_ctrl), GFP_KERNEL);</div><div class='add'>+	if (!ac97_ctrl)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AC97_BUS_MAX_CODECS &amp;&amp; codecs_pdata; i++)</div><div class='add'>+		ac97_ctrl-&gt;codecs_pdata[i] = codecs_pdata[i];</div><div class='add'>+</div><div class='add'>+	ac97_ctrl-&gt;ops = ops;</div><div class='add'>+	ac97_ctrl-&gt;slots_available = slots_available;</div><div class='add'>+	ac97_ctrl-&gt;parent = dev;</div><div class='add'>+	ret = ac97_add_adapter(ac97_ctrl);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	ac97_bus_reset(ac97_ctrl);</div><div class='add'>+	ac97_bus_scan(ac97_ctrl);</div><div class='add'>+</div><div class='add'>+	return ac97_ctrl;</div><div class='add'>+err:</div><div class='add'>+	kfree(ac97_ctrl);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_controller_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_controller_unregister - unregister an ac97 controller</div><div class='add'>+ * @ac97_ctrl: the device previously provided to ac97_controller_register()</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+void snd_ac97_controller_unregister(struct ac97_controller *ac97_ctrl)</div><div class='add'>+{</div><div class='add'>+	ac97_del_adapter(ac97_ctrl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_controller_unregister);</div><div class='add'>+</div><div class='add'>+static int ac97_pm_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *codec = to_ac97_device(dev);</div><div class='add'>+	int ret = pm_generic_runtime_suspend(dev);</div><div class='add'>+</div><div class='add'>+	if (ret == 0 &amp;&amp; dev-&gt;driver) {</div><div class='add'>+		if (pm_runtime_is_irq_safe(dev))</div><div class='add'>+			clk_disable(codec-&gt;clk);</div><div class='add'>+		else</div><div class='add'>+			clk_disable_unprepare(codec-&gt;clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_pm_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *codec = to_ac97_device(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver) {</div><div class='add'>+		if (pm_runtime_is_irq_safe(dev))</div><div class='add'>+			ret = clk_enable(codec-&gt;clk);</div><div class='add'>+		else</div><div class='add'>+			ret = clk_prepare_enable(codec-&gt;clk);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pm_generic_runtime_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops ac97_pm = {</div><div class='add'>+	.suspend	= pm_generic_suspend,</div><div class='add'>+	.resume		= pm_generic_resume,</div><div class='add'>+	.freeze		= pm_generic_freeze,</div><div class='add'>+	.thaw		= pm_generic_thaw,</div><div class='add'>+	.poweroff	= pm_generic_poweroff,</div><div class='add'>+	.restore	= pm_generic_restore,</div><div class='add'>+	RUNTIME_PM_OPS(ac97_pm_runtime_suspend, ac97_pm_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ac97_get_enable_clk(struct ac97_codec_device *adev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adev-&gt;clk = clk_get(&amp;adev-&gt;dev, "ac97_clk");</div><div class='add'>+	if (IS_ERR(adev-&gt;clk))</div><div class='add'>+		return PTR_ERR(adev-&gt;clk);</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(adev-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		clk_put(adev-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ac97_put_disable_clk(struct ac97_codec_device *adev)</div><div class='add'>+{</div><div class='add'>+	clk_disable_unprepare(adev-&gt;clk);</div><div class='add'>+	clk_put(adev-&gt;clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t vendor_id_show(struct device *dev,</div><div class='add'>+			      struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *codec = to_ac97_device(dev);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%08x", codec-&gt;vendor_id);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(vendor_id);</div><div class='add'>+</div><div class='add'>+static struct attribute *ac97_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_vendor_id.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+ATTRIBUTE_GROUPS(ac97_dev);</div><div class='add'>+</div><div class='add'>+static int ac97_bus_match(struct device *dev, const struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(dev);</div><div class='add'>+	const struct ac97_codec_driver *adrv = to_ac97_driver(drv);</div><div class='add'>+	const struct ac97_id *id = adrv-&gt;id_table;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (adev-&gt;vendor_id == 0x0 || adev-&gt;vendor_id == 0xffffffff)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (ac97_ids_match(id[i].id, adev-&gt;vendor_id, id[i].mask))</div><div class='add'>+			return true;</div><div class='add'>+	} while (id[i++].id);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ac97_bus_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(dev);</div><div class='add'>+	struct ac97_codec_driver *adrv = to_ac97_driver(dev-&gt;driver);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ac97_get_enable_clk(adev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_noresume(dev);</div><div class='add'>+	pm_runtime_set_active(dev);</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='add'>+</div><div class='add'>+	ret = adrv-&gt;probe(adev);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+	pm_runtime_set_suspended(dev);</div><div class='add'>+	pm_runtime_put_noidle(dev);</div><div class='add'>+	ac97_put_disable_clk(adev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ac97_bus_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(dev);</div><div class='add'>+	struct ac97_codec_driver *adrv = to_ac97_driver(dev-&gt;driver);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	adrv-&gt;remove(adev);</div><div class='add'>+	pm_runtime_put_noidle(dev);</div><div class='add'>+	ac97_put_disable_clk(adev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bus_type ac97_bus_type = {</div><div class='add'>+	.name		= "ac97bus",</div><div class='add'>+	.dev_groups	= ac97_dev_groups,</div><div class='add'>+	.match		= ac97_bus_match,</div><div class='add'>+	.pm		= pm_ptr(&amp;ac97_pm),</div><div class='add'>+	.probe		= ac97_bus_probe,</div><div class='add'>+	.remove		= ac97_bus_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init ac97_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	return bus_register(&amp;ac97_bus_type);</div><div class='add'>+}</div><div class='add'>+subsys_initcall(ac97_bus_init);</div><div class='add'>+</div><div class='add'>+static void __exit ac97_bus_exit(void)</div><div class='add'>+{</div><div class='add'>+	bus_unregister(&amp;ac97_bus_type);</div><div class='add'>+}</div><div class='add'>+module_exit(ac97_bus_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("AC97 bus interface");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;");</div><div class='head'>diff --git a/sound/ac97/codec.c b/sound/ac97/codec.c<br/>new file mode 100644<br/>index 000000000000..1c8357ad6cb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/codec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/codec.c</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2016 Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/ac97_codec.h&gt;</div><div class='add'>+#include &lt;sound/ac97/codec.h&gt;</div><div class='add'>+#include &lt;sound/ac97/controller.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;	/* For compat_ac97_* */</div><div class='add'>+</div><div class='head'>diff --git a/sound/ac97/snd_ac97_compat.c b/sound/ac97/snd_ac97_compat.c<br/>new file mode 100644<br/>index 000000000000..d2479bba75bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97/snd_ac97_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97/snd_ac97_compat.c</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2016 Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/ac97/codec.h&gt;</div><div class='add'>+#include &lt;sound/ac97/compat.h&gt;</div><div class='add'>+#include &lt;sound/ac97/controller.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ac97_core.h"</div><div class='add'>+</div><div class='add'>+static void compat_ac97_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(to_ac97_t(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void compat_ac97_reset(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(ac97-&gt;private_data);</div><div class='add'>+	struct ac97_controller *actrl = adev-&gt;ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	if (actrl-&gt;ops-&gt;reset)</div><div class='add'>+		actrl-&gt;ops-&gt;reset(actrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void compat_ac97_warm_reset(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(ac97-&gt;private_data);</div><div class='add'>+	struct ac97_controller *actrl = adev-&gt;ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	if (actrl-&gt;ops-&gt;warm_reset)</div><div class='add'>+		actrl-&gt;ops-&gt;warm_reset(actrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void compat_ac97_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='add'>+			      unsigned short val)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(ac97-&gt;private_data);</div><div class='add'>+	struct ac97_controller *actrl = adev-&gt;ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	actrl-&gt;ops-&gt;write(actrl, ac97-&gt;num, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned short compat_ac97_read(struct snd_ac97 *ac97,</div><div class='add'>+				       unsigned short reg)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(ac97-&gt;private_data);</div><div class='add'>+	struct ac97_controller *actrl = adev-&gt;ac97_ctrl;</div><div class='add'>+</div><div class='add'>+	return actrl-&gt;ops-&gt;read(actrl, ac97-&gt;num, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_ac97_bus_ops compat_snd_ac97_bus_ops = {</div><div class='add'>+	.reset = compat_ac97_reset,</div><div class='add'>+	.warm_reset = compat_ac97_warm_reset,</div><div class='add'>+	.write = compat_ac97_write,</div><div class='add'>+	.read = compat_ac97_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct snd_ac97_bus compat_soc_ac97_bus = {</div><div class='add'>+	.ops = &amp;compat_snd_ac97_bus_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ac97 *snd_ac97_compat_alloc(struct ac97_codec_device *adev)</div><div class='add'>+{</div><div class='add'>+	struct snd_ac97 *ac97;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ac97 = kzalloc(sizeof(struct snd_ac97), GFP_KERNEL);</div><div class='add'>+	if (ac97 == NULL)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	ac97-&gt;private_data = adev;</div><div class='add'>+	ac97-&gt;bus = &amp;compat_soc_ac97_bus;</div><div class='add'>+</div><div class='add'>+	ac97-&gt;dev.parent = &amp;adev-&gt;dev;</div><div class='add'>+	ac97-&gt;dev.release = compat_ac97_release;</div><div class='add'>+	dev_set_name(&amp;ac97-&gt;dev, "%s-compat", dev_name(&amp;adev-&gt;dev));</div><div class='add'>+	ret = device_register(&amp;ac97-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		put_device(&amp;ac97-&gt;dev);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ac97;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_compat_alloc);</div><div class='add'>+</div><div class='add'>+void snd_ac97_compat_release(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	device_unregister(&amp;ac97-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_compat_release);</div><div class='add'>+</div><div class='add'>+int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id,</div><div class='add'>+	unsigned int id_mask)</div><div class='add'>+{</div><div class='add'>+	struct ac97_codec_device *adev = to_ac97_device(ac97-&gt;private_data);</div><div class='add'>+	struct ac97_controller *actrl = adev-&gt;ac97_ctrl;</div><div class='add'>+	unsigned int scanned;</div><div class='add'>+</div><div class='add'>+	if (try_warm) {</div><div class='add'>+		compat_ac97_warm_reset(ac97);</div><div class='add'>+		scanned = snd_ac97_bus_scan_one(actrl, adev-&gt;num);</div><div class='add'>+		if (ac97_ids_match(scanned, adev-&gt;vendor_id, id_mask))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	compat_ac97_reset(ac97);</div><div class='add'>+	compat_ac97_warm_reset(ac97);</div><div class='add'>+	scanned = snd_ac97_bus_scan_one(actrl, adev-&gt;num);</div><div class='add'>+	if (ac97_ids_match(scanned, adev-&gt;vendor_id, id_mask))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_reset);</div><div class='head'>diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c<br/>index a351dd0a09c7..8a44297964f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/ac97_bus.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/ac97_bus.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/ac97_bus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/ac97_bus.c</a></div><div class='hunk'>@@ -1,14 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Linux driver model AC97 bus interface</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Created:	Jan 14, 2005</div><div class='ctx'>  * Copyright:	(C) MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -18,44 +14,72 @@</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Let drivers decide whether they want to support given codec from their</div><div class='del'>- * probe method.  Drivers have direct access to the struct snd_ac97 structure and may</div><div class='del'>- * decide based on the id field amongst other things.</div><div class='add'>+ * snd_ac97_check_id() - Reads and checks the vendor ID of the device</div><div class='add'>+ * @ac97: The AC97 device to check</div><div class='add'>+ * @id: The ID to compare to</div><div class='add'>+ * @id_mask: Mask that is applied to the device ID before comparing to @id</div><div class='add'>+ *</div><div class='add'>+ * If @id is 0 this function returns true if the read device vendor ID is</div><div class='add'>+ * a valid ID. If @id is non 0 this functions returns true if @id</div><div class='add'>+ * matches the read vendor ID. Otherwise the function returns false.</div><div class='ctx'>  */</div><div class='del'>-static int ac97_bus_match(struct device *dev, struct device_driver *drv)</div><div class='add'>+static bool snd_ac97_check_id(struct snd_ac97 *ac97, unsigned int id,</div><div class='add'>+	unsigned int id_mask)</div><div class='ctx'> {</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='add'>+	ac97-&gt;id = ac97-&gt;bus-&gt;ops-&gt;read(ac97, AC97_VENDOR_ID1) &lt;&lt; 16;</div><div class='add'>+	ac97-&gt;id |= ac97-&gt;bus-&gt;ops-&gt;read(ac97, AC97_VENDOR_ID2);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ac97_bus_suspend(struct device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='add'>+	if (ac97-&gt;id == 0x0 || ac97-&gt;id == 0xffffffff)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;suspend)</div><div class='del'>-		ret = dev-&gt;driver-&gt;suspend(dev, state);</div><div class='add'>+	if (id != 0 &amp;&amp; id != (ac97-&gt;id &amp; id_mask))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ac97_bus_resume(struct device *dev)</div><div class='add'>+/**</div><div class='add'>+ * snd_ac97_reset() - Reset AC'97 device</div><div class='add'>+ * @ac97: The AC'97 device to reset</div><div class='add'>+ * @try_warm: Try a warm reset first</div><div class='add'>+ * @id: Expected device vendor ID</div><div class='add'>+ * @id_mask: Mask that is applied to the device ID before comparing to @id</div><div class='add'>+ *</div><div class='add'>+ * This function resets the AC'97 device. If @try_warm is true the function</div><div class='add'>+ * first performs a warm reset. If @try_warm is false the function issues</div><div class='add'>+ * cold reset followed by a warm reset. If @id is 0 any valid device ID</div><div class='add'>+ * will be accepted, otherwise only the ID that matches @id and @id_mask</div><div class='add'>+ * is accepted.</div><div class='add'>+ * Returns:</div><div class='add'>+ * * %1 - if warm reset is successful</div><div class='add'>+ * * %0 - if cold reset and warm reset is successful</div><div class='add'>+ * * %-ENODEV - if @id and @id_mask not matching</div><div class='add'>+ */</div><div class='add'>+int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id,</div><div class='add'>+	unsigned int id_mask)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	const struct snd_ac97_bus_ops *ops = ac97-&gt;bus-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if (try_warm &amp;&amp; ops-&gt;warm_reset) {</div><div class='add'>+		ops-&gt;warm_reset(ac97);</div><div class='add'>+		if (snd_ac97_check_id(ac97, id, id_mask))</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ops-&gt;reset)</div><div class='add'>+		ops-&gt;reset(ac97);</div><div class='add'>+	if (ops-&gt;warm_reset)</div><div class='add'>+		ops-&gt;warm_reset(ac97);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;driver &amp;&amp; dev-&gt;driver-&gt;resume)</div><div class='del'>-		ret = dev-&gt;driver-&gt;resume(dev);</div><div class='add'>+	if (snd_ac97_check_id(ac97, id, id_mask))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ac97_reset);</div><div class='ctx'> </div><div class='del'>-struct bus_type ac97_bus_type = {</div><div class='add'>+const struct bus_type ac97_bus_type = {</div><div class='ctx'> 	.name		= "ac97",</div><div class='del'>-	.match		= ac97_bus_match,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= ac97_bus_suspend,</div><div class='del'>-	.resume		= ac97_bus_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ac97_bus_init(void)</div><div class='hunk'>@@ -74,4 +98,5 @@ module_exit(ac97_bus_exit);</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(ac97_bus_type);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Legacy AC97 bus interface");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig<br/>index c081e18b9540..c58308ae4dc1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/Kconfig</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> menuconfig SND_AOA</div><div class='ctx'> 	tristate "Apple Onboard Audio driver"</div><div class='ctx'> 	depends on PPC_PMAC</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables the new driver for the various</div><div class='ctx'> 	Apple Onboard Audio components.</div><div class='ctx'> </div><div class='head'>diff --git a/sound/aoa/Makefile b/sound/aoa/Makefile<br/>index a8c037f908f8..8dbfb01ba227 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_SND_AOA) += core/</div><div class='ctx'> obj-$(CONFIG_SND_AOA_SOUNDBUS) += soundbus/</div><div class='ctx'> obj-$(CONFIG_SND_AOA) += fabrics/</div><div class='head'>diff --git a/sound/aoa/aoa-gpio.h b/sound/aoa/aoa-gpio.h<br/>index 6065b0344e23..77ae75d7594c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/aoa-gpio.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/aoa-gpio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/aoa-gpio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/aoa-gpio.h</a></div><div class='hunk'>@@ -1,16 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio GPIO definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __AOA_GPIO_H</div><div class='ctx'> #define __AOA_GPIO_H</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> typedef void (*notify_func_t)(void *data);</div><div class='ctx'> </div><div class='head'>diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h<br/>index e08789484e30..badff9f7cd54 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/aoa.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/aoa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/aoa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/aoa.h</a></div><div class='hunk'>@@ -1,14 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __AOA_H</div><div class='ctx'> #define __AOA_H</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/asound.h&gt;</div><div class='hunk'>@@ -116,8 +114,8 @@ struct aoa_card {</div><div class='ctx'> 	struct snd_card *alsa_card;</div><div class='ctx'> };</div><div class='ctx'>         </div><div class='del'>-extern int aoa_snd_device_new(snd_device_type_t type,</div><div class='del'>-	void * device_data, struct snd_device_ops * ops);</div><div class='add'>+extern int aoa_snd_device_new(enum snd_device_type type,</div><div class='add'>+	void *device_data, const struct snd_device_ops *ops);</div><div class='ctx'> extern struct snd_card *aoa_get_card(void);</div><div class='ctx'> extern int aoa_snd_ctl_add(struct snd_kcontrol* control);</div><div class='ctx'> </div><div class='head'>diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig<br/>index 808eb11ebacd..03f89dbcca75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/Kconfig</a></div><div class='hunk'>@@ -1,32 +1,25 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config SND_AOA_ONYX</div><div class='ctx'> 	tristate "support Onyx chip"</div><div class='ctx'> 	select I2C</div><div class='ctx'> 	select I2C_POWERMAC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables support for the Onyx (pcm3052)</div><div class='ctx'> 	codec chip found in the latest Apple machines</div><div class='ctx'> 	(most of those with digital audio output).</div><div class='ctx'> </div><div class='del'>-#config SND_AOA_TOPAZ</div><div class='del'>-#	tristate "support Topaz chips"</div><div class='del'>-#	---help---</div><div class='del'>-#	This option enables support for the Topaz (CS84xx)</div><div class='del'>-#	codec chips found in the latest Apple machines,</div><div class='del'>-#	these chips do the digital input and output on</div><div class='del'>-#	some PowerMacs.</div><div class='del'>-</div><div class='ctx'> config SND_AOA_TAS</div><div class='ctx'> 	tristate "support TAS chips"</div><div class='ctx'> 	select I2C</div><div class='ctx'> 	select I2C_POWERMAC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables support for the tas chips</div><div class='ctx'> 	found in a lot of Apple Machines, especially</div><div class='ctx'> 	iBooks and PowerBooks without digital.</div><div class='ctx'> </div><div class='ctx'> config SND_AOA_TOONIE</div><div class='ctx'> 	tristate "support Toonie chip"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables support for the toonie codec</div><div class='ctx'> 	found in the Mac Mini. If you have a Mac Mini and</div><div class='ctx'> 	want to hear sound, select this option.</div><div class='head'>diff --git a/sound/aoa/codecs/Makefile b/sound/aoa/codecs/Makefile<br/>index c3ee77fc4b2d..8feedc771bd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-snd-aoa-codec-onyx-objs := onyx.o</div><div class='del'>-snd-aoa-codec-tas-objs := tas.o</div><div class='del'>-snd-aoa-codec-toonie-objs := toonie.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-aoa-codec-onyx-y := onyx.o</div><div class='add'>+snd-aoa-codec-tas-y := tas.o</div><div class='add'>+snd-aoa-codec-toonie-y := toonie.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_AOA_ONYX) += snd-aoa-codec-onyx.o</div><div class='ctx'> obj-$(CONFIG_SND_AOA_TAS) += snd-aoa-codec-tas.o</div><div class='head'>diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c<br/>index 91852e49910e..4cf959017c9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/onyx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/onyx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/onyx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/onyx.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver for Onyx codec</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * This is a driver for the pcm3052 codec chip (codenamed Onyx)</div><div class='ctx'>  * that is present in newer Apple hardware (with digital output).</div><div class='ctx'>  *</div><div class='hunk'>@@ -29,10 +27,10 @@</div><div class='ctx'>  *	 having just a single card on a system, and making the</div><div class='ctx'>  *	 'card' pointer accessible to anyone who needs it instead</div><div class='ctx'>  *	 of hiding it in the aoa_snd_* functions...</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> MODULE_AUTHOR("Johannes Berg &lt;johannes@sipsolutions.net&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='hunk'>@@ -74,8 +72,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	v = i2c_smbus_read_byte_data(onyx-&gt;i2c, reg);</div><div class='del'>-	if (v &lt; 0)</div><div class='add'>+	if (v &lt; 0) {</div><div class='add'>+		*value = 0;</div><div class='ctx'> 		return -1;</div><div class='add'>+	}</div><div class='ctx'> 	*value = (u8)v;</div><div class='ctx'> 	onyx-&gt;cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -98,7 +98,7 @@ static int onyx_dev_register(struct snd_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_device_ops ops = {</div><div class='add'>+static const struct snd_device_ops ops = {</div><div class='ctx'> 	.dev_register = onyx_dev_register,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -122,10 +122,9 @@ static int onyx_snd_vol_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	s8 l, r;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &amp;l);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &amp;r);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = l + VOLUME_RANGE_SHIFT;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = r + VOLUME_RANGE_SHIFT;</div><div class='hunk'>@@ -146,15 +145,13 @@ static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[1] &gt; -1 + VOLUME_RANGE_SHIFT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &amp;l);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &amp;r);</div><div class='ctx'> </div><div class='ctx'> 	if (l + VOLUME_RANGE_SHIFT == ucontrol-&gt;value.integer.value[0] &amp;&amp;</div><div class='del'>-	    r + VOLUME_RANGE_SHIFT == ucontrol-&gt;value.integer.value[1]) {</div><div class='del'>-		mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='add'>+	    r + VOLUME_RANGE_SHIFT == ucontrol-&gt;value.integer.value[1])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_LEFT,</div><div class='ctx'> 			    ucontrol-&gt;value.integer.value[0]</div><div class='hunk'>@@ -162,12 +159,11 @@ static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT,</div><div class='ctx'> 			    ucontrol-&gt;value.integer.value[1]</div><div class='ctx'> 			     - VOLUME_RANGE_SHIFT);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new volume_control = {</div><div class='add'>+static const struct snd_kcontrol_new volume_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Master Playback Volume",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -198,9 +194,8 @@ static int onyx_snd_inputgain_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	u8 ig;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &amp;ig);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		(ig &amp; ONYX_ADC_PGA_GAIN_MASK) + INPUTGAIN_RANGE_SHIFT;</div><div class='hunk'>@@ -217,19 +212,18 @@ static int onyx_snd_inputgain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0] &lt; 3 + INPUTGAIN_RANGE_SHIFT ||</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[0] &gt; 28 + INPUTGAIN_RANGE_SHIFT)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &amp;v);</div><div class='ctx'> 	n = v;</div><div class='ctx'> 	n &amp;= ~ONYX_ADC_PGA_GAIN_MASK;</div><div class='ctx'> 	n |= (ucontrol-&gt;value.integer.value[0] - INPUTGAIN_RANGE_SHIFT)</div><div class='ctx'> 		&amp; ONYX_ADC_PGA_GAIN_MASK;</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, n);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return n != v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new inputgain_control = {</div><div class='add'>+static const struct snd_kcontrol_new inputgain_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Master Capture Volume",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -241,15 +235,9 @@ static struct snd_kcontrol_new inputgain_control = {</div><div class='ctx'> static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = { "Line-In", "Microphone" };</div><div class='add'>+	static const char * const texts[] = { "Line-In", "Microphone" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int onyx_snd_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -258,9 +246,8 @@ static int onyx_snd_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	s8 v;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &amp;v);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = !!(v&amp;ONYX_ADC_INPUT_MIC);</div><div class='ctx'> </div><div class='hunk'>@@ -271,13 +258,12 @@ static void onyx_set_capture_source(struct onyx *onyx, int mic)</div><div class='ctx'> {</div><div class='ctx'> 	s8 v;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &amp;v);</div><div class='ctx'> 	v &amp;= ~ONYX_ADC_INPUT_MIC;</div><div class='ctx'> 	if (mic)</div><div class='ctx'> 		v |= ONYX_ADC_INPUT_MIC;</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, v);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -290,7 +276,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new capture_source_control = {</div><div class='add'>+static const struct snd_kcontrol_new capture_source_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	/* If we name this 'Input Source', it properly shows up in</div><div class='ctx'> 	 * alsamixer as a selection, * but it's shown under the</div><div class='hunk'>@@ -318,9 +304,8 @@ static int onyx_snd_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	u8 c;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &amp;c);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = !(c &amp; ONYX_MUTE_LEFT);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = !(c &amp; ONYX_MUTE_RIGHT);</div><div class='hunk'>@@ -335,9 +320,9 @@ static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u8 v = 0, c = 0;</div><div class='ctx'> 	int err = -EBUSY;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	if (onyx-&gt;analog_locked)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &amp;v);</div><div class='ctx'> 	c = v;</div><div class='hunk'>@@ -348,13 +333,10 @@ static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		c |= ONYX_MUTE_RIGHT;</div><div class='ctx'> 	err = onyx_write_register(onyx, ONYX_REG_DAC_CONTROL, c);</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	return !err ? (v != c) : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mute_control = {</div><div class='add'>+static const struct snd_kcontrol_new mute_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Master Playback Switch",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -379,9 +361,8 @@ static int onyx_snd_single_bit_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u8 address = (pv &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	u8 mask = pv &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, address, &amp;c);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = !!(c &amp; mask) ^ polarity;</div><div class='ctx'> </div><div class='hunk'>@@ -400,11 +381,10 @@ static int onyx_snd_single_bit_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u8 address = (pv &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	u8 mask = pv &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	if (spdiflock &amp;&amp; onyx-&gt;spdif_locked) {</div><div class='ctx'> 		/* even if alsamixer doesn't care.. */</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	onyx_read_register(onyx, address, &amp;v);</div><div class='ctx'> 	c = v;</div><div class='hunk'>@@ -413,14 +393,11 @@ static int onyx_snd_single_bit_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		c |= mask;</div><div class='ctx'> 	err = onyx_write_register(onyx, address, c);</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='del'>-</div><div class='ctx'> 	return !err ? (v != c) : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SINGLE_BIT(n, type, description, address, mask, flags)	 	\</div><div class='del'>-static struct snd_kcontrol_new n##_control = {				\</div><div class='add'>+static const struct snd_kcontrol_new n##_control = {			\</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_##type,				\</div><div class='ctx'> 	.name = description,						\</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,			\</div><div class='hunk'>@@ -482,7 +459,7 @@ static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new onyx_spdif_mask = {</div><div class='add'>+static const struct snd_kcontrol_new onyx_spdif_mask = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),</div><div class='hunk'>@@ -496,7 +473,7 @@ static int onyx_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	u8 v;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &amp;v);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = v &amp; 0x3e;</div><div class='ctx'> </div><div class='hunk'>@@ -508,7 +485,6 @@ static int onyx_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &amp;v);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[4] = v &amp; 0x0f;</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -519,7 +495,7 @@ static int onyx_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct onyx *onyx = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	u8 v;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DIG_INFO1, &amp;v);</div><div class='ctx'> 	v = (v &amp; ~0x3e) | (ucontrol-&gt;value.iec958.status[0] &amp; 0x3e);</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_DIG_INFO1, v);</div><div class='hunk'>@@ -534,12 +510,11 @@ static int onyx_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &amp;v);</div><div class='ctx'> 	v = (v &amp; ~0x0f) | (ucontrol-&gt;value.iec958.status[4] &amp; 0x0f);</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_DIG_INFO4, v);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new onyx_spdif_ctrl = {</div><div class='add'>+static const struct snd_kcontrol_new onyx_spdif_ctrl = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='hunk'>@@ -550,7 +525,7 @@ static struct snd_kcontrol_new onyx_spdif_ctrl = {</div><div class='ctx'> </div><div class='ctx'> /* our registers */</div><div class='ctx'> </div><div class='del'>-static u8 register_map[] = {</div><div class='add'>+static const u8 register_map[] = {</div><div class='ctx'> 	ONYX_REG_DAC_ATTEN_LEFT,</div><div class='ctx'> 	ONYX_REG_DAC_ATTEN_RIGHT,</div><div class='ctx'> 	ONYX_REG_CONTROL,</div><div class='hunk'>@@ -566,7 +541,7 @@ static u8 register_map[] = {</div><div class='ctx'> 	ONYX_REG_DIG_INFO4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 initial_values[ARRAY_SIZE(register_map)] = {</div><div class='add'>+static const u8 initial_values[ARRAY_SIZE(register_map)] = {</div><div class='ctx'> 	0x80, 0x80, /* muted */</div><div class='ctx'> 	ONYX_MRST | ONYX_SRST, /* but handled specially! */</div><div class='ctx'> 	ONYX_MUTE_LEFT | ONYX_MUTE_RIGHT,</div><div class='hunk'>@@ -679,14 +654,13 @@ static int onyx_usable(struct codec_info_item *cii,</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> 	int spdif_enabled, analog_enabled;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &amp;v);</div><div class='ctx'> 	spdif_enabled = !!(v &amp; ONYX_SPDIF_ENABLE);</div><div class='ctx'> 	onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &amp;v);</div><div class='ctx'> 	analog_enabled =</div><div class='ctx'> 		(v &amp; (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT))</div><div class='ctx'> 		 != (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT);</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	switch (ti-&gt;tag) {</div><div class='ctx'> 	case 0: return 1;</div><div class='hunk'>@@ -702,9 +676,8 @@ static int onyx_prepare(struct codec_info_item *cii,</div><div class='ctx'> {</div><div class='ctx'> 	u8 v;</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='del'>-	int err = -EBUSY;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_PCM_FMTBIT_COMPRESSED_16BE</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;format == SNDRV_PCM_FMTBIT_COMPRESSED_16BE) {</div><div class='hunk'>@@ -713,10 +686,9 @@ static int onyx_prepare(struct codec_info_item *cii,</div><div class='ctx'> 		if (onyx_write_register(onyx,</div><div class='ctx'> 					ONYX_REG_DAC_CONTROL,</div><div class='ctx'> 					v | ONYX_MUTE_RIGHT | ONYX_MUTE_LEFT))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		onyx-&gt;analog_locked = 1;</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	switch (substream-&gt;runtime-&gt;rate) {</div><div class='hunk'>@@ -726,8 +698,7 @@ static int onyx_prepare(struct codec_info_item *cii,</div><div class='ctx'> 		/* these rates are ok for all outputs */</div><div class='ctx'> 		/* FIXME: program spdif channel control bits here so that</div><div class='ctx'> 		 *	  userspace doesn't have to if it only plays pcm! */</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* got some rate that the digital output can't do,</div><div class='ctx'> 		 * so disable and lock it */</div><div class='hunk'>@@ -735,16 +706,12 @@ static int onyx_prepare(struct codec_info_item *cii,</div><div class='ctx'> 		if (onyx_write_register(onyx,</div><div class='ctx'> 					ONYX_REG_DIG_INFO4,</div><div class='ctx'> 					v &amp; ~ONYX_SPDIF_ENABLE))</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		onyx-&gt;spdif_locked = 1;</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int onyx_open(struct codec_info_item *cii,</div><div class='hunk'>@@ -752,9 +719,8 @@ static int onyx_open(struct codec_info_item *cii,</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx-&gt;open_count++;</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -764,11 +730,10 @@ static int onyx_close(struct codec_info_item *cii,</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	onyx-&gt;open_count--;</div><div class='ctx'> 	if (!onyx-&gt;open_count)</div><div class='ctx'> 		onyx-&gt;spdif_locked = onyx-&gt;analog_locked = 0;</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -778,7 +743,7 @@ static int onyx_switch_clock(struct codec_info_item *cii,</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	/* this *MUST* be more elaborate later... */</div><div class='ctx'> 	switch (what) {</div><div class='ctx'> 	case CLOCK_SWITCH_PREPARE_SLAVE:</div><div class='hunk'>@@ -790,7 +755,6 @@ static int onyx_switch_clock(struct codec_info_item *cii,</div><div class='ctx'> 	default: /* silence warning */</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -801,27 +765,21 @@ static int onyx_suspend(struct codec_info_item *cii, pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> 	u8 v;</div><div class='del'>-	int err = -ENXIO;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> 	if (onyx_read_register(onyx, ONYX_REG_CONTROL, &amp;v))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_CONTROL, v | ONYX_ADPSV | ONYX_DAPSV);</div><div class='ctx'> 	/* Apple does a sleep here but the datasheet says to do it on resume */</div><div class='del'>-	err = 0;</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int onyx_resume(struct codec_info_item *cii)</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = cii-&gt;codec_data;</div><div class='ctx'> 	u8 v;</div><div class='del'>-	int err = -ENXIO;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;onyx-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;onyx-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* reset codec */</div><div class='ctx'> 	onyx-&gt;codec.gpio-&gt;methods-&gt;set_hw_reset(onyx-&gt;codec.gpio, 0);</div><div class='hunk'>@@ -833,17 +791,13 @@ static int onyx_resume(struct codec_info_item *cii)</div><div class='ctx'> </div><div class='ctx'> 	/* take codec out of suspend (if it still is after reset) */</div><div class='ctx'> 	if (onyx_read_register(onyx, ONYX_REG_CONTROL, &amp;v))</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	onyx_write_register(onyx, ONYX_REG_CONTROL, v &amp; ~(ONYX_ADPSV | ONYX_DAPSV));</div><div class='ctx'> 	/* FIXME: should divide by sample rate, but 8k is the lowest we go */</div><div class='ctx'> 	msleep(2205000/8000);</div><div class='ctx'> 	/* reset all values */</div><div class='ctx'> 	onyx_register_init(onyx);</div><div class='del'>-	err = 0;</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;onyx-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='hunk'>@@ -889,7 +843,7 @@ static int onyx_init_codec(struct aoa_codec *codec)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, onyx, &amp;ops)) {</div><div class='add'>+	if (aoa_snd_device_new(SNDRV_DEV_CODEC, onyx, &amp;ops)) {</div><div class='ctx'> 		printk(KERN_ERR PFX "failed to create onyx snd device!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -997,45 +951,9 @@ static void onyx_exit_codec(struct aoa_codec *codec)</div><div class='ctx'> 	onyx-&gt;codec.soundbus_dev-&gt;detach_codec(onyx-&gt;codec.soundbus_dev, onyx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int onyx_create(struct i2c_adapter *adapter,</div><div class='del'>-		       struct device_node *node,</div><div class='del'>-		       int addr)</div><div class='del'>-{</div><div class='del'>-	struct i2c_board_info info;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-</div><div class='del'>-	memset(&amp;info, 0, sizeof(struct i2c_board_info));</div><div class='del'>-	strlcpy(info.type, "aoa_codec_onyx", I2C_NAME_SIZE);</div><div class='del'>-	info.addr = addr;</div><div class='del'>-	info.platform_data = node;</div><div class='del'>-	client = i2c_new_device(adapter, &amp;info);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We know the driver is already loaded, so the device should be</div><div class='del'>-	 * already bound. If not it means binding failed, which suggests</div><div class='del'>-	 * the device doesn't really exist and should be deleted.</div><div class='del'>-	 * Ideally this would be replaced by better checks _before_</div><div class='del'>-	 * instantiating the device.</div><div class='del'>-	 */</div><div class='del'>-	if (!client-&gt;driver) {</div><div class='del'>-		i2c_unregister_device(client);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Let i2c-core delete that device on driver removal.</div><div class='del'>-	 * This is safe because i2c-core holds the core_lock mutex for us.</div><div class='del'>-	 */</div><div class='del'>-	list_add_tail(&amp;client-&gt;detected, &amp;client-&gt;driver-&gt;clients);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int onyx_i2c_probe(struct i2c_client *client,</div><div class='del'>-			  const struct i2c_device_id *id)</div><div class='add'>+static int onyx_i2c_probe(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *node = client-&gt;dev.platform_data;</div><div class='add'>+	struct device_node *node = client-&gt;dev.of_node;</div><div class='ctx'> 	struct onyx *onyx;</div><div class='ctx'> 	u8 dummy;</div><div class='ctx'> </div><div class='hunk'>@@ -1055,7 +973,7 @@ static int onyx_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(onyx-&gt;codec.name, "onyx", MAX_CODEC_NAME_LEN);</div><div class='add'>+	strscpy(onyx-&gt;codec.name, "onyx");</div><div class='ctx'> 	onyx-&gt;codec.owner = THIS_MODULE;</div><div class='ctx'> 	onyx-&gt;codec.init = onyx_init_codec;</div><div class='ctx'> 	onyx-&gt;codec.exit = onyx_exit_codec;</div><div class='hunk'>@@ -1067,83 +985,33 @@ static int onyx_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 	printk(KERN_DEBUG PFX "created and attached onyx instance\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'>  fail:</div><div class='del'>-	i2c_set_clientdata(client, NULL);</div><div class='ctx'> 	kfree(onyx);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int onyx_i2c_attach(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	struct device_node *busnode, *dev = NULL;</div><div class='del'>-	struct pmac_i2c_bus *bus;</div><div class='del'>-</div><div class='del'>-	bus = pmac_i2c_adapter_to_bus(adapter);</div><div class='del'>-	if (bus == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	busnode = pmac_i2c_get_bus_node(bus);</div><div class='del'>-</div><div class='del'>-	while ((dev = of_get_next_child(busnode, dev)) != NULL) {</div><div class='del'>-		if (of_device_is_compatible(dev, "pcm3052")) {</div><div class='del'>-			const u32 *addr;</div><div class='del'>-			printk(KERN_DEBUG PFX "found pcm3052\n");</div><div class='del'>-			addr = of_get_property(dev, "reg", NULL);</div><div class='del'>-			if (!addr)</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			return onyx_create(adapter, dev, (*addr)&gt;&gt;1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if that didn't work, try desperate mode for older</div><div class='del'>-	 * machines that have stuff missing from the device tree */</div><div class='del'>-</div><div class='del'>-	if (!of_device_is_compatible(busnode, "k2-i2c"))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");</div><div class='del'>-	/* probe both possible addresses for the onyx chip */</div><div class='del'>-	if (onyx_create(adapter, NULL, 0x46) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	return onyx_create(adapter, NULL, 0x47);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int onyx_i2c_remove(struct i2c_client *client)</div><div class='add'>+static void onyx_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct onyx *onyx = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='ctx'> 	aoa_codec_unregister(&amp;onyx-&gt;codec);</div><div class='ctx'> 	of_node_put(onyx-&gt;codec.node);</div><div class='del'>-	if (onyx-&gt;codec_info)</div><div class='del'>-		kfree(onyx-&gt;codec_info);</div><div class='del'>-	i2c_set_clientdata(client, onyx);</div><div class='add'>+	kfree(onyx-&gt;codec_info);</div><div class='ctx'> 	kfree(onyx);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id onyx_i2c_id[] = {</div><div class='del'>-	{ "aoa_codec_onyx", 0 },</div><div class='add'>+	{ "MAC,pcm3052" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(i2c,onyx_i2c_id);</div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver onyx_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "aoa_codec_onyx",</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter = onyx_i2c_attach,</div><div class='ctx'> 	.probe = onyx_i2c_probe,</div><div class='ctx'> 	.remove = onyx_i2c_remove,</div><div class='ctx'> 	.id_table = onyx_i2c_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init onyx_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;onyx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit onyx_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;onyx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(onyx_init);</div><div class='del'>-module_exit(onyx_exit);</div><div class='add'>+module_i2c_driver(onyx_driver);</div><div class='head'>diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h<br/>index ffd20254ff76..bbdca841fe90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/onyx.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/onyx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/onyx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/onyx.h</a></div><div class='hunk'>@@ -1,16 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver for Onyx codec (header)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_AOA_CODEC_ONYX_H</div><div class='ctx'> #define __SND_AOA_CODEC_ONYX_H</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_low_i2c.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* PCM3052 register definitions */</div><div class='ctx'> </div><div class='head'>diff --git a/sound/aoa/codecs/tas-basstreble.h b/sound/aoa/codecs/tas-basstreble.h<br/>index 69b61136fd54..14dc4e9eea73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas-basstreble.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/tas-basstreble.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas-basstreble.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/tas-basstreble.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * This file is only included exactly once!</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,7 +13,7 @@</div><div class='ctx'> #define TAS3004_TREBLE_ZERO	36</div><div class='ctx'> #define TAS3004_BASS_ZERO	36</div><div class='ctx'> </div><div class='del'>-static u8 tas3004_treble_table[] = {</div><div class='add'>+static const u8 tas3004_treble_table[] = {</div><div class='ctx'> 	150, /* -18 dB */</div><div class='ctx'> 	149,</div><div class='ctx'> 	148,</div><div class='hunk'>@@ -98,7 +99,7 @@ static inline u8 tas3004_treble(int idx)</div><div class='ctx'>  * I have also ignored completely differences of</div><div class='ctx'>  * +/- 1</div><div class='ctx'>  */</div><div class='del'>-static s8 tas3004_bass_diff_to_treble[] = {</div><div class='add'>+static const s8 tas3004_bass_diff_to_treble[] = {</div><div class='ctx'> 	2, /* 7 dB, offset 50 */</div><div class='ctx'> 	2,</div><div class='ctx'> 	2,</div><div class='head'>diff --git a/sound/aoa/codecs/tas-gain-table.h b/sound/aoa/codecs/tas-gain-table.h<br/>index 4cfa6757715e..c9ea01488181 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas-gain-table.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/tas-gain-table.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas-gain-table.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/tas-gain-table.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  This is the program used to generate below table.</div><div class='ctx'> </div><div class='hunk'>@@ -26,7 +27,7 @@ int main() {</div><div class='ctx'>  * as easy as calculating</div><div class='ctx'>  *      hwvalue = 1048576.0*exp(0.057564628*dB*2)</div><div class='ctx'>  * :) */</div><div class='del'>-static int tas_gaintable[] = {</div><div class='add'>+static const int tas_gaintable[] = {</div><div class='ctx'> 	0x000000, /* -infinity dB */</div><div class='ctx'> 	0x00014b, /* -70.0 dB */</div><div class='ctx'> 	0x00015f, /* -69.5 dB */</div><div class='head'>diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c<br/>index fd2188c3df2b..7085e0b93e29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/tas.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/tas.c</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver for tas codec</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Open questions:</div><div class='ctx'>  *  - How to distinguish between 3004 and versions?</div><div class='ctx'>  *</div><div class='hunk'>@@ -59,13 +58,12 @@</div><div class='ctx'>  *    and up to the hardware designer to not wire</div><div class='ctx'>  *    them up in some weird unusable way.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;stddef.h&gt;</div><div class='ctx'> #include &lt;linux/i2c.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_low_i2c.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Johannes Berg &lt;johannes@sipsolutions.net&gt;");</div><div class='hunk'>@@ -218,7 +216,7 @@ static int tas_dev_register(struct snd_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_device_ops ops = {</div><div class='add'>+static const struct snd_device_ops ops = {</div><div class='ctx'> 	.dev_register = tas_dev_register,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -237,10 +235,9 @@ static int tas_snd_vol_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;cached_volume_l;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = tas-&gt;cached_volume_r;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -256,22 +253,19 @@ static int tas_snd_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[1] &gt; 177)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	if (tas-&gt;cached_volume_l == ucontrol-&gt;value.integer.value[0]</div><div class='del'>-	 &amp;&amp; tas-&gt;cached_volume_r == ucontrol-&gt;value.integer.value[1]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	 &amp;&amp; tas-&gt;cached_volume_r == ucontrol-&gt;value.integer.value[1])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;cached_volume_l = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	tas-&gt;cached_volume_r = ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_set_volume(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new volume_control = {</div><div class='add'>+static const struct snd_kcontrol_new volume_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Master Playback Volume",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -287,10 +281,9 @@ static int tas_snd_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = !tas-&gt;mute_l;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = !tas-&gt;mute_r;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -299,22 +292,19 @@ static int tas_snd_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	if (tas-&gt;mute_l == !ucontrol-&gt;value.integer.value[0]</div><div class='del'>-	 &amp;&amp; tas-&gt;mute_r == !ucontrol-&gt;value.integer.value[1]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	 &amp;&amp; tas-&gt;mute_r == !ucontrol-&gt;value.integer.value[1])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;mute_l = !ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	tas-&gt;mute_r = !ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_set_volume(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mute_control = {</div><div class='add'>+static const struct snd_kcontrol_new mute_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Master Playback Switch",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -339,10 +329,9 @@ static int tas_snd_mixer_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int idx = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;mixer_l[idx];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = tas-&gt;mixer_r[idx];</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -353,24 +342,21 @@ static int tas_snd_mixer_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int idx = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	if (tas-&gt;mixer_l[idx] == ucontrol-&gt;value.integer.value[0]</div><div class='del'>-	 &amp;&amp; tas-&gt;mixer_r[idx] == ucontrol-&gt;value.integer.value[1]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	 &amp;&amp; tas-&gt;mixer_r[idx] == ucontrol-&gt;value.integer.value[1])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;mixer_l[idx] = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	tas-&gt;mixer_r[idx] = ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> </div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_set_mixer(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MIXER_CONTROL(n,descr,idx)			\</div><div class='del'>-static struct snd_kcontrol_new n##_control = {		\</div><div class='add'>+static const struct snd_kcontrol_new n##_control = {	\</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		\</div><div class='ctx'> 	.name = descr " Playback Volume",		\</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,	\</div><div class='hunk'>@@ -398,9 +384,8 @@ static int tas_snd_drc_range_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;drc_range;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -413,20 +398,17 @@ static int tas_snd_drc_range_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[0] &gt; TAS3004_DRC_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-	if (tas-&gt;drc_range == ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='add'>+	if (tas-&gt;drc_range == ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;drc_range = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas3004_set_drc(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new drc_range_control = {</div><div class='add'>+static const struct snd_kcontrol_new drc_range_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "DRC Range",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -442,9 +424,8 @@ static int tas_snd_drc_switch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;drc_enabled;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -453,20 +434,17 @@ static int tas_snd_drc_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-	if (tas-&gt;drc_enabled == ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='add'>+	if (tas-&gt;drc_enabled == ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;drc_enabled = !!ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas3004_set_drc(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new drc_switch_control = {</div><div class='add'>+static const struct snd_kcontrol_new drc_switch_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "DRC Range Switch",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -478,15 +456,9 @@ static struct snd_kcontrol_new drc_switch_control = {</div><div class='ctx'> static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = { "Line-In", "Microphone" };</div><div class='add'>+	static const char * const texts[] = { "Line-In", "Microphone" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -494,9 +466,8 @@ static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = !!(tas-&gt;acr &amp; TAS_ACR_INPUT_B);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,7 +479,7 @@ static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	oldacr = tas-&gt;acr;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -520,17 +491,14 @@ static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0])</div><div class='ctx'> 		tas-&gt;acr |= TAS_ACR_INPUT_B | TAS_ACR_B_MONAUREAL |</div><div class='ctx'> 		      TAS_ACR_B_MON_SEL_RIGHT;</div><div class='del'>-	if (oldacr == tas-&gt;acr) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	if (oldacr == tas-&gt;acr)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_write_reg(tas, TAS_REG_ACR, 1, &amp;tas-&gt;acr);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new capture_source_control = {</div><div class='add'>+static const struct snd_kcontrol_new capture_source_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	/* If we name this 'Input Source', it properly shows up in</div><div class='ctx'> 	 * alsamixer as a selection, * but it's shown under the</div><div class='hunk'>@@ -565,9 +533,8 @@ static int tas_snd_treble_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;treble;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -579,20 +546,17 @@ static int tas_snd_treble_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0] &lt; TAS3004_TREBLE_MIN ||</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[0] &gt; TAS3004_TREBLE_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-	if (tas-&gt;treble == ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='add'>+	if (tas-&gt;treble == ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;treble = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_set_treble(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new treble_control = {</div><div class='add'>+static const struct snd_kcontrol_new treble_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Treble",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -616,9 +580,8 @@ static int tas_snd_bass_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = tas-&gt;bass;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -630,20 +593,17 @@ static int tas_snd_bass_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0] &lt; TAS3004_BASS_MIN ||</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[0] &gt; TAS3004_BASS_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-	if (tas-&gt;bass == ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='add'>+	if (tas-&gt;bass == ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	tas-&gt;bass = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (tas-&gt;hw_enabled)</div><div class='ctx'> 		tas_set_bass(tas);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new bass_control = {</div><div class='add'>+static const struct snd_kcontrol_new bass_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Bass",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -730,13 +690,13 @@ static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CLOCK_SWITCH_SLAVE:</div><div class='ctx'> 		/* Clocks are back, re-init the codec */</div><div class='del'>-		mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-		tas_reset_init(tas);</div><div class='del'>-		tas_set_volume(tas);</div><div class='del'>-		tas_set_mixer(tas);</div><div class='del'>-		tas-&gt;hw_enabled = 1;</div><div class='del'>-		tas-&gt;codec.gpio-&gt;methods-&gt;all_amps_restore(tas-&gt;codec.gpio);</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='add'>+		scoped_guard(mutex, &amp;tas-&gt;mtx) {</div><div class='add'>+			tas_reset_init(tas);</div><div class='add'>+			tas_set_volume(tas);</div><div class='add'>+			tas_set_mixer(tas);</div><div class='add'>+			tas-&gt;hw_enabled = 1;</div><div class='add'>+			tas-&gt;codec.gpio-&gt;methods-&gt;all_amps_restore(tas-&gt;codec.gpio);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* doesn't happen as of now */</div><div class='hunk'>@@ -751,23 +711,21 @@ static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock</div><div class='ctx'>  * our i2c device is suspended, and then take note of that! */</div><div class='ctx'> static int tas_suspend(struct tas *tas)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	tas-&gt;hw_enabled = 0;</div><div class='ctx'> 	tas-&gt;acr |= TAS_ACR_ANALOG_PDOWN;</div><div class='ctx'> 	tas_write_reg(tas, TAS_REG_ACR, 1, &amp;tas-&gt;acr);</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tas_resume(struct tas *tas)</div><div class='ctx'> {</div><div class='ctx'> 	/* reset codec */</div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;tas-&gt;mtx);</div><div class='ctx'> 	tas_reset_init(tas);</div><div class='ctx'> 	tas_set_volume(tas);</div><div class='ctx'> 	tas_set_mixer(tas);</div><div class='ctx'> 	tas-&gt;hw_enabled = 1;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -810,14 +768,13 @@ static int tas_init_codec(struct aoa_codec *codec)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;tas-&gt;mtx);</div><div class='del'>-	if (tas_reset_init(tas)) {</div><div class='del'>-		printk(KERN_ERR PFX "tas failed to initialise\n");</div><div class='del'>-		mutex_unlock(&amp;tas-&gt;mtx);</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	scoped_guard(mutex, &amp;tas-&gt;mtx) {</div><div class='add'>+		if (tas_reset_init(tas)) {</div><div class='add'>+			printk(KERN_ERR PFX "tas failed to initialise\n");</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		}</div><div class='add'>+		tas-&gt;hw_enabled = 1;</div><div class='ctx'> 	}</div><div class='del'>-	tas-&gt;hw_enabled = 1;</div><div class='del'>-	mutex_unlock(&amp;tas-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	if (tas-&gt;codec.soundbus_dev-&gt;attach_codec(tas-&gt;codec.soundbus_dev,</div><div class='ctx'> 						   aoa_get_card(),</div><div class='hunk'>@@ -826,7 +783,7 @@ static int tas_init_codec(struct aoa_codec *codec)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, tas, &amp;ops)) {</div><div class='add'>+	if (aoa_snd_device_new(SNDRV_DEV_CODEC, tas, &amp;ops)) {</div><div class='ctx'> 		printk(KERN_ERR PFX "failed to create tas snd device!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -883,43 +840,9 @@ static void tas_exit_codec(struct aoa_codec *codec)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int tas_create(struct i2c_adapter *adapter,</div><div class='del'>-		       struct device_node *node,</div><div class='del'>-		       int addr)</div><div class='del'>-{</div><div class='del'>-	struct i2c_board_info info;</div><div class='del'>-	struct i2c_client *client;</div><div class='del'>-</div><div class='del'>-	memset(&amp;info, 0, sizeof(struct i2c_board_info));</div><div class='del'>-	strlcpy(info.type, "aoa_codec_tas", I2C_NAME_SIZE);</div><div class='del'>-	info.addr = addr;</div><div class='del'>-	info.platform_data = node;</div><div class='del'>-</div><div class='del'>-	client = i2c_new_device(adapter, &amp;info);</div><div class='del'>-	if (!client)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	/*</div><div class='del'>-	 * We know the driver is already loaded, so the device should be</div><div class='del'>-	 * already bound. If not it means binding failed, and then there</div><div class='del'>-	 * is no point in keeping the device instantiated.</div><div class='del'>-	 */</div><div class='del'>-	if (!client-&gt;driver) {</div><div class='del'>-		i2c_unregister_device(client);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Let i2c-core delete that device on driver removal.</div><div class='del'>-	 * This is safe because i2c-core holds the core_lock mutex for us.</div><div class='del'>-	 */</div><div class='del'>-	list_add_tail(&amp;client-&gt;detected, &amp;client-&gt;driver-&gt;clients);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tas_i2c_probe(struct i2c_client *client,</div><div class='del'>-			 const struct i2c_device_id *id)</div><div class='add'>+static int tas_i2c_probe(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *node = client-&gt;dev.platform_data;</div><div class='add'>+	struct device_node *node = client-&gt;dev.of_node;</div><div class='ctx'> 	struct tas *tas;</div><div class='ctx'> </div><div class='ctx'> 	tas = kzalloc(sizeof(struct tas), GFP_KERNEL);</div><div class='hunk'>@@ -934,7 +857,7 @@ static int tas_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 	/* seems that half is a saner default */</div><div class='ctx'> 	tas-&gt;drc_range = TAS3004_DRC_MAX / 2;</div><div class='ctx'> </div><div class='del'>-	strlcpy(tas-&gt;codec.name, "tas", MAX_CODEC_NAME_LEN);</div><div class='add'>+	strscpy(tas-&gt;codec.name, "tas");</div><div class='ctx'> 	tas-&gt;codec.owner = THIS_MODULE;</div><div class='ctx'> 	tas-&gt;codec.init = tas_init_codec;</div><div class='ctx'> 	tas-&gt;codec.exit = tas_exit_codec;</div><div class='hunk'>@@ -944,8 +867,8 @@ static int tas_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> 	printk(KERN_DEBUG</div><div class='del'>-	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",</div><div class='del'>-	       (unsigned int)client-&gt;addr, node-&gt;full_name);</div><div class='add'>+	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n",</div><div class='add'>+	       (unsigned int)client-&gt;addr, node);</div><div class='ctx'> 	return 0;</div><div class='ctx'>  fail:</div><div class='ctx'> 	mutex_destroy(&amp;tas-&gt;mtx);</div><div class='hunk'>@@ -953,48 +876,7 @@ static int tas_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tas_i2c_attach(struct i2c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	struct device_node *busnode, *dev = NULL;</div><div class='del'>-	struct pmac_i2c_bus *bus;</div><div class='del'>-</div><div class='del'>-	bus = pmac_i2c_adapter_to_bus(adapter);</div><div class='del'>-	if (bus == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	busnode = pmac_i2c_get_bus_node(bus);</div><div class='del'>-</div><div class='del'>-	while ((dev = of_get_next_child(busnode, dev)) != NULL) {</div><div class='del'>-		if (of_device_is_compatible(dev, "tas3004")) {</div><div class='del'>-			const u32 *addr;</div><div class='del'>-			printk(KERN_DEBUG PFX "found tas3004\n");</div><div class='del'>-			addr = of_get_property(dev, "reg", NULL);</div><div class='del'>-			if (!addr)</div><div class='del'>-				continue;</div><div class='del'>-			return tas_create(adapter, dev, ((*addr) &gt;&gt; 1) &amp; 0x7f);</div><div class='del'>-		}</div><div class='del'>-		/* older machines have no 'codec' node with a 'compatible'</div><div class='del'>-		 * property that says 'tas3004', they just have a 'deq'</div><div class='del'>-		 * node without any such property... */</div><div class='del'>-		if (strcmp(dev-&gt;name, "deq") == 0) {</div><div class='del'>-			const u32 *_addr;</div><div class='del'>-			u32 addr;</div><div class='del'>-			printk(KERN_DEBUG PFX "found 'deq' node\n");</div><div class='del'>-			_addr = of_get_property(dev, "i2c-address", NULL);</div><div class='del'>-			if (!_addr)</div><div class='del'>-				continue;</div><div class='del'>-			addr = ((*_addr) &gt;&gt; 1) &amp; 0x7f;</div><div class='del'>-			/* now, if the address doesn't match any of the two</div><div class='del'>-			 * that a tas3004 can have, we cannot handle this.</div><div class='del'>-			 * I doubt it ever happens but hey. */</div><div class='del'>-			if (addr != 0x34 &amp;&amp; addr != 0x35)</div><div class='del'>-				continue;</div><div class='del'>-			return tas_create(adapter, dev, addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tas_i2c_remove(struct i2c_client *client)</div><div class='add'>+static void tas_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct tas *tas = i2c_get_clientdata(client);</div><div class='ctx'> 	u8 tmp = TAS_ACR_ANALOG_PDOWN;</div><div class='hunk'>@@ -1007,34 +889,21 @@ static int tas_i2c_remove(struct i2c_client *client)</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;tas-&gt;mtx);</div><div class='ctx'> 	kfree(tas);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id tas_i2c_id[] = {</div><div class='del'>-	{ "aoa_codec_tas", 0 },</div><div class='add'>+	{ "MAC,tas3004" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='add'>+MODULE_DEVICE_TABLE(i2c,tas_i2c_id);</div><div class='ctx'> </div><div class='ctx'> static struct i2c_driver tas_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "aoa_codec_tas",</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='del'>-	.attach_adapter = tas_i2c_attach,</div><div class='ctx'> 	.probe = tas_i2c_probe,</div><div class='ctx'> 	.remove = tas_i2c_remove,</div><div class='ctx'> 	.id_table = tas_i2c_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init tas_init(void)</div><div class='del'>-{</div><div class='del'>-	return i2c_add_driver(&amp;tas_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit tas_exit(void)</div><div class='del'>-{</div><div class='del'>-	i2c_del_driver(&amp;tas_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(tas_init);</div><div class='del'>-module_exit(tas_exit);</div><div class='add'>+module_i2c_driver(tas_driver);</div><div class='head'>diff --git a/sound/aoa/codecs/tas.h b/sound/aoa/codecs/tas.h<br/>index ae177e3466e6..b3891244afa7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/tas.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/tas.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/tas.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver for tas codec (header)</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_AOA_CODECTASH</div><div class='ctx'> #define __SND_AOA_CODECTASH</div><div class='head'>diff --git a/sound/aoa/codecs/toonie.c b/sound/aoa/codecs/toonie.c<br/>index 69d2cb601f2a..b59967c49e0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/toonie.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/codecs/toonie.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/codecs/toonie.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/codecs/toonie.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver for Toonie codec</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * This is a driver for the toonie codec chip. This chip is present</div><div class='ctx'>  * on the Mac Mini and is nothing but a DAC.</div><div class='ctx'>  */</div><div class='hunk'>@@ -32,7 +30,7 @@ static int toonie_dev_register(struct snd_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_device_ops ops = {</div><div class='add'>+static const struct snd_device_ops ops = {</div><div class='ctx'> 	.dev_register = toonie_dev_register,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -92,7 +90,7 @@ static int toonie_init_codec(struct aoa_codec *codec)</div><div class='ctx'> 	if (toonie-&gt;codec.connected != 1)</div><div class='ctx'> 		return -ENOTCONN;</div><div class='ctx'> </div><div class='del'>-	if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, toonie, &amp;ops)) {</div><div class='add'>+	if (aoa_snd_device_new(SNDRV_DEV_CODEC, toonie, &amp;ops)) {</div><div class='ctx'> 		printk(KERN_ERR PFX "failed to create toonie snd device!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -128,7 +126,7 @@ static int __init toonie_init(void)</div><div class='ctx'> 	if (!toonie)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	strlcpy(toonie-&gt;codec.name, "toonie", sizeof(toonie-&gt;codec.name));</div><div class='add'>+	strscpy(toonie-&gt;codec.name, "toonie");</div><div class='ctx'> 	toonie-&gt;codec.owner = THIS_MODULE;</div><div class='ctx'> 	toonie-&gt;codec.init = toonie_init_codec;</div><div class='ctx'> 	toonie-&gt;codec.exit = toonie_exit_codec;</div><div class='head'>diff --git a/sound/aoa/core/Makefile b/sound/aoa/core/Makefile<br/>index a1596e88c718..f586c340fe12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/Makefile</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_SND_AOA) += snd-aoa.o</div><div class='del'>-snd-aoa-objs := core.o \</div><div class='add'>+snd-aoa-y := core.o \</div><div class='ctx'> 		alsa.o \</div><div class='ctx'> 		gpio-pmf.o \</div><div class='ctx'> 		gpio-feature.o</div><div class='head'>diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c<br/>index 0fa3855b4790..aad7dfe089c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/alsa.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/alsa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/alsa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/alsa.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio Alsa helpers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include "alsa.h"</div><div class='hunk'>@@ -23,17 +22,16 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev)</div><div class='ctx'> 		/* cannot be EEXIST due to usage in aoa_fabric_register */</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, name, mod, sizeof(struct aoa_card),</div><div class='del'>-			      &amp;alsa_card);</div><div class='add'>+	err = snd_card_new(dev, index, name, mod, sizeof(struct aoa_card),</div><div class='add'>+			   &amp;alsa_card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	aoa_card = alsa_card-&gt;private_data;</div><div class='ctx'> 	aoa_card-&gt;alsa_card = alsa_card;</div><div class='del'>-	alsa_card-&gt;dev = dev;</div><div class='del'>-	strlcpy(alsa_card-&gt;driver, "AppleOnbdAudio", sizeof(alsa_card-&gt;driver));</div><div class='del'>-	strlcpy(alsa_card-&gt;shortname, name, sizeof(alsa_card-&gt;shortname));</div><div class='del'>-	strlcpy(alsa_card-&gt;longname, name, sizeof(alsa_card-&gt;longname));</div><div class='del'>-	strlcpy(alsa_card-&gt;mixername, name, sizeof(alsa_card-&gt;mixername));</div><div class='add'>+	strscpy(alsa_card-&gt;driver, "AppleOnbdAudio");</div><div class='add'>+	strscpy(alsa_card-&gt;shortname, name);</div><div class='add'>+	strscpy(alsa_card-&gt;longname, name);</div><div class='add'>+	strscpy(alsa_card-&gt;mixername, name);</div><div class='ctx'> 	err = snd_card_register(aoa_card-&gt;alsa_card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		printk(KERN_ERR "snd-aoa: couldn't register alsa card\n");</div><div class='hunk'>@@ -60,8 +58,8 @@ void aoa_alsa_cleanup(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int aoa_snd_device_new(snd_device_type_t type,</div><div class='del'>-		       void * device_data, struct snd_device_ops * ops)</div><div class='add'>+int aoa_snd_device_new(enum snd_device_type type,</div><div class='add'>+		       void *device_data, const struct snd_device_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = aoa_get_card();</div><div class='ctx'> 	int err;</div><div class='head'>diff --git a/sound/aoa/core/alsa.h b/sound/aoa/core/alsa.h<br/>index 9669e4489cab..8966a08c4cf2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/alsa.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/alsa.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/alsa.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/alsa.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio Alsa private helpers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SND_AOA_ALSA_H</div><div class='head'>diff --git a/sound/aoa/core/core.c b/sound/aoa/core/core.c<br/>index 10bec6c61382..99b032a4081f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/core.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver core</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='head'>diff --git a/sound/aoa/core/gpio-feature.c b/sound/aoa/core/gpio-feature.c<br/>index de8e03afa97b..19ed0e6907da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/gpio-feature.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/gpio-feature.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/gpio-feature.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/gpio-feature.c</a></div><div class='hunk'>@@ -1,17 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio feature call GPIO control</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='del'>- *</div><div class='ctx'>  * This file contains the GPIO control routines for</div><div class='ctx'>  * direct (through feature calls) access to the GPIO</div><div class='ctx'>  * registers.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/pmac_feature.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include "../aoa.h"</div><div class='ctx'> </div><div class='ctx'> /* TODO: these are lots of global variables</div><div class='hunk'>@@ -81,14 +81,17 @@ static struct device_node *get_gpio(char *name,</div><div class='ctx'> 			if (altname &amp;&amp; (strcmp(audio_gpio, altname) == 0))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='add'>+		of_node_put(gpio);</div><div class='ctx'> 		/* still not found, assume not there */</div><div class='ctx'> 		if (!np)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	reg = of_get_property(np, "reg", NULL);</div><div class='del'>-	if (!reg)</div><div class='add'>+	if (!reg) {</div><div class='add'>+		of_node_put(np);</div><div class='ctx'> 		return NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	*gpioptr = *reg;</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +120,7 @@ static void get_irq(struct device_node * np, int *irqptr)</div><div class='ctx'> 	if (np)</div><div class='ctx'> 		*irqptr = irq_of_parse_and_map(np, 0);</div><div class='ctx'> 	else</div><div class='del'>-		*irqptr = NO_IRQ;</div><div class='add'>+		*irqptr = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 0x4 is outenable, 0x1 is out, thus 4 or 5 */</div><div class='hunk'>@@ -209,10 +212,9 @@ static void ftr_handle_notify(struct work_struct *work)</div><div class='ctx'> 	struct gpio_notification *notif =</div><div class='ctx'> 		container_of(work, struct gpio_notification, work.work);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;notif-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;notif-&gt;mutex);</div><div class='ctx'> 	if (notif-&gt;notify)</div><div class='ctx'> 		notif-&gt;notify(notif-&gt;data);</div><div class='del'>-	mutex_unlock(&amp;notif-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gpio_enable_dual_edge(int gpio)</div><div class='hunk'>@@ -287,10 +289,9 @@ static void ftr_gpio_exit(struct gpio_runtime *rt)</div><div class='ctx'> 		free_irq(linein_detect_irq, &amp;rt-&gt;line_in_notify);</div><div class='ctx'> 	if (rt-&gt;line_out_notify.gpio_private)</div><div class='ctx'> 		free_irq(lineout_detect_irq, &amp;rt-&gt;line_out_notify);</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;headphone_notify.work);</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;line_in_notify.work);</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;line_out_notify.work);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;headphone_notify.work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;line_in_notify.work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;line_out_notify.work);</div><div class='ctx'> 	mutex_destroy(&amp;rt-&gt;headphone_notify.mutex);</div><div class='ctx'> 	mutex_destroy(&amp;rt-&gt;line_in_notify.mutex);</div><div class='ctx'> 	mutex_destroy(&amp;rt-&gt;line_out_notify.mutex);</div><div class='hunk'>@@ -336,22 +337,20 @@ static int ftr_set_notify(struct gpio_runtime *rt,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (irq == NO_IRQ)</div><div class='add'>+	if (!irq)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;notif-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;notif-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	old = notif-&gt;notify;</div><div class='ctx'> </div><div class='del'>-	if (!old &amp;&amp; !notify) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!old &amp;&amp; !notify)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (old &amp;&amp; notify) {</div><div class='ctx'> 		if (old == notify &amp;&amp; notif-&gt;data == data)</div><div class='ctx'> 			err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (old &amp;&amp; !notify)</div><div class='hunk'>@@ -360,16 +359,13 @@ static int ftr_set_notify(struct gpio_runtime *rt,</div><div class='ctx'> 	if (!old &amp;&amp; notify) {</div><div class='ctx'> 		err = request_irq(irq, ftr_handle_notify_irq, 0, name, notif);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	notif-&gt;notify = notify;</div><div class='ctx'> 	notif-&gt;data = data;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;notif-&gt;mutex);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ftr_get_detect(struct gpio_runtime *rt,</div><div class='head'>diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c<br/>index 7e267c9379bc..e76bde25e41a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/gpio-pmf.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/core/gpio-pmf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/core/gpio-pmf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/core/gpio-pmf.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio pmf GPIOs</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -75,10 +74,9 @@ static void pmf_handle_notify(struct work_struct *work)</div><div class='ctx'> 	struct gpio_notification *notif =</div><div class='ctx'> 		container_of(work, struct gpio_notification, work.work);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;notif-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;notif-&gt;mutex);</div><div class='ctx'> 	if (notif-&gt;notify)</div><div class='ctx'> 		notif-&gt;notify(notif-&gt;data);</div><div class='del'>-	mutex_unlock(&amp;notif-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pmf_gpio_init(struct gpio_runtime *rt)</div><div class='hunk'>@@ -107,10 +105,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)</div><div class='ctx'> </div><div class='ctx'> 	/* make sure no work is pending before freeing</div><div class='ctx'> 	 * all things */</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;headphone_notify.work);</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;line_in_notify.work);</div><div class='del'>-	cancel_delayed_work(&amp;rt-&gt;line_out_notify.work);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;headphone_notify.work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;line_in_notify.work);</div><div class='add'>+	cancel_delayed_work_sync(&amp;rt-&gt;line_out_notify.work);</div><div class='ctx'> </div><div class='ctx'> 	mutex_destroy(&amp;rt-&gt;headphone_notify.mutex);</div><div class='ctx'> 	mutex_destroy(&amp;rt-&gt;line_in_notify.mutex);</div><div class='hunk'>@@ -156,19 +153,17 @@ static int pmf_set_notify(struct gpio_runtime *rt,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;notif-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;notif-&gt;mutex);</div><div class='ctx'> </div><div class='ctx'> 	old = notif-&gt;notify;</div><div class='ctx'> </div><div class='del'>-	if (!old &amp;&amp; !notify) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!old &amp;&amp; !notify)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (old &amp;&amp; notify) {</div><div class='ctx'> 		if (old == notify &amp;&amp; notif-&gt;data == data)</div><div class='ctx'> 			err = 0;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (old &amp;&amp; !notify) {</div><div class='hunk'>@@ -180,10 +175,8 @@ static int pmf_set_notify(struct gpio_runtime *rt,</div><div class='ctx'> 	if (!old &amp;&amp; notify) {</div><div class='ctx'> 		irq_client = kzalloc(sizeof(struct pmf_irq_client),</div><div class='ctx'> 				     GFP_KERNEL);</div><div class='del'>-		if (!irq_client) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!irq_client)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		irq_client-&gt;data = notif;</div><div class='ctx'> 		irq_client-&gt;handler = pmf_handle_notify_irq;</div><div class='ctx'> 		irq_client-&gt;owner = THIS_MODULE;</div><div class='hunk'>@@ -194,17 +187,14 @@ static int pmf_set_notify(struct gpio_runtime *rt,</div><div class='ctx'> 			printk(KERN_ERR "snd-aoa: gpio layer failed to"</div><div class='ctx'> 					" register %s irq (%d)\n", name, err);</div><div class='ctx'> 			kfree(irq_client);</div><div class='del'>-			goto out_unlock;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		notif-&gt;gpio_private = irq_client;</div><div class='ctx'> 	}</div><div class='ctx'> 	notif-&gt;notify = notify;</div><div class='ctx'> 	notif-&gt;data = data;</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;notif-&gt;mutex);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pmf_get_detect(struct gpio_runtime *rt,</div><div class='head'>diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig<br/>index 3ca475a886b1..0fa2da247ad2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/fabrics/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/fabrics/Kconfig</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config SND_AOA_FABRIC_LAYOUT</div><div class='ctx'> 	tristate "layout-id fabric"</div><div class='ctx'> 	select SND_AOA_SOUNDBUS</div><div class='ctx'> 	select SND_AOA_SOUNDBUS_I2S</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This enables the layout-id fabric for the Apple Onboard</div><div class='ctx'> 	Audio driver, the module holding it all together</div><div class='ctx'> 	based on the device-tree's layout-id property.</div><div class='head'>diff --git a/sound/aoa/fabrics/Makefile b/sound/aoa/fabrics/Makefile<br/>index da37c10eca51..2c3bee6cfa2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/fabrics/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/fabrics/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='del'>-snd-aoa-fabric-layout-objs += layout.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-aoa-fabric-layout-y += layout.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT) += snd-aoa-fabric-layout.o</div><div class='head'>diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c<br/>index 3fd1a7e24928..bb2a0ef3004b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/layout.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/fabrics/layout.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/fabrics/layout.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/fabrics/layout.c</a></div><div class='hunk'>@@ -1,17 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Apple Onboard Audio driver -- layout/machine id fabric</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006-2008 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * This fabric module looks for sound codecs based on the</div><div class='ctx'>  * layout-id or device-id property in the device tree.</div><div class='ctx'>  */</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "../aoa.h"</div><div class='ctx'> #include "../soundbus/soundbus.h"</div><div class='hunk'>@@ -112,7 +111,9 @@ MODULE_ALIAS("sound-layout-100");</div><div class='ctx'> </div><div class='ctx'> MODULE_ALIAS("aoa-device-id-14");</div><div class='ctx'> MODULE_ALIAS("aoa-device-id-22");</div><div class='add'>+MODULE_ALIAS("aoa-device-id-31");</div><div class='ctx'> MODULE_ALIAS("aoa-device-id-35");</div><div class='add'>+MODULE_ALIAS("aoa-device-id-44");</div><div class='ctx'> </div><div class='ctx'> /* onyx with all but microphone connected */</div><div class='ctx'> static struct codec_connection onyx_connections_nomic[] = {</div><div class='hunk'>@@ -361,6 +362,20 @@ static struct layout layouts[] = {</div><div class='ctx'> 		.connections = tas_connections_nolineout,</div><div class='ctx'> 	  },</div><div class='ctx'> 	},</div><div class='add'>+	/* PowerBook6,1 */</div><div class='add'>+	{ .device_id = 31,</div><div class='add'>+	  .codecs[0] = {</div><div class='add'>+		.name = "tas",</div><div class='add'>+		.connections = tas_connections_nolineout,</div><div class='add'>+	  },</div><div class='add'>+	},</div><div class='add'>+	/* PowerBook6,5 */</div><div class='add'>+	{ .device_id = 44,</div><div class='add'>+	  .codecs[0] = {</div><div class='add'>+		.name = "tas",</div><div class='add'>+		.connections = tas_connections_all,</div><div class='add'>+	  },</div><div class='add'>+	},</div><div class='ctx'> 	/* PowerBook6,7 */</div><div class='ctx'> 	{ .layout_id = 80,</div><div class='ctx'> 	  .codecs[0] = {</div><div class='hunk'>@@ -636,12 +651,12 @@ static int n##_control_put(struct snd_kcontrol *kcontrol,		\</div><div class='ctx'> 			   struct snd_ctl_elem_value *ucontrol)		\</div><div class='ctx'> {									\</div><div class='ctx'> 	struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);	\</div><div class='del'>-	if (gpio-&gt;methods &amp;&amp; gpio-&gt;methods-&gt;get_##n)			\</div><div class='add'>+	if (gpio-&gt;methods &amp;&amp; gpio-&gt;methods-&gt;set_##n)			\</div><div class='ctx'> 		gpio-&gt;methods-&gt;set_##n(gpio,				\</div><div class='ctx'> 			!!ucontrol-&gt;value.integer.value[0]);		\</div><div class='ctx'> 	return 1;							\</div><div class='ctx'> }									\</div><div class='del'>-static struct snd_kcontrol_new n##_ctl = {				\</div><div class='add'>+static const struct snd_kcontrol_new n##_ctl = {			\</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,				\</div><div class='ctx'> 	.name = description,						\</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,                      \</div><div class='hunk'>@@ -691,7 +706,7 @@ static int detect_choice_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new headphone_detect_choice = {</div><div class='add'>+static const struct snd_kcontrol_new headphone_detect_choice = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Headphone Detect Autoswitch",</div><div class='ctx'> 	.info = control_info,</div><div class='hunk'>@@ -701,7 +716,7 @@ static struct snd_kcontrol_new headphone_detect_choice = {</div><div class='ctx'> 	.private_value = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new lineout_detect_choice = {</div><div class='add'>+static const struct snd_kcontrol_new lineout_detect_choice = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Line-Out Detect Autoswitch",</div><div class='ctx'> 	.info = control_info,</div><div class='hunk'>@@ -733,7 +748,7 @@ static int detected_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new headphone_detected = {</div><div class='add'>+static const struct snd_kcontrol_new headphone_detected = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Headphone Detected",</div><div class='ctx'> 	.info = control_info,</div><div class='hunk'>@@ -742,7 +757,7 @@ static struct snd_kcontrol_new headphone_detected = {</div><div class='ctx'> 	.private_value = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new lineout_detected = {</div><div class='add'>+static const struct snd_kcontrol_new lineout_detected = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Line-Out Detected",</div><div class='ctx'> 	.info = control_info,</div><div class='hunk'>@@ -760,7 +775,7 @@ static int check_codec(struct aoa_codec *codec,</div><div class='ctx'> 	struct codec_connection *cc;</div><div class='ctx'> </div><div class='ctx'> 	/* if the codec has a 'codec' node, we require a reference */</div><div class='del'>-	if (codec-&gt;node &amp;&amp; (strcmp(codec-&gt;node-&gt;name, "codec") == 0)) {</div><div class='add'>+	if (of_node_name_eq(codec-&gt;node, "codec")) {</div><div class='ctx'> 		snprintf(propname, sizeof(propname),</div><div class='ctx'> 			 "platform-%s-codec-ref", codec-&gt;name);</div><div class='ctx'> 		ref = of_get_property(ldev-&gt;sound, propname, NULL);</div><div class='hunk'>@@ -934,8 +949,7 @@ static void layout_attached_codec(struct aoa_codec *codec)</div><div class='ctx'> 				ldev-&gt;gpio.methods-&gt;set_lineout(codec-&gt;gpio, 1);</div><div class='ctx'> 			ctl = snd_ctl_new1(&amp;lineout_ctl, codec-&gt;gpio);</div><div class='ctx'> 			if (cc-&gt;connected &amp; CC_LINEOUT_LABELLED_HEADPHONE)</div><div class='del'>-				strlcpy(ctl-&gt;id.name,</div><div class='del'>-					"Headphone Switch", sizeof(ctl-&gt;id.name));</div><div class='add'>+				strscpy(ctl-&gt;id.name, "Headphone Switch");</div><div class='ctx'> 			ldev-&gt;lineout_ctrl = ctl;</div><div class='ctx'> 			aoa_snd_ctl_add(ctl);</div><div class='ctx'> 			ldev-&gt;have_lineout_detect =</div><div class='hunk'>@@ -948,16 +962,14 @@ static void layout_attached_codec(struct aoa_codec *codec)</div><div class='ctx'> 				ctl = snd_ctl_new1(&amp;lineout_detect_choice,</div><div class='ctx'> 						   ldev);</div><div class='ctx'> 				if (cc-&gt;connected &amp; CC_LINEOUT_LABELLED_HEADPHONE)</div><div class='del'>-					strlcpy(ctl-&gt;id.name,</div><div class='del'>-						"Headphone Detect Autoswitch",</div><div class='del'>-						sizeof(ctl-&gt;id.name));</div><div class='add'>+					strscpy(ctl-&gt;id.name,</div><div class='add'>+						"Headphone Detect Autoswitch");</div><div class='ctx'> 				aoa_snd_ctl_add(ctl);</div><div class='ctx'> 				ctl = snd_ctl_new1(&amp;lineout_detected,</div><div class='ctx'> 						   ldev);</div><div class='ctx'> 				if (cc-&gt;connected &amp; CC_LINEOUT_LABELLED_HEADPHONE)</div><div class='del'>-					strlcpy(ctl-&gt;id.name,</div><div class='del'>-						"Headphone Detected",</div><div class='del'>-						sizeof(ctl-&gt;id.name));</div><div class='add'>+					strscpy(ctl-&gt;id.name,</div><div class='add'>+						"Headphone Detected");</div><div class='ctx'> 				ldev-&gt;lineout_detected_ctrl = ctl;</div><div class='ctx'> 				aoa_snd_ctl_add(ctl);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -992,8 +1004,8 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* by breaking out we keep a reference */</div><div class='del'>-	while ((sound = of_get_next_child(sdev-&gt;ofdev.dev.of_node, sound))) {</div><div class='del'>-		if (sound-&gt;type &amp;&amp; strcasecmp(sound-&gt;type, "soundchip") == 0)</div><div class='add'>+	for_each_child_of_node(sdev-&gt;ofdev.dev.of_node, sound) {</div><div class='add'>+		if (of_node_is_type(sound, "soundchip"))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!sound)</div><div class='hunk'>@@ -1073,14 +1085,14 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)</div><div class='ctx'> 	sdev-&gt;pcmid = -1;</div><div class='ctx'> 	list_del(&amp;ldev-&gt;list);</div><div class='ctx'> 	layouts_list_items--;</div><div class='add'>+	kfree(ldev);</div><div class='ctx'>  outnodev:</div><div class='ctx'>  	of_node_put(sound);</div><div class='ctx'>  	layout_device = NULL;</div><div class='del'>- 	kfree(ldev);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)</div><div class='add'>+static void aoa_fabric_layout_remove(struct soundbus_dev *sdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct layout_dev *ldev = dev_get_drvdata(&amp;sdev-&gt;ofdev.dev);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1109,13 +1121,11 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)</div><div class='ctx'> 	kfree(ldev);</div><div class='ctx'> 	sdev-&gt;pcmid = -1;</div><div class='ctx'> 	sdev-&gt;pcmname = NULL;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state)</div><div class='add'>+static int aoa_fabric_layout_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct layout_dev *ldev = dev_get_drvdata(&amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	struct layout_dev *ldev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ldev-&gt;gpio.methods &amp;&amp; ldev-&gt;gpio.methods-&gt;all_amps_off)</div><div class='ctx'> 		ldev-&gt;gpio.methods-&gt;all_amps_off(&amp;ldev-&gt;gpio);</div><div class='hunk'>@@ -1123,39 +1133,33 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)</div><div class='add'>+static int aoa_fabric_layout_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct layout_dev *ldev = dev_get_drvdata(&amp;sdev-&gt;ofdev.dev);</div><div class='add'>+	struct layout_dev *ldev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	if (ldev-&gt;gpio.methods &amp;&amp; ldev-&gt;gpio.methods-&gt;all_amps_off)</div><div class='add'>+	if (ldev-&gt;gpio.methods &amp;&amp; ldev-&gt;gpio.methods-&gt;all_amps_restore)</div><div class='ctx'> 		ldev-&gt;gpio.methods-&gt;all_amps_restore(&amp;ldev-&gt;gpio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(aoa_fabric_layout_pm_ops,</div><div class='add'>+	aoa_fabric_layout_suspend, aoa_fabric_layout_resume);</div><div class='ctx'> </div><div class='ctx'> static struct soundbus_driver aoa_soundbus_driver = {</div><div class='ctx'> 	.name = "snd_aoa_soundbus_drv",</div><div class='ctx'> 	.owner = THIS_MODULE,</div><div class='ctx'> 	.probe = aoa_fabric_layout_probe,</div><div class='ctx'> 	.remove = aoa_fabric_layout_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = aoa_fabric_layout_suspend,</div><div class='del'>-	.resume = aoa_fabric_layout_resume,</div><div class='del'>-#endif</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.owner = THIS_MODULE,</div><div class='add'>+		.pm = &amp;aoa_fabric_layout_pm_ops,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init aoa_fabric_layout_init(void)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = soundbus_register_driver(&amp;aoa_soundbus_driver);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return soundbus_register_driver(&amp;aoa_soundbus_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit aoa_fabric_layout_exit(void)</div><div class='head'>diff --git a/sound/aoa/soundbus/Kconfig b/sound/aoa/soundbus/Kconfig<br/>index 839d1137b9b2..00189aac8014 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/Kconfig</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config SND_AOA_SOUNDBUS</div><div class='ctx'> 	tristate "Apple Soundbus support"</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables the generic driver for the soundbus</div><div class='ctx'> 	support on Apple machines.</div><div class='ctx'> 	</div><div class='hunk'>@@ -10,5 +11,5 @@ config SND_AOA_SOUNDBUS</div><div class='ctx'> config SND_AOA_SOUNDBUS_I2S</div><div class='ctx'> 	tristate "I2S bus support"</div><div class='ctx'> 	depends on SND_AOA_SOUNDBUS &amp;&amp; PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	This option enables support for Apple I2S busses.</div><div class='head'>diff --git a/sound/aoa/soundbus/Makefile b/sound/aoa/soundbus/Makefile<br/>index 0e61f5aa06b5..a10b102daf81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_SND_AOA_SOUNDBUS) += snd-aoa-soundbus.o</div><div class='del'>-snd-aoa-soundbus-objs := core.o sysfs.o</div><div class='add'>+snd-aoa-soundbus-y := core.o sysfs.o</div><div class='ctx'> obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += i2sbus/</div><div class='head'>diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c<br/>index 7487eb76e034..2a295f610594 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/core.c</a></div><div class='hunk'>@@ -1,12 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * soundbus</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include "soundbus.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Johannes Berg &lt;johannes@sipsolutions.net&gt;");</div><div class='hunk'>@@ -56,10 +57,10 @@ static int soundbus_probe(struct device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='add'>+static int soundbus_uevent(const struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> {</div><div class='del'>-	struct soundbus_dev * soundbus_dev;</div><div class='del'>-	struct platform_device * of;</div><div class='add'>+	const struct soundbus_dev * soundbus_dev;</div><div class='add'>+	const struct platform_device * of;</div><div class='ctx'> 	const char *compat;</div><div class='ctx'> 	int retval = 0;</div><div class='ctx'> 	int cplen, seen = 0;</div><div class='hunk'>@@ -74,11 +75,11 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 	of = &amp;soundbus_dev-&gt;ofdev;</div><div class='ctx'> </div><div class='ctx'> 	/* stuff we want to pass to /sbin/hotplug */</div><div class='del'>-	retval = add_uevent_var(env, "OF_NAME=%s", of-&gt;dev.of_node-&gt;name);</div><div class='add'>+	retval = add_uevent_var(env, "OF_NAME=%pOFn", of-&gt;dev.of_node);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	retval = add_uevent_var(env, "OF_TYPE=%s", of-&gt;dev.of_node-&gt;type);</div><div class='add'>+	retval = add_uevent_var(env, "OF_TYPE=%s", of_node_get_device_type(of-&gt;dev.of_node));</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +106,7 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int soundbus_device_remove(struct device *dev)</div><div class='add'>+static void soundbus_device_remove(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct soundbus_dev * soundbus_dev = to_soundbus_device(dev);</div><div class='ctx'> 	struct soundbus_driver * drv = to_soundbus_driver(dev-&gt;driver);</div><div class='hunk'>@@ -113,8 +114,6 @@ static int soundbus_device_remove(struct device *dev)</div><div class='ctx'> 	if (dev-&gt;driver &amp;&amp; drv-&gt;remove)</div><div class='ctx'> 		drv-&gt;remove(soundbus_dev);</div><div class='ctx'> 	soundbus_dev_put(soundbus_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void soundbus_device_shutdown(struct device *dev)</div><div class='hunk'>@@ -126,41 +125,15 @@ static void soundbus_device_shutdown(struct device *dev)</div><div class='ctx'> 		drv-&gt;shutdown(soundbus_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static int soundbus_device_suspend(struct device *dev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct soundbus_dev * soundbus_dev = to_soundbus_device(dev);</div><div class='del'>-	struct soundbus_driver * drv = to_soundbus_driver(dev-&gt;driver);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;suspend)</div><div class='del'>-		return drv-&gt;suspend(soundbus_dev, state);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int soundbus_device_resume(struct device * dev)</div><div class='del'>-{</div><div class='del'>-	struct soundbus_dev * soundbus_dev = to_soundbus_device(dev);</div><div class='del'>-	struct soundbus_driver * drv = to_soundbus_driver(dev-&gt;driver);</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;driver &amp;&amp; drv-&gt;resume)</div><div class='del'>-		return drv-&gt;resume(soundbus_dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-static struct bus_type soundbus_bus_type = {</div><div class='add'>+/* soundbus_dev_attrs is declared in sysfs.c */</div><div class='add'>+ATTRIBUTE_GROUPS(soundbus_dev);</div><div class='add'>+static const struct bus_type soundbus_bus_type = {</div><div class='ctx'> 	.name		= "aoa-soundbus",</div><div class='ctx'> 	.probe		= soundbus_probe,</div><div class='ctx'> 	.uevent		= soundbus_uevent,</div><div class='ctx'> 	.remove		= soundbus_device_remove,</div><div class='ctx'> 	.shutdown	= soundbus_device_shutdown,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= soundbus_device_suspend,</div><div class='del'>-	.resume		= soundbus_device_resume,</div><div class='del'>-#endif</div><div class='del'>-	.dev_attrs	= soundbus_dev_attrs,</div><div class='add'>+	.dev_groups	= soundbus_dev_groups,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int soundbus_add_one(struct soundbus_dev *dev)</div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/Makefile b/sound/aoa/soundbus/i2sbus/Makefile<br/>index 1b949b2a4028..1ddaa0e17d67 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += snd-aoa-i2sbus.o</div><div class='del'>-snd-aoa-i2sbus-objs := core.o pcm.o control.o</div><div class='add'>+snd-aoa-i2sbus-y := core.o pcm.o control.o</div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/control.c b/sound/aoa/soundbus/i2sbus/control.c<br/>index 4dc9b49c02cf..a003ef06de63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/control.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/control.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/control.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/control.c</a></div><div class='hunk'>@@ -1,17 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * i2sbus driver -- bus control routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/macio.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_pfunc.h&gt;</div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c<br/>index 3ff8cc5f487a..f4d43c854bbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/core.c</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * i2sbus driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006-2008 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -11,6 +10,9 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +31,7 @@ module_param(force, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(force, "Force loading i2sbus even when"</div><div class='ctx'> 			" no layout-id property is present");</div><div class='ctx'> </div><div class='del'>-static struct of_device_id i2sbus_match[] = {</div><div class='add'>+static const struct of_device_id i2sbus_match[] = {</div><div class='ctx'> 	{ .name = "i2s" },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='hunk'>@@ -45,15 +47,11 @@ static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,</div><div class='ctx'> 	/* We use the PCI APIs for now until the generic one gets fixed</div><div class='ctx'> 	 * enough or until we get some macio-specific versions</div><div class='ctx'> 	 */</div><div class='del'>-	r-&gt;space = dma_alloc_coherent(</div><div class='del'>-			&amp;macio_get_pci_dev(i2sdev-&gt;macio)-&gt;dev,</div><div class='del'>-			r-&gt;size,</div><div class='del'>-			&amp;r-&gt;bus_addr,</div><div class='del'>-			GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!r-&gt;space) return -ENOMEM;</div><div class='add'>+	r-&gt;space = dma_alloc_coherent(&amp;macio_get_pci_dev(i2sdev-&gt;macio)-&gt;dev,</div><div class='add'>+				      r-&gt;size, &amp;r-&gt;bus_addr, GFP_KERNEL);</div><div class='add'>+	if (!r-&gt;space)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	memset(r-&gt;space, 0, r-&gt;size);</div><div class='ctx'> 	r-&gt;cmds = (void*)DBDMA_ALIGN(r-&gt;space);</div><div class='ctx'> 	r-&gt;bus_cmd_start = r-&gt;bus_addr +</div><div class='ctx'> 			   (dma_addr_t)((char*)r-&gt;cmds - (char*)r-&gt;space);</div><div class='hunk'>@@ -76,13 +74,11 @@ static void i2sbus_release_dev(struct device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	i2sdev = container_of(dev, struct i2sbus_dev, sound.ofdev.dev);</div><div class='del'>-</div><div class='del'>- 	if (i2sdev-&gt;intfregs) iounmap(i2sdev-&gt;intfregs);</div><div class='del'>- 	if (i2sdev-&gt;out.dbdma) iounmap(i2sdev-&gt;out.dbdma);</div><div class='del'>- 	if (i2sdev-&gt;in.dbdma) iounmap(i2sdev-&gt;in.dbdma);</div><div class='add'>+	iounmap(i2sdev-&gt;intfregs);</div><div class='add'>+	iounmap(i2sdev-&gt;out.dbdma);</div><div class='add'>+	iounmap(i2sdev-&gt;in.dbdma);</div><div class='ctx'> 	for (i = aoa_resource_i2smmio; i &lt;= aoa_resource_rxdbdma; i++)</div><div class='del'>-		if (i2sdev-&gt;allocated_resource[i])</div><div class='del'>-			release_and_free_resource(i2sdev-&gt;allocated_resource[i]);</div><div class='add'>+		release_and_free_resource(i2sdev-&gt;allocated_resource[i]);</div><div class='ctx'> 	free_dbdma_descriptor_ring(i2sdev, &amp;i2sdev-&gt;out.dbdma_ring);</div><div class='ctx'> 	free_dbdma_descriptor_ring(i2sdev, &amp;i2sdev-&gt;in.dbdma_ring);</div><div class='ctx'> 	for (i = aoa_resource_i2smmio; i &lt;= aoa_resource_rxdbdma; i++)</div><div class='hunk'>@@ -97,14 +93,12 @@ static irqreturn_t i2sbus_bus_intr(int irq, void *devid)</div><div class='ctx'> 	struct i2sbus_dev *dev = devid;</div><div class='ctx'> 	u32 intreg;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dev-&gt;low_lock);</div><div class='add'>+	guard(spinlock)(&amp;dev-&gt;low_lock);</div><div class='ctx'> 	intreg = in_le32(&amp;dev-&gt;intfregs-&gt;intr_ctl);</div><div class='ctx'> </div><div class='ctx'> 	/* acknowledge interrupt reasons */</div><div class='ctx'> 	out_le32(&amp;dev-&gt;intfregs-&gt;intr_ctl, intreg);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;dev-&gt;low_lock);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -152,27 +146,29 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Returns 1 if added, 0 for otherwise; don't return a negative value! */</div><div class='ctx'> /* FIXME: look at device node refcounting */</div><div class='ctx'> static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 			  struct i2sbus_control *control,</div><div class='ctx'> 			  struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2sbus_dev *dev;</div><div class='del'>-	struct device_node *child = NULL, *sound = NULL;</div><div class='add'>+	struct device_node *child, *sound = NULL;</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> 	int i, layout = 0, rlen, ok = force;</div><div class='del'>-	static const char *rnames[] = { "i2sbus: %s (control)",</div><div class='del'>-					"i2sbus: %s (tx)",</div><div class='del'>-					"i2sbus: %s (rx)" };</div><div class='del'>-	static irq_handler_t ints[] = {</div><div class='add'>+	char node_name[8];</div><div class='add'>+	static const char *rnames[] = { "i2sbus: %pOFn (control)",</div><div class='add'>+					"i2sbus: %pOFn (tx)",</div><div class='add'>+					"i2sbus: %pOFn (rx)" };</div><div class='add'>+	static const irq_handler_t ints[] = {</div><div class='ctx'> 		i2sbus_bus_intr,</div><div class='ctx'> 		i2sbus_tx_intr,</div><div class='ctx'> 		i2sbus_rx_intr</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (strlen(np-&gt;name) != 5)</div><div class='add'>+	if (snprintf(node_name, sizeof(node_name), "%pOFn", np) != 5)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (strncmp(np-&gt;name, "i2s-", 4))</div><div class='add'>+	if (strncmp(node_name, "i2s-", 4))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL);</div><div class='hunk'>@@ -180,8 +176,8 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	i = 0;</div><div class='del'>-	while ((child = of_get_next_child(np, child))) {</div><div class='del'>-		if (strcmp(child-&gt;name, "sound") == 0) {</div><div class='add'>+	for_each_child_of_node(np, child) {</div><div class='add'>+		if (of_node_name_eq(child, "sound")) {</div><div class='ctx'> 			i++;</div><div class='ctx'> 			sound = child;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -200,7 +196,8 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 			 * We probably cannot handle all device-id machines,</div><div class='ctx'> 			 * so restrict to those we do handle for now.</div><div class='ctx'> 			 */</div><div class='del'>-			if (id &amp;&amp; (*id == 22 || *id == 14 || *id == 35)) {</div><div class='add'>+			if (id &amp;&amp; (*id == 22 || *id == 14 || *id == 35 ||</div><div class='add'>+				   *id == 31 || *id == 44)) {</div><div class='ctx'> 				snprintf(dev-&gt;sound.modalias, 32,</div><div class='ctx'> 					 "aoa-device-id-%d", *id);</div><div class='ctx'> 				ok = 1;</div><div class='hunk'>@@ -216,7 +213,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 	 * either as the second one in that case is just a modem. */</div><div class='ctx'> 	if (!ok) {</div><div class='ctx'> 		kfree(dev);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;dev-&gt;lock);</div><div class='hunk'>@@ -231,13 +228,13 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 	dev-&gt;sound.pcmid = -1;</div><div class='ctx'> 	dev-&gt;macio = macio;</div><div class='ctx'> 	dev-&gt;control = control;</div><div class='del'>-	dev-&gt;bus_number = np-&gt;name[4] - 'a';</div><div class='add'>+	dev-&gt;bus_number = node_name[4] - 'a';</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;dev-&gt;sound.codec_list);</div><div class='ctx'> </div><div class='ctx'> 	for (i = aoa_resource_i2smmio; i &lt;= aoa_resource_rxdbdma; i++) {</div><div class='ctx'> 		dev-&gt;interrupts[i] = -1;</div><div class='ctx'> 		snprintf(dev-&gt;rnames[i], sizeof(dev-&gt;rnames[i]),</div><div class='del'>-			 rnames[i], np-&gt;name);</div><div class='add'>+			 rnames[i], np);</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = aoa_resource_i2smmio; i &lt;= aoa_resource_rxdbdma; i++) {</div><div class='ctx'> 		int irq = irq_of_parse_and_map(np, i);</div><div class='hunk'>@@ -262,8 +259,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev-&gt;allocated_resource[i] =</div><div class='ctx'> 			request_mem_region(dev-&gt;resources[i].start,</div><div class='del'>-					   dev-&gt;resources[i].end -</div><div class='del'>-					   dev-&gt;resources[i].start + 1,</div><div class='add'>+					   resource_size(&amp;dev-&gt;resources[i]),</div><div class='ctx'> 					   dev-&gt;rnames[i]);</div><div class='ctx'> 		if (!dev-&gt;allocated_resource[i]) {</div><div class='ctx'> 			printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i);</div><div class='hunk'>@@ -272,19 +268,19 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = &amp;dev-&gt;resources[aoa_resource_i2smmio];</div><div class='del'>-	rlen = r-&gt;end - r-&gt;start + 1;</div><div class='add'>+	rlen = resource_size(r);</div><div class='ctx'> 	if (rlen &lt; sizeof(struct i2s_interface_regs))</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	dev-&gt;intfregs = ioremap(r-&gt;start, rlen);</div><div class='ctx'> </div><div class='ctx'> 	r = &amp;dev-&gt;resources[aoa_resource_txdbdma];</div><div class='del'>-	rlen = r-&gt;end - r-&gt;start + 1;</div><div class='add'>+	rlen = resource_size(r);</div><div class='ctx'> 	if (rlen &lt; sizeof(struct dbdma_regs))</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	dev-&gt;out.dbdma = ioremap(r-&gt;start, rlen);</div><div class='ctx'> </div><div class='ctx'> 	r = &amp;dev-&gt;resources[aoa_resource_rxdbdma];</div><div class='del'>-	rlen = r-&gt;end - r-&gt;start + 1;</div><div class='add'>+	rlen = resource_size(r);</div><div class='ctx'> 	if (rlen &lt; sizeof(struct dbdma_regs))</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	dev-&gt;in.dbdma = ioremap(r-&gt;start, rlen);</div><div class='hunk'>@@ -306,6 +302,10 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> </div><div class='ctx'> 	if (soundbus_add_one(&amp;dev-&gt;sound)) {</div><div class='ctx'> 		printk(KERN_DEBUG "i2sbus: device registration error!\n");</div><div class='add'>+		if (dev-&gt;sound.ofdev.dev.kobj.state_initialized) {</div><div class='add'>+			soundbus_dev_put(&amp;dev-&gt;sound);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -321,12 +321,11 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> 			free_irq(dev-&gt;interrupts[i], dev);</div><div class='ctx'> 	free_dbdma_descriptor_ring(dev, &amp;dev-&gt;out.dbdma_ring);</div><div class='ctx'> 	free_dbdma_descriptor_ring(dev, &amp;dev-&gt;in.dbdma_ring);</div><div class='del'>-	if (dev-&gt;intfregs) iounmap(dev-&gt;intfregs);</div><div class='del'>-	if (dev-&gt;out.dbdma) iounmap(dev-&gt;out.dbdma);</div><div class='del'>-	if (dev-&gt;in.dbdma) iounmap(dev-&gt;in.dbdma);</div><div class='add'>+	iounmap(dev-&gt;intfregs);</div><div class='add'>+	iounmap(dev-&gt;out.dbdma);</div><div class='add'>+	iounmap(dev-&gt;in.dbdma);</div><div class='ctx'> 	for (i=0;i&lt;3;i++)</div><div class='del'>-		if (dev-&gt;allocated_resource[i])</div><div class='del'>-			release_and_free_resource(dev-&gt;allocated_resource[i]);</div><div class='add'>+		release_and_free_resource(dev-&gt;allocated_resource[i]);</div><div class='ctx'> 	mutex_destroy(&amp;dev-&gt;lock);</div><div class='ctx'> 	kfree(dev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -334,7 +333,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,</div><div class='ctx'> </div><div class='ctx'> static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np = NULL;</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> 	int got = 0, err;</div><div class='ctx'> 	struct i2sbus_control *control = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +345,7 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while ((np = of_get_next_child(dev-&gt;ofdev.dev.of_node, np))) {</div><div class='add'>+	for_each_child_of_node(dev-&gt;ofdev.dev.of_node, np) {</div><div class='ctx'> 		if (of_device_is_compatible(np, "i2sbus") ||</div><div class='ctx'> 		    of_device_is_compatible(np, "i2s-modem")) {</div><div class='ctx'> 			got += i2sbus_add_dev(dev, control, np);</div><div class='hunk'>@@ -364,15 +363,13 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int i2sbus_remove(struct macio_dev* dev)</div><div class='add'>+static void i2sbus_remove(struct macio_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2sbus_control *control = dev_get_drvdata(&amp;dev-&gt;ofdev.dev);</div><div class='ctx'> 	struct i2sbus_dev *i2sdev, *tmp;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(i2sdev, tmp, &amp;control-&gt;list, item)</div><div class='ctx'> 		soundbus_remove_one(&amp;i2sdev-&gt;sound);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -384,12 +381,6 @@ static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state)</div><div class='ctx'> 	int err, ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(i2sdev, &amp;control-&gt;list, item) {</div><div class='del'>-		/* Notify Alsa */</div><div class='del'>-		if (i2sdev-&gt;sound.pcm) {</div><div class='del'>-			/* Suspend PCM streams */</div><div class='del'>-			snd_pcm_suspend_all(i2sdev-&gt;sound.pcm);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* Notify codecs */</div><div class='ctx'> 		list_for_each_entry(cii, &amp;i2sdev-&gt;sound.codec_list, list) {</div><div class='ctx'> 			err = 0;</div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/i2sbus.h b/sound/aoa/soundbus/i2sbus/i2sbus.h<br/>index befefd99e271..7a3cae0d6c26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/i2sbus.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/i2sbus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/i2sbus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/i2sbus.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * i2sbus driver -- private definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __I2SBUS_H</div><div class='ctx'> #define __I2SBUS_H</div><div class='hunk'>@@ -14,7 +13,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include &lt;asm/dbdma.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/interface.h b/sound/aoa/soundbus/i2sbus/interface.h<br/>index c6b5f5452d20..a136274266ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/interface.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/interface.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/interface.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * i2sbus driver -- interface register definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __I2SBUS_INTERFACE_H</div><div class='ctx'> #define __I2SBUS_INTERFACE_H</div><div class='hunk'>@@ -35,7 +34,7 @@ struct i2s_interface_regs {</div><div class='ctx'> 	__le32 peak_level_in1;	/* 0x90 */</div><div class='ctx'> 	PAD(12);</div><div class='ctx'> 	/* total size: 0x100 bytes */</div><div class='del'>-}  __attribute__((__packed__));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> /* interrupt register is just a bitfield with</div><div class='ctx'>  * interrupt enable and pending bits */</div><div class='head'>diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c<br/>index be838993926d..4c480ad2c05d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/i2sbus/pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/i2sbus/pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/i2sbus/pcm.c</a></div><div class='hunk'>@@ -1,17 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * i2sbus driver -- pcm routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;asm/macio.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include "../soundbus.h"</div><div class='ctx'> #include "i2sbus.h"</div><div class='ctx'> </div><div class='hunk'>@@ -79,11 +79,10 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	u64 formats = 0;</div><div class='ctx'> 	unsigned int rates = 0;</div><div class='ctx'> 	struct transfer_info v;</div><div class='del'>-	int result = 0;</div><div class='ctx'> 	int bus_factor = 0, sysclock_factor = 0;</div><div class='ctx'> 	int found_this;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;i2sdev-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;i2sdev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	get_pcm_info(i2sdev, in, &amp;pi, &amp;other);</div><div class='ctx'> </div><div class='hunk'>@@ -92,8 +91,7 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> </div><div class='ctx'> 	if (pi-&gt;active) {</div><div class='ctx'> 		/* alsa messed up */</div><div class='del'>-		result = -EBUSY;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* we now need to assign the hw */</div><div class='hunk'>@@ -117,10 +115,8 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 			ti++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!masks_inited || !bus_factor || !sysclock_factor) {</div><div class='del'>-		result = -ENODEV;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!masks_inited || !bus_factor || !sysclock_factor)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	/* bus dependent stuff */</div><div class='ctx'> 	hw-&gt;info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 		   SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_RESUME |</div><div class='hunk'>@@ -178,7 +174,7 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (other-&gt;active) {</div><div class='ctx'> 		/* FIXME: is this guaranteed by the alsa api? */</div><div class='del'>-		hw-&gt;formats &amp;= (1ULL &lt;&lt; i2sdev-&gt;format);</div><div class='add'>+		hw-&gt;formats &amp;= pcm_format_to_bits(i2sdev-&gt;format);</div><div class='ctx'> 		/* see above, restrict rates to the one we already have */</div><div class='ctx'> 		hw-&gt;rate_min = i2sdev-&gt;rate;</div><div class='ctx'> 		hw-&gt;rate_max = i2sdev-&gt;rate;</div><div class='hunk'>@@ -194,15 +190,12 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	hw-&gt;periods_max = MAX_DBDMA_COMMANDS;</div><div class='ctx'> 	err = snd_pcm_hw_constraint_integer(pi-&gt;substream-&gt;runtime,</div><div class='ctx'> 					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		result = err;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	list_for_each_entry(cii, &amp;sdev-&gt;codec_list, list) {</div><div class='ctx'> 		if (cii-&gt;codec-&gt;open) {</div><div class='ctx'> 			err = cii-&gt;codec-&gt;open(cii, pi-&gt;substream);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				result = err;</div><div class='ctx'> 				/* unwind */</div><div class='ctx'> 				found_this = 0;</div><div class='ctx'> 				list_for_each_entry_reverse(rev,</div><div class='hunk'>@@ -214,14 +207,12 @@ static int i2sbus_pcm_open(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 					if (rev == cii)</div><div class='ctx'> 						found_this = 1;</div><div class='ctx'> 				}</div><div class='del'>-				goto out_unlock;</div><div class='add'>+				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;i2sdev-&gt;lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef CHECK_RATE</div><div class='hunk'>@@ -232,7 +223,7 @@ static int i2sbus_pcm_close(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	struct pcm_info *pi;</div><div class='ctx'> 	int err = 0, tmp;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;i2sdev-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;i2sdev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	get_pcm_info(i2sdev, in, &amp;pi, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -246,7 +237,6 @@ static int i2sbus_pcm_close(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> </div><div class='ctx'> 	pi-&gt;substream = NULL;</div><div class='ctx'> 	pi-&gt;active = 0;</div><div class='del'>-	mutex_unlock(&amp;i2sdev-&gt;lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -254,26 +244,25 @@ static void i2sbus_wait_for_stop(struct i2sbus_dev *i2sdev,</div><div class='ctx'> 				 struct pcm_info *pi)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	struct completion done;</div><div class='del'>-	long timeout;</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(done);</div><div class='add'>+	unsigned long time_left;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;i2sdev-&gt;low_lock, flags);</div><div class='ctx'> 	if (pi-&gt;dbdma_ring.stopping) {</div><div class='del'>-		init_completion(&amp;done);</div><div class='ctx'> 		pi-&gt;stop_completion = &amp;done;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;i2sdev-&gt;low_lock, flags);</div><div class='del'>-		timeout = wait_for_completion_timeout(&amp;done, HZ);</div><div class='add'>+		time_left = wait_for_completion_timeout(&amp;done, HZ);</div><div class='ctx'> 		spin_lock_irqsave(&amp;i2sdev-&gt;low_lock, flags);</div><div class='ctx'> 		pi-&gt;stop_completion = NULL;</div><div class='del'>-		if (timeout == 0) {</div><div class='add'>+		if (time_left == 0) {</div><div class='ctx'> 			/* timeout expired, stop dbdma forcefully */</div><div class='ctx'> 			printk(KERN_ERR "i2sbus_wait_for_stop: timed out\n");</div><div class='ctx'> 			/* make sure RUN, PAUSE and S0 bits are cleared */</div><div class='ctx'> 			out_le32(&amp;pi-&gt;dbdma-&gt;control, (RUN | PAUSE | 1) &lt;&lt; 16);</div><div class='ctx'> 			pi-&gt;dbdma_ring.stopping = 0;</div><div class='del'>-			timeout = 10;</div><div class='add'>+			time_left = 10;</div><div class='ctx'> 			while (in_le32(&amp;pi-&gt;dbdma-&gt;status) &amp; ACTIVE) {</div><div class='del'>-				if (--timeout &lt;= 0)</div><div class='add'>+				if (--time_left &lt;= 0)</div><div class='ctx'> 					break;</div><div class='ctx'> 				udelay(1);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -294,12 +283,6 @@ void i2sbus_wait_for_stop_both(struct i2sbus_dev *i2sdev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int i2sbus_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			    struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int i2sbus_hw_free(struct snd_pcm_substream *substream, int in)</div><div class='ctx'> {</div><div class='ctx'> 	struct i2sbus_dev *i2sdev = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -308,7 +291,6 @@ static inline int i2sbus_hw_free(struct snd_pcm_substream *substream, int in)</div><div class='ctx'> 	get_pcm_info(i2sdev, in, &amp;pi, NULL);</div><div class='ctx'> 	if (pi-&gt;dbdma_ring.stopping)</div><div class='ctx'> 		i2sbus_wait_for_stop(i2sdev, pi);</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -338,33 +320,26 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	int input_16bit;</div><div class='ctx'> 	struct pcm_info *pi, *other;</div><div class='ctx'> 	int cnt;</div><div class='del'>-	int result = 0;</div><div class='ctx'> 	unsigned int cmd, stopaddr;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;i2sdev-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;i2sdev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	get_pcm_info(i2sdev, in, &amp;pi, &amp;other);</div><div class='ctx'> </div><div class='del'>-	if (pi-&gt;dbdma_ring.running) {</div><div class='del'>-		result = -EBUSY;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (pi-&gt;dbdma_ring.running)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	if (pi-&gt;dbdma_ring.stopping)</div><div class='ctx'> 		i2sbus_wait_for_stop(i2sdev, pi);</div><div class='ctx'> </div><div class='del'>-	if (!pi-&gt;substream || !pi-&gt;substream-&gt;runtime) {</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!pi-&gt;substream || !pi-&gt;substream-&gt;runtime)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	runtime = pi-&gt;substream-&gt;runtime;</div><div class='ctx'> 	pi-&gt;active = 1;</div><div class='ctx'> 	if (other-&gt;active &amp;&amp;</div><div class='ctx'> 	    ((i2sdev-&gt;format != runtime-&gt;format)</div><div class='del'>-	     || (i2sdev-&gt;rate != runtime-&gt;rate))) {</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+	     || (i2sdev-&gt;rate != runtime-&gt;rate)))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	i2sdev-&gt;format = runtime-&gt;format;</div><div class='ctx'> 	i2sdev-&gt;rate = runtime-&gt;rate;</div><div class='hunk'>@@ -420,10 +395,8 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 			bi.bus_factor = cii-&gt;codec-&gt;bus_factor;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (!bi.bus_factor) {</div><div class='del'>-			result = -ENODEV;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!bi.bus_factor)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		input_16bit = 1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_S32_BE:</div><div class='hunk'>@@ -434,8 +407,7 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 		input_16bit = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* we assume all sysclocks are the same! */</div><div class='ctx'> 	list_for_each_entry(cii, &amp;i2sdev-&gt;sound.codec_list, list) {</div><div class='hunk'>@@ -446,10 +418,8 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	if (clock_and_divisors(bi.sysclock_factor,</div><div class='ctx'> 			       bi.bus_factor,</div><div class='ctx'> 			       runtime-&gt;rate,</div><div class='del'>-			       &amp;sfr) &lt; 0) {</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	}</div><div class='add'>+			       &amp;sfr) &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	switch (bi.bus_factor) {</div><div class='ctx'> 	case 32:</div><div class='ctx'> 		sfr |= I2S_SF_SERIAL_FORMAT_I2S_32X;</div><div class='hunk'>@@ -465,10 +435,8 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 		int err = 0;</div><div class='ctx'> 		if (cii-&gt;codec-&gt;prepare)</div><div class='ctx'> 			err = cii-&gt;codec-&gt;prepare(cii, &amp;bi, pi-&gt;substream);</div><div class='del'>-		if (err) {</div><div class='del'>-			result = err;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* codecs are fine with it, so set our clocks */</div><div class='ctx'> 	if (input_16bit)</div><div class='hunk'>@@ -484,7 +452,7 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	/* not locking these is fine since we touch them only in this function */</div><div class='ctx'> 	if (in_le32(&amp;i2sdev-&gt;intfregs-&gt;serial_format) == sfr</div><div class='ctx'> 	 &amp;&amp; in_le32(&amp;i2sdev-&gt;intfregs-&gt;data_word_sizes) == dws)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* let's notify the codecs about clocks going away.</div><div class='ctx'> 	 * For now we only do mastering on the i2s cell... */</div><div class='hunk'>@@ -522,9 +490,7 @@ static int i2sbus_pcm_prepare(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 		if (cii-&gt;codec-&gt;switch_clock)</div><div class='ctx'> 			cii-&gt;codec-&gt;switch_clock(cii, CLOCK_SWITCH_SLAVE);</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	mutex_unlock(&amp;i2sdev-&gt;lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -539,20 +505,16 @@ static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct codec_info_item *cii;</div><div class='ctx'> 	struct pcm_info *pi;</div><div class='del'>-	int result = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;i2sdev-&gt;low_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;i2sdev-&gt;low_lock);</div><div class='ctx'> </div><div class='ctx'> 	get_pcm_info(i2sdev, in, &amp;pi, NULL);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		if (pi-&gt;dbdma_ring.running) {</div><div class='del'>-			result = -EALREADY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (pi-&gt;dbdma_ring.running)</div><div class='add'>+			return -EALREADY;</div><div class='ctx'> 		list_for_each_entry(cii, &amp;i2sdev-&gt;sound.codec_list, list)</div><div class='ctx'> 			if (cii-&gt;codec-&gt;start)</div><div class='ctx'> 				cii-&gt;codec-&gt;start(cii, pi-&gt;substream);</div><div class='hunk'>@@ -566,7 +528,7 @@ static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)</div><div class='ctx'> 				udelay(10);</div><div class='ctx'> 				if (in_le32(&amp;pi-&gt;dbdma-&gt;status) &amp; ACTIVE) {</div><div class='ctx'> 					pi-&gt;dbdma_ring.stopping = 0;</div><div class='del'>-					goto out_unlock; /* keep running */</div><div class='add'>+					return 0; /* keep running */</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -592,10 +554,8 @@ static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		if (!pi-&gt;dbdma_ring.running) {</div><div class='del'>-			result = -EALREADY;</div><div class='del'>-			goto out_unlock;</div><div class='del'>-		}</div><div class='add'>+		if (!pi-&gt;dbdma_ring.running)</div><div class='add'>+			return -EALREADY;</div><div class='ctx'> 		pi-&gt;dbdma_ring.running = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* Set the S0 bit to make the DMA branch to the stop cmd */</div><div class='hunk'>@@ -607,13 +567,10 @@ static int i2sbus_pcm_trigger(struct i2sbus_dev *i2sdev, int in, int cmd)</div><div class='ctx'> 				cii-&gt;codec-&gt;stop(cii, pi-&gt;substream);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		goto out_unlock;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- out_unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;i2sdev-&gt;low_lock, flags);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t i2sbus_pcm_pointer(struct i2sbus_dev *i2sdev, int in)</div><div class='hunk'>@@ -640,70 +597,67 @@ static inline void handle_interrupt(struct i2sbus_dev *i2sdev, int in)</div><div class='ctx'> 	int dma_stopped = 0;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;i2sdev-&gt;low_lock);</div><div class='del'>-	get_pcm_info(i2sdev, in, &amp;pi, NULL);</div><div class='del'>-	if (!pi-&gt;dbdma_ring.running &amp;&amp; !pi-&gt;dbdma_ring.stopping)</div><div class='del'>-		goto out_unlock;</div><div class='add'>+	scoped_guard(spinlock, &amp;i2sdev-&gt;low_lock) {</div><div class='add'>+		get_pcm_info(i2sdev, in, &amp;pi, NULL);</div><div class='add'>+		if (!pi-&gt;dbdma_ring.running &amp;&amp; !pi-&gt;dbdma_ring.stopping)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		i = pi-&gt;current_period;</div><div class='add'>+		runtime = pi-&gt;substream-&gt;runtime;</div><div class='add'>+		while (pi-&gt;dbdma_ring.cmds[i].xfer_status) {</div><div class='add'>+			if (le16_to_cpu(pi-&gt;dbdma_ring.cmds[i].xfer_status) &amp; BT)</div><div class='add'>+				/*</div><div class='add'>+				 * BT is the branch taken bit.  If it took a branch</div><div class='add'>+				 * it is because we set the S0 bit to make it</div><div class='add'>+				 * branch to the stop command.</div><div class='add'>+				 */</div><div class='add'>+				dma_stopped = 1;</div><div class='add'>+			pi-&gt;dbdma_ring.cmds[i].xfer_status = 0;</div><div class='add'>+</div><div class='add'>+			if (++i &gt;= runtime-&gt;periods) {</div><div class='add'>+				i = 0;</div><div class='add'>+				pi-&gt;frame_count += runtime-&gt;buffer_size;</div><div class='add'>+			}</div><div class='add'>+			pi-&gt;current_period = i;</div><div class='ctx'> </div><div class='del'>-	i = pi-&gt;current_period;</div><div class='del'>-	runtime = pi-&gt;substream-&gt;runtime;</div><div class='del'>-	while (pi-&gt;dbdma_ring.cmds[i].xfer_status) {</div><div class='del'>-		if (le16_to_cpu(pi-&gt;dbdma_ring.cmds[i].xfer_status) &amp; BT)</div><div class='ctx'> 			/*</div><div class='del'>-			 * BT is the branch taken bit.  If it took a branch</div><div class='del'>-			 * it is because we set the S0 bit to make it</div><div class='del'>-			 * branch to the stop command.</div><div class='add'>+			 * Check the frame count.  The DMA tends to get a bit</div><div class='add'>+			 * ahead of the frame counter, which confuses the core.</div><div class='ctx'> 			 */</div><div class='del'>-			dma_stopped = 1;</div><div class='del'>-		pi-&gt;dbdma_ring.cmds[i].xfer_status = 0;</div><div class='del'>-</div><div class='del'>-		if (++i &gt;= runtime-&gt;periods) {</div><div class='del'>-			i = 0;</div><div class='del'>-			pi-&gt;frame_count += runtime-&gt;buffer_size;</div><div class='add'>+			fc = in_le32(&amp;i2sdev-&gt;intfregs-&gt;frame_count);</div><div class='add'>+			nframes = i * runtime-&gt;period_size;</div><div class='add'>+			if (fc &lt; pi-&gt;frame_count + nframes)</div><div class='add'>+				pi-&gt;frame_count = fc - nframes;</div><div class='ctx'> 		}</div><div class='del'>-		pi-&gt;current_period = i;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check the frame count.  The DMA tends to get a bit</div><div class='del'>-		 * ahead of the frame counter, which confuses the core.</div><div class='del'>-		 */</div><div class='del'>-		fc = in_le32(&amp;i2sdev-&gt;intfregs-&gt;frame_count);</div><div class='del'>-		nframes = i * runtime-&gt;period_size;</div><div class='del'>-		if (fc &lt; pi-&gt;frame_count + nframes)</div><div class='del'>-			pi-&gt;frame_count = fc - nframes;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (dma_stopped) {</div><div class='del'>-		timeout = 1000;</div><div class='del'>-		for (;;) {</div><div class='del'>-			status = in_le32(&amp;pi-&gt;dbdma-&gt;status);</div><div class='del'>-			if (!(status &amp; ACTIVE) &amp;&amp; (!in || (status &amp; 0x80)))</div><div class='del'>-				break;</div><div class='del'>-			if (--timeout &lt;= 0) {</div><div class='del'>-				printk(KERN_ERR "i2sbus: timed out "</div><div class='del'>-				       "waiting for DMA to stop!\n");</div><div class='del'>-				break;</div><div class='add'>+		if (dma_stopped) {</div><div class='add'>+			timeout = 1000;</div><div class='add'>+			for (;;) {</div><div class='add'>+				status = in_le32(&amp;pi-&gt;dbdma-&gt;status);</div><div class='add'>+				if (!(status &amp; ACTIVE) &amp;&amp; (!in || (status &amp; 0x80)))</div><div class='add'>+					break;</div><div class='add'>+				if (--timeout &lt;= 0) {</div><div class='add'>+					printk(KERN_ERR</div><div class='add'>+					       "i2sbus: timed out waiting for DMA to stop!\n");</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				udelay(1);</div><div class='ctx'> 			}</div><div class='del'>-			udelay(1);</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Turn off DMA controller, clear S0 bit */</div><div class='del'>-		out_le32(&amp;pi-&gt;dbdma-&gt;control, (RUN | PAUSE | 1) &lt;&lt; 16);</div><div class='add'>+			/* Turn off DMA controller, clear S0 bit */</div><div class='add'>+			out_le32(&amp;pi-&gt;dbdma-&gt;control, (RUN | PAUSE | 1) &lt;&lt; 16);</div><div class='ctx'> </div><div class='del'>-		pi-&gt;dbdma_ring.stopping = 0;</div><div class='del'>-		if (pi-&gt;stop_completion)</div><div class='del'>-			complete(pi-&gt;stop_completion);</div><div class='add'>+			pi-&gt;dbdma_ring.stopping = 0;</div><div class='add'>+			if (pi-&gt;stop_completion)</div><div class='add'>+				complete(pi-&gt;stop_completion);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!pi-&gt;dbdma_ring.running)</div><div class='add'>+			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!pi-&gt;dbdma_ring.running)</div><div class='del'>-		goto out_unlock;</div><div class='del'>-	spin_unlock(&amp;i2sdev-&gt;low_lock);</div><div class='ctx'> 	/* may call _trigger again, hence needs to be unlocked */</div><div class='ctx'> 	snd_pcm_period_elapsed(pi-&gt;substream);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- out_unlock:</div><div class='del'>-	spin_unlock(&amp;i2sdev-&gt;low_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t i2sbus_tx_intr(int irq, void *devid)</div><div class='hunk'>@@ -777,11 +731,9 @@ static snd_pcm_uframes_t i2sbus_playback_pointer(struct snd_pcm_substream</div><div class='ctx'> 	return i2sbus_pcm_pointer(i2sdev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops i2sbus_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops i2sbus_playback_ops = {</div><div class='ctx'> 	.open =		i2sbus_playback_open,</div><div class='ctx'> 	.close =	i2sbus_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	i2sbus_hw_params,</div><div class='ctx'> 	.hw_free =	i2sbus_playback_hw_free,</div><div class='ctx'> 	.prepare =	i2sbus_playback_prepare,</div><div class='ctx'> 	.trigger =	i2sbus_playback_trigger,</div><div class='hunk'>@@ -847,11 +799,9 @@ static snd_pcm_uframes_t i2sbus_record_pointer(struct snd_pcm_substream</div><div class='ctx'> 	return i2sbus_pcm_pointer(i2sdev, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops i2sbus_record_ops = {</div><div class='add'>+static const struct snd_pcm_ops i2sbus_record_ops = {</div><div class='ctx'> 	.open =		i2sbus_record_open,</div><div class='ctx'> 	.close =	i2sbus_record_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	i2sbus_hw_params,</div><div class='ctx'> 	.hw_free =	i2sbus_record_hw_free,</div><div class='ctx'> 	.prepare =	i2sbus_record_prepare,</div><div class='ctx'> 	.trigger =	i2sbus_record_trigger,</div><div class='hunk'>@@ -930,10 +880,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cii = kzalloc(sizeof(struct codec_info_item), GFP_KERNEL);</div><div class='del'>-	if (!cii) {</div><div class='del'>-		printk(KERN_DEBUG "i2sbus: failed to allocate cii\n");</div><div class='add'>+	if (!cii)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* use the private data to point to the codec info */</div><div class='ctx'> 	cii-&gt;sdev = soundbus_dev_get(dev);</div><div class='hunk'>@@ -967,7 +915,6 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,</div><div class='ctx'> 			printk(KERN_DEBUG "i2sbus: failed to create pcm\n");</div><div class='ctx'> 			goto out_put_ci_module;</div><div class='ctx'> 		}</div><div class='del'>-		dev-&gt;pcm-&gt;dev = &amp;dev-&gt;ofdev.dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ALSA yet again sucks.</div><div class='hunk'>@@ -987,6 +934,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,</div><div class='ctx'> 			goto out_put_ci_module;</div><div class='ctx'> 		snd_pcm_set_ops(dev-&gt;pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='ctx'> 				&amp;i2sbus_playback_ops);</div><div class='add'>+		dev-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].dev-&gt;parent =</div><div class='add'>+			&amp;dev-&gt;ofdev.dev;</div><div class='ctx'> 		i2sdev-&gt;out.created = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1002,6 +951,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,</div><div class='ctx'> 			goto out_put_ci_module;</div><div class='ctx'> 		snd_pcm_set_ops(dev-&gt;pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='ctx'> 				&amp;i2sbus_record_ops);</div><div class='add'>+		dev-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].dev-&gt;parent =</div><div class='add'>+			&amp;dev-&gt;ofdev.dev;</div><div class='ctx'> 		i2sdev-&gt;in.created = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1023,9 +974,9 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,</div><div class='ctx'> 	dev-&gt;pcm-&gt;private_free = i2sbus_private_free;</div><div class='ctx'> </div><div class='ctx'> 	/* well, we really should support scatter/gather DMA */</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(</div><div class='add'>+	snd_pcm_set_managed_buffer_all(</div><div class='ctx'> 		dev-&gt;pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-		snd_dma_pci_data(macio_get_pci_dev(i2sdev-&gt;macio)),</div><div class='add'>+		&amp;macio_get_pci_dev(i2sdev-&gt;macio)-&gt;dev,</div><div class='ctx'> 		64 * 1024, 64 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h<br/>index adecbf36f4f6..877cbad93f12 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/soundbus.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/soundbus.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/soundbus.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/soundbus.h</a></div><div class='hunk'>@@ -1,14 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * soundbus generic definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2006 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='del'>- *</div><div class='del'>- * GPL v2, can be found in COPYING.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SOUNDBUS_H</div><div class='ctx'> #define __SOUNDBUS_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -186,10 +185,8 @@ struct soundbus_driver {</div><div class='ctx'> 	/* we don't implement any matching at all */</div><div class='ctx'> </div><div class='ctx'> 	int	(*probe)(struct soundbus_dev* dev);</div><div class='del'>-	int	(*remove)(struct soundbus_dev* dev);</div><div class='add'>+	void	(*remove)(struct soundbus_dev *dev);</div><div class='ctx'> </div><div class='del'>-	int	(*suspend)(struct soundbus_dev* dev, pm_message_t state);</div><div class='del'>-	int	(*resume)(struct soundbus_dev* dev);</div><div class='ctx'> 	int	(*shutdown)(struct soundbus_dev* dev);</div><div class='ctx'> </div><div class='ctx'> 	struct device_driver driver;</div><div class='hunk'>@@ -199,6 +196,6 @@ struct soundbus_driver {</div><div class='ctx'> extern int soundbus_register_driver(struct soundbus_driver *drv);</div><div class='ctx'> extern void soundbus_unregister_driver(struct soundbus_driver *drv);</div><div class='ctx'> </div><div class='del'>-extern struct device_attribute soundbus_dev_attrs[];</div><div class='add'>+extern struct attribute *soundbus_dev_attrs[];</div><div class='ctx'> </div><div class='ctx'> #endif /* __SOUNDBUS_H */</div><div class='head'>diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c<br/>index e0980b5c2cd8..e87b28428b99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/sysfs.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/aoa/soundbus/sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/aoa/soundbus/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/aoa/soundbus/sysfs.c</a></div><div class='hunk'>@@ -1,42 +1,48 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/stat.h&gt;</div><div class='ctx'> /* FIX UP */</div><div class='ctx'> #include "soundbus.h"</div><div class='ctx'> </div><div class='del'>-#define soundbus_config_of_attr(field, format_string)			\</div><div class='del'>-static ssize_t								\</div><div class='del'>-field##_show (struct device *dev, struct device_attribute *attr,	\</div><div class='del'>-              char *buf)						\</div><div class='del'>-{									\</div><div class='del'>-	struct soundbus_dev *mdev = to_soundbus_device (dev);		\</div><div class='del'>-	return sprintf (buf, format_string, mdev-&gt;ofdev.dev.of_node-&gt;field); \</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> 			     char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct soundbus_dev *sdev = to_soundbus_device(dev);</div><div class='ctx'> 	struct platform_device *of = &amp;sdev-&gt;ofdev;</div><div class='del'>-	int length;</div><div class='ctx'> </div><div class='del'>-	if (*sdev-&gt;modalias) {</div><div class='del'>-		strlcpy(buf, sdev-&gt;modalias, sizeof(sdev-&gt;modalias) + 1);</div><div class='del'>-		strcat(buf, "\n");</div><div class='del'>-		length = strlen(buf);</div><div class='del'>-	} else {</div><div class='del'>-		length = sprintf(buf, "of:N%sT%s\n",</div><div class='del'>-				 of-&gt;dev.of_node-&gt;name, of-&gt;dev.of_node-&gt;type);</div><div class='del'>-	}</div><div class='add'>+	if (*sdev-&gt;modalias)</div><div class='add'>+		return sysfs_emit(buf, "%s\n", sdev-&gt;modalias);</div><div class='add'>+	else</div><div class='add'>+		return sysfs_emit(buf, "of:N%pOFn%c%s\n",</div><div class='add'>+				  of-&gt;dev.of_node, 'T',</div><div class='add'>+				  of_node_get_device_type(of-&gt;dev.of_node));</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(modalias);</div><div class='add'>+</div><div class='add'>+static ssize_t name_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct soundbus_dev *sdev = to_soundbus_device(dev);</div><div class='add'>+	struct platform_device *of = &amp;sdev-&gt;ofdev;</div><div class='ctx'> </div><div class='del'>-	return length;</div><div class='add'>+	return sysfs_emit(buf, "%pOFn\n", of-&gt;dev.of_node);</div><div class='ctx'> }</div><div class='add'>+static DEVICE_ATTR_RO(name);</div><div class='add'>+</div><div class='add'>+static ssize_t type_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct soundbus_dev *sdev = to_soundbus_device(dev);</div><div class='add'>+	struct platform_device *of = &amp;sdev-&gt;ofdev;</div><div class='ctx'> </div><div class='del'>-soundbus_config_of_attr (name, "%s\n");</div><div class='del'>-soundbus_config_of_attr (type, "%s\n");</div><div class='add'>+	return sysfs_emit(buf, "%s\n", of_node_get_device_type(of-&gt;dev.of_node));</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(type);</div><div class='ctx'> </div><div class='del'>-struct device_attribute soundbus_dev_attrs[] = {</div><div class='del'>-	__ATTR_RO(name),</div><div class='del'>-	__ATTR_RO(type),</div><div class='del'>-	__ATTR_RO(modalias),</div><div class='del'>-	__ATTR_NULL</div><div class='add'>+struct attribute *soundbus_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_name.attr,</div><div class='add'>+	&amp;dev_attr_type.attr,</div><div class='add'>+	&amp;dev_attr_modalias.attr,</div><div class='add'>+	NULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig<br/>index 885683a3b0bd..dea2c661b353 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA ARM drivers</div><div class='ctx'> </div><div class='ctx'> menuconfig SND_ARM</div><div class='hunk'>@@ -17,21 +18,9 @@ config SND_ARMAACI</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> </div><div class='del'>-config SND_PXA2XX_PCM</div><div class='del'>-	tristate</div><div class='del'>-	select SND_PCM</div><div class='del'>-</div><div class='del'>-config SND_PXA2XX_LIB</div><div class='del'>-	tristate</div><div class='del'>-	select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97</div><div class='del'>-</div><div class='del'>-config SND_PXA2XX_LIB_AC97</div><div class='del'>-	bool</div><div class='del'>-</div><div class='ctx'> config SND_PXA2XX_AC97</div><div class='ctx'> 	tristate "AC97 driver for the Intel PXA2xx chip"</div><div class='ctx'> 	depends on ARCH_PXA</div><div class='del'>-	select SND_PXA2XX_PCM</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select SND_PXA2XX_LIB</div><div class='ctx'> 	select SND_PXA2XX_LIB_AC97</div><div class='hunk'>@@ -41,3 +30,9 @@ config SND_PXA2XX_AC97</div><div class='ctx'> </div><div class='ctx'> endif	# SND_ARM</div><div class='ctx'> </div><div class='add'>+config SND_PXA2XX_LIB</div><div class='add'>+	tristate</div><div class='add'>+	select SND_DMAENGINE_PCM</div><div class='add'>+</div><div class='add'>+config SND_PXA2XX_LIB_AC97</div><div class='add'>+	bool</div><div class='head'>diff --git a/sound/arm/Makefile b/sound/arm/Makefile<br/>index 8c0c851d4641..899edb4bb278 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/Makefile</a></div><div class='hunk'>@@ -1,16 +1,14 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_ARMAACI)	+= snd-aaci.o</div><div class='del'>-snd-aaci-objs			:= aaci.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_SND_PXA2XX_PCM)	+= snd-pxa2xx-pcm.o</div><div class='del'>-snd-pxa2xx-pcm-objs		:= pxa2xx-pcm.o</div><div class='add'>+snd-aaci-y			:= aaci.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_PXA2XX_LIB)	+= snd-pxa2xx-lib.o</div><div class='ctx'> snd-pxa2xx-lib-y		:= pxa2xx-pcm-lib.o</div><div class='ctx'> snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_AC97)	+= pxa2xx-ac97-lib.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_PXA2XX_AC97)	+= snd-pxa2xx-ac97.o</div><div class='del'>-snd-pxa2xx-ac97-objs		:= pxa2xx-ac97.o</div><div class='add'>+snd-pxa2xx-ac97-y		:= pxa2xx-ac97.o</div><div class='head'>diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c<br/>index 91acc9a243ec..5548ed8e6b1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/aaci.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/aaci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/aaci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/aaci.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/arm/aaci.c - ARM PrimeCell AACI PL041 driver</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  *  Documentation: ARM DDI 0173B</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -30,6 +27,8 @@</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME	"aaci-pl041"</div><div class='ctx'> </div><div class='add'>+#define FRAME_PERIOD_US	21</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * PM support is not complete.  Turn it off.</div><div class='ctx'>  */</div><div class='hunk'>@@ -48,7 +47,11 @@ static void aaci_ac97_select_codec(struct aaci *aaci, struct snd_ac97 *ac97)</div><div class='ctx'> 	if (v &amp; SLFR_1RXV)</div><div class='ctx'> 		readl(aaci-&gt;base + AACI_SL1RX);</div><div class='ctx'> </div><div class='del'>-	writel(maincr, aaci-&gt;base + AACI_MAINCR);</div><div class='add'>+	if (maincr != readl(aaci-&gt;base + AACI_MAINCR)) {</div><div class='add'>+		writel(maincr, aaci-&gt;base + AACI_MAINCR);</div><div class='add'>+		readl(aaci-&gt;base + AACI_MAINCR);</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -64,13 +67,13 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='ctx'> 			    unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci *aaci = ac97-&gt;private_data;</div><div class='add'>+	int timeout;</div><div class='ctx'> 	u32 v;</div><div class='del'>-	int timeout = 5000;</div><div class='ctx'> </div><div class='ctx'> 	if (ac97-&gt;num &gt;= 4)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;aaci-&gt;ac97_sem);</div><div class='add'>+	guard(mutex)(&amp;aaci-&gt;ac97_sem);</div><div class='ctx'> </div><div class='ctx'> 	aaci_ac97_select_codec(aaci, ac97);</div><div class='ctx'> </div><div class='hunk'>@@ -81,18 +84,19 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='ctx'> 	writel(val &lt;&lt; 4, aaci-&gt;base + AACI_SL2TX);</div><div class='ctx'> 	writel(reg &lt;&lt; 12, aaci-&gt;base + AACI_SL1TX);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Wait for the transmission of both slots to complete.</div><div class='del'>-	 */</div><div class='add'>+	/* Initially, wait one frame period */</div><div class='add'>+	udelay(FRAME_PERIOD_US);</div><div class='add'>+</div><div class='add'>+	/* And then wait an additional eight frame periods for it to be sent */</div><div class='add'>+	timeout = FRAME_PERIOD_US * 8;</div><div class='ctx'> 	do {</div><div class='add'>+		udelay(1);</div><div class='ctx'> 		v = readl(aaci-&gt;base + AACI_SLFR);</div><div class='ctx'> 	} while ((v &amp; (SLFR_1TXB|SLFR_2TXB)) &amp;&amp; --timeout);</div><div class='ctx'> </div><div class='del'>-	if (!timeout)</div><div class='add'>+	if (v &amp; (SLFR_1TXB|SLFR_2TXB))</div><div class='ctx'> 		dev_err(&amp;aaci-&gt;dev-&gt;dev,</div><div class='ctx'> 			"timeout waiting for write to complete\n");</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;aaci-&gt;ac97_sem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -101,14 +105,13 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='ctx'> static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci *aaci = ac97-&gt;private_data;</div><div class='add'>+	int timeout, retries = 10;</div><div class='ctx'> 	u32 v;</div><div class='del'>-	int timeout = 5000;</div><div class='del'>-	int retries = 10;</div><div class='ctx'> </div><div class='ctx'> 	if (ac97-&gt;num &gt;= 4)</div><div class='ctx'> 		return ~0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;aaci-&gt;ac97_sem);</div><div class='add'>+	guard(mutex)(&amp;aaci-&gt;ac97_sem);</div><div class='ctx'> </div><div class='ctx'> 	aaci_ac97_select_codec(aaci, ac97);</div><div class='ctx'> </div><div class='hunk'>@@ -117,38 +120,35 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel((reg &lt;&lt; 12) | (1 &lt;&lt; 19), aaci-&gt;base + AACI_SL1TX);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Wait for the transmission to complete.</div><div class='del'>-	 */</div><div class='add'>+	/* Initially, wait one frame period */</div><div class='add'>+	udelay(FRAME_PERIOD_US);</div><div class='add'>+</div><div class='add'>+	/* And then wait an additional eight frame periods for it to be sent */</div><div class='add'>+	timeout = FRAME_PERIOD_US * 8;</div><div class='ctx'> 	do {</div><div class='add'>+		udelay(1);</div><div class='ctx'> 		v = readl(aaci-&gt;base + AACI_SLFR);</div><div class='ctx'> 	} while ((v &amp; SLFR_1TXB) &amp;&amp; --timeout);</div><div class='ctx'> </div><div class='del'>-	if (!timeout) {</div><div class='add'>+	if (v &amp; SLFR_1TXB) {</div><div class='ctx'> 		dev_err(&amp;aaci-&gt;dev-&gt;dev, "timeout on slot 1 TX busy\n");</div><div class='del'>-		v = ~0;</div><div class='del'>-		goto out;</div><div class='add'>+		return ~0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Give the AC'97 codec more than enough time</div><div class='del'>-	 * to respond. (42us = ~2 frames at 48kHz.)</div><div class='del'>-	 */</div><div class='del'>-	udelay(42);</div><div class='add'>+	/* Now wait for the response frame */</div><div class='add'>+	udelay(FRAME_PERIOD_US);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Wait for slot 2 to indicate data.</div><div class='del'>-	 */</div><div class='del'>-	timeout = 5000;</div><div class='add'>+	/* And then wait an additional eight frame periods for data */</div><div class='add'>+	timeout = FRAME_PERIOD_US * 8;</div><div class='ctx'> 	do {</div><div class='add'>+		udelay(1);</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 		v = readl(aaci-&gt;base + AACI_SLFR) &amp; (SLFR_1RXV|SLFR_2RXV);</div><div class='ctx'> 	} while ((v != (SLFR_1RXV|SLFR_2RXV)) &amp;&amp; --timeout);</div><div class='ctx'> </div><div class='del'>-	if (!timeout) {</div><div class='add'>+	if (v != (SLFR_1RXV|SLFR_2RXV)) {</div><div class='ctx'> 		dev_err(&amp;aaci-&gt;dev-&gt;dev, "timeout on RX valid\n");</div><div class='del'>-		v = ~0;</div><div class='del'>-		goto out;</div><div class='add'>+		return ~0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -167,8 +167,6 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> 			v = ~0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (retries);</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;aaci-&gt;ac97_sem);</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -179,6 +177,7 @@ aaci_chan_wait_ready(struct aaci_runtime *aacirun, unsigned long mask)</div><div class='ctx'> 	int timeout = 5000;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		udelay(1);</div><div class='ctx'> 		val = readl(aacirun-&gt;base + AACI_SR);</div><div class='ctx'> 	} while (val &amp; mask &amp;&amp; timeout--);</div><div class='ctx'> }</div><div class='hunk'>@@ -202,6 +201,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ISR_RXINTR) {</div><div class='ctx'> 		struct aaci_runtime *aacirun = &amp;aaci-&gt;capture;</div><div class='add'>+		bool period_elapsed = false;</div><div class='ctx'> 		void *ptr;</div><div class='ctx'> </div><div class='ctx'> 		if (!aacirun-&gt;substream || !aacirun-&gt;start) {</div><div class='hunk'>@@ -210,48 +210,46 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;aacirun-&gt;lock);</div><div class='del'>-</div><div class='del'>-		ptr = aacirun-&gt;ptr;</div><div class='del'>-		do {</div><div class='del'>-			unsigned int len = aacirun-&gt;fifosz;</div><div class='del'>-			u32 val;</div><div class='del'>-</div><div class='del'>-			if (aacirun-&gt;bytes &lt;= 0) {</div><div class='del'>-				aacirun-&gt;bytes += aacirun-&gt;period;</div><div class='del'>-				aacirun-&gt;ptr = ptr;</div><div class='del'>-				spin_unlock(&amp;aacirun-&gt;lock);</div><div class='del'>-				snd_pcm_period_elapsed(aacirun-&gt;substream);</div><div class='del'>-				spin_lock(&amp;aacirun-&gt;lock);</div><div class='del'>-			}</div><div class='del'>-			if (!(aacirun-&gt;cr &amp; CR_EN))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			val = readl(aacirun-&gt;base + AACI_SR);</div><div class='del'>-			if (!(val &amp; SR_RXHF))</div><div class='del'>-				break;</div><div class='del'>-			if (!(val &amp; SR_RXFF))</div><div class='del'>-				len &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-			aacirun-&gt;bytes -= len;</div><div class='del'>-</div><div class='del'>-			/* reading 16 bytes at a time */</div><div class='del'>-			for( ; len &gt; 0; len -= 16) {</div><div class='del'>-				asm(</div><div class='del'>-					"ldmia	%1, {r0, r1, r2, r3}\n\t"</div><div class='del'>-					"stmia	%0!, {r0, r1, r2, r3}"</div><div class='del'>-					: "+r" (ptr)</div><div class='del'>-					: "r" (aacirun-&gt;fifo)</div><div class='del'>-					: "r0", "r1", "r2", "r3", "cc");</div><div class='del'>-</div><div class='del'>-				if (ptr &gt;= aacirun-&gt;end)</div><div class='del'>-					ptr = aacirun-&gt;start;</div><div class='del'>-			}</div><div class='del'>-		} while(1);</div><div class='del'>-</div><div class='del'>-		aacirun-&gt;ptr = ptr;</div><div class='add'>+		scoped_guard(spinlock, &amp;aacirun-&gt;lock) {</div><div class='add'>+			ptr = aacirun-&gt;ptr;</div><div class='add'>+			do {</div><div class='add'>+				unsigned int len = aacirun-&gt;fifo_bytes;</div><div class='add'>+				u32 val;</div><div class='add'>+</div><div class='add'>+				if (aacirun-&gt;bytes &lt;= 0) {</div><div class='add'>+					aacirun-&gt;bytes += aacirun-&gt;period;</div><div class='add'>+					period_elapsed = true;</div><div class='add'>+				}</div><div class='add'>+				if (!(aacirun-&gt;cr &amp; CR_EN))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				val = readl(aacirun-&gt;base + AACI_SR);</div><div class='add'>+				if (!(val &amp; SR_RXHF))</div><div class='add'>+					break;</div><div class='add'>+				if (!(val &amp; SR_RXFF))</div><div class='add'>+					len &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+				aacirun-&gt;bytes -= len;</div><div class='add'>+</div><div class='add'>+				/* reading 16 bytes at a time */</div><div class='add'>+				for( ; len &gt; 0; len -= 16) {</div><div class='add'>+					asm(</div><div class='add'>+					    "ldmia	%1, {r0, r1, r2, r3}\n\t"</div><div class='add'>+					    "stmia	%0!, {r0, r1, r2, r3}"</div><div class='add'>+					    : "+r" (ptr)</div><div class='add'>+					    : "r" (aacirun-&gt;fifo)</div><div class='add'>+					    : "r0", "r1", "r2", "r3", "cc");</div><div class='add'>+</div><div class='add'>+					if (ptr &gt;= aacirun-&gt;end)</div><div class='add'>+						ptr = aacirun-&gt;start;</div><div class='add'>+				}</div><div class='add'>+			} while(1);</div><div class='add'>+</div><div class='add'>+			aacirun-&gt;ptr = ptr;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;aacirun-&gt;lock);</div><div class='add'>+		if (period_elapsed)</div><div class='add'>+			snd_pcm_period_elapsed(aacirun-&gt;substream);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ISR_URINTR) {</div><div class='hunk'>@@ -261,6 +259,7 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)</div><div class='ctx'> </div><div class='ctx'> 	if (mask &amp; ISR_TXINTR) {</div><div class='ctx'> 		struct aaci_runtime *aacirun = &amp;aaci-&gt;playback;</div><div class='add'>+		bool period_elapsed = false;</div><div class='ctx'> 		void *ptr;</div><div class='ctx'> </div><div class='ctx'> 		if (!aacirun-&gt;substream || !aacirun-&gt;start) {</div><div class='hunk'>@@ -269,48 +268,46 @@ static void aaci_fifo_irq(struct aaci *aaci, int channel, u32 mask)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;aacirun-&gt;lock);</div><div class='del'>-</div><div class='del'>-		ptr = aacirun-&gt;ptr;</div><div class='del'>-		do {</div><div class='del'>-			unsigned int len = aacirun-&gt;fifosz;</div><div class='del'>-			u32 val;</div><div class='del'>-</div><div class='del'>-			if (aacirun-&gt;bytes &lt;= 0) {</div><div class='del'>-				aacirun-&gt;bytes += aacirun-&gt;period;</div><div class='del'>-				aacirun-&gt;ptr = ptr;</div><div class='del'>-				spin_unlock(&amp;aacirun-&gt;lock);</div><div class='del'>-				snd_pcm_period_elapsed(aacirun-&gt;substream);</div><div class='del'>-				spin_lock(&amp;aacirun-&gt;lock);</div><div class='del'>-			}</div><div class='del'>-			if (!(aacirun-&gt;cr &amp; CR_EN))</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			val = readl(aacirun-&gt;base + AACI_SR);</div><div class='del'>-			if (!(val &amp; SR_TXHE))</div><div class='del'>-				break;</div><div class='del'>-			if (!(val &amp; SR_TXFE))</div><div class='del'>-				len &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-			aacirun-&gt;bytes -= len;</div><div class='del'>-</div><div class='del'>-			/* writing 16 bytes at a time */</div><div class='del'>-			for ( ; len &gt; 0; len -= 16) {</div><div class='del'>-				asm(</div><div class='del'>-					"ldmia	%0!, {r0, r1, r2, r3}\n\t"</div><div class='del'>-					"stmia	%1, {r0, r1, r2, r3}"</div><div class='del'>-					: "+r" (ptr)</div><div class='del'>-					: "r" (aacirun-&gt;fifo)</div><div class='del'>-					: "r0", "r1", "r2", "r3", "cc");</div><div class='del'>-</div><div class='del'>-				if (ptr &gt;= aacirun-&gt;end)</div><div class='del'>-					ptr = aacirun-&gt;start;</div><div class='del'>-			}</div><div class='del'>-		} while (1);</div><div class='del'>-</div><div class='del'>-		aacirun-&gt;ptr = ptr;</div><div class='add'>+		scoped_guard(spinlock, &amp;aacirun-&gt;lock) {</div><div class='add'>+			ptr = aacirun-&gt;ptr;</div><div class='add'>+			do {</div><div class='add'>+				unsigned int len = aacirun-&gt;fifo_bytes;</div><div class='add'>+				u32 val;</div><div class='add'>+</div><div class='add'>+				if (aacirun-&gt;bytes &lt;= 0) {</div><div class='add'>+					aacirun-&gt;bytes += aacirun-&gt;period;</div><div class='add'>+					period_elapsed = true;</div><div class='add'>+				}</div><div class='add'>+				if (!(aacirun-&gt;cr &amp; CR_EN))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				val = readl(aacirun-&gt;base + AACI_SR);</div><div class='add'>+				if (!(val &amp; SR_TXHE))</div><div class='add'>+					break;</div><div class='add'>+				if (!(val &amp; SR_TXFE))</div><div class='add'>+					len &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+				aacirun-&gt;bytes -= len;</div><div class='add'>+</div><div class='add'>+				/* writing 16 bytes at a time */</div><div class='add'>+				for ( ; len &gt; 0; len -= 16) {</div><div class='add'>+					asm(</div><div class='add'>+					    "ldmia	%0!, {r0, r1, r2, r3}\n\t"</div><div class='add'>+					    "stmia	%1, {r0, r1, r2, r3}"</div><div class='add'>+					    : "+r" (ptr)</div><div class='add'>+					    : "r" (aacirun-&gt;fifo)</div><div class='add'>+					    : "r0", "r1", "r2", "r3", "cc");</div><div class='add'>+</div><div class='add'>+					if (ptr &gt;= aacirun-&gt;end)</div><div class='add'>+						ptr = aacirun-&gt;start;</div><div class='add'>+				}</div><div class='add'>+			} while (1);</div><div class='add'>+</div><div class='add'>+			aacirun-&gt;ptr = ptr;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		spin_unlock(&amp;aacirun-&gt;lock);</div><div class='add'>+		if (period_elapsed)</div><div class='add'>+			snd_pcm_period_elapsed(aacirun-&gt;substream);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +335,7 @@ static irqreturn_t aaci_irq(int irq, void *devid)</div><div class='ctx'> /*</div><div class='ctx'>  * ALSA support.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_hardware aaci_hw_info = {</div><div class='add'>+static const struct snd_pcm_hardware aaci_hw_info = {</div><div class='ctx'> 	.info			= SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				  SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 				  SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -353,7 +350,7 @@ static struct snd_pcm_hardware aaci_hw_info = {</div><div class='ctx'> </div><div class='ctx'> 	/* rates are setup from the AC'97 codec */</div><div class='ctx'> 	.channels_min		= 2,</div><div class='del'>-	.channels_max		= 6,</div><div class='add'>+	.channels_max		= 2,</div><div class='ctx'> 	.buffer_bytes_max	= 64 * 1024,</div><div class='ctx'> 	.period_bytes_min	= 256,</div><div class='ctx'> 	.period_bytes_max	= PAGE_SIZE,</div><div class='hunk'>@@ -361,12 +358,46 @@ static struct snd_pcm_hardware aaci_hw_info = {</div><div class='ctx'> 	.periods_max		= PAGE_SIZE / 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __aaci_pcm_open(struct aaci *aaci,</div><div class='del'>-			   struct snd_pcm_substream *substream,</div><div class='del'>-			   struct aaci_runtime *aacirun)</div><div class='add'>+/*</div><div class='add'>+ * We can support two and four channel audio.  Unfortunately</div><div class='add'>+ * six channel audio requires a non-standard channel ordering:</div><div class='add'>+ *   2 -&gt; FL(3), FR(4)</div><div class='add'>+ *   4 -&gt; FL(3), FR(4), SL(7), SR(8)</div><div class='add'>+ *   6 -&gt; FL(3), FR(4), SL(7), SR(8), C(6), LFE(9) (required)</div><div class='add'>+ *        FL(3), FR(4), C(6), SL(7), SR(8), LFE(9) (actual)</div><div class='add'>+ * This requires an ALSA configuration file to correct.</div><div class='add'>+ */</div><div class='add'>+static int aaci_rule_channels(struct snd_pcm_hw_params *p,</div><div class='add'>+	struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int channel_list[] = { 2, 4, 6 };</div><div class='add'>+	struct aaci *aaci = rule-&gt;private;</div><div class='add'>+	unsigned int mask = 1 &lt;&lt; 0, slots;</div><div class='add'>+</div><div class='add'>+	/* pcms[0] is the our 5.1 PCM instance. */</div><div class='add'>+	slots = aaci-&gt;ac97_bus-&gt;pcms[0].r[0].slots;</div><div class='add'>+	if (slots &amp; (1 &lt;&lt; AC97_SLOT_PCM_SLEFT)) {</div><div class='add'>+		mask |= 1 &lt;&lt; 1;</div><div class='add'>+		if (slots &amp; (1 &lt;&lt; AC97_SLOT_LFE))</div><div class='add'>+			mask |= 1 &lt;&lt; 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_list(hw_param_interval(p, rule-&gt;var),</div><div class='add'>+				 ARRAY_SIZE(channel_list), channel_list, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aaci_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int ret;</div><div class='add'>+	struct aaci *aaci = substream-&gt;private_data;</div><div class='add'>+	struct aaci_runtime *aacirun;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+		aacirun = &amp;aaci-&gt;playback;</div><div class='add'>+	} else {</div><div class='add'>+		aacirun = &amp;aaci-&gt;capture;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	aacirun-&gt;substream = substream;</div><div class='ctx'> 	runtime-&gt;private_data = aacirun;</div><div class='hunk'>@@ -374,27 +405,36 @@ static int __aaci_pcm_open(struct aaci *aaci,</div><div class='ctx'> 	runtime-&gt;hw.rates = aacirun-&gt;pcm-&gt;rates;</div><div class='ctx'> 	snd_pcm_limit_hw_rates(runtime);</div><div class='ctx'> </div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='del'>-	    aacirun-&gt;pcm-&gt;r[1].slots)</div><div class='del'>-		snd_ac97_pcm_double_rate_rules(runtime);</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+		runtime-&gt;hw.channels_max = 6;</div><div class='add'>+</div><div class='add'>+		/* Add rule describing channel dependency. */</div><div class='add'>+		ret = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+					  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+					  aaci_rule_channels, aaci,</div><div class='add'>+					  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (aacirun-&gt;pcm-&gt;r[1].slots)</div><div class='add'>+			snd_ac97_pcm_double_rate_rules(runtime);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * FIXME: ALSA specifies fifo_size in bytes.  If we're in normal</div><div class='del'>-	 * mode, each 32-bit word contains one sample.  If we're in</div><div class='del'>-	 * compact mode, each 32-bit word contains two samples, effectively</div><div class='del'>-	 * halving the FIFO size.  However, we don't know for sure which</div><div class='del'>-	 * we'll be using at this point.  We set this to the lower limit.</div><div class='add'>+	 * ALSA wants the byte-size of the FIFOs.  As we only support</div><div class='add'>+	 * 16-bit samples, this is twice the FIFO depth irrespective</div><div class='add'>+	 * of whether it's in compact mode or not.</div><div class='ctx'> 	 */</div><div class='del'>-	runtime-&gt;hw.fifo_size = aaci-&gt;fifosize * 2;</div><div class='del'>-</div><div class='del'>-	ret = request_irq(aaci-&gt;dev-&gt;irq[0], aaci_irq, IRQF_SHARED|IRQF_DISABLED,</div><div class='del'>-			  DRIVER_NAME, aaci);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	runtime-&gt;hw.fifo_size = aaci-&gt;fifo_depth * 2;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;aaci-&gt;irq_lock);</div><div class='add'>+	if (!aaci-&gt;users++) {</div><div class='add'>+		ret = request_irq(aaci-&gt;dev-&gt;irq[0], aaci_irq,</div><div class='add'>+			   IRQF_SHARED, DRIVER_NAME, aaci);</div><div class='add'>+		if (ret != 0)</div><div class='add'>+			aaci-&gt;users--;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>- out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,7 +450,10 @@ static int aaci_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	WARN_ON(aacirun-&gt;cr &amp; CR_EN);</div><div class='ctx'> </div><div class='ctx'> 	aacirun-&gt;substream = NULL;</div><div class='del'>-	free_irq(aaci-&gt;dev-&gt;irq[0], aaci);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;aaci-&gt;irq_lock);</div><div class='add'>+	if (!--aaci-&gt;users)</div><div class='add'>+		free_irq(aaci-&gt;dev-&gt;irq[0], aaci);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -428,20 +471,25 @@ static int aaci_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_ac97_pcm_close(aacirun-&gt;pcm);</div><div class='ctx'> 	aacirun-&gt;pcm_open = 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Clear out the DMA and any allocated buffers.</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Channel to slot mask */</div><div class='add'>+static const u32 channels_to_slotmask[] = {</div><div class='add'>+	[2] = CR_SL3 | CR_SL4,</div><div class='add'>+	[4] = CR_SL3 | CR_SL4 | CR_SL7 | CR_SL8,</div><div class='add'>+	[6] = CR_SL3 | CR_SL4 | CR_SL7 | CR_SL8 | CR_SL6 | CR_SL9,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			      struct aaci_runtime *aacirun,</div><div class='ctx'> 			      struct snd_pcm_hw_params *params)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	struct aaci_runtime *aacirun = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	struct aaci *aaci = substream-&gt;private_data;</div><div class='add'>+	unsigned int channels = params_channels(params);</div><div class='add'>+	unsigned int rate = params_rate(params);</div><div class='add'>+	int dbl = rate &gt; 48000;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	aaci_pcm_hw_free(substream);</div><div class='ctx'> 	if (aacirun-&gt;pcm_open) {</div><div class='hunk'>@@ -449,23 +497,23 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		aacirun-&gt;pcm_open = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(params));</div><div class='del'>-	if (err &gt;= 0) {</div><div class='del'>-		unsigned int rate = params_rate(params);</div><div class='del'>-		int dbl = rate &gt; 48000;</div><div class='add'>+	/* channels is already limited to 2, 4, or 6 by aaci_rule_channels */</div><div class='add'>+	if (dbl &amp;&amp; channels != 2)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		err = snd_ac97_pcm_open(aacirun-&gt;pcm, rate,</div><div class='del'>-					params_channels(params),</div><div class='del'>-					aacirun-&gt;pcm-&gt;r[dbl].slots);</div><div class='add'>+	err = snd_ac97_pcm_open(aacirun-&gt;pcm, rate, channels,</div><div class='add'>+				aacirun-&gt;pcm-&gt;r[dbl].slots);</div><div class='ctx'> </div><div class='del'>-		aacirun-&gt;pcm_open = err == 0;</div><div class='del'>-		aacirun-&gt;cr = CR_FEN | CR_COMPACT | CR_SZ16;</div><div class='del'>-		aacirun-&gt;fifosz = aaci-&gt;fifosize * 4;</div><div class='add'>+	aacirun-&gt;pcm_open = err == 0;</div><div class='add'>+	aacirun-&gt;cr = CR_FEN | CR_COMPACT | CR_SZ16;</div><div class='add'>+	aacirun-&gt;cr |= channels_to_slotmask[channels + dbl * 2];</div><div class='ctx'> </div><div class='del'>-		if (aacirun-&gt;cr &amp; CR_COMPACT)</div><div class='del'>-			aacirun-&gt;fifosz &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='add'>+	/*</div><div class='add'>+	 * fifo_bytes is the number of bytes we transfer to/from</div><div class='add'>+	 * the FIFO, including padding.  So that's x4.  As we're</div><div class='add'>+	 * in compact mode, the FIFO is half the size.</div><div class='add'>+	 */</div><div class='add'>+	aacirun-&gt;fifo_bytes = aaci-&gt;fifo_depth * 4 / 2;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -475,11 +523,11 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct aaci_runtime *aacirun = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='add'>+	aacirun-&gt;period	= snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	aacirun-&gt;start	= runtime-&gt;dma_area;</div><div class='ctx'> 	aacirun-&gt;end	= aacirun-&gt;start + snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	aacirun-&gt;ptr	= aacirun-&gt;start;</div><div class='del'>-	aacirun-&gt;period	=</div><div class='del'>-	aacirun-&gt;bytes	= frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+	aacirun-&gt;bytes	= aacirun-&gt;period;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -497,89 +545,6 @@ static snd_pcm_uframes_t aaci_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> /*</div><div class='ctx'>  * Playback specific ALSA stuff</div><div class='ctx'>  */</div><div class='del'>-static const u32 channels_to_txmask[] = {</div><div class='del'>-	[2] = CR_SL3 | CR_SL4,</div><div class='del'>-	[4] = CR_SL3 | CR_SL4 | CR_SL7 | CR_SL8,</div><div class='del'>-	[6] = CR_SL3 | CR_SL4 | CR_SL7 | CR_SL8 | CR_SL6 | CR_SL9,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We can support two and four channel audio.  Unfortunately</div><div class='del'>- * six channel audio requires a non-standard channel ordering:</div><div class='del'>- *   2 -&gt; FL(3), FR(4)</div><div class='del'>- *   4 -&gt; FL(3), FR(4), SL(7), SR(8)</div><div class='del'>- *   6 -&gt; FL(3), FR(4), SL(7), SR(8), C(6), LFE(9) (required)</div><div class='del'>- *        FL(3), FR(4), C(6), SL(7), SR(8), LFE(9) (actual)</div><div class='del'>- * This requires an ALSA configuration file to correct.</div><div class='del'>- */</div><div class='del'>-static unsigned int channel_list[] = { 2, 4, 6 };</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-aaci_rule_channels(struct snd_pcm_hw_params *p, struct snd_pcm_hw_rule *rule)</div><div class='del'>-{</div><div class='del'>-	struct aaci *aaci = rule-&gt;private;</div><div class='del'>-	unsigned int chan_mask = 1 &lt;&lt; 0, slots;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * pcms[0] is the our 5.1 PCM instance.</div><div class='del'>-	 */</div><div class='del'>-	slots = aaci-&gt;ac97_bus-&gt;pcms[0].r[0].slots;</div><div class='del'>-	if (slots &amp; (1 &lt;&lt; AC97_SLOT_PCM_SLEFT)) {</div><div class='del'>-		chan_mask |= 1 &lt;&lt; 1;</div><div class='del'>-		if (slots &amp; (1 &lt;&lt; AC97_SLOT_LFE))</div><div class='del'>-			chan_mask |= 1 &lt;&lt; 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return snd_interval_list(hw_param_interval(p, rule-&gt;var),</div><div class='del'>-				 ARRAY_SIZE(channel_list), channel_list,</div><div class='del'>-				 chan_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aaci_pcm_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct aaci *aaci = substream-&gt;private_data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Add rule describing channel dependency.</div><div class='del'>-	 */</div><div class='del'>-	ret = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				  aaci_rule_channels, aaci,</div><div class='del'>-				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		ret = __aaci_pcm_open(aaci, substream, &amp;aaci-&gt;playback);</div><div class='del'>-	} else {</div><div class='del'>-		ret = __aaci_pcm_open(aaci, substream, &amp;aaci-&gt;capture);</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int aaci_pcm_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				       struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	struct aaci_runtime *aacirun = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	unsigned int channels = params_channels(params);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	WARN_ON(channels &gt;= ARRAY_SIZE(channels_to_txmask) ||</div><div class='del'>-		!channels_to_txmask[channels]);</div><div class='del'>-</div><div class='del'>-	ret = aaci_pcm_hw_params(substream, aacirun, params);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable FIFO, compact mode, 16 bits per sample.</div><div class='del'>-	 * FIXME: double rate slots?</div><div class='del'>-	 */</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		aacirun-&gt;cr |= channels_to_txmask[channels];</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void aaci_pcm_playback_stop(struct aaci_runtime *aacirun)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ie;</div><div class='hunk'>@@ -608,10 +573,8 @@ static void aaci_pcm_playback_start(struct aaci_runtime *aacirun)</div><div class='ctx'> static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci_runtime *aacirun = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;aacirun-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;aacirun-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -637,39 +600,22 @@ static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cm</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;aacirun-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops aaci_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops aaci_playback_ops = {</div><div class='ctx'> 	.open		= aaci_pcm_open,</div><div class='ctx'> 	.close		= aaci_pcm_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	= aaci_pcm_playback_hw_params,</div><div class='add'>+	.hw_params	= aaci_pcm_hw_params,</div><div class='ctx'> 	.hw_free	= aaci_pcm_hw_free,</div><div class='ctx'> 	.prepare	= aaci_pcm_prepare,</div><div class='ctx'> 	.trigger	= aaci_pcm_playback_trigger,</div><div class='ctx'> 	.pointer	= aaci_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int aaci_pcm_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	struct aaci_runtime *aacirun = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = aaci_pcm_hw_params(substream, aacirun, params);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		/* Line in record: slot 3 and 4 */</div><div class='del'>-		aacirun-&gt;cr |= CR_SL3 | CR_SL4;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void aaci_pcm_capture_stop(struct aaci_runtime *aacirun)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ie;</div><div class='hunk'>@@ -707,10 +653,8 @@ static void aaci_pcm_capture_start(struct aaci_runtime *aacirun)</div><div class='ctx'> static int aaci_pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci_runtime *aacirun = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;aacirun-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;aacirun-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -736,12 +680,10 @@ static int aaci_pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;aacirun-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -762,11 +704,10 @@ static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops aaci_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops aaci_capture_ops = {</div><div class='ctx'> 	.open		= aaci_pcm_open,</div><div class='ctx'> 	.close		= aaci_pcm_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	= aaci_pcm_capture_hw_params,</div><div class='add'>+	.hw_params	= aaci_pcm_hw_params,</div><div class='ctx'> 	.hw_free	= aaci_pcm_hw_free,</div><div class='ctx'> 	.prepare	= aaci_pcm_capture_prepare,</div><div class='ctx'> 	.trigger	= aaci_pcm_capture_trigger,</div><div class='hunk'>@@ -776,41 +717,33 @@ static struct snd_pcm_ops aaci_capture_ops = {</div><div class='ctx'> /*</div><div class='ctx'>  * Power Management.</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int aaci_do_suspend(struct snd_card *card, unsigned int state)</div><div class='add'>+static int aaci_do_suspend(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct aaci *aaci = card-&gt;private_data;</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);</div><div class='del'>-	snd_pcm_suspend_all(aaci-&gt;pcm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aaci_do_resume(struct snd_card *card, unsigned int state)</div><div class='add'>+static int aaci_do_resume(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aaci_suspend(struct amba_device *dev, pm_message_t state)</div><div class='add'>+static int aaci_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = amba_get_drvdata(dev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	return card ? aaci_do_suspend(card) : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aaci_resume(struct amba_device *dev)</div><div class='add'>+static int aaci_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = amba_get_drvdata(dev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	return card ? aaci_do_resume(card) : 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define aaci_do_suspend		NULL</div><div class='del'>-#define aaci_do_resume		NULL</div><div class='del'>-#define aaci_suspend		NULL</div><div class='del'>-#define aaci_resume		NULL</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume);</div><div class='ctx'> </div><div class='del'>-static struct ac97_pcm ac97_defs[] __devinitdata = {</div><div class='add'>+static const struct ac97_pcm ac97_defs[] = {</div><div class='ctx'> 	[0] = {	/* Front PCM */</div><div class='ctx'> 		.exclusive = 1,</div><div class='ctx'> 		.r = {</div><div class='hunk'>@@ -851,12 +784,12 @@ static struct ac97_pcm ac97_defs[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_bus_ops aaci_bus_ops = {</div><div class='add'>+static const struct snd_ac97_bus_ops aaci_bus_ops = {</div><div class='ctx'> 	.write	= aaci_ac97_write,</div><div class='ctx'> 	.read	= aaci_ac97_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit aaci_probe_ac97(struct aaci *aaci)</div><div class='add'>+static int aaci_probe_ac97(struct aaci *aaci)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_template ac97_template;</div><div class='ctx'> 	struct snd_ac97_bus *ac97_bus;</div><div class='hunk'>@@ -874,7 +807,7 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)</div><div class='ctx'> 	 * Give the AC'97 codec more than enough time</div><div class='ctx'> 	 * to wake up. (42us = ~2 frames at 48kHz.)</div><div class='ctx'> 	 */</div><div class='del'>-	udelay(42);</div><div class='add'>+	udelay(FRAME_PERIOD_US * 2);</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_ac97_bus(aaci-&gt;card, 0, &amp;aaci_bus_ops, aaci, &amp;ac97_bus);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -913,32 +846,33 @@ static int __devinit aaci_probe_ac97(struct aaci *aaci)</div><div class='ctx'> static void aaci_free_card(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci *aaci = card-&gt;private_data;</div><div class='del'>-	if (aaci-&gt;base)</div><div class='del'>-		iounmap(aaci-&gt;base);</div><div class='add'>+</div><div class='add'>+	iounmap(aaci-&gt;base);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct aaci * __devinit aaci_init_card(struct amba_device *dev)</div><div class='add'>+static struct aaci *aaci_init_card(struct amba_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci *aaci;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='del'>-			      THIS_MODULE, sizeof(struct aaci), &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;dev-&gt;dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='add'>+			   THIS_MODULE, sizeof(struct aaci), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;private_free = aaci_free_card;</div><div class='ctx'> </div><div class='del'>-	strlcpy(card-&gt;driver, DRIVER_NAME, sizeof(card-&gt;driver));</div><div class='del'>-	strlcpy(card-&gt;shortname, "ARM AC'97 Interface", sizeof(card-&gt;shortname));</div><div class='add'>+	strscpy(card-&gt;driver, DRIVER_NAME, sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, "ARM AC'97 Interface", sizeof(card-&gt;shortname));</div><div class='ctx'> 	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='del'>-		 "%s at 0x%016llx, irq %d",</div><div class='del'>-		 card-&gt;shortname, (unsigned long long)dev-&gt;res.start,</div><div class='del'>-		 dev-&gt;irq[0]);</div><div class='add'>+		 "%s PL%03x rev%u at 0x%08llx, irq %d",</div><div class='add'>+		 card-&gt;shortname, amba_part(dev), amba_rev(dev),</div><div class='add'>+		 (unsigned long long)dev-&gt;res.start, dev-&gt;irq[0]);</div><div class='ctx'> </div><div class='ctx'> 	aaci = card-&gt;private_data;</div><div class='ctx'> 	mutex_init(&amp;aaci-&gt;ac97_sem);</div><div class='add'>+	mutex_init(&amp;aaci-&gt;irq_lock);</div><div class='ctx'> 	aaci-&gt;card = card;</div><div class='ctx'> 	aaci-&gt;dev = dev;</div><div class='ctx'> </div><div class='hunk'>@@ -949,7 +883,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)</div><div class='ctx'> 	return aaci;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit aaci_init_pcm(struct aaci *aaci)</div><div class='add'>+static int aaci_init_pcm(struct aaci *aaci)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -960,22 +894,27 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)</div><div class='ctx'> 		pcm-&gt;private_data = aaci;</div><div class='ctx'> 		pcm-&gt;info_flags = 0;</div><div class='ctx'> </div><div class='del'>-		strlcpy(pcm-&gt;name, DRIVER_NAME, sizeof(pcm-&gt;name));</div><div class='add'>+		strscpy(pcm-&gt;name, DRIVER_NAME, sizeof(pcm-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;aaci_playback_ops);</div><div class='ctx'> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;aaci_capture_ops);</div><div class='del'>-		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						      NULL, 0, 64 * 1024);</div><div class='add'>+		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					       aaci-&gt;card-&gt;dev,</div><div class='add'>+					       0, 64 * 1024);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)</div><div class='add'>+static unsigned int aaci_size_fifo(struct aaci *aaci)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci_runtime *aacirun = &amp;aaci-&gt;playback;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Enable the channel, but don't assign it to any slots, so</div><div class='add'>+	 * it won't empty onto the AC'97 link.</div><div class='add'>+	 */</div><div class='ctx'> 	writel(CR_FEN | CR_SZ16 | CR_EN, aacirun-&gt;base + AACI_TXCR);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; !(readl(aacirun-&gt;base + AACI_SR) &amp; SR_TXFF) &amp;&amp; i &lt; 4096; i++)</div><div class='hunk'>@@ -989,10 +928,12 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)</div><div class='ctx'> 	 * disabling the channel doesn't clear the FIFO.</div><div class='ctx'> 	 */</div><div class='ctx'> 	writel(aaci-&gt;maincr &amp; ~MAINCR_IE, aaci-&gt;base + AACI_MAINCR);</div><div class='add'>+	readl(aaci-&gt;base + AACI_MAINCR);</div><div class='add'>+	udelay(1);</div><div class='ctx'> 	writel(aaci-&gt;maincr, aaci-&gt;base + AACI_MAINCR);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * If we hit 4096, we failed.  Go back to the specified</div><div class='add'>+	 * If we hit 4096 entries, we failed.  Go back to the specified</div><div class='ctx'> 	 * fifo depth.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (i == 4096)</div><div class='hunk'>@@ -1001,7 +942,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)</div><div class='ctx'> 	return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)</div><div class='add'>+static int aaci_probe(struct amba_device *dev,</div><div class='add'>+		      const struct amba_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct aaci *aaci;</div><div class='ctx'> 	int ret, i;</div><div class='hunk'>@@ -1057,11 +999,12 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Size the FIFOs (must be multiple of 16).</div><div class='add'>+	 * This is the number of entries in the FIFO.</div><div class='ctx'> 	 */</div><div class='del'>-	aaci-&gt;fifosize = aaci_size_fifo(aaci);</div><div class='del'>-	if (aaci-&gt;fifosize &amp; 15) {</div><div class='del'>-		printk(KERN_WARNING "AACI: fifosize = %d not supported\n",</div><div class='del'>-		       aaci-&gt;fifosize);</div><div class='add'>+	aaci-&gt;fifo_depth = aaci_size_fifo(aaci);</div><div class='add'>+	if (aaci-&gt;fifo_depth &amp; 15) {</div><div class='add'>+		printk(KERN_WARNING "AACI: FIFO depth %d not supported\n",</div><div class='add'>+		       aaci-&gt;fifo_depth);</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1070,12 +1013,10 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(aaci-&gt;card, &amp;dev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	ret = snd_card_register(aaci-&gt;card);</div><div class='ctx'> 	if (ret == 0) {</div><div class='del'>-		dev_info(&amp;dev-&gt;dev, "%s, fifo %d\n", aaci-&gt;card-&gt;longname,</div><div class='del'>-			 aaci-&gt;fifosize);</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "%s\n", aaci-&gt;card-&gt;longname);</div><div class='add'>+		dev_info(&amp;dev-&gt;dev, "FIFO %u entries\n", aaci-&gt;fifo_depth);</div><div class='ctx'> 		amba_set_drvdata(dev, aaci-&gt;card);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1087,12 +1028,10 @@ static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit aaci_remove(struct amba_device *dev)</div><div class='add'>+static void aaci_remove(struct amba_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = amba_get_drvdata(dev);</div><div class='ctx'> </div><div class='del'>-	amba_set_drvdata(dev, NULL);</div><div class='del'>-</div><div class='ctx'> 	if (card) {</div><div class='ctx'> 		struct aaci *aaci = card-&gt;private_data;</div><div class='ctx'> 		writel(0, aaci-&gt;base + AACI_MAINCR);</div><div class='hunk'>@@ -1100,11 +1039,9 @@ static int __devexit aaci_remove(struct amba_device *dev)</div><div class='ctx'> 		snd_card_free(card);</div><div class='ctx'> 		amba_release_regions(dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct amba_id aaci_ids[] = {</div><div class='add'>+static const struct amba_id aaci_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.id	= 0x00041041,</div><div class='ctx'> 		.mask	= 0x000fffff,</div><div class='hunk'>@@ -1112,29 +1049,19 @@ static struct amba_id aaci_ids[] = {</div><div class='ctx'> 	{ 0, 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+MODULE_DEVICE_TABLE(amba, aaci_ids);</div><div class='add'>+</div><div class='ctx'> static struct amba_driver aaci_driver = {</div><div class='ctx'> 	.drv		= {</div><div class='ctx'> 		.name	= DRIVER_NAME,</div><div class='add'>+		.pm	= &amp;aaci_dev_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= aaci_probe,</div><div class='del'>-	.remove		= __devexit_p(aaci_remove),</div><div class='del'>-	.suspend	= aaci_suspend,</div><div class='del'>-	.resume		= aaci_resume,</div><div class='add'>+	.remove		= aaci_remove,</div><div class='ctx'> 	.id_table	= aaci_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init aaci_init(void)</div><div class='del'>-{</div><div class='del'>-	return amba_driver_register(&amp;aaci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit aaci_exit(void)</div><div class='del'>-{</div><div class='del'>-	amba_driver_unregister(&amp;aaci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(aaci_init);</div><div class='del'>-module_exit(aaci_exit);</div><div class='add'>+module_amba_driver(aaci_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("ARM PrimeCell PL041 Advanced Audio CODEC Interface driver");</div><div class='head'>diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h<br/>index 6a4a2eebdda1..18680e7f8d3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/aaci.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/aaci.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/aaci.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/aaci.h</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/arm/aaci.c - ARM PrimeCell AACI PL041 driver</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef AACI_H</div><div class='ctx'> #define AACI_H</div><div class='hunk'>@@ -210,6 +207,8 @@ struct aaci_runtime {</div><div class='ctx'> 	u32			cr;</div><div class='ctx'> 	struct snd_pcm_substream	*substream;</div><div class='ctx'> </div><div class='add'>+	unsigned int		period;	/* byte size of a "period" */</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * PIO support</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -217,15 +216,16 @@ struct aaci_runtime {</div><div class='ctx'> 	void			*end;</div><div class='ctx'> 	void			*ptr;</div><div class='ctx'> 	int			bytes;</div><div class='del'>-	unsigned int		period;</div><div class='del'>-	unsigned int		fifosz;</div><div class='add'>+	unsigned int		fifo_bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aaci {</div><div class='ctx'> 	struct amba_device	*dev;</div><div class='ctx'> 	struct snd_card		*card;</div><div class='ctx'> 	void			__iomem *base;</div><div class='del'>-	unsigned int		fifosize;</div><div class='add'>+	unsigned int		fifo_depth;</div><div class='add'>+	unsigned int		users;</div><div class='add'>+	struct mutex		irq_lock;</div><div class='ctx'> </div><div class='ctx'> 	/* AC'97 */</div><div class='ctx'> 	struct mutex		ac97_sem;</div><div class='head'>diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c<br/>index 88eec3847df2..64510318091f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-ac97-lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-ac97-lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-ac97-lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/pxa2xx-ac97-lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Based on sound/arm/pxa2xx-ac97.c and sound/soc/pxa/pxa2xx-ac97.c</div><div class='ctx'>  * which contain:</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Created:	Dec 02, 2004</div><div class='ctx'>  * Copyright:	MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -16,13 +13,17 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#include &lt;linux/soc/pxa/cpu.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/pxa2xx-lib.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;mach/regs-ac97.h&gt;</div><div class='del'>-#include &lt;mach/audio.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/asoc-pxa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pxa2xx-ac97-regs.h"</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(car_mutex);</div><div class='ctx'> static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);</div><div class='hunk'>@@ -30,8 +31,7 @@ static volatile long gsr_bits;</div><div class='ctx'> static struct clk *ac97_clk;</div><div class='ctx'> static struct clk *ac97conf_clk;</div><div class='ctx'> static int reset_gpio;</div><div class='del'>-</div><div class='del'>-extern void pxa27x_assert_ac97reset(int reset_gpio, int on);</div><div class='add'>+static void __iomem *ac97_reg_base;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Beware PXA27x bugs:</div><div class='hunk'>@@ -43,69 +43,75 @@ extern void pxa27x_assert_ac97reset(int reset_gpio, int on);</div><div class='ctx'>  * 1 jiffy timeout if interrupt never comes).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='add'>+int pxa2xx_ac97_read(int slot, unsigned short reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned short val = -1;</div><div class='del'>-	volatile u32 *reg_addr;</div><div class='add'>+	int val = -ENODEV;</div><div class='add'>+	u32 __iomem *reg_addr;</div><div class='add'>+</div><div class='add'>+	if (slot &gt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;car_mutex);</div><div class='add'>+	guard(mutex)(&amp;car_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* set up primary or secondary codec space */</div><div class='ctx'> 	if (cpu_is_pxa25x() &amp;&amp; reg == AC97_GPIO_STATUS)</div><div class='del'>-		reg_addr = ac97-&gt;num ? &amp;SMC_REG_BASE : &amp;PMC_REG_BASE;</div><div class='add'>+		reg_addr = ac97_reg_base +</div><div class='add'>+			   (slot ? SMC_REG_BASE : PMC_REG_BASE);</div><div class='ctx'> 	else</div><div class='del'>-		reg_addr = ac97-&gt;num ? &amp;SAC_REG_BASE : &amp;PAC_REG_BASE;</div><div class='add'>+		reg_addr = ac97_reg_base +</div><div class='add'>+			   (slot ? SAC_REG_BASE : PAC_REG_BASE);</div><div class='ctx'> 	reg_addr += (reg &gt;&gt; 1);</div><div class='ctx'> </div><div class='ctx'> 	/* start read access across the ac97 link */</div><div class='del'>-	GSR = GSR_CDONE | GSR_SDONE;</div><div class='add'>+	writel(GSR_CDONE | GSR_SDONE, ac97_reg_base + GSR);</div><div class='ctx'> 	gsr_bits = 0;</div><div class='del'>-	val = *reg_addr;</div><div class='add'>+	val = (readl(reg_addr) &amp; 0xffff);</div><div class='ctx'> 	if (reg == AC97_GPIO_STATUS)</div><div class='del'>-		goto out;</div><div class='del'>-	if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) &amp; GSR_SDONE, 1) &lt;= 0 &amp;&amp;</div><div class='del'>-	    !((GSR | gsr_bits) &amp; GSR_SDONE)) {</div><div class='add'>+		return val;</div><div class='add'>+	if (wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) &amp; GSR_SDONE, 1) &lt;= 0 &amp;&amp;</div><div class='add'>+	    !((readl(ac97_reg_base + GSR) | gsr_bits) &amp; GSR_SDONE)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",</div><div class='del'>-				__func__, reg, GSR | gsr_bits);</div><div class='del'>-		val = -1;</div><div class='del'>-		goto out;</div><div class='add'>+				__func__, reg, readl(ac97_reg_base + GSR) | gsr_bits);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* valid data now */</div><div class='del'>-	GSR = GSR_CDONE | GSR_SDONE;</div><div class='add'>+	writel(GSR_CDONE | GSR_SDONE, ac97_reg_base + GSR);</div><div class='ctx'> 	gsr_bits = 0;</div><div class='del'>-	val = *reg_addr;</div><div class='add'>+	val = (readl(reg_addr) &amp; 0xffff);</div><div class='ctx'> 	/* but we've just started another cycle... */</div><div class='del'>-	wait_event_timeout(gsr_wq, (GSR | gsr_bits) &amp; GSR_SDONE, 1);</div><div class='del'>-</div><div class='del'>-out:	mutex_unlock(&amp;car_mutex);</div><div class='add'>+	wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) &amp; GSR_SDONE, 1);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_read);</div><div class='ctx'> </div><div class='del'>-void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='del'>-			unsigned short val)</div><div class='add'>+int pxa2xx_ac97_write(int slot, unsigned short reg, unsigned short val)</div><div class='ctx'> {</div><div class='del'>-	volatile u32 *reg_addr;</div><div class='add'>+	u32 __iomem *reg_addr;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;car_mutex);</div><div class='add'>+	guard(mutex)(&amp;car_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* set up primary or secondary codec space */</div><div class='ctx'> 	if (cpu_is_pxa25x() &amp;&amp; reg == AC97_GPIO_STATUS)</div><div class='del'>-		reg_addr = ac97-&gt;num ? &amp;SMC_REG_BASE : &amp;PMC_REG_BASE;</div><div class='add'>+		reg_addr = ac97_reg_base +</div><div class='add'>+			   (slot ? SMC_REG_BASE : PMC_REG_BASE);</div><div class='ctx'> 	else</div><div class='del'>-		reg_addr = ac97-&gt;num ? &amp;SAC_REG_BASE : &amp;PAC_REG_BASE;</div><div class='add'>+		reg_addr = ac97_reg_base +</div><div class='add'>+			   (slot ? SAC_REG_BASE : PAC_REG_BASE);</div><div class='ctx'> 	reg_addr += (reg &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-	GSR = GSR_CDONE | GSR_SDONE;</div><div class='add'>+	writel(GSR_CDONE | GSR_SDONE, ac97_reg_base + GSR);</div><div class='ctx'> 	gsr_bits = 0;</div><div class='del'>-	*reg_addr = val;</div><div class='del'>-	if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) &amp; GSR_CDONE, 1) &lt;= 0 &amp;&amp;</div><div class='del'>-	    !((GSR | gsr_bits) &amp; GSR_CDONE))</div><div class='add'>+	writel(val, reg_addr);</div><div class='add'>+	if (wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) &amp; GSR_CDONE, 1) &lt;= 0 &amp;&amp;</div><div class='add'>+	    !((readl(ac97_reg_base + GSR) | gsr_bits) &amp; GSR_CDONE)) {</div><div class='ctx'> 		printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",</div><div class='del'>-				__func__, reg, GSR | gsr_bits);</div><div class='add'>+				__func__, reg, readl(ac97_reg_base + GSR) | gsr_bits);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;car_mutex);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_write);</div><div class='ctx'> </div><div class='hunk'>@@ -114,20 +120,17 @@ static inline void pxa_ac97_warm_pxa25x(void)</div><div class='ctx'> {</div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='del'>-	GCR |= GCR_WARM_RST | GCR_PRIRDY_IEN | GCR_SECRDY_IEN;</div><div class='del'>-	wait_event_timeout(gsr_wq, gsr_bits &amp; (GSR_PCR | GSR_SCR), 1);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_WARM_RST), ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pxa_ac97_cold_pxa25x(void)</div><div class='ctx'> {</div><div class='del'>-	GCR &amp;=  GCR_COLD_RST;  /* clear everything but nCRST */</div><div class='del'>-	GCR &amp;= ~GCR_COLD_RST;  /* then assert nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; ( GCR_COLD_RST), ac97_reg_base + GCR);  /* clear everything but nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; (~GCR_COLD_RST), ac97_reg_base + GCR);  /* then assert nCRST */</div><div class='ctx'> </div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='del'>-	GCR = GCR_COLD_RST;</div><div class='del'>-	GCR |= GCR_CDONE_IE|GCR_SDONE_IE;</div><div class='del'>-	wait_event_timeout(gsr_wq, gsr_bits &amp; (GSR_PCR | GSR_SCR), 1);</div><div class='add'>+	writel(GCR_COLD_RST, ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -137,69 +140,61 @@ static inline void pxa_ac97_warm_pxa27x(void)</div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* warm reset broken on Bulverde, so manually keep AC97 reset high */</div><div class='del'>-	pxa27x_assert_ac97reset(reset_gpio, 1);</div><div class='add'>+	pxa27x_configure_ac97reset(reset_gpio, true);</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	GCR |= GCR_WARM_RST;</div><div class='del'>-	pxa27x_assert_ac97reset(reset_gpio, 0);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_WARM_RST), ac97_reg_base + GCR);</div><div class='add'>+	pxa27x_configure_ac97reset(reset_gpio, false);</div><div class='ctx'> 	udelay(500);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pxa_ac97_cold_pxa27x(void)</div><div class='ctx'> {</div><div class='del'>-	GCR &amp;=  GCR_COLD_RST;  /* clear everything but nCRST */</div><div class='del'>-	GCR &amp;= ~GCR_COLD_RST;  /* then assert nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; ( GCR_COLD_RST), ac97_reg_base + GCR);  /* clear everything but nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; (~GCR_COLD_RST), ac97_reg_base + GCR);  /* then assert nCRST */</div><div class='ctx'> </div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* PXA27x Developers Manual section 13.5.2.2.1 */</div><div class='del'>-	clk_enable(ac97conf_clk);</div><div class='add'>+	clk_prepare_enable(ac97conf_clk);</div><div class='ctx'> 	udelay(5);</div><div class='del'>-	clk_disable(ac97conf_clk);</div><div class='del'>-	GCR = GCR_COLD_RST;</div><div class='del'>-	udelay(50);</div><div class='add'>+	clk_disable_unprepare(ac97conf_clk);</div><div class='add'>+	writel(GCR_COLD_RST | GCR_WARM_RST, ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA3xx</div><div class='ctx'> static inline void pxa_ac97_warm_pxa3xx(void)</div><div class='ctx'> {</div><div class='del'>-	int timeout = 100;</div><div class='del'>-</div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Can't use interrupts */</div><div class='del'>-	GCR |= GCR_WARM_RST;</div><div class='del'>-	while (!((GSR | gsr_bits) &amp; (GSR_PCR | GSR_SCR)) &amp;&amp; timeout--)</div><div class='del'>-		mdelay(1);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_WARM_RST), ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pxa_ac97_cold_pxa3xx(void)</div><div class='ctx'> {</div><div class='del'>-	int timeout = 1000;</div><div class='del'>-</div><div class='ctx'> 	/* Hold CLKBPB for 100us */</div><div class='del'>-	GCR = 0;</div><div class='del'>-	GCR = GCR_CLKBPB;</div><div class='add'>+	writel(0, ac97_reg_base + GCR);</div><div class='add'>+	writel(GCR_CLKBPB, ac97_reg_base + GCR);</div><div class='ctx'> 	udelay(100);</div><div class='del'>-	GCR = 0;</div><div class='add'>+	writel(0, ac97_reg_base + GCR);</div><div class='ctx'> </div><div class='del'>-	GCR &amp;=  GCR_COLD_RST;  /* clear everything but nCRST */</div><div class='del'>-	GCR &amp;= ~GCR_COLD_RST;  /* then assert nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; ( GCR_COLD_RST), ac97_reg_base + GCR);  /* clear everything but nCRST */</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; (~GCR_COLD_RST), ac97_reg_base + GCR);  /* then assert nCRST */</div><div class='ctx'> </div><div class='ctx'> 	gsr_bits = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Can't use interrupts on PXA3xx */</div><div class='del'>-	GCR &amp;= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) &amp; (~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN)), ac97_reg_base + GCR);</div><div class='ctx'> </div><div class='del'>-	GCR = GCR_WARM_RST | GCR_COLD_RST;</div><div class='del'>-	while (!(GSR &amp; (GSR_PCR | GSR_SCR)) &amp;&amp; timeout--)</div><div class='del'>-		mdelay(10);</div><div class='add'>+	writel(GCR_WARM_RST | GCR_COLD_RST, ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)</div><div class='add'>+bool pxa2xx_ac97_try_warm_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gsr;</div><div class='add'>+	unsigned int timeout = 100;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA25x</div><div class='ctx'> 	if (cpu_is_pxa25x())</div><div class='hunk'>@@ -216,8 +211,12 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)</div><div class='ctx'> 		pxa_ac97_warm_pxa3xx();</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='del'>-		BUG();</div><div class='del'>-	gsr = GSR | gsr_bits;</div><div class='add'>+		snd_BUG();</div><div class='add'>+</div><div class='add'>+	while (!((readl(ac97_reg_base + GSR) | gsr_bits) &amp; (GSR_PCR | GSR_SCR)) &amp;&amp; timeout--)</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+	gsr = readl(ac97_reg_base + GSR) | gsr_bits;</div><div class='ctx'> 	if (!(gsr &amp; (GSR_PCR | GSR_SCR))) {</div><div class='ctx'> 		printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",</div><div class='ctx'> 				 __func__, gsr);</div><div class='hunk'>@@ -229,9 +228,10 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);</div><div class='ctx'> </div><div class='del'>-bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)</div><div class='add'>+bool pxa2xx_ac97_try_cold_reset(void)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long gsr;</div><div class='add'>+	unsigned int timeout = 1000;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PXA25x</div><div class='ctx'> 	if (cpu_is_pxa25x())</div><div class='hunk'>@@ -248,9 +248,12 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)</div><div class='ctx'> 		pxa_ac97_cold_pxa3xx();</div><div class='ctx'> 	else</div><div class='ctx'> #endif</div><div class='del'>-		BUG();</div><div class='add'>+		snd_BUG();</div><div class='add'>+</div><div class='add'>+	while (!((readl(ac97_reg_base + GSR) | gsr_bits) &amp; (GSR_PCR | GSR_SCR)) &amp;&amp; timeout--)</div><div class='add'>+		mdelay(1);</div><div class='ctx'> </div><div class='del'>-	gsr = GSR | gsr_bits;</div><div class='add'>+	gsr = readl(ac97_reg_base + GSR) | gsr_bits;</div><div class='ctx'> 	if (!(gsr &amp; (GSR_PCR | GSR_SCR))) {</div><div class='ctx'> 		printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",</div><div class='ctx'> 				 __func__, gsr);</div><div class='hunk'>@@ -263,10 +266,12 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_cold_reset);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void pxa2xx_ac97_finish_reset(struct snd_ac97 *ac97)</div><div class='add'>+void pxa2xx_ac97_finish_reset(void)</div><div class='ctx'> {</div><div class='del'>-	GCR &amp;= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);</div><div class='del'>-	GCR |= GCR_SDONE_IE|GCR_CDONE_IE;</div><div class='add'>+	u32 gcr = readl(ac97_reg_base + GCR);</div><div class='add'>+	gcr &amp;= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);</div><div class='add'>+	gcr |= GCR_SDONE_IE|GCR_CDONE_IE;</div><div class='add'>+	writel(gcr, ac97_reg_base + GCR);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_finish_reset);</div><div class='ctx'> </div><div class='hunk'>@@ -274,9 +279,9 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	long status;</div><div class='ctx'> </div><div class='del'>-	status = GSR;</div><div class='add'>+	status = readl(ac97_reg_base + GSR);</div><div class='ctx'> 	if (status) {</div><div class='del'>-		GSR = status;</div><div class='add'>+		writel(status, ac97_reg_base + GSR);</div><div class='ctx'> 		gsr_bits |= status;</div><div class='ctx'> 		wake_up(&amp;gsr_wq);</div><div class='ctx'> </div><div class='hunk'>@@ -284,9 +289,9 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)</div><div class='ctx'> 		   since they tend to spuriously trigger when MMC is used</div><div class='ctx'> 		   (hardware bug? go figure)... */</div><div class='ctx'> 		if (cpu_is_pxa27x()) {</div><div class='del'>-			MISR = MISR_EOC;</div><div class='del'>-			PISR = PISR_EOC;</div><div class='del'>-			MCSR = MCSR_EOC;</div><div class='add'>+			writel(MISR_EOC, ac97_reg_base + MISR);</div><div class='add'>+			writel(PISR_EOC, ac97_reg_base + PISR);</div><div class='add'>+			writel(MCSR_EOC, ac97_reg_base + MCSR);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		return IRQ_HANDLED;</div><div class='hunk'>@@ -298,25 +303,32 @@ static irqreturn_t pxa2xx_ac97_irq(int irq, void *dev_id)</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> int pxa2xx_ac97_hw_suspend(void)</div><div class='ctx'> {</div><div class='del'>-	GCR |= GCR_ACLINK_OFF;</div><div class='del'>-	clk_disable(ac97_clk);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_ACLINK_OFF), ac97_reg_base + GCR);</div><div class='add'>+	clk_disable_unprepare(ac97_clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);</div><div class='ctx'> </div><div class='ctx'> int pxa2xx_ac97_hw_resume(void)</div><div class='ctx'> {</div><div class='del'>-	clk_enable(ac97_clk);</div><div class='add'>+	clk_prepare_enable(ac97_clk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_resume);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)</div><div class='add'>+int pxa2xx_ac97_hw_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	int irq;</div><div class='ctx'> 	pxa2xx_audio_ops_t *pdata = dev-&gt;dev.platform_data;</div><div class='ctx'> </div><div class='add'>+	ac97_reg_base = devm_platform_ioremap_resource(dev, 0);</div><div class='add'>+	if (IS_ERR(ac97_reg_base)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Missing MMIO resource\n");</div><div class='add'>+		return PTR_ERR(ac97_reg_base);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (pdata) {</div><div class='ctx'> 		switch (pdata-&gt;reset_gpio) {</div><div class='ctx'> 		case 95:</div><div class='hunk'>@@ -332,14 +344,38 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)</div><div class='ctx'> 			dev_err(&amp;dev-&gt;dev, "Invalid reset GPIO %d\n",</div><div class='ctx'> 				pdata-&gt;reset_gpio);</div><div class='ctx'> 		}</div><div class='add'>+	} else if (!pdata &amp;&amp; dev-&gt;dev.of_node) {</div><div class='add'>+		pdata = devm_kzalloc(&amp;dev-&gt;dev, sizeof(*pdata), GFP_KERNEL);</div><div class='add'>+		if (!pdata)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pdata-&gt;reset_gpio = of_get_named_gpio(dev-&gt;dev.of_node,</div><div class='add'>+						      "reset-gpios", 0);</div><div class='add'>+		if (pdata-&gt;reset_gpio == -ENOENT)</div><div class='add'>+			pdata-&gt;reset_gpio = -1;</div><div class='add'>+		else if (pdata-&gt;reset_gpio &lt; 0)</div><div class='add'>+			return pdata-&gt;reset_gpio;</div><div class='add'>+		reset_gpio = pdata-&gt;reset_gpio;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (cpu_is_pxa27x())</div><div class='ctx'> 			reset_gpio = 113;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpu_is_pxa27x()) {</div><div class='del'>-		/* Use GPIO 113 as AC97 Reset on Bulverde */</div><div class='del'>-		pxa27x_assert_ac97reset(reset_gpio, 0);</div><div class='add'>+		/*</div><div class='add'>+		 * This gpio is needed for a work-around to a bug in the ac97</div><div class='add'>+		 * controller during warm reset.  The direction and level is set</div><div class='add'>+		 * here so that it is an output driven high when switching from</div><div class='add'>+		 * AC97_nRESET alt function to generic gpio.</div><div class='add'>+		 */</div><div class='add'>+		ret = gpio_request_one(reset_gpio, GPIOF_OUT_INIT_HIGH,</div><div class='add'>+				       "pxa27x ac97 reset");</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			pr_err("%s: gpio_request_one() failed: %d\n",</div><div class='add'>+			       __func__, ret);</div><div class='add'>+			goto err_conf;</div><div class='add'>+		}</div><div class='add'>+		pxa27x_configure_ac97reset(reset_gpio, false);</div><div class='add'>+</div><div class='ctx'> 		ac97conf_clk = clk_get(&amp;dev-&gt;dev, "AC97CONFCLK");</div><div class='ctx'> 		if (IS_ERR(ac97conf_clk)) {</div><div class='ctx'> 			ret = PTR_ERR(ac97conf_clk);</div><div class='hunk'>@@ -355,18 +391,24 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)</div><div class='ctx'> 		goto err_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = clk_enable(ac97_clk);</div><div class='add'>+	ret = clk_prepare_enable(ac97_clk);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_clk2;</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL);</div><div class='add'>+	irq = platform_get_irq(dev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		ret = irq;</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(irq, pxa2xx_ac97_irq, 0, "AC97", NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err_irq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_irq:</div><div class='del'>-	GCR |= GCR_ACLINK_OFF;</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_ACLINK_OFF), ac97_reg_base + GCR);</div><div class='ctx'> err_clk2:</div><div class='ctx'> 	clk_put(ac97_clk);</div><div class='ctx'> 	ac97_clk = NULL;</div><div class='hunk'>@@ -382,18 +424,38 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_probe);</div><div class='ctx'> </div><div class='ctx'> void pxa2xx_ac97_hw_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='del'>-	GCR |= GCR_ACLINK_OFF;</div><div class='del'>-	free_irq(IRQ_AC97, NULL);</div><div class='add'>+	if (cpu_is_pxa27x())</div><div class='add'>+		gpio_free(reset_gpio);</div><div class='add'>+	writel(readl(ac97_reg_base + GCR) | (GCR_ACLINK_OFF), ac97_reg_base + GCR);</div><div class='add'>+	free_irq(platform_get_irq(dev, 0), NULL);</div><div class='ctx'> 	if (ac97conf_clk) {</div><div class='ctx'> 		clk_put(ac97conf_clk);</div><div class='ctx'> 		ac97conf_clk = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	clk_disable(ac97_clk);</div><div class='add'>+	clk_disable_unprepare(ac97_clk);</div><div class='ctx'> 	clk_put(ac97_clk);</div><div class='ctx'> 	ac97_clk = NULL;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_remove);</div><div class='ctx'> </div><div class='add'>+u32 pxa2xx_ac97_read_modr(void)</div><div class='add'>+{</div><div class='add'>+	if (!ac97_reg_base)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return readl(ac97_reg_base + MODR);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pxa2xx_ac97_read_modr);</div><div class='add'>+</div><div class='add'>+u32 pxa2xx_ac97_read_misr(void)</div><div class='add'>+{</div><div class='add'>+	if (!ac97_reg_base)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return readl(ac97_reg_base + MISR);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pxa2xx_ac97_read_misr);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Nicolas Pitre");</div><div class='ctx'> MODULE_DESCRIPTION("Intel/Marvell PXA sound library");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/arm/pxa2xx-ac97-regs.h b/sound/arm/pxa2xx-ac97-regs.h<br/>new file mode 100644<br/>index 000000000000..ae638a1b919b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-ac97-regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/pxa2xx-ac97-regs.h</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __ASM_ARCH_REGS_AC97_H</div><div class='add'>+#define __ASM_ARCH_REGS_AC97_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AC97 Controller registers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define POCR		(0x0000)  	/* PCM Out Control Register */</div><div class='add'>+#define POCR_FEIE	(1 &lt;&lt; 3)	/* FIFO Error Interrupt Enable */</div><div class='add'>+#define POCR_FSRIE	(1 &lt;&lt; 1)	/* FIFO Service Request Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define PICR		(0x0004) 	/* PCM In Control Register */</div><div class='add'>+#define PICR_FEIE	(1 &lt;&lt; 3)	/* FIFO Error Interrupt Enable */</div><div class='add'>+#define PICR_FSRIE	(1 &lt;&lt; 1)	/* FIFO Service Request Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define MCCR		(0x0008)  	/* Mic In Control Register */</div><div class='add'>+#define MCCR_FEIE	(1 &lt;&lt; 3)	/* FIFO Error Interrupt Enable */</div><div class='add'>+#define MCCR_FSRIE	(1 &lt;&lt; 1)	/* FIFO Service Request Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define GCR		(0x000C) 	 /* Global Control Register */</div><div class='add'>+#ifdef CONFIG_PXA3xx</div><div class='add'>+#define GCR_CLKBPB	(1 &lt;&lt; 31)	/* Internal clock enable */</div><div class='add'>+#endif</div><div class='add'>+#define GCR_nDMAEN	(1 &lt;&lt; 24)	/* non DMA Enable */</div><div class='add'>+#define GCR_CDONE_IE	(1 &lt;&lt; 19)	/* Command Done Interrupt Enable */</div><div class='add'>+#define GCR_SDONE_IE	(1 &lt;&lt; 18)	/* Status Done Interrupt Enable */</div><div class='add'>+#define GCR_SECRDY_IEN	(1 &lt;&lt; 9)	/* Secondary Ready Interrupt Enable */</div><div class='add'>+#define GCR_PRIRDY_IEN	(1 &lt;&lt; 8)	/* Primary Ready Interrupt Enable */</div><div class='add'>+#define GCR_SECRES_IEN	(1 &lt;&lt; 5)	/* Secondary Resume Interrupt Enable */</div><div class='add'>+#define GCR_PRIRES_IEN	(1 &lt;&lt; 4)	/* Primary Resume Interrupt Enable */</div><div class='add'>+#define GCR_ACLINK_OFF	(1 &lt;&lt; 3)	/* AC-link Shut Off */</div><div class='add'>+#define GCR_WARM_RST	(1 &lt;&lt; 2)	/* AC97 Warm Reset */</div><div class='add'>+#define GCR_COLD_RST	(1 &lt;&lt; 1)	/* AC'97 Cold Reset (0 = active) */</div><div class='add'>+#define GCR_GIE		(1 &lt;&lt; 0)	/* Codec GPI Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define POSR		(0x0010)  	/* PCM Out Status Register */</div><div class='add'>+#define POSR_FIFOE	(1 &lt;&lt; 4)	/* FIFO error */</div><div class='add'>+#define POSR_FSR	(1 &lt;&lt; 2)	/* FIFO Service Request */</div><div class='add'>+</div><div class='add'>+#define PISR		(0x0014)  	/* PCM In Status Register */</div><div class='add'>+#define PISR_FIFOE	(1 &lt;&lt; 4)	/* FIFO error */</div><div class='add'>+#define PISR_EOC	(1 &lt;&lt; 3)	/* DMA End-of-Chain (exclusive clear) */</div><div class='add'>+#define PISR_FSR	(1 &lt;&lt; 2)	/* FIFO Service Request */</div><div class='add'>+</div><div class='add'>+#define MCSR		(0x0018)  	/* Mic In Status Register */</div><div class='add'>+#define MCSR_FIFOE	(1 &lt;&lt; 4)	/* FIFO error */</div><div class='add'>+#define MCSR_EOC	(1 &lt;&lt; 3)	/* DMA End-of-Chain (exclusive clear) */</div><div class='add'>+#define MCSR_FSR	(1 &lt;&lt; 2)	/* FIFO Service Request */</div><div class='add'>+</div><div class='add'>+#define GSR		(0x001C)  	/* Global Status Register */</div><div class='add'>+#define GSR_CDONE	(1 &lt;&lt; 19)	/* Command Done */</div><div class='add'>+#define GSR_SDONE	(1 &lt;&lt; 18)	/* Status Done */</div><div class='add'>+#define GSR_RDCS	(1 &lt;&lt; 15)	/* Read Completion Status */</div><div class='add'>+#define GSR_BIT3SLT12	(1 &lt;&lt; 14)	/* Bit 3 of slot 12 */</div><div class='add'>+#define GSR_BIT2SLT12	(1 &lt;&lt; 13)	/* Bit 2 of slot 12 */</div><div class='add'>+#define GSR_BIT1SLT12	(1 &lt;&lt; 12)	/* Bit 1 of slot 12 */</div><div class='add'>+#define GSR_SECRES	(1 &lt;&lt; 11)	/* Secondary Resume Interrupt */</div><div class='add'>+#define GSR_PRIRES	(1 &lt;&lt; 10)	/* Primary Resume Interrupt */</div><div class='add'>+#define GSR_SCR		(1 &lt;&lt; 9)	/* Secondary Codec Ready */</div><div class='add'>+#define GSR_PCR		(1 &lt;&lt; 8)	/*  Primary Codec Ready */</div><div class='add'>+#define GSR_MCINT	(1 &lt;&lt; 7)	/* Mic In Interrupt */</div><div class='add'>+#define GSR_POINT	(1 &lt;&lt; 6)	/* PCM Out Interrupt */</div><div class='add'>+#define GSR_PIINT	(1 &lt;&lt; 5)	/* PCM In Interrupt */</div><div class='add'>+#define GSR_ACOFFD	(1 &lt;&lt; 3)	/* AC-link Shut Off Done */</div><div class='add'>+#define GSR_MOINT	(1 &lt;&lt; 2)	/* Modem Out Interrupt */</div><div class='add'>+#define GSR_MIINT	(1 &lt;&lt; 1)	/* Modem In Interrupt */</div><div class='add'>+#define GSR_GSCI	(1 &lt;&lt; 0)	/* Codec GPI Status Change Interrupt */</div><div class='add'>+</div><div class='add'>+#define CAR		(0x0020)  	/* CODEC Access Register */</div><div class='add'>+#define CAR_CAIP	(1 &lt;&lt; 0)	/* Codec Access In Progress */</div><div class='add'>+</div><div class='add'>+#define PCDR		(0x0040)  	/* PCM FIFO Data Register */</div><div class='add'>+#define MCDR		(0x0060)  	/* Mic-in FIFO Data Register */</div><div class='add'>+</div><div class='add'>+#define MOCR		(0x0100)  	/* Modem Out Control Register */</div><div class='add'>+#define MOCR_FEIE	(1 &lt;&lt; 3)	/* FIFO Error */</div><div class='add'>+#define MOCR_FSRIE	(1 &lt;&lt; 1)	/* FIFO Service Request Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define MICR		(0x0108)  	/* Modem In Control Register */</div><div class='add'>+#define MICR_FEIE	(1 &lt;&lt; 3)	/* FIFO Error */</div><div class='add'>+#define MICR_FSRIE	(1 &lt;&lt; 1)	/* FIFO Service Request Interrupt Enable */</div><div class='add'>+</div><div class='add'>+#define MOSR		(0x0110)  	/* Modem Out Status Register */</div><div class='add'>+#define MOSR_FIFOE	(1 &lt;&lt; 4)	/* FIFO error */</div><div class='add'>+#define MOSR_FSR	(1 &lt;&lt; 2)	/* FIFO Service Request */</div><div class='add'>+</div><div class='add'>+#define MISR		(0x0118)  	/* Modem In Status Register */</div><div class='add'>+#define MISR_FIFOE	(1 &lt;&lt; 4)	/* FIFO error */</div><div class='add'>+#define MISR_EOC	(1 &lt;&lt; 3)	/* DMA End-of-Chain (exclusive clear) */</div><div class='add'>+#define MISR_FSR	(1 &lt;&lt; 2)	/* FIFO Service Request */</div><div class='add'>+</div><div class='add'>+#define MODR		(0x0140)  	/* Modem FIFO Data Register */</div><div class='add'>+</div><div class='add'>+#define PAC_REG_BASE	(0x0200)  	/* Primary Audio Codec */</div><div class='add'>+#define SAC_REG_BASE	(0x0300)  	/* Secondary Audio Codec */</div><div class='add'>+#define PMC_REG_BASE	(0x0400)  	/* Primary Modem Codec */</div><div class='add'>+#define SMC_REG_BASE	(0x0500)  	/* Secondary Modem Codec */</div><div class='add'>+</div><div class='add'>+#endif /* __ASM_ARCH_REGS_AC97_H */</div><div class='head'>diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c<br/>index 5d9411839cd7..77b11616a7ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-ac97.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-ac97.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-ac97.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/pxa2xx-ac97.c</a></div><div class='hunk'>@@ -1,92 +1,100 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * linux/sound/pxa2xx-ac97.c -- AC97 support for the Intel PXA2xx chip.</div><div class='ctx'>  *</div><div class='ctx'>  * Author:	Nicolas Pitre</div><div class='ctx'>  * Created:	Dec 02, 2004</div><div class='ctx'>  * Copyright:	MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pxa2xx-lib.h&gt;</div><div class='add'>+#include &lt;sound/dmaengine_pcm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;mach/regs-ac97.h&gt;</div><div class='del'>-#include &lt;mach/audio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pxa2xx-pcm.h"</div><div class='add'>+#include &lt;linux/platform_data/asoc-pxa.h&gt;</div><div class='ctx'> </div><div class='del'>-static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)</div><div class='add'>+static void pxa2xx_ac97_legacy_reset(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	if (!pxa2xx_ac97_try_cold_reset(ac97)) {</div><div class='del'>-		pxa2xx_ac97_try_warm_reset(ac97);</div><div class='del'>-	}</div><div class='add'>+	if (!pxa2xx_ac97_try_cold_reset())</div><div class='add'>+		pxa2xx_ac97_try_warm_reset();</div><div class='ctx'> </div><div class='del'>-	pxa2xx_ac97_finish_reset(ac97);</div><div class='add'>+	pxa2xx_ac97_finish_reset();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {</div><div class='del'>-	.read	= pxa2xx_ac97_read,</div><div class='del'>-	.write	= pxa2xx_ac97_write,</div><div class='del'>-	.reset	= pxa2xx_ac97_reset,</div><div class='del'>-};</div><div class='add'>+static unsigned short pxa2xx_ac97_legacy_read(struct snd_ac97 *ac97,</div><div class='add'>+					      unsigned short reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = {</div><div class='del'>-	.name			= "AC97 PCM out",</div><div class='del'>-	.dev_addr		= __PREG(PCDR),</div><div class='del'>-	.drcmr			= &amp;DRCMR(12),</div><div class='del'>-	.dcmd			= DCMD_INCSRCADDR | DCMD_FLOWTRG |</div><div class='del'>-				  DCMD_BURST32 | DCMD_WIDTH4,</div><div class='del'>-};</div><div class='add'>+	ret = pxa2xx_ac97_read(ac97-&gt;num, reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return (unsigned short)(ret &amp; 0xffff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pxa2xx_ac97_legacy_write(struct snd_ac97 *ac97,</div><div class='add'>+				     unsigned short reg, unsigned short val)</div><div class='add'>+{</div><div class='add'>+	pxa2xx_ac97_write(ac97-&gt;num, reg, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = {</div><div class='del'>-	.name			= "AC97 PCM in",</div><div class='del'>-	.dev_addr		= __PREG(PCDR),</div><div class='del'>-	.drcmr			= &amp;DRCMR(11),</div><div class='del'>-	.dcmd			= DCMD_INCTRGADDR | DCMD_FLOWSRC |</div><div class='del'>-				  DCMD_BURST32 | DCMD_WIDTH4,</div><div class='add'>+static const struct snd_ac97_bus_ops pxa2xx_ac97_ops = {</div><div class='add'>+	.read	= pxa2xx_ac97_legacy_read,</div><div class='add'>+	.write	= pxa2xx_ac97_legacy_write,</div><div class='add'>+	.reset	= pxa2xx_ac97_legacy_reset,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct snd_pcm *pxa2xx_ac97_pcm;</div><div class='ctx'> static struct snd_ac97 *pxa2xx_ac97_ac97;</div><div class='ctx'> </div><div class='del'>-static int pxa2xx_ac97_pcm_startup(struct snd_pcm_substream *substream)</div><div class='add'>+static int pxa2xx_ac97_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	pxa2xx_audio_ops_t *platform_ops;</div><div class='del'>-	int r;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = pxa2xx_pcm_open(substream);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw.channels_min = 2;</div><div class='ctx'> 	runtime-&gt;hw.channels_max = 2;</div><div class='ctx'> </div><div class='del'>-	r = (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) ?</div><div class='del'>-	    AC97_RATES_FRONT_DAC : AC97_RATES_ADC;</div><div class='del'>-	runtime-&gt;hw.rates = pxa2xx_ac97_ac97-&gt;rates[r];</div><div class='add'>+	i = (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) ?</div><div class='add'>+		AC97_RATES_FRONT_DAC : AC97_RATES_ADC;</div><div class='add'>+	runtime-&gt;hw.rates = pxa2xx_ac97_ac97-&gt;rates[i];</div><div class='ctx'> 	snd_pcm_limit_hw_rates(runtime);</div><div class='ctx'> </div><div class='del'>-       	platform_ops = substream-&gt;pcm-&gt;card-&gt;dev-&gt;platform_data;</div><div class='del'>-	if (platform_ops &amp;&amp; platform_ops-&gt;startup)</div><div class='del'>-		return platform_ops-&gt;startup(substream, platform_ops-&gt;priv);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	platform_ops = substream-&gt;pcm-&gt;card-&gt;dev-&gt;platform_data;</div><div class='add'>+	if (platform_ops &amp;&amp; platform_ops-&gt;startup) {</div><div class='add'>+		ret = platform_ops-&gt;startup(substream, platform_ops-&gt;priv);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			pxa2xx_pcm_close(substream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pxa2xx_ac97_pcm_shutdown(struct snd_pcm_substream *substream)</div><div class='add'>+static int pxa2xx_ac97_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	pxa2xx_audio_ops_t *platform_ops;</div><div class='ctx'> </div><div class='del'>-       	platform_ops = substream-&gt;pcm-&gt;card-&gt;dev-&gt;platform_data;</div><div class='add'>+	platform_ops = substream-&gt;pcm-&gt;card-&gt;dev-&gt;platform_data;</div><div class='ctx'> 	if (platform_ops &amp;&amp; platform_ops-&gt;shutdown)</div><div class='ctx'> 		platform_ops-&gt;shutdown(substream, platform_ops-&gt;priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pxa2xx_ac97_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -94,25 +102,20 @@ static int pxa2xx_ac97_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int reg = (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) ?</div><div class='ctx'> 		  AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;</div><div class='del'>-	return snd_ac97_set_rate(pxa2xx_ac97_ac97, reg, runtime-&gt;rate);</div><div class='del'>-}</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {</div><div class='del'>-	.playback_params	= &amp;pxa2xx_ac97_pcm_out,</div><div class='del'>-	.capture_params		= &amp;pxa2xx_ac97_pcm_in,</div><div class='del'>-	.startup		= pxa2xx_ac97_pcm_startup,</div><div class='del'>-	.shutdown		= pxa2xx_ac97_pcm_shutdown,</div><div class='del'>-	.prepare		= pxa2xx_ac97_pcm_prepare,</div><div class='del'>-};</div><div class='add'>+	ret = pxa2xx_pcm_prepare(substream);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+	return snd_ac97_set_rate(pxa2xx_ac97_ac97, reg, runtime-&gt;rate);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)</div><div class='add'>+static int pxa2xx_ac97_do_suspend(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	pxa2xx_audio_ops_t *platform_ops = card-&gt;dev-&gt;platform_data;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);</div><div class='del'>-	snd_pcm_suspend_all(pxa2xx_ac97_pcm);</div><div class='ctx'> 	snd_ac97_suspend(pxa2xx_ac97_ac97);</div><div class='ctx'> 	if (platform_ops &amp;&amp; platform_ops-&gt;suspend)</div><div class='ctx'> 		platform_ops-&gt;suspend(platform_ops-&gt;priv);</div><div class='hunk'>@@ -143,7 +146,7 @@ static int pxa2xx_ac97_suspend(struct device *dev)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (card)</div><div class='del'>-		ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);</div><div class='add'>+		ret = pxa2xx_ac97_do_suspend(card);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -159,13 +162,45 @@ static int pxa2xx_ac97_resume(struct device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {</div><div class='del'>-	.suspend	= pxa2xx_ac97_suspend,</div><div class='del'>-	.resume		= pxa2xx_ac97_resume,</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops pxa2xx_ac97_pcm_ops = {</div><div class='add'>+	.open		= pxa2xx_ac97_pcm_open,</div><div class='add'>+	.close		= pxa2xx_ac97_pcm_close,</div><div class='add'>+	.hw_params	= pxa2xx_pcm_hw_params,</div><div class='add'>+	.prepare	= pxa2xx_ac97_pcm_prepare,</div><div class='add'>+	.trigger	= pxa2xx_pcm_trigger,</div><div class='add'>+	.pointer	= pxa2xx_pcm_pointer,</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)</div><div class='add'>+</div><div class='add'>+static int pxa2xx_ac97_pcm_new(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_new(card, "PXA2xx-PCM", 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = dma_coerce_mask_and_coherent(card-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;pxa2xx_ac97_pcm_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;pxa2xx_ac97_pcm_ops);</div><div class='add'>+	ret = pxa2xx_pcm_preallocate_dma_buffer(pcm);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	pxa2xx_ac97_pcm = pcm;</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pxa2xx_ac97_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ac97_bus *ac97_bus;</div><div class='hunk'>@@ -179,15 +214,14 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)</div><div class='ctx'> 		goto err_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='del'>-			      THIS_MODULE, 0, &amp;card);</div><div class='add'>+	ret = snd_card_new(&amp;dev-&gt;dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='add'>+			   THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	card-&gt;dev = &amp;dev-&gt;dev;</div><div class='del'>-	strncpy(card-&gt;driver, dev-&gt;dev.driver-&gt;name, sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;driver, dev-&gt;dev.driver-&gt;name, sizeof(card-&gt;driver));</div><div class='ctx'> </div><div class='del'>-	ret = pxa2xx_pcm_new(card, &amp;pxa2xx_ac97_pcm_client, &amp;pxa2xx_ac97_pcm);</div><div class='add'>+	ret = pxa2xx_ac97_pcm_new(card);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +244,6 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (pdata &amp;&amp; pdata-&gt;codec_pdata[0])</div><div class='ctx'> 		snd_ac97_dev_add_pdata(ac97_bus-&gt;codec[0], pdata-&gt;codec_pdata[0]);</div><div class='del'>-	snd_card_set_dev(card, &amp;dev-&gt;dev);</div><div class='ctx'> 	ret = snd_card_register(card);</div><div class='ctx'> 	if (ret == 0) {</div><div class='ctx'> 		platform_set_drvdata(dev, card);</div><div class='hunk'>@@ -226,43 +259,26 @@ err_dev:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)</div><div class='add'>+static void pxa2xx_ac97_remove(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (card) {</div><div class='ctx'> 		snd_card_free(card);</div><div class='del'>-		platform_set_drvdata(dev, NULL);</div><div class='ctx'> 		pxa2xx_ac97_hw_remove(dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver pxa2xx_ac97_driver = {</div><div class='ctx'> 	.probe		= pxa2xx_ac97_probe,</div><div class='del'>-	.remove		= __devexit_p(pxa2xx_ac97_remove),</div><div class='add'>+	.remove		= pxa2xx_ac97_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "pxa2xx-ac97",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 		.pm	= &amp;pxa2xx_ac97_pm_ops,</div><div class='del'>-#endif</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init pxa2xx_ac97_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;pxa2xx_ac97_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit pxa2xx_ac97_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;pxa2xx_ac97_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(pxa2xx_ac97_init);</div><div class='del'>-module_exit(pxa2xx_ac97_exit);</div><div class='add'>+module_platform_driver(pxa2xx_ac97_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nicolas Pitre");</div><div class='ctx'> MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");</div><div class='head'>diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c<br/>index 8808b82311b1..571e9d909cdf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-pcm-lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm-lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-pcm-lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/arm/pxa2xx-pcm-lib.c</a></div><div class='hunk'>@@ -1,21 +1,16 @@</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/dma/pxa-dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/pxa2xx-lib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pxa2xx-pcm.h"</div><div class='add'>+#include &lt;sound/dmaengine_pcm.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const struct snd_pcm_hardware pxa2xx_pcm_hardware = {</div><div class='ctx'> 	.info			= SNDRV_PCM_INFO_MMAP |</div><div class='hunk'>@@ -24,158 +19,77 @@ static const struct snd_pcm_hardware pxa2xx_pcm_hardware = {</div><div class='ctx'> 				  SNDRV_PCM_INFO_PAUSE |</div><div class='ctx'> 				  SNDRV_PCM_INFO_RESUME,</div><div class='ctx'> 	.formats		= SNDRV_PCM_FMTBIT_S16_LE |</div><div class='del'>-					SNDRV_PCM_FMTBIT_S24_LE |</div><div class='del'>-					SNDRV_PCM_FMTBIT_S32_LE,</div><div class='add'>+				  SNDRV_PCM_FMTBIT_S24_LE |</div><div class='add'>+				  SNDRV_PCM_FMTBIT_S32_LE,</div><div class='ctx'> 	.period_bytes_min	= 32,</div><div class='ctx'> 	.period_bytes_max	= 8192 - 32,</div><div class='ctx'> 	.periods_min		= 1,</div><div class='del'>-	.periods_max		= PAGE_SIZE/sizeof(pxa_dma_desc),</div><div class='add'>+	.periods_max		= 256,</div><div class='ctx'> 	.buffer_bytes_max	= 128 * 1024,</div><div class='ctx'> 	.fifo_size		= 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_pcm_hw_params *params)</div><div class='add'>+int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *params)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd = runtime-&gt;private_data;</div><div class='del'>-	size_t totsize = params_buffer_bytes(params);</div><div class='del'>-	size_t period = params_period_bytes(params);</div><div class='del'>-	pxa_dma_desc *dma_desc;</div><div class='del'>-	dma_addr_t dma_buff_phys, next_desc_phys;</div><div class='del'>-</div><div class='del'>-	snd_pcm_set_runtime_buffer(substream, &amp;substream-&gt;dma_buffer);</div><div class='del'>-	runtime-&gt;dma_bytes = totsize;</div><div class='del'>-</div><div class='del'>-	dma_desc = rtd-&gt;dma_desc_array;</div><div class='del'>-	next_desc_phys = rtd-&gt;dma_desc_array_phys;</div><div class='del'>-	dma_buff_phys = runtime-&gt;dma_addr;</div><div class='del'>-	do {</div><div class='del'>-		next_desc_phys += sizeof(pxa_dma_desc);</div><div class='del'>-		dma_desc-&gt;ddadr = next_desc_phys;</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-			dma_desc-&gt;dsadr = dma_buff_phys;</div><div class='del'>-			dma_desc-&gt;dtadr = rtd-&gt;params-&gt;dev_addr;</div><div class='del'>-		} else {</div><div class='del'>-			dma_desc-&gt;dsadr = rtd-&gt;params-&gt;dev_addr;</div><div class='del'>-			dma_desc-&gt;dtadr = dma_buff_phys;</div><div class='del'>-		}</div><div class='del'>-		if (period &gt; totsize)</div><div class='del'>-			period = totsize;</div><div class='del'>-		dma_desc-&gt;dcmd = rtd-&gt;params-&gt;dcmd | period | DCMD_ENDIRQEN;</div><div class='del'>-		dma_desc++;</div><div class='del'>-		dma_buff_phys += period;</div><div class='del'>-	} while (totsize -= period);</div><div class='del'>-	dma_desc[-1].ddadr = rtd-&gt;dma_desc_array_phys;</div><div class='add'>+	struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);</div><div class='add'>+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);</div><div class='add'>+	struct snd_dmaengine_dai_dma_data *dma_params;</div><div class='add'>+	struct dma_slave_config config;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(__pxa2xx_pcm_hw_params);</div><div class='add'>+	dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);</div><div class='add'>+	if (!dma_params)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct pxa2xx_runtime_data *rtd = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+	ret = snd_hwparams_to_dma_slave_config(substream, params, &amp;config);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	snd_dmaengine_pcm_set_config_from_dai_data(substream,</div><div class='add'>+			snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream),</div><div class='add'>+			&amp;config);</div><div class='ctx'> </div><div class='del'>-	if (rtd &amp;&amp; rtd-&gt;params &amp;&amp; rtd-&gt;params-&gt;drcmr)</div><div class='del'>-		*rtd-&gt;params-&gt;drcmr = 0;</div><div class='add'>+	ret = dmaengine_slave_config(chan, &amp;config);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__pxa2xx_pcm_hw_free);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_pcm_hw_params);</div><div class='ctx'> </div><div class='ctx'> int pxa2xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct pxa2xx_runtime_data *prtd = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		DDADR(prtd-&gt;dma_ch) = prtd-&gt;dma_desc_array_phys;</div><div class='del'>-		DCSR(prtd-&gt;dma_ch) = DCSR_RUN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		DCSR(prtd-&gt;dma_ch) &amp;= ~DCSR_RUN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		DCSR(prtd-&gt;dma_ch) |= DCSR_RUN;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		DDADR(prtd-&gt;dma_ch) = prtd-&gt;dma_desc_array_phys;</div><div class='del'>-		DCSR(prtd-&gt;dma_ch) |= DCSR_RUN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return snd_dmaengine_pcm_trigger(substream, cmd);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pxa2xx_pcm_trigger);</div><div class='ctx'> </div><div class='ctx'> snd_pcm_uframes_t</div><div class='ctx'> pxa2xx_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct pxa2xx_runtime_data *prtd = runtime-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	dma_addr_t ptr = (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) ?</div><div class='del'>-			 DSADR(prtd-&gt;dma_ch) : DTADR(prtd-&gt;dma_ch);</div><div class='del'>-	snd_pcm_uframes_t x = bytes_to_frames(runtime, ptr - runtime-&gt;dma_addr);</div><div class='del'>-</div><div class='del'>-	if (x == runtime-&gt;buffer_size)</div><div class='del'>-		x = 0;</div><div class='del'>-	return x;</div><div class='add'>+	return snd_dmaengine_pcm_pointer(substream);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(pxa2xx_pcm_pointer);</div><div class='ctx'> </div><div class='del'>-int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct pxa2xx_runtime_data *prtd = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (!prtd || !prtd-&gt;params)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	DCSR(prtd-&gt;dma_ch) &amp;= ~DCSR_RUN;</div><div class='del'>-	DCSR(prtd-&gt;dma_ch) = 0;</div><div class='del'>-	DCMD(prtd-&gt;dma_ch) = 0;</div><div class='del'>-	*prtd-&gt;params-&gt;drcmr = prtd-&gt;dma_ch | DRCMR_MAPVLD;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__pxa2xx_pcm_prepare);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_pcm_prepare);</div><div class='ctx'> </div><div class='del'>-void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_substream *substream = dev_id;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int dcsr;</div><div class='del'>-</div><div class='del'>-	dcsr = DCSR(dma_ch);</div><div class='del'>-	DCSR(dma_ch) = dcsr &amp; ~DCSR_STOPIRQEN;</div><div class='del'>-</div><div class='del'>-	if (dcsr &amp; DCSR_ENDINTR) {</div><div class='del'>-		snd_pcm_period_elapsed(substream);</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",</div><div class='del'>-			rtd-&gt;params-&gt;name, dma_ch, dcsr);</div><div class='del'>-		snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(pxa2xx_pcm_dma_irq);</div><div class='del'>-</div><div class='del'>-int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+int pxa2xx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='add'>+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd;</div><div class='add'>+	struct snd_dmaengine_dai_dma_data *dma_params;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = pxa2xx_pcm_hardware;</div><div class='ctx'> </div><div class='add'>+	dma_params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);</div><div class='add'>+	if (!dma_params)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * For mysterious reasons (and despite what the manual says)</div><div class='ctx'> 	 * playback samples are lost if the DMA count is not a multiple</div><div class='hunk'>@@ -184,98 +98,97 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ret = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='ctx'> 		SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='ctx'> 		SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_pcm_hw_constraint_integer(runtime,</div><div class='ctx'> 					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	rtd = kzalloc(sizeof(*rtd), GFP_KERNEL);</div><div class='del'>-	if (!rtd)</div><div class='del'>-		goto out;</div><div class='del'>-	rtd-&gt;dma_desc_array =</div><div class='del'>-		dma_alloc_writecombine(substream-&gt;pcm-&gt;card-&gt;dev, PAGE_SIZE,</div><div class='del'>-				       &amp;rtd-&gt;dma_desc_array_phys, GFP_KERNEL);</div><div class='del'>-	if (!rtd-&gt;dma_desc_array)</div><div class='del'>-		goto err1;</div><div class='del'>-</div><div class='del'>-	rtd-&gt;dma_ch = -1;</div><div class='del'>-	runtime-&gt;private_data = rtd;</div><div class='del'>-	return 0;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>- err1:</div><div class='del'>-	kfree(rtd);</div><div class='del'>- out:</div><div class='del'>-	return ret;</div><div class='add'>+	return snd_dmaengine_pcm_open(</div><div class='add'>+		substream, dma_request_slave_channel(snd_soc_rtd_to_cpu(rtd, 0)-&gt;dev,</div><div class='add'>+						     dma_params-&gt;chan_name));</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__pxa2xx_pcm_open);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_pcm_open);</div><div class='ctx'> </div><div class='del'>-int __pxa2xx_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+int pxa2xx_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd = runtime-&gt;private_data;</div><div class='add'>+	return snd_dmaengine_pcm_close_release_chan(substream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_pcm_close);</div><div class='ctx'> </div><div class='del'>-	dma_free_writecombine(substream-&gt;pcm-&gt;card-&gt;dev, PAGE_SIZE,</div><div class='del'>-			      rtd-&gt;dma_desc_array, rtd-&gt;dma_desc_array_phys);</div><div class='del'>-	kfree(rtd);</div><div class='del'>-	return 0;</div><div class='add'>+int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm)</div><div class='add'>+{</div><div class='add'>+	size_t size = pxa2xx_pcm_hardware.buffer_bytes_max;</div><div class='add'>+</div><div class='add'>+	return snd_pcm_set_fixed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_WC,</div><div class='add'>+					    pcm-&gt;card-&gt;dev, size);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(__pxa2xx_pcm_close);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_pcm_preallocate_dma_buffer);</div><div class='ctx'> </div><div class='del'>-int pxa2xx_pcm_mmap(struct snd_pcm_substream *substream,</div><div class='del'>-	struct vm_area_struct *vma)</div><div class='add'>+int pxa2xx_soc_pcm_new(struct snd_soc_component *component,</div><div class='add'>+		       struct snd_soc_pcm_runtime *rtd)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	return dma_mmap_writecombine(substream-&gt;pcm-&gt;card-&gt;dev, vma,</div><div class='del'>-				     runtime-&gt;dma_area,</div><div class='del'>-				     runtime-&gt;dma_addr,</div><div class='del'>-				     runtime-&gt;dma_bytes);</div><div class='add'>+	struct snd_card *card = rtd-&gt;card-&gt;snd_card;</div><div class='add'>+	struct snd_pcm *pcm = rtd-&gt;pcm;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dma_coerce_mask_and_coherent(card-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return pxa2xx_pcm_preallocate_dma_buffer(pcm);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pxa2xx_pcm_mmap);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_new);</div><div class='ctx'> </div><div class='del'>-int pxa2xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)</div><div class='add'>+int pxa2xx_soc_pcm_open(struct snd_soc_component *component,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream = pcm-&gt;streams[stream].substream;</div><div class='del'>-	struct snd_dma_buffer *buf = &amp;substream-&gt;dma_buffer;</div><div class='del'>-	size_t size = pxa2xx_pcm_hardware.buffer_bytes_max;</div><div class='del'>-	buf-&gt;dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='del'>-	buf-&gt;dev.dev = pcm-&gt;card-&gt;dev;</div><div class='del'>-	buf-&gt;private_data = NULL;</div><div class='del'>-	buf-&gt;area = dma_alloc_writecombine(pcm-&gt;card-&gt;dev, size,</div><div class='del'>-					   &amp;buf-&gt;addr, GFP_KERNEL);</div><div class='del'>-	if (!buf-&gt;area)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	buf-&gt;bytes = size;</div><div class='del'>-	return 0;</div><div class='add'>+	return pxa2xx_pcm_open(substream);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pxa2xx_pcm_preallocate_dma_buffer);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_open);</div><div class='ctx'> </div><div class='del'>-void pxa2xx_pcm_free_dma_buffers(struct snd_pcm *pcm)</div><div class='add'>+int pxa2xx_soc_pcm_close(struct snd_soc_component *component,</div><div class='add'>+			 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_pcm_close(substream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_close);</div><div class='add'>+</div><div class='add'>+int pxa2xx_soc_pcm_hw_params(struct snd_soc_component *component,</div><div class='add'>+			     struct snd_pcm_substream *substream,</div><div class='add'>+			     struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_pcm_hw_params(substream, params);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_hw_params);</div><div class='add'>+</div><div class='add'>+int pxa2xx_soc_pcm_prepare(struct snd_soc_component *component,</div><div class='add'>+			   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_pcm_prepare(substream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_prepare);</div><div class='add'>+</div><div class='add'>+int pxa2xx_soc_pcm_trigger(struct snd_soc_component *component,</div><div class='add'>+			   struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	return pxa2xx_pcm_trigger(substream, cmd);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_trigger);</div><div class='add'>+</div><div class='add'>+snd_pcm_uframes_t</div><div class='add'>+pxa2xx_soc_pcm_pointer(struct snd_soc_component *component,</div><div class='add'>+		       struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_dma_buffer *buf;</div><div class='del'>-	int stream;</div><div class='del'>-</div><div class='del'>-	for (stream = 0; stream &lt; 2; stream++) {</div><div class='del'>-		substream = pcm-&gt;streams[stream].substream;</div><div class='del'>-		if (!substream)</div><div class='del'>-			continue;</div><div class='del'>-		buf = &amp;substream-&gt;dma_buffer;</div><div class='del'>-		if (!buf-&gt;area)</div><div class='del'>-			continue;</div><div class='del'>-		dma_free_writecombine(pcm-&gt;card-&gt;dev, buf-&gt;bytes,</div><div class='del'>-				      buf-&gt;area, buf-&gt;addr);</div><div class='del'>-		buf-&gt;area = NULL;</div><div class='del'>-	}</div><div class='add'>+	return pxa2xx_pcm_pointer(substream);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(pxa2xx_pcm_free_dma_buffers);</div><div class='add'>+EXPORT_SYMBOL(pxa2xx_soc_pcm_pointer);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Nicolas Pitre");</div><div class='ctx'> MODULE_DESCRIPTION("Intel PXA2xx sound library");</div><div class='head'>diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c<br/>deleted file mode 100644<br/>index 535704f77496..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/sound/arm/pxa2xx-pcm.c -- ALSA PCM interface for the Intel PXA2xx chip</div><div class='del'>- *</div><div class='del'>- * Author:	Nicolas Pitre</div><div class='del'>- * Created:	Nov 30, 2004</div><div class='del'>- * Copyright:	(C) 2004 MontaVista Software, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/pxa2xx-lib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pxa2xx-pcm.h"</div><div class='del'>-</div><div class='del'>-static int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct pxa2xx_pcm_client *client = substream-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	__pxa2xx_pcm_prepare(substream);</div><div class='del'>-</div><div class='del'>-	return client-&gt;prepare(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pxa2xx_pcm_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct pxa2xx_pcm_client *client = substream-&gt;private_data;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = __pxa2xx_pcm_open(substream);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	rtd = runtime-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	rtd-&gt;params = (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) ?</div><div class='del'>-		      client-&gt;playback_params : client-&gt;capture_params;</div><div class='del'>-	ret = pxa_request_dma(rtd-&gt;params-&gt;name, DMA_PRIO_LOW,</div><div class='del'>-			      pxa2xx_pcm_dma_irq, substream);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err2;</div><div class='del'>-	rtd-&gt;dma_ch = ret;</div><div class='del'>-</div><div class='del'>-	ret = client-&gt;startup(substream);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	pxa_free_dma(rtd-&gt;dma_ch);</div><div class='del'>- err2:</div><div class='del'>-	__pxa2xx_pcm_close(substream);</div><div class='del'>- out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct pxa2xx_pcm_client *client = substream-&gt;private_data;</div><div class='del'>-	struct pxa2xx_runtime_data *rtd = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	pxa_free_dma(rtd-&gt;dma_ch);</div><div class='del'>-	client-&gt;shutdown(substream);</div><div class='del'>-</div><div class='del'>-	return __pxa2xx_pcm_close(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops pxa2xx_pcm_ops = {</div><div class='del'>-	.open		= pxa2xx_pcm_open,</div><div class='del'>-	.close		= pxa2xx_pcm_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	= __pxa2xx_pcm_hw_params,</div><div class='del'>-	.hw_free	= __pxa2xx_pcm_hw_free,</div><div class='del'>-	.prepare	= pxa2xx_pcm_prepare,</div><div class='del'>-	.trigger	= pxa2xx_pcm_trigger,</div><div class='del'>-	.pointer	= pxa2xx_pcm_pointer,</div><div class='del'>-	.mmap		= pxa2xx_pcm_mmap,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u64 pxa2xx_pcm_dmamask = 0xffffffff;</div><div class='del'>-</div><div class='del'>-int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client,</div><div class='del'>-		   struct snd_pcm **rpcm)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	int play = client-&gt;playback_params ? 1 : 0;</div><div class='del'>-	int capt = client-&gt;capture_params ? 1 : 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = snd_pcm_new(card, "PXA2xx-PCM", 0, play, capt, &amp;pcm);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	pcm-&gt;private_data = client;</div><div class='del'>-	pcm-&gt;private_free = pxa2xx_pcm_free_dma_buffers;</div><div class='del'>-</div><div class='del'>-	if (!card-&gt;dev-&gt;dma_mask)</div><div class='del'>-		card-&gt;dev-&gt;dma_mask = &amp;pxa2xx_pcm_dmamask;</div><div class='del'>-	if (!card-&gt;dev-&gt;coherent_dma_mask)</div><div class='del'>-		card-&gt;dev-&gt;coherent_dma_mask = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	if (play) {</div><div class='del'>-		int stream = SNDRV_PCM_STREAM_PLAYBACK;</div><div class='del'>-		snd_pcm_set_ops(pcm, stream, &amp;pxa2xx_pcm_ops);</div><div class='del'>-		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, stream);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	if (capt) {</div><div class='del'>-		int stream = SNDRV_PCM_STREAM_CAPTURE;</div><div class='del'>-		snd_pcm_set_ops(pcm, stream, &amp;pxa2xx_pcm_ops);</div><div class='del'>-		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm, stream);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(pxa2xx_pcm_new);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Nicolas Pitre");</div><div class='del'>-MODULE_DESCRIPTION("Intel PXA2xx PCM DMA module");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h<br/>deleted file mode 100644<br/>index 65f86b56ba42..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/arm/pxa2xx-pcm.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/arm/pxa2xx-pcm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/sound/arm/pxa2xx-pcm.h -- ALSA PCM interface for the Intel PXA2xx chip</div><div class='del'>- *</div><div class='del'>- * Author:	Nicolas Pitre</div><div class='del'>- * Created:	Nov 30, 2004</div><div class='del'>- * Copyright:	MontaVista Software, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;mach/dma.h&gt;</div><div class='del'>-</div><div class='del'>-struct pxa2xx_runtime_data {</div><div class='del'>-	int dma_ch;</div><div class='del'>-	struct pxa2xx_pcm_dma_params *params;</div><div class='del'>-	pxa_dma_desc *dma_desc_array;</div><div class='del'>-	dma_addr_t dma_desc_array_phys;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pxa2xx_pcm_client {</div><div class='del'>-	struct pxa2xx_pcm_dma_params *playback_params;</div><div class='del'>-	struct pxa2xx_pcm_dma_params *capture_params;</div><div class='del'>-	int (*startup)(struct snd_pcm_substream *);</div><div class='del'>-	void (*shutdown)(struct snd_pcm_substream *);</div><div class='del'>-	int (*prepare)(struct snd_pcm_substream *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern int pxa2xx_pcm_new(struct snd_card *, struct pxa2xx_pcm_client *, struct snd_pcm **);</div><div class='del'>-</div><div class='head'>diff --git a/sound/atmel/Kconfig b/sound/atmel/Kconfig<br/>index 94de43a096f1..6ed2d4a73374 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/atmel/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/atmel/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/atmel/Kconfig</a></div><div class='hunk'>@@ -1,18 +1,12 @@</div><div class='del'>-menu "Atmel devices (AVR32 and AT91)"</div><div class='del'>-	depends on AVR32 || ARCH_AT91</div><div class='del'>-</div><div class='del'>-config SND_ATMEL_ABDAC</div><div class='del'>-	tristate "Atmel Audio Bitstream DAC (ABDAC) driver"</div><div class='del'>-	select SND_PCM</div><div class='del'>-	depends on DW_DMAC &amp;&amp; AVR32</div><div class='del'>-	help</div><div class='del'>-	  ALSA sound driver for the Atmel Audio Bitstream DAC (ABDAC).</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+menu "Atmel devices (AT91)"</div><div class='add'>+	depends on ARCH_AT91</div><div class='ctx'> </div><div class='ctx'> config SND_ATMEL_AC97C</div><div class='ctx'> 	tristate "Atmel AC97 Controller (AC97C) driver"</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='del'>-	depends on (DW_DMAC &amp;&amp; AVR32) || ARCH_AT91</div><div class='add'>+	depends on ARCH_AT91</div><div class='ctx'> 	help</div><div class='ctx'> 	  ALSA sound driver for the Atmel AC97 controller.</div><div class='ctx'> </div><div class='head'>diff --git a/sound/atmel/Makefile b/sound/atmel/Makefile<br/>index 219dcfac6086..a8917d1854c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/atmel/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/atmel/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/atmel/Makefile</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-snd-atmel-abdac-objs		:= abdac.o</div><div class='del'>-snd-atmel-ac97c-objs		:= ac97c.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-atmel-ac97c-y		:= ac97c.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_SND_ATMEL_ABDAC)	+= snd-atmel-abdac.o</div><div class='ctx'> obj-$(CONFIG_SND_ATMEL_AC97C)	+= snd-atmel-ac97c.o</div><div class='head'>diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c<br/>deleted file mode 100644<br/>index f2f41c854221..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/atmel/abdac.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/abdac.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,602 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Driver for the Atmel on-chip Audio Bitstream DAC (ABDAC)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2006-2009 Atmel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='del'>-#include &lt;linux/dw_dmac.h&gt;</div><div class='del'>-#include &lt;linux/dmaengine.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;sound/pcm_params.h&gt;</div><div class='del'>-#include &lt;sound/atmel-abdac.h&gt;</div><div class='del'>-</div><div class='del'>-/* DAC register offsets */</div><div class='del'>-#define DAC_DATA                                0x0000</div><div class='del'>-#define DAC_CTRL                                0x0008</div><div class='del'>-#define DAC_INT_MASK                            0x000c</div><div class='del'>-#define DAC_INT_EN                              0x0010</div><div class='del'>-#define DAC_INT_DIS                             0x0014</div><div class='del'>-#define DAC_INT_CLR                             0x0018</div><div class='del'>-#define DAC_INT_STATUS                          0x001c</div><div class='del'>-</div><div class='del'>-/* Bitfields in CTRL */</div><div class='del'>-#define DAC_SWAP_OFFSET                         30</div><div class='del'>-#define DAC_SWAP_SIZE                           1</div><div class='del'>-#define DAC_EN_OFFSET                           31</div><div class='del'>-#define DAC_EN_SIZE                             1</div><div class='del'>-</div><div class='del'>-/* Bitfields in INT_MASK/INT_EN/INT_DIS/INT_STATUS/INT_CLR */</div><div class='del'>-#define DAC_UNDERRUN_OFFSET                     28</div><div class='del'>-#define DAC_UNDERRUN_SIZE                       1</div><div class='del'>-#define DAC_TX_READY_OFFSET                     29</div><div class='del'>-#define DAC_TX_READY_SIZE                       1</div><div class='del'>-</div><div class='del'>-/* Bit manipulation macros */</div><div class='del'>-#define DAC_BIT(name)					\</div><div class='del'>-	(1 &lt;&lt; DAC_##name##_OFFSET)</div><div class='del'>-#define DAC_BF(name, value)				\</div><div class='del'>-	(((value) &amp; ((1 &lt;&lt; DAC_##name##_SIZE) - 1))	\</div><div class='del'>-	 &lt;&lt; DAC_##name##_OFFSET)</div><div class='del'>-#define DAC_BFEXT(name, value)				\</div><div class='del'>-	(((value) &gt;&gt; DAC_##name##_OFFSET)		\</div><div class='del'>-	 &amp; ((1 &lt;&lt; DAC_##name##_SIZE) - 1))</div><div class='del'>-#define DAC_BFINS(name, value, old)			\</div><div class='del'>-	(((old) &amp; ~(((1 &lt;&lt; DAC_##name##_SIZE) - 1)	\</div><div class='del'>-		    &lt;&lt; DAC_##name##_OFFSET))		\</div><div class='del'>-	 | DAC_BF(name, value))</div><div class='del'>-</div><div class='del'>-/* Register access macros */</div><div class='del'>-#define dac_readl(port, reg)				\</div><div class='del'>-	__raw_readl((port)-&gt;regs + DAC_##reg)</div><div class='del'>-#define dac_writel(port, reg, value)			\</div><div class='del'>-	__raw_writel((value), (port)-&gt;regs + DAC_##reg)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ABDAC supports a maximum of 6 different rates from a generic clock. The</div><div class='del'>- * generic clock has a power of two divider, which gives 6 steps from 192 kHz</div><div class='del'>- * to 5112 Hz.</div><div class='del'>- */</div><div class='del'>-#define MAX_NUM_RATES	6</div><div class='del'>-/* ALSA seems to use rates between 192000 Hz and 5112 Hz. */</div><div class='del'>-#define RATE_MAX	192000</div><div class='del'>-#define RATE_MIN	5112</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DMA_READY = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct atmel_abdac_dma {</div><div class='del'>-	struct dma_chan		*chan;</div><div class='del'>-	struct dw_cyclic_desc	*cdesc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct atmel_abdac {</div><div class='del'>-	struct clk				*pclk;</div><div class='del'>-	struct clk				*sample_clk;</div><div class='del'>-	struct platform_device			*pdev;</div><div class='del'>-	struct atmel_abdac_dma			dma;</div><div class='del'>-</div><div class='del'>-	struct snd_pcm_hw_constraint_list	constraints_rates;</div><div class='del'>-	struct snd_pcm_substream		*substream;</div><div class='del'>-	struct snd_card				*card;</div><div class='del'>-	struct snd_pcm				*pcm;</div><div class='del'>-</div><div class='del'>-	void __iomem				*regs;</div><div class='del'>-	unsigned long				flags;</div><div class='del'>-	unsigned int				rates[MAX_NUM_RATES];</div><div class='del'>-	unsigned int				rates_num;</div><div class='del'>-	int					irq;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define get_dac(card) ((struct atmel_abdac *)(card)-&gt;private_data)</div><div class='del'>-</div><div class='del'>-/* This function is called by the DMA driver. */</div><div class='del'>-static void atmel_abdac_dma_period_done(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = arg;</div><div class='del'>-	snd_pcm_period_elapsed(dac-&gt;substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_prepare_dma(struct atmel_abdac *dac,</div><div class='del'>-		struct snd_pcm_substream *substream,</div><div class='del'>-		enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	struct dma_chan			*chan = dac-&gt;dma.chan;</div><div class='del'>-	struct dw_cyclic_desc		*cdesc;</div><div class='del'>-	struct snd_pcm_runtime		*runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long			buffer_len, period_len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't do DMA on "complex" transfers, i.e. with</div><div class='del'>-	 * non-halfword-aligned buffers or lengths.</div><div class='del'>-	 */</div><div class='del'>-	if (runtime-&gt;dma_addr &amp; 1 || runtime-&gt;buffer_size &amp; 1) {</div><div class='del'>-		dev_dbg(&amp;dac-&gt;pdev-&gt;dev, "too complex transfer\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buffer_len = frames_to_bytes(runtime, runtime-&gt;buffer_size);</div><div class='del'>-	period_len = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='del'>-</div><div class='del'>-	cdesc = dw_dma_cyclic_prep(chan, runtime-&gt;dma_addr, buffer_len,</div><div class='del'>-			period_len, DMA_TO_DEVICE);</div><div class='del'>-	if (IS_ERR(cdesc)) {</div><div class='del'>-		dev_dbg(&amp;dac-&gt;pdev-&gt;dev, "could not prepare cyclic DMA\n");</div><div class='del'>-		return PTR_ERR(cdesc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cdesc-&gt;period_callback = atmel_abdac_dma_period_done;</div><div class='del'>-	cdesc-&gt;period_callback_param = dac;</div><div class='del'>-</div><div class='del'>-	dac-&gt;dma.cdesc = cdesc;</div><div class='del'>-</div><div class='del'>-	set_bit(DMA_READY, &amp;dac-&gt;flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware atmel_abdac_hw = {</div><div class='del'>-	.info			= (SNDRV_PCM_INFO_MMAP</div><div class='del'>-				  | SNDRV_PCM_INFO_MMAP_VALID</div><div class='del'>-				  | SNDRV_PCM_INFO_INTERLEAVED</div><div class='del'>-				  | SNDRV_PCM_INFO_BLOCK_TRANSFER</div><div class='del'>-				  | SNDRV_PCM_INFO_RESUME</div><div class='del'>-				  | SNDRV_PCM_INFO_PAUSE),</div><div class='del'>-	.formats		= (SNDRV_PCM_FMTBIT_S16_BE),</div><div class='del'>-	.rates			= (SNDRV_PCM_RATE_KNOT),</div><div class='del'>-	.rate_min		= RATE_MIN,</div><div class='del'>-	.rate_max		= RATE_MAX,</div><div class='del'>-	.channels_min		= 2,</div><div class='del'>-	.channels_max		= 2,</div><div class='del'>-	.buffer_bytes_max	= 64 * 4096,</div><div class='del'>-	.period_bytes_min	= 4096,</div><div class='del'>-	.period_bytes_max	= 4096,</div><div class='del'>-	.periods_min		= 6,</div><div class='del'>-	.periods_max		= 64,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	dac-&gt;substream = substream;</div><div class='del'>-	atmel_abdac_hw.rate_max = dac-&gt;rates[dac-&gt;rates_num - 1];</div><div class='del'>-	atmel_abdac_hw.rate_min = dac-&gt;rates[0];</div><div class='del'>-	substream-&gt;runtime-&gt;hw = atmel_abdac_hw;</div><div class='del'>-</div><div class='del'>-	return snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='del'>-			SNDRV_PCM_HW_PARAM_RATE, &amp;dac-&gt;constraints_rates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	dac-&gt;substream = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-		struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-			params_buffer_bytes(hw_params));</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-	/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */</div><div class='del'>-	if (retval == 1)</div><div class='del'>-		if (test_and_clear_bit(DMA_READY, &amp;dac-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_free(dac-&gt;dma.chan);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	if (test_and_clear_bit(DMA_READY, &amp;dac-&gt;flags))</div><div class='del'>-		dw_dma_cyclic_free(dac-&gt;dma.chan);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = clk_set_rate(dac-&gt;sample_clk, 256 * substream-&gt;runtime-&gt;rate);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(DMA_READY, &amp;dac-&gt;flags))</div><div class='del'>-		retval = atmel_abdac_prepare_dma(dac, substream, DMA_TO_DEVICE);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_RESUME: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		clk_enable(dac-&gt;sample_clk);</div><div class='del'>-		retval = dw_dma_cyclic_start(dac-&gt;dma.chan);</div><div class='del'>-		if (retval)</div><div class='del'>-			goto out;</div><div class='del'>-		dac_writel(dac, CTRL, DAC_BIT(EN));</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		dw_dma_cyclic_stop(dac-&gt;dma.chan);</div><div class='del'>-		dac_writel(dac, DATA, 0);</div><div class='del'>-		dac_writel(dac, CTRL, 0);</div><div class='del'>-		clk_disable(dac-&gt;sample_clk);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-atmel_abdac_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac	*dac = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct snd_pcm_runtime	*runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_uframes_t	frames;</div><div class='del'>-	unsigned long		bytes;</div><div class='del'>-</div><div class='del'>-	bytes = dw_dma_get_src_addr(dac-&gt;dma.chan);</div><div class='del'>-	bytes -= runtime-&gt;dma_addr;</div><div class='del'>-</div><div class='del'>-	frames = bytes_to_frames(runtime, bytes);</div><div class='del'>-	if (frames &gt;= runtime-&gt;buffer_size)</div><div class='del'>-		frames -= runtime-&gt;buffer_size;</div><div class='del'>-</div><div class='del'>-	return frames;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t abdac_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct atmel_abdac *dac = dev_id;</div><div class='del'>-	u32 status;</div><div class='del'>-</div><div class='del'>-	status = dac_readl(dac, INT_STATUS);</div><div class='del'>-	if (status &amp; DAC_BIT(UNDERRUN)) {</div><div class='del'>-		dev_err(&amp;dac-&gt;pdev-&gt;dev, "underrun detected\n");</div><div class='del'>-		dac_writel(dac, INT_CLR, DAC_BIT(UNDERRUN));</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(&amp;dac-&gt;pdev-&gt;dev, "spurious interrupt (status=0x%x)\n",</div><div class='del'>-			status);</div><div class='del'>-		dac_writel(dac, INT_CLR, status);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops atmel_abdac_ops = {</div><div class='del'>-	.open		= atmel_abdac_open,</div><div class='del'>-	.close		= atmel_abdac_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	= atmel_abdac_hw_params,</div><div class='del'>-	.hw_free	= atmel_abdac_hw_free,</div><div class='del'>-	.prepare	= atmel_abdac_prepare,</div><div class='del'>-	.trigger	= atmel_abdac_trigger,</div><div class='del'>-	.pointer	= atmel_abdac_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit atmel_abdac_pcm_new(struct atmel_abdac *dac)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_hardware hw = atmel_abdac_hw;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = snd_pcm_new(dac-&gt;card, dac-&gt;card-&gt;shortname,</div><div class='del'>-			dac-&gt;pdev-&gt;id, 1, 0, &amp;pcm);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='del'>-</div><div class='del'>-	strcpy(pcm-&gt;name, dac-&gt;card-&gt;shortname);</div><div class='del'>-	pcm-&gt;private_data = dac;</div><div class='del'>-	pcm-&gt;info_flags = 0;</div><div class='del'>-	dac-&gt;pcm = pcm;</div><div class='del'>-</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;atmel_abdac_ops);</div><div class='del'>-</div><div class='del'>-	retval = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-			&amp;dac-&gt;pdev-&gt;dev, hw.periods_min * hw.period_bytes_min,</div><div class='del'>-			hw.buffer_bytes_max);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool filter(struct dma_chan *chan, void *slave)</div><div class='del'>-{</div><div class='del'>-	struct dw_dma_slave *dws = slave;</div><div class='del'>-</div><div class='del'>-	if (dws-&gt;dma_dev == chan-&gt;device-&gt;dev) {</div><div class='del'>-		chan-&gt;private = dws;</div><div class='del'>-		return true;</div><div class='del'>-	} else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_sample_rates(struct atmel_abdac *dac)</div><div class='del'>-{</div><div class='del'>-	long new_rate = RATE_MAX;</div><div class='del'>-	int retval = -EINVAL;</div><div class='del'>-	int index = 0;</div><div class='del'>-</div><div class='del'>-	/* we start at 192 kHz and work our way down to 5112 Hz */</div><div class='del'>-	while (new_rate &gt;= RATE_MIN &amp;&amp; index &lt; (MAX_NUM_RATES + 1)) {</div><div class='del'>-		new_rate = clk_round_rate(dac-&gt;sample_clk, 256 * new_rate);</div><div class='del'>-		if (new_rate &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		/* make sure we are below the ABDAC clock */</div><div class='del'>-		if (new_rate &lt;= clk_get_rate(dac-&gt;pclk)) {</div><div class='del'>-			dac-&gt;rates[index] = new_rate / 256;</div><div class='del'>-			index++;</div><div class='del'>-		}</div><div class='del'>-		/* divide by 256 and then by two to get next rate */</div><div class='del'>-		new_rate /= 256 * 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (index) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		/* reverse array, smallest go first */</div><div class='del'>-		for (i = 0; i &lt; (index / 2); i++) {</div><div class='del'>-			unsigned int tmp = dac-&gt;rates[index - 1 - i];</div><div class='del'>-			dac-&gt;rates[index - 1 - i] = dac-&gt;rates[i];</div><div class='del'>-			dac-&gt;rates[i] = tmp;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dac-&gt;constraints_rates.count = index;</div><div class='del'>-		dac-&gt;constraints_rates.list = dac-&gt;rates;</div><div class='del'>-		dac-&gt;constraints_rates.mask = 0;</div><div class='del'>-		dac-&gt;rates_num = index;</div><div class='del'>-</div><div class='del'>-		retval = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit atmel_abdac_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card		*card;</div><div class='del'>-	struct atmel_abdac	*dac;</div><div class='del'>-	struct resource		*regs;</div><div class='del'>-	struct atmel_abdac_pdata	*pdata;</div><div class='del'>-	struct clk		*pclk;</div><div class='del'>-	struct clk		*sample_clk;</div><div class='del'>-	int			retval;</div><div class='del'>-	int			irq;</div><div class='del'>-</div><div class='del'>-	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!regs) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "no memory resource\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not get IRQ number\n");</div><div class='del'>-		return irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	if (!pdata) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "no platform data\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pclk = clk_get(&amp;pdev-&gt;dev, "pclk");</div><div class='del'>-	if (IS_ERR(pclk)) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "no peripheral clock\n");</div><div class='del'>-		return PTR_ERR(pclk);</div><div class='del'>-	}</div><div class='del'>-	sample_clk = clk_get(&amp;pdev-&gt;dev, "sample_clk");</div><div class='del'>-	if (IS_ERR(pclk)) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "no sample clock\n");</div><div class='del'>-		retval = PTR_ERR(pclk);</div><div class='del'>-		goto out_put_pclk;</div><div class='del'>-	}</div><div class='del'>-	clk_enable(pclk);</div><div class='del'>-</div><div class='del'>-	retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='del'>-			THIS_MODULE, sizeof(struct atmel_abdac), &amp;card);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not create sound card device\n");</div><div class='del'>-		goto out_put_sample_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dac = get_dac(card);</div><div class='del'>-</div><div class='del'>-	dac-&gt;irq = irq;</div><div class='del'>-	dac-&gt;card = card;</div><div class='del'>-	dac-&gt;pclk = pclk;</div><div class='del'>-	dac-&gt;sample_clk = sample_clk;</div><div class='del'>-	dac-&gt;pdev = pdev;</div><div class='del'>-</div><div class='del'>-	retval = set_sample_rates(dac);</div><div class='del'>-	if (retval &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not set supported rates\n");</div><div class='del'>-		goto out_free_card;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dac-&gt;regs = ioremap(regs-&gt;start, regs-&gt;end - regs-&gt;start + 1);</div><div class='del'>-	if (!dac-&gt;regs) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not remap register memory\n");</div><div class='del'>-		goto out_free_card;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* make sure the DAC is silent and disabled */</div><div class='del'>-	dac_writel(dac, DATA, 0);</div><div class='del'>-	dac_writel(dac, CTRL, 0);</div><div class='del'>-</div><div class='del'>-	retval = request_irq(irq, abdac_interrupt, 0, "abdac", dac);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not request irq\n");</div><div class='del'>-		goto out_unmap_regs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;dws.dma_dev) {</div><div class='del'>-		struct dw_dma_slave *dws = &amp;pdata-&gt;dws;</div><div class='del'>-		dma_cap_mask_t mask;</div><div class='del'>-</div><div class='del'>-		dws-&gt;tx_reg = regs-&gt;start + DAC_DATA;</div><div class='del'>-</div><div class='del'>-		dma_cap_zero(mask);</div><div class='del'>-		dma_cap_set(DMA_SLAVE, mask);</div><div class='del'>-</div><div class='del'>-		dac-&gt;dma.chan = dma_request_channel(mask, filter, dws);</div><div class='del'>-	}</div><div class='del'>-	if (!pdata-&gt;dws.dma_dev || !dac-&gt;dma.chan) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "DMA not available\n");</div><div class='del'>-		retval = -ENODEV;</div><div class='del'>-		goto out_unset_card_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(card-&gt;driver, "Atmel ABDAC");</div><div class='del'>-	strcpy(card-&gt;shortname, "Atmel ABDAC");</div><div class='del'>-	sprintf(card-&gt;longname, "Atmel Audio Bitstream DAC");</div><div class='del'>-</div><div class='del'>-	retval = atmel_abdac_pcm_new(dac);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not register ABDAC pcm device\n");</div><div class='del'>-		goto out_release_dma;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = snd_card_register(card);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not register sound card\n");</div><div class='del'>-		goto out_release_dma;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, card);</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "Atmel ABDAC at 0x%p using %s\n",</div><div class='del'>-			dac-&gt;regs, dev_name(&amp;dac-&gt;dma.chan-&gt;dev-&gt;device));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-out_release_dma:</div><div class='del'>-	dma_release_channel(dac-&gt;dma.chan);</div><div class='del'>-	dac-&gt;dma.chan = NULL;</div><div class='del'>-out_unset_card_dev:</div><div class='del'>-	snd_card_set_dev(card, NULL);</div><div class='del'>-	free_irq(irq, dac);</div><div class='del'>-out_unmap_regs:</div><div class='del'>-	iounmap(dac-&gt;regs);</div><div class='del'>-out_free_card:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-out_put_sample_clk:</div><div class='del'>-	clk_put(sample_clk);</div><div class='del'>-	clk_disable(pclk);</div><div class='del'>-out_put_pclk:</div><div class='del'>-	clk_put(pclk);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int atmel_abdac_suspend(struct platform_device *pdev, pm_message_t msg)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='del'>-	struct atmel_abdac *dac = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	dw_dma_cyclic_stop(dac-&gt;dma.chan);</div><div class='del'>-	clk_disable(dac-&gt;sample_clk);</div><div class='del'>-	clk_disable(dac-&gt;pclk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_abdac_resume(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='del'>-	struct atmel_abdac *dac = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	clk_enable(dac-&gt;pclk);</div><div class='del'>-	clk_enable(dac-&gt;sample_clk);</div><div class='del'>-	if (test_bit(DMA_READY, &amp;dac-&gt;flags))</div><div class='del'>-		dw_dma_cyclic_start(dac-&gt;dma.chan);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define atmel_abdac_suspend NULL</div><div class='del'>-#define atmel_abdac_resume NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __devexit atmel_abdac_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='del'>-	struct atmel_abdac *dac = get_dac(card);</div><div class='del'>-</div><div class='del'>-	clk_put(dac-&gt;sample_clk);</div><div class='del'>-	clk_disable(dac-&gt;pclk);</div><div class='del'>-	clk_put(dac-&gt;pclk);</div><div class='del'>-</div><div class='del'>-	dma_release_channel(dac-&gt;dma.chan);</div><div class='del'>-	dac-&gt;dma.chan = NULL;</div><div class='del'>-	snd_card_set_dev(card, NULL);</div><div class='del'>-	iounmap(dac-&gt;regs);</div><div class='del'>-	free_irq(dac-&gt;irq, dac);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver atmel_abdac_driver = {</div><div class='del'>-	.remove		= __devexit_p(atmel_abdac_remove),</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "atmel_abdac",</div><div class='del'>-	},</div><div class='del'>-	.suspend	= atmel_abdac_suspend,</div><div class='del'>-	.resume		= atmel_abdac_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init atmel_abdac_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;atmel_abdac_driver,</div><div class='del'>-			atmel_abdac_probe);</div><div class='del'>-}</div><div class='del'>-module_init(atmel_abdac_init);</div><div class='del'>-</div><div class='del'>-static void __exit atmel_abdac_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;atmel_abdac_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(atmel_abdac_exit);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Driver for Atmel Audio Bitstream DAC (ABDAC)");</div><div class='del'>-MODULE_AUTHOR("Hans-Christian Egtvedt &lt;hans-christian.egtvedt@atmel.com&gt;");</div><div class='head'>diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c<br/>index 10c3a871a12d..df0a049192de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/atmel/ac97c.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/ac97c.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/atmel/ac97c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/atmel/ac97c.c</a></div><div class='hunk'>@@ -1,25 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Atmel AC97C</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005-2009 Atmel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/dmaengine.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/atmel_pdc.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -27,36 +25,16 @@</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='del'>-#include &lt;sound/atmel-ac97c.h&gt;</div><div class='ctx'> #include &lt;sound/memalloc.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/dw_dmac.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/cpu.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;mach/gpio.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "ac97c.h"</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	DMA_TX_READY = 0,</div><div class='del'>-	DMA_RX_READY,</div><div class='del'>-	DMA_TX_CHAN_PRESENT,</div><div class='del'>-	DMA_RX_CHAN_PRESENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Serialize access to opened variable */</div><div class='ctx'> static DEFINE_MUTEX(opened_mutex);</div><div class='ctx'> </div><div class='del'>-struct atmel_ac97c_dma {</div><div class='del'>-	struct dma_chan			*rx_chan;</div><div class='del'>-	struct dma_chan			*tx_chan;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct atmel_ac97c {</div><div class='ctx'> 	struct clk			*pclk;</div><div class='ctx'> 	struct platform_device		*pdev;</div><div class='del'>-	struct atmel_ac97c_dma		dma;</div><div class='ctx'> </div><div class='ctx'> 	struct snd_pcm_substream	*playback_substream;</div><div class='ctx'> 	struct snd_pcm_substream	*capture_substream;</div><div class='hunk'>@@ -67,14 +45,13 @@ struct atmel_ac97c {</div><div class='ctx'> </div><div class='ctx'> 	u64				cur_format;</div><div class='ctx'> 	unsigned int			cur_rate;</div><div class='del'>-	unsigned long			flags;</div><div class='ctx'> 	int				playback_period, capture_period;</div><div class='ctx'> 	/* Serialize access to opened variable */</div><div class='ctx'> 	spinlock_t			lock;</div><div class='ctx'> 	void __iomem			*regs;</div><div class='ctx'> 	int				irq;</div><div class='ctx'> 	int				opened;</div><div class='del'>-	int				reset_pin;</div><div class='add'>+	struct gpio_desc		*reset_pin;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define get_chip(card) ((struct atmel_ac97c *)(card)-&gt;private_data)</div><div class='hunk'>@@ -84,66 +61,7 @@ struct atmel_ac97c {</div><div class='ctx'> #define ac97c_readl(chip, reg)				\</div><div class='ctx'> 	__raw_readl((chip)-&gt;regs + AC97C_##reg)</div><div class='ctx'> </div><div class='del'>-/* This function is called by the DMA driver. */</div><div class='del'>-static void atmel_ac97c_dma_playback_period_done(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct atmel_ac97c *chip = arg;</div><div class='del'>-	snd_pcm_period_elapsed(chip-&gt;playback_substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void atmel_ac97c_dma_capture_period_done(void *arg)</div><div class='del'>-{</div><div class='del'>-	struct atmel_ac97c *chip = arg;</div><div class='del'>-	snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_ac97c_prepare_dma(struct atmel_ac97c *chip,</div><div class='del'>-		struct snd_pcm_substream *substream,</div><div class='del'>-		enum dma_data_direction direction)</div><div class='del'>-{</div><div class='del'>-	struct dma_chan			*chan;</div><div class='del'>-	struct dw_cyclic_desc		*cdesc;</div><div class='del'>-	struct snd_pcm_runtime		*runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long			buffer_len, period_len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We don't do DMA on "complex" transfers, i.e. with</div><div class='del'>-	 * non-halfword-aligned buffers or lengths.</div><div class='del'>-	 */</div><div class='del'>-	if (runtime-&gt;dma_addr &amp; 1 || runtime-&gt;buffer_size &amp; 1) {</div><div class='del'>-		dev_dbg(&amp;chip-&gt;pdev-&gt;dev, "too complex transfer\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (direction == DMA_TO_DEVICE)</div><div class='del'>-		chan = chip-&gt;dma.tx_chan;</div><div class='del'>-	else</div><div class='del'>-		chan = chip-&gt;dma.rx_chan;</div><div class='del'>-</div><div class='del'>-	buffer_len = frames_to_bytes(runtime, runtime-&gt;buffer_size);</div><div class='del'>-	period_len = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='del'>-</div><div class='del'>-	cdesc = dw_dma_cyclic_prep(chan, runtime-&gt;dma_addr, buffer_len,</div><div class='del'>-			period_len, direction);</div><div class='del'>-	if (IS_ERR(cdesc)) {</div><div class='del'>-		dev_dbg(&amp;chip-&gt;pdev-&gt;dev, "could not prepare cyclic DMA\n");</div><div class='del'>-		return PTR_ERR(cdesc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (direction == DMA_TO_DEVICE) {</div><div class='del'>-		cdesc-&gt;period_callback = atmel_ac97c_dma_playback_period_done;</div><div class='del'>-		set_bit(DMA_TX_READY, &amp;chip-&gt;flags);</div><div class='del'>-	} else {</div><div class='del'>-		cdesc-&gt;period_callback = atmel_ac97c_dma_capture_period_done;</div><div class='del'>-		set_bit(DMA_RX_READY, &amp;chip-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cdesc-&gt;period_callback_param = chip;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware atmel_ac97c_hw = {</div><div class='add'>+static const struct snd_pcm_hardware atmel_ac97c_hw = {</div><div class='ctx'> 	.info			= (SNDRV_PCM_INFO_MMAP</div><div class='ctx'> 				  | SNDRV_PCM_INFO_MMAP_VALID</div><div class='ctx'> 				  | SNDRV_PCM_INFO_INTERLEAVED</div><div class='hunk'>@@ -170,7 +88,7 @@ static int atmel_ac97c_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;opened++;</div><div class='ctx'> 	runtime-&gt;hw = atmel_ac97c_hw;</div><div class='ctx'> 	if (chip-&gt;cur_rate) {</div><div class='hunk'>@@ -178,8 +96,7 @@ static int atmel_ac97c_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		runtime-&gt;hw.rate_max = chip-&gt;cur_rate;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;cur_format)</div><div class='del'>-		runtime-&gt;hw.formats = (1ULL &lt;&lt; chip-&gt;cur_format);</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='add'>+		runtime-&gt;hw.formats = pcm_format_to_bits(chip-&gt;cur_format);</div><div class='ctx'> 	chip-&gt;playback_substream = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -189,7 +106,7 @@ static int atmel_ac97c_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;opened++;</div><div class='ctx'> 	runtime-&gt;hw = atmel_ac97c_hw;</div><div class='ctx'> 	if (chip-&gt;cur_rate) {</div><div class='hunk'>@@ -197,8 +114,7 @@ static int atmel_ac97c_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		runtime-&gt;hw.rate_max = chip-&gt;cur_rate;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;cur_format)</div><div class='del'>-		runtime-&gt;hw.formats = (1ULL &lt;&lt; chip-&gt;cur_format);</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='add'>+		runtime-&gt;hw.formats = pcm_format_to_bits(chip-&gt;cur_format);</div><div class='ctx'> 	chip-&gt;capture_substream = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -207,13 +123,12 @@ static int atmel_ac97c_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;opened--;</div><div class='ctx'> 	if (!chip-&gt;opened) {</div><div class='ctx'> 		chip-&gt;cur_rate = 0;</div><div class='ctx'> 		chip-&gt;cur_format = 0;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -224,13 +139,12 @@ static int atmel_ac97c_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;opened--;</div><div class='ctx'> 	if (!chip-&gt;opened) {</div><div class='ctx'> 		chip-&gt;cur_rate = 0;</div><div class='ctx'> 		chip-&gt;cur_format = 0;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;capture_substream = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -241,75 +155,26 @@ static int atmel_ac97c_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int retval;</div><div class='ctx'> </div><div class='del'>-	retval = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-	/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */</div><div class='del'>-		if (retval == 1)</div><div class='del'>-			if (test_and_clear_bit(DMA_TX_READY, &amp;chip-&gt;flags))</div><div class='del'>-				dw_dma_cyclic_free(chip-&gt;dma.tx_chan);</div><div class='del'>-	}</div><div class='ctx'> 	/* Set restrictions to params. */</div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;cur_rate = params_rate(hw_params);</div><div class='ctx'> 	chip-&gt;cur_format = params_format(hw_params);</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='ctx'> </div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	retval = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	if (retval &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-	/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (retval &lt; 0)</div><div class='del'>-			return retval;</div><div class='del'>-		/* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */</div><div class='del'>-		if (retval == 1)</div><div class='del'>-			if (test_and_clear_bit(DMA_RX_READY, &amp;chip-&gt;flags))</div><div class='del'>-				dw_dma_cyclic_free(chip-&gt;dma.rx_chan);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set restrictions to params. */</div><div class='del'>-	mutex_lock(&amp;opened_mutex);</div><div class='add'>+	guard(mutex)(&amp;opened_mutex);</div><div class='ctx'> 	chip-&gt;cur_rate = params_rate(hw_params);</div><div class='ctx'> 	chip-&gt;cur_format = params_format(hw_params);</div><div class='del'>-	mutex_unlock(&amp;opened_mutex);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int atmel_ac97c_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_and_clear_bit(DMA_TX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_free(chip-&gt;dma.tx_chan);</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atmel_ac97c_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_and_clear_bit(DMA_RX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_free(chip-&gt;dma.rx_chan);</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -347,10 +212,8 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	switch (runtime-&gt;format) {</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_S16_LE:</div><div class='del'>-		if (cpu_is_at32ap7000())</div><div class='del'>-			word |= AC97C_CMR_CEM_LITTLE;</div><div class='ctx'> 		break;</div><div class='del'>-	case SNDRV_PCM_FORMAT_S16_BE: /* fall through */</div><div class='add'>+	case SNDRV_PCM_FORMAT_S16_BE:</div><div class='ctx'> 		word &amp;= ~(AC97C_CMR_CEM_LITTLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -387,18 +250,11 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		dev_dbg(&amp;chip-&gt;pdev-&gt;dev, "could not set rate %d Hz\n",</div><div class='ctx'> 				runtime-&gt;rate);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (!test_bit(DMA_TX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			retval = atmel_ac97c_prepare_dma(chip, substream,</div><div class='del'>-					DMA_TO_DEVICE);</div><div class='del'>-	} else {</div><div class='del'>-		/* Initialize and start the PDC */</div><div class='del'>-		writel(runtime-&gt;dma_addr, chip-&gt;regs + ATMEL_PDC_TPR);</div><div class='del'>-		writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_TCR);</div><div class='del'>-		writel(runtime-&gt;dma_addr + block_size,</div><div class='del'>-				chip-&gt;regs + ATMEL_PDC_TNPR);</div><div class='del'>-		writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_TNCR);</div><div class='del'>-	}</div><div class='add'>+	/* Initialize and start the PDC */</div><div class='add'>+	writel(runtime-&gt;dma_addr, chip-&gt;regs + ATMEL_PDC_TPR);</div><div class='add'>+	writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_TCR);</div><div class='add'>+	writel(runtime-&gt;dma_addr + block_size, chip-&gt;regs + ATMEL_PDC_TNPR);</div><div class='add'>+	writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_TNCR);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -438,10 +294,8 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	switch (runtime-&gt;format) {</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_S16_LE:</div><div class='del'>-		if (cpu_is_at32ap7000())</div><div class='del'>-			word |= AC97C_CMR_CEM_LITTLE;</div><div class='ctx'> 		break;</div><div class='del'>-	case SNDRV_PCM_FORMAT_S16_BE: /* fall through */</div><div class='add'>+	case SNDRV_PCM_FORMAT_S16_BE:</div><div class='ctx'> 		word &amp;= ~(AC97C_CMR_CEM_LITTLE);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -478,18 +332,11 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		dev_dbg(&amp;chip-&gt;pdev-&gt;dev, "could not set rate %d Hz\n",</div><div class='ctx'> 				runtime-&gt;rate);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (!test_bit(DMA_RX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			retval = atmel_ac97c_prepare_dma(chip, substream,</div><div class='del'>-					DMA_FROM_DEVICE);</div><div class='del'>-	} else {</div><div class='del'>-		/* Initialize and start the PDC */</div><div class='del'>-		writel(runtime-&gt;dma_addr, chip-&gt;regs + ATMEL_PDC_RPR);</div><div class='del'>-		writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_RCR);</div><div class='del'>-		writel(runtime-&gt;dma_addr + block_size,</div><div class='del'>-				chip-&gt;regs + ATMEL_PDC_RNPR);</div><div class='del'>-		writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_RNCR);</div><div class='del'>-	}</div><div class='add'>+	/* Initialize and start the PDC */</div><div class='add'>+	writel(runtime-&gt;dma_addr, chip-&gt;regs + ATMEL_PDC_RPR);</div><div class='add'>+	writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_RCR);</div><div class='add'>+	writel(runtime-&gt;dma_addr + block_size, chip-&gt;regs + ATMEL_PDC_RNPR);</div><div class='add'>+	writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_RNCR);</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -499,43 +346,30 @@ atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned long camr, ptcr = 0;</div><div class='del'>-	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	camr = ac97c_readl(chip, CAMR);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_RESUME: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		if (cpu_is_at32ap7000()) {</div><div class='del'>-			retval = dw_dma_cyclic_start(chip-&gt;dma.tx_chan);</div><div class='del'>-			if (retval)</div><div class='del'>-				goto out;</div><div class='del'>-		} else {</div><div class='del'>-			ptcr = ATMEL_PDC_TXTEN;</div><div class='del'>-		}</div><div class='add'>+		ptcr = ATMEL_PDC_TXTEN;</div><div class='ctx'> 		camr |= AC97C_CMR_CENA | AC97C_CSR_ENDTX;</div><div class='ctx'> 		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		if (cpu_is_at32ap7000())</div><div class='del'>-			dw_dma_cyclic_stop(chip-&gt;dma.tx_chan);</div><div class='del'>-		else</div><div class='del'>-			ptcr |= ATMEL_PDC_TXTDIS;</div><div class='add'>+		ptcr |= ATMEL_PDC_TXTDIS;</div><div class='ctx'> 		if (chip-&gt;opened &lt;= 1)</div><div class='ctx'> 			camr &amp;= ~AC97C_CMR_CENA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ac97c_writel(chip, CAMR, camr);</div><div class='del'>-	if (!cpu_is_at32ap7000())</div><div class='del'>-		writel(ptcr, chip-&gt;regs + ATMEL_PDC_PTCR);</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='add'>+	writel(ptcr, chip-&gt;regs + ATMEL_PDC_PTCR);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -543,44 +377,31 @@ atmel_ac97c_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct atmel_ac97c *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned long camr, ptcr = 0;</div><div class='del'>-	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	camr = ac97c_readl(chip, CAMR);</div><div class='ctx'> 	ptcr = readl(chip-&gt;regs + ATMEL_PDC_PTSR);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_RESUME: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		if (cpu_is_at32ap7000()) {</div><div class='del'>-			retval = dw_dma_cyclic_start(chip-&gt;dma.rx_chan);</div><div class='del'>-			if (retval)</div><div class='del'>-				goto out;</div><div class='del'>-		} else {</div><div class='del'>-			ptcr = ATMEL_PDC_RXTEN;</div><div class='del'>-		}</div><div class='add'>+		ptcr = ATMEL_PDC_RXTEN;</div><div class='ctx'> 		camr |= AC97C_CMR_CENA | AC97C_CSR_ENDRX;</div><div class='ctx'> 		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */</div><div class='del'>-	case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		if (cpu_is_at32ap7000())</div><div class='del'>-			dw_dma_cyclic_stop(chip-&gt;dma.rx_chan);</div><div class='del'>-		else</div><div class='del'>-			ptcr |= (ATMEL_PDC_RXTDIS);</div><div class='add'>+		ptcr |= ATMEL_PDC_RXTDIS;</div><div class='ctx'> 		if (chip-&gt;opened &lt;= 1)</div><div class='ctx'> 			camr &amp;= ~AC97C_CMR_CENA;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		retval = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ac97c_writel(chip, CAMR, camr);</div><div class='del'>-	if (!cpu_is_at32ap7000())</div><div class='del'>-		writel(ptcr, chip-&gt;regs + ATMEL_PDC_PTCR);</div><div class='del'>-out:</div><div class='del'>-	return retval;</div><div class='add'>+	writel(ptcr, chip-&gt;regs + ATMEL_PDC_PTCR);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t</div><div class='hunk'>@@ -591,10 +412,7 @@ atmel_ac97c_playback_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_uframes_t	frames;</div><div class='ctx'> 	unsigned long		bytes;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000())</div><div class='del'>-		bytes = dw_dma_get_src_addr(chip-&gt;dma.tx_chan);</div><div class='del'>-	else</div><div class='del'>-		bytes = readl(chip-&gt;regs + ATMEL_PDC_TPR);</div><div class='add'>+	bytes = readl(chip-&gt;regs + ATMEL_PDC_TPR);</div><div class='ctx'> 	bytes -= runtime-&gt;dma_addr;</div><div class='ctx'> </div><div class='ctx'> 	frames = bytes_to_frames(runtime, bytes);</div><div class='hunk'>@@ -611,10 +429,7 @@ atmel_ac97c_capture_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_uframes_t	frames;</div><div class='ctx'> 	unsigned long		bytes;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000())</div><div class='del'>-		bytes = dw_dma_get_dst_addr(chip-&gt;dma.rx_chan);</div><div class='del'>-	else</div><div class='del'>-		bytes = readl(chip-&gt;regs + ATMEL_PDC_RPR);</div><div class='add'>+	bytes = readl(chip-&gt;regs + ATMEL_PDC_RPR);</div><div class='ctx'> 	bytes -= runtime-&gt;dma_addr;</div><div class='ctx'> </div><div class='ctx'> 	frames = bytes_to_frames(runtime, bytes);</div><div class='hunk'>@@ -623,23 +438,19 @@ atmel_ac97c_capture_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops atmel_ac97_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops atmel_ac97_playback_ops = {</div><div class='ctx'> 	.open		= atmel_ac97c_playback_open,</div><div class='ctx'> 	.close		= atmel_ac97c_playback_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params	= atmel_ac97c_playback_hw_params,</div><div class='del'>-	.hw_free	= atmel_ac97c_playback_hw_free,</div><div class='ctx'> 	.prepare	= atmel_ac97c_playback_prepare,</div><div class='ctx'> 	.trigger	= atmel_ac97c_playback_trigger,</div><div class='ctx'> 	.pointer	= atmel_ac97c_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops atmel_ac97_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops atmel_ac97_capture_ops = {</div><div class='ctx'> 	.open		= atmel_ac97c_capture_open,</div><div class='ctx'> 	.close		= atmel_ac97c_capture_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params	= atmel_ac97c_capture_hw_params,</div><div class='del'>-	.hw_free	= atmel_ac97c_capture_hw_free,</div><div class='ctx'> 	.prepare	= atmel_ac97c_capture_prepare,</div><div class='ctx'> 	.trigger	= atmel_ac97c_capture_trigger,</div><div class='ctx'> 	.pointer	= atmel_ac97c_capture_pointer,</div><div class='hunk'>@@ -658,66 +469,57 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)</div><div class='ctx'> 		struct snd_pcm_runtime *runtime;</div><div class='ctx'> 		int offset, next_period, block_size;</div><div class='ctx'> 		dev_dbg(&amp;chip-&gt;pdev-&gt;dev, "channel A event%s%s%s%s%s%s\n",</div><div class='del'>-				casr &amp; AC97C_CSR_OVRUN   ? " OVRUN"   : "",</div><div class='del'>-				casr &amp; AC97C_CSR_RXRDY   ? " RXRDY"   : "",</div><div class='del'>-				casr &amp; AC97C_CSR_UNRUN   ? " UNRUN"   : "",</div><div class='del'>-				casr &amp; AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",</div><div class='del'>-				casr &amp; AC97C_CSR_TXRDY   ? " TXRDY"   : "",</div><div class='del'>-				!casr                    ? " NONE"    : "");</div><div class='del'>-		if (!cpu_is_at32ap7000()) {</div><div class='del'>-			if ((casr &amp; camr) &amp; AC97C_CSR_ENDTX) {</div><div class='del'>-				runtime = chip-&gt;playback_substream-&gt;runtime;</div><div class='del'>-				block_size = frames_to_bytes(runtime,</div><div class='del'>-						runtime-&gt;period_size);</div><div class='del'>-				chip-&gt;playback_period++;</div><div class='del'>-</div><div class='del'>-				if (chip-&gt;playback_period == runtime-&gt;periods)</div><div class='del'>-					chip-&gt;playback_period = 0;</div><div class='del'>-				next_period = chip-&gt;playback_period + 1;</div><div class='del'>-				if (next_period == runtime-&gt;periods)</div><div class='del'>-					next_period = 0;</div><div class='del'>-</div><div class='del'>-				offset = block_size * next_period;</div><div class='del'>-</div><div class='del'>-				writel(runtime-&gt;dma_addr + offset,</div><div class='del'>-						chip-&gt;regs + ATMEL_PDC_TNPR);</div><div class='del'>-				writel(block_size / 2,</div><div class='del'>-						chip-&gt;regs + ATMEL_PDC_TNCR);</div><div class='del'>-</div><div class='del'>-				snd_pcm_period_elapsed(</div><div class='del'>-						chip-&gt;playback_substream);</div><div class='del'>-			}</div><div class='del'>-			if ((casr &amp; camr) &amp; AC97C_CSR_ENDRX) {</div><div class='del'>-				runtime = chip-&gt;capture_substream-&gt;runtime;</div><div class='del'>-				block_size = frames_to_bytes(runtime,</div><div class='del'>-						runtime-&gt;period_size);</div><div class='del'>-				chip-&gt;capture_period++;</div><div class='del'>-</div><div class='del'>-				if (chip-&gt;capture_period == runtime-&gt;periods)</div><div class='del'>-					chip-&gt;capture_period = 0;</div><div class='del'>-				next_period = chip-&gt;capture_period + 1;</div><div class='del'>-				if (next_period == runtime-&gt;periods)</div><div class='del'>-					next_period = 0;</div><div class='del'>-</div><div class='del'>-				offset = block_size * next_period;</div><div class='del'>-</div><div class='del'>-				writel(runtime-&gt;dma_addr + offset,</div><div class='del'>-						chip-&gt;regs + ATMEL_PDC_RNPR);</div><div class='del'>-				writel(block_size / 2,</div><div class='del'>-						chip-&gt;regs + ATMEL_PDC_RNCR);</div><div class='del'>-				snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='del'>-			}</div><div class='add'>+			(casr &amp; AC97C_CSR_OVRUN)   ? " OVRUN"   : "",</div><div class='add'>+			(casr &amp; AC97C_CSR_RXRDY)   ? " RXRDY"   : "",</div><div class='add'>+			(casr &amp; AC97C_CSR_UNRUN)   ? " UNRUN"   : "",</div><div class='add'>+			(casr &amp; AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",</div><div class='add'>+			(casr &amp; AC97C_CSR_TXRDY)   ? " TXRDY"   : "",</div><div class='add'>+			!casr                      ? " NONE"    : "");</div><div class='add'>+		if ((casr &amp; camr) &amp; AC97C_CSR_ENDTX) {</div><div class='add'>+			runtime = chip-&gt;playback_substream-&gt;runtime;</div><div class='add'>+			block_size = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+			chip-&gt;playback_period++;</div><div class='add'>+</div><div class='add'>+			if (chip-&gt;playback_period == runtime-&gt;periods)</div><div class='add'>+				chip-&gt;playback_period = 0;</div><div class='add'>+			next_period = chip-&gt;playback_period + 1;</div><div class='add'>+			if (next_period == runtime-&gt;periods)</div><div class='add'>+				next_period = 0;</div><div class='add'>+</div><div class='add'>+			offset = block_size * next_period;</div><div class='add'>+</div><div class='add'>+			writel(runtime-&gt;dma_addr + offset, chip-&gt;regs + ATMEL_PDC_TNPR);</div><div class='add'>+			writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_TNCR);</div><div class='add'>+</div><div class='add'>+			snd_pcm_period_elapsed(chip-&gt;playback_substream);</div><div class='add'>+		}</div><div class='add'>+		if ((casr &amp; camr) &amp; AC97C_CSR_ENDRX) {</div><div class='add'>+			runtime = chip-&gt;capture_substream-&gt;runtime;</div><div class='add'>+			block_size = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+			chip-&gt;capture_period++;</div><div class='add'>+</div><div class='add'>+			if (chip-&gt;capture_period == runtime-&gt;periods)</div><div class='add'>+				chip-&gt;capture_period = 0;</div><div class='add'>+			next_period = chip-&gt;capture_period + 1;</div><div class='add'>+			if (next_period == runtime-&gt;periods)</div><div class='add'>+				next_period = 0;</div><div class='add'>+</div><div class='add'>+			offset = block_size * next_period;</div><div class='add'>+</div><div class='add'>+			writel(runtime-&gt;dma_addr + offset, chip-&gt;regs + ATMEL_PDC_RNPR);</div><div class='add'>+			writel(block_size / 2, chip-&gt;regs + ATMEL_PDC_RNCR);</div><div class='add'>+			snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='ctx'> 		}</div><div class='ctx'> 		retval = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sr &amp; AC97C_SR_COEVT) {</div><div class='ctx'> 		dev_info(&amp;chip-&gt;pdev-&gt;dev, "codec channel event%s%s%s%s%s\n",</div><div class='del'>-				cosr &amp; AC97C_CSR_OVRUN   ? " OVRUN"   : "",</div><div class='del'>-				cosr &amp; AC97C_CSR_RXRDY   ? " RXRDY"   : "",</div><div class='del'>-				cosr &amp; AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",</div><div class='del'>-				cosr &amp; AC97C_CSR_TXRDY   ? " TXRDY"   : "",</div><div class='del'>-				!cosr                    ? " NONE"    : "");</div><div class='add'>+			 (cosr &amp; AC97C_CSR_OVRUN)   ? " OVRUN"   : "",</div><div class='add'>+			 (cosr &amp; AC97C_CSR_RXRDY)   ? " RXRDY"   : "",</div><div class='add'>+			 (cosr &amp; AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",</div><div class='add'>+			 (cosr &amp; AC97C_CSR_TXRDY)   ? " TXRDY"   : "",</div><div class='add'>+			 !cosr                      ? " NONE"    : "");</div><div class='ctx'> 		retval = IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -729,7 +531,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = {</div><div class='add'>+static const struct ac97_pcm at91_ac97_pcm_defs[] = {</div><div class='ctx'> 	/* Playback */</div><div class='ctx'> 	{</div><div class='ctx'> 		.exclusive = 1,</div><div class='hunk'>@@ -757,43 +559,32 @@ static struct ac97_pcm at91_ac97_pcm_defs[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit atmel_ac97c_pcm_new(struct atmel_ac97c *chip)</div><div class='add'>+static int atmel_ac97c_pcm_new(struct atmel_ac97c *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm		*pcm;</div><div class='ctx'> 	struct snd_pcm_hardware	hw = atmel_ac97c_hw;</div><div class='del'>-	int			capture, playback, retval, err;</div><div class='add'>+	int			retval;</div><div class='ctx'> </div><div class='del'>-	capture = test_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-	playback = test_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='add'>+	retval = snd_ac97_pcm_assign(chip-&gt;ac97_bus,</div><div class='add'>+				     ARRAY_SIZE(at91_ac97_pcm_defs),</div><div class='add'>+				     at91_ac97_pcm_defs);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='ctx'> </div><div class='del'>-	if (!cpu_is_at32ap7000()) {</div><div class='del'>-		err = snd_ac97_pcm_assign(chip-&gt;ac97_bus,</div><div class='del'>-				ARRAY_SIZE(at91_ac97_pcm_defs),</div><div class='del'>-				at91_ac97_pcm_defs);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	retval = snd_pcm_new(chip-&gt;card, chip-&gt;card-&gt;shortname,</div><div class='del'>-			chip-&gt;pdev-&gt;id, playback, capture, &amp;pcm);</div><div class='add'>+	retval = snd_pcm_new(chip-&gt;card, chip-&gt;card-&gt;shortname, 0, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (retval)</div><div class='ctx'> 		return retval;</div><div class='ctx'> </div><div class='del'>-	if (capture)</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-				&amp;atmel_ac97_capture_ops);</div><div class='del'>-	if (playback)</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-				&amp;atmel_ac97_playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;atmel_ac97_capture_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;atmel_ac97_playback_ops);</div><div class='ctx'> </div><div class='del'>-	retval = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='ctx'> 			&amp;chip-&gt;pdev-&gt;dev, hw.periods_min * hw.period_bytes_min,</div><div class='ctx'> 			hw.buffer_bytes_max);</div><div class='del'>-	if (retval)</div><div class='del'>-		return retval;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -873,17 +664,6 @@ timed_out:</div><div class='ctx'> 	return 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool filter(struct dma_chan *chan, void *slave)</div><div class='del'>-{</div><div class='del'>-	struct dw_dma_slave *dws = slave;</div><div class='del'>-</div><div class='del'>-	if (dws-&gt;dma_dev == chan-&gt;device-&gt;dev) {</div><div class='del'>-		chan-&gt;private = dws;</div><div class='del'>-		return true;</div><div class='del'>-	} else</div><div class='del'>-		return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void atmel_ac97c_reset(struct atmel_ac97c *chip)</div><div class='ctx'> {</div><div class='ctx'> 	ac97c_writel(chip, MR,   0);</div><div class='hunk'>@@ -891,22 +671,32 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip)</div><div class='ctx'> 	ac97c_writel(chip, CAMR, 0);</div><div class='ctx'> 	ac97c_writel(chip, COMR, 0);</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(chip-&gt;reset_pin)) {</div><div class='del'>-		gpio_set_value(chip-&gt;reset_pin, 0);</div><div class='add'>+	if (!IS_ERR(chip-&gt;reset_pin)) {</div><div class='add'>+		gpiod_set_value(chip-&gt;reset_pin, 0);</div><div class='ctx'> 		/* AC97 v2.2 specifications says minimum 1 us. */</div><div class='ctx'> 		udelay(2);</div><div class='del'>-		gpio_set_value(chip-&gt;reset_pin, 1);</div><div class='add'>+		gpiod_set_value(chip-&gt;reset_pin, 1);</div><div class='add'>+	} else {</div><div class='add'>+		ac97c_writel(chip, MR, AC97C_MR_WRST | AC97C_MR_ENA);</div><div class='add'>+		udelay(2);</div><div class='add'>+		ac97c_writel(chip, MR, AC97C_MR_ENA);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit atmel_ac97c_probe(struct platform_device *pdev)</div><div class='add'>+static const struct of_device_id atmel_ac97c_dt_ids[] = {</div><div class='add'>+	{ .compatible = "atmel,at91sam9263-ac97c", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, atmel_ac97c_dt_ids);</div><div class='add'>+</div><div class='add'>+static int atmel_ac97c_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct device			*dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct snd_card			*card;</div><div class='ctx'> 	struct atmel_ac97c		*chip;</div><div class='ctx'> 	struct resource			*regs;</div><div class='del'>-	struct ac97c_platform_data	*pdata;</div><div class='ctx'> 	struct clk			*pclk;</div><div class='del'>-	static struct snd_ac97_bus_ops	ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops	ops = {</div><div class='ctx'> 		.write	= atmel_ac97c_write,</div><div class='ctx'> 		.read	= atmel_ac97c_read,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -919,32 +709,24 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata = pdev-&gt;dev.platform_data;</div><div class='del'>-	if (!pdata) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "no platform data\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='del'>-		dev_dbg(&amp;pdev-&gt;dev, "could not get irq\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		pclk = clk_get(&amp;pdev-&gt;dev, "pclk");</div><div class='del'>-	} else {</div><div class='del'>-		pclk = clk_get(&amp;pdev-&gt;dev, "ac97_clk");</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "could not get irq: %d\n", irq);</div><div class='add'>+		return irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pclk = clk_get(&amp;pdev-&gt;dev, "ac97_clk");</div><div class='ctx'> 	if (IS_ERR(pclk)) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "no peripheral clock\n");</div><div class='ctx'> 		return PTR_ERR(pclk);</div><div class='ctx'> 	}</div><div class='del'>-	clk_enable(pclk);</div><div class='add'>+	retval = clk_prepare_enable(pclk);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto err_prepare_enable;</div><div class='ctx'> </div><div class='del'>-	retval = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='del'>-			THIS_MODULE, sizeof(struct atmel_ac97c), &amp;card);</div><div class='add'>+	retval = snd_card_new(&amp;pdev-&gt;dev, SNDRV_DEFAULT_IDX1,</div><div class='add'>+			      SNDRV_DEFAULT_STR1, THIS_MODULE,</div><div class='add'>+			      sizeof(struct atmel_ac97c), &amp;card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "could not create sound card device\n");</div><div class='ctx'> 		goto err_snd_card_new;</div><div class='hunk'>@@ -961,31 +743,24 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "Atmel AC97C");</div><div class='del'>-	strcpy(card-&gt;shortname, "Atmel AC97C");</div><div class='del'>-	sprintf(card-&gt;longname, "Atmel AC97 controller");</div><div class='add'>+	strscpy(card-&gt;driver, "Atmel AC97C");</div><div class='add'>+	strscpy(card-&gt;shortname, "Atmel AC97C");</div><div class='add'>+	strscpy(card-&gt;longname, "Atmel AC97 controller");</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pclk = pclk;</div><div class='ctx'> 	chip-&gt;pdev = pdev;</div><div class='del'>-	chip-&gt;regs = ioremap(regs-&gt;start, regs-&gt;end - regs-&gt;start + 1);</div><div class='add'>+	chip-&gt;regs = ioremap(regs-&gt;start, resource_size(regs));</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;regs) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "could not remap register memory\n");</div><div class='add'>+		retval = -ENOMEM;</div><div class='ctx'> 		goto err_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(pdata-&gt;reset_pin)) {</div><div class='del'>-		if (gpio_request(pdata-&gt;reset_pin, "reset_pin")) {</div><div class='del'>-			dev_dbg(&amp;pdev-&gt;dev, "reset pin not available\n");</div><div class='del'>-			chip-&gt;reset_pin = -ENODEV;</div><div class='del'>-		} else {</div><div class='del'>-			gpio_direction_output(pdata-&gt;reset_pin, 1);</div><div class='del'>-			chip-&gt;reset_pin = pdata-&gt;reset_pin;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='add'>+	chip-&gt;reset_pin = devm_gpiod_get_index(dev, "ac97", 2, GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(chip-&gt;reset_pin))</div><div class='add'>+		dev_dbg(dev, "reset pin not available\n");</div><div class='ctx'> </div><div class='ctx'> 	atmel_ac97c_reset(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1005,64 +780,16 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_ac97_bus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (pdata-&gt;rx_dws.dma_dev) {</div><div class='del'>-			struct dw_dma_slave *dws = &amp;pdata-&gt;rx_dws;</div><div class='del'>-			dma_cap_mask_t mask;</div><div class='del'>-</div><div class='del'>-			dws-&gt;rx_reg = regs-&gt;start + AC97C_CARHR + 2;</div><div class='del'>-</div><div class='del'>-			dma_cap_zero(mask);</div><div class='del'>-			dma_cap_set(DMA_SLAVE, mask);</div><div class='del'>-</div><div class='del'>-			chip-&gt;dma.rx_chan = dma_request_channel(mask, filter,</div><div class='del'>-								dws);</div><div class='del'>-</div><div class='del'>-			dev_info(&amp;chip-&gt;pdev-&gt;dev, "using %s for DMA RX\n",</div><div class='del'>-				dev_name(&amp;chip-&gt;dma.rx_chan-&gt;dev-&gt;device));</div><div class='del'>-			set_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pdata-&gt;tx_dws.dma_dev) {</div><div class='del'>-			struct dw_dma_slave *dws = &amp;pdata-&gt;tx_dws;</div><div class='del'>-			dma_cap_mask_t mask;</div><div class='del'>-</div><div class='del'>-			dws-&gt;tx_reg = regs-&gt;start + AC97C_CATHR + 2;</div><div class='del'>-</div><div class='del'>-			dma_cap_zero(mask);</div><div class='del'>-			dma_cap_set(DMA_SLAVE, mask);</div><div class='del'>-</div><div class='del'>-			chip-&gt;dma.tx_chan = dma_request_channel(mask, filter,</div><div class='del'>-								dws);</div><div class='del'>-</div><div class='del'>-			dev_info(&amp;chip-&gt;pdev-&gt;dev, "using %s for DMA TX\n",</div><div class='del'>-				dev_name(&amp;chip-&gt;dma.tx_chan-&gt;dev-&gt;device));</div><div class='del'>-			set_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!test_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags) &amp;&amp;</div><div class='del'>-				!test_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags)) {</div><div class='del'>-			dev_dbg(&amp;pdev-&gt;dev, "DMA not available\n");</div><div class='del'>-			retval = -ENODEV;</div><div class='del'>-			goto err_dma;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Just pretend that we have DMA channel(for at91 i is actually</div><div class='del'>-		 * the PDC) */</div><div class='del'>-		set_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		set_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	retval = atmel_ac97c_pcm_new(chip);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "could not register ac97 pcm device\n");</div><div class='del'>-		goto err_dma;</div><div class='add'>+		goto err_ac97_bus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	retval = snd_card_register(card);</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "could not register sound card\n");</div><div class='del'>-		goto err_dma;</div><div class='add'>+		goto err_ac97_bus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, card);</div><div class='hunk'>@@ -1072,128 +799,67 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_dma:</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags))</div><div class='del'>-			dma_release_channel(chip-&gt;dma.rx_chan);</div><div class='del'>-		if (test_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags))</div><div class='del'>-			dma_release_channel(chip-&gt;dma.tx_chan);</div><div class='del'>-		clear_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		clear_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		chip-&gt;dma.rx_chan = NULL;</div><div class='del'>-		chip-&gt;dma.tx_chan = NULL;</div><div class='del'>-	}</div><div class='ctx'> err_ac97_bus:</div><div class='del'>-	snd_card_set_dev(card, NULL);</div><div class='del'>-</div><div class='del'>-	if (gpio_is_valid(chip-&gt;reset_pin))</div><div class='del'>-		gpio_free(chip-&gt;reset_pin);</div><div class='del'>-</div><div class='ctx'> 	iounmap(chip-&gt;regs);</div><div class='ctx'> err_ioremap:</div><div class='ctx'> 	free_irq(irq, chip);</div><div class='ctx'> err_request_irq:</div><div class='ctx'> 	snd_card_free(card);</div><div class='ctx'> err_snd_card_new:</div><div class='del'>-	clk_disable(pclk);</div><div class='add'>+	clk_disable_unprepare(pclk);</div><div class='add'>+err_prepare_enable:</div><div class='ctx'> 	clk_put(pclk);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg)</div><div class='add'>+static int atmel_ac97c_suspend(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> 	struct atmel_ac97c *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_bit(DMA_RX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_stop(chip-&gt;dma.rx_chan);</div><div class='del'>-		if (test_bit(DMA_TX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_stop(chip-&gt;dma.tx_chan);</div><div class='del'>-	}</div><div class='del'>-	clk_disable(chip-&gt;pclk);</div><div class='del'>-</div><div class='add'>+	clk_disable_unprepare(chip-&gt;pclk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atmel_ac97c_resume(struct platform_device *pdev)</div><div class='add'>+static int atmel_ac97c_resume(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> 	struct atmel_ac97c *chip = card-&gt;private_data;</div><div class='add'>+	int ret = clk_prepare_enable(chip-&gt;pclk);</div><div class='ctx'> </div><div class='del'>-	clk_enable(chip-&gt;pclk);</div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_bit(DMA_RX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_start(chip-&gt;dma.rx_chan);</div><div class='del'>-		if (test_bit(DMA_TX_READY, &amp;chip-&gt;flags))</div><div class='del'>-			dw_dma_cyclic_start(chip-&gt;dma.tx_chan);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define atmel_ac97c_suspend NULL</div><div class='del'>-#define atmel_ac97c_resume NULL</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int __devexit atmel_ac97c_remove(struct platform_device *pdev)</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume);</div><div class='add'>+</div><div class='add'>+static void atmel_ac97c_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct atmel_ac97c *chip = get_chip(card);</div><div class='ctx'> </div><div class='del'>-	if (gpio_is_valid(chip-&gt;reset_pin))</div><div class='del'>-		gpio_free(chip-&gt;reset_pin);</div><div class='del'>-</div><div class='ctx'> 	ac97c_writel(chip, CAMR, 0);</div><div class='ctx'> 	ac97c_writel(chip, COMR, 0);</div><div class='ctx'> 	ac97c_writel(chip, MR,   0);</div><div class='ctx'> </div><div class='del'>-	clk_disable(chip-&gt;pclk);</div><div class='add'>+	clk_disable_unprepare(chip-&gt;pclk);</div><div class='ctx'> 	clk_put(chip-&gt;pclk);</div><div class='ctx'> 	iounmap(chip-&gt;regs);</div><div class='ctx'> 	free_irq(chip-&gt;irq, chip);</div><div class='ctx'> </div><div class='del'>-	if (cpu_is_at32ap7000()) {</div><div class='del'>-		if (test_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags))</div><div class='del'>-			dma_release_channel(chip-&gt;dma.rx_chan);</div><div class='del'>-		if (test_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags))</div><div class='del'>-			dma_release_channel(chip-&gt;dma.tx_chan);</div><div class='del'>-		clear_bit(DMA_RX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		clear_bit(DMA_TX_CHAN_PRESENT, &amp;chip-&gt;flags);</div><div class='del'>-		chip-&gt;dma.rx_chan = NULL;</div><div class='del'>-		chip-&gt;dma.tx_chan = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, NULL);</div><div class='ctx'> 	snd_card_free(card);</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver atmel_ac97c_driver = {</div><div class='del'>-	.remove		= __devexit_p(atmel_ac97c_remove),</div><div class='add'>+	.probe		= atmel_ac97c_probe,</div><div class='add'>+	.remove		= atmel_ac97c_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "atmel_ac97c",</div><div class='add'>+		.pm	= pm_ptr(&amp;atmel_ac97c_pm),</div><div class='add'>+		.of_match_table = atmel_ac97c_dt_ids,</div><div class='ctx'> 	},</div><div class='del'>-	.suspend	= atmel_ac97c_suspend,</div><div class='del'>-	.resume		= atmel_ac97c_resume,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static int __init atmel_ac97c_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;atmel_ac97c_driver,</div><div class='del'>-			atmel_ac97c_probe);</div><div class='del'>-}</div><div class='del'>-module_init(atmel_ac97c_init);</div><div class='del'>-</div><div class='del'>-static void __exit atmel_ac97c_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;atmel_ac97c_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(atmel_ac97c_exit);</div><div class='add'>+module_platform_driver(atmel_ac97c_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Atmel AC97 controller");</div><div class='del'>-MODULE_AUTHOR("Hans-Christian Egtvedt &lt;hans-christian.egtvedt@atmel.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Hans-Christian Egtvedt &lt;egtvedt@samfundet.no&gt;");</div><div class='head'>diff --git a/sound/atmel/ac97c.h b/sound/atmel/ac97c.h<br/>index ecbba5021c80..6fe9245c44fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/atmel/ac97c.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/atmel/ac97c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/atmel/ac97c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/atmel/ac97c.h</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Register definitions for Atmel AC97C</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005-2009 Atmel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published</div><div class='del'>- * by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SOUND_ATMEL_AC97C_H</div><div class='ctx'> #define __SOUND_ATMEL_AC97C_H</div><div class='head'>diff --git a/sound/core/.kunitconfig b/sound/core/.kunitconfig<br/>new file mode 100644<br/>index 000000000000..440f974ba0b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/.kunitconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/.kunitconfig</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+CONFIG_KUNIT=y</div><div class='add'>+CONFIG_SOUND=y</div><div class='add'>+CONFIG_SND=y</div><div class='add'>+CONFIG_SND_PCM=y</div><div class='add'>+CONFIG_SND_CORE_TEST=y</div><div class='head'>diff --git a/sound/core/Kconfig b/sound/core/Kconfig<br/>index 475455c76610..48db44fa56fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/Kconfig</a></div><div class='hunk'>@@ -1,59 +1,88 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA soundcard-configuration</div><div class='ctx'> config SND_TIMER</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='ctx'> config SND_PCM</div><div class='ctx'> 	tristate</div><div class='del'>-	select SND_TIMER</div><div class='del'>-	select GCD</div><div class='add'>+	select SND_TIMER if SND_PCM_TIMER</div><div class='add'>+</div><div class='add'>+config SND_PCM_ELD</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_PCM_IEC958</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_DMAENGINE_PCM</div><div class='add'>+	tristate</div><div class='ctx'> </div><div class='ctx'> config SND_HWDEP</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='add'>+config SND_SEQ_DEVICE</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='ctx'> config SND_RAWMIDI</div><div class='ctx'> 	tristate</div><div class='add'>+	select SND_SEQ_DEVICE if SND_SEQUENCER != n</div><div class='ctx'> </div><div class='del'>-# To be effective this also requires INPUT - users should say:</div><div class='del'>-#    select SND_JACK if INPUT=y || INPUT=SND</div><div class='del'>-# to avoid having to force INPUT on.</div><div class='del'>-config SND_JACK</div><div class='del'>-	bool</div><div class='add'>+config SND_UMP</div><div class='add'>+	tristate</div><div class='add'>+	select SND_RAWMIDI</div><div class='ctx'> </div><div class='del'>-config SND_SEQUENCER</div><div class='del'>-	tristate "Sequencer support"</div><div class='del'>-	select SND_TIMER</div><div class='add'>+config SND_UMP_LEGACY_RAWMIDI</div><div class='add'>+	bool "Legacy raw MIDI support for UMP streams"</div><div class='add'>+	depends on SND_UMP</div><div class='add'>+	help</div><div class='add'>+	  This option enables the legacy raw MIDI support for UMP streams.</div><div class='add'>+	  When this option is set, an additional rawmidi device for the</div><div class='add'>+	  legacy MIDI 1.0 byte streams is created for each UMP Endpoint.</div><div class='add'>+	  The device contains 16 substreams corresponding to UMP groups.</div><div class='add'>+</div><div class='add'>+config SND_CORE_TEST</div><div class='add'>+	tristate "Sound core KUnit test"</div><div class='add'>+	depends on KUNIT</div><div class='add'>+	select SND_PCM</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y or M to enable MIDI sequencer and router support.  This</div><div class='del'>-	  feature allows routing and enqueueing of MIDI events.  Events</div><div class='del'>-	  can be processed at a given time.</div><div class='add'>+	  This options enables the sound core functions KUnit test.</div><div class='ctx'> </div><div class='del'>-	  Many programs require this feature, so you should enable it</div><div class='del'>-	  unless you know what you're doing.</div><div class='add'>+	  KUnit tests run during boot and output the results to the debug</div><div class='add'>+	  log in TAP format (https://testanything.org/). Only useful for</div><div class='add'>+	  kernel devs running KUnit test harness and are not for inclusion</div><div class='add'>+	  into a production build.</div><div class='ctx'> </div><div class='del'>-config SND_SEQ_DUMMY</div><div class='del'>-	tristate "Sequencer dummy client"</div><div class='del'>-	depends on SND_SEQUENCER</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable the dummy sequencer client.  This client</div><div class='del'>-	  is a simple MIDI-through client: all normal input events are</div><div class='del'>-	  redirected to the output port immediately.</div><div class='add'>+	  For more information on KUnit and unit tests in general, refer</div><div class='add'>+	  to the KUnit documentation in Documentation/dev-tools/kunit/.</div><div class='ctx'> </div><div class='del'>-	  You don't need this unless you want to connect many MIDI</div><div class='del'>-	  devices or applications together.</div><div class='ctx'> </div><div class='del'>-	  To compile this driver as a module, choose M here: the module</div><div class='del'>-	  will be called snd-seq-dummy.</div><div class='add'>+config SND_COMPRESS_OFFLOAD</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_COMPRESS_ACCEL</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_JACK</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+# enable input device support in jack layer</div><div class='add'>+config SND_JACK_INPUT_DEV</div><div class='add'>+	bool</div><div class='add'>+	depends on SND_JACK</div><div class='add'>+	default y if INPUT=y || INPUT=SND</div><div class='ctx'> </div><div class='ctx'> config SND_OSSEMUL</div><div class='add'>+	bool "Enable OSS Emulation"</div><div class='ctx'> 	select SOUND_OSS_CORE</div><div class='del'>-	bool</div><div class='add'>+	help</div><div class='add'>+	  This option enables the build of OSS emulation layer.</div><div class='ctx'> </div><div class='ctx'> config SND_MIXER_OSS</div><div class='ctx'> 	tristate "OSS Mixer API"</div><div class='del'>-	select SND_OSSEMUL</div><div class='add'>+	depends on SND_OSSEMUL</div><div class='ctx'> 	help</div><div class='ctx'> 	  To enable OSS mixer API emulation (/dev/mixer*), say Y here</div><div class='del'>-	  and read &lt;file:Documentation/sound/alsa/OSS-Emulation.txt&gt;.</div><div class='add'>+	  and read &lt;file:Documentation/sound/designs/oss-emulation.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  Many programs still use the OSS API, so say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -62,11 +91,11 @@ config SND_MIXER_OSS</div><div class='ctx'> </div><div class='ctx'> config SND_PCM_OSS</div><div class='ctx'> 	tristate "OSS PCM (digital audio) API"</div><div class='del'>-	select SND_OSSEMUL</div><div class='add'>+	depends on SND_OSSEMUL</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  To enable OSS digital audio (PCM) emulation (/dev/dsp*), say Y</div><div class='del'>-	  here and read &lt;file:Documentation/sound/alsa/OSS-Emulation.txt&gt;.</div><div class='add'>+	  here and read &lt;file:Documentation/sound/designs/oss-emulation.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  Many programs still use the OSS API, so say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -76,25 +105,22 @@ config SND_PCM_OSS</div><div class='ctx'> config SND_PCM_OSS_PLUGINS</div><div class='ctx'> 	bool "OSS PCM (digital audio) API - Include plugin system"</div><div class='ctx'> 	depends on SND_PCM_OSS</div><div class='del'>-        default y</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='del'>-          If you disable this option, the ALSA's OSS PCM API will not</div><div class='del'>-          support conversion of channels, formats and rates. It will</div><div class='del'>-          behave like most of new OSS/Free drivers in 2.4/2.6 kernels.</div><div class='add'>+	  If you disable this option, the ALSA's OSS PCM API will not</div><div class='add'>+	  support conversion of channels, formats and rates. It will</div><div class='add'>+	  behave like most of new OSS/Free drivers in 2.4/2.6 kernels.</div><div class='ctx'> </div><div class='del'>-config SND_SEQUENCER_OSS</div><div class='del'>-	bool "OSS Sequencer API"</div><div class='del'>-	depends on SND_SEQUENCER</div><div class='del'>-	select SND_OSSEMUL</div><div class='add'>+config SND_PCM_TIMER</div><div class='add'>+	bool "PCM timer interface" if EXPERT</div><div class='add'>+	default y</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here to enable OSS sequencer emulation (both</div><div class='del'>-	  /dev/sequencer and /dev/music interfaces).</div><div class='del'>-</div><div class='del'>-	  Many programs still use the OSS API, so say Y.</div><div class='add'>+	  If you disable this option, pcm timer will be unavailable, so</div><div class='add'>+	  those stubs that use pcm timer (e.g. dmix, dsnoop &amp; co) may work</div><div class='add'>+	  incorrectly.</div><div class='ctx'> </div><div class='del'>-	  If you choose M in "Sequencer support" (SND_SEQUENCER),</div><div class='del'>-	  this will be compiled as a module. The module will be called</div><div class='del'>-	  snd-seq-oss.</div><div class='add'>+	  For some embedded devices, we may disable it to reduce memory</div><div class='add'>+	  footprint, about 20KB on x86_64 platform.</div><div class='ctx'> </div><div class='ctx'> config SND_HRTIMER</div><div class='ctx'> 	tristate "HR-timer backend support"</div><div class='hunk'>@@ -108,43 +134,6 @@ config SND_HRTIMER</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-hrtimer.</div><div class='ctx'> </div><div class='del'>-config SND_SEQ_HRTIMER_DEFAULT</div><div class='del'>-	bool "Use HR-timer as default sequencer timer"</div><div class='del'>-	depends on SND_HRTIMER &amp;&amp; SND_SEQUENCER</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to use the HR-timer backend as the default sequencer</div><div class='del'>-	  timer.</div><div class='del'>-</div><div class='del'>-config SND_RTCTIMER</div><div class='del'>-	tristate "RTC Timer support"</div><div class='del'>-	depends on RTC</div><div class='del'>-	select SND_TIMER</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable RTC timer support for ALSA.  ALSA uses</div><div class='del'>-	  the RTC timer as a precise timing source and maps the RTC</div><div class='del'>-	  timer to ALSA's timer interface.  The ALSA sequencer code also</div><div class='del'>-	  can use this timing source.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module</div><div class='del'>-	  will be called snd-rtctimer.</div><div class='del'>-</div><div class='del'>-	  Note that this option is exclusive with the new RTC drivers</div><div class='del'>-	  (CONFIG_RTC_CLASS) since this requires the old API.</div><div class='del'>-</div><div class='del'>-config SND_SEQ_RTCTIMER_DEFAULT</div><div class='del'>-	bool "Use RTC as default sequencer timer"</div><div class='del'>-	depends on SND_RTCTIMER &amp;&amp; SND_SEQUENCER</div><div class='del'>-	depends on !SND_SEQ_HRTIMER_DEFAULT</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to use the RTC timer as the default sequencer</div><div class='del'>-	  timer.  This is strongly recommended because it ensures</div><div class='del'>-	  precise MIDI timing even when the system timer runs at less</div><div class='del'>-	  than 1000 Hz.</div><div class='del'>-</div><div class='del'>-	  If in doubt, say Y.</div><div class='del'>-</div><div class='ctx'> config SND_DYNAMIC_MINORS</div><div class='ctx'> 	bool "Dynamic device file minor numbers"</div><div class='ctx'> 	help</div><div class='hunk'>@@ -155,6 +144,15 @@ config SND_DYNAMIC_MINORS</div><div class='ctx'> </div><div class='ctx'> 	  If you are unsure about this, say N here.</div><div class='ctx'> </div><div class='add'>+config SND_MAX_CARDS</div><div class='add'>+	int "Max number of sound cards"</div><div class='add'>+	range 4 256</div><div class='add'>+	default 32</div><div class='add'>+	depends on SND_DYNAMIC_MINORS</div><div class='add'>+	help</div><div class='add'>+	  Specify the max number of sound cards that can be assigned</div><div class='add'>+	  on a single machine.</div><div class='add'>+</div><div class='ctx'> config SND_SUPPORT_OLD_API</div><div class='ctx'> 	bool "Support old ALSA API"</div><div class='ctx'> 	default y</div><div class='hunk'>@@ -162,23 +160,33 @@ config SND_SUPPORT_OLD_API</div><div class='ctx'> 	  Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3</div><div class='ctx'> 	  or older).</div><div class='ctx'> </div><div class='add'>+config SND_PROC_FS</div><div class='add'>+	bool "Sound Proc FS Support" if EXPERT</div><div class='add'>+	depends on PROC_FS</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say 'N' to disable Sound proc FS, which may reduce code size about</div><div class='add'>+	  9KB on x86_64 platform.</div><div class='add'>+	  If unsure say Y.</div><div class='add'>+</div><div class='ctx'> config SND_VERBOSE_PROCFS</div><div class='ctx'> 	bool "Verbose procfs contents"</div><div class='del'>-	depends on PROC_FS</div><div class='add'>+	depends on SND_PROC_FS</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include code for verbose procfs contents (provides</div><div class='del'>-          useful information to developers when a problem occurs).  On the</div><div class='del'>-          other side, it makes the ALSA subsystem larger.</div><div class='add'>+	  useful information to developers when a problem occurs).  On the</div><div class='add'>+	  other side, it makes the ALSA subsystem larger.</div><div class='ctx'> </div><div class='del'>-config SND_VERBOSE_PRINTK</div><div class='del'>-	bool "Verbose printk"</div><div class='add'>+config SND_CTL_FAST_LOOKUP</div><div class='add'>+	bool "Fast lookup of control elements" if EXPERT</div><div class='add'>+	default y</div><div class='add'>+	select XARRAY_MULTI</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here to enable verbose log messages.  These messages</div><div class='del'>-	  will help to identify source file and position containing</div><div class='del'>-	  printed messages.</div><div class='del'>-</div><div class='del'>-	  You don't need this unless you're debugging ALSA.</div><div class='add'>+	  This option enables the faster lookup of control elements.</div><div class='add'>+	  It will consume more memory because of the additional Xarray.</div><div class='add'>+	  If you want to choose the memory footprint over the performance</div><div class='add'>+	  inevitably, turn this off.</div><div class='ctx'> </div><div class='ctx'> config SND_DEBUG</div><div class='ctx'> 	bool "Debug"</div><div class='hunk'>@@ -190,7 +198,7 @@ config SND_DEBUG_VERBOSE</div><div class='ctx'> 	depends on SND_DEBUG</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to enable extra-verbose debugging messages.</div><div class='del'>-	  </div><div class='add'>+</div><div class='ctx'> 	  Let me repeat: it enables EXTRA-VERBOSE DEBUGGING messages.</div><div class='ctx'> 	  So, say Y only if you are ready to be annoyed.</div><div class='ctx'> </div><div class='hunk'>@@ -204,6 +212,49 @@ config SND_PCM_XRUN_DEBUG</div><div class='ctx'> 	  sound clicking when system is loaded, it may help to determine</div><div class='ctx'> 	  the process or driver which causes the scheduling gaps.</div><div class='ctx'> </div><div class='add'>+config SND_CTL_INPUT_VALIDATION</div><div class='add'>+	bool "Validate input data to control API"</div><div class='add'>+	help</div><div class='add'>+	  Say Y to enable the additional validation for the input data to</div><div class='add'>+	  each control element, including the value range checks.</div><div class='add'>+	  An error is returned from ALSA core for invalid inputs without</div><div class='add'>+	  passing to the driver.  This is a kind of hardening for drivers</div><div class='add'>+	  that have no proper error checks, at the cost of a slight</div><div class='add'>+	  performance overhead.</div><div class='add'>+</div><div class='add'>+config SND_CTL_DEBUG</div><div class='add'>+	bool "Enable debugging feature for control API"</div><div class='add'>+	depends on SND_DEBUG</div><div class='add'>+	help</div><div class='add'>+	  Say Y to enable the debugging feature for ALSA control API.</div><div class='add'>+	  It performs the additional sanity-checks for each control element</div><div class='add'>+	  read access, such as whether the values returned from the driver</div><div class='add'>+	  are in the proper ranges or the check of the invalid access at</div><div class='add'>+	  out-of-array areas.  The error is printed when the driver gives</div><div class='add'>+	  such unexpected values.</div><div class='add'>+	  When you develop a driver that deals with control elements, it's</div><div class='add'>+	  strongly recommended to try this one once and verify whether you see</div><div class='add'>+	  any relevant errors or not.</div><div class='add'>+</div><div class='add'>+config SND_JACK_INJECTION_DEBUG</div><div class='add'>+	bool "Sound jack injection interface via debugfs"</div><div class='add'>+	depends on SND_JACK &amp;&amp; SND_DEBUG &amp;&amp; DEBUG_FS</div><div class='add'>+	help</div><div class='add'>+	  This option can be used to enable or disable sound jack</div><div class='add'>+	  software injection.</div><div class='add'>+	  Say Y if you are debugging via jack injection interface.</div><div class='add'>+	  If unsure select "N".</div><div class='add'>+</div><div class='add'>+config SND_UTIMER</div><div class='add'>+	bool "Enable support for userspace-controlled virtual timers"</div><div class='add'>+	depends on SND_TIMER</div><div class='add'>+	help</div><div class='add'>+	  Say Y to enable the support of userspace-controlled timers. These</div><div class='add'>+	  timers are purely virtual, and they are supposed to be triggered</div><div class='add'>+	  from userspace. They could be quite useful when synchronizing the</div><div class='add'>+	  sound timing with userspace applications (for instance, when sending</div><div class='add'>+	  data through snd-aloop).</div><div class='add'>+</div><div class='ctx'> config SND_VMASTER</div><div class='ctx'> 	bool</div><div class='ctx'> </div><div class='hunk'>@@ -211,4 +262,9 @@ config SND_DMA_SGBUF</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on X86</div><div class='ctx'> </div><div class='add'>+config SND_CTL_LED</div><div class='add'>+	tristate</div><div class='add'>+	select NEW_LEDS if SND_CTL_LED</div><div class='add'>+	select LEDS_TRIGGERS if SND_CTL_LED</div><div class='add'>+</div><div class='ctx'> source "sound/core/seq/Kconfig"</div><div class='head'>diff --git a/sound/core/Makefile b/sound/core/Makefile<br/>index 350a08d277f4..31a0623cc89d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/Makefile</a></div><div class='hunk'>@@ -1,33 +1,56 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 1999,2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-y     := sound.o init.o memory.o info.o control.o misc.o device.o</div><div class='add'>+snd-y     := sound.o init.o memory.o control.o misc.o device.o</div><div class='add'>+ifneq ($(CONFIG_SND_PROC_FS),)</div><div class='add'>+snd-y += info.o</div><div class='add'>+snd-$(CONFIG_SND_OSSEMUL) += info_oss.o</div><div class='add'>+endif</div><div class='ctx'> snd-$(CONFIG_ISA_DMA_API) += isadma.o</div><div class='del'>-snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o</div><div class='add'>+snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o</div><div class='ctx'> snd-$(CONFIG_SND_VMASTER) += vmaster.o</div><div class='del'>-snd-$(CONFIG_SND_JACK)	  += jack.o</div><div class='add'>+snd-$(CONFIG_SND_JACK)	  += ctljack.o jack.o</div><div class='ctx'> </div><div class='del'>-snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \</div><div class='del'>-		pcm_memory.o</div><div class='add'>+snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_misc.o \</div><div class='add'>+		pcm_memory.o memalloc.o</div><div class='add'>+snd-pcm-$(CONFIG_SND_PCM_TIMER) += pcm_timer.o</div><div class='add'>+snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o</div><div class='add'>+snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o</div><div class='ctx'> </div><div class='del'>-snd-page-alloc-y := memalloc.o</div><div class='del'>-snd-page-alloc-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o</div><div class='add'>+# for trace-points</div><div class='add'>+CFLAGS_pcm_lib.o := -I$(src)</div><div class='add'>+CFLAGS_pcm_native.o := -I$(src)</div><div class='ctx'> </div><div class='del'>-snd-rawmidi-objs  := rawmidi.o</div><div class='del'>-snd-timer-objs    := timer.o</div><div class='del'>-snd-hrtimer-objs  := hrtimer.o</div><div class='del'>-snd-rtctimer-objs := rtctimer.o</div><div class='del'>-snd-hwdep-objs    := hwdep.o</div><div class='add'>+snd-pcm-dmaengine-y := pcm_dmaengine.o</div><div class='add'>+</div><div class='add'>+snd-ctl-led-y  := control_led.o</div><div class='add'>+snd-rawmidi-y  := rawmidi.o</div><div class='add'>+snd-ump-y      := ump.o</div><div class='add'>+snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o</div><div class='add'>+snd-timer-y    := timer.o</div><div class='add'>+snd-hrtimer-y  := hrtimer.o</div><div class='add'>+snd-hwdep-y    := hwdep.o</div><div class='add'>+snd-seq-device-y := seq_device.o</div><div class='add'>+</div><div class='add'>+snd-compress-y := compress_offload.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND) 		+= snd.o</div><div class='add'>+obj-$(CONFIG_SND_CTL_LED)	+= snd-ctl-led.o</div><div class='ctx'> obj-$(CONFIG_SND_HWDEP)		+= snd-hwdep.o</div><div class='ctx'> obj-$(CONFIG_SND_TIMER)		+= snd-timer.o</div><div class='ctx'> obj-$(CONFIG_SND_HRTIMER)	+= snd-hrtimer.o</div><div class='del'>-obj-$(CONFIG_SND_RTCTIMER)	+= snd-rtctimer.o</div><div class='del'>-obj-$(CONFIG_SND_PCM)		+= snd-pcm.o snd-page-alloc.o</div><div class='add'>+obj-$(CONFIG_SND_PCM)		+= snd-pcm.o</div><div class='add'>+obj-$(CONFIG_SND_DMAENGINE_PCM)	+= snd-pcm-dmaengine.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_DEVICE)	+= snd-seq-device.o</div><div class='ctx'> obj-$(CONFIG_SND_RAWMIDI)	+= snd-rawmidi.o</div><div class='add'>+obj-$(CONFIG_SND_UMP)		+= snd-ump.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_CORE_TEST)	+= sound_kunit.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_OSSEMUL)	+= oss/</div><div class='ctx'> obj-$(CONFIG_SND_SEQUENCER)	+= seq/</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_COMPRESS_OFFLOAD)	+= snd-compress.o</div><div class='head'>diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c<br/>new file mode 100644<br/>index 000000000000..da514fef45bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/compress_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/compress_offload.c</a></div><div class='hunk'>@@ -0,0 +1,1550 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  compress_core.c - compress offload core</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2011 Intel Corporation</div><div class='add'>+ *  Authors:	Vinod Koul &lt;vinod.koul@linux.intel.com&gt;</div><div class='add'>+ *		Pierre-Louis Bossart &lt;pierre-louis.bossart@linux.intel.com&gt;</div><div class='add'>+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+#define FORMAT(fmt) "%s: %d: " fmt, __func__, __LINE__</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " FORMAT(fmt)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/file.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/poll.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/dma-buf.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/compress_params.h&gt;</div><div class='add'>+#include &lt;sound/compress_offload.h&gt;</div><div class='add'>+#include &lt;sound/compress_driver.h&gt;</div><div class='add'>+</div><div class='add'>+/* struct snd_compr_codec_caps overflows the ioctl bit size for some</div><div class='add'>+ * architectures, so we need to disable the relevant ioctls.</div><div class='add'>+ */</div><div class='add'>+#if _IOC_SIZEBITS &lt; 14</div><div class='add'>+#define COMPR_CODEC_CAPS_OVERFLOW</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* TODO:</div><div class='add'>+ * - add substream support for multiple devices in case of</div><div class='add'>+ *	SND_DYNAMIC_MINORS is not used</div><div class='add'>+ * - Multiple node representation</div><div class='add'>+ *	driver should be able to register multiple nodes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct snd_compr_file {</div><div class='add'>+	unsigned long caps;</div><div class='add'>+	struct snd_compr_stream stream;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void error_delayed_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+static void snd_compr_task_free_all(struct snd_compr_stream *stream);</div><div class='add'>+#else</div><div class='add'>+static inline void snd_compr_task_free_all(struct snd_compr_stream *stream) { }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * a note on stream states used:</div><div class='add'>+ * we use following states in the compressed core</div><div class='add'>+ * SNDRV_PCM_STATE_OPEN: When stream has been opened.</div><div class='add'>+ * SNDRV_PCM_STATE_SETUP: When stream has been initialized. This is done by</div><div class='add'>+ *	calling SNDRV_COMPRESS_SET_PARAMS. Running streams will come to this</div><div class='add'>+ *	state at stop by calling SNDRV_COMPRESS_STOP, or at end of drain.</div><div class='add'>+ * SNDRV_PCM_STATE_PREPARED: When a stream has been written to (for</div><div class='add'>+ *	playback only). User after setting up stream writes the data buffer</div><div class='add'>+ *	before starting the stream.</div><div class='add'>+ * SNDRV_PCM_STATE_RUNNING: When stream has been started and is</div><div class='add'>+ *	decoding/encoding and rendering/capturing data.</div><div class='add'>+ * SNDRV_PCM_STATE_DRAINING: When stream is draining current data. This is done</div><div class='add'>+ *	by calling SNDRV_COMPRESS_DRAIN.</div><div class='add'>+ * SNDRV_PCM_STATE_PAUSED: When stream is paused. This is done by calling</div><div class='add'>+ *	SNDRV_COMPRESS_PAUSE. It can be stopped or resumed by calling</div><div class='add'>+ *	SNDRV_COMPRESS_STOP or SNDRV_COMPRESS_RESUME respectively.</div><div class='add'>+ */</div><div class='add'>+static int snd_compr_open(struct inode *inode, struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr *compr;</div><div class='add'>+	struct snd_compr_file *data;</div><div class='add'>+	struct snd_compr_runtime *runtime;</div><div class='add'>+	enum snd_compr_direction dirn;</div><div class='add'>+	int maj = imajor(inode);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((f-&gt;f_flags &amp; O_ACCMODE) == O_WRONLY)</div><div class='add'>+		dirn = SND_COMPRESS_PLAYBACK;</div><div class='add'>+	else if ((f-&gt;f_flags &amp; O_ACCMODE) == O_RDONLY)</div><div class='add'>+		dirn = SND_COMPRESS_CAPTURE;</div><div class='add'>+	else if ((f-&gt;f_flags &amp; O_ACCMODE) == O_RDWR)</div><div class='add'>+		dirn = SND_COMPRESS_ACCEL;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (maj == snd_major)</div><div class='add'>+		compr = snd_lookup_minor_data(iminor(inode),</div><div class='add'>+					SNDRV_DEVICE_TYPE_COMPRESS);</div><div class='add'>+	else</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	if (compr == NULL) {</div><div class='add'>+		pr_err("no device data!!!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dirn != compr-&gt;direction) {</div><div class='add'>+		pr_err("this device doesn't support this direction\n");</div><div class='add'>+		snd_card_unref(compr-&gt;card);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		snd_card_unref(compr-&gt;card);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;data-&gt;stream.error_work, error_delayed_work);</div><div class='add'>+</div><div class='add'>+	data-&gt;stream.ops = compr-&gt;ops;</div><div class='add'>+	data-&gt;stream.direction = dirn;</div><div class='add'>+	data-&gt;stream.private_data = compr-&gt;private_data;</div><div class='add'>+	data-&gt;stream.device = compr;</div><div class='add'>+	runtime = kzalloc(sizeof(*runtime), GFP_KERNEL);</div><div class='add'>+	if (!runtime) {</div><div class='add'>+		kfree(data);</div><div class='add'>+		snd_card_unref(compr-&gt;card);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	runtime-&gt;state = SNDRV_PCM_STATE_OPEN;</div><div class='add'>+	init_waitqueue_head(&amp;runtime-&gt;sleep);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+	INIT_LIST_HEAD(&amp;runtime-&gt;tasks);</div><div class='add'>+#endif</div><div class='add'>+	data-&gt;stream.runtime = runtime;</div><div class='add'>+	f-&gt;private_data = (void *)data;</div><div class='add'>+	scoped_guard(mutex, &amp;compr-&gt;lock)</div><div class='add'>+		ret = compr-&gt;ops-&gt;open(&amp;data-&gt;stream);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(runtime);</div><div class='add'>+		kfree(data);</div><div class='add'>+	}</div><div class='add'>+	snd_card_unref(compr-&gt;card);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_free(struct inode *inode, struct file *f)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_file *data = f-&gt;private_data;</div><div class='add'>+	struct snd_compr_runtime *runtime = data-&gt;stream.runtime;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;data-&gt;stream.error_work);</div><div class='add'>+</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_RUNNING:</div><div class='add'>+	case SNDRV_PCM_STATE_DRAINING:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		data-&gt;stream.ops-&gt;trigger(&amp;data-&gt;stream, SNDRV_PCM_TRIGGER_STOP);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_compr_task_free_all(&amp;data-&gt;stream);</div><div class='add'>+</div><div class='add'>+	data-&gt;stream.ops-&gt;free(&amp;data-&gt;stream);</div><div class='add'>+	if (!data-&gt;stream.runtime-&gt;dma_buffer_p)</div><div class='add'>+		kfree(data-&gt;stream.runtime-&gt;buffer);</div><div class='add'>+	kfree(data-&gt;stream.runtime);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snd_compr_tstamp32_from_64(struct snd_compr_tstamp *tstamp32,</div><div class='add'>+			   const struct snd_compr_tstamp64 *tstamp64)</div><div class='add'>+{</div><div class='add'>+	tstamp32-&gt;byte_offset = tstamp64-&gt;byte_offset;</div><div class='add'>+	tstamp32-&gt;copied_total = (u32)tstamp64-&gt;copied_total;</div><div class='add'>+	tstamp32-&gt;pcm_frames = (u32)tstamp64-&gt;pcm_frames;</div><div class='add'>+	tstamp32-&gt;pcm_io_frames = (u32)tstamp64-&gt;pcm_io_frames;</div><div class='add'>+	tstamp32-&gt;sampling_rate = tstamp64-&gt;sampling_rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_update_tstamp(struct snd_compr_stream *stream,</div><div class='add'>+				   struct snd_compr_tstamp64 *tstamp)</div><div class='add'>+{</div><div class='add'>+	if (!stream-&gt;ops-&gt;pointer)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	stream-&gt;ops-&gt;pointer(stream, tstamp);</div><div class='add'>+	pr_debug("dsp consumed till %u total %llu bytes\n", tstamp-&gt;byte_offset,</div><div class='add'>+		 tstamp-&gt;copied_total);</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_PLAYBACK)</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_transferred = tstamp-&gt;copied_total;</div><div class='add'>+	else</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_available = tstamp-&gt;copied_total;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t snd_compr_calc_avail(struct snd_compr_stream *stream,</div><div class='add'>+				   struct snd_compr_avail64 *avail)</div><div class='add'>+{</div><div class='add'>+	memset(avail, 0, sizeof(*avail));</div><div class='add'>+	snd_compr_update_tstamp(stream, &amp;avail-&gt;tstamp);</div><div class='add'>+	/* Still need to return avail even if tstamp can't be filled in */</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;total_bytes_available == 0 &amp;&amp;</div><div class='add'>+			stream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_SETUP &amp;&amp;</div><div class='add'>+			stream-&gt;direction == SND_COMPRESS_PLAYBACK) {</div><div class='add'>+		pr_debug("detected init and someone forgot to do a write\n");</div><div class='add'>+		return stream-&gt;runtime-&gt;buffer_size;</div><div class='add'>+	}</div><div class='add'>+	pr_debug("app wrote %llu, DSP consumed %llu\n",</div><div class='add'>+		 stream-&gt;runtime-&gt;total_bytes_available,</div><div class='add'>+		 stream-&gt;runtime-&gt;total_bytes_transferred);</div><div class='add'>+	if (stream-&gt;runtime-&gt;total_bytes_available ==</div><div class='add'>+				stream-&gt;runtime-&gt;total_bytes_transferred) {</div><div class='add'>+		if (stream-&gt;direction == SND_COMPRESS_PLAYBACK) {</div><div class='add'>+			pr_debug("both pointers are same, returning full avail\n");</div><div class='add'>+			return stream-&gt;runtime-&gt;buffer_size;</div><div class='add'>+		} else {</div><div class='add'>+			pr_debug("both pointers are same, returning no avail\n");</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	avail-&gt;avail = stream-&gt;runtime-&gt;total_bytes_available -</div><div class='add'>+			stream-&gt;runtime-&gt;total_bytes_transferred;</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_PLAYBACK)</div><div class='add'>+		avail-&gt;avail = stream-&gt;runtime-&gt;buffer_size - avail-&gt;avail;</div><div class='add'>+</div><div class='add'>+	pr_debug("ret avail as %zu\n", (size_t)avail-&gt;avail);</div><div class='add'>+	return avail-&gt;avail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline size_t snd_compr_get_avail(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_avail64 avail;</div><div class='add'>+</div><div class='add'>+	return snd_compr_calc_avail(stream, &amp;avail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compr_avail32_from_64(struct snd_compr_avail *avail32,</div><div class='add'>+				      const struct snd_compr_avail64 *avail64)</div><div class='add'>+{</div><div class='add'>+	avail32-&gt;avail = avail64-&gt;avail;</div><div class='add'>+	snd_compr_tstamp32_from_64(&amp;avail32-&gt;tstamp, &amp;avail64-&gt;tstamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_ioctl_avail(struct snd_compr_stream *stream,</div><div class='add'>+				 unsigned long arg, bool is_32bit)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_avail64 ioctl_avail64;</div><div class='add'>+	struct snd_compr_avail ioctl_avail32;</div><div class='add'>+	size_t avail;</div><div class='add'>+	const void *copy_from = &amp;ioctl_avail64;</div><div class='add'>+	size_t copy_size = sizeof(ioctl_avail64);</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	avail = snd_compr_calc_avail(stream, &amp;ioctl_avail64);</div><div class='add'>+	ioctl_avail64.avail = avail;</div><div class='add'>+	if (is_32bit) {</div><div class='add'>+		snd_compr_avail32_from_64(&amp;ioctl_avail32, &amp;ioctl_avail64);</div><div class='add'>+		copy_from = &amp;ioctl_avail32;</div><div class='add'>+		copy_size = sizeof(ioctl_avail32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((__u64 __user *)arg, copy_from, copy_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_write_data(struct snd_compr_stream *stream,</div><div class='add'>+	       const char __user *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	void *dstn;</div><div class='add'>+	size_t copy;</div><div class='add'>+	struct snd_compr_runtime *runtime = stream-&gt;runtime;</div><div class='add'>+	/* 64-bit Modulus */</div><div class='add'>+	u64 app_pointer = div64_u64(runtime-&gt;total_bytes_available,</div><div class='add'>+				    runtime-&gt;buffer_size);</div><div class='add'>+	app_pointer = runtime-&gt;total_bytes_available -</div><div class='add'>+		      (app_pointer * runtime-&gt;buffer_size);</div><div class='add'>+</div><div class='add'>+	dstn = runtime-&gt;buffer + app_pointer;</div><div class='add'>+	pr_debug("copying %lu at %llu\n", (unsigned long)count, app_pointer);</div><div class='add'>+	if (count &lt; runtime-&gt;buffer_size - app_pointer) {</div><div class='add'>+		if (copy_from_user(dstn, buf, count))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		copy = runtime-&gt;buffer_size - app_pointer;</div><div class='add'>+		if (copy_from_user(dstn, buf, copy))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		if (copy_from_user(runtime-&gt;buffer, buf + copy, count - copy))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+	/* if DSP cares, let it know data has been written */</div><div class='add'>+	if (stream-&gt;ops-&gt;ack)</div><div class='add'>+		stream-&gt;ops-&gt;ack(stream, count);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t snd_compr_write(struct file *f, const char __user *buf,</div><div class='add'>+		size_t count, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_file *data = f-&gt;private_data;</div><div class='add'>+	struct snd_compr_stream *stream;</div><div class='add'>+	size_t avail;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!data))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	stream = &amp;data-&gt;stream;</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+	/* write is allowed when stream is running or has been setup */</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_RUNNING:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	avail = snd_compr_get_avail(stream);</div><div class='add'>+	pr_debug("avail returned %lu\n", (unsigned long)avail);</div><div class='add'>+	/* calculate how much we can write to buffer */</div><div class='add'>+	if (avail &gt; count)</div><div class='add'>+		avail = count;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;ops-&gt;copy) {</div><div class='add'>+		char __user* cbuf = (char __user*)buf;</div><div class='add'>+		retval = stream-&gt;ops-&gt;copy(stream, cbuf, avail);</div><div class='add'>+	} else {</div><div class='add'>+		retval = snd_compr_write_data(stream, buf, avail);</div><div class='add'>+	}</div><div class='add'>+	if (retval &gt; 0)</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_available += retval;</div><div class='add'>+</div><div class='add'>+	/* while initiating the stream, write should be called before START</div><div class='add'>+	 * call, so in setup move state */</div><div class='add'>+	if (stream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_SETUP) {</div><div class='add'>+		stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_PREPARED;</div><div class='add'>+		pr_debug("stream prepared, Houston we are good to go\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static ssize_t snd_compr_read(struct file *f, char __user *buf,</div><div class='add'>+		size_t count, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_file *data = f-&gt;private_data;</div><div class='add'>+	struct snd_compr_stream *stream;</div><div class='add'>+	size_t avail;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!data))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	stream = &amp;data-&gt;stream;</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* read is allowed when stream is running, paused, draining and setup</div><div class='add'>+	 * (yes setup is state which we transition to after stop, so if user</div><div class='add'>+	 * wants to read data after stop we allow that)</div><div class='add'>+	 */</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='add'>+	case SNDRV_PCM_STATE_DISCONNECTED:</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	avail = snd_compr_get_avail(stream);</div><div class='add'>+	pr_debug("avail returned %lu\n", (unsigned long)avail);</div><div class='add'>+	/* calculate how much we can read from buffer */</div><div class='add'>+	if (avail &gt; count)</div><div class='add'>+		avail = count;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;ops-&gt;copy)</div><div class='add'>+		retval = stream-&gt;ops-&gt;copy(stream, buf, avail);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	if (retval &gt; 0)</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_transferred += retval;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t snd_compr_get_poll(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_PLAYBACK)</div><div class='add'>+		return EPOLLOUT | EPOLLWRNORM;</div><div class='add'>+	else</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t snd_compr_poll(struct file *f, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_file *data = f-&gt;private_data;</div><div class='add'>+	struct snd_compr_stream *stream;</div><div class='add'>+	struct snd_compr_runtime *runtime;</div><div class='add'>+	size_t avail;</div><div class='add'>+	__poll_t retval = 0;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!data))</div><div class='add'>+		return EPOLLERR;</div><div class='add'>+</div><div class='add'>+	stream = &amp;data-&gt;stream;</div><div class='add'>+	runtime = stream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return snd_compr_get_poll(stream) | EPOLLERR;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	poll_wait(f, &amp;runtime-&gt;sleep, wait);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL) {</div><div class='add'>+		struct snd_compr_task_runtime *task;</div><div class='add'>+		if (runtime-&gt;fragments &gt; runtime-&gt;active_tasks)</div><div class='add'>+			retval |= EPOLLOUT | EPOLLWRNORM;</div><div class='add'>+		task = list_first_entry_or_null(&amp;runtime-&gt;tasks,</div><div class='add'>+						struct snd_compr_task_runtime,</div><div class='add'>+						list);</div><div class='add'>+		if (task &amp;&amp; task-&gt;state == SND_COMPRESS_TASK_STATE_FINISHED)</div><div class='add'>+			retval |= EPOLLIN | EPOLLRDNORM;</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	avail = snd_compr_get_avail(stream);</div><div class='add'>+	pr_debug("avail is %lu\n", (unsigned long)avail);</div><div class='add'>+	/* check if we have at least one fragment to fill */</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_DRAINING:</div><div class='add'>+		/* stream has been woken up after drain is complete</div><div class='add'>+		 * draining done so set stream state to stopped</div><div class='add'>+		 */</div><div class='add'>+		retval = snd_compr_get_poll(stream);</div><div class='add'>+		runtime-&gt;state = SNDRV_PCM_STATE_SETUP;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_STATE_RUNNING:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		if (avail &gt;= runtime-&gt;fragment_size)</div><div class='add'>+			retval = snd_compr_get_poll(stream);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return snd_compr_get_poll(stream) | EPOLLERR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compr_get_caps(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	struct snd_compr_caps caps;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;ops-&gt;get_caps)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	memset(&amp;caps, 0, sizeof(caps));</div><div class='add'>+	retval = stream-&gt;ops-&gt;get_caps(stream, &amp;caps);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto out;</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;caps, sizeof(caps)))</div><div class='add'>+		retval = -EFAULT;</div><div class='add'>+out:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef COMPR_CODEC_CAPS_OVERFLOW</div><div class='add'>+static int</div><div class='add'>+snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+	struct snd_compr_codec_caps *caps __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;ops-&gt;get_codec_caps)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	caps = kzalloc(sizeof(*caps), GFP_KERNEL);</div><div class='add'>+	if (!caps)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;get_codec_caps(stream, caps);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+	if (copy_to_user((void __user *)arg, caps, sizeof(*caps)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+#endif /* !COMPR_CODEC_CAPS_OVERFLOW */</div><div class='add'>+</div><div class='add'>+int snd_compr_malloc_pages(struct snd_compr_stream *stream, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct snd_dma_buffer *dmab;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!(stream) || !(stream)-&gt;runtime))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	dmab = kzalloc(sizeof(*dmab), GFP_KERNEL);</div><div class='add'>+	if (!dmab)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dmab-&gt;dev = stream-&gt;dma_buffer.dev;</div><div class='add'>+	ret = snd_dma_alloc_pages(dmab-&gt;dev.type, dmab-&gt;dev.dev, size, dmab);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		kfree(dmab);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_compr_set_runtime_buffer(stream, dmab);</div><div class='add'>+	stream-&gt;runtime-&gt;dma_bytes = size;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_compr_malloc_pages);</div><div class='add'>+</div><div class='add'>+int snd_compr_free_pages(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_runtime *runtime;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!(stream) || !(stream)-&gt;runtime))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	runtime = stream-&gt;runtime;</div><div class='add'>+	if (runtime-&gt;dma_area == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	if (runtime-&gt;dma_buffer_p != &amp;stream-&gt;dma_buffer) {</div><div class='add'>+		/* It's a newly allocated buffer. Release it now. */</div><div class='add'>+		snd_dma_free_pages(runtime-&gt;dma_buffer_p);</div><div class='add'>+		kfree(runtime-&gt;dma_buffer_p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_compr_set_runtime_buffer(stream, NULL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_compr_free_pages);</div><div class='add'>+</div><div class='add'>+/* revisit this with snd_pcm_preallocate_xxx */</div><div class='add'>+static int snd_compr_allocate_buffer(struct snd_compr_stream *stream,</div><div class='add'>+		struct snd_compr_params *params)</div><div class='add'>+{</div><div class='add'>+	unsigned int buffer_size;</div><div class='add'>+	void *buffer = NULL;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL)</div><div class='add'>+		goto params;</div><div class='add'>+</div><div class='add'>+	buffer_size = params-&gt;buffer.fragment_size * params-&gt;buffer.fragments;</div><div class='add'>+	if (stream-&gt;ops-&gt;copy) {</div><div class='add'>+		buffer = NULL;</div><div class='add'>+		/* if copy is defined the driver will be required to copy</div><div class='add'>+		 * the data from core</div><div class='add'>+		 */</div><div class='add'>+	} else {</div><div class='add'>+		if (stream-&gt;runtime-&gt;dma_buffer_p) {</div><div class='add'>+</div><div class='add'>+			if (buffer_size &gt; stream-&gt;runtime-&gt;dma_buffer_p-&gt;bytes)</div><div class='add'>+				dev_err(stream-&gt;device-&gt;dev,</div><div class='add'>+						"Not enough DMA buffer");</div><div class='add'>+			else</div><div class='add'>+				buffer = stream-&gt;runtime-&gt;dma_buffer_p-&gt;area;</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			buffer = kmalloc(buffer_size, GFP_KERNEL);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!buffer)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream-&gt;runtime-&gt;buffer = buffer;</div><div class='add'>+	stream-&gt;runtime-&gt;buffer_size = buffer_size;</div><div class='add'>+params:</div><div class='add'>+	stream-&gt;runtime-&gt;fragment_size = params-&gt;buffer.fragment_size;</div><div class='add'>+	stream-&gt;runtime-&gt;fragments = params-&gt;buffer.fragments;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compress_check_input(struct snd_compr_stream *stream, struct snd_compr_params *params)</div><div class='add'>+{</div><div class='add'>+	u32 max_fragments;</div><div class='add'>+</div><div class='add'>+	/* first let's check the buffer parameter's */</div><div class='add'>+	if (params-&gt;buffer.fragment_size == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL)</div><div class='add'>+		max_fragments = 64;			/* safe value */</div><div class='add'>+	else</div><div class='add'>+		max_fragments = U32_MAX / params-&gt;buffer.fragment_size;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;buffer.fragments &gt; max_fragments ||</div><div class='add'>+	    params-&gt;buffer.fragments == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* now codec parameters */</div><div class='add'>+	if (params-&gt;codec.id == 0 || params-&gt;codec.id &gt; SND_AUDIOCODEC_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;codec.ch_in == 0 || params-&gt;codec.ch_out == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_params *params __free(kfree) = NULL;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN || stream-&gt;next_track) {</div><div class='add'>+		/*</div><div class='add'>+		 * we should allow parameter change only when stream has been</div><div class='add'>+		 * opened not in other cases</div><div class='add'>+		 */</div><div class='add'>+		params = memdup_user((void __user *)arg, sizeof(*params));</div><div class='add'>+		if (IS_ERR(params))</div><div class='add'>+			return PTR_ERR(params);</div><div class='add'>+</div><div class='add'>+		retval = snd_compress_check_input(stream, params);</div><div class='add'>+		if (retval)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='add'>+		retval = snd_compr_allocate_buffer(stream, params);</div><div class='add'>+		if (retval)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		retval = stream-&gt;ops-&gt;set_params(stream, params);</div><div class='add'>+		if (retval)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='add'>+		if (stream-&gt;next_track)</div><div class='add'>+			return retval;</div><div class='add'>+</div><div class='add'>+		stream-&gt;metadata_set = false;</div><div class='add'>+		stream-&gt;next_track = false;</div><div class='add'>+</div><div class='add'>+		stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_SETUP;</div><div class='add'>+	} else {</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compr_get_params(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_codec *params __free(kfree) = NULL;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;ops-&gt;get_params)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	params = kzalloc(sizeof(*params), GFP_KERNEL);</div><div class='add'>+	if (!params)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	retval = stream-&gt;ops-&gt;get_params(stream, params);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+	if (copy_to_user((char __user *)arg, params, sizeof(*params)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compr_get_metadata(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_metadata metadata;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;ops-&gt;get_metadata)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;metadata, (void __user *)arg, sizeof(metadata)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;get_metadata(stream, &amp;metadata);</div><div class='add'>+	if (retval != 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user((void __user *)arg, &amp;metadata, sizeof(metadata)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_compr_set_metadata(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_metadata metadata;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;ops-&gt;set_metadata)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	/*</div><div class='add'>+	* we should allow parameter change only when stream has been</div><div class='add'>+	* opened not in other cases</div><div class='add'>+	*/</div><div class='add'>+	if (copy_from_user(&amp;metadata, (void __user *)arg, sizeof(metadata)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;set_metadata(stream, &amp;metadata);</div><div class='add'>+	stream-&gt;metadata_set = true;</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int snd_compr_tstamp(struct snd_compr_stream *stream,</div><div class='add'>+				   unsigned long arg, bool is_32bit)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_tstamp64 tstamp64 = { 0 };</div><div class='add'>+	struct snd_compr_tstamp tstamp32 = { 0 };</div><div class='add'>+	const void *copy_from = &amp;tstamp64;</div><div class='add'>+	size_t copy_size = sizeof(tstamp64);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_compr_update_tstamp(stream, &amp;tstamp64);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		if (is_32bit) {</div><div class='add'>+			snd_compr_tstamp32_from_64(&amp;tstamp32, &amp;tstamp64);</div><div class='add'>+			copy_from = &amp;tstamp32;</div><div class='add'>+			copy_size = sizeof(tstamp32);</div><div class='add'>+		}</div><div class='add'>+		ret = copy_to_user((void __user *)arg, copy_from, copy_size) ?</div><div class='add'>+			      -EFAULT :</div><div class='add'>+			      0;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_pause(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_RUNNING:</div><div class='add'>+		retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_PUSH);</div><div class='add'>+		if (!retval)</div><div class='add'>+			stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_PAUSED;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_STATE_DRAINING:</div><div class='add'>+		if (!stream-&gt;device-&gt;use_pause_in_draining)</div><div class='add'>+			return -EPERM;</div><div class='add'>+		retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_PUSH);</div><div class='add'>+		if (!retval)</div><div class='add'>+			stream-&gt;pause_in_draining = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_resume(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_RELEASE);</div><div class='add'>+		if (!retval)</div><div class='add'>+			stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_RUNNING;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_STATE_DRAINING:</div><div class='add'>+		if (!stream-&gt;pause_in_draining)</div><div class='add'>+			return -EPERM;</div><div class='add'>+		retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_PAUSE_RELEASE);</div><div class='add'>+		if (!retval)</div><div class='add'>+			stream-&gt;pause_in_draining = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_start(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+		if (stream-&gt;direction != SND_COMPRESS_CAPTURE)</div><div class='add'>+			return -EPERM;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_START);</div><div class='add'>+	if (!retval)</div><div class='add'>+		stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_RUNNING;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_stop(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_STOP);</div><div class='add'>+	if (!retval) {</div><div class='add'>+		/* clear flags and stop any drain wait */</div><div class='add'>+		stream-&gt;partial_drain = false;</div><div class='add'>+		stream-&gt;metadata_set = false;</div><div class='add'>+		stream-&gt;pause_in_draining = false;</div><div class='add'>+		snd_compr_drain_notify(stream);</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_available = 0;</div><div class='add'>+		stream-&gt;runtime-&gt;total_bytes_transferred = 0;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void error_delayed_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_stream *stream;</div><div class='add'>+</div><div class='add'>+	stream = container_of(work, struct snd_compr_stream, error_work.work);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+</div><div class='add'>+	stream-&gt;ops-&gt;trigger(stream, SNDRV_PCM_TRIGGER_STOP);</div><div class='add'>+	wake_up(&amp;stream-&gt;runtime-&gt;sleep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_compr_stop_error: Report a fatal error on a stream</div><div class='add'>+ * @stream: pointer to stream</div><div class='add'>+ * @state: state to transition the stream to</div><div class='add'>+ *</div><div class='add'>+ * Stop the stream and set its state.</div><div class='add'>+ *</div><div class='add'>+ * Should be called with compressed device lock held.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_compr_stop_error(struct snd_compr_stream *stream,</div><div class='add'>+			 snd_pcm_state_t state)</div><div class='add'>+{</div><div class='add'>+	if (stream-&gt;runtime-&gt;state == state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	stream-&gt;runtime-&gt;state = state;</div><div class='add'>+</div><div class='add'>+	pr_debug("Changing state to: %d\n", state);</div><div class='add'>+</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;stream-&gt;error_work, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_compr_stop_error);</div><div class='add'>+</div><div class='add'>+static int snd_compress_wait_for_drain(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We are called with lock held. So drop the lock while we wait for</div><div class='add'>+	 * drain complete notification from the driver</div><div class='add'>+	 *</div><div class='add'>+	 * It is expected that driver will notify the drain completion and then</div><div class='add'>+	 * stream will be moved to SETUP state, even if draining resulted in an</div><div class='add'>+	 * error. We can trigger next track after this.</div><div class='add'>+	 */</div><div class='add'>+	stream-&gt;runtime-&gt;state = SNDRV_PCM_STATE_DRAINING;</div><div class='add'>+	mutex_unlock(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* we wait for drain to complete here, drain can return when</div><div class='add'>+	 * interruption occurred, wait returned error or success.</div><div class='add'>+	 * For the first two cases we don't do anything different here and</div><div class='add'>+	 * return after waking up</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = wait_event_interruptible(stream-&gt;runtime-&gt;sleep,</div><div class='add'>+			(stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_DRAINING));</div><div class='add'>+	if (ret == -ERESTARTSYS)</div><div class='add'>+		pr_debug("wait aborted by a signal\n");</div><div class='add'>+	else if (ret)</div><div class='add'>+		pr_debug("wait for drain failed with %d\n", ret);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;stream-&gt;runtime-&gt;sleep);</div><div class='add'>+	mutex_lock(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_drain(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;trigger(stream, SND_COMPR_TRIGGER_DRAIN);</div><div class='add'>+	if (retval) {</div><div class='add'>+		pr_debug("SND_COMPR_TRIGGER_DRAIN failed %d\n", retval);</div><div class='add'>+		wake_up(&amp;stream-&gt;runtime-&gt;sleep);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_compress_wait_for_drain(stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_next_track(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/* only a running stream can transition to next track */</div><div class='add'>+	if (stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_RUNNING)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* next track doesn't have any meaning for capture streams */</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_CAPTURE)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* you can signal next track if this is intended to be a gapless stream</div><div class='add'>+	 * and current track metadata is set</div><div class='add'>+	 */</div><div class='add'>+	if (stream-&gt;metadata_set == false)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	retval = stream-&gt;ops-&gt;trigger(stream, SND_COMPR_TRIGGER_NEXT_TRACK);</div><div class='add'>+	if (retval != 0)</div><div class='add'>+		return retval;</div><div class='add'>+	stream-&gt;metadata_set = false;</div><div class='add'>+	stream-&gt;next_track = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_partial_drain(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	switch (stream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* partial drain doesn't have any meaning for capture streams */</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_CAPTURE)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	/* stream can be drained only when next track has been signalled */</div><div class='add'>+	if (stream-&gt;next_track == false)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	stream-&gt;partial_drain = true;</div><div class='add'>+	retval = stream-&gt;ops-&gt;trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN);</div><div class='add'>+	if (retval) {</div><div class='add'>+		pr_debug("Partial drain returned failure\n");</div><div class='add'>+		wake_up(&amp;stream-&gt;runtime-&gt;sleep);</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream-&gt;next_track = false;</div><div class='add'>+	return snd_compress_wait_for_drain(stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+</div><div class='add'>+static struct snd_compr_task_runtime *</div><div class='add'>+snd_compr_find_task(struct snd_compr_stream *stream, __u64 seqno)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(task, &amp;stream-&gt;runtime-&gt;tasks, list) {</div><div class='add'>+		if (task-&gt;seqno == seqno)</div><div class='add'>+			return task;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compr_task_free(struct snd_compr_task_runtime *task)</div><div class='add'>+{</div><div class='add'>+	if (task-&gt;output)</div><div class='add'>+		dma_buf_put(task-&gt;output);</div><div class='add'>+	if (task-&gt;input)</div><div class='add'>+		dma_buf_put(task-&gt;input);</div><div class='add'>+	kfree(task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 snd_compr_seqno_next(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	u64 seqno = ++stream-&gt;runtime-&gt;task_seqno;</div><div class='add'>+	if (seqno == 0)</div><div class='add'>+		seqno = ++stream-&gt;runtime-&gt;task_seqno;</div><div class='add'>+	return seqno;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_new(struct snd_compr_stream *stream, struct snd_compr_task *utask)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task;</div><div class='add'>+	int retval, fd_i, fd_o;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;total_tasks &gt;= stream-&gt;runtime-&gt;fragments)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (utask-&gt;origin_seqno != 0 || utask-&gt;input_size != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	task = kzalloc(sizeof(*task), GFP_KERNEL);</div><div class='add'>+	if (task == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	task-&gt;seqno = utask-&gt;seqno = snd_compr_seqno_next(stream);</div><div class='add'>+	task-&gt;input_size = utask-&gt;input_size;</div><div class='add'>+	retval = stream-&gt;ops-&gt;task_create(stream, task);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	/* similar functionality as in dma_buf_fd(), but ensure that both</div><div class='add'>+	   file descriptors are allocated before fd_install() */</div><div class='add'>+	if (!task-&gt;input || !task-&gt;input-&gt;file || !task-&gt;output || !task-&gt;output-&gt;file) {</div><div class='add'>+		retval = -EINVAL;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	fd_i = get_unused_fd_flags(O_WRONLY|O_CLOEXEC);</div><div class='add'>+	if (fd_i &lt; 0)</div><div class='add'>+		goto cleanup;</div><div class='add'>+	fd_o = get_unused_fd_flags(O_RDONLY|O_CLOEXEC);</div><div class='add'>+	if (fd_o &lt; 0) {</div><div class='add'>+		put_unused_fd(fd_i);</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+	/* keep dmabuf reference until freed with task free ioctl */</div><div class='add'>+	get_dma_buf(task-&gt;input);</div><div class='add'>+	get_dma_buf(task-&gt;output);</div><div class='add'>+	fd_install(fd_i, task-&gt;input-&gt;file);</div><div class='add'>+	fd_install(fd_o, task-&gt;output-&gt;file);</div><div class='add'>+	utask-&gt;input_fd = fd_i;</div><div class='add'>+	utask-&gt;output_fd = fd_o;</div><div class='add'>+	list_add_tail(&amp;task-&gt;list, &amp;stream-&gt;runtime-&gt;tasks);</div><div class='add'>+	stream-&gt;runtime-&gt;total_tasks++;</div><div class='add'>+	return 0;</div><div class='add'>+cleanup:</div><div class='add'>+	snd_compr_task_free(task);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_create(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task *task __free(kfree) = NULL;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_SETUP)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	task = memdup_user((void __user *)arg, sizeof(*task));</div><div class='add'>+	if (IS_ERR(task))</div><div class='add'>+		return PTR_ERR(task);</div><div class='add'>+	retval = snd_compr_task_new(stream, task);</div><div class='add'>+	if (retval &gt;= 0)</div><div class='add'>+		if (copy_to_user((void __user *)arg, task, sizeof(*task)))</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_start_prepare(struct snd_compr_task_runtime *task,</div><div class='add'>+					struct snd_compr_task *utask)</div><div class='add'>+{</div><div class='add'>+	if (task == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (task-&gt;state &gt;= SND_COMPRESS_TASK_STATE_FINISHED)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (utask-&gt;input_size &gt; task-&gt;input-&gt;size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	task-&gt;flags = utask-&gt;flags;</div><div class='add'>+	task-&gt;input_size = utask-&gt;input_size;</div><div class='add'>+	task-&gt;state = SND_COMPRESS_TASK_STATE_IDLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_start(struct snd_compr_stream *stream, struct snd_compr_task *utask)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (utask-&gt;origin_seqno &gt; 0) {</div><div class='add'>+		task = snd_compr_find_task(stream, utask-&gt;origin_seqno);</div><div class='add'>+		retval = snd_compr_task_start_prepare(task, utask);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+		task-&gt;seqno = utask-&gt;seqno = snd_compr_seqno_next(stream);</div><div class='add'>+		utask-&gt;origin_seqno = 0;</div><div class='add'>+		list_move_tail(&amp;task-&gt;list, &amp;stream-&gt;runtime-&gt;tasks);</div><div class='add'>+	} else {</div><div class='add'>+		task = snd_compr_find_task(stream, utask-&gt;seqno);</div><div class='add'>+		if (task &amp;&amp; task-&gt;state != SND_COMPRESS_TASK_STATE_IDLE)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		retval = snd_compr_task_start_prepare(task, utask);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+	retval = stream-&gt;ops-&gt;task_start(stream, task);</div><div class='add'>+	if (retval &gt;= 0) {</div><div class='add'>+		task-&gt;state = SND_COMPRESS_TASK_STATE_ACTIVE;</div><div class='add'>+		stream-&gt;runtime-&gt;active_tasks++;</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_start_ioctl(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task *task __free(kfree) = NULL;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_SETUP)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	task = memdup_user((void __user *)arg, sizeof(*task));</div><div class='add'>+	if (IS_ERR(task))</div><div class='add'>+		return PTR_ERR(task);</div><div class='add'>+	retval = snd_compr_task_start(stream, task);</div><div class='add'>+	if (retval &gt;= 0)</div><div class='add'>+		if (copy_to_user((void __user *)arg, task, sizeof(*task)))</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compr_task_stop_one(struct snd_compr_stream *stream,</div><div class='add'>+					struct snd_compr_task_runtime *task)</div><div class='add'>+{</div><div class='add'>+	if (task-&gt;state != SND_COMPRESS_TASK_STATE_ACTIVE)</div><div class='add'>+		return;</div><div class='add'>+	stream-&gt;ops-&gt;task_stop(stream, task);</div><div class='add'>+	if (!snd_BUG_ON(stream-&gt;runtime-&gt;active_tasks == 0))</div><div class='add'>+		stream-&gt;runtime-&gt;active_tasks--;</div><div class='add'>+	list_move_tail(&amp;task-&gt;list, &amp;stream-&gt;runtime-&gt;tasks);</div><div class='add'>+	task-&gt;state = SND_COMPRESS_TASK_STATE_IDLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compr_task_free_one(struct snd_compr_stream *stream,</div><div class='add'>+					struct snd_compr_task_runtime *task)</div><div class='add'>+{</div><div class='add'>+	snd_compr_task_stop_one(stream, task);</div><div class='add'>+	stream-&gt;ops-&gt;task_free(stream, task);</div><div class='add'>+	list_del(&amp;task-&gt;list);</div><div class='add'>+	snd_compr_task_free(task);</div><div class='add'>+	stream-&gt;runtime-&gt;total_tasks--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compr_task_free_all(struct snd_compr_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task, *temp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe_reverse(task, temp, &amp;stream-&gt;runtime-&gt;tasks, list)</div><div class='add'>+		snd_compr_task_free_one(stream, task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef void (*snd_compr_seq_func_t)(struct snd_compr_stream *stream,</div><div class='add'>+					struct snd_compr_task_runtime *task);</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_seq(struct snd_compr_stream *stream, unsigned long arg,</div><div class='add'>+					snd_compr_seq_func_t fcn)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task, *temp;</div><div class='add'>+	__u64 seqno;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_SETUP)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	retval = copy_from_user(&amp;seqno, (__u64 __user *)arg, sizeof(seqno));</div><div class='add'>+	if (retval)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	retval = 0;</div><div class='add'>+	if (seqno == 0) {</div><div class='add'>+		list_for_each_entry_safe_reverse(task, temp, &amp;stream-&gt;runtime-&gt;tasks, list)</div><div class='add'>+			fcn(stream, task);</div><div class='add'>+	} else {</div><div class='add'>+		task = snd_compr_find_task(stream, seqno);</div><div class='add'>+		if (task == NULL) {</div><div class='add'>+			retval = -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			fcn(stream, task);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_status(struct snd_compr_stream *stream,</div><div class='add'>+					struct snd_compr_task_status *status)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_runtime *task;</div><div class='add'>+</div><div class='add'>+	task = snd_compr_find_task(stream, status-&gt;seqno);</div><div class='add'>+	if (task == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	status-&gt;input_size = task-&gt;input_size;</div><div class='add'>+	status-&gt;output_size = task-&gt;output_size;</div><div class='add'>+	status-&gt;state = task-&gt;state;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compr_task_status_ioctl(struct snd_compr_stream *stream, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_task_status *status __free(kfree) = NULL;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_SETUP)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	status = memdup_user((void __user *)arg, sizeof(*status));</div><div class='add'>+	if (IS_ERR(status))</div><div class='add'>+		return PTR_ERR(status);</div><div class='add'>+	retval = snd_compr_task_status(stream, status);</div><div class='add'>+	if (retval &gt;= 0)</div><div class='add'>+		if (copy_to_user((void __user *)arg, status, sizeof(*status)))</div><div class='add'>+			retval = -EFAULT;</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_compr_task_finished: Notify that the task was finished</div><div class='add'>+ * @stream: pointer to stream</div><div class='add'>+ * @task: runtime task structure</div><div class='add'>+ *</div><div class='add'>+ * Set the finished task state and notify waiters.</div><div class='add'>+ */</div><div class='add'>+void snd_compr_task_finished(struct snd_compr_stream *stream,</div><div class='add'>+			    struct snd_compr_task_runtime *task)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+	if (!snd_BUG_ON(stream-&gt;runtime-&gt;active_tasks == 0))</div><div class='add'>+		stream-&gt;runtime-&gt;active_tasks--;</div><div class='add'>+	task-&gt;state = SND_COMPRESS_TASK_STATE_FINISHED;</div><div class='add'>+	wake_up(&amp;stream-&gt;runtime-&gt;sleep);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_compr_task_finished);</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("DMA_BUF");</div><div class='add'>+#endif /* CONFIG_SND_COMPRESS_ACCEL */</div><div class='add'>+</div><div class='add'>+static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr_file *data = f-&gt;private_data;</div><div class='add'>+	struct snd_compr_stream *stream;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!data))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	stream = &amp;data-&gt;stream;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;stream-&gt;device-&gt;lock);</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_COMPRESS_IOCTL_VERSION:</div><div class='add'>+		return put_user(SNDRV_COMPRESS_VERSION,</div><div class='add'>+				(int __user *)arg) ? -EFAULT : 0;</div><div class='add'>+	case SNDRV_COMPRESS_GET_CAPS:</div><div class='add'>+		return snd_compr_get_caps(stream, arg);</div><div class='add'>+#ifndef COMPR_CODEC_CAPS_OVERFLOW</div><div class='add'>+	case SNDRV_COMPRESS_GET_CODEC_CAPS:</div><div class='add'>+		return snd_compr_get_codec_caps(stream, arg);</div><div class='add'>+#endif</div><div class='add'>+	case SNDRV_COMPRESS_SET_PARAMS:</div><div class='add'>+		return snd_compr_set_params(stream, arg);</div><div class='add'>+	case SNDRV_COMPRESS_GET_PARAMS:</div><div class='add'>+		return snd_compr_get_params(stream, arg);</div><div class='add'>+	case SNDRV_COMPRESS_SET_METADATA:</div><div class='add'>+		return snd_compr_set_metadata(stream, arg);</div><div class='add'>+	case SNDRV_COMPRESS_GET_METADATA:</div><div class='add'>+		return snd_compr_get_metadata(stream, arg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream-&gt;direction == SND_COMPRESS_ACCEL) {</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+		switch (cmd) {</div><div class='add'>+		case SNDRV_COMPRESS_TASK_CREATE:</div><div class='add'>+			return snd_compr_task_create(stream, arg);</div><div class='add'>+		case SNDRV_COMPRESS_TASK_FREE:</div><div class='add'>+			return snd_compr_task_seq(stream, arg, snd_compr_task_free_one);</div><div class='add'>+		case SNDRV_COMPRESS_TASK_START:</div><div class='add'>+			return snd_compr_task_start_ioctl(stream, arg);</div><div class='add'>+		case SNDRV_COMPRESS_TASK_STOP:</div><div class='add'>+			return snd_compr_task_seq(stream, arg, snd_compr_task_stop_one);</div><div class='add'>+		case SNDRV_COMPRESS_TASK_STATUS:</div><div class='add'>+			return snd_compr_task_status_ioctl(stream, arg);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_COMPRESS_TSTAMP:</div><div class='add'>+		return snd_compr_tstamp(stream, arg, true);</div><div class='add'>+	case SNDRV_COMPRESS_TSTAMP64:</div><div class='add'>+		return snd_compr_tstamp(stream, arg, false);</div><div class='add'>+	case SNDRV_COMPRESS_AVAIL:</div><div class='add'>+		return snd_compr_ioctl_avail(stream, arg, true);</div><div class='add'>+	case SNDRV_COMPRESS_AVAIL64:</div><div class='add'>+		return snd_compr_ioctl_avail(stream, arg, false);</div><div class='add'>+	case SNDRV_COMPRESS_PAUSE:</div><div class='add'>+		return snd_compr_pause(stream);</div><div class='add'>+	case SNDRV_COMPRESS_RESUME:</div><div class='add'>+		return snd_compr_resume(stream);</div><div class='add'>+	case SNDRV_COMPRESS_START:</div><div class='add'>+		return snd_compr_start(stream);</div><div class='add'>+	case SNDRV_COMPRESS_STOP:</div><div class='add'>+		return snd_compr_stop(stream);</div><div class='add'>+	case SNDRV_COMPRESS_DRAIN:</div><div class='add'>+		return snd_compr_drain(stream);</div><div class='add'>+	case SNDRV_COMPRESS_PARTIAL_DRAIN:</div><div class='add'>+		return snd_compr_partial_drain(stream);</div><div class='add'>+	case SNDRV_COMPRESS_NEXT_TRACK:</div><div class='add'>+		return snd_compr_next_track(stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* support of 32bit userspace on 64bit platforms */</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static long snd_compr_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+						unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return snd_compr_ioctl(file, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct file_operations snd_compr_file_ops = {</div><div class='add'>+		.owner =	THIS_MODULE,</div><div class='add'>+		.open =		snd_compr_open,</div><div class='add'>+		.release =	snd_compr_free,</div><div class='add'>+		.write =	snd_compr_write,</div><div class='add'>+		.read =		snd_compr_read,</div><div class='add'>+		.unlocked_ioctl = snd_compr_ioctl,</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+		.compat_ioctl = snd_compr_ioctl_compat,</div><div class='add'>+#endif</div><div class='add'>+		.mmap =		snd_compr_mmap,</div><div class='add'>+		.poll =		snd_compr_poll,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_compress_dev_register(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct snd_compr *compr;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!device || !device-&gt;device_data))</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	compr = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	pr_debug("reg device %s, direction %d\n", compr-&gt;name,</div><div class='add'>+			compr-&gt;direction);</div><div class='add'>+	/* register compressed device */</div><div class='add'>+	ret = snd_register_device(SNDRV_DEVICE_TYPE_COMPRESS,</div><div class='add'>+				  compr-&gt;card, compr-&gt;device,</div><div class='add'>+				  &amp;snd_compr_file_ops, compr, compr-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pr_err("snd_register_device failed %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compress_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr *compr;</div><div class='add'>+</div><div class='add'>+	compr = device-&gt;device_data;</div><div class='add'>+	snd_unregister_device(compr-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_VERBOSE_PROCFS</div><div class='add'>+static void snd_compress_proc_info_read(struct snd_info_entry *entry,</div><div class='add'>+					struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr *compr = (struct snd_compr *)entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "card: %d\n", compr-&gt;card-&gt;number);</div><div class='add'>+	snd_iprintf(buffer, "device: %d\n", compr-&gt;device);</div><div class='add'>+	snd_iprintf(buffer, "stream: %s\n",</div><div class='add'>+			compr-&gt;direction == SND_COMPRESS_PLAYBACK</div><div class='add'>+				? "PLAYBACK" : "CAPTURE");</div><div class='add'>+	snd_iprintf(buffer, "id: %s\n", compr-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_compress_proc_init(struct snd_compr *compr)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+	char name[16];</div><div class='add'>+</div><div class='add'>+	sprintf(name, "compr%i", compr-&gt;device);</div><div class='add'>+	entry = snd_info_create_card_entry(compr-&gt;card, name,</div><div class='add'>+					   compr-&gt;card-&gt;proc_root);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	entry-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+	compr-&gt;proc_root = entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(compr-&gt;card, "info",</div><div class='add'>+					   compr-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, compr,</div><div class='add'>+				      snd_compress_proc_info_read);</div><div class='add'>+	compr-&gt;proc_info_entry = entry;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_compress_proc_done(struct snd_compr *compr)</div><div class='add'>+{</div><div class='add'>+	snd_info_free_entry(compr-&gt;proc_info_entry);</div><div class='add'>+	compr-&gt;proc_info_entry = NULL;</div><div class='add'>+	snd_info_free_entry(compr-&gt;proc_root);</div><div class='add'>+	compr-&gt;proc_root = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)</div><div class='add'>+{</div><div class='add'>+	strscpy(compr-&gt;id, id, sizeof(compr-&gt;id));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int snd_compress_proc_init(struct snd_compr *compr)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void snd_compress_proc_done(struct snd_compr *compr)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int snd_compress_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_compr *compr;</div><div class='add'>+</div><div class='add'>+	compr = device-&gt;device_data;</div><div class='add'>+	snd_compress_proc_done(compr);</div><div class='add'>+	put_device(compr-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_compress_new: create new compress device</div><div class='add'>+ * @card: sound card pointer</div><div class='add'>+ * @device: device number</div><div class='add'>+ * @dirn: device direction, should be of type enum snd_compr_direction</div><div class='add'>+ * @id: ID string</div><div class='add'>+ * @compr: compress device pointer</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_compress_new(struct snd_card *card, int device,</div><div class='add'>+			int dirn, const char *id, struct snd_compr *compr)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_free = snd_compress_dev_free,</div><div class='add'>+		.dev_register = snd_compress_dev_register,</div><div class='add'>+		.dev_disconnect = snd_compress_dev_disconnect,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+#if !IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)</div><div class='add'>+	if (snd_BUG_ON(dirn == SND_COMPRESS_ACCEL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	compr-&gt;card = card;</div><div class='add'>+	compr-&gt;device = device;</div><div class='add'>+	compr-&gt;direction = dirn;</div><div class='add'>+	mutex_init(&amp;compr-&gt;lock);</div><div class='add'>+</div><div class='add'>+	snd_compress_set_id(compr, id);</div><div class='add'>+</div><div class='add'>+	ret = snd_device_alloc(&amp;compr-&gt;dev, card);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	dev_set_name(compr-&gt;dev, "comprC%iD%i", card-&gt;number, device);</div><div class='add'>+</div><div class='add'>+	ret = snd_device_new(card, SNDRV_DEV_COMPRESS, compr, &amp;ops);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		snd_compress_proc_init(compr);</div><div class='add'>+	else</div><div class='add'>+		put_device(compr-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_compress_new);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("ALSA Compressed offload framework");</div><div class='add'>+MODULE_AUTHOR("Vinod Koul &lt;vinod.koul@linux.intel.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/sound/core/control.c b/sound/core/control.c<br/>index 45a818002d99..9c3fd5113a61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/control.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/control.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/control.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/control.c</a></div><div class='hunk'>@@ -1,36 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for driver control interface</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/threads.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> </div><div class='del'>-/* max number of user-defined controls */</div><div class='del'>-#define MAX_USER_CONTROLS	32</div><div class='add'>+// Max allocation size for user controls.</div><div class='add'>+static int max_user_ctl_alloc_size = 8 * 1024 * 1024;</div><div class='add'>+module_param_named(max_user_ctl_alloc_size, max_user_ctl_alloc_size, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(max_user_ctl_alloc_size, "Max allocation size for user controls");</div><div class='add'>+</div><div class='ctx'> #define MAX_CONTROL_COUNT	1028</div><div class='ctx'> </div><div class='ctx'> struct snd_kctl_ioctl {</div><div class='hunk'>@@ -39,19 +32,23 @@ struct snd_kctl_ioctl {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DECLARE_RWSEM(snd_ioctl_rwsem);</div><div class='add'>+static DECLARE_RWSEM(snd_ctl_layer_rwsem);</div><div class='ctx'> static LIST_HEAD(snd_control_ioctls);</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> static LIST_HEAD(snd_control_compat_ioctls);</div><div class='ctx'> #endif</div><div class='add'>+static struct snd_ctl_layer_ops *snd_ctl_layer;</div><div class='add'>+</div><div class='add'>+static int snd_ctl_remove_locked(struct snd_card *card,</div><div class='add'>+				 struct snd_kcontrol *kcontrol);</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = nonseekable_open(inode, file);</div><div class='add'>+	err = stream_open(inode, file);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -78,13 +75,13 @@ static int snd_ctl_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	init_waitqueue_head(&amp;ctl-&gt;change_sleep);</div><div class='ctx'> 	spin_lock_init(&amp;ctl-&gt;read_lock);</div><div class='ctx'> 	ctl-&gt;card = card;</div><div class='del'>-	ctl-&gt;prefer_pcm_subdevice = -1;</div><div class='del'>-	ctl-&gt;prefer_rawmidi_subdevice = -1;</div><div class='add'>+	for (i = 0; i &lt; SND_CTL_SUBDEV_ITEMS; i++)</div><div class='add'>+		ctl-&gt;preferred_subdevice[i] = -1;</div><div class='ctx'> 	ctl-&gt;pid = get_pid(task_pid(current));</div><div class='ctx'> 	file-&gt;private_data = ctl;</div><div class='del'>-	write_lock_irqsave(&amp;card-&gt;ctl_files_rwlock, flags);</div><div class='del'>-	list_add_tail(&amp;ctl-&gt;list, &amp;card-&gt;ctl_files);</div><div class='del'>-	write_unlock_irqrestore(&amp;card-&gt;ctl_files_rwlock, flags);</div><div class='add'>+	scoped_guard(write_lock_irqsave, &amp;card-&gt;controls_rwlock)</div><div class='add'>+		list_add_tail(&amp;ctl-&gt;list, &amp;card-&gt;ctl_files);</div><div class='add'>+	snd_card_unref(card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       __error:</div><div class='hunk'>@@ -92,26 +89,25 @@ static int snd_ctl_open(struct inode *inode, struct file *file)</div><div class='ctx'>       __error2:</div><div class='ctx'> 	snd_card_file_remove(card, file);</div><div class='ctx'>       __error1:</div><div class='add'>+	if (card)</div><div class='add'>+		snd_card_unref(card);</div><div class='ctx'>       	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ctl_empty_read_queue(struct snd_ctl_file * ctl)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_kctl_event *cread;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;ctl-&gt;read_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ctl-&gt;read_lock);</div><div class='ctx'> 	while (!list_empty(&amp;ctl-&gt;events)) {</div><div class='ctx'> 		cread = snd_kctl_event(ctl-&gt;events.next);</div><div class='ctx'> 		list_del(&amp;cread-&gt;list);</div><div class='ctx'> 		kfree(cread);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ctl-&gt;read_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='ctx'> 	struct snd_kcontrol *control;</div><div class='hunk'>@@ -120,15 +116,18 @@ static int snd_ctl_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	ctl = file-&gt;private_data;</div><div class='ctx'> 	file-&gt;private_data = NULL;</div><div class='ctx'> 	card = ctl-&gt;card;</div><div class='del'>-	write_lock_irqsave(&amp;card-&gt;ctl_files_rwlock, flags);</div><div class='del'>-	list_del(&amp;ctl-&gt;list);</div><div class='del'>-	write_unlock_irqrestore(&amp;card-&gt;ctl_files_rwlock, flags);</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	list_for_each_entry(control, &amp;card-&gt;controls, list)</div><div class='del'>-		for (idx = 0; idx &lt; control-&gt;count; idx++)</div><div class='del'>-			if (control-&gt;vd[idx].owner == ctl)</div><div class='del'>-				control-&gt;vd[idx].owner = NULL;</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	scoped_guard(write_lock_irqsave, &amp;card-&gt;controls_rwlock)</div><div class='add'>+		list_del(&amp;ctl-&gt;list);</div><div class='add'>+</div><div class='add'>+	scoped_guard(rwsem_write, &amp;card-&gt;controls_rwsem) {</div><div class='add'>+		list_for_each_entry(control, &amp;card-&gt;controls, list)</div><div class='add'>+			for (idx = 0; idx &lt; control-&gt;count; idx++)</div><div class='add'>+				if (control-&gt;vd[idx].owner == ctl)</div><div class='add'>+					control-&gt;vd[idx].owner = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_fasync_free(ctl-&gt;fasync);</div><div class='ctx'> 	snd_ctl_empty_read_queue(ctl);</div><div class='ctx'> 	put_pid(ctl-&gt;pid);</div><div class='ctx'> 	kfree(ctl);</div><div class='hunk'>@@ -137,78 +136,114 @@ static int snd_ctl_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_notify - Send notification to user-space for a control change</div><div class='add'>+ * @card: the card to send notification</div><div class='add'>+ * @mask: the event mask, SNDRV_CTL_EVENT_*</div><div class='add'>+ * @id: the ctl element id to send notification</div><div class='add'>+ *</div><div class='add'>+ * This function adds an event record with the given id and mask, appends</div><div class='add'>+ * to the list and wakes up the user-space for notification.  This can be</div><div class='add'>+ * called in the atomic context.</div><div class='add'>+ */</div><div class='ctx'> void snd_ctl_notify(struct snd_card *card, unsigned int mask,</div><div class='ctx'> 		    struct snd_ctl_elem_id *id)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='ctx'> 	struct snd_kctl_event *ev;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(!card || !id))</div><div class='ctx'> 		return;</div><div class='del'>-	read_lock(&amp;card-&gt;ctl_files_rwlock);</div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)</div><div class='add'>+	if (card-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(read_lock_irqsave)(&amp;card-&gt;controls_rwlock);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> 	card-&gt;mixer_oss_change_count++;</div><div class='ctx'> #endif</div><div class='ctx'> 	list_for_each_entry(ctl, &amp;card-&gt;ctl_files, list) {</div><div class='ctx'> 		if (!ctl-&gt;subscribed)</div><div class='ctx'> 			continue;</div><div class='del'>-		spin_lock_irqsave(&amp;ctl-&gt;read_lock, flags);</div><div class='del'>-		list_for_each_entry(ev, &amp;ctl-&gt;events, list) {</div><div class='del'>-			if (ev-&gt;id.numid == id-&gt;numid) {</div><div class='del'>-				ev-&gt;mask |= mask;</div><div class='del'>-				goto _found;</div><div class='add'>+		scoped_guard(spinlock, &amp;ctl-&gt;read_lock) {</div><div class='add'>+			list_for_each_entry(ev, &amp;ctl-&gt;events, list) {</div><div class='add'>+				if (ev-&gt;id.numid == id-&gt;numid) {</div><div class='add'>+					ev-&gt;mask |= mask;</div><div class='add'>+					goto _found;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='add'>+			ev = kzalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='add'>+			if (ev) {</div><div class='add'>+				ev-&gt;id = *id;</div><div class='add'>+				ev-&gt;mask = mask;</div><div class='add'>+				list_add_tail(&amp;ev-&gt;list, &amp;ctl-&gt;events);</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(card-&gt;dev, "No memory available to allocate event\n");</div><div class='add'>+			}</div><div class='add'>+_found:</div><div class='add'>+			wake_up(&amp;ctl-&gt;change_sleep);</div><div class='ctx'> 		}</div><div class='del'>-		ev = kzalloc(sizeof(*ev), GFP_ATOMIC);</div><div class='del'>-		if (ev) {</div><div class='del'>-			ev-&gt;id = *id;</div><div class='del'>-			ev-&gt;mask = mask;</div><div class='del'>-			list_add_tail(&amp;ev-&gt;list, &amp;ctl-&gt;events);</div><div class='del'>-		} else {</div><div class='del'>-			snd_printk(KERN_ERR "No memory available to allocate event\n");</div><div class='del'>-		}</div><div class='del'>-	_found:</div><div class='del'>-		wake_up(&amp;ctl-&gt;change_sleep);</div><div class='del'>-		spin_unlock_irqrestore(&amp;ctl-&gt;read_lock, flags);</div><div class='del'>-		kill_fasync(&amp;ctl-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+		snd_kill_fasync(ctl-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;card-&gt;ctl_files_rwlock);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_notify);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_ctl_new - create a control instance from the template</div><div class='del'>- * @control: the control template</div><div class='del'>- * @access: the default control access</div><div class='add'>+ * snd_ctl_notify_one - Send notification to user-space for a control change</div><div class='add'>+ * @card: the card to send notification</div><div class='add'>+ * @mask: the event mask, SNDRV_CTL_EVENT_*</div><div class='add'>+ * @kctl: the pointer with the control instance</div><div class='add'>+ * @ioff: the additional offset to the control index</div><div class='add'>+ *</div><div class='add'>+ * This function calls snd_ctl_notify() and does additional jobs</div><div class='add'>+ * like LED state changes.</div><div class='add'>+ */</div><div class='add'>+void snd_ctl_notify_one(struct snd_card *card, unsigned int mask,</div><div class='add'>+			struct snd_kcontrol *kctl, unsigned int ioff)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id = kctl-&gt;id;</div><div class='add'>+	struct snd_ctl_layer_ops *lops;</div><div class='add'>+</div><div class='add'>+	id.index += ioff;</div><div class='add'>+	id.numid += ioff;</div><div class='add'>+	snd_ctl_notify(card, mask, &amp;id);</div><div class='add'>+	guard(rwsem_read)(&amp;snd_ctl_layer_rwsem);</div><div class='add'>+	for (lops = snd_ctl_layer; lops; lops = lops-&gt;next)</div><div class='add'>+		lops-&gt;lnotify(card, mask, kctl, ioff);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ctl_notify_one);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_new - create a new control instance with some elements</div><div class='add'>+ * @kctl: the pointer to store new control instance</div><div class='add'>+ * @count: the number of elements in this control</div><div class='add'>+ * @access: the default access flags for elements in this control</div><div class='add'>+ * @file: given when locking these elements</div><div class='ctx'>  *</div><div class='del'>- * Allocates a new struct snd_kcontrol instance and copies the given template </div><div class='del'>- * to the new instance. It does not copy volatile data (access).</div><div class='add'>+ * Allocates a memory object for a new control instance. The instance has</div><div class='add'>+ * elements as many as the given number (@count). Each element has given</div><div class='add'>+ * access permissions (@access). Each element is locked when @file is given.</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the new instance, or NULL on failure.</div><div class='add'>+ * Return: 0 on success, error code on failure</div><div class='ctx'>  */</div><div class='del'>-static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,</div><div class='del'>-					unsigned int access)</div><div class='add'>+static int snd_ctl_new(struct snd_kcontrol **kctl, unsigned int count,</div><div class='add'>+		       unsigned int access, struct snd_ctl_file *file)</div><div class='ctx'> {</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='ctx'> 	unsigned int idx;</div><div class='del'>-	</div><div class='del'>-	if (snd_BUG_ON(!control || !control-&gt;count))</div><div class='del'>-		return NULL;</div><div class='ctx'> </div><div class='del'>-	if (control-&gt;count &gt; MAX_CONTROL_COUNT)</div><div class='del'>-		return NULL;</div><div class='add'>+	if (count == 0 || count &gt; MAX_CONTROL_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	kctl = kzalloc(sizeof(*kctl) + sizeof(struct snd_kcontrol_volatile) * control-&gt;count, GFP_KERNEL);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot allocate control instance\n");</div><div class='del'>-		return NULL;</div><div class='add'>+	*kctl = kzalloc(struct_size(*kctl, vd, count), GFP_KERNEL);</div><div class='add'>+	if (!*kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	(*kctl)-&gt;count = count;</div><div class='add'>+	for (idx = 0; idx &lt; count; idx++) {</div><div class='add'>+		(*kctl)-&gt;vd[idx].access = access;</div><div class='add'>+		(*kctl)-&gt;vd[idx].owner = file;</div><div class='ctx'> 	}</div><div class='del'>-	*kctl = *control;</div><div class='del'>-	for (idx = 0; idx &lt; kctl-&gt;count; idx++)</div><div class='del'>-		kctl-&gt;vd[idx].access = access;</div><div class='del'>-	return kctl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -216,48 +251,65 @@ static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,</div><div class='ctx'>  * @ncontrol: the initialization record</div><div class='ctx'>  * @private_data: the private data to set</div><div class='ctx'>  *</div><div class='del'>- * Allocates a new struct snd_kcontrol instance and initialize from the given </div><div class='add'>+ * Allocates a new struct snd_kcontrol instance and initialize from the given</div><div class='ctx'>  * template.  When the access field of ncontrol is 0, it's assumed as</div><div class='ctx'>  * READWRITE access. When the count field is 0, it's assumes as one.</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the newly generated instance, or NULL on failure.</div><div class='add'>+ * Return: The pointer of the newly generated instance, or %NULL on failure.</div><div class='ctx'>  */</div><div class='ctx'> struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,</div><div class='ctx'> 				  void *private_data)</div><div class='ctx'> {</div><div class='del'>-	struct snd_kcontrol kctl;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	unsigned int count;</div><div class='ctx'> 	unsigned int access;</div><div class='del'>-	</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(!ncontrol || !ncontrol-&gt;info))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	memset(&amp;kctl, 0, sizeof(kctl));</div><div class='del'>-	kctl.id.iface = ncontrol-&gt;iface;</div><div class='del'>-	kctl.id.device = ncontrol-&gt;device;</div><div class='del'>-	kctl.id.subdevice = ncontrol-&gt;subdevice;</div><div class='add'>+</div><div class='add'>+	count = ncontrol-&gt;count;</div><div class='add'>+	if (count == 0)</div><div class='add'>+		count = 1;</div><div class='add'>+</div><div class='add'>+	access = ncontrol-&gt;access;</div><div class='add'>+	if (access == 0)</div><div class='add'>+		access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+	access &amp;= (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_VOLATILE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_INACTIVE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_LED_MASK |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK);</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_new(&amp;kctl, count, access, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* The 'numid' member is decided when calling snd_ctl_add(). */</div><div class='add'>+	kctl-&gt;id.iface = ncontrol-&gt;iface;</div><div class='add'>+	kctl-&gt;id.device = ncontrol-&gt;device;</div><div class='add'>+	kctl-&gt;id.subdevice = ncontrol-&gt;subdevice;</div><div class='ctx'> 	if (ncontrol-&gt;name) {</div><div class='del'>-		strlcpy(kctl.id.name, ncontrol-&gt;name, sizeof(kctl.id.name));</div><div class='del'>-		if (strcmp(ncontrol-&gt;name, kctl.id.name) != 0)</div><div class='del'>-			snd_printk(KERN_WARNING</div><div class='del'>-				   "Control name '%s' truncated to '%s'\n",</div><div class='del'>-				   ncontrol-&gt;name, kctl.id.name);</div><div class='add'>+		strscpy(kctl-&gt;id.name, ncontrol-&gt;name, sizeof(kctl-&gt;id.name));</div><div class='add'>+		if (strcmp(ncontrol-&gt;name, kctl-&gt;id.name) != 0)</div><div class='add'>+			pr_warn("ALSA: Control name '%s' truncated to '%s'\n",</div><div class='add'>+				ncontrol-&gt;name, kctl-&gt;id.name);</div><div class='ctx'> 	}</div><div class='del'>-	kctl.id.index = ncontrol-&gt;index;</div><div class='del'>-	kctl.count = ncontrol-&gt;count ? ncontrol-&gt;count : 1;</div><div class='del'>-	access = ncontrol-&gt;access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :</div><div class='del'>-		 (ncontrol-&gt;access &amp; (SNDRV_CTL_ELEM_ACCESS_READWRITE|</div><div class='del'>-				      SNDRV_CTL_ELEM_ACCESS_INACTIVE|</div><div class='del'>-				      SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE|</div><div class='del'>-				      SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND|</div><div class='del'>-				      SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK));</div><div class='del'>-	kctl.info = ncontrol-&gt;info;</div><div class='del'>-	kctl.get = ncontrol-&gt;get;</div><div class='del'>-	kctl.put = ncontrol-&gt;put;</div><div class='del'>-	kctl.tlv.p = ncontrol-&gt;tlv.p;</div><div class='del'>-	kctl.private_value = ncontrol-&gt;private_value;</div><div class='del'>-	kctl.private_data = private_data;</div><div class='del'>-	return snd_ctl_new(&amp;kctl, access);</div><div class='del'>-}</div><div class='add'>+	kctl-&gt;id.index = ncontrol-&gt;index;</div><div class='add'>+</div><div class='add'>+	kctl-&gt;info = ncontrol-&gt;info;</div><div class='add'>+	kctl-&gt;get = ncontrol-&gt;get;</div><div class='add'>+	kctl-&gt;put = ncontrol-&gt;put;</div><div class='add'>+	kctl-&gt;tlv.p = ncontrol-&gt;tlv.p;</div><div class='add'>+</div><div class='add'>+	kctl-&gt;private_value = ncontrol-&gt;private_value;</div><div class='add'>+	kctl-&gt;private_data = private_data;</div><div class='ctx'> </div><div class='add'>+	return kctl;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_new1);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -276,88 +328,200 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol)</div><div class='ctx'> 		kfree(kcontrol);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_free_one);</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_ctl_hole_check(struct snd_card *card,</div><div class='del'>-				       unsigned int count)</div><div class='add'>+static bool snd_ctl_remove_numid_conflict(struct snd_card *card,</div><div class='add'>+					  unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> </div><div class='add'>+	/* Make sure that the ids assigned to the control do not wrap around */</div><div class='add'>+	if (card-&gt;last_numid &gt;= UINT_MAX - count)</div><div class='add'>+		card-&gt;last_numid = 0;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(kctl, &amp;card-&gt;controls, list) {</div><div class='del'>-		if ((kctl-&gt;id.numid &lt;= card-&gt;last_numid &amp;&amp;</div><div class='del'>-		     kctl-&gt;id.numid + kctl-&gt;count &gt; card-&gt;last_numid) ||</div><div class='del'>-		    (kctl-&gt;id.numid &lt;= card-&gt;last_numid + count - 1 &amp;&amp;</div><div class='del'>-		     kctl-&gt;id.numid + kctl-&gt;count &gt; card-&gt;last_numid + count - 1))</div><div class='del'>-		    	return card-&gt;last_numid = kctl-&gt;id.numid + kctl-&gt;count - 1;</div><div class='add'>+		if (kctl-&gt;id.numid &lt; card-&gt;last_numid + 1 + count &amp;&amp;</div><div class='add'>+		    kctl-&gt;id.numid + kctl-&gt;count &gt; card-&gt;last_numid + 1) {</div><div class='add'>+		    	card-&gt;last_numid = kctl-&gt;id.numid + kctl-&gt;count - 1;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return card-&gt;last_numid;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_find_hole(struct snd_card *card, unsigned int count)</div><div class='ctx'> {</div><div class='del'>-	unsigned int last_numid, iter = 100000;</div><div class='add'>+	unsigned int iter = 100000;</div><div class='ctx'> </div><div class='del'>-	last_numid = card-&gt;last_numid;</div><div class='del'>-	while (last_numid != snd_ctl_hole_check(card, count)) {</div><div class='add'>+	while (snd_ctl_remove_numid_conflict(card, count)) {</div><div class='ctx'> 		if (--iter == 0) {</div><div class='ctx'> 			/* this situation is very unlikely */</div><div class='del'>-			snd_printk(KERN_ERR "unable to allocate new control numid\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to allocate new control numid\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		last_numid = card-&gt;last_numid;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * snd_ctl_add - add the control instance to the card</div><div class='del'>- * @card: the card instance</div><div class='del'>- * @kcontrol: the control instance to add</div><div class='del'>- *</div><div class='del'>- * Adds the control instance created via snd_ctl_new() or</div><div class='del'>- * snd_ctl_new1() to the given card. Assigns also an unique</div><div class='del'>- * numid used for fast search.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='del'>- *</div><div class='del'>- * It frees automatically the control which cannot be added.</div><div class='add'>+/* check whether the given id is contained in the given kctl */</div><div class='add'>+static bool elem_id_matches(const struct snd_kcontrol *kctl,</div><div class='add'>+			    const struct snd_ctl_elem_id *id)</div><div class='add'>+{</div><div class='add'>+	return kctl-&gt;id.iface == id-&gt;iface &amp;&amp;</div><div class='add'>+		kctl-&gt;id.device == id-&gt;device &amp;&amp;</div><div class='add'>+		kctl-&gt;id.subdevice == id-&gt;subdevice &amp;&amp;</div><div class='add'>+		!strncmp(kctl-&gt;id.name, id-&gt;name, sizeof(kctl-&gt;id.name)) &amp;&amp;</div><div class='add'>+		kctl-&gt;id.index &lt;= id-&gt;index &amp;&amp;</div><div class='add'>+		kctl-&gt;id.index + kctl-&gt;count &gt; id-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+/* Compute a hash key for the corresponding ctl id</div><div class='add'>+ * It's for the name lookup, hence the numid is excluded.</div><div class='add'>+ * The hash key is bound in LONG_MAX to be used for Xarray key.</div><div class='ctx'>  */</div><div class='del'>-int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)</div><div class='add'>+#define MULTIPLIER	37</div><div class='add'>+static unsigned long get_ctl_id_hash(const struct snd_ctl_elem_id *id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned long h;</div><div class='add'>+</div><div class='add'>+	h = id-&gt;iface;</div><div class='add'>+	h = MULTIPLIER * h + id-&gt;device;</div><div class='add'>+	h = MULTIPLIER * h + id-&gt;subdevice;</div><div class='add'>+	for (i = 0; i &lt; SNDRV_CTL_ELEM_ID_NAME_MAXLEN &amp;&amp; id-&gt;name[i]; i++)</div><div class='add'>+		h = MULTIPLIER * h + id-&gt;name[i];</div><div class='add'>+	h = MULTIPLIER * h + id-&gt;index;</div><div class='add'>+	h &amp;= LONG_MAX;</div><div class='add'>+	return h;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* add hash entries to numid and ctl xarray tables */</div><div class='add'>+static void add_hash_entries(struct snd_card *card,</div><div class='add'>+			     struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id = kcontrol-&gt;id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	xa_store_range(&amp;card-&gt;ctl_numids, kcontrol-&gt;id.numid,</div><div class='add'>+		       kcontrol-&gt;id.numid + kcontrol-&gt;count - 1,</div><div class='add'>+		       kcontrol, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; kcontrol-&gt;count; i++) {</div><div class='add'>+		id.index = kcontrol-&gt;id.index + i;</div><div class='add'>+		if (xa_insert(&amp;card-&gt;ctl_hash, get_ctl_id_hash(&amp;id),</div><div class='add'>+			      kcontrol, GFP_KERNEL)) {</div><div class='add'>+			/* skip hash for this entry, noting we had collision */</div><div class='add'>+			card-&gt;ctl_hash_collision = true;</div><div class='add'>+			dev_dbg(card-&gt;dev, "ctl_hash collision %d:%s:%d\n",</div><div class='add'>+				id.iface, id.name, id.index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* remove hash entries that have been added */</div><div class='add'>+static void remove_hash_entries(struct snd_card *card,</div><div class='add'>+				struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id = kcontrol-&gt;id;</div><div class='add'>+	struct snd_kcontrol *matched;</div><div class='add'>+	unsigned long h;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; kcontrol-&gt;count; i++) {</div><div class='add'>+		xa_erase(&amp;card-&gt;ctl_numids, id.numid);</div><div class='add'>+		h = get_ctl_id_hash(&amp;id);</div><div class='add'>+		matched = xa_load(&amp;card-&gt;ctl_hash, h);</div><div class='add'>+		if (matched &amp;&amp; (matched == kcontrol ||</div><div class='add'>+				elem_id_matches(matched, &amp;id)))</div><div class='add'>+			xa_erase(&amp;card-&gt;ctl_hash, h);</div><div class='add'>+		id.index++;</div><div class='add'>+		id.numid++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_SND_CTL_FAST_LOOKUP */</div><div class='add'>+static inline void add_hash_entries(struct snd_card *card,</div><div class='add'>+				    struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void remove_hash_entries(struct snd_card *card,</div><div class='add'>+				       struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SND_CTL_FAST_LOOKUP */</div><div class='add'>+</div><div class='add'>+enum snd_ctl_add_mode {</div><div class='add'>+	CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* add/replace a new kcontrol object; call with card-&gt;controls_rwsem locked */</div><div class='add'>+static int __snd_ctl_add_replace(struct snd_card *card,</div><div class='add'>+				 struct snd_kcontrol *kcontrol,</div><div class='add'>+				 enum snd_ctl_add_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_id id;</div><div class='ctx'> 	unsigned int idx;</div><div class='add'>+	struct snd_kcontrol *old;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	id = kcontrol-&gt;id;</div><div class='add'>+	if (id.index &gt; UINT_MAX - kcontrol-&gt;count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	old = snd_ctl_find_id(card, &amp;id);</div><div class='add'>+	if (!old) {</div><div class='add'>+		if (mode == CTL_REPLACE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (mode == CTL_ADD_EXCLUSIVE) {</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"control %i:%i:%i:%s:%i is already present\n",</div><div class='add'>+				id.iface, id.device, id.subdevice, id.name,</div><div class='add'>+				id.index);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = snd_ctl_remove_locked(card, old);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (snd_ctl_find_hole(card, kcontrol-&gt;count) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	scoped_guard(write_lock_irq, &amp;card-&gt;controls_rwlock) {</div><div class='add'>+		list_add_tail(&amp;kcontrol-&gt;list, &amp;card-&gt;controls);</div><div class='add'>+		card-&gt;controls_count += kcontrol-&gt;count;</div><div class='add'>+		kcontrol-&gt;id.numid = card-&gt;last_numid + 1;</div><div class='add'>+		card-&gt;last_numid += kcontrol-&gt;count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_hash_entries(card, kcontrol);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; kcontrol-&gt;count; idx++)</div><div class='add'>+		snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_ADD, kcontrol, idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_add_replace(struct snd_card *card,</div><div class='add'>+			       struct snd_kcontrol *kcontrol,</div><div class='add'>+			       enum snd_ctl_add_mode mode)</div><div class='add'>+{</div><div class='ctx'> 	int err = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (! kcontrol)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (snd_BUG_ON(!card || !kcontrol-&gt;info))</div><div class='ctx'> 		goto error;</div><div class='del'>-	id = kcontrol-&gt;id;</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if (snd_ctl_find_id(card, &amp;id)) {</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		snd_printd(KERN_ERR "control %i:%i:%i:%s:%i is already present\n",</div><div class='del'>-					id.iface,</div><div class='del'>-					id.device,</div><div class='del'>-					id.subdevice,</div><div class='del'>-					id.name,</div><div class='del'>-					id.index);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	if (snd_ctl_find_hole(card, kcontrol-&gt;count) &lt; 0) {</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+</div><div class='add'>+	scoped_guard(rwsem_write, &amp;card-&gt;controls_rwsem)</div><div class='add'>+		err = __snd_ctl_add_replace(card, kcontrol, mode);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;kcontrol-&gt;list, &amp;card-&gt;controls);</div><div class='del'>-	card-&gt;controls_count += kcontrol-&gt;count;</div><div class='del'>-	kcontrol-&gt;id.numid = card-&gt;last_numid + 1;</div><div class='del'>-	card-&gt;last_numid += kcontrol-&gt;count;</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	for (idx = 0; idx &lt; kcontrol-&gt;count; idx++, id.index++, id.numid++)</div><div class='del'>-		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &amp;id);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='hunk'>@@ -365,35 +529,99 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_add - add the control instance to the card</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @kcontrol: the control instance to add</div><div class='add'>+ *</div><div class='add'>+ * Adds the control instance created via snd_ctl_new() or</div><div class='add'>+ * snd_ctl_new1() to the given card. Assigns also an unique</div><div class='add'>+ * numid used for fast search.</div><div class='add'>+ *</div><div class='add'>+ * It frees automatically the control which cannot be added.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_add_replace(card, kcontrol, CTL_ADD_EXCLUSIVE);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_add);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_ctl_remove - remove the control from the card and release it</div><div class='add'>+ * snd_ctl_replace - replace the control instance of the card</div><div class='ctx'>  * @card: the card instance</div><div class='del'>- * @kcontrol: the control instance to remove</div><div class='add'>+ * @kcontrol: the control instance to replace</div><div class='add'>+ * @add_on_replace: add the control if not already added</div><div class='ctx'>  *</div><div class='del'>- * Removes the control from the card and then releases the instance.</div><div class='del'>- * You don't need to call snd_ctl_free_one(). You must be in</div><div class='del'>- * the write lock - down_write(&amp;card-&gt;controls_rwsem).</div><div class='del'>- * </div><div class='del'>- * Returns 0 if successful, or a negative error code on failure.</div><div class='add'>+ * Replaces the given control.  If the given control does not exist</div><div class='add'>+ * and the add_on_replace flag is set, the control is added.  If the</div><div class='add'>+ * control exists, it is destroyed first.</div><div class='add'>+ *</div><div class='add'>+ * It frees automatically the control which cannot be added or replaced.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)</div><div class='add'>+int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol,</div><div class='add'>+		    bool add_on_replace)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_add_replace(card, kcontrol,</div><div class='add'>+				   add_on_replace ? CTL_ADD_ON_REPLACE : CTL_REPLACE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ctl_replace);</div><div class='add'>+</div><div class='add'>+static int __snd_ctl_remove(struct snd_card *card,</div><div class='add'>+			    struct snd_kcontrol *kcontrol,</div><div class='add'>+			    bool remove_hash)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(!card || !kcontrol))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	list_del(&amp;kcontrol-&gt;list);</div><div class='del'>-	card-&gt;controls_count -= kcontrol-&gt;count;</div><div class='del'>-	id = kcontrol-&gt;id;</div><div class='del'>-	for (idx = 0; idx &lt; kcontrol-&gt;count; idx++, id.index++, id.numid++)</div><div class='del'>-		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_REMOVE, &amp;id);</div><div class='add'>+</div><div class='add'>+	if (remove_hash)</div><div class='add'>+		remove_hash_entries(card, kcontrol);</div><div class='add'>+</div><div class='add'>+	scoped_guard(write_lock_irq, &amp;card-&gt;controls_rwlock) {</div><div class='add'>+		list_del(&amp;kcontrol-&gt;list);</div><div class='add'>+		card-&gt;controls_count -= kcontrol-&gt;count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; kcontrol-&gt;count; idx++)</div><div class='add'>+		snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_REMOVE, kcontrol, idx);</div><div class='ctx'> 	snd_ctl_free_one(kcontrol);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int snd_ctl_remove_locked(struct snd_card *card,</div><div class='add'>+					struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	return __snd_ctl_remove(card, kcontrol, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_remove - remove the control from the card and release it</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @kcontrol: the control instance to remove</div><div class='add'>+ *</div><div class='add'>+ * Removes the control from the card and then releases the instance.</div><div class='add'>+ * You don't need to call snd_ctl_free_one().</div><div class='add'>+ * Passing NULL to @kcontrol argument is allowed as noop.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, or a negative error code on failure.</div><div class='add'>+ *</div><div class='add'>+ * Note that this function takes card-&gt;controls_rwsem lock internally.</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	if (!kcontrol)</div><div class='add'>+		return 0;</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	return snd_ctl_remove_locked(card, kcontrol);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_remove);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -403,25 +631,19 @@ EXPORT_SYMBOL(snd_ctl_remove);</div><div class='ctx'>  *</div><div class='ctx'>  * Finds the control instance with the given id, removes it from the</div><div class='ctx'>  * card list and releases it.</div><div class='del'>- * </div><div class='del'>- * Returns 0 if successful, or a negative error code on failure.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ctl_remove_id(struct snd_card *card, struct snd_ctl_elem_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	int ret;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (kctl == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	ret = snd_ctl_remove(card, kctl);</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return ret;</div><div class='add'>+	return snd_ctl_remove_locked(card, kctl);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_remove_id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -431,39 +653,77 @@ EXPORT_SYMBOL(snd_ctl_remove_id);</div><div class='ctx'>  *</div><div class='ctx'>  * Finds the control instance with the given id, removes it from the</div><div class='ctx'>  * card list and releases it.</div><div class='del'>- * </div><div class='del'>- * Returns 0 if successful, or a negative error code on failure.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> static int snd_ctl_remove_user_ctl(struct snd_ctl_file * file,</div><div class='ctx'> 				   struct snd_ctl_elem_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = file-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	int idx, ret;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_id(card, id);</div><div class='add'>+	if (kctl == NULL)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	if (!(kctl-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_USER))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (idx = 0; idx &lt; kctl-&gt;count; idx++)</div><div class='add'>+		if (kctl-&gt;vd[idx].owner != NULL &amp;&amp; kctl-&gt;vd[idx].owner != file)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	return snd_ctl_remove_locked(card, kctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_activate_id - activate/inactivate the control of the given id</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @id: the control id to activate/inactivate</div><div class='add'>+ * @active: non-zero to activate</div><div class='add'>+ *</div><div class='add'>+ * Finds the control instance with the given id, and activate or</div><div class='add'>+ * inactivate the control together with notification, if changed.</div><div class='add'>+ * The given ID data is filled with full information.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if unchanged, 1 if changed, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,</div><div class='add'>+			int active)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_kcontrol_volatile *vd;</div><div class='add'>+	unsigned int index_offset;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	down_write(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, id);</div><div class='ctx'> 	if (kctl == NULL) {</div><div class='ctx'> 		ret = -ENOENT;</div><div class='del'>-		goto error;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='del'>-	if (!(kctl-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_USER)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto error;</div><div class='add'>+	index_offset = snd_ctl_get_ioff(kctl, id);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[index_offset];</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (active) {</div><div class='add'>+		if (!(vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_INACTIVE))</div><div class='add'>+			goto unlock;</div><div class='add'>+		vd-&gt;access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	} else {</div><div class='add'>+		if (vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_INACTIVE)</div><div class='add'>+			goto unlock;</div><div class='add'>+		vd-&gt;access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='ctx'> 	}</div><div class='del'>-	for (idx = 0; idx &lt; kctl-&gt;count; idx++)</div><div class='del'>-		if (kctl-&gt;vd[idx].owner != NULL &amp;&amp; kctl-&gt;vd[idx].owner != file) {</div><div class='del'>-			ret = -EBUSY;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	ret = snd_ctl_remove(card, kctl);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	card-&gt;user_ctl_count--;</div><div class='del'>-error:</div><div class='add'>+	snd_ctl_build_ioff(id, kctl, index_offset);</div><div class='add'>+	downgrade_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_INFO, kctl, index_offset);</div><div class='add'>+	up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	return 1;</div><div class='add'>+</div><div class='add'>+ unlock:</div><div class='ctx'> 	up_write(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_activate_id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_ctl_rename_id - replace the id of a control on the card</div><div class='hunk'>@@ -474,53 +734,96 @@ error:</div><div class='ctx'>  * Finds the control with the old id from the card, and replaces the</div><div class='ctx'>  * id with the new one.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * The function tries to keep the already assigned numid while replacing</div><div class='add'>+ * the rest.</div><div class='add'>+ *</div><div class='add'>+ * Note that this function should be used only in the card initialization</div><div class='add'>+ * phase.  Calling after the card instantiation may cause issues with</div><div class='add'>+ * user-space expecting persistent numids.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id,</div><div class='ctx'> 		      struct snd_ctl_elem_id *dst_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='add'>+	int saved_numid;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, src_id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (kctl == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='add'>+	saved_numid = kctl-&gt;id.numid;</div><div class='add'>+	remove_hash_entries(card, kctl);</div><div class='ctx'> 	kctl-&gt;id = *dst_id;</div><div class='del'>-	kctl-&gt;id.numid = card-&gt;last_numid + 1;</div><div class='del'>-	card-&gt;last_numid += kctl-&gt;count;</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl-&gt;id.numid = saved_numid;</div><div class='add'>+	add_hash_entries(card, kctl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_rename_id);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_ctl_find_numid - find the control instance with the given number-id</div><div class='add'>+ * snd_ctl_rename - rename the control on the card</div><div class='ctx'>  * @card: the card instance</div><div class='del'>- * @numid: the number-id to search</div><div class='del'>- *</div><div class='del'>- * Finds the control instance with the given number-id from the card.</div><div class='add'>+ * @kctl: the control to rename</div><div class='add'>+ * @name: the new name</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the instance if found, or NULL if not.</div><div class='add'>+ * Renames the specified control on the card to the new name.</div><div class='ctx'>  *</div><div class='del'>- * The caller must down card-&gt;controls_rwsem before calling this function</div><div class='del'>- * (if the race condition can happen).</div><div class='add'>+ * Note that this function takes card-&gt;controls_rwsem lock internally.</div><div class='ctx'>  */</div><div class='del'>-struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card, unsigned int numid)</div><div class='add'>+void snd_ctl_rename(struct snd_card *card, struct snd_kcontrol *kctl,</div><div class='add'>+		    const char *name)</div><div class='add'>+{</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	remove_hash_entries(card, kctl);</div><div class='add'>+</div><div class='add'>+	if (strscpy(kctl-&gt;id.name, name, sizeof(kctl-&gt;id.name)) &lt; 0)</div><div class='add'>+		pr_warn("ALSA: Renamed control new name '%s' truncated to '%s'\n",</div><div class='add'>+			name, kctl-&gt;id.name);</div><div class='add'>+</div><div class='add'>+	add_hash_entries(card, kctl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ctl_rename);</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+static struct snd_kcontrol *</div><div class='add'>+snd_ctl_find_numid_slow(struct snd_card *card, unsigned int numid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!card || !numid))</div><div class='del'>-		return NULL;</div><div class='add'>+	guard(read_lock_irqsave)(&amp;card-&gt;controls_rwlock);</div><div class='ctx'> 	list_for_each_entry(kctl, &amp;card-&gt;controls, list) {</div><div class='ctx'> 		if (kctl-&gt;id.numid &lt;= numid &amp;&amp; kctl-&gt;id.numid + kctl-&gt;count &gt; numid)</div><div class='ctx'> 			return kctl;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='add'>+#endif /* !CONFIG_SND_CTL_FAST_LOOKUP */</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_find_numid - find the control instance with the given number-id</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @numid: the number-id to search</div><div class='add'>+ *</div><div class='add'>+ * Finds the control instance with the given number-id from the card.</div><div class='add'>+ *</div><div class='add'>+ * Return: The pointer of the instance if found, or %NULL if not.</div><div class='add'>+ *</div><div class='add'>+ * Note that this function takes card-&gt;controls_rwlock lock internally.</div><div class='add'>+ */</div><div class='add'>+struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card,</div><div class='add'>+					unsigned int numid)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!card || !numid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+	return xa_load(&amp;card-&gt;ctl_numids, numid);</div><div class='add'>+#else</div><div class='add'>+	return snd_ctl_find_numid_slow(card, numid);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_find_numid);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -530,145 +833,304 @@ EXPORT_SYMBOL(snd_ctl_find_numid);</div><div class='ctx'>  *</div><div class='ctx'>  * Finds the control instance with the given id from the card.</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the instance if found, or NULL if not.</div><div class='add'>+ * Return: The pointer of the instance if found, or %NULL if not.</div><div class='ctx'>  *</div><div class='del'>- * The caller must down card-&gt;controls_rwsem before calling this function</div><div class='del'>- * (if the race condition can happen).</div><div class='add'>+ * Note that this function takes card-&gt;controls_rwlock lock internally.</div><div class='ctx'>  */</div><div class='ctx'> struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card,</div><div class='del'>-				     struct snd_ctl_elem_id *id)</div><div class='add'>+				     const struct snd_ctl_elem_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card || !id))</div><div class='ctx'> 		return NULL;</div><div class='add'>+</div><div class='ctx'> 	if (id-&gt;numid != 0)</div><div class='ctx'> 		return snd_ctl_find_numid(card, id-&gt;numid);</div><div class='del'>-	list_for_each_entry(kctl, &amp;card-&gt;controls, list) {</div><div class='del'>-		if (kctl-&gt;id.iface != id-&gt;iface)</div><div class='del'>-			continue;</div><div class='del'>-		if (kctl-&gt;id.device != id-&gt;device)</div><div class='del'>-			continue;</div><div class='del'>-		if (kctl-&gt;id.subdevice != id-&gt;subdevice)</div><div class='del'>-			continue;</div><div class='del'>-		if (strncmp(kctl-&gt;id.name, id-&gt;name, sizeof(kctl-&gt;id.name)))</div><div class='del'>-			continue;</div><div class='del'>-		if (kctl-&gt;id.index &gt; id-&gt;index)</div><div class='del'>-			continue;</div><div class='del'>-		if (kctl-&gt;id.index + kctl-&gt;count &lt;= id-&gt;index)</div><div class='del'>-			continue;</div><div class='add'>+#ifdef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+	kctl = xa_load(&amp;card-&gt;ctl_hash, get_ctl_id_hash(id));</div><div class='add'>+	if (kctl &amp;&amp; elem_id_matches(kctl, id))</div><div class='ctx'> 		return kctl;</div><div class='del'>-	}</div><div class='add'>+	if (!card-&gt;ctl_hash_collision)</div><div class='add'>+		return NULL; /* we can rely on only hash table */</div><div class='add'>+#endif</div><div class='add'>+	/* no matching in hash table - try all as the last resort */</div><div class='add'>+	guard(read_lock_irqsave)(&amp;card-&gt;controls_rwlock);</div><div class='add'>+	list_for_each_entry(kctl, &amp;card-&gt;controls, list)</div><div class='add'>+		if (elem_id_matches(kctl, id))</div><div class='add'>+			return kctl;</div><div class='add'>+</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_find_id);</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_card_info(struct snd_card *card, struct snd_ctl_file * ctl,</div><div class='ctx'> 			     unsigned int cmd, void __user *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_card_info *info;</div><div class='add'>+	struct snd_ctl_card_info *info __free(kfree) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='ctx'> 	if (! info)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	down_read(&amp;snd_ioctl_rwsem);</div><div class='del'>-	info-&gt;card = card-&gt;number;</div><div class='del'>-	strlcpy(info-&gt;id, card-&gt;id, sizeof(info-&gt;id));</div><div class='del'>-	strlcpy(info-&gt;driver, card-&gt;driver, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;name, card-&gt;shortname, sizeof(info-&gt;name));</div><div class='del'>-	strlcpy(info-&gt;longname, card-&gt;longname, sizeof(info-&gt;longname));</div><div class='del'>-	strlcpy(info-&gt;mixername, card-&gt;mixername, sizeof(info-&gt;mixername));</div><div class='del'>-	strlcpy(info-&gt;components, card-&gt;components, sizeof(info-&gt;components));</div><div class='del'>-	up_read(&amp;snd_ioctl_rwsem);</div><div class='del'>-	if (copy_to_user(arg, info, sizeof(struct snd_ctl_card_info))) {</div><div class='del'>-		kfree(info);</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	scoped_guard(rwsem_read, &amp;snd_ioctl_rwsem) {</div><div class='add'>+		info-&gt;card = card-&gt;number;</div><div class='add'>+		strscpy(info-&gt;id, card-&gt;id, sizeof(info-&gt;id));</div><div class='add'>+		strscpy(info-&gt;driver, card-&gt;driver, sizeof(info-&gt;driver));</div><div class='add'>+		strscpy(info-&gt;name, card-&gt;shortname, sizeof(info-&gt;name));</div><div class='add'>+		strscpy(info-&gt;longname, card-&gt;longname, sizeof(info-&gt;longname));</div><div class='add'>+		strscpy(info-&gt;mixername, card-&gt;mixername, sizeof(info-&gt;mixername));</div><div class='add'>+		strscpy(info-&gt;components, card-&gt;components, sizeof(info-&gt;components));</div><div class='ctx'> 	}</div><div class='del'>-	kfree(info);</div><div class='add'>+	if (copy_to_user(arg, info, sizeof(struct snd_ctl_card_info)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_list(struct snd_card *card,</div><div class='del'>-			     struct snd_ctl_elem_list __user *_list)</div><div class='add'>+			     struct snd_ctl_elem_list *list)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *plist;</div><div class='del'>-	struct snd_ctl_elem_list list;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	struct snd_ctl_elem_id *dst, *id;</div><div class='del'>-	unsigned int offset, space, first, jidx;</div><div class='del'>-	</div><div class='del'>-	if (copy_from_user(&amp;list, _list, sizeof(list)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	offset = list.offset;</div><div class='del'>-	space = list.space;</div><div class='del'>-	first = 0;</div><div class='del'>-	/* try limit maximum space */</div><div class='del'>-	if (space &gt; 16384)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (space &gt; 0) {</div><div class='del'>-		/* allocate temporary buffer for atomic operation */</div><div class='del'>-		dst = vmalloc(space * sizeof(struct snd_ctl_elem_id));</div><div class='del'>-		if (dst == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		list.count = card-&gt;controls_count;</div><div class='del'>-		plist = card-&gt;controls.next;</div><div class='del'>-		while (plist != &amp;card-&gt;controls) {</div><div class='del'>-			if (offset == 0)</div><div class='del'>-				break;</div><div class='del'>-			kctl = snd_kcontrol(plist);</div><div class='del'>-			if (offset &lt; kctl-&gt;count)</div><div class='del'>-				break;</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+	unsigned int offset, space, jidx;</div><div class='add'>+</div><div class='add'>+	offset = list-&gt;offset;</div><div class='add'>+	space = list-&gt;space;</div><div class='add'>+</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	list-&gt;count = card-&gt;controls_count;</div><div class='add'>+	list-&gt;used = 0;</div><div class='add'>+	if (!space)</div><div class='add'>+		return 0;</div><div class='add'>+	list_for_each_entry(kctl, &amp;card-&gt;controls, list) {</div><div class='add'>+		if (offset &gt;= kctl-&gt;count) {</div><div class='ctx'> 			offset -= kctl-&gt;count;</div><div class='del'>-			plist = plist-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		list.used = 0;</div><div class='del'>-		id = dst;</div><div class='del'>-		while (space &gt; 0 &amp;&amp; plist != &amp;card-&gt;controls) {</div><div class='del'>-			kctl = snd_kcontrol(plist);</div><div class='del'>-			for (jidx = offset; space &gt; 0 &amp;&amp; jidx &lt; kctl-&gt;count; jidx++) {</div><div class='del'>-				snd_ctl_build_ioff(id, kctl, jidx);</div><div class='del'>-				id++;</div><div class='del'>-				space--;</div><div class='del'>-				list.used++;</div><div class='del'>-			}</div><div class='del'>-			plist = plist-&gt;next;</div><div class='del'>-			offset = 0;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		if (list.used &gt; 0 &amp;&amp;</div><div class='del'>-		    copy_to_user(list.pids, dst,</div><div class='del'>-				 list.used * sizeof(struct snd_ctl_elem_id))) {</div><div class='del'>-			vfree(dst);</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		for (jidx = offset; jidx &lt; kctl-&gt;count; jidx++) {</div><div class='add'>+			snd_ctl_build_ioff(&amp;id, kctl, jidx);</div><div class='add'>+			if (copy_to_user(list-&gt;pids + list-&gt;used, &amp;id, sizeof(id)))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			list-&gt;used++;</div><div class='add'>+			if (!--space)</div><div class='add'>+				return 0;</div><div class='ctx'> 		}</div><div class='del'>-		vfree(dst);</div><div class='del'>-	} else {</div><div class='del'>-		down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		list.count = card-&gt;controls_count;</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+		offset = 0;</div><div class='ctx'> 	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_elem_list_user(struct snd_card *card,</div><div class='add'>+				  struct snd_ctl_elem_list __user *_list)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_list list;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;list, _list, sizeof(list)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	err = snd_ctl_elem_list(card, &amp;list);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> 	if (copy_to_user(_list, &amp;list, sizeof(list)))</div><div class='ctx'> 		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ctl_elem_info(struct snd_ctl_file *ctl,</div><div class='del'>-			     struct snd_ctl_elem_info *info)</div><div class='add'>+/* Check whether the given kctl info is valid */</div><div class='add'>+static int snd_ctl_check_elem_info(struct snd_card *card,</div><div class='add'>+				   const struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int max_value_counts[] = {</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_BOOLEAN]	= 128,</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_INTEGER]	= 128,</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_ENUMERATED] = 128,</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_BYTES]	= 512,</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_IEC958]	= 1,</div><div class='add'>+		[SNDRV_CTL_ELEM_TYPE_INTEGER64] = 64,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (info-&gt;type &lt; SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='add'>+	    info-&gt;type &gt; SNDRV_CTL_ELEM_TYPE_INTEGER64) {</div><div class='add'>+		if (card)</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"control %i:%i:%i:%s:%i: invalid type %d\n",</div><div class='add'>+				info-&gt;id.iface, info-&gt;id.device,</div><div class='add'>+				info-&gt;id.subdevice, info-&gt;id.name,</div><div class='add'>+				info-&gt;id.index, info-&gt;type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;type == SNDRV_CTL_ELEM_TYPE_ENUMERATED &amp;&amp;</div><div class='add'>+	    info-&gt;value.enumerated.items == 0) {</div><div class='add'>+		if (card)</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"control %i:%i:%i:%s:%i: zero enum items\n",</div><div class='add'>+				info-&gt;id.iface, info-&gt;id.device,</div><div class='add'>+				info-&gt;id.subdevice, info-&gt;id.name,</div><div class='add'>+				info-&gt;id.index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;count &gt; max_value_counts[info-&gt;type]) {</div><div class='add'>+		if (card)</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"control %i:%i:%i:%s:%i: invalid count %d\n",</div><div class='add'>+				info-&gt;id.iface, info-&gt;id.device,</div><div class='add'>+				info-&gt;id.subdevice, info-&gt;id.name,</div><div class='add'>+				info-&gt;id.index, info-&gt;count);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The capacity of struct snd_ctl_elem_value.value.*/</div><div class='add'>+static const unsigned int value_sizes[] = {</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_BOOLEAN]	= sizeof(long),</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_INTEGER]	= sizeof(long),</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_ENUMERATED] = sizeof(unsigned int),</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_BYTES]	= sizeof(unsigned char),</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_IEC958]	= sizeof(struct snd_aes_iec958),</div><div class='add'>+	[SNDRV_CTL_ELEM_TYPE_INTEGER64] = sizeof(long long),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* fill the remaining snd_ctl_elem_value data with the given pattern */</div><div class='add'>+static void fill_remaining_elem_value(struct snd_ctl_elem_value *control,</div><div class='add'>+				      struct snd_ctl_elem_info *info,</div><div class='add'>+				      u32 pattern)</div><div class='add'>+{</div><div class='add'>+	size_t offset = value_sizes[info-&gt;type] * info-&gt;count;</div><div class='add'>+</div><div class='add'>+	offset = DIV_ROUND_UP(offset, sizeof(u32));</div><div class='add'>+	memset32((u32 *)control-&gt;value.bytes.data + offset, pattern,</div><div class='add'>+		 sizeof(control-&gt;value) / sizeof(u32) - offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the given integer ctl value is valid */</div><div class='add'>+static int sanity_check_int_value(struct snd_card *card,</div><div class='add'>+				  const struct snd_ctl_elem_value *control,</div><div class='add'>+				  const struct snd_ctl_elem_info *info,</div><div class='add'>+				  int i, bool print_error)</div><div class='add'>+{</div><div class='add'>+	long long lval, lmin, lmax, lstep;</div><div class='add'>+	u64 rem;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;type) {</div><div class='add'>+	default:</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='add'>+		lval = control-&gt;value.integer.value[i];</div><div class='add'>+		lmin = 0;</div><div class='add'>+		lmax = 1;</div><div class='add'>+		lstep = 0;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='add'>+		lval = control-&gt;value.integer.value[i];</div><div class='add'>+		lmin = info-&gt;value.integer.min;</div><div class='add'>+		lmax = info-&gt;value.integer.max;</div><div class='add'>+		lstep = info-&gt;value.integer.step;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='add'>+		lval = control-&gt;value.integer64.value[i];</div><div class='add'>+		lmin = info-&gt;value.integer64.min;</div><div class='add'>+		lmax = info-&gt;value.integer64.max;</div><div class='add'>+		lstep = info-&gt;value.integer64.step;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='add'>+		lval = control-&gt;value.enumerated.item[i];</div><div class='add'>+		lmin = 0;</div><div class='add'>+		lmax = info-&gt;value.enumerated.items - 1;</div><div class='add'>+		lstep = 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lval &lt; lmin || lval &gt; lmax) {</div><div class='add'>+		if (print_error)</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"control %i:%i:%i:%s:%i: value out of range %lld (%lld/%lld) at count %i\n",</div><div class='add'>+				control-&gt;id.iface, control-&gt;id.device,</div><div class='add'>+				control-&gt;id.subdevice, control-&gt;id.name,</div><div class='add'>+				control-&gt;id.index, lval, lmin, lmax, i);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (lstep) {</div><div class='add'>+		div64_u64_rem(lval, lstep, &amp;rem);</div><div class='add'>+		if (rem) {</div><div class='add'>+			if (print_error)</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"control %i:%i:%i:%s:%i: unaligned value %lld (step %lld) at count %i\n",</div><div class='add'>+					control-&gt;id.iface, control-&gt;id.device,</div><div class='add'>+					control-&gt;id.subdevice, control-&gt;id.name,</div><div class='add'>+					control-&gt;id.index, lval, lstep, i);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the all input values are valid for the given elem value */</div><div class='add'>+static int sanity_check_input_values(struct snd_card *card,</div><div class='add'>+				     const struct snd_ctl_elem_value *control,</div><div class='add'>+				     const struct snd_ctl_elem_info *info,</div><div class='add'>+				     bool print_error)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;type) {</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='add'>+		for (i = 0; i &lt; info-&gt;count; i++) {</div><div class='add'>+			ret = sanity_check_int_value(card, control, info, i,</div><div class='add'>+						     print_error);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* perform sanity checks to the given snd_ctl_elem_value object */</div><div class='add'>+static int sanity_check_elem_value(struct snd_card *card,</div><div class='add'>+				   const struct snd_ctl_elem_value *control,</div><div class='add'>+				   const struct snd_ctl_elem_info *info,</div><div class='add'>+				   u32 pattern)</div><div class='add'>+{</div><div class='add'>+	size_t offset;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 *p;</div><div class='add'>+</div><div class='add'>+	ret = sanity_check_input_values(card, control, info, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* check whether the remaining area kept untouched */</div><div class='add'>+	offset = value_sizes[info-&gt;type] * info-&gt;count;</div><div class='add'>+	offset = DIV_ROUND_UP(offset, sizeof(u32));</div><div class='add'>+	p = (u32 *)control-&gt;value.bytes.data + offset;</div><div class='add'>+	for (; offset &lt; sizeof(control-&gt;value) / sizeof(u32); offset++, p++) {</div><div class='add'>+		if (*p != pattern) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		*p = 0; /* clear the checked area */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __snd_ctl_elem_info(struct snd_card *card,</div><div class='add'>+			       struct snd_kcontrol *kctl,</div><div class='add'>+			       struct snd_ctl_elem_info *info,</div><div class='add'>+			       struct snd_ctl_file *ctl)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = ctl-&gt;card;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='ctx'> 	unsigned int index_offset;</div><div class='ctx'> 	int result;</div><div class='del'>-	</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	kctl = snd_ctl_find_id(card, &amp;info-&gt;id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	info-&gt;access = 0;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -687,27 +1149,47 @@ static int snd_ctl_elem_info(struct snd_ctl_file *ctl,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			info-&gt;owner = -1;</div><div class='ctx'> 		}</div><div class='add'>+		if (!snd_ctl_skip_validation(info) &amp;&amp;</div><div class='add'>+		    snd_ctl_check_elem_info(card, info) &lt; 0)</div><div class='add'>+			result = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_ctl_elem_info(struct snd_ctl_file *ctl,</div><div class='add'>+			     struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = ctl-&gt;card;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_id(card, &amp;info-&gt;id);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	return __snd_ctl_elem_info(card, kctl, info, ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_ctl_elem_info_user(struct snd_ctl_file *ctl,</div><div class='ctx'> 				  struct snd_ctl_elem_info __user *_info)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card = ctl-&gt;card;</div><div class='ctx'> 	struct snd_ctl_elem_info info;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;info, _info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	snd_power_lock(ctl-&gt;card);</div><div class='del'>-	result = snd_power_wait(ctl-&gt;card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		result = snd_ctl_elem_info(ctl, &amp;info);</div><div class='del'>-	snd_power_unlock(ctl-&gt;card);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+	result = snd_power_ref_and_wait(card);</div><div class='add'>+	if (result)</div><div class='add'>+		return result;</div><div class='add'>+	result = snd_ctl_elem_info(ctl, &amp;info);</div><div class='add'>+	snd_power_unref(card);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+	/* drop internal access flags */</div><div class='add'>+	info.access &amp;= ~(SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK|</div><div class='add'>+			 SNDRV_CTL_ELEM_ACCESS_LED_MASK);</div><div class='add'>+	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -717,45 +1199,68 @@ static int snd_ctl_elem_read(struct snd_card *card,</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='ctx'> 	unsigned int index_offset;</div><div class='del'>-	int result;</div><div class='add'>+	struct snd_ctl_elem_info info;</div><div class='add'>+	const u32 pattern = 0xdeadbeef;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, &amp;control-&gt;id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		result = -ENOENT;</div><div class='del'>-	} else {</div><div class='del'>-		index_offset = snd_ctl_get_ioff(kctl, &amp;control-&gt;id);</div><div class='del'>-		vd = &amp;kctl-&gt;vd[index_offset];</div><div class='del'>-		if ((vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_READ) &amp;&amp;</div><div class='del'>-		    kctl-&gt;get != NULL) {</div><div class='del'>-			snd_ctl_build_ioff(&amp;control-&gt;id, kctl, index_offset);</div><div class='del'>-			result = kctl-&gt;get(kctl, control);</div><div class='del'>-		} else</div><div class='del'>-			result = -EPERM;</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	index_offset = snd_ctl_get_ioff(kctl, &amp;control-&gt;id);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[index_offset];</div><div class='add'>+	if (!(vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_READ) || !kctl-&gt;get)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	snd_ctl_build_ioff(&amp;control-&gt;id, kctl, index_offset);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_CTL_DEBUG</div><div class='add'>+	/* info is needed only for validation */</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.id = control-&gt;id;</div><div class='add'>+	ret = __snd_ctl_elem_info(card, kctl, &amp;info, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (!snd_ctl_skip_validation(&amp;info))</div><div class='add'>+		fill_remaining_elem_value(control, &amp;info, pattern);</div><div class='add'>+	ret = kctl-&gt;get(kctl, control);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	if (!snd_ctl_skip_validation(&amp;info) &amp;&amp;</div><div class='add'>+	    sanity_check_elem_value(card, control, &amp;info, pattern) &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"control %i:%i:%i:%s:%i: access overflow\n",</div><div class='add'>+			control-&gt;id.iface, control-&gt;id.device,</div><div class='add'>+			control-&gt;id.subdevice, control-&gt;id.name,</div><div class='add'>+			control-&gt;id.index);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_read_user(struct snd_card *card,</div><div class='ctx'> 				  struct snd_ctl_elem_value __user *_control)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_value *control;</div><div class='add'>+	struct snd_ctl_elem_value *control __free(kfree) = NULL;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	control = memdup_user(_control, sizeof(*control));</div><div class='ctx'> 	if (IS_ERR(control))</div><div class='ctx'> 		return PTR_ERR(control);</div><div class='ctx'> </div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		result = snd_ctl_elem_read(card, control);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		if (copy_to_user(_control, control, sizeof(*control)))</div><div class='del'>-			result = -EFAULT;</div><div class='del'>-	kfree(control);</div><div class='add'>+	result = snd_power_ref_and_wait(card);</div><div class='add'>+	if (result)</div><div class='add'>+		return result;</div><div class='add'>+	result = snd_ctl_elem_read(card, control);</div><div class='add'>+	snd_power_unref(card);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(_control, control, sizeof(*control)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -765,38 +1270,57 @@ static int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='ctx'> 	unsigned int index_offset;</div><div class='del'>-	int result;</div><div class='add'>+	int result = 0;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	down_write(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, &amp;control-&gt;id);</div><div class='ctx'> 	if (kctl == NULL) {</div><div class='del'>-		result = -ENOENT;</div><div class='add'>+		up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index_offset = snd_ctl_get_ioff(kctl, &amp;control-&gt;id);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[index_offset];</div><div class='add'>+	if (!(vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_WRITE) || kctl-&gt;put == NULL ||</div><div class='add'>+	    (file &amp;&amp; vd-&gt;owner &amp;&amp; vd-&gt;owner != file)) {</div><div class='add'>+		up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_ctl_build_ioff(&amp;control-&gt;id, kctl, index_offset);</div><div class='add'>+	/* validate input values */</div><div class='add'>+	if (IS_ENABLED(CONFIG_SND_CTL_INPUT_VALIDATION)) {</div><div class='add'>+		struct snd_ctl_elem_info info;</div><div class='add'>+</div><div class='add'>+		memset(&amp;info, 0, sizeof(info));</div><div class='add'>+		info.id = control-&gt;id;</div><div class='add'>+		result = __snd_ctl_elem_info(card, kctl, &amp;info, NULL);</div><div class='add'>+		if (!result)</div><div class='add'>+			result = sanity_check_input_values(card, control, &amp;info,</div><div class='add'>+							   false);</div><div class='add'>+	}</div><div class='add'>+	if (!result)</div><div class='add'>+		result = kctl-&gt;put(kctl, control);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+		return result;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result &gt; 0) {</div><div class='add'>+		downgrade_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+		snd_ctl_notify_one(card, SNDRV_CTL_EVENT_MASK_VALUE, kctl, index_offset);</div><div class='add'>+		up_read(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	} else {</div><div class='del'>-		index_offset = snd_ctl_get_ioff(kctl, &amp;control-&gt;id);</div><div class='del'>-		vd = &amp;kctl-&gt;vd[index_offset];</div><div class='del'>-		if (!(vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_WRITE) ||</div><div class='del'>-		    kctl-&gt;put == NULL ||</div><div class='del'>-		    (file &amp;&amp; vd-&gt;owner &amp;&amp; vd-&gt;owner != file)) {</div><div class='del'>-			result = -EPERM;</div><div class='del'>-		} else {</div><div class='del'>-			snd_ctl_build_ioff(&amp;control-&gt;id, kctl, index_offset);</div><div class='del'>-			result = kctl-&gt;put(kctl, control);</div><div class='del'>-		}</div><div class='del'>-		if (result &gt; 0) {</div><div class='del'>-			up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-			snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-				       &amp;control-&gt;id);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		up_write(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return result;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_write_user(struct snd_ctl_file *file,</div><div class='ctx'> 				   struct snd_ctl_elem_value __user *_control)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_value *control;</div><div class='add'>+	struct snd_ctl_elem_value *control __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='hunk'>@@ -805,15 +1329,16 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file,</div><div class='ctx'> 		return PTR_ERR(control);</div><div class='ctx'> </div><div class='ctx'> 	card = file-&gt;card;</div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		result = snd_ctl_elem_write(card, file, control);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		if (copy_to_user(_control, control, sizeof(*control)))</div><div class='del'>-			result = -EFAULT;</div><div class='del'>-	kfree(control);</div><div class='add'>+	result = snd_power_ref_and_wait(card);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+	result = snd_ctl_elem_write(card, file, control);</div><div class='add'>+	snd_power_unref(card);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(_control, control, sizeof(*control)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -824,25 +1349,18 @@ static int snd_ctl_elem_lock(struct snd_ctl_file *file,</div><div class='ctx'> 	struct snd_ctl_elem_id id;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='del'>-	int result;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;id, _id, sizeof(id)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, &amp;id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		result = -ENOENT;</div><div class='del'>-	} else {</div><div class='del'>-		vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, &amp;id)];</div><div class='del'>-		if (vd-&gt;owner != NULL)</div><div class='del'>-			result = -EBUSY;</div><div class='del'>-		else {</div><div class='del'>-			vd-&gt;owner = file;</div><div class='del'>-			result = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return result;</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, &amp;id)];</div><div class='add'>+	if (vd-&gt;owner)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	vd-&gt;owner = file;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_unlock(struct snd_ctl_file *file,</div><div class='hunk'>@@ -852,107 +1370,244 @@ static int snd_ctl_elem_unlock(struct snd_ctl_file *file,</div><div class='ctx'> 	struct snd_ctl_elem_id id;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='del'>-	int result;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;id, _id, sizeof(id)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, &amp;id);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		result = -ENOENT;</div><div class='del'>-	} else {</div><div class='del'>-		vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, &amp;id)];</div><div class='del'>-		if (vd-&gt;owner == NULL)</div><div class='del'>-			result = -EINVAL;</div><div class='del'>-		else if (vd-&gt;owner != file)</div><div class='del'>-			result = -EPERM;</div><div class='del'>-		else {</div><div class='del'>-			vd-&gt;owner = NULL;</div><div class='del'>-			result = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return result;</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, &amp;id)];</div><div class='add'>+	if (!vd-&gt;owner)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (vd-&gt;owner != file)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	vd-&gt;owner = NULL;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct user_element {</div><div class='ctx'> 	struct snd_ctl_elem_info info;</div><div class='del'>-	void *elem_data;		/* element data */</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	char *elem_data;		/* element data */</div><div class='ctx'> 	unsigned long elem_data_size;	/* size of element data in bytes */</div><div class='ctx'> 	void *tlv_data;			/* TLV data */</div><div class='ctx'> 	unsigned long tlv_data_size;	/* TLV data size */</div><div class='ctx'> 	void *priv_data;		/* private data (like strings for enumerated type) */</div><div class='del'>-	unsigned long priv_data_size;	/* size of private data in bytes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+// check whether the addition (in bytes) of user ctl element may overflow the limit.</div><div class='add'>+static bool check_user_elem_overflow(struct snd_card *card, ssize_t add)</div><div class='add'>+{</div><div class='add'>+	return (ssize_t)card-&gt;user_ctl_alloc_size + add &gt; max_user_ctl_alloc_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct user_element *ue = kcontrol-&gt;private_data;</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int offset;</div><div class='ctx'> </div><div class='add'>+	offset = snd_ctl_get_ioff(kcontrol, &amp;uinfo-&gt;id);</div><div class='ctx'> 	*uinfo = ue-&gt;info;</div><div class='add'>+	snd_ctl_build_ioff(&amp;uinfo-&gt;id, kcontrol, offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_elem_user_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				       struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	const char *names;</div><div class='add'>+	unsigned int item;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	item = uinfo-&gt;value.enumerated.item;</div><div class='add'>+</div><div class='add'>+	offset = snd_ctl_get_ioff(kcontrol, &amp;uinfo-&gt;id);</div><div class='add'>+	*uinfo = ue-&gt;info;</div><div class='add'>+	snd_ctl_build_ioff(&amp;uinfo-&gt;id, kcontrol, offset);</div><div class='add'>+</div><div class='add'>+	item = min(item, uinfo-&gt;value.enumerated.items - 1);</div><div class='add'>+	uinfo-&gt;value.enumerated.item = item;</div><div class='add'>+</div><div class='add'>+	names = ue-&gt;priv_data;</div><div class='add'>+	for (; item &gt; 0; --item)</div><div class='add'>+		names += strlen(names) + 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, names);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_user_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct user_element *ue = kcontrol-&gt;private_data;</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int size = ue-&gt;elem_data_size;</div><div class='add'>+	char *src = ue-&gt;elem_data +</div><div class='add'>+			snd_ctl_get_ioff(kcontrol, &amp;ucontrol-&gt;id) * size;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;ucontrol-&gt;value, ue-&gt;elem_data, ue-&gt;elem_data_size);</div><div class='add'>+	memcpy(&amp;ucontrol-&gt;value, src, size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_user_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	int change;</div><div class='del'>-	struct user_element *ue = kcontrol-&gt;private_data;</div><div class='del'>-	</div><div class='del'>-	change = memcmp(&amp;ucontrol-&gt;value, ue-&gt;elem_data, ue-&gt;elem_data_size) != 0;</div><div class='add'>+	int err, change;</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int size = ue-&gt;elem_data_size;</div><div class='add'>+	char *dst = ue-&gt;elem_data +</div><div class='add'>+			snd_ctl_get_ioff(kcontrol, &amp;ucontrol-&gt;id) * size;</div><div class='add'>+</div><div class='add'>+	err = sanity_check_input_values(ue-&gt;card, ucontrol, &amp;ue-&gt;info, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	change = memcmp(&amp;ucontrol-&gt;value, dst, size) != 0;</div><div class='ctx'> 	if (change)</div><div class='del'>-		memcpy(ue-&gt;elem_data, &amp;ucontrol-&gt;value, ue-&gt;elem_data_size);</div><div class='add'>+		memcpy(dst, &amp;ucontrol-&gt;value, size);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 int op_flag,</div><div class='del'>-				 unsigned int size,</div><div class='del'>-				 unsigned int __user *tlv)</div><div class='add'>+/* called in controls_rwsem write lock */</div><div class='add'>+static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,</div><div class='add'>+			    unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	struct user_element *ue = kcontrol-&gt;private_data;</div><div class='del'>-	int change = 0;</div><div class='del'>-	void *new_data;</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kctl);</div><div class='add'>+	unsigned int *container;</div><div class='add'>+	unsigned int mask = 0;</div><div class='add'>+	int i;</div><div class='add'>+	int change;</div><div class='ctx'> </div><div class='del'>-	if (op_flag &gt; 0) {</div><div class='del'>-		if (size &gt; 1024 * 128)	/* sane value */</div><div class='del'>-			return -EINVAL;</div><div class='add'>+	lockdep_assert_held_write(&amp;ue-&gt;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	if (size &gt; 1024 * 128)	/* sane value */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// does the TLV size change cause overflow?</div><div class='add'>+	if (check_user_elem_overflow(ue-&gt;card, (ssize_t)(size - ue-&gt;tlv_data_size)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	container = vmemdup_user(buf, size);</div><div class='add'>+	if (IS_ERR(container))</div><div class='add'>+		return PTR_ERR(container);</div><div class='ctx'> </div><div class='del'>-		new_data = memdup_user(tlv, size);</div><div class='del'>-		if (IS_ERR(new_data))</div><div class='del'>-			return PTR_ERR(new_data);</div><div class='del'>-		change = ue-&gt;tlv_data_size != size;</div><div class='del'>-		if (!change)</div><div class='del'>-			change = memcmp(ue-&gt;tlv_data, new_data, size);</div><div class='del'>-		kfree(ue-&gt;tlv_data);</div><div class='del'>-		ue-&gt;tlv_data = new_data;</div><div class='del'>-		ue-&gt;tlv_data_size = size;</div><div class='add'>+	change = ue-&gt;tlv_data_size != size;</div><div class='add'>+	if (!change)</div><div class='add'>+		change = memcmp(ue-&gt;tlv_data, container, size) != 0;</div><div class='add'>+	if (!change) {</div><div class='add'>+		kvfree(container);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ue-&gt;tlv_data == NULL) {</div><div class='add'>+		/* Now TLV data is available. */</div><div class='add'>+		for (i = 0; i &lt; kctl-&gt;count; ++i)</div><div class='add'>+			kctl-&gt;vd[i].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='add'>+		mask = SNDRV_CTL_EVENT_MASK_INFO;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (! ue-&gt;tlv_data_size || ! ue-&gt;tlv_data)</div><div class='del'>-			return -ENXIO;</div><div class='del'>-		if (size &lt; ue-&gt;tlv_data_size)</div><div class='del'>-			return -ENOSPC;</div><div class='del'>-		if (copy_to_user(tlv, ue-&gt;tlv_data, ue-&gt;tlv_data_size))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		ue-&gt;card-&gt;user_ctl_alloc_size -= ue-&gt;tlv_data_size;</div><div class='add'>+		ue-&gt;tlv_data_size = 0;</div><div class='add'>+		kvfree(ue-&gt;tlv_data);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ue-&gt;tlv_data = container;</div><div class='add'>+	ue-&gt;tlv_data_size = size;</div><div class='add'>+	// decremented at private_free.</div><div class='add'>+	ue-&gt;card-&gt;user_ctl_alloc_size += size;</div><div class='add'>+</div><div class='add'>+	mask |= SNDRV_CTL_EVENT_MASK_TLV;</div><div class='add'>+	for (i = 0; i &lt; kctl-&gt;count; ++i)</div><div class='add'>+		snd_ctl_notify_one(ue-&gt;card, mask, kctl, i);</div><div class='add'>+</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int read_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,</div><div class='add'>+			 unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kctl);</div><div class='add'>+</div><div class='add'>+	if (ue-&gt;tlv_data_size == 0 || ue-&gt;tlv_data == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (size &lt; ue-&gt;tlv_data_size)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, ue-&gt;tlv_data, ue-&gt;tlv_data_size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kctl, int op_flag,</div><div class='add'>+				 unsigned int size, unsigned int __user *buf)</div><div class='add'>+{</div><div class='add'>+	if (op_flag == SNDRV_CTL_TLV_OP_WRITE)</div><div class='add'>+		return replace_user_tlv(kctl, buf, size);</div><div class='add'>+	else</div><div class='add'>+		return read_user_tlv(kctl, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called in controls_rwsem write lock */</div><div class='add'>+static int snd_ctl_elem_init_enum_names(struct user_element *ue)</div><div class='add'>+{</div><div class='add'>+	char *names, *p;</div><div class='add'>+	size_t buf_len, name_len;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	const uintptr_t user_ptrval = ue-&gt;info.value.enumerated.names_ptr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held_write(&amp;ue-&gt;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	buf_len = ue-&gt;info.value.enumerated.names_length;</div><div class='add'>+	if (buf_len &gt; 64 * 1024)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (check_user_elem_overflow(ue-&gt;card, buf_len))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	names = vmemdup_user((const void __user *)user_ptrval, buf_len);</div><div class='add'>+	if (IS_ERR(names))</div><div class='add'>+		return PTR_ERR(names);</div><div class='add'>+</div><div class='add'>+	/* check that there are enough valid names */</div><div class='add'>+	p = names;</div><div class='add'>+	for (i = 0; i &lt; ue-&gt;info.value.enumerated.items; ++i) {</div><div class='add'>+		name_len = strnlen(p, buf_len);</div><div class='add'>+		if (name_len == 0 || name_len &gt;= 64 || name_len == buf_len) {</div><div class='add'>+			kvfree(names);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		p += name_len + 1;</div><div class='add'>+		buf_len -= name_len + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ue-&gt;priv_data = names;</div><div class='add'>+	ue-&gt;info.value.enumerated.names_ptr = 0;</div><div class='add'>+	// increment the allocation size; decremented again at private_free.</div><div class='add'>+	ue-&gt;card-&gt;user_ctl_alloc_size += ue-&gt;info.value.enumerated.names_length;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t compute_user_elem_size(size_t size, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct user_element) + size * count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'> {</div><div class='del'>-	struct user_element *ue = kcontrol-&gt;private_data;</div><div class='del'>-	if (ue-&gt;tlv_data)</div><div class='del'>-		kfree(ue-&gt;tlv_data);</div><div class='add'>+	struct user_element *ue = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	// decrement the allocation size.</div><div class='add'>+	ue-&gt;card-&gt;user_ctl_alloc_size -= compute_user_elem_size(ue-&gt;elem_data_size, kcontrol-&gt;count);</div><div class='add'>+	ue-&gt;card-&gt;user_ctl_alloc_size -= ue-&gt;tlv_data_size;</div><div class='add'>+	if (ue-&gt;priv_data)</div><div class='add'>+		ue-&gt;card-&gt;user_ctl_alloc_size -= ue-&gt;info.value.enumerated.names_length;</div><div class='add'>+</div><div class='add'>+	kvfree(ue-&gt;tlv_data);</div><div class='add'>+	kvfree(ue-&gt;priv_data);</div><div class='ctx'> 	kfree(ue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -960,99 +1615,128 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,</div><div class='ctx'> 			    struct snd_ctl_elem_info *info, int replace)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = file-&gt;card;</div><div class='del'>-	struct snd_kcontrol kctl, *_kctl;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	unsigned int count;</div><div class='ctx'> 	unsigned int access;</div><div class='ctx'> 	long private_size;</div><div class='add'>+	size_t alloc_size;</div><div class='ctx'> 	struct user_element *ue;</div><div class='del'>-	int idx, err;</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;user_ctl_count &gt;= MAX_USER_CONTROLS)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (info-&gt;count &lt; 1)</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!*info-&gt;id.name)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	access = info-&gt;access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :</div><div class='del'>-		(info-&gt;access &amp; (SNDRV_CTL_ELEM_ACCESS_READWRITE|</div><div class='del'>-				 SNDRV_CTL_ELEM_ACCESS_INACTIVE|</div><div class='del'>-				 SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE));</div><div class='del'>-	info-&gt;id.numid = 0;</div><div class='del'>-	memset(&amp;kctl, 0, sizeof(kctl));</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	_kctl = snd_ctl_find_id(card, &amp;info-&gt;id);</div><div class='del'>-	err = 0;</div><div class='del'>-	if (_kctl) {</div><div class='del'>-		if (replace)</div><div class='del'>-			err = snd_ctl_remove(card, _kctl);</div><div class='del'>-		else</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-	} else {</div><div class='del'>-		if (replace)</div><div class='del'>-			err = -ENOENT;</div><div class='add'>+	if (strnlen(info-&gt;id.name, sizeof(info-&gt;id.name)) &gt;= sizeof(info-&gt;id.name))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Delete a control to replace them if needed. */</div><div class='add'>+	if (replace) {</div><div class='add'>+		info-&gt;id.numid = 0;</div><div class='add'>+		err = snd_ctl_remove_user_ctl(file, &amp;info-&gt;id);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	/* Check the number of elements for this userspace control. */</div><div class='add'>+	count = info-&gt;owner;</div><div class='add'>+	if (count == 0)</div><div class='add'>+		count = 1;</div><div class='add'>+	if (count &gt; MAX_CONTROL_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Arrange access permissions if needed. */</div><div class='add'>+	access = info-&gt;access;</div><div class='add'>+	if (access == 0)</div><div class='add'>+		access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+	access &amp;= (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_INACTIVE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_WRITE);</div><div class='add'>+</div><div class='add'>+	/* In initial state, nothing is available as TLV container. */</div><div class='add'>+	if (access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)</div><div class='add'>+		access |= SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;</div><div class='add'>+	access |= SNDRV_CTL_ELEM_ACCESS_USER;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check information and calculate the size of data specific to</div><div class='add'>+	 * this userspace control.</div><div class='add'>+	 */</div><div class='add'>+	/* pass NULL to card for suppressing error messages */</div><div class='add'>+	err = snd_ctl_check_elem_info(NULL, info);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	memcpy(&amp;kctl.id, &amp;info-&gt;id, sizeof(info-&gt;id));</div><div class='del'>-	kctl.count = info-&gt;owner ? info-&gt;owner : 1;</div><div class='del'>-	access |= SNDRV_CTL_ELEM_ACCESS_USER;</div><div class='del'>-	kctl.info = snd_ctl_elem_user_info;</div><div class='del'>-	if (access &amp; SNDRV_CTL_ELEM_ACCESS_READ)</div><div class='del'>-		kctl.get = snd_ctl_elem_user_get;</div><div class='del'>-	if (access &amp; SNDRV_CTL_ELEM_ACCESS_WRITE)</div><div class='del'>-		kctl.put = snd_ctl_elem_user_put;</div><div class='del'>-	if (access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE) {</div><div class='del'>-		kctl.tlv.c = snd_ctl_elem_user_tlv;</div><div class='del'>-		access |= SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;</div><div class='del'>-	}</div><div class='del'>-	switch (info-&gt;type) {</div><div class='del'>-	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='del'>-	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='del'>-		private_size = sizeof(long);</div><div class='del'>-		if (info-&gt;count &gt; 128)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='del'>-		private_size = sizeof(long long);</div><div class='del'>-		if (info-&gt;count &gt; 64)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_CTL_ELEM_TYPE_BYTES:</div><div class='del'>-		private_size = sizeof(unsigned char);</div><div class='del'>-		if (info-&gt;count &gt; 512)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_CTL_ELEM_TYPE_IEC958:</div><div class='del'>-		private_size = sizeof(struct snd_aes_iec958);</div><div class='del'>-		if (info-&gt;count != 1)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	/* user-space control doesn't allow zero-size data */</div><div class='add'>+	if (info-&gt;count &lt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	private_size *= info-&gt;count;</div><div class='del'>-	ue = kzalloc(sizeof(struct user_element) + private_size, GFP_KERNEL);</div><div class='del'>-	if (ue == NULL)</div><div class='add'>+	private_size = value_sizes[info-&gt;type] * info-&gt;count;</div><div class='add'>+	alloc_size = compute_user_elem_size(private_size, count);</div><div class='add'>+</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (check_user_elem_overflow(card, alloc_size))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Keep memory object for this userspace control. After passing this</div><div class='add'>+	 * code block, the instance should be freed by snd_ctl_free_one().</div><div class='add'>+	 *</div><div class='add'>+	 * Note that these elements in this control are locked.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_ctl_new(&amp;kctl, count, access, file);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	memcpy(&amp;kctl-&gt;id, &amp;info-&gt;id, sizeof(kctl-&gt;id));</div><div class='add'>+	ue = kzalloc(alloc_size, GFP_KERNEL);</div><div class='add'>+	if (!ue) {</div><div class='add'>+		kfree(kctl);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	kctl-&gt;private_data = ue;</div><div class='add'>+	kctl-&gt;private_free = snd_ctl_elem_user_free;</div><div class='add'>+</div><div class='add'>+	// increment the allocated size; decremented again at private_free.</div><div class='add'>+	card-&gt;user_ctl_alloc_size += alloc_size;</div><div class='add'>+</div><div class='add'>+	/* Set private data for this userspace control. */</div><div class='add'>+	ue-&gt;card = card;</div><div class='ctx'> 	ue-&gt;info = *info;</div><div class='ctx'> 	ue-&gt;info.access = 0;</div><div class='ctx'> 	ue-&gt;elem_data = (char *)ue + sizeof(*ue);</div><div class='ctx'> 	ue-&gt;elem_data_size = private_size;</div><div class='del'>-	kctl.private_free = snd_ctl_elem_user_free;</div><div class='del'>-	_kctl = snd_ctl_new(&amp;kctl, access);</div><div class='del'>-	if (_kctl == NULL) {</div><div class='del'>-		kfree(ue);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (ue-&gt;info.type == SNDRV_CTL_ELEM_TYPE_ENUMERATED) {</div><div class='add'>+		err = snd_ctl_elem_init_enum_names(ue);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			snd_ctl_free_one(kctl);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	_kctl-&gt;private_data = ue;</div><div class='del'>-	for (idx = 0; idx &lt; _kctl-&gt;count; idx++)</div><div class='del'>-		_kctl-&gt;vd[idx].owner = file;</div><div class='del'>-	err = snd_ctl_add(card, _kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	card-&gt;user_ctl_count++;</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	/* Set callback functions. */</div><div class='add'>+	if (info-&gt;type == SNDRV_CTL_ELEM_TYPE_ENUMERATED)</div><div class='add'>+		kctl-&gt;info = snd_ctl_elem_user_enum_info;</div><div class='add'>+	else</div><div class='add'>+		kctl-&gt;info = snd_ctl_elem_user_info;</div><div class='add'>+	if (access &amp; SNDRV_CTL_ELEM_ACCESS_READ)</div><div class='add'>+		kctl-&gt;get = snd_ctl_elem_user_get;</div><div class='add'>+	if (access &amp; SNDRV_CTL_ELEM_ACCESS_WRITE)</div><div class='add'>+		kctl-&gt;put = snd_ctl_elem_user_put;</div><div class='add'>+	if (access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)</div><div class='add'>+		kctl-&gt;tlv.c = snd_ctl_elem_user_tlv;</div><div class='ctx'> </div><div class='add'>+	/* This function manage to free the instance on failure. */</div><div class='add'>+	err = __snd_ctl_add_replace(card, kctl, CTL_ADD_EXCLUSIVE);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_ctl_free_one(kctl);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	offset = snd_ctl_get_ioff(kctl, &amp;info-&gt;id);</div><div class='add'>+	snd_ctl_build_ioff(&amp;info-&gt;id, kctl, offset);</div><div class='add'>+	/*</div><div class='add'>+	 * Here we cannot fill any field for the number of elements added by</div><div class='add'>+	 * this operation because there're no specific fields. The usage of</div><div class='add'>+	 * 'owner' field for this purpose may cause any bugs to userspace</div><div class='add'>+	 * applications because the field originally means PID of a process</div><div class='add'>+	 * which locks the element.</div><div class='add'>+	 */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1060,9 +1744,19 @@ static int snd_ctl_elem_add_user(struct snd_ctl_file *file,</div><div class='ctx'> 				 struct snd_ctl_elem_info __user *_info, int replace)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_info info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;info, _info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return snd_ctl_elem_add(file, &amp;info, replace);</div><div class='add'>+	err = snd_ctl_elem_add(file, &amp;info, replace);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (copy_to_user(_info, &amp;info, sizeof(info))) {</div><div class='add'>+		snd_ctl_remove_user_ctl(file, &amp;info.id);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_remove(struct snd_ctl_file *file,</div><div class='hunk'>@@ -1096,65 +1790,110 @@ static int snd_ctl_subscribe_events(struct snd_ctl_file *file, int __user *ptr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int call_tlv_handler(struct snd_ctl_file *file, int op_flag,</div><div class='add'>+			    struct snd_kcontrol *kctl,</div><div class='add'>+			    struct snd_ctl_elem_id *id,</div><div class='add'>+			    unsigned int __user *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		int op;</div><div class='add'>+		int perm;</div><div class='add'>+	} pairs[] = {</div><div class='add'>+		{SNDRV_CTL_TLV_OP_READ,  SNDRV_CTL_ELEM_ACCESS_TLV_READ},</div><div class='add'>+		{SNDRV_CTL_TLV_OP_WRITE, SNDRV_CTL_ELEM_ACCESS_TLV_WRITE},</div><div class='add'>+		{SNDRV_CTL_TLV_OP_CMD,   SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND},</div><div class='add'>+	};</div><div class='add'>+	struct snd_kcontrol_volatile *vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, id)];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Check support of the request for this element. */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pairs); ++i) {</div><div class='add'>+		if (op_flag == pairs[i].op &amp;&amp; (vd-&gt;access &amp; pairs[i].perm))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(pairs))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (kctl-&gt;tlv.c == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* Write and command operations are not allowed for locked element. */</div><div class='add'>+	if (op_flag != SNDRV_CTL_TLV_OP_READ &amp;&amp;</div><div class='add'>+	    vd-&gt;owner != NULL &amp;&amp; vd-&gt;owner != file)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	return kctl-&gt;tlv.c(kctl, op_flag, size, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_tlv_buf(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id,</div><div class='add'>+			unsigned int __user *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_volatile *vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, id)];</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	if (!(vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_READ))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (kctl-&gt;tlv.p == NULL)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	len = sizeof(unsigned int) * 2 + kctl-&gt;tlv.p[1];</div><div class='add'>+	if (size &lt; len)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, kctl-&gt;tlv.p, len))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,</div><div class='del'>-                             struct snd_ctl_tlv __user *_tlv,</div><div class='add'>+			     struct snd_ctl_tlv __user *buf,</div><div class='ctx'>                              int op_flag)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = file-&gt;card;</div><div class='del'>-	struct snd_ctl_tlv tlv;</div><div class='add'>+	struct snd_ctl_tlv header;</div><div class='add'>+	unsigned int __user *container;</div><div class='add'>+	unsigned int container_size;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='ctx'> 	struct snd_kcontrol_volatile *vd;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tlv, _tlv, sizeof(tlv)))</div><div class='add'>+	lockdep_assert_held(&amp;file-&gt;card-&gt;controls_rwsem);</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;header, buf, sizeof(header)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (tlv.length &lt; sizeof(unsigned int) * 2)</div><div class='add'>+</div><div class='add'>+	/* In design of control core, numerical ID starts at 1. */</div><div class='add'>+	if (header.numid == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	kctl = snd_ctl_find_numid(card, tlv.numid);</div><div class='del'>-	if (kctl == NULL) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto __kctl_end;</div><div class='del'>-	}</div><div class='del'>-	if (kctl-&gt;tlv.p == NULL) {</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto __kctl_end;</div><div class='del'>-	}</div><div class='del'>-	vd = &amp;kctl-&gt;vd[tlv.numid - kctl-&gt;id.numid];</div><div class='del'>-	if ((op_flag == 0 &amp;&amp; (vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_READ) == 0) ||</div><div class='del'>-	    (op_flag &gt; 0 &amp;&amp; (vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) == 0) ||</div><div class='del'>-	    (op_flag &lt; 0 &amp;&amp; (vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND) == 0)) {</div><div class='del'>-	    	err = -ENXIO;</div><div class='del'>-	    	goto __kctl_end;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/* At least, container should include type and length fields.  */</div><div class='add'>+	if (header.length &lt; sizeof(unsigned int) * 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	container_size = header.length;</div><div class='add'>+	container = buf-&gt;tlv;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_find_numid(file-&gt;card, header.numid);</div><div class='add'>+	if (kctl == NULL)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* Calculate index of the element in this set. */</div><div class='add'>+	id = kctl-&gt;id;</div><div class='add'>+	snd_ctl_build_ioff(&amp;id, kctl, header.numid - id.numid);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[snd_ctl_get_ioff(kctl, &amp;id)];</div><div class='add'>+</div><div class='ctx'> 	if (vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {</div><div class='del'>-		if (vd-&gt;owner != NULL &amp;&amp; vd-&gt;owner != file) {</div><div class='del'>-			err = -EPERM;</div><div class='del'>-			goto __kctl_end;</div><div class='del'>-		}</div><div class='del'>-		err = kctl-&gt;tlv.c(kctl, op_flag, tlv.length, _tlv-&gt;tlv); </div><div class='del'>-		if (err &gt; 0) {</div><div class='del'>-			up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-			snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_TLV, &amp;kctl-&gt;id);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='add'>+		return call_tlv_handler(file, op_flag, kctl, &amp;id, container,</div><div class='add'>+					container_size);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (op_flag) {</div><div class='del'>-			err = -ENXIO;</div><div class='del'>-			goto __kctl_end;</div><div class='add'>+		if (op_flag == SNDRV_CTL_TLV_OP_READ) {</div><div class='add'>+			return read_tlv_buf(kctl, &amp;id, container,</div><div class='add'>+					    container_size);</div><div class='ctx'> 		}</div><div class='del'>-		len = kctl-&gt;tlv.p[1] + 2 * sizeof(unsigned int);</div><div class='del'>-		if (tlv.length &lt; len) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto __kctl_end;</div><div class='del'>-		}</div><div class='del'>-		if (copy_to_user(_tlv-&gt;tlv, kctl-&gt;tlv.p, len))</div><div class='del'>-			err = -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-      __kctl_end:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	return err;</div><div class='add'>+</div><div class='add'>+	/* Not supported. */</div><div class='add'>+	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -1176,7 +1915,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_CARD_INFO:</div><div class='ctx'> 		return snd_ctl_card_info(card, ctl, cmd, argp);</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_ELEM_LIST:</div><div class='del'>-		return snd_ctl_elem_list(card, argp);</div><div class='add'>+		return snd_ctl_elem_list_user(card, argp);</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_ELEM_INFO:</div><div class='ctx'> 		return snd_ctl_elem_info_user(ctl, argp);</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_ELEM_READ:</div><div class='hunk'>@@ -1196,30 +1935,42 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS:</div><div class='ctx'> 		return snd_ctl_subscribe_events(ctl, ip);</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_TLV_READ:</div><div class='del'>-		return snd_ctl_tlv_ioctl(ctl, argp, 0);</div><div class='add'>+		err = snd_power_ref_and_wait(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		scoped_guard(rwsem_read, &amp;card-&gt;controls_rwsem)</div><div class='add'>+			err = snd_ctl_tlv_ioctl(ctl, argp, SNDRV_CTL_TLV_OP_READ);</div><div class='add'>+		snd_power_unref(card);</div><div class='add'>+		return err;</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_TLV_WRITE:</div><div class='del'>-		return snd_ctl_tlv_ioctl(ctl, argp, 1);</div><div class='add'>+		err = snd_power_ref_and_wait(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		scoped_guard(rwsem_write, &amp;card-&gt;controls_rwsem)</div><div class='add'>+			err = snd_ctl_tlv_ioctl(ctl, argp, SNDRV_CTL_TLV_OP_WRITE);</div><div class='add'>+		snd_power_unref(card);</div><div class='add'>+		return err;</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_TLV_COMMAND:</div><div class='del'>-		return snd_ctl_tlv_ioctl(ctl, argp, -1);</div><div class='add'>+		err = snd_power_ref_and_wait(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		scoped_guard(rwsem_write, &amp;card-&gt;controls_rwsem)</div><div class='add'>+			err = snd_ctl_tlv_ioctl(ctl, argp, SNDRV_CTL_TLV_OP_CMD);</div><div class='add'>+		snd_power_unref(card);</div><div class='add'>+		return err;</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_POWER:</div><div class='ctx'> 		return -ENOPROTOOPT;</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_POWER_STATE:</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-		return put_user(card-&gt;power_state, ip) ? -EFAULT : 0;</div><div class='del'>-#else</div><div class='ctx'> 		return put_user(SNDRV_CTL_POWER_D0, ip) ? -EFAULT : 0;</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-	down_read(&amp;snd_ioctl_rwsem);</div><div class='add'>+</div><div class='add'>+	guard(rwsem_read)(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	list_for_each_entry(p, &amp;snd_control_ioctls, list) {</div><div class='ctx'> 		err = p-&gt;fioctl(card, ctl, cmd, arg);</div><div class='del'>-		if (err != -ENOIOCTLCMD) {</div><div class='del'>-			up_read(&amp;snd_ioctl_rwsem);</div><div class='add'>+		if (err != -ENOIOCTLCMD)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;snd_ioctl_rwsem);</div><div class='del'>-	snd_printdd("unknown ioctl = 0x%x\n", cmd);</div><div class='add'>+	dev_dbg(card-&gt;dev, "unknown ioctl = 0x%x\n", cmd);</div><div class='ctx'> 	return -ENOTTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1242,7 +1993,7 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,</div><div class='ctx'> 		struct snd_ctl_event ev;</div><div class='ctx'> 		struct snd_kctl_event *kev;</div><div class='ctx'> 		while (list_empty(&amp;ctl-&gt;events)) {</div><div class='del'>-			wait_queue_t wait;</div><div class='add'>+			wait_queue_entry_t wait;</div><div class='ctx'> 			if ((file-&gt;f_flags &amp; O_NONBLOCK) != 0 || result &gt; 0) {</div><div class='ctx'> 				err = -EAGAIN;</div><div class='ctx'> 				goto __end_lock;</div><div class='hunk'>@@ -1253,6 +2004,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,</div><div class='ctx'> 			spin_unlock_irq(&amp;ctl-&gt;read_lock);</div><div class='ctx'> 			schedule();</div><div class='ctx'> 			remove_wait_queue(&amp;ctl-&gt;change_sleep, &amp;wait);</div><div class='add'>+			if (ctl-&gt;card-&gt;shutdown)</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 			if (signal_pending(current))</div><div class='ctx'> 				return -ERESTARTSYS;</div><div class='ctx'> 			spin_lock_irq(&amp;ctl-&gt;read_lock);</div><div class='hunk'>@@ -1279,9 +2032,9 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,</div><div class='ctx'>       	return result &gt; 0 ? result : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_ctl_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_ctl_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask;</div><div class='add'>+	__poll_t mask;</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='ctx'> </div><div class='ctx'> 	ctl = file-&gt;private_data;</div><div class='hunk'>@@ -1291,7 +2044,7 @@ static unsigned int snd_ctl_poll(struct file *file, poll_table * wait)</div><div class='ctx'> </div><div class='ctx'> 	mask = 0;</div><div class='ctx'> 	if (!list_empty(&amp;ctl-&gt;events))</div><div class='del'>-		mask |= POLLIN | POLLRDNORM;</div><div class='add'>+		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='hunk'>@@ -1308,25 +2061,37 @@ static int _snd_ctl_register_ioctl(snd_kctl_ioctl_func_t fcn, struct list_head *</div><div class='ctx'> 	if (pn == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	pn-&gt;fioctl = fcn;</div><div class='del'>-	down_write(&amp;snd_ioctl_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	list_add_tail(&amp;pn-&gt;list, lists);</div><div class='del'>-	up_write(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_register_ioctl - register the device-specific control-ioctls</div><div class='add'>+ * @fcn: ioctl callback function</div><div class='add'>+ *</div><div class='add'>+ * called from each device manager like pcm.c, hwdep.c, etc.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_ctl_register_ioctl(snd_kctl_ioctl_func_t fcn)</div><div class='ctx'> {</div><div class='ctx'> 	return _snd_ctl_register_ioctl(fcn, &amp;snd_control_ioctls);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_register_ioctl);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_register_ioctl_compat - register the device-specific 32bit compat</div><div class='add'>+ * control-ioctls</div><div class='add'>+ * @fcn: ioctl callback function</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_ctl_register_ioctl_compat(snd_kctl_ioctl_func_t fcn)</div><div class='ctx'> {</div><div class='ctx'> 	return _snd_ctl_register_ioctl(fcn, &amp;snd_control_compat_ioctls);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_register_ioctl_compat);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1340,33 +2105,42 @@ static int _snd_ctl_unregister_ioctl(snd_kctl_ioctl_func_t fcn,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!fcn))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	down_write(&amp;snd_ioctl_rwsem);</div><div class='add'>+	guard(rwsem_write)(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	list_for_each_entry(p, lists, list) {</div><div class='ctx'> 		if (p-&gt;fioctl == fcn) {</div><div class='ctx'> 			list_del(&amp;p-&gt;list);</div><div class='del'>-			up_write(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 			kfree(p);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	snd_BUG();</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_unregister_ioctl - de-register the device-specific control-ioctls</div><div class='add'>+ * @fcn: ioctl callback function to unregister</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_ctl_unregister_ioctl(snd_kctl_ioctl_func_t fcn)</div><div class='ctx'> {</div><div class='ctx'> 	return _snd_ctl_unregister_ioctl(fcn, &amp;snd_control_ioctls);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_unregister_ioctl);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_unregister_ioctl_compat - de-register the device-specific compat</div><div class='add'>+ * 32bit control-ioctls</div><div class='add'>+ * @fcn: ioctl callback function to unregister</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_ctl_unregister_ioctl_compat(snd_kctl_ioctl_func_t fcn)</div><div class='ctx'> {</div><div class='ctx'> 	return _snd_ctl_unregister_ioctl(fcn, &amp;snd_control_compat_ioctls);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1375,8 +2149,28 @@ static int snd_ctl_fasync(int fd, struct file * file, int on)</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='ctx'> </div><div class='ctx'> 	ctl = file-&gt;private_data;</div><div class='del'>-	return fasync_helper(fd, file, on, &amp;ctl-&gt;fasync);</div><div class='add'>+	return snd_fasync_helper(fd, file, on, &amp;ctl-&gt;fasync);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return the preferred subdevice number if already assigned;</div><div class='add'>+ * otherwise return -1</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_get_preferred_subdevice(struct snd_card *card, int type)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_file *kctl;</div><div class='add'>+	int subdevice = -1;</div><div class='add'>+</div><div class='add'>+	guard(read_lock_irqsave)(&amp;card-&gt;controls_rwlock);</div><div class='add'>+	list_for_each_entry(kctl, &amp;card-&gt;ctl_files, list) {</div><div class='add'>+		if (kctl-&gt;pid == task_pid(current)) {</div><div class='add'>+			subdevice = kctl-&gt;preferred_subdevice[type];</div><div class='add'>+			if (subdevice != -1)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return subdevice;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_get_preferred_subdevice);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ioctl32 compat</div><div class='hunk'>@@ -1388,6 +2182,84 @@ static int snd_ctl_fasync(int fd, struct file * file, int on)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * control layers (audio LED etc.)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_request_layer - request to use the layer</div><div class='add'>+ * @module_name: Name of the kernel module (NULL == build-in)</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or an error code when the module cannot be loaded</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_request_layer(const char *module_name)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_layer_ops *lops;</div><div class='add'>+</div><div class='add'>+	if (module_name == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	scoped_guard(rwsem_read, &amp;snd_ctl_layer_rwsem) {</div><div class='add'>+		for (lops = snd_ctl_layer; lops; lops = lops-&gt;next)</div><div class='add'>+			if (strcmp(lops-&gt;module_name, module_name) == 0)</div><div class='add'>+				return 0;</div><div class='add'>+	}</div><div class='add'>+	return request_module(module_name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_request_layer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_register_layer - register new control layer</div><div class='add'>+ * @lops: operation structure</div><div class='add'>+ *</div><div class='add'>+ * The new layer can track all control elements and do additional</div><div class='add'>+ * operations on top (like audio LED handling).</div><div class='add'>+ */</div><div class='add'>+void snd_ctl_register_layer(struct snd_ctl_layer_ops *lops)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	int card_number;</div><div class='add'>+</div><div class='add'>+	scoped_guard(rwsem_write, &amp;snd_ctl_layer_rwsem) {</div><div class='add'>+		lops-&gt;next = snd_ctl_layer;</div><div class='add'>+		snd_ctl_layer = lops;</div><div class='add'>+	}</div><div class='add'>+	for (card_number = 0; card_number &lt; SNDRV_CARDS; card_number++) {</div><div class='add'>+		card = snd_card_ref(card_number);</div><div class='add'>+		if (card) {</div><div class='add'>+			scoped_guard(rwsem_read, &amp;card-&gt;controls_rwsem)</div><div class='add'>+				lops-&gt;lregister(card);</div><div class='add'>+			snd_card_unref(card);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_register_layer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_disconnect_layer - disconnect control layer</div><div class='add'>+ * @lops: operation structure</div><div class='add'>+ *</div><div class='add'>+ * It is expected that the information about tracked cards</div><div class='add'>+ * is freed before this call (the disconnect callback is</div><div class='add'>+ * not called here).</div><div class='add'>+ */</div><div class='add'>+void snd_ctl_disconnect_layer(struct snd_ctl_layer_ops *lops)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_layer_ops *lops2, *prev_lops2;</div><div class='add'>+</div><div class='add'>+	guard(rwsem_write)(&amp;snd_ctl_layer_rwsem);</div><div class='add'>+	for (lops2 = snd_ctl_layer, prev_lops2 = NULL; lops2; lops2 = lops2-&gt;next) {</div><div class='add'>+		if (lops2 == lops) {</div><div class='add'>+			if (!prev_lops2)</div><div class='add'>+				snd_ctl_layer = lops-&gt;next;</div><div class='add'>+			else</div><div class='add'>+				prev_lops2-&gt;next = lops-&gt;next;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		prev_lops2 = lops2;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_disconnect_layer);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *  INIT PART</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -1397,31 +2269,35 @@ static const struct file_operations snd_ctl_f_ops =</div><div class='ctx'> 	.read =		snd_ctl_read,</div><div class='ctx'> 	.open =		snd_ctl_open,</div><div class='ctx'> 	.release =	snd_ctl_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.poll =		snd_ctl_poll,</div><div class='ctx'> 	.unlocked_ioctl =	snd_ctl_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_ctl_ioctl_compat,</div><div class='ctx'> 	.fasync =	snd_ctl_fasync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* call lops under rwsems; called from snd_ctl_dev_*() below() */</div><div class='add'>+#define call_snd_ctl_lops(_card, _op)				    \</div><div class='add'>+	do {							    \</div><div class='add'>+		struct snd_ctl_layer_ops *lops;			    \</div><div class='add'>+		guard(rwsem_read)(&amp;(_card)-&gt;controls_rwsem);	    \</div><div class='add'>+		guard(rwsem_read)(&amp;snd_ctl_layer_rwsem);	    \</div><div class='add'>+		for (lops = snd_ctl_layer; lops; lops = lops-&gt;next) \</div><div class='add'>+			lops-&gt;_op(_card);			    \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * registration of the control device</div><div class='ctx'>  */</div><div class='ctx'> static int snd_ctl_dev_register(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = device-&gt;device_data;</div><div class='del'>-	int err, cardnum;</div><div class='del'>-	char name[16];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!card))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	cardnum = card-&gt;number;</div><div class='del'>-	if (snd_BUG_ON(cardnum &lt; 0 || cardnum &gt;= SNDRV_CARDS))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	sprintf(name, "controlC%i", cardnum);</div><div class='del'>-	if ((err = snd_register_device(SNDRV_DEVICE_TYPE_CONTROL, card, -1,</div><div class='del'>-				       &amp;snd_ctl_f_ops, card, name)) &lt; 0)</div><div class='add'>+	err = snd_register_device(SNDRV_DEVICE_TYPE_CONTROL, card, -1,</div><div class='add'>+				  &amp;snd_ctl_f_ops, card, card-&gt;ctl_dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	call_snd_ctl_lops(card, lregister);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1432,25 +2308,16 @@ static int snd_ctl_dev_disconnect(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = device-&gt;device_data;</div><div class='ctx'> 	struct snd_ctl_file *ctl;</div><div class='del'>-	int err, cardnum;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!card))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	cardnum = card-&gt;number;</div><div class='del'>-	if (snd_BUG_ON(cardnum &lt; 0 || cardnum &gt;= SNDRV_CARDS))</div><div class='del'>-		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;card-&gt;ctl_files_rwlock);</div><div class='del'>-	list_for_each_entry(ctl, &amp;card-&gt;ctl_files, list) {</div><div class='del'>-		wake_up(&amp;ctl-&gt;change_sleep);</div><div class='del'>-		kill_fasync(&amp;ctl-&gt;fasync, SIGIO, POLL_ERR);</div><div class='add'>+	scoped_guard(read_lock_irqsave, &amp;card-&gt;controls_rwlock) {</div><div class='add'>+		list_for_each_entry(ctl, &amp;card-&gt;ctl_files, list) {</div><div class='add'>+			wake_up(&amp;ctl-&gt;change_sleep);</div><div class='add'>+			snd_kill_fasync(ctl-&gt;fasync, SIGIO, POLL_ERR);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;card-&gt;ctl_files_rwlock);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_unregister_device(SNDRV_DEVICE_TYPE_CONTROL,</div><div class='del'>-					 card, -1)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	call_snd_ctl_lops(card, ldisconnect);</div><div class='add'>+	return snd_unregister_device(card-&gt;ctl_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1461,12 +2328,18 @@ static int snd_ctl_dev_free(struct snd_device *device)</div><div class='ctx'> 	struct snd_card *card = device-&gt;device_data;</div><div class='ctx'> 	struct snd_kcontrol *control;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	while (!list_empty(&amp;card-&gt;controls)) {</div><div class='del'>-		control = snd_kcontrol(card-&gt;controls.next);</div><div class='del'>-		snd_ctl_remove(card, control);</div><div class='add'>+	scoped_guard(rwsem_write, &amp;card-&gt;controls_rwsem) {</div><div class='add'>+		while (!list_empty(&amp;card-&gt;controls)) {</div><div class='add'>+			control = snd_kcontrol(card-&gt;controls.next);</div><div class='add'>+			__snd_ctl_remove(card, control, false);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+		xa_destroy(&amp;card-&gt;ctl_numids);</div><div class='add'>+		xa_destroy(&amp;card-&gt;ctl_hash);</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	put_device(card-&gt;ctl_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1476,19 +2349,43 @@ static int snd_ctl_dev_free(struct snd_device *device)</div><div class='ctx'>  */</div><div class='ctx'> int snd_ctl_create(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_ctl_dev_free,</div><div class='ctx'> 		.dev_register =	snd_ctl_dev_register,</div><div class='ctx'> 		.dev_disconnect = snd_ctl_dev_disconnect,</div><div class='ctx'> 	};</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	return snd_device_new(card, SNDRV_DEV_CONTROL, card, &amp;ops);</div><div class='add'>+	if (snd_BUG_ON(card-&gt;number &lt; 0 || card-&gt;number &gt;= SNDRV_CARDS))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	err = snd_device_alloc(&amp;card-&gt;ctl_dev, card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	dev_set_name(card-&gt;ctl_dev, "controlC%d", card-&gt;number);</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CONTROL, card, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		put_device(card-&gt;ctl_dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Frequently used control callbacks</div><div class='add'>+ * Frequently used control callbacks/helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_boolean_mono_info - Helper function for a standard boolean info</div><div class='add'>+ * callback with a mono channel</div><div class='add'>+ * @kcontrol: the kcontrol instance</div><div class='add'>+ * @uinfo: info to store</div><div class='add'>+ *</div><div class='add'>+ * This is a function that can be used as info callback for a standard</div><div class='add'>+ * boolean control with a single mono channel.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero (always successful)</div><div class='ctx'>  */</div><div class='ctx'> int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			      struct snd_ctl_elem_info *uinfo)</div><div class='hunk'>@@ -1499,9 +2396,19 @@ int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	uinfo-&gt;value.integer.max = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_boolean_mono_info);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_boolean_stereo_info - Helper function for a standard boolean info</div><div class='add'>+ * callback with stereo two channels</div><div class='add'>+ * @kcontrol: the kcontrol instance</div><div class='add'>+ * @uinfo: info to store</div><div class='add'>+ *</div><div class='add'>+ * This is a function that can be used as info callback for a standard</div><div class='add'>+ * boolean control with stereo two channels.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero (always successful)</div><div class='add'>+ */</div><div class='ctx'> int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='hunk'>@@ -1511,5 +2418,37 @@ int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	uinfo-&gt;value.integer.max = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_enum_info - fills the info structure for an enumerated control</div><div class='add'>+ * @info: the structure to be filled</div><div class='add'>+ * @channels: the number of the control's channels; often one</div><div class='add'>+ * @items: the number of control values; also the size of @names</div><div class='add'>+ * @names: an array containing the names of all control values</div><div class='add'>+ *</div><div class='add'>+ * Sets all required fields in @info to their appropriate values.</div><div class='add'>+ * If the control's accessibility is not the default (readable and writable),</div><div class='add'>+ * the caller has to fill @info-&gt;access.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero (always successful)</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,</div><div class='add'>+		      unsigned int items, const char *const names[])</div><div class='add'>+{</div><div class='add'>+	info-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	info-&gt;count = channels;</div><div class='add'>+	info-&gt;value.enumerated.items = items;</div><div class='add'>+	if (!items)</div><div class='add'>+		return 0;</div><div class='add'>+	if (info-&gt;value.enumerated.item &gt;= items)</div><div class='add'>+		info-&gt;value.enumerated.item = items - 1;</div><div class='add'>+	WARN(strlen(names[info-&gt;value.enumerated.item]) &gt;= sizeof(info-&gt;value.enumerated.name),</div><div class='add'>+	     "ALSA: too long item name '%s'\n",</div><div class='add'>+	     names[info-&gt;value.enumerated.item]);</div><div class='add'>+	strscpy(info-&gt;value.enumerated.name,</div><div class='add'>+		names[info-&gt;value.enumerated.item],</div><div class='add'>+		sizeof(info-&gt;value.enumerated.name));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ctl_enum_info);</div><div class='head'>diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c<br/>index 426874429a5e..6459809ed364 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/control_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/control_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/control_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/control_compat.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * compat ioctls for control API</div><div class='ctx'>  *</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* this file included from control.c */</div><div class='hunk'>@@ -35,24 +22,22 @@ struct snd_ctl_elem_list32 {</div><div class='ctx'> static int snd_ctl_elem_list_compat(struct snd_card *card,</div><div class='ctx'> 				    struct snd_ctl_elem_list32 __user *data32)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_list __user *data;</div><div class='add'>+	struct snd_ctl_elem_list data = {};</div><div class='ctx'> 	compat_caddr_t ptr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	data = compat_alloc_user_space(sizeof(*data));</div><div class='del'>-</div><div class='ctx'> 	/* offset, space, used, count */</div><div class='del'>-	if (copy_in_user(data, data32, 4 * sizeof(u32)))</div><div class='add'>+	if (copy_from_user(&amp;data, data32, 4 * sizeof(u32)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	/* pids */</div><div class='del'>-	if (get_user(ptr, &amp;data32-&gt;pids) ||</div><div class='del'>-	    put_user(compat_ptr(ptr), &amp;data-&gt;pids))</div><div class='add'>+	if (get_user(ptr, &amp;data32-&gt;pids))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	err = snd_ctl_elem_list(card, data);</div><div class='add'>+	data.pids = compat_ptr(ptr);</div><div class='add'>+	err = snd_ctl_elem_list(card, &amp;data);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* copy the result */</div><div class='del'>-	if (copy_in_user(data32, data, 4 * sizeof(u32)))</div><div class='add'>+	if (copy_to_user(data32, &amp;data, 4 * sizeof(u32)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -83,75 +68,72 @@ struct snd_ctl_elem_info32 {</div><div class='ctx'> 			u32 items;</div><div class='ctx'> 			u32 item;</div><div class='ctx'> 			char name[64];</div><div class='add'>+			u64 names_ptr;</div><div class='add'>+			u32 names_length;</div><div class='ctx'> 		} enumerated;</div><div class='ctx'> 		unsigned char reserved[128];</div><div class='ctx'> 	} value;</div><div class='ctx'> 	unsigned char reserved[64];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl,</div><div class='ctx'> 				    struct snd_ctl_elem_info32 __user *data32)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *data;</div><div class='add'>+	struct snd_card *card = ctl-&gt;card;</div><div class='add'>+	struct snd_ctl_elem_info *data __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (! data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = -EFAULT;</div><div class='ctx'> 	/* copy id */</div><div class='ctx'> 	if (copy_from_user(&amp;data-&gt;id, &amp;data32-&gt;id, sizeof(data-&gt;id)))</div><div class='del'>-		goto error;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	/* we need to copy the item index.</div><div class='ctx'> 	 * hope this doesn't break anything..</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (get_user(data-&gt;value.enumerated.item, &amp;data32-&gt;value.enumerated.item))</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	snd_power_lock(ctl-&gt;card);</div><div class='del'>-	err = snd_power_wait(ctl-&gt;card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = snd_ctl_elem_info(ctl, data);</div><div class='del'>-	snd_power_unlock(ctl-&gt;card);</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='add'>+	err = snd_power_ref_and_wait(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_ctl_elem_info(ctl, data);</div><div class='add'>+	snd_power_unref(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	/* restore info to 32bit */</div><div class='del'>-	err = -EFAULT;</div><div class='ctx'> 	/* id, type, access, count */</div><div class='ctx'> 	if (copy_to_user(&amp;data32-&gt;id, &amp;data-&gt;id, sizeof(data-&gt;id)) ||</div><div class='ctx'> 	    copy_to_user(&amp;data32-&gt;type, &amp;data-&gt;type, 3 * sizeof(u32)))</div><div class='del'>-		goto error;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	if (put_user(data-&gt;owner, &amp;data32-&gt;owner))</div><div class='del'>-		goto error;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	switch (data-&gt;type) {</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='ctx'> 		if (put_user(data-&gt;value.integer.min, &amp;data32-&gt;value.integer.min) ||</div><div class='ctx'> 		    put_user(data-&gt;value.integer.max, &amp;data32-&gt;value.integer.max) ||</div><div class='ctx'> 		    put_user(data-&gt;value.integer.step, &amp;data32-&gt;value.integer.step))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='ctx'> 		if (copy_to_user(&amp;data32-&gt;value.integer64,</div><div class='ctx'> 				 &amp;data-&gt;value.integer64,</div><div class='ctx'> 				 sizeof(data-&gt;value.integer64)))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='ctx'> 		if (copy_to_user(&amp;data32-&gt;value.enumerated,</div><div class='ctx'> 				 &amp;data-&gt;value.enumerated,</div><div class='ctx'> 				 sizeof(data-&gt;value.enumerated)))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	err = 0;</div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* read / write */</div><div class='hunk'>@@ -168,38 +150,45 @@ struct snd_ctl_elem_value32 {</div><div class='ctx'>         unsigned char reserved[128];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+/* x32 has a different alignment for 64bit values from ia32 */</div><div class='add'>+struct snd_ctl_elem_value_x32 {</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+	unsigned int indirect;	/* bit-field causes misalignment */</div><div class='add'>+	union {</div><div class='add'>+		s32 integer[128];</div><div class='add'>+		unsigned char data[512];</div><div class='add'>+		s64 integer64[64];</div><div class='add'>+	} value;</div><div class='add'>+	unsigned char reserved[128];</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='ctx'> </div><div class='ctx'> /* get the value type and count of the control */</div><div class='ctx'> static int get_ctl_type(struct snd_card *card, struct snd_ctl_elem_id *id,</div><div class='ctx'> 			int *countp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	struct snd_ctl_elem_info *info;</div><div class='add'>+	struct snd_ctl_elem_info *info __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_ctl_find_id(card, id);</div><div class='del'>-	if (! kctl) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (info == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	info-&gt;id = *id;</div><div class='ctx'> 	err = kctl-&gt;info(kctl, info);</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='ctx'> 		err = info-&gt;type;</div><div class='ctx'> 		*countp = info-&gt;count;</div><div class='ctx'> 	}</div><div class='del'>-	kfree(info);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_elem_size(int type, int count)</div><div class='add'>+static int get_elem_size(snd_ctl_elem_type_t type, int count)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='hunk'>@@ -217,11 +206,13 @@ static int get_elem_size(int type, int count)</div><div class='ctx'> </div><div class='ctx'> static int copy_ctl_value_from_user(struct snd_card *card,</div><div class='ctx'> 				    struct snd_ctl_elem_value *data,</div><div class='del'>-				    struct snd_ctl_elem_value32 __user *data32,</div><div class='add'>+				    void __user *userdata,</div><div class='add'>+				    void __user *valuep,</div><div class='ctx'> 				    int *typep, int *countp)</div><div class='ctx'> {</div><div class='add'>+	struct snd_ctl_elem_value32 __user *data32 = userdata;</div><div class='ctx'> 	int i, type, size;</div><div class='del'>-	int uninitialized_var(count);</div><div class='add'>+	int count;</div><div class='ctx'> 	unsigned int indirect;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;data-&gt;id, &amp;data32-&gt;id, sizeof(data-&gt;id)))</div><div class='hunk'>@@ -234,22 +225,22 @@ static int copy_ctl_value_from_user(struct snd_card *card,</div><div class='ctx'> 	if (type &lt; 0)</div><div class='ctx'> 		return type;</div><div class='ctx'> </div><div class='del'>-	if (type == SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='del'>-	    type == SNDRV_CTL_ELEM_TYPE_INTEGER) {</div><div class='add'>+	if (type == (__force int)SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='add'>+	    type == (__force int)SNDRV_CTL_ELEM_TYPE_INTEGER) {</div><div class='ctx'> 		for (i = 0; i &lt; count; i++) {</div><div class='add'>+			s32 __user *intp = valuep;</div><div class='ctx'> 			int val;</div><div class='del'>-			if (get_user(val, &amp;data32-&gt;value.integer[i]))</div><div class='add'>+			if (get_user(val, &amp;intp[i]))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			data-&gt;value.integer.value[i] = val;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		size = get_elem_size(type, count);</div><div class='add'>+		size = get_elem_size((__force snd_ctl_elem_type_t)type, count);</div><div class='ctx'> 		if (size &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "snd_ioctl32_ctl_elem_value: unknown type %d\n", type);</div><div class='add'>+			dev_err(card-&gt;dev, "snd_ioctl32_ctl_elem_value: unknown type %d\n", type);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (copy_from_user(data-&gt;value.bytes.data,</div><div class='del'>-				   data32-&gt;value.data, size))</div><div class='add'>+		if (copy_from_user(data-&gt;value.bytes.data, valuep, size))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -259,58 +250,71 @@ static int copy_ctl_value_from_user(struct snd_card *card,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* restore the value to 32bit */</div><div class='del'>-static int copy_ctl_value_to_user(struct snd_ctl_elem_value32 __user *data32,</div><div class='add'>+static int copy_ctl_value_to_user(void __user *userdata,</div><div class='add'>+				  void __user *valuep,</div><div class='ctx'> 				  struct snd_ctl_elem_value *data,</div><div class='ctx'> 				  int type, int count)</div><div class='ctx'> {</div><div class='add'>+	struct snd_ctl_elem_value32 __user *data32 = userdata;</div><div class='ctx'> 	int i, size;</div><div class='ctx'> </div><div class='del'>-	if (type == SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='del'>-	    type == SNDRV_CTL_ELEM_TYPE_INTEGER) {</div><div class='add'>+	if (type == (__force int)SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='add'>+	    type == (__force int)SNDRV_CTL_ELEM_TYPE_INTEGER) {</div><div class='ctx'> 		for (i = 0; i &lt; count; i++) {</div><div class='add'>+			s32 __user *intp = valuep;</div><div class='ctx'> 			int val;</div><div class='ctx'> 			val = data-&gt;value.integer.value[i];</div><div class='del'>-			if (put_user(val, &amp;data32-&gt;value.integer[i]))</div><div class='add'>+			if (put_user(val, &amp;intp[i]))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		size = get_elem_size(type, count);</div><div class='del'>-		if (copy_to_user(data32-&gt;value.data,</div><div class='del'>-				 data-&gt;value.bytes.data, size))</div><div class='add'>+		size = get_elem_size((__force snd_ctl_elem_type_t)type, count);</div><div class='add'>+		if (copy_to_user(valuep, data-&gt;value.bytes.data, size))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='add'>+	if (copy_to_user(&amp;data32-&gt;id, &amp;data-&gt;id, sizeof(data32-&gt;id)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ctl_elem_read_user_compat(struct snd_card *card, </div><div class='del'>-					 struct snd_ctl_elem_value32 __user *data32)</div><div class='add'>+static int __ctl_elem_read_user(struct snd_card *card,</div><div class='add'>+				void __user *userdata, void __user *valuep)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_value *data;</div><div class='add'>+	struct snd_ctl_elem_value *data __free(kfree) = NULL;</div><div class='ctx'> 	int err, type, count;</div><div class='ctx'> </div><div class='ctx'> 	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if ((err = copy_ctl_value_from_user(card, data, data32, &amp;type, &amp;count)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = snd_ctl_elem_read(card, data);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = copy_ctl_value_to_user(data32, data, type, count);</div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='add'>+	err = copy_ctl_value_from_user(card, data, userdata, valuep,</div><div class='add'>+				       &amp;type, &amp;count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_elem_read(card, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return copy_ctl_value_to_user(userdata, valuep, data, type, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctl_elem_read_user(struct snd_card *card,</div><div class='add'>+			      void __user *userdata, void __user *valuep)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_power_ref_and_wait(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = __ctl_elem_read_user(card, userdata, valuep);</div><div class='add'>+	snd_power_unref(card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file,</div><div class='del'>-					  struct snd_ctl_elem_value32 __user *data32)</div><div class='add'>+static int __ctl_elem_write_user(struct snd_ctl_file *file,</div><div class='add'>+				 void __user *userdata, void __user *valuep)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_value *data;</div><div class='add'>+	struct snd_ctl_elem_value *data __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_card *card = file-&gt;card;</div><div class='ctx'> 	int err, type, count;</div><div class='ctx'> </div><div class='hunk'>@@ -318,68 +322,100 @@ static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file,</div><div class='ctx'> 	if (data == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if ((err = copy_ctl_value_from_user(card, data, data32, &amp;type, &amp;count)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = snd_ctl_elem_write(card, file, data);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		err = copy_ctl_value_to_user(data32, data, type, count);</div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='add'>+	err = copy_ctl_value_from_user(card, data, userdata, valuep,</div><div class='add'>+				       &amp;type, &amp;count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_elem_write(card, file, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return copy_ctl_value_to_user(userdata, valuep, data, type, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ctl_elem_write_user(struct snd_ctl_file *file,</div><div class='add'>+			       void __user *userdata, void __user *valuep)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = file-&gt;card;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_power_ref_and_wait(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = __ctl_elem_write_user(file, userdata, valuep);</div><div class='add'>+	snd_power_unref(card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_ctl_elem_read_user_compat(struct snd_card *card,</div><div class='add'>+					 struct snd_ctl_elem_value32 __user *data32)</div><div class='add'>+{</div><div class='add'>+	return ctl_elem_read_user(card, data32, &amp;data32-&gt;value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file,</div><div class='add'>+					  struct snd_ctl_elem_value32 __user *data32)</div><div class='add'>+{</div><div class='add'>+	return ctl_elem_write_user(file, data32, &amp;data32-&gt;value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+static int snd_ctl_elem_read_user_x32(struct snd_card *card,</div><div class='add'>+				      struct snd_ctl_elem_value_x32 __user *data32)</div><div class='add'>+{</div><div class='add'>+	return ctl_elem_read_user(card, data32, &amp;data32-&gt;value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_elem_write_user_x32(struct snd_ctl_file *file,</div><div class='add'>+				       struct snd_ctl_elem_value_x32 __user *data32)</div><div class='add'>+{</div><div class='add'>+	return ctl_elem_write_user(file, data32, &amp;data32-&gt;value);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='add'>+</div><div class='ctx'> /* add or replace a user control */</div><div class='ctx'> static int snd_ctl_elem_add_compat(struct snd_ctl_file *file,</div><div class='ctx'> 				   struct snd_ctl_elem_info32 __user *data32,</div><div class='ctx'> 				   int replace)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *data;</div><div class='del'>-	int err;</div><div class='add'>+	struct snd_ctl_elem_info *data __free(kfree) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='ctx'> 	if (! data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = -EFAULT;</div><div class='ctx'> 	/* id, type, access, count */ \</div><div class='ctx'> 	if (copy_from_user(&amp;data-&gt;id, &amp;data32-&gt;id, sizeof(data-&gt;id)) ||</div><div class='ctx'> 	    copy_from_user(&amp;data-&gt;type, &amp;data32-&gt;type, 3 * sizeof(u32)))</div><div class='del'>-		goto error;</div><div class='del'>-	if (get_user(data-&gt;owner, &amp;data32-&gt;owner) ||</div><div class='del'>-	    get_user(data-&gt;type, &amp;data32-&gt;type))</div><div class='del'>-		goto error;</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (get_user(data-&gt;owner, &amp;data32-&gt;owner))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	switch (data-&gt;type) {</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='ctx'> 		if (get_user(data-&gt;value.integer.min, &amp;data32-&gt;value.integer.min) ||</div><div class='ctx'> 		    get_user(data-&gt;value.integer.max, &amp;data32-&gt;value.integer.max) ||</div><div class='ctx'> 		    get_user(data-&gt;value.integer.step, &amp;data32-&gt;value.integer.step))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER64:</div><div class='ctx'> 		if (copy_from_user(&amp;data-&gt;value.integer64,</div><div class='ctx'> 				   &amp;data32-&gt;value.integer64,</div><div class='ctx'> 				   sizeof(data-&gt;value.integer64)))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='ctx'> 		if (copy_from_user(&amp;data-&gt;value.enumerated,</div><div class='ctx'> 				   &amp;data32-&gt;value.enumerated,</div><div class='ctx'> 				   sizeof(data-&gt;value.enumerated)))</div><div class='del'>-			goto error;</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		data-&gt;value.enumerated.names_ptr =</div><div class='add'>+			(uintptr_t)compat_ptr(data-&gt;value.enumerated.names_ptr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_ctl_elem_add(file, data, replace);</div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='del'>-	return err;</div><div class='add'>+	return snd_ctl_elem_add(file, data, replace);</div><div class='ctx'> }  </div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -389,6 +425,10 @@ enum {</div><div class='ctx'> 	SNDRV_CTL_IOCTL_ELEM_WRITE32 = _IOWR('U', 0x13, struct snd_ctl_elem_value32),</div><div class='ctx'> 	SNDRV_CTL_IOCTL_ELEM_ADD32 = _IOWR('U', 0x17, struct snd_ctl_elem_info32),</div><div class='ctx'> 	SNDRV_CTL_IOCTL_ELEM_REPLACE32 = _IOWR('U', 0x18, struct snd_ctl_elem_info32),</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+	SNDRV_CTL_IOCTL_ELEM_READ_X32 = _IOWR('U', 0x12, struct snd_ctl_elem_value_x32),</div><div class='add'>+	SNDRV_CTL_IOCTL_ELEM_WRITE_X32 = _IOWR('U', 0x13, struct snd_ctl_elem_value_x32),</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -427,18 +467,21 @@ static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns</div><div class='ctx'> 		return snd_ctl_elem_add_compat(ctl, argp, 0);</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_ELEM_REPLACE32:</div><div class='ctx'> 		return snd_ctl_elem_add_compat(ctl, argp, 1);</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+	case SNDRV_CTL_IOCTL_ELEM_READ_X32:</div><div class='add'>+		return snd_ctl_elem_read_user_x32(ctl-&gt;card, argp);</div><div class='add'>+	case SNDRV_CTL_IOCTL_ELEM_WRITE_X32:</div><div class='add'>+		return snd_ctl_elem_write_user_x32(ctl, argp);</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;snd_ioctl_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	list_for_each_entry(p, &amp;snd_control_compat_ioctls, list) {</div><div class='ctx'> 		if (p-&gt;fioctl) {</div><div class='ctx'> 			err = p-&gt;fioctl(ctl-&gt;card, ctl, cmd, arg);</div><div class='del'>-			if (err != -ENOIOCTLCMD) {</div><div class='del'>-				up_read(&amp;snd_ioctl_rwsem);</div><div class='add'>+			if (err != -ENOIOCTLCMD)</div><div class='ctx'> 				return err;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;snd_ioctl_rwsem);</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/control_led.c b/sound/core/control_led.c<br/>new file mode 100644<br/>index 000000000000..e33dfcf863cf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/control_led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/control_led.c</a></div><div class='hunk'>@@ -0,0 +1,789 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  LED state routines for driver control interface</div><div class='add'>+ *  Copyright (c) 2021 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='add'>+MODULE_DESCRIPTION("ALSA control interface to LED trigger code.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define MAX_LED (((SNDRV_CTL_ELEM_ACCESS_MIC_LED - SNDRV_CTL_ELEM_ACCESS_SPK_LED) \</div><div class='add'>+			&gt;&gt; SNDRV_CTL_ELEM_ACCESS_LED_SHIFT) + 1)</div><div class='add'>+</div><div class='add'>+#define to_led_card_dev(_dev) \</div><div class='add'>+	container_of(_dev, struct snd_ctl_led_card, dev)</div><div class='add'>+</div><div class='add'>+enum snd_ctl_led_mode {</div><div class='add'>+	 MODE_FOLLOW_MUTE = 0,</div><div class='add'>+	 MODE_FOLLOW_ROUTE,</div><div class='add'>+	 MODE_OFF,</div><div class='add'>+	 MODE_ON,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ctl_led_card {</div><div class='add'>+	struct device dev;</div><div class='add'>+	int number;</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ctl_led {</div><div class='add'>+	struct device dev;</div><div class='add'>+	struct list_head controls;</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int group;</div><div class='add'>+	enum led_audio trigger_type;</div><div class='add'>+	enum snd_ctl_led_mode mode;</div><div class='add'>+	struct snd_ctl_led_card *cards[SNDRV_CARDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ctl_led_ctl {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	unsigned int access;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	unsigned int index_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(snd_ctl_led_mutex);</div><div class='add'>+static bool snd_ctl_led_card_valid[SNDRV_CARDS];</div><div class='add'>+static struct led_trigger *snd_ctl_ledtrig_audio[NUM_AUDIO_LEDS];</div><div class='add'>+static struct snd_ctl_led snd_ctl_leds[MAX_LED] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "speaker",</div><div class='add'>+		.group = (SNDRV_CTL_ELEM_ACCESS_SPK_LED &gt;&gt; SNDRV_CTL_ELEM_ACCESS_LED_SHIFT) - 1,</div><div class='add'>+		.trigger_type = LED_AUDIO_MUTE,</div><div class='add'>+		.mode = MODE_FOLLOW_MUTE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "mic",</div><div class='add'>+		.group = (SNDRV_CTL_ELEM_ACCESS_MIC_LED &gt;&gt; SNDRV_CTL_ELEM_ACCESS_LED_SHIFT) - 1,</div><div class='add'>+		.trigger_type = LED_AUDIO_MICMUTE,</div><div class='add'>+		.mode = MODE_FOLLOW_MUTE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_sysfs_add(struct snd_card *card);</div><div class='add'>+static void snd_ctl_led_sysfs_remove(struct snd_card *card);</div><div class='add'>+</div><div class='add'>+#define UPDATE_ROUTE(route, cb) \</div><div class='add'>+	do { \</div><div class='add'>+		int route2 = (cb); \</div><div class='add'>+		if (route2 &gt;= 0) \</div><div class='add'>+			route = route &lt; 0 ? route2 : (route | route2); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static inline unsigned int access_to_group(unsigned int access)</div><div class='add'>+{</div><div class='add'>+	return ((access &amp; SNDRV_CTL_ELEM_ACCESS_LED_MASK) &gt;&gt;</div><div class='add'>+				SNDRV_CTL_ELEM_ACCESS_LED_SHIFT) - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int group_to_access(unsigned int group)</div><div class='add'>+{</div><div class='add'>+	return (group + 1) &lt;&lt; SNDRV_CTL_ELEM_ACCESS_LED_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_ctl_led *snd_ctl_led_get_by_access(unsigned int access)</div><div class='add'>+{</div><div class='add'>+	unsigned int group = access_to_group(access);</div><div class='add'>+	if (group &gt;= MAX_LED)</div><div class='add'>+		return NULL;</div><div class='add'>+	return &amp;snd_ctl_leds[group];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A note for callers:</div><div class='add'>+ *   The two static variables info and value are protected using snd_ctl_led_mutex.</div><div class='add'>+ */</div><div class='add'>+static int snd_ctl_led_get(struct snd_ctl_led_ctl *lctl)</div><div class='add'>+{</div><div class='add'>+	static struct snd_ctl_elem_info info;</div><div class='add'>+	static struct snd_ctl_elem_value value;</div><div class='add'>+	struct snd_kcontrol *kctl = lctl-&gt;kctl;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.id = kctl-&gt;id;</div><div class='add'>+	info.id.index += lctl-&gt;index_offset;</div><div class='add'>+	info.id.numid += lctl-&gt;index_offset;</div><div class='add'>+	result = kctl-&gt;info(kctl, &amp;info);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	memset(&amp;value, 0, sizeof(value));</div><div class='add'>+	value.id = info.id;</div><div class='add'>+	result = kctl-&gt;get(kctl, &amp;value);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	if (info.type == SNDRV_CTL_ELEM_TYPE_BOOLEAN ||</div><div class='add'>+	    info.type == SNDRV_CTL_ELEM_TYPE_INTEGER) {</div><div class='add'>+		for (i = 0; i &lt; info.count; i++)</div><div class='add'>+			if (value.value.integer.value[i] != info.value.integer.min)</div><div class='add'>+				return 1;</div><div class='add'>+	} else if (info.type == SNDRV_CTL_ELEM_TYPE_INTEGER64) {</div><div class='add'>+		for (i = 0; i &lt; info.count; i++)</div><div class='add'>+			if (value.value.integer64.value[i] != info.value.integer64.min)</div><div class='add'>+				return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access,</div><div class='add'>+				  struct snd_kcontrol *kctl, unsigned int ioff)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	struct snd_ctl_led_ctl *lctl;</div><div class='add'>+	int route;</div><div class='add'>+	bool found;</div><div class='add'>+</div><div class='add'>+	led = snd_ctl_led_get_by_access(access);</div><div class='add'>+	if (!led)</div><div class='add'>+		return;</div><div class='add'>+	route = -1;</div><div class='add'>+	found = false;</div><div class='add'>+	scoped_guard(mutex, &amp;snd_ctl_led_mutex) {</div><div class='add'>+		/* the card may not be registered (active) at this point */</div><div class='add'>+		if (card &amp;&amp; !snd_ctl_led_card_valid[card-&gt;number])</div><div class='add'>+			return;</div><div class='add'>+		list_for_each_entry(lctl, &amp;led-&gt;controls, list) {</div><div class='add'>+			if (lctl-&gt;kctl == kctl &amp;&amp; lctl-&gt;index_offset == ioff)</div><div class='add'>+				found = true;</div><div class='add'>+			UPDATE_ROUTE(route, snd_ctl_led_get(lctl));</div><div class='add'>+		}</div><div class='add'>+		if (!found &amp;&amp; kctl &amp;&amp; card) {</div><div class='add'>+			lctl = kzalloc(sizeof(*lctl), GFP_KERNEL);</div><div class='add'>+			if (lctl) {</div><div class='add'>+				lctl-&gt;card = card;</div><div class='add'>+				lctl-&gt;access = access;</div><div class='add'>+				lctl-&gt;kctl = kctl;</div><div class='add'>+				lctl-&gt;index_offset = ioff;</div><div class='add'>+				list_add(&amp;lctl-&gt;list, &amp;led-&gt;controls);</div><div class='add'>+				UPDATE_ROUTE(route, snd_ctl_led_get(lctl));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	switch (led-&gt;mode) {</div><div class='add'>+	case MODE_OFF:		route = 1; break;</div><div class='add'>+	case MODE_ON:		route = 0; break;</div><div class='add'>+	case MODE_FOLLOW_ROUTE:	if (route &gt;= 0) route ^= 1; break;</div><div class='add'>+	case MODE_FOLLOW_MUTE:	/* noop */ break;</div><div class='add'>+	}</div><div class='add'>+	if (route &gt;= 0) {</div><div class='add'>+		struct led_trigger *trig = snd_ctl_ledtrig_audio[led-&gt;trigger_type];</div><div class='add'>+</div><div class='add'>+		led_trigger_event(trig, route ? LED_OFF : LED_ON);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_ctl_led_ctl *snd_ctl_led_find(struct snd_kcontrol *kctl, unsigned int ioff)</div><div class='add'>+{</div><div class='add'>+	struct list_head *controls;</div><div class='add'>+	struct snd_ctl_led_ctl *lctl;</div><div class='add'>+	unsigned int group;</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		controls = &amp;snd_ctl_leds[group].controls;</div><div class='add'>+		list_for_each_entry(lctl, controls, list)</div><div class='add'>+			if (lctl-&gt;kctl == kctl &amp;&amp; lctl-&gt;index_offset == ioff)</div><div class='add'>+				return lctl;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int snd_ctl_led_remove(struct snd_kcontrol *kctl, unsigned int ioff,</div><div class='add'>+				       unsigned int access)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_ctl *lctl;</div><div class='add'>+	unsigned int ret = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;snd_ctl_led_mutex);</div><div class='add'>+	lctl = snd_ctl_led_find(kctl, ioff);</div><div class='add'>+	if (lctl &amp;&amp; (access == 0 || access != lctl-&gt;access)) {</div><div class='add'>+		ret = lctl-&gt;access;</div><div class='add'>+		list_del(&amp;lctl-&gt;list);</div><div class='add'>+		kfree(lctl);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_notify(struct snd_card *card, unsigned int mask,</div><div class='add'>+			       struct snd_kcontrol *kctl, unsigned int ioff)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_volatile *vd;</div><div class='add'>+	unsigned int access, access2;</div><div class='add'>+</div><div class='add'>+	if (mask == SNDRV_CTL_EVENT_MASK_REMOVE) {</div><div class='add'>+		access = snd_ctl_led_remove(kctl, ioff, 0);</div><div class='add'>+		if (access)</div><div class='add'>+			snd_ctl_led_set_state(card, access, NULL, 0);</div><div class='add'>+	} else if (mask &amp; SNDRV_CTL_EVENT_MASK_INFO) {</div><div class='add'>+		vd = &amp;kctl-&gt;vd[ioff];</div><div class='add'>+		access = vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_LED_MASK;</div><div class='add'>+		access2 = snd_ctl_led_remove(kctl, ioff, access);</div><div class='add'>+		if (access2)</div><div class='add'>+			snd_ctl_led_set_state(card, access2, NULL, 0);</div><div class='add'>+		if (access)</div><div class='add'>+			snd_ctl_led_set_state(card, access, kctl, ioff);</div><div class='add'>+	} else if ((mask &amp; (SNDRV_CTL_EVENT_MASK_ADD |</div><div class='add'>+			    SNDRV_CTL_EVENT_MASK_VALUE)) != 0) {</div><div class='add'>+		vd = &amp;kctl-&gt;vd[ioff];</div><div class='add'>+		access = vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_LED_MASK;</div><div class='add'>+		if (access)</div><div class='add'>+			snd_ctl_led_set_state(card, access, kctl, ioff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(snd_card_unref, struct snd_card *, if (_T) snd_card_unref(_T))</div><div class='add'>+</div><div class='add'>+static int snd_ctl_led_set_id(int card_number, struct snd_ctl_elem_id *id,</div><div class='add'>+			      unsigned int group, bool set)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card __free(snd_card_unref) = NULL;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_kcontrol_volatile *vd;</div><div class='add'>+	unsigned int ioff, access, new_access;</div><div class='add'>+</div><div class='add'>+	card = snd_card_ref(card_number);</div><div class='add'>+	if (!card)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	guard(rwsem_write)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_id(card, id);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	ioff = snd_ctl_get_ioff(kctl, id);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[ioff];</div><div class='add'>+	access = vd-&gt;access &amp; SNDRV_CTL_ELEM_ACCESS_LED_MASK;</div><div class='add'>+	if (access != 0 &amp;&amp; access != group_to_access(group))</div><div class='add'>+		return -EXDEV;</div><div class='add'>+	new_access = vd-&gt;access &amp; ~SNDRV_CTL_ELEM_ACCESS_LED_MASK;</div><div class='add'>+	if (set)</div><div class='add'>+		new_access |= group_to_access(group);</div><div class='add'>+	if (new_access != vd-&gt;access) {</div><div class='add'>+		vd-&gt;access = new_access;</div><div class='add'>+		snd_ctl_led_notify(card, SNDRV_CTL_EVENT_MASK_INFO, kctl, ioff);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_refresh(void)</div><div class='add'>+{</div><div class='add'>+	unsigned int group;</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++)</div><div class='add'>+		snd_ctl_led_set_state(NULL, group_to_access(group), NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_ctl_destroy(struct snd_ctl_led_ctl *lctl)</div><div class='add'>+{</div><div class='add'>+	list_del(&amp;lctl-&gt;list);</div><div class='add'>+	kfree(lctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_clean(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	unsigned int group;</div><div class='add'>+	struct snd_ctl_led_ctl *lctl, *_lctl;</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		list_for_each_entry_safe(lctl, _lctl, &amp;led-&gt;controls, list)</div><div class='add'>+			if (!card || lctl-&gt;card == card)</div><div class='add'>+				snd_ctl_led_ctl_destroy(lctl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ctl_led_reset(int card_number, unsigned int group)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card __free(snd_card_unref) = NULL;</div><div class='add'>+	struct snd_ctl_led_ctl *lctl, *_lctl;</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	struct snd_kcontrol_volatile *vd;</div><div class='add'>+	bool change = false;</div><div class='add'>+</div><div class='add'>+	card = snd_card_ref(card_number);</div><div class='add'>+	if (!card)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;snd_ctl_led_mutex) {</div><div class='add'>+		if (!snd_ctl_led_card_valid[card_number])</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		list_for_each_entry_safe(lctl, _lctl, &amp;led-&gt;controls, list)</div><div class='add'>+			if (lctl-&gt;card == card) {</div><div class='add'>+				vd = &amp;lctl-&gt;kctl-&gt;vd[lctl-&gt;index_offset];</div><div class='add'>+				vd-&gt;access &amp;= ~group_to_access(group);</div><div class='add'>+				snd_ctl_led_ctl_destroy(lctl);</div><div class='add'>+				change = true;</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+	if (change)</div><div class='add'>+		snd_ctl_led_set_state(NULL, group_to_access(group), NULL, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_register(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	unsigned int ioff;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(card-&gt;number &lt; 0 ||</div><div class='add'>+		       card-&gt;number &gt;= ARRAY_SIZE(snd_ctl_led_card_valid)))</div><div class='add'>+		return;</div><div class='add'>+	scoped_guard(mutex, &amp;snd_ctl_led_mutex)</div><div class='add'>+		snd_ctl_led_card_valid[card-&gt;number] = true;</div><div class='add'>+	/* the register callback is already called with held card-&gt;controls_rwsem */</div><div class='add'>+	list_for_each_entry(kctl, &amp;card-&gt;controls, list)</div><div class='add'>+		for (ioff = 0; ioff &lt; kctl-&gt;count; ioff++)</div><div class='add'>+			snd_ctl_led_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, kctl, ioff);</div><div class='add'>+	snd_ctl_led_refresh();</div><div class='add'>+	snd_ctl_led_sysfs_add(card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_disconnect(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	snd_ctl_led_sysfs_remove(card);</div><div class='add'>+	scoped_guard(mutex, &amp;snd_ctl_led_mutex) {</div><div class='add'>+		snd_ctl_led_card_valid[card-&gt;number] = false;</div><div class='add'>+		snd_ctl_led_clean(card);</div><div class='add'>+	}</div><div class='add'>+	snd_ctl_led_refresh();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_card_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_card *led_card = to_led_card_dev(dev);</div><div class='add'>+</div><div class='add'>+	kfree(led_card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sysfs</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static ssize_t mode_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev);</div><div class='add'>+	const char *str = NULL;</div><div class='add'>+</div><div class='add'>+	switch (led-&gt;mode) {</div><div class='add'>+	case MODE_FOLLOW_MUTE:	str = "follow-mute"; break;</div><div class='add'>+	case MODE_FOLLOW_ROUTE:	str = "follow-route"; break;</div><div class='add'>+	case MODE_ON:		str = "on"; break;</div><div class='add'>+	case MODE_OFF:		str = "off"; break;</div><div class='add'>+	}</div><div class='add'>+	return sysfs_emit(buf, "%s\n", str);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t mode_store(struct device *dev,</div><div class='add'>+			  struct device_attribute *attr,</div><div class='add'>+			  const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev);</div><div class='add'>+	char _buf[16];</div><div class='add'>+	size_t l = min(count, sizeof(_buf) - 1);</div><div class='add'>+	enum snd_ctl_led_mode mode;</div><div class='add'>+</div><div class='add'>+	memcpy(_buf, buf, l);</div><div class='add'>+	_buf[l] = '\0';</div><div class='add'>+	if (strstr(_buf, "mute"))</div><div class='add'>+		mode = MODE_FOLLOW_MUTE;</div><div class='add'>+	else if (strstr(_buf, "route"))</div><div class='add'>+		mode = MODE_FOLLOW_ROUTE;</div><div class='add'>+	else if (strncmp(_buf, "off", 3) == 0 || strncmp(_buf, "0", 1) == 0)</div><div class='add'>+		mode = MODE_OFF;</div><div class='add'>+	else if (strncmp(_buf, "on", 2) == 0 || strncmp(_buf, "1", 1) == 0)</div><div class='add'>+		mode = MODE_ON;</div><div class='add'>+	else</div><div class='add'>+		return count;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;snd_ctl_led_mutex)</div><div class='add'>+		led-&gt;mode = mode;</div><div class='add'>+</div><div class='add'>+	snd_ctl_led_set_state(NULL, group_to_access(led-&gt;group), NULL, 0);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t brightness_show(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev);</div><div class='add'>+	struct led_trigger *trig = snd_ctl_ledtrig_audio[led-&gt;trigger_type];</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", led_trigger_get_brightness(trig));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RW(mode);</div><div class='add'>+static DEVICE_ATTR_RO(brightness);</div><div class='add'>+</div><div class='add'>+static struct attribute *snd_ctl_led_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_mode.attr,</div><div class='add'>+	&amp;dev_attr_brightness.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group snd_ctl_led_dev_attr_group = {</div><div class='add'>+	.attrs = snd_ctl_led_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *snd_ctl_led_dev_attr_groups[] = {</div><div class='add'>+	&amp;snd_ctl_led_dev_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *find_eos(char *s)</div><div class='add'>+{</div><div class='add'>+	while (*s &amp;&amp; *s != ',')</div><div class='add'>+		s++;</div><div class='add'>+	if (*s)</div><div class='add'>+		s++;</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *parse_uint(char *s, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	unsigned long long res;</div><div class='add'>+	if (kstrtoull(s, 10, &amp;res))</div><div class='add'>+		res = 0;</div><div class='add'>+	*val = res;</div><div class='add'>+	return find_eos(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *parse_string(char *s, char *val, size_t val_size)</div><div class='add'>+{</div><div class='add'>+	if (*s == '"' || *s == '\'') {</div><div class='add'>+		char c = *s;</div><div class='add'>+		s++;</div><div class='add'>+		while (*s &amp;&amp; *s != c) {</div><div class='add'>+			if (val_size &gt; 1) {</div><div class='add'>+				*val++ = *s;</div><div class='add'>+				val_size--;</div><div class='add'>+			}</div><div class='add'>+			s++;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		while (*s &amp;&amp; *s != ',') {</div><div class='add'>+			if (val_size &gt; 1) {</div><div class='add'>+				*val++ = *s;</div><div class='add'>+				val_size--;</div><div class='add'>+			}</div><div class='add'>+			s++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*val = '\0';</div><div class='add'>+	if (*s)</div><div class='add'>+		s++;</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *parse_iface(char *s, snd_ctl_elem_iface_t *val)</div><div class='add'>+{</div><div class='add'>+	if (!strncasecmp(s, "card", 4))</div><div class='add'>+		*val = SNDRV_CTL_ELEM_IFACE_CARD;</div><div class='add'>+	else if (!strncasecmp(s, "mixer", 5))</div><div class='add'>+		*val = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	return find_eos(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These types of input strings are accepted:</div><div class='add'>+ *</div><div class='add'>+ *   unsigned integer - numid (equivaled to numid=UINT)</div><div class='add'>+ *   string - basic mixer name (equivalent to iface=MIXER,name=STR)</div><div class='add'>+ *   numid=UINT</div><div class='add'>+ *   [iface=MIXER,][device=UINT,][subdevice=UINT,]name=STR[,index=UINT]</div><div class='add'>+ */</div><div class='add'>+static ssize_t set_led_id(struct snd_ctl_led_card *led_card, const char *buf, size_t count,</div><div class='add'>+			  bool attach)</div><div class='add'>+{</div><div class='add'>+	char buf2[256], *s, *os;</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (strscpy(buf2, buf, sizeof(buf2)) &lt; 0)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+	memset(&amp;id, 0, sizeof(id));</div><div class='add'>+	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	s = buf2;</div><div class='add'>+	while (*s) {</div><div class='add'>+		os = s;</div><div class='add'>+		if (!strncasecmp(s, "numid=", 6)) {</div><div class='add'>+			s = parse_uint(s + 6, &amp;id.numid);</div><div class='add'>+		} else if (!strncasecmp(s, "iface=", 6)) {</div><div class='add'>+			s = parse_iface(s + 6, &amp;id.iface);</div><div class='add'>+		} else if (!strncasecmp(s, "device=", 7)) {</div><div class='add'>+			s = parse_uint(s + 7, &amp;id.device);</div><div class='add'>+		} else if (!strncasecmp(s, "subdevice=", 10)) {</div><div class='add'>+			s = parse_uint(s + 10, &amp;id.subdevice);</div><div class='add'>+		} else if (!strncasecmp(s, "name=", 5)) {</div><div class='add'>+			s = parse_string(s + 5, id.name, sizeof(id.name));</div><div class='add'>+		} else if (!strncasecmp(s, "index=", 6)) {</div><div class='add'>+			s = parse_uint(s + 6, &amp;id.index);</div><div class='add'>+		} else if (s == buf2) {</div><div class='add'>+			while (*s) {</div><div class='add'>+				if (*s &lt; '0' || *s &gt; '9')</div><div class='add'>+					break;</div><div class='add'>+				s++;</div><div class='add'>+			}</div><div class='add'>+			if (*s == '\0')</div><div class='add'>+				parse_uint(buf2, &amp;id.numid);</div><div class='add'>+			else {</div><div class='add'>+				for (; *s &gt;= ' '; s++);</div><div class='add'>+				*s = '\0';</div><div class='add'>+				strscpy(id.name, buf2, sizeof(id.name));</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (*s == ',')</div><div class='add'>+			s++;</div><div class='add'>+		if (s == os)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_led_set_id(led_card-&gt;number, &amp;id, led_card-&gt;led-&gt;group, attach);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t attach_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_card *led_card = container_of(dev, struct snd_ctl_led_card, dev);</div><div class='add'>+	return set_led_id(led_card, buf, count, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t detach_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_card *led_card = container_of(dev, struct snd_ctl_led_card, dev);</div><div class='add'>+	return set_led_id(led_card, buf, count, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t reset_store(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_card *led_card = container_of(dev, struct snd_ctl_led_card, dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (count &gt; 0 &amp;&amp; buf[0] == '1') {</div><div class='add'>+		err = snd_ctl_led_reset(led_card-&gt;number, led_card-&gt;led-&gt;group);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t list_show(struct device *dev,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led_card *led_card = container_of(dev, struct snd_ctl_led_card, dev);</div><div class='add'>+	struct snd_card *card __free(snd_card_unref) = NULL;</div><div class='add'>+	struct snd_ctl_led_ctl *lctl;</div><div class='add'>+	size_t l = 0;</div><div class='add'>+</div><div class='add'>+	card = snd_card_ref(led_card-&gt;number);</div><div class='add'>+	if (!card)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(mutex)(&amp;snd_ctl_led_mutex);</div><div class='add'>+	if (snd_ctl_led_card_valid[led_card-&gt;number]) {</div><div class='add'>+		list_for_each_entry(lctl, &amp;led_card-&gt;led-&gt;controls, list) {</div><div class='add'>+			if (lctl-&gt;card != card)</div><div class='add'>+				continue;</div><div class='add'>+			if (l)</div><div class='add'>+				l += sysfs_emit_at(buf, l, " ");</div><div class='add'>+			l += sysfs_emit_at(buf, l, "%u",</div><div class='add'>+					   lctl-&gt;kctl-&gt;id.numid + lctl-&gt;index_offset);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return l;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_WO(attach);</div><div class='add'>+static DEVICE_ATTR_WO(detach);</div><div class='add'>+static DEVICE_ATTR_WO(reset);</div><div class='add'>+static DEVICE_ATTR_RO(list);</div><div class='add'>+</div><div class='add'>+static struct attribute *snd_ctl_led_card_attrs[] = {</div><div class='add'>+	&amp;dev_attr_attach.attr,</div><div class='add'>+	&amp;dev_attr_detach.attr,</div><div class='add'>+	&amp;dev_attr_reset.attr,</div><div class='add'>+	&amp;dev_attr_list.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group snd_ctl_led_card_attr_group = {</div><div class='add'>+	.attrs = snd_ctl_led_card_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *snd_ctl_led_card_attr_groups[] = {</div><div class='add'>+	&amp;snd_ctl_led_card_attr_group,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct device snd_ctl_led_dev;</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_sysfs_add(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	unsigned int group;</div><div class='add'>+	struct snd_ctl_led_card *led_card;</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	char link_name[32];</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		led_card = kzalloc(sizeof(*led_card), GFP_KERNEL);</div><div class='add'>+		if (!led_card)</div><div class='add'>+			goto cerr2;</div><div class='add'>+		led_card-&gt;number = card-&gt;number;</div><div class='add'>+		led_card-&gt;led = led;</div><div class='add'>+		device_initialize(&amp;led_card-&gt;dev);</div><div class='add'>+		led_card-&gt;dev.release = snd_ctl_led_card_release;</div><div class='add'>+		if (dev_set_name(&amp;led_card-&gt;dev, "card%d", card-&gt;number) &lt; 0)</div><div class='add'>+			goto cerr;</div><div class='add'>+		led_card-&gt;dev.parent = &amp;led-&gt;dev;</div><div class='add'>+		led_card-&gt;dev.groups = snd_ctl_led_card_attr_groups;</div><div class='add'>+		if (device_add(&amp;led_card-&gt;dev))</div><div class='add'>+			goto cerr;</div><div class='add'>+		led-&gt;cards[card-&gt;number] = led_card;</div><div class='add'>+		snprintf(link_name, sizeof(link_name), "led-%s", led-&gt;name);</div><div class='add'>+		if (sysfs_create_link(&amp;card-&gt;ctl_dev-&gt;kobj, &amp;led_card-&gt;dev.kobj,</div><div class='add'>+				      link_name))</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"%s: can't create symlink to controlC%i device\n",</div><div class='add'>+				 __func__, card-&gt;number);</div><div class='add'>+		if (sysfs_create_link(&amp;led_card-&gt;dev.kobj, &amp;card-&gt;card_dev.kobj,</div><div class='add'>+				      "card"))</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"%s: can't create symlink to card%i\n",</div><div class='add'>+				__func__, card-&gt;number);</div><div class='add'>+</div><div class='add'>+		continue;</div><div class='add'>+cerr:</div><div class='add'>+		put_device(&amp;led_card-&gt;dev);</div><div class='add'>+cerr2:</div><div class='add'>+		dev_err(card-&gt;dev, "snd_ctl_led: unable to add card%d", card-&gt;number);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ctl_led_sysfs_remove(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	unsigned int group;</div><div class='add'>+	struct snd_ctl_led_card *led_card;</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	char link_name[32];</div><div class='add'>+</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		led_card = led-&gt;cards[card-&gt;number];</div><div class='add'>+		if (!led_card)</div><div class='add'>+			continue;</div><div class='add'>+		snprintf(link_name, sizeof(link_name), "led-%s", led-&gt;name);</div><div class='add'>+		sysfs_remove_link(&amp;card-&gt;ctl_dev-&gt;kobj, link_name);</div><div class='add'>+		sysfs_remove_link(&amp;led_card-&gt;dev.kobj, "card");</div><div class='add'>+		device_unregister(&amp;led_card-&gt;dev);</div><div class='add'>+		led-&gt;cards[card-&gt;number] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Control layer registration</div><div class='add'>+ */</div><div class='add'>+static struct snd_ctl_layer_ops snd_ctl_led_lops = {</div><div class='add'>+	.module_name = SND_CTL_LAYER_MODULE_LED,</div><div class='add'>+	.lregister = snd_ctl_led_register,</div><div class='add'>+	.ldisconnect = snd_ctl_led_disconnect,</div><div class='add'>+	.lnotify = snd_ctl_led_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_ctl_led_init(void)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	unsigned int group;</div><div class='add'>+</div><div class='add'>+	led_trigger_register_simple("audio-mute", &amp;snd_ctl_ledtrig_audio[LED_AUDIO_MUTE]);</div><div class='add'>+	led_trigger_register_simple("audio-micmute", &amp;snd_ctl_ledtrig_audio[LED_AUDIO_MICMUTE]);</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;snd_ctl_led_dev);</div><div class='add'>+	snd_ctl_led_dev.class = &amp;sound_class;</div><div class='add'>+	snd_ctl_led_dev.release = snd_ctl_led_dev_release;</div><div class='add'>+	dev_set_name(&amp;snd_ctl_led_dev, "ctl-led");</div><div class='add'>+	if (device_add(&amp;snd_ctl_led_dev)) {</div><div class='add'>+		put_device(&amp;snd_ctl_led_dev);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		INIT_LIST_HEAD(&amp;led-&gt;controls);</div><div class='add'>+		device_initialize(&amp;led-&gt;dev);</div><div class='add'>+		led-&gt;dev.parent = &amp;snd_ctl_led_dev;</div><div class='add'>+		led-&gt;dev.release = snd_ctl_led_release;</div><div class='add'>+		led-&gt;dev.groups = snd_ctl_led_dev_attr_groups;</div><div class='add'>+		dev_set_name(&amp;led-&gt;dev, led-&gt;name);</div><div class='add'>+		if (device_add(&amp;led-&gt;dev)) {</div><div class='add'>+			put_device(&amp;led-&gt;dev);</div><div class='add'>+			for (; group &gt; 0; group--) {</div><div class='add'>+				led = &amp;snd_ctl_leds[group - 1];</div><div class='add'>+				device_unregister(&amp;led-&gt;dev);</div><div class='add'>+			}</div><div class='add'>+			device_unregister(&amp;snd_ctl_led_dev);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	snd_ctl_register_layer(&amp;snd_ctl_led_lops);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_ctl_led_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_led *led;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	unsigned int group, card_number;</div><div class='add'>+</div><div class='add'>+	snd_ctl_disconnect_layer(&amp;snd_ctl_led_lops);</div><div class='add'>+	for (card_number = 0; card_number &lt; SNDRV_CARDS; card_number++) {</div><div class='add'>+		if (!snd_ctl_led_card_valid[card_number])</div><div class='add'>+			continue;</div><div class='add'>+		card = snd_card_ref(card_number);</div><div class='add'>+		if (card) {</div><div class='add'>+			snd_ctl_led_sysfs_remove(card);</div><div class='add'>+			snd_card_unref(card);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (group = 0; group &lt; MAX_LED; group++) {</div><div class='add'>+		led = &amp;snd_ctl_leds[group];</div><div class='add'>+		device_unregister(&amp;led-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	device_unregister(&amp;snd_ctl_led_dev);</div><div class='add'>+	snd_ctl_led_clean(NULL);</div><div class='add'>+</div><div class='add'>+	led_trigger_unregister_simple(snd_ctl_ledtrig_audio[LED_AUDIO_MUTE]);</div><div class='add'>+	led_trigger_unregister_simple(snd_ctl_ledtrig_audio[LED_AUDIO_MICMUTE]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_ctl_led_init)</div><div class='add'>+module_exit(snd_ctl_led_exit)</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("ledtrig:audio-mute");</div><div class='add'>+MODULE_ALIAS("ledtrig:audio-micmute");</div><div class='head'>diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c<br/>new file mode 100644<br/>index 000000000000..709b1a9c2caa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/ctljack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/ctljack.c</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Helper functions for jack-detection kcontrols</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+</div><div class='add'>+#define jack_detect_kctl_info	snd_ctl_boolean_mono_info</div><div class='add'>+</div><div class='add'>+static int jack_detect_kctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = kcontrol-&gt;private_value;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new jack_detect_kctl = {</div><div class='add'>+	/* name is filled later */</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+	.info = jack_detect_kctl_info,</div><div class='add'>+	.get = jack_detect_kctl_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_available_index(struct snd_card *card, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id sid;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sid, 0, sizeof(sid));</div><div class='add'>+</div><div class='add'>+	sid.index = 0;</div><div class='add'>+	sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;</div><div class='add'>+	strscpy(sid.name, name, sizeof(sid.name));</div><div class='add'>+</div><div class='add'>+	while (snd_ctl_find_id(card, &amp;sid)) {</div><div class='add'>+		sid.index++;</div><div class='add'>+		/* reset numid; otherwise snd_ctl_find_id() hits this again */</div><div class='add'>+		sid.numid = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sid.index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void jack_kctl_name_gen(char *name, const char *src_name, int size)</div><div class='add'>+{</div><div class='add'>+	size_t count = strlen(src_name);</div><div class='add'>+	bool need_cat = true;</div><div class='add'>+</div><div class='add'>+	/* remove redundant " Jack" from src_name */</div><div class='add'>+	if (count &gt;= 5)</div><div class='add'>+		need_cat = strncmp(&amp;src_name[count - 5], " Jack", 5) ? true : false;</div><div class='add'>+</div><div class='add'>+	snprintf(name, size, need_cat ? "%s Jack" : "%s", src_name);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct snd_kcontrol *</div><div class='add'>+snd_kctl_jack_new(const char *name, struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;jack_detect_kctl, NULL);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	jack_kctl_name_gen(kctl-&gt;id.name, name, sizeof(kctl-&gt;id.name));</div><div class='add'>+	kctl-&gt;id.index = get_available_index(card, kctl-&gt;id.name);</div><div class='add'>+	kctl-&gt;private_value = 0;</div><div class='add'>+	return kctl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_kctl_jack_report(struct snd_card *card,</div><div class='add'>+			  struct snd_kcontrol *kctl, bool status)</div><div class='add'>+{</div><div class='add'>+	if (kctl-&gt;private_value == status)</div><div class='add'>+		return;</div><div class='add'>+	kctl-&gt;private_value = status;</div><div class='add'>+	snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/core/device.c b/sound/core/device.c<br/>index a67dfac08c03..cdc5af526739 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/device.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/device.c</a></div><div class='hunk'>@@ -1,26 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Device management routines</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -38,72 +24,71 @@</div><div class='ctx'>  * The data pointer plays a role as the identifier, too, so the</div><div class='ctx'>  * pointer address must be unique and unchanged.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_device_new(struct snd_card *card, snd_device_type_t type,</div><div class='del'>-		   void *device_data, struct snd_device_ops *ops)</div><div class='add'>+int snd_device_new(struct snd_card *card, enum snd_device_type type,</div><div class='add'>+		   void *device_data, const struct snd_device_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_device *dev;</div><div class='add'>+	struct list_head *p;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card || !device_data || !ops))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot allocate device\n");</div><div class='add'>+	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;dev-&gt;list);</div><div class='ctx'> 	dev-&gt;card = card;</div><div class='ctx'> 	dev-&gt;type = type;</div><div class='ctx'> 	dev-&gt;state = SNDRV_DEV_BUILD;</div><div class='ctx'> 	dev-&gt;device_data = device_data;</div><div class='ctx'> 	dev-&gt;ops = ops;</div><div class='del'>-	list_add(&amp;dev-&gt;list, &amp;card-&gt;devices);	/* add to the head of list */</div><div class='add'>+</div><div class='add'>+	/* insert the entry in an incrementally sorted list */</div><div class='add'>+	list_for_each_prev(p, &amp;card-&gt;devices) {</div><div class='add'>+		struct snd_device *pdev = list_entry(p, struct snd_device, list);</div><div class='add'>+		if ((unsigned int)pdev-&gt;type &lt;= (unsigned int)type)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;dev-&gt;list, p);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_device_new);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * snd_device_free - release the device from the card</div><div class='del'>- * @card: the card instance</div><div class='del'>- * @device_data: the data pointer to release</div><div class='del'>- *</div><div class='del'>- * Removes the device from the list on the card and invokes the</div><div class='del'>- * callbacks, dev_disconnect and dev_free, corresponding to the state.</div><div class='del'>- * Then release the device.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure or if the</div><div class='del'>- * device not found.</div><div class='del'>- */</div><div class='del'>-int snd_device_free(struct snd_card *card, void *device_data)</div><div class='add'>+static void __snd_device_disconnect(struct snd_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_device *dev;</div><div class='del'>-	</div><div class='del'>-	if (snd_BUG_ON(!card || !device_data))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (dev-&gt;device_data != device_data)</div><div class='del'>-			continue;</div><div class='del'>-		/* unlink */</div><div class='del'>-		list_del(&amp;dev-&gt;list);</div><div class='del'>-		if (dev-&gt;state == SNDRV_DEV_REGISTERED &amp;&amp;</div><div class='del'>-		    dev-&gt;ops-&gt;dev_disconnect)</div><div class='del'>-			if (dev-&gt;ops-&gt;dev_disconnect(dev))</div><div class='del'>-				snd_printk(KERN_ERR</div><div class='del'>-					   "device disconnect failure\n");</div><div class='del'>-		if (dev-&gt;ops-&gt;dev_free) {</div><div class='del'>-			if (dev-&gt;ops-&gt;dev_free(dev))</div><div class='del'>-				snd_printk(KERN_ERR "device free failure\n");</div><div class='del'>-		}</div><div class='del'>-		kfree(dev);</div><div class='del'>-		return 0;</div><div class='add'>+	if (dev-&gt;state == SNDRV_DEV_REGISTERED) {</div><div class='add'>+		if (dev-&gt;ops-&gt;dev_disconnect &amp;&amp;</div><div class='add'>+		    dev-&gt;ops-&gt;dev_disconnect(dev))</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "device disconnect failure\n");</div><div class='add'>+		dev-&gt;state = SNDRV_DEV_DISCONNECTED;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("device free %p (from %pF), not found\n", device_data,</div><div class='del'>-		   __builtin_return_address(0));</div><div class='del'>-	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_device_free);</div><div class='add'>+static void __snd_device_free(struct snd_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* unlink */</div><div class='add'>+	list_del(&amp;dev-&gt;list);</div><div class='add'>+</div><div class='add'>+	__snd_device_disconnect(dev);</div><div class='add'>+	if (dev-&gt;ops-&gt;dev_free) {</div><div class='add'>+		if (dev-&gt;ops-&gt;dev_free(dev))</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "device free failure\n");</div><div class='add'>+	}</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_device *look_for_dev(struct snd_card *card, void *device_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_device *dev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dev, &amp;card-&gt;devices, list)</div><div class='add'>+		if (dev-&gt;device_data == device_data)</div><div class='add'>+			return dev;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_device_disconnect - disconnect the device</div><div class='hunk'>@@ -115,29 +100,59 @@ EXPORT_SYMBOL(snd_device_free);</div><div class='ctx'>  *</div><div class='ctx'>  * Usually called from snd_card_disconnect().</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure or if the</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure or if the</div><div class='ctx'>  * device not found.</div><div class='ctx'>  */</div><div class='del'>-int snd_device_disconnect(struct snd_card *card, void *device_data)</div><div class='add'>+void snd_device_disconnect(struct snd_card *card, void *device_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card || !device_data))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (dev-&gt;device_data != device_data)</div><div class='del'>-			continue;</div><div class='del'>-		if (dev-&gt;state == SNDRV_DEV_REGISTERED &amp;&amp;</div><div class='del'>-		    dev-&gt;ops-&gt;dev_disconnect) {</div><div class='del'>-			if (dev-&gt;ops-&gt;dev_disconnect(dev))</div><div class='del'>-				snd_printk(KERN_ERR "device disconnect failure\n");</div><div class='del'>-			dev-&gt;state = SNDRV_DEV_DISCONNECTED;</div><div class='add'>+		return;</div><div class='add'>+	dev = look_for_dev(card, device_data);</div><div class='add'>+	if (dev)</div><div class='add'>+		__snd_device_disconnect(dev);</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(card-&gt;dev, "device disconnect %p (from %pS), not found\n",</div><div class='add'>+			device_data, __builtin_return_address(0));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_device_disconnect);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_device_free - release the device from the card</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @device_data: the data pointer to release</div><div class='add'>+ *</div><div class='add'>+ * Removes the device from the list on the card and invokes the</div><div class='add'>+ * callbacks, dev_disconnect and dev_free, corresponding to the state.</div><div class='add'>+ * Then release the device.</div><div class='add'>+ */</div><div class='add'>+void snd_device_free(struct snd_card *card, void *device_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_device *dev;</div><div class='add'>+	</div><div class='add'>+	if (snd_BUG_ON(!card || !device_data))</div><div class='add'>+		return;</div><div class='add'>+	dev = look_for_dev(card, device_data);</div><div class='add'>+	if (dev)</div><div class='add'>+		__snd_device_free(dev);</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(card-&gt;dev, "device free %p (from %pS), not found\n",</div><div class='add'>+			device_data, __builtin_return_address(0));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_device_free);</div><div class='add'>+</div><div class='add'>+static int __snd_device_register(struct snd_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;state == SNDRV_DEV_BUILD) {</div><div class='add'>+		if (dev-&gt;ops-&gt;dev_register) {</div><div class='add'>+			int err = dev-&gt;ops-&gt;dev_register(dev);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='del'>-		return 0;</div><div class='add'>+		dev-&gt;state = SNDRV_DEV_REGISTERED;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("device disconnect %p (from %pF), not found\n", device_data,</div><div class='del'>-		   __builtin_return_address(0));</div><div class='del'>-	return -ENXIO;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -150,32 +165,21 @@ int snd_device_disconnect(struct snd_card *card, void *device_data)</div><div class='ctx'>  * but it can be called later if any new devices are created after</div><div class='ctx'>  * invocation of snd_card_register().</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure or if the</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure or if the</div><div class='ctx'>  * device not found.</div><div class='ctx'>  */</div><div class='ctx'> int snd_device_register(struct snd_card *card, void *device_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_device *dev;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card || !device_data))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (dev-&gt;device_data != device_data)</div><div class='del'>-			continue;</div><div class='del'>-		if (dev-&gt;state == SNDRV_DEV_BUILD &amp;&amp; dev-&gt;ops-&gt;dev_register) {</div><div class='del'>-			if ((err = dev-&gt;ops-&gt;dev_register(dev)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			dev-&gt;state = SNDRV_DEV_REGISTERED;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		snd_printd("snd_device_register busy\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='add'>+	dev = look_for_dev(card, device_data);</div><div class='add'>+	if (dev)</div><div class='add'>+		return __snd_device_register(dev);</div><div class='ctx'> 	snd_BUG();</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_device_register);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -190,11 +194,9 @@ int snd_device_register_all(struct snd_card *card)</div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (dev-&gt;state == SNDRV_DEV_BUILD &amp;&amp; dev-&gt;ops-&gt;dev_register) {</div><div class='del'>-			if ((err = dev-&gt;ops-&gt;dev_register(dev)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			dev-&gt;state = SNDRV_DEV_REGISTERED;</div><div class='del'>-		}</div><div class='add'>+		err = __snd_device_register(dev);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -203,41 +205,35 @@ int snd_device_register_all(struct snd_card *card)</div><div class='ctx'>  * disconnect all the devices on the card.</div><div class='ctx'>  * called from init.c</div><div class='ctx'>  */</div><div class='del'>-int snd_device_disconnect_all(struct snd_card *card)</div><div class='add'>+void snd_device_disconnect_all(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_device *dev;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (snd_device_disconnect(card, dev-&gt;device_data) &lt; 0)</div><div class='del'>-			err = -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='add'>+		return;</div><div class='add'>+	list_for_each_entry_reverse(dev, &amp;card-&gt;devices, list)</div><div class='add'>+		__snd_device_disconnect(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * release all the devices on the card.</div><div class='ctx'>  * called from init.c</div><div class='ctx'>  */</div><div class='del'>-int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd)</div><div class='add'>+void snd_device_free_all(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct snd_device *dev;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int range_low, range_high;</div><div class='add'>+	struct snd_device *dev, *next;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	range_low = cmd * SNDRV_DEV_TYPE_RANGE_SIZE;</div><div class='del'>-	range_high = range_low + SNDRV_DEV_TYPE_RANGE_SIZE - 1;</div><div class='del'>-      __again:</div><div class='del'>-	list_for_each_entry(dev, &amp;card-&gt;devices, list) {</div><div class='del'>-		if (dev-&gt;type &gt;= range_low &amp;&amp; dev-&gt;type &lt;= range_high) {</div><div class='del'>-			if ((err = snd_device_free(card, dev-&gt;device_data)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			goto __again;</div><div class='del'>-		}</div><div class='add'>+		return;</div><div class='add'>+	list_for_each_entry_safe_reverse(dev, next, &amp;card-&gt;devices, list) {</div><div class='add'>+		/* exception: free ctl and lowlevel stuff later */</div><div class='add'>+		if (dev-&gt;type == SNDRV_DEV_CONTROL ||</div><div class='add'>+		    dev-&gt;type == SNDRV_DEV_LOWLEVEL)</div><div class='add'>+			continue;</div><div class='add'>+		__snd_device_free(dev);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/* free all */</div><div class='add'>+	list_for_each_entry_safe_reverse(dev, next, &amp;card-&gt;devices, list)</div><div class='add'>+		__snd_device_free(dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c<br/>index 7730575bfadd..2d5f4d47071f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/hrtimer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hrtimer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/hrtimer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/hrtimer.c</a></div><div class='hunk'>@@ -1,25 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * ALSA timer back-end using hrtimer</div><div class='ctx'>  * Copyright (C) 2008 Takashi Iwai</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='hunk'>@@ -38,36 +25,50 @@ static unsigned int resolution;</div><div class='ctx'> struct snd_hrtimer {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct hrtimer hrt;</div><div class='del'>-	atomic_t running;</div><div class='add'>+	bool in_callback;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt);</div><div class='ctx'> 	struct snd_timer *t = stime-&gt;timer;</div><div class='add'>+	ktime_t delta;</div><div class='add'>+	unsigned long ticks;</div><div class='add'>+	enum hrtimer_restart ret = HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;t-&gt;lock) {</div><div class='add'>+		if (!t-&gt;running)</div><div class='add'>+			return HRTIMER_NORESTART; /* fast path */</div><div class='add'>+		stime-&gt;in_callback = true;</div><div class='add'>+		ticks = t-&gt;sticks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* calculate the drift */</div><div class='add'>+	delta = ktime_sub(hrtimer_cb_get_time(hrt), hrtimer_get_expires(hrt));</div><div class='add'>+	if (delta &gt; 0)</div><div class='add'>+		ticks += ktime_divns(delta, ticks * resolution);</div><div class='ctx'> </div><div class='del'>-	if (!atomic_read(&amp;stime-&gt;running))</div><div class='del'>-		return HRTIMER_NORESTART;</div><div class='add'>+	snd_timer_interrupt(stime-&gt;timer, ticks);</div><div class='ctx'> </div><div class='del'>-	hrtimer_forward_now(hrt, ns_to_ktime(t-&gt;sticks * resolution));</div><div class='del'>-	snd_timer_interrupt(stime-&gt;timer, t-&gt;sticks);</div><div class='add'>+	guard(spinlock)(&amp;t-&gt;lock);</div><div class='add'>+	if (t-&gt;running) {</div><div class='add'>+		hrtimer_add_expires_ns(hrt, t-&gt;sticks * resolution);</div><div class='add'>+		ret = HRTIMER_RESTART;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!atomic_read(&amp;stime-&gt;running))</div><div class='del'>-		return HRTIMER_NORESTART;</div><div class='del'>-	return HRTIMER_RESTART;</div><div class='add'>+	stime-&gt;in_callback = false;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_hrtimer_open(struct snd_timer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hrtimer *stime;</div><div class='ctx'> </div><div class='del'>-	stime = kmalloc(sizeof(*stime), GFP_KERNEL);</div><div class='add'>+	stime = kzalloc(sizeof(*stime), GFP_KERNEL);</div><div class='ctx'> 	if (!stime)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	hrtimer_init(&amp;stime-&gt;hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> 	stime-&gt;timer = t;</div><div class='del'>-	stime-&gt;hrt.function = snd_hrtimer_callback;</div><div class='del'>-	atomic_set(&amp;stime-&gt;running, 0);</div><div class='add'>+	hrtimer_setup(&amp;stime-&gt;hrt, snd_hrtimer_callback, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> 	t-&gt;private_data = stime;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -77,6 +78,11 @@ static int snd_hrtimer_close(struct snd_timer *t)</div><div class='ctx'> 	struct snd_hrtimer *stime = t-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (stime) {</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;t-&gt;lock) {</div><div class='add'>+			t-&gt;running = 0; /* just to be sure */</div><div class='add'>+			stime-&gt;in_callback = 1; /* skip start/stop */</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		hrtimer_cancel(&amp;stime-&gt;hrt);</div><div class='ctx'> 		kfree(stime);</div><div class='ctx'> 		t-&gt;private_data = NULL;</div><div class='hunk'>@@ -88,23 +94,25 @@ static int snd_hrtimer_start(struct snd_timer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hrtimer *stime = t-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;stime-&gt;running, 0);</div><div class='del'>-	hrtimer_cancel(&amp;stime-&gt;hrt);</div><div class='add'>+	if (stime-&gt;in_callback)</div><div class='add'>+		return 0;</div><div class='ctx'> 	hrtimer_start(&amp;stime-&gt;hrt, ns_to_ktime(t-&gt;sticks * resolution),</div><div class='ctx'> 		      HRTIMER_MODE_REL);</div><div class='del'>-	atomic_set(&amp;stime-&gt;running, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_hrtimer_stop(struct snd_timer *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hrtimer *stime = t-&gt;private_data;</div><div class='del'>-	atomic_set(&amp;stime-&gt;running, 0);</div><div class='add'>+</div><div class='add'>+	if (stime-&gt;in_callback)</div><div class='add'>+		return 0;</div><div class='add'>+	hrtimer_try_to_cancel(&amp;stime-&gt;hrt);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware hrtimer_hw = {</div><div class='del'>-	.flags =	SNDRV_TIMER_HW_AUTO,</div><div class='add'>+static const struct snd_timer_hardware hrtimer_hw __initconst = {</div><div class='add'>+	.flags =	SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_WORK,</div><div class='ctx'> 	.open =		snd_hrtimer_open,</div><div class='ctx'> 	.close =	snd_hrtimer_close,</div><div class='ctx'> 	.start =	snd_hrtimer_start,</div><div class='hunk'>@@ -120,17 +128,9 @@ static struct snd_timer *mytimer;</div><div class='ctx'> static int __init snd_hrtimer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='del'>-	struct timespec tp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hrtimer_get_res(CLOCK_MONOTONIC, &amp;tp);</div><div class='del'>-	if (tp.tv_sec &gt; 0 || !tp.tv_nsec) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "snd-hrtimer: Invalid resolution %u.%09u",</div><div class='del'>-			   (unsigned)tp.tv_sec, (unsigned)tp.tv_nsec);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	resolution = tp.tv_nsec;</div><div class='add'>+	resolution = hrtimer_resolution;</div><div class='ctx'> </div><div class='ctx'> 	/* Create a new timer and set up the fields */</div><div class='ctx'> 	err = snd_timer_global_new("hrtimer", SNDRV_TIMER_GLOBAL_HRTIMER,</div><div class='hunk'>@@ -139,10 +139,11 @@ static int __init snd_hrtimer_init(void)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	timer-&gt;module = THIS_MODULE;</div><div class='del'>-	strcpy(timer-&gt;name, "HR timer");</div><div class='add'>+	strscpy(timer-&gt;name, "HR timer");</div><div class='ctx'> 	timer-&gt;hw = hrtimer_hw;</div><div class='ctx'> 	timer-&gt;hw.resolution = resolution;</div><div class='ctx'> 	timer-&gt;hw.ticks = NANO_SEC / resolution;</div><div class='add'>+	timer-&gt;max_instances = 100; /* lower the limit */</div><div class='ctx'> </div><div class='ctx'> 	err = snd_timer_global_register(timer);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='head'>diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c<br/>index a70ee7f1ed98..09200df2932c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/hwdep.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hwdep.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/hwdep.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Hardware dependent layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='hunk'>@@ -24,6 +9,8 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='hunk'>@@ -37,7 +24,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> static LIST_HEAD(snd_hwdep_devices);</div><div class='ctx'> static DEFINE_MUTEX(register_mutex);</div><div class='ctx'> </div><div class='del'>-static int snd_hwdep_free(struct snd_hwdep *hwdep);</div><div class='ctx'> static int snd_hwdep_dev_free(struct snd_device *device);</div><div class='ctx'> static int snd_hwdep_dev_register(struct snd_device *device);</div><div class='ctx'> static int snd_hwdep_dev_disconnect(struct snd_device *device);</div><div class='hunk'>@@ -84,7 +70,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)</div><div class='ctx'> 	int major = imajor(inode);</div><div class='ctx'> 	struct snd_hwdep *hw;</div><div class='ctx'> 	int err;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	if (major == snd_major) {</div><div class='ctx'> 		hw = snd_lookup_minor_data(iminor(inode),</div><div class='hunk'>@@ -99,8 +85,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)</div><div class='ctx'> 	if (hw == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!try_module_get(hw-&gt;card-&gt;module))</div><div class='add'>+	if (!try_module_get(hw-&gt;card-&gt;module)) {</div><div class='add'>+		snd_card_unref(hw-&gt;card);</div><div class='ctx'> 		return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 	add_wait_queue(&amp;hw-&gt;open_wait, &amp;wait);</div><div class='hunk'>@@ -128,6 +116,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)</div><div class='ctx'> 		mutex_unlock(&amp;hw-&gt;open_mutex);</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		mutex_lock(&amp;hw-&gt;open_mutex);</div><div class='add'>+		if (hw-&gt;card-&gt;shutdown) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			err = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -147,6 +139,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)</div><div class='ctx'> 	mutex_unlock(&amp;hw-&gt;open_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		module_put(hw-&gt;card-&gt;module);</div><div class='add'>+	snd_card_unref(hw-&gt;card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -156,12 +149,12 @@ static int snd_hwdep_release(struct inode *inode, struct file * file)</div><div class='ctx'> 	struct snd_hwdep *hw = file-&gt;private_data;</div><div class='ctx'> 	struct module *mod = hw-&gt;card-&gt;module;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;hw-&gt;open_mutex);</div><div class='del'>-	if (hw-&gt;ops.release)</div><div class='del'>-		err = hw-&gt;ops.release(hw, file);</div><div class='del'>-	if (hw-&gt;used &gt; 0)</div><div class='del'>-		hw-&gt;used--;</div><div class='del'>-	mutex_unlock(&amp;hw-&gt;open_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;hw-&gt;open_mutex) {</div><div class='add'>+		if (hw-&gt;ops.release)</div><div class='add'>+			err = hw-&gt;ops.release(hw, file);</div><div class='add'>+		if (hw-&gt;used &gt; 0)</div><div class='add'>+			hw-&gt;used--;</div><div class='add'>+	}</div><div class='ctx'> 	wake_up(&amp;hw-&gt;open_wait);</div><div class='ctx'> </div><div class='ctx'> 	snd_card_file_remove(hw-&gt;card, file);</div><div class='hunk'>@@ -169,7 +162,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_hwdep_poll(struct file * file, poll_table * wait)</div><div class='add'>+static __poll_t snd_hwdep_poll(struct file * file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hw = file-&gt;private_data;</div><div class='ctx'> 	if (hw-&gt;ops.poll)</div><div class='hunk'>@@ -184,8 +177,8 @@ static int snd_hwdep_info(struct snd_hwdep *hw,</div><div class='ctx'> 	</div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='ctx'> 	info.card = hw-&gt;card-&gt;number;</div><div class='del'>-	strlcpy(info.id, hw-&gt;id, sizeof(info.id));	</div><div class='del'>-	strlcpy(info.name, hw-&gt;name, sizeof(info.name));</div><div class='add'>+	strscpy(info.id, hw-&gt;id, sizeof(info.id));</div><div class='add'>+	strscpy(info.name, hw-&gt;name, sizeof(info.name));</div><div class='ctx'> 	info.iface = hw-&gt;iface;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -202,7 +195,8 @@ static int snd_hwdep_dsp_status(struct snd_hwdep *hw,</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='ctx'> 	info.dsp_loaded = hw-&gt;dsp_loaded;</div><div class='del'>-	if ((err = hw-&gt;ops.dsp_status(hw, &amp;info)) &lt; 0)</div><div class='add'>+	err = hw-&gt;ops.dsp_status(hw, &amp;info);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -210,28 +204,35 @@ static int snd_hwdep_dsp_status(struct snd_hwdep *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_hwdep_dsp_load(struct snd_hwdep *hw,</div><div class='del'>-			      struct snd_hwdep_dsp_image __user *_info)</div><div class='add'>+			      struct snd_hwdep_dsp_image *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_hwdep_dsp_image info;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='ctx'> 	if (! hw-&gt;ops.dsp_load)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	if (copy_from_user(&amp;info, _info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (info-&gt;index &gt;= 32)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	/* check whether the dsp was already loaded */</div><div class='del'>-	if (hw-&gt;dsp_loaded &amp; (1 &lt;&lt; info.index))</div><div class='add'>+	if (hw-&gt;dsp_loaded &amp; (1u &lt;&lt; info-&gt;index))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	if (!access_ok(VERIFY_READ, info.image, info.length))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	err = hw-&gt;ops.dsp_load(hw, &amp;info);</div><div class='add'>+	err = hw-&gt;ops.dsp_load(hw, info);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	hw-&gt;dsp_loaded |= (1 &lt;&lt; info.index);</div><div class='add'>+	hw-&gt;dsp_loaded |= (1u &lt;&lt; info-&gt;index);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_hwdep_dsp_load_user(struct snd_hwdep *hw,</div><div class='add'>+				   struct snd_hwdep_dsp_image __user *_info)</div><div class='add'>+{</div><div class='add'>+	struct snd_hwdep_dsp_image info = {};</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;info, _info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return snd_hwdep_dsp_load(hw, &amp;info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static long snd_hwdep_ioctl(struct file * file, unsigned int cmd,</div><div class='ctx'> 			    unsigned long arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -245,7 +246,7 @@ static long snd_hwdep_ioctl(struct file * file, unsigned int cmd,</div><div class='ctx'> 	case SNDRV_HWDEP_IOCTL_DSP_STATUS:</div><div class='ctx'> 		return snd_hwdep_dsp_status(hw, argp);</div><div class='ctx'> 	case SNDRV_HWDEP_IOCTL_DSP_LOAD:</div><div class='del'>-		return snd_hwdep_dsp_load(hw, argp);</div><div class='add'>+		return snd_hwdep_dsp_load_user(hw, argp);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (hw-&gt;ops.ioctl)</div><div class='ctx'> 		return hw-&gt;ops.ioctl(hw, file, cmd, arg);</div><div class='hunk'>@@ -271,16 +272,23 @@ static int snd_hwdep_control_ioctl(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 			if (get_user(device, (int __user *)arg))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			mutex_lock(&amp;register_mutex);</div><div class='del'>-			device = device &lt; 0 ? 0 : device + 1;</div><div class='del'>-			while (device &lt; SNDRV_MINOR_HWDEPS) {</div><div class='del'>-				if (snd_hwdep_search(card, device))</div><div class='del'>-					break;</div><div class='del'>-				device++;</div><div class='add'>+</div><div class='add'>+			scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+				if (device &lt; 0)</div><div class='add'>+					device = 0;</div><div class='add'>+				else if (device &lt; SNDRV_MINOR_HWDEPS)</div><div class='add'>+					device++;</div><div class='add'>+				else</div><div class='add'>+					device = SNDRV_MINOR_HWDEPS;</div><div class='add'>+</div><div class='add'>+				while (device &lt; SNDRV_MINOR_HWDEPS) {</div><div class='add'>+					if (snd_hwdep_search(card, device))</div><div class='add'>+						break;</div><div class='add'>+					device++;</div><div class='add'>+				}</div><div class='add'>+				if (device &gt;= SNDRV_MINOR_HWDEPS)</div><div class='add'>+					device = -1;</div><div class='ctx'> 			}</div><div class='del'>-			if (device &gt;= SNDRV_MINOR_HWDEPS)</div><div class='del'>-				device = -1;</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 			if (put_user(device, (int __user *)arg))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -288,19 +296,18 @@ static int snd_hwdep_control_ioctl(struct snd_card *card,</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_HWDEP_INFO:</div><div class='ctx'> 		{</div><div class='ctx'> 			struct snd_hwdep_info __user *info = (struct snd_hwdep_info __user *)arg;</div><div class='del'>-			int device, err;</div><div class='add'>+			int device;</div><div class='ctx'> 			struct snd_hwdep *hwdep;</div><div class='ctx'> </div><div class='ctx'> 			if (get_user(device, &amp;info-&gt;device))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			mutex_lock(&amp;register_mutex);</div><div class='del'>-			hwdep = snd_hwdep_search(card, device);</div><div class='del'>-			if (hwdep)</div><div class='del'>-				err = snd_hwdep_info(hwdep, info);</div><div class='del'>-			else</div><div class='del'>-				err = -ENXIO;</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			return err;</div><div class='add'>+			scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+				hwdep = snd_hwdep_search(card, device);</div><div class='add'>+				if (!hwdep)</div><div class='add'>+					return -ENXIO;</div><div class='add'>+				return snd_hwdep_info(hwdep, info);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='hunk'>@@ -330,6 +337,16 @@ static const struct file_operations snd_hwdep_f_ops =</div><div class='ctx'> 	.mmap =		snd_hwdep_mmap,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void snd_hwdep_free(struct snd_hwdep *hwdep)</div><div class='add'>+{</div><div class='add'>+	if (!hwdep)</div><div class='add'>+		return;</div><div class='add'>+	if (hwdep-&gt;private_free)</div><div class='add'>+		hwdep-&gt;private_free(hwdep);</div><div class='add'>+	put_device(hwdep-&gt;dev);</div><div class='add'>+	kfree(hwdep);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_hwdep_new - create a new hwdep instance</div><div class='ctx'>  * @card: the card instance</div><div class='hunk'>@@ -341,14 +358,14 @@ static const struct file_operations snd_hwdep_f_ops =</div><div class='ctx'>  * The callbacks (hwdep-&gt;ops) must be set on the returned instance</div><div class='ctx'>  * after this call manually by the caller.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_hwdep_new(struct snd_card *card, char *id, int device,</div><div class='ctx'> 		  struct snd_hwdep **rhwdep)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hwdep;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_hwdep_dev_free,</div><div class='ctx'> 		.dev_register = snd_hwdep_dev_register,</div><div class='ctx'> 		.dev_disconnect = snd_hwdep_dev_disconnect,</div><div class='hunk'>@@ -359,84 +376,80 @@ int snd_hwdep_new(struct snd_card *card, char *id, int device,</div><div class='ctx'> 	if (rhwdep)</div><div class='ctx'> 		*rhwdep = NULL;</div><div class='ctx'> 	hwdep = kzalloc(sizeof(*hwdep), GFP_KERNEL);</div><div class='del'>-	if (hwdep == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "hwdep: cannot allocate\n");</div><div class='add'>+	if (!hwdep)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;hwdep-&gt;open_wait);</div><div class='add'>+	mutex_init(&amp;hwdep-&gt;open_mutex);</div><div class='ctx'> 	hwdep-&gt;card = card;</div><div class='ctx'> 	hwdep-&gt;device = device;</div><div class='ctx'> 	if (id)</div><div class='del'>-		strlcpy(hwdep-&gt;id, id, sizeof(hwdep-&gt;id));</div><div class='add'>+		strscpy(hwdep-&gt;id, id, sizeof(hwdep-&gt;id));</div><div class='add'>+</div><div class='add'>+	err = snd_device_alloc(&amp;hwdep-&gt;dev, card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hwdep_free(hwdep);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_name(hwdep-&gt;dev, "hwC%iD%i", card-&gt;number, device);</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='ctx'> 	hwdep-&gt;oss_type = -1;</div><div class='ctx'> #endif</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_HWDEP, hwdep, &amp;ops)) &lt; 0) {</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_HWDEP, hwdep, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_hwdep_free(hwdep);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	init_waitqueue_head(&amp;hwdep-&gt;open_wait);</div><div class='del'>-	mutex_init(&amp;hwdep-&gt;open_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (rhwdep)</div><div class='ctx'> 		*rhwdep = hwdep;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int snd_hwdep_free(struct snd_hwdep *hwdep)</div><div class='del'>-{</div><div class='del'>-	if (!hwdep)</div><div class='del'>-		return 0;</div><div class='del'>-	if (hwdep-&gt;private_free)</div><div class='del'>-		hwdep-&gt;private_free(hwdep);</div><div class='del'>-	kfree(hwdep);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+EXPORT_SYMBOL(snd_hwdep_new);</div><div class='ctx'> </div><div class='ctx'> static int snd_hwdep_dev_free(struct snd_device *device)</div><div class='ctx'> {</div><div class='del'>-	struct snd_hwdep *hwdep = device-&gt;device_data;</div><div class='del'>-	return snd_hwdep_free(hwdep);</div><div class='add'>+	snd_hwdep_free(device-&gt;device_data);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_hwdep_dev_register(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hwdep = device-&gt;device_data;</div><div class='add'>+	struct snd_card *card = hwdep-&gt;card;</div><div class='ctx'> 	int err;</div><div class='del'>-	char name[32];</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if (snd_hwdep_search(hwdep-&gt;card, hwdep-&gt;device)) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	if (snd_hwdep_search(card, hwdep-&gt;device))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> 	list_add_tail(&amp;hwdep-&gt;list, &amp;snd_hwdep_devices);</div><div class='del'>-	sprintf(name, "hwC%iD%i", hwdep-&gt;card-&gt;number, hwdep-&gt;device);</div><div class='del'>-	if ((err = snd_register_device(SNDRV_DEVICE_TYPE_HWDEP,</div><div class='del'>-				       hwdep-&gt;card, hwdep-&gt;device,</div><div class='del'>-				       &amp;snd_hwdep_f_ops, hwdep, name)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to register hardware dependent device %i:%i\n",</div><div class='del'>-			   hwdep-&gt;card-&gt;number, hwdep-&gt;device);</div><div class='add'>+	err = snd_register_device(SNDRV_DEVICE_TYPE_HWDEP,</div><div class='add'>+				  hwdep-&gt;card, hwdep-&gt;device,</div><div class='add'>+				  &amp;snd_hwdep_f_ops, hwdep, hwdep-&gt;dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(hwdep-&gt;dev, "unable to register\n");</div><div class='ctx'> 		list_del(&amp;hwdep-&gt;list);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='ctx'> 	hwdep-&gt;ossreg = 0;</div><div class='ctx'> 	if (hwdep-&gt;oss_type &gt;= 0) {</div><div class='del'>-		if ((hwdep-&gt;oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM) &amp;&amp; (hwdep-&gt;device != 0)) {</div><div class='del'>-			snd_printk (KERN_WARNING "only hwdep device 0 can be registered as OSS direct FM device!\n");</div><div class='del'>-		} else {</div><div class='del'>-			if (snd_register_oss_device(hwdep-&gt;oss_type,</div><div class='del'>-						    hwdep-&gt;card, hwdep-&gt;device,</div><div class='del'>-						    &amp;snd_hwdep_f_ops, hwdep,</div><div class='del'>-						    hwdep-&gt;oss_dev) &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "unable to register OSS compatibility device %i:%i\n",</div><div class='del'>-					   hwdep-&gt;card-&gt;number, hwdep-&gt;device);</div><div class='del'>-			} else</div><div class='del'>-				hwdep-&gt;ossreg = 1;</div><div class='del'>-		}</div><div class='add'>+		if (hwdep-&gt;oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM &amp;&amp;</div><div class='add'>+		    hwdep-&gt;device)</div><div class='add'>+			dev_warn(hwdep-&gt;dev,</div><div class='add'>+				 "only hwdep device 0 can be registered as OSS direct FM device!\n");</div><div class='add'>+		else if (snd_register_oss_device(hwdep-&gt;oss_type,</div><div class='add'>+						 card, hwdep-&gt;device,</div><div class='add'>+						 &amp;snd_hwdep_f_ops, hwdep) &lt; 0)</div><div class='add'>+			dev_warn(hwdep-&gt;dev,</div><div class='add'>+				 "unable to register OSS compatibility device\n");</div><div class='add'>+		else</div><div class='add'>+			hwdep-&gt;ossreg = 1;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -446,22 +459,21 @@ static int snd_hwdep_dev_disconnect(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!hwdep))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if (snd_hwdep_search(hwdep-&gt;card, hwdep-&gt;device) != hwdep) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	if (snd_hwdep_search(hwdep-&gt;card, hwdep-&gt;device) != hwdep)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	guard(mutex)(&amp;hwdep-&gt;open_mutex);</div><div class='add'>+	wake_up(&amp;hwdep-&gt;open_wait);</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='ctx'> 	if (hwdep-&gt;ossreg)</div><div class='ctx'> 		snd_unregister_oss_device(hwdep-&gt;oss_type, hwdep-&gt;card, hwdep-&gt;device);</div><div class='ctx'> #endif</div><div class='del'>-	snd_unregister_device(SNDRV_DEVICE_TYPE_HWDEP, hwdep-&gt;card, hwdep-&gt;device);</div><div class='add'>+	snd_unregister_device(hwdep-&gt;dev);</div><div class='ctx'> 	list_del_init(&amp;hwdep-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  Info interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -471,11 +483,10 @@ static void snd_hwdep_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hwdep;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	list_for_each_entry(hwdep, &amp;snd_hwdep_devices, list)</div><div class='ctx'> 		snd_iprintf(buffer, "%02i-%02i: %s\n",</div><div class='ctx'> 			    hwdep-&gt;card-&gt;number, hwdep-&gt;device, hwdep-&gt;name);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_info_entry *snd_hwdep_proc_entry;</div><div class='hunk'>@@ -484,7 +495,8 @@ static void __init snd_hwdep_proc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) {</div><div class='add'>+	entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL);</div><div class='add'>+	if (entry) {</div><div class='ctx'> 		entry-&gt;c.text.read = snd_hwdep_proc_read;</div><div class='ctx'> 		if (snd_info_register(entry) &lt; 0) {</div><div class='ctx'> 			snd_info_free_entry(entry);</div><div class='hunk'>@@ -498,10 +510,10 @@ static void __exit snd_hwdep_proc_done(void)</div><div class='ctx'> {</div><div class='ctx'> 	snd_info_free_entry(snd_hwdep_proc_entry);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+#else /* !CONFIG_SND_PROC_FS */</div><div class='ctx'> #define snd_hwdep_proc_init()</div><div class='ctx'> #define snd_hwdep_proc_done()</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -525,5 +537,3 @@ static void __exit alsa_hwdep_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(alsa_hwdep_init)</div><div class='ctx'> module_exit(alsa_hwdep_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_hwdep_new);</div><div class='head'>diff --git a/sound/core/hwdep_compat.c b/sound/core/hwdep_compat.c<br/>index 3827c0ceec8f..a0b76706c083 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/hwdep_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/hwdep_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/hwdep_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/hwdep_compat.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   32bit -&gt; 64bit ioctl wrapper for hwdep API</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file is included from hwdep.c */</div><div class='hunk'>@@ -33,26 +19,17 @@ struct snd_hwdep_dsp_image32 {</div><div class='ctx'> static int snd_hwdep_dsp_load_compat(struct snd_hwdep *hw,</div><div class='ctx'> 				     struct snd_hwdep_dsp_image32 __user *src)</div><div class='ctx'> {</div><div class='del'>-	struct snd_hwdep_dsp_image __user *dst;</div><div class='add'>+	struct snd_hwdep_dsp_image info = {};</div><div class='ctx'> 	compat_caddr_t ptr;</div><div class='del'>-	u32 val;</div><div class='ctx'> </div><div class='del'>-	dst = compat_alloc_user_space(sizeof(*dst));</div><div class='del'>-</div><div class='del'>-	/* index and name */</div><div class='del'>-	if (copy_in_user(dst, src, 4 + 64))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (get_user(ptr, &amp;src-&gt;image) ||</div><div class='del'>-	    put_user(compat_ptr(ptr), &amp;dst-&gt;image))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (get_user(val, &amp;src-&gt;length) ||</div><div class='del'>-	    put_user(val, &amp;dst-&gt;length))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (get_user(val, &amp;src-&gt;driver_data) ||</div><div class='del'>-	    put_user(val, &amp;dst-&gt;driver_data))</div><div class='add'>+	if (copy_from_user(&amp;info, src, 4 + 64) ||</div><div class='add'>+	    get_user(ptr, &amp;src-&gt;image) ||</div><div class='add'>+	    get_user(info.length, &amp;src-&gt;length) ||</div><div class='add'>+	    get_user(info.driver_data, &amp;src-&gt;driver_data))</div><div class='ctx'> 		return -EFAULT;</div><div class='add'>+	info.image = compat_ptr(ptr);</div><div class='ctx'> </div><div class='del'>-	return snd_hwdep_dsp_load(hw, dst);</div><div class='add'>+	return snd_hwdep_dsp_load(hw, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='head'>diff --git a/sound/core/info.c b/sound/core/info.c<br/>index b70564ed8b37..1f5b8a3d9e3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/info.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/info.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/info.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/info.c</a></div><div class='hunk'>@@ -1,47 +1,25 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Information interface for ALSA driver</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/version.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> </div><div class='ctx'> int snd_info_check_reserved_words(const char *str)</div><div class='ctx'> {</div><div class='del'>-	static char *reserved[] =</div><div class='add'>+	static const char * const reserved[] =</div><div class='ctx'> 	{</div><div class='ctx'> 		"version",</div><div class='ctx'> 		"meminfo",</div><div class='hunk'>@@ -56,7 +34,7 @@ int snd_info_check_reserved_words(const char *str)</div><div class='ctx'> 		"seq",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	char **xstr = reserved;</div><div class='add'>+	const char * const *xstr = reserved;</div><div class='ctx'> </div><div class='ctx'> 	while (*xstr) {</div><div class='ctx'> 		if (!strcmp(*xstr, str))</div><div class='hunk'>@@ -78,74 +56,13 @@ struct snd_info_private_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int snd_info_version_init(void);</div><div class='del'>-static int snd_info_version_done(void);</div><div class='del'>-static void snd_info_disconnect(struct snd_info_entry *entry);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* resize the proc r/w buffer */</div><div class='del'>-static int resize_info_buffer(struct snd_info_buffer *buffer,</div><div class='del'>-			      unsigned int nsize)</div><div class='del'>-{</div><div class='del'>-	char *nbuf;</div><div class='del'>-</div><div class='del'>-	nsize = PAGE_ALIGN(nsize);</div><div class='del'>-	nbuf = krealloc(buffer-&gt;buffer, nsize, GFP_KERNEL);</div><div class='del'>-	if (! nbuf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	buffer-&gt;buffer = nbuf;</div><div class='del'>-	buffer-&gt;len = nsize;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_iprintf - printf on the procfs buffer</div><div class='del'>- * @buffer: the procfs buffer</div><div class='del'>- * @fmt: the printf format</div><div class='del'>- *</div><div class='del'>- * Outputs the string on the procfs buffer just like printf().</div><div class='del'>- *</div><div class='del'>- * Returns the size of output string.</div><div class='del'>- */</div><div class='del'>-int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	int len, res;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	might_sleep();</div><div class='del'>-	if (buffer-&gt;stop || buffer-&gt;error)</div><div class='del'>-		return 0;</div><div class='del'>-	len = buffer-&gt;len - buffer-&gt;size;</div><div class='del'>-	va_start(args, fmt);</div><div class='del'>-	for (;;) {</div><div class='del'>-		va_list ap;</div><div class='del'>-		va_copy(ap, args);</div><div class='del'>-		res = vsnprintf(buffer-&gt;buffer + buffer-&gt;curr, len, fmt, ap);</div><div class='del'>-		va_end(ap);</div><div class='del'>-		if (res &lt; len)</div><div class='del'>-			break;</div><div class='del'>-		err = resize_info_buffer(buffer, buffer-&gt;len + PAGE_SIZE);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		len = buffer-&gt;len - buffer-&gt;size;</div><div class='del'>-	}</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	buffer-&gt;curr += res;</div><div class='del'>-	buffer-&gt;size += res;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_iprintf);</div><div class='add'>+static void snd_info_clear_entries(struct snd_info_entry *entry);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct proc_dir_entry *snd_proc_root;</div><div class='add'>+static struct snd_info_entry *snd_proc_root;</div><div class='ctx'> struct snd_info_entry *snd_seq_root;</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_root);</div><div class='ctx'> </div><div class='hunk'>@@ -153,33 +70,52 @@ EXPORT_SYMBOL(snd_seq_root);</div><div class='ctx'> struct snd_info_entry *snd_oss_root;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void snd_remove_proc_entry(struct proc_dir_entry *parent,</div><div class='del'>-				  struct proc_dir_entry *de)</div><div class='add'>+static int alloc_info_private(struct snd_info_entry *entry,</div><div class='add'>+			      struct snd_info_private_data **ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_private_data *data;</div><div class='add'>+</div><div class='add'>+	if (!entry || !entry-&gt;p)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!try_module_get(entry-&gt;module))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data) {</div><div class='add'>+		module_put(entry-&gt;module);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	data-&gt;entry = entry;</div><div class='add'>+	*ret = data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool valid_pos(loff_t pos, size_t count)</div><div class='ctx'> {</div><div class='del'>-	if (de)</div><div class='del'>-		remove_proc_entry(de-&gt;name, parent);</div><div class='add'>+	if (pos &lt; 0 || (long) pos != pos || (ssize_t) count &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	if ((unsigned long) pos + (unsigned long) count &lt; (unsigned long) pos)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * file ops for binary proc files</div><div class='add'>+ */</div><div class='ctx'> static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_private_data *data;</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='del'>-	loff_t ret = -EINVAL, size;</div><div class='add'>+	loff_t size;</div><div class='ctx'> </div><div class='ctx'> 	data = file-&gt;private_data;</div><div class='ctx'> 	entry = data-&gt;entry;</div><div class='del'>-	mutex_lock(&amp;entry-&gt;access);</div><div class='del'>-	if (entry-&gt;content == SNDRV_INFO_CONTENT_DATA &amp;&amp;</div><div class='del'>-	    entry-&gt;c.ops-&gt;llseek) {</div><div class='del'>-		offset = entry-&gt;c.ops-&gt;llseek(entry,</div><div class='del'>-					      data-&gt;file_private_data,</div><div class='del'>-					      file, offset, orig);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (entry-&gt;content == SNDRV_INFO_CONTENT_DATA)</div><div class='del'>-		size = entry-&gt;size;</div><div class='del'>-	else</div><div class='del'>-		size = 0;</div><div class='add'>+	guard(mutex)(&amp;entry-&gt;access);</div><div class='add'>+	if (entry-&gt;c.ops-&gt;llseek)</div><div class='add'>+		return entry-&gt;c.ops-&gt;llseek(entry,</div><div class='add'>+					    data-&gt;file_private_data,</div><div class='add'>+					    file, offset, orig);</div><div class='add'>+</div><div class='add'>+	size = entry-&gt;size;</div><div class='ctx'> 	switch (orig) {</div><div class='ctx'> 	case SEEK_SET:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -188,65 +124,37 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SEEK_END:</div><div class='ctx'> 		if (!size)</div><div class='del'>-			goto out;</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		offset += size;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (offset &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	if (size &amp;&amp; offset &gt; size)</div><div class='ctx'> 		offset = size;</div><div class='ctx'> 	file-&gt;f_pos = offset;</div><div class='del'>-	ret = offset;</div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;entry-&gt;access);</div><div class='del'>-	return ret;</div><div class='add'>+	return offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,</div><div class='ctx'> 				   size_t count, loff_t * offset)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	struct snd_info_buffer *buf;</div><div class='del'>-	size_t size = 0;</div><div class='add'>+	struct snd_info_private_data *data = file-&gt;private_data;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='add'>+	size_t size;</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> </div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!data))</div><div class='del'>-		return -ENXIO;</div><div class='ctx'> 	pos = *offset;</div><div class='del'>-	if (pos &lt; 0 || (long) pos != pos || (ssize_t) count &lt; 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-	if ((unsigned long) pos + (unsigned long) count &lt; (unsigned long) pos)</div><div class='add'>+	if (!valid_pos(pos, count))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_TEXT:</div><div class='del'>-		buf = data-&gt;rbuffer;</div><div class='del'>-		if (buf == NULL)</div><div class='del'>-			return -EIO;</div><div class='del'>-		if (pos &gt;= buf-&gt;size)</div><div class='del'>-			return 0;</div><div class='del'>-		size = buf-&gt;size - pos;</div><div class='del'>-		size = min(count, size);</div><div class='del'>-		if (copy_to_user(buffer, buf-&gt;buffer + pos, size))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (pos &gt;= entry-&gt;size)</div><div class='del'>-			return 0;</div><div class='del'>-		if (entry-&gt;c.ops-&gt;read) {</div><div class='del'>-			size = entry-&gt;size - pos;</div><div class='del'>-			size = min(count, size);</div><div class='del'>-			size = entry-&gt;c.ops-&gt;read(entry,</div><div class='del'>-						  data-&gt;file_private_data,</div><div class='del'>-						  file, buffer, size, pos);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (pos &gt;= entry-&gt;size)</div><div class='add'>+		return 0;</div><div class='add'>+	size = entry-&gt;size - pos;</div><div class='add'>+	size = min(count, size);</div><div class='add'>+	size = entry-&gt;c.ops-&gt;read(entry, data-&gt;file_private_data,</div><div class='add'>+				  file, buffer, size, pos);</div><div class='ctx'> 	if ((ssize_t) size &gt; 0)</div><div class='ctx'> 		*offset = pos + size;</div><div class='ctx'> 	return size;</div><div class='hunk'>@@ -255,342 +163,314 @@ static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,</div><div class='ctx'> static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer,</div><div class='ctx'> 				    size_t count, loff_t * offset)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	struct snd_info_buffer *buf;</div><div class='add'>+	struct snd_info_private_data *data = file-&gt;private_data;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='ctx'> 	ssize_t size = 0;</div><div class='ctx'> 	loff_t pos;</div><div class='ctx'> </div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!data))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='ctx'> 	pos = *offset;</div><div class='del'>-	if (pos &lt; 0 || (long) pos != pos || (ssize_t) count &lt; 0)</div><div class='add'>+	if (!valid_pos(pos, count))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if ((unsigned long) pos + (unsigned long) count &lt; (unsigned long) pos)</div><div class='del'>-		return -EIO;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_TEXT:</div><div class='del'>-		buf = data-&gt;wbuffer;</div><div class='del'>-		if (buf == NULL)</div><div class='del'>-			return -EIO;</div><div class='del'>-		mutex_lock(&amp;entry-&gt;access);</div><div class='del'>-		if (pos + count &gt;= buf-&gt;len) {</div><div class='del'>-			if (resize_info_buffer(buf, pos + count)) {</div><div class='del'>-				mutex_unlock(&amp;entry-&gt;access);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(buf-&gt;buffer + pos, buffer, count)) {</div><div class='del'>-			mutex_unlock(&amp;entry-&gt;access);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		buf-&gt;size = pos + count;</div><div class='del'>-		mutex_unlock(&amp;entry-&gt;access);</div><div class='del'>-		size = count;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (entry-&gt;c.ops-&gt;write &amp;&amp; count &gt; 0) {</div><div class='del'>-			size_t maxsize = entry-&gt;size - pos;</div><div class='del'>-			count = min(count, maxsize);</div><div class='del'>-			size = entry-&gt;c.ops-&gt;write(entry,</div><div class='del'>-						   data-&gt;file_private_data,</div><div class='del'>-						   file, buffer, count, pos);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+	if (count &gt; 0) {</div><div class='add'>+		size_t maxsize = entry-&gt;size - pos;</div><div class='add'>+		count = min(count, maxsize);</div><div class='add'>+		size = entry-&gt;c.ops-&gt;write(entry, data-&gt;file_private_data,</div><div class='add'>+					   file, buffer, count, pos);</div><div class='ctx'> 	}</div><div class='del'>-	if ((ssize_t) size &gt; 0)</div><div class='add'>+	if (size &gt; 0)</div><div class='ctx'> 		*offset = pos + size;</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_info_entry_open(struct inode *inode, struct file *file)</div><div class='add'>+static __poll_t snd_info_entry_poll(struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_private_data *data = file-&gt;private_data;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='add'>+	__poll_t mask = 0;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;c.ops-&gt;poll)</div><div class='add'>+		return entry-&gt;c.ops-&gt;poll(entry,</div><div class='add'>+					  data-&gt;file_private_data,</div><div class='add'>+					  file, wait);</div><div class='add'>+	if (entry-&gt;c.ops-&gt;read)</div><div class='add'>+		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	if (entry-&gt;c.ops-&gt;write)</div><div class='add'>+		mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_private_data *data = file-&gt;private_data;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;c.ops-&gt;ioctl)</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	return entry-&gt;c.ops-&gt;ioctl(entry, data-&gt;file_private_data,</div><div class='add'>+				   file, cmd, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='ctx'> {</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct snd_info_private_data *data;</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	data = file-&gt;private_data;</div><div class='add'>+	if (data == NULL)</div><div class='add'>+		return 0;</div><div class='add'>+	entry = data-&gt;entry;</div><div class='add'>+	if (!entry-&gt;c.ops-&gt;mmap)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	return entry-&gt;c.ops-&gt;mmap(entry, data-&gt;file_private_data,</div><div class='add'>+				  inode, file, vma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_info_entry_open(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry = pde_data(inode);</div><div class='ctx'> 	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_buffer *buffer;</div><div class='del'>-	struct proc_dir_entry *p;</div><div class='ctx'> 	int mode, err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;info_mutex);</div><div class='del'>-	p = PDE(inode);</div><div class='del'>-	entry = p == NULL ? NULL : (struct snd_info_entry *)p-&gt;data;</div><div class='del'>-	if (entry == NULL || ! entry-&gt;p) {</div><div class='del'>-		mutex_unlock(&amp;info_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (!try_module_get(entry-&gt;module)) {</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto __error1;</div><div class='del'>-	}</div><div class='add'>+	guard(mutex)(&amp;info_mutex);</div><div class='add'>+	err = alloc_info_private(entry, &amp;data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	mode = file-&gt;f_flags &amp; O_ACCMODE;</div><div class='del'>-	if (mode == O_RDONLY || mode == O_RDWR) {</div><div class='del'>-		if ((entry-&gt;content == SNDRV_INFO_CONTENT_DATA &amp;&amp;</div><div class='del'>-		     entry-&gt;c.ops-&gt;read == NULL)) {</div><div class='del'>-		    	err = -ENODEV;</div><div class='del'>-		    	goto __error;</div><div class='del'>-		}</div><div class='add'>+	if (((mode == O_RDONLY || mode == O_RDWR) &amp;&amp; !entry-&gt;c.ops-&gt;read) ||</div><div class='add'>+	    ((mode == O_WRONLY || mode == O_RDWR) &amp;&amp; !entry-&gt;c.ops-&gt;write)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	if (mode == O_WRONLY || mode == O_RDWR) {</div><div class='del'>-		if ((entry-&gt;content == SNDRV_INFO_CONTENT_DATA &amp;&amp;</div><div class='del'>-		     entry-&gt;c.ops-&gt;write == NULL)) {</div><div class='del'>-		    	err = -ENODEV;</div><div class='del'>-		    	goto __error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	data = kzalloc(sizeof(*data), GFP_KERNEL);</div><div class='del'>-	if (data == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __error;</div><div class='del'>-	}</div><div class='del'>-	data-&gt;entry = entry;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_TEXT:</div><div class='del'>-		if (mode == O_RDONLY || mode == O_RDWR) {</div><div class='del'>-			buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);</div><div class='del'>-			if (buffer == NULL)</div><div class='del'>-				goto __nomem;</div><div class='del'>-			data-&gt;rbuffer = buffer;</div><div class='del'>-			buffer-&gt;len = PAGE_SIZE;</div><div class='del'>-			buffer-&gt;buffer = kmalloc(buffer-&gt;len, GFP_KERNEL);</div><div class='del'>-			if (buffer-&gt;buffer == NULL)</div><div class='del'>-				goto __nomem;</div><div class='del'>-		}</div><div class='del'>-		if (mode == O_WRONLY || mode == O_RDWR) {</div><div class='del'>-			buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);</div><div class='del'>-			if (buffer == NULL)</div><div class='del'>-				goto __nomem;</div><div class='del'>-			data-&gt;wbuffer = buffer;</div><div class='del'>-			buffer-&gt;len = PAGE_SIZE;</div><div class='del'>-			buffer-&gt;buffer = kmalloc(buffer-&gt;len, GFP_KERNEL);</div><div class='del'>-			if (buffer-&gt;buffer == NULL)</div><div class='del'>-				goto __nomem;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:	/* data */</div><div class='del'>-		if (entry-&gt;c.ops-&gt;open) {</div><div class='del'>-			if ((err = entry-&gt;c.ops-&gt;open(entry, mode,</div><div class='del'>-						      &amp;data-&gt;file_private_data)) &lt; 0) {</div><div class='del'>-				kfree(data);</div><div class='del'>-				goto __error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;c.ops-&gt;open) {</div><div class='add'>+		err = entry-&gt;c.ops-&gt;open(entry, mode, &amp;data-&gt;file_private_data);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	file-&gt;private_data = data;</div><div class='del'>-	mutex_unlock(&amp;info_mutex);</div><div class='del'>-	if (entry-&gt;content == SNDRV_INFO_CONTENT_TEXT &amp;&amp;</div><div class='del'>-	    (mode == O_RDONLY || mode == O_RDWR)) {</div><div class='del'>-		if (entry-&gt;c.text.read) {</div><div class='del'>-			mutex_lock(&amp;entry-&gt;access);</div><div class='del'>-			entry-&gt;c.text.read(entry, data-&gt;rbuffer);</div><div class='del'>-			mutex_unlock(&amp;entry-&gt;access);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- __nomem:</div><div class='del'>-	if (data-&gt;rbuffer) {</div><div class='del'>-		kfree(data-&gt;rbuffer-&gt;buffer);</div><div class='del'>-		kfree(data-&gt;rbuffer);</div><div class='del'>-	}</div><div class='del'>-	if (data-&gt;wbuffer) {</div><div class='del'>-		kfree(data-&gt;wbuffer-&gt;buffer);</div><div class='del'>-		kfree(data-&gt;wbuffer);</div><div class='del'>-	}</div><div class='add'>+ error:</div><div class='ctx'> 	kfree(data);</div><div class='del'>-	err = -ENOMEM;</div><div class='del'>-      __error:</div><div class='ctx'> 	module_put(entry-&gt;module);</div><div class='del'>-      __error1:</div><div class='del'>-	mutex_unlock(&amp;info_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_info_entry_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	struct snd_info_private_data *data;</div><div class='del'>-	int mode;</div><div class='add'>+	struct snd_info_private_data *data = file-&gt;private_data;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='ctx'> </div><div class='del'>-	mode = file-&gt;f_flags &amp; O_ACCMODE;</div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_TEXT:</div><div class='del'>-		if (data-&gt;rbuffer) {</div><div class='del'>-			kfree(data-&gt;rbuffer-&gt;buffer);</div><div class='del'>-			kfree(data-&gt;rbuffer);</div><div class='del'>-		}</div><div class='del'>-		if (data-&gt;wbuffer) {</div><div class='del'>-			if (entry-&gt;c.text.write) {</div><div class='del'>-				entry-&gt;c.text.write(entry, data-&gt;wbuffer);</div><div class='del'>-				if (data-&gt;wbuffer-&gt;error) {</div><div class='del'>-					snd_printk(KERN_WARNING "data write error to %s (%i)\n",</div><div class='del'>-						entry-&gt;name,</div><div class='del'>-						data-&gt;wbuffer-&gt;error);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			kfree(data-&gt;wbuffer-&gt;buffer);</div><div class='del'>-			kfree(data-&gt;wbuffer);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (entry-&gt;c.ops-&gt;release)</div><div class='del'>-			entry-&gt;c.ops-&gt;release(entry, mode,</div><div class='del'>-					      data-&gt;file_private_data);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	if (entry-&gt;c.ops-&gt;release)</div><div class='add'>+		entry-&gt;c.ops-&gt;release(entry, file-&gt;f_flags &amp; O_ACCMODE,</div><div class='add'>+				      data-&gt;file_private_data);</div><div class='ctx'> 	module_put(entry-&gt;module);</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)</div><div class='add'>+static const struct proc_ops snd_info_entry_operations =</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	unsigned int mask;</div><div class='add'>+	.proc_lseek	= snd_info_entry_llseek,</div><div class='add'>+	.proc_read	= snd_info_entry_read,</div><div class='add'>+	.proc_write	= snd_info_entry_write,</div><div class='add'>+	.proc_poll	= snd_info_entry_poll,</div><div class='add'>+	.proc_ioctl	= snd_info_entry_ioctl,</div><div class='add'>+	.proc_mmap	= snd_info_entry_mmap,</div><div class='add'>+	.proc_open	= snd_info_entry_open,</div><div class='add'>+	.proc_release	= snd_info_entry_release,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (data == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='del'>-	mask = 0;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (entry-&gt;c.ops-&gt;poll)</div><div class='del'>-			return entry-&gt;c.ops-&gt;poll(entry,</div><div class='del'>-						  data-&gt;file_private_data,</div><div class='del'>-						  file, wait);</div><div class='del'>-		if (entry-&gt;c.ops-&gt;read)</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='del'>-		if (entry-&gt;c.ops-&gt;write)</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-		break;</div><div class='add'>+/*</div><div class='add'>+ * file ops for text proc files</div><div class='add'>+ */</div><div class='add'>+static ssize_t snd_info_text_entry_write(struct file *file,</div><div class='add'>+					 const char __user *buffer,</div><div class='add'>+					 size_t count, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct snd_info_private_data *data = m-&gt;private;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='add'>+	struct snd_info_buffer *buf;</div><div class='add'>+	loff_t pos;</div><div class='add'>+	size_t next;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;c.text.write)</div><div class='add'>+		return -EIO;</div><div class='add'>+	pos = *offset;</div><div class='add'>+	if (!valid_pos(pos, count))</div><div class='add'>+		return -EIO;</div><div class='add'>+	next = pos + count;</div><div class='add'>+	/* don't handle too large text inputs */</div><div class='add'>+	if (next &gt; 16 * 1024)</div><div class='add'>+		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;entry-&gt;access);</div><div class='add'>+	buf = data-&gt;wbuffer;</div><div class='add'>+	if (!buf) {</div><div class='add'>+		data-&gt;wbuffer = buf = kzalloc(sizeof(*buf), GFP_KERNEL);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	return mask;</div><div class='add'>+	if (next &gt; buf-&gt;len) {</div><div class='add'>+		char *nbuf = kvzalloc(PAGE_ALIGN(next), GFP_KERNEL);</div><div class='add'>+		if (!nbuf)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kvfree(buf-&gt;buffer);</div><div class='add'>+		buf-&gt;buffer = nbuf;</div><div class='add'>+		buf-&gt;len = PAGE_ALIGN(next);</div><div class='add'>+	}</div><div class='add'>+	if (copy_from_user(buf-&gt;buffer + pos, buffer, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	buf-&gt;size = next;</div><div class='add'>+	*offset = next;</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-				unsigned long arg)</div><div class='add'>+static int snd_info_seq_show(struct seq_file *seq, void *p)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='add'>+	struct snd_info_private_data *data = seq-&gt;private;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='ctx'> </div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (data == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (entry-&gt;c.ops-&gt;ioctl)</div><div class='del'>-			return entry-&gt;c.ops-&gt;ioctl(entry,</div><div class='del'>-						   data-&gt;file_private_data,</div><div class='del'>-						   file, cmd, arg);</div><div class='del'>-		break;</div><div class='add'>+	if (!entry-&gt;c.text.read) {</div><div class='add'>+		return -EIO;</div><div class='add'>+	} else {</div><div class='add'>+		data-&gt;rbuffer-&gt;buffer = (char *)seq; /* XXX hack! */</div><div class='add'>+		entry-&gt;c.text.read(entry, data-&gt;rbuffer);</div><div class='ctx'> 	}</div><div class='del'>-	return -ENOTTY;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='add'>+static int snd_info_text_entry_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct inode *inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='add'>+	struct snd_info_entry *entry = pde_data(inode);</div><div class='ctx'> 	struct snd_info_private_data *data;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	data = file-&gt;private_data;</div><div class='del'>-	if (data == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	entry = data-&gt;entry;</div><div class='del'>-	switch (entry-&gt;content) {</div><div class='del'>-	case SNDRV_INFO_CONTENT_DATA:</div><div class='del'>-		if (entry-&gt;c.ops-&gt;mmap)</div><div class='del'>-			return entry-&gt;c.ops-&gt;mmap(entry,</div><div class='del'>-						  data-&gt;file_private_data,</div><div class='del'>-						  inode, file, vma);</div><div class='del'>-		break;</div><div class='add'>+	guard(mutex)(&amp;info_mutex);</div><div class='add'>+	err = alloc_info_private(entry, &amp;data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data-&gt;rbuffer = kzalloc(sizeof(*data-&gt;rbuffer), GFP_KERNEL);</div><div class='add'>+	if (!data-&gt;rbuffer) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (entry-&gt;size)</div><div class='add'>+		err = single_open_size(file, snd_info_seq_show, data,</div><div class='add'>+				       entry-&gt;size);</div><div class='add'>+	else</div><div class='add'>+		err = single_open(file, snd_info_seq_show, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	kfree(data-&gt;rbuffer);</div><div class='add'>+	kfree(data);</div><div class='add'>+	module_put(entry-&gt;module);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_info_text_entry_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct seq_file *m = file-&gt;private_data;</div><div class='add'>+	struct snd_info_private_data *data = m-&gt;private;</div><div class='add'>+	struct snd_info_entry *entry = data-&gt;entry;</div><div class='add'>+</div><div class='add'>+	if (data-&gt;wbuffer &amp;&amp; entry-&gt;c.text.write)</div><div class='add'>+		entry-&gt;c.text.write(entry, data-&gt;wbuffer);</div><div class='add'>+</div><div class='add'>+	single_release(inode, file);</div><div class='add'>+	kfree(data-&gt;rbuffer);</div><div class='add'>+	if (data-&gt;wbuffer) {</div><div class='add'>+		kvfree(data-&gt;wbuffer-&gt;buffer);</div><div class='add'>+		kfree(data-&gt;wbuffer);</div><div class='ctx'> 	}</div><div class='del'>-	return -ENXIO;</div><div class='add'>+</div><div class='add'>+	module_put(entry-&gt;module);</div><div class='add'>+	kfree(data);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations snd_info_entry_operations =</div><div class='add'>+static const struct proc_ops snd_info_text_entry_ops =</div><div class='ctx'> {</div><div class='del'>-	.owner =		THIS_MODULE,</div><div class='del'>-	.llseek =		snd_info_entry_llseek,</div><div class='del'>-	.read =			snd_info_entry_read,</div><div class='del'>-	.write =		snd_info_entry_write,</div><div class='del'>-	.poll =			snd_info_entry_poll,</div><div class='del'>-	.unlocked_ioctl =	snd_info_entry_ioctl,</div><div class='del'>-	.mmap =			snd_info_entry_mmap,</div><div class='del'>-	.open =			snd_info_entry_open,</div><div class='del'>-	.release =		snd_info_entry_release,</div><div class='add'>+	.proc_open	= snd_info_text_entry_open,</div><div class='add'>+	.proc_release	= snd_info_text_entry_release,</div><div class='add'>+	.proc_write	= snd_info_text_entry_write,</div><div class='add'>+	.proc_lseek	= seq_lseek,</div><div class='add'>+	.proc_read	= seq_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __init snd_info_init(void)</div><div class='add'>+static struct snd_info_entry *create_subdir(struct module *mod,</div><div class='add'>+					    const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct proc_dir_entry *p;</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_module_entry(mod, name, NULL);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return NULL;</div><div class='add'>+	entry-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+	if (snd_info_register(entry) &lt; 0) {</div><div class='add'>+		snd_info_free_entry(entry);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_info_entry *</div><div class='add'>+snd_info_create_entry(const char *name, struct snd_info_entry *parent,</div><div class='add'>+		      struct module *module);</div><div class='ctx'> </div><div class='del'>-	p = create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, NULL);</div><div class='del'>-	if (p == NULL)</div><div class='add'>+int __init snd_info_init(void)</div><div class='add'>+{</div><div class='add'>+	snd_proc_root = snd_info_create_entry("asound", NULL, THIS_MODULE);</div><div class='add'>+	if (!snd_proc_root)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	snd_proc_root = p;</div><div class='add'>+	snd_proc_root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+	snd_proc_root-&gt;p = proc_mkdir("asound", NULL);</div><div class='add'>+	if (!snd_proc_root-&gt;p)</div><div class='add'>+		goto error;</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-	{</div><div class='del'>-		struct snd_info_entry *entry;</div><div class='del'>-		if ((entry = snd_info_create_module_entry(THIS_MODULE, "oss", NULL)) == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		snd_oss_root = entry;</div><div class='del'>-	}</div><div class='add'>+	snd_oss_root = create_subdir(THIS_MODULE, "oss");</div><div class='add'>+	if (!snd_oss_root)</div><div class='add'>+		goto error;</div><div class='ctx'> #endif</div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)</div><div class='del'>-	{</div><div class='del'>-		struct snd_info_entry *entry;</div><div class='del'>-		if ((entry = snd_info_create_module_entry(THIS_MODULE, "seq", NULL)) == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		snd_seq_root = entry;</div><div class='del'>-	}</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	snd_seq_root = create_subdir(THIS_MODULE, "seq");</div><div class='add'>+	if (!snd_seq_root)</div><div class='add'>+		goto error;</div><div class='ctx'> #endif</div><div class='del'>-	snd_info_version_init();</div><div class='del'>-	snd_minor_info_init();</div><div class='del'>-	snd_minor_info_oss_init();</div><div class='del'>-	snd_card_info_init();</div><div class='add'>+	if (snd_info_version_init() &lt; 0 ||</div><div class='add'>+	    snd_minor_info_init() &lt; 0 ||</div><div class='add'>+	    snd_minor_info_oss_init() &lt; 0 ||</div><div class='add'>+	    snd_card_info_init() &lt; 0 ||</div><div class='add'>+	    snd_info_minor_register() &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_info_free_entry(snd_proc_root);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __exit snd_info_done(void)</div><div class='ctx'> {</div><div class='del'>-	snd_card_info_done();</div><div class='del'>-	snd_minor_info_oss_done();</div><div class='del'>-	snd_minor_info_done();</div><div class='del'>-	snd_info_version_done();</div><div class='del'>-	if (snd_proc_root) {</div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)</div><div class='del'>-		snd_info_free_entry(snd_seq_root);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-		snd_info_free_entry(snd_oss_root);</div><div class='del'>-#endif</div><div class='del'>-		snd_remove_proc_entry(NULL, snd_proc_root);</div><div class='del'>-	}</div><div class='add'>+	snd_info_free_entry(snd_proc_root);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>- */</div><div class='add'>+static void snd_card_id_read(struct snd_info_entry *entry,</div><div class='add'>+			     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = entry-&gt;private_data;</div><div class='ctx'> </div><div class='add'>+	snd_iprintf(buffer, "%s\n", card-&gt;id);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * create a card proc file</div><div class='hunk'>@@ -605,33 +485,38 @@ int snd_info_card_create(struct snd_card *card)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(str, "card%i", card-&gt;number);</div><div class='del'>-	if ((entry = snd_info_create_module_entry(card-&gt;module, str, NULL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='add'>+	entry = create_subdir(card-&gt;module, str);</div><div class='add'>+	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	card-&gt;proc_root = entry;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return snd_card_ro_proc_new(card, "id", card, snd_card_id_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * register the card proc file</div><div class='ctx'>  * called from init.c</div><div class='add'>+ * can be called multiple times for reinitialization</div><div class='ctx'>  */</div><div class='ctx'> int snd_info_card_register(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_dir_entry *p;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+	err = snd_info_register(card-&gt;proc_root);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	if (!strcmp(card-&gt;id, card-&gt;proc_root-&gt;name))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	p = proc_symlink(card-&gt;id, snd_proc_root, card-&gt;proc_root-&gt;name);</div><div class='del'>-	if (p == NULL)</div><div class='add'>+	if (card-&gt;proc_root_link)</div><div class='add'>+		return 0;</div><div class='add'>+	p = proc_symlink(card-&gt;id, snd_proc_root-&gt;p, card-&gt;proc_root-&gt;name);</div><div class='add'>+	if (!p)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	card-&gt;proc_root_link = p;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -642,16 +527,15 @@ int snd_info_card_register(struct snd_card *card)</div><div class='ctx'>  */</div><div class='ctx'> void snd_info_card_id_change(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;info_mutex);</div><div class='add'>+	guard(mutex)(&amp;info_mutex);</div><div class='ctx'> 	if (card-&gt;proc_root_link) {</div><div class='del'>-		snd_remove_proc_entry(snd_proc_root, card-&gt;proc_root_link);</div><div class='add'>+		proc_remove(card-&gt;proc_root_link);</div><div class='ctx'> 		card-&gt;proc_root_link = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (strcmp(card-&gt;id, card-&gt;proc_root-&gt;name))</div><div class='ctx'> 		card-&gt;proc_root_link = proc_symlink(card-&gt;id,</div><div class='del'>-						    snd_proc_root,</div><div class='add'>+						    snd_proc_root-&gt;p,</div><div class='ctx'> 						    card-&gt;proc_root-&gt;name);</div><div class='del'>-	mutex_unlock(&amp;info_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -662,14 +546,16 @@ void snd_info_card_disconnect(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return;</div><div class='del'>-	mutex_lock(&amp;info_mutex);</div><div class='del'>-	if (card-&gt;proc_root_link) {</div><div class='del'>-		snd_remove_proc_entry(snd_proc_root, card-&gt;proc_root_link);</div><div class='del'>-		card-&gt;proc_root_link = NULL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	proc_remove(card-&gt;proc_root_link);</div><div class='add'>+	if (card-&gt;proc_root)</div><div class='add'>+		proc_remove(card-&gt;proc_root-&gt;p);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;info_mutex);</div><div class='ctx'> 	if (card-&gt;proc_root)</div><div class='del'>-		snd_info_disconnect(card-&gt;proc_root);</div><div class='del'>-	mutex_unlock(&amp;info_mutex);</div><div class='add'>+		snd_info_clear_entries(card-&gt;proc_root);</div><div class='add'>+	card-&gt;proc_root_link = NULL;</div><div class='add'>+	card-&gt;proc_root = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -690,40 +576,36 @@ int snd_info_card_free(struct snd_card *card)</div><div class='ctx'>  * snd_info_get_line - read one line from the procfs buffer</div><div class='ctx'>  * @buffer: the procfs buffer</div><div class='ctx'>  * @line: the buffer to store</div><div class='del'>- * @len: the max. buffer size - 1</div><div class='add'>+ * @len: the max. buffer size</div><div class='ctx'>  *</div><div class='ctx'>  * Reads one line from the buffer and stores the string.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or 1 if error or EOF.</div><div class='add'>+ * Return: Zero if successful, or 1 if error or EOF.</div><div class='ctx'>  */</div><div class='ctx'> int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len)</div><div class='ctx'> {</div><div class='del'>-	int c = -1;</div><div class='add'>+	int c;</div><div class='ctx'> </div><div class='add'>+	if (snd_BUG_ON(!buffer))</div><div class='add'>+		return 1;</div><div class='add'>+	if (!buffer-&gt;buffer)</div><div class='add'>+		return 1;</div><div class='ctx'> 	if (len &lt;= 0 || buffer-&gt;stop || buffer-&gt;error)</div><div class='ctx'> 		return 1;</div><div class='del'>-	while (--len &gt; 0) {</div><div class='add'>+	while (!buffer-&gt;stop) {</div><div class='ctx'> 		c = buffer-&gt;buffer[buffer-&gt;curr++];</div><div class='del'>-		if (c == '\n') {</div><div class='del'>-			if (buffer-&gt;curr &gt;= buffer-&gt;size)</div><div class='del'>-				buffer-&gt;stop = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		*line++ = c;</div><div class='del'>-		if (buffer-&gt;curr &gt;= buffer-&gt;size) {</div><div class='add'>+		if (buffer-&gt;curr &gt;= buffer-&gt;size)</div><div class='ctx'> 			buffer-&gt;stop = 1;</div><div class='add'>+		if (c == '\n')</div><div class='ctx'> 			break;</div><div class='add'>+		if (len &gt; 1) {</div><div class='add'>+			len--;</div><div class='add'>+			*line++ = c;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	while (c != '\n' &amp;&amp; !buffer-&gt;stop) {</div><div class='del'>-		c = buffer-&gt;buffer[buffer-&gt;curr++];</div><div class='del'>-		if (buffer-&gt;curr &gt;= buffer-&gt;size)</div><div class='del'>-			buffer-&gt;stop = 1;</div><div class='del'>-	}</div><div class='ctx'> 	*line = '\0';</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_get_line);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -735,7 +617,7 @@ EXPORT_SYMBOL(snd_info_get_line);</div><div class='ctx'>  * Parses the original string and copy a token to the given</div><div class='ctx'>  * string buffer.</div><div class='ctx'>  *</div><div class='del'>- * Returns the updated pointer of the original string so that</div><div class='add'>+ * Return: The updated pointer of the original string so that</div><div class='ctx'>  * it can be used for the next call.</div><div class='ctx'>  */</div><div class='ctx'> const char *snd_info_get_str(char *dest, const char *src, int len)</div><div class='hunk'>@@ -761,12 +643,12 @@ const char *snd_info_get_str(char *dest, const char *src, int len)</div><div class='ctx'> 		src++;</div><div class='ctx'> 	return src;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_get_str);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * snd_info_create_entry - create an info entry</div><div class='ctx'>  * @name: the proc file name</div><div class='add'>+ * @parent: the parent directory</div><div class='ctx'>  *</div><div class='ctx'>  * Creates an info entry with the given file name and initializes as</div><div class='ctx'>  * the default state.</div><div class='hunk'>@@ -774,9 +656,11 @@ EXPORT_SYMBOL(snd_info_get_str);</div><div class='ctx'>  * Usually called from other functions such as</div><div class='ctx'>  * snd_info_create_card_entry().</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the new instance, or NULL on failure.</div><div class='add'>+ * Return: The pointer of the new instance, or %NULL on failure.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_info_entry *snd_info_create_entry(const char *name)</div><div class='add'>+static struct snd_info_entry *</div><div class='add'>+snd_info_create_entry(const char *name, struct snd_info_entry *parent,</div><div class='add'>+		      struct module *module)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> 	entry = kzalloc(sizeof(*entry), GFP_KERNEL);</div><div class='hunk'>@@ -787,11 +671,17 @@ static struct snd_info_entry *snd_info_create_entry(const char *name)</div><div class='ctx'> 		kfree(entry);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	entry-&gt;mode = S_IFREG | S_IRUGO;</div><div class='add'>+	entry-&gt;mode = S_IFREG | 0444;</div><div class='ctx'> 	entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='ctx'> 	mutex_init(&amp;entry-&gt;access);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;entry-&gt;children);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;entry-&gt;list);</div><div class='add'>+	entry-&gt;parent = parent;</div><div class='add'>+	entry-&gt;module = module;</div><div class='add'>+	if (parent) {</div><div class='add'>+		guard(mutex)(&amp;parent-&gt;access);</div><div class='add'>+		list_add_tail(&amp;entry-&gt;list, &amp;parent-&gt;children);</div><div class='add'>+	}</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -803,20 +693,16 @@ static struct snd_info_entry *snd_info_create_entry(const char *name)</div><div class='ctx'>  *</div><div class='ctx'>  * Creates a new info entry and assigns it to the given module.</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the new instance, or NULL on failure.</div><div class='add'>+ * Return: The pointer of the new instance, or %NULL on failure.</div><div class='ctx'>  */</div><div class='ctx'> struct snd_info_entry *snd_info_create_module_entry(struct module * module,</div><div class='ctx'> 					       const char *name,</div><div class='ctx'> 					       struct snd_info_entry *parent)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry = snd_info_create_entry(name);</div><div class='del'>-	if (entry) {</div><div class='del'>-		entry-&gt;module = module;</div><div class='del'>-		entry-&gt;parent = parent;</div><div class='del'>-	}</div><div class='del'>-	return entry;</div><div class='add'>+	if (!parent)</div><div class='add'>+		parent = snd_proc_root;</div><div class='add'>+	return snd_info_create_entry(name, parent, module);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_create_module_entry);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -827,168 +713,166 @@ EXPORT_SYMBOL(snd_info_create_module_entry);</div><div class='ctx'>  *</div><div class='ctx'>  * Creates a new info entry and assigns it to the given card.</div><div class='ctx'>  *</div><div class='del'>- * Returns the pointer of the new instance, or NULL on failure.</div><div class='add'>+ * Return: The pointer of the new instance, or %NULL on failure.</div><div class='ctx'>  */</div><div class='ctx'> struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,</div><div class='ctx'> 					     const char *name,</div><div class='ctx'> 					     struct snd_info_entry * parent)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry = snd_info_create_entry(name);</div><div class='del'>-	if (entry) {</div><div class='del'>-		entry-&gt;module = card-&gt;module;</div><div class='del'>-		entry-&gt;card = card;</div><div class='del'>-		entry-&gt;parent = parent;</div><div class='del'>-	}</div><div class='del'>-	return entry;</div><div class='add'>+	if (!parent)</div><div class='add'>+		parent = card-&gt;proc_root;</div><div class='add'>+	return snd_info_create_entry(name, parent, card-&gt;module);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_create_card_entry);</div><div class='ctx'> </div><div class='del'>-static void snd_info_disconnect(struct snd_info_entry *entry)</div><div class='add'>+static void snd_info_clear_entries(struct snd_info_entry *entry)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *p, *n;</div><div class='del'>-	struct proc_dir_entry *root;</div><div class='del'>-</div><div class='del'>-	list_for_each_safe(p, n, &amp;entry-&gt;children) {</div><div class='del'>-		snd_info_disconnect(list_entry(p, struct snd_info_entry, list));</div><div class='del'>-	}</div><div class='add'>+	struct snd_info_entry *p;</div><div class='ctx'> </div><div class='del'>-	if (! entry-&gt;p)</div><div class='add'>+	if (!entry-&gt;p)</div><div class='ctx'> 		return;</div><div class='del'>-	list_del_init(&amp;entry-&gt;list);</div><div class='del'>-	root = entry-&gt;parent == NULL ? snd_proc_root : entry-&gt;parent-&gt;p;</div><div class='del'>-	snd_BUG_ON(!root);</div><div class='del'>-	snd_remove_proc_entry(root, entry-&gt;p);</div><div class='add'>+	list_for_each_entry(p, &amp;entry-&gt;children, list)</div><div class='add'>+		snd_info_clear_entries(p);</div><div class='ctx'> 	entry-&gt;p = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_info_dev_free_entry(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_info_entry *entry = device-&gt;device_data;</div><div class='del'>-	snd_info_free_entry(entry);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_info_dev_register_entry(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_info_entry *entry = device-&gt;device_data;</div><div class='del'>-	return snd_info_register(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_card_proc_new - create an info entry for the given card</div><div class='del'>- * @card: the card instance</div><div class='del'>- * @name: the file name</div><div class='del'>- * @entryp: the pointer to store the new info entry</div><div class='del'>- *</div><div class='del'>- * Creates a new info entry and assigns it to the given card.</div><div class='del'>- * Unlike snd_info_create_card_entry(), this function registers the</div><div class='del'>- * info entry as an ALSA device component, so that it can be</div><div class='del'>- * unregistered/released without explicit call.</div><div class='del'>- * Also, you don't have to register this entry via snd_info_register(),</div><div class='del'>- * since this will be registered by snd_card_register() automatically.</div><div class='del'>- *</div><div class='del'>- * The parent is assumed as card-&gt;proc_root.</div><div class='del'>- *</div><div class='del'>- * For releasing this entry, use snd_device_free() instead of</div><div class='del'>- * snd_info_free_entry(). </div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='del'>- */</div><div class='del'>-int snd_card_proc_new(struct snd_card *card, const char *name,</div><div class='del'>-		      struct snd_info_entry **entryp)</div><div class='del'>-{</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_info_dev_free_entry,</div><div class='del'>-		.dev_register =	snd_info_dev_register_entry,</div><div class='del'>-		/* disconnect is done via snd_info_card_disconnect() */</div><div class='del'>-	};</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	entry = snd_info_create_card_entry(card, name, card-&gt;proc_root);</div><div class='del'>-	if (! entry)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_INFO, entry, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (entryp)</div><div class='del'>-		*entryp = entry;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_card_proc_new);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * snd_info_free_entry - release the info entry</div><div class='ctx'>  * @entry: the info entry</div><div class='ctx'>  *</div><div class='del'>- * Releases the info entry.  Don't call this after registered.</div><div class='add'>+ * Releases the info entry.</div><div class='ctx'>  */</div><div class='ctx'> void snd_info_free_entry(struct snd_info_entry * entry)</div><div class='ctx'> {</div><div class='del'>-	if (entry == NULL)</div><div class='add'>+	struct snd_info_entry *p, *n;</div><div class='add'>+</div><div class='add'>+	if (!entry)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (entry-&gt;p) {</div><div class='del'>-		mutex_lock(&amp;info_mutex);</div><div class='del'>-		snd_info_disconnect(entry);</div><div class='del'>-		mutex_unlock(&amp;info_mutex);</div><div class='add'>+		proc_remove(entry-&gt;p);</div><div class='add'>+		guard(mutex)(&amp;info_mutex);</div><div class='add'>+		snd_info_clear_entries(entry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* free all children at first */</div><div class='add'>+	list_for_each_entry_safe(p, n, &amp;entry-&gt;children, list)</div><div class='add'>+		snd_info_free_entry(p);</div><div class='add'>+</div><div class='add'>+	p = entry-&gt;parent;</div><div class='add'>+	if (p) {</div><div class='add'>+		guard(mutex)(&amp;p-&gt;access);</div><div class='add'>+		list_del(&amp;entry-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(entry-&gt;name);</div><div class='ctx'> 	if (entry-&gt;private_free)</div><div class='ctx'> 		entry-&gt;private_free(entry);</div><div class='ctx'> 	kfree(entry);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_free_entry);</div><div class='ctx'> </div><div class='add'>+static int __snd_info_register(struct snd_info_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct proc_dir_entry *root, *p = NULL;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!entry))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	root = entry-&gt;parent == NULL ? snd_proc_root-&gt;p : entry-&gt;parent-&gt;p;</div><div class='add'>+	guard(mutex)(&amp;info_mutex);</div><div class='add'>+	if (entry-&gt;p || !root)</div><div class='add'>+		return 0;</div><div class='add'>+	if (S_ISDIR(entry-&gt;mode)) {</div><div class='add'>+		p = proc_mkdir_mode(entry-&gt;name, entry-&gt;mode, root);</div><div class='add'>+		if (!p)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		const struct proc_ops *ops;</div><div class='add'>+		if (entry-&gt;content == SNDRV_INFO_CONTENT_DATA)</div><div class='add'>+			ops = &amp;snd_info_entry_operations;</div><div class='add'>+		else</div><div class='add'>+			ops = &amp;snd_info_text_entry_ops;</div><div class='add'>+		p = proc_create_data(entry-&gt;name, entry-&gt;mode, root,</div><div class='add'>+				     ops, entry);</div><div class='add'>+		if (!p)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		proc_set_size(p, entry-&gt;size);</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;p = p;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_info_register - register the info entry</div><div class='ctx'>  * @entry: the info entry</div><div class='ctx'>  *</div><div class='ctx'>  * Registers the proc info entry.</div><div class='add'>+ * The all children entries are registered recursively.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_info_register(struct snd_info_entry * entry)</div><div class='add'>+int snd_info_register(struct snd_info_entry *entry)</div><div class='ctx'> {</div><div class='del'>-	struct proc_dir_entry *root, *p = NULL;</div><div class='add'>+	struct snd_info_entry *p;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!entry))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	root = entry-&gt;parent == NULL ? snd_proc_root : entry-&gt;parent-&gt;p;</div><div class='del'>-	mutex_lock(&amp;info_mutex);</div><div class='del'>-	p = create_proc_entry(entry-&gt;name, entry-&gt;mode, root);</div><div class='del'>-	if (!p) {</div><div class='del'>-		mutex_unlock(&amp;info_mutex);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!entry-&gt;p) {</div><div class='add'>+		err = __snd_info_register(entry);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (!S_ISDIR(entry-&gt;mode))</div><div class='del'>-		p-&gt;proc_fops = &amp;snd_info_entry_operations;</div><div class='del'>-	p-&gt;size = entry-&gt;size;</div><div class='del'>-	p-&gt;data = entry;</div><div class='del'>-	entry-&gt;p = p;</div><div class='del'>-	if (entry-&gt;parent)</div><div class='del'>-		list_add_tail(&amp;entry-&gt;list, &amp;entry-&gt;parent-&gt;children);</div><div class='del'>-	mutex_unlock(&amp;info_mutex);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(p, &amp;entry-&gt;children, list) {</div><div class='add'>+		err = snd_info_register(p);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_info_register);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_card_rw_proc_new - Create a read/write text proc file entry for the card</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @name: the file name</div><div class='add'>+ * @private_data: the arbitrary private data</div><div class='add'>+ * @read: the read callback</div><div class='add'>+ * @write: the write callback, NULL for read-only</div><div class='add'>+ *</div><div class='add'>+ * This proc file entry will be registered via snd_card_register() call, and</div><div class='add'>+ * it will be removed automatically at the card removal, too.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_card_rw_proc_new(struct snd_card *card, const char *name,</div><div class='add'>+			 void *private_data,</div><div class='add'>+			 void (*read)(struct snd_info_entry *,</div><div class='add'>+				      struct snd_info_buffer *),</div><div class='add'>+			 void (*write)(struct snd_info_entry *entry,</div><div class='add'>+				       struct snd_info_buffer *buffer))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(card, name, card-&gt;proc_root);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_info_set_text_ops(entry, private_data, read);</div><div class='add'>+	if (write) {</div><div class='add'>+		entry-&gt;mode |= 0200;</div><div class='add'>+		entry-&gt;c.text.write = write;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_card_rw_proc_new);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry *snd_info_version_entry;</div><div class='del'>-</div><div class='ctx'> static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	snd_iprintf(buffer,</div><div class='del'>-		    "Advanced Linux Sound Architecture Driver Version "</div><div class='del'>-		    CONFIG_SND_VERSION CONFIG_SND_DATE ".\n"</div><div class='del'>-		   );</div><div class='add'>+		    "Advanced Linux Sound Architecture Driver Version k%s.\n",</div><div class='add'>+		    init_utsname()-&gt;release);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __init snd_info_version_init(void)</div><div class='hunk'>@@ -999,18 +883,5 @@ static int __init snd_info_version_init(void)</div><div class='ctx'> 	if (entry == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	entry-&gt;c.text.read = snd_info_version_read;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	snd_info_version_entry = entry;</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_info_register(entry); /* freed in error path */</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int __exit snd_info_version_done(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(snd_info_version_entry);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='head'>diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c<br/>index e4af138d651a..0dbbb8005570 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/info_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/info_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/info_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/info_oss.c</a></div><div class='hunk'>@@ -1,43 +1,25 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Information interface for ALSA driver</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/version.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_OSSEMUL) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  OSS compatible part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(strings);</div><div class='ctx'> static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT];</div><div class='del'>-static struct snd_info_entry *snd_sndstat_proc_entry;</div><div class='ctx'> </div><div class='ctx'> int snd_oss_info_register(int dev, int num, char *string)</div><div class='ctx'> {</div><div class='hunk'>@@ -47,24 +29,19 @@ int snd_oss_info_register(int dev, int num, char *string)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (snd_BUG_ON(num &lt; 0 || num &gt;= SNDRV_CARDS))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	mutex_lock(&amp;strings);</div><div class='add'>+	guard(mutex)(&amp;strings);</div><div class='ctx'> 	if (string == NULL) {</div><div class='del'>-		if ((x = snd_sndstat_strings[num][dev]) != NULL) {</div><div class='del'>-			kfree(x);</div><div class='del'>-			x = NULL;</div><div class='del'>-		}</div><div class='add'>+		x = snd_sndstat_strings[num][dev];</div><div class='add'>+		kfree(x);</div><div class='add'>+		x = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		x = kstrdup(string, GFP_KERNEL);</div><div class='del'>-		if (x == NULL) {</div><div class='del'>-			mutex_unlock(&amp;strings);</div><div class='add'>+		if (x == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_sndstat_strings[num][dev] = x;</div><div class='del'>-	mutex_unlock(&amp;strings);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_oss_info_register);</div><div class='ctx'> </div><div class='ctx'> static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)</div><div class='hunk'>@@ -73,7 +50,7 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d</div><div class='ctx'> 	char *str;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buf, "\n%s:", id);</div><div class='del'>-	mutex_lock(&amp;strings);</div><div class='add'>+	guard(mutex)(&amp;strings);</div><div class='ctx'> 	for (idx = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='ctx'> 		str = snd_sndstat_strings[idx][dev];</div><div class='ctx'> 		if (str) {</div><div class='hunk'>@@ -84,7 +61,6 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d</div><div class='ctx'> 			snd_iprintf(buf, "%i: %s\n", idx, str);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;strings);</div><div class='ctx'> 	if (ok &lt; 0)</div><div class='ctx'> 		snd_iprintf(buf, " NOT ENABLED IN CONFIG\n");</div><div class='ctx'> 	return ok;</div><div class='hunk'>@@ -93,7 +69,7 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d</div><div class='ctx'> static void snd_sndstat_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 				  struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");</div><div class='add'>+	snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA emulation code)\n");</div><div class='ctx'> 	snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",</div><div class='ctx'> 		    init_utsname()-&gt;sysname,</div><div class='ctx'> 		    init_utsname()-&gt;nodename,</div><div class='hunk'>@@ -112,27 +88,15 @@ static void snd_sndstat_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_sndstat_show_strings(buffer, "Mixers", SNDRV_OSS_INFO_DEV_MIXERS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_info_minor_register(void)</div><div class='add'>+int __init snd_info_minor_register(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));</div><div class='del'>-	if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {</div><div class='del'>-		entry-&gt;c.text.read = snd_sndstat_proc_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_sndstat_proc_entry = entry;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_info_minor_unregister(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(snd_sndstat_proc_entry);</div><div class='del'>-	snd_sndstat_proc_entry = NULL;</div><div class='del'>-	return 0;</div><div class='add'>+	entry = snd_info_create_module_entry(THIS_MODULE, "sndstat",</div><div class='add'>+					     snd_oss_root);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	entry-&gt;c.text.read = snd_sndstat_proc_read;</div><div class='add'>+	return snd_info_register(entry); /* freed in error path */</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SND_OSSEMUL */</div><div class='head'>diff --git a/sound/core/init.c b/sound/core/init.c<br/>index 57b792e2439a..c372b3228785 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/init.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/init.c</a></div><div class='hunk'>@@ -1,31 +1,21 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Initialization routines</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -44,9 +34,9 @@ static LIST_HEAD(shutdown_files);</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations snd_shutdown_f_ops;</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_cards_lock;	/* locked for registering/using */</div><div class='del'>-struct snd_card *snd_cards[SNDRV_CARDS];</div><div class='del'>-EXPORT_SYMBOL(snd_cards);</div><div class='add'>+/* locked for registering/using */</div><div class='add'>+static DECLARE_BITMAP(snd_cards_lock, SNDRV_CARDS);</div><div class='add'>+static struct snd_card *snd_cards[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> static DEFINE_MUTEX(snd_card_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -60,10 +50,10 @@ MODULE_PARM_DESC(slots, "Module names assigned to the slots.");</div><div class='ctx'> static int module_slot_match(struct module *module, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int match = 1;</div><div class='del'>-#ifdef MODULE</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='ctx'> 	const char *s1, *s2;</div><div class='ctx'> </div><div class='del'>-	if (!module || !module-&gt;name || !slots[idx])</div><div class='add'>+	if (!module || !*module-&gt;name || !slots[idx])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	s1 = module-&gt;name;</div><div class='hunk'>@@ -87,69 +77,103 @@ static int module_slot_match(struct module *module, int idx)</div><div class='ctx'> 		if (!c1)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* MODULE */</div><div class='add'>+#endif /* CONFIG_MODULES */</div><div class='ctx'> 	return match;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag);</div><div class='ctx'> EXPORT_SYMBOL(snd_mixer_oss_notify_callback);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static void snd_card_id_read(struct snd_info_entry *entry,</div><div class='del'>-			     struct snd_info_buffer *buffer)</div><div class='add'>+static int check_empty_slot(struct module *module, int slot)</div><div class='ctx'> {</div><div class='del'>-	snd_iprintf(buffer, "%s\n", entry-&gt;card-&gt;id);</div><div class='add'>+	return !slots[slot] || !*slots[slot];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int init_info_for_card(struct snd_card *card)</div><div class='add'>+/* return an empty slot number (&gt;= 0) found in the given bitmask @mask.</div><div class='add'>+ * @mask == -1 == 0xffffffff means: take any free slot up to 32</div><div class='add'>+ * when no slot is available, return the original @mask as is.</div><div class='add'>+ */</div><div class='add'>+static int get_slot_from_bitmask(int mask, int (*check)(struct module *, int),</div><div class='add'>+				 struct module *module)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_info_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_printd("unable to create card info\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "id", card-&gt;proc_root)) == NULL) {</div><div class='del'>-		snd_printd("unable to create card entry\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	entry-&gt;c.text.read = snd_card_id_read;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='del'>-		entry = NULL;</div><div class='add'>+	int slot;</div><div class='add'>+</div><div class='add'>+	for (slot = 0; slot &lt; SNDRV_CARDS; slot++) {</div><div class='add'>+		if (slot &lt; 32 &amp;&amp; !(mask &amp; (1U &lt;&lt; slot)))</div><div class='add'>+			continue;</div><div class='add'>+		if (!test_bit(slot, snd_cards_lock)) {</div><div class='add'>+			if (check(module, slot))</div><div class='add'>+				return slot; /* found */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	card-&gt;proc_id = entry;</div><div class='add'>+	return mask; /* unchanged */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* the default release callback set in snd_device_alloc() */</div><div class='add'>+static void default_release_alloc(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_device_alloc - Allocate and initialize struct device for sound devices</div><div class='add'>+ * @dev_p: pointer to store the allocated device</div><div class='add'>+ * @card: card to assign, optional</div><div class='add'>+ *</div><div class='add'>+ * For releasing the allocated device, call put_device().</div><div class='add'>+ */</div><div class='add'>+int snd_device_alloc(struct device **dev_p, struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	*dev_p = NULL;</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	device_initialize(dev);</div><div class='add'>+	if (card)</div><div class='add'>+		dev-&gt;parent = &amp;card-&gt;card_dev;</div><div class='add'>+	dev-&gt;class = &amp;sound_class;</div><div class='add'>+	dev-&gt;release = default_release_alloc;</div><div class='add'>+	*dev_p = dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-#define init_info_for_card(card)</div><div class='del'>-#endif</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_device_alloc);</div><div class='add'>+</div><div class='add'>+static int snd_card_init(struct snd_card *card, struct device *parent,</div><div class='add'>+			 int idx, const char *xid, struct module *module,</div><div class='add'>+			 size_t extra_size);</div><div class='add'>+static int snd_card_do_free(struct snd_card *card);</div><div class='add'>+static const struct attribute_group card_dev_attr_group;</div><div class='add'>+</div><div class='add'>+static void release_card_device(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	snd_card_do_free(dev_to_snd_card(dev));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  snd_card_create - create and initialize a soundcard structure</div><div class='add'>+ *  snd_card_new - create and initialize a soundcard structure</div><div class='add'>+ *  @parent: the parent device object</div><div class='ctx'>  *  @idx: card index (address) [0 ... (SNDRV_CARDS-1)]</div><div class='ctx'>  *  @xid: card identification (ASCII string)</div><div class='ctx'>  *  @module: top level module for locking</div><div class='ctx'>  *  @extra_size: allocate this extra size after the main soundcard structure</div><div class='ctx'>  *  @card_ret: the pointer to store the created card instance</div><div class='ctx'>  *</div><div class='del'>- *  Creates and initializes a soundcard structure.</div><div class='del'>- *</div><div class='ctx'>  *  The function allocates snd_card instance via kzalloc with the given</div><div class='ctx'>  *  space for the driver to use freely.  The allocated struct is stored</div><div class='ctx'>  *  in the given card_ret pointer.</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero if successful or a negative error code.</div><div class='add'>+ *  Return: Zero if successful or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int snd_card_create(int idx, const char *xid,</div><div class='add'>+int snd_card_new(struct device *parent, int idx, const char *xid,</div><div class='ctx'> 		    struct module *module, int extra_size,</div><div class='ctx'> 		    struct snd_card **card_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	int err, idx2;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card_ret))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -160,95 +184,220 @@ int snd_card_create(int idx, const char *xid,</div><div class='ctx'> 	card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);</div><div class='ctx'> 	if (!card)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = snd_card_init(card, parent, idx, xid, module, extra_size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err; /* card is freed by error handler */</div><div class='add'>+</div><div class='add'>+	*card_ret = card;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_card_new);</div><div class='add'>+</div><div class='add'>+static void __snd_card_release(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	snd_card_free(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_devm_card_new - managed snd_card object creation</div><div class='add'>+ * @parent: the parent device object</div><div class='add'>+ * @idx: card index (address) [0 ... (SNDRV_CARDS-1)]</div><div class='add'>+ * @xid: card identification (ASCII string)</div><div class='add'>+ * @module: top level module for locking</div><div class='add'>+ * @extra_size: allocate this extra size after the main soundcard structure</div><div class='add'>+ * @card_ret: the pointer to store the created card instance</div><div class='add'>+ *</div><div class='add'>+ * This function works like snd_card_new() but manages the allocated resource</div><div class='add'>+ * via devres, i.e. you don't need to free explicitly.</div><div class='add'>+ *</div><div class='add'>+ * When a snd_card object is created with this function and registered via</div><div class='add'>+ * snd_card_register(), the very first devres action to call snd_card_free()</div><div class='add'>+ * is added automatically.  In that way, the resource disconnection is assured</div><div class='add'>+ * at first, then released in the expected order.</div><div class='add'>+ *</div><div class='add'>+ * If an error happens at the probe before snd_card_register() is called and</div><div class='add'>+ * there have been other devres resources, you'd need to free the card manually</div><div class='add'>+ * via snd_card_free() call in the error; otherwise it may lead to UAF due to</div><div class='add'>+ * devres call orders.  You can use snd_card_free_on_error() helper for</div><div class='add'>+ * handling it more easily.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_devm_card_new(struct device *parent, int idx, const char *xid,</div><div class='add'>+		      struct module *module, size_t extra_size,</div><div class='add'>+		      struct snd_card **card_ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*card_ret = NULL;</div><div class='add'>+	card = devres_alloc(__snd_card_release, sizeof(*card) + extra_size,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!card)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	card-&gt;managed = true;</div><div class='add'>+	err = snd_card_init(card, parent, idx, xid, module, extra_size);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		devres_free(card); /* in managed mode, we need to free manually */</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devres_add(parent, card);</div><div class='add'>+	*card_ret = card;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_devm_card_new);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_card_free_on_error - a small helper for handling devm probe errors</div><div class='add'>+ * @dev: the managed device object</div><div class='add'>+ * @ret: the return code from the probe callback</div><div class='add'>+ *</div><div class='add'>+ * This function handles the explicit snd_card_free() call at the error from</div><div class='add'>+ * the probe callback.  It's just a small helper for simplifying the error</div><div class='add'>+ * handling with the managed devices.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_card_free_on_error(struct device *dev, int ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+	card = devres_find(dev, __snd_card_release, NULL, NULL);</div><div class='add'>+	if (card)</div><div class='add'>+		snd_card_free(card);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_card_free_on_error);</div><div class='add'>+</div><div class='add'>+static int snd_card_init(struct snd_card *card, struct device *parent,</div><div class='add'>+			 int idx, const char *xid, struct module *module,</div><div class='add'>+			 size_t extra_size)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (extra_size &gt; 0)</div><div class='add'>+		card-&gt;private_data = (char *)card + sizeof(struct snd_card);</div><div class='ctx'> 	if (xid)</div><div class='del'>-		strlcpy(card-&gt;id, xid, sizeof(card-&gt;id));</div><div class='add'>+		strscpy(card-&gt;id, xid, sizeof(card-&gt;id));</div><div class='ctx'> 	err = 0;</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		for (idx2 = 0; idx2 &lt; SNDRV_CARDS; idx2++)</div><div class='del'>-			/* idx == -1 == 0xffff means: take any free slot */</div><div class='del'>-			if (~snd_cards_lock &amp; idx &amp; 1&lt;&lt;idx2) {</div><div class='del'>-				if (module_slot_match(module, idx2)) {</div><div class='del'>-					idx = idx2;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-	if (idx &lt; 0) {</div><div class='del'>-		for (idx2 = 0; idx2 &lt; SNDRV_CARDS; idx2++)</div><div class='del'>-			/* idx == -1 == 0xffff means: take any free slot */</div><div class='del'>-			if (~snd_cards_lock &amp; idx &amp; 1&lt;&lt;idx2) {</div><div class='del'>-				if (!slots[idx2] || !*slots[idx2]) {</div><div class='del'>-					idx = idx2;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='add'>+	scoped_guard(mutex, &amp;snd_card_mutex) {</div><div class='add'>+		if (idx &lt; 0) /* first check the matching module-name slot */</div><div class='add'>+			idx = get_slot_from_bitmask(idx, module_slot_match, module);</div><div class='add'>+		if (idx &lt; 0) /* if not matched, assign an empty slot */</div><div class='add'>+			idx = get_slot_from_bitmask(idx, check_empty_slot, module);</div><div class='add'>+		if (idx &lt; 0)</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		else if (idx &lt; snd_ecards_limit) {</div><div class='add'>+			if (test_bit(idx, snd_cards_lock))</div><div class='add'>+				err = -EBUSY;	/* invalid */</div><div class='add'>+		} else if (idx &gt;= SNDRV_CARDS)</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		if (!err) {</div><div class='add'>+			set_bit(idx, snd_cards_lock);		/* lock it */</div><div class='add'>+			if (idx &gt;= snd_ecards_limit)</div><div class='add'>+				snd_ecards_limit = idx + 1; /* increase the limit */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (idx &lt; 0)</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-	else if (idx &lt; snd_ecards_limit) {</div><div class='del'>-		if (snd_cards_lock &amp; (1 &lt;&lt; idx))</div><div class='del'>-			err = -EBUSY;	/* invalid */</div><div class='del'>-	} else if (idx &gt;= SNDRV_CARDS)</div><div class='del'>-		err = -ENODEV;</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='del'>-		snd_printk(KERN_ERR "cannot find the slot for index %d (range 0-%i), error: %d\n",</div><div class='del'>-			 idx, snd_ecards_limit - 1, err);</div><div class='del'>-		goto __error;</div><div class='add'>+		dev_err(parent, "cannot find the slot for index %d (range 0-%i), error: %d\n",</div><div class='add'>+			idx, snd_ecards_limit - 1, err);</div><div class='add'>+		if (!card-&gt;managed)</div><div class='add'>+			kfree(card); /* manually free here, as no destructor called */</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_cards_lock |= 1 &lt;&lt; idx;		/* lock it */</div><div class='del'>-	if (idx &gt;= snd_ecards_limit)</div><div class='del'>-		snd_ecards_limit = idx + 1; /* increase the limit */</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='add'>+	card-&gt;dev = parent;</div><div class='ctx'> 	card-&gt;number = idx;</div><div class='add'>+	WARN_ON(IS_MODULE(CONFIG_SND) &amp;&amp; !module);</div><div class='ctx'> 	card-&gt;module = module;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;card-&gt;devices);</div><div class='ctx'> 	init_rwsem(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	rwlock_init(&amp;card-&gt;ctl_files_rwlock);</div><div class='add'>+	rwlock_init(&amp;card-&gt;controls_rwlock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;card-&gt;controls);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;card-&gt;ctl_files);</div><div class='add'>+#ifdef CONFIG_SND_CTL_FAST_LOOKUP</div><div class='add'>+	xa_init(&amp;card-&gt;ctl_numids);</div><div class='add'>+	xa_init(&amp;card-&gt;ctl_hash);</div><div class='add'>+#endif</div><div class='ctx'> 	spin_lock_init(&amp;card-&gt;files_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;card-&gt;files_list);</div><div class='del'>-	init_waitqueue_head(&amp;card-&gt;shutdown_sleep);</div><div class='add'>+	mutex_init(&amp;card-&gt;memory_mutex);</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-	mutex_init(&amp;card-&gt;power_lock);</div><div class='ctx'> 	init_waitqueue_head(&amp;card-&gt;power_sleep);</div><div class='add'>+	init_waitqueue_head(&amp;card-&gt;power_ref_sleep);</div><div class='add'>+	atomic_set(&amp;card-&gt;power_ref, 0);</div><div class='ctx'> #endif</div><div class='add'>+	init_waitqueue_head(&amp;card-&gt;remove_sleep);</div><div class='add'>+	card-&gt;sync_irq = -1;</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;card-&gt;card_dev);</div><div class='add'>+	card-&gt;card_dev.parent = parent;</div><div class='add'>+	card-&gt;card_dev.class = &amp;sound_class;</div><div class='add'>+	card-&gt;card_dev.release = release_card_device;</div><div class='add'>+	card-&gt;card_dev.groups = card-&gt;dev_groups;</div><div class='add'>+	card-&gt;dev_groups[0] = &amp;card_dev_attr_group;</div><div class='add'>+	err = kobject_set_name(&amp;card-&gt;card_dev.kobj, "card%d", idx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto __error;</div><div class='add'>+</div><div class='add'>+	snprintf(card-&gt;irq_descr, sizeof(card-&gt;irq_descr), "%s:%s",</div><div class='add'>+		 dev_driver_string(card-&gt;dev), dev_name(&amp;card-&gt;card_dev));</div><div class='add'>+</div><div class='ctx'> 	/* the control interface cannot be accessed from the user space until */</div><div class='ctx'> 	/* snd_cards_bitmask and snd_cards are set with snd_card_register */</div><div class='ctx'> 	err = snd_ctl_create(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to register control minors\n");</div><div class='add'>+		dev_err(parent, "unable to register control minors\n");</div><div class='ctx'> 		goto __error;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_info_card_create(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to create card info\n");</div><div class='add'>+		dev_err(parent, "unable to create card info\n");</div><div class='ctx'> 		goto __error_ctl;</div><div class='ctx'> 	}</div><div class='del'>-	if (extra_size &gt; 0)</div><div class='del'>-		card-&gt;private_data = (char *)card + sizeof(struct snd_card);</div><div class='del'>-	*card_ret = card;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+	card-&gt;debugfs_root = debugfs_create_dir(dev_name(&amp;card-&gt;card_dev),</div><div class='add'>+						sound_debugfs_root);</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       __error_ctl:</div><div class='del'>-	snd_device_free_all(card, SNDRV_DEV_CMD_PRE);</div><div class='add'>+	snd_device_free_all(card);</div><div class='ctx'>       __error:</div><div class='del'>-	kfree(card);</div><div class='add'>+	put_device(&amp;card-&gt;card_dev);</div><div class='ctx'>   	return err;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(snd_card_create);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_card_ref - Get the card object from the index</div><div class='add'>+ * @idx: the card index</div><div class='add'>+ *</div><div class='add'>+ * Returns a card object corresponding to the given index or NULL if not found.</div><div class='add'>+ * Release the object via snd_card_unref().</div><div class='add'>+ *</div><div class='add'>+ * Return: a card object or NULL</div><div class='add'>+ */</div><div class='add'>+struct snd_card *snd_card_ref(int idx)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+	card = snd_cards[idx];</div><div class='add'>+	if (card)</div><div class='add'>+		get_device(&amp;card-&gt;card_dev);</div><div class='add'>+	return card;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_card_ref);</div><div class='ctx'> </div><div class='ctx'> /* return non-zero if a card is already locked */</div><div class='ctx'> int snd_card_locked(int card)</div><div class='ctx'> {</div><div class='del'>-	int locked;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	locked = snd_cards_lock &amp; (1 &lt;&lt; card);</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='del'>-	return locked;</div><div class='add'>+	guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+	return test_bit(card, snd_cards_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static loff_t snd_disconnect_llseek(struct file *file, loff_t offset, int orig)</div><div class='hunk'>@@ -272,15 +421,15 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_monitor_file *df = NULL, *_df;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;shutdown_lock);</div><div class='del'>-	list_for_each_entry(_df, &amp;shutdown_files, shutdown_list) {</div><div class='del'>-		if (_df-&gt;file == file) {</div><div class='del'>-			df = _df;</div><div class='del'>-			list_del_init(&amp;df-&gt;shutdown_list);</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock, &amp;shutdown_lock) {</div><div class='add'>+		list_for_each_entry(_df, &amp;shutdown_files, shutdown_list) {</div><div class='add'>+			if (_df-&gt;file == file) {</div><div class='add'>+				df = _df;</div><div class='add'>+				list_del_init(&amp;df-&gt;shutdown_list);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;shutdown_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(df)) {</div><div class='ctx'> 		if ((file-&gt;f_flags &amp; FASYNC) &amp;&amp; df-&gt;disconnected_f_op-&gt;fasync)</div><div class='hunk'>@@ -291,9 +440,9 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	panic("%s(%p, %p) failed!", __func__, inode, file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait)</div><div class='add'>+static __poll_t snd_disconnect_poll(struct file * file, poll_table * wait)</div><div class='ctx'> {</div><div class='del'>-	return POLLERR | POLLNVAL;</div><div class='add'>+	return EPOLLERR | EPOLLNVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long snd_disconnect_ioctl(struct file *file,</div><div class='hunk'>@@ -334,222 +483,275 @@ static const struct file_operations snd_shutdown_f_ops =</div><div class='ctx'>  *</div><div class='ctx'>  *  Disconnects all APIs from the file-operations (user space).</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero, otherwise a negative error code.</div><div class='add'>+ *  Return: Zero, otherwise a negative error code.</div><div class='ctx'>  *</div><div class='ctx'>  *  Note: The current implementation replaces all active file-&gt;f_op with special</div><div class='ctx'>  *        dummy file operations (they do nothing except release).</div><div class='ctx'>  */</div><div class='del'>-int snd_card_disconnect(struct snd_card *card)</div><div class='add'>+void snd_card_disconnect(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_monitor_file *mfile;</div><div class='del'>-	struct file *file;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!card)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	if (card-&gt;shutdown) {</div><div class='del'>-		spin_unlock(&amp;card-&gt;files_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;shutdown = 1;</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* phase 1: disable fops (user space) operations for ALSA API */</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	snd_cards[card-&gt;number] = NULL;</div><div class='del'>-	snd_cards_lock &amp;= ~(1 &lt;&lt; card-&gt;number);</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='del'>-	</div><div class='del'>-	/* phase 2: replace file-&gt;f_op with special dummy operations */</div><div class='del'>-	</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	list_for_each_entry(mfile, &amp;card-&gt;files_list, list) {</div><div class='del'>-		file = mfile-&gt;file;</div><div class='add'>+	scoped_guard(spinlock, &amp;card-&gt;files_lock) {</div><div class='add'>+		if (card-&gt;shutdown)</div><div class='add'>+			return;</div><div class='add'>+		card-&gt;shutdown = 1;</div><div class='ctx'> </div><div class='del'>-		/* it's critical part, use endless loop */</div><div class='del'>-		/* we have no room to fail */</div><div class='del'>-		mfile-&gt;disconnected_f_op = mfile-&gt;file-&gt;f_op;</div><div class='add'>+		/* replace file-&gt;f_op with special dummy operations */</div><div class='add'>+		list_for_each_entry(mfile, &amp;card-&gt;files_list, list) {</div><div class='add'>+			/* it's critical part, use endless loop */</div><div class='add'>+			/* we have no room to fail */</div><div class='add'>+			mfile-&gt;disconnected_f_op = mfile-&gt;file-&gt;f_op;</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;shutdown_lock);</div><div class='del'>-		list_add(&amp;mfile-&gt;shutdown_list, &amp;shutdown_files);</div><div class='del'>-		spin_unlock(&amp;shutdown_lock);</div><div class='add'>+			scoped_guard(spinlock, &amp;shutdown_lock)</div><div class='add'>+				list_add(&amp;mfile-&gt;shutdown_list, &amp;shutdown_files);</div><div class='ctx'> </div><div class='del'>-		mfile-&gt;file-&gt;f_op = &amp;snd_shutdown_f_ops;</div><div class='del'>-		fops_get(mfile-&gt;file-&gt;f_op);</div><div class='add'>+			mfile-&gt;file-&gt;f_op = &amp;snd_shutdown_f_ops;</div><div class='add'>+			fops_get(mfile-&gt;file-&gt;f_op);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);	</div><div class='ctx'> </div><div class='del'>-	/* phase 3: notify all connected devices about disconnection */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	/* wake up sleepers here before other callbacks for avoiding potential</div><div class='add'>+	 * deadlocks with other locks (e.g. in kctls);</div><div class='add'>+	 * then this notifies the shutdown and sleepers would abort immediately</div><div class='add'>+	 */</div><div class='add'>+	wake_up_all(&amp;card-&gt;power_sleep);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* notify all connected devices about disconnection */</div><div class='ctx'> 	/* at this point, they cannot respond to any calls except release() */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> 	if (snd_mixer_oss_notify_callback)</div><div class='ctx'> 		snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_DISCONNECT);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* notify all devices that we are disconnected */</div><div class='del'>-	err = snd_device_disconnect_all(card);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "not all devices for card %i can be disconnected\n", card-&gt;number);</div><div class='add'>+	snd_device_disconnect_all(card);</div><div class='add'>+</div><div class='add'>+	if (card-&gt;sync_irq &gt; 0)</div><div class='add'>+		synchronize_irq(card-&gt;sync_irq);</div><div class='ctx'> </div><div class='ctx'> 	snd_info_card_disconnect(card);</div><div class='del'>-	if (card-&gt;card_dev) {</div><div class='del'>-		device_unregister(card-&gt;card_dev);</div><div class='del'>-		card-&gt;card_dev = NULL;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	wake_up(&amp;card-&gt;power_sleep);</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+	debugfs_remove(card-&gt;debugfs_root);</div><div class='add'>+	card-&gt;debugfs_root = NULL;</div><div class='ctx'> #endif</div><div class='del'>-	return 0;	</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+	if (card-&gt;registered) {</div><div class='add'>+		device_del(&amp;card-&gt;card_dev);</div><div class='add'>+		card-&gt;registered = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* disable fops (user space) operations for ALSA API */</div><div class='add'>+	scoped_guard(mutex, &amp;snd_card_mutex) {</div><div class='add'>+		snd_cards[card-&gt;number] = NULL;</div><div class='add'>+		clear_bit(card-&gt;number, snd_cards_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_power_sync_ref(card);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_card_disconnect);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  snd_card_free - frees given soundcard structure</div><div class='del'>- *  @card: soundcard structure</div><div class='del'>- *</div><div class='del'>- *  This function releases the soundcard structure and the all assigned</div><div class='del'>- *  devices automatically.  That is, you don't have to release the devices</div><div class='del'>- *  by yourself.</div><div class='add'>+ * snd_card_disconnect_sync - disconnect card and wait until files get closed</div><div class='add'>+ * @card: card object to disconnect</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero. Frees all associated devices and frees the control</div><div class='del'>- *  interface associated to given soundcard.</div><div class='add'>+ * This calls snd_card_disconnect() for disconnecting all belonging components</div><div class='add'>+ * and waits until all pending files get closed.</div><div class='add'>+ * It assures that all accesses from user-space finished so that the driver</div><div class='add'>+ * can release its resources gracefully.</div><div class='ctx'>  */</div><div class='add'>+void snd_card_disconnect_sync(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	snd_card_disconnect(card);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;card-&gt;files_lock);</div><div class='add'>+	wait_event_lock_irq(card-&gt;remove_sleep,</div><div class='add'>+			    list_empty(&amp;card-&gt;files_list),</div><div class='add'>+			    card-&gt;files_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_card_disconnect_sync);</div><div class='add'>+</div><div class='ctx'> static int snd_card_do_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)</div><div class='add'>+	card-&gt;releasing = true;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> 	if (snd_mixer_oss_notify_callback)</div><div class='ctx'> 		snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_FREE);</div><div class='ctx'> #endif</div><div class='del'>-	if (snd_device_free_all(card, SNDRV_DEV_CMD_PRE) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to free all devices (pre)\n");</div><div class='del'>-		/* Fatal, but this situation should never occur */</div><div class='del'>-	}</div><div class='del'>-	if (snd_device_free_all(card, SNDRV_DEV_CMD_NORMAL) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to free all devices (normal)\n");</div><div class='del'>-		/* Fatal, but this situation should never occur */</div><div class='del'>-	}</div><div class='del'>-	if (snd_device_free_all(card, SNDRV_DEV_CMD_POST) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to free all devices (post)\n");</div><div class='del'>-		/* Fatal, but this situation should never occur */</div><div class='del'>-	}</div><div class='add'>+	snd_device_free_all(card);</div><div class='ctx'> 	if (card-&gt;private_free)</div><div class='ctx'> 		card-&gt;private_free(card);</div><div class='del'>-	snd_info_free_entry(card-&gt;proc_id);</div><div class='ctx'> 	if (snd_info_card_free(card) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "unable to free card info\n");</div><div class='add'>+		dev_warn(card-&gt;dev, "unable to free card info\n");</div><div class='ctx'> 		/* Not fatal error */</div><div class='ctx'> 	}</div><div class='del'>-	kfree(card);</div><div class='add'>+	if (card-&gt;release_completion)</div><div class='add'>+		complete(card-&gt;release_completion);</div><div class='add'>+	if (!card-&gt;managed)</div><div class='add'>+		kfree(card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_card_free_when_closed(struct snd_card *card)</div><div class='add'>+/**</div><div class='add'>+ * snd_card_free_when_closed - Disconnect the card, free it later eventually</div><div class='add'>+ * @card: soundcard structure</div><div class='add'>+ *</div><div class='add'>+ * Unlike snd_card_free(), this function doesn't try to release the card</div><div class='add'>+ * resource immediately, but tries to disconnect at first.  When the card</div><div class='add'>+ * is still in use, the function returns before freeing the resources.</div><div class='add'>+ * The card resources will be freed when the refcount gets to zero.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+void snd_card_free_when_closed(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	int free_now = 0;</div><div class='del'>-	int ret = snd_card_disconnect(card);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	if (list_empty(&amp;card-&gt;files_list))</div><div class='del'>-		free_now = 1;</div><div class='del'>-	else</div><div class='del'>-		card-&gt;free_on_last_close = 1;</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='add'>+	if (!card)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (free_now)</div><div class='del'>-		snd_card_do_free(card);</div><div class='del'>-	return 0;</div><div class='add'>+	snd_card_disconnect(card);</div><div class='add'>+	put_device(&amp;card-&gt;card_dev);</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_card_free_when_closed);</div><div class='ctx'> </div><div class='del'>-int snd_card_free(struct snd_card *card)</div><div class='add'>+/**</div><div class='add'>+ * snd_card_free - frees given soundcard structure</div><div class='add'>+ * @card: soundcard structure</div><div class='add'>+ *</div><div class='add'>+ * This function releases the soundcard structure and the all assigned</div><div class='add'>+ * devices automatically.  That is, you don't have to release the devices</div><div class='add'>+ * by yourself.</div><div class='add'>+ *</div><div class='add'>+ * This function waits until the all resources are properly released.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero. Frees all associated devices and frees the control</div><div class='add'>+ * interface associated to given soundcard.</div><div class='add'>+ */</div><div class='add'>+void snd_card_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	int ret = snd_card_disconnect(card);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	DECLARE_COMPLETION_ONSTACK(released);</div><div class='add'>+</div><div class='add'>+	/* The call of snd_card_free() is allowed from various code paths;</div><div class='add'>+	 * a manual call from the driver and the call via devres_free, and</div><div class='add'>+	 * we need to avoid double-free. Moreover, the release via devres</div><div class='add'>+	 * may call snd_card_free() twice due to its nature, we need to have</div><div class='add'>+	 * the check here at the beginning.</div><div class='add'>+	 */</div><div class='add'>+	if (card-&gt;releasing)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	card-&gt;release_completion = &amp;released;</div><div class='add'>+	snd_card_free_when_closed(card);</div><div class='ctx'> </div><div class='ctx'> 	/* wait, until all devices are ready for the free operation */</div><div class='del'>-	wait_event(card-&gt;shutdown_sleep, list_empty(&amp;card-&gt;files_list));</div><div class='del'>-	snd_card_do_free(card);</div><div class='del'>-	return 0;</div><div class='add'>+	wait_for_completion(&amp;released);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_card_free);</div><div class='ctx'> </div><div class='del'>-static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)</div><div class='add'>+/* check, if the character is in the valid ASCII range */</div><div class='add'>+static inline bool safe_ascii_char(char c)</div><div class='ctx'> {</div><div class='del'>-	int i, len, idx_flag = 0, loops = SNDRV_CARDS;</div><div class='del'>-	const char *spos, *src;</div><div class='add'>+	return isascii(c) &amp;&amp; isalnum(c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* retrieve the last word of shortname or longname */</div><div class='add'>+static const char *retrieve_id_from_card_name(const char *name)</div><div class='add'>+{</div><div class='add'>+	const char *spos = name;</div><div class='add'>+</div><div class='add'>+	while (*name) {</div><div class='add'>+		if (isspace(*name) &amp;&amp; safe_ascii_char(name[1]))</div><div class='add'>+			spos = name + 1;</div><div class='add'>+		name++;</div><div class='add'>+	}</div><div class='add'>+	return spos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return true if the given id string doesn't conflict any other card ids */</div><div class='add'>+static bool card_id_ok(struct snd_card *card, const char *id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	if (!snd_info_check_reserved_words(id))</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; snd_ecards_limit; i++) {</div><div class='add'>+		if (snd_cards[i] &amp;&amp; snd_cards[i] != card &amp;&amp;</div><div class='add'>+		    !strcmp(snd_cards[i]-&gt;id, id))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copy to card-&gt;id only with valid letters from nid */</div><div class='add'>+static void copy_valid_id_string(struct snd_card *card, const char *src,</div><div class='add'>+				 const char *nid)</div><div class='add'>+{</div><div class='add'>+	char *id = card-&gt;id;</div><div class='add'>+</div><div class='add'>+	while (*nid &amp;&amp; !safe_ascii_char(*nid))</div><div class='add'>+		nid++;</div><div class='add'>+	if (isdigit(*nid))</div><div class='add'>+		*id++ = isalpha(*src) ? *src : 'D';</div><div class='add'>+	while (*nid &amp;&amp; (size_t)(id - card-&gt;id) &lt; sizeof(card-&gt;id) - 1) {</div><div class='add'>+		if (safe_ascii_char(*nid))</div><div class='add'>+			*id++ = *nid;</div><div class='add'>+		nid++;</div><div class='add'>+	}</div><div class='add'>+	*id = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set card-&gt;id from the given string</div><div class='add'>+ * If the string conflicts with other ids, add a suffix to make it unique.</div><div class='add'>+ */</div><div class='add'>+static void snd_card_set_id_no_lock(struct snd_card *card, const char *src,</div><div class='add'>+				    const char *nid)</div><div class='add'>+{</div><div class='add'>+	int len, loops;</div><div class='add'>+	bool is_default = false;</div><div class='ctx'> 	char *id;</div><div class='ctx'> 	</div><div class='del'>-	if (nid == NULL) {</div><div class='del'>-		id = card-&gt;shortname;</div><div class='del'>-		spos = src = id;</div><div class='del'>-		while (*id != '\0') {</div><div class='del'>-			if (*id == ' ')</div><div class='del'>-				spos = id + 1;</div><div class='del'>-			id++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		spos = src = nid;</div><div class='del'>-	}</div><div class='add'>+	copy_valid_id_string(card, src, nid);</div><div class='ctx'> 	id = card-&gt;id;</div><div class='del'>-	while (*spos != '\0' &amp;&amp; !isalnum(*spos))</div><div class='del'>-		spos++;</div><div class='del'>-	if (isdigit(*spos))</div><div class='del'>-		*id++ = isalpha(src[0]) ? src[0] : 'D';</div><div class='del'>-	while (*spos != '\0' &amp;&amp; (size_t)(id - card-&gt;id) &lt; sizeof(card-&gt;id) - 1) {</div><div class='del'>-		if (isalnum(*spos))</div><div class='del'>-			*id++ = *spos;</div><div class='del'>-		spos++;</div><div class='add'>+</div><div class='add'>+ again:</div><div class='add'>+	/* use "Default" for obviously invalid strings</div><div class='add'>+	 * ("card" conflicts with proc directories)</div><div class='add'>+	 */</div><div class='add'>+	if (!*id || !strncmp(id, "card", 4)) {</div><div class='add'>+		strscpy(card-&gt;id, "Default");</div><div class='add'>+		is_default = true;</div><div class='ctx'> 	}</div><div class='del'>-	*id = '\0';</div><div class='ctx'> </div><div class='del'>-	id = card-&gt;id;</div><div class='del'>-	</div><div class='del'>-	if (*id == '\0')</div><div class='del'>-		strcpy(id, "default");</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-	      	if (loops-- == 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to set card id (%s)\n", id);</div><div class='del'>-      			strcpy(card-&gt;id, card-&gt;proc_root-&gt;name);</div><div class='del'>-      			return;</div><div class='del'>-      		}</div><div class='del'>-	      	if (!snd_info_check_reserved_words(id))</div><div class='del'>-      			goto __change;</div><div class='del'>-		for (i = 0; i &lt; snd_ecards_limit; i++) {</div><div class='del'>-			if (snd_cards[i] &amp;&amp; !strcmp(snd_cards[i]-&gt;id, id))</div><div class='del'>-				goto __change;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	      __change:</div><div class='del'>-		len = strlen(id);</div><div class='del'>-		if (idx_flag) {</div><div class='del'>-			if (id[len-1] != '9')</div><div class='del'>-				id[len-1]++;</div><div class='del'>-			else</div><div class='del'>-				id[len-1] = 'A';</div><div class='del'>-		} else if ((size_t)len &lt;= sizeof(card-&gt;id) - 3) {</div><div class='del'>-			strcat(id, "_1");</div><div class='del'>-			idx_flag++;</div><div class='del'>-		} else {</div><div class='del'>-			spos = id + len - 2;</div><div class='del'>-			if ((size_t)len &lt;= sizeof(card-&gt;id) - 2)</div><div class='del'>-				spos++;</div><div class='del'>-			*(char *)spos++ = '_';</div><div class='del'>-			*(char *)spos++ = '1';</div><div class='del'>-			*(char *)spos++ = '\0';</div><div class='del'>-			idx_flag++;</div><div class='del'>-		}</div><div class='add'>+	len = strlen(id);</div><div class='add'>+	for (loops = 0; loops &lt; SNDRV_CARDS; loops++) {</div><div class='add'>+		char sfxstr[5]; /* "_012" */</div><div class='add'>+		int sfxlen, slen;</div><div class='add'>+</div><div class='add'>+		if (card_id_ok(card, id))</div><div class='add'>+			return; /* OK */</div><div class='add'>+</div><div class='add'>+		/* Add _XYZ suffix */</div><div class='add'>+		sfxlen = scnprintf(sfxstr, sizeof(sfxstr), "_%X", loops + 1);</div><div class='add'>+		if (len + sfxlen &gt;= sizeof(card-&gt;id))</div><div class='add'>+			slen = sizeof(card-&gt;id) - sfxlen - 1;</div><div class='add'>+		else</div><div class='add'>+			slen = len;</div><div class='add'>+		strscpy(id + slen, sfxstr, sizeof(card-&gt;id) - slen);</div><div class='ctx'> 	}</div><div class='add'>+	/* fallback to the default id */</div><div class='add'>+	if (!is_default) {</div><div class='add'>+		*id = 0;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	/* last resort... */</div><div class='add'>+	dev_err(card-&gt;dev, "unable to set card id (%s)\n", id);</div><div class='add'>+	if (card-&gt;proc_root-&gt;name)</div><div class='add'>+		strscpy(card-&gt;id, card-&gt;proc_root-&gt;name, sizeof(card-&gt;id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -565,25 +767,22 @@ void snd_card_set_id(struct snd_card *card, const char *nid)</div><div class='ctx'> 	/* check if user specified own card-&gt;id */</div><div class='ctx'> 	if (card-&gt;id[0] != '\0')</div><div class='ctx'> 		return;</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	snd_card_set_id_no_lock(card, nid);</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='add'>+	guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+	snd_card_set_id_no_lock(card, nid, nid);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_card_set_id);</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-card_id_show_attr(struct device *dev,</div><div class='del'>-		  struct device_attribute *attr, char *buf)</div><div class='add'>+static ssize_t id_show(struct device *dev,</div><div class='add'>+		       struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = dev_get_drvdata(dev);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%s\n", card ? card-&gt;id : "(null)");</div><div class='add'>+	struct snd_card *card = container_of(dev, struct snd_card, card_dev);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", card-&gt;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-card_id_store_attr(struct device *dev, struct device_attribute *attr,</div><div class='del'>-		   const char *buf, size_t count)</div><div class='add'>+static ssize_t id_store(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			const char *buf, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct snd_card *card = container_of(dev, struct snd_card, card_dev);</div><div class='ctx'> 	char buf1[sizeof(card-&gt;id)];</div><div class='ctx'> 	size_t copy = count &gt; sizeof(card-&gt;id) - 1 ?</div><div class='ctx'> 					sizeof(card-&gt;id) - 1 : count;</div><div class='hunk'>@@ -592,46 +791,70 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr,</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; copy; idx++) {</div><div class='ctx'> 		c = buf[idx];</div><div class='del'>-		if (!isalnum(c) &amp;&amp; c != '_' &amp;&amp; c != '-')</div><div class='add'>+		if (!safe_ascii_char(c) &amp;&amp; c != '_' &amp;&amp; c != '-')</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	memcpy(buf1, buf, copy);</div><div class='ctx'> 	buf1[copy] = '\0';</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	if (!snd_info_check_reserved_words(buf1)) {</div><div class='del'>-	     __exist:</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='add'>+	guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+	if (!card_id_ok(NULL, buf1))</div><div class='ctx'> 		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-	for (idx = 0; idx &lt; snd_ecards_limit; idx++) {</div><div class='del'>-		if (snd_cards[idx] &amp;&amp; !strcmp(snd_cards[idx]-&gt;id, buf1)) {</div><div class='del'>-			if (card == snd_cards[idx])</div><div class='del'>-				goto __ok;</div><div class='del'>-			else</div><div class='del'>-				goto __exist;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	strcpy(card-&gt;id, buf1);</div><div class='add'>+	strscpy(card-&gt;id, buf1);</div><div class='ctx'> 	snd_info_card_id_change(card);</div><div class='del'>-__ok:</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_attribute card_id_attrs =</div><div class='del'>-	__ATTR(id, S_IRUGO | S_IWUSR, card_id_show_attr, card_id_store_attr);</div><div class='add'>+static DEVICE_ATTR_RW(id);</div><div class='add'>+</div><div class='add'>+static ssize_t number_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = container_of(dev, struct snd_card, card_dev);</div><div class='add'>+	return sysfs_emit(buf, "%i\n", card-&gt;number);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RO(number);</div><div class='add'>+</div><div class='add'>+static struct attribute *card_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_id.attr,</div><div class='add'>+	&amp;dev_attr_number.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group card_dev_attr_group = {</div><div class='add'>+	.attrs	= card_dev_attrs,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static ssize_t</div><div class='del'>-card_number_show_attr(struct device *dev,</div><div class='del'>-		     struct device_attribute *attr, char *buf)</div><div class='add'>+/**</div><div class='add'>+ * snd_card_add_dev_attr - Append a new sysfs attribute group to card</div><div class='add'>+ * @card: card instance</div><div class='add'>+ * @group: attribute group to append</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_card_add_dev_attr(struct snd_card *card,</div><div class='add'>+			  const struct attribute_group *group)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = dev_get_drvdata(dev);</div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%i\n", card ? card-&gt;number : -1);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* loop for (arraysize-1) here to keep NULL at the last entry */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(card-&gt;dev_groups) - 1; i++) {</div><div class='add'>+		if (!card-&gt;dev_groups[i]) {</div><div class='add'>+			card-&gt;dev_groups[i] = group;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(card-&gt;dev, "Too many groups assigned\n");</div><div class='add'>+	return -ENOSPC;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_card_add_dev_attr);</div><div class='ctx'> </div><div class='del'>-static struct device_attribute card_number_attrs =</div><div class='del'>-	__ATTR(number, S_IRUGO, card_number_show_attr, NULL);</div><div class='add'>+static void trigger_card_free(void *data)</div><div class='add'>+{</div><div class='add'>+	snd_card_free(data);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  snd_card_register - register the soundcard</div><div class='hunk'>@@ -642,7 +865,7 @@ static struct device_attribute card_number_attrs =</div><div class='ctx'>  *  external accesses.  Thus, you should call this function at the end</div><div class='ctx'>  *  of the initialization of the card.</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero otherwise a negative error code if the registrain failed.</div><div class='add'>+ *  Return: Zero otherwise a negative error code if the registration failed.</div><div class='ctx'>  */</div><div class='ctx'> int snd_card_register(struct snd_card *card)</div><div class='ctx'> {</div><div class='hunk'>@@ -651,47 +874,59 @@ int snd_card_register(struct snd_card *card)</div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!card-&gt;card_dev) {</div><div class='del'>-		card-&gt;card_dev = device_create(sound_class, card-&gt;dev,</div><div class='del'>-					       MKDEV(0, 0), card,</div><div class='del'>-					       "card%i", card-&gt;number);</div><div class='del'>-		if (IS_ERR(card-&gt;card_dev))</div><div class='del'>-			card-&gt;card_dev = NULL;</div><div class='add'>+	if (!card-&gt;registered) {</div><div class='add'>+		err = device_add(&amp;card-&gt;card_dev);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		card-&gt;registered = true;</div><div class='add'>+	} else {</div><div class='add'>+		if (card-&gt;managed)</div><div class='add'>+			devm_remove_action(card-&gt;dev, trigger_card_free, card);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (card-&gt;managed) {</div><div class='add'>+		err = devm_add_action(card-&gt;dev, trigger_card_free, card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_register_all(card)) &lt; 0)</div><div class='add'>+	err = snd_device_register_all(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-	if (snd_cards[card-&gt;number]) {</div><div class='del'>-		/* already registered */</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='del'>-		return 0;</div><div class='add'>+	scoped_guard(mutex, &amp;snd_card_mutex) {</div><div class='add'>+		if (snd_cards[card-&gt;number]) {</div><div class='add'>+			/* already registered */</div><div class='add'>+			return snd_info_card_register(card); /* register pending info */</div><div class='add'>+		}</div><div class='add'>+		if (*card-&gt;id) {</div><div class='add'>+			/* make a unique id name from the given string */</div><div class='add'>+			char tmpid[sizeof(card-&gt;id)];</div><div class='add'>+</div><div class='add'>+			memcpy(tmpid, card-&gt;id, sizeof(card-&gt;id));</div><div class='add'>+			snd_card_set_id_no_lock(card, tmpid, tmpid);</div><div class='add'>+		} else {</div><div class='add'>+			/* create an id from either shortname or longname */</div><div class='add'>+			const char *src;</div><div class='add'>+</div><div class='add'>+			src = *card-&gt;shortname ? card-&gt;shortname : card-&gt;longname;</div><div class='add'>+			snd_card_set_id_no_lock(card, src,</div><div class='add'>+						retrieve_id_from_card_name(src));</div><div class='add'>+		}</div><div class='add'>+		snd_cards[card-&gt;number] = card;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_id_no_lock(card, card-&gt;id[0] == '\0' ? NULL : card-&gt;id);</div><div class='del'>-	snd_cards[card-&gt;number] = card;</div><div class='del'>-	mutex_unlock(&amp;snd_card_mutex);</div><div class='del'>-	init_info_for_card(card);</div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)</div><div class='add'>+	err = snd_info_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> 	if (snd_mixer_oss_notify_callback)</div><div class='ctx'> 		snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_REGISTER);</div><div class='ctx'> #endif</div><div class='del'>-	if (card-&gt;card_dev) {</div><div class='del'>-		err = device_create_file(card-&gt;card_dev, &amp;card_id_attrs);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = device_create_file(card-&gt;card_dev, &amp;card_number_attrs);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_card_register);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static struct snd_info_entry *snd_card_info_entry;</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> static void snd_card_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 			       struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -699,8 +934,9 @@ static void snd_card_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = count = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='del'>-		mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-		if ((card = snd_cards[idx]) != NULL) {</div><div class='add'>+		guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+		card = snd_cards[idx];</div><div class='add'>+		if (card) {</div><div class='ctx'> 			count++;</div><div class='ctx'> 			snd_iprintf(buffer, "%2i [%-15s]: %s - %s\n",</div><div class='ctx'> 					idx,</div><div class='hunk'>@@ -710,26 +946,24 @@ static void snd_card_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 			snd_iprintf(buffer, "                      %s\n",</div><div class='ctx'> 					card-&gt;longname);</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!count)</div><div class='ctx'> 		snd_iprintf(buffer, "--- no soundcards ---\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-</div><div class='ctx'> void snd_card_info_read_oss(struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, count;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = count = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='del'>-		mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-		if ((card = snd_cards[idx]) != NULL) {</div><div class='add'>+		guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+		card = snd_cards[idx];</div><div class='add'>+		if (card) {</div><div class='ctx'> 			count++;</div><div class='ctx'> 			snd_iprintf(buffer, "%s\n", card-&gt;longname);</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!count) {</div><div class='ctx'> 		snd_iprintf(buffer, "--- no soundcards ---\n");</div><div class='hunk'>@@ -738,8 +972,7 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-static struct snd_info_entry *snd_card_module_info_entry;</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='ctx'> static void snd_card_module_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 				      struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -747,11 +980,11 @@ static void snd_card_module_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='del'>-		mutex_lock(&amp;snd_card_mutex);</div><div class='del'>-		if ((card = snd_cards[idx]) != NULL)</div><div class='add'>+		guard(mutex)(&amp;snd_card_mutex);</div><div class='add'>+		card = snd_cards[idx];</div><div class='add'>+		if (card)</div><div class='ctx'> 			snd_iprintf(buffer, "%2i %s\n",</div><div class='ctx'> 				    idx, card-&gt;module-&gt;name);</div><div class='del'>-		mutex_unlock(&amp;snd_card_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -764,36 +997,21 @@ int __init snd_card_info_init(void)</div><div class='ctx'> 	if (! entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	entry-&gt;c.text.read = snd_card_info_read;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	snd_card_info_entry = entry;</div><div class='add'>+	if (snd_info_register(entry) &lt; 0)</div><div class='add'>+		return -ENOMEM; /* freed in error path */</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='ctx'> 	entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);</div><div class='del'>-	if (entry) {</div><div class='del'>-		entry-&gt;c.text.read = snd_card_module_info_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0)</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-		else</div><div class='del'>-			snd_card_module_info_entry = entry;</div><div class='del'>-	}</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	entry-&gt;c.text.read = snd_card_module_info_read;</div><div class='add'>+	if (snd_info_register(entry) &lt; 0)</div><div class='add'>+		return -ENOMEM; /* freed in error path */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-int __exit snd_card_info_done(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(snd_card_info_entry);</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	snd_info_free_entry(snd_card_module_info_entry);</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *  snd_component_add - add a component string</div><div class='hunk'>@@ -803,7 +1021,7 @@ int __exit snd_card_info_done(void)</div><div class='ctx'>  *  This function adds the component id string to the supported list.</div><div class='ctx'>  *  The component can be referred from the alsa-lib.</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero otherwise a negative error code.</div><div class='add'>+ *  Return: Zero otherwise a negative error code.</div><div class='ctx'>  */</div><div class='ctx'>   </div><div class='ctx'> int snd_component_add(struct snd_card *card, const char *component)</div><div class='hunk'>@@ -825,7 +1043,6 @@ int snd_component_add(struct snd_card *card, const char *component)</div><div class='ctx'> 	strcat(card-&gt;components, component);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_component_add);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -837,7 +1054,7 @@ EXPORT_SYMBOL(snd_component_add);</div><div class='ctx'>  *  This linked-list is used to keep tracking the connection state,</div><div class='ctx'>  *  and to avoid the release of busy resources by hotplug.</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero or a negative error code.</div><div class='add'>+ *  Return: zero or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_card_file_add(struct snd_card *card, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -848,17 +1065,16 @@ int snd_card_file_add(struct snd_card *card, struct file *file)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	mfile-&gt;file = file;</div><div class='ctx'> 	mfile-&gt;disconnected_f_op = NULL;</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;mfile-&gt;shutdown_list);</div><div class='add'>+	guard(spinlock)(&amp;card-&gt;files_lock);</div><div class='ctx'> 	if (card-&gt;shutdown) {</div><div class='del'>-		spin_unlock(&amp;card-&gt;files_lock);</div><div class='ctx'> 		kfree(mfile);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_add(&amp;mfile-&gt;list, &amp;card-&gt;files_list);</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='add'>+	get_device(&amp;card-&gt;card_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_card_file_add);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -872,76 +1088,81 @@ EXPORT_SYMBOL(snd_card_file_add);</div><div class='ctx'>  *  called beforehand, it processes the pending release of</div><div class='ctx'>  *  resources.</div><div class='ctx'>  *</div><div class='del'>- *  Returns zero or a negative error code.</div><div class='add'>+ *  Return: Zero or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_card_file_remove(struct snd_card *card, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_monitor_file *mfile, *found = NULL;</div><div class='del'>-	int last_close = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	list_for_each_entry(mfile, &amp;card-&gt;files_list, list) {</div><div class='del'>-		if (mfile-&gt;file == file) {</div><div class='del'>-			list_del(&amp;mfile-&gt;list);</div><div class='del'>-			if (mfile-&gt;disconnected_f_op)</div><div class='del'>-				fops_put(mfile-&gt;disconnected_f_op);</div><div class='del'>-			found = mfile;</div><div class='del'>-			break;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;card-&gt;files_lock) {</div><div class='add'>+		list_for_each_entry(mfile, &amp;card-&gt;files_list, list) {</div><div class='add'>+			if (mfile-&gt;file == file) {</div><div class='add'>+				list_del(&amp;mfile-&gt;list);</div><div class='add'>+				scoped_guard(spinlock, &amp;shutdown_lock)</div><div class='add'>+					list_del(&amp;mfile-&gt;shutdown_list);</div><div class='add'>+				if (mfile-&gt;disconnected_f_op)</div><div class='add'>+					fops_put(mfile-&gt;disconnected_f_op);</div><div class='add'>+				found = mfile;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	if (list_empty(&amp;card-&gt;files_list))</div><div class='del'>-		last_close = 1;</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='del'>-	if (last_close) {</div><div class='del'>-		wake_up(&amp;card-&gt;shutdown_sleep);</div><div class='del'>-		if (card-&gt;free_on_last_close)</div><div class='del'>-			snd_card_do_free(card);</div><div class='add'>+		if (list_empty(&amp;card-&gt;files_list))</div><div class='add'>+			wake_up_all(&amp;card-&gt;remove_sleep);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!found) {</div><div class='del'>-		snd_printk(KERN_ERR "ALSA card file remove problem (%p)\n", file);</div><div class='add'>+		dev_err(card-&gt;dev, "card file remove problem (%p)\n", file);</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	kfree(found);</div><div class='add'>+	put_device(&amp;card-&gt;card_dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_card_file_remove);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> /**</div><div class='del'>- *  snd_power_wait - wait until the power-state is changed.</div><div class='del'>- *  @card: soundcard structure</div><div class='del'>- *  @power_state: expected power state</div><div class='add'>+ * snd_power_ref_and_wait - wait until the card gets powered up</div><div class='add'>+ * @card: soundcard structure</div><div class='add'>+ *</div><div class='add'>+ * Take the power_ref reference count of the given card, and</div><div class='add'>+ * wait until the card gets powered up to SNDRV_CTL_POWER_D0 state.</div><div class='add'>+ * The refcount is down again while sleeping until power-up, hence this</div><div class='add'>+ * function can be used for syncing the floating control ops accesses,</div><div class='add'>+ * typically around calling control ops.</div><div class='ctx'>  *</div><div class='del'>- *  Waits until the power-state is changed.</div><div class='add'>+ * The caller needs to pull down the refcount via snd_power_unref() later</div><div class='add'>+ * no matter whether the error is returned from this function or not.</div><div class='ctx'>  *</div><div class='del'>- *  Note: the power lock must be active before call.</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int snd_power_wait(struct snd_card *card, unsigned int power_state)</div><div class='add'>+int snd_power_ref_and_wait(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	wait_queue_t wait;</div><div class='del'>-	int result = 0;</div><div class='del'>-</div><div class='del'>-	/* fastpath */</div><div class='del'>-	if (snd_power_get_state(card) == power_state)</div><div class='add'>+	snd_power_ref(card);</div><div class='add'>+	if (snd_power_get_state(card) == SNDRV_CTL_POWER_D0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-	add_wait_queue(&amp;card-&gt;power_sleep, &amp;wait);</div><div class='del'>-	while (1) {</div><div class='del'>-		if (card-&gt;shutdown) {</div><div class='del'>-			result = -ENODEV;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (snd_power_get_state(card) == power_state)</div><div class='del'>-			break;</div><div class='del'>-		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-		snd_power_unlock(card);</div><div class='del'>-		schedule_timeout(30 * HZ);</div><div class='del'>-		snd_power_lock(card);</div><div class='del'>-	}</div><div class='del'>-	remove_wait_queue(&amp;card-&gt;power_sleep, &amp;wait);</div><div class='del'>-	return result;</div><div class='add'>+	wait_event_cmd(card-&gt;power_sleep,</div><div class='add'>+		       card-&gt;shutdown ||</div><div class='add'>+		       snd_power_get_state(card) == SNDRV_CTL_POWER_D0,</div><div class='add'>+		       snd_power_unref(card), snd_power_ref(card));</div><div class='add'>+	return card-&gt;shutdown ? -ENODEV : 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_power_ref_and_wait);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_power_wait - wait until the card gets powered up (old form)</div><div class='add'>+ * @card: soundcard structure</div><div class='add'>+ *</div><div class='add'>+ * Wait until the card gets powered up to SNDRV_CTL_POWER_D0 state.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_power_wait(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = snd_power_ref_and_wait(card);</div><div class='add'>+	snd_power_unref(card);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_power_wait);</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='head'>diff --git a/sound/core/isadma.c b/sound/core/isadma.c<br/>index 950e19ba91fc..28768061d769 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/isadma.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/isadma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/isadma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/isadma.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ISA DMA support functions</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -26,8 +11,9 @@</div><div class='ctx'> </div><div class='ctx'> #undef HAVE_REALLY_SLOW_DMA_CONTROLLER</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/isa-dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_dma_program - program an ISA DMA transfer</div><div class='hunk'>@@ -54,7 +40,6 @@ void snd_dma_program(unsigned long dma,</div><div class='ctx'> 		enable_dma(dma);</div><div class='ctx'> 	release_dma_lock(flags);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_dma_program);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -72,7 +57,6 @@ void snd_dma_disable(unsigned long dma)</div><div class='ctx'> 	disable_dma(dma);</div><div class='ctx'> 	release_dma_lock(flags);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_dma_disable);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -80,7 +64,7 @@ EXPORT_SYMBOL(snd_dma_disable);</div><div class='ctx'>  * @dma: the dma number</div><div class='ctx'>  * @size: the dma transfer size</div><div class='ctx'>  *</div><div class='del'>- * Returns the current pointer in DMA tranfer buffer in bytes</div><div class='add'>+ * Return: The current pointer in DMA transfer buffer in bytes.</div><div class='ctx'>  */</div><div class='ctx'> unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -105,12 +89,50 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)</div><div class='ctx'> 		result = result1;</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (result &gt; size)</div><div class='del'>-		snd_printk(KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);</div><div class='add'>+		pr_err("ALSA: pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (result &gt;= size || result == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return size - result;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_dma_pointer);</div><div class='add'>+</div><div class='add'>+struct snd_dma_data {</div><div class='add'>+	int dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __snd_release_dma(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct snd_dma_data *p = data;</div><div class='add'>+</div><div class='add'>+	snd_dma_disable(p-&gt;dma);</div><div class='add'>+	free_dma(p-&gt;dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_devm_request_dma - the managed version of request_dma()</div><div class='add'>+ * @dev: the device pointer</div><div class='add'>+ * @dma: the dma number</div><div class='add'>+ * @name: the name string of the requester</div><div class='add'>+ *</div><div class='add'>+ * The requested DMA will be automatically released at unbinding via devres.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_devm_request_dma(struct device *dev, int dma, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct snd_dma_data *p;</div><div class='add'>+</div><div class='add'>+	if (request_dma(dma, name))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	p = devres_alloc(__snd_release_dma, sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='add'>+		free_dma(dma);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	p-&gt;dma = dma;</div><div class='add'>+	devres_add(dev, p);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_devm_request_dma);</div><div class='head'>diff --git a/sound/core/jack.c b/sound/core/jack.c<br/>index 4902ae568730..93e357a23f17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/jack.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/jack.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/jack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/jack.c</a></div><div class='hunk'>@@ -1,43 +1,55 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Jack abstraction layer</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright 2008 Wolfson Microelectronics</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;sound/jack.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+</div><div class='add'>+struct snd_jack_kctl {</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct list_head list;  /* list of controls belong to the same jack */</div><div class='add'>+	unsigned int mask_bits; /* only masked status bits are reported via kctl */</div><div class='add'>+	struct snd_jack *jack;  /* pointer to struct snd_jack */</div><div class='add'>+	bool sw_inject_enable;  /* allow to inject plug event via debugfs */</div><div class='add'>+#ifdef CONFIG_SND_JACK_INJECTION_DEBUG</div><div class='add'>+	struct dentry *jack_debugfs_root; /* jack_kctl debugfs root */</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int jack_switch_types[] = {</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+static const int jack_switch_types[SND_JACK_SWITCH_TYPES] = {</div><div class='ctx'> 	SW_HEADPHONE_INSERT,</div><div class='ctx'> 	SW_MICROPHONE_INSERT,</div><div class='ctx'> 	SW_LINEOUT_INSERT,</div><div class='ctx'> 	SW_JACK_PHYSICAL_INSERT,</div><div class='ctx'> 	SW_VIDEOOUT_INSERT,</div><div class='add'>+	SW_LINEIN_INSERT,</div><div class='add'>+	SW_USB_INSERT,</div><div class='ctx'> };</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='ctx'> </div><div class='del'>-static int snd_jack_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_jack_remove_debugfs(struct snd_jack *jack);</div><div class='add'>+</div><div class='add'>+static int snd_jack_dev_disconnect(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_jack *jack = device-&gt;device_data;</div><div class='ctx'> </div><div class='del'>-	if (jack-&gt;private_free)</div><div class='del'>-		jack-&gt;private_free(jack);</div><div class='add'>+	snd_jack_remove_debugfs(jack);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	guard(mutex)(&amp;jack-&gt;input_dev_lock);</div><div class='add'>+	if (!jack-&gt;input_dev)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If the input device is registered with the input subsystem</div><div class='ctx'> 	 * then we need to use a different deallocator. */</div><div class='hunk'>@@ -45,6 +57,26 @@ static int snd_jack_dev_free(struct snd_device *device)</div><div class='ctx'> 		input_unregister_device(jack-&gt;input_dev);</div><div class='ctx'> 	else</div><div class='ctx'> 		input_free_device(jack-&gt;input_dev);</div><div class='add'>+	jack-&gt;input_dev = NULL;</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_jack_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack *jack = device-&gt;device_data;</div><div class='add'>+	struct snd_card *card = device-&gt;card;</div><div class='add'>+	struct snd_jack_kctl *jack_kctl, *tmp_jack_kctl;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &amp;jack-&gt;kctl_list, list) {</div><div class='add'>+		list_del_init(&amp;jack_kctl-&gt;list);</div><div class='add'>+		snd_ctl_remove(card, jack_kctl-&gt;kctl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;private_free)</div><div class='add'>+		jack-&gt;private_free(jack);</div><div class='add'>+</div><div class='add'>+	snd_jack_dev_disconnect(device);</div><div class='ctx'> </div><div class='ctx'> 	kfree(jack-&gt;id);</div><div class='ctx'> 	kfree(jack);</div><div class='hunk'>@@ -52,6 +84,7 @@ static int snd_jack_dev_free(struct snd_device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='ctx'> static int snd_jack_dev_register(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_jack *jack = device-&gt;device_data;</div><div class='hunk'>@@ -60,6 +93,11 @@ static int snd_jack_dev_register(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	snprintf(jack-&gt;name, sizeof(jack-&gt;name), "%s %s",</div><div class='ctx'> 		 card-&gt;shortname, jack-&gt;id);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;jack-&gt;input_dev_lock);</div><div class='add'>+	if (!jack-&gt;input_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	jack-&gt;input_dev-&gt;name = jack-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	/* Default to the sound card device. */</div><div class='hunk'>@@ -85,6 +123,363 @@ static int snd_jack_dev_register(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INJECTION_DEBUG</div><div class='add'>+static void snd_jack_inject_report(struct snd_jack_kctl *jack_kctl, int status)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack *jack;</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	int i;</div><div class='add'>+#endif</div><div class='add'>+	if (!jack_kctl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	jack = jack_kctl-&gt;jack;</div><div class='add'>+</div><div class='add'>+	if (jack_kctl-&gt;sw_inject_enable)</div><div class='add'>+		snd_kctl_jack_report(jack-&gt;card, jack_kctl-&gt;kctl,</div><div class='add'>+				     status &amp; jack_kctl-&gt;mask_bits);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	if (!jack-&gt;input_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(jack-&gt;key); i++) {</div><div class='add'>+		int testbit = ((SND_JACK_BTN_0 &gt;&gt; i) &amp; jack_kctl-&gt;mask_bits);</div><div class='add'>+</div><div class='add'>+		if (jack-&gt;type &amp; testbit)</div><div class='add'>+			input_report_key(jack-&gt;input_dev, jack-&gt;key[i],</div><div class='add'>+					 status &amp; testbit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(jack_switch_types); i++) {</div><div class='add'>+		int testbit = ((1 &lt;&lt; i) &amp; jack_kctl-&gt;mask_bits);</div><div class='add'>+</div><div class='add'>+		if (jack-&gt;type &amp; testbit)</div><div class='add'>+			input_report_switch(jack-&gt;input_dev,</div><div class='add'>+					    jack_switch_types[i],</div><div class='add'>+					    status &amp; testbit);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	input_sync(jack-&gt;input_dev);</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sw_inject_enable_read(struct file *file,</div><div class='add'>+				     char __user *to, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	int len, ret;</div><div class='add'>+	char buf[128];</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%s: %s\t\t%s: %i\n", "Jack", jack_kctl-&gt;kctl-&gt;id.name,</div><div class='add'>+			"Inject Enabled", jack_kctl-&gt;sw_inject_enable);</div><div class='add'>+	ret = simple_read_from_buffer(to, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t sw_inject_enable_write(struct file *file,</div><div class='add'>+				      const char __user *from, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	int ret, err;</div><div class='add'>+	unsigned long enable;</div><div class='add'>+	char buf[8] = { 0 };</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, from, count);</div><div class='add'>+	err = kstrtoul(buf, 0, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (jack_kctl-&gt;sw_inject_enable == (!!enable))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	jack_kctl-&gt;sw_inject_enable = !!enable;</div><div class='add'>+</div><div class='add'>+	if (!jack_kctl-&gt;sw_inject_enable)</div><div class='add'>+		snd_jack_report(jack_kctl-&gt;jack, jack_kctl-&gt;jack-&gt;hw_status_cache);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t jackin_inject_write(struct file *file,</div><div class='add'>+				   const char __user *from, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	int ret, err;</div><div class='add'>+	unsigned long enable;</div><div class='add'>+	char buf[8] = { 0 };</div><div class='add'>+</div><div class='add'>+	if (!jack_kctl-&gt;sw_inject_enable)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, from, count);</div><div class='add'>+	err = kstrtoul(buf, 0, &amp;enable);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_jack_inject_report(jack_kctl, !!enable ? jack_kctl-&gt;mask_bits : 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t jack_kctl_id_read(struct file *file,</div><div class='add'>+				 char __user *to, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	char buf[64];</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%s\n", jack_kctl-&gt;kctl-&gt;id.name);</div><div class='add'>+	ret = simple_read_from_buffer(to, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* the bit definition is aligned with snd_jack_types in jack.h */</div><div class='add'>+static const char * const jack_events_name[] = {</div><div class='add'>+	"HEADPHONE(0x0001)", "MICROPHONE(0x0002)", "LINEOUT(0x0004)",</div><div class='add'>+	"MECHANICAL(0x0008)", "VIDEOOUT(0x0010)", "LINEIN(0x0020)",</div><div class='add'>+	"USB(0x0040)", "", "", "BTN_5(0x0200)", "BTN_4(0x0400)",</div><div class='add'>+	"BTN_3(0x0800)", "BTN_2(0x1000)", "BTN_1(0x2000)", "BTN_0(0x4000)",</div><div class='add'>+	"",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* the recommended buffer size is 256 */</div><div class='add'>+static int parse_mask_bits(unsigned int mask_bits, char *buf, size_t buf_size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	scnprintf(buf, buf_size, "0x%04x", mask_bits);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(jack_events_name); i++)</div><div class='add'>+		if (mask_bits &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			strlcat(buf, " ", buf_size);</div><div class='add'>+			strlcat(buf, jack_events_name[i], buf_size);</div><div class='add'>+		}</div><div class='add'>+	strlcat(buf, "\n", buf_size);</div><div class='add'>+</div><div class='add'>+	return strlen(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t jack_kctl_mask_bits_read(struct file *file,</div><div class='add'>+					char __user *to, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	char buf[256];</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	len = parse_mask_bits(jack_kctl-&gt;mask_bits, buf, sizeof(buf));</div><div class='add'>+	ret = simple_read_from_buffer(to, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t jack_kctl_status_read(struct file *file,</div><div class='add'>+				     char __user *to, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	char buf[16];</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	len = scnprintf(buf, sizeof(buf), "%s\n", jack_kctl-&gt;kctl-&gt;private_value ?</div><div class='add'>+			"Plugged" : "Unplugged");</div><div class='add'>+	ret = simple_read_from_buffer(to, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+static ssize_t jack_type_read(struct file *file,</div><div class='add'>+			      char __user *to, size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = file-&gt;private_data;</div><div class='add'>+	char buf[256];</div><div class='add'>+	int len, ret;</div><div class='add'>+</div><div class='add'>+	len = parse_mask_bits(jack_kctl-&gt;jack-&gt;type, buf, sizeof(buf));</div><div class='add'>+	ret = simple_read_from_buffer(to, count, ppos, buf, len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations jack_type_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = jack_type_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct file_operations sw_inject_enable_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = sw_inject_enable_read,</div><div class='add'>+	.write = sw_inject_enable_write,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations jackin_inject_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.write = jackin_inject_write,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations jack_kctl_id_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = jack_kctl_id_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations jack_kctl_mask_bits_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = jack_kctl_mask_bits_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct file_operations jack_kctl_status_fops = {</div><div class='add'>+	.open = simple_open,</div><div class='add'>+	.read = jack_kctl_status_read,</div><div class='add'>+	.llseek = default_llseek,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack,</div><div class='add'>+					    struct snd_jack_kctl *jack_kctl)</div><div class='add'>+{</div><div class='add'>+	char *tname;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Don't create injection interface for Phantom jacks */</div><div class='add'>+	if (strstr(jack_kctl-&gt;kctl-&gt;id.name, "Phantom"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tname = kstrdup(jack_kctl-&gt;kctl-&gt;id.name, GFP_KERNEL);</div><div class='add'>+	if (!tname)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* replace the chars which are not suitable for folder's name with _ */</div><div class='add'>+	for (i = 0; tname[i]; i++)</div><div class='add'>+		if (!isalnum(tname[i]))</div><div class='add'>+			tname[i] = '_';</div><div class='add'>+</div><div class='add'>+	jack_kctl-&gt;jack_debugfs_root = debugfs_create_dir(tname, jack-&gt;card-&gt;debugfs_root);</div><div class='add'>+	kfree(tname);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("sw_inject_enable", 0644, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;sw_inject_enable_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("jackin_inject", 0200, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;jackin_inject_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("kctl_id", 0444, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;jack_kctl_id_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("mask_bits", 0444, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;jack_kctl_mask_bits_fops);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("status", 0444, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;jack_kctl_status_fops);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	debugfs_create_file("type", 0444, jack_kctl-&gt;jack_debugfs_root, jack_kctl,</div><div class='add'>+			    &amp;jack_type_fops);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_jack_remove_debugfs(struct snd_jack *jack)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(jack_kctl, &amp;jack-&gt;kctl_list, list) {</div><div class='add'>+		debugfs_remove(jack_kctl-&gt;jack_debugfs_root);</div><div class='add'>+		jack_kctl-&gt;jack_debugfs_root = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else /* CONFIG_SND_JACK_INJECTION_DEBUG */</div><div class='add'>+static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack,</div><div class='add'>+					    struct snd_jack_kctl *jack_kctl)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_jack_remove_debugfs(struct snd_jack *jack)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SND_JACK_INJECTION_DEBUG */</div><div class='add'>+</div><div class='add'>+static void snd_jack_kctl_private_free(struct snd_kcontrol *kctl)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl;</div><div class='add'>+</div><div class='add'>+	jack_kctl = kctl-&gt;private_data;</div><div class='add'>+	if (jack_kctl) {</div><div class='add'>+		list_del(&amp;jack_kctl-&gt;list);</div><div class='add'>+		kfree(jack_kctl);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_jack_kctl_add(struct snd_jack *jack, struct snd_jack_kctl *jack_kctl)</div><div class='add'>+{</div><div class='add'>+	jack_kctl-&gt;jack = jack;</div><div class='add'>+	list_add_tail(&amp;jack_kctl-&gt;list, &amp;jack-&gt;kctl_list);</div><div class='add'>+	snd_jack_debugfs_add_inject_node(jack, jack_kctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_jack_kctl * snd_jack_kctl_new(struct snd_card *card, const char *name, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_jack_kctl *jack_kctl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	kctl = snd_kctl_jack_new(name, card);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	jack_kctl = kzalloc(sizeof(*jack_kctl), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!jack_kctl)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	jack_kctl-&gt;kctl = kctl;</div><div class='add'>+	jack_kctl-&gt;mask_bits = mask;</div><div class='add'>+</div><div class='add'>+	kctl-&gt;private_data = jack_kctl;</div><div class='add'>+	kctl-&gt;private_free = snd_jack_kctl_private_free;</div><div class='add'>+</div><div class='add'>+	return jack_kctl;</div><div class='add'>+error:</div><div class='add'>+	snd_ctl_free_one(kctl);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_jack_add_new_kctl - Create a new snd_jack_kctl and add it to jack</div><div class='add'>+ * @jack:  the jack instance which the kctl will attaching to</div><div class='add'>+ * @name:  the name for the snd_kcontrol object</div><div class='add'>+ * @mask:  a bitmask of enum snd_jack_type values that can be detected</div><div class='add'>+ *         by this snd_jack_kctl object.</div><div class='add'>+ *</div><div class='add'>+ * Creates a new snd_kcontrol object and adds it to the jack kctl_list.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask)</div><div class='add'>+{</div><div class='add'>+	struct snd_jack_kctl *jack_kctl;</div><div class='add'>+</div><div class='add'>+	jack_kctl = snd_jack_kctl_new(jack-&gt;card, name, mask);</div><div class='add'>+	if (!jack_kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snd_jack_kctl_add(jack, jack_kctl);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_jack_add_new_kctl);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_jack_new - Create a new jack</div><div class='hunk'>@@ -93,77 +488,94 @@ static int snd_jack_dev_register(struct snd_device *device)</div><div class='ctx'>  * @type:  a bitmask of enum snd_jack_type values that can be detected by</div><div class='ctx'>  *         this jack</div><div class='ctx'>  * @jjack: Used to provide the allocated jack object to the caller.</div><div class='add'>+ * @initial_kctl: if true, create a kcontrol and add it to the jack list.</div><div class='add'>+ * @phantom_jack: Don't create a input device for phantom jacks.</div><div class='ctx'>  *</div><div class='ctx'>  * Creates a new jack object.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='del'>- * On success jjack will be initialised.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ * On success @jjack will be initialised.</div><div class='ctx'>  */</div><div class='ctx'> int snd_jack_new(struct snd_card *card, const char *id, int type,</div><div class='del'>-		 struct snd_jack **jjack)</div><div class='add'>+		 struct snd_jack **jjack, bool initial_kctl, bool phantom_jack)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_jack *jack;</div><div class='add'>+	struct snd_jack_kctl *jack_kctl = NULL;</div><div class='ctx'> 	int err;</div><div class='del'>-	int i;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_jack_dev_free,</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='ctx'> 		.dev_register = snd_jack_dev_register,</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='add'>+		.dev_disconnect = snd_jack_dev_disconnect,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (initial_kctl) {</div><div class='add'>+		jack_kctl = snd_jack_kctl_new(card, id, type);</div><div class='add'>+		if (!jack_kctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	jack = kzalloc(sizeof(struct snd_jack), GFP_KERNEL);</div><div class='ctx'> 	if (jack == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	jack-&gt;id = kstrdup(id, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	jack-&gt;input_dev = input_allocate_device();</div><div class='del'>-	if (jack-&gt;input_dev == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_input;</div><div class='add'>+	if (jack-&gt;id == NULL) {</div><div class='add'>+		kfree(jack);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	jack-&gt;input_dev-&gt;phys = "ALSA";</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	mutex_init(&amp;jack-&gt;input_dev_lock);</div><div class='add'>+</div><div class='add'>+	/* don't create input device for phantom jack */</div><div class='add'>+	if (!phantom_jack) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		jack-&gt;input_dev = input_allocate_device();</div><div class='add'>+		if (jack-&gt;input_dev == NULL) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto fail_input;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		jack-&gt;input_dev-&gt;phys = "ALSA";</div><div class='add'>+</div><div class='add'>+		jack-&gt;type = type;</div><div class='ctx'> </div><div class='del'>-	jack-&gt;type = type;</div><div class='add'>+		for (i = 0; i &lt; SND_JACK_SWITCH_TYPES; i++)</div><div class='add'>+			if (type &amp; (1 &lt;&lt; i))</div><div class='add'>+				input_set_capability(jack-&gt;input_dev, EV_SW,</div><div class='add'>+						     jack_switch_types[i]);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(jack_switch_types); i++)</div><div class='del'>-		if (type &amp; (1 &lt;&lt; i))</div><div class='del'>-			input_set_capability(jack-&gt;input_dev, EV_SW,</div><div class='del'>-					     jack_switch_types[i]);</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='ctx'> </div><div class='ctx'> 	err = snd_device_new(card, SNDRV_DEV_JACK, jack, &amp;ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto fail_input;</div><div class='ctx'> </div><div class='add'>+	jack-&gt;card = card;</div><div class='add'>+	INIT_LIST_HEAD(&amp;jack-&gt;kctl_list);</div><div class='add'>+</div><div class='add'>+	if (initial_kctl)</div><div class='add'>+		snd_jack_kctl_add(jack, jack_kctl);</div><div class='add'>+</div><div class='ctx'> 	*jjack = jack;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_input:</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='ctx'> 	input_free_device(jack-&gt;input_dev);</div><div class='add'>+#endif</div><div class='add'>+	kfree(jack-&gt;id);</div><div class='ctx'> 	kfree(jack);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_jack_new);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * snd_jack_set_parent - Set the parent device for a jack</div><div class='del'>- *</div><div class='del'>- * @jack:   The jack to configure</div><div class='del'>- * @parent: The device to set as parent for the jack.</div><div class='del'>- *</div><div class='del'>- * Set the parent for the jack input device in the device tree.  This</div><div class='del'>- * function is only valid prior to registration of the jack.  If no</div><div class='del'>- * parent is configured then the parent device will be the sound card.</div><div class='del'>- */</div><div class='del'>-void snd_jack_set_parent(struct snd_jack *jack, struct device *parent)</div><div class='del'>-{</div><div class='del'>-	WARN_ON(jack-&gt;registered);</div><div class='del'>-</div><div class='del'>-	jack-&gt;input_dev-&gt;dev.parent = parent;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_jack_set_parent);</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='ctx'> /**</div><div class='ctx'>  * snd_jack_set_key - Set a key mapping on a jack</div><div class='ctx'>  *</div><div class='hunk'>@@ -171,11 +583,14 @@ EXPORT_SYMBOL(snd_jack_set_parent);</div><div class='ctx'>  * @type:    Jack report type for this key</div><div class='ctx'>  * @keytype: Input layer key type to be reported</div><div class='ctx'>  *</div><div class='del'>- * Map a SND_JACK_BTN_ button type to an input layer key, allowing</div><div class='add'>+ * Map a SND_JACK_BTN_* button type to an input layer key, allowing</div><div class='ctx'>  * reporting of keys on accessories via the jack abstraction.  If no</div><div class='ctx'>  * mapping is provided but keys are enabled in the jack type then</div><div class='ctx'>  * BTN_n numeric buttons will be reported.</div><div class='ctx'>  *</div><div class='add'>+ * If jacks are not reporting via the input API this call will have no</div><div class='add'>+ * effect.</div><div class='add'>+ *</div><div class='ctx'>  * Note that this is intended to be use by simple devices with small</div><div class='ctx'>  * numbers of keys that can be reported.  It is also possible to</div><div class='ctx'>  * access the input device directly - devices with complex input</div><div class='hunk'>@@ -183,6 +598,8 @@ EXPORT_SYMBOL(snd_jack_set_parent);</div><div class='ctx'>  * using this abstraction.</div><div class='ctx'>  *</div><div class='ctx'>  * This function may only be called prior to registration of the jack.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,</div><div class='ctx'> 		     int keytype)</div><div class='hunk'>@@ -196,44 +613,64 @@ int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,</div><div class='ctx'> </div><div class='ctx'> 	jack-&gt;type |= type;</div><div class='ctx'> 	jack-&gt;key[key] = keytype;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_jack_set_key);</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_jack_report - Report the current status of a jack</div><div class='add'>+ * Note: This function uses mutexes and should be called from a</div><div class='add'>+ * context which can sleep (such as a workqueue).</div><div class='ctx'>  *</div><div class='ctx'>  * @jack:   The jack to report status for</div><div class='ctx'>  * @status: The current status of the jack</div><div class='ctx'>  */</div><div class='ctx'> void snd_jack_report(struct snd_jack *jack, int status)</div><div class='ctx'> {</div><div class='add'>+	struct snd_jack_kctl *jack_kctl;</div><div class='add'>+	unsigned int mask_bits = 0;</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	struct input_dev *idev;</div><div class='ctx'> 	int i;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (!jack)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	jack-&gt;hw_status_cache = status;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(jack_kctl, &amp;jack-&gt;kctl_list, list)</div><div class='add'>+		if (jack_kctl-&gt;sw_inject_enable)</div><div class='add'>+			mask_bits |= jack_kctl-&gt;mask_bits;</div><div class='add'>+		else</div><div class='add'>+			snd_kctl_jack_report(jack-&gt;card, jack_kctl-&gt;kctl,</div><div class='add'>+					     status &amp; jack_kctl-&gt;mask_bits);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_JACK_INPUT_DEV</div><div class='add'>+	idev = input_get_device(jack-&gt;input_dev);</div><div class='add'>+	if (!idev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(jack-&gt;key); i++) {</div><div class='del'>-		int testbit = SND_JACK_BTN_0 &gt;&gt; i;</div><div class='add'>+		int testbit = ((SND_JACK_BTN_0 &gt;&gt; i) &amp; ~mask_bits);</div><div class='ctx'> </div><div class='ctx'> 		if (jack-&gt;type &amp; testbit)</div><div class='del'>-			input_report_key(jack-&gt;input_dev, jack-&gt;key[i],</div><div class='add'>+			input_report_key(idev, jack-&gt;key[i],</div><div class='ctx'> 					 status &amp; testbit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(jack_switch_types); i++) {</div><div class='del'>-		int testbit = 1 &lt;&lt; i;</div><div class='add'>+		int testbit = ((1 &lt;&lt; i) &amp; ~mask_bits);</div><div class='add'>+</div><div class='ctx'> 		if (jack-&gt;type &amp; testbit)</div><div class='del'>-			input_report_switch(jack-&gt;input_dev,</div><div class='add'>+			input_report_switch(idev,</div><div class='ctx'> 					    jack_switch_types[i],</div><div class='ctx'> 					    status &amp; testbit);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	input_sync(jack-&gt;input_dev);</div><div class='add'>+	input_sync(idev);</div><div class='add'>+	input_put_device(idev);</div><div class='add'>+#endif /* CONFIG_SND_JACK_INPUT_DEV */</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_jack_report);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Mark Brown &lt;broonie@opensource.wolfsonmicro.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Jack detection support for ALSA");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c<br/>index 9e92441f9b78..b3853583d2ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/memalloc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/memalloc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/memalloc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/memalloc.c</a></div><div class='hunk'>@@ -1,221 +1,88 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  * </div><div class='ctx'>  *  Generic memory allocators</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/seq_file.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/dma-map-ops.h&gt;</div><div class='add'>+#include &lt;linux/genalloc.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+#include &lt;asm/set_memory.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> #include &lt;sound/memalloc.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;, Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Memory allocator for ALSA system.");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(list_mutex);</div><div class='del'>-static LIST_HEAD(mem_list_head);</div><div class='del'>-</div><div class='del'>-/* buffer preservation list */</div><div class='del'>-struct snd_mem_list {</div><div class='del'>-	struct snd_dma_buffer buffer;</div><div class='del'>-	unsigned int id;</div><div class='del'>-	struct list_head list;</div><div class='add'>+struct snd_malloc_ops {</div><div class='add'>+	void *(*alloc)(struct snd_dma_buffer *dmab, size_t size);</div><div class='add'>+	void (*free)(struct snd_dma_buffer *dmab);</div><div class='add'>+	dma_addr_t (*get_addr)(struct snd_dma_buffer *dmab, size_t offset);</div><div class='add'>+	struct page *(*get_page)(struct snd_dma_buffer *dmab, size_t offset);</div><div class='add'>+	unsigned int (*get_chunk_size)(struct snd_dma_buffer *dmab,</div><div class='add'>+				       unsigned int ofs, unsigned int size);</div><div class='add'>+	int (*mmap)(struct snd_dma_buffer *dmab, struct vm_area_struct *area);</div><div class='add'>+	void (*sync)(struct snd_dma_buffer *dmab, enum snd_dma_sync_mode mode);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* id for pre-allocated buffers */</div><div class='del'>-#define SNDRV_DMA_DEVICE_UNUSED (unsigned int)-1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Generic memory allocators</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+#define DEFAULT_GFP \</div><div class='add'>+	(GFP_KERNEL | \</div><div class='add'>+	 __GFP_RETRY_MAYFAIL | /* don't trigger OOM-killer */ \</div><div class='add'>+	 __GFP_NOWARN)   /* no stack trace print - this call is non-critical */</div><div class='ctx'> </div><div class='del'>-static long snd_allocated_pages; /* holding the number of allocated pages */</div><div class='add'>+static const struct snd_malloc_ops *snd_dma_get_ops(struct snd_dma_buffer *dmab);</div><div class='ctx'> </div><div class='del'>-static inline void inc_snd_pages(int order)</div><div class='add'>+static void *__snd_dma_alloc_pages(struct snd_dma_buffer *dmab, size_t size)</div><div class='ctx'> {</div><div class='del'>-	snd_allocated_pages += 1 &lt;&lt; order;</div><div class='del'>-}</div><div class='add'>+	const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);</div><div class='ctx'> </div><div class='del'>-static inline void dec_snd_pages(int order)</div><div class='del'>-{</div><div class='del'>-	snd_allocated_pages -= 1 &lt;&lt; order;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_malloc_pages - allocate pages with the given size</div><div class='del'>- * @size: the size to allocate in bytes</div><div class='del'>- * @gfp_flags: the allocation conditions, GFP_XXX</div><div class='del'>- *</div><div class='del'>- * Allocates the physically contiguous pages with the given size.</div><div class='del'>- *</div><div class='del'>- * Returns the pointer of the buffer, or NULL if no enoguh memory.</div><div class='del'>- */</div><div class='del'>-void *snd_malloc_pages(size_t size, gfp_t gfp_flags)</div><div class='del'>-{</div><div class='del'>-	int pg;</div><div class='del'>-	void *res;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!size))</div><div class='del'>-		return NULL;</div><div class='del'>-	if (WARN_ON(!gfp_flags))</div><div class='add'>+	if (WARN_ON_ONCE(!ops || !ops-&gt;alloc))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	gfp_flags |= __GFP_COMP;	/* compound page lets parts be mapped */</div><div class='del'>-	pg = get_order(size);</div><div class='del'>-	if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL)</div><div class='del'>-		inc_snd_pages(pg);</div><div class='del'>-	return res;</div><div class='add'>+	return ops-&gt;alloc(dmab, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_free_pages - release the pages</div><div class='del'>- * @ptr: the buffer pointer to release</div><div class='del'>- * @size: the allocated buffer size</div><div class='del'>- *</div><div class='del'>- * Releases the buffer allocated via snd_malloc_pages().</div><div class='del'>- */</div><div class='del'>-void snd_free_pages(void *ptr, size_t size)</div><div class='del'>-{</div><div class='del'>-	int pg;</div><div class='del'>-</div><div class='del'>-	if (ptr == NULL)</div><div class='del'>-		return;</div><div class='del'>-	pg = get_order(size);</div><div class='del'>-	dec_snd_pages(pg);</div><div class='del'>-	free_pages((unsigned long) ptr, pg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Bus-specific memory allocators</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_HAS_DMA</div><div class='del'>-/* allocate the coherent DMA pages */</div><div class='del'>-static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma)</div><div class='del'>-{</div><div class='del'>-	int pg;</div><div class='del'>-	void *res;</div><div class='del'>-	gfp_t gfp_flags;</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(!dma))</div><div class='del'>-		return NULL;</div><div class='del'>-	pg = get_order(size);</div><div class='del'>-	gfp_flags = GFP_KERNEL</div><div class='del'>-		| __GFP_COMP	/* compound page lets parts be mapped */</div><div class='del'>-		| __GFP_NORETRY /* don't trigger OOM-killer */</div><div class='del'>-		| __GFP_NOWARN; /* no stack trace print - this call is non-critical */</div><div class='del'>-	res = dma_alloc_coherent(dev, PAGE_SIZE &lt;&lt; pg, dma, gfp_flags);</div><div class='del'>-	if (res != NULL)</div><div class='del'>-		inc_snd_pages(pg);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free the coherent DMA pages */</div><div class='del'>-static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,</div><div class='del'>-			       dma_addr_t dma)</div><div class='del'>-{</div><div class='del'>-	int pg;</div><div class='del'>-</div><div class='del'>-	if (ptr == NULL)</div><div class='del'>-		return;</div><div class='del'>-	pg = get_order(size);</div><div class='del'>-	dec_snd_pages(pg);</div><div class='del'>-	dma_free_coherent(dev, PAGE_SIZE &lt;&lt; pg, ptr, dma);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_HAS_DMA */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  ALSA generic memory management</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_dma_alloc_pages - allocate the buffer area according to the given type</div><div class='add'>+ * snd_dma_alloc_dir_pages - allocate the buffer area according to the given</div><div class='add'>+ *	type and direction</div><div class='ctx'>  * @type: the DMA buffer type</div><div class='ctx'>  * @device: the device pointer</div><div class='add'>+ * @dir: DMA direction</div><div class='ctx'>  * @size: the buffer size to allocate</div><div class='ctx'>  * @dmab: buffer allocation record to store the allocated data</div><div class='ctx'>  *</div><div class='ctx'>  * Calls the memory-allocator function for the corresponding</div><div class='ctx'>  * buffer type.</div><div class='del'>- * </div><div class='del'>- * Returns zero if the buffer with the given size is allocated successfuly,</div><div class='del'>- * other a negative value at error.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if the buffer with the given size is allocated successfully,</div><div class='add'>+ * otherwise a negative value on error.</div><div class='ctx'>  */</div><div class='del'>-int snd_dma_alloc_pages(int type, struct device *device, size_t size,</div><div class='del'>-			struct snd_dma_buffer *dmab)</div><div class='add'>+int snd_dma_alloc_dir_pages(int type, struct device *device,</div><div class='add'>+			    enum dma_data_direction dir, size_t size,</div><div class='add'>+			    struct snd_dma_buffer *dmab)</div><div class='ctx'> {</div><div class='ctx'> 	if (WARN_ON(!size))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (WARN_ON(!dmab))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='ctx'> 	dmab-&gt;dev.type = type;</div><div class='ctx'> 	dmab-&gt;dev.dev = device;</div><div class='add'>+	dmab-&gt;dev.dir = dir;</div><div class='ctx'> 	dmab-&gt;bytes = 0;</div><div class='del'>-	switch (type) {</div><div class='del'>-	case SNDRV_DMA_TYPE_CONTINUOUS:</div><div class='del'>-		dmab-&gt;area = snd_malloc_pages(size, (unsigned long)device);</div><div class='del'>-		dmab-&gt;addr = 0;</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_HAS_DMA</div><div class='del'>-	case SNDRV_DMA_TYPE_DEV:</div><div class='del'>-		dmab-&gt;area = snd_malloc_dev_pages(device, size, &amp;dmab-&gt;addr);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_DMA_SGBUF</div><div class='del'>-	case SNDRV_DMA_TYPE_DEV_SG:</div><div class='del'>-		snd_malloc_sgbuf_pages(device, size, dmab, NULL);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "snd-malloc: invalid device type %d\n", type);</div><div class='del'>-		dmab-&gt;area = NULL;</div><div class='del'>-		dmab-&gt;addr = 0;</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	if (! dmab-&gt;area)</div><div class='add'>+	dmab-&gt;addr = 0;</div><div class='add'>+	dmab-&gt;private_data = NULL;</div><div class='add'>+	dmab-&gt;area = __snd_dma_alloc_pages(dmab, size);</div><div class='add'>+	if (!dmab-&gt;area)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	dmab-&gt;bytes = size;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_dma_alloc_dir_pages);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_dma_alloc_pages_fallback - allocate the buffer area according to the given type with fallback</div><div class='hunk'>@@ -228,9 +95,9 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,</div><div class='ctx'>  * buffer type.  When no space is left, this function reduces the size and</div><div class='ctx'>  * tries to allocate again.  The size actually allocated is stored in</div><div class='ctx'>  * res_size argument.</div><div class='del'>- * </div><div class='del'>- * Returns zero if the buffer with the given size is allocated successfuly,</div><div class='del'>- * other a negative value at error.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if the buffer with the given size is allocated successfully,</div><div class='add'>+ * otherwise a negative value on error.</div><div class='ctx'>  */</div><div class='ctx'> int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,</div><div class='ctx'> 				 struct snd_dma_buffer *dmab)</div><div class='hunk'>@@ -238,22 +105,18 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	while ((err = snd_dma_alloc_pages(type, device, size, dmab)) &lt; 0) {</div><div class='del'>-		size_t aligned_size;</div><div class='ctx'> 		if (err != -ENOMEM)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		if (size &lt;= PAGE_SIZE)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		aligned_size = PAGE_SIZE &lt;&lt; get_order(size);</div><div class='del'>-		if (size != aligned_size)</div><div class='del'>-			size = aligned_size;</div><div class='del'>-		else</div><div class='del'>-			size &gt;&gt;= 1;</div><div class='add'>+		size &gt;&gt;= 1;</div><div class='add'>+		size = PAGE_SIZE &lt;&lt; get_order(size);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! dmab-&gt;area)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_dma_free_pages - release the allocated buffer</div><div class='hunk'>@@ -263,284 +126,787 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,</div><div class='ctx'>  */</div><div class='ctx'> void snd_dma_free_pages(struct snd_dma_buffer *dmab)</div><div class='ctx'> {</div><div class='del'>-	switch (dmab-&gt;dev.type) {</div><div class='del'>-	case SNDRV_DMA_TYPE_CONTINUOUS:</div><div class='del'>-		snd_free_pages(dmab-&gt;area, dmab-&gt;bytes);</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_HAS_DMA</div><div class='del'>-	case SNDRV_DMA_TYPE_DEV:</div><div class='del'>-		snd_free_dev_pages(dmab-&gt;dev.dev, dmab-&gt;bytes, dmab-&gt;area, dmab-&gt;addr);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_DMA_SGBUF</div><div class='del'>-	case SNDRV_DMA_TYPE_DEV_SG:</div><div class='del'>-		snd_free_sgbuf_pages(dmab);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "snd-malloc: invalid device type %d\n", dmab-&gt;dev.type);</div><div class='del'>-	}</div><div class='add'>+	const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;free)</div><div class='add'>+		ops-&gt;free(dmab);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_dma_free_pages);</div><div class='ctx'> </div><div class='add'>+/* called by devres */</div><div class='add'>+static void __snd_release_pages(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+	snd_dma_free_pages(res);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_dma_get_reserved - get the reserved buffer for the given device</div><div class='del'>- * @dmab: the buffer allocation record to store</div><div class='del'>- * @id: the buffer id</div><div class='add'>+ * snd_devm_alloc_dir_pages - allocate the buffer and manage with devres</div><div class='add'>+ * @dev: the device pointer</div><div class='add'>+ * @type: the DMA buffer type</div><div class='add'>+ * @dir: DMA direction</div><div class='add'>+ * @size: the buffer size to allocate</div><div class='add'>+ *</div><div class='add'>+ * Allocate buffer pages depending on the given type and manage using devres.</div><div class='add'>+ * The pages will be released automatically at the device removal.</div><div class='ctx'>  *</div><div class='del'>- * Looks for the reserved-buffer list and re-uses if the same buffer</div><div class='del'>- * is found in the list.  When the buffer is found, it's removed from the free list.</div><div class='add'>+ * Unlike snd_dma_alloc_pages(), this function requires the real device pointer,</div><div class='add'>+ * hence it can't work with SNDRV_DMA_TYPE_CONTINUOUS or</div><div class='add'>+ * SNDRV_DMA_TYPE_VMALLOC type.</div><div class='ctx'>  *</div><div class='del'>- * Returns the size of buffer if the buffer is found, or zero if not found.</div><div class='add'>+ * Return: the snd_dma_buffer object at success, or NULL if failed</div><div class='ctx'>  */</div><div class='del'>-size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id)</div><div class='add'>+struct snd_dma_buffer *</div><div class='add'>+snd_devm_alloc_dir_pages(struct device *dev, int type,</div><div class='add'>+			 enum dma_data_direction dir, size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct snd_mem_list *mem;</div><div class='add'>+	struct snd_dma_buffer *dmab;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!dmab))</div><div class='del'>-		return 0;</div><div class='add'>+	if (WARN_ON(type == SNDRV_DMA_TYPE_CONTINUOUS ||</div><div class='add'>+		    type == SNDRV_DMA_TYPE_VMALLOC))</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;list_mutex);</div><div class='del'>-	list_for_each_entry(mem, &amp;mem_list_head, list) {</div><div class='del'>-		if (mem-&gt;id == id &amp;&amp;</div><div class='del'>-		    (mem-&gt;buffer.dev.dev == NULL || dmab-&gt;dev.dev == NULL ||</div><div class='del'>-		     ! memcmp(&amp;mem-&gt;buffer.dev, &amp;dmab-&gt;dev, sizeof(dmab-&gt;dev)))) {</div><div class='del'>-			struct device *dev = dmab-&gt;dev.dev;</div><div class='del'>-			list_del(&amp;mem-&gt;list);</div><div class='del'>-			*dmab = mem-&gt;buffer;</div><div class='del'>-			if (dmab-&gt;dev.dev == NULL)</div><div class='del'>-				dmab-&gt;dev.dev = dev;</div><div class='del'>-			kfree(mem);</div><div class='del'>-			mutex_unlock(&amp;list_mutex);</div><div class='del'>-			return dmab-&gt;bytes;</div><div class='del'>-		}</div><div class='add'>+	dmab = devres_alloc(__snd_release_pages, sizeof(*dmab), GFP_KERNEL);</div><div class='add'>+	if (!dmab)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	err = snd_dma_alloc_dir_pages(type, dev, dir, size, dmab);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		devres_free(dmab);</div><div class='add'>+		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;list_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	devres_add(dev, dmab);</div><div class='add'>+	return dmab;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_devm_alloc_dir_pages);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_dma_reserve_buf - reserve the buffer</div><div class='del'>- * @dmab: the buffer to reserve</div><div class='del'>- * @id: the buffer id</div><div class='add'>+ * snd_dma_buffer_mmap - perform mmap of the given DMA buffer</div><div class='add'>+ * @dmab: buffer allocation information</div><div class='add'>+ * @area: VM area information</div><div class='ctx'>  *</div><div class='del'>- * Reserves the given buffer as a reserved buffer.</div><div class='del'>- * </div><div class='del'>- * Returns zero if successful, or a negative code at error.</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='ctx'>  */</div><div class='del'>-int snd_dma_reserve_buf(struct snd_dma_buffer *dmab, unsigned int id)</div><div class='add'>+int snd_dma_buffer_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+			struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	struct snd_mem_list *mem;</div><div class='add'>+	const struct snd_malloc_ops *ops;</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!dmab))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	mem = kmalloc(sizeof(*mem), GFP_KERNEL);</div><div class='del'>-	if (! mem)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	mutex_lock(&amp;list_mutex);</div><div class='del'>-	mem-&gt;buffer = *dmab;</div><div class='del'>-	mem-&gt;id = id;</div><div class='del'>-	list_add_tail(&amp;mem-&gt;list, &amp;mem_list_head);</div><div class='del'>-	mutex_unlock(&amp;list_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	if (!dmab)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	ops = snd_dma_get_ops(dmab);</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;mmap)</div><div class='add'>+		return ops-&gt;mmap(dmab, area);</div><div class='add'>+	else</div><div class='add'>+		return -ENOENT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_dma_buffer_mmap);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_HAS_DMA</div><div class='add'>+/**</div><div class='add'>+ * snd_dma_buffer_sync - sync DMA buffer between CPU and device</div><div class='add'>+ * @dmab: buffer allocation information</div><div class='add'>+ * @mode: sync mode</div><div class='add'>+ */</div><div class='add'>+void snd_dma_buffer_sync(struct snd_dma_buffer *dmab,</div><div class='add'>+			 enum snd_dma_sync_mode mode)</div><div class='add'>+{</div><div class='add'>+	const struct snd_malloc_ops *ops;</div><div class='add'>+</div><div class='add'>+	if (!dmab || !dmab-&gt;dev.need_sync)</div><div class='add'>+		return;</div><div class='add'>+	ops = snd_dma_get_ops(dmab);</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;sync)</div><div class='add'>+		ops-&gt;sync(dmab, mode);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dma_buffer_sync);</div><div class='add'>+#endif /* CONFIG_HAS_DMA */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_sgbuf_get_addr - return the physical address at the corresponding offset</div><div class='add'>+ * @dmab: buffer allocation information</div><div class='add'>+ * @offset: offset in the ring buffer</div><div class='add'>+ *</div><div class='add'>+ * Return: the physical address</div><div class='add'>+ */</div><div class='add'>+dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, size_t offset)</div><div class='add'>+{</div><div class='add'>+	const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_addr)</div><div class='add'>+		return ops-&gt;get_addr(dmab, offset);</div><div class='add'>+	else</div><div class='add'>+		return dmab-&gt;addr + offset;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_sgbuf_get_addr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_sgbuf_get_page - return the physical page at the corresponding offset</div><div class='add'>+ * @dmab: buffer allocation information</div><div class='add'>+ * @offset: offset in the ring buffer</div><div class='add'>+ *</div><div class='add'>+ * Return: the page pointer</div><div class='add'>+ */</div><div class='add'>+struct page *snd_sgbuf_get_page(struct snd_dma_buffer *dmab, size_t offset)</div><div class='add'>+{</div><div class='add'>+	const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_page)</div><div class='add'>+		return ops-&gt;get_page(dmab, offset);</div><div class='add'>+	else</div><div class='add'>+		return virt_to_page(dmab-&gt;area + offset);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_sgbuf_get_page);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_sgbuf_get_chunk_size - compute the max chunk size with continuous pages</div><div class='add'>+ *	on sg-buffer</div><div class='add'>+ * @dmab: buffer allocation information</div><div class='add'>+ * @ofs: offset in the ring buffer</div><div class='add'>+ * @size: the requested size</div><div class='add'>+ *</div><div class='add'>+ * Return: the chunk size</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_sgbuf_get_chunk_size(struct snd_dma_buffer *dmab,</div><div class='add'>+				      unsigned int ofs, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);</div><div class='add'>+</div><div class='add'>+	if (ops &amp;&amp; ops-&gt;get_chunk_size)</div><div class='add'>+		return ops-&gt;get_chunk_size(dmab, ofs, size);</div><div class='add'>+	else</div><div class='add'>+		return size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_sgbuf_get_chunk_size);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Continuous pages allocator</div><div class='add'>+ */</div><div class='add'>+static void *do_alloc_pages(struct device *dev, size_t size, dma_addr_t *addr,</div><div class='add'>+			    bool wc)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+	gfp_t gfp = GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN;</div><div class='add'>+</div><div class='add'>+ again:</div><div class='add'>+	p = alloc_pages_exact(size, gfp);</div><div class='add'>+	if (!p)</div><div class='add'>+		return NULL;</div><div class='add'>+	*addr = page_to_phys(virt_to_page(p));</div><div class='add'>+	if (!dev)</div><div class='add'>+		return p;</div><div class='add'>+	if ((*addr + size - 1) &amp; ~dev-&gt;coherent_dma_mask) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_ZONE_DMA32) &amp;&amp; !(gfp &amp; GFP_DMA32)) {</div><div class='add'>+			gfp |= GFP_DMA32;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+		if (IS_ENABLED(CONFIG_ZONE_DMA) &amp;&amp; !(gfp &amp; GFP_DMA)) {</div><div class='add'>+			gfp = (gfp &amp; ~GFP_DMA32) | GFP_DMA;</div><div class='add'>+			goto again;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	if (wc)</div><div class='add'>+		set_memory_wc((unsigned long)(p), size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+#endif</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_free_pages(void *p, size_t size, bool wc)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	if (wc)</div><div class='add'>+		set_memory_wb((unsigned long)(p), size &gt;&gt; PAGE_SHIFT);</div><div class='add'>+#endif</div><div class='add'>+	free_pages_exact(p, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void *snd_dma_continuous_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	return do_alloc_pages(dmab-&gt;dev.dev, size, &amp;dmab-&gt;addr, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_continuous_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	do_free_pages(dmab-&gt;area, dmab-&gt;bytes, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_continuous_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+				   struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	return remap_pfn_range(area, area-&gt;vm_start,</div><div class='add'>+			       dmab-&gt;addr &gt;&gt; PAGE_SHIFT,</div><div class='add'>+			       area-&gt;vm_end - area-&gt;vm_start,</div><div class='add'>+			       area-&gt;vm_page_prot);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct snd_malloc_ops snd_dma_continuous_ops = {</div><div class='add'>+	.alloc = snd_dma_continuous_alloc,</div><div class='add'>+	.free = snd_dma_continuous_free,</div><div class='add'>+	.mmap = snd_dma_continuous_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * purge all reserved buffers</div><div class='add'>+ * VMALLOC allocator</div><div class='ctx'>  */</div><div class='del'>-static void free_all_reserved_pages(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *p;</div><div class='del'>-	struct snd_mem_list *mem;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;list_mutex);</div><div class='del'>-	while (! list_empty(&amp;mem_list_head)) {</div><div class='del'>-		p = mem_list_head.next;</div><div class='del'>-		mem = list_entry(p, struct snd_mem_list, list);</div><div class='del'>-		list_del(p);</div><div class='del'>-		snd_dma_free_pages(&amp;mem-&gt;buffer);</div><div class='del'>-		kfree(mem);</div><div class='add'>+static void *snd_dma_vmalloc_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	return vmalloc(size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_vmalloc_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	vfree(dmab-&gt;area);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_vmalloc_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+				struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	return remap_vmalloc_range(area, dmab-&gt;area, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define get_vmalloc_page_addr(dmab, offset) \</div><div class='add'>+	page_to_phys(vmalloc_to_page((dmab)-&gt;area + (offset)))</div><div class='add'>+</div><div class='add'>+static dma_addr_t snd_dma_vmalloc_get_addr(struct snd_dma_buffer *dmab,</div><div class='add'>+					   size_t offset)</div><div class='add'>+{</div><div class='add'>+	return get_vmalloc_page_addr(dmab, offset) + offset % PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct page *snd_dma_vmalloc_get_page(struct snd_dma_buffer *dmab,</div><div class='add'>+					     size_t offset)</div><div class='add'>+{</div><div class='add'>+	return vmalloc_to_page(dmab-&gt;area + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+snd_dma_vmalloc_get_chunk_size(struct snd_dma_buffer *dmab,</div><div class='add'>+			       unsigned int ofs, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int start, end;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	start = ALIGN_DOWN(ofs, PAGE_SIZE);</div><div class='add'>+	end = ofs + size - 1; /* the last byte address */</div><div class='add'>+	/* check page continuity */</div><div class='add'>+	addr = get_vmalloc_page_addr(dmab, start);</div><div class='add'>+	for (;;) {</div><div class='add'>+		start += PAGE_SIZE;</div><div class='add'>+		if (start &gt; end)</div><div class='add'>+			break;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+		if (get_vmalloc_page_addr(dmab, start) != addr)</div><div class='add'>+			return start - ofs;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;list_mutex);</div><div class='add'>+	/* ok, all on continuous pages */</div><div class='add'>+	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct snd_malloc_ops snd_dma_vmalloc_ops = {</div><div class='add'>+	.alloc = snd_dma_vmalloc_alloc,</div><div class='add'>+	.free = snd_dma_vmalloc_free,</div><div class='add'>+	.mmap = snd_dma_vmalloc_mmap,</div><div class='add'>+	.get_addr = snd_dma_vmalloc_get_addr,</div><div class='add'>+	.get_page = snd_dma_vmalloc_get_page,</div><div class='add'>+	.get_chunk_size = snd_dma_vmalloc_get_chunk_size,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_HAS_DMA</div><div class='ctx'> /*</div><div class='del'>- * proc file interface</div><div class='add'>+ * IRAM allocator</div><div class='ctx'>  */</div><div class='del'>-#define SND_MEM_PROC_FILE	"driver/snd-page-alloc"</div><div class='del'>-static struct proc_dir_entry *snd_mem_proc;</div><div class='del'>-</div><div class='del'>-static int snd_mem_proc_read(struct seq_file *seq, void *offset)</div><div class='del'>-{</div><div class='del'>-	long pages = snd_allocated_pages &gt;&gt; (PAGE_SHIFT-12);</div><div class='del'>-	struct snd_mem_list *mem;</div><div class='del'>-	int devno;</div><div class='del'>-	static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" };</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;list_mutex);</div><div class='del'>-	seq_printf(seq, "pages  : %li bytes (%li pages per %likB)\n",</div><div class='del'>-		   pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);</div><div class='del'>-	devno = 0;</div><div class='del'>-	list_for_each_entry(mem, &amp;mem_list_head, list) {</div><div class='del'>-		devno++;</div><div class='del'>-		seq_printf(seq, "buffer %d : ID %08x : type %s\n",</div><div class='del'>-			   devno, mem-&gt;id, types[mem-&gt;buffer.dev.type]);</div><div class='del'>-		seq_printf(seq, "  addr = 0x%lx, size = %d bytes\n",</div><div class='del'>-			   (unsigned long)mem-&gt;buffer.addr,</div><div class='del'>-			   (int)mem-&gt;buffer.bytes);</div><div class='add'>+#ifdef CONFIG_GENERIC_ALLOCATOR</div><div class='add'>+static void *snd_dma_iram_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = dmab-&gt;dev.dev;</div><div class='add'>+	struct gen_pool *pool;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;of_node) {</div><div class='add'>+		pool = of_gen_pool_get(dev-&gt;of_node, "iram", 0);</div><div class='add'>+		/* Assign the pool into private_data field */</div><div class='add'>+		dmab-&gt;private_data = pool;</div><div class='add'>+</div><div class='add'>+		p = gen_pool_dma_alloc_align(pool, size, &amp;dmab-&gt;addr, PAGE_SIZE);</div><div class='add'>+		if (p)</div><div class='add'>+			return p;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;list_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/* Internal memory might have limited size and no enough space,</div><div class='add'>+	 * so if we fail to malloc, try to fetch memory traditionally.</div><div class='add'>+	 */</div><div class='add'>+	dmab-&gt;dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='add'>+	return __snd_dma_alloc_pages(dmab, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_mem_proc_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return single_open(file, snd_mem_proc_read, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: for pci only - other bus? */</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-#define gettoken(bufp) strsep(bufp, " \t\n")</div><div class='del'>-</div><div class='del'>-static ssize_t snd_mem_proc_write(struct file *file, const char __user * buffer,</div><div class='del'>-				  size_t count, loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	char buf[128];</div><div class='del'>-	char *token, *p;</div><div class='del'>-</div><div class='del'>-	if (count &gt; sizeof(buf) - 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (copy_from_user(buf, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	buf[count] = '\0';</div><div class='del'>-</div><div class='del'>-	p = buf;</div><div class='del'>-	token = gettoken(&amp;p);</div><div class='del'>-	if (! token || *token == '#')</div><div class='del'>-		return count;</div><div class='del'>-	if (strcmp(token, "add") == 0) {</div><div class='del'>-		char *endp;</div><div class='del'>-		int vendor, device, size, buffers;</div><div class='del'>-		long mask;</div><div class='del'>-		int i, alloced;</div><div class='del'>-		struct pci_dev *pci;</div><div class='del'>-</div><div class='del'>-		if ((token = gettoken(&amp;p)) == NULL ||</div><div class='del'>-		    (vendor = simple_strtol(token, NULL, 0)) &lt;= 0 ||</div><div class='del'>-		    (token = gettoken(&amp;p)) == NULL ||</div><div class='del'>-		    (device = simple_strtol(token, NULL, 0)) &lt;= 0 ||</div><div class='del'>-		    (token = gettoken(&amp;p)) == NULL ||</div><div class='del'>-		    (mask = simple_strtol(token, NULL, 0)) &lt; 0 ||</div><div class='del'>-		    (token = gettoken(&amp;p)) == NULL ||</div><div class='del'>-		    (size = memparse(token, &amp;endp)) &lt; 64*1024 ||</div><div class='del'>-		    size &gt; 16*1024*1024 /* too big */ ||</div><div class='del'>-		    (token = gettoken(&amp;p)) == NULL ||</div><div class='del'>-		    (buffers = simple_strtol(token, NULL, 0)) &lt;= 0 ||</div><div class='del'>-		    buffers &gt; 4) {</div><div class='del'>-			printk(KERN_ERR "snd-page-alloc: invalid proc write format\n");</div><div class='del'>-			return count;</div><div class='del'>-		}</div><div class='del'>-		vendor &amp;= 0xffff;</div><div class='del'>-		device &amp;= 0xffff;</div><div class='del'>-</div><div class='del'>-		alloced = 0;</div><div class='del'>-		pci = NULL;</div><div class='del'>-		while ((pci = pci_get_device(vendor, device, pci)) != NULL) {</div><div class='del'>-			if (mask &gt; 0 &amp;&amp; mask &lt; 0xffffffff) {</div><div class='del'>-				if (pci_set_dma_mask(pci, mask) &lt; 0 ||</div><div class='del'>-				    pci_set_consistent_dma_mask(pci, mask) &lt; 0) {</div><div class='del'>-					printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device);</div><div class='del'>-					pci_dev_put(pci);</div><div class='del'>-					return count;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			for (i = 0; i &lt; buffers; i++) {</div><div class='del'>-				struct snd_dma_buffer dmab;</div><div class='del'>-				memset(&amp;dmab, 0, sizeof(dmab));</div><div class='del'>-				if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-							size, &amp;dmab) &lt; 0) {</div><div class='del'>-					printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);</div><div class='del'>-					pci_dev_put(pci);</div><div class='del'>-					return count;</div><div class='del'>-				}</div><div class='del'>-				snd_dma_reserve_buf(&amp;dmab, snd_dma_pci_buf_id(pci));</div><div class='del'>-			}</div><div class='del'>-			alloced++;</div><div class='del'>-		}</div><div class='del'>-		if (! alloced) {</div><div class='del'>-			for (i = 0; i &lt; buffers; i++) {</div><div class='del'>-				struct snd_dma_buffer dmab;</div><div class='del'>-				memset(&amp;dmab, 0, sizeof(dmab));</div><div class='del'>-				/* FIXME: We can allocate only in ZONE_DMA</div><div class='del'>-				 * without a device pointer!</div><div class='del'>-				 */</div><div class='del'>-				if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, NULL,</div><div class='del'>-							size, &amp;dmab) &lt; 0) {</div><div class='del'>-					printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				snd_dma_reserve_buf(&amp;dmab, (unsigned int)((vendor &lt;&lt; 16) | device));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (strcmp(token, "erase") == 0)</div><div class='del'>-		/* FIXME: need for releasing each buffer chunk? */</div><div class='del'>-		free_all_reserved_pages();</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "snd-page-alloc: invalid proc cmd\n");</div><div class='del'>-	return count;</div><div class='add'>+static void snd_dma_iram_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	struct gen_pool *pool = dmab-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (pool &amp;&amp; dmab-&gt;area)</div><div class='add'>+		gen_pool_free(pool, (unsigned long)dmab-&gt;area, dmab-&gt;bytes);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PCI */</div><div class='ctx'> </div><div class='del'>-static const struct file_operations snd_mem_proc_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open		= snd_mem_proc_open,</div><div class='del'>-	.read		= seq_read,</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	.write		= snd_mem_proc_write,</div><div class='del'>-#endif</div><div class='del'>-	.llseek		= seq_lseek,</div><div class='del'>-	.release	= single_release,</div><div class='add'>+static int snd_dma_iram_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+			     struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	area-&gt;vm_page_prot = pgprot_writecombine(area-&gt;vm_page_prot);</div><div class='add'>+	return remap_pfn_range(area, area-&gt;vm_start,</div><div class='add'>+			       dmab-&gt;addr &gt;&gt; PAGE_SHIFT,</div><div class='add'>+			       area-&gt;vm_end - area-&gt;vm_start,</div><div class='add'>+			       area-&gt;vm_page_prot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_malloc_ops snd_dma_iram_ops = {</div><div class='add'>+	.alloc = snd_dma_iram_alloc,</div><div class='add'>+	.free = snd_dma_iram_free,</div><div class='add'>+	.mmap = snd_dma_iram_mmap,</div><div class='ctx'> };</div><div class='add'>+#endif /* CONFIG_GENERIC_ALLOCATOR */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Coherent device pages allocator</div><div class='add'>+ */</div><div class='add'>+static void *snd_dma_dev_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	return dma_alloc_coherent(dmab-&gt;dev.dev, size, &amp;dmab-&gt;addr, DEFAULT_GFP);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+static void snd_dma_dev_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	dma_free_coherent(dmab-&gt;dev.dev, dmab-&gt;bytes, dmab-&gt;area, dmab-&gt;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_dev_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+			    struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	return dma_mmap_coherent(dmab-&gt;dev.dev, area,</div><div class='add'>+				 dmab-&gt;area, dmab-&gt;addr, dmab-&gt;bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_malloc_ops snd_dma_dev_ops = {</div><div class='add'>+	.alloc = snd_dma_dev_alloc,</div><div class='add'>+	.free = snd_dma_dev_free,</div><div class='add'>+	.mmap = snd_dma_dev_mmap,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * module entry</div><div class='add'>+ * Write-combined pages</div><div class='ctx'>  */</div><div class='add'>+#ifdef CONFIG_SND_DMA_SGBUF</div><div class='add'>+/* x86-specific allocations */</div><div class='add'>+static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	void *p = do_alloc_pages(dmab-&gt;dev.dev, size, &amp;dmab-&gt;addr, true);</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return NULL;</div><div class='add'>+	dmab-&gt;addr = dma_map_single(dmab-&gt;dev.dev, p, size, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (dma_mapping_error(dmab-&gt;dev.dev, dmab-&gt;addr)) {</div><div class='add'>+		do_free_pages(dmab-&gt;area, size, true);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_wc_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	dma_unmap_single(dmab-&gt;dev.dev, dmab-&gt;addr, dmab-&gt;bytes,</div><div class='add'>+			 DMA_BIDIRECTIONAL);</div><div class='add'>+	do_free_pages(dmab-&gt;area, dmab-&gt;bytes, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_wc_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+			   struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	area-&gt;vm_page_prot = pgprot_writecombine(area-&gt;vm_page_prot);</div><div class='add'>+	return dma_mmap_coherent(dmab-&gt;dev.dev, area,</div><div class='add'>+				 dmab-&gt;area, dmab-&gt;addr, dmab-&gt;bytes);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	return dma_alloc_wc(dmab-&gt;dev.dev, size, &amp;dmab-&gt;addr, DEFAULT_GFP);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int __init snd_mem_init(void)</div><div class='add'>+static void snd_dma_wc_free(struct snd_dma_buffer *dmab)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	snd_mem_proc = proc_create(SND_MEM_PROC_FILE, 0644, NULL,</div><div class='del'>-				   &amp;snd_mem_proc_fops);</div><div class='add'>+	dma_free_wc(dmab-&gt;dev.dev, dmab-&gt;bytes, dmab-&gt;area, dmab-&gt;addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_wc_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+			   struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	return dma_mmap_wc(dmab-&gt;dev.dev, area,</div><div class='add'>+			   dmab-&gt;area, dmab-&gt;addr, dmab-&gt;bytes);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+static const struct snd_malloc_ops snd_dma_wc_ops = {</div><div class='add'>+	.alloc = snd_dma_wc_alloc,</div><div class='add'>+	.free = snd_dma_wc_free,</div><div class='add'>+	.mmap = snd_dma_wc_mmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Non-contiguous pages allocator</div><div class='add'>+ */</div><div class='add'>+static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct sg_table *sgt;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	sgt = dma_alloc_noncontiguous(dmab-&gt;dev.dev, size, dmab-&gt;dev.dir,</div><div class='add'>+				      DEFAULT_GFP, 0);</div><div class='add'>+	if (!sgt)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dmab-&gt;dev.need_sync = dma_need_sync(dmab-&gt;dev.dev,</div><div class='add'>+					    sg_dma_address(sgt-&gt;sgl));</div><div class='add'>+	p = dma_vmap_noncontiguous(dmab-&gt;dev.dev, size, sgt);</div><div class='add'>+	if (p) {</div><div class='add'>+		dmab-&gt;private_data = sgt;</div><div class='add'>+		/* store the first page address for convenience */</div><div class='add'>+		dmab-&gt;addr = snd_sgbuf_get_addr(dmab, 0);</div><div class='add'>+	} else {</div><div class='add'>+		dma_free_noncontiguous(dmab-&gt;dev.dev, size, sgt, dmab-&gt;dev.dir);</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit snd_mem_exit(void)</div><div class='add'>+static void snd_dma_noncontig_free(struct snd_dma_buffer *dmab)</div><div class='ctx'> {</div><div class='del'>-	remove_proc_entry(SND_MEM_PROC_FILE, NULL);</div><div class='del'>-	free_all_reserved_pages();</div><div class='del'>-	if (snd_allocated_pages &gt; 0)</div><div class='del'>-		printk(KERN_ERR "snd-malloc: Memory leak?  pages not freed = %li\n", snd_allocated_pages);</div><div class='add'>+	dma_vunmap_noncontiguous(dmab-&gt;dev.dev, dmab-&gt;area);</div><div class='add'>+	dma_free_noncontiguous(dmab-&gt;dev.dev, dmab-&gt;bytes, dmab-&gt;private_data,</div><div class='add'>+			       dmab-&gt;dev.dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_dma_noncontig_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+				  struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	return dma_mmap_noncontiguous(dmab-&gt;dev.dev, area,</div><div class='add'>+				      dmab-&gt;bytes, dmab-&gt;private_data);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-module_init(snd_mem_init)</div><div class='del'>-module_exit(snd_mem_exit)</div><div class='add'>+static void snd_dma_noncontig_sync(struct snd_dma_buffer *dmab,</div><div class='add'>+				   enum snd_dma_sync_mode mode)</div><div class='add'>+{</div><div class='add'>+	if (mode == SNDRV_DMA_SYNC_CPU) {</div><div class='add'>+		if (dmab-&gt;dev.dir == DMA_TO_DEVICE)</div><div class='add'>+			return;</div><div class='add'>+		invalidate_kernel_vmap_range(dmab-&gt;area, dmab-&gt;bytes);</div><div class='add'>+		dma_sync_sgtable_for_cpu(dmab-&gt;dev.dev, dmab-&gt;private_data,</div><div class='add'>+					 dmab-&gt;dev.dir);</div><div class='add'>+	} else {</div><div class='add'>+		if (dmab-&gt;dev.dir == DMA_FROM_DEVICE)</div><div class='add'>+			return;</div><div class='add'>+		flush_kernel_vmap_range(dmab-&gt;area, dmab-&gt;bytes);</div><div class='add'>+		dma_sync_sgtable_for_device(dmab-&gt;dev.dev, dmab-&gt;private_data,</div><div class='add'>+					    dmab-&gt;dev.dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static inline void snd_dma_noncontig_iter_set(struct snd_dma_buffer *dmab,</div><div class='add'>+					      struct sg_page_iter *piter,</div><div class='add'>+					      size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct sg_table *sgt = dmab-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	__sg_page_iter_start(piter, sgt-&gt;sgl, sgt-&gt;orig_nents,</div><div class='add'>+			     offset &gt;&gt; PAGE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t snd_dma_noncontig_get_addr(struct snd_dma_buffer *dmab,</div><div class='add'>+					     size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct sg_dma_page_iter iter;</div><div class='add'>+</div><div class='add'>+	snd_dma_noncontig_iter_set(dmab, &amp;iter.base, offset);</div><div class='add'>+	__sg_page_iter_dma_next(&amp;iter);</div><div class='add'>+	return sg_page_iter_dma_address(&amp;iter) + offset % PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct page *snd_dma_noncontig_get_page(struct snd_dma_buffer *dmab,</div><div class='add'>+					       size_t offset)</div><div class='add'>+{</div><div class='add'>+	struct sg_page_iter iter;</div><div class='add'>+</div><div class='add'>+	snd_dma_noncontig_iter_set(dmab, &amp;iter, offset);</div><div class='add'>+	__sg_page_iter_next(&amp;iter);</div><div class='add'>+	return sg_page_iter_page(&amp;iter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+snd_dma_noncontig_get_chunk_size(struct snd_dma_buffer *dmab,</div><div class='add'>+				 unsigned int ofs, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct sg_dma_page_iter iter;</div><div class='add'>+	unsigned int start, end;</div><div class='add'>+	unsigned long addr;</div><div class='add'>+</div><div class='add'>+	start = ALIGN_DOWN(ofs, PAGE_SIZE);</div><div class='add'>+	end = ofs + size - 1; /* the last byte address */</div><div class='add'>+	snd_dma_noncontig_iter_set(dmab, &amp;iter.base, start);</div><div class='add'>+	if (!__sg_page_iter_dma_next(&amp;iter))</div><div class='add'>+		return 0;</div><div class='add'>+	/* check page continuity */</div><div class='add'>+	addr = sg_page_iter_dma_address(&amp;iter);</div><div class='add'>+	for (;;) {</div><div class='add'>+		start += PAGE_SIZE;</div><div class='add'>+		if (start &gt; end)</div><div class='add'>+			break;</div><div class='add'>+		addr += PAGE_SIZE;</div><div class='add'>+		if (!__sg_page_iter_dma_next(&amp;iter) ||</div><div class='add'>+		    sg_page_iter_dma_address(&amp;iter) != addr)</div><div class='add'>+			return start - ofs;</div><div class='add'>+	}</div><div class='add'>+	/* ok, all on continuous pages */</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_malloc_ops snd_dma_noncontig_ops = {</div><div class='add'>+	.alloc = snd_dma_noncontig_alloc,</div><div class='add'>+	.free = snd_dma_noncontig_free,</div><div class='add'>+	.mmap = snd_dma_noncontig_mmap,</div><div class='add'>+	.sync = snd_dma_noncontig_sync,</div><div class='add'>+	.get_addr = snd_dma_noncontig_get_addr,</div><div class='add'>+	.get_page = snd_dma_noncontig_get_page,</div><div class='add'>+	.get_chunk_size = snd_dma_noncontig_get_chunk_size,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DMA_SGBUF</div><div class='add'>+/* Fallback SG-buffer allocations for x86 */</div><div class='add'>+struct snd_dma_sg_fallback {</div><div class='add'>+	struct sg_table sgt; /* used by get_addr - must be the first item */</div><div class='add'>+	size_t count;</div><div class='add'>+	struct page **pages;</div><div class='add'>+	unsigned int *npages;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab,</div><div class='add'>+				       struct snd_dma_sg_fallback *sgbuf)</div><div class='add'>+{</div><div class='add'>+	bool wc = dmab-&gt;dev.type == SNDRV_DMA_TYPE_DEV_WC_SG;</div><div class='add'>+	size_t i, size;</div><div class='add'>+</div><div class='add'>+	if (sgbuf-&gt;pages &amp;&amp; sgbuf-&gt;npages) {</div><div class='add'>+		i = 0;</div><div class='add'>+		while (i &lt; sgbuf-&gt;count) {</div><div class='add'>+			size = sgbuf-&gt;npages[i];</div><div class='add'>+			if (!size)</div><div class='add'>+				break;</div><div class='add'>+			do_free_pages(page_address(sgbuf-&gt;pages[i]),</div><div class='add'>+				      size &lt;&lt; PAGE_SHIFT, wc);</div><div class='add'>+			i += size;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kvfree(sgbuf-&gt;pages);</div><div class='add'>+	kvfree(sgbuf-&gt;npages);</div><div class='add'>+	kfree(sgbuf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fallback manual S/G buffer allocations */</div><div class='add'>+static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	bool wc = dmab-&gt;dev.type == SNDRV_DMA_TYPE_DEV_WC_SG;</div><div class='add'>+	struct snd_dma_sg_fallback *sgbuf;</div><div class='add'>+	struct page **pagep, *curp;</div><div class='add'>+	size_t chunk;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	unsigned int idx, npages;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL);</div><div class='add'>+	if (!sgbuf)</div><div class='add'>+		return NULL;</div><div class='add'>+	size = PAGE_ALIGN(size);</div><div class='add'>+	sgbuf-&gt;count = size &gt;&gt; PAGE_SHIFT;</div><div class='add'>+	sgbuf-&gt;pages = kvcalloc(sgbuf-&gt;count, sizeof(*sgbuf-&gt;pages), GFP_KERNEL);</div><div class='add'>+	sgbuf-&gt;npages = kvcalloc(sgbuf-&gt;count, sizeof(*sgbuf-&gt;npages), GFP_KERNEL);</div><div class='add'>+	if (!sgbuf-&gt;pages || !sgbuf-&gt;npages)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	pagep = sgbuf-&gt;pages;</div><div class='add'>+	chunk = size;</div><div class='add'>+	idx = 0;</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		chunk = min(size, chunk);</div><div class='add'>+		p = do_alloc_pages(dmab-&gt;dev.dev, chunk, &amp;addr, wc);</div><div class='add'>+		if (!p) {</div><div class='add'>+			if (chunk &lt;= PAGE_SIZE)</div><div class='add'>+				goto error;</div><div class='add'>+			chunk &gt;&gt;= 1;</div><div class='add'>+			chunk = PAGE_SIZE &lt;&lt; get_order(chunk);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		size -= chunk;</div><div class='add'>+		/* fill pages */</div><div class='add'>+		npages = chunk &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		sgbuf-&gt;npages[idx] = npages;</div><div class='add'>+		idx += npages;</div><div class='add'>+		curp = virt_to_page(p);</div><div class='add'>+		while (npages--)</div><div class='add'>+			*pagep++ = curp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sg_alloc_table_from_pages(&amp;sgbuf-&gt;sgt, sgbuf-&gt;pages, sgbuf-&gt;count,</div><div class='add'>+				      0, sgbuf-&gt;count &lt;&lt; PAGE_SHIFT, GFP_KERNEL))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (dma_map_sgtable(dmab-&gt;dev.dev, &amp;sgbuf-&gt;sgt, DMA_BIDIRECTIONAL, 0))</div><div class='add'>+		goto error_dma_map;</div><div class='add'>+</div><div class='add'>+	p = vmap(sgbuf-&gt;pages, sgbuf-&gt;count, VM_MAP, PAGE_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		goto error_vmap;</div><div class='add'>+</div><div class='add'>+	dmab-&gt;private_data = sgbuf;</div><div class='add'>+	/* store the first page address for convenience */</div><div class='add'>+	dmab-&gt;addr = snd_sgbuf_get_addr(dmab, 0);</div><div class='add'>+	return p;</div><div class='add'>+</div><div class='add'>+ error_vmap:</div><div class='add'>+	dma_unmap_sgtable(dmab-&gt;dev.dev, &amp;sgbuf-&gt;sgt, DMA_BIDIRECTIONAL, 0);</div><div class='add'>+ error_dma_map:</div><div class='add'>+	sg_free_table(&amp;sgbuf-&gt;sgt);</div><div class='add'>+ error:</div><div class='add'>+	__snd_dma_sg_fallback_free(dmab, sgbuf);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	struct snd_dma_sg_fallback *sgbuf = dmab-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	vunmap(dmab-&gt;area);</div><div class='add'>+	dma_unmap_sgtable(dmab-&gt;dev.dev, &amp;sgbuf-&gt;sgt, DMA_BIDIRECTIONAL, 0);</div><div class='add'>+	sg_free_table(&amp;sgbuf-&gt;sgt);</div><div class='add'>+	__snd_dma_sg_fallback_free(dmab, dmab-&gt;private_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_sg_fallback_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+				    struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	struct snd_dma_sg_fallback *sgbuf = dmab-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (dmab-&gt;dev.type == SNDRV_DMA_TYPE_DEV_WC_SG)</div><div class='add'>+		area-&gt;vm_page_prot = pgprot_writecombine(area-&gt;vm_page_prot);</div><div class='add'>+	return vm_map_pages(area, sgbuf-&gt;pages, sgbuf-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *snd_dma_sg_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	int type = dmab-&gt;dev.type;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	/* try the standard DMA API allocation at first */</div><div class='add'>+	if (type == SNDRV_DMA_TYPE_DEV_WC_SG)</div><div class='add'>+		dmab-&gt;dev.type = SNDRV_DMA_TYPE_DEV_WC;</div><div class='add'>+	else</div><div class='add'>+		dmab-&gt;dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='add'>+	p = __snd_dma_alloc_pages(dmab, size);</div><div class='add'>+	if (p)</div><div class='add'>+		return p;</div><div class='add'>+</div><div class='add'>+	dmab-&gt;dev.type = type; /* restore the type */</div><div class='add'>+	return snd_dma_sg_fallback_alloc(dmab, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_malloc_ops snd_dma_sg_ops = {</div><div class='add'>+	.alloc = snd_dma_sg_alloc,</div><div class='add'>+	.free = snd_dma_sg_fallback_free,</div><div class='add'>+	.mmap = snd_dma_sg_fallback_mmap,</div><div class='add'>+	/* reuse noncontig helper */</div><div class='add'>+	.get_addr = snd_dma_noncontig_get_addr,</div><div class='add'>+	/* reuse vmalloc helpers */</div><div class='add'>+	.get_page = snd_dma_vmalloc_get_page,</div><div class='add'>+	.get_chunk_size = snd_dma_vmalloc_get_chunk_size,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_SND_DMA_SGBUF */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * exports</div><div class='add'>+ * Non-coherent pages allocator</div><div class='ctx'>  */</div><div class='del'>-EXPORT_SYMBOL(snd_dma_alloc_pages);</div><div class='del'>-EXPORT_SYMBOL(snd_dma_alloc_pages_fallback);</div><div class='del'>-EXPORT_SYMBOL(snd_dma_free_pages);</div><div class='add'>+static void *snd_dma_noncoherent_alloc(struct snd_dma_buffer *dmab, size_t size)</div><div class='add'>+{</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	p = dma_alloc_noncoherent(dmab-&gt;dev.dev, size, &amp;dmab-&gt;addr,</div><div class='add'>+				  dmab-&gt;dev.dir, DEFAULT_GFP);</div><div class='add'>+	if (p)</div><div class='add'>+		dmab-&gt;dev.need_sync = dma_need_sync(dmab-&gt;dev.dev, dmab-&gt;addr);</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_noncoherent_free(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	dma_free_noncoherent(dmab-&gt;dev.dev, dmab-&gt;bytes, dmab-&gt;area,</div><div class='add'>+			     dmab-&gt;addr, dmab-&gt;dev.dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dma_noncoherent_mmap(struct snd_dma_buffer *dmab,</div><div class='add'>+				    struct vm_area_struct *area)</div><div class='add'>+{</div><div class='add'>+	area-&gt;vm_page_prot = vm_get_page_prot(area-&gt;vm_flags);</div><div class='add'>+	return dma_mmap_pages(dmab-&gt;dev.dev, area,</div><div class='add'>+			      area-&gt;vm_end - area-&gt;vm_start,</div><div class='add'>+			      virt_to_page(dmab-&gt;area));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dma_noncoherent_sync(struct snd_dma_buffer *dmab,</div><div class='add'>+				     enum snd_dma_sync_mode mode)</div><div class='add'>+{</div><div class='add'>+	if (mode == SNDRV_DMA_SYNC_CPU) {</div><div class='add'>+		if (dmab-&gt;dev.dir != DMA_TO_DEVICE)</div><div class='add'>+			dma_sync_single_for_cpu(dmab-&gt;dev.dev, dmab-&gt;addr,</div><div class='add'>+						dmab-&gt;bytes, dmab-&gt;dev.dir);</div><div class='add'>+	} else {</div><div class='add'>+		if (dmab-&gt;dev.dir != DMA_FROM_DEVICE)</div><div class='add'>+			dma_sync_single_for_device(dmab-&gt;dev.dev, dmab-&gt;addr,</div><div class='add'>+						   dmab-&gt;bytes, dmab-&gt;dev.dir);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_dma_get_reserved_buf);</div><div class='del'>-EXPORT_SYMBOL(snd_dma_reserve_buf);</div><div class='add'>+static const struct snd_malloc_ops snd_dma_noncoherent_ops = {</div><div class='add'>+	.alloc = snd_dma_noncoherent_alloc,</div><div class='add'>+	.free = snd_dma_noncoherent_free,</div><div class='add'>+	.mmap = snd_dma_noncoherent_mmap,</div><div class='add'>+	.sync = snd_dma_noncoherent_sync,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_HAS_DMA */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Entry points</div><div class='add'>+ */</div><div class='add'>+static const struct snd_malloc_ops *snd_dma_ops[] = {</div><div class='add'>+	[SNDRV_DMA_TYPE_CONTINUOUS] = &amp;snd_dma_continuous_ops,</div><div class='add'>+	[SNDRV_DMA_TYPE_VMALLOC] = &amp;snd_dma_vmalloc_ops,</div><div class='add'>+#ifdef CONFIG_HAS_DMA</div><div class='add'>+	[SNDRV_DMA_TYPE_DEV] = &amp;snd_dma_dev_ops,</div><div class='add'>+	[SNDRV_DMA_TYPE_DEV_WC] = &amp;snd_dma_wc_ops,</div><div class='add'>+	[SNDRV_DMA_TYPE_NONCONTIG] = &amp;snd_dma_noncontig_ops,</div><div class='add'>+	[SNDRV_DMA_TYPE_NONCOHERENT] = &amp;snd_dma_noncoherent_ops,</div><div class='add'>+#ifdef CONFIG_SND_DMA_SGBUF</div><div class='add'>+	[SNDRV_DMA_TYPE_DEV_SG] = &amp;snd_dma_sg_ops,</div><div class='add'>+	[SNDRV_DMA_TYPE_DEV_WC_SG] = &amp;snd_dma_sg_ops,</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_GENERIC_ALLOCATOR</div><div class='add'>+	[SNDRV_DMA_TYPE_DEV_IRAM] = &amp;snd_dma_iram_ops,</div><div class='add'>+#endif /* CONFIG_GENERIC_ALLOCATOR */</div><div class='add'>+#endif /* CONFIG_HAS_DMA */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_malloc_pages);</div><div class='del'>-EXPORT_SYMBOL(snd_free_pages);</div><div class='add'>+static const struct snd_malloc_ops *snd_dma_get_ops(struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON_ONCE(!dmab))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (WARN_ON_ONCE(dmab-&gt;dev.type &lt;= SNDRV_DMA_TYPE_UNKNOWN ||</div><div class='add'>+			 dmab-&gt;dev.type &gt;= ARRAY_SIZE(snd_dma_ops)))</div><div class='add'>+		return NULL;</div><div class='add'>+	return snd_dma_ops[dmab-&gt;dev.type];</div><div class='add'>+}</div><div class='head'>diff --git a/sound/core/memory.c b/sound/core/memory.c<br/>index 1161158582a6..d683442b4c97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/memory.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/memory.c</a></div><div class='hunk'>@@ -1,28 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  * </div><div class='ctx'>  *  Misc memory accessors</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * copy_to_user_fromio - copy data from mmio-space to user-space</div><div class='hunk'>@@ -32,30 +19,54 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copies the data from mmio-space to user-space.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or non-zero on failure.</div><div class='add'>+ * Return: Zero if successful, or non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count)</div><div class='ctx'> {</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+</div><div class='add'>+	if (import_ubuf(ITER_DEST, dst, count, &amp;iter))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_to_iter_fromio((const void __iomem *)src, count, &amp;iter) != count)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(copy_to_user_fromio);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * copy_to_iter_fromio - copy data from mmio-space to iov_iter</div><div class='add'>+ * @src: the source pointer on mmio</div><div class='add'>+ * @count: the data size to copy in bytes</div><div class='add'>+ * @dst: the destination iov_iter</div><div class='add'>+ *</div><div class='add'>+ * Copies the data from mmio-space to iov_iter.</div><div class='add'>+ *</div><div class='add'>+ * Return: number of bytes to be copied</div><div class='add'>+ */</div><div class='add'>+size_t copy_to_iter_fromio(const void __iomem *src, size_t count,</div><div class='add'>+			   struct iov_iter *dst)</div><div class='add'>+{</div><div class='ctx'> #if defined(__i386__) || defined(CONFIG_SPARC32)</div><div class='del'>-	return copy_to_user(dst, (const void __force*)src, count) ? -EFAULT : 0;</div><div class='add'>+	return copy_to_iter((const void __force *)src, count, dst);</div><div class='ctx'> #else</div><div class='ctx'> 	char buf[256];</div><div class='add'>+	size_t res = 0;</div><div class='add'>+</div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		size_t c = count;</div><div class='ctx'> 		if (c &gt; sizeof(buf))</div><div class='ctx'> 			c = sizeof(buf);</div><div class='ctx'> 		memcpy_fromio(buf, (void __iomem *)src, c);</div><div class='del'>-		if (copy_to_user(dst, buf, c))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (copy_to_iter(buf, c, dst) != c)</div><div class='add'>+			return res;</div><div class='ctx'> 		count -= c;</div><div class='del'>-		dst += c;</div><div class='ctx'> 		src += c;</div><div class='add'>+		res += c;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return res;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(copy_to_user_fromio);</div><div class='add'>+EXPORT_SYMBOL(copy_to_iter_fromio);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * copy_from_user_toio - copy data from user-space to mmio-space</div><div class='hunk'>@@ -65,27 +76,51 @@ EXPORT_SYMBOL(copy_to_user_fromio);</div><div class='ctx'>  *</div><div class='ctx'>  * Copies the data from user-space to mmio-space.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or non-zero on failure.</div><div class='add'>+ * Return: Zero if successful, or non-zero on failure.</div><div class='ctx'>  */</div><div class='ctx'> int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count)</div><div class='ctx'> {</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+</div><div class='add'>+	if (import_ubuf(ITER_SOURCE, (void __user *)src, count, &amp;iter))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_from_iter_toio((void __iomem *)dst, count, &amp;iter) != count)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(copy_from_user_toio);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * copy_from_iter_toio - copy data from iov_iter to mmio-space</div><div class='add'>+ * @dst: the destination pointer on mmio-space</div><div class='add'>+ * @count: the data size to copy in bytes</div><div class='add'>+ * @src: the source iov_iter</div><div class='add'>+ *</div><div class='add'>+ * Copies the data from iov_iter to mmio-space.</div><div class='add'>+ *</div><div class='add'>+ * Return: number of bytes to be copied</div><div class='add'>+ */</div><div class='add'>+size_t copy_from_iter_toio(void __iomem *dst, size_t count,</div><div class='add'>+			   struct iov_iter *src)</div><div class='add'>+{</div><div class='ctx'> #if defined(__i386__) || defined(CONFIG_SPARC32)</div><div class='del'>-	return copy_from_user((void __force *)dst, src, count) ? -EFAULT : 0;</div><div class='add'>+	return copy_from_iter((void __force *)dst, count, src);</div><div class='ctx'> #else</div><div class='ctx'> 	char buf[256];</div><div class='add'>+	size_t res = 0;</div><div class='add'>+</div><div class='ctx'> 	while (count) {</div><div class='ctx'> 		size_t c = count;</div><div class='ctx'> 		if (c &gt; sizeof(buf))</div><div class='ctx'> 			c = sizeof(buf);</div><div class='del'>-		if (copy_from_user(buf, src, c))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (copy_from_iter(buf, c, src) != c)</div><div class='add'>+			return res;</div><div class='ctx'> 		memcpy_toio(dst, buf, c);</div><div class='ctx'> 		count -= c;</div><div class='ctx'> 		dst += c;</div><div class='del'>-		src += c;</div><div class='add'>+		res += c;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return res;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(copy_from_user_toio);</div><div class='add'>+EXPORT_SYMBOL(copy_from_iter_toio);</div><div class='head'>diff --git a/sound/core/misc.c b/sound/core/misc.c<br/>index 2c41825c836e..88d9e1f9a6e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/misc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/misc.c</a></div><div class='hunk'>@@ -1,44 +1,18 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Misc and compatibility things</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-#define DEFAULT_DEBUG_LEVEL	2</div><div class='del'>-#else</div><div class='del'>-#define DEFAULT_DEBUG_LEVEL	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int debug = DEFAULT_DEBUG_LEVEL;</div><div class='del'>-module_param(debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0 = disable)");</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='ctx'> void release_and_free_resource(struct resource *res)</div><div class='ctx'> {</div><div class='ctx'> 	if (res) {</div><div class='hunk'>@@ -46,59 +20,8 @@ void release_and_free_resource(struct resource *res)</div><div class='ctx'> 		kfree(res);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(release_and_free_resource);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_VERBOSE_PRINTK</div><div class='del'>-/* strip the leading path if the given path is absolute */</div><div class='del'>-static const char *sanity_file_name(const char *path)</div><div class='del'>-{</div><div class='del'>-	if (*path == '/')</div><div class='del'>-		return strrchr(path, '/') + 1;</div><div class='del'>-	else</div><div class='del'>-		return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* print file and line with a certain printk prefix */</div><div class='del'>-static int print_snd_pfx(unsigned int level, const char *path, int line,</div><div class='del'>-			 const char *format)</div><div class='del'>-{</div><div class='del'>-	const char *file = sanity_file_name(path);</div><div class='del'>-	char tmp[] = "&lt;0&gt;";</div><div class='del'>-	const char *pfx = level ? KERN_DEBUG : KERN_DEFAULT;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	if (format[0] == '&lt;' &amp;&amp; format[2] == '&gt;') {</div><div class='del'>-		tmp[1] = format[1];</div><div class='del'>-		pfx = tmp;</div><div class='del'>-		ret = 1;</div><div class='del'>-	}</div><div class='del'>-	printk("%sALSA %s:%d: ", pfx, file, line);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define print_snd_pfx(level, path, line, format)	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK)</div><div class='del'>-void __snd_printk(unsigned int level, const char *path, int line,</div><div class='del'>-		  const char *format, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	</div><div class='del'>-#ifdef CONFIG_SND_DEBUG	</div><div class='del'>-	if (debug &lt; level)</div><div class='del'>-		return;</div><div class='del'>-#endif</div><div class='del'>-	va_start(args, format);</div><div class='del'>-	if (print_snd_pfx(level, path, line, format))</div><div class='del'>-		format += 3; /* skip the printk level-prefix */</div><div class='del'>-	vprintk(format, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(__snd_printk);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> /**</div><div class='hunk'>@@ -119,7 +42,7 @@ snd_pci_quirk_lookup_id(u16 vendor, u16 device,</div><div class='ctx'> {</div><div class='ctx'> 	const struct snd_pci_quirk *q;</div><div class='ctx'> </div><div class='del'>-	for (q = list; q-&gt;subvendor; q++) {</div><div class='add'>+	for (q = list; q-&gt;subvendor || q-&gt;subdevice; q++) {</div><div class='ctx'> 		if (q-&gt;subvendor != vendor)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!q-&gt;subdevice ||</div><div class='hunk'>@@ -144,9 +67,99 @@ EXPORT_SYMBOL(snd_pci_quirk_lookup_id);</div><div class='ctx'> const struct snd_pci_quirk *</div><div class='ctx'> snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list)</div><div class='ctx'> {</div><div class='add'>+	if (!pci)</div><div class='add'>+		return NULL;</div><div class='ctx'> 	return snd_pci_quirk_lookup_id(pci-&gt;subsystem_vendor,</div><div class='ctx'> 				       pci-&gt;subsystem_device,</div><div class='ctx'> 				       list);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_pci_quirk_lookup);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Deferred async signal helpers</div><div class='add'>+ *</div><div class='add'>+ * Below are a few helper functions to wrap the async signal handling</div><div class='add'>+ * in the deferred work.  The main purpose is to avoid the messy deadlock</div><div class='add'>+ * around tasklist_lock and co at the kill_fasync() invocation.</div><div class='add'>+ * fasync_helper() and kill_fasync() are replaced with snd_fasync_helper()</div><div class='add'>+ * and snd_kill_fasync(), respectively.  In addition, snd_fasync_free() has</div><div class='add'>+ * to be called at releasing the relevant file object.</div><div class='add'>+ */</div><div class='add'>+struct snd_fasync {</div><div class='add'>+	struct fasync_struct *fasync;</div><div class='add'>+	int signal;</div><div class='add'>+	int poll;</div><div class='add'>+	int on;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(snd_fasync_lock);</div><div class='add'>+static LIST_HEAD(snd_fasync_list);</div><div class='add'>+</div><div class='add'>+static void snd_fasync_work_fn(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_fasync *fasync;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;snd_fasync_lock);</div><div class='add'>+	while (!list_empty(&amp;snd_fasync_list)) {</div><div class='add'>+		fasync = list_first_entry(&amp;snd_fasync_list, struct snd_fasync, list);</div><div class='add'>+		list_del_init(&amp;fasync-&gt;list);</div><div class='add'>+		spin_unlock_irq(&amp;snd_fasync_lock);</div><div class='add'>+		if (fasync-&gt;on)</div><div class='add'>+			kill_fasync(&amp;fasync-&gt;fasync, fasync-&gt;signal, fasync-&gt;poll);</div><div class='add'>+		spin_lock_irq(&amp;snd_fasync_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;snd_fasync_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(snd_fasync_work, snd_fasync_work_fn);</div><div class='add'>+</div><div class='add'>+int snd_fasync_helper(int fd, struct file *file, int on,</div><div class='add'>+		      struct snd_fasync **fasyncp)</div><div class='add'>+{</div><div class='add'>+	struct snd_fasync *fasync = NULL;</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		fasync = kzalloc(sizeof(*fasync), GFP_KERNEL);</div><div class='add'>+		if (!fasync)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		INIT_LIST_HEAD(&amp;fasync-&gt;list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;snd_fasync_lock) {</div><div class='add'>+		if (*fasyncp) {</div><div class='add'>+			kfree(fasync);</div><div class='add'>+			fasync = *fasyncp;</div><div class='add'>+		} else {</div><div class='add'>+			if (!fasync)</div><div class='add'>+				return 0;</div><div class='add'>+			*fasyncp = fasync;</div><div class='add'>+		}</div><div class='add'>+		fasync-&gt;on = on;</div><div class='add'>+	}</div><div class='add'>+	return fasync_helper(fd, file, on, &amp;fasync-&gt;fasync);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_fasync_helper);</div><div class='add'>+</div><div class='add'>+void snd_kill_fasync(struct snd_fasync *fasync, int signal, int poll)</div><div class='add'>+{</div><div class='add'>+	if (!fasync || !fasync-&gt;on)</div><div class='add'>+		return;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;snd_fasync_lock);</div><div class='add'>+	fasync-&gt;signal = signal;</div><div class='add'>+	fasync-&gt;poll = poll;</div><div class='add'>+	list_move(&amp;fasync-&gt;list, &amp;snd_fasync_list);</div><div class='add'>+	schedule_work(&amp;snd_fasync_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_kill_fasync);</div><div class='add'>+</div><div class='add'>+void snd_fasync_free(struct snd_fasync *fasync)</div><div class='add'>+{</div><div class='add'>+	if (!fasync)</div><div class='add'>+		return;</div><div class='add'>+	fasync-&gt;on = 0;</div><div class='add'>+	flush_work(&amp;snd_fasync_work);</div><div class='add'>+	kfree(fasync);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_fasync_free);</div><div class='head'>diff --git a/sound/core/oss/Makefile b/sound/core/oss/Makefile<br/>index 10a79453245f..d5f48ae6ba96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 1999 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-mixer-oss-objs := mixer_oss.o</div><div class='add'>+snd-mixer-oss-y := mixer_oss.o</div><div class='ctx'> </div><div class='ctx'> snd-pcm-oss-y := pcm_oss.o</div><div class='ctx'> snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \</div><div class='head'>diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c<br/>index 6faa1d719206..d870b2d93135 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/io.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/io.c</a></div><div class='hunk'>@@ -26,9 +26,9 @@</div><div class='ctx'> #include "pcm_plugin.h"</div><div class='ctx'> </div><div class='ctx'> #define pcm_write(plug,buf,count) snd_pcm_oss_write3(plug,buf,count,1)</div><div class='del'>-#define pcm_writev(plug,vec,count) snd_pcm_oss_writev3(plug,vec,count,1)</div><div class='add'>+#define pcm_writev(plug,vec,count) snd_pcm_oss_writev3(plug,vec,count)</div><div class='ctx'> #define pcm_read(plug,buf,count) snd_pcm_oss_read3(plug,buf,count,1)</div><div class='del'>-#define pcm_readv(plug,vec,count) snd_pcm_oss_readv3(plug,vec,count,1)</div><div class='add'>+#define pcm_readv(plug,vec,count) snd_pcm_oss_readv3(plug,vec,count)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Basic io plugin</div><div class='head'>diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c<br/>index 4c1d16827199..797d838a2f9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/linear.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/linear.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/linear.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/linear.c</a></div><div class='hunk'>@@ -90,11 +90,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,</div><div class='ctx'> 			       struct snd_pcm_plugin_channel *dst_channels,</div><div class='ctx'> 			       snd_pcm_uframes_t frames)</div><div class='ctx'> {</div><div class='del'>-	struct linear_priv *data;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	data = (struct linear_priv *)plugin-&gt;extra_data;</div><div class='ctx'> 	if (frames == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='hunk'>@@ -110,11 +107,14 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	if (frames &gt; dst_channels[0].frames)</div><div class='add'>+		frames = dst_channels[0].frames;</div><div class='ctx'> 	convert(plugin, src_channels, dst_channels, frames);</div><div class='ctx'> 	return frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void init_data(struct linear_priv *data, int src_format, int dst_format)</div><div class='add'>+static void init_data(struct linear_priv *data,</div><div class='add'>+		      snd_pcm_format_t src_format, snd_pcm_format_t dst_format)</div><div class='ctx'> {</div><div class='ctx'> 	int src_le, dst_le, src_bytes, dst_bytes;</div><div class='ctx'> </div><div class='hunk'>@@ -140,9 +140,9 @@ static void init_data(struct linear_priv *data, int src_format, int dst_format)</div><div class='ctx'> 	if (snd_pcm_format_signed(src_format) !=</div><div class='ctx'> 	    snd_pcm_format_signed(dst_format)) {</div><div class='ctx'> 		if (dst_le)</div><div class='del'>-			data-&gt;flip = cpu_to_le32(0x80000000);</div><div class='add'>+			data-&gt;flip = (__force u32)cpu_to_le32(0x80000000);</div><div class='ctx'> 		else</div><div class='del'>-			data-&gt;flip = cpu_to_be32(0x80000000);</div><div class='add'>+			data-&gt;flip = (__force u32)cpu_to_be32(0x80000000);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c<br/>index 822dd56993ca..e839a4bb93f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/mixer_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/mixer_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/mixer_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/mixer_oss.c</a></div><div class='hunk'>@@ -1,28 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  OSS emulation layer for the mixer interface</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -51,14 +38,19 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'> 					 SNDRV_OSS_DEVICE_TYPE_MIXER);</div><div class='ctx'> 	if (card == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (card-&gt;mixer_oss == NULL)</div><div class='add'>+	if (card-&gt;mixer_oss == NULL) {</div><div class='add'>+		snd_card_unref(card);</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> 	err = snd_card_file_add(card, file);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_card_unref(card);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> 	fmixer = kzalloc(sizeof(*fmixer), GFP_KERNEL);</div><div class='ctx'> 	if (fmixer == NULL) {</div><div class='ctx'> 		snd_card_file_remove(card, file);</div><div class='add'>+		snd_card_unref(card);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	fmixer-&gt;card = card;</div><div class='hunk'>@@ -67,8 +59,10 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (!try_module_get(card-&gt;module)) {</div><div class='ctx'> 		kfree(fmixer);</div><div class='ctx'> 		snd_card_file_remove(card, file);</div><div class='add'>+		snd_card_unref(card);</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='add'>+	snd_card_unref(card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -93,8 +87,8 @@ static int snd_mixer_oss_info(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 	struct mixer_info info;</div><div class='ctx'> 	</div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	strlcpy(info.id, mixer &amp;&amp; mixer-&gt;id[0] ? mixer-&gt;id : card-&gt;driver, sizeof(info.id));</div><div class='del'>-	strlcpy(info.name, mixer &amp;&amp; mixer-&gt;name[0] ? mixer-&gt;name : card-&gt;mixername, sizeof(info.name));</div><div class='add'>+	strscpy(info.id, mixer &amp;&amp; mixer-&gt;id[0] ? mixer-&gt;id : card-&gt;driver, sizeof(info.id));</div><div class='add'>+	strscpy(info.name, mixer &amp;&amp; mixer-&gt;name[0] ? mixer-&gt;name : card-&gt;mixername, sizeof(info.name));</div><div class='ctx'> 	info.modify_counter = card-&gt;mixer_oss_change_count;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -109,8 +103,8 @@ static int snd_mixer_oss_info_obsolete(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 	_old_mixer_info info;</div><div class='ctx'> 	</div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	strlcpy(info.id, mixer &amp;&amp; mixer-&gt;id[0] ? mixer-&gt;id : card-&gt;driver, sizeof(info.id));</div><div class='del'>-	strlcpy(info.name, mixer &amp;&amp; mixer-&gt;name[0] ? mixer-&gt;name : card-&gt;mixername, sizeof(info.name));</div><div class='add'>+	strscpy(info.id, mixer &amp;&amp; mixer-&gt;id[0] ? mixer-&gt;id : card-&gt;driver, sizeof(info.id));</div><div class='add'>+	strscpy(info.name, mixer &amp;&amp; mixer-&gt;name[0] ? mixer-&gt;name : card-&gt;mixername, sizeof(info.name));</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -136,6 +130,7 @@ static int snd_mixer_oss_devmask(struct snd_mixer_oss_file *fmixer)</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	for (chn = 0; chn &lt; 31; chn++) {</div><div class='ctx'> 		pslot = &amp;mixer-&gt;slots[chn];</div><div class='ctx'> 		if (pslot-&gt;put_volume || pslot-&gt;put_recsrc)</div><div class='hunk'>@@ -152,6 +147,7 @@ static int snd_mixer_oss_stereodevs(struct snd_mixer_oss_file *fmixer)</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	for (chn = 0; chn &lt; 31; chn++) {</div><div class='ctx'> 		pslot = &amp;mixer-&gt;slots[chn];</div><div class='ctx'> 		if (pslot-&gt;put_volume &amp;&amp; pslot-&gt;stereo)</div><div class='hunk'>@@ -167,6 +163,7 @@ static int snd_mixer_oss_recmask(struct snd_mixer_oss_file *fmixer)</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	if (mixer-&gt;put_recsrc &amp;&amp; mixer-&gt;get_recsrc) {	/* exclusive */</div><div class='ctx'> 		result = mixer-&gt;mask_recsrc;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -188,11 +185,13 @@ static int snd_mixer_oss_get_recsrc(struct snd_mixer_oss_file *fmixer)</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	if (mixer-&gt;put_recsrc &amp;&amp; mixer-&gt;get_recsrc) {	/* exclusive */</div><div class='del'>-		int err;</div><div class='del'>-		if ((err = mixer-&gt;get_recsrc(fmixer, &amp;result)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		result = 1 &lt;&lt; result;</div><div class='add'>+		unsigned int index;</div><div class='add'>+		result = mixer-&gt;get_recsrc(fmixer, &amp;index);</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			return result;</div><div class='add'>+		result = 1 &lt;&lt; index;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct snd_mixer_oss_slot *pslot;</div><div class='ctx'> 		int chn;</div><div class='hunk'>@@ -206,7 +205,8 @@ static int snd_mixer_oss_get_recsrc(struct snd_mixer_oss_file *fmixer)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return mixer-&gt;oss_recsrc = result;</div><div class='add'>+	mixer-&gt;oss_recsrc = result;</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_set_recsrc(struct snd_mixer_oss_file *fmixer, int recsrc)</div><div class='hunk'>@@ -214,16 +214,18 @@ static int snd_mixer_oss_set_recsrc(struct snd_mixer_oss_file *fmixer, int recsr</div><div class='ctx'> 	struct snd_mixer_oss *mixer = fmixer-&gt;mixer;</div><div class='ctx'> 	struct snd_mixer_oss_slot *pslot;</div><div class='ctx'> 	int chn, active;</div><div class='add'>+	unsigned int index;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	if (mixer-&gt;get_recsrc &amp;&amp; mixer-&gt;put_recsrc) {	/* exclusive input */</div><div class='ctx'> 		if (recsrc &amp; ~mixer-&gt;oss_recsrc)</div><div class='ctx'> 			recsrc &amp;= ~mixer-&gt;oss_recsrc;</div><div class='ctx'> 		mixer-&gt;put_recsrc(fmixer, ffz(~recsrc));</div><div class='del'>-		mixer-&gt;get_recsrc(fmixer, &amp;result);</div><div class='del'>-		result = 1 &lt;&lt; result;</div><div class='add'>+		mixer-&gt;get_recsrc(fmixer, &amp;index);</div><div class='add'>+		result = 1 &lt;&lt; index;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (chn = 0; chn &lt; 31; chn++) {</div><div class='ctx'> 		pslot = &amp;mixer-&gt;slots[chn];</div><div class='hunk'>@@ -254,6 +256,7 @@ static int snd_mixer_oss_get_volume(struct snd_mixer_oss_file *fmixer, int slot)</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL || slot &gt; 30)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	pslot = &amp;mixer-&gt;slots[slot];</div><div class='ctx'> 	left = pslot-&gt;volume[0];</div><div class='ctx'> 	right = pslot-&gt;volume[1];</div><div class='hunk'>@@ -282,6 +285,7 @@ static int snd_mixer_oss_set_volume(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> </div><div class='ctx'> 	if (mixer == NULL || slot &gt; 30)</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	pslot = &amp;mixer-&gt;slots[slot];</div><div class='ctx'> 	if (left &gt; 100)</div><div class='ctx'> 		left = 100;</div><div class='hunk'>@@ -295,7 +299,8 @@ static int snd_mixer_oss_set_volume(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 		return result;</div><div class='ctx'> 	pslot-&gt;volume[0] = left;</div><div class='ctx'> 	pslot-&gt;volume[1] = right;</div><div class='del'>- 	return (left &amp; 0xff) | ((right &amp; 0xff) &lt;&lt; 8);</div><div class='add'>+	result = (left &amp; 0xff) | ((right &amp; 0xff) &lt;&lt; 8);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_ioctl1(struct snd_mixer_oss_file *fmixer, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -384,10 +389,16 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l</div><div class='ctx'> 	fmixer.mixer = card-&gt;mixer_oss;</div><div class='ctx'> 	return snd_mixer_oss_ioctl1(&amp;fmixer, cmd, arg);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_mixer_oss_ioctl_card);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> /* all compatible */</div><div class='del'>-#define snd_mixer_oss_ioctl_compat	snd_mixer_oss_ioctl</div><div class='add'>+static long snd_mixer_oss_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+				       unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return snd_mixer_oss_ioctl1(file-&gt;private_data, cmd,</div><div class='add'>+				    (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define snd_mixer_oss_ioctl_compat	NULL</div><div class='ctx'> #endif</div><div class='hunk'>@@ -401,7 +412,6 @@ static const struct file_operations snd_mixer_oss_f_ops =</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.open =		snd_mixer_oss_open,</div><div class='ctx'> 	.release =	snd_mixer_oss_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.unlocked_ioctl =	snd_mixer_oss_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_mixer_oss_ioctl_compat,</div><div class='ctx'> };</div><div class='hunk'>@@ -416,7 +426,7 @@ static long snd_mixer_oss_conv(long val, long omin, long omax, long nmin, long n</div><div class='ctx'> 	</div><div class='ctx'> 	if (orange == 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return ((nrange * (val - omin)) + (orange / 2)) / orange + nmin;</div><div class='add'>+	return DIV_ROUND_CLOSEST(nrange * (val - omin), orange) + nmin;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* convert from alsa native to oss values (0-100) */</div><div class='hunk'>@@ -484,7 +494,7 @@ struct slot {</div><div class='ctx'> 	unsigned int channels;</div><div class='ctx'> 	unsigned int numid[SNDRV_MIXER_OSS_ITEM_COUNT];</div><div class='ctx'> 	unsigned int capture_item;</div><div class='del'>-	struct snd_mixer_oss_assign_table *assigned;</div><div class='add'>+	const struct snd_mixer_oss_assign_table *assigned;</div><div class='ctx'> 	unsigned int allocated: 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -497,7 +507,7 @@ static struct snd_kcontrol *snd_mixer_oss_test_id(struct snd_mixer_oss *mixer, c</div><div class='ctx'> 	</div><div class='ctx'> 	memset(&amp;id, 0, sizeof(id));</div><div class='ctx'> 	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(id.name, name);</div><div class='add'>+	strscpy(id.name, name, sizeof(id.name));</div><div class='ctx'> 	id.index = index;</div><div class='ctx'> 	return snd_ctl_find_id(card, &amp;id);</div><div class='ctx'> }</div><div class='hunk'>@@ -507,36 +517,31 @@ static void snd_mixer_oss_get_volume1_vol(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 					  unsigned int numid,</div><div class='ctx'> 					  int *left, int *right)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = fmixer-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	if (numid == ID_UNKNOWN)</div><div class='ctx'> 		return;</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_numid(card, numid);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='ctx'> 	if (uinfo == NULL || uctl == NULL)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;info(kctl, uinfo))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;get(kctl, uctl))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (uinfo-&gt;type == SNDRV_CTL_ELEM_TYPE_BOOLEAN &amp;&amp;</div><div class='ctx'> 	    uinfo-&gt;value.integer.min == 0 &amp;&amp; uinfo-&gt;value.integer.max == 1)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	*left = snd_mixer_oss_conv1(uctl-&gt;value.integer.value[0], uinfo-&gt;value.integer.min, uinfo-&gt;value.integer.max, &amp;pslot-&gt;volume[0]);</div><div class='ctx'> 	if (uinfo-&gt;count &gt; 1)</div><div class='ctx'> 		*right = snd_mixer_oss_conv1(uctl-&gt;value.integer.value[1], uinfo-&gt;value.integer.min, uinfo-&gt;value.integer.max, &amp;pslot-&gt;volume[1]);</div><div class='del'>-      __unalloc:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      	kfree(uctl);</div><div class='del'>-      	kfree(uinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='hunk'>@@ -545,26 +550,25 @@ static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 					 int *left, int *right,</div><div class='ctx'> 					 int route)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = fmixer-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	if (numid == ID_UNKNOWN)</div><div class='ctx'> 		return;</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_numid(card, numid);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='ctx'> 	if (uinfo == NULL || uctl == NULL)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;info(kctl, uinfo))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;get(kctl, uctl))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (!uctl-&gt;value.integer.value[0]) {</div><div class='ctx'> 		*left = 0;</div><div class='ctx'> 		if (uinfo-&gt;count == 1)</div><div class='hunk'>@@ -572,10 +576,6 @@ static void snd_mixer_oss_get_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (uinfo-&gt;count &gt; 1 &amp;&amp; !uctl-&gt;value.integer.value[route ? 3 : 1])</div><div class='ctx'> 		*right = 0;</div><div class='del'>-      __unalloc:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      	kfree(uctl);</div><div class='del'>-	kfree(uinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_get_volume1(struct snd_mixer_oss_file *fmixer,</div><div class='hunk'>@@ -609,39 +609,35 @@ static void snd_mixer_oss_put_volume1_vol(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 					  unsigned int numid,</div><div class='ctx'> 					  int left, int right)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = fmixer-&gt;card;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (numid == ID_UNKNOWN)</div><div class='ctx'> 		return;</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_numid(card, numid);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='ctx'> 	if (uinfo == NULL || uctl == NULL)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;info(kctl, uinfo))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (uinfo-&gt;type == SNDRV_CTL_ELEM_TYPE_BOOLEAN &amp;&amp;</div><div class='ctx'> 	    uinfo-&gt;value.integer.min == 0 &amp;&amp; uinfo-&gt;value.integer.max == 1)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	uctl-&gt;value.integer.value[0] = snd_mixer_oss_conv2(left, uinfo-&gt;value.integer.min, uinfo-&gt;value.integer.max);</div><div class='ctx'> 	if (uinfo-&gt;count &gt; 1)</div><div class='ctx'> 		uctl-&gt;value.integer.value[1] = snd_mixer_oss_conv2(right, uinfo-&gt;value.integer.min, uinfo-&gt;value.integer.max);</div><div class='del'>-	if ((res = kctl-&gt;put(kctl, uctl)) &lt; 0)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+	res = kctl-&gt;put(kctl, uctl);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> 	if (res &gt; 0)</div><div class='ctx'> 		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='del'>-      __unalloc:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      	kfree(uctl);</div><div class='del'>-	kfree(uinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='hunk'>@@ -650,25 +646,24 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 					 int left, int right,</div><div class='ctx'> 					 int route)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = fmixer-&gt;card;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	if (numid == ID_UNKNOWN)</div><div class='ctx'> 		return;</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if ((kctl = snd_ctl_find_numid(card, numid)) == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = snd_ctl_find_numid(card, numid);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='ctx'> 	if (uinfo == NULL || uctl == NULL)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (kctl-&gt;info(kctl, uinfo))</div><div class='del'>-		goto __unalloc;</div><div class='add'>+		return;</div><div class='ctx'> 	if (uinfo-&gt;count &gt; 1) {</div><div class='ctx'> 		uctl-&gt;value.integer.value[0] = left &gt; 0 ? 1 : 0;</div><div class='ctx'> 		uctl-&gt;value.integer.value[route ? 3 : 1] = right &gt; 0 ? 1 : 0;</div><div class='hunk'>@@ -679,14 +674,11 @@ static void snd_mixer_oss_put_volume1_sw(struct snd_mixer_oss_file *fmixer,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		uctl-&gt;value.integer.value[0] = (left &gt; 0 || right &gt; 0) ? 1 : 0;</div><div class='ctx'> 	}</div><div class='del'>-	if ((res = kctl-&gt;put(kctl, uctl)) &lt; 0)</div><div class='del'>-		goto __unalloc;</div><div class='add'>+	res = kctl-&gt;put(kctl, uctl);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> 	if (res &gt; 0)</div><div class='ctx'> 		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='del'>-      __unalloc:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      	kfree(uctl);</div><div class='del'>-	kfree(uinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer,</div><div class='hunk'>@@ -791,26 +783,24 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_mixer_oss_slot *pslot;</div><div class='ctx'> 	struct slot *slot;</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	int err, idx;</div><div class='ctx'> 	</div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='del'>-	if (uinfo == NULL || uctl == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __free_only;</div><div class='del'>-	}</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (uinfo == NULL || uctl == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);</div><div class='del'>-	if (! kctl) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto __unlock;</div><div class='del'>-	}</div><div class='del'>-	if ((err = kctl-&gt;info(kctl, uinfo)) &lt; 0)</div><div class='del'>-		goto __unlock;</div><div class='del'>-	if ((err = kctl-&gt;get(kctl, uctl)) &lt; 0)</div><div class='del'>-		goto __unlock;</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	err = kctl-&gt;info(kctl, uinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = kctl-&gt;get(kctl, uctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	for (idx = 0; idx &lt; 32; idx++) {</div><div class='ctx'> 		if (!(mixer-&gt;mask_recsrc &amp; (1 &lt;&lt; idx)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -825,13 +815,7 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	err = 0;</div><div class='del'>-      __unlock:</div><div class='del'>-     	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      __free_only:</div><div class='del'>-      	kfree(uctl);</div><div class='del'>-      	kfree(uinfo);</div><div class='del'>-      	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned int active_index)</div><div class='hunk'>@@ -841,25 +825,22 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_mixer_oss_slot *pslot;</div><div class='ctx'> 	struct slot *slot = NULL;</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> </div><div class='ctx'> 	uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='del'>-	if (uinfo == NULL || uctl == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __free_only;</div><div class='del'>-	}</div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	if (uinfo == NULL || uctl == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	guard(rwsem_read)(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);</div><div class='del'>-	if (! kctl) {</div><div class='del'>-		err = -ENOENT;</div><div class='del'>-		goto __unlock;</div><div class='del'>-	}</div><div class='del'>-	if ((err = kctl-&gt;info(kctl, uinfo)) &lt; 0)</div><div class='del'>-		goto __unlock;</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	err = kctl-&gt;info(kctl, uinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	for (idx = 0; idx &lt; 32; idx++) {</div><div class='ctx'> 		if (!(mixer-&gt;mask_recsrc &amp; (1 &lt;&lt; idx)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -873,20 +854,14 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned</div><div class='ctx'> 			break;</div><div class='ctx'> 		slot = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (! slot)</div><div class='del'>-		goto __unlock;</div><div class='add'>+	if (!slot)</div><div class='add'>+		return 0;</div><div class='ctx'> 	for (idx = 0; idx &lt; uinfo-&gt;count; idx++)</div><div class='ctx'> 		uctl-&gt;value.enumerated.item[idx] = slot-&gt;capture_item;</div><div class='ctx'> 	err = kctl-&gt;put(kctl, uctl);</div><div class='ctx'> 	if (err &gt; 0)</div><div class='ctx'> 		snd_ctl_notify(fmixer-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='del'>-	err = 0;</div><div class='del'>-      __unlock:</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-      __free_only:</div><div class='del'>-	kfree(uctl);</div><div class='del'>-	kfree(uinfo);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct snd_mixer_oss_assign_table {</div><div class='hunk'>@@ -897,33 +872,26 @@ struct snd_mixer_oss_assign_table {</div><div class='ctx'> </div><div class='ctx'> static int snd_mixer_oss_build_test(struct snd_mixer_oss *mixer, struct slot *slot, const char *name, int index, int item)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *info;</div><div class='add'>+	struct snd_ctl_elem_info *info __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_kcontrol *kcontrol;</div><div class='ctx'> 	struct snd_card *card = mixer-&gt;card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	kcontrol = snd_mixer_oss_test_id(mixer, name, index);</div><div class='del'>-	if (kcontrol == NULL) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='del'>-	if (! info) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if ((err = kcontrol-&gt;info(kcontrol, info)) &lt; 0) {</div><div class='del'>-		up_read(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		kfree(info);</div><div class='del'>-		return err;</div><div class='add'>+	scoped_guard(rwsem_read, &amp;card-&gt;controls_rwsem) {</div><div class='add'>+		kcontrol = snd_mixer_oss_test_id(mixer, name, index);</div><div class='add'>+		if (kcontrol == NULL)</div><div class='add'>+			return 0;</div><div class='add'>+		info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+		if (!info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		err = kcontrol-&gt;info(kcontrol, info);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		slot-&gt;numid[item] = kcontrol-&gt;id.numid;</div><div class='ctx'> 	}</div><div class='del'>-	slot-&gt;numid[item] = kcontrol-&gt;id.numid;</div><div class='del'>-	up_read(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	if (info-&gt;count &gt; slot-&gt;channels)</div><div class='ctx'> 		slot-&gt;channels = info-&gt;count;</div><div class='ctx'> 	slot-&gt;present |= 1 &lt;&lt; item;</div><div class='del'>-	kfree(info);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -951,7 +919,7 @@ static void mixer_slot_clear(struct snd_mixer_oss_slot *rslot)</div><div class='ctx'> /* In a separate function to keep gcc 3.2 happy - do NOT merge this in</div><div class='ctx'>    snd_mixer_oss_build_input! */</div><div class='ctx'> static int snd_mixer_oss_build_test_all(struct snd_mixer_oss *mixer,</div><div class='del'>-					struct snd_mixer_oss_assign_table *ptr,</div><div class='add'>+					const struct snd_mixer_oss_assign_table *ptr,</div><div class='ctx'> 					struct slot *slot)</div><div class='ctx'> {</div><div class='ctx'> 	char str[64];</div><div class='hunk'>@@ -1015,13 +983,15 @@ static int snd_mixer_oss_build_test_all(struct snd_mixer_oss *mixer,</div><div class='ctx'>  * ptr_allocated means the entry is dynamically allocated (change via proc file).</div><div class='ctx'>  * when replace_old = 1, the old entry is replaced with the new one.</div><div class='ctx'>  */</div><div class='del'>-static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mixer_oss_assign_table *ptr, int ptr_allocated, int replace_old)</div><div class='add'>+static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer,</div><div class='add'>+				     const struct snd_mixer_oss_assign_table *ptr,</div><div class='add'>+				     int ptr_allocated, int replace_old)</div><div class='ctx'> {</div><div class='ctx'> 	struct slot slot;</div><div class='ctx'> 	struct slot *pslot;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_mixer_oss_slot *rslot;</div><div class='del'>-	char str[64];	</div><div class='add'>+	const char *str;</div><div class='ctx'> 	</div><div class='ctx'> 	/* check if already assigned */</div><div class='ctx'> 	if (mixer-&gt;slots[ptr-&gt;oss_id].get_volume &amp;&amp; ! replace_old)</div><div class='hunk'>@@ -1031,44 +1001,39 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix</div><div class='ctx'> 	memset(slot.numid, 0xff, sizeof(slot.numid)); /* ID_UNKNOWN */</div><div class='ctx'> 	if (snd_mixer_oss_build_test_all(mixer, ptr, &amp;slot))</div><div class='ctx'> 		return 0;</div><div class='del'>-	down_read(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='del'>-	if (ptr-&gt;index == 0 &amp;&amp; (kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0)) != NULL) {</div><div class='del'>-		struct snd_ctl_elem_info *uinfo;</div><div class='add'>+	guard(rwsem_read)(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='add'>+	kctl = NULL;</div><div class='add'>+	if (!ptr-&gt;index)</div><div class='add'>+		kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0);</div><div class='add'>+	if (kctl) {</div><div class='add'>+		struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='ctx'> </div><div class='ctx'> 		uinfo = kzalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='del'>-		if (! uinfo) {</div><div class='del'>-			up_read(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='add'>+		if (!uinfo)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 			</div><div class='del'>-		if (kctl-&gt;info(kctl, uinfo)) {</div><div class='del'>-			up_read(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='add'>+		if (kctl-&gt;info(kctl, uinfo))</div><div class='ctx'> 			return 0;</div><div class='del'>-		}</div><div class='del'>-		strcpy(str, ptr-&gt;name);</div><div class='add'>+		str = ptr-&gt;name;</div><div class='ctx'> 		if (!strcmp(str, "Master"))</div><div class='del'>-			strcpy(str, "Mix");</div><div class='del'>-		if (!strcmp(str, "Master Mono"))</div><div class='del'>-			strcpy(str, "Mix Mono");</div><div class='add'>+			str = "Mix";</div><div class='add'>+		else if (!strcmp(str, "Master Mono"))</div><div class='add'>+			str = "Mix Mono";</div><div class='ctx'> 		slot.capture_item = 0;</div><div class='ctx'> 		if (!strcmp(uinfo-&gt;value.enumerated.name, str)) {</div><div class='ctx'> 			slot.present |= SNDRV_MIXER_OSS_PRESENT_CAPTURE;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			for (slot.capture_item = 1; slot.capture_item &lt; uinfo-&gt;value.enumerated.items; slot.capture_item++) {</div><div class='ctx'> 				uinfo-&gt;value.enumerated.item = slot.capture_item;</div><div class='del'>-				if (kctl-&gt;info(kctl, uinfo)) {</div><div class='del'>-					up_read(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='add'>+				if (kctl-&gt;info(kctl, uinfo))</div><div class='ctx'> 					return 0;</div><div class='del'>-				}</div><div class='ctx'> 				if (!strcmp(uinfo-&gt;value.enumerated.name, str)) {</div><div class='ctx'> 					slot.present |= SNDRV_MIXER_OSS_PRESENT_CAPTURE;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		kfree(uinfo);</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;mixer-&gt;card-&gt;controls_rwsem);</div><div class='ctx'> 	if (slot.present != 0) {</div><div class='ctx'> 		pslot = kmalloc(sizeof(slot), GFP_KERNEL);</div><div class='ctx'> 		if (! pslot)</div><div class='hunk'>@@ -1099,11 +1064,11 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> #define MIXER_VOL(name) [SOUND_MIXER_##name] = #name</div><div class='del'>-static char *oss_mixer_names[SNDRV_OSS_MAX_MIXERS] = {</div><div class='add'>+static const char * const oss_mixer_names[SNDRV_OSS_MAX_MIXERS] = {</div><div class='ctx'> 	MIXER_VOL(VOLUME),</div><div class='ctx'> 	MIXER_VOL(BASS),</div><div class='ctx'> 	MIXER_VOL(TREBLE),</div><div class='hunk'>@@ -1141,7 +1106,7 @@ static void snd_mixer_oss_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_mixer_oss *mixer = entry-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;mixer-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_OSS_MAX_MIXERS; i++) {</div><div class='ctx'> 		struct slot *p;</div><div class='ctx'> </div><div class='hunk'>@@ -1156,7 +1121,6 @@ static void snd_mixer_oss_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		else</div><div class='ctx'> 			snd_iprintf(buffer, "\"\" 0\n");</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,</div><div class='hunk'>@@ -1165,7 +1129,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_mixer_oss *mixer = entry-&gt;private_data;</div><div class='ctx'> 	char line[128], str[32], idxstr[16];</div><div class='ctx'> 	const char *cptr;</div><div class='del'>-	int ch, idx;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	int ch;</div><div class='ctx'> 	struct snd_mixer_oss_assign_table *tbl;</div><div class='ctx'> 	struct slot *slot;</div><div class='ctx'> </div><div class='hunk'>@@ -1175,47 +1140,44 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 			if (oss_mixer_names[ch] &amp;&amp; strcmp(oss_mixer_names[ch], str) == 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		if (ch &gt;= SNDRV_OSS_MAX_MIXERS) {</div><div class='del'>-			snd_printk(KERN_ERR "mixer_oss: invalid OSS volume '%s'\n", str);</div><div class='add'>+			pr_err("ALSA: mixer_oss: invalid OSS volume '%s'\n",</div><div class='add'>+			       str);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		cptr = snd_info_get_str(str, cptr, sizeof(str));</div><div class='ctx'> 		if (! *str) {</div><div class='ctx'> 			/* remove the entry */</div><div class='del'>-			mutex_lock(&amp;mixer-&gt;reg_mutex);</div><div class='del'>-			mixer_slot_clear(&amp;mixer-&gt;slots[ch]);</div><div class='del'>-			mutex_unlock(&amp;mixer-&gt;reg_mutex);</div><div class='add'>+			scoped_guard(mutex, &amp;mixer-&gt;reg_mutex)</div><div class='add'>+				mixer_slot_clear(&amp;mixer-&gt;slots[ch]);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_info_get_str(idxstr, cptr, sizeof(idxstr));</div><div class='ctx'> 		idx = simple_strtoul(idxstr, NULL, 10);</div><div class='ctx'> 		if (idx &gt;= 0x4000) { /* too big */</div><div class='del'>-			snd_printk(KERN_ERR "mixer_oss: invalid index %d\n", idx);</div><div class='add'>+			pr_err("ALSA: mixer_oss: invalid index %d\n", idx);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		mutex_lock(&amp;mixer-&gt;reg_mutex);</div><div class='del'>-		slot = (struct slot *)mixer-&gt;slots[ch].private_data;</div><div class='del'>-		if (slot &amp;&amp; slot-&gt;assigned &amp;&amp;</div><div class='del'>-		    slot-&gt;assigned-&gt;index == idx &amp;&amp; ! strcmp(slot-&gt;assigned-&gt;name, str))</div><div class='del'>-			/* not changed */</div><div class='del'>-			goto __unlock;</div><div class='del'>-		tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);</div><div class='del'>-		if (! tbl) {</div><div class='del'>-			snd_printk(KERN_ERR "mixer_oss: no memory\n");</div><div class='del'>-			goto __unlock;</div><div class='del'>-		}</div><div class='del'>-		tbl-&gt;oss_id = ch;</div><div class='del'>-		tbl-&gt;name = kstrdup(str, GFP_KERNEL);</div><div class='del'>-		if (! tbl-&gt;name) {</div><div class='del'>-			kfree(tbl);</div><div class='del'>-			goto __unlock;</div><div class='del'>-		}</div><div class='del'>-		tbl-&gt;index = idx;</div><div class='del'>-		if (snd_mixer_oss_build_input(mixer, tbl, 1, 1) &lt;= 0) {</div><div class='del'>-			kfree(tbl-&gt;name);</div><div class='del'>-			kfree(tbl);</div><div class='add'>+		scoped_guard(mutex, &amp;mixer-&gt;reg_mutex) {</div><div class='add'>+			slot = (struct slot *)mixer-&gt;slots[ch].private_data;</div><div class='add'>+			if (slot &amp;&amp; slot-&gt;assigned &amp;&amp;</div><div class='add'>+			    slot-&gt;assigned-&gt;index == idx &amp;&amp; !strcmp(slot-&gt;assigned-&gt;name, str))</div><div class='add'>+				/* not changed */</div><div class='add'>+				break;</div><div class='add'>+			tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);</div><div class='add'>+			if (!tbl)</div><div class='add'>+				break;</div><div class='add'>+			tbl-&gt;oss_id = ch;</div><div class='add'>+			tbl-&gt;name = kstrdup(str, GFP_KERNEL);</div><div class='add'>+			if (!tbl-&gt;name) {</div><div class='add'>+				kfree(tbl);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			tbl-&gt;index = idx;</div><div class='add'>+			if (snd_mixer_oss_build_input(mixer, tbl, 1, 1) &lt;= 0) {</div><div class='add'>+				kfree(tbl-&gt;name);</div><div class='add'>+				kfree(tbl);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	__unlock:</div><div class='del'>-		mutex_unlock(&amp;mixer-&gt;reg_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1228,7 +1190,7 @@ static void snd_mixer_oss_proc_init(struct snd_mixer_oss *mixer)</div><div class='ctx'> 	if (! entry)</div><div class='ctx'> 		return;</div><div class='ctx'> 	entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-	entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='add'>+	entry-&gt;mode = S_IFREG | 0644;</div><div class='ctx'> 	entry-&gt;c.text.read = snd_mixer_oss_proc_read;</div><div class='ctx'> 	entry-&gt;c.text.write = snd_mixer_oss_proc_write;</div><div class='ctx'> 	entry-&gt;private_data = mixer;</div><div class='hunk'>@@ -1244,14 +1206,14 @@ static void snd_mixer_oss_proc_done(struct snd_mixer_oss *mixer)</div><div class='ctx'> 	snd_info_free_entry(mixer-&gt;proc_entry);</div><div class='ctx'> 	mixer-&gt;proc_entry = NULL;</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+#else /* !CONFIG_SND_PROC_FS */</div><div class='ctx'> #define snd_mixer_oss_proc_init(mix)</div><div class='ctx'> #define snd_mixer_oss_proc_done(mix)</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_mixer_oss_assign_table table[] = {</div><div class='add'>+	static const struct snd_mixer_oss_assign_table table[] = {</div><div class='ctx'> 		{ SOUND_MIXER_VOLUME, 	"Master",		0 },</div><div class='ctx'> 		{ SOUND_MIXER_VOLUME, 	"Front",		0 }, /* fallback */</div><div class='ctx'> 		{ SOUND_MIXER_BASS,	"Tone Control - Bass",	0 },</div><div class='hunk'>@@ -1331,29 +1293,29 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)</div><div class='ctx'> 	struct snd_mixer_oss *mixer;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SND_MIXER_OSS_NOTIFY_REGISTER) {</div><div class='del'>-		char name[128];</div><div class='ctx'> 		int idx, err;</div><div class='ctx'> </div><div class='ctx'> 		mixer = kcalloc(2, sizeof(*mixer), GFP_KERNEL);</div><div class='ctx'> 		if (mixer == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		mutex_init(&amp;mixer-&gt;reg_mutex);</div><div class='del'>-		sprintf(name, "mixer%i%i", card-&gt;number, 0);</div><div class='del'>-		if ((err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,</div><div class='del'>-						   card, 0,</div><div class='del'>-						   &amp;snd_mixer_oss_f_ops, card,</div><div class='del'>-						   name)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",</div><div class='del'>-				   card-&gt;number, 0);</div><div class='add'>+		err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,</div><div class='add'>+					      card, 0,</div><div class='add'>+					      &amp;snd_mixer_oss_f_ops, card);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"unable to register OSS mixer device %i:%i\n",</div><div class='add'>+				card-&gt;number, 0);</div><div class='ctx'> 			kfree(mixer);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		mixer-&gt;oss_dev_alloc = 1;</div><div class='ctx'> 		mixer-&gt;card = card;</div><div class='ctx'> 		if (*card-&gt;mixername)</div><div class='del'>-			strlcpy(mixer-&gt;name, card-&gt;mixername, sizeof(mixer-&gt;name));</div><div class='add'>+			strscpy(mixer-&gt;name, card-&gt;mixername, sizeof(mixer-&gt;name));</div><div class='ctx'> 		else</div><div class='del'>-			strlcpy(mixer-&gt;name, name, sizeof(mixer-&gt;name));</div><div class='add'>+			snprintf(mixer-&gt;name, sizeof(mixer-&gt;name),</div><div class='add'>+				 "mixer%i", card-&gt;number);</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_MIXERS</div><div class='ctx'> 		snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,</div><div class='ctx'> 				      card-&gt;number,</div><div class='hunk'>@@ -1385,28 +1347,34 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_mixer_oss_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_mixer_oss_notify_callback = snd_mixer_oss_notify_handler;</div><div class='ctx'> 	for (idx = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='del'>-		if (snd_cards[idx])</div><div class='del'>-			snd_mixer_oss_notify_handler(snd_cards[idx], SND_MIXER_OSS_NOTIFY_REGISTER);</div><div class='add'>+		card = snd_card_ref(idx);</div><div class='add'>+		if (card) {</div><div class='add'>+			snd_mixer_oss_notify_handler(card, SND_MIXER_OSS_NOTIFY_REGISTER);</div><div class='add'>+			snd_card_unref(card);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit alsa_mixer_oss_exit(void)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='ctx'> 	snd_mixer_oss_notify_callback = NULL;</div><div class='ctx'> 	for (idx = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='del'>-		if (snd_cards[idx])</div><div class='del'>-			snd_mixer_oss_notify_handler(snd_cards[idx], SND_MIXER_OSS_NOTIFY_FREE);</div><div class='add'>+		card = snd_card_ref(idx);</div><div class='add'>+		if (card) {</div><div class='add'>+			snd_mixer_oss_notify_handler(card, SND_MIXER_OSS_NOTIFY_FREE);</div><div class='add'>+			snd_card_unref(card);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(alsa_mixer_oss_init)</div><div class='ctx'> module_exit(alsa_mixer_oss_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_mixer_oss_ioctl_card);</div><div class='head'>diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c<br/>index f7649d4d950b..fe27034f2846 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/mulaw.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/mulaw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/mulaw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/mulaw.c</a></div><div class='hunk'>@@ -269,12 +269,14 @@ static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	if (frames &gt; dst_channels[0].frames)</div><div class='add'>+		frames = dst_channels[0].frames;</div><div class='ctx'> 	data = (struct mulaw_priv *)plugin-&gt;extra_data;</div><div class='ctx'> 	data-&gt;func(plugin, src_channels, dst_channels, frames);</div><div class='ctx'> 	return frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void init_data(struct mulaw_priv *data, int format)</div><div class='add'>+static void init_data(struct mulaw_priv *data, snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> #ifdef SNDRV_LITTLE_ENDIAN</div><div class='ctx'> 	data-&gt;cvt_endian = snd_pcm_format_big_endian(format) &gt; 0;</div><div class='hunk'>@@ -327,8 +329,8 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (snd_BUG_ON(!snd_pcm_format_linear(format-&gt;format)))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	if (!snd_pcm_format_linear(format-&gt;format))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_plugin_build(plug, "Mu-Law&lt;-&gt;linear conversion",</div><div class='ctx'> 				   src_format, dst_format,</div><div class='head'>diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c<br/>index 5c8c7dff8ede..a82dd155e1d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/pcm_oss.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer / OSS compatible</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -28,11 +13,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -41,12 +28,13 @@</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;linux/soundcard.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/mixer_oss.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define OSS_ALSAEMULVER		_SIOR ('M', 249, int)</div><div class='ctx'> </div><div class='ctx'> static int dsp_map[SNDRV_CARDS];</div><div class='ctx'> static int adsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};</div><div class='del'>-static int nonblock_open = 1;</div><div class='add'>+static bool nonblock_open = 1;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;, Abramo Bagnara &lt;abramo@alsa-project.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PCM OSS emulation for ALSA.");</div><div class='hunk'>@@ -60,23 +48,10 @@ MODULE_PARM_DESC(nonblock_open, "Don't block opening busy PCM devices.");</div><div class='ctx'> MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM);</div><div class='ctx'> MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM1);</div><div class='ctx'> </div><div class='del'>-extern int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned long arg);</div><div class='ctx'> static int snd_pcm_oss_get_rate(struct snd_pcm_oss_file *pcm_oss_file);</div><div class='ctx'> static int snd_pcm_oss_get_channels(struct snd_pcm_oss_file *pcm_oss_file);</div><div class='ctx'> static int snd_pcm_oss_get_format(struct snd_pcm_oss_file *pcm_oss_file);</div><div class='ctx'> </div><div class='del'>-static inline mm_segment_t snd_enter_user(void)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	return fs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void snd_leave_user(mm_segment_t fs)</div><div class='del'>-{</div><div class='del'>-	set_fs(fs);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * helper functions to process hw_params</div><div class='ctx'>  */</div><div class='hunk'>@@ -172,7 +147,7 @@ snd_pcm_hw_param_value_min(const struct snd_pcm_hw_params *params,</div><div class='ctx'>  *</div><div class='ctx'>  * Return the maximum value for field PAR.</div><div class='ctx'>  */</div><div class='del'>-static unsigned int</div><div class='add'>+static int</div><div class='ctx'> snd_pcm_hw_param_value_max(const struct snd_pcm_hw_params *params,</div><div class='ctx'> 			   snd_pcm_hw_param_t var, int *dir)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,7 +171,7 @@ static int _snd_pcm_hw_param_mask(struct snd_pcm_hw_params *params,</div><div class='ctx'> {</div><div class='ctx'> 	int changed;</div><div class='ctx'> 	changed = snd_mask_refine(hw_param_mask(params, var), val);</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -243,7 +218,7 @@ static int _snd_pcm_hw_param_min(struct snd_pcm_hw_params *params,</div><div class='ctx'> 						  val, open);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -304,7 +279,7 @@ static int _snd_pcm_hw_param_max(struct snd_pcm_hw_params *params,</div><div class='ctx'> 						  val, open);</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -402,7 +377,7 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,</div><div class='ctx'> 				 snd_pcm_hw_param_t var, unsigned int best,</div><div class='ctx'> 				 int *dir)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *save = NULL;</div><div class='add'>+	struct snd_pcm_hw_params *save __free(kfree) = NULL;</div><div class='ctx'> 	int v;</div><div class='ctx'> 	unsigned int saved_min;</div><div class='ctx'> 	int last = 0;</div><div class='hunk'>@@ -429,27 +404,22 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,</div><div class='ctx'> 	saved_min = min;</div><div class='ctx'> 	min = snd_pcm_hw_param_min(pcm, params, var, min, &amp;mindir);</div><div class='ctx'> 	if (min &gt;= 0) {</div><div class='del'>-		struct snd_pcm_hw_params *params1;</div><div class='add'>+		struct snd_pcm_hw_params *params1 __free(kfree) = NULL;</div><div class='ctx'> 		if (max &lt; 0)</div><div class='ctx'> 			goto _end;</div><div class='ctx'> 		if ((unsigned int)min == saved_min &amp;&amp; mindir == valdir)</div><div class='ctx'> 			goto _end;</div><div class='ctx'> 		params1 = kmalloc(sizeof(*params1), GFP_KERNEL);</div><div class='del'>-		if (params1 == NULL) {</div><div class='del'>-			kfree(save);</div><div class='add'>+		if (params1 == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		*params1 = *save;</div><div class='ctx'> 		max = snd_pcm_hw_param_max(pcm, params1, var, max, &amp;maxdir);</div><div class='del'>-		if (max &lt; 0) {</div><div class='del'>-			kfree(params1);</div><div class='add'>+		if (max &lt; 0)</div><div class='ctx'> 			goto _end;</div><div class='del'>-		}</div><div class='ctx'> 		if (boundary_nearer(max, maxdir, best, valdir, min, mindir)) {</div><div class='ctx'> 			*params = *params1;</div><div class='ctx'> 			last = 1;</div><div class='ctx'> 		}</div><div class='del'>-		kfree(params1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		*params = *save;</div><div class='ctx'> 		max = snd_pcm_hw_param_max(pcm, params, var, max, &amp;maxdir);</div><div class='hunk'>@@ -458,12 +428,10 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,</div><div class='ctx'> 		last = 1;</div><div class='ctx'> 	}</div><div class='ctx'>  _end:</div><div class='del'>- 	kfree(save);</div><div class='ctx'> 	if (last)</div><div class='ctx'> 		v = snd_pcm_hw_param_last(pcm, params, var, dir);</div><div class='ctx'> 	else</div><div class='ctx'> 		v = snd_pcm_hw_param_first(pcm, params, var, dir);</div><div class='del'>-	snd_BUG_ON(v &lt; 0);</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,7 +476,7 @@ static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -548,7 +516,7 @@ static int _snd_pcm_hw_param_setinteger(struct snd_pcm_hw_params *params,</div><div class='ctx'> {</div><div class='ctx'> 	int changed;</div><div class='ctx'> 	changed = snd_interval_setinteger(hw_param_interval(params, var));</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -654,7 +622,7 @@ snd_pcm_uframes_t get_hw_ptr_period(struct snd_pcm_runtime *runtime)</div><div class='ctx'> #define AFMT_AC3         0x00000400</div><div class='ctx'> #define AFMT_VORBIS      0x00000800</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_oss_format_from(int format)</div><div class='add'>+static snd_pcm_format_t snd_pcm_oss_format_from(int format)</div><div class='ctx'> {</div><div class='ctx'> 	switch (format) {</div><div class='ctx'> 	case AFMT_MU_LAW:	return SNDRV_PCM_FORMAT_MU_LAW;</div><div class='hunk'>@@ -678,7 +646,7 @@ static int snd_pcm_oss_format_from(int format)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_oss_format_to(int format)</div><div class='add'>+static int snd_pcm_oss_format_to(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	switch (format) {</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_MU_LAW:	return AFMT_MU_LAW;</div><div class='hunk'>@@ -706,18 +674,26 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,</div><div class='ctx'> 				   struct snd_pcm_hw_params *oss_params,</div><div class='ctx'> 				   struct snd_pcm_hw_params *slave_params)</div><div class='ctx'> {</div><div class='del'>-	size_t s;</div><div class='del'>-	size_t oss_buffer_size, oss_period_size, oss_periods;</div><div class='del'>-	size_t min_period_size, max_period_size;</div><div class='add'>+	ssize_t s;</div><div class='add'>+	ssize_t oss_buffer_size;</div><div class='add'>+	ssize_t oss_period_size, oss_periods;</div><div class='add'>+	ssize_t min_period_size, max_period_size;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	size_t oss_frame_size;</div><div class='ctx'> </div><div class='ctx'> 	oss_frame_size = snd_pcm_format_physical_width(params_format(oss_params)) *</div><div class='ctx'> 			 params_channels(oss_params) / 8;</div><div class='ctx'> </div><div class='add'>+	oss_buffer_size = snd_pcm_hw_param_value_max(slave_params,</div><div class='add'>+						     SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+						     NULL);</div><div class='add'>+	if (oss_buffer_size &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	oss_buffer_size = snd_pcm_plug_client_size(substream,</div><div class='del'>-						   snd_pcm_hw_param_value_max(slave_params, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, NULL)) * oss_frame_size;</div><div class='del'>-	oss_buffer_size = 1 &lt;&lt; ld2(oss_buffer_size);</div><div class='add'>+						   oss_buffer_size * oss_frame_size);</div><div class='add'>+	if (oss_buffer_size &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	oss_buffer_size = rounddown_pow_of_two(oss_buffer_size);</div><div class='ctx'> 	if (atomic_read(&amp;substream-&gt;mmap_count)) {</div><div class='ctx'> 		if (oss_buffer_size &gt; runtime-&gt;oss.mmap_bytes)</div><div class='ctx'> 			oss_buffer_size = runtime-&gt;oss.mmap_bytes;</div><div class='hunk'>@@ -752,17 +728,21 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	min_period_size = snd_pcm_plug_client_size(substream,</div><div class='ctx'> 						   snd_pcm_hw_param_value_min(slave_params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, NULL));</div><div class='del'>-	min_period_size *= oss_frame_size;</div><div class='del'>-	min_period_size = 1 &lt;&lt; (ld2(min_period_size - 1) + 1);</div><div class='del'>-	if (oss_period_size &lt; min_period_size)</div><div class='del'>-		oss_period_size = min_period_size;</div><div class='add'>+	if (min_period_size &gt; 0) {</div><div class='add'>+		min_period_size *= oss_frame_size;</div><div class='add'>+		min_period_size = roundup_pow_of_two(min_period_size);</div><div class='add'>+		if (oss_period_size &lt; min_period_size)</div><div class='add'>+			oss_period_size = min_period_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	max_period_size = snd_pcm_plug_client_size(substream,</div><div class='ctx'> 						   snd_pcm_hw_param_value_max(slave_params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, NULL));</div><div class='del'>-	max_period_size *= oss_frame_size;</div><div class='del'>-	max_period_size = 1 &lt;&lt; ld2(max_period_size);</div><div class='del'>-	if (oss_period_size &gt; max_period_size)</div><div class='del'>-		oss_period_size = max_period_size;</div><div class='add'>+	if (max_period_size &gt; 0) {</div><div class='add'>+		max_period_size *= oss_frame_size;</div><div class='add'>+		max_period_size = rounddown_pow_of_two(max_period_size);</div><div class='add'>+		if (oss_period_size &gt; max_period_size)</div><div class='add'>+			oss_period_size = max_period_size;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	oss_periods = oss_buffer_size / oss_period_size;</div><div class='ctx'> </div><div class='hunk'>@@ -770,7 +750,7 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,</div><div class='ctx'> 		oss_periods = substream-&gt;oss.setup.periods;</div><div class='ctx'> </div><div class='ctx'> 	s = snd_pcm_hw_param_value_max(slave_params, SNDRV_PCM_HW_PARAM_PERIODS, NULL);</div><div class='del'>-	if (runtime-&gt;oss.maxfrags &amp;&amp; s &gt; runtime-&gt;oss.maxfrags)</div><div class='add'>+	if (s &gt; 0 &amp;&amp; runtime-&gt;oss.maxfrags &amp;&amp; s &gt; runtime-&gt;oss.maxfrags)</div><div class='ctx'> 		s = runtime-&gt;oss.maxfrags;</div><div class='ctx'> 	if (oss_periods &gt; s)</div><div class='ctx'> 		oss_periods = s;</div><div class='hunk'>@@ -786,6 +766,11 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	if (oss_period_size &lt; 16)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* don't allocate too large period; 1MB period must be enough */</div><div class='add'>+	if (oss_period_size &gt; 1024 * 1024)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	runtime-&gt;oss.period_bytes = oss_period_size;</div><div class='ctx'> 	runtime-&gt;oss.period_frames = 1;</div><div class='ctx'> 	runtime-&gt;oss.periods = oss_periods;</div><div class='hunk'>@@ -795,15 +780,15 @@ static int snd_pcm_oss_period_size(struct snd_pcm_substream *substream,</div><div class='ctx'> static int choose_rate(struct snd_pcm_substream *substream,</div><div class='ctx'> 		       struct snd_pcm_hw_params *params, unsigned int best_rate)</div><div class='ctx'> {</div><div class='del'>-	struct snd_interval *it;</div><div class='del'>-	struct snd_pcm_hw_params *save;</div><div class='add'>+	const struct snd_interval *it;</div><div class='add'>+	struct snd_pcm_hw_params *save __free(kfree) = NULL;</div><div class='ctx'> 	unsigned int rate, prev;</div><div class='ctx'> </div><div class='ctx'> 	save = kmalloc(sizeof(*save), GFP_KERNEL);</div><div class='ctx'> 	if (save == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	*save = *params;</div><div class='del'>-	it = hw_param_interval(save, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	it = hw_param_interval_c(save, SNDRV_PCM_HW_PARAM_RATE);</div><div class='ctx'> </div><div class='ctx'> 	/* try multiples of the best rate */</div><div class='ctx'> 	rate = best_rate;</div><div class='hunk'>@@ -815,10 +800,8 @@ static int choose_rate(struct snd_pcm_substream *substream,</div><div class='ctx'> 			ret = snd_pcm_hw_param_set(substream, params,</div><div class='ctx'> 						   SNDRV_PCM_HW_PARAM_RATE,</div><div class='ctx'> 						   rate, 0);</div><div class='del'>-			if (ret == (int)rate) {</div><div class='del'>-				kfree(save);</div><div class='add'>+			if (ret == (int)rate)</div><div class='ctx'> 				return rate;</div><div class='del'>-			}</div><div class='ctx'> 			*params = *save;</div><div class='ctx'> 		}</div><div class='ctx'> 		prev = rate;</div><div class='hunk'>@@ -828,11 +811,39 @@ static int choose_rate(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* not found, use the nearest rate */</div><div class='del'>-	kfree(save);</div><div class='ctx'> 	return snd_pcm_hw_param_near(substream, params, SNDRV_PCM_HW_PARAM_RATE, best_rate, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='add'>+/* parameter locking: returns immediately if tried during streaming */</div><div class='add'>+static int lock_params(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	if (atomic_read(&amp;runtime-&gt;oss.rw_ref)) {</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unlock_params(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_pcm_oss_release_buffers(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	kvfree(runtime-&gt;oss.buffer);</div><div class='add'>+	runtime-&gt;oss.buffer = NULL;</div><div class='add'>+#ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='add'>+	snd_pcm_oss_plugin_clear(substream);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call with params_lock held */</div><div class='add'>+static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_pcm_hw_params *params, *sparams;</div><div class='hunk'>@@ -841,17 +852,17 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	size_t oss_frame_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int direct;</div><div class='del'>-	int format, sformat, n;</div><div class='del'>-	struct snd_mask sformat_mask;</div><div class='add'>+	snd_pcm_format_t format, sformat;</div><div class='add'>+	int n;</div><div class='add'>+	const struct snd_mask *sformat_mask;</div><div class='ctx'> 	struct snd_mask mask;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='del'>-		return -EINTR;</div><div class='del'>-	sw_params = kmalloc(sizeof(*sw_params), GFP_KERNEL);</div><div class='add'>+	if (!runtime-&gt;oss.params)</div><div class='add'>+		return 0;</div><div class='add'>+	sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL);</div><div class='ctx'> 	params = kmalloc(sizeof(*params), GFP_KERNEL);</div><div class='ctx'> 	sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);</div><div class='ctx'> 	if (!sw_params || !params || !sparams) {</div><div class='del'>-		snd_printd("No memory\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -866,42 +877,49 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	_snd_pcm_hw_param_min(sparams, SNDRV_PCM_HW_PARAM_PERIODS, 2, 0);</div><div class='ctx'> 	snd_mask_none(&amp;mask);</div><div class='ctx'> 	if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='del'>-		snd_mask_set(&amp;mask, SNDRV_PCM_ACCESS_MMAP_INTERLEAVED);</div><div class='add'>+		snd_mask_set(&amp;mask, (__force int)SNDRV_PCM_ACCESS_MMAP_INTERLEAVED);</div><div class='ctx'> 	else {</div><div class='del'>-		snd_mask_set(&amp;mask, SNDRV_PCM_ACCESS_RW_INTERLEAVED);</div><div class='add'>+		snd_mask_set(&amp;mask, (__force int)SNDRV_PCM_ACCESS_RW_INTERLEAVED);</div><div class='ctx'> 		if (!direct)</div><div class='del'>-			snd_mask_set(&amp;mask, SNDRV_PCM_ACCESS_RW_NONINTERLEAVED);</div><div class='add'>+			snd_mask_set(&amp;mask, (__force int)SNDRV_PCM_ACCESS_RW_NONINTERLEAVED);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_pcm_hw_param_mask(substream, sparams, SNDRV_PCM_HW_PARAM_ACCESS, &amp;mask);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("No usable accesses\n");</div><div class='add'>+		pcm_dbg(substream-&gt;pcm, "No usable accesses\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='del'>-	choose_rate(substream, sparams, runtime-&gt;oss.rate);</div><div class='del'>-	snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_CHANNELS, runtime-&gt;oss.channels, NULL);</div><div class='add'>+</div><div class='add'>+	err = choose_rate(substream, sparams, runtime-&gt;oss.rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+	err = snd_pcm_hw_param_near(substream, sparams,</div><div class='add'>+				    SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				    runtime-&gt;oss.channels, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='ctx'> </div><div class='ctx'> 	format = snd_pcm_oss_format_from(runtime-&gt;oss.format);</div><div class='ctx'> </div><div class='del'>-	sformat_mask = *hw_param_mask(sparams, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+	sformat_mask = hw_param_mask_c(sparams, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='ctx'> 	if (direct)</div><div class='ctx'> 		sformat = format;</div><div class='ctx'> 	else</div><div class='del'>-		sformat = snd_pcm_plug_slave_format(format, &amp;sformat_mask);</div><div class='add'>+		sformat = snd_pcm_plug_slave_format(format, sformat_mask);</div><div class='ctx'> </div><div class='del'>-	if (sformat &lt; 0 || !snd_mask_test(&amp;sformat_mask, sformat)) {</div><div class='del'>-		for (sformat = 0; sformat &lt;= SNDRV_PCM_FORMAT_LAST; sformat++) {</div><div class='del'>-			if (snd_mask_test(&amp;sformat_mask, sformat) &amp;&amp;</div><div class='add'>+	if ((__force int)sformat &lt; 0 ||</div><div class='add'>+	    !snd_mask_test_format(sformat_mask, sformat)) {</div><div class='add'>+		pcm_for_each_format(sformat) {</div><div class='add'>+			if (snd_mask_test_format(sformat_mask, sformat) &amp;&amp;</div><div class='ctx'> 			    snd_pcm_oss_format_to(sformat) &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (sformat &gt; SNDRV_PCM_FORMAT_LAST) {</div><div class='del'>-			snd_printd("Cannot find a format!!!\n");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto failure;</div><div class='add'>+				goto format_found;</div><div class='ctx'> 		}</div><div class='add'>+		pcm_dbg(substream-&gt;pcm, "Cannot find a format!!!\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto failure;</div><div class='ctx'> 	}</div><div class='del'>-	err = _snd_pcm_hw_param_set(sparams, SNDRV_PCM_HW_PARAM_FORMAT, sformat, 0);</div><div class='add'>+ format_found:</div><div class='add'>+	err = _snd_pcm_hw_param_set(sparams, SNDRV_PCM_HW_PARAM_FORMAT, (__force int)sformat, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto failure;</div><div class='ctx'> </div><div class='hunk'>@@ -910,9 +928,9 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		_snd_pcm_hw_params_any(params);</div><div class='ctx'> 		_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_ACCESS,</div><div class='del'>-				      SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);</div><div class='add'>+				      (__force int)SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);</div><div class='ctx'> 		_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				      snd_pcm_oss_format_from(runtime-&gt;oss.format), 0);</div><div class='add'>+				      (__force int)snd_pcm_oss_format_from(runtime-&gt;oss.format), 0);</div><div class='ctx'> 		_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='ctx'> 				      runtime-&gt;oss.channels, 0);</div><div class='ctx'> 		_snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_RATE,</div><div class='hunk'>@@ -928,23 +946,44 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	oss_frame_size = snd_pcm_format_physical_width(params_format(params)) *</div><div class='ctx'> 			 params_channels(params) / 8;</div><div class='ctx'> </div><div class='add'>+	err = snd_pcm_oss_period_size(substream, params, sparams);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	n = snd_pcm_plug_slave_size(substream, runtime-&gt;oss.period_bytes / oss_frame_size);</div><div class='add'>+	err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, n, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIODS,</div><div class='add'>+				     runtime-&gt;oss.periods, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto failure;</div><div class='add'>+</div><div class='add'>+	snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, sparams);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pcm_dbg(substream-&gt;pcm, "HW_PARAMS failed: %i\n", err);</div><div class='add'>+		goto failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='ctx'> 	snd_pcm_oss_plugin_clear(substream);</div><div class='ctx'> 	if (!direct) {</div><div class='ctx'> 		/* add necessary plugins */</div><div class='del'>-		snd_pcm_oss_plugin_clear(substream);</div><div class='del'>-		if ((err = snd_pcm_plug_format_plugins(substream,</div><div class='del'>-						       params, </div><div class='del'>-						       sparams)) &lt; 0) {</div><div class='del'>-			snd_printd("snd_pcm_plug_format_plugins failed: %i\n", err);</div><div class='del'>-			snd_pcm_oss_plugin_clear(substream);</div><div class='add'>+		err = snd_pcm_plug_format_plugins(substream, params, sparams);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"snd_pcm_plug_format_plugins failed: %i\n", err);</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (runtime-&gt;oss.plugin_first) {</div><div class='ctx'> 			struct snd_pcm_plugin *plugin;</div><div class='del'>-			if ((err = snd_pcm_plugin_build_io(substream, sparams, &amp;plugin)) &lt; 0) {</div><div class='del'>-				snd_printd("snd_pcm_plugin_build_io failed: %i\n", err);</div><div class='del'>-				snd_pcm_oss_plugin_clear(substream);</div><div class='add'>+			err = snd_pcm_plugin_build_io(substream, sparams, &amp;plugin);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				pcm_dbg(substream-&gt;pcm,</div><div class='add'>+					"snd_pcm_plugin_build_io failed: %i\n", err);</div><div class='ctx'> 				goto failure;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='hunk'>@@ -952,36 +991,12 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				err = snd_pcm_plugin_insert(plugin);</div><div class='ctx'> 			}</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				snd_pcm_oss_plugin_clear(substream);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				goto failure;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_oss_period_size(substream, params, sparams);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	n = snd_pcm_plug_slave_size(substream, runtime-&gt;oss.period_bytes / oss_frame_size);</div><div class='del'>-	err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, n, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIODS,</div><div class='del'>-				     runtime-&gt;oss.periods, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto failure;</div><div class='del'>-</div><div class='del'>-	snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, sparams)) &lt; 0) {</div><div class='del'>-		snd_printd("HW_PARAMS failed: %i\n", err);</div><div class='del'>-		goto failure;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(sw_params, 0, sizeof(*sw_params));</div><div class='ctx'> 	if (runtime-&gt;oss.trigger) {</div><div class='ctx'> 		sw_params-&gt;start_threshold = 1;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1009,8 +1024,9 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 		sw_params-&gt;silence_size = frames;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_SW_PARAMS, sw_params)) &lt; 0) {</div><div class='del'>-		snd_printd("SW_PARAMS failed: %i\n", err);</div><div class='add'>+	err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_SW_PARAMS, sw_params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pcm_dbg(substream-&gt;pcm, "SW_PARAMS failed: %i\n", err);</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1027,10 +1043,9 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	oss_period_size *= oss_frame_size;</div><div class='del'>-</div><div class='del'>-	oss_buffer_size = oss_period_size * runtime-&gt;oss.periods;</div><div class='del'>-	if (oss_buffer_size &lt; 0) {</div><div class='add'>+	oss_period_size = array_size(oss_period_size, oss_frame_size);</div><div class='add'>+	oss_buffer_size = array_size(oss_period_size, runtime-&gt;oss.periods);</div><div class='add'>+	if (oss_buffer_size &lt;= 0) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto failure;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1049,8 +1064,8 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;oss.channels = params_channels(params);</div><div class='ctx'> 	runtime-&gt;oss.rate = params_rate(params);</div><div class='ctx'> </div><div class='del'>-	vfree(runtime-&gt;oss.buffer);</div><div class='del'>-	runtime-&gt;oss.buffer = vmalloc(runtime-&gt;oss.period_bytes);</div><div class='add'>+	kvfree(runtime-&gt;oss.buffer);</div><div class='add'>+	runtime-&gt;oss.buffer = kvzalloc(runtime-&gt;oss.period_bytes, GFP_KERNEL);</div><div class='ctx'> 	if (!runtime-&gt;oss.buffer) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failure;</div><div class='hunk'>@@ -1059,16 +1074,34 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;oss.params = 0;</div><div class='ctx'> 	runtime-&gt;oss.prepare = 1;</div><div class='ctx'> 	runtime-&gt;oss.buffer_used = 0;</div><div class='del'>-	if (runtime-&gt;dma_area)</div><div class='del'>-		snd_pcm_format_set_silence(runtime-&gt;format, runtime-&gt;dma_area, bytes_to_samples(runtime, runtime-&gt;dma_bytes));</div><div class='add'>+	snd_pcm_runtime_buffer_set_silence(runtime);</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;oss.period_frames = snd_pcm_alsa_frames(substream, oss_period_size);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> failure:</div><div class='add'>+	if (err)</div><div class='add'>+		snd_pcm_oss_release_buffers(substream);</div><div class='ctx'> 	kfree(sw_params);</div><div class='ctx'> 	kfree(params);</div><div class='ctx'> 	kfree(sparams);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* this one takes the lock by itself */</div><div class='add'>+static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream,</div><div class='add'>+				     bool trylock)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (trylock) {</div><div class='add'>+		if (!(mutex_trylock(&amp;runtime-&gt;oss.params_lock)))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+	} else if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_oss_change_params_locked(substream);</div><div class='ctx'> 	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1085,7 +1118,7 @@ static int snd_pcm_oss_get_active_substream(struct snd_pcm_oss_file *pcm_oss_fil</div><div class='ctx'> 		if (asubstream == NULL)</div><div class='ctx'> 			asubstream = substream;</div><div class='ctx'> 		if (substream-&gt;runtime-&gt;oss.params) {</div><div class='del'>-			err = snd_pcm_oss_change_params(substream);</div><div class='add'>+			err = snd_pcm_oss_change_params(substream, false);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1097,6 +1130,10 @@ static int snd_pcm_oss_get_active_substream(struct snd_pcm_oss_file *pcm_oss_fil</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* call with params_lock held */</div><div class='add'>+/* NOTE: this always call PREPARE unconditionally no matter whether</div><div class='add'>+ * runtime-&gt;oss.prepare is set or not</div><div class='add'>+ */</div><div class='ctx'> static int snd_pcm_oss_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1104,7 +1141,8 @@ static int snd_pcm_oss_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_PREPARE, NULL);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("snd_pcm_oss_prepare: SNDRV_PCM_IOCTL_PREPARE failed\n");</div><div class='add'>+		pcm_dbg(substream-&gt;pcm,</div><div class='add'>+			"snd_pcm_oss_prepare: SNDRV_PCM_IOCTL_PREPARE failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime-&gt;oss.prepare = 0;</div><div class='hunk'>@@ -1120,11 +1158,32 @@ static int snd_pcm_oss_make_ready(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (substream == NULL)</div><div class='del'>-		return 0;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;oss.params) {</div><div class='del'>-		err = snd_pcm_oss_change_params(substream);</div><div class='add'>+		err = snd_pcm_oss_change_params(substream, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (runtime-&gt;oss.prepare) {</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		err = snd_pcm_oss_prepare(substream);</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call with params_lock held */</div><div class='add'>+static int snd_pcm_oss_make_ready_locked(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+	if (runtime-&gt;oss.params) {</div><div class='add'>+		err = snd_pcm_oss_change_params_locked(substream);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1166,33 +1225,27 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='del'>-		    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='add'>+		    runtime-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN)</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: write: "</div><div class='del'>-				       "recovering from XRUN\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: write: "</div><div class='del'>-				       "recovering from SUSPEND\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"pcm_oss: write: recovering from %s\n",</div><div class='add'>+				runtime-&gt;state == SNDRV_PCM_STATE_XRUN ?</div><div class='add'>+				"XRUN" : "SUSPEND");</div><div class='ctx'> #endif</div><div class='ctx'> 			ret = snd_pcm_oss_prepare(substream);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (in_kernel) {</div><div class='del'>-			mm_segment_t fs;</div><div class='del'>-			fs = snd_enter_user();</div><div class='del'>-			ret = snd_pcm_lib_write(substream, (void __user *)ptr, frames);</div><div class='del'>-			snd_leave_user(fs);</div><div class='del'>-		} else {</div><div class='del'>-			ret = snd_pcm_lib_write(substream, (void __user *)ptr, frames);</div><div class='del'>-		}</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		ret = __snd_pcm_lib_xfer(substream, (void *)ptr, true,</div><div class='add'>+					 frames, in_kernel);</div><div class='add'>+		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 		if (ret != -EPIPE &amp;&amp; ret != -ESTRPIPE)</div><div class='ctx'> 			break;</div><div class='ctx'> 		/* test, if we can't store new data, because the stream */</div><div class='ctx'> 		/* has not been started */</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_PREPARED)</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_PREPARED)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1204,20 +1257,18 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p</div><div class='ctx'> 	snd_pcm_sframes_t delay;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='del'>-		    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='add'>+		    runtime-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN)</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: read: "</div><div class='del'>-				       "recovering from XRUN\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: read: "</div><div class='del'>-				       "recovering from SUSPEND\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"pcm_oss: read: recovering from %s\n",</div><div class='add'>+				runtime-&gt;state == SNDRV_PCM_STATE_XRUN ?</div><div class='add'>+				"XRUN" : "SUSPEND");</div><div class='ctx'> #endif</div><div class='ctx'> 			ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='del'>-		} else if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SETUP) {</div><div class='add'>+		} else if (runtime-&gt;state == SNDRV_PCM_STATE_SETUP) {</div><div class='ctx'> 			ret = snd_pcm_oss_prepare(substream);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1225,16 +1276,12 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p</div><div class='ctx'> 		ret = snd_pcm_oss_capture_position_fixup(substream, &amp;delay);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		if (in_kernel) {</div><div class='del'>-			mm_segment_t fs;</div><div class='del'>-			fs = snd_enter_user();</div><div class='del'>-			ret = snd_pcm_lib_read(substream, (void __user *)ptr, frames);</div><div class='del'>-			snd_leave_user(fs);</div><div class='del'>-		} else {</div><div class='del'>-			ret = snd_pcm_lib_read(substream, (void __user *)ptr, frames);</div><div class='del'>-		}</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		ret = __snd_pcm_lib_xfer(substream, (void *)ptr, true,</div><div class='add'>+					 frames, in_kernel);</div><div class='add'>+		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 		if (ret == -EPIPE) {</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='add'>+			if (runtime-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='ctx'> 				ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='ctx'> 				if (ret &lt; 0)</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -1247,80 +1294,64 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, void **bufs, snd_pcm_uframes_t frames, int in_kernel)</div><div class='add'>+#ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='add'>+snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, void **bufs, snd_pcm_uframes_t frames)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='del'>-		    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='add'>+		    runtime-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN)</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: writev: "</div><div class='del'>-				       "recovering from XRUN\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: writev: "</div><div class='del'>-				       "recovering from SUSPEND\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"pcm_oss: writev: recovering from %s\n",</div><div class='add'>+				runtime-&gt;state == SNDRV_PCM_STATE_XRUN ?</div><div class='add'>+				"XRUN" : "SUSPEND");</div><div class='ctx'> #endif</div><div class='ctx'> 			ret = snd_pcm_oss_prepare(substream);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (in_kernel) {</div><div class='del'>-			mm_segment_t fs;</div><div class='del'>-			fs = snd_enter_user();</div><div class='del'>-			ret = snd_pcm_lib_writev(substream, (void __user **)bufs, frames);</div><div class='del'>-			snd_leave_user(fs);</div><div class='del'>-		} else {</div><div class='del'>-			ret = snd_pcm_lib_writev(substream, (void __user **)bufs, frames);</div><div class='del'>-		}</div><div class='add'>+		ret = snd_pcm_kernel_writev(substream, bufs, frames);</div><div class='ctx'> 		if (ret != -EPIPE &amp;&amp; ret != -ESTRPIPE)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* test, if we can't store new data, because the stream */</div><div class='ctx'> 		/* has not been started */</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_PREPARED)</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_PREPARED)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='del'>-snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, void **bufs, snd_pcm_uframes_t frames, int in_kernel)</div><div class='add'>+snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, void **bufs, snd_pcm_uframes_t frames)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='del'>-		    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_XRUN ||</div><div class='add'>+		    runtime-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_XRUN)</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: readv: "</div><div class='del'>-				       "recovering from XRUN\n");</div><div class='del'>-			else</div><div class='del'>-				printk(KERN_DEBUG "pcm_oss: readv: "</div><div class='del'>-				       "recovering from SUSPEND\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"pcm_oss: readv: recovering from %s\n",</div><div class='add'>+				runtime-&gt;state == SNDRV_PCM_STATE_XRUN ?</div><div class='add'>+				"XRUN" : "SUSPEND");</div><div class='ctx'> #endif</div><div class='ctx'> 			ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='del'>-		} else if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SETUP) {</div><div class='add'>+		} else if (runtime-&gt;state == SNDRV_PCM_STATE_SETUP) {</div><div class='ctx'> 			ret = snd_pcm_oss_prepare(substream);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		if (in_kernel) {</div><div class='del'>-			mm_segment_t fs;</div><div class='del'>-			fs = snd_enter_user();</div><div class='del'>-			ret = snd_pcm_lib_readv(substream, (void __user **)bufs, frames);</div><div class='del'>-			snd_leave_user(fs);</div><div class='del'>-		} else {</div><div class='del'>-			ret = snd_pcm_lib_readv(substream, (void __user **)bufs, frames);</div><div class='del'>-		}</div><div class='add'>+		ret = snd_pcm_kernel_readv(substream, bufs, frames);</div><div class='ctx'> 		if (ret != -EPIPE &amp;&amp; ret != -ESTRPIPE)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_SND_PCM_OSS_PLUGINS */</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const char *buf, size_t bytes, int in_kernel)</div><div class='ctx'> {</div><div class='hunk'>@@ -1331,7 +1362,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha</div><div class='ctx'> 		struct snd_pcm_plugin_channel *channels;</div><div class='ctx'> 		size_t oss_frame_bytes = (runtime-&gt;oss.plugin_first-&gt;src_width * runtime-&gt;oss.plugin_first-&gt;src_format.channels) / 8;</div><div class='ctx'> 		if (!in_kernel) {</div><div class='del'>-			if (copy_from_user(runtime-&gt;oss.buffer, (const char __user *)buf, bytes))</div><div class='add'>+			if (copy_from_user(runtime-&gt;oss.buffer, (const char __force __user *)buf, bytes))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			buf = runtime-&gt;oss.buffer;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1358,16 +1389,21 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha</div><div class='ctx'> static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const char __user *buf, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	size_t xfer = 0;</div><div class='del'>-	ssize_t tmp;</div><div class='add'>+	ssize_t tmp = 0;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if ((tmp = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='del'>-		return tmp;</div><div class='del'>-	mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+	atomic_inc(&amp;runtime-&gt;oss.rw_ref);</div><div class='ctx'> 	while (bytes &gt; 0) {</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock)) {</div><div class='add'>+			tmp = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tmp = snd_pcm_oss_make_ready_locked(substream);</div><div class='add'>+		if (tmp &lt; 0)</div><div class='add'>+			goto err;</div><div class='ctx'> 		if (bytes &lt; runtime-&gt;oss.period_bytes || runtime-&gt;oss.buffer_used &gt; 0) {</div><div class='ctx'> 			tmp = bytes;</div><div class='ctx'> 			if (tmp + runtime-&gt;oss.buffer_used &gt; runtime-&gt;oss.period_bytes)</div><div class='hunk'>@@ -1411,14 +1447,19 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha</div><div class='ctx'> 			xfer += tmp;</div><div class='ctx'> 			if ((substream-&gt;f_flags &amp; O_NONBLOCK) != 0 &amp;&amp;</div><div class='ctx'> 			    tmp != runtime-&gt;oss.period_bytes)</div><div class='del'>-				break;</div><div class='add'>+				tmp = -EAGAIN;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='del'>-	return xfer;</div><div class='del'>-</div><div class='ctx'>  err:</div><div class='del'>-	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		if (tmp &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			tmp = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tmp = 0;</div><div class='add'>+	}</div><div class='add'>+	atomic_dec(&amp;runtime-&gt;oss.rw_ref);</div><div class='ctx'> 	return xfer &gt; 0 ? (snd_pcm_sframes_t)xfer : tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1427,7 +1468,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_sframes_t frames, frames1;</div><div class='ctx'> #ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='del'>-	char __user *final_dst = (char __user *)buf;</div><div class='add'>+	char __user *final_dst = (char __force __user *)buf;</div><div class='ctx'> 	if (runtime-&gt;oss.plugin_first) {</div><div class='ctx'> 		struct snd_pcm_plugin_channel *channels;</div><div class='ctx'> 		size_t oss_frame_bytes = (runtime-&gt;oss.plugin_last-&gt;dst_width * runtime-&gt;oss.plugin_last-&gt;dst_format.channels) / 8;</div><div class='hunk'>@@ -1458,16 +1499,21 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,</div><div class='ctx'> static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __user *buf, size_t bytes)</div><div class='ctx'> {</div><div class='ctx'> 	size_t xfer = 0;</div><div class='del'>-	ssize_t tmp;</div><div class='add'>+	ssize_t tmp = 0;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if ((tmp = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='del'>-		return tmp;</div><div class='del'>-	mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+	atomic_inc(&amp;runtime-&gt;oss.rw_ref);</div><div class='ctx'> 	while (bytes &gt; 0) {</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock)) {</div><div class='add'>+			tmp = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tmp = snd_pcm_oss_make_ready_locked(substream);</div><div class='add'>+		if (tmp &lt; 0)</div><div class='add'>+			goto err;</div><div class='ctx'> 		if (bytes &lt; runtime-&gt;oss.period_bytes || runtime-&gt;oss.buffer_used &gt; 0) {</div><div class='ctx'> 			if (runtime-&gt;oss.buffer_used == 0) {</div><div class='ctx'> 				tmp = snd_pcm_oss_read2(substream, runtime-&gt;oss.buffer, runtime-&gt;oss.period_bytes, 1);</div><div class='hunk'>@@ -1498,28 +1544,38 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use</div><div class='ctx'> 			bytes -= tmp;</div><div class='ctx'> 			xfer += tmp;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='del'>-	return xfer;</div><div class='del'>-</div><div class='ctx'>  err:</div><div class='del'>-	mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		if (tmp &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			tmp = -ERESTARTSYS;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		tmp = 0;</div><div class='add'>+	}</div><div class='add'>+	atomic_dec(&amp;runtime-&gt;oss.rw_ref);</div><div class='ctx'> 	return xfer &gt; 0 ? (snd_pcm_sframes_t)xfer : tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_oss_reset(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='del'>-	if (substream != NULL) {</div><div class='del'>-		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='del'>-		substream-&gt;runtime-&gt;oss.prepare = 1;</div><div class='del'>-	}</div><div class='del'>-	substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='del'>-	if (substream != NULL) {</div><div class='add'>+	for (i = 0; i &lt; 2; i++) { </div><div class='add'>+		substream = pcm_oss_file-&gt;streams[i];</div><div class='add'>+		if (!substream)</div><div class='add'>+			continue;</div><div class='add'>+		runtime = substream-&gt;runtime;</div><div class='ctx'> 		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='del'>-		substream-&gt;runtime-&gt;oss.prepare = 1;</div><div class='add'>+		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		runtime-&gt;oss.prepare = 1;</div><div class='add'>+		runtime-&gt;oss.buffer_used = 0;</div><div class='add'>+		runtime-&gt;oss.prev_hw_ptr_period = 0;</div><div class='add'>+		runtime-&gt;oss.period_ptr = 0;</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1531,7 +1587,8 @@ static int snd_pcm_oss_post(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> </div><div class='ctx'> 	substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='ctx'> 	if (substream != NULL) {</div><div class='del'>-		if ((err = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='add'>+		err = snd_pcm_oss_make_ready(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_START, NULL);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1544,14 +1601,15 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	ssize_t result = 0;</div><div class='add'>+	snd_pcm_state_t state;</div><div class='ctx'> 	long res;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 	add_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "sync1: size = %li\n", size);</div><div class='add'>+	pcm_dbg(substream-&gt;pcm, "sync1: size = %li\n", size);</div><div class='ctx'> #endif</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		result = snd_pcm_oss_write2(substream, runtime-&gt;oss.buffer, size, 1);</div><div class='hunk'>@@ -1564,10 +1622,9 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> 			break;</div><div class='ctx'> 		result = 0;</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		snd_pcm_stream_lock_irq(substream);</div><div class='del'>-		res = runtime-&gt;status-&gt;state;</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		if (res != SNDRV_PCM_STATE_RUNNING) {</div><div class='add'>+		scoped_guard(pcm_stream_lock_irq, substream)</div><div class='add'>+			state = runtime-&gt;state;</div><div class='add'>+		if (state != SNDRV_PCM_STATE_RUNNING) {</div><div class='ctx'> 			set_current_state(TASK_RUNNING);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1577,7 +1634,8 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (res == 0) {</div><div class='del'>-			snd_printk(KERN_ERR "OSS sync error - DMA timeout\n");</div><div class='add'>+			pcm_err(substream-&gt;pcm,</div><div class='add'>+				"OSS sync error - DMA timeout\n");</div><div class='ctx'> 			result = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1601,37 +1659,38 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 		runtime = substream-&gt;runtime;</div><div class='ctx'> 		if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='ctx'> 			goto __direct;</div><div class='del'>-		if ((err = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		atomic_inc(&amp;runtime-&gt;oss.rw_ref);</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock)) {</div><div class='add'>+			atomic_dec(&amp;runtime-&gt;oss.rw_ref);</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		}</div><div class='add'>+		err = snd_pcm_oss_make_ready_locked(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		format = snd_pcm_oss_format_from(runtime-&gt;oss.format);</div><div class='ctx'> 		width = snd_pcm_format_physical_width(format);</div><div class='del'>-		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 		if (runtime-&gt;oss.buffer_used &gt; 0) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			printk(KERN_DEBUG "sync: buffer_used\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm, "sync: buffer_used\n");</div><div class='ctx'> #endif</div><div class='ctx'> 			size = (8 * (runtime-&gt;oss.period_bytes - runtime-&gt;oss.buffer_used) + 7) / width;</div><div class='ctx'> 			snd_pcm_format_set_silence(format,</div><div class='ctx'> 						   runtime-&gt;oss.buffer + runtime-&gt;oss.buffer_used,</div><div class='ctx'> 						   size);</div><div class='ctx'> 			err = snd_pcm_oss_sync1(substream, runtime-&gt;oss.period_bytes);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto unlock;</div><div class='ctx'> 		} else if (runtime-&gt;oss.period_ptr &gt; 0) {</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-			printk(KERN_DEBUG "sync: period_ptr\n");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm, "sync: period_ptr\n");</div><div class='ctx'> #endif</div><div class='ctx'> 			size = runtime-&gt;oss.period_bytes - runtime-&gt;oss.period_ptr;</div><div class='ctx'> 			snd_pcm_format_set_silence(format,</div><div class='ctx'> 						   runtime-&gt;oss.buffer,</div><div class='ctx'> 						   size * 8 / width);</div><div class='ctx'> 			err = snd_pcm_oss_sync1(substream, size);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The ALSA's period might be a bit large than OSS one.</div><div class='hunk'>@@ -1640,29 +1699,16 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 		size = runtime-&gt;control-&gt;appl_ptr % runtime-&gt;period_size;</div><div class='ctx'> 		if (size &gt; 0) {</div><div class='ctx'> 			size = runtime-&gt;period_size - size;</div><div class='del'>-			if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_INTERLEAVED) {</div><div class='del'>-				size = (runtime-&gt;frame_bits * size) / 8;</div><div class='del'>-				while (size &gt; 0) {</div><div class='del'>-					mm_segment_t fs;</div><div class='del'>-					size_t size1 = size &lt; runtime-&gt;oss.period_bytes ? size : runtime-&gt;oss.period_bytes;</div><div class='del'>-					size -= size1;</div><div class='del'>-					size1 *= 8;</div><div class='del'>-					size1 /= runtime-&gt;sample_bits;</div><div class='del'>-					snd_pcm_format_set_silence(runtime-&gt;format,</div><div class='del'>-								   runtime-&gt;oss.buffer,</div><div class='del'>-								   size1);</div><div class='del'>-					size1 /= runtime-&gt;channels; /* frames */</div><div class='del'>-					fs = snd_enter_user();</div><div class='del'>-					snd_pcm_lib_write(substream, (void __user *)runtime-&gt;oss.buffer, size1);</div><div class='del'>-					snd_leave_user(fs);</div><div class='del'>-				}</div><div class='del'>-			} else if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {</div><div class='del'>-				void __user *buffers[runtime-&gt;channels];</div><div class='del'>-				memset(buffers, 0, runtime-&gt;channels * sizeof(void *));</div><div class='del'>-				snd_pcm_lib_writev(substream, buffers, size);</div><div class='del'>-			}</div><div class='add'>+			if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_INTERLEAVED)</div><div class='add'>+				snd_pcm_lib_write(substream, NULL, size);</div><div class='add'>+			else if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)</div><div class='add'>+				snd_pcm_lib_writev(substream, NULL, size);</div><div class='ctx'> 		}</div><div class='add'>+unlock:</div><div class='ctx'> 		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		atomic_dec(&amp;runtime-&gt;oss.rw_ref);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * finish sync: drain the buffer</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1673,19 +1719,24 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 		substream-&gt;f_flags = saved_f_flags;</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 		runtime-&gt;oss.prepare = 1;</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='ctx'> 	if (substream != NULL) {</div><div class='del'>-		if ((err = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='add'>+		err = snd_pcm_oss_make_ready(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		runtime = substream-&gt;runtime;</div><div class='ctx'> 		err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+		mutex_lock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 		runtime-&gt;oss.buffer_used = 0;</div><div class='ctx'> 		runtime-&gt;oss.prepare = 1;</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1697,6 +1748,8 @@ static int snd_pcm_oss_set_rate(struct snd_pcm_oss_file *pcm_oss_file, int rate)</div><div class='ctx'> 	for (idx = 1; idx &gt;= 0; --idx) {</div><div class='ctx'> 		struct snd_pcm_substream *substream = pcm_oss_file-&gt;streams[idx];</div><div class='ctx'> 		struct snd_pcm_runtime *runtime;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='ctx'> 		if (substream == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		runtime = substream-&gt;runtime;</div><div class='hunk'>@@ -1704,10 +1757,14 @@ static int snd_pcm_oss_set_rate(struct snd_pcm_oss_file *pcm_oss_file, int rate)</div><div class='ctx'> 			rate = 1000;</div><div class='ctx'> 		else if (rate &gt; 192000)</div><div class='ctx'> 			rate = 192000;</div><div class='add'>+		err = lock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		if (runtime-&gt;oss.rate != rate) {</div><div class='ctx'> 			runtime-&gt;oss.params = 1;</div><div class='ctx'> 			runtime-&gt;oss.rate = rate;</div><div class='ctx'> 		}</div><div class='add'>+		unlock_params(runtime);</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_pcm_oss_get_rate(pcm_oss_file);</div><div class='ctx'> }</div><div class='hunk'>@@ -1717,7 +1774,8 @@ static int snd_pcm_oss_get_rate(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return substream-&gt;runtime-&gt;oss.rate;</div><div class='ctx'> }</div><div class='hunk'>@@ -1732,13 +1790,19 @@ static int snd_pcm_oss_set_channels(struct snd_pcm_oss_file *pcm_oss_file, unsig</div><div class='ctx'> 	for (idx = 1; idx &gt;= 0; --idx) {</div><div class='ctx'> 		struct snd_pcm_substream *substream = pcm_oss_file-&gt;streams[idx];</div><div class='ctx'> 		struct snd_pcm_runtime *runtime;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='ctx'> 		if (substream == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		runtime = substream-&gt;runtime;</div><div class='add'>+		err = lock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		if (runtime-&gt;oss.channels != channels) {</div><div class='ctx'> 			runtime-&gt;oss.params = 1;</div><div class='ctx'> 			runtime-&gt;oss.channels = channels;</div><div class='ctx'> 		}</div><div class='add'>+		unlock_params(runtime);</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_pcm_oss_get_channels(pcm_oss_file);</div><div class='ctx'> }</div><div class='hunk'>@@ -1748,7 +1812,8 @@ static int snd_pcm_oss_get_channels(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return substream-&gt;runtime-&gt;oss.channels;</div><div class='ctx'> }</div><div class='hunk'>@@ -1758,7 +1823,8 @@ static int snd_pcm_oss_get_block_size(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return substream-&gt;runtime-&gt;oss.period_bytes;</div><div class='ctx'> }</div><div class='hunk'>@@ -1768,12 +1834,13 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int direct;</div><div class='del'>-	struct snd_pcm_hw_params *params;</div><div class='add'>+	struct snd_pcm_hw_params *params __free(kfree) = NULL;</div><div class='ctx'> 	unsigned int formats = 0;</div><div class='del'>-	struct snd_mask format_mask;</div><div class='add'>+	const struct snd_mask *format_mask;</div><div class='ctx'> 	int fmt;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='ctx'> 		direct = 1;</div><div class='hunk'>@@ -1792,23 +1859,24 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	_snd_pcm_hw_params_any(params);</div><div class='ctx'> 	err = snd_pcm_hw_refine(substream, params);</div><div class='del'>-	format_mask = *hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); </div><div class='del'>-	kfree(params);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='ctx'> 	for (fmt = 0; fmt &lt; 32; ++fmt) {</div><div class='del'>-		if (snd_mask_test(&amp;format_mask, fmt)) {</div><div class='del'>-			int f = snd_pcm_oss_format_to(fmt);</div><div class='add'>+		if (snd_mask_test(format_mask, fmt)) {</div><div class='add'>+			int f = snd_pcm_oss_format_to((__force snd_pcm_format_t)fmt);</div><div class='ctx'> 			if (f &gt;= 0)</div><div class='ctx'> 				formats |= f;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return formats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int format)</div><div class='ctx'> {</div><div class='ctx'> 	int formats, idx;</div><div class='add'>+	int err;</div><div class='ctx'> 	</div><div class='ctx'> 	if (format != AFMT_QUERY) {</div><div class='ctx'> 		formats = snd_pcm_oss_get_formats(pcm_oss_file);</div><div class='hunk'>@@ -1822,10 +1890,14 @@ static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int for</div><div class='ctx'> 			if (substream == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			runtime = substream-&gt;runtime;</div><div class='add'>+			err = lock_params(runtime);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 			if (runtime-&gt;oss.format != format) {</div><div class='ctx'> 				runtime-&gt;oss.params = 1;</div><div class='ctx'> 				runtime-&gt;oss.format = format;</div><div class='ctx'> 			}</div><div class='add'>+			unlock_params(runtime);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_pcm_oss_get_format(pcm_oss_file);</div><div class='hunk'>@@ -1836,7 +1908,8 @@ static int snd_pcm_oss_get_format(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_get_active_substream(pcm_oss_file, &amp;substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return substream-&gt;runtime-&gt;oss.format;</div><div class='ctx'> }</div><div class='hunk'>@@ -1845,8 +1918,6 @@ static int snd_pcm_oss_set_subdivide1(struct snd_pcm_substream *substream, int s</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	if (substream == NULL)</div><div class='del'>-		return 0;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (subdivide == 0) {</div><div class='ctx'> 		subdivide = runtime-&gt;oss.subdivision;</div><div class='hunk'>@@ -1870,9 +1941,17 @@ static int snd_pcm_oss_set_subdivide(struct snd_pcm_oss_file *pcm_oss_file, int</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 1; idx &gt;= 0; --idx) {</div><div class='ctx'> 		struct snd_pcm_substream *substream = pcm_oss_file-&gt;streams[idx];</div><div class='add'>+		struct snd_pcm_runtime *runtime;</div><div class='add'>+</div><div class='ctx'> 		if (substream == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((err = snd_pcm_oss_set_subdivide1(substream, subdivide)) &lt; 0)</div><div class='add'>+		runtime = substream-&gt;runtime;</div><div class='add'>+		err = lock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = snd_pcm_oss_set_subdivide1(substream, subdivide);</div><div class='add'>+		unlock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1881,13 +1960,15 @@ static int snd_pcm_oss_set_subdivide(struct snd_pcm_oss_file *pcm_oss_file, int</div><div class='ctx'> static int snd_pcm_oss_set_fragment1(struct snd_pcm_substream *substream, unsigned int val)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='add'>+	int fragshift;</div><div class='ctx'> </div><div class='del'>-	if (substream == NULL)</div><div class='del'>-		return 0;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;oss.subdivision || runtime-&gt;oss.fragshift)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	runtime-&gt;oss.fragshift = val &amp; 0xffff;</div><div class='add'>+	fragshift = val &amp; 0xffff;</div><div class='add'>+	if (fragshift &gt;= 25) /* should be large enough */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	runtime-&gt;oss.fragshift = fragshift;</div><div class='ctx'> 	runtime-&gt;oss.maxfrags = (val &gt;&gt; 16) &amp; 0xffff;</div><div class='ctx'> 	if (runtime-&gt;oss.fragshift &lt; 4)		/* &lt; 16 */</div><div class='ctx'> 		runtime-&gt;oss.fragshift = 4;</div><div class='hunk'>@@ -1903,9 +1984,17 @@ static int snd_pcm_oss_set_fragment(struct snd_pcm_oss_file *pcm_oss_file, unsig</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 1; idx &gt;= 0; --idx) {</div><div class='ctx'> 		struct snd_pcm_substream *substream = pcm_oss_file-&gt;streams[idx];</div><div class='add'>+		struct snd_pcm_runtime *runtime;</div><div class='add'>+</div><div class='ctx'> 		if (substream == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((err = snd_pcm_oss_set_fragment1(substream, val)) &lt; 0)</div><div class='add'>+		runtime = substream-&gt;runtime;</div><div class='add'>+		err = lock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = snd_pcm_oss_set_fragment1(substream, val);</div><div class='add'>+		unlock_params(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1913,9 +2002,8 @@ static int snd_pcm_oss_set_fragment(struct snd_pcm_oss_file *pcm_oss_file, unsig</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_oss_nonblock(struct file * file)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;file-&gt;f_lock);</div><div class='add'>+	guard(spinlock)(&amp;file-&gt;f_lock);</div><div class='ctx'> 	file-&gt;f_flags |= O_NONBLOCK;</div><div class='del'>-	spin_unlock(&amp;file-&gt;f_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1973,22 +2061,27 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr</div><div class='ctx'> 	int err, cmd;</div><div class='ctx'> </div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: trigger = 0x%x\n", trigger);</div><div class='add'>+	pr_debug("pcm_oss: trigger = 0x%x\n", trigger);</div><div class='ctx'> #endif</div><div class='ctx'> 	</div><div class='ctx'> 	psubstream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='ctx'> 	csubstream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='ctx'> </div><div class='ctx'> 	if (psubstream) {</div><div class='del'>-		if ((err = snd_pcm_oss_make_ready(psubstream)) &lt; 0)</div><div class='add'>+		err = snd_pcm_oss_make_ready(psubstream);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (csubstream) {</div><div class='del'>-		if ((err = snd_pcm_oss_make_ready(csubstream)) &lt; 0)</div><div class='add'>+		err = snd_pcm_oss_make_ready(csubstream);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'>       	if (psubstream) {</div><div class='ctx'>       		runtime = psubstream-&gt;runtime;</div><div class='add'>+		cmd = 0;</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='ctx'> 		if (trigger &amp; PCM_ENABLE_OUTPUT) {</div><div class='ctx'> 			if (runtime-&gt;oss.trigger)</div><div class='ctx'> 				goto _skip1;</div><div class='hunk'>@@ -2006,13 +2099,19 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr</div><div class='ctx'> 			cmd = SNDRV_PCM_IOCTL_DROP;</div><div class='ctx'> 			runtime-&gt;oss.prepare = 1;</div><div class='ctx'> 		}</div><div class='del'>-		err = snd_pcm_kernel_ioctl(psubstream, cmd, NULL);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='ctx'>  _skip1:</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		if (cmd) {</div><div class='add'>+			err = snd_pcm_kernel_ioctl(psubstream, cmd, NULL);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (csubstream) {</div><div class='ctx'>       		runtime = csubstream-&gt;runtime;</div><div class='add'>+		cmd = 0;</div><div class='add'>+		if (mutex_lock_interruptible(&amp;runtime-&gt;oss.params_lock))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='ctx'> 		if (trigger &amp; PCM_ENABLE_INPUT) {</div><div class='ctx'> 			if (runtime-&gt;oss.trigger)</div><div class='ctx'> 				goto _skip2;</div><div class='hunk'>@@ -2027,11 +2126,14 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr</div><div class='ctx'> 			cmd = SNDRV_PCM_IOCTL_DROP;</div><div class='ctx'> 			runtime-&gt;oss.prepare = 1;</div><div class='ctx'> 		}</div><div class='del'>-		err = snd_pcm_kernel_ioctl(csubstream, cmd, NULL);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='ctx'>  _skip2:</div><div class='add'>+		mutex_unlock(&amp;runtime-&gt;oss.params_lock);</div><div class='add'>+		if (cmd) {</div><div class='add'>+			err = snd_pcm_kernel_ioctl(csubstream, cmd, NULL);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2059,7 +2161,8 @@ static int snd_pcm_oss_get_odelay(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='ctx'> 	substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((err = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_make_ready(substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;oss.params || runtime-&gt;oss.prepare)</div><div class='hunk'>@@ -2086,7 +2189,8 @@ static int snd_pcm_oss_get_ptr(struct snd_pcm_oss_file *pcm_oss_file, int stream</div><div class='ctx'> 	substream = pcm_oss_file-&gt;streams[stream];</div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((err = snd_pcm_oss_make_ready(substream)) &lt; 0)</div><div class='add'>+	err = snd_pcm_oss_make_ready(substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;oss.params || runtime-&gt;oss.prepare) {</div><div class='hunk'>@@ -2157,9 +2261,11 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;oss.params &amp;&amp;</div><div class='del'>-	    (err = snd_pcm_oss_change_params(substream)) &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (runtime-&gt;oss.params) {</div><div class='add'>+		err = snd_pcm_oss_change_params(substream, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	info.fragsize = runtime-&gt;oss.period_bytes;</div><div class='ctx'> 	info.fragstotal = runtime-&gt;periods;</div><div class='hunk'>@@ -2193,9 +2299,9 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: space: bytes = %i, fragments = %i, "</div><div class='del'>-	       "fragstotal = %i, fragsize = %i\n",</div><div class='del'>-	       info.bytes, info.fragments, info.fragstotal, info.fragsize);</div><div class='add'>+	pcm_dbg(substream-&gt;pcm,</div><div class='add'>+		"pcm_oss: space: bytes = %i, fragments = %i, fragstotal = %i, fragsize = %i\n",</div><div class='add'>+		info.bytes, info.fragments, info.fragstotal, info.fragsize);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='hunk'>@@ -2205,7 +2311,7 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre</div><div class='ctx'> static int snd_pcm_oss_get_mapbuf(struct snd_pcm_oss_file *pcm_oss_file, int stream, struct buffmem_desc __user * _info)</div><div class='ctx'> {</div><div class='ctx'> 	// it won't be probably implemented</div><div class='del'>-	// snd_printd("TODO: snd_pcm_oss_get_mapbuf\n");</div><div class='add'>+	// pr_debug("TODO: snd_pcm_oss_get_mapbuf\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2225,7 +2331,7 @@ static void snd_pcm_oss_look_for_setup(struct snd_pcm *pcm, int stream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_oss_setup *setup;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pcm-&gt;streams[stream].oss.setup_mutex);</div><div class='add'>+	guard(mutex)(&amp;pcm-&gt;streams[stream].oss.setup_mutex);</div><div class='ctx'> 	do {</div><div class='ctx'> 		for (setup = pcm-&gt;streams[stream].oss.setup_list; setup;</div><div class='ctx'> 		     setup = setup-&gt;next) {</div><div class='hunk'>@@ -2236,18 +2342,11 @@ static void snd_pcm_oss_look_for_setup(struct snd_pcm *pcm, int stream,</div><div class='ctx'>  out:</div><div class='ctx'> 	if (setup)</div><div class='ctx'> 		*rsetup = *setup;</div><div class='del'>-	mutex_unlock(&amp;pcm-&gt;streams[stream].oss.setup_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_pcm_oss_release_substream(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	vfree(runtime-&gt;oss.buffer);</div><div class='del'>-	runtime-&gt;oss.buffer = NULL;</div><div class='del'>-#ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='del'>-	snd_pcm_oss_plugin_clear(substream);</div><div class='del'>-#endif</div><div class='add'>+	snd_pcm_oss_release_buffers(substream);</div><div class='ctx'> 	substream-&gt;oss.oss = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2283,6 +2382,7 @@ static void snd_pcm_oss_init_substream(struct snd_pcm_substream *substream,</div><div class='ctx'> 	runtime-&gt;oss.maxfrags = 0;</div><div class='ctx'> 	runtime-&gt;oss.subdivision = 0;</div><div class='ctx'> 	substream-&gt;pcm_release = snd_pcm_oss_release_substream;</div><div class='add'>+	atomic_set(&amp;runtime-&gt;oss.rw_ref, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_oss_release_file(struct snd_pcm_oss_file *pcm_oss_file)</div><div class='hunk'>@@ -2341,7 +2441,6 @@ static int snd_pcm_oss_open_file(struct file *file,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pcm_oss_file-&gt;streams[idx] = substream;</div><div class='del'>-		substream-&gt;file = pcm_oss_file;</div><div class='ctx'> 		snd_pcm_oss_init_substream(substream, &amp;setup[idx], minor);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -2377,7 +2476,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct snd_pcm_oss_file *pcm_oss_file;</div><div class='ctx'> 	struct snd_pcm_oss_setup setup[2];</div><div class='ctx'> 	int nonblock;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	err = nonseekable_open(inode, file);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -2431,6 +2530,10 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		mutex_unlock(&amp;pcm-&gt;open_mutex);</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		mutex_lock(&amp;pcm-&gt;open_mutex);</div><div class='add'>+		if (pcm-&gt;card-&gt;shutdown) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			err = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2440,6 +2543,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	mutex_unlock(&amp;pcm-&gt;open_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto __error;</div><div class='add'>+	snd_card_unref(pcm-&gt;card);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'>       __error:</div><div class='hunk'>@@ -2447,6 +2551,8 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file)</div><div class='ctx'>       __error2:</div><div class='ctx'>       	snd_card_file_remove(pcm-&gt;card, file);</div><div class='ctx'>       __error1:</div><div class='add'>+	if (pcm)</div><div class='add'>+		snd_card_unref(pcm-&gt;card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2485,7 +2591,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 		return put_user(SNDRV_OSS_VERSION, p);</div><div class='ctx'> 	if (cmd == OSS_ALSAEMULVER)</div><div class='ctx'> 		return put_user(1, p);</div><div class='del'>-#if defined(CONFIG_SND_MIXER_OSS) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_MIXER_OSS_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_SND_MIXER_OSS)</div><div class='ctx'> 	if (((cmd &gt;&gt; 8) &amp; 0xff) == 'M')	{	/* mixer ioctl - for OSS compatibility */</div><div class='ctx'> 		struct snd_pcm_substream *substream;</div><div class='ctx'> 		int idx;</div><div class='hunk'>@@ -2502,7 +2608,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 	if (((cmd &gt;&gt; 8) &amp; 0xff) != 'P')</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: ioctl = 0x%x\n", cmd);</div><div class='add'>+	pr_debug("pcm_oss: ioctl = 0x%x\n", cmd);</div><div class='ctx'> #endif</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDCTL_DSP_RESET:</div><div class='hunk'>@@ -2512,7 +2618,8 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 	case SNDCTL_DSP_SPEED:</div><div class='ctx'> 		if (get_user(res, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if ((res = snd_pcm_oss_set_rate(pcm_oss_file, res))&lt;0)</div><div class='add'>+		res = snd_pcm_oss_set_rate(pcm_oss_file, res);</div><div class='add'>+		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='ctx'> 		return put_user(res, p);</div><div class='ctx'> 	case SOUND_PCM_READ_RATE:</div><div class='hunk'>@@ -2524,7 +2631,8 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 		if (get_user(res, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		res = res &gt; 0 ? 2 : 1;</div><div class='del'>-		if ((res = snd_pcm_oss_set_channels(pcm_oss_file, res)) &lt; 0)</div><div class='add'>+		res = snd_pcm_oss_set_channels(pcm_oss_file, res);</div><div class='add'>+		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='ctx'> 		return put_user(--res, p);</div><div class='ctx'> 	case SNDCTL_DSP_GETBLKSIZE:</div><div class='hunk'>@@ -2629,14 +2737,22 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 	case SNDCTL_DSP_PROFILE:</div><div class='ctx'> 		return 0;	/* silently ignore */</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printd("pcm_oss: unknown command = 0x%x\n", cmd);</div><div class='add'>+		pr_debug("pcm_oss: unknown command = 0x%x\n", cmd);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> /* all compatible */</div><div class='del'>-#define snd_pcm_oss_ioctl_compat	snd_pcm_oss_ioctl</div><div class='add'>+static long snd_pcm_oss_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+				     unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Everything is compatbile except SNDCTL_DSP_MAPINBUF/SNDCTL_DSP_MAPOUTBUF,</div><div class='add'>+	 * which are not implemented for the native case either</div><div class='add'>+	 */</div><div class='add'>+	return snd_pcm_oss_ioctl(file, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define snd_pcm_oss_ioctl_compat	NULL</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2656,8 +2772,9 @@ static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t coun</div><div class='ctx'> #else</div><div class='ctx'> 	{</div><div class='ctx'> 		ssize_t res = snd_pcm_oss_read1(substream, buf, count);</div><div class='del'>-		printk(KERN_DEBUG "pcm_oss: read %li bytes "</div><div class='del'>-		       "(returned %li bytes)\n", (long)count, (long)res);</div><div class='add'>+		pcm_dbg(substream-&gt;pcm,</div><div class='add'>+			"pcm_oss: read %li bytes (returned %li bytes)\n",</div><div class='add'>+			(long)count, (long)res);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2676,7 +2793,7 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size</div><div class='ctx'> 	substream-&gt;f_flags = file-&gt;f_flags &amp; O_NONBLOCK;</div><div class='ctx'> 	result = snd_pcm_oss_write1(substream, buf, count);</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: write %li bytes (wrote %li bytes)\n",</div><div class='add'>+	pcm_dbg(substream-&gt;pcm, "pcm_oss: write %li bytes (wrote %li bytes)\n",</div><div class='ctx'> 	       (long)count, (long)result);</div><div class='ctx'> #endif</div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -2704,10 +2821,10 @@ static int snd_pcm_oss_capture_ready(struct snd_pcm_substream *substream)</div><div class='ctx'> 						runtime-&gt;oss.period_frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_pcm_oss_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_pcm_oss_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_oss_file *pcm_oss_file;</div><div class='del'>-	unsigned int mask;</div><div class='add'>+	__poll_t mask;</div><div class='ctx'> 	struct snd_pcm_substream *psubstream = NULL, *csubstream = NULL;</div><div class='ctx'> 	</div><div class='ctx'> 	pcm_oss_file = file-&gt;private_data;</div><div class='hunk'>@@ -2719,22 +2836,23 @@ static unsigned int snd_pcm_oss_poll(struct file *file, poll_table * wait)</div><div class='ctx'> 	if (psubstream != NULL) {</div><div class='ctx'> 		struct snd_pcm_runtime *runtime = psubstream-&gt;runtime;</div><div class='ctx'> 		poll_wait(file, &amp;runtime-&gt;sleep, wait);</div><div class='del'>-		snd_pcm_stream_lock_irq(psubstream);</div><div class='del'>-		if (runtime-&gt;status-&gt;state != SNDRV_PCM_STATE_DRAINING &amp;&amp;</div><div class='del'>-		    (runtime-&gt;status-&gt;state != SNDRV_PCM_STATE_RUNNING ||</div><div class='del'>-		     snd_pcm_oss_playback_ready(psubstream)))</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-		snd_pcm_stream_unlock_irq(psubstream);</div><div class='add'>+		scoped_guard(pcm_stream_lock_irq, psubstream) {</div><div class='add'>+			if (runtime-&gt;state != SNDRV_PCM_STATE_DRAINING &amp;&amp;</div><div class='add'>+			    (runtime-&gt;state != SNDRV_PCM_STATE_RUNNING ||</div><div class='add'>+			     snd_pcm_oss_playback_ready(psubstream)))</div><div class='add'>+				mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (csubstream != NULL) {</div><div class='ctx'> 		struct snd_pcm_runtime *runtime = csubstream-&gt;runtime;</div><div class='ctx'> 		snd_pcm_state_t ostate;</div><div class='ctx'> 		poll_wait(file, &amp;runtime-&gt;sleep, wait);</div><div class='del'>-		snd_pcm_stream_lock_irq(csubstream);</div><div class='del'>-		if ((ostate = runtime-&gt;status-&gt;state) != SNDRV_PCM_STATE_RUNNING ||</div><div class='del'>-		    snd_pcm_oss_capture_ready(csubstream))</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='del'>-		snd_pcm_stream_unlock_irq(csubstream);</div><div class='add'>+		scoped_guard(pcm_stream_lock_irq, csubstream) {</div><div class='add'>+			ostate = runtime-&gt;state;</div><div class='add'>+			if (ostate != SNDRV_PCM_STATE_RUNNING ||</div><div class='add'>+			    snd_pcm_oss_capture_ready(csubstream))</div><div class='add'>+				mask |= EPOLLIN | EPOLLRDNORM;</div><div class='add'>+		}</div><div class='ctx'> 		if (ostate != SNDRV_PCM_STATE_RUNNING &amp;&amp; runtime-&gt;oss.trigger) {</div><div class='ctx'> 			struct snd_pcm_oss_file ofile;</div><div class='ctx'> 			memset(&amp;ofile, 0, sizeof(ofile));</div><div class='hunk'>@@ -2755,7 +2873,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: mmap begin\n");</div><div class='add'>+	pr_debug("pcm_oss: mmap begin\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	pcm_oss_file = file-&gt;private_data;</div><div class='ctx'> 	switch ((area-&gt;vm_flags &amp; (VM_READ | VM_WRITE))) {</div><div class='hunk'>@@ -2763,7 +2881,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 		substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='ctx'> 		if (substream)</div><div class='ctx'> 			break;</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case VM_READ:</div><div class='ctx'> 		substream = pcm_oss_file-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2775,7 +2893,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set VM_READ access as well to fix memset() routines that do</div><div class='ctx'> 	   reads before writes (to improve performance) */</div><div class='del'>-	area-&gt;vm_flags |= VM_READ;</div><div class='add'>+	vm_flags_set(area, VM_READ);</div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='hunk'>@@ -2787,7 +2905,12 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	</div><div class='ctx'> 	if (runtime-&gt;oss.params) {</div><div class='del'>-		if ((err = snd_pcm_oss_change_params(substream)) &lt; 0)</div><div class='add'>+		/* use mutex_trylock() for params_lock for avoiding a deadlock</div><div class='add'>+		 * between mmap_lock and params_lock taken by</div><div class='add'>+		 * copy_from/to_user() in snd_pcm_oss_write/read()</div><div class='add'>+		 */</div><div class='add'>+		err = snd_pcm_oss_change_params(substream, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='hunk'>@@ -2805,7 +2928,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 	runtime-&gt;silence_threshold = 0;</div><div class='ctx'> 	runtime-&gt;silence_size = 0;</div><div class='ctx'> #ifdef OSS_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "pcm_oss: mmap ok, bytes = 0x%x\n",</div><div class='add'>+	pr_debug("pcm_oss: mmap ok, bytes = 0x%x\n",</div><div class='ctx'> 	       runtime-&gt;oss.mmap_bytes);</div><div class='ctx'> #endif</div><div class='ctx'> 	/* In mmap mode we never stop */</div><div class='hunk'>@@ -2824,7 +2947,7 @@ static void snd_pcm_oss_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_str *pstr = entry-&gt;private_data;</div><div class='ctx'> 	struct snd_pcm_oss_setup *setup = pstr-&gt;oss.setup_list;</div><div class='del'>-	mutex_lock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='add'>+	guard(mutex)(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 	while (setup) {</div><div class='ctx'> 		snd_iprintf(buffer, "%s %u %u%s%s%s%s%s%s\n",</div><div class='ctx'> 			    setup-&gt;task_name,</div><div class='hunk'>@@ -2838,7 +2961,6 @@ static void snd_pcm_oss_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 			    setup-&gt;nosilence ? " no-silence" : "");</div><div class='ctx'> 		setup = setup-&gt;next;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_pcm_oss_proc_free_setup_list(struct snd_pcm_str * pstr)</div><div class='hunk'>@@ -2864,12 +2986,11 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_pcm_oss_setup *setup, *setup1, template;</div><div class='ctx'> </div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='del'>-		mutex_lock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='add'>+		guard(mutex)(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 		memset(&amp;template, 0, sizeof(template));</div><div class='ctx'> 		ptr = snd_info_get_str(task_name, line, sizeof(task_name));</div><div class='ctx'> 		if (!strcmp(task_name, "clear") || !strcmp(task_name, "erase")) {</div><div class='ctx'> 			snd_pcm_oss_proc_free_setup_list(pstr);</div><div class='del'>-			mutex_unlock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (setup = pstr-&gt;oss.setup_list; setup; setup = setup-&gt;next) {</div><div class='hunk'>@@ -2909,7 +3030,6 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 			setup = kmalloc(sizeof(*setup), GFP_KERNEL);</div><div class='ctx'> 			if (! setup) {</div><div class='ctx'> 				buffer-&gt;error = -ENOMEM;</div><div class='del'>-				mutex_unlock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (pstr-&gt;oss.setup_list == NULL)</div><div class='hunk'>@@ -2923,12 +3043,10 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 			if (! template.task_name) {</div><div class='ctx'> 				kfree(setup);</div><div class='ctx'> 				buffer-&gt;error = -ENOMEM;</div><div class='del'>-				mutex_unlock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		*setup = template;</div><div class='del'>-		mutex_unlock(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2940,9 +3058,10 @@ static void snd_pcm_oss_proc_init(struct snd_pcm *pcm)</div><div class='ctx'> 		struct snd_pcm_str *pstr = &amp;pcm-&gt;streams[stream];</div><div class='ctx'> 		if (pstr-&gt;substream_count == 0)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((entry = snd_info_create_card_entry(pcm-&gt;card, "oss", pstr-&gt;proc_root)) != NULL) {</div><div class='add'>+		entry = snd_info_create_card_entry(pcm-&gt;card, "oss", pstr-&gt;proc_root);</div><div class='add'>+		if (entry) {</div><div class='ctx'> 			entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-			entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='add'>+			entry-&gt;mode = S_IFREG | 0644;</div><div class='ctx'> 			entry-&gt;c.text.read = snd_pcm_oss_proc_read;</div><div class='ctx'> 			entry-&gt;c.text.write = snd_pcm_oss_proc_write;</div><div class='ctx'> 			entry-&gt;private_data = pstr;</div><div class='hunk'>@@ -2966,8 +3085,12 @@ static void snd_pcm_oss_proc_done(struct snd_pcm *pcm)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else /* !CONFIG_SND_VERBOSE_PROCFS */</div><div class='del'>-#define snd_pcm_oss_proc_init(pcm)</div><div class='del'>-#define snd_pcm_oss_proc_done(pcm)</div><div class='add'>+static inline void snd_pcm_oss_proc_init(struct snd_pcm *pcm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void snd_pcm_oss_proc_done(struct snd_pcm *pcm)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SND_VERBOSE_PROCFS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2981,7 +3104,6 @@ static const struct file_operations snd_pcm_oss_f_reg =</div><div class='ctx'> 	.write =	snd_pcm_oss_write,</div><div class='ctx'> 	.open =		snd_pcm_oss_open,</div><div class='ctx'> 	.release =	snd_pcm_oss_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.poll =		snd_pcm_oss_poll,</div><div class='ctx'> 	.unlocked_ioctl =	snd_pcm_oss_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_pcm_oss_ioctl_compat,</div><div class='hunk'>@@ -2990,12 +3112,10 @@ static const struct file_operations snd_pcm_oss_f_reg =</div><div class='ctx'> </div><div class='ctx'> static void register_oss_dsp(struct snd_pcm *pcm, int index)</div><div class='ctx'> {</div><div class='del'>-	char name[128];</div><div class='del'>-	sprintf(name, "dsp%i%i", pcm-&gt;card-&gt;number, pcm-&gt;device);</div><div class='ctx'> 	if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,</div><div class='ctx'> 				    pcm-&gt;card, index, &amp;snd_pcm_oss_f_reg,</div><div class='del'>-				    pcm, name) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",</div><div class='add'>+				    pcm) &lt; 0) {</div><div class='add'>+		pcm_err(pcm, "unable to register OSS PCM device %i:%i\n",</div><div class='ctx'> 			   pcm-&gt;card-&gt;number, pcm-&gt;device);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3076,17 +3196,18 @@ static int __init alsa_pcm_oss_init(void)</div><div class='ctx'> 	/* check device map table */</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='ctx'> 		if (dsp_map[i] &lt; 0 || dsp_map[i] &gt;= SNDRV_PCM_DEVICES) {</div><div class='del'>-			snd_printk(KERN_ERR "invalid dsp_map[%d] = %d\n",</div><div class='add'>+			pr_err("ALSA: pcm_oss: invalid dsp_map[%d] = %d\n",</div><div class='ctx'> 				   i, dsp_map[i]);</div><div class='ctx'> 			dsp_map[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (adsp_map[i] &lt; 0 || adsp_map[i] &gt;= SNDRV_PCM_DEVICES) {</div><div class='del'>-			snd_printk(KERN_ERR "invalid adsp_map[%d] = %d\n",</div><div class='add'>+			pr_err("ALSA: pcm_oss: invalid adsp_map[%d] = %d\n",</div><div class='ctx'> 				   i, adsp_map[i]);</div><div class='ctx'> 			adsp_map[i] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_notify(&amp;snd_pcm_oss_notify, 0)) &lt; 0)</div><div class='add'>+	err = snd_pcm_notify(&amp;snd_pcm_oss_notify, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c<br/>index 6751daa3bb50..82e180c776ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_plugin.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_plugin.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_plugin.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/pcm_plugin.c</a></div><div class='hunk'>@@ -59,15 +59,19 @@ static int snd_pcm_plugin_alloc(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t</div><div class='ctx'> 	} else {</div><div class='ctx'> 		format = &amp;plugin-&gt;dst_format;</div><div class='ctx'> 	}</div><div class='del'>-	if ((width = snd_pcm_format_physical_width(format-&gt;format)) &lt; 0)</div><div class='add'>+	width = snd_pcm_format_physical_width(format-&gt;format);</div><div class='add'>+	if (width &lt; 0)</div><div class='ctx'> 		return width;</div><div class='del'>-	size = frames * format-&gt;channels * width;</div><div class='add'>+	size = array3_size(frames, format-&gt;channels, width);</div><div class='add'>+	/* check for too large period size once again */</div><div class='add'>+	if (size &gt; 1024 * 1024)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	if (snd_BUG_ON(size % 8))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	size /= 8;</div><div class='ctx'> 	if (plugin-&gt;buf_frames &lt; frames) {</div><div class='del'>-		vfree(plugin-&gt;buf);</div><div class='del'>-		plugin-&gt;buf = vmalloc(size);</div><div class='add'>+		kvfree(plugin-&gt;buf);</div><div class='add'>+		plugin-&gt;buf = kvzalloc(size, GFP_KERNEL);</div><div class='ctx'> 		plugin-&gt;buf_frames = frames;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!plugin-&gt;buf) {</div><div class='hunk'>@@ -111,7 +115,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)</div><div class='ctx'> 		while (plugin-&gt;next) {</div><div class='ctx'> 			if (plugin-&gt;dst_frames)</div><div class='ctx'> 				frames = plugin-&gt;dst_frames(plugin, frames);</div><div class='del'>-			if (snd_BUG_ON(frames &lt;= 0))</div><div class='add'>+			if ((snd_pcm_sframes_t)frames &lt;= 0)</div><div class='ctx'> 				return -ENXIO;</div><div class='ctx'> 			plugin = plugin-&gt;next;</div><div class='ctx'> 			err = snd_pcm_plugin_alloc(plugin, frames);</div><div class='hunk'>@@ -123,7 +127,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)</div><div class='ctx'> 		while (plugin-&gt;prev) {</div><div class='ctx'> 			if (plugin-&gt;src_frames)</div><div class='ctx'> 				frames = plugin-&gt;src_frames(plugin, frames);</div><div class='del'>-			if (snd_BUG_ON(frames &lt;= 0))</div><div class='add'>+			if ((snd_pcm_sframes_t)frames &lt;= 0)</div><div class='ctx'> 				return -ENXIO;</div><div class='ctx'> 			plugin = plugin-&gt;prev;</div><div class='ctx'> 			err = snd_pcm_plugin_alloc(plugin, frames);</div><div class='hunk'>@@ -191,80 +195,87 @@ int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin)</div><div class='ctx'> 	if (plugin-&gt;private_free)</div><div class='ctx'> 		plugin-&gt;private_free(plugin);</div><div class='ctx'> 	kfree(plugin-&gt;buf_channels);</div><div class='del'>-	vfree(plugin-&gt;buf);</div><div class='add'>+	kvfree(plugin-&gt;buf);</div><div class='ctx'> 	kfree(plugin);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pcm_uframes_t drv_frames)</div><div class='add'>+static snd_pcm_sframes_t calc_dst_frames(struct snd_pcm_substream *plug,</div><div class='add'>+					 snd_pcm_sframes_t frames,</div><div class='add'>+					 bool check_size)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;</div><div class='del'>-	int stream = snd_pcm_plug_stream(plug);</div><div class='add'>+	struct snd_pcm_plugin *plugin, *plugin_next;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!plug))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (drv_frames == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		plugin = snd_pcm_plug_last(plug);</div><div class='del'>-		while (plugin &amp;&amp; drv_frames &gt; 0) {</div><div class='del'>-			plugin_prev = plugin-&gt;prev;</div><div class='del'>-			if (plugin-&gt;src_frames)</div><div class='del'>-				drv_frames = plugin-&gt;src_frames(plugin, drv_frames);</div><div class='del'>-			plugin = plugin_prev;</div><div class='add'>+	plugin = snd_pcm_plug_first(plug);</div><div class='add'>+	while (plugin &amp;&amp; frames &gt; 0) {</div><div class='add'>+		plugin_next = plugin-&gt;next;</div><div class='add'>+		if (check_size &amp;&amp; plugin-&gt;buf_frames &amp;&amp;</div><div class='add'>+		    frames &gt; plugin-&gt;buf_frames)</div><div class='add'>+			frames = plugin-&gt;buf_frames;</div><div class='add'>+		if (plugin-&gt;dst_frames) {</div><div class='add'>+			frames = plugin-&gt;dst_frames(plugin, frames);</div><div class='add'>+			if (frames &lt; 0)</div><div class='add'>+				return frames;</div><div class='ctx'> 		}</div><div class='del'>-	} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='del'>-		plugin = snd_pcm_plug_first(plug);</div><div class='del'>-		while (plugin &amp;&amp; drv_frames &gt; 0) {</div><div class='del'>-			plugin_next = plugin-&gt;next;</div><div class='del'>-			if (plugin-&gt;dst_frames)</div><div class='del'>-				drv_frames = plugin-&gt;dst_frames(plugin, drv_frames);</div><div class='del'>-			plugin = plugin_next;</div><div class='add'>+		plugin = plugin_next;</div><div class='add'>+	}</div><div class='add'>+	return frames;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_sframes_t calc_src_frames(struct snd_pcm_substream *plug,</div><div class='add'>+					 snd_pcm_sframes_t frames,</div><div class='add'>+					 bool check_size)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_plugin *plugin, *plugin_prev;</div><div class='add'>+</div><div class='add'>+	plugin = snd_pcm_plug_last(plug);</div><div class='add'>+	while (plugin &amp;&amp; frames &gt; 0) {</div><div class='add'>+		plugin_prev = plugin-&gt;prev;</div><div class='add'>+		if (plugin-&gt;src_frames) {</div><div class='add'>+			frames = plugin-&gt;src_frames(plugin, frames);</div><div class='add'>+			if (frames &lt; 0)</div><div class='add'>+				return frames;</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='add'>+		if (check_size &amp;&amp; plugin-&gt;buf_frames &amp;&amp;</div><div class='add'>+		    frames &gt; plugin-&gt;buf_frames)</div><div class='add'>+			frames = plugin-&gt;buf_frames;</div><div class='add'>+		plugin = plugin_prev;</div><div class='add'>+	}</div><div class='add'>+	return frames;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pcm_uframes_t drv_frames)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!plug))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	switch (snd_pcm_plug_stream(plug)) {</div><div class='add'>+	case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='add'>+		return calc_src_frames(plug, drv_frames, false);</div><div class='add'>+	case SNDRV_PCM_STREAM_CAPTURE:</div><div class='add'>+		return calc_dst_frames(plug, drv_frames, false);</div><div class='add'>+	default:</div><div class='ctx'> 		snd_BUG();</div><div class='del'>-	return drv_frames;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pcm_uframes_t clt_frames)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next;</div><div class='del'>-	snd_pcm_sframes_t frames;</div><div class='del'>-	int stream = snd_pcm_plug_stream(plug);</div><div class='del'>-	</div><div class='ctx'> 	if (snd_BUG_ON(!plug))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	if (clt_frames == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	frames = clt_frames;</div><div class='del'>-	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		plugin = snd_pcm_plug_first(plug);</div><div class='del'>-		while (plugin &amp;&amp; frames &gt; 0) {</div><div class='del'>-			plugin_next = plugin-&gt;next;</div><div class='del'>-			if (plugin-&gt;dst_frames) {</div><div class='del'>-				frames = plugin-&gt;dst_frames(plugin, frames);</div><div class='del'>-				if (frames &lt; 0)</div><div class='del'>-					return frames;</div><div class='del'>-			}</div><div class='del'>-			plugin = plugin_next;</div><div class='del'>-		}</div><div class='del'>-	} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='del'>-		plugin = snd_pcm_plug_last(plug);</div><div class='del'>-		while (plugin) {</div><div class='del'>-			plugin_prev = plugin-&gt;prev;</div><div class='del'>-			if (plugin-&gt;src_frames) {</div><div class='del'>-				frames = plugin-&gt;src_frames(plugin, frames);</div><div class='del'>-				if (frames &lt; 0)</div><div class='del'>-					return frames;</div><div class='del'>-			}</div><div class='del'>-			plugin = plugin_prev;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='add'>+	switch (snd_pcm_plug_stream(plug)) {</div><div class='add'>+	case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='add'>+		return calc_dst_frames(plug, clt_frames, false);</div><div class='add'>+	case SNDRV_PCM_STREAM_CAPTURE:</div><div class='add'>+		return calc_src_frames(plug, clt_frames, false);</div><div class='add'>+	default:</div><div class='ctx'> 		snd_BUG();</div><div class='del'>-	return frames;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_plug_formats(struct snd_mask *mask, int format)</div><div class='add'>+static int snd_pcm_plug_formats(const struct snd_mask *mask,</div><div class='add'>+				snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_mask formats = *mask;</div><div class='ctx'> 	u64 linfmts = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |</div><div class='hunk'>@@ -276,16 +287,16 @@ static int snd_pcm_plug_formats(struct snd_mask *mask, int format)</div><div class='ctx'> 		       SNDRV_PCM_FMTBIT_U24_3BE | SNDRV_PCM_FMTBIT_S24_3BE |</div><div class='ctx'> 		       SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |</div><div class='ctx'> 		       SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE);</div><div class='del'>-	snd_mask_set(&amp;formats, SNDRV_PCM_FORMAT_MU_LAW);</div><div class='add'>+	snd_mask_set(&amp;formats, (__force int)SNDRV_PCM_FORMAT_MU_LAW);</div><div class='ctx'> 	</div><div class='del'>-	if (formats.bits[0] &amp; (u32)linfmts)</div><div class='del'>-		formats.bits[0] |= (u32)linfmts;</div><div class='del'>-	if (formats.bits[1] &amp; (u32)(linfmts &gt;&gt; 32))</div><div class='del'>-		formats.bits[1] |= (u32)(linfmts &gt;&gt; 32);</div><div class='del'>-	return snd_mask_test(&amp;formats, format);</div><div class='add'>+	if (formats.bits[0] &amp; lower_32_bits(linfmts))</div><div class='add'>+		formats.bits[0] |= lower_32_bits(linfmts);</div><div class='add'>+	if (formats.bits[1] &amp; upper_32_bits(linfmts))</div><div class='add'>+		formats.bits[1] |= upper_32_bits(linfmts);</div><div class='add'>+	return snd_mask_test(&amp;formats, (__force int)format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int preferred_formats[] = {</div><div class='add'>+static const snd_pcm_format_t preferred_formats[] = {</div><div class='ctx'> 	SNDRV_PCM_FORMAT_S16_LE,</div><div class='ctx'> 	SNDRV_PCM_FORMAT_S16_BE,</div><div class='ctx'> 	SNDRV_PCM_FORMAT_U16_LE,</div><div class='hunk'>@@ -306,24 +317,25 @@ static int preferred_formats[] = {</div><div class='ctx'> 	SNDRV_PCM_FORMAT_U8</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask)</div><div class='add'>+snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format,</div><div class='add'>+					   const struct snd_mask *format_mask)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (snd_mask_test(format_mask, format))</div><div class='add'>+	if (snd_mask_test(format_mask, (__force int)format))</div><div class='ctx'> 		return format;</div><div class='del'>-	if (! snd_pcm_plug_formats(format_mask, format))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!snd_pcm_plug_formats(format_mask, format))</div><div class='add'>+		return (__force snd_pcm_format_t)-EINVAL;</div><div class='ctx'> 	if (snd_pcm_format_linear(format)) {</div><div class='ctx'> 		unsigned int width = snd_pcm_format_width(format);</div><div class='ctx'> 		int unsignd = snd_pcm_format_unsigned(format) &gt; 0;</div><div class='ctx'> 		int big = snd_pcm_format_big_endian(format) &gt; 0;</div><div class='ctx'> 		unsigned int badness, best = -1;</div><div class='del'>-		int best_format = -1;</div><div class='add'>+		snd_pcm_format_t best_format = (__force snd_pcm_format_t)-1;</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(preferred_formats); i++) {</div><div class='del'>-			int f = preferred_formats[i];</div><div class='add'>+			snd_pcm_format_t f = preferred_formats[i];</div><div class='ctx'> 			unsigned int w;</div><div class='del'>-			if (!snd_mask_test(format_mask, f))</div><div class='add'>+			if (!snd_mask_test(format_mask, (__force int)f))</div><div class='ctx'> 				continue;</div><div class='ctx'> 			w = snd_pcm_format_width(f);</div><div class='ctx'> 			if (w &gt;= width)</div><div class='hunk'>@@ -337,17 +349,21 @@ int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask)</div><div class='ctx'> 				best = badness;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		return best_format &gt;= 0 ? best_format : -EINVAL;</div><div class='add'>+		if ((__force int)best_format &gt;= 0)</div><div class='add'>+			return best_format;</div><div class='add'>+		else</div><div class='add'>+			return (__force snd_pcm_format_t)-EINVAL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		switch (format) {</div><div class='ctx'> 		case SNDRV_PCM_FORMAT_MU_LAW:</div><div class='ctx'> 			for (i = 0; i &lt; ARRAY_SIZE(preferred_formats); ++i) {</div><div class='del'>-				int format1 = preferred_formats[i];</div><div class='del'>-				if (snd_mask_test(format_mask, format1))</div><div class='add'>+				snd_pcm_format_t format1 = preferred_formats[i];</div><div class='add'>+				if (snd_mask_test(format_mask, (__force int)format1))</div><div class='ctx'> 					return format1;</div><div class='ctx'> 			}</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		default:</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return (__force snd_pcm_format_t)-EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -359,7 +375,7 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug,</div><div class='ctx'> 	struct snd_pcm_plugin_format tmpformat;</div><div class='ctx'> 	struct snd_pcm_plugin_format dstformat;</div><div class='ctx'> 	struct snd_pcm_plugin_format srcformat;</div><div class='del'>-	int src_access, dst_access;</div><div class='add'>+	snd_pcm_access_t src_access, dst_access;</div><div class='ctx'> 	struct snd_pcm_plugin *plugin = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int stream = snd_pcm_plug_stream(plug);</div><div class='hunk'>@@ -560,7 +576,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_channels_buf(struct snd_pcm_substream *plu</div><div class='ctx'> 	}</div><div class='ctx'> 	v = plugin-&gt;buf_channels;</div><div class='ctx'> 	*channels = v;</div><div class='del'>-	if ((width = snd_pcm_format_physical_width(format-&gt;format)) &lt; 0)</div><div class='add'>+	width = snd_pcm_format_physical_width(format-&gt;format);</div><div class='add'>+	if (width &lt; 0)</div><div class='ctx'> 		return width;</div><div class='ctx'> 	nchannels = format-&gt;channels;</div><div class='ctx'> 	if (snd_BUG_ON(plugin-&gt;access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &amp;&amp;</div><div class='hunk'>@@ -585,28 +602,38 @@ snd_pcm_sframes_t snd_pcm_plug_write_transfer(struct snd_pcm_substream *plug, st</div><div class='ctx'> 	snd_pcm_sframes_t frames = size;</div><div class='ctx'> </div><div class='ctx'> 	plugin = snd_pcm_plug_first(plug);</div><div class='del'>-	while (plugin &amp;&amp; frames &gt; 0) {</div><div class='del'>-		if ((next = plugin-&gt;next) != NULL) {</div><div class='add'>+	while (plugin) {</div><div class='add'>+		if (frames &lt;= 0)</div><div class='add'>+			return frames;</div><div class='add'>+		next = plugin-&gt;next;</div><div class='add'>+		if (next) {</div><div class='ctx'> 			snd_pcm_sframes_t frames1 = frames;</div><div class='del'>-			if (plugin-&gt;dst_frames)</div><div class='add'>+			if (plugin-&gt;dst_frames) {</div><div class='ctx'> 				frames1 = plugin-&gt;dst_frames(plugin, frames);</div><div class='del'>-			if ((err = next-&gt;client_channels(next, frames1, &amp;dst_channels)) &lt; 0) {</div><div class='del'>-				return err;</div><div class='add'>+				if (frames1 &lt;= 0)</div><div class='add'>+					return frames1;</div><div class='ctx'> 			}</div><div class='add'>+			err = next-&gt;client_channels(next, frames1, &amp;dst_channels);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 			if (err != frames1) {</div><div class='ctx'> 				frames = err;</div><div class='del'>-				if (plugin-&gt;src_frames)</div><div class='add'>+				if (plugin-&gt;src_frames) {</div><div class='ctx'> 					frames = plugin-&gt;src_frames(plugin, frames1);</div><div class='add'>+					if (frames &lt;= 0)</div><div class='add'>+						return frames;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			dst_channels = NULL;</div><div class='ctx'> 		pdprintf("write plugin: %s, %li\n", plugin-&gt;name, frames);</div><div class='del'>-		if ((frames = plugin-&gt;transfer(plugin, src_channels, dst_channels, frames)) &lt; 0)</div><div class='add'>+		frames = plugin-&gt;transfer(plugin, src_channels, dst_channels, frames);</div><div class='add'>+		if (frames &lt; 0)</div><div class='ctx'> 			return frames;</div><div class='ctx'> 		src_channels = dst_channels;</div><div class='ctx'> 		plugin = next;</div><div class='ctx'> 	}</div><div class='del'>-	return snd_pcm_plug_client_size(plug, frames);</div><div class='add'>+	return calc_src_frames(plug, frames, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> snd_pcm_sframes_t snd_pcm_plug_read_transfer(struct snd_pcm_substream *plug, struct snd_pcm_plugin_channel *dst_channels_final, snd_pcm_uframes_t size)</div><div class='hunk'>@@ -616,23 +643,25 @@ snd_pcm_sframes_t snd_pcm_plug_read_transfer(struct snd_pcm_substream *plug, str</div><div class='ctx'> 	snd_pcm_sframes_t frames = size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	frames = snd_pcm_plug_slave_size(plug, frames);</div><div class='add'>+	frames = calc_src_frames(plug, frames, true);</div><div class='ctx'> 	if (frames &lt; 0)</div><div class='ctx'> 		return frames;</div><div class='ctx'> </div><div class='ctx'> 	src_channels = NULL;</div><div class='ctx'> 	plugin = snd_pcm_plug_first(plug);</div><div class='ctx'> 	while (plugin &amp;&amp; frames &gt; 0) {</div><div class='del'>-		if ((next = plugin-&gt;next) != NULL) {</div><div class='del'>-			if ((err = plugin-&gt;client_channels(plugin, frames, &amp;dst_channels)) &lt; 0) {</div><div class='add'>+		next = plugin-&gt;next;</div><div class='add'>+		if (next) {</div><div class='add'>+			err = plugin-&gt;client_channels(plugin, frames, &amp;dst_channels);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-			}</div><div class='ctx'> 			frames = err;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			dst_channels = dst_channels_final;</div><div class='ctx'> 		}</div><div class='ctx'> 		pdprintf("read plugin: %s, %li\n", plugin-&gt;name, frames);</div><div class='del'>-		if ((frames = plugin-&gt;transfer(plugin, src_channels, dst_channels, frames)) &lt; 0)</div><div class='add'>+		frames = plugin-&gt;transfer(plugin, src_channels, dst_channels, frames);</div><div class='add'>+		if (frames &lt; 0)</div><div class='ctx'> 			return frames;</div><div class='ctx'> 		plugin = next;</div><div class='ctx'> 		src_channels = dst_channels;</div><div class='hunk'>@@ -641,7 +670,7 @@ snd_pcm_sframes_t snd_pcm_plug_read_transfer(struct snd_pcm_substream *plug, str</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_area, size_t dst_offset,</div><div class='del'>-			 size_t samples, int format)</div><div class='add'>+			 size_t samples, snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: sub byte resolution and odd dst_offset */</div><div class='ctx'> 	unsigned char *dst;</div><div class='hunk'>@@ -688,7 +717,7 @@ int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_area, size_t dst</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_area, size_t src_offset,</div><div class='ctx'> 		      const struct snd_pcm_channel_area *dst_area, size_t dst_offset,</div><div class='del'>-		      size_t samples, int format)</div><div class='add'>+		      size_t samples, snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: sub byte resolution and odd dst_offset */</div><div class='ctx'> 	char *src, *dst;</div><div class='head'>diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h<br/>index b9afab603711..7b76cf64157e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_plugin.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/pcm_plugin.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/pcm_plugin.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/pcm_plugin.h</a></div><div class='hunk'>@@ -1,25 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __PCM_PLUGIN_H</div><div class='ctx'> #define __PCM_PLUGIN_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (Plugin interface) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_PCM_OSS_PLUGINS</div><div class='hunk'>@@ -46,7 +31,7 @@ struct snd_pcm_plugin_channel {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct snd_pcm_plugin_format {</div><div class='del'>-	int format;</div><div class='add'>+	snd_pcm_format_t format;</div><div class='ctx'> 	unsigned int rate;</div><div class='ctx'> 	unsigned int channels;</div><div class='ctx'> };</div><div class='hunk'>@@ -58,7 +43,7 @@ struct snd_pcm_plugin {</div><div class='ctx'> 	struct snd_pcm_plugin_format dst_format;	/* destination format */</div><div class='ctx'> 	int src_width;			/* sample width in bits */</div><div class='ctx'> 	int dst_width;			/* sample width in bits */</div><div class='del'>-	int access;</div><div class='add'>+	snd_pcm_access_t access;</div><div class='ctx'> 	snd_pcm_sframes_t (*src_frames)(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t dst_frames);</div><div class='ctx'> 	snd_pcm_sframes_t (*dst_frames)(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t src_frames);</div><div class='ctx'> 	snd_pcm_sframes_t (*client_channels)(struct snd_pcm_plugin *plugin,</div><div class='hunk'>@@ -79,7 +64,7 @@ struct snd_pcm_plugin {</div><div class='ctx'> 	char *buf;</div><div class='ctx'> 	snd_pcm_uframes_t buf_frames;</div><div class='ctx'> 	struct snd_pcm_plugin_channel *buf_channels;</div><div class='del'>-	char extra_data[0];</div><div class='add'>+	char extra_data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_plugin_build(struct snd_pcm_substream *handle,</div><div class='hunk'>@@ -89,7 +74,6 @@ int snd_pcm_plugin_build(struct snd_pcm_substream *handle,</div><div class='ctx'>                          size_t extra,</div><div class='ctx'>                          struct snd_pcm_plugin **ret);</div><div class='ctx'> int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin);</div><div class='del'>-int snd_pcm_plugin_clear(struct snd_pcm_plugin **first);</div><div class='ctx'> int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size);</div><div class='hunk'>@@ -125,7 +109,8 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *substream,</div><div class='ctx'> 				struct snd_pcm_hw_params *params,</div><div class='ctx'> 				struct snd_pcm_hw_params *slave_params);</div><div class='ctx'> </div><div class='del'>-int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask);</div><div class='add'>+snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format,</div><div class='add'>+					   const struct snd_mask *format_mask);</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_plugin_append(struct snd_pcm_plugin *plugin);</div><div class='ctx'> </div><div class='hunk'>@@ -146,37 +131,33 @@ snd_pcm_sframes_t snd_pcm_plugin_client_channels(struct snd_pcm_plugin *plugin,</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_channel,</div><div class='ctx'> 			 size_t dst_offset,</div><div class='del'>-			 size_t samples, int format);</div><div class='add'>+			 size_t samples, snd_pcm_format_t format);</div><div class='ctx'> int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_channel,</div><div class='ctx'> 		      size_t src_offset,</div><div class='ctx'> 		      const struct snd_pcm_channel_area *dst_channel,</div><div class='ctx'> 		      size_t dst_offset,</div><div class='del'>-		      size_t samples, int format);</div><div class='add'>+		      size_t samples, snd_pcm_format_t format);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; }</div><div class='add'>+static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; }</div><div class='add'>+static inline int snd_pcm_plug_slave_format(int format, const struct snd_mask *format_mask) { return format; }</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-void *snd_pcm_plug_buf_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t size);</div><div class='del'>-void snd_pcm_plug_buf_unlock(struct snd_pcm_substream *plug, void *ptr);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream,</div><div class='ctx'> 				     const char *ptr, snd_pcm_uframes_t size,</div><div class='ctx'> 				     int in_kernel);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream,</div><div class='ctx'> 				    char *ptr, snd_pcm_uframes_t size, int in_kernel);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream,</div><div class='del'>-				      void **bufs, snd_pcm_uframes_t frames,</div><div class='del'>-				      int in_kernel);</div><div class='add'>+				      void **bufs, snd_pcm_uframes_t frames);</div><div class='ctx'> snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream,</div><div class='del'>-				     void **bufs, snd_pcm_uframes_t frames,</div><div class='del'>-				     int in_kernel);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; }</div><div class='del'>-static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; }</div><div class='del'>-static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask) { return format; }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+				     void **bufs, snd_pcm_uframes_t frames);</div><div class='ctx'> </div><div class='ctx'> #ifdef PLUGIN_DEBUG</div><div class='del'>-#define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args)</div><div class='add'>+#define pdprintf(fmt, args...) pr_debug("plugin: " fmt, ##args)</div><div class='ctx'> #else</div><div class='ctx'> #define pdprintf(fmt, args...)</div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c<br/>index 2fa9299a440d..b56eeda5e30e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/rate.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/rate.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/rate.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/rate.c</a></div><div class='hunk'>@@ -47,7 +47,7 @@ struct rate_priv {</div><div class='ctx'> 	unsigned int pos;</div><div class='ctx'> 	rate_f func;</div><div class='ctx'> 	snd_pcm_sframes_t old_src_frames, old_dst_frames;</div><div class='del'>-	struct rate_channel channels[0];</div><div class='add'>+	struct rate_channel channels[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void rate_init(struct snd_pcm_plugin *plugin)</div><div class='hunk'>@@ -193,7 +193,7 @@ static snd_pcm_sframes_t rate_src_frames(struct snd_pcm_plugin *plugin, snd_pcm_</div><div class='ctx'> 	if (plugin-&gt;src_format.rate &lt; plugin-&gt;dst_format.rate) {</div><div class='ctx'> 		res = (((frames * data-&gt;pitch) + (BITS/2)) &gt;&gt; SHIFT);</div><div class='ctx'> 	} else {</div><div class='del'>-		res = (((frames &lt;&lt; SHIFT) + (data-&gt;pitch / 2)) / data-&gt;pitch);		</div><div class='add'>+		res = DIV_ROUND_CLOSEST(frames &lt;&lt; SHIFT, data-&gt;pitch);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (data-&gt;old_src_frames &gt; 0) {</div><div class='ctx'> 		snd_pcm_sframes_t frames1 = frames, res1 = data-&gt;old_dst_frames;</div><div class='hunk'>@@ -224,7 +224,7 @@ static snd_pcm_sframes_t rate_dst_frames(struct snd_pcm_plugin *plugin, snd_pcm_</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	data = (struct rate_priv *)plugin-&gt;extra_data;</div><div class='ctx'> 	if (plugin-&gt;src_format.rate &lt; plugin-&gt;dst_format.rate) {</div><div class='del'>-		res = (((frames &lt;&lt; SHIFT) + (data-&gt;pitch / 2)) / data-&gt;pitch);</div><div class='add'>+		res = DIV_ROUND_CLOSEST(frames &lt;&lt; SHIFT, data-&gt;pitch);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		res = (((frames * data-&gt;pitch) + (BITS/2)) &gt;&gt; SHIFT);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -294,7 +294,7 @@ static int rate_action(struct snd_pcm_plugin *plugin,</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;	/* silenty ignore other actions */</div><div class='add'>+	return 0;	/* silently ignore other actions */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,</div><div class='hunk'>@@ -323,8 +323,8 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_plugin_build(plug, "rate conversion",</div><div class='ctx'> 				   src_format, dst_format,</div><div class='del'>-				   sizeof(struct rate_priv) +</div><div class='del'>-				   src_format-&gt;channels * sizeof(struct rate_channel),</div><div class='add'>+				   struct_size(data, channels,</div><div class='add'>+					       src_format-&gt;channels),</div><div class='ctx'> 				   &amp;plugin);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c<br/>index bbe25d8c450a..72dea04197ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/oss/route.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/oss/route.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/oss/route.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/oss/route.c</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> #include "pcm_plugin.h"</div><div class='ctx'> </div><div class='ctx'> static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,</div><div class='del'>-		       snd_pcm_uframes_t frames, int format)</div><div class='add'>+		       snd_pcm_uframes_t frames, snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	int dst = 0;</div><div class='ctx'> 	for (; dst &lt; ndsts; ++dst) {</div><div class='hunk'>@@ -38,7 +38,7 @@ static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,</div><div class='ctx'> </div><div class='ctx'> static inline void copy_area(const struct snd_pcm_plugin_channel *src_channel,</div><div class='ctx'> 			     struct snd_pcm_plugin_channel *dst_channel,</div><div class='del'>-			     snd_pcm_uframes_t frames, int format)</div><div class='add'>+			     snd_pcm_uframes_t frames, snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	dst_channel-&gt;enabled = 1;</div><div class='ctx'> 	snd_pcm_area_copy(&amp;src_channel-&gt;area, 0, &amp;dst_channel-&gt;area, 0, frames, format);</div><div class='hunk'>@@ -51,12 +51,14 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin,</div><div class='ctx'> {</div><div class='ctx'> 	int nsrcs, ndsts, dst;</div><div class='ctx'> 	struct snd_pcm_plugin_channel *dvp;</div><div class='del'>-	int format;</div><div class='add'>+	snd_pcm_format_t format;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (frames == 0)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (frames &gt; dst_channels[0].frames)</div><div class='add'>+		frames = dst_channels[0].frames;</div><div class='ctx'> </div><div class='ctx'> 	nsrcs = plugin-&gt;src_format.channels;</div><div class='ctx'> 	ndsts = plugin-&gt;dst_format.channels;</div><div class='head'>diff --git a/sound/core/pcm.c b/sound/core/pcm.c<br/>index 6b4b1287b314..283aac441fa0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm.c</a></div><div class='hunk'>@@ -1,41 +1,34 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/timer.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pcm_local.h"</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;, Abramo Bagnara &lt;abramo@alsa-project.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Midlevel PCM code for ALSA.");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static LIST_HEAD(snd_pcm_devices);</div><div class='del'>-static LIST_HEAD(snd_pcm_notify_list);</div><div class='ctx'> static DEFINE_MUTEX(register_mutex);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='add'>+static LIST_HEAD(snd_pcm_notify_list);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_free(struct snd_pcm *pcm);</div><div class='ctx'> static int snd_pcm_dev_free(struct snd_device *device);</div><div class='hunk'>@@ -70,6 +63,9 @@ static int snd_pcm_add(struct snd_pcm *newpcm)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> </div><div class='add'>+	if (newpcm-&gt;internal)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(pcm, &amp;snd_pcm_devices, list) {</div><div class='ctx'> 		if (pcm-&gt;card == newpcm-&gt;card &amp;&amp; pcm-&gt;device == newpcm-&gt;device)</div><div class='ctx'> 			return -EBUSY;</div><div class='hunk'>@@ -95,9 +91,8 @@ static int snd_pcm_control_ioctl(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 			if (get_user(device, (int __user *)arg))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			mutex_lock(&amp;register_mutex);</div><div class='del'>-			device = snd_pcm_next(card, device);</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='add'>+			scoped_guard(mutex, &amp;register_mutex)</div><div class='add'>+				device = snd_pcm_next(card, device);</div><div class='ctx'> 			if (put_user(device, (int __user *)arg))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -110,7 +105,6 @@ static int snd_pcm_control_ioctl(struct snd_card *card,</div><div class='ctx'> 			struct snd_pcm *pcm;</div><div class='ctx'> 			struct snd_pcm_str *pstr;</div><div class='ctx'> 			struct snd_pcm_substream *substream;</div><div class='del'>-			int err;</div><div class='ctx'> </div><div class='ctx'> 			info = (struct snd_pcm_info __user *)arg;</div><div class='ctx'> 			if (get_user(device, &amp;info-&gt;device))</div><div class='hunk'>@@ -119,35 +113,26 @@ static int snd_pcm_control_ioctl(struct snd_card *card,</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> 			if (stream &lt; 0 || stream &gt; 1)</div><div class='ctx'> 				return -EINVAL;</div><div class='add'>+			stream = array_index_nospec(stream, 2);</div><div class='ctx'> 			if (get_user(subdevice, &amp;info-&gt;subdevice))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			mutex_lock(&amp;register_mutex);</div><div class='add'>+			guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 			pcm = snd_pcm_get(card, device);</div><div class='del'>-			if (pcm == NULL) {</div><div class='del'>-				err = -ENXIO;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='add'>+			if (pcm == NULL)</div><div class='add'>+				return -ENXIO;</div><div class='ctx'> 			pstr = &amp;pcm-&gt;streams[stream];</div><div class='del'>-			if (pstr-&gt;substream_count == 0) {</div><div class='del'>-				err = -ENOENT;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='del'>-			if (subdevice &gt;= pstr-&gt;substream_count) {</div><div class='del'>-				err = -ENXIO;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='add'>+			if (pstr-&gt;substream_count == 0)</div><div class='add'>+				return -ENOENT;</div><div class='add'>+			if (subdevice &gt;= pstr-&gt;substream_count)</div><div class='add'>+				return -ENXIO;</div><div class='ctx'> 			for (substream = pstr-&gt;substream; substream;</div><div class='ctx'> 			     substream = substream-&gt;next)</div><div class='ctx'> 				if (substream-&gt;number == (int)subdevice)</div><div class='ctx'> 					break;</div><div class='del'>-			if (substream == NULL) {</div><div class='del'>-				err = -ENXIO;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='del'>-			err = snd_pcm_info_user(substream, info);</div><div class='del'>-		_error:</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			return err;</div><div class='add'>+			if (substream == NULL)</div><div class='add'>+				return -ENXIO;</div><div class='add'>+			guard(mutex)(&amp;pcm-&gt;open_mutex);</div><div class='add'>+			return snd_pcm_info_user(substream, info);</div><div class='ctx'> 		}</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE:</div><div class='ctx'> 		{</div><div class='hunk'>@@ -155,7 +140,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,</div><div class='ctx'> 			</div><div class='ctx'> 			if (get_user(val, (int __user *)arg))</div><div class='ctx'> 				return -EFAULT;</div><div class='del'>-			control-&gt;prefer_pcm_subdevice = val;</div><div class='add'>+			control-&gt;preferred_subdevice[SND_CTL_SUBDEV_PCM] = val;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -164,7 +149,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> #define FORMAT(v) [SNDRV_PCM_FORMAT_##v] = #v</div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_format_names[] = {</div><div class='add'>+static const char * const snd_pcm_format_names[] = {</div><div class='ctx'> 	FORMAT(S8),</div><div class='ctx'> 	FORMAT(U8),</div><div class='ctx'> 	FORMAT(S16_LE),</div><div class='hunk'>@@ -207,13 +192,30 @@ static char *snd_pcm_format_names[] = {</div><div class='ctx'> 	FORMAT(G723_24_1B),</div><div class='ctx'> 	FORMAT(G723_40),</div><div class='ctx'> 	FORMAT(G723_40_1B),</div><div class='add'>+	FORMAT(DSD_U8),</div><div class='add'>+	FORMAT(DSD_U16_LE),</div><div class='add'>+	FORMAT(DSD_U32_LE),</div><div class='add'>+	FORMAT(DSD_U16_BE),</div><div class='add'>+	FORMAT(DSD_U32_BE),</div><div class='add'>+	FORMAT(S20_LE),</div><div class='add'>+	FORMAT(S20_BE),</div><div class='add'>+	FORMAT(U20_LE),</div><div class='add'>+	FORMAT(U20_BE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_format_name - Return a name string for the given PCM format</div><div class='add'>+ * @format: PCM format</div><div class='add'>+ *</div><div class='add'>+ * Return: the format name string</div><div class='add'>+ */</div><div class='ctx'> const char *snd_pcm_format_name(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='del'>-	if (format &gt;= ARRAY_SIZE(snd_pcm_format_names))</div><div class='add'>+	unsigned int format_num = (__force unsigned int)format;</div><div class='add'>+</div><div class='add'>+	if (format_num &gt;= ARRAY_SIZE(snd_pcm_format_names) || !snd_pcm_format_names[format_num])</div><div class='ctx'> 		return "Unknown";</div><div class='del'>-	return snd_pcm_format_names[format];</div><div class='add'>+	return snd_pcm_format_names[format_num];</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(snd_pcm_format_name);</div><div class='ctx'> </div><div class='hunk'>@@ -229,12 +231,12 @@ EXPORT_SYMBOL_GPL(snd_pcm_format_name);</div><div class='ctx'> #define START(v) [SNDRV_PCM_START_##v] = #v</div><div class='ctx'> #define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v </div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_stream_names[] = {</div><div class='add'>+static const char * const snd_pcm_stream_names[] = {</div><div class='ctx'> 	STREAM(PLAYBACK),</div><div class='ctx'> 	STREAM(CAPTURE),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_state_names[] = {</div><div class='add'>+static const char * const snd_pcm_state_names[] = {</div><div class='ctx'> 	STATE(OPEN),</div><div class='ctx'> 	STATE(SETUP),</div><div class='ctx'> 	STATE(PREPARED),</div><div class='hunk'>@@ -243,9 +245,10 @@ static char *snd_pcm_state_names[] = {</div><div class='ctx'> 	STATE(DRAINING),</div><div class='ctx'> 	STATE(PAUSED),</div><div class='ctx'> 	STATE(SUSPENDED),</div><div class='add'>+	STATE(DISCONNECTED),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_access_names[] = {</div><div class='add'>+static const char * const snd_pcm_access_names[] = {</div><div class='ctx'> 	ACCESS(MMAP_INTERLEAVED), </div><div class='ctx'> 	ACCESS(MMAP_NONINTERLEAVED),</div><div class='ctx'> 	ACCESS(MMAP_COMPLEX),</div><div class='hunk'>@@ -253,11 +256,14 @@ static char *snd_pcm_access_names[] = {</div><div class='ctx'> 	ACCESS(RW_NONINTERLEAVED),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_subformat_names[] = {</div><div class='add'>+static const char * const snd_pcm_subformat_names[] = {</div><div class='ctx'> 	SUBFORMAT(STD), </div><div class='add'>+	SUBFORMAT(MSBITS_MAX),</div><div class='add'>+	SUBFORMAT(MSBITS_20),</div><div class='add'>+	SUBFORMAT(MSBITS_24),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *snd_pcm_tstamp_mode_names[] = {</div><div class='add'>+static const char * const snd_pcm_tstamp_mode_names[] = {</div><div class='ctx'> 	TSTAMP(NONE),</div><div class='ctx'> 	TSTAMP(ENABLE),</div><div class='ctx'> };</div><div class='hunk'>@@ -269,12 +275,12 @@ static const char *snd_pcm_stream_name(int stream)</div><div class='ctx'> </div><div class='ctx'> static const char *snd_pcm_access_name(snd_pcm_access_t access)</div><div class='ctx'> {</div><div class='del'>-	return snd_pcm_access_names[access];</div><div class='add'>+	return snd_pcm_access_names[(__force int)access];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)</div><div class='ctx'> {</div><div class='del'>-	return snd_pcm_subformat_names[subformat];</div><div class='add'>+	return snd_pcm_subformat_names[(__force int)subformat];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *snd_pcm_tstamp_mode_name(int mode)</div><div class='hunk'>@@ -284,10 +290,10 @@ static const char *snd_pcm_tstamp_mode_name(int mode)</div><div class='ctx'> </div><div class='ctx'> static const char *snd_pcm_state_name(snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='del'>-	return snd_pcm_state_names[state];</div><div class='add'>+	return snd_pcm_state_names[(__force int)state];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='ctx'> #include &lt;linux/soundcard.h&gt;</div><div class='ctx'> </div><div class='ctx'> static const char *snd_pcm_oss_format_name(int format)</div><div class='hunk'>@@ -322,22 +328,19 @@ static const char *snd_pcm_oss_format_name(int format)</div><div class='ctx'> static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream,</div><div class='ctx'> 				   struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_info *info;</div><div class='add'>+	struct snd_pcm_info *info __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (! substream)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='del'>-	if (! info) {</div><div class='del'>-		printk(KERN_DEBUG "snd_pcm_proc_info_read: cannot malloc\n");</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_info(substream, info);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		snd_iprintf(buffer, "error %d\n", err);</div><div class='del'>-		kfree(info);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "card: %d\n", info-&gt;card);</div><div class='hunk'>@@ -351,7 +354,6 @@ static void snd_pcm_proc_info_read(struct snd_pcm_substream *substream,</div><div class='ctx'> 	snd_iprintf(buffer, "subclass: %d\n", info-&gt;dev_subclass);</div><div class='ctx'> 	snd_iprintf(buffer, "subdevices_count: %d\n", info-&gt;subdevices_count);</div><div class='ctx'> 	snd_iprintf(buffer, "subdevices_avail: %d\n", info-&gt;subdevices_avail);</div><div class='del'>-	kfree(info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_pcm_stream_proc_info_read(struct snd_info_entry *entry,</div><div class='hunk'>@@ -373,15 +375,15 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_pcm_substream *substream = entry-&gt;private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (!runtime) {</div><div class='ctx'> 		snd_iprintf(buffer, "closed\n");</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='ctx'> 		snd_iprintf(buffer, "no setup\n");</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "access: %s\n", snd_pcm_access_name(runtime-&gt;access));</div><div class='ctx'> 	snd_iprintf(buffer, "format: %s\n", snd_pcm_format_name(runtime-&gt;format));</div><div class='hunk'>@@ -390,7 +392,7 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, "rate: %u (%u/%u)\n", runtime-&gt;rate, runtime-&gt;rate_num, runtime-&gt;rate_den);	</div><div class='ctx'> 	snd_iprintf(buffer, "period_size: %lu\n", runtime-&gt;period_size);	</div><div class='ctx'> 	snd_iprintf(buffer, "buffer_size: %lu\n", runtime-&gt;buffer_size);	</div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='ctx'> 	if (substream-&gt;oss.oss) {</div><div class='ctx'> 		snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime-&gt;oss.format));</div><div class='ctx'> 		snd_iprintf(buffer, "OSS channels: %u\n", runtime-&gt;oss.channels);	</div><div class='hunk'>@@ -400,8 +402,6 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,</div><div class='ctx'> 		snd_iprintf(buffer, "OSS period frames: %lu\n", (unsigned long)runtime-&gt;oss.period_frames);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>- unlock:</div><div class='del'>-	mutex_unlock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,</div><div class='hunk'>@@ -410,15 +410,15 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_pcm_substream *substream = entry-&gt;private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (!runtime) {</div><div class='ctx'> 		snd_iprintf(buffer, "closed\n");</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='ctx'> 		snd_iprintf(buffer, "no setup\n");</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime-&gt;tstamp_mode));</div><div class='ctx'> 	snd_iprintf(buffer, "period_step: %u\n", runtime-&gt;period_step);</div><div class='hunk'>@@ -428,8 +428,6 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, "silence_threshold: %lu\n", runtime-&gt;silence_threshold);</div><div class='ctx'> 	snd_iprintf(buffer, "silence_size: %lu\n", runtime-&gt;silence_size);</div><div class='ctx'> 	snd_iprintf(buffer, "boundary: %lu\n", runtime-&gt;boundary);</div><div class='del'>- unlock:</div><div class='del'>-	mutex_unlock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_pcm_substream_proc_status_read(struct snd_info_entry *entry,</div><div class='hunk'>@@ -437,38 +435,47 @@ static void snd_pcm_substream_proc_status_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream = entry-&gt;private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-	struct snd_pcm_status status;</div><div class='add'>+	struct snd_pcm_status64 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (!runtime) {</div><div class='ctx'> 		snd_iprintf(buffer, "closed\n");</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-	err = snd_pcm_status(substream, &amp;status);</div><div class='add'>+	err = snd_pcm_status64(substream, &amp;status);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		snd_iprintf(buffer, "error %d\n", err);</div><div class='del'>-		goto unlock;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "state: %s\n", snd_pcm_state_name(status.state));</div><div class='ctx'> 	snd_iprintf(buffer, "owner_pid   : %d\n", pid_vnr(substream-&gt;pid));</div><div class='del'>-	snd_iprintf(buffer, "trigger_time: %ld.%09ld\n",</div><div class='del'>-		status.trigger_tstamp.tv_sec, status.trigger_tstamp.tv_nsec);</div><div class='del'>-	snd_iprintf(buffer, "tstamp      : %ld.%09ld\n",</div><div class='del'>-		status.tstamp.tv_sec, status.tstamp.tv_nsec);</div><div class='add'>+	snd_iprintf(buffer, "trigger_time: %lld.%09lld\n",</div><div class='add'>+		status.trigger_tstamp_sec, status.trigger_tstamp_nsec);</div><div class='add'>+	snd_iprintf(buffer, "tstamp      : %lld.%09lld\n",</div><div class='add'>+		status.tstamp_sec, status.tstamp_nsec);</div><div class='ctx'> 	snd_iprintf(buffer, "delay       : %ld\n", status.delay);</div><div class='ctx'> 	snd_iprintf(buffer, "avail       : %ld\n", status.avail);</div><div class='ctx'> 	snd_iprintf(buffer, "avail_max   : %ld\n", status.avail_max);</div><div class='ctx'> 	snd_iprintf(buffer, "-----\n");</div><div class='ctx'> 	snd_iprintf(buffer, "hw_ptr      : %ld\n", runtime-&gt;status-&gt;hw_ptr);</div><div class='ctx'> 	snd_iprintf(buffer, "appl_ptr    : %ld\n", runtime-&gt;control-&gt;appl_ptr);</div><div class='del'>- unlock:</div><div class='del'>-	mutex_unlock(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='add'>+#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+	snd_iprintf(buffer, "xrun_counter: %d\n", substream-&gt;xrun_counter);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+static void snd_pcm_xrun_injection_write(struct snd_info_entry *entry,</div><div class='add'>+					 struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_pcm_stop_xrun(substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_pcm_xrun_debug_read(struct snd_info_entry *entry,</div><div class='ctx'> 				    struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -494,54 +501,49 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "pcm%i%c", pcm-&gt;device, </div><div class='ctx'> 		pstr-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c');</div><div class='del'>-	if ((entry = snd_info_create_card_entry(pcm-&gt;card, name, pcm-&gt;card-&gt;proc_root)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='add'>+	entry = snd_info_create_card_entry(pcm-&gt;card, name,</div><div class='add'>+					   pcm-&gt;card-&gt;proc_root);</div><div class='add'>+	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	entry-&gt;mode = S_IFDIR | 0555;</div><div class='ctx'> 	pstr-&gt;proc_root = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(pcm-&gt;card, "info", pstr-&gt;proc_root)) != NULL) {</div><div class='add'>+	entry = snd_info_create_card_entry(pcm-&gt;card, "info", pstr-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='ctx'> 		snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	pstr-&gt;proc_info_entry = entry;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='del'>-	if ((entry = snd_info_create_card_entry(pcm-&gt;card, "xrun_debug",</div><div class='del'>-						pstr-&gt;proc_root)) != NULL) {</div><div class='del'>-		entry-&gt;c.text.read = snd_pcm_xrun_debug_read;</div><div class='add'>+	entry = snd_info_create_card_entry(pcm-&gt;card, "xrun_debug",</div><div class='add'>+					   pstr-&gt;proc_root);</div><div class='add'>+	if (entry) {</div><div class='add'>+		snd_info_set_text_ops(entry, pstr, snd_pcm_xrun_debug_read);</div><div class='ctx'> 		entry-&gt;c.text.write = snd_pcm_xrun_debug_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;private_data = pstr;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='add'>+		entry-&gt;mode |= 0200;</div><div class='ctx'> 	}</div><div class='del'>-	pstr-&gt;proc_xrun_debug_entry = entry;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_stream_proc_done(struct snd_pcm_str *pstr)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='del'>-	snd_info_free_entry(pstr-&gt;proc_xrun_debug_entry);</div><div class='del'>-	pstr-&gt;proc_xrun_debug_entry = NULL;</div><div class='del'>-#endif</div><div class='del'>-	snd_info_free_entry(pstr-&gt;proc_info_entry);</div><div class='del'>-	pstr-&gt;proc_info_entry = NULL;</div><div class='ctx'> 	snd_info_free_entry(pstr-&gt;proc_root);</div><div class='ctx'> 	pstr-&gt;proc_root = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct snd_info_entry *</div><div class='add'>+create_substream_info_entry(struct snd_pcm_substream *substream,</div><div class='add'>+			    const char *name,</div><div class='add'>+			    void (*read)(struct snd_info_entry *,</div><div class='add'>+					 struct snd_info_buffer *))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(substream-&gt;pcm-&gt;card, name,</div><div class='add'>+					   substream-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, substream, read);</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='hunk'>@@ -551,79 +553,64 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)</div><div class='ctx'> 	card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "sub%i", substream-&gt;number);</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, name, substream-&gt;pstr-&gt;proc_root)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-	if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(entry);</div><div class='add'>+	entry = snd_info_create_card_entry(card, name,</div><div class='add'>+					   substream-&gt;pstr-&gt;proc_root);</div><div class='add'>+	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	entry-&gt;mode = S_IFDIR | 0555;</div><div class='ctx'> 	substream-&gt;proc_root = entry;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "info", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		snd_info_set_text_ops(entry, substream,</div><div class='del'>-				      snd_pcm_substream_proc_info_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	substream-&gt;proc_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "hw_params", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		snd_info_set_text_ops(entry, substream,</div><div class='del'>-				      snd_pcm_substream_proc_hw_params_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	substream-&gt;proc_hw_params_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "sw_params", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		snd_info_set_text_ops(entry, substream,</div><div class='del'>-				      snd_pcm_substream_proc_sw_params_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	substream-&gt;proc_sw_params_entry = entry;</div><div class='add'>+	create_substream_info_entry(substream, "info",</div><div class='add'>+				    snd_pcm_substream_proc_info_read);</div><div class='add'>+	create_substream_info_entry(substream, "hw_params",</div><div class='add'>+				    snd_pcm_substream_proc_hw_params_read);</div><div class='add'>+	create_substream_info_entry(substream, "sw_params",</div><div class='add'>+				    snd_pcm_substream_proc_sw_params_read);</div><div class='add'>+	create_substream_info_entry(substream, "status",</div><div class='add'>+				    snd_pcm_substream_proc_status_read);</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "status", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		snd_info_set_text_ops(entry, substream,</div><div class='del'>-				      snd_pcm_substream_proc_status_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='add'>+#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+	entry = create_substream_info_entry(substream, "xrun_injection", NULL);</div><div class='add'>+	if (entry) {</div><div class='add'>+		entry-&gt;c.text.write = snd_pcm_xrun_injection_write;</div><div class='add'>+		entry-&gt;mode = S_IFREG | 0200;</div><div class='ctx'> 	}</div><div class='del'>-	substream-&gt;proc_status_entry = entry;</div><div class='add'>+#endif /* CONFIG_SND_PCM_XRUN_DEBUG */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_substream_proc_done(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_info_entry);</div><div class='del'>-	substream-&gt;proc_info_entry = NULL;</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_hw_params_entry);</div><div class='del'>-	substream-&gt;proc_hw_params_entry = NULL;</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_sw_params_entry);</div><div class='del'>-	substream-&gt;proc_sw_params_entry = NULL;</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_status_entry);</div><div class='del'>-	substream-&gt;proc_status_entry = NULL;</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_root);</div><div class='del'>-	substream-&gt;proc_root = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> #else /* !CONFIG_SND_VERBOSE_PROCFS */</div><div class='ctx'> static inline int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr) { return 0; }</div><div class='ctx'> static inline int snd_pcm_stream_proc_done(struct snd_pcm_str *pstr) { return 0; }</div><div class='ctx'> static inline int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream) { return 0; }</div><div class='del'>-static inline int snd_pcm_substream_proc_done(struct snd_pcm_substream *substream) { return 0; }</div><div class='ctx'> #endif /* CONFIG_SND_VERBOSE_PROCFS */</div><div class='ctx'> </div><div class='add'>+static const struct attribute_group *pcm_dev_attr_groups[];</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PM callbacks: we need to deal only with suspend here, as the resume is</div><div class='add'>+ * triggered either from user-space or the driver's resume callback</div><div class='add'>+ */</div><div class='add'>+static int do_pcm_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_str *pstr = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (!pstr-&gt;pcm-&gt;no_device_suspend)</div><div class='add'>+		snd_pcm_suspend_all(pstr-&gt;pcm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops pcm_dev_pm_ops = {</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(do_pcm_suspend, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* device type for PCM -- basically only for passing PM callbacks */</div><div class='add'>+static const struct device_type pcm_dev_type = {</div><div class='add'>+	.name = "pcm",</div><div class='add'>+	.pm = &amp;pcm_dev_pm_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_new_stream - create a new PCM stream</div><div class='ctx'>  * @pcm: the pcm instance</div><div class='hunk'>@@ -635,7 +622,7 @@ static inline int snd_pcm_substream_proc_done(struct snd_pcm_substream *substrea</div><div class='ctx'>  * calling this, i.e. zero must be given to the argument of</div><div class='ctx'>  * snd_pcm_new().</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)</div><div class='ctx'> {</div><div class='hunk'>@@ -643,26 +630,36 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)</div><div class='ctx'> 	struct snd_pcm_str *pstr = &amp;pcm-&gt;streams[stream];</div><div class='ctx'> 	struct snd_pcm_substream *substream, *prev;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='ctx'> 	mutex_init(&amp;pstr-&gt;oss.setup_mutex);</div><div class='ctx'> #endif</div><div class='ctx'> 	pstr-&gt;stream = stream;</div><div class='ctx'> 	pstr-&gt;pcm = pcm;</div><div class='ctx'> 	pstr-&gt;substream_count = substream_count;</div><div class='del'>-	if (substream_count &gt; 0) {</div><div class='add'>+	if (!substream_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = snd_device_alloc(&amp;pstr-&gt;dev, pcm-&gt;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	dev_set_name(pstr-&gt;dev, "pcmC%iD%i%c", pcm-&gt;card-&gt;number, pcm-&gt;device,</div><div class='add'>+		     stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c');</div><div class='add'>+	pstr-&gt;dev-&gt;groups = pcm_dev_attr_groups;</div><div class='add'>+	pstr-&gt;dev-&gt;type = &amp;pcm_dev_type;</div><div class='add'>+	dev_set_drvdata(pstr-&gt;dev, pstr);</div><div class='add'>+</div><div class='add'>+	if (!pcm-&gt;internal) {</div><div class='ctx'> 		err = snd_pcm_stream_proc_init(pstr);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "Error in snd_pcm_stream_proc_init\n");</div><div class='add'>+			pcm_err(pcm, "Error in snd_pcm_stream_proc_init\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	prev = NULL;</div><div class='ctx'> 	for (idx = 0, prev = NULL; idx &lt; substream_count; idx++) {</div><div class='ctx'> 		substream = kzalloc(sizeof(*substream), GFP_KERNEL);</div><div class='del'>-		if (substream == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "Cannot allocate PCM substream\n");</div><div class='add'>+		if (!substream)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		substream-&gt;pcm = pcm;</div><div class='ctx'> 		substream-&gt;pstr = pstr;</div><div class='ctx'> 		substream-&gt;number = idx;</div><div class='hunk'>@@ -673,123 +670,193 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)</div><div class='ctx'> 			pstr-&gt;substream = substream;</div><div class='ctx'> 		else</div><div class='ctx'> 			prev-&gt;next = substream;</div><div class='del'>-		err = snd_pcm_substream_proc_init(substream);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "Error in snd_pcm_stream_proc_init\n");</div><div class='del'>-			if (prev == NULL)</div><div class='del'>-				pstr-&gt;substream = NULL;</div><div class='del'>-			else</div><div class='del'>-				prev-&gt;next = NULL;</div><div class='del'>-			kfree(substream);</div><div class='del'>-			return err;</div><div class='add'>+</div><div class='add'>+		if (!pcm-&gt;internal) {</div><div class='add'>+			err = snd_pcm_substream_proc_init(substream);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				pcm_err(pcm,</div><div class='add'>+					"Error in snd_pcm_stream_proc_init\n");</div><div class='add'>+				if (prev == NULL)</div><div class='add'>+					pstr-&gt;substream = NULL;</div><div class='add'>+				else</div><div class='add'>+					prev-&gt;next = NULL;</div><div class='add'>+				kfree(substream);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		substream-&gt;group = &amp;substream-&gt;self_group;</div><div class='del'>-		spin_lock_init(&amp;substream-&gt;self_group.lock);</div><div class='del'>-		INIT_LIST_HEAD(&amp;substream-&gt;self_group.substreams);</div><div class='add'>+		snd_pcm_group_init(&amp;substream-&gt;self_group);</div><div class='ctx'> 		list_add_tail(&amp;substream-&gt;link_list, &amp;substream-&gt;self_group.substreams);</div><div class='ctx'> 		atomic_set(&amp;substream-&gt;mmap_count, 0);</div><div class='ctx'> 		prev = substream;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }				</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_new_stream);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * snd_pcm_new - create a new PCM instance</div><div class='del'>- * @card: the card instance</div><div class='del'>- * @id: the id string</div><div class='del'>- * @device: the device index (zero based)</div><div class='del'>- * @playback_count: the number of substreams for playback</div><div class='del'>- * @capture_count: the number of substreams for capture</div><div class='del'>- * @rpcm: the pointer to store the new pcm instance</div><div class='del'>- *</div><div class='del'>- * Creates a new PCM instance.</div><div class='del'>- *</div><div class='del'>- * The pcm operators have to be set afterwards to the new instance</div><div class='del'>- * via snd_pcm_set_ops().</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='del'>- */</div><div class='del'>-int snd_pcm_new(struct snd_card *card, const char *id, int device,</div><div class='del'>-		int playback_count, int capture_count,</div><div class='del'>-	        struct snd_pcm ** rpcm)</div><div class='add'>+static int _snd_pcm_new(struct snd_card *card, const char *id, int device,</div><div class='add'>+		int playback_count, int capture_count, bool internal,</div><div class='add'>+		struct snd_pcm **rpcm)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_pcm_dev_free,</div><div class='ctx'> 		.dev_register =	snd_pcm_dev_register,</div><div class='ctx'> 		.dev_disconnect = snd_pcm_dev_disconnect,</div><div class='ctx'> 	};</div><div class='add'>+	static const struct snd_device_ops internal_ops = {</div><div class='add'>+		.dev_free = snd_pcm_dev_free,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!card))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (rpcm)</div><div class='ctx'> 		*rpcm = NULL;</div><div class='ctx'> 	pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);</div><div class='del'>-	if (pcm == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot allocate PCM\n");</div><div class='add'>+	if (!pcm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	pcm-&gt;card = card;</div><div class='ctx'> 	pcm-&gt;device = device;</div><div class='del'>-	if (id)</div><div class='del'>-		strlcpy(pcm-&gt;id, id, sizeof(pcm-&gt;id));</div><div class='del'>-	if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count)) &lt; 0) {</div><div class='del'>-		snd_pcm_free(pcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count)) &lt; 0) {</div><div class='del'>-		snd_pcm_free(pcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	pcm-&gt;internal = internal;</div><div class='ctx'> 	mutex_init(&amp;pcm-&gt;open_mutex);</div><div class='ctx'> 	init_waitqueue_head(&amp;pcm-&gt;open_wait);</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_PCM, pcm, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_pcm_free(pcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	INIT_LIST_HEAD(&amp;pcm-&gt;list);</div><div class='add'>+	if (id)</div><div class='add'>+		strscpy(pcm-&gt;id, id, sizeof(pcm-&gt;id));</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				 playback_count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_PCM, pcm,</div><div class='add'>+			     internal ? &amp;internal_ops : &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='add'>+</div><div class='ctx'> 	if (rpcm)</div><div class='ctx'> 		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_pcm:</div><div class='add'>+	snd_pcm_free(pcm);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_new - create a new PCM instance</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @id: the id string</div><div class='add'>+ * @device: the device index (zero based)</div><div class='add'>+ * @playback_count: the number of substreams for playback</div><div class='add'>+ * @capture_count: the number of substreams for capture</div><div class='add'>+ * @rpcm: the pointer to store the new pcm instance</div><div class='add'>+ *</div><div class='add'>+ * Creates a new PCM instance.</div><div class='add'>+ *</div><div class='add'>+ * The pcm operators have to be set afterwards to the new instance</div><div class='add'>+ * via snd_pcm_set_ops().</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_new(struct snd_card *card, const char *id, int device,</div><div class='add'>+		int playback_count, int capture_count, struct snd_pcm **rpcm)</div><div class='add'>+{</div><div class='add'>+	return _snd_pcm_new(card, id, device, playback_count, capture_count,</div><div class='add'>+			false, rpcm);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_new);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_new_internal - create a new internal PCM instance</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @id: the id string</div><div class='add'>+ * @device: the device index (zero based - shared with normal PCMs)</div><div class='add'>+ * @playback_count: the number of substreams for playback</div><div class='add'>+ * @capture_count: the number of substreams for capture</div><div class='add'>+ * @rpcm: the pointer to store the new pcm instance</div><div class='add'>+ *</div><div class='add'>+ * Creates a new internal PCM instance with no userspace device or procfs</div><div class='add'>+ * entries. This is used by ASoC Back End PCMs in order to create a PCM that</div><div class='add'>+ * will only be used internally by kernel drivers. i.e. it cannot be opened</div><div class='add'>+ * by userspace. It provides existing ASoC components drivers with a substream</div><div class='add'>+ * and access to any private data.</div><div class='add'>+ *</div><div class='add'>+ * The pcm operators have to be set afterwards to the new instance</div><div class='add'>+ * via snd_pcm_set_ops().</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_new_internal(struct snd_card *card, const char *id, int device,</div><div class='add'>+	int playback_count, int capture_count,</div><div class='add'>+	struct snd_pcm **rpcm)</div><div class='add'>+{</div><div class='add'>+	return _snd_pcm_new(card, id, device, playback_count, capture_count,</div><div class='add'>+			true, rpcm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_new_internal);</div><div class='add'>+</div><div class='add'>+static void free_chmap(struct snd_pcm_str *pstr)</div><div class='add'>+{</div><div class='add'>+	if (pstr-&gt;chmap_kctl) {</div><div class='add'>+		struct snd_card *card = pstr-&gt;pcm-&gt;card;</div><div class='add'>+</div><div class='add'>+		snd_ctl_remove(card, pstr-&gt;chmap_kctl);</div><div class='add'>+		pstr-&gt;chmap_kctl = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_pcm_free_stream(struct snd_pcm_str * pstr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream, *substream_next;</div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='ctx'> 	struct snd_pcm_oss_setup *setup, *setupn;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/* free all proc files under the stream */</div><div class='add'>+	snd_pcm_stream_proc_done(pstr);</div><div class='add'>+</div><div class='ctx'> 	substream = pstr-&gt;substream;</div><div class='ctx'> 	while (substream) {</div><div class='ctx'> 		substream_next = substream-&gt;next;</div><div class='ctx'> 		snd_pcm_timer_done(substream);</div><div class='del'>-		snd_pcm_substream_proc_done(substream);</div><div class='ctx'> 		kfree(substream);</div><div class='ctx'> 		substream = substream_next;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_proc_done(pstr);</div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='ctx'> 	for (setup = pstr-&gt;oss.setup_list; setup; setup = setupn) {</div><div class='ctx'> 		setupn = setup-&gt;next;</div><div class='ctx'> 		kfree(setup-&gt;task_name);</div><div class='ctx'> 		kfree(setup);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='add'>+	free_chmap(pstr);</div><div class='add'>+	if (pstr-&gt;substream_count)</div><div class='add'>+		put_device(pstr-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='add'>+#define pcm_call_notify(pcm, call)					\</div><div class='add'>+	do {								\</div><div class='add'>+		struct snd_pcm_notify *_notify;				\</div><div class='add'>+		list_for_each_entry(_notify, &amp;snd_pcm_notify_list, list) \</div><div class='add'>+			_notify-&gt;call(pcm);				\</div><div class='add'>+	} while (0)</div><div class='add'>+#else</div><div class='add'>+#define pcm_call_notify(pcm, call) do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_free(struct snd_pcm *pcm)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_notify *notify;</div><div class='del'>-</div><div class='ctx'> 	if (!pcm)</div><div class='ctx'> 		return 0;</div><div class='del'>-	list_for_each_entry(notify, &amp;snd_pcm_notify_list, list) {</div><div class='del'>-		notify-&gt;n_unregister(pcm);</div><div class='del'>-	}</div><div class='add'>+	if (!pcm-&gt;internal)</div><div class='add'>+		pcm_call_notify(pcm, n_unregister);</div><div class='ctx'> 	if (pcm-&gt;private_free)</div><div class='ctx'> 		pcm-&gt;private_free(pcm);</div><div class='ctx'> 	snd_pcm_lib_preallocate_free_for_all(pcm);</div><div class='hunk'>@@ -812,48 +879,31 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> 	struct snd_pcm_str * pstr;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-	struct snd_ctl_file *kctl;</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	int prefer_subdevice = -1;</div><div class='add'>+	int prefer_subdevice;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!pcm || !rsubstream))</div><div class='ctx'> 		return -ENXIO;</div><div class='add'>+	if (snd_BUG_ON(stream != SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='add'>+		       stream != SNDRV_PCM_STREAM_CAPTURE))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	*rsubstream = NULL;</div><div class='ctx'> 	pstr = &amp;pcm-&gt;streams[stream];</div><div class='ctx'> 	if (pstr-&gt;substream == NULL || pstr-&gt;substream_count == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	card = pcm-&gt;card;</div><div class='del'>-	read_lock(&amp;card-&gt;ctl_files_rwlock);</div><div class='del'>-	list_for_each_entry(kctl, &amp;card-&gt;ctl_files, list) {</div><div class='del'>-		if (kctl-&gt;pid == task_pid(current)) {</div><div class='del'>-			prefer_subdevice = kctl-&gt;prefer_pcm_subdevice;</div><div class='del'>-			if (prefer_subdevice != -1)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;card-&gt;ctl_files_rwlock);</div><div class='del'>-</div><div class='del'>-	switch (stream) {</div><div class='del'>-	case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='del'>-		if (pcm-&gt;info_flags &amp; SNDRV_PCM_INFO_HALF_DUPLEX) {</div><div class='del'>-			for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream-&gt;next) {</div><div class='del'>-				if (SUBSTREAM_BUSY(substream))</div><div class='del'>-					return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STREAM_CAPTURE:</div><div class='del'>-		if (pcm-&gt;info_flags &amp; SNDRV_PCM_INFO_HALF_DUPLEX) {</div><div class='del'>-			for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream-&gt;next) {</div><div class='del'>-				if (SUBSTREAM_BUSY(substream))</div><div class='del'>-					return -EAGAIN;</div><div class='del'>-			}</div><div class='add'>+	prefer_subdevice = snd_ctl_get_preferred_subdevice(card, SND_CTL_SUBDEV_PCM);</div><div class='add'>+</div><div class='add'>+	if (pcm-&gt;info_flags &amp; SNDRV_PCM_INFO_HALF_DUPLEX) {</div><div class='add'>+		int opposite = !stream;</div><div class='add'>+</div><div class='add'>+		for (substream = pcm-&gt;streams[opposite].substream; substream;</div><div class='add'>+		     substream = substream-&gt;next) {</div><div class='add'>+			if (SUBSTREAM_BUSY(substream))</div><div class='add'>+				return -EAGAIN;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (file-&gt;f_flags &amp; O_APPEND) {</div><div class='hunk'>@@ -876,15 +926,12 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (prefer_subdevice &gt;= 0) {</div><div class='del'>-		for (substream = pstr-&gt;substream; substream; substream = substream-&gt;next)</div><div class='del'>-			if (!SUBSTREAM_BUSY(substream) &amp;&amp; substream-&gt;number == prefer_subdevice)</div><div class='del'>-				goto __ok;</div><div class='del'>-	}</div><div class='del'>-	for (substream = pstr-&gt;substream; substream; substream = substream-&gt;next)</div><div class='del'>-		if (!SUBSTREAM_BUSY(substream))</div><div class='add'>+	for (substream = pstr-&gt;substream; substream; substream = substream-&gt;next) {</div><div class='add'>+		if (!SUBSTREAM_BUSY(substream) &amp;&amp;</div><div class='add'>+		    (prefer_subdevice == -1 ||</div><div class='add'>+		     substream-&gt;number == prefer_subdevice))</div><div class='ctx'> 			break;</div><div class='del'>-      __ok:</div><div class='add'>+	}</div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='hunk'>@@ -893,27 +940,29 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status));</div><div class='del'>-	runtime-&gt;status = snd_malloc_pages(size, GFP_KERNEL);</div><div class='add'>+	runtime-&gt;status = alloc_pages_exact(size, GFP_KERNEL);</div><div class='ctx'> 	if (runtime-&gt;status == NULL) {</div><div class='ctx'> 		kfree(runtime);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset((void*)runtime-&gt;status, 0, size);</div><div class='add'>+	memset(runtime-&gt;status, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control));</div><div class='del'>-	runtime-&gt;control = snd_malloc_pages(size, GFP_KERNEL);</div><div class='add'>+	runtime-&gt;control = alloc_pages_exact(size, GFP_KERNEL);</div><div class='ctx'> 	if (runtime-&gt;control == NULL) {</div><div class='del'>-		snd_free_pages((void*)runtime-&gt;status,</div><div class='add'>+		free_pages_exact(runtime-&gt;status,</div><div class='ctx'> 			       PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)));</div><div class='ctx'> 		kfree(runtime);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	memset((void*)runtime-&gt;control, 0, size);</div><div class='add'>+	memset(runtime-&gt;control, 0, size);</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_head(&amp;runtime-&gt;sleep);</div><div class='ctx'> 	init_waitqueue_head(&amp;runtime-&gt;tsleep);</div><div class='ctx'> </div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_OPEN;</div><div class='add'>+	__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_OPEN);</div><div class='add'>+	mutex_init(&amp;runtime-&gt;buffer_mutex);</div><div class='add'>+	atomic_set(&amp;runtime-&gt;buffer_accessing, 0);</div><div class='ctx'> </div><div class='ctx'> 	substream-&gt;runtime = runtime;</div><div class='ctx'> 	substream-&gt;private_data = pcm-&gt;private_data;</div><div class='hunk'>@@ -922,6 +971,9 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> 	substream-&gt;pid = get_pid(task_pid(current));</div><div class='ctx'> 	pstr-&gt;substream_opened++;</div><div class='ctx'> 	*rsubstream = substream;</div><div class='add'>+#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+	substream-&gt;xrun_counter = 0;</div><div class='add'>+#endif /* CONFIG_SND_PCM_XRUN_DEBUG */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -934,26 +986,31 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;private_free != NULL)</div><div class='ctx'> 		runtime-&gt;private_free(runtime);</div><div class='del'>-	snd_free_pages((void*)runtime-&gt;status,</div><div class='add'>+	free_pages_exact(runtime-&gt;status,</div><div class='ctx'> 		       PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)));</div><div class='del'>-	snd_free_pages((void*)runtime-&gt;control,</div><div class='add'>+	free_pages_exact(runtime-&gt;control,</div><div class='ctx'> 		       PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)));</div><div class='ctx'> 	kfree(runtime-&gt;hw_constraints.rules);</div><div class='del'>-#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='del'>-	if (runtime-&gt;hwptr_log)</div><div class='del'>-		kfree(runtime-&gt;hwptr_log);</div><div class='del'>-#endif</div><div class='add'>+	/* Avoid concurrent access to runtime via PCM timer interface */</div><div class='add'>+	if (substream-&gt;timer) {</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;substream-&gt;timer-&gt;lock)</div><div class='add'>+			substream-&gt;runtime = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		substream-&gt;runtime = NULL;</div><div class='add'>+	}</div><div class='add'>+	mutex_destroy(&amp;runtime-&gt;buffer_mutex);</div><div class='add'>+	snd_fasync_free(runtime-&gt;fasync);</div><div class='ctx'> 	kfree(runtime);</div><div class='del'>-	substream-&gt;runtime = NULL;</div><div class='ctx'> 	put_pid(substream-&gt;pid);</div><div class='ctx'> 	substream-&gt;pid = NULL;</div><div class='ctx'> 	substream-&gt;pstr-&gt;substream_opened--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t show_pcm_class(struct device *dev,</div><div class='add'>+static ssize_t pcm_class_show(struct device *dev,</div><div class='ctx'> 			      struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='add'>+	struct snd_pcm_str *pstr = dev_get_drvdata(dev);</div><div class='add'>+	struct snd_pcm *pcm = pstr-&gt;pcm;</div><div class='ctx'> 	const char *str;</div><div class='ctx'> 	static const char *strs[SNDRV_PCM_CLASS_LAST + 1] = {</div><div class='ctx'> 		[SNDRV_PCM_CLASS_GENERIC] = "generic",</div><div class='hunk'>@@ -962,114 +1019,120 @@ static ssize_t show_pcm_class(struct device *dev,</div><div class='ctx'> 		[SNDRV_PCM_CLASS_DIGITIZER] = "digitizer",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (! (pcm = dev_get_drvdata(dev)) ||</div><div class='del'>-	    pcm-&gt;dev_class &gt; SNDRV_PCM_CLASS_LAST)</div><div class='add'>+	if (pcm-&gt;dev_class &gt; SNDRV_PCM_CLASS_LAST)</div><div class='ctx'> 		str = "none";</div><div class='ctx'> 	else</div><div class='ctx'> 		str = strs[pcm-&gt;dev_class];</div><div class='del'>-        return snprintf(buf, PAGE_SIZE, "%s\n", str);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", str);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct device_attribute pcm_attrs =</div><div class='del'>-	__ATTR(pcm_class, S_IRUGO, show_pcm_class, NULL);</div><div class='add'>+static DEVICE_ATTR_RO(pcm_class);</div><div class='add'>+static struct attribute *pcm_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_pcm_class.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group pcm_dev_attr_group = {</div><div class='add'>+	.attrs	= pcm_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group *pcm_dev_attr_groups[] = {</div><div class='add'>+	&amp;pcm_dev_attr_group,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_dev_register(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int cidx, err;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_notify *notify;</div><div class='del'>-	char str[16];</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='del'>-	struct device *dev;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!device || !device-&gt;device_data))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	pcm = device-&gt;device_data;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	err = snd_pcm_add(pcm);</div><div class='del'>-	if (err) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	for (cidx = 0; cidx &lt; 2; cidx++) {</div><div class='ctx'> 		int devtype = -1;</div><div class='ctx'> 		if (pcm-&gt;streams[cidx].substream == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		switch (cidx) {</div><div class='ctx'> 		case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='del'>-			sprintf(str, "pcmC%iD%ip", pcm-&gt;card-&gt;number, pcm-&gt;device);</div><div class='ctx'> 			devtype = SNDRV_DEVICE_TYPE_PCM_PLAYBACK;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SNDRV_PCM_STREAM_CAPTURE:</div><div class='del'>-			sprintf(str, "pcmC%iD%ic", pcm-&gt;card-&gt;number, pcm-&gt;device);</div><div class='ctx'> 			devtype = SNDRV_DEVICE_TYPE_PCM_CAPTURE;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* device pointer to use, pcm-&gt;dev takes precedence if</div><div class='del'>-		 * it is assigned, otherwise fall back to card's device</div><div class='del'>-		 * if possible */</div><div class='del'>-		dev = pcm-&gt;dev;</div><div class='del'>-		if (!dev)</div><div class='del'>-			dev = snd_card_get_device_link(pcm-&gt;card);</div><div class='ctx'> 		/* register pcm */</div><div class='del'>-		err = snd_register_device_for_dev(devtype, pcm-&gt;card,</div><div class='del'>-						  pcm-&gt;device,</div><div class='del'>-						  &amp;snd_pcm_f_ops[cidx],</div><div class='del'>-						  pcm, str, dev);</div><div class='add'>+		err = snd_register_device(devtype, pcm-&gt;card, pcm-&gt;device,</div><div class='add'>+					  &amp;snd_pcm_f_ops[cidx], pcm,</div><div class='add'>+					  pcm-&gt;streams[cidx].dev);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			list_del(&amp;pcm-&gt;list);</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='add'>+			list_del_init(&amp;pcm-&gt;list);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		snd_add_device_sysfs_file(devtype, pcm-&gt;card, pcm-&gt;device,</div><div class='del'>-					  &amp;pcm_attrs);</div><div class='add'>+</div><div class='ctx'> 		for (substream = pcm-&gt;streams[cidx].substream; substream; substream = substream-&gt;next)</div><div class='ctx'> 			snd_pcm_timer_init(substream);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(notify, &amp;snd_pcm_notify_list, list)</div><div class='del'>-		notify-&gt;n_register(pcm);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	return 0;</div><div class='add'>+	pcm_call_notify(pcm, n_register);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_dev_disconnect(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm = device-&gt;device_data;</div><div class='del'>-	struct snd_pcm_notify *notify;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	int cidx, devtype;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if (list_empty(&amp;pcm-&gt;list))</div><div class='del'>-		goto unlock;</div><div class='add'>+	int cidx;</div><div class='ctx'> </div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;pcm-&gt;open_mutex);</div><div class='add'>+	wake_up(&amp;pcm-&gt;open_wait);</div><div class='ctx'> 	list_del_init(&amp;pcm-&gt;list);</div><div class='del'>-	for (cidx = 0; cidx &lt; 2; cidx++)</div><div class='del'>-		for (substream = pcm-&gt;streams[cidx].substream; substream; substream = substream-&gt;next)</div><div class='del'>-			if (substream-&gt;runtime)</div><div class='del'>-				substream-&gt;runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_DISCONNECTED;</div><div class='del'>-	list_for_each_entry(notify, &amp;snd_pcm_notify_list, list) {</div><div class='del'>-		notify-&gt;n_disconnect(pcm);</div><div class='add'>+</div><div class='add'>+	for_each_pcm_substream(pcm, cidx, substream) {</div><div class='add'>+		snd_pcm_stream_lock_irq(substream);</div><div class='add'>+		if (substream-&gt;runtime) {</div><div class='add'>+			if (snd_pcm_running(substream))</div><div class='add'>+				snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);</div><div class='add'>+			/* to be sure, set the state unconditionally */</div><div class='add'>+			__snd_pcm_set_state(substream-&gt;runtime,</div><div class='add'>+					    SNDRV_PCM_STATE_DISCONNECTED);</div><div class='add'>+			wake_up(&amp;substream-&gt;runtime-&gt;sleep);</div><div class='add'>+			wake_up(&amp;substream-&gt;runtime-&gt;tsleep);</div><div class='add'>+		}</div><div class='add'>+		snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for_each_pcm_substream(pcm, cidx, substream)</div><div class='add'>+		snd_pcm_sync_stop(substream, false);</div><div class='add'>+</div><div class='add'>+	pcm_call_notify(pcm, n_disconnect);</div><div class='ctx'> 	for (cidx = 0; cidx &lt; 2; cidx++) {</div><div class='del'>-		devtype = -1;</div><div class='del'>-		switch (cidx) {</div><div class='del'>-		case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='del'>-			devtype = SNDRV_DEVICE_TYPE_PCM_PLAYBACK;</div><div class='del'>-			break;</div><div class='del'>-		case SNDRV_PCM_STREAM_CAPTURE:</div><div class='del'>-			devtype = SNDRV_DEVICE_TYPE_PCM_CAPTURE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		snd_unregister_device(devtype, pcm-&gt;card, pcm-&gt;device);</div><div class='add'>+		if (pcm-&gt;streams[cidx].dev)</div><div class='add'>+			snd_unregister_device(pcm-&gt;streams[cidx].dev);</div><div class='add'>+		free_chmap(&amp;pcm-&gt;streams[cidx]);</div><div class='ctx'> 	}</div><div class='del'>- unlock:</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_notify - Add/remove the notify list</div><div class='add'>+ * @notify: PCM notify list</div><div class='add'>+ * @nfree: 0 = register, 1 = unregister</div><div class='add'>+ *</div><div class='add'>+ * This adds the given notifier to the global list so that the callback is</div><div class='add'>+ * called for each registered PCM devices.  This exists only for PCM OSS</div><div class='add'>+ * emulation, so far.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='hunk'>@@ -1079,7 +1142,7 @@ int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)</div><div class='ctx'> 		       !notify-&gt;n_unregister ||</div><div class='ctx'> 		       !notify-&gt;n_disconnect))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	if (nfree) {</div><div class='ctx'> 		list_del(&amp;notify-&gt;list);</div><div class='ctx'> 		list_for_each_entry(pcm, &amp;snd_pcm_devices, list)</div><div class='hunk'>@@ -1089,13 +1152,12 @@ int snd_pcm_notify(struct snd_pcm_notify *notify, int nfree)</div><div class='ctx'> 		list_for_each_entry(pcm, &amp;snd_pcm_devices, list)</div><div class='ctx'> 			notify-&gt;n_register(pcm);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_notify);</div><div class='add'>+#endif /* CONFIG_SND_PCM_OSS */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  Info interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -1105,7 +1167,7 @@ static void snd_pcm_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	list_for_each_entry(pcm, &amp;snd_pcm_devices, list) {</div><div class='ctx'> 		snd_iprintf(buffer, "%02i-%02i: %s : %s",</div><div class='ctx'> 			    pcm-&gt;card-&gt;number, pcm-&gt;device, pcm-&gt;id, pcm-&gt;name);</div><div class='hunk'>@@ -1117,7 +1179,6 @@ static void snd_pcm_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 				    pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream_count);</div><div class='ctx'> 		snd_iprintf(buffer, "\n");</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_info_entry *snd_pcm_proc_entry;</div><div class='hunk'>@@ -1126,7 +1187,8 @@ static void snd_pcm_proc_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL)) != NULL) {</div><div class='add'>+	entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL);</div><div class='add'>+	if (entry) {</div><div class='ctx'> 		snd_info_set_text_ops(entry, NULL, snd_pcm_proc_read);</div><div class='ctx'> 		if (snd_info_register(entry) &lt; 0) {</div><div class='ctx'> 			snd_info_free_entry(entry);</div><div class='hunk'>@@ -1141,10 +1203,10 @@ static void snd_pcm_proc_done(void)</div><div class='ctx'> 	snd_info_free_entry(snd_pcm_proc_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+#else /* !CONFIG_SND_PROC_FS */</div><div class='ctx'> #define snd_pcm_proc_init()</div><div class='ctx'> #define snd_pcm_proc_done()</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c<br/>index 5fb2e28e796f..54eb9bd8eb21 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_compat.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   32bit -&gt; 64bit ioctl wrapper for PCM API</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file included from pcm_native.c */</div><div class='hunk'>@@ -27,17 +13,14 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 				      s32 __user *src)</div><div class='ctx'> {</div><div class='ctx'> 	snd_pcm_sframes_t delay;</div><div class='del'>-	mm_segment_t fs;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	fs = snd_enter_user();</div><div class='ctx'> 	err = snd_pcm_delay(substream, &amp;delay);</div><div class='del'>-	snd_leave_user(fs);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (put_user(delay, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -48,10 +31,7 @@ static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	if (get_user(frames, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-		err = snd_pcm_playback_rewind(substream, frames);</div><div class='del'>-	else</div><div class='del'>-		err = snd_pcm_capture_rewind(substream, frames);</div><div class='add'>+	err = snd_pcm_rewind(substream, frames);</div><div class='ctx'> 	if (put_user(err, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return err &lt; 0 ? err : 0;</div><div class='hunk'>@@ -65,10 +45,7 @@ static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	if (get_user(frames, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-		err = snd_pcm_playback_forward(substream, frames);</div><div class='del'>-	else</div><div class='del'>-		err = snd_pcm_capture_forward(substream, frames);</div><div class='add'>+	err = snd_pcm_forward(substream, frames);</div><div class='ctx'> 	if (put_user(err, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return err &lt; 0 ? err : 0;</div><div class='hunk'>@@ -101,22 +78,11 @@ struct snd_pcm_sw_params32 {</div><div class='ctx'> 	u32 silence_threshold;</div><div class='ctx'> 	u32 silence_size;</div><div class='ctx'> 	u32 boundary;</div><div class='del'>-	unsigned char reserved[64];</div><div class='add'>+	u32 proto;</div><div class='add'>+	u32 tstamp_type;</div><div class='add'>+	unsigned char reserved[56];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* recalcuate the boundary within 32bit */</div><div class='del'>-static snd_pcm_uframes_t recalculate_boundary(struct snd_pcm_runtime *runtime)</div><div class='del'>-{</div><div class='del'>-	snd_pcm_uframes_t boundary;</div><div class='del'>-</div><div class='del'>-	if (! runtime-&gt;buffer_size)</div><div class='del'>-		return 0;</div><div class='del'>-	boundary = runtime-&gt;buffer_size;</div><div class='del'>-	while (boundary * 2 &lt;= 0x7fffffffUL - runtime-&gt;buffer_size)</div><div class='del'>-		boundary *= 2;</div><div class='del'>-	return boundary;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 					  struct snd_pcm_sw_params32 __user *src)</div><div class='ctx'> {</div><div class='hunk'>@@ -133,7 +99,9 @@ static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 	    get_user(params.start_threshold, &amp;src-&gt;start_threshold) ||</div><div class='ctx'> 	    get_user(params.stop_threshold, &amp;src-&gt;stop_threshold) ||</div><div class='ctx'> 	    get_user(params.silence_threshold, &amp;src-&gt;silence_threshold) ||</div><div class='del'>-	    get_user(params.silence_size, &amp;src-&gt;silence_size))</div><div class='add'>+	    get_user(params.silence_size, &amp;src-&gt;silence_size) ||</div><div class='add'>+	    get_user(params.tstamp_type, &amp;src-&gt;tstamp_type) ||</div><div class='add'>+	    get_user(params.proto, &amp;src-&gt;proto))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check silent_size parameter.  Since we have 64bit boundary,</div><div class='hunk'>@@ -179,43 +147,84 @@ static int snd_pcm_ioctl_channel_info_compat(struct snd_pcm_substream *substream</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_pcm_status32 {</div><div class='del'>-	s32 state;</div><div class='del'>-	struct compat_timespec trigger_tstamp;</div><div class='del'>-	struct compat_timespec tstamp;</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+/* X32 ABI has the same struct as x86-64 for snd_pcm_channel_info */</div><div class='add'>+static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,</div><div class='add'>+				     struct snd_pcm_channel_info __user *src);</div><div class='add'>+#define snd_pcm_ioctl_channel_info_x32(s, p)	\</div><div class='add'>+	snd_pcm_channel_info_user(s, p)</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='add'>+</div><div class='add'>+struct compat_snd_pcm_status64 {</div><div class='add'>+	snd_pcm_state_t state;</div><div class='add'>+	u8 rsvd[4]; /* alignment */</div><div class='add'>+	s64 trigger_tstamp_sec;</div><div class='add'>+	s64 trigger_tstamp_nsec;</div><div class='add'>+	s64 tstamp_sec;</div><div class='add'>+	s64 tstamp_nsec;</div><div class='ctx'> 	u32 appl_ptr;</div><div class='ctx'> 	u32 hw_ptr;</div><div class='ctx'> 	s32 delay;</div><div class='ctx'> 	u32 avail;</div><div class='ctx'> 	u32 avail_max;</div><div class='ctx'> 	u32 overrange;</div><div class='del'>-	s32 suspended_state;</div><div class='del'>-	unsigned char reserved[60];</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int snd_pcm_status_user_compat(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_status32 __user *src)</div><div class='add'>+	snd_pcm_state_t suspended_state;</div><div class='add'>+	u32 audio_tstamp_data;</div><div class='add'>+	s64 audio_tstamp_sec;</div><div class='add'>+	s64 audio_tstamp_nsec;</div><div class='add'>+	s64 driver_tstamp_sec;</div><div class='add'>+	s64 driver_tstamp_nsec;</div><div class='add'>+	u32 audio_tstamp_accuracy;</div><div class='add'>+	unsigned char reserved[52-4*sizeof(s64)];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static int snd_pcm_status_user_compat64(struct snd_pcm_substream *substream,</div><div class='add'>+					struct compat_snd_pcm_status64 __user *src,</div><div class='add'>+					bool ext)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_status status;</div><div class='add'>+	struct snd_pcm_status64 status;</div><div class='add'>+	struct compat_snd_pcm_status64 compat_status64;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_status(substream, &amp;status);</div><div class='add'>+	memset(&amp;status, 0, sizeof(status));</div><div class='add'>+	memset(&amp;compat_status64, 0, sizeof(compat_status64));</div><div class='add'>+	/*</div><div class='add'>+	 * with extension, parameters are read/write,</div><div class='add'>+	 * get audio_tstamp_data from user,</div><div class='add'>+	 * ignore rest of status structure</div><div class='add'>+	 */</div><div class='add'>+	if (ext &amp;&amp; get_user(status.audio_tstamp_data,</div><div class='add'>+				(u32 __user *)(&amp;src-&gt;audio_tstamp_data)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	err = snd_pcm_status64(substream, &amp;status);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (put_user(status.state, &amp;src-&gt;state) ||</div><div class='del'>-	    put_user(status.trigger_tstamp.tv_sec, &amp;src-&gt;trigger_tstamp.tv_sec) ||</div><div class='del'>-	    put_user(status.trigger_tstamp.tv_nsec, &amp;src-&gt;trigger_tstamp.tv_nsec) ||</div><div class='del'>-	    put_user(status.tstamp.tv_sec, &amp;src-&gt;tstamp.tv_sec) ||</div><div class='del'>-	    put_user(status.tstamp.tv_nsec, &amp;src-&gt;tstamp.tv_nsec) ||</div><div class='del'>-	    put_user(status.appl_ptr, &amp;src-&gt;appl_ptr) ||</div><div class='del'>-	    put_user(status.hw_ptr, &amp;src-&gt;hw_ptr) ||</div><div class='del'>-	    put_user(status.delay, &amp;src-&gt;delay) ||</div><div class='del'>-	    put_user(status.avail, &amp;src-&gt;avail) ||</div><div class='del'>-	    put_user(status.avail_max, &amp;src-&gt;avail_max) ||</div><div class='del'>-	    put_user(status.overrange, &amp;src-&gt;overrange) ||</div><div class='del'>-	    put_user(status.suspended_state, &amp;src-&gt;suspended_state))</div><div class='add'>+	if (clear_user(src, sizeof(*src)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	compat_status64 = (struct compat_snd_pcm_status64) {</div><div class='add'>+		.state = status.state,</div><div class='add'>+		.trigger_tstamp_sec = status.trigger_tstamp_sec,</div><div class='add'>+		.trigger_tstamp_nsec = status.trigger_tstamp_nsec,</div><div class='add'>+		.tstamp_sec = status.tstamp_sec,</div><div class='add'>+		.tstamp_nsec = status.tstamp_nsec,</div><div class='add'>+		.appl_ptr = status.appl_ptr,</div><div class='add'>+		.hw_ptr = status.hw_ptr,</div><div class='add'>+		.delay = status.delay,</div><div class='add'>+		.avail = status.avail,</div><div class='add'>+		.avail_max = status.avail_max,</div><div class='add'>+		.overrange = status.overrange,</div><div class='add'>+		.suspended_state = status.suspended_state,</div><div class='add'>+		.audio_tstamp_data = status.audio_tstamp_data,</div><div class='add'>+		.audio_tstamp_sec = status.audio_tstamp_sec,</div><div class='add'>+		.audio_tstamp_nsec = status.audio_tstamp_nsec,</div><div class='add'>+		.driver_tstamp_sec = status.audio_tstamp_sec,</div><div class='add'>+		.driver_tstamp_nsec = status.audio_tstamp_nsec,</div><div class='add'>+		.audio_tstamp_accuracy = status.audio_tstamp_accuracy,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(src, &amp;compat_status64, sizeof(compat_status64)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -226,37 +235,41 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 					  int refine, </div><div class='ctx'> 					  struct snd_pcm_hw_params32 __user *data32)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *data;</div><div class='add'>+	struct snd_pcm_hw_params *data __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (! (runtime = substream-&gt;runtime))</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+	if (!runtime)</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-	/* only fifo_size is different, so just copy all */</div><div class='del'>-	data = memdup_user(data32, sizeof(*data32));</div><div class='del'>-	if (IS_ERR(data))</div><div class='del'>-		return PTR_ERR(data);</div><div class='add'>+	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* only fifo_size (RO from userspace) is different, so just copy all */</div><div class='add'>+	if (copy_from_user(data, data32, sizeof(*data32)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (refine)</div><div class='add'>+	if (refine) {</div><div class='ctx'> 		err = snd_pcm_hw_refine(substream, data);</div><div class='del'>-	else</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = fixup_unreferenced_params(substream, data);</div><div class='add'>+	} else {</div><div class='ctx'> 		err = snd_pcm_hw_params(substream, data);</div><div class='add'>+	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> 	if (copy_to_user(data32, data, sizeof(*data32)) ||</div><div class='del'>-	    put_user(data-&gt;fifo_size, &amp;data32-&gt;fifo_size)) {</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	    put_user(data-&gt;fifo_size, &amp;data32-&gt;fifo_size))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (! refine) {</div><div class='ctx'> 		unsigned int new_boundary = recalculate_boundary(runtime);</div><div class='ctx'> 		if (new_boundary)</div><div class='ctx'> 			runtime-&gt;boundary = new_boundary;</div><div class='ctx'> 	}</div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +293,7 @@ static int snd_pcm_ioctl_xferi_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	if (substream-&gt;stream != dir)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (substream-&gt;runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> </div><div class='ctx'> 	if (get_user(buf, &amp;data32-&gt;buf) ||</div><div class='hunk'>@@ -319,30 +332,31 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 	compat_caddr_t buf;</div><div class='ctx'> 	compat_caddr_t __user *bufptr;</div><div class='ctx'> 	u32 frames;</div><div class='del'>-	void __user **bufs;</div><div class='add'>+	void __user **bufs __free(kfree) = NULL;</div><div class='ctx'> 	int err, ch, i;</div><div class='ctx'> </div><div class='ctx'> 	if (! substream-&gt;runtime)</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	if (substream-&gt;stream != dir)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> </div><div class='del'>-	if ((ch = substream-&gt;runtime-&gt;channels) &gt; 128)</div><div class='add'>+	ch = substream-&gt;runtime-&gt;channels;</div><div class='add'>+	if (ch &gt; 128)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (get_user(buf, &amp;data32-&gt;bufs) ||</div><div class='ctx'> 	    get_user(frames, &amp;data32-&gt;frames))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	bufptr = compat_ptr(buf);</div><div class='del'>-	bufs = kmalloc(sizeof(void __user *) * ch, GFP_KERNEL);</div><div class='add'>+	bufs = kmalloc_array(ch, sizeof(void __user *), GFP_KERNEL);</div><div class='ctx'> 	if (bufs == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	for (i = 0; i &lt; ch; i++) {</div><div class='ctx'> 		u32 ptr;</div><div class='del'>-		if (get_user(ptr, bufptr)) {</div><div class='del'>-			kfree(bufs);</div><div class='add'>+		if (get_user(ptr, bufptr))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		bufs[ch] = compat_ptr(ptr);</div><div class='add'>+		bufs[i] = compat_ptr(ptr);</div><div class='ctx'> 		bufptr++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dir == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='hunk'>@@ -351,40 +365,44 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 		err = snd_pcm_lib_readv(substream, bufs, frames);</div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='ctx'> 		if (put_user(err, &amp;data32-&gt;result))</div><div class='del'>-			err = -EFAULT;</div><div class='add'>+			return -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	kfree(bufs);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-struct snd_pcm_mmap_status32 {</div><div class='del'>-	s32 state;</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+/* X32 ABI has 64bit timespec and 64bit alignment */</div><div class='add'>+struct snd_pcm_mmap_status_x32 {</div><div class='add'>+	snd_pcm_state_t state;</div><div class='ctx'> 	s32 pad1;</div><div class='ctx'> 	u32 hw_ptr;</div><div class='del'>-	struct compat_timespec tstamp;</div><div class='del'>-	s32 suspended_state;</div><div class='del'>-} __attribute__((packed));</div><div class='del'>-</div><div class='del'>-struct snd_pcm_mmap_control32 {</div><div class='add'>+	u32 pad2; /* alignment */</div><div class='add'>+	struct __snd_timespec64 tstamp;</div><div class='add'>+	snd_pcm_state_t suspended_state;</div><div class='add'>+	s32 pad3;</div><div class='add'>+	struct __snd_timespec64 audio_tstamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct snd_pcm_mmap_control_x32 {</div><div class='ctx'> 	u32 appl_ptr;</div><div class='ctx'> 	u32 avail_min;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct snd_pcm_sync_ptr32 {</div><div class='add'>+struct snd_pcm_sync_ptr_x32 {</div><div class='ctx'> 	u32 flags;</div><div class='add'>+	u32 rsvd; /* alignment */</div><div class='ctx'> 	union {</div><div class='del'>-		struct snd_pcm_mmap_status32 status;</div><div class='add'>+		struct snd_pcm_mmap_status_x32 status;</div><div class='ctx'> 		unsigned char reserved[64];</div><div class='ctx'> 	} s;</div><div class='ctx'> 	union {</div><div class='del'>-		struct snd_pcm_mmap_control32 control;</div><div class='add'>+		struct snd_pcm_mmap_control_x32 control;</div><div class='ctx'> 		unsigned char reserved[64];</div><div class='ctx'> 	} c;</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,</div><div class='del'>-					 struct snd_pcm_sync_ptr32 __user *src)</div><div class='add'>+static int snd_pcm_ioctl_sync_ptr_x32(struct snd_pcm_substream *substream,</div><div class='add'>+				      struct snd_pcm_sync_ptr_x32 __user *src)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	volatile struct snd_pcm_mmap_status *status;</div><div class='hunk'>@@ -398,9 +416,7 @@ static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (snd_BUG_ON(!runtime))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (get_user(sflags, &amp;src-&gt;flags) ||</div><div class='del'>-	    get_user(scontrol.appl_ptr, &amp;src-&gt;c.control.appl_ptr) ||</div><div class='del'>-	    get_user(scontrol.avail_min, &amp;src-&gt;c.control.avail_min))</div><div class='add'>+	if (snd_pcm_sync_ptr_get_user(sflags, scontrol, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (sflags &amp; SNDRV_PCM_SYNC_PTR_HWSYNC) {</div><div class='ctx'> 		err = snd_pcm_hwsync(substream);</div><div class='hunk'>@@ -410,35 +426,102 @@ static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,</div><div class='ctx'> 	status = runtime-&gt;status;</div><div class='ctx'> 	control = runtime-&gt;control;</div><div class='ctx'> 	boundary = recalculate_boundary(runtime);</div><div class='del'>-	if (! boundary)</div><div class='add'>+	if (!boundary)</div><div class='ctx'> 		boundary = 0x7fffffff;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	/* FIXME: we should consider the boundary for the sync from app */</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		/* FIXME: we should consider the boundary for the sync from app */</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='add'>+			control-&gt;appl_ptr = scontrol.appl_ptr;</div><div class='add'>+		else</div><div class='add'>+			scontrol.appl_ptr = control-&gt;appl_ptr % boundary;</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='add'>+			control-&gt;avail_min = scontrol.avail_min;</div><div class='add'>+		else</div><div class='add'>+			scontrol.avail_min = control-&gt;avail_min;</div><div class='add'>+		sstatus.state = status-&gt;state;</div><div class='add'>+		sstatus.hw_ptr = status-&gt;hw_ptr % boundary;</div><div class='add'>+		sstatus.tstamp = status-&gt;tstamp;</div><div class='add'>+		sstatus.suspended_state = status-&gt;suspended_state;</div><div class='add'>+		sstatus.audio_tstamp = status-&gt;audio_tstamp;</div><div class='add'>+	}</div><div class='ctx'> 	if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='del'>-		control-&gt;appl_ptr = scontrol.appl_ptr;</div><div class='del'>-	else</div><div class='del'>-		scontrol.appl_ptr = control-&gt;appl_ptr % boundary;</div><div class='del'>-	if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='del'>-		control-&gt;avail_min = scontrol.avail_min;</div><div class='del'>-	else</div><div class='del'>-		scontrol.avail_min = control-&gt;avail_min;</div><div class='del'>-	sstatus.state = status-&gt;state;</div><div class='del'>-	sstatus.hw_ptr = status-&gt;hw_ptr % boundary;</div><div class='del'>-	sstatus.tstamp = status-&gt;tstamp;</div><div class='del'>-	sstatus.suspended_state = status-&gt;suspended_state;</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	if (put_user(sstatus.state, &amp;src-&gt;s.status.state) ||</div><div class='del'>-	    put_user(sstatus.hw_ptr, &amp;src-&gt;s.status.hw_ptr) ||</div><div class='del'>-	    put_user(sstatus.tstamp.tv_sec, &amp;src-&gt;s.status.tstamp.tv_sec) ||</div><div class='del'>-	    put_user(sstatus.tstamp.tv_nsec, &amp;src-&gt;s.status.tstamp.tv_nsec) ||</div><div class='del'>-	    put_user(sstatus.suspended_state, &amp;src-&gt;s.status.suspended_state) ||</div><div class='del'>-	    put_user(scontrol.appl_ptr, &amp;src-&gt;c.control.appl_ptr) ||</div><div class='del'>-	    put_user(scontrol.avail_min, &amp;src-&gt;c.control.avail_min))</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='add'>+	if (snd_pcm_sync_ptr_put_user(sstatus, scontrol, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='add'>+</div><div class='add'>+#ifdef __BIG_ENDIAN</div><div class='add'>+typedef char __pad_before_u32[4];</div><div class='add'>+typedef char __pad_after_u32[0];</div><div class='add'>+#else</div><div class='add'>+typedef char __pad_before_u32[0];</div><div class='add'>+typedef char __pad_after_u32[4];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* PCM 2.0.15 API definition had a bug in mmap control; it puts the avail_min</div><div class='add'>+ * at the wrong offset due to a typo in padding type.</div><div class='add'>+ * The bug hits only 32bit.</div><div class='add'>+ * A workaround for incorrect read/write is needed only in 32bit compat mode.</div><div class='add'>+ */</div><div class='add'>+struct __snd_pcm_mmap_control64_buggy {</div><div class='add'>+	__pad_before_u32 __pad1;</div><div class='add'>+	__u32 appl_ptr;</div><div class='add'>+	__pad_before_u32 __pad2;	/* SiC! here is the bug */</div><div class='add'>+	__pad_before_u32 __pad3;</div><div class='add'>+	__u32 avail_min;</div><div class='add'>+	__pad_after_uframe __pad4;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static int snd_pcm_ioctl_sync_ptr_buggy(struct snd_pcm_substream *substream,</div><div class='add'>+					struct snd_pcm_sync_ptr __user *_sync_ptr)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_pcm_sync_ptr sync_ptr;</div><div class='add'>+	struct __snd_pcm_mmap_control64_buggy *sync_cp;</div><div class='add'>+	volatile struct snd_pcm_mmap_status *status;</div><div class='add'>+	volatile struct snd_pcm_mmap_control *control;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sync_ptr, 0, sizeof(sync_ptr));</div><div class='add'>+	sync_cp = (struct __snd_pcm_mmap_control64_buggy *)&amp;sync_ptr.c.control;</div><div class='add'>+	if (get_user(sync_ptr.flags, (unsigned __user *)&amp;(_sync_ptr-&gt;flags)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_from_user(sync_cp, &amp;(_sync_ptr-&gt;c.control), sizeof(*sync_cp)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	status = runtime-&gt;status;</div><div class='add'>+	control = runtime-&gt;control;</div><div class='add'>+	if (sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_HWSYNC) {</div><div class='add'>+		err = snd_pcm_hwsync(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		if (!(sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_APPL)) {</div><div class='add'>+			err = pcm_lib_apply_appl_ptr(substream, sync_cp-&gt;appl_ptr);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			sync_cp-&gt;appl_ptr = control-&gt;appl_ptr;</div><div class='add'>+		}</div><div class='add'>+		if (!(sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='add'>+			control-&gt;avail_min = sync_cp-&gt;avail_min;</div><div class='add'>+		else</div><div class='add'>+			sync_cp-&gt;avail_min = control-&gt;avail_min;</div><div class='add'>+		sync_ptr.s.status.state = status-&gt;state;</div><div class='add'>+		sync_ptr.s.status.hw_ptr = status-&gt;hw_ptr;</div><div class='add'>+		sync_ptr.s.status.tstamp = status-&gt;tstamp;</div><div class='add'>+		sync_ptr.s.status.suspended_state = status-&gt;suspended_state;</div><div class='add'>+		sync_ptr.s.status.audio_tstamp = status-&gt;audio_tstamp;</div><div class='add'>+	}</div><div class='add'>+	if (!(sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='add'>+	if (copy_to_user(_sync_ptr, &amp;sync_ptr, sizeof(sync_ptr)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='hunk'>@@ -446,7 +529,8 @@ enum {</div><div class='ctx'> 	SNDRV_PCM_IOCTL_HW_REFINE32 = _IOWR('A', 0x10, struct snd_pcm_hw_params32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_HW_PARAMS32 = _IOWR('A', 0x11, struct snd_pcm_hw_params32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_SW_PARAMS32 = _IOWR('A', 0x13, struct snd_pcm_sw_params32),</div><div class='del'>-	SNDRV_PCM_IOCTL_STATUS32 = _IOR('A', 0x20, struct snd_pcm_status32),</div><div class='add'>+	SNDRV_PCM_IOCTL_STATUS_COMPAT32 = _IOR('A', 0x20, struct snd_pcm_status32),</div><div class='add'>+	SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT32 = _IOWR('A', 0x24, struct snd_pcm_status32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_DELAY32 = _IOR('A', 0x21, s32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_CHANNEL_INFO32 = _IOR('A', 0x32, struct snd_pcm_channel_info32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_REWIND32 = _IOW('A', 0x46, u32),</div><div class='hunk'>@@ -455,8 +539,12 @@ enum {</div><div class='ctx'> 	SNDRV_PCM_IOCTL_READI_FRAMES32 = _IOR('A', 0x51, struct snd_xferi32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_WRITEN_FRAMES32 = _IOW('A', 0x52, struct snd_xfern32),</div><div class='ctx'> 	SNDRV_PCM_IOCTL_READN_FRAMES32 = _IOR('A', 0x53, struct snd_xfern32),</div><div class='del'>-	SNDRV_PCM_IOCTL_SYNC_PTR32 = _IOWR('A', 0x23, struct snd_pcm_sync_ptr32),</div><div class='del'>-</div><div class='add'>+	SNDRV_PCM_IOCTL_STATUS_COMPAT64 = _IOR('A', 0x20, struct compat_snd_pcm_status64),</div><div class='add'>+	SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT64 = _IOWR('A', 0x24, struct compat_snd_pcm_status64),</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+	SNDRV_PCM_IOCTL_CHANNEL_INFO_X32 = _IOR('A', 0x32, struct snd_pcm_channel_info),</div><div class='add'>+	SNDRV_PCM_IOCTL_SYNC_PTR_X32 = _IOWR('A', 0x23, struct snd_pcm_sync_ptr_x32),</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -474,8 +562,8 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * When PCM is used on 32bit mode, we need to disable</div><div class='del'>-	 * mmap of PCM status/control records because of the size</div><div class='del'>-	 * incompatibility.</div><div class='add'>+	 * mmap of the old PCM status/control records because</div><div class='add'>+	 * of the size incompatibility.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pcm_file-&gt;no_compat_mmap = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -484,6 +572,7 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_INFO:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_TSTAMP:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_TTSTAMP:</div><div class='add'>+	case SNDRV_PCM_IOCTL_USER_PVERSION:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HWSYNC:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_PREPARE:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_RESET:</div><div class='hunk'>@@ -496,20 +585,24 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_XRUN:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_LINK:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_UNLINK:</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-			return snd_pcm_playback_ioctl1(file, substream, cmd, argp);</div><div class='del'>-		else</div><div class='del'>-			return snd_pcm_capture_ioctl1(file, substream, cmd, argp);</div><div class='add'>+	case __SNDRV_PCM_IOCTL_SYNC_PTR32:</div><div class='add'>+		return snd_pcm_common_ioctl(file, substream, cmd, argp);</div><div class='add'>+	case __SNDRV_PCM_IOCTL_SYNC_PTR64:</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+		if (in_x32_syscall())</div><div class='add'>+			return snd_pcm_ioctl_sync_ptr_x32(substream, argp);</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='add'>+		return snd_pcm_ioctl_sync_ptr_buggy(substream, argp);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HW_REFINE32:</div><div class='ctx'> 		return snd_pcm_ioctl_hw_params_compat(substream, 1, argp);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HW_PARAMS32:</div><div class='ctx'> 		return snd_pcm_ioctl_hw_params_compat(substream, 0, argp);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_SW_PARAMS32:</div><div class='ctx'> 		return snd_pcm_ioctl_sw_params_compat(substream, argp);</div><div class='del'>-	case SNDRV_PCM_IOCTL_STATUS32:</div><div class='del'>-		return snd_pcm_status_user_compat(substream, argp);</div><div class='del'>-	case SNDRV_PCM_IOCTL_SYNC_PTR32:</div><div class='del'>-		return snd_pcm_ioctl_sync_ptr_compat(substream, argp);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_COMPAT32:</div><div class='add'>+		return snd_pcm_status_user32(substream, argp, false);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT32:</div><div class='add'>+		return snd_pcm_status_user32(substream, argp, true);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_CHANNEL_INFO32:</div><div class='ctx'> 		return snd_pcm_ioctl_channel_info_compat(substream, argp);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_WRITEI_FRAMES32:</div><div class='hunk'>@@ -526,6 +619,14 @@ static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> 		return snd_pcm_ioctl_rewind_compat(substream, argp);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_FORWARD32:</div><div class='ctx'> 		return snd_pcm_ioctl_forward_compat(substream, argp);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_COMPAT64:</div><div class='add'>+		return snd_pcm_status_user_compat64(substream, argp, false);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT64:</div><div class='add'>+		return snd_pcm_status_user_compat64(substream, argp, true);</div><div class='add'>+#ifdef CONFIG_X86_X32_ABI</div><div class='add'>+	case SNDRV_PCM_IOCTL_CHANNEL_INFO_X32:</div><div class='add'>+		return snd_pcm_ioctl_channel_info_x32(substream, argp);</div><div class='add'>+#endif /* CONFIG_X86_X32_ABI */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='head'>diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c<br/>new file mode 100644<br/>index 000000000000..f0c17503df42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_dmaengine.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_dmaengine.c</a></div><div class='hunk'>@@ -0,0 +1,477 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (C) 2012, Analog Devices Inc.</div><div class='add'>+ *	Author: Lars-Peter Clausen &lt;lars@metafoo.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Based on:</div><div class='add'>+ *	imx-pcm-dma-mx2.c, Copyright 2009 Sascha Hauer &lt;s.hauer@pengutronix.de&gt;</div><div class='add'>+ *	mxs-pcm.c, Copyright (C) 2011 Freescale Semiconductor, Inc.</div><div class='add'>+ *	ep93xx-pcm.c, Copyright (C) 2006 Lennert Buytenhek &lt;buytenh@wantstofly.org&gt;</div><div class='add'>+ *		      Copyright (C) 2006 Applied Data Systems</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/dmaengine_pcm.h&gt;</div><div class='add'>+</div><div class='add'>+struct dmaengine_pcm_runtime_data {</div><div class='add'>+	struct dma_chan *dma_chan;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+</div><div class='add'>+	unsigned int pos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct dmaengine_pcm_runtime_data *substream_to_prtd(</div><div class='add'>+	const struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return substream-&gt;runtime-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+</div><div class='add'>+	return prtd-&gt;dma_chan;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_get_chan);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hwparams_to_dma_slave_config - Convert hw_params to dma_slave_config</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @params: hw_params</div><div class='add'>+ * @slave_config: DMA slave config</div><div class='add'>+ *</div><div class='add'>+ * This function can be used to initialize a dma_slave_config from a substream</div><div class='add'>+ * and hw_params in a dmaengine based PCM driver implementation.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_hwparams_to_dma_slave_config(const struct snd_pcm_substream *substream,</div><div class='add'>+	const struct snd_pcm_hw_params *params,</div><div class='add'>+	struct dma_slave_config *slave_config)</div><div class='add'>+{</div><div class='add'>+	enum dma_slave_buswidth buswidth;</div><div class='add'>+	int bits;</div><div class='add'>+</div><div class='add'>+	bits = params_physical_width(params);</div><div class='add'>+	if (bits &lt; 8 || bits &gt; 64)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else if (bits == 8)</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE;</div><div class='add'>+	else if (bits == 16)</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;</div><div class='add'>+	else if (bits == 24)</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_3_BYTES;</div><div class='add'>+	else if (bits &lt;= 32)</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+	else</div><div class='add'>+		buswidth = DMA_SLAVE_BUSWIDTH_8_BYTES;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+		slave_config-&gt;direction = DMA_MEM_TO_DEV;</div><div class='add'>+		slave_config-&gt;dst_addr_width = buswidth;</div><div class='add'>+	} else {</div><div class='add'>+		slave_config-&gt;direction = DMA_DEV_TO_MEM;</div><div class='add'>+		slave_config-&gt;src_addr_width = buswidth;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slave_config-&gt;device_fc = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hwparams_to_dma_slave_config);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_set_config_from_dai_data() - Initializes a dma slave config</div><div class='add'>+ *  using DAI DMA data.</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @dma_data: DAI DMA data</div><div class='add'>+ * @slave_config: DMA slave configuration</div><div class='add'>+ *</div><div class='add'>+ * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width</div><div class='add'>+ * fields of the DMA slave config from the same fields of the DAI DMA</div><div class='add'>+ * data struct. The src and dst fields will be initialized depending on the</div><div class='add'>+ * direction of the substream. If the substream is a playback stream the dst</div><div class='add'>+ * fields will be initialized, if it is a capture stream the src fields will be</div><div class='add'>+ * initialized. The {dst,src}_addr_width field will only be initialized if the</div><div class='add'>+ * SND_DMAENGINE_PCM_DAI_FLAG_PACK flag is set or if the addr_width field of</div><div class='add'>+ * the DAI DMA data struct is not equal to DMA_SLAVE_BUSWIDTH_UNDEFINED. If</div><div class='add'>+ * both conditions are met the latter takes priority.</div><div class='add'>+ */</div><div class='add'>+void snd_dmaengine_pcm_set_config_from_dai_data(</div><div class='add'>+	const struct snd_pcm_substream *substream,</div><div class='add'>+	const struct snd_dmaengine_dai_dma_data *dma_data,</div><div class='add'>+	struct dma_slave_config *slave_config)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+		slave_config-&gt;dst_addr = dma_data-&gt;addr;</div><div class='add'>+		slave_config-&gt;dst_maxburst = dma_data-&gt;maxburst;</div><div class='add'>+		slave_config-&gt;dst_port_window_size = dma_data-&gt;port_window_size;</div><div class='add'>+		if (dma_data-&gt;flags &amp; SND_DMAENGINE_PCM_DAI_FLAG_PACK)</div><div class='add'>+			slave_config-&gt;dst_addr_width =</div><div class='add'>+				DMA_SLAVE_BUSWIDTH_UNDEFINED;</div><div class='add'>+		if (dma_data-&gt;addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED)</div><div class='add'>+			slave_config-&gt;dst_addr_width = dma_data-&gt;addr_width;</div><div class='add'>+	} else {</div><div class='add'>+		slave_config-&gt;src_addr = dma_data-&gt;addr;</div><div class='add'>+		slave_config-&gt;src_maxburst = dma_data-&gt;maxburst;</div><div class='add'>+		slave_config-&gt;src_port_window_size = dma_data-&gt;port_window_size;</div><div class='add'>+		if (dma_data-&gt;flags &amp; SND_DMAENGINE_PCM_DAI_FLAG_PACK)</div><div class='add'>+			slave_config-&gt;src_addr_width =</div><div class='add'>+				DMA_SLAVE_BUSWIDTH_UNDEFINED;</div><div class='add'>+		if (dma_data-&gt;addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED)</div><div class='add'>+			slave_config-&gt;src_addr_width = dma_data-&gt;addr_width;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slave_config-&gt;peripheral_config = dma_data-&gt;peripheral_config;</div><div class='add'>+	slave_config-&gt;peripheral_size = dma_data-&gt;peripheral_size;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_config_from_dai_data);</div><div class='add'>+</div><div class='add'>+static void dmaengine_pcm_dma_complete(void *arg)</div><div class='add'>+{</div><div class='add'>+	unsigned int new_pos;</div><div class='add'>+	struct snd_pcm_substream *substream = arg;</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+</div><div class='add'>+	new_pos = prtd-&gt;pos + snd_pcm_lib_period_bytes(substream);</div><div class='add'>+	if (new_pos &gt;= snd_pcm_lib_buffer_bytes(substream))</div><div class='add'>+		new_pos = 0;</div><div class='add'>+	prtd-&gt;pos = new_pos;</div><div class='add'>+</div><div class='add'>+	snd_pcm_period_elapsed(substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	struct dma_chan *chan = prtd-&gt;dma_chan;</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	enum dma_transfer_direction direction;</div><div class='add'>+	unsigned long flags = DMA_CTRL_ACK;</div><div class='add'>+</div><div class='add'>+	direction = snd_pcm_substream_to_dma_direction(substream);</div><div class='add'>+</div><div class='add'>+	if (!substream-&gt;runtime-&gt;no_period_wakeup)</div><div class='add'>+		flags |= DMA_PREP_INTERRUPT;</div><div class='add'>+</div><div class='add'>+	prtd-&gt;pos = 0;</div><div class='add'>+	desc = dmaengine_prep_dma_cyclic(chan,</div><div class='add'>+		substream-&gt;runtime-&gt;dma_addr,</div><div class='add'>+		snd_pcm_lib_buffer_bytes(substream),</div><div class='add'>+		snd_pcm_lib_period_bytes(substream), direction, flags);</div><div class='add'>+</div><div class='add'>+	if (!desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	desc-&gt;callback = dmaengine_pcm_dma_complete;</div><div class='add'>+	desc-&gt;callback_param = substream;</div><div class='add'>+	prtd-&gt;cookie = dmaengine_submit(desc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_trigger - dmaengine based PCM trigger implementation</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @cmd: Trigger command</div><div class='add'>+ *</div><div class='add'>+ * This function can be used as the PCM trigger callback for dmaengine based PCM</div><div class='add'>+ * driver implementations.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative error code otherwise</div><div class='add'>+ */</div><div class='add'>+int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		ret = dmaengine_pcm_prepare_and_submit(substream);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		dma_async_issue_pending(prtd-&gt;dma_chan);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+		dmaengine_resume(prtd-&gt;dma_chan);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='add'>+		if (runtime-&gt;info &amp; SNDRV_PCM_INFO_PAUSE)</div><div class='add'>+			dmaengine_pause(prtd-&gt;dma_chan);</div><div class='add'>+		else</div><div class='add'>+			dmaengine_terminate_async(prtd-&gt;dma_chan);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+		dmaengine_pause(prtd-&gt;dma_chan);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		dmaengine_terminate_async(prtd-&gt;dma_chan);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_trigger);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_pointer_no_residue - dmaengine based PCM pointer implementation</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This function is deprecated and should not be used by new drivers, as its</div><div class='add'>+ * results may be unreliable.</div><div class='add'>+ *</div><div class='add'>+ * Return: PCM position in frames</div><div class='add'>+ */</div><div class='add'>+snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime, prtd-&gt;pos);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_pointer_no_residue);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_pointer - dmaengine based PCM pointer implementation</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This function can be used as the PCM pointer callback for dmaengine based PCM</div><div class='add'>+ * driver implementations.</div><div class='add'>+ *</div><div class='add'>+ * Return: PCM position in frames</div><div class='add'>+ */</div><div class='add'>+snd_pcm_uframes_t snd_dmaengine_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct dma_tx_state state;</div><div class='add'>+	enum dma_status status;</div><div class='add'>+	unsigned int buf_size;</div><div class='add'>+	unsigned int pos = 0;</div><div class='add'>+</div><div class='add'>+	status = dmaengine_tx_status(prtd-&gt;dma_chan, prtd-&gt;cookie, &amp;state);</div><div class='add'>+	if (status == DMA_IN_PROGRESS || status == DMA_PAUSED) {</div><div class='add'>+		buf_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='add'>+		if (state.residue &gt; 0 &amp;&amp; state.residue &lt;= buf_size)</div><div class='add'>+			pos = buf_size - state.residue;</div><div class='add'>+</div><div class='add'>+		runtime-&gt;delay = bytes_to_frames(runtime,</div><div class='add'>+						 state.in_flight_bytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bytes_to_frames(runtime, pos);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_pointer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_request_channel - Request channel for the dmaengine PCM</div><div class='add'>+ * @filter_fn: Filter function used to request the DMA channel</div><div class='add'>+ * @filter_data: Data passed to the DMA filter function</div><div class='add'>+ *</div><div class='add'>+ * This function request a DMA channel for usage with dmaengine PCM.</div><div class='add'>+ *</div><div class='add'>+ * Return: NULL or the requested DMA channel</div><div class='add'>+ */</div><div class='add'>+struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn,</div><div class='add'>+	void *filter_data)</div><div class='add'>+{</div><div class='add'>+	dma_cap_mask_t mask;</div><div class='add'>+</div><div class='add'>+	dma_cap_zero(mask);</div><div class='add'>+	dma_cap_set(DMA_SLAVE, mask);</div><div class='add'>+	dma_cap_set(DMA_CYCLIC, mask);</div><div class='add'>+</div><div class='add'>+	return dma_request_channel(mask, filter_fn, filter_data);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_open - Open a dmaengine based PCM substream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @chan: DMA channel to use for data transfers</div><div class='add'>+ *</div><div class='add'>+ * The function should usually be called from the pcm open callback. Note that</div><div class='add'>+ * this function will use private_data field of the substream's runtime. So it</div><div class='add'>+ * is not available to your pcm driver implementation.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative error code otherwise</div><div class='add'>+ */</div><div class='add'>+int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream,</div><div class='add'>+	struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!chan)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_hw_constraint_integer(substream-&gt;runtime,</div><div class='add'>+					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);</div><div class='add'>+	if (!prtd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	prtd-&gt;dma_chan = chan;</div><div class='add'>+</div><div class='add'>+	substream-&gt;runtime-&gt;private_data = prtd;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open);</div><div class='add'>+</div><div class='add'>+int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	struct dma_tx_state state;</div><div class='add'>+	enum dma_status status;</div><div class='add'>+</div><div class='add'>+	status = dmaengine_tx_status(prtd-&gt;dma_chan, prtd-&gt;cookie, &amp;state);</div><div class='add'>+	if (status != DMA_PAUSED)</div><div class='add'>+		dmaengine_synchronize(prtd-&gt;dma_chan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);</div><div class='add'>+</div><div class='add'>+static void __snd_dmaengine_pcm_close(struct snd_pcm_substream *substream,</div><div class='add'>+				      bool release_channel)</div><div class='add'>+{</div><div class='add'>+	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);</div><div class='add'>+	struct dma_tx_state state;</div><div class='add'>+	enum dma_status status;</div><div class='add'>+</div><div class='add'>+	status = dmaengine_tx_status(prtd-&gt;dma_chan, prtd-&gt;cookie, &amp;state);</div><div class='add'>+	if (status == DMA_PAUSED)</div><div class='add'>+		dmaengine_terminate_async(prtd-&gt;dma_chan);</div><div class='add'>+</div><div class='add'>+	dmaengine_synchronize(prtd-&gt;dma_chan);</div><div class='add'>+	if (release_channel)</div><div class='add'>+		dma_release_channel(prtd-&gt;dma_chan);</div><div class='add'>+	kfree(prtd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative error code otherwise</div><div class='add'>+ */</div><div class='add'>+int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	__snd_dmaengine_pcm_close(substream, false);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_close_release_chan - Close a dmaengine based PCM</div><div class='add'>+ *					  substream and release channel</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * Releases the DMA channel associated with the PCM substream.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	__snd_dmaengine_pcm_close(substream, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close_release_chan);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_dmaengine_pcm_refine_runtime_hwparams - Refine runtime hw params</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @dma_data: DAI DMA data</div><div class='add'>+ * @hw: PCM hw params</div><div class='add'>+ * @chan: DMA channel to use for data transfers</div><div class='add'>+ *</div><div class='add'>+ * This function will query DMA capability, then refine the pcm hardware</div><div class='add'>+ * parameters.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, a negative error code otherwise</div><div class='add'>+ */</div><div class='add'>+int snd_dmaengine_pcm_refine_runtime_hwparams(</div><div class='add'>+	struct snd_pcm_substream *substream,</div><div class='add'>+	struct snd_dmaengine_dai_dma_data *dma_data,</div><div class='add'>+	struct snd_pcm_hardware *hw,</div><div class='add'>+	struct dma_chan *chan)</div><div class='add'>+{</div><div class='add'>+	struct dma_slave_caps dma_caps;</div><div class='add'>+	u32 addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |</div><div class='add'>+			  BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) |</div><div class='add'>+			  BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);</div><div class='add'>+	snd_pcm_format_t i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!hw || !chan || !dma_data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = dma_get_slave_caps(chan, &amp;dma_caps);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		if (dma_caps.cmd_pause &amp;&amp; dma_caps.cmd_resume)</div><div class='add'>+			hw-&gt;info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME;</div><div class='add'>+		if (dma_caps.residue_granularity &lt;= DMA_RESIDUE_GRANULARITY_SEGMENT)</div><div class='add'>+			hw-&gt;info |= SNDRV_PCM_INFO_BATCH;</div><div class='add'>+</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+			addr_widths = dma_caps.dst_addr_widths;</div><div class='add'>+		else</div><div class='add'>+			addr_widths = dma_caps.src_addr_widths;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If SND_DMAENGINE_PCM_DAI_FLAG_PACK is set keep</div><div class='add'>+	 * hw.formats set to 0, meaning no restrictions are in place.</div><div class='add'>+	 * In this case it's the responsibility of the DAI driver to</div><div class='add'>+	 * provide the supported format information.</div><div class='add'>+	 */</div><div class='add'>+	if (!(dma_data-&gt;flags &amp; SND_DMAENGINE_PCM_DAI_FLAG_PACK))</div><div class='add'>+		/*</div><div class='add'>+		 * Prepare formats mask for valid/allowed sample types. If the</div><div class='add'>+		 * dma does not have support for the given physical word size,</div><div class='add'>+		 * it needs to be masked out so user space can not use the</div><div class='add'>+		 * format which produces corrupted audio.</div><div class='add'>+		 * In case the dma driver does not implement the slave_caps the</div><div class='add'>+		 * default assumption is that it supports 1, 2 and 4 bytes</div><div class='add'>+		 * widths.</div><div class='add'>+		 */</div><div class='add'>+		pcm_for_each_format(i) {</div><div class='add'>+			int bits = snd_pcm_format_physical_width(i);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Enable only samples with DMA supported physical</div><div class='add'>+			 * widths</div><div class='add'>+			 */</div><div class='add'>+			switch (bits) {</div><div class='add'>+			case 8:</div><div class='add'>+			case 16:</div><div class='add'>+			case 24:</div><div class='add'>+			case 32:</div><div class='add'>+			case 64:</div><div class='add'>+				if (addr_widths &amp; (1 &lt;&lt; (bits / 8)))</div><div class='add'>+					hw-&gt;formats |= pcm_format_to_bits(i);</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				/* Unsupported types */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_refine_runtime_hwparams);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("PCM dmaengine helper APIs");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c<br/>new file mode 100644<br/>index 000000000000..cb2eebaac85f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_drm_eld.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_drm_eld.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  PCM DRM helpers</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/hdmi.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;drm/drm_edid.h&gt;</div><div class='add'>+#include &lt;drm/drm_eld.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_drm_eld.h&gt;</div><div class='add'>+</div><div class='add'>+#define SAD0_CHANNELS_MASK	GENMASK(2, 0) /* max number of channels - 1 */</div><div class='add'>+#define SAD0_FORMAT_MASK	GENMASK(6, 3) /* audio format */</div><div class='add'>+</div><div class='add'>+#define SAD1_RATE_MASK		GENMASK(6, 0) /* bitfield of supported rates */</div><div class='add'>+#define SAD1_RATE_32000_MASK	BIT(0)</div><div class='add'>+#define SAD1_RATE_44100_MASK	BIT(1)</div><div class='add'>+#define SAD1_RATE_48000_MASK	BIT(2)</div><div class='add'>+#define SAD1_RATE_88200_MASK	BIT(3)</div><div class='add'>+#define SAD1_RATE_96000_MASK	BIT(4)</div><div class='add'>+#define SAD1_RATE_176400_MASK	BIT(5)</div><div class='add'>+#define SAD1_RATE_192000_MASK	BIT(6)</div><div class='add'>+</div><div class='add'>+static const unsigned int eld_rates[] = {</div><div class='add'>+	32000,</div><div class='add'>+	44100,</div><div class='add'>+	48000,</div><div class='add'>+	88200,</div><div class='add'>+	96000,</div><div class='add'>+	176400,</div><div class='add'>+	192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int map_rate_families(const u8 *sad,</div><div class='add'>+				      unsigned int mask_32000,</div><div class='add'>+				      unsigned int mask_44100,</div><div class='add'>+				      unsigned int mask_48000)</div><div class='add'>+{</div><div class='add'>+	unsigned int rate_mask = 0;</div><div class='add'>+</div><div class='add'>+	if (sad[1] &amp; SAD1_RATE_32000_MASK)</div><div class='add'>+		rate_mask |= mask_32000;</div><div class='add'>+	if (sad[1] &amp; (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK))</div><div class='add'>+		rate_mask |= mask_44100;</div><div class='add'>+	if (sad[1] &amp; (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK))</div><div class='add'>+		rate_mask |= mask_48000;</div><div class='add'>+	return rate_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sad_rate_mask(const u8 *sad)</div><div class='add'>+{</div><div class='add'>+	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_PCM:</div><div class='add'>+		return sad[1] &amp; SAD1_RATE_MASK;</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_AC3:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_DTS:</div><div class='add'>+		return map_rate_families(sad,</div><div class='add'>+					 SAD1_RATE_32000_MASK,</div><div class='add'>+					 SAD1_RATE_44100_MASK,</div><div class='add'>+					 SAD1_RATE_48000_MASK);</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_EAC3:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_MLP:</div><div class='add'>+		return map_rate_families(sad,</div><div class='add'>+					 0,</div><div class='add'>+					 SAD1_RATE_176400_MASK,</div><div class='add'>+					 SAD1_RATE_192000_MASK);</div><div class='add'>+	default:</div><div class='add'>+		/* TODO adjust for other compressed formats as well */</div><div class='add'>+		return sad[1] &amp; SAD1_RATE_MASK;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int sad_max_channels(const u8 *sad)</div><div class='add'>+{</div><div class='add'>+	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_PCM:</div><div class='add'>+		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_AC3:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_DTS:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_EAC3:</div><div class='add'>+		return 2;</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:</div><div class='add'>+	case HDMI_AUDIO_CODING_TYPE_MLP:</div><div class='add'>+		return 8;</div><div class='add'>+	default:</div><div class='add'>+		/* TODO adjust for other compressed formats as well */</div><div class='add'>+		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eld_limit_rates(struct snd_pcm_hw_params *params,</div><div class='add'>+			   struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *r = hw_param_interval(params, rule-&gt;var);</div><div class='add'>+	const struct snd_interval *c;</div><div class='add'>+	unsigned int rate_mask = 7, i;</div><div class='add'>+	const u8 *sad, *eld = rule-&gt;private;</div><div class='add'>+</div><div class='add'>+	sad = drm_eld_sad(eld);</div><div class='add'>+	if (sad) {</div><div class='add'>+		c = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+</div><div class='add'>+		for (i = drm_eld_sad_count(eld); i &gt; 0; i--, sad += 3) {</div><div class='add'>+			unsigned max_channels = sad_max_channels(sad);</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Exclude SADs which do not include the</div><div class='add'>+			 * requested number of channels.</div><div class='add'>+			 */</div><div class='add'>+			if (c-&gt;min &lt;= max_channels)</div><div class='add'>+				rate_mask |= sad_rate_mask(sad);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_list(r, ARRAY_SIZE(eld_rates), eld_rates,</div><div class='add'>+				 rate_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eld_limit_channels(struct snd_pcm_hw_params *params,</div><div class='add'>+			      struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *c = hw_param_interval(params, rule-&gt;var);</div><div class='add'>+	const struct snd_interval *r;</div><div class='add'>+	struct snd_interval t = { .min = 1, .max = 2, .integer = 1, };</div><div class='add'>+	unsigned int i;</div><div class='add'>+	const u8 *sad, *eld = rule-&gt;private;</div><div class='add'>+</div><div class='add'>+	sad = drm_eld_sad(eld);</div><div class='add'>+	if (sad) {</div><div class='add'>+		unsigned int rate_mask = 0;</div><div class='add'>+</div><div class='add'>+		/* Convert the rate interval to a mask */</div><div class='add'>+		r = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(eld_rates); i++)</div><div class='add'>+			if (r-&gt;min &lt;= eld_rates[i] &amp;&amp; r-&gt;max &gt;= eld_rates[i])</div><div class='add'>+				rate_mask |= BIT(i);</div><div class='add'>+</div><div class='add'>+		for (i = drm_eld_sad_count(eld); i &gt; 0; i--, sad += 3)</div><div class='add'>+			if (rate_mask &amp; sad_rate_mask(sad))</div><div class='add'>+				t.max = max(t.max, sad_max_channels(sad));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_pcm_hw_constraint_eld(struct snd_pcm_runtime *runtime, void *eld)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  eld_limit_rates, eld,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  eld_limit_channels, eld,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_hw_constraint_eld);</div><div class='add'>+</div><div class='add'>+#define SND_PRINT_RATES_ADVISED_BUFSIZE	80</div><div class='add'>+#define SND_PRINT_BITS_ADVISED_BUFSIZE	16</div><div class='add'>+#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80</div><div class='add'>+</div><div class='add'>+static const char * const eld_connection_type_names[4] = {</div><div class='add'>+	"HDMI",</div><div class='add'>+	"DisplayPort",</div><div class='add'>+	"2-reserved",</div><div class='add'>+	"3-reserved"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cea_audio_coding_type_names[] = {</div><div class='add'>+	/*  0 */ "undefined",</div><div class='add'>+	/*  1 */ "LPCM",</div><div class='add'>+	/*  2 */ "AC-3",</div><div class='add'>+	/*  3 */ "MPEG1",</div><div class='add'>+	/*  4 */ "MP3",</div><div class='add'>+	/*  5 */ "MPEG2",</div><div class='add'>+	/*  6 */ "AAC-LC",</div><div class='add'>+	/*  7 */ "DTS",</div><div class='add'>+	/*  8 */ "ATRAC",</div><div class='add'>+	/*  9 */ "DSD (One Bit Audio)",</div><div class='add'>+	/* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)",</div><div class='add'>+	/* 11 */ "DTS-HD",</div><div class='add'>+	/* 12 */ "MLP (Dolby TrueHD)",</div><div class='add'>+	/* 13 */ "DST",</div><div class='add'>+	/* 14 */ "WMAPro",</div><div class='add'>+	/* 15 */ "HE-AAC",</div><div class='add'>+	/* 16 */ "HE-AACv2",</div><div class='add'>+	/* 17 */ "MPEG Surround",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cea_speaker_allocation_names[] = {</div><div class='add'>+	/*  0 */ "FL/FR",</div><div class='add'>+	/*  1 */ "LFE",</div><div class='add'>+	/*  2 */ "FC",</div><div class='add'>+	/*  3 */ "RL/RR",</div><div class='add'>+	/*  4 */ "RC",</div><div class='add'>+	/*  5 */ "FLC/FRC",</div><div class='add'>+	/*  6 */ "RLC/RRC",</div><div class='add'>+	/*  7 */ "FLW/FRW",</div><div class='add'>+	/*  8 */ "FLH/FRH",</div><div class='add'>+	/*  9 */ "TC",</div><div class='add'>+	/* 10 */ "FCH",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SS1:SS0 index =&gt; sample size</div><div class='add'>+ */</div><div class='add'>+static const int cea_sample_sizes[4] = {</div><div class='add'>+	0,			/* 0: Refer to Stream Header */</div><div class='add'>+	ELD_PCM_BITS_16,	/* 1: 16 bits */</div><div class='add'>+	ELD_PCM_BITS_20,	/* 2: 20 bits */</div><div class='add'>+	ELD_PCM_BITS_24,	/* 3: 24 bits */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SF2:SF1:SF0 index =&gt; sampling frequency</div><div class='add'>+ */</div><div class='add'>+static const int cea_sampling_frequencies[8] = {</div><div class='add'>+	0,			/* 0: Refer to Stream Header */</div><div class='add'>+	SNDRV_PCM_RATE_32000,	/* 1:  32000Hz */</div><div class='add'>+	SNDRV_PCM_RATE_44100,	/* 2:  44100Hz */</div><div class='add'>+	SNDRV_PCM_RATE_48000,	/* 3:  48000Hz */</div><div class='add'>+	SNDRV_PCM_RATE_88200,	/* 4:  88200Hz */</div><div class='add'>+	SNDRV_PCM_RATE_96000,	/* 5:  96000Hz */</div><div class='add'>+	SNDRV_PCM_RATE_176400,	/* 6: 176400Hz */</div><div class='add'>+	SNDRV_PCM_RATE_192000,	/* 7: 192000Hz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GRAB_BITS(buf, byte, lowbit, bits)		\</div><div class='add'>+({							\</div><div class='add'>+	BUILD_BUG_ON(lowbit &gt; 7);			\</div><div class='add'>+	BUILD_BUG_ON(bits &gt; 8);				\</div><div class='add'>+	BUILD_BUG_ON(bits &lt;= 0);			\</div><div class='add'>+							\</div><div class='add'>+	(buf[byte] &gt;&gt; (lowbit)) &amp; ((1 &lt;&lt; (bits)) - 1);	\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static void hdmi_update_short_audio_desc(struct device *dev,</div><div class='add'>+					 struct snd_cea_sad *a,</div><div class='add'>+					 const unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = GRAB_BITS(buf, 1, 0, 7);</div><div class='add'>+	a-&gt;rates = 0;</div><div class='add'>+	for (i = 0; i &lt; 7; i++)</div><div class='add'>+		if (val &amp; (1 &lt;&lt; i))</div><div class='add'>+			a-&gt;rates |= cea_sampling_frequencies[i + 1];</div><div class='add'>+</div><div class='add'>+	a-&gt;channels = GRAB_BITS(buf, 0, 0, 3);</div><div class='add'>+	a-&gt;channels++;</div><div class='add'>+</div><div class='add'>+	a-&gt;sample_bits = 0;</div><div class='add'>+	a-&gt;max_bitrate = 0;</div><div class='add'>+</div><div class='add'>+	a-&gt;format = GRAB_BITS(buf, 0, 3, 4);</div><div class='add'>+	switch (a-&gt;format) {</div><div class='add'>+	case AUDIO_CODING_TYPE_REF_STREAM_HEADER:</div><div class='add'>+		dev_info(dev, "HDMI: audio coding type 0 not expected\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_LPCM:</div><div class='add'>+		val = GRAB_BITS(buf, 2, 0, 3);</div><div class='add'>+		for (i = 0; i &lt; 3; i++)</div><div class='add'>+			if (val &amp; (1 &lt;&lt; i))</div><div class='add'>+				a-&gt;sample_bits |= cea_sample_sizes[i + 1];</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_AC3:</div><div class='add'>+	case AUDIO_CODING_TYPE_MPEG1:</div><div class='add'>+	case AUDIO_CODING_TYPE_MP3:</div><div class='add'>+	case AUDIO_CODING_TYPE_MPEG2:</div><div class='add'>+	case AUDIO_CODING_TYPE_AACLC:</div><div class='add'>+	case AUDIO_CODING_TYPE_DTS:</div><div class='add'>+	case AUDIO_CODING_TYPE_ATRAC:</div><div class='add'>+		a-&gt;max_bitrate = GRAB_BITS(buf, 2, 0, 8);</div><div class='add'>+		a-&gt;max_bitrate *= 8000;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_SACD:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_EAC3:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_DTS_HD:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_MLP:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_DST:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_WMAPRO:</div><div class='add'>+		a-&gt;profile = GRAB_BITS(buf, 2, 0, 3);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case AUDIO_CODING_TYPE_REF_CXT:</div><div class='add'>+		a-&gt;format = GRAB_BITS(buf, 2, 3, 5);</div><div class='add'>+		if (a-&gt;format == AUDIO_CODING_XTYPE_HE_REF_CT ||</div><div class='add'>+		    a-&gt;format &gt;= AUDIO_CODING_XTYPE_FIRST_RESERVED) {</div><div class='add'>+			dev_info(dev,</div><div class='add'>+				   "HDMI: audio coding xtype %d not expected\n",</div><div class='add'>+				   a-&gt;format);</div><div class='add'>+			a-&gt;format = 0;</div><div class='add'>+		} else</div><div class='add'>+			a-&gt;format += AUDIO_CODING_TYPE_HE_AAC -</div><div class='add'>+				     AUDIO_CODING_XTYPE_HE_AAC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Be careful, ELD buf could be totally rubbish!</div><div class='add'>+ */</div><div class='add'>+int snd_parse_eld(struct device *dev, struct snd_parsed_hdmi_eld *e,</div><div class='add'>+		  const unsigned char *buf, int size)</div><div class='add'>+{</div><div class='add'>+	int mnl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(e, 0, sizeof(*e));</div><div class='add'>+	e-&gt;eld_ver = GRAB_BITS(buf, 0, 3, 5);</div><div class='add'>+	if (e-&gt;eld_ver != ELD_VER_CEA_861D &amp;&amp;</div><div class='add'>+	    e-&gt;eld_ver != ELD_VER_PARTIAL) {</div><div class='add'>+		dev_info(dev, "HDMI: Unknown ELD version %d\n", e-&gt;eld_ver);</div><div class='add'>+		goto out_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	e-&gt;baseline_len = GRAB_BITS(buf, 2, 0, 8);</div><div class='add'>+	mnl		= GRAB_BITS(buf, 4, 0, 5);</div><div class='add'>+	e-&gt;cea_edid_ver	= GRAB_BITS(buf, 4, 5, 3);</div><div class='add'>+</div><div class='add'>+	e-&gt;support_hdcp	= GRAB_BITS(buf, 5, 0, 1);</div><div class='add'>+	e-&gt;support_ai	= GRAB_BITS(buf, 5, 1, 1);</div><div class='add'>+	e-&gt;conn_type	= GRAB_BITS(buf, 5, 2, 2);</div><div class='add'>+	e-&gt;sad_count	= GRAB_BITS(buf, 5, 4, 4);</div><div class='add'>+</div><div class='add'>+	e-&gt;aud_synch_delay = GRAB_BITS(buf, 6, 0, 8) * 2;</div><div class='add'>+	e-&gt;spk_alloc	= GRAB_BITS(buf, 7, 0, 7);</div><div class='add'>+</div><div class='add'>+	e-&gt;port_id	  = get_unaligned_le64(buf + 8);</div><div class='add'>+</div><div class='add'>+	/* not specified, but the spec's tendency is little endian */</div><div class='add'>+	e-&gt;manufacture_id = get_unaligned_le16(buf + 16);</div><div class='add'>+	e-&gt;product_id	  = get_unaligned_le16(buf + 18);</div><div class='add'>+</div><div class='add'>+	if (mnl &gt; ELD_MAX_MNL) {</div><div class='add'>+		dev_info(dev, "HDMI: MNL is reserved value %d\n", mnl);</div><div class='add'>+		goto out_fail;</div><div class='add'>+	} else if (ELD_FIXED_BYTES + mnl &gt; size) {</div><div class='add'>+		dev_info(dev, "HDMI: out of range MNL %d\n", mnl);</div><div class='add'>+		goto out_fail;</div><div class='add'>+	} else</div><div class='add'>+		strscpy(e-&gt;monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;sad_count; i++) {</div><div class='add'>+		if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) &gt; size) {</div><div class='add'>+			dev_info(dev, "HDMI: out of range SAD %d\n", i);</div><div class='add'>+			goto out_fail;</div><div class='add'>+		}</div><div class='add'>+		hdmi_update_short_audio_desc(dev, e-&gt;sad + i,</div><div class='add'>+					     buf + ELD_FIXED_BYTES + mnl + 3 * i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HDMI sink's ELD info cannot always be retrieved for now, e.g.</div><div class='add'>+	 * in console or for audio devices. Assume the highest speakers</div><div class='add'>+	 * configuration, to _not_ prohibit multi-channel audio playback.</div><div class='add'>+	 */</div><div class='add'>+	if (!e-&gt;spk_alloc &amp;&amp; e-&gt;sad_count)</div><div class='add'>+		e-&gt;spk_alloc = 0xffff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_fail:</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_parse_eld);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SNDRV_PCM_RATE_* and AC_PAR_PCM values don't match, print correct rates with</div><div class='add'>+ * hdmi-specific routine.</div><div class='add'>+ */</div><div class='add'>+static void hdmi_print_pcm_rates(int pcm, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int alsa_rates[] = {</div><div class='add'>+		5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,</div><div class='add'>+		88200, 96000, 176400, 192000, 384000</div><div class='add'>+	};</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(alsa_rates); i++)</div><div class='add'>+		if (pcm &amp; (1 &lt;&lt; i))</div><div class='add'>+			j += scnprintf(buf + j, buflen - j,  " %d",</div><div class='add'>+				alsa_rates[i]);</div><div class='add'>+</div><div class='add'>+	buf[j] = '\0'; /* necessary when j == 0 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eld_print_pcm_bits(int pcm, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int bits[] = { 8, 16, 20, 24, 32 };</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(bits); i++)</div><div class='add'>+		if (pcm &amp; (ELD_PCM_BITS_8 &lt;&lt; i))</div><div class='add'>+			j += scnprintf(buf + j, buflen - j,  " %d", bits[i]);</div><div class='add'>+</div><div class='add'>+	buf[j] = '\0'; /* necessary when j == 0 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_show_short_audio_desc(struct device *dev,</div><div class='add'>+				       struct snd_cea_sad *a)</div><div class='add'>+{</div><div class='add'>+	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];</div><div class='add'>+	char buf2[8 + SND_PRINT_BITS_ADVISED_BUFSIZE] = ", bits =";</div><div class='add'>+</div><div class='add'>+	if (!a-&gt;format)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdmi_print_pcm_rates(a-&gt;rates, buf, sizeof(buf));</div><div class='add'>+</div><div class='add'>+	if (a-&gt;format == AUDIO_CODING_TYPE_LPCM)</div><div class='add'>+		eld_print_pcm_bits(a-&gt;sample_bits, buf2 + 8, sizeof(buf2) - 8);</div><div class='add'>+	else if (a-&gt;max_bitrate)</div><div class='add'>+		snprintf(buf2, sizeof(buf2),</div><div class='add'>+				", max bitrate = %d", a-&gt;max_bitrate);</div><div class='add'>+	else</div><div class='add'>+		buf2[0] = '\0';</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev,</div><div class='add'>+		"HDMI: supports coding type %s: channels = %d, rates =%s%s\n",</div><div class='add'>+		cea_audio_coding_type_names[a-&gt;format],</div><div class='add'>+		a-&gt;channels, buf, buf2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_eld_print_channel_allocation(int spk_alloc, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(cea_speaker_allocation_names); i++) {</div><div class='add'>+		if (spk_alloc &amp; (1 &lt;&lt; i))</div><div class='add'>+			j += scnprintf(buf + j, buflen - j,  " %s",</div><div class='add'>+					cea_speaker_allocation_names[i]);</div><div class='add'>+	}</div><div class='add'>+	buf[j] = '\0';	/* necessary when j == 0 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_show_eld(struct device *dev, struct snd_parsed_hdmi_eld *e)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "HDMI: detected monitor %s at connection type %s\n",</div><div class='add'>+		e-&gt;monitor_name,</div><div class='add'>+		eld_connection_type_names[e-&gt;conn_type]);</div><div class='add'>+</div><div class='add'>+	if (e-&gt;spk_alloc) {</div><div class='add'>+		char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='add'>+</div><div class='add'>+		snd_eld_print_channel_allocation(e-&gt;spk_alloc, buf, sizeof(buf));</div><div class='add'>+		dev_dbg(dev, "HDMI: available speakers:%s\n", buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;sad_count; i++)</div><div class='add'>+		hdmi_show_short_audio_desc(dev, e-&gt;sad + i);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_show_eld);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+static void hdmi_print_sad_info(int i, struct snd_cea_sad *a,</div><div class='add'>+				struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "sad%d_coding_type\t[0x%x] %s\n",</div><div class='add'>+			i, a-&gt;format, cea_audio_coding_type_names[a-&gt;format]);</div><div class='add'>+	snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a-&gt;channels);</div><div class='add'>+</div><div class='add'>+	hdmi_print_pcm_rates(a-&gt;rates, buf, sizeof(buf));</div><div class='add'>+	snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a-&gt;rates, buf);</div><div class='add'>+</div><div class='add'>+	if (a-&gt;format == AUDIO_CODING_TYPE_LPCM) {</div><div class='add'>+		eld_print_pcm_bits(a-&gt;sample_bits, buf, sizeof(buf));</div><div class='add'>+		snd_iprintf(buffer, "sad%d_bits\t\t[0x%x]%s\n",</div><div class='add'>+							i, a-&gt;sample_bits, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (a-&gt;max_bitrate)</div><div class='add'>+		snd_iprintf(buffer, "sad%d_max_bitrate\t%d\n",</div><div class='add'>+							i, a-&gt;max_bitrate);</div><div class='add'>+</div><div class='add'>+	if (a-&gt;profile)</div><div class='add'>+		snd_iprintf(buffer, "sad%d_profile\t\t%d\n", i, a-&gt;profile);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_print_eld_info(struct snd_parsed_hdmi_eld *e,</div><div class='add'>+			struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='add'>+	int i;</div><div class='add'>+	static const char * const eld_version_names[32] = {</div><div class='add'>+		"reserved",</div><div class='add'>+		"reserved",</div><div class='add'>+		"CEA-861D or below",</div><div class='add'>+		[3 ... 30] = "reserved",</div><div class='add'>+		[31] = "partial"</div><div class='add'>+	};</div><div class='add'>+	static const char * const cea_edid_version_names[8] = {</div><div class='add'>+		"no CEA EDID Timing Extension block present",</div><div class='add'>+		"CEA-861",</div><div class='add'>+		"CEA-861-A",</div><div class='add'>+		"CEA-861-B, C or D",</div><div class='add'>+		[4 ... 7] = "reserved"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "monitor_name\t\t%s\n", e-&gt;monitor_name);</div><div class='add'>+	snd_iprintf(buffer, "connection_type\t\t%s\n",</div><div class='add'>+				eld_connection_type_names[e-&gt;conn_type]);</div><div class='add'>+	snd_iprintf(buffer, "eld_version\t\t[0x%x] %s\n", e-&gt;eld_ver,</div><div class='add'>+					eld_version_names[e-&gt;eld_ver]);</div><div class='add'>+	snd_iprintf(buffer, "edid_version\t\t[0x%x] %s\n", e-&gt;cea_edid_ver,</div><div class='add'>+				cea_edid_version_names[e-&gt;cea_edid_ver]);</div><div class='add'>+	snd_iprintf(buffer, "manufacture_id\t\t0x%x\n", e-&gt;manufacture_id);</div><div class='add'>+	snd_iprintf(buffer, "product_id\t\t0x%x\n", e-&gt;product_id);</div><div class='add'>+	snd_iprintf(buffer, "port_id\t\t\t0x%llx\n", (long long)e-&gt;port_id);</div><div class='add'>+	snd_iprintf(buffer, "support_hdcp\t\t%d\n", e-&gt;support_hdcp);</div><div class='add'>+	snd_iprintf(buffer, "support_ai\t\t%d\n", e-&gt;support_ai);</div><div class='add'>+	snd_iprintf(buffer, "audio_sync_delay\t%d\n", e-&gt;aud_synch_delay);</div><div class='add'>+</div><div class='add'>+	snd_eld_print_channel_allocation(e-&gt;spk_alloc, buf, sizeof(buf));</div><div class='add'>+	snd_iprintf(buffer, "speakers\t\t[0x%x]%s\n", e-&gt;spk_alloc, buf);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "sad_count\t\t%d\n", e-&gt;sad_count);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; e-&gt;sad_count; i++)</div><div class='add'>+		hdmi_print_sad_info(i, e-&gt;sad + i, buffer);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_print_eld_info);</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/pcm_iec958.c b/sound/core/pcm_iec958.c<br/>new file mode 100644<br/>index 000000000000..7a1b816f67cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_iec958.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_iec958.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  PCM DRM helpers</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;sound/asoundef.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/pcm_iec958.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_create_iec958_consumer_default - create default consumer format IEC958 channel status</div><div class='add'>+ * @cs: channel status buffer, at least four bytes</div><div class='add'>+ * @len: length of channel status buffer</div><div class='add'>+ *</div><div class='add'>+ * Create the consumer format channel status data in @cs of maximum size</div><div class='add'>+ * @len. When relevant, the configuration-dependant bits will be set as</div><div class='add'>+ * unspecified.</div><div class='add'>+ *</div><div class='add'>+ * Drivers should then call einter snd_pcm_fill_iec958_consumer() or</div><div class='add'>+ * snd_pcm_fill_iec958_consumer_hw_params() to replace these unspecified</div><div class='add'>+ * bits by their actual values.</div><div class='add'>+ *</div><div class='add'>+ * Drivers may wish to tweak the contents of the buffer after creation.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of buffer, or negative error code if something failed.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_create_iec958_consumer_default(u8 *cs, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (len &lt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(cs, 0, len);</div><div class='add'>+</div><div class='add'>+	cs[0] = IEC958_AES0_CON_NOT_COPYRIGHT | IEC958_AES0_CON_EMPHASIS_NONE;</div><div class='add'>+	cs[1] = IEC958_AES1_CON_GENERAL;</div><div class='add'>+	cs[2] = IEC958_AES2_CON_SOURCE_UNSPEC | IEC958_AES2_CON_CHANNEL_UNSPEC;</div><div class='add'>+	cs[3] = IEC958_AES3_CON_CLOCK_1000PPM | IEC958_AES3_CON_FS_NOTID;</div><div class='add'>+</div><div class='add'>+	if (len &gt; 4)</div><div class='add'>+		cs[4] = IEC958_AES4_CON_WORDLEN_NOTID;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_create_iec958_consumer_default);</div><div class='add'>+</div><div class='add'>+static int fill_iec958_consumer(uint rate, uint sample_width,</div><div class='add'>+				u8 *cs, size_t len)</div><div class='add'>+{</div><div class='add'>+	if (len &lt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((cs[3] &amp; IEC958_AES3_CON_FS) == IEC958_AES3_CON_FS_NOTID) {</div><div class='add'>+		unsigned int fs;</div><div class='add'>+</div><div class='add'>+		switch (rate) {</div><div class='add'>+			case 32000:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_32000;</div><div class='add'>+				break;</div><div class='add'>+			case 44100:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_44100;</div><div class='add'>+				break;</div><div class='add'>+			case 48000:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_48000;</div><div class='add'>+				break;</div><div class='add'>+			case 88200:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_88200;</div><div class='add'>+				break;</div><div class='add'>+			case 96000:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_96000;</div><div class='add'>+				break;</div><div class='add'>+			case 176400:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_176400;</div><div class='add'>+				break;</div><div class='add'>+			case 192000:</div><div class='add'>+				fs = IEC958_AES3_CON_FS_192000;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cs[3] &amp;= ~IEC958_AES3_CON_FS;</div><div class='add'>+		cs[3] |= fs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &gt; 4 &amp;&amp;</div><div class='add'>+	    (cs[4] &amp; IEC958_AES4_CON_WORDLEN) == IEC958_AES4_CON_WORDLEN_NOTID) {</div><div class='add'>+		unsigned int ws;</div><div class='add'>+</div><div class='add'>+		switch (sample_width) {</div><div class='add'>+		case 16:</div><div class='add'>+			ws = IEC958_AES4_CON_WORDLEN_20_16;</div><div class='add'>+			break;</div><div class='add'>+		case 18:</div><div class='add'>+			ws = IEC958_AES4_CON_WORDLEN_22_18;</div><div class='add'>+			break;</div><div class='add'>+		case 20:</div><div class='add'>+			ws = IEC958_AES4_CON_WORDLEN_20_16 |</div><div class='add'>+			     IEC958_AES4_CON_MAX_WORDLEN_24;</div><div class='add'>+			break;</div><div class='add'>+		case 24:</div><div class='add'>+		case 32: /* Assume 24-bit width for 32-bit samples. */</div><div class='add'>+			ws = IEC958_AES4_CON_WORDLEN_24_20 |</div><div class='add'>+			     IEC958_AES4_CON_MAX_WORDLEN_24;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cs[4] &amp;= ~IEC958_AES4_CON_WORDLEN;</div><div class='add'>+		cs[4] |= ws;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_fill_iec958_consumer - Fill consumer format IEC958 channel status</div><div class='add'>+ * @runtime: pcm runtime structure with -&gt;rate filled in</div><div class='add'>+ * @cs: channel status buffer, at least four bytes</div><div class='add'>+ * @len: length of channel status buffer</div><div class='add'>+ *</div><div class='add'>+ * Fill the unspecified bits in an IEC958 status bits array using the</div><div class='add'>+ * parameters of the PCM runtime @runtime.</div><div class='add'>+ *</div><div class='add'>+ * Drivers may wish to tweak the contents of the buffer after its been</div><div class='add'>+ * filled.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of buffer, or negative error code if something failed.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_fill_iec958_consumer(struct snd_pcm_runtime *runtime,</div><div class='add'>+				 u8 *cs, size_t len)</div><div class='add'>+{</div><div class='add'>+	return fill_iec958_consumer(runtime-&gt;rate,</div><div class='add'>+				    snd_pcm_format_width(runtime-&gt;format),</div><div class='add'>+				    cs, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_fill_iec958_consumer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_fill_iec958_consumer_hw_params - Fill consumer format IEC958 channel status</div><div class='add'>+ * @params: the hw_params instance for extracting rate and sample format</div><div class='add'>+ * @cs: channel status buffer, at least four bytes</div><div class='add'>+ * @len: length of channel status buffer</div><div class='add'>+ *</div><div class='add'>+ * Fill the unspecified bits in an IEC958 status bits array using the</div><div class='add'>+ * parameters of the PCM hardware parameters @params.</div><div class='add'>+ *</div><div class='add'>+ * Drivers may wish to tweak the contents of the buffer after its been</div><div class='add'>+ * filled..</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of buffer, or negative error code if something failed.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_fill_iec958_consumer_hw_params(struct snd_pcm_hw_params *params,</div><div class='add'>+					   u8 *cs, size_t len)</div><div class='add'>+{</div><div class='add'>+	return fill_iec958_consumer(params_rate(params), params_width(params), cs, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_fill_iec958_consumer_hw_params);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_create_iec958_consumer - create consumer format IEC958 channel status</div><div class='add'>+ * @runtime: pcm runtime structure with -&gt;rate filled in</div><div class='add'>+ * @cs: channel status buffer, at least four bytes</div><div class='add'>+ * @len: length of channel status buffer</div><div class='add'>+ *</div><div class='add'>+ * Create the consumer format channel status data in @cs of maximum size</div><div class='add'>+ * @len corresponding to the parameters of the PCM runtime @runtime.</div><div class='add'>+ *</div><div class='add'>+ * Drivers may wish to tweak the contents of the buffer after creation.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of buffer, or negative error code if something failed.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,</div><div class='add'>+	size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_create_iec958_consumer_default(cs, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return snd_pcm_fill_iec958_consumer(runtime, cs, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_create_iec958_consumer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_create_iec958_consumer_hw_params - create IEC958 channel status</div><div class='add'>+ * @params: the hw_params instance for extracting rate and sample format</div><div class='add'>+ * @cs: channel status buffer, at least four bytes</div><div class='add'>+ * @len: length of channel status buffer</div><div class='add'>+ *</div><div class='add'>+ * Create the consumer format channel status data in @cs of maximum size</div><div class='add'>+ * @len corresponding to the parameters of the PCM runtime @runtime.</div><div class='add'>+ *</div><div class='add'>+ * Drivers may wish to tweak the contents of the buffer after creation.</div><div class='add'>+ *</div><div class='add'>+ * Returns: length of buffer, or negative error code if something failed.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_create_iec958_consumer_hw_params(struct snd_pcm_hw_params *params,</div><div class='add'>+					     u8 *cs, size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_pcm_create_iec958_consumer_default(cs, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return fill_iec958_consumer(params_rate(params), params_width(params), cs, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_create_iec958_consumer_hw_params);</div><div class='head'>diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c<br/>index a1707cca9c66..6eaa950504cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_lib.c</a></div><div class='hunk'>@@ -1,35 +1,57 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Abramo Bagnara &lt;abramo@alsa-project.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/timer.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pcm_local.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "pcm_trace.h"</div><div class='add'>+#else</div><div class='add'>+#define trace_hwptr(substream, pos, in_interrupt)</div><div class='add'>+#define trace_xrun(substream)</div><div class='add'>+#define trace_hw_ptr_error(substream, reason)</div><div class='add'>+#define trace_applptr(substream, prev, curr)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int fill_silence_frames(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_uframes_t off, snd_pcm_uframes_t frames);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline void update_silence_vars(struct snd_pcm_runtime *runtime,</div><div class='add'>+				       snd_pcm_uframes_t ptr,</div><div class='add'>+				       snd_pcm_uframes_t new_ptr)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_sframes_t delta;</div><div class='add'>+</div><div class='add'>+	delta = new_ptr - ptr;</div><div class='add'>+	if (delta == 0)</div><div class='add'>+		return;</div><div class='add'>+	if (delta &lt; 0)</div><div class='add'>+		delta += runtime-&gt;boundary;</div><div class='add'>+	if ((snd_pcm_uframes_t)delta &lt; runtime-&gt;silence_filled)</div><div class='add'>+		runtime-&gt;silence_filled -= delta;</div><div class='add'>+	else</div><div class='add'>+		runtime-&gt;silence_filled = 0;</div><div class='add'>+	runtime-&gt;silence_start = new_ptr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * fill ring buffer with silence</div><div class='ctx'>  * runtime-&gt;silence_start: starting pointer to silence area</div><div class='hunk'>@@ -43,92 +65,77 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_uframes_t frames, ofs, transfer;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (runtime-&gt;silence_size &lt; runtime-&gt;boundary) {</div><div class='del'>-		snd_pcm_sframes_t noise_dist, n;</div><div class='del'>-		if (runtime-&gt;silence_start != runtime-&gt;control-&gt;appl_ptr) {</div><div class='del'>-			n = runtime-&gt;control-&gt;appl_ptr - runtime-&gt;silence_start;</div><div class='del'>-			if (n &lt; 0)</div><div class='del'>-				n += runtime-&gt;boundary;</div><div class='del'>-			if ((snd_pcm_uframes_t)n &lt; runtime-&gt;silence_filled)</div><div class='del'>-				runtime-&gt;silence_filled -= n;</div><div class='del'>-			else</div><div class='del'>-				runtime-&gt;silence_filled = 0;</div><div class='del'>-			runtime-&gt;silence_start = runtime-&gt;control-&gt;appl_ptr;</div><div class='del'>-		}</div><div class='del'>-		if (runtime-&gt;silence_filled &gt;= runtime-&gt;buffer_size)</div><div class='del'>-			return;</div><div class='del'>-		noise_dist = snd_pcm_playback_hw_avail(runtime) + runtime-&gt;silence_filled;</div><div class='add'>+		snd_pcm_sframes_t noise_dist;</div><div class='add'>+		snd_pcm_uframes_t appl_ptr = READ_ONCE(runtime-&gt;control-&gt;appl_ptr);</div><div class='add'>+		update_silence_vars(runtime, runtime-&gt;silence_start, appl_ptr);</div><div class='add'>+		/* initialization outside pointer updates */</div><div class='add'>+		if (new_hw_ptr == ULONG_MAX)</div><div class='add'>+			new_hw_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+		/* get hw_avail with the boundary crossing */</div><div class='add'>+		noise_dist = appl_ptr - new_hw_ptr;</div><div class='add'>+		if (noise_dist &lt; 0)</div><div class='add'>+			noise_dist += runtime-&gt;boundary;</div><div class='add'>+		/* total noise distance */</div><div class='add'>+		noise_dist += runtime-&gt;silence_filled;</div><div class='ctx'> 		if (noise_dist &gt;= (snd_pcm_sframes_t) runtime-&gt;silence_threshold)</div><div class='ctx'> 			return;</div><div class='ctx'> 		frames = runtime-&gt;silence_threshold - noise_dist;</div><div class='ctx'> 		if (frames &gt; runtime-&gt;silence_size)</div><div class='ctx'> 			frames = runtime-&gt;silence_size;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (new_hw_ptr == ULONG_MAX) {	/* initialization */</div><div class='del'>-			snd_pcm_sframes_t avail = snd_pcm_playback_hw_avail(runtime);</div><div class='del'>-			if (avail &gt; runtime-&gt;buffer_size)</div><div class='del'>-				avail = runtime-&gt;buffer_size;</div><div class='del'>-			runtime-&gt;silence_filled = avail &gt; 0 ? avail : 0;</div><div class='del'>-			runtime-&gt;silence_start = (runtime-&gt;status-&gt;hw_ptr +</div><div class='del'>-						  runtime-&gt;silence_filled) %</div><div class='del'>-						 runtime-&gt;boundary;</div><div class='add'>+		/*</div><div class='add'>+		 * This filling mode aims at free-running mode (used for example by dmix),</div><div class='add'>+		 * which doesn't update the application pointer.</div><div class='add'>+		 */</div><div class='add'>+		snd_pcm_uframes_t hw_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+		if (new_hw_ptr == ULONG_MAX) {</div><div class='add'>+			/*</div><div class='add'>+			 * Initialization, fill the whole unused buffer with silence.</div><div class='add'>+			 *</div><div class='add'>+			 * Usually, this is entered while stopped, before data is queued,</div><div class='add'>+			 * so both pointers are expected to be zero.</div><div class='add'>+			 */</div><div class='add'>+			snd_pcm_sframes_t avail = runtime-&gt;control-&gt;appl_ptr - hw_ptr;</div><div class='add'>+			if (avail &lt; 0)</div><div class='add'>+				avail += runtime-&gt;boundary;</div><div class='add'>+			/*</div><div class='add'>+			 * In free-running mode, appl_ptr will be zero even while running,</div><div class='add'>+			 * so we end up with a huge number. There is no useful way to</div><div class='add'>+			 * handle this, so we just clear the whole buffer.</div><div class='add'>+			 */</div><div class='add'>+			runtime-&gt;silence_filled = avail &gt; runtime-&gt;buffer_size ? 0 : avail;</div><div class='add'>+			runtime-&gt;silence_start = hw_ptr;</div><div class='ctx'> 		} else {</div><div class='del'>-			ofs = runtime-&gt;status-&gt;hw_ptr;</div><div class='del'>-			frames = new_hw_ptr - ofs;</div><div class='del'>-			if ((snd_pcm_sframes_t)frames &lt; 0)</div><div class='del'>-				frames += runtime-&gt;boundary;</div><div class='del'>-			runtime-&gt;silence_filled -= frames;</div><div class='del'>-			if ((snd_pcm_sframes_t)runtime-&gt;silence_filled &lt; 0) {</div><div class='del'>-				runtime-&gt;silence_filled = 0;</div><div class='del'>-				runtime-&gt;silence_start = new_hw_ptr;</div><div class='del'>-			} else {</div><div class='del'>-				runtime-&gt;silence_start = ofs;</div><div class='del'>-			}</div><div class='add'>+			/* Silence the just played area immediately */</div><div class='add'>+			update_silence_vars(runtime, hw_ptr, new_hw_ptr);</div><div class='ctx'> 		}</div><div class='add'>+		/*</div><div class='add'>+		 * In this mode, silence_filled actually includes the valid</div><div class='add'>+		 * sample data from the user.</div><div class='add'>+		 */</div><div class='ctx'> 		frames = runtime-&gt;buffer_size - runtime-&gt;silence_filled;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_BUG_ON(frames &gt; runtime-&gt;buffer_size))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (frames == 0)</div><div class='ctx'> 		return;</div><div class='del'>-	ofs = runtime-&gt;silence_start % runtime-&gt;buffer_size;</div><div class='del'>-	while (frames &gt; 0) {</div><div class='add'>+	ofs = (runtime-&gt;silence_start + runtime-&gt;silence_filled) % runtime-&gt;buffer_size;</div><div class='add'>+	do {</div><div class='ctx'> 		transfer = ofs + frames &gt; runtime-&gt;buffer_size ? runtime-&gt;buffer_size - ofs : frames;</div><div class='del'>-		if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||</div><div class='del'>-		    runtime-&gt;access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {</div><div class='del'>-			if (substream-&gt;ops-&gt;silence) {</div><div class='del'>-				int err;</div><div class='del'>-				err = substream-&gt;ops-&gt;silence(substream, -1, ofs, transfer);</div><div class='del'>-				snd_BUG_ON(err &lt; 0);</div><div class='del'>-			} else {</div><div class='del'>-				char *hwbuf = runtime-&gt;dma_area + frames_to_bytes(runtime, ofs);</div><div class='del'>-				snd_pcm_format_set_silence(runtime-&gt;format, hwbuf, transfer * runtime-&gt;channels);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			unsigned int c;</div><div class='del'>-			unsigned int channels = runtime-&gt;channels;</div><div class='del'>-			if (substream-&gt;ops-&gt;silence) {</div><div class='del'>-				for (c = 0; c &lt; channels; ++c) {</div><div class='del'>-					int err;</div><div class='del'>-					err = substream-&gt;ops-&gt;silence(substream, c, ofs, transfer);</div><div class='del'>-					snd_BUG_ON(err &lt; 0);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				size_t dma_csize = runtime-&gt;dma_bytes / channels;</div><div class='del'>-				for (c = 0; c &lt; channels; ++c) {</div><div class='del'>-					char *hwbuf = runtime-&gt;dma_area + (c * dma_csize) + samples_to_bytes(runtime, ofs);</div><div class='del'>-					snd_pcm_format_set_silence(runtime-&gt;format, hwbuf, transfer);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		err = fill_silence_frames(substream, ofs, transfer);</div><div class='add'>+		snd_BUG_ON(err &lt; 0);</div><div class='ctx'> 		runtime-&gt;silence_filled += transfer;</div><div class='ctx'> 		frames -= transfer;</div><div class='ctx'> 		ofs = 0;</div><div class='del'>-	}</div><div class='add'>+	} while (frames &gt; 0);</div><div class='add'>+	snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pcm_debug_name(struct snd_pcm_substream *substream,</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+void snd_pcm_debug_name(struct snd_pcm_substream *substream,</div><div class='ctx'> 			   char *name, size_t len)</div><div class='ctx'> {</div><div class='ctx'> 	snprintf(name, len, "pcmC%dD%d%c:%d",</div><div class='hunk'>@@ -137,14 +144,12 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,</div><div class='ctx'> 		 substream-&gt;stream ? 'c' : 'p',</div><div class='ctx'> 		 substream-&gt;number);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_debug_name);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define XRUN_DEBUG_BASIC	(1&lt;&lt;0)</div><div class='ctx'> #define XRUN_DEBUG_STACK	(1&lt;&lt;1)	/* dump also stack */</div><div class='ctx'> #define XRUN_DEBUG_JIFFIESCHECK	(1&lt;&lt;2)	/* do jiffies check */</div><div class='del'>-#define XRUN_DEBUG_PERIODUPDATE	(1&lt;&lt;3)	/* full period update info */</div><div class='del'>-#define XRUN_DEBUG_HWPTRUPDATE	(1&lt;&lt;4)	/* full hwptr update info */</div><div class='del'>-#define XRUN_DEBUG_LOG		(1&lt;&lt;5)	/* show last 10 positions on err */</div><div class='del'>-#define XRUN_DEBUG_LOGONCE	(1&lt;&lt;6)	/* do above only once */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='ctx'> </div><div class='hunk'>@@ -159,111 +164,45 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,</div><div class='ctx'> 			dump_stack();				\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-static void xrun(struct snd_pcm_substream *substream)</div><div class='add'>+/* call with stream lock held */</div><div class='add'>+void __snd_pcm_xrun(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)</div><div class='del'>-		snd_pcm_gettime(runtime, (struct timespec *)&amp;runtime-&gt;status-&gt;tstamp);</div><div class='add'>+	trace_xrun(substream);</div><div class='add'>+	if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {</div><div class='add'>+		struct timespec64 tstamp;</div><div class='add'>+</div><div class='add'>+		snd_pcm_gettime(runtime, &amp;tstamp);</div><div class='add'>+		runtime-&gt;status-&gt;tstamp.tv_sec = tstamp.tv_sec;</div><div class='add'>+		runtime-&gt;status-&gt;tstamp.tv_nsec = tstamp.tv_nsec;</div><div class='add'>+	}</div><div class='ctx'> 	snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);</div><div class='ctx'> 	if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {</div><div class='ctx'> 		char name[16];</div><div class='del'>-		pcm_debug_name(substream, name, sizeof(name));</div><div class='del'>-		snd_printd(KERN_DEBUG "XRUN: %s\n", name);</div><div class='add'>+		snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='add'>+		pcm_warn(substream-&gt;pcm, "XRUN: %s\n", name);</div><div class='ctx'> 		dump_stack_on_xrun(substream);</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='add'>+	substream-&gt;xrun_counter++;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_PCM_XRUN_DEBUG</div><div class='del'>-#define hw_ptr_error(substream, fmt, args...)				\</div><div class='add'>+#define hw_ptr_error(substream, in_interrupt, reason, fmt, args...)	\</div><div class='ctx'> 	do {								\</div><div class='add'>+		trace_hw_ptr_error(substream, reason);	\</div><div class='ctx'> 		if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {		\</div><div class='del'>-			xrun_log_show(substream);			\</div><div class='del'>-			if (printk_ratelimit()) {			\</div><div class='del'>-				snd_printd("PCM: " fmt, ##args);	\</div><div class='del'>-			}						\</div><div class='add'>+			pr_err_ratelimited("ALSA: PCM: [%c] " reason ": " fmt, \</div><div class='add'>+					   (in_interrupt) ? 'Q' : 'P', ##args);	\</div><div class='ctx'> 			dump_stack_on_xrun(substream);			\</div><div class='ctx'> 		}							\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define XRUN_LOG_CNT	10</div><div class='del'>-</div><div class='del'>-struct hwptr_log_entry {</div><div class='del'>-	unsigned long jiffies;</div><div class='del'>-	snd_pcm_uframes_t pos;</div><div class='del'>-	snd_pcm_uframes_t period_size;</div><div class='del'>-	snd_pcm_uframes_t buffer_size;</div><div class='del'>-	snd_pcm_uframes_t old_hw_ptr;</div><div class='del'>-	snd_pcm_uframes_t hw_ptr_base;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snd_pcm_hwptr_log {</div><div class='del'>-	unsigned int idx;</div><div class='del'>-	unsigned int hit: 1;</div><div class='del'>-	struct hwptr_log_entry entries[XRUN_LOG_CNT];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void xrun_log(struct snd_pcm_substream *substream,</div><div class='del'>-		     snd_pcm_uframes_t pos)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_pcm_hwptr_log *log = runtime-&gt;hwptr_log;</div><div class='del'>-	struct hwptr_log_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (log == NULL) {</div><div class='del'>-		log = kzalloc(sizeof(*log), GFP_ATOMIC);</div><div class='del'>-		if (log == NULL)</div><div class='del'>-			return;</div><div class='del'>-		runtime-&gt;hwptr_log = log;</div><div class='del'>-	} else {</div><div class='del'>-		if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) &amp;&amp; log-&gt;hit)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	entry = &amp;log-&gt;entries[log-&gt;idx];</div><div class='del'>-	entry-&gt;jiffies = jiffies;</div><div class='del'>-	entry-&gt;pos = pos;</div><div class='del'>-	entry-&gt;period_size = runtime-&gt;period_size;</div><div class='del'>-	entry-&gt;buffer_size = runtime-&gt;buffer_size;;</div><div class='del'>-	entry-&gt;old_hw_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='del'>-	entry-&gt;hw_ptr_base = runtime-&gt;hw_ptr_base;</div><div class='del'>-	log-&gt;idx = (log-&gt;idx + 1) % XRUN_LOG_CNT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xrun_log_show(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_hwptr_log *log = substream-&gt;runtime-&gt;hwptr_log;</div><div class='del'>-	struct hwptr_log_entry *entry;</div><div class='del'>-	char name[16];</div><div class='del'>-	unsigned int idx;</div><div class='del'>-	int cnt;</div><div class='del'>-</div><div class='del'>-	if (log == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) &amp;&amp; log-&gt;hit)</div><div class='del'>-		return;</div><div class='del'>-	pcm_debug_name(substream, name, sizeof(name));</div><div class='del'>-	for (cnt = 0, idx = log-&gt;idx; cnt &lt; XRUN_LOG_CNT; cnt++) {</div><div class='del'>-		entry = &amp;log-&gt;entries[idx];</div><div class='del'>-		if (entry-&gt;period_size == 0)</div><div class='del'>-			break;</div><div class='del'>-		snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, "</div><div class='del'>-			   "hwptr=%ld/%ld\n",</div><div class='del'>-			   name, entry-&gt;jiffies, (unsigned long)entry-&gt;pos,</div><div class='del'>-			   (unsigned long)entry-&gt;period_size,</div><div class='del'>-			   (unsigned long)entry-&gt;buffer_size,</div><div class='del'>-			   (unsigned long)entry-&gt;old_hw_ptr,</div><div class='del'>-			   (unsigned long)entry-&gt;hw_ptr_base);</div><div class='del'>-		idx++;</div><div class='del'>-		idx %= XRUN_LOG_CNT;</div><div class='del'>-	}</div><div class='del'>-	log-&gt;hit = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */</div><div class='ctx'> </div><div class='ctx'> #define hw_ptr_error(substream, fmt, args...) do { } while (0)</div><div class='del'>-#define xrun_log(substream, pos)	do { } while (0)</div><div class='del'>-#define xrun_log_show(substream)	do { } while (0)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -272,20 +211,17 @@ int snd_pcm_update_state(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	snd_pcm_uframes_t avail;</div><div class='ctx'> </div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-		avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-	else</div><div class='del'>-		avail = snd_pcm_capture_avail(runtime);</div><div class='add'>+	avail = snd_pcm_avail(substream);</div><div class='ctx'> 	if (avail &gt; runtime-&gt;avail_max)</div><div class='ctx'> 		runtime-&gt;avail_max = avail;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='ctx'> 		if (avail &gt;= runtime-&gt;buffer_size) {</div><div class='ctx'> 			snd_pcm_drain_done(substream);</div><div class='ctx'> 			return -EPIPE;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (avail &gt;= runtime-&gt;stop_threshold) {</div><div class='del'>-			xrun(substream);</div><div class='add'>+			__snd_pcm_xrun(substream);</div><div class='ctx'> 			return -EPIPE;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -297,6 +233,56 @@ int snd_pcm_update_state(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void update_audio_tstamp(struct snd_pcm_substream *substream,</div><div class='add'>+				struct timespec64 *curr_tstamp,</div><div class='add'>+				struct timespec64 *audio_tstamp)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	u64 audio_frames, audio_nsecs;</div><div class='add'>+	struct timespec64 driver_tstamp;</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;tstamp_mode != SNDRV_PCM_TSTAMP_ENABLE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!(substream-&gt;ops-&gt;get_time_info) ||</div><div class='add'>+		(runtime-&gt;audio_tstamp_report.actual_type ==</div><div class='add'>+			SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT)) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * provide audio timestamp derived from pointer position</div><div class='add'>+		 * add delay only if requested</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		audio_frames = runtime-&gt;hw_ptr_wrap + runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+</div><div class='add'>+		if (runtime-&gt;audio_tstamp_config.report_delay) {</div><div class='add'>+			if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+				audio_frames -=  runtime-&gt;delay;</div><div class='add'>+			else</div><div class='add'>+				audio_frames +=  runtime-&gt;delay;</div><div class='add'>+		}</div><div class='add'>+		audio_nsecs = div_u64(audio_frames * 1000000000LL,</div><div class='add'>+				runtime-&gt;rate);</div><div class='add'>+		*audio_tstamp = ns_to_timespec64(audio_nsecs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;status-&gt;audio_tstamp.tv_sec != audio_tstamp-&gt;tv_sec ||</div><div class='add'>+	    runtime-&gt;status-&gt;audio_tstamp.tv_nsec != audio_tstamp-&gt;tv_nsec) {</div><div class='add'>+		runtime-&gt;status-&gt;audio_tstamp.tv_sec = audio_tstamp-&gt;tv_sec;</div><div class='add'>+		runtime-&gt;status-&gt;audio_tstamp.tv_nsec = audio_tstamp-&gt;tv_nsec;</div><div class='add'>+		runtime-&gt;status-&gt;tstamp.tv_sec = curr_tstamp-&gt;tv_sec;</div><div class='add'>+		runtime-&gt;status-&gt;tstamp.tv_nsec = curr_tstamp-&gt;tv_nsec;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * re-take a driver timestamp to let apps detect if the reference tstamp</div><div class='add'>+	 * read by low-level hardware was provided with a delay</div><div class='add'>+	 */</div><div class='add'>+	snd_pcm_gettime(substream-&gt;runtime, &amp;driver_tstamp);</div><div class='add'>+	runtime-&gt;driver_tstamp = driver_tstamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 				  unsigned int in_interrupt)</div><div class='ctx'> {</div><div class='hunk'>@@ -305,28 +291,53 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 	snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_base;</div><div class='ctx'> 	snd_pcm_sframes_t hdelta, delta;</div><div class='ctx'> 	unsigned long jdelta;</div><div class='add'>+	unsigned long curr_jiffies;</div><div class='add'>+	struct timespec64 curr_tstamp;</div><div class='add'>+	struct timespec64 audio_tstamp;</div><div class='add'>+	int crossed_boundary = 0;</div><div class='ctx'> </div><div class='ctx'> 	old_hw_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * group pointer, time and jiffies reads to allow for more</div><div class='add'>+	 * accurate correlations/corrections.</div><div class='add'>+	 * The values are stored at the end of this routine after</div><div class='add'>+	 * corrections for hw_ptr position</div><div class='add'>+	 */</div><div class='ctx'> 	pos = substream-&gt;ops-&gt;pointer(substream);</div><div class='add'>+	curr_jiffies = jiffies;</div><div class='add'>+	if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {</div><div class='add'>+		if ((substream-&gt;ops-&gt;get_time_info) &amp;&amp;</div><div class='add'>+			(runtime-&gt;audio_tstamp_config.type_requested != SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT)) {</div><div class='add'>+			substream-&gt;ops-&gt;get_time_info(substream, &amp;curr_tstamp,</div><div class='add'>+						&amp;audio_tstamp,</div><div class='add'>+						&amp;runtime-&gt;audio_tstamp_config,</div><div class='add'>+						&amp;runtime-&gt;audio_tstamp_report);</div><div class='add'>+</div><div class='add'>+			/* re-test in case tstamp type is not supported in hardware and was demoted to DEFAULT */</div><div class='add'>+			if (runtime-&gt;audio_tstamp_report.actual_type == SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT)</div><div class='add'>+				snd_pcm_gettime(runtime, &amp;curr_tstamp);</div><div class='add'>+		} else</div><div class='add'>+			snd_pcm_gettime(runtime, &amp;curr_tstamp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (pos == SNDRV_PCM_POS_XRUN) {</div><div class='del'>-		xrun(substream);</div><div class='add'>+		__snd_pcm_xrun(substream);</div><div class='ctx'> 		return -EPIPE;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pos &gt;= runtime-&gt;buffer_size) {</div><div class='ctx'> 		if (printk_ratelimit()) {</div><div class='ctx'> 			char name[16];</div><div class='del'>-			pcm_debug_name(substream, name, sizeof(name));</div><div class='del'>-			xrun_log_show(substream);</div><div class='del'>-			snd_printd(KERN_ERR  "BUG: %s, pos = %ld, "</div><div class='del'>-				   "buffer size = %ld, period size = %ld\n",</div><div class='del'>-				   name, pos, runtime-&gt;buffer_size,</div><div class='del'>-				   runtime-&gt;period_size);</div><div class='add'>+			snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='add'>+			pcm_err(substream-&gt;pcm,</div><div class='add'>+				"invalid position: %s, pos = %ld, buffer size = %ld, period size = %ld\n",</div><div class='add'>+				name, pos, runtime-&gt;buffer_size,</div><div class='add'>+				runtime-&gt;period_size);</div><div class='ctx'> 		}</div><div class='ctx'> 		pos = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	pos -= pos % runtime-&gt;min_align;</div><div class='del'>-	if (xrun_debug(substream, XRUN_DEBUG_LOG))</div><div class='del'>-		xrun_log(substream, pos);</div><div class='add'>+	trace_hwptr(substream, pos, in_interrupt);</div><div class='ctx'> 	hw_base = runtime-&gt;hw_ptr_base;</div><div class='ctx'> 	new_hw_ptr = hw_base + pos;</div><div class='ctx'> 	if (in_interrupt) {</div><div class='hunk'>@@ -335,11 +346,13 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 		delta = runtime-&gt;hw_ptr_interrupt + runtime-&gt;period_size;</div><div class='ctx'> 		if (delta &gt; new_hw_ptr) {</div><div class='ctx'> 			/* check for double acknowledged interrupts */</div><div class='del'>-			hdelta = jiffies - runtime-&gt;hw_ptr_jiffies;</div><div class='del'>-			if (hdelta &gt; runtime-&gt;hw_ptr_buffer_jiffies/2) {</div><div class='add'>+			hdelta = curr_jiffies - runtime-&gt;hw_ptr_jiffies;</div><div class='add'>+			if (hdelta &gt; runtime-&gt;hw_ptr_buffer_jiffies/2 + 1) {</div><div class='ctx'> 				hw_base += runtime-&gt;buffer_size;</div><div class='del'>-				if (hw_base &gt;= runtime-&gt;boundary)</div><div class='add'>+				if (hw_base &gt;= runtime-&gt;boundary) {</div><div class='ctx'> 					hw_base = 0;</div><div class='add'>+					crossed_boundary++;</div><div class='add'>+				}</div><div class='ctx'> 				new_hw_ptr = hw_base + pos;</div><div class='ctx'> 				goto __delta;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -349,39 +362,47 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* pointer crosses the end of the ring buffer */</div><div class='ctx'> 	if (new_hw_ptr &lt; old_hw_ptr) {</div><div class='ctx'> 		hw_base += runtime-&gt;buffer_size;</div><div class='del'>-		if (hw_base &gt;= runtime-&gt;boundary)</div><div class='add'>+		if (hw_base &gt;= runtime-&gt;boundary) {</div><div class='ctx'> 			hw_base = 0;</div><div class='add'>+			crossed_boundary++;</div><div class='add'>+		}</div><div class='ctx'> 		new_hw_ptr = hw_base + pos;</div><div class='ctx'> 	}</div><div class='ctx'>       __delta:</div><div class='ctx'> 	delta = new_hw_ptr - old_hw_ptr;</div><div class='ctx'> 	if (delta &lt; 0)</div><div class='ctx'> 		delta += runtime-&gt;boundary;</div><div class='del'>-	if (xrun_debug(substream, in_interrupt ?</div><div class='del'>-			XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {</div><div class='del'>-		char name[16];</div><div class='del'>-		pcm_debug_name(substream, name, sizeof(name));</div><div class='del'>-		snd_printd("%s_update: %s: pos=%u/%u/%u, "</div><div class='del'>-			   "hwptr=%ld/%ld/%ld/%ld\n",</div><div class='del'>-			   in_interrupt ? "period" : "hwptr",</div><div class='del'>-			   name,</div><div class='del'>-			   (unsigned int)pos,</div><div class='del'>-			   (unsigned int)runtime-&gt;period_size,</div><div class='del'>-			   (unsigned int)runtime-&gt;buffer_size,</div><div class='del'>-			   (unsigned long)delta,</div><div class='del'>-			   (unsigned long)old_hw_ptr,</div><div class='del'>-			   (unsigned long)new_hw_ptr,</div><div class='del'>-			   (unsigned long)runtime-&gt;hw_ptr_base);</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;no_period_wakeup) {</div><div class='add'>+		snd_pcm_sframes_t xrun_threshold;</div><div class='add'>+		/*</div><div class='add'>+		 * Without regular period interrupts, we have to check</div><div class='add'>+		 * the elapsed time to detect xruns.</div><div class='add'>+		 */</div><div class='add'>+		jdelta = curr_jiffies - runtime-&gt;hw_ptr_jiffies;</div><div class='add'>+		if (jdelta &lt; runtime-&gt;hw_ptr_buffer_jiffies / 2)</div><div class='add'>+			goto no_delta_check;</div><div class='add'>+		hdelta = jdelta - delta * HZ / runtime-&gt;rate;</div><div class='add'>+		xrun_threshold = runtime-&gt;hw_ptr_buffer_jiffies / 2 + 1;</div><div class='add'>+		while (hdelta &gt; xrun_threshold) {</div><div class='add'>+			delta += runtime-&gt;buffer_size;</div><div class='add'>+			hw_base += runtime-&gt;buffer_size;</div><div class='add'>+			if (hw_base &gt;= runtime-&gt;boundary) {</div><div class='add'>+				hw_base = 0;</div><div class='add'>+				crossed_boundary++;</div><div class='add'>+			}</div><div class='add'>+			new_hw_ptr = hw_base + pos;</div><div class='add'>+			hdelta -= runtime-&gt;hw_ptr_buffer_jiffies;</div><div class='add'>+		}</div><div class='add'>+		goto no_delta_check;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* something must be really wrong */</div><div class='ctx'> 	if (delta &gt;= runtime-&gt;buffer_size + runtime-&gt;period_size) {</div><div class='del'>-		hw_ptr_error(substream,</div><div class='del'>-			       "Unexpected hw_pointer value %s"</div><div class='del'>-			       "(stream=%i, pos=%ld, new_hw_ptr=%ld, "</div><div class='del'>-			       "old_hw_ptr=%ld)\n",</div><div class='del'>-				     in_interrupt ? "[Q] " : "[P]",</div><div class='del'>-				     substream-&gt;stream, (long)pos,</div><div class='del'>-				     (long)new_hw_ptr, (long)old_hw_ptr);</div><div class='add'>+		hw_ptr_error(substream, in_interrupt, "Unexpected hw_ptr",</div><div class='add'>+			     "(stream=%i, pos=%ld, new_hw_ptr=%ld, old_hw_ptr=%ld)\n",</div><div class='add'>+			     substream-&gt;stream, (long)pos,</div><div class='add'>+			     (long)new_hw_ptr, (long)old_hw_ptr);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -399,7 +420,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (hdelta &lt; runtime-&gt;delay)</div><div class='ctx'> 		goto no_jiffies_check;</div><div class='ctx'> 	hdelta -= runtime-&gt;delay;</div><div class='del'>-	jdelta = jiffies - runtime-&gt;hw_ptr_jiffies;</div><div class='add'>+	jdelta = curr_jiffies - runtime-&gt;hw_ptr_jiffies;</div><div class='ctx'> 	if (((hdelta * HZ) / runtime-&gt;rate) &gt; jdelta + HZ/100) {</div><div class='ctx'> 		delta = jdelta /</div><div class='ctx'> 			(((runtime-&gt;period_size * HZ) / runtime-&gt;rate)</div><div class='hunk'>@@ -411,16 +432,15 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 		/* the delta value is small or zero in most cases */</div><div class='ctx'> 		while (delta &gt; 0) {</div><div class='ctx'> 			new_hw_ptr += runtime-&gt;period_size;</div><div class='del'>-			if (new_hw_ptr &gt;= runtime-&gt;boundary)</div><div class='add'>+			if (new_hw_ptr &gt;= runtime-&gt;boundary) {</div><div class='ctx'> 				new_hw_ptr -= runtime-&gt;boundary;</div><div class='add'>+				crossed_boundary--;</div><div class='add'>+			}</div><div class='ctx'> 			delta--;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* align hw_base to buffer_size */</div><div class='del'>-		hw_ptr_error(substream,</div><div class='del'>-			     "hw_ptr skipping! %s"</div><div class='del'>-			     "(pos=%ld, delta=%ld, period=%ld, "</div><div class='del'>-			     "jdelta=%lu/%lu/%lu, hw_ptr=%ld/%ld)\n",</div><div class='del'>-			     in_interrupt ? "[Q] " : "",</div><div class='add'>+		hw_ptr_error(substream, in_interrupt, "hw_ptr skipping",</div><div class='add'>+			     "(pos=%ld, delta=%ld, period=%ld, jdelta=%lu/%lu/%lu, hw_ptr=%ld/%ld)\n",</div><div class='ctx'> 			     (long)pos, (long)hdelta,</div><div class='ctx'> 			     (long)runtime-&gt;period_size, jdelta,</div><div class='ctx'> 			     ((hdelta * HZ) / runtime-&gt;rate), hw_base,</div><div class='hunk'>@@ -432,18 +452,20 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'>  no_jiffies_check:</div><div class='ctx'> 	if (delta &gt; runtime-&gt;period_size + runtime-&gt;period_size / 2) {</div><div class='del'>-		hw_ptr_error(substream,</div><div class='del'>-			     "Lost interrupts? %s"</div><div class='del'>-			     "(stream=%i, delta=%ld, new_hw_ptr=%ld, "</div><div class='del'>-			     "old_hw_ptr=%ld)\n",</div><div class='del'>-			     in_interrupt ? "[Q] " : "",</div><div class='add'>+		hw_ptr_error(substream, in_interrupt,</div><div class='add'>+			     "Lost interrupts?",</div><div class='add'>+			     "(stream=%i, delta=%ld, new_hw_ptr=%ld, old_hw_ptr=%ld)\n",</div><div class='ctx'> 			     substream-&gt;stream, (long)delta,</div><div class='ctx'> 			     (long)new_hw_ptr,</div><div class='ctx'> 			     (long)old_hw_ptr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;status-&gt;hw_ptr == new_hw_ptr)</div><div class='add'>+ no_delta_check:</div><div class='add'>+	if (runtime-&gt;status-&gt;hw_ptr == new_hw_ptr) {</div><div class='add'>+		runtime-&gt;hw_ptr_jiffies = curr_jiffies;</div><div class='add'>+		update_audio_tstamp(substream, &amp;curr_tstamp, &amp;audio_tstamp);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='ctx'> 	    runtime-&gt;silence_size &gt; 0)</div><div class='hunk'>@@ -460,9 +482,13 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime-&gt;hw_ptr_base = hw_base;</div><div class='ctx'> 	runtime-&gt;status-&gt;hw_ptr = new_hw_ptr;</div><div class='del'>-	runtime-&gt;hw_ptr_jiffies = jiffies;</div><div class='del'>-	if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE)</div><div class='del'>-		snd_pcm_gettime(runtime, (struct timespec *)&amp;runtime-&gt;status-&gt;tstamp);</div><div class='add'>+	runtime-&gt;hw_ptr_jiffies = curr_jiffies;</div><div class='add'>+	if (crossed_boundary) {</div><div class='add'>+		snd_BUG_ON(crossed_boundary != 1);</div><div class='add'>+		runtime-&gt;hw_ptr_wrap += runtime-&gt;boundary;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	update_audio_tstamp(substream, &amp;curr_tstamp, &amp;audio_tstamp);</div><div class='ctx'> </div><div class='ctx'> 	return snd_pcm_update_state(substream, runtime);</div><div class='ctx'> }</div><div class='hunk'>@@ -481,7 +507,8 @@ int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream)</div><div class='ctx'>  *</div><div class='ctx'>  * Sets the given PCM operators to the pcm instance.</div><div class='ctx'>  */</div><div class='del'>-void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops)</div><div class='add'>+void snd_pcm_set_ops(struct snd_pcm *pcm, int direction,</div><div class='add'>+		     const struct snd_pcm_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_str *stream = &amp;pcm-&gt;streams[direction];</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='hunk'>@@ -489,26 +516,41 @@ void snd_pcm_set_ops(struct snd_pcm *pcm, int direction, struct snd_pcm_ops *ops</div><div class='ctx'> 	for (substream = stream-&gt;substream; substream != NULL; substream = substream-&gt;next)</div><div class='ctx'> 		substream-&gt;ops = ops;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_set_ops);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_sync - set the PCM sync id</div><div class='add'>+ * snd_pcm_set_sync_per_card - set the PCM sync id with card number</div><div class='ctx'>  * @substream: the pcm substream</div><div class='add'>+ * @params: modified hardware parameters</div><div class='add'>+ * @id: identifier (max 12 bytes)</div><div class='add'>+ * @len: identifier length (max 12 bytes)</div><div class='add'>+ *</div><div class='add'>+ * Sets the PCM sync identifier for the card with zero padding.</div><div class='add'>+ *</div><div class='add'>+ * User space or any user should use this 16-byte identifier for a comparison only</div><div class='add'>+ * to check if two IDs are similar or different. Special case is the identifier</div><div class='add'>+ * containing only zeros. Interpretation for this combination is - empty (not set).</div><div class='add'>+ * The contents of the identifier should not be interpreted in any other way.</div><div class='add'>+ *</div><div class='add'>+ * The synchronization ID must be unique per clock source (usually one sound card,</div><div class='add'>+ * but multiple soundcard may use one PCM word clock source which means that they</div><div class='add'>+ * are fully synchronized).</div><div class='ctx'>  *</div><div class='del'>- * Sets the PCM sync identifier for the card.</div><div class='add'>+ * This routine composes this ID using card number in first four bytes and</div><div class='add'>+ * 12-byte additional ID. When other ID composition is used (e.g. for multiple</div><div class='add'>+ * sound cards), make sure that the composition does not clash with this</div><div class='add'>+ * composition scheme.</div><div class='ctx'>  */</div><div class='del'>-void snd_pcm_set_sync(struct snd_pcm_substream *substream)</div><div class='add'>+void snd_pcm_set_sync_per_card(struct snd_pcm_substream *substream,</div><div class='add'>+			       struct snd_pcm_hw_params *params,</div><div class='add'>+			       const unsigned char *id, unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	</div><div class='del'>-	runtime-&gt;sync.id32[0] = substream-&gt;pcm-&gt;card-&gt;number;</div><div class='del'>-	runtime-&gt;sync.id32[1] = -1;</div><div class='del'>-	runtime-&gt;sync.id32[2] = -1;</div><div class='del'>-	runtime-&gt;sync.id32[3] = -1;</div><div class='add'>+	*(__u32 *)params-&gt;sync = cpu_to_le32(substream-&gt;pcm-&gt;card-&gt;number);</div><div class='add'>+	len = min(12, len);</div><div class='add'>+	memcpy(params-&gt;sync + 4, id, len);</div><div class='add'>+	memset(params-&gt;sync + 4 + len, 0, 12 - len);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_set_sync);</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_set_sync_per_card);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Standard ioctl routine</div><div class='hunk'>@@ -558,7 +600,6 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b,</div><div class='ctx'> {</div><div class='ctx'> 	u_int64_t n = (u_int64_t) a * b;</div><div class='ctx'> 	if (c == 0) {</div><div class='del'>-		snd_BUG_ON(!n);</div><div class='ctx'> 		*r = 0;</div><div class='ctx'> 		return UINT_MAX;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -579,7 +620,8 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b,</div><div class='ctx'>  * The interval is changed to the range satisfying both intervals.</div><div class='ctx'>  * The interval status (min, max, integer, etc.) are evaluated.</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if the value is changed, zero if not changed.</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v)</div><div class='ctx'> {</div><div class='hunk'>@@ -623,32 +665,37 @@ int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v)</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_interval_refine);</div><div class='ctx'> </div><div class='ctx'> static int snd_interval_refine_first(struct snd_interval *i)</div><div class='ctx'> {</div><div class='add'>+	const unsigned int last_max = i-&gt;max;</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(snd_interval_empty(i)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (snd_interval_single(i))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	i-&gt;max = i-&gt;min;</div><div class='del'>-	i-&gt;openmax = i-&gt;openmin;</div><div class='del'>-	if (i-&gt;openmax)</div><div class='add'>+	if (i-&gt;openmin)</div><div class='ctx'> 		i-&gt;max++;</div><div class='add'>+	/* only exclude max value if also excluded before refine */</div><div class='add'>+	i-&gt;openmax = (i-&gt;openmax &amp;&amp; i-&gt;max &gt;= last_max);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_interval_refine_last(struct snd_interval *i)</div><div class='ctx'> {</div><div class='add'>+	const unsigned int last_min = i-&gt;min;</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(snd_interval_empty(i)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (snd_interval_single(i))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	i-&gt;min = i-&gt;max;</div><div class='del'>-	i-&gt;openmin = i-&gt;openmax;</div><div class='del'>-	if (i-&gt;openmin)</div><div class='add'>+	if (i-&gt;openmax)</div><div class='ctx'> 		i-&gt;min--;</div><div class='add'>+	/* only exclude min value if also excluded before refine */</div><div class='add'>+	i-&gt;openmin = (i-&gt;openmin &amp;&amp; i-&gt;min &lt;= last_min);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -778,10 +825,11 @@ void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,</div><div class='ctx'>  * @nump: pointer to store the resultant numerator</div><div class='ctx'>  * @denp: pointer to store the resultant denominator</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if the value is changed, zero if not changed.</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_interval_ratnum(struct snd_interval *i,</div><div class='del'>-			unsigned int rats_count, struct snd_ratnum *rats,</div><div class='add'>+			unsigned int rats_count, const struct snd_ratnum *rats,</div><div class='ctx'> 			unsigned int *nump, unsigned int *denp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int best_num, best_den;</div><div class='hunk'>@@ -885,7 +933,6 @@ int snd_interval_ratnum(struct snd_interval *i,</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_interval_ratnum);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -896,10 +943,12 @@ EXPORT_SYMBOL(snd_interval_ratnum);</div><div class='ctx'>  * @nump: pointer to store the resultant numerator</div><div class='ctx'>  * @denp: pointer to store the resultant denominator</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if the value is changed, zero if not changed.</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='ctx'> static int snd_interval_ratden(struct snd_interval *i,</div><div class='del'>-			       unsigned int rats_count, struct snd_ratden *rats,</div><div class='add'>+			       unsigned int rats_count,</div><div class='add'>+			       const struct snd_ratden *rats,</div><div class='ctx'> 			       unsigned int *nump, unsigned int *denp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int best_num, best_diff, best_den;</div><div class='hunk'>@@ -995,9 +1044,11 @@ static int snd_interval_ratden(struct snd_interval *i,</div><div class='ctx'>  * When mask is non-zero, only the elements corresponding to bit 1 are</div><div class='ctx'>  * evaluated.</div><div class='ctx'>  *</div><div class='del'>- * Returns non-zero if the value is changed, zero if not changed.</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='del'>-int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask)</div><div class='add'>+int snd_interval_list(struct snd_interval *i, unsigned int count,</div><div class='add'>+		      const unsigned int *list, unsigned int mask)</div><div class='ctx'> {</div><div class='ctx'>         unsigned int k;</div><div class='ctx'> 	struct snd_interval list_range;</div><div class='hunk'>@@ -1019,21 +1070,76 @@ int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *</div><div class='ctx'>         }</div><div class='ctx'> 	return snd_interval_refine(i, &amp;list_range);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_interval_list);</div><div class='ctx'> </div><div class='del'>-static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned int step)</div><div class='add'>+/**</div><div class='add'>+ * snd_interval_ranges - refine the interval value from the list of ranges</div><div class='add'>+ * @i: the interval value to refine</div><div class='add'>+ * @count: the number of elements in the list of ranges</div><div class='add'>+ * @ranges: the ranges list</div><div class='add'>+ * @mask: the bit-mask to evaluate</div><div class='add'>+ *</div><div class='add'>+ * Refines the interval value from the list of ranges.</div><div class='add'>+ * When mask is non-zero, only the elements corresponding to bit 1 are</div><div class='add'>+ * evaluated.</div><div class='add'>+ *</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_interval_ranges(struct snd_interval *i, unsigned int count,</div><div class='add'>+			const struct snd_interval *ranges, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	unsigned int k;</div><div class='add'>+	struct snd_interval range_union;</div><div class='add'>+	struct snd_interval range;</div><div class='add'>+</div><div class='add'>+	if (!count) {</div><div class='add'>+		snd_interval_none(i);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	snd_interval_any(&amp;range_union);</div><div class='add'>+	range_union.min = UINT_MAX;</div><div class='add'>+	range_union.max = 0;</div><div class='add'>+	for (k = 0; k &lt; count; k++) {</div><div class='add'>+		if (mask &amp;&amp; !(mask &amp; (1 &lt;&lt; k)))</div><div class='add'>+			continue;</div><div class='add'>+		snd_interval_copy(&amp;range, &amp;ranges[k]);</div><div class='add'>+		if (snd_interval_refine(&amp;range, i) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (snd_interval_empty(&amp;range))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (range.min &lt; range_union.min) {</div><div class='add'>+			range_union.min = range.min;</div><div class='add'>+			range_union.openmin = 1;</div><div class='add'>+		}</div><div class='add'>+		if (range.min == range_union.min &amp;&amp; !range.openmin)</div><div class='add'>+			range_union.openmin = 0;</div><div class='add'>+		if (range.max &gt; range_union.max) {</div><div class='add'>+			range_union.max = range.max;</div><div class='add'>+			range_union.openmax = 1;</div><div class='add'>+		}</div><div class='add'>+		if (range.max == range_union.max &amp;&amp; !range.openmax)</div><div class='add'>+			range_union.openmax = 0;</div><div class='add'>+	}</div><div class='add'>+	return snd_interval_refine(i, &amp;range_union);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_interval_ranges);</div><div class='add'>+</div><div class='add'>+static int snd_interval_step(struct snd_interval *i, unsigned int step)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int n;</div><div class='ctx'> 	int changed = 0;</div><div class='del'>-	n = (i-&gt;min - min) % step;</div><div class='add'>+	n = i-&gt;min % step;</div><div class='ctx'> 	if (n != 0 || i-&gt;openmin) {</div><div class='ctx'> 		i-&gt;min += step - n;</div><div class='add'>+		i-&gt;openmin = 0;</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='del'>-	n = (i-&gt;max - min) % step;</div><div class='add'>+	n = i-&gt;max % step;</div><div class='ctx'> 	if (n != 0 || i-&gt;openmax) {</div><div class='ctx'> 		i-&gt;max -= n;</div><div class='add'>+		i-&gt;openmax = 0;</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_interval_checkempty(i)) {</div><div class='hunk'>@@ -1054,7 +1160,7 @@ static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned</div><div class='ctx'>  * @private: the private data pointer passed to function</div><div class='ctx'>  * @dep: the dependent variables</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,</div><div class='ctx'> 			int var,</div><div class='hunk'>@@ -1069,13 +1175,11 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,</div><div class='ctx'> 	if (constrs-&gt;rules_num &gt;= constrs-&gt;rules_all) {</div><div class='ctx'> 		struct snd_pcm_hw_rule *new;</div><div class='ctx'> 		unsigned int new_rules = constrs-&gt;rules_all + 16;</div><div class='del'>-		new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);</div><div class='del'>-		if (!new)</div><div class='add'>+		new = krealloc_array(constrs-&gt;rules, new_rules,</div><div class='add'>+				     sizeof(*c), GFP_KERNEL);</div><div class='add'>+		if (!new) {</div><div class='add'>+			va_end(args);</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		if (constrs-&gt;rules) {</div><div class='del'>-			memcpy(new, constrs-&gt;rules,</div><div class='del'>-			       constrs-&gt;rules_num * sizeof(*c));</div><div class='del'>-			kfree(constrs-&gt;rules);</div><div class='ctx'> 		}</div><div class='ctx'> 		constrs-&gt;rules = new;</div><div class='ctx'> 		constrs-&gt;rules_all = new_rules;</div><div class='hunk'>@@ -1087,8 +1191,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,</div><div class='ctx'> 	c-&gt;private = private;</div><div class='ctx'> 	k = 0;</div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (snd_BUG_ON(k &gt;= ARRAY_SIZE(c-&gt;deps)))</div><div class='add'>+		if (snd_BUG_ON(k &gt;= ARRAY_SIZE(c-&gt;deps))) {</div><div class='add'>+			va_end(args);</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		c-&gt;deps[k++] = dep;</div><div class='ctx'> 		if (dep &lt; 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1097,8 +1203,7 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,</div><div class='ctx'> 	constrs-&gt;rules_num++;</div><div class='ctx'> 	va_end(args);</div><div class='ctx'> 	return 0;</div><div class='del'>-}				    </div><div class='del'>-</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_rule_add);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1108,6 +1213,8 @@ EXPORT_SYMBOL(snd_pcm_hw_rule_add);</div><div class='ctx'>  * @mask: the bitmap mask</div><div class='ctx'>  *</div><div class='ctx'>  * Apply the constraint of the given bitmap mask to a 32-bit mask parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,</div><div class='ctx'> 			       u_int32_t mask)</div><div class='hunk'>@@ -1128,6 +1235,8 @@ int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param</div><div class='ctx'>  * @mask: the 64bit bitmap mask</div><div class='ctx'>  *</div><div class='ctx'>  * Apply the constraint of the given bitmap mask to a 64-bit mask parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,</div><div class='ctx'> 				 u_int64_t mask)</div><div class='hunk'>@@ -1141,6 +1250,7 @@ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_par</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_hw_constraint_mask64);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval</div><div class='hunk'>@@ -1148,13 +1258,15 @@ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_par</div><div class='ctx'>  * @var: hw_params variable to apply the integer constraint</div><div class='ctx'>  *</div><div class='ctx'>  * Apply the constraint of integer to an interval parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_hw_constraints *constrs = &amp;runtime-&gt;hw_constraints;</div><div class='ctx'> 	return snd_interval_setinteger(constrs_interval(constrs, var));</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1165,6 +1277,9 @@ EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);</div><div class='ctx'>  * @max: the maximal value</div><div class='ctx'>  * </div><div class='ctx'>  * Apply the min/max range constraint to an interval parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Positive if the value is changed, zero if it's not changed, or a</div><div class='add'>+ * negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_minmax(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,</div><div class='ctx'> 				 unsigned int min, unsigned int max)</div><div class='hunk'>@@ -1177,7 +1292,6 @@ int snd_pcm_hw_constraint_minmax(struct snd_pcm_runtime *runtime, snd_pcm_hw_par</div><div class='ctx'> 	t.integer = 0;</div><div class='ctx'> 	return snd_interval_refine(constrs_interval(constrs, var), &amp;t);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_minmax);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1196,23 +1310,55 @@ static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,</div><div class='ctx'>  * @l: list</div><div class='ctx'>  * </div><div class='ctx'>  * Apply the list of constraints to an interval parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 			       unsigned int cond,</div><div class='ctx'> 			       snd_pcm_hw_param_t var,</div><div class='del'>-			       struct snd_pcm_hw_constraint_list *l)</div><div class='add'>+			       const struct snd_pcm_hw_constraint_list *l)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_pcm_hw_rule_add(runtime, cond, var,</div><div class='del'>-				   snd_pcm_hw_rule_list, l,</div><div class='add'>+				   snd_pcm_hw_rule_list, (void *)l,</div><div class='ctx'> 				   var, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_list);</div><div class='ctx'> </div><div class='add'>+static int snd_pcm_hw_rule_ranges(struct snd_pcm_hw_params *params,</div><div class='add'>+				  struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hw_constraint_ranges *r = rule-&gt;private;</div><div class='add'>+	return snd_interval_ranges(hw_param_interval(params, rule-&gt;var),</div><div class='add'>+				   r-&gt;count, r-&gt;ranges, r-&gt;mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_hw_constraint_ranges - apply list of range constraints to a parameter</div><div class='add'>+ * @runtime: PCM runtime instance</div><div class='add'>+ * @cond: condition bits</div><div class='add'>+ * @var: hw_params variable to apply the list of range constraints</div><div class='add'>+ * @r: ranges</div><div class='add'>+ *</div><div class='add'>+ * Apply the list of range constraints to an interval parameter.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime,</div><div class='add'>+				 unsigned int cond,</div><div class='add'>+				 snd_pcm_hw_param_t var,</div><div class='add'>+				 const struct snd_pcm_hw_constraint_ranges *r)</div><div class='add'>+{</div><div class='add'>+	return snd_pcm_hw_rule_add(runtime, cond, var,</div><div class='add'>+				   snd_pcm_hw_rule_ranges, (void *)r,</div><div class='add'>+				   var, -1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_hw_constraint_ranges);</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				   struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_constraint_ratnums *r = rule-&gt;private;</div><div class='add'>+	const struct snd_pcm_hw_constraint_ratnums *r = rule-&gt;private;</div><div class='ctx'> 	unsigned int num = 0, den = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	err = snd_interval_ratnum(hw_param_interval(params, rule-&gt;var),</div><div class='hunk'>@@ -1230,23 +1376,24 @@ static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,</div><div class='ctx'>  * @cond: condition bits</div><div class='ctx'>  * @var: hw_params variable to apply the ratnums constraint</div><div class='ctx'>  * @r: struct snd_ratnums constriants</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, </div><div class='ctx'> 				  unsigned int cond,</div><div class='ctx'> 				  snd_pcm_hw_param_t var,</div><div class='del'>-				  struct snd_pcm_hw_constraint_ratnums *r)</div><div class='add'>+				  const struct snd_pcm_hw_constraint_ratnums *r)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_pcm_hw_rule_add(runtime, cond, var,</div><div class='del'>-				   snd_pcm_hw_rule_ratnums, r,</div><div class='add'>+				   snd_pcm_hw_rule_ratnums, (void *)r,</div><div class='ctx'> 				   var, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_ratnums);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				   struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_constraint_ratdens *r = rule-&gt;private;</div><div class='add'>+	const struct snd_pcm_hw_constraint_ratdens *r = rule-&gt;private;</div><div class='ctx'> 	unsigned int num = 0, den = 0;</div><div class='ctx'> 	int err = snd_interval_ratden(hw_param_interval(params, rule-&gt;var),</div><div class='ctx'> 				  r-&gt;nrats, r-&gt;rats, &amp;num, &amp;den);</div><div class='hunk'>@@ -1263,17 +1410,18 @@ static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,</div><div class='ctx'>  * @cond: condition bits</div><div class='ctx'>  * @var: hw_params variable to apply the ratdens constraint</div><div class='ctx'>  * @r: struct snd_ratdens constriants</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime, </div><div class='ctx'> 				  unsigned int cond,</div><div class='ctx'> 				  snd_pcm_hw_param_t var,</div><div class='del'>-				  struct snd_pcm_hw_constraint_ratdens *r)</div><div class='add'>+				  const struct snd_pcm_hw_constraint_ratdens *r)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_pcm_hw_rule_add(runtime, cond, var,</div><div class='del'>-				   snd_pcm_hw_rule_ratdens, r,</div><div class='add'>+				   snd_pcm_hw_rule_ratdens, (void *)r,</div><div class='ctx'> 				   var, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_ratdens);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1282,9 +1430,16 @@ static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,</div><div class='ctx'> 	unsigned int l = (unsigned long) rule-&gt;private;</div><div class='ctx'> 	int width = l &amp; 0xffff;</div><div class='ctx'> 	unsigned int msbits = l &gt;&gt; 16;</div><div class='del'>-	struct snd_interval *i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);</div><div class='del'>-	if (snd_interval_single(i) &amp;&amp; snd_interval_value(i) == width)</div><div class='del'>-		params-&gt;msbits = msbits;</div><div class='add'>+	const struct snd_interval *i =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);</div><div class='add'>+</div><div class='add'>+	if (!snd_interval_single(i))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((snd_interval_value(i) == width) ||</div><div class='add'>+	    (width == 0 &amp;&amp; snd_interval_value(i) &gt; msbits))</div><div class='add'>+		params-&gt;msbits = min_not_zero(params-&gt;msbits, msbits);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1294,6 +1449,13 @@ static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,</div><div class='ctx'>  * @cond: condition bits</div><div class='ctx'>  * @width: sample bits width</div><div class='ctx'>  * @msbits: msbits width</div><div class='add'>+ *</div><div class='add'>+ * This constraint will set the number of most significant bits (msbits) if a</div><div class='add'>+ * sample format with the specified width has been select. If width is set to 0</div><div class='add'>+ * the msbits will be set for any sample format with a width larger than the</div><div class='add'>+ * specified msbits.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime, </div><div class='ctx'> 				 unsigned int cond,</div><div class='hunk'>@@ -1306,14 +1468,13 @@ int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 				    (void*) l,</div><div class='ctx'> 				    SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_msbits);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long step = (unsigned long) rule-&gt;private;</div><div class='del'>-	return snd_interval_step(hw_param_interval(params, rule-&gt;var), 0, step);</div><div class='add'>+	return snd_interval_step(hw_param_interval(params, rule-&gt;var), step);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1322,6 +1483,8 @@ static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,</div><div class='ctx'>  * @cond: condition bits</div><div class='ctx'>  * @var: hw_params variable to apply the step constraint</div><div class='ctx'>  * @step: step size</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 			       unsigned int cond,</div><div class='hunk'>@@ -1332,12 +1495,11 @@ int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 				   snd_pcm_hw_rule_step, (void *) step,</div><div class='ctx'> 				   var, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_step);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int pow2_sizes[] = {</div><div class='add'>+	static const unsigned int pow2_sizes[] = {</div><div class='ctx'> 		1&lt;&lt;0, 1&lt;&lt;1, 1&lt;&lt;2, 1&lt;&lt;3, 1&lt;&lt;4, 1&lt;&lt;5, 1&lt;&lt;6, 1&lt;&lt;7,</div><div class='ctx'> 		1&lt;&lt;8, 1&lt;&lt;9, 1&lt;&lt;10, 1&lt;&lt;11, 1&lt;&lt;12, 1&lt;&lt;13, 1&lt;&lt;14, 1&lt;&lt;15,</div><div class='ctx'> 		1&lt;&lt;16, 1&lt;&lt;17, 1&lt;&lt;18, 1&lt;&lt;19, 1&lt;&lt;20, 1&lt;&lt;21, 1&lt;&lt;22, 1&lt;&lt;23,</div><div class='hunk'>@@ -1352,6 +1514,8 @@ static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm</div><div class='ctx'>  * @runtime: PCM runtime instance</div><div class='ctx'>  * @cond: condition bits</div><div class='ctx'>  * @var: hw_params variable to apply the power-of-2 constraint</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 			       unsigned int cond,</div><div class='hunk'>@@ -1361,9 +1525,36 @@ int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,</div><div class='ctx'> 				   snd_pcm_hw_rule_pow2, NULL,</div><div class='ctx'> 				   var, -1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_constraint_pow2);</div><div class='ctx'> </div><div class='add'>+static int snd_pcm_hw_rule_noresample_func(struct snd_pcm_hw_params *params,</div><div class='add'>+					   struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	unsigned int base_rate = (unsigned int)(uintptr_t)rule-&gt;private;</div><div class='add'>+	struct snd_interval *rate;</div><div class='add'>+</div><div class='add'>+	rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	return snd_interval_list(rate, 1, &amp;base_rate, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_hw_rule_noresample - add a rule to allow disabling hw resampling</div><div class='add'>+ * @runtime: PCM runtime instance</div><div class='add'>+ * @base_rate: the rate at which the hardware does not resample</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_hw_rule_noresample(struct snd_pcm_runtime *runtime,</div><div class='add'>+			       unsigned int base_rate)</div><div class='add'>+{</div><div class='add'>+	return snd_pcm_hw_rule_add(runtime, SNDRV_PCM_HW_PARAMS_NORESAMPLE,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				   snd_pcm_hw_rule_noresample_func,</div><div class='add'>+				   (void *)(uintptr_t)base_rate,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_hw_rule_noresample);</div><div class='add'>+</div><div class='ctx'> static void _snd_pcm_hw_param_any(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				  snd_pcm_hw_param_t var)</div><div class='ctx'> {</div><div class='hunk'>@@ -1392,7 +1583,6 @@ void _snd_pcm_hw_params_any(struct snd_pcm_hw_params *params)</div><div class='ctx'> 		_snd_pcm_hw_param_any(params, k);</div><div class='ctx'> 	params-&gt;info = ~0U;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(_snd_pcm_hw_params_any);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1401,8 +1591,8 @@ EXPORT_SYMBOL(_snd_pcm_hw_params_any);</div><div class='ctx'>  * @var: parameter to retrieve</div><div class='ctx'>  * @dir: pointer to the direction (-1,0,1) or %NULL</div><div class='ctx'>  *</div><div class='del'>- * Return the value for field @var if it's fixed in configuration space</div><div class='del'>- * defined by @params. Return -%EINVAL otherwise.</div><div class='add'>+ * Return: The value for field @var if it's fixed in configuration space</div><div class='add'>+ * defined by @params. -%EINVAL otherwise.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,</div><div class='ctx'> 			   snd_pcm_hw_param_t var, int *dir)</div><div class='hunk'>@@ -1425,7 +1615,6 @@ int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_param_value);</div><div class='ctx'> </div><div class='ctx'> void _snd_pcm_hw_param_setempty(struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1443,7 +1632,6 @@ void _snd_pcm_hw_param_setempty(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(_snd_pcm_hw_param_setempty);</div><div class='ctx'> </div><div class='ctx'> static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1456,7 +1644,7 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		changed = snd_interval_refine_first(hw_param_interval(params, var));</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1473,7 +1661,8 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,</div><div class='ctx'>  *</div><div class='ctx'>  * Inside configuration space defined by @params remove from @var all</div><div class='ctx'>  * values &gt; minimum. Reduce configuration space accordingly.</div><div class='del'>- * Return the minimum.</div><div class='add'>+ *</div><div class='add'>+ * Return: The minimum, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm, </div><div class='ctx'> 			   struct snd_pcm_hw_params *params, </div><div class='hunk'>@@ -1484,12 +1673,11 @@ int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm,</div><div class='ctx'> 		return changed;</div><div class='ctx'> 	if (params-&gt;rmask) {</div><div class='ctx'> 		int err = snd_pcm_hw_refine(pcm, params);</div><div class='del'>-		if (snd_BUG_ON(err &lt; 0))</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_pcm_hw_param_value(params, var, dir);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_param_first);</div><div class='ctx'> </div><div class='ctx'> static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1502,7 +1690,7 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		changed = snd_interval_refine_last(hw_param_interval(params, var));</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (changed) {</div><div class='add'>+	if (changed &gt; 0) {</div><div class='ctx'> 		params-&gt;cmask |= 1 &lt;&lt; var;</div><div class='ctx'> 		params-&gt;rmask |= 1 &lt;&lt; var;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1519,7 +1707,8 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,</div><div class='ctx'>  *</div><div class='ctx'>  * Inside configuration space defined by @params remove from @var all</div><div class='ctx'>  * values &lt; maximum. Reduce configuration space accordingly.</div><div class='del'>- * Return the maximum.</div><div class='add'>+ *</div><div class='add'>+ * Return: The maximum, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm, </div><div class='ctx'> 			  struct snd_pcm_hw_params *params,</div><div class='hunk'>@@ -1530,63 +1719,60 @@ int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm,</div><div class='ctx'> 		return changed;</div><div class='ctx'> 	if (params-&gt;rmask) {</div><div class='ctx'> 		int err = snd_pcm_hw_refine(pcm, params);</div><div class='del'>-		if (snd_BUG_ON(err &lt; 0))</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_pcm_hw_param_value(params, var, dir);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_param_last);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_hw_param_choose - choose a configuration defined by @params</div><div class='del'>- * @pcm: PCM instance</div><div class='del'>- * @params: the hw_params instance</div><div class='add'>+ * snd_pcm_hw_params_bits - Get the number of bits per the sample.</div><div class='add'>+ * @p: hardware parameters</div><div class='ctx'>  *</div><div class='del'>- * Choose one configuration from configuration space defined by @params.</div><div class='del'>- * The configuration chosen is that obtained fixing in this order:</div><div class='del'>- * first access, first format, first subformat, min channels,</div><div class='del'>- * min rate, min period time, max buffer size, min tick time</div><div class='add'>+ * Return: The number of bits per sample based on the format,</div><div class='add'>+ * subformat and msbits the specified hw params has.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,</div><div class='del'>-			     struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	static int vars[] = {</div><div class='del'>-		SNDRV_PCM_HW_PARAM_ACCESS,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_SUBFORMAT,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_PERIOD_TIME,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_TICK_TIME,</div><div class='del'>-		-1</div><div class='del'>-	};</div><div class='del'>-	int err, *v;</div><div class='del'>-</div><div class='del'>-	for (v = vars; *v != -1; v++) {</div><div class='del'>-		if (*v != SNDRV_PCM_HW_PARAM_BUFFER_SIZE)</div><div class='del'>-			err = snd_pcm_hw_param_first(pcm, params, *v, NULL);</div><div class='del'>-		else</div><div class='del'>-			err = snd_pcm_hw_param_last(pcm, params, *v, NULL);</div><div class='del'>-		if (snd_BUG_ON(err &lt; 0))</div><div class='del'>-			return err;</div><div class='add'>+int snd_pcm_hw_params_bits(const struct snd_pcm_hw_params *p)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_subformat_t subformat = params_subformat(p);</div><div class='add'>+	snd_pcm_format_t format = params_format(p);</div><div class='add'>+</div><div class='add'>+	switch (format) {</div><div class='add'>+	case SNDRV_PCM_FORMAT_S32_LE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_U32_LE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_S32_BE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_U32_BE:</div><div class='add'>+		switch (subformat) {</div><div class='add'>+		case SNDRV_PCM_SUBFORMAT_MSBITS_20:</div><div class='add'>+			return 20;</div><div class='add'>+		case SNDRV_PCM_SUBFORMAT_MSBITS_24:</div><div class='add'>+			return 24;</div><div class='add'>+		case SNDRV_PCM_SUBFORMAT_MSBITS_MAX:</div><div class='add'>+		case SNDRV_PCM_SUBFORMAT_STD:</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return snd_pcm_format_width(format);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_hw_params_bits);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream,</div><div class='ctx'> 				   void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	snd_pcm_stream_lock_irqsave(substream, flags);</div><div class='add'>+</div><div class='add'>+	guard(pcm_stream_lock_irqsave)(substream);</div><div class='ctx'> 	if (snd_pcm_running(substream) &amp;&amp;</div><div class='ctx'> 	    snd_pcm_update_hw_ptr(substream) &gt;= 0)</div><div class='ctx'> 		runtime-&gt;status-&gt;hw_ptr %= runtime-&gt;buffer_size;</div><div class='del'>-	else</div><div class='add'>+	else {</div><div class='ctx'> 		runtime-&gt;status-&gt;hw_ptr = 0;</div><div class='del'>-	snd_pcm_stream_unlock_irqrestore(substream, flags);</div><div class='add'>+		runtime-&gt;hw_ptr_wrap = 0;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1630,18 +1816,32 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_hw_params *params = arg;</div><div class='ctx'> 	snd_pcm_format_t format;</div><div class='del'>-	int channels, width;</div><div class='add'>+	int channels;</div><div class='add'>+	ssize_t frame_size;</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;fifo_size = substream-&gt;runtime-&gt;hw.fifo_size;</div><div class='ctx'> 	if (!(substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_FIFO_IN_FRAMES)) {</div><div class='ctx'> 		format = params_format(params);</div><div class='ctx'> 		channels = params_channels(params);</div><div class='del'>-		width = snd_pcm_format_physical_width(format);</div><div class='del'>-		params-&gt;fifo_size /= width * channels;</div><div class='add'>+		frame_size = snd_pcm_format_size(format, channels);</div><div class='add'>+		if (frame_size &gt; 0)</div><div class='add'>+			params-&gt;fifo_size /= frame_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_pcm_lib_ioctl_sync_id(struct snd_pcm_substream *substream,</div><div class='add'>+				     void *arg)</div><div class='add'>+{</div><div class='add'>+	static const unsigned char id[12] = { 0xff, 0xff, 0xff, 0xff,</div><div class='add'>+					      0xff, 0xff, 0xff, 0xff,</div><div class='add'>+					      0xff, 0xff, 0xff, 0xff };</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;std_sync_id)</div><div class='add'>+		snd_pcm_set_sync_per_card(substream, arg, id, sizeof(id));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_lib_ioctl - a generic PCM ioctl callback</div><div class='ctx'>  * @substream: the pcm substream instance</div><div class='hunk'>@@ -1651,63 +1851,93 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,</div><div class='ctx'>  * Processes the generic ioctl commands for PCM.</div><div class='ctx'>  * Can be passed as the ioctl callback for PCM ops.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,</div><div class='ctx'> 		      unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_IOCTL1_INFO:</div><div class='del'>-		return 0;</div><div class='ctx'> 	case SNDRV_PCM_IOCTL1_RESET:</div><div class='ctx'> 		return snd_pcm_lib_ioctl_reset(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:</div><div class='ctx'> 		return snd_pcm_lib_ioctl_channel_info(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL1_FIFO_SIZE:</div><div class='ctx'> 		return snd_pcm_lib_ioctl_fifo_size(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL1_SYNC_ID:</div><div class='add'>+		return snd_pcm_lib_ioctl_sync_id(substream, arg);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_ioctl);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_period_elapsed - update the pcm status for the next period</div><div class='del'>- * @substream: the pcm substream instance</div><div class='add'>+ * snd_pcm_period_elapsed_under_stream_lock() - update the status of runtime for the next period</div><div class='add'>+ *						under acquired lock of PCM substream.</div><div class='add'>+ * @substream: the instance of pcm substream.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when the batch of audio data frames as the same size as the period of</div><div class='add'>+ * buffer is already processed in audio data transmission.</div><div class='add'>+ *</div><div class='add'>+ * The call of function updates the status of runtime with the latest position of audio data</div><div class='add'>+ * transmission, checks overrun and underrun over buffer, awaken user processes from waiting for</div><div class='add'>+ * available audio data frames, sampling audio timestamp, and performs stop or drain the PCM</div><div class='add'>+ * substream according to configured threshold.</div><div class='add'>+ *</div><div class='add'>+ * The function is intended to use for the case that PCM driver operates audio data frames under</div><div class='add'>+ * acquired lock of PCM substream; e.g. in callback of any operation of &amp;snd_pcm_ops in process</div><div class='add'>+ * context. In any interrupt context, it's preferrable to use ``snd_pcm_period_elapsed()`` instead</div><div class='add'>+ * since lock of PCM substream should be acquired in advance.</div><div class='add'>+ *</div><div class='add'>+ * Developer should pay enough attention that some callbacks in &amp;snd_pcm_ops are done by the call of</div><div class='add'>+ * function:</div><div class='ctx'>  *</div><div class='del'>- * This function is called from the interrupt handler when the</div><div class='del'>- * PCM has processed the period size.  It will update the current</div><div class='del'>- * pointer, wake up sleepers, etc.</div><div class='add'>+ * - .pointer - to retrieve current position of audio data transmission by frame count or XRUN state.</div><div class='add'>+ * - .trigger - with SNDRV_PCM_TRIGGER_STOP at XRUN or DRAINING state.</div><div class='add'>+ * - .get_time_info - to retrieve audio time stamp if needed.</div><div class='ctx'>  *</div><div class='del'>- * Even if more than one periods have elapsed since the last call, you</div><div class='del'>- * have to call this only once.</div><div class='add'>+ * Even if more than one periods have elapsed since the last call, you have to call this only once.</div><div class='ctx'>  */</div><div class='del'>-void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)</div><div class='add'>+void snd_pcm_period_elapsed_under_stream_lock(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;transfer_ack_begin)</div><div class='del'>-		runtime-&gt;transfer_ack_begin(substream);</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irqsave(substream, flags);</div><div class='ctx'> 	if (!snd_pcm_running(substream) ||</div><div class='ctx'> 	    snd_pcm_update_hw_ptr0(substream, 1) &lt; 0)</div><div class='ctx'> 		goto _end;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SND_PCM_TIMER</div><div class='ctx'> 	if (substream-&gt;timer_running)</div><div class='ctx'> 		snd_timer_interrupt(substream-&gt;timer, 1);</div><div class='add'>+#endif</div><div class='ctx'>  _end:</div><div class='del'>-	snd_pcm_stream_unlock_irqrestore(substream, flags);</div><div class='del'>-	if (runtime-&gt;transfer_ack_end)</div><div class='del'>-		runtime-&gt;transfer_ack_end(substream);</div><div class='del'>-	kill_fasync(&amp;runtime-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+	snd_kill_fasync(runtime-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_period_elapsed_under_stream_lock);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_period_elapsed() - update the status of runtime for the next period by acquiring lock of</div><div class='add'>+ *			      PCM substream.</div><div class='add'>+ * @substream: the instance of PCM substream.</div><div class='add'>+ *</div><div class='add'>+ * This function is mostly similar to ``snd_pcm_period_elapsed_under_stream_lock()`` except for</div><div class='add'>+ * acquiring lock of PCM substream voluntarily.</div><div class='add'>+ *</div><div class='add'>+ * It's typically called by any type of IRQ handler when hardware IRQ occurs to notify event that</div><div class='add'>+ * the batch of audio data frames as the same size as the period of buffer is already processed in</div><div class='add'>+ * audio data transmission.</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_period_elapsed(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!substream))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(pcm_stream_lock_irqsave)(substream);</div><div class='add'>+	snd_pcm_period_elapsed_under_stream_lock(substream);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_period_elapsed);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1721,23 +1951,55 @@ static int wait_for_avail(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int is_playback = substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	snd_pcm_uframes_t avail = 0;</div><div class='del'>-	long tout;</div><div class='add'>+	long wait_time, tout;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='add'>+	set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 	add_wait_queue(&amp;runtime-&gt;tsleep, &amp;wait);</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;no_period_wakeup)</div><div class='add'>+		wait_time = MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+	else {</div><div class='add'>+		/* use wait time from substream if available */</div><div class='add'>+		if (substream-&gt;wait_time) {</div><div class='add'>+			wait_time = substream-&gt;wait_time;</div><div class='add'>+		} else {</div><div class='add'>+			wait_time = 100;</div><div class='add'>+</div><div class='add'>+			if (runtime-&gt;rate) {</div><div class='add'>+				long t = runtime-&gt;buffer_size * 1100 / runtime-&gt;rate;</div><div class='add'>+				wait_time = max(t, wait_time);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		wait_time = msecs_to_jiffies(wait_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (;;) {</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			err = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * We need to check if space became available already</div><div class='add'>+		 * (and thus the wakeup happened already) first to close</div><div class='add'>+		 * the race of space already having become available.</div><div class='add'>+		 * This check must happen after been added to the waitqueue</div><div class='add'>+		 * and having current state be INTERRUPTIBLE.</div><div class='add'>+		 */</div><div class='add'>+		avail = snd_pcm_avail(substream);</div><div class='add'>+		if (avail &gt;= runtime-&gt;twake)</div><div class='add'>+			break;</div><div class='ctx'> 		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		tout = schedule_timeout(msecs_to_jiffies(10000));</div><div class='add'>+</div><div class='add'>+		tout = schedule_timeout(wait_time);</div><div class='add'>+</div><div class='ctx'> 		snd_pcm_stream_lock_irq(substream);</div><div class='del'>-		switch (runtime-&gt;status-&gt;state) {</div><div class='add'>+		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		switch (runtime-&gt;state) {</div><div class='ctx'> 		case SNDRV_PCM_STATE_SUSPENDED:</div><div class='ctx'> 			err = -ESTRPIPE;</div><div class='ctx'> 			goto _endloop;</div><div class='hunk'>@@ -1755,148 +2017,178 @@ static int wait_for_avail(struct snd_pcm_substream *substream,</div><div class='ctx'> 		case SNDRV_PCM_STATE_DISCONNECTED:</div><div class='ctx'> 			err = -EBADFD;</div><div class='ctx'> 			goto _endloop;</div><div class='add'>+		case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!tout) {</div><div class='del'>-			snd_printd("%s write error (DMA or IRQ trouble?)\n",</div><div class='del'>-				   is_playback ? "playback" : "capture");</div><div class='add'>+			pcm_dbg(substream-&gt;pcm,</div><div class='add'>+				"%s timeout (DMA or IRQ trouble?)\n",</div><div class='add'>+				is_playback ? "playback write" : "capture read");</div><div class='ctx'> 			err = -EIO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		if (is_playback)</div><div class='del'>-			avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-		else</div><div class='del'>-			avail = snd_pcm_capture_avail(runtime);</div><div class='del'>-		if (avail &gt;= runtime-&gt;twake)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'>  _endloop:</div><div class='add'>+	set_current_state(TASK_RUNNING);</div><div class='ctx'> 	remove_wait_queue(&amp;runtime-&gt;tsleep, &amp;wait);</div><div class='ctx'> 	*availp = avail;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='del'>-static int snd_pcm_lib_write_transfer(struct snd_pcm_substream *substream,</div><div class='del'>-				      unsigned int hwoff,</div><div class='del'>-				      unsigned long data, unsigned int off,</div><div class='del'>-				      snd_pcm_uframes_t frames)</div><div class='add'>+typedef int (*pcm_transfer_f)(struct snd_pcm_substream *substream,</div><div class='add'>+			      int channel, unsigned long hwoff,</div><div class='add'>+			      struct iov_iter *iter, unsigned long bytes);</div><div class='add'>+</div><div class='add'>+typedef int (*pcm_copy_f)(struct snd_pcm_substream *, snd_pcm_uframes_t, void *,</div><div class='add'>+			  snd_pcm_uframes_t, snd_pcm_uframes_t, pcm_transfer_f,</div><div class='add'>+			  bool);</div><div class='add'>+</div><div class='add'>+/* calculate the target DMA-buffer position to be written/read */</div><div class='add'>+static void *get_dma_ptr(struct snd_pcm_runtime *runtime,</div><div class='add'>+			   int channel, unsigned long hwoff)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err;</div><div class='del'>-	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);</div><div class='del'>-	if (substream-&gt;ops-&gt;copy) {</div><div class='del'>-		if ((err = substream-&gt;ops-&gt;copy(substream, -1, hwoff, buf, frames)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	} else {</div><div class='del'>-		char *hwbuf = runtime-&gt;dma_area + frames_to_bytes(runtime, hwoff);</div><div class='del'>-		if (copy_from_user(hwbuf, buf, frames_to_bytes(runtime, frames)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	return runtime-&gt;dma_area + hwoff +</div><div class='add'>+		channel * (runtime-&gt;dma_bytes / runtime-&gt;channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default copy ops for write; used for both interleaved and non- modes */</div><div class='add'>+static int default_write_copy(struct snd_pcm_substream *substream,</div><div class='add'>+			      int channel, unsigned long hwoff,</div><div class='add'>+			      struct iov_iter *iter, unsigned long bytes)</div><div class='add'>+{</div><div class='add'>+	if (copy_from_iter(get_dma_ptr(substream-&gt;runtime, channel, hwoff),</div><div class='add'>+			   bytes, iter) != bytes)</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>- </div><div class='del'>-typedef int (*transfer_f)(struct snd_pcm_substream *substream, unsigned int hwoff,</div><div class='del'>-			  unsigned long data, unsigned int off,</div><div class='del'>-			  snd_pcm_uframes_t size);</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream, </div><div class='del'>-					    unsigned long data,</div><div class='del'>-					    snd_pcm_uframes_t size,</div><div class='del'>-					    int nonblock,</div><div class='del'>-					    transfer_f transfer)</div><div class='add'>+/* fill silence instead of copy data; called as a transfer helper</div><div class='add'>+ * from __snd_pcm_lib_write() or directly from noninterleaved_copy() when</div><div class='add'>+ * a NULL buffer is passed</div><div class='add'>+ */</div><div class='add'>+static int fill_silence(struct snd_pcm_substream *substream, int channel,</div><div class='add'>+			unsigned long hwoff, struct iov_iter *iter,</div><div class='add'>+			unsigned long bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_uframes_t xfer = 0;</div><div class='del'>-	snd_pcm_uframes_t offset = 0;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (size == 0)</div><div class='add'>+	if (substream-&gt;stream != SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (substream-&gt;ops-&gt;fill_silence)</div><div class='add'>+		return substream-&gt;ops-&gt;fill_silence(substream, channel,</div><div class='add'>+						    hwoff, bytes);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		err = -EPIPE;</div><div class='del'>-		goto _end_unlock;</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		err = -ESTRPIPE;</div><div class='del'>-		goto _end_unlock;</div><div class='del'>-	default:</div><div class='del'>-		err = -EBADFD;</div><div class='del'>-		goto _end_unlock;</div><div class='add'>+	snd_pcm_format_set_silence(runtime-&gt;format,</div><div class='add'>+				   get_dma_ptr(runtime, channel, hwoff),</div><div class='add'>+				   bytes_to_samples(runtime, bytes));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default copy ops for read; used for both interleaved and non- modes */</div><div class='add'>+static int default_read_copy(struct snd_pcm_substream *substream,</div><div class='add'>+			     int channel, unsigned long hwoff,</div><div class='add'>+			     struct iov_iter *iter, unsigned long bytes)</div><div class='add'>+{</div><div class='add'>+	if (copy_to_iter(get_dma_ptr(substream-&gt;runtime, channel, hwoff),</div><div class='add'>+			 bytes, iter) != bytes)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call transfer with the filled iov_iter */</div><div class='add'>+static int do_transfer(struct snd_pcm_substream *substream, int c,</div><div class='add'>+		       unsigned long hwoff, void *data, unsigned long bytes,</div><div class='add'>+		       pcm_transfer_f transfer, bool in_kernel)</div><div class='add'>+{</div><div class='add'>+	struct iov_iter iter;</div><div class='add'>+	int err, type;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		type = ITER_SOURCE;</div><div class='add'>+	else</div><div class='add'>+		type = ITER_DEST;</div><div class='add'>+</div><div class='add'>+	if (in_kernel) {</div><div class='add'>+		struct kvec kvec = { data, bytes };</div><div class='add'>+</div><div class='add'>+		iov_iter_kvec(&amp;iter, type, &amp;kvec, 1, bytes);</div><div class='add'>+		return transfer(substream, c, hwoff, &amp;iter, bytes);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	runtime-&gt;twake = runtime-&gt;control-&gt;avail_min ? : 1;</div><div class='del'>-	while (size &gt; 0) {</div><div class='del'>-		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;</div><div class='del'>-		snd_pcm_uframes_t avail;</div><div class='del'>-		snd_pcm_uframes_t cont;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_RUNNING)</div><div class='del'>-			snd_pcm_update_hw_ptr(substream);</div><div class='del'>-		avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-		if (!avail) {</div><div class='del'>-			if (nonblock) {</div><div class='del'>-				err = -EAGAIN;</div><div class='del'>-				goto _end_unlock;</div><div class='del'>-			}</div><div class='del'>-			runtime-&gt;twake = min_t(snd_pcm_uframes_t, size,</div><div class='del'>-					runtime-&gt;control-&gt;avail_min ? : 1);</div><div class='del'>-			err = wait_for_avail(substream, &amp;avail);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto _end_unlock;</div><div class='del'>-		}</div><div class='del'>-		frames = size &gt; avail ? avail : size;</div><div class='del'>-		cont = runtime-&gt;buffer_size - runtime-&gt;control-&gt;appl_ptr % runtime-&gt;buffer_size;</div><div class='del'>-		if (frames &gt; cont)</div><div class='del'>-			frames = cont;</div><div class='del'>-		if (snd_BUG_ON(!frames)) {</div><div class='del'>-			runtime-&gt;twake = 0;</div><div class='del'>-			snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='del'>-		appl_ofs = appl_ptr % runtime-&gt;buffer_size;</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		err = transfer(substream, appl_ofs, data, offset, frames);</div><div class='del'>-		snd_pcm_stream_lock_irq(substream);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto _end_unlock;</div><div class='del'>-		switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-		case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-			err = -EPIPE;</div><div class='del'>-			goto _end_unlock;</div><div class='del'>-		case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-			err = -ESTRPIPE;</div><div class='del'>-			goto _end_unlock;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		appl_ptr += frames;</div><div class='del'>-		if (appl_ptr &gt;= runtime-&gt;boundary)</div><div class='del'>-			appl_ptr -= runtime-&gt;boundary;</div><div class='del'>-		runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-		if (substream-&gt;ops-&gt;ack)</div><div class='del'>-			substream-&gt;ops-&gt;ack(substream);</div><div class='add'>+	err = import_ubuf(type, (__force void __user *)data, bytes, &amp;iter);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return transfer(substream, c, hwoff, &amp;iter, bytes);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		offset += frames;</div><div class='del'>-		size -= frames;</div><div class='del'>-		xfer += frames;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_PREPARED &amp;&amp;</div><div class='del'>-		    snd_pcm_playback_hw_avail(runtime) &gt;= (snd_pcm_sframes_t)runtime-&gt;start_threshold) {</div><div class='del'>-			err = snd_pcm_start(substream);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto _end_unlock;</div><div class='del'>-		}</div><div class='add'>+/* call transfer function with the converted pointers and sizes;</div><div class='add'>+ * for interleaved mode, it's one shot for all samples</div><div class='add'>+ */</div><div class='add'>+static int interleaved_copy(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_uframes_t hwoff, void *data,</div><div class='add'>+			    snd_pcm_uframes_t off,</div><div class='add'>+			    snd_pcm_uframes_t frames,</div><div class='add'>+			    pcm_transfer_f transfer,</div><div class='add'>+			    bool in_kernel)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	/* convert to bytes */</div><div class='add'>+	hwoff = frames_to_bytes(runtime, hwoff);</div><div class='add'>+	off = frames_to_bytes(runtime, off);</div><div class='add'>+	frames = frames_to_bytes(runtime, frames);</div><div class='add'>+</div><div class='add'>+	return do_transfer(substream, 0, hwoff, data + off, frames, transfer,</div><div class='add'>+			   in_kernel);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call transfer function with the converted pointers and sizes for each</div><div class='add'>+ * non-interleaved channel; when buffer is NULL, silencing instead of copying</div><div class='add'>+ */</div><div class='add'>+static int noninterleaved_copy(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_uframes_t hwoff, void *data,</div><div class='add'>+			       snd_pcm_uframes_t off,</div><div class='add'>+			       snd_pcm_uframes_t frames,</div><div class='add'>+			       pcm_transfer_f transfer,</div><div class='add'>+			       bool in_kernel)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int channels = runtime-&gt;channels;</div><div class='add'>+	void **bufs = data;</div><div class='add'>+	int c, err;</div><div class='add'>+</div><div class='add'>+	/* convert to bytes; note that it's not frames_to_bytes() here.</div><div class='add'>+	 * in non-interleaved mode, we copy for each channel, thus</div><div class='add'>+	 * each copy is n_samples bytes x channels = whole frames.</div><div class='add'>+	 */</div><div class='add'>+	off = samples_to_bytes(runtime, off);</div><div class='add'>+	frames = samples_to_bytes(runtime, frames);</div><div class='add'>+	hwoff = samples_to_bytes(runtime, hwoff);</div><div class='add'>+	for (c = 0; c &lt; channels; ++c, ++bufs) {</div><div class='add'>+		if (!data || !*bufs)</div><div class='add'>+			err = fill_silence(substream, c, hwoff, NULL, frames);</div><div class='add'>+		else</div><div class='add'>+			err = do_transfer(substream, c, hwoff, *bufs + off,</div><div class='add'>+					  frames, transfer, in_kernel);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>- _end_unlock:</div><div class='del'>-	runtime-&gt;twake = 0;</div><div class='del'>-	if (xfer &gt; 0 &amp;&amp; err &gt;= 0)</div><div class='del'>-		snd_pcm_update_state(substream, runtime);</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	return xfer &gt; 0 ? (snd_pcm_sframes_t)xfer : err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill silence on the given buffer position;</div><div class='add'>+ * called from snd_pcm_playback_silence()</div><div class='add'>+ */</div><div class='add'>+static int fill_silence_frames(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_uframes_t off, snd_pcm_uframes_t frames)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;runtime-&gt;access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||</div><div class='add'>+	    substream-&gt;runtime-&gt;access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED)</div><div class='add'>+		return interleaved_copy(substream, off, NULL, 0, frames,</div><div class='add'>+					fill_silence, true);</div><div class='add'>+	else</div><div class='add'>+		return noninterleaved_copy(substream, off, NULL, 0, frames,</div><div class='add'>+					   fill_silence, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* sanity-check for read/write methods */</div><div class='hunk'>@@ -1908,162 +2200,151 @@ static int pcm_sanity_check(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (snd_BUG_ON(!substream-&gt;ops-&gt;copy &amp;&amp; !runtime-&gt;dma_area))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-snd_pcm_sframes_t snd_pcm_lib_write(struct snd_pcm_substream *substream, const void __user *buf, snd_pcm_uframes_t size)</div><div class='add'>+static int pcm_accessible_state(struct snd_pcm_runtime *runtime)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	int nonblock;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pcm_sanity_check(substream);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	nonblock = !!(substream-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-</div><div class='del'>-	if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &amp;&amp;</div><div class='del'>-	    runtime-&gt;channels &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return snd_pcm_lib_write1(substream, (unsigned long)buf, size, nonblock,</div><div class='del'>-				  snd_pcm_lib_write_transfer);</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_RUNNING:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		return 0;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='add'>+	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='add'>+		return -ESTRPIPE;</div><div class='add'>+	default:</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_write);</div><div class='del'>-</div><div class='del'>-static int snd_pcm_lib_writev_transfer(struct snd_pcm_substream *substream,</div><div class='del'>-				       unsigned int hwoff,</div><div class='del'>-				       unsigned long data, unsigned int off,</div><div class='del'>-				       snd_pcm_uframes_t frames)</div><div class='add'>+/* update to the given appl_ptr and call ack callback if needed;</div><div class='add'>+ * when an error is returned, take back to the original value</div><div class='add'>+ */</div><div class='add'>+int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,</div><div class='add'>+			   snd_pcm_uframes_t appl_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err;</div><div class='del'>-	void __user **bufs = (void __user **)data;</div><div class='del'>-	int channels = runtime-&gt;channels;</div><div class='del'>-	int c;</div><div class='del'>-	if (substream-&gt;ops-&gt;copy) {</div><div class='del'>-		if (snd_BUG_ON(!substream-&gt;ops-&gt;silence))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		for (c = 0; c &lt; channels; ++c, ++bufs) {</div><div class='del'>-			if (*bufs == NULL) {</div><div class='del'>-				if ((err = substream-&gt;ops-&gt;silence(substream, c, hwoff, frames)) &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			} else {</div><div class='del'>-				char __user *buf = *bufs + samples_to_bytes(runtime, off);</div><div class='del'>-				if ((err = substream-&gt;ops-&gt;copy(substream, c, hwoff, buf, frames)) &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='add'>+	snd_pcm_uframes_t old_appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='add'>+	snd_pcm_sframes_t diff;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (old_appl_ptr == appl_ptr)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (appl_ptr &gt;= runtime-&gt;boundary)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/*</div><div class='add'>+	 * check if a rewind is requested by the application</div><div class='add'>+	 */</div><div class='add'>+	if (substream-&gt;runtime-&gt;info &amp; SNDRV_PCM_INFO_NO_REWINDS) {</div><div class='add'>+		diff = appl_ptr - old_appl_ptr;</div><div class='add'>+		if (diff &gt;= 0) {</div><div class='add'>+			if (diff &gt; runtime-&gt;buffer_size)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			if (runtime-&gt;boundary + diff &gt; runtime-&gt;buffer_size)</div><div class='add'>+				return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		/* default transfer behaviour */</div><div class='del'>-		size_t dma_csize = runtime-&gt;dma_bytes / channels;</div><div class='del'>-		for (c = 0; c &lt; channels; ++c, ++bufs) {</div><div class='del'>-			char *hwbuf = runtime-&gt;dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);</div><div class='del'>-			if (*bufs == NULL) {</div><div class='del'>-				snd_pcm_format_set_silence(runtime-&gt;format, hwbuf, frames);</div><div class='del'>-			} else {</div><div class='del'>-				char __user *buf = *bufs + samples_to_bytes(runtime, off);</div><div class='del'>-				if (copy_from_user(hwbuf, buf, samples_to_bytes(runtime, frames)))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-			}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='add'>+	if (substream-&gt;ops-&gt;ack) {</div><div class='add'>+		ret = substream-&gt;ops-&gt;ack(substream);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			runtime-&gt;control-&gt;appl_ptr = old_appl_ptr;</div><div class='add'>+			if (ret == -EPIPE)</div><div class='add'>+				__snd_pcm_xrun(substream);</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	trace_applptr(substream, old_appl_ptr, appl_ptr);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>- </div><div class='del'>-snd_pcm_sframes_t snd_pcm_lib_writev(struct snd_pcm_substream *substream,</div><div class='del'>-				     void __user **bufs,</div><div class='del'>-				     snd_pcm_uframes_t frames)</div><div class='add'>+</div><div class='add'>+/* the common loop for read/write data */</div><div class='add'>+snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,</div><div class='add'>+				     void *data, bool interleaved,</div><div class='add'>+				     snd_pcm_uframes_t size, bool in_kernel)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	int nonblock;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	snd_pcm_uframes_t xfer = 0;</div><div class='add'>+	snd_pcm_uframes_t offset = 0;</div><div class='add'>+	snd_pcm_uframes_t avail;</div><div class='add'>+	pcm_copy_f writer;</div><div class='add'>+	pcm_transfer_f transfer;</div><div class='add'>+	bool nonblock;</div><div class='add'>+	bool is_playback;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = pcm_sanity_check(substream);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	nonblock = !!(substream-&gt;f_flags &amp; O_NONBLOCK);</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return snd_pcm_lib_write1(substream, (unsigned long)bufs, frames,</div><div class='del'>-				  nonblock, snd_pcm_lib_writev_transfer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_writev);</div><div class='del'>-</div><div class='del'>-static int snd_pcm_lib_read_transfer(struct snd_pcm_substream *substream, </div><div class='del'>-				     unsigned int hwoff,</div><div class='del'>-				     unsigned long data, unsigned int off,</div><div class='del'>-				     snd_pcm_uframes_t frames)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err;</div><div class='del'>-	char __user *buf = (char __user *) data + frames_to_bytes(runtime, off);</div><div class='del'>-	if (substream-&gt;ops-&gt;copy) {</div><div class='del'>-		if ((err = substream-&gt;ops-&gt;copy(substream, -1, hwoff, buf, frames)) &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+	is_playback = substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK;</div><div class='add'>+	if (interleaved) {</div><div class='add'>+		if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_INTERLEAVED &amp;&amp;</div><div class='add'>+		    runtime-&gt;channels &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		writer = interleaved_copy;</div><div class='ctx'> 	} else {</div><div class='del'>-		char *hwbuf = runtime-&gt;dma_area + frames_to_bytes(runtime, hwoff);</div><div class='del'>-		if (copy_to_user(buf, hwbuf, frames_to_bytes(runtime, frames)))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		writer = noninterleaved_copy;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream,</div><div class='del'>-					   unsigned long data,</div><div class='del'>-					   snd_pcm_uframes_t size,</div><div class='del'>-					   int nonblock,</div><div class='del'>-					   transfer_f transfer)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_uframes_t xfer = 0;</div><div class='del'>-	snd_pcm_uframes_t offset = 0;</div><div class='del'>-	int err = 0;</div><div class='add'>+	if (!data) {</div><div class='add'>+		if (is_playback)</div><div class='add'>+			transfer = fill_silence;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (substream-&gt;ops-&gt;copy)</div><div class='add'>+			transfer = substream-&gt;ops-&gt;copy;</div><div class='add'>+		else</div><div class='add'>+			transfer = is_playback ?</div><div class='add'>+				default_write_copy : default_read_copy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (size == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	nonblock = !!(substream-&gt;f_flags &amp; O_NONBLOCK);</div><div class='add'>+</div><div class='ctx'> 	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-		if (size &gt;= runtime-&gt;start_threshold) {</div><div class='del'>-			err = snd_pcm_start(substream);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				goto _end_unlock;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		err = -EPIPE;</div><div class='del'>-		goto _end_unlock;</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		err = -ESTRPIPE;</div><div class='del'>-		goto _end_unlock;</div><div class='del'>-	default:</div><div class='del'>-		err = -EBADFD;</div><div class='add'>+	err = pcm_accessible_state(runtime);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto _end_unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;twake = runtime-&gt;control-&gt;avail_min ? : 1;</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_RUNNING)</div><div class='add'>+		snd_pcm_update_hw_ptr(substream);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If size &lt; start_threshold, wait indefinitely. Another</div><div class='add'>+	 * thread may start capture</div><div class='add'>+	 */</div><div class='add'>+	if (!is_playback &amp;&amp;</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_PREPARED &amp;&amp;</div><div class='add'>+	    size &gt;= runtime-&gt;start_threshold) {</div><div class='add'>+		err = snd_pcm_start(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto _end_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	avail = snd_pcm_avail(substream);</div><div class='add'>+</div><div class='ctx'> 	while (size &gt; 0) {</div><div class='ctx'> 		snd_pcm_uframes_t frames, appl_ptr, appl_ofs;</div><div class='del'>-		snd_pcm_uframes_t avail;</div><div class='ctx'> 		snd_pcm_uframes_t cont;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_RUNNING)</div><div class='del'>-			snd_pcm_update_hw_ptr(substream);</div><div class='del'>-		avail = snd_pcm_capture_avail(runtime);</div><div class='ctx'> 		if (!avail) {</div><div class='del'>-			if (runtime-&gt;status-&gt;state ==</div><div class='del'>-			    SNDRV_PCM_STATE_DRAINING) {</div><div class='add'>+			if (!is_playback &amp;&amp;</div><div class='add'>+			    runtime-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='ctx'> 				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> 				goto _end_unlock;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2080,41 +2361,51 @@ static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream,</div><div class='ctx'> 				continue; /* draining */</div><div class='ctx'> 		}</div><div class='ctx'> 		frames = size &gt; avail ? avail : size;</div><div class='del'>-		cont = runtime-&gt;buffer_size - runtime-&gt;control-&gt;appl_ptr % runtime-&gt;buffer_size;</div><div class='add'>+		appl_ptr = READ_ONCE(runtime-&gt;control-&gt;appl_ptr);</div><div class='add'>+		appl_ofs = appl_ptr % runtime-&gt;buffer_size;</div><div class='add'>+		cont = runtime-&gt;buffer_size - appl_ofs;</div><div class='ctx'> 		if (frames &gt; cont)</div><div class='ctx'> 			frames = cont;</div><div class='ctx'> 		if (snd_BUG_ON(!frames)) {</div><div class='del'>-			runtime-&gt;twake = 0;</div><div class='del'>-			snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto _end_unlock;</div><div class='add'>+		}</div><div class='add'>+		if (!atomic_inc_unless_negative(&amp;runtime-&gt;buffer_accessing)) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto _end_unlock;</div><div class='ctx'> 		}</div><div class='del'>-		appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='del'>-		appl_ofs = appl_ptr % runtime-&gt;buffer_size;</div><div class='ctx'> 		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		err = transfer(substream, appl_ofs, data, offset, frames);</div><div class='add'>+		if (!is_playback)</div><div class='add'>+			snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_CPU);</div><div class='add'>+		err = writer(substream, appl_ofs, data, offset, frames,</div><div class='add'>+			     transfer, in_kernel);</div><div class='add'>+		if (is_playback)</div><div class='add'>+			snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='ctx'> 		snd_pcm_stream_lock_irq(substream);</div><div class='add'>+		atomic_dec(&amp;runtime-&gt;buffer_accessing);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto _end_unlock;</div><div class='del'>-		switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-		case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-			err = -EPIPE;</div><div class='del'>-			goto _end_unlock;</div><div class='del'>-		case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-			err = -ESTRPIPE;</div><div class='add'>+		err = pcm_accessible_state(runtime);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto _end_unlock;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 		appl_ptr += frames;</div><div class='ctx'> 		if (appl_ptr &gt;= runtime-&gt;boundary)</div><div class='ctx'> 			appl_ptr -= runtime-&gt;boundary;</div><div class='del'>-		runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-		if (substream-&gt;ops-&gt;ack)</div><div class='del'>-			substream-&gt;ops-&gt;ack(substream);</div><div class='add'>+		err = pcm_lib_apply_appl_ptr(substream, appl_ptr);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto _end_unlock;</div><div class='ctx'> </div><div class='ctx'> 		offset += frames;</div><div class='ctx'> 		size -= frames;</div><div class='ctx'> 		xfer += frames;</div><div class='add'>+		avail -= frames;</div><div class='add'>+		if (is_playback &amp;&amp;</div><div class='add'>+		    runtime-&gt;state == SNDRV_PCM_STATE_PREPARED &amp;&amp;</div><div class='add'>+		    snd_pcm_playback_hw_avail(runtime) &gt;= (snd_pcm_sframes_t)runtime-&gt;start_threshold) {</div><div class='add'>+			err = snd_pcm_start(substream);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto _end_unlock;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'>  _end_unlock:</div><div class='ctx'> 	runtime-&gt;twake = 0;</div><div class='hunk'>@@ -2123,80 +2414,219 @@ static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream,</div><div class='ctx'> 	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	return xfer &gt; 0 ? (snd_pcm_sframes_t)xfer : err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(__snd_pcm_lib_xfer);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * standard channel mapping helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* default channel maps for multi-channel playbacks, up to 8 channels */</div><div class='add'>+const struct snd_pcm_chmap_elem snd_pcm_std_chmaps[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },</div><div class='add'>+	{ .channels = 4,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ .channels = 6,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR,</div><div class='add'>+		   SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },</div><div class='add'>+	{ .channels = 8,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR,</div><div class='add'>+		   SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE,</div><div class='add'>+		   SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_std_chmaps);</div><div class='add'>+</div><div class='add'>+/* alternative channel maps with CLFE &lt;-&gt; surround swapped for 6/8 channels */</div><div class='add'>+const struct snd_pcm_chmap_elem snd_pcm_alt_chmaps[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },</div><div class='add'>+	{ .channels = 4,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ .channels = 6,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ .channels = 8,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR,</div><div class='add'>+		   SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_alt_chmaps);</div><div class='ctx'> </div><div class='del'>-snd_pcm_sframes_t snd_pcm_lib_read(struct snd_pcm_substream *substream, void __user *buf, snd_pcm_uframes_t size)</div><div class='add'>+static bool valid_chmap_channels(const struct snd_pcm_chmap *info, int ch)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	int nonblock;</div><div class='del'>-	int err;</div><div class='del'>-	</div><div class='del'>-	err = pcm_sanity_check(substream);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	nonblock = !!(substream-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-	if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_INTERLEAVED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return snd_pcm_lib_read1(substream, (unsigned long)buf, size, nonblock, snd_pcm_lib_read_transfer);</div><div class='add'>+	if (ch &gt; info-&gt;max_channels)</div><div class='add'>+		return false;</div><div class='add'>+	return !info-&gt;channel_mask || (info-&gt;channel_mask &amp; (1U &lt;&lt; ch));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_read);</div><div class='add'>+static int pcm_chmap_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = info-&gt;max_channels;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = SNDRV_CHMAP_LAST;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_lib_readv_transfer(struct snd_pcm_substream *substream,</div><div class='del'>-				      unsigned int hwoff,</div><div class='del'>-				      unsigned long data, unsigned int off,</div><div class='del'>-				      snd_pcm_uframes_t frames)</div><div class='add'>+/* get callback for channel map ctl element</div><div class='add'>+ * stores the channel position firstly matching with the current channels</div><div class='add'>+ */</div><div class='add'>+static int pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err;</div><div class='del'>-	void __user **bufs = (void __user **)data;</div><div class='del'>-	int channels = runtime-&gt;channels;</div><div class='del'>-	int c;</div><div class='del'>-	if (substream-&gt;ops-&gt;copy) {</div><div class='del'>-		for (c = 0; c &lt; channels; ++c, ++bufs) {</div><div class='del'>-			char __user *buf;</div><div class='del'>-			if (*bufs == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			buf = *bufs + samples_to_bytes(runtime, off);</div><div class='del'>-			if ((err = substream-&gt;ops-&gt;copy(substream, c, hwoff, buf, frames)) &lt; 0)</div><div class='del'>-				return err;</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	const struct snd_pcm_chmap_elem *map;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;chmap)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	substream = snd_pcm_chmap_substream(info, idx);</div><div class='add'>+	if (!substream)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	memset(ucontrol-&gt;value.integer.value, 0,</div><div class='add'>+	       sizeof(long) * info-&gt;max_channels);</div><div class='add'>+	if (!substream-&gt;runtime)</div><div class='add'>+		return 0; /* no channels set */</div><div class='add'>+	for (map = info-&gt;chmap; map-&gt;channels; map++) {</div><div class='add'>+		int i;</div><div class='add'>+		if (map-&gt;channels == substream-&gt;runtime-&gt;channels &amp;&amp;</div><div class='add'>+		    valid_chmap_channels(info, map-&gt;channels)) {</div><div class='add'>+			for (i = 0; i &lt; map-&gt;channels; i++)</div><div class='add'>+				ucontrol-&gt;value.integer.value[i] = map-&gt;map[i];</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		snd_pcm_uframes_t dma_csize = runtime-&gt;dma_bytes / channels;</div><div class='del'>-		for (c = 0; c &lt; channels; ++c, ++bufs) {</div><div class='del'>-			char *hwbuf;</div><div class='del'>-			char __user *buf;</div><div class='del'>-			if (*bufs == NULL)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			hwbuf = runtime-&gt;dma_area + (c * dma_csize) + samples_to_bytes(runtime, hwoff);</div><div class='del'>-			buf = *bufs + samples_to_bytes(runtime, off);</div><div class='del'>-			if (copy_to_user(buf, hwbuf, samples_to_bytes(runtime, frames)))</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* tlv callback for channel map ctl element</div><div class='add'>+ * expands the pre-defined channel maps in a form of TLV</div><div class='add'>+ */</div><div class='add'>+static int pcm_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='add'>+			     unsigned int size, unsigned int __user *tlv)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	const struct snd_pcm_chmap_elem *map;</div><div class='add'>+	unsigned int __user *dst;</div><div class='add'>+	int c, count = 0;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;chmap)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (size &lt; 8)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (put_user(SNDRV_CTL_TLVT_CONTAINER, tlv))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	size -= 8;</div><div class='add'>+	dst = tlv + 2;</div><div class='add'>+	for (map = info-&gt;chmap; map-&gt;channels; map++) {</div><div class='add'>+		int chs_bytes = map-&gt;channels * 4;</div><div class='add'>+		if (!valid_chmap_channels(info, map-&gt;channels))</div><div class='add'>+			continue;</div><div class='add'>+		if (size &lt; 8)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		if (put_user(SNDRV_CTL_TLVT_CHMAP_FIXED, dst) ||</div><div class='add'>+		    put_user(chs_bytes, dst + 1))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		dst += 2;</div><div class='add'>+		size -= 8;</div><div class='add'>+		count += 8;</div><div class='add'>+		if (size &lt; chs_bytes)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		size -= chs_bytes;</div><div class='add'>+		count += chs_bytes;</div><div class='add'>+		for (c = 0; c &lt; map-&gt;channels; c++) {</div><div class='add'>+			if (put_user(map-&gt;map[c], dst))</div><div class='ctx'> 				return -EFAULT;</div><div class='add'>+			dst++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (put_user(count, tlv + 1))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>- </div><div class='del'>-snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream,</div><div class='del'>-				    void __user **bufs,</div><div class='del'>-				    snd_pcm_uframes_t frames)</div><div class='add'>+</div><div class='add'>+static void pcm_chmap_ctl_private_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	int nonblock;</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	info-&gt;pcm-&gt;streams[info-&gt;stream].chmap_kctl = NULL;</div><div class='add'>+	kfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_add_chmap_ctls - create channel-mapping control elements</div><div class='add'>+ * @pcm: the assigned PCM instance</div><div class='add'>+ * @stream: stream direction</div><div class='add'>+ * @chmap: channel map elements (for query)</div><div class='add'>+ * @max_channels: the max number of channels for the stream</div><div class='add'>+ * @private_value: the value passed to each kcontrol's private_value field</div><div class='add'>+ * @info_ret: store struct snd_pcm_chmap instance if non-NULL</div><div class='add'>+ *</div><div class='add'>+ * Create channel-mapping control elements assigned to the given PCM stream(s).</div><div class='add'>+ * Return: Zero if successful, or a negative error value.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,</div><div class='add'>+			   const struct snd_pcm_chmap_elem *chmap,</div><div class='add'>+			   int max_channels,</div><div class='add'>+			   unsigned long private_value,</div><div class='add'>+			   struct snd_pcm_chmap **info_ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info;</div><div class='add'>+	struct snd_kcontrol_new knew = {</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READ |</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_VOLATILE |</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_READ |</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,</div><div class='add'>+		.info = pcm_chmap_ctl_info,</div><div class='add'>+		.get = pcm_chmap_ctl_get,</div><div class='add'>+		.tlv.c = pcm_chmap_ctl_tlv,</div><div class='add'>+	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = pcm_sanity_check(substream);</div><div class='add'>+	if (WARN_ON(pcm-&gt;streams[stream].chmap_kctl))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info-&gt;pcm = pcm;</div><div class='add'>+	info-&gt;stream = stream;</div><div class='add'>+	info-&gt;chmap = chmap;</div><div class='add'>+	info-&gt;max_channels = max_channels;</div><div class='add'>+	if (stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		knew.name = "Playback Channel Map";</div><div class='add'>+	else</div><div class='add'>+		knew.name = "Capture Channel Map";</div><div class='add'>+	knew.device = pcm-&gt;device;</div><div class='add'>+	knew.count = pcm-&gt;streams[stream].substream_count;</div><div class='add'>+	knew.private_value = private_value;</div><div class='add'>+	info-&gt;kctl = snd_ctl_new1(&amp;knew, info);</div><div class='add'>+	if (!info-&gt;kctl) {</div><div class='add'>+		kfree(info);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;kctl-&gt;private_free = pcm_chmap_ctl_private_free;</div><div class='add'>+	err = snd_ctl_add(pcm-&gt;card, info-&gt;kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-		return -EBADFD;</div><div class='del'>-</div><div class='del'>-	nonblock = !!(substream-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-	if (runtime-&gt;access != SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return snd_pcm_lib_read1(substream, (unsigned long)bufs, frames, nonblock, snd_pcm_lib_readv_transfer);</div><div class='add'>+	pcm-&gt;streams[stream].chmap_kctl = info-&gt;kctl;</div><div class='add'>+	if (info_ret)</div><div class='add'>+		*info_ret = info;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_readv);</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_add_chmap_ctls);</div><div class='head'>diff --git a/sound/core/pcm_local.h b/sound/core/pcm_local.h<br/>new file mode 100644<br/>index 000000000000..ecb21697ae3a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_local.h</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * pcm_local.h - a local header file for snd-pcm module.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_CORE_PCM_LOCAL_H</div><div class='add'>+#define __SOUND_CORE_PCM_LOCAL_H</div><div class='add'>+</div><div class='add'>+extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;</div><div class='add'>+</div><div class='add'>+void snd_interval_mul(const struct snd_interval *a,</div><div class='add'>+		      const struct snd_interval *b, struct snd_interval *c);</div><div class='add'>+void snd_interval_div(const struct snd_interval *a,</div><div class='add'>+		      const struct snd_interval *b, struct snd_interval *c);</div><div class='add'>+void snd_interval_muldivk(const struct snd_interval *a,</div><div class='add'>+			  const struct snd_interval *b,</div><div class='add'>+			  unsigned int k, struct snd_interval *c);</div><div class='add'>+void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,</div><div class='add'>+			  const struct snd_interval *b, struct snd_interval *c);</div><div class='add'>+</div><div class='add'>+int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime,</div><div class='add'>+			       snd_pcm_hw_param_t var, u_int32_t mask);</div><div class='add'>+</div><div class='add'>+int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,</div><div class='add'>+			   snd_pcm_uframes_t appl_ptr);</div><div class='add'>+int snd_pcm_update_state(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_runtime *runtime);</div><div class='add'>+int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+void snd_pcm_playback_silence(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_uframes_t new_hw_ptr);</div><div class='add'>+</div><div class='add'>+static inline snd_pcm_uframes_t</div><div class='add'>+snd_pcm_avail(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		return snd_pcm_playback_avail(substream-&gt;runtime);</div><div class='add'>+	else</div><div class='add'>+		return snd_pcm_capture_avail(substream-&gt;runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline snd_pcm_uframes_t</div><div class='add'>+snd_pcm_hw_avail(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		return snd_pcm_playback_hw_avail(substream-&gt;runtime);</div><div class='add'>+	else</div><div class='add'>+		return snd_pcm_capture_hw_avail(substream-&gt;runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PCM_TIMER</div><div class='add'>+void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream);</div><div class='add'>+void snd_pcm_timer_init(struct snd_pcm_substream *substream);</div><div class='add'>+void snd_pcm_timer_done(struct snd_pcm_substream *substream);</div><div class='add'>+#else</div><div class='add'>+static inline void</div><div class='add'>+snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) {}</div><div class='add'>+static inline void snd_pcm_timer_init(struct snd_pcm_substream *substream) {}</div><div class='add'>+static inline void snd_pcm_timer_done(struct snd_pcm_substream *substream) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void __snd_pcm_xrun(struct snd_pcm_substream *substream);</div><div class='add'>+void snd_pcm_group_init(struct snd_pcm_group *group);</div><div class='add'>+void snd_pcm_sync_stop(struct snd_pcm_substream *substream, bool sync_irq);</div><div class='add'>+</div><div class='add'>+#define PCM_RUNTIME_CHECK(sub) snd_BUG_ON(!(sub) || !(sub)-&gt;runtime)</div><div class='add'>+</div><div class='add'>+/* loop over all PCM substreams */</div><div class='add'>+#define for_each_pcm_substream(pcm, str, subs) \</div><div class='add'>+	for ((str) = 0; (str) &lt; 2; (str)++) \</div><div class='add'>+		for ((subs) = (pcm)-&gt;streams[str].substream; (subs); \</div><div class='add'>+		     (subs) = (subs)-&gt;next)</div><div class='add'>+</div><div class='add'>+static inline void snd_pcm_dma_buffer_sync(struct snd_pcm_substream *substream,</div><div class='add'>+					   enum snd_dma_sync_mode mode)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;runtime-&gt;info &amp; SNDRV_PCM_INFO_EXPLICIT_SYNC)</div><div class='add'>+		snd_dma_buffer_sync(snd_pcm_get_dma_buf(substream), mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif	/* __SOUND_CORE_PCM_LOCAL_H */</div><div class='head'>diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c<br/>index 917e4055ee30..56725d36825b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_memory.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_memory.c</a></div><div class='hunk'>@@ -1,34 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='add'>+#include "pcm_local.h"</div><div class='ctx'> </div><div class='ctx'> static int preallocate_dma = 1;</div><div class='ctx'> module_param(preallocate_dma, int, 0444);</div><div class='hunk'>@@ -40,6 +26,68 @@ MODULE_PARM_DESC(maximum_substreams, "Maximum substreams with preallocated DMA m</div><div class='ctx'> </div><div class='ctx'> static const size_t snd_minimum_buffer = 16384;</div><div class='ctx'> </div><div class='add'>+static unsigned long max_alloc_per_card = 32UL * 1024UL * 1024UL;</div><div class='add'>+module_param(max_alloc_per_card, ulong, 0644);</div><div class='add'>+MODULE_PARM_DESC(max_alloc_per_card, "Max total allocation bytes per card.");</div><div class='add'>+</div><div class='add'>+static void __update_allocated_size(struct snd_card *card, ssize_t bytes)</div><div class='add'>+{</div><div class='add'>+	card-&gt;total_pcm_alloc_bytes += bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_allocated_size(struct snd_card *card, ssize_t bytes)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;card-&gt;memory_mutex);</div><div class='add'>+	__update_allocated_size(card, bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void decrease_allocated_size(struct snd_card *card, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;card-&gt;memory_mutex);</div><div class='add'>+	WARN_ON(card-&gt;total_pcm_alloc_bytes &lt; bytes);</div><div class='add'>+	__update_allocated_size(card, -(ssize_t)bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_alloc_pages(struct snd_card *card, int type, struct device *dev,</div><div class='add'>+			  int str, size_t size, struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* check and reserve the requested size */</div><div class='add'>+	scoped_guard(mutex, &amp;card-&gt;memory_mutex) {</div><div class='add'>+		if (max_alloc_per_card &amp;&amp;</div><div class='add'>+		    card-&gt;total_pcm_alloc_bytes + size &gt; max_alloc_per_card)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		__update_allocated_size(card, size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (str == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		dir = DMA_TO_DEVICE;</div><div class='add'>+	else</div><div class='add'>+		dir = DMA_FROM_DEVICE;</div><div class='add'>+	err = snd_dma_alloc_dir_pages(type, dev, dir, size, dmab);</div><div class='add'>+	if (!err) {</div><div class='add'>+		/* the actual allocation size might be bigger than requested,</div><div class='add'>+		 * and we need to correct the account</div><div class='add'>+		 */</div><div class='add'>+		if (dmab-&gt;bytes != size)</div><div class='add'>+			update_allocated_size(card, dmab-&gt;bytes - size);</div><div class='add'>+	} else {</div><div class='add'>+		/* take back on allocation failure */</div><div class='add'>+		decrease_allocated_size(card, size);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_free_pages(struct snd_card *card, struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	if (!dmab-&gt;area)</div><div class='add'>+		return;</div><div class='add'>+	decrease_allocated_size(card, dmab-&gt;bytes);</div><div class='add'>+	snd_dma_free_pages(dmab);</div><div class='add'>+	dmab-&gt;area = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * try to allocate as the large pages as possible.</div><div class='hunk'>@@ -47,45 +95,29 @@ static const size_t snd_minimum_buffer = 16384;</div><div class='ctx'>  *</div><div class='ctx'>  * the minimum size is snd_minimum_buffer.  it should be power of 2.</div><div class='ctx'>  */</div><div class='del'>-static int preallocate_pcm_pages(struct snd_pcm_substream *substream, size_t size)</div><div class='add'>+static int preallocate_pcm_pages(struct snd_pcm_substream *substream,</div><div class='add'>+				 size_t size, bool no_fallback)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_dma_buffer *dmab = &amp;substream-&gt;dma_buffer;</div><div class='add'>+	struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='add'>+	size_t orig_size = size;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* already reserved? */</div><div class='del'>-	if (snd_dma_get_reserved_buf(dmab, substream-&gt;dma_buf_id) &gt; 0) {</div><div class='del'>-		if (dmab-&gt;bytes &gt;= size)</div><div class='del'>-			return 0; /* yes */</div><div class='del'>-		/* no, free the reserved block */</div><div class='del'>-		snd_dma_free_pages(dmab);</div><div class='del'>-		dmab-&gt;bytes = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	do {</div><div class='del'>-		if ((err = snd_dma_alloc_pages(dmab-&gt;dev.type, dmab-&gt;dev.dev,</div><div class='del'>-					       size, dmab)) &lt; 0) {</div><div class='del'>-			if (err != -ENOMEM)</div><div class='del'>-				return err; /* fatal error */</div><div class='del'>-		} else</div><div class='del'>-			return 0;</div><div class='add'>+		err = do_alloc_pages(card, dmab-&gt;dev.type, dmab-&gt;dev.dev,</div><div class='add'>+				     substream-&gt;stream, size, dmab);</div><div class='add'>+		if (err != -ENOMEM)</div><div class='add'>+			return err;</div><div class='add'>+		if (no_fallback)</div><div class='add'>+			break;</div><div class='ctx'> 		size &gt;&gt;= 1;</div><div class='ctx'> 	} while (size &gt;= snd_minimum_buffer);</div><div class='ctx'> 	dmab-&gt;bytes = 0; /* tell error */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * release the preallocated buffer if not yet done.</div><div class='del'>- */</div><div class='del'>-static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	if (substream-&gt;dma_buffer.area == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (substream-&gt;dma_buf_id)</div><div class='del'>-		snd_dma_reserve_buf(&amp;substream-&gt;dma_buffer, substream-&gt;dma_buf_id);</div><div class='del'>-	else</div><div class='del'>-		snd_dma_free_pages(&amp;substream-&gt;dma_buffer);</div><div class='del'>-	substream-&gt;dma_buffer.area = NULL;</div><div class='add'>+	pr_warn("ALSA pcmC%dD%d%c,%d:%s: cannot preallocate for size %zu\n",</div><div class='add'>+		substream-&gt;pcm-&gt;card-&gt;number, substream-&gt;pcm-&gt;device,</div><div class='add'>+		substream-&gt;stream ? 'c' : 'p', substream-&gt;number,</div><div class='add'>+		substream-&gt;pcm-&gt;name, orig_size);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -93,19 +125,10 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream</div><div class='ctx'>  * @substream: the pcm substream instance</div><div class='ctx'>  *</div><div class='ctx'>  * Releases the pre-allocated buffer of the given substream.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)</div><div class='add'>+void snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	snd_pcm_lib_preallocate_dma_free(substream);</div><div class='del'>-#ifdef CONFIG_SND_VERBOSE_PROCFS</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_prealloc_max_entry);</div><div class='del'>-	substream-&gt;proc_prealloc_max_entry = NULL;</div><div class='del'>-	snd_info_free_entry(substream-&gt;proc_prealloc_entry);</div><div class='del'>-	substream-&gt;proc_prealloc_entry = NULL;</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='add'>+	do_free_pages(substream-&gt;pcm-&gt;card, &amp;substream-&gt;dma_buffer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -113,20 +136,15 @@ int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)</div><div class='ctx'>  * @pcm: the pcm instance</div><div class='ctx'>  *</div><div class='ctx'>  * Releases all the pre-allocated buffers on the given pcm.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)</div><div class='add'>+void snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int stream;</div><div class='ctx'> </div><div class='del'>-	for (stream = 0; stream &lt; 2; stream++)</div><div class='del'>-		for (substream = pcm-&gt;streams[stream].substream; substream; substream = substream-&gt;next)</div><div class='del'>-			snd_pcm_lib_preallocate_free(substream);</div><div class='del'>-	return 0;</div><div class='add'>+	for_each_pcm_substream(pcm, stream, substream)</div><div class='add'>+		snd_pcm_lib_preallocate_free(substream);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_preallocate_free_for_all);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_VERBOSE_PROCFS</div><div class='hunk'>@@ -163,17 +181,22 @@ static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 					       struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream = entry-&gt;private_data;</div><div class='add'>+	struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> 	char line[64], str[64];</div><div class='del'>-	size_t size;</div><div class='add'>+	unsigned long size;</div><div class='ctx'> 	struct snd_dma_buffer new_dmab;</div><div class='ctx'> </div><div class='add'>+	guard(mutex)(&amp;substream-&gt;pcm-&gt;open_mutex);</div><div class='ctx'> 	if (substream-&gt;runtime) {</div><div class='ctx'> 		buffer-&gt;error = -EBUSY;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		snd_info_get_str(str, line, sizeof(str));</div><div class='del'>-		size = simple_strtoul(str, NULL, 10) * 1024;</div><div class='add'>+		buffer-&gt;error = kstrtoul(str, 10, &amp;size);</div><div class='add'>+		if (buffer-&gt;error != 0)</div><div class='add'>+			return;</div><div class='add'>+		size *= 1024;</div><div class='ctx'> 		if ((size != 0 &amp;&amp; size &lt; 8192) || size &gt; substream-&gt;dma_max) {</div><div class='ctx'> 			buffer-&gt;error = -EINVAL;</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -183,10 +206,16 @@ static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 		memset(&amp;new_dmab, 0, sizeof(new_dmab));</div><div class='ctx'> 		new_dmab.dev = substream-&gt;dma_buffer.dev;</div><div class='ctx'> 		if (size &gt; 0) {</div><div class='del'>-			if (snd_dma_alloc_pages(substream-&gt;dma_buffer.dev.type,</div><div class='del'>-						substream-&gt;dma_buffer.dev.dev,</div><div class='del'>-						size, &amp;new_dmab) &lt; 0) {</div><div class='add'>+			if (do_alloc_pages(card,</div><div class='add'>+					   substream-&gt;dma_buffer.dev.type,</div><div class='add'>+					   substream-&gt;dma_buffer.dev.dev,</div><div class='add'>+					   substream-&gt;stream,</div><div class='add'>+					   size, &amp;new_dmab) &lt; 0) {</div><div class='ctx'> 				buffer-&gt;error = -ENOMEM;</div><div class='add'>+				pr_debug("ALSA pcmC%dD%d%c,%d:%s: cannot preallocate for size %lu\n",</div><div class='add'>+					 substream-&gt;pcm-&gt;card-&gt;number, substream-&gt;pcm-&gt;device,</div><div class='add'>+					 substream-&gt;stream ? 'c' : 'p', substream-&gt;number,</div><div class='add'>+					 substream-&gt;pcm-&gt;name, size);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			substream-&gt;buffer_bytes_max = size;</div><div class='hunk'>@@ -194,7 +223,7 @@ static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 			substream-&gt;buffer_bytes_max = UINT_MAX;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (substream-&gt;dma_buffer.area)</div><div class='del'>-			snd_dma_free_pages(&amp;substream-&gt;dma_buffer);</div><div class='add'>+			do_free_pages(card, &amp;substream-&gt;dma_buffer);</div><div class='ctx'> 		substream-&gt;dma_buffer = new_dmab;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		buffer-&gt;error = -EINVAL;</div><div class='hunk'>@@ -205,154 +234,177 @@ static inline void preallocate_info_init(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_card_entry(substream-&gt;pcm-&gt;card, "prealloc", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		entry-&gt;c.text.read = snd_pcm_lib_preallocate_proc_read;</div><div class='add'>+	entry = snd_info_create_card_entry(substream-&gt;pcm-&gt;card, "prealloc",</div><div class='add'>+					   substream-&gt;proc_root);</div><div class='add'>+	if (entry) {</div><div class='add'>+		snd_info_set_text_ops(entry, substream,</div><div class='add'>+				      snd_pcm_lib_preallocate_proc_read);</div><div class='ctx'> 		entry-&gt;c.text.write = snd_pcm_lib_preallocate_proc_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;private_data = substream;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	substream-&gt;proc_prealloc_entry = entry;</div><div class='del'>-	if ((entry = snd_info_create_card_entry(substream-&gt;pcm-&gt;card, "prealloc_max", substream-&gt;proc_root)) != NULL) {</div><div class='del'>-		entry-&gt;c.text.read = snd_pcm_lib_preallocate_max_proc_read;</div><div class='del'>-		entry-&gt;private_data = substream;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='add'>+		entry-&gt;mode |= 0200;</div><div class='ctx'> 	}</div><div class='del'>-	substream-&gt;proc_prealloc_max_entry = entry;</div><div class='add'>+	entry = snd_info_create_card_entry(substream-&gt;pcm-&gt;card, "prealloc_max",</div><div class='add'>+					   substream-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, substream,</div><div class='add'>+				      snd_pcm_lib_preallocate_max_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_SND_VERBOSE_PROCFS */</div><div class='del'>-#define preallocate_info_init(s)</div><div class='add'>+static inline void preallocate_info_init(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> #endif /* CONFIG_SND_VERBOSE_PROCFS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * pre-allocate the buffer and create a proc file for the substream</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream,</div><div class='del'>-					  size_t size, size_t max)</div><div class='add'>+static int preallocate_pages(struct snd_pcm_substream *substream,</div><div class='add'>+			      int type, struct device *data,</div><div class='add'>+			      size_t size, size_t max, bool managed)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(substream-&gt;dma_buffer.dev.type))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	substream-&gt;dma_buffer.dev.type = type;</div><div class='add'>+	substream-&gt;dma_buffer.dev.dev = data;</div><div class='ctx'> </div><div class='del'>-	if (size &gt; 0 &amp;&amp; preallocate_dma &amp;&amp; substream-&gt;number &lt; maximum_substreams)</div><div class='del'>-		preallocate_pcm_pages(substream, size);</div><div class='add'>+	if (size &gt; 0) {</div><div class='add'>+		if (!max) {</div><div class='add'>+			/* no fallback, only also inform -ENOMEM */</div><div class='add'>+			err = preallocate_pcm_pages(substream, size, true);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else if (preallocate_dma &amp;&amp;</div><div class='add'>+			   substream-&gt;number &lt; maximum_substreams) {</div><div class='add'>+			err = preallocate_pcm_pages(substream, size, false);</div><div class='add'>+			if (err &lt; 0 &amp;&amp; err != -ENOMEM)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (substream-&gt;dma_buffer.bytes &gt; 0)</div><div class='ctx'> 		substream-&gt;buffer_bytes_max = substream-&gt;dma_buffer.bytes;</div><div class='ctx'> 	substream-&gt;dma_max = max;</div><div class='del'>-	preallocate_info_init(substream);</div><div class='add'>+	if (max &gt; 0)</div><div class='add'>+		preallocate_info_init(substream);</div><div class='add'>+	if (managed)</div><div class='add'>+		substream-&gt;managed_buffer_alloc = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int preallocate_pages_for_all(struct snd_pcm *pcm, int type,</div><div class='add'>+				      void *data, size_t size, size_t max,</div><div class='add'>+				      bool managed)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	int stream, err;</div><div class='add'>+</div><div class='add'>+	for_each_pcm_substream(pcm, stream, substream) {</div><div class='add'>+		err = preallocate_pages(substream, type, data, size, max, managed);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_lib_preallocate_pages - pre-allocation for the given DMA type</div><div class='ctx'>  * @substream: the pcm substream instance</div><div class='ctx'>  * @type: DMA type (SNDRV_DMA_TYPE_*)</div><div class='del'>- * @data: DMA type dependant data</div><div class='add'>+ * @data: DMA type dependent data</div><div class='ctx'>  * @size: the requested pre-allocation size in bytes</div><div class='ctx'>  * @max: the max. allowed pre-allocation size</div><div class='ctx'>  *</div><div class='ctx'>  * Do pre-allocation for the given DMA buffer type.</div><div class='del'>- *</div><div class='del'>- * When substream-&gt;dma_buf_id is set, the function tries to look for</div><div class='del'>- * the reserved buffer, and the buffer is not freed but reserved at</div><div class='del'>- * destruction time.  The dma_buf_id must be unique for all systems</div><div class='del'>- * (in the same DMA buffer type) e.g. using snd_dma_pci_buf_id().</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,</div><div class='add'>+void snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,</div><div class='ctx'> 				  int type, struct device *data,</div><div class='ctx'> 				  size_t size, size_t max)</div><div class='ctx'> {</div><div class='del'>-	substream-&gt;dma_buffer.dev.type = type;</div><div class='del'>-	substream-&gt;dma_buffer.dev.dev = data;</div><div class='del'>-	return snd_pcm_lib_preallocate_pages1(substream, size, max);</div><div class='add'>+	preallocate_pages(substream, type, data, size, max, false);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continous memory type (all substreams)</div><div class='add'>+ * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continuous memory type (all substreams)</div><div class='ctx'>  * @pcm: the pcm instance</div><div class='ctx'>  * @type: DMA type (SNDRV_DMA_TYPE_*)</div><div class='del'>- * @data: DMA type dependant data</div><div class='add'>+ * @data: DMA type dependent data</div><div class='ctx'>  * @size: the requested pre-allocation size in bytes</div><div class='ctx'>  * @max: the max. allowed pre-allocation size</div><div class='ctx'>  *</div><div class='ctx'>  * Do pre-allocation to all substreams of the given pcm for the</div><div class='ctx'>  * specified DMA type.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm,</div><div class='add'>+void snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm,</div><div class='ctx'> 					  int type, void *data,</div><div class='ctx'> 					  size_t size, size_t max)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	int stream, err;</div><div class='del'>-</div><div class='del'>-	for (stream = 0; stream &lt; 2; stream++)</div><div class='del'>-		for (substream = pcm-&gt;streams[stream].substream; substream; substream = substream-&gt;next)</div><div class='del'>-			if ((err = snd_pcm_lib_preallocate_pages(substream, type, data, size, max)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-	return 0;</div><div class='add'>+	preallocate_pages_for_all(pcm, type, data, size, max, false);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_DMA_SGBUF</div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_sgbuf_ops_page - get the page struct at the given offset</div><div class='add'>+ * snd_pcm_set_managed_buffer - set up buffer management for a substream</div><div class='ctx'>  * @substream: the pcm substream instance</div><div class='del'>- * @offset: the buffer offset</div><div class='add'>+ * @type: DMA type (SNDRV_DMA_TYPE_*)</div><div class='add'>+ * @data: DMA type dependent data</div><div class='add'>+ * @size: the requested pre-allocation size in bytes</div><div class='add'>+ * @max: the max. allowed pre-allocation size</div><div class='add'>+ *</div><div class='add'>+ * Do pre-allocation for the given DMA buffer type, and set the managed</div><div class='add'>+ * buffer allocation mode to the given substream.</div><div class='add'>+ * In this mode, PCM core will allocate a buffer automatically before PCM</div><div class='add'>+ * hw_params ops call, and release the buffer after PCM hw_free ops call</div><div class='add'>+ * as well, so that the driver doesn't need to invoke the allocation and</div><div class='add'>+ * the release explicitly in its callback.</div><div class='add'>+ * When a buffer is actually allocated before the PCM hw_params call, it</div><div class='add'>+ * turns on the runtime buffer_changed flag for drivers changing their h/w</div><div class='add'>+ * parameters accordingly.</div><div class='add'>+ *</div><div class='add'>+ * When @size is non-zero and @max is zero, this tries to allocate for only</div><div class='add'>+ * the exact buffer size without fallback, and may return -ENOMEM.</div><div class='add'>+ * Otherwise, the function tries to allocate smaller chunks if the allocation</div><div class='add'>+ * fails.  This is the behavior of snd_pcm_set_fixed_buffer().</div><div class='ctx'>  *</div><div class='del'>- * Returns the page struct at the given buffer offset.</div><div class='del'>- * Used as the page callback of PCM ops.</div><div class='add'>+ * When both @size and @max are zero, the function only sets up the buffer</div><div class='add'>+ * for later dynamic allocations. It's used typically for buffers with</div><div class='add'>+ * SNDRV_DMA_TYPE_VMALLOC type.</div><div class='add'>+ *</div><div class='add'>+ * Upon successful buffer allocation and setup, the function returns 0.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='ctx'>  */</div><div class='del'>-struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigned long offset)</div><div class='add'>+int snd_pcm_set_managed_buffer(struct snd_pcm_substream *substream, int type,</div><div class='add'>+				struct device *data, size_t size, size_t max)</div><div class='ctx'> {</div><div class='del'>-	struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);</div><div class='del'>-</div><div class='del'>-	unsigned int idx = offset &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (idx &gt;= (unsigned int)sgbuf-&gt;pages)</div><div class='del'>-		return NULL;</div><div class='del'>-	return sgbuf-&gt;page_table[idx];</div><div class='add'>+	return preallocate_pages(substream, type, data, size, max, true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_set_managed_buffer);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_pcm_sgbuf_ops_page);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * compute the max chunk size with continuous pages on sg-buffer</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_set_managed_buffer_all - set up buffer management for all substreams</div><div class='add'>+ *	for all substreams</div><div class='add'>+ * @pcm: the pcm instance</div><div class='add'>+ * @type: DMA type (SNDRV_DMA_TYPE_*)</div><div class='add'>+ * @data: DMA type dependent data</div><div class='add'>+ * @size: the requested pre-allocation size in bytes</div><div class='add'>+ * @max: the max. allowed pre-allocation size</div><div class='add'>+ *</div><div class='add'>+ * Do pre-allocation to all substreams of the given pcm for the specified DMA</div><div class='add'>+ * type and size, and set the managed_buffer_alloc flag to each substream.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='ctx'>  */</div><div class='del'>-unsigned int snd_pcm_sgbuf_get_chunk_size(struct snd_pcm_substream *substream,</div><div class='del'>-					  unsigned int ofs, unsigned int size)</div><div class='add'>+int snd_pcm_set_managed_buffer_all(struct snd_pcm *pcm, int type,</div><div class='add'>+				   struct device *data,</div><div class='add'>+				   size_t size, size_t max)</div><div class='ctx'> {</div><div class='del'>-	struct snd_sg_buf *sg = snd_pcm_substream_sgbuf(substream);</div><div class='del'>-	unsigned int start, end, pg;</div><div class='del'>-</div><div class='del'>-	start = ofs &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	end = (ofs + size - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	/* check page continuity */</div><div class='del'>-	pg = sg-&gt;table[start].addr &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	for (;;) {</div><div class='del'>-		start++;</div><div class='del'>-		if (start &gt; end)</div><div class='del'>-			break;</div><div class='del'>-		pg++;</div><div class='del'>-		if ((sg-&gt;table[start].addr &gt;&gt; PAGE_SHIFT) != pg)</div><div class='del'>-			return (start &lt;&lt; PAGE_SHIFT) - ofs;</div><div class='del'>-	}</div><div class='del'>-	/* ok, all on continuous pages */</div><div class='del'>-	return size;</div><div class='add'>+	return preallocate_pages_for_all(pcm, type, data, size, max, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_sgbuf_get_chunk_size);</div><div class='del'>-#endif /* CONFIG_SND_DMA_SGBUF */</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_set_managed_buffer_all);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_lib_malloc_pages - allocate the DMA buffer</div><div class='hunk'>@@ -362,11 +414,12 @@ EXPORT_SYMBOL(snd_pcm_sgbuf_get_chunk_size);</div><div class='ctx'>  * Allocates the DMA buffer on the BUS type given earlier to</div><div class='ctx'>  * snd_pcm_lib_preallocate_xxx_pages().</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the buffer is changed, 0 if not changed, or a negative</div><div class='add'>+ * Return: 1 if the buffer is changed, 0 if not changed, or a negative</div><div class='ctx'>  * code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	struct snd_dma_buffer *dmab = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -376,6 +429,7 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> 		       SNDRV_DMA_TYPE_UNKNOWN))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='add'>+	card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	if (runtime-&gt;dma_buffer_p) {</div><div class='ctx'> 		/* perphaps, we might free the large DMA memory region</div><div class='hunk'>@@ -391,14 +445,23 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> 	    substream-&gt;dma_buffer.bytes &gt;= size) {</div><div class='ctx'> 		dmab = &amp;substream-&gt;dma_buffer; /* use the pre-allocated buffer */</div><div class='ctx'> 	} else {</div><div class='add'>+		/* dma_max=0 means the fixed size preallocation */</div><div class='add'>+		if (substream-&gt;dma_buffer.area &amp;&amp; !substream-&gt;dma_max)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		dmab = kzalloc(sizeof(*dmab), GFP_KERNEL);</div><div class='ctx'> 		if (! dmab)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		dmab-&gt;dev = substream-&gt;dma_buffer.dev;</div><div class='del'>-		if (snd_dma_alloc_pages(substream-&gt;dma_buffer.dev.type,</div><div class='del'>-					substream-&gt;dma_buffer.dev.dev,</div><div class='del'>-					size, dmab) &lt; 0) {</div><div class='add'>+		if (do_alloc_pages(card,</div><div class='add'>+				   substream-&gt;dma_buffer.dev.type,</div><div class='add'>+				   substream-&gt;dma_buffer.dev.dev,</div><div class='add'>+				   substream-&gt;stream,</div><div class='add'>+				   size, dmab) &lt; 0) {</div><div class='ctx'> 			kfree(dmab);</div><div class='add'>+			pr_debug("ALSA pcmC%dD%d%c,%d:%s: cannot allocate for size %zu\n",</div><div class='add'>+				 substream-&gt;pcm-&gt;card-&gt;number, substream-&gt;pcm-&gt;device,</div><div class='add'>+				 substream-&gt;stream ? 'c' : 'p', substream-&gt;number,</div><div class='add'>+				 substream-&gt;pcm-&gt;name, size);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -406,7 +469,6 @@ int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)</div><div class='ctx'> 	runtime-&gt;dma_bytes = size;</div><div class='ctx'> 	return 1;			/* area was changed */</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_malloc_pages);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -415,7 +477,7 @@ EXPORT_SYMBOL(snd_pcm_lib_malloc_pages);</div><div class='ctx'>  *</div><div class='ctx'>  * Releases the DMA buffer allocated via snd_pcm_lib_malloc_pages().</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -427,66 +489,13 @@ int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (runtime-&gt;dma_area == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (runtime-&gt;dma_buffer_p != &amp;substream-&gt;dma_buffer) {</div><div class='add'>+		struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='add'>+</div><div class='ctx'> 		/* it's a newly allocated buffer.  release it now. */</div><div class='del'>-		snd_dma_free_pages(runtime-&gt;dma_buffer_p);</div><div class='add'>+		do_free_pages(card, runtime-&gt;dma_buffer_p);</div><div class='ctx'> 		kfree(runtime-&gt;dma_buffer_p);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_free_pages);</div><div class='del'>-</div><div class='del'>-int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,</div><div class='del'>-				      size_t size, gfp_t gfp_flags)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	if (PCM_RUNTIME_CHECK(substream))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;dma_area) {</div><div class='del'>-		if (runtime-&gt;dma_bytes &gt;= size)</div><div class='del'>-			return 0; /* already large enough */</div><div class='del'>-		vfree(runtime-&gt;dma_area);</div><div class='del'>-	}</div><div class='del'>-	runtime-&gt;dma_area = __vmalloc(size, gfp_flags, PAGE_KERNEL);</div><div class='del'>-	if (!runtime-&gt;dma_area)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	runtime-&gt;dma_bytes = size;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(_snd_pcm_lib_alloc_vmalloc_buffer);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_pcm_lib_free_vmalloc_buffer - free vmalloc buffer</div><div class='del'>- * @substream: the substream with a buffer allocated by</div><div class='del'>- *	snd_pcm_lib_alloc_vmalloc_buffer()</div><div class='del'>- */</div><div class='del'>-int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	if (PCM_RUNTIME_CHECK(substream))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	vfree(runtime-&gt;dma_area);</div><div class='del'>-	runtime-&gt;dma_area = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_free_vmalloc_buffer);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_pcm_lib_get_vmalloc_page - map vmalloc buffer offset to page struct</div><div class='del'>- * @substream: the substream with a buffer allocated by</div><div class='del'>- *	snd_pcm_lib_alloc_vmalloc_buffer()</div><div class='del'>- * @offset: offset in the buffer</div><div class='del'>- *</div><div class='del'>- * This function is to be used as the page callback in the PCM ops.</div><div class='del'>- */</div><div class='del'>-struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,</div><div class='del'>-					  unsigned long offset)</div><div class='del'>-{</div><div class='del'>-	return vmalloc_to_page(substream-&gt;runtime-&gt;dma_area + offset);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_get_vmalloc_page);</div><div class='head'>diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c<br/>index 434af3c56d52..71eec32a7a0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_misc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_misc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_misc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_misc.c</a></div><div class='hunk'>@@ -20,8 +20,12 @@</div><div class='ctx'>  */</div><div class='ctx'>   </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pcm_local.h"</div><div class='add'>+</div><div class='ctx'> #define SND_PCM_FORMAT_UNKNOWN (-1)</div><div class='ctx'> </div><div class='ctx'> /* NOTE: "signed" prefix must be given below since the default char is</div><div class='hunk'>@@ -35,7 +39,15 @@ struct pcm_format_data {</div><div class='ctx'> 	unsigned char silence[8];	/* silence data to fill */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {</div><div class='add'>+/* we do lots of calculations on snd_pcm_format_t; shut up sparse */</div><div class='add'>+#define INT	__force int</div><div class='add'>+</div><div class='add'>+static bool valid_format(snd_pcm_format_t format)</div><div class='add'>+{</div><div class='add'>+	return (INT)format &gt;= 0 &amp;&amp; (INT)format &lt;= (INT)SNDRV_PCM_FORMAT_LAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = {</div><div class='ctx'> 	[SNDRV_PCM_FORMAT_S8] = {</div><div class='ctx'> 		.width = 8, .phys = 8, .le = -1, .signd = 1,</div><div class='ctx'> 		.silence = {},</div><div class='hunk'>@@ -136,13 +148,50 @@ static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {</div><div class='ctx'> 		.width = 5, .phys = 5, .le = -1, .signd = -1,</div><div class='ctx'> 		.silence = {},</div><div class='ctx'> 	},</div><div class='del'>-	/* FIXME: the following three formats are not defined properly yet */</div><div class='add'>+	[SNDRV_PCM_FORMAT_DSD_U8] = {</div><div class='add'>+		.width = 8, .phys = 8, .le = 1, .signd = 0,</div><div class='add'>+		.silence = { 0x69 },</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_DSD_U16_LE] = {</div><div class='add'>+		.width = 16, .phys = 16, .le = 1, .signd = 0,</div><div class='add'>+		.silence = { 0x69, 0x69 },</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_DSD_U32_LE] = {</div><div class='add'>+		.width = 32, .phys = 32, .le = 1, .signd = 0,</div><div class='add'>+		.silence = { 0x69, 0x69, 0x69, 0x69 },</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_DSD_U16_BE] = {</div><div class='add'>+		.width = 16, .phys = 16, .le = 0, .signd = 0,</div><div class='add'>+		.silence = { 0x69, 0x69 },</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_DSD_U32_BE] = {</div><div class='add'>+		.width = 32, .phys = 32, .le = 0, .signd = 0,</div><div class='add'>+		.silence = { 0x69, 0x69, 0x69, 0x69 },</div><div class='add'>+	},</div><div class='add'>+	/* FIXME: the following two formats are not defined properly yet */</div><div class='ctx'> 	[SNDRV_PCM_FORMAT_MPEG] = {</div><div class='ctx'> 		.le = -1, .signd = -1,</div><div class='ctx'> 	},</div><div class='ctx'> 	[SNDRV_PCM_FORMAT_GSM] = {</div><div class='ctx'> 		.le = -1, .signd = -1,</div><div class='ctx'> 	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_S20_LE] = {</div><div class='add'>+		.width = 20, .phys = 32, .le = 1, .signd = 1,</div><div class='add'>+		.silence = {},</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_S20_BE] = {</div><div class='add'>+		.width = 20, .phys = 32, .le = 0, .signd = 1,</div><div class='add'>+		.silence = {},</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_U20_LE] = {</div><div class='add'>+		.width = 20, .phys = 32, .le = 1, .signd = 0,</div><div class='add'>+		.silence = { 0x00, 0x00, 0x08, 0x00 },</div><div class='add'>+	},</div><div class='add'>+	[SNDRV_PCM_FORMAT_U20_BE] = {</div><div class='add'>+		.width = 20, .phys = 32, .le = 0, .signd = 0,</div><div class='add'>+		.silence = { 0x00, 0x08, 0x00, 0x00 },</div><div class='add'>+	},</div><div class='add'>+	/* FIXME: the following format is not defined properly yet */</div><div class='ctx'> 	[SNDRV_PCM_FORMAT_SPECIAL] = {</div><div class='ctx'> 		.le = -1, .signd = -1,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -209,26 +258,26 @@ static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {</div><div class='ctx'>  * snd_pcm_format_signed - Check the PCM format is signed linear</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the given PCM format is signed linear, 0 if unsigned</div><div class='add'>+ * Return: 1 if the given PCM format is signed linear, 0 if unsigned</div><div class='ctx'>  * linear, and a negative error code for non-linear formats.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_signed(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((val = pcm_formats[format].signd) &lt; 0)</div><div class='add'>+	val = pcm_formats[(INT)format].signd;</div><div class='add'>+	if (val &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_signed);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_unsigned - Check the PCM format is unsigned linear</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the given PCM format is unsigned linear, 0 if signed</div><div class='add'>+ * Return: 1 if the given PCM format is unsigned linear, 0 if signed</div><div class='ctx'>  * linear, and a negative error code for non-linear formats.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_unsigned(snd_pcm_format_t format)</div><div class='hunk'>@@ -240,46 +289,44 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format)</div><div class='ctx'> 		return val;</div><div class='ctx'> 	return !val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_unsigned);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_linear - Check the PCM format is linear</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the given PCM format is linear, 0 if not.</div><div class='add'>+ * Return: 1 if the given PCM format is linear, 0 if not.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_linear(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_pcm_format_signed(format) &gt;= 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_linear);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_little_endian - Check the PCM format is little-endian</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the given PCM format is little-endian, 0 if</div><div class='add'>+ * Return: 1 if the given PCM format is little-endian, 0 if</div><div class='ctx'>  * big-endian, or a negative error code if endian not specified.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_little_endian(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((val = pcm_formats[format].le) &lt; 0)</div><div class='add'>+	val = pcm_formats[(INT)format].le;</div><div class='add'>+	if (val &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_little_endian);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_big_endian - Check the PCM format is big-endian</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the given PCM format is big-endian, 0 if</div><div class='add'>+ * Return: 1 if the given PCM format is big-endian, 0 if</div><div class='ctx'>  * little-endian, or a negative error code if endian not specified.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_big_endian(snd_pcm_format_t format)</div><div class='hunk'>@@ -291,45 +338,44 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format)</div><div class='ctx'> 		return val;</div><div class='ctx'> 	return !val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_big_endian);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_width - return the bit-width of the format</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns the bit-width of the format, or a negative error code</div><div class='add'>+ * Return: The bit-width of the format, or a negative error code</div><div class='ctx'>  * if unknown format.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_width(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((val = pcm_formats[format].width) == 0)</div><div class='add'>+	val = pcm_formats[(INT)format].width;</div><div class='add'>+	if (!val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_width);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_physical_width - return the physical bit-width of the format</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns the physical bit-width of the format, or a negative error code</div><div class='add'>+ * Return: The physical bit-width of the format, or a negative error code</div><div class='ctx'>  * if unknown format.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_physical_width(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if ((val = pcm_formats[format].phys) == 0)</div><div class='add'>+	val = pcm_formats[(INT)format].phys;</div><div class='add'>+	if (!val)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_physical_width);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -337,7 +383,7 @@ EXPORT_SYMBOL(snd_pcm_format_physical_width);</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  * @samples: sampling rate</div><div class='ctx'>  *</div><div class='del'>- * Returns the byte size of the given samples for the format, or a</div><div class='add'>+ * Return: The byte size of the given samples for the format, or a</div><div class='ctx'>  * negative error code if unknown format.</div><div class='ctx'>  */</div><div class='ctx'> ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples)</div><div class='hunk'>@@ -347,24 +393,22 @@ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return samples * phys_width / 8;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_size);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_format_silence_64 - return the silent data in 8 bytes array</div><div class='ctx'>  * @format: the format to check</div><div class='ctx'>  *</div><div class='del'>- * Returns the format pattern to fill or NULL if error.</div><div class='add'>+ * Return: The format pattern to fill or %NULL if error.</div><div class='ctx'>  */</div><div class='ctx'> const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format)</div><div class='ctx'> {</div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (! pcm_formats[format].phys)</div><div class='add'>+	if (! pcm_formats[(INT)format].phys)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	return pcm_formats[format].silence;</div><div class='add'>+	return pcm_formats[(INT)format].silence;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_silence_64);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -375,23 +419,24 @@ EXPORT_SYMBOL(snd_pcm_format_silence_64);</div><div class='ctx'>  *</div><div class='ctx'>  * Sets the silence data on the buffer for the given samples.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int samples)</div><div class='ctx'> {</div><div class='ctx'> 	int width;</div><div class='del'>-	unsigned char *dst, *pat;</div><div class='add'>+	unsigned char *dst;</div><div class='add'>+	const unsigned char *pat;</div><div class='ctx'> </div><div class='del'>-	if (format &lt; 0 || format &gt; SNDRV_PCM_FORMAT_LAST)</div><div class='add'>+	if (!valid_format(format))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (samples == 0)</div><div class='ctx'> 		return 0;</div><div class='del'>-	width = pcm_formats[format].phys; /* physical width */</div><div class='del'>-	pat = pcm_formats[format].silence;</div><div class='del'>-	if (! width)</div><div class='add'>+	width = pcm_formats[(INT)format].phys; /* physical width */</div><div class='add'>+	if (!width)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	pat = pcm_formats[(INT)format].silence;</div><div class='ctx'> 	/* signed or 1 byte data */</div><div class='del'>-	if (pcm_formats[format].signd == 1 || width &lt;= 8) {</div><div class='add'>+	if (pcm_formats[(INT)format].signd == 1 || width &lt;= 8) {</div><div class='ctx'> 		unsigned int bytes = samples * width / 8;</div><div class='ctx'> 		memset(data, *pat, bytes);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -435,43 +480,43 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_format_set_silence);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_pcm_limit_hw_rates - determine rate_min/rate_max fields</div><div class='del'>- * @runtime: the runtime instance</div><div class='add'>+ * snd_pcm_hw_limit_rates - determine rate_min/rate_max fields</div><div class='add'>+ * @hw: the pcm hw instance</div><div class='ctx'>  *</div><div class='ctx'>  * Determines the rate_min and rate_max fields from the rates bits of</div><div class='del'>- * the given runtime-&gt;hw.</div><div class='add'>+ * the given hw.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful.</div><div class='add'>+ * Return: Zero if successful.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)</div><div class='add'>+int snd_pcm_hw_limit_rates(struct snd_pcm_hardware *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='add'>+	unsigned int rmin, rmax;</div><div class='add'>+</div><div class='add'>+	rmin = UINT_MAX;</div><div class='add'>+	rmax = 0;</div><div class='ctx'> 	for (i = 0; i &lt; (int)snd_pcm_known_rates.count; i++) {</div><div class='del'>-		if (runtime-&gt;hw.rates &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			runtime-&gt;hw.rate_min = snd_pcm_known_rates.list[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = (int)snd_pcm_known_rates.count - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (runtime-&gt;hw.rates &amp; (1 &lt;&lt; i)) {</div><div class='del'>-			runtime-&gt;hw.rate_max = snd_pcm_known_rates.list[i];</div><div class='del'>-			break;</div><div class='add'>+		if (hw-&gt;rates &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			rmin = min(rmin, snd_pcm_known_rates.list[i]);</div><div class='add'>+			rmax = max(rmax, snd_pcm_known_rates.list[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (rmin &gt; rmax)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	hw-&gt;rate_min = rmin;</div><div class='add'>+	hw-&gt;rate_max = rmax;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_limit_hw_rates);</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_hw_limit_rates);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit</div><div class='ctx'>  * @rate: the sample rate to convert</div><div class='ctx'>  *</div><div class='del'>- * Returns the SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or</div><div class='add'>+ * Return: The SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or</div><div class='ctx'>  * SNDRV_PCM_RATE_KNOT for an unknown rate.</div><div class='ctx'>  */</div><div class='ctx'> unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)</div><div class='hunk'>@@ -484,3 +529,60 @@ unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)</div><div class='ctx'> 	return SNDRV_PCM_RATE_KNOT;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_rate_to_rate_bit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_rate_bit_to_rate - converts SNDRV_PCM_RATE_xxx bit to sample rate</div><div class='add'>+ * @rate_bit: the rate bit to convert</div><div class='add'>+ *</div><div class='add'>+ * Return: The sample rate that corresponds to the given SNDRV_PCM_RATE_xxx flag</div><div class='add'>+ * or 0 for an unknown rate bit.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; snd_pcm_known_rates.count; i++)</div><div class='add'>+		if ((1u &lt;&lt; i) == rate_bit)</div><div class='add'>+			return snd_pcm_known_rates.list[i];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_pcm_rate_bit_to_rate);</div><div class='add'>+</div><div class='add'>+static unsigned int snd_pcm_rate_mask_sanitize(unsigned int rates)</div><div class='add'>+{</div><div class='add'>+	if (rates &amp; SNDRV_PCM_RATE_CONTINUOUS)</div><div class='add'>+		return SNDRV_PCM_RATE_CONTINUOUS;</div><div class='add'>+	else if (rates &amp; SNDRV_PCM_RATE_KNOT)</div><div class='add'>+		return SNDRV_PCM_RATE_KNOT;</div><div class='add'>+	return rates;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_rate_mask_intersect - computes the intersection between two rate masks</div><div class='add'>+ * @rates_a: The first rate mask</div><div class='add'>+ * @rates_b: The second rate mask</div><div class='add'>+ *</div><div class='add'>+ * This function computes the rates that are supported by both rate masks passed</div><div class='add'>+ * to the function. It will take care of the special handling of</div><div class='add'>+ * SNDRV_PCM_RATE_CONTINUOUS and SNDRV_PCM_RATE_KNOT.</div><div class='add'>+ *</div><div class='add'>+ * Return: A rate mask containing the rates that are supported by both rates_a</div><div class='add'>+ * and rates_b.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,</div><div class='add'>+	unsigned int rates_b)</div><div class='add'>+{</div><div class='add'>+	rates_a = snd_pcm_rate_mask_sanitize(rates_a);</div><div class='add'>+	rates_b = snd_pcm_rate_mask_sanitize(rates_b);</div><div class='add'>+</div><div class='add'>+	if (rates_a &amp; SNDRV_PCM_RATE_CONTINUOUS)</div><div class='add'>+		return rates_b;</div><div class='add'>+	else if (rates_b &amp; SNDRV_PCM_RATE_CONTINUOUS)</div><div class='add'>+		return rates_a;</div><div class='add'>+	else if (rates_a &amp; SNDRV_PCM_RATE_KNOT)</div><div class='add'>+		return rates_b;</div><div class='add'>+	else if (rates_b &amp; SNDRV_PCM_RATE_KNOT)</div><div class='add'>+		return rates_a;</div><div class='add'>+	return rates_a &amp; rates_b;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_rate_mask_intersect);</div><div class='head'>diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c<br/>index 8bc7cb3db330..68bee40c9ada 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_native.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_native.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_native.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_native.c</a></div><div class='hunk'>@@ -1,32 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/file.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/pm_qos_params.h&gt;</div><div class='del'>-#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/pm_qos.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -34,9 +22,20 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/timer.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#if defined(CONFIG_MIPS) &amp;&amp; defined(CONFIG_DMA_NONCOHERENT)</div><div class='del'>-#include &lt;dma-coherence.h&gt;</div><div class='add'>+#include &lt;linux/uio.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include "pcm_local.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "pcm_param_trace.h"</div><div class='add'>+#else</div><div class='add'>+#define trace_hw_mask_param_enabled()		0</div><div class='add'>+#define trace_hw_interval_param_enabled()	0</div><div class='add'>+#define trace_hw_mask_param(substream, type, index, prev, curr)</div><div class='add'>+#define trace_hw_interval_param(substream, type, index, prev, curr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -74,28 +73,153 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream);</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-DEFINE_RWLOCK(snd_pcm_link_rwlock);</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_link_rwlock);</div><div class='del'>-</div><div class='ctx'> static DECLARE_RWSEM(snd_pcm_link_rwsem);</div><div class='ctx'> </div><div class='del'>-static inline mm_segment_t snd_enter_user(void)</div><div class='add'>+void snd_pcm_group_init(struct snd_pcm_group *group)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;group-&gt;lock);</div><div class='add'>+	mutex_init(&amp;group-&gt;mutex);</div><div class='add'>+	INIT_LIST_HEAD(&amp;group-&gt;substreams);</div><div class='add'>+	refcount_set(&amp;group-&gt;refs, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* define group lock helpers */</div><div class='add'>+#define DEFINE_PCM_GROUP_LOCK(action, bh_lock, bh_unlock, mutex_action) \</div><div class='add'>+static void snd_pcm_group_ ## action(struct snd_pcm_group *group, bool nonatomic) \</div><div class='add'>+{ \</div><div class='add'>+	if (nonatomic) { \</div><div class='add'>+		mutex_ ## mutex_action(&amp;group-&gt;mutex); \</div><div class='add'>+	} else { \</div><div class='add'>+		if (IS_ENABLED(CONFIG_PREEMPT_RT) &amp;&amp; bh_lock)   \</div><div class='add'>+			local_bh_disable();			\</div><div class='add'>+		spin_ ## action(&amp;group-&gt;lock);			\</div><div class='add'>+		if (IS_ENABLED(CONFIG_PREEMPT_RT) &amp;&amp; bh_unlock) \</div><div class='add'>+			local_bh_enable();                      \</div><div class='add'>+	}							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_PCM_GROUP_LOCK(lock, false, false, lock);</div><div class='add'>+DEFINE_PCM_GROUP_LOCK(unlock, false, false, unlock);</div><div class='add'>+DEFINE_PCM_GROUP_LOCK(lock_irq, true, false, lock);</div><div class='add'>+DEFINE_PCM_GROUP_LOCK(unlock_irq, false, true, unlock);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stream_lock - Lock the PCM stream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This locks the PCM stream's spinlock or mutex depending on the nonatomic</div><div class='add'>+ * flag of the given substream.  This also takes the global link rw lock</div><div class='add'>+ * (or rw sem), too, for avoiding the race with linked streams.</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_stream_lock(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	return fs;</div><div class='add'>+	snd_pcm_group_lock(&amp;substream-&gt;self_group, substream-&gt;pcm-&gt;nonatomic);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stream_lock);</div><div class='ctx'> </div><div class='del'>-static inline void snd_leave_user(mm_segment_t fs)</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stream_unlock - Unlock the PCM stream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This unlocks the PCM stream that has been locked via snd_pcm_stream_lock().</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_stream_unlock(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	set_fs(fs);</div><div class='add'>+	snd_pcm_group_unlock(&amp;substream-&gt;self_group, substream-&gt;pcm-&gt;nonatomic);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stream_lock_irq - Lock the PCM stream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This locks the PCM stream like snd_pcm_stream_lock() and disables the local</div><div class='add'>+ * IRQ (only when nonatomic is false).  In nonatomic case, this is identical</div><div class='add'>+ * as snd_pcm_stream_lock().</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_group_lock_irq(&amp;substream-&gt;self_group,</div><div class='add'>+			       substream-&gt;pcm-&gt;nonatomic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);</div><div class='add'>+</div><div class='add'>+static void snd_pcm_stream_lock_nested(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_group *group = &amp;substream-&gt;self_group;</div><div class='ctx'> </div><div class='add'>+	if (substream-&gt;pcm-&gt;nonatomic)</div><div class='add'>+		mutex_lock_nested(&amp;group-&gt;mutex, SINGLE_DEPTH_NESTING);</div><div class='add'>+	else</div><div class='add'>+		spin_lock_nested(&amp;group-&gt;lock, SINGLE_DEPTH_NESTING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stream_unlock_irq - Unlock the PCM stream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * This is a counter-part of snd_pcm_stream_lock_irq().</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_group_unlock_irq(&amp;substream-&gt;self_group,</div><div class='add'>+				 substream-&gt;pcm-&gt;nonatomic);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);</div><div class='add'>+</div><div class='add'>+unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	if (substream-&gt;pcm-&gt;nonatomic)</div><div class='add'>+		mutex_lock(&amp;substream-&gt;self_group.mutex);</div><div class='add'>+	else</div><div class='add'>+		spin_lock_irqsave(&amp;substream-&gt;self_group.lock, flags);</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave);</div><div class='add'>+</div><div class='add'>+unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	if (substream-&gt;pcm-&gt;nonatomic)</div><div class='add'>+		mutex_lock_nested(&amp;substream-&gt;self_group.mutex,</div><div class='add'>+				  SINGLE_DEPTH_NESTING);</div><div class='add'>+	else</div><div class='add'>+		spin_lock_irqsave_nested(&amp;substream-&gt;self_group.lock, flags,</div><div class='add'>+					 SINGLE_DEPTH_NESTING);</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave_nested);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @flags: irq flags</div><div class='add'>+ *</div><div class='add'>+ * This is a counter-part of snd_pcm_stream_lock_irqsave().</div><div class='add'>+ */</div><div class='add'>+void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,</div><div class='add'>+				      unsigned long flags)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;pcm-&gt;nonatomic)</div><div class='add'>+		mutex_unlock(&amp;substream-&gt;self_group.mutex);</div><div class='add'>+	else</div><div class='add'>+		spin_unlock_irqrestore(&amp;substream-&gt;self_group.lock, flags);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);</div><div class='add'>+</div><div class='add'>+/* Run PCM ioctl ops */</div><div class='add'>+static int snd_pcm_ops_ioctl(struct snd_pcm_substream *substream,</div><div class='add'>+			     unsigned cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;ops-&gt;ioctl)</div><div class='add'>+		return substream-&gt;ops-&gt;ioctl(substream, cmd, arg);</div><div class='add'>+	else</div><div class='add'>+		return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	struct snd_pcm *pcm = substream-&gt;pcm;</div><div class='ctx'> 	struct snd_pcm_str *pstr = substream-&gt;pstr;</div><div class='ctx'> </div><div class='hunk'>@@ -104,26 +228,21 @@ int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)</div><div class='ctx'> 	info-&gt;device = pcm-&gt;device;</div><div class='ctx'> 	info-&gt;stream = substream-&gt;stream;</div><div class='ctx'> 	info-&gt;subdevice = substream-&gt;number;</div><div class='del'>-	strlcpy(info-&gt;id, pcm-&gt;id, sizeof(info-&gt;id));</div><div class='del'>-	strlcpy(info-&gt;name, pcm-&gt;name, sizeof(info-&gt;name));</div><div class='add'>+	strscpy(info-&gt;id, pcm-&gt;id, sizeof(info-&gt;id));</div><div class='add'>+	strscpy(info-&gt;name, pcm-&gt;name, sizeof(info-&gt;name));</div><div class='ctx'> 	info-&gt;dev_class = pcm-&gt;dev_class;</div><div class='ctx'> 	info-&gt;dev_subclass = pcm-&gt;dev_subclass;</div><div class='ctx'> 	info-&gt;subdevices_count = pstr-&gt;substream_count;</div><div class='ctx'> 	info-&gt;subdevices_avail = pstr-&gt;substream_count - pstr-&gt;substream_opened;</div><div class='del'>-	strlcpy(info-&gt;subname, substream-&gt;name, sizeof(info-&gt;subname));</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	/* AB: FIXME!!! This is definitely nonsense */</div><div class='del'>-	if (runtime) {</div><div class='del'>-		info-&gt;sync = runtime-&gt;sync;</div><div class='del'>-		substream-&gt;ops-&gt;ioctl(substream, SNDRV_PCM_IOCTL1_INFO, info);</div><div class='del'>-	}</div><div class='add'>+	strscpy(info-&gt;subname, substream-&gt;name, sizeof(info-&gt;subname));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_info_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		      struct snd_pcm_info __user * _info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_info *info;</div><div class='add'>+	struct snd_pcm_info *info __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='hunk'>@@ -134,210 +253,337 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		if (copy_to_user(_info, info, sizeof(*info)))</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 	}</div><div class='del'>-	kfree(info);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#undef RULES_DEBUG</div><div class='del'>-</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-#define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v</div><div class='del'>-static const char * const snd_pcm_hw_param_names[] = {</div><div class='del'>-	HW_PARAM(ACCESS),</div><div class='del'>-	HW_PARAM(FORMAT),</div><div class='del'>-	HW_PARAM(SUBFORMAT),</div><div class='del'>-	HW_PARAM(SAMPLE_BITS),</div><div class='del'>-	HW_PARAM(FRAME_BITS),</div><div class='del'>-	HW_PARAM(CHANNELS),</div><div class='del'>-	HW_PARAM(RATE),</div><div class='del'>-	HW_PARAM(PERIOD_TIME),</div><div class='del'>-	HW_PARAM(PERIOD_SIZE),</div><div class='del'>-	HW_PARAM(PERIOD_BYTES),</div><div class='del'>-	HW_PARAM(PERIODS),</div><div class='del'>-	HW_PARAM(BUFFER_TIME),</div><div class='del'>-	HW_PARAM(BUFFER_SIZE),</div><div class='del'>-	HW_PARAM(BUFFER_BYTES),</div><div class='del'>-	HW_PARAM(TICK_TIME),</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='add'>+/* macro for simplified cast */</div><div class='add'>+#define PARAM_MASK_BIT(b)	(1U &lt;&lt; (__force int)(b))</div><div class='ctx'> </div><div class='del'>-int snd_pcm_hw_refine(struct snd_pcm_substream *substream, </div><div class='del'>-		      struct snd_pcm_hw_params *params)</div><div class='add'>+static bool hw_support_mmap(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned int k;</div><div class='del'>-	struct snd_pcm_hardware *hw;</div><div class='del'>-	struct snd_interval *i = NULL;</div><div class='del'>-	struct snd_mask *m = NULL;</div><div class='del'>-	struct snd_pcm_hw_constraints *constrs = &amp;substream-&gt;runtime-&gt;hw_constraints;</div><div class='del'>-	unsigned int rstamps[constrs-&gt;rules_num];</div><div class='del'>-	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];</div><div class='del'>-	unsigned int stamp = 2;</div><div class='del'>-	int changed, again;</div><div class='add'>+	struct snd_dma_buffer *dmabuf;</div><div class='ctx'> </div><div class='del'>-	params-&gt;info = 0;</div><div class='del'>-	params-&gt;fifo_size = 0;</div><div class='del'>-	if (params-&gt;rmask &amp; (1 &lt;&lt; SNDRV_PCM_HW_PARAM_SAMPLE_BITS))</div><div class='del'>-		params-&gt;msbits = 0;</div><div class='del'>-	if (params-&gt;rmask &amp; (1 &lt;&lt; SNDRV_PCM_HW_PARAM_RATE)) {</div><div class='del'>-		params-&gt;rate_num = 0;</div><div class='del'>-		params-&gt;rate_den = 0;</div><div class='add'>+	if (!(substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_MMAP))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;ops-&gt;mmap || substream-&gt;ops-&gt;page)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	dmabuf = snd_pcm_get_dma_buf(substream);</div><div class='add'>+	if (!dmabuf)</div><div class='add'>+		dmabuf = &amp;substream-&gt;dma_buffer;</div><div class='add'>+	switch (dmabuf-&gt;dev.type) {</div><div class='add'>+	case SNDRV_DMA_TYPE_UNKNOWN:</div><div class='add'>+		/* we can't know the device, so just assume that the driver does</div><div class='add'>+		 * everything right</div><div class='add'>+		 */</div><div class='add'>+		return true;</div><div class='add'>+	case SNDRV_DMA_TYPE_CONTINUOUS:</div><div class='add'>+	case SNDRV_DMA_TYPE_VMALLOC:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return dma_can_mmap(dmabuf-&gt;dev.dev);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int constrain_mask_params(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hw_constraints *constrs =</div><div class='add'>+					&amp;substream-&gt;runtime-&gt;hw_constraints;</div><div class='add'>+	struct snd_mask *m;</div><div class='add'>+	unsigned int k;</div><div class='add'>+	struct snd_mask old_mask __maybe_unused;</div><div class='add'>+	int changed;</div><div class='ctx'> </div><div class='ctx'> 	for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k &lt;= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) {</div><div class='ctx'> 		m = hw_param_mask(params, k);</div><div class='ctx'> 		if (snd_mask_empty(m))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (!(params-&gt;rmask &amp; (1 &lt;&lt; k)))</div><div class='add'>+</div><div class='add'>+		/* This parameter is not requested to change by a caller. */</div><div class='add'>+		if (!(params-&gt;rmask &amp; PARAM_MASK_BIT(k)))</div><div class='ctx'> 			continue;</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);</div><div class='del'>-		printk("%04x%04x%04x%04x -&gt; ", m-&gt;bits[3], m-&gt;bits[2], m-&gt;bits[1], m-&gt;bits[0]);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+		if (trace_hw_mask_param_enabled())</div><div class='add'>+			old_mask = *m;</div><div class='add'>+</div><div class='ctx'> 		changed = snd_mask_refine(m, constrs_mask(constrs, k));</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-		printk("%04x%04x%04x%04x\n", m-&gt;bits[3], m-&gt;bits[2], m-&gt;bits[1], m-&gt;bits[0]);</div><div class='del'>-#endif</div><div class='del'>-		if (changed)</div><div class='del'>-			params-&gt;cmask |= 1 &lt;&lt; k;</div><div class='ctx'> 		if (changed &lt; 0)</div><div class='ctx'> 			return changed;</div><div class='add'>+		if (changed == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Set corresponding flag so that the caller gets it. */</div><div class='add'>+		trace_hw_mask_param(substream, k, 0, &amp;old_mask, m);</div><div class='add'>+		params-&gt;cmask |= PARAM_MASK_BIT(k);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int constrain_interval_params(struct snd_pcm_substream *substream,</div><div class='add'>+				     struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hw_constraints *constrs =</div><div class='add'>+					&amp;substream-&gt;runtime-&gt;hw_constraints;</div><div class='add'>+	struct snd_interval *i;</div><div class='add'>+	unsigned int k;</div><div class='add'>+	struct snd_interval old_interval __maybe_unused;</div><div class='add'>+	int changed;</div><div class='add'>+</div><div class='ctx'> 	for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k &lt;= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) {</div><div class='ctx'> 		i = hw_param_interval(params, k);</div><div class='ctx'> 		if (snd_interval_empty(i))</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (!(params-&gt;rmask &amp; (1 &lt;&lt; k)))</div><div class='add'>+</div><div class='add'>+		/* This parameter is not requested to change by a caller. */</div><div class='add'>+		if (!(params-&gt;rmask &amp; PARAM_MASK_BIT(k)))</div><div class='ctx'> 			continue;</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-		printk(KERN_DEBUG "%s = ", snd_pcm_hw_param_names[k]);</div><div class='del'>-		if (i-&gt;empty)</div><div class='del'>-			printk("empty");</div><div class='del'>-		else</div><div class='del'>-			printk("%c%u %u%c", </div><div class='del'>-			       i-&gt;openmin ? '(' : '[', i-&gt;min,</div><div class='del'>-			       i-&gt;max, i-&gt;openmax ? ')' : ']');</div><div class='del'>-		printk(" -&gt; ");</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+		if (trace_hw_interval_param_enabled())</div><div class='add'>+			old_interval = *i;</div><div class='add'>+</div><div class='ctx'> 		changed = snd_interval_refine(i, constrs_interval(constrs, k));</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-		if (i-&gt;empty)</div><div class='del'>-			printk("empty\n");</div><div class='del'>-		else </div><div class='del'>-			printk("%c%u %u%c\n", </div><div class='del'>-			       i-&gt;openmin ? '(' : '[', i-&gt;min,</div><div class='del'>-			       i-&gt;max, i-&gt;openmax ? ')' : ']');</div><div class='del'>-#endif</div><div class='del'>-		if (changed)</div><div class='del'>-			params-&gt;cmask |= 1 &lt;&lt; k;</div><div class='ctx'> 		if (changed &lt; 0)</div><div class='ctx'> 			return changed;</div><div class='add'>+		if (changed == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Set corresponding flag so that the caller gets it. */</div><div class='add'>+		trace_hw_interval_param(substream, k, 0, &amp;old_interval, i);</div><div class='add'>+		params-&gt;cmask |= PARAM_MASK_BIT(k);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (k = 0; k &lt; constrs-&gt;rules_num; k++)</div><div class='del'>-		rstamps[k] = 0;</div><div class='del'>-	for (k = 0; k &lt;= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) </div><div class='del'>-		vstamps[k] = (params-&gt;rmask &amp; (1 &lt;&lt; k)) ? 1 : 0;</div><div class='del'>-	do {</div><div class='del'>-		again = 0;</div><div class='del'>-		for (k = 0; k &lt; constrs-&gt;rules_num; k++) {</div><div class='del'>-			struct snd_pcm_hw_rule *r = &amp;constrs-&gt;rules[k];</div><div class='del'>-			unsigned int d;</div><div class='del'>-			int doit = 0;</div><div class='del'>-			if (r-&gt;cond &amp;&amp; !(r-&gt;cond &amp; params-&gt;flags))</div><div class='del'>-				continue;</div><div class='del'>-			for (d = 0; r-&gt;deps[d] &gt;= 0; d++) {</div><div class='del'>-				if (vstamps[r-&gt;deps[d]] &gt; rstamps[k]) {</div><div class='del'>-					doit = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (!doit)</div><div class='del'>-				continue;</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-			printk(KERN_DEBUG "Rule %d [%p]: ", k, r-&gt;func);</div><div class='del'>-			if (r-&gt;var &gt;= 0) {</div><div class='del'>-				printk("%s = ", snd_pcm_hw_param_names[r-&gt;var]);</div><div class='del'>-				if (hw_is_mask(r-&gt;var)) {</div><div class='del'>-					m = hw_param_mask(params, r-&gt;var);</div><div class='del'>-					printk("%x", *m-&gt;bits);</div><div class='del'>-				} else {</div><div class='del'>-					i = hw_param_interval(params, r-&gt;var);</div><div class='del'>-					if (i-&gt;empty)</div><div class='del'>-						printk("empty");</div><div class='del'>-					else</div><div class='del'>-						printk("%c%u %u%c", </div><div class='del'>-						       i-&gt;openmin ? '(' : '[', i-&gt;min,</div><div class='del'>-						       i-&gt;max, i-&gt;openmax ? ')' : ']');</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-			changed = r-&gt;func(params, r);</div><div class='del'>-#ifdef RULES_DEBUG</div><div class='del'>-			if (r-&gt;var &gt;= 0) {</div><div class='del'>-				printk(" -&gt; ");</div><div class='del'>-				if (hw_is_mask(r-&gt;var))</div><div class='del'>-					printk("%x", *m-&gt;bits);</div><div class='del'>-				else {</div><div class='del'>-					if (i-&gt;empty)</div><div class='del'>-						printk("empty");</div><div class='del'>-					else</div><div class='del'>-						printk("%c%u %u%c", </div><div class='del'>-						       i-&gt;openmin ? '(' : '[', i-&gt;min,</div><div class='del'>-						       i-&gt;max, i-&gt;openmax ? ')' : ']');</div><div class='del'>-				}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int constrain_params_by_rules(struct snd_pcm_substream *substream,</div><div class='add'>+				     struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hw_constraints *constrs =</div><div class='add'>+					&amp;substream-&gt;runtime-&gt;hw_constraints;</div><div class='add'>+	unsigned int k;</div><div class='add'>+	unsigned int *rstamps __free(kfree) = NULL;</div><div class='add'>+	unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];</div><div class='add'>+	unsigned int stamp;</div><div class='add'>+	struct snd_pcm_hw_rule *r;</div><div class='add'>+	unsigned int d;</div><div class='add'>+	struct snd_mask old_mask __maybe_unused;</div><div class='add'>+	struct snd_interval old_interval __maybe_unused;</div><div class='add'>+	bool again;</div><div class='add'>+	int changed, err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each application of rule has own sequence number.</div><div class='add'>+	 *</div><div class='add'>+	 * Each member of 'rstamps' array represents the sequence number of</div><div class='add'>+	 * recent application of corresponding rule.</div><div class='add'>+	 */</div><div class='add'>+	rstamps = kcalloc(constrs-&gt;rules_num, sizeof(unsigned int), GFP_KERNEL);</div><div class='add'>+	if (!rstamps)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Each member of 'vstamps' array represents the sequence number of</div><div class='add'>+	 * recent application of rule in which corresponding parameters were</div><div class='add'>+	 * changed.</div><div class='add'>+	 *</div><div class='add'>+	 * In initial state, elements corresponding to parameters requested by</div><div class='add'>+	 * a caller is 1. For unrequested parameters, corresponding members</div><div class='add'>+	 * have 0 so that the parameters are never changed anymore.</div><div class='add'>+	 */</div><div class='add'>+	for (k = 0; k &lt;= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++)</div><div class='add'>+		vstamps[k] = (params-&gt;rmask &amp; PARAM_MASK_BIT(k)) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Due to the above design, actual sequence number starts at 2. */</div><div class='add'>+	stamp = 2;</div><div class='add'>+retry:</div><div class='add'>+	/* Apply all rules in order. */</div><div class='add'>+	again = false;</div><div class='add'>+	for (k = 0; k &lt; constrs-&gt;rules_num; k++) {</div><div class='add'>+		r = &amp;constrs-&gt;rules[k];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check condition bits of this rule. When the rule has</div><div class='add'>+		 * some condition bits, parameter without the bits is</div><div class='add'>+		 * never processed. SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP</div><div class='add'>+		 * is an example of the condition bits.</div><div class='add'>+		 */</div><div class='add'>+		if (r-&gt;cond &amp;&amp; !(r-&gt;cond &amp; params-&gt;flags))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The 'deps' array includes maximum four dependencies</div><div class='add'>+		 * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fifth</div><div class='add'>+		 * member of this array is a sentinel and should be</div><div class='add'>+		 * negative value.</div><div class='add'>+		 *</div><div class='add'>+		 * This rule should be processed in this time when dependent</div><div class='add'>+		 * parameters were changed at former applications of the other</div><div class='add'>+		 * rules.</div><div class='add'>+		 */</div><div class='add'>+		for (d = 0; r-&gt;deps[d] &gt;= 0; d++) {</div><div class='add'>+			if (vstamps[r-&gt;deps[d]] &gt; rstamps[k])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (r-&gt;deps[d] &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (trace_hw_mask_param_enabled()) {</div><div class='add'>+			if (hw_is_mask(r-&gt;var))</div><div class='add'>+				old_mask = *hw_param_mask(params, r-&gt;var);</div><div class='add'>+		}</div><div class='add'>+		if (trace_hw_interval_param_enabled()) {</div><div class='add'>+			if (hw_is_interval(r-&gt;var))</div><div class='add'>+				old_interval = *hw_param_interval(params, r-&gt;var);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		changed = r-&gt;func(params, r);</div><div class='add'>+		if (changed &lt; 0)</div><div class='add'>+			return changed;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * When the parameter is changed, notify it to the caller</div><div class='add'>+		 * by corresponding returned bit, then preparing for next</div><div class='add'>+		 * iteration.</div><div class='add'>+		 */</div><div class='add'>+		if (changed &amp;&amp; r-&gt;var &gt;= 0) {</div><div class='add'>+			if (hw_is_mask(r-&gt;var)) {</div><div class='add'>+				trace_hw_mask_param(substream, r-&gt;var,</div><div class='add'>+					k + 1, &amp;old_mask,</div><div class='add'>+					hw_param_mask(params, r-&gt;var));</div><div class='ctx'> 			}</div><div class='del'>-			printk("\n");</div><div class='del'>-#endif</div><div class='del'>-			rstamps[k] = stamp;</div><div class='del'>-			if (changed &amp;&amp; r-&gt;var &gt;= 0) {</div><div class='del'>-				params-&gt;cmask |= (1 &lt;&lt; r-&gt;var);</div><div class='del'>-				vstamps[r-&gt;var] = stamp;</div><div class='del'>-				again = 1;</div><div class='add'>+			if (hw_is_interval(r-&gt;var)) {</div><div class='add'>+				trace_hw_interval_param(substream, r-&gt;var,</div><div class='add'>+					k + 1, &amp;old_interval,</div><div class='add'>+					hw_param_interval(params, r-&gt;var));</div><div class='ctx'> 			}</div><div class='del'>-			if (changed &lt; 0)</div><div class='del'>-				return changed;</div><div class='del'>-			stamp++;</div><div class='add'>+</div><div class='add'>+			params-&gt;cmask |= PARAM_MASK_BIT(r-&gt;var);</div><div class='add'>+			vstamps[r-&gt;var] = stamp;</div><div class='add'>+			again = true;</div><div class='ctx'> 		}</div><div class='del'>-	} while (again);</div><div class='add'>+</div><div class='add'>+		rstamps[k] = stamp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Iterate to evaluate all rules till no parameters are changed. */</div><div class='add'>+	if (again)</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fixup_unreferenced_params(struct snd_pcm_substream *substream,</div><div class='add'>+				     struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	const struct snd_interval *i;</div><div class='add'>+	const struct snd_mask *m;</div><div class='add'>+	struct snd_mask *m_rw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!params-&gt;msbits) {</div><div class='del'>-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);</div><div class='add'>+		i = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);</div><div class='ctx'> 		if (snd_interval_single(i))</div><div class='ctx'> 			params-&gt;msbits = snd_interval_value(i);</div><div class='add'>+		m = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+		if (snd_mask_single(m)) {</div><div class='add'>+			snd_pcm_format_t format = (__force snd_pcm_format_t)snd_mask_min(m);</div><div class='add'>+			params-&gt;msbits = snd_pcm_format_width(format);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (params-&gt;msbits) {</div><div class='add'>+		m = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+		if (snd_mask_single(m)) {</div><div class='add'>+			snd_pcm_format_t format = (__force snd_pcm_format_t)snd_mask_min(m);</div><div class='add'>+</div><div class='add'>+			if (snd_pcm_format_linear(format) &amp;&amp;</div><div class='add'>+			    snd_pcm_format_width(format) != params-&gt;msbits) {</div><div class='add'>+				m_rw = hw_param_mask(params, SNDRV_PCM_HW_PARAM_SUBFORMAT);</div><div class='add'>+				snd_mask_reset(m_rw,</div><div class='add'>+					       (__force unsigned)SNDRV_PCM_SUBFORMAT_MSBITS_MAX);</div><div class='add'>+				if (snd_mask_empty(m_rw))</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!params-&gt;rate_den) {</div><div class='del'>-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+		i = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='ctx'> 		if (snd_interval_single(i)) {</div><div class='ctx'> 			params-&gt;rate_num = snd_interval_value(i);</div><div class='ctx'> 			params-&gt;rate_den = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	hw = &amp;substream-&gt;runtime-&gt;hw;</div><div class='del'>-	if (!params-&gt;info)</div><div class='del'>-		params-&gt;info = hw-&gt;info &amp; ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;</div><div class='ctx'> 	if (!params-&gt;fifo_size) {</div><div class='del'>-		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='del'>-		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='del'>-		if (snd_mask_min(m) == snd_mask_max(m) &amp;&amp;</div><div class='del'>-                    snd_interval_min(i) == snd_interval_max(i)) {</div><div class='del'>-			changed = substream-&gt;ops-&gt;ioctl(substream,</div><div class='del'>-					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);</div><div class='del'>-			if (changed &lt; 0)</div><div class='del'>-				return changed;</div><div class='add'>+		m = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+		i = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+		if (snd_mask_single(m) &amp;&amp; snd_interval_single(i)) {</div><div class='add'>+			err = snd_pcm_ops_ioctl(substream,</div><div class='add'>+						SNDRV_PCM_IOCTL1_FIFO_SIZE,</div><div class='add'>+						params);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	params-&gt;rmask = 0;</div><div class='add'>+</div><div class='add'>+	if (!params-&gt;info) {</div><div class='add'>+		params-&gt;info = substream-&gt;runtime-&gt;hw.info;</div><div class='add'>+		params-&gt;info &amp;= ~(SNDRV_PCM_INFO_FIFO_IN_FRAMES |</div><div class='add'>+				  SNDRV_PCM_INFO_DRAIN_TRIGGER);</div><div class='add'>+		if (!hw_support_mmap(substream))</div><div class='add'>+			params-&gt;info &amp;= ~(SNDRV_PCM_INFO_MMAP |</div><div class='add'>+					  SNDRV_PCM_INFO_MMAP_VALID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_ops_ioctl(substream,</div><div class='add'>+				SNDRV_PCM_IOCTL1_SYNC_ID,</div><div class='add'>+				params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_pcm_hw_refine(struct snd_pcm_substream *substream,</div><div class='add'>+		      struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	params-&gt;info = 0;</div><div class='add'>+	params-&gt;fifo_size = 0;</div><div class='add'>+	if (params-&gt;rmask &amp; PARAM_MASK_BIT(SNDRV_PCM_HW_PARAM_SAMPLE_BITS))</div><div class='add'>+		params-&gt;msbits = 0;</div><div class='add'>+	if (params-&gt;rmask &amp; PARAM_MASK_BIT(SNDRV_PCM_HW_PARAM_RATE)) {</div><div class='add'>+		params-&gt;rate_num = 0;</div><div class='add'>+		params-&gt;rate_den = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = constrain_mask_params(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = constrain_interval_params(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = constrain_params_by_rules(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	params-&gt;rmask = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_hw_refine);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_refine_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 				  struct snd_pcm_hw_params __user * _params)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *params;</div><div class='add'>+	struct snd_pcm_hw_params *params __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	params = memdup_user(_params, sizeof(*params));</div><div class='hunk'>@@ -345,13 +591,16 @@ static int snd_pcm_hw_refine_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return PTR_ERR(params);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_refine(substream, params);</div><div class='del'>-	if (copy_to_user(_params, params, sizeof(*params))) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	kfree(params);</div><div class='del'>-	return err;</div><div class='add'>+	err = fixup_unreferenced_params(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(_params, params, sizeof(*params)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int period_to_usecs(struct snd_pcm_runtime *runtime)</div><div class='hunk'>@@ -369,6 +618,134 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime)</div><div class='ctx'> 	return usecs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void snd_pcm_set_state(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_state_t state)</div><div class='add'>+{</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		__snd_pcm_set_state(substream-&gt;runtime, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void snd_pcm_timer_notify(struct snd_pcm_substream *substream,</div><div class='add'>+					int event)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SND_PCM_TIMER</div><div class='add'>+	if (substream-&gt;timer)</div><div class='add'>+		snd_timer_notify(substream-&gt;timer, event,</div><div class='add'>+					&amp;substream-&gt;runtime-&gt;trigger_tstamp);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_pcm_sync_stop(struct snd_pcm_substream *substream, bool sync_irq)</div><div class='add'>+{</div><div class='add'>+	if (substream-&gt;runtime &amp;&amp; substream-&gt;runtime-&gt;stop_operating) {</div><div class='add'>+		substream-&gt;runtime-&gt;stop_operating = false;</div><div class='add'>+		if (substream-&gt;ops &amp;&amp; substream-&gt;ops-&gt;sync_stop)</div><div class='add'>+			substream-&gt;ops-&gt;sync_stop(substream);</div><div class='add'>+		else if (sync_irq &amp;&amp; substream-&gt;pcm-&gt;card-&gt;sync_irq &gt; 0)</div><div class='add'>+			synchronize_irq(substream-&gt;pcm-&gt;card-&gt;sync_irq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_hw_params_choose - choose a configuration defined by @params</div><div class='add'>+ * @pcm: PCM instance</div><div class='add'>+ * @params: the hw_params instance</div><div class='add'>+ *</div><div class='add'>+ * Choose one configuration from configuration space defined by @params.</div><div class='add'>+ * The configuration chosen is that obtained fixing in this order:</div><div class='add'>+ * first access, first format, first subformat, min channels,</div><div class='add'>+ * min rate, min period time, max buffer size, min tick time</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,</div><div class='add'>+				    struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	static const int vars[] = {</div><div class='add'>+		SNDRV_PCM_HW_PARAM_ACCESS,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_SUBFORMAT,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_PERIOD_TIME,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+		SNDRV_PCM_HW_PARAM_TICK_TIME,</div><div class='add'>+		-1</div><div class='add'>+	};</div><div class='add'>+	const int *v;</div><div class='add'>+	struct snd_mask old_mask __maybe_unused;</div><div class='add'>+	struct snd_interval old_interval __maybe_unused;</div><div class='add'>+	int changed;</div><div class='add'>+</div><div class='add'>+	for (v = vars; *v != -1; v++) {</div><div class='add'>+		/* Keep old parameter to trace. */</div><div class='add'>+		if (trace_hw_mask_param_enabled()) {</div><div class='add'>+			if (hw_is_mask(*v))</div><div class='add'>+				old_mask = *hw_param_mask(params, *v);</div><div class='add'>+		}</div><div class='add'>+		if (trace_hw_interval_param_enabled()) {</div><div class='add'>+			if (hw_is_interval(*v))</div><div class='add'>+				old_interval = *hw_param_interval(params, *v);</div><div class='add'>+		}</div><div class='add'>+		if (*v != SNDRV_PCM_HW_PARAM_BUFFER_SIZE)</div><div class='add'>+			changed = snd_pcm_hw_param_first(pcm, params, *v, NULL);</div><div class='add'>+		else</div><div class='add'>+			changed = snd_pcm_hw_param_last(pcm, params, *v, NULL);</div><div class='add'>+		if (changed &lt; 0)</div><div class='add'>+			return changed;</div><div class='add'>+		if (changed == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Trace the changed parameter. */</div><div class='add'>+		if (hw_is_mask(*v)) {</div><div class='add'>+			trace_hw_mask_param(pcm, *v, 0, &amp;old_mask,</div><div class='add'>+					    hw_param_mask(params, *v));</div><div class='add'>+		}</div><div class='add'>+		if (hw_is_interval(*v)) {</div><div class='add'>+			trace_hw_interval_param(pcm, *v, 0, &amp;old_interval,</div><div class='add'>+						hw_param_interval(params, *v));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* acquire buffer_mutex; if it's in r/w operation, return -EBUSY, otherwise</div><div class='add'>+ * block the further r/w operations</div><div class='add'>+ */</div><div class='add'>+static int snd_pcm_buffer_access_lock(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (!atomic_dec_unless_positive(&amp;runtime-&gt;buffer_accessing))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	mutex_lock(&amp;runtime-&gt;buffer_mutex);</div><div class='add'>+	return 0; /* keep buffer_mutex, unlocked by below */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* release buffer_mutex and clear r/w access flag */</div><div class='add'>+static void snd_pcm_buffer_access_unlock(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;runtime-&gt;buffer_mutex);</div><div class='add'>+	atomic_inc(&amp;runtime-&gt;buffer_accessing);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill the PCM buffer with the current silence format; called from pcm_oss.c */</div><div class='add'>+void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_buffer_access_lock(runtime);</div><div class='add'>+	if (runtime-&gt;dma_area)</div><div class='add'>+		snd_pcm_format_set_silence(runtime-&gt;format, runtime-&gt;dma_area,</div><div class='add'>+					   bytes_to_samples(runtime, runtime-&gt;dma_bytes));</div><div class='add'>+	snd_pcm_buffer_access_unlock(runtime);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_runtime_buffer_set_silence);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_PCM_OSS)</div><div class='add'>+#define is_oss_stream(substream)	((substream)-&gt;oss.oss)</div><div class='add'>+#else</div><div class='add'>+#define is_oss_stream(substream)	false</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 			     struct snd_pcm_hw_params *params)</div><div class='ctx'> {</div><div class='hunk'>@@ -380,22 +757,27 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_OPEN:</div><div class='del'>-	case SNDRV_PCM_STATE_SETUP:</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		return -EBADFD;</div><div class='add'>+	err = snd_pcm_buffer_access_lock(runtime);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		switch (runtime-&gt;state) {</div><div class='add'>+		case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+		case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+		case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+			if (!is_oss_stream(substream) &amp;&amp;</div><div class='add'>+			    atomic_read(&amp;substream-&gt;mmap_count))</div><div class='add'>+				err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)</div><div class='del'>-	if (!substream-&gt;oss.oss)</div><div class='del'>-#endif</div><div class='del'>-		if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='del'>-			return -EBADFD;</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	snd_pcm_sync_stop(substream, true);</div><div class='ctx'> </div><div class='ctx'> 	params-&gt;rmask = ~0U;</div><div class='ctx'> 	err = snd_pcm_hw_refine(substream, params);</div><div class='hunk'>@@ -406,6 +788,18 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto _error;</div><div class='ctx'> </div><div class='add'>+	err = fixup_unreferenced_params(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto _error;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;managed_buffer_alloc) {</div><div class='add'>+		err = snd_pcm_lib_malloc_pages(substream,</div><div class='add'>+					       params_buffer_bytes(params));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto _error;</div><div class='add'>+		runtime-&gt;buffer_changed = err &gt; 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (substream-&gt;ops-&gt;hw_params != NULL) {</div><div class='ctx'> 		err = substream-&gt;ops-&gt;hw_params(substream, params);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -423,6 +817,9 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	runtime-&gt;info = params-&gt;info;</div><div class='ctx'> 	runtime-&gt;rate_num = params-&gt;rate_num;</div><div class='ctx'> 	runtime-&gt;rate_den = params-&gt;rate_den;</div><div class='add'>+	runtime-&gt;no_period_wakeup =</div><div class='add'>+			(params-&gt;info &amp; SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) &amp;&amp;</div><div class='add'>+			(params-&gt;flags &amp; SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP);</div><div class='ctx'> </div><div class='ctx'> 	bits = snd_pcm_format_physical_width(runtime-&gt;format);</div><div class='ctx'> 	runtime-&gt;sample_bits = bits;</div><div class='hunk'>@@ -448,29 +845,46 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	while (runtime-&gt;boundary * 2 &lt;= LONG_MAX - runtime-&gt;buffer_size)</div><div class='ctx'> 		runtime-&gt;boundary *= 2;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_timer_resolution_change(substream);</div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_SETUP;</div><div class='add'>+	/* clear the buffer for avoiding possible kernel info leaks */</div><div class='add'>+	if (runtime-&gt;dma_area &amp;&amp; !substream-&gt;ops-&gt;copy) {</div><div class='add'>+		size_t size = runtime-&gt;dma_bytes;</div><div class='ctx'> </div><div class='del'>-	if (pm_qos_request_active(&amp;substream-&gt;latency_pm_qos_req))</div><div class='del'>-		pm_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='del'>-	if ((usecs = period_to_usecs(runtime)) &gt;= 0)</div><div class='del'>-		pm_qos_add_request(&amp;substream-&gt;latency_pm_qos_req,</div><div class='del'>-				   PM_QOS_CPU_DMA_LATENCY, usecs);</div><div class='del'>-	return 0;</div><div class='add'>+		if (runtime-&gt;info &amp; SNDRV_PCM_INFO_MMAP)</div><div class='add'>+			size = PAGE_ALIGN(size);</div><div class='add'>+		memset(runtime-&gt;dma_area, 0, size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_timer_resolution_change(substream);</div><div class='add'>+	snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);</div><div class='add'>+</div><div class='add'>+	if (cpu_latency_qos_request_active(&amp;substream-&gt;latency_pm_qos_req))</div><div class='add'>+		cpu_latency_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='add'>+	usecs = period_to_usecs(runtime);</div><div class='add'>+	if (usecs &gt;= 0)</div><div class='add'>+		cpu_latency_qos_add_request(&amp;substream-&gt;latency_pm_qos_req,</div><div class='add'>+					    usecs);</div><div class='add'>+	err = 0;</div><div class='ctx'>  _error:</div><div class='del'>-	/* hardware might be unuseable from this time,</div><div class='del'>-	   so we force application to retry to set</div><div class='del'>-	   the correct hardware parameter settings */</div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_OPEN;</div><div class='del'>-	if (substream-&gt;ops-&gt;hw_free != NULL)</div><div class='del'>-		substream-&gt;ops-&gt;hw_free(substream);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* hardware might be unusable from this time,</div><div class='add'>+		 * so we force application to retry to set</div><div class='add'>+		 * the correct hardware parameter settings</div><div class='add'>+		 */</div><div class='add'>+		snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN);</div><div class='add'>+		if (substream-&gt;ops-&gt;hw_free != NULL)</div><div class='add'>+			substream-&gt;ops-&gt;hw_free(substream);</div><div class='add'>+		if (substream-&gt;managed_buffer_alloc)</div><div class='add'>+			snd_pcm_lib_free_pages(substream);</div><div class='add'>+	}</div><div class='add'>+ unlock:</div><div class='add'>+	snd_pcm_buffer_access_unlock(runtime);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_params_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 				  struct snd_pcm_hw_params __user * _params)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *params;</div><div class='add'>+	struct snd_pcm_hw_params *params __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	params = memdup_user(_params, sizeof(*params));</div><div class='hunk'>@@ -478,15 +892,26 @@ static int snd_pcm_hw_params_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return PTR_ERR(params);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_params(substream, params);</div><div class='del'>-	if (copy_to_user(_params, params, sizeof(*params))) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	kfree(params);</div><div class='add'>+	if (copy_to_user(_params, params, sizeof(*params)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int do_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int result = 0;</div><div class='add'>+</div><div class='add'>+	snd_pcm_sync_stop(substream, true);</div><div class='add'>+	if (substream-&gt;ops-&gt;hw_free)</div><div class='add'>+		result = substream-&gt;ops-&gt;hw_free(substream);</div><div class='add'>+	if (substream-&gt;managed_buffer_alloc)</div><div class='add'>+		snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='hunk'>@@ -495,22 +920,28 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_SETUP:</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		return -EBADFD;</div><div class='add'>+	result = snd_pcm_buffer_access_lock(runtime);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		return result;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		switch (runtime-&gt;state) {</div><div class='add'>+		case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+		case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+			if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='add'>+				result = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			result = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	if (atomic_read(&amp;substream-&gt;mmap_count))</div><div class='del'>-		return -EBADFD;</div><div class='del'>-	if (substream-&gt;ops-&gt;hw_free)</div><div class='del'>-		result = substream-&gt;ops-&gt;hw_free(substream);</div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_OPEN;</div><div class='del'>-	pm_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='add'>+	if (result)</div><div class='add'>+		goto unlock;</div><div class='add'>+	result = do_hw_free(substream);</div><div class='add'>+	snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN);</div><div class='add'>+	cpu_latency_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='add'>+ unlock:</div><div class='add'>+	snd_pcm_buffer_access_unlock(runtime);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -523,14 +954,16 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		return -EBADFD;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+			return -EBADFD;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> </div><div class='del'>-	if (params-&gt;tstamp_mode &gt; SNDRV_PCM_TSTAMP_LAST)</div><div class='add'>+	if (params-&gt;tstamp_mode &lt; 0 ||</div><div class='add'>+	    params-&gt;tstamp_mode &gt; SNDRV_PCM_TSTAMP_LAST)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (params-&gt;proto &gt;= SNDRV_PROTOCOL_VERSION(2, 0, 12) &amp;&amp;</div><div class='add'>+	    params-&gt;tstamp_type &gt; SNDRV_PCM_TSTAMP_TYPE_LAST)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (params-&gt;avail_min == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -544,22 +977,24 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = 0;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	runtime-&gt;tstamp_mode = params-&gt;tstamp_mode;</div><div class='del'>-	runtime-&gt;period_step = params-&gt;period_step;</div><div class='del'>-	runtime-&gt;control-&gt;avail_min = params-&gt;avail_min;</div><div class='del'>-	runtime-&gt;start_threshold = params-&gt;start_threshold;</div><div class='del'>-	runtime-&gt;stop_threshold = params-&gt;stop_threshold;</div><div class='del'>-	runtime-&gt;silence_threshold = params-&gt;silence_threshold;</div><div class='del'>-	runtime-&gt;silence_size = params-&gt;silence_size;</div><div class='del'>-        params-&gt;boundary = runtime-&gt;boundary;</div><div class='del'>-	if (snd_pcm_running(substream)) {</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='del'>-		    runtime-&gt;silence_size &gt; 0)</div><div class='del'>-			snd_pcm_playback_silence(substream, ULONG_MAX);</div><div class='del'>-		err = snd_pcm_update_state(substream, runtime);</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		runtime-&gt;tstamp_mode = params-&gt;tstamp_mode;</div><div class='add'>+		if (params-&gt;proto &gt;= SNDRV_PROTOCOL_VERSION(2, 0, 12))</div><div class='add'>+			runtime-&gt;tstamp_type = params-&gt;tstamp_type;</div><div class='add'>+		runtime-&gt;period_step = params-&gt;period_step;</div><div class='add'>+		runtime-&gt;control-&gt;avail_min = params-&gt;avail_min;</div><div class='add'>+		runtime-&gt;start_threshold = params-&gt;start_threshold;</div><div class='add'>+		runtime-&gt;stop_threshold = params-&gt;stop_threshold;</div><div class='add'>+		runtime-&gt;silence_threshold = params-&gt;silence_threshold;</div><div class='add'>+		runtime-&gt;silence_size = params-&gt;silence_size;</div><div class='add'>+		params-&gt;boundary = runtime-&gt;boundary;</div><div class='add'>+		if (snd_pcm_running(substream)) {</div><div class='add'>+			if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='add'>+			    runtime-&gt;silence_size &gt; 0)</div><div class='add'>+				snd_pcm_playback_silence(substream, ULONG_MAX);</div><div class='add'>+			err = snd_pcm_update_state(substream, runtime);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -576,60 +1011,109 @@ static int snd_pcm_sw_params_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_pcm_status(struct snd_pcm_substream *substream,</div><div class='del'>-		   struct snd_pcm_status *status)</div><div class='add'>+static inline snd_pcm_uframes_t</div><div class='add'>+snd_pcm_calc_delay(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_uframes_t delay;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		delay = snd_pcm_playback_hw_avail(substream-&gt;runtime);</div><div class='add'>+	else</div><div class='add'>+		delay = snd_pcm_capture_avail(substream-&gt;runtime);</div><div class='add'>+	return delay + substream-&gt;runtime-&gt;delay;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_pcm_status64(struct snd_pcm_substream *substream,</div><div class='add'>+		     struct snd_pcm_status64 *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	status-&gt;state = runtime-&gt;status-&gt;state;</div><div class='del'>-	status-&gt;suspended_state = runtime-&gt;status-&gt;suspended_state;</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='add'>+</div><div class='add'>+	snd_pcm_unpack_audio_tstamp_config(status-&gt;audio_tstamp_data,</div><div class='add'>+					&amp;runtime-&gt;audio_tstamp_config);</div><div class='add'>+</div><div class='add'>+	/* backwards compatible behavior */</div><div class='add'>+	if (runtime-&gt;audio_tstamp_config.type_requested ==</div><div class='add'>+		SNDRV_PCM_AUDIO_TSTAMP_TYPE_COMPAT) {</div><div class='add'>+		if (runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_HAS_WALL_CLOCK)</div><div class='add'>+			runtime-&gt;audio_tstamp_config.type_requested =</div><div class='add'>+				SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK;</div><div class='add'>+		else</div><div class='add'>+			runtime-&gt;audio_tstamp_config.type_requested =</div><div class='add'>+				SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT;</div><div class='add'>+		runtime-&gt;audio_tstamp_report.valid = 0;</div><div class='add'>+	} else</div><div class='add'>+		runtime-&gt;audio_tstamp_report.valid = 1;</div><div class='add'>+</div><div class='add'>+	status-&gt;state = runtime-&gt;state;</div><div class='add'>+	status-&gt;suspended_state = runtime-&gt;suspended_state;</div><div class='ctx'> 	if (status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-		goto _end;</div><div class='del'>-	status-&gt;trigger_tstamp = runtime-&gt;trigger_tstamp;</div><div class='add'>+		return 0;</div><div class='add'>+	status-&gt;trigger_tstamp_sec = runtime-&gt;trigger_tstamp.tv_sec;</div><div class='add'>+	status-&gt;trigger_tstamp_nsec = runtime-&gt;trigger_tstamp.tv_nsec;</div><div class='ctx'> 	if (snd_pcm_running(substream)) {</div><div class='ctx'> 		snd_pcm_update_hw_ptr(substream);</div><div class='ctx'> 		if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {</div><div class='del'>-			status-&gt;tstamp = runtime-&gt;status-&gt;tstamp;</div><div class='add'>+			status-&gt;tstamp_sec = runtime-&gt;status-&gt;tstamp.tv_sec;</div><div class='add'>+			status-&gt;tstamp_nsec =</div><div class='add'>+				runtime-&gt;status-&gt;tstamp.tv_nsec;</div><div class='add'>+			status-&gt;driver_tstamp_sec =</div><div class='add'>+				runtime-&gt;driver_tstamp.tv_sec;</div><div class='add'>+			status-&gt;driver_tstamp_nsec =</div><div class='add'>+				runtime-&gt;driver_tstamp.tv_nsec;</div><div class='add'>+			status-&gt;audio_tstamp_sec =</div><div class='add'>+				runtime-&gt;status-&gt;audio_tstamp.tv_sec;</div><div class='add'>+			status-&gt;audio_tstamp_nsec =</div><div class='add'>+				runtime-&gt;status-&gt;audio_tstamp.tv_nsec;</div><div class='add'>+			if (runtime-&gt;audio_tstamp_report.valid == 1)</div><div class='add'>+				/* backwards compatibility, no report provided in COMPAT mode */</div><div class='add'>+				snd_pcm_pack_audio_tstamp_report(&amp;status-&gt;audio_tstamp_data,</div><div class='add'>+								&amp;status-&gt;audio_tstamp_accuracy,</div><div class='add'>+								&amp;runtime-&gt;audio_tstamp_report);</div><div class='add'>+</div><div class='ctx'> 			goto _tstamp_end;</div><div class='ctx'> 		}</div><div class='add'>+	} else {</div><div class='add'>+		/* get tstamp only in fallback mode and only if enabled */</div><div class='add'>+		if (runtime-&gt;tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) {</div><div class='add'>+			struct timespec64 tstamp;</div><div class='add'>+</div><div class='add'>+			snd_pcm_gettime(runtime, &amp;tstamp);</div><div class='add'>+			status-&gt;tstamp_sec = tstamp.tv_sec;</div><div class='add'>+			status-&gt;tstamp_nsec = tstamp.tv_nsec;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_gettime(runtime, &amp;status-&gt;tstamp);</div><div class='ctx'>  _tstamp_end:</div><div class='ctx'> 	status-&gt;appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='ctx'> 	status-&gt;hw_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		status-&gt;avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_RUNNING ||</div><div class='del'>-		    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='del'>-			status-&gt;delay = runtime-&gt;buffer_size - status-&gt;avail;</div><div class='del'>-			status-&gt;delay += runtime-&gt;delay;</div><div class='del'>-		} else</div><div class='del'>-			status-&gt;delay = 0;</div><div class='del'>-	} else {</div><div class='del'>-		status-&gt;avail = snd_pcm_capture_avail(runtime);</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_RUNNING)</div><div class='del'>-			status-&gt;delay = status-&gt;avail + runtime-&gt;delay;</div><div class='del'>-		else</div><div class='del'>-			status-&gt;delay = 0;</div><div class='del'>-	}</div><div class='add'>+	status-&gt;avail = snd_pcm_avail(substream);</div><div class='add'>+	status-&gt;delay = snd_pcm_running(substream) ?</div><div class='add'>+		snd_pcm_calc_delay(substream) : 0;</div><div class='ctx'> 	status-&gt;avail_max = runtime-&gt;avail_max;</div><div class='ctx'> 	status-&gt;overrange = runtime-&gt;overrange;</div><div class='ctx'> 	runtime-&gt;avail_max = 0;</div><div class='ctx'> 	runtime-&gt;overrange = 0;</div><div class='del'>- _end:</div><div class='del'>- 	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_status_user(struct snd_pcm_substream *substream,</div><div class='del'>-			       struct snd_pcm_status __user * _status)</div><div class='add'>+static int snd_pcm_status_user64(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_status64 __user * _status,</div><div class='add'>+				 bool ext)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_status status;</div><div class='add'>+	struct snd_pcm_status64 status;</div><div class='ctx'> 	int res;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-	res = snd_pcm_status(substream, &amp;status);</div><div class='add'>+	/*</div><div class='add'>+	 * with extension, parameters are read/write,</div><div class='add'>+	 * get audio_tstamp_data from user,</div><div class='add'>+	 * ignore rest of status structure</div><div class='add'>+	 */</div><div class='add'>+	if (ext &amp;&amp; get_user(status.audio_tstamp_data,</div><div class='add'>+				(u32 __user *)(&amp;_status-&gt;audio_tstamp_data)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	res = snd_pcm_status64(substream, &amp;status);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> 	if (copy_to_user(_status, &amp;status, sizeof(status)))</div><div class='hunk'>@@ -637,6 +1121,55 @@ static int snd_pcm_status_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_pcm_status_user32(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_status32 __user * _status,</div><div class='add'>+				 bool ext)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_status64 status64;</div><div class='add'>+	struct snd_pcm_status32 status32;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	memset(&amp;status64, 0, sizeof(status64));</div><div class='add'>+	memset(&amp;status32, 0, sizeof(status32));</div><div class='add'>+	/*</div><div class='add'>+	 * with extension, parameters are read/write,</div><div class='add'>+	 * get audio_tstamp_data from user,</div><div class='add'>+	 * ignore rest of status structure</div><div class='add'>+	 */</div><div class='add'>+	if (ext &amp;&amp; get_user(status64.audio_tstamp_data,</div><div class='add'>+			    (u32 __user *)(&amp;_status-&gt;audio_tstamp_data)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	res = snd_pcm_status64(substream, &amp;status64);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	status32 = (struct snd_pcm_status32) {</div><div class='add'>+		.state = status64.state,</div><div class='add'>+		.trigger_tstamp_sec = status64.trigger_tstamp_sec,</div><div class='add'>+		.trigger_tstamp_nsec = status64.trigger_tstamp_nsec,</div><div class='add'>+		.tstamp_sec = status64.tstamp_sec,</div><div class='add'>+		.tstamp_nsec = status64.tstamp_nsec,</div><div class='add'>+		.appl_ptr = status64.appl_ptr,</div><div class='add'>+		.hw_ptr = status64.hw_ptr,</div><div class='add'>+		.delay = status64.delay,</div><div class='add'>+		.avail = status64.avail,</div><div class='add'>+		.avail_max = status64.avail_max,</div><div class='add'>+		.overrange = status64.overrange,</div><div class='add'>+		.suspended_state = status64.suspended_state,</div><div class='add'>+		.audio_tstamp_data = status64.audio_tstamp_data,</div><div class='add'>+		.audio_tstamp_sec = status64.audio_tstamp_sec,</div><div class='add'>+		.audio_tstamp_nsec = status64.audio_tstamp_nsec,</div><div class='add'>+		.driver_tstamp_sec = status64.audio_tstamp_sec,</div><div class='add'>+		.driver_tstamp_nsec = status64.audio_tstamp_nsec,</div><div class='add'>+		.audio_tstamp_accuracy = status64.audio_tstamp_accuracy,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(_status, &amp;status32, sizeof(status32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_channel_info(struct snd_pcm_substream *substream,</div><div class='ctx'> 				struct snd_pcm_channel_info * info)</div><div class='ctx'> {</div><div class='hunk'>@@ -645,17 +1178,15 @@ static int snd_pcm_channel_info(struct snd_pcm_substream *substream,</div><div class='ctx'> 	</div><div class='ctx'> 	channel = info-&gt;channel;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		return -EBADFD;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+			return -EBADFD;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	if (channel &gt;= runtime-&gt;channels)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	memset(info, 0, sizeof(*info));</div><div class='ctx'> 	info-&gt;channel = channel;</div><div class='del'>-	return substream-&gt;ops-&gt;ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, info);</div><div class='add'>+	return snd_pcm_ops_ioctl(substream, SNDRV_PCM_IOCTL1_CHANNEL_INFO, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -680,7 +1211,8 @@ static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (runtime-&gt;trigger_master == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (runtime-&gt;trigger_master == substream) {</div><div class='del'>-		snd_pcm_gettime(runtime, &amp;runtime-&gt;trigger_tstamp);</div><div class='add'>+		if (!runtime-&gt;trigger_tstamp_latched)</div><div class='add'>+			snd_pcm_gettime(runtime, &amp;runtime-&gt;trigger_tstamp);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_pcm_trigger_tstamp(runtime-&gt;trigger_master);</div><div class='ctx'> 		runtime-&gt;trigger_tstamp = runtime-&gt;trigger_master-&gt;runtime-&gt;trigger_tstamp;</div><div class='hunk'>@@ -688,11 +1220,17 @@ static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;trigger_master = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ACTION_ARG_IGNORE	(__force snd_pcm_state_t)0</div><div class='add'>+</div><div class='ctx'> struct action_ops {</div><div class='del'>-	int (*pre_action)(struct snd_pcm_substream *substream, int state);</div><div class='del'>-	int (*do_action)(struct snd_pcm_substream *substream, int state);</div><div class='del'>-	void (*undo_action)(struct snd_pcm_substream *substream, int state);</div><div class='del'>-	void (*post_action)(struct snd_pcm_substream *substream, int state);</div><div class='add'>+	int (*pre_action)(struct snd_pcm_substream *substream,</div><div class='add'>+			  snd_pcm_state_t state);</div><div class='add'>+	int (*do_action)(struct snd_pcm_substream *substream,</div><div class='add'>+			 snd_pcm_state_t state);</div><div class='add'>+	void (*undo_action)(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state);</div><div class='add'>+	void (*post_action)(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -700,18 +1238,25 @@ struct action_ops {</div><div class='ctx'>  *  Note: the stream state might be changed also on failure</div><div class='ctx'>  *  Note2: call with calling stream lock + link lock</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_action_group(struct action_ops *ops,</div><div class='add'>+static int snd_pcm_action_group(const struct action_ops *ops,</div><div class='ctx'> 				struct snd_pcm_substream *substream,</div><div class='del'>-				int state, int do_lock)</div><div class='add'>+				snd_pcm_state_t state,</div><div class='add'>+				bool stream_lock)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *s = NULL;</div><div class='ctx'> 	struct snd_pcm_substream *s1;</div><div class='del'>-	int res = 0;</div><div class='add'>+	int res = 0, depth = 1;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-		if (do_lock &amp;&amp; s != substream)</div><div class='del'>-			spin_lock_nested(&amp;s-&gt;self_group.lock,</div><div class='del'>-					 SINGLE_DEPTH_NESTING);</div><div class='add'>+		if (s != substream) {</div><div class='add'>+			if (!stream_lock)</div><div class='add'>+				mutex_lock_nested(&amp;s-&gt;runtime-&gt;buffer_mutex, depth);</div><div class='add'>+			else if (s-&gt;pcm-&gt;nonatomic)</div><div class='add'>+				mutex_lock_nested(&amp;s-&gt;self_group.mutex, depth);</div><div class='add'>+			else</div><div class='add'>+				spin_lock_nested(&amp;s-&gt;self_group.lock, depth);</div><div class='add'>+			depth++;</div><div class='add'>+		}</div><div class='ctx'> 		res = ops-&gt;pre_action(s, state);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			goto _unlock;</div><div class='hunk'>@@ -734,14 +1279,18 @@ static int snd_pcm_action_group(struct action_ops *ops,</div><div class='ctx'> 		ops-&gt;post_action(s, state);</div><div class='ctx'> 	}</div><div class='ctx'>  _unlock:</div><div class='del'>-	if (do_lock) {</div><div class='del'>-		/* unlock streams */</div><div class='del'>-		snd_pcm_group_for_each_entry(s1, substream) {</div><div class='del'>-			if (s1 != substream)</div><div class='add'>+	/* unlock streams */</div><div class='add'>+	snd_pcm_group_for_each_entry(s1, substream) {</div><div class='add'>+		if (s1 != substream) {</div><div class='add'>+			if (!stream_lock)</div><div class='add'>+				mutex_unlock(&amp;s1-&gt;runtime-&gt;buffer_mutex);</div><div class='add'>+			else if (s1-&gt;pcm-&gt;nonatomic)</div><div class='add'>+				mutex_unlock(&amp;s1-&gt;self_group.mutex);</div><div class='add'>+			else</div><div class='ctx'> 				spin_unlock(&amp;s1-&gt;self_group.lock);</div><div class='del'>-			if (s1 == s)	/* end */</div><div class='del'>-				break;</div><div class='ctx'> 		}</div><div class='add'>+		if (s1 == s)	/* end */</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -749,9 +1298,9 @@ static int snd_pcm_action_group(struct action_ops *ops,</div><div class='ctx'> /*</div><div class='ctx'>  *  Note: call with stream lock</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_action_single(struct action_ops *ops,</div><div class='add'>+static int snd_pcm_action_single(const struct action_ops *ops,</div><div class='ctx'> 				 struct snd_pcm_substream *substream,</div><div class='del'>-				 int state)</div><div class='add'>+				 snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> 	</div><div class='hunk'>@@ -766,116 +1315,174 @@ static int snd_pcm_action_single(struct action_ops *ops,</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void snd_pcm_group_assign(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_group *new_group)</div><div class='add'>+{</div><div class='add'>+	substream-&gt;group = new_group;</div><div class='add'>+	list_move(&amp;substream-&gt;link_list, &amp;new_group-&gt;substreams);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unref and unlock the group, but keep the stream lock;</div><div class='add'>+ * when the group becomes empty and no longer referred, destroy itself</div><div class='add'>+ */</div><div class='add'>+static void snd_pcm_group_unref(struct snd_pcm_group *group,</div><div class='add'>+				struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	bool do_free;</div><div class='add'>+</div><div class='add'>+	if (!group)</div><div class='add'>+		return;</div><div class='add'>+	do_free = refcount_dec_and_test(&amp;group-&gt;refs);</div><div class='add'>+	snd_pcm_group_unlock(group, substream-&gt;pcm-&gt;nonatomic);</div><div class='add'>+	if (do_free)</div><div class='add'>+		kfree(group);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lock the group inside a stream lock and reference it;</div><div class='add'>+ * return the locked group object, or NULL if not linked</div><div class='add'>+ */</div><div class='add'>+static struct snd_pcm_group *</div><div class='add'>+snd_pcm_stream_group_ref(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	bool nonatomic = substream-&gt;pcm-&gt;nonatomic;</div><div class='add'>+	struct snd_pcm_group *group;</div><div class='add'>+	bool trylock;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (!snd_pcm_stream_linked(substream))</div><div class='add'>+			return NULL;</div><div class='add'>+		group = substream-&gt;group;</div><div class='add'>+		/* block freeing the group object */</div><div class='add'>+		refcount_inc(&amp;group-&gt;refs);</div><div class='add'>+</div><div class='add'>+		trylock = nonatomic ? mutex_trylock(&amp;group-&gt;mutex) :</div><div class='add'>+			spin_trylock(&amp;group-&gt;lock);</div><div class='add'>+		if (trylock)</div><div class='add'>+			break; /* OK */</div><div class='add'>+</div><div class='add'>+		/* re-lock for avoiding ABBA deadlock */</div><div class='add'>+		snd_pcm_stream_unlock(substream);</div><div class='add'>+		snd_pcm_group_lock(group, nonatomic);</div><div class='add'>+		snd_pcm_stream_lock(substream);</div><div class='add'>+</div><div class='add'>+		/* check the group again; the above opens a small race window */</div><div class='add'>+		if (substream-&gt;group == group)</div><div class='add'>+			break; /* OK */</div><div class='add'>+		/* group changed, try again */</div><div class='add'>+		snd_pcm_group_unref(group, substream);</div><div class='add'>+	}</div><div class='add'>+	return group;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  Note: call with stream lock</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_action(struct action_ops *ops,</div><div class='add'>+static int snd_pcm_action(const struct action_ops *ops,</div><div class='ctx'> 			  struct snd_pcm_substream *substream,</div><div class='del'>-			  int state)</div><div class='add'>+			  snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='add'>+	struct snd_pcm_group *group;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	if (snd_pcm_stream_linked(substream)) {</div><div class='del'>-		if (!spin_trylock(&amp;substream-&gt;group-&gt;lock)) {</div><div class='del'>-			spin_unlock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-			spin_lock(&amp;substream-&gt;group-&gt;lock);</div><div class='del'>-			spin_lock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-		}</div><div class='del'>-		res = snd_pcm_action_group(ops, substream, state, 1);</div><div class='del'>-		spin_unlock(&amp;substream-&gt;group-&gt;lock);</div><div class='del'>-	} else {</div><div class='add'>+	group = snd_pcm_stream_group_ref(substream);</div><div class='add'>+	if (group)</div><div class='add'>+		res = snd_pcm_action_group(ops, substream, state, true);</div><div class='add'>+	else</div><div class='ctx'> 		res = snd_pcm_action_single(ops, substream, state);</div><div class='del'>-	}</div><div class='add'>+	snd_pcm_group_unref(group, substream);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Note: don't use any locks before</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_action_lock_irq(struct action_ops *ops,</div><div class='add'>+static int snd_pcm_action_lock_irq(const struct action_ops *ops,</div><div class='ctx'> 				   struct snd_pcm_substream *substream,</div><div class='del'>-				   int state)</div><div class='add'>+				   snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	read_lock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	if (snd_pcm_stream_linked(substream)) {</div><div class='del'>-		spin_lock(&amp;substream-&gt;group-&gt;lock);</div><div class='del'>-		spin_lock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-		res = snd_pcm_action_group(ops, substream, state, 1);</div><div class='del'>-		spin_unlock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-		spin_unlock(&amp;substream-&gt;group-&gt;lock);</div><div class='del'>-	} else {</div><div class='del'>-		spin_lock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-		res = snd_pcm_action_single(ops, substream, state);</div><div class='del'>-		spin_unlock(&amp;substream-&gt;self_group.lock);</div><div class='del'>-	}</div><div class='del'>-	read_unlock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	return res;</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='add'>+	return snd_pcm_action(ops, substream, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_action_nonatomic(struct action_ops *ops,</div><div class='add'>+static int snd_pcm_action_nonatomic(const struct action_ops *ops,</div><div class='ctx'> 				    struct snd_pcm_substream *substream,</div><div class='del'>-				    int state)</div><div class='add'>+				    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;snd_pcm_link_rwsem);</div><div class='add'>+	/* Guarantee the group members won't change during non-atomic action */</div><div class='add'>+	guard(rwsem_read)(&amp;snd_pcm_link_rwsem);</div><div class='add'>+	res = snd_pcm_buffer_access_lock(substream-&gt;runtime);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return res;</div><div class='ctx'> 	if (snd_pcm_stream_linked(substream))</div><div class='del'>-		res = snd_pcm_action_group(ops, substream, state, 0);</div><div class='add'>+		res = snd_pcm_action_group(ops, substream, state, false);</div><div class='ctx'> 	else</div><div class='ctx'> 		res = snd_pcm_action_single(ops, substream, state);</div><div class='del'>-	up_read(&amp;snd_pcm_link_rwsem);</div><div class='add'>+	snd_pcm_buffer_access_unlock(substream-&gt;runtime);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * start callbacks</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_pre_start(struct snd_pcm_substream *substream,</div><div class='add'>+			     snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state != SNDRV_PCM_STATE_PREPARED)</div><div class='add'>+	if (runtime-&gt;state != SNDRV_PCM_STATE_PREPARED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='ctx'> 	    !snd_pcm_playback_data(substream))</div><div class='ctx'> 		return -EPIPE;</div><div class='add'>+	runtime-&gt;trigger_tstamp_latched = false;</div><div class='ctx'> 	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_start(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_start(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;trigger_master != substream)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_START);</div><div class='add'>+	err = substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_START);</div><div class='add'>+	/* XRUN happened during the start */</div><div class='add'>+	if (err == -EPIPE)</div><div class='add'>+		__snd_pcm_set_state(substream-&gt;runtime, SNDRV_PCM_STATE_XRUN);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_undo_start(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_undo_start(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='del'>-	if (substream-&gt;runtime-&gt;trigger_master == substream)</div><div class='add'>+	if (substream-&gt;runtime-&gt;trigger_master == substream) {</div><div class='ctx'> 		substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_STOP);</div><div class='add'>+		substream-&gt;runtime-&gt;stop_operating = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_start(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_trigger_tstamp(substream);</div><div class='ctx'> 	runtime-&gt;hw_ptr_jiffies = jiffies;</div><div class='ctx'> 	runtime-&gt;hw_ptr_buffer_jiffies = (runtime-&gt;buffer_size * HZ) / </div><div class='ctx'> 							    runtime-&gt;rate;</div><div class='del'>-	runtime-&gt;status-&gt;state = state;</div><div class='add'>+	__snd_pcm_set_state(runtime, state);</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='ctx'> 	    runtime-&gt;silence_size &gt; 0)</div><div class='ctx'> 		snd_pcm_playback_silence(substream, ULONG_MAX);</div><div class='del'>-	if (substream-&gt;timer)</div><div class='del'>-		snd_timer_notify(substream-&gt;timer, SNDRV_TIMER_EVENT_MSTART,</div><div class='del'>-				 &amp;runtime-&gt;trigger_tstamp);</div><div class='add'>+	snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSTART);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_start = {</div><div class='add'>+static const struct action_ops snd_pcm_action_start = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_start,</div><div class='ctx'> 	.do_action = snd_pcm_do_start,</div><div class='ctx'> 	.undo_action = snd_pcm_undo_start,</div><div class='hunk'>@@ -885,6 +1492,9 @@ static struct action_ops snd_pcm_action_start = {</div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_start - start all linked streams</div><div class='ctx'>  * @substream: the PCM substream instance</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='add'>+ * The stream lock must be acquired before calling this function.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_start(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -892,41 +1502,51 @@ int snd_pcm_start(struct snd_pcm_substream *substream)</div><div class='ctx'> 			      SNDRV_PCM_STATE_RUNNING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* take the stream lock and start the streams */</div><div class='add'>+static int snd_pcm_start_lock_irq(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return snd_pcm_action_lock_irq(&amp;snd_pcm_action_start, substream,</div><div class='add'>+				       SNDRV_PCM_STATE_RUNNING);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * stop callbacks</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_pre_stop(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_pre_stop(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_stop(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_stop(struct snd_pcm_substream *substream,</div><div class='add'>+			   snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;trigger_master == substream &amp;&amp;</div><div class='del'>-	    snd_pcm_running(substream))</div><div class='add'>+	    snd_pcm_running(substream)) {</div><div class='ctx'> 		substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_STOP);</div><div class='del'>-	return 0; /* unconditonally stop all substreams */</div><div class='add'>+		substream-&gt;runtime-&gt;stop_operating = true;</div><div class='add'>+	}</div><div class='add'>+	return 0; /* unconditionally stop all substreams */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_stop(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_stop(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state != state) {</div><div class='add'>+	if (runtime-&gt;state != state) {</div><div class='ctx'> 		snd_pcm_trigger_tstamp(substream);</div><div class='del'>-		if (substream-&gt;timer)</div><div class='del'>-			snd_timer_notify(substream-&gt;timer, SNDRV_TIMER_EVENT_MSTOP,</div><div class='del'>-					 &amp;runtime-&gt;trigger_tstamp);</div><div class='del'>-		runtime-&gt;status-&gt;state = state;</div><div class='add'>+		__snd_pcm_set_state(runtime, state);</div><div class='add'>+		snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSTOP);</div><div class='ctx'> 	}</div><div class='ctx'> 	wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 	wake_up(&amp;runtime-&gt;tsleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_stop = {</div><div class='add'>+static const struct action_ops snd_pcm_action_stop = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_stop,</div><div class='ctx'> 	.do_action = snd_pcm_do_stop,</div><div class='ctx'> 	.post_action = snd_pcm_post_stop</div><div class='hunk'>@@ -938,12 +1558,13 @@ static struct action_ops snd_pcm_action_stop = {</div><div class='ctx'>  * @state: PCM state after stopping the stream</div><div class='ctx'>  *</div><div class='ctx'>  * The state of each stream is then changed to the given state unconditionally.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_stop(struct snd_pcm_substream *substream, int state)</div><div class='add'>+int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_pcm_action(&amp;snd_pcm_action_stop, substream, state);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_stop);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -952,6 +1573,8 @@ EXPORT_SYMBOL(snd_pcm_stop);</div><div class='ctx'>  *</div><div class='ctx'>  * After stopping, the state is changed to SETUP.</div><div class='ctx'>  * Unlike snd_pcm_stop(), this affects only the given stream.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_drain_done(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -959,71 +1582,87 @@ int snd_pcm_drain_done(struct snd_pcm_substream *substream)</div><div class='ctx'> 				     SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_stop_xrun - stop the running streams as XRUN</div><div class='add'>+ * @substream: the PCM substream instance</div><div class='add'>+ *</div><div class='add'>+ * This stops the given running substream (and all linked substreams) as XRUN.</div><div class='add'>+ * Unlike snd_pcm_stop(), this function takes the substream lock by itself.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_stop_xrun(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	guard(pcm_stream_lock_irqsave)(substream);</div><div class='add'>+	if (substream-&gt;runtime &amp;&amp; snd_pcm_running(substream))</div><div class='add'>+		__snd_pcm_xrun(substream);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_stop_xrun);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * pause callbacks</div><div class='add'>+ * pause callbacks: pass boolean (to start pause or resume) as state argument</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_pre_pause(struct snd_pcm_substream *substream, int push)</div><div class='add'>+#define pause_pushed(state)	(__force bool)(state)</div><div class='add'>+</div><div class='add'>+static int snd_pcm_pre_pause(struct snd_pcm_substream *substream,</div><div class='add'>+			     snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (!(runtime-&gt;info &amp; SNDRV_PCM_INFO_PAUSE))</div><div class='ctx'> 		return -ENOSYS;</div><div class='del'>-	if (push) {</div><div class='del'>-		if (runtime-&gt;status-&gt;state != SNDRV_PCM_STATE_RUNNING)</div><div class='add'>+	if (pause_pushed(state)) {</div><div class='add'>+		if (runtime-&gt;state != SNDRV_PCM_STATE_RUNNING)</div><div class='ctx'> 			return -EBADFD;</div><div class='del'>-	} else if (runtime-&gt;status-&gt;state != SNDRV_PCM_STATE_PAUSED)</div><div class='add'>+	} else if (runtime-&gt;state != SNDRV_PCM_STATE_PAUSED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push)</div><div class='add'>+static int snd_pcm_do_pause(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;trigger_master != substream)</div><div class='ctx'> 		return 0;</div><div class='del'>-	/* some drivers might use hw_ptr to recover from the pause -</div><div class='del'>-	   update the hw_ptr now */</div><div class='del'>-	if (push)</div><div class='del'>-		snd_pcm_update_hw_ptr(substream);</div><div class='ctx'> 	/* The jiffies check in snd_pcm_update_hw_ptr*() is done by</div><div class='del'>-	 * a delta betwen the current jiffies, this gives a large enough</div><div class='add'>+	 * a delta between the current jiffies, this gives a large enough</div><div class='ctx'> 	 * delta, effectively to skip the check once.</div><div class='ctx'> 	 */</div><div class='ctx'> 	substream-&gt;runtime-&gt;hw_ptr_jiffies = jiffies - HZ * 1000;</div><div class='ctx'> 	return substream-&gt;ops-&gt;trigger(substream,</div><div class='del'>-				       push ? SNDRV_PCM_TRIGGER_PAUSE_PUSH :</div><div class='del'>-					      SNDRV_PCM_TRIGGER_PAUSE_RELEASE);</div><div class='add'>+				       pause_pushed(state) ?</div><div class='add'>+				       SNDRV_PCM_TRIGGER_PAUSE_PUSH :</div><div class='add'>+				       SNDRV_PCM_TRIGGER_PAUSE_RELEASE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_undo_pause(struct snd_pcm_substream *substream, int push)</div><div class='add'>+static void snd_pcm_undo_pause(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;trigger_master == substream)</div><div class='ctx'> 		substream-&gt;ops-&gt;trigger(substream,</div><div class='del'>-					push ? SNDRV_PCM_TRIGGER_PAUSE_RELEASE :</div><div class='add'>+					pause_pushed(state) ?</div><div class='add'>+					SNDRV_PCM_TRIGGER_PAUSE_RELEASE :</div><div class='ctx'> 					SNDRV_PCM_TRIGGER_PAUSE_PUSH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_pause(struct snd_pcm_substream *substream, int push)</div><div class='add'>+static void snd_pcm_post_pause(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_trigger_tstamp(substream);</div><div class='del'>-	if (push) {</div><div class='del'>-		runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_PAUSED;</div><div class='del'>-		if (substream-&gt;timer)</div><div class='del'>-			snd_timer_notify(substream-&gt;timer,</div><div class='del'>-					 SNDRV_TIMER_EVENT_MPAUSE,</div><div class='del'>-					 &amp;runtime-&gt;trigger_tstamp);</div><div class='add'>+	if (pause_pushed(state)) {</div><div class='add'>+		__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_PAUSED);</div><div class='add'>+		snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MPAUSE);</div><div class='ctx'> 		wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 		wake_up(&amp;runtime-&gt;tsleep);</div><div class='ctx'> 	} else {</div><div class='del'>-		runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_RUNNING;</div><div class='del'>-		if (substream-&gt;timer)</div><div class='del'>-			snd_timer_notify(substream-&gt;timer,</div><div class='del'>-					 SNDRV_TIMER_EVENT_MCONTINUE,</div><div class='del'>-					 &amp;runtime-&gt;trigger_tstamp);</div><div class='add'>+		__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_RUNNING);</div><div class='add'>+		snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MCONTINUE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_pause = {</div><div class='add'>+static const struct action_ops snd_pcm_action_pause = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_pause,</div><div class='ctx'> 	.do_action = snd_pcm_do_pause,</div><div class='ctx'> 	.undo_action = snd_pcm_undo_pause,</div><div class='hunk'>@@ -1033,24 +1672,41 @@ static struct action_ops snd_pcm_action_pause = {</div><div class='ctx'> /*</div><div class='ctx'>  * Push/release the pause for all linked streams.</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_pause(struct snd_pcm_substream *substream, int push)</div><div class='add'>+static int snd_pcm_pause(struct snd_pcm_substream *substream, bool push)</div><div class='add'>+{</div><div class='add'>+	return snd_pcm_action(&amp;snd_pcm_action_pause, substream,</div><div class='add'>+			      (__force snd_pcm_state_t)push);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_pause_lock_irq(struct snd_pcm_substream *substream,</div><div class='add'>+				  bool push)</div><div class='ctx'> {</div><div class='del'>-	return snd_pcm_action(&amp;snd_pcm_action_pause, substream, push);</div><div class='add'>+	return snd_pcm_action_lock_irq(&amp;snd_pcm_action_pause, substream,</div><div class='add'>+				       (__force snd_pcm_state_t)push);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-/* suspend */</div><div class='add'>+/* suspend callback: state argument ignored */</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_pre_suspend(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_pre_suspend(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED)</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	/* unresumable PCM state; return -EBUSY for skipping suspend */</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+	case SNDRV_PCM_STATE_DISCONNECTED:</div><div class='ctx'> 		return -EBUSY;</div><div class='add'>+	}</div><div class='ctx'> 	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_suspend(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_suspend(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;trigger_master != substream)</div><div class='hunk'>@@ -1058,55 +1714,51 @@ static int snd_pcm_do_suspend(struct snd_pcm_substream *substream, int state)</div><div class='ctx'> 	if (! snd_pcm_running(substream))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);</div><div class='add'>+	runtime-&gt;stop_operating = true;</div><div class='ctx'> 	return 0; /* suspend unconditionally */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_suspend(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_suspend(struct snd_pcm_substream *substream,</div><div class='add'>+				 snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_trigger_tstamp(substream);</div><div class='del'>-	if (substream-&gt;timer)</div><div class='del'>-		snd_timer_notify(substream-&gt;timer, SNDRV_TIMER_EVENT_MSUSPEND,</div><div class='del'>-				 &amp;runtime-&gt;trigger_tstamp);</div><div class='del'>-	runtime-&gt;status-&gt;suspended_state = runtime-&gt;status-&gt;state;</div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_SUSPENDED;</div><div class='add'>+	runtime-&gt;suspended_state = runtime-&gt;state;</div><div class='add'>+	runtime-&gt;status-&gt;suspended_state = runtime-&gt;suspended_state;</div><div class='add'>+	__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_SUSPENDED);</div><div class='add'>+	snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSUSPEND);</div><div class='ctx'> 	wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 	wake_up(&amp;runtime-&gt;tsleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_suspend = {</div><div class='add'>+static const struct action_ops snd_pcm_action_suspend = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_suspend,</div><div class='ctx'> 	.do_action = snd_pcm_do_suspend,</div><div class='ctx'> 	.post_action = snd_pcm_post_suspend</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * snd_pcm_suspend - trigger SUSPEND to all linked streams</div><div class='ctx'>  * @substream: the PCM substream</div><div class='ctx'>  *</div><div class='ctx'>  * After this call, all streams are changed to SUSPENDED state.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='del'>-int snd_pcm_suspend(struct snd_pcm_substream *substream)</div><div class='add'>+static int snd_pcm_suspend(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (! substream)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irqsave(substream, flags);</div><div class='del'>-	err = snd_pcm_action(&amp;snd_pcm_action_suspend, substream, 0);</div><div class='del'>-	snd_pcm_stream_unlock_irqrestore(substream, flags);</div><div class='del'>-	return err;</div><div class='add'>+	guard(pcm_stream_lock_irqsave)(substream);</div><div class='add'>+	return snd_pcm_action(&amp;snd_pcm_action_suspend, substream,</div><div class='add'>+			      ACTION_ARG_IGNORE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_pcm_suspend);</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm</div><div class='ctx'>  * @pcm: the PCM instance</div><div class='ctx'>  *</div><div class='ctx'>  * After this call, all streams are changed to SUSPENDED state.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful (or @pcm is %NULL), or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_pcm_suspend_all(struct snd_pcm *pcm)</div><div class='ctx'> {</div><div class='hunk'>@@ -1116,64 +1768,76 @@ int snd_pcm_suspend_all(struct snd_pcm *pcm)</div><div class='ctx'> 	if (! pcm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	for (stream = 0; stream &lt; 2; stream++) {</div><div class='del'>-		for (substream = pcm-&gt;streams[stream].substream;</div><div class='del'>-		     substream; substream = substream-&gt;next) {</div><div class='del'>-			/* FIXME: the open/close code should lock this as well */</div><div class='del'>-			if (substream-&gt;runtime == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			err = snd_pcm_suspend(substream);</div><div class='del'>-			if (err &lt; 0 &amp;&amp; err != -EBUSY)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='add'>+	for_each_pcm_substream(pcm, stream, substream) {</div><div class='add'>+		/* FIXME: the open/close code should lock this as well */</div><div class='add'>+		if (!substream-&gt;runtime)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Skip BE dai link PCM's that are internal and may</div><div class='add'>+		 * not have their substream ops set.</div><div class='add'>+		 */</div><div class='add'>+		if (!substream-&gt;ops)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = snd_pcm_suspend(substream);</div><div class='add'>+		if (err &lt; 0 &amp;&amp; err != -EBUSY)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	for_each_pcm_substream(pcm, stream, substream)</div><div class='add'>+		snd_pcm_sync_stop(substream, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_suspend_all);</div><div class='ctx'> </div><div class='del'>-/* resume */</div><div class='add'>+/* resume callbacks: state argument ignored */</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_pre_resume(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_pre_resume(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	if (runtime-&gt;state != SNDRV_PCM_STATE_SUSPENDED)</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> 	if (!(runtime-&gt;info &amp; SNDRV_PCM_INFO_RESUME))</div><div class='ctx'> 		return -ENOSYS;</div><div class='ctx'> 	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_resume(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_resume(struct snd_pcm_substream *substream,</div><div class='add'>+			     snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (runtime-&gt;trigger_master != substream)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	/* DMA not running previously? */</div><div class='del'>-	if (runtime-&gt;status-&gt;suspended_state != SNDRV_PCM_STATE_RUNNING &amp;&amp;</div><div class='del'>-	    (runtime-&gt;status-&gt;suspended_state != SNDRV_PCM_STATE_DRAINING ||</div><div class='add'>+	if (runtime-&gt;suspended_state != SNDRV_PCM_STATE_RUNNING &amp;&amp;</div><div class='add'>+	    (runtime-&gt;suspended_state != SNDRV_PCM_STATE_DRAINING ||</div><div class='ctx'> 	     substream-&gt;stream != SNDRV_PCM_STREAM_PLAYBACK))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_RESUME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_undo_resume(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_undo_resume(struct snd_pcm_substream *substream,</div><div class='add'>+				snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;trigger_master == substream &amp;&amp;</div><div class='ctx'> 	    snd_pcm_running(substream))</div><div class='ctx'> 		substream-&gt;ops-&gt;trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_resume(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_resume(struct snd_pcm_substream *substream,</div><div class='add'>+				snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_trigger_tstamp(substream);</div><div class='del'>-	if (substream-&gt;timer)</div><div class='del'>-		snd_timer_notify(substream-&gt;timer, SNDRV_TIMER_EVENT_MRESUME,</div><div class='del'>-				 &amp;runtime-&gt;trigger_tstamp);</div><div class='del'>-	runtime-&gt;status-&gt;state = runtime-&gt;status-&gt;suspended_state;</div><div class='add'>+	__snd_pcm_set_state(runtime, runtime-&gt;suspended_state);</div><div class='add'>+	snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MRESUME);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_resume = {</div><div class='add'>+static const struct action_ops snd_pcm_action_resume = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_resume,</div><div class='ctx'> 	.do_action = snd_pcm_do_resume,</div><div class='ctx'> 	.undo_action = snd_pcm_undo_resume,</div><div class='hunk'>@@ -1182,14 +1846,8 @@ static struct action_ops snd_pcm_action_resume = {</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_resume(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) &gt;= 0)</div><div class='del'>-		res = snd_pcm_action_lock_irq(&amp;snd_pcm_action_resume, substream, 0);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	return res;</div><div class='add'>+	return snd_pcm_action_lock_irq(&amp;snd_pcm_action_resume, substream,</div><div class='add'>+				       ACTION_ARG_IGNORE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -1208,41 +1866,29 @@ static int snd_pcm_resume(struct snd_pcm_substream *substream)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_pcm_xrun(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int result;</div><div class='ctx'> </div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='del'>-		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-		if (result &lt; 0)</div><div class='del'>-			goto _unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='ctx'> 	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		result = 0;	/* already there */</div><div class='del'>-		break;</div><div class='add'>+		return 0;	/* already there */</div><div class='ctx'> 	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		result = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);</div><div class='del'>-		break;</div><div class='add'>+		__snd_pcm_xrun(substream);</div><div class='add'>+		return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EBADFD;</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>- _unlock:</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * reset ioctl</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_pre_reset(struct snd_pcm_substream *substream, int state)</div><div class='add'>+/* reset callbacks:  state argument ignored */</div><div class='add'>+static int snd_pcm_pre_reset(struct snd_pcm_substream *substream,</div><div class='add'>+			     snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='ctx'> 	case SNDRV_PCM_STATE_RUNNING:</div><div class='ctx'> 	case SNDRV_PCM_STATE_PREPARED:</div><div class='ctx'> 	case SNDRV_PCM_STATE_PAUSED:</div><div class='hunk'>@@ -1253,12 +1899,14 @@ static int snd_pcm_pre_reset(struct snd_pcm_substream *substream, int state)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_reset(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_reset(struct snd_pcm_substream *substream,</div><div class='add'>+			    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err = substream-&gt;ops-&gt;ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL);</div><div class='add'>+	int err = snd_pcm_ops_ioctl(substream, SNDRV_PCM_IOCTL1_RESET, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='ctx'> 	runtime-&gt;hw_ptr_base = 0;</div><div class='ctx'> 	runtime-&gt;hw_ptr_interrupt = runtime-&gt;status-&gt;hw_ptr -</div><div class='ctx'> 		runtime-&gt;status-&gt;hw_ptr % runtime-&gt;period_size;</div><div class='hunk'>@@ -1267,16 +1915,18 @@ static int snd_pcm_do_reset(struct snd_pcm_substream *substream, int state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_reset(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_reset(struct snd_pcm_substream *substream,</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='ctx'> 	runtime-&gt;control-&gt;appl_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='ctx'> 	    runtime-&gt;silence_size &gt; 0)</div><div class='ctx'> 		snd_pcm_playback_silence(substream, ULONG_MAX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_reset = {</div><div class='add'>+static const struct action_ops snd_pcm_action_reset = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_reset,</div><div class='ctx'> 	.do_action = snd_pcm_do_reset,</div><div class='ctx'> 	.post_action = snd_pcm_post_reset</div><div class='hunk'>@@ -1284,19 +1934,22 @@ static struct action_ops snd_pcm_action_reset = {</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_reset(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	return snd_pcm_action_nonatomic(&amp;snd_pcm_action_reset, substream, 0);</div><div class='add'>+	return snd_pcm_action_nonatomic(&amp;snd_pcm_action_reset, substream,</div><div class='add'>+					ACTION_ARG_IGNORE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * prepare ioctl</div><div class='ctx'>  */</div><div class='del'>-/* we use the second argument for updating f_flags */</div><div class='add'>+/* pass f_flags as state argument */</div><div class='ctx'> static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream,</div><div class='del'>-			       int f_flags)</div><div class='add'>+			       snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='del'>-	    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+	int f_flags = (__force int)state;</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (snd_pcm_running(substream))</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -1304,23 +1957,26 @@ static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_prepare(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_prepare(struct snd_pcm_substream *substream,</div><div class='add'>+			      snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	snd_pcm_sync_stop(substream, true);</div><div class='ctx'> 	err = substream-&gt;ops-&gt;prepare(substream);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	return snd_pcm_do_reset(substream, 0);</div><div class='add'>+	return snd_pcm_do_reset(substream, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_prepare(struct snd_pcm_substream *substream,</div><div class='add'>+				 snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	runtime-&gt;control-&gt;appl_ptr = runtime-&gt;status-&gt;hw_ptr;</div><div class='del'>-	runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_PREPARED;</div><div class='add'>+	snd_pcm_set_state(substream, SNDRV_PCM_STATE_PREPARED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_prepare = {</div><div class='add'>+static const struct action_ops snd_pcm_action_prepare = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_prepare,</div><div class='ctx'> 	.do_action = snd_pcm_do_prepare,</div><div class='ctx'> 	.post_action = snd_pcm_post_prepare</div><div class='hunk'>@@ -1330,12 +1986,12 @@ static struct action_ops snd_pcm_action_prepare = {</div><div class='ctx'>  * snd_pcm_prepare - prepare the PCM substream to be triggerable</div><div class='ctx'>  * @substream: the PCM substream instance</div><div class='ctx'>  * @file: file to refer f_flags</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> static int snd_pcm_prepare(struct snd_pcm_substream *substream,</div><div class='ctx'> 			   struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int res;</div><div class='del'>-	struct snd_card *card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> 	int f_flags;</div><div class='ctx'> </div><div class='ctx'> 	if (file)</div><div class='hunk'>@@ -1343,66 +1999,97 @@ static int snd_pcm_prepare(struct snd_pcm_substream *substream,</div><div class='ctx'> 	else</div><div class='ctx'> 		f_flags = substream-&gt;f_flags;</div><div class='ctx'> </div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) &gt;= 0)</div><div class='del'>-		res = snd_pcm_action_nonatomic(&amp;snd_pcm_action_prepare,</div><div class='del'>-					       substream, f_flags);</div><div class='del'>-	snd_power_unlock(card);</div><div class='del'>-	return res;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		switch (substream-&gt;runtime-&gt;state) {</div><div class='add'>+		case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+			snd_pcm_pause(substream, false);</div><div class='add'>+			fallthrough;</div><div class='add'>+		case SNDRV_PCM_STATE_SUSPENDED:</div><div class='add'>+			snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_pcm_action_nonatomic(&amp;snd_pcm_action_prepare,</div><div class='add'>+					substream,</div><div class='add'>+					(__force snd_pcm_state_t)f_flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * drain ioctl</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_pre_drain_init(struct snd_pcm_substream *substream, int state)</div><div class='add'>+/* drain init callbacks: state argument ignored */</div><div class='add'>+static int snd_pcm_pre_drain_init(struct snd_pcm_substream *substream,</div><div class='add'>+				  snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='del'>-	substream-&gt;runtime-&gt;trigger_master = substream;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_DISCONNECTED:</div><div class='add'>+	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+	runtime-&gt;trigger_master = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream,</div><div class='add'>+				 snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		switch (runtime-&gt;status-&gt;state) {</div><div class='add'>+		switch (runtime-&gt;state) {</div><div class='ctx'> 		case SNDRV_PCM_STATE_PREPARED:</div><div class='ctx'> 			/* start playback stream if possible */</div><div class='ctx'> 			if (! snd_pcm_playback_empty(substream)) {</div><div class='ctx'> 				snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);</div><div class='ctx'> 				snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);</div><div class='add'>+			} else {</div><div class='add'>+				__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-			runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_DRAINING;</div><div class='add'>+			__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_DRAINING);</div><div class='add'>+			break;</div><div class='add'>+		case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+			__snd_pcm_set_state(runtime, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* stop running stream */</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_RUNNING) {</div><div class='del'>-			int new_state = snd_pcm_capture_avail(runtime) &gt; 0 ?</div><div class='add'>+		if (runtime-&gt;state == SNDRV_PCM_STATE_RUNNING) {</div><div class='add'>+			snd_pcm_state_t new_state;</div><div class='add'>+</div><div class='add'>+			new_state = snd_pcm_capture_avail(runtime) &gt; 0 ?</div><div class='ctx'> 				SNDRV_PCM_STATE_DRAINING : SNDRV_PCM_STATE_SETUP;</div><div class='ctx'> 			snd_pcm_do_stop(substream, new_state);</div><div class='ctx'> 			snd_pcm_post_stop(substream, new_state);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_DRAINING &amp;&amp;</div><div class='add'>+	    runtime-&gt;trigger_master == substream &amp;&amp;</div><div class='add'>+	    (runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_DRAIN_TRIGGER))</div><div class='add'>+		return substream-&gt;ops-&gt;trigger(substream,</div><div class='add'>+					       SNDRV_PCM_TRIGGER_DRAIN);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_pcm_post_drain_init(struct snd_pcm_substream *substream, int state)</div><div class='add'>+static void snd_pcm_post_drain_init(struct snd_pcm_substream *substream,</div><div class='add'>+				    snd_pcm_state_t state)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct action_ops snd_pcm_action_drain_init = {</div><div class='add'>+static const struct action_ops snd_pcm_action_drain_init = {</div><div class='ctx'> 	.pre_action = snd_pcm_pre_drain_init,</div><div class='ctx'> 	.do_action = snd_pcm_do_drain_init,</div><div class='ctx'> 	.post_action = snd_pcm_post_drain_init</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_drop(struct snd_pcm_substream *substream);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Drain the stream(s).</div><div class='ctx'>  * When the substream is linked, sync until the draining of all playback streams</div><div class='hunk'>@@ -1416,39 +2103,31 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	struct snd_pcm_substream *s;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	struct snd_pcm_group *group;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	int nonblock = 0;</div><div class='ctx'> </div><div class='ctx'> 	card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> </div><div class='del'>-	snd_power_lock(card);</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED) {</div><div class='del'>-		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-		if (result &lt; 0) {</div><div class='del'>-			snd_power_unlock(card);</div><div class='del'>-			return result;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (file) {</div><div class='ctx'> 		if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 			nonblock = 1;</div><div class='ctx'> 	} else if (substream-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 		nonblock = 1;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;snd_pcm_link_rwsem);</div><div class='ctx'> 	snd_pcm_stream_lock_irq(substream);</div><div class='ctx'> 	/* resume pause */</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_PAUSED)</div><div class='del'>-		snd_pcm_pause(substream, 0);</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_PAUSED)</div><div class='add'>+		snd_pcm_pause(substream, false);</div><div class='ctx'> </div><div class='ctx'> 	/* pre-start/stop - all running streams are changed to DRAINING state */</div><div class='del'>-	result = snd_pcm_action(&amp;snd_pcm_action_drain_init, substream, 0);</div><div class='add'>+	result = snd_pcm_action(&amp;snd_pcm_action_drain_init, substream,</div><div class='add'>+				ACTION_ARG_IGNORE);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	/* in non-blocking, we don't wait in ioctl but let caller poll */</div><div class='hunk'>@@ -1466,33 +2145,55 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,</div><div class='ctx'> 		}</div><div class='ctx'> 		/* find a substream to drain */</div><div class='ctx'> 		to_check = NULL;</div><div class='add'>+		group = snd_pcm_stream_group_ref(substream);</div><div class='ctx'> 		snd_pcm_group_for_each_entry(s, substream) {</div><div class='ctx'> 			if (s-&gt;stream != SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			runtime = s-&gt;runtime;</div><div class='del'>-			if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='add'>+			if (runtime-&gt;state == SNDRV_PCM_STATE_DRAINING) {</div><div class='ctx'> 				to_check = runtime;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		snd_pcm_group_unref(group, substream);</div><div class='ctx'> 		if (!to_check)</div><div class='ctx'> 			break; /* all drained */</div><div class='ctx'> 		init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-		add_wait_queue(&amp;to_check-&gt;sleep, &amp;wait);</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='add'>+		add_wait_queue(&amp;to_check-&gt;sleep, &amp;wait);</div><div class='ctx'> 		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		up_read(&amp;snd_pcm_link_rwsem);</div><div class='del'>-		snd_power_unlock(card);</div><div class='del'>-		tout = schedule_timeout(10 * HZ);</div><div class='del'>-		snd_power_lock(card);</div><div class='del'>-		down_read(&amp;snd_pcm_link_rwsem);</div><div class='add'>+		if (runtime-&gt;no_period_wakeup)</div><div class='add'>+			tout = MAX_SCHEDULE_TIMEOUT;</div><div class='add'>+		else {</div><div class='add'>+			tout = 100;</div><div class='add'>+			if (runtime-&gt;rate) {</div><div class='add'>+				long t = runtime-&gt;buffer_size * 1100 / runtime-&gt;rate;</div><div class='add'>+				tout = max(t, tout);</div><div class='add'>+			}</div><div class='add'>+			tout = msecs_to_jiffies(tout);</div><div class='add'>+		}</div><div class='add'>+		tout = schedule_timeout(tout);</div><div class='add'>+</div><div class='ctx'> 		snd_pcm_stream_lock_irq(substream);</div><div class='del'>-		remove_wait_queue(&amp;to_check-&gt;sleep, &amp;wait);</div><div class='add'>+		group = snd_pcm_stream_group_ref(substream);</div><div class='add'>+		snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+			if (s-&gt;runtime == to_check) {</div><div class='add'>+				remove_wait_queue(&amp;to_check-&gt;sleep, &amp;wait);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		snd_pcm_group_unref(group, substream);</div><div class='add'>+</div><div class='add'>+		if (card-&gt;shutdown) {</div><div class='add'>+			result = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (tout == 0) {</div><div class='del'>-			if (substream-&gt;runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED)</div><div class='add'>+			if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_SUSPENDED)</div><div class='ctx'> 				result = -ESTRPIPE;</div><div class='ctx'> 			else {</div><div class='del'>-				snd_printd("playback drain error (DMA or IRQ trouble?)\n");</div><div class='add'>+				dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev,</div><div class='add'>+					"playback drain timeout (DMA or IRQ trouble?)\n");</div><div class='ctx'> 				snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> 				result = -EIO;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1502,8 +2203,6 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'>  unlock:</div><div class='ctx'> 	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	up_read(&amp;snd_pcm_link_rwsem);</div><div class='del'>-	snd_power_unlock(card);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -1516,55 +2215,44 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,</div><div class='ctx'> static int snd_pcm_drop(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-	struct snd_card *card;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	card = substream-&gt;pcm-&gt;card;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='del'>-	    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DISCONNECTED ||</div><div class='del'>-	    runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_SUSPENDED)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='ctx'> 	/* resume pause */</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_PAUSED)</div><div class='del'>-		snd_pcm_pause(substream, 0);</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_PAUSED)</div><div class='add'>+		snd_pcm_pause(substream, false);</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> 	/* runtime-&gt;control-&gt;appl_ptr = runtime-&gt;status-&gt;hw_ptr; */</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* WARNING: Don't forget to fput back the file */</div><div class='del'>-static struct file *snd_pcm_file_fd(int fd)</div><div class='add'>+static bool is_pcm_file(struct file *file)</div><div class='ctx'> {</div><div class='del'>-	struct file *file;</div><div class='del'>-	struct inode *inode;</div><div class='add'>+	struct inode *inode = file_inode(file);</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='ctx'> 	unsigned int minor;</div><div class='ctx'> </div><div class='del'>-	file = fget(fd);</div><div class='del'>-	if (!file)</div><div class='del'>-		return NULL;</div><div class='del'>-	inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='del'>-	if (!S_ISCHR(inode-&gt;i_mode) ||</div><div class='del'>-	    imajor(inode) != snd_major) {</div><div class='del'>-		fput(file);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='add'>+	if (!S_ISCHR(inode-&gt;i_mode) || imajor(inode) != snd_major)</div><div class='add'>+		return false;</div><div class='ctx'> 	minor = iminor(inode);</div><div class='del'>-	if (!snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK) &amp;&amp;</div><div class='del'>-	    !snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE)) {</div><div class='del'>-		fput(file);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return file;</div><div class='add'>+	pcm = snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK);</div><div class='add'>+	if (!pcm)</div><div class='add'>+		pcm = snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE);</div><div class='add'>+	if (!pcm)</div><div class='add'>+		return false;</div><div class='add'>+	snd_card_unref(pcm-&gt;card);</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1572,80 +2260,90 @@ static struct file *snd_pcm_file_fd(int fd)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)</div><div class='ctx'> {</div><div class='del'>-	int res = 0;</div><div class='del'>-	struct file *file;</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> 	struct snd_pcm_substream *substream1;</div><div class='add'>+	struct snd_pcm_group *group __free(kfree) = NULL;</div><div class='add'>+	struct snd_pcm_group *target_group;</div><div class='add'>+	bool nonatomic = substream-&gt;pcm-&gt;nonatomic;</div><div class='add'>+	CLASS(fd, f)(fd);</div><div class='ctx'> </div><div class='del'>-	file = snd_pcm_file_fd(fd);</div><div class='del'>-	if (!file)</div><div class='add'>+	if (fd_empty(f))</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	pcm_file = file-&gt;private_data;</div><div class='add'>+	if (!is_pcm_file(fd_file(f)))</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	pcm_file = fd_file(f)-&gt;private_data;</div><div class='ctx'> 	substream1 = pcm_file-&gt;substream;</div><div class='del'>-	down_write(&amp;snd_pcm_link_rwsem);</div><div class='del'>-	write_lock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	if (substream-&gt;runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='del'>-	    substream-&gt;runtime-&gt;status-&gt;state != substream1-&gt;runtime-&gt;status-&gt;state) {</div><div class='del'>-		res = -EBADFD;</div><div class='del'>-		goto _end;</div><div class='del'>-	}</div><div class='del'>-	if (snd_pcm_stream_linked(substream1)) {</div><div class='del'>-		res = -EALREADY;</div><div class='del'>-		goto _end;</div><div class='del'>-	}</div><div class='del'>-	if (!snd_pcm_stream_linked(substream)) {</div><div class='del'>-		substream-&gt;group = kmalloc(sizeof(struct snd_pcm_group), GFP_ATOMIC);</div><div class='del'>-		if (substream-&gt;group == NULL) {</div><div class='del'>-			res = -ENOMEM;</div><div class='del'>-			goto _end;</div><div class='add'>+</div><div class='add'>+	if (substream == substream1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	group = kzalloc(sizeof(*group), GFP_KERNEL);</div><div class='add'>+	if (!group)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_pcm_group_init(group);</div><div class='add'>+</div><div class='add'>+	guard(rwsem_write)(&amp;snd_pcm_link_rwsem);</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    substream-&gt;runtime-&gt;state != substream1-&gt;runtime-&gt;state ||</div><div class='add'>+	    substream-&gt;pcm-&gt;nonatomic != substream1-&gt;pcm-&gt;nonatomic)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	if (snd_pcm_stream_linked(substream1))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		if (!snd_pcm_stream_linked(substream)) {</div><div class='add'>+			snd_pcm_group_assign(substream, group);</div><div class='add'>+			group = NULL; /* assigned, don't free this one below */</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_init(&amp;substream-&gt;group-&gt;lock);</div><div class='del'>-		INIT_LIST_HEAD(&amp;substream-&gt;group-&gt;substreams);</div><div class='del'>-		list_add_tail(&amp;substream-&gt;link_list, &amp;substream-&gt;group-&gt;substreams);</div><div class='del'>-		substream-&gt;group-&gt;count = 1;</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;substream1-&gt;link_list, &amp;substream-&gt;group-&gt;substreams);</div><div class='del'>-	substream-&gt;group-&gt;count++;</div><div class='del'>-	substream1-&gt;group = substream-&gt;group;</div><div class='del'>- _end:</div><div class='del'>-	write_unlock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	up_write(&amp;snd_pcm_link_rwsem);</div><div class='del'>-	fput(file);</div><div class='del'>-	return res;</div><div class='add'>+		target_group = substream-&gt;group;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_group_lock_irq(target_group, nonatomic);</div><div class='add'>+	snd_pcm_stream_lock_nested(substream1);</div><div class='add'>+	snd_pcm_group_assign(substream1, target_group);</div><div class='add'>+	refcount_inc(&amp;target_group-&gt;refs);</div><div class='add'>+	snd_pcm_stream_unlock(substream1);</div><div class='add'>+	snd_pcm_group_unlock_irq(target_group, nonatomic);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void relink_to_local(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	substream-&gt;group = &amp;substream-&gt;self_group;</div><div class='del'>-	INIT_LIST_HEAD(&amp;substream-&gt;self_group.substreams);</div><div class='del'>-	list_add_tail(&amp;substream-&gt;link_list, &amp;substream-&gt;self_group.substreams);</div><div class='add'>+	snd_pcm_stream_lock_nested(substream);</div><div class='add'>+	snd_pcm_group_assign(substream, &amp;substream-&gt;self_group);</div><div class='add'>+	snd_pcm_stream_unlock(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_unlink(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *s;</div><div class='del'>-	int res = 0;</div><div class='add'>+	struct snd_pcm_group *group;</div><div class='add'>+	bool nonatomic = substream-&gt;pcm-&gt;nonatomic;</div><div class='add'>+	bool do_free = false;</div><div class='add'>+</div><div class='add'>+	guard(rwsem_write)(&amp;snd_pcm_link_rwsem);</div><div class='add'>+</div><div class='add'>+	if (!snd_pcm_stream_linked(substream))</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	group = substream-&gt;group;</div><div class='add'>+	snd_pcm_group_lock_irq(group, nonatomic);</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;snd_pcm_link_rwsem);</div><div class='del'>-	write_lock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	if (!snd_pcm_stream_linked(substream)) {</div><div class='del'>-		res = -EALREADY;</div><div class='del'>-		goto _end;</div><div class='del'>-	}</div><div class='del'>-	list_del(&amp;substream-&gt;link_list);</div><div class='del'>-	substream-&gt;group-&gt;count--;</div><div class='del'>-	if (substream-&gt;group-&gt;count == 1) {	/* detach the last stream, too */</div><div class='del'>-		snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-			relink_to_local(s);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		kfree(substream-&gt;group);</div><div class='del'>-	}</div><div class='ctx'> 	relink_to_local(substream);</div><div class='del'>-       _end:</div><div class='del'>-	write_unlock_irq(&amp;snd_pcm_link_rwlock);</div><div class='del'>-	up_write(&amp;snd_pcm_link_rwsem);</div><div class='del'>-	return res;</div><div class='add'>+	refcount_dec(&amp;group-&gt;refs);</div><div class='add'>+</div><div class='add'>+	/* detach the last stream, too */</div><div class='add'>+	if (list_is_singular(&amp;group-&gt;substreams)) {</div><div class='add'>+		relink_to_local(list_first_entry(&amp;group-&gt;substreams,</div><div class='add'>+						 struct snd_pcm_substream,</div><div class='add'>+						 link_list));</div><div class='add'>+		do_free = refcount_dec_and_test(&amp;group-&gt;refs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_group_unlock_irq(group, nonatomic);</div><div class='add'>+	if (do_free)</div><div class='add'>+		kfree(group);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1692,20 +2390,21 @@ static int snd_pcm_hw_rule_mulkdiv(struct snd_pcm_hw_params *params,</div><div class='ctx'> static int snd_pcm_hw_rule_format(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				  struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	unsigned int k;</div><div class='del'>-	struct snd_interval *i = hw_param_interval(params, rule-&gt;deps[0]);</div><div class='add'>+	snd_pcm_format_t k;</div><div class='add'>+	const struct snd_interval *i =</div><div class='add'>+				hw_param_interval_c(params, rule-&gt;deps[0]);</div><div class='ctx'> 	struct snd_mask m;</div><div class='ctx'> 	struct snd_mask *mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='ctx'> 	snd_mask_any(&amp;m);</div><div class='del'>-	for (k = 0; k &lt;= SNDRV_PCM_FORMAT_LAST; ++k) {</div><div class='add'>+	pcm_for_each_format(k) {</div><div class='ctx'> 		int bits;</div><div class='del'>-		if (! snd_mask_test(mask, k))</div><div class='add'>+		if (!snd_mask_test_format(mask, k))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		bits = snd_pcm_format_physical_width(k);</div><div class='ctx'> 		if (bits &lt;= 0)</div><div class='ctx'> 			continue; /* ignore invalid formats */</div><div class='ctx'> 		if ((unsigned)bits &lt; i-&gt;min || (unsigned)bits &gt; i-&gt;max)</div><div class='del'>-			snd_mask_reset(&amp;m, k);</div><div class='add'>+			snd_mask_reset(&amp;m, (__force unsigned)k);</div><div class='ctx'> 	}</div><div class='ctx'> 	return snd_mask_refine(mask, &amp;m);</div><div class='ctx'> }</div><div class='hunk'>@@ -1714,14 +2413,15 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,</div><div class='ctx'> 				       struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_interval t;</div><div class='del'>-	unsigned int k;</div><div class='add'>+	snd_pcm_format_t k;</div><div class='add'>+</div><div class='ctx'> 	t.min = UINT_MAX;</div><div class='ctx'> 	t.max = 0;</div><div class='ctx'> 	t.openmin = 0;</div><div class='ctx'> 	t.openmax = 0;</div><div class='del'>-	for (k = 0; k &lt;= SNDRV_PCM_FORMAT_LAST; ++k) {</div><div class='add'>+	pcm_for_each_format(k) {</div><div class='ctx'> 		int bits;</div><div class='del'>-		if (! snd_mask_test(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), k))</div><div class='add'>+		if (!snd_mask_test_format(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), k))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		bits = snd_pcm_format_physical_width(k);</div><div class='ctx'> 		if (bits &lt;= 0)</div><div class='hunk'>@@ -1735,12 +2435,18 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,</div><div class='ctx'> 	return snd_interval_refine(hw_param_interval(params, rule-&gt;var), &amp;t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if SNDRV_PCM_RATE_5512 != 1 &lt;&lt; 0 || SNDRV_PCM_RATE_192000 != 1 &lt;&lt; 12</div><div class='add'>+#if SNDRV_PCM_RATE_5512 != 1 &lt;&lt; 0 || SNDRV_PCM_RATE_192000 != 1 &lt;&lt; 12 ||\</div><div class='add'>+	SNDRV_PCM_RATE_128000 != 1 &lt;&lt; 19</div><div class='ctx'> #error "Change this table"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,</div><div class='del'>-                                 48000, 64000, 88200, 96000, 176400, 192000 };</div><div class='add'>+/* NOTE: the list is unsorted! */</div><div class='add'>+static const unsigned int rates[] = {</div><div class='add'>+	5512, 8000, 11025, 16000, 22050, 32000, 44100,</div><div class='add'>+	48000, 64000, 88200, 96000, 176400, 192000, 352800, 384000, 705600, 768000,</div><div class='add'>+	/* extended */</div><div class='add'>+	12000, 24000, 128000</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='hunk'>@@ -1769,7 +2475,42 @@ static int snd_pcm_hw_rule_buffer_bytes_max(struct snd_pcm_hw_params *params,</div><div class='ctx'> 	return snd_interval_refine(hw_param_interval(params, rule-&gt;var), &amp;t);</div><div class='ctx'> }		</div><div class='ctx'> </div><div class='del'>-int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream)</div><div class='add'>+static int snd_pcm_hw_rule_subformats(struct snd_pcm_hw_params *params,</div><div class='add'>+				      struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_mask *sfmask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_SUBFORMAT);</div><div class='add'>+	struct snd_mask *fmask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);</div><div class='add'>+	u32 *subformats = rule-&gt;private;</div><div class='add'>+	snd_pcm_format_t f;</div><div class='add'>+	struct snd_mask m;</div><div class='add'>+</div><div class='add'>+	snd_mask_none(&amp;m);</div><div class='add'>+	/* All PCMs support at least the default STD subformat. */</div><div class='add'>+	snd_mask_set(&amp;m, (__force unsigned)SNDRV_PCM_SUBFORMAT_STD);</div><div class='add'>+</div><div class='add'>+	pcm_for_each_format(f) {</div><div class='add'>+		if (!snd_mask_test(fmask, (__force unsigned)f))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (f == SNDRV_PCM_FORMAT_S32_LE &amp;&amp; *subformats)</div><div class='add'>+			m.bits[0] |= *subformats;</div><div class='add'>+		else if (snd_pcm_format_linear(f))</div><div class='add'>+			snd_mask_set(&amp;m, (__force unsigned)SNDRV_PCM_SUBFORMAT_MSBITS_MAX);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_mask_refine(sfmask, &amp;m);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_hw_constraint_subformats(struct snd_pcm_runtime *runtime,</div><div class='add'>+					   unsigned int cond, u32 *subformats)</div><div class='add'>+{</div><div class='add'>+	return snd_pcm_hw_rule_add(runtime, cond, -1,</div><div class='add'>+				   snd_pcm_hw_rule_subformats, (void *)subformats,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_SUBFORMAT,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_pcm_hw_constraints *constrs = &amp;runtime-&gt;hw_constraints;</div><div class='hunk'>@@ -1893,7 +2634,7 @@ int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='add'>+static int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='hunk'>@@ -1901,16 +2642,16 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned int mask = 0;</div><div class='ctx'> </div><div class='ctx'>         if (hw-&gt;info &amp; SNDRV_PCM_INFO_INTERLEAVED)</div><div class='del'>-		mask |= 1 &lt;&lt; SNDRV_PCM_ACCESS_RW_INTERLEAVED;</div><div class='add'>+		mask |= PARAM_MASK_BIT(SNDRV_PCM_ACCESS_RW_INTERLEAVED);</div><div class='ctx'>         if (hw-&gt;info &amp; SNDRV_PCM_INFO_NONINTERLEAVED)</div><div class='del'>-		mask |= 1 &lt;&lt; SNDRV_PCM_ACCESS_RW_NONINTERLEAVED;</div><div class='del'>-	if (hw-&gt;info &amp; SNDRV_PCM_INFO_MMAP) {</div><div class='add'>+		mask |= PARAM_MASK_BIT(SNDRV_PCM_ACCESS_RW_NONINTERLEAVED);</div><div class='add'>+	if (hw_support_mmap(substream)) {</div><div class='ctx'> 		if (hw-&gt;info &amp; SNDRV_PCM_INFO_INTERLEAVED)</div><div class='del'>-			mask |= 1 &lt;&lt; SNDRV_PCM_ACCESS_MMAP_INTERLEAVED;</div><div class='add'>+			mask |= PARAM_MASK_BIT(SNDRV_PCM_ACCESS_MMAP_INTERLEAVED);</div><div class='ctx'> 		if (hw-&gt;info &amp; SNDRV_PCM_INFO_NONINTERLEAVED)</div><div class='del'>-			mask |= 1 &lt;&lt; SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED;</div><div class='add'>+			mask |= PARAM_MASK_BIT(SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED);</div><div class='ctx'> 		if (hw-&gt;info &amp; SNDRV_PCM_INFO_COMPLEX)</div><div class='del'>-			mask |= 1 &lt;&lt; SNDRV_PCM_ACCESS_MMAP_COMPLEX;</div><div class='add'>+			mask |= PARAM_MASK_BIT(SNDRV_PCM_ACCESS_MMAP_COMPLEX);</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_ACCESS, mask);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1920,7 +2661,7 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_hw_constraint_mask(runtime, SNDRV_PCM_HW_PARAM_SUBFORMAT, 1 &lt;&lt; SNDRV_PCM_SUBFORMAT_STD);</div><div class='add'>+	err = snd_pcm_hw_constraint_subformats(runtime, 0, &amp;hw-&gt;subformats);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1959,7 +2700,7 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (runtime-&gt;dma_bytes) {</div><div class='ctx'> 		err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 0, runtime-&gt;dma_bytes);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(hw-&gt;rates &amp; (SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_CONTINUOUS))) {</div><div class='hunk'>@@ -1978,7 +2719,8 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static void pcm_release_private(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	snd_pcm_unlink(substream);</div><div class='add'>+	if (snd_pcm_stream_linked(substream))</div><div class='add'>+		snd_pcm_unlink(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_pcm_release_substream(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1989,20 +2731,19 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_drop(substream);</div><div class='ctx'> 	if (substream-&gt;hw_opened) {</div><div class='del'>-		if (substream-&gt;ops-&gt;hw_free != NULL)</div><div class='del'>-			substream-&gt;ops-&gt;hw_free(substream);</div><div class='add'>+		if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+			do_hw_free(substream);</div><div class='ctx'> 		substream-&gt;ops-&gt;close(substream);</div><div class='ctx'> 		substream-&gt;hw_opened = 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (pm_qos_request_active(&amp;substream-&gt;latency_pm_qos_req))</div><div class='del'>-		pm_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='add'>+	if (cpu_latency_qos_request_active(&amp;substream-&gt;latency_pm_qos_req))</div><div class='add'>+		cpu_latency_qos_remove_request(&amp;substream-&gt;latency_pm_qos_req);</div><div class='ctx'> 	if (substream-&gt;pcm_release) {</div><div class='ctx'> 		substream-&gt;pcm_release(substream);</div><div class='ctx'> 		substream-&gt;pcm_release = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_detach_substream(substream);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_release_substream);</div><div class='ctx'> </div><div class='ctx'> int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,</div><div class='hunk'>@@ -2022,21 +2763,29 @@ int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_constraints_init(substream);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("snd_pcm_hw_constraints_init failed\n");</div><div class='add'>+		pcm_dbg(pcm, "snd_pcm_hw_constraints_init failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = substream-&gt;ops-&gt;open(substream)) &lt; 0)</div><div class='add'>+	err = substream-&gt;ops-&gt;open(substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	substream-&gt;hw_opened = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_constraints_complete(substream);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("snd_pcm_hw_constraints_complete failed\n");</div><div class='add'>+		pcm_dbg(pcm, "snd_pcm_hw_constraints_complete failed\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* automatically set EXPLICIT_SYNC flag in the managed mode whenever</div><div class='add'>+	 * the DMA buffer requires it</div><div class='add'>+	 */</div><div class='add'>+	if (substream-&gt;managed_buffer_alloc &amp;&amp;</div><div class='add'>+	    substream-&gt;dma_buffer.dev.need_sync)</div><div class='add'>+		substream-&gt;runtime-&gt;hw.info |= SNDRV_PCM_INFO_EXPLICIT_SYNC;</div><div class='add'>+</div><div class='ctx'> 	*rsubstream = substream;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2044,22 +2793,16 @@ int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,</div><div class='ctx'> 	snd_pcm_release_substream(substream);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_open_substream);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_open_file(struct file *file,</div><div class='ctx'> 			     struct snd_pcm *pcm,</div><div class='del'>-			     int stream,</div><div class='del'>-			     struct snd_pcm_file **rpcm_file)</div><div class='add'>+			     int stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_str *str;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm_file)</div><div class='del'>-		*rpcm_file = NULL;</div><div class='del'>-</div><div class='ctx'> 	err = snd_pcm_open_substream(pcm, stream, file, &amp;substream);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2070,14 +2813,10 @@ static int snd_pcm_open_file(struct file *file,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	pcm_file-&gt;substream = substream;</div><div class='del'>-	if (substream-&gt;ref_count == 1) {</div><div class='del'>-		str = substream-&gt;pstr;</div><div class='del'>-		substream-&gt;file = pcm_file;</div><div class='add'>+	if (substream-&gt;ref_count == 1)</div><div class='ctx'> 		substream-&gt;pcm_release = pcm_release_private;</div><div class='del'>-	}</div><div class='ctx'> 	file-&gt;private_data = pcm_file;</div><div class='del'>-	if (rpcm_file)</div><div class='del'>-		*rpcm_file = pcm_file;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2089,7 +2828,10 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm = snd_lookup_minor_data(iminor(inode),</div><div class='ctx'> 				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);</div><div class='del'>-	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);</div><div class='add'>+	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);</div><div class='add'>+	if (pcm)</div><div class='add'>+		snd_card_unref(pcm-&gt;card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_capture_open(struct inode *inode, struct file *file)</div><div class='hunk'>@@ -2100,14 +2842,16 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm = snd_lookup_minor_data(iminor(inode),</div><div class='ctx'> 				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);</div><div class='del'>-	return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);</div><div class='add'>+	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);</div><div class='add'>+	if (pcm)</div><div class='add'>+		snd_card_unref(pcm-&gt;card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct snd_pcm_file *pcm_file;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	if (pcm == NULL) {</div><div class='ctx'> 		err = -ENODEV;</div><div class='hunk'>@@ -2124,7 +2868,7 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)</div><div class='ctx'> 	add_wait_queue(&amp;pcm-&gt;open_wait, &amp;wait);</div><div class='ctx'> 	mutex_lock(&amp;pcm-&gt;open_mutex);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		err = snd_pcm_open_file(file, pcm, stream, &amp;pcm_file);</div><div class='add'>+		err = snd_pcm_open_file(file, pcm, stream);</div><div class='ctx'> 		if (err &gt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (err == -EAGAIN) {</div><div class='hunk'>@@ -2138,6 +2882,10 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)</div><div class='ctx'> 		mutex_unlock(&amp;pcm-&gt;open_mutex);</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		mutex_lock(&amp;pcm-&gt;open_mutex);</div><div class='add'>+		if (pcm-&gt;card-&gt;shutdown) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			err = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -2168,319 +2916,335 @@ static int snd_pcm_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (snd_BUG_ON(!substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	pcm = substream-&gt;pcm;</div><div class='del'>-	mutex_lock(&amp;pcm-&gt;open_mutex);</div><div class='del'>-	snd_pcm_release_substream(substream);</div><div class='del'>-	kfree(pcm_file);</div><div class='del'>-	mutex_unlock(&amp;pcm-&gt;open_mutex);</div><div class='add'>+</div><div class='add'>+	/* block until the device gets woken up as it may touch the hardware */</div><div class='add'>+	snd_power_wait(pcm-&gt;card);</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;pcm-&gt;open_mutex) {</div><div class='add'>+		snd_pcm_release_substream(substream);</div><div class='add'>+		kfree(pcm_file);</div><div class='add'>+	}</div><div class='ctx'> 	wake_up(&amp;pcm-&gt;open_wait);</div><div class='ctx'> 	module_put(pcm-&gt;card-&gt;module);</div><div class='ctx'> 	snd_card_file_remove(pcm-&gt;card, file);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *substream,</div><div class='del'>-						 snd_pcm_uframes_t frames)</div><div class='add'>+/* check and update PCM state; return 0 or a negative error</div><div class='add'>+ * call this inside PCM lock</div><div class='add'>+ */</div><div class='add'>+static int do_pcm_hwsync(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_sframes_t appl_ptr;</div><div class='del'>-	snd_pcm_sframes_t ret;</div><div class='del'>-	snd_pcm_sframes_t hw_avail;</div><div class='del'>-</div><div class='del'>-	if (frames == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-		break;</div><div class='add'>+	switch (substream-&gt;runtime-&gt;state) {</div><div class='ctx'> 	case SNDRV_PCM_STATE_DRAINING:</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+			return -EBADFD;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if (snd_pcm_update_hw_ptr(substream) &gt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		ret = -EPIPE;</div><div class='del'>-		goto __end;</div><div class='add'>+		return snd_pcm_update_hw_ptr(substream);</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+	case SNDRV_PCM_STATE_PAUSED:</div><div class='add'>+		return 0;</div><div class='ctx'> 	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		ret = -ESTRPIPE;</div><div class='del'>-		goto __end;</div><div class='add'>+		return -ESTRPIPE;</div><div class='add'>+	case SNDRV_PCM_STATE_XRUN:</div><div class='add'>+		return -EPIPE;</div><div class='ctx'> 	default:</div><div class='del'>-		ret = -EBADFD;</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw_avail = snd_pcm_playback_hw_avail(runtime);</div><div class='del'>-	if (hw_avail &lt;= 0) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto __end;</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> 	}</div><div class='del'>-	if (frames &gt; (snd_pcm_uframes_t)hw_avail)</div><div class='del'>-		frames = hw_avail;</div><div class='del'>-	appl_ptr = runtime-&gt;control-&gt;appl_ptr - frames;</div><div class='del'>-	if (appl_ptr &lt; 0)</div><div class='del'>-		appl_ptr += runtime-&gt;boundary;</div><div class='del'>-	runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	ret = frames;</div><div class='del'>- __end:</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substream,</div><div class='del'>-						snd_pcm_uframes_t frames)</div><div class='add'>+/* increase the appl_ptr; returns the processed frames or a negative error */</div><div class='add'>+static snd_pcm_sframes_t forward_appl_ptr(struct snd_pcm_substream *substream,</div><div class='add'>+					  snd_pcm_uframes_t frames,</div><div class='add'>+					   snd_pcm_sframes_t avail)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	snd_pcm_sframes_t appl_ptr;</div><div class='del'>-	snd_pcm_sframes_t ret;</div><div class='del'>-	snd_pcm_sframes_t hw_avail;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (frames == 0)</div><div class='add'>+	if (avail &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (frames &gt; (snd_pcm_uframes_t)avail)</div><div class='add'>+		frames = avail;</div><div class='add'>+	appl_ptr = runtime-&gt;control-&gt;appl_ptr + frames;</div><div class='add'>+	if (appl_ptr &gt;= (snd_pcm_sframes_t)runtime-&gt;boundary)</div><div class='add'>+		appl_ptr -= runtime-&gt;boundary;</div><div class='add'>+	ret = pcm_lib_apply_appl_ptr(substream, appl_ptr);</div><div class='add'>+	return ret &lt; 0 ? ret : frames;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if (snd_pcm_update_hw_ptr(substream) &gt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		ret = -EPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		ret = -ESTRPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EBADFD;</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='add'>+/* decrease the appl_ptr; returns the processed frames or zero for error */</div><div class='add'>+static snd_pcm_sframes_t rewind_appl_ptr(struct snd_pcm_substream *substream,</div><div class='add'>+					 snd_pcm_uframes_t frames,</div><div class='add'>+					 snd_pcm_sframes_t avail)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	snd_pcm_sframes_t appl_ptr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	hw_avail = snd_pcm_capture_hw_avail(runtime);</div><div class='del'>-	if (hw_avail &lt;= 0) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='del'>-	if (frames &gt; (snd_pcm_uframes_t)hw_avail)</div><div class='del'>-		frames = hw_avail;</div><div class='add'>+	if (avail &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	if (frames &gt; (snd_pcm_uframes_t)avail)</div><div class='add'>+		frames = avail;</div><div class='ctx'> 	appl_ptr = runtime-&gt;control-&gt;appl_ptr - frames;</div><div class='ctx'> 	if (appl_ptr &lt; 0)</div><div class='ctx'> 		appl_ptr += runtime-&gt;boundary;</div><div class='del'>-	runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	ret = frames;</div><div class='del'>- __end:</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	return ret;</div><div class='add'>+	ret = pcm_lib_apply_appl_ptr(substream, appl_ptr);</div><div class='add'>+	/* NOTE: we return zero for errors because PulseAudio gets depressed</div><div class='add'>+	 * upon receiving an error from rewind ioctl and stops processing</div><div class='add'>+	 * any longer.  Returning zero means that no rewind is done, so</div><div class='add'>+	 * it's not absolutely wrong to answer like that.</div><div class='add'>+	 */</div><div class='add'>+	return ret &lt; 0 ? 0 : frames;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *substream,</div><div class='del'>-						  snd_pcm_uframes_t frames)</div><div class='add'>+static snd_pcm_sframes_t snd_pcm_rewind(struct snd_pcm_substream *substream,</div><div class='add'>+					snd_pcm_uframes_t frames)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_sframes_t appl_ptr;</div><div class='ctx'> 	snd_pcm_sframes_t ret;</div><div class='del'>-	snd_pcm_sframes_t avail;</div><div class='ctx'> </div><div class='ctx'> 	if (frames == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if (snd_pcm_update_hw_ptr(substream) &gt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		ret = -EPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		ret = -ESTRPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EBADFD;</div><div class='del'>-		goto __end;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		ret = do_pcm_hwsync(substream);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = rewind_appl_ptr(substream, frames,</div><div class='add'>+					      snd_pcm_hw_avail(substream));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-	if (avail &lt;= 0) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='del'>-	if (frames &gt; (snd_pcm_uframes_t)avail)</div><div class='del'>-		frames = avail;</div><div class='del'>-	appl_ptr = runtime-&gt;control-&gt;appl_ptr + frames;</div><div class='del'>-	if (appl_ptr &gt;= (snd_pcm_sframes_t)runtime-&gt;boundary)</div><div class='del'>-		appl_ptr -= runtime-&gt;boundary;</div><div class='del'>-	runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	ret = frames;</div><div class='del'>- __end:</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *substream,</div><div class='del'>-						 snd_pcm_uframes_t frames)</div><div class='add'>+static snd_pcm_sframes_t snd_pcm_forward(struct snd_pcm_substream *substream,</div><div class='add'>+					 snd_pcm_uframes_t frames)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_sframes_t appl_ptr;</div><div class='ctx'> 	snd_pcm_sframes_t ret;</div><div class='del'>-	snd_pcm_sframes_t avail;</div><div class='ctx'> </div><div class='ctx'> 	if (frames == 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if (snd_pcm_update_hw_ptr(substream) &gt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		ret = -EPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		ret = -ESTRPIPE;</div><div class='del'>-		goto __end;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EBADFD;</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	avail = snd_pcm_capture_avail(runtime);</div><div class='del'>-	if (avail &lt;= 0) {</div><div class='del'>-		ret = 0;</div><div class='del'>-		goto __end;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		ret = do_pcm_hwsync(substream);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = forward_appl_ptr(substream, frames,</div><div class='add'>+					       snd_pcm_avail(substream));</div><div class='ctx'> 	}</div><div class='del'>-	if (frames &gt; (snd_pcm_uframes_t)avail)</div><div class='del'>-		frames = avail;</div><div class='del'>-	appl_ptr = runtime-&gt;control-&gt;appl_ptr + frames;</div><div class='del'>-	if (appl_ptr &gt;= (snd_pcm_sframes_t)runtime-&gt;boundary)</div><div class='del'>-		appl_ptr -= runtime-&gt;boundary;</div><div class='del'>-	runtime-&gt;control-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	ret = frames;</div><div class='del'>- __end:</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_pcm_hwsync(struct snd_pcm_substream *substream)</div><div class='add'>+static int snd_pcm_delay(struct snd_pcm_substream *substream,</div><div class='add'>+			 snd_pcm_sframes_t *delay)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='del'>-			goto __badfd;</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if ((err = snd_pcm_update_hw_ptr(substream)) &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		err = 0;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		err = -EPIPE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	      __badfd:</div><div class='del'>-		err = -EBADFD;</div><div class='del'>-		break;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		err = do_pcm_hwsync(substream);</div><div class='add'>+		if (delay &amp;&amp; !err)</div><div class='add'>+			*delay = snd_pcm_calc_delay(substream);</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='add'>+	snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_CPU);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> 		</div><div class='del'>-static int snd_pcm_delay(struct snd_pcm_substream *substream,</div><div class='del'>-			 snd_pcm_sframes_t __user *res)</div><div class='add'>+static inline int snd_pcm_hwsync(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int err;</div><div class='del'>-	snd_pcm_sframes_t n = 0;</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='del'>-			goto __badfd;</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-		if ((err = snd_pcm_update_hw_ptr(substream)) &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_SUSPENDED:</div><div class='del'>-		err = 0;</div><div class='del'>-		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-			n = snd_pcm_playback_hw_avail(runtime);</div><div class='del'>-		else</div><div class='del'>-			n = snd_pcm_capture_avail(runtime);</div><div class='del'>-		n += runtime-&gt;delay;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STATE_XRUN:</div><div class='del'>-		err = -EPIPE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	      __badfd:</div><div class='del'>-		err = -EBADFD;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	if (!err)</div><div class='del'>-		if (put_user(n, res))</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	return err;</div><div class='add'>+	return snd_pcm_delay(substream, NULL);</div><div class='ctx'> }</div><div class='del'>-		</div><div class='add'>+</div><div class='add'>+#define snd_pcm_sync_ptr_get_user(__f, __c, __ptr) ({				\</div><div class='add'>+	__label__ failed, failed_begin;						\</div><div class='add'>+	int __err = -EFAULT;							\</div><div class='add'>+	typeof(*(__ptr)) __user *__src = (__ptr);				\</div><div class='add'>+										\</div><div class='add'>+	if (!user_read_access_begin(__src, sizeof(*__src)))			\</div><div class='add'>+		goto failed_begin;						\</div><div class='add'>+	unsafe_get_user(__f, &amp;__src-&gt;flags, failed);				\</div><div class='add'>+	unsafe_get_user(__c.appl_ptr, &amp;__src-&gt;c.control.appl_ptr, failed);	\</div><div class='add'>+	unsafe_get_user(__c.avail_min, &amp;__src-&gt;c.control.avail_min, failed);	\</div><div class='add'>+	__err = 0;								\</div><div class='add'>+failed:										\</div><div class='add'>+	user_read_access_end();							\</div><div class='add'>+failed_begin:									\</div><div class='add'>+	__err;									\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+#define snd_pcm_sync_ptr_put_user(__s, __c, __ptr) ({				\</div><div class='add'>+	__label__ failed, failed_begin;						\</div><div class='add'>+	int __err = -EFAULT;							\</div><div class='add'>+	typeof(*(__ptr)) __user *__src = (__ptr);				\</div><div class='add'>+										\</div><div class='add'>+	if (!user_write_access_begin(__src, sizeof(*__src)))			\</div><div class='add'>+		goto failed_begin;						\</div><div class='add'>+	unsafe_put_user(__s.state, &amp;__src-&gt;s.status.state, failed);		\</div><div class='add'>+	unsafe_put_user(__s.hw_ptr, &amp;__src-&gt;s.status.hw_ptr, failed);		\</div><div class='add'>+	unsafe_put_user(__s.tstamp.tv_sec, &amp;__src-&gt;s.status.tstamp.tv_sec, failed);		\</div><div class='add'>+	unsafe_put_user(__s.tstamp.tv_nsec, &amp;__src-&gt;s.status.tstamp.tv_nsec, failed);		\</div><div class='add'>+	unsafe_put_user(__s.suspended_state, &amp;__src-&gt;s.status.suspended_state, failed);		\</div><div class='add'>+	unsafe_put_user(__s.audio_tstamp.tv_sec, &amp;__src-&gt;s.status.audio_tstamp.tv_sec, failed);	\</div><div class='add'>+	unsafe_put_user(__s.audio_tstamp.tv_nsec, &amp;__src-&gt;s.status.audio_tstamp.tv_nsec, failed);\</div><div class='add'>+	unsafe_put_user(__c.appl_ptr, &amp;__src-&gt;c.control.appl_ptr, failed);	\</div><div class='add'>+	unsafe_put_user(__c.avail_min, &amp;__src-&gt;c.control.avail_min, failed);	\</div><div class='add'>+	__err = 0;								\</div><div class='add'>+failed:										\</div><div class='add'>+	user_write_access_end();						\</div><div class='add'>+failed_begin:									\</div><div class='add'>+	__err;									\</div><div class='add'>+})</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream,</div><div class='ctx'> 			    struct snd_pcm_sync_ptr __user *_sync_ptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_pcm_sync_ptr sync_ptr;</div><div class='ctx'> 	volatile struct snd_pcm_mmap_status *status;</div><div class='ctx'> 	volatile struct snd_pcm_mmap_control *control;</div><div class='add'>+	u32 sflags;</div><div class='add'>+	struct snd_pcm_mmap_control scontrol;</div><div class='add'>+	struct snd_pcm_mmap_status sstatus;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;sync_ptr, 0, sizeof(sync_ptr));</div><div class='del'>-	if (get_user(sync_ptr.flags, (unsigned __user *)&amp;(_sync_ptr-&gt;flags)))</div><div class='add'>+	if (snd_pcm_sync_ptr_get_user(sflags, scontrol, _sync_ptr))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (copy_from_user(&amp;sync_ptr.c.control, &amp;(_sync_ptr-&gt;c.control), sizeof(struct snd_pcm_mmap_control)))</div><div class='del'>-		return -EFAULT;	</div><div class='ctx'> 	status = runtime-&gt;status;</div><div class='ctx'> 	control = runtime-&gt;control;</div><div class='del'>-	if (sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_HWSYNC) {</div><div class='add'>+	if (sflags &amp; SNDRV_PCM_SYNC_PTR_HWSYNC) {</div><div class='ctx'> 		err = snd_pcm_hwsync(substream);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	if (!(sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='del'>-		control-&gt;appl_ptr = sync_ptr.c.control.appl_ptr;</div><div class='del'>-	else</div><div class='del'>-		sync_ptr.c.control.appl_ptr = control-&gt;appl_ptr;</div><div class='del'>-	if (!(sync_ptr.flags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='del'>-		control-&gt;avail_min = sync_ptr.c.control.avail_min;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL)) {</div><div class='add'>+			err = pcm_lib_apply_appl_ptr(substream, scontrol.appl_ptr);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			scontrol.appl_ptr = control-&gt;appl_ptr;</div><div class='add'>+		}</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='add'>+			control-&gt;avail_min = scontrol.avail_min;</div><div class='add'>+		else</div><div class='add'>+			scontrol.avail_min = control-&gt;avail_min;</div><div class='add'>+		sstatus.state = status-&gt;state;</div><div class='add'>+		sstatus.hw_ptr = status-&gt;hw_ptr;</div><div class='add'>+		sstatus.tstamp = status-&gt;tstamp;</div><div class='add'>+		sstatus.suspended_state = status-&gt;suspended_state;</div><div class='add'>+		sstatus.audio_tstamp = status-&gt;audio_tstamp;</div><div class='add'>+	}</div><div class='add'>+	if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='add'>+	if (snd_pcm_sync_ptr_put_user(sstatus, scontrol, _sync_ptr))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct snd_pcm_mmap_status32 {</div><div class='add'>+	snd_pcm_state_t state;</div><div class='add'>+	s32 pad1;</div><div class='add'>+	u32 hw_ptr;</div><div class='add'>+	struct __snd_timespec tstamp;</div><div class='add'>+	snd_pcm_state_t suspended_state;</div><div class='add'>+	struct __snd_timespec audio_tstamp;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct snd_pcm_mmap_control32 {</div><div class='add'>+	u32 appl_ptr;</div><div class='add'>+	u32 avail_min;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_pcm_sync_ptr32 {</div><div class='add'>+	u32 flags;</div><div class='add'>+	union {</div><div class='add'>+		struct snd_pcm_mmap_status32 status;</div><div class='add'>+		unsigned char reserved[64];</div><div class='add'>+	} s;</div><div class='add'>+	union {</div><div class='add'>+		struct snd_pcm_mmap_control32 control;</div><div class='add'>+		unsigned char reserved[64];</div><div class='add'>+	} c;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* recalculate the boundary within 32bit */</div><div class='add'>+static snd_pcm_uframes_t recalculate_boundary(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_uframes_t boundary;</div><div class='add'>+	snd_pcm_uframes_t border;</div><div class='add'>+	int order;</div><div class='add'>+</div><div class='add'>+	if (! runtime-&gt;buffer_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	border = 0x7fffffffUL - runtime-&gt;buffer_size;</div><div class='add'>+	if (runtime-&gt;buffer_size &gt; border)</div><div class='add'>+		return runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	order = __fls(border) - __fls(runtime-&gt;buffer_size);</div><div class='add'>+	boundary = runtime-&gt;buffer_size &lt;&lt; order;</div><div class='add'>+</div><div class='add'>+	if (boundary &lt;= border)</div><div class='add'>+		return boundary;</div><div class='ctx'> 	else</div><div class='del'>-		sync_ptr.c.control.avail_min = control-&gt;avail_min;</div><div class='del'>-	sync_ptr.s.status.state = status-&gt;state;</div><div class='del'>-	sync_ptr.s.status.hw_ptr = status-&gt;hw_ptr;</div><div class='del'>-	sync_ptr.s.status.tstamp = status-&gt;tstamp;</div><div class='del'>-	sync_ptr.s.status.suspended_state = status-&gt;suspended_state;</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	if (copy_to_user(_sync_ptr, &amp;sync_ptr, sizeof(sync_ptr)))</div><div class='add'>+		return boundary / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,</div><div class='add'>+					 struct snd_pcm_sync_ptr32 __user *src)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	volatile struct snd_pcm_mmap_status *status;</div><div class='add'>+	volatile struct snd_pcm_mmap_control *control;</div><div class='add'>+	u32 sflags;</div><div class='add'>+	struct snd_pcm_mmap_control scontrol;</div><div class='add'>+	struct snd_pcm_mmap_status sstatus;</div><div class='add'>+	snd_pcm_uframes_t boundary;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!runtime))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (snd_pcm_sync_ptr_get_user(sflags, scontrol, src))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (sflags &amp; SNDRV_PCM_SYNC_PTR_HWSYNC) {</div><div class='add'>+		err = snd_pcm_hwsync(substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	status = runtime-&gt;status;</div><div class='add'>+	control = runtime-&gt;control;</div><div class='add'>+	boundary = recalculate_boundary(runtime);</div><div class='add'>+	if (! boundary)</div><div class='add'>+		boundary = 0x7fffffff;</div><div class='add'>+	scoped_guard(pcm_stream_lock_irq, substream) {</div><div class='add'>+		/* FIXME: we should consider the boundary for the sync from app */</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL)) {</div><div class='add'>+			err = pcm_lib_apply_appl_ptr(substream,</div><div class='add'>+						     scontrol.appl_ptr);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else</div><div class='add'>+			scontrol.appl_ptr = control-&gt;appl_ptr % boundary;</div><div class='add'>+		if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_AVAIL_MIN))</div><div class='add'>+			control-&gt;avail_min = scontrol.avail_min;</div><div class='add'>+		else</div><div class='add'>+			scontrol.avail_min = control-&gt;avail_min;</div><div class='add'>+		sstatus.state = status-&gt;state;</div><div class='add'>+		sstatus.hw_ptr = status-&gt;hw_ptr % boundary;</div><div class='add'>+		sstatus.tstamp = status-&gt;tstamp;</div><div class='add'>+		sstatus.suspended_state = status-&gt;suspended_state;</div><div class='add'>+		sstatus.audio_tstamp = status-&gt;audio_tstamp;</div><div class='add'>+	}</div><div class='add'>+	if (!(sflags &amp; SNDRV_PCM_SYNC_PTR_APPL))</div><div class='add'>+		snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);</div><div class='add'>+	if (snd_pcm_sync_ptr_put_user(sstatus, scontrol, src))</div><div class='ctx'> 		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#define __SNDRV_PCM_IOCTL_SYNC_PTR32 _IOWR('A', 0x23, struct snd_pcm_sync_ptr32)</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -2491,16 +3255,110 @@ static int snd_pcm_tstamp(struct snd_pcm_substream *substream, int __user *_arg)</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (arg &lt; 0 || arg &gt; SNDRV_PCM_TSTAMP_TYPE_LAST)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	runtime-&gt;tstamp_type = SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY;</div><div class='del'>-	if (arg == SNDRV_PCM_TSTAMP_TYPE_MONOTONIC)</div><div class='del'>-		runtime-&gt;tstamp_type = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;</div><div class='add'>+	runtime-&gt;tstamp_type = arg;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-		</div><div class='del'>-static int snd_pcm_common_ioctl1(struct file *file,</div><div class='add'>+</div><div class='add'>+static int snd_pcm_xferi_frames_ioctl(struct snd_pcm_substream *substream,</div><div class='add'>+				      struct snd_xferi __user *_xferi)</div><div class='add'>+{</div><div class='add'>+	struct snd_xferi xferi;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	snd_pcm_sframes_t result;</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	if (put_user(0, &amp;_xferi-&gt;result))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_from_user(&amp;xferi, _xferi, sizeof(xferi)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		result = snd_pcm_lib_write(substream, xferi.buf, xferi.frames);</div><div class='add'>+	else</div><div class='add'>+		result = snd_pcm_lib_read(substream, xferi.buf, xferi.frames);</div><div class='add'>+	if (put_user(result, &amp;_xferi-&gt;result))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return result &lt; 0 ? result : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_xfern_frames_ioctl(struct snd_pcm_substream *substream,</div><div class='add'>+				      struct snd_xfern __user *_xfern)</div><div class='add'>+{</div><div class='add'>+	struct snd_xfern xfern;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	void *bufs __free(kfree) = NULL;</div><div class='add'>+	snd_pcm_sframes_t result;</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	if (runtime-&gt;channels &gt; 128)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (put_user(0, &amp;_xfern-&gt;result))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (copy_from_user(&amp;xfern, _xfern, sizeof(xfern)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	bufs = memdup_array_user(xfern.bufs, runtime-&gt;channels, sizeof(void *));</div><div class='add'>+	if (IS_ERR(bufs))</div><div class='add'>+		return PTR_ERR(bufs);</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		result = snd_pcm_lib_writev(substream, bufs, xfern.frames);</div><div class='add'>+	else</div><div class='add'>+		result = snd_pcm_lib_readv(substream, bufs, xfern.frames);</div><div class='add'>+	if (put_user(result, &amp;_xfern-&gt;result))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return result &lt; 0 ? result : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_rewind_ioctl(struct snd_pcm_substream *substream,</div><div class='add'>+				snd_pcm_uframes_t __user *_frames)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_uframes_t frames;</div><div class='add'>+	snd_pcm_sframes_t result;</div><div class='add'>+</div><div class='add'>+	if (get_user(frames, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (put_user(0, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	result = snd_pcm_rewind(substream, frames);</div><div class='add'>+	if (put_user(result, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return result &lt; 0 ? result : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_forward_ioctl(struct snd_pcm_substream *substream,</div><div class='add'>+				 snd_pcm_uframes_t __user *_frames)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_uframes_t frames;</div><div class='add'>+	snd_pcm_sframes_t result;</div><div class='add'>+</div><div class='add'>+	if (get_user(frames, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (put_user(0, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	result = snd_pcm_forward(substream, frames);</div><div class='add'>+	if (put_user(result, _frames))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return result &lt; 0 ? result : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcm_common_ioctl(struct file *file,</div><div class='ctx'> 				 struct snd_pcm_substream *substream,</div><div class='ctx'> 				 unsigned int cmd, void __user *arg)</div><div class='ctx'> {</div><div class='add'>+	struct snd_pcm_file *pcm_file = file-&gt;private_data;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (PCM_RUNTIME_CHECK(substream))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	res = snd_power_wait(substream-&gt;pcm-&gt;card);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_PVERSION:</div><div class='ctx'> 		return put_user(SNDRV_PCM_VERSION, (int __user *)arg) ? -EFAULT : 0;</div><div class='hunk'>@@ -2510,6 +3368,11 @@ static int snd_pcm_common_ioctl1(struct file *file,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_TTSTAMP:</div><div class='ctx'> 		return snd_pcm_tstamp(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL_USER_PVERSION:</div><div class='add'>+		if (get_user(pcm_file-&gt;user_pversion,</div><div class='add'>+			     (unsigned int __user *)arg))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HW_REFINE:</div><div class='ctx'> 		return snd_pcm_hw_refine_user(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HW_PARAMS:</div><div class='hunk'>@@ -2518,8 +3381,14 @@ static int snd_pcm_common_ioctl1(struct file *file,</div><div class='ctx'> 		return snd_pcm_hw_free(substream);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_SW_PARAMS:</div><div class='ctx'> 		return snd_pcm_sw_params_user(substream, arg);</div><div class='del'>-	case SNDRV_PCM_IOCTL_STATUS:</div><div class='del'>-		return snd_pcm_status_user(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS32:</div><div class='add'>+		return snd_pcm_status_user32(substream, arg, false);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_EXT32:</div><div class='add'>+		return snd_pcm_status_user32(substream, arg, true);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS64:</div><div class='add'>+		return snd_pcm_status_user64(substream, arg, false);</div><div class='add'>+	case SNDRV_PCM_IOCTL_STATUS_EXT64:</div><div class='add'>+		return snd_pcm_status_user64(substream, arg, true);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_CHANNEL_INFO:</div><div class='ctx'> 		return snd_pcm_channel_info_user(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_PREPARE:</div><div class='hunk'>@@ -2527,7 +3396,7 @@ static int snd_pcm_common_ioctl1(struct file *file,</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_RESET:</div><div class='ctx'> 		return snd_pcm_reset(substream);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_START:</div><div class='del'>-		return snd_pcm_action_lock_irq(&amp;snd_pcm_action_start, substream, SNDRV_PCM_STATE_RUNNING);</div><div class='add'>+		return snd_pcm_start_lock_irq(substream);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_LINK:</div><div class='ctx'> 		return snd_pcm_link(substream, (int)(unsigned long) arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_UNLINK:</div><div class='hunk'>@@ -2539,8 +3408,21 @@ static int snd_pcm_common_ioctl1(struct file *file,</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HWSYNC:</div><div class='ctx'> 		return snd_pcm_hwsync(substream);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_DELAY:</div><div class='del'>-		return snd_pcm_delay(substream, arg);</div><div class='del'>-	case SNDRV_PCM_IOCTL_SYNC_PTR:</div><div class='add'>+	{</div><div class='add'>+		snd_pcm_sframes_t delay = 0;</div><div class='add'>+		snd_pcm_sframes_t __user *res = arg;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = snd_pcm_delay(substream, &amp;delay);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		if (put_user(delay, res))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case __SNDRV_PCM_IOCTL_SYNC_PTR32:</div><div class='add'>+		return snd_pcm_ioctl_sync_ptr_compat(substream, arg);</div><div class='add'>+	case __SNDRV_PCM_IOCTL_SYNC_PTR64:</div><div class='ctx'> 		return snd_pcm_sync_ptr(substream, arg);</div><div class='ctx'> #ifdef CONFIG_SND_SUPPORT_OLD_API</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_HW_REFINE_OLD:</div><div class='hunk'>@@ -2553,194 +3435,24 @@ static int snd_pcm_common_ioctl1(struct file *file,</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_DROP:</div><div class='ctx'> 		return snd_pcm_drop(substream);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_PAUSE:</div><div class='del'>-	{</div><div class='del'>-		int res;</div><div class='del'>-		snd_pcm_stream_lock_irq(substream);</div><div class='del'>-		res = snd_pcm_pause(substream, (int)(unsigned long)arg);</div><div class='del'>-		snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-		return res;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-	snd_printd("unknown ioctl = 0x%x\n", cmd);</div><div class='del'>-	return -ENOTTY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_pcm_playback_ioctl1(struct file *file,</div><div class='del'>-				   struct snd_pcm_substream *substream,</div><div class='del'>-				   unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(!substream))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (snd_BUG_ON(substream-&gt;stream != SNDRV_PCM_STREAM_PLAYBACK))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	switch (cmd) {</div><div class='add'>+		return snd_pcm_pause_lock_irq(substream, (unsigned long)arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_WRITEI_FRAMES:</div><div class='del'>-	{</div><div class='del'>-		struct snd_xferi xferi;</div><div class='del'>-		struct snd_xferi __user *_xferi = arg;</div><div class='del'>-		struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-			return -EBADFD;</div><div class='del'>-		if (put_user(0, &amp;_xferi-&gt;result))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;xferi, _xferi, sizeof(xferi)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_lib_write(substream, xferi.buf, xferi.frames);</div><div class='del'>-		__put_user(result, &amp;_xferi-&gt;result);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='del'>-	case SNDRV_PCM_IOCTL_WRITEN_FRAMES:</div><div class='del'>-	{</div><div class='del'>-		struct snd_xfern xfern;</div><div class='del'>-		struct snd_xfern __user *_xfern = arg;</div><div class='del'>-		struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-		void __user **bufs;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-			return -EBADFD;</div><div class='del'>-		if (runtime-&gt;channels &gt; 128)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (put_user(0, &amp;_xfern-&gt;result))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;xfern, _xfern, sizeof(xfern)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		bufs = memdup_user(xfern.bufs,</div><div class='del'>-				   sizeof(void *) * runtime-&gt;channels);</div><div class='del'>-		if (IS_ERR(bufs))</div><div class='del'>-			return PTR_ERR(bufs);</div><div class='del'>-		result = snd_pcm_lib_writev(substream, bufs, xfern.frames);</div><div class='del'>-		kfree(bufs);</div><div class='del'>-		__put_user(result, &amp;_xfern-&gt;result);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='del'>-	case SNDRV_PCM_IOCTL_REWIND:</div><div class='del'>-	{</div><div class='del'>-		snd_pcm_uframes_t frames;</div><div class='del'>-		snd_pcm_uframes_t __user *_frames = arg;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (get_user(frames, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (put_user(0, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_playback_rewind(substream, frames);</div><div class='del'>-		__put_user(result, _frames);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='del'>-	case SNDRV_PCM_IOCTL_FORWARD:</div><div class='del'>-	{</div><div class='del'>-		snd_pcm_uframes_t frames;</div><div class='del'>-		snd_pcm_uframes_t __user *_frames = arg;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (get_user(frames, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (put_user(0, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_playback_forward(substream, frames);</div><div class='del'>-		__put_user(result, _frames);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_common_ioctl1(file, substream, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_pcm_capture_ioctl1(struct file *file,</div><div class='del'>-				  struct snd_pcm_substream *substream,</div><div class='del'>-				  unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(!substream))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (snd_BUG_ON(substream-&gt;stream != SNDRV_PCM_STREAM_CAPTURE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_READI_FRAMES:</div><div class='del'>-	{</div><div class='del'>-		struct snd_xferi xferi;</div><div class='del'>-		struct snd_xferi __user *_xferi = arg;</div><div class='del'>-		struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-			return -EBADFD;</div><div class='del'>-		if (put_user(0, &amp;_xferi-&gt;result))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;xferi, _xferi, sizeof(xferi)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_lib_read(substream, xferi.buf, xferi.frames);</div><div class='del'>-		__put_user(result, &amp;_xferi-&gt;result);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='add'>+		return snd_pcm_xferi_frames_ioctl(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL_WRITEN_FRAMES:</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_READN_FRAMES:</div><div class='del'>-	{</div><div class='del'>-		struct snd_xfern xfern;</div><div class='del'>-		struct snd_xfern __user *_xfern = arg;</div><div class='del'>-		struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-		void *bufs;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='del'>-			return -EBADFD;</div><div class='del'>-		if (runtime-&gt;channels &gt; 128)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (put_user(0, &amp;_xfern-&gt;result))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (copy_from_user(&amp;xfern, _xfern, sizeof(xfern)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		bufs = memdup_user(xfern.bufs,</div><div class='del'>-				   sizeof(void *) * runtime-&gt;channels);</div><div class='del'>-		if (IS_ERR(bufs))</div><div class='del'>-			return PTR_ERR(bufs);</div><div class='del'>-		result = snd_pcm_lib_readv(substream, bufs, xfern.frames);</div><div class='del'>-		kfree(bufs);</div><div class='del'>-		__put_user(result, &amp;_xfern-&gt;result);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='add'>+		return snd_pcm_xfern_frames_ioctl(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_REWIND:</div><div class='del'>-	{</div><div class='del'>-		snd_pcm_uframes_t frames;</div><div class='del'>-		snd_pcm_uframes_t __user *_frames = arg;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (get_user(frames, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (put_user(0, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_capture_rewind(substream, frames);</div><div class='del'>-		__put_user(result, _frames);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='del'>-	}</div><div class='add'>+		return snd_pcm_rewind_ioctl(substream, arg);</div><div class='ctx'> 	case SNDRV_PCM_IOCTL_FORWARD:</div><div class='del'>-	{</div><div class='del'>-		snd_pcm_uframes_t frames;</div><div class='del'>-		snd_pcm_uframes_t __user *_frames = arg;</div><div class='del'>-		snd_pcm_sframes_t result;</div><div class='del'>-		if (get_user(frames, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (put_user(0, _frames))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		result = snd_pcm_capture_forward(substream, frames);</div><div class='del'>-		__put_user(result, _frames);</div><div class='del'>-		return result &lt; 0 ? result : 0;</div><div class='add'>+		return snd_pcm_forward_ioctl(substream, arg);</div><div class='ctx'> 	}</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_common_ioctl1(file, substream, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long snd_pcm_playback_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-				   unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_file *pcm_file;</div><div class='del'>-</div><div class='del'>-	pcm_file = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) != 'A')</div><div class='del'>-		return -ENOTTY;</div><div class='del'>-</div><div class='del'>-	return snd_pcm_playback_ioctl1(file, pcm_file-&gt;substream, cmd,</div><div class='del'>-				       (void __user *)arg);</div><div class='add'>+	pcm_dbg(substream-&gt;pcm, "unknown ioctl = 0x%x\n", cmd);</div><div class='add'>+	return -ENOTTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long snd_pcm_capture_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-				  unsigned long arg)</div><div class='add'>+static long snd_pcm_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			  unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> </div><div class='hunk'>@@ -2749,34 +3461,58 @@ static long snd_pcm_capture_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	if (((cmd &gt;&gt; 8) &amp; 0xff) != 'A')</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_capture_ioctl1(file, pcm_file-&gt;substream, cmd,</div><div class='del'>-				      (void __user *)arg);</div><div class='add'>+	return snd_pcm_common_ioctl(file, pcm_file-&gt;substream, cmd,</div><div class='add'>+				     (void __user *)arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_kernel_ioctl - Execute PCM ioctl in the kernel-space</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @cmd: IOCTL cmd</div><div class='add'>+ * @arg: IOCTL argument</div><div class='add'>+ *</div><div class='add'>+ * The function is provided primarily for OSS layer and USB gadget drivers,</div><div class='add'>+ * and it allows only the limited set of ioctls (hw_params, sw_params,</div><div class='add'>+ * prepare, start, drain, drop, forward).</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,</div><div class='ctx'> 			 unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	mm_segment_t fs;</div><div class='del'>-	int result;</div><div class='add'>+	snd_pcm_uframes_t *frames = arg;</div><div class='add'>+	snd_pcm_sframes_t result;</div><div class='ctx'> 	</div><div class='del'>-	fs = snd_enter_user();</div><div class='del'>-	switch (substream-&gt;stream) {</div><div class='del'>-	case SNDRV_PCM_STREAM_PLAYBACK:</div><div class='del'>-		result = snd_pcm_playback_ioctl1(NULL, substream, cmd,</div><div class='del'>-						 (void __user *)arg);</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_STREAM_CAPTURE:</div><div class='del'>-		result = snd_pcm_capture_ioctl1(NULL, substream, cmd,</div><div class='del'>-						(void __user *)arg);</div><div class='del'>-		break;</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_IOCTL_FORWARD:</div><div class='add'>+	{</div><div class='add'>+		/* provided only for OSS; capture-only and no value returned */</div><div class='add'>+		if (substream-&gt;stream != SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		result = snd_pcm_forward(substream, *frames);</div><div class='add'>+		return result &lt; 0 ? result : 0;</div><div class='add'>+	}</div><div class='add'>+	case SNDRV_PCM_IOCTL_HW_PARAMS:</div><div class='add'>+		return snd_pcm_hw_params(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL_SW_PARAMS:</div><div class='add'>+		return snd_pcm_sw_params(substream, arg);</div><div class='add'>+	case SNDRV_PCM_IOCTL_PREPARE:</div><div class='add'>+		return snd_pcm_prepare(substream, NULL);</div><div class='add'>+	case SNDRV_PCM_IOCTL_START:</div><div class='add'>+		return snd_pcm_start_lock_irq(substream);</div><div class='add'>+	case SNDRV_PCM_IOCTL_DRAIN:</div><div class='add'>+		return snd_pcm_drain(substream, NULL);</div><div class='add'>+	case SNDRV_PCM_IOCTL_DROP:</div><div class='add'>+		return snd_pcm_drop(substream);</div><div class='add'>+	case SNDRV_PCM_IOCTL_DELAY:</div><div class='add'>+		return snd_pcm_delay(substream, frames);</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	snd_leave_user(fs);</div><div class='del'>-	return result;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_kernel_ioctl);</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_pcm_read(struct file *file, char __user *buf, size_t count,</div><div class='hunk'>@@ -2792,7 +3528,8 @@ static ssize_t snd_pcm_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (!frame_aligned(runtime, count))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2816,7 +3553,8 @@ static ssize_t snd_pcm_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (!frame_aligned(runtime, count))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2827,155 +3565,128 @@ static ssize_t snd_pcm_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t snd_pcm_aio_read(struct kiocb *iocb, const struct iovec *iov,</div><div class='del'>-			     unsigned long nr_segs, loff_t pos)</div><div class='del'>-</div><div class='add'>+static ssize_t snd_pcm_readv(struct kiocb *iocb, struct iov_iter *to)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	snd_pcm_sframes_t result;</div><div class='ctx'> 	unsigned long i;</div><div class='del'>-	void __user **bufs;</div><div class='add'>+	void __user **bufs __free(kfree) = NULL;</div><div class='ctx'> 	snd_pcm_uframes_t frames;</div><div class='add'>+	const struct iovec *iov = iter_iov(to);</div><div class='ctx'> </div><div class='ctx'> 	pcm_file = iocb-&gt;ki_filp-&gt;private_data;</div><div class='ctx'> 	substream = pcm_file-&gt;substream;</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	if (nr_segs &gt; 1024 || nr_segs != runtime-&gt;channels)</div><div class='add'>+	if (!user_backed_iter(to))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (to-&gt;nr_segs &gt; 1024 || to-&gt;nr_segs != runtime-&gt;channels)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (!frame_aligned(runtime, iov-&gt;iov_len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	frames = bytes_to_samples(runtime, iov-&gt;iov_len);</div><div class='del'>-	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);</div><div class='add'>+	bufs = kmalloc_array(to-&gt;nr_segs, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (bufs == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	for (i = 0; i &lt; nr_segs; ++i)</div><div class='del'>-		bufs[i] = iov[i].iov_base;</div><div class='add'>+	for (i = 0; i &lt; to-&gt;nr_segs; ++i) {</div><div class='add'>+		bufs[i] = iov-&gt;iov_base;</div><div class='add'>+		iov++;</div><div class='add'>+	}</div><div class='ctx'> 	result = snd_pcm_lib_readv(substream, bufs, frames);</div><div class='ctx'> 	if (result &gt; 0)</div><div class='ctx'> 		result = frames_to_bytes(runtime, result);</div><div class='del'>-	kfree(bufs);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t snd_pcm_aio_write(struct kiocb *iocb, const struct iovec *iov,</div><div class='del'>-			      unsigned long nr_segs, loff_t pos)</div><div class='add'>+static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	snd_pcm_sframes_t result;</div><div class='ctx'> 	unsigned long i;</div><div class='del'>-	void __user **bufs;</div><div class='add'>+	void __user **bufs __free(kfree) = NULL;</div><div class='ctx'> 	snd_pcm_uframes_t frames;</div><div class='add'>+	const struct iovec *iov = iter_iov(from);</div><div class='ctx'> </div><div class='ctx'> 	pcm_file = iocb-&gt;ki_filp-&gt;private_data;</div><div class='ctx'> 	substream = pcm_file-&gt;substream;</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN ||</div><div class='add'>+	    runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	if (nr_segs &gt; 128 || nr_segs != runtime-&gt;channels ||</div><div class='add'>+	if (!user_backed_iter(from))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (from-&gt;nr_segs &gt; 128 || from-&gt;nr_segs != runtime-&gt;channels ||</div><div class='ctx'> 	    !frame_aligned(runtime, iov-&gt;iov_len))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	frames = bytes_to_samples(runtime, iov-&gt;iov_len);</div><div class='del'>-	bufs = kmalloc(sizeof(void *) * nr_segs, GFP_KERNEL);</div><div class='add'>+	bufs = kmalloc_array(from-&gt;nr_segs, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (bufs == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	for (i = 0; i &lt; nr_segs; ++i)</div><div class='del'>-		bufs[i] = iov[i].iov_base;</div><div class='add'>+	for (i = 0; i &lt; from-&gt;nr_segs; ++i) {</div><div class='add'>+		bufs[i] = iov-&gt;iov_base;</div><div class='add'>+		iov++;</div><div class='add'>+	}</div><div class='ctx'> 	result = snd_pcm_lib_writev(substream, bufs, frames);</div><div class='ctx'> 	if (result &gt; 0)</div><div class='ctx'> 		result = frames_to_bytes(runtime, result);</div><div class='del'>-	kfree(bufs);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_pcm_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_file *pcm_file;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-        unsigned int mask;</div><div class='add'>+	__poll_t mask, ok;</div><div class='ctx'> 	snd_pcm_uframes_t avail;</div><div class='ctx'> </div><div class='ctx'> 	pcm_file = file-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	substream = pcm_file-&gt;substream;</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		ok = EPOLLOUT | EPOLLWRNORM;</div><div class='add'>+	else</div><div class='add'>+		ok = EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	poll_wait(file, &amp;runtime-&gt;sleep, wait);</div><div class='del'>-</div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	avail = snd_pcm_playback_avail(runtime);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='del'>-	case SNDRV_PCM_STATE_RUNNING:</div><div class='del'>-	case SNDRV_PCM_STATE_PREPARED:</div><div class='del'>-	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		if (avail &gt;= runtime-&gt;control-&gt;avail_min) {</div><div class='del'>-			mask = POLLOUT | POLLWRNORM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-		mask = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		mask = POLLOUT | POLLWRNORM | POLLERR;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int snd_pcm_capture_poll(struct file *file, poll_table * wait)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_file *pcm_file;</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-        unsigned int mask;</div><div class='del'>-	snd_pcm_uframes_t avail;</div><div class='add'>+		return ok | EPOLLERR;</div><div class='ctx'> </div><div class='del'>-	pcm_file = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	substream = pcm_file-&gt;substream;</div><div class='del'>-	if (PCM_RUNTIME_CHECK(substream))</div><div class='del'>-		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		return ok | EPOLLERR;</div><div class='ctx'> </div><div class='ctx'> 	poll_wait(file, &amp;runtime-&gt;sleep, wait);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_stream_lock_irq(substream);</div><div class='del'>-	avail = snd_pcm_capture_avail(runtime);</div><div class='del'>-	switch (runtime-&gt;status-&gt;state) {</div><div class='add'>+	mask = 0;</div><div class='add'>+	guard(pcm_stream_lock_irq)(substream);</div><div class='add'>+	avail = snd_pcm_avail(substream);</div><div class='add'>+	switch (runtime-&gt;state) {</div><div class='ctx'> 	case SNDRV_PCM_STATE_RUNNING:</div><div class='ctx'> 	case SNDRV_PCM_STATE_PREPARED:</div><div class='ctx'> 	case SNDRV_PCM_STATE_PAUSED:</div><div class='del'>-		if (avail &gt;= runtime-&gt;control-&gt;avail_min) {</div><div class='del'>-			mask = POLLIN | POLLRDNORM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		mask = 0;</div><div class='add'>+		if (avail &gt;= runtime-&gt;control-&gt;avail_min)</div><div class='add'>+			mask = ok;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_STATE_DRAINING:</div><div class='del'>-		if (avail &gt; 0) {</div><div class='del'>-			mask = POLLIN | POLLRDNORM;</div><div class='del'>-			break;</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+			mask = ok;</div><div class='add'>+			if (!avail)</div><div class='add'>+				mask |= EPOLLERR;</div><div class='ctx'> 		}</div><div class='del'>-		/* Fall through */</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		mask = POLLIN | POLLRDNORM | POLLERR;</div><div class='add'>+		mask = ok | EPOLLERR;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	snd_pcm_stream_unlock_irq(substream);</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2991,10 +3702,9 @@ static unsigned int snd_pcm_capture_poll(struct file *file, poll_table * wait)</div><div class='ctx'> /*</div><div class='ctx'>  * mmap status record</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_mmap_status_fault(struct vm_area_struct *area,</div><div class='del'>-						struct vm_fault *vmf)</div><div class='add'>+static vm_fault_t snd_pcm_mmap_status_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream = area-&gt;vm_private_data;</div><div class='add'>+	struct snd_pcm_substream *substream = vmf-&gt;vma-&gt;vm_private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	</div><div class='ctx'> 	if (substream == NULL)</div><div class='hunk'>@@ -3013,27 +3723,26 @@ static const struct vm_operations_struct snd_pcm_vm_ops_status =</div><div class='ctx'> static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,</div><div class='ctx'> 			       struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	long size;</div><div class='ctx'> 	if (!(area-&gt;vm_flags &amp; VM_READ))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='ctx'> 	size = area-&gt;vm_end - area-&gt;vm_start;</div><div class='ctx'> 	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	area-&gt;vm_ops = &amp;snd_pcm_vm_ops_status;</div><div class='ctx'> 	area-&gt;vm_private_data = substream;</div><div class='del'>-	area-&gt;vm_flags |= VM_RESERVED;</div><div class='add'>+	vm_flags_mod(area, VM_DONTEXPAND | VM_DONTDUMP,</div><div class='add'>+		     VM_WRITE | VM_MAYWRITE);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * mmap control record</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_mmap_control_fault(struct vm_area_struct *area,</div><div class='del'>-						struct vm_fault *vmf)</div><div class='add'>+static vm_fault_t snd_pcm_mmap_control_fault(struct vm_fault *vmf)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream = area-&gt;vm_private_data;</div><div class='add'>+	struct snd_pcm_substream *substream = vmf-&gt;vma-&gt;vm_private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	</div><div class='ctx'> 	if (substream == NULL)</div><div class='hunk'>@@ -3052,23 +3761,59 @@ static const struct vm_operations_struct snd_pcm_vm_ops_control =</div><div class='ctx'> static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,</div><div class='ctx'> 				struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	long size;</div><div class='ctx'> 	if (!(area-&gt;vm_flags &amp; VM_READ))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='ctx'> 	size = area-&gt;vm_end - area-&gt;vm_start;</div><div class='ctx'> 	if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	area-&gt;vm_ops = &amp;snd_pcm_vm_ops_control;</div><div class='ctx'> 	area-&gt;vm_private_data = substream;</div><div class='del'>-	area-&gt;vm_flags |= VM_RESERVED;</div><div class='add'>+	vm_flags_set(area, VM_DONTEXPAND | VM_DONTDUMP);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static bool pcm_status_mmap_allowed(struct snd_pcm_file *pcm_file)</div><div class='add'>+{</div><div class='add'>+	/* If drivers require the explicit sync (typically for non-coherent</div><div class='add'>+	 * pages), we have to disable the mmap of status and control data</div><div class='add'>+	 * to enforce the control via SYNC_PTR ioctl.</div><div class='add'>+	 */</div><div class='add'>+	if (pcm_file-&gt;substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_EXPLICIT_SYNC)</div><div class='add'>+		return false;</div><div class='add'>+	/* See pcm_control_mmap_allowed() below.</div><div class='add'>+	 * Since older alsa-lib requires both status and control mmaps to be</div><div class='add'>+	 * coupled, we have to disable the status mmap for old alsa-lib, too.</div><div class='add'>+	 */</div><div class='add'>+	if (pcm_file-&gt;user_pversion &lt; SNDRV_PROTOCOL_VERSION(2, 0, 14) &amp;&amp;</div><div class='add'>+	    (pcm_file-&gt;substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_SYNC_APPLPTR))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pcm_control_mmap_allowed(struct snd_pcm_file *pcm_file)</div><div class='add'>+{</div><div class='add'>+	if (pcm_file-&gt;no_compat_mmap)</div><div class='add'>+		return false;</div><div class='add'>+	/* see above */</div><div class='add'>+	if (pcm_file-&gt;substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_EXPLICIT_SYNC)</div><div class='add'>+		return false;</div><div class='add'>+	/* Disallow the control mmap when SYNC_APPLPTR flag is set;</div><div class='add'>+	 * it enforces the user-space to fall back to snd_pcm_sync_ptr(),</div><div class='add'>+	 * thus it effectively assures the manual update of appl_ptr.</div><div class='add'>+	 */</div><div class='add'>+	if (pcm_file-&gt;substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_SYNC_APPLPTR)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #else /* ! coherent mmap */</div><div class='ctx'> /*</div><div class='ctx'>  * don't support mmap for status and control records.</div><div class='ctx'>  */</div><div class='add'>+#define pcm_status_mmap_allowed(pcm_file)	false</div><div class='add'>+#define pcm_control_mmap_allowed(pcm_file)	false</div><div class='add'>+</div><div class='ctx'> static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,</div><div class='ctx'> 			       struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='hunk'>@@ -3081,34 +3826,32 @@ static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file</div><div class='ctx'> }</div><div class='ctx'> #endif /* coherent mmap */</div><div class='ctx'> </div><div class='del'>-static inline struct page *</div><div class='del'>-snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs)</div><div class='add'>+/*</div><div class='add'>+ * snd_pcm_mmap_data_open - increase the mmap counter</div><div class='add'>+ */</div><div class='add'>+static void snd_pcm_mmap_data_open(struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	void *vaddr = substream-&gt;runtime-&gt;dma_area + ofs;</div><div class='del'>-#if defined(CONFIG_MIPS) &amp;&amp; defined(CONFIG_DMA_NONCOHERENT)</div><div class='del'>-	if (substream-&gt;dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)</div><div class='del'>-		return virt_to_page(CAC_ADDR(vaddr));</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_PPC32) &amp;&amp; defined(CONFIG_NOT_COHERENT_CACHE)</div><div class='del'>-	if (substream-&gt;dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) {</div><div class='del'>-		dma_addr_t addr = substream-&gt;runtime-&gt;dma_addr + ofs;</div><div class='del'>-		addr -= get_dma_offset(substream-&gt;dma_buffer.dev.dev);</div><div class='del'>-		/* assume dma_handle set via pfn_to_phys() in</div><div class='del'>-		 * mm/dma-noncoherent.c</div><div class='del'>-		 */</div><div class='del'>-		return pfn_to_page(addr &gt;&gt; PAGE_SHIFT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return virt_to_page(vaddr);</div><div class='add'>+	struct snd_pcm_substream *substream = area-&gt;vm_private_data;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;substream-&gt;mmap_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * fault callback for mmapping a RAM page</div><div class='add'>+ * snd_pcm_mmap_data_close - decrease the mmap counter</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,</div><div class='del'>-						struct vm_fault *vmf)</div><div class='add'>+static void snd_pcm_mmap_data_close(struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream = area-&gt;vm_private_data;</div><div class='add'>+</div><div class='add'>+	atomic_dec(&amp;substream-&gt;mmap_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * fault callback for mmapping a RAM page</div><div class='add'>+ */</div><div class='add'>+static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = vmf-&gt;vma-&gt;vm_private_data;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	unsigned long offset;</div><div class='ctx'> 	struct page * page;</div><div class='hunk'>@@ -3123,8 +3866,12 @@ static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> 	if (substream-&gt;ops-&gt;page)</div><div class='ctx'> 		page = substream-&gt;ops-&gt;page(substream, offset);</div><div class='del'>-	else</div><div class='del'>-		page = snd_pcm_default_page_ops(substream, offset);</div><div class='add'>+	else if (!snd_pcm_get_dma_buf(substream)) {</div><div class='add'>+		if (WARN_ON_ONCE(!runtime-&gt;dma_area))</div><div class='add'>+			return VM_FAULT_SIGBUS;</div><div class='add'>+		page = virt_to_page(runtime-&gt;dma_area + offset);</div><div class='add'>+	} else</div><div class='add'>+		page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset);</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return VM_FAULT_SIGBUS;</div><div class='ctx'> 	get_page(page);</div><div class='hunk'>@@ -3143,71 +3890,59 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = {</div><div class='ctx'> 	.fault =	snd_pcm_mmap_data_fault,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifndef ARCH_HAS_DMA_MMAP_COHERENT</div><div class='del'>-/* This should be defined / handled globally! */</div><div class='del'>-#ifdef CONFIG_ARM</div><div class='del'>-#define ARCH_HAS_DMA_MMAP_COHERENT</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * mmap the DMA buffer on RAM</div><div class='ctx'>  */</div><div class='del'>-static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,</div><div class='del'>-				struct vm_area_struct *area)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_lib_default_mmap - Default PCM data mmap function</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @area: VMA</div><div class='add'>+ *</div><div class='add'>+ * This is the default mmap handler for PCM data.  When mmap pcm_ops is NULL,</div><div class='add'>+ * this function is invoked implicitly.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,</div><div class='add'>+			     struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	area-&gt;vm_flags |= VM_RESERVED;</div><div class='del'>-#ifdef ARCH_HAS_DMA_MMAP_COHERENT</div><div class='add'>+	vm_flags_set(area, VM_DONTEXPAND | VM_DONTDUMP);</div><div class='ctx'> 	if (!substream-&gt;ops-&gt;page &amp;&amp;</div><div class='del'>-	    substream-&gt;dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)</div><div class='del'>-		return dma_mmap_coherent(substream-&gt;dma_buffer.dev.dev,</div><div class='del'>-					 area,</div><div class='del'>-					 substream-&gt;runtime-&gt;dma_area,</div><div class='del'>-					 substream-&gt;runtime-&gt;dma_addr,</div><div class='del'>-					 area-&gt;vm_end - area-&gt;vm_start);</div><div class='del'>-#elif defined(CONFIG_MIPS) &amp;&amp; defined(CONFIG_DMA_NONCOHERENT)</div><div class='del'>-	if (substream-&gt;dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV &amp;&amp;</div><div class='del'>-	    !plat_device_is_coherent(substream-&gt;dma_buffer.dev.dev))</div><div class='del'>-		area-&gt;vm_page_prot = pgprot_noncached(area-&gt;vm_page_prot);</div><div class='del'>-#endif /* ARCH_HAS_DMA_MMAP_COHERENT */</div><div class='add'>+	    !snd_dma_buffer_mmap(snd_pcm_get_dma_buf(substream), area))</div><div class='add'>+		return 0;</div><div class='ctx'> 	/* mmap with fault handler */</div><div class='ctx'> 	area-&gt;vm_ops = &amp;snd_pcm_vm_ops_data_fault;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * mmap the DMA buffer on I/O memory area</div><div class='ctx'>  */</div><div class='ctx'> #if SNDRV_PCM_INFO_MMAP_IOMEM</div><div class='add'>+/**</div><div class='add'>+ * snd_pcm_lib_mmap_iomem - Default PCM data mmap function for I/O mem</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ * @area: VMA</div><div class='add'>+ *</div><div class='add'>+ * When your hardware uses the iomapped pages as the hardware buffer and</div><div class='add'>+ * wants to mmap it, pass this function as mmap pcm_ops.  Note that this</div><div class='add'>+ * is supposed to work only on limited architectures.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if successful, or a negative error code</div><div class='add'>+ */</div><div class='ctx'> int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream,</div><div class='ctx'> 			   struct vm_area_struct *area)</div><div class='ctx'> {</div><div class='del'>-	long size;</div><div class='del'>-	unsigned long offset;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	area-&gt;vm_page_prot = pgprot_noncached(area-&gt;vm_page_prot);</div><div class='del'>-	area-&gt;vm_flags |= VM_IO;</div><div class='del'>-	size = area-&gt;vm_end - area-&gt;vm_start;</div><div class='del'>-	offset = area-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='del'>-	if (io_remap_pfn_range(area, area-&gt;vm_start,</div><div class='del'>-				(substream-&gt;runtime-&gt;dma_addr + offset) &gt;&gt; PAGE_SHIFT,</div><div class='del'>-				size, area-&gt;vm_page_prot))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	return 0;</div><div class='add'>+	return vm_iomap_memory(area, runtime-&gt;dma_addr, runtime-&gt;dma_bytes);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_lib_mmap_iomem);</div><div class='ctx'> #endif /* SNDRV_PCM_INFO_MMAP */</div><div class='ctx'> </div><div class='del'>-/* mmap callback with pgprot_noncached */</div><div class='del'>-int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream,</div><div class='del'>-			       struct vm_area_struct *area)</div><div class='del'>-{</div><div class='del'>-	area-&gt;vm_page_prot = pgprot_noncached(area-&gt;vm_page_prot);</div><div class='del'>-	return snd_pcm_default_mmap(substream, area);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_pcm_lib_mmap_noncached);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * mmap DMA buffer</div><div class='ctx'>  */</div><div class='hunk'>@@ -3228,7 +3963,7 @@ int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_OPEN)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (!(runtime-&gt;info &amp; SNDRV_PCM_INFO_MMAP))</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -3248,12 +3983,11 @@ int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file,</div><div class='ctx'> 	if (substream-&gt;ops-&gt;mmap)</div><div class='ctx'> 		err = substream-&gt;ops-&gt;mmap(substream, area);</div><div class='ctx'> 	else</div><div class='del'>-		err = snd_pcm_default_mmap(substream, area);</div><div class='add'>+		err = snd_pcm_lib_default_mmap(substream, area);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		atomic_inc(&amp;substream-&gt;mmap_count);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_pcm_mmap_data);</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)</div><div class='hunk'>@@ -3266,15 +4000,25 @@ static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)</div><div class='ctx'> 	substream = pcm_file-&gt;substream;</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> </div><div class='ctx'> 	offset = area-&gt;vm_pgoff &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 	switch (offset) {</div><div class='del'>-	case SNDRV_PCM_MMAP_OFFSET_STATUS:</div><div class='del'>-		if (pcm_file-&gt;no_compat_mmap)</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_STATUS_OLD:</div><div class='add'>+		if (pcm_file-&gt;no_compat_mmap || !IS_ENABLED(CONFIG_64BIT))</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_STATUS_NEW:</div><div class='add'>+		if (!pcm_status_mmap_allowed(pcm_file))</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		return snd_pcm_mmap_status(substream, file, area);</div><div class='del'>-	case SNDRV_PCM_MMAP_OFFSET_CONTROL:</div><div class='del'>-		if (pcm_file-&gt;no_compat_mmap)</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD:</div><div class='add'>+		if (pcm_file-&gt;no_compat_mmap || !IS_ENABLED(CONFIG_64BIT))</div><div class='add'>+			return -ENXIO;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_CONTROL_NEW:</div><div class='add'>+		if (!pcm_control_mmap_allowed(pcm_file))</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		return snd_pcm_mmap_control(substream, file, area);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3294,7 +4038,9 @@ static int snd_pcm_fasync(int fd, struct file * file, int on)</div><div class='ctx'> 	if (PCM_RUNTIME_CHECK(substream))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	return fasync_helper(fd, file, on, &amp;runtime-&gt;fasync);</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_DISCONNECTED)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	return snd_fasync_helper(fd, file, on, &amp;runtime-&gt;fasync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3355,8 +4101,8 @@ static void snd_pcm_hw_convert_to_old_params(struct snd_pcm_hw_params_old *opara</div><div class='ctx'> static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 				      struct snd_pcm_hw_params_old __user * _oparams)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *params;</div><div class='del'>-	struct snd_pcm_hw_params_old *oparams = NULL;</div><div class='add'>+	struct snd_pcm_hw_params *params __free(kfree) = NULL;</div><div class='add'>+	struct snd_pcm_hw_params_old *oparams __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	params = kmalloc(sizeof(*params), GFP_KERNEL);</div><div class='hunk'>@@ -3364,29 +4110,28 @@ static int snd_pcm_hw_refine_old_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	oparams = memdup_user(_oparams, sizeof(*oparams));</div><div class='del'>-	if (IS_ERR(oparams)) {</div><div class='del'>-		err = PTR_ERR(oparams);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(oparams))</div><div class='add'>+		return PTR_ERR(oparams);</div><div class='ctx'> 	snd_pcm_hw_convert_from_old_params(params, oparams);</div><div class='ctx'> 	err = snd_pcm_hw_refine(substream, params);</div><div class='del'>-	snd_pcm_hw_convert_to_old_params(oparams, params);</div><div class='del'>-	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	kfree(oparams);</div><div class='del'>-out:</div><div class='del'>-	kfree(params);</div><div class='del'>-	return err;</div><div class='add'>+	err = fixup_unreferenced_params(substream, params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_pcm_hw_convert_to_old_params(oparams, params);</div><div class='add'>+	if (copy_to_user(_oparams, oparams, sizeof(*oparams)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 				      struct snd_pcm_hw_params_old __user * _oparams)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hw_params *params;</div><div class='del'>-	struct snd_pcm_hw_params_old *oparams = NULL;</div><div class='add'>+	struct snd_pcm_hw_params *params __free(kfree) = NULL;</div><div class='add'>+	struct snd_pcm_hw_params_old *oparams __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	params = kmalloc(sizeof(*params), GFP_KERNEL);</div><div class='hunk'>@@ -3394,22 +4139,18 @@ static int snd_pcm_hw_params_old_user(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	oparams = memdup_user(_oparams, sizeof(*oparams));</div><div class='del'>-	if (IS_ERR(oparams)) {</div><div class='del'>-		err = PTR_ERR(oparams);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(oparams))</div><div class='add'>+		return PTR_ERR(oparams);</div><div class='add'>+</div><div class='ctx'> 	snd_pcm_hw_convert_from_old_params(params, oparams);</div><div class='ctx'> 	err = snd_pcm_hw_params(substream, params);</div><div class='del'>-	snd_pcm_hw_convert_to_old_params(oparams, params);</div><div class='del'>-	if (copy_to_user(_oparams, oparams, sizeof(*oparams))) {</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	kfree(oparams);</div><div class='del'>-out:</div><div class='del'>-	kfree(params);</div><div class='del'>-	return err;</div><div class='add'>+	snd_pcm_hw_convert_to_old_params(oparams, params);</div><div class='add'>+	if (copy_to_user(_oparams, oparams, sizeof(*oparams)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SND_SUPPORT_OLD_API */</div><div class='ctx'> </div><div class='hunk'>@@ -3426,9 +4167,9 @@ static unsigned long snd_pcm_get_unmapped_area(struct file *file,</div><div class='ctx'> 	unsigned long offset = pgoff &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	switch (offset) {</div><div class='del'>-	case SNDRV_PCM_MMAP_OFFSET_STATUS:</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_STATUS_NEW:</div><div class='ctx'> 		return (unsigned long)runtime-&gt;status;</div><div class='del'>-	case SNDRV_PCM_MMAP_OFFSET_CONTROL:</div><div class='add'>+	case SNDRV_PCM_MMAP_OFFSET_CONTROL_NEW:</div><div class='ctx'> 		return (unsigned long)runtime-&gt;control;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return (unsigned long)runtime-&gt;dma_area + offset;</div><div class='hunk'>@@ -3446,12 +4187,11 @@ const struct file_operations snd_pcm_f_ops[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.owner =		THIS_MODULE,</div><div class='ctx'> 		.write =		snd_pcm_write,</div><div class='del'>-		.aio_write =		snd_pcm_aio_write,</div><div class='add'>+		.write_iter =		snd_pcm_writev,</div><div class='ctx'> 		.open =			snd_pcm_playback_open,</div><div class='ctx'> 		.release =		snd_pcm_release,</div><div class='del'>-		.llseek =		no_llseek,</div><div class='del'>-		.poll =			snd_pcm_playback_poll,</div><div class='del'>-		.unlocked_ioctl =	snd_pcm_playback_ioctl,</div><div class='add'>+		.poll =			snd_pcm_poll,</div><div class='add'>+		.unlocked_ioctl =	snd_pcm_ioctl,</div><div class='ctx'> 		.compat_ioctl = 	snd_pcm_ioctl_compat,</div><div class='ctx'> 		.mmap =			snd_pcm_mmap,</div><div class='ctx'> 		.fasync =		snd_pcm_fasync,</div><div class='hunk'>@@ -3460,12 +4200,11 @@ const struct file_operations snd_pcm_f_ops[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.owner =		THIS_MODULE,</div><div class='ctx'> 		.read =			snd_pcm_read,</div><div class='del'>-		.aio_read =		snd_pcm_aio_read,</div><div class='add'>+		.read_iter =		snd_pcm_readv,</div><div class='ctx'> 		.open =			snd_pcm_capture_open,</div><div class='ctx'> 		.release =		snd_pcm_release,</div><div class='del'>-		.llseek =		no_llseek,</div><div class='del'>-		.poll =			snd_pcm_capture_poll,</div><div class='del'>-		.unlocked_ioctl =	snd_pcm_capture_ioctl,</div><div class='add'>+		.poll =			snd_pcm_poll,</div><div class='add'>+		.unlocked_ioctl =	snd_pcm_ioctl,</div><div class='ctx'> 		.compat_ioctl = 	snd_pcm_ioctl_compat,</div><div class='ctx'> 		.mmap =			snd_pcm_mmap,</div><div class='ctx'> 		.fasync =		snd_pcm_fasync,</div><div class='head'>diff --git a/sound/core/pcm_param_trace.h b/sound/core/pcm_param_trace.h<br/>new file mode 100644<br/>index 000000000000..08abba3133ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_param_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_param_trace.h</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM snd_pcm</div><div class='add'>+</div><div class='add'>+#if !defined(_PCM_PARAMS_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _PCM_PARAMS_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+#define HW_PARAM_ENTRY(param) {SNDRV_PCM_HW_PARAM_##param, #param}</div><div class='add'>+#define hw_param_labels			\</div><div class='add'>+	HW_PARAM_ENTRY(ACCESS),		\</div><div class='add'>+	HW_PARAM_ENTRY(FORMAT),		\</div><div class='add'>+	HW_PARAM_ENTRY(SUBFORMAT),	\</div><div class='add'>+	HW_PARAM_ENTRY(SAMPLE_BITS),	\</div><div class='add'>+	HW_PARAM_ENTRY(FRAME_BITS),	\</div><div class='add'>+	HW_PARAM_ENTRY(CHANNELS),	\</div><div class='add'>+	HW_PARAM_ENTRY(RATE),		\</div><div class='add'>+	HW_PARAM_ENTRY(PERIOD_TIME),	\</div><div class='add'>+	HW_PARAM_ENTRY(PERIOD_SIZE),	\</div><div class='add'>+	HW_PARAM_ENTRY(PERIOD_BYTES),	\</div><div class='add'>+	HW_PARAM_ENTRY(PERIODS),	\</div><div class='add'>+	HW_PARAM_ENTRY(BUFFER_TIME),	\</div><div class='add'>+	HW_PARAM_ENTRY(BUFFER_SIZE),	\</div><div class='add'>+	HW_PARAM_ENTRY(BUFFER_BYTES),	\</div><div class='add'>+	HW_PARAM_ENTRY(TICK_TIME)</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hw_mask_param,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_hw_param_t type, int index, const struct snd_mask *prev, const struct snd_mask *curr),</div><div class='add'>+	TP_ARGS(substream, type, index, prev, curr),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, card)</div><div class='add'>+		__field(int, device)</div><div class='add'>+		__field(int, subdevice)</div><div class='add'>+		__field(int, direction)</div><div class='add'>+		__field(snd_pcm_hw_param_t, type)</div><div class='add'>+		__field(int, index)</div><div class='add'>+		__field(int, total)</div><div class='add'>+		__array(__u32, prev_bits, 8)</div><div class='add'>+		__array(__u32, curr_bits, 8)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = substream-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = substream-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;subdevice = substream-&gt;number;</div><div class='add'>+		__entry-&gt;direction = substream-&gt;stream;</div><div class='add'>+		__entry-&gt;type = type;</div><div class='add'>+		__entry-&gt;index = index;</div><div class='add'>+		__entry-&gt;total = substream-&gt;runtime-&gt;hw_constraints.rules_num;</div><div class='add'>+		memcpy(__entry-&gt;prev_bits, prev-&gt;bits, sizeof(__u32) * 8);</div><div class='add'>+		memcpy(__entry-&gt;curr_bits, curr-&gt;bits, sizeof(__u32) * 8);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s:%d %03d/%03d %s %08x%08x%08x%08x %08x%08x%08x%08x",</div><div class='add'>+		  __entry-&gt;card,</div><div class='add'>+		  __entry-&gt;device,</div><div class='add'>+		  __entry-&gt;direction ? "c" : "p",</div><div class='add'>+		  __entry-&gt;subdevice,</div><div class='add'>+		  __entry-&gt;index,</div><div class='add'>+		  __entry-&gt;total,</div><div class='add'>+		  __print_symbolic(__entry-&gt;type, hw_param_labels),</div><div class='add'>+		  __entry-&gt;prev_bits[3], __entry-&gt;prev_bits[2],</div><div class='add'>+		  __entry-&gt;prev_bits[1], __entry-&gt;prev_bits[0],</div><div class='add'>+		  __entry-&gt;curr_bits[3], __entry-&gt;curr_bits[2],</div><div class='add'>+		  __entry-&gt;curr_bits[1], __entry-&gt;curr_bits[0]</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hw_interval_param,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_hw_param_t type, int index, const struct snd_interval *prev, const struct snd_interval *curr),</div><div class='add'>+	TP_ARGS(substream, type, index, prev, curr),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, card)</div><div class='add'>+		__field(int, device)</div><div class='add'>+		__field(int, subdevice)</div><div class='add'>+		__field(int, direction)</div><div class='add'>+		__field(snd_pcm_hw_param_t, type)</div><div class='add'>+		__field(int, index)</div><div class='add'>+		__field(int, total)</div><div class='add'>+		__field(unsigned int, prev_min)</div><div class='add'>+		__field(unsigned int, prev_max)</div><div class='add'>+		__field(unsigned int, prev_openmin)</div><div class='add'>+		__field(unsigned int, prev_openmax)</div><div class='add'>+		__field(unsigned int, prev_integer)</div><div class='add'>+		__field(unsigned int, prev_empty)</div><div class='add'>+		__field(unsigned int, curr_min)</div><div class='add'>+		__field(unsigned int, curr_max)</div><div class='add'>+		__field(unsigned int, curr_openmin)</div><div class='add'>+		__field(unsigned int, curr_openmax)</div><div class='add'>+		__field(unsigned int, curr_integer)</div><div class='add'>+		__field(unsigned int, curr_empty)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = substream-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = substream-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;subdevice = substream-&gt;number;</div><div class='add'>+		__entry-&gt;direction = substream-&gt;stream;</div><div class='add'>+		__entry-&gt;type = type;</div><div class='add'>+		__entry-&gt;index = index;</div><div class='add'>+		__entry-&gt;total = substream-&gt;runtime-&gt;hw_constraints.rules_num;</div><div class='add'>+		__entry-&gt;prev_min = prev-&gt;min;</div><div class='add'>+		__entry-&gt;prev_max = prev-&gt;max;</div><div class='add'>+		__entry-&gt;prev_openmin = prev-&gt;openmin;</div><div class='add'>+		__entry-&gt;prev_openmax = prev-&gt;openmax;</div><div class='add'>+		__entry-&gt;prev_integer = prev-&gt;integer;</div><div class='add'>+		__entry-&gt;prev_empty = prev-&gt;empty;</div><div class='add'>+		__entry-&gt;curr_min = curr-&gt;min;</div><div class='add'>+		__entry-&gt;curr_max = curr-&gt;max;</div><div class='add'>+		__entry-&gt;curr_openmin = curr-&gt;openmin;</div><div class='add'>+		__entry-&gt;curr_openmax = curr-&gt;openmax;</div><div class='add'>+		__entry-&gt;curr_integer = curr-&gt;integer;</div><div class='add'>+		__entry-&gt;curr_empty = curr-&gt;empty;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s:%d %03d/%03d %s %d %d %s%u %u%s %d %d %s%u %u%s",</div><div class='add'>+		  __entry-&gt;card,</div><div class='add'>+		  __entry-&gt;device,</div><div class='add'>+		  __entry-&gt;direction ? "c" : "p",</div><div class='add'>+		  __entry-&gt;subdevice,</div><div class='add'>+		  __entry-&gt;index,</div><div class='add'>+		  __entry-&gt;total,</div><div class='add'>+		  __print_symbolic(__entry-&gt;type, hw_param_labels),</div><div class='add'>+		  __entry-&gt;prev_empty,</div><div class='add'>+		  __entry-&gt;prev_integer,</div><div class='add'>+		  __entry-&gt;prev_openmin ? "(" : "[",</div><div class='add'>+		  __entry-&gt;prev_min,</div><div class='add'>+		  __entry-&gt;prev_max,</div><div class='add'>+		  __entry-&gt;prev_openmax ? ")" : "]",</div><div class='add'>+		  __entry-&gt;curr_empty,</div><div class='add'>+		  __entry-&gt;curr_integer,</div><div class='add'>+		  __entry-&gt;curr_openmin ? "(" : "[",</div><div class='add'>+		  __entry-&gt;curr_min,</div><div class='add'>+		  __entry-&gt;curr_max,</div><div class='add'>+		  __entry-&gt;curr_openmax ? ")" : "]"</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _PCM_PARAMS_TRACE_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE pcm_param_trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c<br/>index b01d9481d632..ab0e5bd70f8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/pcm_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_timer.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Digital Audio (PCM) abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -25,6 +10,8 @@</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/timer.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "pcm_local.h"</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  Timer functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -33,8 +20,8 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long rate, mult, fsize, l, post;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	</div><div class='del'>-        mult = 1000000000;</div><div class='add'>+</div><div class='add'>+	mult = 1000000000;</div><div class='ctx'> 	rate = runtime-&gt;rate;</div><div class='ctx'> 	if (snd_BUG_ON(!rate))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -53,7 +40,9 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)</div><div class='ctx'> 		post *= 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rate == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "pcm timer resolution out of range (rate = %u, period_size = %lu)\n", runtime-&gt;rate, runtime-&gt;period_size);</div><div class='add'>+		pcm_err(substream-&gt;pcm,</div><div class='add'>+			"pcm timer resolution out of range (rate = %u, period_size = %lu)\n",</div><div class='add'>+			runtime-&gt;rate, runtime-&gt;period_size);</div><div class='ctx'> 		runtime-&gt;timer_resolution = -1;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -63,7 +52,7 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream)</div><div class='ctx'> static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	substream = timer-&gt;private_data;</div><div class='ctx'> 	return substream-&gt;runtime ? substream-&gt;runtime-&gt;timer_resolution : 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -71,7 +60,7 @@ static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer)</div><div class='ctx'> static int snd_pcm_timer_start(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	substream = snd_timer_chip(timer);</div><div class='ctx'> 	substream-&gt;timer_running = 1;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -80,13 +69,13 @@ static int snd_pcm_timer_start(struct snd_timer * timer)</div><div class='ctx'> static int snd_pcm_timer_stop(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	substream = snd_timer_chip(timer);</div><div class='ctx'> 	substream-&gt;timer_running = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_pcm_timer =</div><div class='add'>+static const struct snd_timer_hardware snd_pcm_timer =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_SLAVE,</div><div class='ctx'> 	.resolution =	0,</div><div class='hunk'>@@ -110,7 +99,7 @@ void snd_pcm_timer_init(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	tid.dev_sclass = SNDRV_TIMER_SCLASS_NONE;</div><div class='ctx'> 	tid.dev_class = SNDRV_TIMER_CLASS_PCM;</div><div class='ctx'> 	tid.card = substream-&gt;pcm-&gt;card-&gt;number;</div><div class='hunk'>@@ -119,8 +108,7 @@ void snd_pcm_timer_init(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (snd_timer_new(substream-&gt;pcm-&gt;card, "PCM", &amp;tid, &amp;timer) &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	sprintf(timer-&gt;name, "PCM %s %i-%i-%i",</div><div class='del'>-			substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE ?</div><div class='del'>-				"capture" : "playback",</div><div class='add'>+			snd_pcm_direction_name(substream-&gt;stream),</div><div class='ctx'> 			tid.card, tid.device, tid.subdevice);</div><div class='ctx'> 	timer-&gt;hw = snd_pcm_timer;</div><div class='ctx'> 	if (snd_device_register(timer-&gt;card, timer) &lt; 0) {</div><div class='head'>diff --git a/sound/core/pcm_trace.h b/sound/core/pcm_trace.h<br/>new file mode 100644<br/>index 000000000000..adb9b1f3bbfa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/pcm_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/pcm_trace.h</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM snd_pcm</div><div class='add'>+#define TRACE_INCLUDE_FILE pcm_trace</div><div class='add'>+</div><div class='add'>+#if !defined(_PCM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _PCM_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hwptr,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_uframes_t pos, bool irq),</div><div class='add'>+	TP_ARGS(substream, pos, irq),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( bool, in_interrupt )</div><div class='add'>+		__field( unsigned int, card )</div><div class='add'>+		__field( unsigned int, device )</div><div class='add'>+		__field( unsigned int, number )</div><div class='add'>+		__field( unsigned int, stream )</div><div class='add'>+		__field( snd_pcm_uframes_t, pos )</div><div class='add'>+		__field( snd_pcm_uframes_t, period_size )</div><div class='add'>+		__field( snd_pcm_uframes_t, buffer_size )</div><div class='add'>+		__field( snd_pcm_uframes_t, old_hw_ptr )</div><div class='add'>+		__field( snd_pcm_uframes_t, hw_ptr_base )</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;in_interrupt = (irq);</div><div class='add'>+		__entry-&gt;card = (substream)-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = (substream)-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;number = (substream)-&gt;number;</div><div class='add'>+		__entry-&gt;stream = (substream)-&gt;stream;</div><div class='add'>+		__entry-&gt;pos = (pos);</div><div class='add'>+		__entry-&gt;period_size = (substream)-&gt;runtime-&gt;period_size;</div><div class='add'>+		__entry-&gt;buffer_size = (substream)-&gt;runtime-&gt;buffer_size;</div><div class='add'>+		__entry-&gt;old_hw_ptr = (substream)-&gt;runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+		__entry-&gt;hw_ptr_base = (substream)-&gt;runtime-&gt;hw_ptr_base;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s/sub%d: %s: pos=%lu, old=%lu, base=%lu, period=%lu, buf=%lu",</div><div class='add'>+		  __entry-&gt;card, __entry-&gt;device,</div><div class='add'>+		  __entry-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",</div><div class='add'>+		  __entry-&gt;number,</div><div class='add'>+		  __entry-&gt;in_interrupt ? "IRQ" : "POS",</div><div class='add'>+		  (unsigned long)__entry-&gt;pos,</div><div class='add'>+		  (unsigned long)__entry-&gt;old_hw_ptr,</div><div class='add'>+		  (unsigned long)__entry-&gt;hw_ptr_base,</div><div class='add'>+		  (unsigned long)__entry-&gt;period_size,</div><div class='add'>+		  (unsigned long)__entry-&gt;buffer_size)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(xrun,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream),</div><div class='add'>+	TP_ARGS(substream),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( unsigned int, card )</div><div class='add'>+		__field( unsigned int, device )</div><div class='add'>+		__field( unsigned int, number )</div><div class='add'>+		__field( unsigned int, stream )</div><div class='add'>+		__field( snd_pcm_uframes_t, period_size )</div><div class='add'>+		__field( snd_pcm_uframes_t, buffer_size )</div><div class='add'>+		__field( snd_pcm_uframes_t, old_hw_ptr )</div><div class='add'>+		__field( snd_pcm_uframes_t, hw_ptr_base )</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = (substream)-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = (substream)-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;number = (substream)-&gt;number;</div><div class='add'>+		__entry-&gt;stream = (substream)-&gt;stream;</div><div class='add'>+		__entry-&gt;period_size = (substream)-&gt;runtime-&gt;period_size;</div><div class='add'>+		__entry-&gt;buffer_size = (substream)-&gt;runtime-&gt;buffer_size;</div><div class='add'>+		__entry-&gt;old_hw_ptr = (substream)-&gt;runtime-&gt;status-&gt;hw_ptr;</div><div class='add'>+		__entry-&gt;hw_ptr_base = (substream)-&gt;runtime-&gt;hw_ptr_base;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s/sub%d: XRUN: old=%lu, base=%lu, period=%lu, buf=%lu",</div><div class='add'>+		  __entry-&gt;card, __entry-&gt;device,</div><div class='add'>+		  __entry-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",</div><div class='add'>+		  __entry-&gt;number,</div><div class='add'>+		  (unsigned long)__entry-&gt;old_hw_ptr,</div><div class='add'>+		  (unsigned long)__entry-&gt;hw_ptr_base,</div><div class='add'>+		  (unsigned long)__entry-&gt;period_size,</div><div class='add'>+		  (unsigned long)__entry-&gt;buffer_size)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hw_ptr_error,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream, const char *why),</div><div class='add'>+	TP_ARGS(substream, why),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( unsigned int, card )</div><div class='add'>+		__field( unsigned int, device )</div><div class='add'>+		__field( unsigned int, number )</div><div class='add'>+		__field( unsigned int, stream )</div><div class='add'>+		__string( reason, why )</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = (substream)-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = (substream)-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;number = (substream)-&gt;number;</div><div class='add'>+		__entry-&gt;stream = (substream)-&gt;stream;</div><div class='add'>+		__assign_str(reason);</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s/sub%d: ERROR: %s",</div><div class='add'>+		  __entry-&gt;card, __entry-&gt;device,</div><div class='add'>+		  __entry-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",</div><div class='add'>+		  __entry-&gt;number, __get_str(reason))</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(applptr,</div><div class='add'>+	TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_uframes_t prev, snd_pcm_uframes_t curr),</div><div class='add'>+	TP_ARGS(substream, prev, curr),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( unsigned int, card )</div><div class='add'>+		__field( unsigned int, device )</div><div class='add'>+		__field( unsigned int, number )</div><div class='add'>+		__field( unsigned int, stream )</div><div class='add'>+		__field( snd_pcm_uframes_t, prev )</div><div class='add'>+		__field( snd_pcm_uframes_t, curr )</div><div class='add'>+		__field( snd_pcm_uframes_t, avail )</div><div class='add'>+		__field( snd_pcm_uframes_t, period_size )</div><div class='add'>+		__field( snd_pcm_uframes_t, buffer_size )</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = (substream)-&gt;pcm-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;device = (substream)-&gt;pcm-&gt;device;</div><div class='add'>+		__entry-&gt;number = (substream)-&gt;number;</div><div class='add'>+		__entry-&gt;stream = (substream)-&gt;stream;</div><div class='add'>+		__entry-&gt;prev = (prev);</div><div class='add'>+		__entry-&gt;curr = (curr);</div><div class='add'>+		__entry-&gt;avail = (substream)-&gt;stream ? snd_pcm_capture_avail(substream-&gt;runtime) : snd_pcm_playback_avail(substream-&gt;runtime);</div><div class='add'>+		__entry-&gt;period_size = (substream)-&gt;runtime-&gt;period_size;</div><div class='add'>+		__entry-&gt;buffer_size = (substream)-&gt;runtime-&gt;buffer_size;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("pcmC%dD%d%s/sub%d: prev=%lu, curr=%lu, avail=%lu, period=%lu, buf=%lu",</div><div class='add'>+		__entry-&gt;card,</div><div class='add'>+		__entry-&gt;device,</div><div class='add'>+		__entry-&gt;stream ? "c" : "p",</div><div class='add'>+		__entry-&gt;number,</div><div class='add'>+		__entry-&gt;prev,</div><div class='add'>+		__entry-&gt;curr,</div><div class='add'>+		__entry-&gt;avail,</div><div class='add'>+		__entry-&gt;period_size,</div><div class='add'>+		__entry-&gt;buffer_size</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _PCM_TRACE_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c<br/>index cbbed0db9e56..8969ee2757f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/rawmidi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rawmidi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/rawmidi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/rawmidi.c</a></div><div class='hunk'>@@ -1,39 +1,27 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Abstract layer for MIDI v1.0 stream</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;linux/major.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Midlevel RawMidi code for ALSA.");</div><div class='hunk'>@@ -48,7 +36,6 @@ module_param_array(amidi_map, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(amidi_map, "Raw MIDI device number assigned to 2nd OSS device.");</div><div class='ctx'> #endif /* CONFIG_SND_OSSEMUL */</div><div class='ctx'> </div><div class='del'>-static int snd_rawmidi_free(struct snd_rawmidi *rawmidi);</div><div class='ctx'> static int snd_rawmidi_dev_free(struct snd_device *device);</div><div class='ctx'> static int snd_rawmidi_dev_register(struct snd_device *device);</div><div class='ctx'> static int snd_rawmidi_dev_disconnect(struct snd_device *device);</div><div class='hunk'>@@ -56,6 +43,39 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device);</div><div class='ctx'> static LIST_HEAD(snd_rawmidi_devices);</div><div class='ctx'> static DEFINE_MUTEX(register_mutex);</div><div class='ctx'> </div><div class='add'>+#define rmidi_err(rmidi, fmt, args...) \</div><div class='add'>+	dev_err((rmidi)-&gt;dev, fmt, ##args)</div><div class='add'>+#define rmidi_warn(rmidi, fmt, args...) \</div><div class='add'>+	dev_warn((rmidi)-&gt;dev, fmt, ##args)</div><div class='add'>+#define rmidi_dbg(rmidi, fmt, args...) \</div><div class='add'>+	dev_dbg((rmidi)-&gt;dev, fmt, ##args)</div><div class='add'>+</div><div class='add'>+struct snd_rawmidi_status32 {</div><div class='add'>+	s32 stream;</div><div class='add'>+	s32 tstamp_sec;			/* Timestamp */</div><div class='add'>+	s32 tstamp_nsec;</div><div class='add'>+	u32 avail;			/* available bytes */</div><div class='add'>+	u32 xruns;			/* count of overruns since last status (in bytes) */</div><div class='add'>+	unsigned char reserved[16];	/* reserved for future use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SNDRV_RAWMIDI_IOCTL_STATUS32	_IOWR('W', 0x20, struct snd_rawmidi_status32)</div><div class='add'>+</div><div class='add'>+struct snd_rawmidi_status64 {</div><div class='add'>+	int stream;</div><div class='add'>+	u8 rsvd[4];			/* alignment */</div><div class='add'>+	s64 tstamp_sec;			/* Timestamp */</div><div class='add'>+	s64 tstamp_nsec;</div><div class='add'>+	size_t avail;			/* available bytes */</div><div class='add'>+	size_t xruns;			/* count of overruns since last status (in bytes) */</div><div class='add'>+	unsigned char reserved[16];	/* reserved for future use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SNDRV_RAWMIDI_IOCTL_STATUS64	_IOWR('W', 0x20, struct snd_rawmidi_status64)</div><div class='add'>+</div><div class='add'>+#define rawmidi_is_ump(rmidi) \</div><div class='add'>+	(IS_ENABLED(CONFIG_SND_UMP) &amp;&amp; ((rmidi)-&gt;info_flags &amp; SNDRV_RAWMIDI_INFO_UMP))</div><div class='add'>+</div><div class='ctx'> static struct snd_rawmidi *snd_rawmidi_search(struct snd_card *card, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rawmidi;</div><div class='hunk'>@@ -78,48 +98,73 @@ static inline unsigned short snd_rawmidi_file_flags(struct file *file)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int snd_rawmidi_ready(struct snd_rawmidi_substream *substream)</div><div class='add'>+static inline bool __snd_rawmidi_ready(struct snd_rawmidi_runtime *runtime)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	return runtime-&gt;avail &gt;= runtime-&gt;avail_min;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool snd_rawmidi_ready(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	return __snd_rawmidi_ready(substream-&gt;runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int snd_rawmidi_ready_append(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 					   size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='ctx'> 	return runtime-&gt;avail &gt;= runtime-&gt;avail_min &amp;&amp;</div><div class='ctx'> 	       (!substream-&gt;append || runtime-&gt;avail &gt;= count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_rawmidi_input_event_tasklet(unsigned long data)</div><div class='add'>+static void snd_rawmidi_input_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_runtime *runtime =</div><div class='add'>+		container_of(work, struct snd_rawmidi_runtime, event_work);</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;event)</div><div class='add'>+		runtime-&gt;event(runtime-&gt;substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* buffer refcount management: call with substream-&gt;lock held */</div><div class='add'>+static inline void snd_rawmidi_buffer_ref(struct snd_rawmidi_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	runtime-&gt;buffer_ref++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void snd_rawmidi_buffer_unref(struct snd_rawmidi_runtime *runtime)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *)data;</div><div class='del'>-	substream-&gt;runtime-&gt;event(substream);</div><div class='add'>+	runtime-&gt;buffer_ref--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_rawmidi_output_trigger_tasklet(unsigned long data)</div><div class='add'>+static void snd_rawmidi_buffer_ref_sync(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *)data;</div><div class='del'>-	substream-&gt;ops-&gt;trigger(substream, 1);</div><div class='add'>+	int loop = HZ;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+	while (substream-&gt;runtime-&gt;buffer_ref) {</div><div class='add'>+		spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='add'>+		if (!--loop) {</div><div class='add'>+			rmidi_err(substream-&gt;rmidi, "Buffer ref sync timeout\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		schedule_timeout_uninterruptible(1);</div><div class='add'>+		spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	if ((runtime = kzalloc(sizeof(*runtime), GFP_KERNEL)) == NULL)</div><div class='add'>+	runtime = kzalloc(sizeof(*runtime), GFP_KERNEL);</div><div class='add'>+	if (!runtime)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	spin_lock_init(&amp;runtime-&gt;lock);</div><div class='add'>+	runtime-&gt;substream = substream;</div><div class='ctx'> 	init_waitqueue_head(&amp;runtime-&gt;sleep);</div><div class='del'>-	if (substream-&gt;stream == SNDRV_RAWMIDI_STREAM_INPUT)</div><div class='del'>-		tasklet_init(&amp;runtime-&gt;tasklet,</div><div class='del'>-			     snd_rawmidi_input_event_tasklet,</div><div class='del'>-			     (unsigned long)substream);</div><div class='del'>-	else</div><div class='del'>-		tasklet_init(&amp;runtime-&gt;tasklet,</div><div class='del'>-			     snd_rawmidi_output_trigger_tasklet,</div><div class='del'>-			     (unsigned long)substream);</div><div class='add'>+	INIT_WORK(&amp;runtime-&gt;event_work, snd_rawmidi_input_event_work);</div><div class='ctx'> 	runtime-&gt;event = NULL;</div><div class='ctx'> 	runtime-&gt;buffer_size = PAGE_SIZE;</div><div class='ctx'> 	runtime-&gt;avail_min = 1;</div><div class='hunk'>@@ -127,35 +172,45 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		runtime-&gt;avail = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		runtime-&gt;avail = runtime-&gt;buffer_size;</div><div class='del'>-	if ((runtime-&gt;buffer = kmalloc(runtime-&gt;buffer_size, GFP_KERNEL)) == NULL) {</div><div class='add'>+	runtime-&gt;buffer = kvzalloc(runtime-&gt;buffer_size, GFP_KERNEL);</div><div class='add'>+	if (!runtime-&gt;buffer) {</div><div class='ctx'> 		kfree(runtime);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime-&gt;appl_ptr = runtime-&gt;hw_ptr = 0;</div><div class='ctx'> 	substream-&gt;runtime = runtime;</div><div class='add'>+	if (rawmidi_is_ump(substream-&gt;rmidi))</div><div class='add'>+		runtime-&gt;align = 3;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* get the current alignment (either 0 or 3) */</div><div class='add'>+static inline int get_align(struct snd_rawmidi_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (IS_ENABLED(CONFIG_SND_UMP))</div><div class='add'>+		return runtime-&gt;align;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get the trimmed size with the current alignment */</div><div class='add'>+#define get_aligned_size(runtime, size) ((size) &amp; ~get_align(runtime))</div><div class='add'>+</div><div class='ctx'> static int snd_rawmidi_runtime_free(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	kfree(runtime-&gt;buffer);</div><div class='add'>+	kvfree(runtime-&gt;buffer);</div><div class='ctx'> 	kfree(runtime);</div><div class='ctx'> 	substream-&gt;runtime = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *substream,int up)</div><div class='add'>+static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='ctx'> 	if (!substream-&gt;opened)</div><div class='ctx'> 		return;</div><div class='del'>-	if (up) {</div><div class='del'>-		tasklet_schedule(&amp;substream-&gt;runtime-&gt;tasklet);</div><div class='del'>-	} else {</div><div class='del'>-		tasklet_kill(&amp;substream-&gt;runtime-&gt;tasklet);</div><div class='del'>-		substream-&gt;ops-&gt;trigger(substream, 0);</div><div class='del'>-	}</div><div class='add'>+	substream-&gt;ops-&gt;trigger(substream, up);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_rawmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='hunk'>@@ -163,42 +218,64 @@ static void snd_rawmidi_input_trigger(struct snd_rawmidi_substream *substream, i</div><div class='ctx'> 	if (!substream-&gt;opened)</div><div class='ctx'> 		return;</div><div class='ctx'> 	substream-&gt;ops-&gt;trigger(substream, up);</div><div class='del'>-	if (!up &amp;&amp; substream-&gt;runtime-&gt;event)</div><div class='del'>-		tasklet_kill(&amp;substream-&gt;runtime-&gt;tasklet);</div><div class='add'>+	if (!up)</div><div class='add'>+		cancel_work_sync(&amp;substream-&gt;runtime-&gt;event_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_rawmidi_drop_output(struct snd_rawmidi_substream *substream)</div><div class='add'>+static void __reset_runtime_ptrs(struct snd_rawmidi_runtime *runtime,</div><div class='add'>+				 bool is_input)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	snd_rawmidi_output_trigger(substream, 0);</div><div class='ctx'> 	runtime-&gt;drain = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	runtime-&gt;appl_ptr = runtime-&gt;hw_ptr = 0;</div><div class='del'>-	runtime-&gt;avail = runtime-&gt;buffer_size;</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='add'>+	runtime-&gt;avail = is_input ? 0 : runtime-&gt;buffer_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_runtime_ptrs(struct snd_rawmidi_substream *substream,</div><div class='add'>+			       bool is_input)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	if (substream-&gt;opened &amp;&amp; substream-&gt;runtime)</div><div class='add'>+		__reset_runtime_ptrs(substream-&gt;runtime, is_input);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_rawmidi_drop_output(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_rawmidi_output_trigger(substream, 0);</div><div class='add'>+	reset_runtime_ptrs(substream, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_drop_output);</div><div class='ctx'> </div><div class='ctx'> int snd_rawmidi_drain_output(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	long timeout;</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_rawmidi_runtime *runtime;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;substream-&gt;lock) {</div><div class='add'>+		runtime = substream-&gt;runtime;</div><div class='add'>+		if (!substream-&gt;opened || !runtime || !runtime-&gt;buffer)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		snd_rawmidi_buffer_ref(runtime);</div><div class='add'>+		runtime-&gt;drain = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-	runtime-&gt;drain = 1;</div><div class='ctx'> 	timeout = wait_event_interruptible_timeout(runtime-&gt;sleep,</div><div class='ctx'> 				(runtime-&gt;avail &gt;= runtime-&gt;buffer_size),</div><div class='ctx'> 				10*HZ);</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		err = -ERESTARTSYS;</div><div class='del'>-	if (runtime-&gt;avail &lt; runtime-&gt;buffer_size &amp;&amp; !timeout) {</div><div class='del'>-		snd_printk(KERN_WARNING "rawmidi drain error (avail = %li, buffer_size = %li)\n", (long)runtime-&gt;avail, (long)runtime-&gt;buffer_size);</div><div class='del'>-		err = -EIO;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;substream-&gt;lock) {</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			err = -ERESTARTSYS;</div><div class='add'>+		if (runtime-&gt;avail &lt; runtime-&gt;buffer_size &amp;&amp; !timeout) {</div><div class='add'>+			rmidi_warn(substream-&gt;rmidi,</div><div class='add'>+				   "rawmidi drain error (avail = %li, buffer_size = %li)\n",</div><div class='add'>+				   (long)runtime-&gt;avail, (long)runtime-&gt;buffer_size);</div><div class='add'>+			err = -EIO;</div><div class='add'>+		}</div><div class='add'>+		runtime-&gt;drain = 0;</div><div class='ctx'> 	}</div><div class='del'>-	runtime-&gt;drain = 0;</div><div class='add'>+</div><div class='ctx'> 	if (err != -ERESTARTSYS) {</div><div class='ctx'> 		/* we need wait a while to make sure that Tx FIFOs are empty */</div><div class='ctx'> 		if (substream-&gt;ops-&gt;drain)</div><div class='hunk'>@@ -207,22 +284,21 @@ int snd_rawmidi_drain_output(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 			msleep(50);</div><div class='ctx'> 		snd_rawmidi_drop_output(substream);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;substream-&gt;lock)</div><div class='add'>+		snd_rawmidi_buffer_unref(runtime);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_drain_output);</div><div class='ctx'> </div><div class='ctx'> int snd_rawmidi_drain_input(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='ctx'> 	snd_rawmidi_input_trigger(substream, 0);</div><div class='del'>-	runtime-&gt;drain = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='del'>-	runtime-&gt;appl_ptr = runtime-&gt;hw_ptr = 0;</div><div class='del'>-	runtime-&gt;avail = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='add'>+	reset_runtime_ptrs(substream, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_drain_input);</div><div class='ctx'> </div><div class='ctx'> /* look for an available substream for the given stream direction;</div><div class='ctx'>  * if a specific subdevice is given, try to assign it</div><div class='hunk'>@@ -233,7 +309,7 @@ static int assign_substream(struct snd_rawmidi *rmidi, int subdevice,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='ctx'> 	struct snd_rawmidi_str *s = &amp;rmidi-&gt;streams[stream];</div><div class='del'>-	static unsigned int info_flags[2] = {</div><div class='add'>+	static const unsigned int info_flags[2] = {</div><div class='ctx'> 		[SNDRV_RAWMIDI_STREAM_OUTPUT] = SNDRV_RAWMIDI_INFO_OUTPUT,</div><div class='ctx'> 		[SNDRV_RAWMIDI_STREAM_INPUT] = SNDRV_RAWMIDI_INFO_INPUT,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -274,6 +350,7 @@ static int open_substream(struct snd_rawmidi *rmidi,</div><div class='ctx'> 			snd_rawmidi_runtime_free(substream);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='add'>+		guard(spinlock_irq)(&amp;substream-&gt;lock);</div><div class='ctx'> 		substream-&gt;opened = 1;</div><div class='ctx'> 		substream-&gt;active_sensing = 0;</div><div class='ctx'> 		if (mode &amp; SNDRV_RAWMIDI_LFLG_APPEND)</div><div class='hunk'>@@ -332,34 +409,23 @@ static int rawmidi_open_priv(struct snd_rawmidi *rmidi, int subdevice, int mode,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* called from sound/core/seq/seq_midi.c */</div><div class='del'>-int snd_rawmidi_kernel_open(struct snd_card *card, int device, int subdevice,</div><div class='del'>-			    int mode, struct snd_rawmidi_file * rfile)</div><div class='add'>+int snd_rawmidi_kernel_open(struct snd_rawmidi *rmidi, int subdevice,</div><div class='add'>+			    int mode, struct snd_rawmidi_file *rfile)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!rfile))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	rmidi = snd_rawmidi_search(card, device);</div><div class='del'>-	if (rmidi == NULL) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (!try_module_get(rmidi-&gt;card-&gt;module)) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	if (!try_module_get(rmidi-&gt;card-&gt;module))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	err = rawmidi_open_priv(rmidi, subdevice, mode, rfile);</div><div class='del'>-	mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		module_put(rmidi-&gt;card-&gt;module);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_kernel_open);</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -370,13 +436,12 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct snd_rawmidi_file *rawmidi_file = NULL;</div><div class='del'>-	wait_queue_t wait;</div><div class='del'>-	struct snd_ctl_file *kctl;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='del'>-	if ((file-&gt;f_flags &amp; O_APPEND) &amp;&amp; !(file-&gt;f_flags &amp; O_NONBLOCK)) </div><div class='add'>+	if ((file-&gt;f_flags &amp; O_APPEND) &amp;&amp; !(file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='ctx'> 		return -EINVAL;		/* invalid combination */</div><div class='ctx'> </div><div class='del'>-	err = nonseekable_open(inode, file);</div><div class='add'>+	err = stream_open(inode, file);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -394,8 +459,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (rmidi == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (!try_module_get(rmidi-&gt;card-&gt;module))</div><div class='add'>+	if (!try_module_get(rmidi-&gt;card-&gt;module)) {</div><div class='add'>+		snd_card_unref(rmidi-&gt;card);</div><div class='ctx'> 		return -ENXIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	card = rmidi-&gt;card;</div><div class='hunk'>@@ -410,19 +477,11 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto __error;</div><div class='ctx'> 	}</div><div class='add'>+	rawmidi_file-&gt;user_pversion = 0;</div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 	add_wait_queue(&amp;rmidi-&gt;open_wait, &amp;wait);</div><div class='ctx'> 	while (1) {</div><div class='del'>-		subdevice = -1;</div><div class='del'>-		read_lock(&amp;card-&gt;ctl_files_rwlock);</div><div class='del'>-		list_for_each_entry(kctl, &amp;card-&gt;ctl_files, list) {</div><div class='del'>-			if (kctl-&gt;pid == task_pid(current)) {</div><div class='del'>-				subdevice = kctl-&gt;prefer_rawmidi_subdevice;</div><div class='del'>-				if (subdevice != -1)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		read_unlock(&amp;card-&gt;ctl_files_rwlock);</div><div class='add'>+		subdevice = snd_ctl_get_preferred_subdevice(card, SND_CTL_SUBDEV_RAWMIDI);</div><div class='ctx'> 		err = rawmidi_open_priv(rmidi, subdevice, fflags, rawmidi_file);</div><div class='ctx'> 		if (err &gt;= 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -437,6 +496,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 		schedule();</div><div class='ctx'> 		mutex_lock(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+		if (rmidi-&gt;card-&gt;shutdown) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			err = -ERESTARTSYS;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -455,6 +518,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'> #endif</div><div class='ctx'> 	file-&gt;private_data = rawmidi_file;</div><div class='ctx'> 	mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	snd_card_unref(rmidi-&gt;card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  __error:</div><div class='hunk'>@@ -462,6 +526,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)</div><div class='ctx'>  __error_card:</div><div class='ctx'> 	mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	module_put(rmidi-&gt;card-&gt;module);</div><div class='add'>+	snd_card_unref(rmidi-&gt;card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -486,13 +551,16 @@ static void close_substream(struct snd_rawmidi *rmidi,</div><div class='ctx'> 			if (snd_rawmidi_drain_output(substream) == -ERESTARTSYS)</div><div class='ctx'> 				snd_rawmidi_output_trigger(substream, 0);</div><div class='ctx'> 		}</div><div class='add'>+		snd_rawmidi_buffer_ref_sync(substream);</div><div class='add'>+	}</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;substream-&gt;lock) {</div><div class='add'>+		substream-&gt;opened = 0;</div><div class='add'>+		substream-&gt;append = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	substream-&gt;ops-&gt;close(substream);</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;private_free)</div><div class='ctx'> 		substream-&gt;runtime-&gt;private_free(substream);</div><div class='ctx'> 	snd_rawmidi_runtime_free(substream);</div><div class='del'>-	substream-&gt;opened = 0;</div><div class='del'>-	substream-&gt;append = 0;</div><div class='ctx'> 	put_pid(substream-&gt;pid);</div><div class='ctx'> 	substream-&gt;pid = NULL;</div><div class='ctx'> 	rmidi-&gt;streams[substream-&gt;stream].substream_opened--;</div><div class='hunk'>@@ -503,7 +571,7 @@ static void rawmidi_release_priv(struct snd_rawmidi_file *rfile)</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> </div><div class='ctx'> 	rmidi = rfile-&gt;rmidi;</div><div class='del'>-	mutex_lock(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	if (rfile-&gt;input) {</div><div class='ctx'> 		close_substream(rmidi, rfile-&gt;input, 1);</div><div class='ctx'> 		rfile-&gt;input = NULL;</div><div class='hunk'>@@ -513,7 +581,6 @@ static void rawmidi_release_priv(struct snd_rawmidi_file *rfile)</div><div class='ctx'> 		rfile-&gt;output = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	rfile-&gt;rmidi = NULL;</div><div class='del'>-	mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	wake_up(&amp;rmidi-&gt;open_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -524,12 +591,13 @@ int snd_rawmidi_kernel_release(struct snd_rawmidi_file *rfile)</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!rfile))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	rmidi = rfile-&gt;rmidi;</div><div class='ctx'> 	rawmidi_release_priv(rfile);</div><div class='ctx'> 	module_put(rmidi-&gt;card-&gt;module);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_kernel_release);</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='hunk'>@@ -551,7 +619,7 @@ static int snd_rawmidi_info(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 			    struct snd_rawmidi_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	rmidi = substream-&gt;rmidi;</div><div class='hunk'>@@ -561,40 +629,45 @@ static int snd_rawmidi_info(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	info-&gt;subdevice = substream-&gt;number;</div><div class='ctx'> 	info-&gt;stream = substream-&gt;stream;</div><div class='ctx'> 	info-&gt;flags = rmidi-&gt;info_flags;</div><div class='del'>-	strcpy(info-&gt;id, rmidi-&gt;id);</div><div class='del'>-	strcpy(info-&gt;name, rmidi-&gt;name);</div><div class='del'>-	strcpy(info-&gt;subname, substream-&gt;name);</div><div class='add'>+	if (substream-&gt;inactive)</div><div class='add'>+		info-&gt;flags |= SNDRV_RAWMIDI_INFO_STREAM_INACTIVE;</div><div class='add'>+	strscpy(info-&gt;id, rmidi-&gt;id);</div><div class='add'>+	strscpy(info-&gt;name, rmidi-&gt;name);</div><div class='add'>+	strscpy(info-&gt;subname, substream-&gt;name);</div><div class='ctx'> 	info-&gt;subdevices_count = substream-&gt;pstr-&gt;substream_count;</div><div class='ctx'> 	info-&gt;subdevices_avail = (substream-&gt;pstr-&gt;substream_count -</div><div class='ctx'> 				  substream-&gt;pstr-&gt;substream_opened);</div><div class='add'>+	info-&gt;tied_device = rmidi-&gt;tied_device;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_info_user(struct snd_rawmidi_substream *substream,</div><div class='del'>-				 struct snd_rawmidi_info __user * _info)</div><div class='add'>+				 struct snd_rawmidi_info __user *_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_info info;</div><div class='ctx'> 	int err;</div><div class='del'>-	if ((err = snd_rawmidi_info(substream, &amp;info)) &lt; 0)</div><div class='add'>+</div><div class='add'>+	err = snd_rawmidi_info(substream, &amp;info);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(struct snd_rawmidi_info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info)</div><div class='add'>+static int __snd_rawmidi_info_select(struct snd_card *card,</div><div class='add'>+				     struct snd_rawmidi_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct snd_rawmidi_str *pstr;</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='ctx'> 	rmidi = snd_rawmidi_search(card, info-&gt;device);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	if (!rmidi)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (info-&gt;stream &lt; 0 || info-&gt;stream &gt; 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	info-&gt;stream = array_index_nospec(info-&gt;stream, 2);</div><div class='ctx'> 	pstr = &amp;rmidi-&gt;streams[info-&gt;stream];</div><div class='ctx'> 	if (pstr-&gt;substream_count == 0)</div><div class='ctx'> 		return -ENOENT;</div><div class='hunk'>@@ -607,109 +680,216 @@ int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	return __snd_rawmidi_info_select(card, info);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_info_select);</div><div class='add'>+</div><div class='ctx'> static int snd_rawmidi_info_select_user(struct snd_card *card,</div><div class='ctx'> 					struct snd_rawmidi_info __user *_info)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_rawmidi_info info;</div><div class='add'>+</div><div class='ctx'> 	if (get_user(info.device, &amp;_info-&gt;device))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (get_user(info.stream, &amp;_info-&gt;stream))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	if (get_user(info.subdevice, &amp;_info-&gt;subdevice))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if ((err = snd_rawmidi_info_select(card, &amp;info)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_info_select(card, &amp;info);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(struct snd_rawmidi_info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,</div><div class='del'>-			      struct snd_rawmidi_params * params)</div><div class='add'>+static int resize_runtime_buffer(struct snd_rawmidi_substream *substream,</div><div class='add'>+				 struct snd_rawmidi_params *params,</div><div class='add'>+				 bool is_input)</div><div class='ctx'> {</div><div class='del'>-	char *newbuf;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	</div><div class='del'>-	if (substream-&gt;append &amp;&amp; substream-&gt;use_count &gt; 1)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	snd_rawmidi_drain_output(substream);</div><div class='del'>-	if (params-&gt;buffer_size &lt; 32 || params-&gt;buffer_size &gt; 1024L * 1024L) {</div><div class='add'>+	char *newbuf, *oldbuf;</div><div class='add'>+	unsigned int framing = params-&gt;mode &amp; SNDRV_RAWMIDI_MODE_FRAMING_MASK;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;buffer_size &lt; 32 || params-&gt;buffer_size &gt; 1024L * 1024L)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (params-&gt;avail_min &lt; 1 || params-&gt;avail_min &gt; params-&gt;buffer_size) {</div><div class='add'>+	if (framing == SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP &amp;&amp; (params-&gt;buffer_size &amp; 0x1f) != 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (params-&gt;avail_min &lt; 1 || params-&gt;avail_min &gt; params-&gt;buffer_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (params-&gt;buffer_size &amp; get_align(runtime))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	if (params-&gt;buffer_size != runtime-&gt;buffer_size) {</div><div class='del'>-		newbuf = kmalloc(params-&gt;buffer_size, GFP_KERNEL);</div><div class='add'>+		newbuf = kvzalloc(params-&gt;buffer_size, GFP_KERNEL);</div><div class='ctx'> 		if (!newbuf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		kfree(runtime-&gt;buffer);</div><div class='add'>+		spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+		if (runtime-&gt;buffer_ref) {</div><div class='add'>+			spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='add'>+			kvfree(newbuf);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		oldbuf = runtime-&gt;buffer;</div><div class='ctx'> 		runtime-&gt;buffer = newbuf;</div><div class='ctx'> 		runtime-&gt;buffer_size = params-&gt;buffer_size;</div><div class='del'>-		runtime-&gt;avail = runtime-&gt;buffer_size;</div><div class='add'>+		__reset_runtime_ptrs(runtime, is_input);</div><div class='add'>+		spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='add'>+		kvfree(oldbuf);</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime-&gt;avail_min = params-&gt;avail_min;</div><div class='del'>-	substream-&gt;active_sensing = !params-&gt;no_active_sensing;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_rawmidi_output_params(struct snd_rawmidi_substream *substream,</div><div class='add'>+			      struct snd_rawmidi_params *params)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_drain_output(substream);</div><div class='add'>+	guard(mutex)(&amp;substream-&gt;rmidi-&gt;open_mutex);</div><div class='add'>+	if (substream-&gt;append &amp;&amp; substream-&gt;use_count &gt; 1)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	err = resize_runtime_buffer(substream, params, false);</div><div class='add'>+	if (!err)</div><div class='add'>+		substream-&gt;active_sensing = !params-&gt;no_active_sensing;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_output_params);</div><div class='add'>+</div><div class='ctx'> int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream,</div><div class='del'>-			     struct snd_rawmidi_params * params)</div><div class='add'>+			     struct snd_rawmidi_params *params)</div><div class='ctx'> {</div><div class='del'>-	char *newbuf;</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int framing = params-&gt;mode &amp; SNDRV_RAWMIDI_MODE_FRAMING_MASK;</div><div class='add'>+	unsigned int clock_type = params-&gt;mode &amp; SNDRV_RAWMIDI_MODE_CLOCK_MASK;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	snd_rawmidi_drain_input(substream);</div><div class='del'>-	if (params-&gt;buffer_size &lt; 32 || params-&gt;buffer_size &gt; 1024L * 1024L) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (params-&gt;avail_min &lt; 1 || params-&gt;avail_min &gt; params-&gt;buffer_size) {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (params-&gt;buffer_size != runtime-&gt;buffer_size) {</div><div class='del'>-		newbuf = kmalloc(params-&gt;buffer_size, GFP_KERNEL);</div><div class='del'>-		if (!newbuf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		kfree(runtime-&gt;buffer);</div><div class='del'>-		runtime-&gt;buffer = newbuf;</div><div class='del'>-		runtime-&gt;buffer_size = params-&gt;buffer_size;</div><div class='add'>+	guard(mutex)(&amp;substream-&gt;rmidi-&gt;open_mutex);</div><div class='add'>+	if (framing == SNDRV_RAWMIDI_MODE_FRAMING_NONE &amp;&amp; clock_type != SNDRV_RAWMIDI_MODE_CLOCK_NONE)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (clock_type &gt; SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC_RAW)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (framing &gt; SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		err = resize_runtime_buffer(substream, params, true);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		substream-&gt;framing = framing;</div><div class='add'>+		substream-&gt;clock_type = clock_type;</div><div class='ctx'> 	}</div><div class='del'>-	runtime-&gt;avail_min = params-&gt;avail_min;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_input_params);</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_output_status(struct snd_rawmidi_substream *substream,</div><div class='del'>-				     struct snd_rawmidi_status * status)</div><div class='add'>+				     struct snd_rawmidi_status64 *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> 	status-&gt;stream = SNDRV_RAWMIDI_STREAM_OUTPUT;</div><div class='del'>-	spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;substream-&gt;lock);</div><div class='ctx'> 	status-&gt;avail = runtime-&gt;avail;</div><div class='del'>-	spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_input_status(struct snd_rawmidi_substream *substream,</div><div class='del'>-				    struct snd_rawmidi_status * status)</div><div class='add'>+				    struct snd_rawmidi_status64 *status)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	memset(status, 0, sizeof(*status));</div><div class='ctx'> 	status-&gt;stream = SNDRV_RAWMIDI_STREAM_INPUT;</div><div class='del'>-	spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;substream-&gt;lock);</div><div class='ctx'> 	status-&gt;avail = runtime-&gt;avail;</div><div class='ctx'> 	status-&gt;xruns = runtime-&gt;xruns;</div><div class='ctx'> 	runtime-&gt;xruns = 0;</div><div class='del'>-	spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_rawmidi_ioctl_status32(struct snd_rawmidi_file *rfile,</div><div class='add'>+				      struct snd_rawmidi_status32 __user *argp)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct snd_rawmidi_status32 __user *status = argp;</div><div class='add'>+	struct snd_rawmidi_status32 status32;</div><div class='add'>+	struct snd_rawmidi_status64 status64;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;status32, argp,</div><div class='add'>+			   sizeof(struct snd_rawmidi_status32)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (status32.stream) {</div><div class='add'>+	case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='add'>+		if (rfile-&gt;output == NULL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = snd_rawmidi_output_status(rfile-&gt;output, &amp;status64);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_RAWMIDI_STREAM_INPUT:</div><div class='add'>+		if (rfile-&gt;input == NULL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = snd_rawmidi_input_status(rfile-&gt;input, &amp;status64);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	status32 = (struct snd_rawmidi_status32) {</div><div class='add'>+		.stream = status64.stream,</div><div class='add'>+		.tstamp_sec = status64.tstamp_sec,</div><div class='add'>+		.tstamp_nsec = status64.tstamp_nsec,</div><div class='add'>+		.avail = status64.avail,</div><div class='add'>+		.xruns = status64.xruns,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(status, &amp;status32, sizeof(*status)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_rawmidi_ioctl_status64(struct snd_rawmidi_file *rfile,</div><div class='add'>+				      struct snd_rawmidi_status64 __user *argp)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct snd_rawmidi_status64 status;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;status, argp, sizeof(struct snd_rawmidi_status64)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	switch (status.stream) {</div><div class='add'>+	case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='add'>+		if (rfile-&gt;output == NULL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = snd_rawmidi_output_status(rfile-&gt;output, &amp;status);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_RAWMIDI_STREAM_INPUT:</div><div class='add'>+		if (rfile-&gt;input == NULL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = snd_rawmidi_input_status(rfile-&gt;input, &amp;status);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (copy_to_user(argp, &amp;status,</div><div class='add'>+			 sizeof(struct snd_rawmidi_status64)))</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_file *rfile;</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	rfile = file-&gt;private_data;</div><div class='hunk'>@@ -722,6 +902,7 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 	{</div><div class='ctx'> 		int stream;</div><div class='ctx'> 		struct snd_rawmidi_info __user *info = argp;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(stream, &amp;info-&gt;stream))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (stream) {</div><div class='hunk'>@@ -733,11 +914,21 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	case SNDRV_RAWMIDI_IOCTL_USER_PVERSION:</div><div class='add'>+		if (get_user(rfile-&gt;user_pversion, (unsigned int __user *)arg))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_PARAMS:</div><div class='ctx'> 	{</div><div class='ctx'> 		struct snd_rawmidi_params params;</div><div class='add'>+</div><div class='ctx'> 		if (copy_from_user(&amp;params, argp, sizeof(struct snd_rawmidi_params)))</div><div class='ctx'> 			return -EFAULT;</div><div class='add'>+		if (rfile-&gt;user_pversion &lt; SNDRV_PROTOCOL_VERSION(2, 0, 2)) {</div><div class='add'>+			params.mode = 0;</div><div class='add'>+			memset(params.reserved, 0, sizeof(params.reserved));</div><div class='add'>+		}</div><div class='ctx'> 		switch (params.stream) {</div><div class='ctx'> 		case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='ctx'> 			if (rfile-&gt;output == NULL)</div><div class='hunk'>@@ -751,35 +942,14 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	case SNDRV_RAWMIDI_IOCTL_STATUS:</div><div class='del'>-	{</div><div class='del'>-		int err = 0;</div><div class='del'>-		struct snd_rawmidi_status status;</div><div class='del'>-		if (copy_from_user(&amp;status, argp, sizeof(struct snd_rawmidi_status)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		switch (status.stream) {</div><div class='del'>-		case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='del'>-			if (rfile-&gt;output == NULL)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			err = snd_rawmidi_output_status(rfile-&gt;output, &amp;status);</div><div class='del'>-			break;</div><div class='del'>-		case SNDRV_RAWMIDI_STREAM_INPUT:</div><div class='del'>-			if (rfile-&gt;input == NULL)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			err = snd_rawmidi_input_status(rfile-&gt;input, &amp;status);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (copy_to_user(argp, &amp;status, sizeof(struct snd_rawmidi_status)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	case SNDRV_RAWMIDI_IOCTL_STATUS32:</div><div class='add'>+		return snd_rawmidi_ioctl_status32(rfile, argp);</div><div class='add'>+	case SNDRV_RAWMIDI_IOCTL_STATUS64:</div><div class='add'>+		return snd_rawmidi_ioctl_status64(rfile, argp);</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_DROP:</div><div class='ctx'> 	{</div><div class='ctx'> 		int val;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(val, (int __user *) argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (val) {</div><div class='hunk'>@@ -794,6 +964,7 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_DRAIN:</div><div class='ctx'> 	{</div><div class='ctx'> 		int val;</div><div class='add'>+</div><div class='ctx'> 		if (get_user(val, (int __user *) argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		switch (val) {</div><div class='hunk'>@@ -809,14 +980,66 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "rawmidi: unknown command = 0x%x\n", cmd);</div><div class='del'>-#endif</div><div class='add'>+		rmidi = rfile-&gt;rmidi;</div><div class='add'>+		if (rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;ioctl)</div><div class='add'>+			return rmidi-&gt;ops-&gt;ioctl(rmidi, cmd, argp);</div><div class='add'>+		rmidi_dbg(rmidi, "rawmidi: unknown command = 0x%x\n", cmd);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOTTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* ioctl to find the next device; either legacy or UMP depending on @find_ump */</div><div class='add'>+static int snd_rawmidi_next_device(struct snd_card *card, int __user *argp,</div><div class='add'>+				   bool find_ump)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	int device;</div><div class='add'>+	bool is_ump;</div><div class='add'>+</div><div class='add'>+	if (get_user(device, argp))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (device &gt;= SNDRV_RAWMIDI_DEVICES) /* next device is -1 */</div><div class='add'>+		device = SNDRV_RAWMIDI_DEVICES - 1;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		device = device &lt; 0 ? 0 : device + 1;</div><div class='add'>+		for (; device &lt; SNDRV_RAWMIDI_DEVICES; device++) {</div><div class='add'>+			rmidi = snd_rawmidi_search(card, device);</div><div class='add'>+			if (!rmidi)</div><div class='add'>+				continue;</div><div class='add'>+			is_ump = rawmidi_is_ump(rmidi);</div><div class='add'>+			if (find_ump == is_ump)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (device == SNDRV_RAWMIDI_DEVICES)</div><div class='add'>+			device = -1;</div><div class='add'>+	}</div><div class='add'>+	if (put_user(device, argp))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP)</div><div class='add'>+/* inquiry of UMP endpoint and block info via control API */</div><div class='add'>+static int snd_rawmidi_call_ump_ioctl(struct snd_card *card, int cmd,</div><div class='add'>+				      void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint_info __user *info = argp;</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	int device;</div><div class='add'>+</div><div class='add'>+	if (get_user(device, &amp;info-&gt;device))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	rmidi = snd_rawmidi_search(card, device);</div><div class='add'>+	if (rmidi &amp;&amp; rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;ioctl)</div><div class='add'>+		return rmidi-&gt;ops-&gt;ioctl(rmidi, cmd, argp);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int snd_rawmidi_control_ioctl(struct snd_card *card,</div><div class='ctx'> 				     struct snd_ctl_file *control,</div><div class='ctx'> 				     unsigned int cmd,</div><div class='hunk'>@@ -826,34 +1049,22 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_RAWMIDI_NEXT_DEVICE:</div><div class='del'>-	{</div><div class='del'>-		int device;</div><div class='del'>-		</div><div class='del'>-		if (get_user(device, (int __user *)argp))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (device &gt;= SNDRV_RAWMIDI_DEVICES) /* next device is -1 */</div><div class='del'>-			device = SNDRV_RAWMIDI_DEVICES - 1;</div><div class='del'>-		mutex_lock(&amp;register_mutex);</div><div class='del'>-		device = device &lt; 0 ? 0 : device + 1;</div><div class='del'>-		while (device &lt; SNDRV_RAWMIDI_DEVICES) {</div><div class='del'>-			if (snd_rawmidi_search(card, device))</div><div class='del'>-				break;</div><div class='del'>-			device++;</div><div class='del'>-		}</div><div class='del'>-		if (device == SNDRV_RAWMIDI_DEVICES)</div><div class='del'>-			device = -1;</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		if (put_user(device, (int __user *)argp))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+		return snd_rawmidi_next_device(card, argp, false);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP)</div><div class='add'>+	case SNDRV_CTL_IOCTL_UMP_NEXT_DEVICE:</div><div class='add'>+		return snd_rawmidi_next_device(card, argp, true);</div><div class='add'>+	case SNDRV_CTL_IOCTL_UMP_ENDPOINT_INFO:</div><div class='add'>+		return snd_rawmidi_call_ump_ioctl(card, SNDRV_UMP_IOCTL_ENDPOINT_INFO, argp);</div><div class='add'>+	case SNDRV_CTL_IOCTL_UMP_BLOCK_INFO:</div><div class='add'>+		return snd_rawmidi_call_ump_ioctl(card, SNDRV_UMP_IOCTL_BLOCK_INFO, argp);</div><div class='add'>+#endif</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE:</div><div class='ctx'> 	{</div><div class='ctx'> 		int val;</div><div class='del'>-		</div><div class='add'>+</div><div class='ctx'> 		if (get_user(val, (int __user *)argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		control-&gt;prefer_rawmidi_subdevice = val;</div><div class='add'>+		control-&gt;preferred_subdevice[SND_CTL_SUBDEV_RAWMIDI] = val;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SNDRV_CTL_IOCTL_RAWMIDI_INFO:</div><div class='hunk'>@@ -862,6 +1073,63 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int receive_with_tstamp_framing(struct snd_rawmidi_substream *substream,</div><div class='add'>+			const unsigned char *buffer, int src_count, const struct timespec64 *tstamp)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_rawmidi_framing_tstamp *dest_ptr;</div><div class='add'>+	struct snd_rawmidi_framing_tstamp frame = { .tv_sec = tstamp-&gt;tv_sec, .tv_nsec = tstamp-&gt;tv_nsec };</div><div class='add'>+	int orig_count = src_count;</div><div class='add'>+	int frame_size = sizeof(struct snd_rawmidi_framing_tstamp);</div><div class='add'>+	int align = get_align(runtime);</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(frame_size != 0x20);</div><div class='add'>+	if (snd_BUG_ON((runtime-&gt;hw_ptr &amp; 0x1f) != 0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (src_count &gt; align) {</div><div class='add'>+		if ((int)(runtime-&gt;buffer_size - runtime-&gt;avail) &lt; frame_size) {</div><div class='add'>+			runtime-&gt;xruns += src_count;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (src_count &gt;= SNDRV_RAWMIDI_FRAMING_DATA_LENGTH)</div><div class='add'>+			frame.length = SNDRV_RAWMIDI_FRAMING_DATA_LENGTH;</div><div class='add'>+		else {</div><div class='add'>+			frame.length = get_aligned_size(runtime, src_count);</div><div class='add'>+			if (!frame.length)</div><div class='add'>+				break;</div><div class='add'>+			memset(frame.data, 0, SNDRV_RAWMIDI_FRAMING_DATA_LENGTH);</div><div class='add'>+		}</div><div class='add'>+		memcpy(frame.data, buffer, frame.length);</div><div class='add'>+		buffer += frame.length;</div><div class='add'>+		src_count -= frame.length;</div><div class='add'>+		dest_ptr = (struct snd_rawmidi_framing_tstamp *) (runtime-&gt;buffer + runtime-&gt;hw_ptr);</div><div class='add'>+		*dest_ptr = frame;</div><div class='add'>+		runtime-&gt;avail += frame_size;</div><div class='add'>+		runtime-&gt;hw_ptr += frame_size;</div><div class='add'>+		runtime-&gt;hw_ptr %= runtime-&gt;buffer_size;</div><div class='add'>+	}</div><div class='add'>+	return orig_count - src_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct timespec64 get_framing_tstamp(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 ts64 = {0, 0};</div><div class='add'>+</div><div class='add'>+	switch (substream-&gt;clock_type) {</div><div class='add'>+	case SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC_RAW:</div><div class='add'>+		ktime_get_raw_ts64(&amp;ts64);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_RAWMIDI_MODE_CLOCK_MONOTONIC:</div><div class='add'>+		ktime_get_ts64(&amp;ts64);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_RAWMIDI_MODE_CLOCK_REALTIME:</div><div class='add'>+		ktime_get_real_ts64(&amp;ts64);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ts64;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_rawmidi_receive - receive the input data from the device</div><div class='ctx'>  * @substream: the rawmidi substream</div><div class='hunk'>@@ -870,23 +1138,32 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,</div><div class='ctx'>  *</div><div class='ctx'>  * Reads the data from the internal buffer.</div><div class='ctx'>  *</div><div class='del'>- * Returns the size of read data, or a negative error code on failure.</div><div class='add'>+ * Return: The size of read data, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 			const unsigned char *buffer, int count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct timespec64 ts64 = get_framing_tstamp(substream);</div><div class='ctx'> 	int result = 0, count1;</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_rawmidi_runtime *runtime;</div><div class='ctx'> </div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='ctx'> 	if (!substream-&gt;opened)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	if (runtime-&gt;buffer == NULL) {</div><div class='del'>-		snd_printd("snd_rawmidi_receive: input is not active!!!\n");</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+	if (!runtime || !runtime-&gt;buffer) {</div><div class='add'>+		rmidi_dbg(substream-&gt;rmidi,</div><div class='add'>+			  "snd_rawmidi_receive: input is not active!!!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='del'>-	if (count == 1) {	/* special case, faster code */</div><div class='add'>+</div><div class='add'>+	count = get_aligned_size(runtime, count);</div><div class='add'>+	if (!count)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;framing == SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP) {</div><div class='add'>+		result = receive_with_tstamp_framing(substream, buffer, count, &amp;ts64);</div><div class='add'>+	} else if (count == 1) {	/* special case, faster code */</div><div class='ctx'> 		substream-&gt;bytes++;</div><div class='ctx'> 		if (runtime-&gt;avail &lt; runtime-&gt;buffer_size) {</div><div class='ctx'> 			runtime-&gt;buffer[runtime-&gt;hw_ptr++] = buffer[0];</div><div class='hunk'>@@ -903,6 +1180,9 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 			count1 = count;</div><div class='ctx'> 		if (count1 &gt; (int)(runtime-&gt;buffer_size - runtime-&gt;avail))</div><div class='ctx'> 			count1 = runtime-&gt;buffer_size - runtime-&gt;avail;</div><div class='add'>+		count1 = get_aligned_size(runtime, count1);</div><div class='add'>+		if (!count1)</div><div class='add'>+			return result;</div><div class='ctx'> 		memcpy(runtime-&gt;buffer + runtime-&gt;hw_ptr, buffer, count1);</div><div class='ctx'> 		runtime-&gt;hw_ptr += count1;</div><div class='ctx'> 		runtime-&gt;hw_ptr %= runtime-&gt;buffer_size;</div><div class='hunk'>@@ -926,13 +1206,13 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (result &gt; 0) {</div><div class='ctx'> 		if (runtime-&gt;event)</div><div class='del'>-			tasklet_schedule(&amp;runtime-&gt;tasklet);</div><div class='del'>-		else if (snd_rawmidi_ready(substream))</div><div class='add'>+			schedule_work(&amp;runtime-&gt;event_work);</div><div class='add'>+		else if (__snd_rawmidi_ready(runtime))</div><div class='ctx'> 			wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_receive);</div><div class='ctx'> </div><div class='ctx'> static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 				     unsigned char __user *userbuf,</div><div class='hunk'>@@ -941,32 +1221,42 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	long result = 0, count1;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned long appl_ptr;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;substream-&gt;lock, flags);</div><div class='add'>+	snd_rawmidi_buffer_ref(runtime);</div><div class='ctx'> 	while (count &gt; 0 &amp;&amp; runtime-&gt;avail) {</div><div class='ctx'> 		count1 = runtime-&gt;buffer_size - runtime-&gt;appl_ptr;</div><div class='ctx'> 		if (count1 &gt; count)</div><div class='ctx'> 			count1 = count;</div><div class='del'>-		spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 		if (count1 &gt; (int)runtime-&gt;avail)</div><div class='ctx'> 			count1 = runtime-&gt;avail;</div><div class='add'>+</div><div class='add'>+		/* update runtime-&gt;appl_ptr before unlocking for userbuf */</div><div class='add'>+		appl_ptr = runtime-&gt;appl_ptr;</div><div class='add'>+		runtime-&gt;appl_ptr += count1;</div><div class='add'>+		runtime-&gt;appl_ptr %= runtime-&gt;buffer_size;</div><div class='add'>+		runtime-&gt;avail -= count1;</div><div class='add'>+</div><div class='ctx'> 		if (kernelbuf)</div><div class='del'>-			memcpy(kernelbuf + result, runtime-&gt;buffer + runtime-&gt;appl_ptr, count1);</div><div class='add'>+			memcpy(kernelbuf + result, runtime-&gt;buffer + appl_ptr, count1);</div><div class='ctx'> 		if (userbuf) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='add'>+			spin_unlock_irqrestore(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 			if (copy_to_user(userbuf + result,</div><div class='del'>-					 runtime-&gt;buffer + runtime-&gt;appl_ptr, count1)) {</div><div class='del'>-				return result &gt; 0 ? result : -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='add'>+					 runtime-&gt;buffer + appl_ptr, count1))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+			spin_lock_irqsave(&amp;substream-&gt;lock, flags);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='del'>-		runtime-&gt;appl_ptr += count1;</div><div class='del'>-		runtime-&gt;appl_ptr %= runtime-&gt;buffer_size;</div><div class='del'>-		runtime-&gt;avail -= count1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 		result += count1;</div><div class='ctx'> 		count -= count1;</div><div class='ctx'> 	}</div><div class='del'>-	return result;</div><div class='add'>+ out:</div><div class='add'>+	snd_rawmidi_buffer_unref(runtime);</div><div class='add'>+	spin_unlock_irqrestore(&amp;substream-&gt;lock, flags);</div><div class='add'>+	return result &gt; 0 ? result : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> long snd_rawmidi_kernel_read(struct snd_rawmidi_substream *substream,</div><div class='hunk'>@@ -975,6 +1265,7 @@ long snd_rawmidi_kernel_read(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	snd_rawmidi_input_trigger(substream, 1);</div><div class='ctx'> 	return snd_rawmidi_kernel_read1(substream, NULL/*userbuf*/, buf, count);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_kernel_read);</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 				loff_t *offset)</div><div class='hunk'>@@ -993,26 +1284,31 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun</div><div class='ctx'> 	snd_rawmidi_input_trigger(substream, 1);</div><div class='ctx'> 	result = 0;</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='del'>-		spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='del'>-		while (!snd_rawmidi_ready(substream)) {</div><div class='del'>-			wait_queue_t wait;</div><div class='add'>+		spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+		while (!__snd_rawmidi_ready(runtime)) {</div><div class='add'>+			wait_queue_entry_t wait;</div><div class='add'>+</div><div class='ctx'> 			if ((file-&gt;f_flags &amp; O_NONBLOCK) != 0 || result &gt; 0) {</div><div class='del'>-				spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+				spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 				return result &gt; 0 ? result : -EAGAIN;</div><div class='ctx'> 			}</div><div class='ctx'> 			init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 			add_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='ctx'> 			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 			schedule();</div><div class='ctx'> 			remove_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='add'>+			if (rfile-&gt;rmidi-&gt;card-&gt;shutdown)</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 			if (signal_pending(current))</div><div class='ctx'> 				return result &gt; 0 ? result : -ERESTARTSYS;</div><div class='del'>-			if (!runtime-&gt;avail)</div><div class='add'>+			spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+			if (!runtime-&gt;avail) {</div><div class='add'>+				spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 				return result &gt; 0 ? result : -EIO;</div><div class='del'>-			spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+		spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 		count1 = snd_rawmidi_kernel_read1(substream,</div><div class='ctx'> 						  (unsigned char __user *)buf,</div><div class='ctx'> 						  NULL/*kernelbuf*/,</div><div class='hunk'>@@ -1029,52 +1325,44 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun</div><div class='ctx'> /**</div><div class='ctx'>  * snd_rawmidi_transmit_empty - check whether the output buffer is empty</div><div class='ctx'>  * @substream: the rawmidi substream</div><div class='del'>- * </div><div class='del'>- * Returns 1 if the internal output buffer is empty, 0 if not.</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if the internal output buffer is empty, 0 if not.</div><div class='ctx'>  */</div><div class='ctx'> int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int result;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_rawmidi_runtime *runtime;</div><div class='ctx'> </div><div class='del'>-	if (runtime-&gt;buffer == NULL) {</div><div class='del'>-		snd_printd("snd_rawmidi_transmit_empty: output is not active!!!\n");</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+	if (!substream-&gt;opened || !runtime || !runtime-&gt;buffer) {</div><div class='add'>+		rmidi_dbg(substream-&gt;rmidi,</div><div class='add'>+			  "snd_rawmidi_transmit_empty: output is not active!!!\n");</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='del'>-	result = runtime-&gt;avail &gt;= runtime-&gt;buffer_size;</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='del'>-	return result;		</div><div class='add'>+	return (runtime-&gt;avail &gt;= runtime-&gt;buffer_size);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_transmit_empty);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * snd_rawmidi_transmit_peek - copy data from the internal buffer</div><div class='add'>+/*</div><div class='add'>+ * __snd_rawmidi_transmit_peek - copy data from the internal buffer</div><div class='ctx'>  * @substream: the rawmidi substream</div><div class='ctx'>  * @buffer: the buffer pointer</div><div class='ctx'>  * @count: data size to transfer</div><div class='ctx'>  *</div><div class='del'>- * Copies data from the internal output buffer to the given buffer.</div><div class='del'>- *</div><div class='del'>- * Call this in the interrupt handler when the midi output is ready,</div><div class='del'>- * and call snd_rawmidi_transmit_ack() after the transmission is</div><div class='del'>- * finished.</div><div class='del'>- *</div><div class='del'>- * Returns the size of copied data, or a negative error code on failure.</div><div class='add'>+ * This is a variant of snd_rawmidi_transmit_peek() without spinlock.</div><div class='ctx'>  */</div><div class='del'>-int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,</div><div class='del'>-			      unsigned char *buffer, int count)</div><div class='add'>+static int __snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,</div><div class='add'>+				       unsigned char *buffer, int count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int result, count1;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	if (runtime-&gt;buffer == NULL) {</div><div class='del'>-		snd_printd("snd_rawmidi_transmit_peek: output is not active!!!\n");</div><div class='add'>+		rmidi_dbg(substream-&gt;rmidi,</div><div class='add'>+			  "snd_rawmidi_transmit_peek: output is not active!!!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	result = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	if (runtime-&gt;avail &gt;= runtime-&gt;buffer_size) {</div><div class='ctx'> 		/* warning: lowlevel layer MUST trigger down the hardware */</div><div class='ctx'> 		goto __skip;</div><div class='hunk'>@@ -1088,75 +1376,144 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 			count1 = count;</div><div class='ctx'> 		if (count1 &gt; (int)(runtime-&gt;buffer_size - runtime-&gt;avail))</div><div class='ctx'> 			count1 = runtime-&gt;buffer_size - runtime-&gt;avail;</div><div class='add'>+		count1 = get_aligned_size(runtime, count1);</div><div class='add'>+		if (!count1)</div><div class='add'>+			goto __skip;</div><div class='ctx'> 		memcpy(buffer, runtime-&gt;buffer + runtime-&gt;hw_ptr, count1);</div><div class='ctx'> 		count -= count1;</div><div class='ctx'> 		result += count1;</div><div class='ctx'> 		if (count &gt; 0) {</div><div class='ctx'> 			if (count &gt; (int)(runtime-&gt;buffer_size - runtime-&gt;avail - count1))</div><div class='ctx'> 				count = runtime-&gt;buffer_size - runtime-&gt;avail - count1;</div><div class='add'>+			count = get_aligned_size(runtime, count);</div><div class='add'>+			if (!count)</div><div class='add'>+				goto __skip;</div><div class='ctx'> 			memcpy(buffer + count1, runtime-&gt;buffer, count);</div><div class='ctx'> 			result += count;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'>       __skip:</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_rawmidi_transmit_ack - acknowledge the transmission</div><div class='add'>+ * snd_rawmidi_transmit_peek - copy data from the internal buffer</div><div class='ctx'>  * @substream: the rawmidi substream</div><div class='del'>- * @count: the tranferred count</div><div class='add'>+ * @buffer: the buffer pointer</div><div class='add'>+ * @count: data size to transfer</div><div class='ctx'>  *</div><div class='del'>- * Advances the hardware pointer for the internal output buffer with</div><div class='del'>- * the given size and updates the condition.</div><div class='del'>- * Call after the transmission is finished.</div><div class='add'>+ * Copies data from the internal output buffer to the given buffer.</div><div class='add'>+ *</div><div class='add'>+ * Call this in the interrupt handler when the midi output is ready,</div><div class='add'>+ * and call snd_rawmidi_transmit_ack() after the transmission is</div><div class='add'>+ * finished.</div><div class='ctx'>  *</div><div class='del'>- * Returns the advanced size if successful, or a negative error code on failure.</div><div class='add'>+ * Return: The size of copied data, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)</div><div class='add'>+int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,</div><div class='add'>+			      unsigned char *buffer, int count)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	if (!substream-&gt;opened || !substream-&gt;runtime)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	return __snd_rawmidi_transmit_peek(substream, buffer, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_transmit_peek);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * __snd_rawmidi_transmit_ack - acknowledge the transmission</div><div class='add'>+ * @substream: the rawmidi substream</div><div class='add'>+ * @count: the transferred count</div><div class='add'>+ *</div><div class='add'>+ * This is a variant of __snd_rawmidi_transmit_ack() without spinlock.</div><div class='add'>+ */</div><div class='add'>+static int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream,</div><div class='add'>+				      int count)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	if (runtime-&gt;buffer == NULL) {</div><div class='del'>-		snd_printd("snd_rawmidi_transmit_ack: output is not active!!!\n");</div><div class='add'>+		rmidi_dbg(substream-&gt;rmidi,</div><div class='add'>+			  "snd_rawmidi_transmit_ack: output is not active!!!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	snd_BUG_ON(runtime-&gt;avail + count &gt; runtime-&gt;buffer_size);</div><div class='add'>+	count = get_aligned_size(runtime, count);</div><div class='ctx'> 	runtime-&gt;hw_ptr += count;</div><div class='ctx'> 	runtime-&gt;hw_ptr %= runtime-&gt;buffer_size;</div><div class='ctx'> 	runtime-&gt;avail += count;</div><div class='ctx'> 	substream-&gt;bytes += count;</div><div class='ctx'> 	if (count &gt; 0) {</div><div class='del'>-		if (runtime-&gt;drain || snd_rawmidi_ready(substream))</div><div class='add'>+		if (runtime-&gt;drain || __snd_rawmidi_ready(runtime))</div><div class='ctx'> 			wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * snd_rawmidi_transmit_ack - acknowledge the transmission</div><div class='add'>+ * @substream: the rawmidi substream</div><div class='add'>+ * @count: the transferred count</div><div class='add'>+ *</div><div class='add'>+ * Advances the hardware pointer for the internal output buffer with</div><div class='add'>+ * the given size and updates the condition.</div><div class='add'>+ * Call after the transmission is finished.</div><div class='add'>+ *</div><div class='add'>+ * Return: The advanced size if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	if (!substream-&gt;opened || !substream-&gt;runtime)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	return __snd_rawmidi_transmit_ack(substream, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_transmit_ack);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * snd_rawmidi_transmit - copy from the buffer to the device</div><div class='ctx'>  * @substream: the rawmidi substream</div><div class='ctx'>  * @buffer: the buffer pointer</div><div class='ctx'>  * @count: the data size to transfer</div><div class='del'>- * </div><div class='add'>+ *</div><div class='ctx'>  * Copies data from the buffer to the device and advances the pointer.</div><div class='ctx'>  *</div><div class='del'>- * Returns the copied size if successful, or a negative error code on failure.</div><div class='add'>+ * Return: The copied size if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 			 unsigned char *buffer, int count)</div><div class='ctx'> {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='ctx'> 	if (!substream-&gt;opened)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	count = snd_rawmidi_transmit_peek(substream, buffer, count);</div><div class='del'>-	if (count &lt; 0)</div><div class='add'>+	count = __snd_rawmidi_transmit_peek(substream, buffer, count);</div><div class='add'>+	if (count &lt;= 0)</div><div class='ctx'> 		return count;</div><div class='del'>-	return snd_rawmidi_transmit_ack(substream, count);</div><div class='add'>+	return __snd_rawmidi_transmit_ack(substream, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_transmit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_rawmidi_proceed - Discard the all pending bytes and proceed</div><div class='add'>+ * @substream: rawmidi substream</div><div class='add'>+ *</div><div class='add'>+ * Return: the number of discarded bytes</div><div class='add'>+ */</div><div class='add'>+int snd_rawmidi_proceed(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_runtime *runtime;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;substream-&gt;lock);</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+	if (substream-&gt;opened &amp;&amp; runtime &amp;&amp;</div><div class='add'>+	    runtime-&gt;avail &lt; runtime-&gt;buffer_size) {</div><div class='add'>+		count = runtime-&gt;buffer_size - runtime-&gt;avail;</div><div class='add'>+		__snd_rawmidi_transmit_ack(substream, count);</div><div class='add'>+	}</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_proceed);</div><div class='ctx'> </div><div class='ctx'> static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 				      const unsigned char __user *userbuf,</div><div class='hunk'>@@ -1166,48 +1523,55 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	long count1, result;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned long appl_ptr;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!kernelbuf &amp;&amp; !userbuf))</div><div class='add'>+	if (!kernelbuf &amp;&amp; !userbuf)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (snd_BUG_ON(!runtime-&gt;buffer))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	result = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 	if (substream-&gt;append) {</div><div class='ctx'> 		if ((long)runtime-&gt;avail &lt; count) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='add'>+			spin_unlock_irqrestore(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	snd_rawmidi_buffer_ref(runtime);</div><div class='ctx'> 	while (count &gt; 0 &amp;&amp; runtime-&gt;avail &gt; 0) {</div><div class='ctx'> 		count1 = runtime-&gt;buffer_size - runtime-&gt;appl_ptr;</div><div class='ctx'> 		if (count1 &gt; count)</div><div class='ctx'> 			count1 = count;</div><div class='ctx'> 		if (count1 &gt; (long)runtime-&gt;avail)</div><div class='ctx'> 			count1 = runtime-&gt;avail;</div><div class='add'>+</div><div class='add'>+		/* update runtime-&gt;appl_ptr before unlocking for userbuf */</div><div class='add'>+		appl_ptr = runtime-&gt;appl_ptr;</div><div class='add'>+		runtime-&gt;appl_ptr += count1;</div><div class='add'>+		runtime-&gt;appl_ptr %= runtime-&gt;buffer_size;</div><div class='add'>+		runtime-&gt;avail -= count1;</div><div class='add'>+</div><div class='ctx'> 		if (kernelbuf)</div><div class='del'>-			memcpy(runtime-&gt;buffer + runtime-&gt;appl_ptr,</div><div class='add'>+			memcpy(runtime-&gt;buffer + appl_ptr,</div><div class='ctx'> 			       kernelbuf + result, count1);</div><div class='ctx'> 		else if (userbuf) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='del'>-			if (copy_from_user(runtime-&gt;buffer + runtime-&gt;appl_ptr,</div><div class='add'>+			spin_unlock_irqrestore(&amp;substream-&gt;lock, flags);</div><div class='add'>+			if (copy_from_user(runtime-&gt;buffer + appl_ptr,</div><div class='ctx'> 					   userbuf + result, count1)) {</div><div class='del'>-				spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='add'>+				spin_lock_irqsave(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 				result = result &gt; 0 ? result : -EFAULT;</div><div class='ctx'> 				goto __end;</div><div class='ctx'> 			}</div><div class='del'>-			spin_lock_irqsave(&amp;runtime-&gt;lock, flags);</div><div class='add'>+			spin_lock_irqsave(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='del'>-		runtime-&gt;appl_ptr += count1;</div><div class='del'>-		runtime-&gt;appl_ptr %= runtime-&gt;buffer_size;</div><div class='del'>-		runtime-&gt;avail -= count1;</div><div class='ctx'> 		result += count1;</div><div class='ctx'> 		count -= count1;</div><div class='ctx'> 	}</div><div class='ctx'>       __end:</div><div class='ctx'> 	count1 = runtime-&gt;avail &lt; runtime-&gt;buffer_size;</div><div class='del'>-	spin_unlock_irqrestore(&amp;runtime-&gt;lock, flags);</div><div class='add'>+	snd_rawmidi_buffer_unref(runtime);</div><div class='add'>+	spin_unlock_irqrestore(&amp;substream-&gt;lock, flags);</div><div class='ctx'> 	if (count1)</div><div class='ctx'> 		snd_rawmidi_output_trigger(substream, 1);</div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -1218,6 +1582,7 @@ long snd_rawmidi_kernel_write(struct snd_rawmidi_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	return snd_rawmidi_kernel_write1(substream, NULL, buf, count);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_kernel_write);</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 				 size_t count, loff_t *offset)</div><div class='hunk'>@@ -1236,26 +1601,31 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	result = 0;</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='del'>-		spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+		spin_lock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 		while (!snd_rawmidi_ready_append(substream, count)) {</div><div class='del'>-			wait_queue_t wait;</div><div class='add'>+			wait_queue_entry_t wait;</div><div class='add'>+</div><div class='ctx'> 			if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+				spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 				return result &gt; 0 ? result : -EAGAIN;</div><div class='ctx'> 			}</div><div class='ctx'> 			init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 			add_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='ctx'> 			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 			timeout = schedule_timeout(30 * HZ);</div><div class='ctx'> 			remove_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='add'>+			if (rfile-&gt;rmidi-&gt;card-&gt;shutdown)</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 			if (signal_pending(current))</div><div class='ctx'> 				return result &gt; 0 ? result : -ERESTARTSYS;</div><div class='del'>-			if (!runtime-&gt;avail &amp;&amp; !timeout)</div><div class='add'>+			spin_lock_irq(&amp;substream-&gt;lock);</div><div class='add'>+			if (!runtime-&gt;avail &amp;&amp; !timeout) {</div><div class='add'>+				spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 				return result &gt; 0 ? result : -EIO;</div><div class='del'>-			spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+		spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 		count1 = snd_rawmidi_kernel_write1(substream, buf, NULL, count);</div><div class='ctx'> 		if (count1 &lt; 0)</div><div class='ctx'> 			return result &gt; 0 ? result : count1;</div><div class='hunk'>@@ -1266,32 +1636,33 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf,</div><div class='ctx'> 		count -= count1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (file-&gt;f_flags &amp; O_DSYNC) {</div><div class='del'>-		spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+		spin_lock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 		while (runtime-&gt;avail != runtime-&gt;buffer_size) {</div><div class='del'>-			wait_queue_t wait;</div><div class='add'>+			wait_queue_entry_t wait;</div><div class='ctx'> 			unsigned int last_avail = runtime-&gt;avail;</div><div class='add'>+</div><div class='ctx'> 			init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 			add_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='ctx'> 			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 			timeout = schedule_timeout(30 * HZ);</div><div class='ctx'> 			remove_wait_queue(&amp;runtime-&gt;sleep, &amp;wait);</div><div class='ctx'> 			if (signal_pending(current))</div><div class='ctx'> 				return result &gt; 0 ? result : -ERESTARTSYS;</div><div class='ctx'> 			if (runtime-&gt;avail == last_avail &amp;&amp; !timeout)</div><div class='ctx'> 				return result &gt; 0 ? result : -EIO;</div><div class='del'>-			spin_lock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+			spin_lock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irq(&amp;runtime-&gt;lock);</div><div class='add'>+		spin_unlock_irq(&amp;substream-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_rawmidi_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_rawmidi_poll(struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_file *rfile;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime;</div><div class='del'>-	unsigned int mask;</div><div class='add'>+	__poll_t mask;</div><div class='ctx'> </div><div class='ctx'> 	rfile = file-&gt;private_data;</div><div class='ctx'> 	if (rfile-&gt;input != NULL) {</div><div class='hunk'>@@ -1306,11 +1677,11 @@ static unsigned int snd_rawmidi_poll(struct file *file, poll_table * wait)</div><div class='ctx'> 	mask = 0;</div><div class='ctx'> 	if (rfile-&gt;input != NULL) {</div><div class='ctx'> 		if (snd_rawmidi_ready(rfile-&gt;input))</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='add'>+			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rfile-&gt;output != NULL) {</div><div class='ctx'> 		if (snd_rawmidi_ready(rfile-&gt;output))</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='add'>+			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 	}</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='hunk'>@@ -1324,7 +1695,6 @@ static unsigned int snd_rawmidi_poll(struct file *file, poll_table * wait)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,</div><div class='hunk'>@@ -1333,10 +1703,18 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime;</div><div class='add'>+	unsigned long buffer_size, avail, xruns;</div><div class='add'>+	unsigned int clock_type;</div><div class='add'>+	static const char *clock_names[4] = { "none", "realtime", "monotonic", "monotonic raw" };</div><div class='ctx'> </div><div class='ctx'> 	rmidi = entry-&gt;private_data;</div><div class='ctx'> 	snd_iprintf(buffer, "%s\n\n", rmidi-&gt;name);</div><div class='del'>-	mutex_lock(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	if (IS_ENABLED(CONFIG_SND_UMP))</div><div class='add'>+		snd_iprintf(buffer, "Type: %s\n",</div><div class='add'>+			    rawmidi_is_ump(rmidi) ? "UMP" : "Legacy");</div><div class='add'>+	if (rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;proc_read)</div><div class='add'>+		rmidi-&gt;ops-&gt;proc_read(entry, buffer);</div><div class='add'>+	guard(mutex)(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> 	if (rmidi-&gt;info_flags &amp; SNDRV_RAWMIDI_INFO_OUTPUT) {</div><div class='ctx'> 		list_for_each_entry(substream,</div><div class='ctx'> 				    &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams,</div><div class='hunk'>@@ -1351,13 +1729,16 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 				    "  Owner PID    : %d\n",</div><div class='ctx'> 				    pid_vnr(substream-&gt;pid));</div><div class='ctx'> 				runtime = substream-&gt;runtime;</div><div class='add'>+				scoped_guard(spinlock_irq, &amp;substream-&gt;lock) {</div><div class='add'>+					buffer_size = runtime-&gt;buffer_size;</div><div class='add'>+					avail = runtime-&gt;avail;</div><div class='add'>+				}</div><div class='ctx'> 				snd_iprintf(buffer,</div><div class='ctx'> 				    "  Mode         : %s\n"</div><div class='ctx'> 				    "  Buffer size  : %lu\n"</div><div class='ctx'> 				    "  Avail        : %lu\n",</div><div class='ctx'> 				    runtime-&gt;oss ? "OSS compatible" : "native",</div><div class='del'>-				    (unsigned long) runtime-&gt;buffer_size,</div><div class='del'>-				    (unsigned long) runtime-&gt;avail);</div><div class='add'>+				    buffer_size, avail);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1375,31 +1756,39 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 					    "  Owner PID    : %d\n",</div><div class='ctx'> 					    pid_vnr(substream-&gt;pid));</div><div class='ctx'> 				runtime = substream-&gt;runtime;</div><div class='add'>+				scoped_guard(spinlock_irq, &amp;substream-&gt;lock) {</div><div class='add'>+					buffer_size = runtime-&gt;buffer_size;</div><div class='add'>+					avail = runtime-&gt;avail;</div><div class='add'>+					xruns = runtime-&gt;xruns;</div><div class='add'>+				}</div><div class='ctx'> 				snd_iprintf(buffer,</div><div class='ctx'> 					    "  Buffer size  : %lu\n"</div><div class='ctx'> 					    "  Avail        : %lu\n"</div><div class='ctx'> 					    "  Overruns     : %lu\n",</div><div class='del'>-					    (unsigned long) runtime-&gt;buffer_size,</div><div class='del'>-					    (unsigned long) runtime-&gt;avail,</div><div class='del'>-					    (unsigned long) runtime-&gt;xruns);</div><div class='add'>+					    buffer_size, avail, xruns);</div><div class='add'>+				if (substream-&gt;framing == SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP) {</div><div class='add'>+					clock_type = substream-&gt;clock_type &gt;&gt; SNDRV_RAWMIDI_MODE_CLOCK_SHIFT;</div><div class='add'>+					if (!snd_BUG_ON(clock_type &gt;= ARRAY_SIZE(clock_names)))</div><div class='add'>+						snd_iprintf(buffer,</div><div class='add'>+							    "  Framing      : tstamp\n"</div><div class='add'>+							    "  Clock type   : %s\n",</div><div class='add'>+							    clock_names[clock_type]);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;rmidi-&gt;open_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Register functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static const struct file_operations snd_rawmidi_f_ops =</div><div class='del'>-{</div><div class='add'>+static const struct file_operations snd_rawmidi_f_ops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.read =		snd_rawmidi_read,</div><div class='ctx'> 	.write =	snd_rawmidi_write,</div><div class='ctx'> 	.open =		snd_rawmidi_open,</div><div class='ctx'> 	.release =	snd_rawmidi_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.poll =		snd_rawmidi_poll,</div><div class='ctx'> 	.unlocked_ioctl =	snd_rawmidi_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_rawmidi_ioctl_compat,</div><div class='hunk'>@@ -1415,20 +1804,70 @@ static int snd_rawmidi_alloc_substreams(struct snd_rawmidi *rmidi,</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; count; idx++) {</div><div class='ctx'> 		substream = kzalloc(sizeof(*substream), GFP_KERNEL);</div><div class='del'>-		if (substream == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "rawmidi: cannot allocate substream\n");</div><div class='add'>+		if (!substream)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		substream-&gt;stream = direction;</div><div class='ctx'> 		substream-&gt;number = idx;</div><div class='ctx'> 		substream-&gt;rmidi = rmidi;</div><div class='ctx'> 		substream-&gt;pstr = stream;</div><div class='add'>+		spin_lock_init(&amp;substream-&gt;lock);</div><div class='ctx'> 		list_add_tail(&amp;substream-&gt;list, &amp;stream-&gt;substreams);</div><div class='ctx'> 		stream-&gt;substream_count++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* used for both rawmidi and ump */</div><div class='add'>+int snd_rawmidi_init(struct snd_rawmidi *rmidi,</div><div class='add'>+		     struct snd_card *card, char *id, int device,</div><div class='add'>+		     int output_count, int input_count,</div><div class='add'>+		     unsigned int info_flags)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_free = snd_rawmidi_dev_free,</div><div class='add'>+		.dev_register = snd_rawmidi_dev_register,</div><div class='add'>+		.dev_disconnect = snd_rawmidi_dev_disconnect,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;card = card;</div><div class='add'>+	rmidi-&gt;device = device;</div><div class='add'>+	mutex_init(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	init_waitqueue_head(&amp;rmidi-&gt;open_wait);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams);</div><div class='add'>+	rmidi-&gt;info_flags = info_flags;</div><div class='add'>+</div><div class='add'>+	if (id != NULL)</div><div class='add'>+		strscpy(rmidi-&gt;id, id, sizeof(rmidi-&gt;id));</div><div class='add'>+</div><div class='add'>+	err = snd_device_alloc(&amp;rmidi-&gt;dev, card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rawmidi_is_ump(rmidi))</div><div class='add'>+		dev_set_name(rmidi-&gt;dev, "umpC%iD%i", card-&gt;number, device);</div><div class='add'>+	else</div><div class='add'>+		dev_set_name(rmidi-&gt;dev, "midiC%iD%i", card-&gt;number, device);</div><div class='add'>+</div><div class='add'>+	err = snd_rawmidi_alloc_substreams(rmidi,</div><div class='add'>+					   &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT],</div><div class='add'>+					   SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+					   input_count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_rawmidi_alloc_substreams(rmidi,</div><div class='add'>+					   &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT],</div><div class='add'>+					   SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+					   output_count);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_RAWMIDI, rmidi, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_rawmidi_init);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_rawmidi_new - create a rawmidi instance</div><div class='ctx'>  * @card: the card instance</div><div class='hunk'>@@ -1441,53 +1880,23 @@ static int snd_rawmidi_alloc_substreams(struct snd_rawmidi *rmidi,</div><div class='ctx'>  * Creates a new rawmidi instance.</div><div class='ctx'>  * Use snd_rawmidi_set_ops() to set the operators to the new instance.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_rawmidi_new(struct snd_card *card, char *id, int device,</div><div class='ctx'> 		    int output_count, int input_count,</div><div class='del'>-		    struct snd_rawmidi ** rrawmidi)</div><div class='add'>+		    struct snd_rawmidi **rrawmidi)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_rawmidi_dev_free,</div><div class='del'>-		.dev_register = snd_rawmidi_dev_register,</div><div class='del'>-		.dev_disconnect = snd_rawmidi_dev_disconnect,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!card))</div><div class='del'>-		return -ENXIO;</div><div class='ctx'> 	if (rrawmidi)</div><div class='ctx'> 		*rrawmidi = NULL;</div><div class='ctx'> 	rmidi = kzalloc(sizeof(*rmidi), GFP_KERNEL);</div><div class='del'>-	if (rmidi == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "rawmidi: cannot allocate\n");</div><div class='add'>+	if (!rmidi)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	rmidi-&gt;card = card;</div><div class='del'>-	rmidi-&gt;device = device;</div><div class='del'>-	mutex_init(&amp;rmidi-&gt;open_mutex);</div><div class='del'>-	init_waitqueue_head(&amp;rmidi-&gt;open_wait);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams);</div><div class='del'>-	INIT_LIST_HEAD(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams);</div><div class='del'>-</div><div class='del'>-	if (id != NULL)</div><div class='del'>-		strlcpy(rmidi-&gt;id, id, sizeof(rmidi-&gt;id));</div><div class='del'>-	if ((err = snd_rawmidi_alloc_substreams(rmidi,</div><div class='del'>-						&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT],</div><div class='del'>-						SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='del'>-						input_count)) &lt; 0) {</div><div class='del'>-		snd_rawmidi_free(rmidi);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_rawmidi_alloc_substreams(rmidi,</div><div class='del'>-						&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT],</div><div class='del'>-						SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='del'>-						output_count)) &lt; 0) {</div><div class='del'>-		snd_rawmidi_free(rmidi);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_RAWMIDI, rmidi, &amp;ops)) &lt; 0) {</div><div class='add'>+	err = snd_rawmidi_init(rmidi, card, id, device,</div><div class='add'>+			       output_count, input_count, 0);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_rawmidi_free(rmidi);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1495,6 +1904,7 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device,</div><div class='ctx'> 		*rrawmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_new);</div><div class='ctx'> </div><div class='ctx'> static void snd_rawmidi_free_substreams(struct snd_rawmidi_str *stream)</div><div class='ctx'> {</div><div class='hunk'>@@ -1507,36 +1917,39 @@ static void snd_rawmidi_free_substreams(struct snd_rawmidi_str *stream)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_rawmidi_free(struct snd_rawmidi *rmidi)</div><div class='add'>+/* called from ump.c, too */</div><div class='add'>+int snd_rawmidi_free(struct snd_rawmidi *rmidi)</div><div class='ctx'> {</div><div class='ctx'> 	if (!rmidi)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	snd_info_free_entry(rmidi-&gt;proc_entry);</div><div class='ctx'> 	rmidi-&gt;proc_entry = NULL;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='ctx'> 	if (rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;dev_unregister)</div><div class='ctx'> 		rmidi-&gt;ops-&gt;dev_unregister(rmidi);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> </div><div class='ctx'> 	snd_rawmidi_free_substreams(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT]);</div><div class='ctx'> 	snd_rawmidi_free_substreams(&amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT]);</div><div class='ctx'> 	if (rmidi-&gt;private_free)</div><div class='ctx'> 		rmidi-&gt;private_free(rmidi);</div><div class='add'>+	put_device(rmidi-&gt;dev);</div><div class='ctx'> 	kfree(rmidi);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_rawmidi_free);</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_dev_free(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi = device-&gt;device_data;</div><div class='add'>+</div><div class='ctx'> 	return snd_rawmidi_free(rmidi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> static void snd_rawmidi_dev_seq_free(struct snd_seq_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi = device-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	rmidi-&gt;seq_dev = NULL;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1550,35 +1963,38 @@ static int snd_rawmidi_dev_register(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> 	if (rmidi-&gt;device &gt;= SNDRV_RAWMIDI_DEVICES)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if (snd_rawmidi_search(rmidi-&gt;card, rmidi-&gt;device)) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	err = 0;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		if (snd_rawmidi_search(rmidi-&gt;card, rmidi-&gt;device))</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		else</div><div class='add'>+			list_add_tail(&amp;rmidi-&gt;list, &amp;snd_rawmidi_devices);</div><div class='ctx'> 	}</div><div class='del'>-	list_add_tail(&amp;rmidi-&gt;list, &amp;snd_rawmidi_devices);</div><div class='del'>-	sprintf(name, "midiC%iD%i", rmidi-&gt;card-&gt;number, rmidi-&gt;device);</div><div class='del'>-	if ((err = snd_register_device(SNDRV_DEVICE_TYPE_RAWMIDI,</div><div class='del'>-				       rmidi-&gt;card, rmidi-&gt;device,</div><div class='del'>-				       &amp;snd_rawmidi_f_ops, rmidi, name)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to register rawmidi device %i:%i\n", rmidi-&gt;card-&gt;number, rmidi-&gt;device);</div><div class='del'>-		list_del(&amp;rmidi-&gt;list);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_register_device(SNDRV_DEVICE_TYPE_RAWMIDI,</div><div class='add'>+				  rmidi-&gt;card, rmidi-&gt;device,</div><div class='add'>+				  &amp;snd_rawmidi_f_ops, rmidi, rmidi-&gt;dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		rmidi_err(rmidi, "unable to register\n");</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	if (rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;dev_register &amp;&amp;</div><div class='del'>-	    (err = rmidi-&gt;ops-&gt;dev_register(rmidi)) &lt; 0) {</div><div class='del'>-		snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi-&gt;card, rmidi-&gt;device);</div><div class='del'>-		list_del(&amp;rmidi-&gt;list);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return err;</div><div class='add'>+	if (rmidi-&gt;ops &amp;&amp; rmidi-&gt;ops-&gt;dev_register) {</div><div class='add'>+		err = rmidi-&gt;ops-&gt;dev_register(rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='ctx'> 	rmidi-&gt;ossreg = 0;</div><div class='del'>-	if ((int)rmidi-&gt;device == midi_map[rmidi-&gt;card-&gt;number]) {</div><div class='add'>+	if (!rawmidi_is_ump(rmidi) &amp;&amp;</div><div class='add'>+	    (int)rmidi-&gt;device == midi_map[rmidi-&gt;card-&gt;number]) {</div><div class='ctx'> 		if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,</div><div class='ctx'> 					    rmidi-&gt;card, 0, &amp;snd_rawmidi_f_ops,</div><div class='del'>-					    rmidi, name) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi-&gt;card-&gt;number, 0);</div><div class='add'>+					    rmidi) &lt; 0) {</div><div class='add'>+			rmidi_err(rmidi,</div><div class='add'>+				  "unable to register OSS rawmidi device %i:%i\n",</div><div class='add'>+				  rmidi-&gt;card-&gt;number, 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rmidi-&gt;ossreg++;</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_MIDI</div><div class='hunk'>@@ -1586,17 +2002,19 @@ static int snd_rawmidi_dev_register(struct snd_device *device)</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((int)rmidi-&gt;device == amidi_map[rmidi-&gt;card-&gt;number]) {</div><div class='add'>+	if (!rawmidi_is_ump(rmidi) &amp;&amp;</div><div class='add'>+	    (int)rmidi-&gt;device == amidi_map[rmidi-&gt;card-&gt;number]) {</div><div class='ctx'> 		if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,</div><div class='ctx'> 					    rmidi-&gt;card, 1, &amp;snd_rawmidi_f_ops,</div><div class='del'>-					    rmidi, name) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi-&gt;card-&gt;number, 1);</div><div class='add'>+					    rmidi) &lt; 0) {</div><div class='add'>+			rmidi_err(rmidi,</div><div class='add'>+				  "unable to register OSS rawmidi device %i:%i\n",</div><div class='add'>+				  rmidi-&gt;card-&gt;number, 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rmidi-&gt;ossreg++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_SND_OSSEMUL */</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	sprintf(name, "midi%d", rmidi-&gt;device);</div><div class='ctx'> 	entry = snd_info_create_card_entry(rmidi-&gt;card, name, rmidi-&gt;card-&gt;proc_root);</div><div class='ctx'> 	if (entry) {</div><div class='hunk'>@@ -1608,8 +2026,9 @@ static int snd_rawmidi_dev_register(struct snd_device *device)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rmidi-&gt;proc_entry = entry;</div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='del'>-	if (!rmidi-&gt;ops || !rmidi-&gt;ops-&gt;dev_register) { /* own registration mechanism */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	/* no own registration mechanism? */</div><div class='add'>+	if (!rmidi-&gt;ops || !rmidi-&gt;ops-&gt;dev_register) {</div><div class='ctx'> 		if (snd_seq_device_new(rmidi-&gt;card, rmidi-&gt;device, SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &amp;rmidi-&gt;seq_dev) &gt;= 0) {</div><div class='ctx'> 			rmidi-&gt;seq_dev-&gt;private_data = rmidi;</div><div class='ctx'> 			rmidi-&gt;seq_dev-&gt;private_free = snd_rawmidi_dev_seq_free;</div><div class='hunk'>@@ -1619,14 +2038,33 @@ static int snd_rawmidi_dev_register(struct snd_device *device)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ error_unregister:</div><div class='add'>+	snd_unregister_device(rmidi-&gt;dev);</div><div class='add'>+ error:</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex)</div><div class='add'>+		list_del(&amp;rmidi-&gt;list);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_dev_disconnect(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi = device-&gt;device_data;</div><div class='add'>+	int dir;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;rmidi-&gt;open_mutex);</div><div class='add'>+	wake_up(&amp;rmidi-&gt;open_wait);</div><div class='ctx'> 	list_del_init(&amp;rmidi-&gt;list);</div><div class='add'>+	for (dir = 0; dir &lt; 2; dir++) {</div><div class='add'>+		struct snd_rawmidi_substream *s;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(s, &amp;rmidi-&gt;streams[dir].substreams, list) {</div><div class='add'>+			if (s-&gt;runtime)</div><div class='add'>+				wake_up(&amp;s-&gt;runtime-&gt;sleep);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='ctx'> 	if (rmidi-&gt;ossreg) {</div><div class='ctx'> 		if ((int)rmidi-&gt;device == midi_map[rmidi-&gt;card-&gt;number]) {</div><div class='hunk'>@@ -1640,8 +2078,7 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device)</div><div class='ctx'> 		rmidi-&gt;ossreg = 0;</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_SND_OSSEMUL */</div><div class='del'>-	snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi-&gt;card, rmidi-&gt;device);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+	snd_unregister_device(rmidi-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1654,13 +2091,14 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device)</div><div class='ctx'>  * Sets the rawmidi operators for the given stream direction.</div><div class='ctx'>  */</div><div class='ctx'> void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,</div><div class='del'>-			 struct snd_rawmidi_ops *ops)</div><div class='add'>+			 const struct snd_rawmidi_ops *ops)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	list_for_each_entry(substream, &amp;rmidi-&gt;streams[stream].substreams, list)</div><div class='ctx'> 		substream-&gt;ops = ops;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_rawmidi_set_ops);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  ENTRY functions</div><div class='hunk'>@@ -1668,23 +2106,22 @@ void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_rawmidi_init(void)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	snd_ctl_register_ioctl(snd_rawmidi_control_ioctl);</div><div class='ctx'> 	snd_ctl_register_ioctl_compat(snd_rawmidi_control_ioctl);</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-	{ int i;</div><div class='ctx'> 	/* check device map table */</div><div class='del'>-	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='add'>+	for (int i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='ctx'> 		if (midi_map[i] &lt; 0 || midi_map[i] &gt;= SNDRV_RAWMIDI_DEVICES) {</div><div class='del'>-			snd_printk(KERN_ERR "invalid midi_map[%d] = %d\n", i, midi_map[i]);</div><div class='add'>+			pr_err("ALSA: rawmidi: invalid midi_map[%d] = %d\n",</div><div class='add'>+			       i, midi_map[i]);</div><div class='ctx'> 			midi_map[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (amidi_map[i] &lt; 0 || amidi_map[i] &gt;= SNDRV_RAWMIDI_DEVICES) {</div><div class='del'>-			snd_printk(KERN_ERR "invalid amidi_map[%d] = %d\n", i, amidi_map[i]);</div><div class='add'>+			pr_err("ALSA: rawmidi: invalid amidi_map[%d] = %d\n",</div><div class='add'>+			       i, amidi_map[i]);</div><div class='ctx'> 			amidi_map[i] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	}</div><div class='ctx'> #endif /* CONFIG_SND_OSSEMUL */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1697,21 +2134,3 @@ static void __exit alsa_rawmidi_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(alsa_rawmidi_init)</div><div class='ctx'> module_exit(alsa_rawmidi_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_output_params);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_input_params);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_drop_output);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_drain_output);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_drain_input);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_receive);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_transmit_empty);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_transmit_peek);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_transmit_ack);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_transmit);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_new);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_set_ops);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_info_select);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_kernel_open);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_kernel_release);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_kernel_read);</div><div class='del'>-EXPORT_SYMBOL(snd_rawmidi_kernel_write);</div><div class='head'>diff --git a/sound/core/rawmidi_compat.c b/sound/core/rawmidi_compat.c<br/>index 5268c1f58c25..2c6de6e113e4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/rawmidi_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rawmidi_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/rawmidi_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/rawmidi_compat.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   32bit -&gt; 64bit ioctl wrapper for raw MIDI API</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file included from rawmidi.c */</div><div class='hunk'>@@ -27,8 +13,9 @@ struct snd_rawmidi_params32 {</div><div class='ctx'> 	u32 buffer_size;</div><div class='ctx'> 	u32 avail_min;</div><div class='ctx'> 	unsigned int no_active_sensing; /* avoid bit-field */</div><div class='del'>-	unsigned char reserved[16];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+	unsigned int mode;</div><div class='add'>+	unsigned char reserved[12];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='ctx'> static int snd_rawmidi_ioctl_params_compat(struct snd_rawmidi_file *rfile,</div><div class='ctx'> 					   struct snd_rawmidi_params32 __user *src)</div><div class='hunk'>@@ -36,47 +23,55 @@ static int snd_rawmidi_ioctl_params_compat(struct snd_rawmidi_file *rfile,</div><div class='ctx'> 	struct snd_rawmidi_params params;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	if (rfile-&gt;output == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (get_user(params.stream, &amp;src-&gt;stream) ||</div><div class='ctx'> 	    get_user(params.buffer_size, &amp;src-&gt;buffer_size) ||</div><div class='ctx'> 	    get_user(params.avail_min, &amp;src-&gt;avail_min) ||</div><div class='add'>+	    get_user(params.mode, &amp;src-&gt;mode) ||</div><div class='ctx'> 	    get_user(val, &amp;src-&gt;no_active_sensing))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	params.no_active_sensing = val;</div><div class='ctx'> 	switch (params.stream) {</div><div class='ctx'> 	case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='add'>+		if (!rfile-&gt;output)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return snd_rawmidi_output_params(rfile-&gt;output, &amp;params);</div><div class='ctx'> 	case SNDRV_RAWMIDI_STREAM_INPUT:</div><div class='add'>+		if (!rfile-&gt;input)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		return snd_rawmidi_input_params(rfile-&gt;input, &amp;params);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_rawmidi_status32 {</div><div class='add'>+struct compat_snd_rawmidi_status64 {</div><div class='ctx'> 	s32 stream;</div><div class='del'>-	struct compat_timespec tstamp;</div><div class='add'>+	u8 rsvd[4]; /* alignment */</div><div class='add'>+	s64 tstamp_sec;</div><div class='add'>+	s64 tstamp_nsec;</div><div class='ctx'> 	u32 avail;</div><div class='ctx'> 	u32 xruns;</div><div class='ctx'> 	unsigned char reserved[16];</div><div class='del'>-} __attribute__((packed));</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-static int snd_rawmidi_ioctl_status_compat(struct snd_rawmidi_file *rfile,</div><div class='del'>-					   struct snd_rawmidi_status32 __user *src)</div><div class='add'>+static int snd_rawmidi_ioctl_status_compat64(struct snd_rawmidi_file *rfile,</div><div class='add'>+					     struct compat_snd_rawmidi_status64 __user *src)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct snd_rawmidi_status status;</div><div class='add'>+	struct snd_rawmidi_status64 status;</div><div class='add'>+	struct compat_snd_rawmidi_status64 compat_status;</div><div class='ctx'> </div><div class='del'>-	if (rfile-&gt;output == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> 	if (get_user(status.stream, &amp;src-&gt;stream))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	switch (status.stream) {</div><div class='ctx'> 	case SNDRV_RAWMIDI_STREAM_OUTPUT:</div><div class='add'>+		if (!rfile-&gt;output)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = snd_rawmidi_output_status(rfile-&gt;output, &amp;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_RAWMIDI_STREAM_INPUT:</div><div class='add'>+		if (!rfile-&gt;input)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		err = snd_rawmidi_input_status(rfile-&gt;input, &amp;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -85,10 +80,15 @@ static int snd_rawmidi_ioctl_status_compat(struct snd_rawmidi_file *rfile,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (put_user(status.tstamp.tv_sec, &amp;src-&gt;tstamp.tv_sec) ||</div><div class='del'>-	    put_user(status.tstamp.tv_nsec, &amp;src-&gt;tstamp.tv_nsec) ||</div><div class='del'>-	    put_user(status.avail, &amp;src-&gt;avail) ||</div><div class='del'>-	    put_user(status.xruns, &amp;src-&gt;xruns))</div><div class='add'>+	compat_status = (struct compat_snd_rawmidi_status64) {</div><div class='add'>+		.stream = status.stream,</div><div class='add'>+		.tstamp_sec = status.tstamp_sec,</div><div class='add'>+		.tstamp_nsec = status.tstamp_nsec,</div><div class='add'>+		.avail = status.avail,</div><div class='add'>+		.xruns = status.xruns,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(src, &amp;compat_status, sizeof(*src)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -96,7 +96,8 @@ static int snd_rawmidi_ioctl_status_compat(struct snd_rawmidi_file *rfile,</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	SNDRV_RAWMIDI_IOCTL_PARAMS32 = _IOWR('W', 0x10, struct snd_rawmidi_params32),</div><div class='del'>-	SNDRV_RAWMIDI_IOCTL_STATUS32 = _IOWR('W', 0x20, struct snd_rawmidi_status32),</div><div class='add'>+	SNDRV_RAWMIDI_IOCTL_STATUS_COMPAT32 = _IOWR('W', 0x20, struct snd_rawmidi_status32),</div><div class='add'>+	SNDRV_RAWMIDI_IOCTL_STATUS_COMPAT64 = _IOWR('W', 0x20, struct compat_snd_rawmidi_status64),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static long snd_rawmidi_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='hunk'>@@ -110,11 +111,17 @@ static long snd_rawmidi_ioctl_compat(struct file *file, unsigned int cmd, unsign</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_INFO:</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_DROP:</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_DRAIN:</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP)</div><div class='add'>+	case SNDRV_UMP_IOCTL_ENDPOINT_INFO:</div><div class='add'>+	case SNDRV_UMP_IOCTL_BLOCK_INFO:</div><div class='add'>+#endif</div><div class='ctx'> 		return snd_rawmidi_ioctl(file, cmd, (unsigned long)argp);</div><div class='ctx'> 	case SNDRV_RAWMIDI_IOCTL_PARAMS32:</div><div class='ctx'> 		return snd_rawmidi_ioctl_params_compat(rfile, argp);</div><div class='del'>-	case SNDRV_RAWMIDI_IOCTL_STATUS32:</div><div class='del'>-		return snd_rawmidi_ioctl_status_compat(rfile, argp);</div><div class='add'>+	case SNDRV_RAWMIDI_IOCTL_STATUS_COMPAT32:</div><div class='add'>+		return snd_rawmidi_ioctl_status32(rfile, argp);</div><div class='add'>+	case SNDRV_RAWMIDI_IOCTL_STATUS_COMPAT64:</div><div class='add'>+		return snd_rawmidi_ioctl_status_compat64(rfile, argp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c<br/>deleted file mode 100644<br/>index 0851cd13e303..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/rtctimer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/rtctimer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,188 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  RTC based high-frequency timer</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Takashi Iwai</div><div class='del'>- *	based on rtctimer.c by Steve Ratcliffe</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/timer.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_RTC) || defined(CONFIG_RTC_MODULE)</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mc146818rtc.h&gt;</div><div class='del'>-</div><div class='del'>-#define RTC_FREQ	1024		/* default frequency */</div><div class='del'>-#define NANO_SEC	1000000000L	/* 10^9 in sec */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * prototypes</div><div class='del'>- */</div><div class='del'>-static int rtctimer_open(struct snd_timer *t);</div><div class='del'>-static int rtctimer_close(struct snd_timer *t);</div><div class='del'>-static int rtctimer_start(struct snd_timer *t);</div><div class='del'>-static int rtctimer_stop(struct snd_timer *t);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The hardware dependent description for this timer.</div><div class='del'>- */</div><div class='del'>-static struct snd_timer_hardware rtc_hw = {</div><div class='del'>-	.flags =	SNDRV_TIMER_HW_AUTO |</div><div class='del'>-			SNDRV_TIMER_HW_FIRST |</div><div class='del'>-			SNDRV_TIMER_HW_TASKLET,</div><div class='del'>-	.ticks =	100000000L,		/* FIXME: XXX */</div><div class='del'>-	.open =		rtctimer_open,</div><div class='del'>-	.close =	rtctimer_close,</div><div class='del'>-	.start =	rtctimer_start,</div><div class='del'>-	.stop =		rtctimer_stop,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtctimer_freq = RTC_FREQ;		/* frequency */</div><div class='del'>-static struct snd_timer *rtctimer;</div><div class='del'>-static struct tasklet_struct rtc_tasklet;</div><div class='del'>-static rtc_task_t rtc_task;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-rtctimer_open(struct snd_timer *t)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = rtc_register(&amp;rtc_task);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	t-&gt;private_data = &amp;rtc_task;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-rtctimer_close(struct snd_timer *t)</div><div class='del'>-{</div><div class='del'>-	rtc_task_t *rtc = t-&gt;private_data;</div><div class='del'>-	if (rtc) {</div><div class='del'>-		rtc_unregister(rtc);</div><div class='del'>-		tasklet_kill(&amp;rtc_tasklet);</div><div class='del'>-		t-&gt;private_data = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-rtctimer_start(struct snd_timer *timer)</div><div class='del'>-{</div><div class='del'>-	rtc_task_t *rtc = timer-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!rtc))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	rtc_control(rtc, RTC_IRQP_SET, rtctimer_freq);</div><div class='del'>-	rtc_control(rtc, RTC_PIE_ON, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-rtctimer_stop(struct snd_timer *timer)</div><div class='del'>-{</div><div class='del'>-	rtc_task_t *rtc = timer-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!rtc))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	rtc_control(rtc, RTC_PIE_OFF, 0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtctimer_tasklet(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	snd_timer_interrupt((struct snd_timer *)data, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * interrupt</div><div class='del'>- */</div><div class='del'>-static void rtctimer_interrupt(void *private_data)</div><div class='del'>-{</div><div class='del'>-	tasklet_schedule(private_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ENTRY functions</div><div class='del'>- */</div><div class='del'>-static int __init rtctimer_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-</div><div class='del'>-	if (rtctimer_freq &lt; 2 || rtctimer_freq &gt; 8192 ||</div><div class='del'>-	    !is_power_of_2(rtctimer_freq)) {</div><div class='del'>-		snd_printk(KERN_ERR "rtctimer: invalid frequency %d\n",</div><div class='del'>-			   rtctimer_freq);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a new timer and set up the fields */</div><div class='del'>-	err = snd_timer_global_new("rtc", SNDRV_TIMER_GLOBAL_RTC, &amp;timer);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	timer-&gt;module = THIS_MODULE;</div><div class='del'>-	strcpy(timer-&gt;name, "RTC timer");</div><div class='del'>-	timer-&gt;hw = rtc_hw;</div><div class='del'>-	timer-&gt;hw.resolution = NANO_SEC / rtctimer_freq;</div><div class='del'>-</div><div class='del'>-	tasklet_init(&amp;rtc_tasklet, rtctimer_tasklet, (unsigned long)timer);</div><div class='del'>-</div><div class='del'>-	/* set up RTC callback */</div><div class='del'>-	rtc_task.func = rtctimer_interrupt;</div><div class='del'>-	rtc_task.private_data = &amp;rtc_tasklet;</div><div class='del'>-</div><div class='del'>-	err = snd_timer_global_register(timer);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_timer_global_free(timer);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	rtctimer = timer; /* remember this */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit rtctimer_exit(void)</div><div class='del'>-{</div><div class='del'>-	if (rtctimer) {</div><div class='del'>-		snd_timer_global_free(rtctimer);</div><div class='del'>-		rtctimer = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * exported stuff</div><div class='del'>- */</div><div class='del'>-module_init(rtctimer_init)</div><div class='del'>-module_exit(rtctimer_exit)</div><div class='del'>-</div><div class='del'>-module_param(rtctimer_freq, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(rtctimer_freq, "timer frequency in Hz");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-timer-" __stringify(SNDRV_TIMER_GLOBAL_RTC));</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_RTC || CONFIG_RTC_MODULE */</div><div class='head'>diff --git a/sound/core/seq/Kconfig b/sound/core/seq/Kconfig<br/>index b851fd890a89..e4f58cb985d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/Kconfig</a></div><div class='hunk'>@@ -1,16 +1,76 @@</div><div class='del'>-# define SND_XXX_SEQ to min(SND_SEQUENCER,SND_XXX)</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config SND_SEQUENCER</div><div class='add'>+	tristate "Sequencer support"</div><div class='add'>+	select SND_TIMER</div><div class='add'>+	select SND_SEQ_DEVICE</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M to enable MIDI sequencer and router support.  This</div><div class='add'>+	  feature allows routing and enqueueing of MIDI events.  Events</div><div class='add'>+	  can be processed at a given time.</div><div class='ctx'> </div><div class='del'>-config SND_RAWMIDI_SEQ</div><div class='del'>-	def_tristate SND_SEQUENCER &amp;&amp; SND_RAWMIDI</div><div class='add'>+	  Many programs require this feature, so you should enable it</div><div class='add'>+	  unless you know what you're doing.</div><div class='ctx'> </div><div class='del'>-config SND_OPL3_LIB_SEQ</div><div class='del'>-	def_tristate SND_SEQUENCER &amp;&amp; SND_OPL3_LIB</div><div class='add'>+if SND_SEQUENCER</div><div class='ctx'> </div><div class='del'>-config SND_OPL4_LIB_SEQ</div><div class='del'>-	def_tristate SND_SEQUENCER &amp;&amp; SND_OPL4_LIB</div><div class='add'>+config SND_SEQ_DUMMY</div><div class='add'>+	tristate "Sequencer dummy client"</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable the dummy sequencer client.  This client</div><div class='add'>+	  is a simple MIDI-through client: all normal input events are</div><div class='add'>+	  redirected to the output port immediately.</div><div class='ctx'> </div><div class='del'>-config SND_SBAWE_SEQ</div><div class='del'>-	def_tristate SND_SEQUENCER &amp;&amp; SND_SBAWE</div><div class='add'>+	  You don't need this unless you want to connect many MIDI</div><div class='add'>+	  devices or applications together.</div><div class='ctx'> </div><div class='del'>-config SND_EMU10K1_SEQ</div><div class='del'>-	def_tristate SND_SEQUENCER &amp;&amp; SND_EMU10K1</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-seq-dummy.</div><div class='add'>+</div><div class='add'>+config SND_SEQUENCER_OSS</div><div class='add'>+	tristate "OSS Sequencer API"</div><div class='add'>+	depends on SND_OSSEMUL</div><div class='add'>+	select SND_SEQ_MIDI_EVENT</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable OSS sequencer emulation (both</div><div class='add'>+	  /dev/sequencer and /dev/music interfaces).</div><div class='add'>+</div><div class='add'>+	  Many programs still use the OSS API, so say Y.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-seq-oss.</div><div class='add'>+</div><div class='add'>+config SND_SEQ_HRTIMER_DEFAULT</div><div class='add'>+	bool "Use HR-timer as default sequencer timer"</div><div class='add'>+	depends on SND_HRTIMER</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to use the HR-timer backend as the default sequencer</div><div class='add'>+	  timer.</div><div class='add'>+</div><div class='add'>+config SND_SEQ_MIDI_EVENT</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_SEQ_MIDI</div><div class='add'>+	def_tristate SND_RAWMIDI</div><div class='add'>+	select SND_SEQ_MIDI_EVENT</div><div class='add'>+</div><div class='add'>+config SND_SEQ_MIDI_EMUL</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_SEQ_VIRMIDI</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_SEQ_UMP</div><div class='add'>+	bool "Support for UMP events"</div><div class='add'>+	default SND_UMP</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable the support for handling UMP (Universal MIDI</div><div class='add'>+	  Packet) events via ALSA sequencer infrastructure, which is an</div><div class='add'>+	  essential feature for enabling MIDI 2.0 support.</div><div class='add'>+	  It includes the automatic conversion of ALSA sequencer events</div><div class='add'>+	  among legacy and UMP clients.</div><div class='add'>+</div><div class='add'>+config SND_SEQ_UMP_CLIENT</div><div class='add'>+	def_tristate SND_UMP &amp;&amp; SND_SEQ_UMP</div><div class='add'>+</div><div class='add'>+endif # SND_SEQUENCER</div><div class='head'>diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile<br/>index 941f64a853eb..0904aa48d88b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/Makefile</a></div><div class='hunk'>@@ -1,29 +1,27 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 1999 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-seq-device-objs := seq_device.o</div><div class='del'>-snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \</div><div class='add'>+snd-seq-y := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \</div><div class='ctx'>                 seq_fifo.o seq_prioq.o seq_timer.o \</div><div class='del'>-                seq_system.o seq_ports.o seq_info.o</div><div class='del'>-snd-seq-midi-objs := seq_midi.o</div><div class='del'>-snd-seq-midi-emul-objs := seq_midi_emul.o</div><div class='del'>-snd-seq-midi-event-objs := seq_midi_event.o</div><div class='del'>-snd-seq-dummy-objs := seq_dummy.o</div><div class='del'>-snd-seq-virmidi-objs := seq_virmidi.o</div><div class='add'>+                seq_system.o seq_ports.o</div><div class='add'>+snd-seq-$(CONFIG_SND_PROC_FS) += seq_info.o</div><div class='add'>+snd-seq-$(CONFIG_SND_SEQ_UMP) += seq_ump_convert.o</div><div class='add'>+snd-seq-midi-y := seq_midi.o</div><div class='add'>+snd-seq-midi-emul-y := seq_midi_emul.o</div><div class='add'>+snd-seq-midi-event-y := seq_midi_event.o</div><div class='add'>+snd-seq-dummy-y := seq_dummy.o</div><div class='add'>+snd-seq-virmidi-y := seq_virmidi.o</div><div class='add'>+snd-seq-ump-client-y := seq_ump_client.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o</div><div class='del'>-ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)</div><div class='del'>-  obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o</div><div class='del'>-  obj-$(CONFIG_SND_SEQUENCER) += oss/</div><div class='del'>-endif</div><div class='del'>-obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o</div><div class='add'>+obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o</div><div class='add'>+obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/</div><div class='ctx'> </div><div class='del'>-# Toplevel Module Dependency</div><div class='del'>-obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o</div><div class='del'>-obj-$(CONFIG_SND_RAWMIDI_SEQ) += snd-seq-midi.o snd-seq-midi-event.o</div><div class='del'>-obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o</div><div class='del'>-obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o</div><div class='del'>-obj-$(CONFIG_SND_SBAWE_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o</div><div class='del'>-obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_MIDI) += snd-seq-midi.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_UMP_CLIENT) += snd-seq-ump-client.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_MIDI_EMUL) += snd-seq-midi-emul.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_MIDI_EVENT) += snd-seq-midi-event.o</div><div class='add'>+obj-$(CONFIG_SND_SEQ_VIRMIDI) += snd-seq-virmidi.o</div><div class='head'>diff --git a/sound/core/seq/oss/Makefile b/sound/core/seq/oss/Makefile<br/>index b38406b8463c..4e4741834208 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 1999 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-seq-oss-objs  := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \</div><div class='add'>+snd-seq-oss-y  := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \</div><div class='ctx'> 		     seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \</div><div class='ctx'> 		     seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_SND_SEQUENCER) += snd-seq-oss.o</div><div class='add'>+obj-$(CONFIG_SND_SEQUENCER_OSS) += snd-seq-oss.o</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c<br/>index a1f1a2f00ccb..02d30d8b6c3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss.c</a></div><div class='hunk'>@@ -1,28 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * registration of device and proc</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -39,19 +27,13 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_SEQUENCER);</div><div class='ctx'> MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC);</div><div class='ctx'> </div><div class='del'>-#ifdef SNDRV_SEQ_OSS_DEBUG</div><div class='del'>-module_param(seq_oss_debug, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(seq_oss_debug, "debug option");</div><div class='del'>-int seq_oss_debug = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * prototypes</div><div class='ctx'>  */</div><div class='ctx'> static int register_device(void);</div><div class='ctx'> static void unregister_device(void);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> static int register_proc(void);</div><div class='ctx'> static void unregister_proc(void);</div><div class='ctx'> #else</div><div class='hunk'>@@ -64,36 +46,44 @@ static int odev_release(struct inode *inode, struct file *file);</div><div class='ctx'> static ssize_t odev_read(struct file *file, char __user *buf, size_t count, loff_t *offset);</div><div class='ctx'> static ssize_t odev_write(struct file *file, const char __user *buf, size_t count, loff_t *offset);</div><div class='ctx'> static long odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg);</div><div class='del'>-static unsigned int odev_poll(struct file *file, poll_table * wait);</div><div class='add'>+static __poll_t odev_poll(struct file *file, poll_table * wait);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * module interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static struct snd_seq_driver seq_oss_synth_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_seq_oss_synth_probe,</div><div class='add'>+		.remove = snd_seq_oss_synth_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_OSS,</div><div class='add'>+	.argsize = sizeof(struct snd_seq_oss_reg),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int __init alsa_seq_oss_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	static struct snd_seq_dev_ops ops = {</div><div class='del'>-		snd_seq_oss_synth_register,</div><div class='del'>-		snd_seq_oss_synth_unregister,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	snd_seq_autoload_lock();</div><div class='del'>-	if ((rc = register_device()) &lt; 0)</div><div class='add'>+	rc = register_device();</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='del'>-	if ((rc = register_proc()) &lt; 0) {</div><div class='add'>+	rc = register_proc();</div><div class='add'>+	if (rc &lt; 0) {</div><div class='ctx'> 		unregister_device();</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-	if ((rc = snd_seq_oss_create_client()) &lt; 0) {</div><div class='add'>+	rc = snd_seq_oss_create_client();</div><div class='add'>+	if (rc &lt; 0) {</div><div class='ctx'> 		unregister_proc();</div><div class='ctx'> 		unregister_device();</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((rc = snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OSS, &amp;ops,</div><div class='del'>-						 sizeof(struct snd_seq_oss_reg))) &lt; 0) {</div><div class='add'>+	rc = snd_seq_driver_register(&amp;seq_oss_synth_driver);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='ctx'> 		snd_seq_oss_delete_client();</div><div class='ctx'> 		unregister_proc();</div><div class='ctx'> 		unregister_device();</div><div class='hunk'>@@ -104,13 +94,12 @@ static int __init alsa_seq_oss_init(void)</div><div class='ctx'> 	snd_seq_oss_synth_init();</div><div class='ctx'> </div><div class='ctx'>  error:</div><div class='del'>-	snd_seq_autoload_unlock();</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit alsa_seq_oss_exit(void)</div><div class='ctx'> {</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OSS);</div><div class='add'>+	snd_seq_driver_unregister(&amp;seq_oss_synth_driver);</div><div class='ctx'> 	snd_seq_oss_delete_client();</div><div class='ctx'> 	unregister_proc();</div><div class='ctx'> 	unregister_device();</div><div class='hunk'>@@ -128,18 +117,15 @@ static DEFINE_MUTEX(register_mutex);</div><div class='ctx'> static int</div><div class='ctx'> odev_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int level, rc;</div><div class='add'>+	int level;</div><div class='ctx'> </div><div class='ctx'> 	if (iminor(inode) == SNDRV_MINOR_OSS_MUSIC)</div><div class='ctx'> 		level = SNDRV_SEQ_OSS_MODE_MUSIC;</div><div class='ctx'> 	else</div><div class='ctx'> 		level = SNDRV_SEQ_OSS_MODE_SYNTH;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	rc = snd_seq_oss_open(file, level);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	return snd_seq_oss_open(file, level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -147,15 +133,12 @@ odev_release(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_devinfo *dp;</div><div class='ctx'> </div><div class='del'>-	if ((dp = file-&gt;private_data) == NULL)</div><div class='add'>+	dp = file-&gt;private_data;</div><div class='add'>+	if (!dp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	snd_seq_oss_drain_write(dp);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	snd_seq_oss_release(dp);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,25 +167,38 @@ static long</div><div class='ctx'> odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_devinfo *dp;</div><div class='add'>+	long rc;</div><div class='add'>+</div><div class='ctx'> 	dp = file-&gt;private_data;</div><div class='ctx'> 	if (snd_BUG_ON(!dp))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	return snd_seq_oss_ioctl(dp, cmd, arg);</div><div class='add'>+</div><div class='add'>+	if (cmd != SNDCTL_SEQ_SYNC &amp;&amp;</div><div class='add'>+	    mutex_lock_interruptible(&amp;register_mutex))</div><div class='add'>+		return -ERESTARTSYS;</div><div class='add'>+	rc = snd_seq_oss_ioctl(dp, cmd, arg);</div><div class='add'>+	if (cmd != SNDCTL_SEQ_SYNC)</div><div class='add'>+		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-#define odev_ioctl_compat	odev_ioctl</div><div class='add'>+static long odev_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+			      unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return odev_ioctl(file, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='ctx'> #else</div><div class='ctx'> #define odev_ioctl_compat	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static unsigned int</div><div class='add'>+static __poll_t</div><div class='ctx'> odev_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_devinfo *dp;</div><div class='ctx'> 	dp = file-&gt;private_data;</div><div class='ctx'> 	if (snd_BUG_ON(!dp))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		return EPOLLERR;</div><div class='ctx'> 	return snd_seq_oss_poll(dp, file, wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,58 +224,51 @@ register_device(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,</div><div class='del'>-					  NULL, 0,</div><div class='del'>-					  &amp;seq_oss_f_ops, NULL,</div><div class='del'>-					  SNDRV_SEQ_OSS_DEVNAME)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't register device seq\n");</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,</div><div class='add'>+				     NULL, 0,</div><div class='add'>+				     &amp;seq_oss_f_ops, NULL);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		pr_err("ALSA: seq_oss: can't register device seq\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,</div><div class='del'>-					  NULL, 0,</div><div class='del'>-					  &amp;seq_oss_f_ops, NULL,</div><div class='del'>-					  SNDRV_SEQ_OSS_DEVNAME)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't register device music\n");</div><div class='add'>+	rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,</div><div class='add'>+				     NULL, 0,</div><div class='add'>+				     &amp;seq_oss_f_ops, NULL);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		pr_err("ALSA: seq_oss: can't register device music\n");</div><div class='ctx'> 		snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	debug_printk(("device registered\n"));</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> unregister_device(void)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	debug_printk(("device unregistered\n"));</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC, NULL, 0) &lt; 0)		</div><div class='del'>-		snd_printk(KERN_ERR "error unregister device music\n");</div><div class='add'>+		pr_err("ALSA: seq_oss: error unregister device music\n");</div><div class='ctx'> 	if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0) &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "error unregister device seq\n");</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+		pr_err("ALSA: seq_oss: error unregister device seq\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * /proc interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> </div><div class='ctx'> static struct snd_info_entry *info_entry;</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> info_read(struct snd_info_entry *entry, struct snd_info_buffer *buf)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	snd_iprintf(buf, "OSS sequencer emulation version %s\n", SNDRV_SEQ_OSS_VERSION_STR);</div><div class='ctx'> 	snd_seq_oss_system_info_read(buf);</div><div class='ctx'> 	snd_seq_oss_synth_info_read(buf);</div><div class='ctx'> 	snd_seq_oss_midi_info_read(buf);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -309,4 +298,4 @@ unregister_proc(void)</div><div class='ctx'> 	snd_info_free_entry(info_entry);</div><div class='ctx'> 	info_entry = NULL;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_device.h b/sound/core/seq/oss/seq_oss_device.h<br/>index c0154a959d55..935cf3df0b30 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_device.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_device.h</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_DEVICE_H</div><div class='hunk'>@@ -24,15 +11,13 @@</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/seq_oss.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-</div><div class='del'>-/* enable debug print */</div><div class='del'>-#define SNDRV_SEQ_OSS_DEBUG</div><div class='add'>+#include "../seq_clientmgr.h"</div><div class='ctx'> </div><div class='ctx'> /* max. applications */</div><div class='ctx'> #define SNDRV_SEQ_OSS_MAX_CLIENTS	16</div><div class='hunk'>@@ -46,7 +31,6 @@</div><div class='ctx'> #define SNDRV_SEQ_OSS_VERSION_STR	"0.1.8"</div><div class='ctx'> </div><div class='ctx'> /* device and proc interface name */</div><div class='del'>-#define SNDRV_SEQ_OSS_DEVNAME		"seq_oss"</div><div class='ctx'> #define SNDRV_SEQ_OSS_PROCNAME		"oss"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +55,6 @@ struct seq_oss_chinfo {</div><div class='ctx'> struct seq_oss_synthinfo {</div><div class='ctx'> 	struct snd_seq_oss_arg arg;</div><div class='ctx'> 	struct seq_oss_chinfo *ch;</div><div class='del'>-	struct seq_oss_synth_sysex *sysex;</div><div class='ctx'> 	int nr_voices;</div><div class='ctx'> 	int opened;</div><div class='ctx'> 	int is_midi;</div><div class='hunk'>@@ -128,14 +111,9 @@ void snd_seq_oss_release(struct seq_oss_devinfo *dp);</div><div class='ctx'> int snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long arg);</div><div class='ctx'> int snd_seq_oss_read(struct seq_oss_devinfo *dev, char __user *buf, int count);</div><div class='ctx'> int snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int count, struct file *opt);</div><div class='del'>-unsigned int snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait);</div><div class='add'>+__poll_t snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait);</div><div class='ctx'> </div><div class='ctx'> void snd_seq_oss_reset(struct seq_oss_devinfo *dp);</div><div class='del'>-void snd_seq_oss_drain_write(struct seq_oss_devinfo *dp);</div><div class='del'>-</div><div class='del'>-/* */</div><div class='del'>-void snd_seq_oss_process_queue(struct seq_oss_devinfo *dp, abstime_t time);</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* proc interface */</div><div class='ctx'> void snd_seq_oss_system_info_read(struct snd_info_buffer *buf);</div><div class='hunk'>@@ -155,11 +133,11 @@ snd_seq_oss_dispatch(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, int a</div><div class='ctx'> 	return snd_seq_kernel_client_dispatch(dp-&gt;cseq, ev, atomic, hop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ioctl */</div><div class='add'>+/* ioctl for writeq */</div><div class='ctx'> static inline int</div><div class='ctx'> snd_seq_oss_control(struct seq_oss_devinfo *dp, unsigned int type, void *arg)</div><div class='ctx'> {</div><div class='del'>-	return snd_seq_kernel_client_ctl(dp-&gt;cseq, type, arg);</div><div class='add'>+	return snd_seq_kernel_client_ioctl(dp-&gt;cseq, type, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* fill the addresses in header */</div><div class='hunk'>@@ -173,17 +151,4 @@ snd_seq_oss_fill_addr(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,</div><div class='ctx'> 	ev-&gt;dest.port = dest_port;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* misc. functions for proc interface */</div><div class='del'>-char *enabled_str(int bool);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* for debug */</div><div class='del'>-#ifdef SNDRV_SEQ_OSS_DEBUG</div><div class='del'>-extern int seq_oss_debug;</div><div class='del'>-#define debug_printk(x)	do { if (seq_oss_debug &gt; 0) snd_printd x; } while (0)</div><div class='del'>-#else</div><div class='del'>-#define debug_printk(x)	/**/</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif /* __SEQ_OSS_DEVICE_H */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_event.c b/sound/core/seq/oss/seq_oss_event.c<br/>index 066f5f3e3f4c..76fb81077eef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_event.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_event.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_device.h"</div><div class='hunk'>@@ -26,6 +13,7 @@</div><div class='ctx'> #include &lt;sound/seq_oss_legacy.h&gt;</div><div class='ctx'> #include "seq_oss_readq.h"</div><div class='ctx'> #include "seq_oss_writeq.h"</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -285,7 +273,12 @@ local_event(struct seq_oss_devinfo *dp, union evrec *q, struct snd_seq_event *ev</div><div class='ctx'> static int</div><div class='ctx'> note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synthinfo *info = &amp;dp-&gt;synths[dev];</div><div class='add'>+	struct seq_oss_synthinfo *info;</div><div class='add'>+</div><div class='add'>+	info = snd_seq_oss_synth_info(dp, dev);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='ctx'> 	switch (info-&gt;arg.event_passing) {</div><div class='ctx'> 	case SNDRV_SEQ_OSS_PROCESS_EVENTS:</div><div class='ctx'> 		if (! info-&gt;ch || ch &lt; 0 || ch &gt;= info-&gt;nr_voices) {</div><div class='hunk'>@@ -293,19 +286,18 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st</div><div class='ctx'> 			return set_note_event(dp, dev, SNDRV_SEQ_EVENT_NOTEON, ch, note, vel, ev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ch = array_index_nospec(ch, info-&gt;nr_voices);</div><div class='ctx'> 		if (note == 255 &amp;&amp; info-&gt;ch[ch].note &gt;= 0) {</div><div class='ctx'> 			/* volume control */</div><div class='ctx'> 			int type;</div><div class='del'>-			//if (! vel)</div><div class='del'>-				/* set volume to zero -- note off */</div><div class='del'>-			//	type = SNDRV_SEQ_EVENT_NOTEOFF;</div><div class='del'>-			//else</div><div class='del'>-				if (info-&gt;ch[ch].vel)</div><div class='add'>+</div><div class='add'>+			if (info-&gt;ch[ch].vel)</div><div class='ctx'> 				/* sample already started -- volume change */</div><div class='ctx'> 				type = SNDRV_SEQ_EVENT_KEYPRESS;</div><div class='ctx'> 			else</div><div class='ctx'> 				/* sample not started -- start now */</div><div class='ctx'> 				type = SNDRV_SEQ_EVENT_NOTEON;</div><div class='add'>+</div><div class='ctx'> 			info-&gt;ch[ch].vel = vel;</div><div class='ctx'> 			return set_note_event(dp, dev, type, ch, info-&gt;ch[ch].note, vel, ev);</div><div class='ctx'> 		} else if (note &gt;= 128)</div><div class='hunk'>@@ -340,7 +332,12 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st</div><div class='ctx'> static int</div><div class='ctx'> note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synthinfo *info = &amp;dp-&gt;synths[dev];</div><div class='add'>+	struct seq_oss_synthinfo *info;</div><div class='add'>+</div><div class='add'>+	info = snd_seq_oss_synth_info(dp, dev);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='ctx'> 	switch (info-&gt;arg.event_passing) {</div><div class='ctx'> 	case SNDRV_SEQ_OSS_PROCESS_EVENTS:</div><div class='ctx'> 		if (! info-&gt;ch || ch &lt; 0 || ch &gt;= info-&gt;nr_voices) {</div><div class='hunk'>@@ -348,6 +345,7 @@ note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, s</div><div class='ctx'> 			return set_note_event(dp, dev, SNDRV_SEQ_EVENT_NOTEON, ch, note, vel, ev);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ch = array_index_nospec(ch, info-&gt;nr_voices);</div><div class='ctx'> 		if (info-&gt;ch[ch].note &gt;= 0) {</div><div class='ctx'> 			note = info-&gt;ch[ch].note;</div><div class='ctx'> 			info-&gt;ch[ch].vel = 0;</div><div class='hunk'>@@ -371,7 +369,7 @@ note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, s</div><div class='ctx'> static int</div><div class='ctx'> set_note_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int note, int vel, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	if (! snd_seq_oss_synth_is_valid(dp, dev))</div><div class='add'>+	if (!snd_seq_oss_synth_info(dp, dev))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	</div><div class='ctx'> 	ev-&gt;type = type;</div><div class='hunk'>@@ -389,7 +387,7 @@ set_note_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int note,</div><div class='ctx'> static int</div><div class='ctx'> set_control_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int param, int val, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	if (! snd_seq_oss_synth_is_valid(dp, dev))</div><div class='add'>+	if (!snd_seq_oss_synth_info(dp, dev))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	</div><div class='ctx'> 	ev-&gt;type = type;</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_event.h b/sound/core/seq/oss/seq_oss_event.h<br/>index 9a4d9adb7b8c..b4f723949a17 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_event.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_event.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_event.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_event.h</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * seq_oss_event.h - OSS event queue record</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_EVENT_H</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c<br/>index 69cd7b3c362d..973f057eb731 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_init.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_init.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_init.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_init.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * open/close and reset interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998-1999 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_device.h"</div><div class='hunk'>@@ -28,8 +15,10 @@</div><div class='ctx'> #include "seq_oss_timer.h"</div><div class='ctx'> #include "seq_oss_event.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * common variables</div><div class='hunk'>@@ -59,6 +48,14 @@ static void free_devinfo(void *private);</div><div class='ctx'> #define call_ctl(type,rec) snd_seq_kernel_client_ctl(system_client, type, rec)</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* call snd_seq_oss_midi_lookup_ports() asynchronously */</div><div class='add'>+static void async_call_lookup_ports(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	snd_seq_oss_midi_lookup_ports(system_client);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(async_lookup_work, async_call_lookup_ports);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * create sequencer client for OSS sequencer</div><div class='ctx'>  */</div><div class='hunk'>@@ -66,30 +63,23 @@ int __init</div><div class='ctx'> snd_seq_oss_create_client(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct snd_seq_port_info *port;</div><div class='add'>+	struct snd_seq_port_info *port __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_seq_port_callback port_callback;</div><div class='ctx'> </div><div class='del'>-	port = kmalloc(sizeof(*port), GFP_KERNEL);</div><div class='del'>-	if (!port) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto __error;</div><div class='del'>-	}</div><div class='add'>+	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='add'>+	if (!port)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* create ALSA client */</div><div class='ctx'> 	rc = snd_seq_create_kernel_client(NULL, SNDRV_SEQ_CLIENT_OSS,</div><div class='ctx'> 					  "OSS sequencer");</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	system_client = rc;</div><div class='del'>-	debug_printk(("new client = %d\n", rc));</div><div class='ctx'> </div><div class='del'>-	/* look up midi devices */</div><div class='del'>-	snd_seq_oss_midi_lookup_ports(system_client);</div><div class='del'>-</div><div class='del'>-	/* create annoucement receiver port */</div><div class='del'>-	memset(port, 0, sizeof(*port));</div><div class='del'>-	strcpy(port-&gt;name, "Receiver");</div><div class='add'>+	/* create announcement receiver port */</div><div class='add'>+	strscpy(port-&gt;name, "Receiver");</div><div class='ctx'> 	port-&gt;addr.client = system_client;</div><div class='ctx'> 	port-&gt;capability = SNDRV_SEQ_PORT_CAP_WRITE; /* receive only */</div><div class='ctx'> 	port-&gt;type = 0;</div><div class='hunk'>@@ -101,10 +91,10 @@ snd_seq_oss_create_client(void)</div><div class='ctx'> 	port_callback.event_input = receive_announce;</div><div class='ctx'> 	port-&gt;kernel = &amp;port_callback;</div><div class='ctx'> 	</div><div class='del'>-	call_ctl(SNDRV_SEQ_IOCTL_CREATE_PORT, port);</div><div class='del'>-	if ((system_port = port-&gt;addr.port) &gt;= 0) {</div><div class='add'>+	if (call_ctl(SNDRV_SEQ_IOCTL_CREATE_PORT, port) &gt;= 0) {</div><div class='ctx'> 		struct snd_seq_port_subscribe subs;</div><div class='ctx'> </div><div class='add'>+		system_port = port-&gt;addr.port;</div><div class='ctx'> 		memset(&amp;subs, 0, sizeof(subs));</div><div class='ctx'> 		subs.sender.client = SNDRV_SEQ_CLIENT_SYSTEM;</div><div class='ctx'> 		subs.sender.port = SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE;</div><div class='hunk'>@@ -112,16 +102,16 @@ snd_seq_oss_create_client(void)</div><div class='ctx'> 		subs.dest.port = system_port;</div><div class='ctx'> 		call_ctl(SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, &amp;subs);</div><div class='ctx'> 	}</div><div class='del'>-	rc = 0;</div><div class='ctx'> </div><div class='del'>- __error:</div><div class='del'>-	kfree(port);</div><div class='del'>-	return rc;</div><div class='add'>+	/* look up midi devices */</div><div class='add'>+	schedule_work(&amp;async_lookup_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * receive annoucement from system port, and check the midi device</div><div class='add'>+ * receive announcement from system port, and check the midi device</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> receive_announce(struct snd_seq_event *ev, int direct, void *private, int atomic, int hop)</div><div class='hunk'>@@ -159,6 +149,7 @@ receive_announce(struct snd_seq_event *ev, int direct, void *private, int atomic</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_delete_client(void)</div><div class='ctx'> {</div><div class='add'>+	cancel_work_sync(&amp;async_lookup_work);</div><div class='ctx'> 	if (system_client &gt;= 0)</div><div class='ctx'> 		snd_seq_delete_kernel_client(system_client);</div><div class='ctx'> </div><div class='hunk'>@@ -178,11 +169,8 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	struct seq_oss_devinfo *dp;</div><div class='ctx'> </div><div class='ctx'> 	dp = kzalloc(sizeof(*dp), GFP_KERNEL);</div><div class='del'>-	if (!dp) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc device info\n");</div><div class='add'>+	if (!dp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	debug_printk(("oss_open: dp = %p\n", dp));</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;cseq = system_client;</div><div class='ctx'> 	dp-&gt;port = -1;</div><div class='hunk'>@@ -195,7 +183,7 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;index = i;</div><div class='ctx'> 	if (i &gt;= SNDRV_SEQ_OSS_MAX_CLIENTS) {</div><div class='del'>-		snd_printk(KERN_ERR "too many applications\n");</div><div class='add'>+		pr_debug("ALSA: seq_oss: too many applications\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto _error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -205,21 +193,19 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	snd_seq_oss_midi_setup(dp);</div><div class='ctx'> </div><div class='ctx'> 	if (dp-&gt;synth_opened == 0 &amp;&amp; dp-&gt;max_mididev == 0) {</div><div class='del'>-		/* snd_printk(KERN_ERR "no device found\n"); */</div><div class='add'>+		/* pr_err("ALSA: seq_oss: no device found\n"); */</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto _error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create port */</div><div class='del'>-	debug_printk(("create new port\n"));</div><div class='ctx'> 	rc = create_port(dp);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't create port\n");</div><div class='add'>+		pr_err("ALSA: seq_oss: can't create port\n");</div><div class='ctx'> 		goto _error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate queue */</div><div class='del'>-	debug_printk(("allocate queue\n"));</div><div class='ctx'> 	rc = alloc_seq_queue(dp);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto _error;</div><div class='hunk'>@@ -236,7 +222,6 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	dp-&gt;file_mode = translate_mode(file);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize read queue */</div><div class='del'>-	debug_printk(("initialize read queue\n"));</div><div class='ctx'> 	if (is_read_mode(dp-&gt;file_mode)) {</div><div class='ctx'> 		dp-&gt;readq = snd_seq_oss_readq_new(dp, maxqlen);</div><div class='ctx'> 		if (!dp-&gt;readq) {</div><div class='hunk'>@@ -246,7 +231,6 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize write queue */</div><div class='del'>-	debug_printk(("initialize write queue\n"));</div><div class='ctx'> 	if (is_write_mode(dp-&gt;file_mode)) {</div><div class='ctx'> 		dp-&gt;writeq = snd_seq_oss_writeq_new(dp, maxqlen);</div><div class='ctx'> 		if (!dp-&gt;writeq) {</div><div class='hunk'>@@ -256,14 +240,12 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize timer */</div><div class='del'>-	debug_printk(("initialize timer\n"));</div><div class='ctx'> 	dp-&gt;timer = snd_seq_oss_timer_new(dp);</div><div class='ctx'> 	if (!dp-&gt;timer) {</div><div class='del'>-		snd_printk(KERN_ERR "can't alloc timer\n");</div><div class='add'>+		pr_err("ALSA: seq_oss: can't alloc timer\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto _error;</div><div class='ctx'> 	}</div><div class='del'>-	debug_printk(("timer initialized\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* set private data pointer */</div><div class='ctx'> 	file-&gt;private_data = dp;</div><div class='hunk'>@@ -277,7 +259,6 @@ snd_seq_oss_open(struct file *file, int level)</div><div class='ctx'> 	client_table[dp-&gt;index] = dp;</div><div class='ctx'> 	num_clients++;</div><div class='ctx'> </div><div class='del'>-	debug_printk(("open done\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  _error:</div><div class='hunk'>@@ -336,7 +317,6 @@ create_port(struct seq_oss_devinfo *dp)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;port = port.addr.port;</div><div class='del'>-	debug_printk(("new port = %d\n", port.addr.port));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -352,7 +332,6 @@ delete_port(struct seq_oss_devinfo *dp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	debug_printk(("delete_port %i\n", dp-&gt;port));</div><div class='ctx'> 	return snd_seq_event_port_detach(dp-&gt;cseq, dp-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -368,8 +347,9 @@ alloc_seq_queue(struct seq_oss_devinfo *dp)</div><div class='ctx'> 	memset(&amp;qinfo, 0, sizeof(qinfo));</div><div class='ctx'> 	qinfo.owner = system_client;</div><div class='ctx'> 	qinfo.locked = 1;</div><div class='del'>-	strcpy(qinfo.name, "OSS Sequencer Emulation");</div><div class='del'>-	if ((rc = call_ctl(SNDRV_SEQ_IOCTL_CREATE_QUEUE, &amp;qinfo)) &lt; 0)</div><div class='add'>+	strscpy(qinfo.name, "OSS Sequencer Emulation");</div><div class='add'>+	rc = call_ctl(SNDRV_SEQ_IOCTL_CREATE_QUEUE, &amp;qinfo);</div><div class='add'>+	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	dp-&gt;queue = qinfo.queue;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -390,7 +370,7 @@ delete_seq_queue(int queue)</div><div class='ctx'> 	qinfo.queue = queue;</div><div class='ctx'> 	rc = call_ctl(SNDRV_SEQ_IOCTL_DELETE_QUEUE, &amp;qinfo);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		printk(KERN_ERR "seq-oss: unable to delete queue %d (%d)\n", queue, rc);</div><div class='add'>+		pr_err("ALSA: seq_oss: unable to delete queue %d (%d)\n", queue, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -403,14 +383,11 @@ free_devinfo(void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private;</div><div class='ctx'> </div><div class='del'>-	if (dp-&gt;timer)</div><div class='del'>-		snd_seq_oss_timer_delete(dp-&gt;timer);</div><div class='add'>+	snd_seq_oss_timer_delete(dp-&gt;timer);</div><div class='ctx'> 		</div><div class='del'>-	if (dp-&gt;writeq)</div><div class='del'>-		snd_seq_oss_writeq_delete(dp-&gt;writeq);</div><div class='add'>+	snd_seq_oss_writeq_delete(dp-&gt;writeq);</div><div class='ctx'> </div><div class='del'>-	if (dp-&gt;readq)</div><div class='del'>-		snd_seq_oss_readq_delete(dp-&gt;readq);</div><div class='add'>+	snd_seq_oss_readq_delete(dp-&gt;readq);</div><div class='ctx'> 	</div><div class='ctx'> 	kfree(dp);</div><div class='ctx'> }</div><div class='hunk'>@@ -427,38 +404,16 @@ snd_seq_oss_release(struct seq_oss_devinfo *dp)</div><div class='ctx'> 	client_table[dp-&gt;index] = NULL;</div><div class='ctx'> 	num_clients--;</div><div class='ctx'> </div><div class='del'>-	debug_printk(("resetting..\n"));</div><div class='ctx'> 	snd_seq_oss_reset(dp);</div><div class='ctx'> </div><div class='del'>-	debug_printk(("cleaning up..\n"));</div><div class='ctx'> 	snd_seq_oss_synth_cleanup(dp);</div><div class='ctx'> 	snd_seq_oss_midi_cleanup(dp);</div><div class='ctx'> </div><div class='ctx'> 	/* clear slot */</div><div class='del'>-	debug_printk(("releasing resource..\n"));</div><div class='ctx'> 	queue = dp-&gt;queue;</div><div class='ctx'> 	if (dp-&gt;port &gt;= 0)</div><div class='ctx'> 		delete_port(dp);</div><div class='ctx'> 	delete_seq_queue(queue);</div><div class='del'>-</div><div class='del'>-	debug_printk(("release done\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait until the queue is empty (if we don't have nonblock)</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-snd_seq_oss_drain_write(struct seq_oss_devinfo *dp)</div><div class='del'>-{</div><div class='del'>-	if (! dp-&gt;timer-&gt;running)</div><div class='del'>-		return;</div><div class='del'>-	if (is_write_mode(dp-&gt;file_mode) &amp;&amp; !is_nonblock_mode(dp-&gt;file_mode) &amp;&amp;</div><div class='del'>-	    dp-&gt;writeq) {</div><div class='del'>-		debug_printk(("syncing..\n"));</div><div class='del'>-		while (snd_seq_oss_writeq_sync(dp-&gt;writeq))</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -490,21 +445,14 @@ snd_seq_oss_reset(struct seq_oss_devinfo *dp)</div><div class='ctx'> 	snd_seq_oss_timer_stop(dp-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * misc. functions for proc interface</div><div class='ctx'>  */</div><div class='del'>-char *</div><div class='del'>-enabled_str(int bool)</div><div class='del'>-{</div><div class='del'>-	return bool ? "enabled" : "disabled";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='add'>+static const char *</div><div class='ctx'> filemode_str(int val)</div><div class='ctx'> {</div><div class='del'>-	static char *str[] = {</div><div class='add'>+	static const char * const str[] = {</div><div class='ctx'> 		"none", "read", "write", "read/write",</div><div class='ctx'> 	};</div><div class='ctx'> 	return str[val &amp; SNDRV_SEQ_OSS_FILE_ACMODE];</div><div class='hunk'>@@ -526,7 +474,8 @@ snd_seq_oss_system_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> 	snd_iprintf(buf, "\nNumber of applications: %d\n", num_clients);</div><div class='ctx'> 	for (i = 0; i &lt; num_clients; i++) {</div><div class='ctx'> 		snd_iprintf(buf, "\nApplication %d: ", i);</div><div class='del'>-		if ((dp = client_table[i]) == NULL) {</div><div class='add'>+		dp = client_table[i];</div><div class='add'>+		if (!dp) {</div><div class='ctx'> 			snd_iprintf(buf, "*empty*\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -542,4 +491,4 @@ snd_seq_oss_system_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> 			snd_seq_oss_readq_info_read(dp-&gt;readq, buf);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_ioctl.c b/sound/core/seq/oss/seq_oss_ioctl.c<br/>index 5ac701c903c1..ccf682689ec9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_ioctl.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_ioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_ioctl.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * OSS compatible i/o control</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_device.h"</div><div class='hunk'>@@ -62,7 +49,7 @@ static int snd_seq_oss_oob_user(struct seq_oss_devinfo *dp, void __user *arg)</div><div class='ctx'> 	if (copy_from_user(ev, arg, 8))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	memset(&amp;tmpev, 0, sizeof(tmpev));</div><div class='del'>-	snd_seq_oss_fill_addr(dp, &amp;tmpev, dp-&gt;addr.port, dp-&gt;addr.client);</div><div class='add'>+	snd_seq_oss_fill_addr(dp, &amp;tmpev, dp-&gt;addr.client, dp-&gt;addr.port);</div><div class='ctx'> 	tmpev.time.tick = 0;</div><div class='ctx'> 	if (! snd_seq_oss_process_event(dp, (union evrec *)ev, &amp;tmpev)) {</div><div class='ctx'> 		snd_seq_oss_dispatch(dp, &amp;tmpev, 0, 0);</div><div class='hunk'>@@ -90,12 +77,10 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca</div><div class='ctx'> 		return snd_seq_oss_timer_ioctl(dp-&gt;timer, cmd, arg);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_PANIC:</div><div class='del'>-		debug_printk(("panic\n"));</div><div class='ctx'> 		snd_seq_oss_reset(dp);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_SYNC:</div><div class='del'>-		debug_printk(("sync\n"));</div><div class='ctx'> 		if (! is_write_mode(dp-&gt;file_mode) || dp-&gt;writeq == NULL)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		while (snd_seq_oss_writeq_sync(dp-&gt;writeq))</div><div class='hunk'>@@ -105,55 +90,45 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_RESET:</div><div class='del'>-		debug_printk(("reset\n"));</div><div class='ctx'> 		snd_seq_oss_reset(dp);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_TESTMIDI:</div><div class='del'>-		debug_printk(("test midi\n"));</div><div class='ctx'> 		if (get_user(dev, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return snd_seq_oss_midi_open(dp, dev, dp-&gt;file_mode);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_GETINCOUNT:</div><div class='del'>-		debug_printk(("get in count\n"));</div><div class='ctx'> 		if (dp-&gt;readq == NULL || ! is_read_mode(dp-&gt;file_mode))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		return put_user(dp-&gt;readq-&gt;qlen, p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_GETOUTCOUNT:</div><div class='del'>-		debug_printk(("get out count\n"));</div><div class='ctx'> 		if (! is_write_mode(dp-&gt;file_mode) || dp-&gt;writeq == NULL)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		return put_user(snd_seq_oss_writeq_get_free_size(dp-&gt;writeq), p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_GETTIME:</div><div class='del'>-		debug_printk(("get time\n"));</div><div class='ctx'> 		return put_user(snd_seq_oss_timer_cur_tick(dp-&gt;timer), p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_RESETSAMPLES:</div><div class='del'>-		debug_printk(("reset samples\n"));</div><div class='ctx'> 		if (get_user(dev, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_NRSYNTHS:</div><div class='del'>-		debug_printk(("nr synths\n"));</div><div class='ctx'> 		return put_user(dp-&gt;max_synthdev, p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_NRMIDIS:</div><div class='del'>-		debug_printk(("nr midis\n"));</div><div class='ctx'> 		return put_user(dp-&gt;max_mididev, p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SYNTH_MEMAVL:</div><div class='del'>-		debug_printk(("mem avail\n"));</div><div class='ctx'> 		if (get_user(dev, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		val = snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);</div><div class='ctx'> 		return put_user(val, p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_FM_4OP_ENABLE:</div><div class='del'>-		debug_printk(("4op\n"));</div><div class='ctx'> 		if (get_user(dev, p))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);</div><div class='hunk'>@@ -161,19 +136,15 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SYNTH_INFO:</div><div class='ctx'> 	case SNDCTL_SYNTH_ID:</div><div class='del'>-		debug_printk(("synth info\n"));</div><div class='ctx'> 		return snd_seq_oss_synth_info_user(dp, arg);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_OUTOFBAND:</div><div class='del'>-		debug_printk(("out of band\n"));</div><div class='ctx'> 		return snd_seq_oss_oob_user(dp, arg);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_MIDI_INFO:</div><div class='del'>-		debug_printk(("midi info\n"));</div><div class='ctx'> 		return snd_seq_oss_midi_info_user(dp, arg);</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_SEQ_THRESHOLD:</div><div class='del'>-		debug_printk(("threshold\n"));</div><div class='ctx'> 		if (! is_write_mode(dp-&gt;file_mode))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (get_user(val, p))</div><div class='hunk'>@@ -186,7 +157,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case SNDCTL_MIDI_PRETIME:</div><div class='del'>-		debug_printk(("pretime\n"));</div><div class='ctx'> 		if (dp-&gt;readq == NULL || !is_read_mode(dp-&gt;file_mode))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		if (get_user(val, p))</div><div class='hunk'>@@ -199,7 +169,6 @@ snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long ca</div><div class='ctx'> 		return put_user(val, p) ? -EFAULT : 0;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		debug_printk(("others\n"));</div><div class='ctx'> 		if (! is_write_mode(dp-&gt;file_mode))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		return snd_seq_oss_synth_ioctl(dp, 0, cmd, carg);</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c<br/>index 677dc84590c7..023e5d0a4351 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_midi.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * MIDI device handlers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='hunk'>@@ -29,6 +16,7 @@</div><div class='ctx'> #include "../seq_lock.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -49,8 +37,10 @@ struct seq_oss_midi {</div><div class='ctx'> 	struct snd_midi_event *coder;	/* MIDI event coder */</div><div class='ctx'> 	struct seq_oss_devinfo *devinfo;	/* assigned OSSseq device */</div><div class='ctx'> 	snd_use_lock_t use_lock;</div><div class='add'>+	struct mutex open_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(seq_oss_midi, struct seq_oss_midi *, if (!IS_ERR_OR_NULL(_T)) snd_use_lock_free(&amp;(_T)-&gt;use_lock))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * midi device table</div><div class='hunk'>@@ -72,19 +62,16 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,</div><div class='ctx'>  * look up the existing ports</div><div class='ctx'>  * this looks a very exhausting job.</div><div class='ctx'>  */</div><div class='del'>-int __init</div><div class='add'>+int</div><div class='ctx'> snd_seq_oss_midi_lookup_ports(int client)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_info *clinfo;</div><div class='del'>-	struct snd_seq_port_info *pinfo;</div><div class='add'>+	struct snd_seq_client_info *clinfo __free(kfree) = NULL;</div><div class='add'>+	struct snd_seq_port_info *pinfo __free(kfree) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	clinfo = kzalloc(sizeof(*clinfo), GFP_KERNEL);</div><div class='ctx'> 	pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);</div><div class='del'>-	if (! clinfo || ! pinfo) {</div><div class='del'>-		kfree(clinfo);</div><div class='del'>-		kfree(pinfo);</div><div class='add'>+	if (!clinfo || !pinfo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	clinfo-&gt;client = -1;</div><div class='ctx'> 	while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT, clinfo) == 0) {</div><div class='ctx'> 		if (clinfo-&gt;client == client)</div><div class='hunk'>@@ -94,8 +81,6 @@ snd_seq_oss_midi_lookup_ports(int client)</div><div class='ctx'> 		while (snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT, pinfo) == 0)</div><div class='ctx'> 			snd_seq_oss_midi_check_new_port(pinfo);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(clinfo);</div><div class='del'>-	kfree(pinfo);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -106,13 +91,11 @@ static struct seq_oss_midi *</div><div class='ctx'> get_mdev(int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_midi *mdev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	mdev = midi_devs[dev];</div><div class='ctx'> 	if (mdev)</div><div class='ctx'> 		snd_use_lock_use(&amp;mdev-&gt;use_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 	return mdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,19 +107,16 @@ find_slot(int client, int port)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct seq_oss_midi *mdev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	for (i = 0; i &lt; max_midi_devs; i++) {</div><div class='ctx'> 		mdev = midi_devs[i];</div><div class='ctx'> 		if (mdev &amp;&amp; mdev-&gt;client == client &amp;&amp; mdev-&gt;port == port) {</div><div class='ctx'> 			/* found! */</div><div class='ctx'> 			snd_use_lock_use(&amp;mdev-&gt;use_lock);</div><div class='del'>-			spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 			return mdev;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -151,9 +131,7 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct seq_oss_midi *mdev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	debug_printk(("check for MIDI client %d port %d\n", pinfo-&gt;addr.client, pinfo-&gt;addr.port));</div><div class='ctx'> 	/* the port must include generic midi */</div><div class='ctx'> 	if (! (pinfo-&gt;type &amp; SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -165,7 +143,8 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * look for the identical slot</div><div class='ctx'> 	 */</div><div class='del'>-	if ((mdev = find_slot(pinfo-&gt;addr.client, pinfo-&gt;addr.port)) != NULL) {</div><div class='add'>+	mdev = find_slot(pinfo-&gt;addr.client, pinfo-&gt;addr.port);</div><div class='add'>+	if (mdev) {</div><div class='ctx'> 		/* already exists */</div><div class='ctx'> 		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -174,10 +153,9 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * allocate midi info record</div><div class='ctx'> 	 */</div><div class='del'>-	if ((mdev = kzalloc(sizeof(*mdev), GFP_KERNEL)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc midi info\n");</div><div class='add'>+	mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* copy the port information */</div><div class='ctx'> 	mdev-&gt;client = pinfo-&gt;addr.client;</div><div class='hunk'>@@ -185,13 +163,14 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> 	mdev-&gt;flags = pinfo-&gt;capability;</div><div class='ctx'> 	mdev-&gt;opened = 0;</div><div class='ctx'> 	snd_use_lock_init(&amp;mdev-&gt;use_lock);</div><div class='add'>+	mutex_init(&amp;mdev-&gt;open_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* copy and truncate the name of synth device */</div><div class='del'>-	strlcpy(mdev-&gt;name, pinfo-&gt;name, sizeof(mdev-&gt;name));</div><div class='add'>+	strscpy(mdev-&gt;name, pinfo-&gt;name, sizeof(mdev-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	/* create MIDI coder */</div><div class='ctx'> 	if (snd_midi_event_new(MAX_MIDI_EVENT_BUF, &amp;mdev-&gt;coder) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc midi coder\n");</div><div class='add'>+		pr_err("ALSA: seq_oss: can't malloc midi coder\n");</div><div class='ctx'> 		kfree(mdev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -201,14 +180,13 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * look for en empty slot</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	for (i = 0; i &lt; max_midi_devs; i++) {</div><div class='ctx'> 		if (midi_devs[i] == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &gt;= max_midi_devs) {</div><div class='ctx'> 		if (max_midi_devs &gt;= SNDRV_SEQ_OSS_MAX_MIDI_DEVS) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 			snd_midi_event_free(mdev-&gt;coder);</div><div class='ctx'> 			kfree(mdev);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -217,7 +195,6 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo)</div><div class='ctx'> 	}</div><div class='ctx'> 	mdev-&gt;seq_device = i;</div><div class='ctx'> 	midi_devs[mdev-&gt;seq_device] = mdev;</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -229,26 +206,24 @@ int</div><div class='ctx'> snd_seq_oss_midi_check_exit_port(int client, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_midi *mdev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = find_slot(client, port)) != NULL) {</div><div class='del'>-		spin_lock_irqsave(&amp;register_lock, flags);</div><div class='del'>-		midi_devs[mdev-&gt;seq_device] = NULL;</div><div class='del'>-		spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='add'>+	mdev = find_slot(client, port);</div><div class='add'>+	if (mdev) {</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;register_lock) {</div><div class='add'>+			midi_devs[mdev-&gt;seq_device] = NULL;</div><div class='add'>+		}</div><div class='ctx'> 		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 		snd_use_lock_sync(&amp;mdev-&gt;use_lock);</div><div class='del'>-		if (mdev-&gt;coder)</div><div class='del'>-			snd_midi_event_free(mdev-&gt;coder);</div><div class='add'>+		snd_midi_event_free(mdev-&gt;coder);</div><div class='ctx'> 		kfree(mdev);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	for (index = max_midi_devs - 1; index &gt;= 0; index--) {</div><div class='ctx'> 		if (midi_devs[index])</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	max_midi_devs = index + 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -261,19 +236,17 @@ snd_seq_oss_midi_clear_all(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct seq_oss_midi *mdev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	for (i = 0; i &lt; max_midi_devs; i++) {</div><div class='del'>-		if ((mdev = midi_devs[i]) != NULL) {</div><div class='del'>-			if (mdev-&gt;coder)</div><div class='del'>-				snd_midi_event_free(mdev-&gt;coder);</div><div class='add'>+		mdev = midi_devs[i];</div><div class='add'>+		if (mdev) {</div><div class='add'>+			snd_midi_event_free(mdev-&gt;coder);</div><div class='ctx'> 			kfree(mdev);</div><div class='ctx'> 			midi_devs[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	max_midi_devs = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -283,6 +256,7 @@ snd_seq_oss_midi_clear_all(void)</div><div class='ctx'> void</div><div class='ctx'> snd_seq_oss_midi_setup(struct seq_oss_devinfo *dp)</div><div class='ctx'> {</div><div class='add'>+	guard(spinlock_irq)(&amp;register_lock);</div><div class='ctx'> 	dp-&gt;max_mididev = max_midi_devs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,6 +293,7 @@ get_mididev(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev &lt; 0 || dev &gt;= dp-&gt;max_mididev)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	dev = array_index_nospec(dev, dp-&gt;max_mididev);</div><div class='ctx'> 	return get_mdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,17 +305,17 @@ int</div><div class='ctx'> snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)</div><div class='ctx'> {</div><div class='ctx'> 	int perm;</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> 	struct snd_seq_port_subscribe subs;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='add'>+	guard(mutex)(&amp;mdev-&gt;open_mutex);</div><div class='ctx'> 	/* already used? */</div><div class='del'>-	if (mdev-&gt;opened &amp;&amp; mdev-&gt;devinfo != dp) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if (mdev-&gt;opened &amp;&amp; mdev-&gt;devinfo != dp)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	perm = 0;</div><div class='ctx'> 	if (is_write_mode(fmode))</div><div class='hunk'>@@ -348,16 +323,12 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)</div><div class='ctx'> 	if (is_read_mode(fmode))</div><div class='ctx'> 		perm |= PERM_READ;</div><div class='ctx'> 	perm &amp;= mdev-&gt;flags;</div><div class='del'>-	if (perm == 0) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if (perm == 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* already opened? */</div><div class='del'>-	if ((mdev-&gt;opened &amp; perm) == perm) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if ((mdev-&gt;opened &amp; perm) == perm)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	perm &amp;= ~mdev-&gt;opened;</div><div class='ctx'> </div><div class='hunk'>@@ -380,13 +351,10 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)</div><div class='ctx'> 			mdev-&gt;opened |= PERM_READ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (! mdev-&gt;opened) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if (!mdev-&gt;opened)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mdev-&gt;devinfo = dp;</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -396,17 +364,16 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> 	struct snd_seq_port_subscribe subs;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (! mdev-&gt;opened || mdev-&gt;devinfo != dp) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	guard(mutex)(&amp;mdev-&gt;open_mutex);</div><div class='add'>+	if (!mdev-&gt;opened || mdev-&gt;devinfo != dp)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	debug_printk(("closing client %d port %d mode %d\n", mdev-&gt;client, mdev-&gt;port, mdev-&gt;opened));</div><div class='ctx'> 	memset(&amp;subs, 0, sizeof(subs));</div><div class='ctx'> 	if (mdev-&gt;opened &amp; PERM_WRITE) {</div><div class='ctx'> 		subs.sender = dp-&gt;addr;</div><div class='hunk'>@@ -423,8 +390,6 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> </div><div class='ctx'> 	mdev-&gt;opened = 0;</div><div class='ctx'> 	mdev-&gt;devinfo = NULL;</div><div class='del'>-</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -434,10 +399,11 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> 	int mode;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mode = 0;</div><div class='hunk'>@@ -446,7 +412,6 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> 	if (mdev-&gt;opened &amp; PERM_READ)</div><div class='ctx'> 		mode |= SNDRV_SEQ_OSS_FILE_READ;</div><div class='ctx'> </div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -457,20 +422,18 @@ snd_seq_oss_midi_filemode(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> void</div><div class='ctx'> snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return;</div><div class='del'>-	if (! mdev-&gt;opened) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if (!mdev-&gt;opened)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (mdev-&gt;opened &amp; PERM_WRITE) {</div><div class='ctx'> 		struct snd_seq_event ev;</div><div class='ctx'> 		int c;</div><div class='ctx'> </div><div class='del'>-		debug_printk(("resetting client %d port %d\n", mdev-&gt;client, mdev-&gt;port));</div><div class='ctx'> 		memset(&amp;ev, 0, sizeof(ev));</div><div class='ctx'> 		ev.dest.client = mdev-&gt;client;</div><div class='ctx'> 		ev.dest.port = mdev-&gt;port;</div><div class='hunk'>@@ -496,7 +459,6 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	// snd_seq_oss_midi_close(dp, dev);</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -506,13 +468,13 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> void</div><div class='ctx'> snd_seq_oss_midi_get_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_addr *addr)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return;</div><div class='ctx'> 	addr-&gt;client = mdev-&gt;client;</div><div class='ctx'> 	addr-&gt;port = mdev-&gt;port;</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -523,25 +485,20 @@ int</div><div class='ctx'> snd_seq_oss_midi_input(struct snd_seq_event *ev, int direct, void *private_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private_data;</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='del'>-	int rc;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (dp-&gt;readq == NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((mdev = find_slot(ev-&gt;source.client, ev-&gt;source.port)) == NULL)</div><div class='add'>+	mdev = find_slot(ev-&gt;source.client, ev-&gt;source.port);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (! (mdev-&gt;opened &amp; PERM_READ)) {</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	if (!(mdev-&gt;opened &amp; PERM_READ))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (dp-&gt;seq_mode == SNDRV_SEQ_OSS_MODE_MUSIC)</div><div class='del'>-		rc = send_synth_event(dp, ev, mdev-&gt;seq_device);</div><div class='add'>+		return send_synth_event(dp, ev, mdev-&gt;seq_device);</div><div class='ctx'> 	else</div><div class='del'>-		rc = send_midi_event(dp, ev, mdev);</div><div class='del'>-</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='del'>-	return rc;</div><div class='add'>+		return send_midi_event(dp, ev, mdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -618,9 +575,8 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq</div><div class='ctx'> 	if (!dp-&gt;timer-&gt;running)</div><div class='ctx'> 		len = snd_seq_oss_timer_start(dp-&gt;timer);</div><div class='ctx'> 	if (ev-&gt;type == SNDRV_SEQ_EVENT_SYSEX) {</div><div class='del'>-		if ((ev-&gt;flags &amp; SNDRV_SEQ_EVENT_LENGTH_MASK) == SNDRV_SEQ_EVENT_LENGTH_VARIABLE)</div><div class='del'>-			snd_seq_oss_readq_puts(dp-&gt;readq, mdev-&gt;seq_device,</div><div class='del'>-					       ev-&gt;data.ext.ptr, ev-&gt;data.ext.len);</div><div class='add'>+		snd_seq_oss_readq_sysex(dp-&gt;readq, mdev-&gt;seq_device, ev);</div><div class='add'>+		snd_midi_event_reset_decode(mdev-&gt;coder);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		len = snd_midi_event_decode(mdev-&gt;coder, msg, sizeof(msg), ev);</div><div class='ctx'> 		if (len &gt; 0)</div><div class='hunk'>@@ -639,16 +595,15 @@ send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, struct seq</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	if (snd_midi_event_encode_byte(mdev-&gt;coder, c, ev) &gt; 0) {</div><div class='add'>+	if (snd_midi_event_encode_byte(mdev-&gt;coder, c, ev)) {</div><div class='ctx'> 		snd_seq_oss_fill_addr(dp, ev, mdev-&gt;client, mdev-&gt;port);</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -658,20 +613,20 @@ snd_seq_oss_midi_putc(struct seq_oss_devinfo *dp, int dev, unsigned char c, stru</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_midi_make_info(struct seq_oss_devinfo *dp, int dev, struct midi_info *inf)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='add'>+	struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((mdev = get_mididev(dp, dev)) == NULL)</div><div class='add'>+	mdev = get_mididev(dp, dev);</div><div class='add'>+	if (!mdev)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	inf-&gt;device = dev;</div><div class='ctx'> 	inf-&gt;dev_type = 0; /* FIXME: ?? */</div><div class='ctx'> 	inf-&gt;capabilities = 0; /* FIXME: ?? */</div><div class='del'>-	strlcpy(inf-&gt;name, mdev-&gt;name, sizeof(inf-&gt;name));</div><div class='del'>-	snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='add'>+	strscpy(inf-&gt;name, mdev-&gt;name, sizeof(inf-&gt;name));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -693,10 +648,11 @@ void</div><div class='ctx'> snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct seq_oss_midi *mdev;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buf, "\nNumber of MIDI devices: %d\n", max_midi_devs);</div><div class='ctx'> 	for (i = 0; i &lt; max_midi_devs; i++) {</div><div class='add'>+		struct seq_oss_midi *mdev __free(seq_oss_midi) = NULL;</div><div class='add'>+</div><div class='ctx'> 		snd_iprintf(buf, "\nmidi %d: ", i);</div><div class='ctx'> 		mdev = get_mdev(i);</div><div class='ctx'> 		if (mdev == NULL) {</div><div class='hunk'>@@ -708,7 +664,6 @@ snd_seq_oss_midi_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> 		snd_iprintf(buf, "  capability %s / opened %s\n",</div><div class='ctx'> 			    capmode_str(mdev-&gt;flags),</div><div class='ctx'> 			    capmode_str(mdev-&gt;opened));</div><div class='del'>-		snd_use_lock_free(&amp;mdev-&gt;use_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_midi.h b/sound/core/seq/oss/seq_oss_midi.h<br/>index 84eb866ba58e..bcc1683773df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_midi.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_midi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_midi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_midi.h</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * midi device information</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_MIDI_H</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_readq.c b/sound/core/seq/oss/seq_oss_readq.c<br/>index 73661c4ab82a..bbaf72e70b35 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_readq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_readq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_readq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_readq.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * seq_oss_readq.c - MIDI input queue</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_readq.h"</div><div class='hunk'>@@ -47,13 +34,12 @@ snd_seq_oss_readq_new(struct seq_oss_devinfo *dp, int maxlen)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_readq *q;</div><div class='ctx'> </div><div class='del'>-	if ((q = kzalloc(sizeof(*q), GFP_KERNEL)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc read queue\n");</div><div class='add'>+	q = kzalloc(sizeof(*q), GFP_KERNEL);</div><div class='add'>+	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((q-&gt;q = kcalloc(maxlen, sizeof(union evrec), GFP_KERNEL)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc read queue buffer\n");</div><div class='add'>+	q-&gt;q = kcalloc(maxlen, sizeof(union evrec), GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;q) {</div><div class='ctx'> 		kfree(q);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -92,8 +78,7 @@ snd_seq_oss_readq_clear(struct seq_oss_readq *q)</div><div class='ctx'> 		q-&gt;head = q-&gt;tail = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* if someone sleeping, wake'em up */</div><div class='del'>-	if (waitqueue_active(&amp;q-&gt;midi_sleep))</div><div class='del'>-		wake_up(&amp;q-&gt;midi_sleep);</div><div class='add'>+	wake_up(&amp;q-&gt;midi_sleep);</div><div class='ctx'> 	q-&gt;input_time = (unsigned long)-1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -120,29 +105,51 @@ snd_seq_oss_readq_puts(struct seq_oss_readq *q, int dev, unsigned char *data, in</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * put MIDI sysex bytes; the event buffer may be chained, thus it has</div><div class='add'>+ * to be expanded via snd_seq_dump_var_event().</div><div class='add'>+ */</div><div class='add'>+struct readq_sysex_ctx {</div><div class='add'>+	struct seq_oss_readq *readq;</div><div class='add'>+	int dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int readq_dump_sysex(void *ptr, void *buf, int count)</div><div class='add'>+{</div><div class='add'>+	struct readq_sysex_ctx *ctx = ptr;</div><div class='add'>+</div><div class='add'>+	return snd_seq_oss_readq_puts(ctx-&gt;readq, ctx-&gt;dev, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_seq_oss_readq_sysex(struct seq_oss_readq *q, int dev,</div><div class='add'>+			    struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	struct readq_sysex_ctx ctx = {</div><div class='add'>+		.readq = q,</div><div class='add'>+		.dev = dev</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if ((ev-&gt;flags &amp; SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE)</div><div class='add'>+		return 0;</div><div class='add'>+	return snd_seq_dump_var_event(ev, readq_dump_sysex, &amp;ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * copy an event to input queue:</div><div class='ctx'>  * return zero if enqueued</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_readq_put_event(struct seq_oss_readq *q, union evrec *ev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;lock, flags);</div><div class='del'>-	if (q-&gt;qlen &gt;= q-&gt;maxlen - 1) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;q-&gt;lock);</div><div class='add'>+	if (q-&gt;qlen &gt;= q-&gt;maxlen - 1)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;q-&gt;q[q-&gt;tail], ev, sizeof(*ev));</div><div class='ctx'> 	q-&gt;tail = (q-&gt;tail + 1) % q-&gt;maxlen;</div><div class='ctx'> 	q-&gt;qlen++;</div><div class='ctx'> </div><div class='ctx'> 	/* wake up sleeper */</div><div class='del'>-	if (waitqueue_active(&amp;q-&gt;midi_sleep))</div><div class='del'>-		wake_up(&amp;q-&gt;midi_sleep);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;lock, flags);</div><div class='add'>+	wake_up(&amp;q-&gt;midi_sleep);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -223,7 +230,7 @@ snd_seq_oss_readq_put_timestamp(struct seq_oss_readq *q, unsigned long curt, int</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -234,4 +241,4 @@ snd_seq_oss_readq_info_read(struct seq_oss_readq *q, struct snd_info_buffer *buf</div><div class='ctx'> 		    (waitqueue_active(&amp;q-&gt;midi_sleep) ? "sleeping":"running"),</div><div class='ctx'> 		    q-&gt;qlen, q-&gt;input_time);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_readq.h b/sound/core/seq/oss/seq_oss_readq.h<br/>index f1463f1f449e..38d0c4682b29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_readq.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_readq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_readq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_readq.h</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  * read fifo queue</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_READQ_H</div><div class='hunk'>@@ -44,6 +31,8 @@ void snd_seq_oss_readq_delete(struct seq_oss_readq *q);</div><div class='ctx'> void snd_seq_oss_readq_clear(struct seq_oss_readq *readq);</div><div class='ctx'> unsigned int snd_seq_oss_readq_poll(struct seq_oss_readq *readq, struct file *file, poll_table *wait);</div><div class='ctx'> int snd_seq_oss_readq_puts(struct seq_oss_readq *readq, int dev, unsigned char *data, int len);</div><div class='add'>+int snd_seq_oss_readq_sysex(struct seq_oss_readq *q, int dev,</div><div class='add'>+			    struct snd_seq_event *ev);</div><div class='ctx'> int snd_seq_oss_readq_put_event(struct seq_oss_readq *readq, union evrec *ev);</div><div class='ctx'> int snd_seq_oss_readq_put_timestamp(struct seq_oss_readq *readq, unsigned long curt, int seq_mode);</div><div class='ctx'> int snd_seq_oss_readq_pick(struct seq_oss_readq *q, union evrec *rec);</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_rw.c b/sound/core/seq/oss/seq_oss_rw.c<br/>index 6a7b6aceeca9..8a142fd54a19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_rw.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_rw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_rw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_rw.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * read/write/select interface to device file</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_device.h"</div><div class='hunk'>@@ -145,7 +132,8 @@ snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int count,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* insert queue */</div><div class='del'>-		if ((err = insert_queue(dp, &amp;rec, opt)) &lt; 0)</div><div class='add'>+		err = insert_queue(dp, &amp;rec, opt);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		result += ev_size;</div><div class='hunk'>@@ -174,20 +162,17 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)</div><div class='ctx'> 	memset(&amp;event, 0, sizeof(event));</div><div class='ctx'> 	/* set dummy -- to be sure */</div><div class='ctx'> 	event.type = SNDRV_SEQ_EVENT_NOTEOFF;</div><div class='del'>-	snd_seq_oss_fill_addr(dp, &amp;event, dp-&gt;addr.port, dp-&gt;addr.client);</div><div class='add'>+	snd_seq_oss_fill_addr(dp, &amp;event, dp-&gt;addr.client, dp-&gt;addr.port);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_seq_oss_process_event(dp, rec, &amp;event))</div><div class='ctx'> 		return 0; /* invalid event - no need to insert queue */</div><div class='ctx'> </div><div class='ctx'> 	event.time.tick = snd_seq_oss_timer_cur_tick(dp-&gt;timer);</div><div class='del'>-	if (dp-&gt;timer-&gt;realtime || !dp-&gt;timer-&gt;running) {</div><div class='add'>+	if (dp-&gt;timer-&gt;realtime || !dp-&gt;timer-&gt;running)</div><div class='ctx'> 		snd_seq_oss_dispatch(dp, &amp;event, 0, 0);</div><div class='del'>-	} else {</div><div class='del'>-		if (is_nonblock_mode(dp-&gt;file_mode))</div><div class='del'>-			rc = snd_seq_kernel_client_enqueue(dp-&gt;cseq, &amp;event, 0, 0);</div><div class='del'>-		else</div><div class='del'>-			rc = snd_seq_kernel_client_enqueue_blocking(dp-&gt;cseq, &amp;event, opt, 0, 0);</div><div class='del'>-	}</div><div class='add'>+	else</div><div class='add'>+		rc = snd_seq_kernel_client_enqueue(dp-&gt;cseq, &amp;event, opt,</div><div class='add'>+						   !is_nonblock_mode(dp-&gt;file_mode));</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> 		</div><div class='hunk'>@@ -196,21 +181,21 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)</div><div class='ctx'>  * select / poll</div><div class='ctx'>  */</div><div class='ctx'>   </div><div class='del'>-unsigned int</div><div class='add'>+__poll_t</div><div class='ctx'> snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = 0;</div><div class='add'>+	__poll_t mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* input */</div><div class='ctx'> 	if (dp-&gt;readq &amp;&amp; is_read_mode(dp-&gt;file_mode)) {</div><div class='ctx'> 		if (snd_seq_oss_readq_poll(dp-&gt;readq, file, wait))</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='add'>+			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* output */</div><div class='ctx'> 	if (dp-&gt;writeq &amp;&amp; is_write_mode(dp-&gt;file_mode)) {</div><div class='ctx'> 		if (snd_seq_kernel_client_write_poll(dp-&gt;cseq, file, wait))</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='add'>+			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 	}</div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c<br/>index ee44ab9593c0..8c4e5913c7e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_synth.c</a></div><div class='hunk'>@@ -1,30 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * synth device handlers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_synth.h"</div><div class='ctx'> #include "seq_oss_midi.h"</div><div class='ctx'> #include "../seq_lock.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * constants</div><div class='hunk'>@@ -37,13 +26,6 @@</div><div class='ctx'>  * definition of synth info records</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* sysex buffer */</div><div class='del'>-struct seq_oss_synth_sysex {</div><div class='del'>-	int len;</div><div class='del'>-	int skip;</div><div class='del'>-	unsigned char buf[MAX_SYSEX_BUFLEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* synth info */</div><div class='ctx'> struct seq_oss_synth {</div><div class='ctx'> 	int seq_device;</div><div class='hunk'>@@ -62,6 +44,7 @@ struct seq_oss_synth {</div><div class='ctx'> 	snd_use_lock_t use_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(seq_oss_synth, struct seq_oss_synth *, if (!IS_ERR_OR_NULL(_T)) snd_use_lock_free(&amp;(_T)-&gt;use_lock))</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * device table</div><div class='hunk'>@@ -69,11 +52,11 @@ struct seq_oss_synth {</div><div class='ctx'> static int max_synth_devs;</div><div class='ctx'> static struct seq_oss_synth *synth_devs[SNDRV_SEQ_OSS_MAX_SYNTH_DEVS];</div><div class='ctx'> static struct seq_oss_synth midi_synth_dev = {</div><div class='del'>-	-1, /* seq_device */</div><div class='del'>-	SYNTH_TYPE_MIDI, /* synth_type */</div><div class='del'>-	0, /* synth_subtype */</div><div class='del'>-	16, /* nr_voices */</div><div class='del'>-	"MIDI", /* name */</div><div class='add'>+	.seq_device = -1,</div><div class='add'>+	.synth_type = SYNTH_TYPE_MIDI,</div><div class='add'>+	.synth_subtype = 0,</div><div class='add'>+	.nr_voices = 16,</div><div class='add'>+	.name = "MIDI",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static DEFINE_SPINLOCK(register_lock);</div><div class='hunk'>@@ -97,17 +80,16 @@ snd_seq_oss_synth_init(void)</div><div class='ctx'>  * registration of the synth device</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='del'>-snd_seq_oss_synth_register(struct snd_seq_device *dev)</div><div class='add'>+snd_seq_oss_synth_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct seq_oss_synth *rec;</div><div class='ctx'> 	struct snd_seq_oss_reg *reg = SNDRV_SEQ_DEVICE_ARGPTR(dev);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if ((rec = kzalloc(sizeof(*rec), GFP_KERNEL)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't malloc synth info\n");</div><div class='add'>+	rec = kzalloc(sizeof(*rec), GFP_KERNEL);</div><div class='add'>+	if (!rec)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	rec-&gt;seq_device = -1;</div><div class='ctx'> 	rec-&gt;synth_type = reg-&gt;type;</div><div class='ctx'> 	rec-&gt;synth_subtype = reg-&gt;subtype;</div><div class='hunk'>@@ -118,27 +100,25 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)</div><div class='ctx'> 	snd_use_lock_init(&amp;rec-&gt;use_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* copy and truncate the name of synth device */</div><div class='del'>-	strlcpy(rec-&gt;name, dev-&gt;name, sizeof(rec-&gt;name));</div><div class='add'>+	strscpy(rec-&gt;name, dev-&gt;name, sizeof(rec-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	/* registration */</div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; max_synth_devs; i++) {</div><div class='del'>-		if (synth_devs[i] == NULL)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i &gt;= max_synth_devs) {</div><div class='del'>-		if (max_synth_devs &gt;= SNDRV_SEQ_OSS_MAX_SYNTH_DEVS) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='del'>-			snd_printk(KERN_ERR "no more synth slot\n");</div><div class='del'>-			kfree(rec);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;register_lock) {</div><div class='add'>+		for (i = 0; i &lt; max_synth_devs; i++) {</div><div class='add'>+			if (synth_devs[i] == NULL)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i &gt;= max_synth_devs) {</div><div class='add'>+			if (max_synth_devs &gt;= SNDRV_SEQ_OSS_MAX_SYNTH_DEVS) {</div><div class='add'>+				pr_err("ALSA: seq_oss: no more synth slot\n");</div><div class='add'>+				kfree(rec);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='add'>+			max_synth_devs++;</div><div class='ctx'> 		}</div><div class='del'>-		max_synth_devs++;</div><div class='add'>+		rec-&gt;seq_device = i;</div><div class='add'>+		synth_devs[i] = rec;</div><div class='ctx'> 	}</div><div class='del'>-	rec-&gt;seq_device = i;</div><div class='del'>-	synth_devs[i] = rec;</div><div class='del'>-	debug_printk(("synth %s registered %d\n", rec-&gt;name, i));</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 	dev-&gt;driver_data = rec;</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_SYNTH</div><div class='ctx'> 	if (i &lt; SNDRV_CARDS)</div><div class='hunk'>@@ -149,31 +129,30 @@ snd_seq_oss_synth_register(struct snd_seq_device *dev)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> int</div><div class='del'>-snd_seq_oss_synth_unregister(struct snd_seq_device *dev)</div><div class='add'>+snd_seq_oss_synth_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	int index;</div><div class='ctx'> 	struct seq_oss_synth *rec = dev-&gt;driver_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='del'>-	for (index = 0; index &lt; max_synth_devs; index++) {</div><div class='del'>-		if (synth_devs[index] == rec)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (index &gt;= max_synth_devs) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='del'>-		snd_printk(KERN_ERR "can't unregister synth\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	synth_devs[index] = NULL;</div><div class='del'>-	if (index == max_synth_devs - 1) {</div><div class='del'>-		for (index--; index &gt;= 0; index--) {</div><div class='del'>-			if (synth_devs[index])</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;register_lock) {</div><div class='add'>+		for (index = 0; index &lt; max_synth_devs; index++) {</div><div class='add'>+			if (synth_devs[index] == rec)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		max_synth_devs = index + 1;</div><div class='add'>+		if (index &gt;= max_synth_devs) {</div><div class='add'>+			pr_err("ALSA: seq_oss: can't unregister synth\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		synth_devs[index] = NULL;</div><div class='add'>+		if (index == max_synth_devs - 1) {</div><div class='add'>+			for (index--; index &gt;= 0; index--) {</div><div class='add'>+				if (synth_devs[index])</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			max_synth_devs = index + 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_SYNTH</div><div class='ctx'> 	if (rec-&gt;seq_device &lt; SNDRV_CARDS)</div><div class='ctx'> 		snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_SYNTH, rec-&gt;seq_device);</div><div class='hunk'>@@ -192,13 +171,11 @@ static struct seq_oss_synth *</div><div class='ctx'> get_sdev(int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_synth *rec;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;register_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;register_lock);</div><div class='ctx'> 	rec = synth_devs[dev];</div><div class='ctx'> 	if (rec)</div><div class='ctx'> 		snd_use_lock_use(&amp;rec-&gt;use_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;register_lock, flags);</div><div class='ctx'> 	return rec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,20 +188,18 @@ void</div><div class='ctx'> snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='ctx'> 	struct seq_oss_synthinfo *info;</div><div class='ctx'> </div><div class='ctx'> 	dp-&gt;max_synthdev = max_synth_devs;</div><div class='ctx'> 	dp-&gt;synth_opened = 0;</div><div class='ctx'> 	memset(dp-&gt;synths, 0, sizeof(dp-&gt;synths));</div><div class='ctx'> 	for (i = 0; i &lt; dp-&gt;max_synthdev; i++) {</div><div class='del'>-		rec = get_sdev(i);</div><div class='add'>+		struct seq_oss_synth *rec __free(seq_oss_synth) = get_sdev(i);</div><div class='add'>+</div><div class='ctx'> 		if (rec == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (rec-&gt;oper.open == NULL || rec-&gt;oper.close == NULL) {</div><div class='del'>-			snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='add'>+		if (rec-&gt;oper.open == NULL || rec-&gt;oper.close == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> 		info = &amp;dp-&gt;synths[i];</div><div class='ctx'> 		info-&gt;arg.app_index = dp-&gt;port;</div><div class='ctx'> 		info-&gt;arg.file_mode = dp-&gt;file_mode;</div><div class='hunk'>@@ -234,32 +209,25 @@ snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp)</div><div class='ctx'> 		else</div><div class='ctx'> 			info-&gt;arg.event_passing = SNDRV_SEQ_OSS_PASS_EVENTS;</div><div class='ctx'> 		info-&gt;opened = 0;</div><div class='del'>-		if (!try_module_get(rec-&gt;oper.owner)) {</div><div class='del'>-			snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='add'>+		if (!try_module_get(rec-&gt;oper.owner))</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> 		if (rec-&gt;oper.open(&amp;info-&gt;arg, rec-&gt;private_data) &lt; 0) {</div><div class='ctx'> 			module_put(rec-&gt;oper.owner);</div><div class='del'>-			snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		info-&gt;nr_voices = rec-&gt;nr_voices;</div><div class='ctx'> 		if (info-&gt;nr_voices &gt; 0) {</div><div class='ctx'> 			info-&gt;ch = kcalloc(info-&gt;nr_voices, sizeof(struct seq_oss_chinfo), GFP_KERNEL);</div><div class='ctx'> 			if (!info-&gt;ch) {</div><div class='del'>-				snd_printk(KERN_ERR "Cannot malloc\n");</div><div class='ctx'> 				rec-&gt;oper.close(&amp;info-&gt;arg);</div><div class='ctx'> 				module_put(rec-&gt;oper.owner);</div><div class='del'>-				snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			reset_channels(info);</div><div class='ctx'> 		}</div><div class='del'>-		debug_printk(("synth %d assigned\n", i));</div><div class='ctx'> 		info-&gt;opened++;</div><div class='ctx'> 		rec-&gt;opened++;</div><div class='ctx'> 		dp-&gt;synth_opened++;</div><div class='del'>-		snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -306,10 +274,9 @@ void</div><div class='ctx'> snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='ctx'> 	struct seq_oss_synthinfo *info;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(dp-&gt;max_synthdev &gt;= SNDRV_SEQ_OSS_MAX_SYNTH_DEVS))</div><div class='add'>+	if (snd_BUG_ON(dp-&gt;max_synthdev &gt; SNDRV_SEQ_OSS_MAX_SYNTH_DEVS))</div><div class='ctx'> 		return;</div><div class='ctx'> 	for (i = 0; i &lt; dp-&gt;max_synthdev; i++) {</div><div class='ctx'> 		info = &amp;dp-&gt;synths[i];</div><div class='hunk'>@@ -321,19 +288,17 @@ snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp)</div><div class='ctx'> 				midi_synth_dev.opened--;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			rec = get_sdev(i);</div><div class='add'>+			struct seq_oss_synth *rec __free(seq_oss_synth) =</div><div class='add'>+				get_sdev(i);</div><div class='add'>+</div><div class='ctx'> 			if (rec == NULL)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (rec-&gt;opened &gt; 0) {</div><div class='del'>-				debug_printk(("synth %d closed\n", i));</div><div class='ctx'> 				rec-&gt;oper.close(&amp;info-&gt;arg);</div><div class='ctx'> 				module_put(rec-&gt;oper.owner);</div><div class='ctx'> 				rec-&gt;opened = 0;</div><div class='ctx'> 			}</div><div class='del'>-			snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> 		}</div><div class='del'>-		kfree(info-&gt;sysex);</div><div class='del'>-		info-&gt;sysex = NULL;</div><div class='ctx'> 		kfree(info-&gt;ch);</div><div class='ctx'> 		info-&gt;ch = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,17 +306,13 @@ snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp)</div><div class='ctx'> 	dp-&gt;max_synthdev = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * check if the specified device is MIDI mapped device</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-is_midi_dev(struct seq_oss_devinfo *dp, int dev)</div><div class='add'>+static struct seq_oss_synthinfo *</div><div class='add'>+get_synthinfo_nospec(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (dev &lt; 0 || dev &gt;= dp-&gt;max_synthdev)</div><div class='del'>-		return 0;</div><div class='del'>-	if (dp-&gt;synths[dev].is_midi)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='add'>+		return NULL;</div><div class='add'>+	dev = array_index_nospec(dev, SNDRV_SEQ_OSS_MAX_SYNTH_DEVS);</div><div class='add'>+	return &amp;dp-&gt;synths[dev];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -361,14 +322,20 @@ static struct seq_oss_synth *</div><div class='ctx'> get_synthdev(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct seq_oss_synth *rec;</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= dp-&gt;max_synthdev)</div><div class='del'>-		return NULL;</div><div class='del'>-	if (! dp-&gt;synths[dev].opened)</div><div class='add'>+	struct seq_oss_synthinfo *info = get_synthinfo_nospec(dp, dev);</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (dp-&gt;synths[dev].is_midi)</div><div class='del'>-		return &amp;midi_synth_dev;</div><div class='del'>-	if ((rec = get_sdev(dev)) == NULL)</div><div class='add'>+	if (!info-&gt;opened)</div><div class='ctx'> 		return NULL;</div><div class='add'>+	if (info-&gt;is_midi) {</div><div class='add'>+		rec = &amp;midi_synth_dev;</div><div class='add'>+		snd_use_lock_use(&amp;rec-&gt;use_lock);</div><div class='add'>+	} else {</div><div class='add'>+		rec = get_sdev(dev);</div><div class='add'>+		if (!rec)</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='ctx'> 	if (! rec-&gt;opened) {</div><div class='ctx'> 		snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -401,16 +368,12 @@ reset_channels(struct seq_oss_synthinfo *info)</div><div class='ctx'> void</div><div class='ctx'> snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='add'>+	struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;</div><div class='ctx'> 	struct seq_oss_synthinfo *info;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(dev &lt; 0 || dev &gt;= dp-&gt;max_synthdev))</div><div class='add'>+	info = get_synthinfo_nospec(dp, dev);</div><div class='add'>+	if (!info || !info-&gt;opened)</div><div class='ctx'> 		return;</div><div class='del'>-	info = &amp;dp-&gt;synths[dev];</div><div class='del'>-	if (! info-&gt;opened)</div><div class='del'>-		return;</div><div class='del'>-	if (info-&gt;sysex)</div><div class='del'>-		info-&gt;sysex-&gt;len = 0; /* reset sysex */</div><div class='ctx'> 	reset_channels(info);</div><div class='ctx'> 	if (info-&gt;is_midi) {</div><div class='ctx'> 		if (midi_synth_dev.opened &lt;= 0)</div><div class='hunk'>@@ -422,8 +385,6 @@ snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> 					  dp-&gt;file_mode) &lt; 0) {</div><div class='ctx'> 			midi_synth_dev.opened--;</div><div class='ctx'> 			info-&gt;opened = 0;</div><div class='del'>-			kfree(info-&gt;sysex);</div><div class='del'>-			info-&gt;sysex = NULL;</div><div class='ctx'> 			kfree(info-&gt;ch);</div><div class='ctx'> 			info-&gt;ch = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -443,7 +404,6 @@ snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> 		ev.type = SNDRV_SEQ_EVENT_RESET;</div><div class='ctx'> 		snd_seq_oss_dispatch(dp, &amp;ev, 0, 0);</div><div class='ctx'> 	}</div><div class='del'>-	snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -455,98 +415,62 @@ int</div><div class='ctx'> snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt,</div><div class='ctx'> 			    const char __user *buf, int p, int c)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='del'>-	int rc;</div><div class='add'>+	struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;</div><div class='add'>+	struct seq_oss_synthinfo *info;</div><div class='ctx'> </div><div class='del'>-	if (dev &lt; 0 || dev &gt;= dp-&gt;max_synthdev)</div><div class='add'>+	info = get_synthinfo_nospec(dp, dev);</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (is_midi_dev(dp, dev))</div><div class='add'>+	if (info-&gt;is_midi)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((rec = get_synthdev(dp, dev)) == NULL)</div><div class='add'>+	rec = get_synthdev(dp, dev);</div><div class='add'>+	if (!rec)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	if (rec-&gt;oper.load_patch == NULL)</div><div class='del'>-		rc = -ENXIO;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	else</div><div class='del'>-		rc = rec-&gt;oper.load_patch(&amp;dp-&gt;synths[dev].arg, fmt, buf, p, c);</div><div class='del'>-	snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='del'>-	return rc;</div><div class='add'>+		return rec-&gt;oper.load_patch(&amp;info-&gt;arg, fmt, buf, p, c);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * check if the device is valid synth device</div><div class='add'>+ * check if the device is valid synth device and return the synth info</div><div class='ctx'>  */</div><div class='del'>-int</div><div class='del'>-snd_seq_oss_synth_is_valid(struct seq_oss_devinfo *dp, int dev)</div><div class='add'>+struct seq_oss_synthinfo *</div><div class='add'>+snd_seq_oss_synth_info(struct seq_oss_devinfo *dp, int dev)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='add'>+	struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;</div><div class='add'>+</div><div class='ctx'> 	rec = get_synthdev(dp, dev);</div><div class='del'>-	if (rec) {</div><div class='del'>-		snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (rec)</div><div class='add'>+		return get_synthinfo_nospec(dp, dev);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * receive OSS 6 byte sysex packet:</div><div class='del'>- * the full sysex message will be sent if it reaches to the end of data</div><div class='del'>- * (0xff).</div><div class='add'>+ * the event is filled and prepared for sending immediately</div><div class='add'>+ * (i.e. sysex messages are fragmented)</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	int i, send;</div><div class='del'>-	unsigned char *dest;</div><div class='del'>-	struct seq_oss_synth_sysex *sysex;</div><div class='add'>+	unsigned char *p;</div><div class='add'>+	int len = 6;</div><div class='ctx'> </div><div class='del'>-	if (! snd_seq_oss_synth_is_valid(dp, dev))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	sysex = dp-&gt;synths[dev].sysex;</div><div class='del'>-	if (sysex == NULL) {</div><div class='del'>-		sysex = kzalloc(sizeof(*sysex), GFP_KERNEL);</div><div class='del'>-		if (sysex == NULL)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		dp-&gt;synths[dev].sysex = sysex;</div><div class='del'>-	}</div><div class='add'>+	p = memchr(buf, 0xff, 6);</div><div class='add'>+	if (p)</div><div class='add'>+		len = p - buf + 1;</div><div class='ctx'> </div><div class='del'>-	send = 0;</div><div class='del'>-	dest = sysex-&gt;buf + sysex-&gt;len;</div><div class='del'>-	/* copy 6 byte packet to the buffer */</div><div class='del'>-	for (i = 0; i &lt; 6; i++) {</div><div class='del'>-		if (buf[i] == 0xff) {</div><div class='del'>-			send = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		dest[i] = buf[i];</div><div class='del'>-		sysex-&gt;len++;</div><div class='del'>-		if (sysex-&gt;len &gt;= MAX_SYSEX_BUFLEN) {</div><div class='del'>-			sysex-&gt;len = 0;</div><div class='del'>-			sysex-&gt;skip = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sysex-&gt;len &amp;&amp; send) {</div><div class='del'>-		if (sysex-&gt;skip) {</div><div class='del'>-			sysex-&gt;skip = 0;</div><div class='del'>-			sysex-&gt;len = 0;</div><div class='del'>-			return -EINVAL; /* skip */</div><div class='del'>-		}</div><div class='del'>-		/* copy the data to event record and send it */</div><div class='del'>-		ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_VARIABLE;</div><div class='del'>-		if (snd_seq_oss_synth_addr(dp, dev, ev))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		ev-&gt;data.ext.len = sysex-&gt;len;</div><div class='del'>-		ev-&gt;data.ext.ptr = sysex-&gt;buf;</div><div class='del'>-		sysex-&gt;len = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL; /* skip */</div><div class='add'>+	/* copy the data to event record and send it */</div><div class='add'>+	if (snd_seq_oss_synth_addr(dp, dev, ev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_VARIABLE;</div><div class='add'>+	ev-&gt;data.ext.len = len;</div><div class='add'>+	ev-&gt;data.ext.ptr = buf;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -555,10 +479,12 @@ snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf,</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_synth_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	if (! snd_seq_oss_synth_is_valid(dp, dev))</div><div class='add'>+	struct seq_oss_synthinfo *info = snd_seq_oss_synth_info(dp, dev);</div><div class='add'>+</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	snd_seq_oss_fill_addr(dp, ev, dp-&gt;synths[dev].arg.addr.client,</div><div class='del'>-			      dp-&gt;synths[dev].arg.addr.port);</div><div class='add'>+	snd_seq_oss_fill_addr(dp, ev, info-&gt;arg.addr.client,</div><div class='add'>+			      info-&gt;arg.addr.port);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -569,19 +495,19 @@ snd_seq_oss_synth_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_event</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_synth_ioctl(struct seq_oss_devinfo *dp, int dev, unsigned int cmd, unsigned long addr)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='del'>-	int rc;</div><div class='add'>+	struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;</div><div class='add'>+	struct seq_oss_synthinfo *info;</div><div class='ctx'> </div><div class='del'>-	if (is_midi_dev(dp, dev))</div><div class='add'>+	info = get_synthinfo_nospec(dp, dev);</div><div class='add'>+	if (!info || info-&gt;is_midi)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	if ((rec = get_synthdev(dp, dev)) == NULL)</div><div class='add'>+	rec = get_synthdev(dp, dev);</div><div class='add'>+	if (!rec)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	if (rec-&gt;oper.ioctl == NULL)</div><div class='del'>-		rc = -ENXIO;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	else</div><div class='del'>-		rc = rec-&gt;oper.ioctl(&amp;dp-&gt;synths[dev].arg, cmd, addr);</div><div class='del'>-	snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='del'>-	return rc;</div><div class='add'>+		return rec-&gt;oper.ioctl(&amp;info-&gt;arg, cmd, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +517,10 @@ snd_seq_oss_synth_ioctl(struct seq_oss_devinfo *dp, int dev, unsigned int cmd, u</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_synth_raw_event(struct seq_oss_devinfo *dp, int dev, unsigned char *data, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	if (! snd_seq_oss_synth_is_valid(dp, dev) || is_midi_dev(dp, dev))</div><div class='add'>+	struct seq_oss_synthinfo *info;</div><div class='add'>+</div><div class='add'>+	info = snd_seq_oss_synth_info(dp, dev);</div><div class='add'>+	if (!info || info-&gt;is_midi)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	ev-&gt;type = SNDRV_SEQ_EVENT_OSS;</div><div class='ctx'> 	memcpy(ev-&gt;data.raw8.d, data, 8);</div><div class='hunk'>@@ -605,34 +534,37 @@ snd_seq_oss_synth_raw_event(struct seq_oss_devinfo *dp, int dev, unsigned char *</div><div class='ctx'> int</div><div class='ctx'> snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_info *inf)</div><div class='ctx'> {</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='add'>+	struct seq_oss_synthinfo *info = get_synthinfo_nospec(dp, dev);</div><div class='ctx'> </div><div class='del'>-	if (dev &lt; 0 || dev &gt;= dp-&gt;max_synthdev)</div><div class='add'>+	if (!info)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (dp-&gt;synths[dev].is_midi) {</div><div class='add'>+	if (info-&gt;is_midi) {</div><div class='ctx'> 		struct midi_info minf;</div><div class='del'>-		snd_seq_oss_midi_make_info(dp, dp-&gt;synths[dev].midi_mapped, &amp;minf);</div><div class='add'>+		if (snd_seq_oss_midi_make_info(dp, info-&gt;midi_mapped, &amp;minf))</div><div class='add'>+			return -ENXIO;</div><div class='ctx'> 		inf-&gt;synth_type = SYNTH_TYPE_MIDI;</div><div class='ctx'> 		inf-&gt;synth_subtype = 0;</div><div class='ctx'> 		inf-&gt;nr_voices = 16;</div><div class='ctx'> 		inf-&gt;device = dev;</div><div class='del'>-		strlcpy(inf-&gt;name, minf.name, sizeof(inf-&gt;name));</div><div class='add'>+		strscpy(inf-&gt;name, minf.name, sizeof(inf-&gt;name));</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((rec = get_synthdev(dp, dev)) == NULL)</div><div class='add'>+		struct seq_oss_synth *rec __free(seq_oss_synth) =</div><div class='add'>+			get_synthdev(dp, dev);</div><div class='add'>+</div><div class='add'>+		if (!rec)</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		inf-&gt;synth_type = rec-&gt;synth_type;</div><div class='ctx'> 		inf-&gt;synth_subtype = rec-&gt;synth_subtype;</div><div class='ctx'> 		inf-&gt;nr_voices = rec-&gt;nr_voices;</div><div class='ctx'> 		inf-&gt;device = dev;</div><div class='del'>-		strlcpy(inf-&gt;name, rec-&gt;name, sizeof(inf-&gt;name));</div><div class='del'>-		snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='add'>+		strscpy(inf-&gt;name, rec-&gt;name, sizeof(inf-&gt;name));</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -640,10 +572,11 @@ void</div><div class='ctx'> snd_seq_oss_synth_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct seq_oss_synth *rec;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buf, "\nNumber of synth devices: %d\n", max_synth_devs);</div><div class='ctx'> 	for (i = 0; i &lt; max_synth_devs; i++) {</div><div class='add'>+		struct seq_oss_synth *rec __free(seq_oss_synth) = NULL;</div><div class='add'>+</div><div class='ctx'> 		snd_iprintf(buf, "\nsynth %d: ", i);</div><div class='ctx'> 		rec = get_sdev(i);</div><div class='ctx'> 		if (rec == NULL) {</div><div class='hunk'>@@ -655,9 +588,8 @@ snd_seq_oss_synth_info_read(struct snd_info_buffer *buf)</div><div class='ctx'> 			    rec-&gt;synth_type, rec-&gt;synth_subtype,</div><div class='ctx'> 			    rec-&gt;nr_voices);</div><div class='ctx'> 		snd_iprintf(buf, "  capabilities : ioctl %s / load_patch %s\n",</div><div class='del'>-			    enabled_str((long)rec-&gt;oper.ioctl),</div><div class='del'>-			    enabled_str((long)rec-&gt;oper.load_patch));</div><div class='del'>-		snd_use_lock_free(&amp;rec-&gt;use_lock);</div><div class='add'>+			    str_enabled_disabled((long)rec-&gt;oper.ioctl),</div><div class='add'>+			    str_enabled_disabled((long)rec-&gt;oper.load_patch));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_synth.h b/sound/core/seq/oss/seq_oss_synth.h<br/>index dbdfcbb80eaa..ffc40d8a7ef1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_synth.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_synth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_synth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_synth.h</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * synth device information</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_SYNTH_H</div><div class='hunk'>@@ -28,8 +15,8 @@</div><div class='ctx'> #include &lt;sound/seq_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> void snd_seq_oss_synth_init(void);</div><div class='del'>-int snd_seq_oss_synth_register(struct snd_seq_device *dev);</div><div class='del'>-int snd_seq_oss_synth_unregister(struct snd_seq_device *dev);</div><div class='add'>+int snd_seq_oss_synth_probe(struct device *dev);</div><div class='add'>+int snd_seq_oss_synth_remove(struct device *dev);</div><div class='ctx'> void snd_seq_oss_synth_setup(struct seq_oss_devinfo *dp);</div><div class='ctx'> void snd_seq_oss_synth_setup_midi(struct seq_oss_devinfo *dp);</div><div class='ctx'> void snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp);</div><div class='hunk'>@@ -37,7 +24,8 @@ void snd_seq_oss_synth_cleanup(struct seq_oss_devinfo *dp);</div><div class='ctx'> void snd_seq_oss_synth_reset(struct seq_oss_devinfo *dp, int dev);</div><div class='ctx'> int snd_seq_oss_synth_load_patch(struct seq_oss_devinfo *dp, int dev, int fmt,</div><div class='ctx'> 				 const char __user *buf, int p, int c);</div><div class='del'>-int snd_seq_oss_synth_is_valid(struct seq_oss_devinfo *dp, int dev);</div><div class='add'>+struct seq_oss_synthinfo *snd_seq_oss_synth_info(struct seq_oss_devinfo *dp,</div><div class='add'>+						 int dev);</div><div class='ctx'> int snd_seq_oss_synth_sysex(struct seq_oss_devinfo *dp, int dev, unsigned char *buf,</div><div class='ctx'> 			    struct snd_seq_event *ev);</div><div class='ctx'> int snd_seq_oss_synth_addr(struct seq_oss_devinfo *dp, int dev, struct snd_seq_event *ev);</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_timer.c b/sound/core/seq/oss/seq_oss_timer.c<br/>index ab59cbfbcaf2..f9f57232a83f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_timer.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * Timer control routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_timer.h"</div><div class='hunk'>@@ -92,7 +79,7 @@ snd_seq_oss_process_timer_event(struct seq_oss_timer *rec, union evrec *ev)</div><div class='ctx'> 		case TMR_WAIT_REL:</div><div class='ctx'> 			parm += rec-&gt;cur_tick;</div><div class='ctx'> 			rec-&gt;realtime = 0;</div><div class='del'>-			/* continue to next */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case TMR_WAIT_ABS:</div><div class='ctx'> 			if (parm == 0) {</div><div class='ctx'> 				rec-&gt;realtime = 1;</div><div class='hunk'>@@ -233,7 +220,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use</div><div class='ctx'> 	int value;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SNDCTL_SEQ_CTRLRATE) {</div><div class='del'>-		debug_printk(("ctrl rate\n"));</div><div class='ctx'> 		/* if *arg == 0, just return the current rate */</div><div class='ctx'> 		if (get_user(value, arg))</div><div class='ctx'> 			return -EFAULT;</div><div class='hunk'>@@ -248,21 +234,16 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDCTL_TMR_START:</div><div class='del'>-		debug_printk(("timer start\n"));</div><div class='ctx'> 		return snd_seq_oss_timer_start(timer);</div><div class='ctx'> 	case SNDCTL_TMR_STOP:</div><div class='del'>-		debug_printk(("timer stop\n"));</div><div class='ctx'> 		return snd_seq_oss_timer_stop(timer);</div><div class='ctx'> 	case SNDCTL_TMR_CONTINUE:</div><div class='del'>-		debug_printk(("timer continue\n"));</div><div class='ctx'> 		return snd_seq_oss_timer_continue(timer);</div><div class='ctx'> 	case SNDCTL_TMR_TEMPO:</div><div class='del'>-		debug_printk(("timer tempo\n"));</div><div class='ctx'> 		if (get_user(value, arg))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		return snd_seq_oss_timer_tempo(timer, value);</div><div class='ctx'> 	case SNDCTL_TMR_TIMEBASE:</div><div class='del'>-		debug_printk(("timer timebase\n"));</div><div class='ctx'> 		if (get_user(value, arg))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (value &lt; MIN_OSS_TIMEBASE)</div><div class='hunk'>@@ -276,7 +257,6 @@ snd_seq_oss_timer_ioctl(struct seq_oss_timer *timer, unsigned int cmd, int __use</div><div class='ctx'> 	case SNDCTL_TMR_METRONOME:</div><div class='ctx'> 	case SNDCTL_TMR_SELECT:</div><div class='ctx'> 	case SNDCTL_TMR_SOURCE:</div><div class='del'>-		debug_printk(("timer XXX\n"));</div><div class='ctx'> 		/* not supported */</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_timer.h b/sound/core/seq/oss/seq_oss_timer.h<br/>index b995bd68ad1f..dee190b4ec6b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_timer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_timer.h</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  * timer handling routines</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_TIMER_H</div><div class='hunk'>@@ -57,14 +44,4 @@ snd_seq_oss_timer_cur_tick(struct seq_oss_timer *timer)</div><div class='ctx'> 	return timer-&gt;cur_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * is realtime event?</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-snd_seq_oss_timer_is_realtime(struct seq_oss_timer *timer)</div><div class='del'>-{</div><div class='del'>-	return timer-&gt;realtime;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_writeq.c b/sound/core/seq/oss/seq_oss_writeq.c<br/>index d50338bbc21f..a93ff8315b8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_writeq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_writeq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_writeq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_writeq.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  *</div><div class='ctx'>  * seq_oss_writeq.c - write queue and sync</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "seq_oss_writeq.h"</div><div class='hunk'>@@ -28,6 +15,7 @@</div><div class='ctx'> #include "../seq_clientmgr.h"</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -39,7 +27,8 @@ snd_seq_oss_writeq_new(struct seq_oss_devinfo *dp, int maxlen)</div><div class='ctx'> 	struct seq_oss_writeq *q;</div><div class='ctx'> 	struct snd_seq_client_pool pool;</div><div class='ctx'> </div><div class='del'>-	if ((q = kzalloc(sizeof(*q), GFP_KERNEL)) == NULL)</div><div class='add'>+	q = kzalloc(sizeof(*q), GFP_KERNEL);</div><div class='add'>+	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	q-&gt;dp = dp;</div><div class='ctx'> 	q-&gt;maxlen = maxlen;</div><div class='hunk'>@@ -115,7 +104,7 @@ snd_seq_oss_writeq_sync(struct seq_oss_writeq *q)</div><div class='ctx'> 		rec-&gt;t.code = SEQ_SYNCTIMER;</div><div class='ctx'> 		rec-&gt;t.time = time;</div><div class='ctx'> 		q-&gt;sync_event_put = 1;</div><div class='del'>-		snd_seq_kernel_client_enqueue_blocking(dp-&gt;cseq, &amp;ev, NULL, 0, 0);</div><div class='add'>+		snd_seq_kernel_client_enqueue(dp-&gt;cseq, &amp;ev, NULL, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wait_event_interruptible_timeout(q-&gt;sync_sleep, ! q-&gt;sync_event_put, HZ);</div><div class='hunk'>@@ -133,15 +122,10 @@ snd_seq_oss_writeq_sync(struct seq_oss_writeq *q)</div><div class='ctx'> void</div><div class='ctx'> snd_seq_oss_writeq_wakeup(struct seq_oss_writeq *q, abstime_t time)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;sync_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;q-&gt;sync_lock);</div><div class='ctx'> 	q-&gt;sync_time = time;</div><div class='ctx'> 	q-&gt;sync_event_put = 0;</div><div class='del'>-	if (waitqueue_active(&amp;q-&gt;sync_sleep)) {</div><div class='del'>-		wake_up(&amp;q-&gt;sync_sleep);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;sync_lock, flags);</div><div class='add'>+	wake_up(&amp;q-&gt;sync_sleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/seq/oss/seq_oss_writeq.h b/sound/core/seq/oss/seq_oss_writeq.h<br/>index c469d2967566..490d27a7b29d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_writeq.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/oss/seq_oss_writeq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/oss/seq_oss_writeq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/oss/seq_oss_writeq.h</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * OSS compatible sequencer driver</div><div class='ctx'>  * write priority queue</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SEQ_OSS_WRITEQ_H</div><div class='head'>diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c<br/>index bf09a5ad1865..00f7342ee839 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq.c</a></div><div class='hunk'>@@ -1,26 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer main module</div><div class='ctx'>  *  Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +18,7 @@</div><div class='ctx'> #include "seq_timer.h"</div><div class='ctx'> #include "seq_system.h"</div><div class='ctx'> #include "seq_info.h"</div><div class='add'>+#include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/seq_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_SND_SEQ_DUMMY_MODULE)</div><div class='hunk'>@@ -45,8 +32,6 @@ int seq_default_timer_card = -1;</div><div class='ctx'> int seq_default_timer_device =</div><div class='ctx'> #ifdef CONFIG_SND_SEQ_HRTIMER_DEFAULT</div><div class='ctx'> 	SNDRV_TIMER_GLOBAL_HRTIMER</div><div class='del'>-#elif defined(CONFIG_SND_SEQ_RTCTIMER_DEFAULT)</div><div class='del'>-	SNDRV_TIMER_GLOBAL_RTC</div><div class='ctx'> #else</div><div class='ctx'> 	SNDRV_TIMER_GLOBAL_SYSTEM</div><div class='ctx'> #endif</div><div class='hunk'>@@ -73,6 +58,9 @@ MODULE_PARM_DESC(seq_default_timer_subdevice, "The default timer subdevice numbe</div><div class='ctx'> module_param(seq_default_timer_resolution, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(seq_default_timer_resolution, "The default timer resolution in Hz.");</div><div class='ctx'> </div><div class='add'>+MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_SEQUENCER);</div><div class='add'>+MODULE_ALIAS("devname:snd/seq");</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  INIT PART</div><div class='ctx'>  */</div><div class='hunk'>@@ -81,32 +69,33 @@ static int __init alsa_seq_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_seq_autoload_lock();</div><div class='del'>-	if ((err = client_init_data()) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* init memory, room for selected events */</div><div class='del'>-	if ((err = snd_sequencer_memory_init()) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* init event queues */</div><div class='del'>-	if ((err = snd_seq_queues_init()) &lt; 0)</div><div class='add'>+	err = client_init_data();</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* register sequencer device */</div><div class='del'>-	if ((err = snd_sequencer_device_init()) &lt; 0)</div><div class='add'>+	err = snd_sequencer_device_init();</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* register proc interface */</div><div class='del'>-	if ((err = snd_seq_info_init()) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_seq_info_init();</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_device;</div><div class='ctx'> </div><div class='ctx'> 	/* register our internal client */</div><div class='del'>-	if ((err = snd_seq_system_client_init()) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_seq_system_client_init();</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_info;</div><div class='add'>+</div><div class='add'>+	snd_seq_autoload_init();</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+ error_info:</div><div class='add'>+	snd_seq_info_done();</div><div class='add'>+ error_device:</div><div class='add'>+	snd_sequencer_device_done();</div><div class='ctx'>  error:</div><div class='del'>-	snd_seq_autoload_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,8 +113,7 @@ static void __exit alsa_seq_exit(void)</div><div class='ctx'> 	/* unregister sequencer device */</div><div class='ctx'> 	snd_sequencer_device_done();</div><div class='ctx'> </div><div class='del'>-	/* release event memory */</div><div class='del'>-	snd_sequencer_memory_done();</div><div class='add'>+	snd_seq_autoload_exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(alsa_seq_init)</div><div class='head'>diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c<br/>index 99a485f13648..f9a6e497f997 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_clientmgr.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_clientmgr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_clientmgr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_clientmgr.c</a></div><div class='hunk'>@@ -1,39 +1,27 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer Client Manager</div><div class='ctx'>  *  Copyright (c) 1998-2001 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *                             Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                             Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='ctx'> #include "seq_clientmgr.h"</div><div class='ctx'> #include "seq_memory.h"</div><div class='ctx'> #include "seq_queue.h"</div><div class='ctx'> #include "seq_timer.h"</div><div class='ctx'> #include "seq_info.h"</div><div class='ctx'> #include "seq_system.h"</div><div class='add'>+#include "seq_ump_convert.h"</div><div class='ctx'> #include &lt;sound/seq_device.h&gt;</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='hunk'>@@ -82,22 +70,11 @@ static int bounce_error_event(struct snd_seq_client *client,</div><div class='ctx'> 			      int err, int atomic, int hop);</div><div class='ctx'> static int snd_seq_deliver_single_event(struct snd_seq_client *client,</div><div class='ctx'> 					struct snd_seq_event *event,</div><div class='del'>-					int filter, int atomic, int hop);</div><div class='add'>+					int atomic, int hop);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static inline mm_segment_t snd_enter_user(void)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	return fs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void snd_leave_user(mm_segment_t fs)</div><div class='del'>-{</div><div class='del'>-	set_fs(fs);</div><div class='del'>-}</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+static void free_ump_info(struct snd_seq_client *client);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='hunk'>@@ -122,41 +99,38 @@ static inline int snd_seq_write_pool_allocated(struct snd_seq_client *client)</div><div class='ctx'> static struct snd_seq_client *clientptr(int clientid)</div><div class='ctx'> {</div><div class='ctx'> 	if (clientid &lt; 0 || clientid &gt;= SNDRV_SEQ_MAX_CLIENTS) {</div><div class='del'>-		snd_printd("Seq: oops. Trying to get pointer to client %d\n",</div><div class='add'>+		pr_debug("ALSA: seq: oops. Trying to get pointer to client %d\n",</div><div class='ctx'> 			   clientid);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return clienttab[clientid];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_seq_client *snd_seq_client_use_ptr(int clientid)</div><div class='add'>+static struct snd_seq_client *client_use_ptr(int clientid, bool load_module)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_client *client;</div><div class='ctx'> </div><div class='ctx'> 	if (clientid &lt; 0 || clientid &gt;= SNDRV_SEQ_MAX_CLIENTS) {</div><div class='del'>-		snd_printd("Seq: oops. Trying to get pointer to client %d\n",</div><div class='add'>+		pr_debug("ALSA: seq: oops. Trying to get pointer to client %d\n",</div><div class='ctx'> 			   clientid);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;clients_lock, flags);</div><div class='del'>-	client = clientptr(clientid);</div><div class='del'>-	if (client)</div><div class='del'>-		goto __lock;</div><div class='del'>-	if (clienttablock[clientid]) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='del'>-		return NULL;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;clients_lock) {</div><div class='add'>+		client = clientptr(clientid);</div><div class='add'>+		if (client)</div><div class='add'>+			return snd_seq_client_ref(client);</div><div class='add'>+		if (clienttablock[clientid])</div><div class='add'>+			return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='del'>-	if (!in_interrupt()) {</div><div class='del'>-		static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];</div><div class='del'>-		static char card_requested[SNDRV_CARDS];</div><div class='add'>+	if (load_module) {</div><div class='add'>+		static DECLARE_BITMAP(client_requested, SNDRV_SEQ_GLOBAL_CLIENTS);</div><div class='add'>+		static DECLARE_BITMAP(card_requested, SNDRV_CARDS);</div><div class='add'>+</div><div class='ctx'> 		if (clientid &lt; SNDRV_SEQ_GLOBAL_CLIENTS) {</div><div class='ctx'> 			int idx;</div><div class='ctx'> 			</div><div class='del'>-			if (!client_requested[clientid]) {</div><div class='del'>-				client_requested[clientid] = 1;</div><div class='add'>+			if (!test_and_set_bit(clientid, client_requested)) {</div><div class='ctx'> 				for (idx = 0; idx &lt; 15; idx++) {</div><div class='ctx'> 					if (seq_client_load[idx] &lt; 0)</div><div class='ctx'> 						break;</div><div class='hunk'>@@ -171,26 +145,33 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)</div><div class='ctx'> 			int card = (clientid - SNDRV_SEQ_GLOBAL_CLIENTS) /</div><div class='ctx'> 				SNDRV_SEQ_CLIENTS_PER_CARD;</div><div class='ctx'> 			if (card &lt; snd_ecards_limit) {</div><div class='del'>-				if (! card_requested[card]) {</div><div class='del'>-					card_requested[card] = 1;</div><div class='add'>+				if (!test_and_set_bit(card, card_requested))</div><div class='ctx'> 					snd_request_card(card);</div><div class='del'>-				}</div><div class='ctx'> 				snd_seq_device_load_drivers();</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_irqsave(&amp;clients_lock, flags);</div><div class='del'>-		client = clientptr(clientid);</div><div class='del'>-		if (client)</div><div class='del'>-			goto __lock;</div><div class='del'>-		spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;clients_lock) {</div><div class='add'>+			client = clientptr(clientid);</div><div class='add'>+			if (client)</div><div class='add'>+				return snd_seq_client_ref(client);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-      __lock:</div><div class='del'>-	snd_use_lock_use(&amp;client-&gt;use_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='del'>-	return client;</div><div class='add'>+/* get snd_seq_client object for the given id quickly */</div><div class='add'>+struct snd_seq_client *snd_seq_client_use_ptr(int clientid)</div><div class='add'>+{</div><div class='add'>+	return client_use_ptr(clientid, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get snd_seq_client object for the given id;</div><div class='add'>+ * if not found, retry after loading the modules</div><div class='add'>+ */</div><div class='add'>+static struct snd_seq_client *client_load_and_use_ptr(int clientid)</div><div class='add'>+{</div><div class='add'>+	return client_use_ptr(clientid, IS_ENABLED(CONFIG_MODULES));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void usage_alloc(struct snd_seq_usage *res, int num)</div><div class='hunk'>@@ -217,7 +198,6 @@ int __init client_init_data(void)</div><div class='ctx'> </div><div class='ctx'> static struct snd_seq_client *seq_create_client1(int client_index, int poolsize)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int c;</div><div class='ctx'> 	struct snd_seq_client *client;</div><div class='ctx'> </div><div class='hunk'>@@ -235,27 +215,28 @@ static struct snd_seq_client *seq_create_client1(int client_index, int poolsize)</div><div class='ctx'> 	rwlock_init(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	mutex_init(&amp;client-&gt;ports_mutex);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;client-&gt;ports_list_head);</div><div class='add'>+	mutex_init(&amp;client-&gt;ioctl_mutex);</div><div class='add'>+	client-&gt;ump_endpoint_port = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* find free slot in the client table */</div><div class='del'>-	spin_lock_irqsave(&amp;clients_lock, flags);</div><div class='del'>-	if (client_index &lt; 0) {</div><div class='del'>-		for (c = SNDRV_SEQ_DYNAMIC_CLIENTS_BEGIN;</div><div class='del'>-		     c &lt; SNDRV_SEQ_MAX_CLIENTS;</div><div class='del'>-		     c++) {</div><div class='del'>-			if (clienttab[c] || clienttablock[c])</div><div class='del'>-				continue;</div><div class='del'>-			clienttab[client-&gt;number = c] = client;</div><div class='del'>-			spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='del'>-			return client;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (clienttab[client_index] == NULL &amp;&amp; !clienttablock[client_index]) {</div><div class='del'>-			clienttab[client-&gt;number = client_index] = client;</div><div class='del'>-			spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='del'>-			return client;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;clients_lock) {</div><div class='add'>+		if (client_index &lt; 0) {</div><div class='add'>+			for (c = SNDRV_SEQ_DYNAMIC_CLIENTS_BEGIN;</div><div class='add'>+			     c &lt; SNDRV_SEQ_MAX_CLIENTS;</div><div class='add'>+			     c++) {</div><div class='add'>+				if (clienttab[c] || clienttablock[c])</div><div class='add'>+					continue;</div><div class='add'>+				clienttab[client-&gt;number = c] = client;</div><div class='add'>+				return client;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (clienttab[client_index] == NULL &amp;&amp; !clienttablock[client_index]) {</div><div class='add'>+				clienttab[client-&gt;number = client_index] = client;</div><div class='add'>+				return client;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	snd_seq_pool_delete(&amp;client-&gt;pool);</div><div class='ctx'> 	kfree(client);</div><div class='ctx'> 	return NULL;	/* no free slot found or busy, return failure code */</div><div class='hunk'>@@ -264,46 +245,43 @@ static struct snd_seq_client *seq_create_client1(int client_index, int poolsize)</div><div class='ctx'> </div><div class='ctx'> static int seq_free_client1(struct snd_seq_client *client)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (!client)</div><div class='ctx'> 		return 0;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;clients_lock) {</div><div class='add'>+		clienttablock[client-&gt;number] = 1;</div><div class='add'>+		clienttab[client-&gt;number] = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	snd_seq_delete_all_ports(client);</div><div class='ctx'> 	snd_seq_queue_client_leave(client-&gt;number);</div><div class='del'>-	spin_lock_irqsave(&amp;clients_lock, flags);</div><div class='del'>-	clienttablock[client-&gt;number] = 1;</div><div class='del'>-	clienttab[client-&gt;number] = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='ctx'> 	snd_use_lock_sync(&amp;client-&gt;use_lock);</div><div class='del'>-	snd_seq_queue_client_termination(client-&gt;number);</div><div class='ctx'> 	if (client-&gt;pool)</div><div class='ctx'> 		snd_seq_pool_delete(&amp;client-&gt;pool);</div><div class='del'>-	spin_lock_irqsave(&amp;clients_lock, flags);</div><div class='del'>-	clienttablock[client-&gt;number] = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;clients_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;clients_lock) {</div><div class='add'>+		clienttablock[client-&gt;number] = 0;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void seq_free_client(struct snd_seq_client * client)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	switch (client-&gt;type) {</div><div class='del'>-	case NO_CLIENT:</div><div class='del'>-		snd_printk(KERN_WARNING "Seq: Trying to free unused client %d\n",</div><div class='del'>-			   client-&gt;number);</div><div class='del'>-		break;</div><div class='del'>-	case USER_CLIENT:</div><div class='del'>-	case KERNEL_CLIENT:</div><div class='del'>-		seq_free_client1(client);</div><div class='del'>-		usage_free(&amp;client_usage, 1);</div><div class='del'>-		break;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		switch (client-&gt;type) {</div><div class='add'>+		case NO_CLIENT:</div><div class='add'>+			pr_warn("ALSA: seq: Trying to free unused client %d\n",</div><div class='add'>+				client-&gt;number);</div><div class='add'>+			break;</div><div class='add'>+		case USER_CLIENT:</div><div class='add'>+		case KERNEL_CLIENT:</div><div class='add'>+			seq_free_client1(client);</div><div class='add'>+			usage_free(&amp;client_usage, 1);</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		snd_printk(KERN_ERR "Seq: Trying to free client %d with undefined type = %d\n",</div><div class='del'>-			   client-&gt;number, client-&gt;type);</div><div class='add'>+		default:</div><div class='add'>+			pr_err("ALSA: seq: Trying to free client %d with undefined type = %d\n",</div><div class='add'>+			       client-&gt;number, client-&gt;type);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> </div><div class='ctx'> 	snd_seq_system_client_ev_client_exit(client-&gt;number);</div><div class='ctx'> }</div><div class='hunk'>@@ -320,42 +298,38 @@ static int snd_seq_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	struct snd_seq_user_client *user;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nonseekable_open(inode, file);</div><div class='add'>+	err = stream_open(inode, file);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;register_mutex))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	client = seq_create_client1(-1, SNDRV_SEQ_DEFAULT_EVENTS);</div><div class='del'>-	if (client == NULL) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -ENOMEM;	/* failure code */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mode = snd_seq_file_flags(file);</div><div class='del'>-	if (mode &amp; SNDRV_SEQ_LFLG_INPUT)</div><div class='del'>-		client-&gt;accept_input = 1;</div><div class='del'>-	if (mode &amp; SNDRV_SEQ_LFLG_OUTPUT)</div><div class='del'>-		client-&gt;accept_output = 1;</div><div class='del'>-</div><div class='del'>-	user = &amp;client-&gt;data.user;</div><div class='del'>-	user-&gt;fifo = NULL;</div><div class='del'>-	user-&gt;fifo_pool_size = 0;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; SNDRV_SEQ_LFLG_INPUT) {</div><div class='del'>-		user-&gt;fifo_pool_size = SNDRV_SEQ_DEFAULT_CLIENT_EVENTS;</div><div class='del'>-		user-&gt;fifo = snd_seq_fifo_new(user-&gt;fifo_pool_size);</div><div class='del'>-		if (user-&gt;fifo == NULL) {</div><div class='del'>-			seq_free_client1(client);</div><div class='del'>-			kfree(client);</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		client = seq_create_client1(-1, SNDRV_SEQ_DEFAULT_EVENTS);</div><div class='add'>+		if (!client)</div><div class='add'>+			return -ENOMEM;	/* failure code */</div><div class='add'>+</div><div class='add'>+		mode = snd_seq_file_flags(file);</div><div class='add'>+		if (mode &amp; SNDRV_SEQ_LFLG_INPUT)</div><div class='add'>+			client-&gt;accept_input = 1;</div><div class='add'>+		if (mode &amp; SNDRV_SEQ_LFLG_OUTPUT)</div><div class='add'>+			client-&gt;accept_output = 1;</div><div class='add'>+</div><div class='add'>+		user = &amp;client-&gt;data.user;</div><div class='add'>+		user-&gt;fifo = NULL;</div><div class='add'>+		user-&gt;fifo_pool_size = 0;</div><div class='add'>+</div><div class='add'>+		if (mode &amp; SNDRV_SEQ_LFLG_INPUT) {</div><div class='add'>+			user-&gt;fifo_pool_size = SNDRV_SEQ_DEFAULT_CLIENT_EVENTS;</div><div class='add'>+			user-&gt;fifo = snd_seq_fifo_new(user-&gt;fifo_pool_size);</div><div class='add'>+			if (user-&gt;fifo == NULL) {</div><div class='add'>+				seq_free_client1(client);</div><div class='add'>+				kfree(client);</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	usage_alloc(&amp;client_usage, 1);</div><div class='del'>-	client-&gt;type = USER_CLIENT;</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+		usage_alloc(&amp;client_usage, 1);</div><div class='add'>+		client-&gt;type = USER_CLIENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	c = client-&gt;number;</div><div class='ctx'> 	file-&gt;private_data = client;</div><div class='hunk'>@@ -363,6 +337,7 @@ static int snd_seq_open(struct inode *inode, struct file *file)</div><div class='ctx'> 	/* fill client data */</div><div class='ctx'> 	user-&gt;file = file;</div><div class='ctx'> 	sprintf(client-&gt;name, "Client-%d", c);</div><div class='add'>+	client-&gt;data.user.owner = get_pid(task_pid(current));</div><div class='ctx'> </div><div class='ctx'> 	/* make others aware this new client */</div><div class='ctx'> 	snd_seq_system_client_ev_client_start(c);</div><div class='hunk'>@@ -379,12 +354,25 @@ static int snd_seq_release(struct inode *inode, struct file *file)</div><div class='ctx'> 		seq_free_client(client);</div><div class='ctx'> 		if (client-&gt;data.user.fifo)</div><div class='ctx'> 			snd_seq_fifo_delete(&amp;client-&gt;data.user.fifo);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+		free_ump_info(client);</div><div class='add'>+#endif</div><div class='add'>+		put_pid(client-&gt;data.user.owner);</div><div class='ctx'> 		kfree(client);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool event_is_compatible(const struct snd_seq_client *client,</div><div class='add'>+				const struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	if (snd_seq_ev_is_ump(ev) &amp;&amp; !client-&gt;midi_version)</div><div class='add'>+		return false;</div><div class='add'>+	if (snd_seq_ev_is_ump(ev) &amp;&amp; snd_seq_ev_is_variable(ev))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* handle client read() */</div><div class='ctx'> /* possible error values:</div><div class='hunk'>@@ -398,6 +386,7 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_client *client = file-&gt;private_data;</div><div class='ctx'> 	struct snd_seq_fifo *fifo;</div><div class='add'>+	size_t aligned_size;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	long result = 0;</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='hunk'>@@ -405,14 +394,17 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 	if (!(snd_seq_file_flags(file) &amp; SNDRV_SEQ_LFLG_INPUT))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buf, count))</div><div class='add'>+	if (!access_ok(buf, count))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	/* check client structures are in place */</div><div class='ctx'> 	if (snd_BUG_ON(!client))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (!client-&gt;accept_input || (fifo = client-&gt;data.user.fifo) == NULL)</div><div class='add'>+	if (!client-&gt;accept_input)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	fifo = client-&gt;data.user.fifo;</div><div class='add'>+	if (!fifo)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;fifo-&gt;overflow) &gt; 0) {</div><div class='hunk'>@@ -424,45 +416,56 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> </div><div class='ctx'> 	cell = NULL;</div><div class='ctx'> 	err = 0;</div><div class='del'>-	snd_seq_fifo_lock(fifo);</div><div class='add'>+	guard(snd_seq_fifo)(fifo);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_SND_SEQ_UMP) &amp;&amp; client-&gt;midi_version &gt; 0)</div><div class='add'>+		aligned_size = sizeof(struct snd_seq_ump_event);</div><div class='add'>+	else</div><div class='add'>+		aligned_size = sizeof(struct snd_seq_event);</div><div class='ctx'> </div><div class='ctx'> 	/* while data available in queue */</div><div class='del'>-	while (count &gt;= sizeof(struct snd_seq_event)) {</div><div class='add'>+	while (count &gt;= aligned_size) {</div><div class='ctx'> 		int nonblock;</div><div class='ctx'> </div><div class='ctx'> 		nonblock = (file-&gt;f_flags &amp; O_NONBLOCK) || result &gt; 0;</div><div class='del'>-		if ((err = snd_seq_fifo_cell_out(fifo, &amp;cell, nonblock)) &lt; 0) {</div><div class='add'>+		err = snd_seq_fifo_cell_out(fifo, &amp;cell, nonblock);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='add'>+		if (!event_is_compatible(client, &amp;cell-&gt;event)) {</div><div class='add'>+			snd_seq_cell_free(cell);</div><div class='add'>+			cell = NULL;</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (snd_seq_ev_is_variable(&amp;cell-&gt;event)) {</div><div class='del'>-			struct snd_seq_event tmpev;</div><div class='del'>-			tmpev = cell-&gt;event;</div><div class='add'>+			struct snd_seq_ump_event tmpev;</div><div class='add'>+</div><div class='add'>+			memcpy(&amp;tmpev, &amp;cell-&gt;event, aligned_size);</div><div class='ctx'> 			tmpev.data.ext.len &amp;= ~SNDRV_SEQ_EXT_MASK;</div><div class='del'>-			if (copy_to_user(buf, &amp;tmpev, sizeof(struct snd_seq_event))) {</div><div class='add'>+			if (copy_to_user(buf, &amp;tmpev, aligned_size)) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			count -= sizeof(struct snd_seq_event);</div><div class='del'>-			buf += sizeof(struct snd_seq_event);</div><div class='add'>+			count -= aligned_size;</div><div class='add'>+			buf += aligned_size;</div><div class='ctx'> 			err = snd_seq_expand_var_event(&amp;cell-&gt;event, count,</div><div class='ctx'> 						       (char __force *)buf, 0,</div><div class='del'>-						       sizeof(struct snd_seq_event));</div><div class='add'>+						       aligned_size);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> 			result += err;</div><div class='ctx'> 			count -= err;</div><div class='ctx'> 			buf += err;</div><div class='ctx'> 		} else {</div><div class='del'>-			if (copy_to_user(buf, &amp;cell-&gt;event, sizeof(struct snd_seq_event))) {</div><div class='add'>+			if (copy_to_user(buf, &amp;cell-&gt;event, aligned_size)) {</div><div class='ctx'> 				err = -EFAULT;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			count -= sizeof(struct snd_seq_event);</div><div class='del'>-			buf += sizeof(struct snd_seq_event);</div><div class='add'>+			count -= aligned_size;</div><div class='add'>+			buf += aligned_size;</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_seq_cell_free(cell);</div><div class='ctx'> 		cell = NULL; /* to be sure */</div><div class='del'>-		result += sizeof(struct snd_seq_event);</div><div class='add'>+		result += aligned_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -471,7 +474,6 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> 		if (err == -EAGAIN &amp;&amp; result &gt; 0)</div><div class='ctx'> 			err = 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_seq_fifo_unlock(fifo);</div><div class='ctx'> </div><div class='ctx'> 	return (err &lt; 0) ? err : result;</div><div class='ctx'> }</div><div class='hunk'>@@ -489,28 +491,24 @@ static int check_port_perm(struct snd_seq_client_port *port, unsigned int flags)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * check if the destination client is available, and return the pointer</div><div class='del'>- * if filter is non-zero, client filter bitmap is tested.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_seq_client *get_event_dest_client(struct snd_seq_event *event,</div><div class='del'>-						    int filter)</div><div class='add'>+static struct snd_seq_client *get_event_dest_client(struct snd_seq_event *event)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *dest;</div><div class='add'>+	struct snd_seq_client *dest __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	dest = snd_seq_client_use_ptr(event-&gt;dest.client);</div><div class='ctx'> 	if (dest == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (! dest-&gt;accept_input)</div><div class='del'>-		goto __not_avail;</div><div class='add'>+		return NULL;</div><div class='add'>+	if (snd_seq_ev_is_ump(event))</div><div class='add'>+		return no_free_ptr(dest); /* ok - no filter checks */</div><div class='add'>+</div><div class='ctx'> 	if ((dest-&gt;filter &amp; SNDRV_SEQ_FILTER_USE_EVENT) &amp;&amp;</div><div class='ctx'> 	    ! test_bit(event-&gt;type, dest-&gt;event_filter))</div><div class='del'>-		goto __not_avail;</div><div class='del'>-	if (filter &amp;&amp; !(dest-&gt;filter &amp; filter))</div><div class='del'>-		goto __not_avail;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return dest; /* ok - accessible */</div><div class='del'>-__not_avail:</div><div class='del'>-	snd_seq_client_unlock(dest);</div><div class='del'>-	return NULL;</div><div class='add'>+	return no_free_ptr(dest); /* ok - accessible */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -549,7 +547,7 @@ static int bounce_error_event(struct snd_seq_client *client,</div><div class='ctx'> 	bounce_ev.data.quote.origin = event-&gt;dest;</div><div class='ctx'> 	bounce_ev.data.quote.event = event;</div><div class='ctx'> 	bounce_ev.data.quote.value = -err; /* use positive value */</div><div class='del'>-	result = snd_seq_deliver_single_event(NULL, &amp;bounce_ev, 0, atomic, hop + 1);</div><div class='add'>+	result = snd_seq_deliver_single_event(NULL, &amp;bounce_ev, atomic, hop + 1);</div><div class='ctx'> 	if (result &lt; 0) {</div><div class='ctx'> 		client-&gt;event_lost++;</div><div class='ctx'> 		return result;</div><div class='hunk'>@@ -567,7 +565,7 @@ static int bounce_error_event(struct snd_seq_client *client,</div><div class='ctx'> static int update_timestamp_of_queue(struct snd_seq_event *event,</div><div class='ctx'> 				     int queue, int real_time)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	q = queueptr(queue);</div><div class='ctx'> 	if (! q)</div><div class='hunk'>@@ -575,78 +573,94 @@ static int update_timestamp_of_queue(struct snd_seq_event *event,</div><div class='ctx'> 	event-&gt;queue = queue;</div><div class='ctx'> 	event-&gt;flags &amp;= ~SNDRV_SEQ_TIME_STAMP_MASK;</div><div class='ctx'> 	if (real_time) {</div><div class='del'>-		event-&gt;time.time = snd_seq_timer_get_cur_time(q-&gt;timer);</div><div class='add'>+		event-&gt;time.time = snd_seq_timer_get_cur_time(q-&gt;timer, true);</div><div class='ctx'> 		event-&gt;flags |= SNDRV_SEQ_TIME_STAMP_REAL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		event-&gt;time.tick = snd_seq_timer_get_cur_tick(q-&gt;timer);</div><div class='ctx'> 		event-&gt;flags |= SNDRV_SEQ_TIME_STAMP_TICK;</div><div class='ctx'> 	}</div><div class='del'>-	queuefree(q);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * deliver an event to the specified destination.</div><div class='del'>- * if filter is non-zero, client filter bitmap is tested.</div><div class='del'>- *</div><div class='del'>- *  RETURN VALUE: 0 : if succeeded</div><div class='del'>- *		 &lt;0 : error</div><div class='del'>- */</div><div class='del'>-static int snd_seq_deliver_single_event(struct snd_seq_client *client,</div><div class='del'>-					struct snd_seq_event *event,</div><div class='del'>-					int filter, int atomic, int hop)</div><div class='add'>+/* deliver a single event; called from below and UMP converter */</div><div class='add'>+int __snd_seq_deliver_single_event(struct snd_seq_client *dest,</div><div class='add'>+				   struct snd_seq_client_port *dest_port,</div><div class='add'>+				   struct snd_seq_event *event,</div><div class='add'>+				   int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *dest = NULL;</div><div class='del'>-	struct snd_seq_client_port *dest_port = NULL;</div><div class='del'>-	int result = -ENOENT;</div><div class='del'>-	int direct;</div><div class='add'>+	switch (dest-&gt;type) {</div><div class='add'>+	case USER_CLIENT:</div><div class='add'>+		if (!dest-&gt;data.user.fifo)</div><div class='add'>+			return 0;</div><div class='add'>+		return snd_seq_fifo_event_in(dest-&gt;data.user.fifo, event);</div><div class='add'>+	case KERNEL_CLIENT:</div><div class='add'>+		if (!dest_port-&gt;event_input)</div><div class='add'>+			return 0;</div><div class='add'>+		return dest_port-&gt;event_input(event,</div><div class='add'>+					      snd_seq_ev_is_direct(event),</div><div class='add'>+					      dest_port-&gt;private_data,</div><div class='add'>+					      atomic, hop);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	direct = snd_seq_ev_is_direct(event);</div><div class='add'>+/* deliver a single event; called from snd_seq_deliver_single_event() */</div><div class='add'>+static int _snd_seq_deliver_single_event(struct snd_seq_client *client,</div><div class='add'>+					 struct snd_seq_event *event,</div><div class='add'>+					 int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_client *dest __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *dest_port __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-	dest = get_event_dest_client(event, filter);</div><div class='add'>+	dest = get_event_dest_client(event);</div><div class='ctx'> 	if (dest == NULL)</div><div class='del'>-		goto __skip;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	dest_port = snd_seq_port_use_ptr(dest, event-&gt;dest.port);</div><div class='ctx'> 	if (dest_port == NULL)</div><div class='del'>-		goto __skip;</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 	/* check permission */</div><div class='del'>-	if (! check_port_perm(dest_port, SNDRV_SEQ_PORT_CAP_WRITE)) {</div><div class='del'>-		result = -EPERM;</div><div class='del'>-		goto __skip;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='add'>+	if (!check_port_perm(dest_port, SNDRV_SEQ_PORT_CAP_WRITE))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	if (dest_port-&gt;timestamping)</div><div class='ctx'> 		update_timestamp_of_queue(event, dest_port-&gt;time_queue,</div><div class='ctx'> 					  dest_port-&gt;time_real);</div><div class='ctx'> </div><div class='del'>-	switch (dest-&gt;type) {</div><div class='del'>-	case USER_CLIENT:</div><div class='del'>-		if (dest-&gt;data.user.fifo)</div><div class='del'>-			result = snd_seq_fifo_event_in(dest-&gt;data.user.fifo, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case KERNEL_CLIENT:</div><div class='del'>-		if (dest_port-&gt;event_input == NULL)</div><div class='del'>-			break;</div><div class='del'>-		result = dest_port-&gt;event_input(event, direct,</div><div class='del'>-						dest_port-&gt;private_data,</div><div class='del'>-						atomic, hop);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	if (snd_seq_ev_is_ump(event)) {</div><div class='add'>+		if (!(dest-&gt;filter &amp; SNDRV_SEQ_FILTER_NO_CONVERT))</div><div class='add'>+			return snd_seq_deliver_from_ump(client, dest, dest_port,</div><div class='add'>+							event, atomic, hop);</div><div class='add'>+		else if (dest-&gt;type == USER_CLIENT &amp;&amp;</div><div class='add'>+			 !snd_seq_client_is_ump(dest))</div><div class='add'>+			return 0; // drop the event</div><div class='add'>+	} else if (snd_seq_client_is_ump(dest)) {</div><div class='add'>+		if (!(dest-&gt;filter &amp; SNDRV_SEQ_FILTER_NO_CONVERT))</div><div class='add'>+			return snd_seq_deliver_to_ump(client, dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='ctx'> 	}</div><div class='add'>+#endif /* CONFIG_SND_SEQ_UMP */</div><div class='ctx'> </div><div class='del'>-  __skip:</div><div class='del'>-	if (dest_port)</div><div class='del'>-		snd_seq_port_unlock(dest_port);</div><div class='del'>-	if (dest)</div><div class='del'>-		snd_seq_client_unlock(dest);</div><div class='add'>+	return __snd_seq_deliver_single_event(dest, dest_port, event,</div><div class='add'>+					      atomic, hop);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (result &lt; 0 &amp;&amp; !direct) {</div><div class='del'>-		result = bounce_error_event(client, event, result, atomic, hop);</div><div class='del'>-	}</div><div class='add'>+/*</div><div class='add'>+ * deliver an event to the specified destination.</div><div class='add'>+ * if filter is non-zero, client filter bitmap is tested.</div><div class='add'>+ *</div><div class='add'>+ *  RETURN VALUE: 0 : if succeeded</div><div class='add'>+ *		 &lt;0 : error</div><div class='add'>+ */</div><div class='add'>+static int snd_seq_deliver_single_event(struct snd_seq_client *client,</div><div class='add'>+					struct snd_seq_event *event,</div><div class='add'>+					int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	int result = _snd_seq_deliver_single_event(client, event, atomic, hop);</div><div class='add'>+</div><div class='add'>+	if (result &lt; 0 &amp;&amp; !snd_seq_ev_is_direct(event))</div><div class='add'>+		return bounce_error_event(client, event, result, atomic, hop);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -654,129 +668,92 @@ static int snd_seq_deliver_single_event(struct snd_seq_client *client,</div><div class='ctx'> /*</div><div class='ctx'>  * send the event to all subscribers:</div><div class='ctx'>  */</div><div class='del'>-static int deliver_to_subscribers(struct snd_seq_client *client,</div><div class='del'>-				  struct snd_seq_event *event,</div><div class='del'>-				  int atomic, int hop)</div><div class='add'>+static int __deliver_to_subscribers(struct snd_seq_client *client,</div><div class='add'>+				    struct snd_seq_event *event,</div><div class='add'>+				    int port, int atomic, int hop)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_client_port *src_port __free(snd_seq_port) = NULL;</div><div class='ctx'> 	struct snd_seq_subscribers *subs;</div><div class='del'>-	int err = 0, num_ev = 0;</div><div class='del'>-	struct snd_seq_event event_saved;</div><div class='del'>-	struct snd_seq_client_port *src_port;</div><div class='add'>+	int err, result = 0, num_ev = 0;</div><div class='add'>+	union __snd_seq_event event_saved;</div><div class='add'>+	size_t saved_size;</div><div class='ctx'> 	struct snd_seq_port_subs_info *grp;</div><div class='ctx'> </div><div class='del'>-	src_port = snd_seq_port_use_ptr(client, event-&gt;source.port);</div><div class='del'>-	if (src_port == NULL)</div><div class='del'>-		return -EINVAL; /* invalid source port */</div><div class='add'>+	if (port &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	src_port = snd_seq_port_use_ptr(client, port);</div><div class='add'>+	if (!src_port)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* save original event record */</div><div class='del'>-	event_saved = *event;</div><div class='add'>+	saved_size = snd_seq_event_packet_size(event);</div><div class='add'>+	memcpy(&amp;event_saved, event, saved_size);</div><div class='ctx'> 	grp = &amp;src_port-&gt;c_src;</div><div class='ctx'> 	</div><div class='ctx'> 	/* lock list */</div><div class='ctx'> 	if (atomic)</div><div class='ctx'> 		read_lock(&amp;grp-&gt;list_lock);</div><div class='ctx'> 	else</div><div class='del'>-		down_read(&amp;grp-&gt;list_mutex);</div><div class='add'>+		down_read_nested(&amp;grp-&gt;list_mutex, hop);</div><div class='ctx'> 	list_for_each_entry(subs, &amp;grp-&gt;list_head, src_list) {</div><div class='add'>+		/* both ports ready? */</div><div class='add'>+		if (atomic_read(&amp;subs-&gt;ref_count) != 2)</div><div class='add'>+			continue;</div><div class='ctx'> 		event-&gt;dest = subs-&gt;info.dest;</div><div class='ctx'> 		if (subs-&gt;info.flags &amp; SNDRV_SEQ_PORT_SUBS_TIMESTAMP)</div><div class='ctx'> 			/* convert time according to flag with subscription */</div><div class='ctx'> 			update_timestamp_of_queue(event, subs-&gt;info.queue,</div><div class='ctx'> 						  subs-&gt;info.flags &amp; SNDRV_SEQ_PORT_SUBS_TIME_REAL);</div><div class='del'>-		err = snd_seq_deliver_single_event(client, event,</div><div class='del'>-						   0, atomic, hop);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+		err = snd_seq_deliver_single_event(client, event, atomic, hop);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			/* save first error that occurs and continue */</div><div class='add'>+			if (!result)</div><div class='add'>+				result = err;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		num_ev++;</div><div class='ctx'> 		/* restore original event record */</div><div class='del'>-		*event = event_saved;</div><div class='add'>+		memcpy(event, &amp;event_saved, saved_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (atomic)</div><div class='ctx'> 		read_unlock(&amp;grp-&gt;list_lock);</div><div class='ctx'> 	else</div><div class='ctx'> 		up_read(&amp;grp-&gt;list_mutex);</div><div class='del'>-	*event = event_saved; /* restore */</div><div class='del'>-	snd_seq_port_unlock(src_port);</div><div class='del'>-	return (err &lt; 0) ? err : num_ev;</div><div class='add'>+	memcpy(event, &amp;event_saved, saved_size);</div><div class='add'>+	return (result &lt; 0) ? result : num_ev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef SUPPORT_BROADCAST </div><div class='del'>-/*</div><div class='del'>- * broadcast to all ports:</div><div class='del'>- */</div><div class='del'>-static int port_broadcast_event(struct snd_seq_client *client,</div><div class='del'>-				struct snd_seq_event *event,</div><div class='del'>-				int atomic, int hop)</div><div class='del'>-{</div><div class='del'>-	int num_ev = 0, err = 0;</div><div class='del'>-	struct snd_seq_client *dest_client;</div><div class='del'>-	struct snd_seq_client_port *port;</div><div class='del'>-</div><div class='del'>-	dest_client = get_event_dest_client(event, SNDRV_SEQ_FILTER_BROADCAST);</div><div class='del'>-	if (dest_client == NULL)</div><div class='del'>-		return 0; /* no matching destination */</div><div class='del'>-</div><div class='del'>-	read_lock(&amp;dest_client-&gt;ports_lock);</div><div class='del'>-	list_for_each_entry(port, &amp;dest_client-&gt;ports_list_head, list) {</div><div class='del'>-		event-&gt;dest.port = port-&gt;addr.port;</div><div class='del'>-		/* pass NULL as source client to avoid error bounce */</div><div class='del'>-		err = snd_seq_deliver_single_event(NULL, event,</div><div class='del'>-						   SNDRV_SEQ_FILTER_BROADCAST,</div><div class='del'>-						   atomic, hop);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		num_ev++;</div><div class='del'>-	}</div><div class='del'>-	read_unlock(&amp;dest_client-&gt;ports_lock);</div><div class='del'>-	snd_seq_client_unlock(dest_client);</div><div class='del'>-	event-&gt;dest.port = SNDRV_SEQ_ADDRESS_BROADCAST; /* restore */</div><div class='del'>-	return (err &lt; 0) ? err : num_ev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * send the event to all clients:</div><div class='del'>- * if destination port is also ADDRESS_BROADCAST, deliver to all ports.</div><div class='del'>- */</div><div class='del'>-static int broadcast_event(struct snd_seq_client *client,</div><div class='del'>-			   struct snd_seq_event *event, int atomic, int hop)</div><div class='add'>+static int deliver_to_subscribers(struct snd_seq_client *client,</div><div class='add'>+				  struct snd_seq_event *event,</div><div class='add'>+				  int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	int err = 0, num_ev = 0;</div><div class='del'>-	int dest;</div><div class='del'>-	struct snd_seq_addr addr;</div><div class='del'>-</div><div class='del'>-	addr = event-&gt;dest; /* save */</div><div class='del'>-</div><div class='del'>-	for (dest = 0; dest &lt; SNDRV_SEQ_MAX_CLIENTS; dest++) {</div><div class='del'>-		/* don't send to itself */</div><div class='del'>-		if (dest == client-&gt;number)</div><div class='del'>-			continue;</div><div class='del'>-		event-&gt;dest.client = dest;</div><div class='del'>-		event-&gt;dest.port = addr.port;</div><div class='del'>-		if (addr.port == SNDRV_SEQ_ADDRESS_BROADCAST)</div><div class='del'>-			err = port_broadcast_event(client, event, atomic, hop);</div><div class='del'>-		else</div><div class='del'>-			/* pass NULL as source client to avoid error bounce */</div><div class='del'>-			err = snd_seq_deliver_single_event(NULL, event,</div><div class='del'>-							   SNDRV_SEQ_FILTER_BROADCAST,</div><div class='del'>-							   atomic, hop);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		num_ev += err;</div><div class='del'>-	}</div><div class='del'>-	event-&gt;dest = addr; /* restore */</div><div class='del'>-	return (err &lt; 0) ? err : num_ev;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+	int ret;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	int ret2;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-/* multicast - not supported yet */</div><div class='del'>-static int multicast_event(struct snd_seq_client *client, struct snd_seq_event *event,</div><div class='del'>-			   int atomic, int hop)</div><div class='del'>-{</div><div class='del'>-	snd_printd("seq: multicast not supported yet.\n");</div><div class='del'>-	return 0; /* ignored */</div><div class='add'>+	ret = __deliver_to_subscribers(client, event,</div><div class='add'>+				       event-&gt;source.port, atomic, hop);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	if (!snd_seq_client_is_ump(client) || client-&gt;ump_endpoint_port &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	/* If it's an event from EP port (and with a UMP group),</div><div class='add'>+	 * deliver to subscribers of the corresponding UMP group port, too.</div><div class='add'>+	 * Or, if it's from non-EP port, deliver to subscribers of EP port, too.</div><div class='add'>+	 */</div><div class='add'>+	if (event-&gt;source.port == client-&gt;ump_endpoint_port)</div><div class='add'>+		ret2 = __deliver_to_subscribers(client, event,</div><div class='add'>+						snd_seq_ump_group_port(event),</div><div class='add'>+						atomic, hop);</div><div class='add'>+	else</div><div class='add'>+		ret2 = __deliver_to_subscribers(client, event,</div><div class='add'>+						client-&gt;ump_endpoint_port,</div><div class='add'>+						atomic, hop);</div><div class='add'>+	if (ret2 &lt; 0)</div><div class='add'>+		return ret2;</div><div class='add'>+#endif</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='del'>-#endif /* SUPPORT_BROADCAST */</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* deliver an event to the destination port(s).</div><div class='ctx'>  * if the event is to subscribers or broadcast, the event is dispatched</div><div class='hunk'>@@ -793,26 +770,21 @@ static int snd_seq_deliver_event(struct snd_seq_client *client, struct snd_seq_e</div><div class='ctx'> </div><div class='ctx'> 	hop++;</div><div class='ctx'> 	if (hop &gt;= SNDRV_SEQ_MAX_HOPS) {</div><div class='del'>-		snd_printd("too long delivery path (%d:%d-&gt;%d:%d)\n",</div><div class='add'>+		pr_debug("ALSA: seq: too long delivery path (%d:%d-&gt;%d:%d)\n",</div><div class='ctx'> 			   event-&gt;source.client, event-&gt;source.port,</div><div class='ctx'> 			   event-&gt;dest.client, event-&gt;dest.port);</div><div class='ctx'> 		return -EMLINK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (snd_seq_ev_is_variable(event) &amp;&amp;</div><div class='add'>+	    snd_BUG_ON(atomic &amp;&amp; (event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_USRPTR)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (event-&gt;queue == SNDRV_SEQ_ADDRESS_SUBSCRIBERS ||</div><div class='ctx'> 	    event-&gt;dest.client == SNDRV_SEQ_ADDRESS_SUBSCRIBERS)</div><div class='ctx'> 		result = deliver_to_subscribers(client, event, atomic, hop);</div><div class='del'>-#ifdef SUPPORT_BROADCAST</div><div class='del'>-	else if (event-&gt;queue == SNDRV_SEQ_ADDRESS_BROADCAST ||</div><div class='del'>-		 event-&gt;dest.client == SNDRV_SEQ_ADDRESS_BROADCAST)</div><div class='del'>-		result = broadcast_event(client, event, atomic, hop);</div><div class='del'>-	else if (event-&gt;dest.client &gt;= SNDRV_SEQ_MAX_CLIENTS)</div><div class='del'>-		result = multicast_event(client, event, atomic, hop);</div><div class='del'>-	else if (event-&gt;dest.port == SNDRV_SEQ_ADDRESS_BROADCAST)</div><div class='del'>-		result = port_broadcast_event(client, event, atomic, hop);</div><div class='del'>-#endif</div><div class='ctx'> 	else</div><div class='del'>-		result = snd_seq_deliver_single_event(client, event, 0, atomic, hop);</div><div class='add'>+		result = snd_seq_deliver_single_event(client, event, atomic, hop);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -829,7 +801,7 @@ static int snd_seq_deliver_event(struct snd_seq_client *client, struct snd_seq_e</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *client;</div><div class='add'>+	struct snd_seq_client *client __free(snd_seq_client) = NULL;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!cell))</div><div class='hunk'>@@ -841,7 +813,8 @@ int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cell-&gt;event.type == SNDRV_SEQ_EVENT_NOTE) {</div><div class='add'>+	if (!snd_seq_ev_is_ump(&amp;cell-&gt;event) &amp;&amp;</div><div class='add'>+	    cell-&gt;event.type == SNDRV_SEQ_EVENT_NOTE) {</div><div class='ctx'> 		/* NOTE event:</div><div class='ctx'> 		 * the event cell is re-used as a NOTE-OFF event and</div><div class='ctx'> 		 * enqueued again.</div><div class='hunk'>@@ -865,7 +838,7 @@ int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> 		/* add the duration time */</div><div class='ctx'> 		switch (ev-&gt;flags &amp; SNDRV_SEQ_TIME_STAMP_MASK) {</div><div class='ctx'> 		case SNDRV_SEQ_TIME_STAMP_TICK:</div><div class='del'>-			ev-&gt;time.tick += ev-&gt;data.note.duration;</div><div class='add'>+			cell-&gt;event.time.tick += ev-&gt;data.note.duration;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SNDRV_SEQ_TIME_STAMP_REAL:</div><div class='ctx'> 			/* unit for duration is ms */</div><div class='hunk'>@@ -890,7 +863,6 @@ int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> 		snd_seq_cell_free(cell);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_seq_client_unlock(client);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -902,7 +874,8 @@ int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> static int snd_seq_client_enqueue_event(struct snd_seq_client *client,</div><div class='ctx'> 					struct snd_seq_event *event,</div><div class='ctx'> 					struct file *file, int blocking,</div><div class='del'>-					int atomic, int hop)</div><div class='add'>+					int atomic, int hop,</div><div class='add'>+					struct mutex *mutexp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -911,24 +884,18 @@ static int snd_seq_client_enqueue_event(struct snd_seq_client *client,</div><div class='ctx'> 	if (event-&gt;queue == SNDRV_SEQ_ADDRESS_SUBSCRIBERS) {</div><div class='ctx'> 		event-&gt;dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;</div><div class='ctx'> 		event-&gt;queue = SNDRV_SEQ_QUEUE_DIRECT;</div><div class='del'>-	} else</div><div class='del'>-#ifdef SUPPORT_BROADCAST</div><div class='del'>-		if (event-&gt;queue == SNDRV_SEQ_ADDRESS_BROADCAST) {</div><div class='del'>-			event-&gt;dest.client = SNDRV_SEQ_ADDRESS_BROADCAST;</div><div class='del'>-			event-&gt;queue = SNDRV_SEQ_QUEUE_DIRECT;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	if (event-&gt;dest.client == SNDRV_SEQ_ADDRESS_SUBSCRIBERS) {</div><div class='add'>+	} else if (event-&gt;dest.client == SNDRV_SEQ_ADDRESS_SUBSCRIBERS) {</div><div class='ctx'> 		/* check presence of source port */</div><div class='del'>-		struct snd_seq_client_port *src_port = snd_seq_port_use_ptr(client, event-&gt;source.port);</div><div class='del'>-		if (src_port == NULL)</div><div class='add'>+		struct snd_seq_client_port *src_port __free(snd_seq_port) =</div><div class='add'>+			snd_seq_port_use_ptr(client, event-&gt;source.port);</div><div class='add'>+		if (!src_port)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		snd_seq_port_unlock(src_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* direct event processing without enqueued */</div><div class='ctx'> 	if (snd_seq_ev_is_direct(event)) {</div><div class='del'>-		if (event-&gt;type == SNDRV_SEQ_EVENT_NOTE)</div><div class='add'>+		if (!snd_seq_ev_is_ump(event) &amp;&amp;</div><div class='add'>+		    event-&gt;type == SNDRV_SEQ_EVENT_NOTE)</div><div class='ctx'> 			return -EINVAL; /* this event must be enqueued! */</div><div class='ctx'> 		return snd_seq_deliver_event(client, event, atomic, hop);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -940,12 +907,14 @@ static int snd_seq_client_enqueue_event(struct snd_seq_client *client,</div><div class='ctx'> 		return -ENXIO; /* queue is not allocated */</div><div class='ctx'> </div><div class='ctx'> 	/* allocate an event cell */</div><div class='del'>-	err = snd_seq_event_dup(client-&gt;pool, event, &amp;cell, !blocking || atomic, file);</div><div class='add'>+	err = snd_seq_event_dup(client-&gt;pool, event, &amp;cell, !blocking || atomic,</div><div class='add'>+				file, mutexp);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* we got a cell. enqueue it. */</div><div class='del'>-	if ((err = snd_seq_enqueue_event(cell, atomic, hop)) &lt; 0) {</div><div class='add'>+	err = snd_seq_enqueue_event(cell, atomic, hop);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_seq_cell_free(cell);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -995,8 +964,9 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_client *client = file-&gt;private_data;</div><div class='ctx'> 	int written = 0, len;</div><div class='del'>-	int err = -EINVAL;</div><div class='del'>-	struct snd_seq_event event;</div><div class='add'>+	int err, handled;</div><div class='add'>+	union __snd_seq_event __event;</div><div class='add'>+	struct snd_seq_event *ev = &amp;__event.legacy;</div><div class='ctx'> </div><div class='ctx'> 	if (!(snd_seq_file_flags(file) &amp; SNDRV_SEQ_LFLG_OUTPUT))</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -1008,70 +978,101 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,</div><div class='ctx'> 	if (!client-&gt;accept_output || client-&gt;pool == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+ repeat:</div><div class='add'>+	handled = 0;</div><div class='ctx'> 	/* allocate the pool now if the pool is not allocated yet */ </div><div class='add'>+	mutex_lock(&amp;client-&gt;ioctl_mutex);</div><div class='ctx'> 	if (client-&gt;pool-&gt;size &gt; 0 &amp;&amp; !snd_seq_write_pool_allocated(client)) {</div><div class='del'>-		if (snd_seq_pool_init(client-&gt;pool) &lt; 0)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		err = snd_seq_pool_init(client-&gt;pool);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* only process whole events */</div><div class='add'>+	err = -EINVAL;</div><div class='ctx'> 	while (count &gt;= sizeof(struct snd_seq_event)) {</div><div class='ctx'> 		/* Read in the event header from the user */</div><div class='del'>-		len = sizeof(event);</div><div class='del'>-		if (copy_from_user(&amp;event, buf, len)) {</div><div class='add'>+		len = sizeof(struct snd_seq_event);</div><div class='add'>+		if (copy_from_user(ev, buf, len)) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		event.source.client = client-&gt;number;	/* fill in client number */</div><div class='add'>+		/* read in the rest bytes for UMP events */</div><div class='add'>+		if (snd_seq_ev_is_ump(ev)) {</div><div class='add'>+			if (count &lt; sizeof(struct snd_seq_ump_event))</div><div class='add'>+				break;</div><div class='add'>+			if (copy_from_user((char *)ev + len, buf + len,</div><div class='add'>+					   sizeof(struct snd_seq_ump_event) - len)) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			len = sizeof(struct snd_seq_ump_event);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ev-&gt;source.client = client-&gt;number;	/* fill in client number */</div><div class='ctx'> 		/* Check for extension data length */</div><div class='del'>-		if (check_event_type_and_length(&amp;event)) {</div><div class='add'>+		if (check_event_type_and_length(ev)) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* check for special events */</div><div class='del'>-		if (event.type == SNDRV_SEQ_EVENT_NONE)</div><div class='del'>-			goto __skip_event;</div><div class='del'>-		else if (snd_seq_ev_is_reserved(&amp;event)) {</div><div class='add'>+		if (!event_is_compatible(client, ev)) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (snd_seq_ev_is_variable(&amp;event)) {</div><div class='del'>-			int extlen = event.data.ext.len &amp; ~SNDRV_SEQ_EXT_MASK;</div><div class='add'>+		/* check for special events */</div><div class='add'>+		if (!snd_seq_ev_is_ump(ev)) {</div><div class='add'>+			if (ev-&gt;type == SNDRV_SEQ_EVENT_NONE)</div><div class='add'>+				goto __skip_event;</div><div class='add'>+			else if (snd_seq_ev_is_reserved(ev)) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (snd_seq_ev_is_variable(ev)) {</div><div class='add'>+			int extlen = ev-&gt;data.ext.len &amp; ~SNDRV_SEQ_EXT_MASK;</div><div class='ctx'> 			if ((size_t)(extlen + len) &gt; count) {</div><div class='ctx'> 				/* back out, will get an error this time or next */</div><div class='ctx'> 				err = -EINVAL;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* set user space pointer */</div><div class='del'>-			event.data.ext.len = extlen | SNDRV_SEQ_EXT_USRPTR;</div><div class='del'>-			event.data.ext.ptr = (char __force *)buf</div><div class='del'>-						+ sizeof(struct snd_seq_event);</div><div class='add'>+			ev-&gt;data.ext.len = extlen | SNDRV_SEQ_EXT_USRPTR;</div><div class='add'>+			ev-&gt;data.ext.ptr = (char __force *)buf + len;</div><div class='ctx'> 			len += extlen; /* increment data length */</div><div class='ctx'> 		} else {</div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='del'>-			if (client-&gt;convert32 &amp;&amp; snd_seq_ev_is_varusr(&amp;event)) {</div><div class='del'>-				void *ptr = compat_ptr(event.data.raw32.d[1]);</div><div class='del'>-				event.data.ext.ptr = ptr;</div><div class='del'>-			}</div><div class='add'>+			if (client-&gt;convert32 &amp;&amp; snd_seq_ev_is_varusr(ev))</div><div class='add'>+				ev-&gt;data.ext.ptr =</div><div class='add'>+					(void __force *)compat_ptr(ev-&gt;data.raw32.d[1]);</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* ok, enqueue it */</div><div class='del'>-		err = snd_seq_client_enqueue_event(client, &amp;event, file,</div><div class='add'>+		err = snd_seq_client_enqueue_event(client, ev, file,</div><div class='ctx'> 						   !(file-&gt;f_flags &amp; O_NONBLOCK),</div><div class='del'>-						   0, 0);</div><div class='add'>+						   0, 0, &amp;client-&gt;ioctl_mutex);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='add'>+		handled++;</div><div class='ctx'> </div><div class='ctx'> 	__skip_event:</div><div class='ctx'> 		/* Update pointers and counts */</div><div class='ctx'> 		count -= len;</div><div class='ctx'> 		buf += len;</div><div class='ctx'> 		written += len;</div><div class='add'>+</div><div class='add'>+		/* let's have a coffee break if too many events are queued */</div><div class='add'>+		if (++handled &gt;= 200) {</div><div class='add'>+			mutex_unlock(&amp;client-&gt;ioctl_mutex);</div><div class='add'>+			goto repeat;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;client-&gt;ioctl_mutex);</div><div class='ctx'> 	return written ? written : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1079,29 +1080,28 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,</div><div class='ctx'> /*</div><div class='ctx'>  * handle polling</div><div class='ctx'>  */</div><div class='del'>-static unsigned int snd_seq_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_seq_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_client *client = file-&gt;private_data;</div><div class='del'>-	unsigned int mask = 0;</div><div class='add'>+	__poll_t mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check client structures are in place */</div><div class='ctx'> 	if (snd_BUG_ON(!client))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		return EPOLLERR;</div><div class='ctx'> </div><div class='ctx'> 	if ((snd_seq_file_flags(file) &amp; SNDRV_SEQ_LFLG_INPUT) &amp;&amp;</div><div class='ctx'> 	    client-&gt;data.user.fifo) {</div><div class='ctx'> </div><div class='ctx'> 		/* check if data is available in the outqueue */</div><div class='ctx'> 		if (snd_seq_fifo_poll_wait(client-&gt;data.user.fifo, file, wait))</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='add'>+			mask |= EPOLLIN | EPOLLRDNORM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_seq_file_flags(file) &amp; SNDRV_SEQ_LFLG_OUTPUT) {</div><div class='ctx'> </div><div class='ctx'> 		/* check if data is available in the pool */</div><div class='del'>-		if (!snd_seq_write_pool_allocated(client) ||</div><div class='del'>-		    snd_seq_pool_poll_wait(client-&gt;pool, file, wait))</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='add'>+		if (snd_seq_pool_poll_wait(client-&gt;pool, file, wait))</div><div class='add'>+			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='hunk'>@@ -1110,62 +1110,68 @@ static unsigned int snd_seq_poll(struct file *file, poll_table * wait)</div><div class='ctx'> </div><div class='ctx'> /*-----------------------------------------------------*/</div><div class='ctx'> </div><div class='add'>+static int snd_seq_ioctl_pversion(struct snd_seq_client *client, void *arg)</div><div class='add'>+{</div><div class='add'>+	int *pversion = arg;</div><div class='add'>+</div><div class='add'>+	*pversion = SNDRV_SEQ_VERSION;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_seq_ioctl_user_pversion(struct snd_seq_client *client, void *arg)</div><div class='add'>+{</div><div class='add'>+	client-&gt;user_pversion = *(unsigned int *)arg;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_seq_ioctl_client_id(struct snd_seq_client *client, void *arg)</div><div class='add'>+{</div><div class='add'>+	int *client_id = arg;</div><div class='add'>+</div><div class='add'>+	*client_id = client-&gt;number;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* SYSTEM_INFO ioctl() */</div><div class='del'>-static int snd_seq_ioctl_system_info(struct snd_seq_client *client, void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_system_info(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_system_info info;</div><div class='add'>+	struct snd_seq_system_info *info = arg;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='ctx'> 	/* fill the info fields */</div><div class='del'>-	info.queues = SNDRV_SEQ_MAX_QUEUES;</div><div class='del'>-	info.clients = SNDRV_SEQ_MAX_CLIENTS;</div><div class='del'>-	info.ports = 256;	/* fixed limit */</div><div class='del'>-	info.channels = 256;	/* fixed limit */</div><div class='del'>-	info.cur_clients = client_usage.cur;</div><div class='del'>-	info.cur_queues = snd_seq_queue_get_cur_queues();</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	info-&gt;queues = SNDRV_SEQ_MAX_QUEUES;</div><div class='add'>+	info-&gt;clients = SNDRV_SEQ_MAX_CLIENTS;</div><div class='add'>+	info-&gt;ports = SNDRV_SEQ_MAX_PORTS;</div><div class='add'>+	info-&gt;channels = 256;	/* fixed limit */</div><div class='add'>+	info-&gt;cur_clients = client_usage.cur;</div><div class='add'>+	info-&gt;cur_queues = snd_seq_queue_get_cur_queues();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* RUNNING_MODE ioctl() */</div><div class='del'>-static int snd_seq_ioctl_running_mode(struct snd_seq_client *client, void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_running_mode(struct snd_seq_client *client, void  *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_running_info info;</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_running_info *info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* requested client number */</div><div class='del'>-	cptr = snd_seq_client_use_ptr(info.client);</div><div class='add'>+	cptr = client_load_and_use_ptr(info-&gt;client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -ENOENT;		/* don't change !!! */</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_BIG_ENDIAN</div><div class='del'>-	if (! info.big_endian) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='add'>+	if (!info-&gt;big_endian)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> #else</div><div class='del'>-	if (info.big_endian) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	if (info-&gt;big_endian)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> #endif</div><div class='del'>-	if (info.cpu_mode &gt; sizeof(long)) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='del'>-	cptr-&gt;convert32 = (info.cpu_mode &lt; sizeof(long));</div><div class='del'>- __err:</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-	return err;</div><div class='add'>+	if (info-&gt;cpu_mode &gt; sizeof(long))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cptr-&gt;convert32 = (info-&gt;cpu_mode &lt; sizeof(long));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* CLIENT_INFO ioctl() */</div><div class='hunk'>@@ -1176,60 +1182,80 @@ static void get_client_info(struct snd_seq_client *cptr,</div><div class='ctx'> </div><div class='ctx'> 	/* fill the info fields */</div><div class='ctx'> 	info-&gt;type = cptr-&gt;type;</div><div class='del'>-	strcpy(info-&gt;name, cptr-&gt;name);</div><div class='add'>+	strscpy(info-&gt;name, cptr-&gt;name);</div><div class='ctx'> 	info-&gt;filter = cptr-&gt;filter;</div><div class='ctx'> 	info-&gt;event_lost = cptr-&gt;event_lost;</div><div class='ctx'> 	memcpy(info-&gt;event_filter, cptr-&gt;event_filter, 32);</div><div class='add'>+	info-&gt;group_filter = cptr-&gt;group_filter;</div><div class='ctx'> 	info-&gt;num_ports = cptr-&gt;num_ports;</div><div class='add'>+</div><div class='add'>+	if (cptr-&gt;type == USER_CLIENT)</div><div class='add'>+		info-&gt;pid = pid_vnr(cptr-&gt;data.user.owner);</div><div class='add'>+	else</div><div class='add'>+		info-&gt;pid = -1;</div><div class='add'>+</div><div class='add'>+	if (cptr-&gt;type == KERNEL_CLIENT)</div><div class='add'>+		info-&gt;card = cptr-&gt;data.kernel.card ? cptr-&gt;data.kernel.card-&gt;number : -1;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;card = -1;</div><div class='add'>+</div><div class='add'>+	info-&gt;midi_version = cptr-&gt;midi_version;</div><div class='ctx'> 	memset(info-&gt;reserved, 0, sizeof(info-&gt;reserved));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_seq_ioctl_get_client_info(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	struct snd_seq_client_info client_info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;client_info, arg, sizeof(client_info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_client_info *client_info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* requested client number */</div><div class='del'>-	cptr = snd_seq_client_use_ptr(client_info.client);</div><div class='add'>+	cptr = client_load_and_use_ptr(client_info-&gt;client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -ENOENT;		/* don't change !!! */</div><div class='ctx'> </div><div class='del'>-	get_client_info(cptr, &amp;client_info);</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;client_info, sizeof(client_info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	get_client_info(cptr, client_info);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* CLIENT_INFO ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_info client_info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;client_info, arg, sizeof(client_info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_client_info *client_info = arg;</div><div class='ctx'> </div><div class='ctx'> 	/* it is not allowed to set the info fields for an another client */</div><div class='del'>-	if (client-&gt;number != client_info.client)</div><div class='add'>+	if (client-&gt;number != client_info-&gt;client)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	/* also client type must be set now */</div><div class='del'>-	if (client-&gt;type != client_info.type)</div><div class='add'>+	if (client-&gt;type != client_info-&gt;type)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (client-&gt;user_pversion &gt;= SNDRV_PROTOCOL_VERSION(1, 0, 3)) {</div><div class='add'>+		/* check validity of midi_version field */</div><div class='add'>+		if (client_info-&gt;midi_version &gt; SNDRV_SEQ_CLIENT_UMP_MIDI_2_0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* check if UMP is supported in kernel */</div><div class='add'>+		if (!IS_ENABLED(CONFIG_SND_SEQ_UMP) &amp;&amp;</div><div class='add'>+		    client_info-&gt;midi_version &gt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* fill the info fields */</div><div class='del'>-	if (client_info.name[0])</div><div class='del'>-		strlcpy(client-&gt;name, client_info.name, sizeof(client-&gt;name));</div><div class='add'>+	if (client_info-&gt;name[0])</div><div class='add'>+		strscpy(client-&gt;name, client_info-&gt;name, sizeof(client-&gt;name));</div><div class='ctx'> </div><div class='del'>-	client-&gt;filter = client_info.filter;</div><div class='del'>-	client-&gt;event_lost = client_info.event_lost;</div><div class='del'>-	memcpy(client-&gt;event_filter, client_info.event_filter, 32);</div><div class='add'>+	client-&gt;filter = client_info-&gt;filter;</div><div class='add'>+	client-&gt;event_lost = client_info-&gt;event_lost;</div><div class='add'>+	if (client-&gt;user_pversion &gt;= SNDRV_PROTOCOL_VERSION(1, 0, 3))</div><div class='add'>+		client-&gt;midi_version = client_info-&gt;midi_version;</div><div class='add'>+	memcpy(client-&gt;event_filter, client_info-&gt;event_filter, 32);</div><div class='add'>+	client-&gt;group_filter = client_info-&gt;group_filter;</div><div class='add'>+</div><div class='add'>+	/* notify the change */</div><div class='add'>+	snd_seq_system_client_ev_client_change(client-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1238,35 +1264,39 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client,</div><div class='ctx'> /* </div><div class='ctx'>  * CREATE PORT ioctl() </div><div class='ctx'>  */</div><div class='del'>-static int snd_seq_ioctl_create_port(struct snd_seq_client *client,</div><div class='del'>-				     void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_port_info *info = arg;</div><div class='ctx'> 	struct snd_seq_client_port *port;</div><div class='del'>-	struct snd_seq_port_info info;</div><div class='ctx'> 	struct snd_seq_port_callback *callback;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	int port_idx, err;</div><div class='ctx'> </div><div class='ctx'> 	/* it is not allowed to create the port for an another client */</div><div class='del'>-	if (info.addr.client != client-&gt;number)</div><div class='add'>+	if (info-&gt;addr.client != client-&gt;number)</div><div class='ctx'> 		return -EPERM;</div><div class='add'>+	if (client-&gt;type == USER_CLIENT &amp;&amp; info-&gt;kernel)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if ((info-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_UMP_ENDPOINT) &amp;&amp;</div><div class='add'>+	    client-&gt;ump_endpoint_port &gt;= 0)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	port = snd_seq_create_port(client, (info.flags &amp; SNDRV_SEQ_PORT_FLG_GIVEN_PORT) ? info.addr.port : -1);</div><div class='del'>-	if (port == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (client-&gt;type == USER_CLIENT &amp;&amp; info.kernel) {</div><div class='del'>-		snd_seq_delete_port(client, port-&gt;addr.port);</div><div class='add'>+	if (info-&gt;flags &amp; SNDRV_SEQ_PORT_FLG_GIVEN_PORT)</div><div class='add'>+		port_idx = info-&gt;addr.port;</div><div class='add'>+	else</div><div class='add'>+		port_idx = -1;</div><div class='add'>+	if (port_idx &gt;= SNDRV_SEQ_ADDRESS_UNKNOWN)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	err = snd_seq_create_port(client, port_idx, &amp;port);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	if (client-&gt;type == KERNEL_CLIENT) {</div><div class='del'>-		if ((callback = info.kernel) != NULL) {</div><div class='add'>+		callback = info-&gt;kernel;</div><div class='add'>+		if (callback) {</div><div class='ctx'> 			if (callback-&gt;owner)</div><div class='ctx'> 				port-&gt;owner = callback-&gt;owner;</div><div class='ctx'> 			port-&gt;private_data = callback-&gt;private_data;</div><div class='ctx'> 			port-&gt;private_free = callback-&gt;private_free;</div><div class='del'>-			port-&gt;callback_all = callback-&gt;callback_all;</div><div class='ctx'> 			port-&gt;event_input = callback-&gt;event_input;</div><div class='ctx'> 			port-&gt;c_src.open = callback-&gt;subscribe;</div><div class='ctx'> 			port-&gt;c_src.close = callback-&gt;unsubscribe;</div><div class='hunk'>@@ -1275,13 +1305,13 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	info.addr = port-&gt;addr;</div><div class='add'>+	info-&gt;addr = port-&gt;addr;</div><div class='ctx'> </div><div class='del'>-	snd_seq_set_port_info(port, &amp;info);</div><div class='add'>+	snd_seq_set_port_info(port, info);</div><div class='add'>+	if (info-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_UMP_ENDPOINT)</div><div class='add'>+		client-&gt;ump_endpoint_port = port-&gt;addr.port;</div><div class='ctx'> 	snd_seq_system_client_ev_port_start(port-&gt;addr.client, port-&gt;addr.port);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	snd_seq_port_unlock(port);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1289,23 +1319,21 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client,</div><div class='ctx'> /* </div><div class='ctx'>  * DELETE PORT ioctl() </div><div class='ctx'>  */</div><div class='del'>-static int snd_seq_ioctl_delete_port(struct snd_seq_client *client,</div><div class='del'>-				     void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_delete_port(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_port_info info;</div><div class='add'>+	struct snd_seq_port_info *info = arg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* set passed parameters */</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	</div><div class='ctx'> 	/* it is not allowed to remove the port for an another client */</div><div class='del'>-	if (info.addr.client != client-&gt;number)</div><div class='add'>+	if (info-&gt;addr.client != client-&gt;number)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	err = snd_seq_delete_port(client, info.addr.port);</div><div class='del'>-	if (err &gt;= 0)</div><div class='del'>-		snd_seq_system_client_ev_port_exit(client-&gt;number, info.addr.port);</div><div class='add'>+	err = snd_seq_delete_port(client, info-&gt;addr.port);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		if (client-&gt;ump_endpoint_port == info-&gt;addr.port)</div><div class='add'>+			client-&gt;ump_endpoint_port = -1;</div><div class='add'>+		snd_seq_system_client_ev_port_exit(client-&gt;number, info-&gt;addr.port);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1313,32 +1341,22 @@ static int snd_seq_ioctl_delete_port(struct snd_seq_client *client,</div><div class='ctx'> /* </div><div class='ctx'>  * GET_PORT_INFO ioctl() (on any client) </div><div class='ctx'>  */</div><div class='del'>-static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client,</div><div class='del'>-				       void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	struct snd_seq_client_port *port;</div><div class='del'>-	struct snd_seq_port_info info;</div><div class='add'>+	struct snd_seq_port_info *info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *port __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	cptr = snd_seq_client_use_ptr(info.addr.client);</div><div class='add'>+	cptr = client_load_and_use_ptr(info-&gt;addr.client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	port = snd_seq_port_use_ptr(cptr, info.addr.port);</div><div class='del'>-	if (port == NULL) {</div><div class='del'>-		snd_seq_client_unlock(cptr);</div><div class='add'>+	port = snd_seq_port_use_ptr(cptr, info-&gt;addr.port);</div><div class='add'>+	if (port == NULL)</div><div class='ctx'> 		return -ENOENT;			/* don't change */</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* get port info */</div><div class='del'>-	snd_seq_get_port_info(port, &amp;info);</div><div class='del'>-	snd_seq_port_unlock(port);</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	snd_seq_get_port_info(port, info);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1346,21 +1364,19 @@ static int snd_seq_ioctl_get_port_info(struct snd_seq_client *client,</div><div class='ctx'> /* </div><div class='ctx'>  * SET_PORT_INFO ioctl() (only ports on this/own client) </div><div class='ctx'>  */</div><div class='del'>-static int snd_seq_ioctl_set_port_info(struct snd_seq_client *client,</div><div class='del'>-				       void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_set_port_info(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_port *port;</div><div class='del'>-	struct snd_seq_port_info info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_port_info *info = arg;</div><div class='add'>+	struct snd_seq_client_port *port __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (info.addr.client != client-&gt;number) /* only set our own ports ! */</div><div class='add'>+	if (info-&gt;addr.client != client-&gt;number) /* only set our own ports ! */</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	port = snd_seq_port_use_ptr(client, info.addr.port);</div><div class='add'>+	port = snd_seq_port_use_ptr(client, info-&gt;addr.port);</div><div class='ctx'> 	if (port) {</div><div class='del'>-		snd_seq_set_port_info(port, &amp;info);</div><div class='del'>-		snd_seq_port_unlock(port);</div><div class='add'>+		snd_seq_set_port_info(port, info);</div><div class='add'>+		/* notify the change */</div><div class='add'>+		snd_seq_system_client_ev_port_change(info-&gt;addr.client,</div><div class='add'>+						     info-&gt;addr.port);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1417,7 +1433,7 @@ int snd_seq_client_notify_subscription(int client, int port,</div><div class='ctx'> 	event.data.connect.dest = info-&gt;dest;</div><div class='ctx'> 	event.data.connect.sender = info-&gt;sender;</div><div class='ctx'> </div><div class='del'>-	return snd_seq_system_notify(client, port, &amp;event);  /* non-atomic */</div><div class='add'>+	return snd_seq_system_notify(client, port, &amp;event, false);  /* non-atomic */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1425,43 +1441,37 @@ int snd_seq_client_notify_subscription(int client, int port,</div><div class='ctx'>  * add to port's subscription list IOCTL interface </div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client,</div><div class='del'>-					void __user *arg)</div><div class='add'>+					void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result = -EINVAL;</div><div class='del'>-	struct snd_seq_client *receiver = NULL, *sender = NULL;</div><div class='del'>-	struct snd_seq_client_port *sport = NULL, *dport = NULL;</div><div class='del'>-	struct snd_seq_port_subscribe subs;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;subs, arg, sizeof(subs)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_port_subscribe *subs = arg;</div><div class='add'>+	struct snd_seq_client *receiver __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client *sender __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;</div><div class='add'>+	struct snd_seq_client_port *dport __free(snd_seq_port) = NULL;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((sender = snd_seq_client_use_ptr(subs.sender.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((sport = snd_seq_port_use_ptr(sender, subs.sender.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((dport = snd_seq_port_use_ptr(receiver, subs.dest.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='add'>+	receiver = client_load_and_use_ptr(subs-&gt;dest.client);</div><div class='add'>+	if (!receiver)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	sender = client_load_and_use_ptr(subs-&gt;sender.client);</div><div class='add'>+	if (!sender)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	sport = snd_seq_port_use_ptr(sender, subs-&gt;sender.port);</div><div class='add'>+	if (!sport)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	dport = snd_seq_port_use_ptr(receiver, subs-&gt;dest.port);</div><div class='add'>+	if (!dport)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	result = check_subscription_permission(client, sport, dport, &amp;subs);</div><div class='add'>+	result = check_subscription_permission(client, sport, dport, subs);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='del'>-		goto __end;</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='ctx'> 	/* connect them */</div><div class='del'>-	result = snd_seq_port_connect(client, sender, sport, receiver, dport, &amp;subs);</div><div class='add'>+	result = snd_seq_port_connect(client, sender, sport, receiver, dport, subs);</div><div class='ctx'> 	if (! result) /* broadcast announce */</div><div class='ctx'> 		snd_seq_client_notify_subscription(SNDRV_SEQ_ADDRESS_SUBSCRIBERS, 0,</div><div class='del'>-						   &amp;subs, SNDRV_SEQ_EVENT_PORT_SUBSCRIBED);</div><div class='del'>-      __end:</div><div class='del'>-      	if (sport)</div><div class='del'>-		snd_seq_port_unlock(sport);</div><div class='del'>-	if (dport)</div><div class='del'>-		snd_seq_port_unlock(dport);</div><div class='del'>-	if (sender)</div><div class='del'>-		snd_seq_client_unlock(sender);</div><div class='del'>-	if (receiver)</div><div class='del'>-		snd_seq_client_unlock(receiver);</div><div class='add'>+						   subs, SNDRV_SEQ_EVENT_PORT_SUBSCRIBED);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1470,240 +1480,188 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client,</div><div class='ctx'>  * remove from port's subscription list </div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client,</div><div class='del'>-					  void __user *arg)</div><div class='add'>+					  void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result = -ENXIO;</div><div class='del'>-	struct snd_seq_client *receiver = NULL, *sender = NULL;</div><div class='del'>-	struct snd_seq_client_port *sport = NULL, *dport = NULL;</div><div class='del'>-	struct snd_seq_port_subscribe subs;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;subs, arg, sizeof(subs)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_port_subscribe *subs = arg;</div><div class='add'>+	struct snd_seq_client *receiver __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client *sender __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;</div><div class='add'>+	struct snd_seq_client_port *dport __free(snd_seq_port) = NULL;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((sender = snd_seq_client_use_ptr(subs.sender.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((sport = snd_seq_port_use_ptr(sender, subs.sender.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((dport = snd_seq_port_use_ptr(receiver, subs.dest.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='add'>+	receiver = snd_seq_client_use_ptr(subs-&gt;dest.client);</div><div class='add'>+	if (!receiver)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	sender = snd_seq_client_use_ptr(subs-&gt;sender.client);</div><div class='add'>+	if (!sender)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	sport = snd_seq_port_use_ptr(sender, subs-&gt;sender.port);</div><div class='add'>+	if (!sport)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	dport = snd_seq_port_use_ptr(receiver, subs-&gt;dest.port);</div><div class='add'>+	if (!dport)</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	result = check_subscription_permission(client, sport, dport, &amp;subs);</div><div class='add'>+	result = check_subscription_permission(client, sport, dport, subs);</div><div class='ctx'> 	if (result &lt; 0)</div><div class='del'>-		goto __end;</div><div class='add'>+		return result;</div><div class='ctx'> </div><div class='del'>-	result = snd_seq_port_disconnect(client, sender, sport, receiver, dport, &amp;subs);</div><div class='add'>+	result = snd_seq_port_disconnect(client, sender, sport, receiver, dport, subs);</div><div class='ctx'> 	if (! result) /* broadcast announce */</div><div class='ctx'> 		snd_seq_client_notify_subscription(SNDRV_SEQ_ADDRESS_SUBSCRIBERS, 0,</div><div class='del'>-						   &amp;subs, SNDRV_SEQ_EVENT_PORT_UNSUBSCRIBED);</div><div class='del'>-      __end:</div><div class='del'>-      	if (sport)</div><div class='del'>-		snd_seq_port_unlock(sport);</div><div class='del'>-	if (dport)</div><div class='del'>-		snd_seq_port_unlock(dport);</div><div class='del'>-	if (sender)</div><div class='del'>-		snd_seq_client_unlock(sender);</div><div class='del'>-	if (receiver)</div><div class='del'>-		snd_seq_client_unlock(receiver);</div><div class='add'>+						   subs, SNDRV_SEQ_EVENT_PORT_UNSUBSCRIBED);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* CREATE_QUEUE ioctl() */</div><div class='del'>-static int snd_seq_ioctl_create_queue(struct snd_seq_client *client,</div><div class='del'>-				      void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_create_queue(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_info info;</div><div class='del'>-	int result;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	result = snd_seq_queue_alloc(client-&gt;number, info.locked, info.flags);</div><div class='del'>-	if (result &lt; 0)</div><div class='del'>-		return result;</div><div class='add'>+	struct snd_seq_queue_info *info = arg;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='del'>-	q = queueptr(result);</div><div class='del'>-	if (q == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	q = snd_seq_queue_alloc(client-&gt;number, info-&gt;locked, info-&gt;flags);</div><div class='add'>+	if (IS_ERR(q))</div><div class='add'>+		return PTR_ERR(q);</div><div class='ctx'> </div><div class='del'>-	info.queue = q-&gt;queue;</div><div class='del'>-	info.locked = q-&gt;locked;</div><div class='del'>-	info.owner = q-&gt;owner;</div><div class='add'>+	info-&gt;queue = q-&gt;queue;</div><div class='add'>+	info-&gt;locked = q-&gt;locked;</div><div class='add'>+	info-&gt;owner = q-&gt;owner;</div><div class='ctx'> </div><div class='ctx'> 	/* set queue name */</div><div class='del'>-	if (! info.name[0])</div><div class='del'>-		snprintf(info.name, sizeof(info.name), "Queue-%d", q-&gt;queue);</div><div class='del'>-	strlcpy(q-&gt;name, info.name, sizeof(q-&gt;name));</div><div class='del'>-	queuefree(q);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!info-&gt;name[0])</div><div class='add'>+		snprintf(info-&gt;name, sizeof(info-&gt;name), "Queue-%d", q-&gt;queue);</div><div class='add'>+	strscpy(q-&gt;name, info-&gt;name, sizeof(q-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* DELETE_QUEUE ioctl() */</div><div class='del'>-static int snd_seq_ioctl_delete_queue(struct snd_seq_client *client,</div><div class='del'>-				      void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_delete_queue(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_info info;</div><div class='add'>+	struct snd_seq_queue_info *info = arg;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return snd_seq_queue_delete(client-&gt;number, info.queue);</div><div class='add'>+	return snd_seq_queue_delete(client-&gt;number, info-&gt;queue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* GET_QUEUE_INFO ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_queue_info(struct snd_seq_client *client,</div><div class='del'>-					void __user *arg)</div><div class='add'>+					void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_info info;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_queue_info *info = arg;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='del'>-	q = queueptr(info.queue);</div><div class='add'>+	q = queueptr(info-&gt;queue);</div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.queue = q-&gt;queue;</div><div class='del'>-	info.owner = q-&gt;owner;</div><div class='del'>-	info.locked = q-&gt;locked;</div><div class='del'>-	strlcpy(info.name, q-&gt;name, sizeof(info.name));</div><div class='del'>-	queuefree(q);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+	info-&gt;queue = q-&gt;queue;</div><div class='add'>+	info-&gt;owner = q-&gt;owner;</div><div class='add'>+	info-&gt;locked = q-&gt;locked;</div><div class='add'>+	strscpy(info-&gt;name, q-&gt;name, sizeof(info-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SET_QUEUE_INFO ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client,</div><div class='del'>-					void __user *arg)</div><div class='add'>+					void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_info info;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_queue_info *info = arg;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (info.owner != client-&gt;number)</div><div class='add'>+	if (info-&gt;owner != client-&gt;number)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* change owner/locked permission */</div><div class='del'>-	if (snd_seq_queue_check_access(info.queue, client-&gt;number)) {</div><div class='del'>-		if (snd_seq_queue_set_owner(info.queue, client-&gt;number, info.locked) &lt; 0)</div><div class='add'>+	if (snd_seq_queue_check_access(info-&gt;queue, client-&gt;number)) {</div><div class='add'>+		if (snd_seq_queue_set_owner(info-&gt;queue, client-&gt;number, info-&gt;locked) &lt; 0)</div><div class='ctx'> 			return -EPERM;</div><div class='del'>-		if (info.locked)</div><div class='del'>-			snd_seq_queue_use(info.queue, client-&gt;number, 1);</div><div class='add'>+		if (info-&gt;locked)</div><div class='add'>+			snd_seq_queue_use(info-&gt;queue, client-&gt;number, 1);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}	</div><div class='ctx'> </div><div class='del'>-	q = queueptr(info.queue);</div><div class='add'>+	q = queueptr(info-&gt;queue);</div><div class='ctx'> 	if (! q)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (q-&gt;owner != client-&gt;number) {</div><div class='del'>-		queuefree(q);</div><div class='add'>+	if (q-&gt;owner != client-&gt;number)</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	}</div><div class='del'>-	strlcpy(q-&gt;name, info.name, sizeof(q-&gt;name));</div><div class='del'>-	queuefree(q);</div><div class='add'>+	strscpy(q-&gt;name, info-&gt;name, sizeof(q-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* GET_NAMED_QUEUE ioctl() */</div><div class='del'>-static int snd_seq_ioctl_get_named_queue(struct snd_seq_client *client, void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_get_named_queue(struct snd_seq_client *client,</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_info info;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='add'>+	struct snd_seq_queue_info *info = arg;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	q = snd_seq_queue_find_name(info.name);</div><div class='add'>+	q = snd_seq_queue_find_name(info-&gt;name);</div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	info.queue = q-&gt;queue;</div><div class='del'>-	info.owner = q-&gt;owner;</div><div class='del'>-	info.locked = q-&gt;locked;</div><div class='del'>-	queuefree(q);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	info-&gt;queue = q-&gt;queue;</div><div class='add'>+	info-&gt;owner = q-&gt;owner;</div><div class='add'>+	info-&gt;locked = q-&gt;locked;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* GET_QUEUE_STATUS ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_queue_status(struct snd_seq_client *client,</div><div class='del'>-					  void __user *arg)</div><div class='add'>+					  void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_status status;</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='add'>+	struct snd_seq_queue_status *status = arg;</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;status, arg, sizeof(status)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	queue = queueptr(status.queue);</div><div class='add'>+	queue = queueptr(status-&gt;queue);</div><div class='ctx'> 	if (queue == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-	status.queue = queue-&gt;queue;</div><div class='add'>+	memset(status, 0, sizeof(*status));</div><div class='add'>+	status-&gt;queue = queue-&gt;queue;</div><div class='ctx'> 	</div><div class='ctx'> 	tmr = queue-&gt;timer;</div><div class='del'>-	status.events = queue-&gt;tickq-&gt;cells + queue-&gt;timeq-&gt;cells;</div><div class='add'>+	status-&gt;events = queue-&gt;tickq-&gt;cells + queue-&gt;timeq-&gt;cells;</div><div class='ctx'> </div><div class='del'>-	status.time = snd_seq_timer_get_cur_time(tmr);</div><div class='del'>-	status.tick = snd_seq_timer_get_cur_tick(tmr);</div><div class='add'>+	status-&gt;time = snd_seq_timer_get_cur_time(tmr, true);</div><div class='add'>+	status-&gt;tick = snd_seq_timer_get_cur_tick(tmr);</div><div class='ctx'> </div><div class='del'>-	status.running = tmr-&gt;running;</div><div class='add'>+	status-&gt;running = tmr-&gt;running;</div><div class='ctx'> </div><div class='del'>-	status.flags = queue-&gt;flags;</div><div class='del'>-	queuefree(queue);</div><div class='add'>+	status-&gt;flags = queue-&gt;flags;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(arg, &amp;status, sizeof(status)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* GET_QUEUE_TEMPO ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_queue_tempo(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_tempo tempo;</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='add'>+	struct snd_seq_queue_tempo *tempo = arg;</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;tempo, arg, sizeof(tempo)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	queue = queueptr(tempo.queue);</div><div class='add'>+	queue = queueptr(tempo-&gt;queue);</div><div class='ctx'> 	if (queue == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	memset(&amp;tempo, 0, sizeof(tempo));</div><div class='del'>-	tempo.queue = queue-&gt;queue;</div><div class='add'>+	memset(tempo, 0, sizeof(*tempo));</div><div class='add'>+	tempo-&gt;queue = queue-&gt;queue;</div><div class='ctx'> 	</div><div class='ctx'> 	tmr = queue-&gt;timer;</div><div class='ctx'> </div><div class='del'>-	tempo.tempo = tmr-&gt;tempo;</div><div class='del'>-	tempo.ppq = tmr-&gt;ppq;</div><div class='del'>-	tempo.skew_value = tmr-&gt;skew;</div><div class='del'>-	tempo.skew_base = tmr-&gt;skew_base;</div><div class='del'>-	queuefree(queue);</div><div class='add'>+	tempo-&gt;tempo = tmr-&gt;tempo;</div><div class='add'>+	tempo-&gt;ppq = tmr-&gt;ppq;</div><div class='add'>+	tempo-&gt;skew_value = tmr-&gt;skew;</div><div class='add'>+	tempo-&gt;skew_base = tmr-&gt;skew_base;</div><div class='add'>+	if (client-&gt;user_pversion &gt;= SNDRV_PROTOCOL_VERSION(1, 0, 4))</div><div class='add'>+		tempo-&gt;tempo_base = tmr-&gt;tempo_base;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(arg, &amp;tempo, sizeof(tempo)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1715,94 +1673,74 @@ int snd_seq_set_queue_tempo(int client, struct snd_seq_queue_tempo *tempo)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	return snd_seq_queue_timer_set_tempo(tempo-&gt;queue, client, tempo);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_set_queue_tempo);</div><div class='ctx'> </div><div class='ctx'> static int snd_seq_ioctl_set_queue_tempo(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_queue_tempo *tempo = arg;</div><div class='ctx'> 	int result;</div><div class='del'>-	struct snd_seq_queue_tempo tempo;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;tempo, arg, sizeof(tempo)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	result = snd_seq_set_queue_tempo(client-&gt;number, &amp;tempo);</div><div class='add'>+	if (client-&gt;user_pversion &lt; SNDRV_PROTOCOL_VERSION(1, 0, 4))</div><div class='add'>+		tempo-&gt;tempo_base = 0;</div><div class='add'>+	result = snd_seq_set_queue_tempo(client-&gt;number, tempo);</div><div class='ctx'> 	return result &lt; 0 ? result : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* GET_QUEUE_TIMER ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_queue_timer(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_timer timer;</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='add'>+	struct snd_seq_queue_timer *timer = arg;</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;timer, arg, sizeof(timer)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	queue = queueptr(timer.queue);</div><div class='add'>+	queue = queueptr(timer-&gt;queue);</div><div class='ctx'> 	if (queue == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;queue-&gt;timer_mutex)) {</div><div class='del'>-		queuefree(queue);</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	}</div><div class='add'>+	guard(mutex)(&amp;queue-&gt;timer_mutex);</div><div class='ctx'> 	tmr = queue-&gt;timer;</div><div class='del'>-	memset(&amp;timer, 0, sizeof(timer));</div><div class='del'>-	timer.queue = queue-&gt;queue;</div><div class='add'>+	memset(timer, 0, sizeof(*timer));</div><div class='add'>+	timer-&gt;queue = queue-&gt;queue;</div><div class='ctx'> </div><div class='del'>-	timer.type = tmr-&gt;type;</div><div class='add'>+	timer-&gt;type = tmr-&gt;type;</div><div class='ctx'> 	if (tmr-&gt;type == SNDRV_SEQ_TIMER_ALSA) {</div><div class='del'>-		timer.u.alsa.id = tmr-&gt;alsa_id;</div><div class='del'>-		timer.u.alsa.resolution = tmr-&gt;preferred_resolution;</div><div class='add'>+		timer-&gt;u.alsa.id = tmr-&gt;alsa_id;</div><div class='add'>+		timer-&gt;u.alsa.resolution = tmr-&gt;preferred_resolution;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;queue-&gt;timer_mutex);</div><div class='del'>-	queuefree(queue);</div><div class='ctx'> 	</div><div class='del'>-	if (copy_to_user(arg, &amp;timer, sizeof(timer)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* SET_QUEUE_TIMER ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_set_queue_timer(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_queue_timer *timer = arg;</div><div class='ctx'> 	int result = 0;</div><div class='del'>-	struct snd_seq_queue_timer timer;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;timer, arg, sizeof(timer)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (timer.type != SNDRV_SEQ_TIMER_ALSA)</div><div class='add'>+	if (timer-&gt;type != SNDRV_SEQ_TIMER_ALSA)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (snd_seq_queue_check_access(timer.queue, client-&gt;number)) {</div><div class='del'>-		struct snd_seq_queue *q;</div><div class='add'>+	if (snd_seq_queue_check_access(timer-&gt;queue, client-&gt;number)) {</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> 		struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='del'>-		q = queueptr(timer.queue);</div><div class='add'>+		q = queueptr(timer-&gt;queue);</div><div class='ctx'> 		if (q == NULL)</div><div class='ctx'> 			return -ENXIO;</div><div class='del'>-		if (mutex_lock_interruptible(&amp;q-&gt;timer_mutex)) {</div><div class='del'>-			queuefree(q);</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-		}</div><div class='add'>+		guard(mutex)(&amp;q-&gt;timer_mutex);</div><div class='ctx'> 		tmr = q-&gt;timer;</div><div class='del'>-		snd_seq_queue_timer_close(timer.queue);</div><div class='del'>-		tmr-&gt;type = timer.type;</div><div class='add'>+		snd_seq_queue_timer_close(timer-&gt;queue);</div><div class='add'>+		tmr-&gt;type = timer-&gt;type;</div><div class='ctx'> 		if (tmr-&gt;type == SNDRV_SEQ_TIMER_ALSA) {</div><div class='del'>-			tmr-&gt;alsa_id = timer.u.alsa.id;</div><div class='del'>-			tmr-&gt;preferred_resolution = timer.u.alsa.resolution;</div><div class='add'>+			tmr-&gt;alsa_id = timer-&gt;u.alsa.id;</div><div class='add'>+			tmr-&gt;preferred_resolution = timer-&gt;u.alsa.resolution;</div><div class='ctx'> 		}</div><div class='del'>-		result = snd_seq_queue_timer_open(timer.queue);</div><div class='del'>-		mutex_unlock(&amp;q-&gt;timer_mutex);</div><div class='del'>-		queuefree(q);</div><div class='add'>+		result = snd_seq_queue_timer_open(timer-&gt;queue);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}	</div><div class='hunk'>@@ -1813,38 +1751,30 @@ static int snd_seq_ioctl_set_queue_timer(struct snd_seq_client *client,</div><div class='ctx'> </div><div class='ctx'> /* GET_QUEUE_CLIENT ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_queue_client(struct snd_seq_client *client,</div><div class='del'>-					  void __user *arg)</div><div class='add'>+					  void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue_client info;</div><div class='add'>+	struct snd_seq_queue_client *info = arg;</div><div class='ctx'> 	int used;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	used = snd_seq_queue_is_used(info.queue, client-&gt;number);</div><div class='add'>+	used = snd_seq_queue_is_used(info-&gt;queue, client-&gt;number);</div><div class='ctx'> 	if (used &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	info.used = used;</div><div class='del'>-	info.client = client-&gt;number;</div><div class='add'>+	info-&gt;used = used;</div><div class='add'>+	info-&gt;client = client-&gt;number;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* SET_QUEUE_CLIENT ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_set_queue_client(struct snd_seq_client *client,</div><div class='del'>-					  void __user *arg)</div><div class='add'>+					  void *arg)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_queue_client *info = arg;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct snd_seq_queue_client info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> </div><div class='del'>-	if (info.used &gt;= 0) {</div><div class='del'>-		err = snd_seq_queue_use(info.queue, client-&gt;number, info.used);</div><div class='add'>+	if (info-&gt;used &gt;= 0) {</div><div class='add'>+		err = snd_seq_queue_use(info-&gt;queue, client-&gt;number, info-&gt;used);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1855,77 +1785,71 @@ static int snd_seq_ioctl_set_queue_client(struct snd_seq_client *client,</div><div class='ctx'> </div><div class='ctx'> /* GET_CLIENT_POOL ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_pool info;</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='add'>+	struct snd_seq_client_pool *info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	cptr = snd_seq_client_use_ptr(info.client);</div><div class='add'>+	cptr = client_load_and_use_ptr(info-&gt;client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	info.output_pool = cptr-&gt;pool-&gt;size;</div><div class='del'>-	info.output_room = cptr-&gt;pool-&gt;room;</div><div class='del'>-	info.output_free = info.output_pool;</div><div class='del'>-	info.output_free = snd_seq_unused_cells(cptr-&gt;pool);</div><div class='add'>+	memset(info, 0, sizeof(*info));</div><div class='add'>+	info-&gt;client = cptr-&gt;number;</div><div class='add'>+	info-&gt;output_pool = cptr-&gt;pool-&gt;size;</div><div class='add'>+	info-&gt;output_room = cptr-&gt;pool-&gt;room;</div><div class='add'>+	info-&gt;output_free = info-&gt;output_pool;</div><div class='add'>+	info-&gt;output_free = snd_seq_unused_cells(cptr-&gt;pool);</div><div class='ctx'> 	if (cptr-&gt;type == USER_CLIENT) {</div><div class='del'>-		info.input_pool = cptr-&gt;data.user.fifo_pool_size;</div><div class='del'>-		info.input_free = info.input_pool;</div><div class='del'>-		if (cptr-&gt;data.user.fifo)</div><div class='del'>-			info.input_free = snd_seq_unused_cells(cptr-&gt;data.user.fifo-&gt;pool);</div><div class='add'>+		info-&gt;input_pool = cptr-&gt;data.user.fifo_pool_size;</div><div class='add'>+		info-&gt;input_free = info-&gt;input_pool;</div><div class='add'>+		info-&gt;input_free = snd_seq_fifo_unused_cells(cptr-&gt;data.user.fifo);</div><div class='ctx'> 	} else {</div><div class='del'>-		info.input_pool = 0;</div><div class='del'>-		info.input_free = 0;</div><div class='add'>+		info-&gt;input_pool = 0;</div><div class='add'>+		info-&gt;input_free = 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='ctx'> 	</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* SET_CLIENT_POOL ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_pool info;</div><div class='add'>+	struct snd_seq_client_pool *info = arg;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (client-&gt;number != info.client)</div><div class='add'>+	if (client-&gt;number != info-&gt;client)</div><div class='ctx'> 		return -EINVAL; /* can't change other clients */</div><div class='ctx'> </div><div class='del'>-	if (info.output_pool &gt;= 1 &amp;&amp; info.output_pool &lt;= SNDRV_SEQ_MAX_EVENTS &amp;&amp;</div><div class='add'>+	if (info-&gt;output_pool &gt;= 1 &amp;&amp; info-&gt;output_pool &lt;= SNDRV_SEQ_MAX_EVENTS &amp;&amp;</div><div class='ctx'> 	    (! snd_seq_write_pool_allocated(client) ||</div><div class='del'>-	     info.output_pool != client-&gt;pool-&gt;size)) {</div><div class='add'>+	     info-&gt;output_pool != client-&gt;pool-&gt;size)) {</div><div class='ctx'> 		if (snd_seq_write_pool_allocated(client)) {</div><div class='add'>+			/* is the pool in use? */</div><div class='add'>+			if (atomic_read(&amp;client-&gt;pool-&gt;counter))</div><div class='add'>+				return -EBUSY;</div><div class='ctx'> 			/* remove all existing cells */</div><div class='del'>-			snd_seq_queue_client_leave_cells(client-&gt;number);</div><div class='add'>+			snd_seq_pool_mark_closing(client-&gt;pool);</div><div class='ctx'> 			snd_seq_pool_done(client-&gt;pool);</div><div class='ctx'> 		}</div><div class='del'>-		client-&gt;pool-&gt;size = info.output_pool;</div><div class='add'>+		client-&gt;pool-&gt;size = info-&gt;output_pool;</div><div class='ctx'> 		rc = snd_seq_pool_init(client-&gt;pool);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (client-&gt;type == USER_CLIENT &amp;&amp; client-&gt;data.user.fifo != NULL &amp;&amp;</div><div class='del'>-	    info.input_pool &gt;= 1 &amp;&amp;</div><div class='del'>-	    info.input_pool &lt;= SNDRV_SEQ_MAX_CLIENT_EVENTS &amp;&amp;</div><div class='del'>-	    info.input_pool != client-&gt;data.user.fifo_pool_size) {</div><div class='add'>+	    info-&gt;input_pool &gt;= 1 &amp;&amp;</div><div class='add'>+	    info-&gt;input_pool &lt;= SNDRV_SEQ_MAX_CLIENT_EVENTS &amp;&amp;</div><div class='add'>+	    info-&gt;input_pool != client-&gt;data.user.fifo_pool_size) {</div><div class='ctx'> 		/* change pool size */</div><div class='del'>-		rc = snd_seq_fifo_resize(client-&gt;data.user.fifo, info.input_pool);</div><div class='add'>+		rc = snd_seq_fifo_resize(client-&gt;data.user.fifo, info-&gt;input_pool);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='del'>-		client-&gt;data.user.fifo_pool_size = info.input_pool;</div><div class='add'>+		client-&gt;data.user.fifo_pool_size = info-&gt;input_pool;</div><div class='ctx'> 	}</div><div class='del'>-	if (info.output_room &gt;= 1 &amp;&amp;</div><div class='del'>-	    info.output_room &lt;= client-&gt;pool-&gt;size) {</div><div class='del'>-		client-&gt;pool-&gt;room  = info.output_room;</div><div class='add'>+	if (info-&gt;output_room &gt;= 1 &amp;&amp;</div><div class='add'>+	    info-&gt;output_room &lt;= client-&gt;pool-&gt;size) {</div><div class='add'>+		client-&gt;pool-&gt;room  = info-&gt;output_room;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return snd_seq_ioctl_get_client_pool(client, arg);</div><div class='hunk'>@@ -1934,27 +1858,24 @@ static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client,</div><div class='ctx'> </div><div class='ctx'> /* REMOVE_EVENTS ioctl() */</div><div class='ctx'> static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,</div><div class='del'>-				       void __user *arg)</div><div class='add'>+				       void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_remove_events info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_remove_events *info = arg;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Input mostly not implemented XXX.</div><div class='ctx'> 	 */</div><div class='del'>-	if (info.remove_mode &amp; SNDRV_SEQ_REMOVE_INPUT) {</div><div class='add'>+	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_INPUT) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * No restrictions so for a user client we can clear</div><div class='ctx'> 		 * the whole fifo</div><div class='ctx'> 		 */</div><div class='del'>-		if (client-&gt;type == USER_CLIENT)</div><div class='add'>+		if (client-&gt;type == USER_CLIENT &amp;&amp; client-&gt;data.user.fifo)</div><div class='ctx'> 			snd_seq_fifo_clear(client-&gt;data.user.fifo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (info.remove_mode &amp; SNDRV_SEQ_REMOVE_OUTPUT)</div><div class='del'>-		snd_seq_queue_remove_cells(client-&gt;number, &amp;info);</div><div class='add'>+	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_OUTPUT)</div><div class='add'>+		snd_seq_queue_remove_cells(client-&gt;number, info);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1964,65 +1885,42 @@ static int snd_seq_ioctl_remove_events(struct snd_seq_client *client,</div><div class='ctx'>  * get subscription info</div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,</div><div class='del'>-					  void __user *arg)</div><div class='add'>+					  void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='del'>-	struct snd_seq_client *sender = NULL;</div><div class='del'>-	struct snd_seq_client_port *sport = NULL;</div><div class='del'>-	struct snd_seq_port_subscribe subs;</div><div class='del'>-	struct snd_seq_subscribers *p;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;subs, arg, sizeof(subs)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_port_subscribe *subs = arg;</div><div class='add'>+	struct snd_seq_client *sender __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *sport __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-	result = -EINVAL;</div><div class='del'>-	if ((sender = snd_seq_client_use_ptr(subs.sender.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((sport = snd_seq_port_use_ptr(sender, subs.sender.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	p = snd_seq_port_get_subscription(&amp;sport-&gt;c_src, &amp;subs.dest);</div><div class='del'>-	if (p) {</div><div class='del'>-		result = 0;</div><div class='del'>-		subs = p-&gt;info;</div><div class='del'>-	} else</div><div class='del'>-		result = -ENOENT;</div><div class='del'>-</div><div class='del'>-      __end:</div><div class='del'>-      	if (sport)</div><div class='del'>-		snd_seq_port_unlock(sport);</div><div class='del'>-	if (sender)</div><div class='del'>-		snd_seq_client_unlock(sender);</div><div class='del'>-	if (result &gt;= 0) {</div><div class='del'>-		if (copy_to_user(arg, &amp;subs, sizeof(subs)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='add'>+	sender = client_load_and_use_ptr(subs-&gt;sender.client);</div><div class='add'>+	if (!sender)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	sport = snd_seq_port_use_ptr(sender, subs-&gt;sender.port);</div><div class='add'>+	if (!sport)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return snd_seq_port_get_subscription(&amp;sport-&gt;c_src, &amp;subs-&gt;dest, subs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * get subscription info - check only its presence</div><div class='ctx'>  */</div><div class='del'>-static int snd_seq_ioctl_query_subs(struct snd_seq_client *client,</div><div class='del'>-				    void __user *arg)</div><div class='add'>+static int snd_seq_ioctl_query_subs(struct snd_seq_client *client, void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result = -ENXIO;</div><div class='del'>-	struct snd_seq_client *cptr = NULL;</div><div class='del'>-	struct snd_seq_client_port *port = NULL;</div><div class='del'>-	struct snd_seq_query_subs subs;</div><div class='add'>+	struct snd_seq_query_subs *subs = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *port __free(snd_seq_port) = NULL;</div><div class='ctx'> 	struct snd_seq_port_subs_info *group;</div><div class='ctx'> 	struct list_head *p;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;subs, arg, sizeof(subs)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if ((cptr = snd_seq_client_use_ptr(subs.root.client)) == NULL)</div><div class='del'>-		goto __end;</div><div class='del'>-	if ((port = snd_seq_port_use_ptr(cptr, subs.root.port)) == NULL)</div><div class='del'>-		goto __end;</div><div class='add'>+	cptr = client_load_and_use_ptr(subs-&gt;root.client);</div><div class='add'>+	if (!cptr)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	port = snd_seq_port_use_ptr(cptr, subs-&gt;root.port);</div><div class='add'>+	if (!port)</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	switch (subs.type) {</div><div class='add'>+	switch (subs-&gt;type) {</div><div class='ctx'> 	case SNDRV_SEQ_QUERY_SUBS_READ:</div><div class='ctx'> 		group = &amp;port-&gt;c_src;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2030,43 +1928,31 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client,</div><div class='ctx'> 		group = &amp;port-&gt;c_dest;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		goto __end;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;group-&gt;list_mutex);</div><div class='add'>+	guard(rwsem_read)(&amp;group-&gt;list_mutex);</div><div class='ctx'> 	/* search for the subscriber */</div><div class='del'>-	subs.num_subs = group-&gt;count;</div><div class='add'>+	subs-&gt;num_subs = group-&gt;count;</div><div class='ctx'> 	i = 0;</div><div class='del'>-	result = -ENOENT;</div><div class='ctx'> 	list_for_each(p, &amp;group-&gt;list_head) {</div><div class='del'>-		if (i++ == subs.index) {</div><div class='add'>+		if (i++ == subs-&gt;index) {</div><div class='ctx'> 			/* found! */</div><div class='ctx'> 			struct snd_seq_subscribers *s;</div><div class='del'>-			if (subs.type == SNDRV_SEQ_QUERY_SUBS_READ) {</div><div class='add'>+			if (subs-&gt;type == SNDRV_SEQ_QUERY_SUBS_READ) {</div><div class='ctx'> 				s = list_entry(p, struct snd_seq_subscribers, src_list);</div><div class='del'>-				subs.addr = s-&gt;info.dest;</div><div class='add'>+				subs-&gt;addr = s-&gt;info.dest;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				s = list_entry(p, struct snd_seq_subscribers, dest_list);</div><div class='del'>-				subs.addr = s-&gt;info.sender;</div><div class='add'>+				subs-&gt;addr = s-&gt;info.sender;</div><div class='ctx'> 			}</div><div class='del'>-			subs.flags = s-&gt;info.flags;</div><div class='del'>-			subs.queue = s-&gt;info.queue;</div><div class='del'>-			result = 0;</div><div class='del'>-			break;</div><div class='add'>+			subs-&gt;flags = s-&gt;info.flags;</div><div class='add'>+			subs-&gt;queue = s-&gt;info.queue;</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;group-&gt;list_mutex);</div><div class='ctx'> </div><div class='del'>-      __end:</div><div class='del'>-   	if (port)</div><div class='del'>-		snd_seq_port_unlock(port);</div><div class='del'>-	if (cptr)</div><div class='del'>-		snd_seq_client_unlock(cptr);</div><div class='del'>-	if (result &gt;= 0) {</div><div class='del'>-		if (copy_to_user(arg, &amp;subs, sizeof(subs)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2074,75 +1960,199 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client,</div><div class='ctx'>  * query next client</div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_ioctl_query_next_client(struct snd_seq_client *client,</div><div class='del'>-					   void __user *arg)</div><div class='add'>+					   void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr = NULL;</div><div class='del'>-	struct snd_seq_client_info info;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	struct snd_seq_client_info *info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* search for next client */</div><div class='del'>-	info.client++;</div><div class='del'>-	if (info.client &lt; 0)</div><div class='del'>-		info.client = 0;</div><div class='del'>-	for (; info.client &lt; SNDRV_SEQ_MAX_CLIENTS; info.client++) {</div><div class='del'>-		cptr = snd_seq_client_use_ptr(info.client);</div><div class='del'>-		if (cptr)</div><div class='del'>-			break; /* found */</div><div class='add'>+	if (info-&gt;client &lt; INT_MAX)</div><div class='add'>+		info-&gt;client++;</div><div class='add'>+	if (info-&gt;client &lt; 0)</div><div class='add'>+		info-&gt;client = 0;</div><div class='add'>+	for (; info-&gt;client &lt; SNDRV_SEQ_MAX_CLIENTS; info-&gt;client++) {</div><div class='add'>+		cptr = client_load_and_use_ptr(info-&gt;client);</div><div class='add'>+		if (cptr) {</div><div class='add'>+			get_client_info(cptr, info);</div><div class='add'>+			return 0; /* found */</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	if (cptr == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	get_client_info(cptr, &amp;info);</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* </div><div class='ctx'>  * query next port</div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_ioctl_query_next_port(struct snd_seq_client *client,</div><div class='del'>-					 void __user *arg)</div><div class='add'>+					 void *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	struct snd_seq_client_port *port = NULL;</div><div class='del'>-	struct snd_seq_port_info info;</div><div class='add'>+	struct snd_seq_port_info *info = arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='add'>+	struct snd_seq_client_port *port __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;info, arg, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	cptr = snd_seq_client_use_ptr(info.addr.client);</div><div class='add'>+	cptr = client_load_and_use_ptr(info-&gt;addr.client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> 	/* search for next port */</div><div class='del'>-	info.addr.port++;</div><div class='del'>-	port = snd_seq_port_query_nearest(cptr, &amp;info);</div><div class='del'>-	if (port == NULL) {</div><div class='del'>-		snd_seq_client_unlock(cptr);</div><div class='add'>+	info-&gt;addr.port++;</div><div class='add'>+	port = snd_seq_port_query_nearest(cptr, info);</div><div class='add'>+	if (port == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* get port info */</div><div class='del'>-	info.addr = port-&gt;addr;</div><div class='del'>-	snd_seq_get_port_info(port, &amp;info);</div><div class='del'>-	snd_seq_port_unlock(port);</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='add'>+	info-&gt;addr = port-&gt;addr;</div><div class='add'>+	snd_seq_get_port_info(port, info);</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+#define NUM_UMP_INFOS (SNDRV_UMP_MAX_BLOCKS + 1)</div><div class='add'>+</div><div class='add'>+static void free_ump_info(struct snd_seq_client *client)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!client-&gt;ump_info)</div><div class='add'>+		return;</div><div class='add'>+	for (i = 0; i &lt; NUM_UMP_INFOS; i++)</div><div class='add'>+		kfree(client-&gt;ump_info[i]);</div><div class='add'>+	kfree(client-&gt;ump_info);</div><div class='add'>+	client-&gt;ump_info = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void terminate_ump_info_strings(void *p, int type)</div><div class='add'>+{</div><div class='add'>+	if (type == SNDRV_SEQ_CLIENT_UMP_INFO_ENDPOINT) {</div><div class='add'>+		struct snd_ump_endpoint_info *ep = p;</div><div class='add'>+		ep-&gt;name[sizeof(ep-&gt;name) - 1] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		struct snd_ump_block_info *bp = p;</div><div class='add'>+		bp-&gt;name[sizeof(bp-&gt;name) - 1] = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+static void dump_ump_info(struct snd_info_buffer *buffer,</div><div class='add'>+			  struct snd_seq_client *client)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint_info *ep;</div><div class='add'>+	struct snd_ump_block_info *bp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!client-&gt;ump_info)</div><div class='add'>+		return;</div><div class='add'>+	ep = client-&gt;ump_info[SNDRV_SEQ_CLIENT_UMP_INFO_ENDPOINT];</div><div class='add'>+	if (ep &amp;&amp; *ep-&gt;name)</div><div class='add'>+		snd_iprintf(buffer, "  UMP Endpoint: \"%s\"\n", ep-&gt;name);</div><div class='add'>+	for (i = 0; i &lt; SNDRV_UMP_MAX_BLOCKS; i++) {</div><div class='add'>+		bp = client-&gt;ump_info[i + 1];</div><div class='add'>+		if (bp &amp;&amp; *bp-&gt;name) {</div><div class='add'>+			snd_iprintf(buffer, "  UMP Block %d: \"%s\" [%s]\n",</div><div class='add'>+				    i, bp-&gt;name,</div><div class='add'>+				    bp-&gt;active ? "Active" : "Inactive");</div><div class='add'>+			snd_iprintf(buffer, "    Groups: %d-%d\n",</div><div class='add'>+				    bp-&gt;first_group + 1,</div><div class='add'>+				    bp-&gt;first_group + bp-&gt;num_groups);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* UMP-specific ioctls -- called directly without data copy */</div><div class='add'>+static int snd_seq_ioctl_client_ump_info(struct snd_seq_client *caller,</div><div class='add'>+					 unsigned int cmd,</div><div class='add'>+					 unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_client_ump_info __user *argp =</div><div class='add'>+		(struct snd_seq_client_ump_info __user *)arg;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='add'>+	int client, type, err = 0;</div><div class='add'>+	size_t size;</div><div class='add'>+	void *p;</div><div class='add'>+</div><div class='add'>+	if (get_user(client, &amp;argp-&gt;client) || get_user(type, &amp;argp-&gt;type))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_UMP_INFO &amp;&amp;</div><div class='add'>+	    caller-&gt;number != client)</div><div class='add'>+		return -EPERM;</div><div class='add'>+	if (type &lt; 0 || type &gt;= NUM_UMP_INFOS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (type == SNDRV_SEQ_CLIENT_UMP_INFO_ENDPOINT)</div><div class='add'>+		size = sizeof(struct snd_ump_endpoint_info);</div><div class='add'>+	else</div><div class='add'>+		size = sizeof(struct snd_ump_block_info);</div><div class='add'>+	cptr = client_load_and_use_ptr(client);</div><div class='add'>+	if (!cptr)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;cptr-&gt;ioctl_mutex) {</div><div class='add'>+		if (!cptr-&gt;midi_version) {</div><div class='add'>+			err = -EBADFD;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmd == SNDRV_SEQ_IOCTL_GET_CLIENT_UMP_INFO) {</div><div class='add'>+			if (!cptr-&gt;ump_info)</div><div class='add'>+				p = NULL;</div><div class='add'>+			else</div><div class='add'>+				p = cptr-&gt;ump_info[type];</div><div class='add'>+			if (!p) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (copy_to_user(argp-&gt;info, p, size)) {</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (cptr-&gt;type != USER_CLIENT) {</div><div class='add'>+				err = -EBADFD;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!cptr-&gt;ump_info) {</div><div class='add'>+				cptr-&gt;ump_info = kcalloc(NUM_UMP_INFOS,</div><div class='add'>+							 sizeof(void *), GFP_KERNEL);</div><div class='add'>+				if (!cptr-&gt;ump_info) {</div><div class='add'>+					err = -ENOMEM;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			p = memdup_user(argp-&gt;info, size);</div><div class='add'>+			if (IS_ERR(p)) {</div><div class='add'>+				err = PTR_ERR(p);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			kfree(cptr-&gt;ump_info[type]);</div><div class='add'>+			terminate_ump_info_strings(p, type);</div><div class='add'>+			cptr-&gt;ump_info[type] = p;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (!err &amp;&amp; cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_UMP_INFO) {</div><div class='add'>+		if (type == SNDRV_SEQ_CLIENT_UMP_INFO_ENDPOINT)</div><div class='add'>+			snd_seq_system_ump_notify(client, 0,</div><div class='add'>+						  SNDRV_SEQ_EVENT_UMP_EP_CHANGE,</div><div class='add'>+						  false);</div><div class='add'>+		else</div><div class='add'>+			snd_seq_system_ump_notify(client, type - 1,</div><div class='add'>+						  SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE,</div><div class='add'>+						  false);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* -------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static struct seq_ioctl_table {</div><div class='add'>+static const struct ioctl_handler {</div><div class='ctx'> 	unsigned int cmd;</div><div class='del'>-	int (*func)(struct snd_seq_client *client, void __user * arg);</div><div class='del'>-} ioctl_tables[] = {</div><div class='add'>+	int (*func)(struct snd_seq_client *client, void *arg);</div><div class='add'>+} ioctl_handlers[] = {</div><div class='add'>+	{ SNDRV_SEQ_IOCTL_PVERSION, snd_seq_ioctl_pversion },</div><div class='add'>+	{ SNDRV_SEQ_IOCTL_USER_PVERSION, snd_seq_ioctl_user_pversion },</div><div class='add'>+	{ SNDRV_SEQ_IOCTL_CLIENT_ID, snd_seq_ioctl_client_id },</div><div class='ctx'> 	{ SNDRV_SEQ_IOCTL_SYSTEM_INFO, snd_seq_ioctl_system_info },</div><div class='ctx'> 	{ SNDRV_SEQ_IOCTL_RUNNING_MODE, snd_seq_ioctl_running_mode },</div><div class='ctx'> 	{ SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, snd_seq_ioctl_get_client_info },</div><div class='hunk'>@@ -2175,40 +2185,76 @@ static struct seq_ioctl_table {</div><div class='ctx'> 	{ 0, NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_seq_do_ioctl(struct snd_seq_client *client, unsigned int cmd,</div><div class='del'>-			    void __user *arg)</div><div class='add'>+static long snd_seq_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+			  unsigned long arg)</div><div class='ctx'> {</div><div class='del'>-	struct seq_ioctl_table *p;</div><div class='add'>+	struct snd_seq_client *client = file-&gt;private_data;</div><div class='add'>+	/* To use kernel stack for ioctl data. */</div><div class='add'>+	union {</div><div class='add'>+		int pversion;</div><div class='add'>+		int client_id;</div><div class='add'>+		struct snd_seq_system_info	system_info;</div><div class='add'>+		struct snd_seq_running_info	running_info;</div><div class='add'>+		struct snd_seq_client_info	client_info;</div><div class='add'>+		struct snd_seq_port_info	port_info;</div><div class='add'>+		struct snd_seq_port_subscribe	port_subscribe;</div><div class='add'>+		struct snd_seq_queue_info	queue_info;</div><div class='add'>+		struct snd_seq_queue_status	queue_status;</div><div class='add'>+		struct snd_seq_queue_tempo	tempo;</div><div class='add'>+		struct snd_seq_queue_timer	queue_timer;</div><div class='add'>+		struct snd_seq_queue_client	queue_client;</div><div class='add'>+		struct snd_seq_client_pool	client_pool;</div><div class='add'>+		struct snd_seq_remove_events	remove_events;</div><div class='add'>+		struct snd_seq_query_subs	query_subs;</div><div class='add'>+	} buf;</div><div class='add'>+	const struct ioctl_handler *handler;</div><div class='add'>+	unsigned long size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!client))</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	/* exception - handling large data */</div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case SNDRV_SEQ_IOCTL_PVERSION:</div><div class='del'>-		/* return sequencer version number */</div><div class='del'>-		return put_user(SNDRV_SEQ_VERSION, (int __user *)arg) ? -EFAULT : 0;</div><div class='del'>-	case SNDRV_SEQ_IOCTL_CLIENT_ID:</div><div class='del'>-		/* return the id of this client */</div><div class='del'>-		return put_user(client-&gt;number, (int __user *)arg) ? -EFAULT : 0;</div><div class='add'>+	case SNDRV_SEQ_IOCTL_GET_CLIENT_UMP_INFO:</div><div class='add'>+	case SNDRV_SEQ_IOCTL_SET_CLIENT_UMP_INFO:</div><div class='add'>+		return snd_seq_ioctl_client_ump_info(client, cmd, arg);</div><div class='ctx'> 	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	if (! arg)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	for (p = ioctl_tables; p-&gt;cmd; p++) {</div><div class='del'>-		if (p-&gt;cmd == cmd)</div><div class='del'>-			return p-&gt;func(client, arg);</div><div class='add'>+	for (handler = ioctl_handlers; handler-&gt;cmd &gt; 0; ++handler) {</div><div class='add'>+		if (handler-&gt;cmd == cmd)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n",</div><div class='del'>-		   cmd, _IOC_TYPE(cmd), _IOC_NR(cmd));</div><div class='del'>-	return -ENOTTY;</div><div class='del'>-}</div><div class='add'>+	if (handler-&gt;cmd == 0)</div><div class='add'>+		return -ENOTTY;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;buf, 0, sizeof(buf));</div><div class='ctx'> </div><div class='del'>-static long snd_seq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_client *client = file-&gt;private_data;</div><div class='add'>+	/*</div><div class='add'>+	 * All of ioctl commands for ALSA sequencer get an argument of size</div><div class='add'>+	 * within 13 bits. We can safely pick up the size from the command.</div><div class='add'>+	 */</div><div class='add'>+	size = _IOC_SIZE(handler-&gt;cmd);</div><div class='add'>+	if (handler-&gt;cmd &amp; IOC_IN) {</div><div class='add'>+		if (copy_from_user(&amp;buf, (const void __user *)arg, size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!client))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-		</div><div class='del'>-	return snd_seq_do_ioctl(client, cmd, (void __user *) arg);</div><div class='add'>+	scoped_guard(mutex, &amp;client-&gt;ioctl_mutex) {</div><div class='add'>+		err = handler-&gt;func(client, &amp;buf);</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		/* Some commands includes a bug in 'dir' field. */</div><div class='add'>+		if (handler-&gt;cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||</div><div class='add'>+		    handler-&gt;cmd == SNDRV_SEQ_IOCTL_SET_CLIENT_POOL ||</div><div class='add'>+		    (handler-&gt;cmd &amp; IOC_OUT))</div><div class='add'>+			if (copy_to_user((void __user *)arg, &amp;buf, size))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_COMPAT</div><div class='hunk'>@@ -2235,33 +2281,32 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index,</div><div class='ctx'> 	if (card == NULL &amp;&amp; client_index &gt;= SNDRV_SEQ_GLOBAL_CLIENTS)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;register_mutex))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='ctx'> </div><div class='del'>-	if (card) {</div><div class='del'>-		client_index += SNDRV_SEQ_GLOBAL_CLIENTS</div><div class='del'>-			+ card-&gt;number * SNDRV_SEQ_CLIENTS_PER_CARD;</div><div class='del'>-		if (client_index &gt;= SNDRV_SEQ_DYNAMIC_CLIENTS_BEGIN)</div><div class='del'>-			client_index = -1;</div><div class='del'>-	}</div><div class='add'>+		if (card) {</div><div class='add'>+			client_index += SNDRV_SEQ_GLOBAL_CLIENTS</div><div class='add'>+				+ card-&gt;number * SNDRV_SEQ_CLIENTS_PER_CARD;</div><div class='add'>+			if (client_index &gt;= SNDRV_SEQ_DYNAMIC_CLIENTS_BEGIN)</div><div class='add'>+				client_index = -1;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* empty write queue as default */</div><div class='del'>-	client = seq_create_client1(client_index, 0);</div><div class='del'>-	if (client == NULL) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -EBUSY;	/* failure code */</div><div class='del'>-	}</div><div class='del'>-	usage_alloc(&amp;client_usage, 1);</div><div class='add'>+		/* empty write queue as default */</div><div class='add'>+		client = seq_create_client1(client_index, 0);</div><div class='add'>+		if (client == NULL)</div><div class='add'>+			return -EBUSY;	/* failure code */</div><div class='add'>+		usage_alloc(&amp;client_usage, 1);</div><div class='ctx'> </div><div class='del'>-	client-&gt;accept_input = 1;</div><div class='del'>-	client-&gt;accept_output = 1;</div><div class='add'>+		client-&gt;accept_input = 1;</div><div class='add'>+		client-&gt;accept_output = 1;</div><div class='add'>+		client-&gt;data.kernel.card = card;</div><div class='add'>+		client-&gt;user_pversion = SNDRV_SEQ_VERSION;</div><div class='ctx'> 		</div><div class='del'>-	va_start(args, name_fmt);</div><div class='del'>-	vsnprintf(client-&gt;name, sizeof(client-&gt;name), name_fmt, args);</div><div class='del'>-	va_end(args);</div><div class='add'>+		va_start(args, name_fmt);</div><div class='add'>+		vsnprintf(client-&gt;name, sizeof(client-&gt;name), name_fmt, args);</div><div class='add'>+		va_end(args);</div><div class='ctx'> </div><div class='del'>-	client-&gt;type = KERNEL_CLIENT;</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+		client-&gt;type = KERNEL_CLIENT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* make others aware this new client */</div><div class='ctx'> 	snd_seq_system_client_ev_client_start(client-&gt;number);</div><div class='hunk'>@@ -2269,7 +2314,6 @@ int snd_seq_create_kernel_client(struct snd_card *card, int client_index,</div><div class='ctx'> 	/* return client number to caller */</div><div class='ctx'> 	return client-&gt;number;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_create_kernel_client);</div><div class='ctx'> </div><div class='ctx'> /* exported to kernel modules */</div><div class='hunk'>@@ -2288,26 +2332,27 @@ int snd_seq_delete_kernel_client(int client)</div><div class='ctx'> 	kfree(ptr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_delete_kernel_client);</div><div class='ctx'> </div><div class='del'>-/* skeleton to enqueue event, called from snd_seq_kernel_client_enqueue</div><div class='del'>- * and snd_seq_kernel_client_enqueue_blocking</div><div class='add'>+/*</div><div class='add'>+ * exported, called by kernel clients to enqueue events (w/o blocking)</div><div class='add'>+ *</div><div class='add'>+ * RETURN VALUE: zero if succeed, negative if error</div><div class='ctx'>  */</div><div class='del'>-static int kernel_client_enqueue(int client, struct snd_seq_event *ev,</div><div class='del'>-				 struct file *file, int blocking,</div><div class='del'>-				 int atomic, int hop)</div><div class='add'>+int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev,</div><div class='add'>+				  struct file *file, bool blocking)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	int result;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (ev-&gt;type == SNDRV_SEQ_EVENT_NONE)</div><div class='del'>-		return 0; /* ignore this */</div><div class='del'>-	if (ev-&gt;type == SNDRV_SEQ_EVENT_KERNEL_ERROR)</div><div class='del'>-		return -EINVAL; /* quoted events can't be enqueued */</div><div class='add'>+	if (!snd_seq_ev_is_ump(ev)) {</div><div class='add'>+		if (ev-&gt;type == SNDRV_SEQ_EVENT_NONE)</div><div class='add'>+			return 0; /* ignore this */</div><div class='add'>+		if (ev-&gt;type == SNDRV_SEQ_EVENT_KERNEL_ERROR)</div><div class='add'>+			return -EINVAL; /* quoted events can't be enqueued */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* fill in client number */</div><div class='ctx'> 	ev-&gt;source.client = client;</div><div class='hunk'>@@ -2315,46 +2360,21 @@ static int kernel_client_enqueue(int client, struct snd_seq_event *ev,</div><div class='ctx'> 	if (check_event_type_and_length(ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	cptr = snd_seq_client_use_ptr(client);</div><div class='add'>+	cptr = client_load_and_use_ptr(client);</div><div class='ctx'> 	if (cptr == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	</div><div class='del'>-	if (! cptr-&gt;accept_output)</div><div class='del'>-		result = -EPERM;</div><div class='del'>-	else /* send it */</div><div class='del'>-		result = snd_seq_client_enqueue_event(cptr, ev, file, blocking, atomic, hop);</div><div class='del'>-</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * exported, called by kernel clients to enqueue events (w/o blocking)</div><div class='del'>- *</div><div class='del'>- * RETURN VALUE: zero if succeed, negative if error</div><div class='del'>- */</div><div class='del'>-int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event * ev,</div><div class='del'>-				  int atomic, int hop)</div><div class='del'>-{</div><div class='del'>-	return kernel_client_enqueue(client, ev, NULL, 0, atomic, hop);</div><div class='add'>+	if (!cptr-&gt;accept_output) {</div><div class='add'>+		return -EPERM;</div><div class='add'>+	} else { /* send it */</div><div class='add'>+		guard(mutex)(&amp;cptr-&gt;ioctl_mutex);</div><div class='add'>+		return snd_seq_client_enqueue_event(cptr, ev, file, blocking,</div><div class='add'>+						    false, 0,</div><div class='add'>+						    &amp;cptr-&gt;ioctl_mutex);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_kernel_client_enqueue);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * exported, called by kernel clients to enqueue events (with blocking)</div><div class='del'>- *</div><div class='del'>- * RETURN VALUE: zero if succeed, negative if error</div><div class='del'>- */</div><div class='del'>-int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev,</div><div class='del'>-					   struct file *file,</div><div class='del'>-					   int atomic, int hop)</div><div class='del'>-{</div><div class='del'>-	return kernel_client_enqueue(client, ev, file, 1, atomic, hop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_seq_kernel_client_enqueue_blocking);</div><div class='del'>-</div><div class='ctx'> /* </div><div class='ctx'>  * exported, called by kernel clients to dispatch events directly to other</div><div class='ctx'>  * clients, bypassing the queues.  Event time-stamp will be updated.</div><div class='hunk'>@@ -2365,8 +2385,7 @@ EXPORT_SYMBOL(snd_seq_kernel_client_enqueue_blocking);</div><div class='ctx'> int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event * ev,</div><div class='ctx'> 				   int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client *cptr;</div><div class='del'>-	int result;</div><div class='add'>+	struct snd_seq_client *cptr __free(snd_seq_client) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2383,37 +2402,64 @@ int snd_seq_kernel_client_dispatch(int client, struct snd_seq_event * ev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!cptr-&gt;accept_output)</div><div class='del'>-		result = -EPERM;</div><div class='add'>+		return -EPERM;</div><div class='ctx'> 	else</div><div class='del'>-		result = snd_seq_deliver_event(cptr, ev, atomic, hop);</div><div class='del'>-</div><div class='del'>-	snd_seq_client_unlock(cptr);</div><div class='del'>-	return result;</div><div class='add'>+		return snd_seq_deliver_event(cptr, ev, atomic, hop);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_kernel_client_dispatch);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * exported, called by kernel clients to perform same functions as with</div><div class='del'>- * userland ioctl() </div><div class='add'>+static int call_seq_client_ctl(struct snd_seq_client *client,</div><div class='add'>+			       unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	const struct ioctl_handler *handler;</div><div class='add'>+</div><div class='add'>+	for (handler = ioctl_handlers; handler-&gt;cmd &gt; 0; ++handler) {</div><div class='add'>+		if (handler-&gt;cmd == cmd)</div><div class='add'>+			return handler-&gt;func(client, arg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pr_debug("ALSA: seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n",</div><div class='add'>+		 cmd, _IOC_TYPE(cmd), _IOC_NR(cmd));</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_seq_kernel_client_ctl - operate a command for a client with data in</div><div class='add'>+ *			       kernel space.</div><div class='add'>+ * @clientid:	A numerical ID for a client.</div><div class='add'>+ * @cmd:	An ioctl(2) command for ALSA sequencer operation.</div><div class='add'>+ * @arg:	A pointer to data in kernel space.</div><div class='add'>+ *</div><div class='add'>+ * Against its name, both kernel/application client can be handled by this</div><div class='add'>+ * kernel API. A pointer of 'arg' argument should be in kernel space.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 at success. Negative error code at failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_client *client;</div><div class='del'>-	mm_segment_t fs;</div><div class='del'>-	int result;</div><div class='ctx'> </div><div class='ctx'> 	client = clientptr(clientid);</div><div class='ctx'> 	if (client == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	fs = snd_enter_user();</div><div class='del'>-	result = snd_seq_do_ioctl(client, cmd, (void __user *)arg);</div><div class='del'>-	snd_leave_user(fs);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+	return call_seq_client_ctl(client, cmd, arg);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_kernel_client_ctl);</div><div class='ctx'> </div><div class='add'>+/* a similar like above but taking locks; used only from OSS sequencer layer */</div><div class='add'>+int snd_seq_kernel_client_ioctl(int clientid, unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_client *client __free(snd_seq_client) = NULL;</div><div class='add'>+</div><div class='add'>+	client = client_load_and_use_ptr(clientid);</div><div class='add'>+	if (!client)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	guard(mutex)(&amp;client-&gt;ioctl_mutex);</div><div class='add'>+	return call_seq_client_ctl(client, cmd, arg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_kernel_client_ioctl);</div><div class='add'>+</div><div class='ctx'> /* exported (for OSS emulator) */</div><div class='ctx'> int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table *wait)</div><div class='ctx'> {</div><div class='hunk'>@@ -2423,18 +2469,30 @@ int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table</div><div class='ctx'> 	if (client == NULL)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (! snd_seq_write_pool_allocated(client))</div><div class='del'>-		return 1;</div><div class='ctx'> 	if (snd_seq_pool_poll_wait(client-&gt;pool, file, wait))</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_kernel_client_write_poll);</div><div class='ctx'> </div><div class='add'>+/* get a sequencer client object; for internal use from a kernel client */</div><div class='add'>+struct snd_seq_client *snd_seq_kernel_client_get(int id)</div><div class='add'>+{</div><div class='add'>+	return snd_seq_client_use_ptr(id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_kernel_client_get);</div><div class='add'>+</div><div class='add'>+/* put a sequencer client object; for internal use from a kernel client */</div><div class='add'>+void snd_seq_kernel_client_put(struct snd_seq_client *cptr)</div><div class='add'>+{</div><div class='add'>+	if (cptr)</div><div class='add'>+		snd_seq_client_unref(cptr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_kernel_client_put);</div><div class='add'>+</div><div class='ctx'> /*---------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  /proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -2446,11 +2504,9 @@ static void snd_seq_info_dump_subscribers(struct snd_info_buffer *buffer,</div><div class='ctx'> 	struct snd_seq_subscribers *s;</div><div class='ctx'> 	int count = 0;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;group-&gt;list_mutex);</div><div class='del'>-	if (list_empty(&amp;group-&gt;list_head)) {</div><div class='del'>-		up_read(&amp;group-&gt;list_mutex);</div><div class='add'>+	guard(rwsem_read)(&amp;group-&gt;list_mutex);</div><div class='add'>+	if (list_empty(&amp;group-&gt;list_head))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	snd_iprintf(buffer, msg);</div><div class='ctx'> 	list_for_each(p, &amp;group-&gt;list_head) {</div><div class='ctx'> 		if (is_src)</div><div class='hunk'>@@ -2467,7 +2523,6 @@ static void snd_seq_info_dump_subscribers(struct snd_info_buffer *buffer,</div><div class='ctx'> 		if (group-&gt;exclusive)</div><div class='ctx'> 			snd_iprintf(buffer, "[ex]");</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;group-&gt;list_mutex);</div><div class='ctx'> 	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2477,35 +2532,62 @@ static void snd_seq_info_dump_subscribers(struct snd_info_buffer *buffer,</div><div class='ctx'> </div><div class='ctx'> #define FLAG_PERM_DUPLEX(perm) ((perm) &amp; SNDRV_SEQ_PORT_CAP_DUPLEX ? 'X' : '-')</div><div class='ctx'> </div><div class='add'>+static const char *port_direction_name(unsigned char dir)</div><div class='add'>+{</div><div class='add'>+	static const char *names[4] = {</div><div class='add'>+		"-", "In", "Out", "In/Out"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (dir &gt; SNDRV_SEQ_PORT_DIR_BIDIRECTION)</div><div class='add'>+		return "Invalid";</div><div class='add'>+	return names[dir];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_seq_info_dump_ports(struct snd_info_buffer *buffer,</div><div class='ctx'> 				    struct snd_seq_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_client_port *p;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;client-&gt;ports_mutex);</div><div class='add'>+	guard(mutex)(&amp;client-&gt;ports_mutex);</div><div class='ctx'> 	list_for_each_entry(p, &amp;client-&gt;ports_list_head, list) {</div><div class='del'>-		snd_iprintf(buffer, "  Port %3d : \"%s\" (%c%c%c%c)\n",</div><div class='add'>+		if (p-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_INACTIVE)</div><div class='add'>+			continue;</div><div class='add'>+		snd_iprintf(buffer, "  Port %3d : \"%s\" (%c%c%c%c) [%s]",</div><div class='ctx'> 			    p-&gt;addr.port, p-&gt;name,</div><div class='ctx'> 			    FLAG_PERM_RD(p-&gt;capability),</div><div class='ctx'> 			    FLAG_PERM_WR(p-&gt;capability),</div><div class='ctx'> 			    FLAG_PERM_EX(p-&gt;capability),</div><div class='del'>-			    FLAG_PERM_DUPLEX(p-&gt;capability));</div><div class='add'>+			    FLAG_PERM_DUPLEX(p-&gt;capability),</div><div class='add'>+			    port_direction_name(p-&gt;direction));</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+		if (snd_seq_client_is_midi2(client) &amp;&amp; p-&gt;is_midi1)</div><div class='add'>+			snd_iprintf(buffer, " [MIDI1]");</div><div class='add'>+#endif</div><div class='add'>+		snd_iprintf(buffer, "\n");</div><div class='ctx'> 		snd_seq_info_dump_subscribers(buffer, &amp;p-&gt;c_src, 1, "    Connecting To: ");</div><div class='ctx'> 		snd_seq_info_dump_subscribers(buffer, &amp;p-&gt;c_dest, 0, "    Connected From: ");</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;client-&gt;ports_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void snd_seq_info_pool(struct snd_info_buffer *buffer,</div><div class='del'>-		       struct snd_seq_pool *pool, char *space);</div><div class='add'>+static const char *midi_version_string(unsigned int version)</div><div class='add'>+{</div><div class='add'>+	switch (version) {</div><div class='add'>+	case SNDRV_SEQ_CLIENT_LEGACY_MIDI:</div><div class='add'>+		return "Legacy";</div><div class='add'>+	case SNDRV_SEQ_CLIENT_UMP_MIDI_1_0:</div><div class='add'>+		return "UMP MIDI1";</div><div class='add'>+	case SNDRV_SEQ_CLIENT_UMP_MIDI_2_0:</div><div class='add'>+		return "UMP MIDI2";</div><div class='add'>+	default:</div><div class='add'>+		return "Unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* exported to seq_info.c */</div><div class='ctx'> void snd_seq_info_clients_read(struct snd_info_entry *entry, </div><div class='ctx'> 			       struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int c;</div><div class='del'>-	struct snd_seq_client *client;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer, "Client info\n");</div><div class='ctx'> 	snd_iprintf(buffer, "  cur  clients : %d\n", client_usage.cur);</div><div class='hunk'>@@ -2515,17 +2597,22 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 	/* list the client table */</div><div class='ctx'> 	for (c = 0; c &lt; SNDRV_SEQ_MAX_CLIENTS; c++) {</div><div class='del'>-		client = snd_seq_client_use_ptr(c);</div><div class='add'>+		struct snd_seq_client *client __free(snd_seq_client) = NULL;</div><div class='add'>+</div><div class='add'>+		client = client_load_and_use_ptr(c);</div><div class='ctx'> 		if (client == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (client-&gt;type == NO_CLIENT) {</div><div class='del'>-			snd_seq_client_unlock(client);</div><div class='add'>+		if (client-&gt;type == NO_CLIENT)</div><div class='ctx'> 			continue;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		snd_iprintf(buffer, "Client %3d : \"%s\" [%s]\n",</div><div class='add'>+		guard(mutex)(&amp;client-&gt;ioctl_mutex);</div><div class='add'>+		snd_iprintf(buffer, "Client %3d : \"%s\" [%s %s]\n",</div><div class='ctx'> 			    c, client-&gt;name,</div><div class='del'>-			    client-&gt;type == USER_CLIENT ? "User" : "Kernel");</div><div class='add'>+			    client-&gt;type == USER_CLIENT ? "User" : "Kernel",</div><div class='add'>+			    midi_version_string(client-&gt;midi_version));</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+		dump_ump_info(buffer, client);</div><div class='add'>+#endif</div><div class='ctx'> 		snd_seq_info_dump_ports(buffer, client);</div><div class='ctx'> 		if (snd_seq_write_pool_allocated(client)) {</div><div class='ctx'> 			snd_iprintf(buffer, "  Output pool :\n");</div><div class='hunk'>@@ -2536,10 +2623,9 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,</div><div class='ctx'> 			snd_iprintf(buffer, "  Input pool :\n");</div><div class='ctx'> 			snd_seq_info_pool(buffer, client-&gt;data.user.fifo-&gt;pool, "    ");</div><div class='ctx'> 		}</div><div class='del'>-		snd_seq_client_unlock(client);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> /*---------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='hunk'>@@ -2555,12 +2641,13 @@ static const struct file_operations snd_seq_f_ops =</div><div class='ctx'> 	.write =	snd_seq_write,</div><div class='ctx'> 	.open =		snd_seq_open,</div><div class='ctx'> 	.release =	snd_seq_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.poll =		snd_seq_poll,</div><div class='ctx'> 	.unlocked_ioctl =	snd_seq_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_seq_ioctl_compat,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct device *seq_dev;</div><div class='add'>+</div><div class='ctx'> /* </div><div class='ctx'>  * register sequencer device </div><div class='ctx'>  */</div><div class='hunk'>@@ -2568,17 +2655,20 @@ int __init snd_sequencer_device_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;register_mutex))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='add'>+	err = snd_device_alloc(&amp;seq_dev, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	dev_set_name(seq_dev, "seq");</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_register_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0,</div><div class='del'>-				       &amp;snd_seq_f_ops, NULL, "seq")) &lt; 0) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		err = snd_register_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0,</div><div class='add'>+					  &amp;snd_seq_f_ops, NULL, seq_dev);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		put_device(seq_dev);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2587,7 +2677,8 @@ int __init snd_sequencer_device_init(void)</div><div class='ctx'> /* </div><div class='ctx'>  * unregister sequencer device </div><div class='ctx'>  */</div><div class='del'>-void __exit snd_sequencer_device_done(void)</div><div class='add'>+void snd_sequencer_device_done(void)</div><div class='ctx'> {</div><div class='del'>-	snd_unregister_device(SNDRV_DEVICE_TYPE_SEQUENCER, NULL, 0);</div><div class='add'>+	snd_unregister_device(seq_dev);</div><div class='add'>+	put_device(seq_dev);</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h<br/>index 20f0a725ec7d..ece02c58db70 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_clientmgr.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_clientmgr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_clientmgr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_clientmgr.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Client Manager</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_CLIENTMGR_H</div><div class='ctx'> #define __SND_SEQ_CLIENTMGR_H</div><div class='hunk'>@@ -27,12 +12,12 @@</div><div class='ctx'> #include "seq_ports.h"</div><div class='ctx'> #include "seq_lock.h"</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* client manager */</div><div class='ctx'> </div><div class='ctx'> struct snd_seq_user_client {</div><div class='ctx'> 	struct file *file;	/* file struct of client */</div><div class='ctx'> 	/* ... */</div><div class='add'>+	struct pid *owner;</div><div class='ctx'> 	</div><div class='ctx'> 	/* fifo */</div><div class='ctx'> 	struct snd_seq_fifo *fifo;	/* queue for incoming events */</div><div class='hunk'>@@ -41,6 +26,7 @@ struct snd_seq_user_client {</div><div class='ctx'> </div><div class='ctx'> struct snd_seq_kernel_client {</div><div class='ctx'> 	/* ... */</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -48,10 +34,13 @@ struct snd_seq_client {</div><div class='ctx'> 	snd_seq_client_type_t type;</div><div class='ctx'> 	unsigned int accept_input: 1,</div><div class='ctx'> 		accept_output: 1;</div><div class='add'>+	unsigned int midi_version;</div><div class='add'>+	unsigned int user_pversion;</div><div class='ctx'> 	char name[64];		/* client name */</div><div class='ctx'> 	int number;		/* client number */</div><div class='ctx'> 	unsigned int filter;	/* filter flags */</div><div class='ctx'> 	DECLARE_BITMAP(event_filter, 256);</div><div class='add'>+	unsigned short group_filter;</div><div class='ctx'> 	snd_use_lock_t use_lock;</div><div class='ctx'> 	int event_lost;</div><div class='ctx'> 	/* ports */</div><div class='hunk'>@@ -59,7 +48,9 @@ struct snd_seq_client {</div><div class='ctx'> 	struct list_head ports_list_head;</div><div class='ctx'> 	rwlock_t ports_lock;</div><div class='ctx'> 	struct mutex ports_mutex;</div><div class='add'>+	struct mutex ioctl_mutex;</div><div class='ctx'> 	int convert32;		/* convert 32-&gt;64bit */</div><div class='add'>+	int ump_endpoint_port;</div><div class='ctx'> </div><div class='ctx'> 	/* output pool */</div><div class='ctx'> 	struct snd_seq_pool *pool;		/* memory pool for this client */</div><div class='hunk'>@@ -68,6 +59,9 @@ struct snd_seq_client {</div><div class='ctx'> 		struct snd_seq_user_client user;</div><div class='ctx'> 		struct snd_seq_kernel_client kernel;</div><div class='ctx'> 	} data;</div><div class='add'>+</div><div class='add'>+	/* for UMP */</div><div class='add'>+	void **ump_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* usage statistics */</div><div class='hunk'>@@ -84,20 +78,50 @@ void snd_sequencer_device_done(void);</div><div class='ctx'> /* get locked pointer to client */</div><div class='ctx'> struct snd_seq_client *snd_seq_client_use_ptr(int clientid);</div><div class='ctx'> </div><div class='add'>+static inline struct snd_seq_client *</div><div class='add'>+snd_seq_client_ref(struct snd_seq_client *client)</div><div class='add'>+{</div><div class='add'>+	snd_use_lock_use(&amp;client-&gt;use_lock);</div><div class='add'>+	return client;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* unlock pointer to client */</div><div class='del'>-#define snd_seq_client_unlock(client) snd_use_lock_free(&amp;(client)-&gt;use_lock)</div><div class='add'>+static inline void snd_seq_client_unref(struct snd_seq_client *client)</div><div class='add'>+{</div><div class='add'>+	snd_use_lock_free(&amp;client-&gt;use_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_FREE(snd_seq_client, struct snd_seq_client *, if (!IS_ERR_OR_NULL(_T)) snd_seq_client_unref(_T))</div><div class='ctx'> </div><div class='ctx'> /* dispatch event to client(s) */</div><div class='ctx'> int snd_seq_dispatch_event(struct snd_seq_event_cell *cell, int atomic, int hop);</div><div class='ctx'> </div><div class='del'>-/* exported to other modules */</div><div class='del'>-int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop);</div><div class='del'>-int snd_seq_kernel_client_enqueue_blocking(int client, struct snd_seq_event * ev,</div><div class='del'>-					   struct file *file, int atomic, int hop);</div><div class='ctx'> int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table *wait);</div><div class='ctx'> int snd_seq_client_notify_subscription(int client, int port,</div><div class='ctx'> 				       struct snd_seq_port_subscribe *info, int evtype);</div><div class='ctx'> </div><div class='add'>+int __snd_seq_deliver_single_event(struct snd_seq_client *dest,</div><div class='add'>+				   struct snd_seq_client_port *dest_port,</div><div class='add'>+				   struct snd_seq_event *event,</div><div class='add'>+				   int atomic, int hop);</div><div class='add'>+</div><div class='add'>+/* only for OSS sequencer */</div><div class='add'>+int snd_seq_kernel_client_ioctl(int clientid, unsigned int cmd, void *arg);</div><div class='add'>+</div><div class='ctx'> extern int seq_client_load[15];</div><div class='ctx'> </div><div class='add'>+/* for internal use between kernel sequencer clients */</div><div class='add'>+struct snd_seq_client *snd_seq_kernel_client_get(int client);</div><div class='add'>+void snd_seq_kernel_client_put(struct snd_seq_client *cptr);</div><div class='add'>+</div><div class='add'>+static inline bool snd_seq_client_is_ump(struct snd_seq_client *c)</div><div class='add'>+{</div><div class='add'>+	return c-&gt;midi_version != SNDRV_SEQ_CLIENT_LEGACY_MIDI;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool snd_seq_client_is_midi2(struct snd_seq_client *c)</div><div class='add'>+{</div><div class='add'>+	return c-&gt;midi_version == SNDRV_SEQ_CLIENT_UMP_MIDI_2_0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c<br/>index 81f7c109dc46..643af4c1e838 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_compat.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   32bit -&gt; 64bit ioctl wrapper for sequencer API</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file included from seq.c */</div><div class='hunk'>@@ -45,32 +31,28 @@ struct snd_seq_port_info32 {</div><div class='ctx'> static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned int cmd,</div><div class='ctx'> 					struct snd_seq_port_info32 __user *data32)</div><div class='ctx'> {</div><div class='del'>-	int err = -EFAULT;</div><div class='del'>-	struct snd_seq_port_info *data;</div><div class='del'>-	mm_segment_t fs;</div><div class='add'>+	struct snd_seq_port_info *data __free(kfree) = NULL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	data = memdup_user(data32, sizeof(*data32));</div><div class='del'>-	if (IS_ERR(data))</div><div class='del'>-		return PTR_ERR(data);</div><div class='add'>+	data = kmalloc(sizeof(*data), GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (get_user(data-&gt;flags, &amp;data32-&gt;flags) ||</div><div class='add'>+	if (copy_from_user(data, data32, sizeof(*data32)) ||</div><div class='add'>+	    get_user(data-&gt;flags, &amp;data32-&gt;flags) ||</div><div class='ctx'> 	    get_user(data-&gt;time_queue, &amp;data32-&gt;time_queue))</div><div class='del'>-		goto error;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> 	data-&gt;kernel = NULL;</div><div class='ctx'> </div><div class='del'>-	fs = snd_enter_user();</div><div class='del'>-	err = snd_seq_do_ioctl(client, cmd, data);</div><div class='del'>-	snd_leave_user(fs);</div><div class='add'>+	err = snd_seq_kernel_client_ctl(client-&gt;number, cmd, data);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_to_user(data32, data, sizeof(*data32)) ||</div><div class='ctx'> 	    put_user(data-&gt;flags, &amp;data32-&gt;flags) ||</div><div class='ctx'> 	    put_user(data-&gt;time_queue, &amp;data32-&gt;time_queue))</div><div class='del'>-		err = -EFAULT;</div><div class='add'>+		return -EFAULT;</div><div class='ctx'> </div><div class='del'>- error:</div><div class='del'>-	kfree(data);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -97,10 +79,13 @@ static long snd_seq_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_PVERSION:</div><div class='add'>+	case SNDRV_SEQ_IOCTL_USER_PVERSION:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_CLIENT_ID:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_SYSTEM_INFO:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_GET_CLIENT_INFO:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_SET_CLIENT_INFO:</div><div class='add'>+	case SNDRV_SEQ_IOCTL_GET_CLIENT_UMP_INFO:</div><div class='add'>+	case SNDRV_SEQ_IOCTL_SET_CLIENT_UMP_INFO:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_CREATE_QUEUE:</div><div class='hunk'>@@ -122,7 +107,7 @@ static long snd_seq_ioctl_compat(struct file *file, unsigned int cmd, unsigned l</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT:</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_RUNNING_MODE:</div><div class='del'>-		return snd_seq_do_ioctl(client, cmd, argp);</div><div class='add'>+		return snd_seq_ioctl(file, cmd, arg);</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_CREATE_PORT32:</div><div class='ctx'> 		return snd_seq_call_port_info_ioctl(client, SNDRV_SEQ_IOCTL_CREATE_PORT, argp);</div><div class='ctx'> 	case SNDRV_SEQ_IOCTL_DELETE_PORT32:</div><div class='head'>diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c<br/>deleted file mode 100644<br/>index 1f997675c893..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_device.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_device.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,572 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  ALSA sequencer device management</div><div class='del'>- *  Copyright (c) 1999 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *----------------------------------------------------------------</div><div class='del'>- *</div><div class='del'>- * This device handler separates the card driver module from sequencer</div><div class='del'>- * stuff (sequencer core, synth drivers, etc), so that user can avoid</div><div class='del'>- * to spend unnecessary resources e.g. if he needs only listening to</div><div class='del'>- * MP3s.</div><div class='del'>- *</div><div class='del'>- * The card (or lowlevel) driver creates a sequencer device entry</div><div class='del'>- * via snd_seq_device_new().  This is an entry pointer to communicate</div><div class='del'>- * with the sequencer device "driver", which is involved with the</div><div class='del'>- * actual part to communicate with the sequencer core.</div><div class='del'>- * Each sequencer device entry has an id string and the corresponding</div><div class='del'>- * driver with the same id is loaded when required.  For example,</div><div class='del'>- * lowlevel codes to access emu8000 chip on sbawe card are included in</div><div class='del'>- * emu8000-synth module.  To activate this module, the hardware</div><div class='del'>- * resources like i/o port are passed via snd_seq_device argument.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/seq_device.h&gt;</div><div class='del'>-#include &lt;sound/seq_kernel.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("ALSA sequencer device management");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/* driver state */</div><div class='del'>-#define DRIVER_EMPTY		0</div><div class='del'>-#define DRIVER_LOADED		(1&lt;&lt;0)</div><div class='del'>-#define DRIVER_REQUESTED	(1&lt;&lt;1)</div><div class='del'>-#define DRIVER_LOCKED		(1&lt;&lt;2)</div><div class='del'>-</div><div class='del'>-struct ops_list {</div><div class='del'>-	char id[ID_LEN];	/* driver id */</div><div class='del'>-	int driver;		/* driver state */</div><div class='del'>-	int used;		/* reference counter */</div><div class='del'>-	int argsize;		/* argument size */</div><div class='del'>-</div><div class='del'>-	/* operators */</div><div class='del'>-	struct snd_seq_dev_ops ops;</div><div class='del'>-</div><div class='del'>-	/* registred devices */</div><div class='del'>-	struct list_head dev_list;	/* list of devices */</div><div class='del'>-	int num_devices;	/* number of associated devices */</div><div class='del'>-	int num_init_devices;	/* number of initialized devices */</div><div class='del'>-	struct mutex reg_mutex;</div><div class='del'>-</div><div class='del'>-	struct list_head list;	/* next driver */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(opslist);</div><div class='del'>-static int num_ops;</div><div class='del'>-static DEFINE_MUTEX(ops_mutex);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static struct snd_info_entry *info_entry;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * prototypes</div><div class='del'>- */</div><div class='del'>-static int snd_seq_device_free(struct snd_seq_device *dev);</div><div class='del'>-static int snd_seq_device_dev_free(struct snd_device *device);</div><div class='del'>-static int snd_seq_device_dev_register(struct snd_device *device);</div><div class='del'>-static int snd_seq_device_dev_disconnect(struct snd_device *device);</div><div class='del'>-</div><div class='del'>-static int init_device(struct snd_seq_device *dev, struct ops_list *ops);</div><div class='del'>-static int free_device(struct snd_seq_device *dev, struct ops_list *ops);</div><div class='del'>-static struct ops_list *find_driver(char *id, int create_if_empty);</div><div class='del'>-static struct ops_list *create_driver(char *id);</div><div class='del'>-static void unlock_driver(struct ops_list *ops);</div><div class='del'>-static void remove_drivers(void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * show all drivers and their status</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static void snd_seq_device_info(struct snd_info_entry *entry,</div><div class='del'>-				struct snd_info_buffer *buffer)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	list_for_each_entry(ops, &amp;opslist, list) {</div><div class='del'>-		snd_iprintf(buffer, "snd-%s%s%s%s,%d\n",</div><div class='del'>-				ops-&gt;id,</div><div class='del'>-				ops-&gt;driver &amp; DRIVER_LOADED ? ",loaded" : (ops-&gt;driver == DRIVER_EMPTY ? ",empty" : ""),</div><div class='del'>-				ops-&gt;driver &amp; DRIVER_REQUESTED ? ",requested" : "",</div><div class='del'>-				ops-&gt;driver &amp; DRIVER_LOCKED ? ",locked" : "",</div><div class='del'>-				ops-&gt;num_devices);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>- </div><div class='del'>-/*</div><div class='del'>- * load all registered drivers (called from seq_clientmgr.c)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MODULES</div><div class='del'>-/* avoid auto-loading during module_init() */</div><div class='del'>-static int snd_seq_in_init;</div><div class='del'>-void snd_seq_autoload_lock(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_in_init++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_seq_autoload_unlock(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_in_init--;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void snd_seq_device_load_drivers(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_MODULES</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	/* Calling request_module during module_init()</div><div class='del'>-	 * may cause blocking.</div><div class='del'>-	 */</div><div class='del'>-	if (snd_seq_in_init)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	list_for_each_entry(ops, &amp;opslist, list) {</div><div class='del'>-		if (! (ops-&gt;driver &amp; DRIVER_LOADED) &amp;&amp;</div><div class='del'>-		    ! (ops-&gt;driver &amp; DRIVER_REQUESTED)) {</div><div class='del'>-			ops-&gt;used++;</div><div class='del'>-			mutex_unlock(&amp;ops_mutex);</div><div class='del'>-			ops-&gt;driver |= DRIVER_REQUESTED;</div><div class='del'>-			request_module("snd-%s", ops-&gt;id);</div><div class='del'>-			mutex_lock(&amp;ops_mutex);</div><div class='del'>-			ops-&gt;used--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * register a sequencer device</div><div class='del'>- * card = card info (NULL allowed)</div><div class='del'>- * device = device number (if any)</div><div class='del'>- * id = id of driver</div><div class='del'>- * result = return pointer (NULL allowed if unnecessary)</div><div class='del'>- */</div><div class='del'>-int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize,</div><div class='del'>-		       struct snd_seq_device **result)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_device *dev;</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-	int err;</div><div class='del'>-	static struct snd_device_ops dops = {</div><div class='del'>-		.dev_free = snd_seq_device_dev_free,</div><div class='del'>-		.dev_register = snd_seq_device_dev_register,</div><div class='del'>-		.dev_disconnect = snd_seq_device_dev_disconnect,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (result)</div><div class='del'>-		*result = NULL;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!id))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ops = find_driver(id, 1);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dev = kzalloc(sizeof(*dev)*2 + argsize, GFP_KERNEL);</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		unlock_driver(ops);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set up device info */</div><div class='del'>-	dev-&gt;card = card;</div><div class='del'>-	dev-&gt;device = device;</div><div class='del'>-	strlcpy(dev-&gt;id, id, sizeof(dev-&gt;id));</div><div class='del'>-	dev-&gt;argsize = argsize;</div><div class='del'>-	dev-&gt;status = SNDRV_SEQ_DEVICE_FREE;</div><div class='del'>-</div><div class='del'>-	/* add this device to the list */</div><div class='del'>-	mutex_lock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-	list_add_tail(&amp;dev-&gt;list, &amp;ops-&gt;dev_list);</div><div class='del'>-	ops-&gt;num_devices++;</div><div class='del'>-	mutex_unlock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-	</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_SEQUENCER, dev, &amp;dops)) &lt; 0) {</div><div class='del'>-		snd_seq_device_free(dev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (result)</div><div class='del'>-		*result = dev;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * free the existing device</div><div class='del'>- */</div><div class='del'>-static int snd_seq_device_free(struct snd_seq_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ops = find_driver(dev-&gt;id, 0);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	/* remove the device from the list */</div><div class='del'>-	mutex_lock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-	list_del(&amp;dev-&gt;list);</div><div class='del'>-	ops-&gt;num_devices--;</div><div class='del'>-	mutex_unlock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	free_device(dev, ops);</div><div class='del'>-	if (dev-&gt;private_free)</div><div class='del'>-		dev-&gt;private_free(dev);</div><div class='del'>-	kfree(dev);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_seq_device_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='del'>-	return snd_seq_device_free(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * register the device</div><div class='del'>- */</div><div class='del'>-static int snd_seq_device_dev_register(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	ops = find_driver(dev-&gt;id, 0);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	/* initialize this device if the corresponding driver was</div><div class='del'>-	 * already loaded</div><div class='del'>-	 */</div><div class='del'>-	if (ops-&gt;driver &amp; DRIVER_LOADED)</div><div class='del'>-		init_device(dev, ops);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * disconnect the device</div><div class='del'>- */</div><div class='del'>-static int snd_seq_device_dev_disconnect(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	ops = find_driver(dev-&gt;id, 0);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	free_device(dev, ops);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * register device driver</div><div class='del'>- * id = driver id</div><div class='del'>- * entry = driver operators - duplicated to each instance</div><div class='del'>- */</div><div class='del'>-int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,</div><div class='del'>-				   int argsize)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-	struct snd_seq_device *dev;</div><div class='del'>-</div><div class='del'>-	if (id == NULL || entry == NULL ||</div><div class='del'>-	    entry-&gt;init_device == NULL || entry-&gt;free_device == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	snd_seq_autoload_lock();</div><div class='del'>-	ops = find_driver(id, 1);</div><div class='del'>-	if (ops == NULL) {</div><div class='del'>-		snd_seq_autoload_unlock();</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if (ops-&gt;driver &amp; DRIVER_LOADED) {</div><div class='del'>-		snd_printk(KERN_WARNING "driver_register: driver '%s' already exists\n", id);</div><div class='del'>-		unlock_driver(ops);</div><div class='del'>-		snd_seq_autoload_unlock();</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-	/* copy driver operators */</div><div class='del'>-	ops-&gt;ops = *entry;</div><div class='del'>-	ops-&gt;driver |= DRIVER_LOADED;</div><div class='del'>-	ops-&gt;argsize = argsize;</div><div class='del'>-</div><div class='del'>-	/* initialize existing devices if necessary */</div><div class='del'>-	list_for_each_entry(dev, &amp;ops-&gt;dev_list, list) {</div><div class='del'>-		init_device(dev, ops);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-	snd_seq_autoload_unlock();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * create driver record</div><div class='del'>- */</div><div class='del'>-static struct ops_list * create_driver(char *id)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	ops = kzalloc(sizeof(*ops), GFP_KERNEL);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return ops;</div><div class='del'>-</div><div class='del'>-	/* set up driver entry */</div><div class='del'>-	strlcpy(ops-&gt;id, id, sizeof(ops-&gt;id));</div><div class='del'>-	mutex_init(&amp;ops-&gt;reg_mutex);</div><div class='del'>-	/*</div><div class='del'>-	 * The -&gt;reg_mutex locking rules are per-driver, so we create</div><div class='del'>-	 * separate per-driver lock classes:</div><div class='del'>-	 */</div><div class='del'>-	lockdep_set_class(&amp;ops-&gt;reg_mutex, (struct lock_class_key *)id);</div><div class='del'>-</div><div class='del'>-	ops-&gt;driver = DRIVER_EMPTY;</div><div class='del'>-	INIT_LIST_HEAD(&amp;ops-&gt;dev_list);</div><div class='del'>-	/* lock this instance */</div><div class='del'>-	ops-&gt;used = 1;</div><div class='del'>-</div><div class='del'>-	/* register driver entry */</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	list_add_tail(&amp;ops-&gt;list, &amp;opslist);</div><div class='del'>-	num_ops++;</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-</div><div class='del'>-	return ops;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unregister the specified driver</div><div class='del'>- */</div><div class='del'>-int snd_seq_device_unregister_driver(char *id)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-	struct snd_seq_device *dev;</div><div class='del'>-</div><div class='del'>-	ops = find_driver(id, 0);</div><div class='del'>-	if (ops == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (! (ops-&gt;driver &amp; DRIVER_LOADED) ||</div><div class='del'>-	    (ops-&gt;driver &amp; DRIVER_LOCKED)) {</div><div class='del'>-		snd_printk(KERN_ERR "driver_unregister: cannot unload driver '%s': status=%x\n",</div><div class='del'>-			   id, ops-&gt;driver);</div><div class='del'>-		unlock_driver(ops);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* close and release all devices associated with this driver */</div><div class='del'>-	mutex_lock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-	ops-&gt;driver |= DRIVER_LOCKED; /* do not remove this driver recursively */</div><div class='del'>-	list_for_each_entry(dev, &amp;ops-&gt;dev_list, list) {</div><div class='del'>-		free_device(dev, ops);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ops-&gt;driver = 0;</div><div class='del'>-	if (ops-&gt;num_init_devices &gt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "free_driver: init_devices &gt; 0!! (%d)\n",</div><div class='del'>-			   ops-&gt;num_init_devices);</div><div class='del'>-	mutex_unlock(&amp;ops-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	unlock_driver(ops);</div><div class='del'>-</div><div class='del'>-	/* remove empty driver entries */</div><div class='del'>-	remove_drivers();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * remove empty driver entries</div><div class='del'>- */</div><div class='del'>-static void remove_drivers(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *head;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	head = opslist.next;</div><div class='del'>-	while (head != &amp;opslist) {</div><div class='del'>-		struct ops_list *ops = list_entry(head, struct ops_list, list);</div><div class='del'>-		if (! (ops-&gt;driver &amp; DRIVER_LOADED) &amp;&amp;</div><div class='del'>-		    ops-&gt;used == 0 &amp;&amp; ops-&gt;num_devices == 0) {</div><div class='del'>-			head = head-&gt;next;</div><div class='del'>-			list_del(&amp;ops-&gt;list);</div><div class='del'>-			kfree(ops);</div><div class='del'>-			num_ops--;</div><div class='del'>-		} else</div><div class='del'>-			head = head-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize the device - call init_device operator</div><div class='del'>- */</div><div class='del'>-static int init_device(struct snd_seq_device *dev, struct ops_list *ops)</div><div class='del'>-{</div><div class='del'>-	if (! (ops-&gt;driver &amp; DRIVER_LOADED))</div><div class='del'>-		return 0; /* driver is not loaded yet */</div><div class='del'>-	if (dev-&gt;status != SNDRV_SEQ_DEVICE_FREE)</div><div class='del'>-		return 0; /* already initialized */</div><div class='del'>-	if (ops-&gt;argsize != dev-&gt;argsize) {</div><div class='del'>-		snd_printk(KERN_ERR "incompatible device '%s' for plug-in '%s' (%d %d)\n",</div><div class='del'>-			   dev-&gt;name, ops-&gt;id, ops-&gt;argsize, dev-&gt;argsize);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (ops-&gt;ops.init_device(dev) &gt;= 0) {</div><div class='del'>-		dev-&gt;status = SNDRV_SEQ_DEVICE_REGISTERED;</div><div class='del'>-		ops-&gt;num_init_devices++;</div><div class='del'>-	} else {</div><div class='del'>-		snd_printk(KERN_ERR "init_device failed: %s: %s\n",</div><div class='del'>-			   dev-&gt;name, dev-&gt;id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * release the device - call free_device operator</div><div class='del'>- */</div><div class='del'>-static int free_device(struct snd_seq_device *dev, struct ops_list *ops)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	if (! (ops-&gt;driver &amp; DRIVER_LOADED))</div><div class='del'>-		return 0; /* driver is not loaded yet */</div><div class='del'>-	if (dev-&gt;status != SNDRV_SEQ_DEVICE_REGISTERED)</div><div class='del'>-		return 0; /* not registered */</div><div class='del'>-	if (ops-&gt;argsize != dev-&gt;argsize) {</div><div class='del'>-		snd_printk(KERN_ERR "incompatible device '%s' for plug-in '%s' (%d %d)\n",</div><div class='del'>-			   dev-&gt;name, ops-&gt;id, ops-&gt;argsize, dev-&gt;argsize);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if ((result = ops-&gt;ops.free_device(dev)) &gt;= 0 || result == -ENXIO) {</div><div class='del'>-		dev-&gt;status = SNDRV_SEQ_DEVICE_FREE;</div><div class='del'>-		dev-&gt;driver_data = NULL;</div><div class='del'>-		ops-&gt;num_init_devices--;</div><div class='del'>-	} else {</div><div class='del'>-		snd_printk(KERN_ERR "free_device failed: %s: %s\n",</div><div class='del'>-			   dev-&gt;name, dev-&gt;id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * find the matching driver with given id</div><div class='del'>- */</div><div class='del'>-static struct ops_list * find_driver(char *id, int create_if_empty)</div><div class='del'>-{</div><div class='del'>-	struct ops_list *ops;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	list_for_each_entry(ops, &amp;opslist, list) {</div><div class='del'>-		if (strcmp(ops-&gt;id, id) == 0) {</div><div class='del'>-			ops-&gt;used++;</div><div class='del'>-			mutex_unlock(&amp;ops_mutex);</div><div class='del'>-			return ops;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-	if (create_if_empty)</div><div class='del'>-		return create_driver(id);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unlock_driver(struct ops_list *ops)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;ops_mutex);</div><div class='del'>-	ops-&gt;used--;</div><div class='del'>-	mutex_unlock(&amp;ops_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * module part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_seq_device_init(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	info_entry = snd_info_create_module_entry(THIS_MODULE, "drivers",</div><div class='del'>-						  snd_seq_root);</div><div class='del'>-	if (info_entry == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	info_entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-	info_entry-&gt;c.text.read = snd_seq_device_info;</div><div class='del'>-	if (snd_info_register(info_entry) &lt; 0) {</div><div class='del'>-		snd_info_free_entry(info_entry);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_seq_device_exit(void)</div><div class='del'>-{</div><div class='del'>-	remove_drivers();</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	snd_info_free_entry(info_entry);</div><div class='del'>-#endif</div><div class='del'>-	if (num_ops)</div><div class='del'>-		snd_printk(KERN_ERR "drivers not released (%d)\n", num_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_seq_device_init)</div><div class='del'>-module_exit(alsa_seq_device_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_seq_device_load_drivers);</div><div class='del'>-EXPORT_SYMBOL(snd_seq_device_new);</div><div class='del'>-EXPORT_SYMBOL(snd_seq_device_register_driver);</div><div class='del'>-EXPORT_SYMBOL(snd_seq_device_unregister_driver);</div><div class='del'>-EXPORT_SYMBOL(snd_seq_autoload_lock);</div><div class='del'>-EXPORT_SYMBOL(snd_seq_autoload_unlock);</div><div class='head'>diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c<br/>index f3bdc54b429a..783fc72c2ef6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_dummy.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_dummy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_dummy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_dummy.c</a></div><div class='hunk'>@@ -1,26 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * ALSA sequencer MIDI-through client</div><div class='ctx'>  * Copyright (c) 1999-2000 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include "seq_clientmgr.h"</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -34,23 +20,23 @@</div><div class='ctx'>   are redirected to output port immediately.</div><div class='ctx'>   The routing can be done via aconnect program in alsa-utils.</div><div class='ctx'> </div><div class='del'>-  Each client has a static client number 62 (= SNDRV_SEQ_CLIENT_DUMMY).</div><div class='add'>+  Each client has a static client number 14 (= SNDRV_SEQ_CLIENT_DUMMY).</div><div class='ctx'>   If you want to auto-load this module, you may add the following alias</div><div class='ctx'>   in your /etc/conf.modules file.</div><div class='ctx'> </div><div class='del'>-	alias snd-seq-client-62  snd-seq-dummy</div><div class='add'>+	alias snd-seq-client-14  snd-seq-dummy</div><div class='ctx'> </div><div class='del'>-  The module is loaded on demand for client 62, or /proc/asound/seq/</div><div class='add'>+  The module is loaded on demand for client 14, or /proc/asound/seq/</div><div class='ctx'>   is accessed.  If you don't need this module to be loaded, alias</div><div class='del'>-  snd-seq-client-62 as "off".  This will help modprobe.</div><div class='add'>+  snd-seq-client-14 as "off".  This will help modprobe.</div><div class='ctx'> </div><div class='ctx'>   The number of ports to be created can be specified via the module</div><div class='ctx'>   parameter "ports".  For example, to create four ports, add the</div><div class='del'>-  following option in /etc/modprobe.conf:</div><div class='add'>+  following option in a configuration file under /etc/modprobe.d/:</div><div class='ctx'> </div><div class='ctx'> 	option snd-seq-dummy ports=4</div><div class='ctx'> </div><div class='del'>-  The modle option "duplex=1" enables duplex operation to the port.</div><div class='add'>+  The model option "duplex=1" enables duplex operation to the port.</div><div class='ctx'>   In duplex mode, a pair of ports are created instead of single port,</div><div class='ctx'>   and events are tunneled between pair-ports.  For example, input to</div><div class='ctx'>   port A is sent to output port of another port B and vice versa.</div><div class='hunk'>@@ -65,13 +51,19 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("snd-seq-client-" __stringify(SNDRV_SEQ_CLIENT_DUMMY));</div><div class='ctx'> </div><div class='ctx'> static int ports = 1;</div><div class='del'>-static int duplex;</div><div class='add'>+static bool duplex;</div><div class='ctx'> </div><div class='ctx'> module_param(ports, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ports, "number of ports to be created");</div><div class='ctx'> module_param(duplex, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(duplex, "create DUPLEX ports");</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+static int ump;</div><div class='add'>+module_param(ump, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(ump, "UMP conversion (0: no convert, 1: MIDI 1.0, 2: MIDI 2.0)");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct snd_seq_dummy_port {</div><div class='ctx'> 	int client;</div><div class='ctx'> 	int port;</div><div class='hunk'>@@ -82,36 +74,6 @@ struct snd_seq_dummy_port {</div><div class='ctx'> static int my_client = -1;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * unuse callback - send ALL_SOUNDS_OFF and RESET_CONTROLLERS events</div><div class='del'>- * to subscribers.</div><div class='del'>- * Note: this callback is called only after all subscribers are removed.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-dummy_unuse(void *private_data, struct snd_seq_port_subscribe *info)</div><div class='del'>-{</div><div class='del'>-	struct snd_seq_dummy_port *p;</div><div class='del'>-	int i;</div><div class='del'>-	struct snd_seq_event ev;</div><div class='del'>-</div><div class='del'>-	p = private_data;</div><div class='del'>-	memset(&amp;ev, 0, sizeof(ev));</div><div class='del'>-	if (p-&gt;duplex)</div><div class='del'>-		ev.source.port = p-&gt;connect;</div><div class='del'>-	else</div><div class='del'>-		ev.source.port = p-&gt;port;</div><div class='del'>-	ev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;</div><div class='del'>-	ev.type = SNDRV_SEQ_EVENT_CONTROLLER;</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		ev.data.control.channel = i;</div><div class='del'>-		ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;</div><div class='del'>-		snd_seq_kernel_client_dispatch(p-&gt;client, &amp;ev, 0, 0);</div><div class='del'>-		ev.data.control.param = MIDI_CTL_RESET_CONTROLLERS;</div><div class='del'>-		snd_seq_kernel_client_dispatch(p-&gt;client, &amp;ev, 0, 0);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * event input callback - just redirect events to subscribers</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='hunk'>@@ -153,7 +115,8 @@ create_port(int idx, int type)</div><div class='ctx'> 	struct snd_seq_port_callback pcb;</div><div class='ctx'> 	struct snd_seq_dummy_port *rec;</div><div class='ctx'> </div><div class='del'>-	if ((rec = kzalloc(sizeof(*rec), GFP_KERNEL)) == NULL)</div><div class='add'>+	rec = kzalloc(sizeof(*rec), GFP_KERNEL);</div><div class='add'>+	if (!rec)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	rec-&gt;client = my_client;</div><div class='hunk'>@@ -170,12 +133,12 @@ create_port(int idx, int type)</div><div class='ctx'> 	pinfo.capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;</div><div class='ctx'> 	if (duplex)</div><div class='ctx'> 		pinfo.capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;</div><div class='add'>+	pinfo.direction = SNDRV_SEQ_PORT_DIR_BIDIRECTION;</div><div class='ctx'> 	pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC</div><div class='ctx'> 		| SNDRV_SEQ_PORT_TYPE_SOFTWARE</div><div class='ctx'> 		| SNDRV_SEQ_PORT_TYPE_PORT;</div><div class='ctx'> 	memset(&amp;pcb, 0, sizeof(pcb));</div><div class='ctx'> 	pcb.owner = THIS_MODULE;</div><div class='del'>-	pcb.unuse = dummy_unuse;</div><div class='ctx'> 	pcb.event_input = dummy_input;</div><div class='ctx'> 	pcb.private_free = dummy_free;</div><div class='ctx'> 	pcb.private_data = rec;</div><div class='hunk'>@@ -195,10 +158,13 @@ static int __init</div><div class='ctx'> register_client(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_dummy_port *rec1, *rec2;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	struct snd_seq_client *client;</div><div class='add'>+#endif</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (ports &lt; 1) {</div><div class='del'>-		snd_printk(KERN_ERR "invalid number of ports %d\n", ports);</div><div class='add'>+		pr_err("ALSA: seq_dummy: invalid number of ports %d\n", ports);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -208,6 +174,25 @@ register_client(void)</div><div class='ctx'> 	if (my_client &lt; 0)</div><div class='ctx'> 		return my_client;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	client = snd_seq_kernel_client_get(my_client);</div><div class='add'>+	if (!client)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	switch (ump) {</div><div class='add'>+	case 1:</div><div class='add'>+		client-&gt;midi_version = SNDRV_SEQ_CLIENT_UMP_MIDI_1_0;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		client-&gt;midi_version = SNDRV_SEQ_CLIENT_UMP_MIDI_2_0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* don't convert events but just pass-through */</div><div class='add'>+		client-&gt;filter = SNDRV_SEQ_FILTER_NO_CONVERT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	snd_seq_kernel_client_put(client);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	/* create ports */</div><div class='ctx'> 	for (i = 0; i &lt; ports; i++) {</div><div class='ctx'> 		rec1 = create_port(i, 0);</div><div class='hunk'>@@ -245,11 +230,7 @@ delete_client(void)</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_seq_dummy_init(void)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	snd_seq_autoload_lock();</div><div class='del'>-	err = register_client();</div><div class='del'>-	snd_seq_autoload_unlock();</div><div class='del'>-	return err;</div><div class='add'>+	return register_client();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit alsa_seq_dummy_exit(void)</div><div class='head'>diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c<br/>index 0d75afa786bc..91cce1890111 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_fifo.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_fifo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_fifo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_fifo.c</a></div><div class='hunk'>@@ -1,26 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer FIFO</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "seq_fifo.h"</div><div class='ctx'> #include "seq_lock.h"</div><div class='ctx'> </div><div class='hunk'>@@ -33,10 +20,8 @@ struct snd_seq_fifo *snd_seq_fifo_new(int poolsize)</div><div class='ctx'> 	struct snd_seq_fifo *f;</div><div class='ctx'> </div><div class='ctx'> 	f = kzalloc(sizeof(*f), GFP_KERNEL);</div><div class='del'>-	if (f == NULL) {</div><div class='del'>-		snd_printd("malloc failed for snd_seq_fifo_new() \n");</div><div class='add'>+	if (!f)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	f-&gt;pool = snd_seq_pool_new(poolsize);</div><div class='ctx'> 	if (f-&gt;pool == NULL) {</div><div class='hunk'>@@ -72,6 +57,9 @@ void snd_seq_fifo_delete(struct snd_seq_fifo **fifo)</div><div class='ctx'> 		return;</div><div class='ctx'> 	*fifo = NULL;</div><div class='ctx'> </div><div class='add'>+	if (f-&gt;pool)</div><div class='add'>+		snd_seq_pool_mark_closing(f-&gt;pool);</div><div class='add'>+</div><div class='ctx'> 	snd_seq_fifo_clear(f);</div><div class='ctx'> </div><div class='ctx'> 	/* wake up clients if any */</div><div class='hunk'>@@ -95,18 +83,16 @@ static struct snd_seq_event_cell *fifo_cell_out(struct snd_seq_fifo *f);</div><div class='ctx'> void snd_seq_fifo_clear(struct snd_seq_fifo *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* clear overflow flag */</div><div class='ctx'> 	atomic_set(&amp;f-&gt;overflow, 0);</div><div class='ctx'> </div><div class='ctx'> 	snd_use_lock_sync(&amp;f-&gt;use_lock);</div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;f-&gt;lock);</div><div class='ctx'> 	/* drain the fifo */</div><div class='ctx'> 	while ((cell = fifo_cell_out(f)) != NULL) {</div><div class='ctx'> 		snd_seq_cell_free(cell);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -115,37 +101,34 @@ int snd_seq_fifo_event_in(struct snd_seq_fifo *f,</div><div class='ctx'> 			  struct snd_seq_event *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!f))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	snd_use_lock_use(&amp;f-&gt;use_lock);</div><div class='del'>-	err = snd_seq_event_dup(f-&gt;pool, event, &amp;cell, 1, NULL); /* always non-blocking */</div><div class='add'>+	guard(snd_seq_fifo)(f);</div><div class='add'>+	err = snd_seq_event_dup(f-&gt;pool, event, &amp;cell, 1, NULL, NULL); /* always non-blocking */</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		if (err == -ENOMEM)</div><div class='add'>+		if ((err == -ENOMEM) || (err == -EAGAIN))</div><div class='ctx'> 			atomic_inc(&amp;f-&gt;overflow);</div><div class='del'>-		snd_use_lock_free(&amp;f-&gt;use_lock);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='ctx'> 	/* append new cells to fifo */</div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='del'>-	if (f-&gt;tail != NULL)</div><div class='del'>-		f-&gt;tail-&gt;next = cell;</div><div class='del'>-	f-&gt;tail = cell;</div><div class='del'>-	if (f-&gt;head == NULL)</div><div class='del'>-		f-&gt;head = cell;</div><div class='del'>-	f-&gt;cells++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;f-&gt;lock) {</div><div class='add'>+		if (f-&gt;tail != NULL)</div><div class='add'>+			f-&gt;tail-&gt;next = cell;</div><div class='add'>+		f-&gt;tail = cell;</div><div class='add'>+		if (f-&gt;head == NULL)</div><div class='add'>+			f-&gt;head = cell;</div><div class='add'>+		cell-&gt;next = NULL;</div><div class='add'>+		f-&gt;cells++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* wakeup client */</div><div class='ctx'> 	if (waitqueue_active(&amp;f-&gt;input_sleep))</div><div class='ctx'> 		wake_up(&amp;f-&gt;input_sleep);</div><div class='ctx'> </div><div class='del'>-	snd_use_lock_free(&amp;f-&gt;use_lock);</div><div class='del'>-</div><div class='ctx'> 	return 0; /* success */</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -155,7 +138,8 @@ static struct snd_seq_event_cell *fifo_cell_out(struct snd_seq_fifo *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='ctx'> </div><div class='del'>-	if ((cell = f-&gt;head) != NULL) {</div><div class='add'>+	cell = f-&gt;head;</div><div class='add'>+	if (cell) {</div><div class='ctx'> 		f-&gt;head = cell-&gt;next;</div><div class='ctx'> </div><div class='ctx'> 		/* reset tail if this was the last element */</div><div class='hunk'>@@ -175,7 +159,7 @@ int snd_seq_fifo_cell_out(struct snd_seq_fifo *f,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!f))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -191,9 +175,9 @@ int snd_seq_fifo_cell_out(struct snd_seq_fifo *f,</div><div class='ctx'> 		}</div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		add_wait_queue(&amp;f-&gt;input_sleep, &amp;wait);</div><div class='del'>-		spin_unlock_irq(&amp;f-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> 		schedule();</div><div class='del'>-		spin_lock_irq(&amp;f-&gt;lock);</div><div class='add'>+		spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='ctx'> 		remove_wait_queue(&amp;f-&gt;input_sleep, &amp;wait);</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='hunk'>@@ -210,14 +194,13 @@ int snd_seq_fifo_cell_out(struct snd_seq_fifo *f,</div><div class='ctx'> void snd_seq_fifo_cell_putback(struct snd_seq_fifo *f,</div><div class='ctx'> 			       struct snd_seq_event_cell *cell)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (cell) {</div><div class='del'>-		spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;f-&gt;lock);</div><div class='ctx'> 		cell-&gt;next = f-&gt;head;</div><div class='ctx'> 		f-&gt;head = cell;</div><div class='add'>+		if (!f-&gt;tail)</div><div class='add'>+			f-&gt;tail = cell;</div><div class='ctx'> 		f-&gt;cells++;</div><div class='del'>-		spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -227,13 +210,13 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,</div><div class='ctx'> 			   poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	poll_wait(file, &amp;f-&gt;input_sleep, wait);</div><div class='add'>+	guard(spinlock_irq)(&amp;f-&gt;lock);</div><div class='ctx'> 	return (f-&gt;cells &gt; 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* change the size of pool; all old events are removed */</div><div class='ctx'> int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_pool *newpool, *oldpool;</div><div class='ctx'> 	struct snd_seq_event_cell *cell, *next, *oldhead;</div><div class='ctx'> </div><div class='hunk'>@@ -249,17 +232,21 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='del'>-	/* remember old pool */</div><div class='del'>-	oldpool = f-&gt;pool;</div><div class='del'>-	oldhead = f-&gt;head;</div><div class='del'>-	/* exchange pools */</div><div class='del'>-	f-&gt;pool = newpool;</div><div class='del'>-	f-&gt;head = NULL;</div><div class='del'>-	f-&gt;tail = NULL;</div><div class='del'>-	f-&gt;cells = 0;</div><div class='del'>-	/* NOTE: overflow flag is not cleared */</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;f-&gt;lock) {</div><div class='add'>+		/* remember old pool */</div><div class='add'>+		oldpool = f-&gt;pool;</div><div class='add'>+		oldhead = f-&gt;head;</div><div class='add'>+		/* exchange pools */</div><div class='add'>+		f-&gt;pool = newpool;</div><div class='add'>+		f-&gt;head = NULL;</div><div class='add'>+		f-&gt;tail = NULL;</div><div class='add'>+		f-&gt;cells = 0;</div><div class='add'>+		/* NOTE: overflow flag is not cleared */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* close the old pool and wait until all users are gone */</div><div class='add'>+	snd_seq_pool_mark_closing(oldpool);</div><div class='add'>+	snd_use_lock_sync(&amp;f-&gt;use_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* release cells in old pool */</div><div class='ctx'> 	for (cell = oldhead; cell; cell = next) {</div><div class='hunk'>@@ -270,3 +257,14 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* get the number of unused cells safely */</div><div class='add'>+int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f)</div><div class='add'>+{</div><div class='add'>+	if (!f)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	guard(snd_seq_fifo)(f);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;f-&gt;lock);</div><div class='add'>+	return snd_seq_unused_cells(f-&gt;pool);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/core/seq/seq_fifo.h b/sound/core/seq/seq_fifo.h<br/>index 062c446e7867..4c9c49127746 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_fifo.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_fifo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_fifo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_fifo.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer FIFO</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_FIFO_H</div><div class='ctx'> #define __SND_SEQ_FIFO_H</div><div class='hunk'>@@ -52,6 +37,7 @@ int snd_seq_fifo_event_in(struct snd_seq_fifo *f, struct snd_seq_event *event);</div><div class='ctx'> /* lock fifo from release */</div><div class='ctx'> #define snd_seq_fifo_lock(fifo)		snd_use_lock_use(&amp;(fifo)-&gt;use_lock)</div><div class='ctx'> #define snd_seq_fifo_unlock(fifo)	snd_use_lock_free(&amp;(fifo)-&gt;use_lock)</div><div class='add'>+DEFINE_GUARD(snd_seq_fifo, struct snd_seq_fifo *, snd_seq_fifo_lock(_T), snd_seq_fifo_unlock(_T))</div><div class='ctx'> </div><div class='ctx'> /* get a cell from fifo - fifo should be locked */</div><div class='ctx'> int snd_seq_fifo_cell_out(struct snd_seq_fifo *f, struct snd_seq_event_cell **cellp, int nonblock);</div><div class='hunk'>@@ -68,5 +54,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file, poll_table</div><div class='ctx'> /* resize pool in fifo */</div><div class='ctx'> int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize);</div><div class='ctx'> </div><div class='add'>+/* get the number of unused cells safely */</div><div class='add'>+int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c<br/>index 201f8106ffdd..3e9fce7bead8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_info.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_info.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_info.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_info.c</a></div><div class='hunk'>@@ -1,32 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer /proc interface</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "seq_info.h"</div><div class='ctx'> #include "seq_clientmgr.h"</div><div class='ctx'> #include "seq_timer.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static struct snd_info_entry *queues_entry;</div><div class='ctx'> static struct snd_info_entry *clients_entry;</div><div class='ctx'> static struct snd_info_entry *timer_entry;</div><div class='hunk'>@@ -50,6 +35,13 @@ create_info_entry(char *name, void (*read)(struct snd_info_entry *,</div><div class='ctx'> 	return entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void snd_seq_info_done(void)</div><div class='add'>+{</div><div class='add'>+	snd_info_free_entry(queues_entry);</div><div class='add'>+	snd_info_free_entry(clients_entry);</div><div class='add'>+	snd_info_free_entry(timer_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* create all our /proc entries */</div><div class='ctx'> int __init snd_seq_info_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -58,14 +50,11 @@ int __init snd_seq_info_init(void)</div><div class='ctx'> 	clients_entry = create_info_entry("clients",</div><div class='ctx'> 					  snd_seq_info_clients_read);</div><div class='ctx'> 	timer_entry = create_info_entry("timer", snd_seq_info_timer_read);</div><div class='add'>+	if (!queues_entry || !clients_entry || !timer_entry)</div><div class='add'>+		goto error;</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-int __exit snd_seq_info_done(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(queues_entry);</div><div class='del'>-	snd_info_free_entry(clients_entry);</div><div class='del'>-	snd_info_free_entry(timer_entry);</div><div class='del'>-	return 0;</div><div class='add'>+ error:</div><div class='add'>+	snd_seq_info_done();</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/core/seq/seq_info.h b/sound/core/seq/seq_info.h<br/>index 4892a7f35c08..576cf0522163 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_info.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_info.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_info.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_info.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer /proc info</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_INFO_H</div><div class='ctx'> #define __SND_SEQ_INFO_H</div><div class='hunk'>@@ -29,12 +14,12 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry, struct snd_info_buffe</div><div class='ctx'> void snd_seq_info_queues_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-int snd_seq_info_init( void );</div><div class='del'>-int snd_seq_info_done( void );</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+int snd_seq_info_init(void);</div><div class='add'>+void snd_seq_info_done(void);</div><div class='ctx'> #else</div><div class='ctx'> static inline int snd_seq_info_init(void) { return 0; }</div><div class='del'>-static inline int snd_seq_info_done(void) { return 0; }</div><div class='add'>+static inline void snd_seq_info_done(void) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c<br/>index 54f921edda79..48b4ffb4b76e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_lock.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_lock.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_lock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_lock.c</a></div><div class='hunk'>@@ -1,48 +1,26 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Do sleep inside a spin-lock</div><div class='ctx'>  *  Copyright (c) 1999 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include "seq_lock.h"</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)</div><div class='del'>-</div><div class='ctx'> /* wait until all locks are released */</div><div class='ctx'> void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)</div><div class='ctx'> {</div><div class='del'>-	int max_count = 5 * HZ;</div><div class='add'>+	int warn_count = 5 * HZ;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(lockp) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);</div><div class='add'>+		pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (atomic_read(lockp) &gt; 0) {</div><div class='del'>-		if (max_count == 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		if (warn_count-- == 0)</div><div class='add'>+			pr_warn("ALSA: seq_lock: waiting [%d left] in %s:%d\n", atomic_read(lockp), file, line);</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='del'>-		max_count--;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_use_lock_sync_helper);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/core/seq/seq_lock.h b/sound/core/seq/seq_lock.h<br/>index 54044bc2c9ef..a973860ebcd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_lock.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_lock.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_lock.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_lock.h</a></div><div class='hunk'>@@ -1,10 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SND_SEQ_LOCK_H</div><div class='ctx'> #define __SND_SEQ_LOCK_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)</div><div class='del'>-</div><div class='ctx'> typedef atomic_t snd_use_lock_t;</div><div class='ctx'> </div><div class='ctx'> /* initialize lock */</div><div class='hunk'>@@ -20,14 +19,4 @@ typedef atomic_t snd_use_lock_t;</div><div class='ctx'> void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);</div><div class='ctx'> #define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__)</div><div class='ctx'> </div><div class='del'>-#else /* SMP || CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='del'>-typedef spinlock_t snd_use_lock_t;	/* dummy */</div><div class='del'>-#define snd_use_lock_init(lockp) /**/</div><div class='del'>-#define snd_use_lock_use(lockp) /**/</div><div class='del'>-#define snd_use_lock_free(lockp) /**/</div><div class='del'>-#define snd_use_lock_sync(lockp) /**/</div><div class='del'>-</div><div class='del'>-#endif /* SMP || CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='ctx'> #endif /* __SND_SEQ_LOCK_H */</div><div class='head'>diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c<br/>index 7fb55436287f..ccde0ca3d208 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_memory.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_memory.c</a></div><div class='hunk'>@@ -1,28 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer Memory Manager</div><div class='ctx'>  *  Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *                        Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                2000 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='hunk'>@@ -75,18 +63,26 @@ static int get_var_len(const struct snd_seq_event *event)</div><div class='ctx'> 	return event-&gt;data.ext.len &amp; ~SNDRV_SEQ_EXT_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_seq_dump_var_event(const struct snd_seq_event *event,</div><div class='del'>-			   snd_seq_dump_func_t func, void *private_data)</div><div class='add'>+static int dump_var_event(const struct snd_seq_event *event,</div><div class='add'>+			  snd_seq_dump_func_t func, void *private_data,</div><div class='add'>+			  int offset, int maxlen)</div><div class='ctx'> {</div><div class='ctx'> 	int len, err;</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='ctx'> </div><div class='del'>-	if ((len = get_var_len(event)) &lt;= 0)</div><div class='add'>+	len = get_var_len(event);</div><div class='add'>+	if (len &lt;= 0)</div><div class='ctx'> 		return len;</div><div class='add'>+	if (len &lt;= offset)</div><div class='add'>+		return 0;</div><div class='add'>+	if (maxlen &amp;&amp; len &gt; offset + maxlen)</div><div class='add'>+		len = offset + maxlen;</div><div class='ctx'> </div><div class='ctx'> 	if (event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_USRPTR) {</div><div class='ctx'> 		char buf[32];</div><div class='del'>-		char __user *curptr = (char __user *)event-&gt;data.ext.ptr;</div><div class='add'>+		char __user *curptr = (char __force __user *)event-&gt;data.ext.ptr;</div><div class='add'>+		curptr += offset;</div><div class='add'>+		len -= offset;</div><div class='ctx'> 		while (len &gt; 0) {</div><div class='ctx'> 			int size = sizeof(buf);</div><div class='ctx'> 			if (len &lt; size)</div><div class='hunk'>@@ -100,23 +96,37 @@ int snd_seq_dump_var_event(const struct snd_seq_event *event,</div><div class='ctx'> 			len -= size;</div><div class='ctx'> 		}</div><div class='ctx'> 		return 0;</div><div class='del'>-	} if (! (event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_CHAINED)) {</div><div class='del'>-		return func(private_data, event-&gt;data.ext.ptr, len);</div><div class='ctx'> 	}</div><div class='add'>+	if (!(event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_CHAINED))</div><div class='add'>+		return func(private_data, event-&gt;data.ext.ptr + offset,</div><div class='add'>+			    len - offset);</div><div class='ctx'> </div><div class='ctx'> 	cell = (struct snd_seq_event_cell *)event-&gt;data.ext.ptr;</div><div class='ctx'> 	for (; len &gt; 0 &amp;&amp; cell; cell = cell-&gt;next) {</div><div class='ctx'> 		int size = sizeof(struct snd_seq_event);</div><div class='add'>+		char *curptr = (char *)&amp;cell-&gt;event;</div><div class='add'>+</div><div class='add'>+		if (offset &gt;= size) {</div><div class='add'>+			offset -= size;</div><div class='add'>+			len -= size;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> 		if (len &lt; size)</div><div class='ctx'> 			size = len;</div><div class='del'>-		err = func(private_data, &amp;cell-&gt;event, size);</div><div class='add'>+		err = func(private_data, curptr + offset, size - offset);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+		offset = 0;</div><div class='ctx'> 		len -= size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_seq_dump_var_event(const struct snd_seq_event *event,</div><div class='add'>+			   snd_seq_dump_func_t func, void *private_data)</div><div class='add'>+{</div><div class='add'>+	return dump_var_event(event, func, private_data, 0, 0);</div><div class='add'>+}</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_dump_var_event);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -125,51 +135,89 @@ EXPORT_SYMBOL(snd_seq_dump_var_event);</div><div class='ctx'>  * expand the variable length event to linear buffer space.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int seq_copy_in_kernel(char **bufptr, const void *src, int size)</div><div class='add'>+static int seq_copy_in_kernel(void *ptr, void *src, int size)</div><div class='ctx'> {</div><div class='add'>+	char **bufptr = ptr;</div><div class='add'>+</div><div class='ctx'> 	memcpy(*bufptr, src, size);</div><div class='ctx'> 	*bufptr += size;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seq_copy_in_user(char __user **bufptr, const void *src, int size)</div><div class='add'>+static int seq_copy_in_user(void *ptr, void *src, int size)</div><div class='ctx'> {</div><div class='add'>+	char __user **bufptr = ptr;</div><div class='add'>+</div><div class='ctx'> 	if (copy_to_user(*bufptr, src, size))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	*bufptr += size;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int expand_var_event(const struct snd_seq_event *event,</div><div class='add'>+			    int offset, int size, char *buf, bool in_kernel)</div><div class='add'>+{</div><div class='add'>+	if (event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_USRPTR) {</div><div class='add'>+		if (! in_kernel)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (copy_from_user(buf,</div><div class='add'>+				   (char __force __user *)event-&gt;data.ext.ptr + offset,</div><div class='add'>+				   size))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return dump_var_event(event,</div><div class='add'>+			     in_kernel ? seq_copy_in_kernel : seq_copy_in_user,</div><div class='add'>+			     &amp;buf, offset, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char *buf,</div><div class='ctx'> 			     int in_kernel, int size_aligned)</div><div class='ctx'> {</div><div class='del'>-	int len, newlen;</div><div class='del'>-	int err;</div><div class='add'>+	int len, newlen, err;</div><div class='ctx'> </div><div class='del'>-	if ((len = get_var_len(event)) &lt; 0)</div><div class='add'>+	len = get_var_len(event);</div><div class='add'>+	if (len &lt; 0)</div><div class='ctx'> 		return len;</div><div class='ctx'> 	newlen = len;</div><div class='ctx'> 	if (size_aligned &gt; 0)</div><div class='ctx'> 		newlen = roundup(len, size_aligned);</div><div class='ctx'> 	if (count &lt; newlen)</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;data.ext.len &amp; SNDRV_SEQ_EXT_USRPTR) {</div><div class='del'>-		if (! in_kernel)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (copy_from_user(buf, (void __user *)event-&gt;data.ext.ptr, len))</div><div class='add'>+	err = expand_var_event(event, 0, len, buf, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (len != newlen) {</div><div class='add'>+		if (in_kernel)</div><div class='add'>+			memset(buf + len, 0, newlen - len);</div><div class='add'>+		else if (clear_user((__force void __user *)buf + len,</div><div class='add'>+				    newlen - len))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		return newlen;</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_seq_dump_var_event(event,</div><div class='del'>-				     in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel :</div><div class='del'>-				     (snd_seq_dump_func_t)seq_copy_in_user,</div><div class='del'>-				     &amp;buf);</div><div class='del'>-	return err &lt; 0 ? err : newlen;</div><div class='add'>+	return newlen;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_expand_var_event);</div><div class='ctx'> </div><div class='add'>+int snd_seq_expand_var_event_at(const struct snd_seq_event *event, int count,</div><div class='add'>+				char *buf, int offset)</div><div class='add'>+{</div><div class='add'>+	int len, err;</div><div class='add'>+</div><div class='add'>+	len = get_var_len(event);</div><div class='add'>+	if (len &lt; 0)</div><div class='add'>+		return len;</div><div class='add'>+	if (len &lt;= offset)</div><div class='add'>+		return 0;</div><div class='add'>+	len -= offset;</div><div class='add'>+	if (len &gt; count)</div><div class='add'>+		len = count;</div><div class='add'>+	err = expand_var_event(event, offset, count, buf, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_expand_var_event_at);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * release this cell, free extended data if available</div><div class='ctx'>  */</div><div class='hunk'>@@ -184,7 +232,6 @@ static inline void free_cell(struct snd_seq_pool *pool,</div><div class='ctx'> </div><div class='ctx'> void snd_seq_cell_free(struct snd_seq_event_cell * cell)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_pool *pool;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!cell))</div><div class='hunk'>@@ -193,7 +240,7 @@ void snd_seq_cell_free(struct snd_seq_event_cell * cell)</div><div class='ctx'> 	if (snd_BUG_ON(!pool))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;pool-&gt;lock);</div><div class='ctx'> 	free_cell(pool, cell);</div><div class='ctx'> 	if (snd_seq_ev_is_variable(&amp;cell-&gt;event)) {</div><div class='ctx'> 		if (cell-&gt;event.data.ext.len &amp; SNDRV_SEQ_EXT_CHAINED) {</div><div class='hunk'>@@ -211,7 +258,6 @@ void snd_seq_cell_free(struct snd_seq_event_cell * cell)</div><div class='ctx'> 		if (snd_seq_output_ok(pool))</div><div class='ctx'> 			wake_up(&amp;pool-&gt;output_sleep);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -220,12 +266,13 @@ void snd_seq_cell_free(struct snd_seq_event_cell * cell)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_seq_cell_alloc(struct snd_seq_pool *pool,</div><div class='ctx'> 			      struct snd_seq_event_cell **cellp,</div><div class='del'>-			      int nonblock, struct file *file)</div><div class='add'>+			      int nonblock, struct file *file,</div><div class='add'>+			      struct mutex *mutexp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = -EAGAIN;</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	if (pool == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -235,7 +282,7 @@ static int snd_seq_cell_alloc(struct snd_seq_pool *pool,</div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='ctx'> 	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='ctx'> 	if (pool-&gt;ptr == NULL) {	/* not initialized */</div><div class='del'>-		snd_printd("seq: pool is not initialized\n");</div><div class='add'>+		pr_debug("ALSA: seq: pool is not initialized\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto __error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -243,9 +290,13 @@ static int snd_seq_cell_alloc(struct snd_seq_pool *pool,</div><div class='ctx'> </div><div class='ctx'> 		set_current_state(TASK_INTERRUPTIBLE);</div><div class='ctx'> 		add_wait_queue(&amp;pool-&gt;output_sleep, &amp;wait);</div><div class='del'>-		spin_unlock_irq(&amp;pool-&gt;lock);</div><div class='add'>+		spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='add'>+		if (mutexp)</div><div class='add'>+			mutex_unlock(mutexp);</div><div class='ctx'> 		schedule();</div><div class='del'>-		spin_lock_irq(&amp;pool-&gt;lock);</div><div class='add'>+		if (mutexp)</div><div class='add'>+			mutex_lock(mutexp);</div><div class='add'>+		spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='ctx'> 		remove_wait_queue(&amp;pool-&gt;output_sleep, &amp;wait);</div><div class='ctx'> 		/* interrupted? */</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='hunk'>@@ -287,11 +338,12 @@ __error:</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,</div><div class='ctx'> 		      struct snd_seq_event_cell **cellp, int nonblock,</div><div class='del'>-		      struct file *file)</div><div class='add'>+		      struct file *file, struct mutex *mutexp)</div><div class='ctx'> {</div><div class='ctx'> 	int ncells, err;</div><div class='ctx'> 	unsigned int extlen;</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='add'>+	int size;</div><div class='ctx'> </div><div class='ctx'> 	*cellp = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -299,17 +351,22 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,</div><div class='ctx'> 	extlen = 0;</div><div class='ctx'> 	if (snd_seq_ev_is_variable(event)) {</div><div class='ctx'> 		extlen = event-&gt;data.ext.len &amp; ~SNDRV_SEQ_EXT_MASK;</div><div class='del'>-		ncells = (extlen + sizeof(struct snd_seq_event) - 1) / sizeof(struct snd_seq_event);</div><div class='add'>+		ncells = DIV_ROUND_UP(extlen, sizeof(struct snd_seq_event));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ncells &gt;= pool-&gt;total_elements)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = snd_seq_cell_alloc(pool, &amp;cell, nonblock, file);</div><div class='add'>+	err = snd_seq_cell_alloc(pool, &amp;cell, nonblock, file, mutexp);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* copy the event */</div><div class='del'>-	cell-&gt;event = *event;</div><div class='add'>+	size = snd_seq_event_packet_size(event);</div><div class='add'>+	memcpy(&amp;cell-&gt;ump, event, size);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	if (size &lt; sizeof(cell-&gt;event))</div><div class='add'>+		cell-&gt;ump.raw.extra = 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* decompose */</div><div class='ctx'> 	if (snd_seq_ev_is_variable(event)) {</div><div class='hunk'>@@ -327,10 +384,11 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,</div><div class='ctx'> 		tail = NULL;</div><div class='ctx'> </div><div class='ctx'> 		while (ncells-- &gt; 0) {</div><div class='del'>-			int size = sizeof(struct snd_seq_event);</div><div class='add'>+			size = sizeof(struct snd_seq_event);</div><div class='ctx'> 			if (len &lt; size)</div><div class='ctx'> 				size = len;</div><div class='del'>-			err = snd_seq_cell_alloc(pool, &amp;tmp, nonblock, file);</div><div class='add'>+			err = snd_seq_cell_alloc(pool, &amp;tmp, nonblock, file,</div><div class='add'>+						 mutexp);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto __error;</div><div class='ctx'> 			if (cell-&gt;event.data.ext.ptr == NULL)</div><div class='hunk'>@@ -343,7 +401,7 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,</div><div class='ctx'> 				tmp-&gt;event = src-&gt;event;</div><div class='ctx'> 				src = src-&gt;next;</div><div class='ctx'> 			} else if (is_usrptr) {</div><div class='del'>-				if (copy_from_user(&amp;tmp-&gt;event, (char __user *)buf, size)) {</div><div class='add'>+				if (copy_from_user(&amp;tmp-&gt;event, (char __force __user *)buf, size)) {</div><div class='ctx'> 					err = -EFAULT;</div><div class='ctx'> 					goto __error;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -369,6 +427,7 @@ int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file,</div><div class='ctx'> 			   poll_table *wait)</div><div class='ctx'> {</div><div class='ctx'> 	poll_wait(file, &amp;pool-&gt;output_sleep, wait);</div><div class='add'>+	guard(spinlock_irq)(&amp;pool-&gt;lock);</div><div class='ctx'> 	return snd_seq_output_ok(pool);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -378,21 +437,24 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)</div><div class='ctx'> {</div><div class='ctx'> 	int cell;</div><div class='ctx'> 	struct snd_seq_event_cell *cellptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!pool))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (pool-&gt;ptr)			/* should be atomic? */</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	pool-&gt;ptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool-&gt;size);</div><div class='del'>-	if (pool-&gt;ptr == NULL) {</div><div class='del'>-		snd_printd("seq: malloc for sequencer events failed\n");</div><div class='add'>+	cellptr = kvmalloc_array(pool-&gt;size,</div><div class='add'>+				 sizeof(struct snd_seq_event_cell),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!cellptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* add new cells to the free cell list */</div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;pool-&gt;lock);</div><div class='add'>+	if (pool-&gt;ptr) {</div><div class='add'>+		kvfree(cellptr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pool-&gt;ptr = cellptr;</div><div class='ctx'> 	pool-&gt;free = NULL;</div><div class='ctx'> </div><div class='ctx'> 	for (cell = 0; cell &lt; pool-&gt;size; cell++) {</div><div class='hunk'>@@ -406,50 +468,45 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)</div><div class='ctx'> 	/* init statistics */</div><div class='ctx'> 	pool-&gt;max_used = 0;</div><div class='ctx'> 	pool-&gt;total_elements = pool-&gt;size;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* refuse the further insertion to the pool */</div><div class='add'>+void snd_seq_pool_mark_closing(struct snd_seq_pool *pool)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!pool))</div><div class='add'>+		return;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;pool-&gt;lock);</div><div class='add'>+	pool-&gt;closing = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* remove events */</div><div class='ctx'> int snd_seq_pool_done(struct snd_seq_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_event_cell *ptr;</div><div class='del'>-	int max_count = 5 * HZ;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!pool))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* wait for closing all threads */</div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='del'>-	pool-&gt;closing = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	if (waitqueue_active(&amp;pool-&gt;output_sleep))</div><div class='ctx'> 		wake_up(&amp;pool-&gt;output_sleep);</div><div class='ctx'> </div><div class='del'>-	while (atomic_read(&amp;pool-&gt;counter) &gt; 0) {</div><div class='del'>-		if (max_count == 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&amp;pool-&gt;counter));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	while (atomic_read(&amp;pool-&gt;counter) &gt; 0)</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='del'>-		max_count--;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* release all resources */</div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='del'>-	ptr = pool-&gt;ptr;</div><div class='del'>-	pool-&gt;ptr = NULL;</div><div class='del'>-	pool-&gt;free = NULL;</div><div class='del'>-	pool-&gt;total_elements = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;pool-&gt;lock) {</div><div class='add'>+		ptr = pool-&gt;ptr;</div><div class='add'>+		pool-&gt;ptr = NULL;</div><div class='add'>+		pool-&gt;free = NULL;</div><div class='add'>+		pool-&gt;total_elements = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	vfree(ptr);</div><div class='add'>+	kvfree(ptr);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pool-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;pool-&gt;lock);</div><div class='ctx'> 	pool-&gt;closing = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pool-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -462,10 +519,8 @@ struct snd_seq_pool *snd_seq_pool_new(int poolsize)</div><div class='ctx'> </div><div class='ctx'> 	/* create pool block */</div><div class='ctx'> 	pool = kzalloc(sizeof(*pool), GFP_KERNEL);</div><div class='del'>-	if (pool == NULL) {</div><div class='del'>-		snd_printd("seq: malloc failed for pool\n");</div><div class='add'>+	if (!pool)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;pool-&gt;lock);</div><div class='ctx'> 	pool-&gt;ptr = NULL;</div><div class='ctx'> 	pool-&gt;free = NULL;</div><div class='hunk'>@@ -489,23 +544,12 @@ int snd_seq_pool_delete(struct snd_seq_pool **ppool)</div><div class='ctx'> 	*ppool = NULL;</div><div class='ctx'> 	if (pool == NULL)</div><div class='ctx'> 		return 0;</div><div class='add'>+	snd_seq_pool_mark_closing(pool);</div><div class='ctx'> 	snd_seq_pool_done(pool);</div><div class='ctx'> 	kfree(pool);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* initialize sequencer memory */</div><div class='del'>-int __init snd_sequencer_memory_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* release sequencer memory */</div><div class='del'>-void __exit snd_sequencer_memory_done(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* exported to seq_clientmgr.c */</div><div class='ctx'> void snd_seq_info_pool(struct snd_info_buffer *buffer,</div><div class='ctx'> 		       struct snd_seq_pool *pool, char *space)</div><div class='head'>diff --git a/sound/core/seq/seq_memory.h b/sound/core/seq/seq_memory.h<br/>index 63e91431a29f..7f7a2c0b187d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_memory.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_memory.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_memory.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_memory.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer Memory Manager</div><div class='ctx'>  *  Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_MEMORYMGR_H</div><div class='ctx'> #define __SND_SEQ_MEMORYMGR_H</div><div class='hunk'>@@ -24,9 +9,28 @@</div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> </div><div class='add'>+struct snd_info_buffer;</div><div class='add'>+</div><div class='add'>+/* aliasing for legacy and UMP event packet handling */</div><div class='add'>+union __snd_seq_event {</div><div class='add'>+	struct snd_seq_event legacy;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	struct snd_seq_ump_event ump;</div><div class='add'>+#endif</div><div class='add'>+	struct {</div><div class='add'>+		struct snd_seq_event event;</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+		u32 extra;</div><div class='add'>+#endif</div><div class='add'>+	} __packed raw;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* container for sequencer event (internal use) */</div><div class='ctx'> struct snd_seq_event_cell {</div><div class='del'>-	struct snd_seq_event event;</div><div class='add'>+	union {</div><div class='add'>+		struct snd_seq_event event;</div><div class='add'>+		union __snd_seq_event ump;</div><div class='add'>+	};</div><div class='ctx'> 	struct snd_seq_pool *pool;				/* used pool */</div><div class='ctx'> 	struct snd_seq_event_cell *next;	/* next cell */</div><div class='ctx'> };</div><div class='hunk'>@@ -64,7 +68,8 @@ struct snd_seq_pool {</div><div class='ctx'> void snd_seq_cell_free(struct snd_seq_event_cell *cell);</div><div class='ctx'> </div><div class='ctx'> int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,</div><div class='del'>-		      struct snd_seq_event_cell **cellp, int nonblock, struct file *file);</div><div class='add'>+		      struct snd_seq_event_cell **cellp, int nonblock,</div><div class='add'>+		      struct file *file, struct mutex *mutexp);</div><div class='ctx'> </div><div class='ctx'> /* return number of unused (free) cells */</div><div class='ctx'> static inline int snd_seq_unused_cells(struct snd_seq_pool *pool)</div><div class='hunk'>@@ -82,6 +87,7 @@ static inline int snd_seq_total_cells(struct snd_seq_pool *pool)</div><div class='ctx'> int snd_seq_pool_init(struct snd_seq_pool *pool);</div><div class='ctx'> </div><div class='ctx'> /* done pool - free events */</div><div class='add'>+void snd_seq_pool_mark_closing(struct snd_seq_pool *pool);</div><div class='ctx'> int snd_seq_pool_done(struct snd_seq_pool *pool);</div><div class='ctx'> </div><div class='ctx'> /* create pool */</div><div class='hunk'>@@ -90,14 +96,10 @@ struct snd_seq_pool *snd_seq_pool_new(int poolsize);</div><div class='ctx'> /* remove pool */</div><div class='ctx'> int snd_seq_pool_delete(struct snd_seq_pool **pool);</div><div class='ctx'> </div><div class='del'>-/* init memory */</div><div class='del'>-int snd_sequencer_memory_init(void);</div><div class='del'>-            </div><div class='del'>-/* release event memory */</div><div class='del'>-void snd_sequencer_memory_done(void);</div><div class='del'>-</div><div class='ctx'> /* polling */</div><div class='ctx'> int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file, poll_table *wait);</div><div class='ctx'> </div><div class='add'>+void snd_seq_info_pool(struct snd_info_buffer *buffer,</div><div class='add'>+		       struct snd_seq_pool *pool, char *space);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c<br/>index ebaf1b541dcd..581e138a3115 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_midi.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Generic MIDI synth driver for ALSA sequencer</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *                         Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> /* </div><div class='hunk'>@@ -30,7 +16,7 @@ Possible options for midisynth module:</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='hunk'>@@ -52,6 +38,7 @@ MODULE_PARM_DESC(input_buffer_size, "Input buffer size in bytes.");</div><div class='ctx'> /* data for this midi synth driver */</div><div class='ctx'> struct seq_midisynth {</div><div class='ctx'> 	struct snd_card *card;</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int device;</div><div class='ctx'> 	int subdevice;</div><div class='ctx'> 	struct snd_rawmidi_file input_rfile;</div><div class='hunk'>@@ -78,7 +65,7 @@ static void snd_midi_input_event(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct seq_midisynth *msynth;</div><div class='ctx'> 	struct snd_seq_event ev;</div><div class='ctx'> 	char buf[16], *pbuf;</div><div class='del'>-	long res, count;</div><div class='add'>+	long res;</div><div class='ctx'> </div><div class='ctx'> 	if (substream == NULL)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -94,19 +81,15 @@ static void snd_midi_input_event(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		if (msynth-&gt;parser == NULL)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		pbuf = buf;</div><div class='del'>-		while (res &gt; 0) {</div><div class='del'>-			count = snd_midi_event_encode(msynth-&gt;parser, pbuf, res, &amp;ev);</div><div class='del'>-			if (count &lt; 0)</div><div class='del'>-				break;</div><div class='del'>-			pbuf += count;</div><div class='del'>-			res -= count;</div><div class='del'>-			if (ev.type != SNDRV_SEQ_EVENT_NONE) {</div><div class='del'>-				ev.source.port = msynth-&gt;seq_port;</div><div class='del'>-				ev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;</div><div class='del'>-				snd_seq_kernel_client_dispatch(msynth-&gt;seq_client, &amp;ev, 1, 0);</div><div class='del'>-				/* clear event and reset header */</div><div class='del'>-				memset(&amp;ev, 0, sizeof(ev));</div><div class='del'>-			}</div><div class='add'>+		while (res-- &gt; 0) {</div><div class='add'>+			if (!snd_midi_event_encode_byte(msynth-&gt;parser,</div><div class='add'>+							*pbuf++, &amp;ev))</div><div class='add'>+				continue;</div><div class='add'>+			ev.source.port = msynth-&gt;seq_port;</div><div class='add'>+			ev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;</div><div class='add'>+			snd_seq_kernel_client_dispatch(msynth-&gt;seq_client, &amp;ev, 1, 0);</div><div class='add'>+			/* clear event and reset header */</div><div class='add'>+			memset(&amp;ev, 0, sizeof(ev));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -119,9 +102,10 @@ static int dump_midi(struct snd_rawmidi_substream *substream, const char *buf, i</div><div class='ctx'> 	if (snd_BUG_ON(!substream || !buf))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	runtime = substream-&gt;runtime;</div><div class='del'>-	if ((tmp = runtime-&gt;avail) &lt; count) {</div><div class='add'>+	tmp = runtime-&gt;avail;</div><div class='add'>+	if (tmp &lt; count) {</div><div class='ctx'> 		if (printk_ratelimit())</div><div class='del'>-			snd_printk(KERN_ERR "MIDI output buffer overrun\n");</div><div class='add'>+			pr_err("ALSA: seq_midi: MIDI output buffer overrun\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_rawmidi_kernel_write(substream, buf, count) &lt; count)</div><div class='hunk'>@@ -129,6 +113,12 @@ static int dump_midi(struct snd_rawmidi_substream *substream, const char *buf, i</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* callback for snd_seq_dump_var_event(), bridging to dump_midi() */</div><div class='add'>+static int __dump_midi(void *ptr, void *buf, int count)</div><div class='add'>+{</div><div class='add'>+	return dump_midi(ptr, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int event_process_midi(struct snd_seq_event *ev, int direct,</div><div class='ctx'> 			      void *private_data, int atomic, int hop)</div><div class='ctx'> {</div><div class='hunk'>@@ -145,10 +135,10 @@ static int event_process_midi(struct snd_seq_event *ev, int direct,</div><div class='ctx'> 	if (ev-&gt;type == SNDRV_SEQ_EVENT_SYSEX) {	/* special case, to save space */</div><div class='ctx'> 		if ((ev-&gt;flags &amp; SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE) {</div><div class='ctx'> 			/* invalid event */</div><div class='del'>-			snd_printd("seq_midi: invalid sysex event flags = 0x%x\n", ev-&gt;flags);</div><div class='add'>+			pr_debug("ALSA: seq_midi: invalid sysex event flags = 0x%x\n", ev-&gt;flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='del'>-		snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)dump_midi, substream);</div><div class='add'>+		snd_seq_dump_var_event(ev, __dump_midi, substream);</div><div class='ctx'> 		snd_midi_event_reset_decode(msynth-&gt;parser);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (msynth-&gt;parser == NULL)</div><div class='hunk'>@@ -185,18 +175,19 @@ static int midisynth_subscribe(void *private_data, struct snd_seq_port_subscribe</div><div class='ctx'> 	struct snd_rawmidi_params params;</div><div class='ctx'> </div><div class='ctx'> 	/* open midi port */</div><div class='del'>-	if ((err = snd_rawmidi_kernel_open(msynth-&gt;card, msynth-&gt;device,</div><div class='del'>-					   msynth-&gt;subdevice,</div><div class='del'>-					   SNDRV_RAWMIDI_LFLG_INPUT,</div><div class='del'>-					   &amp;msynth-&gt;input_rfile)) &lt; 0) {</div><div class='del'>-		snd_printd("midi input open failed!!!\n");</div><div class='add'>+	err = snd_rawmidi_kernel_open(msynth-&gt;rmidi, msynth-&gt;subdevice,</div><div class='add'>+				      SNDRV_RAWMIDI_LFLG_INPUT,</div><div class='add'>+				      &amp;msynth-&gt;input_rfile);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_debug("ALSA: seq_midi: midi input open failed!!!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime = msynth-&gt;input_rfile.input-&gt;runtime;</div><div class='ctx'> 	memset(&amp;params, 0, sizeof(params));</div><div class='ctx'> 	params.avail_min = 1;</div><div class='ctx'> 	params.buffer_size = input_buffer_size;</div><div class='del'>-	if ((err = snd_rawmidi_input_params(msynth-&gt;input_rfile.input, &amp;params)) &lt; 0) {</div><div class='add'>+	err = snd_rawmidi_input_params(msynth-&gt;input_rfile.input, &amp;params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_rawmidi_kernel_release(&amp;msynth-&gt;input_rfile);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -227,18 +218,19 @@ static int midisynth_use(void *private_data, struct snd_seq_port_subscribe *info</div><div class='ctx'> 	struct snd_rawmidi_params params;</div><div class='ctx'> </div><div class='ctx'> 	/* open midi port */</div><div class='del'>-	if ((err = snd_rawmidi_kernel_open(msynth-&gt;card, msynth-&gt;device,</div><div class='del'>-					   msynth-&gt;subdevice,</div><div class='del'>-					   SNDRV_RAWMIDI_LFLG_OUTPUT,</div><div class='del'>-					   &amp;msynth-&gt;output_rfile)) &lt; 0) {</div><div class='del'>-		snd_printd("midi output open failed!!!\n");</div><div class='add'>+	err = snd_rawmidi_kernel_open(msynth-&gt;rmidi, msynth-&gt;subdevice,</div><div class='add'>+				      SNDRV_RAWMIDI_LFLG_OUTPUT,</div><div class='add'>+				      &amp;msynth-&gt;output_rfile);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_debug("ALSA: seq_midi: midi output open failed!!!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	memset(&amp;params, 0, sizeof(params));</div><div class='ctx'> 	params.avail_min = 1;</div><div class='ctx'> 	params.buffer_size = output_buffer_size;</div><div class='ctx'> 	params.no_active_sensing = 1;</div><div class='del'>-	if ((err = snd_rawmidi_output_params(msynth-&gt;output_rfile.output, &amp;params)) &lt; 0) {</div><div class='add'>+	err = snd_rawmidi_output_params(msynth-&gt;output_rfile.output, &amp;params);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_rawmidi_kernel_release(&amp;msynth-&gt;output_rfile);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -268,18 +260,18 @@ static void snd_seq_midisynth_delete(struct seq_midisynth *msynth)</div><div class='ctx'> 		snd_seq_event_port_detach(msynth-&gt;seq_client, msynth-&gt;seq_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (msynth-&gt;parser)</div><div class='del'>-		snd_midi_event_free(msynth-&gt;parser);</div><div class='add'>+	snd_midi_event_free(msynth-&gt;parser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* register new midi synth port */</div><div class='ctx'> static int</div><div class='del'>-snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='add'>+snd_seq_midisynth_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct seq_midisynth_client *client;</div><div class='ctx'> 	struct seq_midisynth *msynth, *ms;</div><div class='del'>-	struct snd_seq_port_info *port;</div><div class='del'>-	struct snd_rawmidi_info *info;</div><div class='add'>+	struct snd_seq_port_info *port __free(kfree) = NULL;</div><div class='add'>+	struct snd_rawmidi_info *info __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_rawmidi *rmidi = dev-&gt;private_data;</div><div class='ctx'> 	int newclient = 0;</div><div class='ctx'> 	unsigned int p, ports;</div><div class='hunk'>@@ -305,31 +297,24 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> 	ports = output_count;</div><div class='ctx'> 	if (ports &lt; input_count)</div><div class='ctx'> 		ports = input_count;</div><div class='del'>-	if (ports == 0) {</div><div class='del'>-		kfree(info);</div><div class='add'>+	if (ports == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> 	if (ports &gt; (256 / SNDRV_RAWMIDI_DEVICES))</div><div class='ctx'> 		ports = 256 / SNDRV_RAWMIDI_DEVICES;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	client = synths[card-&gt;number];</div><div class='ctx'> 	if (client == NULL) {</div><div class='ctx'> 		newclient = 1;</div><div class='ctx'> 		client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='del'>-		if (client == NULL) {</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			kfree(info);</div><div class='add'>+		if (client == NULL)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='ctx'> 		client-&gt;seq_client =</div><div class='ctx'> 			snd_seq_create_kernel_client(</div><div class='ctx'> 				card, 0, "%s", card-&gt;shortname[0] ?</div><div class='ctx'> 				(const char *)card-&gt;shortname : "External MIDI");</div><div class='ctx'> 		if (client-&gt;seq_client &lt; 0) {</div><div class='ctx'> 			kfree(client);</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			kfree(info);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,6 +326,7 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (p = 0; p &lt; ports; p++) {</div><div class='ctx'> 		ms = &amp;msynth[p];</div><div class='add'>+		ms-&gt;rmidi = rmidi;</div><div class='ctx'> </div><div class='ctx'> 		if (snd_seq_midisynth_new(ms, card, device, p) &lt; 0)</div><div class='ctx'> 			goto __nomem;</div><div class='hunk'>@@ -358,17 +344,17 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> 			info-&gt;stream = SNDRV_RAWMIDI_STREAM_INPUT;</div><div class='ctx'> 		info-&gt;subdevice = p;</div><div class='ctx'> 		if (snd_rawmidi_info_select(card, info) &gt;= 0)</div><div class='del'>-			strcpy(port-&gt;name, info-&gt;subname);</div><div class='add'>+			strscpy(port-&gt;name, info-&gt;subname);</div><div class='ctx'> 		if (! port-&gt;name[0]) {</div><div class='ctx'> 			if (info-&gt;name[0]) {</div><div class='ctx'> 				if (ports &gt; 1)</div><div class='del'>-					snprintf(port-&gt;name, sizeof(port-&gt;name), "%s-%d", info-&gt;name, p);</div><div class='add'>+					scnprintf(port-&gt;name, sizeof(port-&gt;name), "%s-%u", info-&gt;name, p);</div><div class='ctx'> 				else</div><div class='del'>-					snprintf(port-&gt;name, sizeof(port-&gt;name), "%s", info-&gt;name);</div><div class='add'>+					scnprintf(port-&gt;name, sizeof(port-&gt;name), "%s", info-&gt;name);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* last resort */</div><div class='ctx'> 				if (ports &gt; 1)</div><div class='del'>-					sprintf(port-&gt;name, "MIDI %d-%d-%d", card-&gt;number, device, p);</div><div class='add'>+					sprintf(port-&gt;name, "MIDI %d-%d-%u", card-&gt;number, device, p);</div><div class='ctx'> 				else</div><div class='ctx'> 					sprintf(port-&gt;name, "MIDI %d-%d", card-&gt;number, device);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -380,6 +366,10 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> 		if ((port-&gt;capability &amp; (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ)) == (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ) &amp;&amp;</div><div class='ctx'> 		    info-&gt;flags &amp; SNDRV_RAWMIDI_INFO_DUPLEX)</div><div class='ctx'> 			port-&gt;capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;</div><div class='add'>+		if (port-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_READ)</div><div class='add'>+			port-&gt;direction |= SNDRV_SEQ_PORT_DIR_INPUT;</div><div class='add'>+		if (port-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_WRITE)</div><div class='add'>+			port-&gt;direction |= SNDRV_SEQ_PORT_DIR_OUTPUT;</div><div class='ctx'> 		port-&gt;type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC</div><div class='ctx'> 			| SNDRV_SEQ_PORT_TYPE_HARDWARE</div><div class='ctx'> 			| SNDRV_SEQ_PORT_TYPE_PORT;</div><div class='hunk'>@@ -405,9 +395,6 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> 	client-&gt;num_ports++;</div><div class='ctx'> 	if (newclient)</div><div class='ctx'> 		synths[card-&gt;number] = client;</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	kfree(info);</div><div class='del'>-	kfree(port);</div><div class='ctx'> 	return 0;	/* success */</div><div class='ctx'> </div><div class='ctx'>       __nomem:</div><div class='hunk'>@@ -420,27 +407,23 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)</div><div class='ctx'> 		snd_seq_delete_kernel_client(client-&gt;seq_client);</div><div class='ctx'> 		kfree(client);</div><div class='ctx'> 	}</div><div class='del'>-	kfree(info);</div><div class='del'>-	kfree(port);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* release midi synth port */</div><div class='ctx'> static int</div><div class='del'>-snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)</div><div class='add'>+snd_seq_midisynth_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct seq_midisynth_client *client;</div><div class='ctx'> 	struct seq_midisynth *msynth;</div><div class='ctx'> 	struct snd_card *card = dev-&gt;card;</div><div class='ctx'> 	int device = dev-&gt;device, p, ports;</div><div class='ctx'> 	</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	client = synths[card-&gt;number];</div><div class='del'>-	if (client == NULL || client-&gt;ports[device] == NULL) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+	if (client == NULL || client-&gt;ports[device] == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> 	ports = client-&gt;ports_per_device[device];</div><div class='ctx'> 	client-&gt;ports_per_device[device] = 0;</div><div class='ctx'> 	msynth = client-&gt;ports[device];</div><div class='hunk'>@@ -454,28 +437,17 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)</div><div class='ctx'> 		synths[card-&gt;number] = NULL;</div><div class='ctx'> 		kfree(client);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct snd_seq_driver seq_midisynth_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_seq_midisynth_probe,</div><div class='add'>+		.remove = snd_seq_midisynth_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_MIDISYNTH,</div><div class='add'>+	.argsize = 0,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static int __init alsa_seq_midi_init(void)</div><div class='del'>-{</div><div class='del'>-	static struct snd_seq_dev_ops ops = {</div><div class='del'>-		snd_seq_midisynth_register_port,</div><div class='del'>-		snd_seq_midisynth_unregister_port,</div><div class='del'>-	};</div><div class='del'>-	memset(&amp;synths, 0, sizeof(synths));</div><div class='del'>-	snd_seq_autoload_lock();</div><div class='del'>-	snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_MIDISYNTH, &amp;ops, 0);</div><div class='del'>-	snd_seq_autoload_unlock();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_seq_midi_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_MIDISYNTH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_seq_midi_init)</div><div class='del'>-module_exit(alsa_seq_midi_exit)</div><div class='add'>+module_snd_seq_driver(seq_midisynth_driver);</div><div class='head'>diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c<br/>index 07c663135c62..81d2ef5e5811 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi_emul.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi_emul.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi_emul.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_midi_emul.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  GM/GS/XG midi module.</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Steve Ratcliffe</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on awe_wave.c by Takashi Iwai</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'>  * This module is used to keep track of the current midi state.</div><div class='hunk'>@@ -32,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='ctx'> #include &lt;sound/seq_midi_emul.h&gt;</div><div class='hunk'>@@ -43,22 +30,25 @@ MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer MIDI emulation."</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* Prototypes for static functions */</div><div class='del'>-static void note_off(struct snd_midi_op *ops, void *drv,</div><div class='add'>+static void note_off(const struct snd_midi_op *ops, void *drv,</div><div class='ctx'> 		     struct snd_midi_channel *chan,</div><div class='ctx'> 		     int note, int vel);</div><div class='del'>-static void do_control(struct snd_midi_op *ops, void *private,</div><div class='add'>+static void do_control(const struct snd_midi_op *ops, void *private,</div><div class='ctx'> 		       struct snd_midi_channel_set *chset,</div><div class='ctx'> 		       struct snd_midi_channel *chan,</div><div class='ctx'> 		       int control, int value);</div><div class='del'>-static void rpn(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='add'>+static void rpn(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+		struct snd_midi_channel *chan,</div><div class='ctx'> 		struct snd_midi_channel_set *chset);</div><div class='del'>-static void nrpn(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='add'>+static void nrpn(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+		 struct snd_midi_channel *chan,</div><div class='ctx'> 		 struct snd_midi_channel_set *chset);</div><div class='del'>-static void sysex(struct snd_midi_op *ops, void *private, unsigned char *sysex,</div><div class='add'>+static void sysex(const struct snd_midi_op *ops, void *private,</div><div class='add'>+		  unsigned char *sysex,</div><div class='ctx'> 		  int len, struct snd_midi_channel_set *chset);</div><div class='del'>-static void all_sounds_off(struct snd_midi_op *ops, void *private,</div><div class='add'>+static void all_sounds_off(const struct snd_midi_op *ops, void *private,</div><div class='ctx'> 			   struct snd_midi_channel *chan);</div><div class='del'>-static void all_notes_off(struct snd_midi_op *ops, void *private,</div><div class='add'>+static void all_notes_off(const struct snd_midi_op *ops, void *private,</div><div class='ctx'> 			  struct snd_midi_channel *chan);</div><div class='ctx'> static void snd_midi_reset_controllers(struct snd_midi_channel *chan);</div><div class='ctx'> static void reset_all_channels(struct snd_midi_channel_set *chset);</div><div class='hunk'>@@ -79,7 +69,7 @@ static void reset_all_channels(struct snd_midi_channel_set *chset);</div><div class='ctx'>  *        be interpreted.</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='del'>-snd_midi_process_event(struct snd_midi_op *ops,</div><div class='add'>+snd_midi_process_event(const struct snd_midi_op *ops,</div><div class='ctx'> 		       struct snd_seq_event *ev,</div><div class='ctx'> 		       struct snd_midi_channel_set *chanset)</div><div class='ctx'> {</div><div class='hunk'>@@ -88,7 +78,7 @@ snd_midi_process_event(struct snd_midi_op *ops,</div><div class='ctx'> 	int dest_channel = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ev == NULL || chanset == NULL) {</div><div class='del'>-		snd_printd("ev or chanbase NULL (snd_midi_process_event)\n");</div><div class='add'>+		pr_debug("ALSA: seq_midi_emul: ev or chanbase NULL (snd_midi_process_event)\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chanset-&gt;channels == NULL)</div><div class='hunk'>@@ -97,7 +87,7 @@ snd_midi_process_event(struct snd_midi_op *ops,</div><div class='ctx'> 	if (snd_seq_ev_is_channel_type(ev)) {</div><div class='ctx'> 		dest_channel = ev-&gt;data.note.channel;</div><div class='ctx'> 		if (dest_channel &gt;= chanset-&gt;max_channels) {</div><div class='del'>-			snd_printd("dest channel is %d, max is %d\n",</div><div class='add'>+			pr_debug("ALSA: seq_midi_emul: dest channel is %d, max is %d\n",</div><div class='ctx'> 				   dest_channel, chanset-&gt;max_channels);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -231,17 +221,19 @@ snd_midi_process_event(struct snd_midi_op *ops,</div><div class='ctx'> 	case SNDRV_SEQ_EVENT_ECHO:</div><div class='ctx'> 	not_yet:</div><div class='ctx'> 	default:</div><div class='del'>-		/*snd_printd("Unimplemented event %d\n", ev-&gt;type);*/</div><div class='add'>+		/*pr_debug("ALSA: seq_midi_emul: Unimplemented event %d\n", ev-&gt;type);*/</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_process_event);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * release note</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-note_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='add'>+note_off(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+	 struct snd_midi_channel *chan,</div><div class='ctx'> 	 int note, int vel)</div><div class='ctx'> {</div><div class='ctx'> 	if (chan-&gt;gm_hold) {</div><div class='hunk'>@@ -263,11 +255,15 @@ note_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='ctx'>  * events that need to take place immediately to the driver.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-do_control(struct snd_midi_op *ops, void *drv, struct snd_midi_channel_set *chset,</div><div class='add'>+do_control(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+	   struct snd_midi_channel_set *chset,</div><div class='ctx'> 	   struct snd_midi_channel *chan, int control, int value)</div><div class='ctx'> {</div><div class='ctx'> 	int  i;</div><div class='ctx'> </div><div class='add'>+	if (control &gt;= ARRAY_SIZE(chan-&gt;control))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* Switches */</div><div class='ctx'> 	if ((control &gt;=64 &amp;&amp; control &lt;=69) || (control &gt;= 80 &amp;&amp; control &lt;= 83)) {</div><div class='ctx'> 		/* These are all switches; either off or on so set to 0 or 127 */</div><div class='hunk'>@@ -313,7 +309,7 @@ do_control(struct snd_midi_op *ops, void *drv, struct snd_midi_channel_set *chse</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MIDI_CTL_MSB_DATA_ENTRY:</div><div class='ctx'> 		chan-&gt;control[MIDI_CTL_LSB_DATA_ENTRY] = 0;</div><div class='del'>-		/* go through here */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case MIDI_CTL_LSB_DATA_ENTRY:</div><div class='ctx'> 		if (chan-&gt;param_type == SNDRV_MIDI_PARAM_TYPE_REGISTERED)</div><div class='ctx'> 			rpn(ops, drv, chan, chset);</div><div class='hunk'>@@ -405,12 +401,13 @@ snd_midi_channel_set_clear(struct snd_midi_channel_set *chset)</div><div class='ctx'> 			chan-&gt;drum_channel = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_channel_set_clear);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Process a rpn message.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-rpn(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='add'>+rpn(const struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='ctx'>     struct snd_midi_channel_set *chset)</div><div class='ctx'> {</div><div class='ctx'> 	int type;</div><div class='hunk'>@@ -450,7 +447,7 @@ rpn(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='ctx'>  * Process an nrpn message.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-nrpn(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='add'>+nrpn(const struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,</div><div class='ctx'>      struct snd_midi_channel_set *chset)</div><div class='ctx'> {</div><div class='ctx'> 	/* parse XG NRPNs here if possible */</div><div class='hunk'>@@ -478,15 +475,15 @@ get_channel(unsigned char cmd)</div><div class='ctx'>  * Process a sysex message.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-sysex(struct snd_midi_op *ops, void *private, unsigned char *buf, int len,</div><div class='add'>+sysex(const struct snd_midi_op *ops, void *private, unsigned char *buf, int len,</div><div class='ctx'>       struct snd_midi_channel_set *chset)</div><div class='ctx'> {</div><div class='ctx'> 	/* GM on */</div><div class='del'>-	static unsigned char gm_on_macro[] = {</div><div class='add'>+	static const unsigned char gm_on_macro[] = {</div><div class='ctx'> 		0x7e,0x7f,0x09,0x01,</div><div class='ctx'> 	};</div><div class='ctx'> 	/* XG on */</div><div class='del'>-	static unsigned char xg_on_macro[] = {</div><div class='add'>+	static const unsigned char xg_on_macro[] = {</div><div class='ctx'> 		0x43,0x10,0x4c,0x00,0x00,0x7e,0x00,</div><div class='ctx'> 	};</div><div class='ctx'> 	/* GS prefix</div><div class='hunk'>@@ -495,7 +492,7 @@ sysex(struct snd_midi_op *ops, void *private, unsigned char *buf, int len,</div><div class='ctx'> 	 * chorus mode: XX=0x01, YY=0x38, ZZ=0-7</div><div class='ctx'> 	 * master vol:  XX=0x00, YY=0x04, ZZ=0-127</div><div class='ctx'> 	 */</div><div class='del'>-	static unsigned char gs_pfx_macro[] = {</div><div class='add'>+	static const unsigned char gs_pfx_macro[] = {</div><div class='ctx'> 		0x41,0x10,0x42,0x12,0x40,/*XX,YY,ZZ*/</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -592,7 +589,8 @@ sysex(struct snd_midi_op *ops, void *private, unsigned char *buf, int len,</div><div class='ctx'>  * all sound off</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-all_sounds_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan)</div><div class='add'>+all_sounds_off(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+	       struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='hunk'>@@ -610,7 +608,8 @@ all_sounds_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan</div><div class='ctx'>  * all notes off</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-all_notes_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan)</div><div class='add'>+all_notes_off(const struct snd_midi_op *ops, void *drv,</div><div class='add'>+	      struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	int n;</div><div class='ctx'> </div><div class='hunk'>@@ -651,7 +650,7 @@ static struct snd_midi_channel *snd_midi_channel_init_set(int n)</div><div class='ctx'> 	struct snd_midi_channel *chan;</div><div class='ctx'> 	int  i;</div><div class='ctx'> </div><div class='del'>-	chan = kmalloc(n * sizeof(struct snd_midi_channel), GFP_KERNEL);</div><div class='add'>+	chan = kmalloc_array(n, sizeof(struct snd_midi_channel), GFP_KERNEL);</div><div class='ctx'> 	if (chan) {</div><div class='ctx'> 		for (i = 0; i &lt; n; i++)</div><div class='ctx'> 			snd_midi_channel_init(chan+i, i);</div><div class='hunk'>@@ -697,6 +696,7 @@ struct snd_midi_channel_set *snd_midi_channel_alloc_set(int n)</div><div class='ctx'> 	}</div><div class='ctx'> 	return chset;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_channel_alloc_set);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Reset the midi controllers on a particular channel to default values.</div><div class='hunk'>@@ -720,20 +720,4 @@ void snd_midi_channel_free_set(struct snd_midi_channel_set *chset)</div><div class='ctx'> 	kfree(chset-&gt;channels);</div><div class='ctx'> 	kfree(chset);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static int __init alsa_seq_midi_emul_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_seq_midi_emul_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_seq_midi_emul_init)</div><div class='del'>-module_exit(alsa_seq_midi_emul_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_midi_process_event);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_channel_set_clear);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_channel_alloc_set);</div><div class='ctx'> EXPORT_SYMBOL(snd_midi_channel_free_set);</div><div class='head'>diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c<br/>index b5d6ea4904c0..fa9dfc53c3fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi_event.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_midi_event.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_midi_event.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_midi_event.c</a></div><div class='hunk'>@@ -1,27 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  MIDI byte &lt;-&gt; sequencer event coder</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1998,99 Takashi Iwai &lt;tiwai@suse.de&gt;,</div><div class='ctx'>  *                        Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='ctx'> #include &lt;sound/seq_midi_event.h&gt;</div><div class='hunk'>@@ -133,6 +121,7 @@ int snd_midi_event_new(int bufsize, struct snd_midi_event **rdev)</div><div class='ctx'> 	*rdev = dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_new);</div><div class='ctx'> </div><div class='ctx'> void snd_midi_event_free(struct snd_midi_event *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -141,6 +130,7 @@ void snd_midi_event_free(struct snd_midi_event *dev)</div><div class='ctx'> 		kfree(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_free);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * initialize record</div><div class='hunk'>@@ -154,97 +144,33 @@ static inline void reset_encode(struct snd_midi_event *dev)</div><div class='ctx'> </div><div class='ctx'> void snd_midi_event_reset_encode(struct snd_midi_event *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	reset_encode(dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_reset_encode);</div><div class='ctx'> </div><div class='ctx'> void snd_midi_event_reset_decode(struct snd_midi_event *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	dev-&gt;lastcmd = 0xff;</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void snd_midi_event_init(struct snd_midi_event *dev)</div><div class='del'>-{</div><div class='del'>-	snd_midi_event_reset_encode(dev);</div><div class='del'>-	snd_midi_event_reset_decode(dev);</div><div class='ctx'> }</div><div class='del'>-#endif  /*  0  */</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_reset_decode);</div><div class='ctx'> </div><div class='ctx'> void snd_midi_event_no_status(struct snd_midi_event *dev, int on)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;nostat = on ? 1 : 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * resize buffer</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-int snd_midi_event_resize_buffer(struct snd_midi_event *dev, int bufsize)</div><div class='del'>-{</div><div class='del'>-	unsigned char *new_buf, *old_buf;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (bufsize == dev-&gt;bufsize)</div><div class='del'>-		return 0;</div><div class='del'>-	new_buf = kmalloc(bufsize, GFP_KERNEL);</div><div class='del'>-	if (new_buf == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='del'>-	old_buf = dev-&gt;buf;</div><div class='del'>-	dev-&gt;buf = new_buf;</div><div class='del'>-	dev-&gt;bufsize = bufsize;</div><div class='del'>-	reset_encode(dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-	kfree(old_buf);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  read bytes and encode to sequencer event if finished</div><div class='del'>- *  return the size of encoded bytes</div><div class='del'>- */</div><div class='del'>-long snd_midi_event_encode(struct snd_midi_event *dev, unsigned char *buf, long count,</div><div class='del'>-			   struct snd_seq_event *ev)</div><div class='del'>-{</div><div class='del'>-	long result = 0;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	ev-&gt;type = SNDRV_SEQ_EVENT_NONE;</div><div class='del'>-</div><div class='del'>-	while (count-- &gt; 0) {</div><div class='del'>-		rc = snd_midi_event_encode_byte(dev, *buf++, ev);</div><div class='del'>-		result++;</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			return rc;</div><div class='del'>-		else if (rc &gt; 0)</div><div class='del'>-			return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_no_status);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  read one byte and encode to sequencer event:</div><div class='del'>- *  return 1 if MIDI bytes are encoded to an event</div><div class='del'>- *         0 data is not finished</div><div class='del'>- *         negative for error</div><div class='add'>+ *  return true if MIDI bytes are encoded to an event</div><div class='add'>+ *         false data is not finished</div><div class='ctx'>  */</div><div class='del'>-int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,</div><div class='del'>-			       struct snd_seq_event *ev)</div><div class='add'>+bool snd_midi_event_encode_byte(struct snd_midi_event *dev, unsigned char c,</div><div class='add'>+				struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	c &amp;= 0xff;</div><div class='add'>+	bool rc = false;</div><div class='ctx'> </div><div class='ctx'> 	if (c &gt;= MIDI_CMD_COMMON_CLOCK) {</div><div class='ctx'> 		/* real-time event */</div><div class='hunk'>@@ -254,7 +180,7 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,</div><div class='ctx'> 		return ev-&gt;type != SNDRV_SEQ_EVENT_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	if ((c &amp; 0x80) &amp;&amp;</div><div class='ctx'> 	    (c != MIDI_CMD_COMMON_SYSEX_END || dev-&gt;type != ST_SYSEX)) {</div><div class='ctx'> 		/* new command */</div><div class='hunk'>@@ -286,7 +212,7 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,</div><div class='ctx'> 			status_event[dev-&gt;type].encode(dev, ev);</div><div class='ctx'> 		if (dev-&gt;type &gt;= ST_SPECIAL)</div><div class='ctx'> 			dev-&gt;type = ST_INVALID;</div><div class='del'>-		rc = 1;</div><div class='add'>+		rc = true;</div><div class='ctx'> 	} else 	if (dev-&gt;type == ST_SYSEX) {</div><div class='ctx'> 		if (c == MIDI_CMD_COMMON_SYSEX_END ||</div><div class='ctx'> 		    dev-&gt;read &gt;= dev-&gt;bufsize) {</div><div class='hunk'>@@ -299,13 +225,13 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,</div><div class='ctx'> 				dev-&gt;read = 0; /* continue to parse */</div><div class='ctx'> 			else</div><div class='ctx'> 				reset_encode(dev); /* all parsed */</div><div class='del'>-			rc = 1;</div><div class='add'>+			rc = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_encode_byte);</div><div class='ctx'> </div><div class='ctx'> /* encode note event */</div><div class='ctx'> static void note_event(struct snd_midi_event *dev, struct snd_seq_event *ev)</div><div class='hunk'>@@ -407,6 +333,7 @@ long snd_midi_event_decode(struct snd_midi_event *dev, unsigned char *buf, long</div><div class='ctx'> 		return qlen;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_midi_event_decode);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* decode note event */</div><div class='hunk'>@@ -487,12 +414,12 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf,</div><div class='ctx'> 			     int count, struct snd_seq_event *ev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char cmd;</div><div class='del'>-	char *cbytes;</div><div class='del'>-	static char cbytes_nrpn[4] = { MIDI_CTL_NONREG_PARM_NUM_MSB,</div><div class='add'>+	const char *cbytes;</div><div class='add'>+	static const char cbytes_nrpn[4] = { MIDI_CTL_NONREG_PARM_NUM_MSB,</div><div class='ctx'> 				       MIDI_CTL_NONREG_PARM_NUM_LSB,</div><div class='ctx'> 				       MIDI_CTL_MSB_DATA_ENTRY,</div><div class='ctx'> 				       MIDI_CTL_LSB_DATA_ENTRY };</div><div class='del'>-	static char cbytes_rpn[4] =  { MIDI_CTL_REGIST_PARM_NUM_MSB,</div><div class='add'>+	static const char cbytes_rpn[4] =  { MIDI_CTL_REGIST_PARM_NUM_MSB,</div><div class='ctx'> 				       MIDI_CTL_REGIST_PARM_NUM_LSB,</div><div class='ctx'> 				       MIDI_CTL_MSB_DATA_ENTRY,</div><div class='ctx'> 				       MIDI_CTL_LSB_DATA_ENTRY };</div><div class='hunk'>@@ -522,28 +449,3 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf,</div><div class='ctx'> 	}</div><div class='ctx'> 	return idx;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  exports</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_new);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_free);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_reset_encode);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_reset_decode);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_no_status);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_encode);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_encode_byte);</div><div class='del'>-EXPORT_SYMBOL(snd_midi_event_decode);</div><div class='del'>-</div><div class='del'>-static int __init alsa_seq_midi_event_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_seq_midi_event_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_seq_midi_event_init)</div><div class='del'>-module_exit(alsa_seq_midi_event_exit)</div><div class='head'>diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c<br/>index 3bf7d73ac52e..40fa379847e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ports.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ports.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ports.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_ports.c</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Ports</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *                         Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include "seq_system.h"</div><div class='ctx'> #include "seq_ports.h"</div><div class='ctx'> #include "seq_clientmgr.h"</div><div class='hunk'>@@ -62,17 +48,15 @@ struct snd_seq_client_port *snd_seq_port_use_ptr(struct snd_seq_client *client,</div><div class='ctx'> </div><div class='ctx'> 	if (client == NULL)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	read_lock(&amp;client-&gt;ports_lock);</div><div class='add'>+	guard(read_lock)(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	list_for_each_entry(port, &amp;client-&gt;ports_list_head, list) {</div><div class='ctx'> 		if (port-&gt;addr.port == num) {</div><div class='ctx'> 			if (port-&gt;closing)</div><div class='ctx'> 				break; /* deleting now */</div><div class='ctx'> 			snd_use_lock_use(&amp;port-&gt;use_lock);</div><div class='del'>-			read_unlock(&amp;client-&gt;ports_lock);</div><div class='ctx'> 			return port;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	return NULL;		/* not found */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,11 +67,15 @@ struct snd_seq_client_port *snd_seq_port_query_nearest(struct snd_seq_client *cl</div><div class='ctx'> {</div><div class='ctx'> 	int num;</div><div class='ctx'> 	struct snd_seq_client_port *port, *found;</div><div class='add'>+	bool check_inactive = (pinfo-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_INACTIVE);</div><div class='ctx'> </div><div class='ctx'> 	num = pinfo-&gt;addr.port;</div><div class='ctx'> 	found = NULL;</div><div class='del'>-	read_lock(&amp;client-&gt;ports_lock);</div><div class='add'>+	guard(read_lock)(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	list_for_each_entry(port, &amp;client-&gt;ports_list_head, list) {</div><div class='add'>+		if ((port-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_INACTIVE) &amp;&amp;</div><div class='add'>+		    !check_inactive)</div><div class='add'>+			continue; /* skip inactive ports */</div><div class='ctx'> 		if (port-&gt;addr.port &lt; num)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (port-&gt;addr.port == num) {</div><div class='hunk'>@@ -103,7 +91,6 @@ struct snd_seq_client_port *snd_seq_port_query_nearest(struct snd_seq_client *cl</div><div class='ctx'> 		else</div><div class='ctx'> 			snd_use_lock_use(&amp;found-&gt;use_lock);</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -121,42 +108,47 @@ static void port_subs_info_init(struct snd_seq_port_subs_info *grp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* create a port, port number is returned (-1 on failure) */</div><div class='del'>-struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client,</div><div class='del'>-						int port)</div><div class='add'>+/* create a port, port number or a negative error code is returned</div><div class='add'>+ * the caller needs to unref the port via snd_seq_port_unlock() appropriately</div><div class='add'>+ */</div><div class='add'>+int snd_seq_create_port(struct snd_seq_client *client, int port,</div><div class='add'>+			struct snd_seq_client_port **port_ret)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_client_port *new_port, *p;</div><div class='del'>-	int num = -1;</div><div class='add'>+	int num;</div><div class='ctx'> 	</div><div class='add'>+	*port_ret = NULL;</div><div class='add'>+</div><div class='ctx'> 	/* sanity check */</div><div class='ctx'> 	if (snd_BUG_ON(!client))</div><div class='del'>-		return NULL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (client-&gt;num_ports &gt;= SNDRV_SEQ_MAX_PORTS - 1) {</div><div class='del'>-		snd_printk(KERN_WARNING "too many ports for client %d\n", client-&gt;number);</div><div class='del'>-		return NULL;</div><div class='add'>+	if (client-&gt;num_ports &gt;= SNDRV_SEQ_MAX_PORTS) {</div><div class='add'>+		pr_warn("ALSA: seq: too many ports for client %d\n", client-&gt;number);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create a new port */</div><div class='ctx'> 	new_port = kzalloc(sizeof(*new_port), GFP_KERNEL);</div><div class='del'>-	if (! new_port) {</div><div class='del'>-		snd_printd("malloc failed for registering client port\n");</div><div class='del'>-		return NULL;	/* failure, out of memory */</div><div class='del'>-	}</div><div class='add'>+	if (!new_port)</div><div class='add'>+		return -ENOMEM;	/* failure, out of memory */</div><div class='ctx'> 	/* init port data */</div><div class='ctx'> 	new_port-&gt;addr.client = client-&gt;number;</div><div class='ctx'> 	new_port-&gt;addr.port = -1;</div><div class='ctx'> 	new_port-&gt;owner = THIS_MODULE;</div><div class='del'>-	sprintf(new_port-&gt;name, "port-%d", num);</div><div class='ctx'> 	snd_use_lock_init(&amp;new_port-&gt;use_lock);</div><div class='ctx'> 	port_subs_info_init(&amp;new_port-&gt;c_src);</div><div class='ctx'> 	port_subs_info_init(&amp;new_port-&gt;c_dest);</div><div class='add'>+	snd_use_lock_use(&amp;new_port-&gt;use_lock);</div><div class='ctx'> </div><div class='del'>-	num = port &gt;= 0 ? port : 0;</div><div class='del'>-	mutex_lock(&amp;client-&gt;ports_mutex);</div><div class='del'>-	write_lock_irqsave(&amp;client-&gt;ports_lock, flags);</div><div class='add'>+	num = max(port, 0);</div><div class='add'>+	guard(mutex)(&amp;client-&gt;ports_mutex);</div><div class='add'>+	guard(write_lock_irq)(&amp;client-&gt;ports_lock);</div><div class='ctx'> 	list_for_each_entry(p, &amp;client-&gt;ports_list_head, list) {</div><div class='add'>+		if (p-&gt;addr.port == port) {</div><div class='add'>+			kfree(new_port);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='ctx'> 		if (p-&gt;addr.port &gt; num)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (port &lt; 0) /* auto-probe mode */</div><div class='hunk'>@@ -166,18 +158,13 @@ struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client,</div><div class='ctx'> 	list_add_tail(&amp;new_port-&gt;list, &amp;p-&gt;list);</div><div class='ctx'> 	client-&gt;num_ports++;</div><div class='ctx'> 	new_port-&gt;addr.port = num;	/* store the port number in the port */</div><div class='del'>-	write_unlock_irqrestore(&amp;client-&gt;ports_lock, flags);</div><div class='del'>-	mutex_unlock(&amp;client-&gt;ports_mutex);</div><div class='ctx'> 	sprintf(new_port-&gt;name, "port-%d", num);</div><div class='add'>+	*port_ret = new_port;</div><div class='ctx'> </div><div class='del'>-	return new_port;</div><div class='add'>+	return num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* */</div><div class='del'>-enum group_type {</div><div class='del'>-	SRC_LIST, DEST_LIST</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int subscribe_port(struct snd_seq_client *client,</div><div class='ctx'> 			  struct snd_seq_client_port *port,</div><div class='ctx'> 			  struct snd_seq_port_subs_info *grp,</div><div class='hunk'>@@ -191,17 +178,24 @@ static int unsubscribe_port(struct snd_seq_client *client,</div><div class='ctx'> static struct snd_seq_client_port *get_client_port(struct snd_seq_addr *addr,</div><div class='ctx'> 						   struct snd_seq_client **cp)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_client_port *p;</div><div class='ctx'> 	*cp = snd_seq_client_use_ptr(addr-&gt;client);</div><div class='del'>-	if (*cp) {</div><div class='del'>-		p = snd_seq_port_use_ptr(*cp, addr-&gt;port);</div><div class='del'>-		if (! p) {</div><div class='del'>-			snd_seq_client_unlock(*cp);</div><div class='del'>-			*cp = NULL;</div><div class='del'>-		}</div><div class='del'>-		return p;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='add'>+	if (!*cp)</div><div class='add'>+		return NULL;</div><div class='add'>+	return snd_seq_port_use_ptr(*cp, addr-&gt;port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_and_unsubscribe_port(struct snd_seq_client *client,</div><div class='add'>+					struct snd_seq_client_port *port,</div><div class='add'>+					struct snd_seq_subscribers *subs,</div><div class='add'>+					bool is_src, bool ack);</div><div class='add'>+</div><div class='add'>+static inline struct snd_seq_subscribers *</div><div class='add'>+get_subscriber(struct list_head *p, bool is_src)</div><div class='add'>+{</div><div class='add'>+	if (is_src)</div><div class='add'>+		return list_entry(p, struct snd_seq_subscribers, src_list);</div><div class='add'>+	else</div><div class='add'>+		return list_entry(p, struct snd_seq_subscribers, dest_list);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -211,24 +205,22 @@ static struct snd_seq_client_port *get_client_port(struct snd_seq_addr *addr,</div><div class='ctx'> static void clear_subscriber_list(struct snd_seq_client *client,</div><div class='ctx'> 				  struct snd_seq_client_port *port,</div><div class='ctx'> 				  struct snd_seq_port_subs_info *grp,</div><div class='del'>-				  int grptype)</div><div class='add'>+				  int is_src)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *p, *n;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(p, n, &amp;grp-&gt;list_head) {</div><div class='ctx'> 		struct snd_seq_subscribers *subs;</div><div class='del'>-		struct snd_seq_client *c;</div><div class='del'>-		struct snd_seq_client_port *aport;</div><div class='add'>+		struct snd_seq_client *c __free(snd_seq_client) = NULL;</div><div class='add'>+		struct snd_seq_client_port *aport __free(snd_seq_port) = NULL;</div><div class='ctx'> </div><div class='del'>-		if (grptype == SRC_LIST) {</div><div class='del'>-			subs = list_entry(p, struct snd_seq_subscribers, src_list);</div><div class='add'>+		subs = get_subscriber(p, is_src);</div><div class='add'>+		if (is_src)</div><div class='ctx'> 			aport = get_client_port(&amp;subs-&gt;info.dest, &amp;c);</div><div class='del'>-		} else {</div><div class='del'>-			subs = list_entry(p, struct snd_seq_subscribers, dest_list);</div><div class='add'>+		else</div><div class='ctx'> 			aport = get_client_port(&amp;subs-&gt;info.sender, &amp;c);</div><div class='del'>-		}</div><div class='del'>-		list_del(p);</div><div class='del'>-		unsubscribe_port(client, port, grp, &amp;subs-&gt;info, 0);</div><div class='add'>+		delete_and_unsubscribe_port(client, port, subs, is_src, false);</div><div class='add'>+</div><div class='ctx'> 		if (!aport) {</div><div class='ctx'> 			/* looks like the connected port is being deleted.</div><div class='ctx'> 			 * we decrease the counter, and when both ports are deleted</div><div class='hunk'>@@ -236,21 +228,12 @@ static void clear_subscriber_list(struct snd_seq_client *client,</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (atomic_dec_and_test(&amp;subs-&gt;ref_count))</div><div class='ctx'> 				kfree(subs);</div><div class='del'>-		} else {</div><div class='del'>-			/* ok we got the connected port */</div><div class='del'>-			struct snd_seq_port_subs_info *agrp;</div><div class='del'>-			agrp = (grptype == SRC_LIST) ? &amp;aport-&gt;c_dest : &amp;aport-&gt;c_src;</div><div class='del'>-			down_write(&amp;agrp-&gt;list_mutex);</div><div class='del'>-			if (grptype == SRC_LIST)</div><div class='del'>-				list_del(&amp;subs-&gt;dest_list);</div><div class='del'>-			else</div><div class='del'>-				list_del(&amp;subs-&gt;src_list);</div><div class='del'>-			up_write(&amp;agrp-&gt;list_mutex);</div><div class='del'>-			unsubscribe_port(c, aport, agrp, &amp;subs-&gt;info, 1);</div><div class='del'>-			kfree(subs);</div><div class='del'>-			snd_seq_port_unlock(aport);</div><div class='del'>-			snd_seq_client_unlock(c);</div><div class='add'>+			continue;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* ok we got the connected port */</div><div class='add'>+		delete_and_unsubscribe_port(c, aport, subs, !is_src, true);</div><div class='add'>+		kfree(subs);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -263,8 +246,8 @@ static int port_delete(struct snd_seq_client *client,</div><div class='ctx'> 	snd_use_lock_sync(&amp;port-&gt;use_lock); </div><div class='ctx'> </div><div class='ctx'> 	/* clear subscribers info */</div><div class='del'>-	clear_subscriber_list(client, port, &amp;port-&gt;c_src, SRC_LIST);</div><div class='del'>-	clear_subscriber_list(client, port, &amp;port-&gt;c_dest, DEST_LIST);</div><div class='add'>+	clear_subscriber_list(client, port, &amp;port-&gt;c_src, true);</div><div class='add'>+	clear_subscriber_list(client, port, &amp;port-&gt;c_dest, false);</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;private_free)</div><div class='ctx'> 		port-&gt;private_free(port-&gt;private_data);</div><div class='hunk'>@@ -280,22 +263,20 @@ static int port_delete(struct snd_seq_client *client,</div><div class='ctx'> /* delete a port with the given port id */</div><div class='ctx'> int snd_seq_delete_port(struct snd_seq_client *client, int port)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_client_port *found = NULL, *p;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;client-&gt;ports_mutex);</div><div class='del'>-	write_lock_irqsave(&amp;client-&gt;ports_lock, flags);</div><div class='del'>-	list_for_each_entry(p, &amp;client-&gt;ports_list_head, list) {</div><div class='del'>-		if (p-&gt;addr.port == port) {</div><div class='del'>-			/* ok found.  delete from the list at first */</div><div class='del'>-			list_del(&amp;p-&gt;list);</div><div class='del'>-			client-&gt;num_ports--;</div><div class='del'>-			found = p;</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(mutex, &amp;client-&gt;ports_mutex) {</div><div class='add'>+		guard(write_lock_irq)(&amp;client-&gt;ports_lock);</div><div class='add'>+		list_for_each_entry(p, &amp;client-&gt;ports_list_head, list) {</div><div class='add'>+			if (p-&gt;addr.port == port) {</div><div class='add'>+				/* ok found.  delete from the list at first */</div><div class='add'>+				list_del(&amp;p-&gt;list);</div><div class='add'>+				client-&gt;num_ports--;</div><div class='add'>+				found = p;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	write_unlock_irqrestore(&amp;client-&gt;ports_lock, flags);</div><div class='del'>-	mutex_unlock(&amp;client-&gt;ports_mutex);</div><div class='ctx'> 	if (found)</div><div class='ctx'> 		return port_delete(client, found);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -305,23 +286,22 @@ int snd_seq_delete_port(struct snd_seq_client *client, int port)</div><div class='ctx'> /* delete the all ports belonging to the given client */</div><div class='ctx'> int snd_seq_delete_all_ports(struct snd_seq_client *client)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct list_head deleted_list;</div><div class='ctx'> 	struct snd_seq_client_port *port, *tmp;</div><div class='ctx'> 	</div><div class='ctx'> 	/* move the port list to deleted_list, and</div><div class='ctx'> 	 * clear the port list in the client data.</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;client-&gt;ports_mutex);</div><div class='del'>-	write_lock_irqsave(&amp;client-&gt;ports_lock, flags);</div><div class='del'>-	if (! list_empty(&amp;client-&gt;ports_list_head)) {</div><div class='del'>-		list_add(&amp;deleted_list, &amp;client-&gt;ports_list_head);</div><div class='del'>-		list_del_init(&amp;client-&gt;ports_list_head);</div><div class='del'>-	} else {</div><div class='del'>-		INIT_LIST_HEAD(&amp;deleted_list);</div><div class='add'>+	guard(mutex)(&amp;client-&gt;ports_mutex);</div><div class='add'>+	scoped_guard(write_lock_irq, &amp;client-&gt;ports_lock) {</div><div class='add'>+		if (!list_empty(&amp;client-&gt;ports_list_head)) {</div><div class='add'>+			list_add(&amp;deleted_list, &amp;client-&gt;ports_list_head);</div><div class='add'>+			list_del_init(&amp;client-&gt;ports_list_head);</div><div class='add'>+		} else {</div><div class='add'>+			INIT_LIST_HEAD(&amp;deleted_list);</div><div class='add'>+		}</div><div class='add'>+		client-&gt;num_ports = 0;</div><div class='ctx'> 	}</div><div class='del'>-	client-&gt;num_ports = 0;</div><div class='del'>-	write_unlock_irqrestore(&amp;client-&gt;ports_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* remove each port in deleted_list */</div><div class='ctx'> 	list_for_each_entry_safe(port, tmp, &amp;deleted_list, list) {</div><div class='hunk'>@@ -329,7 +309,6 @@ int snd_seq_delete_all_ports(struct snd_seq_client *client)</div><div class='ctx'> 		snd_seq_system_client_ev_port_exit(port-&gt;addr.client, port-&gt;addr.port);</div><div class='ctx'> 		port_delete(client, port);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;client-&gt;ports_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +321,7 @@ int snd_seq_set_port_info(struct snd_seq_client_port * port,</div><div class='ctx'> </div><div class='ctx'> 	/* set port name */</div><div class='ctx'> 	if (info-&gt;name[0])</div><div class='del'>-		strlcpy(port-&gt;name, info-&gt;name, sizeof(port-&gt;name));</div><div class='add'>+		strscpy(port-&gt;name, info-&gt;name, sizeof(port-&gt;name));</div><div class='ctx'> 	</div><div class='ctx'> 	/* set capabilities */</div><div class='ctx'> 	port-&gt;capability = info-&gt;capability;</div><div class='hunk'>@@ -360,6 +339,22 @@ int snd_seq_set_port_info(struct snd_seq_client_port * port,</div><div class='ctx'> 	port-&gt;time_real = (info-&gt;flags &amp; SNDRV_SEQ_PORT_FLG_TIME_REAL) ? 1 : 0;</div><div class='ctx'> 	port-&gt;time_queue = info-&gt;time_queue;</div><div class='ctx'> </div><div class='add'>+	/* UMP direction and group */</div><div class='add'>+	port-&gt;direction = info-&gt;direction;</div><div class='add'>+	port-&gt;ump_group = info-&gt;ump_group;</div><div class='add'>+	if (port-&gt;ump_group &gt; SNDRV_UMP_MAX_GROUPS)</div><div class='add'>+		port-&gt;ump_group = 0;</div><div class='add'>+</div><div class='add'>+	/* fill default port direction */</div><div class='add'>+	if (!port-&gt;direction) {</div><div class='add'>+		if (info-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_READ)</div><div class='add'>+			port-&gt;direction |= SNDRV_SEQ_PORT_DIR_INPUT;</div><div class='add'>+		if (info-&gt;capability &amp; SNDRV_SEQ_PORT_CAP_WRITE)</div><div class='add'>+			port-&gt;direction |= SNDRV_SEQ_PORT_DIR_OUTPUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port-&gt;is_midi1 = !!(info-&gt;flags &amp; SNDRV_SEQ_PORT_FLG_IS_MIDI1);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -371,7 +366,7 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* get port name */</div><div class='del'>-	strlcpy(info-&gt;name, port-&gt;name, sizeof(info-&gt;name));</div><div class='add'>+	strscpy(info-&gt;name, port-&gt;name, sizeof(info-&gt;name));</div><div class='ctx'> 	</div><div class='ctx'> 	/* get capabilities */</div><div class='ctx'> 	info-&gt;capability = port-&gt;capability;</div><div class='hunk'>@@ -397,6 +392,13 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,</div><div class='ctx'> 		info-&gt;time_queue = port-&gt;time_queue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (port-&gt;is_midi1)</div><div class='add'>+		info-&gt;flags |= SNDRV_SEQ_PORT_FLG_IS_MIDI1;</div><div class='add'>+</div><div class='add'>+	/* UMP direction and group */</div><div class='add'>+	info-&gt;direction = port-&gt;direction;</div><div class='add'>+	info-&gt;ump_group = port-&gt;ump_group;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,9 +412,6 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,</div><div class='ctx'>  * invoked.</div><div class='ctx'>  * This feature is useful if these callbacks are associated with</div><div class='ctx'>  * initialization or termination of devices (see seq_midi.c).</div><div class='del'>- *</div><div class='del'>- * If callback_all option is set, the callback function is invoked</div><div class='del'>- * at each connnection/disconnection. </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int subscribe_port(struct snd_seq_client *client,</div><div class='hunk'>@@ -426,7 +425,7 @@ static int subscribe_port(struct snd_seq_client *client,</div><div class='ctx'> 	if (!try_module_get(port-&gt;owner))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	grp-&gt;count++;</div><div class='del'>-	if (grp-&gt;open &amp;&amp; (port-&gt;callback_all || grp-&gt;count == 1)) {</div><div class='add'>+	if (grp-&gt;open &amp;&amp; grp-&gt;count == 1) {</div><div class='ctx'> 		err = grp-&gt;open(port-&gt;private_data, info);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			module_put(port-&gt;owner);</div><div class='hunk'>@@ -451,7 +450,7 @@ static int unsubscribe_port(struct snd_seq_client *client,</div><div class='ctx'> 	if (! grp-&gt;count)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	grp-&gt;count--;</div><div class='del'>-	if (grp-&gt;close &amp;&amp; (port-&gt;callback_all || grp-&gt;count == 0))</div><div class='add'>+	if (grp-&gt;close &amp;&amp; grp-&gt;count == 0)</div><div class='ctx'> 		err = grp-&gt;close(port-&gt;private_data, info);</div><div class='ctx'> 	if (send_ack &amp;&amp; client-&gt;type == USER_CLIENT)</div><div class='ctx'> 		snd_seq_client_notify_subscription(port-&gt;addr.client, port-&gt;addr.port,</div><div class='hunk'>@@ -483,6 +482,84 @@ static int match_subs_info(struct snd_seq_port_subscribe *r,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int check_and_subscribe_port(struct snd_seq_client *client,</div><div class='add'>+				    struct snd_seq_client_port *port,</div><div class='add'>+				    struct snd_seq_subscribers *subs,</div><div class='add'>+				    bool is_src, bool exclusive, bool ack)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_port_subs_info *grp;</div><div class='add'>+	struct list_head *p;</div><div class='add'>+	struct snd_seq_subscribers *s;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	grp = is_src ? &amp;port-&gt;c_src : &amp;port-&gt;c_dest;</div><div class='add'>+	guard(rwsem_write)(&amp;grp-&gt;list_mutex);</div><div class='add'>+	if (exclusive) {</div><div class='add'>+		if (!list_empty(&amp;grp-&gt;list_head))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	} else {</div><div class='add'>+		if (grp-&gt;exclusive)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		/* check whether already exists */</div><div class='add'>+		list_for_each(p, &amp;grp-&gt;list_head) {</div><div class='add'>+			s = get_subscriber(p, is_src);</div><div class='add'>+			if (match_subs_info(&amp;subs-&gt;info, &amp;s-&gt;info))</div><div class='add'>+				return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = subscribe_port(client, port, grp, &amp;subs-&gt;info, ack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		grp-&gt;exclusive = 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add to list */</div><div class='add'>+	guard(write_lock_irq)(&amp;grp-&gt;list_lock);</div><div class='add'>+	if (is_src)</div><div class='add'>+		list_add_tail(&amp;subs-&gt;src_list, &amp;grp-&gt;list_head);</div><div class='add'>+	else</div><div class='add'>+		list_add_tail(&amp;subs-&gt;dest_list, &amp;grp-&gt;list_head);</div><div class='add'>+	grp-&gt;exclusive = exclusive;</div><div class='add'>+	atomic_inc(&amp;subs-&gt;ref_count);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called with grp-&gt;list_mutex held */</div><div class='add'>+static void __delete_and_unsubscribe_port(struct snd_seq_client *client,</div><div class='add'>+					  struct snd_seq_client_port *port,</div><div class='add'>+					  struct snd_seq_subscribers *subs,</div><div class='add'>+					  bool is_src, bool ack)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_port_subs_info *grp;</div><div class='add'>+	struct list_head *list;</div><div class='add'>+	bool empty;</div><div class='add'>+</div><div class='add'>+	grp = is_src ? &amp;port-&gt;c_src : &amp;port-&gt;c_dest;</div><div class='add'>+	list = is_src ? &amp;subs-&gt;src_list : &amp;subs-&gt;dest_list;</div><div class='add'>+	scoped_guard(write_lock_irq, &amp;grp-&gt;list_lock) {</div><div class='add'>+		empty = list_empty(list);</div><div class='add'>+		if (!empty)</div><div class='add'>+			list_del_init(list);</div><div class='add'>+		grp-&gt;exclusive = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!empty)</div><div class='add'>+		unsubscribe_port(client, port, grp, &amp;subs-&gt;info, ack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_and_unsubscribe_port(struct snd_seq_client *client,</div><div class='add'>+					struct snd_seq_client_port *port,</div><div class='add'>+					struct snd_seq_subscribers *subs,</div><div class='add'>+					bool is_src, bool ack)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_port_subs_info *grp;</div><div class='add'>+</div><div class='add'>+	grp = is_src ? &amp;port-&gt;c_src : &amp;port-&gt;c_dest;</div><div class='add'>+	guard(rwsem_write)(&amp;grp-&gt;list_mutex);</div><div class='add'>+	__delete_and_unsubscribe_port(client, port, subs, is_src, ack);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* connect two ports */</div><div class='ctx'> int snd_seq_port_connect(struct snd_seq_client *connector,</div><div class='hunk'>@@ -492,76 +569,42 @@ int snd_seq_port_connect(struct snd_seq_client *connector,</div><div class='ctx'> 			 struct snd_seq_client_port *dest_port,</div><div class='ctx'> 			 struct snd_seq_port_subscribe *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_port_subs_info *src = &amp;src_port-&gt;c_src;</div><div class='del'>-	struct snd_seq_port_subs_info *dest = &amp;dest_port-&gt;c_dest;</div><div class='del'>-	struct snd_seq_subscribers *subs, *s;</div><div class='del'>-	int err, src_called = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int exclusive;</div><div class='add'>+	struct snd_seq_subscribers *subs;</div><div class='add'>+	bool exclusive;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	subs = kzalloc(sizeof(*subs), GFP_KERNEL);</div><div class='del'>-	if (! subs)</div><div class='add'>+	if (!subs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	subs-&gt;info = *info;</div><div class='del'>-	atomic_set(&amp;subs-&gt;ref_count, 2);</div><div class='add'>+	atomic_set(&amp;subs-&gt;ref_count, 0);</div><div class='add'>+	INIT_LIST_HEAD(&amp;subs-&gt;src_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;subs-&gt;dest_list);</div><div class='add'>+</div><div class='add'>+	exclusive = !!(info-&gt;flags &amp; SNDRV_SEQ_PORT_SUBS_EXCLUSIVE);</div><div class='add'>+</div><div class='add'>+	err = check_and_subscribe_port(src_client, src_port, subs, true,</div><div class='add'>+				       exclusive,</div><div class='add'>+				       connector-&gt;number != src_client-&gt;number);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = check_and_subscribe_port(dest_client, dest_port, subs, false,</div><div class='add'>+				       exclusive,</div><div class='add'>+				       connector-&gt;number != dest_client-&gt;number);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_dest;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;src-&gt;list_mutex);</div><div class='del'>-	down_write_nested(&amp;dest-&gt;list_mutex, SINGLE_DEPTH_NESTING);</div><div class='del'>-</div><div class='del'>-	exclusive = info-&gt;flags &amp; SNDRV_SEQ_PORT_SUBS_EXCLUSIVE ? 1 : 0;</div><div class='del'>-	err = -EBUSY;</div><div class='del'>-	if (exclusive) {</div><div class='del'>-		if (! list_empty(&amp;src-&gt;list_head) || ! list_empty(&amp;dest-&gt;list_head))</div><div class='del'>-			goto __error;</div><div class='del'>-	} else {</div><div class='del'>-		if (src-&gt;exclusive || dest-&gt;exclusive)</div><div class='del'>-			goto __error;</div><div class='del'>-		/* check whether already exists */</div><div class='del'>-		list_for_each_entry(s, &amp;src-&gt;list_head, src_list) {</div><div class='del'>-			if (match_subs_info(info, &amp;s-&gt;info))</div><div class='del'>-				goto __error;</div><div class='del'>-		}</div><div class='del'>-		list_for_each_entry(s, &amp;dest-&gt;list_head, dest_list) {</div><div class='del'>-			if (match_subs_info(info, &amp;s-&gt;info))</div><div class='del'>-				goto __error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = subscribe_port(src_client, src_port, src, info,</div><div class='del'>-				  connector-&gt;number != src_client-&gt;number)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-	src_called = 1;</div><div class='del'>-</div><div class='del'>-	if ((err = subscribe_port(dest_client, dest_port, dest, info,</div><div class='del'>-				  connector-&gt;number != dest_client-&gt;number)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-</div><div class='del'>-	/* add to list */</div><div class='del'>-	write_lock_irqsave(&amp;src-&gt;list_lock, flags);</div><div class='del'>-	// write_lock(&amp;dest-&gt;list_lock); // no other lock yet</div><div class='del'>-	list_add_tail(&amp;subs-&gt;src_list, &amp;src-&gt;list_head);</div><div class='del'>-	list_add_tail(&amp;subs-&gt;dest_list, &amp;dest-&gt;list_head);</div><div class='del'>-	// write_unlock(&amp;dest-&gt;list_lock); // no other lock yet</div><div class='del'>-	write_unlock_irqrestore(&amp;src-&gt;list_lock, flags);</div><div class='del'>-</div><div class='del'>-	src-&gt;exclusive = dest-&gt;exclusive = exclusive;</div><div class='del'>-</div><div class='del'>-	up_write(&amp;dest-&gt;list_mutex);</div><div class='del'>-	up_write(&amp;src-&gt;list_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- __error:</div><div class='del'>-	if (src_called)</div><div class='del'>-		unsubscribe_port(src_client, src_port, src, info,</div><div class='del'>-				 connector-&gt;number != src_client-&gt;number);</div><div class='add'>+ error_dest:</div><div class='add'>+	delete_and_unsubscribe_port(src_client, src_port, subs, true,</div><div class='add'>+				    connector-&gt;number != src_client-&gt;number);</div><div class='add'>+ error:</div><div class='ctx'> 	kfree(subs);</div><div class='del'>-	up_write(&amp;dest-&gt;list_mutex);</div><div class='del'>-	up_write(&amp;src-&gt;list_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* remove the connection */</div><div class='ctx'> int snd_seq_port_disconnect(struct snd_seq_client *connector,</div><div class='ctx'> 			    struct snd_seq_client *src_client,</div><div class='hunk'>@@ -570,56 +613,52 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector,</div><div class='ctx'> 			    struct snd_seq_client_port *dest_port,</div><div class='ctx'> 			    struct snd_seq_port_subscribe *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_port_subs_info *src = &amp;src_port-&gt;c_src;</div><div class='ctx'> 	struct snd_seq_port_subs_info *dest = &amp;dest_port-&gt;c_dest;</div><div class='ctx'> 	struct snd_seq_subscribers *subs;</div><div class='ctx'> 	int err = -ENOENT;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	down_write(&amp;src-&gt;list_mutex);</div><div class='del'>-	down_write_nested(&amp;dest-&gt;list_mutex, SINGLE_DEPTH_NESTING);</div><div class='del'>-</div><div class='del'>-	/* look for the connection */</div><div class='del'>-	list_for_each_entry(subs, &amp;src-&gt;list_head, src_list) {</div><div class='del'>-		if (match_subs_info(info, &amp;subs-&gt;info)) {</div><div class='del'>-			write_lock_irqsave(&amp;src-&gt;list_lock, flags);</div><div class='del'>-			// write_lock(&amp;dest-&gt;list_lock);  // no lock yet</div><div class='del'>-			list_del(&amp;subs-&gt;src_list);</div><div class='del'>-			list_del(&amp;subs-&gt;dest_list);</div><div class='del'>-			// write_unlock(&amp;dest-&gt;list_lock);</div><div class='del'>-			write_unlock_irqrestore(&amp;src-&gt;list_lock, flags);</div><div class='del'>-			src-&gt;exclusive = dest-&gt;exclusive = 0;</div><div class='del'>-			unsubscribe_port(src_client, src_port, src, info,</div><div class='del'>-					 connector-&gt;number != src_client-&gt;number);</div><div class='del'>-			unsubscribe_port(dest_client, dest_port, dest, info,</div><div class='del'>-					 connector-&gt;number != dest_client-&gt;number);</div><div class='del'>-			kfree(subs);</div><div class='del'>-			err = 0;</div><div class='del'>-			break;</div><div class='add'>+</div><div class='add'>+	/* always start from deleting the dest port for avoiding concurrent</div><div class='add'>+	 * deletions</div><div class='add'>+	 */</div><div class='add'>+	scoped_guard(rwsem_write, &amp;dest-&gt;list_mutex) {</div><div class='add'>+		/* look for the connection */</div><div class='add'>+		list_for_each_entry(subs, &amp;dest-&gt;list_head, dest_list) {</div><div class='add'>+			if (match_subs_info(info, &amp;subs-&gt;info)) {</div><div class='add'>+				__delete_and_unsubscribe_port(dest_client, dest_port,</div><div class='add'>+							      subs, false,</div><div class='add'>+							      connector-&gt;number != dest_client-&gt;number);</div><div class='add'>+				err = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	up_write(&amp;dest-&gt;list_mutex);</div><div class='del'>-	up_write(&amp;src-&gt;list_mutex);</div><div class='del'>-	return err;</div><div class='add'>+	delete_and_unsubscribe_port(src_client, src_port, subs, true,</div><div class='add'>+				    connector-&gt;number != src_client-&gt;number);</div><div class='add'>+	kfree(subs);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* get matched subscriber */</div><div class='del'>-struct snd_seq_subscribers *snd_seq_port_get_subscription(struct snd_seq_port_subs_info *src_grp,</div><div class='del'>-							  struct snd_seq_addr *dest_addr)</div><div class='add'>+int snd_seq_port_get_subscription(struct snd_seq_port_subs_info *src_grp,</div><div class='add'>+				  struct snd_seq_addr *dest_addr,</div><div class='add'>+				  struct snd_seq_port_subscribe *subs)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_subscribers *s, *found = NULL;</div><div class='add'>+	struct snd_seq_subscribers *s;</div><div class='add'>+	int err = -ENOENT;</div><div class='ctx'> </div><div class='del'>-	down_read(&amp;src_grp-&gt;list_mutex);</div><div class='add'>+	guard(rwsem_read)(&amp;src_grp-&gt;list_mutex);</div><div class='ctx'> 	list_for_each_entry(s, &amp;src_grp-&gt;list_head, src_list) {</div><div class='ctx'> 		if (addr_match(dest_addr, &amp;s-&gt;info.dest)) {</div><div class='del'>-			found = s;</div><div class='add'>+			*subs = s-&gt;info;</div><div class='add'>+			err = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	up_read(&amp;src_grp-&gt;list_mutex);</div><div class='del'>-	return found;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -640,7 +679,7 @@ int snd_seq_event_port_attach(int client,</div><div class='ctx'> 	/* Set up the port */</div><div class='ctx'> 	memset(&amp;portinfo, 0, sizeof(portinfo));</div><div class='ctx'> 	portinfo.addr.client = client;</div><div class='del'>-	strlcpy(portinfo.name, portname ? portname : "Unamed port",</div><div class='add'>+	strscpy(portinfo.name, portname ? portname : "Unnamed port",</div><div class='ctx'> 		sizeof(portinfo.name));</div><div class='ctx'> </div><div class='ctx'> 	portinfo.capability = cap;</div><div class='hunk'>@@ -659,7 +698,6 @@ int snd_seq_event_port_attach(int client,</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_event_port_attach);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -680,5 +718,4 @@ int snd_seq_event_port_detach(int client, int port)</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_seq_event_port_detach);</div><div class='head'>diff --git a/sound/core/seq/seq_ports.h b/sound/core/seq/seq_ports.h<br/>index 9d7117118ba4..40ed6cf7cb90 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ports.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_ports.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ports.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_ports.h</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Ports </div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_PORTS_H</div><div class='ctx'> #define __SND_SEQ_PORTS_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='add'>+#include &lt;sound/ump_convert.h&gt;</div><div class='ctx'> #include "seq_lock.h"</div><div class='ctx'> </div><div class='ctx'> /* list of 'exported' ports */</div><div class='hunk'>@@ -73,7 +59,6 @@ struct snd_seq_client_port {</div><div class='ctx'> 			   int atomic, int hop);</div><div class='ctx'> 	void (*private_free)(void *private_data);</div><div class='ctx'> 	void *private_data;</div><div class='del'>-	unsigned int callback_all : 1;</div><div class='ctx'> 	unsigned int closing : 1;</div><div class='ctx'> 	unsigned int timestamping: 1;</div><div class='ctx'> 	unsigned int time_real: 1;</div><div class='hunk'>@@ -88,6 +73,15 @@ struct snd_seq_client_port {</div><div class='ctx'> 	int midi_voices;</div><div class='ctx'> 	int synth_voices;</div><div class='ctx'> 		</div><div class='add'>+	/* UMP direction and group */</div><div class='add'>+	unsigned char direction;</div><div class='add'>+	unsigned char ump_group;</div><div class='add'>+</div><div class='add'>+	bool is_midi1;	/* keep MIDI 1.0 protocol */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQ_UMP)</div><div class='add'>+	struct ump_cvt_to_ump_bank midi2_bank[16]; /* per channel */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct snd_seq_client;</div><div class='hunk'>@@ -102,8 +96,11 @@ struct snd_seq_client_port *snd_seq_port_query_nearest(struct snd_seq_client *cl</div><div class='ctx'> /* unlock the port */</div><div class='ctx'> #define snd_seq_port_unlock(port) snd_use_lock_free(&amp;(port)-&gt;use_lock)</div><div class='ctx'> </div><div class='del'>-/* create a port, port number is returned (-1 on failure) */</div><div class='del'>-struct snd_seq_client_port *snd_seq_create_port(struct snd_seq_client *client, int port_index);</div><div class='add'>+DEFINE_FREE(snd_seq_port, struct snd_seq_client_port *, if (!IS_ERR_OR_NULL(_T)) snd_seq_port_unlock(_T))</div><div class='add'>+</div><div class='add'>+/* create a port, port number or a negative error code is returned */</div><div class='add'>+int snd_seq_create_port(struct snd_seq_client *client, int port_index,</div><div class='add'>+			struct snd_seq_client_port **port_ret);</div><div class='ctx'> </div><div class='ctx'> /* delete a port */</div><div class='ctx'> int snd_seq_delete_port(struct snd_seq_client *client, int port);</div><div class='hunk'>@@ -136,7 +133,8 @@ int snd_seq_port_subscribe(struct snd_seq_client_port *port,</div><div class='ctx'> 			   struct snd_seq_port_subscribe *info);</div><div class='ctx'> </div><div class='ctx'> /* get matched subscriber */</div><div class='del'>-struct snd_seq_subscribers *snd_seq_port_get_subscription(struct snd_seq_port_subs_info *src_grp,</div><div class='del'>-							  struct snd_seq_addr *dest_addr);</div><div class='add'>+int snd_seq_port_get_subscription(struct snd_seq_port_subs_info *src_grp,</div><div class='add'>+				  struct snd_seq_addr *dest_addr,</div><div class='add'>+				  struct snd_seq_port_subscribe *subs);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c<br/>index 29896ab23403..e649485a8772 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_prioq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_prioq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_prioq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_prioq.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Priority Queue</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -59,10 +44,8 @@ struct snd_seq_prioq *snd_seq_prioq_new(void)</div><div class='ctx'> 	struct snd_seq_prioq *f;</div><div class='ctx'> </div><div class='ctx'> 	f = kzalloc(sizeof(*f), GFP_KERNEL);</div><div class='del'>-	if (f == NULL) {</div><div class='del'>-		snd_printd("oops: malloc failed for snd_seq_prioq_new()\n");</div><div class='add'>+	if (!f)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	spin_lock_init(&amp;f-&gt;lock);</div><div class='ctx'> 	f-&gt;head = NULL;</div><div class='hunk'>@@ -79,7 +62,7 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo)</div><div class='ctx'> 	*fifo = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (f == NULL) {</div><div class='del'>-		snd_printd("oops: snd_seq_prioq_delete() called with NULL prioq\n");</div><div class='add'>+		pr_debug("ALSA: seq: snd_seq_prioq_delete() called with NULL prioq\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +72,7 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo)</div><div class='ctx'> 	if (f-&gt;cells &gt; 0) {</div><div class='ctx'> 		/* drain prioQ */</div><div class='ctx'> 		while (f-&gt;cells &gt; 0)</div><div class='del'>-			snd_seq_cell_free(snd_seq_prioq_cell_out(f));</div><div class='add'>+			snd_seq_cell_free(snd_seq_prioq_cell_out(f, NULL));</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	kfree(f);</div><div class='hunk'>@@ -149,7 +132,6 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,</div><div class='ctx'> 			  struct snd_seq_event_cell * cell)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cur, *prev;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int count;</div><div class='ctx'> 	int prior;</div><div class='ctx'> </div><div class='hunk'>@@ -159,7 +141,7 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,</div><div class='ctx'> 	/* check flags */</div><div class='ctx'> 	prior = (cell-&gt;event.flags &amp; SNDRV_SEQ_PRIORITY_MASK);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;f-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* check if this element needs to inserted at the end (ie. ordered </div><div class='ctx'> 	   data is inserted) This will be very likeley if a sequencer </div><div class='hunk'>@@ -171,7 +153,6 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,</div><div class='ctx'> 			f-&gt;tail = cell;</div><div class='ctx'> 			cell-&gt;next = NULL;</div><div class='ctx'> 			f-&gt;cells++;</div><div class='del'>-			spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -196,8 +177,7 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,</div><div class='ctx'> 		prev = cur;</div><div class='ctx'> 		cur = cur-&gt;next;</div><div class='ctx'> 		if (! --count) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='del'>-			snd_printk(KERN_ERR "cannot find a pointer.. infinite loop?\n");</div><div class='add'>+			pr_err("ALSA: seq: cannot find a pointer.. infinite loop?\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -212,23 +192,33 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f,</div><div class='ctx'> 	if (cur == NULL) /* reached end of the list */</div><div class='ctx'> 		f-&gt;tail = cell;</div><div class='ctx'> 	f-&gt;cells++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* return 1 if the current time &gt;= event timestamp */</div><div class='add'>+static int event_is_ready(struct snd_seq_event *ev, void *current_time)</div><div class='add'>+{</div><div class='add'>+	if ((ev-&gt;flags &amp; SNDRV_SEQ_TIME_STAMP_MASK) == SNDRV_SEQ_TIME_STAMP_TICK)</div><div class='add'>+		return snd_seq_compare_tick_time(current_time, &amp;ev-&gt;time.tick);</div><div class='add'>+	else</div><div class='add'>+		return snd_seq_compare_real_time(current_time, &amp;ev-&gt;time.time);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* dequeue cell from prioq */</div><div class='del'>-struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)</div><div class='add'>+struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f,</div><div class='add'>+						  void *current_time)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (f == NULL) {</div><div class='del'>-		snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");</div><div class='add'>+		pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	guard(spinlock_irqsave)(&amp;f-&gt;lock);</div><div class='ctx'> 	cell = f-&gt;head;</div><div class='add'>+	if (cell &amp;&amp; current_time &amp;&amp; !event_is_ready(&amp;cell-&gt;event, current_time))</div><div class='add'>+		cell = NULL;</div><div class='ctx'> 	if (cell) {</div><div class='ctx'> 		f-&gt;head = cell-&gt;next;</div><div class='ctx'> </div><div class='hunk'>@@ -240,7 +230,6 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)</div><div class='ctx'> 		f-&gt;cells--;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);</div><div class='ctx'> 	return cell;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -248,91 +237,49 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)</div><div class='ctx'> int snd_seq_prioq_avail(struct snd_seq_prioq * f)</div><div class='ctx'> {</div><div class='ctx'> 	if (f == NULL) {</div><div class='del'>-		snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");</div><div class='add'>+		pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return f-&gt;cells;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* peek at cell at the head of the prioq */</div><div class='del'>-struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq * f)</div><div class='del'>-{</div><div class='del'>-	if (f == NULL) {</div><div class='del'>-		snd_printd("oops: snd_seq_prioq_cell_in() called with NULL prioq\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return f-&gt;head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int prioq_match(struct snd_seq_event_cell *cell,</div><div class='del'>-			      int client, int timestamp)</div><div class='del'>-{</div><div class='del'>-	if (cell-&gt;event.source.client == client ||</div><div class='del'>-	    cell-&gt;event.dest.client == client)</div><div class='del'>-		return 1;</div><div class='del'>-	if (!timestamp)</div><div class='del'>-		return 0;</div><div class='del'>-	switch (cell-&gt;event.flags &amp; SNDRV_SEQ_TIME_STAMP_MASK) {</div><div class='del'>-	case SNDRV_SEQ_TIME_STAMP_TICK:</div><div class='del'>-		if (cell-&gt;event.time.tick)</div><div class='del'>-			return 1;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_SEQ_TIME_STAMP_REAL:</div><div class='del'>-		if (cell-&gt;event.time.time.tv_sec ||</div><div class='del'>-		    cell-&gt;event.time.time.tv_nsec)</div><div class='del'>-			return 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* remove cells for left client */</div><div class='del'>-void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp)</div><div class='add'>+/* remove cells matching with the condition */</div><div class='add'>+static void prioq_remove_cells(struct snd_seq_prioq *f,</div><div class='add'>+			       bool (*match)(struct snd_seq_event_cell *cell,</div><div class='add'>+					     void *arg),</div><div class='add'>+			       void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	register struct snd_seq_event_cell *cell, *next;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_event_cell *prev = NULL;</div><div class='ctx'> 	struct snd_seq_event_cell *freefirst = NULL, *freeprev = NULL, *freenext;</div><div class='ctx'> </div><div class='ctx'> 	/* collect all removed cells */</div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='del'>-	cell = f-&gt;head;</div><div class='del'>-	while (cell) {</div><div class='del'>-		next = cell-&gt;next;</div><div class='del'>-		if (prioq_match(cell, client, timestamp)) {</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;f-&gt;lock) {</div><div class='add'>+		for (cell = f-&gt;head; cell; cell = next) {</div><div class='add'>+			next = cell-&gt;next;</div><div class='add'>+			if (!match(cell, arg)) {</div><div class='add'>+				prev = cell;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			/* remove cell from prioq */</div><div class='del'>-			if (cell == f-&gt;head) {</div><div class='add'>+			if (cell == f-&gt;head)</div><div class='ctx'> 				f-&gt;head = cell-&gt;next;</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				prev-&gt;next = cell-&gt;next;</div><div class='del'>-			}</div><div class='ctx'> 			if (cell == f-&gt;tail)</div><div class='ctx'> 				f-&gt;tail = cell-&gt;next;</div><div class='ctx'> 			f-&gt;cells--;</div><div class='add'>+</div><div class='ctx'> 			/* add cell to free list */</div><div class='ctx'> 			cell-&gt;next = NULL;</div><div class='del'>-			if (freefirst == NULL) {</div><div class='add'>+			if (freefirst == NULL)</div><div class='ctx'> 				freefirst = cell;</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				freeprev-&gt;next = cell;</div><div class='del'>-			}</div><div class='ctx'> 			freeprev = cell;</div><div class='del'>-		} else {</div><div class='del'>-#if 0</div><div class='del'>-			printk(KERN_DEBUG "type = %i, source = %i, dest = %i, "</div><div class='del'>-			       "client = %i\n",</div><div class='del'>-				cell-&gt;event.type,</div><div class='del'>-				cell-&gt;event.source.client,</div><div class='del'>-				cell-&gt;event.dest.client,</div><div class='del'>-				client);</div><div class='del'>-#endif</div><div class='del'>-			prev = cell;</div><div class='ctx'> 		}</div><div class='del'>-		cell = next;		</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);	</div><div class='ctx'> </div><div class='ctx'> 	/* remove selected cells */</div><div class='ctx'> 	while (freefirst) {</div><div class='hunk'>@@ -342,22 +289,68 @@ void snd_seq_prioq_leave(struct snd_seq_prioq * f, int client, int timestamp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prioq_remove_match(struct snd_seq_remove_events *info,</div><div class='del'>-			      struct snd_seq_event *ev)</div><div class='add'>+struct prioq_match_arg {</div><div class='add'>+	int client;</div><div class='add'>+	int timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool prioq_match(struct snd_seq_event_cell *cell, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct prioq_match_arg *v = arg;</div><div class='add'>+</div><div class='add'>+	if (cell-&gt;event.source.client == v-&gt;client ||</div><div class='add'>+	    cell-&gt;event.dest.client == v-&gt;client)</div><div class='add'>+		return true;</div><div class='add'>+	if (!v-&gt;timestamp)</div><div class='add'>+		return false;</div><div class='add'>+	switch (cell-&gt;event.flags &amp; SNDRV_SEQ_TIME_STAMP_MASK) {</div><div class='add'>+	case SNDRV_SEQ_TIME_STAMP_TICK:</div><div class='add'>+		if (cell-&gt;event.time.tick)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_SEQ_TIME_STAMP_REAL:</div><div class='add'>+		if (cell-&gt;event.time.time.tv_sec ||</div><div class='add'>+		    cell-&gt;event.time.time.tv_nsec)</div><div class='add'>+			return true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* remove cells for left client */</div><div class='add'>+void snd_seq_prioq_leave(struct snd_seq_prioq *f, int client, int timestamp)</div><div class='ctx'> {</div><div class='add'>+	struct prioq_match_arg arg = { client, timestamp };</div><div class='add'>+</div><div class='add'>+	return prioq_remove_cells(f, prioq_match, &amp;arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct prioq_remove_match_arg {</div><div class='add'>+	int client;</div><div class='add'>+	struct snd_seq_remove_events *info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool prioq_remove_match(struct snd_seq_event_cell *cell, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct prioq_remove_match_arg *v = arg;</div><div class='add'>+	struct snd_seq_event *ev = &amp;cell-&gt;event;</div><div class='add'>+	struct snd_seq_remove_events *info = v-&gt;info;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='add'>+	if (ev-&gt;source.client != v-&gt;client)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_DEST) {</div><div class='ctx'> 		if (ev-&gt;dest.client != info-&gt;dest.client ||</div><div class='ctx'> 				ev-&gt;dest.port != info-&gt;dest.port)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_DEST_CHANNEL) {</div><div class='ctx'> 		if (! snd_seq_ev_is_channel_type(ev))</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 		/* data.note.channel and data.control.channel are identical */</div><div class='ctx'> 		if (ev-&gt;data.note.channel != info-&gt;channel)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_TIME_AFTER) {</div><div class='ctx'> 		if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_TIME_TICK)</div><div class='hunk'>@@ -365,7 +358,7 @@ static int prioq_remove_match(struct snd_seq_remove_events *info,</div><div class='ctx'> 		else</div><div class='ctx'> 			res = snd_seq_compare_real_time(&amp;ev-&gt;time.time, &amp;info-&gt;time.time);</div><div class='ctx'> 		if (!res)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_TIME_BEFORE) {</div><div class='ctx'> 		if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_TIME_TICK)</div><div class='hunk'>@@ -373,81 +366,35 @@ static int prioq_remove_match(struct snd_seq_remove_events *info,</div><div class='ctx'> 		else</div><div class='ctx'> 			res = snd_seq_compare_real_time(&amp;ev-&gt;time.time, &amp;info-&gt;time.time);</div><div class='ctx'> 		if (res)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_EVENT_TYPE) {</div><div class='ctx'> 		if (ev-&gt;type != info-&gt;type)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_IGNORE_OFF) {</div><div class='ctx'> 		/* Do not remove off events */</div><div class='ctx'> 		switch (ev-&gt;type) {</div><div class='ctx'> 		case SNDRV_SEQ_EVENT_NOTEOFF:</div><div class='ctx'> 		/* case SNDRV_SEQ_EVENT_SAMPLE_STOP: */</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_TAG_MATCH) {</div><div class='ctx'> 		if (info-&gt;tag != ev-&gt;tag)</div><div class='del'>-			return 0;</div><div class='add'>+			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* remove cells matching remove criteria */</div><div class='ctx'> void snd_seq_prioq_remove_events(struct snd_seq_prioq * f, int client,</div><div class='ctx'> 				 struct snd_seq_remove_events *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_event_cell *cell, *next;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct snd_seq_event_cell *prev = NULL;</div><div class='del'>-	struct snd_seq_event_cell *freefirst = NULL, *freeprev = NULL, *freenext;</div><div class='del'>-</div><div class='del'>-	/* collect all removed cells */</div><div class='del'>-	spin_lock_irqsave(&amp;f-&gt;lock, flags);</div><div class='del'>-	cell = f-&gt;head;</div><div class='del'>-</div><div class='del'>-	while (cell) {</div><div class='del'>-		next = cell-&gt;next;</div><div class='del'>-		if (cell-&gt;event.source.client == client &amp;&amp;</div><div class='del'>-			prioq_remove_match(info, &amp;cell-&gt;event)) {</div><div class='del'>-</div><div class='del'>-			/* remove cell from prioq */</div><div class='del'>-			if (cell == f-&gt;head) {</div><div class='del'>-				f-&gt;head = cell-&gt;next;</div><div class='del'>-			} else {</div><div class='del'>-				prev-&gt;next = cell-&gt;next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (cell == f-&gt;tail)</div><div class='del'>-				f-&gt;tail = cell-&gt;next;</div><div class='del'>-			f-&gt;cells--;</div><div class='del'>-</div><div class='del'>-			/* add cell to free list */</div><div class='del'>-			cell-&gt;next = NULL;</div><div class='del'>-			if (freefirst == NULL) {</div><div class='del'>-				freefirst = cell;</div><div class='del'>-			} else {</div><div class='del'>-				freeprev-&gt;next = cell;</div><div class='del'>-			}</div><div class='add'>+	struct prioq_remove_match_arg arg = { client, info };</div><div class='ctx'> </div><div class='del'>-			freeprev = cell;</div><div class='del'>-		} else {</div><div class='del'>-			prev = cell;</div><div class='del'>-		}</div><div class='del'>-		cell = next;		</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;f-&gt;lock, flags);	</div><div class='del'>-</div><div class='del'>-	/* remove selected cells */</div><div class='del'>-	while (freefirst) {</div><div class='del'>-		freenext = freefirst-&gt;next;</div><div class='del'>-		snd_seq_cell_free(freefirst);</div><div class='del'>-		freefirst = freenext;</div><div class='del'>-	}</div><div class='add'>+	return prioq_remove_cells(f, prioq_remove_match, &amp;arg);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/sound/core/seq/seq_prioq.h b/sound/core/seq/seq_prioq.h<br/>index d38bb78d9345..5811a87deb8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_prioq.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_prioq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_prioq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_prioq.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Priority Queue</div><div class='ctx'>  *   Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_PRIOQ_H</div><div class='ctx'> #define __SND_SEQ_PRIOQ_H</div><div class='hunk'>@@ -44,14 +29,12 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo);</div><div class='ctx'> int snd_seq_prioq_cell_in(struct snd_seq_prioq *f, struct snd_seq_event_cell *cell);</div><div class='ctx'> </div><div class='ctx'> /* dequeue cell from prioq */ </div><div class='del'>-struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f);</div><div class='add'>+struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f,</div><div class='add'>+						  void *current_time);</div><div class='ctx'> </div><div class='ctx'> /* return number of events available in prioq */</div><div class='ctx'> int snd_seq_prioq_avail(struct snd_seq_prioq *f);</div><div class='ctx'> </div><div class='del'>-/* peek at cell at the head of the prioq */</div><div class='del'>-struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq *f);</div><div class='del'>-</div><div class='ctx'> /* client left queue */</div><div class='ctx'> void snd_seq_prioq_leave(struct snd_seq_prioq *f, int client, int timestamp);        </div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c<br/>index e7a8e9e4edb2..f5c0e401c8ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_queue.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_queue.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_queue.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_queue.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Timing queue handling</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * MAJOR CHANGES</div><div class='ctx'>  *   Nov. 13, 1999	Takashi Iwai &lt;iwai@ww.uni-erlangen.de&gt;</div><div class='ctx'>  *     - Queues are allocated dynamically via ioctl.</div><div class='hunk'>@@ -63,43 +50,35 @@ int snd_seq_queue_get_cur_queues(void)</div><div class='ctx'> static int queue_list_add(struct snd_seq_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;queue_list_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;queue_list_lock);</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='ctx'> 		if (! queue_list[i]) {</div><div class='ctx'> 			queue_list[i] = q;</div><div class='ctx'> 			q-&gt;queue = i;</div><div class='ctx'> 			num_queues++;</div><div class='del'>-			spin_unlock_irqrestore(&amp;queue_list_lock, flags);</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;queue_list_lock, flags);</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_seq_queue *queue_list_remove(int id, int client)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_queue *q;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;queue_list_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;queue_list_lock);</div><div class='ctx'> 	q = queue_list[id];</div><div class='ctx'> 	if (q) {</div><div class='del'>-		spin_lock(&amp;q-&gt;owner_lock);</div><div class='add'>+		guard(spinlock)(&amp;q-&gt;owner_lock);</div><div class='ctx'> 		if (q-&gt;owner == client) {</div><div class='ctx'> 			/* found */</div><div class='ctx'> 			q-&gt;klocked = 1;</div><div class='del'>-			spin_unlock(&amp;q-&gt;owner_lock);</div><div class='ctx'> 			queue_list[id] = NULL;</div><div class='ctx'> 			num_queues--;</div><div class='del'>-			spin_unlock_irqrestore(&amp;queue_list_lock, flags);</div><div class='ctx'> 			return q;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;q-&gt;owner_lock);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;queue_list_lock, flags);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -111,10 +90,8 @@ static struct snd_seq_queue *queue_new(int owner, int locked)</div><div class='ctx'> 	struct snd_seq_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	q = kzalloc(sizeof(*q), GFP_KERNEL);</div><div class='del'>-	if (q == NULL) {</div><div class='del'>-		snd_printd("malloc failed for snd_seq_queue_new()\n");</div><div class='add'>+	if (!q)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;owner_lock);</div><div class='ctx'> 	spin_lock_init(&amp;q-&gt;check_lock);</div><div class='hunk'>@@ -144,8 +121,10 @@ static struct snd_seq_queue *queue_new(int owner, int locked)</div><div class='ctx'> static void queue_delete(struct snd_seq_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	/* stop and release the timer */</div><div class='add'>+	mutex_lock(&amp;q-&gt;timer_mutex);</div><div class='ctx'> 	snd_seq_timer_stop(q-&gt;timer);</div><div class='ctx'> 	snd_seq_timer_close(q);</div><div class='add'>+	mutex_unlock(&amp;q-&gt;timer_mutex);</div><div class='ctx'> 	/* wait until access free */</div><div class='ctx'> 	snd_use_lock_sync(&amp;q-&gt;use_lock);</div><div class='ctx'> 	/* release resources... */</div><div class='hunk'>@@ -159,18 +138,8 @@ static void queue_delete(struct snd_seq_queue *q)</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* setup queues */</div><div class='del'>-int __init snd_seq_queues_init(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	memset(queue_list, 0, sizeof(queue_list));</div><div class='del'>-	num_queues = 0;</div><div class='del'>-	*/</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* delete all existing queues */</div><div class='del'>-void __exit snd_seq_queues_delete(void)</div><div class='add'>+void snd_seq_queues_delete(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -181,23 +150,29 @@ void __exit snd_seq_queues_delete(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void queue_use(struct snd_seq_queue *queue, int client, int use);</div><div class='add'>+</div><div class='ctx'> /* allocate a new queue -</div><div class='del'>- * return queue index value or negative value for error</div><div class='add'>+ * return pointer to new queue or ERR_PTR(-errno) for error</div><div class='add'>+ * The new queue's use_lock is set to 1. It is the caller's responsibility to</div><div class='add'>+ * call snd_use_lock_free(&amp;q-&gt;use_lock).</div><div class='ctx'>  */</div><div class='del'>-int snd_seq_queue_alloc(int client, int locked, unsigned int info_flags)</div><div class='add'>+struct snd_seq_queue *snd_seq_queue_alloc(int client, int locked, unsigned int info_flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	q = queue_new(client, locked);</div><div class='ctx'> 	if (q == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	q-&gt;info_flags = info_flags;</div><div class='add'>+	queue_use(q, client, 1);</div><div class='add'>+	snd_use_lock_use(&amp;q-&gt;use_lock);</div><div class='ctx'> 	if (queue_list_add(q) &lt; 0) {</div><div class='add'>+		snd_use_lock_free(&amp;q-&gt;use_lock);</div><div class='ctx'> 		queue_delete(q);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='del'>-	snd_seq_queue_use(q-&gt;queue, client, 1); /* use this queue */</div><div class='del'>-	return q-&gt;queue;</div><div class='add'>+	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* delete a queue - queue must be owned by the client */</div><div class='hunk'>@@ -220,15 +195,13 @@ int snd_seq_queue_delete(int client, int queueid)</div><div class='ctx'> struct snd_seq_queue *queueptr(int queueid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_queue *q;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (queueid &lt; 0 || queueid &gt;= SNDRV_SEQ_MAX_QUEUES)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	spin_lock_irqsave(&amp;queue_list_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;queue_list_lock);</div><div class='ctx'> 	q = queue_list[queueid];</div><div class='ctx'> 	if (q)</div><div class='ctx'> 		snd_use_lock_use(&amp;q-&gt;use_lock);</div><div class='del'>-	spin_unlock_irqrestore(&amp;queue_list_lock, flags);</div><div class='ctx'> 	return q;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,13 +209,13 @@ struct snd_seq_queue *queueptr(int queueid)</div><div class='ctx'> struct snd_seq_queue *snd_seq_queue_find_name(char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) != NULL) {</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='add'>+		q = queueptr(i);</div><div class='add'>+		if (q) {</div><div class='ctx'> 			if (strncmp(q-&gt;name, name, sizeof(q-&gt;name)) == 0)</div><div class='del'>-				return q;</div><div class='del'>-			queuefree(q);</div><div class='add'>+				return no_free_ptr(q);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -251,61 +224,60 @@ struct snd_seq_queue *snd_seq_queue_find_name(char *name)</div><div class='ctx'> </div><div class='ctx'> /* -------------------------------------------------------- */</div><div class='ctx'> </div><div class='add'>+#define MAX_CELL_PROCESSES_IN_QUEUE	1000</div><div class='add'>+</div><div class='ctx'> void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_event_cell *cell;</div><div class='add'>+	snd_seq_tick_time_t cur_tick;</div><div class='add'>+	snd_seq_real_time_t cur_time;</div><div class='add'>+	int processed = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* make this function non-reentrant */</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;check_lock, flags);</div><div class='del'>-	if (q-&gt;check_blocked) {</div><div class='del'>-		q-&gt;check_again = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;q-&gt;check_lock, flags);</div><div class='del'>-		return;		/* other thread is already checking queues */</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;q-&gt;check_lock) {</div><div class='add'>+		if (q-&gt;check_blocked) {</div><div class='add'>+			q-&gt;check_again = 1;</div><div class='add'>+			return;	/* other thread is already checking queues */</div><div class='add'>+		}</div><div class='add'>+		q-&gt;check_blocked = 1;</div><div class='ctx'> 	}</div><div class='del'>-	q-&gt;check_blocked = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;check_lock, flags);</div><div class='ctx'> </div><div class='ctx'>       __again:</div><div class='ctx'> 	/* Process tick queue... */</div><div class='del'>-	while ((cell = snd_seq_prioq_cell_peek(q-&gt;tickq)) != NULL) {</div><div class='del'>-		if (snd_seq_compare_tick_time(&amp;q-&gt;timer-&gt;tick.cur_tick,</div><div class='del'>-					      &amp;cell-&gt;event.time.tick)) {</div><div class='del'>-			cell = snd_seq_prioq_cell_out(q-&gt;tickq);</div><div class='del'>-			if (cell)</div><div class='del'>-				snd_seq_dispatch_event(cell, atomic, hop);</div><div class='del'>-		} else {</div><div class='del'>-			/* event remains in the queue */</div><div class='add'>+	cur_tick = snd_seq_timer_get_cur_tick(q-&gt;timer);</div><div class='add'>+	for (;;) {</div><div class='add'>+		cell = snd_seq_prioq_cell_out(q-&gt;tickq, &amp;cur_tick);</div><div class='add'>+		if (!cell)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+		snd_seq_dispatch_event(cell, atomic, hop);</div><div class='add'>+		if (++processed &gt;= MAX_CELL_PROCESSES_IN_QUEUE)</div><div class='add'>+			goto out; /* the rest processed at the next batch */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	/* Process time queue... */</div><div class='del'>-	while ((cell = snd_seq_prioq_cell_peek(q-&gt;timeq)) != NULL) {</div><div class='del'>-		if (snd_seq_compare_real_time(&amp;q-&gt;timer-&gt;cur_time,</div><div class='del'>-					      &amp;cell-&gt;event.time.time)) {</div><div class='del'>-			cell = snd_seq_prioq_cell_out(q-&gt;timeq);</div><div class='del'>-			if (cell)</div><div class='del'>-				snd_seq_dispatch_event(cell, atomic, hop);</div><div class='del'>-		} else {</div><div class='del'>-			/* event remains in the queue */</div><div class='add'>+	cur_time = snd_seq_timer_get_cur_time(q-&gt;timer, false);</div><div class='add'>+	for (;;) {</div><div class='add'>+		cell = snd_seq_prioq_cell_out(q-&gt;timeq, &amp;cur_time);</div><div class='add'>+		if (!cell)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='add'>+		snd_seq_dispatch_event(cell, atomic, hop);</div><div class='add'>+		if (++processed &gt;= MAX_CELL_PROCESSES_IN_QUEUE)</div><div class='add'>+			goto out; /* the rest processed at the next batch */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+ out:</div><div class='ctx'> 	/* free lock */</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;check_lock, flags);</div><div class='del'>-	if (q-&gt;check_again) {</div><div class='del'>-		q-&gt;check_again = 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;q-&gt;check_lock, flags);</div><div class='del'>-		goto __again;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;q-&gt;check_lock) {</div><div class='add'>+		if (q-&gt;check_again) {</div><div class='add'>+			q-&gt;check_again = 0;</div><div class='add'>+			if (processed &lt; MAX_CELL_PROCESSES_IN_QUEUE)</div><div class='add'>+				goto __again;</div><div class='add'>+		}</div><div class='add'>+		q-&gt;check_blocked = 0;</div><div class='ctx'> 	}</div><div class='del'>-	q-&gt;check_blocked = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;check_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +285,7 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop)</div><div class='ctx'> int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> {</div><div class='ctx'> 	int dest, err;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!cell))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -348,16 +320,12 @@ int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		queuefree(q); /* unlock */</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* trigger dispatching */</div><div class='ctx'> 	snd_seq_check_queue(q, atomic, hop);</div><div class='ctx'> </div><div class='del'>-	queuefree(q); /* unlock */</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -374,41 +342,31 @@ static inline int check_access(struct snd_seq_queue *q, int client)</div><div class='ctx'>  */</div><div class='ctx'> static int queue_access_lock(struct snd_seq_queue *q, int client)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int access_ok;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;owner_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;q-&gt;owner_lock);</div><div class='ctx'> 	access_ok = check_access(q, client);</div><div class='ctx'> 	if (access_ok)</div><div class='ctx'> 		q-&gt;klocked = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;owner_lock, flags);</div><div class='ctx'> 	return access_ok;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* unlock the queue */</div><div class='ctx'> static inline void queue_access_unlock(struct snd_seq_queue *q)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;owner_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;q-&gt;owner_lock);</div><div class='ctx'> 	q-&gt;klocked = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;owner_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* exported - only checking permission */</div><div class='ctx'> int snd_seq_queue_check_access(int queueid, int client)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q = queueptr(queueid);</div><div class='del'>-	int access_ok;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(queueid);</div><div class='ctx'> </div><div class='ctx'> 	if (! q)</div><div class='ctx'> 		return 0;</div><div class='del'>-	spin_lock_irqsave(&amp;q-&gt;owner_lock, flags);</div><div class='del'>-	access_ok = check_access(q, client);</div><div class='del'>-	spin_unlock_irqrestore(&amp;q-&gt;owner_lock, flags);</div><div class='del'>-	queuefree(q);</div><div class='del'>-	return access_ok;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;q-&gt;owner_lock);</div><div class='add'>+	return check_access(q, client);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------*/</div><div class='hunk'>@@ -418,20 +376,19 @@ int snd_seq_queue_check_access(int queueid, int client)</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_queue_set_owner(int queueid, int client, int locked)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q = queueptr(queueid);</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(queueid);</div><div class='ctx'> </div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (! queue_access_lock(q, client)) {</div><div class='del'>-		queuefree(q);</div><div class='add'>+	if (!queue_access_lock(q, client))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	q-&gt;locked = locked ? 1 : 0;</div><div class='del'>-	q-&gt;owner = client;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;q-&gt;owner_lock) {</div><div class='add'>+		q-&gt;locked = locked ? 1 : 0;</div><div class='add'>+		q-&gt;owner = client;</div><div class='add'>+	}</div><div class='ctx'> 	queue_access_unlock(q);</div><div class='del'>-	queuefree(q);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -446,18 +403,18 @@ int snd_seq_queue_set_owner(int queueid, int client, int locked)</div><div class='ctx'> int snd_seq_queue_timer_open(int queueid)</div><div class='ctx'> {</div><div class='ctx'> 	int result = 0;</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='ctx'> 	queue = queueptr(queueid);</div><div class='ctx'> 	if (queue == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	tmr = queue-&gt;timer;</div><div class='del'>-	if ((result = snd_seq_timer_open(queue)) &lt; 0) {</div><div class='add'>+	result = snd_seq_timer_open(queue);</div><div class='add'>+	if (result &lt; 0) {</div><div class='ctx'> 		snd_seq_timer_defaults(tmr);</div><div class='ctx'> 		result = snd_seq_timer_open(queue);</div><div class='ctx'> 	}</div><div class='del'>-	queuefree(queue);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -466,16 +423,13 @@ int snd_seq_queue_timer_open(int queueid)</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_queue_timer_close(int queueid)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='del'>-	struct snd_seq_timer *tmr;</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='ctx'> 	queue = queueptr(queueid);</div><div class='ctx'> 	if (queue == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	tmr = queue-&gt;timer;</div><div class='ctx'> 	snd_seq_timer_close(queue);</div><div class='del'>-	queuefree(queue);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,40 +437,26 @@ int snd_seq_queue_timer_close(int queueid)</div><div class='ctx'> int snd_seq_queue_timer_set_tempo(int queueid, int client,</div><div class='ctx'> 				  struct snd_seq_queue_tempo *info)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q = queueptr(queueid);</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(queueid);</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (! queue_access_lock(q, client)) {</div><div class='del'>-		queuefree(q);</div><div class='add'>+	if (!queue_access_lock(q, client))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	result = snd_seq_timer_set_tempo(q-&gt;timer, info-&gt;tempo);</div><div class='del'>-	if (result &gt;= 0)</div><div class='del'>-		result = snd_seq_timer_set_ppq(q-&gt;timer, info-&gt;ppq);</div><div class='add'>+	result = snd_seq_timer_set_tempo_ppq(q-&gt;timer, info-&gt;tempo, info-&gt;ppq,</div><div class='add'>+					     info-&gt;tempo_base);</div><div class='ctx'> 	if (result &gt;= 0 &amp;&amp; info-&gt;skew_base &gt; 0)</div><div class='ctx'> 		result = snd_seq_timer_set_skew(q-&gt;timer, info-&gt;skew_value,</div><div class='ctx'> 						info-&gt;skew_base);</div><div class='ctx'> 	queue_access_unlock(q);</div><div class='del'>-	queuefree(q);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* use or unuse this queue -</div><div class='del'>- * if it is the first client, starts the timer.</div><div class='del'>- * if it is not longer used by any clients, stop the timer.</div><div class='del'>- */</div><div class='del'>-int snd_seq_queue_use(int queueid, int client, int use)</div><div class='add'>+/* use or unuse this queue */</div><div class='add'>+static void queue_use(struct snd_seq_queue *queue, int client, int use)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *queue;</div><div class='del'>-</div><div class='del'>-	queue = queueptr(queueid);</div><div class='del'>-	if (queue == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;queue-&gt;timer_mutex);</div><div class='ctx'> 	if (use) {</div><div class='ctx'> 		if (!test_and_set_bit(client, queue-&gt;clients_bitmap))</div><div class='ctx'> 			queue-&gt;clients++;</div><div class='hunk'>@@ -531,8 +471,21 @@ int snd_seq_queue_use(int queueid, int client, int use)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_seq_timer_close(queue);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;queue-&gt;timer_mutex);</div><div class='del'>-	queuefree(queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* use or unuse this queue -</div><div class='add'>+ * if it is the first client, starts the timer.</div><div class='add'>+ * if it is not longer used by any clients, stop the timer.</div><div class='add'>+ */</div><div class='add'>+int snd_seq_queue_use(int queueid, int client, int use)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_queue *queue __free(snd_seq_queue) = NULL;</div><div class='add'>+</div><div class='add'>+	queue = queueptr(queueid);</div><div class='add'>+	if (queue == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;queue-&gt;timer_mutex);</div><div class='add'>+	queue_use(queue, client, use);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -543,45 +496,17 @@ int snd_seq_queue_use(int queueid, int client, int use)</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_queue_is_used(int queueid, int client)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-	int result;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	q = queueptr(queueid);</div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL; /* invalid queue */</div><div class='del'>-	result = test_bit(client, q-&gt;clients_bitmap) ? 1 : 0;</div><div class='del'>-	queuefree(q);</div><div class='del'>-	return result;</div><div class='add'>+	return test_bit(client, q-&gt;clients_bitmap) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* notification that client has left the system -</div><div class='del'>- * stop the timer on all queues owned by this client</div><div class='del'>- */</div><div class='del'>-void snd_seq_queue_client_termination(int client)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) == NULL)</div><div class='del'>-			continue;</div><div class='del'>-		spin_lock_irqsave(&amp;q-&gt;owner_lock, flags);</div><div class='del'>-		if (q-&gt;owner == client)</div><div class='del'>-			q-&gt;klocked = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;q-&gt;owner_lock, flags);</div><div class='del'>-		if (q-&gt;owner == client) {</div><div class='del'>-			if (q-&gt;timer-&gt;running)</div><div class='del'>-				snd_seq_timer_stop(q-&gt;timer);</div><div class='del'>-			snd_seq_timer_reset(q-&gt;timer);</div><div class='del'>-		}</div><div class='del'>-		queuefree(q);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* final stage notification -</div><div class='ctx'>  * remove cells for no longer exist client (for non-owned queue)</div><div class='ctx'>  * or delete this queue (for owned queue)</div><div class='hunk'>@@ -589,11 +514,11 @@ void snd_seq_queue_client_termination(int client)</div><div class='ctx'> void snd_seq_queue_client_leave(int client)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	/* delete own queues from queue list */</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queue_list_remove(i, client)) != NULL)</div><div class='add'>+		struct snd_seq_queue *q = queue_list_remove(i, client);</div><div class='add'>+		if (q)</div><div class='ctx'> 			queue_delete(q);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -601,14 +526,14 @@ void snd_seq_queue_client_leave(int client)</div><div class='ctx'> 	 * they are not owned by this client</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) == NULL)</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(i);</div><div class='add'>+		if (!q)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (test_bit(client, q-&gt;clients_bitmap)) {</div><div class='ctx'> 			snd_seq_prioq_leave(q-&gt;tickq, client, 0);</div><div class='ctx'> 			snd_seq_prioq_leave(q-&gt;timeq, client, 0);</div><div class='ctx'> 			snd_seq_queue_use(q-&gt;queue, client, 0);</div><div class='ctx'> 		}</div><div class='del'>-		queuefree(q);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -616,29 +541,14 @@ void snd_seq_queue_client_leave(int client)</div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-/* remove cells from all queues */</div><div class='del'>-void snd_seq_queue_client_leave_cells(int client)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) == NULL)</div><div class='del'>-			continue;</div><div class='del'>-		snd_seq_prioq_leave(q-&gt;tickq, client, 0);</div><div class='del'>-		snd_seq_prioq_leave(q-&gt;timeq, client, 0);</div><div class='del'>-		queuefree(q);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* remove cells based on flush criteria */</div><div class='ctx'> void snd_seq_queue_remove_cells(int client, struct snd_seq_remove_events *info)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) == NULL)</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(i);</div><div class='add'>+		if (!q)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (test_bit(client, q-&gt;clients_bitmap) &amp;&amp;</div><div class='ctx'> 		    (! (info-&gt;remove_mode &amp; SNDRV_SEQ_REMOVE_DEST) ||</div><div class='hunk'>@@ -646,7 +556,6 @@ void snd_seq_queue_remove_cells(int client, struct snd_seq_remove_events *info)</div><div class='ctx'> 			snd_seq_prioq_remove_events(q-&gt;tickq, client, info);</div><div class='ctx'> 			snd_seq_prioq_remove_events(q-&gt;timeq, client, info);</div><div class='ctx'> 		}</div><div class='del'>-		queuefree(q);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +642,7 @@ static void snd_seq_queue_process_event(struct snd_seq_queue *q,</div><div class='ctx'>  */</div><div class='ctx'> int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop)</div><div class='ctx'> {</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='add'>+	struct snd_seq_queue *q __free(snd_seq_queue) = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!ev))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -742,54 +651,58 @@ int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop)</div><div class='ctx'> 	if (q == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (! queue_access_lock(q, ev-&gt;source.client)) {</div><div class='del'>-		queuefree(q);</div><div class='add'>+	if (!queue_access_lock(q, ev-&gt;source.client))</div><div class='ctx'> 		return -EPERM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_seq_queue_process_event(q, ev, atomic, hop);</div><div class='ctx'> </div><div class='ctx'> 	queue_access_unlock(q);</div><div class='del'>-	queuefree(q);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*----------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /* exported to seq_info.c */</div><div class='ctx'> void snd_seq_info_queues_read(struct snd_info_entry *entry, </div><div class='ctx'> 			      struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int i, bpm;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='add'>+	bool locked;</div><div class='add'>+	int owner;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_SEQ_MAX_QUEUES; i++) {</div><div class='del'>-		if ((q = queueptr(i)) == NULL)</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(i);</div><div class='add'>+		if (!q)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		tmr = q-&gt;timer;</div><div class='ctx'> 		if (tmr-&gt;tempo)</div><div class='del'>-			bpm = 60000000 / tmr-&gt;tempo;</div><div class='add'>+			bpm = (60000 * tmr-&gt;tempo_base) / tmr-&gt;tempo;</div><div class='ctx'> 		else</div><div class='ctx'> 			bpm = 0;</div><div class='ctx'> </div><div class='add'>+		scoped_guard(spinlock_irq, &amp;q-&gt;owner_lock) {</div><div class='add'>+			locked = q-&gt;locked;</div><div class='add'>+			owner = q-&gt;owner;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		snd_iprintf(buffer, "queue %d: [%s]\n", q-&gt;queue, q-&gt;name);</div><div class='del'>-		snd_iprintf(buffer, "owned by client    : %d\n", q-&gt;owner);</div><div class='del'>-		snd_iprintf(buffer, "lock status        : %s\n", q-&gt;locked ? "Locked" : "Free");</div><div class='add'>+		snd_iprintf(buffer, "owned by client    : %d\n", owner);</div><div class='add'>+		snd_iprintf(buffer, "lock status        : %s\n", locked ? "Locked" : "Free");</div><div class='ctx'> 		snd_iprintf(buffer, "queued time events : %d\n", snd_seq_prioq_avail(q-&gt;timeq));</div><div class='ctx'> 		snd_iprintf(buffer, "queued tick events : %d\n", snd_seq_prioq_avail(q-&gt;tickq));</div><div class='ctx'> 		snd_iprintf(buffer, "timer state        : %s\n", tmr-&gt;running ? "Running" : "Stopped");</div><div class='ctx'> 		snd_iprintf(buffer, "timer PPQ          : %d\n", tmr-&gt;ppq);</div><div class='ctx'> 		snd_iprintf(buffer, "current tempo      : %d\n", tmr-&gt;tempo);</div><div class='add'>+		snd_iprintf(buffer, "tempo base         : %d ns\n", tmr-&gt;tempo_base);</div><div class='ctx'> 		snd_iprintf(buffer, "current BPM        : %d\n", bpm);</div><div class='ctx'> 		snd_iprintf(buffer, "current time       : %d.%09d s\n", tmr-&gt;cur_time.tv_sec, tmr-&gt;cur_time.tv_nsec);</div><div class='ctx'> 		snd_iprintf(buffer, "current tick       : %d\n", tmr-&gt;tick.cur_tick);</div><div class='ctx'> 		snd_iprintf(buffer, "\n");</div><div class='del'>-		queuefree(q);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h<br/>index 30c8111477f6..afcd3c5484a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_queue.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_queue.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_queue.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_queue.h</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Queue handling</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_QUEUE_H</div><div class='ctx'> #define __SND_SEQ_QUEUE_H</div><div class='hunk'>@@ -40,10 +26,10 @@ struct snd_seq_queue {</div><div class='ctx'> 	</div><div class='ctx'> 	struct snd_seq_timer *timer;	/* time keeper for this queue */</div><div class='ctx'> 	int	owner;		/* client that 'owns' the timer */</div><div class='del'>-	unsigned int	locked:1,	/* timer is only accesibble by owner if set */</div><div class='del'>-		klocked:1,	/* kernel lock (after START) */	</div><div class='del'>-		check_again:1,</div><div class='del'>-		check_blocked:1;</div><div class='add'>+	bool	locked;		/* timer is only accesibble by owner if set */</div><div class='add'>+	bool	klocked;	/* kernel lock (after START) */</div><div class='add'>+	bool	check_again;	/* concurrent access happened during check */</div><div class='add'>+	bool	check_blocked;	/* queue being checked */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int flags;		/* status flags */</div><div class='ctx'> 	unsigned int info_flags;	/* info for sync */</div><div class='hunk'>@@ -63,22 +49,16 @@ struct snd_seq_queue {</div><div class='ctx'> /* get the number of current queues */</div><div class='ctx'> int snd_seq_queue_get_cur_queues(void);</div><div class='ctx'> </div><div class='del'>-/* init queues structure */</div><div class='del'>-int snd_seq_queues_init(void);</div><div class='del'>-</div><div class='ctx'> /* delete queues */ </div><div class='ctx'> void snd_seq_queues_delete(void);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* create new queue (constructor) */</div><div class='del'>-int snd_seq_queue_alloc(int client, int locked, unsigned int flags);</div><div class='add'>+struct snd_seq_queue *snd_seq_queue_alloc(int client, int locked, unsigned int flags);</div><div class='ctx'> </div><div class='ctx'> /* delete queue (destructor) */</div><div class='ctx'> int snd_seq_queue_delete(int client, int queueid);</div><div class='ctx'> </div><div class='del'>-/* notification that client has left the system */</div><div class='del'>-void snd_seq_queue_client_termination(int client);</div><div class='del'>-</div><div class='ctx'> /* final stage */</div><div class='ctx'> void snd_seq_queue_client_leave(int client);</div><div class='ctx'> </div><div class='hunk'>@@ -86,7 +66,6 @@ void snd_seq_queue_client_leave(int client);</div><div class='ctx'> int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop);</div><div class='ctx'> </div><div class='ctx'> /* Remove events */</div><div class='del'>-void snd_seq_queue_client_leave_cells(int client);</div><div class='ctx'> void snd_seq_queue_remove_cells(int client, struct snd_seq_remove_events *info);</div><div class='ctx'> </div><div class='ctx'> /* return pointer to queue structure for specified id */</div><div class='hunk'>@@ -94,6 +73,8 @@ struct snd_seq_queue *queueptr(int queueid);</div><div class='ctx'> /* unlock */</div><div class='ctx'> #define queuefree(q) snd_use_lock_free(&amp;(q)-&gt;use_lock)</div><div class='ctx'> </div><div class='add'>+DEFINE_FREE(snd_seq_queue, struct snd_seq_queue *, if (!IS_ERR_OR_NULL(_T)) queuefree(_T))</div><div class='add'>+</div><div class='ctx'> /* return the (first) queue matching with the specified name */</div><div class='ctx'> struct snd_seq_queue *snd_seq_queue_find_name(char *name);</div><div class='ctx'> </div><div class='hunk'>@@ -104,7 +85,6 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop);</div><div class='ctx'> int snd_seq_queue_check_access(int queueid, int client);</div><div class='ctx'> int snd_seq_queue_timer_set_tempo(int queueid, int client, struct snd_seq_queue_tempo *info);</div><div class='ctx'> int snd_seq_queue_set_owner(int queueid, int client, int locked);</div><div class='del'>-int snd_seq_queue_set_locked(int queueid, int client, int locked);</div><div class='ctx'> int snd_seq_queue_timer_open(int queueid);</div><div class='ctx'> int snd_seq_queue_timer_close(int queueid);</div><div class='ctx'> int snd_seq_queue_use(int queueid, int client, int use);</div><div class='hunk'>@@ -112,28 +92,4 @@ int snd_seq_queue_is_used(int queueid, int client);</div><div class='ctx'> </div><div class='ctx'> int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 64bit division - for sync stuff..</div><div class='del'>- */</div><div class='del'>-#if defined(i386) || defined(i486)</div><div class='del'>-</div><div class='del'>-#define udiv_qrnnd(q, r, n1, n0, d) \</div><div class='del'>-  __asm__ ("divl %4"		\</div><div class='del'>-	   : "=a" ((u32)(q)),	\</div><div class='del'>-	     "=d" ((u32)(r))	\</div><div class='del'>-	   : "0" ((u32)(n0)),	\</div><div class='del'>-	     "1" ((u32)(n1)),	\</div><div class='del'>-	     "rm" ((u32)(d)))</div><div class='del'>-</div><div class='del'>-#define u64_div(x,y,q) do {u32 __tmp; udiv_qrnnd(q, __tmp, (x)&gt;&gt;32, x, y);} while (0)</div><div class='del'>-#define u64_mod(x,y,r) do {u32 __tmp; udiv_qrnnd(__tmp, q, (x)&gt;&gt;32, x, y);} while (0)</div><div class='del'>-#define u64_divmod(x,y,q,r) udiv_qrnnd(q, r, (x)&gt;&gt;32, x, y)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define u64_div(x,y,q)	((q) = (u32)((u64)(x) / (u64)(y)))</div><div class='del'>-#define u64_mod(x,y,r)	((r) = (u32)((u64)(x) % (u64)(y)))</div><div class='del'>-#define u64_divmod(x,y,q,r) (u64_div(x,y,q), u64_mod(x,y,r))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c<br/>index c38b90cf3cb0..5b5603e5970b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_system.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_system.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_system.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_system.c</a></div><div class='hunk'>@@ -1,25 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer System services Client</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include "seq_system.h"</div><div class='hunk'>@@ -63,12 +49,14 @@ static int sysclient = -1;</div><div class='ctx'> /* port id numbers for this client */</div><div class='ctx'> static int announce_port = -1;</div><div class='ctx'> </div><div class='add'>+/* number of subscriptions to announce port */</div><div class='add'>+static int announce_subscribed;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* fill standard header data, source port &amp; channel are filled in */</div><div class='ctx'> static int setheader(struct snd_seq_event * ev, int client, int port)</div><div class='ctx'> {</div><div class='del'>-	if (announce_port &lt; 0)</div><div class='add'>+	if (announce_port &lt; 0 || !announce_subscribed)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	memset(ev, 0, sizeof(struct snd_seq_event));</div><div class='hunk'>@@ -90,25 +78,27 @@ static int setheader(struct snd_seq_event * ev, int client, int port)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry points for broadcasting system events */</div><div class='del'>-void snd_seq_system_broadcast(int client, int port, int type)</div><div class='add'>+void snd_seq_system_broadcast(int client, int port, int type, bool atomic)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_event ev;</div><div class='ctx'> 	</div><div class='ctx'> 	if (setheader(&amp;ev, client, port) &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> 	ev.type = type;</div><div class='del'>-	snd_seq_kernel_client_dispatch(sysclient, &amp;ev, 0, 0);</div><div class='add'>+	snd_seq_kernel_client_dispatch(sysclient, &amp;ev, atomic, 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_system_broadcast);</div><div class='ctx'> </div><div class='ctx'> /* entry points for broadcasting system events */</div><div class='del'>-int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev)</div><div class='add'>+int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev,</div><div class='add'>+			  bool atomic)</div><div class='ctx'> {</div><div class='ctx'> 	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_FIXED;</div><div class='ctx'> 	ev-&gt;source.client = sysclient;</div><div class='ctx'> 	ev-&gt;source.port = announce_port;</div><div class='ctx'> 	ev-&gt;dest.client = client;</div><div class='ctx'> 	ev-&gt;dest.port = port;</div><div class='del'>-	return snd_seq_kernel_client_dispatch(sysclient, ev, 0, 0);</div><div class='add'>+	return snd_seq_kernel_client_dispatch(sysclient, ev, atomic, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* call-back handler for timer events */</div><div class='hunk'>@@ -117,11 +107,28 @@ static int event_input_timer(struct snd_seq_event * ev, int direct, void *privat</div><div class='ctx'> 	return snd_seq_control_queue(ev, atomic, hop);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sys_announce_subscribe(void *private_data,</div><div class='add'>+				  struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	announce_subscribed++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sys_announce_unsubscribe(void *private_data,</div><div class='add'>+				    struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!announce_subscribed))</div><div class='add'>+		return 0;</div><div class='add'>+	announce_subscribed--;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* register our internal client */</div><div class='ctx'> int __init snd_seq_system_client_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_port_callback pcallbacks;</div><div class='ctx'> 	struct snd_seq_port_info *port;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='ctx'> 	if (!port)</div><div class='hunk'>@@ -133,9 +140,13 @@ int __init snd_seq_system_client_init(void)</div><div class='ctx'> </div><div class='ctx'> 	/* register client */</div><div class='ctx'> 	sysclient = snd_seq_create_kernel_client(NULL, 0, "System");</div><div class='add'>+	if (sysclient &lt; 0) {</div><div class='add'>+		kfree(port);</div><div class='add'>+		return sysclient;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* register timer */</div><div class='del'>-	strcpy(port-&gt;name, "Timer");</div><div class='add'>+	strscpy(port-&gt;name, "Timer");</div><div class='ctx'> 	port-&gt;capability = SNDRV_SEQ_PORT_CAP_WRITE; /* accept queue control */</div><div class='ctx'> 	port-&gt;capability |= SNDRV_SEQ_PORT_CAP_READ|SNDRV_SEQ_PORT_CAP_SUBS_READ; /* for broadcast */</div><div class='ctx'> 	port-&gt;kernel = &amp;pcallbacks;</div><div class='hunk'>@@ -143,26 +154,40 @@ int __init snd_seq_system_client_init(void)</div><div class='ctx'> 	port-&gt;flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;</div><div class='ctx'> 	port-&gt;addr.client = sysclient;</div><div class='ctx'> 	port-&gt;addr.port = SNDRV_SEQ_PORT_SYSTEM_TIMER;</div><div class='del'>-	snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port);</div><div class='add'>+	err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT,</div><div class='add'>+					port);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_port;</div><div class='ctx'> </div><div class='ctx'> 	/* register announcement port */</div><div class='del'>-	strcpy(port-&gt;name, "Announce");</div><div class='add'>+	strscpy(port-&gt;name, "Announce");</div><div class='ctx'> 	port-&gt;capability = SNDRV_SEQ_PORT_CAP_READ|SNDRV_SEQ_PORT_CAP_SUBS_READ; /* for broadcast only */</div><div class='del'>-	port-&gt;kernel = NULL;</div><div class='add'>+	pcallbacks.event_input = NULL;</div><div class='add'>+	pcallbacks.subscribe = sys_announce_subscribe;</div><div class='add'>+	pcallbacks.unsubscribe = sys_announce_unsubscribe;</div><div class='add'>+	port-&gt;kernel = &amp;pcallbacks;</div><div class='ctx'> 	port-&gt;type = 0;</div><div class='ctx'> 	port-&gt;flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;</div><div class='ctx'> 	port-&gt;addr.client = sysclient;</div><div class='ctx'> 	port-&gt;addr.port = SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE;</div><div class='del'>-	snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port);</div><div class='add'>+	err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT,</div><div class='add'>+					port);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_port;</div><div class='ctx'> 	announce_port = port-&gt;addr.port;</div><div class='ctx'> </div><div class='ctx'> 	kfree(port);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ error_port:</div><div class='add'>+	snd_seq_system_client_done();</div><div class='add'>+	kfree(port);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* unregister our internal client */</div><div class='del'>-void __exit snd_seq_system_client_done(void)</div><div class='add'>+void snd_seq_system_client_done(void)</div><div class='ctx'> {</div><div class='ctx'> 	int oldsysclient = sysclient;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/seq/seq_system.h b/sound/core/seq/seq_system.h<br/>index cf2cfa23430e..62e513f74871 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_system.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_system.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_system.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_system.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer System Client</div><div class='ctx'>  *  Copyright (c) 1998 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_SYSTEM_H</div><div class='ctx'> #define __SND_SEQ_SYSTEM_H</div><div class='hunk'>@@ -25,16 +10,31 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry points for broadcasting system events */</div><div class='del'>-void snd_seq_system_broadcast(int client, int port, int type);</div><div class='del'>-</div><div class='del'>-#define snd_seq_system_client_ev_client_start(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_START)</div><div class='del'>-#define snd_seq_system_client_ev_client_exit(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_EXIT)</div><div class='del'>-#define snd_seq_system_client_ev_client_change(client) snd_seq_system_broadcast(client, 0, SNDRV_SEQ_EVENT_CLIENT_CHANGE)</div><div class='del'>-#define snd_seq_system_client_ev_port_start(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_START)</div><div class='del'>-#define snd_seq_system_client_ev_port_exit(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_EXIT)</div><div class='del'>-#define snd_seq_system_client_ev_port_change(client, port) snd_seq_system_broadcast(client, port, SNDRV_SEQ_EVENT_PORT_CHANGE)</div><div class='del'>-</div><div class='del'>-int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev);</div><div class='add'>+void snd_seq_system_broadcast(int client, int port, int type, bool atomic);</div><div class='add'>+</div><div class='add'>+/* normal system notification event broadcast */</div><div class='add'>+#define notify_event(client, port, type) \</div><div class='add'>+	snd_seq_system_broadcast(client, port, type, false)</div><div class='add'>+</div><div class='add'>+/* notify UMP EP/FB change event */</div><div class='add'>+static inline void snd_seq_system_ump_notify(int client, int block, int type,</div><div class='add'>+					     bool atomic)</div><div class='add'>+{</div><div class='add'>+	/* reuse the existing snd_seq_system_broadcast():</div><div class='add'>+	 * struct snd_seq_ev_ump_notify is compatible with struct snd_seq_addr</div><div class='add'>+	 */</div><div class='add'>+	snd_seq_system_broadcast(client, block, type, atomic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define snd_seq_system_client_ev_client_start(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_START)</div><div class='add'>+#define snd_seq_system_client_ev_client_exit(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_EXIT)</div><div class='add'>+#define snd_seq_system_client_ev_client_change(client) notify_event(client, 0, SNDRV_SEQ_EVENT_CLIENT_CHANGE)</div><div class='add'>+#define snd_seq_system_client_ev_port_start(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_START)</div><div class='add'>+#define snd_seq_system_client_ev_port_exit(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_EXIT)</div><div class='add'>+#define snd_seq_system_client_ev_port_change(client, port) notify_event(client, port, SNDRV_SEQ_EVENT_PORT_CHANGE)</div><div class='add'>+</div><div class='add'>+int snd_seq_system_notify(int client, int port, struct snd_seq_event *ev,</div><div class='add'>+			  bool atomic);</div><div class='ctx'> </div><div class='ctx'> /* register our internal client */</div><div class='ctx'> int snd_seq_system_client_init(void);</div><div class='head'>diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c<br/>index 160b1bd0cd62..29b018a212fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_timer.c</a></div><div class='hunk'>@@ -1,23 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA sequencer Timer</div><div class='ctx'>  *   Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='ctx'>  *                              Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -35,14 +20,17 @@</div><div class='ctx'> </div><div class='ctx'> static void snd_seq_timer_set_tick_resolution(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='del'>-	if (tmr-&gt;tempo &lt; 1000000)</div><div class='del'>-		tmr-&gt;tick.resolution = (tmr-&gt;tempo * 1000) / tmr-&gt;ppq;</div><div class='add'>+	unsigned int threshold =</div><div class='add'>+		tmr-&gt;tempo_base == 1000 ? 1000000 : 10000;</div><div class='add'>+</div><div class='add'>+	if (tmr-&gt;tempo &lt; threshold)</div><div class='add'>+		tmr-&gt;tick.resolution = (tmr-&gt;tempo * tmr-&gt;tempo_base) / tmr-&gt;ppq;</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* might overflow.. */</div><div class='ctx'> 		unsigned int s;</div><div class='ctx'> 		s = tmr-&gt;tempo % tmr-&gt;ppq;</div><div class='del'>-		s = (s * 1000) / tmr-&gt;ppq;</div><div class='del'>-		tmr-&gt;tick.resolution = (tmr-&gt;tempo / tmr-&gt;ppq) * 1000;</div><div class='add'>+		s = (s * tmr-&gt;tempo_base) / tmr-&gt;ppq;</div><div class='add'>+		tmr-&gt;tick.resolution = (tmr-&gt;tempo / tmr-&gt;ppq) * tmr-&gt;tempo_base;</div><div class='ctx'> 		tmr-&gt;tick.resolution += s;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (tmr-&gt;tick.resolution &lt;= 0)</div><div class='hunk'>@@ -56,10 +44,8 @@ struct snd_seq_timer *snd_seq_timer_new(void)</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> 	</div><div class='ctx'> 	tmr = kzalloc(sizeof(*tmr), GFP_KERNEL);</div><div class='del'>-	if (tmr == NULL) {</div><div class='del'>-		snd_printd("malloc failed for snd_seq_timer_new() \n");</div><div class='add'>+	if (!tmr)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;tmr-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* reset setup to defaults */</div><div class='hunk'>@@ -78,7 +64,7 @@ void snd_seq_timer_delete(struct snd_seq_timer **tmr)</div><div class='ctx'> 	*tmr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (t == NULL) {</div><div class='del'>-		snd_printd("oops: snd_seq_timer_delete() called with NULL timer\n");</div><div class='add'>+		pr_debug("ALSA: seq: snd_seq_timer_delete() called with NULL timer\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	t-&gt;running = 0;</div><div class='hunk'>@@ -92,9 +78,11 @@ void snd_seq_timer_delete(struct snd_seq_timer **tmr)</div><div class='ctx'> </div><div class='ctx'> void snd_seq_timer_defaults(struct snd_seq_timer * tmr)</div><div class='ctx'> {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	/* setup defaults */</div><div class='ctx'> 	tmr-&gt;ppq = 96;		/* 96 PPQ */</div><div class='ctx'> 	tmr-&gt;tempo = 500000;	/* 120 BPM */</div><div class='add'>+	tmr-&gt;tempo_base = 1000;	/* 1us */</div><div class='ctx'> 	snd_seq_timer_set_tick_resolution(tmr);</div><div class='ctx'> 	tmr-&gt;running = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -109,20 +97,20 @@ void snd_seq_timer_defaults(struct snd_seq_timer * tmr)</div><div class='ctx'> 	tmr-&gt;skew = tmr-&gt;skew_base = SKEW_BASE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void snd_seq_timer_reset(struct snd_seq_timer * tmr)</div><div class='add'>+static void seq_timer_reset(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	/* reset time &amp; songposition */</div><div class='ctx'> 	tmr-&gt;cur_time.tv_sec = 0;</div><div class='ctx'> 	tmr-&gt;cur_time.tv_nsec = 0;</div><div class='ctx'> </div><div class='ctx'> 	tmr-&gt;tick.cur_tick = 0;</div><div class='ctx'> 	tmr-&gt;tick.fraction = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='add'>+void snd_seq_timer_reset(struct snd_seq_timer *tmr)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='add'>+	seq_timer_reset(tmr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +119,6 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> 				    unsigned long resolution,</div><div class='ctx'> 				    unsigned long ticks)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_seq_queue *q = timeri-&gt;callback_data;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> </div><div class='hunk'>@@ -140,28 +127,27 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> 	tmr = q-&gt;timer;</div><div class='ctx'> 	if (tmr == NULL)</div><div class='ctx'> 		return;</div><div class='del'>-	if (!tmr-&gt;running)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resolution *= ticks;</div><div class='del'>-	if (tmr-&gt;skew != tmr-&gt;skew_base) {</div><div class='del'>-		/* FIXME: assuming skew_base = 0x10000 */</div><div class='del'>-		resolution = (resolution &gt;&gt; 16) * tmr-&gt;skew +</div><div class='del'>-			(((resolution &amp; 0xffff) * tmr-&gt;skew) &gt;&gt; 16);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;tmr-&gt;lock) {</div><div class='add'>+		if (!tmr-&gt;running)</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	/* update timer */</div><div class='del'>-	snd_seq_inc_time_nsec(&amp;tmr-&gt;cur_time, resolution);</div><div class='add'>+		resolution *= ticks;</div><div class='add'>+		if (tmr-&gt;skew != tmr-&gt;skew_base) {</div><div class='add'>+			/* FIXME: assuming skew_base = 0x10000 */</div><div class='add'>+			resolution = (resolution &gt;&gt; 16) * tmr-&gt;skew +</div><div class='add'>+				(((resolution &amp; 0xffff) * tmr-&gt;skew) &gt;&gt; 16);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* calculate current tick */</div><div class='del'>-	snd_seq_timer_update_tick(&amp;tmr-&gt;tick, resolution);</div><div class='add'>+		/* update timer */</div><div class='add'>+		snd_seq_inc_time_nsec(&amp;tmr-&gt;cur_time, resolution);</div><div class='ctx'> </div><div class='del'>-	/* register actual time of this timer update */</div><div class='del'>-	do_gettimeofday(&amp;tmr-&gt;last_update);</div><div class='add'>+		/* calculate current tick */</div><div class='add'>+		snd_seq_timer_update_tick(&amp;tmr-&gt;tick, resolution);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='add'>+		/* register actual time of this timer update */</div><div class='add'>+		ktime_get_ts64(&amp;tmr-&gt;last_update);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* check queues and dispatch events */</div><div class='ctx'> 	snd_seq_check_queue(q, 1, 0);</div><div class='hunk'>@@ -170,42 +156,44 @@ static void snd_seq_timer_interrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> /* set current tempo */</div><div class='ctx'> int snd_seq_timer_set_tempo(struct snd_seq_timer * tmr, int tempo)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (tempo &lt;= 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	if ((unsigned int)tempo != tmr-&gt;tempo) {</div><div class='ctx'> 		tmr-&gt;tempo = tempo;</div><div class='ctx'> 		snd_seq_timer_set_tick_resolution(tmr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* set current ppq */</div><div class='del'>-int snd_seq_timer_set_ppq(struct snd_seq_timer * tmr, int ppq)</div><div class='add'>+/* set current tempo, ppq and base in a shot */</div><div class='add'>+int snd_seq_timer_set_tempo_ppq(struct snd_seq_timer *tmr, int tempo, int ppq,</div><div class='add'>+				unsigned int tempo_base)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	int changed;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (ppq &lt;= 0)</div><div class='add'>+	if (tempo &lt;= 0 || ppq &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* allow only 10ns or 1us tempo base for now */</div><div class='add'>+	if (tempo_base &amp;&amp; tempo_base != 10 &amp;&amp; tempo_base != 1000)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	if (tmr-&gt;running &amp;&amp; (ppq != tmr-&gt;ppq)) {</div><div class='ctx'> 		/* refuse to change ppq on running timers */</div><div class='ctx'> 		/* because it will upset the song position (ticks) */</div><div class='del'>-		spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='del'>-		snd_printd("seq: cannot change ppq of a running timer\n");</div><div class='add'>+		pr_debug("ALSA: seq: cannot change ppq of a running timer\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	changed = (tempo != tmr-&gt;tempo) || (ppq != tmr-&gt;ppq);</div><div class='add'>+	tmr-&gt;tempo = tempo;</div><div class='ctx'> 	tmr-&gt;ppq = ppq;</div><div class='del'>-	snd_seq_timer_set_tick_resolution(tmr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	tmr-&gt;tempo_base = tempo_base ? tempo_base : 1000;</div><div class='add'>+	if (changed)</div><div class='add'>+		snd_seq_timer_set_tick_resolution(tmr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -213,15 +201,12 @@ int snd_seq_timer_set_ppq(struct snd_seq_timer * tmr, int ppq)</div><div class='ctx'> int snd_seq_timer_set_position_tick(struct snd_seq_timer *tmr,</div><div class='ctx'> 				    snd_seq_tick_time_t position)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	tmr-&gt;tick.cur_tick = position;</div><div class='ctx'> 	tmr-&gt;tick.fraction = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -229,15 +214,12 @@ int snd_seq_timer_set_position_tick(struct snd_seq_timer *tmr,</div><div class='ctx'> int snd_seq_timer_set_position_time(struct snd_seq_timer *tmr,</div><div class='ctx'> 				    snd_seq_real_time_t position)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	snd_seq_sanity_real_time(&amp;position);</div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	tmr-&gt;cur_time = position;</div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -245,19 +227,16 @@ int snd_seq_timer_set_position_time(struct snd_seq_timer *tmr,</div><div class='ctx'> int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew,</div><div class='ctx'> 			   unsigned int base)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME */</div><div class='ctx'> 	if (base != SKEW_BASE) {</div><div class='del'>-		snd_printd("invalid skew base 0x%x\n", base);</div><div class='add'>+		pr_debug("ALSA: seq: invalid skew base 0x%x\n", base);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;tmr-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	tmr-&gt;skew = skew;</div><div class='del'>-	spin_unlock_irqrestore(&amp;tmr-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -278,7 +257,13 @@ int snd_seq_timer_open(struct snd_seq_queue *q)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (tmr-&gt;alsa_id.dev_class != SNDRV_TIMER_CLASS_SLAVE)</div><div class='ctx'> 		tmr-&gt;alsa_id.dev_sclass = SNDRV_TIMER_SCLASS_SEQUENCER;</div><div class='del'>-	err = snd_timer_open(&amp;t, str, &amp;tmr-&gt;alsa_id, q-&gt;queue);</div><div class='add'>+	t = snd_timer_instance_new(str);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	t-&gt;callback = snd_seq_timer_interrupt;</div><div class='add'>+	t-&gt;callback_data = q;</div><div class='add'>+	t-&gt;flags |= SNDRV_TIMER_IFLG_AUTO;</div><div class='add'>+	err = snd_timer_open(t, &amp;tmr-&gt;alsa_id, q-&gt;queue);</div><div class='ctx'> 	if (err &lt; 0 &amp;&amp; tmr-&gt;alsa_id.dev_class != SNDRV_TIMER_CLASS_SLAVE) {</div><div class='ctx'> 		if (tmr-&gt;alsa_id.dev_class != SNDRV_TIMER_CLASS_GLOBAL ||</div><div class='ctx'> 		    tmr-&gt;alsa_id.device != SNDRV_TIMER_GLOBAL_SYSTEM) {</div><div class='hunk'>@@ -288,36 +273,48 @@ int snd_seq_timer_open(struct snd_seq_queue *q)</div><div class='ctx'> 			tid.dev_sclass = SNDRV_TIMER_SCLASS_SEQUENCER;</div><div class='ctx'> 			tid.card = -1;</div><div class='ctx'> 			tid.device = SNDRV_TIMER_GLOBAL_SYSTEM;</div><div class='del'>-			err = snd_timer_open(&amp;t, str, &amp;tid, q-&gt;queue);</div><div class='del'>-		}</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "seq fatal error: cannot create timer (%i)\n", err);</div><div class='del'>-			return err;</div><div class='add'>+			err = snd_timer_open(t, &amp;tid, q-&gt;queue);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	t-&gt;callback = snd_seq_timer_interrupt;</div><div class='del'>-	t-&gt;callback_data = q;</div><div class='del'>-	t-&gt;flags |= SNDRV_TIMER_IFLG_AUTO;</div><div class='del'>-	tmr-&gt;timeri = t;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("ALSA: seq fatal error: cannot create timer (%i)\n", err);</div><div class='add'>+		snd_timer_instance_free(t);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;tmr-&gt;lock) {</div><div class='add'>+		if (tmr-&gt;timeri)</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		else</div><div class='add'>+			tmr-&gt;timeri = t;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_timer_close(t);</div><div class='add'>+		snd_timer_instance_free(t);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_seq_timer_close(struct snd_seq_queue *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='add'>+	struct snd_timer_instance *t;</div><div class='ctx'> 	</div><div class='ctx'> 	tmr = q-&gt;timer;</div><div class='ctx'> 	if (snd_BUG_ON(!tmr))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (tmr-&gt;timeri) {</div><div class='del'>-		snd_timer_stop(tmr-&gt;timeri);</div><div class='del'>-		snd_timer_close(tmr-&gt;timeri);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;tmr-&gt;lock) {</div><div class='add'>+		t = tmr-&gt;timeri;</div><div class='ctx'> 		tmr-&gt;timeri = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	if (t) {</div><div class='add'>+		snd_timer_close(t);</div><div class='add'>+		snd_timer_instance_free(t);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_seq_timer_stop(struct snd_seq_timer * tmr)</div><div class='add'>+static int seq_timer_stop(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='ctx'> 	if (! tmr-&gt;timeri)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -328,13 +325,19 @@ int snd_seq_timer_stop(struct snd_seq_timer * tmr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_seq_timer_stop(struct snd_seq_timer *tmr)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='add'>+	return seq_timer_stop(tmr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int initialize_timer(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *t;</div><div class='ctx'> 	unsigned long freq;</div><div class='ctx'> </div><div class='ctx'> 	t = tmr-&gt;timeri-&gt;timer;</div><div class='del'>-	if (snd_BUG_ON(!t))</div><div class='add'>+	if (!t)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	freq = tmr-&gt;preferred_resolution;</div><div class='hunk'>@@ -347,9 +350,7 @@ static int initialize_timer(struct snd_seq_timer *tmr)</div><div class='ctx'> </div><div class='ctx'> 	tmr-&gt;ticks = 1;</div><div class='ctx'> 	if (!(t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)) {</div><div class='del'>-		unsigned long r = t-&gt;hw.resolution;</div><div class='del'>-		if (! r &amp;&amp; t-&gt;hw.c_resolution)</div><div class='del'>-			r = t-&gt;hw.c_resolution(t);</div><div class='add'>+		unsigned long r = snd_timer_resolution(tmr-&gt;timeri);</div><div class='ctx'> 		if (r) {</div><div class='ctx'> 			tmr-&gt;ticks = (unsigned int)(1000000000uL / (r * freq));</div><div class='ctx'> 			if (! tmr-&gt;ticks)</div><div class='hunk'>@@ -360,59 +361,67 @@ static int initialize_timer(struct snd_seq_timer *tmr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_seq_timer_start(struct snd_seq_timer * tmr)</div><div class='add'>+static int seq_timer_start(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='ctx'> 	if (! tmr-&gt;timeri)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (tmr-&gt;running)</div><div class='del'>-		snd_seq_timer_stop(tmr);</div><div class='del'>-	snd_seq_timer_reset(tmr);</div><div class='add'>+		seq_timer_stop(tmr);</div><div class='add'>+	seq_timer_reset(tmr);</div><div class='ctx'> 	if (initialize_timer(tmr) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	snd_timer_start(tmr-&gt;timeri, tmr-&gt;ticks);</div><div class='ctx'> 	tmr-&gt;running = 1;</div><div class='del'>-	do_gettimeofday(&amp;tmr-&gt;last_update);</div><div class='add'>+	ktime_get_ts64(&amp;tmr-&gt;last_update);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_seq_timer_continue(struct snd_seq_timer * tmr)</div><div class='add'>+int snd_seq_timer_start(struct snd_seq_timer *tmr)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='add'>+	return seq_timer_start(tmr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seq_timer_continue(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='ctx'> 	if (! tmr-&gt;timeri)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (tmr-&gt;running)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	if (! tmr-&gt;initialized) {</div><div class='del'>-		snd_seq_timer_reset(tmr);</div><div class='add'>+		seq_timer_reset(tmr);</div><div class='ctx'> 		if (initialize_timer(tmr) &lt; 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_timer_start(tmr-&gt;timeri, tmr-&gt;ticks);</div><div class='ctx'> 	tmr-&gt;running = 1;</div><div class='del'>-	do_gettimeofday(&amp;tmr-&gt;last_update);</div><div class='add'>+	ktime_get_ts64(&amp;tmr-&gt;last_update);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int snd_seq_timer_continue(struct snd_seq_timer *tmr)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='add'>+	return seq_timer_continue(tmr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* return current 'real' time. use timeofday() to get better granularity. */</div><div class='del'>-snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr)</div><div class='add'>+snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr,</div><div class='add'>+					       bool adjust_ktime)</div><div class='ctx'> {</div><div class='ctx'> 	snd_seq_real_time_t cur_time;</div><div class='ctx'> </div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	cur_time = tmr-&gt;cur_time;</div><div class='del'>-	if (tmr-&gt;running) { </div><div class='del'>-		struct timeval tm;</div><div class='del'>-		int usec;</div><div class='del'>-		do_gettimeofday(&amp;tm);</div><div class='del'>-		usec = (int)(tm.tv_usec - tmr-&gt;last_update.tv_usec);</div><div class='del'>-		if (usec &lt; 0) {</div><div class='del'>-			cur_time.tv_nsec += (1000000 + usec) * 1000;</div><div class='del'>-			cur_time.tv_sec += tm.tv_sec - tmr-&gt;last_update.tv_sec - 1;</div><div class='del'>-		} else {</div><div class='del'>-			cur_time.tv_nsec += usec * 1000;</div><div class='del'>-			cur_time.tv_sec += tm.tv_sec - tmr-&gt;last_update.tv_sec;</div><div class='del'>-		}</div><div class='add'>+	if (adjust_ktime &amp;&amp; tmr-&gt;running) {</div><div class='add'>+		struct timespec64 tm;</div><div class='add'>+</div><div class='add'>+		ktime_get_ts64(&amp;tm);</div><div class='add'>+		tm = timespec64_sub(tm, tmr-&gt;last_update);</div><div class='add'>+		cur_time.tv_nsec += tm.tv_nsec;</div><div class='add'>+		cur_time.tv_sec += tm.tv_sec;</div><div class='ctx'> 		snd_seq_sanity_real_time(&amp;cur_time);</div><div class='ctx'> 	}</div><div class='del'>-                </div><div class='ctx'> 	return cur_time;	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -420,36 +429,39 @@ snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr)</div><div class='ctx'>  high PPQ values) */</div><div class='ctx'> snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr)</div><div class='ctx'> {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tmr-&gt;lock);</div><div class='ctx'> 	return tmr-&gt;tick.cur_tick;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /* exported to seq_info.c */</div><div class='ctx'> void snd_seq_info_timer_read(struct snd_info_entry *entry,</div><div class='ctx'> 			     struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='del'>-	struct snd_seq_queue *q;</div><div class='ctx'> 	struct snd_seq_timer *tmr;</div><div class='ctx'> 	struct snd_timer_instance *ti;</div><div class='ctx'> 	unsigned long resolution;</div><div class='ctx'> 	</div><div class='ctx'> 	for (idx = 0; idx &lt; SNDRV_SEQ_MAX_QUEUES; idx++) {</div><div class='del'>-		q = queueptr(idx);</div><div class='add'>+		struct snd_seq_queue *q __free(snd_seq_queue) = queueptr(idx);</div><div class='add'>+</div><div class='ctx'> 		if (q == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((tmr = q-&gt;timer) == NULL ||</div><div class='del'>-		    (ti = tmr-&gt;timeri) == NULL) {</div><div class='del'>-			queuefree(q);</div><div class='del'>-			continue;</div><div class='add'>+		scoped_guard(mutex, &amp;q-&gt;timer_mutex) {</div><div class='add'>+			tmr = q-&gt;timer;</div><div class='add'>+			if (!tmr)</div><div class='add'>+				break;</div><div class='add'>+			ti = tmr-&gt;timeri;</div><div class='add'>+			if (!ti)</div><div class='add'>+				break;</div><div class='add'>+			snd_iprintf(buffer, "Timer for queue %i : %s\n", q-&gt;queue, ti-&gt;timer-&gt;name);</div><div class='add'>+			resolution = snd_timer_resolution(ti) * tmr-&gt;ticks;</div><div class='add'>+			snd_iprintf(buffer, "  Period time : %lu.%09lu\n", resolution / 1000000000, resolution % 1000000000);</div><div class='add'>+			snd_iprintf(buffer, "  Skew : %u / %u\n", tmr-&gt;skew, tmr-&gt;skew_base);</div><div class='ctx'> 		}</div><div class='del'>-		snd_iprintf(buffer, "Timer for queue %i : %s\n", q-&gt;queue, ti-&gt;timer-&gt;name);</div><div class='del'>-		resolution = snd_timer_resolution(ti) * tmr-&gt;ticks;</div><div class='del'>-		snd_iprintf(buffer, "  Period time : %lu.%09lu\n", resolution / 1000000000, resolution % 1000000000);</div><div class='del'>-		snd_iprintf(buffer, "  Skew : %u / %u\n", tmr-&gt;skew, tmr-&gt;skew_base);</div><div class='del'>-		queuefree(q);</div><div class='ctx'>  	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='head'>diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h<br/>index 88dfb71805ae..c8803216a3a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_timer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_timer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_timer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_timer.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA sequencer Timer</div><div class='ctx'>  *  Copyright (c) 1998-1999 by Frank van de Pol &lt;fvdpol@coil.demon.nl&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __SND_SEQ_TIMER_H</div><div class='ctx'> #define __SND_SEQ_TIMER_H</div><div class='hunk'>@@ -51,8 +36,9 @@ struct snd_seq_timer {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int skew;</div><div class='ctx'> 	unsigned int skew_base;</div><div class='add'>+	unsigned int tempo_base;</div><div class='ctx'> </div><div class='del'>-	struct timeval 		last_update;	 /* time of last clock update, used for interpolation */</div><div class='add'>+	struct timespec64	last_update;	 /* time of last clock update, used for interpolation */</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> };</div><div class='hunk'>@@ -123,19 +109,19 @@ static inline void snd_seq_inc_time_nsec(snd_seq_real_time_t *tm, unsigned long</div><div class='ctx'> struct snd_seq_queue;</div><div class='ctx'> int snd_seq_timer_open(struct snd_seq_queue *q);</div><div class='ctx'> int snd_seq_timer_close(struct snd_seq_queue *q);</div><div class='del'>-int snd_seq_timer_midi_open(struct snd_seq_queue *q);</div><div class='del'>-int snd_seq_timer_midi_close(struct snd_seq_queue *q);</div><div class='ctx'> void snd_seq_timer_defaults(struct snd_seq_timer *tmr);</div><div class='ctx'> void snd_seq_timer_reset(struct snd_seq_timer *tmr);</div><div class='ctx'> int snd_seq_timer_stop(struct snd_seq_timer *tmr);</div><div class='ctx'> int snd_seq_timer_start(struct snd_seq_timer *tmr);</div><div class='ctx'> int snd_seq_timer_continue(struct snd_seq_timer *tmr);</div><div class='ctx'> int snd_seq_timer_set_tempo(struct snd_seq_timer *tmr, int tempo);</div><div class='del'>-int snd_seq_timer_set_ppq(struct snd_seq_timer *tmr, int ppq);</div><div class='add'>+int snd_seq_timer_set_tempo_ppq(struct snd_seq_timer *tmr, int tempo, int ppq,</div><div class='add'>+				unsigned int tempo_base);</div><div class='ctx'> int snd_seq_timer_set_position_tick(struct snd_seq_timer *tmr, snd_seq_tick_time_t position);</div><div class='ctx'> int snd_seq_timer_set_position_time(struct snd_seq_timer *tmr, snd_seq_real_time_t position);</div><div class='ctx'> int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew, unsigned int base);</div><div class='del'>-snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr);</div><div class='add'>+snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr,</div><div class='add'>+					       bool adjust_ktime);</div><div class='ctx'> snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr);</div><div class='ctx'> </div><div class='ctx'> extern int seq_default_timer_class;</div><div class='head'>diff --git a/sound/core/seq/seq_ump_client.c b/sound/core/seq/seq_ump_client.c<br/>new file mode 100644<br/>index 000000000000..27247babb16d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ump_client.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_ump_client.c</a></div><div class='hunk'>@@ -0,0 +1,539 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* ALSA sequencer binding for UMP device */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='add'>+#include &lt;sound/seq_kernel.h&gt;</div><div class='add'>+#include &lt;sound/seq_device.h&gt;</div><div class='add'>+#include "seq_clientmgr.h"</div><div class='add'>+#include "seq_system.h"</div><div class='add'>+</div><div class='add'>+struct seq_ump_client;</div><div class='add'>+struct seq_ump_group;</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STR_IN = SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+	STR_OUT = SNDRV_RAWMIDI_STREAM_OUTPUT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* context for UMP input parsing, per EP */</div><div class='add'>+struct seq_ump_input_buffer {</div><div class='add'>+	unsigned char len;		/* total length in words */</div><div class='add'>+	unsigned char pending;		/* pending words */</div><div class='add'>+	unsigned char type;		/* parsed UMP packet type */</div><div class='add'>+	unsigned char group;		/* parsed UMP packet group */</div><div class='add'>+	u32 buf[4];			/* incoming UMP packet */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* sequencer client, per UMP EP (rawmidi) */</div><div class='add'>+struct seq_ump_client {</div><div class='add'>+	struct snd_ump_endpoint *ump;	/* assigned endpoint */</div><div class='add'>+	int seq_client;			/* sequencer client id */</div><div class='add'>+	int opened[2];			/* current opens for each direction */</div><div class='add'>+	struct snd_rawmidi_file out_rfile; /* rawmidi for output */</div><div class='add'>+	struct seq_ump_input_buffer input; /* input parser context */</div><div class='add'>+	void *ump_info[SNDRV_UMP_MAX_BLOCKS + 1]; /* shadow of seq client ump_info */</div><div class='add'>+	struct work_struct group_notify_work; /* FB change notification */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* number of 32bit words for each UMP message type */</div><div class='add'>+static unsigned char ump_packet_words[0x10] = {</div><div class='add'>+	1, 1, 1, 2, 2, 4, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* conversion between UMP group and seq port;</div><div class='add'>+ * assume the port number is equal with UMP group number (1-based)</div><div class='add'>+ */</div><div class='add'>+static unsigned char ump_group_to_seq_port(unsigned char group)</div><div class='add'>+{</div><div class='add'>+	return group + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process the incoming rawmidi stream */</div><div class='add'>+static void seq_ump_input_receive(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const u32 *val, int words)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = ump-&gt;seq_client;</div><div class='add'>+	struct snd_seq_ump_event ev = {};</div><div class='add'>+</div><div class='add'>+	if (!client-&gt;opened[STR_IN])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ump_is_groupless_msg(ump_message_type(*val)))</div><div class='add'>+		ev.source.port = 0; /* UMP EP port */</div><div class='add'>+	else</div><div class='add'>+		ev.source.port = ump_group_to_seq_port(ump_message_group(*val));</div><div class='add'>+	ev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;</div><div class='add'>+	ev.flags = SNDRV_SEQ_EVENT_UMP;</div><div class='add'>+	memcpy(ev.ump, val, words &lt;&lt; 2);</div><div class='add'>+	snd_seq_kernel_client_dispatch(client-&gt;seq_client,</div><div class='add'>+				       (struct snd_seq_event *)&amp;ev,</div><div class='add'>+				       true, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process an input sequencer event; only deal with UMP types */</div><div class='add'>+static int seq_ump_process_event(struct snd_seq_event *ev, int direct,</div><div class='add'>+				 void *private_data, int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = private_data;</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	struct snd_seq_ump_event *ump_ev;</div><div class='add'>+	unsigned char type;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	substream = client-&gt;out_rfile.output;</div><div class='add'>+	if (!substream)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!snd_seq_ev_is_ump(ev))</div><div class='add'>+		return 0; /* invalid event, skip */</div><div class='add'>+	ump_ev = (struct snd_seq_ump_event *)ev;</div><div class='add'>+	type = ump_message_type(ump_ev-&gt;ump[0]);</div><div class='add'>+	len = ump_packet_words[type];</div><div class='add'>+	if (len &gt; 4)</div><div class='add'>+		return 0; // invalid - skip</div><div class='add'>+	snd_rawmidi_kernel_write(substream, ev-&gt;data.raw8.d, len &lt;&lt; 2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* open the rawmidi */</div><div class='add'>+static int seq_ump_client_open(struct seq_ump_client *client, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = client-&gt;ump;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ump-&gt;open_mutex);</div><div class='add'>+	if (dir == STR_OUT &amp;&amp; !client-&gt;opened[dir]) {</div><div class='add'>+		err = snd_rawmidi_kernel_open(&amp;ump-&gt;core, 0,</div><div class='add'>+					      SNDRV_RAWMIDI_LFLG_OUTPUT |</div><div class='add'>+					      SNDRV_RAWMIDI_LFLG_APPEND,</div><div class='add'>+					      &amp;client-&gt;out_rfile);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	client-&gt;opened[dir]++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* close the rawmidi */</div><div class='add'>+static int seq_ump_client_close(struct seq_ump_client *client, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = client-&gt;ump;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ump-&gt;open_mutex);</div><div class='add'>+	if (!--client-&gt;opened[dir])</div><div class='add'>+		if (dir == STR_OUT)</div><div class='add'>+			snd_rawmidi_kernel_release(&amp;client-&gt;out_rfile);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sequencer subscription ops for each client */</div><div class='add'>+static int seq_ump_subscribe(void *pdata, struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = pdata;</div><div class='add'>+</div><div class='add'>+	return seq_ump_client_open(client, STR_IN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seq_ump_unsubscribe(void *pdata, struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = pdata;</div><div class='add'>+</div><div class='add'>+	return seq_ump_client_close(client, STR_IN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seq_ump_use(void *pdata, struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = pdata;</div><div class='add'>+</div><div class='add'>+	return seq_ump_client_open(client, STR_OUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int seq_ump_unuse(void *pdata, struct snd_seq_port_subscribe *info)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = pdata;</div><div class='add'>+</div><div class='add'>+	return seq_ump_client_close(client, STR_OUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill port_info from the given UMP EP and group info */</div><div class='add'>+static void fill_port_info(struct snd_seq_port_info *port,</div><div class='add'>+			   struct seq_ump_client *client,</div><div class='add'>+			   struct snd_ump_group *group)</div><div class='add'>+{</div><div class='add'>+	unsigned int rawmidi_info = client-&gt;ump-&gt;core.info_flags;</div><div class='add'>+</div><div class='add'>+	port-&gt;addr.client = client-&gt;seq_client;</div><div class='add'>+	port-&gt;addr.port = ump_group_to_seq_port(group-&gt;group);</div><div class='add'>+	port-&gt;capability = 0;</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_OUTPUT)</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_WRITE |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SYNC_WRITE |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SUBS_WRITE;</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_INPUT)</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_READ |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SYNC_READ |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SUBS_READ;</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_DUPLEX)</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;</div><div class='add'>+	if (group-&gt;dir_bits &amp; (1 &lt;&lt; STR_IN))</div><div class='add'>+		port-&gt;direction |= SNDRV_SEQ_PORT_DIR_INPUT;</div><div class='add'>+	if (group-&gt;dir_bits &amp; (1 &lt;&lt; STR_OUT))</div><div class='add'>+		port-&gt;direction |= SNDRV_SEQ_PORT_DIR_OUTPUT;</div><div class='add'>+	port-&gt;ump_group = group-&gt;group + 1;</div><div class='add'>+	if (!group-&gt;active)</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_INACTIVE;</div><div class='add'>+	if (group-&gt;is_midi1)</div><div class='add'>+		port-&gt;flags |= SNDRV_SEQ_PORT_FLG_IS_MIDI1;</div><div class='add'>+	port-&gt;type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |</div><div class='add'>+		SNDRV_SEQ_PORT_TYPE_MIDI_UMP |</div><div class='add'>+		SNDRV_SEQ_PORT_TYPE_HARDWARE |</div><div class='add'>+		SNDRV_SEQ_PORT_TYPE_PORT;</div><div class='add'>+	port-&gt;midi_channels = 16;</div><div class='add'>+	if (*group-&gt;name)</div><div class='add'>+		snprintf(port-&gt;name, sizeof(port-&gt;name), "Group %d (%.53s)",</div><div class='add'>+			 group-&gt;group + 1, group-&gt;name);</div><div class='add'>+	else</div><div class='add'>+		sprintf(port-&gt;name, "Group %d", group-&gt;group + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* skip non-existing group for static blocks */</div><div class='add'>+static bool skip_group(struct seq_ump_client *client, struct snd_ump_group *group)</div><div class='add'>+{</div><div class='add'>+	return !group-&gt;valid &amp;&amp;</div><div class='add'>+		(client-&gt;ump-&gt;info.flags &amp; SNDRV_UMP_EP_INFO_STATIC_BLOCKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a new sequencer port per UMP group */</div><div class='add'>+static int seq_ump_group_init(struct seq_ump_client *client, int group_index)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_group *group = &amp;client-&gt;ump-&gt;groups[group_index];</div><div class='add'>+	struct snd_seq_port_info *port __free(kfree) = NULL;</div><div class='add'>+	struct snd_seq_port_callback pcallbacks;</div><div class='add'>+</div><div class='add'>+	if (skip_group(client, group))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='add'>+	if (!port)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fill_port_info(port, client, group);</div><div class='add'>+	port-&gt;flags |= SNDRV_SEQ_PORT_FLG_GIVEN_PORT;</div><div class='add'>+	memset(&amp;pcallbacks, 0, sizeof(pcallbacks));</div><div class='add'>+	pcallbacks.owner = THIS_MODULE;</div><div class='add'>+	pcallbacks.private_data = client;</div><div class='add'>+	pcallbacks.subscribe = seq_ump_subscribe;</div><div class='add'>+	pcallbacks.unsubscribe = seq_ump_unsubscribe;</div><div class='add'>+	pcallbacks.use = seq_ump_use;</div><div class='add'>+	pcallbacks.unuse = seq_ump_unuse;</div><div class='add'>+	pcallbacks.event_input = seq_ump_process_event;</div><div class='add'>+	port-&gt;kernel = &amp;pcallbacks;</div><div class='add'>+	return snd_seq_kernel_client_ctl(client-&gt;seq_client,</div><div class='add'>+					 SNDRV_SEQ_IOCTL_CREATE_PORT,</div><div class='add'>+					 port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update the sequencer ports; called from notify_fb_change callback */</div><div class='add'>+static void update_port_infos(struct seq_ump_client *client)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_port_info *old __free(kfree) = NULL;</div><div class='add'>+	struct snd_seq_port_info *new __free(kfree) = NULL;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	old = kzalloc(sizeof(*old), GFP_KERNEL);</div><div class='add'>+	new = kzalloc(sizeof(*new), GFP_KERNEL);</div><div class='add'>+	if (!old || !new)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNDRV_UMP_MAX_GROUPS; i++) {</div><div class='add'>+		if (skip_group(client, &amp;client-&gt;ump-&gt;groups[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		old-&gt;addr.client = client-&gt;seq_client;</div><div class='add'>+		old-&gt;addr.port = ump_group_to_seq_port(i);</div><div class='add'>+		err = snd_seq_kernel_client_ctl(client-&gt;seq_client,</div><div class='add'>+						SNDRV_SEQ_IOCTL_GET_PORT_INFO,</div><div class='add'>+						old);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		fill_port_info(new, client, &amp;client-&gt;ump-&gt;groups[i]);</div><div class='add'>+		if (old-&gt;capability == new-&gt;capability &amp;&amp;</div><div class='add'>+		    !strcmp(old-&gt;name, new-&gt;name))</div><div class='add'>+			continue;</div><div class='add'>+		err = snd_seq_kernel_client_ctl(client-&gt;seq_client,</div><div class='add'>+						SNDRV_SEQ_IOCTL_SET_PORT_INFO,</div><div class='add'>+						new);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a UMP Endpoint port */</div><div class='add'>+static int create_ump_endpoint_port(struct seq_ump_client *client)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_port_info *port __free(kfree) = NULL;</div><div class='add'>+	struct snd_seq_port_callback pcallbacks;</div><div class='add'>+	unsigned int rawmidi_info = client-&gt;ump-&gt;core.info_flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port = kzalloc(sizeof(*port), GFP_KERNEL);</div><div class='add'>+	if (!port)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	port-&gt;addr.client = client-&gt;seq_client;</div><div class='add'>+	port-&gt;addr.port = 0; /* fixed */</div><div class='add'>+	port-&gt;flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT;</div><div class='add'>+	port-&gt;capability = SNDRV_SEQ_PORT_CAP_UMP_ENDPOINT;</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_INPUT) {</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_READ |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SYNC_READ |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SUBS_READ;</div><div class='add'>+		port-&gt;direction |= SNDRV_SEQ_PORT_DIR_INPUT;</div><div class='add'>+	}</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_OUTPUT) {</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_WRITE |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SYNC_WRITE |</div><div class='add'>+			SNDRV_SEQ_PORT_CAP_SUBS_WRITE;</div><div class='add'>+		port-&gt;direction |= SNDRV_SEQ_PORT_DIR_OUTPUT;</div><div class='add'>+	}</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_DUPLEX)</div><div class='add'>+		port-&gt;capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;</div><div class='add'>+	port-&gt;ump_group = 0; /* no associated group, no conversion */</div><div class='add'>+	port-&gt;type = SNDRV_SEQ_PORT_TYPE_MIDI_UMP |</div><div class='add'>+		SNDRV_SEQ_PORT_TYPE_HARDWARE |</div><div class='add'>+		SNDRV_SEQ_PORT_TYPE_PORT;</div><div class='add'>+	port-&gt;midi_channels = 16;</div><div class='add'>+	strscpy(port-&gt;name, "MIDI 2.0");</div><div class='add'>+	memset(&amp;pcallbacks, 0, sizeof(pcallbacks));</div><div class='add'>+	pcallbacks.owner = THIS_MODULE;</div><div class='add'>+	pcallbacks.private_data = client;</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_INPUT) {</div><div class='add'>+		pcallbacks.subscribe = seq_ump_subscribe;</div><div class='add'>+		pcallbacks.unsubscribe = seq_ump_unsubscribe;</div><div class='add'>+	}</div><div class='add'>+	if (rawmidi_info &amp; SNDRV_RAWMIDI_INFO_OUTPUT) {</div><div class='add'>+		pcallbacks.use = seq_ump_use;</div><div class='add'>+		pcallbacks.unuse = seq_ump_unuse;</div><div class='add'>+		pcallbacks.event_input = seq_ump_process_event;</div><div class='add'>+	}</div><div class='add'>+	port-&gt;kernel = &amp;pcallbacks;</div><div class='add'>+	err = snd_seq_kernel_client_ctl(client-&gt;seq_client,</div><div class='add'>+					SNDRV_SEQ_IOCTL_CREATE_PORT,</div><div class='add'>+					port);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* release the client resources */</div><div class='add'>+static void seq_ump_client_free(struct seq_ump_client *client)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;client-&gt;group_notify_work);</div><div class='add'>+</div><div class='add'>+	if (client-&gt;seq_client &gt;= 0)</div><div class='add'>+		snd_seq_delete_kernel_client(client-&gt;seq_client);</div><div class='add'>+</div><div class='add'>+	client-&gt;ump-&gt;seq_ops = NULL;</div><div class='add'>+	client-&gt;ump-&gt;seq_client = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(client);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update the MIDI version for the given client */</div><div class='add'>+static void setup_client_midi_version(struct seq_ump_client *client)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_client *cptr;</div><div class='add'>+</div><div class='add'>+	cptr = snd_seq_kernel_client_get(client-&gt;seq_client);</div><div class='add'>+	if (!cptr)</div><div class='add'>+		return;</div><div class='add'>+	if (client-&gt;ump-&gt;info.protocol &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI2)</div><div class='add'>+		cptr-&gt;midi_version = SNDRV_SEQ_CLIENT_UMP_MIDI_2_0;</div><div class='add'>+	else</div><div class='add'>+		cptr-&gt;midi_version = SNDRV_SEQ_CLIENT_UMP_MIDI_1_0;</div><div class='add'>+	snd_seq_kernel_client_put(cptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up client's group_filter bitmap */</div><div class='add'>+static void setup_client_group_filter(struct seq_ump_client *client)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_client *cptr;</div><div class='add'>+	unsigned int filter;</div><div class='add'>+	int p;</div><div class='add'>+</div><div class='add'>+	cptr = snd_seq_kernel_client_get(client-&gt;seq_client);</div><div class='add'>+	if (!cptr)</div><div class='add'>+		return;</div><div class='add'>+	filter = ~(1U &lt;&lt; 0); /* always allow groupless messages */</div><div class='add'>+	for (p = 0; p &lt; SNDRV_UMP_MAX_GROUPS; p++) {</div><div class='add'>+		if (client-&gt;ump-&gt;groups[p].active)</div><div class='add'>+			filter &amp;= ~(1U &lt;&lt; (p + 1));</div><div class='add'>+	}</div><div class='add'>+	cptr-&gt;group_filter = filter;</div><div class='add'>+	snd_seq_kernel_client_put(cptr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* UMP group change notification */</div><div class='add'>+static void handle_group_notify(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client =</div><div class='add'>+		container_of(work, struct seq_ump_client, group_notify_work);</div><div class='add'>+</div><div class='add'>+	update_port_infos(client);</div><div class='add'>+	setup_client_group_filter(client);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* UMP EP change notification */</div><div class='add'>+static int seq_ump_notify_ep_change(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = ump-&gt;seq_client;</div><div class='add'>+	struct snd_seq_client *cptr;</div><div class='add'>+	int client_id;</div><div class='add'>+</div><div class='add'>+	if (!client)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	client_id = client-&gt;seq_client;</div><div class='add'>+	cptr = snd_seq_kernel_client_get(client_id);</div><div class='add'>+	if (!cptr)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	snd_seq_system_ump_notify(client_id, 0, SNDRV_SEQ_EVENT_UMP_EP_CHANGE,</div><div class='add'>+				  true);</div><div class='add'>+</div><div class='add'>+	/* update sequencer client name if needed */</div><div class='add'>+	if (*ump-&gt;core.name &amp;&amp; strcmp(ump-&gt;core.name, cptr-&gt;name)) {</div><div class='add'>+		strscpy(cptr-&gt;name, ump-&gt;core.name, sizeof(cptr-&gt;name));</div><div class='add'>+		snd_seq_system_client_ev_client_change(client_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_seq_kernel_client_put(cptr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* UMP FB change notification */</div><div class='add'>+static int seq_ump_notify_fb_change(struct snd_ump_endpoint *ump,</div><div class='add'>+				    struct snd_ump_block *fb)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = ump-&gt;seq_client;</div><div class='add'>+</div><div class='add'>+	if (!client)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	schedule_work(&amp;client-&gt;group_notify_work);</div><div class='add'>+	snd_seq_system_ump_notify(client-&gt;seq_client, fb-&gt;info.block_id,</div><div class='add'>+				  SNDRV_SEQ_EVENT_UMP_BLOCK_CHANGE,</div><div class='add'>+				  true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* UMP protocol change notification; just update the midi_version field */</div><div class='add'>+static int seq_ump_switch_protocol(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct seq_ump_client *client = ump-&gt;seq_client;</div><div class='add'>+</div><div class='add'>+	if (!client)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	setup_client_midi_version(client);</div><div class='add'>+	snd_seq_system_ump_notify(client-&gt;seq_client, 0,</div><div class='add'>+				  SNDRV_SEQ_EVENT_UMP_EP_CHANGE,</div><div class='add'>+				  true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_seq_ump_ops seq_ump_ops = {</div><div class='add'>+	.input_receive = seq_ump_input_receive,</div><div class='add'>+	.notify_ep_change = seq_ump_notify_ep_change,</div><div class='add'>+	.notify_fb_change = seq_ump_notify_fb_change,</div><div class='add'>+	.switch_protocol = seq_ump_switch_protocol,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* create a sequencer client and ports for the given UMP endpoint */</div><div class='add'>+static int snd_seq_ump_probe(struct device *_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='add'>+	struct snd_ump_endpoint *ump = dev-&gt;private_data;</div><div class='add'>+	struct snd_card *card = dev-&gt;card;</div><div class='add'>+	struct seq_ump_client *client;</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	struct snd_seq_client *cptr;</div><div class='add'>+	int p, err;</div><div class='add'>+</div><div class='add'>+	client = kzalloc(sizeof(*client), GFP_KERNEL);</div><div class='add'>+	if (!client)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;client-&gt;group_notify_work, handle_group_notify);</div><div class='add'>+	client-&gt;ump = ump;</div><div class='add'>+</div><div class='add'>+	client-&gt;seq_client =</div><div class='add'>+		snd_seq_create_kernel_client(card, ump-&gt;core.device,</div><div class='add'>+					     ump-&gt;core.name);</div><div class='add'>+	if (client-&gt;seq_client &lt; 0) {</div><div class='add'>+		err = client-&gt;seq_client;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	client-&gt;ump_info[0] = &amp;ump-&gt;info;</div><div class='add'>+	list_for_each_entry(fb, &amp;ump-&gt;block_list, list)</div><div class='add'>+		client-&gt;ump_info[fb-&gt;info.block_id + 1] = &amp;fb-&gt;info;</div><div class='add'>+</div><div class='add'>+	setup_client_midi_version(client);</div><div class='add'>+</div><div class='add'>+	for (p = 0; p &lt; SNDRV_UMP_MAX_GROUPS; p++) {</div><div class='add'>+		err = seq_ump_group_init(client, p);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setup_client_group_filter(client);</div><div class='add'>+</div><div class='add'>+	err = create_ump_endpoint_port(client);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	cptr = snd_seq_kernel_client_get(client-&gt;seq_client);</div><div class='add'>+	if (!cptr) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	cptr-&gt;ump_info = client-&gt;ump_info;</div><div class='add'>+	snd_seq_kernel_client_put(cptr);</div><div class='add'>+</div><div class='add'>+	ump-&gt;seq_client = client;</div><div class='add'>+	ump-&gt;seq_ops = &amp;seq_ump_ops;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	seq_ump_client_free(client);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* remove a sequencer client */</div><div class='add'>+static int snd_seq_ump_remove(struct device *_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='add'>+	struct snd_ump_endpoint *ump = dev-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;seq_client)</div><div class='add'>+		seq_ump_client_free(ump-&gt;seq_client);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_seq_driver seq_ump_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_seq_ump_probe,</div><div class='add'>+		.remove = snd_seq_ump_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_UMP,</div><div class='add'>+	.argsize = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_snd_seq_driver(seq_ump_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("ALSA sequencer client for UMP rawmidi");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/core/seq/seq_ump_convert.c b/sound/core/seq/seq_ump_convert.c<br/>new file mode 100644<br/>index 000000000000..db2f169cae11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ump_convert.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_ump_convert.c</a></div><div class='hunk'>@@ -0,0 +1,1305 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * ALSA sequencer event conversion between UMP and legacy clients</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='add'>+#include &lt;sound/ump_msg.h&gt;</div><div class='add'>+#include "seq_ump_convert.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Upgrade / downgrade value bits</div><div class='add'>+ */</div><div class='add'>+static u8 downscale_32_to_7bit(u32 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 25;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 downscale_32_to_14bit(u32 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 18;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 downscale_16_to_7bit(u16 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 9;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 upscale_7_to_16bit(u8 src)</div><div class='add'>+{</div><div class='add'>+	u16 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = (u16)src &lt;&lt; 9;</div><div class='add'>+	if (src &lt;= 0x40)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x3f;</div><div class='add'>+	return val | (repeat &lt;&lt; 3) | (repeat &gt;&gt; 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 upscale_7_to_32bit(u8 src)</div><div class='add'>+{</div><div class='add'>+	u32 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = src &lt;&lt; 25;</div><div class='add'>+	if (src &lt;= 0x40)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x3f;</div><div class='add'>+	return val | (repeat &lt;&lt; 19) | (repeat &lt;&lt; 13) |</div><div class='add'>+		(repeat &lt;&lt; 7) | (repeat &lt;&lt; 1) | (repeat &gt;&gt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 upscale_14_to_32bit(u16 src)</div><div class='add'>+{</div><div class='add'>+	u32 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = src &lt;&lt; 18;</div><div class='add'>+	if (src &lt;= 0x2000)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x1fff;</div><div class='add'>+	return val | (repeat &lt;&lt; 5) | (repeat &gt;&gt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char get_ump_group(struct snd_seq_client_port *port)</div><div class='add'>+{</div><div class='add'>+	return port-&gt;ump_group ? (port-&gt;ump_group - 1) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a UMP header */</div><div class='add'>+#define make_raw_ump(port, type) \</div><div class='add'>+	ump_compose(type, get_ump_group(port), 0, 0)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UMP -&gt; MIDI1 sequencer event</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* MIDI 1.0 CVM */</div><div class='add'>+</div><div class='add'>+/* encode note event */</div><div class='add'>+static void ump_midi1_to_note_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+				 struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.note.channel = val-&gt;note.channel;</div><div class='add'>+	ev-&gt;data.note.note = val-&gt;note.note;</div><div class='add'>+	ev-&gt;data.note.velocity = val-&gt;note.velocity;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode one parameter controls */</div><div class='add'>+static void ump_midi1_to_ctrl_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+				 struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;caf.channel;</div><div class='add'>+	ev-&gt;data.control.value = val-&gt;caf.data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode pitch wheel change */</div><div class='add'>+static void ump_midi1_to_pitchbend_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+				      struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;pb.channel;</div><div class='add'>+	ev-&gt;data.control.value = (val-&gt;pb.data_msb &lt;&lt; 7) | val-&gt;pb.data_lsb;</div><div class='add'>+	ev-&gt;data.control.value -= 8192;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode midi control change */</div><div class='add'>+static void ump_midi1_to_cc_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+			       struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;cc.channel;</div><div class='add'>+	ev-&gt;data.control.param = val-&gt;cc.index;</div><div class='add'>+	ev-&gt;data.control.value = val-&gt;cc.data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Encoding MIDI 1.0 UMP packet */</div><div class='add'>+struct seq_ump_midi1_to_ev {</div><div class='add'>+	int seq_type;</div><div class='add'>+	void (*encode)(const union snd_ump_midi1_msg *val, struct snd_seq_event *ev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Encoders for MIDI1 status 0x80-0xe0 */</div><div class='add'>+static struct seq_ump_midi1_to_ev midi1_msg_encoders[] = {</div><div class='add'>+	{SNDRV_SEQ_EVENT_NOTEOFF,	ump_midi1_to_note_ev},	/* 0x80 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NOTEON,	ump_midi1_to_note_ev},	/* 0x90 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_KEYPRESS,	ump_midi1_to_note_ev},	/* 0xa0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CONTROLLER,	ump_midi1_to_cc_ev},	/* 0xb0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_PGMCHANGE,	ump_midi1_to_ctrl_ev},	/* 0xc0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CHANPRESS,	ump_midi1_to_ctrl_ev},	/* 0xd0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_PITCHBEND,	ump_midi1_to_pitchbend_ev}, /* 0xe0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cvt_ump_midi1_to_event(const union snd_ump_midi1_msg *val,</div><div class='add'>+				  struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	unsigned char status = val-&gt;note.status;</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0x8 || status &gt; 0xe)</div><div class='add'>+		return 0; /* invalid - skip */</div><div class='add'>+	status -= 8;</div><div class='add'>+	ev-&gt;type = midi1_msg_encoders[status].seq_type;</div><div class='add'>+	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_FIXED;</div><div class='add'>+	midi1_msg_encoders[status].encode(val, ev);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MIDI System message */</div><div class='add'>+</div><div class='add'>+/* encode one parameter value*/</div><div class='add'>+static void ump_system_to_one_param_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+				       struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.value = val-&gt;system.parm1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode song position */</div><div class='add'>+static void ump_system_to_songpos_ev(const union snd_ump_midi1_msg *val,</div><div class='add'>+				     struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.value = (val-&gt;system.parm2 &lt;&lt; 7) | val-&gt;system.parm1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Encoders for 0xf0 - 0xff */</div><div class='add'>+static struct seq_ump_midi1_to_ev system_msg_encoders[] = {</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},	 /* 0xf0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_QFRAME,	ump_system_to_one_param_ev}, /* 0xf1 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_SONGPOS,	ump_system_to_songpos_ev}, /* 0xf2 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_SONGSEL,	ump_system_to_one_param_ev}, /* 0xf3 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL}, /* 0xf4 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL}, /* 0xf5 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_TUNE_REQUEST,	NULL}, /* 0xf6 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL}, /* 0xf7 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CLOCK,		NULL}, /* 0xf8 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL}, /* 0xf9 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_START,		NULL}, /* 0xfa */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CONTINUE,	NULL}, /* 0xfb */</div><div class='add'>+	{SNDRV_SEQ_EVENT_STOP,		NULL}, /* 0xfc */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL}, /* 0xfd */</div><div class='add'>+	{SNDRV_SEQ_EVENT_SENSING,	NULL}, /* 0xfe */</div><div class='add'>+	{SNDRV_SEQ_EVENT_RESET,		NULL}, /* 0xff */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cvt_ump_system_to_event(const union snd_ump_midi1_msg *val,</div><div class='add'>+				   struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	unsigned char status = val-&gt;system.status;</div><div class='add'>+</div><div class='add'>+	if ((status &amp; 0xf0) != UMP_MIDI1_MSG_REALTIME)</div><div class='add'>+		return 0; /* invalid status - skip */</div><div class='add'>+	status &amp;= 0x0f;</div><div class='add'>+	ev-&gt;type = system_msg_encoders[status].seq_type;</div><div class='add'>+	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_FIXED;</div><div class='add'>+	if (ev-&gt;type == SNDRV_SEQ_EVENT_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+	if (system_msg_encoders[status].encode)</div><div class='add'>+		system_msg_encoders[status].encode(val, ev);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MIDI 2.0 CVM */</div><div class='add'>+</div><div class='add'>+/* encode note event */</div><div class='add'>+static int ump_midi2_to_note_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+				struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.note.channel = val-&gt;note.channel;</div><div class='add'>+	ev-&gt;data.note.note = val-&gt;note.note;</div><div class='add'>+	ev-&gt;data.note.velocity = downscale_16_to_7bit(val-&gt;note.velocity);</div><div class='add'>+	/* correct note-on velocity 0 to 1;</div><div class='add'>+	 * it's no longer equivalent as not-off for MIDI 2.0</div><div class='add'>+	 */</div><div class='add'>+	if (ev-&gt;type == SNDRV_SEQ_EVENT_NOTEON &amp;&amp;</div><div class='add'>+	    !ev-&gt;data.note.velocity)</div><div class='add'>+		ev-&gt;data.note.velocity = 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode pitch wheel change */</div><div class='add'>+static int ump_midi2_to_pitchbend_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+				     struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;pb.channel;</div><div class='add'>+	ev-&gt;data.control.value = downscale_32_to_14bit(val-&gt;pb.data);</div><div class='add'>+	ev-&gt;data.control.value -= 8192;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode midi control change */</div><div class='add'>+static int ump_midi2_to_cc_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+			      struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;cc.channel;</div><div class='add'>+	ev-&gt;data.control.param = val-&gt;cc.index;</div><div class='add'>+	ev-&gt;data.control.value = downscale_32_to_7bit(val-&gt;cc.data);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode midi program change */</div><div class='add'>+static int ump_midi2_to_pgm_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+			       struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	int size = 1;</div><div class='add'>+</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;pg.channel;</div><div class='add'>+	if (val-&gt;pg.bank_valid) {</div><div class='add'>+		ev-&gt;type = SNDRV_SEQ_EVENT_CONTROL14;</div><div class='add'>+		ev-&gt;data.control.param = UMP_CC_BANK_SELECT;</div><div class='add'>+		ev-&gt;data.control.value = (val-&gt;pg.bank_msb &lt;&lt; 7) | val-&gt;pg.bank_lsb;</div><div class='add'>+		ev[1] = ev[0];</div><div class='add'>+		ev++;</div><div class='add'>+		ev-&gt;type = SNDRV_SEQ_EVENT_PGMCHANGE;</div><div class='add'>+		size = 2;</div><div class='add'>+	}</div><div class='add'>+	ev-&gt;data.control.value = val-&gt;pg.program;</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode one parameter controls */</div><div class='add'>+static int ump_midi2_to_ctrl_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+				struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;caf.channel;</div><div class='add'>+	ev-&gt;data.control.value = downscale_32_to_7bit(val-&gt;caf.data);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* encode RPN/NRPN */</div><div class='add'>+static int ump_midi2_to_rpn_ev(const union snd_ump_midi2_msg *val,</div><div class='add'>+			       struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	ev-&gt;data.control.channel = val-&gt;rpn.channel;</div><div class='add'>+	ev-&gt;data.control.param = (val-&gt;rpn.bank &lt;&lt; 7) | val-&gt;rpn.index;</div><div class='add'>+	ev-&gt;data.control.value = downscale_32_to_14bit(val-&gt;rpn.data);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Encoding MIDI 2.0 UMP Packet */</div><div class='add'>+struct seq_ump_midi2_to_ev {</div><div class='add'>+	int seq_type;</div><div class='add'>+	int (*encode)(const union snd_ump_midi2_msg *val, struct snd_seq_event *ev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Encoders for MIDI2 status 0x00-0xf0 */</div><div class='add'>+static struct seq_ump_midi2_to_ev midi2_msg_encoders[] = {</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x00 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x10 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_REGPARAM,	ump_midi2_to_rpn_ev},	/* 0x20 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONREGPARAM,	ump_midi2_to_rpn_ev},	/* 0x30 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x40 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x50 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x60 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0x70 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NOTEOFF,	ump_midi2_to_note_ev},	/* 0x80 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NOTEON,	ump_midi2_to_note_ev},	/* 0x90 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_KEYPRESS,	ump_midi2_to_note_ev},	/* 0xa0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CONTROLLER,	ump_midi2_to_cc_ev},	/* 0xb0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_PGMCHANGE,	ump_midi2_to_pgm_ev},	/* 0xc0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_CHANPRESS,	ump_midi2_to_ctrl_ev},	/* 0xd0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_PITCHBEND,	ump_midi2_to_pitchbend_ev}, /* 0xe0 */</div><div class='add'>+	{SNDRV_SEQ_EVENT_NONE,		NULL},			/* 0xf0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cvt_ump_midi2_to_event(const union snd_ump_midi2_msg *val,</div><div class='add'>+				  struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	unsigned char status = val-&gt;note.status;</div><div class='add'>+</div><div class='add'>+	ev-&gt;type = midi2_msg_encoders[status].seq_type;</div><div class='add'>+	if (ev-&gt;type == SNDRV_SEQ_EVENT_NONE)</div><div class='add'>+		return 0; /* skip */</div><div class='add'>+	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_FIXED;</div><div class='add'>+	return midi2_msg_encoders[status].encode(val, ev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse and compose for a sysex var-length event */</div><div class='add'>+static int cvt_ump_sysex7_to_event(const u32 *data, unsigned char *buf,</div><div class='add'>+				   struct snd_seq_event *ev)</div><div class='add'>+{</div><div class='add'>+	unsigned char status;</div><div class='add'>+	unsigned char bytes;</div><div class='add'>+	u32 val;</div><div class='add'>+	int size = 0;</div><div class='add'>+</div><div class='add'>+	val = data[0];</div><div class='add'>+	status = ump_sysex_message_status(val);</div><div class='add'>+	bytes = ump_sysex_message_length(val);</div><div class='add'>+	if (bytes &gt; 6)</div><div class='add'>+		return 0; // skip</div><div class='add'>+</div><div class='add'>+	if (status == UMP_SYSEX_STATUS_SINGLE ||</div><div class='add'>+	    status == UMP_SYSEX_STATUS_START) {</div><div class='add'>+		buf[0] = UMP_MIDI1_MSG_SYSEX_START;</div><div class='add'>+		size = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bytes &gt; 0)</div><div class='add'>+		buf[size++] = (val &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	if (bytes &gt; 1)</div><div class='add'>+		buf[size++] = val &amp; 0x7f;</div><div class='add'>+	val = data[1];</div><div class='add'>+	if (bytes &gt; 2)</div><div class='add'>+		buf[size++] = (val &gt;&gt; 24) &amp; 0x7f;</div><div class='add'>+	if (bytes &gt; 3)</div><div class='add'>+		buf[size++] = (val &gt;&gt; 16) &amp; 0x7f;</div><div class='add'>+	if (bytes &gt; 4)</div><div class='add'>+		buf[size++] = (val &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	if (bytes &gt; 5)</div><div class='add'>+		buf[size++] = val &amp; 0x7f;</div><div class='add'>+</div><div class='add'>+	if (status == UMP_SYSEX_STATUS_SINGLE ||</div><div class='add'>+	    status == UMP_SYSEX_STATUS_END)</div><div class='add'>+		buf[size++] = UMP_MIDI1_MSG_SYSEX_END;</div><div class='add'>+</div><div class='add'>+	ev-&gt;type = SNDRV_SEQ_EVENT_SYSEX;</div><div class='add'>+	ev-&gt;flags = SNDRV_SEQ_EVENT_LENGTH_VARIABLE;</div><div class='add'>+	ev-&gt;data.ext.len = size;</div><div class='add'>+	ev-&gt;data.ext.ptr = buf;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert UMP packet from MIDI 1.0 to MIDI 2.0 and deliver it */</div><div class='add'>+static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  struct snd_seq_event *__event,</div><div class='add'>+				  int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_ump_event *event = (struct snd_seq_ump_event *)__event;</div><div class='add'>+	struct snd_seq_ump_event ev_cvt;</div><div class='add'>+	const union snd_ump_midi1_msg *midi1 = (const union snd_ump_midi1_msg *)event-&gt;ump;</div><div class='add'>+	union snd_ump_midi2_msg *midi2 = (union snd_ump_midi2_msg *)ev_cvt.ump;</div><div class='add'>+	struct ump_cvt_to_ump_bank *cc;</div><div class='add'>+</div><div class='add'>+	ev_cvt = *event;</div><div class='add'>+	memset(&amp;ev_cvt.ump, 0, sizeof(ev_cvt.ump));</div><div class='add'>+</div><div class='add'>+	midi2-&gt;note.type = UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE;</div><div class='add'>+	midi2-&gt;note.group = midi1-&gt;note.group;</div><div class='add'>+	midi2-&gt;note.status = midi1-&gt;note.status;</div><div class='add'>+	midi2-&gt;note.channel = midi1-&gt;note.channel;</div><div class='add'>+	switch (midi1-&gt;note.status) {</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_ON:</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_OFF:</div><div class='add'>+		midi2-&gt;note.note = midi1-&gt;note.note;</div><div class='add'>+		midi2-&gt;note.velocity = upscale_7_to_16bit(midi1-&gt;note.velocity);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_POLY_PRESSURE:</div><div class='add'>+		midi2-&gt;paf.note = midi1-&gt;paf.note;</div><div class='add'>+		midi2-&gt;paf.data = upscale_7_to_32bit(midi1-&gt;paf.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CC:</div><div class='add'>+		cc = &amp;dest_port-&gt;midi2_bank[midi1-&gt;note.channel];</div><div class='add'>+		switch (midi1-&gt;cc.index) {</div><div class='add'>+		case UMP_CC_BANK_SELECT:</div><div class='add'>+			cc-&gt;bank_set = 1;</div><div class='add'>+			cc-&gt;cc_bank_msb = midi1-&gt;cc.data;</div><div class='add'>+			return 0; // skip</div><div class='add'>+		case UMP_CC_BANK_SELECT_LSB:</div><div class='add'>+			cc-&gt;bank_set = 1;</div><div class='add'>+			cc-&gt;cc_bank_lsb = midi1-&gt;cc.data;</div><div class='add'>+			return 0; // skip</div><div class='add'>+		}</div><div class='add'>+		midi2-&gt;cc.index = midi1-&gt;cc.index;</div><div class='add'>+		midi2-&gt;cc.data = upscale_7_to_32bit(midi1-&gt;cc.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PROGRAM:</div><div class='add'>+		midi2-&gt;pg.program = midi1-&gt;pg.program;</div><div class='add'>+		cc = &amp;dest_port-&gt;midi2_bank[midi1-&gt;note.channel];</div><div class='add'>+		if (cc-&gt;bank_set) {</div><div class='add'>+			midi2-&gt;pg.bank_valid = 1;</div><div class='add'>+			midi2-&gt;pg.bank_msb = cc-&gt;cc_bank_msb;</div><div class='add'>+			midi2-&gt;pg.bank_lsb = cc-&gt;cc_bank_lsb;</div><div class='add'>+			cc-&gt;bank_set = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CHANNEL_PRESSURE:</div><div class='add'>+		midi2-&gt;caf.data = upscale_7_to_32bit(midi1-&gt;caf.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PITCH_BEND:</div><div class='add'>+		midi2-&gt;pb.data = upscale_14_to_32bit((midi1-&gt;pb.data_msb &lt;&lt; 7) |</div><div class='add'>+						     midi1-&gt;pb.data_lsb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+					      (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+					      atomic, hop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert UMP packet from MIDI 2.0 to MIDI 1.0 and deliver it */</div><div class='add'>+static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  struct snd_seq_event *__event,</div><div class='add'>+				  int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_ump_event *event = (struct snd_seq_ump_event *)__event;</div><div class='add'>+	struct snd_seq_ump_event ev_cvt;</div><div class='add'>+	union snd_ump_midi1_msg *midi1 = (union snd_ump_midi1_msg *)ev_cvt.ump;</div><div class='add'>+	const union snd_ump_midi2_msg *midi2 = (const union snd_ump_midi2_msg *)event-&gt;ump;</div><div class='add'>+	int err;</div><div class='add'>+	u16 v;</div><div class='add'>+</div><div class='add'>+	ev_cvt = *event;</div><div class='add'>+	memset(&amp;ev_cvt.ump, 0, sizeof(ev_cvt.ump));</div><div class='add'>+</div><div class='add'>+	midi1-&gt;note.type = UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE;</div><div class='add'>+	midi1-&gt;note.group = midi2-&gt;note.group;</div><div class='add'>+	midi1-&gt;note.status = midi2-&gt;note.status;</div><div class='add'>+	midi1-&gt;note.channel = midi2-&gt;note.channel;</div><div class='add'>+	switch (midi2-&gt;note.status) {</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_ON:</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_OFF:</div><div class='add'>+		midi1-&gt;note.note = midi2-&gt;note.note;</div><div class='add'>+		midi1-&gt;note.velocity = downscale_16_to_7bit(midi2-&gt;note.velocity);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_POLY_PRESSURE:</div><div class='add'>+		midi1-&gt;paf.note = midi2-&gt;paf.note;</div><div class='add'>+		midi1-&gt;paf.data = downscale_32_to_7bit(midi2-&gt;paf.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CC:</div><div class='add'>+		midi1-&gt;cc.index = midi2-&gt;cc.index;</div><div class='add'>+		midi1-&gt;cc.data = downscale_32_to_7bit(midi2-&gt;cc.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PROGRAM:</div><div class='add'>+		if (midi2-&gt;pg.bank_valid) {</div><div class='add'>+			midi1-&gt;cc.status = UMP_MSG_STATUS_CC;</div><div class='add'>+			midi1-&gt;cc.index = UMP_CC_BANK_SELECT;</div><div class='add'>+			midi1-&gt;cc.data = midi2-&gt;pg.bank_msb;</div><div class='add'>+			err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+							     (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+							     atomic, hop);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			midi1-&gt;cc.index = UMP_CC_BANK_SELECT_LSB;</div><div class='add'>+			midi1-&gt;cc.data = midi2-&gt;pg.bank_lsb;</div><div class='add'>+			err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+							     (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+							     atomic, hop);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			midi1-&gt;note.status = midi2-&gt;note.status;</div><div class='add'>+		}</div><div class='add'>+		midi1-&gt;pg.program = midi2-&gt;pg.program;</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CHANNEL_PRESSURE:</div><div class='add'>+		midi1-&gt;caf.data = downscale_32_to_7bit(midi2-&gt;caf.data);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PITCH_BEND:</div><div class='add'>+		v = downscale_32_to_14bit(midi2-&gt;pb.data);</div><div class='add'>+		midi1-&gt;pb.data_msb = v &gt;&gt; 7;</div><div class='add'>+		midi1-&gt;pb.data_lsb = v &amp; 0x7f;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+					      (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+					      atomic, hop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert UMP to a legacy ALSA seq event and deliver it */</div><div class='add'>+static int cvt_ump_to_any(struct snd_seq_client *dest,</div><div class='add'>+			  struct snd_seq_client_port *dest_port,</div><div class='add'>+			  struct snd_seq_event *event,</div><div class='add'>+			  unsigned char type,</div><div class='add'>+			  int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_event ev_cvt[2]; /* up to two events */</div><div class='add'>+	struct snd_seq_ump_event *ump_ev = (struct snd_seq_ump_event *)event;</div><div class='add'>+	/* use the second event as a temp buffer for saving stack usage */</div><div class='add'>+	unsigned char *sysex_buf = (unsigned char *)(ev_cvt + 1);</div><div class='add'>+	unsigned char flags = event-&gt;flags &amp; ~SNDRV_SEQ_EVENT_UMP;</div><div class='add'>+	int i, len, err;</div><div class='add'>+</div><div class='add'>+	ev_cvt[0] = ev_cvt[1] = *event;</div><div class='add'>+	ev_cvt[0].flags = flags;</div><div class='add'>+	ev_cvt[1].flags = flags;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case UMP_MSG_TYPE_SYSTEM:</div><div class='add'>+		len = cvt_ump_system_to_event((union snd_ump_midi1_msg *)ump_ev-&gt;ump,</div><div class='add'>+					      ev_cvt);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE:</div><div class='add'>+		len = cvt_ump_midi1_to_event((union snd_ump_midi1_msg *)ump_ev-&gt;ump,</div><div class='add'>+					     ev_cvt);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE:</div><div class='add'>+		len = cvt_ump_midi2_to_event((union snd_ump_midi2_msg *)ump_ev-&gt;ump,</div><div class='add'>+					     ev_cvt);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_TYPE_DATA:</div><div class='add'>+		len = cvt_ump_sysex7_to_event(ump_ev-&gt;ump, sysex_buf, ev_cvt);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						     &amp;ev_cvt[i], atomic, hop);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Replace UMP group field with the destination and deliver */</div><div class='add'>+static int deliver_with_group_convert(struct snd_seq_client *dest,</div><div class='add'>+				      struct snd_seq_client_port *dest_port,</div><div class='add'>+				      struct snd_seq_ump_event *ump_ev,</div><div class='add'>+				      int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_ump_event ev = *ump_ev;</div><div class='add'>+</div><div class='add'>+	/* rewrite the group to the destination port */</div><div class='add'>+	ev.ump[0] &amp;= ~(0xfU &lt;&lt; 24);</div><div class='add'>+	/* fill with the new group; the dest_port-&gt;ump_group field is 1-based */</div><div class='add'>+	ev.ump[0] |= ((dest_port-&gt;ump_group - 1) &lt;&lt; 24);</div><div class='add'>+</div><div class='add'>+	return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+					      (struct snd_seq_event *)&amp;ev,</div><div class='add'>+					      atomic, hop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* apply the UMP event filter; return true to skip the event */</div><div class='add'>+static bool ump_event_filtered(struct snd_seq_client *dest,</div><div class='add'>+			       const struct snd_seq_ump_event *ev)</div><div class='add'>+{</div><div class='add'>+	unsigned char group;</div><div class='add'>+</div><div class='add'>+	group = ump_message_group(ev-&gt;ump[0]);</div><div class='add'>+	if (ump_is_groupless_msg(ump_message_type(ev-&gt;ump[0])))</div><div class='add'>+		return dest-&gt;group_filter &amp; (1U &lt;&lt; 0);</div><div class='add'>+	/* check the bitmap for 1-based group number */</div><div class='add'>+	return dest-&gt;group_filter &amp; (1U &lt;&lt; (group + 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert from UMP packet and deliver */</div><div class='add'>+int snd_seq_deliver_from_ump(struct snd_seq_client *source,</div><div class='add'>+			     struct snd_seq_client *dest,</div><div class='add'>+			     struct snd_seq_client_port *dest_port,</div><div class='add'>+			     struct snd_seq_event *event,</div><div class='add'>+			     int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_ump_event *ump_ev = (struct snd_seq_ump_event *)event;</div><div class='add'>+	unsigned char type;</div><div class='add'>+</div><div class='add'>+	if (snd_seq_ev_is_variable(event))</div><div class='add'>+		return 0; // skip, no variable event for UMP, so far</div><div class='add'>+	if (ump_event_filtered(dest, ump_ev))</div><div class='add'>+		return 0; // skip if group filter is set and matching</div><div class='add'>+	type = ump_message_type(ump_ev-&gt;ump[0]);</div><div class='add'>+</div><div class='add'>+	if (snd_seq_client_is_ump(dest)) {</div><div class='add'>+		bool is_midi2 = snd_seq_client_is_midi2(dest) &amp;&amp;</div><div class='add'>+			!dest_port-&gt;is_midi1;</div><div class='add'>+</div><div class='add'>+		if (is_midi2 &amp;&amp; type == UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE)</div><div class='add'>+			return cvt_ump_midi1_to_midi2(dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='add'>+		else if (!is_midi2 &amp;&amp; type == UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE)</div><div class='add'>+			return cvt_ump_midi2_to_midi1(dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='add'>+		/* non-EP port and different group is set? */</div><div class='add'>+		if (dest_port-&gt;ump_group &amp;&amp;</div><div class='add'>+		    !ump_is_groupless_msg(type) &amp;&amp;</div><div class='add'>+		    ump_message_group(*ump_ev-&gt;ump) + 1 != dest_port-&gt;ump_group)</div><div class='add'>+			return deliver_with_group_convert(dest, dest_port,</div><div class='add'>+							  ump_ev, atomic, hop);</div><div class='add'>+		/* copy as-is */</div><div class='add'>+		return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cvt_ump_to_any(dest, dest_port, event, type, atomic, hop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIDI1 sequencer event -&gt; UMP conversion</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Conversion to UMP MIDI 1.0 */</div><div class='add'>+</div><div class='add'>+/* convert note on/off event to MIDI 1.0 UMP */</div><div class='add'>+static int note_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				struct snd_seq_client_port *dest_port,</div><div class='add'>+				union snd_ump_midi1_msg *data,</div><div class='add'>+				unsigned char status)</div><div class='add'>+{</div><div class='add'>+	if (!event-&gt;data.note.velocity)</div><div class='add'>+		status = UMP_MSG_STATUS_NOTE_OFF;</div><div class='add'>+	data-&gt;note.status = status;</div><div class='add'>+	data-&gt;note.channel = event-&gt;data.note.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;note.velocity = event-&gt;data.note.velocity &amp; 0x7f;</div><div class='add'>+	data-&gt;note.note = event-&gt;data.note.note &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert CC event to MIDI 1.0 UMP */</div><div class='add'>+static int cc_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+			      struct snd_seq_client_port *dest_port,</div><div class='add'>+			      union snd_ump_midi1_msg *data,</div><div class='add'>+			      unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;cc.status = status;</div><div class='add'>+	data-&gt;cc.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;cc.index = event-&gt;data.control.param;</div><div class='add'>+	data-&gt;cc.data = event-&gt;data.control.value;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert one-parameter control event to MIDI 1.0 UMP */</div><div class='add'>+static int ctrl_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				struct snd_seq_client_port *dest_port,</div><div class='add'>+				union snd_ump_midi1_msg *data,</div><div class='add'>+				unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;caf.status = status;</div><div class='add'>+	data-&gt;caf.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;caf.data = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert pitchbend event to MIDI 1.0 UMP */</div><div class='add'>+static int pitchbend_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi1_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	int val = event-&gt;data.control.value + 8192;</div><div class='add'>+</div><div class='add'>+	val = clamp(val, 0, 0x3fff);</div><div class='add'>+	data-&gt;pb.status = status;</div><div class='add'>+	data-&gt;pb.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;pb.data_msb = (val &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	data-&gt;pb.data_lsb = val &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert 14bit control event to MIDI 1.0 UMP; split to two events */</div><div class='add'>+static int ctrl14_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  union snd_ump_midi1_msg *data,</div><div class='add'>+				  unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;cc.status = UMP_MSG_STATUS_CC;</div><div class='add'>+	data-&gt;cc.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;cc.index = event-&gt;data.control.param &amp; 0x7f;</div><div class='add'>+	if (event-&gt;data.control.param &lt; 0x20) {</div><div class='add'>+		data-&gt;cc.data = (event-&gt;data.control.value &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+		data[1] = data[0];</div><div class='add'>+		data[1].cc.index = event-&gt;data.control.param | 0x20;</div><div class='add'>+		data[1].cc.data = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+		return 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;cc.data = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert RPN/NRPN event to MIDI 1.0 UMP; split to four events */</div><div class='add'>+static int rpn_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+			       struct snd_seq_client_port *dest_port,</div><div class='add'>+			       union snd_ump_midi1_msg *data,</div><div class='add'>+			       unsigned char status)</div><div class='add'>+{</div><div class='add'>+	bool is_rpn = (status == UMP_MSG_STATUS_RPN);</div><div class='add'>+</div><div class='add'>+	data-&gt;cc.status = UMP_MSG_STATUS_CC;</div><div class='add'>+	data-&gt;cc.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data[1] = data[2] = data[3] = data[0];</div><div class='add'>+</div><div class='add'>+	data[0].cc.index = is_rpn ? UMP_CC_RPN_MSB : UMP_CC_NRPN_MSB;</div><div class='add'>+	data[0].cc.data = (event-&gt;data.control.param &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	data[1].cc.index = is_rpn ? UMP_CC_RPN_LSB : UMP_CC_NRPN_LSB;</div><div class='add'>+	data[1].cc.data = event-&gt;data.control.param &amp; 0x7f;</div><div class='add'>+	data[2].cc.index = UMP_CC_DATA;</div><div class='add'>+	data[2].cc.data = (event-&gt;data.control.value &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	data[3].cc.index = UMP_CC_DATA_LSB;</div><div class='add'>+	data[3].cc.data = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message to UMP */</div><div class='add'>+static int system_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  union snd_ump_midi1_msg *data,</div><div class='add'>+				  unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;system.type = UMP_MSG_TYPE_SYSTEM; // override</div><div class='add'>+	data-&gt;system.status = status;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message with 1 parameter to UMP */</div><div class='add'>+static int system_1p_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi1_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;system.type = UMP_MSG_TYPE_SYSTEM; // override</div><div class='add'>+	data-&gt;system.status = status;</div><div class='add'>+	data-&gt;system.parm1 = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message with two parameters to UMP */</div><div class='add'>+static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi1_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;system.type = UMP_MSG_TYPE_SYSTEM; // override</div><div class='add'>+	data-&gt;system.status = status;</div><div class='add'>+	data-&gt;system.parm1 = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	data-&gt;system.parm2 = (event-&gt;data.control.value &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Conversion to UMP MIDI 2.0 */</div><div class='add'>+</div><div class='add'>+/* convert note on/off event to MIDI 2.0 UMP */</div><div class='add'>+static int note_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				struct snd_seq_client_port *dest_port,</div><div class='add'>+				union snd_ump_midi2_msg *data,</div><div class='add'>+				unsigned char status)</div><div class='add'>+{</div><div class='add'>+	if (!event-&gt;data.note.velocity)</div><div class='add'>+		status = UMP_MSG_STATUS_NOTE_OFF;</div><div class='add'>+	data-&gt;note.status = status;</div><div class='add'>+	data-&gt;note.channel = event-&gt;data.note.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;note.note = event-&gt;data.note.note &amp; 0x7f;</div><div class='add'>+	data-&gt;note.velocity = upscale_7_to_16bit(event-&gt;data.note.velocity &amp; 0x7f);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert PAF event to MIDI 2.0 UMP */</div><div class='add'>+static int paf_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+			       struct snd_seq_client_port *dest_port,</div><div class='add'>+			       union snd_ump_midi2_msg *data,</div><div class='add'>+			       unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;paf.status = status;</div><div class='add'>+	data-&gt;paf.channel = event-&gt;data.note.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;paf.note = event-&gt;data.note.note &amp; 0x7f;</div><div class='add'>+	data-&gt;paf.data = upscale_7_to_32bit(event-&gt;data.note.velocity &amp; 0x7f);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_rpn(struct ump_cvt_to_ump_bank *cc)</div><div class='add'>+{</div><div class='add'>+	cc-&gt;rpn_set = 0;</div><div class='add'>+	cc-&gt;nrpn_set = 0;</div><div class='add'>+	cc-&gt;cc_rpn_msb = cc-&gt;cc_rpn_lsb = 0;</div><div class='add'>+	cc-&gt;cc_data_msb = cc-&gt;cc_data_lsb = 0;</div><div class='add'>+	cc-&gt;cc_data_msb_set = cc-&gt;cc_data_lsb_set = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up the MIDI2 RPN/NRPN packet data from the parsed info */</div><div class='add'>+static int fill_rpn(struct ump_cvt_to_ump_bank *cc,</div><div class='add'>+		    union snd_ump_midi2_msg *data,</div><div class='add'>+		    unsigned char channel,</div><div class='add'>+		    bool flush)</div><div class='add'>+{</div><div class='add'>+	if (!(cc-&gt;cc_data_lsb_set || cc-&gt;cc_data_msb_set))</div><div class='add'>+		return 0; // skip</div><div class='add'>+	/* when not flushing, wait for complete data set */</div><div class='add'>+	if (!flush &amp;&amp; (!cc-&gt;cc_data_lsb_set || !cc-&gt;cc_data_msb_set))</div><div class='add'>+		return 0; // skip</div><div class='add'>+</div><div class='add'>+	if (cc-&gt;rpn_set) {</div><div class='add'>+		data-&gt;rpn.status = UMP_MSG_STATUS_RPN;</div><div class='add'>+		data-&gt;rpn.bank = cc-&gt;cc_rpn_msb;</div><div class='add'>+		data-&gt;rpn.index = cc-&gt;cc_rpn_lsb;</div><div class='add'>+	} else if (cc-&gt;nrpn_set) {</div><div class='add'>+		data-&gt;rpn.status = UMP_MSG_STATUS_NRPN;</div><div class='add'>+		data-&gt;rpn.bank = cc-&gt;cc_nrpn_msb;</div><div class='add'>+		data-&gt;rpn.index = cc-&gt;cc_nrpn_lsb;</div><div class='add'>+	} else {</div><div class='add'>+		return 0; // skip</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;rpn.data = upscale_14_to_32bit((cc-&gt;cc_data_msb &lt;&lt; 7) |</div><div class='add'>+					     cc-&gt;cc_data_lsb);</div><div class='add'>+	data-&gt;rpn.channel = channel;</div><div class='add'>+</div><div class='add'>+	reset_rpn(cc);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert CC event to MIDI 2.0 UMP */</div><div class='add'>+static int cc_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+			      struct snd_seq_client_port *dest_port,</div><div class='add'>+			      union snd_ump_midi2_msg *data,</div><div class='add'>+			      unsigned char status)</div><div class='add'>+{</div><div class='add'>+	unsigned char channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	unsigned char index = event-&gt;data.control.param &amp; 0x7f;</div><div class='add'>+	unsigned char val = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	struct ump_cvt_to_ump_bank *cc = &amp;dest_port-&gt;midi2_bank[channel];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* process special CC's (bank/rpn/nrpn) */</div><div class='add'>+	switch (index) {</div><div class='add'>+	case UMP_CC_RPN_MSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;rpn_set = 1;</div><div class='add'>+		cc-&gt;cc_rpn_msb = val;</div><div class='add'>+		if (cc-&gt;cc_rpn_msb == 0x7f &amp;&amp; cc-&gt;cc_rpn_lsb == 0x7f)</div><div class='add'>+			reset_rpn(cc);</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_RPN_LSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;rpn_set = 1;</div><div class='add'>+		cc-&gt;cc_rpn_lsb = val;</div><div class='add'>+		if (cc-&gt;cc_rpn_msb == 0x7f &amp;&amp; cc-&gt;cc_rpn_lsb == 0x7f)</div><div class='add'>+			reset_rpn(cc);</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_NRPN_MSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;nrpn_set = 1;</div><div class='add'>+		cc-&gt;cc_nrpn_msb = val;</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_NRPN_LSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;nrpn_set = 1;</div><div class='add'>+		cc-&gt;cc_nrpn_lsb = val;</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_DATA:</div><div class='add'>+		cc-&gt;cc_data_msb_set = 1;</div><div class='add'>+		cc-&gt;cc_data_msb = val;</div><div class='add'>+		return fill_rpn(cc, data, channel, false);</div><div class='add'>+	case UMP_CC_BANK_SELECT:</div><div class='add'>+		cc-&gt;bank_set = 1;</div><div class='add'>+		cc-&gt;cc_bank_msb = val;</div><div class='add'>+		return 0; // skip</div><div class='add'>+	case UMP_CC_BANK_SELECT_LSB:</div><div class='add'>+		cc-&gt;bank_set = 1;</div><div class='add'>+		cc-&gt;cc_bank_lsb = val;</div><div class='add'>+		return 0; // skip</div><div class='add'>+	case UMP_CC_DATA_LSB:</div><div class='add'>+		cc-&gt;cc_data_lsb_set = 1;</div><div class='add'>+		cc-&gt;cc_data_lsb = val;</div><div class='add'>+		return fill_rpn(cc, data, channel, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;cc.status = status;</div><div class='add'>+	data-&gt;cc.channel = channel;</div><div class='add'>+	data-&gt;cc.index = index;</div><div class='add'>+	data-&gt;cc.data = upscale_7_to_32bit(event-&gt;data.control.value &amp; 0x7f);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert one-parameter control event to MIDI 2.0 UMP */</div><div class='add'>+static int ctrl_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				struct snd_seq_client_port *dest_port,</div><div class='add'>+				union snd_ump_midi2_msg *data,</div><div class='add'>+				unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;caf.status = status;</div><div class='add'>+	data-&gt;caf.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;caf.data = upscale_7_to_32bit(event-&gt;data.control.value &amp; 0x7f);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert program change event to MIDI 2.0 UMP */</div><div class='add'>+static int pgm_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+			       struct snd_seq_client_port *dest_port,</div><div class='add'>+			       union snd_ump_midi2_msg *data,</div><div class='add'>+			       unsigned char status)</div><div class='add'>+{</div><div class='add'>+	unsigned char channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	struct ump_cvt_to_ump_bank *cc = &amp;dest_port-&gt;midi2_bank[channel];</div><div class='add'>+</div><div class='add'>+	data-&gt;pg.status = status;</div><div class='add'>+	data-&gt;pg.channel = channel;</div><div class='add'>+	data-&gt;pg.program = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	if (cc-&gt;bank_set) {</div><div class='add'>+		data-&gt;pg.bank_valid = 1;</div><div class='add'>+		data-&gt;pg.bank_msb = cc-&gt;cc_bank_msb;</div><div class='add'>+		data-&gt;pg.bank_lsb = cc-&gt;cc_bank_lsb;</div><div class='add'>+		cc-&gt;bank_set = 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert pitchbend event to MIDI 2.0 UMP */</div><div class='add'>+static int pitchbend_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi2_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	int val = event-&gt;data.control.value + 8192;</div><div class='add'>+</div><div class='add'>+	val = clamp(val, 0, 0x3fff);</div><div class='add'>+	data-&gt;pb.status = status;</div><div class='add'>+	data-&gt;pb.channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	data-&gt;pb.data = upscale_14_to_32bit(val);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert 14bit control event to MIDI 2.0 UMP; split to two events */</div><div class='add'>+static int ctrl14_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  union snd_ump_midi2_msg *data,</div><div class='add'>+				  unsigned char status)</div><div class='add'>+{</div><div class='add'>+	unsigned char channel = event-&gt;data.control.channel &amp; 0x0f;</div><div class='add'>+	unsigned char index = event-&gt;data.control.param &amp; 0x7f;</div><div class='add'>+	struct ump_cvt_to_ump_bank *cc = &amp;dest_port-&gt;midi2_bank[channel];</div><div class='add'>+	unsigned char msb, lsb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	msb = (event-&gt;data.control.value &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	lsb = event-&gt;data.control.value &amp; 0x7f;</div><div class='add'>+	/* process special CC's (bank/rpn/nrpn) */</div><div class='add'>+	switch (index) {</div><div class='add'>+	case UMP_CC_BANK_SELECT:</div><div class='add'>+		cc-&gt;cc_bank_msb = msb;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case UMP_CC_BANK_SELECT_LSB:</div><div class='add'>+		cc-&gt;bank_set = 1;</div><div class='add'>+		cc-&gt;cc_bank_lsb = lsb;</div><div class='add'>+		return 0; // skip</div><div class='add'>+	case UMP_CC_RPN_MSB:</div><div class='add'>+	case UMP_CC_RPN_LSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;cc_rpn_msb = msb;</div><div class='add'>+		cc-&gt;cc_rpn_lsb = lsb;</div><div class='add'>+		cc-&gt;rpn_set = 1;</div><div class='add'>+		if (cc-&gt;cc_rpn_msb == 0x7f &amp;&amp; cc-&gt;cc_rpn_lsb == 0x7f)</div><div class='add'>+			reset_rpn(cc);</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_NRPN_MSB:</div><div class='add'>+	case UMP_CC_NRPN_LSB:</div><div class='add'>+		ret = fill_rpn(cc, data, channel, true);</div><div class='add'>+		cc-&gt;cc_nrpn_msb = msb;</div><div class='add'>+		cc-&gt;nrpn_set = 1;</div><div class='add'>+		cc-&gt;cc_nrpn_lsb = lsb;</div><div class='add'>+		return ret;</div><div class='add'>+	case UMP_CC_DATA:</div><div class='add'>+	case UMP_CC_DATA_LSB:</div><div class='add'>+		cc-&gt;cc_data_msb_set = cc-&gt;cc_data_lsb_set = 1;</div><div class='add'>+		cc-&gt;cc_data_msb = msb;</div><div class='add'>+		cc-&gt;cc_data_lsb = lsb;</div><div class='add'>+		return fill_rpn(cc, data, channel, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;cc.status = UMP_MSG_STATUS_CC;</div><div class='add'>+	data-&gt;cc.channel = channel;</div><div class='add'>+	data-&gt;cc.index = index;</div><div class='add'>+	if (event-&gt;data.control.param &lt; 0x20) {</div><div class='add'>+		data-&gt;cc.data = upscale_7_to_32bit(msb);</div><div class='add'>+		data[1] = data[0];</div><div class='add'>+		data[1].cc.index = event-&gt;data.control.param | 0x20;</div><div class='add'>+		data[1].cc.data = upscale_7_to_32bit(lsb);</div><div class='add'>+		return 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data-&gt;cc.data = upscale_7_to_32bit(lsb);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert RPN/NRPN event to MIDI 2.0 UMP */</div><div class='add'>+static int rpn_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+			       struct snd_seq_client_port *dest_port,</div><div class='add'>+			       union snd_ump_midi2_msg *data,</div><div class='add'>+			       unsigned char status)</div><div class='add'>+{</div><div class='add'>+	data-&gt;rpn.status = status;</div><div class='add'>+	data-&gt;rpn.channel = event-&gt;data.control.channel;</div><div class='add'>+	data-&gt;rpn.bank = (event-&gt;data.control.param &gt;&gt; 7) &amp; 0x7f;</div><div class='add'>+	data-&gt;rpn.index = event-&gt;data.control.param &amp; 0x7f;</div><div class='add'>+	data-&gt;rpn.data = upscale_14_to_32bit(event-&gt;data.control.value &amp; 0x3fff);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message to UMP */</div><div class='add'>+static int system_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				  struct snd_seq_client_port *dest_port,</div><div class='add'>+				  union snd_ump_midi2_msg *data,</div><div class='add'>+				  unsigned char status)</div><div class='add'>+{</div><div class='add'>+	return system_ev_to_ump_midi1(event, dest_port,</div><div class='add'>+				      (union snd_ump_midi1_msg *)data,</div><div class='add'>+				      status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message with 1 parameter to UMP */</div><div class='add'>+static int system_1p_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi2_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	return system_1p_ev_to_ump_midi1(event, dest_port,</div><div class='add'>+					 (union snd_ump_midi1_msg *)data,</div><div class='add'>+					 status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert system / RT message with two parameters to UMP */</div><div class='add'>+static int system_2p_ev_to_ump_midi2(const struct snd_seq_event *event,</div><div class='add'>+				     struct snd_seq_client_port *dest_port,</div><div class='add'>+				     union snd_ump_midi2_msg *data,</div><div class='add'>+				     unsigned char status)</div><div class='add'>+{</div><div class='add'>+	return system_2p_ev_to_ump_midi1(event, dest_port,</div><div class='add'>+					 (union snd_ump_midi1_msg *)data,</div><div class='add'>+					 status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct seq_ev_to_ump {</div><div class='add'>+	int seq_type;</div><div class='add'>+	unsigned char status;</div><div class='add'>+	int (*midi1_encode)(const struct snd_seq_event *event,</div><div class='add'>+			    struct snd_seq_client_port *dest_port,</div><div class='add'>+			    union snd_ump_midi1_msg *data,</div><div class='add'>+			    unsigned char status);</div><div class='add'>+	int (*midi2_encode)(const struct snd_seq_event *event,</div><div class='add'>+			    struct snd_seq_client_port *dest_port,</div><div class='add'>+			    union snd_ump_midi2_msg *data,</div><div class='add'>+			    unsigned char status);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct seq_ev_to_ump seq_ev_ump_encoders[] = {</div><div class='add'>+	{ SNDRV_SEQ_EVENT_NOTEON, UMP_MSG_STATUS_NOTE_ON,</div><div class='add'>+	  note_ev_to_ump_midi1, note_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_NOTEOFF, UMP_MSG_STATUS_NOTE_OFF,</div><div class='add'>+	  note_ev_to_ump_midi1, note_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_KEYPRESS, UMP_MSG_STATUS_POLY_PRESSURE,</div><div class='add'>+	  note_ev_to_ump_midi1, paf_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_CONTROLLER, UMP_MSG_STATUS_CC,</div><div class='add'>+	  cc_ev_to_ump_midi1, cc_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_PGMCHANGE, UMP_MSG_STATUS_PROGRAM,</div><div class='add'>+	  ctrl_ev_to_ump_midi1, pgm_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_CHANPRESS, UMP_MSG_STATUS_CHANNEL_PRESSURE,</div><div class='add'>+	  ctrl_ev_to_ump_midi1, ctrl_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_PITCHBEND, UMP_MSG_STATUS_PITCH_BEND,</div><div class='add'>+	  pitchbend_ev_to_ump_midi1, pitchbend_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_CONTROL14, 0,</div><div class='add'>+	  ctrl14_ev_to_ump_midi1, ctrl14_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_NONREGPARAM, UMP_MSG_STATUS_NRPN,</div><div class='add'>+	  rpn_ev_to_ump_midi1, rpn_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_REGPARAM, UMP_MSG_STATUS_RPN,</div><div class='add'>+	  rpn_ev_to_ump_midi1, rpn_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_QFRAME, UMP_SYSTEM_STATUS_MIDI_TIME_CODE,</div><div class='add'>+	  system_1p_ev_to_ump_midi1, system_1p_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_SONGPOS, UMP_SYSTEM_STATUS_SONG_POSITION,</div><div class='add'>+	  system_2p_ev_to_ump_midi1, system_2p_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_SONGSEL, UMP_SYSTEM_STATUS_SONG_SELECT,</div><div class='add'>+	  system_1p_ev_to_ump_midi1, system_1p_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_TUNE_REQUEST, UMP_SYSTEM_STATUS_TUNE_REQUEST,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_CLOCK, UMP_SYSTEM_STATUS_TIMING_CLOCK,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_START, UMP_SYSTEM_STATUS_START,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_CONTINUE, UMP_SYSTEM_STATUS_CONTINUE,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_STOP, UMP_SYSTEM_STATUS_STOP,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_SENSING, UMP_SYSTEM_STATUS_ACTIVE_SENSING,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+	{ SNDRV_SEQ_EVENT_RESET, UMP_SYSTEM_STATUS_RESET,</div><div class='add'>+	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct seq_ev_to_ump *find_ump_encoder(int type)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(seq_ev_ump_encoders); i++)</div><div class='add'>+		if (seq_ev_ump_encoders[i].seq_type == type)</div><div class='add'>+			return &amp;seq_ev_ump_encoders[i];</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void setup_ump_event(struct snd_seq_ump_event *dest,</div><div class='add'>+			    const struct snd_seq_event *src)</div><div class='add'>+{</div><div class='add'>+	memcpy(dest, src, sizeof(*src));</div><div class='add'>+	dest-&gt;type = 0;</div><div class='add'>+	dest-&gt;flags |= SNDRV_SEQ_EVENT_UMP;</div><div class='add'>+	dest-&gt;flags &amp;= ~SNDRV_SEQ_EVENT_LENGTH_MASK;</div><div class='add'>+	memset(dest-&gt;ump, 0, sizeof(dest-&gt;ump));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert ALSA seq event to UMP MIDI 1.0 and deliver it */</div><div class='add'>+static int cvt_to_ump_midi1(struct snd_seq_client *dest,</div><div class='add'>+			    struct snd_seq_client_port *dest_port,</div><div class='add'>+			    struct snd_seq_event *event,</div><div class='add'>+			    int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	const struct seq_ev_to_ump *encoder;</div><div class='add'>+	struct snd_seq_ump_event ev_cvt;</div><div class='add'>+	union snd_ump_midi1_msg data[4];</div><div class='add'>+	int i, n, err;</div><div class='add'>+</div><div class='add'>+	encoder = find_ump_encoder(event-&gt;type);</div><div class='add'>+	if (!encoder)</div><div class='add'>+		return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='add'>+</div><div class='add'>+	data-&gt;raw = make_raw_ump(dest_port, UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE);</div><div class='add'>+	n = encoder-&gt;midi1_encode(event, dest_port, data, encoder-&gt;status);</div><div class='add'>+	if (!n)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	setup_ump_event(&amp;ev_cvt, event);</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		ev_cvt.ump[0] = data[i].raw;</div><div class='add'>+		err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						     (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+						     atomic, hop);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert ALSA seq event to UMP MIDI 2.0 and deliver it */</div><div class='add'>+static int cvt_to_ump_midi2(struct snd_seq_client *dest,</div><div class='add'>+			    struct snd_seq_client_port *dest_port,</div><div class='add'>+			    struct snd_seq_event *event,</div><div class='add'>+			    int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	const struct seq_ev_to_ump *encoder;</div><div class='add'>+	struct snd_seq_ump_event ev_cvt;</div><div class='add'>+	union snd_ump_midi2_msg data[2];</div><div class='add'>+	int i, n, err;</div><div class='add'>+</div><div class='add'>+	encoder = find_ump_encoder(event-&gt;type);</div><div class='add'>+	if (!encoder)</div><div class='add'>+		return __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						      event, atomic, hop);</div><div class='add'>+</div><div class='add'>+	data-&gt;raw[0] = make_raw_ump(dest_port, UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE);</div><div class='add'>+	data-&gt;raw[1] = 0;</div><div class='add'>+	n = encoder-&gt;midi2_encode(event, dest_port, data, encoder-&gt;status);</div><div class='add'>+	if (!n)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	setup_ump_event(&amp;ev_cvt, event);</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		memcpy(ev_cvt.ump, &amp;data[i], sizeof(data[i]));</div><div class='add'>+		err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						     (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+						     atomic, hop);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill up a sysex7 UMP from the byte stream */</div><div class='add'>+static void fill_sysex7_ump(struct snd_seq_client_port *dest_port,</div><div class='add'>+			    u32 *val, u8 status, u8 *buf, int len)</div><div class='add'>+{</div><div class='add'>+	memset(val, 0, 8);</div><div class='add'>+	memcpy((u8 *)val + 2, buf, len);</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	swab32_array(val, 2);</div><div class='add'>+#endif</div><div class='add'>+	val[0] |= ump_compose(UMP_MSG_TYPE_DATA, get_ump_group(dest_port),</div><div class='add'>+			      status, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert sysex var event to UMP sysex7 packets and deliver them */</div><div class='add'>+static int cvt_sysex_to_ump(struct snd_seq_client *dest,</div><div class='add'>+			    struct snd_seq_client_port *dest_port,</div><div class='add'>+			    struct snd_seq_event *event,</div><div class='add'>+			    int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_ump_event ev_cvt;</div><div class='add'>+	unsigned char status;</div><div class='add'>+	u8 buf[8], *xbuf;</div><div class='add'>+	int offset = 0;</div><div class='add'>+	int len, err;</div><div class='add'>+	bool finished = false;</div><div class='add'>+</div><div class='add'>+	if (!snd_seq_ev_is_variable(event))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	setup_ump_event(&amp;ev_cvt, event);</div><div class='add'>+	while (!finished) {</div><div class='add'>+		len = snd_seq_expand_var_event_at(event, sizeof(buf), buf, offset);</div><div class='add'>+		if (len &lt;= 0)</div><div class='add'>+			break;</div><div class='add'>+		if (WARN_ON(len &gt; sizeof(buf)))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		xbuf = buf;</div><div class='add'>+		status = UMP_SYSEX_STATUS_CONTINUE;</div><div class='add'>+		/* truncate the sysex start-marker */</div><div class='add'>+		if (*xbuf == UMP_MIDI1_MSG_SYSEX_START) {</div><div class='add'>+			status = UMP_SYSEX_STATUS_START;</div><div class='add'>+			len--;</div><div class='add'>+			offset++;</div><div class='add'>+			xbuf++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if the last of this packet or the 1st byte of the next packet</div><div class='add'>+		 * is the end-marker, finish the transfer with this packet</div><div class='add'>+		 */</div><div class='add'>+		if (len &gt; 0 &amp;&amp; len &lt; 8 &amp;&amp;</div><div class='add'>+		    xbuf[len - 1] == UMP_MIDI1_MSG_SYSEX_END) {</div><div class='add'>+			if (status == UMP_SYSEX_STATUS_START)</div><div class='add'>+				status = UMP_SYSEX_STATUS_SINGLE;</div><div class='add'>+			else</div><div class='add'>+				status = UMP_SYSEX_STATUS_END;</div><div class='add'>+			len--;</div><div class='add'>+			finished = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = min(len, 6);</div><div class='add'>+		fill_sysex7_ump(dest_port, ev_cvt.ump, status, xbuf, len);</div><div class='add'>+		err = __snd_seq_deliver_single_event(dest, dest_port,</div><div class='add'>+						     (struct snd_seq_event *)&amp;ev_cvt,</div><div class='add'>+						     atomic, hop);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		offset += len;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert to UMP packet and deliver */</div><div class='add'>+int snd_seq_deliver_to_ump(struct snd_seq_client *source,</div><div class='add'>+			   struct snd_seq_client *dest,</div><div class='add'>+			   struct snd_seq_client_port *dest_port,</div><div class='add'>+			   struct snd_seq_event *event,</div><div class='add'>+			   int atomic, int hop)</div><div class='add'>+{</div><div class='add'>+	if (dest-&gt;group_filter &amp; (1U &lt;&lt; dest_port-&gt;ump_group))</div><div class='add'>+		return 0; /* group filtered - skip the event */</div><div class='add'>+	if (event-&gt;type == SNDRV_SEQ_EVENT_SYSEX)</div><div class='add'>+		return cvt_sysex_to_ump(dest, dest_port, event, atomic, hop);</div><div class='add'>+	else if (snd_seq_client_is_midi2(dest) &amp;&amp; !dest_port-&gt;is_midi1)</div><div class='add'>+		return cvt_to_ump_midi2(dest, dest_port, event, atomic, hop);</div><div class='add'>+	else</div><div class='add'>+		return cvt_to_ump_midi1(dest, dest_port, event, atomic, hop);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return the UMP group-port number of the event;</div><div class='add'>+ * return -1 if groupless or non-UMP event</div><div class='add'>+ */</div><div class='add'>+int snd_seq_ump_group_port(const struct snd_seq_event *event)</div><div class='add'>+{</div><div class='add'>+	const struct snd_seq_ump_event *ump_ev =</div><div class='add'>+		(const struct snd_seq_ump_event *)event;</div><div class='add'>+	unsigned char type;</div><div class='add'>+</div><div class='add'>+	if (!snd_seq_ev_is_ump(event))</div><div class='add'>+		return -1;</div><div class='add'>+	type = ump_message_type(ump_ev-&gt;ump[0]);</div><div class='add'>+	if (ump_is_groupless_msg(type))</div><div class='add'>+		return -1;</div><div class='add'>+	/* group-port number starts from 1 */</div><div class='add'>+	return ump_message_group(ump_ev-&gt;ump[0]) + 1;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/core/seq/seq_ump_convert.h b/sound/core/seq/seq_ump_convert.h<br/>new file mode 100644<br/>index 000000000000..4abf0a7637d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_ump_convert.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_ump_convert.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * ALSA sequencer event conversion between UMP and legacy clients</div><div class='add'>+ */</div><div class='add'>+#ifndef __SEQ_UMP_CONVERT_H</div><div class='add'>+#define __SEQ_UMP_CONVERT_H</div><div class='add'>+</div><div class='add'>+#include "seq_clientmgr.h"</div><div class='add'>+#include "seq_ports.h"</div><div class='add'>+</div><div class='add'>+int snd_seq_deliver_from_ump(struct snd_seq_client *source,</div><div class='add'>+			     struct snd_seq_client *dest,</div><div class='add'>+			     struct snd_seq_client_port *dest_port,</div><div class='add'>+			     struct snd_seq_event *event,</div><div class='add'>+			     int atomic, int hop);</div><div class='add'>+int snd_seq_deliver_to_ump(struct snd_seq_client *source,</div><div class='add'>+			   struct snd_seq_client *dest,</div><div class='add'>+			   struct snd_seq_client_port *dest_port,</div><div class='add'>+			   struct snd_seq_event *event,</div><div class='add'>+			   int atomic, int hop);</div><div class='add'>+int snd_seq_ump_group_port(const struct snd_seq_event *event);</div><div class='add'>+</div><div class='add'>+#endif /* __SEQ_UMP_CONVERT_H */</div><div class='head'>diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c<br/>index 86e7739269ca..9e7fd4993a10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_virmidi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/seq/seq_virmidi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq/seq_virmidi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq/seq_virmidi.c</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Virtual Raw MIDI client on Sequencer</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2000 by Takashi Iwai &lt;tiwai@suse.de&gt;,</div><div class='ctx'>  *                        Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -37,6 +23,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='hunk'>@@ -75,50 +62,48 @@ static void snd_virmidi_init_event(struct snd_virmidi *vmidi,</div><div class='ctx'> /*</div><div class='ctx'>  * decode input event and put to read buffer of each opened file</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+/* callback for snd_seq_dump_var_event(), bridging to snd_rawmidi_receive() */</div><div class='add'>+static int dump_to_rawmidi(void *ptr, void *buf, int count)</div><div class='add'>+{</div><div class='add'>+	return snd_rawmidi_receive(ptr, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_virmidi_dev_receive_event(struct snd_virmidi_dev *rdev,</div><div class='del'>-					 struct snd_seq_event *ev)</div><div class='add'>+					 struct snd_seq_event *ev,</div><div class='add'>+					 bool atomic)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_virmidi *vmidi;</div><div class='ctx'> 	unsigned char msg[4];</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='del'>-	read_lock(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+	if (atomic)</div><div class='add'>+		read_lock(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+	else</div><div class='add'>+		down_read(&amp;rdev-&gt;filelist_sem);</div><div class='ctx'> 	list_for_each_entry(vmidi, &amp;rdev-&gt;filelist, list) {</div><div class='del'>-		if (!vmidi-&gt;trigger)</div><div class='add'>+		if (!READ_ONCE(vmidi-&gt;trigger))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (ev-&gt;type == SNDRV_SEQ_EVENT_SYSEX) {</div><div class='ctx'> 			if ((ev-&gt;flags &amp; SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE)</div><div class='ctx'> 				continue;</div><div class='del'>-			snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)snd_rawmidi_receive, vmidi-&gt;substream);</div><div class='add'>+			snd_seq_dump_var_event(ev, dump_to_rawmidi, vmidi-&gt;substream);</div><div class='add'>+			snd_midi_event_reset_decode(vmidi-&gt;parser);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			len = snd_midi_event_decode(vmidi-&gt;parser, msg, sizeof(msg), ev);</div><div class='ctx'> 			if (len &gt; 0)</div><div class='ctx'> 				snd_rawmidi_receive(vmidi-&gt;substream, msg, len);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	read_unlock(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+	if (atomic)</div><div class='add'>+		read_unlock(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+	else</div><div class='add'>+		up_read(&amp;rdev-&gt;filelist_sem);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * receive an event from the remote virmidi port</div><div class='del'>- *</div><div class='del'>- * for rawmidi inputs, you can call this function from the event</div><div class='del'>- * handler of a remote port which is attached to the virmidi via</div><div class='del'>- * SNDRV_VIRMIDI_SEQ_ATTACH.</div><div class='del'>- */</div><div class='del'>-#if 0</div><div class='del'>-int snd_virmidi_receive(struct snd_rawmidi *rmidi, struct snd_seq_event *ev)</div><div class='del'>-{</div><div class='del'>-	struct snd_virmidi_dev *rdev;</div><div class='del'>-</div><div class='del'>-	rdev = rmidi-&gt;private_data;</div><div class='del'>-	return snd_virmidi_dev_receive_event(rdev, ev);</div><div class='del'>-}</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * event handler of virmidi port</div><div class='ctx'>  */</div><div class='ctx'> static int snd_virmidi_event_input(struct snd_seq_event *ev, int direct,</div><div class='hunk'>@@ -129,7 +114,7 @@ static int snd_virmidi_event_input(struct snd_seq_event *ev, int direct,</div><div class='ctx'> 	rdev = private_data;</div><div class='ctx'> 	if (!(rdev-&gt;flags &amp; SNDRV_VIRMIDI_USE))</div><div class='ctx'> 		return 0; /* ignored */</div><div class='del'>-	return snd_virmidi_dev_receive_event(rdev, ev);</div><div class='add'>+	return snd_virmidi_dev_receive_event(rdev, ev, atomic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -139,61 +124,61 @@ static void snd_virmidi_input_trigger(struct snd_rawmidi_substream *substream, i</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if (up) {</div><div class='del'>-		vmidi-&gt;trigger = 1;</div><div class='del'>-	} else {</div><div class='del'>-		vmidi-&gt;trigger = 0;</div><div class='del'>-	}</div><div class='add'>+	WRITE_ONCE(vmidi-&gt;trigger, !!up);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * trigger rawmidi stream for output</div><div class='add'>+/* process rawmidi bytes and send events;</div><div class='add'>+ * we need no lock here for vmidi-&gt;event since it's handled only in this work</div><div class='ctx'>  */</div><div class='del'>-static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='add'>+static void snd_vmidi_output_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int count, res;</div><div class='del'>-	unsigned char buf[32], *pbuf;</div><div class='del'>-</div><div class='del'>-	if (up) {</div><div class='del'>-		vmidi-&gt;trigger = 1;</div><div class='del'>-		if (vmidi-&gt;seq_mode == SNDRV_VIRMIDI_SEQ_DISPATCH &amp;&amp;</div><div class='del'>-		    !(vmidi-&gt;rdev-&gt;flags &amp; SNDRV_VIRMIDI_SUBSCRIBE)) {</div><div class='del'>-			snd_rawmidi_transmit_ack(substream, substream-&gt;runtime-&gt;buffer_size - substream-&gt;runtime-&gt;avail);</div><div class='del'>-			return;		/* ignored */</div><div class='del'>-		}</div><div class='add'>+	struct snd_virmidi *vmidi;</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	unsigned char input;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vmidi = container_of(work, struct snd_virmidi, output_work);</div><div class='add'>+	substream = vmidi-&gt;substream;</div><div class='add'>+</div><div class='add'>+	/* discard the outputs in dispatch mode unless subscribed */</div><div class='add'>+	if (vmidi-&gt;seq_mode == SNDRV_VIRMIDI_SEQ_DISPATCH &amp;&amp;</div><div class='add'>+	    !(vmidi-&gt;rdev-&gt;flags &amp; SNDRV_VIRMIDI_SUBSCRIBE)) {</div><div class='add'>+		snd_rawmidi_proceed(substream);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (READ_ONCE(vmidi-&gt;trigger)) {</div><div class='add'>+		if (snd_rawmidi_transmit(substream, &amp;input, 1) != 1)</div><div class='add'>+			break;</div><div class='add'>+		if (!snd_midi_event_encode_byte(vmidi-&gt;parser, input,</div><div class='add'>+						&amp;vmidi-&gt;event))</div><div class='add'>+			continue;</div><div class='ctx'> 		if (vmidi-&gt;event.type != SNDRV_SEQ_EVENT_NONE) {</div><div class='del'>-			if (snd_seq_kernel_client_dispatch(vmidi-&gt;client, &amp;vmidi-&gt;event, in_atomic(), 0) &lt; 0)</div><div class='del'>-				return;</div><div class='add'>+			ret = snd_seq_kernel_client_dispatch(vmidi-&gt;client,</div><div class='add'>+							     &amp;vmidi-&gt;event,</div><div class='add'>+							     false, 0);</div><div class='ctx'> 			vmidi-&gt;event.type = SNDRV_SEQ_EVENT_NONE;</div><div class='del'>-		}</div><div class='del'>-		while (1) {</div><div class='del'>-			count = snd_rawmidi_transmit_peek(substream, buf, sizeof(buf));</div><div class='del'>-			if (count &lt;= 0)</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				break;</div><div class='del'>-			pbuf = buf;</div><div class='del'>-			while (count &gt; 0) {</div><div class='del'>-				res = snd_midi_event_encode(vmidi-&gt;parser, pbuf, count, &amp;vmidi-&gt;event);</div><div class='del'>-				if (res &lt; 0) {</div><div class='del'>-					snd_midi_event_reset_encode(vmidi-&gt;parser);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				snd_rawmidi_transmit_ack(substream, res);</div><div class='del'>-				pbuf += res;</div><div class='del'>-				count -= res;</div><div class='del'>-				if (vmidi-&gt;event.type != SNDRV_SEQ_EVENT_NONE) {</div><div class='del'>-					if (snd_seq_kernel_client_dispatch(vmidi-&gt;client, &amp;vmidi-&gt;event, in_atomic(), 0) &lt; 0)</div><div class='del'>-						return;</div><div class='del'>-					vmidi-&gt;event.type = SNDRV_SEQ_EVENT_NONE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		vmidi-&gt;trigger = 0;</div><div class='add'>+		/* rawmidi input might be huge, allow to have a break */</div><div class='add'>+		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * trigger rawmidi stream for output</div><div class='add'>+ */</div><div class='add'>+static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(vmidi-&gt;trigger, !!up);</div><div class='add'>+	if (up)</div><div class='add'>+		queue_work(system_highpri_wq, &amp;vmidi-&gt;output_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * open rawmidi handle for input</div><div class='ctx'>  */</div><div class='ctx'> static int snd_virmidi_input_open(struct snd_rawmidi_substream *substream)</div><div class='hunk'>@@ -201,7 +186,6 @@ static int snd_virmidi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct snd_virmidi_dev *rdev = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct snd_rawmidi_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_virmidi *vmidi;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	vmidi = kzalloc(sizeof(*vmidi), GFP_KERNEL);</div><div class='ctx'> 	if (vmidi == NULL)</div><div class='hunk'>@@ -215,9 +199,10 @@ static int snd_virmidi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	vmidi-&gt;client = rdev-&gt;client;</div><div class='ctx'> 	vmidi-&gt;port = rdev-&gt;port;	</div><div class='ctx'> 	runtime-&gt;private_data = vmidi;</div><div class='del'>-	write_lock_irqsave(&amp;rdev-&gt;filelist_lock, flags);</div><div class='del'>-	list_add_tail(&amp;vmidi-&gt;list, &amp;rdev-&gt;filelist);</div><div class='del'>-	write_unlock_irqrestore(&amp;rdev-&gt;filelist_lock, flags);</div><div class='add'>+	scoped_guard(rwsem_write, &amp;rdev-&gt;filelist_sem) {</div><div class='add'>+		guard(write_lock_irq)(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+		list_add_tail(&amp;vmidi-&gt;list, &amp;rdev-&gt;filelist);</div><div class='add'>+	}</div><div class='ctx'> 	vmidi-&gt;rdev = rdev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -244,6 +229,7 @@ static int snd_virmidi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	vmidi-&gt;port = rdev-&gt;port;</div><div class='ctx'> 	snd_virmidi_init_event(vmidi, &amp;vmidi-&gt;event);</div><div class='ctx'> 	vmidi-&gt;rdev = rdev;</div><div class='add'>+	INIT_WORK(&amp;vmidi-&gt;output_work, snd_vmidi_output_work);</div><div class='ctx'> 	runtime-&gt;private_data = vmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -253,9 +239,14 @@ static int snd_virmidi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_virmidi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='add'>+	struct snd_virmidi_dev *rdev = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(rwsem_write, &amp;rdev-&gt;filelist_sem) {</div><div class='add'>+		guard(write_lock_irq)(&amp;rdev-&gt;filelist_lock);</div><div class='add'>+		list_del(&amp;vmidi-&gt;list);</div><div class='add'>+	}</div><div class='ctx'> 	snd_midi_event_free(vmidi-&gt;parser);</div><div class='del'>-	list_del(&amp;vmidi-&gt;list);</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = NULL;</div><div class='ctx'> 	kfree(vmidi);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -267,6 +258,9 @@ static int snd_virmidi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> static int snd_virmidi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(vmidi-&gt;trigger, false); /* to be sure */</div><div class='add'>+	cancel_work_sync(&amp;vmidi-&gt;output_work);</div><div class='ctx'> 	snd_midi_event_free(vmidi-&gt;parser);</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = NULL;</div><div class='ctx'> 	kfree(vmidi);</div><div class='hunk'>@@ -274,6 +268,16 @@ static int snd_virmidi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * drain output work queue</div><div class='add'>+ */</div><div class='add'>+static void snd_virmidi_output_drain(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_virmidi *vmidi = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;vmidi-&gt;output_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * subscribe callback - allow output to rawmidi device</div><div class='ctx'>  */</div><div class='ctx'> static int snd_virmidi_subscribe(void *private_data,</div><div class='hunk'>@@ -337,16 +341,17 @@ static int snd_virmidi_unuse(void *private_data,</div><div class='ctx'>  *  Register functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_virmidi_input_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_virmidi_input_ops = {</div><div class='ctx'> 	.open = snd_virmidi_input_open,</div><div class='ctx'> 	.close = snd_virmidi_input_close,</div><div class='ctx'> 	.trigger = snd_virmidi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_virmidi_output_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_virmidi_output_ops = {</div><div class='ctx'> 	.open = snd_virmidi_output_open,</div><div class='ctx'> 	.close = snd_virmidi_output_close,</div><div class='ctx'> 	.trigger = snd_virmidi_output_trigger,</div><div class='add'>+	.drain = snd_virmidi_output_drain,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -356,26 +361,22 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)</div><div class='ctx'> {</div><div class='ctx'> 	int client;</div><div class='ctx'> 	struct snd_seq_port_callback pcallbacks;</div><div class='del'>-	struct snd_seq_port_info *pinfo;</div><div class='add'>+	struct snd_seq_port_info *pinfo __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (rdev-&gt;client &gt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	pinfo = kzalloc(sizeof(*pinfo), GFP_KERNEL);</div><div class='del'>-	if (!pinfo) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __error;</div><div class='del'>-	}</div><div class='add'>+	if (!pinfo)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	client = snd_seq_create_kernel_client(rdev-&gt;card, rdev-&gt;device,</div><div class='ctx'> 					      "%s %d-%d", rdev-&gt;rmidi-&gt;name,</div><div class='ctx'> 					      rdev-&gt;card-&gt;number,</div><div class='ctx'> 					      rdev-&gt;device);</div><div class='del'>-	if (client &lt; 0) {</div><div class='del'>-		err = client;</div><div class='del'>-		goto __error;</div><div class='del'>-	}</div><div class='add'>+	if (client &lt; 0)</div><div class='add'>+		return client;</div><div class='ctx'> 	rdev-&gt;client = client;</div><div class='ctx'> </div><div class='ctx'> 	/* create a port */</div><div class='hunk'>@@ -385,6 +386,7 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)</div><div class='ctx'> 	pinfo-&gt;capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SYNC_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;</div><div class='ctx'> 	pinfo-&gt;capability |= SNDRV_SEQ_PORT_CAP_READ | SNDRV_SEQ_PORT_CAP_SYNC_READ | SNDRV_SEQ_PORT_CAP_SUBS_READ;</div><div class='ctx'> 	pinfo-&gt;capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;</div><div class='add'>+	pinfo-&gt;direction = SNDRV_SEQ_PORT_DIR_BIDIRECTION;</div><div class='ctx'> 	pinfo-&gt;type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC</div><div class='ctx'> 		| SNDRV_SEQ_PORT_TYPE_SOFTWARE</div><div class='ctx'> 		| SNDRV_SEQ_PORT_TYPE_PORT;</div><div class='hunk'>@@ -402,15 +404,11 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev)</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		snd_seq_delete_kernel_client(client);</div><div class='ctx'> 		rdev-&gt;client = -1;</div><div class='del'>-		goto __error;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rdev-&gt;port = pinfo-&gt;addr.port;</div><div class='del'>-	err = 0; /* success */</div><div class='del'>-</div><div class='del'>- __error:</div><div class='del'>-	kfree(pinfo);</div><div class='del'>-	return err;</div><div class='add'>+	return 0; /* success */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -445,7 +443,7 @@ static int snd_virmidi_dev_register(struct snd_rawmidi *rmidi)</div><div class='ctx'> 		/* should check presence of port more strictly.. */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "seq_mode is not set: %d\n", rdev-&gt;seq_mode);</div><div class='add'>+		pr_err("ALSA: seq_virmidi: seq_mode is not set: %d\n", rdev-&gt;seq_mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -467,7 +465,7 @@ static int snd_virmidi_dev_unregister(struct snd_rawmidi *rmidi)</div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static struct snd_rawmidi_global_ops snd_virmidi_global_ops = {</div><div class='add'>+static const struct snd_rawmidi_global_ops snd_virmidi_global_ops = {</div><div class='ctx'> 	.dev_register = snd_virmidi_dev_register,</div><div class='ctx'> 	.dev_unregister = snd_virmidi_dev_unregister,</div><div class='ctx'> };</div><div class='hunk'>@@ -493,12 +491,13 @@ int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmi</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='ctx'> 	*rrmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(card, "VirMidi", device,</div><div class='del'>-				   16,	/* may be configurable */</div><div class='del'>-				   16,	/* may be configurable */</div><div class='del'>-				   &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(card, "VirMidi", device,</div><div class='add'>+			      16,	/* may be configurable */</div><div class='add'>+			      16,	/* may be configurable */</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(rmidi-&gt;name, rmidi-&gt;id);</div><div class='add'>+	strscpy(rmidi-&gt;name, rmidi-&gt;id);</div><div class='ctx'> 	rdev = kzalloc(sizeof(*rdev), GFP_KERNEL);</div><div class='ctx'> 	if (rdev == NULL) {</div><div class='ctx'> 		snd_device_free(card, rmidi);</div><div class='hunk'>@@ -508,6 +507,7 @@ int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmi</div><div class='ctx'> 	rdev-&gt;rmidi = rmidi;</div><div class='ctx'> 	rdev-&gt;device = device;</div><div class='ctx'> 	rdev-&gt;client = -1;</div><div class='add'>+	init_rwsem(&amp;rdev-&gt;filelist_sem);</div><div class='ctx'> 	rwlock_init(&amp;rdev-&gt;filelist_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rdev-&gt;filelist);</div><div class='ctx'> 	rdev-&gt;seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH;</div><div class='hunk'>@@ -522,21 +522,4 @@ int snd_virmidi_new(struct snd_card *card, int device, struct snd_rawmidi **rrmi</div><div class='ctx'> 	*rrmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ENTRY functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_virmidi_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_virmidi_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_virmidi_init)</div><div class='del'>-module_exit(alsa_virmidi_exit)</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_virmidi_new);</div><div class='head'>diff --git a/sound/core/seq_device.c b/sound/core/seq_device.c<br/>new file mode 100644<br/>index 000000000000..bac9f8603734<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/seq_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/seq_device.c</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  ALSA sequencer device management</div><div class='add'>+ *  Copyright (c) 1999 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *----------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * This device handler separates the card driver module from sequencer</div><div class='add'>+ * stuff (sequencer core, synth drivers, etc), so that user can avoid</div><div class='add'>+ * to spend unnecessary resources e.g. if he needs only listening to</div><div class='add'>+ * MP3s.</div><div class='add'>+ *</div><div class='add'>+ * The card (or lowlevel) driver creates a sequencer device entry</div><div class='add'>+ * via snd_seq_device_new().  This is an entry pointer to communicate</div><div class='add'>+ * with the sequencer device "driver", which is involved with the</div><div class='add'>+ * actual part to communicate with the sequencer core.</div><div class='add'>+ * Each sequencer device entry has an id string and the corresponding</div><div class='add'>+ * driver with the same id is loaded when required.  For example,</div><div class='add'>+ * lowlevel codes to access emu8000 chip on sbawe card are included in</div><div class='add'>+ * emu8000-synth module.  To activate this module, the hardware</div><div class='add'>+ * resources like i/o port are passed via snd_seq_device argument.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/seq_device.h&gt;</div><div class='add'>+#include &lt;sound/seq_kernel.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;linux/kmod.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("ALSA sequencer device management");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * bus definition</div><div class='add'>+ */</div><div class='add'>+static int snd_seq_bus_match(struct device *dev, const struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *sdev = to_seq_dev(dev);</div><div class='add'>+	const struct snd_seq_driver *sdrv = to_seq_drv(drv);</div><div class='add'>+</div><div class='add'>+	return strcmp(sdrv-&gt;id, sdev-&gt;id) == 0 &amp;&amp;</div><div class='add'>+		sdrv-&gt;argsize == sdev-&gt;argsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bus_type snd_seq_bus_type = {</div><div class='add'>+	.name = "snd_seq",</div><div class='add'>+	.match = snd_seq_bus_match,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * proc interface -- just for compatibility</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+static struct snd_info_entry *info_entry;</div><div class='add'>+</div><div class='add'>+static int print_dev_info(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *sdev = to_seq_dev(dev);</div><div class='add'>+	struct snd_info_buffer *buffer = data;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "snd-%s,%s,%d\n", sdev-&gt;id,</div><div class='add'>+		    dev-&gt;driver ? "loaded" : "empty",</div><div class='add'>+		    dev-&gt;driver ? 1 : 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_seq_device_info(struct snd_info_entry *entry,</div><div class='add'>+				struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	bus_for_each_dev(&amp;snd_seq_bus_type, NULL, buffer, print_dev_info);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * load all registered drivers (called from seq_clientmgr.c)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+/* flag to block auto-loading */</div><div class='add'>+static atomic_t snd_seq_in_init = ATOMIC_INIT(1); /* blocked as default */</div><div class='add'>+</div><div class='add'>+static int request_seq_drv(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *sdev = to_seq_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;driver)</div><div class='add'>+		request_module("snd-%s", sdev-&gt;id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void autoload_drivers(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	/* avoid reentrance */</div><div class='add'>+	if (atomic_inc_return(&amp;snd_seq_in_init) == 1)</div><div class='add'>+		bus_for_each_dev(&amp;snd_seq_bus_type, NULL, NULL,</div><div class='add'>+				 request_seq_drv);</div><div class='add'>+	atomic_dec(&amp;snd_seq_in_init);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(autoload_work, autoload_drivers);</div><div class='add'>+</div><div class='add'>+static void queue_autoload_drivers(void)</div><div class='add'>+{</div><div class='add'>+	schedule_work(&amp;autoload_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_seq_autoload_init(void)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;snd_seq_in_init);</div><div class='add'>+#ifdef CONFIG_SND_SEQUENCER_MODULE</div><div class='add'>+	/* initial autoload only when snd-seq is a module */</div><div class='add'>+	queue_autoload_drivers();</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_seq_autoload_init);</div><div class='add'>+</div><div class='add'>+void snd_seq_autoload_exit(void)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;snd_seq_in_init);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_seq_autoload_exit);</div><div class='add'>+</div><div class='add'>+void snd_seq_device_load_drivers(void)</div><div class='add'>+{</div><div class='add'>+	queue_autoload_drivers();</div><div class='add'>+	flush_work(&amp;autoload_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_seq_device_load_drivers);</div><div class='add'>+</div><div class='add'>+static inline void cancel_autoload_drivers(void)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;autoload_work);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void queue_autoload_drivers(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cancel_autoload_drivers(void)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * device management</div><div class='add'>+ */</div><div class='add'>+static int snd_seq_device_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	cancel_autoload_drivers();</div><div class='add'>+	if (dev-&gt;private_free)</div><div class='add'>+		dev-&gt;private_free(dev);</div><div class='add'>+	put_device(&amp;dev-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_seq_device_dev_register(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = device_add(&amp;dev-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (!dev-&gt;dev.driver)</div><div class='add'>+		queue_autoload_drivers();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_seq_device_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	device_del(&amp;dev-&gt;dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_seq_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	kfree(to_seq_dev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * register a sequencer device</div><div class='add'>+ * card = card info</div><div class='add'>+ * device = device number (if any)</div><div class='add'>+ * id = id of driver</div><div class='add'>+ * result = return pointer (NULL allowed if unnecessary)</div><div class='add'>+ */</div><div class='add'>+int snd_seq_device_new(struct snd_card *card, int device, const char *id,</div><div class='add'>+		       int argsize, struct snd_seq_device **result)</div><div class='add'>+{</div><div class='add'>+	struct snd_seq_device *dev;</div><div class='add'>+	int err;</div><div class='add'>+	static const struct snd_device_ops dops = {</div><div class='add'>+		.dev_free = snd_seq_device_dev_free,</div><div class='add'>+		.dev_register = snd_seq_device_dev_register,</div><div class='add'>+		.dev_disconnect = snd_seq_device_dev_disconnect,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		*result = NULL;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev) + argsize, GFP_KERNEL);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* set up device info */</div><div class='add'>+	dev-&gt;card = card;</div><div class='add'>+	dev-&gt;device = device;</div><div class='add'>+	dev-&gt;id = id;</div><div class='add'>+	dev-&gt;argsize = argsize;</div><div class='add'>+</div><div class='add'>+	device_initialize(&amp;dev-&gt;dev);</div><div class='add'>+	dev-&gt;dev.parent = &amp;card-&gt;card_dev;</div><div class='add'>+	dev-&gt;dev.bus = &amp;snd_seq_bus_type;</div><div class='add'>+	dev-&gt;dev.release = snd_seq_dev_release;</div><div class='add'>+	dev_set_name(&amp;dev-&gt;dev, "%s-%d-%d", dev-&gt;id, card-&gt;number, device);</div><div class='add'>+</div><div class='add'>+	/* add this device to the list */</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_SEQUENCER, dev, &amp;dops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		put_device(&amp;dev-&gt;dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (result)</div><div class='add'>+		*result = dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_seq_device_new);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver registration</div><div class='add'>+ */</div><div class='add'>+int __snd_seq_driver_register(struct snd_seq_driver *drv, struct module *mod)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(!drv-&gt;driver.name || !drv-&gt;id))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	drv-&gt;driver.bus = &amp;snd_seq_bus_type;</div><div class='add'>+	drv-&gt;driver.owner = mod;</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__snd_seq_driver_register);</div><div class='add'>+</div><div class='add'>+void snd_seq_driver_unregister(struct snd_seq_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_seq_driver_unregister);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * module part</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int __init seq_dev_proc_init(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+	info_entry = snd_info_create_module_entry(THIS_MODULE, "drivers",</div><div class='add'>+						  snd_seq_root);</div><div class='add'>+	if (info_entry == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info_entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='add'>+	info_entry-&gt;c.text.read = snd_seq_device_info;</div><div class='add'>+	if (snd_info_register(info_entry) &lt; 0) {</div><div class='add'>+		snd_info_free_entry(info_entry);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init alsa_seq_device_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bus_register(&amp;snd_seq_bus_type);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = seq_dev_proc_init();</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		bus_unregister(&amp;snd_seq_bus_type);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit alsa_seq_device_exit(void)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_MODULES</div><div class='add'>+	cancel_work_sync(&amp;autoload_work);</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+	snd_info_free_entry(info_entry);</div><div class='add'>+#endif</div><div class='add'>+	bus_unregister(&amp;snd_seq_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(alsa_seq_device_init)</div><div class='add'>+module_exit(alsa_seq_device_exit)</div><div class='head'>diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c<br/>deleted file mode 100644<br/>index 4e7ec2b49873..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/sgbuf.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sgbuf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Scatter-Gather buffer</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;sound/memalloc.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* table entries are align to 32 */</div><div class='del'>-#define SGBUF_TBL_ALIGN		32</div><div class='del'>-#define sgbuf_align_table(tbl)	ALIGN((tbl), SGBUF_TBL_ALIGN)</div><div class='del'>-</div><div class='del'>-int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)</div><div class='del'>-{</div><div class='del'>-	struct snd_sg_buf *sgbuf = dmab-&gt;private_data;</div><div class='del'>-	struct snd_dma_buffer tmpb;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (! sgbuf)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (dmab-&gt;area)</div><div class='del'>-		vunmap(dmab-&gt;area);</div><div class='del'>-	dmab-&gt;area = NULL;</div><div class='del'>-</div><div class='del'>-	tmpb.dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='del'>-	tmpb.dev.dev = sgbuf-&gt;dev;</div><div class='del'>-	for (i = 0; i &lt; sgbuf-&gt;pages; i++) {</div><div class='del'>-		if (!(sgbuf-&gt;table[i].addr &amp; ~PAGE_MASK))</div><div class='del'>-			continue; /* continuous pages */</div><div class='del'>-		tmpb.area = sgbuf-&gt;table[i].buf;</div><div class='del'>-		tmpb.addr = sgbuf-&gt;table[i].addr &amp; PAGE_MASK;</div><div class='del'>-		tmpb.bytes = (sgbuf-&gt;table[i].addr &amp; ~PAGE_MASK) &lt;&lt; PAGE_SHIFT;</div><div class='del'>-		snd_dma_free_pages(&amp;tmpb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(sgbuf-&gt;table);</div><div class='del'>-	kfree(sgbuf-&gt;page_table);</div><div class='del'>-	kfree(sgbuf);</div><div class='del'>-	dmab-&gt;private_data = NULL;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_ALLOC_PAGES		32</div><div class='del'>-</div><div class='del'>-void *snd_malloc_sgbuf_pages(struct device *device,</div><div class='del'>-			     size_t size, struct snd_dma_buffer *dmab,</div><div class='del'>-			     size_t *res_size)</div><div class='del'>-{</div><div class='del'>-	struct snd_sg_buf *sgbuf;</div><div class='del'>-	unsigned int i, pages, chunk, maxpages;</div><div class='del'>-	struct snd_dma_buffer tmpb;</div><div class='del'>-	struct snd_sg_page *table;</div><div class='del'>-	struct page **pgtable;</div><div class='del'>-</div><div class='del'>-	dmab-&gt;area = NULL;</div><div class='del'>-	dmab-&gt;addr = 0;</div><div class='del'>-	dmab-&gt;private_data = sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL);</div><div class='del'>-	if (! sgbuf)</div><div class='del'>-		return NULL;</div><div class='del'>-	sgbuf-&gt;dev = device;</div><div class='del'>-	pages = snd_sgbuf_aligned_pages(size);</div><div class='del'>-	sgbuf-&gt;tblsize = sgbuf_align_table(pages);</div><div class='del'>-	table = kcalloc(sgbuf-&gt;tblsize, sizeof(*table), GFP_KERNEL);</div><div class='del'>-	if (!table)</div><div class='del'>-		goto _failed;</div><div class='del'>-	sgbuf-&gt;table = table;</div><div class='del'>-	pgtable = kcalloc(sgbuf-&gt;tblsize, sizeof(*pgtable), GFP_KERNEL);</div><div class='del'>-	if (!pgtable)</div><div class='del'>-		goto _failed;</div><div class='del'>-	sgbuf-&gt;page_table = pgtable;</div><div class='del'>-</div><div class='del'>-	/* allocate pages */</div><div class='del'>-	maxpages = MAX_ALLOC_PAGES;</div><div class='del'>-	while (pages &gt; 0) {</div><div class='del'>-		chunk = pages;</div><div class='del'>-		/* don't be too eager to take a huge chunk */</div><div class='del'>-		if (chunk &gt; maxpages)</div><div class='del'>-			chunk = maxpages;</div><div class='del'>-		chunk &lt;&lt;= PAGE_SHIFT;</div><div class='del'>-		if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, device,</div><div class='del'>-						 chunk, &amp;tmpb) &lt; 0) {</div><div class='del'>-			if (!sgbuf-&gt;pages)</div><div class='del'>-				return NULL;</div><div class='del'>-			if (!res_size)</div><div class='del'>-				goto _failed;</div><div class='del'>-			size = sgbuf-&gt;pages * PAGE_SIZE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		chunk = tmpb.bytes &gt;&gt; PAGE_SHIFT;</div><div class='del'>-		for (i = 0; i &lt; chunk; i++) {</div><div class='del'>-			table-&gt;buf = tmpb.area;</div><div class='del'>-			table-&gt;addr = tmpb.addr;</div><div class='del'>-			if (!i)</div><div class='del'>-				table-&gt;addr |= chunk; /* mark head */</div><div class='del'>-			table++;</div><div class='del'>-			*pgtable++ = virt_to_page(tmpb.area);</div><div class='del'>-			tmpb.area += PAGE_SIZE;</div><div class='del'>-			tmpb.addr += PAGE_SIZE;</div><div class='del'>-		}</div><div class='del'>-		sgbuf-&gt;pages += chunk;</div><div class='del'>-		pages -= chunk;</div><div class='del'>-		if (chunk &lt; maxpages)</div><div class='del'>-			maxpages = chunk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sgbuf-&gt;size = size;</div><div class='del'>-	dmab-&gt;area = vmap(sgbuf-&gt;page_table, sgbuf-&gt;pages, VM_MAP, PAGE_KERNEL);</div><div class='del'>-	if (! dmab-&gt;area)</div><div class='del'>-		goto _failed;</div><div class='del'>-	if (res_size)</div><div class='del'>-		*res_size = sgbuf-&gt;size;</div><div class='del'>-	return dmab-&gt;area;</div><div class='del'>-</div><div class='del'>- _failed:</div><div class='del'>-	snd_free_sgbuf_pages(dmab); /* free the table */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/core/sound.c b/sound/core/sound.c<br/>index 62a093efb453..6531a67f13b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/sound.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sound.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/sound.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/sound.c</a></div><div class='hunk'>@@ -1,34 +1,18 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Advanced Linux Sound Architecture</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/smp_lock.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/version.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='hunk'>@@ -56,6 +40,11 @@ MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);</div><div class='ctx'> int snd_ecards_limit;</div><div class='ctx'> EXPORT_SYMBOL(snd_ecards_limit);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+struct dentry *sound_debugfs_root;</div><div class='add'>+EXPORT_SYMBOL_GPL(sound_debugfs_root);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct snd_minor *snd_minors[SNDRV_OS_MINORS];</div><div class='ctx'> static DEFINE_MUTEX(sound_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +65,6 @@ void snd_request_card(int card)</div><div class='ctx'> 		return;</div><div class='ctx'> 	request_module("snd-card-%i", card);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_request_card);</div><div class='ctx'> </div><div class='ctx'> static void snd_request_other(int minor)</div><div class='hunk'>@@ -100,6 +88,13 @@ static void snd_request_other(int minor)</div><div class='ctx'>  *</div><div class='ctx'>  * Checks that a minor device with the specified type is registered, and returns</div><div class='ctx'>  * its user data pointer.</div><div class='add'>+ *</div><div class='add'>+ * This function increments the reference counter of the card instance</div><div class='add'>+ * if an associated instance with the given minor number and type is found.</div><div class='add'>+ * The caller must call snd_card_unref() appropriately later.</div><div class='add'>+ *</div><div class='add'>+ * Return: The user data pointer if the specified device is found. %NULL</div><div class='add'>+ * otherwise.</div><div class='ctx'>  */</div><div class='ctx'> void *snd_lookup_minor_data(unsigned int minor, int type)</div><div class='ctx'> {</div><div class='hunk'>@@ -108,16 +103,16 @@ void *snd_lookup_minor_data(unsigned int minor, int type)</div><div class='ctx'> </div><div class='ctx'> 	if (minor &gt;= ARRAY_SIZE(snd_minors))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='add'>+	guard(mutex)(&amp;sound_mutex);</div><div class='ctx'> 	mreg = snd_minors[minor];</div><div class='del'>-	if (mreg &amp;&amp; mreg-&gt;type == type)</div><div class='add'>+	if (mreg &amp;&amp; mreg-&gt;type == type) {</div><div class='ctx'> 		private_data = mreg-&gt;private_data;</div><div class='del'>-	else</div><div class='add'>+		if (private_data &amp;&amp; mreg-&gt;card_ptr)</div><div class='add'>+			get_device(&amp;mreg-&gt;card_ptr-&gt;card_dev);</div><div class='add'>+	} else</div><div class='ctx'> 		private_data = NULL;</div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='ctx'> 	return private_data;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_lookup_minor_data);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='hunk'>@@ -129,13 +124,16 @@ static struct snd_minor *autoload_device(unsigned int minor)</div><div class='ctx'> 	if (dev == SNDRV_MINOR_CONTROL) {</div><div class='ctx'> 		/* /dev/aloadC? */</div><div class='ctx'> 		int card = SNDRV_MINOR_CARD(minor);</div><div class='del'>-		if (snd_cards[card] == NULL)</div><div class='add'>+		struct snd_card *ref = snd_card_ref(card);</div><div class='add'>+		if (!ref)</div><div class='ctx'> 			snd_request_card(card);</div><div class='add'>+		else</div><div class='add'>+			snd_card_unref(ref);</div><div class='ctx'> 	} else if (dev == SNDRV_MINOR_GLOBAL) {</div><div class='ctx'> 		/* /dev/aloadSEQ */</div><div class='ctx'> 		snd_request_other(minor);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_lock(&amp;sound_mutex); /* reacuire lock */</div><div class='add'>+	mutex_lock(&amp;sound_mutex); /* reacquire lock */</div><div class='ctx'> 	return snd_minors[minor];</div><div class='ctx'> }</div><div class='ctx'> #else /* !CONFIG_MODULES */</div><div class='hunk'>@@ -146,38 +144,26 @@ static int snd_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int minor = iminor(inode);</div><div class='ctx'> 	struct snd_minor *mptr = NULL;</div><div class='del'>-	const struct file_operations *old_fops;</div><div class='add'>+	const struct file_operations *new_fops;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (minor &gt;= ARRAY_SIZE(snd_minors))</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='del'>-	mptr = snd_minors[minor];</div><div class='del'>-	if (mptr == NULL) {</div><div class='del'>-		mptr = autoload_device(minor);</div><div class='del'>-		if (!mptr) {</div><div class='del'>-			mutex_unlock(&amp;sound_mutex);</div><div class='del'>-			return -ENODEV;</div><div class='add'>+	scoped_guard(mutex, &amp;sound_mutex) {</div><div class='add'>+		mptr = snd_minors[minor];</div><div class='add'>+		if (mptr == NULL) {</div><div class='add'>+			mptr = autoload_device(minor);</div><div class='add'>+			if (!mptr)</div><div class='add'>+				return -ENODEV;</div><div class='ctx'> 		}</div><div class='add'>+		new_fops = fops_get(mptr-&gt;f_ops);</div><div class='ctx'> 	}</div><div class='del'>-	old_fops = file-&gt;f_op;</div><div class='del'>-	file-&gt;f_op = fops_get(mptr-&gt;f_ops);</div><div class='del'>-	if (file-&gt;f_op == NULL) {</div><div class='del'>-		file-&gt;f_op = old_fops;</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (!new_fops)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	replace_fops(file, new_fops);</div><div class='ctx'> </div><div class='del'>-	if (file-&gt;f_op-&gt;open) {</div><div class='add'>+	if (file-&gt;f_op-&gt;open)</div><div class='ctx'> 		err = file-&gt;f_op-&gt;open(inode, file);</div><div class='del'>-		if (err) {</div><div class='del'>-			fops_put(file-&gt;f_op);</div><div class='del'>-			file-&gt;f_op = fops_get(old_fops);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	fops_put(old_fops);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -189,14 +175,22 @@ static const struct file_operations snd_fops =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_DYNAMIC_MINORS</div><div class='del'>-static int snd_find_free_minor(void)</div><div class='add'>+static int snd_find_free_minor(int type, struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int minor;</div><div class='ctx'> </div><div class='add'>+	/* static minors for module auto loading */</div><div class='add'>+	if (type == SNDRV_DEVICE_TYPE_SEQUENCER)</div><div class='add'>+		return SNDRV_MINOR_SEQUENCER;</div><div class='add'>+	if (type == SNDRV_DEVICE_TYPE_TIMER)</div><div class='add'>+		return SNDRV_MINOR_TIMER;</div><div class='add'>+</div><div class='ctx'> 	for (minor = 0; minor &lt; ARRAY_SIZE(snd_minors); ++minor) {</div><div class='del'>-		/* skip minors still used statically for autoloading devices */</div><div class='del'>-		if (SNDRV_MINOR_DEVICE(minor) == SNDRV_MINOR_CONTROL ||</div><div class='del'>-		    minor == SNDRV_MINOR_SEQUENCER)</div><div class='add'>+		/* skip static minors still used for module auto loading */</div><div class='add'>+		if (SNDRV_MINOR_DEVICE(minor) == SNDRV_MINOR_CONTROL)</div><div class='add'>+			continue;</div><div class='add'>+		if (minor == SNDRV_MINOR_SEQUENCER ||</div><div class='add'>+		    minor == SNDRV_MINOR_TIMER)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (!snd_minors[minor])</div><div class='ctx'> 			return minor;</div><div class='hunk'>@@ -204,7 +198,7 @@ static int snd_find_free_minor(void)</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static int snd_kernel_minor(int type, struct snd_card *card, int dev)</div><div class='add'>+static int snd_find_free_minor(int type, struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int minor;</div><div class='ctx'> </div><div class='hunk'>@@ -222,6 +216,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)</div><div class='ctx'> 	case SNDRV_DEVICE_TYPE_RAWMIDI:</div><div class='ctx'> 	case SNDRV_DEVICE_TYPE_PCM_PLAYBACK:</div><div class='ctx'> 	case SNDRV_DEVICE_TYPE_PCM_CAPTURE:</div><div class='add'>+	case SNDRV_DEVICE_TYPE_COMPRESS:</div><div class='ctx'> 		if (snd_BUG_ON(!card))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		minor = SNDRV_MINOR(card-&gt;number, type + dev);</div><div class='hunk'>@@ -231,35 +226,37 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_BUG_ON(minor &lt; 0 || minor &gt;= SNDRV_OS_MINORS))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (snd_minors[minor])</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	return minor;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_register_device_for_dev - Register the ALSA device file for the card</div><div class='add'>+ * snd_register_device - Register the ALSA device file for the card</div><div class='ctx'>  * @type: the device type, SNDRV_DEVICE_TYPE_XXX</div><div class='ctx'>  * @card: the card instance</div><div class='ctx'>  * @dev: the device index</div><div class='ctx'>  * @f_ops: the file operations</div><div class='ctx'>  * @private_data: user pointer for f_ops-&gt;open()</div><div class='del'>- * @name: the device file name</div><div class='del'>- * @device: the &amp;struct device to link this new device to</div><div class='add'>+ * @device: the device to register</div><div class='ctx'>  *</div><div class='ctx'>  * Registers an ALSA device file for the given card.</div><div class='ctx'>  * The operators have to be set in reg parameter.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_register_device_for_dev(int type, struct snd_card *card, int dev,</div><div class='del'>-				const struct file_operations *f_ops,</div><div class='del'>-				void *private_data,</div><div class='del'>-				const char *name, struct device *device)</div><div class='add'>+int snd_register_device(int type, struct snd_card *card, int dev,</div><div class='add'>+			const struct file_operations *f_ops,</div><div class='add'>+			void *private_data, struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	int minor;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	struct snd_minor *preg;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!name))</div><div class='add'>+	if (snd_BUG_ON(!device))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	preg = kmalloc(sizeof *preg, GFP_KERNEL);</div><div class='ctx'> 	if (preg == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -268,110 +265,62 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,</div><div class='ctx'> 	preg-&gt;device = dev;</div><div class='ctx'> 	preg-&gt;f_ops = f_ops;</div><div class='ctx'> 	preg-&gt;private_data = private_data;</div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='del'>-#ifdef CONFIG_SND_DYNAMIC_MINORS</div><div class='del'>-	minor = snd_find_free_minor();</div><div class='del'>-#else</div><div class='del'>-	minor = snd_kernel_minor(type, card, dev);</div><div class='del'>-	if (minor &gt;= 0 &amp;&amp; snd_minors[minor])</div><div class='del'>-		minor = -EBUSY;</div><div class='del'>-#endif</div><div class='add'>+	preg-&gt;card_ptr = card;</div><div class='add'>+	guard(mutex)(&amp;sound_mutex);</div><div class='add'>+	minor = snd_find_free_minor(type, card, dev);</div><div class='ctx'> 	if (minor &lt; 0) {</div><div class='del'>-		mutex_unlock(&amp;sound_mutex);</div><div class='del'>-		kfree(preg);</div><div class='del'>-		return minor;</div><div class='del'>-	}</div><div class='del'>-	snd_minors[minor] = preg;</div><div class='del'>-	preg-&gt;dev = device_create(sound_class, device, MKDEV(major, minor),</div><div class='del'>-				  private_data, "%s", name);</div><div class='del'>-	if (IS_ERR(preg-&gt;dev)) {</div><div class='del'>-		snd_minors[minor] = NULL;</div><div class='del'>-		mutex_unlock(&amp;sound_mutex);</div><div class='del'>-		minor = PTR_ERR(preg-&gt;dev);</div><div class='del'>-		kfree(preg);</div><div class='del'>-		return minor;</div><div class='add'>+		err = minor;</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_register_device_for_dev);</div><div class='del'>-</div><div class='del'>-/* find the matching minor record</div><div class='del'>- * return the index of snd_minor, or -1 if not found</div><div class='del'>- */</div><div class='del'>-static int find_snd_minor(int type, struct snd_card *card, int dev)</div><div class='del'>-{</div><div class='del'>-	int cardnum, minor;</div><div class='del'>-	struct snd_minor *mptr;</div><div class='add'>+	preg-&gt;dev = device;</div><div class='add'>+	device-&gt;devt = MKDEV(major, minor);</div><div class='add'>+	err = device_add(device);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	cardnum = card ? card-&gt;number : -1;</div><div class='del'>-	for (minor = 0; minor &lt; ARRAY_SIZE(snd_minors); ++minor)</div><div class='del'>-		if ((mptr = snd_minors[minor]) != NULL &amp;&amp;</div><div class='del'>-		    mptr-&gt;type == type &amp;&amp;</div><div class='del'>-		    mptr-&gt;card == cardnum &amp;&amp;</div><div class='del'>-		    mptr-&gt;device == dev)</div><div class='del'>-			return minor;</div><div class='del'>-	return -1;</div><div class='add'>+	snd_minors[minor] = preg;</div><div class='add'>+ error:</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		kfree(preg);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_register_device);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_unregister_device - unregister the device on the given card</div><div class='del'>- * @type: the device type, SNDRV_DEVICE_TYPE_XXX</div><div class='del'>- * @card: the card instance</div><div class='del'>- * @dev: the device index</div><div class='add'>+ * @dev: the device instance</div><div class='ctx'>  *</div><div class='ctx'>  * Unregisters the device file already registered via</div><div class='ctx'>  * snd_register_device().</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if sucecessful, or a negative error code on failure</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_unregister_device(int type, struct snd_card *card, int dev)</div><div class='add'>+int snd_unregister_device(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int minor;</div><div class='add'>+	struct snd_minor *preg;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='del'>-	minor = find_snd_minor(type, card, dev);</div><div class='del'>-	if (minor &lt; 0) {</div><div class='del'>-		mutex_unlock(&amp;sound_mutex);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;sound_mutex);</div><div class='add'>+	for (minor = 0; minor &lt; ARRAY_SIZE(snd_minors); ++minor) {</div><div class='add'>+		preg = snd_minors[minor];</div><div class='add'>+		if (preg &amp;&amp; preg-&gt;dev == dev) {</div><div class='add'>+			snd_minors[minor] = NULL;</div><div class='add'>+			device_del(dev);</div><div class='add'>+			kfree(preg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	device_destroy(sound_class, MKDEV(major, minor));</div><div class='del'>-</div><div class='del'>-	kfree(snd_minors[minor]);</div><div class='del'>-	snd_minors[minor] = NULL;</div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='add'>+	if (minor &gt;= ARRAY_SIZE(snd_minors))</div><div class='add'>+		return -ENOENT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_unregister_device);</div><div class='ctx'> </div><div class='del'>-int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev,</div><div class='del'>-			      struct device_attribute *attr)</div><div class='del'>-{</div><div class='del'>-	int minor, ret = -EINVAL;</div><div class='del'>-	struct device *d;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='del'>-	minor = find_snd_minor(type, card, dev);</div><div class='del'>-	if (minor &gt;= 0 &amp;&amp; (d = snd_minors[minor]-&gt;dev) != NULL)</div><div class='del'>-		ret = device_create_file(d, attr);</div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_add_device_sysfs_file);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  INFO PART</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static struct snd_info_entry *snd_minor_info_entry;</div><div class='del'>-</div><div class='ctx'> static const char *snd_device_type_name(int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -389,6 +338,8 @@ static const char *snd_device_type_name(int type)</div><div class='ctx'> 		return "sequencer";</div><div class='ctx'> 	case SNDRV_DEVICE_TYPE_TIMER:</div><div class='ctx'> 		return "timer";</div><div class='add'>+	case SNDRV_DEVICE_TYPE_COMPRESS:</div><div class='add'>+		return "compress";</div><div class='ctx'> 	default:</div><div class='ctx'> 		return "?";</div><div class='ctx'> 	}</div><div class='hunk'>@@ -399,9 +350,10 @@ static void snd_minor_info_read(struct snd_info_entry *entry, struct snd_info_bu</div><div class='ctx'> 	int minor;</div><div class='ctx'> 	struct snd_minor *mptr;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sound_mutex);</div><div class='add'>+	guard(mutex)(&amp;sound_mutex);</div><div class='ctx'> 	for (minor = 0; minor &lt; SNDRV_OS_MINORS; ++minor) {</div><div class='del'>-		if (!(mptr = snd_minors[minor]))</div><div class='add'>+		mptr = snd_minors[minor];</div><div class='add'>+		if (!mptr)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (mptr-&gt;card &gt;= 0) {</div><div class='ctx'> 			if (mptr-&gt;device &gt;= 0)</div><div class='hunk'>@@ -416,7 +368,6 @@ static void snd_minor_info_read(struct snd_info_entry *entry, struct snd_info_bu</div><div class='ctx'> 			snd_iprintf(buffer, "%3i:        : %s\n", minor,</div><div class='ctx'> 				    snd_device_type_name(mptr-&gt;type));</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;sound_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int __init snd_minor_info_init(void)</div><div class='hunk'>@@ -424,23 +375,12 @@ int __init snd_minor_info_init(void)</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = snd_info_create_module_entry(THIS_MODULE, "devices", NULL);</div><div class='del'>-	if (entry) {</div><div class='del'>-		entry-&gt;c.text.read = snd_minor_info_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_minor_info_entry = entry;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __exit snd_minor_info_done(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(snd_minor_info_entry);</div><div class='del'>-	return 0;</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	entry-&gt;c.text.read = snd_minor_info_read;</div><div class='add'>+	return snd_info_register(entry); /* freed in error path */</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  INIT PART</div><div class='hunk'>@@ -451,23 +391,28 @@ static int __init alsa_sound_init(void)</div><div class='ctx'> 	snd_major = major;</div><div class='ctx'> 	snd_ecards_limit = cards_limit;</div><div class='ctx'> 	if (register_chrdev(major, "alsa", &amp;snd_fops)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to register native major device number %d\n", major);</div><div class='add'>+		pr_err("ALSA core: unable to register native major device number %d\n", major);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_info_init() &lt; 0) {</div><div class='ctx'> 		unregister_chrdev(major, "alsa");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	snd_info_minor_register();</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+	sound_debugfs_root = debugfs_create_dir("sound", NULL);</div><div class='add'>+#endif</div><div class='ctx'> #ifndef MODULE</div><div class='del'>-	printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION CONFIG_SND_DATE ".\n");</div><div class='add'>+	pr_info("Advanced Linux Sound Architecture Driver Initialized.\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit alsa_sound_exit(void)</div><div class='ctx'> {</div><div class='del'>-	snd_info_minor_unregister();</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+	debugfs_remove(sound_debugfs_root);</div><div class='add'>+#endif</div><div class='ctx'> 	snd_info_done();</div><div class='ctx'> 	unregister_chrdev(major, "alsa");</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/core/sound_kunit.c b/sound/core/sound_kunit.c<br/>new file mode 100644<br/>index 000000000000..84e337ecbddd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/sound_kunit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/sound_kunit.c</a></div><div class='hunk'>@@ -0,0 +1,324 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Sound core KUnit test</div><div class='add'>+ * Author: Ivan Orlov &lt;ivan.orlov0322@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+</div><div class='add'>+#define SILENCE_BUFFER_MAX_FRAMES 260</div><div class='add'>+#define SILENCE_BUFFER_SIZE (sizeof(u64) * SILENCE_BUFFER_MAX_FRAMES)</div><div class='add'>+#define SILENCE(...) { __VA_ARGS__ }</div><div class='add'>+#define DEFINE_FORMAT(fmt, pbits, wd, endianness, signd, silence_arr) {		\</div><div class='add'>+	.format = SNDRV_PCM_FORMAT_##fmt, .physical_bits = pbits,		\</div><div class='add'>+	.width = wd, .le = endianness, .sd = signd, .silence = silence_arr,	\</div><div class='add'>+	.name = #fmt,								\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define WRONG_FORMAT_1 (__force snd_pcm_format_t)((__force int)SNDRV_PCM_FORMAT_LAST + 1)</div><div class='add'>+#define WRONG_FORMAT_2 (__force snd_pcm_format_t)-1</div><div class='add'>+</div><div class='add'>+#define VALID_NAME "ValidName"</div><div class='add'>+#define NAME_W_SPEC_CHARS "In%v@1id name"</div><div class='add'>+#define NAME_W_SPACE "Test name"</div><div class='add'>+#define NAME_W_SPACE_REMOVED "Testname"</div><div class='add'>+</div><div class='add'>+#define TEST_FIRST_COMPONENT "Component1"</div><div class='add'>+#define TEST_SECOND_COMPONENT "Component2"</div><div class='add'>+</div><div class='add'>+struct snd_format_test_data {</div><div class='add'>+	snd_pcm_format_t format;</div><div class='add'>+	int physical_bits;</div><div class='add'>+	int width;</div><div class='add'>+	int le;</div><div class='add'>+	int sd;</div><div class='add'>+	unsigned char silence[8];</div><div class='add'>+	unsigned char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct avail_test_data {</div><div class='add'>+	snd_pcm_uframes_t buffer_size;</div><div class='add'>+	snd_pcm_uframes_t hw_ptr;</div><div class='add'>+	snd_pcm_uframes_t appl_ptr;</div><div class='add'>+	snd_pcm_uframes_t expected_avail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_format_test_data valid_fmt[] = {</div><div class='add'>+	DEFINE_FORMAT(S8, 8, 8, -1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U8, 8, 8, -1, 0, SILENCE(0x80)),</div><div class='add'>+	DEFINE_FORMAT(S16_LE, 16, 16, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S16_BE, 16, 16, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U16_LE, 16, 16, 1, 0, SILENCE(0x00, 0x80)),</div><div class='add'>+	DEFINE_FORMAT(U16_BE, 16, 16, 0, 0, SILENCE(0x80, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(S24_LE, 32, 24, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S24_BE, 32, 24, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U24_LE, 32, 24, 1, 0, SILENCE(0x00, 0x00, 0x80)),</div><div class='add'>+	DEFINE_FORMAT(U24_BE, 32, 24, 0, 0, SILENCE(0x00, 0x80, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(S32_LE, 32, 32, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S32_BE, 32, 32, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U32_LE, 32, 32, 1, 0, SILENCE(0x00, 0x00, 0x00, 0x80)),</div><div class='add'>+	DEFINE_FORMAT(U32_BE, 32, 32, 0, 0, SILENCE(0x80, 0x00, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(FLOAT_LE, 32, 32, 1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(FLOAT_BE, 32, 32, 0, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(FLOAT64_LE, 64, 64, 1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(FLOAT64_BE, 64, 64, 0, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(IEC958_SUBFRAME_LE, 32, 32, 1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(IEC958_SUBFRAME_BE, 32, 32, 0, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(MU_LAW, 8, 8, -1, -1, SILENCE(0x7f)),</div><div class='add'>+	DEFINE_FORMAT(A_LAW, 8, 8, -1, -1, SILENCE(0x55)),</div><div class='add'>+	DEFINE_FORMAT(IMA_ADPCM, 4, 4, -1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(G723_24, 3, 3, -1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(G723_40, 5, 5, -1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(DSD_U8, 8, 8, 1, 0, SILENCE(0x69)),</div><div class='add'>+	DEFINE_FORMAT(DSD_U16_LE, 16, 16, 1, 0, SILENCE(0x69, 0x69)),</div><div class='add'>+	DEFINE_FORMAT(DSD_U32_LE, 32, 32, 1, 0, SILENCE(0x69, 0x69, 0x69, 0x69)),</div><div class='add'>+	DEFINE_FORMAT(DSD_U16_BE, 16, 16, 0, 0, SILENCE(0x69, 0x69)),</div><div class='add'>+	DEFINE_FORMAT(DSD_U32_BE, 32, 32, 0, 0, SILENCE(0x69, 0x69, 0x69, 0x69)),</div><div class='add'>+	DEFINE_FORMAT(S20_LE, 32, 20, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S20_BE, 32, 20, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U20_LE, 32, 20, 1, 0, SILENCE(0x00, 0x00, 0x08, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(U20_BE, 32, 20, 0, 0, SILENCE(0x00, 0x08, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(S24_3LE, 24, 24, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S24_3BE, 24, 24, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U24_3LE, 24, 24, 1, 0, SILENCE(0x00, 0x00, 0x80)),</div><div class='add'>+	DEFINE_FORMAT(U24_3BE, 24, 24, 0, 0, SILENCE(0x80, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(S20_3LE, 24, 20, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S20_3BE, 24, 20, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U20_3LE, 24, 20, 1, 0, SILENCE(0x00, 0x00, 0x08)),</div><div class='add'>+	DEFINE_FORMAT(U20_3BE, 24, 20, 0, 0, SILENCE(0x08, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(S18_3LE, 24, 18, 1, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(S18_3BE, 24, 18, 0, 1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(U18_3LE, 24, 18, 1, 0, SILENCE(0x00, 0x00, 0x02)),</div><div class='add'>+	DEFINE_FORMAT(U18_3BE, 24, 18, 0, 0, SILENCE(0x02, 0x00, 0x00)),</div><div class='add'>+	DEFINE_FORMAT(G723_24_1B, 8, 3, -1, -1, SILENCE()),</div><div class='add'>+	DEFINE_FORMAT(G723_40_1B, 8, 5, -1, -1, SILENCE()),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_phys_format_size(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(valid_fmt); i++) {</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_physical_width(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].physical_bits);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_physical_width(WRONG_FORMAT_1), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_physical_width(WRONG_FORMAT_2), -EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_format_width(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(valid_fmt); i++) {</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_width(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].width);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_width(WRONG_FORMAT_1), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_width(WRONG_FORMAT_2), -EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_format_signed(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(valid_fmt); i++) {</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_signed(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].sd &lt; 0 ? -EINVAL : valid_fmt[i].sd);</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_unsigned(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].sd &lt; 0 ? -EINVAL : 1 - valid_fmt[i].sd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_width(WRONG_FORMAT_1), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_width(WRONG_FORMAT_2), -EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_format_endianness(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(valid_fmt); i++) {</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_little_endian(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].le &lt; 0 ? -EINVAL : valid_fmt[i].le);</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_format_big_endian(valid_fmt[i].format),</div><div class='add'>+				valid_fmt[i].le &lt; 0 ? -EINVAL : 1 - valid_fmt[i].le);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_little_endian(WRONG_FORMAT_1), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_little_endian(WRONG_FORMAT_2), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_big_endian(WRONG_FORMAT_1), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_big_endian(WRONG_FORMAT_2), -EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _test_fill_silence(struct kunit *test, const struct snd_format_test_data *data,</div><div class='add'>+			       u8 *buffer, size_t samples_count)</div><div class='add'>+{</div><div class='add'>+	size_t sample_bytes = data-&gt;physical_bits &gt;&gt; 3;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, snd_pcm_format_set_silence(data-&gt;format, buffer, samples_count), 0);</div><div class='add'>+	for (i = 0; i &lt; samples_count * sample_bytes; i++)</div><div class='add'>+		KUNIT_EXPECT_EQ(test, buffer[i], data-&gt;silence[i % sample_bytes]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_format_fill_silence(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	static const u32 buf_samples[] = { 10, 20, 32, 64, 129, SILENCE_BUFFER_MAX_FRAMES };</div><div class='add'>+	u8 *buffer;</div><div class='add'>+	u32 i, j;</div><div class='add'>+</div><div class='add'>+	buffer = kunit_kzalloc(test, SILENCE_BUFFER_SIZE, GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buffer);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(buf_samples); i++) {</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(valid_fmt); j++)</div><div class='add'>+			_test_fill_silence(test, &amp;valid_fmt[j], buffer, buf_samples[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_set_silence(WRONG_FORMAT_1, buffer, 20), -EINVAL);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, snd_pcm_format_set_silence(SNDRV_PCM_FORMAT_LAST, buffer, 0), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t calculate_boundary(snd_pcm_uframes_t buffer_size)</div><div class='add'>+{</div><div class='add'>+	snd_pcm_uframes_t boundary = buffer_size;</div><div class='add'>+</div><div class='add'>+	while (boundary * 2 &lt;= 0x7fffffffUL - buffer_size)</div><div class='add'>+		boundary *= 2;</div><div class='add'>+	return boundary;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct avail_test_data p_avail_data[] = {</div><div class='add'>+	/* buf_size + hw_ptr &lt; appl_ptr =&gt; avail = buf_size + hw_ptr - appl_ptr + boundary */</div><div class='add'>+	{ 128, 1000, 1129, 1073741824UL - 1 },</div><div class='add'>+	/*</div><div class='add'>+	 * buf_size + hw_ptr - appl_ptr &gt;= boundary =&gt;</div><div class='add'>+	 * =&gt; avail = buf_size + hw_ptr - appl_ptr - boundary</div><div class='add'>+	 */</div><div class='add'>+	{ 128, 1073741824UL, 10, 118 },</div><div class='add'>+	/* standard case: avail = buf_size + hw_ptr - appl_ptr */</div><div class='add'>+	{ 128, 1000, 1001, 127 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_playback_avail(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *r = kunit_kzalloc(test, sizeof(*r), GFP_KERNEL);</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r);</div><div class='add'>+</div><div class='add'>+	r-&gt;status = kunit_kzalloc(test, sizeof(*r-&gt;status), GFP_KERNEL);</div><div class='add'>+	r-&gt;control = kunit_kzalloc(test, sizeof(*r-&gt;control), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r-&gt;status);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r-&gt;control);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(p_avail_data); i++) {</div><div class='add'>+		r-&gt;buffer_size = p_avail_data[i].buffer_size;</div><div class='add'>+		r-&gt;boundary = calculate_boundary(r-&gt;buffer_size);</div><div class='add'>+		r-&gt;status-&gt;hw_ptr = p_avail_data[i].hw_ptr;</div><div class='add'>+		r-&gt;control-&gt;appl_ptr = p_avail_data[i].appl_ptr;</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_playback_avail(r), p_avail_data[i].expected_avail);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct avail_test_data c_avail_data[] = {</div><div class='add'>+	/* hw_ptr - appl_ptr &lt; 0 =&gt; avail = hw_ptr - appl_ptr + boundary */</div><div class='add'>+	{ 128, 1000, 1001, 1073741824UL - 1 },</div><div class='add'>+	/* standard case: avail = hw_ptr - appl_ptr */</div><div class='add'>+	{ 128, 1001, 1000, 1 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void test_capture_avail(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *r = kunit_kzalloc(test, sizeof(*r), GFP_KERNEL);</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r);</div><div class='add'>+</div><div class='add'>+	r-&gt;status = kunit_kzalloc(test, sizeof(*r-&gt;status), GFP_KERNEL);</div><div class='add'>+	r-&gt;control = kunit_kzalloc(test, sizeof(*r-&gt;control), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r-&gt;status);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r-&gt;control);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(c_avail_data); i++) {</div><div class='add'>+		r-&gt;buffer_size = c_avail_data[i].buffer_size;</div><div class='add'>+		r-&gt;boundary = calculate_boundary(r-&gt;buffer_size);</div><div class='add'>+		r-&gt;status-&gt;hw_ptr = c_avail_data[i].hw_ptr;</div><div class='add'>+		r-&gt;control-&gt;appl_ptr = c_avail_data[i].appl_ptr;</div><div class='add'>+		KUNIT_EXPECT_EQ(test, snd_pcm_capture_avail(r), c_avail_data[i].expected_avail);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_card_set_id(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = kunit_kzalloc(test, sizeof(*card), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, card);</div><div class='add'>+</div><div class='add'>+	snd_card_set_id(card, VALID_NAME);</div><div class='add'>+	KUNIT_EXPECT_STREQ(test, card-&gt;id, VALID_NAME);</div><div class='add'>+</div><div class='add'>+	/* clear the first id character so we can set it again */</div><div class='add'>+	card-&gt;id[0] = '\0';</div><div class='add'>+	snd_card_set_id(card, NAME_W_SPEC_CHARS);</div><div class='add'>+	KUNIT_EXPECT_STRNEQ(test, card-&gt;id, NAME_W_SPEC_CHARS);</div><div class='add'>+</div><div class='add'>+	card-&gt;id[0] = '\0';</div><div class='add'>+	snd_card_set_id(card, NAME_W_SPACE);</div><div class='add'>+	kunit_info(test, "%s", card-&gt;id);</div><div class='add'>+	KUNIT_EXPECT_STREQ(test, card-&gt;id, NAME_W_SPACE_REMOVED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_pcm_format_name(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(valid_fmt); i++) {</div><div class='add'>+		name = snd_pcm_format_name(valid_fmt[i].format);</div><div class='add'>+		KUNIT_ASSERT_NOT_NULL_MSG(test, name, "Don't have name for %s", valid_fmt[i].name);</div><div class='add'>+		KUNIT_EXPECT_STREQ(test, name, valid_fmt[i].name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_STREQ(test, snd_pcm_format_name(WRONG_FORMAT_1), "Unknown");</div><div class='add'>+	KUNIT_ASSERT_STREQ(test, snd_pcm_format_name(WRONG_FORMAT_2), "Unknown");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void test_card_add_component(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = kunit_kzalloc(test, sizeof(*card), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, card);</div><div class='add'>+</div><div class='add'>+	snd_component_add(card, TEST_FIRST_COMPONENT);</div><div class='add'>+	KUNIT_ASSERT_STREQ(test, card-&gt;components, TEST_FIRST_COMPONENT);</div><div class='add'>+</div><div class='add'>+	snd_component_add(card, TEST_SECOND_COMPONENT);</div><div class='add'>+	KUNIT_ASSERT_STREQ(test, card-&gt;components, TEST_FIRST_COMPONENT " " TEST_SECOND_COMPONENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kunit_case sound_utils_cases[] = {</div><div class='add'>+	KUNIT_CASE(test_phys_format_size),</div><div class='add'>+	KUNIT_CASE(test_format_width),</div><div class='add'>+	KUNIT_CASE(test_format_endianness),</div><div class='add'>+	KUNIT_CASE(test_format_signed),</div><div class='add'>+	KUNIT_CASE(test_format_fill_silence),</div><div class='add'>+	KUNIT_CASE(test_playback_avail),</div><div class='add'>+	KUNIT_CASE(test_capture_avail),</div><div class='add'>+	KUNIT_CASE(test_card_set_id),</div><div class='add'>+	KUNIT_CASE(test_pcm_format_name),</div><div class='add'>+	KUNIT_CASE(test_card_add_component),</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite sound_utils_suite = {</div><div class='add'>+	.name = "sound-core-test",</div><div class='add'>+	.test_cases = sound_utils_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(sound_utils_suite);</div><div class='add'>+MODULE_DESCRIPTION("Sound core KUnit test");</div><div class='add'>+MODULE_AUTHOR("Ivan Orlov");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c<br/>index 0c164e5e4322..d65cc6fee2e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/sound_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/sound_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/sound_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/sound_oss.c</a></div><div class='hunk'>@@ -1,31 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Advanced Linux Sound Architecture</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_SOUND) &amp;&amp; !(defined(MODULE) &amp;&amp; defined(CONFIG_SOUND_MODULE))</div><div class='del'>-#error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel."</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -34,11 +14,14 @@</div><div class='ctx'> #include &lt;linux/sound.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='del'>-#define SNDRV_OSS_MINORS 128</div><div class='add'>+#define SNDRV_OSS_MINORS 256</div><div class='ctx'> </div><div class='ctx'> static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS];</div><div class='ctx'> static DEFINE_MUTEX(sound_oss_mutex);</div><div class='ctx'> </div><div class='add'>+/* NOTE: This function increments the refcount of the associated card like</div><div class='add'>+ * snd_lookup_minor_data(); the caller must call snd_card_unref() appropriately</div><div class='add'>+ */</div><div class='ctx'> void *snd_lookup_oss_minor_data(unsigned int minor, int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_minor *mreg;</div><div class='hunk'>@@ -46,16 +29,16 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type)</div><div class='ctx'> </div><div class='ctx'> 	if (minor &gt;= ARRAY_SIZE(snd_oss_minors))</div><div class='ctx'> 		return NULL;</div><div class='del'>-	mutex_lock(&amp;sound_oss_mutex);</div><div class='add'>+	guard(mutex)(&amp;sound_oss_mutex);</div><div class='ctx'> 	mreg = snd_oss_minors[minor];</div><div class='del'>-	if (mreg &amp;&amp; mreg-&gt;type == type)</div><div class='add'>+	if (mreg &amp;&amp; mreg-&gt;type == type) {</div><div class='ctx'> 		private_data = mreg-&gt;private_data;</div><div class='del'>-	else</div><div class='add'>+		if (private_data &amp;&amp; mreg-&gt;card_ptr)</div><div class='add'>+			get_device(&amp;mreg-&gt;card_ptr-&gt;card_dev);</div><div class='add'>+	} else</div><div class='ctx'> 		private_data = NULL;</div><div class='del'>-	mutex_unlock(&amp;sound_oss_mutex);</div><div class='ctx'> 	return private_data;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_lookup_oss_minor_data);</div><div class='ctx'> </div><div class='ctx'> static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)</div><div class='hunk'>@@ -99,8 +82,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_register_oss_device(int type, struct snd_card *card, int dev,</div><div class='del'>-			    const struct file_operations *f_ops, void *private_data,</div><div class='del'>-			    const char *name)</div><div class='add'>+			    const struct file_operations *f_ops, void *private_data)</div><div class='ctx'> {</div><div class='ctx'> 	int minor = snd_oss_kernel_minor(type, card, dev);</div><div class='ctx'> 	int minor_unit;</div><div class='hunk'>@@ -110,7 +92,7 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,</div><div class='ctx'> 	int register1 = -1, register2 = -1;</div><div class='ctx'> 	struct device *carddev = snd_card_get_device_link(card);</div><div class='ctx'> </div><div class='del'>-	if (card &amp;&amp; card-&gt;number &gt;= 8)</div><div class='add'>+	if (card &amp;&amp; card-&gt;number &gt;= SNDRV_MINOR_OSS_DEVICES)</div><div class='ctx'> 		return 0; /* ignore silently */</div><div class='ctx'> 	if (minor &lt; 0)</div><div class='ctx'> 		return minor;</div><div class='hunk'>@@ -122,7 +104,8 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,</div><div class='ctx'> 	preg-&gt;device = dev;</div><div class='ctx'> 	preg-&gt;f_ops = f_ops;</div><div class='ctx'> 	preg-&gt;private_data = private_data;</div><div class='del'>-	mutex_lock(&amp;sound_oss_mutex);</div><div class='add'>+	preg-&gt;card_ptr = card;</div><div class='add'>+	guard(mutex)(&amp;sound_oss_mutex);</div><div class='ctx'> 	snd_oss_minors[minor] = preg;</div><div class='ctx'> 	minor_unit = SNDRV_MINOR_OSS_DEVICE(minor);</div><div class='ctx'> 	switch (minor_unit) {</div><div class='hunk'>@@ -146,7 +129,6 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,</div><div class='ctx'> 			goto __end;</div><div class='ctx'> 		snd_oss_minors[track2] = preg;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;sound_oss_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       __end:</div><div class='hunk'>@@ -155,11 +137,9 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,</div><div class='ctx'>       	if (register1 &gt;= 0)</div><div class='ctx'>       		unregister_sound_special(register1);</div><div class='ctx'> 	snd_oss_minors[minor] = NULL;</div><div class='del'>-	mutex_unlock(&amp;sound_oss_mutex);</div><div class='ctx'> 	kfree(preg);</div><div class='ctx'>       	return -EBUSY;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_register_oss_device);</div><div class='ctx'> </div><div class='ctx'> int snd_unregister_oss_device(int type, struct snd_card *card, int dev)</div><div class='hunk'>@@ -169,17 +149,14 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev)</div><div class='ctx'> 	int track2 = -1;</div><div class='ctx'> 	struct snd_minor *mptr;</div><div class='ctx'> </div><div class='del'>-	if (card &amp;&amp; card-&gt;number &gt;= 8)</div><div class='add'>+	if (card &amp;&amp; card-&gt;number &gt;= SNDRV_MINOR_OSS_DEVICES)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (minor &lt; 0)</div><div class='ctx'> 		return minor;</div><div class='del'>-	mutex_lock(&amp;sound_oss_mutex);</div><div class='add'>+	guard(mutex)(&amp;sound_oss_mutex);</div><div class='ctx'> 	mptr = snd_oss_minors[minor];</div><div class='del'>-	if (mptr == NULL) {</div><div class='del'>-		mutex_unlock(&amp;sound_oss_mutex);</div><div class='add'>+	if (mptr == NULL)</div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-	unregister_sound_special(minor);</div><div class='ctx'> 	switch (SNDRV_MINOR_OSS_DEVICE(minor)) {</div><div class='ctx'> 	case SNDRV_MINOR_OSS_PCM:</div><div class='ctx'> 		track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_AUDIO);</div><div class='hunk'>@@ -191,26 +168,27 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev)</div><div class='ctx'> 		track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (track2 &gt;= 0) {</div><div class='del'>-		unregister_sound_special(track2);</div><div class='add'>+	if (track2 &gt;= 0)</div><div class='ctx'> 		snd_oss_minors[track2] = NULL;</div><div class='del'>-	}</div><div class='ctx'> 	snd_oss_minors[minor] = NULL;</div><div class='del'>-	mutex_unlock(&amp;sound_oss_mutex);</div><div class='add'>+</div><div class='add'>+	/* call unregister_sound_special() outside sound_oss_mutex;</div><div class='add'>+	 * otherwise may deadlock, as it can trigger the release of a card</div><div class='add'>+	 */</div><div class='add'>+	unregister_sound_special(minor);</div><div class='add'>+	if (track2 &gt;= 0)</div><div class='add'>+		unregister_sound_special(track2);</div><div class='add'>+</div><div class='ctx'> 	kfree(mptr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_unregister_oss_device);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  INFO PART</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='del'>-static struct snd_info_entry *snd_minor_info_oss_entry;</div><div class='del'>-</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> static const char *snd_oss_device_type_name(int type)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -236,9 +214,10 @@ static void snd_minor_info_oss_read(struct snd_info_entry *entry,</div><div class='ctx'> 	int minor;</div><div class='ctx'> 	struct snd_minor *mptr;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;sound_oss_mutex);</div><div class='add'>+	guard(mutex)(&amp;sound_oss_mutex);</div><div class='ctx'> 	for (minor = 0; minor &lt; SNDRV_OSS_MINORS; ++minor) {</div><div class='del'>-		if (!(mptr = snd_oss_minors[minor]))</div><div class='add'>+		mptr = snd_oss_minors[minor];</div><div class='add'>+		if (!mptr)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (mptr-&gt;card &gt;= 0)</div><div class='ctx'> 			snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", minor,</div><div class='hunk'>@@ -248,7 +227,6 @@ static void snd_minor_info_oss_read(struct snd_info_entry *entry,</div><div class='ctx'> 			snd_iprintf(buffer, "%3i:       : %s\n", minor,</div><div class='ctx'> 				    snd_oss_device_type_name(mptr-&gt;type));</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;sound_oss_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -257,22 +235,9 @@ int __init snd_minor_info_oss_init(void)</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='ctx'> 	entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);</div><div class='del'>-	if (entry) {</div><div class='del'>-		entry-&gt;c.text.read = snd_minor_info_oss_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_minor_info_oss_entry = entry;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __exit snd_minor_info_oss_done(void)</div><div class='del'>-{</div><div class='del'>-	snd_info_free_entry(snd_minor_info_oss_entry);</div><div class='del'>-	return 0;</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	entry-&gt;c.text.read = snd_minor_info_oss_read;</div><div class='add'>+	return snd_info_register(entry); /* freed in error path */</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SND_OSSEMUL */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='head'>diff --git a/sound/core/timer.c b/sound/core/timer.c<br/>index 13afb60999b9..d9fff5c87613 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/timer.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Timers abstract layer</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -24,8 +9,12 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/anon_inodes.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/timer.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -34,10 +23,12 @@</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;linux/kmod.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_HPET) || defined(CONFIG_SND_HPET_MODULE)</div><div class='del'>-#define DEFAULT_TIMER_LIMIT 3</div><div class='del'>-#elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE)</div><div class='del'>-#define DEFAULT_TIMER_LIMIT 2</div><div class='add'>+/* internal flags */</div><div class='add'>+#define SNDRV_TIMER_IFLG_PAUSED		0x00010000</div><div class='add'>+#define SNDRV_TIMER_IFLG_DEAD		0x00020000</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_HRTIMER)</div><div class='add'>+#define DEFAULT_TIMER_LIMIT 4</div><div class='ctx'> #else</div><div class='ctx'> #define DEFAULT_TIMER_LIMIT 1</div><div class='ctx'> #endif</div><div class='hunk'>@@ -52,6 +43,31 @@ MODULE_PARM_DESC(timer_limit, "Maximum global timers in system.");</div><div class='ctx'> module_param(timer_tstamp_monotonic, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(timer_tstamp_monotonic, "Use posix monotonic clock source for timestamps (default).");</div><div class='ctx'> </div><div class='add'>+MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_TIMER);</div><div class='add'>+MODULE_ALIAS("devname:snd/timer");</div><div class='add'>+</div><div class='add'>+enum timer_tread_format {</div><div class='add'>+	TREAD_FORMAT_NONE = 0,</div><div class='add'>+	TREAD_FORMAT_TIME64,</div><div class='add'>+	TREAD_FORMAT_TIME32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_timer_tread32 {</div><div class='add'>+	int event;</div><div class='add'>+	s32 tstamp_sec;</div><div class='add'>+	s32 tstamp_nsec;</div><div class='add'>+	unsigned int val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_timer_tread64 {</div><div class='add'>+	int event;</div><div class='add'>+	u8 pad1[4];</div><div class='add'>+	s64 tstamp_sec;</div><div class='add'>+	s64 tstamp_nsec;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	u8 pad2[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct snd_timer_user {</div><div class='ctx'> 	struct snd_timer_instance *timeri;</div><div class='ctx'> 	int tread;		/* enhanced read with timestamps and events */</div><div class='hunk'>@@ -61,16 +77,51 @@ struct snd_timer_user {</div><div class='ctx'> 	int qtail;</div><div class='ctx'> 	int qused;</div><div class='ctx'> 	int queue_size;</div><div class='add'>+	bool disconnected;</div><div class='ctx'> 	struct snd_timer_read *queue;</div><div class='del'>-	struct snd_timer_tread *tqueue;</div><div class='add'>+	struct snd_timer_tread64 *tqueue;</div><div class='ctx'> 	spinlock_t qlock;</div><div class='ctx'> 	unsigned long last_resolution;</div><div class='ctx'> 	unsigned int filter;</div><div class='del'>-	struct timespec tstamp;		/* trigger tstamp */</div><div class='add'>+	struct timespec64 tstamp;		/* trigger tstamp */</div><div class='ctx'> 	wait_queue_head_t qchange_sleep;</div><div class='del'>-	struct fasync_struct *fasync;</div><div class='del'>-	struct mutex tread_sem;</div><div class='add'>+	struct snd_fasync *fasync;</div><div class='add'>+	struct mutex ioctl_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_timer_status32 {</div><div class='add'>+	s32 tstamp_sec;			/* Timestamp - last update */</div><div class='add'>+	s32 tstamp_nsec;</div><div class='add'>+	unsigned int resolution;	/* current period resolution in ns */</div><div class='add'>+	unsigned int lost;		/* counter of master tick lost */</div><div class='add'>+	unsigned int overrun;		/* count of read queue overruns */</div><div class='add'>+	unsigned int queue;		/* used queue size */</div><div class='add'>+	unsigned char reserved[64];	/* reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SNDRV_TIMER_IOCTL_STATUS32	_IOR('T', 0x14, struct snd_timer_status32)</div><div class='add'>+</div><div class='add'>+struct snd_timer_status64 {</div><div class='add'>+	s64 tstamp_sec;			/* Timestamp - last update */</div><div class='add'>+	s64 tstamp_nsec;</div><div class='add'>+	unsigned int resolution;	/* current period resolution in ns */</div><div class='add'>+	unsigned int lost;		/* counter of master tick lost */</div><div class='add'>+	unsigned int overrun;		/* count of read queue overruns */</div><div class='add'>+	unsigned int queue;		/* used queue size */</div><div class='add'>+	unsigned char reserved[64];	/* reserved */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_UTIMER</div><div class='add'>+#define SNDRV_UTIMERS_MAX_COUNT 128</div><div class='add'>+/* Internal data structure for keeping the state of the userspace-driven timer */</div><div class='add'>+struct snd_utimer {</div><div class='add'>+	char *name;</div><div class='add'>+	struct snd_timer *timer;</div><div class='add'>+	unsigned int id;</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define SNDRV_TIMER_IOCTL_STATUS64	_IOR('T', 0x14, struct snd_timer_status64)</div><div class='ctx'> </div><div class='ctx'> /* list of timers */</div><div class='ctx'> static LIST_HEAD(snd_timer_list);</div><div class='hunk'>@@ -81,6 +132,9 @@ static LIST_HEAD(snd_timer_slave_list);</div><div class='ctx'> /* lock for slave active lists */</div><div class='ctx'> static DEFINE_SPINLOCK(slave_active_lock);</div><div class='ctx'> </div><div class='add'>+#define MAX_SLAVE_INSTANCES	1000</div><div class='add'>+static int num_slaves;</div><div class='add'>+</div><div class='ctx'> static DEFINE_MUTEX(register_mutex);</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_free(struct snd_timer *timer);</div><div class='hunk'>@@ -92,12 +146,11 @@ static void snd_timer_reschedule(struct snd_timer * timer, unsigned long ticks_l</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * create a timer instance with the given owner string.</div><div class='del'>- * when timer is not NULL, increments the module counter</div><div class='ctx'>  */</div><div class='del'>-static struct snd_timer_instance *snd_timer_instance_new(char *owner,</div><div class='del'>-							 struct snd_timer *timer)</div><div class='add'>+struct snd_timer_instance *snd_timer_instance_new(const char *owner)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_instance *timeri;</div><div class='add'>+</div><div class='ctx'> 	timeri = kzalloc(sizeof(*timeri), GFP_KERNEL);</div><div class='ctx'> 	if (timeri == NULL)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -112,22 +165,27 @@ static struct snd_timer_instance *snd_timer_instance_new(char *owner,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timeri-&gt;slave_list_head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timeri-&gt;slave_active_head);</div><div class='ctx'> </div><div class='del'>-	timeri-&gt;timer = timer;</div><div class='del'>-	if (timer &amp;&amp; !try_module_get(timer-&gt;module)) {</div><div class='add'>+	return timeri;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_timer_instance_new);</div><div class='add'>+</div><div class='add'>+void snd_timer_instance_free(struct snd_timer_instance *timeri)</div><div class='add'>+{</div><div class='add'>+	if (timeri) {</div><div class='add'>+		if (timeri-&gt;private_free)</div><div class='add'>+			timeri-&gt;private_free(timeri);</div><div class='ctx'> 		kfree(timeri-&gt;owner);</div><div class='ctx'> 		kfree(timeri);</div><div class='del'>-		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return timeri;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_instance_free);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * find a timer instance from the given timer id</div><div class='ctx'>  */</div><div class='ctx'> static struct snd_timer *snd_timer_find(struct snd_timer_id *tid)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer = NULL;</div><div class='add'>+	struct snd_timer *timer;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(timer, &amp;snd_timer_list, device_list) {</div><div class='ctx'> 		if (timer-&gt;tmr_class != tid-&gt;dev_class)</div><div class='hunk'>@@ -167,33 +225,48 @@ static void snd_timer_request(struct snd_timer_id *tid)</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* move the slave if it belongs to the master; return 1 if match */</div><div class='add'>+static int check_matching_master_slave(struct snd_timer_instance *master,</div><div class='add'>+				       struct snd_timer_instance *slave)</div><div class='add'>+{</div><div class='add'>+	if (slave-&gt;slave_class != master-&gt;slave_class ||</div><div class='add'>+	    slave-&gt;slave_id != master-&gt;slave_id)</div><div class='add'>+		return 0;</div><div class='add'>+	if (master-&gt;timer-&gt;num_instances &gt;= master-&gt;timer-&gt;max_instances)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	list_move_tail(&amp;slave-&gt;open_list, &amp;master-&gt;slave_list_head);</div><div class='add'>+	master-&gt;timer-&gt;num_instances++;</div><div class='add'>+	guard(spinlock_irq)(&amp;slave_active_lock);</div><div class='add'>+	guard(spinlock)(&amp;master-&gt;timer-&gt;lock);</div><div class='add'>+	slave-&gt;master = master;</div><div class='add'>+	slave-&gt;timer = master-&gt;timer;</div><div class='add'>+	if (slave-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING)</div><div class='add'>+		list_add_tail(&amp;slave-&gt;active_list, &amp;master-&gt;slave_active_head);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * look for a master instance matching with the slave id of the given slave.</div><div class='ctx'>  * when found, relink the open_link of the slave.</div><div class='ctx'>  *</div><div class='ctx'>  * call this with register_mutex down.</div><div class='ctx'>  */</div><div class='del'>-static void snd_timer_check_slave(struct snd_timer_instance *slave)</div><div class='add'>+static int snd_timer_check_slave(struct snd_timer_instance *slave)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct snd_timer_instance *master;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: it's really dumb to look up all entries.. */</div><div class='ctx'> 	list_for_each_entry(timer, &amp;snd_timer_list, device_list) {</div><div class='ctx'> 		list_for_each_entry(master, &amp;timer-&gt;open_list_head, open_list) {</div><div class='del'>-			if (slave-&gt;slave_class == master-&gt;slave_class &amp;&amp;</div><div class='del'>-			    slave-&gt;slave_id == master-&gt;slave_id) {</div><div class='del'>-				list_del(&amp;slave-&gt;open_list);</div><div class='del'>-				list_add_tail(&amp;slave-&gt;open_list,</div><div class='del'>-					      &amp;master-&gt;slave_list_head);</div><div class='del'>-				spin_lock_irq(&amp;slave_active_lock);</div><div class='del'>-				slave-&gt;master = master;</div><div class='del'>-				slave-&gt;timer = master-&gt;timer;</div><div class='del'>-				spin_unlock_irq(&amp;slave_active_lock);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='add'>+			err = check_matching_master_slave(master, slave);</div><div class='add'>+			if (err != 0) /* match found or error */</div><div class='add'>+				goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+ out:</div><div class='add'>+	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -202,62 +275,59 @@ static void snd_timer_check_slave(struct snd_timer_instance *slave)</div><div class='ctx'>  *</div><div class='ctx'>  * call this with register_mutex down.</div><div class='ctx'>  */</div><div class='del'>-static void snd_timer_check_master(struct snd_timer_instance *master)</div><div class='add'>+static int snd_timer_check_master(struct snd_timer_instance *master)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_instance *slave, *tmp;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check all pending slaves */</div><div class='ctx'> 	list_for_each_entry_safe(slave, tmp, &amp;snd_timer_slave_list, open_list) {</div><div class='del'>-		if (slave-&gt;slave_class == master-&gt;slave_class &amp;&amp;</div><div class='del'>-		    slave-&gt;slave_id == master-&gt;slave_id) {</div><div class='del'>-			list_move_tail(&amp;slave-&gt;open_list, &amp;master-&gt;slave_list_head);</div><div class='del'>-			spin_lock_irq(&amp;slave_active_lock);</div><div class='del'>-			slave-&gt;master = master;</div><div class='del'>-			slave-&gt;timer = master-&gt;timer;</div><div class='del'>-			if (slave-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING)</div><div class='del'>-				list_add_tail(&amp;slave-&gt;active_list,</div><div class='del'>-					      &amp;master-&gt;slave_active_head);</div><div class='del'>-			spin_unlock_irq(&amp;slave_active_lock);</div><div class='del'>-		}</div><div class='add'>+		err = check_matching_master_slave(master, slave);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='add'>+	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void snd_timer_close_locked(struct snd_timer_instance *timeri,</div><div class='add'>+				   struct device **card_devp_to_put);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * open a timer instance</div><div class='ctx'>  * when opening a master, the slave id must be here given.</div><div class='ctx'>  */</div><div class='del'>-int snd_timer_open(struct snd_timer_instance **ti,</div><div class='del'>-		   char *owner, struct snd_timer_id *tid,</div><div class='add'>+int snd_timer_open(struct snd_timer_instance *timeri,</div><div class='add'>+		   struct snd_timer_id *tid,</div><div class='ctx'> 		   unsigned int slave_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='del'>-	struct snd_timer_instance *timeri = NULL;</div><div class='add'>+	struct device *card_dev_to_put = NULL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;register_mutex);</div><div class='ctx'> 	if (tid-&gt;dev_class == SNDRV_TIMER_CLASS_SLAVE) {</div><div class='ctx'> 		/* open a slave instance */</div><div class='ctx'> 		if (tid-&gt;dev_sclass &lt;= SNDRV_TIMER_SCLASS_NONE ||</div><div class='ctx'> 		    tid-&gt;dev_sclass &gt; SNDRV_TIMER_SCLASS_OSS_SEQUENCER) {</div><div class='del'>-			snd_printd("invalid slave class %i\n", tid-&gt;dev_sclass);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			pr_debug("ALSA: timer: invalid slave class %i\n",</div><div class='add'>+				 tid-&gt;dev_sclass);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='del'>-		mutex_lock(&amp;register_mutex);</div><div class='del'>-		timeri = snd_timer_instance_new(owner, NULL);</div><div class='del'>-		if (!timeri) {</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (num_slaves &gt;= MAX_SLAVE_INSTANCES) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		timeri-&gt;slave_class = tid-&gt;dev_sclass;</div><div class='ctx'> 		timeri-&gt;slave_id = tid-&gt;device;</div><div class='ctx'> 		timeri-&gt;flags |= SNDRV_TIMER_IFLG_SLAVE;</div><div class='ctx'> 		list_add_tail(&amp;timeri-&gt;open_list, &amp;snd_timer_slave_list);</div><div class='del'>-		snd_timer_check_slave(timeri);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		*ti = timeri;</div><div class='del'>-		return 0;</div><div class='add'>+		num_slaves++;</div><div class='add'>+		err = snd_timer_check_slave(timeri);</div><div class='add'>+		goto list_added;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* open a master instance */</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='ctx'> 	timer = snd_timer_find(tid);</div><div class='ctx'> #ifdef CONFIG_MODULES</div><div class='ctx'> 	if (!timer) {</div><div class='hunk'>@@ -268,64 +338,104 @@ int snd_timer_open(struct snd_timer_instance **ti,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (!timer) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!list_empty(&amp;timer-&gt;open_list_head)) {</div><div class='del'>-		timeri = list_entry(timer-&gt;open_list_head.next,</div><div class='add'>+		struct snd_timer_instance *t =</div><div class='add'>+			list_entry(timer-&gt;open_list_head.next,</div><div class='ctx'> 				    struct snd_timer_instance, open_list);</div><div class='del'>-		if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_EXCLUSIVE) {</div><div class='del'>-			mutex_unlock(&amp;register_mutex);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+		if (t-&gt;flags &amp; SNDRV_TIMER_IFLG_EXCLUSIVE) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	timeri = snd_timer_instance_new(owner, timer);</div><div class='del'>-	if (!timeri) {</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (timer-&gt;num_instances &gt;= timer-&gt;max_instances) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='add'>+	if (!try_module_get(timer-&gt;module)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	/* take a card refcount for safe disconnection */</div><div class='add'>+	if (timer-&gt;card) {</div><div class='add'>+		get_device(&amp;timer-&gt;card-&gt;card_dev);</div><div class='add'>+		card_dev_to_put = &amp;timer-&gt;card-&gt;card_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;timer-&gt;open_list_head) &amp;&amp; timer-&gt;hw.open) {</div><div class='add'>+		err = timer-&gt;hw.open(timer);</div><div class='add'>+		if (err) {</div><div class='add'>+			module_put(timer-&gt;module);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timeri-&gt;timer = timer;</div><div class='ctx'> 	timeri-&gt;slave_class = tid-&gt;dev_sclass;</div><div class='ctx'> 	timeri-&gt;slave_id = slave_id;</div><div class='del'>-	if (list_empty(&amp;timer-&gt;open_list_head) &amp;&amp; timer-&gt;hw.open)</div><div class='del'>-		timer-&gt;hw.open(timer);</div><div class='add'>+</div><div class='ctx'> 	list_add_tail(&amp;timeri-&gt;open_list, &amp;timer-&gt;open_list_head);</div><div class='del'>-	snd_timer_check_master(timeri);</div><div class='add'>+	timer-&gt;num_instances++;</div><div class='add'>+	err = snd_timer_check_master(timeri);</div><div class='add'>+list_added:</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_timer_close_locked(timeri, &amp;card_dev_to_put);</div><div class='add'>+</div><div class='add'>+ unlock:</div><div class='ctx'> 	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	*ti = timeri;</div><div class='del'>-	return 0;</div><div class='add'>+	/* put_device() is called after unlock for avoiding deadlock */</div><div class='add'>+	if (err &lt; 0 &amp;&amp; card_dev_to_put)</div><div class='add'>+		put_device(card_dev_to_put);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_open);</div><div class='ctx'> </div><div class='del'>-static int _snd_timer_stop(struct snd_timer_instance *timeri,</div><div class='del'>-			   int keep_flag, int event);</div><div class='add'>+/* remove slave links, called from snd_timer_close_locked() below */</div><div class='add'>+static void remove_slave_links(struct snd_timer_instance *timeri,</div><div class='add'>+			       struct snd_timer *timer)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_instance *slave, *tmp;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;slave_active_lock);</div><div class='add'>+	guard(spinlock)(&amp;timer-&gt;lock);</div><div class='add'>+	timeri-&gt;timer = NULL;</div><div class='add'>+	list_for_each_entry_safe(slave, tmp, &amp;timeri-&gt;slave_list_head, open_list) {</div><div class='add'>+		list_move_tail(&amp;slave-&gt;open_list, &amp;snd_timer_slave_list);</div><div class='add'>+		timer-&gt;num_instances--;</div><div class='add'>+		slave-&gt;master = NULL;</div><div class='add'>+		slave-&gt;timer = NULL;</div><div class='add'>+		list_del_init(&amp;slave-&gt;ack_list);</div><div class='add'>+		list_del_init(&amp;slave-&gt;active_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * close a timer instance</div><div class='add'>+ * call this with register_mutex down.</div><div class='ctx'>  */</div><div class='del'>-int snd_timer_close(struct snd_timer_instance *timeri)</div><div class='add'>+static void snd_timer_close_locked(struct snd_timer_instance *timeri,</div><div class='add'>+				   struct device **card_devp_to_put)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer = NULL;</div><div class='del'>-	struct snd_timer_instance *slave, *tmp;</div><div class='add'>+	struct snd_timer *timer = timeri-&gt;timer;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!timeri))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	if (timer) {</div><div class='add'>+		guard(spinlock_irq)(&amp;timer-&gt;lock);</div><div class='add'>+		timeri-&gt;flags |= SNDRV_TIMER_IFLG_DEAD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;timeri-&gt;open_list)) {</div><div class='add'>+		list_del_init(&amp;timeri-&gt;open_list);</div><div class='add'>+		if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='add'>+			num_slaves--;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* force to stop the timer */</div><div class='ctx'> 	snd_timer_stop(timeri);</div><div class='ctx'> </div><div class='del'>-	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE) {</div><div class='del'>-		/* wait, until the active callback is finished */</div><div class='del'>-		spin_lock_irq(&amp;slave_active_lock);</div><div class='del'>-		while (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_CALLBACK) {</div><div class='del'>-			spin_unlock_irq(&amp;slave_active_lock);</div><div class='del'>-			udelay(10);</div><div class='del'>-			spin_lock_irq(&amp;slave_active_lock);</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irq(&amp;slave_active_lock);</div><div class='del'>-		mutex_lock(&amp;register_mutex);</div><div class='del'>-		list_del(&amp;timeri-&gt;open_list);</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='del'>-	} else {</div><div class='del'>-		timer = timeri-&gt;timer;</div><div class='add'>+	if (timer) {</div><div class='add'>+		timer-&gt;num_instances--;</div><div class='ctx'> 		/* wait, until the active callback is finished */</div><div class='ctx'> 		spin_lock_irq(&amp;timer-&gt;lock);</div><div class='ctx'> 		while (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_CALLBACK) {</div><div class='hunk'>@@ -334,165 +444,193 @@ int snd_timer_close(struct snd_timer_instance *timeri)</div><div class='ctx'> 			spin_lock_irq(&amp;timer-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irq(&amp;timer-&gt;lock);</div><div class='del'>-		mutex_lock(&amp;register_mutex);</div><div class='del'>-		list_del(&amp;timeri-&gt;open_list);</div><div class='del'>-		if (timer &amp;&amp; list_empty(&amp;timer-&gt;open_list_head) &amp;&amp;</div><div class='del'>-		    timer-&gt;hw.close)</div><div class='del'>-			timer-&gt;hw.close(timer);</div><div class='del'>-		/* remove slave links */</div><div class='del'>-		list_for_each_entry_safe(slave, tmp, &amp;timeri-&gt;slave_list_head,</div><div class='del'>-					 open_list) {</div><div class='del'>-			spin_lock_irq(&amp;slave_active_lock);</div><div class='del'>-			_snd_timer_stop(slave, 1, SNDRV_TIMER_EVENT_RESOLUTION);</div><div class='del'>-			list_move_tail(&amp;slave-&gt;open_list, &amp;snd_timer_slave_list);</div><div class='del'>-			slave-&gt;master = NULL;</div><div class='del'>-			slave-&gt;timer = NULL;</div><div class='del'>-			spin_unlock_irq(&amp;slave_active_lock);</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='add'>+</div><div class='add'>+		remove_slave_links(timeri, timer);</div><div class='add'>+</div><div class='add'>+		/* slave doesn't need to release timer resources below */</div><div class='add'>+		if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='add'>+			timer = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (timeri-&gt;private_free)</div><div class='del'>-		timeri-&gt;private_free(timeri);</div><div class='del'>-	kfree(timeri-&gt;owner);</div><div class='del'>-	kfree(timeri);</div><div class='del'>-	if (timer)</div><div class='add'>+</div><div class='add'>+	if (timer) {</div><div class='add'>+		if (list_empty(&amp;timer-&gt;open_list_head) &amp;&amp; timer-&gt;hw.close)</div><div class='add'>+			timer-&gt;hw.close(timer);</div><div class='add'>+		/* release a card refcount for safe disconnection */</div><div class='add'>+		if (timer-&gt;card)</div><div class='add'>+			*card_devp_to_put = &amp;timer-&gt;card-&gt;card_dev;</div><div class='ctx'> 		module_put(timer-&gt;module);</div><div class='del'>-	return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * close a timer instance</div><div class='add'>+ */</div><div class='add'>+void snd_timer_close(struct snd_timer_instance *timeri)</div><div class='add'>+{</div><div class='add'>+	struct device *card_dev_to_put = NULL;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!timeri))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex)</div><div class='add'>+		snd_timer_close_locked(timeri, &amp;card_dev_to_put);</div><div class='add'>+	/* put_device() is called after unlock for avoiding deadlock */</div><div class='add'>+	if (card_dev_to_put)</div><div class='add'>+		put_device(card_dev_to_put);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_timer_close);</div><div class='add'>+</div><div class='add'>+static unsigned long snd_timer_hw_resolution(struct snd_timer *timer)</div><div class='add'>+{</div><div class='add'>+	if (timer-&gt;hw.c_resolution)</div><div class='add'>+		return timer-&gt;hw.c_resolution(timer);</div><div class='add'>+	else</div><div class='add'>+		return timer-&gt;hw.resolution;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned long snd_timer_resolution(struct snd_timer_instance *timeri)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer * timer;</div><div class='add'>+	unsigned long ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (timeri == NULL)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((timer = timeri-&gt;timer) != NULL) {</div><div class='del'>-		if (timer-&gt;hw.c_resolution)</div><div class='del'>-			return timer-&gt;hw.c_resolution(timer);</div><div class='del'>-		return timer-&gt;hw.resolution;</div><div class='add'>+	timer = timeri-&gt;timer;</div><div class='add'>+	if (timer) {</div><div class='add'>+		guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='add'>+		ret = snd_timer_hw_resolution(timer);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_resolution);</div><div class='ctx'> </div><div class='ctx'> static void snd_timer_notify1(struct snd_timer_instance *ti, int event)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_timer *timer = ti-&gt;timer;</div><div class='ctx'> 	unsigned long resolution = 0;</div><div class='ctx'> 	struct snd_timer_instance *ts;</div><div class='del'>-	struct timespec tstamp;</div><div class='add'>+	struct timespec64 tstamp;</div><div class='ctx'> </div><div class='ctx'> 	if (timer_tstamp_monotonic)</div><div class='del'>-		do_posix_clock_monotonic_gettime(&amp;tstamp);</div><div class='add'>+		ktime_get_ts64(&amp;tstamp);</div><div class='ctx'> 	else</div><div class='del'>-		getnstimeofday(&amp;tstamp);</div><div class='add'>+		ktime_get_real_ts64(&amp;tstamp);</div><div class='ctx'> 	if (snd_BUG_ON(event &lt; SNDRV_TIMER_EVENT_START ||</div><div class='ctx'> 		       event &gt; SNDRV_TIMER_EVENT_PAUSE))</div><div class='ctx'> 		return;</div><div class='del'>-	if (event == SNDRV_TIMER_EVENT_START ||</div><div class='del'>-	    event == SNDRV_TIMER_EVENT_CONTINUE)</div><div class='del'>-		resolution = snd_timer_resolution(ti);</div><div class='add'>+	if (timer &amp;&amp;</div><div class='add'>+	    (event == SNDRV_TIMER_EVENT_START ||</div><div class='add'>+	     event == SNDRV_TIMER_EVENT_CONTINUE))</div><div class='add'>+		resolution = snd_timer_hw_resolution(timer);</div><div class='ctx'> 	if (ti-&gt;ccallback)</div><div class='ctx'> 		ti-&gt;ccallback(ti, event, &amp;tstamp, resolution);</div><div class='ctx'> 	if (ti-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='ctx'> 		return;</div><div class='del'>-	timer = ti-&gt;timer;</div><div class='ctx'> 	if (timer == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 		return;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='add'>+	event += 10; /* convert to SNDRV_TIMER_EVENT_MXXX */</div><div class='ctx'> 	list_for_each_entry(ts, &amp;ti-&gt;slave_active_head, active_list)</div><div class='ctx'> 		if (ts-&gt;ccallback)</div><div class='del'>-			ts-&gt;ccallback(ti, event + 100, &amp;tstamp, resolution);</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='add'>+			ts-&gt;ccallback(ts, event, &amp;tstamp, resolution);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_timer_start1(struct snd_timer *timer, struct snd_timer_instance *timeri,</div><div class='del'>-			    unsigned long sticks)</div><div class='add'>+/* start/continue a master timer */</div><div class='add'>+static int snd_timer_start1(struct snd_timer_instance *timeri,</div><div class='add'>+			    bool start, unsigned long ticks)</div><div class='ctx'> {</div><div class='del'>-	list_del(&amp;timeri-&gt;active_list);</div><div class='del'>-	list_add_tail(&amp;timeri-&gt;active_list, &amp;timer-&gt;active_list_head);</div><div class='add'>+	struct snd_timer *timer;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	timer = timeri-&gt;timer;</div><div class='add'>+	if (!timer)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_DEAD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (timeri-&gt;flags &amp; (SNDRV_TIMER_IFLG_RUNNING |</div><div class='add'>+			     SNDRV_TIMER_IFLG_START))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* check the actual time for the start tick;</div><div class='add'>+	 * bail out as error if it's way too low (&lt; 100us)</div><div class='add'>+	 */</div><div class='add'>+	if (start &amp;&amp; !(timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)) {</div><div class='add'>+		if ((u64)snd_timer_hw_resolution(timer) * ticks &lt; 100000)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (start)</div><div class='add'>+		timeri-&gt;ticks = timeri-&gt;cticks = ticks;</div><div class='add'>+	else if (!timeri-&gt;cticks)</div><div class='add'>+		timeri-&gt;cticks = 1;</div><div class='add'>+	timeri-&gt;pticks = 0;</div><div class='add'>+</div><div class='add'>+	list_move_tail(&amp;timeri-&gt;active_list, &amp;timer-&gt;active_list_head);</div><div class='ctx'> 	if (timer-&gt;running) {</div><div class='ctx'> 		if (timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 			goto __start_now;</div><div class='ctx'> 		timer-&gt;flags |= SNDRV_TIMER_FLG_RESCHED;</div><div class='ctx'> 		timeri-&gt;flags |= SNDRV_TIMER_IFLG_START;</div><div class='del'>-		return 1;	/* delayed start */</div><div class='add'>+		result = 1; /* delayed start */</div><div class='ctx'> 	} else {</div><div class='del'>-		timer-&gt;sticks = sticks;</div><div class='add'>+		if (start)</div><div class='add'>+			timer-&gt;sticks = ticks;</div><div class='ctx'> 		timer-&gt;hw.start(timer);</div><div class='ctx'> 	      __start_now:</div><div class='ctx'> 		timer-&gt;running++;</div><div class='ctx'> 		timeri-&gt;flags |= SNDRV_TIMER_IFLG_RUNNING;</div><div class='del'>-		return 0;</div><div class='add'>+		result = 0;</div><div class='ctx'> 	}</div><div class='add'>+	snd_timer_notify1(timeri, start ? SNDRV_TIMER_EVENT_START :</div><div class='add'>+			  SNDRV_TIMER_EVENT_CONTINUE);</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_timer_start_slave(struct snd_timer_instance *timeri)</div><div class='add'>+/* start/continue a slave timer */</div><div class='add'>+static int snd_timer_start_slave(struct snd_timer_instance *timeri,</div><div class='add'>+				 bool start)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;slave_active_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;slave_active_lock);</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_DEAD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	timeri-&gt;flags |= SNDRV_TIMER_IFLG_RUNNING;</div><div class='del'>-	if (timeri-&gt;master)</div><div class='add'>+	if (timeri-&gt;master &amp;&amp; timeri-&gt;timer) {</div><div class='add'>+		guard(spinlock)(&amp;timeri-&gt;timer-&gt;lock);</div><div class='ctx'> 		list_add_tail(&amp;timeri-&gt;active_list,</div><div class='ctx'> 			      &amp;timeri-&gt;master-&gt;slave_active_head);</div><div class='del'>-	spin_unlock_irqrestore(&amp;slave_active_lock, flags);</div><div class='del'>-	return 1; /* delayed start */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  start the timer instance</div><div class='del'>- */</div><div class='del'>-int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks)</div><div class='del'>-{</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-	int result = -EINVAL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (timeri == NULL || ticks &lt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE) {</div><div class='del'>-		result = snd_timer_start_slave(timeri);</div><div class='del'>-		snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START);</div><div class='del'>-		return result;</div><div class='add'>+		snd_timer_notify1(timeri, start ? SNDRV_TIMER_EVENT_START :</div><div class='add'>+				  SNDRV_TIMER_EVENT_CONTINUE);</div><div class='ctx'> 	}</div><div class='del'>-	timer = timeri-&gt;timer;</div><div class='del'>-	if (timer == NULL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='del'>-	timeri-&gt;ticks = timeri-&gt;cticks = ticks;</div><div class='del'>-	timeri-&gt;pticks = 0;</div><div class='del'>-	result = snd_timer_start1(timer, timeri, ticks);</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='del'>-	snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_START);</div><div class='del'>-	return result;</div><div class='add'>+	return 1; /* delayed start */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _snd_timer_stop(struct snd_timer_instance * timeri,</div><div class='del'>-			   int keep_flag, int event)</div><div class='add'>+/* stop/pause a master timer */</div><div class='add'>+static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!timeri))</div><div class='del'>-		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE) {</div><div class='del'>-		if (!keep_flag) {</div><div class='del'>-			spin_lock_irqsave(&amp;slave_active_lock, flags);</div><div class='del'>-			timeri-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_RUNNING;</div><div class='del'>-			spin_unlock_irqrestore(&amp;slave_active_lock, flags);</div><div class='del'>-		}</div><div class='del'>-		goto __end;</div><div class='del'>-	}</div><div class='ctx'> 	timer = timeri-&gt;timer;</div><div class='ctx'> 	if (!timer)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='ctx'> 	list_del_init(&amp;timeri-&gt;ack_list);</div><div class='ctx'> 	list_del_init(&amp;timeri-&gt;active_list);</div><div class='add'>+	if (!(timeri-&gt;flags &amp; (SNDRV_TIMER_IFLG_RUNNING |</div><div class='add'>+			       SNDRV_TIMER_IFLG_START)))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown)</div><div class='add'>+		return 0;</div><div class='add'>+	if (stop) {</div><div class='add'>+		timeri-&gt;cticks = timeri-&gt;ticks;</div><div class='add'>+		timeri-&gt;pticks = 0;</div><div class='add'>+	}</div><div class='ctx'> 	if ((timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING) &amp;&amp;</div><div class='ctx'> 	    !(--timer-&gt;running)) {</div><div class='ctx'> 		timer-&gt;hw.stop(timer);</div><div class='hunk'>@@ -505,16 +643,49 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!keep_flag)</div><div class='del'>-		timeri-&gt;flags &amp;=</div><div class='del'>-			~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='del'>-      __end:</div><div class='del'>-	if (event != SNDRV_TIMER_EVENT_RESOLUTION)</div><div class='del'>-		snd_timer_notify1(timeri, event);</div><div class='add'>+	timeri-&gt;flags &amp;= ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);</div><div class='add'>+	if (stop)</div><div class='add'>+		timeri-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_PAUSED;</div><div class='add'>+	else</div><div class='add'>+		timeri-&gt;flags |= SNDRV_TIMER_IFLG_PAUSED;</div><div class='add'>+	snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :</div><div class='add'>+			  SNDRV_TIMER_EVENT_PAUSE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* stop/pause a slave timer */</div><div class='add'>+static int snd_timer_stop_slave(struct snd_timer_instance *timeri, bool stop)</div><div class='add'>+{</div><div class='add'>+	bool running;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;slave_active_lock);</div><div class='add'>+	running = timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING;</div><div class='add'>+	timeri-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_RUNNING;</div><div class='add'>+	if (timeri-&gt;timer) {</div><div class='add'>+		guard(spinlock)(&amp;timeri-&gt;timer-&gt;lock);</div><div class='add'>+		list_del_init(&amp;timeri-&gt;ack_list);</div><div class='add'>+		list_del_init(&amp;timeri-&gt;active_list);</div><div class='add'>+		if (running)</div><div class='add'>+			snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :</div><div class='add'>+					  SNDRV_TIMER_EVENT_PAUSE);</div><div class='add'>+	}</div><div class='add'>+	return running ? 0 : -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  start the timer instance</div><div class='add'>+ */</div><div class='add'>+int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks)</div><div class='add'>+{</div><div class='add'>+	if (timeri == NULL || ticks &lt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='add'>+		return snd_timer_start_slave(timeri, true);</div><div class='add'>+	else</div><div class='add'>+		return snd_timer_start1(timeri, true, ticks);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_timer_start);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * stop the timer instance.</div><div class='ctx'>  *</div><div class='hunk'>@@ -522,54 +693,40 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri,</div><div class='ctx'>  */</div><div class='ctx'> int snd_timer_stop(struct snd_timer_instance *timeri)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_STOP);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	timer = timeri-&gt;timer;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='del'>-	timeri-&gt;cticks = timeri-&gt;ticks;</div><div class='del'>-	timeri-&gt;pticks = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='del'>-	return 0;</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='add'>+		return snd_timer_stop_slave(timeri, true);</div><div class='add'>+	else</div><div class='add'>+		return snd_timer_stop1(timeri, true);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_stop);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * start again..  the tick is kept.</div><div class='ctx'>  */</div><div class='ctx'> int snd_timer_continue(struct snd_timer_instance *timeri)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-	int result = -EINVAL;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	/* timer can continue only after pause */</div><div class='add'>+	if (!(timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_PAUSED))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (timeri == NULL)</div><div class='del'>-		return result;</div><div class='ctx'> 	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='del'>-		return snd_timer_start_slave(timeri);</div><div class='del'>-	timer = timeri-&gt;timer;</div><div class='del'>-	if (! timer)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='del'>-	if (!timeri-&gt;cticks)</div><div class='del'>-		timeri-&gt;cticks = 1;</div><div class='del'>-	timeri-&gt;pticks = 0;</div><div class='del'>-	result = snd_timer_start1(timer, timeri, timer-&gt;sticks);</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='del'>-	snd_timer_notify1(timeri, SNDRV_TIMER_EVENT_CONTINUE);</div><div class='del'>-	return result;</div><div class='add'>+		return snd_timer_start_slave(timeri, false);</div><div class='add'>+	else</div><div class='add'>+		return snd_timer_start1(timeri, false, 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_continue);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * pause.. remember the ticks left</div><div class='ctx'>  */</div><div class='ctx'> int snd_timer_pause(struct snd_timer_instance * timeri)</div><div class='ctx'> {</div><div class='del'>-	return _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_PAUSE);</div><div class='add'>+	if (timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_SLAVE)</div><div class='add'>+		return snd_timer_stop_slave(timeri, false);</div><div class='add'>+	else</div><div class='add'>+		return snd_timer_stop1(timeri, false);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_pause);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * reschedule the timer</div><div class='hunk'>@@ -604,39 +761,58 @@ static void snd_timer_reschedule(struct snd_timer * timer, unsigned long ticks_l</div><div class='ctx'> 	timer-&gt;sticks = ticks;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * timer tasklet</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static void snd_timer_tasklet(unsigned long arg)</div><div class='add'>+/* call callbacks in timer ack list */</div><div class='add'>+static void snd_timer_process_callbacks(struct snd_timer *timer,</div><div class='add'>+					struct list_head *head)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer = (struct snd_timer *) arg;</div><div class='ctx'> 	struct snd_timer_instance *ti;</div><div class='del'>-	struct list_head *p;</div><div class='ctx'> 	unsigned long resolution, ticks;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='del'>-	/* now process all callbacks */</div><div class='del'>-	while (!list_empty(&amp;timer-&gt;sack_list_head)) {</div><div class='del'>-		p = timer-&gt;sack_list_head.next;		/* get first item */</div><div class='del'>-		ti = list_entry(p, struct snd_timer_instance, ack_list);</div><div class='add'>+	while (!list_empty(head)) {</div><div class='add'>+		ti = list_first_entry(head, struct snd_timer_instance,</div><div class='add'>+				      ack_list);</div><div class='ctx'> </div><div class='ctx'> 		/* remove from ack_list and make empty */</div><div class='del'>-		list_del_init(p);</div><div class='add'>+		list_del_init(&amp;ti-&gt;ack_list);</div><div class='add'>+</div><div class='add'>+		if (!(ti-&gt;flags &amp; SNDRV_TIMER_IFLG_DEAD)) {</div><div class='add'>+			ticks = ti-&gt;pticks;</div><div class='add'>+			ti-&gt;pticks = 0;</div><div class='add'>+			resolution = ti-&gt;resolution;</div><div class='add'>+			ti-&gt;flags |= SNDRV_TIMER_IFLG_CALLBACK;</div><div class='add'>+			spin_unlock(&amp;timer-&gt;lock);</div><div class='add'>+			if (ti-&gt;callback)</div><div class='add'>+				ti-&gt;callback(ti, resolution, ticks);</div><div class='add'>+			spin_lock(&amp;timer-&gt;lock);</div><div class='add'>+			ti-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_CALLBACK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clear pending instances from ack list */</div><div class='add'>+static void snd_timer_clear_callbacks(struct snd_timer *timer,</div><div class='add'>+				      struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='add'>+	while (!list_empty(head))</div><div class='add'>+		list_del_init(head-&gt;next);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		ticks = ti-&gt;pticks;</div><div class='del'>-		ti-&gt;pticks = 0;</div><div class='del'>-		resolution = ti-&gt;resolution;</div><div class='add'>+/*</div><div class='add'>+ * timer work</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void snd_timer_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer *timer = container_of(work, struct snd_timer, task_work);</div><div class='ctx'> </div><div class='del'>-		ti-&gt;flags |= SNDRV_TIMER_IFLG_CALLBACK;</div><div class='del'>-		spin_unlock(&amp;timer-&gt;lock);</div><div class='del'>-		if (ti-&gt;callback)</div><div class='del'>-			ti-&gt;callback(ti, resolution, ticks);</div><div class='del'>-		spin_lock(&amp;timer-&gt;lock);</div><div class='del'>-		ti-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_CALLBACK;</div><div class='add'>+	if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown) {</div><div class='add'>+		snd_timer_clear_callbacks(timer, &amp;timer-&gt;sack_list_head);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='add'>+	snd_timer_process_callbacks(timer, &amp;timer-&gt;sack_list_head);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -648,21 +824,21 @@ static void snd_timer_tasklet(unsigned long arg)</div><div class='ctx'> void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_instance *ti, *ts, *tmp;</div><div class='del'>-	unsigned long resolution, ticks;</div><div class='del'>-	struct list_head *p, *ack_list_head;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int use_tasklet = 0;</div><div class='add'>+	unsigned long resolution;</div><div class='add'>+	struct list_head *ack_list_head;</div><div class='ctx'> </div><div class='ctx'> 	if (timer == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='add'>+	if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown) {</div><div class='add'>+		snd_timer_clear_callbacks(timer, &amp;timer-&gt;ack_list_head);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* remember the current resolution */</div><div class='del'>-	if (timer-&gt;hw.c_resolution)</div><div class='del'>-		resolution = timer-&gt;hw.c_resolution(timer);</div><div class='del'>-	else</div><div class='del'>-		resolution = timer-&gt;hw.resolution;</div><div class='add'>+	resolution = snd_timer_hw_resolution(timer);</div><div class='ctx'> </div><div class='ctx'> 	/* loop for all active instances</div><div class='ctx'> 	 * Here we cannot use list_for_each_entry because the active_list of a</div><div class='hunk'>@@ -671,6 +847,8 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)</div><div class='ctx'> 	 */</div><div class='ctx'> 	list_for_each_entry_safe(ti, tmp, &amp;timer-&gt;active_list_head,</div><div class='ctx'> 				 active_list) {</div><div class='add'>+		if (ti-&gt;flags &amp; SNDRV_TIMER_IFLG_DEAD)</div><div class='add'>+			continue;</div><div class='ctx'> 		if (!(ti-&gt;flags &amp; SNDRV_TIMER_IFLG_RUNNING))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		ti-&gt;pticks += ticks_left;</div><div class='hunk'>@@ -685,10 +863,10 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)</div><div class='ctx'> 			ti-&gt;cticks = ti-&gt;ticks;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			ti-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_RUNNING;</div><div class='del'>-			if (--timer-&gt;running)</div><div class='del'>-				list_del(&amp;ti-&gt;active_list);</div><div class='add'>+			--timer-&gt;running;</div><div class='add'>+			list_del_init(&amp;ti-&gt;active_list);</div><div class='ctx'> 		}</div><div class='del'>-		if ((timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_TASKLET) ||</div><div class='add'>+		if ((timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_WORK) ||</div><div class='ctx'> 		    (ti-&gt;flags &amp; SNDRV_TIMER_IFLG_FAST))</div><div class='ctx'> 			ack_list_head = &amp;timer-&gt;ack_list_head;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -720,31 +898,13 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* now process all fast callbacks */</div><div class='del'>-	while (!list_empty(&amp;timer-&gt;ack_list_head)) {</div><div class='del'>-		p = timer-&gt;ack_list_head.next;		/* get first item */</div><div class='del'>-		ti = list_entry(p, struct snd_timer_instance, ack_list);</div><div class='del'>-</div><div class='del'>-		/* remove from ack_list and make empty */</div><div class='del'>-		list_del_init(p);</div><div class='del'>-</div><div class='del'>-		ticks = ti-&gt;pticks;</div><div class='del'>-		ti-&gt;pticks = 0;</div><div class='del'>-</div><div class='del'>-		ti-&gt;flags |= SNDRV_TIMER_IFLG_CALLBACK;</div><div class='del'>-		spin_unlock(&amp;timer-&gt;lock);</div><div class='del'>-		if (ti-&gt;callback)</div><div class='del'>-			ti-&gt;callback(ti, resolution, ticks);</div><div class='del'>-		spin_lock(&amp;timer-&gt;lock);</div><div class='del'>-		ti-&gt;flags &amp;= ~SNDRV_TIMER_IFLG_CALLBACK;</div><div class='del'>-	}</div><div class='add'>+	snd_timer_process_callbacks(timer, &amp;timer-&gt;ack_list_head);</div><div class='ctx'> </div><div class='ctx'> 	/* do we have any slow callbacks? */</div><div class='del'>-	use_tasklet = !list_empty(&amp;timer-&gt;sack_list_head);</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (use_tasklet)</div><div class='del'>-		tasklet_schedule(&amp;timer-&gt;task_queue);</div><div class='add'>+	if (!list_empty(&amp;timer-&gt;sack_list_head))</div><div class='add'>+		queue_work(system_highpri_wq, &amp;timer-&gt;task_work);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_interrupt);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> </div><div class='hunk'>@@ -755,7 +915,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_timer_dev_free,</div><div class='ctx'> 		.dev_register = snd_timer_dev_register,</div><div class='ctx'> 		.dev_disconnect = snd_timer_dev_disconnect,</div><div class='hunk'>@@ -763,27 +923,31 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!tid))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	if (tid-&gt;dev_class == SNDRV_TIMER_CLASS_CARD ||</div><div class='add'>+	    tid-&gt;dev_class == SNDRV_TIMER_CLASS_PCM) {</div><div class='add'>+		if (WARN_ON(!card))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (rtimer)</div><div class='ctx'> 		*rtimer = NULL;</div><div class='ctx'> 	timer = kzalloc(sizeof(*timer), GFP_KERNEL);</div><div class='del'>-	if (timer == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "timer: cannot allocate\n");</div><div class='add'>+	if (!timer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	timer-&gt;tmr_class = tid-&gt;dev_class;</div><div class='ctx'> 	timer-&gt;card = card;</div><div class='ctx'> 	timer-&gt;tmr_device = tid-&gt;device;</div><div class='ctx'> 	timer-&gt;tmr_subdevice = tid-&gt;subdevice;</div><div class='ctx'> 	if (id)</div><div class='del'>-		strlcpy(timer-&gt;id, id, sizeof(timer-&gt;id));</div><div class='add'>+		strscpy(timer-&gt;id, id, sizeof(timer-&gt;id));</div><div class='add'>+	timer-&gt;sticks = 1;</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timer-&gt;device_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timer-&gt;open_list_head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timer-&gt;active_list_head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timer-&gt;ack_list_head);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;timer-&gt;sack_list_head);</div><div class='ctx'> 	spin_lock_init(&amp;timer-&gt;lock);</div><div class='del'>-	tasklet_init(&amp;timer-&gt;task_queue, snd_timer_tasklet,</div><div class='del'>-		     (unsigned long)timer);</div><div class='add'>+	INIT_WORK(&amp;timer-&gt;task_work, snd_timer_work);</div><div class='add'>+	timer-&gt;max_instances = 1000; /* default limit per timer */</div><div class='ctx'> 	if (card != NULL) {</div><div class='ctx'> 		timer-&gt;module = card-&gt;module;</div><div class='ctx'> 		err = snd_device_new(card, SNDRV_DEV_TIMER, timer, &amp;ops);</div><div class='hunk'>@@ -796,17 +960,18 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid,</div><div class='ctx'> 		*rtimer = timer;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_new);</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_free(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	if (!timer)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	if (! list_empty(&amp;timer-&gt;open_list_head)) {</div><div class='ctx'> 		struct list_head *p, *n;</div><div class='ctx'> 		struct snd_timer_instance *ti;</div><div class='del'>-		snd_printk(KERN_WARNING "timer %p is busy?\n", timer);</div><div class='add'>+		pr_warn("ALSA: timer %p is busy?\n", timer);</div><div class='ctx'> 		list_for_each_safe(p, n, &amp;timer-&gt;open_list_head) {</div><div class='ctx'> 			list_del_init(p);</div><div class='ctx'> 			ti = list_entry(p, struct snd_timer_instance, open_list);</div><div class='hunk'>@@ -814,7 +979,6 @@ static int snd_timer_free(struct snd_timer *timer)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	list_del(&amp;timer-&gt;device_list);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (timer-&gt;private_free)</div><div class='ctx'> 		timer-&gt;private_free(timer);</div><div class='hunk'>@@ -839,7 +1003,7 @@ static int snd_timer_dev_register(struct snd_device *dev)</div><div class='ctx'> 	    !timer-&gt;hw.resolution &amp;&amp; timer-&gt;hw.c_resolution == NULL)</div><div class='ctx'> 	    	return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	list_for_each_entry(timer1, &amp;snd_timer_list, device_list) {</div><div class='ctx'> 		if (timer1-&gt;tmr_class &gt; timer-&gt;tmr_class)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -860,43 +1024,44 @@ static int snd_timer_dev_register(struct snd_device *dev)</div><div class='ctx'> 		if (timer1-&gt;tmr_subdevice &lt; timer-&gt;tmr_subdevice)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		/* conflicts.. */</div><div class='del'>-		mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	list_add_tail(&amp;timer-&gt;device_list, &amp;timer1-&gt;device_list);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_dev_disconnect(struct snd_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer = device-&gt;device_data;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	struct snd_timer_instance *ti;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	list_del_init(&amp;timer-&gt;device_list);</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+	/* wake up pending sleepers */</div><div class='add'>+	list_for_each_entry(ti, &amp;timer-&gt;open_list_head, open_list) {</div><div class='add'>+		if (ti-&gt;disconnect)</div><div class='add'>+			ti-&gt;disconnect(ti);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void snd_timer_notify(struct snd_timer *timer, int event, struct timespec *tstamp)</div><div class='add'>+void snd_timer_notify(struct snd_timer *timer, int event, struct timespec64 *tstamp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned long resolution = 0;</div><div class='ctx'> 	struct snd_timer_instance *ti, *ts;</div><div class='ctx'> </div><div class='add'>+	if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown)</div><div class='add'>+		return;</div><div class='ctx'> 	if (! (timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE))</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (snd_BUG_ON(event &lt; SNDRV_TIMER_EVENT_MSTART ||</div><div class='ctx'> 		       event &gt; SNDRV_TIMER_EVENT_MRESUME))</div><div class='ctx'> 		return;</div><div class='del'>-	spin_lock_irqsave(&amp;timer-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;timer-&gt;lock);</div><div class='ctx'> 	if (event == SNDRV_TIMER_EVENT_MSTART ||</div><div class='ctx'> 	    event == SNDRV_TIMER_EVENT_MCONTINUE ||</div><div class='del'>-	    event == SNDRV_TIMER_EVENT_MRESUME) {</div><div class='del'>-		if (timer-&gt;hw.c_resolution)</div><div class='del'>-			resolution = timer-&gt;hw.c_resolution(timer);</div><div class='del'>-		else</div><div class='del'>-			resolution = timer-&gt;hw.resolution;</div><div class='del'>-	}</div><div class='add'>+	    event == SNDRV_TIMER_EVENT_MRESUME)</div><div class='add'>+		resolution = snd_timer_hw_resolution(timer);</div><div class='ctx'> 	list_for_each_entry(ti, &amp;timer-&gt;active_list_head, active_list) {</div><div class='ctx'> 		if (ti-&gt;ccallback)</div><div class='ctx'> 			ti-&gt;ccallback(ti, event, tstamp, resolution);</div><div class='hunk'>@@ -904,8 +1069,8 @@ void snd_timer_notify(struct snd_timer *timer, int event, struct timespec *tstam</div><div class='ctx'> 			if (ts-&gt;ccallback)</div><div class='ctx'> 				ts-&gt;ccallback(ts, event, tstamp, resolution);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;timer-&gt;lock, flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_notify);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * exported functions for global timers</div><div class='hunk'>@@ -921,11 +1086,13 @@ int snd_timer_global_new(char *id, int device, struct snd_timer **rtimer)</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='ctx'> 	return snd_timer_new(NULL, id, &amp;tid, rtimer);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_global_new);</div><div class='ctx'> </div><div class='ctx'> int snd_timer_global_free(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_timer_free(timer);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_global_free);</div><div class='ctx'> </div><div class='ctx'> int snd_timer_global_register(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='hunk'>@@ -935,6 +1102,7 @@ int snd_timer_global_register(struct snd_timer *timer)</div><div class='ctx'> 	dev.device_data = timer;</div><div class='ctx'> 	return snd_timer_dev_register(&amp;dev);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_timer_global_register);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  System timer</div><div class='hunk'>@@ -942,15 +1110,17 @@ int snd_timer_global_register(struct snd_timer *timer)</div><div class='ctx'> </div><div class='ctx'> struct snd_timer_system_private {</div><div class='ctx'> 	struct timer_list tlist;</div><div class='add'>+	struct snd_timer *snd_timer;</div><div class='ctx'> 	unsigned long last_expires;</div><div class='ctx'> 	unsigned long last_jiffies;</div><div class='ctx'> 	unsigned long correction;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void snd_timer_s_function(unsigned long data)</div><div class='add'>+static void snd_timer_s_function(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer *timer = (struct snd_timer *)data;</div><div class='del'>-	struct snd_timer_system_private *priv = timer-&gt;private_data;</div><div class='add'>+	struct snd_timer_system_private *priv = timer_container_of(priv, t,</div><div class='add'>+								   tlist);</div><div class='add'>+	struct snd_timer *timer = priv-&gt;snd_timer;</div><div class='ctx'> 	unsigned long jiff = jiffies;</div><div class='ctx'> 	if (time_after(jiff, priv-&gt;last_expires))</div><div class='ctx'> 		priv-&gt;correction += (long)jiff - (long)priv-&gt;last_expires;</div><div class='hunk'>@@ -971,8 +1141,8 @@ static int snd_timer_s_start(struct snd_timer * timer)</div><div class='ctx'> 		njiff += timer-&gt;sticks - priv-&gt;correction;</div><div class='ctx'> 		priv-&gt;correction = 0;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;last_expires = priv-&gt;tlist.expires = njiff;</div><div class='del'>-	add_timer(&amp;priv-&gt;tlist);</div><div class='add'>+	priv-&gt;last_expires = njiff;</div><div class='add'>+	mod_timer(&amp;priv-&gt;tlist, njiff);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -982,7 +1152,7 @@ static int snd_timer_s_stop(struct snd_timer * timer)</div><div class='ctx'> 	unsigned long jiff;</div><div class='ctx'> </div><div class='ctx'> 	priv = (struct snd_timer_system_private *) timer-&gt;private_data;</div><div class='del'>-	del_timer(&amp;priv-&gt;tlist);</div><div class='add'>+	timer_delete(&amp;priv-&gt;tlist);</div><div class='ctx'> 	jiff = jiffies;</div><div class='ctx'> 	if (time_before(jiff, priv-&gt;last_expires))</div><div class='ctx'> 		timer-&gt;sticks = priv-&gt;last_expires - jiff;</div><div class='hunk'>@@ -992,11 +1162,21 @@ static int snd_timer_s_stop(struct snd_timer * timer)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_timer_system =</div><div class='add'>+static int snd_timer_s_close(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	.flags =	SNDRV_TIMER_HW_FIRST | SNDRV_TIMER_HW_TASKLET,</div><div class='del'>-	.resolution =	1000000000L / HZ,</div><div class='add'>+	struct snd_timer_system_private *priv;</div><div class='add'>+</div><div class='add'>+	priv = (struct snd_timer_system_private *)timer-&gt;private_data;</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;tlist);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_timer_hardware snd_timer_system =</div><div class='add'>+{</div><div class='add'>+	.flags =	SNDRV_TIMER_HW_FIRST | SNDRV_TIMER_HW_WORK,</div><div class='add'>+	.resolution =	NSEC_PER_SEC / HZ,</div><div class='ctx'> 	.ticks =	10000000L,</div><div class='add'>+	.close =	snd_timer_s_close,</div><div class='ctx'> 	.start =	snd_timer_s_start,</div><div class='ctx'> 	.stop =		snd_timer_s_stop</div><div class='ctx'> };</div><div class='hunk'>@@ -1015,22 +1195,21 @@ static int snd_timer_register_system(void)</div><div class='ctx'> 	err = snd_timer_global_new("system", SNDRV_TIMER_GLOBAL_SYSTEM, &amp;timer);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(timer-&gt;name, "system timer");</div><div class='add'>+	strscpy(timer-&gt;name, "system timer");</div><div class='ctx'> 	timer-&gt;hw = snd_timer_system;</div><div class='ctx'> 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);</div><div class='ctx'> 	if (priv == NULL) {</div><div class='ctx'> 		snd_timer_free(timer);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	init_timer(&amp;priv-&gt;tlist);</div><div class='del'>-	priv-&gt;tlist.function = snd_timer_s_function;</div><div class='del'>-	priv-&gt;tlist.data = (unsigned long) timer;</div><div class='add'>+	priv-&gt;snd_timer = timer;</div><div class='add'>+	timer_setup(&amp;priv-&gt;tlist, snd_timer_s_function, 0);</div><div class='ctx'> 	timer-&gt;private_data = priv;</div><div class='ctx'> 	timer-&gt;private_free = snd_timer_free_system;</div><div class='ctx'> 	return snd_timer_global_register(timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  Info interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -1040,9 +1219,12 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct snd_timer_instance *ti;</div><div class='add'>+	unsigned long resolution;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='ctx'> 	list_for_each_entry(timer, &amp;snd_timer_list, device_list) {</div><div class='add'>+		if (timer-&gt;card &amp;&amp; timer-&gt;card-&gt;shutdown)</div><div class='add'>+			continue;</div><div class='ctx'> 		switch (timer-&gt;tmr_class) {</div><div class='ctx'> 		case SNDRV_TIMER_CLASS_GLOBAL:</div><div class='ctx'> 			snd_iprintf(buffer, "G%i: ", timer-&gt;tmr_device);</div><div class='hunk'>@@ -1061,10 +1243,12 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 				    timer-&gt;tmr_device, timer-&gt;tmr_subdevice);</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_iprintf(buffer, "%s :", timer-&gt;name);</div><div class='del'>-		if (timer-&gt;hw.resolution)</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;timer-&gt;lock)</div><div class='add'>+			resolution = snd_timer_hw_resolution(timer);</div><div class='add'>+		if (resolution)</div><div class='ctx'> 			snd_iprintf(buffer, " %lu.%03luus (%lu ticks)",</div><div class='del'>-				    timer-&gt;hw.resolution / 1000,</div><div class='del'>-				    timer-&gt;hw.resolution % 1000,</div><div class='add'>+				    resolution / 1000,</div><div class='add'>+				    resolution % 1000,</div><div class='ctx'> 				    timer-&gt;hw.ticks);</div><div class='ctx'> 		if (timer-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 			snd_iprintf(buffer, " SLAVE");</div><div class='hunk'>@@ -1072,11 +1256,10 @@ static void snd_timer_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		list_for_each_entry(ti, &amp;timer-&gt;open_list_head, open_list)</div><div class='ctx'> 			snd_iprintf(buffer, "  Client %s : %s\n",</div><div class='ctx'> 				    ti-&gt;owner ? ti-&gt;owner : "unknown",</div><div class='del'>-				    ti-&gt;flags &amp; (SNDRV_TIMER_IFLG_START |</div><div class='del'>-						 SNDRV_TIMER_IFLG_RUNNING)</div><div class='add'>+				    (ti-&gt;flags &amp; (SNDRV_TIMER_IFLG_START |</div><div class='add'>+						  SNDRV_TIMER_IFLG_RUNNING))</div><div class='ctx'> 				    ? "running" : "stopped");</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_info_entry *snd_timer_proc_entry;</div><div class='hunk'>@@ -1100,7 +1283,7 @@ static void __exit snd_timer_proc_done(void)</div><div class='ctx'> {</div><div class='ctx'> 	snd_info_free_entry(snd_timer_proc_entry);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+#else /* !CONFIG_SND_PROC_FS */</div><div class='ctx'> #define snd_timer_proc_init()</div><div class='ctx'> #define snd_timer_proc_done()</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1117,7 +1300,7 @@ static void snd_timer_user_interrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> 	struct snd_timer_read *r;</div><div class='ctx'> 	int prev;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;tu-&gt;qlock);</div><div class='add'>+	guard(spinlock)(&amp;tu-&gt;qlock);</div><div class='ctx'> 	if (tu-&gt;qused &gt; 0) {</div><div class='ctx'> 		prev = tu-&gt;qtail == 0 ? tu-&gt;queue_size - 1 : tu-&gt;qtail - 1;</div><div class='ctx'> 		r = &amp;tu-&gt;queue[prev];</div><div class='hunk'>@@ -1136,13 +1319,12 @@ static void snd_timer_user_interrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> 		tu-&gt;qused++;</div><div class='ctx'> 	}</div><div class='ctx'>       __wake:</div><div class='del'>-	spin_unlock(&amp;tu-&gt;qlock);</div><div class='del'>-	kill_fasync(&amp;tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+	snd_kill_fasync(tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	wake_up(&amp;tu-&gt;qchange_sleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_timer_user_append_to_tqueue(struct snd_timer_user *tu,</div><div class='del'>-					    struct snd_timer_tread *tread)</div><div class='add'>+					    struct snd_timer_tread64 *tread)</div><div class='ctx'> {</div><div class='ctx'> 	if (tu-&gt;qused &gt;= tu-&gt;queue_size) {</div><div class='ctx'> 		tu-&gt;overrun++;</div><div class='hunk'>@@ -1155,25 +1337,33 @@ static void snd_timer_user_append_to_tqueue(struct snd_timer_user *tu,</div><div class='ctx'> </div><div class='ctx'> static void snd_timer_user_ccallback(struct snd_timer_instance *timeri,</div><div class='ctx'> 				     int event,</div><div class='del'>-				     struct timespec *tstamp,</div><div class='add'>+				     struct timespec64 *tstamp,</div><div class='ctx'> 				     unsigned long resolution)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu = timeri-&gt;callback_data;</div><div class='del'>-	struct snd_timer_tread r1;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_timer_tread64 r1;</div><div class='ctx'> </div><div class='ctx'> 	if (event &gt;= SNDRV_TIMER_EVENT_START &amp;&amp;</div><div class='ctx'> 	    event &lt;= SNDRV_TIMER_EVENT_PAUSE)</div><div class='ctx'> 		tu-&gt;tstamp = *tstamp;</div><div class='ctx'> 	if ((tu-&gt;filter &amp; (1 &lt;&lt; event)) == 0 || !tu-&gt;tread)</div><div class='ctx'> 		return;</div><div class='add'>+	memset(&amp;r1, 0, sizeof(r1));</div><div class='ctx'> 	r1.event = event;</div><div class='del'>-	r1.tstamp = *tstamp;</div><div class='add'>+	r1.tstamp_sec = tstamp-&gt;tv_sec;</div><div class='add'>+	r1.tstamp_nsec = tstamp-&gt;tv_nsec;</div><div class='ctx'> 	r1.val = resolution;</div><div class='del'>-	spin_lock_irqsave(&amp;tu-&gt;qlock, flags);</div><div class='del'>-	snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;tu-&gt;qlock, flags);</div><div class='del'>-	kill_fasync(&amp;tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;tu-&gt;qlock)</div><div class='add'>+		snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='add'>+	snd_kill_fasync(tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+	wake_up(&amp;tu-&gt;qchange_sleep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_timer_user_disconnect(struct snd_timer_instance *timeri)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_user *tu = timeri-&gt;callback_data;</div><div class='add'>+</div><div class='add'>+	tu-&gt;disconnected = true;</div><div class='ctx'> 	wake_up(&amp;tu-&gt;qchange_sleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1182,65 +1372,92 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri,</div><div class='ctx'> 				      unsigned long ticks)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu = timeri-&gt;callback_data;</div><div class='del'>-	struct snd_timer_tread *r, r1;</div><div class='del'>-	struct timespec tstamp;</div><div class='add'>+	struct snd_timer_tread64 *r, r1;</div><div class='add'>+	struct timespec64 tstamp;</div><div class='ctx'> 	int prev, append = 0;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;r1, 0, sizeof(r1));</div><div class='ctx'> 	memset(&amp;tstamp, 0, sizeof(tstamp));</div><div class='del'>-	spin_lock(&amp;tu-&gt;qlock);</div><div class='del'>-	if ((tu-&gt;filter &amp; ((1 &lt;&lt; SNDRV_TIMER_EVENT_RESOLUTION) |</div><div class='del'>-			   (1 &lt;&lt; SNDRV_TIMER_EVENT_TICK))) == 0) {</div><div class='del'>-		spin_unlock(&amp;tu-&gt;qlock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (tu-&gt;last_resolution != resolution || ticks &gt; 0) {</div><div class='del'>-		if (timer_tstamp_monotonic)</div><div class='del'>-			do_posix_clock_monotonic_gettime(&amp;tstamp);</div><div class='del'>-		else</div><div class='del'>-			getnstimeofday(&amp;tstamp);</div><div class='del'>-	}</div><div class='del'>-	if ((tu-&gt;filter &amp; (1 &lt;&lt; SNDRV_TIMER_EVENT_RESOLUTION)) &amp;&amp;</div><div class='del'>-	    tu-&gt;last_resolution != resolution) {</div><div class='del'>-		r1.event = SNDRV_TIMER_EVENT_RESOLUTION;</div><div class='del'>-		r1.tstamp = tstamp;</div><div class='del'>-		r1.val = resolution;</div><div class='del'>-		snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='del'>-		tu-&gt;last_resolution = resolution;</div><div class='del'>-		append++;</div><div class='del'>-	}</div><div class='del'>-	if ((tu-&gt;filter &amp; (1 &lt;&lt; SNDRV_TIMER_EVENT_TICK)) == 0)</div><div class='del'>-		goto __wake;</div><div class='del'>-	if (ticks == 0)</div><div class='del'>-		goto __wake;</div><div class='del'>-	if (tu-&gt;qused &gt; 0) {</div><div class='del'>-		prev = tu-&gt;qtail == 0 ? tu-&gt;queue_size - 1 : tu-&gt;qtail - 1;</div><div class='del'>-		r = &amp;tu-&gt;tqueue[prev];</div><div class='del'>-		if (r-&gt;event == SNDRV_TIMER_EVENT_TICK) {</div><div class='del'>-			r-&gt;tstamp = tstamp;</div><div class='del'>-			r-&gt;val += ticks;</div><div class='add'>+	scoped_guard(spinlock, &amp;tu-&gt;qlock) {</div><div class='add'>+		if ((tu-&gt;filter &amp; ((1 &lt;&lt; SNDRV_TIMER_EVENT_RESOLUTION) |</div><div class='add'>+				   (1 &lt;&lt; SNDRV_TIMER_EVENT_TICK))) == 0)</div><div class='add'>+			return;</div><div class='add'>+		if (tu-&gt;last_resolution != resolution || ticks &gt; 0) {</div><div class='add'>+			if (timer_tstamp_monotonic)</div><div class='add'>+				ktime_get_ts64(&amp;tstamp);</div><div class='add'>+			else</div><div class='add'>+				ktime_get_real_ts64(&amp;tstamp);</div><div class='add'>+		}</div><div class='add'>+		if ((tu-&gt;filter &amp; (1 &lt;&lt; SNDRV_TIMER_EVENT_RESOLUTION)) &amp;&amp;</div><div class='add'>+		    tu-&gt;last_resolution != resolution) {</div><div class='add'>+			r1.event = SNDRV_TIMER_EVENT_RESOLUTION;</div><div class='add'>+			r1.tstamp_sec = tstamp.tv_sec;</div><div class='add'>+			r1.tstamp_nsec = tstamp.tv_nsec;</div><div class='add'>+			r1.val = resolution;</div><div class='add'>+			snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='add'>+			tu-&gt;last_resolution = resolution;</div><div class='ctx'> 			append++;</div><div class='del'>-			goto __wake;</div><div class='ctx'> 		}</div><div class='add'>+		if ((tu-&gt;filter &amp; (1 &lt;&lt; SNDRV_TIMER_EVENT_TICK)) == 0)</div><div class='add'>+			break;</div><div class='add'>+		if (ticks == 0)</div><div class='add'>+			break;</div><div class='add'>+		if (tu-&gt;qused &gt; 0) {</div><div class='add'>+			prev = tu-&gt;qtail == 0 ? tu-&gt;queue_size - 1 : tu-&gt;qtail - 1;</div><div class='add'>+			r = &amp;tu-&gt;tqueue[prev];</div><div class='add'>+			if (r-&gt;event == SNDRV_TIMER_EVENT_TICK) {</div><div class='add'>+				r-&gt;tstamp_sec = tstamp.tv_sec;</div><div class='add'>+				r-&gt;tstamp_nsec = tstamp.tv_nsec;</div><div class='add'>+				r-&gt;val += ticks;</div><div class='add'>+				append++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		r1.event = SNDRV_TIMER_EVENT_TICK;</div><div class='add'>+		r1.tstamp_sec = tstamp.tv_sec;</div><div class='add'>+		r1.tstamp_nsec = tstamp.tv_nsec;</div><div class='add'>+		r1.val = ticks;</div><div class='add'>+		snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='add'>+		append++;</div><div class='ctx'> 	}</div><div class='del'>-	r1.event = SNDRV_TIMER_EVENT_TICK;</div><div class='del'>-	r1.tstamp = tstamp;</div><div class='del'>-	r1.val = ticks;</div><div class='del'>-	snd_timer_user_append_to_tqueue(tu, &amp;r1);</div><div class='del'>-	append++;</div><div class='del'>-      __wake:</div><div class='del'>-	spin_unlock(&amp;tu-&gt;qlock);</div><div class='ctx'> 	if (append == 0)</div><div class='ctx'> 		return;</div><div class='del'>-	kill_fasync(&amp;tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='add'>+	snd_kill_fasync(tu-&gt;fasync, SIGIO, POLL_IN);</div><div class='ctx'> 	wake_up(&amp;tu-&gt;qchange_sleep);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int realloc_user_queue(struct snd_timer_user *tu, int size)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_read *queue = NULL;</div><div class='add'>+	struct snd_timer_tread64 *tqueue = NULL;</div><div class='add'>+</div><div class='add'>+	if (tu-&gt;tread) {</div><div class='add'>+		tqueue = kcalloc(size, sizeof(*tqueue), GFP_KERNEL);</div><div class='add'>+		if (!tqueue)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	} else {</div><div class='add'>+		queue = kcalloc(size, sizeof(*queue), GFP_KERNEL);</div><div class='add'>+		if (!queue)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;tu-&gt;qlock);</div><div class='add'>+	kfree(tu-&gt;queue);</div><div class='add'>+	kfree(tu-&gt;tqueue);</div><div class='add'>+	tu-&gt;queue_size = size;</div><div class='add'>+	tu-&gt;queue = queue;</div><div class='add'>+	tu-&gt;tqueue = tqueue;</div><div class='add'>+	tu-&gt;qhead = tu-&gt;qtail = tu-&gt;qused = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_timer_user_open(struct inode *inode, struct file *file)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = nonseekable_open(inode, file);</div><div class='add'>+	err = stream_open(inode, file);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1249,12 +1466,9 @@ static int snd_timer_user_open(struct inode *inode, struct file *file)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	spin_lock_init(&amp;tu-&gt;qlock);</div><div class='ctx'> 	init_waitqueue_head(&amp;tu-&gt;qchange_sleep);</div><div class='del'>-	mutex_init(&amp;tu-&gt;tread_sem);</div><div class='add'>+	mutex_init(&amp;tu-&gt;ioctl_lock);</div><div class='ctx'> 	tu-&gt;ticks = 1;</div><div class='del'>-	tu-&gt;queue_size = 128;</div><div class='del'>-	tu-&gt;queue = kmalloc(tu-&gt;queue_size * sizeof(struct snd_timer_read),</div><div class='del'>-			    GFP_KERNEL);</div><div class='del'>-	if (tu-&gt;queue == NULL) {</div><div class='add'>+	if (realloc_user_queue(tu, 128) &lt; 0) {</div><div class='ctx'> 		kfree(tu);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1269,8 +1483,13 @@ static int snd_timer_user_release(struct inode *inode, struct file *file)</div><div class='ctx'> 	if (file-&gt;private_data) {</div><div class='ctx'> 		tu = file-&gt;private_data;</div><div class='ctx'> 		file-&gt;private_data = NULL;</div><div class='del'>-		if (tu-&gt;timeri)</div><div class='del'>-			snd_timer_close(tu-&gt;timeri);</div><div class='add'>+		scoped_guard(mutex, &amp;tu-&gt;ioctl_lock) {</div><div class='add'>+			if (tu-&gt;timeri) {</div><div class='add'>+				snd_timer_close(tu-&gt;timeri);</div><div class='add'>+				snd_timer_instance_free(tu-&gt;timeri);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		snd_fasync_free(tu-&gt;fasync);</div><div class='ctx'> 		kfree(tu-&gt;queue);</div><div class='ctx'> 		kfree(tu-&gt;tqueue);</div><div class='ctx'> 		kfree(tu);</div><div class='hunk'>@@ -1296,97 +1515,97 @@ static void snd_timer_user_copy_id(struct snd_timer_id *id, struct snd_timer *ti</div><div class='ctx'> 	id-&gt;subdevice = timer-&gt;tmr_subdevice;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_timer_user_next_device(struct snd_timer_id __user *_tid)</div><div class='add'>+static void get_next_device(struct snd_timer_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer_id id;</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct list_head *p;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;id, _tid, sizeof(id)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	if (id.dev_class &lt; 0) {		/* first item */</div><div class='add'>+	if (id-&gt;dev_class &lt; 0) {		/* first item */</div><div class='ctx'> 		if (list_empty(&amp;snd_timer_list))</div><div class='del'>-			snd_timer_user_zero_id(&amp;id);</div><div class='add'>+			snd_timer_user_zero_id(id);</div><div class='ctx'> 		else {</div><div class='ctx'> 			timer = list_entry(snd_timer_list.next,</div><div class='ctx'> 					   struct snd_timer, device_list);</div><div class='del'>-			snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+			snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		switch (id.dev_class) {</div><div class='add'>+		switch (id-&gt;dev_class) {</div><div class='ctx'> 		case SNDRV_TIMER_CLASS_GLOBAL:</div><div class='del'>-			id.device = id.device &lt; 0 ? 0 : id.device + 1;</div><div class='add'>+			id-&gt;device = id-&gt;device &lt; 0 ? 0 : id-&gt;device + 1;</div><div class='ctx'> 			list_for_each(p, &amp;snd_timer_list) {</div><div class='ctx'> 				timer = list_entry(p, struct snd_timer, device_list);</div><div class='ctx'> 				if (timer-&gt;tmr_class &gt; SNDRV_TIMER_CLASS_GLOBAL) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (timer-&gt;tmr_device &gt;= id.device) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				if (timer-&gt;tmr_device &gt;= id-&gt;device) {</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			if (p == &amp;snd_timer_list)</div><div class='del'>-				snd_timer_user_zero_id(&amp;id);</div><div class='add'>+				snd_timer_user_zero_id(id);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SNDRV_TIMER_CLASS_CARD:</div><div class='ctx'> 		case SNDRV_TIMER_CLASS_PCM:</div><div class='del'>-			if (id.card &lt; 0) {</div><div class='del'>-				id.card = 0;</div><div class='add'>+			if (id-&gt;card &lt; 0) {</div><div class='add'>+				id-&gt;card = 0;</div><div class='ctx'> 			} else {</div><div class='del'>-				if (id.card &lt; 0) {</div><div class='del'>-					id.card = 0;</div><div class='add'>+				if (id-&gt;device &lt; 0) {</div><div class='add'>+					id-&gt;device = 0;</div><div class='ctx'> 				} else {</div><div class='del'>-					if (id.device &lt; 0) {</div><div class='del'>-						id.device = 0;</div><div class='del'>-					} else {</div><div class='del'>-						if (id.subdevice &lt; 0) {</div><div class='del'>-							id.subdevice = 0;</div><div class='del'>-						} else {</div><div class='del'>-							id.subdevice++;</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='add'>+					if (id-&gt;subdevice &lt; 0)</div><div class='add'>+						id-&gt;subdevice = 0;</div><div class='add'>+					else if (id-&gt;subdevice &lt; INT_MAX)</div><div class='add'>+						id-&gt;subdevice++;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			list_for_each(p, &amp;snd_timer_list) {</div><div class='ctx'> 				timer = list_entry(p, struct snd_timer, device_list);</div><div class='del'>-				if (timer-&gt;tmr_class &gt; id.dev_class) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				if (timer-&gt;tmr_class &gt; id-&gt;dev_class) {</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (timer-&gt;tmr_class &lt; id.dev_class)</div><div class='add'>+				if (timer-&gt;tmr_class &lt; id-&gt;dev_class)</div><div class='ctx'> 					continue;</div><div class='del'>-				if (timer-&gt;card-&gt;number &gt; id.card) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				if (timer-&gt;card-&gt;number &gt; id-&gt;card) {</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (timer-&gt;card-&gt;number &lt; id.card)</div><div class='add'>+				if (timer-&gt;card-&gt;number &lt; id-&gt;card)</div><div class='ctx'> 					continue;</div><div class='del'>-				if (timer-&gt;tmr_device &gt; id.device) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				if (timer-&gt;tmr_device &gt; id-&gt;device) {</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (timer-&gt;tmr_device &lt; id.device)</div><div class='add'>+				if (timer-&gt;tmr_device &lt; id-&gt;device)</div><div class='ctx'> 					continue;</div><div class='del'>-				if (timer-&gt;tmr_subdevice &gt; id.subdevice) {</div><div class='del'>-					snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				if (timer-&gt;tmr_subdevice &gt; id-&gt;subdevice) {</div><div class='add'>+					snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				if (timer-&gt;tmr_subdevice &lt; id.subdevice)</div><div class='add'>+				if (timer-&gt;tmr_subdevice &lt; id-&gt;subdevice)</div><div class='ctx'> 					continue;</div><div class='del'>-				snd_timer_user_copy_id(&amp;id, timer);</div><div class='add'>+				snd_timer_user_copy_id(id, timer);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (p == &amp;snd_timer_list)</div><div class='del'>-				snd_timer_user_zero_id(&amp;id);</div><div class='add'>+				snd_timer_user_zero_id(id);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_timer_user_zero_id(&amp;id);</div><div class='add'>+			snd_timer_user_zero_id(id);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_timer_user_next_device(struct snd_timer_id __user *_tid)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_id id;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;id, _tid, sizeof(id)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex)</div><div class='add'>+		get_next_device(&amp;id);</div><div class='ctx'> 	if (copy_to_user(_tid, &amp;id, sizeof(*_tid)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1395,11 +1614,10 @@ static int snd_timer_user_next_device(struct snd_timer_id __user *_tid)</div><div class='ctx'> static int snd_timer_user_ginfo(struct file *file,</div><div class='ctx'> 				struct snd_timer_ginfo __user *_ginfo)</div><div class='ctx'> {</div><div class='del'>-	struct snd_timer_ginfo *ginfo;</div><div class='add'>+	struct snd_timer_ginfo *ginfo __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='ctx'> 	struct snd_timer *t;</div><div class='ctx'> 	struct list_head *p;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	ginfo = memdup_user(_ginfo, sizeof(*ginfo));</div><div class='ctx'> 	if (IS_ERR(ginfo))</div><div class='hunk'>@@ -1408,15 +1626,17 @@ static int snd_timer_user_ginfo(struct file *file,</div><div class='ctx'> 	tid = ginfo-&gt;tid;</div><div class='ctx'> 	memset(ginfo, 0, sizeof(*ginfo));</div><div class='ctx'> 	ginfo-&gt;tid = tid;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	t = snd_timer_find(&amp;tid);</div><div class='del'>-	if (t != NULL) {</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		t = snd_timer_find(&amp;tid);</div><div class='add'>+		if (!t)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		ginfo-&gt;card = t-&gt;card ? t-&gt;card-&gt;number : -1;</div><div class='ctx'> 		if (t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 			ginfo-&gt;flags |= SNDRV_TIMER_FLG_SLAVE;</div><div class='del'>-		strlcpy(ginfo-&gt;id, t-&gt;id, sizeof(ginfo-&gt;id));</div><div class='del'>-		strlcpy(ginfo-&gt;name, t-&gt;name, sizeof(ginfo-&gt;name));</div><div class='del'>-		ginfo-&gt;resolution = t-&gt;hw.resolution;</div><div class='add'>+		strscpy(ginfo-&gt;id, t-&gt;id, sizeof(ginfo-&gt;id));</div><div class='add'>+		strscpy(ginfo-&gt;name, t-&gt;name, sizeof(ginfo-&gt;name));</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;t-&gt;lock)</div><div class='add'>+			ginfo-&gt;resolution = snd_timer_hw_resolution(t);</div><div class='ctx'> 		if (t-&gt;hw.resolution_min &gt; 0) {</div><div class='ctx'> 			ginfo-&gt;resolution_min = t-&gt;hw.resolution_min;</div><div class='ctx'> 			ginfo-&gt;resolution_max = t-&gt;hw.resolution_max;</div><div class='hunk'>@@ -1424,43 +1644,35 @@ static int snd_timer_user_ginfo(struct file *file,</div><div class='ctx'> 		list_for_each(p, &amp;t-&gt;open_list_head) {</div><div class='ctx'> 			ginfo-&gt;clients++;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	if (err &gt;= 0 &amp;&amp; copy_to_user(_ginfo, ginfo, sizeof(*ginfo)))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	kfree(ginfo);</div><div class='del'>-	return err;</div><div class='add'>+	if (copy_to_user(_ginfo, ginfo, sizeof(*ginfo)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int timer_set_gparams(struct snd_timer_gparams *gparams)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer *t;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;register_mutex);</div><div class='add'>+	t = snd_timer_find(&amp;gparams-&gt;tid);</div><div class='add'>+	if (!t)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!list_empty(&amp;t-&gt;open_list_head))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!t-&gt;hw.set_period)</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+	return t-&gt;hw.set_period(t, gparams-&gt;period_num, gparams-&gt;period_den);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_gparams(struct file *file,</div><div class='ctx'> 				  struct snd_timer_gparams __user *_gparams)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_gparams gparams;</div><div class='del'>-	struct snd_timer *t;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;gparams, _gparams, sizeof(gparams)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	t = snd_timer_find(&amp;gparams.tid);</div><div class='del'>-	if (!t) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto _error;</div><div class='del'>-	}</div><div class='del'>-	if (!list_empty(&amp;t-&gt;open_list_head)) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto _error;</div><div class='del'>-	}</div><div class='del'>-	if (!t-&gt;hw.set_period) {</div><div class='del'>-		err = -ENOSYS;</div><div class='del'>-		goto _error;</div><div class='del'>-	}</div><div class='del'>-	err = t-&gt;hw.set_period(t, gparams.period_num, gparams.period_den);</div><div class='del'>-_error:</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	return err;</div><div class='add'>+	return timer_set_gparams(&amp;gparams);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_gstatus(struct file *file,</div><div class='hunk'>@@ -1469,34 +1681,31 @@ static int snd_timer_user_gstatus(struct file *file,</div><div class='ctx'> 	struct snd_timer_gstatus gstatus;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='ctx'> 	struct snd_timer *t;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;gstatus, _gstatus, sizeof(gstatus)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	tid = gstatus.tid;</div><div class='ctx'> 	memset(&amp;gstatus, 0, sizeof(gstatus));</div><div class='ctx'> 	gstatus.tid = tid;</div><div class='del'>-	mutex_lock(&amp;register_mutex);</div><div class='del'>-	t = snd_timer_find(&amp;tid);</div><div class='del'>-	if (t != NULL) {</div><div class='del'>-		if (t-&gt;hw.c_resolution)</div><div class='del'>-			gstatus.resolution = t-&gt;hw.c_resolution(t);</div><div class='del'>-		else</div><div class='del'>-			gstatus.resolution = t-&gt;hw.resolution;</div><div class='del'>-		if (t-&gt;hw.precise_resolution) {</div><div class='del'>-			t-&gt;hw.precise_resolution(t, &amp;gstatus.resolution_num,</div><div class='del'>-						 &amp;gstatus.resolution_den);</div><div class='add'>+	scoped_guard(mutex, &amp;register_mutex) {</div><div class='add'>+		t = snd_timer_find(&amp;tid);</div><div class='add'>+		if (t != NULL) {</div><div class='add'>+			guard(spinlock_irq)(&amp;t-&gt;lock);</div><div class='add'>+			gstatus.resolution = snd_timer_hw_resolution(t);</div><div class='add'>+			if (t-&gt;hw.precise_resolution) {</div><div class='add'>+				t-&gt;hw.precise_resolution(t, &amp;gstatus.resolution_num,</div><div class='add'>+							 &amp;gstatus.resolution_den);</div><div class='add'>+			} else {</div><div class='add'>+				gstatus.resolution_num = gstatus.resolution;</div><div class='add'>+				gstatus.resolution_den = 1000000000uL;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			gstatus.resolution_num = gstatus.resolution;</div><div class='del'>-			gstatus.resolution_den = 1000000000uL;</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		err = -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;register_mutex);</div><div class='del'>-	if (err &gt;= 0 &amp;&amp; copy_to_user(_gstatus, &amp;gstatus, sizeof(gstatus)))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	return err;</div><div class='add'>+	if (copy_to_user(_gstatus, &amp;gstatus, sizeof(gstatus)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_tselect(struct file *file,</div><div class='hunk'>@@ -1508,9 +1717,9 @@ static int snd_timer_user_tselect(struct file *file,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='del'>-	mutex_lock(&amp;tu-&gt;tread_sem);</div><div class='ctx'> 	if (tu-&gt;timeri) {</div><div class='ctx'> 		snd_timer_close(tu-&gt;timeri);</div><div class='add'>+		snd_timer_instance_free(tu-&gt;timeri);</div><div class='ctx'> 		tu-&gt;timeri = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (copy_from_user(&amp;tselect, _tselect, sizeof(tselect))) {</div><div class='hunk'>@@ -1520,39 +1729,26 @@ static int snd_timer_user_tselect(struct file *file,</div><div class='ctx'> 	sprintf(str, "application %i", current-&gt;pid);</div><div class='ctx'> 	if (tselect.id.dev_class != SNDRV_TIMER_CLASS_SLAVE)</div><div class='ctx'> 		tselect.id.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION;</div><div class='del'>-	err = snd_timer_open(&amp;tu-&gt;timeri, str, &amp;tselect.id, current-&gt;pid);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	tu-&gt;timeri = snd_timer_instance_new(str);</div><div class='add'>+	if (!tu-&gt;timeri) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto __err;</div><div class='del'>-</div><div class='del'>-	kfree(tu-&gt;queue);</div><div class='del'>-	tu-&gt;queue = NULL;</div><div class='del'>-	kfree(tu-&gt;tqueue);</div><div class='del'>-	tu-&gt;tqueue = NULL;</div><div class='del'>-	if (tu-&gt;tread) {</div><div class='del'>-		tu-&gt;tqueue = kmalloc(tu-&gt;queue_size * sizeof(struct snd_timer_tread),</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-		if (tu-&gt;tqueue == NULL)</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-	} else {</div><div class='del'>-		tu-&gt;queue = kmalloc(tu-&gt;queue_size * sizeof(struct snd_timer_read),</div><div class='del'>-				    GFP_KERNEL);</div><div class='del'>-		if (tu-&gt;queue == NULL)</div><div class='del'>-			err = -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-      	if (err &lt; 0) {</div><div class='del'>-		snd_timer_close(tu-&gt;timeri);</div><div class='del'>-      		tu-&gt;timeri = NULL;</div><div class='del'>-      	} else {</div><div class='del'>-		tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_FAST;</div><div class='del'>-		tu-&gt;timeri-&gt;callback = tu-&gt;tread</div><div class='add'>+	tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_FAST;</div><div class='add'>+	tu-&gt;timeri-&gt;callback = tu-&gt;tread</div><div class='ctx'> 			? snd_timer_user_tinterrupt : snd_timer_user_interrupt;</div><div class='del'>-		tu-&gt;timeri-&gt;ccallback = snd_timer_user_ccallback;</div><div class='del'>-		tu-&gt;timeri-&gt;callback_data = (void *)tu;</div><div class='add'>+	tu-&gt;timeri-&gt;ccallback = snd_timer_user_ccallback;</div><div class='add'>+	tu-&gt;timeri-&gt;callback_data = (void *)tu;</div><div class='add'>+	tu-&gt;timeri-&gt;disconnect = snd_timer_user_disconnect;</div><div class='add'>+</div><div class='add'>+	err = snd_timer_open(tu-&gt;timeri, &amp;tselect.id, current-&gt;pid);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_timer_instance_free(tu-&gt;timeri);</div><div class='add'>+		tu-&gt;timeri = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       __err:</div><div class='del'>-      	mutex_unlock(&amp;tu-&gt;tread_sem);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1560,9 +1756,8 @@ static int snd_timer_user_info(struct file *file,</div><div class='ctx'> 			       struct snd_timer_info __user *_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='del'>-	struct snd_timer_info *info;</div><div class='add'>+	struct snd_timer_info *info __free(kfree) = NULL;</div><div class='ctx'> 	struct snd_timer *t;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='ctx'> 	if (!tu-&gt;timeri)</div><div class='hunk'>@@ -1577,13 +1772,13 @@ static int snd_timer_user_info(struct file *file,</div><div class='ctx'> 	info-&gt;card = t-&gt;card ? t-&gt;card-&gt;number : -1;</div><div class='ctx'> 	if (t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 		info-&gt;flags |= SNDRV_TIMER_FLG_SLAVE;</div><div class='del'>-	strlcpy(info-&gt;id, t-&gt;id, sizeof(info-&gt;id));</div><div class='del'>-	strlcpy(info-&gt;name, t-&gt;name, sizeof(info-&gt;name));</div><div class='del'>-	info-&gt;resolution = t-&gt;hw.resolution;</div><div class='add'>+	strscpy(info-&gt;id, t-&gt;id, sizeof(info-&gt;id));</div><div class='add'>+	strscpy(info-&gt;name, t-&gt;name, sizeof(info-&gt;name));</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;t-&gt;lock)</div><div class='add'>+		info-&gt;resolution = snd_timer_hw_resolution(t);</div><div class='ctx'> 	if (copy_to_user(_info, info, sizeof(*_info)))</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-	kfree(info);</div><div class='del'>-	return err;</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_params(struct file *file,</div><div class='hunk'>@@ -1592,8 +1787,6 @@ static int snd_timer_user_params(struct file *file,</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='ctx'> 	struct snd_timer_params params;</div><div class='ctx'> 	struct snd_timer *t;</div><div class='del'>-	struct snd_timer_read *tr;</div><div class='del'>-	struct snd_timer_tread *ttr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='hunk'>@@ -1604,9 +1797,21 @@ static int snd_timer_user_params(struct file *file,</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	if (copy_from_user(&amp;params, _params, sizeof(params)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (!(t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE) &amp;&amp; params.ticks &lt; 1) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto _end;</div><div class='add'>+	if (!(t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)) {</div><div class='add'>+		u64 resolution;</div><div class='add'>+</div><div class='add'>+		if (params.ticks &lt; 1) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto _end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Don't allow resolution less than 1ms */</div><div class='add'>+		resolution = snd_timer_resolution(tu-&gt;timeri);</div><div class='add'>+		resolution *= params.ticks;</div><div class='add'>+		if (resolution &lt; 1000000) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto _end;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (params.queue_size &gt; 0 &amp;&amp;</div><div class='ctx'> 	    (params.queue_size &lt; 32 || params.queue_size &gt; 1024)) {</div><div class='hunk'>@@ -1631,56 +1836,47 @@ static int snd_timer_user_params(struct file *file,</div><div class='ctx'> 		goto _end;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_timer_stop(tu-&gt;timeri);</div><div class='del'>-	spin_lock_irq(&amp;t-&gt;lock);</div><div class='del'>-	tu-&gt;timeri-&gt;flags &amp;= ~(SNDRV_TIMER_IFLG_AUTO|</div><div class='del'>-			       SNDRV_TIMER_IFLG_EXCLUSIVE|</div><div class='del'>-			       SNDRV_TIMER_IFLG_EARLY_EVENT);</div><div class='del'>-	if (params.flags &amp; SNDRV_TIMER_PSFLG_AUTO)</div><div class='del'>-		tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_AUTO;</div><div class='del'>-	if (params.flags &amp; SNDRV_TIMER_PSFLG_EXCLUSIVE)</div><div class='del'>-		tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_EXCLUSIVE;</div><div class='del'>-	if (params.flags &amp; SNDRV_TIMER_PSFLG_EARLY_EVENT)</div><div class='del'>-		tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_EARLY_EVENT;</div><div class='del'>-	spin_unlock_irq(&amp;t-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;t-&gt;lock) {</div><div class='add'>+		tu-&gt;timeri-&gt;flags &amp;= ~(SNDRV_TIMER_IFLG_AUTO|</div><div class='add'>+				       SNDRV_TIMER_IFLG_EXCLUSIVE|</div><div class='add'>+				       SNDRV_TIMER_IFLG_EARLY_EVENT);</div><div class='add'>+		if (params.flags &amp; SNDRV_TIMER_PSFLG_AUTO)</div><div class='add'>+			tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_AUTO;</div><div class='add'>+		if (params.flags &amp; SNDRV_TIMER_PSFLG_EXCLUSIVE)</div><div class='add'>+			tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_EXCLUSIVE;</div><div class='add'>+		if (params.flags &amp; SNDRV_TIMER_PSFLG_EARLY_EVENT)</div><div class='add'>+			tu-&gt;timeri-&gt;flags |= SNDRV_TIMER_IFLG_EARLY_EVENT;</div><div class='add'>+	}</div><div class='ctx'> 	if (params.queue_size &gt; 0 &amp;&amp;</div><div class='ctx'> 	    (unsigned int)tu-&gt;queue_size != params.queue_size) {</div><div class='del'>-		if (tu-&gt;tread) {</div><div class='del'>-			ttr = kmalloc(params.queue_size * sizeof(*ttr),</div><div class='del'>-				      GFP_KERNEL);</div><div class='del'>-			if (ttr) {</div><div class='del'>-				kfree(tu-&gt;tqueue);</div><div class='del'>-				tu-&gt;queue_size = params.queue_size;</div><div class='del'>-				tu-&gt;tqueue = ttr;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			tr = kmalloc(params.queue_size * sizeof(*tr),</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-			if (tr) {</div><div class='del'>-				kfree(tu-&gt;queue);</div><div class='del'>-				tu-&gt;queue_size = params.queue_size;</div><div class='del'>-				tu-&gt;queue = tr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		err = realloc_user_queue(tu, params.queue_size);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto _end;</div><div class='ctx'> 	}</div><div class='del'>-	tu-&gt;qhead = tu-&gt;qtail = tu-&gt;qused = 0;</div><div class='del'>-	if (tu-&gt;timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_EARLY_EVENT) {</div><div class='del'>-		if (tu-&gt;tread) {</div><div class='del'>-			struct snd_timer_tread tread;</div><div class='del'>-			tread.event = SNDRV_TIMER_EVENT_EARLY;</div><div class='del'>-			tread.tstamp.tv_sec = 0;</div><div class='del'>-			tread.tstamp.tv_nsec = 0;</div><div class='del'>-			tread.val = 0;</div><div class='del'>-			snd_timer_user_append_to_tqueue(tu, &amp;tread);</div><div class='del'>-		} else {</div><div class='del'>-			struct snd_timer_read *r = &amp;tu-&gt;queue[0];</div><div class='del'>-			r-&gt;resolution = 0;</div><div class='del'>-			r-&gt;ticks = 0;</div><div class='del'>-			tu-&gt;qused++;</div><div class='del'>-			tu-&gt;qtail++;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;tu-&gt;qlock) {</div><div class='add'>+		tu-&gt;qhead = tu-&gt;qtail = tu-&gt;qused = 0;</div><div class='add'>+		if (tu-&gt;timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_EARLY_EVENT) {</div><div class='add'>+			if (tu-&gt;tread) {</div><div class='add'>+				struct snd_timer_tread64 tread;</div><div class='add'>+</div><div class='add'>+				memset(&amp;tread, 0, sizeof(tread));</div><div class='add'>+				tread.event = SNDRV_TIMER_EVENT_EARLY;</div><div class='add'>+				tread.tstamp_sec = 0;</div><div class='add'>+				tread.tstamp_nsec = 0;</div><div class='add'>+				tread.val = 0;</div><div class='add'>+				snd_timer_user_append_to_tqueue(tu, &amp;tread);</div><div class='add'>+			} else {</div><div class='add'>+				struct snd_timer_read *r = &amp;tu-&gt;queue[0];</div><div class='add'>+</div><div class='add'>+				r-&gt;resolution = 0;</div><div class='add'>+				r-&gt;ticks = 0;</div><div class='add'>+				tu-&gt;qused++;</div><div class='add'>+				tu-&gt;qtail++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		tu-&gt;filter = params.filter;</div><div class='add'>+		tu-&gt;ticks = params.ticks;</div><div class='ctx'> 	}</div><div class='del'>-	tu-&gt;filter = params.filter;</div><div class='del'>-	tu-&gt;ticks = params.ticks;</div><div class='ctx'> 	err = 0;</div><div class='ctx'>  _end:</div><div class='ctx'> 	if (copy_to_user(_params, &amp;params, sizeof(params)))</div><div class='hunk'>@@ -1688,23 +1884,45 @@ static int snd_timer_user_params(struct file *file,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_timer_user_status(struct file *file,</div><div class='del'>-				 struct snd_timer_status __user *_status)</div><div class='add'>+static int snd_timer_user_status32(struct file *file,</div><div class='add'>+				   struct snd_timer_status32 __user *_status)</div><div class='add'>+ {</div><div class='add'>+	struct snd_timer_user *tu;</div><div class='add'>+	struct snd_timer_status32 status;</div><div class='add'>+</div><div class='add'>+	tu = file-&gt;private_data;</div><div class='add'>+	if (!tu-&gt;timeri)</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	memset(&amp;status, 0, sizeof(status));</div><div class='add'>+	status.tstamp_sec = tu-&gt;tstamp.tv_sec;</div><div class='add'>+	status.tstamp_nsec = tu-&gt;tstamp.tv_nsec;</div><div class='add'>+	status.resolution = snd_timer_resolution(tu-&gt;timeri);</div><div class='add'>+	status.lost = tu-&gt;timeri-&gt;lost;</div><div class='add'>+	status.overrun = tu-&gt;overrun;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;tu-&gt;qlock)</div><div class='add'>+		status.queue = tu-&gt;qused;</div><div class='add'>+	if (copy_to_user(_status, &amp;status, sizeof(status)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_timer_user_status64(struct file *file,</div><div class='add'>+				   struct snd_timer_status64 __user *_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='del'>-	struct snd_timer_status status;</div><div class='add'>+	struct snd_timer_status64 status;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='ctx'> 	if (!tu-&gt;timeri)</div><div class='ctx'> 		return -EBADFD;</div><div class='ctx'> 	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-	status.tstamp = tu-&gt;tstamp;</div><div class='add'>+	status.tstamp_sec = tu-&gt;tstamp.tv_sec;</div><div class='add'>+	status.tstamp_nsec = tu-&gt;tstamp.tv_nsec;</div><div class='ctx'> 	status.resolution = snd_timer_resolution(tu-&gt;timeri);</div><div class='ctx'> 	status.lost = tu-&gt;timeri-&gt;lost;</div><div class='ctx'> 	status.overrun = tu-&gt;overrun;</div><div class='del'>-	spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='del'>-	status.queue = tu-&gt;qused;</div><div class='del'>-	spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;tu-&gt;qlock)</div><div class='add'>+		status.queue = tu-&gt;qused;</div><div class='ctx'> 	if (copy_to_user(_status, &amp;status, sizeof(status)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1721,7 +1939,10 @@ static int snd_timer_user_start(struct file *file)</div><div class='ctx'> 	snd_timer_stop(tu-&gt;timeri);</div><div class='ctx'> 	tu-&gt;timeri-&gt;lost = 0;</div><div class='ctx'> 	tu-&gt;last_resolution = 0;</div><div class='del'>-	return (err = snd_timer_start(tu-&gt;timeri, tu-&gt;ticks)) &lt; 0 ? err : 0;</div><div class='add'>+	err = snd_timer_start(tu-&gt;timeri, tu-&gt;ticks);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_stop(struct file *file)</div><div class='hunk'>@@ -1732,7 +1953,10 @@ static int snd_timer_user_stop(struct file *file)</div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='ctx'> 	if (!tu-&gt;timeri)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	return (err = snd_timer_stop(tu-&gt;timeri)) &lt; 0 ? err : 0;</div><div class='add'>+	err = snd_timer_stop(tu-&gt;timeri);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_continue(struct file *file)</div><div class='hunk'>@@ -1743,8 +1967,14 @@ static int snd_timer_user_continue(struct file *file)</div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='ctx'> 	if (!tu-&gt;timeri)</div><div class='ctx'> 		return -EBADFD;</div><div class='add'>+	/* start timer instead of continue if it's not used before */</div><div class='add'>+	if (!(tu-&gt;timeri-&gt;flags &amp; SNDRV_TIMER_IFLG_PAUSED))</div><div class='add'>+		return snd_timer_user_start(file);</div><div class='ctx'> 	tu-&gt;timeri-&gt;lost = 0;</div><div class='del'>-	return (err = snd_timer_continue(tu-&gt;timeri)) &lt; 0 ? err : 0;</div><div class='add'>+	err = snd_timer_continue(tu-&gt;timeri);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_timer_user_pause(struct file *file)</div><div class='hunk'>@@ -1755,7 +1985,40 @@ static int snd_timer_user_pause(struct file *file)</div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='ctx'> 	if (!tu-&gt;timeri)</div><div class='ctx'> 		return -EBADFD;</div><div class='del'>-	return (err = snd_timer_pause(tu-&gt;timeri)) &lt; 0 ? err : 0;</div><div class='add'>+	err = snd_timer_pause(tu-&gt;timeri);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_timer_user_tread(void __user *argp, struct snd_timer_user *tu,</div><div class='add'>+				unsigned int cmd, bool compat)</div><div class='add'>+{</div><div class='add'>+	int __user *p = argp;</div><div class='add'>+	int xarg, old_tread;</div><div class='add'>+</div><div class='add'>+	if (tu-&gt;timeri)	/* too late */</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (get_user(xarg, p))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	old_tread = tu-&gt;tread;</div><div class='add'>+</div><div class='add'>+	if (!xarg)</div><div class='add'>+		tu-&gt;tread = TREAD_FORMAT_NONE;</div><div class='add'>+	else if (cmd == SNDRV_TIMER_IOCTL_TREAD64 ||</div><div class='add'>+		 (IS_ENABLED(CONFIG_64BIT) &amp;&amp; !compat))</div><div class='add'>+		tu-&gt;tread = TREAD_FORMAT_TIME64;</div><div class='add'>+	else</div><div class='add'>+		tu-&gt;tread = TREAD_FORMAT_TIME32;</div><div class='add'>+</div><div class='add'>+	if (tu-&gt;tread != old_tread &amp;&amp;</div><div class='add'>+	    realloc_user_queue(tu, tu-&gt;queue_size) &lt; 0) {</div><div class='add'>+		tu-&gt;tread = old_tread;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -1765,8 +2028,219 @@ enum {</div><div class='ctx'> 	SNDRV_TIMER_IOCTL_PAUSE_OLD = _IO('T', 0x23),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='del'>-				 unsigned long arg)</div><div class='add'>+#ifdef CONFIG_SND_UTIMER</div><div class='add'>+/*</div><div class='add'>+ * Since userspace-driven timers are passed to userspace, we need to have an identifier</div><div class='add'>+ * which will allow us to use them (basically, the subdevice number of udriven timer).</div><div class='add'>+ */</div><div class='add'>+static DEFINE_IDA(snd_utimer_ids);</div><div class='add'>+</div><div class='add'>+static void snd_utimer_put_id(struct snd_utimer *utimer)</div><div class='add'>+{</div><div class='add'>+	int timer_id = utimer-&gt;id;</div><div class='add'>+</div><div class='add'>+	snd_BUG_ON(timer_id &lt; 0 || timer_id &gt;= SNDRV_UTIMERS_MAX_COUNT);</div><div class='add'>+	ida_free(&amp;snd_utimer_ids, timer_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_take_id(void)</div><div class='add'>+{</div><div class='add'>+	return ida_alloc_max(&amp;snd_utimer_ids, SNDRV_UTIMERS_MAX_COUNT - 1, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_utimer_free(struct snd_utimer *utimer)</div><div class='add'>+{</div><div class='add'>+	snd_timer_free(utimer-&gt;timer);</div><div class='add'>+	snd_utimer_put_id(utimer);</div><div class='add'>+	kfree(utimer-&gt;name);</div><div class='add'>+	kfree(utimer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_release(struct inode *inode, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_utimer *utimer = (struct snd_utimer *)file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_utimer_free(utimer);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_trigger(struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_utimer *utimer = (struct snd_utimer *)file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_timer_interrupt(utimer-&gt;timer, utimer-&gt;timer-&gt;sticks);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long snd_utimer_ioctl(struct file *file, unsigned int ioctl, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	switch (ioctl) {</div><div class='add'>+	case SNDRV_TIMER_IOCTL_TRIGGER:</div><div class='add'>+		return snd_utimer_trigger(file);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations snd_utimer_fops = {</div><div class='add'>+	.llseek = noop_llseek,</div><div class='add'>+	.release = snd_utimer_release,</div><div class='add'>+	.unlocked_ioctl = snd_utimer_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_utimer_start(struct snd_timer *t)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_stop(struct snd_timer *t)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_open(struct snd_timer *t)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_close(struct snd_timer *t)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_timer_hardware timer_hw = {</div><div class='add'>+	.flags = SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_WORK,</div><div class='add'>+	.open = snd_utimer_open,</div><div class='add'>+	.close = snd_utimer_close,</div><div class='add'>+	.start = snd_utimer_start,</div><div class='add'>+	.stop = snd_utimer_stop,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_utimer_create(struct snd_timer_uinfo *utimer_info,</div><div class='add'>+			     struct snd_utimer **r_utimer)</div><div class='add'>+{</div><div class='add'>+	struct snd_utimer *utimer;</div><div class='add'>+	struct snd_timer *timer;</div><div class='add'>+	struct snd_timer_id tid;</div><div class='add'>+	int utimer_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!utimer_info || utimer_info-&gt;resolution == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	utimer = kzalloc(sizeof(*utimer), GFP_KERNEL);</div><div class='add'>+	if (!utimer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* We hold the ioctl lock here so we won't get a race condition when allocating id */</div><div class='add'>+	utimer_id = snd_utimer_take_id();</div><div class='add'>+	if (utimer_id &lt; 0) {</div><div class='add'>+		err = utimer_id;</div><div class='add'>+		goto err_take_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	utimer-&gt;id = utimer_id;</div><div class='add'>+</div><div class='add'>+	utimer-&gt;name = kasprintf(GFP_KERNEL, "snd-utimer%d", utimer_id);</div><div class='add'>+	if (!utimer-&gt;name) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_get_name;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tid.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION;</div><div class='add'>+	tid.dev_class = SNDRV_TIMER_CLASS_GLOBAL;</div><div class='add'>+	tid.card = -1;</div><div class='add'>+	tid.device = SNDRV_TIMER_GLOBAL_UDRIVEN;</div><div class='add'>+	tid.subdevice = utimer_id;</div><div class='add'>+</div><div class='add'>+	err = snd_timer_new(NULL, utimer-&gt;name, &amp;tid, &amp;timer);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("Can't create userspace-driven timer\n");</div><div class='add'>+		goto err_timer_new;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timer-&gt;module = THIS_MODULE;</div><div class='add'>+	timer-&gt;hw = timer_hw;</div><div class='add'>+	timer-&gt;hw.resolution = utimer_info-&gt;resolution;</div><div class='add'>+	timer-&gt;hw.ticks = 1;</div><div class='add'>+	timer-&gt;max_instances = MAX_SLAVE_INSTANCES;</div><div class='add'>+</div><div class='add'>+	utimer-&gt;timer = timer;</div><div class='add'>+</div><div class='add'>+	err = snd_timer_global_register(timer);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("Can't register a userspace-driven timer\n");</div><div class='add'>+		goto err_timer_reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*r_utimer = utimer;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_timer_reg:</div><div class='add'>+	snd_timer_free(timer);</div><div class='add'>+err_timer_new:</div><div class='add'>+	kfree(utimer-&gt;name);</div><div class='add'>+err_get_name:</div><div class='add'>+	snd_utimer_put_id(utimer);</div><div class='add'>+err_take_id:</div><div class='add'>+	kfree(utimer);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_utimer_ioctl_create(struct file *file,</div><div class='add'>+				   struct snd_timer_uinfo __user *_utimer_info)</div><div class='add'>+{</div><div class='add'>+	struct snd_utimer *utimer;</div><div class='add'>+	struct snd_timer_uinfo *utimer_info __free(kfree) = NULL;</div><div class='add'>+	int err, timer_fd;</div><div class='add'>+</div><div class='add'>+	utimer_info = memdup_user(_utimer_info, sizeof(*utimer_info));</div><div class='add'>+	if (IS_ERR(utimer_info))</div><div class='add'>+		return PTR_ERR(utimer_info);</div><div class='add'>+</div><div class='add'>+	err = snd_utimer_create(utimer_info, &amp;utimer);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	utimer_info-&gt;id = utimer-&gt;id;</div><div class='add'>+</div><div class='add'>+	timer_fd = anon_inode_getfd(utimer-&gt;name, &amp;snd_utimer_fops, utimer, O_RDWR | O_CLOEXEC);</div><div class='add'>+	if (timer_fd &lt; 0) {</div><div class='add'>+		snd_utimer_free(utimer);</div><div class='add'>+		return timer_fd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	utimer_info-&gt;fd = timer_fd;</div><div class='add'>+</div><div class='add'>+	err = copy_to_user(_utimer_info, utimer_info, sizeof(*utimer_info));</div><div class='add'>+	if (err) {</div><div class='add'>+		/*</div><div class='add'>+		 * "Leak" the fd, as there is nothing we can do about it.</div><div class='add'>+		 * It might have been closed already since anon_inode_getfd</div><div class='add'>+		 * makes it available for userspace.</div><div class='add'>+		 *</div><div class='add'>+		 * We have to rely on the process exit path to do any</div><div class='add'>+		 * necessary cleanup (e.g. releasing the file).</div><div class='add'>+		 */</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static int snd_utimer_ioctl_create(struct file *file,</div><div class='add'>+				   struct snd_timer_uinfo __user *_utimer_info)</div><div class='add'>+{</div><div class='add'>+	return -ENOTTY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static long __snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				 unsigned long arg, bool compat)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='ctx'> 	void __user *argp = (void __user *)arg;</div><div class='hunk'>@@ -1778,23 +2252,9 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		return put_user(SNDRV_TIMER_VERSION, p) ? -EFAULT : 0;</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_NEXT_DEVICE:</div><div class='ctx'> 		return snd_timer_user_next_device(argp);</div><div class='del'>-	case SNDRV_TIMER_IOCTL_TREAD:</div><div class='del'>-	{</div><div class='del'>-		int xarg;</div><div class='del'>-</div><div class='del'>-		mutex_lock(&amp;tu-&gt;tread_sem);</div><div class='del'>-		if (tu-&gt;timeri)	{	/* too late */</div><div class='del'>-			mutex_unlock(&amp;tu-&gt;tread_sem);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		if (get_user(xarg, p)) {</div><div class='del'>-			mutex_unlock(&amp;tu-&gt;tread_sem);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		tu-&gt;tread = xarg ? 1 : 0;</div><div class='del'>-		mutex_unlock(&amp;tu-&gt;tread_sem);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	case SNDRV_TIMER_IOCTL_TREAD_OLD:</div><div class='add'>+	case SNDRV_TIMER_IOCTL_TREAD64:</div><div class='add'>+		return snd_timer_user_tread(argp, tu, cmd, compat);</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_GINFO:</div><div class='ctx'> 		return snd_timer_user_ginfo(file, argp);</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_GPARAMS:</div><div class='hunk'>@@ -1807,8 +2267,10 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 		return snd_timer_user_info(file, argp);</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PARAMS:</div><div class='ctx'> 		return snd_timer_user_params(file, argp);</div><div class='del'>-	case SNDRV_TIMER_IOCTL_STATUS:</div><div class='del'>-		return snd_timer_user_status(file, argp);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_STATUS32:</div><div class='add'>+		return snd_timer_user_status32(file, argp);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_STATUS64:</div><div class='add'>+		return snd_timer_user_status64(file, argp);</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_START:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_START_OLD:</div><div class='ctx'> 		return snd_timer_user_start(file);</div><div class='hunk'>@@ -1821,35 +2283,64 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PAUSE:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PAUSE_OLD:</div><div class='ctx'> 		return snd_timer_user_pause(file);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_CREATE:</div><div class='add'>+		return snd_utimer_ioctl_create(file, argp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOTTY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,</div><div class='add'>+				 unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_user *tu = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tu-&gt;ioctl_lock);</div><div class='add'>+	return __snd_timer_user_ioctl(file, cmd, arg, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_timer_user_fasync(int fd, struct file * file, int on)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='del'>-	return fasync_helper(fd, file, on, &amp;tu-&gt;fasync);</div><div class='add'>+	return snd_fasync_helper(fd, file, on, &amp;tu-&gt;fasync);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,</div><div class='ctx'> 				   size_t count, loff_t *offset)</div><div class='ctx'> {</div><div class='add'>+	struct snd_timer_tread64 *tread;</div><div class='add'>+	struct snd_timer_tread32 tread32;</div><div class='ctx'> 	struct snd_timer_user *tu;</div><div class='ctx'> 	long result = 0, unit;</div><div class='add'>+	int qhead;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='del'>-	unit = tu-&gt;tread ? sizeof(struct snd_timer_tread) : sizeof(struct snd_timer_read);</div><div class='add'>+	switch (tu-&gt;tread) {</div><div class='add'>+	case TREAD_FORMAT_TIME64:</div><div class='add'>+		unit = sizeof(struct snd_timer_tread64);</div><div class='add'>+		break;</div><div class='add'>+	case TREAD_FORMAT_TIME32:</div><div class='add'>+		unit = sizeof(struct snd_timer_tread32);</div><div class='add'>+		break;</div><div class='add'>+	case TREAD_FORMAT_NONE:</div><div class='add'>+		unit = sizeof(struct snd_timer_read);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Corrupt snd_timer_user\n");</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;tu-&gt;ioctl_lock);</div><div class='ctx'> 	spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='ctx'> 	while ((long)count - result &gt;= unit) {</div><div class='ctx'> 		while (!tu-&gt;qused) {</div><div class='del'>-			wait_queue_t wait;</div><div class='add'>+			wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 			if ((file-&gt;f_flags &amp; O_NONBLOCK) != 0 || result &gt; 0) {</div><div class='ctx'> 				err = -EAGAIN;</div><div class='del'>-				break;</div><div class='add'>+				goto _error;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			set_current_state(TASK_INTERRUPTIBLE);</div><div class='hunk'>@@ -1857,51 +2348,73 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,</div><div class='ctx'> 			add_wait_queue(&amp;tu-&gt;qchange_sleep, &amp;wait);</div><div class='ctx'> </div><div class='ctx'> 			spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='add'>+			mutex_unlock(&amp;tu-&gt;ioctl_lock);</div><div class='ctx'> 			schedule();</div><div class='add'>+			mutex_lock(&amp;tu-&gt;ioctl_lock);</div><div class='ctx'> 			spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='ctx'> </div><div class='ctx'> 			remove_wait_queue(&amp;tu-&gt;qchange_sleep, &amp;wait);</div><div class='ctx'> </div><div class='add'>+			if (tu-&gt;disconnected) {</div><div class='add'>+				err = -ENODEV;</div><div class='add'>+				goto _error;</div><div class='add'>+			}</div><div class='ctx'> 			if (signal_pending(current)) {</div><div class='ctx'> 				err = -ERESTARTSYS;</div><div class='del'>-				break;</div><div class='add'>+				goto _error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		qhead = tu-&gt;qhead++;</div><div class='add'>+		tu-&gt;qhead %= tu-&gt;queue_size;</div><div class='add'>+		tu-&gt;qused--;</div><div class='ctx'> 		spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='ctx'> </div><div class='del'>-		if (tu-&gt;tread) {</div><div class='del'>-			if (copy_to_user(buffer, &amp;tu-&gt;tqueue[tu-&gt;qhead++],</div><div class='del'>-					 sizeof(struct snd_timer_tread))) {</div><div class='add'>+		tread = &amp;tu-&gt;tqueue[qhead];</div><div class='add'>+</div><div class='add'>+		switch (tu-&gt;tread) {</div><div class='add'>+		case TREAD_FORMAT_TIME64:</div><div class='add'>+			if (copy_to_user(buffer, tread,</div><div class='add'>+					 sizeof(struct snd_timer_tread64)))</div><div class='ctx'> 				err = -EFAULT;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (copy_to_user(buffer, &amp;tu-&gt;queue[tu-&gt;qhead++],</div><div class='del'>-					 sizeof(struct snd_timer_read))) {</div><div class='add'>+			break;</div><div class='add'>+		case TREAD_FORMAT_TIME32:</div><div class='add'>+			memset(&amp;tread32, 0, sizeof(tread32));</div><div class='add'>+			tread32 = (struct snd_timer_tread32) {</div><div class='add'>+				.event = tread-&gt;event,</div><div class='add'>+				.tstamp_sec = tread-&gt;tstamp_sec,</div><div class='add'>+				.tstamp_nsec = tread-&gt;tstamp_nsec,</div><div class='add'>+				.val = tread-&gt;val,</div><div class='add'>+			};</div><div class='add'>+</div><div class='add'>+			if (copy_to_user(buffer, &amp;tread32, sizeof(tread32)))</div><div class='ctx'> 				err = -EFAULT;</div><div class='del'>-				goto _error;</div><div class='del'>-			}</div><div class='add'>+			break;</div><div class='add'>+		case TREAD_FORMAT_NONE:</div><div class='add'>+			if (copy_to_user(buffer, &amp;tu-&gt;queue[qhead],</div><div class='add'>+					 sizeof(struct snd_timer_read)))</div><div class='add'>+				err = -EFAULT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -ENOTSUPP;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		tu-&gt;qhead %= tu-&gt;queue_size;</div><div class='del'>-</div><div class='add'>+		spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto _error;</div><div class='ctx'> 		result += unit;</div><div class='ctx'> 		buffer += unit;</div><div class='del'>-</div><div class='del'>-		spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='del'>-		tu-&gt;qused--;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='ctx'>  _error:</div><div class='add'>+	spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='add'>+	mutex_unlock(&amp;tu-&gt;ioctl_lock);</div><div class='ctx'> 	return result &gt; 0 ? result : err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_timer_user_poll(struct file *file, poll_table * wait)</div><div class='add'>+static __poll_t snd_timer_user_poll(struct file *file, poll_table * wait)</div><div class='ctx'> {</div><div class='del'>-        unsigned int mask;</div><div class='add'>+        __poll_t mask;</div><div class='ctx'>         struct snd_timer_user *tu;</div><div class='ctx'> </div><div class='ctx'>         tu = file-&gt;private_data;</div><div class='hunk'>@@ -1909,8 +2422,11 @@ static unsigned int snd_timer_user_poll(struct file *file, poll_table * wait)</div><div class='ctx'>         poll_wait(file, &amp;tu-&gt;qchange_sleep, wait);</div><div class='ctx'> </div><div class='ctx'> 	mask = 0;</div><div class='add'>+	guard(spinlock_irq)(&amp;tu-&gt;qlock);</div><div class='ctx'> 	if (tu-&gt;qused)</div><div class='del'>-		mask |= POLLIN | POLLRDNORM;</div><div class='add'>+		mask |= EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	if (tu-&gt;disconnected)</div><div class='add'>+		mask |= EPOLLERR;</div><div class='ctx'> </div><div class='ctx'> 	return mask;</div><div class='ctx'> }</div><div class='hunk'>@@ -1927,13 +2443,23 @@ static const struct file_operations snd_timer_f_ops =</div><div class='ctx'> 	.read =		snd_timer_user_read,</div><div class='ctx'> 	.open =		snd_timer_user_open,</div><div class='ctx'> 	.release =	snd_timer_user_release,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='ctx'> 	.poll =		snd_timer_user_poll,</div><div class='ctx'> 	.unlocked_ioctl =	snd_timer_user_ioctl,</div><div class='ctx'> 	.compat_ioctl =	snd_timer_user_ioctl_compat,</div><div class='ctx'> 	.fasync = 	snd_timer_user_fasync,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* unregister the system timer */</div><div class='add'>+static void snd_timer_free_all(void)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer *timer, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(timer, n, &amp;snd_timer_list, device_list)</div><div class='add'>+		snd_timer_free(timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *timer_dev;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  *  ENTRY functions</div><div class='ctx'>  */</div><div class='hunk'>@@ -1942,32 +2468,43 @@ static int __init alsa_timer_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = snd_device_alloc(&amp;timer_dev, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	dev_set_name(timer_dev, "timer");</div><div class='add'>+</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_TIMERS</div><div class='ctx'> 	snd_oss_info_register(SNDRV_OSS_INFO_DEV_TIMERS, SNDRV_CARDS - 1,</div><div class='ctx'> 			      "system timer");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_timer_register_system()) &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "unable to register system timer (%i)\n",</div><div class='del'>-			   err);</div><div class='del'>-	if ((err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0,</div><div class='del'>-				       &amp;snd_timer_f_ops, NULL, "timer")) &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "unable to register timer device (%i)\n",</div><div class='del'>-			   err);</div><div class='add'>+	err = snd_timer_register_system();</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("ALSA: unable to register system timer (%i)\n", err);</div><div class='add'>+		goto put_timer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0,</div><div class='add'>+				  &amp;snd_timer_f_ops, NULL, timer_dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pr_err("ALSA: unable to register timer device (%i)\n", err);</div><div class='add'>+		snd_timer_free_all();</div><div class='add'>+		goto put_timer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	snd_timer_proc_init();</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+put_timer:</div><div class='add'>+	put_device(timer_dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit alsa_timer_exit(void)</div><div class='ctx'> {</div><div class='del'>-	struct list_head *p, *n;</div><div class='del'>-</div><div class='del'>-	snd_unregister_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0);</div><div class='del'>-	/* unregister the system timer */</div><div class='del'>-	list_for_each_safe(p, n, &amp;snd_timer_list) {</div><div class='del'>-		struct snd_timer *timer = list_entry(p, struct snd_timer, device_list);</div><div class='del'>-		snd_timer_free(timer);</div><div class='del'>-	}</div><div class='add'>+	snd_unregister_device(timer_dev);</div><div class='add'>+	snd_timer_free_all();</div><div class='add'>+	put_device(timer_dev);</div><div class='ctx'> 	snd_timer_proc_done();</div><div class='ctx'> #ifdef SNDRV_OSS_INFO_DEV_TIMERS</div><div class='ctx'> 	snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_TIMERS, SNDRV_CARDS - 1);</div><div class='hunk'>@@ -1976,17 +2513,3 @@ static void __exit alsa_timer_exit(void)</div><div class='ctx'> </div><div class='ctx'> module_init(alsa_timer_init)</div><div class='ctx'> module_exit(alsa_timer_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_timer_open);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_close);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_resolution);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_start);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_stop);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_continue);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_pause);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_new);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_notify);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_global_new);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_global_free);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_global_register);</div><div class='del'>-EXPORT_SYMBOL(snd_timer_interrupt);</div><div class='head'>diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c<br/>index e05802ae6e1b..4ae9eaeb5afb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/timer_compat.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/timer_compat.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/timer_compat.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/timer_compat.c</a></div><div class='hunk'>@@ -1,27 +1,26 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   32bit -&gt; 64bit ioctl wrapper for timer API</div><div class='ctx'>  *   Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This file included from timer.c */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/compat.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * ILP32/LP64 has different size for 'long' type. Additionally, the size</div><div class='add'>+ * of storage alignment differs depending on architectures. Here, '__packed'</div><div class='add'>+ * qualifier is used so that the size of this structure is multiple of 4 and</div><div class='add'>+ * it fits to any architectures with 32 bit storage alignment.</div><div class='add'>+ */</div><div class='add'>+struct snd_timer_gparams32 {</div><div class='add'>+	struct snd_timer_id tid;</div><div class='add'>+	u32 period_num;</div><div class='add'>+	u32 period_den;</div><div class='add'>+	unsigned char reserved[32];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct snd_timer_info32 {</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	s32 card;</div><div class='hunk'>@@ -32,6 +31,19 @@ struct snd_timer_info32 {</div><div class='ctx'> 	unsigned char reserved[64];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int snd_timer_user_gparams_compat(struct file *file,</div><div class='add'>+					struct snd_timer_gparams32 __user *user)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_gparams gparams;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(&amp;gparams.tid, &amp;user-&gt;tid, sizeof(gparams.tid)) ||</div><div class='add'>+	    get_user(gparams.period_num, &amp;user-&gt;period_num) ||</div><div class='add'>+	    get_user(gparams.period_den, &amp;user-&gt;period_den))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return timer_set_gparams(&amp;gparams);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_timer_user_info_compat(struct file *file,</div><div class='ctx'> 				      struct snd_timer_info32 __user *_info)</div><div class='ctx'> {</div><div class='hunk'>@@ -40,71 +52,40 @@ static int snd_timer_user_info_compat(struct file *file,</div><div class='ctx'> 	struct snd_timer *t;</div><div class='ctx'> </div><div class='ctx'> 	tu = file-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!tu-&gt;timeri))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	if (!tu-&gt;timeri)</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> 	t = tu-&gt;timeri-&gt;timer;</div><div class='del'>-	if (snd_BUG_ON(!t))</div><div class='del'>-		return -ENXIO;</div><div class='add'>+	if (!t)</div><div class='add'>+		return -EBADFD;</div><div class='ctx'> 	memset(&amp;info, 0, sizeof(info));</div><div class='ctx'> 	info.card = t-&gt;card ? t-&gt;card-&gt;number : -1;</div><div class='ctx'> 	if (t-&gt;hw.flags &amp; SNDRV_TIMER_HW_SLAVE)</div><div class='ctx'> 		info.flags |= SNDRV_TIMER_FLG_SLAVE;</div><div class='del'>-	strlcpy(info.id, t-&gt;id, sizeof(info.id));</div><div class='del'>-	strlcpy(info.name, t-&gt;name, sizeof(info.name));</div><div class='add'>+	strscpy(info.id, t-&gt;id, sizeof(info.id));</div><div class='add'>+	strscpy(info.name, t-&gt;name, sizeof(info.name));</div><div class='ctx'> 	info.resolution = t-&gt;hw.resolution;</div><div class='ctx'> 	if (copy_to_user(_info, &amp;info, sizeof(*_info)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_timer_status32 {</div><div class='del'>-	struct compat_timespec tstamp;</div><div class='del'>-	u32 resolution;</div><div class='del'>-	u32 lost;</div><div class='del'>-	u32 overrun;</div><div class='del'>-	u32 queue;</div><div class='del'>-	unsigned char reserved[64];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int snd_timer_user_status_compat(struct file *file,</div><div class='del'>-					struct snd_timer_status32 __user *_status)</div><div class='del'>-{</div><div class='del'>-	struct snd_timer_user *tu;</div><div class='del'>-	struct snd_timer_status status;</div><div class='del'>-	</div><div class='del'>-	tu = file-&gt;private_data;</div><div class='del'>-	if (snd_BUG_ON(!tu-&gt;timeri))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-	status.tstamp = tu-&gt;tstamp;</div><div class='del'>-	status.resolution = snd_timer_resolution(tu-&gt;timeri);</div><div class='del'>-	status.lost = tu-&gt;timeri-&gt;lost;</div><div class='del'>-	status.overrun = tu-&gt;overrun;</div><div class='del'>-	spin_lock_irq(&amp;tu-&gt;qlock);</div><div class='del'>-	status.queue = tu-&gt;qused;</div><div class='del'>-	spin_unlock_irq(&amp;tu-&gt;qlock);</div><div class='del'>-	if (copy_to_user(_status, &amp;status, sizeof(status)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='add'>+	SNDRV_TIMER_IOCTL_GPARAMS32 = _IOW('T', 0x04, struct snd_timer_gparams32),</div><div class='ctx'> 	SNDRV_TIMER_IOCTL_INFO32 = _IOR('T', 0x11, struct snd_timer_info32),</div><div class='del'>-	SNDRV_TIMER_IOCTL_STATUS32 = _IOW('T', 0x14, struct snd_timer_status32),</div><div class='add'>+	SNDRV_TIMER_IOCTL_STATUS_COMPAT32 = _IOW('T', 0x14, struct snd_timer_status32),</div><div class='add'>+	SNDRV_TIMER_IOCTL_STATUS_COMPAT64 = _IOW('T', 0x14, struct snd_timer_status64),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='add'>+static long __snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+					  unsigned long arg)</div><div class='ctx'> {</div><div class='ctx'> 	void __user *argp = compat_ptr(arg);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PVERSION:</div><div class='del'>-	case SNDRV_TIMER_IOCTL_TREAD:</div><div class='add'>+	case SNDRV_TIMER_IOCTL_TREAD_OLD:</div><div class='add'>+	case SNDRV_TIMER_IOCTL_TREAD64:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_GINFO:</div><div class='del'>-	case SNDRV_TIMER_IOCTL_GPARAMS:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_GSTATUS:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_SELECT:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PARAMS:</div><div class='hunk'>@@ -117,11 +98,24 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PAUSE:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_PAUSE_OLD:</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_NEXT_DEVICE:</div><div class='del'>-		return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);</div><div class='add'>+		return __snd_timer_user_ioctl(file, cmd, (unsigned long)argp, true);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_GPARAMS32:</div><div class='add'>+		return snd_timer_user_gparams_compat(file, argp);</div><div class='ctx'> 	case SNDRV_TIMER_IOCTL_INFO32:</div><div class='ctx'> 		return snd_timer_user_info_compat(file, argp);</div><div class='del'>-	case SNDRV_TIMER_IOCTL_STATUS32:</div><div class='del'>-		return snd_timer_user_status_compat(file, argp);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_STATUS_COMPAT32:</div><div class='add'>+		return snd_timer_user_status32(file, argp);</div><div class='add'>+	case SNDRV_TIMER_IOCTL_STATUS_COMPAT64:</div><div class='add'>+		return snd_timer_user_status64(file, argp);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOIOCTLCMD;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,</div><div class='add'>+					unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_timer_user *tu = file-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tu-&gt;ioctl_lock);</div><div class='add'>+	return __snd_timer_user_ioctl_compat(file, cmd, arg);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/core/ump.c b/sound/core/ump.c<br/>new file mode 100644<br/>index 000000000000..8d8681a42ca5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/ump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/ump.c</a></div><div class='hunk'>@@ -0,0 +1,1394 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal MIDI Packet (UMP) support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='add'>+#include &lt;sound/ump_convert.h&gt;</div><div class='add'>+</div><div class='add'>+#define ump_err(ump, fmt, args...)	dev_err((ump)-&gt;core.dev, fmt, ##args)</div><div class='add'>+#define ump_warn(ump, fmt, args...)	dev_warn((ump)-&gt;core.dev, fmt, ##args)</div><div class='add'>+#define ump_info(ump, fmt, args...)	dev_info((ump)-&gt;core.dev, fmt, ##args)</div><div class='add'>+#define ump_dbg(ump, fmt, args...)	dev_dbg((ump)-&gt;core.dev, fmt, ##args)</div><div class='add'>+</div><div class='add'>+static int snd_ump_dev_register(struct snd_rawmidi *rmidi);</div><div class='add'>+static int snd_ump_dev_unregister(struct snd_rawmidi *rmidi);</div><div class='add'>+static long snd_ump_ioctl(struct snd_rawmidi *rmidi, unsigned int cmd,</div><div class='add'>+			  void __user *argp);</div><div class='add'>+static void snd_ump_proc_read(struct snd_info_entry *entry,</div><div class='add'>+			      struct snd_info_buffer *buffer);</div><div class='add'>+static int snd_ump_rawmidi_open(struct snd_rawmidi_substream *substream);</div><div class='add'>+static int snd_ump_rawmidi_close(struct snd_rawmidi_substream *substream);</div><div class='add'>+static void snd_ump_rawmidi_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				    int up);</div><div class='add'>+static void snd_ump_rawmidi_drain(struct snd_rawmidi_substream *substream);</div><div class='add'>+</div><div class='add'>+static void ump_handle_stream_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const u32 *buf, int size);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI)</div><div class='add'>+static int process_legacy_output(struct snd_ump_endpoint *ump,</div><div class='add'>+				 u32 *buffer, int count);</div><div class='add'>+static void process_legacy_input(struct snd_ump_endpoint *ump, const u32 *src,</div><div class='add'>+				 int words);</div><div class='add'>+static void ump_legacy_set_rawmidi_name(struct snd_ump_endpoint *ump);</div><div class='add'>+static void update_legacy_names(struct snd_ump_endpoint *ump);</div><div class='add'>+#else</div><div class='add'>+static inline int process_legacy_output(struct snd_ump_endpoint *ump,</div><div class='add'>+					u32 *buffer, int count)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void process_legacy_input(struct snd_ump_endpoint *ump,</div><div class='add'>+					const u32 *src, int words)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void ump_legacy_set_rawmidi_name(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+static inline void update_legacy_names(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* copy a string safely with stripping non-printable letters */</div><div class='add'>+static void safe_copy_string(void *dst, size_t max_dst_size,</div><div class='add'>+			     const void *src, size_t max_src_size)</div><div class='add'>+{</div><div class='add'>+	const unsigned char *s = src;</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+</div><div class='add'>+	if (!max_dst_size--)</div><div class='add'>+		return;</div><div class='add'>+	for (s = src; max_dst_size &amp;&amp; *s &amp;&amp; max_src_size--; s++) {</div><div class='add'>+		if (!isascii(*s) || !isprint(*s))</div><div class='add'>+			continue;</div><div class='add'>+		*d++ = *s;</div><div class='add'>+		max_dst_size--;</div><div class='add'>+	}</div><div class='add'>+	*d = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* append a string safely with stripping non-printable letters */</div><div class='add'>+static void safe_append_string(void *dst, size_t max_dst_size,</div><div class='add'>+			       const void *src, size_t max_src_size)</div><div class='add'>+{</div><div class='add'>+	unsigned char *d = dst;</div><div class='add'>+	size_t len = strlen(d);</div><div class='add'>+</div><div class='add'>+	safe_copy_string(d + len, max_dst_size - len, src, max_src_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_global_ops snd_ump_rawmidi_ops = {</div><div class='add'>+	.dev_register = snd_ump_dev_register,</div><div class='add'>+	.dev_unregister = snd_ump_dev_unregister,</div><div class='add'>+	.ioctl = snd_ump_ioctl,</div><div class='add'>+	.proc_read = snd_ump_proc_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_ump_rawmidi_input_ops = {</div><div class='add'>+	.open = snd_ump_rawmidi_open,</div><div class='add'>+	.close = snd_ump_rawmidi_close,</div><div class='add'>+	.trigger = snd_ump_rawmidi_trigger,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_ump_rawmidi_output_ops = {</div><div class='add'>+	.open = snd_ump_rawmidi_open,</div><div class='add'>+	.close = snd_ump_rawmidi_close,</div><div class='add'>+	.trigger = snd_ump_rawmidi_trigger,</div><div class='add'>+	.drain = snd_ump_rawmidi_drain,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void snd_ump_endpoint_free(struct snd_rawmidi *rmidi)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(rmidi);</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;ump-&gt;block_list)) {</div><div class='add'>+		fb = list_first_entry(&amp;ump-&gt;block_list, struct snd_ump_block,</div><div class='add'>+				      list);</div><div class='add'>+		list_del(&amp;fb-&gt;list);</div><div class='add'>+		if (fb-&gt;private_free)</div><div class='add'>+			fb-&gt;private_free(fb);</div><div class='add'>+		kfree(fb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;private_free)</div><div class='add'>+		ump-&gt;private_free(ump);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI)</div><div class='add'>+	kfree(ump-&gt;out_cvts);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_endpoint_new - create a UMP Endpoint object</div><div class='add'>+ * @card: the card instance</div><div class='add'>+ * @id: the id string for rawmidi</div><div class='add'>+ * @device: the device index for rawmidi</div><div class='add'>+ * @output: 1 for enabling output</div><div class='add'>+ * @input: 1 for enabling input</div><div class='add'>+ * @ump_ret: the pointer to store the new UMP instance</div><div class='add'>+ *</div><div class='add'>+ * Creates a new UMP Endpoint object. A UMP Endpoint is tied with one rawmidi</div><div class='add'>+ * instance with one input and/or one output rawmidi stream (either uni-</div><div class='add'>+ * or bi-directional). A UMP Endpoint may contain one or multiple UMP Blocks</div><div class='add'>+ * that consist of one or multiple UMP Groups.</div><div class='add'>+ *</div><div class='add'>+ * Use snd_rawmidi_set_ops() to set the operators to the new instance.</div><div class='add'>+ * Unlike snd_rawmidi_new(), this function sets up the info_flags by itself</div><div class='add'>+ * depending on the given @output and @input.</div><div class='add'>+ *</div><div class='add'>+ * The device has SNDRV_RAWMIDI_INFO_UMP flag set and a different device</div><div class='add'>+ * file ("umpCxDx") than a standard MIDI 1.x device ("midiCxDx") is</div><div class='add'>+ * created.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_endpoint_new(struct snd_card *card, char *id, int device,</div><div class='add'>+			 int output, int input,</div><div class='add'>+			 struct snd_ump_endpoint **ump_ret)</div><div class='add'>+{</div><div class='add'>+	unsigned int info_flags = SNDRV_RAWMIDI_INFO_UMP;</div><div class='add'>+	struct snd_ump_endpoint *ump;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (input)</div><div class='add'>+		info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+	if (output)</div><div class='add'>+		info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+	if (input &amp;&amp; output)</div><div class='add'>+		info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	ump = kzalloc(sizeof(*ump), GFP_KERNEL);</div><div class='add'>+	if (!ump)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	INIT_LIST_HEAD(&amp;ump-&gt;block_list);</div><div class='add'>+	mutex_init(&amp;ump-&gt;open_mutex);</div><div class='add'>+	init_waitqueue_head(&amp;ump-&gt;stream_wait);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI)</div><div class='add'>+	spin_lock_init(&amp;ump-&gt;legacy_locks[0]);</div><div class='add'>+	spin_lock_init(&amp;ump-&gt;legacy_locks[1]);</div><div class='add'>+#endif</div><div class='add'>+	err = snd_rawmidi_init(&amp;ump-&gt;core, card, id, device,</div><div class='add'>+			       output, input, info_flags);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_rawmidi_free(&amp;ump-&gt;core);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ump-&gt;info.card = card-&gt;number;</div><div class='add'>+	ump-&gt;info.device = device;</div><div class='add'>+</div><div class='add'>+	ump-&gt;core.private_free = snd_ump_endpoint_free;</div><div class='add'>+	ump-&gt;core.ops = &amp;snd_ump_rawmidi_ops;</div><div class='add'>+	if (input)</div><div class='add'>+		snd_rawmidi_set_ops(&amp;ump-&gt;core, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;snd_ump_rawmidi_input_ops);</div><div class='add'>+	if (output)</div><div class='add'>+		snd_rawmidi_set_ops(&amp;ump-&gt;core, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;snd_ump_rawmidi_output_ops);</div><div class='add'>+</div><div class='add'>+	ump_dbg(ump, "Created a UMP EP #%d (%s)\n", device, id);</div><div class='add'>+	*ump_ret = ump;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_endpoint_new);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device register / unregister hooks;</div><div class='add'>+ *  do nothing, placeholders for avoiding the default rawmidi handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+static void snd_ump_dev_seq_free(struct snd_seq_device *device)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = device-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	ump-&gt;seq_dev = NULL;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int snd_ump_dev_register(struct snd_rawmidi *rmidi)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(rmidi);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_seq_device_new(ump-&gt;core.card, ump-&gt;core.device,</div><div class='add'>+				 SNDRV_SEQ_DEV_ID_UMP, 0, &amp;ump-&gt;seq_dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	ump-&gt;seq_dev-&gt;private_data = ump;</div><div class='add'>+	ump-&gt;seq_dev-&gt;private_free = snd_ump_dev_seq_free;</div><div class='add'>+	snd_device_register(ump-&gt;core.card, ump-&gt;seq_dev);</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ump_dev_unregister(struct snd_rawmidi *rmidi)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_ump_block *</div><div class='add'>+snd_ump_get_block(struct snd_ump_endpoint *ump, unsigned char id)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fb, &amp;ump-&gt;block_list, list) {</div><div class='add'>+		if (fb-&gt;info.block_id == id)</div><div class='add'>+			return fb;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * rawmidi ops for UMP endpoint</div><div class='add'>+ */</div><div class='add'>+static int snd_ump_rawmidi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(substream-&gt;rmidi);</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;substreams[dir])</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	err = ump-&gt;ops-&gt;open(ump, dir);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	ump-&gt;substreams[dir] = substream;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ump_rawmidi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(substream-&gt;rmidi);</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+</div><div class='add'>+	ump-&gt;substreams[dir] = NULL;</div><div class='add'>+	ump-&gt;ops-&gt;close(ump, dir);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ump_rawmidi_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				    int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(substream-&gt;rmidi);</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+</div><div class='add'>+	ump-&gt;ops-&gt;trigger(ump, dir, up);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ump_rawmidi_drain(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(substream-&gt;rmidi);</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;ops-&gt;drain)</div><div class='add'>+		ump-&gt;ops-&gt;drain(ump, SNDRV_RAWMIDI_STREAM_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* number of 32bit words per message type */</div><div class='add'>+static unsigned char ump_packet_words[0x10] = {</div><div class='add'>+	1, 1, 1, 2, 2, 4, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_receive_ump_val - parse the UMP packet data</div><div class='add'>+ * @ump: UMP endpoint</div><div class='add'>+ * @val: UMP packet data</div><div class='add'>+ *</div><div class='add'>+ * The data is copied onto ump-&gt;input_buf[].</div><div class='add'>+ * When a full packet is completed, returns the number of words (from 1 to 4).</div><div class='add'>+ * OTOH, if the packet is incomplete, returns 0.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_receive_ump_val(struct snd_ump_endpoint *ump, u32 val)</div><div class='add'>+{</div><div class='add'>+	int words;</div><div class='add'>+</div><div class='add'>+	if (!ump-&gt;input_pending)</div><div class='add'>+		ump-&gt;input_pending = ump_packet_words[ump_message_type(val)];</div><div class='add'>+</div><div class='add'>+	ump-&gt;input_buf[ump-&gt;input_buf_head++] = val;</div><div class='add'>+	ump-&gt;input_pending--;</div><div class='add'>+	if (!ump-&gt;input_pending) {</div><div class='add'>+		words = ump-&gt;input_buf_head;</div><div class='add'>+		ump-&gt;input_buf_head = 0;</div><div class='add'>+		return words;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_receive_ump_val);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_receive - transfer UMP packets from the device</div><div class='add'>+ * @ump: the UMP endpoint</div><div class='add'>+ * @buffer: the buffer pointer to transfer</div><div class='add'>+ * @count: byte size to transfer</div><div class='add'>+ *</div><div class='add'>+ * Called from the driver to submit the received UMP packets from the device</div><div class='add'>+ * to user-space.  It's essentially a wrapper of rawmidi_receive().</div><div class='add'>+ * The data to receive is in CPU-native endianness.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_receive(struct snd_ump_endpoint *ump, const u32 *buffer, int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	const u32 *p = buffer;</div><div class='add'>+	int n, words = count &gt;&gt; 2;</div><div class='add'>+</div><div class='add'>+	while (words--) {</div><div class='add'>+		n = snd_ump_receive_ump_val(ump, *p++);</div><div class='add'>+		if (!n)</div><div class='add'>+			continue;</div><div class='add'>+		ump_handle_stream_msg(ump, ump-&gt;input_buf, n);</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+		if (ump-&gt;seq_ops)</div><div class='add'>+			ump-&gt;seq_ops-&gt;input_receive(ump, ump-&gt;input_buf, n);</div><div class='add'>+#endif</div><div class='add'>+		process_legacy_input(ump, ump-&gt;input_buf, n);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	substream = ump-&gt;substreams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+	if (!substream)</div><div class='add'>+		return 0;</div><div class='add'>+	return snd_rawmidi_receive(substream, (const char *)buffer, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_receive);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_transmit - transmit UMP packets</div><div class='add'>+ * @ump: the UMP endpoint</div><div class='add'>+ * @buffer: the buffer pointer to transfer</div><div class='add'>+ * @count: byte size to transfer</div><div class='add'>+ *</div><div class='add'>+ * Called from the driver to obtain the UMP packets from user-space to the</div><div class='add'>+ * device.  It's essentially a wrapper of rawmidi_transmit().</div><div class='add'>+ * The data to transmit is in CPU-native endianness.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_transmit(struct snd_ump_endpoint *ump, u32 *buffer, int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream =</div><div class='add'>+		ump-&gt;substreams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!substream)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	err = snd_rawmidi_transmit(substream, (char *)buffer, count);</div><div class='add'>+	/* received either data or an error? */</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return process_legacy_output(ump, buffer, count);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_transmit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_block_new - Create a UMP block</div><div class='add'>+ * @ump: UMP object</div><div class='add'>+ * @blk: block ID number to create</div><div class='add'>+ * @direction: direction (in/out/bidirection)</div><div class='add'>+ * @first_group: the first group ID (0-based)</div><div class='add'>+ * @num_groups: the number of groups in this block</div><div class='add'>+ * @blk_ret: the pointer to store the resultant block object</div><div class='add'>+ */</div><div class='add'>+int snd_ump_block_new(struct snd_ump_endpoint *ump, unsigned int blk,</div><div class='add'>+		      unsigned int direction, unsigned int first_group,</div><div class='add'>+		      unsigned int num_groups, struct snd_ump_block **blk_ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb, *p;</div><div class='add'>+</div><div class='add'>+	if (blk &gt;= SNDRV_UMP_MAX_BLOCKS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (snd_ump_get_block(ump, blk))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	fb = kzalloc(sizeof(*fb), GFP_KERNEL);</div><div class='add'>+	if (!fb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fb-&gt;ump = ump;</div><div class='add'>+	fb-&gt;info.card = ump-&gt;info.card;</div><div class='add'>+	fb-&gt;info.device = ump-&gt;info.device;</div><div class='add'>+	fb-&gt;info.block_id = blk;</div><div class='add'>+	if (blk &gt;= ump-&gt;info.num_blocks)</div><div class='add'>+		ump-&gt;info.num_blocks = blk + 1;</div><div class='add'>+	fb-&gt;info.direction = direction;</div><div class='add'>+	fb-&gt;info.active = 1;</div><div class='add'>+	fb-&gt;info.first_group = first_group;</div><div class='add'>+	fb-&gt;info.num_groups = num_groups;</div><div class='add'>+	/* fill the default name, may be overwritten to a better name */</div><div class='add'>+	snprintf(fb-&gt;info.name, sizeof(fb-&gt;info.name), "Group %u-%u",</div><div class='add'>+		 first_group + 1, first_group + num_groups);</div><div class='add'>+</div><div class='add'>+	/* put the entry in the ordered list */</div><div class='add'>+	list_for_each_entry(p, &amp;ump-&gt;block_list, list) {</div><div class='add'>+		if (p-&gt;info.block_id &gt; blk) {</div><div class='add'>+			list_add_tail(&amp;fb-&gt;list, &amp;p-&gt;list);</div><div class='add'>+			goto added;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	list_add_tail(&amp;fb-&gt;list, &amp;ump-&gt;block_list);</div><div class='add'>+</div><div class='add'>+ added:</div><div class='add'>+	ump_dbg(ump, "Created a UMP Block #%d (%s)\n", blk, fb-&gt;info.name);</div><div class='add'>+	*blk_ret = fb;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_block_new);</div><div class='add'>+</div><div class='add'>+static int snd_ump_ioctl_block(struct snd_ump_endpoint *ump,</div><div class='add'>+			       struct snd_ump_block_info __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	unsigned char id;</div><div class='add'>+</div><div class='add'>+	if (get_user(id, &amp;argp-&gt;block_id))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	fb = snd_ump_get_block(ump, id);</div><div class='add'>+	if (!fb)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	if (copy_to_user(argp, &amp;fb-&gt;info, sizeof(fb-&gt;info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle UMP-specific ioctls; called from snd_rawmidi_ioctl()</div><div class='add'>+ */</div><div class='add'>+static long snd_ump_ioctl(struct snd_rawmidi *rmidi, unsigned int cmd,</div><div class='add'>+			  void __user *argp)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(rmidi);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_UMP_IOCTL_ENDPOINT_INFO:</div><div class='add'>+		if (copy_to_user(argp, &amp;ump-&gt;info, sizeof(ump-&gt;info)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	case SNDRV_UMP_IOCTL_BLOCK_INFO:</div><div class='add'>+		return snd_ump_ioctl_block(ump, argp);</div><div class='add'>+	default:</div><div class='add'>+		ump_dbg(ump, "rawmidi: unknown command = 0x%x\n", cmd);</div><div class='add'>+		return -ENOTTY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ump_direction_string(int dir)</div><div class='add'>+{</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case SNDRV_UMP_DIR_INPUT:</div><div class='add'>+		return "input";</div><div class='add'>+	case SNDRV_UMP_DIR_OUTPUT:</div><div class='add'>+		return "output";</div><div class='add'>+	case SNDRV_UMP_DIR_BIDIRECTION:</div><div class='add'>+		return "bidirection";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *ump_ui_hint_string(int dir)</div><div class='add'>+{</div><div class='add'>+	switch (dir) {</div><div class='add'>+	case  SNDRV_UMP_BLOCK_UI_HINT_RECEIVER:</div><div class='add'>+		return "receiver";</div><div class='add'>+	case SNDRV_UMP_BLOCK_UI_HINT_SENDER:</div><div class='add'>+		return "sender";</div><div class='add'>+	case SNDRV_UMP_BLOCK_UI_HINT_BOTH:</div><div class='add'>+		return "both";</div><div class='add'>+	default:</div><div class='add'>+		return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Additional proc file output */</div><div class='add'>+static void snd_ump_proc_read(struct snd_info_entry *entry,</div><div class='add'>+			      struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rmidi = entry-&gt;private_data;</div><div class='add'>+	struct snd_ump_endpoint *ump = rawmidi_to_ump(rmidi);</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "EP Name: %s\n", ump-&gt;info.name);</div><div class='add'>+	snd_iprintf(buffer, "EP Product ID: %s\n", ump-&gt;info.product_id);</div><div class='add'>+	snd_iprintf(buffer, "UMP Version: 0x%04x\n", ump-&gt;info.version);</div><div class='add'>+	snd_iprintf(buffer, "Protocol Caps: 0x%08x\n", ump-&gt;info.protocol_caps);</div><div class='add'>+	snd_iprintf(buffer, "Protocol: 0x%08x\n", ump-&gt;info.protocol);</div><div class='add'>+	if (ump-&gt;info.version) {</div><div class='add'>+		snd_iprintf(buffer, "Manufacturer ID: 0x%08x\n",</div><div class='add'>+			    ump-&gt;info.manufacturer_id);</div><div class='add'>+		snd_iprintf(buffer, "Family ID: 0x%04x\n", ump-&gt;info.family_id);</div><div class='add'>+		snd_iprintf(buffer, "Model ID: 0x%04x\n", ump-&gt;info.model_id);</div><div class='add'>+		snd_iprintf(buffer, "SW Revision: 0x%4phN\n", ump-&gt;info.sw_revision);</div><div class='add'>+	}</div><div class='add'>+	snd_iprintf(buffer, "Static Blocks: %s\n",</div><div class='add'>+		    (ump-&gt;info.flags &amp; SNDRV_UMP_EP_INFO_STATIC_BLOCKS) ? "Yes" : "No");</div><div class='add'>+	snd_iprintf(buffer, "Num Blocks: %d\n\n", ump-&gt;info.num_blocks);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fb, &amp;ump-&gt;block_list, list) {</div><div class='add'>+		snd_iprintf(buffer, "Block %d (%s)\n", fb-&gt;info.block_id,</div><div class='add'>+			    fb-&gt;info.name);</div><div class='add'>+		snd_iprintf(buffer, "  Direction: %s\n",</div><div class='add'>+			    ump_direction_string(fb-&gt;info.direction));</div><div class='add'>+		snd_iprintf(buffer, "  Active: %s\n",</div><div class='add'>+			    fb-&gt;info.active ? "Yes" : "No");</div><div class='add'>+		snd_iprintf(buffer, "  Groups: %d-%d\n",</div><div class='add'>+			    fb-&gt;info.first_group + 1,</div><div class='add'>+			    fb-&gt;info.first_group + fb-&gt;info.num_groups);</div><div class='add'>+		snd_iprintf(buffer, "  Is MIDI1: %s%s\n",</div><div class='add'>+			    (fb-&gt;info.flags &amp; SNDRV_UMP_BLOCK_IS_MIDI1) ? "Yes" : "No",</div><div class='add'>+			    (fb-&gt;info.flags &amp; SNDRV_UMP_BLOCK_IS_LOWSPEED) ? " (Low Speed)" : "");</div><div class='add'>+		if (ump-&gt;info.version) {</div><div class='add'>+			snd_iprintf(buffer, "  MIDI-CI Version: %d\n",</div><div class='add'>+				    fb-&gt;info.midi_ci_version);</div><div class='add'>+			snd_iprintf(buffer, "  Sysex8 Streams: %d\n",</div><div class='add'>+				    fb-&gt;info.sysex8_streams);</div><div class='add'>+			snd_iprintf(buffer, "  UI Hint: %s\n",</div><div class='add'>+				    ump_ui_hint_string(fb-&gt;info.ui_hint));</div><div class='add'>+		}</div><div class='add'>+		snd_iprintf(buffer, "\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update dir_bits and active flag for all groups in the client */</div><div class='add'>+void snd_ump_update_group_attrs(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	struct snd_ump_group *group;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNDRV_UMP_MAX_GROUPS; i++) {</div><div class='add'>+		group = &amp;ump-&gt;groups[i];</div><div class='add'>+		*group-&gt;name = 0;</div><div class='add'>+		group-&gt;dir_bits = 0;</div><div class='add'>+		group-&gt;active = 0;</div><div class='add'>+		group-&gt;group = i;</div><div class='add'>+		group-&gt;valid = false;</div><div class='add'>+		group-&gt;is_midi1 = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(fb, &amp;ump-&gt;block_list, list) {</div><div class='add'>+		if (fb-&gt;info.first_group + fb-&gt;info.num_groups &gt; SNDRV_UMP_MAX_GROUPS)</div><div class='add'>+			break;</div><div class='add'>+		group = &amp;ump-&gt;groups[fb-&gt;info.first_group];</div><div class='add'>+		for (i = 0; i &lt; fb-&gt;info.num_groups; i++, group++) {</div><div class='add'>+			group-&gt;valid = true;</div><div class='add'>+			if (fb-&gt;info.active)</div><div class='add'>+				group-&gt;active = 1;</div><div class='add'>+			if (fb-&gt;info.flags &amp; SNDRV_UMP_BLOCK_IS_MIDI1)</div><div class='add'>+				group-&gt;is_midi1 = true;</div><div class='add'>+			switch (fb-&gt;info.direction) {</div><div class='add'>+			case SNDRV_UMP_DIR_INPUT:</div><div class='add'>+				group-&gt;dir_bits |= (1 &lt;&lt; SNDRV_RAWMIDI_STREAM_INPUT);</div><div class='add'>+				break;</div><div class='add'>+			case SNDRV_UMP_DIR_OUTPUT:</div><div class='add'>+				group-&gt;dir_bits |= (1 &lt;&lt; SNDRV_RAWMIDI_STREAM_OUTPUT);</div><div class='add'>+				break;</div><div class='add'>+			case SNDRV_UMP_DIR_BIDIRECTION:</div><div class='add'>+				group-&gt;dir_bits |= (1 &lt;&lt; SNDRV_RAWMIDI_STREAM_INPUT) |</div><div class='add'>+					(1 &lt;&lt; SNDRV_RAWMIDI_STREAM_OUTPUT);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!*fb-&gt;info.name)</div><div class='add'>+				continue;</div><div class='add'>+			if (*group-&gt;name)</div><div class='add'>+				strlcat(group-&gt;name, ", ", sizeof(group-&gt;name));</div><div class='add'>+			safe_append_string(group-&gt;name, sizeof(group-&gt;name),</div><div class='add'>+					   fb-&gt;info.name, sizeof(fb-&gt;info.name));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_update_group_attrs);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UMP endpoint and function block handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* open / close UMP streams for the internal stream msg communication */</div><div class='add'>+static int ump_request_open(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	return snd_rawmidi_kernel_open(&amp;ump-&gt;core, 0,</div><div class='add'>+				       SNDRV_RAWMIDI_LFLG_OUTPUT,</div><div class='add'>+				       &amp;ump-&gt;stream_rfile);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ump_request_close(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	snd_rawmidi_kernel_release(&amp;ump-&gt;stream_rfile);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* request a command and wait for the given response;</div><div class='add'>+ * @req1 and @req2 are u32 commands</div><div class='add'>+ * @reply is the expected UMP stream status</div><div class='add'>+ */</div><div class='add'>+static int ump_req_msg(struct snd_ump_endpoint *ump, u32 req1, u32 req2,</div><div class='add'>+		       u32 reply)</div><div class='add'>+{</div><div class='add'>+	u32 buf[4];</div><div class='add'>+</div><div class='add'>+	ump_dbg(ump, "%s: request %08x %08x, wait-for %08x\n",</div><div class='add'>+		__func__, req1, req2, reply);</div><div class='add'>+	memset(buf, 0, sizeof(buf));</div><div class='add'>+	buf[0] = req1;</div><div class='add'>+	buf[1] = req2;</div><div class='add'>+	ump-&gt;stream_finished = 0;</div><div class='add'>+	ump-&gt;stream_wait_for = reply;</div><div class='add'>+	snd_rawmidi_kernel_write(ump-&gt;stream_rfile.output,</div><div class='add'>+				 (unsigned char *)&amp;buf, 16);</div><div class='add'>+	wait_event_timeout(ump-&gt;stream_wait, ump-&gt;stream_finished,</div><div class='add'>+			   msecs_to_jiffies(500));</div><div class='add'>+	if (!READ_ONCE(ump-&gt;stream_finished)) {</div><div class='add'>+		ump_dbg(ump, "%s: request timed out\n", __func__);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	ump-&gt;stream_finished = 0;</div><div class='add'>+	ump_dbg(ump, "%s: reply: %08x %08x %08x %08x\n",</div><div class='add'>+		__func__, buf[0], buf[1], buf[2], buf[3]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* append the received letters via UMP packet to the given string buffer;</div><div class='add'>+ * return 1 if the full string is received or 0 to continue</div><div class='add'>+ */</div><div class='add'>+static int ump_append_string(struct snd_ump_endpoint *ump, char *dest,</div><div class='add'>+			     int maxsize, const u32 *buf, int offset)</div><div class='add'>+{</div><div class='add'>+	unsigned char format;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	format = ump_stream_message_format(buf[0]);</div><div class='add'>+	if (format == UMP_STREAM_MSG_FORMAT_SINGLE ||</div><div class='add'>+	    format == UMP_STREAM_MSG_FORMAT_START) {</div><div class='add'>+		c = 0;</div><div class='add'>+	} else {</div><div class='add'>+		c = strlen(dest);</div><div class='add'>+		if (c &gt;= maxsize - 1)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; offset &lt; 16; offset++) {</div><div class='add'>+		dest[c] = buf[offset / 4] &gt;&gt; (3 - (offset % 4)) * 8;</div><div class='add'>+		if (!dest[c])</div><div class='add'>+			break;</div><div class='add'>+		if (++c &gt;= maxsize - 1)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	dest[c] = 0;</div><div class='add'>+	return (format == UMP_STREAM_MSG_FORMAT_SINGLE ||</div><div class='add'>+		format == UMP_STREAM_MSG_FORMAT_END);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Choose the default protocol */</div><div class='add'>+static void choose_default_protocol(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	if (ump-&gt;info.protocol &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK)</div><div class='add'>+		return;</div><div class='add'>+	if (ump-&gt;info.protocol_caps &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI2)</div><div class='add'>+		ump-&gt;info.protocol |= SNDRV_UMP_EP_INFO_PROTO_MIDI2;</div><div class='add'>+	else</div><div class='add'>+		ump-&gt;info.protocol |= SNDRV_UMP_EP_INFO_PROTO_MIDI1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* notify the EP info/name change to sequencer */</div><div class='add'>+static void seq_notify_ep_change(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	if (ump-&gt;parsed &amp;&amp; ump-&gt;seq_ops &amp;&amp; ump-&gt;seq_ops-&gt;notify_ep_change)</div><div class='add'>+		ump-&gt;seq_ops-&gt;notify_ep_change(ump);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle EP info stream message; update the UMP attributes */</div><div class='add'>+static int ump_handle_ep_info_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	ump-&gt;info.version = (buf-&gt;ep_info.ump_version_major &lt;&lt; 8) |</div><div class='add'>+		buf-&gt;ep_info.ump_version_minor;</div><div class='add'>+	ump-&gt;info.num_blocks = buf-&gt;ep_info.num_function_blocks;</div><div class='add'>+	if (ump-&gt;info.num_blocks &gt; SNDRV_UMP_MAX_BLOCKS) {</div><div class='add'>+		ump_info(ump, "Invalid function blocks %d, fallback to 1\n",</div><div class='add'>+			 ump-&gt;info.num_blocks);</div><div class='add'>+		ump-&gt;info.num_blocks = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;ep_info.static_function_block)</div><div class='add'>+		ump-&gt;info.flags |= SNDRV_UMP_EP_INFO_STATIC_BLOCKS;</div><div class='add'>+</div><div class='add'>+	ump-&gt;info.protocol_caps = (buf-&gt;ep_info.protocol &lt;&lt; 8) |</div><div class='add'>+		buf-&gt;ep_info.jrts;</div><div class='add'>+</div><div class='add'>+	ump_dbg(ump, "EP info: version=%x, num_blocks=%x, proto_caps=%x\n",</div><div class='add'>+		ump-&gt;info.version, ump-&gt;info.num_blocks, ump-&gt;info.protocol_caps);</div><div class='add'>+</div><div class='add'>+	ump-&gt;info.protocol &amp;= ump-&gt;info.protocol_caps;</div><div class='add'>+	choose_default_protocol(ump);</div><div class='add'>+	seq_notify_ep_change(ump);</div><div class='add'>+</div><div class='add'>+	return 1; /* finished */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle EP device info stream message; update the UMP attributes */</div><div class='add'>+static int ump_handle_device_info_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				      const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	ump-&gt;info.manufacturer_id = buf-&gt;device_info.manufacture_id &amp; 0x7f7f7f;</div><div class='add'>+	ump-&gt;info.family_id = (buf-&gt;device_info.family_msb &lt;&lt; 8) |</div><div class='add'>+		buf-&gt;device_info.family_lsb;</div><div class='add'>+	ump-&gt;info.model_id = (buf-&gt;device_info.model_msb &lt;&lt; 8) |</div><div class='add'>+		buf-&gt;device_info.model_lsb;</div><div class='add'>+	ump-&gt;info.sw_revision[0] = (buf-&gt;device_info.sw_revision &gt;&gt; 24) &amp; 0x7f;</div><div class='add'>+	ump-&gt;info.sw_revision[1] = (buf-&gt;device_info.sw_revision &gt;&gt; 16) &amp; 0x7f;</div><div class='add'>+	ump-&gt;info.sw_revision[2] = (buf-&gt;device_info.sw_revision &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+	ump-&gt;info.sw_revision[3] = buf-&gt;device_info.sw_revision &amp; 0x7f;</div><div class='add'>+	ump_dbg(ump, "EP devinfo: manid=%08x, family=%04x, model=%04x, sw=%4phN\n",</div><div class='add'>+		ump-&gt;info.manufacturer_id,</div><div class='add'>+		ump-&gt;info.family_id,</div><div class='add'>+		ump-&gt;info.model_id,</div><div class='add'>+		ump-&gt;info.sw_revision);</div><div class='add'>+	seq_notify_ep_change(ump);</div><div class='add'>+	return 1; /* finished */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up the core rawmidi name from UMP EP name string */</div><div class='add'>+static void ump_set_rawmidi_name(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	safe_copy_string(ump-&gt;core.name, sizeof(ump-&gt;core.name),</div><div class='add'>+			 ump-&gt;info.name, sizeof(ump-&gt;info.name));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle EP name stream message; update the UMP name string */</div><div class='add'>+static int ump_handle_ep_name_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ump_append_string(ump, ump-&gt;info.name, sizeof(ump-&gt;info.name),</div><div class='add'>+				buf-&gt;raw, 2);</div><div class='add'>+	if (ret &amp;&amp; ump-&gt;parsed) {</div><div class='add'>+		ump_set_rawmidi_name(ump);</div><div class='add'>+		ump_legacy_set_rawmidi_name(ump);</div><div class='add'>+		seq_notify_ep_change(ump);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle EP product id stream message; update the UMP product_id string */</div><div class='add'>+static int ump_handle_product_id_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				     const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ump_append_string(ump, ump-&gt;info.product_id,</div><div class='add'>+				sizeof(ump-&gt;info.product_id),</div><div class='add'>+				buf-&gt;raw, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		seq_notify_ep_change(ump);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* notify the protocol change to sequencer */</div><div class='add'>+static void seq_notify_protocol(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	if (ump-&gt;seq_ops &amp;&amp; ump-&gt;seq_ops-&gt;switch_protocol)</div><div class='add'>+		ump-&gt;seq_ops-&gt;switch_protocol(ump);</div><div class='add'>+#endif /* CONFIG_SND_SEQUENCER */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_switch_protocol - switch MIDI protocol</div><div class='add'>+ * @ump: UMP endpoint</div><div class='add'>+ * @protocol: protocol to switch to</div><div class='add'>+ *</div><div class='add'>+ * Returns 1 if the protocol is actually switched, 0 if unchanged</div><div class='add'>+ */</div><div class='add'>+int snd_ump_switch_protocol(struct snd_ump_endpoint *ump, unsigned int protocol)</div><div class='add'>+{</div><div class='add'>+	unsigned int type;</div><div class='add'>+</div><div class='add'>+	protocol &amp;= ump-&gt;info.protocol_caps;</div><div class='add'>+	if (protocol == ump-&gt;info.protocol)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	type = protocol &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK;</div><div class='add'>+	if (type != SNDRV_UMP_EP_INFO_PROTO_MIDI1 &amp;&amp;</div><div class='add'>+	    type != SNDRV_UMP_EP_INFO_PROTO_MIDI2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ump-&gt;info.protocol = protocol;</div><div class='add'>+	ump_dbg(ump, "New protocol = %x (caps = %x)\n",</div><div class='add'>+		protocol, ump-&gt;info.protocol_caps);</div><div class='add'>+	seq_notify_protocol(ump);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_switch_protocol);</div><div class='add'>+</div><div class='add'>+/* handle EP stream config message; update the UMP protocol */</div><div class='add'>+static int ump_handle_stream_cfg_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				     const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int protocol =</div><div class='add'>+		(buf-&gt;stream_cfg.protocol &lt;&lt; 8) | buf-&gt;stream_cfg.jrts;</div><div class='add'>+</div><div class='add'>+	snd_ump_switch_protocol(ump, protocol);</div><div class='add'>+	return 1; /* finished */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Extract Function Block info from UMP packet */</div><div class='add'>+static void fill_fb_info(struct snd_ump_endpoint *ump,</div><div class='add'>+			 struct snd_ump_block_info *info,</div><div class='add'>+			 const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	info-&gt;direction = buf-&gt;fb_info.direction;</div><div class='add'>+	info-&gt;ui_hint = buf-&gt;fb_info.ui_hint;</div><div class='add'>+	info-&gt;first_group = buf-&gt;fb_info.first_group;</div><div class='add'>+	info-&gt;num_groups = buf-&gt;fb_info.num_groups;</div><div class='add'>+	if (buf-&gt;fb_info.midi_10 &lt; 2)</div><div class='add'>+		info-&gt;flags = buf-&gt;fb_info.midi_10;</div><div class='add'>+	else</div><div class='add'>+		info-&gt;flags = SNDRV_UMP_BLOCK_IS_MIDI1 | SNDRV_UMP_BLOCK_IS_LOWSPEED;</div><div class='add'>+	info-&gt;active = buf-&gt;fb_info.active;</div><div class='add'>+	info-&gt;midi_ci_version = buf-&gt;fb_info.midi_ci_version;</div><div class='add'>+	info-&gt;sysex8_streams = buf-&gt;fb_info.sysex8_streams;</div><div class='add'>+</div><div class='add'>+	ump_dbg(ump, "FB %d: dir=%d, active=%d, first_gp=%d, num_gp=%d, midici=%d, sysex8=%d, flags=0x%x\n",</div><div class='add'>+		info-&gt;block_id, info-&gt;direction, info-&gt;active,</div><div class='add'>+		info-&gt;first_group, info-&gt;num_groups, info-&gt;midi_ci_version,</div><div class='add'>+		info-&gt;sysex8_streams, info-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if ((info-&gt;flags &amp; SNDRV_UMP_BLOCK_IS_MIDI1) &amp;&amp; info-&gt;num_groups != 1) {</div><div class='add'>+		info-&gt;num_groups = 1;</div><div class='add'>+		ump_dbg(ump, "FB %d: corrected groups to 1 for MIDI1\n",</div><div class='add'>+			info-&gt;block_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the FB info gets updated by the current message */</div><div class='add'>+static bool is_fb_info_updated(struct snd_ump_endpoint *ump,</div><div class='add'>+			       struct snd_ump_block *fb,</div><div class='add'>+			       const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	char tmpbuf[offsetof(struct snd_ump_block_info, name)];</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;info.flags &amp; SNDRV_UMP_EP_INFO_STATIC_BLOCKS) {</div><div class='add'>+		ump_info(ump, "Skipping static FB info update (blk#%d)\n",</div><div class='add'>+			 fb-&gt;info.block_id);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(tmpbuf, &amp;fb-&gt;info, sizeof(tmpbuf));</div><div class='add'>+	fill_fb_info(ump, (struct snd_ump_block_info *)tmpbuf, buf);</div><div class='add'>+	return memcmp(&amp;fb-&gt;info, tmpbuf, sizeof(tmpbuf)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* notify the FB info/name change to sequencer */</div><div class='add'>+static void seq_notify_fb_change(struct snd_ump_endpoint *ump,</div><div class='add'>+				 struct snd_ump_block *fb)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='add'>+	if (ump-&gt;seq_ops &amp;&amp; ump-&gt;seq_ops-&gt;notify_fb_change)</div><div class='add'>+		ump-&gt;seq_ops-&gt;notify_fb_change(ump, fb);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle FB info message; update FB info if the block is present */</div><div class='add'>+static int ump_handle_fb_info_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned char blk;</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+</div><div class='add'>+	blk = buf-&gt;fb_info.function_block_id;</div><div class='add'>+	fb = snd_ump_get_block(ump, blk);</div><div class='add'>+</div><div class='add'>+	/* complain only if updated after parsing */</div><div class='add'>+	if (!fb &amp;&amp; ump-&gt;parsed) {</div><div class='add'>+		ump_info(ump, "Function Block Info Update for non-existing block %d\n",</div><div class='add'>+			 blk);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When updated after the initial parse, check the FB info update */</div><div class='add'>+	if (ump-&gt;parsed &amp;&amp; !is_fb_info_updated(ump, fb, buf))</div><div class='add'>+		return 1; /* no content change */</div><div class='add'>+</div><div class='add'>+	if (fb) {</div><div class='add'>+		fill_fb_info(ump, &amp;fb-&gt;info, buf);</div><div class='add'>+		if (ump-&gt;parsed) {</div><div class='add'>+			snd_ump_update_group_attrs(ump);</div><div class='add'>+			update_legacy_names(ump);</div><div class='add'>+			seq_notify_fb_change(ump, fb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1; /* finished */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle FB name message; update the FB name string */</div><div class='add'>+static int ump_handle_fb_name_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const union snd_ump_stream_msg *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned char blk;</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	blk = buf-&gt;fb_name.function_block_id;</div><div class='add'>+	fb = snd_ump_get_block(ump, blk);</div><div class='add'>+	if (!fb)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;parsed &amp;&amp;</div><div class='add'>+	    (ump-&gt;info.flags &amp; SNDRV_UMP_EP_INFO_STATIC_BLOCKS)) {</div><div class='add'>+		ump_dbg(ump, "Skipping static FB name update (blk#%d)\n",</div><div class='add'>+			fb-&gt;info.block_id);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ump_append_string(ump, fb-&gt;info.name, sizeof(fb-&gt;info.name),</div><div class='add'>+				buf-&gt;raw, 3);</div><div class='add'>+	/* notify the FB name update to sequencer, too */</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; ump-&gt;parsed) {</div><div class='add'>+		snd_ump_update_group_attrs(ump);</div><div class='add'>+		update_legacy_names(ump);</div><div class='add'>+		seq_notify_fb_change(ump, fb);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_block_from_fb_info(struct snd_ump_endpoint *ump, int blk)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	unsigned char direction, first_group, num_groups;</div><div class='add'>+	const union snd_ump_stream_msg *buf =</div><div class='add'>+		(const union snd_ump_stream_msg *)ump-&gt;input_buf;</div><div class='add'>+	u32 msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* query the FB info once */</div><div class='add'>+	msg = ump_stream_compose(UMP_STREAM_MSG_STATUS_FB_DISCOVERY, 0) |</div><div class='add'>+		(blk &lt;&lt; 8) | UMP_STREAM_MSG_REQUEST_FB_INFO;</div><div class='add'>+	err = ump_req_msg(ump, msg, 0, UMP_STREAM_MSG_STATUS_FB_INFO);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ump_dbg(ump, "Unable to get FB info for block %d\n", blk);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* the last input must be the FB info */</div><div class='add'>+	if (buf-&gt;fb_info.status != UMP_STREAM_MSG_STATUS_FB_INFO) {</div><div class='add'>+		ump_dbg(ump, "Inconsistent input: 0x%x\n", *buf-&gt;raw);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	direction = buf-&gt;fb_info.direction;</div><div class='add'>+	first_group = buf-&gt;fb_info.first_group;</div><div class='add'>+	num_groups = buf-&gt;fb_info.num_groups;</div><div class='add'>+</div><div class='add'>+	err = snd_ump_block_new(ump, blk, direction, first_group, num_groups,</div><div class='add'>+				&amp;fb);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fill_fb_info(ump, &amp;fb-&gt;info, buf);</div><div class='add'>+</div><div class='add'>+	msg = ump_stream_compose(UMP_STREAM_MSG_STATUS_FB_DISCOVERY, 0) |</div><div class='add'>+		(blk &lt;&lt; 8) | UMP_STREAM_MSG_REQUEST_FB_NAME;</div><div class='add'>+	err = ump_req_msg(ump, msg, 0, UMP_STREAM_MSG_STATUS_FB_NAME);</div><div class='add'>+	if (err)</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP FB name string #%d\n", blk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* handle stream messages, called from snd_ump_receive() */</div><div class='add'>+static void ump_handle_stream_msg(struct snd_ump_endpoint *ump,</div><div class='add'>+				  const u32 *buf, int size)</div><div class='add'>+{</div><div class='add'>+	const union snd_ump_stream_msg *msg;</div><div class='add'>+	unsigned int status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* UMP stream message suppressed (for gadget UMP)? */</div><div class='add'>+	if (ump-&gt;no_process_stream)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(*msg) != 16);</div><div class='add'>+	ump_dbg(ump, "Stream msg: %08x %08x %08x %08x\n",</div><div class='add'>+		buf[0], buf[1], buf[2], buf[3]);</div><div class='add'>+</div><div class='add'>+	if (size != 4 || ump_message_type(*buf) != UMP_MSG_TYPE_STREAM)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msg = (const union snd_ump_stream_msg *)buf;</div><div class='add'>+	status = ump_stream_message_status(*buf);</div><div class='add'>+	switch (status) {</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_EP_INFO:</div><div class='add'>+		ret = ump_handle_ep_info_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_DEVICE_INFO:</div><div class='add'>+		ret = ump_handle_device_info_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_EP_NAME:</div><div class='add'>+		ret = ump_handle_ep_name_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_PRODUCT_ID:</div><div class='add'>+		ret = ump_handle_product_id_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_STREAM_CFG:</div><div class='add'>+		ret = ump_handle_stream_cfg_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_FB_INFO:</div><div class='add'>+		ret = ump_handle_fb_info_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_STREAM_MSG_STATUS_FB_NAME:</div><div class='add'>+		ret = ump_handle_fb_name_msg(ump, msg);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* when the message has been processed fully, wake up */</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; ump-&gt;stream_wait_for == status) {</div><div class='add'>+		WRITE_ONCE(ump-&gt;stream_finished, 1);</div><div class='add'>+		wake_up(&amp;ump-&gt;stream_wait);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_parse_endpoint - parse endpoint and create function blocks</div><div class='add'>+ * @ump: UMP object</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 for successful parse, -ENODEV if device doesn't respond</div><div class='add'>+ * (or the query is unsupported), or other error code for serious errors.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_parse_endpoint(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	int blk, err;</div><div class='add'>+	u32 msg;</div><div class='add'>+</div><div class='add'>+	if (!(ump-&gt;core.info_flags &amp; SNDRV_RAWMIDI_INFO_DUPLEX))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = ump_request_open(ump);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ump_dbg(ump, "Unable to open rawmidi device: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check Endpoint Information */</div><div class='add'>+	msg = ump_stream_compose(UMP_STREAM_MSG_STATUS_EP_DISCOVERY, 0) |</div><div class='add'>+		0x0101; /* UMP version 1.1 */</div><div class='add'>+	err = ump_req_msg(ump, msg, UMP_STREAM_MSG_REQUEST_EP_INFO,</div><div class='add'>+			  UMP_STREAM_MSG_STATUS_EP_INFO);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP EP info\n");</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Request Endpoint Device Info */</div><div class='add'>+	err = ump_req_msg(ump, msg, UMP_STREAM_MSG_REQUEST_DEVICE_INFO,</div><div class='add'>+			  UMP_STREAM_MSG_STATUS_DEVICE_INFO);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP EP device info\n");</div><div class='add'>+</div><div class='add'>+	/* Request Endpoint Name */</div><div class='add'>+	err = ump_req_msg(ump, msg, UMP_STREAM_MSG_REQUEST_EP_NAME,</div><div class='add'>+			  UMP_STREAM_MSG_STATUS_EP_NAME);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP EP name string\n");</div><div class='add'>+</div><div class='add'>+	ump_set_rawmidi_name(ump);</div><div class='add'>+</div><div class='add'>+	/* Request Endpoint Product ID */</div><div class='add'>+	err = ump_req_msg(ump, msg, UMP_STREAM_MSG_REQUEST_PRODUCT_ID,</div><div class='add'>+			  UMP_STREAM_MSG_STATUS_PRODUCT_ID);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP EP product ID string\n");</div><div class='add'>+</div><div class='add'>+	/* Get the current stream configuration */</div><div class='add'>+	err = ump_req_msg(ump, msg, UMP_STREAM_MSG_REQUEST_STREAM_CFG,</div><div class='add'>+			  UMP_STREAM_MSG_STATUS_STREAM_CFG);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		ump_dbg(ump, "Unable to get UMP EP stream config\n");</div><div class='add'>+</div><div class='add'>+	/* If no protocol is set by some reason, assume the valid one */</div><div class='add'>+	choose_default_protocol(ump);</div><div class='add'>+</div><div class='add'>+	/* Query and create blocks from Function Blocks */</div><div class='add'>+	for (blk = 0; blk &lt; ump-&gt;info.num_blocks; blk++) {</div><div class='add'>+		err = create_block_from_fb_info(ump, blk);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize group attributions */</div><div class='add'>+	snd_ump_update_group_attrs(ump);</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	ump-&gt;parsed = true;</div><div class='add'>+	ump_request_close(ump);</div><div class='add'>+	if (err == -ETIMEDOUT)</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_parse_endpoint);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI)</div><div class='add'>+/*</div><div class='add'>+ * Legacy rawmidi support</div><div class='add'>+ */</div><div class='add'>+static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+	int group = ump-&gt;legacy_mapping[substream-&gt;number];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ump-&gt;open_mutex);</div><div class='add'>+	if (ump-&gt;legacy_substreams[dir][group])</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	if (!ump-&gt;groups[group].active)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (dir == SNDRV_RAWMIDI_STREAM_OUTPUT) {</div><div class='add'>+		if (!ump-&gt;legacy_out_opens) {</div><div class='add'>+			err = snd_rawmidi_kernel_open(&amp;ump-&gt;core, 0,</div><div class='add'>+						      SNDRV_RAWMIDI_LFLG_OUTPUT |</div><div class='add'>+						      SNDRV_RAWMIDI_LFLG_APPEND,</div><div class='add'>+						      &amp;ump-&gt;legacy_out_rfile);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+		ump-&gt;legacy_out_opens++;</div><div class='add'>+		snd_ump_convert_reset(&amp;ump-&gt;out_cvts[group]);</div><div class='add'>+	}</div><div class='add'>+	guard(spinlock_irq)(&amp;ump-&gt;legacy_locks[dir]);</div><div class='add'>+	ump-&gt;legacy_substreams[dir][group] = substream;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ump_legacy_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+	int group = ump-&gt;legacy_mapping[substream-&gt;number];</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ump-&gt;open_mutex);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ump-&gt;legacy_locks[dir])</div><div class='add'>+		ump-&gt;legacy_substreams[dir][group] = NULL;</div><div class='add'>+	if (dir == SNDRV_RAWMIDI_STREAM_OUTPUT) {</div><div class='add'>+		if (!--ump-&gt;legacy_out_opens)</div><div class='add'>+			snd_rawmidi_kernel_release(&amp;ump-&gt;legacy_out_rfile);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ump_legacy_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				   int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int dir = substream-&gt;stream;</div><div class='add'>+</div><div class='add'>+	ump-&gt;ops-&gt;trigger(ump, dir, up);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ump_legacy_drain(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_endpoint *ump = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;ops-&gt;drain)</div><div class='add'>+		ump-&gt;ops-&gt;drain(ump, SNDRV_RAWMIDI_STREAM_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ump_legacy_dev_register(struct snd_rawmidi *rmidi)</div><div class='add'>+{</div><div class='add'>+	/* dummy, just for avoiding create superfluous seq clients */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_ump_legacy_input_ops = {</div><div class='add'>+	.open = snd_ump_legacy_open,</div><div class='add'>+	.close = snd_ump_legacy_close,</div><div class='add'>+	.trigger = snd_ump_legacy_trigger,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_ump_legacy_output_ops = {</div><div class='add'>+	.open = snd_ump_legacy_open,</div><div class='add'>+	.close = snd_ump_legacy_close,</div><div class='add'>+	.trigger = snd_ump_legacy_trigger,</div><div class='add'>+	.drain = snd_ump_legacy_drain,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_global_ops snd_ump_legacy_ops = {</div><div class='add'>+	.dev_register = snd_ump_legacy_dev_register,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int process_legacy_output(struct snd_ump_endpoint *ump,</div><div class='add'>+				 u32 *buffer, int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	struct ump_cvt_to_ump *ctx;</div><div class='add'>+	const int dir = SNDRV_RAWMIDI_STREAM_OUTPUT;</div><div class='add'>+	unsigned int protocol;</div><div class='add'>+	unsigned char c;</div><div class='add'>+	int group, size = 0;</div><div class='add'>+</div><div class='add'>+	if (!ump-&gt;out_cvts || !ump-&gt;legacy_out_opens)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ump-&gt;legacy_locks[dir]);</div><div class='add'>+	for (group = 0; group &lt; SNDRV_UMP_MAX_GROUPS; group++) {</div><div class='add'>+		substream = ump-&gt;legacy_substreams[dir][group];</div><div class='add'>+		if (!substream)</div><div class='add'>+			continue;</div><div class='add'>+		ctx = &amp;ump-&gt;out_cvts[group];</div><div class='add'>+		protocol = ump-&gt;info.protocol;</div><div class='add'>+		if ((protocol &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI2) &amp;&amp;</div><div class='add'>+		    ump-&gt;groups[group].is_midi1)</div><div class='add'>+			protocol = SNDRV_UMP_EP_INFO_PROTO_MIDI1;</div><div class='add'>+		while (!ctx-&gt;ump_bytes &amp;&amp;</div><div class='add'>+		       snd_rawmidi_transmit(substream, &amp;c, 1) &gt; 0)</div><div class='add'>+			snd_ump_convert_to_ump(ctx, group, protocol, c);</div><div class='add'>+		if (ctx-&gt;ump_bytes &amp;&amp; ctx-&gt;ump_bytes &lt;= count) {</div><div class='add'>+			size = ctx-&gt;ump_bytes;</div><div class='add'>+			memcpy(buffer, ctx-&gt;ump, size);</div><div class='add'>+			ctx-&gt;ump_bytes = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_legacy_input(struct snd_ump_endpoint *ump, const u32 *src,</div><div class='add'>+				 int words)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	unsigned char buf[16];</div><div class='add'>+	unsigned char group;</div><div class='add'>+	const int dir = SNDRV_RAWMIDI_STREAM_INPUT;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	size = snd_ump_convert_from_ump(src, buf, &amp;group);</div><div class='add'>+	if (size &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ump-&gt;legacy_locks[dir]);</div><div class='add'>+	substream = ump-&gt;legacy_substreams[dir][group];</div><div class='add'>+	if (substream)</div><div class='add'>+		snd_rawmidi_receive(substream, buf, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fill ump-&gt;legacy_mapping[] for groups to be used for legacy rawmidi */</div><div class='add'>+static int fill_legacy_mapping(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct snd_ump_block *fb;</div><div class='add'>+	unsigned int group_maps = 0;</div><div class='add'>+	int i, num;</div><div class='add'>+</div><div class='add'>+	if (ump-&gt;info.flags &amp; SNDRV_UMP_EP_INFO_STATIC_BLOCKS) {</div><div class='add'>+		list_for_each_entry(fb, &amp;ump-&gt;block_list, list) {</div><div class='add'>+			for (i = 0; i &lt; fb-&gt;info.num_groups; i++)</div><div class='add'>+				group_maps |= 1U &lt;&lt; (fb-&gt;info.first_group + i);</div><div class='add'>+		}</div><div class='add'>+		if (!group_maps)</div><div class='add'>+			ump_info(ump, "No UMP Group is found in FB\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* use all groups for non-static case */</div><div class='add'>+	if (!group_maps)</div><div class='add'>+		group_maps = (1U &lt;&lt; SNDRV_UMP_MAX_GROUPS) - 1;</div><div class='add'>+</div><div class='add'>+	num = 0;</div><div class='add'>+	for (i = 0; i &lt; SNDRV_UMP_MAX_GROUPS; i++)</div><div class='add'>+		if (group_maps &amp; (1U &lt;&lt; i))</div><div class='add'>+			ump-&gt;legacy_mapping[num++] = i;</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_legacy_substreams(struct snd_ump_endpoint *ump,</div><div class='add'>+				     struct snd_rawmidi *rmidi, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *s;</div><div class='add'>+	const char *name;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;rmidi-&gt;streams[dir].substreams, list) {</div><div class='add'>+		idx = ump-&gt;legacy_mapping[s-&gt;number];</div><div class='add'>+		name = ump-&gt;groups[idx].name;</div><div class='add'>+		if (!*name)</div><div class='add'>+			name = ump-&gt;core.name;</div><div class='add'>+		scnprintf(s-&gt;name, sizeof(s-&gt;name), "Group %d (%.16s)%s",</div><div class='add'>+			  idx + 1, name,</div><div class='add'>+			  ump-&gt;groups[idx].active ? "" : " [Inactive]");</div><div class='add'>+		s-&gt;inactive = !ump-&gt;groups[idx].active;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_legacy_names(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rmidi = ump-&gt;legacy_rmidi;</div><div class='add'>+</div><div class='add'>+	update_legacy_substreams(ump, rmidi, SNDRV_RAWMIDI_STREAM_INPUT);</div><div class='add'>+	update_legacy_substreams(ump, rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ump_legacy_set_rawmidi_name(struct snd_ump_endpoint *ump)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rmidi = ump-&gt;legacy_rmidi;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name), "%.68s (MIDI 1.0)",</div><div class='add'>+		 ump-&gt;core.name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump,</div><div class='add'>+				  char *id, int device)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	bool input, output;</div><div class='add'>+	int err, num;</div><div class='add'>+</div><div class='add'>+	ump-&gt;out_cvts = kcalloc(SNDRV_UMP_MAX_GROUPS,</div><div class='add'>+				sizeof(*ump-&gt;out_cvts), GFP_KERNEL);</div><div class='add'>+	if (!ump-&gt;out_cvts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	num = fill_legacy_mapping(ump);</div><div class='add'>+</div><div class='add'>+	input = ump-&gt;core.info_flags &amp; SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+	output = ump-&gt;core.info_flags &amp; SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+	err = snd_rawmidi_new(ump-&gt;core.card, id, device,</div><div class='add'>+			      output ? num : 0, input ? num : 0,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(ump-&gt;out_cvts);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (input)</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;snd_ump_legacy_input_ops);</div><div class='add'>+	if (output)</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;snd_ump_legacy_output_ops);</div><div class='add'>+	rmidi-&gt;info_flags = ump-&gt;core.info_flags &amp; ~SNDRV_RAWMIDI_INFO_UMP;</div><div class='add'>+	rmidi-&gt;ops = &amp;snd_ump_legacy_ops;</div><div class='add'>+	rmidi-&gt;private_data = ump;</div><div class='add'>+	ump-&gt;legacy_rmidi = rmidi;</div><div class='add'>+	ump_legacy_set_rawmidi_name(ump);</div><div class='add'>+	update_legacy_names(ump);</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_tie_devices(rmidi, &amp;ump-&gt;core);</div><div class='add'>+</div><div class='add'>+	ump_dbg(ump, "Created a legacy rawmidi #%d (%s)\n", device, id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_attach_legacy_rawmidi);</div><div class='add'>+#endif /* CONFIG_SND_UMP_LEGACY_RAWMIDI */</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Universal MIDI Packet (UMP) Core Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/core/ump_convert.c b/sound/core/ump_convert.c<br/>new file mode 100644<br/>index 000000000000..0fe13d031656<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/ump_convert.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/ump_convert.c</a></div><div class='hunk'>@@ -0,0 +1,528 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Helpers for UMP &lt;-&gt; MIDI 1.0 byte stream conversion</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/asound.h&gt;</div><div class='add'>+#include &lt;sound/ump.h&gt;</div><div class='add'>+#include &lt;sound/ump_convert.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Upgrade / downgrade value bits</div><div class='add'>+ */</div><div class='add'>+static u8 downscale_32_to_7bit(u32 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 25;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 downscale_32_to_14bit(u32 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 18;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 downscale_16_to_7bit(u16 src)</div><div class='add'>+{</div><div class='add'>+	return src &gt;&gt; 9;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 upscale_7_to_16bit(u8 src)</div><div class='add'>+{</div><div class='add'>+	u16 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = (u16)src &lt;&lt; 9;</div><div class='add'>+	if (src &lt;= 0x40)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x3f;</div><div class='add'>+	return val | (repeat &lt;&lt; 3) | (repeat &gt;&gt; 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 upscale_7_to_32bit(u8 src)</div><div class='add'>+{</div><div class='add'>+	u32 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = src &lt;&lt; 25;</div><div class='add'>+	if (src &lt;= 0x40)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x3f;</div><div class='add'>+	return val | (repeat &lt;&lt; 19) | (repeat &lt;&lt; 13) |</div><div class='add'>+		(repeat &lt;&lt; 7) | (repeat &lt;&lt; 1) | (repeat &gt;&gt; 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 upscale_14_to_32bit(u16 src)</div><div class='add'>+{</div><div class='add'>+	u32 val, repeat;</div><div class='add'>+</div><div class='add'>+	val = src &lt;&lt; 18;</div><div class='add'>+	if (src &lt;= 0x2000)</div><div class='add'>+		return val;</div><div class='add'>+	repeat = src &amp; 0x1fff;</div><div class='add'>+	return val | (repeat &lt;&lt; 5) | (repeat &gt;&gt; 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * UMP -&gt; MIDI 1 byte stream conversion</div><div class='add'>+ */</div><div class='add'>+/* convert a UMP System message to MIDI 1.0 byte stream */</div><div class='add'>+static int cvt_ump_system_to_legacy(u32 data, unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	buf[0] = ump_message_status_channel(data);</div><div class='add'>+	switch (ump_message_status_code(data)) {</div><div class='add'>+	case UMP_SYSTEM_STATUS_MIDI_TIME_CODE:</div><div class='add'>+	case UMP_SYSTEM_STATUS_SONG_SELECT:</div><div class='add'>+		buf[1] = (data &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+		return 2;</div><div class='add'>+	case UMP_SYSTEM_STATUS_SONG_POSITION:</div><div class='add'>+		buf[1] = (data &gt;&gt; 8) &amp; 0x7f;</div><div class='add'>+		buf[2] = data &amp; 0x7f;</div><div class='add'>+		return 3;</div><div class='add'>+	default:</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert a UMP MIDI 1.0 Channel Voice message to MIDI 1.0 byte stream */</div><div class='add'>+static int cvt_ump_midi1_to_legacy(u32 data, unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	buf[0] = ump_message_status_channel(data);</div><div class='add'>+	buf[1] = (data &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	switch (ump_message_status_code(data)) {</div><div class='add'>+	case UMP_MSG_STATUS_PROGRAM:</div><div class='add'>+	case UMP_MSG_STATUS_CHANNEL_PRESSURE:</div><div class='add'>+		return 2;</div><div class='add'>+	default:</div><div class='add'>+		buf[2] = data &amp; 0xff;</div><div class='add'>+		return 3;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert a UMP MIDI 2.0 Channel Voice message to MIDI 1.0 byte stream */</div><div class='add'>+static int cvt_ump_midi2_to_legacy(const union snd_ump_midi2_msg *midi2,</div><div class='add'>+				   unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned char status = midi2-&gt;note.status;</div><div class='add'>+	unsigned char channel = midi2-&gt;note.channel;</div><div class='add'>+	u16 v;</div><div class='add'>+</div><div class='add'>+	buf[0] = (status &lt;&lt; 4) | channel;</div><div class='add'>+	switch (status) {</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_OFF:</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_ON:</div><div class='add'>+		buf[1] = midi2-&gt;note.note;</div><div class='add'>+		buf[2] = downscale_16_to_7bit(midi2-&gt;note.velocity);</div><div class='add'>+		if (status == UMP_MSG_STATUS_NOTE_ON &amp;&amp; !buf[2])</div><div class='add'>+			buf[2] = 1;</div><div class='add'>+		return 3;</div><div class='add'>+	case UMP_MSG_STATUS_POLY_PRESSURE:</div><div class='add'>+		buf[1] = midi2-&gt;paf.note;</div><div class='add'>+		buf[2] = downscale_32_to_7bit(midi2-&gt;paf.data);</div><div class='add'>+		return 3;</div><div class='add'>+	case UMP_MSG_STATUS_CC:</div><div class='add'>+		buf[1] = midi2-&gt;cc.index;</div><div class='add'>+		buf[2] = downscale_32_to_7bit(midi2-&gt;cc.data);</div><div class='add'>+		return 3;</div><div class='add'>+	case UMP_MSG_STATUS_CHANNEL_PRESSURE:</div><div class='add'>+		buf[1] = downscale_32_to_7bit(midi2-&gt;caf.data);</div><div class='add'>+		return 2;</div><div class='add'>+	case UMP_MSG_STATUS_PROGRAM:</div><div class='add'>+		if (midi2-&gt;pg.bank_valid) {</div><div class='add'>+			buf[0] = channel | (UMP_MSG_STATUS_CC &lt;&lt; 4);</div><div class='add'>+			buf[1] = UMP_CC_BANK_SELECT;</div><div class='add'>+			buf[2] = midi2-&gt;pg.bank_msb;</div><div class='add'>+			buf[3] = channel | (UMP_MSG_STATUS_CC &lt;&lt; 4);</div><div class='add'>+			buf[4] = UMP_CC_BANK_SELECT_LSB;</div><div class='add'>+			buf[5] = midi2-&gt;pg.bank_lsb;</div><div class='add'>+			buf[6] = channel | (UMP_MSG_STATUS_PROGRAM &lt;&lt; 4);</div><div class='add'>+			buf[7] = midi2-&gt;pg.program;</div><div class='add'>+			return 8;</div><div class='add'>+		}</div><div class='add'>+		buf[1] = midi2-&gt;pg.program;</div><div class='add'>+		return 2;</div><div class='add'>+	case UMP_MSG_STATUS_PITCH_BEND:</div><div class='add'>+		v = downscale_32_to_14bit(midi2-&gt;pb.data);</div><div class='add'>+		buf[1] = v &amp; 0x7f;</div><div class='add'>+		buf[2] = v &gt;&gt; 7;</div><div class='add'>+		return 3;</div><div class='add'>+	case UMP_MSG_STATUS_RPN:</div><div class='add'>+	case UMP_MSG_STATUS_NRPN:</div><div class='add'>+		buf[0] = channel | (UMP_MSG_STATUS_CC &lt;&lt; 4);</div><div class='add'>+		buf[1] = status == UMP_MSG_STATUS_RPN ? UMP_CC_RPN_MSB : UMP_CC_NRPN_MSB;</div><div class='add'>+		buf[2] = midi2-&gt;rpn.bank;</div><div class='add'>+		buf[3] = buf[0];</div><div class='add'>+		buf[4] = status == UMP_MSG_STATUS_RPN ? UMP_CC_RPN_LSB : UMP_CC_NRPN_LSB;</div><div class='add'>+		buf[5] = midi2-&gt;rpn.index;</div><div class='add'>+		buf[6] = buf[0];</div><div class='add'>+		buf[7] = UMP_CC_DATA;</div><div class='add'>+		v = downscale_32_to_14bit(midi2-&gt;rpn.data);</div><div class='add'>+		buf[8] = v &gt;&gt; 7;</div><div class='add'>+		buf[9] = buf[0];</div><div class='add'>+		buf[10] = UMP_CC_DATA_LSB;</div><div class='add'>+		buf[11] = v &amp; 0x7f;</div><div class='add'>+		return 12;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert a UMP 7-bit SysEx message to MIDI 1.0 byte stream */</div><div class='add'>+static int cvt_ump_sysex7_to_legacy(const u32 *data, unsigned char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned char status;</div><div class='add'>+	unsigned char bytes;</div><div class='add'>+	int size, offset;</div><div class='add'>+</div><div class='add'>+	status = ump_sysex_message_status(*data);</div><div class='add'>+	if (status &gt; UMP_SYSEX_STATUS_END)</div><div class='add'>+		return 0; // unsupported, skip</div><div class='add'>+	bytes = ump_sysex_message_length(*data);</div><div class='add'>+	if (bytes &gt; 6)</div><div class='add'>+		return 0; // skip</div><div class='add'>+</div><div class='add'>+	size = 0;</div><div class='add'>+	if (status == UMP_SYSEX_STATUS_SINGLE ||</div><div class='add'>+	    status == UMP_SYSEX_STATUS_START) {</div><div class='add'>+		buf[0] = UMP_MIDI1_MSG_SYSEX_START;</div><div class='add'>+		size = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offset = 8;</div><div class='add'>+	for (; bytes; bytes--, size++) {</div><div class='add'>+		buf[size] = (*data &gt;&gt; offset) &amp; 0x7f;</div><div class='add'>+		if (!offset) {</div><div class='add'>+			offset = 24;</div><div class='add'>+			data++;</div><div class='add'>+		} else {</div><div class='add'>+			offset -= 8;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status == UMP_SYSEX_STATUS_SINGLE ||</div><div class='add'>+	    status == UMP_SYSEX_STATUS_END)</div><div class='add'>+		buf[size++] = UMP_MIDI1_MSG_SYSEX_END;</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_convert_from_ump - convert from UMP to legacy MIDI</div><div class='add'>+ * @data: UMP packet</div><div class='add'>+ * @buf: buffer to store legacy MIDI data</div><div class='add'>+ * @group_ret: pointer to store the target group</div><div class='add'>+ *</div><div class='add'>+ * Convert from a UMP packet @data to MIDI 1.0 bytes at @buf.</div><div class='add'>+ * The target group is stored at @group_ret.</div><div class='add'>+ *</div><div class='add'>+ * The function returns the number of bytes of MIDI 1.0 stream.</div><div class='add'>+ */</div><div class='add'>+int snd_ump_convert_from_ump(const u32 *data,</div><div class='add'>+			     unsigned char *buf,</div><div class='add'>+			     unsigned char *group_ret)</div><div class='add'>+{</div><div class='add'>+	*group_ret = ump_message_group(*data);</div><div class='add'>+</div><div class='add'>+	switch (ump_message_type(*data)) {</div><div class='add'>+	case UMP_MSG_TYPE_SYSTEM:</div><div class='add'>+		return cvt_ump_system_to_legacy(*data, buf);</div><div class='add'>+	case UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE:</div><div class='add'>+		return cvt_ump_midi1_to_legacy(*data, buf);</div><div class='add'>+	case UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE:</div><div class='add'>+		return cvt_ump_midi2_to_legacy((const union snd_ump_midi2_msg *)data,</div><div class='add'>+					       buf);</div><div class='add'>+	case UMP_MSG_TYPE_DATA:</div><div class='add'>+		return cvt_ump_sysex7_to_legacy(data, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_convert_from_ump);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MIDI 1 byte stream -&gt; UMP conversion</div><div class='add'>+ */</div><div class='add'>+/* convert MIDI 1.0 SysEx to a UMP packet */</div><div class='add'>+static int cvt_legacy_sysex_to_ump(struct ump_cvt_to_ump *cvt,</div><div class='add'>+				   unsigned char group, u32 *data, bool finish)</div><div class='add'>+{</div><div class='add'>+	unsigned char status;</div><div class='add'>+	bool start = cvt-&gt;in_sysex == 1;</div><div class='add'>+	int i, offset;</div><div class='add'>+</div><div class='add'>+	if (start &amp;&amp; finish)</div><div class='add'>+		status = UMP_SYSEX_STATUS_SINGLE;</div><div class='add'>+	else if (start)</div><div class='add'>+		status = UMP_SYSEX_STATUS_START;</div><div class='add'>+	else if (finish)</div><div class='add'>+		status = UMP_SYSEX_STATUS_END;</div><div class='add'>+	else</div><div class='add'>+		status = UMP_SYSEX_STATUS_CONTINUE;</div><div class='add'>+	*data = ump_compose(UMP_MSG_TYPE_DATA, group, status, cvt-&gt;len);</div><div class='add'>+	offset = 8;</div><div class='add'>+	for (i = 0; i &lt; cvt-&gt;len; i++) {</div><div class='add'>+		*data |= cvt-&gt;buf[i] &lt;&lt; offset;</div><div class='add'>+		if (!offset) {</div><div class='add'>+			offset = 24;</div><div class='add'>+			data++;</div><div class='add'>+		} else</div><div class='add'>+			offset -= 8;</div><div class='add'>+	}</div><div class='add'>+	cvt-&gt;len = 0;</div><div class='add'>+	if (finish)</div><div class='add'>+		cvt-&gt;in_sysex = 0;</div><div class='add'>+	else</div><div class='add'>+		cvt-&gt;in_sysex++;</div><div class='add'>+	return 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert to a UMP System message */</div><div class='add'>+static int cvt_legacy_system_to_ump(struct ump_cvt_to_ump *cvt,</div><div class='add'>+				    unsigned char group, u32 *data)</div><div class='add'>+{</div><div class='add'>+	data[0] = ump_compose(UMP_MSG_TYPE_SYSTEM, group, 0, cvt-&gt;buf[0]);</div><div class='add'>+	if (cvt-&gt;cmd_bytes &gt; 1)</div><div class='add'>+		data[0] |= cvt-&gt;buf[1] &lt;&lt; 8;</div><div class='add'>+	if (cvt-&gt;cmd_bytes &gt; 2)</div><div class='add'>+		data[0] |= cvt-&gt;buf[2];</div><div class='add'>+	return 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_rpn(struct ump_cvt_to_ump_bank *cc)</div><div class='add'>+{</div><div class='add'>+	cc-&gt;rpn_set = 0;</div><div class='add'>+	cc-&gt;nrpn_set = 0;</div><div class='add'>+	cc-&gt;cc_rpn_msb = cc-&gt;cc_rpn_lsb = 0;</div><div class='add'>+	cc-&gt;cc_data_msb = cc-&gt;cc_data_lsb = 0;</div><div class='add'>+	cc-&gt;cc_data_msb_set = cc-&gt;cc_data_lsb_set = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_rpn(struct ump_cvt_to_ump_bank *cc,</div><div class='add'>+		    union snd_ump_midi2_msg *midi2,</div><div class='add'>+		    bool flush)</div><div class='add'>+{</div><div class='add'>+	if (!(cc-&gt;cc_data_lsb_set || cc-&gt;cc_data_msb_set))</div><div class='add'>+		return 0; // skip</div><div class='add'>+	/* when not flushing, wait for complete data set */</div><div class='add'>+	if (!flush &amp;&amp; (!cc-&gt;cc_data_lsb_set || !cc-&gt;cc_data_msb_set))</div><div class='add'>+		return 0; // skip</div><div class='add'>+</div><div class='add'>+	if (cc-&gt;rpn_set) {</div><div class='add'>+		midi2-&gt;rpn.status = UMP_MSG_STATUS_RPN;</div><div class='add'>+		midi2-&gt;rpn.bank = cc-&gt;cc_rpn_msb;</div><div class='add'>+		midi2-&gt;rpn.index = cc-&gt;cc_rpn_lsb;</div><div class='add'>+	} else if (cc-&gt;nrpn_set) {</div><div class='add'>+		midi2-&gt;rpn.status = UMP_MSG_STATUS_NRPN;</div><div class='add'>+		midi2-&gt;rpn.bank = cc-&gt;cc_nrpn_msb;</div><div class='add'>+		midi2-&gt;rpn.index = cc-&gt;cc_nrpn_lsb;</div><div class='add'>+	} else {</div><div class='add'>+		return 0; // skip</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	midi2-&gt;rpn.data = upscale_14_to_32bit((cc-&gt;cc_data_msb &lt;&lt; 7) |</div><div class='add'>+					      cc-&gt;cc_data_lsb);</div><div class='add'>+</div><div class='add'>+	reset_rpn(cc);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert to a MIDI 1.0 Channel Voice message */</div><div class='add'>+static int cvt_legacy_cmd_to_ump(struct ump_cvt_to_ump *cvt,</div><div class='add'>+				 unsigned char group,</div><div class='add'>+				 unsigned int protocol,</div><div class='add'>+				 u32 *data, unsigned char bytes)</div><div class='add'>+{</div><div class='add'>+	const unsigned char *buf = cvt-&gt;buf;</div><div class='add'>+	struct ump_cvt_to_ump_bank *cc;</div><div class='add'>+	union snd_ump_midi2_msg *midi2 = (union snd_ump_midi2_msg *)data;</div><div class='add'>+	unsigned char status, channel;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(union snd_ump_midi1_msg) != 4);</div><div class='add'>+	BUILD_BUG_ON(sizeof(union snd_ump_midi2_msg) != 8);</div><div class='add'>+</div><div class='add'>+	/* for MIDI 1.0 UMP, it's easy, just pack it into UMP */</div><div class='add'>+	if (protocol &amp; SNDRV_UMP_EP_INFO_PROTO_MIDI1) {</div><div class='add'>+		data[0] = ump_compose(UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE,</div><div class='add'>+				      group, 0, buf[0]);</div><div class='add'>+		data[0] |= buf[1] &lt;&lt; 8;</div><div class='add'>+		if (bytes &gt; 2)</div><div class='add'>+			data[0] |= buf[2];</div><div class='add'>+		return 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = *buf &gt;&gt; 4;</div><div class='add'>+	channel = *buf &amp; 0x0f;</div><div class='add'>+	cc = &amp;cvt-&gt;bank[channel];</div><div class='add'>+</div><div class='add'>+	/* special handling: treat note-on with 0 velocity as note-off */</div><div class='add'>+	if (status == UMP_MSG_STATUS_NOTE_ON &amp;&amp; !buf[2])</div><div class='add'>+		status = UMP_MSG_STATUS_NOTE_OFF;</div><div class='add'>+</div><div class='add'>+	/* initialize the packet */</div><div class='add'>+	data[0] = ump_compose(UMP_MSG_TYPE_MIDI2_CHANNEL_VOICE,</div><div class='add'>+			      group, status, channel);</div><div class='add'>+	data[1] = 0;</div><div class='add'>+</div><div class='add'>+	switch (status) {</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_ON:</div><div class='add'>+	case UMP_MSG_STATUS_NOTE_OFF:</div><div class='add'>+		midi2-&gt;note.note = buf[1];</div><div class='add'>+		midi2-&gt;note.velocity = upscale_7_to_16bit(buf[2]);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_POLY_PRESSURE:</div><div class='add'>+		midi2-&gt;paf.note = buf[1];</div><div class='add'>+		midi2-&gt;paf.data = upscale_7_to_32bit(buf[2]);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CC:</div><div class='add'>+		switch (buf[1]) {</div><div class='add'>+		case UMP_CC_RPN_MSB:</div><div class='add'>+			ret = fill_rpn(cc, midi2, true);</div><div class='add'>+			cc-&gt;rpn_set = 1;</div><div class='add'>+			cc-&gt;cc_rpn_msb = buf[2];</div><div class='add'>+			if (cc-&gt;cc_rpn_msb == 0x7f &amp;&amp; cc-&gt;cc_rpn_lsb == 0x7f)</div><div class='add'>+				reset_rpn(cc);</div><div class='add'>+			return ret;</div><div class='add'>+		case UMP_CC_RPN_LSB:</div><div class='add'>+			ret = fill_rpn(cc, midi2, true);</div><div class='add'>+			cc-&gt;rpn_set = 1;</div><div class='add'>+			cc-&gt;cc_rpn_lsb = buf[2];</div><div class='add'>+			if (cc-&gt;cc_rpn_msb == 0x7f &amp;&amp; cc-&gt;cc_rpn_lsb == 0x7f)</div><div class='add'>+				reset_rpn(cc);</div><div class='add'>+			return ret;</div><div class='add'>+		case UMP_CC_NRPN_MSB:</div><div class='add'>+			ret = fill_rpn(cc, midi2, true);</div><div class='add'>+			cc-&gt;nrpn_set = 1;</div><div class='add'>+			cc-&gt;cc_nrpn_msb = buf[2];</div><div class='add'>+			return ret;</div><div class='add'>+		case UMP_CC_NRPN_LSB:</div><div class='add'>+			ret = fill_rpn(cc, midi2, true);</div><div class='add'>+			cc-&gt;nrpn_set = 1;</div><div class='add'>+			cc-&gt;cc_nrpn_lsb = buf[2];</div><div class='add'>+			return ret;</div><div class='add'>+		case UMP_CC_DATA:</div><div class='add'>+			cc-&gt;cc_data_msb_set = 1;</div><div class='add'>+			cc-&gt;cc_data_msb = buf[2];</div><div class='add'>+			return fill_rpn(cc, midi2, false);</div><div class='add'>+		case UMP_CC_BANK_SELECT:</div><div class='add'>+			cc-&gt;bank_set = 1;</div><div class='add'>+			cc-&gt;cc_bank_msb = buf[2];</div><div class='add'>+			return 0; // skip</div><div class='add'>+		case UMP_CC_BANK_SELECT_LSB:</div><div class='add'>+			cc-&gt;bank_set = 1;</div><div class='add'>+			cc-&gt;cc_bank_lsb = buf[2];</div><div class='add'>+			return 0; // skip</div><div class='add'>+		case UMP_CC_DATA_LSB:</div><div class='add'>+			cc-&gt;cc_data_lsb_set = 1;</div><div class='add'>+			cc-&gt;cc_data_lsb = buf[2];</div><div class='add'>+			return fill_rpn(cc, midi2, false);</div><div class='add'>+		default:</div><div class='add'>+			midi2-&gt;cc.index = buf[1];</div><div class='add'>+			midi2-&gt;cc.data = upscale_7_to_32bit(buf[2]);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PROGRAM:</div><div class='add'>+		midi2-&gt;pg.program = buf[1];</div><div class='add'>+		if (cc-&gt;bank_set) {</div><div class='add'>+			midi2-&gt;pg.bank_valid = 1;</div><div class='add'>+			midi2-&gt;pg.bank_msb = cc-&gt;cc_bank_msb;</div><div class='add'>+			midi2-&gt;pg.bank_lsb = cc-&gt;cc_bank_lsb;</div><div class='add'>+			cc-&gt;bank_set = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_CHANNEL_PRESSURE:</div><div class='add'>+		midi2-&gt;caf.data = upscale_7_to_32bit(buf[1]);</div><div class='add'>+		break;</div><div class='add'>+	case UMP_MSG_STATUS_PITCH_BEND:</div><div class='add'>+		midi2-&gt;pb.data = upscale_14_to_32bit(buf[1] | (buf[2] &lt;&lt; 7));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_convert_to_ump(struct ump_cvt_to_ump *cvt, unsigned char group,</div><div class='add'>+			     unsigned int protocol, unsigned char c, u32 *data)</div><div class='add'>+{</div><div class='add'>+	/* bytes for 0x80-0xf0 */</div><div class='add'>+	static unsigned char cmd_bytes[8] = {</div><div class='add'>+		3, 3, 3, 3, 2, 2, 3, 0</div><div class='add'>+	};</div><div class='add'>+	/* bytes for 0xf0-0xff */</div><div class='add'>+	static unsigned char system_bytes[16] = {</div><div class='add'>+		0, 2, 3, 2, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1</div><div class='add'>+	};</div><div class='add'>+	unsigned char bytes;</div><div class='add'>+</div><div class='add'>+	if (c == UMP_MIDI1_MSG_SYSEX_START) {</div><div class='add'>+		cvt-&gt;in_sysex = 1;</div><div class='add'>+		cvt-&gt;len = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (c == UMP_MIDI1_MSG_SYSEX_END) {</div><div class='add'>+		if (!cvt-&gt;in_sysex)</div><div class='add'>+			return 0; /* skip */</div><div class='add'>+		return cvt_legacy_sysex_to_ump(cvt, group, data, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((c &amp; 0xf0) == UMP_MIDI1_MSG_REALTIME) {</div><div class='add'>+		bytes = system_bytes[c &amp; 0x0f];</div><div class='add'>+		if (!bytes)</div><div class='add'>+			return 0; /* skip */</div><div class='add'>+		if (bytes == 1) {</div><div class='add'>+			data[0] = ump_compose(UMP_MSG_TYPE_SYSTEM, group, 0, c);</div><div class='add'>+			return 4;</div><div class='add'>+		}</div><div class='add'>+		cvt-&gt;buf[0] = c;</div><div class='add'>+		cvt-&gt;len = 1;</div><div class='add'>+		cvt-&gt;cmd_bytes = bytes;</div><div class='add'>+		cvt-&gt;in_sysex = 0; /* abort SysEx */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (c &amp; 0x80) {</div><div class='add'>+		bytes = cmd_bytes[(c &gt;&gt; 4) &amp; 7];</div><div class='add'>+		cvt-&gt;buf[0] = c;</div><div class='add'>+		cvt-&gt;len = 1;</div><div class='add'>+		cvt-&gt;cmd_bytes = bytes;</div><div class='add'>+		cvt-&gt;in_sysex = 0; /* abort SysEx */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cvt-&gt;in_sysex) {</div><div class='add'>+		cvt-&gt;buf[cvt-&gt;len++] = c;</div><div class='add'>+		if (cvt-&gt;len == 6)</div><div class='add'>+			return cvt_legacy_sysex_to_ump(cvt, group, data, false);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cvt-&gt;len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cvt-&gt;buf[cvt-&gt;len++] = c;</div><div class='add'>+	if (cvt-&gt;len &lt; cvt-&gt;cmd_bytes)</div><div class='add'>+		return 0;</div><div class='add'>+	cvt-&gt;len = 1;</div><div class='add'>+	if ((cvt-&gt;buf[0] &amp; 0xf0) == UMP_MIDI1_MSG_REALTIME)</div><div class='add'>+		return cvt_legacy_system_to_ump(cvt, group, data);</div><div class='add'>+	return cvt_legacy_cmd_to_ump(cvt, group, protocol, data, cvt-&gt;cmd_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ump_convert_to_ump - convert legacy MIDI byte to UMP packet</div><div class='add'>+ * @cvt: converter context</div><div class='add'>+ * @group: target UMP group</div><div class='add'>+ * @protocol: target UMP protocol</div><div class='add'>+ * @c: MIDI 1.0 byte data</div><div class='add'>+ *</div><div class='add'>+ * Feed a MIDI 1.0 byte @c and convert to a UMP packet if completed.</div><div class='add'>+ * The result is stored in the buffer in @cvt.</div><div class='add'>+ */</div><div class='add'>+void snd_ump_convert_to_ump(struct ump_cvt_to_ump *cvt, unsigned char group,</div><div class='add'>+			    unsigned int protocol, unsigned char c)</div><div class='add'>+{</div><div class='add'>+	cvt-&gt;ump_bytes = do_convert_to_ump(cvt, group, protocol, c, cvt-&gt;ump);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ump_convert_to_ump);</div><div class='head'>diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c<br/>index 3b9b550109cb..c657659b236c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/core/vmaster.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/core/vmaster.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/core/vmaster.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/core/vmaster.c</a></div><div class='hunk'>@@ -1,15 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * Virtual master and slave controls</div><div class='add'>+ * Virtual master and follower controls</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2008 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of the GNU General Public License as</div><div class='del'>- *  published by the Free Software Foundation, version 2.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -18,222 +15,233 @@</div><div class='ctx'>  * a subset of information returned via ctl info callback</div><div class='ctx'>  */</div><div class='ctx'> struct link_ctl_info {</div><div class='del'>-	int type;		/* value type */</div><div class='add'>+	snd_ctl_elem_type_t type; /* value type */</div><div class='ctx'> 	int count;		/* item count */</div><div class='ctx'> 	int min_val, max_val;	/* min, max values */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * link master - this contains a list of slave controls that are</div><div class='add'>+ * link master - this contains a list of follower controls that are</div><div class='ctx'>  * identical types, i.e. info returns the same value type and value</div><div class='ctx'>  * ranges, but may have different number of counts.</div><div class='ctx'>  *</div><div class='ctx'>  * The master control is so far only mono volume/switch for simplicity.</div><div class='del'>- * The same value will be applied to all slaves.</div><div class='add'>+ * The same value will be applied to all followers.</div><div class='ctx'>  */</div><div class='ctx'> struct link_master {</div><div class='del'>-	struct list_head slaves;</div><div class='add'>+	struct list_head followers;</div><div class='ctx'> 	struct link_ctl_info info;</div><div class='ctx'> 	int val;		/* the master value */</div><div class='ctx'> 	unsigned int tlv[4];</div><div class='add'>+	void (*hook)(void *private_data, int);</div><div class='add'>+	void *hook_private_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * link slave - this contains a slave control element</div><div class='add'>+ * link follower - this contains a follower control element</div><div class='ctx'>  *</div><div class='del'>- * It fakes the control callbacsk with additional attenuation by the</div><div class='del'>- * master control.  A slave may have either one or two channels.</div><div class='add'>+ * It fakes the control callbacks with additional attenuation by the</div><div class='add'>+ * master control.  A follower may have either one or two channels.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-struct link_slave {</div><div class='add'>+struct link_follower {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct link_master *master;</div><div class='ctx'> 	struct link_ctl_info info;</div><div class='ctx'> 	int vals[2];		/* current values */</div><div class='ctx'> 	unsigned int flags;</div><div class='del'>-	struct snd_kcontrol slave; /* the copy of original control entry */</div><div class='add'>+	struct snd_kcontrol *kctl; /* original kcontrol pointer */</div><div class='add'>+	struct snd_kcontrol follower; /* the copy of original control entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int slave_update(struct link_slave *slave)</div><div class='add'>+static int follower_update(struct link_follower *follower)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_value *uctl;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='ctx'> 	int err, ch;</div><div class='ctx'> </div><div class='del'>-	uctl = kmalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='add'>+	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='ctx'> 	if (!uctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	uctl-&gt;id = slave-&gt;slave.id;</div><div class='del'>-	err = slave-&gt;slave.get(&amp;slave-&gt;slave, uctl);</div><div class='del'>-	for (ch = 0; ch &lt; slave-&gt;info.count; ch++)</div><div class='del'>-		slave-&gt;vals[ch] = uctl-&gt;value.integer.value[ch];</div><div class='del'>-	kfree(uctl);</div><div class='add'>+	uctl-&gt;id = follower-&gt;follower.id;</div><div class='add'>+	err = follower-&gt;follower.get(&amp;follower-&gt;follower, uctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	for (ch = 0; ch &lt; follower-&gt;info.count; ch++)</div><div class='add'>+		follower-&gt;vals[ch] = uctl-&gt;value.integer.value[ch];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* get the slave ctl info and save the initial values */</div><div class='del'>-static int slave_init(struct link_slave *slave)</div><div class='add'>+/* get the follower ctl info and save the initial values */</div><div class='add'>+static int follower_init(struct link_follower *follower)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_info *uinfo;</div><div class='add'>+	struct snd_ctl_elem_info *uinfo __free(kfree) = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (slave-&gt;info.count) {</div><div class='add'>+	if (follower-&gt;info.count) {</div><div class='ctx'> 		/* already initialized */</div><div class='del'>-		if (slave-&gt;flags &amp; SND_CTL_SLAVE_NEED_UPDATE)</div><div class='del'>-			return slave_update(slave);</div><div class='add'>+		if (follower-&gt;flags &amp; SND_CTL_FOLLOWER_NEED_UPDATE)</div><div class='add'>+			return follower_update(follower);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL);</div><div class='ctx'> 	if (!uinfo)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	uinfo-&gt;id = slave-&gt;slave.id;</div><div class='del'>-	err = slave-&gt;slave.info(&amp;slave-&gt;slave, uinfo);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(uinfo);</div><div class='add'>+	uinfo-&gt;id = follower-&gt;follower.id;</div><div class='add'>+	err = follower-&gt;follower.info(&amp;follower-&gt;follower, uinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	slave-&gt;info.type = uinfo-&gt;type;</div><div class='del'>-	slave-&gt;info.count = uinfo-&gt;count;</div><div class='del'>-	if (slave-&gt;info.count &gt; 2  ||</div><div class='del'>-	    (slave-&gt;info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &amp;&amp;</div><div class='del'>-	     slave-&gt;info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {</div><div class='del'>-		snd_printk(KERN_ERR "invalid slave element\n");</div><div class='del'>-		kfree(uinfo);</div><div class='add'>+	follower-&gt;info.type = uinfo-&gt;type;</div><div class='add'>+	follower-&gt;info.count = uinfo-&gt;count;</div><div class='add'>+	if (follower-&gt;info.count &gt; 2  ||</div><div class='add'>+	    (follower-&gt;info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &amp;&amp;</div><div class='add'>+	     follower-&gt;info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {</div><div class='add'>+		pr_err("ALSA: vmaster: invalid follower element\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	slave-&gt;info.min_val = uinfo-&gt;value.integer.min;</div><div class='del'>-	slave-&gt;info.max_val = uinfo-&gt;value.integer.max;</div><div class='del'>-	kfree(uinfo);</div><div class='add'>+	follower-&gt;info.min_val = uinfo-&gt;value.integer.min;</div><div class='add'>+	follower-&gt;info.max_val = uinfo-&gt;value.integer.max;</div><div class='ctx'> </div><div class='del'>-	return slave_update(slave);</div><div class='add'>+	return follower_update(follower);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize master volume */</div><div class='ctx'> static int master_init(struct link_master *master)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave;</div><div class='add'>+	struct link_follower *follower;</div><div class='ctx'> </div><div class='ctx'> 	if (master-&gt;info.count)</div><div class='ctx'> 		return 0; /* already initialized */</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(slave, &amp;master-&gt;slaves, list) {</div><div class='del'>-		int err = slave_init(slave);</div><div class='add'>+	list_for_each_entry(follower, &amp;master-&gt;followers, list) {</div><div class='add'>+		int err = follower_init(follower);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		master-&gt;info = slave-&gt;info;</div><div class='add'>+		master-&gt;info = follower-&gt;info;</div><div class='ctx'> 		master-&gt;info.count = 1; /* always mono */</div><div class='ctx'> 		/* set full volume as default (= no attenuation) */</div><div class='ctx'> 		master-&gt;val = master-&gt;info.max_val;</div><div class='del'>-		return 0;</div><div class='add'>+		if (master-&gt;hook)</div><div class='add'>+			master-&gt;hook(master-&gt;hook_private_data, master-&gt;val);</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int slave_get_val(struct link_slave *slave,</div><div class='del'>-			 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+static int follower_get_val(struct link_follower *follower,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	int err, ch;</div><div class='ctx'> </div><div class='del'>-	err = slave_init(slave);</div><div class='add'>+	err = follower_init(follower);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	for (ch = 0; ch &lt; slave-&gt;info.count; ch++)</div><div class='del'>-		ucontrol-&gt;value.integer.value[ch] = slave-&gt;vals[ch];</div><div class='add'>+	for (ch = 0; ch &lt; follower-&gt;info.count; ch++)</div><div class='add'>+		ucontrol-&gt;value.integer.value[ch] = follower-&gt;vals[ch];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int slave_put_val(struct link_slave *slave,</div><div class='del'>-			 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+static int follower_put_val(struct link_follower *follower,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	int err, ch, vol;</div><div class='ctx'> </div><div class='del'>-	err = master_init(slave-&gt;master);</div><div class='add'>+	err = master_init(follower-&gt;master);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	switch (slave-&gt;info.type) {</div><div class='add'>+	switch (follower-&gt;info.type) {</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='del'>-		for (ch = 0; ch &lt; slave-&gt;info.count; ch++)</div><div class='add'>+		for (ch = 0; ch &lt; follower-&gt;info.count; ch++)</div><div class='ctx'> 			ucontrol-&gt;value.integer.value[ch] &amp;=</div><div class='del'>-				!!slave-&gt;master-&gt;val;</div><div class='add'>+				!!follower-&gt;master-&gt;val;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='del'>-		for (ch = 0; ch &lt; slave-&gt;info.count; ch++) {</div><div class='add'>+		for (ch = 0; ch &lt; follower-&gt;info.count; ch++) {</div><div class='ctx'> 			/* max master volume is supposed to be 0 dB */</div><div class='ctx'> 			vol = ucontrol-&gt;value.integer.value[ch];</div><div class='del'>-			vol += slave-&gt;master-&gt;val - slave-&gt;master-&gt;info.max_val;</div><div class='del'>-			if (vol &lt; slave-&gt;info.min_val)</div><div class='del'>-				vol = slave-&gt;info.min_val;</div><div class='del'>-			else if (vol &gt; slave-&gt;info.max_val)</div><div class='del'>-				vol = slave-&gt;info.max_val;</div><div class='add'>+			vol += follower-&gt;master-&gt;val - follower-&gt;master-&gt;info.max_val;</div><div class='add'>+			if (vol &lt; follower-&gt;info.min_val)</div><div class='add'>+				vol = follower-&gt;info.min_val;</div><div class='add'>+			else if (vol &gt; follower-&gt;info.max_val)</div><div class='add'>+				vol = follower-&gt;info.max_val;</div><div class='ctx'> 			ucontrol-&gt;value.integer.value[ch] = vol;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return slave-&gt;slave.put(&amp;slave-&gt;slave, ucontrol);</div><div class='add'>+	return follower-&gt;follower.put(&amp;follower-&gt;follower, ucontrol);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * ctl callbacks for slaves</div><div class='add'>+ * ctl callbacks for followers</div><div class='ctx'>  */</div><div class='del'>-static int slave_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-		      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+static int follower_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	return slave-&gt;slave.info(&amp;slave-&gt;slave, uinfo);</div><div class='add'>+	struct link_follower *follower = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	return follower-&gt;follower.info(&amp;follower-&gt;follower, uinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int slave_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-		     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+static int follower_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	return slave_get_val(slave, ucontrol);</div><div class='add'>+	struct link_follower *follower = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	return follower_get_val(follower, ucontrol);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int slave_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-		     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+static int follower_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct link_follower *follower = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int err, ch, changed = 0;</div><div class='ctx'> </div><div class='del'>-	err = slave_init(slave);</div><div class='add'>+	err = follower_init(follower);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	for (ch = 0; ch &lt; slave-&gt;info.count; ch++) {</div><div class='del'>-		if (slave-&gt;vals[ch] != ucontrol-&gt;value.integer.value[ch]) {</div><div class='add'>+	for (ch = 0; ch &lt; follower-&gt;info.count; ch++) {</div><div class='add'>+		if (ucontrol-&gt;value.integer.value[ch] &lt; follower-&gt;info.min_val ||</div><div class='add'>+		    ucontrol-&gt;value.integer.value[ch] &gt; follower-&gt;info.max_val)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; follower-&gt;info.count; ch++) {</div><div class='add'>+		if (follower-&gt;vals[ch] != ucontrol-&gt;value.integer.value[ch]) {</div><div class='ctx'> 			changed = 1;</div><div class='del'>-			slave-&gt;vals[ch] = ucontrol-&gt;value.integer.value[ch];</div><div class='add'>+			follower-&gt;vals[ch] = ucontrol-&gt;value.integer.value[ch];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!changed)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return slave_put_val(slave, ucontrol);</div><div class='add'>+	err = follower_put_val(follower, ucontrol);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,</div><div class='del'>-			 int op_flag, unsigned int size,</div><div class='del'>-			 unsigned int __user *tlv)</div><div class='add'>+static int follower_tlv_cmd(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    int op_flag, unsigned int size,</div><div class='add'>+			    unsigned int __user *tlv)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct link_follower *follower = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	/* FIXME: this assumes that the max volume is 0 dB */</div><div class='del'>-	return slave-&gt;slave.tlv.c(&amp;slave-&gt;slave, op_flag, size, tlv);</div><div class='add'>+	return follower-&gt;follower.tlv.c(&amp;follower-&gt;follower, op_flag, size, tlv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void slave_free(struct snd_kcontrol *kcontrol)</div><div class='add'>+static void follower_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'> {</div><div class='del'>-	struct link_slave *slave = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	if (slave-&gt;slave.private_free)</div><div class='del'>-		slave-&gt;slave.private_free(&amp;slave-&gt;slave);</div><div class='del'>-	if (slave-&gt;master)</div><div class='del'>-		list_del(&amp;slave-&gt;list);</div><div class='del'>-	kfree(slave);</div><div class='add'>+	struct link_follower *follower = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	if (follower-&gt;follower.private_free)</div><div class='add'>+		follower-&gt;follower.private_free(&amp;follower-&gt;follower);</div><div class='add'>+	if (follower-&gt;master)</div><div class='add'>+		list_del(&amp;follower-&gt;list);</div><div class='add'>+	kfree(follower);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Add a slave control to the group with the given master control</div><div class='add'>+ * Add a follower control to the group with the given master control</div><div class='ctx'>  *</div><div class='del'>- * All slaves must be the same type (returning the same information</div><div class='del'>- * via info callback).  The fucntion doesn't check it, so it's your</div><div class='add'>+ * All followers must be the same type (returning the same information</div><div class='add'>+ * via info callback).  The function doesn't check it, so it's your</div><div class='ctx'>  * responsibility.</div><div class='ctx'>  *</div><div class='ctx'>  * Also, some additional limitations:</div><div class='hunk'>@@ -241,34 +249,64 @@ static void slave_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'>  * - logarithmic volume control (dB level), no linear volume</div><div class='ctx'>  * - master can only attenuate the volume, no gain</div><div class='ctx'>  */</div><div class='del'>-int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,</div><div class='del'>-		       unsigned int flags)</div><div class='add'>+int _snd_ctl_add_follower(struct snd_kcontrol *master,</div><div class='add'>+			  struct snd_kcontrol *follower,</div><div class='add'>+			  unsigned int flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct link_master *master_link = snd_kcontrol_chip(master);</div><div class='del'>-	struct link_slave *srec;</div><div class='add'>+	struct link_follower *srec;</div><div class='ctx'> </div><div class='del'>-	srec = kzalloc(sizeof(*srec) +</div><div class='del'>-		       slave-&gt;count * sizeof(*slave-&gt;vd), GFP_KERNEL);</div><div class='add'>+	srec = kzalloc(struct_size(srec, follower.vd, follower-&gt;count),</div><div class='add'>+		       GFP_KERNEL);</div><div class='ctx'> 	if (!srec)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	srec-&gt;slave = *slave;</div><div class='del'>-	memcpy(srec-&gt;slave.vd, slave-&gt;vd, slave-&gt;count * sizeof(*slave-&gt;vd));</div><div class='add'>+	srec-&gt;kctl = follower;</div><div class='add'>+	srec-&gt;follower = *follower;</div><div class='add'>+	memcpy(srec-&gt;follower.vd, follower-&gt;vd, follower-&gt;count * sizeof(*follower-&gt;vd));</div><div class='ctx'> 	srec-&gt;master = master_link;</div><div class='ctx'> 	srec-&gt;flags = flags;</div><div class='ctx'> </div><div class='ctx'> 	/* override callbacks */</div><div class='del'>-	slave-&gt;info = slave_info;</div><div class='del'>-	slave-&gt;get = slave_get;</div><div class='del'>-	slave-&gt;put = slave_put;</div><div class='del'>-	if (slave-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK)</div><div class='del'>-		slave-&gt;tlv.c = slave_tlv_cmd;</div><div class='del'>-	slave-&gt;private_data = srec;</div><div class='del'>-	slave-&gt;private_free = slave_free;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;srec-&gt;list, &amp;master_link-&gt;slaves);</div><div class='add'>+	follower-&gt;info = follower_info;</div><div class='add'>+	follower-&gt;get = follower_get;</div><div class='add'>+	follower-&gt;put = follower_put;</div><div class='add'>+	if (follower-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK)</div><div class='add'>+		follower-&gt;tlv.c = follower_tlv_cmd;</div><div class='add'>+	follower-&gt;private_data = srec;</div><div class='add'>+	follower-&gt;private_free = follower_free;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;srec-&gt;list, &amp;master_link-&gt;followers);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(_snd_ctl_add_slave);</div><div class='add'>+EXPORT_SYMBOL(_snd_ctl_add_follower);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_add_followers - add multiple followers to vmaster</div><div class='add'>+ * @card: card instance</div><div class='add'>+ * @master: the target vmaster kcontrol object</div><div class='add'>+ * @list: NULL-terminated list of name strings of followers to be added</div><div class='add'>+ *</div><div class='add'>+ * Adds the multiple follower kcontrols with the given names.</div><div class='add'>+ * Returns 0 for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_add_followers(struct snd_card *card, struct snd_kcontrol *master,</div><div class='add'>+			  const char * const *list)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *follower;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (; *list; list++) {</div><div class='add'>+		follower = snd_ctl_find_id_mixer(card, *list);</div><div class='add'>+		if (follower) {</div><div class='add'>+			err = snd_ctl_add_follower(master, follower);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_add_followers);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * ctl callbacks for master controls</div><div class='hunk'>@@ -300,42 +338,65 @@ static int master_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sync_followers(struct link_master *master, int old_val, int new_val)</div><div class='add'>+{</div><div class='add'>+	struct link_follower *follower;</div><div class='add'>+	struct snd_ctl_elem_value *uval __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	uval = kmalloc(sizeof(*uval), GFP_KERNEL);</div><div class='add'>+	if (!uval)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	list_for_each_entry(follower, &amp;master-&gt;followers, list) {</div><div class='add'>+		master-&gt;val = old_val;</div><div class='add'>+		uval-&gt;id = follower-&gt;follower.id;</div><div class='add'>+		follower_get_val(follower, uval);</div><div class='add'>+		master-&gt;val = new_val;</div><div class='add'>+		follower_put_val(follower, uval);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int master_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		      struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct link_master *master = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct link_slave *slave;</div><div class='del'>-	struct snd_ctl_elem_value *uval;</div><div class='del'>-	int err, old_val;</div><div class='add'>+	int err, new_val, old_val;</div><div class='add'>+	bool first_init;</div><div class='ctx'> </div><div class='ctx'> 	err = master_init(master);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	first_init = err;</div><div class='ctx'> 	old_val = master-&gt;val;</div><div class='del'>-	if (ucontrol-&gt;value.integer.value[0] == old_val)</div><div class='add'>+	new_val = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	if (new_val == old_val)</div><div class='ctx'> 		return 0;</div><div class='add'>+	if (new_val &lt; master-&gt;info.min_val || new_val &gt; master-&gt;info.max_val)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	uval = kmalloc(sizeof(*uval), GFP_KERNEL);</div><div class='del'>-	if (!uval)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	list_for_each_entry(slave, &amp;master-&gt;slaves, list) {</div><div class='del'>-		master-&gt;val = old_val;</div><div class='del'>-		uval-&gt;id = slave-&gt;slave.id;</div><div class='del'>-		slave_get_val(slave, uval);</div><div class='del'>-		master-&gt;val = ucontrol-&gt;value.integer.value[0];</div><div class='del'>-		slave_put_val(slave, uval);</div><div class='del'>-	}</div><div class='del'>-	kfree(uval);</div><div class='add'>+	err = sync_followers(master, old_val, new_val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (master-&gt;hook &amp;&amp; !first_init)</div><div class='add'>+		master-&gt;hook(master-&gt;hook_private_data, master-&gt;val);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void master_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct link_master *master = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct link_slave *slave;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(slave, &amp;master-&gt;slaves, list)</div><div class='del'>-		slave-&gt;master = NULL;</div><div class='add'>+	struct link_follower *follower, *n;</div><div class='add'>+</div><div class='add'>+	/* free all follower links and retore the original follower kctls */</div><div class='add'>+	list_for_each_entry_safe(follower, n, &amp;master-&gt;followers, list) {</div><div class='add'>+		struct snd_kcontrol *sctl = follower-&gt;kctl;</div><div class='add'>+		struct list_head olist = sctl-&gt;list;</div><div class='add'>+		memcpy(sctl, &amp;follower-&gt;follower, sizeof(*sctl));</div><div class='add'>+		memcpy(sctl-&gt;vd, follower-&gt;follower.vd,</div><div class='add'>+		       sctl-&gt;count * sizeof(*sctl-&gt;vd));</div><div class='add'>+		sctl-&gt;list = olist; /* keep the current linked-list */</div><div class='add'>+		kfree(follower);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(master);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,16 +406,17 @@ static void master_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'>  * @name: name string of the control element to create</div><div class='ctx'>  * @tlv: optional TLV int array for dB information</div><div class='ctx'>  *</div><div class='del'>- * Creates a virtual matster control with the given name string.</div><div class='del'>- * Returns the created control element, or NULL for errors (ENOMEM).</div><div class='add'>+ * Creates a virtual master control with the given name string.</div><div class='ctx'>  *</div><div class='del'>- * After creating a vmaster element, you can add the slave controls</div><div class='del'>- * via snd_ctl_add_slave() or snd_ctl_add_slave_uncached().</div><div class='add'>+ * After creating a vmaster element, you can add the follower controls</div><div class='add'>+ * via snd_ctl_add_follower() or snd_ctl_add_follower_uncached().</div><div class='ctx'>  *</div><div class='ctx'>  * The optional argument @tlv can be used to specify the TLV information</div><div class='ctx'>  * for dB scale of the master control.  It should be a single element</div><div class='ctx'>  * with #SNDRV_CTL_TLVT_DB_SCALE, #SNDRV_CTL_TLV_DB_MINMAX or</div><div class='ctx'>  * #SNDRV_CTL_TLVT_DB_MINMAX_MUTE type, and should be the max 0dB.</div><div class='add'>+ *</div><div class='add'>+ * Return: The created control element, or %NULL for errors (ENOMEM).</div><div class='ctx'>  */</div><div class='ctx'> struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,</div><div class='ctx'> 						 const unsigned int *tlv)</div><div class='hunk'>@@ -371,7 +433,7 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,</div><div class='ctx'> 	master = kzalloc(sizeof(*master), GFP_KERNEL);</div><div class='ctx'> 	if (!master)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	INIT_LIST_HEAD(&amp;master-&gt;slaves);</div><div class='add'>+	INIT_LIST_HEAD(&amp;master-&gt;followers);</div><div class='ctx'> </div><div class='ctx'> 	kctl = snd_ctl_new1(&amp;knew, master);</div><div class='ctx'> 	if (!kctl) {</div><div class='hunk'>@@ -385,15 +447,105 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,</div><div class='ctx'> 	kctl-&gt;private_free = master_free;</div><div class='ctx'> </div><div class='ctx'> 	/* additional (constant) TLV read */</div><div class='del'>-	if (tlv &amp;&amp;</div><div class='del'>-	    (tlv[0] == SNDRV_CTL_TLVT_DB_SCALE ||</div><div class='del'>-	     tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX ||</div><div class='del'>-	     tlv[0] == SNDRV_CTL_TLVT_DB_MINMAX_MUTE)) {</div><div class='del'>-		kctl-&gt;vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='del'>-		memcpy(master-&gt;tlv, tlv, sizeof(master-&gt;tlv));</div><div class='del'>-		kctl-&gt;tlv.p = master-&gt;tlv;</div><div class='add'>+	if (tlv) {</div><div class='add'>+		unsigned int type = tlv[SNDRV_CTL_TLVO_TYPE];</div><div class='add'>+		if (type == SNDRV_CTL_TLVT_DB_SCALE ||</div><div class='add'>+		    type == SNDRV_CTL_TLVT_DB_MINMAX ||</div><div class='add'>+		    type == SNDRV_CTL_TLVT_DB_MINMAX_MUTE) {</div><div class='add'>+			kctl-&gt;vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='add'>+			memcpy(master-&gt;tlv, tlv, sizeof(master-&gt;tlv));</div><div class='add'>+			kctl-&gt;tlv.p = master-&gt;tlv;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return kctl;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_ctl_make_virtual_master);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_add_vmaster_hook - Add a hook to a vmaster control</div><div class='add'>+ * @kcontrol: vmaster kctl element</div><div class='add'>+ * @hook: the hook function</div><div class='add'>+ * @private_data: the private_data pointer to be saved</div><div class='add'>+ *</div><div class='add'>+ * Adds the given hook to the vmaster control element so that it's called</div><div class='add'>+ * at each time when the value is changed.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero.</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     void (*hook)(void *private_data, int),</div><div class='add'>+			     void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct link_master *master = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	master-&gt;hook = hook;</div><div class='add'>+	master-&gt;hook_private_data = private_data;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_add_vmaster_hook);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_sync_vmaster - Sync the vmaster followers and hook</div><div class='add'>+ * @kcontrol: vmaster kctl element</div><div class='add'>+ * @hook_only: sync only the hook</div><div class='add'>+ *</div><div class='add'>+ * Forcibly call the put callback of each follower and call the hook function</div><div class='add'>+ * to synchronize with the current value of the given vmaster element.</div><div class='add'>+ * NOP when NULL is passed to @kcontrol.</div><div class='add'>+ */</div><div class='add'>+void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only)</div><div class='add'>+{</div><div class='add'>+	struct link_master *master;</div><div class='add'>+	bool first_init = false;</div><div class='add'>+</div><div class='add'>+	if (!kcontrol)</div><div class='add'>+		return;</div><div class='add'>+	master = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	if (!hook_only) {</div><div class='add'>+		int err = master_init(master);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+		first_init = err;</div><div class='add'>+		err = sync_followers(master, master-&gt;val, master-&gt;val);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (master-&gt;hook &amp;&amp; !first_init)</div><div class='add'>+		master-&gt;hook(master-&gt;hook_private_data, master-&gt;val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_sync_vmaster);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_ctl_apply_vmaster_followers - Apply function to each vmaster follower</div><div class='add'>+ * @kctl: vmaster kctl element</div><div class='add'>+ * @func: function to apply</div><div class='add'>+ * @arg: optional function argument</div><div class='add'>+ *</div><div class='add'>+ * Apply the function @func to each follower kctl of the given vmaster kctl.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if successful, or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_ctl_apply_vmaster_followers(struct snd_kcontrol *kctl,</div><div class='add'>+				    int (*func)(struct snd_kcontrol *vfollower,</div><div class='add'>+						struct snd_kcontrol *follower,</div><div class='add'>+						void *arg),</div><div class='add'>+				    void *arg)</div><div class='add'>+{</div><div class='add'>+	struct link_master *master;</div><div class='add'>+	struct link_follower *follower;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	master = snd_kcontrol_chip(kctl);</div><div class='add'>+	err = master_init(master);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	list_for_each_entry(follower, &amp;master-&gt;followers, list) {</div><div class='add'>+		err = func(follower-&gt;kctl, &amp;follower-&gt;follower, arg);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_ctl_apply_vmaster_followers);</div><div class='head'>diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig<br/>index c8961165277c..6debd8e95cb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/Kconfig</a></div><div class='hunk'>@@ -1,19 +1,34 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config SND_MPU401_UART</div><div class='del'>-        tristate</div><div class='del'>-        select SND_RAWMIDI</div><div class='add'>+	tristate</div><div class='add'>+	select SND_RAWMIDI</div><div class='ctx'> </div><div class='ctx'> config SND_OPL3_LIB</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select SND_TIMER</div><div class='ctx'> 	select SND_HWDEP</div><div class='add'>+	select SND_SEQ_DEVICE if SND_SEQUENCER != n</div><div class='ctx'> </div><div class='ctx'> config SND_OPL4_LIB</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select SND_TIMER</div><div class='ctx'> 	select SND_HWDEP</div><div class='add'>+	select SND_SEQ_DEVICE if SND_SEQUENCER != n</div><div class='add'>+</div><div class='add'>+# select SEQ stuff to min(SND_SEQUENCER,SND_XXX)</div><div class='add'>+config SND_OPL3_LIB_SEQ</div><div class='add'>+	def_tristate SND_SEQUENCER &amp;&amp; SND_OPL3_LIB</div><div class='add'>+	select SND_SEQ_MIDI_EMUL</div><div class='add'>+	select SND_SEQ_MIDI_EVENT</div><div class='add'>+</div><div class='add'>+config SND_OPL4_LIB_SEQ</div><div class='add'>+	def_tristate SND_SEQUENCER &amp;&amp; SND_OPL4_LIB</div><div class='add'>+	select SND_SEQ_MIDI_EMUL</div><div class='add'>+	select SND_SEQ_MIDI_EVENT</div><div class='ctx'> </div><div class='ctx'> config SND_VX_LIB</div><div class='ctx'> 	tristate</div><div class='add'>+	select FW_LOADER</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> </div><div class='hunk'>@@ -35,7 +50,6 @@ config SND_PCSP</div><div class='ctx'> 	tristate "PC-Speaker support (READ HELP!)"</div><div class='ctx'> 	depends on PCSPKR_PLATFORM &amp;&amp; X86 &amp;&amp; HIGH_RES_TIMERS</div><div class='ctx'> 	depends on INPUT</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you don't have a sound card in your computer, you can include a</div><div class='hunk'>@@ -50,7 +64,8 @@ config SND_PCSP</div><div class='ctx'> 	  before the other sound driver of yours, making the</div><div class='ctx'> 	  pc-speaker a default sound device. Which is likely not</div><div class='ctx'> 	  what you want. To make this driver play nicely with other</div><div class='del'>-	  sound driver, you can add this into your /etc/modprobe.conf:</div><div class='add'>+	  sound driver, you can add this in a configuration file under</div><div class='add'>+	  /etc/modprobe.d/ directory:</div><div class='ctx'> 	  options snd-pcsp index=2</div><div class='ctx'> </div><div class='ctx'> 	  You don't need this driver if you only want your pc-speaker to beep.</div><div class='hunk'>@@ -75,29 +90,49 @@ config SND_DUMMY</div><div class='ctx'> 	  will be called snd-dummy.</div><div class='ctx'> </div><div class='ctx'> config SND_ALOOP</div><div class='del'>-        tristate "Generic loopback driver (PCM)"</div><div class='del'>-        select SND_PCM</div><div class='del'>-        help</div><div class='del'>-          Say 'Y' or 'M' to include support for the PCM loopback device.</div><div class='add'>+	tristate "Generic loopback driver (PCM)"</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_TIMER</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' or 'M' to include support for the PCM loopback device.</div><div class='ctx'> 	  This module returns played samples back to the user space using</div><div class='ctx'> 	  the standard ALSA PCM device. The devices are routed 0-&gt;1 and</div><div class='del'>-          1-&gt;0, where first number is the playback PCM device and second</div><div class='add'>+	  1-&gt;0, where first number is the playback PCM device and second</div><div class='ctx'> 	  number is the capture device. Module creates two PCM devices and</div><div class='ctx'> 	  configured number of substreams (see the pcm_substreams module</div><div class='del'>-          parameter).</div><div class='add'>+	  parameter).</div><div class='ctx'> </div><div class='del'>-	  The looback device allow time sychronization with an external</div><div class='add'>+	  The loopback device allows time synchronization with an external</div><div class='ctx'> 	  timing source using the time shift universal control (+-20%</div><div class='ctx'> 	  of system time).</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-aloop.</div><div class='ctx'> </div><div class='add'>+config SND_PCMTEST</div><div class='add'>+	tristate "Virtual PCM test driver"</div><div class='add'>+	depends on DEBUG_FS</div><div class='add'>+	select SND_PCM</div><div class='add'>+	help</div><div class='add'>+	  Say 'Y' or 'M' to include support for the Virtual PCM test driver.</div><div class='add'>+	  This driver is aimed at extended testing of the userspace applications</div><div class='add'>+	  which use the ALSA API, as well as the PCM middle layer testing.</div><div class='add'>+</div><div class='add'>+	  It can generate random or pattern-based data into the capture stream,</div><div class='add'>+	  check the playback stream for containing the selected pattern, inject</div><div class='add'>+	  time delays during capture/playback, redefine the RESET ioctl operation</div><div class='add'>+	  to perform the PCM middle layer testing and inject errors during the</div><div class='add'>+	  PCM callbacks. It supports both interleaved and non-interleaved access</div><div class='add'>+	  modes. You can find the corresponding selftest in the 'alsa'</div><div class='add'>+	  selftests folder.</div><div class='add'>+</div><div class='ctx'> config SND_VIRMIDI</div><div class='ctx'> 	tristate "Virtual MIDI soundcard"</div><div class='ctx'> 	depends on SND_SEQUENCER</div><div class='ctx'> 	select SND_TIMER</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='add'>+	select SND_SEQ_VIRMIDI</div><div class='add'>+	select SND_SEQ_MIDI_EVENT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include the virtual MIDI driver.  This driver</div><div class='ctx'> 	  allows to connect applications using raw MIDI devices to</div><div class='hunk'>@@ -110,6 +145,7 @@ config SND_VIRMIDI</div><div class='ctx'> </div><div class='ctx'> config SND_MTPAV</div><div class='ctx'> 	tristate "MOTU MidiTimePiece AV multiport MIDI"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	help</div><div class='ctx'> 	  To use a MOTU MidiTimePiece AV multiport MIDI adapter</div><div class='hunk'>@@ -125,19 +161,20 @@ config SND_MTS64</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	help</div><div class='ctx'> 	  The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with </div><div class='del'>-          additional SMPTE Timecode capabilities for the parallel port.</div><div class='add'>+	  additional SMPTE Timecode capabilities for the parallel port.</div><div class='ctx'> </div><div class='ctx'> 	  Say 'Y' to include support for this device.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, chose 'M' here: the module </div><div class='del'>-          will be called snd-mts64.</div><div class='add'>+	  will be called snd-mts64.</div><div class='ctx'> </div><div class='ctx'> config SND_SERIAL_U16550</div><div class='ctx'> 	tristate "UART16550 serial MIDI driver"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	help</div><div class='ctx'> 	  To include support for MIDI serial port interfaces, say Y here</div><div class='del'>-	  and read &lt;file:Documentation/sound/alsa/serial-u16550.txt&gt;.</div><div class='add'>+	  and read &lt;file:Documentation/sound/cards/serial-u16550.rst&gt;.</div><div class='ctx'> 	  This driver works with serial UARTs 16550 and better.</div><div class='ctx'> </div><div class='ctx'> 	  This driver accesses the serial port hardware directly, so</div><div class='hunk'>@@ -147,8 +184,27 @@ config SND_SERIAL_U16550</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-serial-u16550.</div><div class='ctx'> </div><div class='add'>+config SND_SERIAL_GENERIC</div><div class='add'>+	tristate "Generic serial MIDI driver"</div><div class='add'>+	depends on SERIAL_DEV_BUS</div><div class='add'>+	depends on OF</div><div class='add'>+	select SND_RAWMIDI</div><div class='add'>+	help</div><div class='add'>+	  To include support for mapping generic serial devices as raw</div><div class='add'>+	  ALSA MIDI devices, say Y here. The driver only supports setting</div><div class='add'>+	  the serial port to standard baudrates. To attain the standard MIDI</div><div class='add'>+	  baudrate of 31.25 kBaud, configure the clock of the underlying serial</div><div class='add'>+	  device so that a requested 38.4 kBaud will result in the standard speed.</div><div class='add'>+</div><div class='add'>+	  Use this devicetree binding to configure serial port mapping</div><div class='add'>+	  &lt;file:Documentation/devicetree/bindings/sound/serial-midi.yaml&gt;</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-serial-generic.</div><div class='add'>+</div><div class='ctx'> config SND_MPU401</div><div class='ctx'> 	tristate "Generic MPU-401 UART driver"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for MIDI ports compatible with</div><div class='hunk'>@@ -168,18 +224,6 @@ config SND_PORTMAN2X4</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-portman2x4.</div><div class='ctx'> </div><div class='del'>-config SND_ML403_AC97CR</div><div class='del'>-	tristate "Xilinx ML403 AC97 Controller Reference"</div><div class='del'>-	depends on XILINX_VIRTEX</div><div class='del'>-	select SND_AC97_CODEC</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include support for the</div><div class='del'>-	  opb_ac97_controller_ref_v1_00_a ip core found in Xilinx's ML403</div><div class='del'>-	  reference design.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module</div><div class='del'>-	  will be called snd-ml403_ac97cr.</div><div class='del'>-</div><div class='ctx'> config SND_AC97_POWER_SAVE</div><div class='ctx'> 	bool "AC97 Power-Saving Mode"</div><div class='ctx'> 	depends on SND_AC97_CODEC</div><div class='hunk'>@@ -207,7 +251,7 @@ config SND_AC97_POWER_SAVE</div><div class='ctx'> 	  the device frequently.  A value of 10 seconds would be a</div><div class='ctx'> 	  good choice for normal operations.</div><div class='ctx'> </div><div class='del'>-	  See Documentation/sound/alsa/powersave.txt for more details.</div><div class='add'>+	  See Documentation/sound/designs/powersave.rst for more details.</div><div class='ctx'> </div><div class='ctx'> config SND_AC97_POWER_SAVE_DEFAULT</div><div class='ctx'> 	int "Default time-out for AC97 power-save mode"</div><div class='head'>diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile<br/>index 1a8440c8b138..a08bdd70ec9c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/Makefile</a></div><div class='hunk'>@@ -1,25 +1,28 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-dummy-objs := dummy.o</div><div class='del'>-snd-aloop-objs := aloop.o</div><div class='del'>-snd-mtpav-objs := mtpav.o</div><div class='del'>-snd-mts64-objs := mts64.o</div><div class='del'>-snd-portman2x4-objs := portman2x4.o</div><div class='del'>-snd-serial-u16550-objs := serial-u16550.o</div><div class='del'>-snd-virmidi-objs := virmidi.o</div><div class='del'>-snd-ml403-ac97cr-objs := ml403-ac97cr.o pcm-indirect2.o</div><div class='add'>+snd-dummy-y := dummy.o</div><div class='add'>+snd-aloop-y := aloop.o</div><div class='add'>+snd-mtpav-y := mtpav.o</div><div class='add'>+snd-mts64-y := mts64.o</div><div class='add'>+snd-pcmtest-y := pcmtest.o</div><div class='add'>+snd-portman2x4-y := portman2x4.o</div><div class='add'>+snd-serial-u16550-y := serial-u16550.o</div><div class='add'>+snd-serial-generic-y := serial-generic.o</div><div class='add'>+snd-virmidi-y := virmidi.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_DUMMY) += snd-dummy.o</div><div class='ctx'> obj-$(CONFIG_SND_ALOOP) += snd-aloop.o</div><div class='ctx'> obj-$(CONFIG_SND_VIRMIDI) += snd-virmidi.o</div><div class='add'>+obj-$(CONFIG_SND_PCMTEST) += snd-pcmtest.o</div><div class='ctx'> obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o</div><div class='add'>+obj-$(CONFIG_SND_SERIAL_GENERIC) += snd-serial-generic.o</div><div class='ctx'> obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o</div><div class='ctx'> obj-$(CONFIG_SND_MTS64) += snd-mts64.o</div><div class='ctx'> obj-$(CONFIG_SND_PORTMAN2X4) += snd-portman2x4.o</div><div class='del'>-obj-$(CONFIG_SND_ML403_AC97CR) += snd-ml403-ac97cr.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND) += opl3/ opl4/ mpu401/ vx/ pcsp/</div><div class='head'>diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c<br/>index 12b44b0b6777..64ef03b2d579 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/aloop.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/aloop.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/aloop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/aloop.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Loopback soundcard</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,48 +13,36 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  A next major update in 2010 (separate timers for playback and capture):</div><div class='ctx'>  *  Copyright (c) Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/timer.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("A loopback soundcard");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}");</div><div class='ctx'> </div><div class='ctx'> #define MAX_PCM_SUBSTREAMS	8</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='add'>+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='ctx'> static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};</div><div class='ctx'> static int pcm_notify[SNDRV_CARDS];</div><div class='add'>+static char *timer_source[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for loopback soundcard.");</div><div class='hunk'>@@ -65,11 +54,48 @@ module_param_array(pcm_substreams, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-8) for loopback driver.");</div><div class='ctx'> module_param_array(pcm_notify, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pcm_notify, "Break capture when PCM format/rate/channels changes.");</div><div class='add'>+module_param_array(timer_source, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(timer_source, "Sound card name or number and device/subdevice number of timer to be used. Empty string for jiffies timer [default].");</div><div class='ctx'> </div><div class='ctx'> #define NO_PITCH 100000</div><div class='ctx'> </div><div class='add'>+#define CABLE_VALID_PLAYBACK	BIT(SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+#define CABLE_VALID_CAPTURE	BIT(SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+#define CABLE_VALID_BOTH	(CABLE_VALID_PLAYBACK | CABLE_VALID_CAPTURE)</div><div class='add'>+</div><div class='add'>+struct loopback_cable;</div><div class='ctx'> struct loopback_pcm;</div><div class='ctx'> </div><div class='add'>+struct loopback_ops {</div><div class='add'>+	/* optional</div><div class='add'>+	 * call in loopback-&gt;cable_lock</div><div class='add'>+	 */</div><div class='add'>+	int (*open)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* required</div><div class='add'>+	 * call in cable-&gt;lock</div><div class='add'>+	 */</div><div class='add'>+	int (*start)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* required</div><div class='add'>+	 * call in cable-&gt;lock</div><div class='add'>+	 */</div><div class='add'>+	int (*stop)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* optional */</div><div class='add'>+	int (*stop_sync)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* optional */</div><div class='add'>+	int (*close_substream)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* optional</div><div class='add'>+	 * call in loopback-&gt;cable_lock</div><div class='add'>+	 */</div><div class='add'>+	int (*close_cable)(struct loopback_pcm *dpcm);</div><div class='add'>+	/* optional</div><div class='add'>+	 * call in cable-&gt;lock</div><div class='add'>+	 */</div><div class='add'>+	unsigned int (*pos_update)(struct loopback_cable *cable);</div><div class='add'>+	/* optional */</div><div class='add'>+	void (*dpcm_info)(struct loopback_pcm *dpcm,</div><div class='add'>+			  struct snd_info_buffer *buffer);</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct loopback_cable {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct loopback_pcm *streams[2];</div><div class='hunk'>@@ -78,18 +104,29 @@ struct loopback_cable {</div><div class='ctx'> 	unsigned int valid;</div><div class='ctx'> 	unsigned int running;</div><div class='ctx'> 	unsigned int pause;</div><div class='add'>+	/* timer specific */</div><div class='add'>+	const struct loopback_ops *ops;</div><div class='add'>+	/* If sound timer is used */</div><div class='add'>+	struct {</div><div class='add'>+		int stream;</div><div class='add'>+		struct snd_timer_id id;</div><div class='add'>+		struct work_struct event_work;</div><div class='add'>+		struct snd_timer_instance *instance;</div><div class='add'>+	} snd_timer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct loopback_setup {</div><div class='ctx'> 	unsigned int notify: 1;</div><div class='ctx'> 	unsigned int rate_shift;</div><div class='del'>-	unsigned int format;</div><div class='add'>+	snd_pcm_format_t format;</div><div class='ctx'> 	unsigned int rate;</div><div class='add'>+	snd_pcm_access_t access;</div><div class='ctx'> 	unsigned int channels;</div><div class='ctx'> 	struct snd_ctl_elem_id active_id;</div><div class='ctx'> 	struct snd_ctl_elem_id format_id;</div><div class='ctx'> 	struct snd_ctl_elem_id rate_id;</div><div class='ctx'> 	struct snd_ctl_elem_id channels_id;</div><div class='add'>+	struct snd_ctl_elem_id access_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct loopback {</div><div class='hunk'>@@ -98,6 +135,7 @@ struct loopback {</div><div class='ctx'> 	struct loopback_cable *cables[MAX_PCM_SUBSTREAMS][2];</div><div class='ctx'> 	struct snd_pcm *pcm[2];</div><div class='ctx'> 	struct loopback_setup setup[MAX_PCM_SUBSTREAMS][2];</div><div class='add'>+	const char *timer_source;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct loopback_pcm {</div><div class='hunk'>@@ -115,10 +153,17 @@ struct loopback_pcm {</div><div class='ctx'> 	/* flags */</div><div class='ctx'> 	unsigned int period_update_pending :1;</div><div class='ctx'> 	/* timer stuff */</div><div class='del'>-	unsigned int irq_pos;		/* fractional IRQ position */</div><div class='del'>-	unsigned int period_size_frac;</div><div class='add'>+	unsigned int irq_pos;		/* fractional IRQ position in jiffies</div><div class='add'>+					 * ticks</div><div class='add'>+					 */</div><div class='add'>+	unsigned int period_size_frac;	/* period size in jiffies ticks */</div><div class='add'>+	unsigned int last_drift;</div><div class='ctx'> 	unsigned long last_jiffies;</div><div class='add'>+	/* If jiffies timer is used */</div><div class='ctx'> 	struct timer_list timer;</div><div class='add'>+</div><div class='add'>+	/* size of per channel buffer in case of non-interleaved access */</div><div class='add'>+	unsigned int channel_buf_n;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *devices[SNDRV_CARDS];</div><div class='hunk'>@@ -164,7 +209,8 @@ static inline unsigned int get_rate_shift(struct loopback_pcm *dpcm)</div><div class='ctx'> 	return get_setup(dpcm)-&gt;rate_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void loopback_timer_start(struct loopback_pcm *dpcm)</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static int loopback_jiffies_timer_start(struct loopback_pcm *dpcm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long tick;</div><div class='ctx'> 	unsigned int rate_shift = get_rate_shift(dpcm);</div><div class='hunk'>@@ -178,20 +224,115 @@ static void loopback_timer_start(struct loopback_pcm *dpcm)</div><div class='ctx'> 		dpcm-&gt;period_update_pending = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	tick = dpcm-&gt;period_size_frac - dpcm-&gt;irq_pos;</div><div class='del'>-	tick = (tick + dpcm-&gt;pcm_bps - 1) / dpcm-&gt;pcm_bps;</div><div class='del'>-	dpcm-&gt;timer.expires = jiffies + tick;</div><div class='del'>-	add_timer(&amp;dpcm-&gt;timer);</div><div class='add'>+	tick = DIV_ROUND_UP(tick, dpcm-&gt;pcm_bps);</div><div class='add'>+	mod_timer(&amp;dpcm-&gt;timer, jiffies + tick);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static int loopback_snd_timer_start(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Loopback device has to use same period as timer card. Therefore</div><div class='add'>+	 * wake up for each snd_pcm_period_elapsed() call of timer card.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_timer_start(cable-&gt;snd_timer.instance, 1);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		/* do not report error if trying to start but already</div><div class='add'>+		 * running. For example called by opposite substream</div><div class='add'>+		 * of the same cable</div><div class='add'>+		 */</div><div class='add'>+		if (err == -EBUSY)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		pcm_err(dpcm-&gt;substream-&gt;pcm,</div><div class='add'>+			"snd_timer_start(%d,%d,%d) failed with %d",</div><div class='add'>+			cable-&gt;snd_timer.id.card,</div><div class='add'>+			cable-&gt;snd_timer.id.device,</div><div class='add'>+			cable-&gt;snd_timer.id.subdevice,</div><div class='add'>+			err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void loopback_timer_stop(struct loopback_pcm *dpcm)</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static inline int loopback_jiffies_timer_stop(struct loopback_pcm *dpcm)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;dpcm-&gt;timer);</div><div class='add'>+	timer_delete(&amp;dpcm-&gt;timer);</div><div class='ctx'> 	dpcm-&gt;timer.expires = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define CABLE_VALID_PLAYBACK	(1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-#define CABLE_VALID_CAPTURE	(1 &lt;&lt; SNDRV_PCM_STREAM_CAPTURE)</div><div class='del'>-#define CABLE_VALID_BOTH	(CABLE_VALID_PLAYBACK|CABLE_VALID_CAPTURE)</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static int loopback_snd_timer_stop(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* only stop if both devices (playback and capture) are not running */</div><div class='add'>+	if (cable-&gt;running ^ cable-&gt;pause)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = snd_timer_stop(cable-&gt;snd_timer.instance);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pcm_err(dpcm-&gt;substream-&gt;pcm,</div><div class='add'>+			"snd_timer_stop(%d,%d,%d) failed with %d",</div><div class='add'>+			cable-&gt;snd_timer.id.card,</div><div class='add'>+			cable-&gt;snd_timer.id.device,</div><div class='add'>+			cable-&gt;snd_timer.id.subdevice,</div><div class='add'>+			err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int loopback_jiffies_timer_stop_sync(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	timer_delete_sync(&amp;dpcm-&gt;timer);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call in loopback-&gt;cable_lock */</div><div class='add'>+static int loopback_snd_timer_close_cable(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+</div><div class='add'>+	/* snd_timer was not opened */</div><div class='add'>+	if (!cable-&gt;snd_timer.instance)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* will only be called from free_cable() when other stream was</div><div class='add'>+	 * already closed. Other stream cannot be reopened as long as</div><div class='add'>+	 * loopback-&gt;cable_lock is locked. Therefore no need to lock</div><div class='add'>+	 * cable-&gt;lock;</div><div class='add'>+	 */</div><div class='add'>+	snd_timer_close(cable-&gt;snd_timer.instance);</div><div class='add'>+</div><div class='add'>+	/* wait till drain work has finished if requested */</div><div class='add'>+	cancel_work_sync(&amp;cable-&gt;snd_timer.event_work);</div><div class='add'>+</div><div class='add'>+	snd_timer_instance_free(cable-&gt;snd_timer.instance);</div><div class='add'>+	memset(&amp;cable-&gt;snd_timer, 0, sizeof(cable-&gt;snd_timer));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_access_interleaved(snd_pcm_access_t access)</div><div class='add'>+{</div><div class='add'>+	switch (access) {</div><div class='add'>+	case SNDRV_PCM_ACCESS_MMAP_INTERLEAVED:</div><div class='add'>+	case SNDRV_PCM_ACCESS_RW_INTERLEAVED:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int loopback_check_format(struct loopback_cable *cable, int stream)</div><div class='ctx'> {</div><div class='hunk'>@@ -211,7 +352,9 @@ static int loopback_check_format(struct loopback_cable *cable, int stream)</div><div class='ctx'> 							substream-&gt;runtime;</div><div class='ctx'> 	check = runtime-&gt;format != cruntime-&gt;format ||</div><div class='ctx'> 		runtime-&gt;rate != cruntime-&gt;rate ||</div><div class='del'>-		runtime-&gt;channels != cruntime-&gt;channels;</div><div class='add'>+		runtime-&gt;channels != cruntime-&gt;channels ||</div><div class='add'>+		is_access_interleaved(runtime-&gt;access) !=</div><div class='add'>+		is_access_interleaved(cruntime-&gt;access);</div><div class='ctx'> 	if (!check)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='hunk'>@@ -239,6 +382,12 @@ static int loopback_check_format(struct loopback_cable *cable, int stream)</div><div class='ctx'> 							&amp;setup-&gt;channels_id);</div><div class='ctx'> 			setup-&gt;channels = runtime-&gt;channels;</div><div class='ctx'> 		}</div><div class='add'>+		if (is_access_interleaved(setup-&gt;access) !=</div><div class='add'>+		    is_access_interleaved(runtime-&gt;access)) {</div><div class='add'>+			snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='add'>+							&amp;setup-&gt;access_id);</div><div class='add'>+			setup-&gt;access = runtime-&gt;access;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -255,7 +404,7 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='del'>-	int err, stream = 1 &lt;&lt; substream-&gt;stream;</div><div class='add'>+	int err = 0, stream = 1 &lt;&lt; substream-&gt;stream;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -264,53 +413,47 @@ static int loopback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		dpcm-&gt;last_jiffies = jiffies;</div><div class='ctx'> 		dpcm-&gt;pcm_rate_shift = 0;</div><div class='del'>-		spin_lock(&amp;cable-&gt;lock);	</div><div class='del'>-		cable-&gt;running |= stream;</div><div class='del'>-		cable-&gt;pause &amp;= ~stream;</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		loopback_timer_start(dpcm);</div><div class='add'>+		dpcm-&gt;last_drift = 0;</div><div class='add'>+		scoped_guard(spinlock, &amp;cable-&gt;lock) {</div><div class='add'>+			cable-&gt;running |= stream;</div><div class='add'>+			cable-&gt;pause &amp;= ~stream;</div><div class='add'>+			err = cable-&gt;ops-&gt;start(dpcm);</div><div class='add'>+		}</div><div class='ctx'> 		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 			loopback_active_notify(dpcm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		spin_lock(&amp;cable-&gt;lock);	</div><div class='del'>-		cable-&gt;running &amp;= ~stream;</div><div class='del'>-		cable-&gt;pause &amp;= ~stream;</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		loopback_timer_stop(dpcm);</div><div class='add'>+		scoped_guard(spinlock, &amp;cable-&gt;lock) {</div><div class='add'>+			cable-&gt;running &amp;= ~stream;</div><div class='add'>+			cable-&gt;pause &amp;= ~stream;</div><div class='add'>+			err = cable-&gt;ops-&gt;stop(dpcm);</div><div class='add'>+		}</div><div class='ctx'> 		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 			loopback_active_notify(dpcm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		spin_lock(&amp;cable-&gt;lock);	</div><div class='del'>-		cable-&gt;pause |= stream;</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		loopback_timer_stop(dpcm);</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='add'>+		scoped_guard(spinlock, &amp;cable-&gt;lock) {</div><div class='add'>+			cable-&gt;pause |= stream;</div><div class='add'>+			err = cable-&gt;ops-&gt;stop(dpcm);</div><div class='add'>+		}</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+			loopback_active_notify(dpcm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		spin_lock(&amp;cable-&gt;lock);</div><div class='del'>-		dpcm-&gt;last_jiffies = jiffies;</div><div class='del'>-		cable-&gt;pause &amp;= ~stream;</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		loopback_timer_start(dpcm);</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='add'>+		scoped_guard(spinlock, &amp;cable-&gt;lock) {</div><div class='add'>+			dpcm-&gt;last_jiffies = jiffies;</div><div class='add'>+			cable-&gt;pause &amp;= ~stream;</div><div class='add'>+			err = cable-&gt;ops-&gt;start(dpcm);</div><div class='add'>+		}</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+			loopback_active_notify(dpcm);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void params_change_substream(struct loopback_pcm *dpcm,</div><div class='del'>-				    struct snd_pcm_runtime *runtime)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *dst_runtime;</div><div class='del'>-</div><div class='del'>-	if (dpcm == NULL || dpcm-&gt;substream == NULL)</div><div class='del'>-		return;</div><div class='del'>-	dst_runtime = dpcm-&gt;substream-&gt;runtime;</div><div class='del'>-	if (dst_runtime == NULL)</div><div class='del'>-		return;</div><div class='del'>-	dst_runtime-&gt;hw = dpcm-&gt;cable-&gt;hw;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void params_change(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -319,15 +462,18 @@ static void params_change(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='ctx'> </div><div class='del'>-	cable-&gt;hw.formats = (1ULL &lt;&lt; runtime-&gt;format);</div><div class='add'>+	cable-&gt;hw.formats = pcm_format_to_bits(runtime-&gt;format);</div><div class='ctx'> 	cable-&gt;hw.rate_min = runtime-&gt;rate;</div><div class='ctx'> 	cable-&gt;hw.rate_max = runtime-&gt;rate;</div><div class='ctx'> 	cable-&gt;hw.channels_min = runtime-&gt;channels;</div><div class='ctx'> 	cable-&gt;hw.channels_max = runtime-&gt;channels;</div><div class='del'>-	params_change_substream(cable-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='del'>-				runtime);</div><div class='del'>-	params_change_substream(cable-&gt;streams[SNDRV_PCM_STREAM_CAPTURE],</div><div class='del'>-				runtime);</div><div class='add'>+</div><div class='add'>+	if (cable-&gt;snd_timer.instance) {</div><div class='add'>+		cable-&gt;hw.period_bytes_min =</div><div class='add'>+				frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+		cable-&gt;hw.period_bytes_max = cable-&gt;hw.period_bytes_min;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int loopback_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -335,9 +481,15 @@ static int loopback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='del'>-	int bps, salign;</div><div class='add'>+	int err, bps, salign;</div><div class='ctx'> </div><div class='del'>-	salign = (snd_pcm_format_width(runtime-&gt;format) *</div><div class='add'>+	if (cable-&gt;ops-&gt;stop_sync) {</div><div class='add'>+		err = cable-&gt;ops-&gt;stop_sync(dpcm);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	salign = (snd_pcm_format_physical_width(runtime-&gt;format) *</div><div class='ctx'> 						runtime-&gt;channels) / 8;</div><div class='ctx'> 	bps = salign * runtime-&gt;rate;</div><div class='ctx'> 	if (bps &lt;= 0 || salign &lt;= 0)</div><div class='hunk'>@@ -345,6 +497,7 @@ static int loopback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	dpcm-&gt;buf_pos = 0;</div><div class='ctx'> 	dpcm-&gt;pcm_buffer_size = frames_to_bytes(runtime, runtime-&gt;buffer_size);</div><div class='add'>+	dpcm-&gt;channel_buf_n = dpcm-&gt;pcm_buffer_size / runtime-&gt;channels;</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='ctx'> 		/* clear capture buffer */</div><div class='ctx'> 		dpcm-&gt;silent_size = dpcm-&gt;pcm_buffer_size;</div><div class='hunk'>@@ -358,13 +511,12 @@ static int loopback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	dpcm-&gt;pcm_salign = salign;</div><div class='ctx'> 	dpcm-&gt;pcm_period_size = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='add'>+	guard(mutex)(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='ctx'> 	if (!(cable-&gt;valid &amp; ~(1 &lt;&lt; substream-&gt;stream)) ||</div><div class='ctx'>             (get_setup(dpcm)-&gt;notify &amp;&amp;</div><div class='ctx'> 	     substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK))</div><div class='ctx'> 		params_change(substream);</div><div class='ctx'> 	cable-&gt;valid |= 1 &lt;&lt; substream-&gt;stream;</div><div class='del'>-	mutex_unlock(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -395,6 +547,22 @@ static void clear_capture_buf(struct loopback_pcm *dpcm, unsigned int bytes)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void copy_play_buf_part_n(struct loopback_pcm *play, struct loopback_pcm *capt,</div><div class='add'>+				 unsigned int size, unsigned int src_off, unsigned int dst_off)</div><div class='add'>+{</div><div class='add'>+	unsigned int channels = capt-&gt;substream-&gt;runtime-&gt;channels;</div><div class='add'>+	unsigned int size_p_ch = size / channels;</div><div class='add'>+	unsigned int src_off_ch = src_off / channels;</div><div class='add'>+	unsigned int dst_off_ch = dst_off / channels;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; channels; i++) {</div><div class='add'>+		memcpy(capt-&gt;substream-&gt;runtime-&gt;dma_area + capt-&gt;channel_buf_n * i + dst_off_ch,</div><div class='add'>+		       play-&gt;substream-&gt;runtime-&gt;dma_area + play-&gt;channel_buf_n * i + src_off_ch,</div><div class='add'>+		       size_p_ch);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void copy_play_buf(struct loopback_pcm *play,</div><div class='ctx'> 			  struct loopback_pcm *capt,</div><div class='ctx'> 			  unsigned int bytes)</div><div class='hunk'>@@ -408,7 +576,7 @@ static void copy_play_buf(struct loopback_pcm *play,</div><div class='ctx'> </div><div class='ctx'> 	/* check if playback is draining, trim the capture copy size</div><div class='ctx'> 	 * when our pointer is at the end of playback ring buffer */</div><div class='del'>-	if (runtime-&gt;status-&gt;state == SNDRV_PCM_STATE_DRAINING &amp;&amp;</div><div class='add'>+	if (runtime-&gt;state == SNDRV_PCM_STATE_DRAINING &amp;&amp;</div><div class='ctx'> 	    snd_pcm_playback_hw_avail(runtime) &lt; runtime-&gt;buffer_size) { </div><div class='ctx'> 	    	snd_pcm_uframes_t appl_ptr, appl_ptr1, diff;</div><div class='ctx'> 		appl_ptr = appl_ptr1 = runtime-&gt;control-&gt;appl_ptr;</div><div class='hunk'>@@ -429,7 +597,10 @@ static void copy_play_buf(struct loopback_pcm *play,</div><div class='ctx'> 			size = play-&gt;pcm_buffer_size - src_off;</div><div class='ctx'> 		if (dst_off + size &gt; capt-&gt;pcm_buffer_size)</div><div class='ctx'> 			size = capt-&gt;pcm_buffer_size - dst_off;</div><div class='del'>-		memcpy(dst + dst_off, src + src_off, size);</div><div class='add'>+		if (!is_access_interleaved(runtime-&gt;access))</div><div class='add'>+			copy_play_buf_part_n(play, capt, size, src_off, dst_off);</div><div class='add'>+		else</div><div class='add'>+			memcpy(dst + dst_off, src + src_off, size);</div><div class='ctx'> 		capt-&gt;silent_size = 0;</div><div class='ctx'> 		bytes -= size;</div><div class='ctx'> 		if (!bytes)</div><div class='hunk'>@@ -444,117 +615,324 @@ static void copy_play_buf(struct loopback_pcm *play,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BYTEPOS_UPDATE_POSONLY	0</div><div class='del'>-#define BYTEPOS_UPDATE_CLEAR	1</div><div class='del'>-#define BYTEPOS_UPDATE_COPY	2</div><div class='del'>-</div><div class='del'>-static void loopback_bytepos_update(struct loopback_pcm *dpcm,</div><div class='del'>-				    unsigned int delta,</div><div class='del'>-				    unsigned int cmd)</div><div class='add'>+static inline unsigned int bytepos_delta(struct loopback_pcm *dpcm,</div><div class='add'>+					 unsigned int jiffies_delta)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count;</div><div class='ctx'> 	unsigned long last_pos;</div><div class='add'>+	unsigned int delta;</div><div class='ctx'> </div><div class='ctx'> 	last_pos = byte_pos(dpcm, dpcm-&gt;irq_pos);</div><div class='del'>-	dpcm-&gt;irq_pos += delta * dpcm-&gt;pcm_bps;</div><div class='del'>-	count = byte_pos(dpcm, dpcm-&gt;irq_pos) - last_pos;</div><div class='del'>-	if (!count)</div><div class='del'>-		return;</div><div class='del'>-	if (cmd == BYTEPOS_UPDATE_CLEAR)</div><div class='del'>-		clear_capture_buf(dpcm, count);</div><div class='del'>-	else if (cmd == BYTEPOS_UPDATE_COPY)</div><div class='del'>-		copy_play_buf(dpcm-&gt;cable-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='del'>-			      dpcm-&gt;cable-&gt;streams[SNDRV_PCM_STREAM_CAPTURE],</div><div class='del'>-			      count);</div><div class='del'>-	dpcm-&gt;buf_pos += count;</div><div class='del'>-	dpcm-&gt;buf_pos %= dpcm-&gt;pcm_buffer_size;</div><div class='add'>+	dpcm-&gt;irq_pos += jiffies_delta * dpcm-&gt;pcm_bps;</div><div class='add'>+	delta = byte_pos(dpcm, dpcm-&gt;irq_pos) - last_pos;</div><div class='add'>+	if (delta &gt;= dpcm-&gt;last_drift)</div><div class='add'>+		delta -= dpcm-&gt;last_drift;</div><div class='add'>+	dpcm-&gt;last_drift = 0;</div><div class='ctx'> 	if (dpcm-&gt;irq_pos &gt;= dpcm-&gt;period_size_frac) {</div><div class='ctx'> 		dpcm-&gt;irq_pos %= dpcm-&gt;period_size_frac;</div><div class='ctx'> 		dpcm-&gt;period_update_pending = 1;</div><div class='ctx'> 	}</div><div class='add'>+	return delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bytepos_finish(struct loopback_pcm *dpcm,</div><div class='add'>+				  unsigned int delta)</div><div class='add'>+{</div><div class='add'>+	dpcm-&gt;buf_pos += delta;</div><div class='add'>+	dpcm-&gt;buf_pos %= dpcm-&gt;pcm_buffer_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int loopback_pos_update(struct loopback_cable *cable)</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static unsigned int loopback_jiffies_timer_pos_update</div><div class='add'>+		(struct loopback_cable *cable)</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback_pcm *dpcm_play =</div><div class='ctx'> 			cable-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='ctx'> 	struct loopback_pcm *dpcm_capt =</div><div class='ctx'> 			cable-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='del'>-	unsigned long delta_play = 0, delta_capt = 0;</div><div class='del'>-	unsigned int running;</div><div class='add'>+	unsigned long delta_play = 0, delta_capt = 0, cur_jiffies;</div><div class='add'>+	unsigned int running, count1, count2;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cable-&gt;lock);	</div><div class='add'>+	cur_jiffies = jiffies;</div><div class='ctx'> 	running = cable-&gt;running ^ cable-&gt;pause;</div><div class='ctx'> 	if (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) {</div><div class='del'>-		delta_play = jiffies - dpcm_play-&gt;last_jiffies;</div><div class='add'>+		delta_play = cur_jiffies - dpcm_play-&gt;last_jiffies;</div><div class='ctx'> 		dpcm_play-&gt;last_jiffies += delta_play;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_CAPTURE)) {</div><div class='del'>-		delta_capt = jiffies - dpcm_capt-&gt;last_jiffies;</div><div class='add'>+		delta_capt = cur_jiffies - dpcm_capt-&gt;last_jiffies;</div><div class='ctx'> 		dpcm_capt-&gt;last_jiffies += delta_capt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (delta_play == 0 &amp;&amp; delta_capt == 0) {</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		return running;</div><div class='del'>-	}</div><div class='add'>+	if (delta_play == 0 &amp;&amp; delta_capt == 0)</div><div class='add'>+		goto unlock;</div><div class='ctx'> 		</div><div class='ctx'> 	if (delta_play &gt; delta_capt) {</div><div class='del'>-		loopback_bytepos_update(dpcm_play, delta_play - delta_capt,</div><div class='del'>-					BYTEPOS_UPDATE_POSONLY);</div><div class='add'>+		count1 = bytepos_delta(dpcm_play, delta_play - delta_capt);</div><div class='add'>+		bytepos_finish(dpcm_play, count1);</div><div class='ctx'> 		delta_play = delta_capt;</div><div class='ctx'> 	} else if (delta_play &lt; delta_capt) {</div><div class='del'>-		loopback_bytepos_update(dpcm_capt, delta_capt - delta_play,</div><div class='del'>-					BYTEPOS_UPDATE_CLEAR);</div><div class='add'>+		count1 = bytepos_delta(dpcm_capt, delta_capt - delta_play);</div><div class='add'>+		clear_capture_buf(dpcm_capt, count1);</div><div class='add'>+		bytepos_finish(dpcm_capt, count1);</div><div class='ctx'> 		delta_capt = delta_play;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (delta_play == 0 &amp;&amp; delta_capt == 0) {</div><div class='del'>-		spin_unlock(&amp;cable-&gt;lock);</div><div class='del'>-		return running;</div><div class='del'>-	}</div><div class='add'>+	if (delta_play == 0 &amp;&amp; delta_capt == 0)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='ctx'> 	/* note delta_capt == delta_play at this moment */</div><div class='del'>-	loopback_bytepos_update(dpcm_capt, delta_capt, BYTEPOS_UPDATE_COPY);</div><div class='del'>-	loopback_bytepos_update(dpcm_play, delta_play, BYTEPOS_UPDATE_POSONLY);</div><div class='del'>-	spin_unlock(&amp;cable-&gt;lock);</div><div class='add'>+	count1 = bytepos_delta(dpcm_play, delta_play);</div><div class='add'>+	count2 = bytepos_delta(dpcm_capt, delta_capt);</div><div class='add'>+	if (count1 &lt; count2) {</div><div class='add'>+		dpcm_capt-&gt;last_drift = count2 - count1;</div><div class='add'>+		count1 = count2;</div><div class='add'>+	} else if (count1 &gt; count2) {</div><div class='add'>+		dpcm_play-&gt;last_drift = count1 - count2;</div><div class='add'>+	}</div><div class='add'>+	copy_play_buf(dpcm_play, dpcm_capt, count1);</div><div class='add'>+	bytepos_finish(dpcm_play, count1);</div><div class='add'>+	bytepos_finish(dpcm_capt, count1);</div><div class='add'>+ unlock:</div><div class='ctx'> 	return running;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void loopback_timer_function(unsigned long data)</div><div class='add'>+static void loopback_jiffies_timer_function(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct loopback_pcm *dpcm = (struct loopback_pcm *)data;</div><div class='del'>-	unsigned int running;</div><div class='add'>+	struct loopback_pcm *dpcm = timer_container_of(dpcm, t, timer);</div><div class='add'>+	bool period_elapsed = false;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;dpcm-&gt;cable-&gt;lock) {</div><div class='add'>+		if (loopback_jiffies_timer_pos_update(dpcm-&gt;cable) &amp;</div><div class='add'>+		    (1 &lt;&lt; dpcm-&gt;substream-&gt;stream)) {</div><div class='add'>+			loopback_jiffies_timer_start(dpcm);</div><div class='add'>+			if (dpcm-&gt;period_update_pending) {</div><div class='add'>+				dpcm-&gt;period_update_pending = 0;</div><div class='add'>+				period_elapsed = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (period_elapsed)</div><div class='add'>+		snd_pcm_period_elapsed(dpcm-&gt;substream);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	running = loopback_pos_update(dpcm-&gt;cable);</div><div class='del'>-	if (running &amp; (1 &lt;&lt; dpcm-&gt;substream-&gt;stream)) {</div><div class='del'>-		loopback_timer_start(dpcm);</div><div class='del'>-		if (dpcm-&gt;period_update_pending) {</div><div class='del'>-			dpcm-&gt;period_update_pending = 0;</div><div class='del'>-			snd_pcm_period_elapsed(dpcm-&gt;substream);</div><div class='add'>+/* call in cable-&gt;lock */</div><div class='add'>+static int loopback_snd_timer_check_resolution(struct snd_pcm_runtime *runtime,</div><div class='add'>+					       unsigned long resolution)</div><div class='add'>+{</div><div class='add'>+	if (resolution != runtime-&gt;timer_resolution) {</div><div class='add'>+		struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='add'>+		struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+		/* Worst case estimation of possible values for resolution</div><div class='add'>+		 * resolution &lt;= (512 * 1024) frames / 8kHz in nsec</div><div class='add'>+		 * resolution &lt;= 65.536.000.000 nsec</div><div class='add'>+		 *</div><div class='add'>+		 * period_size &lt;= 65.536.000.000 nsec / 1000nsec/usec * 192kHz +</div><div class='add'>+		 *  500.000</div><div class='add'>+		 * period_size &lt;= 12.582.912.000.000  &lt;64bit</div><div class='add'>+		 *  / 1.000.000 usec/sec</div><div class='add'>+		 */</div><div class='add'>+		snd_pcm_uframes_t period_size_usec =</div><div class='add'>+				resolution / 1000 * runtime-&gt;rate;</div><div class='add'>+		/* round to nearest sample rate */</div><div class='add'>+		snd_pcm_uframes_t period_size =</div><div class='add'>+				(period_size_usec + 500 * 1000) / (1000 * 1000);</div><div class='add'>+</div><div class='add'>+		pcm_err(dpcm-&gt;substream-&gt;pcm,</div><div class='add'>+			"Period size (%lu frames) of loopback device is not corresponding to timer resolution (%lu nsec = %lu frames) of card timer %d,%d,%d. Use period size of %lu frames for loopback device.",</div><div class='add'>+			runtime-&gt;period_size, resolution, period_size,</div><div class='add'>+			cable-&gt;snd_timer.id.card,</div><div class='add'>+			cable-&gt;snd_timer.id.device,</div><div class='add'>+			cable-&gt;snd_timer.id.subdevice,</div><div class='add'>+			period_size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_snd_timer_period_elapsed(struct loopback_cable *cable,</div><div class='add'>+					      int event,</div><div class='add'>+					      unsigned long resolution)</div><div class='add'>+{</div><div class='add'>+	struct loopback_pcm *dpcm_play, *dpcm_capt;</div><div class='add'>+	struct snd_pcm_substream *substream_play, *substream_capt;</div><div class='add'>+	struct snd_pcm_runtime *valid_runtime;</div><div class='add'>+	unsigned int running, elapsed_bytes;</div><div class='add'>+	bool xrun = false;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;cable-&gt;lock) {</div><div class='add'>+		running = cable-&gt;running ^ cable-&gt;pause;</div><div class='add'>+		/* no need to do anything if no stream is running */</div><div class='add'>+		if (!running)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		dpcm_play = cable-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+		dpcm_capt = cable-&gt;streams[SNDRV_PCM_STREAM_CAPTURE];</div><div class='add'>+</div><div class='add'>+		if (event == SNDRV_TIMER_EVENT_MSTOP) {</div><div class='add'>+			if (!dpcm_play ||</div><div class='add'>+			    dpcm_play-&gt;substream-&gt;runtime-&gt;state !=</div><div class='add'>+			    SNDRV_PCM_STATE_DRAINING)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		substream_play = (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) ?</div><div class='add'>+			dpcm_play-&gt;substream : NULL;</div><div class='add'>+		substream_capt = (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_CAPTURE)) ?</div><div class='add'>+			dpcm_capt-&gt;substream : NULL;</div><div class='add'>+		valid_runtime = (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) ?</div><div class='add'>+			dpcm_play-&gt;substream-&gt;runtime :</div><div class='add'>+			dpcm_capt-&gt;substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+		/* resolution is only valid for SNDRV_TIMER_EVENT_TICK events */</div><div class='add'>+		if (event == SNDRV_TIMER_EVENT_TICK) {</div><div class='add'>+			/* The hardware rules guarantee that playback and capture period</div><div class='add'>+			 * are the same. Therefore only one device has to be checked</div><div class='add'>+			 * here.</div><div class='add'>+			 */</div><div class='add'>+			if (loopback_snd_timer_check_resolution(valid_runtime,</div><div class='add'>+								resolution) &lt; 0) {</div><div class='add'>+				xrun = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		elapsed_bytes = frames_to_bytes(valid_runtime,</div><div class='add'>+						valid_runtime-&gt;period_size);</div><div class='add'>+		/* The same timer interrupt is used for playback and capture device */</div><div class='add'>+		if ((running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) &amp;&amp;</div><div class='add'>+		    (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_CAPTURE))) {</div><div class='add'>+			copy_play_buf(dpcm_play, dpcm_capt, elapsed_bytes);</div><div class='add'>+			bytepos_finish(dpcm_play, elapsed_bytes);</div><div class='add'>+			bytepos_finish(dpcm_capt, elapsed_bytes);</div><div class='add'>+		} else if (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) {</div><div class='add'>+			bytepos_finish(dpcm_play, elapsed_bytes);</div><div class='add'>+		} else if (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_CAPTURE)) {</div><div class='add'>+			clear_capture_buf(dpcm_capt, elapsed_bytes);</div><div class='add'>+			bytepos_finish(dpcm_capt, elapsed_bytes);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (xrun) {</div><div class='add'>+		if (substream_play)</div><div class='add'>+			snd_pcm_stop_xrun(substream_play);</div><div class='add'>+		if (substream_capt)</div><div class='add'>+			snd_pcm_stop_xrun(substream_capt);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (substream_play)</div><div class='add'>+		snd_pcm_period_elapsed(substream_play);</div><div class='add'>+	if (substream_capt)</div><div class='add'>+		snd_pcm_period_elapsed(substream_capt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_snd_timer_function(struct snd_timer_instance *timeri,</div><div class='add'>+					unsigned long resolution,</div><div class='add'>+					unsigned long ticks)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable = timeri-&gt;callback_data;</div><div class='add'>+</div><div class='add'>+	loopback_snd_timer_period_elapsed(cable, SNDRV_TIMER_EVENT_TICK,</div><div class='add'>+					  resolution);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_snd_timer_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable;</div><div class='add'>+</div><div class='add'>+	cable = container_of(work, struct loopback_cable, snd_timer.event_work);</div><div class='add'>+	loopback_snd_timer_period_elapsed(cable, SNDRV_TIMER_EVENT_MSTOP, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_snd_timer_event(struct snd_timer_instance *timeri,</div><div class='add'>+				     int event,</div><div class='add'>+				     struct timespec64 *tstamp,</div><div class='add'>+				     unsigned long resolution)</div><div class='add'>+{</div><div class='add'>+	/* Do not lock cable-&gt;lock here because timer-&gt;lock is already hold.</div><div class='add'>+	 * There are other functions which first lock cable-&gt;lock and than</div><div class='add'>+	 * timer-&gt;lock e.g.</div><div class='add'>+	 * loopback_trigger()</div><div class='add'>+	 * spin_lock(&amp;cable-&gt;lock)</div><div class='add'>+	 * loopback_snd_timer_start()</div><div class='add'>+	 * snd_timer_start()</div><div class='add'>+	 * spin_lock(&amp;timer-&gt;lock)</div><div class='add'>+	 * Therefore when using the oposit order of locks here it could result</div><div class='add'>+	 * in a deadlock.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (event == SNDRV_TIMER_EVENT_MSTOP) {</div><div class='add'>+		struct loopback_cable *cable = timeri-&gt;callback_data;</div><div class='add'>+</div><div class='add'>+		/* sound card of the timer was stopped. Therefore there will not</div><div class='add'>+		 * be any further timer callbacks. Due to this forward audio</div><div class='add'>+		 * data from here if in draining state. When still in running</div><div class='add'>+		 * state the streaming will be aborted by the usual timeout. It</div><div class='add'>+		 * should not be aborted here because may be the timer sound</div><div class='add'>+		 * card does only a recovery and the timer is back soon.</div><div class='add'>+		 * This work triggers loopback_snd_timer_work()</div><div class='add'>+		 */</div><div class='add'>+		schedule_work(&amp;cable-&gt;snd_timer.event_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_jiffies_timer_dpcm_info(struct loopback_pcm *dpcm,</div><div class='add'>+					     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	snd_iprintf(buffer, "    update_pending:\t%u\n",</div><div class='add'>+		    dpcm-&gt;period_update_pending);</div><div class='add'>+	snd_iprintf(buffer, "    irq_pos:\t\t%u\n", dpcm-&gt;irq_pos);</div><div class='add'>+	snd_iprintf(buffer, "    period_frac:\t%u\n", dpcm-&gt;period_size_frac);</div><div class='add'>+	snd_iprintf(buffer, "    last_jiffies:\t%lu (%lu)\n",</div><div class='add'>+		    dpcm-&gt;last_jiffies, jiffies);</div><div class='add'>+	snd_iprintf(buffer, "    timer_expires:\t%lu\n", dpcm-&gt;timer.expires);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void loopback_snd_timer_dpcm_info(struct loopback_pcm *dpcm,</div><div class='add'>+					 struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "    sound timer:\thw:%d,%d,%d\n",</div><div class='add'>+		    cable-&gt;snd_timer.id.card,</div><div class='add'>+		    cable-&gt;snd_timer.id.device,</div><div class='add'>+		    cable-&gt;snd_timer.id.subdevice);</div><div class='add'>+	snd_iprintf(buffer, "    timer open:\t\t%s\n",</div><div class='add'>+		    snd_pcm_direction_name(cable-&gt;snd_timer.stream));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t loopback_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='add'>+	snd_pcm_uframes_t pos;</div><div class='ctx'> </div><div class='del'>-	loopback_pos_update(dpcm-&gt;cable);</div><div class='del'>-	return bytes_to_frames(runtime, dpcm-&gt;buf_pos);</div><div class='add'>+	guard(spinlock)(&amp;dpcm-&gt;cable-&gt;lock);</div><div class='add'>+	if (dpcm-&gt;cable-&gt;ops-&gt;pos_update)</div><div class='add'>+		dpcm-&gt;cable-&gt;ops-&gt;pos_update(dpcm-&gt;cable);</div><div class='add'>+	pos = dpcm-&gt;buf_pos;</div><div class='add'>+	return bytes_to_frames(runtime, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware loopback_pcm_hardware =</div><div class='add'>+static const struct snd_pcm_hardware loopback_pcm_hardware =</div><div class='ctx'> {</div><div class='ctx'> 	.info =		(SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP |</div><div class='del'>-			 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),</div><div class='add'>+			 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE |</div><div class='add'>+			 SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_NONINTERLEAVED),</div><div class='ctx'> 	.formats =	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |</div><div class='add'>+			 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE |</div><div class='add'>+			 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE |</div><div class='ctx'> 			 SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE |</div><div class='del'>-			 SNDRV_PCM_FMTBIT_FLOAT_LE | SNDRV_PCM_FMTBIT_FLOAT_BE),</div><div class='del'>-	.rates =	SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_192000,</div><div class='add'>+			 SNDRV_PCM_FMTBIT_FLOAT_LE | SNDRV_PCM_FMTBIT_FLOAT_BE |</div><div class='add'>+			 SNDRV_PCM_FMTBIT_DSD_U8 |</div><div class='add'>+			 SNDRV_PCM_FMTBIT_DSD_U16_LE | SNDRV_PCM_FMTBIT_DSD_U16_BE |</div><div class='add'>+			 SNDRV_PCM_FMTBIT_DSD_U32_LE | SNDRV_PCM_FMTBIT_DSD_U32_BE),</div><div class='add'>+	.rates =	SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_768000,</div><div class='ctx'> 	.rate_min =		8000,</div><div class='del'>-	.rate_max =		192000,</div><div class='add'>+	.rate_max =		768000,</div><div class='ctx'> 	.channels_min =		1,</div><div class='ctx'> 	.channels_max =		32,</div><div class='ctx'> 	.buffer_bytes_max =	2 * 1024 * 1024,</div><div class='hunk'>@@ -573,22 +951,15 @@ static void loopback_runtime_free(struct snd_pcm_runtime *runtime)</div><div class='ctx'> 	kfree(dpcm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int loopback_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			      struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int loopback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct loopback_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='add'>+	guard(mutex)(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='ctx'> 	cable-&gt;valid &amp;= ~(1 &lt;&lt; substream-&gt;stream);</div><div class='del'>-	mutex_unlock(&amp;dpcm-&gt;loopback-&gt;cable_lock);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int get_cable_index(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -602,26 +973,29 @@ static unsigned int get_cable_index(struct snd_pcm_substream *substream)</div><div class='ctx'> static int rule_format(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		       struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='add'>+	struct loopback_pcm *dpcm = rule-&gt;private;</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+	struct snd_mask m;</div><div class='ctx'> </div><div class='del'>-	struct snd_pcm_hardware *hw = rule-&gt;private;</div><div class='del'>-	struct snd_mask *maskp = hw_param_mask(params, rule-&gt;var);</div><div class='del'>-</div><div class='del'>-	maskp-&gt;bits[0] &amp;= (u_int32_t)hw-&gt;formats;</div><div class='del'>-	maskp-&gt;bits[1] &amp;= (u_int32_t)(hw-&gt;formats &gt;&gt; 32);</div><div class='del'>-	memset(maskp-&gt;bits + 2, 0, (SNDRV_MASK_MAX-64) / 8); /* clear rest */</div><div class='del'>-	if (! maskp-&gt;bits[0] &amp;&amp; ! maskp-&gt;bits[1])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='add'>+	snd_mask_none(&amp;m);</div><div class='add'>+	scoped_guard(mutex, &amp;dpcm-&gt;loopback-&gt;cable_lock) {</div><div class='add'>+		m.bits[0] = (u_int32_t)cable-&gt;hw.formats;</div><div class='add'>+		m.bits[1] = (u_int32_t)(cable-&gt;hw.formats &gt;&gt; 32);</div><div class='add'>+	}</div><div class='add'>+	return snd_mask_refine(hw_param_mask(params, rule-&gt;var), &amp;m);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rule_rate(struct snd_pcm_hw_params *params,</div><div class='ctx'> 		     struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hardware *hw = rule-&gt;private;</div><div class='add'>+	struct loopback_pcm *dpcm = rule-&gt;private;</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='ctx'> 	struct snd_interval t;</div><div class='ctx'> </div><div class='del'>-        t.min = hw-&gt;rate_min;</div><div class='del'>-        t.max = hw-&gt;rate_max;</div><div class='add'>+	scoped_guard(mutex, &amp;dpcm-&gt;loopback-&gt;cable_lock) {</div><div class='add'>+		t.min = cable-&gt;hw.rate_min;</div><div class='add'>+		t.max = cable-&gt;hw.rate_max;</div><div class='add'>+	}</div><div class='ctx'>         t.openmin = t.openmax = 0;</div><div class='ctx'>         t.integer = 0;</div><div class='ctx'> 	return snd_interval_refine(hw_param_interval(params, rule-&gt;var), &amp;t);</div><div class='hunk'>@@ -630,50 +1004,267 @@ static int rule_rate(struct snd_pcm_hw_params *params,</div><div class='ctx'> static int rule_channels(struct snd_pcm_hw_params *params,</div><div class='ctx'> 			 struct snd_pcm_hw_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_hardware *hw = rule-&gt;private;</div><div class='add'>+	struct loopback_pcm *dpcm = rule-&gt;private;</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='ctx'> 	struct snd_interval t;</div><div class='ctx'> </div><div class='del'>-        t.min = hw-&gt;channels_min;</div><div class='del'>-        t.max = hw-&gt;channels_max;</div><div class='add'>+	scoped_guard(mutex, &amp;dpcm-&gt;loopback-&gt;cable_lock) {</div><div class='add'>+		t.min = cable-&gt;hw.channels_min;</div><div class='add'>+		t.max = cable-&gt;hw.channels_max;</div><div class='add'>+	}</div><div class='ctx'>         t.openmin = t.openmax = 0;</div><div class='ctx'>         t.integer = 0;</div><div class='ctx'> 	return snd_interval_refine(hw_param_interval(params, rule-&gt;var), &amp;t);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rule_period_bytes(struct snd_pcm_hw_params *params,</div><div class='add'>+			     struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct loopback_pcm *dpcm = rule-&gt;private;</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+	struct snd_interval t;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dpcm-&gt;loopback-&gt;cable_lock) {</div><div class='add'>+		t.min = cable-&gt;hw.period_bytes_min;</div><div class='add'>+		t.max = cable-&gt;hw.period_bytes_max;</div><div class='add'>+	}</div><div class='add'>+	t.openmin = 0;</div><div class='add'>+	t.openmax = 0;</div><div class='add'>+	t.integer = 0;</div><div class='add'>+	return snd_interval_refine(hw_param_interval(params, rule-&gt;var), &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_cable(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct loopback *loopback = substream-&gt;private_data;</div><div class='add'>+	int dev = get_cable_index(substream);</div><div class='add'>+	struct loopback_cable *cable;</div><div class='add'>+</div><div class='add'>+	cable = loopback-&gt;cables[substream-&gt;number][dev];</div><div class='add'>+	if (!cable)</div><div class='add'>+		return;</div><div class='add'>+	if (cable-&gt;streams[!substream-&gt;stream]) {</div><div class='add'>+		/* other stream is still alive */</div><div class='add'>+		guard(spinlock_irq)(&amp;cable-&gt;lock);</div><div class='add'>+		cable-&gt;streams[substream-&gt;stream] = NULL;</div><div class='add'>+	} else {</div><div class='add'>+		struct loopback_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		if (cable-&gt;ops &amp;&amp; cable-&gt;ops-&gt;close_cable &amp;&amp; dpcm)</div><div class='add'>+			cable-&gt;ops-&gt;close_cable(dpcm);</div><div class='add'>+		/* free the cable */</div><div class='add'>+		loopback-&gt;cables[substream-&gt;number][dev] = NULL;</div><div class='add'>+		kfree(cable);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int loopback_jiffies_timer_open(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	timer_setup(&amp;dpcm-&gt;timer, loopback_jiffies_timer_function, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct loopback_ops loopback_jiffies_timer_ops = {</div><div class='add'>+	.open = loopback_jiffies_timer_open,</div><div class='add'>+	.start = loopback_jiffies_timer_start,</div><div class='add'>+	.stop = loopback_jiffies_timer_stop,</div><div class='add'>+	.stop_sync = loopback_jiffies_timer_stop_sync,</div><div class='add'>+	.close_substream = loopback_jiffies_timer_stop_sync,</div><div class='add'>+	.pos_update = loopback_jiffies_timer_pos_update,</div><div class='add'>+	.dpcm_info = loopback_jiffies_timer_dpcm_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int loopback_parse_timer_id(const char *str,</div><div class='add'>+				   struct snd_timer_id *tid)</div><div class='add'>+{</div><div class='add'>+	/* [&lt;pref&gt;:](&lt;card name&gt;|&lt;card idx&gt;)[{.,}&lt;dev idx&gt;[{.,}&lt;subdev idx&gt;]] */</div><div class='add'>+	const char * const sep_dev = ".,";</div><div class='add'>+	const char * const sep_pref = ":";</div><div class='add'>+	const char *name = str;</div><div class='add'>+	char *sep, save = '\0';</div><div class='add'>+	int card_idx = 0, dev = 0, subdev = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sep = strpbrk(str, sep_pref);</div><div class='add'>+	if (sep)</div><div class='add'>+		name = sep + 1;</div><div class='add'>+	sep = strpbrk(name, sep_dev);</div><div class='add'>+	if (sep) {</div><div class='add'>+		save = *sep;</div><div class='add'>+		*sep = '\0';</div><div class='add'>+	}</div><div class='add'>+	err = kstrtoint(name, 0, &amp;card_idx);</div><div class='add'>+	if (err == -EINVAL) {</div><div class='add'>+		/* Must be the name, not number */</div><div class='add'>+		for (card_idx = 0; card_idx &lt; snd_ecards_limit; card_idx++) {</div><div class='add'>+			struct snd_card *card = snd_card_ref(card_idx);</div><div class='add'>+</div><div class='add'>+			if (card) {</div><div class='add'>+				if (!strcmp(card-&gt;id, name))</div><div class='add'>+					err = 0;</div><div class='add'>+				snd_card_unref(card);</div><div class='add'>+			}</div><div class='add'>+			if (!err)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (sep) {</div><div class='add'>+		*sep = save;</div><div class='add'>+		if (!err) {</div><div class='add'>+			char *sep2, save2 = '\0';</div><div class='add'>+</div><div class='add'>+			sep2 = strpbrk(sep + 1, sep_dev);</div><div class='add'>+			if (sep2) {</div><div class='add'>+				save2 = *sep2;</div><div class='add'>+				*sep2 = '\0';</div><div class='add'>+			}</div><div class='add'>+			err = kstrtoint(sep + 1, 0, &amp;dev);</div><div class='add'>+			if (sep2) {</div><div class='add'>+				*sep2 = save2;</div><div class='add'>+				if (!err)</div><div class='add'>+					err = kstrtoint(sep2 + 1, 0, &amp;subdev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (card_idx == -1)</div><div class='add'>+		tid-&gt;dev_class = SNDRV_TIMER_CLASS_GLOBAL;</div><div class='add'>+	if (!err &amp;&amp; tid) {</div><div class='add'>+		tid-&gt;card = card_idx;</div><div class='add'>+		tid-&gt;device = dev;</div><div class='add'>+		tid-&gt;subdevice = subdev;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call in loopback-&gt;cable_lock */</div><div class='add'>+static int loopback_snd_timer_open(struct loopback_pcm *dpcm)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct snd_timer_id tid = {</div><div class='add'>+		.dev_class = SNDRV_TIMER_CLASS_PCM,</div><div class='add'>+		.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION,</div><div class='add'>+	};</div><div class='add'>+	struct snd_timer_instance *timeri;</div><div class='add'>+	struct loopback_cable *cable = dpcm-&gt;cable;</div><div class='add'>+</div><div class='add'>+	/* check if timer was already opened. It is only opened once</div><div class='add'>+	 * per playback and capture subdevice (aka cable).</div><div class='add'>+	 */</div><div class='add'>+	if (cable-&gt;snd_timer.instance)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	err = loopback_parse_timer_id(dpcm-&gt;loopback-&gt;timer_source, &amp;tid);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pcm_err(dpcm-&gt;substream-&gt;pcm,</div><div class='add'>+			"Parsing timer source \'%s\' failed with %d",</div><div class='add'>+			dpcm-&gt;loopback-&gt;timer_source, err);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cable-&gt;snd_timer.stream = dpcm-&gt;substream-&gt;stream;</div><div class='add'>+	cable-&gt;snd_timer.id = tid;</div><div class='add'>+</div><div class='add'>+	timeri = snd_timer_instance_new(dpcm-&gt;loopback-&gt;card-&gt;id);</div><div class='add'>+	if (!timeri) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	/* The callback has to be called from another work. If</div><div class='add'>+	 * SNDRV_TIMER_IFLG_FAST is specified it will be called from the</div><div class='add'>+	 * snd_pcm_period_elapsed() call of the selected sound card.</div><div class='add'>+	 * snd_pcm_period_elapsed() helds snd_pcm_stream_lock_irqsave().</div><div class='add'>+	 * Due to our callback loopback_snd_timer_function() also calls</div><div class='add'>+	 * snd_pcm_period_elapsed() which calls snd_pcm_stream_lock_irqsave().</div><div class='add'>+	 * This would end up in a dead lock.</div><div class='add'>+	 */</div><div class='add'>+	timeri-&gt;flags |= SNDRV_TIMER_IFLG_AUTO;</div><div class='add'>+	timeri-&gt;callback = loopback_snd_timer_function;</div><div class='add'>+	timeri-&gt;callback_data = (void *)cable;</div><div class='add'>+	timeri-&gt;ccallback = loopback_snd_timer_event;</div><div class='add'>+</div><div class='add'>+	/* initialise a work used for draining */</div><div class='add'>+	INIT_WORK(&amp;cable-&gt;snd_timer.event_work, loopback_snd_timer_work);</div><div class='add'>+</div><div class='add'>+	/* The mutex loopback-&gt;cable_lock is kept locked.</div><div class='add'>+	 * Therefore snd_timer_open() cannot be called a second time</div><div class='add'>+	 * by the other device of the same cable.</div><div class='add'>+	 * Therefore the following issue cannot happen:</div><div class='add'>+	 * [proc1] Call loopback_timer_open() -&gt;</div><div class='add'>+	 *	   Unlock cable-&gt;lock for snd_timer_close/open() call</div><div class='add'>+	 * [proc2] Call loopback_timer_open() -&gt; snd_timer_open(),</div><div class='add'>+	 *	   snd_timer_start()</div><div class='add'>+	 * [proc1] Call snd_timer_open() and overwrite running timer</div><div class='add'>+	 *	   instance</div><div class='add'>+	 */</div><div class='add'>+	err = snd_timer_open(timeri, &amp;cable-&gt;snd_timer.id, current-&gt;pid);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pcm_err(dpcm-&gt;substream-&gt;pcm,</div><div class='add'>+			"snd_timer_open (%d,%d,%d) failed with %d",</div><div class='add'>+			cable-&gt;snd_timer.id.card,</div><div class='add'>+			cable-&gt;snd_timer.id.device,</div><div class='add'>+			cable-&gt;snd_timer.id.subdevice,</div><div class='add'>+			err);</div><div class='add'>+		snd_timer_instance_free(timeri);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cable-&gt;snd_timer.instance = timeri;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* stop_sync() is not required for sound timer because it does not need to be</div><div class='add'>+ * restarted in loopback_prepare() on Xrun recovery</div><div class='add'>+ */</div><div class='add'>+static const struct loopback_ops loopback_snd_timer_ops = {</div><div class='add'>+	.open = loopback_snd_timer_open,</div><div class='add'>+	.start = loopback_snd_timer_start,</div><div class='add'>+	.stop = loopback_snd_timer_stop,</div><div class='add'>+	.close_cable = loopback_snd_timer_close_cable,</div><div class='add'>+	.dpcm_info = loopback_snd_timer_dpcm_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int loopback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct loopback *loopback = substream-&gt;private_data;</div><div class='ctx'> 	struct loopback_pcm *dpcm;</div><div class='del'>-	struct loopback_cable *cable;</div><div class='add'>+	struct loopback_cable *cable = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int dev = get_cable_index(substream);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);</div><div class='del'>-	if (!dpcm) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='add'>+	if (!dpcm)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	dpcm-&gt;loopback = loopback;</div><div class='ctx'> 	dpcm-&gt;substream = substream;</div><div class='del'>-	setup_timer(&amp;dpcm-&gt;timer, loopback_timer_function,</div><div class='del'>-		    (unsigned long)dpcm);</div><div class='ctx'> </div><div class='ctx'> 	cable = loopback-&gt;cables[substream-&gt;number][dev];</div><div class='ctx'> 	if (!cable) {</div><div class='ctx'> 		cable = kzalloc(sizeof(*cable), GFP_KERNEL);</div><div class='ctx'> 		if (!cable) {</div><div class='del'>-			kfree(dpcm);</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock_init(&amp;cable-&gt;lock);</div><div class='ctx'> 		cable-&gt;hw = loopback_pcm_hardware;</div><div class='add'>+		if (loopback-&gt;timer_source)</div><div class='add'>+			cable-&gt;ops = &amp;loopback_snd_timer_ops;</div><div class='add'>+		else</div><div class='add'>+			cable-&gt;ops = &amp;loopback_jiffies_timer_ops;</div><div class='ctx'> 		loopback-&gt;cables[substream-&gt;number][dev] = cable;</div><div class='ctx'> 	}</div><div class='ctx'> 	dpcm-&gt;cable = cable;</div><div class='del'>-	cable-&gt;streams[substream-&gt;stream] = dpcm;</div><div class='add'>+	runtime-&gt;private_data = dpcm;</div><div class='add'>+</div><div class='add'>+	if (cable-&gt;ops-&gt;open) {</div><div class='add'>+		err = cable-&gt;ops-&gt;open(dpcm);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='ctx'> </div><div class='hunk'>@@ -682,31 +1273,54 @@ static int loopback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	/* are cached -&gt; they do not reflect the actual state */</div><div class='ctx'> 	err = snd_pcm_hw_rule_add(runtime, 0,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				  rule_format, &amp;runtime-&gt;hw,</div><div class='add'>+				  rule_format, dpcm,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	err = snd_pcm_hw_rule_add(runtime, 0,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-				  rule_rate, &amp;runtime-&gt;hw,</div><div class='add'>+				  rule_rate, dpcm,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	err = snd_pcm_hw_rule_add(runtime, 0,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				  rule_channels, &amp;runtime-&gt;hw,</div><div class='add'>+				  rule_channels, dpcm,</div><div class='ctx'> 				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	runtime-&gt;private_data = dpcm;</div><div class='add'>+	/* In case of sound timer the period time of both devices of the same</div><div class='add'>+	 * loop has to be the same.</div><div class='add'>+	 * This rule only takes effect if a sound timer was chosen</div><div class='add'>+	 */</div><div class='add'>+	if (cable-&gt;snd_timer.instance) {</div><div class='add'>+		err = snd_pcm_hw_rule_add(runtime, 0,</div><div class='add'>+					  SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='add'>+					  rule_period_bytes, dpcm,</div><div class='add'>+					  SNDRV_PCM_HW_PARAM_PERIOD_BYTES, -1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* loopback_runtime_free() has not to be called if kfree(dpcm) was</div><div class='add'>+	 * already called here. Otherwise it will end up with a double free.</div><div class='add'>+	 */</div><div class='ctx'> 	runtime-&gt;private_free = loopback_runtime_free;</div><div class='ctx'> 	if (get_notify(dpcm))</div><div class='ctx'> 		runtime-&gt;hw = loopback_pcm_hardware;</div><div class='ctx'> 	else</div><div class='ctx'> 		runtime-&gt;hw = cable-&gt;hw;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;cable-&gt;lock) {</div><div class='add'>+		cable-&gt;streams[substream-&gt;stream] = dpcm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'>  unlock:</div><div class='del'>-	mutex_unlock(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		free_cable(substream);</div><div class='add'>+		kfree(dpcm);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -714,48 +1328,26 @@ static int loopback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = substream-&gt;private_data;</div><div class='ctx'> 	struct loopback_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	struct loopback_cable *cable;</div><div class='del'>-	int dev = get_cable_index(substream);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	loopback_timer_stop(dpcm);</div><div class='del'>-	mutex_lock(&amp;loopback-&gt;cable_lock);</div><div class='del'>-	cable = loopback-&gt;cables[substream-&gt;number][dev];</div><div class='del'>-	if (cable-&gt;streams[!substream-&gt;stream]) {</div><div class='del'>-		/* other stream is still alive */</div><div class='del'>-		cable-&gt;streams[substream-&gt;stream] = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		/* free the cable */</div><div class='del'>-		loopback-&gt;cables[substream-&gt;number][dev] = NULL;</div><div class='del'>-		kfree(cable);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;loopback-&gt;cable_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	if (dpcm-&gt;cable-&gt;ops-&gt;close_substream)</div><div class='add'>+		err = dpcm-&gt;cable-&gt;ops-&gt;close_substream(dpcm);</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	free_cable(substream);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops loopback_playback_ops = {</div><div class='del'>-	.open =		loopback_open,</div><div class='del'>-	.close =	loopback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	loopback_hw_params,</div><div class='del'>-	.hw_free =	loopback_hw_free,</div><div class='del'>-	.prepare =	loopback_prepare,</div><div class='del'>-	.trigger =	loopback_trigger,</div><div class='del'>-	.pointer =	loopback_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops loopback_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops loopback_pcm_ops = {</div><div class='ctx'> 	.open =		loopback_open,</div><div class='ctx'> 	.close =	loopback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	loopback_hw_params,</div><div class='ctx'> 	.hw_free =	loopback_hw_free,</div><div class='ctx'> 	.prepare =	loopback_prepare,</div><div class='ctx'> 	.trigger =	loopback_trigger,</div><div class='ctx'> 	.pointer =	loopback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit loopback_pcm_new(struct loopback *loopback,</div><div class='del'>-				      int device, int substreams)</div><div class='add'>+static int loopback_pcm_new(struct loopback *loopback,</div><div class='add'>+			    int device, int substreams)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -764,18 +1356,15 @@ static int __devinit loopback_pcm_new(struct loopback *loopback,</div><div class='ctx'> 			  substreams, substreams, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;loopback_playback_ops);</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;loopback_capture_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;loopback_pcm_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;loopback_pcm_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = loopback;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "Loopback PCM");</div><div class='add'>+	strscpy(pcm-&gt;name, "Loopback PCM");</div><div class='ctx'> </div><div class='ctx'> 	loopback-&gt;pcm[device] = pcm;</div><div class='del'>-</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-			snd_dma_continuous_data(GFP_KERNEL),</div><div class='del'>-			0, 2 * 1024 * 1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -795,6 +1384,7 @@ static int loopback_rate_shift_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].rate_shift;</div><div class='hunk'>@@ -813,14 +1403,13 @@ static int loopback_rate_shift_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		val = 80000;</div><div class='ctx'> 	if (val &gt; 120000)</div><div class='ctx'> 		val = 120000;	</div><div class='del'>-	mutex_lock(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	if (val != loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 				  [kcontrol-&gt;id.device].rate_shift) {</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].rate_shift = val;</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -829,6 +1418,7 @@ static int loopback_notify_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].notify;</div><div class='hunk'>@@ -843,6 +1433,7 @@ static int loopback_notify_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	if (val != loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 				[kcontrol-&gt;id.device].notify) {</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='hunk'>@@ -856,13 +1447,17 @@ static int loopback_active_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct loopback_cable *cable = loopback-&gt;cables</div><div class='del'>-			[kcontrol-&gt;id.subdevice][kcontrol-&gt;id.device ^ 1];</div><div class='add'>+	struct loopback_cable *cable;</div><div class='add'>+</div><div class='ctx'> 	unsigned int val = 0;</div><div class='ctx'> </div><div class='del'>-	if (cable != NULL)</div><div class='del'>-		val = (cable-&gt;running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) ?</div><div class='del'>-									1 : 0;</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	cable = loopback-&gt;cables[kcontrol-&gt;id.subdevice][kcontrol-&gt;id.device ^ 1];</div><div class='add'>+	if (cable != NULL) {</div><div class='add'>+		unsigned int running = cable-&gt;running ^ cable-&gt;pause;</div><div class='add'>+</div><div class='add'>+		val = (running &amp; (1 &lt;&lt; SNDRV_PCM_STREAM_PLAYBACK)) ? 1 : 0;</div><div class='add'>+	}</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -873,7 +1468,7 @@ static int loopback_format_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = SNDRV_PCM_FORMAT_LAST;</div><div class='add'>+	uinfo-&gt;value.integer.max = (__force int)SNDRV_PCM_FORMAT_LAST;</div><div class='ctx'> 	uinfo-&gt;value.integer.step = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }                                  </div><div class='hunk'>@@ -884,7 +1479,7 @@ static int loopback_format_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='del'>-		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='add'>+		(__force int)loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].format;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -905,6 +1500,7 @@ static int loopback_rate_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].rate;</div><div class='hunk'>@@ -927,13 +1523,36 @@ static int loopback_channels_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		loopback-&gt;setup[kcontrol-&gt;id.subdevice]</div><div class='ctx'> 			       [kcontrol-&gt;id.device].channels;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new loopback_controls[]  __devinitdata = {</div><div class='add'>+static int loopback_access_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	const char * const texts[] = {"Interleaved", "Non-interleaved"};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int loopback_access_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct loopback *loopback = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	snd_pcm_access_t access;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	access = loopback-&gt;setup[kcontrol-&gt;id.subdevice][kcontrol-&gt;id.device].access;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = !is_access_interleaved(access);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new loopback_controls[]  = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         "PCM Rate Shift 100000",</div><div class='hunk'>@@ -979,10 +1598,18 @@ static struct snd_kcontrol_new loopback_controls[]  __devinitdata = {</div><div class='ctx'> 	.name =         "PCM Slave Channels",</div><div class='ctx'> 	.info =         loopback_channels_info,</div><div class='ctx'> 	.get =          loopback_channels_get</div><div class='del'>-}</div><div class='add'>+},</div><div class='add'>+#define ACCESS_IDX 6</div><div class='add'>+{</div><div class='add'>+	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='add'>+	.name =		"PCM Slave Access Mode",</div><div class='add'>+	.info =		loopback_access_info,</div><div class='add'>+	.get =		loopback_access_get,</div><div class='add'>+},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='add'>+static int loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = loopback-&gt;card;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='hunk'>@@ -990,7 +1617,7 @@ static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='ctx'> 	struct loopback_setup *setup;</div><div class='ctx'> 	int err, dev, substr, substr_count, idx;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, "Loopback Mixer");</div><div class='add'>+	strscpy(card-&gt;mixername, "Loopback Mixer");</div><div class='ctx'> 	for (dev = 0; dev &lt; 2; dev++) {</div><div class='ctx'> 		pcm = loopback-&gt;pcm[dev];</div><div class='ctx'> 		substr_count =</div><div class='hunk'>@@ -1000,6 +1627,7 @@ static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='ctx'> 			setup-&gt;notify = notify;</div><div class='ctx'> 			setup-&gt;rate_shift = NO_PITCH;</div><div class='ctx'> 			setup-&gt;format = SNDRV_PCM_FORMAT_S16_LE;</div><div class='add'>+			setup-&gt;access = SNDRV_PCM_ACCESS_RW_INTERLEAVED;</div><div class='ctx'> 			setup-&gt;rate = 48000;</div><div class='ctx'> 			setup-&gt;channels = 2;</div><div class='ctx'> 			for (idx = 0; idx &lt; ARRAY_SIZE(loopback_controls);</div><div class='hunk'>@@ -1010,6 +1638,14 @@ static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='ctx'> 					return -ENOMEM;</div><div class='ctx'> 				kctl-&gt;id.device = dev;</div><div class='ctx'> 				kctl-&gt;id.subdevice = substr;</div><div class='add'>+</div><div class='add'>+				/* Add the control before copying the id so that</div><div class='add'>+				 * the numid field of the id is set in the copy.</div><div class='add'>+				 */</div><div class='add'>+				err = snd_ctl_add(card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					return err;</div><div class='add'>+</div><div class='ctx'> 				switch (idx) {</div><div class='ctx'> 				case ACTIVE_IDX:</div><div class='ctx'> 					setup-&gt;active_id = kctl-&gt;id;</div><div class='hunk'>@@ -1023,20 +1659,18 @@ static int __devinit loopback_mixer_new(struct loopback *loopback, int notify)</div><div class='ctx'> 				case CHANNELS_IDX:</div><div class='ctx'> 					setup-&gt;channels_id = kctl-&gt;id;</div><div class='ctx'> 					break;</div><div class='add'>+				case ACCESS_IDX:</div><div class='add'>+					setup-&gt;access_id = kctl-&gt;id;</div><div class='add'>+					break;</div><div class='ctx'> 				default:</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				err = snd_ctl_add(card, kctl);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='ctx'> static void print_dpcm_info(struct snd_info_buffer *buffer,</div><div class='ctx'> 			    struct loopback_pcm *dpcm,</div><div class='ctx'> 			    const char *id)</div><div class='hunk'>@@ -1053,13 +1687,8 @@ static void print_dpcm_info(struct snd_info_buffer *buffer,</div><div class='ctx'> 	snd_iprintf(buffer, "    bytes_per_sec:\t%u\n", dpcm-&gt;pcm_bps);</div><div class='ctx'> 	snd_iprintf(buffer, "    sample_align:\t%u\n", dpcm-&gt;pcm_salign);</div><div class='ctx'> 	snd_iprintf(buffer, "    rate_shift:\t\t%u\n", dpcm-&gt;pcm_rate_shift);</div><div class='del'>-	snd_iprintf(buffer, "    update_pending:\t%u\n",</div><div class='del'>-						dpcm-&gt;period_update_pending);</div><div class='del'>-	snd_iprintf(buffer, "    irq_pos:\t\t%u\n", dpcm-&gt;irq_pos);</div><div class='del'>-	snd_iprintf(buffer, "    period_frac:\t%u\n", dpcm-&gt;period_size_frac);</div><div class='del'>-	snd_iprintf(buffer, "    last_jiffies:\t%lu (%lu)\n",</div><div class='del'>-					dpcm-&gt;last_jiffies, jiffies);</div><div class='del'>-	snd_iprintf(buffer, "    timer_expires:\t%lu\n", dpcm-&gt;timer.expires);</div><div class='add'>+	if (dpcm-&gt;cable-&gt;ops-&gt;dpcm_info)</div><div class='add'>+		dpcm-&gt;cable-&gt;ops-&gt;dpcm_info(dpcm, buffer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_substream_info(struct snd_info_buffer *buffer,</div><div class='hunk'>@@ -1087,44 +1716,71 @@ static void print_cable_info(struct snd_info_entry *entry,</div><div class='ctx'> 	struct loopback *loopback = entry-&gt;private_data;</div><div class='ctx'> 	int sub, num;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> 	num = entry-&gt;name[strlen(entry-&gt;name)-1];</div><div class='ctx'> 	num = num == '0' ? 0 : 1;</div><div class='ctx'> 	for (sub = 0; sub &lt; MAX_PCM_SUBSTREAMS; sub++)</div><div class='ctx'> 		print_substream_info(buffer, loopback, sub, num);</div><div class='del'>-	mutex_unlock(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit loopback_proc_new(struct loopback *loopback, int cidx)</div><div class='add'>+static int loopback_cable_proc_new(struct loopback *loopback, int cidx)</div><div class='ctx'> {</div><div class='ctx'> 	char name[32];</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(name, sizeof(name), "cable#%d", cidx);</div><div class='del'>-	err = snd_card_proc_new(loopback-&gt;card, name, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	return snd_card_ro_proc_new(loopback-&gt;card, name, loopback,</div><div class='add'>+				    print_cable_info);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	snd_info_set_text_ops(entry, loopback, print_cable_info);</div><div class='del'>-	return 0;</div><div class='add'>+static void loopback_set_timer_source(struct loopback *loopback,</div><div class='add'>+				      const char *value)</div><div class='add'>+{</div><div class='add'>+	if (loopback-&gt;timer_source) {</div><div class='add'>+		devm_kfree(loopback-&gt;card-&gt;dev, loopback-&gt;timer_source);</div><div class='add'>+		loopback-&gt;timer_source = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (value &amp;&amp; *value)</div><div class='add'>+		loopback-&gt;timer_source = devm_kstrdup(loopback-&gt;card-&gt;dev,</div><div class='add'>+						      value, GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+static void print_timer_source_info(struct snd_info_entry *entry,</div><div class='add'>+				    struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct loopback *loopback = entry-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-#define loopback_proc_new(loopback, cidx) do { } while (0)</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	snd_iprintf(buffer, "%s\n",</div><div class='add'>+		    loopback-&gt;timer_source ? loopback-&gt;timer_source : "");</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='add'>+static void change_timer_source_info(struct snd_info_entry *entry,</div><div class='add'>+				     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct loopback *loopback = entry-&gt;private_data;</div><div class='add'>+	char line[64];</div><div class='ctx'> </div><div class='del'>-static int __devinit loopback_probe(struct platform_device *devptr)</div><div class='add'>+	guard(mutex)(&amp;loopback-&gt;cable_lock);</div><div class='add'>+	if (!snd_info_get_line(buffer, line, sizeof(line)))</div><div class='add'>+		loopback_set_timer_source(loopback, strim(line));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int loopback_timer_source_proc_new(struct loopback *loopback)</div><div class='add'>+{</div><div class='add'>+	return snd_card_rw_proc_new(loopback-&gt;card, "timer_source", loopback,</div><div class='add'>+				    print_timer_source_info,</div><div class='add'>+				    change_timer_source_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int loopback_probe(struct platform_device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct loopback *loopback;</div><div class='ctx'> 	int dev = devptr-&gt;id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct loopback), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;devptr-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct loopback), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	loopback = card-&gt;private_data;</div><div class='hunk'>@@ -1135,73 +1791,57 @@ static int __devinit loopback_probe(struct platform_device *devptr)</div><div class='ctx'> 		pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;</div><div class='ctx'> 	</div><div class='ctx'> 	loopback-&gt;card = card;</div><div class='add'>+	loopback_set_timer_source(loopback, timer_source[dev]);</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;loopback-&gt;cable_lock);</div><div class='ctx'> </div><div class='ctx'> 	err = loopback_pcm_new(loopback, 0, pcm_substreams[dev]);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __nodev;</div><div class='add'>+		return err;</div><div class='ctx'> 	err = loopback_pcm_new(loopback, 1, pcm_substreams[dev]);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __nodev;</div><div class='add'>+		return err;</div><div class='ctx'> 	err = loopback_mixer_new(loopback, pcm_notify[dev] ? 1 : 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __nodev;</div><div class='del'>-	loopback_proc_new(loopback, 0);</div><div class='del'>-	loopback_proc_new(loopback, 1);</div><div class='del'>-	strcpy(card-&gt;driver, "Loopback");</div><div class='del'>-	strcpy(card-&gt;shortname, "Loopback");</div><div class='add'>+		return err;</div><div class='add'>+	loopback_cable_proc_new(loopback, 0);</div><div class='add'>+	loopback_cable_proc_new(loopback, 1);</div><div class='add'>+	loopback_timer_source_proc_new(loopback);</div><div class='add'>+	strscpy(card-&gt;driver, "Loopback");</div><div class='add'>+	strscpy(card-&gt;shortname, "Loopback");</div><div class='ctx'> 	sprintf(card-&gt;longname, "Loopback %i", dev + 1);</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (!err) {</div><div class='del'>-		platform_set_drvdata(devptr, card);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-      __nodev:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit loopback_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	platform_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int loopback_suspend(struct platform_device *pdev,</div><div class='del'>-				pm_message_t state)</div><div class='add'>+static int loopback_suspend(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='del'>-	struct loopback *loopback = card-&gt;private_data;</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-</div><div class='del'>-	snd_pcm_suspend_all(loopback-&gt;pcm[0]);</div><div class='del'>-	snd_pcm_suspend_all(loopback-&gt;pcm[1]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='del'>-static int loopback_resume(struct platform_device *pdev)</div><div class='add'>+static int loopback_resume(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(loopback_pm, loopback_suspend, loopback_resume);</div><div class='ctx'> </div><div class='ctx'> #define SND_LOOPBACK_DRIVER	"snd_aloop"</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver loopback_driver = {</div><div class='ctx'> 	.probe		= loopback_probe,</div><div class='del'>-	.remove		= __devexit_p(loopback_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= loopback_suspend,</div><div class='del'>-	.resume		= loopback_resume,</div><div class='del'>-#endif</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_LOOPBACK_DRIVER</div><div class='add'>+		.name	= SND_LOOPBACK_DRIVER,</div><div class='add'>+		.pm	= &amp;loopback_pm,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1241,7 +1881,7 @@ static int __init alsa_card_loopback_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!cards) {</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "aloop: No loopback enabled\n");</div><div class='add'>+		pr_err("aloop: No loopback enabled\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		loopback_unregister_all();</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c<br/>index 7f41990ed68b..1860ff75fe15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/dummy.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/dummy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/dummy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/dummy.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Dummy soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -23,11 +9,12 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/math64.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -39,7 +26,6 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Dummy soundcard (/dev/null)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");</div><div class='ctx'> </div><div class='ctx'> #define MAX_PCM_DEVICES		4</div><div class='ctx'> #define MAX_PCM_SUBSTREAMS	128</div><div class='hunk'>@@ -57,18 +43,22 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");</div><div class='ctx'> #define USE_CHANNELS_MAX 	2</div><div class='ctx'> #define USE_PERIODS_MIN 	1</div><div class='ctx'> #define USE_PERIODS_MAX 	1024</div><div class='add'>+#define USE_MIXER_VOLUME_LEVEL_MIN	-50</div><div class='add'>+#define USE_MIXER_VOLUME_LEVEL_MAX	100</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='add'>+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='ctx'> static char *model[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = NULL};</div><div class='ctx'> static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};</div><div class='ctx'> //static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};</div><div class='add'>+static int mixer_volume_level_min = USE_MIXER_VOLUME_LEVEL_MIN;</div><div class='add'>+static int mixer_volume_level_max = USE_MIXER_VOLUME_LEVEL_MAX;</div><div class='ctx'> #ifdef CONFIG_HIGH_RES_TIMERS</div><div class='del'>-static int hrtimer = 1;</div><div class='add'>+static bool hrtimer = 1;</div><div class='ctx'> #endif</div><div class='del'>-static int fake_buffer = 1;</div><div class='add'>+static bool fake_buffer = 1;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for dummy soundcard.");</div><div class='hunk'>@@ -84,6 +74,10 @@ module_param_array(pcm_substreams, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-128) for dummy driver.");</div><div class='ctx'> //module_param_array(midi_devs, int, NULL, 0444);</div><div class='ctx'> //MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");</div><div class='add'>+module_param(mixer_volume_level_min, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(mixer_volume_level_min, "Minimum mixer volume level for dummy driver. Default: -50");</div><div class='add'>+module_param(mixer_volume_level_max, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(mixer_volume_level_max, "Maximum mixer volume level for dummy driver. Default: 100");</div><div class='ctx'> module_param(fake_buffer, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fake_buffer, "Fake buffer allocations.");</div><div class='ctx'> #ifdef CONFIG_HIGH_RES_TIMERS</div><div class='hunk'>@@ -109,6 +103,9 @@ struct dummy_timer_ops {</div><div class='ctx'> 	snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define get_dummy_ops(substream) \</div><div class='add'>+	(*(const struct dummy_timer_ops **)(substream)-&gt;runtime-&gt;private_data)</div><div class='add'>+</div><div class='ctx'> struct dummy_model {</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	int (*playback_constraints)(struct snd_pcm_runtime *runtime);</div><div class='hunk'>@@ -128,13 +125,15 @@ struct dummy_model {</div><div class='ctx'> </div><div class='ctx'> struct snd_dummy {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct dummy_model *model;</div><div class='add'>+	const struct dummy_model *model;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_pcm_hardware pcm_hw;</div><div class='ctx'> 	spinlock_t mixer_lock;</div><div class='ctx'> 	int mixer_volume[MIXER_ADDR_LAST+1][2];</div><div class='ctx'> 	int capture_source[MIXER_ADDR_LAST+1][2];</div><div class='del'>-	const struct dummy_timer_ops *timer_ops;</div><div class='add'>+	int iobox;</div><div class='add'>+	struct snd_kcontrol *cd_volume_ctl;</div><div class='add'>+	struct snd_kcontrol *cd_switch_ctl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -153,13 +152,13 @@ static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_emu10k1 = {</div><div class='add'>+static const struct dummy_model model_emu10k1 = {</div><div class='ctx'> 	.name = "emu10k1",</div><div class='ctx'> 	.playback_constraints = emu10k1_playback_constraints,</div><div class='ctx'> 	.buffer_bytes_max = 128 * 1024,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_rme9652 = {</div><div class='add'>+static const struct dummy_model model_rme9652 = {</div><div class='ctx'> 	.name = "rme9652",</div><div class='ctx'> 	.buffer_bytes_max = 26 * 64 * 1024,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S32_LE,</div><div class='hunk'>@@ -169,7 +168,7 @@ struct dummy_model model_rme9652 = {</div><div class='ctx'> 	.periods_max = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_ice1712 = {</div><div class='add'>+static const struct dummy_model model_ice1712 = {</div><div class='ctx'> 	.name = "ice1712",</div><div class='ctx'> 	.buffer_bytes_max = 256 * 1024,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S32_LE,</div><div class='hunk'>@@ -179,7 +178,7 @@ struct dummy_model model_ice1712 = {</div><div class='ctx'> 	.periods_max = 1024,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_uda1341 = {</div><div class='add'>+static const struct dummy_model model_uda1341 = {</div><div class='ctx'> 	.name = "uda1341",</div><div class='ctx'> 	.buffer_bytes_max = 16380,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='hunk'>@@ -189,7 +188,7 @@ struct dummy_model model_uda1341 = {</div><div class='ctx'> 	.periods_max = 255,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_ac97 = {</div><div class='add'>+static const struct dummy_model model_ac97 = {</div><div class='ctx'> 	.name = "ac97",</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> 	.channels_min = 2,</div><div class='hunk'>@@ -199,7 +198,7 @@ struct dummy_model model_ac97 = {</div><div class='ctx'> 	.rate_max = 48000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model model_ca0106 = {</div><div class='add'>+static const struct dummy_model model_ca0106 = {</div><div class='ctx'> 	.name = "ca0106",</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> 	.buffer_bytes_max = ((65536-64)*8),</div><div class='hunk'>@@ -213,7 +212,7 @@ struct dummy_model model_ca0106 = {</div><div class='ctx'> 	.rate_max = 192000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dummy_model *dummy_models[] = {</div><div class='add'>+static const struct dummy_model *dummy_models[] = {</div><div class='ctx'> 	&amp;model_emu10k1,</div><div class='ctx'> 	&amp;model_rme9652,</div><div class='ctx'> 	&amp;model_ice1712,</div><div class='hunk'>@@ -228,6 +227,8 @@ struct dummy_model *dummy_models[] = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct dummy_systimer_pcm {</div><div class='add'>+	/* ops must be the first item */</div><div class='add'>+	const struct dummy_timer_ops *timer_ops;</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	unsigned long base_time;</div><div class='hunk'>@@ -242,9 +243,8 @@ struct dummy_systimer_pcm {</div><div class='ctx'> </div><div class='ctx'> static void dummy_systimer_rearm(struct dummy_systimer_pcm *dpcm)</div><div class='ctx'> {</div><div class='del'>-	dpcm-&gt;timer.expires = jiffies +</div><div class='del'>-		(dpcm-&gt;frac_period_rest + dpcm-&gt;rate - 1) / dpcm-&gt;rate;</div><div class='del'>-	add_timer(&amp;dpcm-&gt;timer);</div><div class='add'>+	mod_timer(&amp;dpcm-&gt;timer, jiffies +</div><div class='add'>+		DIV_ROUND_UP(dpcm-&gt;frac_period_rest, dpcm-&gt;rate));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm)</div><div class='hunk'>@@ -269,19 +269,19 @@ static void dummy_systimer_update(struct dummy_systimer_pcm *dpcm)</div><div class='ctx'> static int dummy_systimer_start(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct dummy_systimer_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	spin_lock(&amp;dpcm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;dpcm-&gt;lock);</div><div class='ctx'> 	dpcm-&gt;base_time = jiffies;</div><div class='ctx'> 	dummy_systimer_rearm(dpcm);</div><div class='del'>-	spin_unlock(&amp;dpcm-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_systimer_stop(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct dummy_systimer_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	spin_lock(&amp;dpcm-&gt;lock);</div><div class='del'>-	del_timer(&amp;dpcm-&gt;timer);</div><div class='del'>-	spin_unlock(&amp;dpcm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;dpcm-&gt;lock);</div><div class='add'>+	timer_delete(&amp;dpcm-&gt;timer);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -300,18 +300,17 @@ static int dummy_systimer_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dummy_systimer_callback(unsigned long data)</div><div class='add'>+static void dummy_systimer_callback(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct dummy_systimer_pcm *dpcm = (struct dummy_systimer_pcm *)data;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct dummy_systimer_pcm *dpcm = timer_container_of(dpcm, t, timer);</div><div class='ctx'> 	int elapsed = 0;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;dpcm-&gt;lock, flags);</div><div class='del'>-	dummy_systimer_update(dpcm);</div><div class='del'>-	dummy_systimer_rearm(dpcm);</div><div class='del'>-	elapsed = dpcm-&gt;elapsed;</div><div class='del'>-	dpcm-&gt;elapsed = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;dpcm-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;dpcm-&gt;lock) {</div><div class='add'>+		dummy_systimer_update(dpcm);</div><div class='add'>+		dummy_systimer_rearm(dpcm);</div><div class='add'>+		elapsed = dpcm-&gt;elapsed;</div><div class='add'>+		dpcm-&gt;elapsed = 0;</div><div class='add'>+	}</div><div class='ctx'> 	if (elapsed)</div><div class='ctx'> 		snd_pcm_period_elapsed(dpcm-&gt;substream);</div><div class='ctx'> }</div><div class='hunk'>@@ -320,13 +319,10 @@ static snd_pcm_uframes_t</div><div class='ctx'> dummy_systimer_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct dummy_systimer_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	snd_pcm_uframes_t pos;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dpcm-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;dpcm-&gt;lock);</div><div class='ctx'> 	dummy_systimer_update(dpcm);</div><div class='del'>-	pos = dpcm-&gt;frac_pos / HZ;</div><div class='del'>-	spin_unlock(&amp;dpcm-&gt;lock);</div><div class='del'>-	return pos;</div><div class='add'>+	return dpcm-&gt;frac_pos / HZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_systimer_create(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -337,9 +333,7 @@ static int dummy_systimer_create(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (!dpcm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = dpcm;</div><div class='del'>-	init_timer(&amp;dpcm-&gt;timer);</div><div class='del'>-	dpcm-&gt;timer.data = (unsigned long) dpcm;</div><div class='del'>-	dpcm-&gt;timer.function = dummy_systimer_callback;</div><div class='add'>+	timer_setup(&amp;dpcm-&gt;timer, dummy_systimer_callback, 0);</div><div class='ctx'> 	spin_lock_init(&amp;dpcm-&gt;lock);</div><div class='ctx'> 	dpcm-&gt;substream = substream;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -350,7 +344,7 @@ static void dummy_systimer_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	kfree(substream-&gt;runtime-&gt;private_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dummy_timer_ops dummy_systimer_ops = {</div><div class='add'>+static const struct dummy_timer_ops dummy_systimer_ops = {</div><div class='ctx'> 	.create =	dummy_systimer_create,</div><div class='ctx'> 	.free =		dummy_systimer_free,</div><div class='ctx'> 	.prepare =	dummy_systimer_prepare,</div><div class='hunk'>@@ -365,21 +359,15 @@ static struct dummy_timer_ops dummy_systimer_ops = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct dummy_hrtimer_pcm {</div><div class='add'>+	/* ops must be the first item */</div><div class='add'>+	const struct dummy_timer_ops *timer_ops;</div><div class='ctx'> 	ktime_t base_time;</div><div class='ctx'> 	ktime_t period_time;</div><div class='ctx'> 	atomic_t running;</div><div class='ctx'> 	struct hrtimer timer;</div><div class='del'>-	struct tasklet_struct tasklet;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void dummy_hrtimer_pcm_elapsed(unsigned long priv)</div><div class='del'>-{</div><div class='del'>-	struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv;</div><div class='del'>-	if (atomic_read(&amp;dpcm-&gt;running))</div><div class='del'>-		snd_pcm_period_elapsed(dpcm-&gt;substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct dummy_hrtimer_pcm *dpcm;</div><div class='hunk'>@@ -387,7 +375,14 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)</div><div class='ctx'> 	dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer);</div><div class='ctx'> 	if (!atomic_read(&amp;dpcm-&gt;running))</div><div class='ctx'> 		return HRTIMER_NORESTART;</div><div class='del'>-	tasklet_schedule(&amp;dpcm-&gt;tasklet);</div><div class='add'>+	/*</div><div class='add'>+	 * In cases of XRUN and draining, this calls .trigger to stop PCM</div><div class='add'>+	 * substream.</div><div class='add'>+	 */</div><div class='add'>+	snd_pcm_period_elapsed(dpcm-&gt;substream);</div><div class='add'>+	if (!atomic_read(&amp;dpcm-&gt;running))</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='ctx'> 	hrtimer_forward_now(timer, dpcm-&gt;period_time);</div><div class='ctx'> 	return HRTIMER_RESTART;</div><div class='ctx'> }</div><div class='hunk'>@@ -397,7 +392,7 @@ static int dummy_hrtimer_start(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct dummy_hrtimer_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	dpcm-&gt;base_time = hrtimer_cb_get_time(&amp;dpcm-&gt;timer);</div><div class='del'>-	hrtimer_start(&amp;dpcm-&gt;timer, dpcm-&gt;period_time, HRTIMER_MODE_REL);</div><div class='add'>+	hrtimer_start(&amp;dpcm-&gt;timer, dpcm-&gt;period_time, HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> 	atomic_set(&amp;dpcm-&gt;running, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -407,13 +402,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct dummy_hrtimer_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;dpcm-&gt;running, 0);</div><div class='del'>-	hrtimer_cancel(&amp;dpcm-&gt;timer);</div><div class='add'>+	if (!hrtimer_callback_running(&amp;dpcm-&gt;timer))</div><div class='add'>+		hrtimer_cancel(&amp;dpcm-&gt;timer);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)</div><div class='ctx'> {</div><div class='del'>-	tasklet_kill(&amp;dpcm-&gt;tasklet);</div><div class='add'>+	hrtimer_cancel(&amp;dpcm-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t</div><div class='hunk'>@@ -458,12 +454,9 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (!dpcm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = dpcm;</div><div class='del'>-	hrtimer_init(&amp;dpcm-&gt;timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-	dpcm-&gt;timer.function = dummy_hrtimer_callback;</div><div class='add'>+	hrtimer_setup(&amp;dpcm-&gt;timer, dummy_hrtimer_callback, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);</div><div class='ctx'> 	dpcm-&gt;substream = substream;</div><div class='ctx'> 	atomic_set(&amp;dpcm-&gt;running, 0);</div><div class='del'>-	tasklet_init(&amp;dpcm-&gt;tasklet, dummy_hrtimer_pcm_elapsed,</div><div class='del'>-		     (unsigned long)dpcm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -474,7 +467,7 @@ static void dummy_hrtimer_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	kfree(dpcm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dummy_timer_ops dummy_hrtimer_ops = {</div><div class='add'>+static const struct dummy_timer_ops dummy_hrtimer_ops = {</div><div class='ctx'> 	.create =	dummy_hrtimer_create,</div><div class='ctx'> 	.free =		dummy_hrtimer_free,</div><div class='ctx'> 	.prepare =	dummy_hrtimer_prepare,</div><div class='hunk'>@@ -491,34 +484,28 @@ static struct dummy_timer_ops dummy_hrtimer_ops = {</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		return dummy-&gt;timer_ops-&gt;start(substream);</div><div class='add'>+		return get_dummy_ops(substream)-&gt;start(substream);</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		return dummy-&gt;timer_ops-&gt;stop(substream);</div><div class='add'>+		return get_dummy_ops(substream)-&gt;stop(substream);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	return dummy-&gt;timer_ops-&gt;prepare(substream);</div><div class='add'>+	return get_dummy_ops(substream)-&gt;prepare(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	return dummy-&gt;timer_ops-&gt;pointer(substream);</div><div class='add'>+	return get_dummy_ops(substream)-&gt;pointer(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware dummy_pcm_hardware = {</div><div class='add'>+static const struct snd_pcm_hardware dummy_pcm_hardware = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='hunk'>@@ -545,33 +532,27 @@ static int dummy_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		substream-&gt;runtime-&gt;dma_bytes = params_buffer_bytes(hw_params);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dummy_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	if (fake_buffer)</div><div class='del'>-		return 0;</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct dummy_model *model = dummy-&gt;model;</div><div class='add'>+	const struct dummy_model *model = dummy-&gt;model;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	const struct dummy_timer_ops *ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dummy-&gt;timer_ops = &amp;dummy_systimer_ops;</div><div class='add'>+	ops = &amp;dummy_systimer_ops;</div><div class='ctx'> #ifdef CONFIG_HIGH_RES_TIMERS</div><div class='ctx'> 	if (hrtimer)</div><div class='del'>-		dummy-&gt;timer_ops = &amp;dummy_hrtimer_ops;</div><div class='add'>+		ops = &amp;dummy_hrtimer_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	err = dummy-&gt;timer_ops-&gt;create(substream);</div><div class='add'>+	err = ops-&gt;create(substream);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	get_dummy_ops(substream) = ops;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = dummy-&gt;pcm_hw;</div><div class='ctx'> 	if (substream-&gt;pcm-&gt;device &amp; 1) {</div><div class='hunk'>@@ -593,7 +574,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 			err = model-&gt;capture_constraints(substream-&gt;runtime);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		dummy-&gt;timer_ops-&gt;free(substream);</div><div class='add'>+		get_dummy_ops(substream)-&gt;free(substream);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -601,8 +582,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_dummy *dummy = snd_pcm_substream_chip(substream);</div><div class='del'>-	dummy-&gt;timer_ops-&gt;free(substream);</div><div class='add'>+	get_dummy_ops(substream)-&gt;free(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -641,15 +621,15 @@ static int alloc_fake_buffer(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_copy(struct snd_pcm_substream *substream,</div><div class='del'>-			  int channel, snd_pcm_uframes_t pos,</div><div class='del'>-			  void __user *dst, snd_pcm_uframes_t count)</div><div class='add'>+			  int channel, unsigned long pos,</div><div class='add'>+			  struct iov_iter *iter, unsigned long bytes)</div><div class='ctx'> {</div><div class='ctx'> 	return 0; /* do nothing */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dummy_pcm_silence(struct snd_pcm_substream *substream,</div><div class='del'>-			     int channel, snd_pcm_uframes_t pos,</div><div class='del'>-			     snd_pcm_uframes_t count)</div><div class='add'>+			     int channel, unsigned long pos,</div><div class='add'>+			     unsigned long bytes)</div><div class='ctx'> {</div><div class='ctx'> 	return 0; /* do nothing */</div><div class='ctx'> }</div><div class='hunk'>@@ -660,36 +640,32 @@ static struct page *dummy_pcm_page(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return virt_to_page(dummy_page[substream-&gt;stream]); /* the same page */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops dummy_pcm_ops = {</div><div class='add'>+static const struct snd_pcm_ops dummy_pcm_ops = {</div><div class='ctx'> 	.open =		dummy_pcm_open,</div><div class='ctx'> 	.close =	dummy_pcm_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	dummy_pcm_hw_params,</div><div class='del'>-	.hw_free =	dummy_pcm_hw_free,</div><div class='ctx'> 	.prepare =	dummy_pcm_prepare,</div><div class='ctx'> 	.trigger =	dummy_pcm_trigger,</div><div class='ctx'> 	.pointer =	dummy_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops dummy_pcm_ops_no_buf = {</div><div class='add'>+static const struct snd_pcm_ops dummy_pcm_ops_no_buf = {</div><div class='ctx'> 	.open =		dummy_pcm_open,</div><div class='ctx'> 	.close =	dummy_pcm_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	dummy_pcm_hw_params,</div><div class='del'>-	.hw_free =	dummy_pcm_hw_free,</div><div class='ctx'> 	.prepare =	dummy_pcm_prepare,</div><div class='ctx'> 	.trigger =	dummy_pcm_trigger,</div><div class='ctx'> 	.pointer =	dummy_pcm_pointer,</div><div class='ctx'> 	.copy =		dummy_pcm_copy,</div><div class='del'>-	.silence =	dummy_pcm_silence,</div><div class='add'>+	.fill_silence =	dummy_pcm_silence,</div><div class='ctx'> 	.page =		dummy_pcm_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,</div><div class='del'>-					int substreams)</div><div class='add'>+static int snd_card_dummy_pcm(struct snd_dummy *dummy, int device,</div><div class='add'>+			      int substreams)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='del'>-	struct snd_pcm_ops *ops;</div><div class='add'>+	const struct snd_pcm_ops *ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_new(dummy-&gt;card, "Dummy PCM", device,</div><div class='hunk'>@@ -705,11 +681,11 @@ static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, ops);</div><div class='ctx'> 	pcm-&gt;private_data = dummy;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "Dummy PCM");</div><div class='add'>+	strscpy(pcm-&gt;name, "Dummy PCM");</div><div class='ctx'> 	if (!fake_buffer) {</div><div class='del'>-		snd_pcm_lib_preallocate_pages_for_all(pcm,</div><div class='add'>+		snd_pcm_set_managed_buffer_all(pcm,</div><div class='ctx'> 			SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-			snd_dma_continuous_data(GFP_KERNEL),</div><div class='add'>+			NULL,</div><div class='ctx'> 			0, 64*1024);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -733,21 +709,20 @@ static int snd_dummy_volume_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 2;</div><div class='del'>-	uinfo-&gt;value.integer.min = -50;</div><div class='del'>-	uinfo-&gt;value.integer.max = 100;</div><div class='add'>+	uinfo-&gt;value.integer.min = mixer_volume_level_min;</div><div class='add'>+	uinfo-&gt;value.integer.max = mixer_volume_level_max;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int snd_dummy_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int addr = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = dummy-&gt;mixer_volume[addr][0];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = dummy-&gt;mixer_volume[addr][1];</div><div class='del'>-	spin_unlock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -759,21 +734,20 @@ static int snd_dummy_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int left, right;</div><div class='ctx'> </div><div class='ctx'> 	left = ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	if (left &lt; -50)</div><div class='del'>-		left = -50;</div><div class='del'>-	if (left &gt; 100)</div><div class='del'>-		left = 100;</div><div class='add'>+	if (left &lt; mixer_volume_level_min)</div><div class='add'>+		left = mixer_volume_level_min;</div><div class='add'>+	if (left &gt; mixer_volume_level_max)</div><div class='add'>+		left = mixer_volume_level_max;</div><div class='ctx'> 	right = ucontrol-&gt;value.integer.value[1];</div><div class='del'>-	if (right &lt; -50)</div><div class='del'>-		right = -50;</div><div class='del'>-	if (right &gt; 100)</div><div class='del'>-		right = 100;</div><div class='del'>-	spin_lock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='add'>+	if (right &lt; mixer_volume_level_min)</div><div class='add'>+		right = mixer_volume_level_min;</div><div class='add'>+	if (right &gt; mixer_volume_level_max)</div><div class='add'>+		right = mixer_volume_level_max;</div><div class='add'>+	guard(spinlock_irq)(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	change = dummy-&gt;mixer_volume[addr][0] != left ||</div><div class='ctx'> 	         dummy-&gt;mixer_volume[addr][1] != right;</div><div class='ctx'> 	dummy-&gt;mixer_volume[addr][0] = left;</div><div class='ctx'> 	dummy-&gt;mixer_volume[addr][1] = right;</div><div class='del'>-	spin_unlock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -786,17 +760,16 @@ static const DECLARE_TLV_DB_SCALE(db_scale_dummy, -4500, 30, 0);</div><div class='ctx'>   .private_value = addr }</div><div class='ctx'> </div><div class='ctx'> #define snd_dummy_capsrc_info	snd_ctl_boolean_stereo_info</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'> static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int addr = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = dummy-&gt;capture_source[addr][0];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = dummy-&gt;capture_source[addr][1];</div><div class='del'>-	spin_unlock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -808,16 +781,66 @@ static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> </div><div class='ctx'> 	left = ucontrol-&gt;value.integer.value[0] &amp; 1;</div><div class='ctx'> 	right = ucontrol-&gt;value.integer.value[1] &amp; 1;</div><div class='del'>-	spin_lock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	change = dummy-&gt;capture_source[addr][0] != left &amp;&amp;</div><div class='ctx'> 	         dummy-&gt;capture_source[addr][1] != right;</div><div class='ctx'> 	dummy-&gt;capture_source[addr][0] = left;</div><div class='ctx'> 	dummy-&gt;capture_source[addr][1] = right;</div><div class='del'>-	spin_unlock_irq(&amp;dummy-&gt;mixer_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_dummy_controls[] = {</div><div class='add'>+static int snd_dummy_iobox_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	static const char *const names[] = { "None", "CD Player" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(info, 1, 2, names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dummy_iobox_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	value-&gt;value.enumerated.item[0] = dummy-&gt;iobox;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dummy_iobox_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_dummy *dummy = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int changed;</div><div class='add'>+</div><div class='add'>+	if (value-&gt;value.enumerated.item[0] &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	changed = value-&gt;value.enumerated.item[0] != dummy-&gt;iobox;</div><div class='add'>+	if (changed) {</div><div class='add'>+		dummy-&gt;iobox = value-&gt;value.enumerated.item[0];</div><div class='add'>+</div><div class='add'>+		if (dummy-&gt;iobox) {</div><div class='add'>+			dummy-&gt;cd_volume_ctl-&gt;vd[0].access &amp;=</div><div class='add'>+				~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+			dummy-&gt;cd_switch_ctl-&gt;vd[0].access &amp;=</div><div class='add'>+				~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+		} else {</div><div class='add'>+			dummy-&gt;cd_volume_ctl-&gt;vd[0].access |=</div><div class='add'>+				SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+			dummy-&gt;cd_switch_ctl-&gt;vd[0].access |=</div><div class='add'>+				SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snd_ctl_notify(dummy-&gt;card, SNDRV_CTL_EVENT_MASK_INFO,</div><div class='add'>+			       &amp;dummy-&gt;cd_volume_ctl-&gt;id);</div><div class='add'>+		snd_ctl_notify(dummy-&gt;card, SNDRV_CTL_EVENT_MASK_INFO,</div><div class='add'>+			       &amp;dummy-&gt;cd_switch_ctl-&gt;id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new snd_dummy_controls[] = {</div><div class='ctx'> DUMMY_VOLUME("Master Volume", 0, MIXER_ADDR_MASTER),</div><div class='ctx'> DUMMY_CAPSRC("Master Capture Switch", 0, MIXER_ADDR_MASTER),</div><div class='ctx'> DUMMY_VOLUME("Synth Volume", 0, MIXER_ADDR_SYNTH),</div><div class='hunk'>@@ -827,37 +850,52 @@ DUMMY_CAPSRC("Line Capture Switch", 0, MIXER_ADDR_LINE),</div><div class='ctx'> DUMMY_VOLUME("Mic Volume", 0, MIXER_ADDR_MIC),</div><div class='ctx'> DUMMY_CAPSRC("Mic Capture Switch", 0, MIXER_ADDR_MIC),</div><div class='ctx'> DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD),</div><div class='del'>-DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)</div><div class='add'>+DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD),</div><div class='add'>+{</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name  = "External I/O Box",</div><div class='add'>+	.info  = snd_dummy_iobox_info,</div><div class='add'>+	.get   = snd_dummy_iobox_get,</div><div class='add'>+	.put   = snd_dummy_iobox_put,</div><div class='add'>+},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)</div><div class='add'>+static int snd_card_dummy_new_mixer(struct snd_dummy *dummy)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = dummy-&gt;card;</div><div class='add'>+	struct snd_kcontrol *kcontrol;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;dummy-&gt;mixer_lock);</div><div class='del'>-	strcpy(card-&gt;mixername, "Dummy Mixer");</div><div class='add'>+	strscpy(card-&gt;mixername, "Dummy Mixer");</div><div class='add'>+	dummy-&gt;iobox = 1;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_dummy_controls); idx++) {</div><div class='del'>-		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_dummy_controls[idx], dummy));</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;snd_dummy_controls[idx], dummy);</div><div class='add'>+		err = snd_ctl_add(card, kcontrol);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+		if (!strcmp(kcontrol-&gt;id.name, "CD Volume"))</div><div class='add'>+			dummy-&gt;cd_volume_ctl = kcontrol;</div><div class='add'>+		else if (!strcmp(kcontrol-&gt;id.name, "CD Capture Switch"))</div><div class='add'>+			dummy-&gt;cd_switch_ctl = kcontrol;</div><div class='add'>+</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_DEBUG) &amp;&amp; defined(CONFIG_PROC_FS)</div><div class='add'>+#if defined(CONFIG_SND_DEBUG) &amp;&amp; defined(CONFIG_SND_PROC_FS)</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface</div><div class='ctx'>  */</div><div class='ctx'> static void print_formats(struct snd_dummy *dummy,</div><div class='ctx'> 			  struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	snd_pcm_format_t i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SNDRV_PCM_FORMAT_LAST; i++) {</div><div class='del'>-		if (dummy-&gt;pcm_hw.formats &amp; (1ULL &lt;&lt; i))</div><div class='add'>+	pcm_for_each_format(i) {</div><div class='add'>+		if (dummy-&gt;pcm_hw.formats &amp; pcm_format_to_bits(i))</div><div class='ctx'> 			snd_iprintf(buffer, " %s", snd_pcm_format_name(i));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -865,7 +903,7 @@ static void print_formats(struct snd_dummy *dummy,</div><div class='ctx'> static void print_rates(struct snd_dummy *dummy,</div><div class='ctx'> 			struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	static int rates[] = {</div><div class='add'>+	static const int rates[] = {</div><div class='ctx'> 		5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,</div><div class='ctx'> 		64000, 88200, 96000, 176400, 192000,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -897,7 +935,7 @@ struct dummy_hw_field {</div><div class='ctx'> 	.offset = offsetof(struct snd_pcm_hardware, item), \</div><div class='ctx'> 	.size = sizeof(dummy_pcm_hardware.item) }</div><div class='ctx'> </div><div class='del'>-static struct dummy_hw_field fields[] = {</div><div class='add'>+static const struct dummy_hw_field fields[] = {</div><div class='ctx'> 	FIELD_ENTRY(formats, "%#llx"),</div><div class='ctx'> 	FIELD_ENTRY(rates, "%#x"),</div><div class='ctx'> 	FIELD_ENTRY(rate_min, "%d"),</div><div class='hunk'>@@ -953,7 +991,7 @@ static void dummy_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 		if (i &gt;= ARRAY_SIZE(fields))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		snd_info_get_str(item, ptr, sizeof(item));</div><div class='del'>-		if (strict_strtoull(item, 0, &amp;val))</div><div class='add'>+		if (kstrtoull(item, 0, &amp;val))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (fields[i].size == sizeof(int))</div><div class='ctx'> 			*get_dummy_int_ptr(dummy, fields[i].offset) = val;</div><div class='hunk'>@@ -962,39 +1000,32 @@ static void dummy_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit dummy_proc_init(struct snd_dummy *chip)</div><div class='add'>+static void dummy_proc_init(struct snd_dummy *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(chip-&gt;card, "dummy_pcm", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, chip, dummy_proc_read);</div><div class='del'>-		entry-&gt;c.text.write = dummy_proc_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-	}</div><div class='add'>+	snd_card_rw_proc_new(chip-&gt;card, "dummy_pcm", chip,</div><div class='add'>+			     dummy_proc_read, dummy_proc_write);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> #define dummy_proc_init(x)</div><div class='del'>-#endif /* CONFIG_SND_DEBUG &amp;&amp; CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_DEBUG &amp;&amp; CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_dummy_probe(struct platform_device *devptr)</div><div class='add'>+static int snd_dummy_probe(struct platform_device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_dummy *dummy;</div><div class='del'>-	struct dummy_model *m = NULL, **mdl;</div><div class='add'>+	const struct dummy_model *m = NULL, **mdl;</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> 	int dev = devptr-&gt;id;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_dummy), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;devptr-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_dummy), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	dummy = card-&gt;private_data;</div><div class='ctx'> 	dummy-&gt;card = card;</div><div class='ctx'> 	for (mdl = dummy_models; *mdl &amp;&amp; model[dev]; mdl++) {</div><div class='ctx'> 		if (strcmp(model[dev], (*mdl)-&gt;name) == 0) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-				"snd-dummy: Using model '%s' for card %i\n",</div><div class='add'>+			pr_info("snd-dummy: Using model '%s' for card %i\n",</div><div class='ctx'> 				(*mdl)-&gt;name, card-&gt;number);</div><div class='ctx'> 			m = dummy-&gt;model = *mdl;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1007,7 +1038,7 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)</div><div class='ctx'> 			pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;</div><div class='ctx'> 		err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev]);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto __nodev;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dummy-&gt;pcm_hw = dummy_pcm_hardware;</div><div class='hunk'>@@ -1036,65 +1067,53 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)</div><div class='ctx'> 			dummy-&gt;pcm_hw.channels_max = m-&gt;channels_max;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (mixer_volume_level_min &gt; mixer_volume_level_max) {</div><div class='add'>+		pr_warn("snd-dummy: Invalid mixer volume level: min=%d, max=%d. Fall back to default value.\n",</div><div class='add'>+		mixer_volume_level_min, mixer_volume_level_max);</div><div class='add'>+		mixer_volume_level_min = USE_MIXER_VOLUME_LEVEL_MIN;</div><div class='add'>+		mixer_volume_level_max = USE_MIXER_VOLUME_LEVEL_MAX;</div><div class='add'>+	}</div><div class='ctx'> 	err = snd_card_dummy_new_mixer(dummy);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __nodev;</div><div class='del'>-	strcpy(card-&gt;driver, "Dummy");</div><div class='del'>-	strcpy(card-&gt;shortname, "Dummy");</div><div class='add'>+		return err;</div><div class='add'>+	strscpy(card-&gt;driver, "Dummy");</div><div class='add'>+	strscpy(card-&gt;shortname, "Dummy");</div><div class='ctx'> 	sprintf(card-&gt;longname, "Dummy %i", dev + 1);</div><div class='ctx'> </div><div class='ctx'> 	dummy_proc_init(dummy);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;devptr-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		platform_set_drvdata(devptr, card);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-      __nodev:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_dummy_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	platform_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state)</div><div class='add'>+static int snd_dummy_suspend(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='del'>-	struct snd_dummy *dummy = card-&gt;private_data;</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(dummy-&gt;pcm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-	</div><div class='del'>-static int snd_dummy_resume(struct platform_device *pdev)</div><div class='add'>+</div><div class='add'>+static int snd_dummy_resume(struct device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);</div><div class='ctx'> </div><div class='ctx'> #define SND_DUMMY_DRIVER	"snd_dummy"</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_dummy_driver = {</div><div class='ctx'> 	.probe		= snd_dummy_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_dummy_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= snd_dummy_suspend,</div><div class='del'>-	.resume		= snd_dummy_resume,</div><div class='del'>-#endif</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_DUMMY_DRIVER</div><div class='add'>+		.name	= SND_DUMMY_DRIVER,</div><div class='add'>+		.pm	= &amp;snd_dummy_pm,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1140,7 +1159,7 @@ static int __init alsa_card_dummy_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!cards) {</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "Dummy soundcard not found or device busy\n");</div><div class='add'>+		pr_err("Dummy soundcard not found or device busy\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		snd_dummy_unregister_all();</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c<br/>deleted file mode 100644<br/>index a1282c1c0591..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/ml403-ac97cr.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/ml403-ac97cr.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1355 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ALSA driver for Xilinx ML403 AC97 Controller Reference</div><div class='del'>- *   IP: opb_ac97_controller_ref_v1_00_a (EDK 8.1i)</div><div class='del'>- *   IP: opb_ac97_controller_ref_v1_00_a (EDK 9.1i)</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by 2007  Joachim Foerster &lt;JOFT@gmx.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Some notes / status of this driver:</div><div class='del'>- *</div><div class='del'>- * - Don't wonder about some strange implementations of things - especially the</div><div class='del'>- * (heavy) shadowing of codec registers, with which I tried to reduce read</div><div class='del'>- * accesses to a minimum, because after a variable amount of accesses, the AC97</div><div class='del'>- * controller doesn't raise the register access finished bit anymore ...</div><div class='del'>- *</div><div class='del'>- * - Playback support seems to be pretty stable - no issues here.</div><div class='del'>- * - Capture support "works" now, too. Overruns don't happen any longer so often.</div><div class='del'>- *   But there might still be some ...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-/* HZ */</div><div class='del'>-#include &lt;linux/param.h&gt;</div><div class='del'>-/* jiffies, time_*() */</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-/* schedule_timeout*() */</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-/* spin_lock*() */</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-/* struct mutex, mutex_init(), mutex_*lock() */</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-/* snd_printk(), snd_printd() */</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;sound/pcm_params.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;sound/ac97_codec.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pcm-indirect2.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SND_ML403_AC97CR_DRIVER "ml403-ac97cr"</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Joachim Foerster &lt;JOFT@gmx.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Xilinx ML403 AC97 Controller Reference");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Xilinx,ML403 AC97 Controller Reference}}");</div><div class='del'>-</div><div class='del'>-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='del'>-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;</div><div class='del'>-</div><div class='del'>-module_param_array(index, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(index, "Index value for ML403 AC97 Controller Reference.");</div><div class='del'>-module_param_array(id, charp, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(id, "ID string for ML403 AC97 Controller Reference.");</div><div class='del'>-module_param_array(enable, bool, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(enable, "Enable this ML403 AC97 Controller Reference.");</div><div class='del'>-</div><div class='del'>-/* Special feature options */</div><div class='del'>-/*#define CODEC_WRITE_CHECK_RAF*/ /* don't return after a write to a codec</div><div class='del'>-				   * register, while RAF bit is not set</div><div class='del'>-				   */</div><div class='del'>-/* Debug options for code which may be removed completely in a final version */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-/*#define CODEC_STAT*/            /* turn on some minimal "statistics"</div><div class='del'>-				   * about codec register usage</div><div class='del'>-				   */</div><div class='del'>-#define SND_PCM_INDIRECT2_STAT    /* turn on some "statistics" about the</div><div class='del'>-				   * process of copying bytes from the</div><div class='del'>-				   * intermediate buffer to the hardware</div><div class='del'>-				   * fifo and the other way round</div><div class='del'>-				   */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Definition of a "level/facility dependent" printk(); may be removed</div><div class='del'>- * completely in a final version</div><div class='del'>- */</div><div class='del'>-#undef PDEBUG</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-/* "facilities" for PDEBUG */</div><div class='del'>-#define UNKNOWN       (1&lt;&lt;0)</div><div class='del'>-#define CODEC_SUCCESS (1&lt;&lt;1)</div><div class='del'>-#define CODEC_FAKE    (1&lt;&lt;2)</div><div class='del'>-#define INIT_INFO     (1&lt;&lt;3)</div><div class='del'>-#define INIT_FAILURE  (1&lt;&lt;4)</div><div class='del'>-#define WORK_INFO     (1&lt;&lt;5)</div><div class='del'>-#define WORK_FAILURE  (1&lt;&lt;6)</div><div class='del'>-</div><div class='del'>-#define PDEBUG_FACILITIES (UNKNOWN | INIT_FAILURE | WORK_FAILURE)</div><div class='del'>-</div><div class='del'>-#define PDEBUG(fac, fmt, args...) do { \</div><div class='del'>-		if (fac &amp; PDEBUG_FACILITIES) \</div><div class='del'>-			snd_printd(KERN_DEBUG SND_ML403_AC97CR_DRIVER ": " \</div><div class='del'>-				   fmt, ##args); \</div><div class='del'>-	} while (0)</div><div class='del'>-#else</div><div class='del'>-#define PDEBUG(fac, fmt, args...) /* nothing */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Defines for "waits"/timeouts (portions of HZ=250 on arch/ppc by default) */</div><div class='del'>-#define CODEC_TIMEOUT_ON_INIT       5	/* timeout for checking for codec</div><div class='del'>-					 * readiness (after insmod)</div><div class='del'>-					 */</div><div class='del'>-#ifndef CODEC_WRITE_CHECK_RAF</div><div class='del'>-#define CODEC_WAIT_AFTER_WRITE    100	/* general, static wait after a write</div><div class='del'>-					 * access to a codec register, may be</div><div class='del'>-					 * 0 to completely remove wait</div><div class='del'>-					 */</div><div class='del'>-#else</div><div class='del'>-#define CODEC_TIMEOUT_AFTER_WRITE   5	/* timeout after a write access to a</div><div class='del'>-					 * codec register, if RAF bit is used</div><div class='del'>-					 */</div><div class='del'>-#endif</div><div class='del'>-#define CODEC_TIMEOUT_AFTER_READ    5	/* timeout after a read access to a</div><div class='del'>-					 * codec register (checking RAF bit)</div><div class='del'>-					 */</div><div class='del'>-</div><div class='del'>-/* Infrastructure for codec register shadowing */</div><div class='del'>-#define LM4550_REG_OK        (1&lt;&lt;0)   /* register exists */</div><div class='del'>-#define LM4550_REG_DONEREAD  (1&lt;&lt;1)   /* read register once, value should be</div><div class='del'>-				       * the same currently in the register</div><div class='del'>-				       */</div><div class='del'>-#define LM4550_REG_NOSAVE    (1&lt;&lt;2)   /* values written to this register will</div><div class='del'>-				       * not be saved in the register</div><div class='del'>-				       */</div><div class='del'>-#define LM4550_REG_NOSHADOW  (1&lt;&lt;3)   /* don't do register shadowing, use plain</div><div class='del'>-				       * hardware access</div><div class='del'>-				       */</div><div class='del'>-#define LM4550_REG_READONLY  (1&lt;&lt;4)   /* register is read only */</div><div class='del'>-#define LM4550_REG_FAKEPROBE (1&lt;&lt;5)   /* fake write _and_ read actions during</div><div class='del'>-				       * probe() correctly</div><div class='del'>-				       */</div><div class='del'>-#define LM4550_REG_FAKEREAD  (1&lt;&lt;6)   /* fake read access, always return</div><div class='del'>-				       * default value</div><div class='del'>-				       */</div><div class='del'>-#define LM4550_REG_ALLFAKE   (LM4550_REG_FAKEREAD | LM4550_REG_FAKEPROBE)</div><div class='del'>-</div><div class='del'>-struct lm4550_reg {</div><div class='del'>-	u16 value;</div><div class='del'>-	u16 flag;</div><div class='del'>-	u16 wmask;</div><div class='del'>-	u16 def;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lm4550_reg lm4550_regfile[64] = {</div><div class='del'>-	[AC97_RESET / 2]              = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_NOSAVE \</div><div class='del'>-						| LM4550_REG_FAKEREAD,</div><div class='del'>-					 .def = 0x0D50},</div><div class='del'>-	[AC97_MASTER / 2]             = {.flag = LM4550_REG_OK</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8000},</div><div class='del'>-	[AC97_HEADPHONE / 2]          = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8000},</div><div class='del'>-	[AC97_MASTER_MONO / 2]        = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x801F,</div><div class='del'>-					 .def = 0x8000},</div><div class='del'>-	[AC97_PC_BEEP / 2]            = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x801E,</div><div class='del'>-					 .def = 0x0},</div><div class='del'>-	[AC97_PHONE / 2]              = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x801F,</div><div class='del'>-					 .def = 0x8008},</div><div class='del'>-	[AC97_MIC / 2]                = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x805F,</div><div class='del'>-					 .def = 0x8008},</div><div class='del'>-	[AC97_LINE / 2]               = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8808},</div><div class='del'>-	[AC97_CD / 2]                 = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8808},</div><div class='del'>-	[AC97_VIDEO / 2]              = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8808},</div><div class='del'>-	[AC97_AUX / 2]                = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8808},</div><div class='del'>-	[AC97_PCM / 2]                = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x9F1F,</div><div class='del'>-					 .def = 0x8008},</div><div class='del'>-	[AC97_REC_SEL / 2]            = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x707,</div><div class='del'>-					 .def = 0x0},</div><div class='del'>-	[AC97_REC_GAIN / 2]           = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .wmask = 0x8F0F,</div><div class='del'>-					 .def = 0x8000},</div><div class='del'>-	[AC97_GENERAL_PURPOSE / 2]    = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .def = 0x0,</div><div class='del'>-					 .wmask = 0xA380},</div><div class='del'>-	[AC97_3D_CONTROL / 2]         = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEREAD \</div><div class='del'>-						| LM4550_REG_READONLY,</div><div class='del'>-					 .def = 0x0101},</div><div class='del'>-	[AC97_POWERDOWN / 2]          = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_NOSHADOW \</div><div class='del'>-						| LM4550_REG_NOSAVE,</div><div class='del'>-					 .wmask = 0xFF00},</div><div class='del'>-					/* may not write ones to</div><div class='del'>-					 * REF/ANL/DAC/ADC bits</div><div class='del'>-					 * FIXME: Is this ok?</div><div class='del'>-					 */</div><div class='del'>-	[AC97_EXTENDED_ID / 2]        = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEREAD \</div><div class='del'>-						| LM4550_REG_READONLY,</div><div class='del'>-					 .def = 0x0201}, /* primary codec */</div><div class='del'>-	[AC97_EXTENDED_STATUS / 2]    = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_NOSHADOW \</div><div class='del'>-						| LM4550_REG_NOSAVE,</div><div class='del'>-					 .wmask = 0x1},</div><div class='del'>-	[AC97_PCM_FRONT_DAC_RATE / 2] = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .def = 0xBB80,</div><div class='del'>-					 .wmask = 0xFFFF},</div><div class='del'>-	[AC97_PCM_LR_ADC_RATE / 2]    = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_FAKEPROBE,</div><div class='del'>-					 .def = 0xBB80,</div><div class='del'>-					 .wmask = 0xFFFF},</div><div class='del'>-	[AC97_VENDOR_ID1 / 2]         = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_READONLY \</div><div class='del'>-						| LM4550_REG_FAKEREAD,</div><div class='del'>-					 .def = 0x4E53},</div><div class='del'>-	[AC97_VENDOR_ID2 / 2]         = {.flag = LM4550_REG_OK \</div><div class='del'>-						| LM4550_REG_READONLY \</div><div class='del'>-						| LM4550_REG_FAKEREAD,</div><div class='del'>-					 .def = 0x4350}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define LM4550_RF_OK(reg)    (lm4550_regfile[reg / 2].flag &amp; LM4550_REG_OK)</div><div class='del'>-</div><div class='del'>-static void lm4550_regfile_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 64; i++)</div><div class='del'>-		if (lm4550_regfile[i].flag &amp; LM4550_REG_FAKEPROBE)</div><div class='del'>-			lm4550_regfile[i].value = lm4550_regfile[i].def;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lm4550_regfile_write_values_after_init(struct snd_ac97 *ac97)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 64; i++)</div><div class='del'>-		if ((lm4550_regfile[i].flag &amp; LM4550_REG_FAKEPROBE) &amp;&amp;</div><div class='del'>-		    (lm4550_regfile[i].value != lm4550_regfile[i].def)) {</div><div class='del'>-			PDEBUG(CODEC_FAKE, "lm4550_regfile_write_values_after_"</div><div class='del'>-			       "init(): reg=0x%x value=0x%x / %d is different "</div><div class='del'>-			       "from def=0x%x / %d\n",</div><div class='del'>-			       i, lm4550_regfile[i].value,</div><div class='del'>-			       lm4550_regfile[i].value, lm4550_regfile[i].def,</div><div class='del'>-			       lm4550_regfile[i].def);</div><div class='del'>-			snd_ac97_write(ac97, i * 2, lm4550_regfile[i].value);</div><div class='del'>-			lm4550_regfile[i].flag |= LM4550_REG_DONEREAD;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* direct registers */</div><div class='del'>-#define CR_REG(ml403_ac97cr, x) ((ml403_ac97cr)-&gt;port + CR_REG_##x)</div><div class='del'>-</div><div class='del'>-#define CR_REG_PLAYFIFO         0x00</div><div class='del'>-#define   CR_PLAYDATA(a)        ((a) &amp; 0xFFFF)</div><div class='del'>-</div><div class='del'>-#define CR_REG_RECFIFO          0x04</div><div class='del'>-#define   CR_RECDATA(a)         ((a) &amp; 0xFFFF)</div><div class='del'>-</div><div class='del'>-#define CR_REG_STATUS           0x08</div><div class='del'>-#define   CR_RECOVER            (1&lt;&lt;7)</div><div class='del'>-#define   CR_PLAYUNDER          (1&lt;&lt;6)</div><div class='del'>-#define   CR_CODECREADY         (1&lt;&lt;5)</div><div class='del'>-#define   CR_RAF                (1&lt;&lt;4)</div><div class='del'>-#define   CR_RECEMPTY           (1&lt;&lt;3)</div><div class='del'>-#define   CR_RECFULL            (1&lt;&lt;2)</div><div class='del'>-#define   CR_PLAYHALF           (1&lt;&lt;1)</div><div class='del'>-#define   CR_PLAYFULL           (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define CR_REG_RESETFIFO        0x0C</div><div class='del'>-#define   CR_RECRESET           (1&lt;&lt;1)</div><div class='del'>-#define   CR_PLAYRESET          (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define CR_REG_CODEC_ADDR       0x10</div><div class='del'>-/* UG082 says:</div><div class='del'>- * #define   CR_CODEC_ADDR(a)  ((a) &lt;&lt; 1)</div><div class='del'>- * #define   CR_CODEC_READ     (1&lt;&lt;0)</div><div class='del'>- * #define   CR_CODEC_WRITE    (0&lt;&lt;0)</div><div class='del'>- */</div><div class='del'>-/* RefDesign example says: */</div><div class='del'>-#define   CR_CODEC_ADDR(a)      ((a) &lt;&lt; 0)</div><div class='del'>-#define   CR_CODEC_READ         (1&lt;&lt;7)</div><div class='del'>-#define   CR_CODEC_WRITE        (0&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-#define CR_REG_CODEC_DATAREAD   0x14</div><div class='del'>-#define   CR_CODEC_DATAREAD(v)  ((v) &amp; 0xFFFF)</div><div class='del'>-</div><div class='del'>-#define CR_REG_CODEC_DATAWRITE  0x18</div><div class='del'>-#define   CR_CODEC_DATAWRITE(v) ((v) &amp; 0xFFFF)</div><div class='del'>-</div><div class='del'>-#define CR_FIFO_SIZE            32</div><div class='del'>-</div><div class='del'>-struct snd_ml403_ac97cr {</div><div class='del'>-	/* lock for access to (controller) registers */</div><div class='del'>-	spinlock_t reg_lock;</div><div class='del'>-	/* mutex for the whole sequence of accesses to (controller) registers</div><div class='del'>-	 * which affect codec registers</div><div class='del'>-	 */</div><div class='del'>-	struct mutex cdc_mutex;</div><div class='del'>-</div><div class='del'>-	int irq; /* for playback */</div><div class='del'>-	int enable_irq;	/* for playback */</div><div class='del'>-</div><div class='del'>-	int capture_irq;</div><div class='del'>-	int enable_capture_irq;</div><div class='del'>-</div><div class='del'>-	struct resource *res_port;</div><div class='del'>-	void *port;</div><div class='del'>-</div><div class='del'>-	struct snd_ac97 *ac97;</div><div class='del'>-	int ac97_fake;</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	int ac97_read;</div><div class='del'>-	int ac97_write;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	struct platform_device *pfdev;</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	struct snd_pcm_substream *playback_substream;</div><div class='del'>-	struct snd_pcm_substream *capture_substream;</div><div class='del'>-</div><div class='del'>-	struct snd_pcm_indirect2 ind_rec; /* for playback */</div><div class='del'>-	struct snd_pcm_indirect2 capture_ind2_rec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware snd_ml403_ac97cr_playback = {</div><div class='del'>-	.info =	            (SNDRV_PCM_INFO_MMAP |</div><div class='del'>-			     SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-			     SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-	.formats =          SNDRV_PCM_FMTBIT_S16_BE,</div><div class='del'>-	.rates =	    (SNDRV_PCM_RATE_CONTINUOUS |</div><div class='del'>-			     SNDRV_PCM_RATE_8000_48000),</div><div class='del'>-	.rate_min =	    4000,</div><div class='del'>-	.rate_max =	    48000,</div><div class='del'>-	.channels_min =     2,</div><div class='del'>-	.channels_max =     2,</div><div class='del'>-	.buffer_bytes_max = (128*1024),</div><div class='del'>-	.period_bytes_min = CR_FIFO_SIZE/2,</div><div class='del'>-	.period_bytes_max = (64*1024),</div><div class='del'>-	.periods_min =      2,</div><div class='del'>-	.periods_max =      (128*1024)/(CR_FIFO_SIZE/2),</div><div class='del'>-	.fifo_size =	    0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware snd_ml403_ac97cr_capture = {</div><div class='del'>-	.info =	            (SNDRV_PCM_INFO_MMAP |</div><div class='del'>-			     SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-			     SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-	.formats =          SNDRV_PCM_FMTBIT_S16_BE,</div><div class='del'>-	.rates =            (SNDRV_PCM_RATE_CONTINUOUS |</div><div class='del'>-			     SNDRV_PCM_RATE_8000_48000),</div><div class='del'>-	.rate_min =         4000,</div><div class='del'>-	.rate_max =         48000,</div><div class='del'>-	.channels_min =     2,</div><div class='del'>-	.channels_max =     2,</div><div class='del'>-	.buffer_bytes_max = (128*1024),</div><div class='del'>-	.period_bytes_min = CR_FIFO_SIZE/2,</div><div class='del'>-	.period_bytes_max = (64*1024),</div><div class='del'>-	.periods_min =      2,</div><div class='del'>-	.periods_max =      (128*1024)/(CR_FIFO_SIZE/2),</div><div class='del'>-	.fifo_size =	    0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-snd_ml403_ac97cr_playback_ind2_zero(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_indirect2 *rec)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	int copied_words = 0;</div><div class='del'>-	u32 full = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	while ((full = (in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-			CR_PLAYFULL)) != CR_PLAYFULL) {</div><div class='del'>-		out_be32(CR_REG(ml403_ac97cr, PLAYFIFO), 0);</div><div class='del'>-		copied_words++;</div><div class='del'>-	}</div><div class='del'>-	rec-&gt;hw_ready = 0;</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return (size_t) (copied_words * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-snd_ml403_ac97cr_playback_ind2_copy(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_indirect2 *rec,</div><div class='del'>-				    size_t bytes)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	u16 *src;</div><div class='del'>-	int copied_words = 0;</div><div class='del'>-	u32 full = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	src = (u16 *)(substream-&gt;runtime-&gt;dma_area + rec-&gt;sw_data);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	while (((full = (in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-			 CR_PLAYFULL)) != CR_PLAYFULL) &amp;&amp; (bytes &gt; 1)) {</div><div class='del'>-		out_be32(CR_REG(ml403_ac97cr, PLAYFIFO),</div><div class='del'>-			 CR_PLAYDATA(src[copied_words]));</div><div class='del'>-		copied_words++;</div><div class='del'>-		bytes = bytes - 2;</div><div class='del'>-	}</div><div class='del'>-	if (full != CR_PLAYFULL)</div><div class='del'>-		rec-&gt;hw_ready = 1;</div><div class='del'>-	else</div><div class='del'>-		rec-&gt;hw_ready = 0;</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return (size_t) (copied_words * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-snd_ml403_ac97cr_capture_ind2_null(struct snd_pcm_substream *substream,</div><div class='del'>-				   struct snd_pcm_indirect2 *rec)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	int copied_words = 0;</div><div class='del'>-	u32 empty = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	while ((empty = (in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-			 CR_RECEMPTY)) != CR_RECEMPTY) {</div><div class='del'>-		volatile u32 trash;</div><div class='del'>-</div><div class='del'>-		trash = CR_RECDATA(in_be32(CR_REG(ml403_ac97cr, RECFIFO)));</div><div class='del'>-		/* Hmmmm, really necessary? Don't want call to in_be32()</div><div class='del'>-		 * to be optimised away!</div><div class='del'>-		 */</div><div class='del'>-		trash++;</div><div class='del'>-		copied_words++;</div><div class='del'>-	}</div><div class='del'>-	rec-&gt;hw_ready = 0;</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return (size_t) (copied_words * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-snd_ml403_ac97cr_capture_ind2_copy(struct snd_pcm_substream *substream,</div><div class='del'>-				   struct snd_pcm_indirect2 *rec, size_t bytes)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	u16 *dst;</div><div class='del'>-	int copied_words = 0;</div><div class='del'>-	u32 empty = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	dst = (u16 *)(substream-&gt;runtime-&gt;dma_area + rec-&gt;sw_data);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	while (((empty = (in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-			  CR_RECEMPTY)) != CR_RECEMPTY) &amp;&amp; (bytes &gt; 1)) {</div><div class='del'>-		dst[copied_words] = CR_RECDATA(in_be32(CR_REG(ml403_ac97cr,</div><div class='del'>-							      RECFIFO)));</div><div class='del'>-		copied_words++;</div><div class='del'>-		bytes = bytes - 2;</div><div class='del'>-	}</div><div class='del'>-	if (empty != CR_RECEMPTY)</div><div class='del'>-		rec-&gt;hw_ready = 1;</div><div class='del'>-	else</div><div class='del'>-		rec-&gt;hw_ready = 0;</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return (size_t) (copied_words * 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-snd_ml403_ac97cr_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct snd_pcm_indirect2 *ind2_rec = NULL;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	if (substream == ml403_ac97cr-&gt;playback_substream)</div><div class='del'>-		ind2_rec = &amp;ml403_ac97cr-&gt;ind_rec;</div><div class='del'>-	if (substream == ml403_ac97cr-&gt;capture_substream)</div><div class='del'>-		ind2_rec = &amp;ml403_ac97cr-&gt;capture_ind2_rec;</div><div class='del'>-</div><div class='del'>-	if (ind2_rec != NULL)</div><div class='del'>-		return snd_pcm_indirect2_pointer(substream, ind2_rec);</div><div class='del'>-	return (snd_pcm_uframes_t) 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ml403_ac97cr_pcm_playback_trigger(struct snd_pcm_substream *substream,</div><div class='del'>-				      int cmd)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		PDEBUG(WORK_INFO, "trigger(playback): START\n");</div><div class='del'>-		ml403_ac97cr-&gt;ind_rec.hw_ready = 1;</div><div class='del'>-</div><div class='del'>-		/* clear play FIFO */</div><div class='del'>-		out_be32(CR_REG(ml403_ac97cr, RESETFIFO), CR_PLAYRESET);</div><div class='del'>-</div><div class='del'>-		/* enable play irq */</div><div class='del'>-		ml403_ac97cr-&gt;enable_irq = 1;</div><div class='del'>-		enable_irq(ml403_ac97cr-&gt;irq);</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		PDEBUG(WORK_INFO, "trigger(playback): STOP\n");</div><div class='del'>-		ml403_ac97cr-&gt;ind_rec.hw_ready = 0;</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		snd_pcm_indirect2_stat(substream, &amp;ml403_ac97cr-&gt;ind_rec);</div><div class='del'>-#endif</div><div class='del'>-		/* disable play irq */</div><div class='del'>-		disable_irq_nosync(ml403_ac97cr-&gt;irq);</div><div class='del'>-		ml403_ac97cr-&gt;enable_irq = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(WORK_INFO, "trigger(playback): (done)\n");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ml403_ac97cr_pcm_capture_trigger(struct snd_pcm_substream *substream,</div><div class='del'>-				      int cmd)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		PDEBUG(WORK_INFO, "trigger(capture): START\n");</div><div class='del'>-		ml403_ac97cr-&gt;capture_ind2_rec.hw_ready = 0;</div><div class='del'>-</div><div class='del'>-		/* clear record FIFO */</div><div class='del'>-		out_be32(CR_REG(ml403_ac97cr, RESETFIFO), CR_RECRESET);</div><div class='del'>-</div><div class='del'>-		/* enable record irq */</div><div class='del'>-		ml403_ac97cr-&gt;enable_capture_irq = 1;</div><div class='del'>-		enable_irq(ml403_ac97cr-&gt;capture_irq);</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		PDEBUG(WORK_INFO, "trigger(capture): STOP\n");</div><div class='del'>-		ml403_ac97cr-&gt;capture_ind2_rec.hw_ready = 0;</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		snd_pcm_indirect2_stat(substream,</div><div class='del'>-				       &amp;ml403_ac97cr-&gt;capture_ind2_rec);</div><div class='del'>-#endif</div><div class='del'>-		/* disable capture irq */</div><div class='del'>-		disable_irq_nosync(ml403_ac97cr-&gt;capture_irq);</div><div class='del'>-		ml403_ac97cr-&gt;enable_capture_irq = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(WORK_INFO, "trigger(capture): (done)\n");</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ml403_ac97cr_pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO,</div><div class='del'>-	       "prepare(): period_bytes=%d, minperiod_bytes=%d\n",</div><div class='del'>-	       snd_pcm_lib_period_bytes(substream), CR_FIFO_SIZE / 2);</div><div class='del'>-</div><div class='del'>-	/* set sampling rate */</div><div class='del'>-	snd_ac97_set_rate(ml403_ac97cr-&gt;ac97, AC97_PCM_FRONT_DAC_RATE,</div><div class='del'>-			  runtime-&gt;rate);</div><div class='del'>-	PDEBUG(WORK_INFO, "prepare(): rate=%d\n", runtime-&gt;rate);</div><div class='del'>-</div><div class='del'>-	/* init struct for intermediate buffer */</div><div class='del'>-	memset(&amp;ml403_ac97cr-&gt;ind_rec, 0,</div><div class='del'>-	       sizeof(struct snd_pcm_indirect2));</div><div class='del'>-	ml403_ac97cr-&gt;ind_rec.hw_buffer_size = CR_FIFO_SIZE;</div><div class='del'>-	ml403_ac97cr-&gt;ind_rec.sw_buffer_size =</div><div class='del'>-		snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	ml403_ac97cr-&gt;ind_rec.min_periods = -1;</div><div class='del'>-	ml403_ac97cr-&gt;ind_rec.min_multiple =</div><div class='del'>-		snd_pcm_lib_period_bytes(substream) / (CR_FIFO_SIZE / 2);</div><div class='del'>-	PDEBUG(WORK_INFO, "prepare(): hw_buffer_size=%d, "</div><div class='del'>-	       "sw_buffer_size=%d, min_multiple=%d\n",</div><div class='del'>-	       CR_FIFO_SIZE, ml403_ac97cr-&gt;ind_rec.sw_buffer_size,</div><div class='del'>-	       ml403_ac97cr-&gt;ind_rec.min_multiple);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ml403_ac97cr_pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO,</div><div class='del'>-	       "prepare(capture): period_bytes=%d, minperiod_bytes=%d\n",</div><div class='del'>-	       snd_pcm_lib_period_bytes(substream), CR_FIFO_SIZE / 2);</div><div class='del'>-</div><div class='del'>-	/* set sampling rate */</div><div class='del'>-	snd_ac97_set_rate(ml403_ac97cr-&gt;ac97, AC97_PCM_LR_ADC_RATE,</div><div class='del'>-			  runtime-&gt;rate);</div><div class='del'>-	PDEBUG(WORK_INFO, "prepare(capture): rate=%d\n", runtime-&gt;rate);</div><div class='del'>-</div><div class='del'>-	/* init struct for intermediate buffer */</div><div class='del'>-	memset(&amp;ml403_ac97cr-&gt;capture_ind2_rec, 0,</div><div class='del'>-	       sizeof(struct snd_pcm_indirect2));</div><div class='del'>-	ml403_ac97cr-&gt;capture_ind2_rec.hw_buffer_size = CR_FIFO_SIZE;</div><div class='del'>-	ml403_ac97cr-&gt;capture_ind2_rec.sw_buffer_size =</div><div class='del'>-		snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	ml403_ac97cr-&gt;capture_ind2_rec.min_multiple =</div><div class='del'>-		snd_pcm_lib_period_bytes(substream) / (CR_FIFO_SIZE / 2);</div><div class='del'>-	PDEBUG(WORK_INFO, "prepare(capture): hw_buffer_size=%d, "</div><div class='del'>-	       "sw_buffer_size=%d, min_multiple=%d\n", CR_FIFO_SIZE,</div><div class='del'>-	       ml403_ac97cr-&gt;capture_ind2_rec.sw_buffer_size,</div><div class='del'>-	       ml403_ac97cr-&gt;capture_ind2_rec.min_multiple);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	PDEBUG(WORK_INFO, "hw_free()\n");</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ml403_ac97cr_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			   struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	PDEBUG(WORK_INFO, "hw_params(): desired buffer bytes=%d, desired "</div><div class='del'>-	       "period bytes=%d\n",</div><div class='del'>-	       params_buffer_bytes(hw_params), params_period_bytes(hw_params));</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_playback_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO, "open(playback)\n");</div><div class='del'>-	ml403_ac97cr-&gt;playback_substream = substream;</div><div class='del'>-	runtime-&gt;hw = snd_ml403_ac97cr_playback;</div><div class='del'>-</div><div class='del'>-	snd_pcm_hw_constraint_step(runtime, 0,</div><div class='del'>-				   SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='del'>-				   CR_FIFO_SIZE / 2);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_capture_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO, "open(capture)\n");</div><div class='del'>-	ml403_ac97cr-&gt;capture_substream = substream;</div><div class='del'>-	runtime-&gt;hw = snd_ml403_ac97cr_capture;</div><div class='del'>-</div><div class='del'>-	snd_pcm_hw_constraint_step(runtime, 0,</div><div class='del'>-				   SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='del'>-				   CR_FIFO_SIZE / 2);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_playback_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO, "close(playback)\n");</div><div class='del'>-	ml403_ac97cr-&gt;playback_substream = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_capture_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	PDEBUG(WORK_INFO, "close(capture)\n");</div><div class='del'>-	ml403_ac97cr-&gt;capture_substream = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_ml403_ac97cr_playback_ops = {</div><div class='del'>-	.open = snd_ml403_ac97cr_playback_open,</div><div class='del'>-	.close = snd_ml403_ac97cr_playback_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_ml403_ac97cr_hw_params,</div><div class='del'>-	.hw_free = snd_ml403_ac97cr_hw_free,</div><div class='del'>-	.prepare = snd_ml403_ac97cr_pcm_playback_prepare,</div><div class='del'>-	.trigger = snd_ml403_ac97cr_pcm_playback_trigger,</div><div class='del'>-	.pointer = snd_ml403_ac97cr_pcm_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_ml403_ac97cr_capture_ops = {</div><div class='del'>-	.open = snd_ml403_ac97cr_capture_open,</div><div class='del'>-	.close = snd_ml403_ac97cr_capture_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_ml403_ac97cr_hw_params,</div><div class='del'>-	.hw_free = snd_ml403_ac97cr_hw_free,</div><div class='del'>-	.prepare = snd_ml403_ac97cr_pcm_capture_prepare,</div><div class='del'>-	.trigger = snd_ml403_ac97cr_pcm_capture_trigger,</div><div class='del'>-	.pointer = snd_ml403_ac97cr_pcm_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static irqreturn_t snd_ml403_ac97cr_irq(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	struct platform_device *pfdev;</div><div class='del'>-	int cmp_irq;</div><div class='del'>-</div><div class='del'>-	ml403_ac97cr = (struct snd_ml403_ac97cr *)dev_id;</div><div class='del'>-	if (ml403_ac97cr == NULL)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	pfdev = ml403_ac97cr-&gt;pfdev;</div><div class='del'>-</div><div class='del'>-	/* playback interrupt */</div><div class='del'>-	cmp_irq = platform_get_irq(pfdev, 0);</div><div class='del'>-	if (irq == cmp_irq) {</div><div class='del'>-		if (ml403_ac97cr-&gt;enable_irq)</div><div class='del'>-			snd_pcm_indirect2_playback_interrupt(</div><div class='del'>-				ml403_ac97cr-&gt;playback_substream,</div><div class='del'>-				&amp;ml403_ac97cr-&gt;ind_rec,</div><div class='del'>-				snd_ml403_ac97cr_playback_ind2_copy,</div><div class='del'>-				snd_ml403_ac97cr_playback_ind2_zero);</div><div class='del'>-		else</div><div class='del'>-			goto __disable_irq;</div><div class='del'>-	} else {</div><div class='del'>-		/* record interrupt */</div><div class='del'>-		cmp_irq = platform_get_irq(pfdev, 1);</div><div class='del'>-		if (irq == cmp_irq) {</div><div class='del'>-			if (ml403_ac97cr-&gt;enable_capture_irq)</div><div class='del'>-				snd_pcm_indirect2_capture_interrupt(</div><div class='del'>-					ml403_ac97cr-&gt;capture_substream,</div><div class='del'>-					&amp;ml403_ac97cr-&gt;capture_ind2_rec,</div><div class='del'>-					snd_ml403_ac97cr_capture_ind2_copy,</div><div class='del'>-					snd_ml403_ac97cr_capture_ind2_null);</div><div class='del'>-			else</div><div class='del'>-				goto __disable_irq;</div><div class='del'>-		} else</div><div class='del'>-			return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-</div><div class='del'>-__disable_irq:</div><div class='del'>-	PDEBUG(INIT_INFO, "irq(): irq %d is meant to be disabled! So, now try "</div><div class='del'>-	       "to disable it _really_!\n", irq);</div><div class='del'>-	disable_irq_nosync(irq);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned short</div><div class='del'>-snd_ml403_ac97cr_codec_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr = ac97-&gt;private_data;</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	u32 stat;</div><div class='del'>-	u32 rafaccess = 0;</div><div class='del'>-#endif</div><div class='del'>-	unsigned long end_time;</div><div class='del'>-	u16 value = 0;</div><div class='del'>-</div><div class='del'>-	if (!LM4550_RF_OK(reg)) {</div><div class='del'>-		snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "access to unknown/unused codec register 0x%x "</div><div class='del'>-			   "ignored!\n", reg);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* check if we can fake/answer this access from our shadow register */</div><div class='del'>-	if ((lm4550_regfile[reg / 2].flag &amp;</div><div class='del'>-	     (LM4550_REG_DONEREAD | LM4550_REG_ALLFAKE)) &amp;&amp;</div><div class='del'>-	    !(lm4550_regfile[reg / 2].flag &amp; LM4550_REG_NOSHADOW)) {</div><div class='del'>-		if (lm4550_regfile[reg / 2].flag &amp; LM4550_REG_FAKEREAD) {</div><div class='del'>-			PDEBUG(CODEC_FAKE, "codec_read(): faking read from "</div><div class='del'>-			       "reg=0x%x, val=0x%x / %d\n",</div><div class='del'>-			       reg, lm4550_regfile[reg / 2].def,</div><div class='del'>-			       lm4550_regfile[reg / 2].def);</div><div class='del'>-			return lm4550_regfile[reg / 2].def;</div><div class='del'>-		} else if ((lm4550_regfile[reg / 2].flag &amp;</div><div class='del'>-			    LM4550_REG_FAKEPROBE) &amp;&amp;</div><div class='del'>-			   ml403_ac97cr-&gt;ac97_fake) {</div><div class='del'>-			PDEBUG(CODEC_FAKE, "codec_read(): faking read from "</div><div class='del'>-			       "reg=0x%x, val=0x%x / %d (probe)\n",</div><div class='del'>-			       reg, lm4550_regfile[reg / 2].value,</div><div class='del'>-			       lm4550_regfile[reg / 2].value);</div><div class='del'>-			return lm4550_regfile[reg / 2].value;</div><div class='del'>-		} else {</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-			PDEBUG(CODEC_FAKE, "codec_read(): read access "</div><div class='del'>-			       "answered by shadow register 0x%x (value=0x%x "</div><div class='del'>-			       "/ %d) (cw=%d cr=%d)\n",</div><div class='del'>-			       reg, lm4550_regfile[reg / 2].value,</div><div class='del'>-			       lm4550_regfile[reg / 2].value,</div><div class='del'>-			       ml403_ac97cr-&gt;ac97_write,</div><div class='del'>-			       ml403_ac97cr-&gt;ac97_read);</div><div class='del'>-#else</div><div class='del'>-			PDEBUG(CODEC_FAKE, "codec_read(): read access "</div><div class='del'>-			       "answered by shadow register 0x%x (value=0x%x "</div><div class='del'>-			       "/ %d)\n",</div><div class='del'>-			       reg, lm4550_regfile[reg / 2].value,</div><div class='del'>-			       lm4550_regfile[reg / 2].value);</div><div class='del'>-#endif</div><div class='del'>-			return lm4550_regfile[reg / 2].value;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* if we are here, we _have_ to access the codec really, no faking */</div><div class='del'>-	if (mutex_lock_interruptible(&amp;ml403_ac97cr-&gt;cdc_mutex) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	ml403_ac97cr-&gt;ac97_read++;</div><div class='del'>-#endif</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	out_be32(CR_REG(ml403_ac97cr, CODEC_ADDR),</div><div class='del'>-		 CR_CODEC_ADDR(reg) | CR_CODEC_READ);</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	end_time = jiffies + (HZ / CODEC_TIMEOUT_AFTER_READ);</div><div class='del'>-	do {</div><div class='del'>-		spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-		rafaccess++;</div><div class='del'>-		stat = in_be32(CR_REG(ml403_ac97cr, STATUS));</div><div class='del'>-		if ((stat &amp; CR_RAF) == CR_RAF) {</div><div class='del'>-			value = CR_CODEC_DATAREAD(</div><div class='del'>-				in_be32(CR_REG(ml403_ac97cr, CODEC_DATAREAD)));</div><div class='del'>-			PDEBUG(CODEC_SUCCESS, "codec_read(): (done) reg=0x%x, "</div><div class='del'>-			       "value=0x%x / %d (STATUS=0x%x)\n",</div><div class='del'>-			       reg, value, value, stat);</div><div class='del'>-#else</div><div class='del'>-		if ((in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-		     CR_RAF) == CR_RAF) {</div><div class='del'>-			value = CR_CODEC_DATAREAD(</div><div class='del'>-				in_be32(CR_REG(ml403_ac97cr, CODEC_DATAREAD)));</div><div class='del'>-			PDEBUG(CODEC_SUCCESS, "codec_read(): (done) "</div><div class='del'>-			       "reg=0x%x, value=0x%x / %d\n",</div><div class='del'>-			       reg, value, value);</div><div class='del'>-#endif</div><div class='del'>-			lm4550_regfile[reg / 2].value = value;</div><div class='del'>-			lm4550_regfile[reg / 2].flag |= LM4550_REG_DONEREAD;</div><div class='del'>-			spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-			mutex_unlock(&amp;ml403_ac97cr-&gt;cdc_mutex);</div><div class='del'>-			return value;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-	} while (time_after(end_time, jiffies));</div><div class='del'>-	/* read the DATAREAD register anyway, see comment below */</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	value =</div><div class='del'>-	    CR_CODEC_DATAREAD(in_be32(CR_REG(ml403_ac97cr, CODEC_DATAREAD)));</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "timeout while codec read! "</div><div class='del'>-		   "(reg=0x%x, last STATUS=0x%x, DATAREAD=0x%x / %d, %d) "</div><div class='del'>-		   "(cw=%d, cr=%d)\n",</div><div class='del'>-		   reg, stat, value, value, rafaccess,</div><div class='del'>-		   ml403_ac97cr-&gt;ac97_write, ml403_ac97cr-&gt;ac97_read);</div><div class='del'>-#else</div><div class='del'>-	snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "timeout while codec read! "</div><div class='del'>-		   "(reg=0x%x, DATAREAD=0x%x / %d)\n",</div><div class='del'>-		   reg, value, value);</div><div class='del'>-#endif</div><div class='del'>-	/* BUG: This is PURE speculation! But after _most_ read timeouts the</div><div class='del'>-	 * value in the register is ok!</div><div class='del'>-	 */</div><div class='del'>-	lm4550_regfile[reg / 2].value = value;</div><div class='del'>-	lm4550_regfile[reg / 2].flag |= LM4550_REG_DONEREAD;</div><div class='del'>-	mutex_unlock(&amp;ml403_ac97cr-&gt;cdc_mutex);</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-snd_ml403_ac97cr_codec_write(struct snd_ac97 *ac97, unsigned short reg,</div><div class='del'>-			     unsigned short val)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr = ac97-&gt;private_data;</div><div class='del'>-</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	u32 stat;</div><div class='del'>-	u32 rafaccess = 0;</div><div class='del'>-#endif</div><div class='del'>-#ifdef CODEC_WRITE_CHECK_RAF</div><div class='del'>-	unsigned long end_time;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!LM4550_RF_OK(reg)) {</div><div class='del'>-		snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "access to unknown/unused codec register 0x%x "</div><div class='del'>-			   "ignored!\n", reg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (lm4550_regfile[reg / 2].flag &amp; LM4550_REG_READONLY) {</div><div class='del'>-		snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "write access to read only codec register 0x%x "</div><div class='del'>-			   "ignored!\n", reg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if ((val &amp; lm4550_regfile[reg / 2].wmask) != val) {</div><div class='del'>-		snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "write access to codec register 0x%x "</div><div class='del'>-			   "with bad value 0x%x / %d!\n",</div><div class='del'>-			   reg, val, val);</div><div class='del'>-		val = val &amp; lm4550_regfile[reg / 2].wmask;</div><div class='del'>-	}</div><div class='del'>-	if (((lm4550_regfile[reg / 2].flag &amp; LM4550_REG_FAKEPROBE) &amp;&amp;</div><div class='del'>-	     ml403_ac97cr-&gt;ac97_fake) &amp;&amp;</div><div class='del'>-	    !(lm4550_regfile[reg / 2].flag &amp; LM4550_REG_NOSHADOW)) {</div><div class='del'>-		PDEBUG(CODEC_FAKE, "codec_write(): faking write to reg=0x%x, "</div><div class='del'>-		       "val=0x%x / %d\n", reg, val, val);</div><div class='del'>-		lm4550_regfile[reg / 2].value = (val &amp;</div><div class='del'>-						lm4550_regfile[reg / 2].wmask);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (mutex_lock_interruptible(&amp;ml403_ac97cr-&gt;cdc_mutex) != 0)</div><div class='del'>-		return;</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	ml403_ac97cr-&gt;ac97_write++;</div><div class='del'>-#endif</div><div class='del'>-	spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	out_be32(CR_REG(ml403_ac97cr, CODEC_DATAWRITE),</div><div class='del'>-		 CR_CODEC_DATAWRITE(val));</div><div class='del'>-	out_be32(CR_REG(ml403_ac97cr, CODEC_ADDR),</div><div class='del'>-		 CR_CODEC_ADDR(reg) | CR_CODEC_WRITE);</div><div class='del'>-	spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-#ifdef CODEC_WRITE_CHECK_RAF</div><div class='del'>-	/* check CR_CODEC_RAF bit to see if write access to register is done;</div><div class='del'>-	 * loop until bit is set or timeout happens</div><div class='del'>-	 */</div><div class='del'>-	end_time = jiffies + HZ / CODEC_TIMEOUT_AFTER_WRITE;</div><div class='del'>-	do {</div><div class='del'>-		spin_lock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-		rafaccess++;</div><div class='del'>-		stat = in_be32(CR_REG(ml403_ac97cr, STATUS))</div><div class='del'>-		if ((stat &amp; CR_RAF) == CR_RAF) {</div><div class='del'>-#else</div><div class='del'>-		if ((in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp;</div><div class='del'>-		     CR_RAF) == CR_RAF) {</div><div class='del'>-#endif</div><div class='del'>-			PDEBUG(CODEC_SUCCESS, "codec_write(): (done) "</div><div class='del'>-			       "reg=0x%x, value=%d / 0x%x\n",</div><div class='del'>-			       reg, val, val);</div><div class='del'>-			if (!(lm4550_regfile[reg / 2].flag &amp;</div><div class='del'>-			      LM4550_REG_NOSHADOW) &amp;&amp;</div><div class='del'>-			    !(lm4550_regfile[reg / 2].flag &amp;</div><div class='del'>-			      LM4550_REG_NOSAVE))</div><div class='del'>-				lm4550_regfile[reg / 2].value = val;</div><div class='del'>-			lm4550_regfile[reg / 2].flag |= LM4550_REG_DONEREAD;</div><div class='del'>-			spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-			mutex_unlock(&amp;ml403_ac97cr-&gt;cdc_mutex);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-	} while (time_after(end_time, jiffies));</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "timeout while codec write "</div><div class='del'>-		   "(reg=0x%x, val=0x%x / %d, last STATUS=0x%x, %d) "</div><div class='del'>-		   "(cw=%d, cr=%d)\n",</div><div class='del'>-		   reg, val, val, stat, rafaccess, ml403_ac97cr-&gt;ac97_write,</div><div class='del'>-		   ml403_ac97cr-&gt;ac97_read);</div><div class='del'>-#else</div><div class='del'>-	snd_printk(KERN_WARNING SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "timeout while codec write (reg=0x%x, val=0x%x / %d)\n",</div><div class='del'>-		   reg, val, val);</div><div class='del'>-#endif</div><div class='del'>-#else /* CODEC_WRITE_CHECK_RAF */</div><div class='del'>-#if CODEC_WAIT_AFTER_WRITE &gt; 0</div><div class='del'>-	/* officially, in AC97 spec there is no possibility for a AC97</div><div class='del'>-	 * controller to determine, if write access is done or not - so: How</div><div class='del'>-	 * is Xilinx able to provide a RAF bit for write access?</div><div class='del'>-	 * =&gt; very strange, thus just don't check RAF bit (compare with</div><div class='del'>-	 * Xilinx's example app in EDK 8.1i) and wait</div><div class='del'>-	 */</div><div class='del'>-	schedule_timeout_uninterruptible(HZ / CODEC_WAIT_AFTER_WRITE);</div><div class='del'>-#endif</div><div class='del'>-	PDEBUG(CODEC_SUCCESS, "codec_write(): (done) "</div><div class='del'>-	       "reg=0x%x, value=%d / 0x%x (no RAF check)\n",</div><div class='del'>-	       reg, val, val);</div><div class='del'>-#endif</div><div class='del'>-	mutex_unlock(&amp;ml403_ac97cr-&gt;cdc_mutex);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ml403_ac97cr_chip_init(struct snd_ml403_ac97cr *ml403_ac97cr)</div><div class='del'>-{</div><div class='del'>-	unsigned long end_time;</div><div class='del'>-	PDEBUG(INIT_INFO, "chip_init():\n");</div><div class='del'>-	end_time = jiffies + HZ / CODEC_TIMEOUT_ON_INIT;</div><div class='del'>-	do {</div><div class='del'>-		if (in_be32(CR_REG(ml403_ac97cr, STATUS)) &amp; CR_CODECREADY) {</div><div class='del'>-			/* clear both hardware FIFOs */</div><div class='del'>-			out_be32(CR_REG(ml403_ac97cr, RESETFIFO),</div><div class='del'>-				 CR_RECRESET | CR_PLAYRESET);</div><div class='del'>-			PDEBUG(INIT_INFO, "chip_init(): (done)\n");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		schedule_timeout_uninterruptible(1);</div><div class='del'>-	} while (time_after(end_time, jiffies));</div><div class='del'>-	snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "timeout while waiting for codec, "</div><div class='del'>-		   "not ready!\n");</div><div class='del'>-	return -EBUSY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_free(struct snd_ml403_ac97cr *ml403_ac97cr)</div><div class='del'>-{</div><div class='del'>-	PDEBUG(INIT_INFO, "free():\n");</div><div class='del'>-	/* irq release */</div><div class='del'>-	if (ml403_ac97cr-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(ml403_ac97cr-&gt;irq, ml403_ac97cr);</div><div class='del'>-	if (ml403_ac97cr-&gt;capture_irq &gt;= 0)</div><div class='del'>-		free_irq(ml403_ac97cr-&gt;capture_irq, ml403_ac97cr);</div><div class='del'>-	/* give back "port" */</div><div class='del'>-	if (ml403_ac97cr-&gt;port != NULL)</div><div class='del'>-		iounmap(ml403_ac97cr-&gt;port);</div><div class='del'>-	kfree(ml403_ac97cr);</div><div class='del'>-	PDEBUG(INIT_INFO, "free(): (done)\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_dev_free(struct snd_device *snddev)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr = snddev-&gt;device_data;</div><div class='del'>-	PDEBUG(INIT_INFO, "dev_free():\n");</div><div class='del'>-	return snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,</div><div class='del'>-			struct snd_ml403_ac97cr **rml403_ac97cr)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr;</div><div class='del'>-	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_ml403_ac97cr_dev_free,</div><div class='del'>-	};</div><div class='del'>-	struct resource *resource;</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	*rml403_ac97cr = NULL;</div><div class='del'>-	ml403_ac97cr = kzalloc(sizeof(*ml403_ac97cr), GFP_KERNEL);</div><div class='del'>-	if (ml403_ac97cr == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	spin_lock_init(&amp;ml403_ac97cr-&gt;reg_lock);</div><div class='del'>-	mutex_init(&amp;ml403_ac97cr-&gt;cdc_mutex);</div><div class='del'>-	ml403_ac97cr-&gt;card = card;</div><div class='del'>-	ml403_ac97cr-&gt;pfdev = pfdev;</div><div class='del'>-	ml403_ac97cr-&gt;irq = -1;</div><div class='del'>-	ml403_ac97cr-&gt;enable_irq = 0;</div><div class='del'>-	ml403_ac97cr-&gt;capture_irq = -1;</div><div class='del'>-	ml403_ac97cr-&gt;enable_capture_irq = 0;</div><div class='del'>-	ml403_ac97cr-&gt;port = NULL;</div><div class='del'>-	ml403_ac97cr-&gt;res_port = NULL;</div><div class='del'>-</div><div class='del'>-	PDEBUG(INIT_INFO, "Trying to reserve resources now ...\n");</div><div class='del'>-	resource = platform_get_resource(pfdev, IORESOURCE_MEM, 0);</div><div class='del'>-	/* get "port" */</div><div class='del'>-	ml403_ac97cr-&gt;port = ioremap_nocache(resource-&gt;start,</div><div class='del'>-					     (resource-&gt;end) -</div><div class='del'>-					     (resource-&gt;start) + 1);</div><div class='del'>-	if (ml403_ac97cr-&gt;port == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "unable to remap memory region (%x to %x)\n",</div><div class='del'>-			   resource-&gt;start, resource-&gt;end);</div><div class='del'>-		snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_INFO SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "remap controller memory region to "</div><div class='del'>-		   "0x%x done\n", (unsigned int)ml403_ac97cr-&gt;port);</div><div class='del'>-	/* get irq */</div><div class='del'>-	irq = platform_get_irq(pfdev, 0);</div><div class='del'>-	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,</div><div class='del'>-			dev_name(&amp;pfdev-&gt;dev), (void *)ml403_ac97cr)) {</div><div class='del'>-		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "unable to grab IRQ %d\n",</div><div class='del'>-			   irq);</div><div class='del'>-		snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	ml403_ac97cr-&gt;irq = irq;</div><div class='del'>-	snd_printk(KERN_INFO SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "request (playback) irq %d done\n",</div><div class='del'>-		   ml403_ac97cr-&gt;irq);</div><div class='del'>-	irq = platform_get_irq(pfdev, 1);</div><div class='del'>-	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,</div><div class='del'>-			dev_name(&amp;pfdev-&gt;dev), (void *)ml403_ac97cr)) {</div><div class='del'>-		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-			   "unable to grab IRQ %d\n",</div><div class='del'>-			   irq);</div><div class='del'>-		snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	ml403_ac97cr-&gt;capture_irq = irq;</div><div class='del'>-	snd_printk(KERN_INFO SND_ML403_AC97CR_DRIVER ": "</div><div class='del'>-		   "request (capture) irq %d done\n",</div><div class='del'>-		   ml403_ac97cr-&gt;capture_irq);</div><div class='del'>-</div><div class='del'>-	err = snd_ml403_ac97cr_chip_init(ml403_ac97cr);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ml403_ac97cr, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		PDEBUG(INIT_FAILURE, "probe(): snd_device_new() failed!\n");</div><div class='del'>-		snd_ml403_ac97cr_free(ml403_ac97cr);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*rml403_ac97cr = ml403_ac97cr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_ml403_ac97cr_mixer_free(struct snd_ac97 *ac97)</div><div class='del'>-{</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr = ac97-&gt;private_data;</div><div class='del'>-	PDEBUG(INIT_INFO, "mixer_free():\n");</div><div class='del'>-	ml403_ac97cr-&gt;ac97 = NULL;</div><div class='del'>-	PDEBUG(INIT_INFO, "mixer_free(): (done)\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ml403_ac97cr_mixer(struct snd_ml403_ac97cr *ml403_ac97cr)</div><div class='del'>-{</div><div class='del'>-	struct snd_ac97_bus *bus;</div><div class='del'>-	struct snd_ac97_template ac97;</div><div class='del'>-	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='del'>-		.write = snd_ml403_ac97cr_codec_write,</div><div class='del'>-		.read = snd_ml403_ac97cr_codec_read,</div><div class='del'>-	};</div><div class='del'>-	PDEBUG(INIT_INFO, "mixer():\n");</div><div class='del'>-	err = snd_ac97_bus(ml403_ac97cr-&gt;card, 0, &amp;ops, NULL, &amp;bus);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='del'>-	ml403_ac97cr-&gt;ac97_fake = 1;</div><div class='del'>-	lm4550_regfile_init();</div><div class='del'>-#ifdef CODEC_STAT</div><div class='del'>-	ml403_ac97cr-&gt;ac97_read = 0;</div><div class='del'>-	ml403_ac97cr-&gt;ac97_write = 0;</div><div class='del'>-#endif</div><div class='del'>-	ac97.private_data = ml403_ac97cr;</div><div class='del'>-	ac97.private_free = snd_ml403_ac97cr_mixer_free;</div><div class='del'>-	ac97.scaps = AC97_SCAP_AUDIO | AC97_SCAP_SKIP_MODEM |</div><div class='del'>-	    AC97_SCAP_NO_SPDIF;</div><div class='del'>-	err = snd_ac97_mixer(bus, &amp;ac97, &amp;ml403_ac97cr-&gt;ac97);</div><div class='del'>-	ml403_ac97cr-&gt;ac97_fake = 0;</div><div class='del'>-	lm4550_regfile_write_values_after_init(ml403_ac97cr-&gt;ac97);</div><div class='del'>-	PDEBUG(INIT_INFO, "mixer(): (done) snd_ac97_mixer()=%d\n", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ml403_ac97cr_pcm(struct snd_ml403_ac97cr *ml403_ac97cr, int device,</div><div class='del'>-		     struct snd_pcm **rpcm)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-	err = snd_pcm_new(ml403_ac97cr-&gt;card, "ML403AC97CR/1", device, 1, 1,</div><div class='del'>-			  &amp;pcm);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-			&amp;snd_ml403_ac97cr_playback_ops);</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-			&amp;snd_ml403_ac97cr_capture_ops);</div><div class='del'>-	pcm-&gt;private_data = ml403_ac97cr;</div><div class='del'>-	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ML403AC97CR DAC/ADC");</div><div class='del'>-	ml403_ac97cr-&gt;pcm = pcm;</div><div class='del'>-</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-					  snd_dma_continuous_data(GFP_KERNEL),</div><div class='del'>-					  64 * 1024,</div><div class='del'>-					  128 * 1024);</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_ml403_ac97cr_probe(struct platform_device *pfdev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct snd_ml403_ac97cr *ml403_ac97cr = NULL;</div><div class='del'>-	int err;</div><div class='del'>-	int dev = pfdev-&gt;id;</div><div class='del'>-</div><div class='del'>-	if (dev &gt;= SNDRV_CARDS)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!enable[dev])</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = snd_ml403_ac97cr_create(card, pfdev, &amp;ml403_ac97cr);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		PDEBUG(INIT_FAILURE, "probe(): create failed!\n");</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(INIT_INFO, "probe(): create done\n");</div><div class='del'>-	card-&gt;private_data = ml403_ac97cr;</div><div class='del'>-	err = snd_ml403_ac97cr_mixer(ml403_ac97cr);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(INIT_INFO, "probe(): mixer done\n");</div><div class='del'>-	err = snd_ml403_ac97cr_pcm(ml403_ac97cr, 0, NULL);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	PDEBUG(INIT_INFO, "probe(): PCM done\n");</div><div class='del'>-	strcpy(card-&gt;driver, SND_ML403_AC97CR_DRIVER);</div><div class='del'>-	strcpy(card-&gt;shortname, "ML403 AC97 Controller Reference");</div><div class='del'>-	sprintf(card-&gt;longname, "%s %s at 0x%lx, irq %i &amp; %i, device %i",</div><div class='del'>-		card-&gt;shortname, card-&gt;driver,</div><div class='del'>-		(unsigned long)ml403_ac97cr-&gt;port, ml403_ac97cr-&gt;irq,</div><div class='del'>-		ml403_ac97cr-&gt;capture_irq, dev + 1);</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pfdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	platform_set_drvdata(pfdev, card);</div><div class='del'>-	PDEBUG(INIT_INFO, "probe(): (done)\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ml403_ac97cr_remove(struct platform_device *pfdev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(pfdev));</div><div class='del'>-	platform_set_drvdata(pfdev, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* work with hotplug and coldplug */</div><div class='del'>-MODULE_ALIAS("platform:" SND_ML403_AC97CR_DRIVER);</div><div class='del'>-</div><div class='del'>-static struct platform_driver snd_ml403_ac97cr_driver = {</div><div class='del'>-	.probe = snd_ml403_ac97cr_probe,</div><div class='del'>-	.remove = snd_ml403_ac97cr_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = SND_ML403_AC97CR_DRIVER,</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init alsa_card_ml403_ac97cr_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;snd_ml403_ac97cr_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_ml403_ac97cr_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;snd_ml403_ac97cr_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ml403_ac97cr_init)</div><div class='del'>-module_exit(alsa_card_ml403_ac97cr_exit)</div><div class='head'>diff --git a/sound/drivers/mpu401/Makefile b/sound/drivers/mpu401/Makefile<br/>index 918f83f34c11..0a96e238ee92 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/mpu401/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-mpu401-objs := mpu401.o</div><div class='del'>-snd-mpu401-uart-objs := mpu401_uart.o</div><div class='add'>+snd-mpu401-y := mpu401.o</div><div class='add'>+snd-mpu401-uart-y := mpu401_uart.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_MPU401_UART) += snd-mpu401-uart.o</div><div class='ctx'> </div><div class='head'>diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c<br/>index 149d05a8202d..d3f9424088d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/mpu401.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/mpu401.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/mpu401.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/mpu401/mpu401.c</a></div><div class='hunk'>@@ -1,30 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for generic MPU-401 boards (UART mode only)</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Copyright (c) 2004 by Castet Matthieu &lt;castet.matthieu@free.fr&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -35,13 +20,13 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* exclude the first card */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int pnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool pnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* MPU-401 port number */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* MPU-401 IRQ */</div><div class='del'>-static int uart_enter[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool uart_enter[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for MPU-401 device.");</div><div class='hunk'>@@ -53,9 +38,9 @@ MODULE_PARM_DESC(enable, "Enable MPU-401 device.");</div><div class='ctx'> module_param_array(pnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pnp, "PnP detection for MPU-401 device.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for MPU-401 device.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");</div><div class='ctx'> module_param_array(uart_enter, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(uart_enter, "Issue UART_ENTER command at open.");</div><div class='hunk'>@@ -64,20 +49,22 @@ static struct platform_device *platform_devices[SNDRV_CARDS];</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> static unsigned int snd_mpu401_devices;</div><div class='ctx'> </div><div class='del'>-static int snd_mpu401_create(int dev, struct snd_card **rcard)</div><div class='add'>+static int snd_mpu401_create(struct device *devptr, int dev,</div><div class='add'>+			     struct snd_card **rcard)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!uart_enter[dev])</div><div class='del'>-		snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");</div><div class='add'>+		dev_err(devptr, "the uart_enter option is obsolete; remove it\n");</div><div class='ctx'> </div><div class='ctx'> 	*rcard = NULL;</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(card-&gt;driver, "MPU-401 UART");</div><div class='del'>-	strcpy(card-&gt;shortname, card-&gt;driver);</div><div class='add'>+	strscpy(card-&gt;driver, "MPU-401 UART");</div><div class='add'>+	strscpy(card-&gt;shortname, card-&gt;driver);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at %#lx, ", card-&gt;shortname, port[dev]);</div><div class='ctx'> 	if (irq[dev] &gt;= 0) {</div><div class='ctx'> 		sprintf(card-&gt;longname + strlen(card-&gt;longname), "irq %d", irq[dev]);</div><div class='hunk'>@@ -86,61 +73,46 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,</div><div class='del'>-				  irq[dev], irq[dev] &gt;= 0 ? IRQF_DISABLED : 0,</div><div class='del'>-				  NULL);</div><div class='add'>+				  irq[dev], NULL);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);</div><div class='del'>-		goto _err;</div><div class='add'>+		dev_err(devptr, "MPU401 not detected at 0x%lx\n", port[dev]);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*rcard = card;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- _err:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mpu401_probe(struct platform_device *devptr)</div><div class='add'>+static int snd_mpu401_probe(struct platform_device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	int dev = devptr-&gt;id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='ctx'> 	if (port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR "specify port\n");</div><div class='add'>+		dev_err(&amp;devptr-&gt;dev, "specify port\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (irq[dev] == SNDRV_AUTO_IRQ) {</div><div class='del'>-		snd_printk(KERN_ERR "specify or disable IRQ\n");</div><div class='add'>+		dev_err(&amp;devptr-&gt;dev, "specify or disable IRQ\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_mpu401_create(dev, &amp;card);</div><div class='add'>+	err = snd_mpu401_create(&amp;devptr-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, &amp;devptr-&gt;dev);</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	platform_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_mpu401_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define SND_MPU401_DRIVER	"snd_mpu401"</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_mpu401_driver = {</div><div class='ctx'> 	.probe		= snd_mpu401_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_mpu401_remove),</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_MPU401_DRIVER</div><div class='add'>+		.name	= SND_MPU401_DRIVER,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -149,23 +121,23 @@ static struct platform_driver snd_mpu401_driver = {</div><div class='ctx'> </div><div class='ctx'> #define IO_EXTENT 2</div><div class='ctx'> </div><div class='del'>-static struct pnp_device_id snd_mpu401_pnpids[] = {</div><div class='add'>+static const struct pnp_device_id snd_mpu401_pnpids[] = {</div><div class='ctx'> 	{ .id = "PNPb006" },</div><div class='ctx'> 	{ .id = "" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,</div><div class='del'>-				 const struct pnp_device_id *id)</div><div class='add'>+static int snd_mpu401_pnp(int dev, struct pnp_dev *device,</div><div class='add'>+			  const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	if (!pnp_port_valid(device, 0) ||</div><div class='ctx'> 	    pnp_port_flags(device, 0) &amp; IORESOURCE_DISABLED) {</div><div class='del'>-		snd_printk(KERN_ERR "no PnP port\n");</div><div class='add'>+		dev_err(&amp;device-&gt;dev, "no PnP port\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pnp_port_len(device, 0) &lt; IO_EXTENT) {</div><div class='del'>-		snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n",</div><div class='add'>+		dev_err(&amp;device-&gt;dev, "PnP port length is %llu, expected %d\n",</div><div class='ctx'> 			   (unsigned long long)pnp_port_len(device, 0),</div><div class='ctx'> 			   IO_EXTENT);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -174,7 +146,7 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,</div><div class='ctx'> </div><div class='ctx'> 	if (!pnp_irq_valid(device, 0) ||</div><div class='ctx'> 	    pnp_irq_flags(device, 0) &amp; IORESOURCE_DISABLED) {</div><div class='del'>-		snd_printk(KERN_WARNING "no PnP irq, using polling\n");</div><div class='add'>+		dev_warn(&amp;device-&gt;dev, "no PnP irq, using polling\n");</div><div class='ctx'> 		irq[dev] = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		irq[dev] = pnp_irq(device, 0);</div><div class='hunk'>@@ -182,8 +154,8 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,</div><div class='del'>-					  const struct pnp_device_id *id)</div><div class='add'>+static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,</div><div class='add'>+				const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -195,14 +167,12 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,</div><div class='ctx'> 		err = snd_mpu401_pnp(dev, pnp_dev, id);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		err = snd_mpu401_create(dev, &amp;card);</div><div class='add'>+		err = snd_mpu401_create(&amp;pnp_dev-&gt;dev, dev, &amp;card);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		err = snd_card_register(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='del'>-		snd_card_set_dev(card, &amp;pnp_dev-&gt;dev);</div><div class='ctx'> 		pnp_set_drvdata(pnp_dev, card);</div><div class='ctx'> 		snd_mpu401_devices++;</div><div class='ctx'> 		++dev;</div><div class='hunk'>@@ -211,19 +181,10 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	snd_card_disconnect(card);</div><div class='del'>-	snd_card_free_when_closed(card);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pnp_driver snd_mpu401_pnp_driver = {</div><div class='ctx'> 	.name = "mpu401",</div><div class='ctx'> 	.id_table = snd_mpu401_pnpids,</div><div class='ctx'> 	.probe = snd_mpu401_pnp_probe,</div><div class='del'>-	.remove = __devexit_p(snd_mpu401_pnp_remove),</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='ctx'> static struct pnp_driver snd_mpu401_pnp_driver;</div><div class='hunk'>@@ -244,7 +205,8 @@ static int __init alsa_card_mpu401_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_mpu401_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_mpu401_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='hunk'>@@ -272,7 +234,7 @@ static int __init alsa_card_mpu401_init(void)</div><div class='ctx'> </div><div class='ctx'> 	if (!snd_mpu401_devices) {</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "MPU-401 device not found or device busy\n");</div><div class='add'>+		pr_err("MPU-401 device not found or device busy\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		snd_mpu401_unregister_all();</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c<br/>index 2af09996a3d0..4af89822bf32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/mpu401_uart.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mpu401/mpu401_uart.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/mpu401/mpu401_uart.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/mpu401/mpu401_uart.c</a></div><div class='hunk'>@@ -1,38 +1,24 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of MPU-401 in UART mode</div><div class='ctx'>  *</div><div class='ctx'>  *  MPU-401 supports UART mode which is not capable generate transmit</div><div class='del'>- *  interrupts thus output is done via polling. Also, if irq &lt; 0, then</div><div class='add'>+ *  interrupts thus output is done via polling. Without interrupt,</div><div class='ctx'>  *  input is done also via polling. Do not expect good performance.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  *   13-03-2003:</div><div class='ctx'>  *      Added support for different kind of hardware I/O. Build in choices</div><div class='ctx'>  *      are port and mmio. For other kind of I/O, set mpu-&gt;read and</div><div class='ctx'>  *      mpu-&gt;write to your own I/O functions.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -87,34 +73,29 @@ static void snd_mpu401_uart_clear_rx(struct snd_mpu401 *mpu)</div><div class='ctx'> 		mpu-&gt;read(mpu, MPU401D(mpu));</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (timeout &lt;= 0)</div><div class='del'>-		snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n",</div><div class='del'>-			   mpu-&gt;read(mpu, MPU401C(mpu)));</div><div class='add'>+		dev_err(mpu-&gt;rmidi-&gt;dev,</div><div class='add'>+			"cmd: clear rx timeout (status = 0x%x)\n",</div><div class='add'>+			mpu-&gt;read(mpu, MPU401C(mpu)));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void uart_interrupt_tx(struct snd_mpu401 *mpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (test_bit(MPU401_MODE_BIT_OUTPUT, &amp;mpu-&gt;mode) &amp;&amp;</div><div class='ctx'> 	    test_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &amp;mpu-&gt;mode)) {</div><div class='del'>-		spin_lock_irqsave(&amp;mpu-&gt;output_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;mpu-&gt;output_lock);</div><div class='ctx'> 		snd_mpu401_uart_output_write(mpu);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mpu-&gt;output_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void _snd_mpu401_uart_interrupt(struct snd_mpu401 *mpu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (mpu-&gt;info_flags &amp; MPU401_INFO_INPUT) {</div><div class='del'>-		spin_lock_irqsave(&amp;mpu-&gt;input_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;mpu-&gt;input_lock);</div><div class='ctx'> 		if (test_bit(MPU401_MODE_BIT_INPUT, &amp;mpu-&gt;mode))</div><div class='ctx'> 			snd_mpu401_uart_input_read(mpu);</div><div class='ctx'> 		else</div><div class='ctx'> 			snd_mpu401_uart_clear_rx(mpu);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mpu-&gt;input_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! (mpu-&gt;info_flags &amp; MPU401_INFO_TX_IRQ))</div><div class='ctx'> 		/* ok. for better Tx performance try do some output</div><div class='hunk'>@@ -128,12 +109,14 @@ static void _snd_mpu401_uart_interrupt(struct snd_mpu401 *mpu)</div><div class='ctx'>  * @dev_id: mpu401 instance</div><div class='ctx'>  *</div><div class='ctx'>  * Processes the interrupt for MPU401-UART i/o.</div><div class='add'>+ *</div><div class='add'>+ * Return: %IRQ_HANDLED if the interrupt was handled. %IRQ_NONE otherwise.</div><div class='ctx'>  */</div><div class='ctx'> irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_mpu401 *mpu = dev_id;</div><div class='ctx'> 	</div><div class='del'>-	if (mpu == NULL)</div><div class='add'>+	if (!mpu)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	_snd_mpu401_uart_interrupt(mpu);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -147,12 +130,14 @@ EXPORT_SYMBOL(snd_mpu401_uart_interrupt);</div><div class='ctx'>  * @dev_id: mpu401 instance</div><div class='ctx'>  *</div><div class='ctx'>  * Processes the interrupt for MPU401-UART output.</div><div class='add'>+ *</div><div class='add'>+ * Return: %IRQ_HANDLED if the interrupt was handled. %IRQ_NONE otherwise.</div><div class='ctx'>  */</div><div class='ctx'> irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_mpu401 *mpu = dev_id;</div><div class='ctx'> 	</div><div class='del'>-	if (mpu == NULL)</div><div class='add'>+	if (!mpu)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	uart_interrupt_tx(mpu);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -164,16 +149,14 @@ EXPORT_SYMBOL(snd_mpu401_uart_interrupt_tx);</div><div class='ctx'>  * timer callback</div><div class='ctx'>  * reprogram the timer and call the interrupt job</div><div class='ctx'>  */</div><div class='del'>-static void snd_mpu401_uart_timer(unsigned long data)</div><div class='add'>+static void snd_mpu401_uart_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct snd_mpu401 *mpu = (struct snd_mpu401 *)data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mpu-&gt;timer_lock, flags);</div><div class='del'>-	/*mpu-&gt;mode |= MPU401_MODE_TIMER;*/</div><div class='del'>-	mpu-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;mpu-&gt;timer);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpu-&gt;timer_lock, flags);</div><div class='add'>+	struct snd_mpu401 *mpu = timer_container_of(mpu, t, timer);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mpu-&gt;timer_lock) {</div><div class='add'>+		/*mpu-&gt;mode |= MPU401_MODE_TIMER;*/</div><div class='add'>+		mod_timer(&amp;mpu-&gt;timer,  1 + jiffies);</div><div class='add'>+	}</div><div class='ctx'> 	if (mpu-&gt;rmidi)</div><div class='ctx'> 		_snd_mpu401_uart_interrupt(mpu);</div><div class='ctx'> }</div><div class='hunk'>@@ -183,19 +166,13 @@ static void snd_mpu401_uart_timer(unsigned long data)</div><div class='ctx'>  */</div><div class='ctx'> static void snd_mpu401_uart_add_timer (struct snd_mpu401 *mpu, int input)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave (&amp;mpu-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mpu-&gt;timer_lock);</div><div class='ctx'> 	if (mpu-&gt;timer_invoked == 0) {</div><div class='del'>-		init_timer(&amp;mpu-&gt;timer);</div><div class='del'>-		mpu-&gt;timer.data = (unsigned long)mpu;</div><div class='del'>-		mpu-&gt;timer.function = snd_mpu401_uart_timer;</div><div class='del'>-		mpu-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-		add_timer(&amp;mpu-&gt;timer);</div><div class='add'>+		timer_setup(&amp;mpu-&gt;timer, snd_mpu401_uart_timer, 0);</div><div class='add'>+		mod_timer(&amp;mpu-&gt;timer, 1 + jiffies);</div><div class='ctx'> 	} </div><div class='ctx'> 	mpu-&gt;timer_invoked |= input ? MPU401_MODE_INPUT_TIMER :</div><div class='ctx'> 		MPU401_MODE_OUTPUT_TIMER;</div><div class='del'>-	spin_unlock_irqrestore (&amp;mpu-&gt;timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -203,16 +180,13 @@ static void snd_mpu401_uart_add_timer (struct snd_mpu401 *mpu, int input)</div><div class='ctx'>  */</div><div class='ctx'> static void snd_mpu401_uart_remove_timer (struct snd_mpu401 *mpu, int input)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave (&amp;mpu-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mpu-&gt;timer_lock);</div><div class='ctx'> 	if (mpu-&gt;timer_invoked) {</div><div class='ctx'> 		mpu-&gt;timer_invoked &amp;= input ? ~MPU401_MODE_INPUT_TIMER :</div><div class='ctx'> 			~MPU401_MODE_OUTPUT_TIMER;</div><div class='ctx'> 		if (! mpu-&gt;timer_invoked)</div><div class='del'>-			del_timer(&amp;mpu-&gt;timer);</div><div class='add'>+			timer_delete(&amp;mpu-&gt;timer);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore (&amp;mpu-&gt;timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -223,10 +197,9 @@ static void snd_mpu401_uart_remove_timer (struct snd_mpu401 *mpu, int input)</div><div class='ctx'> static int snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd,</div><div class='ctx'> 			       int ack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int timeout, ok;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mpu-&gt;input_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mpu-&gt;input_lock);</div><div class='ctx'> 	if (mpu-&gt;hardware != MPU401_HW_TRID4DWAVE) {</div><div class='ctx'> 		mpu-&gt;write(mpu, 0x00, MPU401D(mpu));</div><div class='ctx'> 		/*snd_mpu401_uart_clear_rx(mpu);*/</div><div class='hunk'>@@ -238,8 +211,9 @@ static int snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd,</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 		if (!timeout)</div><div class='del'>-			snd_printk(KERN_ERR "cmd: tx timeout (status = 0x%x)\n",</div><div class='del'>-				   mpu-&gt;read(mpu, MPU401C(mpu)));</div><div class='add'>+			dev_err(mpu-&gt;rmidi-&gt;dev,</div><div class='add'>+				"cmd: tx timeout (status = 0x%x)\n",</div><div class='add'>+				mpu-&gt;read(mpu, MPU401C(mpu)));</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	mpu-&gt;write(mpu, cmd, MPU401C(mpu));</div><div class='hunk'>@@ -256,12 +230,12 @@ static int snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd,</div><div class='ctx'> 			ok = 1;</div><div class='ctx'> 	} else</div><div class='ctx'> 		ok = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpu-&gt;input_lock, flags);</div><div class='ctx'> 	if (!ok) {</div><div class='del'>-		snd_printk(KERN_ERR "cmd: 0x%x failed at 0x%lx "</div><div class='del'>-			   "(status = 0x%x, data = 0x%x)\n", cmd, mpu-&gt;port,</div><div class='del'>-			   mpu-&gt;read(mpu, MPU401C(mpu)),</div><div class='del'>-			   mpu-&gt;read(mpu, MPU401D(mpu)));</div><div class='add'>+		dev_err(mpu-&gt;rmidi-&gt;dev,</div><div class='add'>+			"cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)\n",</div><div class='add'>+			cmd, mpu-&gt;port,</div><div class='add'>+			mpu-&gt;read(mpu, MPU401C(mpu)),</div><div class='add'>+			mpu-&gt;read(mpu, MPU401D(mpu)));</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -285,8 +259,11 @@ static int snd_mpu401_uart_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	if (mpu-&gt;open_input &amp;&amp; (err = mpu-&gt;open_input(mpu)) &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (mpu-&gt;open_input) {</div><div class='add'>+		err = mpu-&gt;open_input(mpu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> 	if (! test_bit(MPU401_MODE_BIT_OUTPUT, &amp;mpu-&gt;mode)) {</div><div class='ctx'> 		if (snd_mpu401_do_reset(mpu) &lt; 0)</div><div class='ctx'> 			goto error_out;</div><div class='hunk'>@@ -307,8 +284,11 @@ static int snd_mpu401_uart_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	if (mpu-&gt;open_output &amp;&amp; (err = mpu-&gt;open_output(mpu)) &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (mpu-&gt;open_output) {</div><div class='add'>+		err = mpu-&gt;open_output(mpu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> 	if (! test_bit(MPU401_MODE_BIT_INPUT, &amp;mpu-&gt;mode)) {</div><div class='ctx'> 		if (snd_mpu401_do_reset(mpu) &lt; 0)</div><div class='ctx'> 			goto error_out;</div><div class='hunk'>@@ -363,7 +343,6 @@ static int snd_mpu401_uart_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> static void</div><div class='ctx'> snd_mpu401_uart_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_mpu401 *mpu;</div><div class='ctx'> 	int max = 64;</div><div class='ctx'> </div><div class='hunk'>@@ -374,16 +353,15 @@ snd_mpu401_uart_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> 			/* first time - flush FIFO */</div><div class='ctx'> 			while (max-- &gt; 0)</div><div class='ctx'> 				mpu-&gt;read(mpu, MPU401D(mpu));</div><div class='del'>-			if (mpu-&gt;irq &lt; 0)</div><div class='add'>+			if (mpu-&gt;info_flags &amp; MPU401_INFO_USE_TIMER)</div><div class='ctx'> 				snd_mpu401_uart_add_timer(mpu, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		</div><div class='ctx'> 		/* read data in advance */</div><div class='del'>-		spin_lock_irqsave(&amp;mpu-&gt;input_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;mpu-&gt;input_lock);</div><div class='ctx'> 		snd_mpu401_uart_input_read(mpu);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mpu-&gt;input_lock, flags);</div><div class='ctx'> 	} else {</div><div class='del'>-		if (mpu-&gt;irq &lt; 0)</div><div class='add'>+		if (mpu-&gt;info_flags &amp; MPU401_INFO_USE_TIMER)</div><div class='ctx'> 			snd_mpu401_uart_remove_timer(mpu, 1);</div><div class='ctx'> 		clear_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &amp;mpu-&gt;mode);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -450,7 +428,6 @@ static void snd_mpu401_uart_output_write(struct snd_mpu401 * mpu)</div><div class='ctx'> static void</div><div class='ctx'> snd_mpu401_uart_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_mpu401 *mpu;</div><div class='ctx'> </div><div class='ctx'> 	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='hunk'>@@ -465,9 +442,8 @@ snd_mpu401_uart_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> 			snd_mpu401_uart_add_timer(mpu, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* output pending data */</div><div class='del'>-		spin_lock_irqsave(&amp;mpu-&gt;output_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;mpu-&gt;output_lock);</div><div class='ctx'> 		snd_mpu401_uart_output_write(mpu);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mpu-&gt;output_lock, flags);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (! (mpu-&gt;info_flags &amp; MPU401_INFO_TX_IRQ))</div><div class='ctx'> 			snd_mpu401_uart_remove_timer(mpu, 0);</div><div class='hunk'>@@ -479,14 +455,14 @@ snd_mpu401_uart_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mpu401_uart_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_mpu401_uart_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_mpu401_uart_output_open,</div><div class='ctx'> 	.close =	snd_mpu401_uart_output_close,</div><div class='ctx'> 	.trigger =	snd_mpu401_uart_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mpu401_uart_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_mpu401_uart_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_mpu401_uart_input_open,</div><div class='ctx'> 	.close =	snd_mpu401_uart_input_close,</div><div class='hunk'>@@ -496,7 +472,7 @@ static struct snd_rawmidi_ops snd_mpu401_uart_input =</div><div class='ctx'> static void snd_mpu401_uart_free(struct snd_rawmidi *rmidi)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_mpu401 *mpu = rmidi-&gt;private_data;</div><div class='del'>-	if (mpu-&gt;irq_flags &amp;&amp; mpu-&gt;irq &gt;= 0)</div><div class='add'>+	if (mpu-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(mpu-&gt;irq, (void *) mpu);</div><div class='ctx'> 	release_and_free_resource(mpu-&gt;res);</div><div class='ctx'> 	kfree(mpu);</div><div class='hunk'>@@ -509,8 +485,7 @@ static void snd_mpu401_uart_free(struct snd_rawmidi *rmidi)</div><div class='ctx'>  * @hardware: the hardware type, MPU401_HW_XXXX</div><div class='ctx'>  * @port: the base address of MPU401 port</div><div class='ctx'>  * @info_flags: bitflags MPU401_INFO_XXX</div><div class='del'>- * @irq: the irq number, -1 if no interrupt for mpu</div><div class='del'>- * @irq_flags: the irq request flags (SA_XXX), 0 if irq was already reserved.</div><div class='add'>+ * @irq: the ISA irq number, -1 if not to be allocated</div><div class='ctx'>  * @rrawmidi: the pointer to store the new rawmidi instance</div><div class='ctx'>  *</div><div class='ctx'>  * Creates a new MPU-401 instance.</div><div class='hunk'>@@ -519,13 +494,13 @@ static void snd_mpu401_uart_free(struct snd_rawmidi *rmidi)</div><div class='ctx'>  * not the mpu401 instance itself.  To access to the mpu401 instance,</div><div class='ctx'>  * cast from rawmidi-&gt;private_data (with struct snd_mpu401 magic-cast).</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code.</div><div class='add'>+ * Return: Zero if successful, or a negative error code.</div><div class='ctx'>  */</div><div class='ctx'> int snd_mpu401_uart_new(struct snd_card *card, int device,</div><div class='ctx'> 			unsigned short hardware,</div><div class='ctx'> 			unsigned long port,</div><div class='ctx'> 			unsigned int info_flags,</div><div class='del'>-			int irq, int irq_flags,</div><div class='add'>+			int irq,</div><div class='ctx'> 			struct snd_rawmidi ** rrawmidi)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_mpu401 *mpu;</div><div class='hunk'>@@ -539,14 +514,14 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,</div><div class='ctx'> 		info_flags |= MPU401_INFO_INPUT | MPU401_INFO_OUTPUT;</div><div class='ctx'> 	in_enable = (info_flags &amp; MPU401_INFO_INPUT) ? 1 : 0;</div><div class='ctx'> 	out_enable = (info_flags &amp; MPU401_INFO_OUTPUT) ? 1 : 0;</div><div class='del'>-	if ((err = snd_rawmidi_new(card, "MPU-401U", device,</div><div class='del'>-				   out_enable, in_enable, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(card, "MPU-401U", device,</div><div class='add'>+			      out_enable, in_enable, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);</div><div class='del'>-	if (mpu == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "mpu401_uart: cannot allocate\n");</div><div class='del'>-		snd_device_free(card, rmidi);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!mpu) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_device;</div><div class='ctx'> 	}</div><div class='ctx'> 	rmidi-&gt;private_data = mpu;</div><div class='ctx'> 	rmidi-&gt;private_free = snd_mpu401_uart_free;</div><div class='hunk'>@@ -554,15 +529,17 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,</div><div class='ctx'> 	spin_lock_init(&amp;mpu-&gt;output_lock);</div><div class='ctx'> 	spin_lock_init(&amp;mpu-&gt;timer_lock);</div><div class='ctx'> 	mpu-&gt;hardware = hardware;</div><div class='add'>+	mpu-&gt;irq = -1;</div><div class='add'>+	mpu-&gt;rmidi = rmidi;</div><div class='ctx'> 	if (! (info_flags &amp; MPU401_INFO_INTEGRATED)) {</div><div class='ctx'> 		int res_size = hardware == MPU401_HW_PC98II ? 4 : 2;</div><div class='ctx'> 		mpu-&gt;res = request_region(port, res_size, "MPU401 UART");</div><div class='del'>-		if (mpu-&gt;res == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "mpu401_uart: "</div><div class='del'>-				   "unable to grab port 0x%lx size %d\n",</div><div class='del'>-				   port, res_size);</div><div class='del'>-			snd_device_free(card, rmidi);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+		if (!mpu-&gt;res) {</div><div class='add'>+			dev_err(rmidi-&gt;dev,</div><div class='add'>+				"mpu401_uart: unable to grab port 0x%lx size %d\n",</div><div class='add'>+				port, res_size);</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto free_device;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (info_flags &amp; MPU401_INFO_MMIO) {</div><div class='hunk'>@@ -577,18 +554,19 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,</div><div class='ctx'> 		mpu-&gt;cport = port + 2;</div><div class='ctx'> 	else</div><div class='ctx'> 		mpu-&gt;cport = port + 1;</div><div class='del'>-	if (irq &gt;= 0 &amp;&amp; irq_flags) {</div><div class='del'>-		if (request_irq(irq, snd_mpu401_uart_interrupt, irq_flags,</div><div class='add'>+	if (irq &gt;= 0) {</div><div class='add'>+		if (request_irq(irq, snd_mpu401_uart_interrupt, 0,</div><div class='ctx'> 				"MPU401 UART", (void *) mpu)) {</div><div class='del'>-			snd_printk(KERN_ERR "mpu401_uart: "</div><div class='del'>-				   "unable to grab IRQ %d\n", irq);</div><div class='del'>-			snd_device_free(card, rmidi);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+			dev_err(rmidi-&gt;dev,</div><div class='add'>+				"mpu401_uart: unable to grab IRQ %d\n", irq);</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto free_device;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (irq &lt; 0 &amp;&amp; !(info_flags &amp; MPU401_INFO_IRQ_HOOK))</div><div class='add'>+		info_flags |= MPU401_INFO_USE_TIMER;</div><div class='ctx'> 	mpu-&gt;info_flags = info_flags;</div><div class='ctx'> 	mpu-&gt;irq = irq;</div><div class='del'>-	mpu-&gt;irq_flags = irq_flags;</div><div class='ctx'> 	if (card-&gt;shortname[0])</div><div class='ctx'> 		snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name), "%s MIDI",</div><div class='ctx'> 			 card-&gt;shortname);</div><div class='hunk'>@@ -606,26 +584,12 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,</div><div class='ctx'> 		if (out_enable)</div><div class='ctx'> 			rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	}</div><div class='del'>-	mpu-&gt;rmidi = rmidi;</div><div class='ctx'> 	if (rrawmidi)</div><div class='ctx'> 		*rrawmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='add'>+free_device:</div><div class='add'>+	snd_device_free(card, rmidi);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_mpu401_uart_new);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_mpu401_uart_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_mpu401_uart_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_mpu401_uart_init)</div><div class='del'>-module_exit(alsa_mpu401_uart_exit)</div><div class='head'>diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c<br/>index da03597fc893..d31eadf4be5f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/mtpav.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mtpav.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/mtpav.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/mtpav.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *      MOTU Midi Timepiece ALSA Main routines</div><div class='ctx'>  *      Copyright by Michael T. Mayers (c) Jan 09, 2000</div><div class='ctx'>  *      mail: michael@tweakoz.com</div><div class='ctx'>  *      Thanks to John Galbraith</div><div class='ctx'>  *</div><div class='del'>- *      This program is free software; you can redistribute it and/or modify</div><div class='del'>- *      it under the terms of the GNU General Public License as published by</div><div class='del'>- *      the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *      (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *      This program is distributed in the hope that it will be useful,</div><div class='del'>- *      but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *      GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *      You should have received a copy of the GNU General Public License</div><div class='del'>- *      along with this program; if not, write to the Free Software</div><div class='del'>- *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  *      This driver is for the 'Mark Of The Unicorn' (MOTU)</div><div class='ctx'>  *      MidiTimePiece AV multiport MIDI interface </div><div class='ctx'>  *</div><div class='hunk'>@@ -39,7 +25,6 @@</div><div class='ctx'>  *      MIDI Synchronization to Video, ADAT, SMPTE and other Clock sources</div><div class='ctx'>  *      128 'scene' memories, recallable from MIDI program change</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * ChangeLog</div><div class='ctx'>  * Jun 11 2001	Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *      - Recoded &amp; debugged</div><div class='hunk'>@@ -47,21 +32,21 @@</div><div class='ctx'>  *      - hwports is between 1 and 8, which specifies the number of hardware ports.</div><div class='ctx'>  *        The three global ports, computer, adat and broadcast ports, are created</div><div class='ctx'>  *        always after h/w and remote ports.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *      globals</div><div class='hunk'>@@ -69,7 +54,6 @@</div><div class='ctx'> MODULE_AUTHOR("Michael T. Mayers");</div><div class='ctx'> MODULE_DESCRIPTION("MOTU MidiTimePiece AV multiport MIDI");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{MOTU,MidiTimePiece AV multiport MIDI}}");</div><div class='ctx'> </div><div class='ctx'> // io resources</div><div class='ctx'> #define MTPAV_IOBASE		0x378</div><div class='hunk'>@@ -86,9 +70,9 @@ module_param(index, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for MotuMTPAV MIDI.");</div><div class='ctx'> module_param(id, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for MotuMTPAV MIDI.");</div><div class='del'>-module_param(port, long, 0444);</div><div class='add'>+module_param_hw(port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Parallel port # for MotuMTPAV MIDI.");</div><div class='del'>-module_param(irq, int, 0444);</div><div class='add'>+module_param_hw(irq, int, irq, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "Parallel IRQ # for MotuMTPAV MIDI.");</div><div class='ctx'> module_param(hwports, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(hwports, "Hardware ports # for MotuMTPAV MIDI.");</div><div class='hunk'>@@ -302,10 +286,6 @@ static void snd_mtpav_output_port_write(struct mtpav *mtp_card,</div><div class='ctx'> </div><div class='ctx'> 		snd_mtpav_send_byte(mtp_card, 0xf5);</div><div class='ctx'> 		snd_mtpav_send_byte(mtp_card, portp-&gt;hwport);</div><div class='del'>-		/*</div><div class='del'>-		snd_printk(KERN_DEBUG "new outport: 0x%x\n",</div><div class='del'>-			   (unsigned int) portp-&gt;hwport);</div><div class='del'>-		*/</div><div class='ctx'> 		if (!(outbyte &amp; 0x80) &amp;&amp; portp-&gt;running_status)</div><div class='ctx'> 			snd_mtpav_send_byte(mtp_card, portp-&gt;running_status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -324,11 +304,9 @@ static void snd_mtpav_output_write(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	snd_mtpav_output_port_write(mtp_card, portp, substream);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -354,14 +332,12 @@ static int snd_mtpav_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	portp-&gt;mode |= MTPAV_MODE_INPUT_OPENED;</div><div class='ctx'> 	portp-&gt;input = substream;</div><div class='ctx'> 	if (mtp_card-&gt;share_irq++ == 0)</div><div class='ctx'> 		snd_mtpav_mputreg(mtp_card, CREG, (SIGC_INTEN | SIGC_WRITE));	// enable pport interrupts</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,14 +348,12 @@ static int snd_mtpav_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	portp-&gt;mode &amp;= ~MTPAV_MODE_INPUT_OPENED;</div><div class='ctx'> 	portp-&gt;input = NULL;</div><div class='ctx'> 	if (--mtp_card-&gt;share_irq == 0)</div><div class='ctx'> 		snd_mtpav_mputreg(mtp_card, CREG, 0);	// disable pport interrupts</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -390,15 +364,12 @@ static void snd_mtpav_input_trigger(struct snd_rawmidi_substream *substream, int</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	if (up)</div><div class='ctx'> 		portp-&gt;mode |= MTPAV_MODE_INPUT_TRIGGERED;</div><div class='ctx'> 	else</div><div class='ctx'> 		portp-&gt;mode &amp;= ~MTPAV_MODE_INPUT_TRIGGERED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -406,36 +377,32 @@ static void snd_mtpav_input_trigger(struct snd_rawmidi_substream *substream, int</div><div class='ctx'>  * timer interrupt for outputs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void snd_mtpav_output_timer(unsigned long data)</div><div class='add'>+static void snd_mtpav_output_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct mtpav *chip = (struct mtpav *)data;</div><div class='add'>+	struct mtpav *chip = timer_container_of(chip, t, timer);</div><div class='ctx'> 	int p;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;spinlock);</div><div class='ctx'> 	/* reprogram timer */</div><div class='del'>-	chip-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;chip-&gt;timer);</div><div class='add'>+	mod_timer(&amp;chip-&gt;timer, 1 + jiffies);</div><div class='ctx'> 	/* process each port */</div><div class='ctx'> 	for (p = 0; p &lt;= chip-&gt;num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) {</div><div class='ctx'> 		struct mtpav_port *portp = &amp;chip-&gt;ports[p];</div><div class='ctx'> 		if ((portp-&gt;mode &amp; MTPAV_MODE_OUTPUT_TRIGGERED) &amp;&amp; portp-&gt;output)</div><div class='ctx'> 			snd_mtpav_output_port_write(chip, portp, portp-&gt;output);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;spinlock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* spinlock held! */</div><div class='ctx'> static void snd_mtpav_add_output_timer(struct mtpav *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;chip-&gt;timer);</div><div class='add'>+	mod_timer(&amp;chip-&gt;timer, 1 + jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* spinlock held! */</div><div class='ctx'> static void snd_mtpav_remove_output_timer(struct mtpav *chip)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;chip-&gt;timer);</div><div class='add'>+	timer_delete(&amp;chip-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -445,12 +412,10 @@ static int snd_mtpav_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	portp-&gt;mode |= MTPAV_MODE_OUTPUT_OPENED;</div><div class='ctx'> 	portp-&gt;output = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -461,12 +426,10 @@ static int snd_mtpav_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mtp_card-&gt;spinlock);</div><div class='ctx'> 	portp-&gt;mode &amp;= ~MTPAV_MODE_OUTPUT_OPENED;</div><div class='ctx'> 	portp-&gt;output = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -477,21 +440,20 @@ static void snd_mtpav_output_trigger(struct snd_rawmidi_substream *substream, in</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mtp_card = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	struct mtpav_port *portp = &amp;mtp_card-&gt;ports[substream-&gt;number];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mtp_card-&gt;spinlock, flags);</div><div class='del'>-	if (up) {</div><div class='del'>-		if (! (portp-&gt;mode &amp; MTPAV_MODE_OUTPUT_TRIGGERED)) {</div><div class='del'>-			if (mtp_card-&gt;istimer++ == 0)</div><div class='del'>-				snd_mtpav_add_output_timer(mtp_card);</div><div class='del'>-			portp-&gt;mode |= MTPAV_MODE_OUTPUT_TRIGGERED;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mtp_card-&gt;spinlock) {</div><div class='add'>+		if (up) {</div><div class='add'>+			if ((portp-&gt;mode &amp; MTPAV_MODE_OUTPUT_TRIGGERED)) {</div><div class='add'>+				if (mtp_card-&gt;istimer++ == 0)</div><div class='add'>+					snd_mtpav_add_output_timer(mtp_card);</div><div class='add'>+				portp-&gt;mode |= MTPAV_MODE_OUTPUT_TRIGGERED;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			portp-&gt;mode &amp;= ~MTPAV_MODE_OUTPUT_TRIGGERED;</div><div class='add'>+			if (--mtp_card-&gt;istimer == 0)</div><div class='add'>+				snd_mtpav_remove_output_timer(mtp_card);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		portp-&gt;mode &amp;= ~MTPAV_MODE_OUTPUT_TRIGGERED;</div><div class='del'>-		if (--mtp_card-&gt;istimer == 0)</div><div class='del'>-			snd_mtpav_remove_output_timer(mtp_card);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mtp_card-&gt;spinlock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (up)</div><div class='ctx'> 		snd_mtpav_output_write(substream);</div><div class='hunk'>@@ -541,8 +503,6 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd)</div><div class='ctx'> </div><div class='ctx'> 	u8 sbyt = snd_mtpav_getreg(mcrd, SREG);</div><div class='ctx'> </div><div class='del'>-	/* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */</div><div class='del'>-</div><div class='ctx'> 	if (!(sbyt &amp; SIGS_BYTE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -574,24 +534,26 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *mcard = dev_id;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mcard-&gt;spinlock);</div><div class='add'>+	guard(spinlock)(&amp;mcard-&gt;spinlock);</div><div class='ctx'> 	snd_mtpav_read_bytes(mcard);</div><div class='del'>-	spin_unlock(&amp;mcard-&gt;spinlock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * get ISA resources</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)</div><div class='add'>+static int snd_mtpav_get_ISA(struct mtpav *mcard)</div><div class='ctx'> {</div><div class='del'>-	if ((mcard-&gt;res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);</div><div class='add'>+	mcard-&gt;res_port = devm_request_region(mcard-&gt;card-&gt;dev, port, 3,</div><div class='add'>+					      "MotuMTPAV MIDI");</div><div class='add'>+	if (!mcard-&gt;res_port) {</div><div class='add'>+		dev_err(mcard-&gt;card-&gt;dev, "MTVAP port 0x%lx is busy\n", port);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	mcard-&gt;port = port;</div><div class='del'>-	if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {</div><div class='del'>-		snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);</div><div class='add'>+	if (devm_request_irq(mcard-&gt;card-&gt;dev, irq, snd_mtpav_irqh, 0,</div><div class='add'>+			     "MOTU MTPAV", mcard)) {</div><div class='add'>+		dev_err(mcard-&gt;card-&gt;dev, "MTVAP IRQ %d busy\n", irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	mcard-&gt;irq = irq;</div><div class='hunk'>@@ -602,13 +564,13 @@ static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mtpav_output = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_mtpav_output = {</div><div class='ctx'> 	.open =		snd_mtpav_output_open,</div><div class='ctx'> 	.close =	snd_mtpav_output_close,</div><div class='ctx'> 	.trigger =	snd_mtpav_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mtpav_input = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_mtpav_input = {</div><div class='ctx'> 	.open =		snd_mtpav_input_open,</div><div class='ctx'> 	.close =	snd_mtpav_input_close,</div><div class='ctx'> 	.trigger =	snd_mtpav_input_trigger,</div><div class='hunk'>@@ -619,22 +581,22 @@ static struct snd_rawmidi_ops snd_mtpav_input = {</div><div class='ctx'>  * get RAWMIDI resources</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_mtpav_set_name(struct mtpav *chip,</div><div class='del'>-				      struct snd_rawmidi_substream *substream)</div><div class='add'>+static void snd_mtpav_set_name(struct mtpav *chip,</div><div class='add'>+			       struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	if (substream-&gt;number &gt;= 0 &amp;&amp; substream-&gt;number &lt; chip-&gt;num_ports)</div><div class='ctx'> 		sprintf(substream-&gt;name, "MTP direct %d", (substream-&gt;number % chip-&gt;num_ports) + 1);</div><div class='ctx'> 	else if (substream-&gt;number &gt;= 8 &amp;&amp; substream-&gt;number &lt; chip-&gt;num_ports * 2)</div><div class='ctx'> 		sprintf(substream-&gt;name, "MTP remote %d", (substream-&gt;number % chip-&gt;num_ports) + 1);</div><div class='ctx'> 	else if (substream-&gt;number == chip-&gt;num_ports * 2)</div><div class='del'>-		strcpy(substream-&gt;name, "MTP computer");</div><div class='add'>+		strscpy(substream-&gt;name, "MTP computer");</div><div class='ctx'> 	else if (substream-&gt;number == chip-&gt;num_ports * 2 + 1)</div><div class='del'>-		strcpy(substream-&gt;name, "MTP ADAT");</div><div class='add'>+		strscpy(substream-&gt;name, "MTP ADAT");</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(substream-&gt;name, "MTP broadcast");</div><div class='add'>+		strscpy(substream-&gt;name, "MTP broadcast");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)</div><div class='add'>+static int snd_mtpav_get_RAWMIDI(struct mtpav *mcard)</div><div class='ctx'> {</div><div class='ctx'> 	int rval;</div><div class='ctx'> 	struct snd_rawmidi *rawmidi;</div><div class='hunk'>@@ -647,10 +609,11 @@ static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)</div><div class='ctx'> 		hwports = 8;</div><div class='ctx'> 	mcard-&gt;num_ports = hwports;</div><div class='ctx'> </div><div class='del'>-	if ((rval = snd_rawmidi_new(mcard-&gt;card, "MotuMIDI", 0,</div><div class='del'>-				    mcard-&gt;num_ports * 2 + MTPAV_PIDX_BROADCAST + 1,</div><div class='del'>-				    mcard-&gt;num_ports * 2 + MTPAV_PIDX_BROADCAST + 1,</div><div class='del'>-				    &amp;mcard-&gt;rmidi)) &lt; 0)</div><div class='add'>+	rval = snd_rawmidi_new(mcard-&gt;card, "MotuMIDI", 0,</div><div class='add'>+			       mcard-&gt;num_ports * 2 + MTPAV_PIDX_BROADCAST + 1,</div><div class='add'>+			       mcard-&gt;num_ports * 2 + MTPAV_PIDX_BROADCAST + 1,</div><div class='add'>+			       &amp;mcard-&gt;rmidi);</div><div class='add'>+	if (rval &lt; 0)</div><div class='ctx'> 		return rval;</div><div class='ctx'> 	rawmidi = mcard-&gt;rmidi;</div><div class='ctx'> 	rawmidi-&gt;private_data = mcard;</div><div class='hunk'>@@ -678,78 +641,61 @@ static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)</div><div class='ctx'> static void snd_mtpav_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct mtpav *crd = card-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;crd-&gt;spinlock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;crd-&gt;spinlock);</div><div class='ctx'> 	if (crd-&gt;istimer &gt; 0)</div><div class='ctx'> 		snd_mtpav_remove_output_timer(crd);</div><div class='del'>-	spin_unlock_irqrestore(&amp;crd-&gt;spinlock, flags);</div><div class='del'>-	if (crd-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(crd-&gt;irq, (void *)crd);</div><div class='del'>-	release_and_free_resource(crd-&gt;res_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_mtpav_probe(struct platform_device *dev)</div><div class='add'>+static int snd_mtpav_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct mtpav *mtp_card;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;dev-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*mtp_card), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	mtp_card = card-&gt;private_data;</div><div class='ctx'> 	spin_lock_init(&amp;mtp_card-&gt;spinlock);</div><div class='del'>-	init_timer(&amp;mtp_card-&gt;timer);</div><div class='ctx'> 	mtp_card-&gt;card = card;</div><div class='ctx'> 	mtp_card-&gt;irq = -1;</div><div class='ctx'> 	mtp_card-&gt;share_irq = 0;</div><div class='ctx'> 	mtp_card-&gt;inmidistate = 0;</div><div class='ctx'> 	mtp_card-&gt;outmidihwport = 0xffffffff;</div><div class='del'>-	init_timer(&amp;mtp_card-&gt;timer);</div><div class='del'>-	mtp_card-&gt;timer.function = snd_mtpav_output_timer;</div><div class='del'>-	mtp_card-&gt;timer.data = (unsigned long) mtp_card;</div><div class='del'>-</div><div class='del'>-	card-&gt;private_free = snd_mtpav_free;</div><div class='add'>+	timer_setup(&amp;mtp_card-&gt;timer, snd_mtpav_output_timer, 0);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_mtpav_get_RAWMIDI(mtp_card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	mtp_card-&gt;inmidiport = mtp_card-&gt;num_ports + MTPAV_PIDX_BROADCAST;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_mtpav_get_ISA(mtp_card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "MTPAV");</div><div class='del'>-	strcpy(card-&gt;shortname, "MTPAV on parallel port");</div><div class='add'>+	strscpy(card-&gt;driver, "MTPAV");</div><div class='add'>+	strscpy(card-&gt;shortname, "MTPAV on parallel port");</div><div class='ctx'> 	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='ctx'> 		 "MTPAV on parallel port at 0x%lx", port);</div><div class='ctx'> </div><div class='ctx'> 	snd_mtpav_portscan(mtp_card);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;dev-&gt;dev);</div><div class='ctx'> 	err = snd_card_register(mtp_card-&gt;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(dev, card);</div><div class='del'>-	printk(KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n", irq, port);</div><div class='del'>-	return 0;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>- __error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	card-&gt;private_free = snd_mtpav_free;</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_mtpav_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='add'>+	platform_set_drvdata(dev, card);</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n",</div><div class='add'>+		 irq, port);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -757,9 +703,8 @@ static int __devexit snd_mtpav_remove(struct platform_device *devptr)</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_mtpav_driver = {</div><div class='ctx'> 	.probe		= snd_mtpav_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_mtpav_remove),</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_MTPAV_DRIVER</div><div class='add'>+		.name	= SND_MTPAV_DRIVER,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -767,7 +712,8 @@ static int __init alsa_card_mtpav_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_mtpav_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_mtpav_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);</div><div class='head'>diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c<br/>index 8539ab0a0893..fe50b48c10e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/mts64.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/mts64.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/mts64.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/mts64.c</a></div><div class='hunk'>@@ -1,29 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*     </div><div class='ctx'>  *   ALSA Driver for Ego Systems Inc. (ESI) Miditerminal 4140</div><div class='ctx'>  *   Copyright (c) 2006 by Matthias König &lt;mk@phasorlab.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify </div><div class='del'>- *   it under the terms of the GNU General Public License as published by </div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or </div><div class='del'>- *   (at your option) any later version. </div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful, </div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of </div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/parport.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='hunk'>@@ -35,22 +23,21 @@</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS]  = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS]   = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *platform_devices[SNDRV_CARDS]; </div><div class='ctx'> static int device_count;</div><div class='ctx'> </div><div class='del'>-module_param_array(index, int, NULL, S_IRUGO);</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");</div><div class='del'>-module_param_array(id, charp, NULL, S_IRUGO);</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");</div><div class='del'>-module_param_array(enable, bool, NULL, S_IRUGO);</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Matthias Koenig &lt;mk@phasorlab.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ESI Miditerminal 4140");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ESI,Miditerminal 4140}}");</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  * Chip specific</div><div class='hunk'>@@ -64,8 +51,6 @@ struct mts64 {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct pardevice *pardev;</div><div class='del'>-	int pardev_claimed;</div><div class='del'>-</div><div class='ctx'> 	int open_count;</div><div class='ctx'> 	int current_midi_output_port;</div><div class='ctx'> 	int current_midi_input_port;</div><div class='hunk'>@@ -82,9 +67,9 @@ static int snd_mts64_free(struct mts64 *mts)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mts64_create(struct snd_card *card, </div><div class='del'>-				      struct pardevice *pardev, </div><div class='del'>-				      struct mts64 **rchip)</div><div class='add'>+static int snd_mts64_create(struct snd_card *card,</div><div class='add'>+			    struct pardevice *pardev,</div><div class='add'>+			    struct mts64 **rchip)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts;</div><div class='ctx'> </div><div class='hunk'>@@ -213,7 +198,7 @@ static int mts64_device_ready(struct parport *p)</div><div class='ctx'>  *  0 init ok</div><div class='ctx'>  *  -EIO failure</div><div class='ctx'>  */</div><div class='del'>-static int __devinit mts64_device_init(struct parport *p)</div><div class='add'>+static int mts64_device_init(struct parport *p)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +261,7 @@ static int mts64_device_close(struct mts64 *mts)</div><div class='ctx'>  */</div><div class='ctx'> static u8 mts64_map_midi_input(u8 c)</div><div class='ctx'> {</div><div class='del'>-	static u8 map[] = { 0, 1, 4, 2, 3 };</div><div class='add'>+	static const u8 map[] = { 0, 1, 4, 2, 3 };</div><div class='ctx'> </div><div class='ctx'> 	return map[c];</div><div class='ctx'> }</div><div class='hunk'>@@ -289,7 +274,7 @@ static u8 mts64_map_midi_input(u8 c)</div><div class='ctx'>  *  0       device found</div><div class='ctx'>  *  -ENODEV no device</div><div class='ctx'>  */</div><div class='del'>-static int __devinit mts64_probe(struct parport *p)</div><div class='add'>+static int mts64_probe(struct parport *p)</div><div class='ctx'> {</div><div class='ctx'> 	u8 c;</div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +353,7 @@ static void mts64_smpte_start(struct parport *p,</div><div class='ctx'> 			      u8 seconds, u8 frames,</div><div class='ctx'> 			      u8 idx)</div><div class='ctx'> {</div><div class='del'>-	static u8 fps[5] = { MTS64_CMD_SMPTE_FPS_24, </div><div class='add'>+	static const u8 fps[5] = { MTS64_CMD_SMPTE_FPS_24,</div><div class='ctx'> 			     MTS64_CMD_SMPTE_FPS_25,</div><div class='ctx'> 			     MTS64_CMD_SMPTE_FPS_2997, </div><div class='ctx'> 			     MTS64_CMD_SMPTE_FPS_30D,</div><div class='hunk'>@@ -447,9 +432,8 @@ static int snd_mts64_ctl_smpte_switch_get(struct snd_kcontrol* kctl,</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	uctl-&gt;value.integer.value[0] = mts-&gt;smpte_switch;</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -460,14 +444,12 @@ static int snd_mts64_ctl_smpte_switch_put(struct snd_kcontrol* kctl,</div><div class='ctx'> 					  struct snd_ctl_elem_value *uctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='del'>-	int changed = 0;</div><div class='ctx'> 	int val = !!uctl-&gt;value.integer.value[0];</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	if (mts-&gt;smpte_switch == val)</div><div class='del'>-		goto __out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	changed = 1;</div><div class='ctx'> 	mts-&gt;smpte_switch = val;</div><div class='ctx'> 	if (mts-&gt;smpte_switch) {</div><div class='ctx'> 		mts64_smpte_start(mts-&gt;pardev-&gt;port,</div><div class='hunk'>@@ -477,12 +459,10 @@ static int snd_mts64_ctl_smpte_switch_put(struct snd_kcontrol* kctl,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mts64_smpte_stop(mts-&gt;pardev-&gt;port);</div><div class='ctx'> 	}</div><div class='del'>-__out:</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='del'>-	return changed;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_switch = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Playback Switch",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -530,9 +510,8 @@ static int snd_mts64_ctl_smpte_time_get(struct snd_kcontrol *kctl,</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='ctx'> 	int idx = kctl-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	uctl-&gt;value.integer.value[0] = mts-&gt;time[idx];</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -543,19 +522,17 @@ static int snd_mts64_ctl_smpte_time_put(struct snd_kcontrol *kctl,</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='ctx'> 	int idx = kctl-&gt;private_value;</div><div class='ctx'> 	unsigned int time = uctl-&gt;value.integer.value[0] % 60;</div><div class='del'>-	int changed = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	if (mts-&gt;time[idx] != time) {</div><div class='del'>-		changed = 1;</div><div class='ctx'> 		mts-&gt;time[idx] = time;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return changed;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_time_hours __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_time_hours = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Time Hours",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -566,7 +543,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_hours __devinitdata = {</div><div class='ctx'> 	.put  = snd_mts64_ctl_smpte_time_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_time_minutes __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_time_minutes = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Time Minutes",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -577,7 +554,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_minutes __devinitdata = {</div><div class='ctx'> 	.put  = snd_mts64_ctl_smpte_time_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_time_seconds __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_time_seconds = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Time Seconds",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -588,7 +565,7 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_seconds __devinitdata = {</div><div class='ctx'> 	.put  = snd_mts64_ctl_smpte_time_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_time_frames __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_time_frames = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Time Frames",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -603,21 +580,11 @@ static struct snd_kcontrol_new mts64_ctl_smpte_time_frames __devinitdata = {</div><div class='ctx'> static int snd_mts64_ctl_smpte_fps_info(struct snd_kcontrol *kctl,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[5] = { "24",</div><div class='del'>-				  "25",</div><div class='del'>-				  "29.97",</div><div class='del'>-				  "30D",</div><div class='del'>-				  "30"    };</div><div class='add'>+	static const char * const texts[5] = {</div><div class='add'>+		"24", "25", "29.97", "30D", "30"</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 4;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_mts64_ctl_smpte_fps_get(struct snd_kcontrol *kctl,</div><div class='hunk'>@@ -625,9 +592,8 @@ static int snd_mts64_ctl_smpte_fps_get(struct snd_kcontrol *kctl,</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	uctl-&gt;value.enumerated.item[0] = mts-&gt;fps;</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -636,21 +602,19 @@ static int snd_mts64_ctl_smpte_fps_put(struct snd_kcontrol *kctl,</div><div class='ctx'> 				       struct snd_ctl_elem_value *uctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = snd_kcontrol_chip(kctl);</div><div class='del'>-	int changed = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (uctl-&gt;value.enumerated.item[0] &gt;= 5)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irq(&amp;mts-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;mts-&gt;lock);</div><div class='ctx'> 	if (mts-&gt;fps != uctl-&gt;value.enumerated.item[0]) {</div><div class='del'>-		changed = 1;</div><div class='ctx'> 		mts-&gt;fps = uctl-&gt;value.enumerated.item[0];</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;mts-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return changed;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mts64_ctl_smpte_fps __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new mts64_ctl_smpte_fps = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_RAWMIDI,</div><div class='ctx'> 	.name  = "SMPTE Fps",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -662,11 +626,11 @@ static struct snd_kcontrol_new mts64_ctl_smpte_fps __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mts64_ctl_create(struct snd_card *card, </div><div class='del'>-					  struct mts64 *mts) </div><div class='add'>+static int snd_mts64_ctl_create(struct snd_card *card,</div><div class='add'>+				struct mts64 *mts)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='del'>-	static struct snd_kcontrol_new *control[] __devinitdata = {</div><div class='add'>+	static const struct snd_kcontrol_new *control[] = {</div><div class='ctx'> 		&amp;mts64_ctl_smpte_switch,</div><div class='ctx'> 		&amp;mts64_ctl_smpte_time_hours,</div><div class='ctx'> 		&amp;mts64_ctl_smpte_time_minutes,</div><div class='hunk'>@@ -678,8 +642,8 @@ static int __devinit snd_mts64_ctl_create(struct snd_card *card,</div><div class='ctx'> 	for (i = 0; control[i]; ++i) {</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(control[i], mts));</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printd("Cannot create control: %s\n", </div><div class='del'>-				   control[i]-&gt;name);</div><div class='add'>+			dev_dbg(card-&gt;dev, "Cannot create control: %s\n",</div><div class='add'>+				control[i]-&gt;name);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -712,15 +676,14 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	--(mts-&gt;open_count);</div><div class='ctx'> 	if (mts-&gt;open_count == 0) {</div><div class='ctx'> 		/* We need the spinlock_irqsave here because we can still</div><div class='ctx'> 		   have IRQs at this point */</div><div class='del'>-		spin_lock_irqsave(&amp;mts-&gt;lock, flags);</div><div class='del'>-		mts64_device_close(mts);</div><div class='del'>-		spin_unlock_irqrestore(&amp;mts-&gt;lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;mts-&gt;lock) {</div><div class='add'>+			mts64_device_close(mts);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		msleep(500);</div><div class='ctx'> </div><div class='hunk'>@@ -735,45 +698,40 @@ static void snd_mts64_rawmidi_output_trigger(struct snd_rawmidi_substream *subst</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	u8 data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mts-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mts-&gt;lock);</div><div class='ctx'> 	while (snd_rawmidi_transmit_peek(substream, &amp;data, 1) == 1) {</div><div class='ctx'> 		mts64_write_midi(mts, data, substream-&gt;number+1);</div><div class='ctx'> 		snd_rawmidi_transmit_ack(substream, 1);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mts-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_mts64_rawmidi_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 					    int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mts-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mts-&gt;lock);</div><div class='ctx'> 	if (up)</div><div class='ctx'> 		mts-&gt;mode[substream-&gt;number] |= MTS64_MODE_INPUT_TRIGGERED;</div><div class='ctx'> 	else</div><div class='ctx'>  		mts-&gt;mode[substream-&gt;number] &amp;= ~MTS64_MODE_INPUT_TRIGGERED;</div><div class='del'>-	</div><div class='del'>-	spin_unlock_irqrestore(&amp;mts-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mts64_rawmidi_output_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_mts64_rawmidi_output_ops = {</div><div class='ctx'> 	.open    = snd_mts64_rawmidi_open,</div><div class='ctx'> 	.close   = snd_mts64_rawmidi_close,</div><div class='ctx'> 	.trigger = snd_mts64_rawmidi_output_trigger</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_mts64_rawmidi_input_ops = {</div><div class='ctx'> 	.open    = snd_mts64_rawmidi_open,</div><div class='ctx'> 	.close   = snd_mts64_rawmidi_close,</div><div class='ctx'> 	.trigger = snd_mts64_rawmidi_input_trigger</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Create and initialize the rawmidi component */</div><div class='del'>-static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)</div><div class='add'>+static int snd_mts64_rawmidi_create(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct mts64 *mts = card-&gt;private_data;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='hunk'>@@ -789,7 +747,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	rmidi-&gt;private_data = mts;</div><div class='del'>-	strcpy(rmidi-&gt;name, CARD_NAME);</div><div class='add'>+	strscpy(rmidi-&gt;name, CARD_NAME);</div><div class='ctx'> 	rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='ctx'> 		            SNDRV_RAWMIDI_INFO_INPUT |</div><div class='ctx'>                             SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='hunk'>@@ -817,7 +775,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)</div><div class='ctx'> 		mts-&gt;midi_input_substream[substream-&gt;number] = substream;</div><div class='ctx'> 		switch(substream-&gt;number) {</div><div class='ctx'> 		case MTS64_SMPTE_SUBSTREAM:</div><div class='del'>-			strcpy(substream-&gt;name, "Miditerminal SMPTE");</div><div class='add'>+			strscpy(substream-&gt;name, "Miditerminal SMPTE");</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			sprintf(substream-&gt;name,</div><div class='hunk'>@@ -841,7 +799,10 @@ static void snd_mts64_interrupt(void *private)</div><div class='ctx'> 	u8 status, data;</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;mts-&gt;lock);</div><div class='add'>+	if (!mts)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;mts-&gt;lock);</div><div class='ctx'> 	ret = mts64_read(mts-&gt;pardev-&gt;port);</div><div class='ctx'> 	data = ret &amp; 0x00ff;</div><div class='ctx'> 	status = ret &gt;&gt; 8;</div><div class='hunk'>@@ -850,40 +811,14 @@ static void snd_mts64_interrupt(void *private)</div><div class='ctx'> 		mts-&gt;current_midi_input_port = mts64_map_midi_input(data);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (mts-&gt;current_midi_input_port == -1) </div><div class='del'>-			goto __out;</div><div class='add'>+			return;</div><div class='ctx'> 		substream = mts-&gt;midi_input_substream[mts-&gt;current_midi_input_port];</div><div class='ctx'> 		if (mts-&gt;mode[substream-&gt;number] &amp; MTS64_MODE_INPUT_TRIGGERED)</div><div class='ctx'> 			snd_rawmidi_receive(substream, &amp;data, 1);</div><div class='ctx'> 	}</div><div class='del'>-__out:</div><div class='del'>-	spin_unlock(&amp;mts-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_mts64_probe_port(struct parport *p)</div><div class='del'>-{</div><div class='del'>-	struct pardevice *pardev;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	pardev = parport_register_device(p, DRIVER_NAME,</div><div class='del'>-					 NULL, NULL, NULL,</div><div class='del'>-					 0, NULL);</div><div class='del'>-	if (!pardev)</div><div class='del'>-		return -EIO;</div><div class='del'>-	</div><div class='del'>-	if (parport_claim(pardev)) {</div><div class='del'>-		parport_unregister_device(pardev);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = mts64_probe(p);</div><div class='del'>-</div><div class='del'>-	parport_release(pardev);</div><div class='del'>-	parport_unregister_device(pardev);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_mts64_attach(struct parport *p)</div><div class='add'>+static void snd_mts64_attach(struct parport *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *device;</div><div class='ctx'> </div><div class='hunk'>@@ -916,10 +851,19 @@ static void snd_mts64_detach(struct parport *p)</div><div class='ctx'> 	/* nothing to do here */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_mts64_dev_probe(struct pardevice *pardev)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(pardev-&gt;name, DRIVER_NAME))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct parport_driver mts64_parport_driver = {</div><div class='del'>-	.name   = "mts64",</div><div class='del'>-	.attach = snd_mts64_attach,</div><div class='del'>-	.detach = snd_mts64_detach</div><div class='add'>+	.name		= "mts64",</div><div class='add'>+	.probe		= snd_mts64_dev_probe,</div><div class='add'>+	.match_port	= snd_mts64_attach,</div><div class='add'>+	.detach		= snd_mts64_detach,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************</div><div class='hunk'>@@ -931,15 +875,14 @@ static void snd_mts64_card_private_free(struct snd_card *card)</div><div class='ctx'> 	struct pardevice *pardev = mts-&gt;pardev;</div><div class='ctx'> </div><div class='ctx'> 	if (pardev) {</div><div class='del'>-		if (mts-&gt;pardev_claimed)</div><div class='del'>-			parport_release(pardev);</div><div class='add'>+		parport_release(pardev);</div><div class='ctx'> 		parport_unregister_device(pardev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_mts64_free(mts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_mts64_probe(struct platform_device *pdev)</div><div class='add'>+static int snd_mts64_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pardevice *pardev;</div><div class='ctx'> 	struct parport *p;</div><div class='hunk'>@@ -947,6 +890,12 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct snd_card *card = NULL;</div><div class='ctx'> 	struct mts64 *mts = NULL;</div><div class='ctx'> 	int err;</div><div class='add'>+	struct pardev_cb mts64_cb = {</div><div class='add'>+		.preempt = NULL,</div><div class='add'>+		.wakeup = NULL,</div><div class='add'>+		.irq_func = snd_mts64_interrupt,	/* ISR */</div><div class='add'>+		.flags = PARPORT_DEV_EXCL,		/* flags */</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	p = platform_get_drvdata(pdev);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='hunk'>@@ -955,91 +904,95 @@ static int __devinit snd_mts64_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	if (!enable[dev]) </div><div class='ctx'> 		return -ENOENT;</div><div class='del'>-	if ((err = snd_mts64_probe_port(p)) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+			   0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("Cannot create card\n");</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "Cannot create card\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;driver, DRIVER_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, "ESI " CARD_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DRIVER_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, "ESI " CARD_NAME);</div><div class='ctx'> 	sprintf(card-&gt;longname,  "%s at 0x%lx, irq %i", </div><div class='ctx'> 		card-&gt;shortname, p-&gt;base, p-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	pardev = parport_register_device(p,                   /* port */</div><div class='del'>-					 DRIVER_NAME,         /* name */</div><div class='del'>-					 NULL,                /* preempt */</div><div class='del'>-					 NULL,                /* wakeup */</div><div class='del'>-					 snd_mts64_interrupt, /* ISR */</div><div class='del'>-					 PARPORT_DEV_EXCL,    /* flags */</div><div class='del'>-					 (void *)card);       /* private */</div><div class='del'>-	if (pardev == NULL) {</div><div class='del'>-		snd_printd("Cannot register pardevice\n");</div><div class='add'>+	mts64_cb.private = card;			 /* private */</div><div class='add'>+	pardev = parport_register_dev_model(p,		 /* port */</div><div class='add'>+					    DRIVER_NAME, /* name */</div><div class='add'>+					    &amp;mts64_cb,	 /* callbacks */</div><div class='add'>+					    pdev-&gt;id);	 /* device number */</div><div class='add'>+	if (!pardev) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot register pardevice\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_mts64_create(card, pardev, &amp;mts)) &lt; 0) {</div><div class='del'>-		snd_printd("Cannot create main component\n");</div><div class='del'>-		parport_unregister_device(pardev);</div><div class='del'>-		goto __err;</div><div class='add'>+	/* claim parport */</div><div class='add'>+	if (parport_claim(pardev)) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot claim parport 0x%lx\n", pardev-&gt;port-&gt;base);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto free_pardev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_mts64_create(card, pardev, &amp;mts);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot create main component\n");</div><div class='add'>+		goto release_pardev;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;private_data = mts;</div><div class='ctx'> 	card-&gt;private_free = snd_mts64_card_private_free;</div><div class='del'>-	</div><div class='del'>-	if ((err = snd_mts64_rawmidi_create(card)) &lt; 0) {</div><div class='del'>-		snd_printd("Creating Rawmidi component failed\n");</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* claim parport */</div><div class='del'>-	if (parport_claim(pardev)) {</div><div class='del'>-		snd_printd("Cannot claim parport 0x%lx\n", pardev-&gt;port-&gt;base);</div><div class='add'>+	err = mts64_probe(p);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='del'>-	mts-&gt;pardev_claimed = 1;</div><div class='add'>+	</div><div class='add'>+	err = snd_mts64_rawmidi_create(card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Creating Rawmidi component failed\n");</div><div class='add'>+		goto __err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* init device */</div><div class='del'>-	if ((err = mts64_device_init(p)) &lt; 0)</div><div class='add'>+	err = mts64_device_init(p);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __err;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, card);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	/* At this point card will be usable */</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_printd("Cannot register card\n");</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot register card\n");</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "ESI Miditerminal 4140 on 0x%lx\n", p-&gt;base);</div><div class='add'>+	dev_info(card-&gt;dev, "ESI Miditerminal 4140 on 0x%lx\n", p-&gt;base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+release_pardev:</div><div class='add'>+	parport_release(pardev);</div><div class='add'>+free_pardev:</div><div class='add'>+	parport_unregister_device(pardev);</div><div class='ctx'> __err:</div><div class='ctx'> 	snd_card_free(card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_mts64_remove(struct platform_device *pdev)</div><div class='add'>+static void snd_mts64_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (card)</div><div class='ctx'> 		snd_card_free(card);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static struct platform_driver snd_mts64_driver = {</div><div class='ctx'> 	.probe  = snd_mts64_probe,</div><div class='del'>-	.remove = __devexit_p(snd_mts64_remove),</div><div class='add'>+	.remove = snd_mts64_remove,</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.name = PLATFORM_DRIVER</div><div class='add'>+		.name = PLATFORM_DRIVER,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1064,7 +1017,8 @@ static int __init snd_mts64_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_mts64_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_mts64_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (parport_register_driver(&amp;mts64_parport_driver) != 0) {</div><div class='head'>diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile<br/>index 7f2c2a10c4e5..cf4826308365 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/Makefile</a></div><div class='hunk'>@@ -1,11 +1,14 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-opl3-lib-objs := opl3_lib.o opl3_synth.o</div><div class='add'>+snd-opl3-lib-y := opl3_lib.o opl3_synth.o</div><div class='ctx'> snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o</div><div class='del'>-snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o</div><div class='add'>+ifneq ($(CONFIG_SND_SEQUENCER_OSS),)</div><div class='add'>+snd-opl3-synth-y += opl3_oss.o</div><div class='add'>+endif</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o</div><div class='ctx'> obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_drums.c b/sound/drivers/opl3/opl3_drums.c<br/>index 73694380734a..ccc49f39404d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_drums.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_drums.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_drums.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_drums.c</a></div><div class='hunk'>@@ -1,29 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *   OPL2/OPL3/OPL4 FM routines for internal percussion channels</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "opl3_voice.h"</div><div class='ctx'> </div><div class='del'>-extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];</div><div class='del'>-</div><div class='del'>-static char snd_opl3_drum_table[47] =</div><div class='add'>+static const char snd_opl3_drum_table[47] =</div><div class='ctx'> {</div><div class='ctx'> 	OPL3_BASSDRUM_ON,  OPL3_BASSDRUM_ON,  OPL3_HIHAT_ON,	/* 35 - 37 */</div><div class='ctx'> 	OPL3_SNAREDRUM_ON, OPL3_HIHAT_ON,     OPL3_SNAREDRUM_ON, /* 38 - 40 */</div><div class='hunk'>@@ -63,25 +47,25 @@ struct snd_opl3_drum_note {</div><div class='ctx'> 	unsigned char feedback_connection;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_opl3_drum_voice bass_op0 = {6, 0, 0x00, 0x32, 0xf8, 0x66, 0x30, 0x00};</div><div class='del'>-static struct snd_opl3_drum_voice bass_op1 = {6, 1, 0x00, 0x03, 0xf6, 0x57, 0x30, 0x00};</div><div class='del'>-static struct snd_opl3_drum_note bass_note = {6, 0x90, 0x09};</div><div class='add'>+static const struct snd_opl3_drum_voice bass_op0 = {6, 0, 0x00, 0x32, 0xf8, 0x66, 0x30, 0x00};</div><div class='add'>+static const struct snd_opl3_drum_voice bass_op1 = {6, 1, 0x00, 0x03, 0xf6, 0x57, 0x30, 0x00};</div><div class='add'>+static const struct snd_opl3_drum_note bass_note = {6, 0x90, 0x09};</div><div class='ctx'> </div><div class='del'>-static struct snd_opl3_drum_voice hihat = {7, 0, 0x00, 0x03, 0xf0, 0x06, 0x20, 0x00};</div><div class='add'>+static const struct snd_opl3_drum_voice hihat = {7, 0, 0x00, 0x03, 0xf0, 0x06, 0x20, 0x00};</div><div class='ctx'> </div><div class='del'>-static struct snd_opl3_drum_voice snare = {7, 1, 0x00, 0x03, 0xf0, 0x07, 0x20, 0x02};</div><div class='del'>-static struct snd_opl3_drum_note snare_note = {7, 0xf4, 0x0d};</div><div class='add'>+static const struct snd_opl3_drum_voice snare = {7, 1, 0x00, 0x03, 0xf0, 0x07, 0x20, 0x02};</div><div class='add'>+static const struct snd_opl3_drum_note snare_note = {7, 0xf4, 0x0d};</div><div class='ctx'> </div><div class='del'>-static struct snd_opl3_drum_voice tomtom = {8, 0, 0x02, 0x03, 0xf0, 0x06, 0x10, 0x00};</div><div class='del'>-static struct snd_opl3_drum_note tomtom_note = {8, 0xf4, 0x09};</div><div class='add'>+static const struct snd_opl3_drum_voice tomtom = {8, 0, 0x02, 0x03, 0xf0, 0x06, 0x10, 0x00};</div><div class='add'>+static const struct snd_opl3_drum_note tomtom_note = {8, 0xf4, 0x09};</div><div class='ctx'> </div><div class='del'>-static struct snd_opl3_drum_voice cymbal = {8, 1, 0x04, 0x03, 0xf0, 0x06, 0x10, 0x00};</div><div class='add'>+static const struct snd_opl3_drum_voice cymbal = {8, 1, 0x04, 0x03, 0xf0, 0x06, 0x10, 0x00};</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * set drum voice characteristics</div><div class='ctx'>  */</div><div class='ctx'> static void snd_opl3_drum_voice_set(struct snd_opl3 *opl3,</div><div class='del'>-				    struct snd_opl3_drum_voice *data)</div><div class='add'>+				    const struct snd_opl3_drum_voice *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char op_offset = snd_opl3_regmap[data-&gt;voice][data-&gt;op];</div><div class='ctx'> 	unsigned char voice_offset = data-&gt;voice;</div><div class='hunk'>@@ -116,7 +100,7 @@ static void snd_opl3_drum_voice_set(struct snd_opl3 *opl3,</div><div class='ctx'>  * Set drum voice pitch</div><div class='ctx'>  */</div><div class='ctx'> static void snd_opl3_drum_note_set(struct snd_opl3 *opl3,</div><div class='del'>-				   struct snd_opl3_drum_note *data)</div><div class='add'>+				   const struct snd_opl3_drum_note *data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char voice_offset = data-&gt;voice;</div><div class='ctx'> 	unsigned short opl3_reg;</div><div class='hunk'>@@ -134,7 +118,7 @@ static void snd_opl3_drum_note_set(struct snd_opl3 *opl3,</div><div class='ctx'>  * Set drum voice volume and position</div><div class='ctx'>  */</div><div class='ctx'> static void snd_opl3_drum_vol_set(struct snd_opl3 *opl3,</div><div class='del'>-				  struct snd_opl3_drum_voice *data,</div><div class='add'>+				  const struct snd_opl3_drum_voice *data,</div><div class='ctx'> 				  int vel, struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char op_offset = snd_opl3_regmap[data-&gt;voice][data-&gt;op];</div><div class='hunk'>@@ -186,7 +170,7 @@ void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off,</div><div class='ctx'> 			  struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char drum_mask;</div><div class='del'>-	struct snd_opl3_drum_voice *drum_voice;</div><div class='add'>+	const struct snd_opl3_drum_voice *drum_voice;</div><div class='ctx'> </div><div class='ctx'> 	if (!(opl3-&gt;drum_reg &amp; OPL3_PERCUSSION_ENABLE))</div><div class='ctx'> 		return;</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c<br/>index 6e31e46ca393..fa8a2ccbbd51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='ctx'>  *                   Hannu Savolainen 1993-1996,</div><div class='hunk'>@@ -6,40 +7,24 @@</div><div class='ctx'>  *  Routines for control of AdLib FM cards (OPL2/OPL3/OPL4 chips)</div><div class='ctx'>  *</div><div class='ctx'>  *  Most if code is ported from OSS/Lite.</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;sound/minors.h&gt;</div><div class='add'>+#include "opl3_voice.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;, Hannu Savolainen 1993-1996, Rob Hooft");</div><div class='ctx'> MODULE_DESCRIPTION("Routines for control of AdLib FM cards (OPL2/OPL3/OPL4 chips)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];</div><div class='del'>-</div><div class='ctx'> static void snd_opl2_command(struct snd_opl3 * opl3, unsigned short cmd, unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned long port;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -49,20 +34,17 @@ static void snd_opl2_command(struct snd_opl3 * opl3, unsigned short cmd, unsigne</div><div class='ctx'> </div><div class='ctx'> 	port = (cmd &amp; OPL3_RIGHT) ? opl3-&gt;r_port : opl3-&gt;l_port;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	outb((unsigned char) cmd, port);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	outb((unsigned char) val, port + 1);</div><div class='ctx'> 	udelay(30);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opl3_command(struct snd_opl3 * opl3, unsigned short cmd, unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned long port;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -72,7 +54,7 @@ static void snd_opl3_command(struct snd_opl3 * opl3, unsigned short cmd, unsigne</div><div class='ctx'> </div><div class='ctx'> 	port = (cmd &amp; OPL3_RIGHT) ? opl3-&gt;r_port : opl3-&gt;l_port;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	outb((unsigned char) cmd, port);</div><div class='ctx'> 	inb(opl3-&gt;l_port);</div><div class='hunk'>@@ -81,8 +63,6 @@ static void snd_opl3_command(struct snd_opl3 * opl3, unsigned short cmd, unsigne</div><div class='ctx'> 	outb((unsigned char) val, port + 1);</div><div class='ctx'> 	inb(opl3-&gt;l_port);</div><div class='ctx'> 	inb(opl3-&gt;l_port);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_detect(struct snd_opl3 * opl3)</div><div class='hunk'>@@ -106,7 +86,7 @@ static int snd_opl3_detect(struct snd_opl3 * opl3)</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, OPL3_IRQ_RESET);</div><div class='ctx'> 	signature = stat1 = inb(opl3-&gt;l_port);	/* Status register */</div><div class='ctx'> 	if ((stat1 &amp; 0xe0) != 0x00) {	/* Should be 0x00 */</div><div class='del'>-		snd_printd("OPL3: stat1 = 0x%x\n", stat1);</div><div class='add'>+		dev_dbg(opl3-&gt;card-&gt;dev, "OPL3: stat1 = 0x%x\n", stat1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Set timer1 to 0xff */</div><div class='hunk'>@@ -122,7 +102,7 @@ static int snd_opl3_detect(struct snd_opl3 * opl3)</div><div class='ctx'> 	/* Reset the IRQ of the FM chip */</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, OPL3_IRQ_RESET);</div><div class='ctx'> 	if ((stat2 &amp; 0xe0) != 0xc0) {	/* There is no YM3812 */</div><div class='del'>-		snd_printd("OPL3: stat2 = 0x%x\n", stat2);</div><div class='add'>+		dev_dbg(opl3-&gt;card-&gt;dev, "OPL3: stat2 = 0x%x\n", stat2);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -156,34 +136,30 @@ static int snd_opl3_detect(struct snd_opl3 * opl3)</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_timer1_start(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	unsigned int ticks;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;timer_lock);</div><div class='ctx'> 	ticks = timer-&gt;sticks;</div><div class='ctx'> 	tmp = (opl3-&gt;timer_enable | OPL3_TIMER1_START) &amp; ~OPL3_TIMER1_MASK;</div><div class='ctx'> 	opl3-&gt;timer_enable = tmp;</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER1, 256 - ticks);	/* timer 1 count */</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, tmp);	/* enable timer 1 IRQ */</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;timer_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_timer1_stop(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;timer_lock);</div><div class='ctx'> 	tmp = (opl3-&gt;timer_enable | OPL3_TIMER1_MASK) &amp; ~OPL3_TIMER1_START;</div><div class='ctx'> 	opl3-&gt;timer_enable = tmp;</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, tmp);	/* disable timer #1 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;timer_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,34 +169,30 @@ static int snd_opl3_timer1_stop(struct snd_timer * timer)</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_timer2_start(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	unsigned int ticks;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;timer_lock);</div><div class='ctx'> 	ticks = timer-&gt;sticks;</div><div class='ctx'> 	tmp = (opl3-&gt;timer_enable | OPL3_TIMER2_START) &amp; ~OPL3_TIMER2_MASK;</div><div class='ctx'> 	opl3-&gt;timer_enable = tmp;</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER2, 256 - ticks);	/* timer 1 count */</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, tmp);	/* enable timer 1 IRQ */</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;timer_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_timer2_stop(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;timer_lock);</div><div class='ctx'> 	tmp = (opl3-&gt;timer_enable | OPL3_TIMER2_MASK) &amp; ~OPL3_TIMER2_START;</div><div class='ctx'> 	opl3-&gt;timer_enable = tmp;</div><div class='ctx'> 	opl3-&gt;command(opl3, OPL3_LEFT | OPL3_REG_TIMER_CONTROL, tmp);	/* disable timer #1 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;timer_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,7 +200,7 @@ static int snd_opl3_timer2_stop(struct snd_timer * timer)</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_opl3_timer1 =</div><div class='add'>+static const struct snd_timer_hardware snd_opl3_timer1 =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_STOP,</div><div class='ctx'> 	.resolution =	80000,</div><div class='hunk'>@@ -237,7 +209,7 @@ static struct snd_timer_hardware snd_opl3_timer1 =</div><div class='ctx'> 	.stop =		snd_opl3_timer1_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_opl3_timer2 =</div><div class='add'>+static const struct snd_timer_hardware snd_opl3_timer2 =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_STOP,</div><div class='ctx'> 	.resolution =	320000,</div><div class='hunk'>@@ -257,8 +229,9 @@ static int snd_opl3_timer1_init(struct snd_opl3 * opl3, int timer_no)</div><div class='ctx'> 	tid.card = opl3-&gt;card-&gt;number;</div><div class='ctx'> 	tid.device = timer_no;</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='del'>-	if ((err = snd_timer_new(opl3-&gt;card, "AdLib timer #1", &amp;tid, &amp;timer)) &gt;= 0) {</div><div class='del'>-		strcpy(timer-&gt;name, "AdLib timer #1");</div><div class='add'>+	err = snd_timer_new(opl3-&gt;card, "AdLib timer #1", &amp;tid, &amp;timer);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		strscpy(timer-&gt;name, "AdLib timer #1");</div><div class='ctx'> 		timer-&gt;private_data = opl3;</div><div class='ctx'> 		timer-&gt;hw = snd_opl3_timer1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -277,8 +250,9 @@ static int snd_opl3_timer2_init(struct snd_opl3 * opl3, int timer_no)</div><div class='ctx'> 	tid.card = opl3-&gt;card-&gt;number;</div><div class='ctx'> 	tid.device = timer_no;</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='del'>-	if ((err = snd_timer_new(opl3-&gt;card, "AdLib timer #2", &amp;tid, &amp;timer)) &gt;= 0) {</div><div class='del'>-		strcpy(timer-&gt;name, "AdLib timer #2");</div><div class='add'>+	err = snd_timer_new(opl3-&gt;card, "AdLib timer #2", &amp;tid, &amp;timer);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		strscpy(timer-&gt;name, "AdLib timer #2");</div><div class='ctx'> 		timer-&gt;private_data = opl3;</div><div class='ctx'> 		timer-&gt;hw = snd_opl3_timer2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -301,9 +275,6 @@ void snd_opl3_interrupt(struct snd_hwdep * hw)</div><div class='ctx'> </div><div class='ctx'> 	opl3 = hw-&gt;private_data;</div><div class='ctx'> 	status = inb(opl3-&gt;l_port);</div><div class='del'>-#if 0</div><div class='del'>-	snd_printk(KERN_DEBUG "AdLib IRQ status = 0x%x\n", status);</div><div class='del'>-#endif</div><div class='ctx'> 	if (!(status &amp; 0x80))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -346,7 +317,7 @@ int snd_opl3_new(struct snd_card *card,</div><div class='ctx'> 		 unsigned short hardware,</div><div class='ctx'> 		 struct snd_opl3 **ropl3)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_opl3_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='hunk'>@@ -354,17 +325,16 @@ int snd_opl3_new(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	*ropl3 = NULL;</div><div class='ctx'> 	opl3 = kzalloc(sizeof(*opl3), GFP_KERNEL);</div><div class='del'>-	if (opl3 == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "opl3: cannot allocate\n");</div><div class='add'>+	if (!opl3)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	opl3-&gt;card = card;</div><div class='ctx'> 	opl3-&gt;hardware = hardware;</div><div class='ctx'> 	spin_lock_init(&amp;opl3-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;opl3-&gt;timer_lock);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &amp;ops)) &lt; 0) {</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_opl3_free(opl3);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -378,7 +348,8 @@ EXPORT_SYMBOL(snd_opl3_new);</div><div class='ctx'> int snd_opl3_init(struct snd_opl3 *opl3)</div><div class='ctx'> {</div><div class='ctx'> 	if (! opl3-&gt;command) {</div><div class='del'>-		printk(KERN_ERR "snd_opl3_init: command not defined!\n");</div><div class='add'>+		dev_err(opl3-&gt;card-&gt;dev,</div><div class='add'>+			"snd_opl3_init: command not defined!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -412,19 +383,23 @@ int snd_opl3_create(struct snd_card *card,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	*ropl3 = NULL;</div><div class='del'>-	if ((err = snd_opl3_new(card, hardware, &amp;opl3)) &lt; 0)</div><div class='add'>+	err = snd_opl3_new(card, hardware, &amp;opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (! integrated) {</div><div class='del'>-		if ((opl3-&gt;res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);</div><div class='add'>+		opl3-&gt;res_l_port = request_region(l_port, 2, "OPL2/3 (left)");</div><div class='add'>+		if (!opl3-&gt;res_l_port) {</div><div class='add'>+			dev_err(card-&gt;dev, "opl3: can't grab left port 0x%lx\n", l_port);</div><div class='ctx'> 			snd_device_free(card, opl3);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='del'>-		if (r_port != 0 &amp;&amp;</div><div class='del'>-		    (opl3-&gt;res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);</div><div class='del'>-			snd_device_free(card, opl3);</div><div class='del'>-			return -EBUSY;</div><div class='add'>+		if (r_port != 0) {</div><div class='add'>+			opl3-&gt;res_r_port = request_region(r_port, 2, "OPL2/3 (right)");</div><div class='add'>+			if (!opl3-&gt;res_r_port) {</div><div class='add'>+				dev_err(card-&gt;dev, "opl3: can't grab right port 0x%lx\n", r_port);</div><div class='add'>+				snd_device_free(card, opl3);</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	opl3-&gt;l_port = l_port;</div><div class='hunk'>@@ -439,9 +414,10 @@ int snd_opl3_create(struct snd_card *card,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		opl3-&gt;command = &amp;snd_opl2_command;</div><div class='del'>-		if ((err = snd_opl3_detect(opl3)) &lt; 0) {</div><div class='del'>-			snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",</div><div class='del'>-				   opl3-&gt;l_port, opl3-&gt;r_port);</div><div class='add'>+		err = snd_opl3_detect(opl3);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_dbg(card-&gt;dev, "OPL2/3 chip not detected at 0x%lx/0x%lx\n",</div><div class='add'>+				opl3-&gt;l_port, opl3-&gt;r_port);</div><div class='ctx'> 			snd_device_free(card, opl3);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -465,11 +441,14 @@ int snd_opl3_timer_new(struct snd_opl3 * opl3, int timer1_dev, int timer2_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (timer1_dev &gt;= 0)</div><div class='del'>-		if ((err = snd_opl3_timer1_init(opl3, timer1_dev)) &lt; 0)</div><div class='add'>+	if (timer1_dev &gt;= 0) {</div><div class='add'>+		err = snd_opl3_timer1_init(opl3, timer1_dev);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> 	if (timer2_dev &gt;= 0) {</div><div class='del'>-		if ((err = snd_opl3_timer2_init(opl3, timer2_dev)) &lt; 0) {</div><div class='add'>+		err = snd_opl3_timer2_init(opl3, timer2_dev);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			snd_device_free(opl3-&gt;card, opl3-&gt;timer1);</div><div class='ctx'> 			opl3-&gt;timer1 = NULL;</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -493,30 +472,29 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,</div><div class='ctx'> </div><div class='ctx'> 	/* create hardware dependent device (direct FM) */</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_hwdep_new(card, "OPL2/OPL3", device, &amp;hw)) &lt; 0) {</div><div class='add'>+	err = snd_hwdep_new(card, "OPL2/OPL3", device, &amp;hw);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_device_free(card, opl3);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	hw-&gt;private_data = opl3;</div><div class='ctx'> 	hw-&gt;exclusive = 1;</div><div class='ctx'> #ifdef CONFIG_SND_OSSEMUL</div><div class='del'>-	if (device == 0) {</div><div class='add'>+	if (device == 0)</div><div class='ctx'> 		hw-&gt;oss_type = SNDRV_OSS_DEVICE_TYPE_DMFM;</div><div class='del'>-		sprintf(hw-&gt;oss_dev, "dmfm%i", card-&gt;number);</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='del'>-	strcpy(hw-&gt;name, hw-&gt;id);</div><div class='add'>+	strscpy(hw-&gt;name, hw-&gt;id);</div><div class='ctx'> 	switch (opl3-&gt;hardware &amp; OPL3_HW_MASK) {</div><div class='ctx'> 	case OPL3_HW_OPL2:</div><div class='del'>-		strcpy(hw-&gt;name, "OPL2 FM");</div><div class='add'>+		strscpy(hw-&gt;name, "OPL2 FM");</div><div class='ctx'> 		hw-&gt;iface = SNDRV_HWDEP_IFACE_OPL2;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPL3_HW_OPL3:</div><div class='del'>-		strcpy(hw-&gt;name, "OPL3 FM");</div><div class='add'>+		strscpy(hw-&gt;name, "OPL3 FM");</div><div class='ctx'> 		hw-&gt;iface = SNDRV_HWDEP_IFACE_OPL3;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPL3_HW_OPL4:</div><div class='del'>-		strcpy(hw-&gt;name, "OPL4 FM");</div><div class='add'>+		strscpy(hw-&gt;name, "OPL4 FM");</div><div class='ctx'> 		hw-&gt;iface = SNDRV_HWDEP_IFACE_OPL4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -529,10 +507,10 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,</div><div class='ctx'> </div><div class='ctx'> 	opl3-&gt;hwdep = hw;</div><div class='ctx'> 	opl3-&gt;seq_dev_num = seq_device;</div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> 	if (snd_seq_device_new(card, seq_device, SNDRV_SEQ_DEV_ID_OPL3,</div><div class='ctx'> 			       sizeof(struct snd_opl3 *), &amp;opl3-&gt;seq_dev) &gt;= 0) {</div><div class='del'>-		strcpy(opl3-&gt;seq_dev-&gt;name, hw-&gt;name);</div><div class='add'>+		strscpy(opl3-&gt;seq_dev-&gt;name, hw-&gt;name);</div><div class='ctx'> 		*(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(opl3-&gt;seq_dev) = opl3;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -542,19 +520,3 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_opl3_hwdep_new);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_opl3_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_opl3_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_opl3_init)</div><div class='del'>-module_exit(alsa_opl3_exit)</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c<br/>index 7d722a025d0d..6d3c5b5a35ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_midi.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Midi synth routines for OPL2/OPL3/OPL4 FM</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG_ALLOC</div><div class='hunk'>@@ -25,9 +11,12 @@</div><div class='ctx'> #include "opl3_voice.h"</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> </div><div class='del'>-extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];</div><div class='del'>-</div><div class='del'>-extern int use_internal_drums;</div><div class='add'>+#ifdef DEBUG_MIDI</div><div class='add'>+#define opl3_dbg(opl3, fmt, ...) \</div><div class='add'>+	dev_dbg(((struct snd_opl3 *)(opl3))-&gt;card-&gt;dev, fmt, ##__VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define opl3_dbg(opl3, fmt, ...) do {} while (0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void snd_opl3_note_off_unsafe(void *p, int note, int vel,</div><div class='ctx'> 				     struct snd_midi_channel *chan);</div><div class='hunk'>@@ -41,7 +30,7 @@ static void snd_opl3_note_off_unsafe(void *p, int note, int vel,</div><div class='ctx'>  * it saves a lot of log() calculations. (Rob Hooft &lt;hooft@chem.ruu.nl&gt;)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static char opl3_volume_table[128] =</div><div class='add'>+static const char opl3_volume_table[128] =</div><div class='ctx'> {</div><div class='ctx'> 	-63, -48, -40, -35, -32, -29, -27, -26,</div><div class='ctx'> 	-24, -23, -21, -20, -19, -18, -18, -17,</div><div class='hunk'>@@ -87,7 +76,7 @@ void snd_opl3_calc_volume(unsigned char *volbyte, int vel,</div><div class='ctx'> /*</div><div class='ctx'>  * Converts the note frequency to block and fnum values for the FM chip</div><div class='ctx'>  */</div><div class='del'>-static short opl3_note_table[16] =</div><div class='add'>+static const short opl3_note_table[16] =</div><div class='ctx'> {</div><div class='ctx'> 	305, 323,	/* for pitch bending, -2 semitones */</div><div class='ctx'> 	343, 363, 385, 408, 432, 458, 485, 514, 544, 577, 611, 647,</div><div class='hunk'>@@ -105,6 +94,8 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum,</div><div class='ctx'> 		int pitchbend = chan-&gt;midi_pitchbend;</div><div class='ctx'> 		int segment;</div><div class='ctx'> </div><div class='add'>+		if (pitchbend &lt; -0x2000)</div><div class='add'>+			pitchbend = -0x2000;</div><div class='ctx'> 		if (pitchbend &gt; 0x1FFF)</div><div class='ctx'> 			pitchbend = 0x1FFF;</div><div class='ctx'> </div><div class='hunk'>@@ -123,14 +114,17 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG_ALLOC</div><div class='del'>-static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice) {</div><div class='add'>+static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice)</div><div class='add'>+{</div><div class='ctx'> 	int i;</div><div class='del'>-	char *str = "x.24";</div><div class='add'>+	const char *str = "x.24";</div><div class='add'>+	char buf[MAX_OPL3_VOICES + 1];</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3-&gt;use_time, s, voice);</div><div class='ctx'> 	for (i = 0; i &lt; opl3-&gt;max_voices; i++)</div><div class='del'>-		printk("%c", *(str + opl3-&gt;voices[i].state + 1));</div><div class='del'>-	printk("\n");</div><div class='add'>+		buf[i] = str[opl3-&gt;voices[i].state + 1];</div><div class='add'>+	buf[i] = 0;</div><div class='add'>+	dev_dbg(opl3-&gt;card-&gt;dev, "time %.5i: %s [%.2i]: %s\n",</div><div class='add'>+		opl3-&gt;use_time, s, voice, buf);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +157,7 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,</div><div class='ctx'> 	struct best *bp;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; END; i++) {</div><div class='del'>-		best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */;</div><div class='add'>+		best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */</div><div class='ctx'> 		best[i].voice = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -196,8 +190,7 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,</div><div class='ctx'> 			if (vp2-&gt;state == SNDRV_OPL3_ST_ON_2OP) {</div><div class='ctx'> 				/* kill two voices, EXPENSIVE */</div><div class='ctx'> 				bp++;</div><div class='del'>-				voice_time = (voice_time &gt; vp-&gt;time) ?</div><div class='del'>-					voice_time : vp-&gt;time;</div><div class='add'>+				voice_time = max(voice_time, vp2-&gt;time);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* allocate 2op voice */</div><div class='hunk'>@@ -220,9 +213,10 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,</div><div class='ctx'> 	for (i = 0; i &lt; END; i++) {</div><div class='ctx'> 		if (best[i].voice &gt;= 0) {</div><div class='ctx'> #ifdef DEBUG_ALLOC</div><div class='del'>-			printk(KERN_DEBUG "%s %iop allocation on voice %i\n",</div><div class='del'>-			       alloc_type[i], instr_4op ? 4 : 2,</div><div class='del'>-			       best[i].voice);</div><div class='add'>+			dev_dbg(opl3-&gt;card-&gt;dev,</div><div class='add'>+				"%s %iop allocation on voice %i\n",</div><div class='add'>+				alloc_type[i], instr_4op ? 4 : 2,</div><div class='add'>+				best[i].voice);</div><div class='ctx'> #endif</div><div class='ctx'> 			return best[i].voice;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -236,35 +230,31 @@ static int opl3_get_voice(struct snd_opl3 *opl3, int instr_4op,</div><div class='ctx'> /*</div><div class='ctx'>  * System timer interrupt function</div><div class='ctx'>  */</div><div class='del'>-void snd_opl3_timer_func(unsigned long data)</div><div class='add'>+void snd_opl3_timer_func(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	struct snd_opl3 *opl3 = (struct snd_opl3 *)data;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_opl3 *opl3 = timer_container_of(opl3, t, tlist);</div><div class='ctx'> 	int again = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;voice_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; opl3-&gt;max_voices; i++) {</div><div class='del'>-		struct snd_opl3_voice *vp = &amp;opl3-&gt;voices[i];</div><div class='del'>-		if (vp-&gt;state &gt; 0 &amp;&amp; vp-&gt;note_off_check) {</div><div class='del'>-			if (vp-&gt;note_off == jiffies)</div><div class='del'>-				snd_opl3_note_off_unsafe(opl3, vp-&gt;note, 0,</div><div class='del'>-							 vp-&gt;chan);</div><div class='del'>-			else</div><div class='del'>-				again++;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;opl3-&gt;voice_lock) {</div><div class='add'>+		for (i = 0; i &lt; opl3-&gt;max_voices; i++) {</div><div class='add'>+			struct snd_opl3_voice *vp = &amp;opl3-&gt;voices[i];</div><div class='add'>+			if (vp-&gt;state &gt; 0 &amp;&amp; vp-&gt;note_off_check) {</div><div class='add'>+				if (vp-&gt;note_off == jiffies)</div><div class='add'>+					snd_opl3_note_off_unsafe(opl3, vp-&gt;note, 0,</div><div class='add'>+								 vp-&gt;chan);</div><div class='add'>+				else</div><div class='add'>+					again++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='del'>-	if (again) {</div><div class='del'>-		opl3-&gt;tlist.expires = jiffies + 1;	/* invoke again */</div><div class='del'>-		add_timer(&amp;opl3-&gt;tlist);</div><div class='del'>-	} else {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;sys_timer_lock);</div><div class='add'>+	if (again)</div><div class='add'>+		mod_timer(&amp;opl3-&gt;tlist, jiffies + 1);	/* invoke again */</div><div class='add'>+	else</div><div class='ctx'> 		opl3-&gt;sys_timer_status = 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -272,20 +262,17 @@ void snd_opl3_timer_func(unsigned long data)</div><div class='ctx'>  */</div><div class='ctx'> static void snd_opl3_start_timer(struct snd_opl3 *opl3)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;sys_timer_lock);</div><div class='ctx'> 	if (! opl3-&gt;sys_timer_status) {</div><div class='del'>-		opl3-&gt;tlist.expires = jiffies + 1;</div><div class='del'>-		add_timer(&amp;opl3-&gt;tlist);</div><div class='add'>+		mod_timer(&amp;opl3-&gt;tlist, jiffies + 1);</div><div class='ctx'> 		opl3-&gt;sys_timer_status = 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------ */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int snd_opl3_oss_map[MAX_OPL3_VOICES] = {</div><div class='add'>+static const int snd_opl3_oss_map[MAX_OPL3_VOICES] = {</div><div class='ctx'> 	0, 1, 2, 9, 10, 11, 6, 7, 8, 15, 16, 17, 3, 4 ,5, 12, 13, 14</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -318,14 +305,11 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	struct fm_patch *patch;</div><div class='ctx'> 	struct fm_instrument *fm;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = p;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "Note on, ch %i, inst %i, note %i, vel %i\n",</div><div class='del'>-		   chan-&gt;number, chan-&gt;midi_program, note, vel);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "Note on, ch %i, inst %i, note %i, vel %i\n",</div><div class='add'>+		 chan-&gt;number, chan-&gt;midi_program, note, vel);</div><div class='ctx'> </div><div class='ctx'> 	/* in SYNTH mode, application takes care of voices */</div><div class='ctx'> 	/* in SEQ mode, drum voice numbers are notes on drum channel */</div><div class='hunk'>@@ -348,20 +332,17 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 		prg = chan-&gt;midi_program;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;voice_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;voice_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (use_internal_drums) {</div><div class='ctx'> 		snd_opl3_drum_switch(opl3, note, vel, 1, chan);</div><div class='del'>-		spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>  __extra_prg:</div><div class='ctx'> 	patch = snd_opl3_find_patch(opl3, prg, bank, 0);</div><div class='del'>-	if (!patch) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='add'>+	if (!patch)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	fm = &amp;patch-&gt;inst;</div><div class='ctx'> 	switch (patch-&gt;type) {</div><div class='hunk'>@@ -373,14 +354,12 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 			instr_4op = 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "  --&gt; OPL%i instrument: %s\n",</div><div class='del'>-		   instr_4op ? 3 : 2, patch-&gt;name);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "  --&gt; OPL%i instrument: %s\n",</div><div class='add'>+		 instr_4op ? 3 : 2, patch-&gt;name);</div><div class='ctx'> 	/* in SYNTH mode, application takes care of voices */</div><div class='ctx'> 	/* in SEQ mode, allocate voice on free OPL3 channel */</div><div class='ctx'> 	if (opl3-&gt;synth_mode == SNDRV_OPL3_MODE_SEQ) {</div><div class='hunk'>@@ -390,6 +369,9 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 		voice = snd_opl3_oss_map[chan-&gt;number];		</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (voice &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (voice &lt; MAX_OPL2_VOICES) {</div><div class='ctx'> 		/* Left register block for voices 0 .. 8 */</div><div class='ctx'> 		reg_side = OPL3_LEFT;</div><div class='hunk'>@@ -411,7 +393,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (instr_4op) {</div><div class='ctx'> 		vp2 = &amp;opl3-&gt;voices[voice + 3];</div><div class='del'>-		if (vp-&gt;state &gt; 0) {</div><div class='add'>+		if (vp2-&gt;state &gt; 0) {</div><div class='ctx'> 			opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK +</div><div class='ctx'> 					       voice_offset + 3);</div><div class='ctx'> 			reg_val = vp-&gt;keyon_reg &amp; ~OPL3_KEYON_BIT;</div><div class='hunk'>@@ -436,10 +418,8 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "  --&gt; setting OPL3 connection: 0x%x\n",</div><div class='del'>-		   opl3-&gt;connection_reg);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "  --&gt; setting OPL3 connection: 0x%x\n",</div><div class='add'>+		opl3-&gt;connection_reg);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * calculate volume depending on connection</div><div class='ctx'> 	 * between FM operators (see include/opl3.h)</div><div class='hunk'>@@ -456,7 +436,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 		switch (connection) {</div><div class='ctx'> 		case 0x03:</div><div class='ctx'> 			snd_opl3_calc_volume(&amp;vol_op[2], vel, chan);</div><div class='del'>-			/* fallthru */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 0x02:</div><div class='ctx'> 			snd_opl3_calc_volume(&amp;vol_op[0], vel, chan);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -471,9 +451,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> </div><div class='ctx'> 	/* Program the FM voice characteristics */</div><div class='ctx'> 	for (i = 0; i &lt; (instr_4op ? 4 : 2); i++) {</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-		snd_printk(KERN_DEBUG "  --&gt; programming operator %i\n", i);</div><div class='del'>-#endif</div><div class='add'>+		opl3_dbg(opl3, "  --&gt; programming operator %i\n", i);</div><div class='ctx'> 		op_offset = snd_opl3_regmap[voice_offset][i];</div><div class='ctx'> </div><div class='ctx'> 		/* Set OPL3 AM_VIB register of requested voice/operator */ </div><div class='hunk'>@@ -551,9 +529,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 	/* Set output sound flag */</div><div class='ctx'> 	blocknum |= OPL3_KEYON_BIT;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "  --&gt; trigger voice %i\n", voice);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "  --&gt; trigger voice %i\n", voice);</div><div class='ctx'> 	/* Set OPL3 KEYON_BLOCK register of requested voice */ </div><div class='ctx'> 	opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);</div><div class='ctx'> 	opl3-&gt;command(opl3, opl3_reg, blocknum);</div><div class='hunk'>@@ -607,12 +583,9 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> 			bank = 0;</div><div class='ctx'> 			prg = extra_prg - 1;</div><div class='ctx'> 		}</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-		snd_printk(KERN_DEBUG " *** allocating extra program\n");</div><div class='del'>-#endif</div><div class='add'>+		opl3_dbg(opl3, " *** allocating extra program\n");</div><div class='ctx'> 		goto __extra_prg;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)</div><div class='hunk'>@@ -638,9 +611,7 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* kill voice */</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "  --&gt; kill voice %i\n", voice);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "  --&gt; kill voice %i\n", voice);</div><div class='ctx'> 	opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK + voice_offset);</div><div class='ctx'> 	/* clear Key ON bit */</div><div class='ctx'> 	opl3-&gt;command(opl3, opl3_reg, vp-&gt;keyon_reg);</div><div class='hunk'>@@ -674,10 +645,8 @@ static void snd_opl3_note_off_unsafe(void *p, int note, int vel,</div><div class='ctx'> </div><div class='ctx'> 	opl3 = p;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "Note off, ch %i, inst %i, note %i\n",</div><div class='del'>-		   chan-&gt;number, chan-&gt;midi_program, note);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "Note off, ch %i, inst %i, note %i\n",</div><div class='add'>+		 chan-&gt;number, chan-&gt;midi_program, note);</div><div class='ctx'> </div><div class='ctx'> 	if (opl3-&gt;synth_mode == SNDRV_OPL3_MODE_SEQ) {</div><div class='ctx'> 		if (chan-&gt;drum_channel &amp;&amp; use_internal_drums) {</div><div class='hunk'>@@ -705,11 +674,9 @@ void snd_opl3_note_off(void *p, int note, int vel,</div><div class='ctx'> 		       struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3 *opl3 = p;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;voice_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;voice_lock);</div><div class='ctx'> 	snd_opl3_note_off_unsafe(p, note, vel, chan);</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -717,13 +684,8 @@ void snd_opl3_note_off(void *p, int note, int vel,</div><div class='ctx'>  */</div><div class='ctx'> void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='del'>-  	struct snd_opl3 *opl3;</div><div class='del'>-</div><div class='del'>-	opl3 = p;</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "Key pressure, ch#: %i, inst#: %i\n",</div><div class='del'>-		   chan-&gt;number, chan-&gt;midi_program);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(p, "Key pressure, ch#: %i, inst#: %i\n",</div><div class='add'>+		 chan-&gt;number, chan-&gt;midi_program);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -731,13 +693,8 @@ void snd_opl3_key_press(void *p, int note, int vel, struct snd_midi_channel *cha</div><div class='ctx'>  */</div><div class='ctx'> void snd_opl3_terminate_note(void *p, int note, struct snd_midi_channel *chan)</div><div class='ctx'> {</div><div class='del'>-  	struct snd_opl3 *opl3;</div><div class='del'>-</div><div class='del'>-	opl3 = p;</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "Terminate note, ch#: %i, inst#: %i\n",</div><div class='del'>-		   chan-&gt;number, chan-&gt;midi_program);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(p, "Terminate note, ch#: %i, inst#: %i\n",</div><div class='add'>+		 chan-&gt;number, chan-&gt;midi_program);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opl3_update_pitch(struct snd_opl3 *opl3, int voice)</div><div class='hunk'>@@ -793,9 +750,7 @@ static void snd_opl3_pitch_ctrl(struct snd_opl3 *opl3, struct snd_midi_channel *</div><div class='ctx'> 	int voice;</div><div class='ctx'> 	struct snd_opl3_voice *vp;</div><div class='ctx'> </div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;voice_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;voice_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (opl3-&gt;synth_mode == SNDRV_OPL3_MODE_SEQ) {</div><div class='ctx'> 		for (voice = 0; voice &lt; opl3-&gt;max_voices; voice++) {</div><div class='hunk'>@@ -811,7 +766,6 @@ static void snd_opl3_pitch_ctrl(struct snd_opl3 *opl3, struct snd_midi_channel *</div><div class='ctx'> 			snd_opl3_update_pitch(opl3, voice);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;voice_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -823,10 +777,8 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)</div><div class='ctx'>   	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = p;</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "Controller, TYPE = %i, ch#: %i, inst#: %i\n",</div><div class='del'>-		   type, chan-&gt;number, chan-&gt;midi_program);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(opl3, "Controller, TYPE = %i, ch#: %i, inst#: %i\n",</div><div class='add'>+		 type, chan-&gt;number, chan-&gt;midi_program);</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case MIDI_CTL_MSB_MODWHEEL:</div><div class='hunk'>@@ -857,13 +809,8 @@ void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)</div><div class='ctx'> void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,</div><div class='ctx'> 		   struct snd_midi_channel_set *chset)</div><div class='ctx'> {</div><div class='del'>-  	struct snd_opl3 *opl3;</div><div class='del'>-</div><div class='del'>-	opl3 = p;</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "NRPN, ch#: %i, inst#: %i\n",</div><div class='del'>-		   chan-&gt;number, chan-&gt;midi_program);</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(p, "NRPN, ch#: %i, inst#: %i\n",</div><div class='add'>+		 chan-&gt;number, chan-&gt;midi_program);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -872,10 +819,5 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan,</div><div class='ctx'> void snd_opl3_sysex(void *p, unsigned char *buf, int len,</div><div class='ctx'> 		    int parsed, struct snd_midi_channel_set *chset)</div><div class='ctx'> {</div><div class='del'>-  	struct snd_opl3 *opl3;</div><div class='del'>-</div><div class='del'>-	opl3 = p;</div><div class='del'>-#ifdef DEBUG_MIDI</div><div class='del'>-	snd_printk(KERN_DEBUG "SYSEX\n");</div><div class='del'>-#endif</div><div class='add'>+	opl3_dbg(p, "SYSEX\n");</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c<br/>index ade3ca52422e..6d39b2b77b80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_oss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_oss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_oss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_oss.c</a></div><div class='hunk'>@@ -1,23 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Interface for OSS sequencer emulation</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "opl3_voice.h"</div><div class='ctx'> </div><div class='ctx'> static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure);</div><div class='hunk'>@@ -26,25 +14,9 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,</div><div class='ctx'> static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format, const char __user *buf, int offs, int count);</div><div class='ctx'> static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg);</div><div class='ctx'> </div><div class='del'>-/* */</div><div class='del'>-</div><div class='del'>-static inline mm_segment_t snd_enter_user(void)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	return fs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void snd_leave_user(mm_segment_t fs)</div><div class='del'>-{</div><div class='del'>-	set_fs(fs);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* operators */</div><div class='ctx'> </div><div class='del'>-extern struct snd_midi_op opl3_ops;</div><div class='del'>-</div><div class='del'>-static struct snd_seq_oss_callback oss_callback = {</div><div class='add'>+static const struct snd_seq_oss_callback oss_callback = {</div><div class='ctx'> 	.owner = 	THIS_MODULE,</div><div class='ctx'> 	.open =		snd_opl3_open_seq_oss,</div><div class='ctx'> 	.close =	snd_opl3_close_seq_oss,</div><div class='hunk'>@@ -125,7 +97,7 @@ void snd_opl3_init_seq_oss(struct snd_opl3 *opl3, char *name)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	opl3-&gt;oss_seq_dev = dev;</div><div class='del'>-	strlcpy(dev-&gt;name, name, sizeof(dev-&gt;name));</div><div class='add'>+	strscpy(dev-&gt;name, name, sizeof(dev-&gt;name));</div><div class='ctx'> 	arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);</div><div class='ctx'> 	arg-&gt;type = SYNTH_TYPE_FM;</div><div class='ctx'> 	if (opl3-&gt;hardware &lt; OPL3_HW_OPL3) {</div><div class='hunk'>@@ -164,7 +136,8 @@ static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)</div><div class='ctx'> 	if (snd_BUG_ON(!arg))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_opl3_synth_setup(opl3)) &lt; 0)</div><div class='add'>+	err = snd_opl3_synth_setup(opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* fill the argument data */</div><div class='hunk'>@@ -172,7 +145,8 @@ static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)</div><div class='ctx'> 	arg-&gt;addr.client = opl3-&gt;oss_chset-&gt;client;</div><div class='ctx'> 	arg-&gt;addr.port = opl3-&gt;oss_chset-&gt;port;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_opl3_synth_use_inc(opl3)) &lt; 0)</div><div class='add'>+	err = snd_opl3_synth_use_inc(opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	opl3-&gt;synth_mode = SNDRV_OPL3_MODE_SYNTH;</div><div class='hunk'>@@ -219,14 +193,14 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (count &lt; (int)sizeof(sbi)) {</div><div class='del'>-		snd_printk(KERN_ERR "FM Error: Patch record too short\n");</div><div class='add'>+		dev_err(opl3-&gt;card-&gt;dev, "FM Error: Patch record too short\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (copy_from_user(&amp;sbi, buf, sizeof(sbi)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 	if (sbi.channel &lt; 0 || sbi.channel &gt;= SBFM_MAXINSTR) {</div><div class='del'>-		snd_printk(KERN_ERR "FM Error: Invalid instrument number %d\n",</div><div class='add'>+		dev_err(opl3-&gt;card-&gt;dev, "FM Error: Invalid instrument number %d\n",</div><div class='ctx'> 			   sbi.channel);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -253,9 +227,8 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,</div><div class='ctx'> 	opl3 = arg-&gt;private_data;</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 		case SNDCTL_FM_LOAD_INSTR:</div><div class='del'>-			snd_printk(KERN_ERR "OPL3: "</div><div class='del'>-				   "Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. "</div><div class='del'>-				   "Fix the program.\n");</div><div class='add'>+			dev_err(opl3-&gt;card-&gt;dev,</div><div class='add'>+				"OPL3: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		case SNDCTL_SYNTH_MEMAVL:</div><div class='hunk'>@@ -274,11 +247,8 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,</div><div class='ctx'> /* reset device */</div><div class='ctx'> static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg)</div><div class='ctx'> {</div><div class='del'>-	struct snd_opl3 *opl3;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!arg))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	opl3 = arg-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c<br/>index 2d33f53d36b8..d3278428d360 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_seq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_seq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_seq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_seq.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,33 +6,19 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  OPL2/3 FM instrument loader:</div><div class='ctx'>  *   alsa-tools/seq/sbiload/</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "opl3_voice.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Uros Bizjak &lt;uros@kss-loka.si&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("ALSA driver for OPL3 FM synth");</div><div class='ctx'> </div><div class='del'>-int use_internal_drums = 0;</div><div class='add'>+bool use_internal_drums = 0;</div><div class='ctx'> module_param(use_internal_drums, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(use_internal_drums, "Enable internal OPL2/3 drums.");</div><div class='ctx'> </div><div class='hunk'>@@ -53,13 +40,11 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3)</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	struct snd_hwdep *hwdep = opl3-&gt;hwdep;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;hwdep-&gt;open_mutex);</div><div class='del'>-	if (hwdep-&gt;used) {</div><div class='del'>-		mutex_unlock(&amp;hwdep-&gt;open_mutex);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	scoped_guard(mutex, &amp;hwdep-&gt;open_mutex) {</div><div class='add'>+		if (hwdep-&gt;used)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		hwdep-&gt;used++;</div><div class='ctx'> 	}</div><div class='del'>-	hwdep-&gt;used++;</div><div class='del'>-	mutex_unlock(&amp;hwdep-&gt;open_mutex);</div><div class='ctx'> </div><div class='ctx'> 	snd_opl3_reset(opl3);</div><div class='ctx'> </div><div class='hunk'>@@ -81,22 +66,21 @@ int snd_opl3_synth_setup(struct snd_opl3 * opl3)</div><div class='ctx'> </div><div class='ctx'> void snd_opl3_synth_cleanup(struct snd_opl3 * opl3)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_hwdep *hwdep;</div><div class='ctx'> </div><div class='ctx'> 	/* Stop system timer */</div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='del'>-	if (opl3-&gt;sys_timer_status) {</div><div class='del'>-		del_timer(&amp;opl3-&gt;tlist);</div><div class='del'>-		opl3-&gt;sys_timer_status = 0;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;opl3-&gt;sys_timer_lock) {</div><div class='add'>+		if (opl3-&gt;sys_timer_status) {</div><div class='add'>+			timer_delete(&amp;opl3-&gt;tlist);</div><div class='add'>+			opl3-&gt;sys_timer_status = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;sys_timer_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	snd_opl3_reset(opl3);</div><div class='ctx'> 	hwdep = opl3-&gt;hwdep;</div><div class='del'>-	mutex_lock(&amp;hwdep-&gt;open_mutex);</div><div class='del'>-	hwdep-&gt;used--;</div><div class='del'>-	mutex_unlock(&amp;hwdep-&gt;open_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;hwdep-&gt;open_mutex) {</div><div class='add'>+		hwdep-&gt;used--;</div><div class='add'>+	}</div><div class='ctx'> 	wake_up(&amp;hwdep-&gt;open_wait);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -105,7 +89,8 @@ static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe</div><div class='ctx'> 	struct snd_opl3 *opl3 = private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_opl3_synth_setup(opl3)) &lt; 0)</div><div class='add'>+	err = snd_opl3_synth_setup(opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (use_internal_drums) {</div><div class='hunk'>@@ -120,7 +105,8 @@ static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {</div><div class='del'>-		if ((err = snd_opl3_synth_use_inc(opl3)) &lt; 0)</div><div class='add'>+		err = snd_opl3_synth_use_inc(opl3);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	opl3-&gt;synth_mode = SNDRV_OPL3_MODE_SEQ;</div><div class='hunk'>@@ -141,7 +127,7 @@ static int snd_opl3_synth_unuse(void *private_data, struct snd_seq_port_subscrib</div><div class='ctx'> /*</div><div class='ctx'>  * MIDI emulation operators</div><div class='ctx'>  */</div><div class='del'>-struct snd_midi_op opl3_ops = {</div><div class='add'>+const struct snd_midi_op opl3_ops = {</div><div class='ctx'> 	.note_on =		snd_opl3_note_on,</div><div class='ctx'> 	.note_off =		snd_opl3_note_off,</div><div class='ctx'> 	.key_press =		snd_opl3_key_press,</div><div class='hunk'>@@ -215,8 +201,9 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)</div><div class='ctx'> </div><div class='ctx'> /* ------------------------------ */</div><div class='ctx'> </div><div class='del'>-static int snd_opl3_seq_new_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_opl3_seq_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int client, err;</div><div class='ctx'> 	char name[32];</div><div class='hunk'>@@ -239,34 +226,34 @@ static int snd_opl3_seq_new_device(struct snd_seq_device *dev)</div><div class='ctx'> 	if (client &lt; 0)</div><div class='ctx'> 		return client;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_opl3_synth_create_port(opl3)) &lt; 0) {</div><div class='add'>+	err = snd_opl3_synth_create_port(opl3);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_seq_delete_kernel_client(client);</div><div class='ctx'> 		opl3-&gt;seq_client = -1;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup system timer */</div><div class='del'>-	init_timer(&amp;opl3-&gt;tlist);</div><div class='del'>-	opl3-&gt;tlist.function = snd_opl3_timer_func;</div><div class='del'>-	opl3-&gt;tlist.data = (unsigned long) opl3;</div><div class='add'>+	timer_setup(&amp;opl3-&gt;tlist, snd_opl3_timer_func, 0);</div><div class='ctx'> 	spin_lock_init(&amp;opl3-&gt;sys_timer_lock);</div><div class='ctx'> 	opl3-&gt;sys_timer_status = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> 	snd_opl3_init_seq_oss(opl3, name);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_opl3_seq_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='ctx'> 	opl3 = *(struct snd_opl3 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);</div><div class='ctx'> 	if (opl3 == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> 	snd_opl3_free_seq_oss(opl3);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (opl3-&gt;seq_client &gt;= 0) {</div><div class='hunk'>@@ -276,22 +263,14 @@ static int snd_opl3_seq_delete_device(struct snd_seq_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init alsa_opl3_seq_init(void)</div><div class='del'>-{</div><div class='del'>-	static struct snd_seq_dev_ops ops =</div><div class='del'>-	{</div><div class='del'>-		snd_opl3_seq_new_device,</div><div class='del'>-		snd_opl3_seq_delete_device</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &amp;ops,</div><div class='del'>-					      sizeof(struct snd_opl3 *));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_opl3_seq_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OPL3);</div><div class='del'>-}</div><div class='add'>+static struct snd_seq_driver opl3_seq_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_opl3_seq_probe,</div><div class='add'>+		.remove = snd_opl3_seq_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_OPL3,</div><div class='add'>+	.argsize = sizeof(struct snd_opl3 *),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-module_init(alsa_opl3_seq_init)</div><div class='del'>-module_exit(alsa_opl3_seq_exit)</div><div class='add'>+module_snd_seq_driver(opl3_seq_driver);</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c<br/>index 301acb6b9cf9..10f622b439a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_synth.c</a></div><div class='hunk'>@@ -1,29 +1,18 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *                   </div><div class='ctx'>  *  Routines for OPL2/OPL3/OPL4 control</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify </div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> #include &lt;sound/asound_fm.h&gt;</div><div class='add'>+#include "opl3_voice.h"</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> #define OPL3_SUPPORT_SYNTH</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -102,6 +91,8 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,</div><div class='ctx'> 		{</div><div class='ctx'> 			struct snd_dm_fm_info info;</div><div class='ctx'> </div><div class='add'>+			memset(&amp;info, 0, sizeof(info));</div><div class='add'>+</div><div class='ctx'> 			info.fm_mode = opl3-&gt;fm_mode;</div><div class='ctx'> 			info.rhythm = opl3-&gt;rhythm;</div><div class='ctx'> 			if (copy_to_user(argp, &amp;info, sizeof(struct snd_dm_fm_info)))</div><div class='hunk'>@@ -167,10 +158,8 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "unknown IOCTL: 0x%x\n", cmd);</div><div class='del'>-#endif</div><div class='add'>+		dev_dbg(opl3-&gt;card-&gt;dev, "unknown IOCTL: 0x%x\n", cmd);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOTTY;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,7 +288,7 @@ int snd_opl3_load_patch(struct snd_opl3 *opl3,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (name)</div><div class='del'>-		strlcpy(patch-&gt;name, name, sizeof(patch-&gt;name));</div><div class='add'>+		strscpy(patch-&gt;name, name, sizeof(patch-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -447,7 +436,7 @@ static int snd_opl3_set_voice(struct snd_opl3 * opl3, struct snd_dm_fm_voice * v</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short reg_side;</div><div class='ctx'> 	unsigned char op_offset;</div><div class='del'>-	unsigned char voice_offset;</div><div class='add'>+	unsigned char voice_offset, voice_op;</div><div class='ctx'> </div><div class='ctx'> 	unsigned short opl3_reg;</div><div class='ctx'> 	unsigned char reg_val;</div><div class='hunk'>@@ -472,7 +461,9 @@ static int snd_opl3_set_voice(struct snd_opl3 * opl3, struct snd_dm_fm_voice * v</div><div class='ctx'> 		voice_offset = voice-&gt;voice - MAX_OPL2_VOICES;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Get register offset of operator */</div><div class='del'>-	op_offset = snd_opl3_regmap[voice_offset][voice-&gt;op];</div><div class='add'>+	voice_offset = array_index_nospec(voice_offset, MAX_OPL2_VOICES);</div><div class='add'>+	voice_op = array_index_nospec(voice-&gt;op, 4);</div><div class='add'>+	op_offset = snd_opl3_regmap[voice_offset][voice_op];</div><div class='ctx'> </div><div class='ctx'> 	reg_val = 0x00;</div><div class='ctx'> 	/* Set amplitude modulation (tremolo) effect */</div><div class='head'>diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h<br/>index a371c075ac87..be9ccca2d952 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_voice.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl3/opl3_voice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl3/opl3_voice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl3/opl3_voice.h</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __OPL3_VOICE_H</div><div class='ctx'> #define __OPL3_VOICE_H</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 2000 Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='hunk'>@@ -37,16 +24,23 @@ void snd_opl3_nrpn(void *p, struct snd_midi_channel *chan, struct snd_midi_chann</div><div class='ctx'> void snd_opl3_sysex(void *p, unsigned char *buf, int len, int parsed, struct snd_midi_channel_set *chset);</div><div class='ctx'> </div><div class='ctx'> void snd_opl3_calc_volume(unsigned char *reg, int vel, struct snd_midi_channel *chan);</div><div class='del'>-void snd_opl3_timer_func(unsigned long data);</div><div class='add'>+void snd_opl3_timer_func(struct timer_list *t);</div><div class='ctx'> </div><div class='ctx'> /* Prototypes for opl3_drums.c */</div><div class='ctx'> void snd_opl3_load_drums(struct snd_opl3 *opl3);</div><div class='del'>-void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int on_off, int vel, struct snd_midi_channel *chan);</div><div class='add'>+void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off, struct snd_midi_channel *chan);</div><div class='ctx'> </div><div class='ctx'> /* Prototypes for opl3_oss.c */</div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> void snd_opl3_init_seq_oss(struct snd_opl3 *opl3, char *name);</div><div class='ctx'> void snd_opl3_free_seq_oss(struct snd_opl3 *opl3);</div><div class='add'>+#else</div><div class='add'>+#define snd_opl3_init_seq_oss(opl3, name) /* NOP */</div><div class='add'>+#define snd_opl3_free_seq_oss(opl3) /* NOP */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];</div><div class='add'>+extern bool use_internal_drums;</div><div class='add'>+extern const struct snd_midi_op opl3_ops;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/drivers/opl4/Makefile b/sound/drivers/opl4/Makefile<br/>index b94009b0b19f..a841630b45c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/Makefile</a></div><div class='hunk'>@@ -1,10 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o</div><div class='del'>-snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o</div><div class='add'>+snd-opl4-lib-y := opl4_lib.o opl4_mixer.o</div><div class='add'>+snd-opl4-lib-$(CONFIG_SND_PROC_FS) += opl4_proc.o</div><div class='add'>+snd-opl4-synth-y := opl4_seq.o opl4_synth.o yrw801.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o</div><div class='ctx'> obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-opl4-synth.o</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c<br/>index f07e38da59b8..44fbc6bf0654 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_lib.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Functions for accessing OPL4 devices</div><div class='ctx'>  * Copyright (c) 2003 by Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "opl4_local.h"</div><div class='hunk'>@@ -22,13 +9,14 @@</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("OPL4 driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static void inline snd_opl4_wait(struct snd_opl4 *opl4)</div><div class='add'>+static inline void snd_opl4_wait(struct snd_opl4 *opl4)</div><div class='ctx'> {</div><div class='ctx'> 	int timeout = 10;</div><div class='ctx'> 	while ((inb(opl4-&gt;fm_port) &amp; OPL4_STATUS_BUSY) &amp;&amp; --timeout &gt; 0)</div><div class='hunk'>@@ -59,10 +47,9 @@ EXPORT_SYMBOL(snd_opl4_read);</div><div class='ctx'> </div><div class='ctx'> void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u8 memcfg;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	memcfg = snd_opl4_read(opl4, OPL4_REG_MEMORY_CONFIGURATION);</div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MEMORY_CONFIGURATION, memcfg | OPL4_MODE_BIT);</div><div class='hunk'>@@ -77,18 +64,15 @@ void snd_opl4_read_memory(struct snd_opl4 *opl4, char *buf, int offset, int size</div><div class='ctx'> 	insb(opl4-&gt;pcm_port + 1, buf, size);</div><div class='ctx'> </div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MEMORY_CONFIGURATION, memcfg);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_opl4_read_memory);</div><div class='ctx'> </div><div class='ctx'> void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, int size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u8 memcfg;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	memcfg = snd_opl4_read(opl4, OPL4_REG_MEMORY_CONFIGURATION);</div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MEMORY_CONFIGURATION, memcfg | OPL4_MODE_BIT);</div><div class='hunk'>@@ -103,8 +87,6 @@ void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, i</div><div class='ctx'> 	outsb(opl4-&gt;pcm_port + 1, buf, size);</div><div class='ctx'> </div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MEMORY_CONFIGURATION, memcfg);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_opl4_write_memory);</div><div class='hunk'>@@ -126,7 +108,7 @@ static int snd_opl4_detect(struct snd_opl4 *opl4)</div><div class='ctx'> 	snd_opl4_enable_opl4(opl4);</div><div class='ctx'> </div><div class='ctx'> 	id1 = snd_opl4_read(opl4, OPL4_REG_MEMORY_CONFIGURATION);</div><div class='del'>-	snd_printdd("OPL4[02]=%02x\n", id1);</div><div class='add'>+	dev_dbg(opl4-&gt;card-&gt;dev, "OPL4[02]=%02x\n", id1);</div><div class='ctx'> 	switch (id1 &amp; OPL4_DEVICE_ID_MASK) {</div><div class='ctx'> 	case 0x20:</div><div class='ctx'> 		opl4-&gt;hardware = OPL3_HW_OPL4;</div><div class='hunk'>@@ -142,7 +124,7 @@ static int snd_opl4_detect(struct snd_opl4 *opl4)</div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MIX_CONTROL_PCM, 0xff);</div><div class='ctx'> 	id1 = snd_opl4_read(opl4, OPL4_REG_MIX_CONTROL_FM);</div><div class='ctx'> 	id2 = snd_opl4_read(opl4, OPL4_REG_MIX_CONTROL_PCM);</div><div class='del'>-	snd_printdd("OPL4 id1=%02x id2=%02x\n", id1, id2);</div><div class='add'>+	dev_dbg(opl4-&gt;card-&gt;dev, "OPL4 id1=%02x id2=%02x\n", id1, id2);</div><div class='ctx'>        	if (id1 != 0x00 || id2 != 0xff)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +134,7 @@ static int snd_opl4_detect(struct snd_opl4 *opl4)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> static void snd_opl4_seq_dev_free(struct snd_seq_device *seq_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl4 *opl4 = seq_dev-&gt;private_data;</div><div class='hunk'>@@ -164,7 +146,7 @@ static int snd_opl4_create_seq_dev(struct snd_opl4 *opl4, int seq_device)</div><div class='ctx'> 	opl4-&gt;seq_dev_num = seq_device;</div><div class='ctx'> 	if (snd_seq_device_new(opl4-&gt;card, seq_device, SNDRV_SEQ_DEV_ID_OPL4,</div><div class='ctx'> 			       sizeof(struct snd_opl4 *), &amp;opl4-&gt;seq_dev) &gt;= 0) {</div><div class='del'>-		strcpy(opl4-&gt;seq_dev-&gt;name, "OPL4 Wavetable");</div><div class='add'>+		strscpy(opl4-&gt;seq_dev-&gt;name, "OPL4 Wavetable");</div><div class='ctx'> 		*(struct snd_opl4 **)SNDRV_SEQ_DEVICE_ARGPTR(opl4-&gt;seq_dev) = opl4;</div><div class='ctx'> 		opl4-&gt;seq_dev-&gt;private_data = opl4;</div><div class='ctx'> 		opl4-&gt;seq_dev-&gt;private_free = snd_opl4_seq_dev_free;</div><div class='hunk'>@@ -175,9 +157,7 @@ static int snd_opl4_create_seq_dev(struct snd_opl4 *opl4, int seq_device)</div><div class='ctx'> </div><div class='ctx'> static void snd_opl4_free(struct snd_opl4 *opl4)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> 	snd_opl4_free_proc(opl4);</div><div class='del'>-#endif</div><div class='ctx'> 	release_and_free_resource(opl4-&gt;res_fm_port);</div><div class='ctx'> 	release_and_free_resource(opl4-&gt;res_pcm_port);</div><div class='ctx'> 	kfree(opl4);</div><div class='hunk'>@@ -198,7 +178,7 @@ int snd_opl4_create(struct snd_card *card,</div><div class='ctx'> 	struct snd_opl4 *opl4;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_opl4_dev_free</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -214,7 +194,7 @@ int snd_opl4_create(struct snd_card *card,</div><div class='ctx'> 	opl4-&gt;res_fm_port = request_region(fm_port, 8, "OPL4 FM");</div><div class='ctx'> 	opl4-&gt;res_pcm_port = request_region(pcm_port, 8, "OPL4 PCM/MIX");</div><div class='ctx'> 	if (!opl4-&gt;res_fm_port || !opl4-&gt;res_pcm_port) {</div><div class='del'>-		snd_printk(KERN_ERR "opl4: can't grab ports 0x%lx, 0x%lx\n", fm_port, pcm_port);</div><div class='add'>+		dev_err(card-&gt;dev, "opl4: can't grab ports 0x%lx, 0x%lx\n", fm_port, pcm_port);</div><div class='ctx'> 		snd_opl4_free(opl4);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -228,7 +208,7 @@ int snd_opl4_create(struct snd_card *card,</div><div class='ctx'> 	err = snd_opl4_detect(opl4);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		snd_opl4_free(opl4);</div><div class='del'>-		snd_printd("OPL4 chip not detected at %#lx/%#lx\n", fm_port, pcm_port);</div><div class='add'>+		dev_dbg(card-&gt;dev, "OPL4 chip not detected at %#lx/%#lx\n", fm_port, pcm_port);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -248,11 +228,9 @@ int snd_opl4_create(struct snd_card *card,</div><div class='ctx'> 	snd_opl4_enable_opl4(opl4);</div><div class='ctx'> </div><div class='ctx'> 	snd_opl4_create_mixer(opl4);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> 	snd_opl4_create_proc(opl4);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> 	opl4-&gt;seq_client = -1;</div><div class='ctx'> 	if (opl4-&gt;hardware &lt; OPL3_HW_OPL4_ML)</div><div class='ctx'> 		snd_opl4_create_seq_dev(opl4, seq_device);</div><div class='hunk'>@@ -266,15 +244,3 @@ int snd_opl4_create(struct snd_card *card,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_opl4_create);</div><div class='del'>-</div><div class='del'>-static int __init alsa_opl4_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_opl4_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_opl4_init)</div><div class='del'>-module_exit(alsa_opl4_exit)</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_local.h b/sound/drivers/opl4/opl4_local.h<br/>index 470e5a758a02..a16b4677c1e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_local.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_local.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_local.h</a></div><div class='hunk'>@@ -178,13 +178,13 @@ struct snd_opl4 {</div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> 	struct snd_info_entry *proc_entry;</div><div class='ctx'> 	int memory_access;</div><div class='ctx'> #endif</div><div class='ctx'> 	struct mutex access_mutex;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> 	int used;</div><div class='ctx'> </div><div class='ctx'> 	int seq_dev_num;</div><div class='hunk'>@@ -207,10 +207,13 @@ void snd_opl4_write_memory(struct snd_opl4 *opl4, const char *buf, int offset, i</div><div class='ctx'> /* opl4_mixer.c */</div><div class='ctx'> int snd_opl4_create_mixer(struct snd_opl4 *opl4);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /* opl4_proc.c */</div><div class='ctx'> int snd_opl4_create_proc(struct snd_opl4 *opl4);</div><div class='ctx'> void snd_opl4_free_proc(struct snd_opl4 *opl4);</div><div class='add'>+#else</div><div class='add'>+static inline int snd_opl4_create_proc(struct snd_opl4 *opl4) { return 0; }</div><div class='add'>+static inline void snd_opl4_free_proc(struct snd_opl4 *opl4) {}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* opl4_seq.c */</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_mixer.c b/sound/drivers/opl4/opl4_mixer.c<br/>index 04079de4c35f..deebb8636437 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_mixer.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OPL4 mixer functions</div><div class='ctx'>  * Copyright (c) 2003 by Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "opl4_local.h"</div><div class='hunk'>@@ -32,13 +19,11 @@ static int snd_opl4_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> static int snd_opl4_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u8 reg = kcontrol-&gt;private_value;</div><div class='ctx'> 	u8 value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	value = snd_opl4_read(opl4, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = 7 - (value &amp; 7);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = 7 - ((value &gt;&gt; 3) &amp; 7);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -47,20 +32,18 @@ static int snd_opl4_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v</div><div class='ctx'> static int snd_opl4_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl4 *opl4 = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u8 reg = kcontrol-&gt;private_value;</div><div class='ctx'> 	u8 value, old_value;</div><div class='ctx'> </div><div class='ctx'> 	value = (7 - (ucontrol-&gt;value.integer.value[0] &amp; 7)) |</div><div class='ctx'> 		((7 - (ucontrol-&gt;value.integer.value[1] &amp; 7)) &lt;&lt; 3);</div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	old_value = snd_opl4_read(opl4, reg);</div><div class='ctx'> 	snd_opl4_write(opl4, reg, value);</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> 	return value != old_value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_opl4_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_opl4_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "FM Playback Volume",</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c<br/>index df850b8830a5..fd0ba4704d9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_proc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_proc.c</a></div><div class='hunk'>@@ -1,40 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Functions for the OPL4 proc file</div><div class='ctx'>  * Copyright (c) 2003 by Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "opl4_local.h"</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='ctx'> static int snd_opl4_mem_proc_open(struct snd_info_entry *entry,</div><div class='ctx'> 				  unsigned short mode, void **file_private_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl4 *opl4 = entry-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opl4-&gt;access_mutex);</div><div class='del'>-	if (opl4-&gt;memory_access) {</div><div class='del'>-		mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='add'>+	guard(mutex)(&amp;opl4-&gt;access_mutex);</div><div class='add'>+	if (opl4-&gt;memory_access)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> 	opl4-&gt;memory_access++;</div><div class='del'>-	mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -43,9 +26,8 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl4 *opl4 = entry-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opl4-&gt;access_mutex);</div><div class='add'>+	guard(mutex)(&amp;opl4-&gt;access_mutex);</div><div class='ctx'> 	opl4-&gt;memory_access--;</div><div class='del'>-	mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +72,7 @@ static ssize_t snd_opl4_mem_proc_write(struct snd_info_entry *entry,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_opl4_mem_proc_ops = {</div><div class='add'>+static const struct snd_info_entry_ops snd_opl4_mem_proc_ops = {</div><div class='ctx'> 	.open = snd_opl4_mem_proc_open,</div><div class='ctx'> 	.release = snd_opl4_mem_proc_release,</div><div class='ctx'> 	.read = snd_opl4_mem_proc_read,</div><div class='hunk'>@@ -105,7 +87,7 @@ int snd_opl4_create_proc(struct snd_opl4 *opl4)</div><div class='ctx'> 	if (entry) {</div><div class='ctx'> 		if (opl4-&gt;hardware &lt; OPL3_HW_OPL4_ML) {</div><div class='ctx'> 			/* OPL4 can access 4 MB external ROM/SRAM */</div><div class='del'>-			entry-&gt;mode |= S_IWUSR;</div><div class='add'>+			entry-&gt;mode |= 0200;</div><div class='ctx'> 			entry-&gt;size = 4 * 1024 * 1024;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* OPL4-ML has 1 MB internal ROM */</div><div class='hunk'>@@ -115,10 +97,6 @@ int snd_opl4_create_proc(struct snd_opl4 *opl4)</div><div class='ctx'> 		entry-&gt;c.ops = &amp;snd_opl4_mem_proc_ops;</div><div class='ctx'> 		entry-&gt;module = THIS_MODULE;</div><div class='ctx'> 		entry-&gt;private_data = opl4;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	opl4-&gt;proc_entry = entry;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -128,5 +106,3 @@ void snd_opl4_free_proc(struct snd_opl4 *opl4)</div><div class='ctx'> {</div><div class='ctx'> 	snd_info_free_entry(opl4-&gt;proc_entry);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c<br/>index 43d8a2bdd280..7bb22089a093 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_seq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_seq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_seq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_seq.c</a></div><div class='hunk'>@@ -34,6 +34,7 @@</div><div class='ctx'> #include "opl4_local.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='hunk'>@@ -62,24 +63,18 @@ static int snd_opl4_seq_use(void *private_data, struct snd_seq_port_subscribe *i</div><div class='ctx'> 	struct snd_opl4 *opl4 = private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opl4-&gt;access_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;opl4-&gt;access_mutex) {</div><div class='add'>+		if (opl4-&gt;used)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		opl4-&gt;used++;</div><div class='ctx'> </div><div class='del'>-	if (opl4-&gt;used) {</div><div class='del'>-		mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	opl4-&gt;used++;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {</div><div class='del'>-		err = snd_opl4_seq_use_inc(opl4);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='del'>-			return err;</div><div class='add'>+		if (info-&gt;sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {</div><div class='add'>+			err = snd_opl4_seq_use_inc(opl4);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='del'>-</div><div class='ctx'> 	snd_opl4_synth_reset(opl4);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -90,16 +85,16 @@ static int snd_opl4_seq_unuse(void *private_data, struct snd_seq_port_subscribe</div><div class='ctx'> </div><div class='ctx'> 	snd_opl4_synth_shutdown(opl4);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;opl4-&gt;access_mutex);</div><div class='del'>-	opl4-&gt;used--;</div><div class='del'>-	mutex_unlock(&amp;opl4-&gt;access_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;opl4-&gt;access_mutex) {</div><div class='add'>+		opl4-&gt;used--;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (info-&gt;sender.client != SNDRV_SEQ_CLIENT_SYSTEM)</div><div class='ctx'> 		snd_opl4_seq_use_dec(opl4);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_midi_op opl4_ops = {</div><div class='add'>+static const struct snd_midi_op opl4_ops = {</div><div class='ctx'> 	.note_on =		snd_opl4_note_on,</div><div class='ctx'> 	.note_off =		snd_opl4_note_off,</div><div class='ctx'> 	.note_terminate =	snd_opl4_terminate_note,</div><div class='hunk'>@@ -123,8 +118,9 @@ static void snd_opl4_seq_free_port(void *private_data)</div><div class='ctx'> 	snd_midi_channel_free_set(opl4-&gt;chset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_opl4_seq_new_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_opl4_seq_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_opl4 *opl4;</div><div class='ctx'> 	int client;</div><div class='ctx'> 	struct snd_seq_port_callback pcallbacks;</div><div class='hunk'>@@ -179,8 +175,9 @@ static int snd_opl4_seq_new_device(struct snd_seq_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_opl4_seq_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_opl4 *opl4;</div><div class='ctx'> </div><div class='ctx'> 	opl4 = *(struct snd_opl4 **)SNDRV_SEQ_DEVICE_ARGPTR(dev);</div><div class='hunk'>@@ -194,21 +191,14 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init alsa_opl4_synth_init(void)</div><div class='del'>-{</div><div class='del'>-	static struct snd_seq_dev_ops ops = {</div><div class='del'>-		snd_opl4_seq_new_device,</div><div class='del'>-		snd_opl4_seq_delete_device</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &amp;ops,</div><div class='del'>-					      sizeof(struct snd_opl4 *));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_opl4_synth_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OPL4);</div><div class='del'>-}</div><div class='add'>+static struct snd_seq_driver opl4_seq_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_opl4_seq_probe,</div><div class='add'>+		.remove = snd_opl4_seq_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_OPL4,</div><div class='add'>+	.argsize = sizeof(struct snd_opl4 *),</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-module_init(alsa_opl4_synth_init)</div><div class='del'>-module_exit(alsa_opl4_synth_exit)</div><div class='add'>+module_snd_seq_driver(opl4_seq_driver);</div><div class='head'>diff --git a/sound/drivers/opl4/opl4_synth.c b/sound/drivers/opl4/opl4_synth.c<br/>index 49b9e240915c..82dbb8519ab1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/opl4_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/opl4_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/opl4_synth.c</a></div><div class='hunk'>@@ -33,7 +33,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "opl4_local.h"</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* GM2 controllers */</div><div class='hunk'>@@ -248,7 +248,7 @@ static const s16 snd_opl4_pitch_map[0x600] = {</div><div class='ctx'>  * Attenuation according to GM recommendations, in -0.375 dB units.</div><div class='ctx'>  * table[v] = 40 * log(v / 127) / -0.375</div><div class='ctx'>  */</div><div class='del'>-static unsigned char snd_opl4_volume_table[128] = {</div><div class='add'>+static const unsigned char snd_opl4_volume_table[128] = {</div><div class='ctx'> 	255,224,192,173,160,150,141,134,</div><div class='ctx'> 	128,122,117,113,109,105,102, 99,</div><div class='ctx'> 	 96, 93, 90, 88, 85, 83, 81, 79,</div><div class='hunk'>@@ -272,13 +272,12 @@ static unsigned char snd_opl4_volume_table[128] = {</div><div class='ctx'>  */</div><div class='ctx'> void snd_opl4_synth_reset(struct snd_opl4 *opl4)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; OPL4_MAX_VOICES; i++)</div><div class='del'>-		snd_opl4_write(opl4, OPL4_REG_MISC + i, OPL4_DAMP_BIT);</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;opl4-&gt;reg_lock) {</div><div class='add'>+		for (i = 0; i &lt; OPL4_MAX_VOICES; i++)</div><div class='add'>+			snd_opl4_write(opl4, OPL4_REG_MISC + i, OPL4_DAMP_BIT);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;opl4-&gt;off_voices);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;opl4-&gt;on_voices);</div><div class='hunk'>@@ -296,14 +295,12 @@ void snd_opl4_synth_reset(struct snd_opl4 *opl4)</div><div class='ctx'>  */</div><div class='ctx'> void snd_opl4_synth_shutdown(struct snd_opl4 *opl4)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; OPL4_MAX_VOICES; i++)</div><div class='ctx'> 		snd_opl4_write(opl4, OPL4_REG_MISC + i,</div><div class='ctx'> 			       opl4-&gt;voices[i].reg_misc &amp; ~OPL4_KEY_ON_BIT);</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -313,17 +310,15 @@ static void snd_opl4_do_for_note(struct snd_opl4 *opl4, int note, struct snd_mid</div><div class='ctx'> 				 void (*func)(struct snd_opl4 *opl4, struct opl4_voice *voice))</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct opl4_voice *voice;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; OPL4_MAX_VOICES; i++) {</div><div class='ctx'> 		voice = &amp;opl4-&gt;voices[i];</div><div class='ctx'> 		if (voice-&gt;chan == chan &amp;&amp; voice-&gt;note == note) {</div><div class='ctx'> 			func(opl4, voice);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -334,17 +329,15 @@ static void snd_opl4_do_for_channel(struct snd_opl4 *opl4,</div><div class='ctx'> 				    void (*func)(struct snd_opl4 *opl4, struct opl4_voice *voice))</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct opl4_voice *voice;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; OPL4_MAX_VOICES; i++) {</div><div class='ctx'> 		voice = &amp;opl4-&gt;voices[i];</div><div class='ctx'> 		if (voice-&gt;chan == chan) {</div><div class='ctx'> 			func(opl4, voice);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -354,16 +347,14 @@ static void snd_opl4_do_for_all(struct snd_opl4 *opl4,</div><div class='ctx'> 				void (*func)(struct snd_opl4 *opl4, struct opl4_voice *voice))</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct opl4_voice *voice;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; OPL4_MAX_VOICES; i++) {</div><div class='ctx'> 		voice = &amp;opl4-&gt;voices[i];</div><div class='ctx'> 		if (voice-&gt;chan)</div><div class='ctx'> 			func(opl4, voice);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opl4_update_volume(struct snd_opl4 *opl4, struct opl4_voice *voice)</div><div class='hunk'>@@ -486,7 +477,6 @@ void snd_opl4_note_on(void *private_data, int note, int vel, struct snd_midi_cha</div><div class='ctx'> 	struct opl4_voice *voice[2];</div><div class='ctx'> 	const struct opl4_sound *sound[2];</div><div class='ctx'> 	int voices = 0, i;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* determine the number of voices and voice parameters */</div><div class='ctx'> 	i = chan-&gt;drum_channel ? 0x80 : (chan-&gt;midi_program &amp; 0x7f);</div><div class='hunk'>@@ -501,42 +491,41 @@ void snd_opl4_note_on(void *private_data, int note, int vel, struct snd_midi_cha</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate and initialize the needed voices */</div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; voices; i++) {</div><div class='del'>-		voice[i] = snd_opl4_get_voice(opl4);</div><div class='del'>-		list_del(&amp;voice[i]-&gt;list);</div><div class='del'>-		list_add_tail(&amp;voice[i]-&gt;list, &amp;opl4-&gt;on_voices);</div><div class='del'>-		voice[i]-&gt;chan = chan;</div><div class='del'>-		voice[i]-&gt;note = note;</div><div class='del'>-		voice[i]-&gt;velocity = vel &amp; 0x7f;</div><div class='del'>-		voice[i]-&gt;sound = sound[i];</div><div class='del'>-	}</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;opl4-&gt;reg_lock) {</div><div class='add'>+		for (i = 0; i &lt; voices; i++) {</div><div class='add'>+			voice[i] = snd_opl4_get_voice(opl4);</div><div class='add'>+			list_move_tail(&amp;voice[i]-&gt;list, &amp;opl4-&gt;on_voices);</div><div class='add'>+			voice[i]-&gt;chan = chan;</div><div class='add'>+			voice[i]-&gt;note = note;</div><div class='add'>+			voice[i]-&gt;velocity = vel &amp; 0x7f;</div><div class='add'>+			voice[i]-&gt;sound = sound[i];</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* set tone number (triggers header loading) */</div><div class='del'>-	for (i = 0; i &lt; voices; i++) {</div><div class='del'>-		voice[i]-&gt;reg_f_number =</div><div class='del'>-			(sound[i]-&gt;tone &gt;&gt; 8) &amp; OPL4_TONE_NUMBER_BIT8;</div><div class='del'>-		snd_opl4_write(opl4, OPL4_REG_F_NUMBER + voice[i]-&gt;number,</div><div class='del'>-			       voice[i]-&gt;reg_f_number);</div><div class='del'>-		snd_opl4_write(opl4, OPL4_REG_TONE_NUMBER + voice[i]-&gt;number,</div><div class='del'>-			       sound[i]-&gt;tone &amp; 0xff);</div><div class='del'>-	}</div><div class='add'>+		/* set tone number (triggers header loading) */</div><div class='add'>+		for (i = 0; i &lt; voices; i++) {</div><div class='add'>+			voice[i]-&gt;reg_f_number =</div><div class='add'>+				(sound[i]-&gt;tone &gt;&gt; 8) &amp; OPL4_TONE_NUMBER_BIT8;</div><div class='add'>+			snd_opl4_write(opl4, OPL4_REG_F_NUMBER + voice[i]-&gt;number,</div><div class='add'>+				       voice[i]-&gt;reg_f_number);</div><div class='add'>+			snd_opl4_write(opl4, OPL4_REG_TONE_NUMBER + voice[i]-&gt;number,</div><div class='add'>+				       sound[i]-&gt;tone &amp; 0xff);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* set parameters which can be set while loading */</div><div class='del'>-	for (i = 0; i &lt; voices; i++) {</div><div class='del'>-		voice[i]-&gt;reg_misc = OPL4_LFO_RESET_BIT;</div><div class='del'>-		snd_opl4_update_pan(opl4, voice[i]);</div><div class='del'>-		snd_opl4_update_pitch(opl4, voice[i]);</div><div class='del'>-		voice[i]-&gt;level_direct = OPL4_LEVEL_DIRECT_BIT;</div><div class='del'>-		snd_opl4_update_volume(opl4, voice[i]);</div><div class='add'>+		/* set parameters which can be set while loading */</div><div class='add'>+		for (i = 0; i &lt; voices; i++) {</div><div class='add'>+			voice[i]-&gt;reg_misc = OPL4_LFO_RESET_BIT;</div><div class='add'>+			snd_opl4_update_pan(opl4, voice[i]);</div><div class='add'>+			snd_opl4_update_pitch(opl4, voice[i]);</div><div class='add'>+			voice[i]-&gt;level_direct = OPL4_LEVEL_DIRECT_BIT;</div><div class='add'>+			snd_opl4_update_volume(opl4, voice[i]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* wait for completion of loading */</div><div class='ctx'> 	snd_opl4_wait_for_wave_headers(opl4);</div><div class='ctx'> </div><div class='ctx'> 	/* set remaining parameters */</div><div class='del'>-	spin_lock_irqsave(&amp;opl4-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl4-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; voices; i++) {</div><div class='ctx'> 		snd_opl4_update_tone_parameters(opl4, voice[i]);</div><div class='ctx'> 		voice[i]-&gt;reg_lfo_vibrato = voice[i]-&gt;sound-&gt;reg_lfo_vibrato;</div><div class='hunk'>@@ -550,13 +539,11 @@ void snd_opl4_note_on(void *private_data, int note, int vel, struct snd_midi_cha</div><div class='ctx'> 		snd_opl4_write(opl4, OPL4_REG_MISC + voice[i]-&gt;number,</div><div class='ctx'> 			       voice[i]-&gt;reg_misc);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl4-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opl4_voice_off(struct snd_opl4 *opl4, struct opl4_voice *voice)</div><div class='ctx'> {</div><div class='del'>-	list_del(&amp;voice-&gt;list);</div><div class='del'>-	list_add_tail(&amp;voice-&gt;list, &amp;opl4-&gt;off_voices);</div><div class='add'>+	list_move_tail(&amp;voice-&gt;list, &amp;opl4-&gt;off_voices);</div><div class='ctx'> </div><div class='ctx'> 	voice-&gt;reg_misc &amp;= ~OPL4_KEY_ON_BIT;</div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MISC + voice-&gt;number, voice-&gt;reg_misc);</div><div class='hunk'>@@ -571,8 +558,7 @@ void snd_opl4_note_off(void *private_data, int note, int vel, struct snd_midi_ch</div><div class='ctx'> </div><div class='ctx'> static void snd_opl4_terminate_voice(struct snd_opl4 *opl4, struct opl4_voice *voice)</div><div class='ctx'> {</div><div class='del'>-	list_del(&amp;voice-&gt;list);</div><div class='del'>-	list_add_tail(&amp;voice-&gt;list, &amp;opl4-&gt;off_voices);</div><div class='add'>+	list_move_tail(&amp;voice-&gt;list, &amp;opl4-&gt;off_voices);</div><div class='ctx'> </div><div class='ctx'> 	voice-&gt;reg_misc = (voice-&gt;reg_misc &amp; ~OPL4_KEY_ON_BIT) | OPL4_DAMP_BIT;</div><div class='ctx'> 	snd_opl4_write(opl4, OPL4_REG_MISC + voice-&gt;number, voice-&gt;reg_misc);</div><div class='head'>diff --git a/sound/drivers/opl4/yrw801.c b/sound/drivers/opl4/yrw801.c<br/>index 6c335492d082..9e464b84b905 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/yrw801.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/opl4/yrw801.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/opl4/yrw801.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/opl4/yrw801.c</a></div><div class='hunk'>@@ -43,7 +43,7 @@ int snd_yrw801_detect(struct snd_opl4 *opl4)</div><div class='ctx'> 	snd_opl4_read_memory(opl4, buf, 0x1ffffe, 2);</div><div class='ctx'> 	if (buf[0] != 0x01)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	snd_printdd("YRW801 ROM version %02x.%02x\n", buf[0], buf[1]);</div><div class='add'>+	dev_dbg(opl4-&gt;card-&gt;dev, "YRW801 ROM version %02x.%02x\n", buf[0], buf[1]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/drivers/pcm-indirect2.c b/sound/drivers/pcm-indirect2.c<br/>deleted file mode 100644<br/>index 3c93c23e4883..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcm-indirect2.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcm-indirect2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,573 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Helper functions for indirect PCM data transfer to a simple FIFO in</div><div class='del'>- * hardware (small, no possibility to read "hardware io position",</div><div class='del'>- * updating position done by interrupt, ...)</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by 2007  Joachim Foerster &lt;JOFT@gmx.de&gt;</div><div class='del'>- *</div><div class='del'>- *  Based on "pcm-indirect.h" (alsa-driver-1.0.13) by</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *                   Jaroslav Kysela &lt;perex@suse.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* snd_printk/d() */</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-/* struct snd_pcm_substream, struct snd_pcm_runtime, snd_pcm_uframes_t</div><div class='del'>- * snd_pcm_period_elapsed() */</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pcm-indirect2.h"</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-/* jiffies */</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-void snd_pcm_indirect2_stat(struct snd_pcm_substream *substream,</div><div class='del'>-			    struct snd_pcm_indirect2 *rec)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int i;</div><div class='del'>-	int j;</div><div class='del'>-	int k;</div><div class='del'>-	int seconds = (rec-&gt;lastbytetime - rec-&gt;firstbytetime) / HZ;</div><div class='del'>-</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: mul_elapsed: %u, mul_elapsed_real: %d, "</div><div class='del'>-		   "irq_occured: %d\n",</div><div class='del'>-		   rec-&gt;mul_elapsed, rec-&gt;mul_elapsed_real, rec-&gt;irq_occured);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: min_multiple: %d (irqs/period)\n",</div><div class='del'>-		   rec-&gt;min_multiple);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: firstbytetime: %lu, lastbytetime: %lu, "</div><div class='del'>-		   "firstzerotime: %lu\n",</div><div class='del'>-		 rec-&gt;firstbytetime, rec-&gt;lastbytetime, rec-&gt;firstzerotime);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: bytes2hw: %u Bytes =&gt; (by runtime-&gt;rate) "</div><div class='del'>-		   "length: %d s\n",</div><div class='del'>-		 rec-&gt;bytes2hw, rec-&gt;bytes2hw / 2 / 2 / runtime-&gt;rate);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: (by measurement) length: %d =&gt; "</div><div class='del'>-		   "rate: %d Bytes/s = %d Frames/s|Hz\n",</div><div class='del'>-		   seconds, rec-&gt;bytes2hw / seconds,</div><div class='del'>-		   rec-&gt;bytes2hw / 2 / 2 / seconds);</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='del'>-		   "STAT: zeros2hw: %u = %d ms ~ %d * %d zero copies\n",</div><div class='del'>-		   rec-&gt;zeros2hw, ((rec-&gt;zeros2hw / 2 / 2) * 1000) /</div><div class='del'>-		   runtime-&gt;rate,</div><div class='del'>-		   rec-&gt;zeros2hw / (rec-&gt;hw_buffer_size / 2),</div><div class='del'>-		   (rec-&gt;hw_buffer_size / 2));</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: pointer_calls: %u, lastdifftime: %u\n",</div><div class='del'>-		   rec-&gt;pointer_calls, rec-&gt;lastdifftime);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: sw_io: %d, sw_data: %d\n", rec-&gt;sw_io,</div><div class='del'>-		   rec-&gt;sw_data);</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: byte_sizes[]:\n");</div><div class='del'>-	k = 0;</div><div class='del'>-	for (j = 0; j &lt; 8; j++) {</div><div class='del'>-		for (i = j * 8; i &lt; (j + 1) * 8; i++)</div><div class='del'>-			if (rec-&gt;byte_sizes[i] != 0) {</div><div class='del'>-				snd_printk(KERN_DEBUG "%u: %u",</div><div class='del'>-					   i, rec-&gt;byte_sizes[i]);</div><div class='del'>-				k++;</div><div class='del'>-			}</div><div class='del'>-		if (((k % 8) == 0) &amp;&amp; (k != 0)) {</div><div class='del'>-			snd_printk(KERN_DEBUG "\n");</div><div class='del'>-			k = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: zero_sizes[]:\n");</div><div class='del'>-	for (j = 0; j &lt; 8; j++) {</div><div class='del'>-		k = 0;</div><div class='del'>-		for (i = j * 8; i &lt; (j + 1) * 8; i++)</div><div class='del'>-			if (rec-&gt;zero_sizes[i] != 0)</div><div class='del'>-				snd_printk(KERN_DEBUG "%u: %u",</div><div class='del'>-					   i, rec-&gt;zero_sizes[i]);</div><div class='del'>-			else</div><div class='del'>-				k++;</div><div class='del'>-		if (!k)</div><div class='del'>-			snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: min_adds[]:\n");</div><div class='del'>-	for (j = 0; j &lt; 8; j++) {</div><div class='del'>-		if (rec-&gt;min_adds[j] != 0)</div><div class='del'>-			snd_printk(KERN_DEBUG "%u: %u", j, rec-&gt;min_adds[j]);</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	snd_printk(KERN_DEBUG "STAT: mul_adds[]:\n");</div><div class='del'>-	for (j = 0; j &lt; 8; j++) {</div><div class='del'>-		if (rec-&gt;mul_adds[j] != 0)</div><div class='del'>-			snd_printk(KERN_DEBUG "%u: %u", j, rec-&gt;mul_adds[j]);</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='del'>-		   "STAT: zero_times_saved: %d, zero_times_notsaved: %d\n",</div><div class='del'>-		   rec-&gt;zero_times_saved, rec-&gt;zero_times_notsaved);</div><div class='del'>-	/* snd_printk(KERN_DEBUG "STAT: zero_times[]\n");</div><div class='del'>-	i = 0;</div><div class='del'>-	for (j = 0; j &lt; 3750; j++) {</div><div class='del'>-		if (rec-&gt;zero_times[j] != 0) {</div><div class='del'>-			snd_printk(KERN_DEBUG "%u: %u", j, rec-&gt;zero_times[j]);</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-		if (((i % 8) == 0) &amp;&amp; (i != 0))</div><div class='del'>-			snd_printk(KERN_DEBUG "\n");</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_DEBUG "\n"); */</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * _internal_ helper function for playback/capture transfer function</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-snd_pcm_indirect2_increase_min_periods(struct snd_pcm_substream *substream,</div><div class='del'>-				       struct snd_pcm_indirect2 *rec,</div><div class='del'>-				       int isplay, int iscopy,</div><div class='del'>-				       unsigned int bytes)</div><div class='del'>-{</div><div class='del'>-	if (rec-&gt;min_periods &gt;= 0) {</div><div class='del'>-		if (iscopy) {</div><div class='del'>-			rec-&gt;sw_io += bytes;</div><div class='del'>-			if (rec-&gt;sw_io &gt;= rec-&gt;sw_buffer_size)</div><div class='del'>-				rec-&gt;sw_io -= rec-&gt;sw_buffer_size;</div><div class='del'>-		} else if (isplay) {</div><div class='del'>-			/* If application does not write data in multiples of</div><div class='del'>-			 * a period, move sw_data to the next correctly aligned</div><div class='del'>-			 * position, so that sw_io can converge to it (in the</div><div class='del'>-			 * next step).</div><div class='del'>-			 */</div><div class='del'>-			if (!rec-&gt;check_alignment) {</div><div class='del'>-				if (rec-&gt;bytes2hw %</div><div class='del'>-				    snd_pcm_lib_period_bytes(substream)) {</div><div class='del'>-					unsigned bytes2hw_aligned =</div><div class='del'>-					    (1 +</div><div class='del'>-					     (rec-&gt;bytes2hw /</div><div class='del'>-					      snd_pcm_lib_period_bytes</div><div class='del'>-					      (substream))) *</div><div class='del'>-					    snd_pcm_lib_period_bytes</div><div class='del'>-					    (substream);</div><div class='del'>-					rec-&gt;sw_data =</div><div class='del'>-					    bytes2hw_aligned %</div><div class='del'>-					    rec-&gt;sw_buffer_size;</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-					snd_printk(KERN_DEBUG</div><div class='del'>-						   "STAT: @re-align: aligned "</div><div class='del'>-						   "bytes2hw to next period "</div><div class='del'>-						   "size boundary: %d "</div><div class='del'>-						   "(instead of %d)\n",</div><div class='del'>-						   bytes2hw_aligned,</div><div class='del'>-						   rec-&gt;bytes2hw);</div><div class='del'>-					snd_printk(KERN_DEBUG</div><div class='del'>-						   "STAT: @re-align: sw_data "</div><div class='del'>-						   "moves to: %d\n",</div><div class='del'>-						   rec-&gt;sw_data);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				rec-&gt;check_alignment = 1;</div><div class='del'>-			}</div><div class='del'>-			/* We are at the end and are copying zeros into the</div><div class='del'>-			 * fifo.</div><div class='del'>-			 * Now, we have to make sure that sw_io is increased</div><div class='del'>-			 * until the position of sw_data: Filling the fifo with</div><div class='del'>-			 * the first zeros means, the last bytes were played.</div><div class='del'>-			 */</div><div class='del'>-			if (rec-&gt;sw_io != rec-&gt;sw_data) {</div><div class='del'>-				unsigned int diff;</div><div class='del'>-				if (rec-&gt;sw_data &gt; rec-&gt;sw_io)</div><div class='del'>-					diff = rec-&gt;sw_data - rec-&gt;sw_io;</div><div class='del'>-				else</div><div class='del'>-					diff = (rec-&gt;sw_buffer_size -</div><div class='del'>-						rec-&gt;sw_io) +</div><div class='del'>-						rec-&gt;sw_data;</div><div class='del'>-				if (bytes &gt;= diff)</div><div class='del'>-					rec-&gt;sw_io = rec-&gt;sw_data;</div><div class='del'>-				else {</div><div class='del'>-					rec-&gt;sw_io += bytes;</div><div class='del'>-					if (rec-&gt;sw_io &gt;= rec-&gt;sw_buffer_size)</div><div class='del'>-						rec-&gt;sw_io -=</div><div class='del'>-						    rec-&gt;sw_buffer_size;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rec-&gt;min_period_count += bytes;</div><div class='del'>-		if (rec-&gt;min_period_count &gt;= (rec-&gt;hw_buffer_size / 2)) {</div><div class='del'>-			rec-&gt;min_periods += (rec-&gt;min_period_count /</div><div class='del'>-					     (rec-&gt;hw_buffer_size / 2));</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-			if ((rec-&gt;min_period_count /</div><div class='del'>-			     (rec-&gt;hw_buffer_size / 2)) &gt; 7)</div><div class='del'>-				snd_printk(KERN_DEBUG</div><div class='del'>-					   "STAT: more than 7 (%d) min_adds "</div><div class='del'>-					   "at once - too big to save!\n",</div><div class='del'>-					   (rec-&gt;min_period_count /</div><div class='del'>-					    (rec-&gt;hw_buffer_size / 2)));</div><div class='del'>-			else</div><div class='del'>-				rec-&gt;min_adds[(rec-&gt;min_period_count /</div><div class='del'>-					       (rec-&gt;hw_buffer_size / 2))]++;</div><div class='del'>-#endif</div><div class='del'>-			rec-&gt;min_period_count = (rec-&gt;min_period_count %</div><div class='del'>-						 (rec-&gt;hw_buffer_size / 2));</div><div class='del'>-		}</div><div class='del'>-	} else if (isplay &amp;&amp; iscopy)</div><div class='del'>-		rec-&gt;min_periods = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * helper function for playback/capture pointer callback</div><div class='del'>- */</div><div class='del'>-snd_pcm_uframes_t</div><div class='del'>-snd_pcm_indirect2_pointer(struct snd_pcm_substream *substream,</div><div class='del'>-			  struct snd_pcm_indirect2 *rec)</div><div class='del'>-{</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-	rec-&gt;pointer_calls++;</div><div class='del'>-#endif</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, rec-&gt;sw_io);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * _internal_ helper function for playback interrupt callback</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-snd_pcm_indirect2_playback_transfer(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_indirect2 *rec,</div><div class='del'>-				    snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				    snd_pcm_indirect2_zero_t zero)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_uframes_t appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='del'>-</div><div class='del'>-	/* runtime-&gt;control-&gt;appl_ptr: position where ALSA will write next time</div><div class='del'>-	 * rec-&gt;appl_ptr: position where ALSA was last time</div><div class='del'>-	 * diff: obviously ALSA wrote that much bytes into the intermediate</div><div class='del'>-	 * buffer since we checked last time</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_sframes_t diff = appl_ptr - rec-&gt;appl_ptr;</div><div class='del'>-</div><div class='del'>-	if (diff) {</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		rec-&gt;lastdifftime = jiffies;</div><div class='del'>-#endif</div><div class='del'>-		if (diff &lt; -(snd_pcm_sframes_t) (runtime-&gt;boundary / 2))</div><div class='del'>-			diff += runtime-&gt;boundary;</div><div class='del'>-		/* number of bytes "added" by ALSA increases the number of</div><div class='del'>-		 * bytes which are ready to "be transfered to HW"/"played"</div><div class='del'>-		 * Then, set rec-&gt;appl_ptr to not count bytes twice next time.</div><div class='del'>-		 */</div><div class='del'>-		rec-&gt;sw_ready += (int)frames_to_bytes(runtime, diff);</div><div class='del'>-		rec-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	}</div><div class='del'>-	if (rec-&gt;hw_ready &amp;&amp; (rec-&gt;sw_ready &lt;= 0)) {</div><div class='del'>-		unsigned int bytes;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (rec-&gt;firstzerotime == 0) {</div><div class='del'>-			rec-&gt;firstzerotime = jiffies;</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: @firstzerotime: mul_elapsed: %d, "</div><div class='del'>-				   "min_period_count: %d\n",</div><div class='del'>-				   rec-&gt;mul_elapsed, rec-&gt;min_period_count);</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: @firstzerotime: sw_io: %d, "</div><div class='del'>-				   "sw_data: %d, appl_ptr: %u\n",</div><div class='del'>-				   rec-&gt;sw_io, rec-&gt;sw_data,</div><div class='del'>-				   (unsigned int)appl_ptr);</div><div class='del'>-		}</div><div class='del'>-		if ((jiffies - rec-&gt;firstzerotime) &lt; 3750) {</div><div class='del'>-			rec-&gt;zero_times[(jiffies - rec-&gt;firstzerotime)]++;</div><div class='del'>-			rec-&gt;zero_times_saved++;</div><div class='del'>-		} else</div><div class='del'>-			rec-&gt;zero_times_notsaved++;</div><div class='del'>-#endif</div><div class='del'>-		bytes = zero(substream, rec);</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		rec-&gt;zeros2hw += bytes;</div><div class='del'>-		if (bytes &lt; 64)</div><div class='del'>-			rec-&gt;zero_sizes[bytes]++;</div><div class='del'>-		else</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: %d zero Bytes copied to hardware at "</div><div class='del'>-				   "once - too big to save!\n",</div><div class='del'>-				   bytes);</div><div class='del'>-#endif</div><div class='del'>-		snd_pcm_indirect2_increase_min_periods(substream, rec, 1, 0,</div><div class='del'>-						       bytes);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	while (rec-&gt;hw_ready &amp;&amp; (rec-&gt;sw_ready &gt; 0)) {</div><div class='del'>-		/* sw_to_end: max. number of bytes that can be read/take from</div><div class='del'>-		 * the current position (sw_data) in _one_ step</div><div class='del'>-		 */</div><div class='del'>-		unsigned int sw_to_end = rec-&gt;sw_buffer_size - rec-&gt;sw_data;</div><div class='del'>-</div><div class='del'>-		/* bytes: number of bytes we have available (for reading) */</div><div class='del'>-		unsigned int bytes = rec-&gt;sw_ready;</div><div class='del'>-</div><div class='del'>-		if (sw_to_end &lt; bytes)</div><div class='del'>-			bytes = sw_to_end;</div><div class='del'>-		if (!bytes)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (rec-&gt;firstbytetime == 0)</div><div class='del'>-			rec-&gt;firstbytetime = jiffies;</div><div class='del'>-		rec-&gt;lastbytetime = jiffies;</div><div class='del'>-#endif</div><div class='del'>-		/* copy bytes from intermediate buffer position sw_data to the</div><div class='del'>-		 * HW and return number of bytes actually written</div><div class='del'>-		 * Furthermore, set hw_ready to 0, if the fifo isn't empty</div><div class='del'>-		 * now =&gt; more could be transfered to fifo</div><div class='del'>-		 */</div><div class='del'>-		bytes = copy(substream, rec, bytes);</div><div class='del'>-		rec-&gt;bytes2hw += bytes;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (bytes &lt; 64)</div><div class='del'>-			rec-&gt;byte_sizes[bytes]++;</div><div class='del'>-		else</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: %d Bytes copied to hardware at once "</div><div class='del'>-				   "- too big to save!\n",</div><div class='del'>-				   bytes);</div><div class='del'>-#endif</div><div class='del'>-		/* increase sw_data by the number of actually written bytes</div><div class='del'>-		 * (= number of taken bytes from intermediate buffer)</div><div class='del'>-		 */</div><div class='del'>-		rec-&gt;sw_data += bytes;</div><div class='del'>-		if (rec-&gt;sw_data == rec-&gt;sw_buffer_size)</div><div class='del'>-			rec-&gt;sw_data = 0;</div><div class='del'>-		/* now sw_data is the position where ALSA is going to write</div><div class='del'>-		 * in the intermediate buffer next time = position we are going</div><div class='del'>-		 * to read from next time</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		snd_pcm_indirect2_increase_min_periods(substream, rec, 1, 1,</div><div class='del'>-						       bytes);</div><div class='del'>-</div><div class='del'>-		/* we read bytes from intermediate buffer, so we need to say</div><div class='del'>-		 * that the number of bytes ready for transfer are decreased</div><div class='del'>-		 * now</div><div class='del'>-		 */</div><div class='del'>-		rec-&gt;sw_ready -= bytes;</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * helper function for playback interrupt routine</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-snd_pcm_indirect2_playback_interrupt(struct snd_pcm_substream *substream,</div><div class='del'>-				     struct snd_pcm_indirect2 *rec,</div><div class='del'>-				     snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				     snd_pcm_indirect2_zero_t zero)</div><div class='del'>-{</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-	rec-&gt;irq_occured++;</div><div class='del'>-#endif</div><div class='del'>-	/* hardware played some bytes, so there is room again (in fifo) */</div><div class='del'>-	rec-&gt;hw_ready = 1;</div><div class='del'>-</div><div class='del'>-	/* don't call ack() now, instead call transfer() function directly</div><div class='del'>-	 * (normally called by ack() )</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_indirect2_playback_transfer(substream, rec, copy, zero);</div><div class='del'>-</div><div class='del'>-	if (rec-&gt;min_periods &gt;= rec-&gt;min_multiple) {</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if ((rec-&gt;min_periods / rec-&gt;min_multiple) &gt; 7)</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: more than 7 (%d) mul_adds - too big "</div><div class='del'>-				   "to save!\n",</div><div class='del'>-				   (rec-&gt;min_periods / rec-&gt;min_multiple));</div><div class='del'>-		else</div><div class='del'>-			rec-&gt;mul_adds[(rec-&gt;min_periods /</div><div class='del'>-				       rec-&gt;min_multiple)]++;</div><div class='del'>-		rec-&gt;mul_elapsed_real += (rec-&gt;min_periods /</div><div class='del'>-					  rec-&gt;min_multiple);</div><div class='del'>-		rec-&gt;mul_elapsed++;</div><div class='del'>-#endif</div><div class='del'>-		rec-&gt;min_periods = (rec-&gt;min_periods % rec-&gt;min_multiple);</div><div class='del'>-		snd_pcm_period_elapsed(substream);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * _internal_ helper function for capture interrupt callback</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-snd_pcm_indirect2_capture_transfer(struct snd_pcm_substream *substream,</div><div class='del'>-				   struct snd_pcm_indirect2 *rec,</div><div class='del'>-				   snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				   snd_pcm_indirect2_zero_t null)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	snd_pcm_uframes_t appl_ptr = runtime-&gt;control-&gt;appl_ptr;</div><div class='del'>-	snd_pcm_sframes_t diff = appl_ptr - rec-&gt;appl_ptr;</div><div class='del'>-</div><div class='del'>-	if (diff) {</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		rec-&gt;lastdifftime = jiffies;</div><div class='del'>-#endif</div><div class='del'>-		if (diff &lt; -(snd_pcm_sframes_t) (runtime-&gt;boundary / 2))</div><div class='del'>-			diff += runtime-&gt;boundary;</div><div class='del'>-		rec-&gt;sw_ready -= frames_to_bytes(runtime, diff);</div><div class='del'>-		rec-&gt;appl_ptr = appl_ptr;</div><div class='del'>-	}</div><div class='del'>-	/* if hardware has something, but the intermediate buffer is full</div><div class='del'>-	 * =&gt; skip contents of buffer</div><div class='del'>-	 */</div><div class='del'>-	if (rec-&gt;hw_ready &amp;&amp; (rec-&gt;sw_ready &gt;= (int)rec-&gt;sw_buffer_size)) {</div><div class='del'>-		unsigned int bytes;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (rec-&gt;firstzerotime == 0) {</div><div class='del'>-			rec-&gt;firstzerotime = jiffies;</div><div class='del'>-			snd_printk(KERN_DEBUG "STAT: (capture) "</div><div class='del'>-				   "@firstzerotime: mul_elapsed: %d, "</div><div class='del'>-				   "min_period_count: %d\n",</div><div class='del'>-				   rec-&gt;mul_elapsed, rec-&gt;min_period_count);</div><div class='del'>-			snd_printk(KERN_DEBUG "STAT: (capture) "</div><div class='del'>-				   "@firstzerotime: sw_io: %d, sw_data: %d, "</div><div class='del'>-				   "appl_ptr: %u\n",</div><div class='del'>-				   rec-&gt;sw_io, rec-&gt;sw_data,</div><div class='del'>-				   (unsigned int)appl_ptr);</div><div class='del'>-		}</div><div class='del'>-		if ((jiffies - rec-&gt;firstzerotime) &lt; 3750) {</div><div class='del'>-			rec-&gt;zero_times[(jiffies - rec-&gt;firstzerotime)]++;</div><div class='del'>-			rec-&gt;zero_times_saved++;</div><div class='del'>-		} else</div><div class='del'>-			rec-&gt;zero_times_notsaved++;</div><div class='del'>-#endif</div><div class='del'>-		bytes = null(substream, rec);</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		rec-&gt;zeros2hw += bytes;</div><div class='del'>-		if (bytes &lt; 64)</div><div class='del'>-			rec-&gt;zero_sizes[bytes]++;</div><div class='del'>-		else</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: (capture) %d zero Bytes copied to "</div><div class='del'>-				   "hardware at once - too big to save!\n",</div><div class='del'>-				   bytes);</div><div class='del'>-#endif</div><div class='del'>-		snd_pcm_indirect2_increase_min_periods(substream, rec, 0, 0,</div><div class='del'>-						       bytes);</div><div class='del'>-		/* report an overrun */</div><div class='del'>-		rec-&gt;sw_io = SNDRV_PCM_POS_XRUN;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	while (rec-&gt;hw_ready &amp;&amp; (rec-&gt;sw_ready &lt; (int)rec-&gt;sw_buffer_size)) {</div><div class='del'>-		/* sw_to_end: max. number of bytes that we can write to the</div><div class='del'>-		 *  intermediate buffer (until it's end)</div><div class='del'>-		 */</div><div class='del'>-		size_t sw_to_end = rec-&gt;sw_buffer_size - rec-&gt;sw_data;</div><div class='del'>-</div><div class='del'>-		/* bytes: max. number of bytes, which may be copied to the</div><div class='del'>-		 *  intermediate buffer without overflow (in _one_ step)</div><div class='del'>-		 */</div><div class='del'>-		size_t bytes = rec-&gt;sw_buffer_size - rec-&gt;sw_ready;</div><div class='del'>-</div><div class='del'>-		/* limit number of bytes (for transfer) by available room in</div><div class='del'>-		 * the intermediate buffer</div><div class='del'>-		 */</div><div class='del'>-		if (sw_to_end &lt; bytes)</div><div class='del'>-			bytes = sw_to_end;</div><div class='del'>-		if (!bytes)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (rec-&gt;firstbytetime == 0)</div><div class='del'>-			rec-&gt;firstbytetime = jiffies;</div><div class='del'>-		rec-&gt;lastbytetime = jiffies;</div><div class='del'>-#endif</div><div class='del'>-		/* copy bytes from the intermediate buffer (position sw_data)</div><div class='del'>-		 * to the HW at most and return number of bytes actually copied</div><div class='del'>-		 * from HW</div><div class='del'>-		 * Furthermore, set hw_ready to 0, if the fifo is empty now.</div><div class='del'>-		 */</div><div class='del'>-		bytes = copy(substream, rec, bytes);</div><div class='del'>-		rec-&gt;bytes2hw += bytes;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if (bytes &lt; 64)</div><div class='del'>-			rec-&gt;byte_sizes[bytes]++;</div><div class='del'>-		else</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: (capture) %d Bytes copied to "</div><div class='del'>-				   "hardware at once - too big to save!\n",</div><div class='del'>-				   bytes);</div><div class='del'>-#endif</div><div class='del'>-		/* increase sw_data by the number of actually copied bytes from</div><div class='del'>-		 * HW</div><div class='del'>-		 */</div><div class='del'>-		rec-&gt;sw_data += bytes;</div><div class='del'>-		if (rec-&gt;sw_data == rec-&gt;sw_buffer_size)</div><div class='del'>-			rec-&gt;sw_data = 0;</div><div class='del'>-</div><div class='del'>-		snd_pcm_indirect2_increase_min_periods(substream, rec, 0, 1,</div><div class='del'>-						       bytes);</div><div class='del'>-</div><div class='del'>-		/* number of bytes in the intermediate buffer, which haven't</div><div class='del'>-		 * been fetched by ALSA yet.</div><div class='del'>-		 */</div><div class='del'>-		rec-&gt;sw_ready += bytes;</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * helper function for capture interrupt routine</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-snd_pcm_indirect2_capture_interrupt(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_indirect2 *rec,</div><div class='del'>-				    snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				    snd_pcm_indirect2_zero_t null)</div><div class='del'>-{</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-	rec-&gt;irq_occured++;</div><div class='del'>-#endif</div><div class='del'>-	/* hardware recorded some bytes, so there is something to read from the</div><div class='del'>-	 * record fifo:</div><div class='del'>-	 */</div><div class='del'>-	rec-&gt;hw_ready = 1;</div><div class='del'>-</div><div class='del'>-	/* don't call ack() now, instead call transfer() function directly</div><div class='del'>-	 * (normally called by ack() )</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_indirect2_capture_transfer(substream, rec, copy, null);</div><div class='del'>-</div><div class='del'>-	if (rec-&gt;min_periods &gt;= rec-&gt;min_multiple) {</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-		if ((rec-&gt;min_periods / rec-&gt;min_multiple) &gt; 7)</div><div class='del'>-			snd_printk(KERN_DEBUG</div><div class='del'>-				   "STAT: more than 7 (%d) mul_adds - "</div><div class='del'>-				   "too big to save!\n",</div><div class='del'>-				   (rec-&gt;min_periods / rec-&gt;min_multiple));</div><div class='del'>-		else</div><div class='del'>-			rec-&gt;mul_adds[(rec-&gt;min_periods /</div><div class='del'>-				       rec-&gt;min_multiple)]++;</div><div class='del'>-		rec-&gt;mul_elapsed_real += (rec-&gt;min_periods /</div><div class='del'>-					  rec-&gt;min_multiple);</div><div class='del'>-		rec-&gt;mul_elapsed++;</div><div class='del'>-#endif</div><div class='del'>-		rec-&gt;min_periods = (rec-&gt;min_periods % rec-&gt;min_multiple);</div><div class='del'>-		snd_pcm_period_elapsed(substream);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/sound/drivers/pcm-indirect2.h b/sound/drivers/pcm-indirect2.h<br/>deleted file mode 100644<br/>index 2ea6e460f348..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcm-indirect2.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcm-indirect2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Helper functions for indirect PCM data transfer to a simple FIFO in</div><div class='del'>- * hardware (small, no possibility to read "hardware io position",</div><div class='del'>- * updating position done by interrupt, ...)</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by 2007  Joachim Foerster &lt;JOFT@gmx.de&gt;</div><div class='del'>- *</div><div class='del'>- *  Based on "pcm-indirect.h" (alsa-driver-1.0.13) by</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *                   Jaroslav Kysela &lt;perex@suse.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SOUND_PCM_INDIRECT2_H</div><div class='del'>-#define __SOUND_PCM_INDIRECT2_H</div><div class='del'>-</div><div class='del'>-/* struct snd_pcm_substream, struct snd_pcm_runtime, snd_pcm_uframes_t */</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-</div><div class='del'>-/* Debug options for code which may be removed completely in a final version */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define SND_PCM_INDIRECT2_STAT    /* turn on some "statistics" about the</div><div class='del'>-				   * process of copying bytes from the</div><div class='del'>-				   * intermediate buffer to the hardware</div><div class='del'>-				   * fifo and the other way round</div><div class='del'>-				   */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct snd_pcm_indirect2 {</div><div class='del'>-	unsigned int hw_buffer_size;  /* Byte size of hardware buffer */</div><div class='del'>-	int hw_ready;		      /* playback: 1 = hw fifo has room left,</div><div class='del'>-				       * 0 = hw fifo is full</div><div class='del'>-				       */</div><div class='del'>-	unsigned int min_multiple;</div><div class='del'>-	int min_periods;	      /* counts number of min. periods until</div><div class='del'>-				       * min_multiple is reached</div><div class='del'>-				       */</div><div class='del'>-	int min_period_count;	      /* counts bytes to count number of</div><div class='del'>-				       * min. periods</div><div class='del'>-				       */</div><div class='del'>-</div><div class='del'>-	unsigned int sw_buffer_size;  /* Byte size of software buffer */</div><div class='del'>-</div><div class='del'>-	/* sw_data: position in intermediate buffer, where we will read (or</div><div class='del'>-	 *          write) from/to next time (to transfer data to/from HW)</div><div class='del'>-	 */</div><div class='del'>-	unsigned int sw_data;         /* Offset to next dst (or src) in sw</div><div class='del'>-				       * ring buffer</div><div class='del'>-				       */</div><div class='del'>-	/* easiest case (playback):</div><div class='del'>-	 * sw_data is nearly the same as ~ runtime-&gt;control-&gt;appl_ptr, with the</div><div class='del'>-	 * exception that sw_data is "behind" by the number if bytes ALSA wrote</div><div class='del'>-	 * to the intermediate buffer last time.</div><div class='del'>-	 * A call to ack() callback synchronizes both indirectly.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* We have no real sw_io pointer here. Usually sw_io is pointing to the</div><div class='del'>-	 * current playback/capture position _inside_ the hardware. Devices</div><div class='del'>-	 * with plain FIFOs often have no possibility to publish this position.</div><div class='del'>-	 * So we say: if sw_data is updated, that means bytes were copied to</div><div class='del'>-	 * the hardware, we increase sw_io by that amount, because there have</div><div class='del'>-	 * to be as much bytes which were played. So sw_io will stay behind</div><div class='del'>-	 * sw_data all the time and has to converge to sw_data at the end of</div><div class='del'>-	 * playback.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int sw_io;           /* Current software pointer in bytes */</div><div class='del'>-</div><div class='del'>-	/* sw_ready: number of bytes ALSA copied to the intermediate buffer, so</div><div class='del'>-	 * it represents the number of bytes which wait for transfer to the HW</div><div class='del'>-	 */</div><div class='del'>-	int sw_ready;		  /* Bytes ready to be transferred to/from hw */</div><div class='del'>-</div><div class='del'>-	/* appl_ptr: last known position of ALSA (where ALSA is going to write</div><div class='del'>-	 * next time into the intermediate buffer</div><div class='del'>-	 */</div><div class='del'>-	snd_pcm_uframes_t appl_ptr;   /* Last seen appl_ptr */</div><div class='del'>-</div><div class='del'>-	unsigned int bytes2hw;</div><div class='del'>-	int check_alignment;</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-	unsigned int zeros2hw;</div><div class='del'>-	unsigned int mul_elapsed;</div><div class='del'>-	unsigned int mul_elapsed_real;</div><div class='del'>-	unsigned long firstbytetime;</div><div class='del'>-	unsigned long lastbytetime;</div><div class='del'>-	unsigned long firstzerotime;</div><div class='del'>-	unsigned int byte_sizes[64];</div><div class='del'>-	unsigned int zero_sizes[64];</div><div class='del'>-	unsigned int min_adds[8];</div><div class='del'>-	unsigned int mul_adds[8];</div><div class='del'>-	unsigned int zero_times[3750];	/* = 15s */</div><div class='del'>-	unsigned int zero_times_saved;</div><div class='del'>-	unsigned int zero_times_notsaved;</div><div class='del'>-	unsigned int irq_occured;</div><div class='del'>-	unsigned int pointer_calls;</div><div class='del'>-	unsigned int lastdifftime;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef size_t (*snd_pcm_indirect2_copy_t) (struct snd_pcm_substream *substream,</div><div class='del'>-					   struct snd_pcm_indirect2 *rec,</div><div class='del'>-					   size_t bytes);</div><div class='del'>-typedef size_t (*snd_pcm_indirect2_zero_t) (struct snd_pcm_substream *substream,</div><div class='del'>-					   struct snd_pcm_indirect2 *rec);</div><div class='del'>-</div><div class='del'>-#ifdef SND_PCM_INDIRECT2_STAT</div><div class='del'>-void snd_pcm_indirect2_stat(struct snd_pcm_substream *substream,</div><div class='del'>-				   struct snd_pcm_indirect2 *rec);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-snd_pcm_uframes_t</div><div class='del'>-snd_pcm_indirect2_pointer(struct snd_pcm_substream *substream,</div><div class='del'>-			  struct snd_pcm_indirect2 *rec);</div><div class='del'>-void</div><div class='del'>-snd_pcm_indirect2_playback_interrupt(struct snd_pcm_substream *substream,</div><div class='del'>-				     struct snd_pcm_indirect2 *rec,</div><div class='del'>-				     snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				     snd_pcm_indirect2_zero_t zero);</div><div class='del'>-void</div><div class='del'>-snd_pcm_indirect2_capture_interrupt(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_indirect2 *rec,</div><div class='del'>-				    snd_pcm_indirect2_copy_t copy,</div><div class='del'>-				    snd_pcm_indirect2_zero_t null);</div><div class='del'>-</div><div class='del'>-#endif /* __SOUND_PCM_INDIRECT2_H */</div><div class='head'>diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c<br/>new file mode 100644<br/>index 000000000000..b8474631f0b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcmtest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcmtest.c</a></div><div class='hunk'>@@ -0,0 +1,780 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Virtual ALSA driver for PCM testing/fuzzing</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2023 Ivan Orlov &lt;ivan.orlov0322@gmail.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * This is a simple virtual ALSA driver, which can be used for audio applications/PCM middle layer</div><div class='add'>+ * testing or fuzzing.</div><div class='add'>+ * It can:</div><div class='add'>+ *	- Simulate 'playback' and 'capture' actions</div><div class='add'>+ *	- Generate random or pattern-based capture data</div><div class='add'>+ *	- Check playback buffer for containing looped template, and notify about the results</div><div class='add'>+ *	through the debugfs entry</div><div class='add'>+ *	- Inject delays into the playback and capturing processes. See 'inject_delay' parameter.</div><div class='add'>+ *	- Inject errors during the PCM callbacks.</div><div class='add'>+ *	- Register custom RESET ioctl and notify when it is called through the debugfs entry</div><div class='add'>+ *	- Work in interleaved and non-interleaved modes</div><div class='add'>+ *	- Support up to 8 substreams</div><div class='add'>+ *	- Support up to 4 channels</div><div class='add'>+ *	- Support framerates from 8 kHz to 48 kHz</div><div class='add'>+ *</div><div class='add'>+ * When driver works in the capture mode with multiple channels, it duplicates the looped</div><div class='add'>+ * pattern to each separate channel. For example, if we have 2 channels, format = U8, interleaved</div><div class='add'>+ * access mode and pattern 'abacaba', the DMA buffer will look like aabbccaabbaaaa..., so buffer for</div><div class='add'>+ * each channel will contain abacabaabacaba... Same for the non-interleaved mode.</div><div class='add'>+ *</div><div class='add'>+ * However, it may break the capturing on the higher framerates with small period size, so it is</div><div class='add'>+ * better to choose larger period sizes.</div><div class='add'>+ *</div><div class='add'>+ * You can find the corresponding selftest in the 'alsa' selftests folder.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#define TIMER_PER_SEC 5</div><div class='add'>+#define TIMER_INTERVAL (HZ / TIMER_PER_SEC)</div><div class='add'>+#define DELAY_JIFFIES HZ</div><div class='add'>+#define PLAYBACK_SUBSTREAM_CNT	8</div><div class='add'>+#define CAPTURE_SUBSTREAM_CNT	8</div><div class='add'>+#define MAX_CHANNELS_NUM	4</div><div class='add'>+</div><div class='add'>+#define DEFAULT_PATTERN		"abacaba"</div><div class='add'>+#define DEFAULT_PATTERN_LEN	7</div><div class='add'>+</div><div class='add'>+#define FILL_MODE_RAND	0</div><div class='add'>+#define FILL_MODE_PAT	1</div><div class='add'>+</div><div class='add'>+#define MAX_PATTERN_LEN 4096</div><div class='add'>+</div><div class='add'>+static int index = -1;</div><div class='add'>+static char *id = "pcmtest";</div><div class='add'>+static bool enable = true;</div><div class='add'>+static int inject_delay;</div><div class='add'>+static bool inject_hwpars_err;</div><div class='add'>+static bool inject_prepare_err;</div><div class='add'>+static bool inject_trigger_err;</div><div class='add'>+static bool inject_open_err;</div><div class='add'>+</div><div class='add'>+static short fill_mode = FILL_MODE_PAT;</div><div class='add'>+</div><div class='add'>+static u8 playback_capture_test;</div><div class='add'>+static u8 ioctl_reset_test;</div><div class='add'>+static struct dentry *driver_debug_dir;</div><div class='add'>+</div><div class='add'>+module_param(index, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for pcmtest soundcard");</div><div class='add'>+module_param(id, charp, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for pcmtest soundcard");</div><div class='add'>+module_param(enable, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable pcmtest soundcard.");</div><div class='add'>+module_param(fill_mode, short, 0600);</div><div class='add'>+MODULE_PARM_DESC(fill_mode, "Buffer fill mode: rand(0) or pattern(1)");</div><div class='add'>+module_param(inject_delay, int, 0600);</div><div class='add'>+MODULE_PARM_DESC(inject_delay, "Inject delays during playback/capture (in jiffies)");</div><div class='add'>+module_param(inject_hwpars_err, bool, 0600);</div><div class='add'>+MODULE_PARM_DESC(inject_hwpars_err, "Inject EBUSY error in the 'hw_params' callback");</div><div class='add'>+module_param(inject_prepare_err, bool, 0600);</div><div class='add'>+MODULE_PARM_DESC(inject_prepare_err, "Inject EINVAL error in the 'prepare' callback");</div><div class='add'>+module_param(inject_trigger_err, bool, 0600);</div><div class='add'>+MODULE_PARM_DESC(inject_trigger_err, "Inject EINVAL error in the 'trigger' callback");</div><div class='add'>+module_param(inject_open_err, bool, 0600);</div><div class='add'>+MODULE_PARM_DESC(inject_open_err, "Inject EBUSY error in the 'open' callback");</div><div class='add'>+</div><div class='add'>+struct pcmtst {</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pcmtst_buf_iter {</div><div class='add'>+	size_t buf_pos;				// position in the DMA buffer</div><div class='add'>+	size_t period_pos;			// period-relative position</div><div class='add'>+	size_t b_rw;				// Bytes to write on every timer tick</div><div class='add'>+	size_t s_rw_ch;				// Samples to write to one channel on every tick</div><div class='add'>+	unsigned int sample_bytes;		// sample_bits / 8</div><div class='add'>+	bool is_buf_corrupted;			// playback test result indicator</div><div class='add'>+	size_t period_bytes;			// bytes in a one period</div><div class='add'>+	bool interleaved;			// Interleaved/Non-interleaved mode</div><div class='add'>+	size_t total_bytes;			// Total bytes read/written</div><div class='add'>+	size_t chan_block;			// Bytes in one channel buffer when non-interleaved</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	bool suspend;				// We need to pause timer without shutting it down</div><div class='add'>+	struct timer_list timer_instance;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct snd_pcm_hardware snd_pcmtst_hw = {</div><div class='add'>+	.info = (SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+		 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+		 SNDRV_PCM_INFO_NONINTERLEAVED |</div><div class='add'>+		 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+		 SNDRV_PCM_INFO_PAUSE),</div><div class='add'>+	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+	.rates =		SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+	.rate_min =		8000,</div><div class='add'>+	.rate_max =		48000,</div><div class='add'>+	.channels_min =		1,</div><div class='add'>+	.channels_max =		MAX_CHANNELS_NUM,</div><div class='add'>+	.buffer_bytes_max =	128 * 1024,</div><div class='add'>+	.period_bytes_min =	4096,</div><div class='add'>+	.period_bytes_max =	32768,</div><div class='add'>+	.periods_min =		1,</div><div class='add'>+	.periods_max =		1024,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pattern_buf {</div><div class='add'>+	char *buf;</div><div class='add'>+	u32 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int buf_allocated;</div><div class='add'>+static struct pattern_buf patt_bufs[MAX_CHANNELS_NUM];</div><div class='add'>+</div><div class='add'>+static inline void inc_buf_pos(struct pcmtst_buf_iter *v_iter, size_t by, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	v_iter-&gt;total_bytes += by;</div><div class='add'>+	v_iter-&gt;buf_pos += by;</div><div class='add'>+	if (v_iter-&gt;buf_pos &gt;= bytes)</div><div class='add'>+		v_iter-&gt;buf_pos %= bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Position in the DMA buffer when we are in the non-interleaved mode. We increment buf_pos</div><div class='add'>+ * every time we write a byte to any channel, so the position in the current channel buffer is</div><div class='add'>+ * (position in the DMA buffer) / count_of_channels + size_of_channel_buf * current_channel</div><div class='add'>+ */</div><div class='add'>+static inline size_t buf_pos_n(struct pcmtst_buf_iter *v_iter, unsigned int channels,</div><div class='add'>+			       unsigned int chan_num)</div><div class='add'>+{</div><div class='add'>+	return v_iter-&gt;buf_pos / channels + v_iter-&gt;chan_block * chan_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get the count of bytes written for the current channel in the interleaved mode.</div><div class='add'>+ * This is (count of samples written for the current channel) * bytes_in_sample +</div><div class='add'>+ * (relative position in the current sample)</div><div class='add'>+ */</div><div class='add'>+static inline size_t ch_pos_i(size_t b_total, unsigned int channels, unsigned int b_sample)</div><div class='add'>+{</div><div class='add'>+	return b_total / channels / b_sample * b_sample + (b_total % b_sample);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_buf_block_i(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	short ch_num;</div><div class='add'>+	u8 current_byte;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; v_iter-&gt;b_rw; i++) {</div><div class='add'>+		current_byte = runtime-&gt;dma_area[v_iter-&gt;buf_pos];</div><div class='add'>+		if (!current_byte)</div><div class='add'>+			break;</div><div class='add'>+		ch_num = (v_iter-&gt;total_bytes / v_iter-&gt;sample_bytes) % runtime-&gt;channels;</div><div class='add'>+		if (current_byte != patt_bufs[ch_num].buf[ch_pos_i(v_iter-&gt;total_bytes,</div><div class='add'>+								   runtime-&gt;channels,</div><div class='add'>+								   v_iter-&gt;sample_bytes)</div><div class='add'>+							  % patt_bufs[ch_num].len]) {</div><div class='add'>+			v_iter-&gt;is_buf_corrupted = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		inc_buf_pos(v_iter, 1, runtime-&gt;dma_bytes);</div><div class='add'>+	}</div><div class='add'>+	// If we broke during the loop, add remaining bytes to the buffer position.</div><div class='add'>+	inc_buf_pos(v_iter, v_iter-&gt;b_rw - i, runtime-&gt;dma_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_buf_block_ni(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	unsigned int channels = runtime-&gt;channels;</div><div class='add'>+	size_t i;</div><div class='add'>+	short ch_num;</div><div class='add'>+	u8 current_byte;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; v_iter-&gt;b_rw; i++) {</div><div class='add'>+		ch_num = i % channels;</div><div class='add'>+		current_byte = runtime-&gt;dma_area[buf_pos_n(v_iter, channels, ch_num)];</div><div class='add'>+		if (!current_byte)</div><div class='add'>+			break;</div><div class='add'>+		if (current_byte != patt_bufs[ch_num].buf[(v_iter-&gt;total_bytes / channels)</div><div class='add'>+							  % patt_bufs[ch_num].len]) {</div><div class='add'>+			v_iter-&gt;is_buf_corrupted = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		inc_buf_pos(v_iter, 1, runtime-&gt;dma_bytes);</div><div class='add'>+	}</div><div class='add'>+	inc_buf_pos(v_iter, v_iter-&gt;b_rw - i, runtime-&gt;dma_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check one block of the buffer. Here we iterate the buffer until we find '0'. This condition is</div><div class='add'>+ * necessary because we need to detect when the reading/writing ends, so we assume that the pattern</div><div class='add'>+ * doesn't contain zeros.</div><div class='add'>+ */</div><div class='add'>+static void check_buf_block(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (v_iter-&gt;interleaved)</div><div class='add'>+		check_buf_block_i(v_iter, runtime);</div><div class='add'>+	else</div><div class='add'>+		check_buf_block_ni(v_iter, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fill buffer in the non-interleaved mode. The order of samples is C0, ..., C0, C1, ..., C1, C2...</div><div class='add'>+ * The channel buffers lay in the DMA buffer continuously (see default copy</div><div class='add'>+ * handlers in the pcm_lib.c file).</div><div class='add'>+ *</div><div class='add'>+ * Here we increment the DMA buffer position every time we write a byte to any channel 'buffer'.</div><div class='add'>+ * We need this to simulate the correct hardware pointer moving.</div><div class='add'>+ */</div><div class='add'>+static void fill_block_pattern_n(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	unsigned int channels = runtime-&gt;channels;</div><div class='add'>+	short ch_num;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; v_iter-&gt;b_rw; i++) {</div><div class='add'>+		ch_num = i % channels;</div><div class='add'>+		runtime-&gt;dma_area[buf_pos_n(v_iter, channels, ch_num)] =</div><div class='add'>+			patt_bufs[ch_num].buf[(v_iter-&gt;total_bytes / channels)</div><div class='add'>+					      % patt_bufs[ch_num].len];</div><div class='add'>+		inc_buf_pos(v_iter, 1, runtime-&gt;dma_bytes);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fill buffer in the interleaved mode. The order of samples is C0, C1, C2, C0, C1, C2, ...</div><div class='add'>+static void fill_block_pattern_i(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	size_t sample;</div><div class='add'>+	size_t pos_in_ch, pos_pattern;</div><div class='add'>+	short ch, pos_sample;</div><div class='add'>+</div><div class='add'>+	pos_in_ch = ch_pos_i(v_iter-&gt;total_bytes, runtime-&gt;channels, v_iter-&gt;sample_bytes);</div><div class='add'>+</div><div class='add'>+	for (sample = 0; sample &lt; v_iter-&gt;s_rw_ch; sample++) {</div><div class='add'>+		for (ch = 0; ch &lt; runtime-&gt;channels; ch++) {</div><div class='add'>+			for (pos_sample = 0; pos_sample &lt; v_iter-&gt;sample_bytes; pos_sample++) {</div><div class='add'>+				pos_pattern = (pos_in_ch + sample * v_iter-&gt;sample_bytes</div><div class='add'>+					      + pos_sample) % patt_bufs[ch].len;</div><div class='add'>+				runtime-&gt;dma_area[v_iter-&gt;buf_pos] = patt_bufs[ch].buf[pos_pattern];</div><div class='add'>+				inc_buf_pos(v_iter, 1, runtime-&gt;dma_bytes);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_block_pattern(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (v_iter-&gt;interleaved)</div><div class='add'>+		fill_block_pattern_i(v_iter, runtime);</div><div class='add'>+	else</div><div class='add'>+		fill_block_pattern_n(v_iter, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_block_rand_n(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	unsigned int channels = runtime-&gt;channels;</div><div class='add'>+	// Remaining space in all channel buffers</div><div class='add'>+	size_t bytes_remain = runtime-&gt;dma_bytes - v_iter-&gt;buf_pos;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; channels; i++) {</div><div class='add'>+		if (v_iter-&gt;b_rw &lt;= bytes_remain) {</div><div class='add'>+			//b_rw - count of bytes must be written for all channels at each timer tick</div><div class='add'>+			get_random_bytes(runtime-&gt;dma_area + buf_pos_n(v_iter, channels, i),</div><div class='add'>+					 v_iter-&gt;b_rw / channels);</div><div class='add'>+		} else {</div><div class='add'>+			// Write to the end of buffer and start from the beginning of it</div><div class='add'>+			get_random_bytes(runtime-&gt;dma_area + buf_pos_n(v_iter, channels, i),</div><div class='add'>+					 bytes_remain / channels);</div><div class='add'>+			get_random_bytes(runtime-&gt;dma_area + v_iter-&gt;chan_block * i,</div><div class='add'>+					 (v_iter-&gt;b_rw - bytes_remain) / channels);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	inc_buf_pos(v_iter, v_iter-&gt;b_rw, runtime-&gt;dma_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_block_rand_i(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	size_t in_cur_block = runtime-&gt;dma_bytes - v_iter-&gt;buf_pos;</div><div class='add'>+</div><div class='add'>+	if (v_iter-&gt;b_rw &lt;= in_cur_block) {</div><div class='add'>+		get_random_bytes(&amp;runtime-&gt;dma_area[v_iter-&gt;buf_pos], v_iter-&gt;b_rw);</div><div class='add'>+	} else {</div><div class='add'>+		get_random_bytes(&amp;runtime-&gt;dma_area[v_iter-&gt;buf_pos], in_cur_block);</div><div class='add'>+		get_random_bytes(runtime-&gt;dma_area, v_iter-&gt;b_rw - in_cur_block);</div><div class='add'>+	}</div><div class='add'>+	inc_buf_pos(v_iter, v_iter-&gt;b_rw, runtime-&gt;dma_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_block_random(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (v_iter-&gt;interleaved)</div><div class='add'>+		fill_block_rand_i(v_iter, runtime);</div><div class='add'>+	else</div><div class='add'>+		fill_block_rand_n(v_iter, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fill_block(struct pcmtst_buf_iter *v_iter, struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	switch (fill_mode) {</div><div class='add'>+	case FILL_MODE_RAND:</div><div class='add'>+		fill_block_random(v_iter, runtime);</div><div class='add'>+		break;</div><div class='add'>+	case FILL_MODE_PAT:</div><div class='add'>+		fill_block_pattern(v_iter, runtime);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Here we iterate through the buffer by (buffer_size / iterates_per_second) bytes.</div><div class='add'>+ * The driver uses timer to simulate the hardware pointer moving, and notify the PCM middle layer</div><div class='add'>+ * about period elapsed.</div><div class='add'>+ */</div><div class='add'>+static void timer_timeout(struct timer_list *data)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst_buf_iter *v_iter;</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+</div><div class='add'>+	v_iter = timer_container_of(v_iter, data, timer_instance);</div><div class='add'>+	substream = v_iter-&gt;substream;</div><div class='add'>+</div><div class='add'>+	if (v_iter-&gt;suspend)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp; !v_iter-&gt;is_buf_corrupted)</div><div class='add'>+		check_buf_block(v_iter, substream-&gt;runtime);</div><div class='add'>+	else if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+		fill_block(v_iter, substream-&gt;runtime);</div><div class='add'>+	else</div><div class='add'>+		inc_buf_pos(v_iter, v_iter-&gt;b_rw, substream-&gt;runtime-&gt;dma_bytes);</div><div class='add'>+</div><div class='add'>+	v_iter-&gt;period_pos += v_iter-&gt;b_rw;</div><div class='add'>+	if (v_iter-&gt;period_pos &gt;= v_iter-&gt;period_bytes) {</div><div class='add'>+		v_iter-&gt;period_pos %= v_iter-&gt;period_bytes;</div><div class='add'>+		snd_pcm_period_elapsed(substream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!v_iter-&gt;suspend)</div><div class='add'>+		mod_timer(&amp;v_iter-&gt;timer_instance, jiffies + TIMER_INTERVAL + inject_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct pcmtst_buf_iter *v_iter;</div><div class='add'>+</div><div class='add'>+	if (inject_open_err)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	v_iter = kzalloc(sizeof(*v_iter), GFP_KERNEL);</div><div class='add'>+	if (!v_iter)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	v_iter-&gt;substream = substream;</div><div class='add'>+	runtime-&gt;hw = snd_pcmtst_hw;</div><div class='add'>+	runtime-&gt;private_data = v_iter;</div><div class='add'>+</div><div class='add'>+	playback_capture_test = 0;</div><div class='add'>+	ioctl_reset_test = 0;</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;v_iter-&gt;timer_instance, timer_timeout, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst_buf_iter *v_iter = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;v_iter-&gt;timer_instance);</div><div class='add'>+	playback_capture_test = !v_iter-&gt;is_buf_corrupted;</div><div class='add'>+	kfree(v_iter);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void reset_buf_iterator(struct pcmtst_buf_iter *v_iter)</div><div class='add'>+{</div><div class='add'>+	v_iter-&gt;buf_pos = 0;</div><div class='add'>+	v_iter-&gt;is_buf_corrupted = false;</div><div class='add'>+	v_iter-&gt;period_pos = 0;</div><div class='add'>+	v_iter-&gt;total_bytes = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void start_pcmtest_timer(struct pcmtst_buf_iter *v_iter)</div><div class='add'>+{</div><div class='add'>+	v_iter-&gt;suspend = false;</div><div class='add'>+	mod_timer(&amp;v_iter-&gt;timer_instance, jiffies + TIMER_INTERVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst_buf_iter *v_iter = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (inject_trigger_err)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		reset_buf_iterator(v_iter);</div><div class='add'>+		start_pcmtest_timer(v_iter);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+		start_pcmtest_timer(v_iter);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+		// We can't call timer_shutdown_sync here, as it is forbidden to sleep here</div><div class='add'>+		v_iter-&gt;suspend = true;</div><div class='add'>+		timer_delete(&amp;v_iter-&gt;timer_instance);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t snd_pcmtst_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst_buf_iter *v_iter = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime, v_iter-&gt;buf_pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_free(struct pcmtst *pcmtst)</div><div class='add'>+{</div><div class='add'>+	if (!pcmtst)</div><div class='add'>+		return 0;</div><div class='add'>+	kfree(pcmtst);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// These callbacks are required, but empty - all freeing occurs in pdev_remove</div><div class='add'>+static int snd_pcmtst_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pcmtst_pdev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct pcmtst_buf_iter *v_iter = runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (inject_prepare_err)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	v_iter-&gt;sample_bytes = samples_to_bytes(runtime, 1);</div><div class='add'>+	v_iter-&gt;period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='add'>+	v_iter-&gt;interleaved = true;</div><div class='add'>+	if (runtime-&gt;access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ||</div><div class='add'>+	    runtime-&gt;access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) {</div><div class='add'>+		v_iter-&gt;chan_block = snd_pcm_lib_buffer_bytes(substream) / runtime-&gt;channels;</div><div class='add'>+		v_iter-&gt;interleaved = false;</div><div class='add'>+	}</div><div class='add'>+	// We want to record RATE * ch_cnt samples per sec, it is rate * sample_bytes * ch_cnt bytes</div><div class='add'>+	v_iter-&gt;s_rw_ch = runtime-&gt;rate / TIMER_PER_SEC;</div><div class='add'>+	v_iter-&gt;b_rw = v_iter-&gt;s_rw_ch * v_iter-&gt;sample_bytes * runtime-&gt;channels;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				    struct snd_pcm_hw_params *params)</div><div class='add'>+{</div><div class='add'>+	if (inject_hwpars_err)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg)</div><div class='add'>+{</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_IOCTL1_RESET:</div><div class='add'>+		ioctl_reset_test = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_sync_stop(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst_buf_iter *v_iter = substream-&gt;runtime-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;v_iter-&gt;timer_instance);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops snd_pcmtst_playback_ops = {</div><div class='add'>+	.open =		snd_pcmtst_pcm_open,</div><div class='add'>+	.close =	snd_pcmtst_pcm_close,</div><div class='add'>+	.trigger =	snd_pcmtst_pcm_trigger,</div><div class='add'>+	.hw_params =	snd_pcmtst_pcm_hw_params,</div><div class='add'>+	.ioctl =	snd_pcmtst_ioctl,</div><div class='add'>+	.sync_stop =	snd_pcmtst_sync_stop,</div><div class='add'>+	.hw_free =	snd_pcmtst_pcm_hw_free,</div><div class='add'>+	.prepare =	snd_pcmtst_pcm_prepare,</div><div class='add'>+	.pointer =	snd_pcmtst_pcm_pointer,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops snd_pcmtst_capture_ops = {</div><div class='add'>+	.open =		snd_pcmtst_pcm_open,</div><div class='add'>+	.close =	snd_pcmtst_pcm_close,</div><div class='add'>+	.trigger =	snd_pcmtst_pcm_trigger,</div><div class='add'>+	.hw_params =	snd_pcmtst_pcm_hw_params,</div><div class='add'>+	.hw_free =	snd_pcmtst_pcm_hw_free,</div><div class='add'>+	.ioctl =	snd_pcmtst_ioctl,</div><div class='add'>+	.sync_stop =	snd_pcmtst_sync_stop,</div><div class='add'>+	.prepare =	snd_pcmtst_pcm_prepare,</div><div class='add'>+	.pointer =	snd_pcmtst_pcm_pointer,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_new_pcm(struct pcmtst *pcmtst)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(pcmtst-&gt;card, "PCMTest", 0, PLAYBACK_SUBSTREAM_CNT,</div><div class='add'>+			  CAPTURE_SUBSTREAM_CNT, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	pcm-&gt;private_data = pcmtst;</div><div class='add'>+	strscpy(pcm-&gt;name, "PCMTest");</div><div class='add'>+	pcmtst-&gt;pcm = pcm;</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_pcmtst_playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_pcmtst_capture_ops);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;pcmtst-&gt;pdev-&gt;dev,</div><div class='add'>+					     0, 128 * 1024);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_pcmtst_create(struct snd_card *card, struct platform_device *pdev,</div><div class='add'>+			     struct pcmtst **r_pcmtst)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst *pcmtst;</div><div class='add'>+	int err;</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_free = snd_pcmtst_dev_free,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	pcmtst = kzalloc(sizeof(*pcmtst), GFP_KERNEL);</div><div class='add'>+	if (!pcmtst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pcmtst-&gt;card = card;</div><div class='add'>+	pcmtst-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, pcmtst, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto _err_free_chip;</div><div class='add'>+</div><div class='add'>+	err = snd_pcmtst_new_pcm(pcmtst);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto _err_free_chip;</div><div class='add'>+</div><div class='add'>+	*r_pcmtst = pcmtst;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+_err_free_chip:</div><div class='add'>+	snd_pcmtst_free(pcmtst);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcmtst_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct pcmtst *pcmtst;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_devm_card_new(&amp;pdev-&gt;dev, index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcmtst_create(card, pdev, &amp;pcmtst);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "PCM-TEST Driver");</div><div class='add'>+	strscpy(card-&gt;shortname, "PCM-Test");</div><div class='add'>+	strscpy(card-&gt;longname, "PCM-Test virtual driver");</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, pcmtst);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdev_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pcmtst *pcmtst = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	snd_pcmtst_free(pcmtst);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_device pcmtst_pdev = {</div><div class='add'>+	.name =		"pcmtest",</div><div class='add'>+	.dev.release =	pcmtst_pdev_release,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver pcmtst_pdrv = {</div><div class='add'>+	.probe =	pcmtst_probe,</div><div class='add'>+	.remove =	pdev_remove,</div><div class='add'>+	.driver =	{</div><div class='add'>+		.name = "pcmtest",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t pattern_write(struct file *file, const char __user *u_buff, size_t len, loff_t *off)</div><div class='add'>+{</div><div class='add'>+	struct pattern_buf *patt_buf = file-&gt;f_inode-&gt;i_private;</div><div class='add'>+	ssize_t to_write = len;</div><div class='add'>+</div><div class='add'>+	if (*off + to_write &gt; MAX_PATTERN_LEN)</div><div class='add'>+		to_write = MAX_PATTERN_LEN - *off;</div><div class='add'>+</div><div class='add'>+	// Crop silently everything over the buffer</div><div class='add'>+	if (to_write &lt;= 0)</div><div class='add'>+		return len;</div><div class='add'>+</div><div class='add'>+	if (copy_from_user(patt_buf-&gt;buf + *off, u_buff, to_write))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	patt_buf-&gt;len = *off + to_write;</div><div class='add'>+	*off += to_write;</div><div class='add'>+</div><div class='add'>+	return to_write;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pattern_read(struct file *file, char __user *u_buff, size_t len, loff_t *off)</div><div class='add'>+{</div><div class='add'>+	struct pattern_buf *patt_buf = file-&gt;f_inode-&gt;i_private;</div><div class='add'>+	ssize_t to_read = len;</div><div class='add'>+</div><div class='add'>+	if (*off + to_read &gt;= MAX_PATTERN_LEN)</div><div class='add'>+		to_read = MAX_PATTERN_LEN - *off;</div><div class='add'>+	if (to_read &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(u_buff, patt_buf-&gt;buf + *off, to_read))</div><div class='add'>+		to_read = 0;</div><div class='add'>+	else</div><div class='add'>+		*off += to_read;</div><div class='add'>+</div><div class='add'>+	return to_read;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct file_operations fill_pattern_fops = {</div><div class='add'>+	.read = pattern_read,</div><div class='add'>+	.write = pattern_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int setup_patt_bufs(void)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(patt_bufs); i++) {</div><div class='add'>+		patt_bufs[i].buf = kmalloc(MAX_PATTERN_LEN, GFP_KERNEL);</div><div class='add'>+		if (!patt_bufs[i].buf)</div><div class='add'>+			break;</div><div class='add'>+		strscpy_pad(patt_bufs[i].buf, DEFAULT_PATTERN, MAX_PATTERN_LEN);</div><div class='add'>+		patt_bufs[i].len = DEFAULT_PATTERN_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const pattern_files[] = { "fill_pattern0", "fill_pattern1",</div><div class='add'>+					      "fill_pattern2", "fill_pattern3"};</div><div class='add'>+static int init_debug_files(int buf_count)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+	char len_file_name[32];</div><div class='add'>+</div><div class='add'>+	driver_debug_dir = debugfs_create_dir("pcmtest", NULL);</div><div class='add'>+	if (IS_ERR(driver_debug_dir))</div><div class='add'>+		return PTR_ERR(driver_debug_dir);</div><div class='add'>+	debugfs_create_u8("pc_test", 0444, driver_debug_dir, &amp;playback_capture_test);</div><div class='add'>+	debugfs_create_u8("ioctl_test", 0444, driver_debug_dir, &amp;ioctl_reset_test);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; buf_count; i++) {</div><div class='add'>+		debugfs_create_file(pattern_files[i], 0600, driver_debug_dir,</div><div class='add'>+				    &amp;patt_bufs[i], &amp;fill_pattern_fops);</div><div class='add'>+		snprintf(len_file_name, sizeof(len_file_name), "%s_len", pattern_files[i]);</div><div class='add'>+		debugfs_create_u32(len_file_name, 0444, driver_debug_dir, &amp;patt_bufs[i].len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void free_pattern_buffers(void)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; buf_allocated; i++)</div><div class='add'>+		kfree(patt_bufs[i].buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_debug_files(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(driver_debug_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init mod_init(void)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	buf_allocated = setup_patt_bufs();</div><div class='add'>+	if (!buf_allocated)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snd_pcmtst_hw.channels_max = buf_allocated;</div><div class='add'>+</div><div class='add'>+	err = init_debug_files(buf_allocated);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = platform_device_register(&amp;pcmtst_pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = platform_driver_register(&amp;pcmtst_pdrv);</div><div class='add'>+	if (err)</div><div class='add'>+		platform_device_unregister(&amp;pcmtst_pdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit mod_exit(void)</div><div class='add'>+{</div><div class='add'>+	clear_debug_files();</div><div class='add'>+	free_pattern_buffers();</div><div class='add'>+</div><div class='add'>+	platform_driver_unregister(&amp;pcmtst_pdrv);</div><div class='add'>+	platform_device_unregister(&amp;pcmtst_pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Virtual ALSA driver for PCM testing/fuzzing");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Ivan Orlov");</div><div class='add'>+module_init(mod_init);</div><div class='add'>+module_exit(mod_exit);</div><div class='head'>diff --git a/sound/drivers/pcsp/Makefile b/sound/drivers/pcsp/Makefile<br/>index b19555b440da..309c09497261 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='del'>-snd-pcsp-objs := pcsp.o pcsp_lib.o pcsp_mixer.o pcsp_input.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-pcsp-y := pcsp.o pcsp_lib.o pcsp_mixer.o pcsp_input.o</div><div class='ctx'> obj-$(CONFIG_SND_PCSP) += snd-pcsp.o</div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c<br/>index f165c77d6273..ff6bb375c900 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * PC-Speaker driver for Linux</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,27 +7,27 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/bitops.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='ctx'> #include "pcsp_input.h"</div><div class='ctx'> #include "pcsp.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Stas Sergeev &lt;stsp@users.sourceforge.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PC-Speaker driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{PC-Speaker, pcsp}}");</div><div class='ctx'> MODULE_ALIAS("platform:pcspkr");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='del'>-static int enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */</div><div class='del'>-static int nopcm;	/* Disable PCM capability of the driver */</div><div class='add'>+static bool enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */</div><div class='add'>+static bool nopcm;	/* Disable PCM capability of the driver */</div><div class='ctx'> </div><div class='ctx'> module_param(index, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for pcsp soundcard.");</div><div class='hunk'>@@ -39,32 +40,30 @@ MODULE_PARM_DESC(nopcm, "Disable PC-Speaker PCM sound. Only beeps remain.");</div><div class='ctx'> </div><div class='ctx'> struct snd_pcsp pcsp_chip;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_pcsp_create(struct snd_card *card)</div><div class='add'>+static int snd_pcsp_create(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = { };</div><div class='del'>-	struct timespec tp;</div><div class='del'>-	int err;</div><div class='add'>+	unsigned int resolution = hrtimer_resolution;</div><div class='ctx'> 	int div, min_div, order;</div><div class='ctx'> </div><div class='ctx'> 	if (!nopcm) {</div><div class='del'>-		hrtimer_get_res(CLOCK_MONOTONIC, &amp;tp);</div><div class='del'>-		if (tp.tv_sec || tp.tv_nsec &gt; PCSP_MAX_PERIOD_NS) {</div><div class='del'>-			printk(KERN_ERR "PCSP: Timer resolution is not sufficient "</div><div class='del'>-				"(%linS)\n", tp.tv_nsec);</div><div class='del'>-			printk(KERN_ERR "PCSP: Make sure you have HPET and ACPI "</div><div class='del'>-				"enabled.\n");</div><div class='del'>-			printk(KERN_ERR "PCSP: Turned into nopcm mode.\n");</div><div class='add'>+		if (resolution &gt; PCSP_MAX_PERIOD_NS) {</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"PCSP: Timer resolution is not sufficient (%unS)\n",</div><div class='add'>+				resolution);</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"PCSP: Make sure you have HPET and ACPI enabled.\n");</div><div class='add'>+			dev_err(card-&gt;dev, "PCSP: Turned into nopcm mode.\n");</div><div class='ctx'> 			nopcm = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (loops_per_jiffy &gt;= PCSP_MIN_LPJ &amp;&amp; tp.tv_nsec &lt;= PCSP_MIN_PERIOD_NS)</div><div class='add'>+	if (loops_per_jiffy &gt;= PCSP_MIN_LPJ &amp;&amp; resolution &lt;= PCSP_MIN_PERIOD_NS)</div><div class='ctx'> 		min_div = MIN_DIV;</div><div class='ctx'> 	else</div><div class='ctx'> 		min_div = MAX_DIV;</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "PCSP: lpj=%li, min_div=%i, res=%li\n",</div><div class='del'>-	       loops_per_jiffy, min_div, tp.tv_nsec);</div><div class='add'>+	dev_dbg(card-&gt;dev, "PCSP: lpj=%li, min_div=%i, res=%u\n",</div><div class='add'>+		loops_per_jiffy, min_div, resolution);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	div = MAX_DIV / min_div;</div><div class='hunk'>@@ -84,16 +83,19 @@ static int __devinit snd_pcsp_create(struct snd_card *card)</div><div class='ctx'> 	pcsp_chip.port = 0x61;</div><div class='ctx'> 	pcsp_chip.irq = -1;</div><div class='ctx'> 	pcsp_chip.dma = -1;</div><div class='del'>-</div><div class='del'>-	/* Register device */</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, &amp;pcsp_chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	card-&gt;private_data = &amp;pcsp_chip;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)</div><div class='add'>+static void pcsp_stop_beep(struct snd_pcsp *chip);</div><div class='add'>+</div><div class='add'>+static void alsa_card_pcsp_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	pcsp_stop_beep(card-&gt;private_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_card_pcsp_probe(int devnum, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -101,72 +103,58 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)</div><div class='ctx'> 	if (devnum != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	hrtimer_init(&amp;pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-	pcsp_chip.timer.function = pcsp_do_timer;</div><div class='add'>+	hrtimer_setup(&amp;pcsp_chip.timer, pcsp_do_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(dev, index, id, THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcsp_create(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (!nopcm) {</div><div class='ctx'> 		err = snd_pcsp_new_pcm(&amp;pcsp_chip);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_pcsp_new_mixer(&amp;pcsp_chip, nopcm);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(pcsp_chip.card, dev);</div><div class='del'>-</div><div class='del'>-	strcpy(card-&gt;driver, "PC-Speaker");</div><div class='del'>-	strcpy(card-&gt;shortname, "pcsp");</div><div class='add'>+	strscpy(card-&gt;driver, "PC-Speaker");</div><div class='add'>+	strscpy(card-&gt;shortname, "pcsp");</div><div class='ctx'> 	sprintf(card-&gt;longname, "Internal PC-Speaker at port 0x%x",</div><div class='ctx'> 		pcsp_chip.port);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+	card-&gt;private_free = alsa_card_pcsp_free;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit alsa_card_pcsp_init(struct device *dev)</div><div class='add'>+static int alsa_card_pcsp_init(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_pcsp_probe(0, dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "PC-Speaker initialization failed.\n");</div><div class='add'>+		dev_err(dev, "PC-Speaker initialization failed.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_DEBUG_PAGEALLOC</div><div class='ctx'> 	/* Well, CONFIG_DEBUG_PAGEALLOC makes the sound horrible. Lets alert */</div><div class='del'>-	printk(KERN_WARNING "PCSP: CONFIG_DEBUG_PAGEALLOC is enabled, "</div><div class='del'>-	       "which may make the sound noisy.\n");</div><div class='del'>-#endif</div><div class='add'>+	if (debug_pagealloc_enabled()) {</div><div class='add'>+		dev_warn(dev,</div><div class='add'>+			 "PCSP: CONFIG_DEBUG_PAGEALLOC is enabled, which may make the sound noisy.\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit alsa_card_pcsp_exit(struct snd_pcsp *chip)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(chip-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit pcsp_probe(struct platform_device *dev)</div><div class='add'>+static int pcsp_probe(struct platform_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -175,41 +163,27 @@ static int __devinit pcsp_probe(struct platform_device *dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = alsa_card_pcsp_init(&amp;dev-&gt;dev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pcspkr_input_remove(pcsp_chip.input_dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(dev, &amp;pcsp_chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit pcsp_remove(struct platform_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcsp *chip = platform_get_drvdata(dev);</div><div class='del'>-	alsa_card_pcsp_exit(chip);</div><div class='del'>-	pcspkr_input_remove(chip-&gt;input_dev);</div><div class='del'>-	platform_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void pcsp_stop_beep(struct snd_pcsp *chip)</div><div class='ctx'> {</div><div class='ctx'> 	pcsp_sync_stop(chip);</div><div class='ctx'> 	pcspkr_stop_sound();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int pcsp_suspend(struct platform_device *dev, pm_message_t state)</div><div class='add'>+static int pcsp_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcsp *chip = platform_get_drvdata(dev);</div><div class='add'>+	struct snd_pcsp *chip = dev_get_drvdata(dev);</div><div class='ctx'> 	pcsp_stop_beep(chip);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define pcsp_suspend NULL</div><div class='del'>-#endif	/* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(pcsp_pm, pcsp_suspend, NULL);</div><div class='ctx'> </div><div class='ctx'> static void pcsp_shutdown(struct platform_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -220,11 +194,9 @@ static void pcsp_shutdown(struct platform_device *dev)</div><div class='ctx'> static struct platform_driver pcsp_platform_driver = {</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "pcspkr",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='add'>+		.pm	= &amp;pcsp_pm,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe		= pcsp_probe,</div><div class='del'>-	.remove		= __devexit_p(pcsp_remove),</div><div class='del'>-	.suspend	= pcsp_suspend,</div><div class='ctx'> 	.shutdown	= pcsp_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h<br/>index 4ff6c8cc5077..036ad3c99a43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * PC-Speaker driver for Linux</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,14 +11,8 @@</div><div class='ctx'> #define __PCSP_H__</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/i8253.h&gt;</div><div class='ctx'> #include &lt;linux/timex.h&gt;</div><div class='del'>-#if defined(CONFIG_MIPS) || defined(CONFIG_X86)</div><div class='del'>-/* Use the global PIT lock ! */</div><div class='del'>-#include &lt;asm/i8253.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;asm/8253pit.h&gt;</div><div class='del'>-static DEFINE_RAW_SPINLOCK(i8253_lock);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define PCSP_SOUND_VERSION 0x400	/* read 4.00 */</div><div class='ctx'> #define PCSP_DEBUG 0</div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c<br/>index b5e2b54c2604..5a799f7f00a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_input.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_input.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_input.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp_input.c</a></div><div class='hunk'>@@ -1,21 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  PC Speaker beeper driver for Linux</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2002 Vojtech Pavlik</div><div class='ctx'>  *  Copyright (c) 1992 Orest Zborowski</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License version 2 as published by</div><div class='del'>- * the Free Software Foundation</div><div class='del'>- */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include "pcsp.h"</div><div class='add'>+#include "pcsp_input.h"</div><div class='ctx'> </div><div class='ctx'> static void pcspkr_do_sound(unsigned int count)</div><div class='ctx'> {</div><div class='hunk'>@@ -58,6 +54,7 @@ static int pcspkr_input_event(struct input_dev *dev, unsigned int type,</div><div class='ctx'> 		case SND_BELL:</div><div class='ctx'> 			if (value)</div><div class='ctx'> 				value = 1000;</div><div class='add'>+			break;</div><div class='ctx'> 		case SND_TONE:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -77,11 +74,11 @@ static int pcspkr_input_event(struct input_dev *dev, unsigned int type,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit pcspkr_input_init(struct input_dev **rdev, struct device *dev)</div><div class='add'>+int pcspkr_input_init(struct input_dev **rdev, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	struct input_dev *input_dev = input_allocate_device();</div><div class='add'>+	struct input_dev *input_dev = devm_input_allocate_device(dev);</div><div class='ctx'> 	if (!input_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -98,19 +95,9 @@ int __devinit pcspkr_input_init(struct input_dev **rdev, struct device *dev)</div><div class='ctx'> 	input_dev-&gt;event = pcspkr_input_event;</div><div class='ctx'> </div><div class='ctx'> 	err = input_register_device(input_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		input_free_device(input_dev);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	*rdev = input_dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-int pcspkr_input_remove(struct input_dev *dev)</div><div class='del'>-{</div><div class='del'>-	pcspkr_stop_sound();</div><div class='del'>-	input_unregister_device(dev);	/* this also does kfree() */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp_input.h b/sound/drivers/pcsp/pcsp_input.h<br/>index e66738c78333..42bfc9eab6eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_input.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_input.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_input.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp_input.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * PC-Speaker driver for Linux</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,8 +8,7 @@</div><div class='ctx'> #ifndef __PCSP_INPUT_H__</div><div class='ctx'> #define __PCSP_INPUT_H__</div><div class='ctx'> </div><div class='del'>-int __devinit pcspkr_input_init(struct input_dev **rdev, struct device *dev);</div><div class='del'>-int pcspkr_input_remove(struct input_dev *dev);</div><div class='add'>+int pcspkr_input_init(struct input_dev **rdev, struct device *dev);</div><div class='ctx'> void pcspkr_stop_sound(void);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c<br/>index ce9e7d170c0d..80b313f4fcd3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp_lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * PC-Speaker driver for Linux</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,11 +11,12 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include "pcsp.h"</div><div class='ctx'> </div><div class='del'>-static int nforce_wa;</div><div class='add'>+static bool nforce_wa;</div><div class='ctx'> module_param(nforce_wa, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround "</div><div class='ctx'> 		"(expect bad sound)");</div><div class='hunk'>@@ -22,10 +24,10 @@ MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround "</div><div class='ctx'> #define DMIX_WANTS_S16	1</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Call snd_pcm_period_elapsed in a tasklet</div><div class='add'>+ * Call snd_pcm_period_elapsed in a work</div><div class='ctx'>  * This avoids spinlock messes and long-running irq contexts</div><div class='ctx'>  */</div><div class='del'>-static void pcsp_call_pcm_elapsed(unsigned long priv)</div><div class='add'>+static void pcsp_call_pcm_elapsed(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	if (atomic_read(&amp;pcsp_chip.timer_active)) {</div><div class='ctx'> 		struct snd_pcm_substream *substream;</div><div class='hunk'>@@ -35,7 +37,7 @@ static void pcsp_call_pcm_elapsed(unsigned long priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DECLARE_TASKLET(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed, 0);</div><div class='add'>+static DECLARE_WORK(pcsp_pcm_work, pcsp_call_pcm_elapsed);</div><div class='ctx'> </div><div class='ctx'> /* write the port and returns the next expire time in ns;</div><div class='ctx'>  * called at the trigger-start and in hrtimer callback</div><div class='hunk'>@@ -104,8 +106,8 @@ static void pcsp_pointer_update(struct snd_pcsp *chip)</div><div class='ctx'> 	periods_elapsed = chip-&gt;playback_ptr - chip-&gt;period_ptr;</div><div class='ctx'> 	if (periods_elapsed &lt; 0) {</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-		printk(KERN_INFO "PCSP: buffer_bytes mod period_bytes != 0 ? "</div><div class='del'>-			"(%zi %zi %zi)\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"PCSP: buffer_bytes mod period_bytes != 0 ? (%zi %zi %zi)\n",</div><div class='ctx'> 			chip-&gt;playback_ptr, period_bytes, buffer_bytes);</div><div class='ctx'> #endif</div><div class='ctx'> 		periods_elapsed += buffer_bytes;</div><div class='hunk'>@@ -118,11 +120,9 @@ static void pcsp_pointer_update(struct snd_pcsp *chip)</div><div class='ctx'> 	if (periods_elapsed) {</div><div class='ctx'> 		chip-&gt;period_ptr += periods_elapsed * period_bytes;</div><div class='ctx'> 		chip-&gt;period_ptr %= buffer_bytes;</div><div class='add'>+		queue_work(system_highpri_wq, &amp;pcsp_pcm_work);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chip-&gt;substream_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (periods_elapsed)</div><div class='del'>-		tasklet_schedule(&amp;pcsp_pcm_tasklet);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)</div><div class='hunk'>@@ -137,14 +137,14 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)</div><div class='ctx'> 	pointer_update = !chip-&gt;thalf;</div><div class='ctx'> 	ns = pcsp_timer_update(chip);</div><div class='ctx'> 	if (!ns) {</div><div class='del'>-		printk(KERN_WARNING "PCSP: unexpected stop\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "PCSP: unexpected stop\n");</div><div class='ctx'> 		return HRTIMER_NORESTART;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pointer_update)</div><div class='ctx'> 		pcsp_pointer_update(chip);</div><div class='ctx'> </div><div class='del'>-	hrtimer_forward(handle, hrtimer_get_expires(handle), ns_to_ktime(ns));</div><div class='add'>+	hrtimer_forward_now(handle, ns_to_ktime(ns));</div><div class='ctx'> </div><div class='ctx'> 	return HRTIMER_RESTART;</div><div class='ctx'> }</div><div class='hunk'>@@ -152,10 +152,10 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)</div><div class='ctx'> static int pcsp_start_playing(struct snd_pcsp *chip)</div><div class='ctx'> {</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: start_playing called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: start_playing called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	if (atomic_read(&amp;chip-&gt;timer_active)) {</div><div class='del'>-		printk(KERN_ERR "PCSP: Timer already active\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "PCSP: Timer already active\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -166,14 +166,14 @@ static int pcsp_start_playing(struct snd_pcsp *chip)</div><div class='ctx'> 	atomic_set(&amp;chip-&gt;timer_active, 1);</div><div class='ctx'> 	chip-&gt;thalf = 0;</div><div class='ctx'> </div><div class='del'>-	hrtimer_start(&amp;pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);</div><div class='add'>+	hrtimer_start(&amp;pcsp_chip.timer, 0, HRTIMER_MODE_REL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pcsp_stop_playing(struct snd_pcsp *chip)</div><div class='ctx'> {</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: stop_playing called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: stop_playing called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	if (!atomic_read(&amp;chip-&gt;timer_active))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -195,14 +195,14 @@ void pcsp_sync_stop(struct snd_pcsp *chip)</div><div class='ctx'> 	pcsp_stop_playing(chip);</div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> 	hrtimer_cancel(&amp;chip-&gt;timer);</div><div class='del'>-	tasklet_kill(&amp;pcsp_pcm_tasklet);</div><div class='add'>+	cancel_work_sync(&amp;pcsp_pcm_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcsp_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcsp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: close called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: close called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	pcsp_sync_stop(chip);</div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='hunk'>@@ -213,12 +213,7 @@ static int snd_pcsp_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 				       struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcsp *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='ctx'> 	pcsp_sync_stop(chip);</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				      params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -226,10 +221,10 @@ static int snd_pcsp_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcsp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: hw_free called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: hw_free called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	pcsp_sync_stop(chip);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_pcsp_playback_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -242,14 +237,13 @@ static int snd_pcsp_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_pcm_format_physical_width(substream-&gt;runtime-&gt;format) &gt;&gt; 3;</div><div class='ctx'> 	chip-&gt;is_signed = snd_pcm_format_signed(substream-&gt;runtime-&gt;format);</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: prepare called, "</div><div class='del'>-			"size=%zi psize=%zi f=%zi f1=%i fsize=%i\n",</div><div class='del'>-			snd_pcm_lib_buffer_bytes(substream),</div><div class='del'>-			snd_pcm_lib_period_bytes(substream),</div><div class='del'>-			snd_pcm_lib_buffer_bytes(substream) /</div><div class='del'>-			snd_pcm_lib_period_bytes(substream),</div><div class='del'>-			substream-&gt;runtime-&gt;periods,</div><div class='del'>-			chip-&gt;fmt_size);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: prepare called, size=%zi psize=%zi f=%zi f1=%i fsize=%i\n",</div><div class='add'>+		snd_pcm_lib_buffer_bytes(substream),</div><div class='add'>+		snd_pcm_lib_period_bytes(substream),</div><div class='add'>+		snd_pcm_lib_buffer_bytes(substream) /</div><div class='add'>+		snd_pcm_lib_period_bytes(substream),</div><div class='add'>+		substream-&gt;runtime-&gt;periods,</div><div class='add'>+		chip-&gt;fmt_size);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -258,7 +252,7 @@ static int snd_pcsp_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcsp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: trigger called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: trigger called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -285,7 +279,7 @@ static snd_pcm_uframes_t snd_pcsp_playback_pointer(struct snd_pcm_substream</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_pcsp_playback = {</div><div class='add'>+static const struct snd_pcm_hardware snd_pcsp_playback = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		 SNDRV_PCM_INFO_HALF_DUPLEX |</div><div class='ctx'> 		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -312,10 +306,10 @@ static int snd_pcsp_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcsp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-	printk(KERN_INFO "PCSP: open called\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "PCSP: open called\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	if (atomic_read(&amp;chip-&gt;timer_active)) {</div><div class='del'>-		printk(KERN_ERR "PCSP: still active!!\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "PCSP: still active!!\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	runtime-&gt;hw = snd_pcsp_playback;</div><div class='hunk'>@@ -323,10 +317,9 @@ static int snd_pcsp_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_pcsp_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_pcsp_playback_ops = {</div><div class='ctx'> 	.open = snd_pcsp_playback_open,</div><div class='ctx'> 	.close = snd_pcsp_playback_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = snd_pcsp_playback_hw_params,</div><div class='ctx'> 	.hw_free = snd_pcsp_playback_hw_free,</div><div class='ctx'> 	.prepare = snd_pcsp_playback_prepare,</div><div class='hunk'>@@ -334,7 +327,7 @@ static struct snd_pcm_ops snd_pcsp_playback_ops = {</div><div class='ctx'> 	.pointer = snd_pcsp_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_pcsp_new_pcm(struct snd_pcsp *chip)</div><div class='add'>+int snd_pcsp_new_pcm(struct snd_pcsp *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -347,13 +340,13 @@ int __devinit snd_pcsp_new_pcm(struct snd_pcsp *chip)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='del'>-	strcpy(chip-&gt;pcm-&gt;name, "pcsp");</div><div class='add'>+	strscpy(chip-&gt;pcm-&gt;name, "pcsp");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(chip-&gt;pcm,</div><div class='del'>-					      SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-					      snd_dma_continuous_data</div><div class='del'>-					      (GFP_KERNEL), PCSP_BUFFER_SIZE,</div><div class='del'>-					      PCSP_BUFFER_SIZE);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(chip-&gt;pcm,</div><div class='add'>+				       SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='add'>+				       NULL,</div><div class='add'>+				       PCSP_BUFFER_SIZE,</div><div class='add'>+				       PCSP_BUFFER_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c<br/>index 6f633f4f3b96..27d6150329a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/pcsp/pcsp_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/pcsp/pcsp_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/pcsp/pcsp_mixer.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * PC-Speaker driver for Linux</div><div class='ctx'>  *</div><div class='hunk'>@@ -72,7 +73,7 @@ static int pcsp_treble_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (treble != chip-&gt;treble) {</div><div class='ctx'> 		chip-&gt;treble = treble;</div><div class='ctx'> #if PCSP_DEBUG</div><div class='del'>-		printk(KERN_INFO "PCSP: rate set to %li\n", PCSP_RATE());</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCSP: rate set to %li\n", PCSP_RATE());</div><div class='ctx'> #endif</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -119,17 +120,17 @@ static int pcsp_pcspkr_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	.put =		pcsp_##ctl_type##_put, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_pcm[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_pcsp_controls_pcm[] = {</div><div class='ctx'> 	PCSP_MIXER_CONTROL(enable, "Master Playback Switch"),</div><div class='ctx'> 	PCSP_MIXER_CONTROL(treble, "BaseFRQ Playback Volume"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new __devinitdata snd_pcsp_controls_spkr[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_pcsp_controls_spkr[] = {</div><div class='ctx'> 	PCSP_MIXER_CONTROL(pcspkr, "Beep Playback Switch"),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,</div><div class='del'>-	struct snd_kcontrol_new *ctls, int num)</div><div class='add'>+static int snd_pcsp_ctls_add(struct snd_pcsp *chip,</div><div class='add'>+			     const struct snd_kcontrol_new *ctls, int num)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='hunk'>@@ -141,7 +142,7 @@ static int __devinit snd_pcsp_ctls_add(struct snd_pcsp *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm)</div><div class='add'>+int snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='hunk'>@@ -157,7 +158,7 @@ int __devinit snd_pcsp_new_mixer(struct snd_pcsp *chip, int nopcm)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, "PC-Speaker");</div><div class='add'>+	strscpy(card-&gt;mixername, "PC-Speaker");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c<br/>index f2b0ba22d9ce..b903a138fc2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/portman2x4.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/portman2x4.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/portman2x4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/portman2x4.c</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Driver for Midiman Portman2x4 parallel port midi interface</div><div class='ctx'>  *</div><div class='ctx'>  *   Copyright (c) by Levent Guendogdu &lt;levon@feature-it.com&gt;</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  * ChangeLog</div><div class='ctx'>  * Jan 24 2007 Matthias Koenig &lt;mkoenig@suse.de&gt;</div><div class='ctx'>  *      - cleanup and rewrite</div><div class='hunk'>@@ -43,6 +30,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='hunk'>@@ -54,22 +42,21 @@</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS]  = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS]   = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> static struct platform_device *platform_devices[SNDRV_CARDS]; </div><div class='ctx'> static int device_count;</div><div class='ctx'> </div><div class='del'>-module_param_array(index, int, NULL, S_IRUGO);</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");</div><div class='del'>-module_param_array(id, charp, NULL, S_IRUGO);</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");</div><div class='del'>-module_param_array(enable, bool, NULL, S_IRUGO);</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Levent Guendogdu, Tobias Gehrig, Matthias Koenig");</div><div class='ctx'> MODULE_DESCRIPTION("Midiman Portman2x4");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Midiman,Portman2x4}}");</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  * Chip specific</div><div class='hunk'>@@ -82,8 +69,6 @@ struct portman {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct pardevice *pardev;</div><div class='del'>-	int pardev_claimed;</div><div class='del'>-</div><div class='ctx'> 	int open_count;</div><div class='ctx'> 	int mode[PORTMAN_NUM_INPUT_PORTS];</div><div class='ctx'> 	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];</div><div class='hunk'>@@ -95,9 +80,9 @@ static int portman_free(struct portman *pm)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit portman_create(struct snd_card *card, </div><div class='del'>-				    struct pardevice *pardev, </div><div class='del'>-				    struct portman **rchip)</div><div class='add'>+static int portman_create(struct snd_card *card,</div><div class='add'>+			  struct pardevice *pardev,</div><div class='add'>+			  struct portman **rchip)</div><div class='ctx'> {</div><div class='ctx'> 	struct portman *pm;</div><div class='ctx'> </div><div class='hunk'>@@ -197,21 +182,11 @@ static inline void portman_write_command(struct portman *pm, u8 value)</div><div class='ctx'> 	parport_write_control(pm-&gt;pardev-&gt;port, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 portman_read_command(struct portman *pm)</div><div class='del'>-{</div><div class='del'>-	return parport_read_control(pm-&gt;pardev-&gt;port);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline u8 portman_read_status(struct portman *pm)</div><div class='ctx'> {</div><div class='ctx'> 	return parport_read_status(pm-&gt;pardev-&gt;port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 portman_read_data(struct portman *pm)</div><div class='del'>-{</div><div class='del'>-	return parport_read_data(pm-&gt;pardev-&gt;port);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void portman_write_data(struct portman *pm, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	parport_write_data(pm-&gt;pardev-&gt;port, value);</div><div class='hunk'>@@ -410,9 +385,8 @@ static void portman_flush_input(struct portman *pm, unsigned char port)</div><div class='ctx'> 		command = RXDATA1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			   "portman_flush_input() Won't flush port %i\n",</div><div class='del'>-			   port);</div><div class='add'>+		dev_warn(pm-&gt;card-&gt;dev, "%s Won't flush port %i\n",</div><div class='add'>+			 __func__, port);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -471,7 +445,7 @@ static int portman_probe(struct parport *p)</div><div class='ctx'> </div><div class='ctx'> 	/* Set for RXDATA0 where no damage will be done. */</div><div class='ctx'> 	/* 5 */</div><div class='del'>-	parport_write_control(p, RXDATA0 + STROBE);	/* Write Strobe=1 to command reg. */</div><div class='add'>+	parport_write_control(p, RXDATA0 | STROBE);	/* Write Strobe=1 to command reg. */</div><div class='ctx'> </div><div class='ctx'> 	/* 6 */</div><div class='ctx'> 	if ((parport_read_status(p) &amp; ESTB) != ESTB)</div><div class='hunk'>@@ -481,7 +455,7 @@ static int portman_probe(struct parport *p)</div><div class='ctx'> 	parport_write_control(p, 0);	/* Reset Strobe=0. */</div><div class='ctx'> </div><div class='ctx'> 	/* Check if Tx circuitry is functioning properly.  If initialized </div><div class='del'>-	 * unit TxEmpty is false, send out char and see if if goes true.</div><div class='add'>+	 * unit TxEmpty is false, send out char and see if it goes true.</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* 8 */</div><div class='ctx'> 	parport_write_control(p, TXDATA0);	/* Tx channel 0, strobe off. */</div><div class='hunk'>@@ -522,45 +496,41 @@ static void snd_portman_midi_input_trigger(struct snd_rawmidi_substream *substre</div><div class='ctx'> 					   int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct portman *pm = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pm-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;pm-&gt;reg_lock);</div><div class='ctx'> 	if (up)</div><div class='ctx'> 		pm-&gt;mode[substream-&gt;number] |= PORTMAN2X4_MODE_INPUT_TRIGGERED;</div><div class='ctx'> 	else</div><div class='ctx'> 		pm-&gt;mode[substream-&gt;number] &amp;= ~PORTMAN2X4_MODE_INPUT_TRIGGERED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pm-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_portman_midi_output_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 					    int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct portman *pm = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char byte;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pm-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;pm-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		while ((snd_rawmidi_transmit(substream, &amp;byte, 1) == 1))</div><div class='ctx'> 			portman_write_midi(pm, substream-&gt;number, byte);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;pm-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_portman_midi_output = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_portman_midi_output = {</div><div class='ctx'> 	.open =		snd_portman_midi_open,</div><div class='ctx'> 	.close =	snd_portman_midi_close,</div><div class='ctx'> 	.trigger =	snd_portman_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_portman_midi_input = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_portman_midi_input = {</div><div class='ctx'> 	.open =		snd_portman_midi_open,</div><div class='ctx'> 	.close =	snd_portman_midi_close,</div><div class='ctx'> 	.trigger =	snd_portman_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Create and initialize the rawmidi component */</div><div class='del'>-static int __devinit snd_portman_rawmidi_create(struct snd_card *card)</div><div class='add'>+static int snd_portman_rawmidi_create(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct portman *pm = card-&gt;private_data;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='hunk'>@@ -575,7 +545,7 @@ static int __devinit snd_portman_rawmidi_create(struct snd_card *card)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	rmidi-&gt;private_data = pm;</div><div class='del'>-	strcpy(rmidi-&gt;name, CARD_NAME);</div><div class='add'>+	strscpy(rmidi-&gt;name, CARD_NAME);</div><div class='ctx'> 	rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='ctx'> 		            SNDRV_RAWMIDI_INFO_INPUT |</div><div class='ctx'>                             SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='hunk'>@@ -616,7 +586,7 @@ static void snd_portman_interrupt(void *userdata)</div><div class='ctx'> 	unsigned char midivalue = 0;</div><div class='ctx'> 	struct portman *pm = ((struct snd_card*)userdata)-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;pm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;pm-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* While any input data is waiting */</div><div class='ctx'> 	while ((portman_read_status(pm) &amp; INT_REQ) == INT_REQ) {</div><div class='hunk'>@@ -643,35 +613,9 @@ static void snd_portman_interrupt(void *userdata)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;pm-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_portman_probe_port(struct parport *p)</div><div class='del'>-{</div><div class='del'>-	struct pardevice *pardev;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	pardev = parport_register_device(p, DRIVER_NAME,</div><div class='del'>-					 NULL, NULL, NULL,</div><div class='del'>-					 0, NULL);</div><div class='del'>-	if (!pardev)</div><div class='del'>-		return -EIO;</div><div class='del'>-	</div><div class='del'>-	if (parport_claim(pardev)) {</div><div class='del'>-		parport_unregister_device(pardev);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = portman_probe(p);</div><div class='del'>-</div><div class='del'>-	parport_release(pardev);</div><div class='del'>-	parport_unregister_device(pardev);</div><div class='del'>-</div><div class='del'>-	return res ? -EIO : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit snd_portman_attach(struct parport *p)</div><div class='add'>+static void snd_portman_attach(struct parport *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *device;</div><div class='ctx'> </div><div class='hunk'>@@ -704,10 +648,19 @@ static void snd_portman_detach(struct parport *p)</div><div class='ctx'> 	/* nothing to do here */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_portman_dev_probe(struct pardevice *pardev)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(pardev-&gt;name, DRIVER_NAME))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct parport_driver portman_parport_driver = {</div><div class='del'>-	.name   = "portman2x4",</div><div class='del'>-	.attach = snd_portman_attach,</div><div class='del'>-	.detach = snd_portman_detach</div><div class='add'>+	.name		= "portman2x4",</div><div class='add'>+	.probe		= snd_portman_dev_probe,</div><div class='add'>+	.match_port	= snd_portman_attach,</div><div class='add'>+	.detach		= snd_portman_detach,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*********************************************************************</div><div class='hunk'>@@ -719,15 +672,14 @@ static void snd_portman_card_private_free(struct snd_card *card)</div><div class='ctx'> 	struct pardevice *pardev = pm-&gt;pardev;</div><div class='ctx'> </div><div class='ctx'> 	if (pardev) {</div><div class='del'>-		if (pm-&gt;pardev_claimed)</div><div class='del'>-			parport_release(pardev);</div><div class='add'>+		parport_release(pardev);</div><div class='ctx'> 		parport_unregister_device(pardev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	portman_free(pm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_portman_probe(struct platform_device *pdev)</div><div class='add'>+static int snd_portman_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pardevice *pardev;</div><div class='ctx'> 	struct parport *p;</div><div class='hunk'>@@ -735,6 +687,12 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct snd_card *card = NULL;</div><div class='ctx'> 	struct portman *pm = NULL;</div><div class='ctx'> 	int err;</div><div class='add'>+	struct pardev_cb portman_cb = {</div><div class='add'>+		.preempt = NULL,</div><div class='add'>+		.wakeup = NULL,</div><div class='add'>+		.irq_func = snd_portman_interrupt,	/* ISR */</div><div class='add'>+		.flags = PARPORT_DEV_EXCL,		/* flags */</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	p = platform_get_drvdata(pdev);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='hunk'>@@ -744,91 +702,95 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!enable[dev]) </div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_portman_probe_port(p)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+			   0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("Cannot create card\n");</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "Cannot create card\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;driver, DRIVER_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, CARD_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DRIVER_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, CARD_NAME);</div><div class='ctx'> 	sprintf(card-&gt;longname,  "%s at 0x%lx, irq %i", </div><div class='ctx'> 		card-&gt;shortname, p-&gt;base, p-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	pardev = parport_register_device(p,                     /* port */</div><div class='del'>-					 DRIVER_NAME,           /* name */</div><div class='del'>-					 NULL,                  /* preempt */</div><div class='del'>-					 NULL,                  /* wakeup */</div><div class='del'>-					 snd_portman_interrupt, /* ISR */</div><div class='del'>-					 PARPORT_DEV_EXCL,      /* flags */</div><div class='del'>-					 (void *)card);         /* private */</div><div class='add'>+	portman_cb.private = card;			   /* private */</div><div class='add'>+	pardev = parport_register_dev_model(p,		   /* port */</div><div class='add'>+					    DRIVER_NAME,   /* name */</div><div class='add'>+					    &amp;portman_cb,   /* callbacks */</div><div class='add'>+					    pdev-&gt;id);	   /* device number */</div><div class='ctx'> 	if (pardev == NULL) {</div><div class='del'>-		snd_printd("Cannot register pardevice\n");</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot register pardevice\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = portman_create(card, pardev, &amp;pm)) &lt; 0) {</div><div class='del'>-		snd_printd("Cannot create main component\n");</div><div class='del'>-		parport_unregister_device(pardev);</div><div class='del'>-		goto __err;</div><div class='add'>+	/* claim parport */</div><div class='add'>+	if (parport_claim(pardev)) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot claim parport 0x%lx\n", pardev-&gt;port-&gt;base);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto free_pardev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = portman_create(card, pardev, &amp;pm);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot create main component\n");</div><div class='add'>+		goto release_pardev;</div><div class='ctx'> 	}</div><div class='ctx'> 	card-&gt;private_data = pm;</div><div class='ctx'> 	card-&gt;private_free = snd_portman_card_private_free;</div><div class='del'>-	</div><div class='del'>-	if ((err = snd_portman_rawmidi_create(card)) &lt; 0) {</div><div class='del'>-		snd_printd("Creating Rawmidi component failed\n");</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* claim parport */</div><div class='del'>-	if (parport_claim(pardev)) {</div><div class='del'>-		snd_printd("Cannot claim parport 0x%lx\n", pardev-&gt;port-&gt;base);</div><div class='add'>+	err = portman_probe(p);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='del'>-	pm-&gt;pardev_claimed = 1;</div><div class='add'>+	</div><div class='add'>+	err = snd_portman_rawmidi_create(card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Creating Rawmidi component failed\n");</div><div class='add'>+		goto __err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* init device */</div><div class='del'>-	if ((err = portman_device_init(pm)) &lt; 0)</div><div class='add'>+	err = portman_device_init(pm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __err;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, card);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	/* At this point card will be usable */</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_printd("Cannot register card\n");</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Cannot register card\n");</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "Portman 2x4 on 0x%lx\n", p-&gt;base);</div><div class='add'>+	dev_info(card-&gt;dev, "Portman 2x4 on 0x%lx\n", p-&gt;base);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+release_pardev:</div><div class='add'>+	parport_release(pardev);</div><div class='add'>+free_pardev:</div><div class='add'>+	parport_unregister_device(pardev);</div><div class='ctx'> __err:</div><div class='ctx'> 	snd_card_free(card);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_portman_remove(struct platform_device *pdev)</div><div class='add'>+static void snd_portman_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (card)</div><div class='ctx'> 		snd_card_free(card);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_portman_driver = {</div><div class='ctx'> 	.probe  = snd_portman_probe,</div><div class='del'>-	.remove = __devexit_p(snd_portman_remove),</div><div class='add'>+	.remove = snd_portman_remove,</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.name = PLATFORM_DRIVER</div><div class='add'>+		.name = PLATFORM_DRIVER,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -853,7 +815,8 @@ static int __init snd_portman_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_portman_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_portman_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (parport_register_driver(&amp;portman_parport_driver) != 0) {</div><div class='head'>diff --git a/sound/drivers/serial-generic.c b/sound/drivers/serial-generic.c<br/>new file mode 100644<br/>index 000000000000..766206c6ca75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/serial-generic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/serial-generic.c</a></div><div class='hunk'>@@ -0,0 +1,376 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *   serial-generic.c</div><div class='add'>+ *   Copyright (c) by Daniel Kaehn &lt;kaehndan@gmail.com</div><div class='add'>+ *   Based on serial-u16550.c by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='add'>+ *		                 Isaku Yamahata &lt;yamahata@private.email.ne.jp&gt;,</div><div class='add'>+ *		                 George Hansper &lt;ghansper@apana.org.au&gt;,</div><div class='add'>+ *		                 Hannu Savolainen</div><div class='add'>+ *</div><div class='add'>+ * Generic serial MIDI driver using the serdev serial bus API for hardware interaction</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/serdev.h&gt;</div><div class='add'>+#include &lt;linux/serial_reg.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dev_printk.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Generic serial MIDI driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define SERIAL_MODE_INPUT_OPEN		1</div><div class='add'>+#define SERIAL_MODE_OUTPUT_OPEN	2</div><div class='add'>+#define SERIAL_MODE_INPUT_TRIGGERED	3</div><div class='add'>+#define SERIAL_MODE_OUTPUT_TRIGGERED	4</div><div class='add'>+</div><div class='add'>+#define SERIAL_TX_STATE_ACTIVE	1</div><div class='add'>+#define SERIAL_TX_STATE_WAKEUP	2</div><div class='add'>+</div><div class='add'>+#define INTERNAL_BUF_SIZE 256</div><div class='add'>+</div><div class='add'>+struct snd_serial_generic {</div><div class='add'>+	struct serdev_device *serdev;</div><div class='add'>+</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_substream *midi_output;</div><div class='add'>+	struct snd_rawmidi_substream *midi_input;</div><div class='add'>+</div><div class='add'>+	unsigned int baudrate;</div><div class='add'>+</div><div class='add'>+	unsigned long filemode;		/* open status of file */</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+	unsigned long tx_state;</div><div class='add'>+</div><div class='add'>+	char tx_buf[INTERNAL_BUF_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_tx_wakeup(struct snd_serial_generic *drvdata)</div><div class='add'>+{</div><div class='add'>+	if (test_and_set_bit(SERIAL_TX_STATE_ACTIVE, &amp;drvdata-&gt;tx_state))</div><div class='add'>+		set_bit(SERIAL_TX_STATE_WAKEUP, &amp;drvdata-&gt;tx_state);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;drvdata-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	int num_bytes;</div><div class='add'>+	struct snd_serial_generic *drvdata = container_of(work, struct snd_serial_generic,</div><div class='add'>+						   tx_work);</div><div class='add'>+	struct snd_rawmidi_substream *substream = drvdata-&gt;midi_output;</div><div class='add'>+</div><div class='add'>+	clear_bit(SERIAL_TX_STATE_WAKEUP, &amp;drvdata-&gt;tx_state);</div><div class='add'>+</div><div class='add'>+	while (!snd_rawmidi_transmit_empty(substream)) {</div><div class='add'>+</div><div class='add'>+		if (!test_bit(SERIAL_MODE_OUTPUT_OPEN, &amp;drvdata-&gt;filemode))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		num_bytes = snd_rawmidi_transmit_peek(substream, drvdata-&gt;tx_buf,</div><div class='add'>+						      INTERNAL_BUF_SIZE);</div><div class='add'>+		num_bytes = serdev_device_write_buf(drvdata-&gt;serdev, drvdata-&gt;tx_buf,</div><div class='add'>+						    num_bytes);</div><div class='add'>+</div><div class='add'>+		if (!num_bytes)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_transmit_ack(substream, num_bytes);</div><div class='add'>+</div><div class='add'>+		if (!test_bit(SERIAL_TX_STATE_WAKEUP, &amp;drvdata-&gt;tx_state))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(SERIAL_TX_STATE_ACTIVE, &amp;drvdata-&gt;tx_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_write_wakeup(struct serdev_device *serdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = serdev_device_get_drvdata(serdev);</div><div class='add'>+</div><div class='add'>+	snd_serial_generic_tx_wakeup(drvdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t snd_serial_generic_receive_buf(struct serdev_device *serdev,</div><div class='add'>+					     const u8 *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct snd_serial_generic *drvdata = serdev_device_get_drvdata(serdev);</div><div class='add'>+</div><div class='add'>+	if (!test_bit(SERIAL_MODE_INPUT_OPEN, &amp;drvdata-&gt;filemode))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = snd_rawmidi_receive(drvdata-&gt;midi_input, buf, count);</div><div class='add'>+	return ret &lt; 0 ? 0 : ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct serdev_device_ops snd_serial_generic_serdev_device_ops = {</div><div class='add'>+	.receive_buf = snd_serial_generic_receive_buf,</div><div class='add'>+	.write_wakeup = snd_serial_generic_write_wakeup</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_ensure_serdev_open(struct snd_serial_generic *drvdata)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int actual_baud;</div><div class='add'>+</div><div class='add'>+	if (drvdata-&gt;filemode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(drvdata-&gt;card-&gt;dev, "Opening serial port for card %s\n",</div><div class='add'>+		drvdata-&gt;card-&gt;shortname);</div><div class='add'>+	err = serdev_device_open(drvdata-&gt;serdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	actual_baud = serdev_device_set_baudrate(drvdata-&gt;serdev,</div><div class='add'>+		drvdata-&gt;baudrate);</div><div class='add'>+	if (actual_baud != drvdata-&gt;baudrate) {</div><div class='add'>+		dev_warn(drvdata-&gt;card-&gt;dev, "requested %d baud for card %s but it was actually set to %d\n",</div><div class='add'>+			drvdata-&gt;baudrate, drvdata-&gt;card-&gt;shortname, actual_baud);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_input_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(drvdata-&gt;card-&gt;dev, "Opening input for card %s\n",</div><div class='add'>+		drvdata-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	err = snd_serial_generic_ensure_serdev_open(drvdata);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	set_bit(SERIAL_MODE_INPUT_OPEN, &amp;drvdata-&gt;filemode);</div><div class='add'>+	drvdata-&gt;midi_input = substream;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_input_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(drvdata-&gt;card-&gt;dev, "Closing input for card %s\n",</div><div class='add'>+		drvdata-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	clear_bit(SERIAL_MODE_INPUT_OPEN, &amp;drvdata-&gt;filemode);</div><div class='add'>+	clear_bit(SERIAL_MODE_INPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;midi_input = NULL;</div><div class='add'>+</div><div class='add'>+	if (!drvdata-&gt;filemode)</div><div class='add'>+		serdev_device_close(drvdata-&gt;serdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+					int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		set_bit(SERIAL_MODE_INPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(SERIAL_MODE_INPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_output_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev_dbg(drvdata-&gt;card-&gt;dev, "Opening output for card %s\n",</div><div class='add'>+		drvdata-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	err = snd_serial_generic_ensure_serdev_open(drvdata);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	set_bit(SERIAL_MODE_OUTPUT_OPEN, &amp;drvdata-&gt;filemode);</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;midi_output = substream;</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_output_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(drvdata-&gt;card-&gt;dev, "Closing output for card %s\n",</div><div class='add'>+		drvdata-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	clear_bit(SERIAL_MODE_OUTPUT_OPEN, &amp;drvdata-&gt;filemode);</div><div class='add'>+	clear_bit(SERIAL_MODE_OUTPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+</div><div class='add'>+	if (!drvdata-&gt;filemode)</div><div class='add'>+		serdev_device_close(drvdata-&gt;serdev);</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;midi_output = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_output_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+					 int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		set_bit(SERIAL_MODE_OUTPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(SERIAL_MODE_OUTPUT_TRIGGERED, &amp;drvdata-&gt;filemode);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		snd_serial_generic_tx_wakeup(drvdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_output_drain(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_serial_generic *drvdata = substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Flush any pending characters */</div><div class='add'>+	serdev_device_write_flush(drvdata-&gt;serdev);</div><div class='add'>+	cancel_work_sync(&amp;drvdata-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_serial_generic_output = {</div><div class='add'>+	.open =		snd_serial_generic_output_open,</div><div class='add'>+	.close =	snd_serial_generic_output_close,</div><div class='add'>+	.trigger =	snd_serial_generic_output_trigger,</div><div class='add'>+	.drain =	snd_serial_generic_output_drain,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_rawmidi_ops snd_serial_generic_input = {</div><div class='add'>+	.open =		snd_serial_generic_input_open,</div><div class='add'>+	.close =	snd_serial_generic_input_close,</div><div class='add'>+	.trigger =	snd_serial_generic_input_trigger,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_parse_dt(struct serdev_device *serdev,</div><div class='add'>+				struct snd_serial_generic *drvdata)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(serdev-&gt;dev.of_node, "current-speed",</div><div class='add'>+		&amp;drvdata-&gt;baudrate);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(drvdata-&gt;card-&gt;dev,</div><div class='add'>+			"MIDI device reading of current-speed DT param failed with error %d, using default of 38400\n",</div><div class='add'>+			err);</div><div class='add'>+		drvdata-&gt;baudrate = 38400;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_serial_generic_substreams(struct snd_rawmidi_str *stream, int dev_num)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(substream, &amp;stream-&gt;substreams, list) {</div><div class='add'>+		sprintf(substream-&gt;name, "Serial MIDI %d-%d", dev_num, substream-&gt;number);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_rmidi(struct snd_serial_generic *drvdata,</div><div class='add'>+				int outs, int ins, struct snd_rawmidi **rmidi)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi *rrawmidi;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_rawmidi_new(drvdata-&gt;card, drvdata-&gt;card-&gt;driver, 0,</div><div class='add'>+				outs, ins, &amp;rrawmidi);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_set_ops(rrawmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				&amp;snd_serial_generic_input);</div><div class='add'>+	snd_rawmidi_set_ops(rrawmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				&amp;snd_serial_generic_output);</div><div class='add'>+	strscpy(rrawmidi-&gt;name, drvdata-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	snd_serial_generic_substreams(&amp;rrawmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT],</div><div class='add'>+					drvdata-&gt;serdev-&gt;ctrl-&gt;nr);</div><div class='add'>+	snd_serial_generic_substreams(&amp;rrawmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT],</div><div class='add'>+					drvdata-&gt;serdev-&gt;ctrl-&gt;nr);</div><div class='add'>+</div><div class='add'>+	rrawmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='add'>+			       SNDRV_RAWMIDI_INFO_INPUT |</div><div class='add'>+			       SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	if (rmidi)</div><div class='add'>+		*rmidi = rrawmidi;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_serial_generic_probe(struct serdev_device *serdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_serial_generic *drvdata;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err  = snd_devm_card_new(&amp;serdev-&gt;dev, SNDRV_DEFAULT_IDX1,</div><div class='add'>+				SNDRV_DEFAULT_STR1, THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_serial_generic), &amp;card);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "SerialMIDI");</div><div class='add'>+	sprintf(card-&gt;shortname, "SerialMIDI-%d", serdev-&gt;ctrl-&gt;nr);</div><div class='add'>+	sprintf(card-&gt;longname, "Serial MIDI device at serial%d", serdev-&gt;ctrl-&gt;nr);</div><div class='add'>+</div><div class='add'>+	drvdata = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	drvdata-&gt;serdev = serdev;</div><div class='add'>+	drvdata-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	snd_serial_generic_parse_dt(serdev, drvdata);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;drvdata-&gt;tx_work, snd_serial_generic_tx_work);</div><div class='add'>+</div><div class='add'>+	err = snd_serial_generic_rmidi(drvdata, 1, 1, &amp;drvdata-&gt;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	serdev_device_set_client_ops(serdev, &amp;snd_serial_generic_serdev_device_ops);</div><div class='add'>+	serdev_device_set_drvdata(drvdata-&gt;serdev, drvdata);</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id snd_serial_generic_dt_ids[] = {</div><div class='add'>+	{ .compatible = "serial-midi" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, snd_serial_generic_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct serdev_device_driver snd_serial_generic_driver = {</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name		= "snd-serial-generic",</div><div class='add'>+		.of_match_table	= snd_serial_generic_dt_ids,</div><div class='add'>+	},</div><div class='add'>+	.probe	= snd_serial_generic_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_serdev_device_driver(snd_serial_generic_driver);</div><div class='head'>diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c<br/>index a25fb7b1f441..3c28961091b1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/serial-u16550.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/serial-u16550.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/serial-u16550.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/serial-u16550.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   serial.c</div><div class='ctx'>  *   Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='hunk'>@@ -7,20 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   This code is based on the code from ALSA 0.5.9, but heavily rewritten.</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * Sat Mar 31 17:27:57 PST 2001 tim.mann@compaq.com </div><div class='ctx'>  *      Added support for the Midiator MS-124T and for the MS-124W in</div><div class='ctx'>  *      Single Addressed (S/A) or Multiple Burst (M/B) mode, with</div><div class='hunk'>@@ -36,7 +23,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -44,11 +32,8 @@</div><div class='ctx'> #include &lt;linux/serial_reg.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("MIDI serial u16550");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ALSA, MIDI serial u16550}}");</div><div class='ctx'> </div><div class='ctx'> #define SNDRV_SERIAL_SOUNDCANVAS 0 /* Roland Soundcanvas; F5 NN selects part */</div><div class='ctx'> #define SNDRV_SERIAL_MS124T 1      /* Midiator MS-124T */</div><div class='hunk'>@@ -56,7 +41,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA, MIDI serial u16550}}");</div><div class='ctx'> #define SNDRV_SERIAL_MS124W_MB 3   /* Midiator MS-124W in M/B mode */</div><div class='ctx'> #define SNDRV_SERIAL_GENERIC 4     /* Generic Interface */</div><div class='ctx'> #define SNDRV_SERIAL_MAX_ADAPTOR SNDRV_SERIAL_GENERIC</div><div class='del'>-static char *adaptor_names[] = {</div><div class='add'>+static const char * const adaptor_names[] = {</div><div class='ctx'> 	"Soundcanvas",</div><div class='ctx'>         "MS-124T",</div><div class='ctx'> 	"MS-124W S/A",</div><div class='hunk'>@@ -69,7 +54,7 @@ static char *adaptor_names[] = {</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x3f8,0x2f8,0x3e8,0x2e8 */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; 	/* 3,4,5,7,9,10,11,14,15 */</div><div class='ctx'> static int speed[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 38400}; /* 9600,19200,38400,57600,115200 */</div><div class='hunk'>@@ -77,7 +62,7 @@ static int base[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 115200}; /* baud bas</div><div class='ctx'> static int outs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};	 /* 1 to 16 */</div><div class='ctx'> static int ins[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};	/* 1 to 16 */</div><div class='ctx'> static int adaptor[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = SNDRV_SERIAL_SOUNDCANVAS};</div><div class='del'>-static int droponfull[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS -1)] = SNDRV_SERIAL_NORMALBUFF };</div><div class='add'>+static bool droponfull[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS -1)] = SNDRV_SERIAL_NORMALBUFF };</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Serial MIDI.");</div><div class='hunk'>@@ -85,9 +70,9 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for Serial MIDI.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable UART16550A chip.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for UART16550A chip.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for UART16550A chip.");</div><div class='ctx'> module_param_array(speed, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(speed, "Speed in bauds.");</div><div class='hunk'>@@ -130,7 +115,6 @@ struct snd_uart16550 {</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long base;</div><div class='del'>-	struct resource *res_base;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int speed;</div><div class='ctx'> 	unsigned int speed_base;</div><div class='hunk'>@@ -174,16 +158,15 @@ static inline void snd_uart16550_add_timer(struct snd_uart16550 *uart)</div><div class='ctx'> {</div><div class='ctx'> 	if (!uart-&gt;timer_running) {</div><div class='ctx'> 		/* timer 38600bps * 10bit * 16byte */</div><div class='del'>-		uart-&gt;buffer_timer.expires = jiffies + (HZ+255)/256;</div><div class='add'>+		mod_timer(&amp;uart-&gt;buffer_timer, jiffies + (HZ + 255) / 256);</div><div class='ctx'> 		uart-&gt;timer_running = 1;</div><div class='del'>-		add_timer(&amp;uart-&gt;buffer_timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void snd_uart16550_del_timer(struct snd_uart16550 *uart)</div><div class='ctx'> {</div><div class='ctx'> 	if (uart-&gt;timer_running) {</div><div class='del'>-		del_timer(&amp;uart-&gt;buffer_timer);</div><div class='add'>+		timer_delete(&amp;uart-&gt;buffer_timer);</div><div class='ctx'> 		uart-&gt;timer_running = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -241,9 +224,9 @@ static void snd_uart16550_io_loop(struct snd_uart16550 * uart)</div><div class='ctx'> 			snd_rawmidi_receive(uart-&gt;midi_input[substream], &amp;c, 1);</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; UART_LSR_OE)</div><div class='del'>-			snd_printk(KERN_WARNING</div><div class='del'>-				   "%s: Overrun on device at 0x%lx\n",</div><div class='del'>-			       uart-&gt;rmidi-&gt;name, uart-&gt;base);</div><div class='add'>+			dev_warn(uart-&gt;card-&gt;dev,</div><div class='add'>+				 "%s: Overrun on device at 0x%lx\n",</div><div class='add'>+				 uart-&gt;rmidi-&gt;name, uart-&gt;base);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remember the last stream */</div><div class='hunk'>@@ -298,29 +281,24 @@ static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct snd_uart16550 *uart;</div><div class='ctx'> </div><div class='ctx'> 	uart = dev_id;</div><div class='del'>-	spin_lock(&amp;uart-&gt;open_lock);</div><div class='del'>-	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED) {</div><div class='del'>-		spin_unlock(&amp;uart-&gt;open_lock);</div><div class='add'>+	guard(spinlock)(&amp;uart-&gt;open_lock);</div><div class='add'>+	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	}</div><div class='ctx'> 	/* indicate to the UART that the interrupt has been serviced */</div><div class='ctx'> 	inb(uart-&gt;base + UART_IIR);</div><div class='ctx'> 	snd_uart16550_io_loop(uart);</div><div class='del'>-	spin_unlock(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* When the polling mode, this function calls snd_uart16550_io_loop. */</div><div class='del'>-static void snd_uart16550_buffer_timer(unsigned long data)</div><div class='add'>+static void snd_uart16550_buffer_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart;</div><div class='ctx'> </div><div class='del'>-	uart = (struct snd_uart16550 *)data;</div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	uart = timer_container_of(uart, t, buffer_timer);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	snd_uart16550_del_timer(uart);</div><div class='ctx'> 	snd_uart16550_io_loop(uart);</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -328,7 +306,7 @@ static void snd_uart16550_buffer_timer(unsigned long data)</div><div class='ctx'>  *  return 0 if found</div><div class='ctx'>  *  return negative error if not found</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart)</div><div class='add'>+static int snd_uart16550_detect(struct snd_uart16550 *uart)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long io_base = uart-&gt;base;</div><div class='ctx'> 	int ok;</div><div class='hunk'>@@ -339,9 +317,9 @@ static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart)</div><div class='ctx'> 		return -ENODEV;	/* Not configured */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uart-&gt;res_base = request_region(io_base, 8, "Serial MIDI");</div><div class='del'>-	if (uart-&gt;res_base == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "u16550: can't grab port 0x%lx\n", io_base);</div><div class='add'>+	if (!devm_request_region(uart-&gt;card-&gt;dev, io_base, 8, "Serial MIDI")) {</div><div class='add'>+		dev_err(uart-&gt;card-&gt;dev,</div><div class='add'>+			"u16550: can't grab port 0x%lx\n", io_base);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -516,71 +494,61 @@ static void snd_uart16550_do_close(struct snd_uart16550 * uart)</div><div class='ctx'> </div><div class='ctx'> static int snd_uart16550_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED)</div><div class='ctx'> 		snd_uart16550_do_open(uart);</div><div class='ctx'> 	uart-&gt;filemode |= SERIAL_MODE_INPUT_OPEN;</div><div class='ctx'> 	uart-&gt;midi_input[substream-&gt;number] = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_uart16550_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	uart-&gt;filemode &amp;= ~SERIAL_MODE_INPUT_OPEN;</div><div class='ctx'> 	uart-&gt;midi_input[substream-&gt;number] = NULL;</div><div class='ctx'> 	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED)</div><div class='ctx'> 		snd_uart16550_do_close(uart);</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_uart16550_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 					int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	if (up)</div><div class='ctx'> 		uart-&gt;filemode |= SERIAL_MODE_INPUT_TRIGGERED;</div><div class='ctx'> 	else</div><div class='ctx'> 		uart-&gt;filemode &amp;= ~SERIAL_MODE_INPUT_TRIGGERED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_uart16550_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED)</div><div class='ctx'> 		snd_uart16550_do_open(uart);</div><div class='ctx'> 	uart-&gt;filemode |= SERIAL_MODE_OUTPUT_OPEN;</div><div class='ctx'> 	uart-&gt;midi_output[substream-&gt;number] = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int snd_uart16550_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> 	uart-&gt;filemode &amp;= ~SERIAL_MODE_OUTPUT_OPEN;</div><div class='ctx'> 	uart-&gt;midi_output[substream-&gt;number] = NULL;</div><div class='ctx'> 	if (uart-&gt;filemode == SERIAL_MODE_NOT_OPENED)</div><div class='ctx'> 		snd_uart16550_do_close(uart);</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -637,9 +605,9 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (!snd_uart16550_write_buffer(uart, midi_byte)) {</div><div class='del'>-			snd_printk(KERN_WARNING</div><div class='del'>-				   "%s: Buffer overrun on device at 0x%lx\n",</div><div class='del'>-				   uart-&gt;rmidi-&gt;name, uart-&gt;base);</div><div class='add'>+			dev_warn(uart-&gt;card-&gt;dev,</div><div class='add'>+				 "%s: Buffer overrun on device at 0x%lx\n",</div><div class='add'>+				 uart-&gt;rmidi-&gt;name, uart-&gt;base);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -649,7 +617,6 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,</div><div class='ctx'> </div><div class='ctx'> static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char midi_byte, addr_byte;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	char first;</div><div class='hunk'>@@ -660,7 +627,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	 * variables (ie buff_in &amp; buff_out)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;uart-&gt;open_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (uart-&gt;irq &lt; 0)	/* polling */</div><div class='ctx'> 		snd_uart16550_io_loop(uart);</div><div class='hunk'>@@ -735,71 +702,52 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		}</div><div class='ctx'> 		lasttime = jiffies;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_uart16550_output_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 					 int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_uart16550 *uart = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;uart-&gt;open_lock, flags);</div><div class='del'>-	if (up)</div><div class='del'>-		uart-&gt;filemode |= SERIAL_MODE_OUTPUT_TRIGGERED;</div><div class='del'>-	else</div><div class='del'>-		uart-&gt;filemode &amp;= ~SERIAL_MODE_OUTPUT_TRIGGERED;</div><div class='del'>-	spin_unlock_irqrestore(&amp;uart-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;uart-&gt;open_lock) {</div><div class='add'>+		if (up)</div><div class='add'>+			uart-&gt;filemode |= SERIAL_MODE_OUTPUT_TRIGGERED;</div><div class='add'>+		else</div><div class='add'>+			uart-&gt;filemode &amp;= ~SERIAL_MODE_OUTPUT_TRIGGERED;</div><div class='add'>+	}</div><div class='ctx'> 	if (up)</div><div class='ctx'> 		snd_uart16550_output_write(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_uart16550_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_uart16550_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_uart16550_output_open,</div><div class='ctx'> 	.close =	snd_uart16550_output_close,</div><div class='ctx'> 	.trigger =	snd_uart16550_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_uart16550_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_uart16550_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_uart16550_input_open,</div><div class='ctx'> 	.close =	snd_uart16550_input_close,</div><div class='ctx'> 	.trigger =	snd_uart16550_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_uart16550_free(struct snd_uart16550 *uart)</div><div class='del'>-{</div><div class='del'>-	if (uart-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(uart-&gt;irq, uart);</div><div class='del'>-	release_and_free_resource(uart-&gt;res_base);</div><div class='del'>-	kfree(uart);</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int snd_uart16550_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_uart16550 *uart = device-&gt;device_data;</div><div class='del'>-	return snd_uart16550_free(uart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_uart16550_create(struct snd_card *card,</div><div class='del'>-				       unsigned long iobase,</div><div class='del'>-				       int irq,</div><div class='del'>-				       unsigned int speed,</div><div class='del'>-				       unsigned int base,</div><div class='del'>-				       int adaptor,</div><div class='del'>-				       int droponfull,</div><div class='del'>-				       struct snd_uart16550 **ruart)</div><div class='add'>+static int snd_uart16550_create(struct snd_card *card,</div><div class='add'>+				unsigned long iobase,</div><div class='add'>+				int irq,</div><div class='add'>+				unsigned int speed,</div><div class='add'>+				unsigned int base,</div><div class='add'>+				int adaptor,</div><div class='add'>+				int droponfull,</div><div class='add'>+				struct snd_uart16550 **ruart)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_uart16550_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	struct snd_uart16550 *uart;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if ((uart = kzalloc(sizeof(*uart), GFP_KERNEL)) == NULL)</div><div class='add'>+	uart = devm_kzalloc(card-&gt;dev, sizeof(*uart), GFP_KERNEL);</div><div class='add'>+	if (!uart)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	uart-&gt;adaptor = adaptor;</div><div class='ctx'> 	uart-&gt;card = card;</div><div class='hunk'>@@ -808,17 +756,17 @@ static int __devinit snd_uart16550_create(struct snd_card *card,</div><div class='ctx'> 	uart-&gt;base = iobase;</div><div class='ctx'> 	uart-&gt;drop_on_full = droponfull;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_uart16550_detect(uart)) &lt;= 0) {</div><div class='del'>-		printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);</div><div class='del'>-		snd_uart16550_free(uart);</div><div class='add'>+	err = snd_uart16550_detect(uart);</div><div class='add'>+	if (err &lt;= 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "no UART detected at 0x%lx\n", iobase);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (irq &gt;= 0 &amp;&amp; irq != SNDRV_AUTO_IRQ) {</div><div class='del'>-		if (request_irq(irq, snd_uart16550_interrupt,</div><div class='del'>-				IRQF_DISABLED, "Serial MIDI", uart)) {</div><div class='del'>-			snd_printk(KERN_WARNING</div><div class='del'>-				   "irq %d busy. Using Polling.\n", irq);</div><div class='add'>+		if (devm_request_irq(card-&gt;dev, irq, snd_uart16550_interrupt,</div><div class='add'>+				     0, "Serial MIDI", uart)) {</div><div class='add'>+			dev_warn(card-&gt;dev,</div><div class='add'>+				 "irq %d busy. Using Polling.\n", irq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			uart-&gt;irq = irq;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -830,17 +778,9 @@ static int __devinit snd_uart16550_create(struct snd_card *card,</div><div class='ctx'> 	uart-&gt;prev_in = 0;</div><div class='ctx'> 	uart-&gt;rstatus = 0;</div><div class='ctx'> 	memset(uart-&gt;prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS);</div><div class='del'>-	init_timer(&amp;uart-&gt;buffer_timer);</div><div class='del'>-	uart-&gt;buffer_timer.function = snd_uart16550_buffer_timer;</div><div class='del'>-	uart-&gt;buffer_timer.data = (unsigned long)uart;</div><div class='add'>+	timer_setup(&amp;uart-&gt;buffer_timer, snd_uart16550_buffer_timer, 0);</div><div class='ctx'> 	uart-&gt;timer_running = 0;</div><div class='ctx'> </div><div class='del'>-	/* Register device */</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, uart, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_uart16550_free(uart);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	switch (uart-&gt;adaptor) {</div><div class='ctx'> 	case SNDRV_SERIAL_MS124W_SA:</div><div class='ctx'> 	case SNDRV_SERIAL_MS124W_MB:</div><div class='hunk'>@@ -863,7 +803,7 @@ static int __devinit snd_uart16550_create(struct snd_card *card,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)</div><div class='add'>+static void snd_uart16550_substreams(struct snd_rawmidi_str *stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi_substream *substream;</div><div class='ctx'> </div><div class='hunk'>@@ -872,9 +812,9 @@ static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,</div><div class='del'>-				      int outs, int ins,</div><div class='del'>-				      struct snd_rawmidi **rmidi)</div><div class='add'>+static int snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,</div><div class='add'>+			       int outs, int ins,</div><div class='add'>+			       struct snd_rawmidi **rmidi)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rrawmidi;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -887,7 +827,7 @@ static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,</div><div class='ctx'> 			    &amp;snd_uart16550_input);</div><div class='ctx'> 	snd_rawmidi_set_ops(rrawmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='ctx'> 			    &amp;snd_uart16550_output);</div><div class='del'>-	strcpy(rrawmidi-&gt;name, "Serial MIDI");</div><div class='add'>+	strscpy(rrawmidi-&gt;name, "Serial MIDI");</div><div class='ctx'> 	snd_uart16550_substreams(&amp;rrawmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT]);</div><div class='ctx'> 	snd_uart16550_substreams(&amp;rrawmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT]);</div><div class='ctx'> 	rrawmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='hunk'>@@ -899,7 +839,7 @@ static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_serial_probe(struct platform_device *devptr)</div><div class='add'>+static int snd_serial_probe(struct platform_device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_uart16550 *uart;</div><div class='hunk'>@@ -922,46 +862,43 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)</div><div class='ctx'> 	case SNDRV_SERIAL_GENERIC:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "Adaptor type is out of range 0-%d (%d)\n",</div><div class='del'>-			   SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);</div><div class='add'>+		dev_err(&amp;devptr-&gt;dev,</div><div class='add'>+			"Adaptor type is out of range 0-%d (%d)\n",</div><div class='add'>+			SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (outs[dev] &lt; 1 || outs[dev] &gt; SNDRV_SERIAL_MAX_OUTS) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "Count of outputs is out of range 1-%d (%d)\n",</div><div class='del'>-			   SNDRV_SERIAL_MAX_OUTS, outs[dev]);</div><div class='add'>+		dev_err(&amp;devptr-&gt;dev,</div><div class='add'>+			"Count of outputs is out of range 1-%d (%d)\n",</div><div class='add'>+			SNDRV_SERIAL_MAX_OUTS, outs[dev]);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ins[dev] &lt; 1 || ins[dev] &gt; SNDRV_SERIAL_MAX_INS) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "Count of inputs is out of range 1-%d (%d)\n",</div><div class='del'>-			   SNDRV_SERIAL_MAX_INS, ins[dev]);</div><div class='add'>+		dev_err(&amp;devptr-&gt;dev,</div><div class='add'>+			"Count of inputs is out of range 1-%d (%d)\n",</div><div class='add'>+			SNDRV_SERIAL_MAX_INS, ins[dev]);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err  = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err  = snd_devm_card_new(&amp;devptr-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				 0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "Serial");</div><div class='del'>-	strcpy(card-&gt;shortname, "Serial MIDI (UART16550A)");</div><div class='add'>+	strscpy(card-&gt;driver, "Serial");</div><div class='add'>+	strscpy(card-&gt;shortname, "Serial MIDI (UART16550A)");</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_uart16550_create(card,</div><div class='del'>-					port[dev],</div><div class='del'>-					irq[dev],</div><div class='del'>-					speed[dev],</div><div class='del'>-					base[dev],</div><div class='del'>-					adaptor[dev],</div><div class='del'>-					droponfull[dev],</div><div class='del'>-					&amp;uart)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_uart16550_create(card, port[dev], irq[dev], speed[dev],</div><div class='add'>+				   base[dev], adaptor[dev], droponfull[dev],</div><div class='add'>+				   &amp;uart);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_uart16550_rmidi(uart, 0, outs[dev], ins[dev], &amp;uart-&gt;rmidi);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname, "%s [%s] at %#lx, irq %d",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='hunk'>@@ -969,33 +906,20 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)</div><div class='ctx'> 		uart-&gt;base,</div><div class='ctx'> 		uart-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;devptr-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- _err:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_serial_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SND_SERIAL_DRIVER	"snd_serial_u16550"</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_serial_driver = {</div><div class='ctx'> 	.probe		= snd_serial_probe,</div><div class='del'>-	.remove		= __devexit_p( snd_serial_remove),</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_SERIAL_DRIVER</div><div class='add'>+		.name	= SND_SERIAL_DRIVER,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1012,7 +936,8 @@ static int __init alsa_card_serial_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, cards, err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_serial_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_serial_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	cards = 0;</div><div class='hunk'>@@ -1033,7 +958,7 @@ static int __init alsa_card_serial_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! cards) {</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "serial midi soundcard not found or device busy\n");</div><div class='add'>+		pr_err("serial midi soundcard not found or device busy\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		snd_serial_unregister_all();</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c<br/>index f4cd49336f33..a204f42d1026 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/virmidi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/virmidi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/virmidi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/virmidi.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Dummy soundcard for virtual rawmidi devices</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 2000 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -45,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/seq_kernel.h&gt;</div><div class='ctx'> #include &lt;sound/seq_virmidi.h&gt;</div><div class='hunk'>@@ -57,13 +43,12 @@</div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Dummy soundcard for virtual rawmidi devices");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}");</div><div class='ctx'> </div><div class='ctx'> #define MAX_MIDI_DEVICES	4</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='add'>+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};</div><div class='ctx'> static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -83,56 +68,45 @@ struct snd_card_virmidi {</div><div class='ctx'> static struct platform_device *devices[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_virmidi_probe(struct platform_device *devptr)</div><div class='add'>+static int snd_virmidi_probe(struct platform_device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_card_virmidi *vmidi;</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> 	int dev = devptr-&gt;id;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_card_virmidi), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;devptr-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_card_virmidi), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	vmidi = card-&gt;private_data;</div><div class='ctx'> 	vmidi-&gt;card = card;</div><div class='ctx'> </div><div class='ctx'> 	if (midi_devs[dev] &gt; MAX_MIDI_DEVICES) {</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			   "too much midi devices for virmidi %d: "</div><div class='del'>-			   "force to use %d\n", dev, MAX_MIDI_DEVICES);</div><div class='add'>+		dev_warn(&amp;devptr-&gt;dev,</div><div class='add'>+			 "too much midi devices for virmidi %d: force to use %d\n",</div><div class='add'>+			 dev, MAX_MIDI_DEVICES);</div><div class='ctx'> 		midi_devs[dev] = MAX_MIDI_DEVICES;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 0; idx &lt; midi_devs[dev]; idx++) {</div><div class='ctx'> 		struct snd_rawmidi *rmidi;</div><div class='del'>-		struct snd_virmidi_dev *rdev;</div><div class='del'>-		if ((err = snd_virmidi_new(card, idx, &amp;rmidi)) &lt; 0)</div><div class='del'>-			goto __nodev;</div><div class='del'>-		rdev = rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+		err = snd_virmidi_new(card, idx, &amp;rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		vmidi-&gt;midi[idx] = rmidi;</div><div class='del'>-		strcpy(rmidi-&gt;name, "Virtual Raw MIDI");</div><div class='del'>-		rdev-&gt;seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH;</div><div class='add'>+		strscpy(rmidi-&gt;name, "Virtual Raw MIDI");</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	strcpy(card-&gt;driver, "VirMIDI");</div><div class='del'>-	strcpy(card-&gt;shortname, "VirMIDI");</div><div class='del'>-	sprintf(card-&gt;longname, "Virtual MIDI Card %i", dev + 1);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;devptr-&gt;dev);</div><div class='add'>+	strscpy(card-&gt;driver, "VirMIDI");</div><div class='add'>+	strscpy(card-&gt;shortname, "VirMIDI");</div><div class='add'>+	sprintf(card-&gt;longname, "Virtual MIDI Card %i", dev + 1);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) == 0) {</div><div class='del'>-		platform_set_drvdata(devptr, card);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-      __nodev:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_virmidi_remove(struct platform_device *devptr)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(platform_get_drvdata(devptr));</div><div class='del'>-	platform_set_drvdata(devptr, NULL);</div><div class='add'>+	platform_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -140,9 +114,8 @@ static int __devexit snd_virmidi_remove(struct platform_device *devptr)</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver snd_virmidi_driver = {</div><div class='ctx'> 	.probe		= snd_virmidi_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_virmidi_remove),</div><div class='ctx'> 	.driver		= {</div><div class='del'>-		.name	= SND_VIRMIDI_DRIVER</div><div class='add'>+		.name	= SND_VIRMIDI_DRIVER,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -159,13 +132,15 @@ static int __init alsa_card_virmidi_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, cards, err;</div><div class='ctx'> </div><div class='del'>-	if ((err = platform_driver_register(&amp;snd_virmidi_driver)) &lt; 0)</div><div class='add'>+	err = platform_driver_register(&amp;snd_virmidi_driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	cards = 0;</div><div class='ctx'> 	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='ctx'> 		struct platform_device *device;</div><div class='del'>-		if (! enable[i])</div><div class='add'>+</div><div class='add'>+		if (!enable[i])</div><div class='ctx'> 			continue;</div><div class='ctx'> 		device = platform_device_register_simple(SND_VIRMIDI_DRIVER,</div><div class='ctx'> 							 i, NULL, 0);</div><div class='hunk'>@@ -180,7 +155,7 @@ static int __init alsa_card_virmidi_init(void)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!cards) {</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");</div><div class='add'>+		pr_err("Card-VirMIDI soundcard not found or device busy\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		snd_virmidi_unregister_all();</div><div class='ctx'> 		return -ENODEV;</div><div class='head'>diff --git a/sound/drivers/vx/Makefile b/sound/drivers/vx/Makefile<br/>index 9a168a3c1560..ae1b3e09283f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/Makefile</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-vx-lib-objs := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o</div><div class='add'>+snd-vx-lib-y := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_VX_LIB) += snd-vx-lib.o</div><div class='head'>diff --git a/sound/drivers/vx/vx_cmd.c b/sound/drivers/vx/vx_cmd.c<br/>index 23f4857f02c8..b0970a04883e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_cmd.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_cmd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_cmd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_cmd.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * DSP commands</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -28,7 +15,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Array of DSP commands</div><div class='ctx'>  */</div><div class='del'>-static struct vx_cmd_info vx_dsp_cmds[] = {</div><div class='add'>+static const struct vx_cmd_info vx_dsp_cmds[] = {</div><div class='ctx'> [CMD_VERSION] =			{ 0x010000, 2, RMH_SSIZE_FIXED, 1 },</div><div class='ctx'> [CMD_SUPPORTED] =		{ 0x020000, 1, RMH_SSIZE_FIXED, 2 },</div><div class='ctx'> [CMD_TEST_IT] =			{ 0x040000, 1, RMH_SSIZE_FIXED, 1 },</div><div class='head'>diff --git a/sound/drivers/vx/vx_cmd.h b/sound/drivers/vx/vx_cmd.h<br/>index a85248ba3cc5..c2a520274493 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_cmd.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_cmd.h</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * Definitions of DSP commands</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __VX_CMD_H</div><div class='head'>diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c<br/>index 19c6e376c7c7..52b93407bfe3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_core.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * Hardware core part</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -26,11 +13,12 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;sound/vx_core.h&gt;</div><div class='ctx'> #include "vx_cmd.h"</div><div class='ctx'> </div><div class='hunk'>@@ -51,21 +39,22 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> int snd_vx_check_reg_bit(struct vx_core *chip, int reg, int mask, int bit, int time)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long end_time = jiffies + (time * HZ + 999) / 1000;</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	static char *reg_names[VX_REG_MAX] = {</div><div class='add'>+	static const char * const reg_names[VX_REG_MAX] = {</div><div class='ctx'> 		"ICR", "CVR", "ISR", "IVR", "RXH", "RXM", "RXL",</div><div class='ctx'> 		"DMA", "CDSP", "RFREQ", "RUER/V2", "DATA", "MEMIRQ",</div><div class='ctx'> 		"ACQ", "BIT0", "BIT1", "MIC0", "MIC1", "MIC2",</div><div class='ctx'> 		"MIC3", "INTCSR", "CNTRL", "GPIOC",</div><div class='ctx'> 		"LOFREQ", "HIFREQ", "CSUER", "RUER"</div><div class='ctx'> 	};</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		if ((snd_vx_inb(chip, reg) &amp; mask) == bit)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		//msleep(10);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='del'>-	snd_printd(KERN_DEBUG "vx_check_reg_bit: timeout, reg=%s, mask=0x%x, val=0x%x\n", reg_names[reg], mask, snd_vx_inb(chip, reg));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"vx_check_reg_bit: timeout, reg=%s, mask=0x%x, val=0x%x\n",</div><div class='add'>+		reg_names[reg], mask, snd_vx_inb(chip, reg));</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -117,33 +106,39 @@ static int vx_reset_chk(struct vx_core *chip)</div><div class='ctx'>  *</div><div class='ctx'>  * returns 0 if successful, or a negative error code.</div><div class='ctx'>  * the error code can be VX-specific, retrieved via vx_get_error().</div><div class='del'>- * NB: call with spinlock held!</div><div class='add'>+ * NB: call with mutex held!</div><div class='ctx'>  */</div><div class='ctx'> static int vx_transfer_end(struct vx_core *chip, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_reset_chk(chip)) &lt; 0)</div><div class='add'>+	err = vx_reset_chk(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* irq MESS_READ/WRITE_END */</div><div class='del'>-	if ((err = vx_send_irq_dsp(chip, cmd)) &lt; 0)</div><div class='add'>+	err = vx_send_irq_dsp(chip, cmd);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait CHK = 1 */</div><div class='del'>-	if ((err = vx_wait_isr_bit(chip, ISR_CHK)) &lt; 0)</div><div class='add'>+	err = vx_wait_isr_bit(chip, ISR_CHK);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* If error, Read RX */</div><div class='del'>-	if ((err = vx_inb(chip, ISR)) &amp; ISR_ERR) {</div><div class='del'>-		if ((err = vx_wait_for_rx_full(chip)) &lt; 0) {</div><div class='del'>-			snd_printd(KERN_DEBUG "transfer_end: error in rx_full\n");</div><div class='add'>+	err = vx_inb(chip, ISR);</div><div class='add'>+	if (err &amp; ISR_ERR) {</div><div class='add'>+		err = vx_wait_for_rx_full(chip);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"transfer_end: error in rx_full\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = vx_inb(chip, RXH) &lt;&lt; 16;</div><div class='ctx'> 		err |= vx_inb(chip, RXM) &lt;&lt; 8;</div><div class='ctx'> 		err |= vx_inb(chip, RXL);</div><div class='del'>-		snd_printd(KERN_DEBUG "transfer_end: error = 0x%x\n", err);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "transfer_end: error = 0x%x\n", err);</div><div class='ctx'> 		return -(VX_ERR_MASK | err);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -155,7 +150,7 @@ static int vx_transfer_end(struct vx_core *chip, int cmd)</div><div class='ctx'>  *</div><div class='ctx'>  * returns 0 if successful, or a negative error code.</div><div class='ctx'>  * the error code can be VX-specific, retrieved via vx_get_error().</div><div class='del'>- * NB: call with spinlock held!</div><div class='add'>+ * NB: call with mutex held!</div><div class='ctx'>  */</div><div class='ctx'> static int vx_read_status(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> {</div><div class='hunk'>@@ -205,7 +200,7 @@ static int vx_read_status(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> </div><div class='ctx'> 	if (size &lt; 1)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if (snd_BUG_ON(size &gt; SIZE_MAX_STATUS))</div><div class='add'>+	if (snd_BUG_ON(size &gt;= SIZE_MAX_STATUS))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 1; i &lt;= size; i++) {</div><div class='hunk'>@@ -236,7 +231,7 @@ static int vx_read_status(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'>  * returns 0 if successful, or a negative error code.</div><div class='ctx'>  * the error code can be VX-specific, retrieved via vx_get_error().</div><div class='ctx'>  * </div><div class='del'>- * this function doesn't call spinlock at all.</div><div class='add'>+ * this function doesn't call mutex lock at all.</div><div class='ctx'>  */</div><div class='ctx'> int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> {</div><div class='hunk'>@@ -245,21 +240,12 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> 	if (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_reset_chk(chip)) &lt; 0) {</div><div class='del'>-		snd_printd(KERN_DEBUG "vx_send_msg: vx_reset_chk error\n");</div><div class='add'>+	err = vx_reset_chk(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "vx_send_msg: vx_reset_chk error\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	printk(KERN_DEBUG "rmh: cmd = 0x%06x, length = %d, stype = %d\n",</div><div class='del'>-	       rmh-&gt;Cmd[0], rmh-&gt;LgCmd, rmh-&gt;DspStat);</div><div class='del'>-	if (rmh-&gt;LgCmd &gt; 1) {</div><div class='del'>-		printk(KERN_DEBUG "  ");</div><div class='del'>-		for (i = 1; i &lt; rmh-&gt;LgCmd; i++)</div><div class='del'>-			printk("0x%06x ", rmh-&gt;Cmd[i]);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> 	/* Check bit M is set according to length of the command */</div><div class='ctx'> 	if (rmh-&gt;LgCmd &gt; 1)</div><div class='ctx'> 		rmh-&gt;Cmd[0] |= MASK_MORE_THAN_1_WORD_COMMAND;</div><div class='hunk'>@@ -267,8 +253,9 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> 		rmh-&gt;Cmd[0] &amp;= MASK_1_WORD_COMMAND;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for TX empty */</div><div class='del'>-	if ((err = vx_wait_isr_bit(chip, ISR_TX_EMPTY)) &lt; 0) {</div><div class='del'>-		snd_printd(KERN_DEBUG "vx_send_msg: wait tx empty error\n");</div><div class='add'>+	err = vx_wait_isr_bit(chip, ISR_TX_EMPTY);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "vx_send_msg: wait tx empty error\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -278,25 +265,31 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> 	vx_outb(chip, TXL, rmh-&gt;Cmd[0] &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger irq MESSAGE */</div><div class='del'>-	if ((err = vx_send_irq_dsp(chip, IRQ_MESSAGE)) &lt; 0) {</div><div class='del'>-		snd_printd(KERN_DEBUG "vx_send_msg: send IRQ_MESSAGE error\n");</div><div class='add'>+	err = vx_send_irq_dsp(chip, IRQ_MESSAGE);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"vx_send_msg: send IRQ_MESSAGE error\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for CHK = 1 */</div><div class='del'>-	if ((err = vx_wait_isr_bit(chip, ISR_CHK)) &lt; 0)</div><div class='add'>+	err = vx_wait_isr_bit(chip, ISR_CHK);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* If error, get error value from RX */</div><div class='ctx'> 	if (vx_inb(chip, ISR) &amp; ISR_ERR) {</div><div class='del'>-		if ((err = vx_wait_for_rx_full(chip)) &lt; 0) {</div><div class='del'>-			snd_printd(KERN_DEBUG "vx_send_msg: rx_full read error\n");</div><div class='add'>+		err = vx_wait_for_rx_full(chip);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"vx_send_msg: rx_full read error\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = vx_inb(chip, RXH) &lt;&lt; 16;</div><div class='ctx'> 		err |= vx_inb(chip, RXM) &lt;&lt; 8;</div><div class='ctx'> 		err |= vx_inb(chip, RXL);</div><div class='del'>-		snd_printd(KERN_DEBUG "msg got error = 0x%x at cmd[0]\n", err);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"msg got error = 0x%x at cmd[0]\n", err);</div><div class='ctx'> 		err = -(VX_ERR_MASK | err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -305,8 +298,10 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> 	if (rmh-&gt;LgCmd &gt; 1) {</div><div class='ctx'> 		for (i = 1; i &lt; rmh-&gt;LgCmd; i++) {</div><div class='ctx'> 			/* Wait for TX ready */</div><div class='del'>-			if ((err = vx_wait_isr_bit(chip, ISR_TX_READY)) &lt; 0) {</div><div class='del'>-				snd_printd(KERN_DEBUG "vx_send_msg: tx_ready error\n");</div><div class='add'>+			err = vx_wait_isr_bit(chip, ISR_TX_READY);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+					"vx_send_msg: tx_ready error\n");</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -316,14 +311,18 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> 			vx_outb(chip, TXL, rmh-&gt;Cmd[i] &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 			/* Trigger irq MESS_READ_NEXT */</div><div class='del'>-			if ((err = vx_send_irq_dsp(chip, IRQ_MESS_READ_NEXT)) &lt; 0) {</div><div class='del'>-				snd_printd(KERN_DEBUG "vx_send_msg: IRQ_READ_NEXT error\n");</div><div class='add'>+			err = vx_send_irq_dsp(chip, IRQ_MESS_READ_NEXT);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+					"vx_send_msg: IRQ_READ_NEXT error\n");</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Wait for TX empty */</div><div class='del'>-		if ((err = vx_wait_isr_bit(chip, ISR_TX_READY)) &lt; 0) {</div><div class='del'>-			snd_printd(KERN_DEBUG "vx_send_msg: TX_READY error\n");</div><div class='add'>+		err = vx_wait_isr_bit(chip, ISR_TX_READY);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"vx_send_msg: TX_READY error\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* End of transfer */</div><div class='hunk'>@@ -337,7 +336,7 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vx_send_msg - send a DSP message with spinlock</div><div class='add'>+ * vx_send_msg - send a DSP message with mutex</div><div class='ctx'>  * @rmh: the rmh record to send and receive</div><div class='ctx'>  *</div><div class='ctx'>  * returns 0 if successful, or a negative error code.</div><div class='hunk'>@@ -345,13 +344,8 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'>  */</div><div class='ctx'> int vx_send_msg(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	err = vx_send_msg_nolock(chip, rmh);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='del'>-	return err;</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='add'>+	return vx_send_msg_nolock(chip, rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -362,7 +356,7 @@ int vx_send_msg(struct vx_core *chip, struct vx_rmh *rmh)</div><div class='ctx'>  * returns 0 if successful, or a negative error code.</div><div class='ctx'>  * the error code can be VX-specific, retrieved via vx_get_error().</div><div class='ctx'>  *</div><div class='del'>- * this function doesn't call spinlock at all.</div><div class='add'>+ * this function doesn't call mutex at all.</div><div class='ctx'>  *</div><div class='ctx'>  * unlike RMH, no command is sent to DSP.</div><div class='ctx'>  */</div><div class='hunk'>@@ -373,20 +367,21 @@ int vx_send_rih_nolock(struct vx_core *chip, int cmd)</div><div class='ctx'> 	if (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	printk(KERN_DEBUG "send_rih: cmd = 0x%x\n", cmd);</div><div class='del'>-#endif</div><div class='del'>-	if ((err = vx_reset_chk(chip)) &lt; 0)</div><div class='add'>+	err = vx_reset_chk(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* send the IRQ */</div><div class='del'>-	if ((err = vx_send_irq_dsp(chip, cmd)) &lt; 0)</div><div class='add'>+	err = vx_send_irq_dsp(chip, cmd);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* Wait CHK = 1 */</div><div class='del'>-	if ((err = vx_wait_isr_bit(chip, ISR_CHK)) &lt; 0)</div><div class='add'>+	err = vx_wait_isr_bit(chip, ISR_CHK);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* If error, read RX */</div><div class='ctx'> 	if (vx_inb(chip, ISR) &amp; ISR_ERR) {</div><div class='del'>-		if ((err = vx_wait_for_rx_full(chip)) &lt; 0)</div><div class='add'>+		err = vx_wait_for_rx_full(chip);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		err = vx_inb(chip, RXH) &lt;&lt; 16;</div><div class='ctx'> 		err |= vx_inb(chip, RXM) &lt;&lt; 8;</div><div class='hunk'>@@ -398,26 +393,22 @@ int vx_send_rih_nolock(struct vx_core *chip, int cmd)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vx_send_rih - send an RIH with spinlock</div><div class='add'>+ * vx_send_rih - send an RIH with mutex</div><div class='ctx'>  * @cmd: the command to send</div><div class='ctx'>  *</div><div class='ctx'>  * see vx_send_rih_nolock().</div><div class='ctx'>  */</div><div class='ctx'> int vx_send_rih(struct vx_core *chip, int cmd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	err = vx_send_rih_nolock(chip, cmd);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='del'>-	return err;</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='add'>+	return vx_send_rih_nolock(chip, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define END_OF_RESET_WAIT_TIME		500	/* us */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * snd_vx_boot_xilinx - boot up the xilinx interface</div><div class='add'>+ * snd_vx_load_boot_image - boot up the xilinx interface</div><div class='add'>+ * @chip: VX core instance</div><div class='ctx'>  * @boot: the boot record to load</div><div class='ctx'>  */</div><div class='ctx'> int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *boot)</div><div class='hunk'>@@ -450,7 +441,7 @@ int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *boot)</div><div class='ctx'> 			if (no_fillup)</div><div class='ctx'> 				break;</div><div class='ctx'> 			if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "dsp boot failed at %d\n", i);</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev, "dsp boot failed at %d\n", i);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 			vx_outb(chip, TXH, 0);</div><div class='hunk'>@@ -459,7 +450,7 @@ int snd_vx_load_boot_image(struct vx_core *chip, const struct firmware *boot)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			const unsigned char *image = boot-&gt;data + i;</div><div class='ctx'> 			if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "dsp boot failed at %d\n", i);</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev, "dsp boot failed at %d\n", i);</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 			vx_outb(chip, TXH, image[0]);</div><div class='hunk'>@@ -482,51 +473,45 @@ static int vx_test_irq_src(struct vx_core *chip, unsigned int *ret)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	vx_init_rmh(&amp;chip-&gt;irq_rmh, CMD_TEST_IT);</div><div class='del'>-	spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	err = vx_send_msg_nolock(chip, &amp;chip-&gt;irq_rmh);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		*ret = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		*ret = chip-&gt;irq_rmh.Stat[0];</div><div class='del'>-	spin_unlock(&amp;chip-&gt;lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vx_interrupt - soft irq handler</div><div class='add'>+ * snd_vx_threaded_irq_handler - threaded irq handler</div><div class='ctx'>  */</div><div class='del'>-static void vx_interrupt(unsigned long private_data)</div><div class='add'>+irqreturn_t snd_vx_threaded_irq_handler(int irq, void *dev)</div><div class='ctx'> {</div><div class='del'>-	struct vx_core *chip = (struct vx_core *) private_data;</div><div class='add'>+	struct vx_core *chip = dev;</div><div class='ctx'> 	unsigned int events;</div><div class='ctx'> 		</div><div class='ctx'> 	if (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)</div><div class='del'>-		return;</div><div class='add'>+		return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	if (vx_test_irq_src(chip, &amp;events) &lt; 0)</div><div class='del'>-		return;</div><div class='add'>+		return IRQ_HANDLED;</div><div class='ctx'>     </div><div class='del'>-#if 0</div><div class='del'>-	if (events &amp; 0x000800)</div><div class='del'>-		printk(KERN_ERR "DSP Stream underrun ! IRQ events = 0x%x\n", events);</div><div class='del'>-#endif</div><div class='del'>-	// printk(KERN_DEBUG "IRQ events = 0x%x\n", events);</div><div class='del'>-</div><div class='ctx'> 	/* We must prevent any application using this DSP</div><div class='ctx'> 	 * and block any further request until the application</div><div class='ctx'> 	 * either unregisters or reloads the DSP</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (events &amp; FATAL_DSP_ERROR) {</div><div class='del'>-		snd_printk(KERN_ERR "vx_core: fatal DSP error!!\n");</div><div class='del'>-		return;</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "vx_core: fatal DSP error!!\n");</div><div class='add'>+		return IRQ_HANDLED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The start on time code conditions are filled (ie the time code</div><div class='ctx'> 	 * received by the board is equal to one of those given to it).</div><div class='ctx'> 	 */</div><div class='del'>-	if (events &amp; TIME_CODE_EVENT_PENDING)</div><div class='add'>+	if (events &amp; TIME_CODE_EVENT_PENDING) {</div><div class='ctx'> 		; /* so far, nothing to do yet */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* The frequency has changed on the board (UER mode). */</div><div class='ctx'> 	if (events &amp; FREQUENCY_CHANGE_EVENT_PENDING)</div><div class='hunk'>@@ -534,11 +519,14 @@ static void vx_interrupt(unsigned long private_data)</div><div class='ctx'> </div><div class='ctx'> 	/* update the pcm streams */</div><div class='ctx'> 	vx_pcm_update_intr(chip, events);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+EXPORT_SYMBOL(snd_vx_threaded_irq_handler);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_vx_irq_handler - interrupt handler</div><div class='add'>+ * @irq: irq number</div><div class='add'>+ * @dev: VX core instance</div><div class='ctx'>  */</div><div class='ctx'> irqreturn_t snd_vx_irq_handler(int irq, void *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -548,8 +536,8 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev)</div><div class='ctx'> 	    (chip-&gt;chip_status &amp; VX_STAT_IS_STALE))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	if (! vx_test_and_ack(chip))</div><div class='del'>-		tasklet_schedule(&amp;chip-&gt;tq);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='add'>+		return IRQ_WAKE_THREAD;</div><div class='add'>+	return IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_vx_irq_handler);</div><div class='hunk'>@@ -599,17 +587,17 @@ static void vx_reset_board(struct vx_core *chip, int cold_reset)</div><div class='ctx'> static void vx_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct vx_core *chip = entry-&gt;private_data;</div><div class='del'>-	static char *audio_src_vxp[] = { "Line", "Mic", "Digital" };</div><div class='del'>-	static char *audio_src_vx2[] = { "Analog", "Analog", "Digital" };</div><div class='del'>-	static char *clock_mode[] = { "Auto", "Internal", "External" };</div><div class='del'>-	static char *clock_src[] = { "Internal", "External" };</div><div class='del'>-	static char *uer_type[] = { "Consumer", "Professional", "Not Present" };</div><div class='add'>+	static const char * const audio_src_vxp[] = { "Line", "Mic", "Digital" };</div><div class='add'>+	static const char * const audio_src_vx2[] = { "Analog", "Analog", "Digital" };</div><div class='add'>+	static const char * const clock_mode[] = { "Auto", "Internal", "External" };</div><div class='add'>+	static const char * const clock_src[] = { "Internal", "External" };</div><div class='add'>+	static const char * const uer_type[] = { "Consumer", "Professional", "Not Present" };</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "%s\n", chip-&gt;card-&gt;longname);</div><div class='ctx'> 	snd_iprintf(buffer, "Xilinx Firmware: %s\n",</div><div class='del'>-		    chip-&gt;chip_status &amp; VX_STAT_XILINX_LOADED ? "Loaded" : "No");</div><div class='add'>+		    (chip-&gt;chip_status &amp; VX_STAT_XILINX_LOADED) ? "Loaded" : "No");</div><div class='ctx'> 	snd_iprintf(buffer, "Device Initialized: %s\n",</div><div class='del'>-		    chip-&gt;chip_status &amp; VX_STAT_DEVICE_INIT ? "Yes" : "No");</div><div class='add'>+		    (chip-&gt;chip_status &amp; VX_STAT_DEVICE_INIT) ? "Yes" : "No");</div><div class='ctx'> 	snd_iprintf(buffer, "DSP audio info:");</div><div class='ctx'> 	if (chip-&gt;audio_info &amp; VX_AUDIO_INFO_REAL_TIME)</div><div class='ctx'> 		snd_iprintf(buffer, " realtime");</div><div class='hunk'>@@ -641,15 +629,14 @@ static void vx_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *b</div><div class='ctx'> </div><div class='ctx'> static void vx_proc_init(struct vx_core *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "vx-status", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, vx_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "vx-status", chip, vx_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_vx_dsp_boot - load the DSP boot</div><div class='add'>+ * @chip: VX core instance</div><div class='add'>+ * @boot: firmware data</div><div class='ctx'>  */</div><div class='ctx'> int snd_vx_dsp_boot(struct vx_core *chip, const struct firmware *boot)</div><div class='ctx'> {</div><div class='hunk'>@@ -659,7 +646,8 @@ int snd_vx_dsp_boot(struct vx_core *chip, const struct firmware *boot)</div><div class='ctx'> 	vx_reset_board(chip, cold_reset);</div><div class='ctx'> 	vx_validate_irq(chip, 0);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_vx_load_boot_image(chip, boot)) &lt; 0)</div><div class='add'>+	err = snd_vx_load_boot_image(chip, boot);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='hunk'>@@ -670,6 +658,8 @@ EXPORT_SYMBOL(snd_vx_dsp_boot);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_vx_dsp_load - load the DSP image</div><div class='add'>+ * @chip: VX core instance</div><div class='add'>+ * @dsp: firmware data</div><div class='ctx'>  */</div><div class='ctx'> int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)</div><div class='ctx'> {</div><div class='hunk'>@@ -687,9 +677,10 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)</div><div class='ctx'> 	for (i = 0; i &lt; dsp-&gt;size; i += 3) {</div><div class='ctx'> 		image = dsp-&gt;data + i;</div><div class='ctx'> 		/* Wait DSP ready for a new read */</div><div class='del'>-		if ((err = vx_wait_isr_bit(chip, ISR_TX_EMPTY)) &lt; 0) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "dsp loading error at position %d\n", i);</div><div class='add'>+		err = vx_wait_isr_bit(chip, ISR_TX_EMPTY);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp loading error at position %d\n", i);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		cptr = image;</div><div class='hunk'>@@ -703,11 +694,11 @@ int snd_vx_dsp_load(struct vx_core *chip, const struct firmware *dsp)</div><div class='ctx'> 		csum = (csum &gt;&gt; 24) | (csum &lt;&lt; 8);</div><div class='ctx'> 		vx_outb(chip, TXL, *cptr++);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printdd(KERN_DEBUG "checksum = 0x%08x\n", csum);</div><div class='ctx'> </div><div class='ctx'> 	msleep(200);</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_wait_isr_bit(chip, ISR_CHK)) &lt; 0)</div><div class='add'>+	err = vx_wait_isr_bit(chip, ISR_CHK);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	vx_toggle_dac_mute(chip, 0);</div><div class='hunk'>@@ -724,14 +715,10 @@ EXPORT_SYMBOL(snd_vx_dsp_load);</div><div class='ctx'> /*</div><div class='ctx'>  * suspend</div><div class='ctx'>  */</div><div class='del'>-int snd_vx_suspend(struct vx_core *chip, pm_message_t state)</div><div class='add'>+int snd_vx_suspend(struct vx_core *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='ctx'> 	snd_power_change_state(chip-&gt;card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> 	chip-&gt;chip_status |= VX_STAT_IN_SUSPEND;</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;hw-&gt;num_codecs; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -752,7 +739,8 @@ int snd_vx_resume(struct vx_core *chip)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		err = chip-&gt;ops-&gt;load_dsp(chip, i, chip-&gt;firmware[i]);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "vx: firmware resume error at DSP %d\n", i);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"vx: firmware resume error at DSP %d\n", i);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -767,17 +755,28 @@ int snd_vx_resume(struct vx_core *chip)</div><div class='ctx'> EXPORT_SYMBOL(snd_vx_resume);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void snd_vx_release(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	snd_vx_free_firmware(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * snd_vx_create - constructor for struct vx_core</div><div class='add'>+ * @card: card instance</div><div class='ctx'>  * @hw: hardware specific record</div><div class='add'>+ * @ops: VX ops pointer</div><div class='add'>+ * @extra_size: extra byte size to allocate appending to chip</div><div class='ctx'>  *</div><div class='ctx'>  * this function allocates the instance and prepare for the hardware</div><div class='ctx'>  * initialization.</div><div class='ctx'>  *</div><div class='add'>+ * The object is managed via devres, and will be automatically released.</div><div class='add'>+ *</div><div class='ctx'>  * return the instance pointer if successful, NULL in error.</div><div class='ctx'>  */</div><div class='del'>-struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw,</div><div class='del'>-			      struct snd_vx_ops *ops,</div><div class='add'>+struct vx_core *snd_vx_create(struct snd_card *card,</div><div class='add'>+			      const struct snd_vx_hardware *hw,</div><div class='add'>+			      const struct snd_vx_ops *ops,</div><div class='ctx'> 			      int extra_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct vx_core *chip;</div><div class='hunk'>@@ -785,23 +784,20 @@ struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw,</div><div class='ctx'> 	if (snd_BUG_ON(!card || !hw || !ops))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip) + extra_size, GFP_KERNEL);</div><div class='del'>-	if (! chip) {</div><div class='del'>-		snd_printk(KERN_ERR "vx_core: no memory\n");</div><div class='add'>+	chip = devres_alloc(snd_vx_release, sizeof(*chip) + extra_size,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!chip)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;irq_lock);</div><div class='add'>+	mutex_init(&amp;chip-&gt;lock);</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	chip-&gt;hw = hw;</div><div class='ctx'> 	chip-&gt;type = hw-&gt;type;</div><div class='ctx'> 	chip-&gt;ops = ops;</div><div class='del'>-	tasklet_init(&amp;chip-&gt;tq, vx_interrupt, (unsigned long)chip);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	card-&gt;private_data = chip;</div><div class='del'>-	strcpy(card-&gt;driver, hw-&gt;name);</div><div class='add'>+	strscpy(card-&gt;driver, hw-&gt;name);</div><div class='ctx'> 	sprintf(card-&gt;shortname, "Digigram %s", hw-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	vx_proc_init(chip);</div><div class='hunk'>@@ -810,18 +806,3 @@ struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_vx_create);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * module entries</div><div class='del'>- */</div><div class='del'>-static int __init alsa_vx_core_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_vx_core_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_vx_core_init)</div><div class='del'>-module_exit(alsa_vx_core_exit)</div><div class='head'>diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c<br/>index f7a6fbd313e3..a7f8ddf4df5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_hwdep.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_hwdep.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_hwdep.c</a></div><div class='hunk'>@@ -1,35 +1,21 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * DSP firmware management</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/hwdep.h&gt;</div><div class='ctx'> #include &lt;sound/vx_core.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef SND_VX_FW_LOADER</div><div class='del'>-</div><div class='ctx'> MODULE_FIRMWARE("vx/bx_1_vxp.b56");</div><div class='ctx'> MODULE_FIRMWARE("vx/bx_1_vp4.b56");</div><div class='ctx'> MODULE_FIRMWARE("vx/x1_1_vx2.xlx");</div><div class='hunk'>@@ -46,7 +32,7 @@ MODULE_FIRMWARE("vx/l_1_vp4.d56");</div><div class='ctx'> </div><div class='ctx'> int snd_vx_setup_firmware(struct vx_core *chip)</div><div class='ctx'> {</div><div class='del'>-	static char *fw_files[VX_TYPE_NUMS][4] = {</div><div class='add'>+	static const char * const fw_files[VX_TYPE_NUMS][4] = {</div><div class='ctx'> 		[VX_TYPE_BOARD] = {</div><div class='ctx'> 			NULL, "x1_1_vx2.xlx", "bd56002.boot", "l_1_vx2.d56",</div><div class='ctx'> 		},</div><div class='hunk'>@@ -72,8 +58,8 @@ int snd_vx_setup_firmware(struct vx_core *chip)</div><div class='ctx'> 		if (! fw_files[chip-&gt;type][i])</div><div class='ctx'> 			continue;</div><div class='ctx'> 		sprintf(path, "vx/%s", fw_files[chip-&gt;type][i]);</div><div class='del'>-		if (request_firmware(&amp;fw, path, chip-&gt;dev)) {</div><div class='del'>-			snd_printk(KERN_ERR "vx: can't load firmware %s\n", path);</div><div class='add'>+		if (request_firmware(&amp;fw, path, chip-&gt;card-&gt;dev)) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "vx: can't load firmware %s\n", path);</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = chip-&gt;ops-&gt;load_dsp(chip, i, fw);</div><div class='hunk'>@@ -92,15 +78,19 @@ int snd_vx_setup_firmware(struct vx_core *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* ok, we reached to the last one */</div><div class='ctx'> 	/* create the devices if not built yet */</div><div class='del'>-	if ((err = snd_vx_pcm_new(chip)) &lt; 0)</div><div class='add'>+	err = snd_vx_pcm_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_vx_mixer_new(chip)) &lt; 0)</div><div class='add'>+	err = snd_vx_mixer_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;ops-&gt;add_controls)</div><div class='del'>-		if ((err = chip-&gt;ops-&gt;add_controls(chip)) &lt; 0)</div><div class='add'>+	if (chip-&gt;ops-&gt;add_controls) {</div><div class='add'>+		err = chip-&gt;ops-&gt;add_controls(chip);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;chip_status |= VX_STAT_DEVICE_INIT;</div><div class='ctx'> 	chip-&gt;chip_status |= VX_STAT_CHIP_INIT;</div><div class='hunk'>@@ -118,142 +108,5 @@ void snd_vx_free_firmware(struct vx_core *chip)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* old style firmware loading */</div><div class='del'>-</div><div class='del'>-static int vx_hwdep_dsp_status(struct snd_hwdep *hw,</div><div class='del'>-			       struct snd_hwdep_dsp_status *info)</div><div class='del'>-{</div><div class='del'>-	static char *type_ids[VX_TYPE_NUMS] = {</div><div class='del'>-		[VX_TYPE_BOARD] = "vxboard",</div><div class='del'>-		[VX_TYPE_V2] = "vx222",</div><div class='del'>-		[VX_TYPE_MIC] = "vx222",</div><div class='del'>-		[VX_TYPE_VXPOCKET] = "vxpocket",</div><div class='del'>-		[VX_TYPE_VXP440] = "vxp440",</div><div class='del'>-	};</div><div class='del'>-	struct vx_core *vx = hw-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!type_ids[vx-&gt;type]))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	strcpy(info-&gt;id, type_ids[vx-&gt;type]);</div><div class='del'>-	if (vx_is_pcmcia(vx))</div><div class='del'>-		info-&gt;num_dsps = 4;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;num_dsps = 3;</div><div class='del'>-	if (vx-&gt;chip_status &amp; VX_STAT_CHIP_INIT)</div><div class='del'>-		info-&gt;chip_ready = 1;</div><div class='del'>-	info-&gt;version = VX_DRIVER_VERSION;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_fw(const struct firmware *fw)</div><div class='del'>-{</div><div class='del'>-	if (fw) {</div><div class='del'>-		vfree(fw-&gt;data);</div><div class='del'>-		kfree(fw);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vx_hwdep_dsp_load(struct snd_hwdep *hw,</div><div class='del'>-			     struct snd_hwdep_dsp_image *dsp)</div><div class='del'>-{</div><div class='del'>-	struct vx_core *vx = hw-&gt;private_data;</div><div class='del'>-	int index, err;</div><div class='del'>-	struct firmware *fw;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!vx-&gt;ops-&gt;load_dsp))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	fw = kmalloc(sizeof(*fw), GFP_KERNEL);</div><div class='del'>-	if (! fw) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot allocate firmware\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	fw-&gt;size = dsp-&gt;length;</div><div class='del'>-	fw-&gt;data = vmalloc(fw-&gt;size);</div><div class='del'>-	if (! fw-&gt;data) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot allocate firmware image (length=%d)\n",</div><div class='del'>-			   (int)fw-&gt;size);</div><div class='del'>-		kfree(fw);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	if (copy_from_user((void *)fw-&gt;data, dsp-&gt;image, dsp-&gt;length)) {</div><div class='del'>-		free_fw(fw);</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	index = dsp-&gt;index;</div><div class='del'>-	if (! vx_is_pcmcia(vx))</div><div class='del'>-		index++;</div><div class='del'>-	err = vx-&gt;ops-&gt;load_dsp(vx, index, fw);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		free_fw(fw);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	vx-&gt;firmware[index] = fw;</div><div class='del'>-#else</div><div class='del'>-	free_fw(fw);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (index == 1)</div><div class='del'>-		vx-&gt;chip_status |= VX_STAT_XILINX_LOADED;</div><div class='del'>-	if (index &lt; 3)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* ok, we reached to the last one */</div><div class='del'>-	/* create the devices if not built yet */</div><div class='del'>-	if (! (vx-&gt;chip_status &amp; VX_STAT_DEVICE_INIT)) {</div><div class='del'>-		if ((err = snd_vx_pcm_new(vx)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if ((err = snd_vx_mixer_new(vx)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (vx-&gt;ops-&gt;add_controls)</div><div class='del'>-			if ((err = vx-&gt;ops-&gt;add_controls(vx)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-		if ((err = snd_card_register(vx-&gt;card)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		vx-&gt;chip_status |= VX_STAT_DEVICE_INIT;</div><div class='del'>-	}</div><div class='del'>-	vx-&gt;chip_status |= VX_STAT_CHIP_INIT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* exported */</div><div class='del'>-int snd_vx_setup_firmware(struct vx_core *chip)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_hwdep *hw;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_hwdep_new(chip-&gt;card, SND_VX_HWDEP_ID, 0, &amp;hw)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	hw-&gt;iface = SNDRV_HWDEP_IFACE_VX;</div><div class='del'>-	hw-&gt;private_data = chip;</div><div class='del'>-	hw-&gt;ops.dsp_status = vx_hwdep_dsp_status;</div><div class='del'>-	hw-&gt;ops.dsp_load = vx_hwdep_dsp_load;</div><div class='del'>-	hw-&gt;exclusive = 1;</div><div class='del'>-	sprintf(hw-&gt;name, "VX Loader (%s)", chip-&gt;card-&gt;driver);</div><div class='del'>-	chip-&gt;hwdep = hw;</div><div class='del'>-</div><div class='del'>-	return snd_card_register(chip-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* exported */</div><div class='del'>-void snd_vx_free_firmware(struct vx_core *chip)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		free_fw(chip-&gt;firmware[i]);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* SND_VX_FW_LOADER */</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_vx_setup_firmware);</div><div class='ctx'> EXPORT_SYMBOL(snd_vx_free_firmware);</div><div class='head'>diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c<br/>index c71b8d148d7f..9dc5cecaa86a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_mixer.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * Common mixer part</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -32,17 +19,14 @@</div><div class='ctx'>  */</div><div class='ctx'> static void vx_write_codec_reg(struct vx_core *chip, int codec, unsigned int data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!chip-&gt;ops-&gt;write_codec))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	chip-&gt;ops-&gt;write_codec(chip, codec, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -178,14 +162,11 @@ void vx_reset_codec(struct vx_core *chip, int cold_reset)</div><div class='ctx'>  */</div><div class='ctx'> static void vx_change_audio_source(struct vx_core *chip, int src)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	chip-&gt;ops-&gt;change_audio_source(chip, src);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -428,10 +409,10 @@ static int vx_output_level_get(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> {</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int codec = kcontrol-&gt;id.index;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;output_level[codec][0];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = chip-&gt;output_level[codec][1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -446,20 +427,18 @@ static int vx_output_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> 	val[1] = ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> 	if (val[0] &gt; vmax || val[1] &gt; vmax)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (val[0] != chip-&gt;output_level[codec][0] ||</div><div class='ctx'> 	    val[1] != chip-&gt;output_level[codec][1]) {</div><div class='ctx'> 		vx_set_analog_output_level(chip, codec, val[0], val[1]);</div><div class='ctx'> 		chip-&gt;output_level[codec][0] = val[0];</div><div class='ctx'> 		chip-&gt;output_level[codec][1] = val[1];</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_output_level = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_output_level = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 			 SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='hunk'>@@ -475,30 +454,18 @@ static struct snd_kcontrol_new vx_control_output_level = {</div><div class='ctx'>  */</div><div class='ctx'> static int vx_audio_src_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts_mic[3] = {</div><div class='add'>+	static const char * const texts_mic[3] = {</div><div class='ctx'> 		"Digital", "Line", "Mic"</div><div class='ctx'> 	};</div><div class='del'>-	static char *texts_vx2[2] = {</div><div class='add'>+	static const char * const texts_vx2[2] = {</div><div class='ctx'> 		"Digital", "Analog"</div><div class='ctx'> 	};</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (chip-&gt;type &gt;= VX_TYPE_VXPOCKET) {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		       texts_mic[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	} else {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		       texts_vx2[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (chip-&gt;type &gt;= VX_TYPE_VXPOCKET)</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 3, texts_mic);</div><div class='add'>+	else</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 2, texts_vx2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vx_audio_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -519,18 +486,16 @@ static int vx_audio_src_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v</div><div class='ctx'> 		if (ucontrol-&gt;value.enumerated.item[0] &gt; 1)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (chip-&gt;audio_source_target != ucontrol-&gt;value.enumerated.item[0]) {</div><div class='ctx'> 		chip-&gt;audio_source_target = ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 		vx_sync_audio_source(chip);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_audio_src = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_audio_src = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Capture Source",</div><div class='ctx'> 	.info =		vx_audio_src_info,</div><div class='hunk'>@@ -543,18 +508,11 @@ static struct snd_kcontrol_new vx_control_audio_src = {</div><div class='ctx'>  */</div><div class='ctx'> static int vx_clock_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Auto", "Internal", "External"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vx_clock_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -570,18 +528,16 @@ static int vx_clock_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> </div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (chip-&gt;clock_mode != ucontrol-&gt;value.enumerated.item[0]) {</div><div class='ctx'> 		chip-&gt;clock_mode = ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 		vx_set_clock(chip, chip-&gt;freq);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_clock_mode = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_clock_mode = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Clock Mode",</div><div class='ctx'> 	.info =		vx_clock_mode_info,</div><div class='hunk'>@@ -607,10 +563,9 @@ static int vx_audio_gain_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int capture = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;audio_gain[capture][audio];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = chip-&gt;audio_gain[capture][audio+1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -625,15 +580,13 @@ static int vx_audio_gain_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 	val[1] = ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> 	if (val[0] &gt; CVAL_MAX || val[1] &gt; CVAL_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (val[0] != chip-&gt;audio_gain[capture][audio] ||</div><div class='ctx'> 	    val[1] != chip-&gt;audio_gain[capture][audio+1]) {</div><div class='ctx'> 		vx_set_audio_gain(chip, audio, capture, val[0]);</div><div class='ctx'> 		vx_set_audio_gain(chip, audio+1, capture, val[1]);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -642,10 +595,9 @@ static int vx_audio_monitor_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;audio_monitor[audio];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = chip-&gt;audio_monitor[audio+1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -660,17 +612,15 @@ static int vx_audio_monitor_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 	if (val[0] &gt; CVAL_MAX || val[1] &gt; CVAL_MAX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (val[0] != chip-&gt;audio_monitor[audio] ||</div><div class='ctx'> 	    val[1] != chip-&gt;audio_monitor[audio+1]) {</div><div class='ctx'> 		vx_set_monitor_level(chip, audio, val[0],</div><div class='ctx'> 				     chip-&gt;audio_monitor_active[audio]);</div><div class='ctx'> 		vx_set_monitor_level(chip, audio+1, val[1],</div><div class='ctx'> 				     chip-&gt;audio_monitor_active[audio+1]);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -681,10 +631,9 @@ static int vx_audio_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;audio_active[audio];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = chip-&gt;audio_active[audio+1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -693,17 +642,15 @@ static int vx_audio_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0] != chip-&gt;audio_active[audio] ||</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[1] != chip-&gt;audio_active[audio+1]) {</div><div class='ctx'> 		vx_set_audio_switch(chip, audio,</div><div class='ctx'> 				    !!ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> 		vx_set_audio_switch(chip, audio+1,</div><div class='ctx'> 				    !!ucontrol-&gt;value.integer.value[1]);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,10 +659,9 @@ static int vx_monitor_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;audio_monitor_active[audio];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = chip-&gt;audio_monitor_active[audio+1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -724,23 +670,21 @@ static int vx_monitor_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int audio = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0] != chip-&gt;audio_monitor_active[audio] ||</div><div class='ctx'> 	    ucontrol-&gt;value.integer.value[1] != chip-&gt;audio_monitor_active[audio+1]) {</div><div class='ctx'> 		vx_set_monitor_level(chip, audio, chip-&gt;audio_monitor[audio],</div><div class='ctx'> 				     !!ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> 		vx_set_monitor_level(chip, audio+1, chip-&gt;audio_monitor[audio+1],</div><div class='ctx'> 				     !!ucontrol-&gt;value.integer.value[1]);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_audio_gain, -10975, 25, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_audio_gain = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_audio_gain = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 			 SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='hunk'>@@ -750,14 +694,14 @@ static struct snd_kcontrol_new vx_control_audio_gain = {</div><div class='ctx'> 	.put =          vx_audio_gain_put,</div><div class='ctx'> 	.tlv = { .p = db_scale_audio_gain },</div><div class='ctx'> };</div><div class='del'>-static struct snd_kcontrol_new vx_control_output_switch = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_output_switch = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =         "PCM Playback Switch",</div><div class='ctx'> 	.info =         vx_audio_sw_info,</div><div class='ctx'> 	.get =          vx_audio_sw_get,</div><div class='ctx'> 	.put =          vx_audio_sw_put</div><div class='ctx'> };</div><div class='del'>-static struct snd_kcontrol_new vx_control_monitor_gain = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_monitor_gain = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =         "Monitoring Volume",</div><div class='ctx'> 	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='hunk'>@@ -767,7 +711,7 @@ static struct snd_kcontrol_new vx_control_monitor_gain = {</div><div class='ctx'> 	.put =          vx_audio_monitor_put,</div><div class='ctx'> 	.tlv = { .p = db_scale_audio_gain },</div><div class='ctx'> };</div><div class='del'>-static struct snd_kcontrol_new vx_control_monitor_switch = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_monitor_switch = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =         "Monitoring Switch",</div><div class='ctx'> 	.info =         vx_audio_sw_info,	/* shared */</div><div class='hunk'>@@ -790,12 +734,11 @@ static int vx_iec958_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> {</div><div class='ctx'> 	struct vx_core *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = (chip-&gt;uer_bits &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (chip-&gt;uer_bits &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (chip-&gt;uer_bits &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = (chip-&gt;uer_bits &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -817,18 +760,16 @@ static int vx_iec958_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mixer_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	if (chip-&gt;uer_bits != val) {</div><div class='ctx'> 		chip-&gt;uer_bits = val;</div><div class='ctx'> 		vx_set_iec958_status(chip, val);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mixer_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_iec958_mask = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_iec958_mask = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),</div><div class='hunk'>@@ -836,7 +777,7 @@ static struct snd_kcontrol_new vx_control_iec958_mask = {</div><div class='ctx'> 	.get =		vx_iec958_mask_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_iec958 = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_iec958 = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='ctx'> 	.info =         vx_iec958_info,</div><div class='hunk'>@@ -901,7 +842,7 @@ static int vx_saturation_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_vu_meter = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_vu_meter = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	/* name will be filled later */</div><div class='hunk'>@@ -909,7 +850,7 @@ static struct snd_kcontrol_new vx_control_vu_meter = {</div><div class='ctx'> 	.get =		vx_vu_meter_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_peak_meter = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_peak_meter = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	/* name will be filled later */</div><div class='hunk'>@@ -917,7 +858,7 @@ static struct snd_kcontrol_new vx_control_peak_meter = {</div><div class='ctx'> 	.get =		vx_peak_meter_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vx_control_saturation = {</div><div class='add'>+static const struct snd_kcontrol_new vx_control_saturation = {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Input Saturation",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='hunk'>@@ -939,14 +880,15 @@ int snd_vx_mixer_new(struct vx_core *chip)</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	char name[32];</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, card-&gt;driver);</div><div class='add'>+	strscpy(card-&gt;mixername, card-&gt;driver);</div><div class='ctx'> </div><div class='ctx'> 	/* output level controls */</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;hw-&gt;num_outs; i++) {</div><div class='ctx'> 		temp = vx_control_output_level;</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.tlv.p = chip-&gt;hw-&gt;output_level_db_scale;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -957,22 +899,26 @@ int snd_vx_mixer_new(struct vx_core *chip)</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.name = "PCM Playback Volume";</div><div class='ctx'> 		temp.private_value = val;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		temp = vx_control_output_switch;</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.private_value = val;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		temp = vx_control_monitor_gain;</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.private_value = val;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		temp = vx_control_monitor_switch;</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.private_value = val;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;hw-&gt;num_outs; i++) {</div><div class='hunk'>@@ -980,31 +926,37 @@ int snd_vx_mixer_new(struct vx_core *chip)</div><div class='ctx'> 		temp.index = i;</div><div class='ctx'> 		temp.name = "PCM Capture Volume";</div><div class='ctx'> 		temp.private_value = (i * 2) | (1 &lt;&lt; 8);</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Audio source */</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_audio_src, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_audio_src, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* clock mode */</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_clock_mode, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_clock_mode, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* IEC958 controls */</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_iec958_mask, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_iec958_mask, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_iec958, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;vx_control_iec958, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* VU, peak, saturation meters */</div><div class='ctx'> 	for (c = 0; c &lt; 2; c++) {</div><div class='del'>-		static char *dir[2] = { "Output", "Input" };</div><div class='add'>+		static const char * const dir[2] = { "Output", "Input" };</div><div class='ctx'> 		for (i = 0; i &lt; chip-&gt;hw-&gt;num_ins; i++) {</div><div class='ctx'> 			int val = (i * 2) | (c &lt;&lt; 8);</div><div class='ctx'> 			if (c == 1) {</div><div class='ctx'> 				temp = vx_control_saturation;</div><div class='ctx'> 				temp.index = i;</div><div class='ctx'> 				temp.private_value = val;</div><div class='del'>-				if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+				err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			sprintf(name, "%s VU Meter", dir[c]);</div><div class='hunk'>@@ -1012,14 +964,16 @@ int snd_vx_mixer_new(struct vx_core *chip)</div><div class='ctx'> 			temp.index = i;</div><div class='ctx'> 			temp.name = name;</div><div class='ctx'> 			temp.private_value = val;</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			sprintf(name, "%s Peak Meter", dir[c]);</div><div class='ctx'> 			temp = vx_control_peak_meter;</div><div class='ctx'> 			temp.index = i;</div><div class='ctx'> 			temp.name = name;</div><div class='ctx'> 			temp.private_value = val;</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;temp, chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c<br/>index 35a2f71a6af5..7fd8f413d6cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_pcm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002,2003 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * STRATEGY</div><div class='ctx'>  *  for playback, we send series of "chunks", which size is equal with the</div><div class='ctx'>  *  IBL size, typically 126 samples.  at each end of chunk, the end-of-buffer</div><div class='hunk'>@@ -39,7 +25,6 @@</div><div class='ctx'>  *  the current point of read buffer is kept in pipe-&gt;hw_ptr.  note that</div><div class='ctx'>  *  this is in bytes.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * TODO</div><div class='ctx'>  *  - linked trigger for full-duplex mode.</div><div class='ctx'>  *  - scheduled action on the stream.</div><div class='hunk'>@@ -75,7 +60,6 @@ static void vx_pcm_read_per_bytes(struct vx_core *chip, struct snd_pcm_runtime *</div><div class='ctx'> 	*buf++ = vx_inb(chip, RXL);</div><div class='ctx'> 	if (++offset &gt;= pipe-&gt;buffer_bytes) {</div><div class='ctx'> 		offset = 0;</div><div class='del'>-		buf = (unsigned char *)runtime-&gt;dma_area;</div><div class='ctx'> 	}</div><div class='ctx'> 	pipe-&gt;hw_ptr = offset;</div><div class='ctx'> }</div><div class='hunk'>@@ -184,7 +168,7 @@ static int vx_set_format(struct vx_core *chip, struct vx_pipe *pipe,</div><div class='ctx'> 	default : </div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-        };</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return vx_set_stream_format(chip, pipe, header);</div><div class='ctx'> }</div><div class='hunk'>@@ -206,8 +190,10 @@ static int vx_set_ibl(struct vx_core *chip, struct vx_ibl_info *info)</div><div class='ctx'> 	info-&gt;max_size = rmh.Stat[1];</div><div class='ctx'> 	info-&gt;min_size = rmh.Stat[2];</div><div class='ctx'> 	info-&gt;granularity = rmh.Stat[3];</div><div class='del'>-	snd_printdd(KERN_DEBUG "vx_set_ibl: size = %d, max = %d, min = %d, gran = %d\n",</div><div class='del'>-		   info-&gt;size, info-&gt;max_size, info-&gt;min_size, info-&gt;granularity);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"%s: size = %d, max = %d, min = %d, gran = %d\n",</div><div class='add'>+		__func__, info-&gt;size, info-&gt;max_size, info-&gt;min_size,</div><div class='add'>+		info-&gt;granularity);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +215,7 @@ static int vx_get_pipe_state(struct vx_core *chip, struct vx_pipe *pipe, int *st</div><div class='ctx'> </div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_PIPE_STATE);</div><div class='ctx'> 	vx_set_pipe_cmd_params(&amp;rmh, pipe-&gt;is_capture, pipe-&gt;number, 0);</div><div class='del'>-	err = vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	err = vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> 	if (! err)</div><div class='ctx'> 		*state = (rmh.Stat[0] &amp; (1 &lt;&lt; pipe-&gt;number)) ? 1 : 0;</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -280,7 +266,7 @@ static int vx_pipe_can_start(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'> 	vx_set_pipe_cmd_params(&amp;rmh, pipe-&gt;is_capture, pipe-&gt;number, 0);</div><div class='ctx'> 	rmh.Cmd[0] |= 1;</div><div class='ctx'> </div><div class='del'>-	err = vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	err = vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> 	if (! err) {</div><div class='ctx'> 		if (rmh.Stat[0])</div><div class='ctx'> 			err = 1;</div><div class='hunk'>@@ -300,7 +286,7 @@ static int vx_conf_pipe(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'> 	if (pipe-&gt;is_capture)</div><div class='ctx'> 		rmh.Cmd[0] |= COMMAND_RECORD_MASK;</div><div class='ctx'> 	rmh.Cmd[1] = 1 &lt;&lt; pipe-&gt;number;</div><div class='del'>-	return vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */</div><div class='add'>+	return vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -311,7 +297,7 @@ static int vx_send_irqa(struct vx_core *chip)</div><div class='ctx'> 	struct vx_rmh rmh;</div><div class='ctx'> </div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_SEND_IRQA);</div><div class='del'>-	return vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	return vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -357,10 +343,12 @@ static int vx_toggle_pipe(struct vx_core *chip, struct vx_pipe *pipe, int state)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'>     </div><div class='del'>-	if ((err = vx_conf_pipe(chip, pipe)) &lt; 0)</div><div class='add'>+	err = vx_conf_pipe(chip, pipe);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_send_irqa(chip)) &lt; 0)</div><div class='add'>+	err = vx_send_irqa(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'>     </div><div class='ctx'> 	/* If it completes successfully, wait for the pipes</div><div class='hunk'>@@ -389,7 +377,7 @@ static int vx_stop_pipe(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'> 	struct vx_rmh rmh;</div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_STOP_PIPE);</div><div class='ctx'> 	vx_set_pipe_cmd_params(&amp;rmh, pipe-&gt;is_capture, pipe-&gt;number, 0);</div><div class='del'>-	return vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	return vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -477,7 +465,7 @@ static int vx_start_stream(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_START_ONE_STREAM);</div><div class='ctx'> 	vx_set_stream_cmd_params(&amp;rmh, pipe-&gt;is_capture, pipe-&gt;number);</div><div class='ctx'> 	vx_set_differed_time(chip, &amp;rmh, pipe);</div><div class='del'>-	return vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	return vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -492,7 +480,7 @@ static int vx_stop_stream(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'> </div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_STOP_STREAM);</div><div class='ctx'> 	vx_set_stream_cmd_params(&amp;rmh, pipe-&gt;is_capture, pipe-&gt;number);</div><div class='del'>-	return vx_send_msg_nolock(chip, &amp;rmh); /* no lock needed for trigger */ </div><div class='add'>+	return vx_send_msg(chip, &amp;rmh);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -500,7 +488,7 @@ static int vx_stop_stream(struct vx_core *chip, struct vx_pipe *pipe)</div><div class='ctx'>  * playback hw information</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware vx_pcm_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware vx_pcm_playback_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_MMAP_VALID /*|*/</div><div class='ctx'> 				 /*SNDRV_PCM_INFO_RESUME*/),</div><div class='hunk'>@@ -520,8 +508,6 @@ static struct snd_pcm_hardware vx_pcm_playback_hw = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void vx_pcm_delayed_start(unsigned long arg);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * vx_pcm_playback_open - open callback for playback</div><div class='ctx'>  */</div><div class='hunk'>@@ -547,13 +533,11 @@ static int vx_pcm_playback_open(struct snd_pcm_substream *subs)</div><div class='ctx'> 		err = vx_alloc_pipe(chip, 0, audio, 2, &amp;pipe); /* stereo playback */</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		chip-&gt;playback_pipes[audio] = pipe;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* open for playback */</div><div class='ctx'> 	pipe-&gt;references++;</div><div class='ctx'> </div><div class='ctx'> 	pipe-&gt;substream = subs;</div><div class='del'>-	tasklet_init(&amp;pipe-&gt;start_tq, vx_pcm_delayed_start, (unsigned long)subs);</div><div class='ctx'> 	chip-&gt;playback_pipes[audio] = pipe;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = vx_pcm_playback_hw;</div><div class='hunk'>@@ -634,24 +618,23 @@ static int vx_pcm_playback_transfer_chunk(struct vx_core *chip,</div><div class='ctx'> 	if (space &lt; 0) {</div><div class='ctx'> 		/* disconnect the host, SIZE_HBUF command always switches to the stream mode */</div><div class='ctx'> 		vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='del'>-		snd_printd("error hbuffer\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "error hbuffer\n");</div><div class='ctx'> 		return space;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (space &lt; size) {</div><div class='ctx'> 		vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='del'>-		snd_printd("no enough hbuffer space %d\n", space);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "no enough hbuffer space %d\n", space);</div><div class='ctx'> 		return -EIO; /* XRUN */</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='ctx'> 	/* we don't need irqsave here, because this function</div><div class='ctx'> 	 * is called from either trigger callback or irq handler</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;chip-&gt;lock); </div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	vx_pseudo_dma_write(chip, runtime, pipe, size);</div><div class='ctx'> 	err = vx_notify_end_of_buffer(chip, pipe);</div><div class='ctx'> 	/* disconnect the host, SIZE_HBUF command always switches to the stream mode */</div><div class='ctx'> 	vx_send_rih_nolock(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -700,8 +683,9 @@ static void vx_pcm_playback_transfer(struct vx_core *chip,</div><div class='ctx'> 	if (! pipe-&gt;prepared || (chip-&gt;chip_status &amp; VX_STAT_IS_STALE))</div><div class='ctx'> 		return;</div><div class='ctx'> 	for (i = 0; i &lt; nchunks; i++) {</div><div class='del'>-		if ((err = vx_pcm_playback_transfer_chunk(chip, runtime, pipe,</div><div class='del'>-							  chip-&gt;ibl.size)) &lt; 0)</div><div class='add'>+		err = vx_pcm_playback_transfer_chunk(chip, runtime, pipe,</div><div class='add'>+						     chip-&gt;ibl.size);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -718,7 +702,8 @@ static void vx_pcm_playback_update(struct vx_core *chip,</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = subs-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	if (pipe-&gt;running &amp;&amp; ! (chip-&gt;chip_status &amp; VX_STAT_IS_STALE)) {</div><div class='del'>-		if ((err = vx_update_pipe_position(chip, runtime, pipe)) &lt; 0)</div><div class='add'>+		err = vx_update_pipe_position(chip, runtime, pipe);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return;</div><div class='ctx'> 		if (pipe-&gt;transferred &gt;= (int)runtime-&gt;period_size) {</div><div class='ctx'> 			pipe-&gt;transferred %= runtime-&gt;period_size;</div><div class='hunk'>@@ -728,31 +713,6 @@ static void vx_pcm_playback_update(struct vx_core *chip,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * start the stream and pipe.</div><div class='del'>- * this function is called from tasklet, which is invoked by the trigger</div><div class='del'>- * START callback.</div><div class='del'>- */</div><div class='del'>-static void vx_pcm_delayed_start(unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_substream *subs = (struct snd_pcm_substream *)arg;</div><div class='del'>-	struct vx_core *chip = subs-&gt;pcm-&gt;private_data;</div><div class='del'>-	struct vx_pipe *pipe = subs-&gt;runtime-&gt;private_data;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*  printk( KERN_DEBUG "DDDD tasklet delayed start jiffies = %ld\n", jiffies);*/</div><div class='del'>-</div><div class='del'>-	if ((err = vx_start_stream(chip, pipe)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "vx: cannot start stream\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if ((err = vx_toggle_pipe(chip, pipe, 1)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "vx: cannot start pipe\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/*   printk( KERN_DEBUG "dddd tasklet delayed start jiffies = %ld \n", jiffies);*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * vx_pcm_playback_trigger - trigger callback for playback</div><div class='ctx'>  */</div><div class='ctx'> static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)</div><div class='hunk'>@@ -769,11 +729,17 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='ctx'> 		if (! pipe-&gt;is_capture)</div><div class='ctx'> 			vx_pcm_playback_transfer(chip, subs, pipe, 2);</div><div class='del'>-		/* FIXME:</div><div class='del'>-		 * we trigger the pipe using tasklet, so that the interrupts are</div><div class='del'>-		 * issued surely after the trigger is completed.</div><div class='del'>-		 */ </div><div class='del'>-		tasklet_schedule(&amp;pipe-&gt;start_tq);</div><div class='add'>+		err = vx_start_stream(chip, pipe);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			pr_debug("vx: cannot start stream\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		err = vx_toggle_pipe(chip, pipe, 1);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			pr_debug("vx: cannot start pipe\n");</div><div class='add'>+			vx_stop_stream(chip, pipe);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 		chip-&gt;pcm_running++;</div><div class='ctx'> 		pipe-&gt;running = 1;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -786,11 +752,13 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)</div><div class='ctx'> 		pipe-&gt;running = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		if ((err = vx_toggle_pipe(chip, pipe, 0)) &lt; 0)</div><div class='add'>+		err = vx_toggle_pipe(chip, pipe, 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		if ((err = vx_toggle_pipe(chip, pipe, 1)) &lt; 0)</div><div class='add'>+		err = vx_toggle_pipe(chip, pipe, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -810,24 +778,6 @@ static snd_pcm_uframes_t vx_pcm_playback_pointer(struct snd_pcm_substream *subs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vx_pcm_hw_params - hw_params callback for playback and capture</div><div class='del'>- */</div><div class='del'>-static int vx_pcm_hw_params(struct snd_pcm_substream *subs,</div><div class='del'>-				     struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_alloc_vmalloc_32_buffer</div><div class='del'>-					(subs, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vx_pcm_hw_free - hw_free callback for playback and capture</div><div class='del'>- */</div><div class='del'>-static int vx_pcm_hw_free(struct snd_pcm_substream *subs)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_vmalloc_buffer(subs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * vx_pcm_prepare - prepare callback for playback and capture</div><div class='ctx'>  */</div><div class='ctx'> static int vx_pcm_prepare(struct snd_pcm_substream *subs)</div><div class='hunk'>@@ -846,28 +796,33 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs)</div><div class='ctx'> 		/* IEC958 status (raw-mode) was changed */</div><div class='ctx'> 		/* we reopen the pipe */</div><div class='ctx'> 		struct vx_rmh rmh;</div><div class='del'>-		snd_printdd(KERN_DEBUG "reopen the pipe with data_mode = %d\n", data_mode);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"reopen the pipe with data_mode = %d\n", data_mode);</div><div class='ctx'> 		vx_init_rmh(&amp;rmh, CMD_FREE_PIPE);</div><div class='ctx'> 		vx_set_pipe_cmd_params(&amp;rmh, 0, pipe-&gt;number, 0);</div><div class='del'>-		if ((err = vx_send_msg(chip, &amp;rmh)) &lt; 0)</div><div class='add'>+		err = vx_send_msg(chip, &amp;rmh);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		vx_init_rmh(&amp;rmh, CMD_RES_PIPE);</div><div class='ctx'> 		vx_set_pipe_cmd_params(&amp;rmh, 0, pipe-&gt;number, pipe-&gt;channels);</div><div class='ctx'> 		if (data_mode)</div><div class='ctx'> 			rmh.Cmd[0] |= BIT_DATA_MODE;</div><div class='del'>-		if ((err = vx_send_msg(chip, &amp;rmh)) &lt; 0)</div><div class='add'>+		err = vx_send_msg(chip, &amp;rmh);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		pipe-&gt;data_mode = data_mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;pcm_running &amp;&amp; chip-&gt;freq != runtime-&gt;rate) {</div><div class='del'>-		snd_printk(KERN_ERR "vx: cannot set different clock %d "</div><div class='del'>-			   "from the current %d\n", runtime-&gt;rate, chip-&gt;freq);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"vx: cannot set different clock %d from the current %d\n",</div><div class='add'>+			runtime-&gt;rate, chip-&gt;freq);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	vx_set_clock(chip, runtime-&gt;rate);</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_set_format(chip, pipe, runtime)) &lt; 0)</div><div class='add'>+	err = vx_set_format(chip, pipe, runtime);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (vx_is_pcmcia(chip)) {</div><div class='hunk'>@@ -895,17 +850,12 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs)</div><div class='ctx'> /*</div><div class='ctx'>  * operators for PCM playback</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_ops vx_pcm_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops vx_pcm_playback_ops = {</div><div class='ctx'> 	.open =		vx_pcm_playback_open,</div><div class='ctx'> 	.close =	vx_pcm_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	vx_pcm_hw_params,</div><div class='del'>-	.hw_free =	vx_pcm_hw_free,</div><div class='ctx'> 	.prepare =	vx_pcm_prepare,</div><div class='ctx'> 	.trigger =	vx_pcm_trigger,</div><div class='ctx'> 	.pointer =	vx_pcm_playback_pointer,</div><div class='del'>-	.page =		snd_pcm_lib_get_vmalloc_page,</div><div class='del'>-	.mmap =		snd_pcm_lib_mmap_vmalloc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -913,7 +863,7 @@ static struct snd_pcm_ops vx_pcm_playback_ops = {</div><div class='ctx'>  * playback hw information</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware vx_pcm_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware vx_pcm_capture_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_MMAP_VALID /*|*/</div><div class='ctx'> 				 /*SNDRV_PCM_INFO_RESUME*/),</div><div class='hunk'>@@ -955,7 +905,6 @@ static int vx_pcm_capture_open(struct snd_pcm_substream *subs)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pipe-&gt;substream = subs;</div><div class='del'>-	tasklet_init(&amp;pipe-&gt;start_tq, vx_pcm_delayed_start, (unsigned long)subs);</div><div class='ctx'> 	chip-&gt;capture_pipes[audio] = pipe;</div><div class='ctx'> </div><div class='ctx'> 	/* check if monitoring is needed */</div><div class='hunk'>@@ -1038,7 +987,7 @@ static void vx_pcm_capture_update(struct vx_core *chip, struct snd_pcm_substream</div><div class='ctx'> 	int size, space, count;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = subs-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	if (! pipe-&gt;prepared || (chip-&gt;chip_status &amp; VX_STAT_IS_STALE))</div><div class='add'>+	if (!pipe-&gt;running || (chip-&gt;chip_status &amp; VX_STAT_IS_STALE))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	size = runtime-&gt;buffer_size - snd_pcm_capture_avail(runtime);</div><div class='hunk'>@@ -1071,8 +1020,10 @@ static void vx_pcm_capture_update(struct vx_core *chip, struct snd_pcm_substream</div><div class='ctx'> 		/* ok, let's accelerate! */</div><div class='ctx'> 		int align = pipe-&gt;align * 3;</div><div class='ctx'> 		space = (count / align) * align;</div><div class='del'>-		vx_pseudo_dma_read(chip, runtime, pipe, space);</div><div class='del'>-		count -= space;</div><div class='add'>+		if (space &gt; 0) {</div><div class='add'>+			vx_pseudo_dma_read(chip, runtime, pipe, space);</div><div class='add'>+			count -= space;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* read the rest of bytes */</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='hunk'>@@ -1082,7 +1033,7 @@ static void vx_pcm_capture_update(struct vx_core *chip, struct snd_pcm_substream</div><div class='ctx'> 		count -= 3;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* disconnect the host, SIZE_HBUF command always switches to the stream mode */</div><div class='del'>-	vx_send_rih_nolock(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='add'>+	vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='ctx'> 	/* read the last pending 6 bytes */</div><div class='ctx'> 	count = DMA_READ_ALIGN;</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='hunk'>@@ -1099,7 +1050,7 @@ static void vx_pcm_capture_update(struct vx_core *chip, struct snd_pcm_substream</div><div class='ctx'> </div><div class='ctx'>  _error:</div><div class='ctx'> 	/* disconnect the host, SIZE_HBUF command always switches to the stream mode */</div><div class='del'>-	vx_send_rih_nolock(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='add'>+	vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1116,17 +1067,12 @@ static snd_pcm_uframes_t vx_pcm_capture_pointer(struct snd_pcm_substream *subs)</div><div class='ctx'> /*</div><div class='ctx'>  * operators for PCM capture</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_ops vx_pcm_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops vx_pcm_capture_ops = {</div><div class='ctx'> 	.open =		vx_pcm_capture_open,</div><div class='ctx'> 	.close =	vx_pcm_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	vx_pcm_hw_params,</div><div class='del'>-	.hw_free =	vx_pcm_hw_free,</div><div class='ctx'> 	.prepare =	vx_pcm_prepare,</div><div class='ctx'> 	.trigger =	vx_pcm_trigger,</div><div class='ctx'> 	.pointer =	vx_pcm_capture_pointer,</div><div class='del'>-	.page =		snd_pcm_lib_get_vmalloc_page,</div><div class='del'>-	.mmap =		snd_pcm_lib_mmap_vmalloc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1148,7 +1094,7 @@ void vx_pcm_update_intr(struct vx_core *chip, unsigned int events)</div><div class='ctx'> 			chip-&gt;irq_rmh.Cmd[0] |= 0x00000002;	/* SEL_END_OF_BUF_EVENTS */</div><div class='ctx'> </div><div class='ctx'> 		if (vx_send_msg(chip, &amp;chip-&gt;irq_rmh) &lt; 0) {</div><div class='del'>-			snd_printdd(KERN_ERR "msg send error!!\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "msg send error!!\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1189,7 +1135,7 @@ void vx_pcm_update_intr(struct vx_core *chip, unsigned int events)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * vx_init_audio_io - check the availabe audio i/o and allocate pipe arrays</div><div class='add'>+ * vx_init_audio_io - check the available audio i/o and allocate pipe arrays</div><div class='ctx'>  */</div><div class='ctx'> static int vx_init_audio_io(struct vx_core *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -1198,7 +1144,8 @@ static int vx_init_audio_io(struct vx_core *chip)</div><div class='ctx'> </div><div class='ctx'> 	vx_init_rmh(&amp;rmh, CMD_SUPPORTED);</div><div class='ctx'> 	if (vx_send_msg(chip, &amp;rmh) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "vx: cannot get the supported audio data\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"vx: cannot get the supported audio data\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1220,8 +1167,7 @@ static int vx_init_audio_io(struct vx_core *chip)</div><div class='ctx'> 	chip-&gt;ibl.size = 0;</div><div class='ctx'> 	vx_set_ibl(chip, &amp;chip-&gt;ibl); /* query the info */</div><div class='ctx'> 	if (preferred &gt; 0) {</div><div class='del'>-		chip-&gt;ibl.size = ((preferred + chip-&gt;ibl.granularity - 1) /</div><div class='del'>-				  chip-&gt;ibl.granularity) * chip-&gt;ibl.granularity;</div><div class='add'>+		chip-&gt;ibl.size = roundup(preferred, chip-&gt;ibl.granularity);</div><div class='ctx'> 		if (chip-&gt;ibl.size &gt; chip-&gt;ibl.max_size)</div><div class='ctx'> 			chip-&gt;ibl.size = chip-&gt;ibl.max_size;</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -1254,7 +1200,8 @@ int snd_vx_pcm_new(struct vx_core *chip)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = vx_init_audio_io(chip)) &lt; 0)</div><div class='add'>+	err = vx_init_audio_io(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;hw-&gt;num_codecs; i++) {</div><div class='hunk'>@@ -1271,11 +1218,14 @@ int snd_vx_pcm_new(struct vx_core *chip)</div><div class='ctx'> 			snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;vx_pcm_playback_ops);</div><div class='ctx'> 		if (ins)</div><div class='ctx'> 			snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;vx_pcm_capture_ops);</div><div class='add'>+		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,</div><div class='add'>+					       NULL, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 		pcm-&gt;private_data = chip;</div><div class='ctx'> 		pcm-&gt;private_free = snd_vx_pcm_free;</div><div class='ctx'> 		pcm-&gt;info_flags = 0;</div><div class='del'>-		strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+		pcm-&gt;nonatomic = true;</div><div class='add'>+		strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 		chip-&gt;pcm[i] = pcm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c<br/>index b0560fec6bba..1d90db3b0abd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_uer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/drivers/vx/vx_uer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/drivers/vx/vx_uer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/drivers/vx/vx_uer.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Digigram VX soundcards</div><div class='ctx'>  *</div><div class='ctx'>  * IEC958 stuff</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -60,9 +47,9 @@ static int vx_modify_board_inputs(struct vx_core *chip)</div><div class='ctx'>  */</div><div class='ctx'> static int vx_read_one_cbit(struct vx_core *chip, int index)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int val;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (chip-&gt;type &gt;= VX_TYPE_VXPOCKET) {</div><div class='ctx'> 		vx_outb(chip, CSUER, 1); /* read */</div><div class='ctx'> 		vx_outb(chip, RUER, index &amp; XX_UER_CBITS_OFFSET_MASK);</div><div class='hunk'>@@ -72,7 +59,6 @@ static int vx_read_one_cbit(struct vx_core *chip, int index)</div><div class='ctx'> 		vx_outl(chip, RUER, index &amp; XX_UER_CBITS_OFFSET_MASK);</div><div class='ctx'> 		val = (vx_inl(chip, RUER) &gt;&gt; 7) &amp; 0x01;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -83,9 +69,8 @@ static int vx_read_one_cbit(struct vx_core *chip, int index)</div><div class='ctx'>  */</div><div class='ctx'> static void vx_write_one_cbit(struct vx_core *chip, int index, int val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	val = !!val;	/* 0 or 1 */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (vx_is_pcmcia(chip)) {</div><div class='ctx'> 		vx_outb(chip, CSUER, 0); /* write */</div><div class='ctx'> 		vx_outb(chip, RUER, (val &lt;&lt; 7) | (index &amp; XX_UER_CBITS_OFFSET_MASK));</div><div class='hunk'>@@ -93,7 +78,6 @@ static void vx_write_one_cbit(struct vx_core *chip, int index, int val)</div><div class='ctx'> 		vx_outl(chip, CSUER, 0); /* write */</div><div class='ctx'> 		vx_outl(chip, RUER, (val &lt;&lt; 7) | (index &amp; XX_UER_CBITS_OFFSET_MASK));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -190,14 +174,12 @@ static int vx_calc_clock_from_freq(struct vx_core *chip, int freq)</div><div class='ctx'>  */</div><div class='ctx'> static void vx_change_clock_source(struct vx_core *chip, int source)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	/* we mute DAC to prevent clicks */</div><div class='ctx'> 	vx_toggle_dac_mute(chip, 1);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	chip-&gt;ops-&gt;set_clock_source(chip, source);</div><div class='del'>-	chip-&gt;clock_source = source;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;lock) {</div><div class='add'>+		chip-&gt;ops-&gt;set_clock_source(chip, source);</div><div class='add'>+		chip-&gt;clock_source = source;</div><div class='add'>+	}</div><div class='ctx'> 	/* unmute */</div><div class='ctx'> 	vx_toggle_dac_mute(chip, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -209,11 +191,12 @@ static void vx_change_clock_source(struct vx_core *chip, int source)</div><div class='ctx'> void vx_set_internal_clock(struct vx_core *chip, unsigned int freq)</div><div class='ctx'> {</div><div class='ctx'> 	int clock;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+</div><div class='ctx'> 	/* Get real clock value */</div><div class='ctx'> 	clock = vx_calc_clock_from_freq(chip, freq);</div><div class='del'>-	snd_printdd(KERN_DEBUG "set internal clock to 0x%x from freq %d\n", clock, freq);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set internal clock to 0x%x from freq %d\n", clock, freq);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (vx_is_pcmcia(chip)) {</div><div class='ctx'> 		vx_outb(chip, HIFREQ, (clock &gt;&gt; 8) &amp; 0x0f);</div><div class='ctx'> 		vx_outb(chip, LOFREQ, clock &amp; 0xff);</div><div class='hunk'>@@ -221,7 +204,6 @@ void vx_set_internal_clock(struct vx_core *chip, unsigned int freq)</div><div class='ctx'> 		vx_outl(chip, HIFREQ, (clock &gt;&gt; 8) &amp; 0x0f);</div><div class='ctx'> 		vx_outl(chip, LOFREQ, clock &amp; 0xff);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig<br/>new file mode 100644<br/>index 000000000000..5973c25c2add<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,202 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+menuconfig SND_FIREWIRE</div><div class='add'>+	bool "FireWire sound devices"</div><div class='add'>+	depends on FIREWIRE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Support for IEEE-1394/FireWire/iLink sound devices.</div><div class='add'>+</div><div class='add'>+if SND_FIREWIRE &amp;&amp; FIREWIRE</div><div class='add'>+</div><div class='add'>+config SND_FIREWIRE_LIB</div><div class='add'>+	tristate</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_RAWMIDI</div><div class='add'>+</div><div class='add'>+config SND_DICE</div><div class='add'>+	tristate "DICE-based DACs support"</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for devices based on the DICE chip family</div><div class='add'>+	  (DICE-II/TCD2210(Mini)/TCD2220(Jr.)) which TC Applied Technologies (TCAT) produced.</div><div class='add'>+	   * Allen and Heath Zed R16</div><div class='add'>+	   * Alesis iO 14/26 FireWire, MasterControl, MultiMix 8/12/16 FireWire</div><div class='add'>+	   * Avid Mbox 3 Pro</div><div class='add'>+	   * FlexRadio Systems FLEX-3000, FLEX-5000</div><div class='add'>+	   * Focusrite Liquid Saffire 56</div><div class='add'>+	   * Focusrite Saffire Pro 14, Pro 24, Pro 24 DSP, Pro 26, Pro 40(TCD2220)</div><div class='add'>+	   * Harman Music Group Lexicon I-ONIX FW810S</div><div class='add'>+	   * Loud Technologies Mackie Onyx Blackbird, Onyx 820i/1220i/1620i/1640i (latter models)</div><div class='add'>+	   * M-Audio ProFire 610/2626</div><div class='add'>+	   * Mytek Stereo192-DSD DAC</div><div class='add'>+	   * Midas Klark Teknik VeniceF series</div><div class='add'>+	   * PreSonus FireStudio, FireStudio Mobile, FireStudio Project, FireStudio Tube</div><div class='add'>+	   * PreSonus StudioLive 16.4.2, 16.0.2, 24.4.2, 32.4.2</div><div class='add'>+	   * Solid State Logic Duende Classic, Duende Mini</div><div class='add'>+	   * TC Electronic Studio Konnekt 48, Konnekt 24D, Konnekt Live, Impact Twin</div><div class='add'>+	   * TC Electronic Digital Konnekt x32, Desktop Konnekt 6</div><div class='add'>+	   * Weiss Engineering ADC2, Vesta, Minerva, AFI1, DAC1, INT202, DAC202</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-dice.</div><div class='add'>+</div><div class='add'>+config SND_OXFW</div><div class='add'>+	tristate "Oxford Semiconductor FW970/971 chipset support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for FireWire devices based on</div><div class='add'>+	  Oxford Semiconductor FW970/971 chipset.</div><div class='add'>+	   * Griffin Firewave</div><div class='add'>+	   * LaCie Firewire Speakers</div><div class='add'>+	   * Behringer F-Control Audio 202</div><div class='add'>+	   * Mackie(Loud) Onyx-i series (former models)</div><div class='add'>+	   * Mackie(Loud) Onyx 1640i (former model)</div><div class='add'>+	   * Mackie(Loud) Onyx Satellite</div><div class='add'>+	   * Mackie(Loud) Tapco Link.Firewire</div><div class='add'>+	   * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC)</div><div class='add'>+	   * Mackie(Loud) U.420/U.420d</div><div class='add'>+	   * TASCAM FireOne</div><div class='add'>+	   * Stanton Controllers &amp; Systems 1 Deck/Mixer</div><div class='add'>+	   * APOGEE duet FireWire</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-oxfw.</div><div class='add'>+</div><div class='add'>+config SND_ISIGHT</div><div class='add'>+	tristate "Apple iSight microphone"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for the front and rear microphones</div><div class='add'>+	  of the Apple iSight web camera.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-isight.</div><div class='add'>+</div><div class='add'>+config SND_FIREWORKS</div><div class='add'>+	tristate "Echo Fireworks board module support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for FireWire devices based</div><div class='add'>+	  on Echo Digital Audio Fireworks board:</div><div class='add'>+	   * Mackie Onyx 400F/1200F</div><div class='add'>+	   * Echo AudioFire12/8(until 2009 July)</div><div class='add'>+	   * Echo AudioFire2/4/Pre8/8(since 2009 July)</div><div class='add'>+	   * Echo Fireworks 8/HDMI</div><div class='add'>+	   * Gibson Robot Interface Pack/GoldTop</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-fireworks.</div><div class='add'>+</div><div class='add'>+config SND_BEBOB</div><div class='add'>+	tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to include support for FireWire devices based</div><div class='add'>+	 on BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware:</div><div class='add'>+	  * Edirol FA-66/FA-101</div><div class='add'>+	  * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394</div><div class='add'>+	  * BridgeCo RDAudio1/Audio5</div><div class='add'>+	  * Mackie Onyx 1220/1620/1640 (FireWire I/O Card)</div><div class='add'>+	  * Mackie d.2 (optional FireWire card with DM1000 ASIC)</div><div class='add'>+	  * Stanton FinalScratch 2 (ScratchAmp)</div><div class='add'>+	  * Tascam IF-FW/DM</div><div class='add'>+	  * Behringer XENIX UFX 1204/1604</div><div class='add'>+	  * Behringer Digital Mixer X32 series (X-UF Card)</div><div class='add'>+	  * Behringer FCA610/1616</div><div class='add'>+	  * Apogee Rosetta 200/400 (X-FireWire card)</div><div class='add'>+	  * Apogee DA/AD/DD-16X (X-FireWire card)</div><div class='add'>+	  * Apogee Ensemble</div><div class='add'>+	  * ESI QuataFire 610</div><div class='add'>+	  * AcousticReality eARMasterOne</div><div class='add'>+	  * CME MatrixKFW</div><div class='add'>+	  * Phonic Helix Board 12 MkII/18 MkII/24 MkII</div><div class='add'>+	  * Phonic Helix Board 12 Universal/18 Universal/24 Universal</div><div class='add'>+	  * Lynx Aurora 8/16 (LT-FW)</div><div class='add'>+	  * ICON FireXon</div><div class='add'>+	  * PrismSound Orpheus/ADA-8XR</div><div class='add'>+	  * TerraTec PHASE 24 FW/PHASE X24 FW/PHASE 88 Rack FW</div><div class='add'>+	  * TerraTec EWS MIC2/EWS MIC8</div><div class='add'>+	  * TerraTec Aureon 7.1 FireWire</div><div class='add'>+	  * Yamaha GO44/GO46</div><div class='add'>+	  * Focusrite Saffire/Saffire LE/SaffirePro10 IO/SaffirePro26 IO</div><div class='add'>+	  * M-Audio FireWire410/AudioPhile/Solo</div><div class='add'>+	  * M-Audio Ozonic/NRV10/ProfireLightBridge</div><div class='add'>+	  * M-Audio FireWire 1814/ProjectMix IO</div><div class='add'>+	  * Digidesign Mbox 2 Pro</div><div class='add'>+	  * ToneWeal FW66</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-bebob.</div><div class='add'>+</div><div class='add'>+config SND_FIREWIRE_DIGI00X</div><div class='add'>+	tristate "Digidesign Digi 002/003 family support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to include support for Digidesign Digi 002/003 family.</div><div class='add'>+	  * Digi 002 Console</div><div class='add'>+	  * Digi 002 Rack</div><div class='add'>+	  * Digi 003 Console</div><div class='add'>+	  * Digi 003 Rack</div><div class='add'>+	  * Digi 003 Rack+</div><div class='add'>+</div><div class='add'>+	 To compile this driver as a module, choose M here: the module</div><div class='add'>+	 will be called snd-firewire-digi00x.</div><div class='add'>+</div><div class='add'>+config SND_FIREWIRE_TASCAM</div><div class='add'>+	tristate "TASCAM FireWire series support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to include support for TASCAM.</div><div class='add'>+	  * FW-1884</div><div class='add'>+	  * FW-1082</div><div class='add'>+	  * FW-1804</div><div class='add'>+</div><div class='add'>+	 To compile this driver as a module, choose M here: the module</div><div class='add'>+	 will be called snd-firewire-tascam.</div><div class='add'>+</div><div class='add'>+config SND_FIREWIRE_MOTU</div><div class='add'>+	tristate "Mark of the unicorn FireWire series support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to enable support for FireWire devices which MOTU produced:</div><div class='add'>+	  * 828</div><div class='add'>+	  * 896</div><div class='add'>+	  * 828mk2</div><div class='add'>+	  * 896hd</div><div class='add'>+	  * Traveler</div><div class='add'>+	  * Ultralite</div><div class='add'>+	  * 8pre</div><div class='add'>+	  * 828mk3 (FireWire only)</div><div class='add'>+	  * 828mk3 (Hybrid)</div><div class='add'>+	  * 896mk3 (FireWire only)</div><div class='add'>+	  * 896mk3 (Hybrid)</div><div class='add'>+	  * Ultralite mk3 (FireWire only)</div><div class='add'>+	  * Ultralite mk3 (Hybrid)</div><div class='add'>+	  * Traveler mk3</div><div class='add'>+	  * Audio Express</div><div class='add'>+	  * Track 16</div><div class='add'>+	  * 4pre</div><div class='add'>+</div><div class='add'>+	 To compile this driver as a module, choose M here: the module</div><div class='add'>+	 will be called snd-firewire-motu.</div><div class='add'>+</div><div class='add'>+config SND_FIREFACE</div><div class='add'>+	tristate "RME Fireface series support"</div><div class='add'>+	select SND_FIREWIRE_LIB</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	 Say Y here to include support for RME fireface series.</div><div class='add'>+	  * Fireface 400</div><div class='add'>+	  * Fireface 800</div><div class='add'>+	  * Fireface UFX</div><div class='add'>+	  * Fireface UCX</div><div class='add'>+	  * Fireface 802</div><div class='add'>+</div><div class='add'>+endif # SND_FIREWIRE</div><div class='head'>diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile<br/>new file mode 100644<br/>index 000000000000..45018a5c224f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# To find a header included by define_trace.h.</div><div class='add'>+CFLAGS_amdtp-stream.o	:= -I$(src)</div><div class='add'>+</div><div class='add'>+snd-firewire-lib-y := lib.o iso-resources.o packets-buffer.o \</div><div class='add'>+			 fcp.o cmp.o amdtp-stream.o amdtp-am824.o</div><div class='add'>+snd-isight-y := isight.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o</div><div class='add'>+obj-$(CONFIG_SND_DICE) += dice/</div><div class='add'>+obj-$(CONFIG_SND_OXFW) += oxfw/</div><div class='add'>+obj-$(CONFIG_SND_ISIGHT) += snd-isight.o</div><div class='add'>+obj-$(CONFIG_SND_FIREWORKS) += fireworks/</div><div class='add'>+obj-$(CONFIG_SND_BEBOB) += bebob/</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_DIGI00X) += digi00x/</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_TASCAM) += tascam/</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_MOTU) += motu/</div><div class='add'>+obj-$(CONFIG_SND_FIREFACE) += fireface/</div><div class='head'>diff --git a/sound/firewire/amdtp-am824.c b/sound/firewire/amdtp-am824.c<br/>new file mode 100644<br/>index 000000000000..3660c312bf33<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/amdtp-am824.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/amdtp-am824.c</a></div><div class='hunk'>@@ -0,0 +1,420 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * AM824 format in Audio and Music Data Transmission Protocol (IEC 61883-6)</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#include "amdtp-am824.h"</div><div class='add'>+</div><div class='add'>+#define CIP_FMT_AM		0x10</div><div class='add'>+</div><div class='add'>+/* "Clock-based rate control mode" is just supported. */</div><div class='add'>+#define AMDTP_FDF_AM824		0x00</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Nominally 3125 bytes/second, but the MIDI port's clock might be</div><div class='add'>+ * 1% too slow, and the bus clock 100 ppm too fast.</div><div class='add'>+ */</div><div class='add'>+#define MIDI_BYTES_PER_SECOND	3093</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Several devices look only at the first eight data blocks.</div><div class='add'>+ * In any case, this is more than enough for the MIDI data rate.</div><div class='add'>+ */</div><div class='add'>+#define MAX_MIDI_RX_BLOCKS	8</div><div class='add'>+</div><div class='add'>+struct amdtp_am824 {</div><div class='add'>+	struct snd_rawmidi_substream *midi[AM824_MAX_CHANNELS_FOR_MIDI * 8];</div><div class='add'>+	int midi_fifo_limit;</div><div class='add'>+	int midi_fifo_used[AM824_MAX_CHANNELS_FOR_MIDI * 8];</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+	unsigned int midi_ports;</div><div class='add'>+</div><div class='add'>+	u8 pcm_positions[AM824_MAX_CHANNELS_FOR_PCM];</div><div class='add'>+	u8 midi_position;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_set_parameters - set stream parameters</div><div class='add'>+ * @s: the AMDTP stream to configure</div><div class='add'>+ * @rate: the sample rate</div><div class='add'>+ * @pcm_channels: the number of PCM samples in each data block, to be encoded</div><div class='add'>+ *                as AM824 multi-bit linear audio</div><div class='add'>+ * @midi_ports: the number of MIDI ports (i.e., MPX-MIDI Data Channels)</div><div class='add'>+ * @double_pcm_frames: one data block transfers two PCM frames</div><div class='add'>+ *</div><div class='add'>+ * The parameters must be set before the stream is started, and must not be</div><div class='add'>+ * changed while the stream is running.</div><div class='add'>+ */</div><div class='add'>+int amdtp_am824_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			       unsigned int pcm_channels,</div><div class='add'>+			       unsigned int midi_ports,</div><div class='add'>+			       bool double_pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int midi_channels;</div><div class='add'>+	unsigned int pcm_frame_multiplier;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(s))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (pcm_channels &gt; AM824_MAX_CHANNELS_FOR_PCM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	midi_channels = DIV_ROUND_UP(midi_ports, 8);</div><div class='add'>+	if (midi_channels &gt; AM824_MAX_CHANNELS_FOR_MIDI)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(amdtp_stream_running(s)) ||</div><div class='add'>+	    WARN_ON(pcm_channels &gt; AM824_MAX_CHANNELS_FOR_PCM) ||</div><div class='add'>+	    WARN_ON(midi_channels &gt; AM824_MAX_CHANNELS_FOR_MIDI))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In IEC 61883-6, one data block represents one event. In ALSA, one</div><div class='add'>+	 * event equals to one PCM frame. But Dice has a quirk at higher</div><div class='add'>+	 * sampling rate to transfer two PCM frames in one data block.</div><div class='add'>+	 */</div><div class='add'>+	if (double_pcm_frames)</div><div class='add'>+		pcm_frame_multiplier = 2;</div><div class='add'>+	else</div><div class='add'>+		pcm_frame_multiplier = 1;</div><div class='add'>+</div><div class='add'>+	err = amdtp_stream_set_parameters(s, rate, pcm_channels + midi_channels,</div><div class='add'>+					  pcm_frame_multiplier);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_OUT_STREAM)</div><div class='add'>+		s-&gt;ctx_data.rx.fdf = AMDTP_FDF_AM824 | s-&gt;sfc;</div><div class='add'>+</div><div class='add'>+	p-&gt;pcm_channels = pcm_channels;</div><div class='add'>+	p-&gt;midi_ports = midi_ports;</div><div class='add'>+</div><div class='add'>+	/* init the position map for PCM and MIDI channels */</div><div class='add'>+	for (i = 0; i &lt; pcm_channels; i++)</div><div class='add'>+		p-&gt;pcm_positions[i] = i;</div><div class='add'>+	p-&gt;midi_position = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not know the actual MIDI FIFO size of most devices.  Just</div><div class='add'>+	 * assume two bytes, i.e., one byte can be received over the bus while</div><div class='add'>+	 * the previous one is transmitted over MIDI.</div><div class='add'>+	 * (The value here is adjusted for midi_ratelimit_per_packet().)</div><div class='add'>+	 */</div><div class='add'>+	p-&gt;midi_fifo_limit = rate - MIDI_BYTES_PER_SECOND * s-&gt;syt_interval + 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_set_parameters);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_set_pcm_position - set an index of data channel for a channel</div><div class='add'>+ *				  of PCM frame</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ * @index: the index of data channel in an data block</div><div class='add'>+ * @position: the channel of PCM frame</div><div class='add'>+ */</div><div class='add'>+void amdtp_am824_set_pcm_position(struct amdtp_stream *s, unsigned int index,</div><div class='add'>+				 unsigned int position)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (index &lt; p-&gt;pcm_channels)</div><div class='add'>+		p-&gt;pcm_positions[index] = position;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_set_pcm_position);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_set_midi_position - set a index of data channel for MIDI</div><div class='add'>+ *				   conformant data channel</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ * @position: the index of data channel in an data block</div><div class='add'>+ */</div><div class='add'>+void amdtp_am824_set_midi_position(struct amdtp_stream *s,</div><div class='add'>+				   unsigned int position)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	p-&gt;midi_position = position;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_set_midi_position);</div><div class='add'>+</div><div class='add'>+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			  __be32 *buffer, unsigned int frames,</div><div class='add'>+			  unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	const u32 *src;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	src = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			buffer[p-&gt;pcm_positions[c]] =</div><div class='add'>+					cpu_to_be32((*src &gt;&gt; 8) | 0x40000000);</div><div class='add'>+			src++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			src = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			 __be32 *buffer, unsigned int frames,</div><div class='add'>+			 unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u32 *dst;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	dst  = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			*dst = be32_to_cpu(buffer[p-&gt;pcm_positions[c]]) &lt;&lt; 8;</div><div class='add'>+			dst++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			dst = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_silence(struct amdtp_stream *s,</div><div class='add'>+			      __be32 *buffer, unsigned int frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int i, c, channels = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c)</div><div class='add'>+			buffer[p-&gt;pcm_positions[c]] = cpu_to_be32(0x40000000);</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_add_pcm_hw_constraints - add hw constraints for PCM substream</div><div class='add'>+ * @s:		the AMDTP stream for AM824 data block, must be initialized.</div><div class='add'>+ * @runtime:	the PCM substream runtime</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int amdtp_am824_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				       struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_stream_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* AM824 in IEC 61883-6 can deliver 24bit data. */</div><div class='add'>+	return snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_add_pcm_hw_constraints);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_midi_trigger - start/stop playback/capture with a MIDI device</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ * @port: index of MIDI port</div><div class='add'>+ * @midi: the MIDI device to be started, or %NULL to stop the current device</div><div class='add'>+ *</div><div class='add'>+ * Call this function on a running isochronous stream to enable the actual</div><div class='add'>+ * transmission of MIDI data.  This function should be called from the MIDI</div><div class='add'>+ * device's .trigger callback.</div><div class='add'>+ */</div><div class='add'>+void amdtp_am824_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			      struct snd_rawmidi_substream *midi)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (port &lt; p-&gt;midi_ports)</div><div class='add'>+		WRITE_ONCE(p-&gt;midi[port], midi);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_midi_trigger);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * To avoid sending MIDI bytes at too high a rate, assume that the receiving</div><div class='add'>+ * device has a FIFO, and track how much it is filled.  This values increases</div><div class='add'>+ * by one whenever we send one byte in a packet, but the FIFO empties at</div><div class='add'>+ * a constant rate independent of our packet rate.  One packet has syt_interval</div><div class='add'>+ * samples, so the number of bytes that empty out of the FIFO, per packet(!),</div><div class='add'>+ * is MIDI_BYTES_PER_SECOND * syt_interval / sample_rate.  To avoid storing</div><div class='add'>+ * fractional values, the values in midi_fifo_used[] are measured in bytes</div><div class='add'>+ * multiplied by the sample rate.</div><div class='add'>+ */</div><div class='add'>+static bool midi_ratelimit_per_packet(struct amdtp_stream *s, unsigned int port)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	int used;</div><div class='add'>+</div><div class='add'>+	used = p-&gt;midi_fifo_used[port];</div><div class='add'>+	if (used == 0) /* common shortcut */</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	used -= MIDI_BYTES_PER_SECOND * s-&gt;syt_interval;</div><div class='add'>+	used = max(used, 0);</div><div class='add'>+	p-&gt;midi_fifo_used[port] = used;</div><div class='add'>+</div><div class='add'>+	return used &lt; p-&gt;midi_fifo_limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_rate_use_one_byte(struct amdtp_stream *s, unsigned int port)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	p-&gt;midi_fifo_used[port] += amdtp_rate_table[s-&gt;sfc];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			unsigned int frames, unsigned int data_block_counter)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int f, port;</div><div class='add'>+	u8 *b;</div><div class='add'>+</div><div class='add'>+	for (f = 0; f &lt; frames; f++) {</div><div class='add'>+		b = (u8 *)&amp;buffer[p-&gt;midi_position];</div><div class='add'>+</div><div class='add'>+		port = (data_block_counter + f) % 8;</div><div class='add'>+		if (f &lt; MAX_MIDI_RX_BLOCKS &amp;&amp;</div><div class='add'>+		    midi_ratelimit_per_packet(s, port) &amp;&amp;</div><div class='add'>+		    p-&gt;midi[port] != NULL &amp;&amp;</div><div class='add'>+		    snd_rawmidi_transmit(p-&gt;midi[port], &amp;b[1], 1) == 1) {</div><div class='add'>+			midi_rate_use_one_byte(s, port);</div><div class='add'>+			b[0] = 0x81;</div><div class='add'>+		} else {</div><div class='add'>+			b[0] = 0x80;</div><div class='add'>+			b[1] = 0;</div><div class='add'>+		}</div><div class='add'>+		b[2] = 0;</div><div class='add'>+		b[3] = 0;</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			unsigned int frames, unsigned int data_block_counter)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	int len;</div><div class='add'>+	u8 *b;</div><div class='add'>+	int f;</div><div class='add'>+</div><div class='add'>+	for (f = 0; f &lt; frames; f++) {</div><div class='add'>+		unsigned int port = f;</div><div class='add'>+</div><div class='add'>+		if (!(s-&gt;flags &amp; CIP_UNALIGHED_DBC))</div><div class='add'>+			port += data_block_counter;</div><div class='add'>+		port %= 8;</div><div class='add'>+		b = (u8 *)&amp;buffer[p-&gt;midi_position];</div><div class='add'>+</div><div class='add'>+		len = b[0] - 0x80;</div><div class='add'>+		if ((1 &lt;= len) &amp;&amp;  (len &lt;= 3) &amp;&amp; (p-&gt;midi[port]))</div><div class='add'>+			snd_rawmidi_receive(p-&gt;midi[port], b + 1, len);</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks * s-&gt;pcm_frame_multiplier;</div><div class='add'>+		} else {</div><div class='add'>+			write_pcm_silence(s, buf, data_blocks);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (p-&gt;midi_ports) {</div><div class='add'>+			write_midi_messages(s, buf, data_blocks,</div><div class='add'>+					    desc-&gt;data_block_counter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_am824 *p = s-&gt;protocol;</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks * s-&gt;pcm_frame_multiplier;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (p-&gt;midi_ports) {</div><div class='add'>+			read_midi_messages(s, buf, data_blocks,</div><div class='add'>+					   desc-&gt;data_block_counter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_am824_init - initialize an AMDTP stream structure to handle AM824</div><div class='add'>+ *		      data block</div><div class='add'>+ * @s: the AMDTP stream to initialize</div><div class='add'>+ * @unit: the target of the stream</div><div class='add'>+ * @dir: the direction of stream</div><div class='add'>+ * @flags: the details of the streaming protocol consist of cip_flags enumeration-constants.</div><div class='add'>+ */</div><div class='add'>+int amdtp_am824_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		     enum amdtp_stream_direction dir, unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM)</div><div class='add'>+		process_ctx_payloads = process_ir_ctx_payloads;</div><div class='add'>+	else</div><div class='add'>+		process_ctx_payloads = process_it_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_init(s, unit, dir, flags, CIP_FMT_AM,</div><div class='add'>+			process_ctx_payloads, sizeof(struct amdtp_am824));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_am824_init);</div><div class='head'>diff --git a/sound/firewire/amdtp-am824.h b/sound/firewire/amdtp-am824.h<br/>new file mode 100644<br/>index 000000000000..2b092b1061ba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/amdtp-am824.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/amdtp-am824.h</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_AMDTP_AM824_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_AMDTP_AM824_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "amdtp-stream.h"</div><div class='add'>+</div><div class='add'>+#define AM824_IN_PCM_FORMAT_BITS	SNDRV_PCM_FMTBIT_S32</div><div class='add'>+</div><div class='add'>+#define AM824_OUT_PCM_FORMAT_BITS	SNDRV_PCM_FMTBIT_S32</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This module supports maximum 64 PCM channels for one PCM stream</div><div class='add'>+ * This is for our convenience.</div><div class='add'>+ */</div><div class='add'>+#define AM824_MAX_CHANNELS_FOR_PCM	64</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AMDTP packet can include channels for MIDI conformant data.</div><div class='add'>+ * Each MIDI conformant data channel includes 8 MPX-MIDI data stream.</div><div class='add'>+ * Each MPX-MIDI data stream includes one data stream from/to MIDI ports.</div><div class='add'>+ *</div><div class='add'>+ * This module supports maximum 1 MIDI conformant data channels.</div><div class='add'>+ * Then this AMDTP packets can transfer maximum 8 MIDI data streams.</div><div class='add'>+ */</div><div class='add'>+#define AM824_MAX_CHANNELS_FOR_MIDI	1</div><div class='add'>+</div><div class='add'>+int amdtp_am824_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			       unsigned int pcm_channels,</div><div class='add'>+			       unsigned int midi_ports,</div><div class='add'>+			       bool double_pcm_frames);</div><div class='add'>+</div><div class='add'>+void amdtp_am824_set_pcm_position(struct amdtp_stream *s, unsigned int index,</div><div class='add'>+				 unsigned int position);</div><div class='add'>+</div><div class='add'>+void amdtp_am824_set_midi_position(struct amdtp_stream *s,</div><div class='add'>+				   unsigned int position);</div><div class='add'>+</div><div class='add'>+int amdtp_am824_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				       struct snd_pcm_runtime *runtime);</div><div class='add'>+</div><div class='add'>+void amdtp_am824_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			      struct snd_rawmidi_substream *midi);</div><div class='add'>+</div><div class='add'>+int amdtp_am824_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		     enum amdtp_stream_direction dir, unsigned int flags);</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h<br/>new file mode 100644<br/>index 000000000000..208f97cf8de6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/amdtp-stream-trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/amdtp-stream-trace.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * amdtp-stream-trace.h - tracepoint definitions to dump a part of packet data</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2016 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM		snd_firewire_lib</div><div class='add'>+</div><div class='add'>+#if !defined(_AMDTP_STREAM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _AMDTP_STREAM_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(amdtp_packet,</div><div class='add'>+	TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int data_block_counter, unsigned int packet_index, unsigned int index, u32 curr_cycle_time),</div><div class='add'>+	TP_ARGS(s, cycles, cip_header, payload_length, data_blocks, data_block_counter, packet_index, index, curr_cycle_time),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned int, cycle_time)</div><div class='add'>+		__field(unsigned int, second)</div><div class='add'>+		__field(unsigned int, cycle)</div><div class='add'>+		__field(int, channel)</div><div class='add'>+		__field(int, src)</div><div class='add'>+		__field(int, dest)</div><div class='add'>+		__dynamic_array(u8, cip_header, cip_header ? 8 : 0)</div><div class='add'>+		__field(unsigned int, payload_quadlets)</div><div class='add'>+		__field(unsigned int, data_blocks)</div><div class='add'>+		__field(unsigned int, data_block_counter)</div><div class='add'>+		__field(unsigned int, packet_index)</div><div class='add'>+		__field(unsigned int, irq)</div><div class='add'>+		__field(unsigned int, index)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;cycle_time = curr_cycle_time;</div><div class='add'>+		__entry-&gt;second = cycles / CYCLES_PER_SECOND;</div><div class='add'>+		__entry-&gt;cycle = cycles % CYCLES_PER_SECOND;</div><div class='add'>+		__entry-&gt;channel = s-&gt;context-&gt;channel;</div><div class='add'>+		if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+			__entry-&gt;dest = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+		} else {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+			__entry-&gt;dest = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+		}</div><div class='add'>+		if (cip_header) {</div><div class='add'>+			memcpy(__get_dynamic_array(cip_header), cip_header,</div><div class='add'>+			       __get_dynamic_array_len(cip_header));</div><div class='add'>+		}</div><div class='add'>+		__entry-&gt;payload_quadlets = payload_length / sizeof(__be32);</div><div class='add'>+		__entry-&gt;data_blocks = data_blocks;</div><div class='add'>+		__entry-&gt;data_block_counter = data_block_counter,</div><div class='add'>+		__entry-&gt;packet_index = packet_index;</div><div class='add'>+		__entry-&gt;irq = !!in_softirq();</div><div class='add'>+		__entry-&gt;index = index;</div><div class='add'>+	),</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%08x %02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u %s",</div><div class='add'>+		__entry-&gt;cycle_time,</div><div class='add'>+		__entry-&gt;second,</div><div class='add'>+		__entry-&gt;cycle,</div><div class='add'>+		__entry-&gt;src,</div><div class='add'>+		__entry-&gt;dest,</div><div class='add'>+		__entry-&gt;channel,</div><div class='add'>+		__entry-&gt;payload_quadlets,</div><div class='add'>+		__entry-&gt;data_blocks,</div><div class='add'>+		__entry-&gt;data_block_counter,</div><div class='add'>+		__entry-&gt;packet_index,</div><div class='add'>+		__entry-&gt;irq,</div><div class='add'>+		__entry-&gt;index,</div><div class='add'>+		__print_array(__get_dynamic_array(cip_header),</div><div class='add'>+			      __get_dynamic_array_len(cip_header), 1))</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH	.</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE	amdtp-stream-trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c<br/>new file mode 100644<br/>index 000000000000..5cdc34877fc1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/amdtp-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/amdtp-stream.c</a></div><div class='hunk'>@@ -0,0 +1,2160 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Audio and Music Data Transmission Protocol (IEC 61883-6) streams</div><div class='add'>+ * with Common Isochronous Packet (IEC 61883-1) headers</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include "amdtp-stream.h"</div><div class='add'>+</div><div class='add'>+#define TICKS_PER_CYCLE		3072</div><div class='add'>+#define CYCLES_PER_SECOND	8000</div><div class='add'>+#define TICKS_PER_SECOND	(TICKS_PER_CYCLE * CYCLES_PER_SECOND)</div><div class='add'>+</div><div class='add'>+#define OHCI_SECOND_MODULUS		8</div><div class='add'>+</div><div class='add'>+/* Always support Linux tracing subsystem. */</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "amdtp-stream-trace.h"</div><div class='add'>+</div><div class='add'>+#define TRANSFER_DELAY_TICKS	0x2e00 /* 479.17 microseconds */</div><div class='add'>+</div><div class='add'>+/* isochronous header parameters */</div><div class='add'>+#define ISO_DATA_LENGTH_SHIFT	16</div><div class='add'>+#define TAG_NO_CIP_HEADER	0</div><div class='add'>+#define TAG_CIP			1</div><div class='add'>+</div><div class='add'>+// Common Isochronous Packet (CIP) header parameters. Use two quadlets CIP header when supported.</div><div class='add'>+#define CIP_HEADER_QUADLETS	2</div><div class='add'>+#define CIP_EOH_SHIFT		31</div><div class='add'>+#define CIP_EOH			(1u &lt;&lt; CIP_EOH_SHIFT)</div><div class='add'>+#define CIP_EOH_MASK		0x80000000</div><div class='add'>+#define CIP_SID_SHIFT		24</div><div class='add'>+#define CIP_SID_MASK		0x3f000000</div><div class='add'>+#define CIP_DBS_MASK		0x00ff0000</div><div class='add'>+#define CIP_DBS_SHIFT		16</div><div class='add'>+#define CIP_SPH_MASK		0x00000400</div><div class='add'>+#define CIP_SPH_SHIFT		10</div><div class='add'>+#define CIP_DBC_MASK		0x000000ff</div><div class='add'>+#define CIP_FMT_SHIFT		24</div><div class='add'>+#define CIP_FMT_MASK		0x3f000000</div><div class='add'>+#define CIP_FDF_MASK		0x00ff0000</div><div class='add'>+#define CIP_FDF_SHIFT		16</div><div class='add'>+#define CIP_FDF_NO_DATA		0xff</div><div class='add'>+#define CIP_SYT_MASK		0x0000ffff</div><div class='add'>+#define CIP_SYT_NO_INFO		0xffff</div><div class='add'>+#define CIP_SYT_CYCLE_MODULUS	16</div><div class='add'>+#define CIP_NO_DATA		((CIP_FDF_NO_DATA &lt;&lt; CIP_FDF_SHIFT) | CIP_SYT_NO_INFO)</div><div class='add'>+</div><div class='add'>+#define CIP_HEADER_SIZE		(sizeof(__be32) * CIP_HEADER_QUADLETS)</div><div class='add'>+</div><div class='add'>+/* Audio and Music transfer protocol specific parameters */</div><div class='add'>+#define CIP_FMT_AM		0x10</div><div class='add'>+#define AMDTP_FDF_NO_DATA	0xff</div><div class='add'>+</div><div class='add'>+// For iso header and tstamp.</div><div class='add'>+#define IR_CTX_HEADER_DEFAULT_QUADLETS	2</div><div class='add'>+// Add nothing.</div><div class='add'>+#define IR_CTX_HEADER_SIZE_NO_CIP	(sizeof(__be32) * IR_CTX_HEADER_DEFAULT_QUADLETS)</div><div class='add'>+// Add two quadlets CIP header.</div><div class='add'>+#define IR_CTX_HEADER_SIZE_CIP		(IR_CTX_HEADER_SIZE_NO_CIP + CIP_HEADER_SIZE)</div><div class='add'>+#define HEADER_TSTAMP_MASK	0x0000ffff</div><div class='add'>+</div><div class='add'>+#define IT_PKT_HEADER_SIZE_CIP		CIP_HEADER_SIZE</div><div class='add'>+#define IT_PKT_HEADER_SIZE_NO_CIP	0 // Nothing.</div><div class='add'>+</div><div class='add'>+// The initial firmware of OXFW970 can postpone transmission of packet during finishing</div><div class='add'>+// asynchronous transaction. This module accepts 5 cycles to skip as maximum to avoid buffer</div><div class='add'>+// overrun. Actual device can skip more, then this module stops the packet streaming.</div><div class='add'>+#define IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES	5</div><div class='add'>+</div><div class='add'>+static void pcm_period_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_init - initialize an AMDTP stream structure</div><div class='add'>+ * @s: the AMDTP stream to initialize</div><div class='add'>+ * @unit: the target of the stream</div><div class='add'>+ * @dir: the direction of stream</div><div class='add'>+ * @flags: the details of the streaming protocol consist of cip_flags enumeration-constants.</div><div class='add'>+ * @fmt: the value of fmt field in CIP header</div><div class='add'>+ * @process_ctx_payloads: callback handler to process payloads of isoc context</div><div class='add'>+ * @protocol_size: the size to allocate newly for protocol</div><div class='add'>+ */</div><div class='add'>+int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		      enum amdtp_stream_direction dir, unsigned int flags,</div><div class='add'>+		      unsigned int fmt,</div><div class='add'>+		      amdtp_stream_process_ctx_payloads_t process_ctx_payloads,</div><div class='add'>+		      unsigned int protocol_size)</div><div class='add'>+{</div><div class='add'>+	if (process_ctx_payloads == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	s-&gt;protocol = kzalloc(protocol_size, GFP_KERNEL);</div><div class='add'>+	if (!s-&gt;protocol)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	s-&gt;unit = unit;</div><div class='add'>+	s-&gt;direction = dir;</div><div class='add'>+	s-&gt;flags = flags;</div><div class='add'>+	s-&gt;context = ERR_PTR(-1);</div><div class='add'>+	mutex_init(&amp;s-&gt;mutex);</div><div class='add'>+	INIT_WORK(&amp;s-&gt;period_work, pcm_period_work);</div><div class='add'>+	s-&gt;packet_index = 0;</div><div class='add'>+</div><div class='add'>+	init_waitqueue_head(&amp;s-&gt;ready_wait);</div><div class='add'>+</div><div class='add'>+	s-&gt;fmt = fmt;</div><div class='add'>+	s-&gt;process_ctx_payloads = process_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_destroy - free stream resources</div><div class='add'>+ * @s: the AMDTP stream to destroy</div><div class='add'>+ */</div><div class='add'>+void amdtp_stream_destroy(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	/* Not initialized. */</div><div class='add'>+	if (s-&gt;protocol == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	WARN_ON(amdtp_stream_running(s));</div><div class='add'>+	kfree(s-&gt;protocol);</div><div class='add'>+	mutex_destroy(&amp;s-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_destroy);</div><div class='add'>+</div><div class='add'>+const unsigned int amdtp_syt_intervals[CIP_SFC_COUNT] = {</div><div class='add'>+	[CIP_SFC_32000]  =  8,</div><div class='add'>+	[CIP_SFC_44100]  =  8,</div><div class='add'>+	[CIP_SFC_48000]  =  8,</div><div class='add'>+	[CIP_SFC_88200]  = 16,</div><div class='add'>+	[CIP_SFC_96000]  = 16,</div><div class='add'>+	[CIP_SFC_176400] = 32,</div><div class='add'>+	[CIP_SFC_192000] = 32,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(amdtp_syt_intervals);</div><div class='add'>+</div><div class='add'>+const unsigned int amdtp_rate_table[CIP_SFC_COUNT] = {</div><div class='add'>+	[CIP_SFC_32000]  =  32000,</div><div class='add'>+	[CIP_SFC_44100]  =  44100,</div><div class='add'>+	[CIP_SFC_48000]  =  48000,</div><div class='add'>+	[CIP_SFC_88200]  =  88200,</div><div class='add'>+	[CIP_SFC_96000]  =  96000,</div><div class='add'>+	[CIP_SFC_176400] = 176400,</div><div class='add'>+	[CIP_SFC_192000] = 192000,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL(amdtp_rate_table);</div><div class='add'>+</div><div class='add'>+static int apply_constraint_to_size(struct snd_pcm_hw_params *params,</div><div class='add'>+				    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *s = hw_param_interval(params, rule-&gt;var);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval t = {0};</div><div class='add'>+	unsigned int step = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CIP_SFC_COUNT; ++i) {</div><div class='add'>+		if (snd_interval_test(r, amdtp_rate_table[i]))</div><div class='add'>+			step = max(step, amdtp_syt_intervals[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (step == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	t.min = roundup(s-&gt;min, step);</div><div class='add'>+	t.max = rounddown(s-&gt;max, step);</div><div class='add'>+	t.integer = 1;</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(s, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_add_pcm_hw_constraints - add hw constraints for PCM substream</div><div class='add'>+ * @s:		the AMDTP stream, which must be initialized.</div><div class='add'>+ * @runtime:	the PCM substream runtime</div><div class='add'>+ */</div><div class='add'>+int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+					struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	unsigned int ctx_header_size;</div><div class='add'>+	unsigned int maximum_usec_per_period;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw-&gt;info = SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+		   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+		   SNDRV_PCM_INFO_JOINT_DUPLEX |</div><div class='add'>+		   SNDRV_PCM_INFO_MMAP |</div><div class='add'>+		   SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+		   SNDRV_PCM_INFO_NO_PERIOD_WAKEUP;</div><div class='add'>+</div><div class='add'>+	hw-&gt;periods_min = 2;</div><div class='add'>+	hw-&gt;periods_max = UINT_MAX;</div><div class='add'>+</div><div class='add'>+	/* bytes for a frame */</div><div class='add'>+	hw-&gt;period_bytes_min = 4 * hw-&gt;channels_max;</div><div class='add'>+</div><div class='add'>+	/* Just to prevent from allocating much pages. */</div><div class='add'>+	hw-&gt;period_bytes_max = hw-&gt;period_bytes_min * 2048;</div><div class='add'>+	hw-&gt;buffer_bytes_max = hw-&gt;period_bytes_max * hw-&gt;periods_min;</div><div class='add'>+</div><div class='add'>+	// Linux driver for 1394 OHCI controller voluntarily flushes isoc</div><div class='add'>+	// context when total size of accumulated context header reaches</div><div class='add'>+	// PAGE_SIZE. This kicks work for the isoc context and brings</div><div class='add'>+	// callback in the middle of scheduled interrupts.</div><div class='add'>+	// Although AMDTP streams in the same domain use the same events per</div><div class='add'>+	// IRQ, use the largest size of context header between IT/IR contexts.</div><div class='add'>+	// Here, use the value of context header in IR context is for both</div><div class='add'>+	// contexts.</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+		ctx_header_size = IR_CTX_HEADER_SIZE_CIP;</div><div class='add'>+	else</div><div class='add'>+		ctx_header_size = IR_CTX_HEADER_SIZE_NO_CIP;</div><div class='add'>+	maximum_usec_per_period = USEC_PER_SEC * PAGE_SIZE /</div><div class='add'>+				  CYCLES_PER_SECOND / ctx_header_size;</div><div class='add'>+</div><div class='add'>+	// In IEC 61883-6, one isoc packet can transfer events up to the value</div><div class='add'>+	// of syt interval. This comes from the interval of isoc cycle. As 1394</div><div class='add'>+	// OHCI controller can generate hardware IRQ per isoc packet, the</div><div class='add'>+	// interval is 125 usec.</div><div class='add'>+	// However, there are two ways of transmission in IEC 61883-6; blocking</div><div class='add'>+	// and non-blocking modes. In blocking mode, the sequence of isoc packet</div><div class='add'>+	// includes 'empty' or 'NODATA' packets which include no event. In</div><div class='add'>+	// non-blocking mode, the number of events per packet is variable up to</div><div class='add'>+	// the syt interval.</div><div class='add'>+	// Due to the above protocol design, the minimum PCM frames per</div><div class='add'>+	// interrupt should be double of the value of syt interval, thus it is</div><div class='add'>+	// 250 usec.</div><div class='add'>+	err = snd_pcm_hw_constraint_minmax(runtime,</div><div class='add'>+					   SNDRV_PCM_HW_PARAM_PERIOD_TIME,</div><div class='add'>+					   250, maximum_usec_per_period);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Non-Blocking stream has no more constraints */</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_BLOCKING))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * One AMDTP packet can include some frames. In blocking mode, the</div><div class='add'>+	 * number equals to SYT_INTERVAL. So the number is 8, 16 or 32,</div><div class='add'>+	 * depending on its sampling rate. For accurate period interrupt, it's</div><div class='add'>+	 * preferrable to align period/buffer sizes to current SYT_INTERVAL.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+				  apply_constraint_to_size, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+				  apply_constraint_to_size, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_add_pcm_hw_constraints);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_set_parameters - set stream parameters</div><div class='add'>+ * @s: the AMDTP stream to configure</div><div class='add'>+ * @rate: the sample rate</div><div class='add'>+ * @data_block_quadlets: the size of a data block in quadlet unit</div><div class='add'>+ * @pcm_frame_multiplier: the multiplier to compute the number of PCM frames by the number of AMDTP</div><div class='add'>+ *			  events.</div><div class='add'>+ *</div><div class='add'>+ * The parameters must be set before the stream is started, and must not be</div><div class='add'>+ * changed while the stream is running.</div><div class='add'>+ */</div><div class='add'>+int amdtp_stream_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+				unsigned int data_block_quadlets, unsigned int pcm_frame_multiplier)</div><div class='add'>+{</div><div class='add'>+	unsigned int sfc;</div><div class='add'>+</div><div class='add'>+	for (sfc = 0; sfc &lt; ARRAY_SIZE(amdtp_rate_table); ++sfc) {</div><div class='add'>+		if (amdtp_rate_table[sfc] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (sfc == ARRAY_SIZE(amdtp_rate_table))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	s-&gt;sfc = sfc;</div><div class='add'>+	s-&gt;data_block_quadlets = data_block_quadlets;</div><div class='add'>+	s-&gt;syt_interval = amdtp_syt_intervals[sfc];</div><div class='add'>+</div><div class='add'>+	// default buffering in the device.</div><div class='add'>+	s-&gt;transfer_delay = TRANSFER_DELAY_TICKS - TICKS_PER_CYCLE;</div><div class='add'>+</div><div class='add'>+	// additional buffering needed to adjust for no-data packets.</div><div class='add'>+	if (s-&gt;flags &amp; CIP_BLOCKING)</div><div class='add'>+		s-&gt;transfer_delay += TICKS_PER_SECOND * s-&gt;syt_interval / rate;</div><div class='add'>+</div><div class='add'>+	s-&gt;pcm_frame_multiplier = pcm_frame_multiplier;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_set_parameters);</div><div class='add'>+</div><div class='add'>+// The CIP header is processed in context header apart from context payload.</div><div class='add'>+static int amdtp_stream_get_max_ctx_payload_size(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	unsigned int multiplier;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;flags &amp; CIP_JUMBO_PAYLOAD)</div><div class='add'>+		multiplier = IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES;</div><div class='add'>+	else</div><div class='add'>+		multiplier = 1;</div><div class='add'>+</div><div class='add'>+	return s-&gt;syt_interval * s-&gt;data_block_quadlets * sizeof(__be32) * multiplier;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_get_max_payload - get the stream's packet size</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ *</div><div class='add'>+ * This function must not be called before the stream has been configured</div><div class='add'>+ * with amdtp_stream_set_parameters().</div><div class='add'>+ */</div><div class='add'>+unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	unsigned int cip_header_size;</div><div class='add'>+</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+		cip_header_size = CIP_HEADER_SIZE;</div><div class='add'>+	else</div><div class='add'>+		cip_header_size = 0;</div><div class='add'>+</div><div class='add'>+	return cip_header_size + amdtp_stream_get_max_ctx_payload_size(s);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_get_max_payload);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_pcm_prepare - prepare PCM device for running</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ *</div><div class='add'>+ * This function should be called from the PCM device's .prepare callback.</div><div class='add'>+ */</div><div class='add'>+void amdtp_stream_pcm_prepare(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;s-&gt;period_work);</div><div class='add'>+	s-&gt;pcm_buffer_pointer = 0;</div><div class='add'>+	s-&gt;pcm_period_pointer = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_pcm_prepare);</div><div class='add'>+</div><div class='add'>+#define prev_packet_desc(s, desc) \</div><div class='add'>+	list_prev_entry_circular(desc, &amp;s-&gt;packet_descs_list, link)</div><div class='add'>+</div><div class='add'>+static void pool_blocking_data_blocks(struct amdtp_stream *s, struct seq_desc *descs,</div><div class='add'>+				      unsigned int size, unsigned int pos, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	const unsigned int syt_interval = s-&gt;syt_interval;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		struct seq_desc *desc = descs + pos;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;syt_offset != CIP_SYT_NO_INFO)</div><div class='add'>+			desc-&gt;data_blocks = syt_interval;</div><div class='add'>+		else</div><div class='add'>+			desc-&gt;data_blocks = 0;</div><div class='add'>+</div><div class='add'>+		pos = (pos + 1) % size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pool_ideal_nonblocking_data_blocks(struct amdtp_stream *s, struct seq_desc *descs,</div><div class='add'>+					       unsigned int size, unsigned int pos,</div><div class='add'>+					       unsigned int count)</div><div class='add'>+{</div><div class='add'>+	const enum cip_sfc sfc = s-&gt;sfc;</div><div class='add'>+	unsigned int state = s-&gt;ctx_data.rx.data_block_state;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		struct seq_desc *desc = descs + pos;</div><div class='add'>+</div><div class='add'>+		if (!cip_sfc_is_base_44100(sfc)) {</div><div class='add'>+			// Sample_rate / 8000 is an integer, and precomputed.</div><div class='add'>+			desc-&gt;data_blocks = state;</div><div class='add'>+		} else {</div><div class='add'>+			unsigned int phase = state;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * This calculates the number of data blocks per packet so that</div><div class='add'>+		 * 1) the overall rate is correct and exactly synchronized to</div><div class='add'>+		 *    the bus clock, and</div><div class='add'>+		 * 2) packets with a rounded-up number of blocks occur as early</div><div class='add'>+		 *    as possible in the sequence (to prevent underruns of the</div><div class='add'>+		 *    device's buffer).</div><div class='add'>+		 */</div><div class='add'>+			if (sfc == CIP_SFC_44100)</div><div class='add'>+				/* 6 6 5 6 5 6 5 ... */</div><div class='add'>+				desc-&gt;data_blocks = 5 + ((phase &amp; 1) ^ (phase == 0 || phase &gt;= 40));</div><div class='add'>+			else</div><div class='add'>+				/* 12 11 11 11 11 ... or 23 22 22 22 22 ... */</div><div class='add'>+				desc-&gt;data_blocks = 11 * (sfc &gt;&gt; 1) + (phase == 0);</div><div class='add'>+			if (++phase &gt;= (80 &gt;&gt; (sfc &gt;&gt; 1)))</div><div class='add'>+				phase = 0;</div><div class='add'>+			state = phase;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos = (pos + 1) % size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.rx.data_block_state = state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int calculate_syt_offset(unsigned int *last_syt_offset,</div><div class='add'>+			unsigned int *syt_offset_state, enum cip_sfc sfc)</div><div class='add'>+{</div><div class='add'>+	unsigned int syt_offset;</div><div class='add'>+</div><div class='add'>+	if (*last_syt_offset &lt; TICKS_PER_CYCLE) {</div><div class='add'>+		if (!cip_sfc_is_base_44100(sfc))</div><div class='add'>+			syt_offset = *last_syt_offset + *syt_offset_state;</div><div class='add'>+		else {</div><div class='add'>+		/*</div><div class='add'>+		 * The time, in ticks, of the n'th SYT_INTERVAL sample is:</div><div class='add'>+		 *   n * SYT_INTERVAL * 24576000 / sample_rate</div><div class='add'>+		 * Modulo TICKS_PER_CYCLE, the difference between successive</div><div class='add'>+		 * elements is about 1386.23.  Rounding the results of this</div><div class='add'>+		 * formula to the SYT precision results in a sequence of</div><div class='add'>+		 * differences that begins with:</div><div class='add'>+		 *   1386 1386 1387 1386 1386 1386 1387 1386 1386 1386 1387 ...</div><div class='add'>+		 * This code generates _exactly_ the same sequence.</div><div class='add'>+		 */</div><div class='add'>+			unsigned int phase = *syt_offset_state;</div><div class='add'>+			unsigned int index = phase % 13;</div><div class='add'>+</div><div class='add'>+			syt_offset = *last_syt_offset;</div><div class='add'>+			syt_offset += 1386 + ((index &amp;&amp; !(index &amp; 3)) ||</div><div class='add'>+					      phase == 146);</div><div class='add'>+			if (++phase &gt;= 147)</div><div class='add'>+				phase = 0;</div><div class='add'>+			*syt_offset_state = phase;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		syt_offset = *last_syt_offset - TICKS_PER_CYCLE;</div><div class='add'>+	*last_syt_offset = syt_offset;</div><div class='add'>+</div><div class='add'>+	if (syt_offset &gt;= TICKS_PER_CYCLE)</div><div class='add'>+		syt_offset = CIP_SYT_NO_INFO;</div><div class='add'>+</div><div class='add'>+	return syt_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pool_ideal_syt_offsets(struct amdtp_stream *s, struct seq_desc *descs,</div><div class='add'>+				   unsigned int size, unsigned int pos, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	const enum cip_sfc sfc = s-&gt;sfc;</div><div class='add'>+	unsigned int last = s-&gt;ctx_data.rx.last_syt_offset;</div><div class='add'>+	unsigned int state = s-&gt;ctx_data.rx.syt_offset_state;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		struct seq_desc *desc = descs + pos;</div><div class='add'>+</div><div class='add'>+		desc-&gt;syt_offset = calculate_syt_offset(&amp;last, &amp;state, sfc);</div><div class='add'>+</div><div class='add'>+		pos = (pos + 1) % size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.rx.last_syt_offset = last;</div><div class='add'>+	s-&gt;ctx_data.rx.syt_offset_state = state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int compute_syt_offset(unsigned int syt, unsigned int cycle,</div><div class='add'>+				       unsigned int transfer_delay)</div><div class='add'>+{</div><div class='add'>+	unsigned int cycle_lo = (cycle % CYCLES_PER_SECOND) &amp; 0x0f;</div><div class='add'>+	unsigned int syt_cycle_lo = (syt &amp; 0xf000) &gt;&gt; 12;</div><div class='add'>+	unsigned int syt_offset;</div><div class='add'>+</div><div class='add'>+	// Round up.</div><div class='add'>+	if (syt_cycle_lo &lt; cycle_lo)</div><div class='add'>+		syt_cycle_lo += CIP_SYT_CYCLE_MODULUS;</div><div class='add'>+	syt_cycle_lo -= cycle_lo;</div><div class='add'>+</div><div class='add'>+	// Subtract transfer delay so that the synchronization offset is not so large</div><div class='add'>+	// at transmission.</div><div class='add'>+	syt_offset = syt_cycle_lo * TICKS_PER_CYCLE + (syt &amp; 0x0fff);</div><div class='add'>+	if (syt_offset &lt; transfer_delay)</div><div class='add'>+		syt_offset += CIP_SYT_CYCLE_MODULUS * TICKS_PER_CYCLE;</div><div class='add'>+</div><div class='add'>+	return syt_offset - transfer_delay;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Both of the producer and consumer of the queue runs in the same clock of IEEE 1394 bus.</div><div class='add'>+// Additionally, the sequence of tx packets is severely checked against any discontinuity</div><div class='add'>+// before filling entries in the queue. The calculation is safe even if it looks fragile by</div><div class='add'>+// overrun.</div><div class='add'>+static unsigned int calculate_cached_cycle_count(struct amdtp_stream *s, unsigned int head)</div><div class='add'>+{</div><div class='add'>+	const unsigned int cache_size = s-&gt;ctx_data.tx.cache.size;</div><div class='add'>+	unsigned int cycles = s-&gt;ctx_data.tx.cache.pos;</div><div class='add'>+</div><div class='add'>+	if (cycles &lt; head)</div><div class='add'>+		cycles += cache_size;</div><div class='add'>+	cycles -= head;</div><div class='add'>+</div><div class='add'>+	return cycles;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_seq(struct amdtp_stream *s, const struct pkt_desc *src, unsigned int desc_count)</div><div class='add'>+{</div><div class='add'>+	const unsigned int transfer_delay = s-&gt;transfer_delay;</div><div class='add'>+	const unsigned int cache_size = s-&gt;ctx_data.tx.cache.size;</div><div class='add'>+	struct seq_desc *cache = s-&gt;ctx_data.tx.cache.descs;</div><div class='add'>+	unsigned int cache_pos = s-&gt;ctx_data.tx.cache.pos;</div><div class='add'>+	bool aware_syt = !(s-&gt;flags &amp; CIP_UNAWARE_SYT);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; desc_count; ++i) {</div><div class='add'>+		struct seq_desc *dst = cache + cache_pos;</div><div class='add'>+</div><div class='add'>+		if (aware_syt &amp;&amp; src-&gt;syt != CIP_SYT_NO_INFO)</div><div class='add'>+			dst-&gt;syt_offset = compute_syt_offset(src-&gt;syt, src-&gt;cycle, transfer_delay);</div><div class='add'>+		else</div><div class='add'>+			dst-&gt;syt_offset = CIP_SYT_NO_INFO;</div><div class='add'>+		dst-&gt;data_blocks = src-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		cache_pos = (cache_pos + 1) % cache_size;</div><div class='add'>+		src = amdtp_stream_next_packet_desc(s, src);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.tx.cache.pos = cache_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pool_ideal_seq_descs(struct amdtp_stream *s, struct seq_desc *descs, unsigned int size,</div><div class='add'>+				 unsigned int pos, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	pool_ideal_syt_offsets(s, descs, size, pos, count);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;flags &amp; CIP_BLOCKING)</div><div class='add'>+		pool_blocking_data_blocks(s, descs, size, pos, count);</div><div class='add'>+	else</div><div class='add'>+		pool_ideal_nonblocking_data_blocks(s, descs, size, pos, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pool_replayed_seq(struct amdtp_stream *s, struct seq_desc *descs, unsigned int size,</div><div class='add'>+			      unsigned int pos, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *target = s-&gt;ctx_data.rx.replay_target;</div><div class='add'>+	const struct seq_desc *cache = target-&gt;ctx_data.tx.cache.descs;</div><div class='add'>+	const unsigned int cache_size = target-&gt;ctx_data.tx.cache.size;</div><div class='add'>+	unsigned int cache_pos = s-&gt;ctx_data.rx.cache_pos;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		descs[pos] = cache[cache_pos];</div><div class='add'>+		cache_pos = (cache_pos + 1) % cache_size;</div><div class='add'>+		pos = (pos + 1) % size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.rx.cache_pos = cache_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pool_seq_descs(struct amdtp_stream *s, struct seq_desc *descs, unsigned int size,</div><div class='add'>+			   unsigned int pos, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	void (*pool_seq_descs)(struct amdtp_stream *s, struct seq_desc *descs, unsigned int size,</div><div class='add'>+			       unsigned int pos, unsigned int count);</div><div class='add'>+</div><div class='add'>+	if (!d-&gt;replay.enable || !s-&gt;ctx_data.rx.replay_target) {</div><div class='add'>+		pool_seq_descs = pool_ideal_seq_descs;</div><div class='add'>+	} else {</div><div class='add'>+		if (!d-&gt;replay.on_the_fly) {</div><div class='add'>+			pool_seq_descs = pool_replayed_seq;</div><div class='add'>+		} else {</div><div class='add'>+			struct amdtp_stream *tx = s-&gt;ctx_data.rx.replay_target;</div><div class='add'>+			const unsigned int cache_size = tx-&gt;ctx_data.tx.cache.size;</div><div class='add'>+			const unsigned int cache_pos = s-&gt;ctx_data.rx.cache_pos;</div><div class='add'>+			unsigned int cached_cycles = calculate_cached_cycle_count(tx, cache_pos);</div><div class='add'>+</div><div class='add'>+			if (cached_cycles &gt; count &amp;&amp; cached_cycles &gt; cache_size / 2)</div><div class='add'>+				pool_seq_descs = pool_replayed_seq;</div><div class='add'>+			else</div><div class='add'>+				pool_seq_descs = pool_ideal_seq_descs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pool_seq_descs(s, descs, size, pos, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_pcm_pointers(struct amdtp_stream *s,</div><div class='add'>+				struct snd_pcm_substream *pcm,</div><div class='add'>+				unsigned int frames)</div><div class='add'>+{</div><div class='add'>+	unsigned int ptr;</div><div class='add'>+</div><div class='add'>+	ptr = s-&gt;pcm_buffer_pointer + frames;</div><div class='add'>+	if (ptr &gt;= pcm-&gt;runtime-&gt;buffer_size)</div><div class='add'>+		ptr -= pcm-&gt;runtime-&gt;buffer_size;</div><div class='add'>+	WRITE_ONCE(s-&gt;pcm_buffer_pointer, ptr);</div><div class='add'>+</div><div class='add'>+	s-&gt;pcm_period_pointer += frames;</div><div class='add'>+	if (s-&gt;pcm_period_pointer &gt;= pcm-&gt;runtime-&gt;period_size) {</div><div class='add'>+		s-&gt;pcm_period_pointer -= pcm-&gt;runtime-&gt;period_size;</div><div class='add'>+</div><div class='add'>+		// The program in user process should periodically check the status of intermediate</div><div class='add'>+		// buffer associated to PCM substream to process PCM frames in the buffer, instead</div><div class='add'>+		// of receiving notification of period elapsed by poll wait.</div><div class='add'>+		//</div><div class='add'>+		// Use another work item for period elapsed event to prevent the following AB/BA</div><div class='add'>+		// deadlock:</div><div class='add'>+		//</div><div class='add'>+		//             thread 1                            thread 2</div><div class='add'>+		// =================================   =================================</div><div class='add'>+		//       A.work item (process)                pcm ioctl (process)</div><div class='add'>+		//                 v                                   v</div><div class='add'>+		//       process_rx_packets()                  B.PCM stream lock</div><div class='add'>+		//       process_tx_packets()                          v</div><div class='add'>+		//                 v                        callbacks in snd_pcm_ops</div><div class='add'>+		//       update_pcm_pointers()                         v</div><div class='add'>+		//         snd_pcm_elapsed()           fw_iso_context_flush_completions()</div><div class='add'>+		//  snd_pcm_stream_lock_irqsave()             disable_work_sync()</div><div class='add'>+		//                 v                                   v</div><div class='add'>+		//     wait until release of B                wait until A exits</div><div class='add'>+		if (!pcm-&gt;runtime-&gt;no_period_wakeup)</div><div class='add'>+			queue_work(system_highpri_wq, &amp;s-&gt;period_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pcm_period_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = container_of(work, struct amdtp_stream,</div><div class='add'>+					      period_work);</div><div class='add'>+	struct snd_pcm_substream *pcm = READ_ONCE(s-&gt;pcm);</div><div class='add'>+</div><div class='add'>+	if (pcm)</div><div class='add'>+		snd_pcm_period_elapsed(pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int queue_packet(struct amdtp_stream *s, struct fw_iso_packet *params,</div><div class='add'>+			bool sched_irq)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	params-&gt;interrupt = sched_irq;</div><div class='add'>+	params-&gt;tag = s-&gt;tag;</div><div class='add'>+	params-&gt;sy = 0;</div><div class='add'>+</div><div class='add'>+	err = fw_iso_context_queue(s-&gt;context, params, &amp;s-&gt;buffer.iso_buffer,</div><div class='add'>+				   s-&gt;buffer.packets[s-&gt;packet_index].offset);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;s-&gt;unit-&gt;device, "queueing error: %d\n", err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (++s-&gt;packet_index &gt;= s-&gt;queue_size)</div><div class='add'>+		s-&gt;packet_index = 0;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int queue_out_packet(struct amdtp_stream *s,</div><div class='add'>+				   struct fw_iso_packet *params, bool sched_irq)</div><div class='add'>+{</div><div class='add'>+	params-&gt;skip =</div><div class='add'>+		!!(params-&gt;header_length == 0 &amp;&amp; params-&gt;payload_length == 0);</div><div class='add'>+	return queue_packet(s, params, sched_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int queue_in_packet(struct amdtp_stream *s,</div><div class='add'>+				  struct fw_iso_packet *params)</div><div class='add'>+{</div><div class='add'>+	// Queue one packet for IR context.</div><div class='add'>+	params-&gt;header_length = s-&gt;ctx_data.tx.ctx_header_size;</div><div class='add'>+	params-&gt;payload_length = s-&gt;ctx_data.tx.max_ctx_payload_length;</div><div class='add'>+	params-&gt;skip = false;</div><div class='add'>+	return queue_packet(s, params, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void generate_cip_header(struct amdtp_stream *s, __be32 cip_header[2],</div><div class='add'>+			unsigned int data_block_counter, unsigned int syt)</div><div class='add'>+{</div><div class='add'>+	cip_header[0] = cpu_to_be32(READ_ONCE(s-&gt;source_node_id_field) |</div><div class='add'>+				(s-&gt;data_block_quadlets &lt;&lt; CIP_DBS_SHIFT) |</div><div class='add'>+				((s-&gt;sph &lt;&lt; CIP_SPH_SHIFT) &amp; CIP_SPH_MASK) |</div><div class='add'>+				data_block_counter);</div><div class='add'>+	cip_header[1] = cpu_to_be32(CIP_EOH |</div><div class='add'>+			((s-&gt;fmt &lt;&lt; CIP_FMT_SHIFT) &amp; CIP_FMT_MASK) |</div><div class='add'>+			((s-&gt;ctx_data.rx.fdf &lt;&lt; CIP_FDF_SHIFT) &amp; CIP_FDF_MASK) |</div><div class='add'>+			(syt &amp; CIP_SYT_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void build_it_pkt_header(struct amdtp_stream *s, unsigned int cycle,</div><div class='add'>+				struct fw_iso_packet *params, unsigned int header_length,</div><div class='add'>+				unsigned int data_blocks,</div><div class='add'>+				unsigned int data_block_counter,</div><div class='add'>+				unsigned int syt, unsigned int index, u32 curr_cycle_time)</div><div class='add'>+{</div><div class='add'>+	unsigned int payload_length;</div><div class='add'>+	__be32 *cip_header;</div><div class='add'>+</div><div class='add'>+	payload_length = data_blocks * sizeof(__be32) * s-&gt;data_block_quadlets;</div><div class='add'>+	params-&gt;payload_length = payload_length;</div><div class='add'>+</div><div class='add'>+	if (header_length &gt; 0) {</div><div class='add'>+		cip_header = (__be32 *)params-&gt;header;</div><div class='add'>+		generate_cip_header(s, cip_header, data_block_counter, syt);</div><div class='add'>+		params-&gt;header_length = header_length;</div><div class='add'>+	} else {</div><div class='add'>+		cip_header = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_amdtp_packet(s, cycle, cip_header, payload_length + header_length, data_blocks,</div><div class='add'>+			   data_block_counter, s-&gt;packet_index, index, curr_cycle_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_cip_header(struct amdtp_stream *s, const __be32 *buf,</div><div class='add'>+			    unsigned int payload_length,</div><div class='add'>+			    unsigned int *data_blocks,</div><div class='add'>+			    unsigned int *data_block_counter, unsigned int *syt)</div><div class='add'>+{</div><div class='add'>+	u32 cip_header[2];</div><div class='add'>+	unsigned int sph;</div><div class='add'>+	unsigned int fmt;</div><div class='add'>+	unsigned int fdf;</div><div class='add'>+	unsigned int dbc;</div><div class='add'>+	bool lost;</div><div class='add'>+</div><div class='add'>+	cip_header[0] = be32_to_cpu(buf[0]);</div><div class='add'>+	cip_header[1] = be32_to_cpu(buf[1]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This module supports 'Two-quadlet CIP header with SYT field'.</div><div class='add'>+	 * For convenience, also check FMT field is AM824 or not.</div><div class='add'>+	 */</div><div class='add'>+	if ((((cip_header[0] &amp; CIP_EOH_MASK) == CIP_EOH) ||</div><div class='add'>+	     ((cip_header[1] &amp; CIP_EOH_MASK) != CIP_EOH)) &amp;&amp;</div><div class='add'>+	    (!(s-&gt;flags &amp; CIP_HEADER_WITHOUT_EOH))) {</div><div class='add'>+		dev_info_ratelimited(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+				"Invalid CIP header for AMDTP: %08X:%08X\n",</div><div class='add'>+				cip_header[0], cip_header[1]);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check valid protocol or not. */</div><div class='add'>+	sph = (cip_header[0] &amp; CIP_SPH_MASK) &gt;&gt; CIP_SPH_SHIFT;</div><div class='add'>+	fmt = (cip_header[1] &amp; CIP_FMT_MASK) &gt;&gt; CIP_FMT_SHIFT;</div><div class='add'>+	if (sph != s-&gt;sph || fmt != s-&gt;fmt) {</div><div class='add'>+		dev_info_ratelimited(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+				     "Detect unexpected protocol: %08x %08x\n",</div><div class='add'>+				     cip_header[0], cip_header[1]);</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate data blocks */</div><div class='add'>+	fdf = (cip_header[1] &amp; CIP_FDF_MASK) &gt;&gt; CIP_FDF_SHIFT;</div><div class='add'>+	if (payload_length == 0 || (fmt == CIP_FMT_AM &amp;&amp; fdf == AMDTP_FDF_NO_DATA)) {</div><div class='add'>+		*data_blocks = 0;</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int data_block_quadlets =</div><div class='add'>+				(cip_header[0] &amp; CIP_DBS_MASK) &gt;&gt; CIP_DBS_SHIFT;</div><div class='add'>+		/* avoid division by zero */</div><div class='add'>+		if (data_block_quadlets == 0) {</div><div class='add'>+			dev_err(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+				"Detect invalid value in dbs field: %08X\n",</div><div class='add'>+				cip_header[0]);</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+		if (s-&gt;flags &amp; CIP_WRONG_DBS)</div><div class='add'>+			data_block_quadlets = s-&gt;data_block_quadlets;</div><div class='add'>+</div><div class='add'>+		*data_blocks = payload_length / sizeof(__be32) / data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check data block counter continuity */</div><div class='add'>+	dbc = cip_header[0] &amp; CIP_DBC_MASK;</div><div class='add'>+	if (*data_blocks == 0 &amp;&amp; (s-&gt;flags &amp; CIP_EMPTY_HAS_WRONG_DBC) &amp;&amp;</div><div class='add'>+	    *data_block_counter != UINT_MAX)</div><div class='add'>+		dbc = *data_block_counter;</div><div class='add'>+</div><div class='add'>+	if ((dbc == 0x00 &amp;&amp; (s-&gt;flags &amp; CIP_SKIP_DBC_ZERO_CHECK)) ||</div><div class='add'>+	    *data_block_counter == UINT_MAX) {</div><div class='add'>+		lost = false;</div><div class='add'>+	} else if (!(s-&gt;flags &amp; CIP_DBC_IS_END_EVENT)) {</div><div class='add'>+		lost = dbc != *data_block_counter;</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int dbc_interval;</div><div class='add'>+</div><div class='add'>+		if (!(s-&gt;flags &amp; CIP_DBC_IS_PAYLOAD_QUADLETS)) {</div><div class='add'>+			if (*data_blocks &gt; 0 &amp;&amp; s-&gt;ctx_data.tx.dbc_interval &gt; 0)</div><div class='add'>+				dbc_interval = s-&gt;ctx_data.tx.dbc_interval;</div><div class='add'>+			else</div><div class='add'>+				dbc_interval = *data_blocks;</div><div class='add'>+		} else {</div><div class='add'>+			dbc_interval = payload_length / sizeof(__be32);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		lost = dbc != ((*data_block_counter + dbc_interval) &amp; 0xff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lost) {</div><div class='add'>+		dev_err(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+			"Detect discontinuity of CIP: %02X %02X\n",</div><div class='add'>+			*data_block_counter, dbc);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data_block_counter = dbc;</div><div class='add'>+</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_UNAWARE_SYT))</div><div class='add'>+		*syt = cip_header[1] &amp; CIP_SYT_MASK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,</div><div class='add'>+			       const __be32 *ctx_header,</div><div class='add'>+			       unsigned int *data_blocks,</div><div class='add'>+			       unsigned int *data_block_counter,</div><div class='add'>+			       unsigned int *syt, unsigned int packet_index, unsigned int index,</div><div class='add'>+			       u32 curr_cycle_time)</div><div class='add'>+{</div><div class='add'>+	unsigned int payload_length;</div><div class='add'>+	const __be32 *cip_header;</div><div class='add'>+	unsigned int cip_header_size;</div><div class='add'>+</div><div class='add'>+	payload_length = be32_to_cpu(ctx_header[0]) &gt;&gt; ISO_DATA_LENGTH_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+		cip_header_size = CIP_HEADER_SIZE;</div><div class='add'>+	else</div><div class='add'>+		cip_header_size = 0;</div><div class='add'>+</div><div class='add'>+	if (payload_length &gt; cip_header_size + s-&gt;ctx_data.tx.max_ctx_payload_length) {</div><div class='add'>+		dev_err(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+			"Detect jumbo payload: %04x %04x\n",</div><div class='add'>+			payload_length, cip_header_size + s-&gt;ctx_data.tx.max_ctx_payload_length);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cip_header_size &gt; 0) {</div><div class='add'>+		if (payload_length &gt;= cip_header_size) {</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			cip_header = ctx_header + IR_CTX_HEADER_DEFAULT_QUADLETS;</div><div class='add'>+			err = check_cip_header(s, cip_header, payload_length - cip_header_size,</div><div class='add'>+					       data_blocks, data_block_counter, syt);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			// Handle the cycle so that empty packet arrives.</div><div class='add'>+			cip_header = NULL;</div><div class='add'>+			*data_blocks = 0;</div><div class='add'>+			*syt = 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		cip_header = NULL;</div><div class='add'>+		*data_blocks = payload_length / sizeof(__be32) / s-&gt;data_block_quadlets;</div><div class='add'>+		*syt = 0;</div><div class='add'>+</div><div class='add'>+		if (*data_block_counter == UINT_MAX)</div><div class='add'>+			*data_block_counter = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_amdtp_packet(s, cycle, cip_header, payload_length, *data_blocks,</div><div class='add'>+			   *data_block_counter, packet_index, index, curr_cycle_time);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// In CYCLE_TIMER register of IEEE 1394, 7 bits are used to represent second. On</div><div class='add'>+// the other hand, in DMA descriptors of 1394 OHCI, 3 bits are used to represent</div><div class='add'>+// it. Thus, via Linux firewire subsystem, we can get the 3 bits for second.</div><div class='add'>+static inline u32 compute_ohci_iso_ctx_cycle_count(u32 tstamp)</div><div class='add'>+{</div><div class='add'>+	return (((tstamp &gt;&gt; 13) &amp; 0x07) * CYCLES_PER_SECOND) + (tstamp &amp; 0x1fff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 compute_ohci_cycle_count(__be32 ctx_header_tstamp)</div><div class='add'>+{</div><div class='add'>+	u32 tstamp = be32_to_cpu(ctx_header_tstamp) &amp; HEADER_TSTAMP_MASK;</div><div class='add'>+	return compute_ohci_iso_ctx_cycle_count(tstamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 increment_ohci_cycle_count(u32 cycle, unsigned int addend)</div><div class='add'>+{</div><div class='add'>+	cycle += addend;</div><div class='add'>+	if (cycle &gt;= OHCI_SECOND_MODULUS * CYCLES_PER_SECOND)</div><div class='add'>+		cycle -= OHCI_SECOND_MODULUS * CYCLES_PER_SECOND;</div><div class='add'>+	return cycle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 decrement_ohci_cycle_count(u32 minuend, u32 subtrahend)</div><div class='add'>+{</div><div class='add'>+	if (minuend &lt; subtrahend)</div><div class='add'>+		minuend += OHCI_SECOND_MODULUS * CYCLES_PER_SECOND;</div><div class='add'>+</div><div class='add'>+	return minuend - subtrahend;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compare_ohci_cycle_count(u32 lval, u32 rval)</div><div class='add'>+{</div><div class='add'>+	if (lval == rval)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (lval &lt; rval &amp;&amp; rval - lval &lt; OHCI_SECOND_MODULUS * CYCLES_PER_SECOND / 2)</div><div class='add'>+		return -1;</div><div class='add'>+	else</div><div class='add'>+		return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Align to actual cycle count for the packet which is going to be scheduled.</div><div class='add'>+// This module queued the same number of isochronous cycle as the size of queue</div><div class='add'>+// to kip isochronous cycle, therefore it's OK to just increment the cycle by</div><div class='add'>+// the size of queue for scheduled cycle.</div><div class='add'>+static inline u32 compute_ohci_it_cycle(const __be32 ctx_header_tstamp,</div><div class='add'>+					unsigned int queue_size)</div><div class='add'>+{</div><div class='add'>+	u32 cycle = compute_ohci_cycle_count(ctx_header_tstamp);</div><div class='add'>+	return increment_ohci_cycle_count(cycle, queue_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generate_tx_packet_descs(struct amdtp_stream *s, struct pkt_desc *desc,</div><div class='add'>+				    const __be32 *ctx_header, unsigned int packet_count,</div><div class='add'>+				    unsigned int *desc_count)</div><div class='add'>+{</div><div class='add'>+	unsigned int next_cycle = s-&gt;next_cycle;</div><div class='add'>+	unsigned int dbc = s-&gt;data_block_counter;</div><div class='add'>+	unsigned int packet_index = s-&gt;packet_index;</div><div class='add'>+	unsigned int queue_size = s-&gt;queue_size;</div><div class='add'>+	u32 curr_cycle_time = 0;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (trace_amdtp_packet_enabled())</div><div class='add'>+		(void)fw_card_read_cycle_time(fw_parent_device(s-&gt;unit)-&gt;card, &amp;curr_cycle_time);</div><div class='add'>+</div><div class='add'>+	*desc_count = 0;</div><div class='add'>+	for (i = 0; i &lt; packet_count; ++i) {</div><div class='add'>+		unsigned int cycle;</div><div class='add'>+		bool lost;</div><div class='add'>+		unsigned int data_blocks;</div><div class='add'>+		unsigned int syt;</div><div class='add'>+</div><div class='add'>+		cycle = compute_ohci_cycle_count(ctx_header[1]);</div><div class='add'>+		lost = (next_cycle != cycle);</div><div class='add'>+		if (lost) {</div><div class='add'>+			if (s-&gt;flags &amp; CIP_NO_HEADER) {</div><div class='add'>+				// Fireface skips transmission just for an isoc cycle corresponding</div><div class='add'>+				// to empty packet.</div><div class='add'>+				unsigned int prev_cycle = next_cycle;</div><div class='add'>+</div><div class='add'>+				next_cycle = increment_ohci_cycle_count(next_cycle, 1);</div><div class='add'>+				lost = (next_cycle != cycle);</div><div class='add'>+				if (!lost) {</div><div class='add'>+					// Prepare a description for the skipped cycle for</div><div class='add'>+					// sequence replay.</div><div class='add'>+					desc-&gt;cycle = prev_cycle;</div><div class='add'>+					desc-&gt;syt = 0;</div><div class='add'>+					desc-&gt;data_blocks = 0;</div><div class='add'>+					desc-&gt;data_block_counter = dbc;</div><div class='add'>+					desc-&gt;ctx_payload = NULL;</div><div class='add'>+					desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+					++(*desc_count);</div><div class='add'>+				}</div><div class='add'>+			} else if (s-&gt;flags &amp; CIP_JUMBO_PAYLOAD) {</div><div class='add'>+				// OXFW970 skips transmission for several isoc cycles during</div><div class='add'>+				// asynchronous transaction. The sequence replay is impossible due</div><div class='add'>+				// to the reason.</div><div class='add'>+				unsigned int safe_cycle = increment_ohci_cycle_count(next_cycle,</div><div class='add'>+								IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES);</div><div class='add'>+				lost = (compare_ohci_cycle_count(safe_cycle, cycle) &lt; 0);</div><div class='add'>+			}</div><div class='add'>+			if (lost) {</div><div class='add'>+				dev_err(&amp;s-&gt;unit-&gt;device, "Detect discontinuity of cycle: %d %d\n",</div><div class='add'>+					next_cycle, cycle);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = parse_ir_ctx_header(s, cycle, ctx_header, &amp;data_blocks, &amp;dbc, &amp;syt,</div><div class='add'>+					  packet_index, i, curr_cycle_time);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		desc-&gt;cycle = cycle;</div><div class='add'>+		desc-&gt;syt = syt;</div><div class='add'>+		desc-&gt;data_blocks = data_blocks;</div><div class='add'>+		desc-&gt;data_block_counter = dbc;</div><div class='add'>+		desc-&gt;ctx_payload = s-&gt;buffer.packets[packet_index].buffer;</div><div class='add'>+</div><div class='add'>+		if (!(s-&gt;flags &amp; CIP_DBC_IS_END_EVENT))</div><div class='add'>+			dbc = (dbc + desc-&gt;data_blocks) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		next_cycle = increment_ohci_cycle_count(next_cycle, 1);</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+		++(*desc_count);</div><div class='add'>+		ctx_header += s-&gt;ctx_data.tx.ctx_header_size / sizeof(*ctx_header);</div><div class='add'>+		packet_index = (packet_index + 1) % queue_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;next_cycle = next_cycle;</div><div class='add'>+	s-&gt;data_block_counter = dbc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int compute_syt(unsigned int syt_offset, unsigned int cycle,</div><div class='add'>+				unsigned int transfer_delay)</div><div class='add'>+{</div><div class='add'>+	unsigned int syt;</div><div class='add'>+</div><div class='add'>+	syt_offset += transfer_delay;</div><div class='add'>+	syt = ((cycle + syt_offset / TICKS_PER_CYCLE) &lt;&lt; 12) |</div><div class='add'>+	      (syt_offset % TICKS_PER_CYCLE);</div><div class='add'>+	return syt &amp; CIP_SYT_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void generate_rx_packet_descs(struct amdtp_stream *s, struct pkt_desc *desc,</div><div class='add'>+				     const __be32 *ctx_header, unsigned int packet_count)</div><div class='add'>+{</div><div class='add'>+	struct seq_desc *seq_descs = s-&gt;ctx_data.rx.seq.descs;</div><div class='add'>+	unsigned int seq_size = s-&gt;ctx_data.rx.seq.size;</div><div class='add'>+	unsigned int seq_pos = s-&gt;ctx_data.rx.seq.pos;</div><div class='add'>+	unsigned int dbc = s-&gt;data_block_counter;</div><div class='add'>+	bool aware_syt = !(s-&gt;flags &amp; CIP_UNAWARE_SYT);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pool_seq_descs(s, seq_descs, seq_size, seq_pos, packet_count);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; packet_count; ++i) {</div><div class='add'>+		unsigned int index = (s-&gt;packet_index + i) % s-&gt;queue_size;</div><div class='add'>+		const struct seq_desc *seq = seq_descs + seq_pos;</div><div class='add'>+</div><div class='add'>+		desc-&gt;cycle = compute_ohci_it_cycle(*ctx_header, s-&gt;queue_size);</div><div class='add'>+</div><div class='add'>+		if (aware_syt &amp;&amp; seq-&gt;syt_offset != CIP_SYT_NO_INFO)</div><div class='add'>+			desc-&gt;syt = compute_syt(seq-&gt;syt_offset, desc-&gt;cycle, s-&gt;transfer_delay);</div><div class='add'>+		else</div><div class='add'>+			desc-&gt;syt = CIP_SYT_NO_INFO;</div><div class='add'>+</div><div class='add'>+		desc-&gt;data_blocks = seq-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;flags &amp; CIP_DBC_IS_END_EVENT)</div><div class='add'>+			dbc = (dbc + desc-&gt;data_blocks) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		desc-&gt;data_block_counter = dbc;</div><div class='add'>+</div><div class='add'>+		if (!(s-&gt;flags &amp; CIP_DBC_IS_END_EVENT))</div><div class='add'>+			dbc = (dbc + desc-&gt;data_blocks) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+		desc-&gt;ctx_payload = s-&gt;buffer.packets[index].buffer;</div><div class='add'>+</div><div class='add'>+		seq_pos = (seq_pos + 1) % seq_size;</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+</div><div class='add'>+		++ctx_header;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;data_block_counter = dbc;</div><div class='add'>+	s-&gt;ctx_data.rx.seq.pos = seq_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cancel_stream(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct work_struct *work = current_work();</div><div class='add'>+</div><div class='add'>+	s-&gt;packet_index = -1;</div><div class='add'>+</div><div class='add'>+	// Detect work items for any isochronous context. The work item for pcm_period_work()</div><div class='add'>+	// should be avoided since the call of snd_pcm_period_elapsed() can reach via</div><div class='add'>+	// snd_pcm_ops.pointer() under acquiring PCM stream(group) lock and causes dead lock at</div><div class='add'>+	// snd_pcm_stop_xrun().</div><div class='add'>+	if (work &amp;&amp; work != &amp;s-&gt;period_work)</div><div class='add'>+		amdtp_stream_pcm_abort(s);</div><div class='add'>+	WRITE_ONCE(s-&gt;pcm_buffer_pointer, SNDRV_PCM_POS_XRUN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_sframes_t compute_pcm_extra_delay(struct amdtp_stream *s,</div><div class='add'>+						 const struct pkt_desc *desc, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	unsigned int data_block_count = 0;</div><div class='add'>+	u32 latest_cycle;</div><div class='add'>+	u32 cycle_time;</div><div class='add'>+	u32 curr_cycle;</div><div class='add'>+	u32 cycle_gap;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (count == 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	// Forward to the latest record.</div><div class='add'>+	for (i = 0; i &lt; count - 1; ++i)</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	latest_cycle = desc-&gt;cycle;</div><div class='add'>+</div><div class='add'>+	err = fw_card_read_cycle_time(fw_parent_device(s-&gt;unit)-&gt;card, &amp;cycle_time);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	// Compute cycle count with lower 3 bits of second field and cycle field like timestamp</div><div class='add'>+	// format of 1394 OHCI isochronous context.</div><div class='add'>+	curr_cycle = compute_ohci_iso_ctx_cycle_count((cycle_time &gt;&gt; 12) &amp; 0x0000ffff);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+		// NOTE: The AMDTP packet descriptor should be for the past isochronous cycle since</div><div class='add'>+		// it corresponds to arrived isochronous packet.</div><div class='add'>+		if (compare_ohci_cycle_count(latest_cycle, curr_cycle) &gt; 0)</div><div class='add'>+			goto end;</div><div class='add'>+		cycle_gap = decrement_ohci_cycle_count(curr_cycle, latest_cycle);</div><div class='add'>+</div><div class='add'>+		// NOTE: estimate delay by recent history of arrived AMDTP packets. The estimated</div><div class='add'>+		// value expectedly corresponds to a few packets (0-2) since the packet arrived at</div><div class='add'>+		// the most recent isochronous cycle has been already processed.</div><div class='add'>+		for (i = 0; i &lt; cycle_gap; ++i) {</div><div class='add'>+			desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+			data_block_count += desc-&gt;data_blocks;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		// NOTE: The AMDTP packet descriptor should be for the future isochronous cycle</div><div class='add'>+		// since it was already scheduled.</div><div class='add'>+		if (compare_ohci_cycle_count(latest_cycle, curr_cycle) &lt; 0)</div><div class='add'>+			goto end;</div><div class='add'>+		cycle_gap = decrement_ohci_cycle_count(latest_cycle, curr_cycle);</div><div class='add'>+</div><div class='add'>+		// NOTE: use history of scheduled packets.</div><div class='add'>+		for (i = 0; i &lt; cycle_gap; ++i) {</div><div class='add'>+			data_block_count += desc-&gt;data_blocks;</div><div class='add'>+			desc = prev_packet_desc(s, desc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return data_block_count * s-&gt;pcm_frame_multiplier;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ctx_payloads(struct amdtp_stream *s,</div><div class='add'>+				 const struct pkt_desc *desc,</div><div class='add'>+				 unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	pcm = READ_ONCE(s-&gt;pcm);</div><div class='add'>+	s-&gt;process_ctx_payloads(s, desc, count, pcm);</div><div class='add'>+</div><div class='add'>+	if (pcm) {</div><div class='add'>+		unsigned int data_block_count = 0;</div><div class='add'>+</div><div class='add'>+		pcm-&gt;runtime-&gt;delay = compute_pcm_extra_delay(s, desc, count);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; count; ++i) {</div><div class='add'>+			data_block_count += desc-&gt;data_blocks;</div><div class='add'>+			desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		update_pcm_pointers(s, pcm, data_block_count * s-&gt;pcm_frame_multiplier);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_rx_packets(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+			       void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	const struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	const __be32 *ctx_header = header;</div><div class='add'>+	const unsigned int events_per_period = d-&gt;events_per_period;</div><div class='add'>+	unsigned int event_count = s-&gt;ctx_data.rx.event_count;</div><div class='add'>+	struct pkt_desc *desc = s-&gt;packet_descs_cursor;</div><div class='add'>+	unsigned int pkt_header_length;</div><div class='add'>+	unsigned int packets;</div><div class='add'>+	u32 curr_cycle_time;</div><div class='add'>+	bool need_hw_irq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	// Calculate the number of packets in buffer and check XRUN.</div><div class='add'>+	packets = header_length / sizeof(*ctx_header);</div><div class='add'>+</div><div class='add'>+	generate_rx_packet_descs(s, desc, ctx_header, packets);</div><div class='add'>+</div><div class='add'>+	process_ctx_payloads(s, desc, packets);</div><div class='add'>+</div><div class='add'>+	if (!(s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+		pkt_header_length = IT_PKT_HEADER_SIZE_CIP;</div><div class='add'>+	else</div><div class='add'>+		pkt_header_length = 0;</div><div class='add'>+</div><div class='add'>+	if (s == d-&gt;irq_target) {</div><div class='add'>+		// At NO_PERIOD_WAKEUP mode, the packets for all IT/IR contexts are processed by</div><div class='add'>+		// the tasks of user process operating ALSA PCM character device by calling ioctl(2)</div><div class='add'>+		// with some requests, instead of scheduled hardware IRQ of an IT context.</div><div class='add'>+		struct snd_pcm_substream *pcm = READ_ONCE(s-&gt;pcm);</div><div class='add'>+		need_hw_irq = !pcm || !pcm-&gt;runtime-&gt;no_period_wakeup;</div><div class='add'>+	} else {</div><div class='add'>+		need_hw_irq = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (trace_amdtp_packet_enabled())</div><div class='add'>+		(void)fw_card_read_cycle_time(fw_parent_device(s-&gt;unit)-&gt;card, &amp;curr_cycle_time);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; packets; ++i) {</div><div class='add'>+		DEFINE_RAW_FLEX(struct fw_iso_packet, template, header, CIP_HEADER_QUADLETS);</div><div class='add'>+		bool sched_irq = false;</div><div class='add'>+</div><div class='add'>+		build_it_pkt_header(s, desc-&gt;cycle, template, pkt_header_length,</div><div class='add'>+				    desc-&gt;data_blocks, desc-&gt;data_block_counter,</div><div class='add'>+				    desc-&gt;syt, i, curr_cycle_time);</div><div class='add'>+</div><div class='add'>+		if (s == s-&gt;domain-&gt;irq_target) {</div><div class='add'>+			event_count += desc-&gt;data_blocks;</div><div class='add'>+			if (event_count &gt;= events_per_period) {</div><div class='add'>+				event_count -= events_per_period;</div><div class='add'>+				sched_irq = need_hw_irq;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (queue_out_packet(s, template, sched_irq) &lt; 0) {</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.rx.event_count = event_count;</div><div class='add'>+	s-&gt;packet_descs_cursor = desc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void skip_rx_packets(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+			    void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	const __be32 *ctx_header = header;</div><div class='add'>+	unsigned int packets;</div><div class='add'>+	unsigned int cycle;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	packets = header_length / sizeof(*ctx_header);</div><div class='add'>+</div><div class='add'>+	cycle = compute_ohci_it_cycle(ctx_header[packets - 1], s-&gt;queue_size);</div><div class='add'>+	s-&gt;next_cycle = increment_ohci_cycle_count(cycle, 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; packets; ++i) {</div><div class='add'>+		struct fw_iso_packet params = {</div><div class='add'>+			.header_length = 0,</div><div class='add'>+			.payload_length = 0,</div><div class='add'>+		};</div><div class='add'>+		bool sched_irq = (s == d-&gt;irq_target &amp;&amp; i == packets - 1);</div><div class='add'>+</div><div class='add'>+		if (queue_out_packet(s, &amp;params, sched_irq) &lt; 0) {</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void irq_target_callback(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+				void *header, void *private_data);</div><div class='add'>+</div><div class='add'>+static void process_rx_packets_intermediately(struct fw_iso_context *context, u32 tstamp,</div><div class='add'>+					size_t header_length, void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	__be32 *ctx_header = header;</div><div class='add'>+	const unsigned int queue_size = s-&gt;queue_size;</div><div class='add'>+	unsigned int packets;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	packets = header_length / sizeof(*ctx_header);</div><div class='add'>+</div><div class='add'>+	offset = 0;</div><div class='add'>+	while (offset &lt; packets) {</div><div class='add'>+		unsigned int cycle = compute_ohci_it_cycle(ctx_header[offset], queue_size);</div><div class='add'>+</div><div class='add'>+		if (compare_ohci_cycle_count(cycle, d-&gt;processing_cycle.rx_start) &gt;= 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		++offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset &gt; 0) {</div><div class='add'>+		unsigned int length = sizeof(*ctx_header) * offset;</div><div class='add'>+</div><div class='add'>+		skip_rx_packets(context, tstamp, length, ctx_header, private_data);</div><div class='add'>+		if (amdtp_streaming_error(s))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ctx_header += offset;</div><div class='add'>+		header_length -= length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset &lt; packets) {</div><div class='add'>+		s-&gt;ready_processing = true;</div><div class='add'>+		wake_up(&amp;s-&gt;ready_wait);</div><div class='add'>+</div><div class='add'>+		if (d-&gt;replay.enable)</div><div class='add'>+			s-&gt;ctx_data.rx.cache_pos = 0;</div><div class='add'>+</div><div class='add'>+		process_rx_packets(context, tstamp, header_length, ctx_header, private_data);</div><div class='add'>+		if (amdtp_streaming_error(s))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (s == d-&gt;irq_target)</div><div class='add'>+			s-&gt;context-&gt;callback.sc = irq_target_callback;</div><div class='add'>+		else</div><div class='add'>+			s-&gt;context-&gt;callback.sc = process_rx_packets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_tx_packets(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+			       void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	__be32 *ctx_header = header;</div><div class='add'>+	struct pkt_desc *desc = s-&gt;packet_descs_cursor;</div><div class='add'>+	unsigned int packet_count;</div><div class='add'>+	unsigned int desc_count;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	// Calculate the number of packets in buffer and check XRUN.</div><div class='add'>+	packet_count = header_length / s-&gt;ctx_data.tx.ctx_header_size;</div><div class='add'>+</div><div class='add'>+	desc_count = 0;</div><div class='add'>+	err = generate_tx_packet_descs(s, desc, ctx_header, packet_count, &amp;desc_count);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		if (err != -EAGAIN) {</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+</div><div class='add'>+		process_ctx_payloads(s, desc, desc_count);</div><div class='add'>+</div><div class='add'>+		if (d-&gt;replay.enable)</div><div class='add'>+			cache_seq(s, desc, desc_count);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; desc_count; ++i)</div><div class='add'>+			desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+		s-&gt;packet_descs_cursor = desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; packet_count; ++i) {</div><div class='add'>+		struct fw_iso_packet params = {0};</div><div class='add'>+</div><div class='add'>+		if (queue_in_packet(s, &amp;params) &lt; 0) {</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drop_tx_packets(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+			    void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	const __be32 *ctx_header = header;</div><div class='add'>+	unsigned int packets;</div><div class='add'>+	unsigned int cycle;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	packets = header_length / s-&gt;ctx_data.tx.ctx_header_size;</div><div class='add'>+</div><div class='add'>+	ctx_header += (packets - 1) * s-&gt;ctx_data.tx.ctx_header_size / sizeof(*ctx_header);</div><div class='add'>+	cycle = compute_ohci_cycle_count(ctx_header[1]);</div><div class='add'>+	s-&gt;next_cycle = increment_ohci_cycle_count(cycle, 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; packets; ++i) {</div><div class='add'>+		struct fw_iso_packet params = {0};</div><div class='add'>+</div><div class='add'>+		if (queue_in_packet(s, &amp;params) &lt; 0) {</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_tx_packets_intermediately(struct fw_iso_context *context, u32 tstamp,</div><div class='add'>+					size_t header_length, void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	__be32 *ctx_header;</div><div class='add'>+	unsigned int packets;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	packets = header_length / s-&gt;ctx_data.tx.ctx_header_size;</div><div class='add'>+</div><div class='add'>+	offset = 0;</div><div class='add'>+	ctx_header = header;</div><div class='add'>+	while (offset &lt; packets) {</div><div class='add'>+		unsigned int cycle = compute_ohci_cycle_count(ctx_header[1]);</div><div class='add'>+</div><div class='add'>+		if (compare_ohci_cycle_count(cycle, d-&gt;processing_cycle.tx_start) &gt;= 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ctx_header += s-&gt;ctx_data.tx.ctx_header_size / sizeof(__be32);</div><div class='add'>+		++offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx_header = header;</div><div class='add'>+</div><div class='add'>+	if (offset &gt; 0) {</div><div class='add'>+		size_t length = s-&gt;ctx_data.tx.ctx_header_size * offset;</div><div class='add'>+</div><div class='add'>+		drop_tx_packets(context, tstamp, length, ctx_header, s);</div><div class='add'>+		if (amdtp_streaming_error(s))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ctx_header += length / sizeof(*ctx_header);</div><div class='add'>+		header_length -= length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset &lt; packets) {</div><div class='add'>+		s-&gt;ready_processing = true;</div><div class='add'>+		wake_up(&amp;s-&gt;ready_wait);</div><div class='add'>+</div><div class='add'>+		process_tx_packets(context, tstamp, header_length, ctx_header, s);</div><div class='add'>+		if (amdtp_streaming_error(s))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		context-&gt;callback.sc = process_tx_packets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void drop_tx_packets_initially(struct fw_iso_context *context, u32 tstamp,</div><div class='add'>+				      size_t header_length, void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	__be32 *ctx_header;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned int events;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	count = header_length / s-&gt;ctx_data.tx.ctx_header_size;</div><div class='add'>+</div><div class='add'>+	// Attempt to detect any event in the batch of packets.</div><div class='add'>+	events = 0;</div><div class='add'>+	ctx_header = header;</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		unsigned int payload_quads =</div><div class='add'>+			(be32_to_cpu(*ctx_header) &gt;&gt; ISO_DATA_LENGTH_SHIFT) / sizeof(__be32);</div><div class='add'>+		unsigned int data_blocks;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;flags &amp; CIP_NO_HEADER) {</div><div class='add'>+			data_blocks = payload_quads / s-&gt;data_block_quadlets;</div><div class='add'>+		} else {</div><div class='add'>+			__be32 *cip_headers = ctx_header + IR_CTX_HEADER_DEFAULT_QUADLETS;</div><div class='add'>+</div><div class='add'>+			if (payload_quads &lt; CIP_HEADER_QUADLETS) {</div><div class='add'>+				data_blocks = 0;</div><div class='add'>+			} else {</div><div class='add'>+				payload_quads -= CIP_HEADER_QUADLETS;</div><div class='add'>+</div><div class='add'>+				if (s-&gt;flags &amp; CIP_UNAWARE_SYT) {</div><div class='add'>+					data_blocks = payload_quads / s-&gt;data_block_quadlets;</div><div class='add'>+				} else {</div><div class='add'>+					u32 cip1 = be32_to_cpu(cip_headers[1]);</div><div class='add'>+</div><div class='add'>+					// NODATA packet can includes any data blocks but they are</div><div class='add'>+					// not available as event.</div><div class='add'>+					if ((cip1 &amp; CIP_NO_DATA) == CIP_NO_DATA)</div><div class='add'>+						data_blocks = 0;</div><div class='add'>+					else</div><div class='add'>+						data_blocks = payload_quads / s-&gt;data_block_quadlets;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		events += data_blocks;</div><div class='add'>+</div><div class='add'>+		ctx_header += s-&gt;ctx_data.tx.ctx_header_size / sizeof(__be32);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	drop_tx_packets(context, tstamp, header_length, header, s);</div><div class='add'>+</div><div class='add'>+	if (events &gt; 0)</div><div class='add'>+		s-&gt;ctx_data.tx.event_starts = true;</div><div class='add'>+</div><div class='add'>+	// Decide the cycle count to begin processing content of packet in IR contexts.</div><div class='add'>+	{</div><div class='add'>+		unsigned int stream_count = 0;</div><div class='add'>+		unsigned int event_starts_count = 0;</div><div class='add'>+		unsigned int cycle = UINT_MAX;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+			if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+				++stream_count;</div><div class='add'>+				if (s-&gt;ctx_data.tx.event_starts)</div><div class='add'>+					++event_starts_count;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (stream_count == event_starts_count) {</div><div class='add'>+			unsigned int next_cycle;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+				if (s-&gt;direction != AMDTP_IN_STREAM)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				next_cycle = increment_ohci_cycle_count(s-&gt;next_cycle,</div><div class='add'>+								d-&gt;processing_cycle.tx_init_skip);</div><div class='add'>+				if (cycle == UINT_MAX ||</div><div class='add'>+				    compare_ohci_cycle_count(next_cycle, cycle) &gt; 0)</div><div class='add'>+					cycle = next_cycle;</div><div class='add'>+</div><div class='add'>+				s-&gt;context-&gt;callback.sc = process_tx_packets_intermediately;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			d-&gt;processing_cycle.tx_start = cycle;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ctxs_in_domain(struct amdtp_domain *d)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+		if (s != d-&gt;irq_target &amp;&amp; amdtp_stream_running(s))</div><div class='add'>+			fw_iso_context_flush_completions(s-&gt;context);</div><div class='add'>+</div><div class='add'>+		if (amdtp_streaming_error(s))</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+error:</div><div class='add'>+	if (amdtp_stream_running(d-&gt;irq_target))</div><div class='add'>+		cancel_stream(d-&gt;irq_target);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+		if (amdtp_stream_running(s))</div><div class='add'>+			cancel_stream(s);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void irq_target_callback(struct fw_iso_context *context, u32 tstamp, size_t header_length,</div><div class='add'>+				void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+</div><div class='add'>+	process_rx_packets(context, tstamp, header_length, header, private_data);</div><div class='add'>+	process_ctxs_in_domain(d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void irq_target_callback_intermediately(struct fw_iso_context *context, u32 tstamp,</div><div class='add'>+					size_t header_length, void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+</div><div class='add'>+	process_rx_packets_intermediately(context, tstamp, header_length, header, private_data);</div><div class='add'>+	process_ctxs_in_domain(d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void irq_target_callback_skip(struct fw_iso_context *context, u32 tstamp,</div><div class='add'>+				     size_t header_length, void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+	bool ready_to_start;</div><div class='add'>+</div><div class='add'>+	skip_rx_packets(context, tstamp, header_length, header, private_data);</div><div class='add'>+	process_ctxs_in_domain(d);</div><div class='add'>+</div><div class='add'>+	if (d-&gt;replay.enable &amp;&amp; !d-&gt;replay.on_the_fly) {</div><div class='add'>+		unsigned int rx_count = 0;</div><div class='add'>+		unsigned int rx_ready_count = 0;</div><div class='add'>+		struct amdtp_stream *rx;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(rx, &amp;d-&gt;streams, list) {</div><div class='add'>+			struct amdtp_stream *tx;</div><div class='add'>+			unsigned int cached_cycles;</div><div class='add'>+</div><div class='add'>+			if (rx-&gt;direction != AMDTP_OUT_STREAM)</div><div class='add'>+				continue;</div><div class='add'>+			++rx_count;</div><div class='add'>+</div><div class='add'>+			tx = rx-&gt;ctx_data.rx.replay_target;</div><div class='add'>+			cached_cycles = calculate_cached_cycle_count(tx, 0);</div><div class='add'>+			if (cached_cycles &gt; tx-&gt;ctx_data.tx.cache.size / 2)</div><div class='add'>+				++rx_ready_count;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ready_to_start = (rx_count == rx_ready_count);</div><div class='add'>+	} else {</div><div class='add'>+		ready_to_start = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Decide the cycle count to begin processing content of packet in IT contexts. All of IT</div><div class='add'>+	// contexts are expected to start and get callback when reaching here.</div><div class='add'>+	if (ready_to_start) {</div><div class='add'>+		unsigned int cycle = s-&gt;next_cycle;</div><div class='add'>+		list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+			if (s-&gt;direction != AMDTP_OUT_STREAM)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (compare_ohci_cycle_count(s-&gt;next_cycle, cycle) &gt; 0)</div><div class='add'>+				cycle = s-&gt;next_cycle;</div><div class='add'>+</div><div class='add'>+			if (s == d-&gt;irq_target)</div><div class='add'>+				s-&gt;context-&gt;callback.sc = irq_target_callback_intermediately;</div><div class='add'>+			else</div><div class='add'>+				s-&gt;context-&gt;callback.sc = process_rx_packets_intermediately;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		d-&gt;processing_cycle.rx_start = cycle;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This is executed one time. For in-stream, first packet has come. For out-stream, prepared to</div><div class='add'>+// transmit first packet.</div><div class='add'>+static void amdtp_stream_first_callback(struct fw_iso_context *context,</div><div class='add'>+					u32 tstamp, size_t header_length,</div><div class='add'>+					void *header, void *private_data)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s = private_data;</div><div class='add'>+	struct amdtp_domain *d = s-&gt;domain;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+		context-&gt;callback.sc = drop_tx_packets_initially;</div><div class='add'>+	} else {</div><div class='add'>+		if (s == d-&gt;irq_target)</div><div class='add'>+			context-&gt;callback.sc = irq_target_callback_skip;</div><div class='add'>+		else</div><div class='add'>+			context-&gt;callback.sc = skip_rx_packets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	context-&gt;callback.sc(context, tstamp, header_length, header, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_start - start transferring packets</div><div class='add'>+ * @s: the AMDTP stream to start</div><div class='add'>+ * @channel: the isochronous channel on the bus</div><div class='add'>+ * @speed: firewire speed code</div><div class='add'>+ * @queue_size: The number of packets in the queue.</div><div class='add'>+ * @idle_irq_interval: the interval to queue packet during initial state.</div><div class='add'>+ *</div><div class='add'>+ * The stream cannot be started until it has been configured with</div><div class='add'>+ * amdtp_stream_set_parameters() and it must be started before any PCM or MIDI</div><div class='add'>+ * device can be started.</div><div class='add'>+ */</div><div class='add'>+static int amdtp_stream_start(struct amdtp_stream *s, int channel, int speed,</div><div class='add'>+			      unsigned int queue_size, unsigned int idle_irq_interval)</div><div class='add'>+{</div><div class='add'>+	bool is_irq_target = (s == s-&gt;domain-&gt;irq_target);</div><div class='add'>+	unsigned int ctx_header_size;</div><div class='add'>+	unsigned int max_ctx_payload_size;</div><div class='add'>+	enum dma_data_direction dir;</div><div class='add'>+	struct pkt_desc *descs;</div><div class='add'>+	int i, type, tag, err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;s-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(amdtp_stream_running(s) ||</div><div class='add'>+		    (s-&gt;data_block_quadlets &lt; 1)))</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+		// NOTE: IT context should be used for constant IRQ.</div><div class='add'>+		if (is_irq_target)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		s-&gt;data_block_counter = UINT_MAX;</div><div class='add'>+	} else {</div><div class='add'>+		s-&gt;data_block_counter = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// initialize packet buffer.</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+		dir = DMA_FROM_DEVICE;</div><div class='add'>+		type = FW_ISO_CONTEXT_RECEIVE;</div><div class='add'>+		if (!(s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+			ctx_header_size = IR_CTX_HEADER_SIZE_CIP;</div><div class='add'>+		else</div><div class='add'>+			ctx_header_size = IR_CTX_HEADER_SIZE_NO_CIP;</div><div class='add'>+	} else {</div><div class='add'>+		dir = DMA_TO_DEVICE;</div><div class='add'>+		type = FW_ISO_CONTEXT_TRANSMIT;</div><div class='add'>+		ctx_header_size = 0;	// No effect for IT context.</div><div class='add'>+	}</div><div class='add'>+	max_ctx_payload_size = amdtp_stream_get_max_ctx_payload_size(s);</div><div class='add'>+</div><div class='add'>+	err = iso_packets_buffer_init(&amp;s-&gt;buffer, s-&gt;unit, queue_size, max_ctx_payload_size, dir);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	s-&gt;queue_size = queue_size;</div><div class='add'>+</div><div class='add'>+	s-&gt;context = fw_iso_context_create(fw_parent_device(s-&gt;unit)-&gt;card,</div><div class='add'>+					  type, channel, speed, ctx_header_size,</div><div class='add'>+					  amdtp_stream_first_callback, s);</div><div class='add'>+	if (IS_ERR(s-&gt;context)) {</div><div class='add'>+		err = PTR_ERR(s-&gt;context);</div><div class='add'>+		if (err == -EBUSY)</div><div class='add'>+			dev_err(&amp;s-&gt;unit-&gt;device,</div><div class='add'>+				"no free stream on this controller\n");</div><div class='add'>+		goto err_buffer;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amdtp_stream_update(s);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+		s-&gt;ctx_data.tx.max_ctx_payload_length = max_ctx_payload_size;</div><div class='add'>+		s-&gt;ctx_data.tx.ctx_header_size = ctx_header_size;</div><div class='add'>+		s-&gt;ctx_data.tx.event_starts = false;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;domain-&gt;replay.enable) {</div><div class='add'>+			// struct fw_iso_context.drop_overflow_headers is false therefore it's</div><div class='add'>+			// possible to cache much unexpectedly.</div><div class='add'>+			s-&gt;ctx_data.tx.cache.size = max_t(unsigned int, s-&gt;syt_interval * 2,</div><div class='add'>+							  queue_size * 3 / 2);</div><div class='add'>+			s-&gt;ctx_data.tx.cache.pos = 0;</div><div class='add'>+			s-&gt;ctx_data.tx.cache.descs = kcalloc(s-&gt;ctx_data.tx.cache.size,</div><div class='add'>+						sizeof(*s-&gt;ctx_data.tx.cache.descs), GFP_KERNEL);</div><div class='add'>+			if (!s-&gt;ctx_data.tx.cache.descs) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto err_context;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		static const struct {</div><div class='add'>+			unsigned int data_block;</div><div class='add'>+			unsigned int syt_offset;</div><div class='add'>+		} *entry, initial_state[] = {</div><div class='add'>+			[CIP_SFC_32000]  = {  4, 3072 },</div><div class='add'>+			[CIP_SFC_48000]  = {  6, 1024 },</div><div class='add'>+			[CIP_SFC_96000]  = { 12, 1024 },</div><div class='add'>+			[CIP_SFC_192000] = { 24, 1024 },</div><div class='add'>+			[CIP_SFC_44100]  = {  0,   67 },</div><div class='add'>+			[CIP_SFC_88200]  = {  0,   67 },</div><div class='add'>+			[CIP_SFC_176400] = {  0,   67 },</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		s-&gt;ctx_data.rx.seq.descs = kcalloc(queue_size, sizeof(*s-&gt;ctx_data.rx.seq.descs), GFP_KERNEL);</div><div class='add'>+		if (!s-&gt;ctx_data.rx.seq.descs) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_context;</div><div class='add'>+		}</div><div class='add'>+		s-&gt;ctx_data.rx.seq.size = queue_size;</div><div class='add'>+		s-&gt;ctx_data.rx.seq.pos = 0;</div><div class='add'>+</div><div class='add'>+		entry = &amp;initial_state[s-&gt;sfc];</div><div class='add'>+		s-&gt;ctx_data.rx.data_block_state = entry-&gt;data_block;</div><div class='add'>+		s-&gt;ctx_data.rx.syt_offset_state = entry-&gt;syt_offset;</div><div class='add'>+		s-&gt;ctx_data.rx.last_syt_offset = TICKS_PER_CYCLE;</div><div class='add'>+</div><div class='add'>+		s-&gt;ctx_data.rx.event_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (s-&gt;flags &amp; CIP_NO_HEADER)</div><div class='add'>+		s-&gt;tag = TAG_NO_CIP_HEADER;</div><div class='add'>+	else</div><div class='add'>+		s-&gt;tag = TAG_CIP;</div><div class='add'>+</div><div class='add'>+	// NOTE: When operating without hardIRQ/softIRQ, applications tends to call ioctl request</div><div class='add'>+	// for runtime of PCM substream in the interval equivalent to the size of PCM buffer. It</div><div class='add'>+	// could take a round over queue of AMDTP packet descriptors and small loss of history. For</div><div class='add'>+	// safe, keep more 8 elements for the queue, equivalent to 1 ms.</div><div class='add'>+	descs = kcalloc(s-&gt;queue_size + 8, sizeof(*descs), GFP_KERNEL);</div><div class='add'>+	if (!descs) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_context;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;packet_descs = descs;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;s-&gt;packet_descs_list);</div><div class='add'>+	for (i = 0; i &lt; s-&gt;queue_size; ++i) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;descs-&gt;link);</div><div class='add'>+		list_add_tail(&amp;descs-&gt;link, &amp;s-&gt;packet_descs_list);</div><div class='add'>+		++descs;</div><div class='add'>+	}</div><div class='add'>+	s-&gt;packet_descs_cursor = list_first_entry(&amp;s-&gt;packet_descs_list, struct pkt_desc, link);</div><div class='add'>+</div><div class='add'>+	s-&gt;packet_index = 0;</div><div class='add'>+	do {</div><div class='add'>+		struct fw_iso_packet params;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+			err = queue_in_packet(s, &amp;params);</div><div class='add'>+		} else {</div><div class='add'>+			bool sched_irq = false;</div><div class='add'>+</div><div class='add'>+			params.header_length = 0;</div><div class='add'>+			params.payload_length = 0;</div><div class='add'>+</div><div class='add'>+			if (is_irq_target) {</div><div class='add'>+				sched_irq = !((s-&gt;packet_index + 1) %</div><div class='add'>+					      idle_irq_interval);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			err = queue_out_packet(s, &amp;params, sched_irq);</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_pkt_descs;</div><div class='add'>+	} while (s-&gt;packet_index &gt; 0);</div><div class='add'>+</div><div class='add'>+	/* NOTE: TAG1 matches CIP. This just affects in stream. */</div><div class='add'>+	tag = FW_ISO_CONTEXT_MATCH_TAG1;</div><div class='add'>+	if ((s-&gt;flags &amp; CIP_EMPTY_WITH_TAG0) || (s-&gt;flags &amp; CIP_NO_HEADER))</div><div class='add'>+		tag |= FW_ISO_CONTEXT_MATCH_TAG0;</div><div class='add'>+</div><div class='add'>+	s-&gt;ready_processing = false;</div><div class='add'>+	err = fw_iso_context_start(s-&gt;context, -1, 0, tag);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_pkt_descs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_pkt_descs:</div><div class='add'>+	kfree(s-&gt;packet_descs);</div><div class='add'>+	s-&gt;packet_descs = NULL;</div><div class='add'>+err_context:</div><div class='add'>+	if (s-&gt;direction == AMDTP_OUT_STREAM) {</div><div class='add'>+		kfree(s-&gt;ctx_data.rx.seq.descs);</div><div class='add'>+	} else {</div><div class='add'>+		if (s-&gt;domain-&gt;replay.enable)</div><div class='add'>+			kfree(s-&gt;ctx_data.tx.cache.descs);</div><div class='add'>+	}</div><div class='add'>+	fw_iso_context_destroy(s-&gt;context);</div><div class='add'>+	s-&gt;context = ERR_PTR(-1);</div><div class='add'>+err_buffer:</div><div class='add'>+	iso_packets_buffer_destroy(&amp;s-&gt;buffer, s-&gt;unit);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_stream_pcm_pointer - get the PCM buffer position</div><div class='add'>+ * @d: the AMDTP domain.</div><div class='add'>+ * @s: the AMDTP stream that transports the PCM data</div><div class='add'>+ *</div><div class='add'>+ * Returns the current buffer position, in frames.</div><div class='add'>+ */</div><div class='add'>+unsigned long amdtp_domain_stream_pcm_pointer(struct amdtp_domain *d,</div><div class='add'>+					      struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *irq_target = d-&gt;irq_target;</div><div class='add'>+</div><div class='add'>+	if (irq_target &amp;&amp; amdtp_stream_running(irq_target)) {</div><div class='add'>+		// The work item to call snd_pcm_period_elapsed() can reach here by the call of</div><div class='add'>+		// snd_pcm_ops.pointer(), however less packets would be available then. Therefore</div><div class='add'>+		// the following call is just for user process contexts.</div><div class='add'>+		if (current_work() != &amp;s-&gt;period_work)</div><div class='add'>+			fw_iso_context_flush_completions(irq_target-&gt;context);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return READ_ONCE(s-&gt;pcm_buffer_pointer);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_stream_pcm_pointer);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_stream_pcm_ack - acknowledge queued PCM frames</div><div class='add'>+ * @d: the AMDTP domain.</div><div class='add'>+ * @s: the AMDTP stream that transfers the PCM frames</div><div class='add'>+ *</div><div class='add'>+ * Returns zero always.</div><div class='add'>+ */</div><div class='add'>+int amdtp_domain_stream_pcm_ack(struct amdtp_domain *d, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *irq_target = d-&gt;irq_target;</div><div class='add'>+</div><div class='add'>+	// Process isochronous packets for recent isochronous cycle to handle</div><div class='add'>+	// queued PCM frames.</div><div class='add'>+	if (irq_target &amp;&amp; amdtp_stream_running(irq_target))</div><div class='add'>+		fw_iso_context_flush_completions(irq_target-&gt;context);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_stream_pcm_ack);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_update - update the stream after a bus reset</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ */</div><div class='add'>+void amdtp_stream_update(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	/* Precomputing. */</div><div class='add'>+	WRITE_ONCE(s-&gt;source_node_id_field,</div><div class='add'>+                   (fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id &lt;&lt; CIP_SID_SHIFT) &amp; CIP_SID_MASK);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_update);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_stop - stop sending packets</div><div class='add'>+ * @s: the AMDTP stream to stop</div><div class='add'>+ *</div><div class='add'>+ * All PCM and MIDI devices of the stream must be stopped before the stream</div><div class='add'>+ * itself can be stopped.</div><div class='add'>+ */</div><div class='add'>+static void amdtp_stream_stop(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;s-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(s))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;s-&gt;period_work);</div><div class='add'>+	fw_iso_context_stop(s-&gt;context);</div><div class='add'>+	fw_iso_context_destroy(s-&gt;context);</div><div class='add'>+	s-&gt;context = ERR_PTR(-1);</div><div class='add'>+	iso_packets_buffer_destroy(&amp;s-&gt;buffer, s-&gt;unit);</div><div class='add'>+	kfree(s-&gt;packet_descs);</div><div class='add'>+	s-&gt;packet_descs = NULL;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;direction == AMDTP_OUT_STREAM) {</div><div class='add'>+		kfree(s-&gt;ctx_data.rx.seq.descs);</div><div class='add'>+	} else {</div><div class='add'>+		if (s-&gt;domain-&gt;replay.enable)</div><div class='add'>+			kfree(s-&gt;ctx_data.tx.cache.descs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_pcm_abort - abort the running PCM device</div><div class='add'>+ * @s: the AMDTP stream about to be stopped</div><div class='add'>+ *</div><div class='add'>+ * If the isochronous stream needs to be stopped asynchronously, call this</div><div class='add'>+ * function first to stop the PCM device.</div><div class='add'>+ */</div><div class='add'>+void amdtp_stream_pcm_abort(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+</div><div class='add'>+	pcm = READ_ONCE(s-&gt;pcm);</div><div class='add'>+	if (pcm)</div><div class='add'>+		snd_pcm_stop_xrun(pcm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(amdtp_stream_pcm_abort);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_init - initialize an AMDTP domain structure</div><div class='add'>+ * @d: the AMDTP domain to initialize.</div><div class='add'>+ */</div><div class='add'>+int amdtp_domain_init(struct amdtp_domain *d)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;d-&gt;streams);</div><div class='add'>+</div><div class='add'>+	d-&gt;events_per_period = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_destroy - destroy an AMDTP domain structure</div><div class='add'>+ * @d: the AMDTP domain to destroy.</div><div class='add'>+ */</div><div class='add'>+void amdtp_domain_destroy(struct amdtp_domain *d)</div><div class='add'>+{</div><div class='add'>+	// At present nothing to do.</div><div class='add'>+	return;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_destroy);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_add_stream - register isoc context into the domain.</div><div class='add'>+ * @d: the AMDTP domain.</div><div class='add'>+ * @s: the AMDTP stream.</div><div class='add'>+ * @channel: the isochronous channel on the bus.</div><div class='add'>+ * @speed: firewire speed code.</div><div class='add'>+ */</div><div class='add'>+int amdtp_domain_add_stream(struct amdtp_domain *d, struct amdtp_stream *s,</div><div class='add'>+			    int channel, int speed)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;d-&gt;streams, list) {</div><div class='add'>+		if (s == tmp)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;s-&gt;list, &amp;d-&gt;streams);</div><div class='add'>+</div><div class='add'>+	s-&gt;channel = channel;</div><div class='add'>+	s-&gt;speed = speed;</div><div class='add'>+	s-&gt;domain = d;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_add_stream);</div><div class='add'>+</div><div class='add'>+// Make the reference from rx stream to tx stream for sequence replay. When the number of tx streams</div><div class='add'>+// is less than the number of rx streams, the first tx stream is selected.</div><div class='add'>+static int make_association(struct amdtp_domain *d)</div><div class='add'>+{</div><div class='add'>+	unsigned int dst_index = 0;</div><div class='add'>+	struct amdtp_stream *rx;</div><div class='add'>+</div><div class='add'>+	// Make association to replay target.</div><div class='add'>+	list_for_each_entry(rx, &amp;d-&gt;streams, list) {</div><div class='add'>+		if (rx-&gt;direction == AMDTP_OUT_STREAM) {</div><div class='add'>+			unsigned int src_index = 0;</div><div class='add'>+			struct amdtp_stream *tx = NULL;</div><div class='add'>+			struct amdtp_stream *s;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+				if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+					if (dst_index == src_index) {</div><div class='add'>+						tx = s;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					++src_index;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (!tx) {</div><div class='add'>+				// Select the first entry.</div><div class='add'>+				list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+					if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+						tx = s;</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				// No target is available to replay sequence.</div><div class='add'>+				if (!tx)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rx-&gt;ctx_data.rx.replay_target = tx;</div><div class='add'>+</div><div class='add'>+			++dst_index;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_start - start sending packets for isoc context in the domain.</div><div class='add'>+ * @d: the AMDTP domain.</div><div class='add'>+ * @tx_init_skip_cycles: the number of cycles to skip processing packets at initial stage of IR</div><div class='add'>+ *			 contexts.</div><div class='add'>+ * @replay_seq: whether to replay the sequence of packet in IR context for the sequence of packet in</div><div class='add'>+ *		IT context.</div><div class='add'>+ * @replay_on_the_fly: transfer rx packets according to nominal frequency, then begin to replay</div><div class='add'>+ *		       according to arrival of events in tx packets.</div><div class='add'>+ */</div><div class='add'>+int amdtp_domain_start(struct amdtp_domain *d, unsigned int tx_init_skip_cycles, bool replay_seq,</div><div class='add'>+		       bool replay_on_the_fly)</div><div class='add'>+{</div><div class='add'>+	unsigned int events_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+	unsigned int events_per_period = d-&gt;events_per_period;</div><div class='add'>+	unsigned int queue_size;</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+	bool found = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (replay_seq) {</div><div class='add'>+		err = make_association(d);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	d-&gt;replay.enable = replay_seq;</div><div class='add'>+	d-&gt;replay.on_the_fly = replay_on_the_fly;</div><div class='add'>+</div><div class='add'>+	// Select an IT context as IRQ target.</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+		if (s-&gt;direction == AMDTP_OUT_STREAM) {</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!found)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	d-&gt;irq_target = s;</div><div class='add'>+</div><div class='add'>+	d-&gt;processing_cycle.tx_init_skip = tx_init_skip_cycles;</div><div class='add'>+</div><div class='add'>+	// This is a case that AMDTP streams in domain run just for MIDI</div><div class='add'>+	// substream. Use the number of events equivalent to 10 msec as</div><div class='add'>+	// interval of hardware IRQ.</div><div class='add'>+	if (events_per_period == 0)</div><div class='add'>+		events_per_period = amdtp_rate_table[d-&gt;irq_target-&gt;sfc] / 100;</div><div class='add'>+	if (events_per_buffer == 0)</div><div class='add'>+		events_per_buffer = events_per_period * 3;</div><div class='add'>+</div><div class='add'>+	queue_size = DIV_ROUND_UP(CYCLES_PER_SECOND * events_per_buffer,</div><div class='add'>+				  amdtp_rate_table[d-&gt;irq_target-&gt;sfc]);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+		unsigned int idle_irq_interval = 0;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;direction == AMDTP_OUT_STREAM &amp;&amp; s == d-&gt;irq_target) {</div><div class='add'>+			idle_irq_interval = DIV_ROUND_UP(CYCLES_PER_SECOND * events_per_period,</div><div class='add'>+							 amdtp_rate_table[d-&gt;irq_target-&gt;sfc]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Starts immediately but actually DMA context starts several hundred cycles later.</div><div class='add'>+		err = amdtp_stream_start(s, s-&gt;channel, s-&gt;speed, queue_size, idle_irq_interval);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list)</div><div class='add'>+		amdtp_stream_stop(s);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_start);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_stop - stop sending packets for isoc context in the same domain.</div><div class='add'>+ * @d: the AMDTP domain to which the isoc contexts belong.</div><div class='add'>+ */</div><div class='add'>+void amdtp_domain_stop(struct amdtp_domain *d)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s, *next;</div><div class='add'>+</div><div class='add'>+	if (d-&gt;irq_target)</div><div class='add'>+		amdtp_stream_stop(d-&gt;irq_target);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(s, next, &amp;d-&gt;streams, list) {</div><div class='add'>+		list_del(&amp;s-&gt;list);</div><div class='add'>+</div><div class='add'>+		if (s != d-&gt;irq_target)</div><div class='add'>+			amdtp_stream_stop(s);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	d-&gt;events_per_period = 0;</div><div class='add'>+	d-&gt;irq_target = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(amdtp_domain_stop);</div><div class='head'>diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h<br/>new file mode 100644<br/>index 000000000000..ec10270c2cce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/amdtp-stream.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/amdtp-stream.h</a></div><div class='hunk'>@@ -0,0 +1,372 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_AMDTP_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_AMDTP_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;sound/asound.h&gt;</div><div class='add'>+#include "packets-buffer.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum cip_flags - describes details of the streaming protocol</div><div class='add'>+ * @CIP_NONBLOCKING: In non-blocking mode, each packet contains</div><div class='add'>+ *	sample_rate/8000 samples, with rounding up or down to adjust</div><div class='add'>+ *	for clock skew and left-over fractional samples.  This should</div><div class='add'>+ *	be used if supported by the device.</div><div class='add'>+ * @CIP_BLOCKING: In blocking mode, each packet contains either zero or</div><div class='add'>+ *	SYT_INTERVAL samples, with these two types alternating so that</div><div class='add'>+ *	the overall sample rate comes out right.</div><div class='add'>+ * @CIP_EMPTY_WITH_TAG0: Only for in-stream. Empty in-packets have TAG0.</div><div class='add'>+ * @CIP_DBC_IS_END_EVENT: The value of dbc in an packet corresponds to the end</div><div class='add'>+ * of event in the packet. Out of IEC 61883.</div><div class='add'>+ * @CIP_WRONG_DBS: Only for in-stream. The value of dbs is wrong in in-packets.</div><div class='add'>+ *	The value of data_block_quadlets is used instead of reported value.</div><div class='add'>+ * @CIP_SKIP_DBC_ZERO_CHECK: Only for in-stream.  Packets with zero in dbc is</div><div class='add'>+ *	skipped for detecting discontinuity.</div><div class='add'>+ * @CIP_EMPTY_HAS_WRONG_DBC: Only for in-stream. The value of dbc in empty</div><div class='add'>+ *	packet is wrong but the others are correct.</div><div class='add'>+ * @CIP_JUMBO_PAYLOAD: Only for in-stream. The number of data blocks in an</div><div class='add'>+ *	packet is larger than IEC 61883-6 defines. Current implementation</div><div class='add'>+ *	allows 5 times as large as IEC 61883-6 defines.</div><div class='add'>+ * @CIP_HEADER_WITHOUT_EOH: Only for in-stream. CIP Header doesn't include</div><div class='add'>+ *	valid EOH.</div><div class='add'>+ * @CIP_NO_HEADER: a lack of headers in packets</div><div class='add'>+ * @CIP_UNALIGHED_DBC: Only for in-stream. The value of dbc is not alighed to</div><div class='add'>+ *	the value of current SYT_INTERVAL; e.g. initial value is not zero.</div><div class='add'>+ * @CIP_UNAWARE_SYT: For outgoing packet, the value in SYT field of CIP is 0xffff.</div><div class='add'>+ *	For incoming packet, the value in SYT field of CIP is not handled.</div><div class='add'>+ * @CIP_DBC_IS_PAYLOAD_QUADLETS: Available for incoming packet, and only effective with</div><div class='add'>+ *	CIP_DBC_IS_END_EVENT flag. The value of dbc field is the number of accumulated quadlets</div><div class='add'>+ *	in CIP payload, instead of the number of accumulated data blocks.</div><div class='add'>+ */</div><div class='add'>+enum cip_flags {</div><div class='add'>+	CIP_NONBLOCKING		= 0x00,</div><div class='add'>+	CIP_BLOCKING		= 0x01,</div><div class='add'>+	CIP_EMPTY_WITH_TAG0	= 0x02,</div><div class='add'>+	CIP_DBC_IS_END_EVENT	= 0x04,</div><div class='add'>+	CIP_WRONG_DBS		= 0x08,</div><div class='add'>+	CIP_SKIP_DBC_ZERO_CHECK	= 0x10,</div><div class='add'>+	CIP_EMPTY_HAS_WRONG_DBC	= 0x20,</div><div class='add'>+	CIP_JUMBO_PAYLOAD	= 0x40,</div><div class='add'>+	CIP_HEADER_WITHOUT_EOH	= 0x80,</div><div class='add'>+	CIP_NO_HEADER		= 0x100,</div><div class='add'>+	CIP_UNALIGHED_DBC	= 0x200,</div><div class='add'>+	CIP_UNAWARE_SYT		= 0x400,</div><div class='add'>+	CIP_DBC_IS_PAYLOAD_QUADLETS = 0x800,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum cip_sfc - supported Sampling Frequency Codes (SFCs)</div><div class='add'>+ * @CIP_SFC_32000:   32,000 data blocks</div><div class='add'>+ * @CIP_SFC_44100:   44,100 data blocks</div><div class='add'>+ * @CIP_SFC_48000:   48,000 data blocks</div><div class='add'>+ * @CIP_SFC_88200:   88,200 data blocks</div><div class='add'>+ * @CIP_SFC_96000:   96,000 data blocks</div><div class='add'>+ * @CIP_SFC_176400: 176,400 data blocks</div><div class='add'>+ * @CIP_SFC_192000: 192,000 data blocks</div><div class='add'>+ * @CIP_SFC_COUNT: the number of supported SFCs</div><div class='add'>+ *</div><div class='add'>+ * These values are used to show nominal Sampling Frequency Code in</div><div class='add'>+ * Format Dependent Field (FDF) of AMDTP packet header. In IEC 61883-6:2002,</div><div class='add'>+ * this code means the number of events per second. Actually the code</div><div class='add'>+ * represents the number of data blocks transferred per second in an AMDTP</div><div class='add'>+ * stream.</div><div class='add'>+ *</div><div class='add'>+ * In IEC 61883-6:2005, some extensions were added to support more types of</div><div class='add'>+ * data such as 'One Bit LInear Audio', therefore the meaning of SFC became</div><div class='add'>+ * different depending on the types.</div><div class='add'>+ *</div><div class='add'>+ * Currently our implementation is compatible with IEC 61883-6:2002.</div><div class='add'>+ */</div><div class='add'>+enum cip_sfc {</div><div class='add'>+	CIP_SFC_32000  = 0,</div><div class='add'>+	CIP_SFC_44100  = 1,</div><div class='add'>+	CIP_SFC_48000  = 2,</div><div class='add'>+	CIP_SFC_88200  = 3,</div><div class='add'>+	CIP_SFC_96000  = 4,</div><div class='add'>+	CIP_SFC_176400 = 5,</div><div class='add'>+	CIP_SFC_192000 = 6,</div><div class='add'>+	CIP_SFC_COUNT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fw_unit;</div><div class='add'>+struct fw_iso_context;</div><div class='add'>+struct snd_pcm_substream;</div><div class='add'>+struct snd_pcm_runtime;</div><div class='add'>+</div><div class='add'>+enum amdtp_stream_direction {</div><div class='add'>+	AMDTP_OUT_STREAM = 0,</div><div class='add'>+	AMDTP_IN_STREAM</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pkt_desc {</div><div class='add'>+	u32 cycle;</div><div class='add'>+	u32 syt;</div><div class='add'>+	unsigned int data_blocks;</div><div class='add'>+	unsigned int data_block_counter;</div><div class='add'>+	__be32 *ctx_payload;</div><div class='add'>+	struct list_head link;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct amdtp_stream;</div><div class='add'>+typedef void (*amdtp_stream_process_ctx_payloads_t)(struct amdtp_stream *s,</div><div class='add'>+						    const struct pkt_desc *desc,</div><div class='add'>+						    unsigned int count,</div><div class='add'>+						    struct snd_pcm_substream *pcm);</div><div class='add'>+</div><div class='add'>+struct amdtp_domain;</div><div class='add'>+struct amdtp_stream {</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	// The combination of cip_flags enumeration-constants.</div><div class='add'>+	unsigned int flags;</div><div class='add'>+	enum amdtp_stream_direction direction;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* For packet processing. */</div><div class='add'>+	struct fw_iso_context *context;</div><div class='add'>+	struct iso_packets_buffer buffer;</div><div class='add'>+	unsigned int queue_size;</div><div class='add'>+	int packet_index;</div><div class='add'>+	struct pkt_desc *packet_descs;</div><div class='add'>+	struct list_head packet_descs_list;</div><div class='add'>+	struct pkt_desc *packet_descs_cursor;</div><div class='add'>+	int tag;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int ctx_header_size;</div><div class='add'>+</div><div class='add'>+			// limit for payload of iso packet.</div><div class='add'>+			unsigned int max_ctx_payload_length;</div><div class='add'>+</div><div class='add'>+			// For quirks of CIP headers.</div><div class='add'>+			// Fixed interval of dbc between previos/current</div><div class='add'>+			// packets.</div><div class='add'>+			unsigned int dbc_interval;</div><div class='add'>+</div><div class='add'>+			// The device starts multiplexing events to the packet.</div><div class='add'>+			bool event_starts;</div><div class='add'>+</div><div class='add'>+			struct {</div><div class='add'>+				struct seq_desc *descs;</div><div class='add'>+				unsigned int size;</div><div class='add'>+				unsigned int pos;</div><div class='add'>+			} cache;</div><div class='add'>+		} tx;</div><div class='add'>+		struct {</div><div class='add'>+			// To generate CIP header.</div><div class='add'>+			unsigned int fdf;</div><div class='add'>+</div><div class='add'>+			// To generate constant hardware IRQ.</div><div class='add'>+			unsigned int event_count;</div><div class='add'>+</div><div class='add'>+			// To calculate CIP data blocks and tstamp.</div><div class='add'>+			struct {</div><div class='add'>+				struct seq_desc *descs;</div><div class='add'>+				unsigned int size;</div><div class='add'>+				unsigned int pos;</div><div class='add'>+			} seq;</div><div class='add'>+</div><div class='add'>+			unsigned int data_block_state;</div><div class='add'>+			unsigned int syt_offset_state;</div><div class='add'>+			unsigned int last_syt_offset;</div><div class='add'>+</div><div class='add'>+			struct amdtp_stream *replay_target;</div><div class='add'>+			unsigned int cache_pos;</div><div class='add'>+		} rx;</div><div class='add'>+	} ctx_data;</div><div class='add'>+</div><div class='add'>+	/* For CIP headers. */</div><div class='add'>+	unsigned int source_node_id_field;</div><div class='add'>+	unsigned int data_block_quadlets;</div><div class='add'>+	unsigned int data_block_counter;</div><div class='add'>+	unsigned int sph;</div><div class='add'>+	unsigned int fmt;</div><div class='add'>+</div><div class='add'>+	// Internal flags.</div><div class='add'>+	unsigned int transfer_delay;</div><div class='add'>+	enum cip_sfc sfc;</div><div class='add'>+	unsigned int syt_interval;</div><div class='add'>+</div><div class='add'>+	/* For a PCM substream processing. */</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+	struct work_struct period_work;</div><div class='add'>+	snd_pcm_uframes_t pcm_buffer_pointer;</div><div class='add'>+	unsigned int pcm_period_pointer;</div><div class='add'>+	unsigned int pcm_frame_multiplier;</div><div class='add'>+</div><div class='add'>+	// To start processing content of packets at the same cycle in several contexts for</div><div class='add'>+	// each direction.</div><div class='add'>+	bool ready_processing;</div><div class='add'>+	wait_queue_head_t ready_wait;</div><div class='add'>+	unsigned int next_cycle;</div><div class='add'>+</div><div class='add'>+	/* For backends to process data blocks. */</div><div class='add'>+	void *protocol;</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	// For domain.</div><div class='add'>+	int channel;</div><div class='add'>+	int speed;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct amdtp_domain *domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		      enum amdtp_stream_direction dir, unsigned int flags,</div><div class='add'>+		      unsigned int fmt,</div><div class='add'>+		      amdtp_stream_process_ctx_payloads_t process_ctx_payloads,</div><div class='add'>+		      unsigned int protocol_size);</div><div class='add'>+void amdtp_stream_destroy(struct amdtp_stream *s);</div><div class='add'>+</div><div class='add'>+int amdtp_stream_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+				unsigned int data_block_quadlets, unsigned int pcm_frame_multiplier);</div><div class='add'>+unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s);</div><div class='add'>+</div><div class='add'>+void amdtp_stream_update(struct amdtp_stream *s);</div><div class='add'>+</div><div class='add'>+int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+					struct snd_pcm_runtime *runtime);</div><div class='add'>+</div><div class='add'>+void amdtp_stream_pcm_prepare(struct amdtp_stream *s);</div><div class='add'>+void amdtp_stream_pcm_abort(struct amdtp_stream *s);</div><div class='add'>+</div><div class='add'>+extern const unsigned int amdtp_syt_intervals[CIP_SFC_COUNT];</div><div class='add'>+extern const unsigned int amdtp_rate_table[CIP_SFC_COUNT];</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_running - check stream is running or not</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ *</div><div class='add'>+ * If this function returns true, the stream is running.</div><div class='add'>+ */</div><div class='add'>+static inline bool amdtp_stream_running(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	return !IS_ERR(s-&gt;context);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_streaming_error - check for streaming error</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ *</div><div class='add'>+ * If this function returns true, the stream's packet queue has stopped due to</div><div class='add'>+ * an asynchronous error.</div><div class='add'>+ */</div><div class='add'>+static inline bool amdtp_streaming_error(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	return s-&gt;packet_index &lt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_pcm_running - check PCM substream is running or not</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ *</div><div class='add'>+ * If this function returns true, PCM substream in the AMDTP stream is running.</div><div class='add'>+ */</div><div class='add'>+static inline bool amdtp_stream_pcm_running(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	return !!s-&gt;pcm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_pcm_trigger - start/stop playback from a PCM device</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ * @pcm: the PCM device to be started, or %NULL to stop the current device</div><div class='add'>+ *</div><div class='add'>+ * Call this function on a running isochronous stream to enable the actual</div><div class='add'>+ * transmission of PCM data.  This function should be called from the PCM</div><div class='add'>+ * device's .trigger callback.</div><div class='add'>+ */</div><div class='add'>+static inline void amdtp_stream_pcm_trigger(struct amdtp_stream *s,</div><div class='add'>+					    struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	WRITE_ONCE(s-&gt;pcm, pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_stream_next_packet_desc - retrieve next descriptor for amdtp packet.</div><div class='add'>+ * @s: the AMDTP stream</div><div class='add'>+ * @desc: the descriptor of packet</div><div class='add'>+ *</div><div class='add'>+ * This macro computes next descriptor so that the list of descriptors behaves circular queue.</div><div class='add'>+ */</div><div class='add'>+#define amdtp_stream_next_packet_desc(s, desc) \</div><div class='add'>+	list_next_entry_circular(desc, &amp;s-&gt;packet_descs_list, link)</div><div class='add'>+</div><div class='add'>+static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)</div><div class='add'>+{</div><div class='add'>+	return sfc &amp; 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct seq_desc {</div><div class='add'>+	unsigned int syt_offset;</div><div class='add'>+	unsigned int data_blocks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct amdtp_domain {</div><div class='add'>+	struct list_head streams;</div><div class='add'>+</div><div class='add'>+	unsigned int events_per_period;</div><div class='add'>+	unsigned int events_per_buffer;</div><div class='add'>+</div><div class='add'>+	struct amdtp_stream *irq_target;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		unsigned int tx_init_skip;</div><div class='add'>+		unsigned int tx_start;</div><div class='add'>+		unsigned int rx_start;</div><div class='add'>+	} processing_cycle;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		bool enable:1;</div><div class='add'>+		bool on_the_fly:1;</div><div class='add'>+	} replay;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_domain_init(struct amdtp_domain *d);</div><div class='add'>+void amdtp_domain_destroy(struct amdtp_domain *d);</div><div class='add'>+</div><div class='add'>+int amdtp_domain_add_stream(struct amdtp_domain *d, struct amdtp_stream *s,</div><div class='add'>+			    int channel, int speed);</div><div class='add'>+</div><div class='add'>+int amdtp_domain_start(struct amdtp_domain *d, unsigned int tx_init_skip_cycles, bool replay_seq,</div><div class='add'>+		       bool replay_on_the_fly);</div><div class='add'>+void amdtp_domain_stop(struct amdtp_domain *d);</div><div class='add'>+</div><div class='add'>+static inline int amdtp_domain_set_events_per_period(struct amdtp_domain *d,</div><div class='add'>+						unsigned int events_per_period,</div><div class='add'>+						unsigned int events_per_buffer)</div><div class='add'>+{</div><div class='add'>+	d-&gt;events_per_period = events_per_period;</div><div class='add'>+	d-&gt;events_per_buffer = events_per_buffer;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned long amdtp_domain_stream_pcm_pointer(struct amdtp_domain *d,</div><div class='add'>+					      struct amdtp_stream *s);</div><div class='add'>+int amdtp_domain_stream_pcm_ack(struct amdtp_domain *d, struct amdtp_stream *s);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * amdtp_domain_wait_ready - sleep till being ready to process packets or timeout</div><div class='add'>+ * @d: the AMDTP domain</div><div class='add'>+ * @timeout_ms: msec till timeout</div><div class='add'>+ *</div><div class='add'>+ * If this function return false, the AMDTP domain should be stopped.</div><div class='add'>+ */</div><div class='add'>+static inline bool amdtp_domain_wait_ready(struct amdtp_domain *d, unsigned int timeout_ms)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;d-&gt;streams, list) {</div><div class='add'>+		unsigned int j = msecs_to_jiffies(timeout_ms);</div><div class='add'>+</div><div class='add'>+		if (wait_event_interruptible_timeout(s-&gt;ready_wait, s-&gt;ready_processing, j) &lt;= 0)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/bebob/Makefile b/sound/firewire/bebob/Makefile<br/>new file mode 100644<br/>index 000000000000..b913e805bd7a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-bebob-y := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \</div><div class='add'>+		  bebob_pcm.o bebob_hwdep.o bebob_terratec.o \</div><div class='add'>+		  bebob_yamaha_terratec.o bebob_focusrite.o bebob_maudio.o \</div><div class='add'>+		  bebob.o</div><div class='add'>+obj-$(CONFIG_SND_BEBOB) += snd-bebob.o</div><div class='head'>diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c<br/>new file mode 100644<br/>index 000000000000..01e2c4cc03d4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob.c</a></div><div class='hunk'>@@ -0,0 +1,510 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BeBoB is 'BridgeCo enhanced Breakout Box'. This is installed to firewire</div><div class='add'>+ * devices with DM1000/DM1100/DM1500 chipset. It gives common way for host</div><div class='add'>+ * system to handle BeBoB based devices.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bebob.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("BridgeCo BeBoB driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int index[SNDRV_CARDS]	= SNDRV_DEFAULT_IDX;</div><div class='add'>+static char *id[SNDRV_CARDS]	= SNDRV_DEFAULT_STR;</div><div class='add'>+static bool enable[SNDRV_CARDS]	= SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "card index");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "enable BeBoB sound card");</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(devices_mutex);</div><div class='add'>+static DECLARE_BITMAP(devices_used, SNDRV_CARDS);</div><div class='add'>+</div><div class='add'>+/* Offsets from information register. */</div><div class='add'>+#define INFO_OFFSET_BEBOB_VERSION	0x08</div><div class='add'>+#define INFO_OFFSET_GUID		0x10</div><div class='add'>+#define INFO_OFFSET_HW_MODEL_ID		0x18</div><div class='add'>+#define INFO_OFFSET_HW_MODEL_REVISION	0x1c</div><div class='add'>+</div><div class='add'>+#define VEN_EDIROL	0x000040ab</div><div class='add'>+#define VEN_PRESONUS	0x00000a92</div><div class='add'>+#define VEN_BRIDGECO	0x000007f5</div><div class='add'>+#define VEN_MACKIE	0x00000ff2</div><div class='add'>+#define VEN_STANTON	0x00001260</div><div class='add'>+#define VEN_TASCAM	0x0000022e</div><div class='add'>+#define VEN_BEHRINGER	0x00001564</div><div class='add'>+#define VEN_APOGEE	0x000003db</div><div class='add'>+#define VEN_ESI		0x00000f1b</div><div class='add'>+#define VEN_CME		0x0000000a</div><div class='add'>+#define VEN_PHONIC	0x00001496</div><div class='add'>+#define VEN_LYNX	0x000019e5</div><div class='add'>+#define VEN_ICON	0x00001a9e</div><div class='add'>+#define VEN_PRISMSOUND	0x00001198</div><div class='add'>+#define VEN_TERRATEC	0x00000aac</div><div class='add'>+#define VEN_YAMAHA	0x0000a0de</div><div class='add'>+#define VEN_FOCUSRITE	0x0000130e</div><div class='add'>+#define VEN_MAUDIO	0x00000d6c</div><div class='add'>+#define VEN_DIGIDESIGN	0x00a07e</div><div class='add'>+#define OUI_SHOUYO	0x002327</div><div class='add'>+</div><div class='add'>+#define MODEL_FOCUSRITE_SAFFIRE_BOTH	0x00000000</div><div class='add'>+#define MODEL_MAUDIO_AUDIOPHILE_BOTH	0x00010060</div><div class='add'>+#define MODEL_MAUDIO_FW1814		0x00010071</div><div class='add'>+#define MODEL_MAUDIO_PROJECTMIX		0x00010091</div><div class='add'>+#define MODEL_MAUDIO_PROFIRELIGHTBRIDGE	0x000100a1</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+name_device(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(bebob-&gt;unit);</div><div class='add'>+	char vendor[24] = {0};</div><div class='add'>+	char model[32] = {0};</div><div class='add'>+	u32 hw_id;</div><div class='add'>+	u32 data[2] = {0};</div><div class='add'>+	u32 revision;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get vendor name from root directory */</div><div class='add'>+	err = fw_csr_string(fw_dev-&gt;config_rom + 5, CSR_VENDOR,</div><div class='add'>+			    vendor, sizeof(vendor));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* get model name from unit directory */</div><div class='add'>+	err = fw_csr_string(bebob-&gt;unit-&gt;directory, CSR_MODEL,</div><div class='add'>+			    model, sizeof(model));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* get hardware id */</div><div class='add'>+	err = snd_bebob_read_quad(bebob-&gt;unit, INFO_OFFSET_HW_MODEL_ID,</div><div class='add'>+				  &amp;hw_id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* get hardware revision */</div><div class='add'>+	err = snd_bebob_read_quad(bebob-&gt;unit, INFO_OFFSET_HW_MODEL_REVISION,</div><div class='add'>+				  &amp;revision);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* get GUID */</div><div class='add'>+	err = snd_bebob_read_block(bebob-&gt;unit, INFO_OFFSET_GUID,</div><div class='add'>+				   data, sizeof(data));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	strscpy(bebob-&gt;card-&gt;driver, "BeBoB");</div><div class='add'>+	strscpy(bebob-&gt;card-&gt;shortname, model);</div><div class='add'>+	strscpy(bebob-&gt;card-&gt;mixername, model);</div><div class='add'>+	snprintf(bebob-&gt;card-&gt;longname, sizeof(bebob-&gt;card-&gt;longname),</div><div class='add'>+		 "%s %s (id:%d, rev:%d), GUID %08x%08x at %s, S%d",</div><div class='add'>+		 vendor, model, hw_id, revision,</div><div class='add'>+		 data[0], data[1], dev_name(&amp;bebob-&gt;unit-&gt;device),</div><div class='add'>+		 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bebob_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;devices_mutex) {</div><div class='add'>+		clear_bit(bebob-&gt;card_index, devices_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_bebob_stream_destroy_duplex(bebob);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;bebob-&gt;mutex);</div><div class='add'>+	fw_unit_put(bebob-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_bebob_spec *</div><div class='add'>+get_saffire_spec(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	char name[24] = {0};</div><div class='add'>+</div><div class='add'>+	if (fw_csr_string(unit-&gt;directory, CSR_MODEL, name, sizeof(name)) &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (strcmp(name, "SaffireLE") == 0)</div><div class='add'>+		return &amp;saffire_le_spec;</div><div class='add'>+	else</div><div class='add'>+		return &amp;saffire_spec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+check_audiophile_booted(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	char name[28] = {0};</div><div class='add'>+</div><div class='add'>+	if (fw_csr_string(unit-&gt;directory, CSR_MODEL, name, sizeof(name)) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return strncmp(name, "FW Audiophile Bootloader", 24) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_quirks(struct snd_bebob *bebob, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	if (entry-&gt;vendor_id == VEN_MAUDIO) {</div><div class='add'>+		switch (entry-&gt;model_id) {</div><div class='add'>+		case MODEL_MAUDIO_PROFIRELIGHTBRIDGE:</div><div class='add'>+			// M-Audio ProFire Lightbridge has a quirk to transfer packets with</div><div class='add'>+			// discontinuous cycle or data block counter in early stage of packet</div><div class='add'>+			// streaming. The cycle span from the first packet with event is variable.</div><div class='add'>+			bebob-&gt;quirks |= SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC;</div><div class='add'>+			break;</div><div class='add'>+		case MODEL_MAUDIO_FW1814:</div><div class='add'>+		case MODEL_MAUDIO_PROJECTMIX:</div><div class='add'>+			// At high sampling rate, M-Audio special firmware transmits empty packet</div><div class='add'>+			// with the value of dbc incremented by 8.</div><div class='add'>+			bebob-&gt;quirks |= SND_BEBOB_QUIRK_WRONG_DBC;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bebob_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	unsigned int card_index;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_bebob *bebob;</div><div class='add'>+	const struct snd_bebob_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vendor_id == VEN_FOCUSRITE &amp;&amp;</div><div class='add'>+	    entry-&gt;model_id == MODEL_FOCUSRITE_SAFFIRE_BOTH)</div><div class='add'>+		spec = get_saffire_spec(unit);</div><div class='add'>+	else if (entry-&gt;vendor_id == VEN_MAUDIO &amp;&amp;</div><div class='add'>+		 entry-&gt;model_id == MODEL_MAUDIO_AUDIOPHILE_BOTH &amp;&amp;</div><div class='add'>+		 !check_audiophile_booted(unit))</div><div class='add'>+		spec = NULL;</div><div class='add'>+	else</div><div class='add'>+		spec = (const struct snd_bebob_spec *)entry-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (spec == NULL) {</div><div class='add'>+		// To boot up M-Audio models.</div><div class='add'>+		if (entry-&gt;vendor_id == VEN_MAUDIO || entry-&gt;vendor_id == VEN_BRIDGECO)</div><div class='add'>+			return snd_bebob_maudio_load_firmware(unit);</div><div class='add'>+		else</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;devices_mutex) {</div><div class='add'>+		for (card_index = 0; card_index &lt; SNDRV_CARDS; card_index++) {</div><div class='add'>+			if (!test_bit(card_index, devices_used) &amp;&amp; enable[card_index])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (card_index &gt;= SNDRV_CARDS)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		err = snd_card_new(&amp;unit-&gt;device, index[card_index], id[card_index], THIS_MODULE,</div><div class='add'>+				   sizeof(*bebob), &amp;card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		card-&gt;private_free = bebob_card_free;</div><div class='add'>+		set_bit(card_index, devices_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bebob = card-&gt;private_data;</div><div class='add'>+	bebob-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, bebob);</div><div class='add'>+	bebob-&gt;card = card;</div><div class='add'>+	bebob-&gt;card_index = card_index;</div><div class='add'>+</div><div class='add'>+	bebob-&gt;spec = spec;</div><div class='add'>+	mutex_init(&amp;bebob-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;bebob-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;bebob-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	err = name_device(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = detect_quirks(bebob, entry);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;spec == &amp;maudio_special_spec) {</div><div class='add'>+		if (entry-&gt;model_id == MODEL_MAUDIO_FW1814)</div><div class='add'>+			err = snd_bebob_maudio_special_discover(bebob, true);</div><div class='add'>+		else</div><div class='add'>+			err = snd_bebob_maudio_special_discover(bebob, false);</div><div class='add'>+	} else {</div><div class='add'>+		err = snd_bebob_stream_discover(bebob);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_init_duplex(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_bebob_proc_init(bebob);</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;midi_input_ports &gt; 0 || bebob-&gt;midi_output_ports &gt; 0) {</div><div class='add'>+		err = snd_bebob_create_midi_devices(bebob);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_create_pcm_devices(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_create_hwdep_device(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vendor_id == VEN_MAUDIO &amp;&amp;</div><div class='add'>+	    (entry-&gt;model_id == MODEL_MAUDIO_FW1814 || entry-&gt;model_id == MODEL_MAUDIO_PROJECTMIX)) {</div><div class='add'>+		// This is a workaround. This bus reset seems to have an effect to make devices</div><div class='add'>+		// correctly handling transactions. Without this, the devices have gap_count</div><div class='add'>+		// mismatch. This causes much failure of transaction.</div><div class='add'>+		//</div><div class='add'>+		// Just after registration, user-land application receive signals from dbus and</div><div class='add'>+		// starts I/Os. To avoid I/Os till the future bus reset, registration is done in</div><div class='add'>+		// next update().</div><div class='add'>+		fw_schedule_bus_reset(fw_parent_device(bebob-&gt;unit)-&gt;card, false, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This driver doesn't update streams in bus reset handler.</div><div class='add'>+ *</div><div class='add'>+ * DM1000/ DM1100/DM1500 chipsets with BeBoB firmware transfer packets with</div><div class='add'>+ * discontinued counter at bus reset. This discontinuity is immediately</div><div class='add'>+ * detected in packet streaming layer, then it sets XRUN to PCM substream.</div><div class='add'>+ *</div><div class='add'>+ * ALSA PCM applications can know the XRUN by getting -EPIPE from PCM operation.</div><div class='add'>+ * Then, they can recover the PCM substream by executing ioctl(2) with</div><div class='add'>+ * SNDRV_PCM_IOCTL_PREPARE. 'struct snd_pcm_ops.prepare' is called and drivers</div><div class='add'>+ * restart packet streaming.</div><div class='add'>+ *</div><div class='add'>+ * The above processing may be executed before this bus-reset handler is</div><div class='add'>+ * executed. When this handler updates streams with current isochronous</div><div class='add'>+ * channels, the streams already have the current ones.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+bebob_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	if (bebob == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fcp_bus_reset(bebob-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bebob_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	if (bebob == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(bebob-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_bebob_rate_spec normal_rate_spec = {</div><div class='add'>+	.get	= &amp;snd_bebob_stream_get_rate,</div><div class='add'>+	.set	= &amp;snd_bebob_stream_set_rate</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_spec spec_normal = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;normal_rate_spec,</div><div class='add'>+	.meter	= NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SPECIFIER_1394TA	0x00a02d</div><div class='add'>+</div><div class='add'>+// The immediate entry for version in unit directory differs depending on models:</div><div class='add'>+//  * 0x010001</div><div class='add'>+//  * 0x014001</div><div class='add'>+#define SND_BEBOB_DEV_ENTRY(vendor, model, data) \</div><div class='add'>+{ \</div><div class='add'>+	.match_flags	= IEEE1394_MATCH_VENDOR_ID | \</div><div class='add'>+			  IEEE1394_MATCH_MODEL_ID | \</div><div class='add'>+			  IEEE1394_MATCH_SPECIFIER_ID, \</div><div class='add'>+	.vendor_id	= vendor, \</div><div class='add'>+	.model_id	= model, \</div><div class='add'>+	.specifier_id	= SPECIFIER_1394TA, \</div><div class='add'>+	.driver_data	= (kernel_ulong_t)data \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id bebob_id_table[] = {</div><div class='add'>+	/* Edirol, FA-66 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_EDIROL, 0x00010049, &amp;spec_normal),</div><div class='add'>+	/* Edirol, FA-101 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_EDIROL, 0x00010048, &amp;spec_normal),</div><div class='add'>+	/* Presonus, FIREBOX */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PRESONUS, 0x00010000, &amp;spec_normal),</div><div class='add'>+	/* PreSonus, FIREPOD/FP10 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PRESONUS, 0x00010066, &amp;spec_normal),</div><div class='add'>+	/* PreSonus, Inspire1394 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PRESONUS, 0x00010001, &amp;spec_normal),</div><div class='add'>+	/* BridgeCo, RDAudio1 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010048, &amp;spec_normal),</div><div class='add'>+	/* BridgeCo, Audio5 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &amp;spec_normal),</div><div class='add'>+	/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010065, &amp;spec_normal),</div><div class='add'>+	// Mackie, d.2 (optional Firewire card with DM1000).</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010067, &amp;spec_normal),</div><div class='add'>+	/* Stanton, ScratchAmp */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &amp;spec_normal),</div><div class='add'>+	/* Tascam, IF-FW DM */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TASCAM, 0x00010067, &amp;spec_normal),</div><div class='add'>+	/* Behringer, XENIX UFX 1204 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00001204, &amp;spec_normal),</div><div class='add'>+	/* Behringer, XENIX UFX 1604 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00001604, &amp;spec_normal),</div><div class='add'>+	/* Behringer, Digital Mixer X32 series (X-UF Card) */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x00000006, &amp;spec_normal),</div><div class='add'>+	/*  Behringer, F-Control Audio 1616 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x001616, &amp;spec_normal),</div><div class='add'>+	/*  Behringer, F-Control Audio 610 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BEHRINGER, 0x000610, &amp;spec_normal),</div><div class='add'>+	/* Apogee Electronics, Rosetta 200/400 (X-FireWire card) */</div><div class='add'>+	/* Apogee Electronics, DA/AD/DD-16X (X-FireWire card) */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x00010048, &amp;spec_normal),</div><div class='add'>+	/* Apogee Electronics, Ensemble */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x01eeee, &amp;spec_normal),</div><div class='add'>+	/* ESI, Quatafire610 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_ESI, 0x00010064, &amp;spec_normal),</div><div class='add'>+	/* CME, MatrixKFW */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_CME, 0x00030000, &amp;spec_normal),</div><div class='add'>+	// Phonic Helix Board 12 FireWire MkII.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00050000, &amp;spec_normal),</div><div class='add'>+	// Phonic Helix Board 18 FireWire MkII.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00060000, &amp;spec_normal),</div><div class='add'>+	// Phonic Helix Board 24 FireWire MkII.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00070000, &amp;spec_normal),</div><div class='add'>+	// Phonic FireFly 808 FireWire.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00080000, &amp;spec_normal),</div><div class='add'>+	// Phonic FireFly 202, 302, 808 Universal.</div><div class='add'>+	// Phinic Helix Board 12/18/24 FireWire, 12/18/24 Universal</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PHONIC, 0x00000000, &amp;spec_normal),</div><div class='add'>+	/* Lynx, Aurora 8/16 (LT-FW) */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_LYNX, 0x00000001, &amp;spec_normal),</div><div class='add'>+	/* ICON, FireXon */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_ICON, 0x00000001, &amp;spec_normal),</div><div class='add'>+	/* PrismSound, Orpheus */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PRISMSOUND, 0x00010048, &amp;spec_normal),</div><div class='add'>+	/* PrismSound, ADA-8XR */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_PRISMSOUND, 0x0000ada8, &amp;spec_normal),</div><div class='add'>+	/* TerraTec Electronic GmbH, PHASE 88 Rack FW */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000003, &amp;phase88_rack_spec),</div><div class='add'>+	/* TerraTec Electronic GmbH, PHASE 24 FW */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000004, &amp;yamaha_terratec_spec),</div><div class='add'>+	/* TerraTec Electronic GmbH, Phase X24 FW */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000007, &amp;yamaha_terratec_spec),</div><div class='add'>+	/* TerraTec Electronic GmbH, EWS MIC2/MIC8 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000005, &amp;spec_normal),</div><div class='add'>+	// Terratec Electronic GmbH, Aureon 7.1 Firewire.</div><div class='add'>+	// AcousticReality, eAR Master One, Eroica, Figaro, and Ciaccona. Perhaps Terratec OEM.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &amp;spec_normal),</div><div class='add'>+	/* Yamaha, GO44 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_YAMAHA, 0x0010000b, &amp;yamaha_terratec_spec),</div><div class='add'>+	/* YAMAHA, GO46 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_YAMAHA, 0x0010000c, &amp;yamaha_terratec_spec),</div><div class='add'>+	/* Focusrite, SaffirePro 26 I/O */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, 0x00000003, &amp;saffirepro_26_spec),</div><div class='add'>+	/* Focusrite, SaffirePro 10 I/O */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, 0x000006, &amp;saffirepro_10_spec),</div><div class='add'>+	/* Focusrite, Saffire(no label and LE) */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_FOCUSRITE, MODEL_FOCUSRITE_SAFFIRE_BOTH,</div><div class='add'>+			    &amp;saffire_spec),</div><div class='add'>+	// M-Audio, Firewire 410. The vendor field is left as BridgeCo. AG.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010058, NULL),</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010046, &amp;maudio_fw410_spec),</div><div class='add'>+	/* M-Audio, Firewire Audiophile */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, MODEL_MAUDIO_AUDIOPHILE_BOTH,</div><div class='add'>+			    &amp;maudio_audiophile_spec),</div><div class='add'>+	/* M-Audio, Firewire Solo */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, 0x00010062, &amp;maudio_solo_spec),</div><div class='add'>+	/* M-Audio, Ozonic */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, 0x0000000a, &amp;maudio_ozonic_spec),</div><div class='add'>+	/* M-Audio NRV10 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, 0x00010081, &amp;maudio_nrv10_spec),</div><div class='add'>+	/* M-Audio, ProFireLightbridge */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, MODEL_MAUDIO_PROFIRELIGHTBRIDGE, &amp;spec_normal),</div><div class='add'>+	/* Firewire 1814 */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, 0x00010070, NULL),	/* bootloader */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, MODEL_MAUDIO_FW1814,</div><div class='add'>+			    &amp;maudio_special_spec),</div><div class='add'>+	/* M-Audio ProjectMix */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_MAUDIO, MODEL_MAUDIO_PROJECTMIX,</div><div class='add'>+			    &amp;maudio_special_spec),</div><div class='add'>+	/* Digidesign Mbox 2 Pro */</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(VEN_DIGIDESIGN, 0x0000a9, &amp;spec_normal),</div><div class='add'>+	// Toneweal FW66.</div><div class='add'>+	SND_BEBOB_DEV_ENTRY(OUI_SHOUYO, 0x020002, &amp;spec_normal),</div><div class='add'>+	/* IDs are unknown but able to be supported */</div><div class='add'>+	/*  Apogee, Mini-ME Firewire */</div><div class='add'>+	/*  Apogee, Mini-DAC Firewire */</div><div class='add'>+	/*  Cakawalk, Sonar Power Studio 66 */</div><div class='add'>+	/*  CME, UF400e */</div><div class='add'>+	/*  ESI, Quotafire XL */</div><div class='add'>+	/*  Infrasonic, DewX */</div><div class='add'>+	/*  Infrasonic, Windy6 */</div><div class='add'>+	/*  Mackie, Digital X Bus x.200 */</div><div class='add'>+	/*  Mackie, Digital X Bus x.400 */</div><div class='add'>+	/*  Rolf Spuler, Firewire Guitar */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, bebob_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver bebob_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = bebob_probe,</div><div class='add'>+	.update	  = bebob_update,</div><div class='add'>+	.remove   = bebob_remove,</div><div class='add'>+	.id_table = bebob_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init</div><div class='add'>+snd_bebob_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;bebob_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit</div><div class='add'>+snd_bebob_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;bebob_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_bebob_init);</div><div class='add'>+module_exit(snd_bebob_exit);</div><div class='head'>diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h<br/>new file mode 100644<br/>index 000000000000..4d73ecb30d79<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob.h</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * bebob.h - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_BEBOB_H_INCLUDED</div><div class='add'>+#define SOUND_BEBOB_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../fcp.h"</div><div class='add'>+#include "../packets-buffer.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+#include "../amdtp-am824.h"</div><div class='add'>+#include "../cmp.h"</div><div class='add'>+</div><div class='add'>+/* basic register addresses on DM1000/DM1100/DM1500 */</div><div class='add'>+#define BEBOB_ADDR_REG_INFO	0xffffc8020000ULL</div><div class='add'>+#define BEBOB_ADDR_REG_REQ	0xffffc8021000ULL</div><div class='add'>+</div><div class='add'>+struct snd_bebob;</div><div class='add'>+</div><div class='add'>+#define SND_BEBOB_STRM_FMT_ENTRIES	7</div><div class='add'>+struct snd_bebob_stream_formation {</div><div class='add'>+	unsigned int pcm;</div><div class='add'>+	unsigned int midi;</div><div class='add'>+};</div><div class='add'>+/* this is a lookup table for index of stream formations */</div><div class='add'>+extern const unsigned int snd_bebob_rate_table[SND_BEBOB_STRM_FMT_ENTRIES];</div><div class='add'>+</div><div class='add'>+/* device specific operations */</div><div class='add'>+enum snd_bebob_clock_type {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL = 0,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_SYT,</div><div class='add'>+};</div><div class='add'>+struct snd_bebob_clock_spec {</div><div class='add'>+	unsigned int num;</div><div class='add'>+	const char *const *labels;</div><div class='add'>+	const enum snd_bebob_clock_type *types;</div><div class='add'>+	int (*get)(struct snd_bebob *bebob, unsigned int *id);</div><div class='add'>+};</div><div class='add'>+struct snd_bebob_rate_spec {</div><div class='add'>+	int (*get)(struct snd_bebob *bebob, unsigned int *rate);</div><div class='add'>+	int (*set)(struct snd_bebob *bebob, unsigned int rate);</div><div class='add'>+};</div><div class='add'>+struct snd_bebob_meter_spec {</div><div class='add'>+	unsigned int num;</div><div class='add'>+	const char *const *labels;</div><div class='add'>+	int (*get)(struct snd_bebob *bebob, u32 *target, unsigned int size);</div><div class='add'>+};</div><div class='add'>+struct snd_bebob_spec {</div><div class='add'>+	const struct snd_bebob_clock_spec *clock;</div><div class='add'>+	const struct snd_bebob_rate_spec *rate;</div><div class='add'>+	const struct snd_bebob_meter_spec *meter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_bebob_quirk {</div><div class='add'>+	SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC = (1 &lt;&lt; 0),</div><div class='add'>+	SND_BEBOB_QUIRK_WRONG_DBC		  = (1 &lt;&lt; 1),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_bebob {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	int card_index;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	const struct snd_bebob_spec *spec;</div><div class='add'>+	unsigned int quirks;	// Combination of snd_bebob_quirk enumerations.</div><div class='add'>+</div><div class='add'>+	unsigned int midi_input_ports;</div><div class='add'>+	unsigned int midi_output_ports;</div><div class='add'>+</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	struct cmp_connection out_conn;</div><div class='add'>+	struct cmp_connection in_conn;</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	struct snd_bebob_stream_formation</div><div class='add'>+		tx_stream_formations[SND_BEBOB_STRM_FMT_ENTRIES];</div><div class='add'>+	struct snd_bebob_stream_formation</div><div class='add'>+		rx_stream_formations[SND_BEBOB_STRM_FMT_ENTRIES];</div><div class='add'>+</div><div class='add'>+	int sync_input_plug;</div><div class='add'>+</div><div class='add'>+	/* for uapi */</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	/* for M-Audio special devices */</div><div class='add'>+	void *maudio_special_quirk;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+snd_bebob_read_block(struct fw_unit *unit, u64 addr, void *buf, int size)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				  BEBOB_ADDR_REG_INFO + addr,</div><div class='add'>+				  buf, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+snd_bebob_read_quad(struct fw_unit *unit, u64 addr, u32 *buf)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				  BEBOB_ADDR_REG_INFO + addr,</div><div class='add'>+				  (void *)buf, sizeof(u32), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* AV/C Audio Subunit Specification 1.0 (Oct 2000, 1394TA) */</div><div class='add'>+int avc_audio_set_selector(struct fw_unit *unit, unsigned int subunit_id,</div><div class='add'>+			   unsigned int fb_id, unsigned int num);</div><div class='add'>+int avc_audio_get_selector(struct fw_unit *unit, unsigned  int subunit_id,</div><div class='add'>+			   unsigned int fb_id, unsigned int *num);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AVC command extensions, AV/C Unit and Subunit, Revision 17</div><div class='add'>+ * (Nov 2003, BridgeCo)</div><div class='add'>+ */</div><div class='add'>+#define	AVC_BRIDGECO_ADDR_BYTES	6</div><div class='add'>+enum avc_bridgeco_plug_dir {</div><div class='add'>+	AVC_BRIDGECO_PLUG_DIR_IN	= 0x00,</div><div class='add'>+	AVC_BRIDGECO_PLUG_DIR_OUT	= 0x01</div><div class='add'>+};</div><div class='add'>+enum avc_bridgeco_plug_mode {</div><div class='add'>+	AVC_BRIDGECO_PLUG_MODE_UNIT		= 0x00,</div><div class='add'>+	AVC_BRIDGECO_PLUG_MODE_SUBUNIT		= 0x01,</div><div class='add'>+	AVC_BRIDGECO_PLUG_MODE_FUNCTION_BLOCK	= 0x02</div><div class='add'>+};</div><div class='add'>+enum avc_bridgeco_plug_unit {</div><div class='add'>+	AVC_BRIDGECO_PLUG_UNIT_ISOC	= 0x00,</div><div class='add'>+	AVC_BRIDGECO_PLUG_UNIT_EXT	= 0x01,</div><div class='add'>+	AVC_BRIDGECO_PLUG_UNIT_ASYNC	= 0x02</div><div class='add'>+};</div><div class='add'>+enum avc_bridgeco_plug_type {</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_ISOC	= 0x00,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_ASYNC	= 0x01,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_MIDI	= 0x02,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_SYNC	= 0x03,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_ANA	= 0x04,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_DIG	= 0x05,</div><div class='add'>+	AVC_BRIDGECO_PLUG_TYPE_ADDITION	= 0x06</div><div class='add'>+};</div><div class='add'>+static inline void</div><div class='add'>+avc_bridgeco_fill_unit_addr(u8 buf[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+			    enum avc_bridgeco_plug_dir dir,</div><div class='add'>+			    enum avc_bridgeco_plug_unit unit,</div><div class='add'>+			    unsigned int pid)</div><div class='add'>+{</div><div class='add'>+	buf[0] = 0xff;	/* Unit */</div><div class='add'>+	buf[1] = dir;</div><div class='add'>+	buf[2] = AVC_BRIDGECO_PLUG_MODE_UNIT;</div><div class='add'>+	buf[3] = unit;</div><div class='add'>+	buf[4] = 0xff &amp; pid;</div><div class='add'>+	buf[5] = 0xff;	/* reserved */</div><div class='add'>+}</div><div class='add'>+static inline void</div><div class='add'>+avc_bridgeco_fill_msu_addr(u8 buf[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+			   enum avc_bridgeco_plug_dir dir,</div><div class='add'>+			   unsigned int pid)</div><div class='add'>+{</div><div class='add'>+	buf[0] = 0x60;	/* Music subunit */</div><div class='add'>+	buf[1] = dir;</div><div class='add'>+	buf[2] = AVC_BRIDGECO_PLUG_MODE_SUBUNIT;</div><div class='add'>+	buf[3] = 0xff &amp; pid;</div><div class='add'>+	buf[4] = 0xff;	/* reserved */</div><div class='add'>+	buf[5] = 0xff;	/* reserved */</div><div class='add'>+}</div><div class='add'>+int avc_bridgeco_get_plug_ch_pos(struct fw_unit *unit,</div><div class='add'>+				 u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				 u8 *buf, unsigned int len);</div><div class='add'>+int avc_bridgeco_get_plug_type(struct fw_unit *unit,</div><div class='add'>+			       u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+			       enum avc_bridgeco_plug_type *type);</div><div class='add'>+int avc_bridgeco_get_plug_ch_count(struct fw_unit *unit, u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				   unsigned int *ch_count);</div><div class='add'>+int avc_bridgeco_get_plug_section_type(struct fw_unit *unit,</div><div class='add'>+				       u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				       unsigned int id, u8 *type);</div><div class='add'>+int avc_bridgeco_get_plug_input(struct fw_unit *unit,</div><div class='add'>+				u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				u8 input[7]);</div><div class='add'>+int avc_bridgeco_get_plug_strm_fmt(struct fw_unit *unit,</div><div class='add'>+				   u8 addr[AVC_BRIDGECO_ADDR_BYTES], u8 *buf,</div><div class='add'>+				   unsigned int *len, unsigned int eid);</div><div class='add'>+</div><div class='add'>+/* for AMDTP streaming */</div><div class='add'>+int snd_bebob_stream_get_rate(struct snd_bebob *bebob, unsigned int *rate);</div><div class='add'>+int snd_bebob_stream_set_rate(struct snd_bebob *bebob, unsigned int rate);</div><div class='add'>+int snd_bebob_stream_get_clock_src(struct snd_bebob *bebob,</div><div class='add'>+				   enum snd_bebob_clock_type *src);</div><div class='add'>+int snd_bebob_stream_discover(struct snd_bebob *bebob);</div><div class='add'>+int snd_bebob_stream_init_duplex(struct snd_bebob *bebob);</div><div class='add'>+int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate,</div><div class='add'>+				    unsigned int frames_per_period,</div><div class='add'>+				    unsigned int frames_per_buffer);</div><div class='add'>+int snd_bebob_stream_start_duplex(struct snd_bebob *bebob);</div><div class='add'>+void snd_bebob_stream_stop_duplex(struct snd_bebob *bebob);</div><div class='add'>+void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+void snd_bebob_stream_lock_changed(struct snd_bebob *bebob);</div><div class='add'>+int snd_bebob_stream_lock_try(struct snd_bebob *bebob);</div><div class='add'>+void snd_bebob_stream_lock_release(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+void snd_bebob_proc_init(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_midi_devices(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_pcm_devices(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_hwdep_device(struct snd_bebob *bebob);</div><div class='add'>+</div><div class='add'>+/* model specific operations */</div><div class='add'>+extern const struct snd_bebob_spec phase88_rack_spec;</div><div class='add'>+extern const struct snd_bebob_spec yamaha_terratec_spec;</div><div class='add'>+extern const struct snd_bebob_spec saffirepro_26_spec;</div><div class='add'>+extern const struct snd_bebob_spec saffirepro_10_spec;</div><div class='add'>+extern const struct snd_bebob_spec saffire_le_spec;</div><div class='add'>+extern const struct snd_bebob_spec saffire_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_fw410_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_audiophile_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_solo_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_ozonic_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_nrv10_spec;</div><div class='add'>+extern const struct snd_bebob_spec maudio_special_spec;</div><div class='add'>+int snd_bebob_maudio_special_discover(struct snd_bebob *bebob, bool is1814);</div><div class='add'>+int snd_bebob_maudio_load_firmware(struct fw_unit *unit);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_command.c b/sound/firewire/bebob/bebob_command.c<br/>new file mode 100644<br/>index 000000000000..022df09c68ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_command.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_command.c</a></div><div class='hunk'>@@ -0,0 +1,331 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_command.c - driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+int avc_audio_set_selector(struct fw_unit *unit, unsigned int subunit_id,</div><div class='add'>+			   unsigned int fb_id, unsigned int num)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0]  = 0x00;		/* AV/C CONTROL */</div><div class='add'>+	buf[1]  = 0x08 | (0x07 &amp; subunit_id);	/* AUDIO SUBUNIT ID */</div><div class='add'>+	buf[2]  = 0xb8;		/* FUNCTION BLOCK  */</div><div class='add'>+	buf[3]  = 0x80;		/* type is 'selector'*/</div><div class='add'>+	buf[4]  = 0xff &amp; fb_id;	/* function block id */</div><div class='add'>+	buf[5]  = 0x10;		/* control attribute is CURRENT */</div><div class='add'>+	buf[6]  = 0x02;		/* selector length is 2 */</div><div class='add'>+	buf[7]  = 0xff &amp; num;	/* input function block plug number */</div><div class='add'>+	buf[8]  = 0x01;		/* control selector is SELECTOR_CONTROL */</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(8));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 9)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_audio_get_selector(struct fw_unit *unit, unsigned int subunit_id,</div><div class='add'>+			   unsigned int fb_id, unsigned int *num)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0]  = 0x01;		/* AV/C STATUS */</div><div class='add'>+	buf[1]  = 0x08 | (0x07 &amp; subunit_id);	/* AUDIO SUBUNIT ID */</div><div class='add'>+	buf[2]  = 0xb8;		/* FUNCTION BLOCK */</div><div class='add'>+	buf[3]  = 0x80;		/* type is 'selector'*/</div><div class='add'>+	buf[4]  = 0xff &amp; fb_id;	/* function block id */</div><div class='add'>+	buf[5]  = 0x10;		/* control attribute is CURRENT */</div><div class='add'>+	buf[6]  = 0x02;		/* selector length is 2 */</div><div class='add'>+	buf[7]  = 0xff;		/* input function block plug number */</div><div class='add'>+	buf[8]  = 0x01;		/* control selector is SELECTOR_CONTROL */</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(8));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 9)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*num = buf[7];</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+avc_bridgeco_fill_extension_addr(u8 *buf, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	buf[1] = addr[0];</div><div class='add'>+	memcpy(buf + 4, addr + 1, 5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+avc_bridgeco_fill_plug_info_extension_command(u8 *buf, u8 *addr,</div><div class='add'>+					      unsigned int itype)</div><div class='add'>+{</div><div class='add'>+	buf[0] = 0x01;	/* AV/C STATUS */</div><div class='add'>+	buf[2] = 0x02;	/* AV/C GENERAL PLUG INFO */</div><div class='add'>+	buf[3] = 0xc0;	/* BridgeCo extension */</div><div class='add'>+	avc_bridgeco_fill_extension_addr(buf, addr);</div><div class='add'>+	buf[9] = itype;	/* info type */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_type(struct fw_unit *unit,</div><div class='add'>+			       u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+			       enum avc_bridgeco_plug_type *type)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Info type is 'plug type'. */</div><div class='add'>+	avc_bridgeco_fill_plug_info_extension_command(buf, addr, 0x00);</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(9));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 11)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*type = buf[10];</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_ch_count(struct fw_unit *unit, u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				   unsigned int *ch_count)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	// Info type is 'plug type'.</div><div class='add'>+	avc_bridgeco_fill_plug_info_extension_command(buf, addr, 0x02);</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(9));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 11)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) // NOT IMPLEMENTED</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) // REJECTED</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) // IN TRANSITION</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*ch_count = buf[10];</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_ch_pos(struct fw_unit *unit,</div><div class='add'>+				 u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				 u8 *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Info type is 'channel position'. */</div><div class='add'>+	avc_bridgeco_fill_plug_info_extension_command(buf, addr, 0x03);</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 256,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) |</div><div class='add'>+				  BIT(5) | BIT(6) | BIT(7) | BIT(9));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 11)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Pick up specific data. */</div><div class='add'>+	memmove(buf, buf + 10, err - 10);</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_section_type(struct fw_unit *unit,</div><div class='add'>+				       u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				       unsigned int id, u8 *type)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* section info includes charactors but this module don't need it */</div><div class='add'>+	buf = kzalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Info type is 'section info'. */</div><div class='add'>+	avc_bridgeco_fill_plug_info_extension_command(buf, addr, 0x07);</div><div class='add'>+	buf[10] = 0xff &amp; ++id;	/* section id */</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(9) | BIT(10));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 12)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*type = buf[11];</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_input(struct fw_unit *unit,</div><div class='add'>+				u8 addr[AVC_BRIDGECO_ADDR_BYTES], u8 input[7])</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(18, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Info type is 'plug input'. */</div><div class='add'>+	avc_bridgeco_fill_plug_info_extension_command(buf, addr, 0x05);</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 16, buf, 16,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 16)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	memcpy(input, buf + 10, 5);</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_bridgeco_get_plug_strm_fmt(struct fw_unit *unit,</div><div class='add'>+				   u8 addr[AVC_BRIDGECO_ADDR_BYTES], u8 *buf,</div><div class='add'>+				   unsigned int *len, unsigned int eid)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* check given buffer */</div><div class='add'>+	if ((buf == NULL) || (*len &lt; 12)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x01;	/* AV/C STATUS */</div><div class='add'>+	buf[2] = 0x2f;	/* AV/C STREAM FORMAT SUPPORT */</div><div class='add'>+	buf[3] = 0xc1;	/* Bridgeco extension - List Request */</div><div class='add'>+	avc_bridgeco_fill_extension_addr(buf, addr);</div><div class='add'>+	buf[10] = 0xff &amp; eid;	/* Entry ID */</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, *len,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(10));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 12)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08)        /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a)        /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b)        /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	else if (buf[10] != eid)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Pick up 'stream format info'. */</div><div class='add'>+	memmove(buf, buf + 11, err - 11);</div><div class='add'>+	*len = err - 11;</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c<br/>new file mode 100644<br/>index 000000000000..06d6a37cd853<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_focusrite.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_focusrite.c</a></div><div class='hunk'>@@ -0,0 +1,322 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_focusrite.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+#define ANA_IN	"Analog In"</div><div class='add'>+#define DIG_IN	"Digital In"</div><div class='add'>+#define ANA_OUT	"Analog Out"</div><div class='add'>+#define DIG_OUT	"Digital Out"</div><div class='add'>+#define STM_IN	"Stream In"</div><div class='add'>+</div><div class='add'>+#define SAFFIRE_ADDRESS_BASE			0x000100000000ULL</div><div class='add'>+</div><div class='add'>+#define SAFFIRE_OFFSET_CLOCK_SOURCE		0x00f8</div><div class='add'>+#define SAFFIREPRO_OFFSET_CLOCK_SOURCE		0x0174</div><div class='add'>+</div><div class='add'>+/* whether sync to external device or not */</div><div class='add'>+#define SAFFIRE_OFFSET_CLOCK_SYNC_EXT		0x013c</div><div class='add'>+#define SAFFIRE_LE_OFFSET_CLOCK_SYNC_EXT	0x0432</div><div class='add'>+#define SAFFIREPRO_OFFSET_CLOCK_SYNC_EXT	0x0164</div><div class='add'>+</div><div class='add'>+#define SAFFIRE_CLOCK_SOURCE_INTERNAL		0</div><div class='add'>+#define SAFFIRE_CLOCK_SOURCE_SPDIF		1</div><div class='add'>+</div><div class='add'>+/* clock sources as returned from register of Saffire Pro 10 and 26 */</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_SELECT_MASK	0x000000ff</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_DETECT_MASK	0x0000ff00</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_INTERNAL	0</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_SKIP		1 /* never used on hardware */</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_SPDIF		2</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_ADAT1		3 /* not used on s.pro. 10 */</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_ADAT2		4 /* not used on s.pro. 10 */</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK	5</div><div class='add'>+#define SAFFIREPRO_CLOCK_SOURCE_COUNT		6</div><div class='add'>+</div><div class='add'>+/* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */</div><div class='add'>+#define SAFFIREPRO_ENABLE_DIG_IFACES		0x01a4</div><div class='add'>+</div><div class='add'>+/* saffirepro has its own parameter for sampling frequency */</div><div class='add'>+#define SAFFIREPRO_RATE_NOREBOOT		0x01cc</div><div class='add'>+/* index is the value for this register */</div><div class='add'>+static const unsigned int rates[] = {</div><div class='add'>+	[0] = 0,</div><div class='add'>+	[1] = 44100,</div><div class='add'>+	[2] = 48000,</div><div class='add'>+	[3] = 88200,</div><div class='add'>+	[4] = 96000,</div><div class='add'>+	[5] = 176400,</div><div class='add'>+	[6] = 192000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* saffire(no label)/saffire LE has metering */</div><div class='add'>+#define SAFFIRE_OFFSET_METER			0x0100</div><div class='add'>+#define SAFFIRE_LE_OFFSET_METER			0x0168</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+saffire_read_block(struct snd_bebob *bebob, u64 offset,</div><div class='add'>+		   u32 *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+	__be32 *tmp = (__be32 *)buf;</div><div class='add'>+</div><div class='add'>+	err =  snd_fw_transaction(bebob-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				  SAFFIRE_ADDRESS_BASE + offset,</div><div class='add'>+				  tmp, size, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size / sizeof(u32); i++)</div><div class='add'>+		buf[i] = be32_to_cpu(tmp[i]);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+saffire_read_quad(struct snd_bebob *bebob, u64 offset, u32 *value)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	__be32 tmp;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(bebob-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 SAFFIRE_ADDRESS_BASE + offset,</div><div class='add'>+				 &amp;tmp, sizeof(__be32), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*value = be32_to_cpu(tmp);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+saffire_write_quad(struct snd_bebob *bebob, u64 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	__be32 data = cpu_to_be32(value);</div><div class='add'>+</div><div class='add'>+	return snd_fw_transaction(bebob-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  SAFFIRE_ADDRESS_BASE + offset,</div><div class='add'>+				  &amp;data, sizeof(__be32), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const enum snd_bebob_clock_type saffirepro_10_clk_src_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* S/PDIF */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* Word Clock */</div><div class='add'>+};</div><div class='add'>+static const enum snd_bebob_clock_type saffirepro_26_clk_src_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* S/PDIF */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* ADAT1 */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* ADAT2 */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* Word Clock */</div><div class='add'>+};</div><div class='add'>+/* Value maps between registers and labels for SaffirePro 10/26. */</div><div class='add'>+static const signed char saffirepro_clk_maps[][SAFFIREPRO_CLOCK_SOURCE_COUNT] = {</div><div class='add'>+	/* SaffirePro 10 */</div><div class='add'>+	[0] = {</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_INTERNAL]  =  0,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_SKIP]      = -1, /* not supported */</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_SPDIF]     =  1,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_ADAT1]     = -1, /* not supported */</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_ADAT2]     = -1, /* not supported */</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK] =  2,</div><div class='add'>+	},</div><div class='add'>+	/* SaffirePro 26 */</div><div class='add'>+	[1] = {</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_INTERNAL]  =  0,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_SKIP]      = -1, /* not supported */</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_SPDIF]     =  1,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_ADAT1]     =  2,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_ADAT2]     =  3,</div><div class='add'>+		[SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK] =  4,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+saffirepro_both_clk_freq_get(struct snd_bebob *bebob, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	u32 id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = saffire_read_quad(bebob, SAFFIREPRO_RATE_NOREBOOT, &amp;id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	if (id &gt;= ARRAY_SIZE(rates))</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else</div><div class='add'>+		*rate = rates[id];</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static int</div><div class='add'>+saffirepro_both_clk_freq_set(struct snd_bebob *bebob, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	for (id = 0; id &lt; ARRAY_SIZE(rates); id++) {</div><div class='add'>+		if (rates[id] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (id == ARRAY_SIZE(rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return saffire_write_quad(bebob, SAFFIREPRO_RATE_NOREBOOT, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * query hardware for current clock source, return our internally</div><div class='add'>+ * used clock index in *id, depending on hardware.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+saffirepro_both_clk_src_get(struct snd_bebob *bebob, unsigned int *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 value;       /* clock source read from hw register */</div><div class='add'>+	const signed char *map;</div><div class='add'>+</div><div class='add'>+	err = saffire_read_quad(bebob, SAFFIREPRO_OFFSET_CLOCK_SOURCE, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* depending on hardware, use a different mapping */</div><div class='add'>+	if (bebob-&gt;spec-&gt;clock-&gt;types == saffirepro_10_clk_src_types)</div><div class='add'>+		map = saffirepro_clk_maps[0];</div><div class='add'>+	else</div><div class='add'>+		map = saffirepro_clk_maps[1];</div><div class='add'>+</div><div class='add'>+	/* In a case that this driver cannot handle the value of register. */</div><div class='add'>+	value &amp;= SAFFIREPRO_CLOCK_SOURCE_SELECT_MASK;</div><div class='add'>+	if (value &gt;= SAFFIREPRO_CLOCK_SOURCE_COUNT || map[value] &lt; 0) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*id = (unsigned int)map[value];</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_bebob_spec saffire_le_spec;</div><div class='add'>+static const enum snd_bebob_clock_type saffire_both_clk_src_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+saffire_both_clk_src_get(struct snd_bebob *bebob, unsigned int *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	err = saffire_read_quad(bebob, SAFFIRE_OFFSET_CLOCK_SOURCE, &amp;value);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*id = 0xff &amp; value;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+};</div><div class='add'>+static const char *const saffire_le_meter_labels[] = {</div><div class='add'>+	ANA_IN, ANA_IN, DIG_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT,</div><div class='add'>+	STM_IN, STM_IN</div><div class='add'>+};</div><div class='add'>+static const char *const saffire_meter_labels[] = {</div><div class='add'>+	ANA_IN, ANA_IN,</div><div class='add'>+	STM_IN, STM_IN, STM_IN, STM_IN, STM_IN,</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+saffire_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	const struct snd_bebob_meter_spec *spec = bebob-&gt;spec-&gt;meter;</div><div class='add'>+	unsigned int channels;</div><div class='add'>+	u64 offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;labels == saffire_le_meter_labels)</div><div class='add'>+		offset = SAFFIRE_LE_OFFSET_METER;</div><div class='add'>+	else</div><div class='add'>+		offset = SAFFIRE_OFFSET_METER;</div><div class='add'>+</div><div class='add'>+	channels = spec-&gt;num * 2;</div><div class='add'>+	if (size &lt; channels * sizeof(u32))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	err = saffire_read_block(bebob, offset, buf, size);</div><div class='add'>+	if (err &gt;= 0 &amp;&amp; spec-&gt;labels == saffire_le_meter_labels) {</div><div class='add'>+		swap(buf[1], buf[3]);</div><div class='add'>+		swap(buf[2], buf[3]);</div><div class='add'>+		swap(buf[3], buf[4]);</div><div class='add'>+</div><div class='add'>+		swap(buf[7], buf[10]);</div><div class='add'>+		swap(buf[8], buf[10]);</div><div class='add'>+		swap(buf[9], buf[11]);</div><div class='add'>+		swap(buf[11], buf[12]);</div><div class='add'>+</div><div class='add'>+		swap(buf[15], buf[16]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_bebob_rate_spec saffirepro_both_rate_spec = {</div><div class='add'>+	.get	= &amp;saffirepro_both_clk_freq_get,</div><div class='add'>+	.set	= &amp;saffirepro_both_clk_freq_set,</div><div class='add'>+};</div><div class='add'>+/* Saffire Pro 26 I/O  */</div><div class='add'>+static const struct snd_bebob_clock_spec saffirepro_26_clk_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(saffirepro_26_clk_src_types),</div><div class='add'>+	.types	= saffirepro_26_clk_src_types,</div><div class='add'>+	.get	= &amp;saffirepro_both_clk_src_get,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec saffirepro_26_spec = {</div><div class='add'>+	.clock	= &amp;saffirepro_26_clk_spec,</div><div class='add'>+	.rate	= &amp;saffirepro_both_rate_spec,</div><div class='add'>+	.meter	= NULL</div><div class='add'>+};</div><div class='add'>+/* Saffire Pro 10 I/O */</div><div class='add'>+static const struct snd_bebob_clock_spec saffirepro_10_clk_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(saffirepro_10_clk_src_types),</div><div class='add'>+	.types	= saffirepro_10_clk_src_types,</div><div class='add'>+	.get	= &amp;saffirepro_both_clk_src_get,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec saffirepro_10_spec = {</div><div class='add'>+	.clock	= &amp;saffirepro_10_clk_spec,</div><div class='add'>+	.rate	= &amp;saffirepro_both_rate_spec,</div><div class='add'>+	.meter	= NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_bebob_rate_spec saffire_both_rate_spec = {</div><div class='add'>+	.get	= &amp;snd_bebob_stream_get_rate,</div><div class='add'>+	.set	= &amp;snd_bebob_stream_set_rate,</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_clock_spec saffire_both_clk_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(saffire_both_clk_src_types),</div><div class='add'>+	.types	= saffire_both_clk_src_types,</div><div class='add'>+	.get	= &amp;saffire_both_clk_src_get,</div><div class='add'>+};</div><div class='add'>+/* Saffire LE */</div><div class='add'>+static const struct snd_bebob_meter_spec saffire_le_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(saffire_le_meter_labels),</div><div class='add'>+	.labels	= saffire_le_meter_labels,</div><div class='add'>+	.get	= &amp;saffire_meter_get,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec saffire_le_spec = {</div><div class='add'>+	.clock	= &amp;saffire_both_clk_spec,</div><div class='add'>+	.rate	= &amp;saffire_both_rate_spec,</div><div class='add'>+	.meter	= &amp;saffire_le_meter_spec</div><div class='add'>+};</div><div class='add'>+/* Saffire */</div><div class='add'>+static const struct snd_bebob_meter_spec saffire_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(saffire_meter_labels),</div><div class='add'>+	.labels	= saffire_meter_labels,</div><div class='add'>+	.get	= &amp;saffire_meter_get,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec saffire_spec = {</div><div class='add'>+	.clock	= &amp;saffire_both_clk_spec,</div><div class='add'>+	.rate	= &amp;saffire_both_rate_spec,</div><div class='add'>+	.meter	= &amp;saffire_meter_spec</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_hwdep.c b/sound/firewire/bebob/bebob_hwdep.c<br/>new file mode 100644<br/>index 000000000000..216d1fceb6e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_hwdep.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes give three functionality.</div><div class='add'>+ *</div><div class='add'>+ * 1.get firewire node infomation</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock stream</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bebob.h"</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+hwdep_read(struct snd_hwdep *hwdep, char __user *buf,  long count,</div><div class='add'>+	   loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	union snd_firewire_event event;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!bebob-&gt;dev_lock_changed) {</div><div class='add'>+		prepare_to_wait(&amp;bebob-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;bebob-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;bebob-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;bebob-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;event, 0, sizeof(event));</div><div class='add'>+	count = min_t(long, count, sizeof(event.lock_status));</div><div class='add'>+	event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;</div><div class='add'>+	event.lock_status.status = (bebob-&gt;dev_lock_count &gt; 0);</div><div class='add'>+	bebob-&gt;dev_lock_changed = false;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t</div><div class='add'>+hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;bebob-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+	if (bebob-&gt;dev_lock_changed)</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_get_info(struct snd_bebob *bebob, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(bebob-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_BEBOB;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_lock(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;dev_lock_count == 0) {</div><div class='add'>+		bebob-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_unlock(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;dev_lock_count == -1) {</div><div class='add'>+		bebob-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+	if (bebob-&gt;dev_lock_count == -1)</div><div class='add'>+		bebob-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+	    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(bebob, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(bebob);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(bebob);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int</div><div class='add'>+hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+		   unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_hwdep_device(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(bebob-&gt;card, "BeBoB", 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	strscpy(hwdep-&gt;name, "BeBoB");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_BEBOB;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = bebob;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c<br/>new file mode 100644<br/>index 000000000000..376a9a175479<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_maudio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_maudio.c</a></div><div class='hunk'>@@ -0,0 +1,785 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_maudio.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Just powering on, Firewire 410/Audiophile/1814 and ProjectMix I/O wait to</div><div class='add'>+ * download firmware blob. To enable these devices, drivers should upload</div><div class='add'>+ * firmware blob and send a command to initialize configuration to factory</div><div class='add'>+ * settings when completing uploading. Then these devices generate bus reset</div><div class='add'>+ * and are recognized as new devices with the firmware.</div><div class='add'>+ *</div><div class='add'>+ * But with firmware version 5058 or later, the firmware is stored to flash</div><div class='add'>+ * memory in the device and drivers can tell bootloader to load the firmware</div><div class='add'>+ * by sending a cue. This cue must be sent one time.</div><div class='add'>+ *</div><div class='add'>+ * For streaming, both of output and input streams are needed for Firewire 410</div><div class='add'>+ * and Ozonic. The single stream is OK for the other devices even if the clock</div><div class='add'>+ * source is not SYT-Match (I note no devices use SYT-Match).</div><div class='add'>+ *</div><div class='add'>+ * Without streaming, the devices except for Firewire Audiophile can mix any</div><div class='add'>+ * input and output. For this reason, Audiophile cannot be used as standalone</div><div class='add'>+ * mixer.</div><div class='add'>+ *</div><div class='add'>+ * Firewire 1814 and ProjectMix I/O uses special firmware. It will be freezed</div><div class='add'>+ * when receiving any commands which the firmware can't understand. These</div><div class='add'>+ * devices utilize completely different system to control. It is some</div><div class='add'>+ * write-transaction directly into a certain address. All of addresses for mixer</div><div class='add'>+ * functionality is between 0xffc700700000 to 0xffc70070009c.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Offset from information register */</div><div class='add'>+#define INFO_OFFSET_SW_DATE	0x20</div><div class='add'>+</div><div class='add'>+/* Bootloader Protocol Version 1 */</div><div class='add'>+#define MAUDIO_BOOTLOADER_CUE1	0x00000001</div><div class='add'>+/*</div><div class='add'>+ * Initializing configuration to factory settings (= 0x1101), (swapped in line),</div><div class='add'>+ * Command code is zero (= 0x00),</div><div class='add'>+ * the number of operands is zero (= 0x00)(at least significant byte)</div><div class='add'>+ */</div><div class='add'>+#define MAUDIO_BOOTLOADER_CUE2	0x01110000</div><div class='add'>+/* padding */</div><div class='add'>+#define MAUDIO_BOOTLOADER_CUE3	0x00000000</div><div class='add'>+</div><div class='add'>+#define MAUDIO_SPECIFIC_ADDRESS	0xffc700000000ULL</div><div class='add'>+</div><div class='add'>+#define METER_OFFSET		0x00600000</div><div class='add'>+</div><div class='add'>+/* some device has sync info after metering data */</div><div class='add'>+#define METER_SIZE_SPECIAL	84	/* with sync info */</div><div class='add'>+#define METER_SIZE_FW410	76	/* with sync info */</div><div class='add'>+#define METER_SIZE_AUDIOPHILE	60	/* with sync info */</div><div class='add'>+#define METER_SIZE_SOLO		52	/* with sync info */</div><div class='add'>+#define METER_SIZE_OZONIC	48</div><div class='add'>+#define METER_SIZE_NRV10	80</div><div class='add'>+</div><div class='add'>+/* labels for metering */</div><div class='add'>+#define ANA_IN		"Analog In"</div><div class='add'>+#define ANA_OUT		"Analog Out"</div><div class='add'>+#define DIG_IN		"Digital In"</div><div class='add'>+#define SPDIF_IN	"S/PDIF In"</div><div class='add'>+#define ADAT_IN		"ADAT In"</div><div class='add'>+#define DIG_OUT		"Digital Out"</div><div class='add'>+#define SPDIF_OUT	"S/PDIF Out"</div><div class='add'>+#define ADAT_OUT	"ADAT Out"</div><div class='add'>+#define STRM_IN		"Stream In"</div><div class='add'>+#define AUX_OUT		"Aux Out"</div><div class='add'>+#define HP_OUT		"HP Out"</div><div class='add'>+/* for NRV */</div><div class='add'>+#define UNKNOWN_METER	"Unknown"</div><div class='add'>+</div><div class='add'>+struct special_params {</div><div class='add'>+	bool is1814;</div><div class='add'>+	unsigned int clk_src;</div><div class='add'>+	unsigned int dig_in_fmt;</div><div class='add'>+	unsigned int dig_out_fmt;</div><div class='add'>+	unsigned int clk_lock;</div><div class='add'>+	struct snd_ctl_elem_id *ctl_id_sync;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For some M-Audio devices, this module just send cue to load firmware. After</div><div class='add'>+ * loading, the device generates bus reset and newly detected.</div><div class='add'>+ *</div><div class='add'>+ * If we make any transactions to load firmware, the operation may failed.</div><div class='add'>+ */</div><div class='add'>+int snd_bebob_maudio_load_firmware(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(unit);</div><div class='add'>+	int err, rcode;</div><div class='add'>+	u64 date;</div><div class='add'>+	__le32 *cues;</div><div class='add'>+</div><div class='add'>+	/* check date of software used to build */</div><div class='add'>+	err = snd_bebob_read_block(unit, INFO_OFFSET_SW_DATE,</div><div class='add'>+				   &amp;date, sizeof(u64));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	/*</div><div class='add'>+	 * firmware version 5058 or later has date later than "20070401", but</div><div class='add'>+	 * 'date' is not null-terminated.</div><div class='add'>+	 */</div><div class='add'>+	if (date &lt; 0x3230303730343031LL) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device,</div><div class='add'>+			"Use firmware version 5058 or later\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cues = kmalloc_array(3, sizeof(*cues), GFP_KERNEL);</div><div class='add'>+	if (!cues)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cues[0] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE1);</div><div class='add'>+	cues[1] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE2);</div><div class='add'>+	cues[2] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE3);</div><div class='add'>+</div><div class='add'>+	rcode = fw_run_transaction(device-&gt;card, TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				   device-&gt;node_id, device-&gt;generation,</div><div class='add'>+				   device-&gt;max_speed, BEBOB_ADDR_REG_REQ,</div><div class='add'>+				   cues, 3 * sizeof(*cues));</div><div class='add'>+	kfree(cues);</div><div class='add'>+	if (rcode != RCODE_COMPLETE) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device,</div><div class='add'>+			"Failed to send a cue to load firmware\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+get_meter(struct snd_bebob *bebob, void *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(bebob-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				  MAUDIO_SPECIFIC_ADDRESS + METER_OFFSET,</div><div class='add'>+				  buf, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+check_clk_sync(struct snd_bebob *bebob, unsigned int size, bool *sync)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = get_meter(bebob, buf, size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* if synced, this value is the same as SFC of FDF in CIP header */</div><div class='add'>+	*sync = (buf[size - 2] != 0xff);</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dig_fmt: 0x00:S/PDIF, 0x01:ADAT</div><div class='add'>+ * clk_lock: 0x00:unlock, 0x01:lock</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+avc_maudio_set_special_clk(struct snd_bebob *bebob, unsigned int clk_src,</div><div class='add'>+			   unsigned int dig_in_fmt, unsigned int dig_out_fmt,</div><div class='add'>+			   unsigned int clk_lock)</div><div class='add'>+{</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	int err;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(&amp;bebob-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_stream_running(&amp;bebob-&gt;tx_stream))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(12, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0]  = 0x00;		/* CONTROL */</div><div class='add'>+	buf[1]  = 0xff;		/* UNIT */</div><div class='add'>+	buf[2]  = 0x00;		/* vendor dependent */</div><div class='add'>+	buf[3]  = 0x04;		/* company ID high */</div><div class='add'>+	buf[4]  = 0x00;		/* company ID middle */</div><div class='add'>+	buf[5]  = 0x04;		/* company ID low */</div><div class='add'>+	buf[6]  = 0xff &amp; clk_src;	/* clock source */</div><div class='add'>+	buf[7]  = 0xff &amp; dig_in_fmt;	/* input digital format */</div><div class='add'>+	buf[8]  = 0xff &amp; dig_out_fmt;	/* output digital format */</div><div class='add'>+	buf[9]  = 0xff &amp; clk_lock;	/* lock these settings */</div><div class='add'>+	buf[10] = 0x00;		/* padding  */</div><div class='add'>+	buf[11] = 0x00;		/* padding */</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(bebob-&gt;unit, buf, 12, buf, 12,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) |</div><div class='add'>+				  BIT(5) | BIT(6) | BIT(7) | BIT(8) |</div><div class='add'>+				  BIT(9));</div><div class='add'>+	if ((err &gt; 0) &amp;&amp; (err &lt; 10))</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	params-&gt;clk_src		= buf[6];</div><div class='add'>+	params-&gt;dig_in_fmt	= buf[7];</div><div class='add'>+	params-&gt;dig_out_fmt	= buf[8];</div><div class='add'>+	params-&gt;clk_lock	= buf[9];</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ctl_id_sync)</div><div class='add'>+		snd_ctl_notify(bebob-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='add'>+			       params-&gt;ctl_id_sync);</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static void</div><div class='add'>+special_stream_formation_set(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int ch_table[2][2][3] = {</div><div class='add'>+		/* AMDTP_OUT_STREAM */</div><div class='add'>+		{ {  6,  6,  4 },	/* SPDIF */</div><div class='add'>+		  { 12,  8,  4 } },	/* ADAT */</div><div class='add'>+		/* AMDTP_IN_STREAM */</div><div class='add'>+		{ { 10, 10,  2 },	/* SPDIF */</div><div class='add'>+		  { 16, 12,  2 } }	/* ADAT */</div><div class='add'>+	};</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	unsigned int i, max;</div><div class='add'>+</div><div class='add'>+	max = SND_BEBOB_STRM_FMT_ENTRIES - 1;</div><div class='add'>+	if (!params-&gt;is1814)</div><div class='add'>+		max -= 2;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max; i++) {</div><div class='add'>+		bebob-&gt;tx_stream_formations[i + 1].pcm =</div><div class='add'>+			ch_table[AMDTP_IN_STREAM][params-&gt;dig_in_fmt][i / 2];</div><div class='add'>+		bebob-&gt;tx_stream_formations[i + 1].midi = 1;</div><div class='add'>+</div><div class='add'>+		bebob-&gt;rx_stream_formations[i + 1].pcm =</div><div class='add'>+			ch_table[AMDTP_OUT_STREAM][params-&gt;dig_out_fmt][i / 2];</div><div class='add'>+		bebob-&gt;rx_stream_formations[i + 1].midi = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_special_controls(struct snd_bebob *bebob);</div><div class='add'>+int</div><div class='add'>+snd_bebob_maudio_special_discover(struct snd_bebob *bebob, bool is1814)</div><div class='add'>+{</div><div class='add'>+	struct special_params *params;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	params = devm_kzalloc(&amp;bebob-&gt;card-&gt;card_dev,</div><div class='add'>+			      sizeof(struct special_params), GFP_KERNEL);</div><div class='add'>+	if (!params)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	bebob-&gt;maudio_special_quirk = (void *)params;</div><div class='add'>+	params-&gt;is1814 = is1814;</div><div class='add'>+</div><div class='add'>+	/* initialize these parameters because driver is not allowed to ask */</div><div class='add'>+	bebob-&gt;rx_stream.context = ERR_PTR(-1);</div><div class='add'>+	bebob-&gt;tx_stream.context = ERR_PTR(-1);</div><div class='add'>+	err = avc_maudio_set_special_clk(bebob, 0x03, 0x00, 0x00, 0x00);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to initialize clock params: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = add_special_controls(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	special_stream_formation_set(bebob);</div><div class='add'>+</div><div class='add'>+	if (params-&gt;is1814) {</div><div class='add'>+		bebob-&gt;midi_input_ports = 1;</div><div class='add'>+		bebob-&gt;midi_output_ports = 1;</div><div class='add'>+	} else {</div><div class='add'>+		bebob-&gt;midi_input_ports = 2;</div><div class='add'>+		bebob-&gt;midi_output_ports = 2;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Input plug shows actual rate. Output plug is needless for this purpose. */</div><div class='add'>+static int special_get_rate(struct snd_bebob *bebob, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	int err, trials;</div><div class='add'>+</div><div class='add'>+	trials = 0;</div><div class='add'>+	do {</div><div class='add'>+		err = avc_general_get_sig_fmt(bebob-&gt;unit, rate,</div><div class='add'>+					      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+	} while (err == -EAGAIN &amp;&amp; ++trials &lt; 3);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static int special_set_rate(struct snd_bebob *bebob, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = avc_general_set_sig_fmt(bebob-&gt;unit, rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_OUT, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Just after changing sampling rate for output, a followed command</div><div class='add'>+	 * for input is easy to fail. This is a workaround fot this issue.</div><div class='add'>+	 */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	err = avc_general_set_sig_fmt(bebob-&gt;unit, rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (params-&gt;ctl_id_sync)</div><div class='add'>+		snd_ctl_notify(bebob-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='add'>+			       params-&gt;ctl_id_sync);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Clock source control for special firmware */</div><div class='add'>+static const enum snd_bebob_clock_type special_clk_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,	/* With digital mute */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* SPDIF/ADAT */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* Word Clock */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+};</div><div class='add'>+static int special_clk_get(struct snd_bebob *bebob, unsigned int *id)</div><div class='add'>+{</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	*id = params-&gt;clk_src;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int special_clk_ctl_info(struct snd_kcontrol *kctl,</div><div class='add'>+				struct snd_ctl_elem_info *einf)</div><div class='add'>+{</div><div class='add'>+	static const char *const special_clk_labels[] = {</div><div class='add'>+		"Internal with Digital Mute",</div><div class='add'>+		"Digital",</div><div class='add'>+		"Word Clock",</div><div class='add'>+		"Internal"</div><div class='add'>+	};</div><div class='add'>+	return snd_ctl_enum_info(einf, 1, ARRAY_SIZE(special_clk_types),</div><div class='add'>+				 special_clk_labels);</div><div class='add'>+}</div><div class='add'>+static int special_clk_ctl_get(struct snd_kcontrol *kctl,</div><div class='add'>+			       struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	uval-&gt;value.enumerated.item[0] = params-&gt;clk_src;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int special_clk_ctl_put(struct snd_kcontrol *kctl,</div><div class='add'>+			       struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	int err, id;</div><div class='add'>+</div><div class='add'>+	id = uval-&gt;value.enumerated.item[0];</div><div class='add'>+	if (id &gt;= ARRAY_SIZE(special_clk_types))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = avc_maudio_set_special_clk(bebob, id,</div><div class='add'>+					 params-&gt;dig_in_fmt,</div><div class='add'>+					 params-&gt;dig_out_fmt,</div><div class='add'>+					 params-&gt;clk_lock);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		err = 1;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static const struct snd_kcontrol_new special_clk_ctl = {</div><div class='add'>+	.name	= "Clock Source",</div><div class='add'>+	.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access	= SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info	= special_clk_ctl_info,</div><div class='add'>+	.get	= special_clk_ctl_get,</div><div class='add'>+	.put	= special_clk_ctl_put</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Clock synchronization control for special firmware */</div><div class='add'>+static int special_sync_ctl_info(struct snd_kcontrol *kctl,</div><div class='add'>+				 struct snd_ctl_elem_info *einf)</div><div class='add'>+{</div><div class='add'>+	einf-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='add'>+	einf-&gt;count = 1;</div><div class='add'>+	einf-&gt;value.integer.min = 0;</div><div class='add'>+	einf-&gt;value.integer.max = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int special_sync_ctl_get(struct snd_kcontrol *kctl,</div><div class='add'>+				struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	int err;</div><div class='add'>+	bool synced = 0;</div><div class='add'>+</div><div class='add'>+	err = check_clk_sync(bebob, METER_SIZE_SPECIAL, &amp;synced);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		uval-&gt;value.integer.value[0] = synced;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static const struct snd_kcontrol_new special_sync_ctl = {</div><div class='add'>+	.name	= "Sync Status",</div><div class='add'>+	.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access	= SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+	.info	= special_sync_ctl_info,</div><div class='add'>+	.get	= special_sync_ctl_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Digital input interface control for special firmware */</div><div class='add'>+static const char *const special_dig_in_iface_labels[] = {</div><div class='add'>+	"S/PDIF Optical", "S/PDIF Coaxial", "ADAT Optical"</div><div class='add'>+};</div><div class='add'>+static int special_dig_in_iface_ctl_info(struct snd_kcontrol *kctl,</div><div class='add'>+					 struct snd_ctl_elem_info *einf)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_enum_info(einf, 1,</div><div class='add'>+				 ARRAY_SIZE(special_dig_in_iface_labels),</div><div class='add'>+				 special_dig_in_iface_labels);</div><div class='add'>+}</div><div class='add'>+static int special_dig_in_iface_ctl_get(struct snd_kcontrol *kctl,</div><div class='add'>+					struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	unsigned int dig_in_iface;</div><div class='add'>+	int err, val;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = avc_audio_get_selector(bebob-&gt;unit, 0x00, 0x04,</div><div class='add'>+				     &amp;dig_in_iface);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get digital input interface: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* encoded id for user value */</div><div class='add'>+	val = (params-&gt;dig_in_fmt &lt;&lt; 1) | (dig_in_iface &amp; 0x01);</div><div class='add'>+</div><div class='add'>+	/* for ADAT Optical */</div><div class='add'>+	if (val &gt; 2)</div><div class='add'>+		val = 2;</div><div class='add'>+</div><div class='add'>+	uval-&gt;value.enumerated.item[0] = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int special_dig_in_iface_ctl_set(struct snd_kcontrol *kctl,</div><div class='add'>+					struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	unsigned int id, dig_in_fmt, dig_in_iface;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	id = uval-&gt;value.enumerated.item[0];</div><div class='add'>+	if (id &gt;= ARRAY_SIZE(special_dig_in_iface_labels))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* decode user value */</div><div class='add'>+	dig_in_fmt = (id &gt;&gt; 1) &amp; 0x01;</div><div class='add'>+	dig_in_iface = id &amp; 0x01;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = avc_maudio_set_special_clk(bebob,</div><div class='add'>+					 params-&gt;clk_src,</div><div class='add'>+					 dig_in_fmt,</div><div class='add'>+					 params-&gt;dig_out_fmt,</div><div class='add'>+					 params-&gt;clk_lock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* For ADAT, optical interface is only available. */</div><div class='add'>+	if (params-&gt;dig_in_fmt &gt; 0)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	/* For S/PDIF, optical/coaxial interfaces are selectable. */</div><div class='add'>+	err = avc_audio_set_selector(bebob-&gt;unit, 0x00, 0x04, dig_in_iface);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to set digital input interface: %d\n", err);</div><div class='add'>+	special_stream_formation_set(bebob);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+static const struct snd_kcontrol_new special_dig_in_iface_ctl = {</div><div class='add'>+	.name	= "Digital Input Interface",</div><div class='add'>+	.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access	= SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info	= special_dig_in_iface_ctl_info,</div><div class='add'>+	.get	= special_dig_in_iface_ctl_get,</div><div class='add'>+	.put	= special_dig_in_iface_ctl_set</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Digital output interface control for special firmware */</div><div class='add'>+static const char *const special_dig_out_iface_labels[] = {</div><div class='add'>+	"S/PDIF Optical and Coaxial", "ADAT Optical"</div><div class='add'>+};</div><div class='add'>+static int special_dig_out_iface_ctl_info(struct snd_kcontrol *kctl,</div><div class='add'>+					  struct snd_ctl_elem_info *einf)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_enum_info(einf, 1,</div><div class='add'>+				 ARRAY_SIZE(special_dig_out_iface_labels),</div><div class='add'>+				 special_dig_out_iface_labels);</div><div class='add'>+}</div><div class='add'>+static int special_dig_out_iface_ctl_get(struct snd_kcontrol *kctl,</div><div class='add'>+					 struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+	uval-&gt;value.enumerated.item[0] = params-&gt;dig_out_fmt;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int special_dig_out_iface_ctl_set(struct snd_kcontrol *kctl,</div><div class='add'>+					 struct snd_ctl_elem_value *uval)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = snd_kcontrol_chip(kctl);</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	id = uval-&gt;value.enumerated.item[0];</div><div class='add'>+	if (id &gt;= ARRAY_SIZE(special_dig_out_iface_labels))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = avc_maudio_set_special_clk(bebob,</div><div class='add'>+					 params-&gt;clk_src,</div><div class='add'>+					 params-&gt;dig_in_fmt,</div><div class='add'>+					 id, params-&gt;clk_lock);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		special_stream_formation_set(bebob);</div><div class='add'>+		err = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static const struct snd_kcontrol_new special_dig_out_iface_ctl = {</div><div class='add'>+	.name	= "Digital Output Interface",</div><div class='add'>+	.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access	= SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info	= special_dig_out_iface_ctl_info,</div><div class='add'>+	.get	= special_dig_out_iface_ctl_get,</div><div class='add'>+	.put	= special_dig_out_iface_ctl_set</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int add_special_controls(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct special_params *params = bebob-&gt;maudio_special_quirk;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;special_clk_ctl, bebob);</div><div class='add'>+	err = snd_ctl_add(bebob-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;special_sync_ctl, bebob);</div><div class='add'>+	err = snd_ctl_add(bebob-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	params-&gt;ctl_id_sync = &amp;kctl-&gt;id;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;special_dig_in_iface_ctl, bebob);</div><div class='add'>+	err = snd_ctl_add(bebob-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;special_dig_out_iface_ctl, bebob);</div><div class='add'>+	err = snd_ctl_add(bebob-&gt;card, kctl);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hardware metering for special firmware */</div><div class='add'>+static const char *const special_meter_labels[] = {</div><div class='add'>+	ANA_IN, ANA_IN, ANA_IN, ANA_IN,</div><div class='add'>+	SPDIF_IN,</div><div class='add'>+	ADAT_IN, ADAT_IN, ADAT_IN, ADAT_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT,</div><div class='add'>+	SPDIF_OUT,</div><div class='add'>+	ADAT_OUT, ADAT_OUT, ADAT_OUT, ADAT_OUT,</div><div class='add'>+	HP_OUT, HP_OUT,</div><div class='add'>+	AUX_OUT</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+special_meter_get(struct snd_bebob *bebob, u32 *target, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	__be16 *buf;</div><div class='add'>+	unsigned int i, c, channels;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	channels = ARRAY_SIZE(special_meter_labels) * 2;</div><div class='add'>+	if (size &lt; channels * sizeof(u32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* omit last 4 bytes because it's clock info. */</div><div class='add'>+	buf = kmalloc(METER_SIZE_SPECIAL - 4, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = get_meter(bebob, (void *)buf, METER_SIZE_SPECIAL - 4);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Its format is u16 and some channels are unknown. */</div><div class='add'>+	i = 0;</div><div class='add'>+	for (c = 2; c &lt; channels + 2; c++)</div><div class='add'>+		target[i++] = be16_to_cpu(buf[c]) &lt;&lt; 16;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* last 4 bytes are omitted because it's clock info. */</div><div class='add'>+static const char *const fw410_meter_labels[] = {</div><div class='add'>+	ANA_IN, DIG_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT, DIG_OUT,</div><div class='add'>+	HP_OUT</div><div class='add'>+};</div><div class='add'>+static const char *const audiophile_meter_labels[] = {</div><div class='add'>+	ANA_IN, DIG_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT, DIG_OUT,</div><div class='add'>+	HP_OUT, AUX_OUT,</div><div class='add'>+};</div><div class='add'>+static const char *const solo_meter_labels[] = {</div><div class='add'>+	ANA_IN, DIG_IN,</div><div class='add'>+	STRM_IN, STRM_IN,</div><div class='add'>+	ANA_OUT, DIG_OUT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* no clock info */</div><div class='add'>+static const char *const ozonic_meter_labels[] = {</div><div class='add'>+	ANA_IN, ANA_IN,</div><div class='add'>+	STRM_IN, STRM_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT</div><div class='add'>+};</div><div class='add'>+/* TODO: need testers. these positions are based on authour's assumption */</div><div class='add'>+static const char *const nrv10_meter_labels[] = {</div><div class='add'>+	ANA_IN, ANA_IN, ANA_IN, ANA_IN,</div><div class='add'>+	DIG_IN,</div><div class='add'>+	ANA_OUT, ANA_OUT, ANA_OUT, ANA_OUT,</div><div class='add'>+	DIG_IN</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+normal_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	const struct snd_bebob_meter_spec *spec = bebob-&gt;spec-&gt;meter;</div><div class='add'>+	unsigned int c, channels;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	channels = spec-&gt;num * 2;</div><div class='add'>+	if (size &lt; channels * sizeof(u32))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = get_meter(bebob, (void *)buf, size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; channels; c++)</div><div class='add'>+		be32_to_cpus(&amp;buf[c]);</div><div class='add'>+</div><div class='add'>+	/* swap stream channels because inverted */</div><div class='add'>+	if (spec-&gt;labels == solo_meter_labels) {</div><div class='add'>+		swap(buf[4], buf[6]);</div><div class='add'>+		swap(buf[5], buf[7]);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* for special customized devices */</div><div class='add'>+static const struct snd_bebob_rate_spec special_rate_spec = {</div><div class='add'>+	.get	= &amp;special_get_rate,</div><div class='add'>+	.set	= &amp;special_set_rate,</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_clock_spec special_clk_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(special_clk_types),</div><div class='add'>+	.types	= special_clk_types,</div><div class='add'>+	.get	= &amp;special_clk_get,</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_meter_spec special_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(special_meter_labels),</div><div class='add'>+	.labels	= special_meter_labels,</div><div class='add'>+	.get	= &amp;special_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_special_spec = {</div><div class='add'>+	.clock	= &amp;special_clk_spec,</div><div class='add'>+	.rate	= &amp;special_rate_spec,</div><div class='add'>+	.meter	= &amp;special_meter_spec</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Firewire 410 specification */</div><div class='add'>+static const struct snd_bebob_rate_spec usual_rate_spec = {</div><div class='add'>+	.get	= &amp;snd_bebob_stream_get_rate,</div><div class='add'>+	.set	= &amp;snd_bebob_stream_set_rate,</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_meter_spec fw410_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(fw410_meter_labels),</div><div class='add'>+	.labels	= fw410_meter_labels,</div><div class='add'>+	.get	= &amp;normal_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_fw410_spec = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;usual_rate_spec,</div><div class='add'>+	.meter	= &amp;fw410_meter_spec</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Firewire Audiophile specification */</div><div class='add'>+static const struct snd_bebob_meter_spec audiophile_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(audiophile_meter_labels),</div><div class='add'>+	.labels	= audiophile_meter_labels,</div><div class='add'>+	.get	= &amp;normal_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_audiophile_spec = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;usual_rate_spec,</div><div class='add'>+	.meter	= &amp;audiophile_meter_spec</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Firewire Solo specification */</div><div class='add'>+static const struct snd_bebob_meter_spec solo_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(solo_meter_labels),</div><div class='add'>+	.labels	= solo_meter_labels,</div><div class='add'>+	.get	= &amp;normal_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_solo_spec = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;usual_rate_spec,</div><div class='add'>+	.meter	= &amp;solo_meter_spec</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ozonic specification */</div><div class='add'>+static const struct snd_bebob_meter_spec ozonic_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(ozonic_meter_labels),</div><div class='add'>+	.labels	= ozonic_meter_labels,</div><div class='add'>+	.get	= &amp;normal_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_ozonic_spec = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;usual_rate_spec,</div><div class='add'>+	.meter	= &amp;ozonic_meter_spec</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NRV10 specification */</div><div class='add'>+static const struct snd_bebob_meter_spec nrv10_meter_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(nrv10_meter_labels),</div><div class='add'>+	.labels	= nrv10_meter_labels,</div><div class='add'>+	.get	= &amp;normal_meter_get</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec maudio_nrv10_spec = {</div><div class='add'>+	.clock	= NULL,</div><div class='add'>+	.rate	= &amp;usual_rate_spec,</div><div class='add'>+	.meter	= &amp;nrv10_meter_spec</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_midi.c b/sound/firewire/bebob/bebob_midi.c<br/>new file mode 100644<br/>index 000000000000..678631f31d3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_midi.c</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_midi.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "bebob.h"</div><div class='add'>+</div><div class='add'>+static int midi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_lock_try(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;bebob-&gt;mutex) {</div><div class='add'>+		err = snd_bebob_stream_reserve_duplex(bebob, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++bebob-&gt;substreams_counter;</div><div class='add'>+			err = snd_bebob_stream_start_duplex(bebob);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--bebob-&gt;substreams_counter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_bebob_stream_lock_release(bebob);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;bebob-&gt;mutex) {</div><div class='add'>+		bebob-&gt;substreams_counter--;</div><div class='add'>+		snd_bebob_stream_stop_duplex(bebob);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_bebob_stream_lock_release(bebob);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;bebob-&gt;tx_stream,</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;bebob-&gt;tx_stream,</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;bebob-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;bebob-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_bebob *bebob,</div><div class='add'>+				     struct snd_rawmidi_str *str)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+		scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+			  "%s MIDI %d",</div><div class='add'>+			  bebob-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_midi_devices(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* create midi ports */</div><div class='add'>+	err = snd_rawmidi_new(bebob-&gt;card, bebob-&gt;card-&gt;driver, 0,</div><div class='add'>+			      bebob-&gt;midi_output_ports, bebob-&gt;midi_input_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", bebob-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = bebob;</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;midi_input_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;capture_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(bebob, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;midi_output_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;playback_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(bebob, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((bebob-&gt;midi_output_ports &gt; 0) &amp;&amp; (bebob-&gt;midi_input_ports &gt; 0))</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c<br/>new file mode 100644<br/>index 000000000000..692d33bac2d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_pcm.c</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_pcm.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hw_rule_rate(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob_stream_formation *formations = rule-&gt;private;</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; i++) {</div><div class='add'>+		/* entry is invalid */</div><div class='add'>+		if (formations[i].pcm == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(c, formations[i].pcm))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, snd_bebob_rate_table[i]);</div><div class='add'>+		t.max = max(t.max, snd_bebob_rate_table[i]);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return snd_interval_refine(r, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hw_rule_channels(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob_stream_formation *formations = rule-&gt;private;</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; i++) {</div><div class='add'>+		/* entry is invalid */</div><div class='add'>+		if (formations[i].pcm == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(r, snd_bebob_rate_table[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, formations[i].pcm);</div><div class='add'>+		t.max = max(t.max, formations[i].pcm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+limit_channels_and_rates(struct snd_pcm_hardware *hw,</div><div class='add'>+			 struct snd_bebob_stream_formation *formations)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rate_min = UINT_MAX;</div><div class='add'>+	hw-&gt;rate_max = 0;</div><div class='add'>+	hw-&gt;rates = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; i++) {</div><div class='add'>+		/* entry has no PCM channels */</div><div class='add'>+		if (formations[i].pcm == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, formations[i].pcm);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, formations[i].pcm);</div><div class='add'>+</div><div class='add'>+		hw-&gt;rate_min = min(hw-&gt;rate_min, snd_bebob_rate_table[i]);</div><div class='add'>+		hw-&gt;rate_max = max(hw-&gt;rate_max, snd_bebob_rate_table[i]);</div><div class='add'>+		hw-&gt;rates |= snd_pcm_rate_to_rate_bit(snd_bebob_rate_table[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+pcm_init_hw_params(struct snd_bebob *bebob,</div><div class='add'>+		   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+	struct snd_bebob_stream_formation *formations;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_IN_PCM_FORMAT_BITS;</div><div class='add'>+		s = &amp;bebob-&gt;tx_stream;</div><div class='add'>+		formations = bebob-&gt;tx_stream_formations;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_OUT_PCM_FORMAT_BITS;</div><div class='add'>+		s = &amp;bebob-&gt;rx_stream;</div><div class='add'>+		formations = bebob-&gt;rx_stream_formations;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit_channels_and_rates(&amp;runtime-&gt;hw, formations);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_channels, formations,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_rate, formations,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+	const struct snd_bebob_rate_spec *spec = bebob-&gt;spec-&gt;rate;</div><div class='add'>+	struct amdtp_domain *d = &amp;bebob-&gt;domain;</div><div class='add'>+	enum snd_bebob_clock_type src;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_lock_try(bebob);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pcm_init_hw_params(bebob, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_get_clock_src(bebob, &amp;src);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;bebob-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if (src == SND_BEBOB_CLOCK_TYPE_EXTERNAL ||</div><div class='add'>+		    (bebob-&gt;substreams_counter &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0)) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int sampling_rate;</div><div class='add'>+</div><div class='add'>+			err = spec-&gt;get(bebob, &amp;sampling_rate);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+					"fail to get sampling rate: %d\n", err);</div><div class='add'>+				goto err_locked;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = sampling_rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = sampling_rate;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_bebob_stream_lock_release(bebob);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+	snd_bebob_stream_lock_release(bebob);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+		err = snd_bebob_stream_reserve_duplex(bebob, rate,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++bebob-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bebob-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		bebob-&gt;substreams_counter--;</div><div class='add'>+</div><div class='add'>+	snd_bebob_stream_stop_duplex(bebob);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_start_duplex(bebob);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;bebob-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static int</div><div class='add'>+pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_bebob_stream_start_duplex(bebob);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;bebob-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;bebob-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;bebob-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int</div><div class='add'>+pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;bebob-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;bebob-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;bebob-&gt;domain,</div><div class='add'>+					       &amp;bebob-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;bebob-&gt;domain,</div><div class='add'>+					       &amp;bebob-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;bebob-&gt;domain, &amp;bebob-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;bebob-&gt;domain, &amp;bebob-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_create_pcm_devices(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_capture_prepare,</div><div class='add'>+		.trigger	= pcm_capture_trigger,</div><div class='add'>+		.pointer	= pcm_capture_pointer,</div><div class='add'>+		.ack		= pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_playback_prepare,</div><div class='add'>+		.trigger	= pcm_playback_trigger,</div><div class='add'>+		.pointer	= pcm_playback_pointer,</div><div class='add'>+		.ack		= pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(bebob-&gt;card, bebob-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = bebob;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name),</div><div class='add'>+		 "%s PCM", bebob-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_proc.c b/sound/firewire/bebob/bebob_proc.c<br/>new file mode 100644<br/>index 000000000000..f659b888a6d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_proc.c</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_proc.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+/* contents of information register */</div><div class='add'>+struct hw_info {</div><div class='add'>+	u64 manufacturer;</div><div class='add'>+	u32 protocol_ver;</div><div class='add'>+	u32 bld_ver;</div><div class='add'>+	u32 guid[2];</div><div class='add'>+	u32 model_id;</div><div class='add'>+	u32 model_rev;</div><div class='add'>+	u64 fw_date;</div><div class='add'>+	u64 fw_time;</div><div class='add'>+	u32 fw_id;</div><div class='add'>+	u32 fw_ver;</div><div class='add'>+	u32 base_addr;</div><div class='add'>+	u32 max_size;</div><div class='add'>+	u64 bld_date;</div><div class='add'>+	u64 bld_time;</div><div class='add'>+/* may not used in product</div><div class='add'>+	u64 dbg_date;</div><div class='add'>+	u64 dbg_time;</div><div class='add'>+	u32 dbg_id;</div><div class='add'>+	u32 dbg_version;</div><div class='add'>+*/</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_hw_info(struct snd_info_entry *entry,</div><div class='add'>+		  struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = entry-&gt;private_data;</div><div class='add'>+	struct hw_info *info;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(struct hw_info), GFP_KERNEL);</div><div class='add'>+	if (info == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (snd_bebob_read_block(bebob-&gt;unit, 0,</div><div class='add'>+				   info, sizeof(struct hw_info)) &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Manufacturer:\t%.8s\n",</div><div class='add'>+		    (char *)&amp;info-&gt;manufacturer);</div><div class='add'>+	snd_iprintf(buffer, "Protocol Ver:\t%d\n", info-&gt;protocol_ver);</div><div class='add'>+	snd_iprintf(buffer, "Build Ver:\t%d\n", info-&gt;bld_ver);</div><div class='add'>+	snd_iprintf(buffer, "GUID:\t\t0x%.8X%.8X\n",</div><div class='add'>+		    info-&gt;guid[0], info-&gt;guid[1]);</div><div class='add'>+	snd_iprintf(buffer, "Model ID:\t0x%02X\n", info-&gt;model_id);</div><div class='add'>+	snd_iprintf(buffer, "Model Rev:\t%d\n", info-&gt;model_rev);</div><div class='add'>+	snd_iprintf(buffer, "Firmware Date:\t%.8s\n", (char *)&amp;info-&gt;fw_date);</div><div class='add'>+	snd_iprintf(buffer, "Firmware Time:\t%.8s\n", (char *)&amp;info-&gt;fw_time);</div><div class='add'>+	snd_iprintf(buffer, "Firmware ID:\t0x%X\n", info-&gt;fw_id);</div><div class='add'>+	snd_iprintf(buffer, "Firmware Ver:\t%d\n", info-&gt;fw_ver);</div><div class='add'>+	snd_iprintf(buffer, "Base Addr:\t0x%X\n", info-&gt;base_addr);</div><div class='add'>+	snd_iprintf(buffer, "Max Size:\t%d\n", info-&gt;max_size);</div><div class='add'>+	snd_iprintf(buffer, "Loader Date:\t%.8s\n", (char *)&amp;info-&gt;bld_date);</div><div class='add'>+	snd_iprintf(buffer, "Loader Time:\t%.8s\n", (char *)&amp;info-&gt;bld_time);</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	kfree(info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_meters(struct snd_info_entry *entry,</div><div class='add'>+		 struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = entry-&gt;private_data;</div><div class='add'>+	const struct snd_bebob_meter_spec *spec = bebob-&gt;spec-&gt;meter;</div><div class='add'>+	u32 *buf;</div><div class='add'>+	unsigned int i, c, channels, size;</div><div class='add'>+</div><div class='add'>+	if (spec == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	channels = spec-&gt;num * 2;</div><div class='add'>+	size = channels * sizeof(u32);</div><div class='add'>+	buf = kmalloc(size, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;get(bebob, buf, size) &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	for (i = 0, c = 1; i &lt; channels; i++) {</div><div class='add'>+		snd_iprintf(buffer, "%s %d:\t%d\n",</div><div class='add'>+			    spec-&gt;labels[i / 2], c++, buf[i]);</div><div class='add'>+		if ((i + 1 &lt; channels - 1) &amp;&amp;</div><div class='add'>+		    (strcmp(spec-&gt;labels[i / 2],</div><div class='add'>+			    spec-&gt;labels[(i + 1) / 2]) != 0))</div><div class='add'>+			c = 1;</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_formation(struct snd_info_entry *entry,</div><div class='add'>+		struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_bebob *bebob = entry-&gt;private_data;</div><div class='add'>+	struct snd_bebob_stream_formation *formation;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Output Stream from device:\n");</div><div class='add'>+	snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");</div><div class='add'>+	formation = bebob-&gt;tx_stream_formations;</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; i++) {</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "\t%d\t%d\t%d\n", snd_bebob_rate_table[i],</div><div class='add'>+			    formation[i].pcm, formation[i].midi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Input Stream to device:\n");</div><div class='add'>+	snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");</div><div class='add'>+	formation = bebob-&gt;rx_stream_formations;</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; i++) {</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "\t%d\t%d\t%d\n", snd_bebob_rate_table[i],</div><div class='add'>+			    formation[i].pcm, formation[i].midi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_clock(struct snd_info_entry *entry,</div><div class='add'>+		struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	static const char *const clk_labels[] = {</div><div class='add'>+		"Internal",</div><div class='add'>+		"External",</div><div class='add'>+		"SYT-Match",</div><div class='add'>+	};</div><div class='add'>+	struct snd_bebob *bebob = entry-&gt;private_data;</div><div class='add'>+	const struct snd_bebob_rate_spec *rate_spec = bebob-&gt;spec-&gt;rate;</div><div class='add'>+	const struct snd_bebob_clock_spec *clk_spec = bebob-&gt;spec-&gt;clock;</div><div class='add'>+	enum snd_bebob_clock_type src;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+</div><div class='add'>+	if (rate_spec-&gt;get(bebob, &amp;rate) &gt;= 0)</div><div class='add'>+		snd_iprintf(buffer, "Sampling rate: %d\n", rate);</div><div class='add'>+</div><div class='add'>+	if (snd_bebob_stream_get_clock_src(bebob, &amp;src) &gt;= 0) {</div><div class='add'>+		if (clk_spec)</div><div class='add'>+			snd_iprintf(buffer, "Clock Source: %s\n",</div><div class='add'>+				    clk_labels[src]);</div><div class='add'>+		else</div><div class='add'>+			snd_iprintf(buffer, "Clock Source: %s (MSU-dest: %d)\n",</div><div class='add'>+				    clk_labels[src], bebob-&gt;sync_input_plug);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+add_node(struct snd_bebob *bebob, struct snd_info_entry *root, const char *name,</div><div class='add'>+	 void (*op)(struct snd_info_entry *e, struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(bebob-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, bebob, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_bebob_proc_init(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(bebob-&gt;card, "firewire",</div><div class='add'>+					  bebob-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(bebob, root, "clock", proc_read_clock);</div><div class='add'>+	add_node(bebob, root, "firmware", proc_read_hw_info);</div><div class='add'>+	add_node(bebob, root, "formation", proc_read_formation);</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;spec-&gt;meter != NULL)</div><div class='add'>+		add_node(bebob, root, "meter", proc_read_meters);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c<br/>new file mode 100644<br/>index 000000000000..449cb17717f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_stream.c</a></div><div class='hunk'>@@ -0,0 +1,987 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_stream.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+#define READY_TIMEOUT_MS	4000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE;</div><div class='add'>+ * For BeBoB streams, Both of input and output CMP connection are important.</div><div class='add'>+ *</div><div class='add'>+ * For most devices, each CMP connection starts to transmit/receive a</div><div class='add'>+ * corresponding stream. But for a few devices, both of CMP connection needs</div><div class='add'>+ * to start transmitting stream. An example is 'M-Audio Firewire 410'.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* 128 is an arbitrary length but it seems to be enough */</div><div class='add'>+#define FORMAT_MAXIMUM_LENGTH 128</div><div class='add'>+</div><div class='add'>+const unsigned int snd_bebob_rate_table[SND_BEBOB_STRM_FMT_ENTRIES] = {</div><div class='add'>+	[0] = 32000,</div><div class='add'>+	[1] = 44100,</div><div class='add'>+	[2] = 48000,</div><div class='add'>+	[3] = 88200,</div><div class='add'>+	[4] = 96000,</div><div class='add'>+	[5] = 176400,</div><div class='add'>+	[6] = 192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See: Table 51: Extended Stream Format Info ‘Sampling Frequency’</div><div class='add'>+ * in Additional AVC commands (Nov 2003, BridgeCo)</div><div class='add'>+ */</div><div class='add'>+static const unsigned int bridgeco_freq_table[] = {</div><div class='add'>+	[0] = 0x02,</div><div class='add'>+	[1] = 0x03,</div><div class='add'>+	[2] = 0x04,</div><div class='add'>+	[3] = 0x0a,</div><div class='add'>+	[4] = 0x05,</div><div class='add'>+	[5] = 0x06,</div><div class='add'>+	[6] = 0x07,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_formation_index(unsigned int rate, unsigned int *index)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_bebob_rate_table); i++) {</div><div class='add'>+		if (snd_bebob_rate_table[i] == rate) {</div><div class='add'>+			*index = i;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+snd_bebob_stream_get_rate(struct snd_bebob *bebob, unsigned int *curr_rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int tx_rate, rx_rate, trials;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	trials = 0;</div><div class='add'>+	do {</div><div class='add'>+		err = avc_general_get_sig_fmt(bebob-&gt;unit, &amp;tx_rate,</div><div class='add'>+					      AVC_GENERAL_PLUG_DIR_OUT, 0);</div><div class='add'>+	} while (err == -EAGAIN &amp;&amp; ++trials &lt; 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	trials = 0;</div><div class='add'>+	do {</div><div class='add'>+		err = avc_general_get_sig_fmt(bebob-&gt;unit, &amp;rx_rate,</div><div class='add'>+					      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+	} while (err == -EAGAIN &amp;&amp; ++trials &lt; 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*curr_rate = rx_rate;</div><div class='add'>+	if (rx_rate == tx_rate)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* synchronize receive stream rate to transmit stream rate */</div><div class='add'>+	err = avc_general_set_sig_fmt(bebob-&gt;unit, rx_rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+snd_bebob_stream_set_rate(struct snd_bebob *bebob, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = avc_general_set_sig_fmt(bebob-&gt;unit, rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_OUT, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = avc_general_set_sig_fmt(bebob-&gt;unit, rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some devices need a bit time for transition.</div><div class='add'>+	 * 300msec is got by some experiments.</div><div class='add'>+	 */</div><div class='add'>+	msleep(300);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_get_clock_src(struct snd_bebob *bebob,</div><div class='add'>+				   enum snd_bebob_clock_type *src)</div><div class='add'>+{</div><div class='add'>+	const struct snd_bebob_clock_spec *clk_spec = bebob-&gt;spec-&gt;clock;</div><div class='add'>+	u8 addr[AVC_BRIDGECO_ADDR_BYTES], input[7];</div><div class='add'>+	unsigned int id;</div><div class='add'>+	enum avc_bridgeco_plug_type type;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* 1.The device has its own operation to switch source of clock */</div><div class='add'>+	if (clk_spec) {</div><div class='add'>+		err = clk_spec-&gt;get(bebob, &amp;id);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"fail to get clock source: %d\n", err);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (id &gt;= clk_spec-&gt;num) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"clock source %d out of range 0..%d\n",</div><div class='add'>+				id, clk_spec-&gt;num - 1);</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*src = clk_spec-&gt;types[id];</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 2.The device don't support to switch source of clock then assumed</div><div class='add'>+	 *   to use internal clock always</div><div class='add'>+	 */</div><div class='add'>+	if (bebob-&gt;sync_input_plug &lt; 0) {</div><div class='add'>+		*src = SND_BEBOB_CLOCK_TYPE_INTERNAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3.The device supports to switch source of clock by an usual way.</div><div class='add'>+	 *   Let's check input for 'Music Sub Unit Sync Input' plug.</div><div class='add'>+	 */</div><div class='add'>+	avc_bridgeco_fill_msu_addr(addr, AVC_BRIDGECO_PLUG_DIR_IN,</div><div class='add'>+				   bebob-&gt;sync_input_plug);</div><div class='add'>+	err = avc_bridgeco_get_plug_input(bebob-&gt;unit, addr, input);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get an input for MSU in plug %d: %d\n",</div><div class='add'>+			bebob-&gt;sync_input_plug, err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there are no input plugs, all of fields are 0xff.</div><div class='add'>+	 * Here check the first field. This field is used for direction.</div><div class='add'>+	 */</div><div class='add'>+	if (input[0] == 0xff) {</div><div class='add'>+		*src = SND_BEBOB_CLOCK_TYPE_INTERNAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The source from any output plugs is for one purpose only. */</div><div class='add'>+	if (input[0] == AVC_BRIDGECO_PLUG_DIR_OUT) {</div><div class='add'>+		/*</div><div class='add'>+		 * In BeBoB architecture, the source from music subunit may</div><div class='add'>+		 * bypass from oPCR[0]. This means that this source gives</div><div class='add'>+		 * synchronization to IEEE 1394 cycle start packet.</div><div class='add'>+		 */</div><div class='add'>+		if (input[1] == AVC_BRIDGECO_PLUG_MODE_SUBUNIT &amp;&amp;</div><div class='add'>+		    input[2] == 0x0c) {</div><div class='add'>+			*src = SND_BEBOB_CLOCK_TYPE_INTERNAL;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	/* The source from any input units is for several purposes. */</div><div class='add'>+	} else if (input[1] == AVC_BRIDGECO_PLUG_MODE_UNIT) {</div><div class='add'>+		if (input[2] == AVC_BRIDGECO_PLUG_UNIT_ISOC) {</div><div class='add'>+			if (input[3] == 0x00) {</div><div class='add'>+				/*</div><div class='add'>+				 * This source comes from iPCR[0]. This means</div><div class='add'>+				 * that presentation timestamp calculated by</div><div class='add'>+				 * SYT series of the received packets. In</div><div class='add'>+				 * short, this driver is the master of</div><div class='add'>+				 * synchronization.</div><div class='add'>+				 */</div><div class='add'>+				*src = SND_BEBOB_CLOCK_TYPE_SYT;</div><div class='add'>+				goto end;</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				 * This source comes from iPCR[1-29]. This</div><div class='add'>+				 * means that the synchronization stream is not</div><div class='add'>+				 * the Audio/MIDI compound stream.</div><div class='add'>+				 */</div><div class='add'>+				*src = SND_BEBOB_CLOCK_TYPE_EXTERNAL;</div><div class='add'>+				goto end;</div><div class='add'>+			}</div><div class='add'>+		} else if (input[2] == AVC_BRIDGECO_PLUG_UNIT_EXT) {</div><div class='add'>+			/* Check type of this plug.  */</div><div class='add'>+			avc_bridgeco_fill_unit_addr(addr,</div><div class='add'>+						    AVC_BRIDGECO_PLUG_DIR_IN,</div><div class='add'>+						    AVC_BRIDGECO_PLUG_UNIT_EXT,</div><div class='add'>+						    input[3]);</div><div class='add'>+			err = avc_bridgeco_get_plug_type(bebob-&gt;unit, addr,</div><div class='add'>+							 &amp;type);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto end;</div><div class='add'>+</div><div class='add'>+			if (type == AVC_BRIDGECO_PLUG_TYPE_DIG) {</div><div class='add'>+				/*</div><div class='add'>+				 * SPDIF/ADAT or sometimes (not always) word</div><div class='add'>+				 * clock.</div><div class='add'>+				 */</div><div class='add'>+				*src = SND_BEBOB_CLOCK_TYPE_EXTERNAL;</div><div class='add'>+				goto end;</div><div class='add'>+			} else if (type == AVC_BRIDGECO_PLUG_TYPE_SYNC) {</div><div class='add'>+				/* Often word clock. */</div><div class='add'>+				*src = SND_BEBOB_CLOCK_TYPE_EXTERNAL;</div><div class='add'>+				goto end;</div><div class='add'>+			} else if (type == AVC_BRIDGECO_PLUG_TYPE_ADDITION) {</div><div class='add'>+				/*</div><div class='add'>+				 * Not standard.</div><div class='add'>+				 * Mostly, additional internal clock.</div><div class='add'>+				 */</div><div class='add'>+				*src = SND_BEBOB_CLOCK_TYPE_INTERNAL;</div><div class='add'>+				goto end;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Not supported. */</div><div class='add'>+	err = -EIO;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	unsigned int sec, sections, ch, channels;</div><div class='add'>+	unsigned int pcm, midi, location;</div><div class='add'>+	unsigned int stm_pos, sec_loc, pos;</div><div class='add'>+	u8 *buf, addr[AVC_BRIDGECO_ADDR_BYTES], type;</div><div class='add'>+	enum avc_bridgeco_plug_dir dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The length of return value of this command cannot be expected. Here</div><div class='add'>+	 * use the maximum length of FCP.</div><div class='add'>+	 */</div><div class='add'>+	buf = kzalloc(256, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;bebob-&gt;tx_stream)</div><div class='add'>+		dir = AVC_BRIDGECO_PLUG_DIR_OUT;</div><div class='add'>+	else</div><div class='add'>+		dir = AVC_BRIDGECO_PLUG_DIR_IN;</div><div class='add'>+</div><div class='add'>+	avc_bridgeco_fill_unit_addr(addr, dir, AVC_BRIDGECO_PLUG_UNIT_ISOC, 0);</div><div class='add'>+	err = avc_bridgeco_get_plug_ch_pos(bebob-&gt;unit, addr, buf, 256);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get channel position for isoc %s plug 0: %d\n",</div><div class='add'>+			(dir == AVC_BRIDGECO_PLUG_DIR_IN) ? "in" : "out",</div><div class='add'>+			err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	pos = 0;</div><div class='add'>+</div><div class='add'>+	/* positions in I/O buffer */</div><div class='add'>+	pcm = 0;</div><div class='add'>+	midi = 0;</div><div class='add'>+</div><div class='add'>+	/* the number of sections in AMDTP packet */</div><div class='add'>+	sections = buf[pos++];</div><div class='add'>+</div><div class='add'>+	for (sec = 0; sec &lt; sections; sec++) {</div><div class='add'>+		/* type of this section */</div><div class='add'>+		avc_bridgeco_fill_unit_addr(addr, dir,</div><div class='add'>+					    AVC_BRIDGECO_PLUG_UNIT_ISOC, 0);</div><div class='add'>+		err = avc_bridgeco_get_plug_section_type(bebob-&gt;unit, addr,</div><div class='add'>+							 sec, &amp;type);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get section type for isoc %s plug 0: %d\n",</div><div class='add'>+				(dir == AVC_BRIDGECO_PLUG_DIR_IN) ? "in" :</div><div class='add'>+								    "out",</div><div class='add'>+				err);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		/* NoType */</div><div class='add'>+		if (type == 0xff) {</div><div class='add'>+			err = -ENOSYS;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* the number of channels in this section */</div><div class='add'>+		channels = buf[pos++];</div><div class='add'>+</div><div class='add'>+		for (ch = 0; ch &lt; channels; ch++) {</div><div class='add'>+			/* position of this channel in AMDTP packet */</div><div class='add'>+			stm_pos = buf[pos++] - 1;</div><div class='add'>+			/* location of this channel in this section */</div><div class='add'>+			sec_loc = buf[pos++] - 1;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * Basically the number of location is within the</div><div class='add'>+			 * number of channels in this section. But some models</div><div class='add'>+			 * of M-Audio don't follow this. Its location for MIDI</div><div class='add'>+			 * is the position of MIDI channels in AMDTP packet.</div><div class='add'>+			 */</div><div class='add'>+			if (sec_loc &gt;= channels)</div><div class='add'>+				sec_loc = ch;</div><div class='add'>+</div><div class='add'>+			switch (type) {</div><div class='add'>+			/* for MIDI conformant data channel */</div><div class='add'>+			case 0x0a:</div><div class='add'>+				/* AMDTP_MAX_CHANNELS_FOR_MIDI is 1. */</div><div class='add'>+				if ((midi &gt; 0) &amp;&amp; (stm_pos != midi)) {</div><div class='add'>+					err = -ENOSYS;</div><div class='add'>+					goto end;</div><div class='add'>+				}</div><div class='add'>+				amdtp_am824_set_midi_position(s, stm_pos);</div><div class='add'>+				midi = stm_pos;</div><div class='add'>+				break;</div><div class='add'>+			/* for PCM data channel */</div><div class='add'>+			case 0x01:	/* Headphone */</div><div class='add'>+			case 0x02:	/* Microphone */</div><div class='add'>+			case 0x03:	/* Line */</div><div class='add'>+			case 0x04:	/* SPDIF */</div><div class='add'>+			case 0x05:	/* ADAT */</div><div class='add'>+			case 0x06:	/* TDIF */</div><div class='add'>+			case 0x07:	/* MADI */</div><div class='add'>+			/* for undefined/changeable signal  */</div><div class='add'>+			case 0x08:	/* Analog */</div><div class='add'>+			case 0x09:	/* Digital */</div><div class='add'>+			default:</div><div class='add'>+				location = pcm + sec_loc;</div><div class='add'>+				if (location &gt;= AM824_MAX_CHANNELS_FOR_PCM) {</div><div class='add'>+					err = -ENOSYS;</div><div class='add'>+					goto end;</div><div class='add'>+				}</div><div class='add'>+				amdtp_am824_set_pcm_position(s, location,</div><div class='add'>+							     stm_pos);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (type != 0x0a)</div><div class='add'>+			pcm += channels;</div><div class='add'>+		else</div><div class='add'>+			midi += channels;</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+check_connection_used_by_others(struct snd_bebob *bebob, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	bool used;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;bebob-&gt;tx_stream)</div><div class='add'>+		conn = &amp;bebob-&gt;out_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;bebob-&gt;in_conn;</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_check_used(conn, &amp;used);</div><div class='add'>+	if ((err &gt;= 0) &amp;&amp; used &amp;&amp; !amdtp_stream_running(s)) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"Connection established by others: %cPCR[%d]\n",</div><div class='add'>+			(conn-&gt;direction == CMP_OUTPUT) ? 'o' : 'i',</div><div class='add'>+			conn-&gt;pcr_index);</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void break_both_connections(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	cmp_connection_break(&amp;bebob-&gt;in_conn);</div><div class='add'>+	cmp_connection_break(&amp;bebob-&gt;out_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_stream(struct snd_bebob *bebob, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;bebob-&gt;rx_stream)</div><div class='add'>+		conn = &amp;bebob-&gt;in_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;bebob-&gt;out_conn;</div><div class='add'>+</div><div class='add'>+	// channel mapping.</div><div class='add'>+	if (bebob-&gt;maudio_special_quirk == NULL) {</div><div class='add'>+		err = map_data_channels(bebob, stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_establish(conn);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_add_stream(&amp;bebob-&gt;domain, stream,</div><div class='add'>+				       conn-&gt;resources.channel, conn-&gt;speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_bebob *bebob, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = CIP_BLOCKING;</div><div class='add'>+	enum amdtp_stream_direction dir_stream;</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	enum cmp_direction dir_conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;bebob-&gt;tx_stream) {</div><div class='add'>+		dir_stream = AMDTP_IN_STREAM;</div><div class='add'>+		conn = &amp;bebob-&gt;out_conn;</div><div class='add'>+		dir_conn = CMP_OUTPUT;</div><div class='add'>+	} else {</div><div class='add'>+		dir_stream = AMDTP_OUT_STREAM;</div><div class='add'>+		conn = &amp;bebob-&gt;in_conn;</div><div class='add'>+		dir_conn = CMP_INPUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;bebob-&gt;tx_stream) {</div><div class='add'>+		if (bebob-&gt;quirks &amp; SND_BEBOB_QUIRK_WRONG_DBC)</div><div class='add'>+			flags |= CIP_EMPTY_HAS_WRONG_DBC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_init(conn, bebob-&gt;unit, dir_conn, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_init(stream, bebob-&gt;unit, dir_stream, flags);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cmp_connection_destroy(conn);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_bebob *bebob, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(stream);</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;bebob-&gt;tx_stream)</div><div class='add'>+		cmp_connection_destroy(&amp;bebob-&gt;out_conn);</div><div class='add'>+	else</div><div class='add'>+		cmp_connection_destroy(&amp;bebob-&gt;in_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_init_duplex(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(bebob, &amp;bebob-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(bebob, &amp;bebob-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(bebob, &amp;bebob-&gt;tx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;bebob-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(bebob, &amp;bebob-&gt;tx_stream);</div><div class='add'>+		destroy_stream(bebob, &amp;bebob-&gt;rx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_bebob *bebob, struct amdtp_stream *stream,</div><div class='add'>+			  unsigned int rate, unsigned int index)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+	unsigned int midi_ports;</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;bebob-&gt;tx_stream) {</div><div class='add'>+		pcm_channels = bebob-&gt;tx_stream_formations[index].pcm;</div><div class='add'>+		midi_ports = bebob-&gt;midi_input_ports;</div><div class='add'>+		conn = &amp;bebob-&gt;out_conn;</div><div class='add'>+	} else {</div><div class='add'>+		pcm_channels = bebob-&gt;rx_stream_formations[index].pcm;</div><div class='add'>+		midi_ports = bebob-&gt;midi_output_ports;</div><div class='add'>+		conn = &amp;bebob-&gt;in_conn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_set_parameters(stream, rate, pcm_channels, midi_ports, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_reserve_duplex(struct snd_bebob *bebob, unsigned int rate,</div><div class='add'>+				    unsigned int frames_per_period,</div><div class='add'>+				    unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Considering JACK/FFADO streaming:</div><div class='add'>+	// TODO: This can be removed hwdep functionality becomes popular.</div><div class='add'>+	err = check_connection_used_by_others(bebob, &amp;bebob-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bebob-&gt;spec-&gt;rate-&gt;get(bebob, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0)</div><div class='add'>+		rate = curr_rate;</div><div class='add'>+	if (curr_rate != rate) {</div><div class='add'>+		amdtp_domain_stop(&amp;bebob-&gt;domain);</div><div class='add'>+		break_both_connections(bebob);</div><div class='add'>+</div><div class='add'>+		cmp_connection_release(&amp;bebob-&gt;out_conn);</div><div class='add'>+		cmp_connection_release(&amp;bebob-&gt;in_conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bebob-&gt;substreams_counter == 0 || curr_rate != rate) {</div><div class='add'>+		unsigned int index;</div><div class='add'>+</div><div class='add'>+		// NOTE:</div><div class='add'>+		// If establishing connections at first, Yamaha GO46</div><div class='add'>+		// (and maybe Terratec X24) don't generate sound.</div><div class='add'>+		//</div><div class='add'>+		// For firmware customized by M-Audio, refer to next NOTE.</div><div class='add'>+		err = bebob-&gt;spec-&gt;rate-&gt;set(bebob, rate);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"fail to set sampling rate: %d\n",</div><div class='add'>+				err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = get_formation_index(rate, &amp;index);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(bebob, &amp;bebob-&gt;tx_stream, rate, index);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(bebob, &amp;bebob-&gt;rx_stream, rate, index);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			cmp_connection_release(&amp;bebob-&gt;out_conn);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;bebob-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			cmp_connection_release(&amp;bebob-&gt;out_conn);</div><div class='add'>+			cmp_connection_release(&amp;bebob-&gt;in_conn);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_start_duplex(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Need no substreams.</div><div class='add'>+	if (bebob-&gt;substreams_counter == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	// packet queueing error or detecting discontinuity</div><div class='add'>+	if (amdtp_streaming_error(&amp;bebob-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;bebob-&gt;tx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;bebob-&gt;domain);</div><div class='add'>+		break_both_connections(bebob);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(&amp;bebob-&gt;rx_stream)) {</div><div class='add'>+		enum snd_bebob_clock_type src;</div><div class='add'>+		unsigned int curr_rate;</div><div class='add'>+		unsigned int tx_init_skip_cycles;</div><div class='add'>+</div><div class='add'>+		if (bebob-&gt;maudio_special_quirk) {</div><div class='add'>+			err = bebob-&gt;spec-&gt;rate-&gt;get(bebob, &amp;curr_rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = snd_bebob_stream_get_clock_src(bebob, &amp;src);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = start_stream(bebob, &amp;bebob-&gt;rx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = start_stream(bebob, &amp;bebob-&gt;tx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!(bebob-&gt;quirks &amp; SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC))</div><div class='add'>+			tx_init_skip_cycles = 0;</div><div class='add'>+		else</div><div class='add'>+			tx_init_skip_cycles = 16000;</div><div class='add'>+</div><div class='add'>+		// MEMO: Some devices start packet transmission long enough after establishment of</div><div class='add'>+		// CMP connection. In the early stage of packet streaming, any device transfers</div><div class='add'>+		// NODATA packets. After several hundred cycles, it begins to multiplex event into</div><div class='add'>+		// the packet with adequate value of syt field in CIP header. Some devices are</div><div class='add'>+		// strictly to generate any discontinuity in the sequence of tx packet when they</div><div class='add'>+		// receives inadequate sequence of value in syt field of CIP header. In the case,</div><div class='add'>+		// the request to break CMP connection is often corrupted, then any transaction</div><div class='add'>+		// results in unrecoverable error, sometimes generate bus-reset.</div><div class='add'>+		err = amdtp_domain_start(&amp;bebob-&gt;domain, tx_init_skip_cycles, true, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		// NOTE:</div><div class='add'>+		// The firmware customized by M-Audio uses these commands to</div><div class='add'>+		// start transmitting stream. This is not usual way.</div><div class='add'>+		if (bebob-&gt;maudio_special_quirk) {</div><div class='add'>+			err = bebob-&gt;spec-&gt;rate-&gt;set(bebob, curr_rate);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+					"fail to ensure sampling rate: %d\n",</div><div class='add'>+					err);</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// Some devices postpone start of transmission mostly for 1 sec after receives</div><div class='add'>+		// packets firstly.</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;bebob-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;bebob-&gt;domain);</div><div class='add'>+	break_both_connections(bebob);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_bebob_stream_stop_duplex(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	if (bebob-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;bebob-&gt;domain);</div><div class='add'>+		break_both_connections(bebob);</div><div class='add'>+</div><div class='add'>+		cmp_connection_release(&amp;bebob-&gt;out_conn);</div><div class='add'>+		cmp_connection_release(&amp;bebob-&gt;in_conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function should be called before starting streams or after stopping</div><div class='add'>+ * streams.</div><div class='add'>+ */</div><div class='add'>+void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;bebob-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(bebob, &amp;bebob-&gt;tx_stream);</div><div class='add'>+	destroy_stream(bebob, &amp;bebob-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See: Table 50: Extended Stream Format Info Format Hierarchy Level 2’</div><div class='add'>+ * in Additional AVC commands (Nov 2003, BridgeCo)</div><div class='add'>+ * Also 'Clause 12 AM824 sequence adaption layers' in IEC 61883-6:2005</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+parse_stream_formation(u8 *buf, unsigned int len,</div><div class='add'>+		       struct snd_bebob_stream_formation *formation)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, e, channels, format;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this module can support a hierarchy combination that:</div><div class='add'>+	 *  Root:	Audio and Music (0x90)</div><div class='add'>+	 *  Level 1:	AM824 Compound  (0x40)</div><div class='add'>+	 */</div><div class='add'>+	if ((buf[0] != 0x90) || (buf[1] != 0x40))</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+</div><div class='add'>+	/* check sampling rate */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(bridgeco_freq_table); i++) {</div><div class='add'>+		if (buf[2] == bridgeco_freq_table[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(bridgeco_freq_table))</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+</div><div class='add'>+	/* Avoid double count by different entries for the same rate. */</div><div class='add'>+	memset(&amp;formation[i], 0, sizeof(struct snd_bebob_stream_formation));</div><div class='add'>+</div><div class='add'>+	for (e = 0; e &lt; buf[4]; e++) {</div><div class='add'>+		channels = buf[5 + e * 2];</div><div class='add'>+		format = buf[6 + e * 2];</div><div class='add'>+</div><div class='add'>+		switch (format) {</div><div class='add'>+		/* IEC 60958 Conformant, currently handled as MBLA */</div><div class='add'>+		case 0x00:</div><div class='add'>+		/* Multi bit linear audio */</div><div class='add'>+		case 0x06:	/* Raw */</div><div class='add'>+			formation[i].pcm += channels;</div><div class='add'>+			break;</div><div class='add'>+		/* MIDI Conformant */</div><div class='add'>+		case 0x0d:</div><div class='add'>+			formation[i].midi += channels;</div><div class='add'>+			break;</div><div class='add'>+		/* IEC 61937-3 to 7 */</div><div class='add'>+		case 0x01:</div><div class='add'>+		case 0x02:</div><div class='add'>+		case 0x03:</div><div class='add'>+		case 0x04:</div><div class='add'>+		case 0x05:</div><div class='add'>+		/* Multi bit linear audio */</div><div class='add'>+		case 0x07:	/* DVD-Audio */</div><div class='add'>+		case 0x0c:	/* High Precision */</div><div class='add'>+		/* One Bit Audio */</div><div class='add'>+		case 0x08:	/* (Plain) Raw */</div><div class='add'>+		case 0x09:	/* (Plain) SACD */</div><div class='add'>+		case 0x0a:	/* (Encoded) Raw */</div><div class='add'>+		case 0x0b:	/* (Encoded) SACD */</div><div class='add'>+		/* Synchronization Stream (Stereo Raw audio) */</div><div class='add'>+		case 0x40:</div><div class='add'>+		/* Don't care */</div><div class='add'>+		case 0xff:</div><div class='add'>+		default:</div><div class='add'>+			return -ENOSYS;	/* not supported */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (formation[i].pcm  &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    formation[i].midi &gt; AM824_MAX_CHANNELS_FOR_MIDI)</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_stream_formations(struct snd_bebob *bebob, u8 addr[AVC_BRIDGECO_ADDR_BYTES],</div><div class='add'>+				  enum avc_bridgeco_plug_dir plug_dir, unsigned int plug_id,</div><div class='add'>+				  struct snd_bebob_stream_formation *formations)</div><div class='add'>+{</div><div class='add'>+	enum avc_bridgeco_plug_type plug_type;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	unsigned int len, eid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	avc_bridgeco_fill_unit_addr(addr, plug_dir, AVC_BRIDGECO_PLUG_UNIT_ISOC, plug_id);</div><div class='add'>+</div><div class='add'>+	err = avc_bridgeco_get_plug_type(bebob-&gt;unit, addr, &amp;plug_type);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"Fail to get type for isoc %d plug 0: %d\n", plug_dir, err);</div><div class='add'>+		return err;</div><div class='add'>+	} else if (plug_type != AVC_BRIDGECO_PLUG_TYPE_ISOC)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(FORMAT_MAXIMUM_LENGTH, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (eid = 0; eid &lt; SND_BEBOB_STRM_FMT_ENTRIES; ++eid) {</div><div class='add'>+		avc_bridgeco_fill_unit_addr(addr, plug_dir, AVC_BRIDGECO_PLUG_UNIT_ISOC, plug_id);</div><div class='add'>+</div><div class='add'>+		len = FORMAT_MAXIMUM_LENGTH;</div><div class='add'>+		err = avc_bridgeco_get_plug_strm_fmt(bebob-&gt;unit, addr, buf, &amp;len, eid);</div><div class='add'>+		// No entries remained.</div><div class='add'>+		if (err == -EINVAL &amp;&amp; eid &gt; 0) {</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"fail to get stream format %d for isoc %d plug %d:%d\n",</div><div class='add'>+				eid, plug_dir, plug_id, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = parse_stream_formation(buf, len, formations);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_midi_ports(struct snd_bebob *bebob,</div><div class='add'>+			     const struct snd_bebob_stream_formation *formats,</div><div class='add'>+			     u8 addr[AVC_BRIDGECO_ADDR_BYTES], enum avc_bridgeco_plug_dir plug_dir,</div><div class='add'>+			     unsigned int plug_count, unsigned int *midi_ports)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	*midi_ports = 0;</div><div class='add'>+</div><div class='add'>+	/// Detect the number of available MIDI ports when packet has MIDI conformant data channel.</div><div class='add'>+	for (i = 0; i &lt; SND_BEBOB_STRM_FMT_ENTRIES; ++i) {</div><div class='add'>+		if (formats[i].midi &gt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt;= SND_BEBOB_STRM_FMT_ENTRIES)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; plug_count; ++i) {</div><div class='add'>+		enum avc_bridgeco_plug_type plug_type;</div><div class='add'>+		unsigned int ch_count;</div><div class='add'>+</div><div class='add'>+		avc_bridgeco_fill_unit_addr(addr, plug_dir, AVC_BRIDGECO_PLUG_UNIT_EXT, i);</div><div class='add'>+</div><div class='add'>+		err = avc_bridgeco_get_plug_type(bebob-&gt;unit, addr, &amp;plug_type);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"fail to get type for external %d plug %d: %d\n",</div><div class='add'>+				plug_dir, i, err);</div><div class='add'>+			break;</div><div class='add'>+		} else if (plug_type != AVC_BRIDGECO_PLUG_TYPE_MIDI) {</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = avc_bridgeco_get_plug_ch_count(bebob-&gt;unit, addr, &amp;ch_count);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		// Yamaha GO44, GO46, Terratec Phase 24, Phase x24 reports 0 for the number of</div><div class='add'>+		// channels in external output plug 3 (MIDI type) even if it has a pair of physical</div><div class='add'>+		// MIDI jacks. As a workaround, assume it as one.</div><div class='add'>+		if (ch_count == 0)</div><div class='add'>+			ch_count = 1;</div><div class='add'>+		*midi_ports += ch_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+seek_msu_sync_input_plug(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	u8 plugs[AVC_PLUG_INFO_BUF_BYTES], addr[AVC_BRIDGECO_ADDR_BYTES];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	enum avc_bridgeco_plug_type type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Get the number of Music Sub Unit for both direction. */</div><div class='add'>+	err = avc_general_get_plug_info(bebob-&gt;unit, 0x0c, 0x00, 0x00, plugs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get info for MSU in/out plugs: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* seek destination plugs for 'MSU sync input' */</div><div class='add'>+	bebob-&gt;sync_input_plug = -1;</div><div class='add'>+	for (i = 0; i &lt; plugs[0]; i++) {</div><div class='add'>+		avc_bridgeco_fill_msu_addr(addr, AVC_BRIDGECO_PLUG_DIR_IN, i);</div><div class='add'>+		err = avc_bridgeco_get_plug_type(bebob-&gt;unit, addr, &amp;type);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+				"fail to get type for MSU in plug %d: %d\n",</div><div class='add'>+				i, err);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (type == AVC_BRIDGECO_PLUG_TYPE_SYNC) {</div><div class='add'>+			bebob-&gt;sync_input_plug = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_discover(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	const struct snd_bebob_clock_spec *clk_spec = bebob-&gt;spec-&gt;clock;</div><div class='add'>+	u8 plugs[AVC_PLUG_INFO_BUF_BYTES], addr[AVC_BRIDGECO_ADDR_BYTES];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* the number of plugs for isoc in/out, ext in/out  */</div><div class='add'>+	err = avc_general_get_plug_info(bebob-&gt;unit, 0x1f, 0x07, 0x00, plugs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;bebob-&gt;unit-&gt;device,</div><div class='add'>+		"fail to get info for isoc/external in/out plugs: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This module supports at least one isoc input plug and one isoc</div><div class='add'>+	 * output plug.</div><div class='add'>+	 */</div><div class='add'>+	if ((plugs[0] == 0) || (plugs[1] == 0)) {</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fill_stream_formations(bebob, addr, AVC_BRIDGECO_PLUG_DIR_IN, 0,</div><div class='add'>+				     bebob-&gt;rx_stream_formations);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = fill_stream_formations(bebob, addr, AVC_BRIDGECO_PLUG_DIR_OUT, 0,</div><div class='add'>+				     bebob-&gt;tx_stream_formations);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = detect_midi_ports(bebob, bebob-&gt;tx_stream_formations, addr, AVC_BRIDGECO_PLUG_DIR_IN,</div><div class='add'>+				plugs[2], &amp;bebob-&gt;midi_input_ports);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = detect_midi_ports(bebob, bebob-&gt;rx_stream_formations, addr, AVC_BRIDGECO_PLUG_DIR_OUT,</div><div class='add'>+				plugs[3], &amp;bebob-&gt;midi_output_ports);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* for check source of clock later */</div><div class='add'>+	if (!clk_spec)</div><div class='add'>+		err = seek_msu_sync_input_plug(bebob);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_bebob_stream_lock_changed(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	bebob-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;bebob-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_bebob_stream_lock_try(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (bebob-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (bebob-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_bebob_stream_lock_changed(bebob);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_bebob_stream_lock_release(struct snd_bebob *bebob)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;bebob-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(bebob-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--bebob-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_bebob_stream_lock_changed(bebob);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_terratec.c b/sound/firewire/bebob/bebob_terratec.c<br/>new file mode 100644<br/>index 000000000000..c2dd074eca32<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_terratec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_terratec.c</a></div><div class='hunk'>@@ -0,0 +1,53 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_terratec.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+static const enum snd_bebob_clock_type phase88_rack_clk_src_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* S/PDIF */</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* Word Clock */</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+phase88_rack_clk_src_get(struct snd_bebob *bebob, unsigned int *id)</div><div class='add'>+{</div><div class='add'>+	unsigned int enable_ext, enable_word;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = avc_audio_get_selector(bebob-&gt;unit, 0, 9, &amp;enable_ext);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	err = avc_audio_get_selector(bebob-&gt;unit, 0, 8, &amp;enable_word);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (enable_ext == 0)</div><div class='add'>+		*id = 0;</div><div class='add'>+	else if (enable_word == 0)</div><div class='add'>+		*id = 1;</div><div class='add'>+	else</div><div class='add'>+		*id = 2;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_bebob_rate_spec phase_series_rate_spec = {</div><div class='add'>+	.get	= &amp;snd_bebob_stream_get_rate,</div><div class='add'>+	.set	= &amp;snd_bebob_stream_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* PHASE 88 Rack FW */</div><div class='add'>+static const struct snd_bebob_clock_spec phase88_rack_clk = {</div><div class='add'>+	.num	= ARRAY_SIZE(phase88_rack_clk_src_types),</div><div class='add'>+	.types	= phase88_rack_clk_src_types,</div><div class='add'>+	.get	= &amp;phase88_rack_clk_src_get,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec phase88_rack_spec = {</div><div class='add'>+	.clock	= &amp;phase88_rack_clk,</div><div class='add'>+	.rate	= &amp;phase_series_rate_spec,</div><div class='add'>+	.meter	= NULL</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/bebob/bebob_yamaha_terratec.c b/sound/firewire/bebob/bebob_yamaha_terratec.c<br/>new file mode 100644<br/>index 000000000000..ce1975e6ab86<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/bebob/bebob_yamaha_terratec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/bebob/bebob_yamaha_terratec.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * bebob_yamaha.c - a part of driver for BeBoB based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./bebob.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE:</div><div class='add'>+ * Yamaha GO44 is not designed to be used as stand-alone mixer. So any streams</div><div class='add'>+ * must be accompanied. If changing the state, a LED on the device starts to</div><div class='add'>+ * blink and its sync status is false. In this state, the device sounds nothing</div><div class='add'>+ * even if streaming. To start streaming at the current sampling rate is only</div><div class='add'>+ * way to recover this state. GO46 is better for stand-alone mixer.</div><div class='add'>+ *</div><div class='add'>+ * Both of them have a capability to change its sampling rate up to 192.0kHz.</div><div class='add'>+ * At 192.0kHz, the device reports 4 PCM-in, 1 MIDI-in, 6 PCM-out, 1 MIDI-out.</div><div class='add'>+ * But Yamaha's driver reduce 2 PCM-in, 1 MIDI-in, 2 PCM-out, 1 MIDI-out to use</div><div class='add'>+ * 'Extended Stream Format Information Command - Single Request' in 'Additional</div><div class='add'>+ * AVC commands' defined by BridgeCo.</div><div class='add'>+ * This ALSA driver don't do this because a bit tiresome. Then isochronous</div><div class='add'>+ * streaming with many asynchronous transactions brings sounds with noises.</div><div class='add'>+ * Unfortunately current 'ffado-mixer' generated many asynchronous transaction</div><div class='add'>+ * to observe device's state, mainly check cmp connection and signal format. I</div><div class='add'>+ * recommend users to close ffado-mixer at 192.0kHz if mixer is needless.</div><div class='add'>+ *</div><div class='add'>+ * Terratec PHASE 24 FW and PHASE X24 FW are internally the same as</div><div class='add'>+ * Yamaha GO 44 and GO 46. Yamaha and Terratec had cooperated for these models.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const enum snd_bebob_clock_type clk_src_types[] = {</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_INTERNAL,</div><div class='add'>+	SND_BEBOB_CLOCK_TYPE_EXTERNAL,	/* S/PDIF */</div><div class='add'>+};</div><div class='add'>+static int</div><div class='add'>+clk_src_get(struct snd_bebob *bebob, unsigned int *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = avc_audio_get_selector(bebob-&gt;unit, 0, 4, id);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (*id &gt;= ARRAY_SIZE(clk_src_types))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static const struct snd_bebob_clock_spec clock_spec = {</div><div class='add'>+	.num	= ARRAY_SIZE(clk_src_types),</div><div class='add'>+	.types	= clk_src_types,</div><div class='add'>+	.get	= &amp;clk_src_get,</div><div class='add'>+};</div><div class='add'>+static const struct snd_bebob_rate_spec rate_spec = {</div><div class='add'>+	.get	= &amp;snd_bebob_stream_get_rate,</div><div class='add'>+	.set	= &amp;snd_bebob_stream_set_rate,</div><div class='add'>+};</div><div class='add'>+const struct snd_bebob_spec yamaha_terratec_spec = {</div><div class='add'>+	.clock	= &amp;clock_spec,</div><div class='add'>+	.rate	= &amp;rate_spec,</div><div class='add'>+	.meter	= NULL</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c<br/>new file mode 100644<br/>index 000000000000..b2b76c7c71b3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/cmp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/cmp.c</a></div><div class='hunk'>@@ -0,0 +1,351 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Connection Management Procedures (IEC 61883-1) helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include "lib.h"</div><div class='add'>+#include "iso-resources.h"</div><div class='add'>+#include "cmp.h"</div><div class='add'>+</div><div class='add'>+/* MPR common fields */</div><div class='add'>+#define MPR_SPEED_MASK		0xc0000000</div><div class='add'>+#define MPR_SPEED_SHIFT		30</div><div class='add'>+#define MPR_XSPEED_MASK		0x00000060</div><div class='add'>+#define MPR_XSPEED_SHIFT	5</div><div class='add'>+#define MPR_PLUGS_MASK		0x0000001f</div><div class='add'>+</div><div class='add'>+/* PCR common fields */</div><div class='add'>+#define PCR_ONLINE		0x80000000</div><div class='add'>+#define PCR_BCAST_CONN		0x40000000</div><div class='add'>+#define PCR_P2P_CONN_MASK	0x3f000000</div><div class='add'>+#define PCR_P2P_CONN_SHIFT	24</div><div class='add'>+#define PCR_CHANNEL_MASK	0x003f0000</div><div class='add'>+#define PCR_CHANNEL_SHIFT	16</div><div class='add'>+</div><div class='add'>+/* oPCR specific fields */</div><div class='add'>+#define OPCR_XSPEED_MASK	0x00C00000</div><div class='add'>+#define OPCR_XSPEED_SHIFT	22</div><div class='add'>+#define OPCR_SPEED_MASK		0x0000C000</div><div class='add'>+#define OPCR_SPEED_SHIFT	14</div><div class='add'>+#define OPCR_OVERHEAD_ID_MASK	0x00003C00</div><div class='add'>+#define OPCR_OVERHEAD_ID_SHIFT	10</div><div class='add'>+</div><div class='add'>+enum bus_reset_handling {</div><div class='add'>+	ABORT_ON_BUS_RESET,</div><div class='add'>+	SUCCEED_ON_BUS_RESET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __printf(2, 3)</div><div class='add'>+void cmp_error(struct cmp_connection *c, const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+</div><div class='add'>+	va_start(va, fmt);</div><div class='add'>+	dev_err(&amp;c-&gt;resources.unit-&gt;device, "%cPCR%u: %pV",</div><div class='add'>+		(c-&gt;direction == CMP_INPUT) ? 'i' : 'o',</div><div class='add'>+		c-&gt;pcr_index, &amp;(struct va_format){ fmt, &amp;va });</div><div class='add'>+	va_end(va);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mpr_address(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	if (c-&gt;direction == CMP_INPUT)</div><div class='add'>+		return CSR_REGISTER_BASE + CSR_IMPR;</div><div class='add'>+	else</div><div class='add'>+		return CSR_REGISTER_BASE + CSR_OMPR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 pcr_address(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	if (c-&gt;direction == CMP_INPUT)</div><div class='add'>+		return CSR_REGISTER_BASE + CSR_IPCR(c-&gt;pcr_index);</div><div class='add'>+	else</div><div class='add'>+		return CSR_REGISTER_BASE + CSR_OPCR(c-&gt;pcr_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcr_modify(struct cmp_connection *c,</div><div class='add'>+		      __be32 (*modify)(struct cmp_connection *c, __be32 old),</div><div class='add'>+		      int (*check)(struct cmp_connection *c, __be32 pcr),</div><div class='add'>+		      enum bus_reset_handling bus_reset_handling)</div><div class='add'>+{</div><div class='add'>+	__be32 old_arg, buffer[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buffer[0] = c-&gt;last_pcr_value;</div><div class='add'>+	for (;;) {</div><div class='add'>+		old_arg = buffer[0];</div><div class='add'>+		buffer[1] = modify(c, buffer[0]);</div><div class='add'>+</div><div class='add'>+		err = snd_fw_transaction(</div><div class='add'>+				c-&gt;resources.unit, TCODE_LOCK_COMPARE_SWAP,</div><div class='add'>+				pcr_address(c), buffer, 8,</div><div class='add'>+				FW_FIXED_GENERATION | c-&gt;resources.generation);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			if (err == -EAGAIN &amp;&amp;</div><div class='add'>+			    bus_reset_handling == SUCCEED_ON_BUS_RESET)</div><div class='add'>+				err = 0;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (buffer[0] == old_arg) /* success? */</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (check) {</div><div class='add'>+			err = check(c, buffer[0]);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	c-&gt;last_pcr_value = buffer[1];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmp_connection_init - initializes a connection manager</div><div class='add'>+ * @c: the connection manager to initialize</div><div class='add'>+ * @unit: a unit of the target device</div><div class='add'>+ * @direction: input or output</div><div class='add'>+ * @pcr_index: the index of the iPCR/oPCR on the target device</div><div class='add'>+ */</div><div class='add'>+int cmp_connection_init(struct cmp_connection *c,</div><div class='add'>+			struct fw_unit *unit,</div><div class='add'>+			enum cmp_direction direction,</div><div class='add'>+			unsigned int pcr_index)</div><div class='add'>+{</div><div class='add'>+	__be32 mpr_be;</div><div class='add'>+	u32 mpr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	c-&gt;direction = direction;</div><div class='add'>+	err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 mpr_address(c), &amp;mpr_be, 4, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	mpr = be32_to_cpu(mpr_be);</div><div class='add'>+</div><div class='add'>+	if (pcr_index &gt;= (mpr &amp; MPR_PLUGS_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(&amp;c-&gt;resources, unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	c-&gt;connected = false;</div><div class='add'>+	mutex_init(&amp;c-&gt;mutex);</div><div class='add'>+	c-&gt;last_pcr_value = cpu_to_be32(0x80000000);</div><div class='add'>+	c-&gt;pcr_index = pcr_index;</div><div class='add'>+	c-&gt;max_speed = (mpr &amp; MPR_SPEED_MASK) &gt;&gt; MPR_SPEED_SHIFT;</div><div class='add'>+	if (c-&gt;max_speed == SCODE_BETA)</div><div class='add'>+		c-&gt;max_speed += (mpr &amp; MPR_XSPEED_MASK) &gt;&gt; MPR_XSPEED_SHIFT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmp_connection_check_used - check connection is already esablished or not</div><div class='add'>+ * @c: the connection manager to be checked</div><div class='add'>+ * @used: the pointer to store the result of checking the connection</div><div class='add'>+ */</div><div class='add'>+int cmp_connection_check_used(struct cmp_connection *c, bool *used)</div><div class='add'>+{</div><div class='add'>+	__be32 pcr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(</div><div class='add'>+			c-&gt;resources.unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+			pcr_address(c), &amp;pcr, 4, 0);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*used = !!(pcr &amp; cpu_to_be32(PCR_BCAST_CONN |</div><div class='add'>+					     PCR_P2P_CONN_MASK));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_check_used);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmp_connection_destroy - free connection manager resources</div><div class='add'>+ * @c: the connection manager</div><div class='add'>+ */</div><div class='add'>+void cmp_connection_destroy(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(c-&gt;connected);</div><div class='add'>+	mutex_destroy(&amp;c-&gt;mutex);</div><div class='add'>+	fw_iso_resources_destroy(&amp;c-&gt;resources);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_destroy);</div><div class='add'>+</div><div class='add'>+int cmp_connection_reserve(struct cmp_connection *c,</div><div class='add'>+			   unsigned int max_payload_bytes)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;c-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(c-&gt;resources.allocated))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	c-&gt;speed = min(c-&gt;max_speed,</div><div class='add'>+		       fw_parent_device(c-&gt;resources.unit)-&gt;max_speed);</div><div class='add'>+</div><div class='add'>+	return fw_iso_resources_allocate(&amp;c-&gt;resources, max_payload_bytes,</div><div class='add'>+					 c-&gt;speed);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_reserve);</div><div class='add'>+</div><div class='add'>+void cmp_connection_release(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;c-&gt;mutex);</div><div class='add'>+	fw_iso_resources_free(&amp;c-&gt;resources);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_release);</div><div class='add'>+</div><div class='add'>+static __be32 ipcr_set_modify(struct cmp_connection *c, __be32 ipcr)</div><div class='add'>+{</div><div class='add'>+	ipcr &amp;= ~cpu_to_be32(PCR_BCAST_CONN |</div><div class='add'>+			     PCR_P2P_CONN_MASK |</div><div class='add'>+			     PCR_CHANNEL_MASK);</div><div class='add'>+	ipcr |= cpu_to_be32(1 &lt;&lt; PCR_P2P_CONN_SHIFT);</div><div class='add'>+	ipcr |= cpu_to_be32(c-&gt;resources.channel &lt;&lt; PCR_CHANNEL_SHIFT);</div><div class='add'>+</div><div class='add'>+	return ipcr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_overhead_id(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * apply "oPCR overhead ID encoding"</div><div class='add'>+	 * the encoding table can convert up to 512.</div><div class='add'>+	 * here the value over 512 is converted as the same way as 512.</div><div class='add'>+	 */</div><div class='add'>+	for (id = 1; id &lt; 16; id++) {</div><div class='add'>+		if (c-&gt;resources.bandwidth_overhead &lt; (id &lt;&lt; 5))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (id == 16)</div><div class='add'>+		id = 0;</div><div class='add'>+</div><div class='add'>+	return id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __be32 opcr_set_modify(struct cmp_connection *c, __be32 opcr)</div><div class='add'>+{</div><div class='add'>+	unsigned int spd, xspd;</div><div class='add'>+</div><div class='add'>+	/* generate speed and extended speed field value */</div><div class='add'>+	if (c-&gt;speed &gt; SCODE_400) {</div><div class='add'>+		spd  = SCODE_800;</div><div class='add'>+		xspd = c-&gt;speed - SCODE_800;</div><div class='add'>+	} else {</div><div class='add'>+		spd = c-&gt;speed;</div><div class='add'>+		xspd = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opcr &amp;= ~cpu_to_be32(PCR_BCAST_CONN |</div><div class='add'>+			     PCR_P2P_CONN_MASK |</div><div class='add'>+			     OPCR_XSPEED_MASK |</div><div class='add'>+			     PCR_CHANNEL_MASK |</div><div class='add'>+			     OPCR_SPEED_MASK |</div><div class='add'>+			     OPCR_OVERHEAD_ID_MASK);</div><div class='add'>+	opcr |= cpu_to_be32(1 &lt;&lt; PCR_P2P_CONN_SHIFT);</div><div class='add'>+	opcr |= cpu_to_be32(xspd &lt;&lt; OPCR_XSPEED_SHIFT);</div><div class='add'>+	opcr |= cpu_to_be32(c-&gt;resources.channel &lt;&lt; PCR_CHANNEL_SHIFT);</div><div class='add'>+	opcr |= cpu_to_be32(spd &lt;&lt; OPCR_SPEED_SHIFT);</div><div class='add'>+	opcr |= cpu_to_be32(get_overhead_id(c) &lt;&lt; OPCR_OVERHEAD_ID_SHIFT);</div><div class='add'>+</div><div class='add'>+	return opcr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcr_set_check(struct cmp_connection *c, __be32 pcr)</div><div class='add'>+{</div><div class='add'>+	if (pcr &amp; cpu_to_be32(PCR_BCAST_CONN |</div><div class='add'>+			      PCR_P2P_CONN_MASK)) {</div><div class='add'>+		cmp_error(c, "plug is already in use\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	if (!(pcr &amp; cpu_to_be32(PCR_ONLINE))) {</div><div class='add'>+		cmp_error(c, "plug is not on-line\n");</div><div class='add'>+		return -ECONNREFUSED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmp_connection_establish - establish a connection to the target</div><div class='add'>+ * @c: the connection manager</div><div class='add'>+ *</div><div class='add'>+ * This function establishes a point-to-point connection from the local</div><div class='add'>+ * computer to the target by allocating isochronous resources (channel and</div><div class='add'>+ * bandwidth) and setting the target's input/output plug control register.</div><div class='add'>+ * When this function succeeds, the caller is responsible for starting</div><div class='add'>+ * transmitting packets.</div><div class='add'>+ */</div><div class='add'>+int cmp_connection_establish(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;c-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(c-&gt;connected))</div><div class='add'>+		return -EISCONN;</div><div class='add'>+</div><div class='add'>+retry_after_bus_reset:</div><div class='add'>+	if (c-&gt;direction == CMP_OUTPUT)</div><div class='add'>+		err = pcr_modify(c, opcr_set_modify, pcr_set_check,</div><div class='add'>+				 ABORT_ON_BUS_RESET);</div><div class='add'>+	else</div><div class='add'>+		err = pcr_modify(c, ipcr_set_modify, pcr_set_check,</div><div class='add'>+				 ABORT_ON_BUS_RESET);</div><div class='add'>+</div><div class='add'>+	if (err == -EAGAIN) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;c-&gt;resources);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			goto retry_after_bus_reset;</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		c-&gt;connected = true;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_establish);</div><div class='add'>+</div><div class='add'>+static __be32 pcr_break_modify(struct cmp_connection *c, __be32 pcr)</div><div class='add'>+{</div><div class='add'>+	return pcr &amp; ~cpu_to_be32(PCR_BCAST_CONN | PCR_P2P_CONN_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cmp_connection_break - break the connection to the target</div><div class='add'>+ * @c: the connection manager</div><div class='add'>+ *</div><div class='add'>+ * This function deactives the connection in the target's input/output plug</div><div class='add'>+ * control register, and frees the isochronous resources of the connection.</div><div class='add'>+ * Before calling this function, the caller should cease transmitting packets.</div><div class='add'>+ */</div><div class='add'>+void cmp_connection_break(struct cmp_connection *c)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;c-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!c-&gt;connected)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = pcr_modify(c, pcr_break_modify, NULL, SUCCEED_ON_BUS_RESET);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		cmp_error(c, "plug is still connected\n");</div><div class='add'>+</div><div class='add'>+	c-&gt;connected = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cmp_connection_break);</div><div class='head'>diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h<br/>new file mode 100644<br/>index 000000000000..66fc08b742d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/cmp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/cmp.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_CMP_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_CMP_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include "iso-resources.h"</div><div class='add'>+</div><div class='add'>+struct fw_unit;</div><div class='add'>+</div><div class='add'>+enum cmp_direction {</div><div class='add'>+	CMP_INPUT = 0,</div><div class='add'>+	CMP_OUTPUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct cmp_connection - manages an isochronous connection to a device</div><div class='add'>+ * @speed: the connection's actual speed</div><div class='add'>+ *</div><div class='add'>+ * This structure manages (using CMP) an isochronous stream between the local</div><div class='add'>+ * computer and a device's input plug (iPCR) and output plug (oPCR).</div><div class='add'>+ *</div><div class='add'>+ * There is no corresponding oPCR created on the local computer, so it is not</div><div class='add'>+ * possible to overlay connections on top of this one.</div><div class='add'>+ */</div><div class='add'>+struct cmp_connection {</div><div class='add'>+	int speed;</div><div class='add'>+	/* private: */</div><div class='add'>+	bool connected;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	struct fw_iso_resources resources;</div><div class='add'>+	__be32 last_pcr_value;</div><div class='add'>+	unsigned int pcr_index;</div><div class='add'>+	unsigned int max_speed;</div><div class='add'>+	enum cmp_direction direction;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cmp_connection_init(struct cmp_connection *connection,</div><div class='add'>+			struct fw_unit *unit,</div><div class='add'>+			enum cmp_direction direction,</div><div class='add'>+			unsigned int pcr_index);</div><div class='add'>+int cmp_connection_check_used(struct cmp_connection *connection, bool *used);</div><div class='add'>+void cmp_connection_destroy(struct cmp_connection *connection);</div><div class='add'>+</div><div class='add'>+int cmp_connection_reserve(struct cmp_connection *connection,</div><div class='add'>+			   unsigned int max_payload);</div><div class='add'>+void cmp_connection_release(struct cmp_connection *connection);</div><div class='add'>+</div><div class='add'>+int cmp_connection_establish(struct cmp_connection *connection);</div><div class='add'>+void cmp_connection_break(struct cmp_connection *connection);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile<br/>new file mode 100644<br/>index 000000000000..478cd7a08fb5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-dice-y := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \</div><div class='add'>+		 dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \</div><div class='add'>+		 dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \</div><div class='add'>+		 dice-harman.o dice-focusrite.o dice-weiss.o dice-teac.o</div><div class='add'>+obj-$(CONFIG_SND_DICE) += snd-dice.o</div><div class='head'>diff --git a/sound/firewire/dice/dice-alesis.c b/sound/firewire/dice/dice-alesis.c<br/>new file mode 100644<br/>index 000000000000..27c13b9cc9ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-alesis.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-alesis.c</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * dice-alesis.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2018 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static const unsigned int</div><div class='add'>+alesis_io14_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {</div><div class='add'>+	{6, 6, 4},	/* Tx0 = Analog + S/PDIF. */</div><div class='add'>+	{8, 4, 0},	/* Tx1 = ADAT1. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int</div><div class='add'>+alesis_io26_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = {</div><div class='add'>+	{10, 10, 4},	/* Tx0 = Analog + S/PDIF. */</div><div class='add'>+	{16, 4, 0},	/* Tx1 = ADAT1 + ADAT2 (available at low rate). */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_alesis_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_tx(dice, TX_NUMBER_AUDIO, &amp;reg,</div><div class='add'>+					   sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	if (data == 4 || data == 6) {</div><div class='add'>+		memcpy(dice-&gt;tx_pcm_chs, alesis_io14_tx_pcm_chs,</div><div class='add'>+				MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *</div><div class='add'>+				sizeof(unsigned int));</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(dice-&gt;tx_pcm_chs, alesis_io26_tx_pcm_chs,</div><div class='add'>+				MAX_STREAMS * SND_DICE_RATE_MODE_COUNT *</div><div class='add'>+				sizeof(unsigned int));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_DICE_RATE_MODE_COUNT; ++i)</div><div class='add'>+		dice-&gt;rx_pcm_chs[0][i] = 8;</div><div class='add'>+</div><div class='add'>+	dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+	dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_alesis_mastercontrol_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][SND_DICE_RATE_MODE_LOW]	= 16;</div><div class='add'>+	dice-&gt;tx_pcm_chs[1][SND_DICE_RATE_MODE_LOW]	= 12;</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][SND_DICE_RATE_MODE_MIDDLE]	= 12;</div><div class='add'>+	dice-&gt;tx_pcm_chs[1][SND_DICE_RATE_MODE_MIDDLE]	= 4;</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][SND_DICE_RATE_MODE_HIGH]	= 8;</div><div class='add'>+	dice-&gt;tx_pcm_chs[1][SND_DICE_RATE_MODE_HIGH]	= 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_DICE_RATE_MODE_COUNT; ++i) {</div><div class='add'>+		dice-&gt;rx_pcm_chs[0][i] = 6;</div><div class='add'>+		dice-&gt;rx_pcm_chs[1][i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		dice-&gt;tx_midi_ports[i] = 2;</div><div class='add'>+		dice-&gt;rx_midi_ports[i] = 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-extension.c b/sound/firewire/dice/dice-extension.c<br/>new file mode 100644<br/>index 000000000000..48bfb3ad93ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-extension.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-extension.c</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * dice-extension.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2018 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+/* For TCD2210/2220, TCAT defines extension of application protocol. */</div><div class='add'>+</div><div class='add'>+#define DICE_EXT_APP_SPACE		0xffffe0200000uLL</div><div class='add'>+</div><div class='add'>+#define DICE_EXT_APP_CAPS_OFFSET	0x00</div><div class='add'>+#define DICE_EXT_APP_CAPS_SIZE		0x04</div><div class='add'>+#define DICE_EXT_APP_CMD_OFFSET		0x08</div><div class='add'>+#define DICE_EXT_APP_CMD_SIZE		0x0c</div><div class='add'>+#define DICE_EXT_APP_MIXER_OFFSET	0x10</div><div class='add'>+#define DICE_EXT_APP_MIXER_SIZE		0x14</div><div class='add'>+#define DICE_EXT_APP_PEAK_OFFSET	0x18</div><div class='add'>+#define DICE_EXT_APP_PEAK_SIZE		0x1c</div><div class='add'>+#define DICE_EXT_APP_ROUTER_OFFSET	0x20</div><div class='add'>+#define DICE_EXT_APP_ROUTER_SIZE	0x24</div><div class='add'>+#define DICE_EXT_APP_STREAM_OFFSET	0x28</div><div class='add'>+#define DICE_EXT_APP_STREAM_SIZE	0x2c</div><div class='add'>+#define DICE_EXT_APP_CURRENT_OFFSET	0x30</div><div class='add'>+#define DICE_EXT_APP_CURRENT_SIZE	0x34</div><div class='add'>+#define DICE_EXT_APP_STANDALONE_OFFSET	0x38</div><div class='add'>+#define DICE_EXT_APP_STANDALONE_SIZE	0x3c</div><div class='add'>+#define DICE_EXT_APP_APPLICATION_OFFSET	0x40</div><div class='add'>+#define DICE_EXT_APP_APPLICATION_SIZE	0x44</div><div class='add'>+</div><div class='add'>+#define EXT_APP_STREAM_TX_NUMBER	0x0000</div><div class='add'>+#define EXT_APP_STREAM_RX_NUMBER	0x0004</div><div class='add'>+#define EXT_APP_STREAM_ENTRIES		0x0008</div><div class='add'>+#define EXT_APP_STREAM_ENTRY_SIZE	0x010c</div><div class='add'>+#define  EXT_APP_NUMBER_AUDIO		0x0000</div><div class='add'>+#define  EXT_APP_NUMBER_MIDI		0x0004</div><div class='add'>+#define  EXT_APP_NAMES			0x0008</div><div class='add'>+#define   EXT_APP_NAMES_SIZE		256</div><div class='add'>+#define  EXT_APP_AC3			0x0108</div><div class='add'>+</div><div class='add'>+#define EXT_APP_CONFIG_LOW_ROUTER	0x0000</div><div class='add'>+#define EXT_APP_CONFIG_LOW_STREAM	0x1000</div><div class='add'>+#define EXT_APP_CONFIG_MIDDLE_ROUTER	0x2000</div><div class='add'>+#define EXT_APP_CONFIG_MIDDLE_STREAM	0x3000</div><div class='add'>+#define EXT_APP_CONFIG_HIGH_ROUTER	0x4000</div><div class='add'>+#define EXT_APP_CONFIG_HIGH_STREAM	0x5000</div><div class='add'>+</div><div class='add'>+static inline int read_transaction(struct snd_dice *dice, u64 section_addr,</div><div class='add'>+				   u32 offset, void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(dice-&gt;unit,</div><div class='add'>+				  len == 4 ? TCODE_READ_QUADLET_REQUEST :</div><div class='add'>+					     TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				  section_addr + offset, buf, len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int read_stream_entries(struct snd_dice *dice, u64 section_addr,</div><div class='add'>+			       u32 base_offset, unsigned int stream_count,</div><div class='add'>+			       unsigned int mode,</div><div class='add'>+			       unsigned int pcm_channels[MAX_STREAMS][3],</div><div class='add'>+			       unsigned int midi_ports[MAX_STREAMS])</div><div class='add'>+{</div><div class='add'>+	u32 entry_offset;</div><div class='add'>+	__be32 reg[2];</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; stream_count; ++i) {</div><div class='add'>+		entry_offset = base_offset + i * EXT_APP_STREAM_ENTRY_SIZE;</div><div class='add'>+		err = read_transaction(dice, section_addr,</div><div class='add'>+				    entry_offset + EXT_APP_NUMBER_AUDIO,</div><div class='add'>+				    reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		pcm_channels[i][mode] = be32_to_cpu(reg[0]);</div><div class='add'>+		midi_ports[i] = max(midi_ports[i], be32_to_cpu(reg[1]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_stream_formats(struct snd_dice *dice, u64 section_addr)</div><div class='add'>+{</div><div class='add'>+	u32 base_offset;</div><div class='add'>+	__be32 reg[2];</div><div class='add'>+	unsigned int stream_count;</div><div class='add'>+	int mode;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	for (mode = 0; mode &lt; SND_DICE_RATE_MODE_COUNT; ++mode) {</div><div class='add'>+		unsigned int cap;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Some models report stream formats at highest mode, however</div><div class='add'>+		 * they don't support the mode. Check clock capabilities.</div><div class='add'>+		 */</div><div class='add'>+		if (mode == 2) {</div><div class='add'>+			cap = CLOCK_CAP_RATE_176400 | CLOCK_CAP_RATE_192000;</div><div class='add'>+		} else if (mode == 1) {</div><div class='add'>+			cap = CLOCK_CAP_RATE_88200 | CLOCK_CAP_RATE_96000;</div><div class='add'>+		} else {</div><div class='add'>+			cap = CLOCK_CAP_RATE_32000 | CLOCK_CAP_RATE_44100 |</div><div class='add'>+			      CLOCK_CAP_RATE_48000;</div><div class='add'>+		}</div><div class='add'>+		if (!(cap &amp; dice-&gt;clock_caps))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		base_offset = 0x2000 * mode + 0x1000;</div><div class='add'>+</div><div class='add'>+		err = read_transaction(dice, section_addr,</div><div class='add'>+				       base_offset + EXT_APP_STREAM_TX_NUMBER,</div><div class='add'>+				       &amp;reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		base_offset += EXT_APP_STREAM_ENTRIES;</div><div class='add'>+		stream_count = min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);</div><div class='add'>+		err = read_stream_entries(dice, section_addr, base_offset,</div><div class='add'>+					  stream_count, mode,</div><div class='add'>+					  dice-&gt;tx_pcm_chs,</div><div class='add'>+					  dice-&gt;tx_midi_ports);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		base_offset += stream_count * EXT_APP_STREAM_ENTRY_SIZE;</div><div class='add'>+		stream_count = min_t(unsigned int, be32_to_cpu(reg[1]), MAX_STREAMS);</div><div class='add'>+		err = read_stream_entries(dice, section_addr, base_offset,</div><div class='add'>+					  stream_count,</div><div class='add'>+					  mode, dice-&gt;rx_pcm_chs,</div><div class='add'>+					  dice-&gt;rx_midi_ports);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_extension_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 *pointers;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u64 section_addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pointers = kmalloc_array(9, sizeof(__be32) * 2, GFP_KERNEL);</div><div class='add'>+	if (pointers == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dice-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				 DICE_EXT_APP_SPACE, pointers,</div><div class='add'>+				 9 * sizeof(__be32) * 2, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* Check two of them for offset have the same value or not. */</div><div class='add'>+	for (i = 0; i &lt; 9; ++i) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = i + 1; j &lt; 9; ++j) {</div><div class='add'>+			if (pointers[i * 2] == pointers[j * 2]) {</div><div class='add'>+				// Fallback to limited functionality.</div><div class='add'>+				err = -ENXIO;</div><div class='add'>+				goto end;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	section_addr = DICE_EXT_APP_SPACE + be32_to_cpu(pointers[12]) * 4;</div><div class='add'>+	err = detect_stream_formats(dice, section_addr);</div><div class='add'>+end:</div><div class='add'>+	kfree(pointers);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-focusrite.c b/sound/firewire/dice/dice-focusrite.c<br/>new file mode 100644<br/>index 000000000000..ea27cfb01cc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-focusrite.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-focusrite.c</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// dice-focusrite.c - a part of driver for DICE based devices</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2022 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	// Focusrite shipped several variants of Saffire Pro 40. One of them is based on TCD3070-CH</div><div class='add'>+	// apart from the others with TCD2220. It doesn't support TCAT protocol extension.</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][0] = 20;</div><div class='add'>+	dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+	dice-&gt;rx_pcm_chs[0][0] = 20;</div><div class='add'>+	dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][1] = 16;</div><div class='add'>+	dice-&gt;tx_midi_ports[1] = 1;</div><div class='add'>+	dice-&gt;rx_pcm_chs[0][1] = 16;</div><div class='add'>+	dice-&gt;rx_midi_ports[1] = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-harman.c b/sound/firewire/dice/dice-harman.c<br/>new file mode 100644<br/>index 000000000000..212ae77dfca2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-harman.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-harman.c</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// dice-harman.c - a part of driver for DICE based devices</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_harman_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	// Lexicon I-ONYX FW810s supports sampling transfer frequency up to</div><div class='add'>+	// 96.0 kHz, 12 PCM channels and 1 MIDI channel in its first tx stream</div><div class='add'>+	// , 10 PCM channels and 1 MIDI channel in its first rx stream for all</div><div class='add'>+	// of the frequencies.</div><div class='add'>+	for (i = 0; i &lt; 2; ++i) {</div><div class='add'>+		dice-&gt;tx_pcm_chs[0][i] = 12;</div><div class='add'>+		dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+		dice-&gt;rx_pcm_chs[0][i] = 10;</div><div class='add'>+		dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-hwdep.c b/sound/firewire/dice/dice-hwdep.c<br/>new file mode 100644<br/>index 000000000000..747ff0952483<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_hwdep.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,</div><div class='add'>+			    long count, loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	union snd_firewire_event event;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!dice-&gt;dev_lock_changed &amp;&amp; dice-&gt;notification_bits == 0) {</div><div class='add'>+		prepare_to_wait(&amp;dice-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;dice-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;dice-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;dice-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;event, 0, sizeof(event));</div><div class='add'>+	if (dice-&gt;dev_lock_changed) {</div><div class='add'>+		event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;</div><div class='add'>+		event.lock_status.status = dice-&gt;dev_lock_count &gt; 0;</div><div class='add'>+		dice-&gt;dev_lock_changed = false;</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event.lock_status));</div><div class='add'>+	} else {</div><div class='add'>+		event.dice_notification.type =</div><div class='add'>+					SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION;</div><div class='add'>+		event.dice_notification.notification = dice-&gt;notification_bits;</div><div class='add'>+		dice-&gt;notification_bits = 0;</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event.dice_notification));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;dice-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+	if (dice-&gt;dev_lock_changed || dice-&gt;notification_bits != 0)</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_dice *dice, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(dice-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_DICE;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;dev_lock_count == 0) {</div><div class='add'>+		dice-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;dev_lock_count == -1) {</div><div class='add'>+		dice-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+	if (dice-&gt;dev_lock_count == -1)</div><div class='add'>+		dice-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(dice, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(dice);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(dice);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_dice_create_hwdep(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read         = hwdep_read,</div><div class='add'>+		.release      = hwdep_release,</div><div class='add'>+		.poll         = hwdep_poll,</div><div class='add'>+		.ioctl        = hwdep_ioctl,</div><div class='add'>+		.ioctl_compat = hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(dice-&gt;card, "DICE", 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	strscpy(hwdep-&gt;name, "DICE");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_DICE;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = dice;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-interface.h b/sound/firewire/dice/dice-interface.h<br/>new file mode 100644<br/>index 000000000000..9cad3d608229<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-interface.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-interface.h</a></div><div class='hunk'>@@ -0,0 +1,378 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_DICE_INTERFACE_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_DICE_INTERFACE_H_INCLUDED</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DICE device interface definitions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Generally, all registers can be read like memory, i.e., with quadlet read or</div><div class='add'>+ * block read transactions with at least quadlet-aligned offset and length.</div><div class='add'>+ * Writes are not allowed except where noted; quadlet-sized registers must be</div><div class='add'>+ * written with a quadlet write transaction.</div><div class='add'>+ *</div><div class='add'>+ * All values are in big endian.  The DICE firmware runs on a little-endian CPU</div><div class='add'>+ * and just byte-swaps _all_ quadlets on the bus, so values without endianness</div><div class='add'>+ * (e.g. strings) get scrambled and must be byte-swapped again by the driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Streaming is handled by the "DICE driver" interface.  Its registers are</div><div class='add'>+ * located in this private address space.</div><div class='add'>+ */</div><div class='add'>+#define DICE_PRIVATE_SPACE		0xffffe0000000uLL</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The registers are organized in several sections, which are organized</div><div class='add'>+ * separately to allow them to be extended individually.  Whether a register is</div><div class='add'>+ * supported can be detected by checking its offset against its section's size.</div><div class='add'>+ *</div><div class='add'>+ * The section offset values are relative to DICE_PRIVATE_SPACE; the offset/</div><div class='add'>+ * size values are measured in quadlets.  Read-only.</div><div class='add'>+ */</div><div class='add'>+#define DICE_GLOBAL_OFFSET		0x00</div><div class='add'>+#define DICE_GLOBAL_SIZE		0x04</div><div class='add'>+#define DICE_TX_OFFSET			0x08</div><div class='add'>+#define DICE_TX_SIZE			0x0c</div><div class='add'>+#define DICE_RX_OFFSET			0x10</div><div class='add'>+#define DICE_RX_SIZE			0x14</div><div class='add'>+#define DICE_EXT_SYNC_OFFSET		0x18</div><div class='add'>+#define DICE_EXT_SYNC_SIZE		0x1c</div><div class='add'>+#define DICE_UNUSED2_OFFSET		0x20</div><div class='add'>+#define DICE_UNUSED2_SIZE		0x24</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Global settings.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stores the full 64-bit address (node ID and offset in the node's address</div><div class='add'>+ * space) where the device will send notifications.  Must be changed with</div><div class='add'>+ * a compare/swap transaction by the owner.  This register is automatically</div><div class='add'>+ * cleared on a bus reset.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_OWNER			0x000</div><div class='add'>+#define  OWNER_NO_OWNER			0xffff000000000000uLL</div><div class='add'>+#define  OWNER_NODE_SHIFT		48</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A bitmask with asynchronous events; read-only.  When any event(s) happen,</div><div class='add'>+ * the bits of previous events are cleared, and the value of this register is</div><div class='add'>+ * also written to the address stored in the owner register.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_NOTIFICATION		0x008</div><div class='add'>+/* Some registers in the Rx/Tx sections may have changed. */</div><div class='add'>+#define  NOTIFY_RX_CFG_CHG		0x00000001</div><div class='add'>+#define  NOTIFY_TX_CFG_CHG		0x00000002</div><div class='add'>+/* Lock status of the current clock source may have changed. */</div><div class='add'>+#define  NOTIFY_LOCK_CHG		0x00000010</div><div class='add'>+/* Write to the clock select register has been finished. */</div><div class='add'>+#define  NOTIFY_CLOCK_ACCEPTED		0x00000020</div><div class='add'>+/* Lock status of some clock source has changed. */</div><div class='add'>+#define  NOTIFY_EXT_STATUS		0x00000040</div><div class='add'>+/* Other bits may be used for device-specific events. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * A name that can be customized for each device; read/write.  Padded with zero</div><div class='add'>+ * bytes.  Quadlets are byte-swapped.  The encoding is whatever the host driver</div><div class='add'>+ * happens to be using.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_NICK_NAME		0x00c</div><div class='add'>+#define  NICK_NAME_SIZE			64</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The current sample rate and clock source; read/write.  Whether a clock</div><div class='add'>+ * source or sample rate is supported is device-specific; the internal clock</div><div class='add'>+ * source is always available.  Low/mid/high = up to 48/96/192 kHz.  This</div><div class='add'>+ * register can be changed even while streams are running.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_CLOCK_SELECT		0x04c</div><div class='add'>+#define  CLOCK_SOURCE_MASK		0x000000ff</div><div class='add'>+#define  CLOCK_SOURCE_AES1		0x00000000</div><div class='add'>+#define  CLOCK_SOURCE_AES2		0x00000001</div><div class='add'>+#define  CLOCK_SOURCE_AES3		0x00000002</div><div class='add'>+#define  CLOCK_SOURCE_AES4		0x00000003</div><div class='add'>+#define  CLOCK_SOURCE_AES_ANY		0x00000004</div><div class='add'>+#define  CLOCK_SOURCE_ADAT		0x00000005</div><div class='add'>+#define  CLOCK_SOURCE_TDIF		0x00000006</div><div class='add'>+#define  CLOCK_SOURCE_WC		0x00000007</div><div class='add'>+#define  CLOCK_SOURCE_ARX1		0x00000008</div><div class='add'>+#define  CLOCK_SOURCE_ARX2		0x00000009</div><div class='add'>+#define  CLOCK_SOURCE_ARX3		0x0000000a</div><div class='add'>+#define  CLOCK_SOURCE_ARX4		0x0000000b</div><div class='add'>+#define  CLOCK_SOURCE_INTERNAL		0x0000000c</div><div class='add'>+#define  CLOCK_RATE_MASK		0x0000ff00</div><div class='add'>+#define  CLOCK_RATE_32000		0x00000000</div><div class='add'>+#define  CLOCK_RATE_44100		0x00000100</div><div class='add'>+#define  CLOCK_RATE_48000		0x00000200</div><div class='add'>+#define  CLOCK_RATE_88200		0x00000300</div><div class='add'>+#define  CLOCK_RATE_96000		0x00000400</div><div class='add'>+#define  CLOCK_RATE_176400		0x00000500</div><div class='add'>+#define  CLOCK_RATE_192000		0x00000600</div><div class='add'>+#define  CLOCK_RATE_ANY_LOW		0x00000700</div><div class='add'>+#define  CLOCK_RATE_ANY_MID		0x00000800</div><div class='add'>+#define  CLOCK_RATE_ANY_HIGH		0x00000900</div><div class='add'>+#define  CLOCK_RATE_NONE		0x00000a00</div><div class='add'>+#define  CLOCK_RATE_SHIFT		8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable streaming; read/write.  Writing a non-zero value (re)starts all</div><div class='add'>+ * streams that have a valid iso channel set; zero stops all streams.  The</div><div class='add'>+ * streams' parameters must be configured before starting.  This register is</div><div class='add'>+ * automatically cleared on a bus reset.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_ENABLE			0x050</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Status of the sample clock; read-only.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_STATUS			0x054</div><div class='add'>+/* The current clock source is locked. */</div><div class='add'>+#define  STATUS_SOURCE_LOCKED		0x00000001</div><div class='add'>+/* The actual sample rate; CLOCK_RATE_32000-_192000 or _NONE. */</div><div class='add'>+#define  STATUS_NOMINAL_RATE_MASK	0x0000ff00</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Status of all clock sources; read-only.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_EXTENDED_STATUS		0x058</div><div class='add'>+/*</div><div class='add'>+ * The _LOCKED bits always show the current status; any change generates</div><div class='add'>+ * a notification.</div><div class='add'>+ */</div><div class='add'>+#define  EXT_STATUS_AES1_LOCKED		0x00000001</div><div class='add'>+#define  EXT_STATUS_AES2_LOCKED		0x00000002</div><div class='add'>+#define  EXT_STATUS_AES3_LOCKED		0x00000004</div><div class='add'>+#define  EXT_STATUS_AES4_LOCKED		0x00000008</div><div class='add'>+#define  EXT_STATUS_ADAT_LOCKED		0x00000010</div><div class='add'>+#define  EXT_STATUS_TDIF_LOCKED		0x00000020</div><div class='add'>+#define  EXT_STATUS_ARX1_LOCKED		0x00000040</div><div class='add'>+#define  EXT_STATUS_ARX2_LOCKED		0x00000080</div><div class='add'>+#define  EXT_STATUS_ARX3_LOCKED		0x00000100</div><div class='add'>+#define  EXT_STATUS_ARX4_LOCKED		0x00000200</div><div class='add'>+#define  EXT_STATUS_WC_LOCKED		0x00000400</div><div class='add'>+/*</div><div class='add'>+ * The _SLIP bits do not generate notifications; a set bit indicates that an</div><div class='add'>+ * error occurred since the last time when this register was read with</div><div class='add'>+ * a quadlet read transaction.</div><div class='add'>+ */</div><div class='add'>+#define  EXT_STATUS_AES1_SLIP		0x00010000</div><div class='add'>+#define  EXT_STATUS_AES2_SLIP		0x00020000</div><div class='add'>+#define  EXT_STATUS_AES3_SLIP		0x00040000</div><div class='add'>+#define  EXT_STATUS_AES4_SLIP		0x00080000</div><div class='add'>+#define  EXT_STATUS_ADAT_SLIP		0x00100000</div><div class='add'>+#define  EXT_STATUS_TDIF_SLIP		0x00200000</div><div class='add'>+#define  EXT_STATUS_ARX1_SLIP		0x00400000</div><div class='add'>+#define  EXT_STATUS_ARX2_SLIP		0x00800000</div><div class='add'>+#define  EXT_STATUS_ARX3_SLIP		0x01000000</div><div class='add'>+#define  EXT_STATUS_ARX4_SLIP		0x02000000</div><div class='add'>+#define  EXT_STATUS_WC_SLIP		0x04000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The measured rate of the current clock source, in Hz; read-only.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_SAMPLE_RATE		0x05c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Some old firmware versions do not have the following global registers.</div><div class='add'>+ * Windows drivers produced by TCAT lost backward compatibility in its</div><div class='add'>+ * early release because they can handle firmware only which supports the</div><div class='add'>+ * following registers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The version of the DICE driver specification that this device conforms to;</div><div class='add'>+ * read-only.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_VERSION			0x060</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Supported sample rates and clock sources; read-only.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_CLOCK_CAPABILITIES	0x064</div><div class='add'>+#define  CLOCK_CAP_RATE_32000		0x00000001</div><div class='add'>+#define  CLOCK_CAP_RATE_44100		0x00000002</div><div class='add'>+#define  CLOCK_CAP_RATE_48000		0x00000004</div><div class='add'>+#define  CLOCK_CAP_RATE_88200		0x00000008</div><div class='add'>+#define  CLOCK_CAP_RATE_96000		0x00000010</div><div class='add'>+#define  CLOCK_CAP_RATE_176400		0x00000020</div><div class='add'>+#define  CLOCK_CAP_RATE_192000		0x00000040</div><div class='add'>+#define  CLOCK_CAP_SOURCE_AES1		0x00010000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_AES2		0x00020000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_AES3		0x00040000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_AES4		0x00080000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_AES_ANY	0x00100000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_ADAT		0x00200000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_TDIF		0x00400000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_WC		0x00800000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_ARX1		0x01000000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_ARX2		0x02000000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_ARX3		0x04000000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_ARX4		0x08000000</div><div class='add'>+#define  CLOCK_CAP_SOURCE_INTERNAL	0x10000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Names of all clock sources; read-only.  Quadlets are byte-swapped.  Names</div><div class='add'>+ * are separated with one backslash, the list is terminated with two</div><div class='add'>+ * backslashes.  Unused clock sources are included.</div><div class='add'>+ */</div><div class='add'>+#define GLOBAL_CLOCK_SOURCE_NAMES	0x068</div><div class='add'>+#define  CLOCK_SOURCE_NAMES_SIZE	256</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Capture stream settings.  This section includes the number/size registers</div><div class='add'>+ * and the registers of all streams.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of supported capture streams; read-only.</div><div class='add'>+ */</div><div class='add'>+#define TX_NUMBER			0x000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The size of one stream's register block, in quadlets; read-only.  The</div><div class='add'>+ * registers of the first stream follow immediately afterwards; the registers</div><div class='add'>+ * of the following streams are offset by this register's value.</div><div class='add'>+ */</div><div class='add'>+#define TX_SIZE				0x004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The isochronous channel number on which packets are sent, or -1 if the</div><div class='add'>+ * stream is not to be used; read/write.</div><div class='add'>+ */</div><div class='add'>+#define TX_ISOCHRONOUS			0x008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of audio channels; read-only.  There will be one quadlet per</div><div class='add'>+ * channel; the first channel is the first quadlet in a data block.</div><div class='add'>+ */</div><div class='add'>+#define TX_NUMBER_AUDIO			0x00c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of MIDI ports, 0-8; read-only.  If &gt; 0, there will be one</div><div class='add'>+ * additional quadlet in each data block, following the audio quadlets.</div><div class='add'>+ */</div><div class='add'>+#define TX_NUMBER_MIDI			0x010</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The speed at which the packets are sent, SCODE_100-_400; read/write.</div><div class='add'>+ * SCODE_800 is only available in Dice III.</div><div class='add'>+ */</div><div class='add'>+#define TX_SPEED			0x014</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Names of all audio channels; read-only.  Quadlets are byte-swapped.  Names</div><div class='add'>+ * are separated with one backslash, the list is terminated with two</div><div class='add'>+ * backslashes.</div><div class='add'>+ */</div><div class='add'>+#define TX_NAMES			0x018</div><div class='add'>+#define  TX_NAMES_SIZE			256</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Audio IEC60958 capabilities; read-only.  Bitmask with one bit per audio</div><div class='add'>+ * channel.</div><div class='add'>+ */</div><div class='add'>+#define TX_AC3_CAPABILITIES		0x118</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send audio data with IEC60958 label; read/write.  Bitmask with one bit per</div><div class='add'>+ * audio channel.  This register can be changed even while the stream is</div><div class='add'>+ * running.</div><div class='add'>+ */</div><div class='add'>+#define TX_AC3_ENABLE			0x11c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Playback stream settings.  This section includes the number/size registers</div><div class='add'>+ * and the registers of all streams.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of supported playback streams; read-only.</div><div class='add'>+ */</div><div class='add'>+#define RX_NUMBER			0x000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The size of one stream's register block, in quadlets; read-only.  The</div><div class='add'>+ * registers of the first stream follow immediately afterwards; the registers</div><div class='add'>+ * of the following streams are offset by this register's value.</div><div class='add'>+ */</div><div class='add'>+#define RX_SIZE				0x004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The isochronous channel number on which packets are received, or -1 if the</div><div class='add'>+ * stream is not to be used; read/write.</div><div class='add'>+ */</div><div class='add'>+#define RX_ISOCHRONOUS			0x008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Index of first quadlet to be interpreted; read/write.  If &gt; 0, that many</div><div class='add'>+ * quadlets at the beginning of each data block will be ignored, and all the</div><div class='add'>+ * audio and MIDI quadlets will follow.</div><div class='add'>+ */</div><div class='add'>+#define RX_SEQ_START			0x00c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of audio channels; read-only.  There will be one quadlet per</div><div class='add'>+ * channel.</div><div class='add'>+ */</div><div class='add'>+#define RX_NUMBER_AUDIO			0x010</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The number of MIDI ports, 0-8; read-only.  If &gt; 0, there will be one</div><div class='add'>+ * additional quadlet in each data block, following the audio quadlets.</div><div class='add'>+ */</div><div class='add'>+#define RX_NUMBER_MIDI			0x014</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Names of all audio channels; read-only.  Quadlets are byte-swapped.  Names</div><div class='add'>+ * are separated with one backslash, the list is terminated with two</div><div class='add'>+ * backslashes.</div><div class='add'>+ */</div><div class='add'>+#define RX_NAMES			0x018</div><div class='add'>+#define  RX_NAMES_SIZE			256</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Audio IEC60958 capabilities; read-only.  Bitmask with one bit per audio</div><div class='add'>+ * channel.</div><div class='add'>+ */</div><div class='add'>+#define RX_AC3_CAPABILITIES		0x118</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Receive audio data with IEC60958 label; read/write.  Bitmask with one bit</div><div class='add'>+ * per audio channel.  This register can be changed even while the stream is</div><div class='add'>+ * running.</div><div class='add'>+ */</div><div class='add'>+#define RX_AC3_ENABLE			0x11c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extended synchronization information.</div><div class='add'>+ * This section can be read completely with a block read request.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Current clock source; read-only.</div><div class='add'>+ */</div><div class='add'>+#define EXT_SYNC_CLOCK_SOURCE		0x000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock source is locked (boolean); read-only.</div><div class='add'>+ */</div><div class='add'>+#define EXT_SYNC_LOCKED			0x004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Current sample rate (CLOCK_RATE_* &gt;&gt; CLOCK_RATE_SHIFT), _32000-_192000 or</div><div class='add'>+ * _NONE; read-only.</div><div class='add'>+ */</div><div class='add'>+#define EXT_SYNC_RATE			0x008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ADAT user data bits; read-only.</div><div class='add'>+ */</div><div class='add'>+#define EXT_SYNC_ADAT_USER_DATA		0x00c</div><div class='add'>+/* The data bits, if available. */</div><div class='add'>+#define  ADAT_USER_DATA_MASK		0x0f</div><div class='add'>+/* The data bits are not available. */</div><div class='add'>+#define  ADAT_USER_DATA_NO_DATA		0x10</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/dice/dice-midi.c b/sound/firewire/dice/dice-midi.c<br/>new file mode 100644<br/>index 000000000000..722bce379345<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-midi.c</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_midi.c - a part of driver for Dice based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static int midi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_stream_lock_try(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dice-&gt;mutex) {</div><div class='add'>+		err = snd_dice_stream_reserve_duplex(dice, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++dice-&gt;substreams_counter;</div><div class='add'>+			err = snd_dice_stream_start_duplex(dice);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--dice-&gt;substreams_counter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_dice_stream_lock_release(dice);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dice-&gt;mutex) {</div><div class='add'>+		--dice-&gt;substreams_counter;</div><div class='add'>+		snd_dice_stream_stop_duplex(dice);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_dice_stream_lock_release(dice);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;dice-&gt;tx_stream[0],</div><div class='add'>+					  substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;dice-&gt;tx_stream[0],</div><div class='add'>+					  substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;dice-&gt;rx_stream[0],</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;dice-&gt;rx_stream[0],</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_dice *dice,</div><div class='add'>+				     struct snd_rawmidi_str *str)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+		scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+			  "%s MIDI %d", dice-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_create_midi(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	unsigned int midi_in_ports, midi_out_ports;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	midi_in_ports = 0;</div><div class='add'>+	midi_out_ports = 0;</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		midi_in_ports = max(midi_in_ports, dice-&gt;tx_midi_ports[i]);</div><div class='add'>+		midi_out_ports = max(midi_out_ports, dice-&gt;rx_midi_ports[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (midi_in_ports + midi_out_ports == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* create midi ports */</div><div class='add'>+	err = snd_rawmidi_new(dice-&gt;card, dice-&gt;card-&gt;driver, 0,</div><div class='add'>+			      midi_out_ports, midi_in_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", dice-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = dice;</div><div class='add'>+</div><div class='add'>+	if (midi_in_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;capture_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(dice, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (midi_out_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;playback_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(dice, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((midi_out_ports &gt; 0) &amp;&amp; (midi_in_ports &gt; 0))</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-mytek.c b/sound/firewire/dice/dice-mytek.c<br/>new file mode 100644<br/>index 000000000000..eb7d5492d10b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-mytek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-mytek.c</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * dice-mytek.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2018 Melvin Vermeeren</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+struct dice_mytek_spec {</div><div class='add'>+	unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_mytek_spec stereo_192_dsd_dac = {</div><div class='add'>+	/* AES, TOSLINK, SPDIF, ADAT inputs on device */</div><div class='add'>+	.tx_pcm_chs = {{8, 8, 8}, {0, 0, 0} },</div><div class='add'>+	/* PCM 44.1-192, native DSD64/DSD128 to device */</div><div class='add'>+	.rx_pcm_chs = {{4, 4, 4}, {0, 0, 0} }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mytek has a few other firewire-capable devices, though newer models appear</div><div class='add'>+ * to lack the port more often than not. As I don't have access to any of them</div><div class='add'>+ * they are missing here. An example is the Mytek 8x192 ADDA, which is DICE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_mytek_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	const struct dice_mytek_spec *dev;</div><div class='add'>+</div><div class='add'>+	dev = &amp;stereo_192_dsd_dac;</div><div class='add'>+</div><div class='add'>+	memcpy(dice-&gt;tx_pcm_chs, dev-&gt;tx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+	memcpy(dice-&gt;rx_pcm_chs, dev-&gt;rx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		dice-&gt;tx_midi_ports[i] = 0;</div><div class='add'>+		dice-&gt;rx_midi_ports[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-pcm.c b/sound/firewire/dice/dice-pcm.c<br/>new file mode 100644<br/>index 000000000000..d5319cd2cc6f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,449 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_pcm.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static int dice_rate_constraint(struct snd_pcm_hw_params *params,</div><div class='add'>+				struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = rule-&gt;private;</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	unsigned int index = substream-&gt;pcm-&gt;device;</div><div class='add'>+</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval rates = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int *pcm_channels;</div><div class='add'>+	enum snd_dice_rate_mode mode;</div><div class='add'>+	unsigned int i, rate;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+		pcm_channels = dice-&gt;tx_pcm_chs[index];</div><div class='add'>+	else</div><div class='add'>+		pcm_channels = dice-&gt;rx_pcm_chs[index];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dice_rates); ++i) {</div><div class='add'>+		rate = snd_dice_rates[i];</div><div class='add'>+		if (snd_dice_stream_get_rate_mode(dice, rate, &amp;mode) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(c, pcm_channels[mode]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rates.min = min(rates.min, rate);</div><div class='add'>+		rates.max = max(rates.max, rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(r, &amp;rates);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dice_channels_constraint(struct snd_pcm_hw_params *params,</div><div class='add'>+				    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = rule-&gt;private;</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	unsigned int index = substream-&gt;pcm-&gt;device;</div><div class='add'>+</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval channels = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int *pcm_channels;</div><div class='add'>+	enum snd_dice_rate_mode mode;</div><div class='add'>+	unsigned int i, rate;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+		pcm_channels = dice-&gt;tx_pcm_chs[index];</div><div class='add'>+	else</div><div class='add'>+		pcm_channels = dice-&gt;rx_pcm_chs[index];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dice_rates); ++i) {</div><div class='add'>+		rate = snd_dice_rates[i];</div><div class='add'>+		if (snd_dice_stream_get_rate_mode(dice, rate, &amp;mode) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(r, rate))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channels.min = min(channels.min, pcm_channels[mode]);</div><div class='add'>+		channels.max = max(channels.max, pcm_channels[mode]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int limit_channels_and_rates(struct snd_dice *dice,</div><div class='add'>+				    struct snd_pcm_runtime *runtime,</div><div class='add'>+				    enum amdtp_stream_direction dir,</div><div class='add'>+				    unsigned int index)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	unsigned int *pcm_channels;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM)</div><div class='add'>+		pcm_channels = dice-&gt;tx_pcm_chs[index];</div><div class='add'>+	else</div><div class='add'>+		pcm_channels = dice-&gt;rx_pcm_chs[index];</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dice_rates); ++i) {</div><div class='add'>+		enum snd_dice_rate_mode mode;</div><div class='add'>+		unsigned int rate, channels;</div><div class='add'>+</div><div class='add'>+		rate = snd_dice_rates[i];</div><div class='add'>+		if (snd_dice_stream_get_rate_mode(dice, rate, &amp;mode) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		hw-&gt;rates |= snd_pcm_rate_to_rate_bit(rate);</div><div class='add'>+</div><div class='add'>+		channels = pcm_channels[mode];</div><div class='add'>+		if (channels == 0)</div><div class='add'>+			continue;</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, channels);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, channels);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_hw_info(struct snd_dice *dice,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	unsigned int index = substream-&gt;pcm-&gt;device;</div><div class='add'>+	enum amdtp_stream_direction dir;</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		hw-&gt;formats = AM824_IN_PCM_FORMAT_BITS;</div><div class='add'>+		dir = AMDTP_IN_STREAM;</div><div class='add'>+		stream = &amp;dice-&gt;tx_stream[index];</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;formats = AM824_OUT_PCM_FORMAT_BITS;</div><div class='add'>+		dir = AMDTP_OUT_STREAM;</div><div class='add'>+		stream = &amp;dice-&gt;rx_stream[index];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = limit_channels_and_rates(dice, substream-&gt;runtime, dir,</div><div class='add'>+				       index);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  dice_rate_constraint, substream,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  dice_channels_constraint, substream,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_am824_add_pcm_hw_constraints(stream, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;dice-&gt;domain;</div><div class='add'>+	unsigned int source;</div><div class='add'>+	bool internal;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_stream_lock_try(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_hw_info(dice, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_get_clock_source(dice, &amp;source);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+	switch (source) {</div><div class='add'>+	case CLOCK_SOURCE_AES1:</div><div class='add'>+	case CLOCK_SOURCE_AES2:</div><div class='add'>+	case CLOCK_SOURCE_AES3:</div><div class='add'>+	case CLOCK_SOURCE_AES4:</div><div class='add'>+	case CLOCK_SOURCE_AES_ANY:</div><div class='add'>+	case CLOCK_SOURCE_ADAT:</div><div class='add'>+	case CLOCK_SOURCE_TDIF:</div><div class='add'>+	case CLOCK_SOURCE_WC:</div><div class='add'>+		internal = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		internal = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dice-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if (!internal ||</div><div class='add'>+		    (dice-&gt;substreams_counter &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0)) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int rate;</div><div class='add'>+</div><div class='add'>+			err = snd_dice_transaction_get_rate(dice, &amp;rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				// For double_pcm_frame quirk.</div><div class='add'>+				if (rate &gt; 96000 &amp;&amp; !dice-&gt;disable_double_pcm_frames) {</div><div class='add'>+					frames_per_period *= 2;</div><div class='add'>+					frames_per_buffer *= 2;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_dice_stream_lock_release(dice);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_dice_stream_lock_release(dice);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int events_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int events_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;dice-&gt;mutex);</div><div class='add'>+		// For double_pcm_frame quirk.</div><div class='add'>+		if (rate &gt; 96000 &amp;&amp; !dice-&gt;disable_double_pcm_frames) {</div><div class='add'>+			events_per_period /= 2;</div><div class='add'>+			events_per_buffer /= 2;</div><div class='add'>+		}</div><div class='add'>+		err = snd_dice_stream_reserve_duplex(dice, rate,</div><div class='add'>+					events_per_period, events_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++dice-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dice-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--dice-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_dice_stream_stop_duplex(dice);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;tx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dice-&gt;mutex) {</div><div class='add'>+		err = snd_dice_stream_start_duplex(dice);</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(stream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;rx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dice-&gt;mutex) {</div><div class='add'>+		err = snd_dice_stream_start_duplex(dice);</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;tx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;rx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t capture_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;tx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;dice-&gt;domain, stream);</div><div class='add'>+}</div><div class='add'>+static snd_pcm_uframes_t playback_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;rx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;dice-&gt;domain, stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;tx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;dice-&gt;domain, stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_stream *stream = &amp;dice-&gt;rx_stream[substream-&gt;pcm-&gt;device];</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;dice-&gt;domain, stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_create_pcm(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_hw_params,</div><div class='add'>+		.hw_free   = pcm_hw_free,</div><div class='add'>+		.prepare   = capture_prepare,</div><div class='add'>+		.trigger   = capture_trigger,</div><div class='add'>+		.pointer   = capture_pointer,</div><div class='add'>+		.ack       = capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_hw_params,</div><div class='add'>+		.hw_free   = pcm_hw_free,</div><div class='add'>+		.prepare   = playback_prepare,</div><div class='add'>+		.trigger   = playback_trigger,</div><div class='add'>+		.pointer   = playback_pointer,</div><div class='add'>+		.ack       = playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	unsigned int capture, playback;</div><div class='add'>+	int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; i++) {</div><div class='add'>+		capture = playback = 0;</div><div class='add'>+		for (j = 0; j &lt; SND_DICE_RATE_MODE_COUNT; ++j) {</div><div class='add'>+			if (dice-&gt;tx_pcm_chs[i][j] &gt; 0)</div><div class='add'>+				capture = 1;</div><div class='add'>+			if (dice-&gt;rx_pcm_chs[i][j] &gt; 0)</div><div class='add'>+				playback = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = snd_pcm_new(dice-&gt;card, "DICE", i, playback, capture,</div><div class='add'>+				  &amp;pcm);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		pcm-&gt;private_data = dice;</div><div class='add'>+		pcm-&gt;nonatomic = true;</div><div class='add'>+		strscpy(pcm-&gt;name, dice-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+		if (capture &gt; 0)</div><div class='add'>+			snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+					&amp;capture_ops);</div><div class='add'>+</div><div class='add'>+		if (playback &gt; 0)</div><div class='add'>+			snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+					&amp;playback_ops);</div><div class='add'>+</div><div class='add'>+		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,</div><div class='add'>+					       NULL, 0, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-presonus.c b/sound/firewire/dice/dice-presonus.c<br/>new file mode 100644<br/>index 000000000000..967cc3119a64<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-presonus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-presonus.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// dice-presonus.c - a part of driver for DICE based devices</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+struct dice_presonus_spec {</div><div class='add'>+	unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	bool has_midi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_presonus_spec dice_presonus_firesutio = {</div><div class='add'>+	.tx_pcm_chs = {{16, 16, 0}, {10, 2, 0} },</div><div class='add'>+	.rx_pcm_chs = {{16, 16, 0}, {10, 2, 0} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_presonus_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		u32 model_id;</div><div class='add'>+		const struct dice_presonus_spec *spec;</div><div class='add'>+	} *entry, entries[] = {</div><div class='add'>+		{0x000008, &amp;dice_presonus_firesutio},</div><div class='add'>+	};</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val, model_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	model_id = 0;</div><div class='add'>+	fw_csr_iterator_init(&amp;it, dice-&gt;unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		if (key == CSR_MODEL) {</div><div class='add'>+			model_id = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(entries); ++i) {</div><div class='add'>+		entry = entries + i;</div><div class='add'>+		if (entry-&gt;model_id == model_id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(entries))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	memcpy(dice-&gt;tx_pcm_chs, entry-&gt;spec-&gt;tx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+	memcpy(dice-&gt;rx_pcm_chs, entry-&gt;spec-&gt;rx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;spec-&gt;has_midi) {</div><div class='add'>+		dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+		dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-proc.c b/sound/firewire/dice/dice-proc.c<br/>new file mode 100644<br/>index 000000000000..db0a03123c4f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-proc.c</a></div><div class='hunk'>@@ -0,0 +1,307 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_proc.c - a part of driver for Dice based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static int dice_proc_read_mem(struct snd_dice *dice, void *buffer,</div><div class='add'>+			      unsigned int offset_q, unsigned int quadlets)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dice-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				 DICE_PRIVATE_SPACE + 4 * offset_q,</div><div class='add'>+				 buffer, 4 * quadlets, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; quadlets; ++i)</div><div class='add'>+		be32_to_cpus(&amp;((u32 *)buffer)[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *str_from_array(const char *const strs[], unsigned int count,</div><div class='add'>+				  unsigned int i)</div><div class='add'>+{</div><div class='add'>+	if (i &lt; count)</div><div class='add'>+		return strs[i];</div><div class='add'>+</div><div class='add'>+	return "(unknown)";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_proc_fixup_string(char *s, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i += 4)</div><div class='add'>+		cpu_to_le32s((u32 *)(s + i));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size - 2; ++i) {</div><div class='add'>+		if (s[i] == '\0')</div><div class='add'>+			return;</div><div class='add'>+		if (s[i] == '\\' &amp;&amp; s[i + 1] == '\\') {</div><div class='add'>+			s[i + 2] = '\0';</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	s[size - 1] = '\0';</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_proc_read(struct snd_info_entry *entry,</div><div class='add'>+			   struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	static const char *const section_names[5] = {</div><div class='add'>+		"global", "tx", "rx", "ext_sync", "unused2"</div><div class='add'>+	};</div><div class='add'>+	static const char *const clock_sources[] = {</div><div class='add'>+		"aes1", "aes2", "aes3", "aes4", "aes", "adat", "tdif",</div><div class='add'>+		"wc", "arx1", "arx2", "arx3", "arx4", "internal"</div><div class='add'>+	};</div><div class='add'>+	static const char *const rates[] = {</div><div class='add'>+		"32000", "44100", "48000", "88200", "96000", "176400", "192000",</div><div class='add'>+		"any low", "any mid", "any high", "none"</div><div class='add'>+	};</div><div class='add'>+	struct snd_dice *dice = entry-&gt;private_data;</div><div class='add'>+	u32 sections[ARRAY_SIZE(section_names) * 2];</div><div class='add'>+	struct {</div><div class='add'>+		u32 number;</div><div class='add'>+		u32 size;</div><div class='add'>+	} tx_rx_header;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32 owner_hi, owner_lo;</div><div class='add'>+			u32 notification;</div><div class='add'>+			char nick_name[NICK_NAME_SIZE];</div><div class='add'>+			u32 clock_select;</div><div class='add'>+			u32 enable;</div><div class='add'>+			u32 status;</div><div class='add'>+			u32 extended_status;</div><div class='add'>+			u32 sample_rate;</div><div class='add'>+			u32 version;</div><div class='add'>+			u32 clock_caps;</div><div class='add'>+			char clock_source_names[CLOCK_SOURCE_NAMES_SIZE];</div><div class='add'>+		} global;</div><div class='add'>+		struct {</div><div class='add'>+			u32 iso;</div><div class='add'>+			u32 number_audio;</div><div class='add'>+			u32 number_midi;</div><div class='add'>+			u32 speed;</div><div class='add'>+			char names[TX_NAMES_SIZE];</div><div class='add'>+			u32 ac3_caps;</div><div class='add'>+			u32 ac3_enable;</div><div class='add'>+		} tx;</div><div class='add'>+		struct {</div><div class='add'>+			u32 iso;</div><div class='add'>+			u32 seq_start;</div><div class='add'>+			u32 number_audio;</div><div class='add'>+			u32 number_midi;</div><div class='add'>+			char names[RX_NAMES_SIZE];</div><div class='add'>+			u32 ac3_caps;</div><div class='add'>+			u32 ac3_enable;</div><div class='add'>+		} rx;</div><div class='add'>+		struct {</div><div class='add'>+			u32 clock_source;</div><div class='add'>+			u32 locked;</div><div class='add'>+			u32 rate;</div><div class='add'>+			u32 adat_user_data;</div><div class='add'>+		} ext_sync;</div><div class='add'>+	} buf;</div><div class='add'>+	unsigned int quadlets, stream, i;</div><div class='add'>+</div><div class='add'>+	if (dice_proc_read_mem(dice, sections, 0, ARRAY_SIZE(sections)) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	snd_iprintf(buffer, "sections:\n");</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(section_names); ++i)</div><div class='add'>+		snd_iprintf(buffer, "  %s: offset %u, size %u\n",</div><div class='add'>+			    section_names[i],</div><div class='add'>+			    sections[i * 2], sections[i * 2 + 1]);</div><div class='add'>+</div><div class='add'>+	quadlets = min_t(u32, sections[1], sizeof(buf.global) / 4);</div><div class='add'>+	if (dice_proc_read_mem(dice, &amp;buf.global, sections[0], quadlets) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	snd_iprintf(buffer, "global:\n");</div><div class='add'>+	snd_iprintf(buffer, "  owner: %04x:%04x%08x\n",</div><div class='add'>+		    buf.global.owner_hi &gt;&gt; 16,</div><div class='add'>+		    buf.global.owner_hi &amp; 0xffff, buf.global.owner_lo);</div><div class='add'>+	snd_iprintf(buffer, "  notification: %08x\n", buf.global.notification);</div><div class='add'>+	dice_proc_fixup_string(buf.global.nick_name, NICK_NAME_SIZE);</div><div class='add'>+	snd_iprintf(buffer, "  nick name: %s\n", buf.global.nick_name);</div><div class='add'>+	snd_iprintf(buffer, "  clock select: %s %s\n",</div><div class='add'>+		    str_from_array(clock_sources, ARRAY_SIZE(clock_sources),</div><div class='add'>+				   buf.global.clock_select &amp; CLOCK_SOURCE_MASK),</div><div class='add'>+		    str_from_array(rates, ARRAY_SIZE(rates),</div><div class='add'>+				   (buf.global.clock_select &amp; CLOCK_RATE_MASK)</div><div class='add'>+				   &gt;&gt; CLOCK_RATE_SHIFT));</div><div class='add'>+	snd_iprintf(buffer, "  enable: %u\n", buf.global.enable);</div><div class='add'>+	snd_iprintf(buffer, "  status: %slocked %s\n",</div><div class='add'>+		    buf.global.status &amp; STATUS_SOURCE_LOCKED ? "" : "un",</div><div class='add'>+		    str_from_array(rates, ARRAY_SIZE(rates),</div><div class='add'>+				   (buf.global.status &amp;</div><div class='add'>+				    STATUS_NOMINAL_RATE_MASK)</div><div class='add'>+				   &gt;&gt; CLOCK_RATE_SHIFT));</div><div class='add'>+	snd_iprintf(buffer, "  ext status: %08x\n", buf.global.extended_status);</div><div class='add'>+	snd_iprintf(buffer, "  sample rate: %u\n", buf.global.sample_rate);</div><div class='add'>+	if (quadlets &gt;= 90) {</div><div class='add'>+		snd_iprintf(buffer, "  version: %u.%u.%u.%u\n",</div><div class='add'>+			    (buf.global.version &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+			    (buf.global.version &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+			    (buf.global.version &gt;&gt;  8) &amp; 0xff,</div><div class='add'>+			    (buf.global.version &gt;&gt;  0) &amp; 0xff);</div><div class='add'>+		snd_iprintf(buffer, "  clock caps:");</div><div class='add'>+		for (i = 0; i &lt;= 6; ++i)</div><div class='add'>+			if (buf.global.clock_caps &amp; (1 &lt;&lt; i))</div><div class='add'>+				snd_iprintf(buffer, " %s", rates[i]);</div><div class='add'>+		for (i = 0; i &lt;= 12; ++i)</div><div class='add'>+			if (buf.global.clock_caps &amp; (1 &lt;&lt; (16 + i)))</div><div class='add'>+				snd_iprintf(buffer, " %s", clock_sources[i]);</div><div class='add'>+		snd_iprintf(buffer, "\n");</div><div class='add'>+		dice_proc_fixup_string(buf.global.clock_source_names,</div><div class='add'>+				       CLOCK_SOURCE_NAMES_SIZE);</div><div class='add'>+		snd_iprintf(buffer, "  clock source names: %s\n",</div><div class='add'>+			    buf.global.clock_source_names);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dice_proc_read_mem(dice, &amp;tx_rx_header, sections[2], 2) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx) / 4);</div><div class='add'>+	for (stream = 0; stream &lt; tx_rx_header.number; ++stream) {</div><div class='add'>+		if (dice_proc_read_mem(dice, &amp;buf.tx, sections[2] + 2 +</div><div class='add'>+				       stream * tx_rx_header.size,</div><div class='add'>+				       quadlets) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		snd_iprintf(buffer, "tx %u:\n", stream);</div><div class='add'>+		snd_iprintf(buffer, "  iso channel: %d\n", (int)buf.tx.iso);</div><div class='add'>+		snd_iprintf(buffer, "  audio channels: %u\n",</div><div class='add'>+			    buf.tx.number_audio);</div><div class='add'>+		snd_iprintf(buffer, "  midi ports: %u\n", buf.tx.number_midi);</div><div class='add'>+		snd_iprintf(buffer, "  speed: S%u\n", 100u &lt;&lt; buf.tx.speed);</div><div class='add'>+		if (quadlets &gt;= 68) {</div><div class='add'>+			dice_proc_fixup_string(buf.tx.names, TX_NAMES_SIZE);</div><div class='add'>+			snd_iprintf(buffer, "  names: %s\n", buf.tx.names);</div><div class='add'>+		}</div><div class='add'>+		if (quadlets &gt;= 70) {</div><div class='add'>+			snd_iprintf(buffer, "  ac3 caps: %08x\n",</div><div class='add'>+				    buf.tx.ac3_caps);</div><div class='add'>+			snd_iprintf(buffer, "  ac3 enable: %08x\n",</div><div class='add'>+				    buf.tx.ac3_enable);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dice_proc_read_mem(dice, &amp;tx_rx_header, sections[4], 2) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx) / 4);</div><div class='add'>+	for (stream = 0; stream &lt; tx_rx_header.number; ++stream) {</div><div class='add'>+		if (dice_proc_read_mem(dice, &amp;buf.rx, sections[4] + 2 +</div><div class='add'>+				       stream * tx_rx_header.size,</div><div class='add'>+				       quadlets) &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		snd_iprintf(buffer, "rx %u:\n", stream);</div><div class='add'>+		snd_iprintf(buffer, "  iso channel: %d\n", (int)buf.rx.iso);</div><div class='add'>+		snd_iprintf(buffer, "  sequence start: %u\n", buf.rx.seq_start);</div><div class='add'>+		snd_iprintf(buffer, "  audio channels: %u\n",</div><div class='add'>+			    buf.rx.number_audio);</div><div class='add'>+		snd_iprintf(buffer, "  midi ports: %u\n", buf.rx.number_midi);</div><div class='add'>+		if (quadlets &gt;= 68) {</div><div class='add'>+			dice_proc_fixup_string(buf.rx.names, RX_NAMES_SIZE);</div><div class='add'>+			snd_iprintf(buffer, "  names: %s\n", buf.rx.names);</div><div class='add'>+		}</div><div class='add'>+		if (quadlets &gt;= 70) {</div><div class='add'>+			snd_iprintf(buffer, "  ac3 caps: %08x\n",</div><div class='add'>+				    buf.rx.ac3_caps);</div><div class='add'>+			snd_iprintf(buffer, "  ac3 enable: %08x\n",</div><div class='add'>+				    buf.rx.ac3_enable);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	quadlets = min_t(u32, sections[7], sizeof(buf.ext_sync) / 4);</div><div class='add'>+	if (quadlets &gt;= 4) {</div><div class='add'>+		if (dice_proc_read_mem(dice, &amp;buf.ext_sync,</div><div class='add'>+				       sections[6], 4) &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+		snd_iprintf(buffer, "ext status:\n");</div><div class='add'>+		snd_iprintf(buffer, "  clock source: %s\n",</div><div class='add'>+			    str_from_array(clock_sources,</div><div class='add'>+					   ARRAY_SIZE(clock_sources),</div><div class='add'>+					   buf.ext_sync.clock_source));</div><div class='add'>+		snd_iprintf(buffer, "  locked: %u\n", buf.ext_sync.locked);</div><div class='add'>+		snd_iprintf(buffer, "  rate: %s\n",</div><div class='add'>+			    str_from_array(rates, ARRAY_SIZE(rates),</div><div class='add'>+					   buf.ext_sync.rate));</div><div class='add'>+		snd_iprintf(buffer, "  adat user data: ");</div><div class='add'>+		if (buf.ext_sync.adat_user_data &amp; ADAT_USER_DATA_NO_DATA)</div><div class='add'>+			snd_iprintf(buffer, "-\n");</div><div class='add'>+		else</div><div class='add'>+			snd_iprintf(buffer, "%x\n",</div><div class='add'>+				    buf.ext_sync.adat_user_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_proc_read_formation(struct snd_info_entry *entry,</div><div class='add'>+				     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	static const char *const rate_labels[] = {</div><div class='add'>+		[SND_DICE_RATE_MODE_LOW]	= "low",</div><div class='add'>+		[SND_DICE_RATE_MODE_MIDDLE]	= "middle",</div><div class='add'>+		[SND_DICE_RATE_MODE_HIGH]	= "high",</div><div class='add'>+	};</div><div class='add'>+	struct snd_dice *dice = entry-&gt;private_data;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Output stream from unit:\n");</div><div class='add'>+	for (i = 0; i &lt; SND_DICE_RATE_MODE_COUNT; ++i)</div><div class='add'>+		snd_iprintf(buffer, "\t%s", rate_labels[i]);</div><div class='add'>+	snd_iprintf(buffer, "\tMIDI\n");</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		snd_iprintf(buffer, "Tx %u:", i);</div><div class='add'>+		for (j = 0; j &lt; SND_DICE_RATE_MODE_COUNT; ++j)</div><div class='add'>+			snd_iprintf(buffer, "\t%u", dice-&gt;tx_pcm_chs[i][j]);</div><div class='add'>+		snd_iprintf(buffer, "\t%u\n", dice-&gt;tx_midi_ports[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Input stream to unit:\n");</div><div class='add'>+	for (i = 0; i &lt; SND_DICE_RATE_MODE_COUNT; ++i)</div><div class='add'>+		snd_iprintf(buffer, "\t%s", rate_labels[i]);</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		snd_iprintf(buffer, "Rx %u:", i);</div><div class='add'>+		for (j = 0; j &lt; SND_DICE_RATE_MODE_COUNT; ++j)</div><div class='add'>+			snd_iprintf(buffer, "\t%u", dice-&gt;rx_pcm_chs[i][j]);</div><div class='add'>+		snd_iprintf(buffer, "\t%u\n", dice-&gt;rx_midi_ports[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_node(struct snd_dice *dice, struct snd_info_entry *root,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     void (*op)(struct snd_info_entry *entry,</div><div class='add'>+				struct snd_info_buffer *buffer))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(dice-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, dice, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_create_proc(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(dice-&gt;card, "firewire",</div><div class='add'>+					  dice-&gt;card-&gt;proc_root);</div><div class='add'>+	if (!root)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(dice, root, "dice", dice_proc_read);</div><div class='add'>+	add_node(dice, root, "formation", dice_proc_read_formation);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c<br/>new file mode 100644<br/>index 000000000000..d5ffe7c82993<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-stream.c</a></div><div class='hunk'>@@ -0,0 +1,699 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_stream.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+#define	READY_TIMEOUT_MS	200</div><div class='add'>+#define NOTIFICATION_TIMEOUT_MS	100</div><div class='add'>+</div><div class='add'>+struct reg_params {</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned int size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const unsigned int snd_dice_rates[SND_DICE_RATES_COUNT] = {</div><div class='add'>+	/* mode 0 */</div><div class='add'>+	[0] =  32000,</div><div class='add'>+	[1] =  44100,</div><div class='add'>+	[2] =  48000,</div><div class='add'>+	/* mode 1 */</div><div class='add'>+	[3] =  88200,</div><div class='add'>+	[4] =  96000,</div><div class='add'>+	/* mode 2 */</div><div class='add'>+	[5] = 176400,</div><div class='add'>+	[6] = 192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_get_rate_mode(struct snd_dice *dice, unsigned int rate,</div><div class='add'>+				  enum snd_dice_rate_mode *mode)</div><div class='add'>+{</div><div class='add'>+	/* Corresponding to each entry in snd_dice_rates. */</div><div class='add'>+	static const enum snd_dice_rate_mode modes[] = {</div><div class='add'>+		[0] = SND_DICE_RATE_MODE_LOW,</div><div class='add'>+		[1] = SND_DICE_RATE_MODE_LOW,</div><div class='add'>+		[2] = SND_DICE_RATE_MODE_LOW,</div><div class='add'>+		[3] = SND_DICE_RATE_MODE_MIDDLE,</div><div class='add'>+		[4] = SND_DICE_RATE_MODE_MIDDLE,</div><div class='add'>+		[5] = SND_DICE_RATE_MODE_HIGH,</div><div class='add'>+		[6] = SND_DICE_RATE_MODE_HIGH,</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dice_rates); i++) {</div><div class='add'>+		if (!(dice-&gt;clock_caps &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+		if (snd_dice_rates[i] != rate)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		*mode = modes[i];</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int select_clock(struct snd_dice *dice, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg, new;</div><div class='add'>+	u32 data;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_global(dice, GLOBAL_CLOCK_SELECT,</div><div class='add'>+					       &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~CLOCK_RATE_MASK;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dice_rates); ++i) {</div><div class='add'>+		if (snd_dice_rates[i] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(snd_dice_rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	data |= i &lt;&lt; CLOCK_RATE_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (completion_done(&amp;dice-&gt;clock_accepted))</div><div class='add'>+		reinit_completion(&amp;dice-&gt;clock_accepted);</div><div class='add'>+</div><div class='add'>+	new = cpu_to_be32(data);</div><div class='add'>+	err = snd_dice_transaction_write_global(dice, GLOBAL_CLOCK_SELECT,</div><div class='add'>+						&amp;new, sizeof(new));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (wait_for_completion_timeout(&amp;dice-&gt;clock_accepted,</div><div class='add'>+			msecs_to_jiffies(NOTIFICATION_TIMEOUT_MS)) == 0) {</div><div class='add'>+		if (reg != new)</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_register_params(struct snd_dice *dice,</div><div class='add'>+			       struct reg_params *tx_params,</div><div class='add'>+			       struct reg_params *rx_params)</div><div class='add'>+{</div><div class='add'>+	__be32 reg[2];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_tx(dice, TX_NUMBER, reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	tx_params-&gt;count =</div><div class='add'>+			min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);</div><div class='add'>+	tx_params-&gt;size = be32_to_cpu(reg[1]) * 4;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_rx(dice, RX_NUMBER, reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	rx_params-&gt;count =</div><div class='add'>+			min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);</div><div class='add'>+	rx_params-&gt;size = be32_to_cpu(reg[1]) * 4;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_resources(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		fw_iso_resources_free(&amp;dice-&gt;tx_resources[i]);</div><div class='add'>+		fw_iso_resources_free(&amp;dice-&gt;rx_resources[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stop_streams(struct snd_dice *dice, enum amdtp_stream_direction dir,</div><div class='add'>+			 struct reg_params *params)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params-&gt;count; i++) {</div><div class='add'>+		reg = cpu_to_be32((u32)-1);</div><div class='add'>+		if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+			snd_dice_transaction_write_tx(dice,</div><div class='add'>+					params-&gt;size * i + TX_ISOCHRONOUS,</div><div class='add'>+					&amp;reg, sizeof(reg));</div><div class='add'>+		} else {</div><div class='add'>+			snd_dice_transaction_write_rx(dice,</div><div class='add'>+					params-&gt;size * i + RX_ISOCHRONOUS,</div><div class='add'>+					&amp;reg, sizeof(reg));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_dice *dice, struct amdtp_stream *stream,</div><div class='add'>+			  struct fw_iso_resources *resources, unsigned int rate,</div><div class='add'>+			  unsigned int pcm_chs, unsigned int midi_ports)</div><div class='add'>+{</div><div class='add'>+	bool double_pcm_frames;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// At 176.4/192.0 kHz, Dice has a quirk to transfer two PCM frames in</div><div class='add'>+	// one data block of AMDTP packet. Thus sampling transfer frequency is</div><div class='add'>+	// a half of PCM sampling frequency, i.e. PCM frames at 192.0 kHz are</div><div class='add'>+	// transferred on AMDTP packets at 96 kHz. Two successive samples of a</div><div class='add'>+	// channel are stored consecutively in the packet. This quirk is called</div><div class='add'>+	// as 'Dual Wire'.</div><div class='add'>+	// For this quirk, blocking mode is required and PCM buffer size should</div><div class='add'>+	// be aligned to SYT_INTERVAL.</div><div class='add'>+	double_pcm_frames = (rate &gt; 96000 &amp;&amp; !dice-&gt;disable_double_pcm_frames);</div><div class='add'>+	if (double_pcm_frames) {</div><div class='add'>+		rate /= 2;</div><div class='add'>+		pcm_chs *= 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_set_parameters(stream, rate, pcm_chs, midi_ports,</div><div class='add'>+					 double_pcm_frames);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (double_pcm_frames) {</div><div class='add'>+		pcm_chs /= 2;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; pcm_chs; i++) {</div><div class='add'>+			amdtp_am824_set_pcm_position(stream, i, i * 2);</div><div class='add'>+			amdtp_am824_set_pcm_position(stream, i + pcm_chs,</div><div class='add'>+						     i * 2 + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return fw_iso_resources_allocate(resources,</div><div class='add'>+				amdtp_stream_get_max_payload(stream),</div><div class='add'>+				fw_parent_device(dice-&gt;unit)-&gt;max_speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_dual_resources(struct snd_dice *dice, unsigned int rate,</div><div class='add'>+			       enum amdtp_stream_direction dir,</div><div class='add'>+			       struct reg_params *params)</div><div class='add'>+{</div><div class='add'>+	enum snd_dice_rate_mode mode;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_stream_get_rate_mode(dice, rate, &amp;mode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params-&gt;count; ++i) {</div><div class='add'>+		__be32 reg[2];</div><div class='add'>+		struct amdtp_stream *stream;</div><div class='add'>+		struct fw_iso_resources *resources;</div><div class='add'>+		unsigned int pcm_cache;</div><div class='add'>+		unsigned int pcm_chs;</div><div class='add'>+		unsigned int midi_ports;</div><div class='add'>+</div><div class='add'>+		if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+			stream = &amp;dice-&gt;tx_stream[i];</div><div class='add'>+			resources = &amp;dice-&gt;tx_resources[i];</div><div class='add'>+</div><div class='add'>+			pcm_cache = dice-&gt;tx_pcm_chs[i][mode];</div><div class='add'>+			err = snd_dice_transaction_read_tx(dice,</div><div class='add'>+					params-&gt;size * i + TX_NUMBER_AUDIO,</div><div class='add'>+					reg, sizeof(reg));</div><div class='add'>+		} else {</div><div class='add'>+			stream = &amp;dice-&gt;rx_stream[i];</div><div class='add'>+			resources = &amp;dice-&gt;rx_resources[i];</div><div class='add'>+</div><div class='add'>+			pcm_cache = dice-&gt;rx_pcm_chs[i][mode];</div><div class='add'>+			err = snd_dice_transaction_read_rx(dice,</div><div class='add'>+					params-&gt;size * i + RX_NUMBER_AUDIO,</div><div class='add'>+					reg, sizeof(reg));</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		pcm_chs = be32_to_cpu(reg[0]);</div><div class='add'>+		midi_ports = be32_to_cpu(reg[1]);</div><div class='add'>+</div><div class='add'>+		// These are important for developer of this driver.</div><div class='add'>+		if (pcm_chs != pcm_cache) {</div><div class='add'>+			dev_info(&amp;dice-&gt;unit-&gt;device,</div><div class='add'>+				 "cache mismatch: pcm: %u:%u, midi: %u\n",</div><div class='add'>+				 pcm_chs, pcm_cache, midi_ports);</div><div class='add'>+			return -EPROTO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = keep_resources(dice, stream, resources, rate, pcm_chs,</div><div class='add'>+				     midi_ports);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_session(struct snd_dice *dice, struct reg_params *tx_params,</div><div class='add'>+			   struct reg_params *rx_params)</div><div class='add'>+{</div><div class='add'>+	stop_streams(dice, AMDTP_IN_STREAM, tx_params);</div><div class='add'>+	stop_streams(dice, AMDTP_OUT_STREAM, rx_params);</div><div class='add'>+</div><div class='add'>+	snd_dice_transaction_clear_enable(dice);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,</div><div class='add'>+				   unsigned int events_per_period,</div><div class='add'>+				   unsigned int events_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Check sampling transmission frequency.</div><div class='add'>+	err = snd_dice_transaction_get_rate(dice, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0)</div><div class='add'>+		rate = curr_rate;</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;substreams_counter == 0 || curr_rate != rate) {</div><div class='add'>+		struct reg_params tx_params, rx_params;</div><div class='add'>+</div><div class='add'>+		amdtp_domain_stop(&amp;dice-&gt;domain);</div><div class='add'>+</div><div class='add'>+		err = get_register_params(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		finish_session(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+</div><div class='add'>+		release_resources(dice);</div><div class='add'>+</div><div class='add'>+		// Just after owning the unit (GLOBAL_OWNER), the unit can</div><div class='add'>+		// return invalid stream formats. Selecting clock parameters</div><div class='add'>+		// have an effect for the unit to refine it.</div><div class='add'>+		err = select_clock(dice, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		// After changing sampling transfer frequency, the value of</div><div class='add'>+		// register can be changed.</div><div class='add'>+		err = get_register_params(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_dual_resources(dice, rate, AMDTP_IN_STREAM,</div><div class='add'>+					  &amp;tx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = keep_dual_resources(dice, rate, AMDTP_OUT_STREAM,</div><div class='add'>+					  &amp;rx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;dice-&gt;domain,</div><div class='add'>+					events_per_period, events_per_buffer);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	release_resources(dice);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_streams(struct snd_dice *dice, enum amdtp_stream_direction dir,</div><div class='add'>+			 unsigned int rate, struct reg_params *params)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_speed = fw_parent_device(dice-&gt;unit)-&gt;max_speed;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; params-&gt;count; i++) {</div><div class='add'>+		struct amdtp_stream *stream;</div><div class='add'>+		struct fw_iso_resources *resources;</div><div class='add'>+		__be32 reg;</div><div class='add'>+</div><div class='add'>+		if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+			stream = dice-&gt;tx_stream + i;</div><div class='add'>+			resources = dice-&gt;tx_resources + i;</div><div class='add'>+		} else {</div><div class='add'>+			stream = dice-&gt;rx_stream + i;</div><div class='add'>+			resources = dice-&gt;rx_resources + i;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reg = cpu_to_be32(resources-&gt;channel);</div><div class='add'>+		if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+			err = snd_dice_transaction_write_tx(dice,</div><div class='add'>+					params-&gt;size * i + TX_ISOCHRONOUS,</div><div class='add'>+					&amp;reg, sizeof(reg));</div><div class='add'>+		} else {</div><div class='add'>+			err = snd_dice_transaction_write_rx(dice,</div><div class='add'>+					params-&gt;size * i + RX_ISOCHRONOUS,</div><div class='add'>+					&amp;reg, sizeof(reg));</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+			reg = cpu_to_be32(max_speed);</div><div class='add'>+			err = snd_dice_transaction_write_tx(dice,</div><div class='add'>+					params-&gt;size * i + TX_SPEED,</div><div class='add'>+					&amp;reg, sizeof(reg));</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;dice-&gt;domain, stream,</div><div class='add'>+					      resources-&gt;channel, max_speed);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MEMO: After this function, there're two states of streams:</div><div class='add'>+ *  - None streams are running.</div><div class='add'>+ *  - All streams are running.</div><div class='add'>+ */</div><div class='add'>+int snd_dice_stream_start_duplex(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = dice-&gt;rx_resources[0].generation;</div><div class='add'>+	struct reg_params tx_params, rx_params;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_dice_rate_mode mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;substreams_counter == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	err = get_register_params(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Check error of packet streaming.</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		if (amdtp_streaming_error(&amp;dice-&gt;tx_stream[i]) ||</div><div class='add'>+		    amdtp_streaming_error(&amp;dice-&gt;rx_stream[i])) {</div><div class='add'>+			amdtp_domain_stop(&amp;dice-&gt;domain);</div><div class='add'>+			finish_session(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(dice-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+			if (i &lt; tx_params.count)</div><div class='add'>+				fw_iso_resources_update(dice-&gt;tx_resources + i);</div><div class='add'>+			if (i &lt; rx_params.count)</div><div class='add'>+				fw_iso_resources_update(dice-&gt;rx_resources + i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Check required streams are running or not.</div><div class='add'>+	err = snd_dice_transaction_get_rate(dice, &amp;rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_dice_stream_get_rate_mode(dice, rate, &amp;mode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+		if (dice-&gt;tx_pcm_chs[i][mode] &gt; 0 &amp;&amp;</div><div class='add'>+		    !amdtp_stream_running(&amp;dice-&gt;tx_stream[i]))</div><div class='add'>+			break;</div><div class='add'>+		if (dice-&gt;rx_pcm_chs[i][mode] &gt; 0 &amp;&amp;</div><div class='add'>+		    !amdtp_stream_running(&amp;dice-&gt;rx_stream[i]))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &lt; MAX_STREAMS) {</div><div class='add'>+		// Start both streams.</div><div class='add'>+		err = start_streams(dice, AMDTP_IN_STREAM, rate, &amp;tx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = start_streams(dice, AMDTP_OUT_STREAM, rate, &amp;rx_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = snd_dice_transaction_set_enable(dice);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;dice-&gt;unit-&gt;device,</div><div class='add'>+				"fail to enable interface\n");</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// MEMO: The device immediately starts packet transmission when enabled. Some</div><div class='add'>+		// devices are strictly to generate any discontinuity in the sequence of tx packet</div><div class='add'>+		// when they receives invalid sequence of presentation time in CIP header. The</div><div class='add'>+		// sequence replay for media clock recovery can suppress the behaviour.</div><div class='add'>+		err = amdtp_domain_start(&amp;dice-&gt;domain, 0, true, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;dice-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;dice-&gt;domain);</div><div class='add'>+	finish_session(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * MEMO: After this function, there're two states of streams:</div><div class='add'>+ *  - None streams are running.</div><div class='add'>+ *  - All streams are running.</div><div class='add'>+ */</div><div class='add'>+void snd_dice_stream_stop_duplex(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct reg_params tx_params, rx_params;</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;substreams_counter == 0) {</div><div class='add'>+		if (get_register_params(dice, &amp;tx_params, &amp;rx_params) &gt;= 0)</div><div class='add'>+			finish_session(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+</div><div class='add'>+		amdtp_domain_stop(&amp;dice-&gt;domain);</div><div class='add'>+		release_resources(dice);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_dice *dice, enum amdtp_stream_direction dir,</div><div class='add'>+		       unsigned int index)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+		stream = &amp;dice-&gt;tx_stream[index];</div><div class='add'>+		resources = &amp;dice-&gt;tx_resources[index];</div><div class='add'>+	} else {</div><div class='add'>+		stream = &amp;dice-&gt;rx_stream[index];</div><div class='add'>+		resources = &amp;dice-&gt;rx_resources[index];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(resources, dice-&gt;unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	resources-&gt;channels_mask = 0x00000000ffffffffuLL;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_init(stream, dice-&gt;unit, dir, CIP_BLOCKING);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		amdtp_stream_destroy(stream);</div><div class='add'>+		fw_iso_resources_destroy(resources);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function should be called before starting streams or after stopping</div><div class='add'>+ * streams.</div><div class='add'>+ */</div><div class='add'>+static void destroy_stream(struct snd_dice *dice,</div><div class='add'>+			   enum amdtp_stream_direction dir,</div><div class='add'>+			   unsigned int index)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+		stream = &amp;dice-&gt;tx_stream[index];</div><div class='add'>+		resources = &amp;dice-&gt;tx_resources[index];</div><div class='add'>+	} else {</div><div class='add'>+		stream = &amp;dice-&gt;rx_stream[index];</div><div class='add'>+		resources = &amp;dice-&gt;rx_resources[index];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amdtp_stream_destroy(stream);</div><div class='add'>+	fw_iso_resources_destroy(resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_init_duplex(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; i++) {</div><div class='add'>+		err = init_stream(dice, AMDTP_IN_STREAM, i);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			for (; i &gt;= 0; i--)</div><div class='add'>+				destroy_stream(dice, AMDTP_IN_STREAM, i);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; i++) {</div><div class='add'>+		err = init_stream(dice, AMDTP_OUT_STREAM, i);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			for (; i &gt;= 0; i--)</div><div class='add'>+				destroy_stream(dice, AMDTP_OUT_STREAM, i);</div><div class='add'>+			for (i = 0; i &lt; MAX_STREAMS; i++)</div><div class='add'>+				destroy_stream(dice, AMDTP_IN_STREAM, i);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;dice-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		for (i = 0; i &lt; MAX_STREAMS; ++i) {</div><div class='add'>+			destroy_stream(dice, AMDTP_OUT_STREAM, i);</div><div class='add'>+			destroy_stream(dice, AMDTP_IN_STREAM, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_stream_destroy_duplex(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_STREAMS; i++) {</div><div class='add'>+		destroy_stream(dice, AMDTP_IN_STREAM, i);</div><div class='add'>+		destroy_stream(dice, AMDTP_OUT_STREAM, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amdtp_domain_destroy(&amp;dice-&gt;domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_stream_update_duplex(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct reg_params tx_params, rx_params;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On a bus reset, the DICE firmware disables streaming and then goes</div><div class='add'>+	 * off contemplating its own navel for hundreds of milliseconds before</div><div class='add'>+	 * it can react to any of our attempts to reenable streaming.  This</div><div class='add'>+	 * means that we lose synchronization anyway, so we force our streams</div><div class='add'>+	 * to stop so that the application can restart them in an orderly</div><div class='add'>+	 * manner.</div><div class='add'>+	 */</div><div class='add'>+	dice-&gt;global_enabled = false;</div><div class='add'>+</div><div class='add'>+	if (get_register_params(dice, &amp;tx_params, &amp;rx_params) == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;dice-&gt;domain);</div><div class='add'>+</div><div class='add'>+		stop_streams(dice, AMDTP_IN_STREAM, &amp;tx_params);</div><div class='add'>+		stop_streams(dice, AMDTP_OUT_STREAM, &amp;rx_params);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_detect_current_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_dice_rate_mode mode;</div><div class='add'>+	__be32 reg[2];</div><div class='add'>+	struct reg_params tx_params, rx_params;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* If extended protocol is available, detect detail spec. */</div><div class='add'>+	err = snd_dice_detect_extension_formats(dice);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Available stream format is restricted at current mode of sampling</div><div class='add'>+	 * clock.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_dice_transaction_get_rate(dice, &amp;rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_stream_get_rate_mode(dice, rate, &amp;mode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Just after owning the unit (GLOBAL_OWNER), the unit can return</div><div class='add'>+	 * invalid stream formats. Selecting clock parameters have an effect</div><div class='add'>+	 * for the unit to refine it.</div><div class='add'>+	 */</div><div class='add'>+	err = select_clock(dice, rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = get_register_params(dice, &amp;tx_params, &amp;rx_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tx_params.count; ++i) {</div><div class='add'>+		err = snd_dice_transaction_read_tx(dice,</div><div class='add'>+				tx_params.size * i + TX_NUMBER_AUDIO,</div><div class='add'>+				reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		dice-&gt;tx_pcm_chs[i][mode] = be32_to_cpu(reg[0]);</div><div class='add'>+		dice-&gt;tx_midi_ports[i] = max_t(unsigned int,</div><div class='add'>+				be32_to_cpu(reg[1]), dice-&gt;tx_midi_ports[i]);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; rx_params.count; ++i) {</div><div class='add'>+		err = snd_dice_transaction_read_rx(dice,</div><div class='add'>+				rx_params.size * i + RX_NUMBER_AUDIO,</div><div class='add'>+				reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		dice-&gt;rx_pcm_chs[i][mode] = be32_to_cpu(reg[0]);</div><div class='add'>+		dice-&gt;rx_midi_ports[i] = max_t(unsigned int,</div><div class='add'>+				be32_to_cpu(reg[1]), dice-&gt;rx_midi_ports[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_lock_changed(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	dice-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;dice-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_lock_try(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;dev_lock_count++ == 0)</div><div class='add'>+		dice_lock_changed(dice);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_stream_lock_release(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dice-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(dice-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (--dice-&gt;dev_lock_count == 0)</div><div class='add'>+		dice_lock_changed(dice);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-tcelectronic.c b/sound/firewire/dice/dice-tcelectronic.c<br/>new file mode 100644<br/>index 000000000000..43a3bcb15b3d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-tcelectronic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-tcelectronic.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * dice-tc_electronic.c - a part of driver for DICE based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2018 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+struct dice_tc_spec {</div><div class='add'>+	unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	bool has_midi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec desktop_konnekt6 = {</div><div class='add'>+	.tx_pcm_chs = {{6, 6, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{6, 6, 4}, {0, 0, 0} },</div><div class='add'>+	.has_midi = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec impact_twin = {</div><div class='add'>+	.tx_pcm_chs = {{14, 10, 6}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{14, 10, 6}, {0, 0, 0} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec konnekt_8 = {</div><div class='add'>+	.tx_pcm_chs = {{4, 4, 3}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{4, 4, 3}, {0, 0, 0} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec konnekt_24d = {</div><div class='add'>+	.tx_pcm_chs = {{16, 16, 6}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{16, 16, 6}, {0, 0, 0} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec konnekt_live = {</div><div class='add'>+	.tx_pcm_chs = {{16, 16, 6}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{16, 16, 6}, {0, 0, 0} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec studio_konnekt_48 = {</div><div class='add'>+	.tx_pcm_chs = {{16, 16, 8}, {16, 16, 7} },</div><div class='add'>+	.rx_pcm_chs = {{16, 16, 8}, {14, 14, 7} },</div><div class='add'>+	.has_midi = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dice_tc_spec digital_konnekt_x32 = {</div><div class='add'>+	.tx_pcm_chs = {{16, 16, 4}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{16, 16, 4}, {0, 0, 0} },</div><div class='add'>+	.has_midi = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		u32 model_id;</div><div class='add'>+		const struct dice_tc_spec *spec;</div><div class='add'>+	} *entry, entries[] = {</div><div class='add'>+		{0x00000020, &amp;konnekt_24d},</div><div class='add'>+		{0x00000021, &amp;konnekt_8},</div><div class='add'>+		{0x00000022, &amp;studio_konnekt_48},</div><div class='add'>+		{0x00000023, &amp;konnekt_live},</div><div class='add'>+		{0x00000024, &amp;desktop_konnekt6},</div><div class='add'>+		{0x00000027, &amp;impact_twin},</div><div class='add'>+		{0x00000030, &amp;digital_konnekt_x32},</div><div class='add'>+	};</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val, model_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	model_id = 0;</div><div class='add'>+	fw_csr_iterator_init(&amp;it, dice-&gt;unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		if (key == CSR_MODEL) {</div><div class='add'>+			model_id = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(entries); ++i) {</div><div class='add'>+		entry = entries + i;</div><div class='add'>+		if (entry-&gt;model_id == model_id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(entries))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	memcpy(dice-&gt;tx_pcm_chs, entry-&gt;spec-&gt;tx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+	memcpy(dice-&gt;rx_pcm_chs, entry-&gt;spec-&gt;rx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;spec-&gt;has_midi) {</div><div class='add'>+		dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+		dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-teac.c b/sound/firewire/dice/dice-teac.c<br/>new file mode 100644<br/>index 000000000000..29febddfe3a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-teac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-teac.c</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// dice-teac.c - a part of driver for DICE based devices</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2025 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_teac_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_tx(dice, TX_NUMBER, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err  &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][SND_DICE_RATE_MODE_LOW] = 16;</div><div class='add'>+	dice-&gt;tx_pcm_chs[0][SND_DICE_RATE_MODE_MIDDLE] = 16;</div><div class='add'>+	dice-&gt;tx_midi_ports[0] = 1;</div><div class='add'>+</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+	if (data &gt; 1) {</div><div class='add'>+		dice-&gt;tx_pcm_chs[1][SND_DICE_RATE_MODE_LOW] = 16;</div><div class='add'>+		dice-&gt;tx_pcm_chs[1][SND_DICE_RATE_MODE_MIDDLE] = 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_read_rx(dice, RX_NUMBER, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err  &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dice-&gt;rx_pcm_chs[0][SND_DICE_RATE_MODE_LOW] = 16;</div><div class='add'>+	dice-&gt;rx_pcm_chs[0][SND_DICE_RATE_MODE_MIDDLE] = 16;</div><div class='add'>+	dice-&gt;rx_midi_ports[0] = 1;</div><div class='add'>+</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+	if (data &gt; 1) {</div><div class='add'>+		dice-&gt;rx_pcm_chs[1][SND_DICE_RATE_MODE_LOW] = 16;</div><div class='add'>+		dice-&gt;rx_pcm_chs[1][SND_DICE_RATE_MODE_MIDDLE] = 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-transaction.c b/sound/firewire/dice/dice-transaction.c<br/>new file mode 100644<br/>index 000000000000..a3f7dfa990a4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-transaction.c</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * dice_transaction.c - a part of driver for Dice based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+static u64 get_subaddr(struct snd_dice *dice, enum snd_dice_addr_type type,</div><div class='add'>+		       u64 offset)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case SND_DICE_ADDR_TYPE_TX:</div><div class='add'>+		offset += dice-&gt;tx_offset;</div><div class='add'>+		break;</div><div class='add'>+	case SND_DICE_ADDR_TYPE_RX:</div><div class='add'>+		offset += dice-&gt;rx_offset;</div><div class='add'>+		break;</div><div class='add'>+	case SND_DICE_ADDR_TYPE_SYNC:</div><div class='add'>+		offset += dice-&gt;sync_offset;</div><div class='add'>+		break;</div><div class='add'>+	case SND_DICE_ADDR_TYPE_RSRV:</div><div class='add'>+		offset += dice-&gt;rsrv_offset;</div><div class='add'>+		break;</div><div class='add'>+	case SND_DICE_ADDR_TYPE_GLOBAL:</div><div class='add'>+	default:</div><div class='add'>+		offset += dice-&gt;global_offset;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	offset += DICE_PRIVATE_SPACE;</div><div class='add'>+	return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_write(struct snd_dice *dice,</div><div class='add'>+			       enum snd_dice_addr_type type,</div><div class='add'>+			       unsigned int offset, void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(dice-&gt;unit,</div><div class='add'>+				  (len == 4) ? TCODE_WRITE_QUADLET_REQUEST :</div><div class='add'>+					       TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				  get_subaddr(dice, type, offset), buf, len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_read(struct snd_dice *dice,</div><div class='add'>+			      enum snd_dice_addr_type type, unsigned int offset,</div><div class='add'>+			      void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(dice-&gt;unit,</div><div class='add'>+				  (len == 4) ? TCODE_READ_QUADLET_REQUEST :</div><div class='add'>+					       TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				  get_subaddr(dice, type, offset), buf, len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int get_clock_info(struct snd_dice *dice, __be32 *info)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_read_global(dice, GLOBAL_CLOCK_SELECT,</div><div class='add'>+						info, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_get_clock_source(struct snd_dice *dice,</div><div class='add'>+					  unsigned int *source)</div><div class='add'>+{</div><div class='add'>+	__be32 info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock_info(dice, &amp;info);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*source = be32_to_cpu(info) &amp; CLOCK_SOURCE_MASK;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_get_rate(struct snd_dice *dice, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	__be32 info;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock_info(dice, &amp;info);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	index = (be32_to_cpu(info) &amp; CLOCK_RATE_MASK) &gt;&gt; CLOCK_RATE_SHIFT;</div><div class='add'>+	if (index &gt;= SND_DICE_RATES_COUNT) {</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*rate = snd_dice_rates[index];</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_set_enable(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 value;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (dice-&gt;global_enabled)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	value = cpu_to_be32(1);</div><div class='add'>+	err = snd_fw_transaction(dice-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 get_subaddr(dice, SND_DICE_ADDR_TYPE_GLOBAL,</div><div class='add'>+					     GLOBAL_ENABLE),</div><div class='add'>+				 &amp;value, 4,</div><div class='add'>+				 FW_FIXED_GENERATION | dice-&gt;owner_generation);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	dice-&gt;global_enabled = true;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_transaction_clear_enable(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 value;</div><div class='add'>+</div><div class='add'>+	value = 0;</div><div class='add'>+	snd_fw_transaction(dice-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   get_subaddr(dice, SND_DICE_ADDR_TYPE_GLOBAL,</div><div class='add'>+				       GLOBAL_ENABLE),</div><div class='add'>+			   &amp;value, 4, FW_QUIET |</div><div class='add'>+			   FW_FIXED_GENERATION | dice-&gt;owner_generation);</div><div class='add'>+</div><div class='add'>+	dice-&gt;global_enabled = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_notification(struct fw_card *card, struct fw_request *request,</div><div class='add'>+			      int tcode, int destination, int source,</div><div class='add'>+			      int generation, unsigned long long offset,</div><div class='add'>+			      void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = callback_data;</div><div class='add'>+	u32 bits;</div><div class='add'>+</div><div class='add'>+	if (tcode != TCODE_WRITE_QUADLET_REQUEST) {</div><div class='add'>+		fw_send_response(card, request, RCODE_TYPE_ERROR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if ((offset &amp; 3) != 0) {</div><div class='add'>+		fw_send_response(card, request, RCODE_ADDRESS_ERROR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bits = be32_to_cpup(data);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;dice-&gt;lock) {</div><div class='add'>+		dice-&gt;notification_bits |= bits;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+</div><div class='add'>+	if (bits &amp; NOTIFY_CLOCK_ACCEPTED)</div><div class='add'>+		complete(&amp;dice-&gt;clock_accepted);</div><div class='add'>+	wake_up(&amp;dice-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int register_notification_address(struct snd_dice *dice, bool retry)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(dice-&gt;unit);</div><div class='add'>+	__be64 *buffer;</div><div class='add'>+	unsigned int retries;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	retries = (retry) ? 3 : 0;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(2 * 8, GFP_KERNEL);</div><div class='add'>+	if (!buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		buffer[0] = cpu_to_be64(OWNER_NO_OWNER);</div><div class='add'>+		buffer[1] = cpu_to_be64(</div><div class='add'>+			((u64)device-&gt;card-&gt;node_id &lt;&lt; OWNER_NODE_SHIFT) |</div><div class='add'>+			dice-&gt;notification_handler.offset);</div><div class='add'>+</div><div class='add'>+		dice-&gt;owner_generation = device-&gt;generation;</div><div class='add'>+		smp_rmb(); /* node_id vs. generation */</div><div class='add'>+		err = snd_fw_transaction(dice-&gt;unit, TCODE_LOCK_COMPARE_SWAP,</div><div class='add'>+					 get_subaddr(dice,</div><div class='add'>+						     SND_DICE_ADDR_TYPE_GLOBAL,</div><div class='add'>+						     GLOBAL_OWNER),</div><div class='add'>+					 buffer, 2 * 8,</div><div class='add'>+					 FW_FIXED_GENERATION |</div><div class='add'>+							dice-&gt;owner_generation);</div><div class='add'>+		if (err == 0) {</div><div class='add'>+			/* success */</div><div class='add'>+			if (buffer[0] == cpu_to_be64(OWNER_NO_OWNER))</div><div class='add'>+				break;</div><div class='add'>+			/* The address seems to be already registered. */</div><div class='add'>+			if (buffer[0] == buffer[1])</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			dev_err(&amp;dice-&gt;unit-&gt;device,</div><div class='add'>+				"device is already in use\n");</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		if (err != -EAGAIN || retries-- &gt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(buffer);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		dice-&gt;owner_generation = -1;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unregister_notification_address(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(dice-&gt;unit);</div><div class='add'>+	__be64 *buffer;</div><div class='add'>+</div><div class='add'>+	buffer = kmalloc(2 * 8, GFP_KERNEL);</div><div class='add'>+	if (buffer == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	buffer[0] = cpu_to_be64(</div><div class='add'>+		((u64)device-&gt;card-&gt;node_id &lt;&lt; OWNER_NODE_SHIFT) |</div><div class='add'>+		dice-&gt;notification_handler.offset);</div><div class='add'>+	buffer[1] = cpu_to_be64(OWNER_NO_OWNER);</div><div class='add'>+	snd_fw_transaction(dice-&gt;unit, TCODE_LOCK_COMPARE_SWAP,</div><div class='add'>+			   get_subaddr(dice, SND_DICE_ADDR_TYPE_GLOBAL,</div><div class='add'>+				       GLOBAL_OWNER),</div><div class='add'>+			   buffer, 2 * 8, FW_QUIET |</div><div class='add'>+			   FW_FIXED_GENERATION | dice-&gt;owner_generation);</div><div class='add'>+</div><div class='add'>+	kfree(buffer);</div><div class='add'>+</div><div class='add'>+	dice-&gt;owner_generation = -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dice_transaction_destroy(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct fw_address_handler *handler = &amp;dice-&gt;notification_handler;</div><div class='add'>+</div><div class='add'>+	if (handler-&gt;callback_data == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	unregister_notification_address(dice);</div><div class='add'>+</div><div class='add'>+	fw_core_remove_address_handler(handler);</div><div class='add'>+	handler-&gt;callback_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_reinit(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct fw_address_handler *handler = &amp;dice-&gt;notification_handler;</div><div class='add'>+</div><div class='add'>+	if (handler-&gt;callback_data == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return register_notification_address(dice, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_subaddrs(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const int min_values[10] = {</div><div class='add'>+		10, 0x60 / 4,</div><div class='add'>+		10, 0x18 / 4,</div><div class='add'>+		10, 0x18 / 4,</div><div class='add'>+		0, 0,</div><div class='add'>+		0, 0,</div><div class='add'>+	};</div><div class='add'>+	__be32 *pointers;</div><div class='add'>+	__be32 version;</div><div class='add'>+	u32 data;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pointers = kmalloc_array(ARRAY_SIZE(min_values), sizeof(__be32),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (pointers == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that the sub address spaces exist and are located inside the</div><div class='add'>+	 * private address space.  The minimum values are chosen so that all</div><div class='add'>+	 * minimally required registers are included.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_fw_transaction(dice-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				 DICE_PRIVATE_SPACE, pointers,</div><div class='add'>+				 sizeof(__be32) * ARRAY_SIZE(min_values), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(min_values); ++i) {</div><div class='add'>+		data = be32_to_cpu(pointers[i]);</div><div class='add'>+		if (data &lt; min_values[i] || data &gt;= 0x40000) {</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (be32_to_cpu(pointers[1]) &gt; 0x18) {</div><div class='add'>+		/*</div><div class='add'>+		 * Check that the implemented DICE driver specification major</div><div class='add'>+		 * version number matches.</div><div class='add'>+		 */</div><div class='add'>+		err = snd_fw_transaction(dice-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				DICE_PRIVATE_SPACE +</div><div class='add'>+				be32_to_cpu(pointers[0]) * 4 + GLOBAL_VERSION,</div><div class='add'>+				&amp;version, sizeof(version), 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto end;</div><div class='add'>+</div><div class='add'>+		if ((version &amp; cpu_to_be32(0xff000000)) !=</div><div class='add'>+						cpu_to_be32(0x01000000)) {</div><div class='add'>+			dev_err(&amp;dice-&gt;unit-&gt;device,</div><div class='add'>+				"unknown DICE version: 0x%08x\n",</div><div class='add'>+				be32_to_cpu(version));</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Set up later. */</div><div class='add'>+		dice-&gt;clock_caps = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dice-&gt;global_offset = be32_to_cpu(pointers[0]) * 4;</div><div class='add'>+	dice-&gt;tx_offset = be32_to_cpu(pointers[2]) * 4;</div><div class='add'>+	dice-&gt;rx_offset = be32_to_cpu(pointers[4]) * 4;</div><div class='add'>+</div><div class='add'>+	/* Old firmware doesn't support these fields. */</div><div class='add'>+	if (pointers[7])</div><div class='add'>+		dice-&gt;sync_offset = be32_to_cpu(pointers[6]) * 4;</div><div class='add'>+	if (pointers[9])</div><div class='add'>+		dice-&gt;rsrv_offset = be32_to_cpu(pointers[8]) * 4;</div><div class='add'>+end:</div><div class='add'>+	kfree(pointers);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_init(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct fw_address_handler *handler = &amp;dice-&gt;notification_handler;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_subaddrs(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Allocation callback in address space over host controller */</div><div class='add'>+	handler-&gt;length = 4;</div><div class='add'>+	handler-&gt;address_callback = dice_notification;</div><div class='add'>+	handler-&gt;callback_data = dice;</div><div class='add'>+	err = fw_core_add_address_handler(handler, &amp;fw_high_memory_region);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		handler-&gt;callback_data = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register the address space */</div><div class='add'>+	err = register_notification_address(dice, true);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		fw_core_remove_address_handler(handler);</div><div class='add'>+		handler-&gt;callback_data = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice-weiss.c b/sound/firewire/dice/dice-weiss.c<br/>new file mode 100644<br/>index 000000000000..129d43408956<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice-weiss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice-weiss.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// dice-weiss.c - a part of driver for DICE based devices</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023 Rolf Anderegg and Michele Perrone</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+struct dice_weiss_spec {</div><div class='add'>+	unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss DAC202: 192kHz 2-channel DAC</div><div class='add'>+static const struct dice_weiss_spec dac202 = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss MAN301: 192kHz 2-channel music archive network player</div><div class='add'>+static const struct dice_weiss_spec man301 = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss INT202: 192kHz unidirectional 2-channel digital Firewire nterface</div><div class='add'>+static const struct dice_weiss_spec int202 = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss INT203: 192kHz bidirectional 2-channel digital Firewire nterface</div><div class='add'>+static const struct dice_weiss_spec int203 = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss ADC2: 192kHz A/D converter with microphone preamps and line nputs</div><div class='add'>+static const struct dice_weiss_spec adc2 = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss DAC2/Minerva: 192kHz 2-channel DAC</div><div class='add'>+static const struct dice_weiss_spec dac2_minerva = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss Vesta: 192kHz 2-channel Firewire to AES/EBU interface</div><div class='add'>+static const struct dice_weiss_spec vesta = {</div><div class='add'>+	.tx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{2, 2, 2}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+// Weiss AFI1: 192kHz 24-channel Firewire to ADAT or AES/EBU interface</div><div class='add'>+static const struct dice_weiss_spec afi1 = {</div><div class='add'>+	.tx_pcm_chs = {{24, 16, 8}, {0, 0, 0} },</div><div class='add'>+	.rx_pcm_chs = {{24, 16, 8}, {0, 0, 0} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_weiss_formats(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		u32 model_id;</div><div class='add'>+		const struct dice_weiss_spec *spec;</div><div class='add'>+	} *entry, entries[] = {</div><div class='add'>+		{0x000007, &amp;dac202},</div><div class='add'>+		{0x000008, &amp;dac202}, // Maya edition: same audio I/O as DAC202.</div><div class='add'>+		{0x000006, &amp;int202},</div><div class='add'>+		{0x00000a, &amp;int203},</div><div class='add'>+		{0x00000b, &amp;man301},</div><div class='add'>+		{0x000001, &amp;adc2},</div><div class='add'>+		{0x000003, &amp;dac2_minerva},</div><div class='add'>+		{0x000002, &amp;vesta},</div><div class='add'>+		{0x000004, &amp;afi1},</div><div class='add'>+	};</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val, model_id;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	model_id = 0;</div><div class='add'>+	fw_csr_iterator_init(&amp;it, dice-&gt;unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		if (key == CSR_MODEL) {</div><div class='add'>+			model_id = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(entries); ++i) {</div><div class='add'>+		entry = entries + i;</div><div class='add'>+		if (entry-&gt;model_id == model_id)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(entries))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	memcpy(dice-&gt;tx_pcm_chs, entry-&gt;spec-&gt;tx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+	memcpy(dice-&gt;rx_pcm_chs, entry-&gt;spec-&gt;rx_pcm_chs,</div><div class='add'>+	       MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c<br/>new file mode 100644<br/>index 000000000000..85d265c7d544<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice.c</a></div><div class='hunk'>@@ -0,0 +1,501 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * TC Applied Technologies Digital Interface Communications Engine driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dice.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("DICE driver");</div><div class='add'>+MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define OUI_WEISS		0x001c6a</div><div class='add'>+#define OUI_LOUD		0x000ff2</div><div class='add'>+#define OUI_FOCUSRITE		0x00130e</div><div class='add'>+#define OUI_TCELECTRONIC	0x000166</div><div class='add'>+#define OUI_ALESIS		0x000595</div><div class='add'>+#define OUI_MAUDIO		0x000d6c</div><div class='add'>+#define OUI_MYTEK		0x001ee8</div><div class='add'>+#define OUI_SSL			0x0050c2	// Actually ID reserved by IEEE.</div><div class='add'>+#define OUI_PRESONUS		0x000a92</div><div class='add'>+#define OUI_HARMAN		0x000fd7</div><div class='add'>+#define OUI_AVID		0x00a07e</div><div class='add'>+#define OUI_TEAC		0x00022e</div><div class='add'>+</div><div class='add'>+#define DICE_CATEGORY_ID	0x04</div><div class='add'>+#define WEISS_CATEGORY_ID	0x00</div><div class='add'>+#define LOUD_CATEGORY_ID	0x10</div><div class='add'>+#define HARMAN_CATEGORY_ID	0x20</div><div class='add'>+</div><div class='add'>+#define MODEL_ALESIS_IO_BOTH	0x000001</div><div class='add'>+</div><div class='add'>+static int check_dice_category(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(unit);</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val, vendor = -1, model = -1;</div><div class='add'>+	unsigned int category;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check that GUID and unit directory are constructed according to DICE</div><div class='add'>+	 * rules, i.e., that the specifier ID is the GUID's OUI, and that the</div><div class='add'>+	 * GUID chip ID consists of the 8-bit category ID, the 10-bit product</div><div class='add'>+	 * ID, and a 22-bit serial number.</div><div class='add'>+	 */</div><div class='add'>+	fw_csr_iterator_init(&amp;it, unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		switch (key) {</div><div class='add'>+		case CSR_SPECIFIER_ID:</div><div class='add'>+			vendor = val;</div><div class='add'>+			break;</div><div class='add'>+		case CSR_MODEL:</div><div class='add'>+			model = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vendor == OUI_WEISS)</div><div class='add'>+		category = WEISS_CATEGORY_ID;</div><div class='add'>+	else if (vendor == OUI_LOUD)</div><div class='add'>+		category = LOUD_CATEGORY_ID;</div><div class='add'>+	else if (vendor == OUI_HARMAN)</div><div class='add'>+		category = HARMAN_CATEGORY_ID;</div><div class='add'>+	else</div><div class='add'>+		category = DICE_CATEGORY_ID;</div><div class='add'>+	if (device-&gt;config_rom[3] != ((vendor &lt;&lt; 8) | category) ||</div><div class='add'>+	    device-&gt;config_rom[4] &gt;&gt; 22 != model)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_clock_caps(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	__be32 value;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* some very old firmwares don't tell about their clock support */</div><div class='add'>+	if (dice-&gt;clock_caps &gt; 0) {</div><div class='add'>+		err = snd_dice_transaction_read_global(dice,</div><div class='add'>+						GLOBAL_CLOCK_CAPABILITIES,</div><div class='add'>+						&amp;value, 4);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		dice-&gt;clock_caps = be32_to_cpu(value);</div><div class='add'>+	} else {</div><div class='add'>+		/* this should be supported by any device */</div><div class='add'>+		dice-&gt;clock_caps = CLOCK_CAP_RATE_44100 |</div><div class='add'>+				   CLOCK_CAP_RATE_48000 |</div><div class='add'>+				   CLOCK_CAP_SOURCE_ARX1 |</div><div class='add'>+				   CLOCK_CAP_SOURCE_INTERNAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_card_strings(struct snd_dice *dice)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dice-&gt;card;</div><div class='add'>+	struct fw_device *dev = fw_parent_device(dice-&gt;unit);</div><div class='add'>+	char vendor[32], model[32];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "DICE");</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;shortname, "DICE");</div><div class='add'>+	BUILD_BUG_ON(NICK_NAME_SIZE &lt; sizeof(card-&gt;shortname));</div><div class='add'>+	err = snd_dice_transaction_read_global(dice, GLOBAL_NICK_NAME,</div><div class='add'>+					       card-&gt;shortname,</div><div class='add'>+					       sizeof(card-&gt;shortname));</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		/* DICE strings are returned in "always-wrong" endianness */</div><div class='add'>+		BUILD_BUG_ON(sizeof(card-&gt;shortname) % 4 != 0);</div><div class='add'>+		for (i = 0; i &lt; sizeof(card-&gt;shortname); i += 4)</div><div class='add'>+			swab32s((u32 *)&amp;card-&gt;shortname[i]);</div><div class='add'>+		card-&gt;shortname[sizeof(card-&gt;shortname) - 1] = '\0';</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(vendor, "?");</div><div class='add'>+	fw_csr_string(dev-&gt;config_rom + 5, CSR_VENDOR, vendor, sizeof(vendor));</div><div class='add'>+	strscpy(model, "?");</div><div class='add'>+	fw_csr_string(dice-&gt;unit-&gt;directory, CSR_MODEL, model, sizeof(model));</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "%s %s (serial %u) at %s, S%d",</div><div class='add'>+		 vendor, model, dev-&gt;config_rom[4] &amp; 0x3fffff,</div><div class='add'>+		 dev_name(&amp;dice-&gt;unit-&gt;device), 100 &lt;&lt; dev-&gt;max_speed);</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;mixername, "DICE");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_dice_stream_destroy_duplex(dice);</div><div class='add'>+	snd_dice_transaction_destroy(dice);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;dice-&gt;mutex);</div><div class='add'>+	fw_unit_put(dice-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dice_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_dice *dice;</div><div class='add'>+	snd_dice_detect_formats_t detect_formats;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;driver_data &amp;&amp; entry-&gt;vendor_id != OUI_SSL) {</div><div class='add'>+		err = check_dice_category(unit);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*dice), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = dice_card_free;</div><div class='add'>+</div><div class='add'>+	dice = card-&gt;private_data;</div><div class='add'>+	dice-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, dice);</div><div class='add'>+	dice-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;driver_data)</div><div class='add'>+		detect_formats = snd_dice_stream_detect_current_formats;</div><div class='add'>+	else</div><div class='add'>+		detect_formats = (snd_dice_detect_formats_t)entry-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	// Below models are compliant to IEC 61883-1/6 and have no quirk at high sampling transfer</div><div class='add'>+	// frequency.</div><div class='add'>+	// * Avid M-Box 3 Pro</div><div class='add'>+	// * M-Audio Profire 610</div><div class='add'>+	// * M-Audio Profire 2626</div><div class='add'>+	if (entry-&gt;vendor_id == OUI_MAUDIO || entry-&gt;vendor_id == OUI_AVID)</div><div class='add'>+		dice-&gt;disable_double_pcm_frames = true;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;dice-&gt;lock);</div><div class='add'>+	mutex_init(&amp;dice-&gt;mutex);</div><div class='add'>+	init_completion(&amp;dice-&gt;clock_accepted);</div><div class='add'>+	init_waitqueue_head(&amp;dice-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	err = snd_dice_transaction_init(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = check_clock_caps(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	dice_card_strings(dice);</div><div class='add'>+</div><div class='add'>+	err = detect_formats(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_stream_init_duplex(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_dice_create_proc(dice);</div><div class='add'>+</div><div class='add'>+	err = snd_dice_create_pcm(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_create_midi(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dice_create_hwdep(dice);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(dice-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dice_bus_reset(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_dice *dice = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	/* The handler address register becomes initialized. */</div><div class='add'>+	snd_dice_transaction_reinit(dice);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dice-&gt;mutex);</div><div class='add'>+	snd_dice_stream_update_duplex(dice);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DICE_INTERFACE	0x000001</div><div class='add'>+</div><div class='add'>+#define DICE_DEV_ENTRY_TYPICAL(vendor, model, data) \</div><div class='add'>+	{ \</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | \</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID | \</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID | \</div><div class='add'>+				  IEEE1394_MATCH_VERSION, \</div><div class='add'>+		.vendor_id	= (vendor), \</div><div class='add'>+		.model_id	= (model), \</div><div class='add'>+		.specifier_id	= (vendor), \</div><div class='add'>+		.version	= DICE_INTERFACE, \</div><div class='add'>+		.driver_data = (kernel_ulong_t)(data), \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id dice_id_table[] = {</div><div class='add'>+	// Avid M-Box 3 Pro. To match in probe function.</div><div class='add'>+	DICE_DEV_ENTRY_TYPICAL(OUI_AVID, 0x000004, snd_dice_detect_extension_formats),</div><div class='add'>+	/* M-Audio Profire 2626 has a different value in version field. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_MAUDIO,</div><div class='add'>+		.model_id	= 0x000010,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_extension_formats,</div><div class='add'>+	},</div><div class='add'>+	/* M-Audio Profire 610 has a different value in version field. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_MAUDIO,</div><div class='add'>+		.model_id	= 0x000011,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_extension_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Konnekt 24D. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000020,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Konnekt 8. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000021,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Studio Konnekt 48. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000022,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Konnekt Live. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000023,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Desktop Konnekt 6. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000024,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Impact Twin. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000027,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* TC Electronic Digital Konnekt x32. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_TCELECTRONIC,</div><div class='add'>+		.model_id	= 0x000030,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_tcelectronic_formats,</div><div class='add'>+	},</div><div class='add'>+	/* Alesis iO14/iO26. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_ALESIS,</div><div class='add'>+		.model_id	= MODEL_ALESIS_IO_BOTH,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_alesis_formats,</div><div class='add'>+	},</div><div class='add'>+	// Alesis MasterControl.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_ALESIS,</div><div class='add'>+		.model_id	= 0x000002,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_alesis_mastercontrol_formats,</div><div class='add'>+	},</div><div class='add'>+	/* Mytek Stereo 192 DSD-DAC. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_MYTEK,</div><div class='add'>+		.model_id	= 0x000002,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_mytek_formats,</div><div class='add'>+	},</div><div class='add'>+	// Solid State Logic, Duende Classic and Mini.</div><div class='add'>+	// NOTE: each field of GUID in config ROM is not compliant to standard</div><div class='add'>+	// DICE scheme.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_SSL,</div><div class='add'>+		.model_id	= 0x000070,</div><div class='add'>+	},</div><div class='add'>+	// Presonus FireStudio.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_PRESONUS,</div><div class='add'>+		.model_id	= 0x000008,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_presonus_formats,</div><div class='add'>+	},</div><div class='add'>+	// Lexicon I-ONYX FW810S.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_HARMAN,</div><div class='add'>+		.model_id	= 0x000001,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_harman_formats,</div><div class='add'>+	},</div><div class='add'>+	// Focusrite Saffire Pro 40 with TCD3070-CH.</div><div class='add'>+	// The model has quirk in its GUID, in which model field is 0x000013 and different from</div><div class='add'>+	// model ID (0x0000de) in its root/unit directory.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_FOCUSRITE,</div><div class='add'>+		.model_id	= 0x0000de,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_focusrite_pro40_tcd3070_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss DAC202: 192kHz 2-channel DAC</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000007,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss DAC202: 192kHz 2-channel DAC (Maya edition)</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000008,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss MAN301: 192kHz 2-channel music archive network player</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x00000b,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss INT202: 192kHz unidirectional 2-channel digital Firewire face</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000006,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss INT203: 192kHz bidirectional 2-channel digital Firewire face</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x00000a,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss ADC2: 192kHz A/D converter with microphone preamps and inputs</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000001,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss DAC2/Minerva: 192kHz 2-channel DAC</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000003,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss Vesta: 192kHz 2-channel Firewire to AES/EBU interface</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000002,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	// Weiss AFI1: 192kHz 24-channel Firewire to ADAT or AES/EBU face</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_WEISS,</div><div class='add'>+		.model_id	= 0x000004,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)snd_dice_detect_weiss_formats,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VERSION,</div><div class='add'>+		.version     = DICE_INTERFACE,</div><div class='add'>+	},</div><div class='add'>+	// Tascam IF-FW/DM MkII for DM-3200 and DM-4800.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION,</div><div class='add'>+		.vendor_id	= OUI_TEAC,</div><div class='add'>+		.model_id	= OUI_TEAC,</div><div class='add'>+		.specifier_id	= OUI_TEAC,</div><div class='add'>+		.version	= 0x800006,</div><div class='add'>+		.driver_data = (kernel_ulong_t)snd_dice_detect_teac_formats,</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, dice_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver dice_driver = {</div><div class='add'>+	.driver   = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = dice_probe,</div><div class='add'>+	.update   = dice_bus_reset,</div><div class='add'>+	.remove   = dice_remove,</div><div class='add'>+	.id_table = dice_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init alsa_dice_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;dice_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit alsa_dice_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;dice_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(alsa_dice_init);</div><div class='add'>+module_exit(alsa_dice_exit);</div><div class='head'>diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h<br/>new file mode 100644<br/>index 000000000000..7744ea6a0791<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/dice/dice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/dice/dice.h</a></div><div class='hunk'>@@ -0,0 +1,238 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * dice.h - a part of driver for Dice based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_DICE_H_INCLUDED</div><div class='add'>+#define SOUND_DICE_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../amdtp-am824.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "dice-interface.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This module support maximum 2 pairs of tx/rx isochronous streams for</div><div class='add'>+ * our convinience.</div><div class='add'>+ *</div><div class='add'>+ * In documents for ASICs called with a name of 'DICE':</div><div class='add'>+ *  - ASIC for DICE II:</div><div class='add'>+ *   - Maximum 2 tx and 4 rx are supported.</div><div class='add'>+ *   - A packet supports maximum 16 data channels.</div><div class='add'>+ *  - TCD2210/2210-E (so-called 'Dice Mini'):</div><div class='add'>+ *   - Maximum 2 tx and 2 rx are supported.</div><div class='add'>+ *   - A packet supports maximum 16 data channels.</div><div class='add'>+ *  - TCD2220/2220-E (so-called 'Dice Jr.')</div><div class='add'>+ *   - 2 tx and 2 rx are supported.</div><div class='add'>+ *   - A packet supports maximum 16 data channels.</div><div class='add'>+ *  - TCD3070-CH (so-called 'Dice III')</div><div class='add'>+ *   - Maximum 2 tx and 2 rx are supported.</div><div class='add'>+ *   - A packet supports maximum 32 data channels.</div><div class='add'>+ *</div><div class='add'>+ * For the above, MIDI conformant data channel is just on the first isochronous</div><div class='add'>+ * stream.</div><div class='add'>+ */</div><div class='add'>+#define MAX_STREAMS	2</div><div class='add'>+</div><div class='add'>+enum snd_dice_rate_mode {</div><div class='add'>+	SND_DICE_RATE_MODE_LOW = 0,</div><div class='add'>+	SND_DICE_RATE_MODE_MIDDLE,</div><div class='add'>+	SND_DICE_RATE_MODE_HIGH,</div><div class='add'>+	SND_DICE_RATE_MODE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_dice;</div><div class='add'>+typedef int (*snd_dice_detect_formats_t)(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+struct snd_dice {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+</div><div class='add'>+	/* Offsets for sub-addresses */</div><div class='add'>+	unsigned int global_offset;</div><div class='add'>+	unsigned int rx_offset;</div><div class='add'>+	unsigned int tx_offset;</div><div class='add'>+	unsigned int sync_offset;</div><div class='add'>+	unsigned int rsrv_offset;</div><div class='add'>+</div><div class='add'>+	unsigned int clock_caps;</div><div class='add'>+	unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT];</div><div class='add'>+	unsigned int tx_midi_ports[MAX_STREAMS];</div><div class='add'>+	unsigned int rx_midi_ports[MAX_STREAMS];</div><div class='add'>+</div><div class='add'>+	struct fw_address_handler notification_handler;</div><div class='add'>+	int owner_generation;</div><div class='add'>+	u32 notification_bits;</div><div class='add'>+</div><div class='add'>+	/* For uapi */</div><div class='add'>+	int dev_lock_count; /* &gt; 0 driver, &lt; 0 userspace */</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	/* For streaming */</div><div class='add'>+	struct fw_iso_resources tx_resources[MAX_STREAMS];</div><div class='add'>+	struct fw_iso_resources rx_resources[MAX_STREAMS];</div><div class='add'>+	struct amdtp_stream tx_stream[MAX_STREAMS];</div><div class='add'>+	struct amdtp_stream rx_stream[MAX_STREAMS];</div><div class='add'>+	bool global_enabled:1;</div><div class='add'>+	bool disable_double_pcm_frames:1;</div><div class='add'>+	struct completion clock_accepted;</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_dice_addr_type {</div><div class='add'>+	SND_DICE_ADDR_TYPE_PRIVATE,</div><div class='add'>+	SND_DICE_ADDR_TYPE_GLOBAL,</div><div class='add'>+	SND_DICE_ADDR_TYPE_TX,</div><div class='add'>+	SND_DICE_ADDR_TYPE_RX,</div><div class='add'>+	SND_DICE_ADDR_TYPE_SYNC,</div><div class='add'>+	SND_DICE_ADDR_TYPE_RSRV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_write(struct snd_dice *dice,</div><div class='add'>+			       enum snd_dice_addr_type type,</div><div class='add'>+			       unsigned int offset,</div><div class='add'>+			       void *buf, unsigned int len);</div><div class='add'>+int snd_dice_transaction_read(struct snd_dice *dice,</div><div class='add'>+			      enum snd_dice_addr_type type, unsigned int offset,</div><div class='add'>+			      void *buf, unsigned int len);</div><div class='add'>+</div><div class='add'>+static inline int snd_dice_transaction_write_global(struct snd_dice *dice,</div><div class='add'>+						    unsigned int offset,</div><div class='add'>+						    void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_write(dice,</div><div class='add'>+					  SND_DICE_ADDR_TYPE_GLOBAL, offset,</div><div class='add'>+					  buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_read_global(struct snd_dice *dice,</div><div class='add'>+						   unsigned int offset,</div><div class='add'>+						   void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_read(dice,</div><div class='add'>+					 SND_DICE_ADDR_TYPE_GLOBAL, offset,</div><div class='add'>+					 buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_write_tx(struct snd_dice *dice,</div><div class='add'>+						unsigned int offset,</div><div class='add'>+						void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_write(dice, SND_DICE_ADDR_TYPE_TX, offset,</div><div class='add'>+					  buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_read_tx(struct snd_dice *dice,</div><div class='add'>+					       unsigned int offset,</div><div class='add'>+					       void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_read(dice, SND_DICE_ADDR_TYPE_TX, offset,</div><div class='add'>+					 buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_write_rx(struct snd_dice *dice,</div><div class='add'>+						unsigned int offset,</div><div class='add'>+						void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_write(dice, SND_DICE_ADDR_TYPE_RX, offset,</div><div class='add'>+					  buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_read_rx(struct snd_dice *dice,</div><div class='add'>+					       unsigned int offset,</div><div class='add'>+					       void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_read(dice, SND_DICE_ADDR_TYPE_RX, offset,</div><div class='add'>+					 buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_write_sync(struct snd_dice *dice,</div><div class='add'>+						  unsigned int offset,</div><div class='add'>+						  void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_write(dice, SND_DICE_ADDR_TYPE_SYNC, offset,</div><div class='add'>+					  buf, len);</div><div class='add'>+}</div><div class='add'>+static inline int snd_dice_transaction_read_sync(struct snd_dice *dice,</div><div class='add'>+						 unsigned int offset,</div><div class='add'>+						 void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return snd_dice_transaction_read(dice, SND_DICE_ADDR_TYPE_SYNC, offset,</div><div class='add'>+					 buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dice_transaction_get_clock_source(struct snd_dice *dice,</div><div class='add'>+					  unsigned int *source);</div><div class='add'>+int snd_dice_transaction_get_rate(struct snd_dice *dice, unsigned int *rate);</div><div class='add'>+int snd_dice_transaction_set_enable(struct snd_dice *dice);</div><div class='add'>+void snd_dice_transaction_clear_enable(struct snd_dice *dice);</div><div class='add'>+int snd_dice_transaction_init(struct snd_dice *dice);</div><div class='add'>+int snd_dice_transaction_reinit(struct snd_dice *dice);</div><div class='add'>+void snd_dice_transaction_destroy(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+#define SND_DICE_RATES_COUNT	7</div><div class='add'>+extern const unsigned int snd_dice_rates[SND_DICE_RATES_COUNT];</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_get_rate_mode(struct snd_dice *dice, unsigned int rate,</div><div class='add'>+				  enum snd_dice_rate_mode *mode);</div><div class='add'>+int snd_dice_stream_start_duplex(struct snd_dice *dice);</div><div class='add'>+void snd_dice_stream_stop_duplex(struct snd_dice *dice);</div><div class='add'>+int snd_dice_stream_init_duplex(struct snd_dice *dice);</div><div class='add'>+void snd_dice_stream_destroy_duplex(struct snd_dice *dice);</div><div class='add'>+int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,</div><div class='add'>+				   unsigned int events_per_period,</div><div class='add'>+				   unsigned int events_per_buffer);</div><div class='add'>+void snd_dice_stream_update_duplex(struct snd_dice *dice);</div><div class='add'>+int snd_dice_stream_detect_current_formats(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+int snd_dice_stream_lock_try(struct snd_dice *dice);</div><div class='add'>+void snd_dice_stream_lock_release(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+int snd_dice_create_pcm(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+int snd_dice_create_hwdep(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+void snd_dice_create_proc(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+int snd_dice_create_midi(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_alesis_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_alesis_mastercontrol_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_extension_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_mytek_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_presonus_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_harman_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_weiss_formats(struct snd_dice *dice);</div><div class='add'>+int snd_dice_detect_teac_formats(struct snd_dice *dice);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/digi00x/Makefile b/sound/firewire/digi00x/Makefile<br/>new file mode 100644<br/>index 000000000000..6dc18bd2e186<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-firewire-digi00x-y := amdtp-dot.o digi00x-stream.o digi00x-proc.o \</div><div class='add'>+			     digi00x-pcm.o digi00x-hwdep.o \</div><div class='add'>+			     digi00x-transaction.o digi00x-midi.o digi00x.o</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_DIGI00X) += snd-firewire-digi00x.o</div><div class='head'>diff --git a/sound/firewire/digi00x/amdtp-dot.c b/sound/firewire/digi00x/amdtp-dot.c<br/>new file mode 100644<br/>index 000000000000..7db0024495b7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/amdtp-dot.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/amdtp-dot.c</a></div><div class='hunk'>@@ -0,0 +1,412 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * amdtp-dot.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ * Copyright (C) 2012 Robin Gareus &lt;robin@gareus.org&gt;</div><div class='add'>+ * Copyright (C) 2012 Damien Zammit &lt;damien@zamaudio.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+#define CIP_FMT_AM		0x10</div><div class='add'>+</div><div class='add'>+/* 'Clock-based rate control mode' is just supported. */</div><div class='add'>+#define AMDTP_FDF_AM824		0x00</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Nominally 3125 bytes/second, but the MIDI port's clock might be</div><div class='add'>+ * 1% too slow, and the bus clock 100 ppm too fast.</div><div class='add'>+ */</div><div class='add'>+#define MIDI_BYTES_PER_SECOND	3093</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Several devices look only at the first eight data blocks.</div><div class='add'>+ * In any case, this is more than enough for the MIDI data rate.</div><div class='add'>+ */</div><div class='add'>+#define MAX_MIDI_RX_BLOCKS	8</div><div class='add'>+</div><div class='add'>+/* 3 = MAX(DOT_MIDI_IN_PORTS, DOT_MIDI_OUT_PORTS) + 1. */</div><div class='add'>+#define MAX_MIDI_PORTS		3</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The double-oh-three algorithm was discovered by Robin Gareus and Damien</div><div class='add'>+ * Zammit in 2012, with reverse-engineering for Digi 003 Rack.</div><div class='add'>+ */</div><div class='add'>+struct dot_state {</div><div class='add'>+	u8 carry;</div><div class='add'>+	u8 idx;</div><div class='add'>+	unsigned int off;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct amdtp_dot {</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+	struct dot_state state;</div><div class='add'>+</div><div class='add'>+	struct snd_rawmidi_substream *midi[MAX_MIDI_PORTS];</div><div class='add'>+	int midi_fifo_used[MAX_MIDI_PORTS];</div><div class='add'>+	int midi_fifo_limit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * double-oh-three look up table</div><div class='add'>+ *</div><div class='add'>+ * @param idx index byte (audio-sample data) 0x00..0xff</div><div class='add'>+ * @param off channel offset shift</div><div class='add'>+ * @return salt to XOR with given data</div><div class='add'>+ */</div><div class='add'>+#define BYTE_PER_SAMPLE (4)</div><div class='add'>+#define MAGIC_DOT_BYTE (2)</div><div class='add'>+#define MAGIC_BYTE_OFF(x) (((x) * BYTE_PER_SAMPLE) + MAGIC_DOT_BYTE)</div><div class='add'>+static u8 dot_scrt(const u8 idx, const unsigned int off)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * the length of the added pattern only depends on the lower nibble</div><div class='add'>+	 * of the last non-zero data</div><div class='add'>+	 */</div><div class='add'>+	static const u8 len[16] = {0, 1, 3, 5, 7, 9, 11, 13, 14,</div><div class='add'>+				   12, 10, 8, 6, 4, 2, 0};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * the lower nibble of the salt. Interleaved sequence.</div><div class='add'>+	 * this is walked backwards according to len[]</div><div class='add'>+	 */</div><div class='add'>+	static const u8 nib[15] = {0x8, 0x7, 0x9, 0x6, 0xa, 0x5, 0xb, 0x4,</div><div class='add'>+				   0xc, 0x3, 0xd, 0x2, 0xe, 0x1, 0xf};</div><div class='add'>+</div><div class='add'>+	/* circular list for the salt's hi nibble. */</div><div class='add'>+	static const u8 hir[15] = {0x0, 0x6, 0xf, 0x8, 0x7, 0x5, 0x3, 0x4,</div><div class='add'>+				   0xc, 0xd, 0xe, 0x1, 0x2, 0xb, 0xa};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * start offset for upper nibble mapping.</div><div class='add'>+	 * note: 9 is /special/. In the case where the high nibble == 0x9,</div><div class='add'>+	 * hir[] is not used and - coincidentally - the salt's hi nibble is</div><div class='add'>+	 * 0x09 regardless of the offset.</div><div class='add'>+	 */</div><div class='add'>+	static const u8 hio[16] = {0, 11, 12, 6, 7, 5, 1, 4,</div><div class='add'>+				   3, 0x00, 14, 13, 8, 9, 10, 2};</div><div class='add'>+</div><div class='add'>+	const u8 ln = idx &amp; 0xf;</div><div class='add'>+	const u8 hn = (idx &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+	const u8 hr = (hn == 0x9) ? 0x9 : hir[(hio[hn] + off) % 15];</div><div class='add'>+</div><div class='add'>+	if (len[ln] &lt; off)</div><div class='add'>+		return 0x00;</div><div class='add'>+</div><div class='add'>+	return ((nib[14 + off - len[ln]]) | (hr &lt;&lt; 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dot_encode_step(struct dot_state *state, __be32 *const buffer)</div><div class='add'>+{</div><div class='add'>+	u8 * const data = (u8 *) buffer;</div><div class='add'>+</div><div class='add'>+	if (data[MAGIC_DOT_BYTE] != 0x00) {</div><div class='add'>+		state-&gt;off = 0;</div><div class='add'>+		state-&gt;idx = data[MAGIC_DOT_BYTE] ^ state-&gt;carry;</div><div class='add'>+	}</div><div class='add'>+	data[MAGIC_DOT_BYTE] ^= state-&gt;carry;</div><div class='add'>+	state-&gt;carry = dot_scrt(state-&gt;idx, ++(state-&gt;off));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_dot_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			     unsigned int pcm_channels)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(s))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * A first data channel is for MIDI messages, the rest is Multi Bit</div><div class='add'>+	 * Linear Audio data channel.</div><div class='add'>+	 */</div><div class='add'>+	err = amdtp_stream_set_parameters(s, rate, pcm_channels + 1, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	s-&gt;ctx_data.rx.fdf = AMDTP_FDF_AM824 | s-&gt;sfc;</div><div class='add'>+</div><div class='add'>+	p-&gt;pcm_channels = pcm_channels;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We do not know the actual MIDI FIFO size of most devices.  Just</div><div class='add'>+	 * assume two bytes, i.e., one byte can be received over the bus while</div><div class='add'>+	 * the previous one is transmitted over MIDI.</div><div class='add'>+	 * (The value here is adjusted for midi_ratelimit_per_packet().)</div><div class='add'>+	 */</div><div class='add'>+	p-&gt;midi_fifo_limit = rate - MIDI_BYTES_PER_SECOND * s-&gt;syt_interval + 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			  __be32 *buffer, unsigned int frames,</div><div class='add'>+			  unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	const u32 *src;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	src = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	buffer++;</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			buffer[c] = cpu_to_be32((*src &gt;&gt; 8) | 0x40000000);</div><div class='add'>+			dot_encode_step(&amp;p-&gt;state, &amp;buffer[c]);</div><div class='add'>+			src++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			src = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			 __be32 *buffer, unsigned int frames,</div><div class='add'>+			 unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u32 *dst;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	dst  = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	buffer++;</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			*dst = be32_to_cpu(buffer[c]) &lt;&lt; 8;</div><div class='add'>+			dst++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			dst = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_silence(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			      unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels, i, c;</div><div class='add'>+</div><div class='add'>+	channels = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	buffer++;</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c)</div><div class='add'>+			buffer[c] = cpu_to_be32(0x40000000);</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool midi_ratelimit_per_packet(struct amdtp_stream *s, unsigned int port)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	int used;</div><div class='add'>+</div><div class='add'>+	used = p-&gt;midi_fifo_used[port];</div><div class='add'>+	if (used == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	used -= MIDI_BYTES_PER_SECOND * s-&gt;syt_interval;</div><div class='add'>+	used = max(used, 0);</div><div class='add'>+	p-&gt;midi_fifo_used[port] = used;</div><div class='add'>+</div><div class='add'>+	return used &lt; p-&gt;midi_fifo_limit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void midi_use_bytes(struct amdtp_stream *s,</div><div class='add'>+				  unsigned int port, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	p-&gt;midi_fifo_used[port] += amdtp_rate_table[s-&gt;sfc] * count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+		unsigned int data_blocks, unsigned int data_block_counter)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	unsigned int f, port;</div><div class='add'>+	int len;</div><div class='add'>+	u8 *b;</div><div class='add'>+</div><div class='add'>+	for (f = 0; f &lt; data_blocks; f++) {</div><div class='add'>+		port = (data_block_counter + f) % 8;</div><div class='add'>+		b = (u8 *)&amp;buffer[0];</div><div class='add'>+</div><div class='add'>+		len = 0;</div><div class='add'>+		if (port &lt; MAX_MIDI_PORTS &amp;&amp;</div><div class='add'>+		    midi_ratelimit_per_packet(s, port) &amp;&amp;</div><div class='add'>+		    p-&gt;midi[port] != NULL)</div><div class='add'>+			len = snd_rawmidi_transmit(p-&gt;midi[port], b + 1, 2);</div><div class='add'>+</div><div class='add'>+		if (len &gt; 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Upper 4 bits of LSB represent port number.</div><div class='add'>+			 * - 0000b: physical MIDI port 1.</div><div class='add'>+			 * - 0010b: physical MIDI port 2.</div><div class='add'>+			 * - 1110b: console MIDI port.</div><div class='add'>+			 */</div><div class='add'>+			if (port == 2)</div><div class='add'>+				b[3] = 0xe0;</div><div class='add'>+			else if (port == 1)</div><div class='add'>+				b[3] = 0x20;</div><div class='add'>+			else</div><div class='add'>+				b[3] = 0x00;</div><div class='add'>+			b[3] |= len;</div><div class='add'>+			midi_use_bytes(s, port, len);</div><div class='add'>+		} else {</div><div class='add'>+			b[1] = 0;</div><div class='add'>+			b[2] = 0;</div><div class='add'>+			b[3] = 0;</div><div class='add'>+		}</div><div class='add'>+		b[0] = 0x80;</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			       unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+	unsigned int f, port, len;</div><div class='add'>+	u8 *b;</div><div class='add'>+</div><div class='add'>+	for (f = 0; f &lt; data_blocks; f++) {</div><div class='add'>+		b = (u8 *)&amp;buffer[0];</div><div class='add'>+</div><div class='add'>+		len = b[3] &amp; 0x0f;</div><div class='add'>+		if (len &gt; 0) {</div><div class='add'>+			/*</div><div class='add'>+			 * Upper 4 bits of LSB represent port number.</div><div class='add'>+			 * - 0000b: physical MIDI port 1. Use port 0.</div><div class='add'>+			 * - 1110b: console MIDI port. Use port 2.</div><div class='add'>+			 */</div><div class='add'>+			if (b[3] &gt;&gt; 4 &gt; 0)</div><div class='add'>+				port = 2;</div><div class='add'>+			else</div><div class='add'>+				port = 0;</div><div class='add'>+</div><div class='add'>+			if (port &lt; MAX_MIDI_PORTS &amp;&amp; p-&gt;midi[port])</div><div class='add'>+				snd_rawmidi_receive(p-&gt;midi[port], b + 1, len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_dot_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				     struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* This protocol delivers 24 bit data in 32bit data channel. */</div><div class='add'>+	err = snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void amdtp_dot_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			  struct snd_rawmidi_substream *midi)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (port &lt; MAX_MIDI_PORTS)</div><div class='add'>+		WRITE_ONCE(p-&gt;midi[port], midi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		read_midi_messages(s, buf, data_blocks);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		} else {</div><div class='add'>+			write_pcm_silence(s, buf, data_blocks);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		write_midi_messages(s, buf, data_blocks,</div><div class='add'>+				    desc-&gt;data_block_counter);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_dot_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		 enum amdtp_stream_direction dir)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+	unsigned int flags = CIP_NONBLOCKING | CIP_UNAWARE_SYT;</div><div class='add'>+</div><div class='add'>+	// Use different mode between incoming/outgoing.</div><div class='add'>+	if (dir == AMDTP_IN_STREAM)</div><div class='add'>+		process_ctx_payloads = process_ir_ctx_payloads;</div><div class='add'>+	else</div><div class='add'>+		process_ctx_payloads = process_it_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_init(s, unit, dir, flags, CIP_FMT_AM,</div><div class='add'>+				process_ctx_payloads, sizeof(struct amdtp_dot));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void amdtp_dot_reset(struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_dot *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	p-&gt;state.carry = 0x00;</div><div class='add'>+	p-&gt;state.idx = 0x00;</div><div class='add'>+	p-&gt;state.off = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-hwdep.c b/sound/firewire/digi00x/digi00x-hwdep.c<br/>new file mode 100644<br/>index 000000000000..435d18417cf0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,181 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-hwdep.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes give three functionality.</div><div class='add'>+ *</div><div class='add'>+ * 1.get firewire node information</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock stream</div><div class='add'>+ * 4.get asynchronous messaging</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,  long count,</div><div class='add'>+		       loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	union snd_firewire_event event;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!dg00x-&gt;dev_lock_changed &amp;&amp; dg00x-&gt;msg == 0) {</div><div class='add'>+		prepare_to_wait(&amp;dg00x-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;dg00x-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;dg00x-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;dg00x-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;event, 0, sizeof(event));</div><div class='add'>+	if (dg00x-&gt;dev_lock_changed) {</div><div class='add'>+		event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;</div><div class='add'>+		event.lock_status.status = (dg00x-&gt;dev_lock_count &gt; 0);</div><div class='add'>+		dg00x-&gt;dev_lock_changed = false;</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event.lock_status));</div><div class='add'>+	} else {</div><div class='add'>+		event.digi00x_message.type =</div><div class='add'>+					SNDRV_FIREWIRE_EVENT_DIGI00X_MESSAGE;</div><div class='add'>+		event.digi00x_message.message = dg00x-&gt;msg;</div><div class='add'>+		dg00x-&gt;msg = 0;</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event.digi00x_message));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;dg00x-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+	if (dg00x-&gt;dev_lock_changed || dg00x-&gt;msg)</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_dg00x *dg00x, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(dg00x-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_DIGI00X;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dg00x-&gt;dev_lock_count == 0) {</div><div class='add'>+		dg00x-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dg00x-&gt;dev_lock_count == -1) {</div><div class='add'>+		dg00x-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+	if (dg00x-&gt;dev_lock_count == -1)</div><div class='add'>+		dg00x-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+	    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(dg00x, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(dg00x);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(dg00x);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_hwdep_device(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(dg00x-&gt;card, "Digi00x", 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(hwdep-&gt;name, "Digi00x");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_DIGI00X;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = dg00x;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-midi.c b/sound/firewire/digi00x/digi00x-midi.c<br/>new file mode 100644<br/>index 000000000000..bcdaf003514b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-midi.c</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-midi.h - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+static int midi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_lock_try(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dg00x-&gt;mutex) {</div><div class='add'>+		err = snd_dg00x_stream_reserve_duplex(dg00x, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++dg00x-&gt;substreams_counter;</div><div class='add'>+			err = snd_dg00x_stream_start_duplex(dg00x);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--dg00x-&gt;substreams_counter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_dg00x_stream_lock_release(dg00x);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dg00x-&gt;mutex) {</div><div class='add'>+		--dg00x-&gt;substreams_counter;</div><div class='add'>+		snd_dg00x_stream_stop_duplex(dg00x);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_dg00x_stream_lock_release(dg00x);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				 int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	unsigned int port;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;rmidi-&gt;device == 0)</div><div class='add'>+		port = substream-&gt;number;</div><div class='add'>+	else</div><div class='add'>+		port = 2;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_dot_midi_trigger(&amp;dg00x-&gt;tx_stream, port, substream);</div><div class='add'>+	else</div><div class='add'>+		amdtp_dot_midi_trigger(&amp;dg00x-&gt;tx_stream, port, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				  int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	unsigned int port;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;rmidi-&gt;device == 0)</div><div class='add'>+		port = substream-&gt;number;</div><div class='add'>+	else</div><div class='add'>+		port = 2;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_dot_midi_trigger(&amp;dg00x-&gt;rx_stream, port, substream);</div><div class='add'>+	else</div><div class='add'>+		amdtp_dot_midi_trigger(&amp;dg00x-&gt;rx_stream, port, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_substream_names(struct snd_dg00x *dg00x,</div><div class='add'>+				struct snd_rawmidi *rmidi, bool is_console)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; ++i) {</div><div class='add'>+		str = &amp;rmidi-&gt;streams[i];</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+			if (!is_console) {</div><div class='add'>+				scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+					  "%s MIDI %d",</div><div class='add'>+					  dg00x-&gt;card-&gt;shortname,</div><div class='add'>+					  subs-&gt;number + 1);</div><div class='add'>+			} else {</div><div class='add'>+				scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+					  "%s control",</div><div class='add'>+					  dg00x-&gt;card-&gt;shortname);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_substream_pair(struct snd_dg00x *dg00x, unsigned int out_ports,</div><div class='add'>+			      unsigned int in_ports, bool is_console)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open = midi_open,</div><div class='add'>+		.close = midi_close,</div><div class='add'>+		.trigger = midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open = midi_open,</div><div class='add'>+		.close = midi_close,</div><div class='add'>+		.trigger = midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	const char *label;</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Add physical midi ports. */</div><div class='add'>+	err = snd_rawmidi_new(dg00x-&gt;card, dg00x-&gt;card-&gt;driver, is_console,</div><div class='add'>+			      out_ports, in_ports, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	rmidi-&gt;private_data = dg00x;</div><div class='add'>+</div><div class='add'>+	if (!is_console)</div><div class='add'>+		label = "%s control";</div><div class='add'>+	else</div><div class='add'>+		label = "%s MIDI";</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name), label,</div><div class='add'>+		 dg00x-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;playback_ops);</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;capture_ops);</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT |</div><div class='add'>+			     SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='add'>+			     SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	set_substream_names(dg00x, rmidi, is_console);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Add physical midi ports. */</div><div class='add'>+	err = add_substream_pair(dg00x, DOT_MIDI_OUT_PORTS, DOT_MIDI_IN_PORTS,</div><div class='add'>+				 false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (dg00x-&gt;is_console)</div><div class='add'>+		err = add_substream_pair(dg00x, 1, 1, true);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-pcm.c b/sound/firewire/digi00x/digi00x-pcm.c<br/>new file mode 100644<br/>index 000000000000..75f81545d50c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-pcm.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+static int hw_rule_rate(struct snd_pcm_hw_params *params,</div><div class='add'>+			struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1,</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_DG00X_RATE_COUNT; i++) {</div><div class='add'>+		if (!snd_interval_test(c,</div><div class='add'>+				       snd_dg00x_stream_pcm_channels[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, snd_dg00x_stream_rates[i]);</div><div class='add'>+		t.max = max(t.max, snd_dg00x_stream_rates[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(r, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_rule_channels(struct snd_pcm_hw_params *params,</div><div class='add'>+			    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1,</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_DG00X_RATE_COUNT; i++) {</div><div class='add'>+		if (!snd_interval_test(r, snd_dg00x_stream_rates[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, snd_dg00x_stream_pcm_channels[i]);</div><div class='add'>+		t.max = max(t.max, snd_dg00x_stream_pcm_channels[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_init_hw_params(struct snd_dg00x *dg00x,</div><div class='add'>+			      struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		substream-&gt;runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		s = &amp;dg00x-&gt;tx_stream;</div><div class='add'>+	} else {</div><div class='add'>+		substream-&gt;runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		s = &amp;dg00x-&gt;rx_stream;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = 10;</div><div class='add'>+	hw-&gt;channels_max = 18;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rates = SNDRV_PCM_RATE_44100 |</div><div class='add'>+		    SNDRV_PCM_RATE_48000 |</div><div class='add'>+		    SNDRV_PCM_RATE_88200 |</div><div class='add'>+		    SNDRV_PCM_RATE_96000;</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_channels, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_rate, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_dot_add_pcm_hw_constraints(s, substream-&gt;runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;dg00x-&gt;domain;</div><div class='add'>+	enum snd_dg00x_clock clock;</div><div class='add'>+	bool detect;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_lock_try(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pcm_init_hw_params(dg00x, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	/* Check current clock source. */</div><div class='add'>+	err = snd_dg00x_stream_get_clock(dg00x, &amp;clock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+	if (clock != SND_DG00X_CLOCK_INTERNAL) {</div><div class='add'>+		err = snd_dg00x_stream_check_external_clock(dg00x, &amp;detect);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_locked;</div><div class='add'>+		if (!detect) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto err_locked;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;dg00x-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if ((clock != SND_DG00X_CLOCK_INTERNAL) ||</div><div class='add'>+		    (dg00x-&gt;substreams_counter &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0)) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int rate;</div><div class='add'>+</div><div class='add'>+			err = snd_dg00x_stream_get_external_rate(dg00x, &amp;rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_dg00x_stream_lock_release(dg00x);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_dg00x_stream_lock_release(dg00x);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;dg00x-&gt;mutex);</div><div class='add'>+		err = snd_dg00x_stream_reserve_duplex(dg00x, rate,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++dg00x-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dg00x-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--dg00x-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_dg00x_stream_stop_duplex(dg00x);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dg00x-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_start_duplex(dg00x);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;dg00x-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dg00x-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_start_duplex(dg00x);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;dg00x-&gt;rx_stream);</div><div class='add'>+		amdtp_dot_reset(&amp;dg00x-&gt;rx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;dg00x-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;dg00x-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;dg00x-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;dg00x-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_capture_prepare,</div><div class='add'>+		.trigger	= pcm_capture_trigger,</div><div class='add'>+		.pointer	= pcm_capture_pointer,</div><div class='add'>+		.ack		= pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_playback_prepare,</div><div class='add'>+		.trigger	= pcm_playback_trigger,</div><div class='add'>+		.pointer	= pcm_playback_pointer,</div><div class='add'>+		.ack		= pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(dg00x-&gt;card, dg00x-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = dg00x;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name),</div><div class='add'>+		 "%s PCM", dg00x-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-proc.c b/sound/firewire/digi00x/digi00x-proc.c<br/>new file mode 100644<br/>index 000000000000..00b047fefb8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-proc.c</a></div><div class='hunk'>@@ -0,0 +1,86 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-proc.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+static int get_optical_iface_mode(struct snd_dg00x *dg00x,</div><div class='add'>+				  enum snd_dg00x_optical_mode *mode)</div><div class='add'>+{</div><div class='add'>+	__be32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_OPT_IFACE_MODE,</div><div class='add'>+				 &amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*mode = be32_to_cpu(data) &amp; 0x01;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void proc_read_clock(struct snd_info_entry *entry,</div><div class='add'>+			    struct snd_info_buffer *buf)</div><div class='add'>+{</div><div class='add'>+	static const char *const source_name[] = {</div><div class='add'>+		[SND_DG00X_CLOCK_INTERNAL] = "internal",</div><div class='add'>+		[SND_DG00X_CLOCK_SPDIF] = "s/pdif",</div><div class='add'>+		[SND_DG00X_CLOCK_ADAT] = "adat",</div><div class='add'>+		[SND_DG00X_CLOCK_WORD] = "word clock",</div><div class='add'>+	};</div><div class='add'>+	static const char *const optical_name[] = {</div><div class='add'>+		[SND_DG00X_OPT_IFACE_MODE_ADAT] = "adat",</div><div class='add'>+		[SND_DG00X_OPT_IFACE_MODE_SPDIF] = "s/pdif",</div><div class='add'>+	};</div><div class='add'>+	struct snd_dg00x *dg00x = entry-&gt;private_data;</div><div class='add'>+	enum snd_dg00x_optical_mode mode;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_dg00x_clock clock;</div><div class='add'>+	bool detect;</div><div class='add'>+</div><div class='add'>+	if (get_optical_iface_mode(dg00x, &amp;mode) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (snd_dg00x_stream_get_local_rate(dg00x, &amp;rate) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (snd_dg00x_stream_get_clock(dg00x, &amp;clock) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buf, "Optical mode: %s\n", optical_name[mode]);</div><div class='add'>+	snd_iprintf(buf, "Sampling Rate: %d\n", rate);</div><div class='add'>+	snd_iprintf(buf, "Clock Source: %s\n", source_name[clock]);</div><div class='add'>+</div><div class='add'>+	if (clock == SND_DG00X_CLOCK_INTERNAL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (snd_dg00x_stream_check_external_clock(dg00x, &amp;detect) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	snd_iprintf(buf, "External source: %s\n", detect ? "detected" : "not");</div><div class='add'>+	if (!detect)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (snd_dg00x_stream_get_external_rate(dg00x, &amp;rate) &gt;= 0)</div><div class='add'>+		snd_iprintf(buf, "External sampling rate: %d\n", rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_proc_init(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root, *entry;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(dg00x-&gt;card, "firewire",</div><div class='add'>+					  dg00x-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(dg00x-&gt;card, "clock", root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, dg00x, proc_read_clock);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-stream.c b/sound/firewire/digi00x/digi00x-stream.c<br/>new file mode 100644<br/>index 000000000000..250ffdb26ebd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-stream.c</a></div><div class='hunk'>@@ -0,0 +1,450 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-stream.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+#define READY_TIMEOUT_MS	200</div><div class='add'>+</div><div class='add'>+const unsigned int snd_dg00x_stream_rates[SND_DG00X_RATE_COUNT] = {</div><div class='add'>+	[SND_DG00X_RATE_44100] = 44100,</div><div class='add'>+	[SND_DG00X_RATE_48000] = 48000,</div><div class='add'>+	[SND_DG00X_RATE_88200] = 88200,</div><div class='add'>+	[SND_DG00X_RATE_96000] = 96000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Multi Bit Linear Audio data channels for each sampling transfer frequency. */</div><div class='add'>+const unsigned int</div><div class='add'>+snd_dg00x_stream_pcm_channels[SND_DG00X_RATE_COUNT] = {</div><div class='add'>+	/* Analog/ADAT/SPDIF */</div><div class='add'>+	[SND_DG00X_RATE_44100] = (8 + 8 + 2),</div><div class='add'>+	[SND_DG00X_RATE_48000] = (8 + 8 + 2),</div><div class='add'>+	/* Analog/SPDIF */</div><div class='add'>+	[SND_DG00X_RATE_88200] = (8 + 2),</div><div class='add'>+	[SND_DG00X_RATE_96000] = (8 + 2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_get_local_rate(struct snd_dg00x *dg00x, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_LOCAL_RATE,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = be32_to_cpu(reg) &amp; 0x0f;</div><div class='add'>+	if (data &lt; ARRAY_SIZE(snd_dg00x_stream_rates))</div><div class='add'>+		*rate = snd_dg00x_stream_rates[data];</div><div class='add'>+	else</div><div class='add'>+		err = -EIO;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_set_local_rate(struct snd_dg00x *dg00x, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_dg00x_stream_rates); i++) {</div><div class='add'>+		if (rate == snd_dg00x_stream_rates[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(snd_dg00x_stream_rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(i);</div><div class='add'>+	return snd_fw_transaction(dg00x-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  DG00X_ADDR_BASE + DG00X_OFFSET_LOCAL_RATE,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_get_clock(struct snd_dg00x *dg00x,</div><div class='add'>+			       enum snd_dg00x_clock *clock)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_CLOCK_SOURCE,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*clock = be32_to_cpu(reg) &amp; 0x0f;</div><div class='add'>+	if (*clock &gt;= SND_DG00X_CLOCK_COUNT)</div><div class='add'>+		err = -EIO;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_check_external_clock(struct snd_dg00x *dg00x, bool *detect)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_DETECT_EXTERNAL,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*detect = be32_to_cpu(reg) &gt; 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_get_external_rate(struct snd_dg00x *dg00x,</div><div class='add'>+				       unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_EXTERNAL_RATE,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = be32_to_cpu(reg) &amp; 0x0f;</div><div class='add'>+	if (data &lt; ARRAY_SIZE(snd_dg00x_stream_rates))</div><div class='add'>+		*rate = snd_dg00x_stream_rates[data];</div><div class='add'>+	/* This means desync. */</div><div class='add'>+	else</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_session(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	__be32 data;</div><div class='add'>+</div><div class='add'>+	data = cpu_to_be32(0x00000003);</div><div class='add'>+	snd_fw_transaction(dg00x-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_SET,</div><div class='add'>+			   &amp;data, sizeof(data), 0);</div><div class='add'>+</div><div class='add'>+	// Unregister isochronous channels for both direction.</div><div class='add'>+	data = 0;</div><div class='add'>+	snd_fw_transaction(dg00x-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS,</div><div class='add'>+			   &amp;data, sizeof(data), 0);</div><div class='add'>+</div><div class='add'>+	// Just after finishing the session, the device may lost transmitting</div><div class='add'>+	// functionality for a short time.</div><div class='add'>+	msleep(50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int begin_session(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	__be32 data;</div><div class='add'>+	u32 curr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Register isochronous channels for both direction.</div><div class='add'>+	data = cpu_to_be32((dg00x-&gt;tx_resources.channel &lt;&lt; 16) |</div><div class='add'>+			   dg00x-&gt;rx_resources.channel);</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_ISOC_CHANNELS,</div><div class='add'>+				 &amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(dg00x-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_STATE,</div><div class='add'>+				 &amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	curr = be32_to_cpu(data);</div><div class='add'>+</div><div class='add'>+	if (curr == 0)</div><div class='add'>+		curr = 2;</div><div class='add'>+</div><div class='add'>+	curr--;</div><div class='add'>+	while (curr &gt; 0) {</div><div class='add'>+		data = cpu_to_be32(curr);</div><div class='add'>+		err = snd_fw_transaction(dg00x-&gt;unit,</div><div class='add'>+					 TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+					 DG00X_ADDR_BASE +</div><div class='add'>+					 DG00X_OFFSET_STREAMING_SET,</div><div class='add'>+					 &amp;data, sizeof(data), 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+		curr--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_dg00x *dg00x, struct amdtp_stream *stream,</div><div class='add'>+			  unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Check sampling rate.</div><div class='add'>+	for (i = 0; i &lt; SND_DG00X_RATE_COUNT; i++) {</div><div class='add'>+		if (snd_dg00x_stream_rates[i] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == SND_DG00X_RATE_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;dg00x-&gt;tx_stream)</div><div class='add'>+		resources = &amp;dg00x-&gt;tx_resources;</div><div class='add'>+	else</div><div class='add'>+		resources = &amp;dg00x-&gt;rx_resources;</div><div class='add'>+</div><div class='add'>+	err = amdtp_dot_set_parameters(stream, rate,</div><div class='add'>+				       snd_dg00x_stream_pcm_channels[i]);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return fw_iso_resources_allocate(resources,</div><div class='add'>+				amdtp_stream_get_max_payload(stream),</div><div class='add'>+				fw_parent_device(dg00x-&gt;unit)-&gt;max_speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_dg00x *dg00x, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	enum amdtp_stream_direction dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;dg00x-&gt;tx_stream) {</div><div class='add'>+		resources = &amp;dg00x-&gt;tx_resources;</div><div class='add'>+		dir = AMDTP_IN_STREAM;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;dg00x-&gt;rx_resources;</div><div class='add'>+		dir = AMDTP_OUT_STREAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(resources, dg00x-&gt;unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_dot_init(s, dg00x-&gt;unit, dir);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_destroy(resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_dg00x *dg00x, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(s);</div><div class='add'>+</div><div class='add'>+	if (s == &amp;dg00x-&gt;tx_stream)</div><div class='add'>+		fw_iso_resources_destroy(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+	else</div><div class='add'>+		fw_iso_resources_destroy(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(dg00x, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(dg00x, &amp;dg00x-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(dg00x, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;dg00x-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(dg00x, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+		destroy_stream(dg00x, &amp;dg00x-&gt;tx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function should be called before starting streams or after stopping</div><div class='add'>+ * streams.</div><div class='add'>+ */</div><div class='add'>+void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;dg00x-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(dg00x, &amp;dg00x-&gt;rx_stream);</div><div class='add'>+	destroy_stream(dg00x, &amp;dg00x-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate,</div><div class='add'>+				    unsigned int frames_per_period,</div><div class='add'>+				    unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_get_local_rate(dg00x, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0)</div><div class='add'>+		rate = curr_rate;</div><div class='add'>+</div><div class='add'>+	if (dg00x-&gt;substreams_counter == 0 || curr_rate != rate) {</div><div class='add'>+		amdtp_domain_stop(&amp;dg00x-&gt;domain);</div><div class='add'>+</div><div class='add'>+		finish_session(dg00x);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		err = snd_dg00x_stream_set_local_rate(dg00x, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(dg00x, &amp;dg00x-&gt;rx_stream, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(dg00x, &amp;dg00x-&gt;tx_stream, rate);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;dg00x-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+			fw_iso_resources_free(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = dg00x-&gt;rx_resources.generation;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (dg00x-&gt;substreams_counter == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;dg00x-&gt;tx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;dg00x-&gt;rx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;dg00x-&gt;domain);</div><div class='add'>+		finish_session(dg00x);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(dg00x-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = fw_iso_resources_update(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * No packets are transmitted without receiving packets, reagardless of</div><div class='add'>+	 * which source of clock is used.</div><div class='add'>+	 */</div><div class='add'>+	if (!amdtp_stream_running(&amp;dg00x-&gt;rx_stream)) {</div><div class='add'>+		int spd = fw_parent_device(dg00x-&gt;unit)-&gt;max_speed;</div><div class='add'>+</div><div class='add'>+		err = begin_session(dg00x);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;rx_stream,</div><div class='add'>+					      dg00x-&gt;rx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;dg00x-&gt;domain, &amp;dg00x-&gt;tx_stream,</div><div class='add'>+					      dg00x-&gt;tx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		// NOTE: The device doesn't start packet transmission till receiving any packet.</div><div class='add'>+		// It ignores presentation time expressed by the value of syt field of CIP header</div><div class='add'>+		// in received packets. The sequence of the number of data blocks per packet is</div><div class='add'>+		// important for media clock recovery.</div><div class='add'>+		err = amdtp_domain_start(&amp;dg00x-&gt;domain, 0, true, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;dg00x-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;dg00x-&gt;domain);</div><div class='add'>+	finish_session(dg00x);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	if (dg00x-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;dg00x-&gt;domain);</div><div class='add'>+		finish_session(dg00x);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	fw_iso_resources_update(&amp;dg00x-&gt;tx_resources);</div><div class='add'>+	fw_iso_resources_update(&amp;dg00x-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+	amdtp_stream_update(&amp;dg00x-&gt;tx_stream);</div><div class='add'>+	amdtp_stream_update(&amp;dg00x-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_stream_lock_changed(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	dg00x-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;dg00x-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_stream_lock_try(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (dg00x-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (dg00x-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_dg00x_stream_lock_changed(dg00x);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_stream_lock_release(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;dg00x-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(dg00x-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--dg00x-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_dg00x_stream_lock_changed(dg00x);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x-transaction.c b/sound/firewire/digi00x/digi00x-transaction.c<br/>new file mode 100644<br/>index 000000000000..8a1667159930<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x-transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x-transaction.c</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x-transaction.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/asound.h&gt;</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+static void handle_unknown_message(struct snd_dg00x *dg00x,</div><div class='add'>+				   unsigned long long offset, __be32 *buf)</div><div class='add'>+{</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;dg00x-&gt;lock) {</div><div class='add'>+		dg00x-&gt;msg = be32_to_cpu(*buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;dg00x-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_message(struct fw_card *card, struct fw_request *request,</div><div class='add'>+			   int tcode, int destination, int source,</div><div class='add'>+			   int generation, unsigned long long offset,</div><div class='add'>+			   void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = callback_data;</div><div class='add'>+	__be32 *buf = (__be32 *)data;</div><div class='add'>+</div><div class='add'>+	fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+</div><div class='add'>+	if (offset == dg00x-&gt;async_handler.offset)</div><div class='add'>+		handle_unknown_message(dg00x, offset, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_transaction_reregister(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(dg00x-&gt;unit);</div><div class='add'>+	__be32 data[2];</div><div class='add'>+</div><div class='add'>+	/* Unknown. 4bytes. */</div><div class='add'>+	data[0] = cpu_to_be32((device-&gt;card-&gt;node_id &lt;&lt; 16) |</div><div class='add'>+			      (dg00x-&gt;async_handler.offset &gt;&gt; 32));</div><div class='add'>+	data[1] = cpu_to_be32(dg00x-&gt;async_handler.offset);</div><div class='add'>+	return snd_fw_transaction(dg00x-&gt;unit, TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				  DG00X_ADDR_BASE + DG00X_OFFSET_MESSAGE_ADDR,</div><div class='add'>+				  &amp;data, sizeof(data), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_dg00x_transaction_unregister(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	if (dg00x-&gt;async_handler.callback_data == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_core_remove_address_handler(&amp;dg00x-&gt;async_handler);</div><div class='add'>+</div><div class='add'>+	dg00x-&gt;async_handler.callback_data = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_dg00x_transaction_register(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	static const struct fw_address_region resp_register_region = {</div><div class='add'>+		.start	= 0xffffe0000000ull,</div><div class='add'>+		.end	= 0xffffe000ffffull,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dg00x-&gt;async_handler.length = 4;</div><div class='add'>+	dg00x-&gt;async_handler.address_callback = handle_message;</div><div class='add'>+	dg00x-&gt;async_handler.callback_data = dg00x;</div><div class='add'>+</div><div class='add'>+	err = fw_core_add_address_handler(&amp;dg00x-&gt;async_handler,</div><div class='add'>+					  &amp;resp_register_region);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_transaction_reregister(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_dg00x_transaction_unregister(dg00x);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x.c b/sound/firewire/digi00x/digi00x.c<br/>new file mode 100644<br/>index 000000000000..f73a9fc8adb1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x.c</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * digi00x.c - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "digi00x.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Digidesign Digi 002/003 family Driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define VENDOR_DIGIDESIGN	0x00a07e</div><div class='add'>+#define MODEL_CONSOLE		0x000001</div><div class='add'>+#define MODEL_RACK		0x000002</div><div class='add'>+#define SPEC_VERSION		0x000001</div><div class='add'>+</div><div class='add'>+static int name_card(struct snd_dg00x *dg00x)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(dg00x-&gt;unit);</div><div class='add'>+	char name[32] = {0};</div><div class='add'>+	char *model;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fw_csr_string(dg00x-&gt;unit-&gt;directory, CSR_MODEL, name,</div><div class='add'>+			    sizeof(name));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	model = skip_spaces(name);</div><div class='add'>+</div><div class='add'>+	strscpy(dg00x-&gt;card-&gt;driver, "Digi00x");</div><div class='add'>+	strscpy(dg00x-&gt;card-&gt;shortname, model);</div><div class='add'>+	strscpy(dg00x-&gt;card-&gt;mixername, model);</div><div class='add'>+	snprintf(dg00x-&gt;card-&gt;longname, sizeof(dg00x-&gt;card-&gt;longname),</div><div class='add'>+		 "Digidesign %s, GUID %08x%08x at %s, S%d", model,</div><div class='add'>+		 fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		 dev_name(&amp;dg00x-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dg00x_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_dg00x_stream_destroy_duplex(dg00x);</div><div class='add'>+	snd_dg00x_transaction_unregister(dg00x);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;dg00x-&gt;mutex);</div><div class='add'>+	fw_unit_put(dg00x-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_dg00x_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_dg00x *dg00x;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*dg00x), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = dg00x_card_free;</div><div class='add'>+</div><div class='add'>+	dg00x = card-&gt;private_data;</div><div class='add'>+	dg00x-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, dg00x);</div><div class='add'>+	dg00x-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;dg00x-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;dg00x-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;dg00x-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	dg00x-&gt;is_console = entry-&gt;model_id == MODEL_CONSOLE;</div><div class='add'>+</div><div class='add'>+	err = name_card(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_stream_init_duplex(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_dg00x_proc_init(dg00x);</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_create_pcm_devices(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_create_midi_devices(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_create_hwdep_device(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_dg00x_transaction_register(dg00x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dg00x_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	snd_dg00x_transaction_reregister(dg00x);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;dg00x-&gt;mutex);</div><div class='add'>+	snd_dg00x_stream_update_duplex(dg00x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_dg00x_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_dg00x *dg00x = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(dg00x-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id snd_dg00x_id_table[] = {</div><div class='add'>+	/* Both of 002/003 use the same ID. */</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+			       IEEE1394_MATCH_VERSION |</div><div class='add'>+			       IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id = VENDOR_DIGIDESIGN,</div><div class='add'>+		.version = SPEC_VERSION,</div><div class='add'>+		.model_id = MODEL_CONSOLE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+			       IEEE1394_MATCH_VERSION |</div><div class='add'>+			       IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id = VENDOR_DIGIDESIGN,</div><div class='add'>+		.version = SPEC_VERSION,</div><div class='add'>+		.model_id = MODEL_RACK,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, snd_dg00x_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver dg00x_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.bus = &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = snd_dg00x_probe,</div><div class='add'>+	.update   = snd_dg00x_update,</div><div class='add'>+	.remove   = snd_dg00x_remove,</div><div class='add'>+	.id_table = snd_dg00x_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_dg00x_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;dg00x_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_dg00x_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;dg00x_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_dg00x_init);</div><div class='add'>+module_exit(snd_dg00x_exit);</div><div class='head'>diff --git a/sound/firewire/digi00x/digi00x.h b/sound/firewire/digi00x/digi00x.h<br/>new file mode 100644<br/>index 000000000000..82b647d383c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/digi00x/digi00x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/digi00x/digi00x.h</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * digi00x.h - a part of driver for Digidesign Digi 002/003 family</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014-2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_DIGI00X_H_INCLUDED</div><div class='add'>+#define SOUND_DIGI00X_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+#include "../amdtp-stream.h"</div><div class='add'>+</div><div class='add'>+struct snd_dg00x {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct fw_iso_resources tx_resources;</div><div class='add'>+</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	struct fw_iso_resources rx_resources;</div><div class='add'>+</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	/* for uapi */</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	/* For asynchronous messages. */</div><div class='add'>+	struct fw_address_handler async_handler;</div><div class='add'>+	u32 msg;</div><div class='add'>+</div><div class='add'>+	/* Console models have additional MIDI ports for control surface. */</div><div class='add'>+	bool is_console;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DG00X_ADDR_BASE		0xffffe0000000ull</div><div class='add'>+</div><div class='add'>+#define DG00X_OFFSET_STREAMING_STATE	0x0000</div><div class='add'>+#define DG00X_OFFSET_STREAMING_SET	0x0004</div><div class='add'>+/* unknown but address in host space	0x0008 */</div><div class='add'>+/* For LSB of the address		0x000c */</div><div class='add'>+/* unknown				0x0010 */</div><div class='add'>+#define DG00X_OFFSET_MESSAGE_ADDR	0x0014</div><div class='add'>+/* For LSB of the address		0x0018 */</div><div class='add'>+/* unknown				0x001c */</div><div class='add'>+/* unknown				0x0020 */</div><div class='add'>+/* not used			0x0024--0x00ff */</div><div class='add'>+#define DG00X_OFFSET_ISOC_CHANNELS	0x0100</div><div class='add'>+/* unknown				0x0104 */</div><div class='add'>+/* unknown				0x0108 */</div><div class='add'>+/* unknown				0x010c */</div><div class='add'>+#define DG00X_OFFSET_LOCAL_RATE		0x0110</div><div class='add'>+#define DG00X_OFFSET_EXTERNAL_RATE	0x0114</div><div class='add'>+#define DG00X_OFFSET_CLOCK_SOURCE	0x0118</div><div class='add'>+#define DG00X_OFFSET_OPT_IFACE_MODE	0x011c</div><div class='add'>+/* unknown				0x0120 */</div><div class='add'>+/* Mixer control on/off			0x0124 */</div><div class='add'>+/* unknown				0x0128 */</div><div class='add'>+#define DG00X_OFFSET_DETECT_EXTERNAL	0x012c</div><div class='add'>+/* unknown				0x0138 */</div><div class='add'>+#define DG00X_OFFSET_MMC		0x0400</div><div class='add'>+</div><div class='add'>+enum snd_dg00x_rate {</div><div class='add'>+	SND_DG00X_RATE_44100 = 0,</div><div class='add'>+	SND_DG00X_RATE_48000,</div><div class='add'>+	SND_DG00X_RATE_88200,</div><div class='add'>+	SND_DG00X_RATE_96000,</div><div class='add'>+	SND_DG00X_RATE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_dg00x_clock {</div><div class='add'>+	SND_DG00X_CLOCK_INTERNAL = 0,</div><div class='add'>+	SND_DG00X_CLOCK_SPDIF,</div><div class='add'>+	SND_DG00X_CLOCK_ADAT,</div><div class='add'>+	SND_DG00X_CLOCK_WORD,</div><div class='add'>+	SND_DG00X_CLOCK_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_dg00x_optical_mode {</div><div class='add'>+	SND_DG00X_OPT_IFACE_MODE_ADAT = 0,</div><div class='add'>+	SND_DG00X_OPT_IFACE_MODE_SPDIF,</div><div class='add'>+	SND_DG00X_OPT_IFACE_MODE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DOT_MIDI_IN_PORTS	1</div><div class='add'>+#define DOT_MIDI_OUT_PORTS	2</div><div class='add'>+</div><div class='add'>+int amdtp_dot_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		   enum amdtp_stream_direction dir);</div><div class='add'>+int amdtp_dot_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			     unsigned int pcm_channels);</div><div class='add'>+void amdtp_dot_reset(struct amdtp_stream *s);</div><div class='add'>+int amdtp_dot_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				     struct snd_pcm_runtime *runtime);</div><div class='add'>+void amdtp_dot_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			  struct snd_rawmidi_substream *midi);</div><div class='add'>+</div><div class='add'>+int snd_dg00x_transaction_register(struct snd_dg00x *dg00x);</div><div class='add'>+int snd_dg00x_transaction_reregister(struct snd_dg00x *dg00x);</div><div class='add'>+void snd_dg00x_transaction_unregister(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+extern const unsigned int snd_dg00x_stream_rates[SND_DG00X_RATE_COUNT];</div><div class='add'>+extern const unsigned int snd_dg00x_stream_pcm_channels[SND_DG00X_RATE_COUNT];</div><div class='add'>+int snd_dg00x_stream_get_external_rate(struct snd_dg00x *dg00x,</div><div class='add'>+				       unsigned int *rate);</div><div class='add'>+int snd_dg00x_stream_get_local_rate(struct snd_dg00x *dg00x,</div><div class='add'>+				    unsigned int *rate);</div><div class='add'>+int snd_dg00x_stream_set_local_rate(struct snd_dg00x *dg00x, unsigned int rate);</div><div class='add'>+int snd_dg00x_stream_get_clock(struct snd_dg00x *dg00x,</div><div class='add'>+			       enum snd_dg00x_clock *clock);</div><div class='add'>+int snd_dg00x_stream_check_external_clock(struct snd_dg00x *dg00x,</div><div class='add'>+					  bool *detect);</div><div class='add'>+int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x);</div><div class='add'>+int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate,</div><div class='add'>+				    unsigned int frames_per_period,</div><div class='add'>+				    unsigned int frames_per_buffer);</div><div class='add'>+int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x);</div><div class='add'>+void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x);</div><div class='add'>+void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x);</div><div class='add'>+void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+void snd_dg00x_stream_lock_changed(struct snd_dg00x *dg00x);</div><div class='add'>+int snd_dg00x_stream_lock_try(struct snd_dg00x *dg00x);</div><div class='add'>+void snd_dg00x_stream_lock_release(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+void snd_dg00x_proc_init(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_pcm_devices(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_midi_devices(struct snd_dg00x *dg00x);</div><div class='add'>+</div><div class='add'>+int snd_dg00x_create_hwdep_device(struct snd_dg00x *dg00x);</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/fcp.c b/sound/firewire/fcp.c<br/>new file mode 100644<br/>index 000000000000..e60bfd0ee4ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fcp.c</a></div><div class='hunk'>@@ -0,0 +1,398 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Function Control Protocol (IEC 61883-1) helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "fcp.h"</div><div class='add'>+#include "lib.h"</div><div class='add'>+#include "amdtp-stream.h"</div><div class='add'>+</div><div class='add'>+#define CTS_AVC 0x00</div><div class='add'>+</div><div class='add'>+#define ERROR_RETRIES	3</div><div class='add'>+#define ERROR_DELAY_MS	5</div><div class='add'>+#define FCP_TIMEOUT_MS	125</div><div class='add'>+</div><div class='add'>+int avc_general_set_sig_fmt(struct fw_unit *unit, unsigned int rate,</div><div class='add'>+			    enum avc_general_plug_dir dir,</div><div class='add'>+			    unsigned short pid)</div><div class='add'>+{</div><div class='add'>+	unsigned int sfc;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	bool flag;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	flag = false;</div><div class='add'>+	for (sfc = 0; sfc &lt; CIP_SFC_COUNT; sfc++) {</div><div class='add'>+		if (amdtp_rate_table[sfc] == rate) {</div><div class='add'>+			flag = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!flag)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(8, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x00;		/* AV/C CONTROL */</div><div class='add'>+	buf[1] = 0xff;		/* UNIT */</div><div class='add'>+	if (dir == AVC_GENERAL_PLUG_DIR_IN)</div><div class='add'>+		buf[2] = 0x19;	/* INPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	else</div><div class='add'>+		buf[2] = 0x18;	/* OUTPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	buf[3] = 0xff &amp; pid;	/* plug id */</div><div class='add'>+	buf[4] = 0x90;		/* EOH_1, Form_1, FMT. AM824 */</div><div class='add'>+	buf[5] = 0x07 &amp; sfc;	/* FDF-hi. AM824, frequency */</div><div class='add'>+	buf[6] = 0xff;		/* FDF-mid. AM824, SYT hi (not used)*/</div><div class='add'>+	buf[7] = 0xff;		/* FDF-low. AM824, SYT lo (not used) */</div><div class='add'>+</div><div class='add'>+	/* do transaction and check buf[1-5] are the same against command */</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 8, buf, 8,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 8)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(avc_general_set_sig_fmt);</div><div class='add'>+</div><div class='add'>+int avc_general_get_sig_fmt(struct fw_unit *unit, unsigned int *rate,</div><div class='add'>+			    enum avc_general_plug_dir dir,</div><div class='add'>+			    unsigned short pid)</div><div class='add'>+{</div><div class='add'>+	unsigned int sfc;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(8, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x01;		/* AV/C STATUS */</div><div class='add'>+	buf[1] = 0xff;		/* Unit */</div><div class='add'>+	if (dir == AVC_GENERAL_PLUG_DIR_IN)</div><div class='add'>+		buf[2] = 0x19;	/* INPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	else</div><div class='add'>+		buf[2] = 0x18;	/* OUTPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	buf[3] = 0xff &amp; pid;	/* plug id */</div><div class='add'>+	buf[4] = 0x90;		/* EOH_1, Form_1, FMT. AM824 */</div><div class='add'>+	buf[5] = 0xff;		/* FDF-hi. AM824, frequency */</div><div class='add'>+	buf[6] = 0xff;		/* FDF-mid. AM824, SYT hi (not used) */</div><div class='add'>+	buf[7] = 0xff;		/* FDF-low. AM824, SYT lo (not used) */</div><div class='add'>+</div><div class='add'>+	/* do transaction and check buf[1-4] are the same against command */</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 8, buf, 8,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 8)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* check sfc field and pick up rate */</div><div class='add'>+	sfc = 0x07 &amp; buf[5];</div><div class='add'>+	if (sfc &gt;= CIP_SFC_COUNT) {</div><div class='add'>+		err = -EAGAIN;	/* also in transition */</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*rate = amdtp_rate_table[sfc];</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(avc_general_get_sig_fmt);</div><div class='add'>+</div><div class='add'>+int avc_general_get_plug_info(struct fw_unit *unit, unsigned int subunit_type,</div><div class='add'>+			      unsigned int subunit_id, unsigned int subfunction,</div><div class='add'>+			      u8 info[AVC_PLUG_INFO_BUF_BYTES])</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* extended subunit in spec.4.2 is not supported */</div><div class='add'>+	if ((subunit_type == 0x1E) || (subunit_id == 5))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(8, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x01;	/* AV/C STATUS */</div><div class='add'>+	/* UNIT or Subunit, Functionblock */</div><div class='add'>+	buf[1] = ((subunit_type &amp; 0x1f) &lt;&lt; 3) | (subunit_id &amp; 0x7);</div><div class='add'>+	buf[2] = 0x02;	/* PLUG INFO */</div><div class='add'>+	buf[3] = 0xff &amp; subfunction;</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 8, buf, 8, BIT(1) | BIT(2));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 8)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b) /* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	info[0] = buf[4];</div><div class='add'>+	info[1] = buf[5];</div><div class='add'>+	info[2] = buf[6];</div><div class='add'>+	info[3] = buf[7];</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(avc_general_get_plug_info);</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(transactions_lock);</div><div class='add'>+static LIST_HEAD(transactions);</div><div class='add'>+</div><div class='add'>+enum fcp_state {</div><div class='add'>+	STATE_PENDING,</div><div class='add'>+	STATE_BUS_RESET,</div><div class='add'>+	STATE_COMPLETE,</div><div class='add'>+	STATE_DEFERRED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fcp_transaction {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	void *response_buffer;</div><div class='add'>+	unsigned int response_size;</div><div class='add'>+	unsigned int response_match_bytes;</div><div class='add'>+	enum fcp_state state;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+	bool deferrable;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fcp_avc_transaction - send an AV/C command and wait for its response</div><div class='add'>+ * @unit: a unit on the target device</div><div class='add'>+ * @command: a buffer containing the command frame; must be DMA-able</div><div class='add'>+ * @command_size: the size of @command</div><div class='add'>+ * @response: a buffer for the response frame</div><div class='add'>+ * @response_size: the maximum size of @response</div><div class='add'>+ * @response_match_bytes: a bitmap specifying the bytes used to detect the</div><div class='add'>+ *                        correct response frame</div><div class='add'>+ *</div><div class='add'>+ * This function sends a FCP command frame to the target and waits for the</div><div class='add'>+ * corresponding response frame to be returned.</div><div class='add'>+ *</div><div class='add'>+ * Because it is possible for multiple FCP transactions to be active at the</div><div class='add'>+ * same time, the correct response frame is detected by the value of certain</div><div class='add'>+ * bytes.  These bytes must be set in @response before calling this function,</div><div class='add'>+ * and the corresponding bits must be set in @response_match_bytes.</div><div class='add'>+ *</div><div class='add'>+ * @command and @response can point to the same buffer.</div><div class='add'>+ *</div><div class='add'>+ * Returns the actual size of the response frame, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int fcp_avc_transaction(struct fw_unit *unit,</div><div class='add'>+			const void *command, unsigned int command_size,</div><div class='add'>+			void *response, unsigned int response_size,</div><div class='add'>+			unsigned int response_match_bytes)</div><div class='add'>+{</div><div class='add'>+	struct fcp_transaction t;</div><div class='add'>+	int tcode, ret, tries = 0;</div><div class='add'>+</div><div class='add'>+	t.unit = unit;</div><div class='add'>+	t.response_buffer = response;</div><div class='add'>+	t.response_size = response_size;</div><div class='add'>+	t.response_match_bytes = response_match_bytes;</div><div class='add'>+	t.state = STATE_PENDING;</div><div class='add'>+	init_waitqueue_head(&amp;t.wait);</div><div class='add'>+	t.deferrable = (*(const u8 *)command == 0x00 || *(const u8 *)command == 0x03);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;transactions_lock) {</div><div class='add'>+		list_add_tail(&amp;t.list, &amp;transactions);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		tcode = command_size == 4 ? TCODE_WRITE_QUADLET_REQUEST</div><div class='add'>+					  : TCODE_WRITE_BLOCK_REQUEST;</div><div class='add'>+		ret = snd_fw_transaction(t.unit, tcode,</div><div class='add'>+					 CSR_REGISTER_BASE + CSR_FCP_COMMAND,</div><div class='add'>+					 (void *)command, command_size, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+deferred:</div><div class='add'>+		wait_event_timeout(t.wait, t.state != STATE_PENDING,</div><div class='add'>+				   msecs_to_jiffies(FCP_TIMEOUT_MS));</div><div class='add'>+</div><div class='add'>+		if (t.state == STATE_DEFERRED) {</div><div class='add'>+			/*</div><div class='add'>+			 * 'AV/C General Specification' define no time limit</div><div class='add'>+			 * on command completion once an INTERIM response has</div><div class='add'>+			 * been sent. but we promise to finish this function</div><div class='add'>+			 * for a caller. Here we use FCP_TIMEOUT_MS for next</div><div class='add'>+			 * interval. This is not in the specification.</div><div class='add'>+			 */</div><div class='add'>+			t.state = STATE_PENDING;</div><div class='add'>+			goto deferred;</div><div class='add'>+		} else if (t.state == STATE_COMPLETE) {</div><div class='add'>+			ret = t.response_size;</div><div class='add'>+			break;</div><div class='add'>+		} else if (t.state == STATE_BUS_RESET) {</div><div class='add'>+			msleep(ERROR_DELAY_MS);</div><div class='add'>+		} else if (++tries &gt;= ERROR_RETRIES) {</div><div class='add'>+			dev_err(&amp;t.unit-&gt;device, "FCP command timed out\n");</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;transactions_lock) {</div><div class='add'>+		list_del(&amp;t.list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fcp_avc_transaction);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fcp_bus_reset - inform the target handler about a bus reset</div><div class='add'>+ * @unit: the unit that might be used by fcp_avc_transaction()</div><div class='add'>+ *</div><div class='add'>+ * This function must be called from the driver's .update handler to inform</div><div class='add'>+ * the FCP transaction handler that a bus reset has happened.  Any pending FCP</div><div class='add'>+ * transactions are retried.</div><div class='add'>+ */</div><div class='add'>+void fcp_bus_reset(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct fcp_transaction *t;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;transactions_lock);</div><div class='add'>+	list_for_each_entry(t, &amp;transactions, list) {</div><div class='add'>+		if (t-&gt;unit == unit &amp;&amp;</div><div class='add'>+		    (t-&gt;state == STATE_PENDING ||</div><div class='add'>+		     t-&gt;state == STATE_DEFERRED)) {</div><div class='add'>+			t-&gt;state = STATE_BUS_RESET;</div><div class='add'>+			wake_up(&amp;t-&gt;wait);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fcp_bus_reset);</div><div class='add'>+</div><div class='add'>+/* checks whether the response matches the masked bytes in response_buffer */</div><div class='add'>+static bool is_matching_response(struct fcp_transaction *transaction,</div><div class='add'>+				 const void *response, size_t length)</div><div class='add'>+{</div><div class='add'>+	const u8 *p1, *p2;</div><div class='add'>+	unsigned int mask, i;</div><div class='add'>+</div><div class='add'>+	p1 = response;</div><div class='add'>+	p2 = transaction-&gt;response_buffer;</div><div class='add'>+	mask = transaction-&gt;response_match_bytes;</div><div class='add'>+</div><div class='add'>+	for (i = 0; ; ++i) {</div><div class='add'>+		if ((mask &amp; 1) &amp;&amp; p1[i] != p2[i])</div><div class='add'>+			return false;</div><div class='add'>+		mask &gt;&gt;= 1;</div><div class='add'>+		if (!mask)</div><div class='add'>+			return true;</div><div class='add'>+		if (--length == 0)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fcp_response(struct fw_card *card, struct fw_request *request,</div><div class='add'>+			 int tcode, int destination, int source,</div><div class='add'>+			 int generation, unsigned long long offset,</div><div class='add'>+			 void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct fcp_transaction *t;</div><div class='add'>+</div><div class='add'>+	if (length &lt; 1 || (*(const u8 *)data &amp; 0xf0) != CTS_AVC)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;transactions_lock);</div><div class='add'>+	list_for_each_entry(t, &amp;transactions, list) {</div><div class='add'>+		struct fw_device *device = fw_parent_device(t-&gt;unit);</div><div class='add'>+		if (device-&gt;card != card ||</div><div class='add'>+		    device-&gt;generation != generation)</div><div class='add'>+			continue;</div><div class='add'>+		smp_rmb(); /* node_id vs. generation */</div><div class='add'>+		if (device-&gt;node_id != source)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (t-&gt;state == STATE_PENDING &amp;&amp;</div><div class='add'>+		    is_matching_response(t, data, length)) {</div><div class='add'>+			if (t-&gt;deferrable &amp;&amp; *(const u8 *)data == 0x0f) {</div><div class='add'>+				t-&gt;state = STATE_DEFERRED;</div><div class='add'>+			} else {</div><div class='add'>+				t-&gt;state = STATE_COMPLETE;</div><div class='add'>+				t-&gt;response_size = min_t(unsigned int, length,</div><div class='add'>+							 t-&gt;response_size);</div><div class='add'>+				memcpy(t-&gt;response_buffer, data,</div><div class='add'>+				       t-&gt;response_size);</div><div class='add'>+			}</div><div class='add'>+			wake_up(&amp;t-&gt;wait);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fw_address_handler response_register_handler = {</div><div class='add'>+	.length = 0x200,</div><div class='add'>+	.address_callback = fcp_response,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init fcp_module_init(void)</div><div class='add'>+{</div><div class='add'>+	static const struct fw_address_region response_register_region = {</div><div class='add'>+		.start = CSR_REGISTER_BASE + CSR_FCP_RESPONSE,</div><div class='add'>+		.end = CSR_REGISTER_BASE + CSR_FCP_END,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	fw_core_add_address_handler(&amp;response_register_handler,</div><div class='add'>+				    &amp;response_register_region);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit fcp_module_exit(void)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;transactions));</div><div class='add'>+	fw_core_remove_address_handler(&amp;response_register_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(fcp_module_init);</div><div class='add'>+module_exit(fcp_module_exit);</div><div class='head'>diff --git a/sound/firewire/fcp.h b/sound/firewire/fcp.h<br/>new file mode 100644<br/>index 000000000000..512f7c40903a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fcp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fcp.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_FCP_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_FCP_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#define	AVC_PLUG_INFO_BUF_BYTES	4</div><div class='add'>+</div><div class='add'>+struct fw_unit;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AV/C Digital Interface Command Set General Specification 4.2</div><div class='add'>+ * (Sep 2004, 1394TA)</div><div class='add'>+ */</div><div class='add'>+enum avc_general_plug_dir {</div><div class='add'>+	AVC_GENERAL_PLUG_DIR_IN		= 0,</div><div class='add'>+	AVC_GENERAL_PLUG_DIR_OUT	= 1,</div><div class='add'>+	AVC_GENERAL_PLUG_DIR_COUNT</div><div class='add'>+};</div><div class='add'>+int avc_general_set_sig_fmt(struct fw_unit *unit, unsigned int rate,</div><div class='add'>+			    enum avc_general_plug_dir dir,</div><div class='add'>+			    unsigned short plug);</div><div class='add'>+int avc_general_get_sig_fmt(struct fw_unit *unit, unsigned int *rate,</div><div class='add'>+			    enum avc_general_plug_dir dir,</div><div class='add'>+			    unsigned short plug);</div><div class='add'>+int avc_general_get_plug_info(struct fw_unit *unit, unsigned int subunit_type,</div><div class='add'>+			      unsigned int subunit_id, unsigned int subfunction,</div><div class='add'>+			      u8 info[AVC_PLUG_INFO_BUF_BYTES]);</div><div class='add'>+</div><div class='add'>+int fcp_avc_transaction(struct fw_unit *unit,</div><div class='add'>+			const void *command, unsigned int command_size,</div><div class='add'>+			void *response, unsigned int response_size,</div><div class='add'>+			unsigned int response_match_bytes);</div><div class='add'>+void fcp_bus_reset(struct fw_unit *unit);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/fireface/Makefile b/sound/firewire/fireface/Makefile<br/>new file mode 100644<br/>index 000000000000..b397d95877a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-fireface-y := ff.o ff-transaction.o ff-midi.o ff-proc.o amdtp-ff.o \</div><div class='add'>+		     ff-stream.o ff-pcm.o ff-hwdep.o ff-protocol-former.o \</div><div class='add'>+		     ff-protocol-latter.o</div><div class='add'>+obj-$(CONFIG_SND_FIREFACE) += snd-fireface.o</div><div class='head'>diff --git a/sound/firewire/fireface/amdtp-ff.c b/sound/firewire/fireface/amdtp-ff.c<br/>new file mode 100644<br/>index 000000000000..76c9d33ed572<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/amdtp-ff.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/amdtp-ff.c</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * amdtp-ff.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+struct amdtp_ff {</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_ff_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			    unsigned int pcm_channels)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_ff *p = s-&gt;protocol;</div><div class='add'>+	unsigned int data_channels;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(s))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	p-&gt;pcm_channels = pcm_channels;</div><div class='add'>+	data_channels = pcm_channels;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_set_parameters(s, rate, data_channels, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			  __le32 *buffer, unsigned int frames,</div><div class='add'>+			  unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_ff *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	const u32 *src;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	src = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			buffer[c] = cpu_to_le32(*src);</div><div class='add'>+			src++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			src = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			 __le32 *buffer, unsigned int frames,</div><div class='add'>+			 unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_ff *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u32 *dst;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	dst  = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			*dst = le32_to_cpu(buffer[c]) &amp; 0xffffff00;</div><div class='add'>+			dst++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			dst = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_silence(struct amdtp_stream *s,</div><div class='add'>+			      __le32 *buffer, unsigned int frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_ff *p = s-&gt;protocol;</div><div class='add'>+	unsigned int i, c, channels = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c)</div><div class='add'>+			buffer[c] = cpu_to_le32(0x00000000);</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_ff_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				    struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__le32 *buf = (__le32 *)desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		} else {</div><div class='add'>+			write_pcm_silence(s, buf, data_blocks);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__le32 *buf = (__le32 *)desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_ff_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		  enum amdtp_stream_direction dir)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM)</div><div class='add'>+		process_ctx_payloads = process_ir_ctx_payloads;</div><div class='add'>+	else</div><div class='add'>+		process_ctx_payloads = process_it_ctx_payloads;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_init(s, unit, dir, CIP_BLOCKING | CIP_UNAWARE_SYT | CIP_NO_HEADER, 0,</div><div class='add'>+				 process_ctx_payloads, sizeof(struct amdtp_ff));</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-hwdep.c b/sound/firewire/fireface/ff-hwdep.c<br/>new file mode 100644<br/>index 000000000000..5976abf2e1ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-hwdep.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes give three functionality.</div><div class='add'>+ *</div><div class='add'>+ * 1.get firewire node information</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock stream</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+static bool has_msg(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	if (ff-&gt;spec-&gt;protocol-&gt;has_msg)</div><div class='add'>+		return ff-&gt;spec-&gt;protocol-&gt;has_msg(ff);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,  long count,</div><div class='add'>+		       loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!ff-&gt;dev_lock_changed &amp;&amp; !has_msg(ff)) {</div><div class='add'>+		prepare_to_wait(&amp;ff-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;ff-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;ff-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;dev_lock_changed &amp;&amp; count &gt;= sizeof(struct snd_firewire_event_lock_status)) {</div><div class='add'>+		struct snd_firewire_event_lock_status ev = {</div><div class='add'>+			.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS,</div><div class='add'>+			.status = (ff-&gt;dev_lock_count &gt; 0),</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		ff-&gt;dev_lock_changed = false;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (copy_to_user(buf, &amp;ev, sizeof(ev)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		count = sizeof(ev);</div><div class='add'>+	} else if (has_msg(ff)) {</div><div class='add'>+		// NOTE: Acquired spin lock should be released before accessing to user space in the</div><div class='add'>+		// callback since the access can cause page fault.</div><div class='add'>+		count = ff-&gt;spec-&gt;protocol-&gt;copy_msg_to_user(ff, buf, count);</div><div class='add'>+		spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+		count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;ff-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+	if (ff-&gt;dev_lock_changed || has_msg(ff))</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_ff *ff, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(ff-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_FIREFACE;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;dev_lock_count == 0) {</div><div class='add'>+		ff-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;dev_lock_count == -1) {</div><div class='add'>+		ff-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+	if (ff-&gt;dev_lock_count == -1)</div><div class='add'>+		ff-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(ff, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(ff);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(ff);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_ff_create_hwdep_devices(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops hwdep_ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(ff-&gt;card, ff-&gt;card-&gt;driver, 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(hwdep-&gt;name, ff-&gt;card-&gt;driver);</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_FIREFACE;</div><div class='add'>+	hwdep-&gt;ops = hwdep_ops;</div><div class='add'>+	hwdep-&gt;private_data = ff;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-midi.c b/sound/firewire/fireface/ff-midi.c<br/>new file mode 100644<br/>index 000000000000..9f6aa490e5bf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-midi.c</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-midi.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+static int midi_capture_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* Initialize internal status. */</div><div class='add'>+	ff-&gt;on_sysex[substream-&gt;number] = 0;</div><div class='add'>+	ff-&gt;rx_midi_error[substream-&gt;number] = false;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ff-&gt;rx_midi_substreams[substream-&gt;number], substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_capture_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;ff-&gt;rx_midi_work[substream-&gt;number]);</div><div class='add'>+	WRITE_ONCE(ff-&gt;rx_midi_substreams[substream-&gt;number], NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				 int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		WRITE_ONCE(ff-&gt;tx_midi_substreams[substream-&gt;number],</div><div class='add'>+			   substream);</div><div class='add'>+	else</div><div class='add'>+		WRITE_ONCE(ff-&gt;tx_midi_substreams[substream-&gt;number], NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substream,</div><div class='add'>+				  int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up || !ff-&gt;rx_midi_error[substream-&gt;number])</div><div class='add'>+		schedule_work(&amp;ff-&gt;rx_midi_work[substream-&gt;number]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_rawmidi_str *stream,</div><div class='add'>+				     const char *const name)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(substream, &amp;stream-&gt;substreams, list) {</div><div class='add'>+		scnprintf(substream-&gt;name, sizeof(substream-&gt;name),</div><div class='add'>+			  "%s MIDI %d", name, substream-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_create_midi_devices(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops midi_capture_ops = {</div><div class='add'>+		.open		= midi_capture_open,</div><div class='add'>+		.close		= midi_capture_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops midi_playback_ops = {</div><div class='add'>+		.open		= midi_playback_open,</div><div class='add'>+		.close		= midi_playback_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *stream;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_rawmidi_new(ff-&gt;card, ff-&gt;card-&gt;driver, 0,</div><div class='add'>+			      ff-&gt;spec-&gt;midi_out_ports, ff-&gt;spec-&gt;midi_in_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", ff-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = ff;</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+			    &amp;midi_capture_ops);</div><div class='add'>+	stream = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+	set_midi_substream_names(stream, ff-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+			    &amp;midi_playback_ops);</div><div class='add'>+	stream = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+	set_midi_substream_names(stream, ff-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c<br/>new file mode 100644<br/>index 000000000000..7ad8204fbfe8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,387 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-pcm.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+static int hw_rule_rate(struct snd_pcm_hw_params *params,</div><div class='add'>+			struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	const unsigned int *pcm_channels = rule-&gt;private;</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amdtp_rate_table); i++) {</div><div class='add'>+		enum snd_ff_stream_mode mode;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(c, pcm_channels[mode]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, amdtp_rate_table[i]);</div><div class='add'>+		t.max = max(t.max, amdtp_rate_table[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(r, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_rule_channels(struct snd_pcm_hw_params *params,</div><div class='add'>+			    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	const unsigned int *pcm_channels = rule-&gt;private;</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amdtp_rate_table); i++) {</div><div class='add'>+		enum snd_ff_stream_mode mode;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(r, amdtp_rate_table[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, pcm_channels[mode]);</div><div class='add'>+		t.max = max(t.max, pcm_channels[mode]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void limit_channels_and_rates(struct snd_pcm_hardware *hw,</div><div class='add'>+				     const unsigned int *pcm_channels)</div><div class='add'>+{</div><div class='add'>+	unsigned int rate, channels;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+	hw-&gt;rate_min = UINT_MAX;</div><div class='add'>+	hw-&gt;rate_max = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amdtp_rate_table); i++) {</div><div class='add'>+		enum snd_ff_stream_mode mode;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		channels = pcm_channels[mode];</div><div class='add'>+		if (pcm_channels[mode] == 0)</div><div class='add'>+			continue;</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, channels);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, channels);</div><div class='add'>+</div><div class='add'>+		rate = amdtp_rate_table[i];</div><div class='add'>+		hw-&gt;rates |= snd_pcm_rate_to_rate_bit(rate);</div><div class='add'>+		hw-&gt;rate_min = min(hw-&gt;rate_min, rate);</div><div class='add'>+		hw-&gt;rate_max = max(hw-&gt;rate_max, rate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_init_hw_params(struct snd_ff *ff,</div><div class='add'>+			      struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+	const unsigned int *pcm_channels;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		s = &amp;ff-&gt;tx_stream;</div><div class='add'>+		pcm_channels = ff-&gt;spec-&gt;pcm_capture_channels;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		s = &amp;ff-&gt;rx_stream;</div><div class='add'>+		pcm_channels = ff-&gt;spec-&gt;pcm_playback_channels;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit_channels_and_rates(&amp;runtime-&gt;hw, pcm_channels);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_channels, (void *)pcm_channels,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_rate, (void *)pcm_channels,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_ff_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;ff-&gt;domain;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_ff_clock_src src;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_lock_try(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pcm_init_hw_params(ff, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto release_lock;</div><div class='add'>+</div><div class='add'>+	err = ff-&gt;spec-&gt;protocol-&gt;get_clock(ff, &amp;rate, &amp;src);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto release_lock;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;ff-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if (src != SND_FF_CLOCK_SRC_INTERNAL) {</div><div class='add'>+			for (i = 0; i &lt; CIP_SFC_COUNT; ++i) {</div><div class='add'>+				if (amdtp_rate_table[i] == rate)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			// The unit is configured at sampling frequency which packet</div><div class='add'>+			// streaming engine can't support.</div><div class='add'>+			if (i &gt;= CIP_SFC_COUNT) {</div><div class='add'>+				err = -EIO;</div><div class='add'>+				goto release_lock;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+		} else {</div><div class='add'>+			if (ff-&gt;substreams_counter &gt; 0) {</div><div class='add'>+				unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+				unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+</div><div class='add'>+				rate = amdtp_rate_table[ff-&gt;rx_stream.sfc];</div><div class='add'>+				substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+				substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto release_lock;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto release_lock;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+release_lock:</div><div class='add'>+	snd_ff_stream_lock_release(ff);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_ff_stream_lock_release(ff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;ff-&gt;mutex);</div><div class='add'>+		err = snd_ff_stream_reserve_duplex(ff, rate, frames_per_period,</div><div class='add'>+						   frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++ff-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ff-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--ff-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_ff_stream_stop_duplex(ff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ff-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_start_duplex(ff, runtime-&gt;rate);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;ff-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ff-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_start_duplex(ff, runtime-&gt;rate);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;ff-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;ff-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;ff-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;ff-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;ff-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;ff-&gt;domain, &amp;ff-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;ff-&gt;domain, &amp;ff-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;ff-&gt;domain, &amp;ff-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;ff-&gt;domain, &amp;ff-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_create_pcm_devices(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops pcm_capture_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_capture_prepare,</div><div class='add'>+		.trigger	= pcm_capture_trigger,</div><div class='add'>+		.pointer	= pcm_capture_pointer,</div><div class='add'>+		.ack		= pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops pcm_playback_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_playback_prepare,</div><div class='add'>+		.trigger	= pcm_playback_trigger,</div><div class='add'>+		.pointer	= pcm_playback_pointer,</div><div class='add'>+		.ack		= pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(ff-&gt;card, ff-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = ff;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name),</div><div class='add'>+		 "%s PCM", ff-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;pcm_playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;pcm_capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-proc.c b/sound/firewire/fireface/ff-proc.c<br/>new file mode 100644<br/>index 000000000000..4aecc8dcbb99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-proc.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-proc.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./ff.h"</div><div class='add'>+</div><div class='add'>+const char *snd_ff_proc_get_clk_label(enum snd_ff_clock_src src)</div><div class='add'>+{</div><div class='add'>+	static const char *const labels[] = {</div><div class='add'>+		"Internal",</div><div class='add'>+		"S/PDIF",</div><div class='add'>+		"ADAT1",</div><div class='add'>+		"ADAT2",</div><div class='add'>+		"Word",</div><div class='add'>+		"LTC",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (src &gt;= ARRAY_SIZE(labels))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return labels[src];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void proc_dump_status(struct snd_info_entry *entry,</div><div class='add'>+			     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	ff-&gt;spec-&gt;protocol-&gt;dump_status(ff, buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_node(struct snd_ff *ff, struct snd_info_entry *root,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     void (*op)(struct snd_info_entry *e,</div><div class='add'>+				struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(ff-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, ff, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_proc_init(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(ff-&gt;card, "firewire",</div><div class='add'>+					  ff-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(ff, root, "status", proc_dump_status);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-protocol-former.c b/sound/firewire/fireface/ff-protocol-former.c<br/>new file mode 100644<br/>index 000000000000..0907d0a2296f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-protocol-former.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-protocol-former.c</a></div><div class='hunk'>@@ -0,0 +1,733 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// ff-protocol-former.c - a part of driver for RME Fireface series</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+#define FORMER_REG_SYNC_STATUS		0x0000801c0000ull</div><div class='add'>+/* For block write request. */</div><div class='add'>+#define FORMER_REG_FETCH_PCM_FRAMES	0x0000801c0000ull</div><div class='add'>+#define FORMER_REG_CLOCK_CONFIG		0x0000801c0004ull</div><div class='add'>+</div><div class='add'>+static int parse_clock_bits(u32 data, unsigned int *rate,</div><div class='add'>+			    enum snd_ff_clock_src *src)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		unsigned int rate;</div><div class='add'>+		u32 mask;</div><div class='add'>+	} *rate_entry, rate_entries[] = {</div><div class='add'>+		{  32000, 0x00000002, },</div><div class='add'>+		{  44100, 0x00000000, },</div><div class='add'>+		{  48000, 0x00000006, },</div><div class='add'>+		{  64000, 0x0000000a, },</div><div class='add'>+		{  88200, 0x00000008, },</div><div class='add'>+		{  96000, 0x0000000e, },</div><div class='add'>+		{ 128000, 0x00000012, },</div><div class='add'>+		{ 176400, 0x00000010, },</div><div class='add'>+		{ 192000, 0x00000016, },</div><div class='add'>+	};</div><div class='add'>+	static const struct {</div><div class='add'>+		enum snd_ff_clock_src src;</div><div class='add'>+		u32 mask;</div><div class='add'>+	} *clk_entry, clk_entries[] = {</div><div class='add'>+		{ SND_FF_CLOCK_SRC_ADAT1,	0x00000000, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_ADAT2,	0x00000400, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_SPDIF,	0x00000c00, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_WORD,	0x00001000, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_LTC,		0x00001800, },</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rate_entries); ++i) {</div><div class='add'>+		rate_entry = rate_entries + i;</div><div class='add'>+		if ((data &amp; 0x0000001e) == rate_entry-&gt;mask) {</div><div class='add'>+			*rate = rate_entry-&gt;rate;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(rate_entries))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (data &amp; 0x00000001) {</div><div class='add'>+		*src = SND_FF_CLOCK_SRC_INTERNAL;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(clk_entries); ++i) {</div><div class='add'>+			clk_entry = clk_entries + i;</div><div class='add'>+			if ((data &amp; 0x00001c00) == clk_entry-&gt;mask) {</div><div class='add'>+				*src = clk_entry-&gt;src;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (i == ARRAY_SIZE(clk_entries))</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int former_get_clock(struct snd_ff *ff, unsigned int *rate,</div><div class='add'>+			    enum snd_ff_clock_src *src)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 FORMER_REG_CLOCK_CONFIG, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = le32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	return parse_clock_bits(data, rate, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int former_switch_fetching_mode(struct snd_ff *ff, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int count;</div><div class='add'>+	__le32 *reg;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	for (i = 0; i &lt; SND_FF_STREAM_MODE_COUNT; ++i)</div><div class='add'>+		count = max(count, ff-&gt;spec-&gt;pcm_playback_channels[i]);</div><div class='add'>+</div><div class='add'>+	reg = kcalloc(count, sizeof(__le32), GFP_KERNEL);</div><div class='add'>+	if (!reg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!enable) {</div><div class='add'>+		/*</div><div class='add'>+		 * Each quadlet is corresponding to data channels in a data</div><div class='add'>+		 * blocks in reverse order. Precisely, quadlets for available</div><div class='add'>+		 * data channels should be enabled. Here, I take second best</div><div class='add'>+		 * to fetch PCM frames from all of data channels regardless of</div><div class='add'>+		 * stf.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; count; ++i)</div><div class='add'>+			reg[i] = cpu_to_le32(0x00000001);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				 FORMER_REG_FETCH_PCM_FRAMES, reg,</div><div class='add'>+				 sizeof(__le32) * count, 0);</div><div class='add'>+	kfree(reg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_clock_config(struct snd_ff *ff, struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_ff_clock_src src;</div><div class='add'>+	const char *label;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				 FORMER_REG_CLOCK_CONFIG, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	data = le32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Output S/PDIF format: %s (Emphasis: %s)\n",</div><div class='add'>+		    (data &amp; 0x00000020) ? "Professional" : "Consumer",</div><div class='add'>+		    str_on_off(data &amp; 0x00000040));</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Optical output interface format: %s\n",</div><div class='add'>+		    (data &amp; 0x00000100) ? "S/PDIF" : "ADAT");</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Word output single speed: %s\n",</div><div class='add'>+		    str_on_off(data &amp; 0x00002000));</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "S/PDIF input interface: %s\n",</div><div class='add'>+		    (data &amp; 0x00000200) ? "Optical" : "Coaxial");</div><div class='add'>+</div><div class='add'>+	err = parse_clock_bits(data, &amp;rate, &amp;src);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	label = snd_ff_proc_get_clk_label(src);</div><div class='add'>+	if (!label)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Clock configuration: %d %s\n", rate, label);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dump_sync_status(struct snd_ff *ff, struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		char *const label;</div><div class='add'>+		u32 locked_mask;</div><div class='add'>+		u32 synced_mask;</div><div class='add'>+	} *clk_entry, clk_entries[] = {</div><div class='add'>+		{ "WDClk",	0x40000000, 0x20000000, },</div><div class='add'>+		{ "S/PDIF",	0x00080000, 0x00040000, },</div><div class='add'>+		{ "ADAT1",	0x00000400, 0x00001000, },</div><div class='add'>+		{ "ADAT2",	0x00000800, 0x00002000, },</div><div class='add'>+	};</div><div class='add'>+	static const struct {</div><div class='add'>+		char *const label;</div><div class='add'>+		u32 mask;</div><div class='add'>+	} *referred_entry, referred_entries[] = {</div><div class='add'>+		{ "ADAT1",	0x00000000, },</div><div class='add'>+		{ "ADAT2",	0x00400000, },</div><div class='add'>+		{ "S/PDIF",	0x00c00000, },</div><div class='add'>+		{ "WDclk",	0x01000000, },</div><div class='add'>+		{ "TCO",	0x01400000, },</div><div class='add'>+	};</div><div class='add'>+	static const struct {</div><div class='add'>+		unsigned int rate;</div><div class='add'>+		u32 mask;</div><div class='add'>+	} *rate_entry, rate_entries[] = {</div><div class='add'>+		{ 32000,	0x02000000, },</div><div class='add'>+		{ 44100,	0x04000000, },</div><div class='add'>+		{ 48000,	0x06000000, },</div><div class='add'>+		{ 64000,	0x08000000, },</div><div class='add'>+		{ 88200,	0x0a000000, },</div><div class='add'>+		{ 96000,	0x0c000000, },</div><div class='add'>+		{ 128000,	0x0e000000, },</div><div class='add'>+		{ 176400,	0x10000000, },</div><div class='add'>+		{ 192000,	0x12000000, },</div><div class='add'>+	};</div><div class='add'>+	__le32 reg[2];</div><div class='add'>+	u32 data[2];</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_BLOCK_REQUEST,</div><div class='add'>+				 FORMER_REG_SYNC_STATUS, reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	data[0] = le32_to_cpu(reg[0]);</div><div class='add'>+	data[1] = le32_to_cpu(reg[1]);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "External source detection:\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(clk_entries); ++i) {</div><div class='add'>+		const char *state;</div><div class='add'>+</div><div class='add'>+		clk_entry = clk_entries + i;</div><div class='add'>+		if (data[0] &amp; clk_entry-&gt;locked_mask) {</div><div class='add'>+			if (data[0] &amp; clk_entry-&gt;synced_mask)</div><div class='add'>+				state = "sync";</div><div class='add'>+			else</div><div class='add'>+				state = "lock";</div><div class='add'>+		} else {</div><div class='add'>+			state = "none";</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, "%s: %s\n", clk_entry-&gt;label, state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Referred clock:\n");</div><div class='add'>+</div><div class='add'>+	if (data[1] &amp; 0x00000001) {</div><div class='add'>+		snd_iprintf(buffer, "Internal\n");</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int rate;</div><div class='add'>+		const char *label;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(referred_entries); ++i) {</div><div class='add'>+			referred_entry = referred_entries + i;</div><div class='add'>+			if ((data[0] &amp; 0x1e0000) == referred_entry-&gt;mask) {</div><div class='add'>+				label = referred_entry-&gt;label;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (i == ARRAY_SIZE(referred_entries))</div><div class='add'>+			label = "none";</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(rate_entries); ++i) {</div><div class='add'>+			rate_entry = rate_entries + i;</div><div class='add'>+			if ((data[0] &amp; 0x1e000000) == rate_entry-&gt;mask) {</div><div class='add'>+				rate = rate_entry-&gt;rate;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (i == ARRAY_SIZE(rate_entries))</div><div class='add'>+			rate = 0;</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, "%s %d\n", label, rate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void former_dump_status(struct snd_ff *ff,</div><div class='add'>+			       struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	dump_clock_config(ff, buffer);</div><div class='add'>+	dump_sync_status(ff, buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int former_fill_midi_msg(struct snd_ff *ff,</div><div class='add'>+				struct snd_rawmidi_substream *substream,</div><div class='add'>+				unsigned int port)</div><div class='add'>+{</div><div class='add'>+	u8 *buf = (u8 *)ff-&gt;msg_buf[port];</div><div class='add'>+	int len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	len = snd_rawmidi_transmit_peek(substream, buf,</div><div class='add'>+					SND_FF_MAXIMIM_MIDI_QUADS);</div><div class='add'>+	if (len &lt;= 0)</div><div class='add'>+		return len;</div><div class='add'>+</div><div class='add'>+	// One quadlet includes one byte.</div><div class='add'>+	for (i = len - 1; i &gt;= 0; --i)</div><div class='add'>+		ff-&gt;msg_buf[port][i] = cpu_to_le32(buf[i]);</div><div class='add'>+	ff-&gt;rx_bytes[port] = len;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FF800_STF		0x0000fc88f000</div><div class='add'>+#define FF800_RX_PACKET_FORMAT	0x0000fc88f004</div><div class='add'>+#define FF800_ALLOC_TX_STREAM	0x0000fc88f008</div><div class='add'>+#define FF800_ISOC_COMM_START	0x0000fc88f00c</div><div class='add'>+#define   FF800_TX_S800_FLAG	0x00000800</div><div class='add'>+#define FF800_ISOC_COMM_STOP	0x0000fc88f010</div><div class='add'>+</div><div class='add'>+#define FF800_TX_PACKET_ISOC_CH	0x0000801c0008</div><div class='add'>+</div><div class='add'>+static int allocate_tx_resources(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned int tx_isoc_channel;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(ff-&gt;tx_stream.data_block_quadlets);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF800_ALLOC_TX_STREAM, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Wait till the format of tx packet is available.</div><div class='add'>+	count = 0;</div><div class='add'>+	while (count++ &lt; 10) {</div><div class='add'>+		u32 data;</div><div class='add'>+		err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				FF800_TX_PACKET_ISOC_CH, &amp;reg, sizeof(reg), 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		data = le32_to_cpu(reg);</div><div class='add'>+		if (data != 0xffffffff) {</div><div class='add'>+			tx_isoc_channel = data;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msleep(50);</div><div class='add'>+	}</div><div class='add'>+	if (count &gt;= 10)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	// NOTE: this is a makeshift to start OHCI 1394 IR context in the</div><div class='add'>+	// channel. On the other hand, 'struct fw_iso_resources.allocated' is</div><div class='add'>+	// not true and it's not deallocated at stop.</div><div class='add'>+	ff-&gt;tx_resources.channel = tx_isoc_channel;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ff800_allocate_resources(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	__le32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(rate);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF800_STF, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// If starting isochronous communication immediately, change of STF has</div><div class='add'>+	// no effect. In this case, the communication runs based on former STF.</div><div class='add'>+	// Let's sleep for a bit.</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	// Controllers should allocate isochronous resources for rx stream.</div><div class='add'>+	err = fw_iso_resources_allocate(&amp;ff-&gt;rx_resources,</div><div class='add'>+				amdtp_stream_get_max_payload(&amp;ff-&gt;rx_stream),</div><div class='add'>+				fw_parent_device(ff-&gt;unit)-&gt;max_speed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Set isochronous channel and the number of quadlets of rx packets.</div><div class='add'>+	// This should be done before the allocation of tx resources to avoid</div><div class='add'>+	// periodical noise.</div><div class='add'>+	data = ff-&gt;rx_stream.data_block_quadlets &lt;&lt; 3;</div><div class='add'>+	data = (data &lt;&lt; 8) | ff-&gt;rx_resources.channel;</div><div class='add'>+	reg = cpu_to_le32(data);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF800_RX_PACKET_FORMAT, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return allocate_tx_resources(ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ff800_begin_session(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = ff-&gt;rx_resources.generation;</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(ff-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		int err = fw_iso_resources_update(&amp;ff-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(0x80000000);</div><div class='add'>+	reg |= cpu_to_le32(ff-&gt;tx_stream.data_block_quadlets);</div><div class='add'>+	if (fw_parent_device(ff-&gt;unit)-&gt;max_speed == SCODE_800)</div><div class='add'>+		reg |= cpu_to_le32(FF800_TX_S800_FLAG);</div><div class='add'>+	return snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF800_ISOC_COMM_START, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ff800_finish_session(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(0x80000000);</div><div class='add'>+	snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   FF800_ISOC_COMM_STOP, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fireface 800 doesn't allow drivers to register lower 4 bytes of destination</div><div class='add'>+// address.</div><div class='add'>+// A write transaction to clear registered higher 4 bytes of destination address</div><div class='add'>+// has an effect to suppress asynchronous transaction from device.</div><div class='add'>+static void ff800_handle_midi_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,</div><div class='add'>+				  size_t length, u32 tstamp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length / 4; i++) {</div><div class='add'>+		u8 byte = le32_to_cpu(buf[i]) &amp; 0xff;</div><div class='add'>+		struct snd_rawmidi_substream *substream;</div><div class='add'>+</div><div class='add'>+		substream = READ_ONCE(ff-&gt;tx_midi_substreams[0]);</div><div class='add'>+		if (substream)</div><div class='add'>+			snd_rawmidi_receive(substream, &amp;byte, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_ff_protocol snd_ff_protocol_ff800 = {</div><div class='add'>+	.handle_msg		= ff800_handle_midi_msg,</div><div class='add'>+	.fill_midi_msg		= former_fill_midi_msg,</div><div class='add'>+	.get_clock		= former_get_clock,</div><div class='add'>+	.switch_fetching_mode	= former_switch_fetching_mode,</div><div class='add'>+	.allocate_resources	= ff800_allocate_resources,</div><div class='add'>+	.begin_session		= ff800_begin_session,</div><div class='add'>+	.finish_session		= ff800_finish_session,</div><div class='add'>+	.dump_status		= former_dump_status,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FF400_STF		0x000080100500ull</div><div class='add'>+#define FF400_RX_PACKET_FORMAT	0x000080100504ull</div><div class='add'>+#define FF400_ISOC_COMM_START	0x000080100508ull</div><div class='add'>+#define FF400_TX_PACKET_FORMAT	0x00008010050cull</div><div class='add'>+#define FF400_ISOC_COMM_STOP	0x000080100510ull</div><div class='add'>+</div><div class='add'>+// Fireface 400 manages isochronous channel number in 3 bit field. Therefore,</div><div class='add'>+// we can allocate between 0 and 7 channel.</div><div class='add'>+static int ff400_allocate_resources(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+	enum snd_ff_stream_mode mode;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Check whether the given value is supported or not.</div><div class='add'>+	for (i = 0; i &lt; CIP_SFC_COUNT; i++) {</div><div class='add'>+		if (amdtp_rate_table[i] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt;= CIP_SFC_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// Set the number of data blocks transferred in a second.</div><div class='add'>+	reg = cpu_to_le32(rate);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF400_STF, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Keep resources for in-stream.</div><div class='add'>+	ff-&gt;tx_resources.channels_mask = 0x00000000000000ffuLL;</div><div class='add'>+	err = fw_iso_resources_allocate(&amp;ff-&gt;tx_resources,</div><div class='add'>+			amdtp_stream_get_max_payload(&amp;ff-&gt;tx_stream),</div><div class='add'>+			fw_parent_device(ff-&gt;unit)-&gt;max_speed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Keep resources for out-stream.</div><div class='add'>+	ff-&gt;rx_resources.channels_mask = 0x00000000000000ffuLL;</div><div class='add'>+	err = fw_iso_resources_allocate(&amp;ff-&gt;rx_resources,</div><div class='add'>+			amdtp_stream_get_max_payload(&amp;ff-&gt;rx_stream),</div><div class='add'>+			fw_parent_device(ff-&gt;unit)-&gt;max_speed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;tx_resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ff400_begin_session(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = ff-&gt;rx_resources.generation;</div><div class='add'>+	__le32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(ff-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;ff-&gt;tx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = fw_iso_resources_update(&amp;ff-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Set isochronous channel and the number of quadlets of received</div><div class='add'>+	// packets.</div><div class='add'>+	reg = cpu_to_le32(((ff-&gt;rx_stream.data_block_quadlets &lt;&lt; 3) &lt;&lt; 8) |</div><div class='add'>+			  ff-&gt;rx_resources.channel);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF400_RX_PACKET_FORMAT, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Set isochronous channel and the number of quadlets of transmitted</div><div class='add'>+	// packet.</div><div class='add'>+	// TODO: investigate the purpose of this 0x80.</div><div class='add'>+	reg = cpu_to_le32((0x80 &lt;&lt; 24) |</div><div class='add'>+			  (ff-&gt;tx_resources.channel &lt;&lt; 5) |</div><div class='add'>+			  (ff-&gt;tx_stream.data_block_quadlets));</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF400_TX_PACKET_FORMAT, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Allow to transmit packets.</div><div class='add'>+	reg = cpu_to_le32(0x00000001);</div><div class='add'>+	return snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 FF400_ISOC_COMM_START, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ff400_finish_session(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(0x80000000);</div><div class='add'>+	snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   FF400_ISOC_COMM_STOP, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_midi_msg(struct snd_ff *ff, u32 quad, unsigned int port)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream = READ_ONCE(ff-&gt;tx_midi_substreams[port]);</div><div class='add'>+</div><div class='add'>+	if (substream != NULL) {</div><div class='add'>+		u8 byte = (quad &gt;&gt; (16 * port)) &amp; 0x000000ff;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_receive(substream, &amp;byte, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FF400_QUEUE_SIZE	32</div><div class='add'>+</div><div class='add'>+struct ff400_msg_parser {</div><div class='add'>+	struct {</div><div class='add'>+		u32 msg;</div><div class='add'>+		u32 tstamp;</div><div class='add'>+	} msgs[FF400_QUEUE_SIZE];</div><div class='add'>+	size_t push_pos;</div><div class='add'>+	size_t pull_pos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool ff400_has_msg(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	struct ff400_msg_parser *parser = ff-&gt;msg_parser;</div><div class='add'>+</div><div class='add'>+	return (parser-&gt;push_pos != parser-&gt;pull_pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// For Fireface 400, lower 4 bytes of destination address is configured by bit</div><div class='add'>+// flag in quadlet register (little endian) at 0x'0000'801'0051c. Drivers can</div><div class='add'>+// select one of 4 options:</div><div class='add'>+//</div><div class='add'>+// bit flags: offset of destination address</div><div class='add'>+//  - 0x04000000: 0x'....'....'0000'0000</div><div class='add'>+//  - 0x08000000: 0x'....'....'0000'0080</div><div class='add'>+//  - 0x10000000: 0x'....'....'0000'0100</div><div class='add'>+//  - 0x20000000: 0x'....'....'0000'0180</div><div class='add'>+//</div><div class='add'>+// Drivers can suppress the device to transfer asynchronous transactions by</div><div class='add'>+// using below 2 bits.</div><div class='add'>+//  - 0x01000000: suppress transmission</div><div class='add'>+//  - 0x02000000: suppress transmission</div><div class='add'>+//</div><div class='add'>+// Actually, the register is write-only and includes the other options such as</div><div class='add'>+// input attenuation. This driver allocates destination address with '0000'0000</div><div class='add'>+// in its lower offset and expects userspace application to configure the</div><div class='add'>+// register for it.</div><div class='add'>+</div><div class='add'>+// When the message is for signal level operation, the upper 4 bits in MSB expresses the pair of</div><div class='add'>+// stereo physical port.</div><div class='add'>+// - 0: Microphone input 0/1</div><div class='add'>+// - 1: Line input 0/1</div><div class='add'>+// - [2-4]: Line output 0-5</div><div class='add'>+// - 5: Headphone output 0/1</div><div class='add'>+// - 6: S/PDIF output 0/1</div><div class='add'>+// - [7-10]: ADAT output 0-7</div><div class='add'>+//</div><div class='add'>+// The value of signal level can be detected by mask of 0x00fffc00. For signal level of microphone</div><div class='add'>+// input:</div><div class='add'>+//</div><div class='add'>+// - 0:    0.0 dB</div><div class='add'>+// - 10: +10.0 dB</div><div class='add'>+// - 11: +11.0 dB</div><div class='add'>+// - 12: +12.0 dB</div><div class='add'>+// - ...</div><div class='add'>+// - 63: +63.0 dB:</div><div class='add'>+// - 64: +64.0 dB:</div><div class='add'>+// - 65: +65.0 dB:</div><div class='add'>+//</div><div class='add'>+// For signal level of line input:</div><div class='add'>+//</div><div class='add'>+// - 0:  0.0 dB</div><div class='add'>+// - 1: +0.5 dB</div><div class='add'>+// - 2: +1.0 dB</div><div class='add'>+// - 3: +1.5 dB</div><div class='add'>+// - ...</div><div class='add'>+// - 34: +17.0 dB:</div><div class='add'>+// - 35: +17.5 dB:</div><div class='add'>+// - 36: +18.0 dB:</div><div class='add'>+//</div><div class='add'>+// For signal level of any type of output:</div><div class='add'>+//</div><div class='add'>+// - 63: -infinite</div><div class='add'>+// - 62: -58.0 dB</div><div class='add'>+// - 61: -56.0 dB</div><div class='add'>+// - 60: -54.0 dB</div><div class='add'>+// - 59: -53.0 dB</div><div class='add'>+// - 58: -52.0 dB</div><div class='add'>+// - ...</div><div class='add'>+// - 7: -1.0 dB</div><div class='add'>+// - 6:  0.0 dB</div><div class='add'>+// - 5: +1.0 dB</div><div class='add'>+// - ...</div><div class='add'>+// - 2: +4.0 dB</div><div class='add'>+// - 1: +5.0 dB</div><div class='add'>+// - 0: +6.0 dB</div><div class='add'>+//</div><div class='add'>+// When the message is not for signal level operation, it's for MIDI bytes. When matching to</div><div class='add'>+// FF400_MSG_FLAG_IS_MIDI_PORT_0, one MIDI byte can be detected by mask of 0x000000ff. When</div><div class='add'>+// matching to FF400_MSG_FLAG_IS_MIDI_PORT_1, one MIDI byte can be detected by mask of 0x00ff0000.</div><div class='add'>+#define FF400_MSG_FLAG_IS_SIGNAL_LEVEL		0x04000000</div><div class='add'>+#define  FF400_MSG_FLAG_IS_RIGHT_CHANNEL	0x08000000</div><div class='add'>+#define  FF400_MSG_FLAG_IS_STEREO_PAIRED	0x02000000</div><div class='add'>+#define  FF400_MSG_MASK_STEREO_PAIR		0xf0000000</div><div class='add'>+#define  FF400_MSG_MASK_SIGNAL_LEVEL		0x00fffc00</div><div class='add'>+#define FF400_MSG_FLAG_IS_MIDI_PORT_0		0x00000100</div><div class='add'>+#define  FF400_MSG_MASK_MIDI_PORT_0		0x000000ff</div><div class='add'>+#define FF400_MSG_FLAG_IS_MIDI_PORT_1		0x01000000</div><div class='add'>+#define  FF400_MSG_MASK_MIDI_PORT_1		0x00ff0000</div><div class='add'>+</div><div class='add'>+static void ff400_handle_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,</div><div class='add'>+			     size_t length, u32 tstamp)</div><div class='add'>+{</div><div class='add'>+	bool need_hwdep_wake_up = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; length / 4; i++) {</div><div class='add'>+		u32 quad = le32_to_cpu(buf[i]);</div><div class='add'>+</div><div class='add'>+		if (quad &amp; FF400_MSG_FLAG_IS_SIGNAL_LEVEL) {</div><div class='add'>+			struct ff400_msg_parser *parser = ff-&gt;msg_parser;</div><div class='add'>+</div><div class='add'>+			parser-&gt;msgs[parser-&gt;push_pos].msg = quad;</div><div class='add'>+			parser-&gt;msgs[parser-&gt;push_pos].tstamp = tstamp;</div><div class='add'>+			++parser-&gt;push_pos;</div><div class='add'>+			if (parser-&gt;push_pos &gt;= FF400_QUEUE_SIZE)</div><div class='add'>+				parser-&gt;push_pos = 0;</div><div class='add'>+</div><div class='add'>+			need_hwdep_wake_up = true;</div><div class='add'>+		} else if (quad &amp; FF400_MSG_FLAG_IS_MIDI_PORT_0) {</div><div class='add'>+			parse_midi_msg(ff, quad, 0);</div><div class='add'>+		} else if (quad &amp; FF400_MSG_FLAG_IS_MIDI_PORT_1) {</div><div class='add'>+			parse_midi_msg(ff, quad, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_hwdep_wake_up)</div><div class='add'>+		wake_up(&amp;ff-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long ff400_copy_msg_to_user(struct snd_ff *ff, char __user *buf, long count)</div><div class='add'>+{</div><div class='add'>+	struct snd_firewire_event_ff400_message ev = {</div><div class='add'>+		.type = SNDRV_FIREWIRE_EVENT_FF400_MESSAGE,</div><div class='add'>+		.message_count = 0,</div><div class='add'>+	};</div><div class='add'>+	struct ff400_msg_parser *parser = ff-&gt;msg_parser;</div><div class='add'>+	long consumed = 0;</div><div class='add'>+	long ret = 0;</div><div class='add'>+</div><div class='add'>+	if (count &lt; sizeof(ev) || parser-&gt;pull_pos == parser-&gt;push_pos)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	count -= sizeof(ev);</div><div class='add'>+	consumed += sizeof(ev);</div><div class='add'>+</div><div class='add'>+	while (count &gt;= sizeof(*parser-&gt;msgs) &amp;&amp; parser-&gt;pull_pos != parser-&gt;push_pos) {</div><div class='add'>+		spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+		if (copy_to_user(buf + consumed, parser-&gt;msgs + parser-&gt;pull_pos,</div><div class='add'>+				 sizeof(*parser-&gt;msgs)))</div><div class='add'>+			ret = -EFAULT;</div><div class='add'>+		spin_lock_irq(&amp;ff-&gt;lock);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		++parser-&gt;pull_pos;</div><div class='add'>+		if (parser-&gt;pull_pos &gt;= FF400_QUEUE_SIZE)</div><div class='add'>+			parser-&gt;pull_pos = 0;</div><div class='add'>+		++ev.message_count;</div><div class='add'>+		count -= sizeof(*parser-&gt;msgs);</div><div class='add'>+		consumed += sizeof(*parser-&gt;msgs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;ff-&gt;lock);</div><div class='add'>+	if (copy_to_user(buf, &amp;ev, sizeof(ev)))</div><div class='add'>+		ret = -EFAULT;</div><div class='add'>+	spin_lock_irq(&amp;ff-&gt;lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return consumed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_ff_protocol snd_ff_protocol_ff400 = {</div><div class='add'>+	.msg_parser_size	= sizeof(struct ff400_msg_parser),</div><div class='add'>+	.has_msg		= ff400_has_msg,</div><div class='add'>+	.copy_msg_to_user	= ff400_copy_msg_to_user,</div><div class='add'>+	.handle_msg		= ff400_handle_msg,</div><div class='add'>+	.fill_midi_msg		= former_fill_midi_msg,</div><div class='add'>+	.get_clock		= former_get_clock,</div><div class='add'>+	.switch_fetching_mode	= former_switch_fetching_mode,</div><div class='add'>+	.allocate_resources	= ff400_allocate_resources,</div><div class='add'>+	.begin_session		= ff400_begin_session,</div><div class='add'>+	.finish_session		= ff400_finish_session,</div><div class='add'>+	.dump_status		= former_dump_status,</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/fireface/ff-protocol-latter.c b/sound/firewire/fireface/ff-protocol-latter.c<br/>new file mode 100644<br/>index 000000000000..9947e0c2e0aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-protocol-latter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-protocol-latter.c</a></div><div class='hunk'>@@ -0,0 +1,540 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// ff-protocol-latter.c - a part of driver for RME Fireface series</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Takashi Sakamoto</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+#define LATTER_STF		0xffff00000004ULL</div><div class='add'>+#define LATTER_ISOC_CHANNELS	0xffff00000008ULL</div><div class='add'>+#define LATTER_ISOC_START	0xffff0000000cULL</div><div class='add'>+#define LATTER_FETCH_MODE	0xffff00000010ULL</div><div class='add'>+#define LATTER_SYNC_STATUS	0x0000801c0000ULL</div><div class='add'>+</div><div class='add'>+// The content of sync status register differs between models.</div><div class='add'>+//</div><div class='add'>+// Fireface UCX:</div><div class='add'>+//  0xf0000000: (unidentified)</div><div class='add'>+//  0x0f000000: effective rate of sampling clock</div><div class='add'>+//  0x00f00000: detected rate of word clock on BNC interface</div><div class='add'>+//  0x000f0000: detected rate of ADAT or S/PDIF on optical interface</div><div class='add'>+//  0x0000f000: detected rate of S/PDIF on coaxial interface</div><div class='add'>+//  0x00000e00: effective source of sampling clock</div><div class='add'>+//    0x00000e00: Internal</div><div class='add'>+//    0x00000800: (unidentified)</div><div class='add'>+//    0x00000600: Word clock on BNC interface</div><div class='add'>+//    0x00000400: ADAT on optical interface</div><div class='add'>+//    0x00000200: S/PDIF on coaxial or optical interface</div><div class='add'>+//  0x00000100: Optical interface is used for ADAT signal</div><div class='add'>+//  0x00000080: (unidentified)</div><div class='add'>+//  0x00000040: Synchronized to word clock on BNC interface</div><div class='add'>+//  0x00000020: Synchronized to ADAT or S/PDIF on optical interface</div><div class='add'>+//  0x00000010: Synchronized to S/PDIF on coaxial interface</div><div class='add'>+//  0x00000008: (unidentified)</div><div class='add'>+//  0x00000004: Lock word clock on BNC interface</div><div class='add'>+//  0x00000002: Lock ADAT or S/PDIF on optical interface</div><div class='add'>+//  0x00000001: Lock S/PDIF on coaxial interface</div><div class='add'>+//</div><div class='add'>+// Fireface 802 (and perhaps UFX):</div><div class='add'>+//   0xf0000000: effective rate of sampling clock</div><div class='add'>+//   0x0f000000: detected rate of ADAT-B on 2nd optical interface</div><div class='add'>+//   0x00f00000: detected rate of ADAT-A on 1st optical interface</div><div class='add'>+//   0x000f0000: detected rate of AES/EBU on XLR or coaxial interface</div><div class='add'>+//   0x0000f000: detected rate of word clock on BNC interface</div><div class='add'>+//   0x00000e00: effective source of sampling clock</div><div class='add'>+//     0x00000e00: internal</div><div class='add'>+//     0x00000800: ADAT-B</div><div class='add'>+//     0x00000600: ADAT-A</div><div class='add'>+//     0x00000400: AES/EBU</div><div class='add'>+//     0x00000200: Word clock</div><div class='add'>+//   0x00000080: Synchronized to ADAT-B on 2nd optical interface</div><div class='add'>+//   0x00000040: Synchronized to ADAT-A on 1st optical interface</div><div class='add'>+//   0x00000020: Synchronized to AES/EBU on XLR or 2nd optical interface</div><div class='add'>+//   0x00000010: Synchronized to word clock on BNC interface</div><div class='add'>+//   0x00000008: Lock ADAT-B on 2nd optical interface</div><div class='add'>+//   0x00000004: Lock ADAT-A on 1st optical interface</div><div class='add'>+//   0x00000002: Lock AES/EBU on XLR or 2nd optical interface</div><div class='add'>+//   0x00000001: Lock word clock on BNC interface</div><div class='add'>+//</div><div class='add'>+// The pattern for rate bits:</div><div class='add'>+//   0x00: 32.0 kHz</div><div class='add'>+//   0x01: 44.1 kHz</div><div class='add'>+//   0x02: 48.0 kHz</div><div class='add'>+//   0x04: 64.0 kHz</div><div class='add'>+//   0x05: 88.2 kHz</div><div class='add'>+//   0x06: 96.0 kHz</div><div class='add'>+//   0x08: 128.0 kHz</div><div class='add'>+//   0x09: 176.4 kHz</div><div class='add'>+//   0x0a: 192.0 kHz</div><div class='add'>+static int parse_clock_bits(u32 data, unsigned int *rate,</div><div class='add'>+			    enum snd_ff_clock_src *src,</div><div class='add'>+			    enum snd_ff_unit_version unit_version)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		unsigned int rate;</div><div class='add'>+		u32 flag;</div><div class='add'>+	} *rate_entry, rate_entries[] = {</div><div class='add'>+		{ 32000,	0x00, },</div><div class='add'>+		{ 44100,	0x01, },</div><div class='add'>+		{ 48000,	0x02, },</div><div class='add'>+		{ 64000,	0x04, },</div><div class='add'>+		{ 88200,	0x05, },</div><div class='add'>+		{ 96000,	0x06, },</div><div class='add'>+		{ 128000,	0x08, },</div><div class='add'>+		{ 176400,	0x09, },</div><div class='add'>+		{ 192000,	0x0a, },</div><div class='add'>+	};</div><div class='add'>+	static const struct {</div><div class='add'>+		enum snd_ff_clock_src src;</div><div class='add'>+		u32 flag;</div><div class='add'>+	} *clk_entry, *clk_entries, ucx_clk_entries[] = {</div><div class='add'>+		{ SND_FF_CLOCK_SRC_SPDIF,	0x00000200, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_ADAT1,	0x00000400, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_WORD,	0x00000600, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_INTERNAL,	0x00000e00, },</div><div class='add'>+	}, ufx_ff802_clk_entries[] = {</div><div class='add'>+		{ SND_FF_CLOCK_SRC_WORD,	0x00000200, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_SPDIF,	0x00000400, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_ADAT1,	0x00000600, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_ADAT2,	0x00000800, },</div><div class='add'>+		{ SND_FF_CLOCK_SRC_INTERNAL,	0x00000e00, },</div><div class='add'>+	};</div><div class='add'>+	u32 rate_bits;</div><div class='add'>+	unsigned int clk_entry_count;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (unit_version == SND_FF_UNIT_VERSION_UCX) {</div><div class='add'>+		rate_bits = (data &amp; 0x0f000000) &gt;&gt; 24;</div><div class='add'>+		clk_entries = ucx_clk_entries;</div><div class='add'>+		clk_entry_count = ARRAY_SIZE(ucx_clk_entries);</div><div class='add'>+	} else {</div><div class='add'>+		rate_bits = (data &amp; 0xf0000000) &gt;&gt; 28;</div><div class='add'>+		clk_entries = ufx_ff802_clk_entries;</div><div class='add'>+		clk_entry_count = ARRAY_SIZE(ufx_ff802_clk_entries);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rate_entries); ++i) {</div><div class='add'>+		rate_entry = rate_entries + i;</div><div class='add'>+		if (rate_bits == rate_entry-&gt;flag) {</div><div class='add'>+			*rate = rate_entry-&gt;rate;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(rate_entries))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; clk_entry_count; ++i) {</div><div class='add'>+		clk_entry = clk_entries + i;</div><div class='add'>+		if ((data &amp; 0x000e00) == clk_entry-&gt;flag) {</div><div class='add'>+			*src = clk_entry-&gt;src;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == clk_entry_count)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latter_get_clock(struct snd_ff *ff, unsigned int *rate,</div><div class='add'>+			   enum snd_ff_clock_src *src)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 LATTER_SYNC_STATUS, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = le32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	return parse_clock_bits(data, rate, src, ff-&gt;unit_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latter_switch_fetching_mode(struct snd_ff *ff, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		data = 0x00000000;</div><div class='add'>+	else</div><div class='add'>+		data = 0xffffffff;</div><div class='add'>+	reg = cpu_to_le32(data);</div><div class='add'>+</div><div class='add'>+	return snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  LATTER_FETCH_MODE, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latter_allocate_resources(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	enum snd_ff_stream_mode mode;</div><div class='add'>+	unsigned int code;</div><div class='add'>+	__le32 reg;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Set the number of data blocks transferred in a second.</div><div class='add'>+	if (rate % 48000 == 0)</div><div class='add'>+		code = 0x04;</div><div class='add'>+	else if (rate % 44100 == 0)</div><div class='add'>+		code = 0x02;</div><div class='add'>+	else if (rate % 32000 == 0)</div><div class='add'>+		code = 0x00;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rate &gt;= 64000 &amp;&amp; rate &lt; 128000)</div><div class='add'>+		code |= 0x08;</div><div class='add'>+	else if (rate &gt;= 128000)</div><div class='add'>+		code |= 0x10;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(code);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 LATTER_STF, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Confirm to shift transmission clock.</div><div class='add'>+	count = 0;</div><div class='add'>+	while (count++ &lt; 10) {</div><div class='add'>+		unsigned int curr_rate;</div><div class='add'>+		enum snd_ff_clock_src src;</div><div class='add'>+</div><div class='add'>+		err = latter_get_clock(ff, &amp;curr_rate, &amp;src);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (curr_rate == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (count &gt; 10)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amdtp_rate_table); ++i) {</div><div class='add'>+		if (rate == amdtp_rate_table[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(amdtp_rate_table))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Keep resources for in-stream.</div><div class='add'>+	ff-&gt;tx_resources.channels_mask = 0x00000000000000ffuLL;</div><div class='add'>+	err = fw_iso_resources_allocate(&amp;ff-&gt;tx_resources,</div><div class='add'>+			amdtp_stream_get_max_payload(&amp;ff-&gt;tx_stream),</div><div class='add'>+			fw_parent_device(ff-&gt;unit)-&gt;max_speed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Keep resources for out-stream.</div><div class='add'>+	ff-&gt;rx_resources.channels_mask = 0x00000000000000ffuLL;</div><div class='add'>+	err = fw_iso_resources_allocate(&amp;ff-&gt;rx_resources,</div><div class='add'>+			amdtp_stream_get_max_payload(&amp;ff-&gt;rx_stream),</div><div class='add'>+			fw_parent_device(ff-&gt;unit)-&gt;max_speed);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;tx_resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latter_begin_session(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = ff-&gt;rx_resources.generation;</div><div class='add'>+	unsigned int flag;</div><div class='add'>+	u32 data;</div><div class='add'>+	__le32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;unit_version == SND_FF_UNIT_VERSION_UCX) {</div><div class='add'>+		// For Fireface UCX. Always use the maximum number of data</div><div class='add'>+		// channels in data block of packet.</div><div class='add'>+		if (rate &gt;= 32000 &amp;&amp; rate &lt;= 48000)</div><div class='add'>+			flag = 0x92;</div><div class='add'>+		else if (rate &gt;= 64000 &amp;&amp; rate &lt;= 96000)</div><div class='add'>+			flag = 0x8e;</div><div class='add'>+		else if (rate &gt;= 128000 &amp;&amp; rate &lt;= 192000)</div><div class='add'>+			flag = 0x8c;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		// For Fireface UFX and 802. Due to bandwidth limitation on</div><div class='add'>+		// IEEE 1394a (400 Mbps), Analog 1-12 and AES are available</div><div class='add'>+		// without any ADAT at quadruple speed.</div><div class='add'>+		if (rate &gt;= 32000 &amp;&amp; rate &lt;= 48000)</div><div class='add'>+			flag = 0x9e;</div><div class='add'>+		else if (rate &gt;= 64000 &amp;&amp; rate &lt;= 96000)</div><div class='add'>+			flag = 0x96;</div><div class='add'>+		else if (rate &gt;= 128000 &amp;&amp; rate &lt;= 192000)</div><div class='add'>+			flag = 0x8e;</div><div class='add'>+		else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(ff-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;ff-&gt;tx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = fw_iso_resources_update(&amp;ff-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = (ff-&gt;tx_resources.channel &lt;&lt; 8) | ff-&gt;rx_resources.channel;</div><div class='add'>+	reg = cpu_to_le32(data);</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 LATTER_ISOC_CHANNELS, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(flag);</div><div class='add'>+	return snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  LATTER_ISOC_START, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void latter_finish_session(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_le32(0x00000000);</div><div class='add'>+	snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   LATTER_ISOC_START, &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void latter_dump_status(struct snd_ff *ff, struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		char *const label;</div><div class='add'>+		u32 locked_mask;</div><div class='add'>+		u32 synced_mask;</div><div class='add'>+	} *clk_entry, *clk_entries, ucx_clk_entries[] = {</div><div class='add'>+		{ "S/PDIF",	0x00000001, 0x00000010, },</div><div class='add'>+		{ "ADAT",	0x00000002, 0x00000020, },</div><div class='add'>+		{ "WDClk",	0x00000004, 0x00000040, },</div><div class='add'>+	}, ufx_ff802_clk_entries[] = {</div><div class='add'>+		{ "WDClk",	0x00000001, 0x00000010, },</div><div class='add'>+		{ "AES/EBU",	0x00000002, 0x00000020, },</div><div class='add'>+		{ "ADAT-A",	0x00000004, 0x00000040, },</div><div class='add'>+		{ "ADAT-B",	0x00000008, 0x00000080, },</div><div class='add'>+	};</div><div class='add'>+	__le32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_ff_clock_src src;</div><div class='add'>+	const char *label;</div><div class='add'>+	unsigned int clk_entry_count;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(ff-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 LATTER_SYNC_STATUS, &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	data = le32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "External source detection:\n");</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;unit_version == SND_FF_UNIT_VERSION_UCX) {</div><div class='add'>+		clk_entries = ucx_clk_entries;</div><div class='add'>+		clk_entry_count = ARRAY_SIZE(ucx_clk_entries);</div><div class='add'>+	} else {</div><div class='add'>+		clk_entries = ufx_ff802_clk_entries;</div><div class='add'>+		clk_entry_count = ARRAY_SIZE(ufx_ff802_clk_entries);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; clk_entry_count; ++i) {</div><div class='add'>+		clk_entry = clk_entries + i;</div><div class='add'>+		snd_iprintf(buffer, "%s: ", clk_entry-&gt;label);</div><div class='add'>+		if (data &amp; clk_entry-&gt;locked_mask) {</div><div class='add'>+			if (data &amp; clk_entry-&gt;synced_mask)</div><div class='add'>+				snd_iprintf(buffer, "sync\n");</div><div class='add'>+			else</div><div class='add'>+				snd_iprintf(buffer, "lock\n");</div><div class='add'>+		} else {</div><div class='add'>+			snd_iprintf(buffer, "none\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = parse_clock_bits(data, &amp;rate, &amp;src, ff-&gt;unit_version);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	label = snd_ff_proc_get_clk_label(src);</div><div class='add'>+	if (!label)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Referred clock: %s %d\n", label, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// NOTE: transactions are transferred within 0x00-0x7f in allocated range of</div><div class='add'>+// address. This seems to be for check of discontinuity in receiver side.</div><div class='add'>+//</div><div class='add'>+// Like Fireface 400, drivers can select one of 4 options for lower 4 bytes of</div><div class='add'>+// destination address by bit flags in quadlet register (little endian) at</div><div class='add'>+// 0x'ffff'0000'0014:</div><div class='add'>+//</div><div class='add'>+// bit flags: offset of destination address</div><div class='add'>+// - 0x00002000: 0x'....'....'0000'0000</div><div class='add'>+// - 0x00004000: 0x'....'....'0000'0080</div><div class='add'>+// - 0x00008000: 0x'....'....'0000'0100</div><div class='add'>+// - 0x00010000: 0x'....'....'0000'0180</div><div class='add'>+//</div><div class='add'>+// Drivers can suppress the device to transfer asynchronous transactions by</div><div class='add'>+// clear these bit flags.</div><div class='add'>+//</div><div class='add'>+// Actually, the register is write-only and includes the other settings such as</div><div class='add'>+// input attenuation. This driver allocates for the first option</div><div class='add'>+// (0x'....'....'0000'0000) and expects userspace application to configure the</div><div class='add'>+// register for it.</div><div class='add'>+static void latter_handle_midi_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,</div><div class='add'>+				   size_t length, u32 tstamp)</div><div class='add'>+{</div><div class='add'>+	u32 data = le32_to_cpu(*buf);</div><div class='add'>+	unsigned int index = (data &amp; 0x000000f0) &gt;&gt; 4;</div><div class='add'>+	u8 byte[3];</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= ff-&gt;spec-&gt;midi_in_ports)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (data &amp; 0x0000000f) {</div><div class='add'>+	case 0x00000008:</div><div class='add'>+	case 0x00000009:</div><div class='add'>+	case 0x0000000a:</div><div class='add'>+	case 0x0000000b:</div><div class='add'>+	case 0x0000000e:</div><div class='add'>+		len = 3;</div><div class='add'>+		break;</div><div class='add'>+	case 0x0000000c:</div><div class='add'>+	case 0x0000000d:</div><div class='add'>+		len = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		len = data &amp; 0x00000003;</div><div class='add'>+		if (len == 0)</div><div class='add'>+			len = 3;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	byte[0] = (data &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='add'>+	byte[1] = (data &amp; 0x00ff0000) &gt;&gt; 16;</div><div class='add'>+	byte[2] = (data &amp; 0xff000000) &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	substream = READ_ONCE(ff-&gt;tx_midi_substreams[index]);</div><div class='add'>+	if (substream)</div><div class='add'>+		snd_rawmidi_receive(substream, byte, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When return minus value, given argument is not MIDI status.</div><div class='add'>+ * When return 0, given argument is a beginning of system exclusive.</div><div class='add'>+ * When return the others, given argument is MIDI data.</div><div class='add'>+ */</div><div class='add'>+static inline int calculate_message_bytes(u8 status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case 0xf6:	/* Tune request. */</div><div class='add'>+	case 0xf8:	/* Timing clock. */</div><div class='add'>+	case 0xfa:	/* Start. */</div><div class='add'>+	case 0xfb:	/* Continue. */</div><div class='add'>+	case 0xfc:	/* Stop. */</div><div class='add'>+	case 0xfe:	/* Active sensing. */</div><div class='add'>+	case 0xff:	/* System reset. */</div><div class='add'>+		return 1;</div><div class='add'>+	case 0xf1:	/* MIDI time code quarter frame. */</div><div class='add'>+	case 0xf3:	/* Song select. */</div><div class='add'>+		return 2;</div><div class='add'>+	case 0xf2:	/* Song position pointer. */</div><div class='add'>+		return 3;</div><div class='add'>+	case 0xf0:	/* Exclusive. */</div><div class='add'>+		return 0;</div><div class='add'>+	case 0xf7:	/* End of exclusive. */</div><div class='add'>+		break;</div><div class='add'>+	case 0xf4:	/* Undefined. */</div><div class='add'>+	case 0xf5:	/* Undefined. */</div><div class='add'>+	case 0xf9:	/* Undefined. */</div><div class='add'>+	case 0xfd:	/* Undefined. */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		switch (status &amp; 0xf0) {</div><div class='add'>+		case 0x80:	/* Note on. */</div><div class='add'>+		case 0x90:	/* Note off. */</div><div class='add'>+		case 0xa0:	/* Polyphonic key pressure. */</div><div class='add'>+		case 0xb0:	/* Control change and Mode change. */</div><div class='add'>+		case 0xe0:	/* Pitch bend change. */</div><div class='add'>+			return 3;</div><div class='add'>+		case 0xc0:	/* Program change. */</div><div class='add'>+		case 0xd0:	/* Channel pressure. */</div><div class='add'>+			return 2;</div><div class='add'>+		default:</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int latter_fill_midi_msg(struct snd_ff *ff,</div><div class='add'>+				struct snd_rawmidi_substream *substream,</div><div class='add'>+				unsigned int port)</div><div class='add'>+{</div><div class='add'>+	u32 data = {0};</div><div class='add'>+	u8 *buf = (u8 *)&amp;data;</div><div class='add'>+	int consumed;</div><div class='add'>+</div><div class='add'>+	buf[0] = port &lt;&lt; 4;</div><div class='add'>+	consumed = snd_rawmidi_transmit_peek(substream, buf + 1, 3);</div><div class='add'>+	if (consumed &lt;= 0)</div><div class='add'>+		return consumed;</div><div class='add'>+</div><div class='add'>+	if (!ff-&gt;on_sysex[port]) {</div><div class='add'>+		if (buf[1] != 0xf0) {</div><div class='add'>+			if (consumed &lt; calculate_message_bytes(buf[1]))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			// The beginning of exclusives.</div><div class='add'>+			ff-&gt;on_sysex[port] = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf[0] |= consumed;</div><div class='add'>+	} else {</div><div class='add'>+		if (buf[1] != 0xf7) {</div><div class='add'>+			if (buf[2] == 0xf7 || buf[3] == 0xf7) {</div><div class='add'>+				// Transfer end code at next time.</div><div class='add'>+				consumed -= 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			buf[0] |= consumed;</div><div class='add'>+		} else {</div><div class='add'>+			// The end of exclusives.</div><div class='add'>+			ff-&gt;on_sysex[port] = false;</div><div class='add'>+			consumed = 1;</div><div class='add'>+			buf[0] |= 0x0f;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ff-&gt;msg_buf[port][0] = cpu_to_le32(data);</div><div class='add'>+	ff-&gt;rx_bytes[port] = consumed;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_ff_protocol snd_ff_protocol_latter = {</div><div class='add'>+	.handle_msg		= latter_handle_midi_msg,</div><div class='add'>+	.fill_midi_msg		= latter_fill_midi_msg,</div><div class='add'>+	.get_clock		= latter_get_clock,</div><div class='add'>+	.switch_fetching_mode	= latter_switch_fetching_mode,</div><div class='add'>+	.allocate_resources	= latter_allocate_resources,</div><div class='add'>+	.begin_session		= latter_begin_session,</div><div class='add'>+	.finish_session		= latter_finish_session,</div><div class='add'>+	.dump_status		= latter_dump_status,</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/fireface/ff-stream.c b/sound/firewire/fireface/ff-stream.c<br/>new file mode 100644<br/>index 000000000000..ba42490f2b0e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-stream.c</a></div><div class='hunk'>@@ -0,0 +1,276 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-stream.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+#define READY_TIMEOUT_MS	200</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_get_multiplier_mode(enum cip_sfc sfc,</div><div class='add'>+				      enum snd_ff_stream_mode *mode)</div><div class='add'>+{</div><div class='add'>+	static const enum snd_ff_stream_mode modes[] = {</div><div class='add'>+		[CIP_SFC_32000] = SND_FF_STREAM_MODE_LOW,</div><div class='add'>+		[CIP_SFC_44100] = SND_FF_STREAM_MODE_LOW,</div><div class='add'>+		[CIP_SFC_48000] = SND_FF_STREAM_MODE_LOW,</div><div class='add'>+		[CIP_SFC_88200] = SND_FF_STREAM_MODE_MID,</div><div class='add'>+		[CIP_SFC_96000] = SND_FF_STREAM_MODE_MID,</div><div class='add'>+		[CIP_SFC_176400] = SND_FF_STREAM_MODE_HIGH,</div><div class='add'>+		[CIP_SFC_192000] = SND_FF_STREAM_MODE_HIGH,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (sfc &gt;= CIP_SFC_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*mode = modes[sfc];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void finish_session(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	ff-&gt;spec-&gt;protocol-&gt;finish_session(ff);</div><div class='add'>+	ff-&gt;spec-&gt;protocol-&gt;switch_fetching_mode(ff, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_ff *ff, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	enum amdtp_stream_direction dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;ff-&gt;tx_stream) {</div><div class='add'>+		resources = &amp;ff-&gt;tx_resources;</div><div class='add'>+		dir = AMDTP_IN_STREAM;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;ff-&gt;rx_resources;</div><div class='add'>+		dir = AMDTP_OUT_STREAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(resources, ff-&gt;unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_ff_init(s, ff-&gt;unit, dir);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_destroy(resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_ff *ff, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(s);</div><div class='add'>+</div><div class='add'>+	if (s == &amp;ff-&gt;tx_stream)</div><div class='add'>+		fw_iso_resources_destroy(&amp;ff-&gt;tx_resources);</div><div class='add'>+	else</div><div class='add'>+		fw_iso_resources_destroy(&amp;ff-&gt;rx_resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_init_duplex(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(ff, &amp;ff-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(ff, &amp;ff-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(ff, &amp;ff-&gt;rx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;ff-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(ff, &amp;ff-&gt;rx_stream);</div><div class='add'>+		destroy_stream(ff, &amp;ff-&gt;tx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function should be called before starting streams or after stopping</div><div class='add'>+ * streams.</div><div class='add'>+ */</div><div class='add'>+void snd_ff_stream_destroy_duplex(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;ff-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(ff, &amp;ff-&gt;rx_stream);</div><div class='add'>+	destroy_stream(ff, &amp;ff-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_reserve_duplex(struct snd_ff *ff, unsigned int rate,</div><div class='add'>+				 unsigned int frames_per_period,</div><div class='add'>+				 unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	enum snd_ff_clock_src src;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ff-&gt;spec-&gt;protocol-&gt;get_clock(ff, &amp;curr_rate, &amp;src);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;substreams_counter == 0 || curr_rate != rate) {</div><div class='add'>+		enum snd_ff_stream_mode mode;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		amdtp_domain_stop(&amp;ff-&gt;domain);</div><div class='add'>+		finish_session(ff);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; CIP_SFC_COUNT; ++i) {</div><div class='add'>+			if (amdtp_rate_table[i] == rate)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i &gt;= CIP_SFC_COUNT)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = snd_ff_stream_get_multiplier_mode(i, &amp;mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = amdtp_ff_set_parameters(&amp;ff-&gt;tx_stream, rate,</div><div class='add'>+					ff-&gt;spec-&gt;pcm_capture_channels[mode]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = amdtp_ff_set_parameters(&amp;ff-&gt;rx_stream, rate,</div><div class='add'>+					ff-&gt;spec-&gt;pcm_playback_channels[mode]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = ff-&gt;spec-&gt;protocol-&gt;allocate_resources(ff, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;ff-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;ff-&gt;tx_resources);</div><div class='add'>+			fw_iso_resources_free(&amp;ff-&gt;rx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;substreams_counter == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;ff-&gt;tx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;ff-&gt;rx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;ff-&gt;domain);</div><div class='add'>+		finish_session(ff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Regardless of current source of clock signal, drivers transfer some</div><div class='add'>+	 * packets. Then, the device transfers packets.</div><div class='add'>+	 */</div><div class='add'>+	if (!amdtp_stream_running(&amp;ff-&gt;rx_stream)) {</div><div class='add'>+		int spd = fw_parent_device(ff-&gt;unit)-&gt;max_speed;</div><div class='add'>+</div><div class='add'>+		err = ff-&gt;spec-&gt;protocol-&gt;begin_session(ff, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;ff-&gt;domain, &amp;ff-&gt;rx_stream,</div><div class='add'>+					      ff-&gt;rx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;ff-&gt;domain, &amp;ff-&gt;tx_stream,</div><div class='add'>+					      ff-&gt;tx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		// NOTE: The device doesn't transfer packets unless receiving any packet. The</div><div class='add'>+		// sequence of tx packets includes cycle skip corresponding to empty packet or</div><div class='add'>+		// NODATA packet in IEC 61883-1/6. The sequence of the number of data blocks per</div><div class='add'>+		// packet is important for media clock recovery.</div><div class='add'>+		err = amdtp_domain_start(&amp;ff-&gt;domain, 0, true, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;ff-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = ff-&gt;spec-&gt;protocol-&gt;switch_fetching_mode(ff, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;ff-&gt;domain);</div><div class='add'>+	finish_session(ff);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_stream_stop_duplex(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	if (ff-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;ff-&gt;domain);</div><div class='add'>+		finish_session(ff);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;ff-&gt;rx_resources);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_stream_update_duplex(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_stop(&amp;ff-&gt;domain);</div><div class='add'>+</div><div class='add'>+	// The device discontinue to transfer packets.</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;ff-&gt;tx_stream);</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;ff-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_stream_lock_changed(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	ff-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;ff-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_lock_try(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (ff-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (ff-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_ff_stream_lock_changed(ff);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_stream_lock_release(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;ff-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(ff-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--ff-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_ff_stream_lock_changed(ff);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff-transaction.c b/sound/firewire/fireface/ff-transaction.c<br/>new file mode 100644<br/>index 000000000000..436da0a3bdcc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff-transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff-transaction.c</a></div><div class='hunk'>@@ -0,0 +1,233 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff-transaction.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+static void finish_transmit_midi_msg(struct snd_ff *ff, unsigned int port,</div><div class='add'>+				     int rcode)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream =</div><div class='add'>+				READ_ONCE(ff-&gt;rx_midi_substreams[port]);</div><div class='add'>+</div><div class='add'>+	if (rcode_is_permanent_error(rcode)) {</div><div class='add'>+		ff-&gt;rx_midi_error[port] = true;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rcode != RCODE_COMPLETE) {</div><div class='add'>+		/* Transfer the message again, immediately. */</div><div class='add'>+		ff-&gt;next_ktime[port] = 0;</div><div class='add'>+		schedule_work(&amp;ff-&gt;rx_midi_work[port]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_transmit_ack(substream, ff-&gt;rx_bytes[port]);</div><div class='add'>+	ff-&gt;rx_bytes[port] = 0;</div><div class='add'>+</div><div class='add'>+	if (!snd_rawmidi_transmit_empty(substream))</div><div class='add'>+		schedule_work(&amp;ff-&gt;rx_midi_work[port]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_transmit_midi0_msg(struct fw_card *card, int rcode,</div><div class='add'>+				      void *data, size_t length,</div><div class='add'>+				      void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff =</div><div class='add'>+		container_of(callback_data, struct snd_ff, transactions[0]);</div><div class='add'>+	finish_transmit_midi_msg(ff, 0, rcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_transmit_midi1_msg(struct fw_card *card, int rcode,</div><div class='add'>+				      void *data, size_t length,</div><div class='add'>+				      void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff =</div><div class='add'>+		container_of(callback_data, struct snd_ff, transactions[1]);</div><div class='add'>+	finish_transmit_midi_msg(ff, 1, rcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void transmit_midi_msg(struct snd_ff *ff, unsigned int port)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *substream =</div><div class='add'>+			READ_ONCE(ff-&gt;rx_midi_substreams[port]);</div><div class='add'>+	int quad_count;</div><div class='add'>+</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(ff-&gt;unit);</div><div class='add'>+	unsigned long long addr;</div><div class='add'>+	int generation;</div><div class='add'>+	fw_transaction_callback_t callback;</div><div class='add'>+	int tcode;</div><div class='add'>+</div><div class='add'>+	if (substream == NULL || snd_rawmidi_transmit_empty(substream))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;rx_bytes[port] &gt; 0 || ff-&gt;rx_midi_error[port])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Do it in next chance. */</div><div class='add'>+	if (ktime_after(ff-&gt;next_ktime[port], ktime_get())) {</div><div class='add'>+		schedule_work(&amp;ff-&gt;rx_midi_work[port]);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	quad_count = ff-&gt;spec-&gt;protocol-&gt;fill_midi_msg(ff, substream, port);</div><div class='add'>+	if (quad_count &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (port == 0) {</div><div class='add'>+		addr = ff-&gt;spec-&gt;midi_rx_addrs[0];</div><div class='add'>+		callback = finish_transmit_midi0_msg;</div><div class='add'>+	} else {</div><div class='add'>+		addr = ff-&gt;spec-&gt;midi_rx_addrs[1];</div><div class='add'>+		callback = finish_transmit_midi1_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set interval to next transaction. */</div><div class='add'>+	ff-&gt;next_ktime[port] = ktime_add_ns(ktime_get(),</div><div class='add'>+			ff-&gt;rx_bytes[port] * 8 * (NSEC_PER_SEC / 31250));</div><div class='add'>+</div><div class='add'>+	if (quad_count == 1)</div><div class='add'>+		tcode = TCODE_WRITE_QUADLET_REQUEST;</div><div class='add'>+	else</div><div class='add'>+		tcode = TCODE_WRITE_BLOCK_REQUEST;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In Linux FireWire core, when generation is updated with memory</div><div class='add'>+	 * barrier, node id has already been updated. In this module, After</div><div class='add'>+	 * this smp_rmb(), load/store instructions to memory are completed.</div><div class='add'>+	 * Thus, both of generation and node id are available with recent</div><div class='add'>+	 * values. This is a light-serialization solution to handle bus reset</div><div class='add'>+	 * events on IEEE 1394 bus.</div><div class='add'>+	 */</div><div class='add'>+	generation = fw_dev-&gt;generation;</div><div class='add'>+	smp_rmb();</div><div class='add'>+	fw_send_request(fw_dev-&gt;card, &amp;ff-&gt;transactions[port], tcode,</div><div class='add'>+			fw_dev-&gt;node_id, generation, fw_dev-&gt;max_speed,</div><div class='add'>+			addr, &amp;ff-&gt;msg_buf[port], quad_count * 4,</div><div class='add'>+			callback, &amp;ff-&gt;transactions[port]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void transmit_midi0_msg(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = container_of(work, struct snd_ff, rx_midi_work[0]);</div><div class='add'>+</div><div class='add'>+	transmit_midi_msg(ff, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void transmit_midi1_msg(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = container_of(work, struct snd_ff, rx_midi_work[1]);</div><div class='add'>+</div><div class='add'>+	transmit_midi_msg(ff, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_msg(struct fw_card *card, struct fw_request *request, int tcode,</div><div class='add'>+		       int destination, int source, int generation, unsigned long long offset,</div><div class='add'>+		       void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = callback_data;</div><div class='add'>+	__le32 *buf = data;</div><div class='add'>+	u32 tstamp = fw_request_get_timestamp(request);</div><div class='add'>+</div><div class='add'>+	fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+</div><div class='add'>+	offset -= ff-&gt;async_handler.offset;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ff-&gt;lock);</div><div class='add'>+	ff-&gt;spec-&gt;protocol-&gt;handle_msg(ff, (unsigned int)offset, buf, length, tstamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int allocate_own_address(struct snd_ff *ff, int i)</div><div class='add'>+{</div><div class='add'>+	struct fw_address_region midi_msg_region;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ff-&gt;async_handler.length = ff-&gt;spec-&gt;midi_addr_range;</div><div class='add'>+	ff-&gt;async_handler.address_callback = handle_msg;</div><div class='add'>+	ff-&gt;async_handler.callback_data = ff;</div><div class='add'>+</div><div class='add'>+	midi_msg_region.start = 0x000100000000ull * i;</div><div class='add'>+	midi_msg_region.end = midi_msg_region.start + ff-&gt;async_handler.length;</div><div class='add'>+</div><div class='add'>+	err = fw_core_add_address_handler(&amp;ff-&gt;async_handler, &amp;midi_msg_region);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		/* Controllers are allowed to register this region. */</div><div class='add'>+		if (ff-&gt;async_handler.offset &amp; 0x0000ffffffff) {</div><div class='add'>+			fw_core_remove_address_handler(&amp;ff-&gt;async_handler);</div><div class='add'>+			err = -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Controllers are allowed to register higher 4 bytes of destination address to</div><div class='add'>+// receive asynchronous transactions for MIDI messages, while the way to</div><div class='add'>+// register lower 4 bytes of address is different depending on protocols. For</div><div class='add'>+// details, please refer to comments in protocol implementations.</div><div class='add'>+//</div><div class='add'>+// This driver expects userspace applications to configure registers for the</div><div class='add'>+// lower address because in most cases such registers has the other settings.</div><div class='add'>+int snd_ff_transaction_reregister(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	struct fw_card *fw_card = fw_parent_device(ff-&gt;unit)-&gt;card;</div><div class='add'>+	u32 addr;</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Controllers are allowed to register its node ID and upper 2 byte of</div><div class='add'>+	 * local address to listen asynchronous transactions.</div><div class='add'>+	 */</div><div class='add'>+	addr = (fw_card-&gt;node_id &lt;&lt; 16) | (ff-&gt;async_handler.offset &gt;&gt; 32);</div><div class='add'>+	reg = cpu_to_le32(addr);</div><div class='add'>+	return snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  ff-&gt;spec-&gt;midi_high_addr,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_ff_transaction_register(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Allocate in Memory Space of IEC 13213, but lower 4 byte in LSB should</div><div class='add'>+	 * be zero due to device specification.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 0xffff; i++) {</div><div class='add'>+		err = allocate_own_address(ff, i);</div><div class='add'>+		if (err != -EBUSY &amp;&amp; err != -EAGAIN)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_transaction_reregister(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;ff-&gt;rx_midi_work[0], transmit_midi0_msg);</div><div class='add'>+	INIT_WORK(&amp;ff-&gt;rx_midi_work[1], transmit_midi1_msg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_ff_transaction_unregister(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	__le32 reg;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;async_handler.callback_data == NULL)</div><div class='add'>+		return;</div><div class='add'>+	ff-&gt;async_handler.callback_data = NULL;</div><div class='add'>+</div><div class='add'>+	/* Release higher 4 bytes of address. */</div><div class='add'>+	reg = cpu_to_le32(0x00000000);</div><div class='add'>+	snd_fw_transaction(ff-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   ff-&gt;spec-&gt;midi_high_addr,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	fw_core_remove_address_handler(&amp;ff-&gt;async_handler);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireface/ff.c b/sound/firewire/fireface/ff.c<br/>new file mode 100644<br/>index 000000000000..5d2c4fbf4434<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff.c</a></div><div class='hunk'>@@ -0,0 +1,266 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ff.c - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ff.h"</div><div class='add'>+</div><div class='add'>+#define OUI_RME	0x000a35</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("RME Fireface series Driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static void name_card(struct snd_ff *ff)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(ff-&gt;unit);</div><div class='add'>+	static const char *const names[] = {</div><div class='add'>+		[SND_FF_UNIT_VERSION_FF800]	= "Fireface800",</div><div class='add'>+		[SND_FF_UNIT_VERSION_FF400]	= "Fireface400",</div><div class='add'>+		[SND_FF_UNIT_VERSION_UFX]	= "FirefaceUFX",</div><div class='add'>+		[SND_FF_UNIT_VERSION_UCX]	= "FirefaceUCX",</div><div class='add'>+		[SND_FF_UNIT_VERSION_802]	= "Fireface802",</div><div class='add'>+	};</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	name = names[ff-&gt;unit_version];</div><div class='add'>+</div><div class='add'>+	strscpy(ff-&gt;card-&gt;driver, "Fireface");</div><div class='add'>+	strscpy(ff-&gt;card-&gt;shortname, name);</div><div class='add'>+	strscpy(ff-&gt;card-&gt;mixername, name);</div><div class='add'>+	snprintf(ff-&gt;card-&gt;longname, sizeof(ff-&gt;card-&gt;longname),</div><div class='add'>+		 "RME %s, GUID %08x%08x at %s, S%d", name,</div><div class='add'>+		 fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		 dev_name(&amp;ff-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ff_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_ff_stream_destroy_duplex(ff);</div><div class='add'>+	snd_ff_transaction_unregister(ff);</div><div class='add'>+</div><div class='add'>+	kfree(ff-&gt;msg_parser);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;ff-&gt;mutex);</div><div class='add'>+	fw_unit_put(ff-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ff_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_ff *ff;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*ff), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = ff_card_free;</div><div class='add'>+</div><div class='add'>+	ff = card-&gt;private_data;</div><div class='add'>+	ff-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, ff);</div><div class='add'>+	ff-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ff-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;ff-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;ff-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	ff-&gt;unit_version = entry-&gt;version;</div><div class='add'>+	ff-&gt;spec = (const struct snd_ff_spec *)entry-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_transaction_register(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	name_card(ff);</div><div class='add'>+</div><div class='add'>+	err = snd_ff_stream_init_duplex(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_ff_proc_init(ff);</div><div class='add'>+</div><div class='add'>+	err = snd_ff_create_midi_devices(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_create_pcm_devices(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_ff_create_hwdep_devices(ff);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (ff-&gt;spec-&gt;protocol-&gt;msg_parser_size &gt; 0) {</div><div class='add'>+		ff-&gt;msg_parser = kzalloc(ff-&gt;spec-&gt;protocol-&gt;msg_parser_size, GFP_KERNEL);</div><div class='add'>+		if (!ff-&gt;msg_parser) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ff_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	snd_ff_transaction_reregister(ff);</div><div class='add'>+</div><div class='add'>+	snd_ff_stream_update_duplex(ff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_ff_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_ff *ff = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(ff-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_ff_spec spec_ff800 = {</div><div class='add'>+	.pcm_capture_channels = {28, 20, 12},</div><div class='add'>+	.pcm_playback_channels = {28, 20, 12},</div><div class='add'>+	.midi_in_ports = 1,</div><div class='add'>+	.midi_out_ports = 1,</div><div class='add'>+	.protocol = &amp;snd_ff_protocol_ff800,</div><div class='add'>+	.midi_high_addr = 0x000200000320ull,</div><div class='add'>+	.midi_addr_range = 12,</div><div class='add'>+	.midi_rx_addrs = {0x000080180000ull, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ff_spec spec_ff400 = {</div><div class='add'>+	.pcm_capture_channels = {18, 14, 10},</div><div class='add'>+	.pcm_playback_channels = {18, 14, 10},</div><div class='add'>+	.midi_in_ports = 2,</div><div class='add'>+	.midi_out_ports = 2,</div><div class='add'>+	.protocol = &amp;snd_ff_protocol_ff400,</div><div class='add'>+	.midi_high_addr = 0x0000801003f4ull,</div><div class='add'>+	.midi_addr_range = SND_FF_MAXIMIM_MIDI_QUADS * 4,</div><div class='add'>+	.midi_rx_addrs = {0x000080180000ull, 0x000080190000ull},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ff_spec spec_ucx = {</div><div class='add'>+	.pcm_capture_channels = {18, 14, 12},</div><div class='add'>+	.pcm_playback_channels = {18, 14, 12},</div><div class='add'>+	.midi_in_ports = 2,</div><div class='add'>+	.midi_out_ports = 2,</div><div class='add'>+	.protocol = &amp;snd_ff_protocol_latter,</div><div class='add'>+	.midi_high_addr = 0xffff00000034ull,</div><div class='add'>+	.midi_addr_range = 0x80,</div><div class='add'>+	.midi_rx_addrs = {0xffff00000030ull, 0xffff00000030ull},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ff_spec spec_ufx_802 = {</div><div class='add'>+	.pcm_capture_channels = {30, 22, 14},</div><div class='add'>+	.pcm_playback_channels = {30, 22, 14},</div><div class='add'>+	.midi_in_ports = 1,</div><div class='add'>+	.midi_out_ports = 1,</div><div class='add'>+	.protocol = &amp;snd_ff_protocol_latter,</div><div class='add'>+	.midi_high_addr = 0xffff00000034ull,</div><div class='add'>+	.midi_addr_range = 0x80,</div><div class='add'>+	.midi_rx_addrs = {0xffff00000030ull, 0xffff00000030ull},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id snd_ff_id_table[] = {</div><div class='add'>+	/* Fireface 800 */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_RME,</div><div class='add'>+		.specifier_id	= OUI_RME,</div><div class='add'>+		.version	= SND_FF_UNIT_VERSION_FF800,</div><div class='add'>+		.model_id	= 0x101800,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)&amp;spec_ff800,</div><div class='add'>+	},</div><div class='add'>+	/* Fireface 400 */</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_RME,</div><div class='add'>+		.specifier_id	= OUI_RME,</div><div class='add'>+		.version	= SND_FF_UNIT_VERSION_FF400,</div><div class='add'>+		.model_id	= 0x101800,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)&amp;spec_ff400,</div><div class='add'>+	},</div><div class='add'>+	// Fireface UFX.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_RME,</div><div class='add'>+		.specifier_id	= OUI_RME,</div><div class='add'>+		.version	= SND_FF_UNIT_VERSION_UFX,</div><div class='add'>+		.model_id	= 0x101800,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)&amp;spec_ufx_802,</div><div class='add'>+	},</div><div class='add'>+	// Fireface UCX.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_RME,</div><div class='add'>+		.specifier_id	= OUI_RME,</div><div class='add'>+		.version	= SND_FF_UNIT_VERSION_UCX,</div><div class='add'>+		.model_id	= 0x101800,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)&amp;spec_ucx,</div><div class='add'>+	},</div><div class='add'>+	// Fireface 802.</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION |</div><div class='add'>+				  IEEE1394_MATCH_MODEL_ID,</div><div class='add'>+		.vendor_id	= OUI_RME,</div><div class='add'>+		.specifier_id	= OUI_RME,</div><div class='add'>+		.version	= SND_FF_UNIT_VERSION_802,</div><div class='add'>+		.model_id	= 0x101800,</div><div class='add'>+		.driver_data	= (kernel_ulong_t)&amp;spec_ufx_802,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, snd_ff_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver ff_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = snd_ff_probe,</div><div class='add'>+	.update   = snd_ff_update,</div><div class='add'>+	.remove   = snd_ff_remove,</div><div class='add'>+	.id_table = snd_ff_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_ff_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;ff_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_ff_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;ff_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_ff_init);</div><div class='add'>+module_exit(snd_ff_exit);</div><div class='head'>diff --git a/sound/firewire/fireface/ff.h b/sound/firewire/fireface/ff.h<br/>new file mode 100644<br/>index 000000000000..7e42f5778a8a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireface/ff.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireface/ff.h</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * ff.h - a part of driver for RME Fireface series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_FIREFACE_H_INCLUDED</div><div class='add'>+#define SOUND_FIREFACE_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../amdtp-stream.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+</div><div class='add'>+#define SND_FF_MAXIMIM_MIDI_QUADS	9</div><div class='add'>+#define SND_FF_IN_MIDI_PORTS		2</div><div class='add'>+#define SND_FF_OUT_MIDI_PORTS		2</div><div class='add'>+</div><div class='add'>+enum snd_ff_unit_version {</div><div class='add'>+	SND_FF_UNIT_VERSION_FF800	= 0x000001,</div><div class='add'>+	SND_FF_UNIT_VERSION_FF400	= 0x000002,</div><div class='add'>+	SND_FF_UNIT_VERSION_UFX		= 0x000003,</div><div class='add'>+	SND_FF_UNIT_VERSION_UCX		= 0x000004,</div><div class='add'>+	SND_FF_UNIT_VERSION_802		= 0x000005,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_ff_stream_mode {</div><div class='add'>+	SND_FF_STREAM_MODE_LOW = 0,</div><div class='add'>+	SND_FF_STREAM_MODE_MID,</div><div class='add'>+	SND_FF_STREAM_MODE_HIGH,</div><div class='add'>+	SND_FF_STREAM_MODE_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ff_protocol;</div><div class='add'>+struct snd_ff_spec {</div><div class='add'>+	const unsigned int pcm_capture_channels[SND_FF_STREAM_MODE_COUNT];</div><div class='add'>+	const unsigned int pcm_playback_channels[SND_FF_STREAM_MODE_COUNT];</div><div class='add'>+</div><div class='add'>+	unsigned int midi_in_ports;</div><div class='add'>+	unsigned int midi_out_ports;</div><div class='add'>+</div><div class='add'>+	const struct snd_ff_protocol *protocol;</div><div class='add'>+	u64 midi_high_addr;</div><div class='add'>+	u8 midi_addr_range;</div><div class='add'>+	u64 midi_rx_addrs[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ff {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	enum snd_ff_unit_version unit_version;</div><div class='add'>+	const struct snd_ff_spec *spec;</div><div class='add'>+</div><div class='add'>+	/* To handle MIDI tx. */</div><div class='add'>+	struct snd_rawmidi_substream *tx_midi_substreams[SND_FF_IN_MIDI_PORTS];</div><div class='add'>+	struct fw_address_handler async_handler;</div><div class='add'>+</div><div class='add'>+	/* TO handle MIDI rx. */</div><div class='add'>+	struct snd_rawmidi_substream *rx_midi_substreams[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	bool on_sysex[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	__le32 msg_buf[SND_FF_OUT_MIDI_PORTS][SND_FF_MAXIMIM_MIDI_QUADS];</div><div class='add'>+	struct work_struct rx_midi_work[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	struct fw_transaction transactions[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	ktime_t next_ktime[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	bool rx_midi_error[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+	unsigned int rx_bytes[SND_FF_OUT_MIDI_PORTS];</div><div class='add'>+</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	struct fw_iso_resources tx_resources;</div><div class='add'>+	struct fw_iso_resources rx_resources;</div><div class='add'>+</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+</div><div class='add'>+	void *msg_parser;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_ff_clock_src {</div><div class='add'>+	SND_FF_CLOCK_SRC_INTERNAL,</div><div class='add'>+	SND_FF_CLOCK_SRC_SPDIF,</div><div class='add'>+	SND_FF_CLOCK_SRC_ADAT1,</div><div class='add'>+	SND_FF_CLOCK_SRC_ADAT2,</div><div class='add'>+	SND_FF_CLOCK_SRC_WORD,</div><div class='add'>+	SND_FF_CLOCK_SRC_LTC,</div><div class='add'>+	/* TODO: perhaps TCO exists. */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ff_protocol {</div><div class='add'>+	size_t msg_parser_size;</div><div class='add'>+	bool (*has_msg)(struct snd_ff *ff);</div><div class='add'>+	long (*copy_msg_to_user)(struct snd_ff *ff, char __user *buf, long count);</div><div class='add'>+	void (*handle_msg)(struct snd_ff *ff, unsigned int offset, const __le32 *buf,</div><div class='add'>+			   size_t length, u32 tstamp);</div><div class='add'>+	int (*fill_midi_msg)(struct snd_ff *ff,</div><div class='add'>+			     struct snd_rawmidi_substream *substream,</div><div class='add'>+			     unsigned int port);</div><div class='add'>+	int (*get_clock)(struct snd_ff *ff, unsigned int *rate,</div><div class='add'>+			 enum snd_ff_clock_src *src);</div><div class='add'>+	int (*switch_fetching_mode)(struct snd_ff *ff, bool enable);</div><div class='add'>+	int (*allocate_resources)(struct snd_ff *ff, unsigned int rate);</div><div class='add'>+	int (*begin_session)(struct snd_ff *ff, unsigned int rate);</div><div class='add'>+	void (*finish_session)(struct snd_ff *ff);</div><div class='add'>+	void (*dump_status)(struct snd_ff *ff, struct snd_info_buffer *buffer);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct snd_ff_protocol snd_ff_protocol_ff800;</div><div class='add'>+extern const struct snd_ff_protocol snd_ff_protocol_ff400;</div><div class='add'>+extern const struct snd_ff_protocol snd_ff_protocol_latter;</div><div class='add'>+</div><div class='add'>+int snd_ff_transaction_register(struct snd_ff *ff);</div><div class='add'>+int snd_ff_transaction_reregister(struct snd_ff *ff);</div><div class='add'>+void snd_ff_transaction_unregister(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+int amdtp_ff_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			    unsigned int pcm_channels);</div><div class='add'>+int amdtp_ff_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				    struct snd_pcm_runtime *runtime);</div><div class='add'>+int amdtp_ff_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		  enum amdtp_stream_direction dir);</div><div class='add'>+</div><div class='add'>+int snd_ff_stream_get_multiplier_mode(enum cip_sfc sfc,</div><div class='add'>+				      enum snd_ff_stream_mode *mode);</div><div class='add'>+int snd_ff_stream_init_duplex(struct snd_ff *ff);</div><div class='add'>+void snd_ff_stream_destroy_duplex(struct snd_ff *ff);</div><div class='add'>+int snd_ff_stream_reserve_duplex(struct snd_ff *ff, unsigned int rate,</div><div class='add'>+				 unsigned int frames_per_period,</div><div class='add'>+				 unsigned int frames_per_buffer);</div><div class='add'>+int snd_ff_stream_start_duplex(struct snd_ff *ff, unsigned int rate);</div><div class='add'>+void snd_ff_stream_stop_duplex(struct snd_ff *ff);</div><div class='add'>+void snd_ff_stream_update_duplex(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+void snd_ff_stream_lock_changed(struct snd_ff *ff);</div><div class='add'>+int snd_ff_stream_lock_try(struct snd_ff *ff);</div><div class='add'>+void snd_ff_stream_lock_release(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+void snd_ff_proc_init(struct snd_ff *ff);</div><div class='add'>+const char *snd_ff_proc_get_clk_label(enum snd_ff_clock_src src);</div><div class='add'>+</div><div class='add'>+int snd_ff_create_midi_devices(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+int snd_ff_create_pcm_devices(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+int snd_ff_create_hwdep_devices(struct snd_ff *ff);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/fireworks/Makefile b/sound/firewire/fireworks/Makefile<br/>new file mode 100644<br/>index 000000000000..baaf3066c9b1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-fireworks-y := fireworks_transaction.o fireworks_command.o \</div><div class='add'>+		      fireworks_stream.o fireworks_proc.o fireworks_midi.o \</div><div class='add'>+		      fireworks_pcm.o fireworks_hwdep.o fireworks.o</div><div class='add'>+obj-$(CONFIG_SND_FIREWORKS) += snd-fireworks.o</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c<br/>new file mode 100644<br/>index 000000000000..3378c7dce88a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks.c</a></div><div class='hunk'>@@ -0,0 +1,366 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2010 Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fireworks is a board module which Echo Audio produced. This module consists</div><div class='add'>+ * of three chipsets:</div><div class='add'>+ *  - Communication chipset for IEEE1394 PHY/Link and IEC 61883-1/6</div><div class='add'>+ *  - DSP or/and FPGA for signal processing</div><div class='add'>+ *  - Flash Memory to store firmwares</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fireworks.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Echo Fireworks driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static int index[SNDRV_CARDS]	= SNDRV_DEFAULT_IDX;</div><div class='add'>+static char *id[SNDRV_CARDS]	= SNDRV_DEFAULT_STR;</div><div class='add'>+static bool enable[SNDRV_CARDS]	= SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+unsigned int snd_efw_resp_buf_size	= 1024;</div><div class='add'>+bool snd_efw_resp_buf_debug		= false;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "card index");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "enable Fireworks sound card");</div><div class='add'>+module_param_named(resp_buf_size, snd_efw_resp_buf_size, uint, 0444);</div><div class='add'>+MODULE_PARM_DESC(resp_buf_size,</div><div class='add'>+		 "response buffer size (max 4096, default 1024)");</div><div class='add'>+module_param_named(resp_buf_debug, snd_efw_resp_buf_debug, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(resp_buf_debug, "store all responses to buffer");</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(devices_mutex);</div><div class='add'>+static DECLARE_BITMAP(devices_used, SNDRV_CARDS);</div><div class='add'>+</div><div class='add'>+#define VENDOR_LOUD			0x000ff2</div><div class='add'>+#define  MODEL_MACKIE_400F		0x00400f</div><div class='add'>+#define  MODEL_MACKIE_1200F		0x01200f</div><div class='add'>+</div><div class='add'>+#define VENDOR_ECHO			0x001486</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_12	0x00af12</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_12HD	0x0af12d</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_12_APPLE	0x0af12a</div><div class='add'>+/* This is applied for AudioFire8 (until 2009 July) */</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_8		0x000af8</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_2		0x000af2</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_4		0x000af4</div><div class='add'>+/* AudioFire9 is applied for AudioFire8(since 2009 July) and AudioFirePre8 */</div><div class='add'>+#define  MODEL_ECHO_AUDIOFIRE_9		0x000af9</div><div class='add'>+/* unknown as product */</div><div class='add'>+#define  MODEL_ECHO_FIREWORKS_8		0x0000f8</div><div class='add'>+#define  MODEL_ECHO_FIREWORKS_HDMI	0x00afd1</div><div class='add'>+</div><div class='add'>+#define VENDOR_GIBSON			0x00075b</div><div class='add'>+/* for Robot Interface Pack of Dark Fire, Dusk Tiger, Les Paul Standard 2010 */</div><div class='add'>+#define  MODEL_GIBSON_RIP		0x00afb2</div><div class='add'>+/* unknown as product */</div><div class='add'>+#define  MODEL_GIBSON_GOLDTOP		0x00afb9</div><div class='add'>+</div><div class='add'>+/* part of hardware capability flags */</div><div class='add'>+#define FLAG_RESP_ADDR_CHANGABLE	0</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_hardware_info(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(efw-&gt;unit);</div><div class='add'>+	struct snd_efw_hwinfo *hwinfo;</div><div class='add'>+	char version[12] = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hwinfo = kzalloc(sizeof(struct snd_efw_hwinfo), GFP_KERNEL);</div><div class='add'>+	if (hwinfo == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_command_get_hwinfo(efw, hwinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* firmware version for communication chipset */</div><div class='add'>+	snprintf(version, sizeof(version), "%u.%u",</div><div class='add'>+		 (hwinfo-&gt;arm_version &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+		 (hwinfo-&gt;arm_version &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+	efw-&gt;firmware_version = hwinfo-&gt;arm_version;</div><div class='add'>+</div><div class='add'>+	strscpy(efw-&gt;card-&gt;driver, "Fireworks");</div><div class='add'>+	strscpy(efw-&gt;card-&gt;shortname, hwinfo-&gt;model_name);</div><div class='add'>+	strscpy(efw-&gt;card-&gt;mixername, hwinfo-&gt;model_name);</div><div class='add'>+	scnprintf(efw-&gt;card-&gt;longname, sizeof(efw-&gt;card-&gt;longname),</div><div class='add'>+		  "%s %s v%s, GUID %08x%08x at %s, S%d",</div><div class='add'>+		  hwinfo-&gt;vendor_name, hwinfo-&gt;model_name, version,</div><div class='add'>+		  hwinfo-&gt;guid_hi, hwinfo-&gt;guid_lo,</div><div class='add'>+		  dev_name(&amp;efw-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+</div><div class='add'>+	if (hwinfo-&gt;flags &amp; BIT(FLAG_RESP_ADDR_CHANGABLE))</div><div class='add'>+		efw-&gt;resp_addr_changable = true;</div><div class='add'>+</div><div class='add'>+	efw-&gt;supported_sampling_rate = 0;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 22050)</div><div class='add'>+	 &amp;&amp; (22050 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_22050;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 32000)</div><div class='add'>+	 &amp;&amp; (32000 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_32000;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 44100)</div><div class='add'>+	 &amp;&amp; (44100 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_44100;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 48000)</div><div class='add'>+	 &amp;&amp; (48000 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_48000;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 88200)</div><div class='add'>+	 &amp;&amp; (88200 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_88200;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 96000)</div><div class='add'>+	 &amp;&amp; (96000 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_96000;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 176400)</div><div class='add'>+	 &amp;&amp; (176400 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_176400;</div><div class='add'>+	if ((hwinfo-&gt;min_sample_rate &lt;= 192000)</div><div class='add'>+	 &amp;&amp; (192000 &lt;= hwinfo-&gt;max_sample_rate))</div><div class='add'>+		efw-&gt;supported_sampling_rate |= SNDRV_PCM_RATE_192000;</div><div class='add'>+</div><div class='add'>+	/* the number of MIDI ports, not of MIDI conformant data channels */</div><div class='add'>+	if (hwinfo-&gt;midi_out_ports &gt; SND_EFW_MAX_MIDI_OUT_PORTS ||</div><div class='add'>+	    hwinfo-&gt;midi_in_ports &gt; SND_EFW_MAX_MIDI_IN_PORTS) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	efw-&gt;midi_out_ports = hwinfo-&gt;midi_out_ports;</div><div class='add'>+	efw-&gt;midi_in_ports = hwinfo-&gt;midi_in_ports;</div><div class='add'>+</div><div class='add'>+	if (hwinfo-&gt;amdtp_tx_pcm_channels    &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    hwinfo-&gt;amdtp_tx_pcm_channels_2x &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    hwinfo-&gt;amdtp_tx_pcm_channels_4x &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    hwinfo-&gt;amdtp_rx_pcm_channels    &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    hwinfo-&gt;amdtp_rx_pcm_channels_2x &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    hwinfo-&gt;amdtp_rx_pcm_channels_4x &gt; AM824_MAX_CHANNELS_FOR_PCM) {</div><div class='add'>+		err = -ENOSYS;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	efw-&gt;pcm_capture_channels[0] = hwinfo-&gt;amdtp_tx_pcm_channels;</div><div class='add'>+	efw-&gt;pcm_capture_channels[1] = hwinfo-&gt;amdtp_tx_pcm_channels_2x;</div><div class='add'>+	efw-&gt;pcm_capture_channels[2] = hwinfo-&gt;amdtp_tx_pcm_channels_4x;</div><div class='add'>+	efw-&gt;pcm_playback_channels[0] = hwinfo-&gt;amdtp_rx_pcm_channels;</div><div class='add'>+	efw-&gt;pcm_playback_channels[1] = hwinfo-&gt;amdtp_rx_pcm_channels_2x;</div><div class='add'>+	efw-&gt;pcm_playback_channels[2] = hwinfo-&gt;amdtp_rx_pcm_channels_4x;</div><div class='add'>+</div><div class='add'>+	/* Hardware metering. */</div><div class='add'>+	if (hwinfo-&gt;phys_in_grp_count  &gt; HWINFO_MAX_CAPS_GROUPS ||</div><div class='add'>+	    hwinfo-&gt;phys_out_grp_count &gt; HWINFO_MAX_CAPS_GROUPS) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	efw-&gt;phys_in = hwinfo-&gt;phys_in;</div><div class='add'>+	efw-&gt;phys_out = hwinfo-&gt;phys_out;</div><div class='add'>+	efw-&gt;phys_in_grp_count = hwinfo-&gt;phys_in_grp_count;</div><div class='add'>+	efw-&gt;phys_out_grp_count = hwinfo-&gt;phys_out_grp_count;</div><div class='add'>+	memcpy(&amp;efw-&gt;phys_in_grps, hwinfo-&gt;phys_in_grps,</div><div class='add'>+	       sizeof(struct snd_efw_phys_grp) * hwinfo-&gt;phys_in_grp_count);</div><div class='add'>+	memcpy(&amp;efw-&gt;phys_out_grps, hwinfo-&gt;phys_out_grps,</div><div class='add'>+	       sizeof(struct snd_efw_phys_grp) * hwinfo-&gt;phys_out_grp_count);</div><div class='add'>+</div><div class='add'>+	/* AudioFire8 (since 2009) and AudioFirePre8 */</div><div class='add'>+	if (hwinfo-&gt;type == MODEL_ECHO_AUDIOFIRE_9)</div><div class='add'>+		efw-&gt;is_af9 = true;</div><div class='add'>+	/* These models uses the same firmware. */</div><div class='add'>+	if (hwinfo-&gt;type == MODEL_ECHO_AUDIOFIRE_2 ||</div><div class='add'>+	    hwinfo-&gt;type == MODEL_ECHO_AUDIOFIRE_4 ||</div><div class='add'>+	    hwinfo-&gt;type == MODEL_ECHO_AUDIOFIRE_9 ||</div><div class='add'>+	    hwinfo-&gt;type == MODEL_GIBSON_RIP ||</div><div class='add'>+	    hwinfo-&gt;type == MODEL_GIBSON_GOLDTOP)</div><div class='add'>+		efw-&gt;is_fireworks3 = true;</div><div class='add'>+end:</div><div class='add'>+	kfree(hwinfo);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+efw_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;devices_mutex) {</div><div class='add'>+		clear_bit(efw-&gt;card_index, devices_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_efw_stream_destroy_duplex(efw);</div><div class='add'>+	snd_efw_transaction_remove_instance(efw);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;efw-&gt;mutex);</div><div class='add'>+	fw_unit_put(efw-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int efw_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	unsigned int card_index;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_efw *efw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// check registered cards.</div><div class='add'>+	scoped_guard(mutex, &amp;devices_mutex) {</div><div class='add'>+		for (card_index = 0; card_index &lt; SNDRV_CARDS; ++card_index) {</div><div class='add'>+			if (!test_bit(card_index, devices_used) &amp;&amp; enable[card_index])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (card_index &gt;= SNDRV_CARDS)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		err = snd_card_new(&amp;unit-&gt;device, index[card_index], id[card_index], THIS_MODULE,</div><div class='add'>+				   sizeof(*efw), &amp;card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		card-&gt;private_free = efw_card_free;</div><div class='add'>+		set_bit(card_index, devices_used);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	efw = card-&gt;private_data;</div><div class='add'>+	efw-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, efw);</div><div class='add'>+	efw-&gt;card = card;</div><div class='add'>+	efw-&gt;card_index = card_index;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;efw-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;efw-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;efw-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	// prepare response buffer.</div><div class='add'>+	snd_efw_resp_buf_size = clamp(snd_efw_resp_buf_size, SND_EFW_RESPONSE_MAXIMUM_BYTES, 4096U);</div><div class='add'>+	efw-&gt;resp_buf = devm_kzalloc(&amp;card-&gt;card_dev, snd_efw_resp_buf_size, GFP_KERNEL);</div><div class='add'>+	if (!efw-&gt;resp_buf) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	efw-&gt;pull_ptr = efw-&gt;push_ptr = efw-&gt;resp_buf;</div><div class='add'>+	snd_efw_transaction_add_instance(efw);</div><div class='add'>+</div><div class='add'>+	err = get_hardware_info(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_stream_init_duplex(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_efw_proc_init(efw);</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;midi_out_ports || efw-&gt;midi_in_ports) {</div><div class='add'>+		err = snd_efw_create_midi_devices(efw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_efw_create_pcm_devices(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_create_hwdep_device(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void efw_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	snd_efw_transaction_bus_reset(efw-&gt;unit);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;efw-&gt;mutex);</div><div class='add'>+	snd_efw_stream_update_duplex(efw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void efw_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(efw-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SPECIFIER_1394TA	0x00a02d</div><div class='add'>+#define VERSION_EFW		0x010000</div><div class='add'>+</div><div class='add'>+#define SND_EFW_DEV_ENTRY(vendor, model) \</div><div class='add'>+{ \</div><div class='add'>+	.match_flags	= IEEE1394_MATCH_VENDOR_ID | \</div><div class='add'>+			  IEEE1394_MATCH_MODEL_ID | \</div><div class='add'>+			  IEEE1394_MATCH_SPECIFIER_ID | \</div><div class='add'>+			  IEEE1394_MATCH_VERSION, \</div><div class='add'>+	.vendor_id	= vendor,\</div><div class='add'>+	.model_id	= model, \</div><div class='add'>+	.specifier_id	= SPECIFIER_1394TA, \</div><div class='add'>+	.version	= VERSION_EFW, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id efw_id_table[] = {</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_400F),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_1200F),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_8),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_12),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_12HD),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_12_APPLE),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_2),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_4),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_AUDIOFIRE_9),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_FIREWORKS_8),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_ECHO, MODEL_ECHO_FIREWORKS_HDMI),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_GIBSON, MODEL_GIBSON_RIP),</div><div class='add'>+	SND_EFW_DEV_ENTRY(VENDOR_GIBSON, MODEL_GIBSON_GOLDTOP),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, efw_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver efw_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.bus = &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = efw_probe,</div><div class='add'>+	.update   = efw_update,</div><div class='add'>+	.remove   = efw_remove,</div><div class='add'>+	.id_table = efw_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_efw_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_transaction_register();</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = driver_register(&amp;efw_driver.driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_efw_transaction_unregister();</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_efw_exit(void)</div><div class='add'>+{</div><div class='add'>+	snd_efw_transaction_unregister();</div><div class='add'>+	driver_unregister(&amp;efw_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_efw_init);</div><div class='add'>+module_exit(snd_efw_exit);</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h<br/>new file mode 100644<br/>index 000000000000..c8d5879efe28<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks.h</a></div><div class='hunk'>@@ -0,0 +1,227 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * fireworks.h - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2010 Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+#ifndef SOUND_FIREWORKS_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWORKS_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../packets-buffer.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+#include "../amdtp-am824.h"</div><div class='add'>+#include "../cmp.h"</div><div class='add'>+#include "../lib.h"</div><div class='add'>+</div><div class='add'>+#define SND_EFW_MAX_MIDI_OUT_PORTS	2</div><div class='add'>+#define SND_EFW_MAX_MIDI_IN_PORTS	2</div><div class='add'>+</div><div class='add'>+#define SND_EFW_MULTIPLIER_MODES	3</div><div class='add'>+#define HWINFO_NAME_SIZE_BYTES		32</div><div class='add'>+#define HWINFO_MAX_CAPS_GROUPS		8</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This should be greater than maximum bytes for EFW response content.</div><div class='add'>+ * Currently response against command for isochronous channel mapping is</div><div class='add'>+ * confirmed to be the maximum one. But for flexibility, use maximum data</div><div class='add'>+ * payload for asynchronous primary packets at S100 (Cable base rate) in</div><div class='add'>+ * IEEE Std 1394-1995.</div><div class='add'>+ */</div><div class='add'>+#define SND_EFW_RESPONSE_MAXIMUM_BYTES	0x200U</div><div class='add'>+</div><div class='add'>+extern unsigned int snd_efw_resp_buf_size;</div><div class='add'>+extern bool snd_efw_resp_buf_debug;</div><div class='add'>+</div><div class='add'>+struct snd_efw_phys_grp {</div><div class='add'>+	u8 type;	/* see enum snd_efw_grp_type */</div><div class='add'>+	u8 count;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct snd_efw {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	int card_index;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* for transaction */</div><div class='add'>+	u32 seqnum;</div><div class='add'>+	bool resp_addr_changable;</div><div class='add'>+</div><div class='add'>+	/* for quirks */</div><div class='add'>+	bool is_af9;</div><div class='add'>+	bool is_fireworks3;</div><div class='add'>+	u32 firmware_version;</div><div class='add'>+</div><div class='add'>+	unsigned int midi_in_ports;</div><div class='add'>+	unsigned int midi_out_ports;</div><div class='add'>+</div><div class='add'>+	unsigned int supported_sampling_rate;</div><div class='add'>+	unsigned int pcm_capture_channels[SND_EFW_MULTIPLIER_MODES];</div><div class='add'>+	unsigned int pcm_playback_channels[SND_EFW_MULTIPLIER_MODES];</div><div class='add'>+</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	struct cmp_connection out_conn;</div><div class='add'>+	struct cmp_connection in_conn;</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	/* hardware metering parameters */</div><div class='add'>+	unsigned int phys_out;</div><div class='add'>+	unsigned int phys_in;</div><div class='add'>+	unsigned int phys_out_grp_count;</div><div class='add'>+	unsigned int phys_in_grp_count;</div><div class='add'>+	struct snd_efw_phys_grp phys_out_grps[HWINFO_MAX_CAPS_GROUPS];</div><div class='add'>+	struct snd_efw_phys_grp phys_in_grps[HWINFO_MAX_CAPS_GROUPS];</div><div class='add'>+</div><div class='add'>+	/* for uapi */</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	/* response queue */</div><div class='add'>+	u8 *resp_buf;</div><div class='add'>+	u8 *pull_ptr;</div><div class='add'>+	u8 *push_ptr;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_efw_transaction_cmd(struct fw_unit *unit,</div><div class='add'>+			    const void *cmd, unsigned int size);</div><div class='add'>+int snd_efw_transaction_run(struct fw_unit *unit,</div><div class='add'>+			    const void *cmd, unsigned int cmd_size,</div><div class='add'>+			    void *resp, unsigned int resp_size);</div><div class='add'>+int snd_efw_transaction_register(void);</div><div class='add'>+void snd_efw_transaction_unregister(void);</div><div class='add'>+void snd_efw_transaction_bus_reset(struct fw_unit *unit);</div><div class='add'>+void snd_efw_transaction_add_instance(struct snd_efw *efw);</div><div class='add'>+void snd_efw_transaction_remove_instance(struct snd_efw *efw);</div><div class='add'>+</div><div class='add'>+struct snd_efw_hwinfo {</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 guid_hi;</div><div class='add'>+	u32 guid_lo;</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 version;</div><div class='add'>+	char vendor_name[HWINFO_NAME_SIZE_BYTES];</div><div class='add'>+	char model_name[HWINFO_NAME_SIZE_BYTES];</div><div class='add'>+	u32 supported_clocks;</div><div class='add'>+	u32 amdtp_rx_pcm_channels;</div><div class='add'>+	u32 amdtp_tx_pcm_channels;</div><div class='add'>+	u32 phys_out;</div><div class='add'>+	u32 phys_in;</div><div class='add'>+	u32 phys_out_grp_count;</div><div class='add'>+	struct snd_efw_phys_grp phys_out_grps[HWINFO_MAX_CAPS_GROUPS];</div><div class='add'>+	u32 phys_in_grp_count;</div><div class='add'>+	struct snd_efw_phys_grp phys_in_grps[HWINFO_MAX_CAPS_GROUPS];</div><div class='add'>+	u32 midi_out_ports;</div><div class='add'>+	u32 midi_in_ports;</div><div class='add'>+	u32 max_sample_rate;</div><div class='add'>+	u32 min_sample_rate;</div><div class='add'>+	u32 dsp_version;</div><div class='add'>+	u32 arm_version;</div><div class='add'>+	u32 mixer_playback_channels;</div><div class='add'>+	u32 mixer_capture_channels;</div><div class='add'>+	u32 fpga_version;</div><div class='add'>+	u32 amdtp_rx_pcm_channels_2x;</div><div class='add'>+	u32 amdtp_tx_pcm_channels_2x;</div><div class='add'>+	u32 amdtp_rx_pcm_channels_4x;</div><div class='add'>+	u32 amdtp_tx_pcm_channels_4x;</div><div class='add'>+	u32 reserved[16];</div><div class='add'>+} __packed;</div><div class='add'>+enum snd_efw_grp_type {</div><div class='add'>+	SND_EFW_CH_TYPE_ANALOG			= 0,</div><div class='add'>+	SND_EFW_CH_TYPE_SPDIF			= 1,</div><div class='add'>+	SND_EFW_CH_TYPE_ADAT			= 2,</div><div class='add'>+	SND_EFW_CH_TYPE_SPDIF_OR_ADAT		= 3,</div><div class='add'>+	SND_EFW_CH_TYPE_ANALOG_MIRRORING	= 4,</div><div class='add'>+	SND_EFW_CH_TYPE_HEADPHONES		= 5,</div><div class='add'>+	SND_EFW_CH_TYPE_I2S			= 6,</div><div class='add'>+	SND_EFW_CH_TYPE_GUITAR			= 7,</div><div class='add'>+	SND_EFW_CH_TYPE_PIEZO_GUITAR		= 8,</div><div class='add'>+	SND_EFW_CH_TYPE_GUITAR_STRING		= 9,</div><div class='add'>+	SND_EFW_CH_TYPE_DUMMY</div><div class='add'>+};</div><div class='add'>+struct snd_efw_phys_meters {</div><div class='add'>+	u32 status;	/* guitar state/midi signal/clock input detect */</div><div class='add'>+	u32 reserved0;</div><div class='add'>+	u32 reserved1;</div><div class='add'>+	u32 reserved2;</div><div class='add'>+	u32 reserved3;</div><div class='add'>+	u32 out_meters;</div><div class='add'>+	u32 in_meters;</div><div class='add'>+	u32 reserved4;</div><div class='add'>+	u32 reserved5;</div><div class='add'>+	u32 values[];</div><div class='add'>+} __packed;</div><div class='add'>+enum snd_efw_clock_source {</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_INTERNAL	= 0,</div><div class='add'>+	// Unused.</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_WORDCLOCK	= 2,</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_SPDIF	= 3,</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_ADAT_1	= 4,</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_ADAT_2	= 5,</div><div class='add'>+	SND_EFW_CLOCK_SOURCE_CONTINUOUS	= 6	/* internal variable clock */</div><div class='add'>+};</div><div class='add'>+enum snd_efw_transport_mode {</div><div class='add'>+	SND_EFW_TRANSPORT_MODE_WINDOWS	= 0,</div><div class='add'>+	SND_EFW_TRANSPORT_MODE_IEC61883	= 1,</div><div class='add'>+};</div><div class='add'>+int snd_efw_command_set_resp_addr(struct snd_efw *efw,</div><div class='add'>+				  u16 addr_high, u32 addr_low);</div><div class='add'>+int snd_efw_command_set_tx_mode(struct snd_efw *efw,</div><div class='add'>+				enum snd_efw_transport_mode mode);</div><div class='add'>+int snd_efw_command_get_hwinfo(struct snd_efw *efw,</div><div class='add'>+			       struct snd_efw_hwinfo *hwinfo);</div><div class='add'>+int snd_efw_command_get_phys_meters(struct snd_efw *efw,</div><div class='add'>+				    struct snd_efw_phys_meters *meters,</div><div class='add'>+				    unsigned int len);</div><div class='add'>+int snd_efw_command_get_clock_source(struct snd_efw *efw,</div><div class='add'>+				     enum snd_efw_clock_source *source);</div><div class='add'>+int snd_efw_command_get_sampling_rate(struct snd_efw *efw, unsigned int *rate);</div><div class='add'>+int snd_efw_command_set_sampling_rate(struct snd_efw *efw, unsigned int rate);</div><div class='add'>+</div><div class='add'>+int snd_efw_stream_init_duplex(struct snd_efw *efw);</div><div class='add'>+int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate,</div><div class='add'>+				  unsigned int frames_per_period,</div><div class='add'>+				  unsigned int frames_per_buffer);</div><div class='add'>+int snd_efw_stream_start_duplex(struct snd_efw *efw);</div><div class='add'>+void snd_efw_stream_stop_duplex(struct snd_efw *efw);</div><div class='add'>+void snd_efw_stream_update_duplex(struct snd_efw *efw);</div><div class='add'>+void snd_efw_stream_destroy_duplex(struct snd_efw *efw);</div><div class='add'>+void snd_efw_stream_lock_changed(struct snd_efw *efw);</div><div class='add'>+int snd_efw_stream_lock_try(struct snd_efw *efw);</div><div class='add'>+void snd_efw_stream_lock_release(struct snd_efw *efw);</div><div class='add'>+</div><div class='add'>+void snd_efw_proc_init(struct snd_efw *efw);</div><div class='add'>+</div><div class='add'>+int snd_efw_create_midi_devices(struct snd_efw *efw);</div><div class='add'>+</div><div class='add'>+int snd_efw_create_pcm_devices(struct snd_efw *efw);</div><div class='add'>+int snd_efw_get_multiplier_mode(unsigned int sampling_rate, unsigned int *mode);</div><div class='add'>+</div><div class='add'>+int snd_efw_create_hwdep_device(struct snd_efw *efw);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_command.c b/sound/firewire/fireworks/fireworks_command.c<br/>new file mode 100644<br/>index 000000000000..2b595ee0bc35<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_command.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_command.c</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_command.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./fireworks.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This driver uses transaction version 1 or later to use extended hardware</div><div class='add'>+ * information. Then too old devices are not available.</div><div class='add'>+ *</div><div class='add'>+ * Each commands are not required to have continuous sequence numbers. This</div><div class='add'>+ * number is just used to match command and response.</div><div class='add'>+ *</div><div class='add'>+ * This module support a part of commands. Please see FFADO if you want to see</div><div class='add'>+ * whole commands. But there are some commands which FFADO don't implement.</div><div class='add'>+ *</div><div class='add'>+ * Fireworks also supports AV/C general commands and AV/C Stream Format</div><div class='add'>+ * Information commands. But this module don't use them.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define KERNEL_SEQNUM_MIN	(SND_EFW_TRANSACTION_USER_SEQNUM_MAX + 2)</div><div class='add'>+#define KERNEL_SEQNUM_MAX	((u32)~0)</div><div class='add'>+</div><div class='add'>+/* for clock source and sampling rate */</div><div class='add'>+struct efc_clock {</div><div class='add'>+	u32 source;</div><div class='add'>+	u32 sampling_rate;</div><div class='add'>+	u32 index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* command categories */</div><div class='add'>+enum efc_category {</div><div class='add'>+	EFC_CAT_HWINFO		= 0,</div><div class='add'>+	EFC_CAT_TRANSPORT	= 2,</div><div class='add'>+	EFC_CAT_HWCTL		= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hardware info category commands */</div><div class='add'>+enum efc_cmd_hwinfo {</div><div class='add'>+	EFC_CMD_HWINFO_GET_CAPS		= 0,</div><div class='add'>+	EFC_CMD_HWINFO_GET_POLLED	= 1,</div><div class='add'>+	EFC_CMD_HWINFO_SET_RESP_ADDR	= 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum efc_cmd_transport {</div><div class='add'>+	EFC_CMD_TRANSPORT_SET_TX_MODE	= 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* hardware control category commands */</div><div class='add'>+enum efc_cmd_hwctl {</div><div class='add'>+	EFC_CMD_HWCTL_SET_CLOCK		= 0,</div><div class='add'>+	EFC_CMD_HWCTL_GET_CLOCK		= 1,</div><div class='add'>+	EFC_CMD_HWCTL_IDENTIFY		= 5</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* return values in response */</div><div class='add'>+enum efr_status {</div><div class='add'>+	EFR_STATUS_OK			= 0,</div><div class='add'>+	EFR_STATUS_BAD			= 1,</div><div class='add'>+	EFR_STATUS_BAD_COMMAND		= 2,</div><div class='add'>+	EFR_STATUS_COMM_ERR		= 3,</div><div class='add'>+	EFR_STATUS_BAD_QUAD_COUNT	= 4,</div><div class='add'>+	EFR_STATUS_UNSUPPORTED		= 5,</div><div class='add'>+	EFR_STATUS_1394_TIMEOUT		= 6,</div><div class='add'>+	EFR_STATUS_DSP_TIMEOUT		= 7,</div><div class='add'>+	EFR_STATUS_BAD_RATE		= 8,</div><div class='add'>+	EFR_STATUS_BAD_CLOCK		= 9,</div><div class='add'>+	EFR_STATUS_BAD_CHANNEL		= 10,</div><div class='add'>+	EFR_STATUS_BAD_PAN		= 11,</div><div class='add'>+	EFR_STATUS_FLASH_BUSY		= 12,</div><div class='add'>+	EFR_STATUS_BAD_MIRROR		= 13,</div><div class='add'>+	EFR_STATUS_BAD_LED		= 14,</div><div class='add'>+	EFR_STATUS_BAD_PARAMETER	= 15,</div><div class='add'>+	EFR_STATUS_INCOMPLETE		= 0x80000000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *const efr_status_names[] = {</div><div class='add'>+	[EFR_STATUS_OK]			= "OK",</div><div class='add'>+	[EFR_STATUS_BAD]		= "bad",</div><div class='add'>+	[EFR_STATUS_BAD_COMMAND]	= "bad command",</div><div class='add'>+	[EFR_STATUS_COMM_ERR]		= "comm err",</div><div class='add'>+	[EFR_STATUS_BAD_QUAD_COUNT]	= "bad quad count",</div><div class='add'>+	[EFR_STATUS_UNSUPPORTED]	= "unsupported",</div><div class='add'>+	[EFR_STATUS_1394_TIMEOUT]	= "1394 timeout",</div><div class='add'>+	[EFR_STATUS_DSP_TIMEOUT]	= "DSP timeout",</div><div class='add'>+	[EFR_STATUS_BAD_RATE]		= "bad rate",</div><div class='add'>+	[EFR_STATUS_BAD_CLOCK]		= "bad clock",</div><div class='add'>+	[EFR_STATUS_BAD_CHANNEL]	= "bad channel",</div><div class='add'>+	[EFR_STATUS_BAD_PAN]		= "bad pan",</div><div class='add'>+	[EFR_STATUS_FLASH_BUSY]		= "flash busy",</div><div class='add'>+	[EFR_STATUS_BAD_MIRROR]		= "bad mirror",</div><div class='add'>+	[EFR_STATUS_BAD_LED]		= "bad LED",</div><div class='add'>+	[EFR_STATUS_BAD_PARAMETER]	= "bad parameter",</div><div class='add'>+	[EFR_STATUS_BAD_PARAMETER + 1]	= "incomplete"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+efw_transaction(struct snd_efw *efw, unsigned int category,</div><div class='add'>+		unsigned int command,</div><div class='add'>+		const __be32 *params, unsigned int param_bytes,</div><div class='add'>+		const __be32 *resp, unsigned int resp_bytes)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw_transaction *header;</div><div class='add'>+	__be32 *buf;</div><div class='add'>+	u32 seqnum;</div><div class='add'>+	unsigned int buf_bytes, cmd_bytes;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* calculate buffer size*/</div><div class='add'>+	buf_bytes = sizeof(struct snd_efw_transaction) +</div><div class='add'>+		    max(param_bytes, resp_bytes);</div><div class='add'>+</div><div class='add'>+	/* keep buffer */</div><div class='add'>+	buf = kzalloc(buf_bytes, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* to keep consistency of sequence number */</div><div class='add'>+	scoped_guard(spinlock, &amp;efw-&gt;lock) {</div><div class='add'>+		if ((efw-&gt;seqnum &lt; KERNEL_SEQNUM_MIN) ||</div><div class='add'>+		    (efw-&gt;seqnum &gt;= KERNEL_SEQNUM_MAX - 2))</div><div class='add'>+			efw-&gt;seqnum = KERNEL_SEQNUM_MIN;</div><div class='add'>+		else</div><div class='add'>+			efw-&gt;seqnum += 2;</div><div class='add'>+		seqnum = efw-&gt;seqnum;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* fill transaction header fields */</div><div class='add'>+	cmd_bytes = sizeof(struct snd_efw_transaction) + param_bytes;</div><div class='add'>+	header = (struct snd_efw_transaction *)buf;</div><div class='add'>+	header-&gt;length	 = cpu_to_be32(cmd_bytes / sizeof(__be32));</div><div class='add'>+	header-&gt;version	 = cpu_to_be32(1);</div><div class='add'>+	header-&gt;seqnum	 = cpu_to_be32(seqnum);</div><div class='add'>+	header-&gt;category = cpu_to_be32(category);</div><div class='add'>+	header-&gt;command	 = cpu_to_be32(command);</div><div class='add'>+	header-&gt;status	 = 0;</div><div class='add'>+</div><div class='add'>+	/* fill transaction command parameters */</div><div class='add'>+	memcpy(header-&gt;params, params, param_bytes);</div><div class='add'>+</div><div class='add'>+	err = snd_efw_transaction_run(efw-&gt;unit, buf, cmd_bytes,</div><div class='add'>+				      buf, buf_bytes);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* check transaction header fields */</div><div class='add'>+	if ((be32_to_cpu(header-&gt;version) &lt; 1) ||</div><div class='add'>+	    (be32_to_cpu(header-&gt;category) != category) ||</div><div class='add'>+	    (be32_to_cpu(header-&gt;command) != command) ||</div><div class='add'>+	    (be32_to_cpu(header-&gt;status) != EFR_STATUS_OK)) {</div><div class='add'>+		dev_err(&amp;efw-&gt;unit-&gt;device, "EFW command failed [%u/%u]: %s\n",</div><div class='add'>+			be32_to_cpu(header-&gt;category),</div><div class='add'>+			be32_to_cpu(header-&gt;command),</div><div class='add'>+			efr_status_names[be32_to_cpu(header-&gt;status)]);</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (resp == NULL)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* fill transaction response parameters */</div><div class='add'>+	memset((void *)resp, 0, resp_bytes);</div><div class='add'>+	resp_bytes = min_t(unsigned int, resp_bytes,</div><div class='add'>+			   be32_to_cpu(header-&gt;length) * sizeof(__be32) -</div><div class='add'>+				sizeof(struct snd_efw_transaction));</div><div class='add'>+	memcpy((void *)resp, &amp;buf[6], resp_bytes);</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The address in host system for transaction response is changable when the</div><div class='add'>+ * device supports. struct hwinfo.flags includes its flag. The default is</div><div class='add'>+ * MEMORY_SPACE_EFW_RESPONSE.</div><div class='add'>+ */</div><div class='add'>+int snd_efw_command_set_resp_addr(struct snd_efw *efw,</div><div class='add'>+				  u16 addr_high, u32 addr_low)</div><div class='add'>+{</div><div class='add'>+	__be32 addr[2];</div><div class='add'>+</div><div class='add'>+	addr[0] = cpu_to_be32(addr_high);</div><div class='add'>+	addr[1] = cpu_to_be32(addr_low);</div><div class='add'>+</div><div class='add'>+	if (!efw-&gt;resp_addr_changable)</div><div class='add'>+		return -ENOSYS;</div><div class='add'>+</div><div class='add'>+	return efw_transaction(efw, EFC_CAT_HWCTL,</div><div class='add'>+			       EFC_CMD_HWINFO_SET_RESP_ADDR,</div><div class='add'>+			       addr, sizeof(addr), NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is for timestamp processing. In Windows mode, all 32bit fields of second</div><div class='add'>+ * CIP header in AMDTP transmit packet is used for 'presentation timestamp'. In</div><div class='add'>+ * 'no data' packet the value of this field is 0x90ffffff.</div><div class='add'>+ */</div><div class='add'>+int snd_efw_command_set_tx_mode(struct snd_efw *efw,</div><div class='add'>+				enum snd_efw_transport_mode mode)</div><div class='add'>+{</div><div class='add'>+	__be32 param = cpu_to_be32(mode);</div><div class='add'>+	return efw_transaction(efw, EFC_CAT_TRANSPORT,</div><div class='add'>+			       EFC_CMD_TRANSPORT_SET_TX_MODE,</div><div class='add'>+			       &amp;param, sizeof(param), NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_command_get_hwinfo(struct snd_efw *efw,</div><div class='add'>+			       struct snd_efw_hwinfo *hwinfo)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err  = efw_transaction(efw, EFC_CAT_HWINFO,</div><div class='add'>+			       EFC_CMD_HWINFO_GET_CAPS,</div><div class='add'>+			       NULL, 0, (__be32 *)hwinfo, sizeof(*hwinfo));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;flags);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;guid_hi);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;guid_lo);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;type);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;version);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;supported_clocks);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_rx_pcm_channels);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_tx_pcm_channels);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;phys_out);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;phys_in);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;phys_out_grp_count);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;phys_in_grp_count);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;midi_out_ports);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;midi_in_ports);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;max_sample_rate);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;min_sample_rate);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;dsp_version);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;arm_version);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;mixer_playback_channels);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;mixer_capture_channels);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;fpga_version);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_rx_pcm_channels_2x);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_tx_pcm_channels_2x);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_rx_pcm_channels_4x);</div><div class='add'>+	be32_to_cpus(&amp;hwinfo-&gt;amdtp_tx_pcm_channels_4x);</div><div class='add'>+</div><div class='add'>+	/* ensure terminated */</div><div class='add'>+	hwinfo-&gt;vendor_name[HWINFO_NAME_SIZE_BYTES - 1] = '\0';</div><div class='add'>+	hwinfo-&gt;model_name[HWINFO_NAME_SIZE_BYTES  - 1] = '\0';</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_command_get_phys_meters(struct snd_efw *efw,</div><div class='add'>+				    struct snd_efw_phys_meters *meters,</div><div class='add'>+				    unsigned int len)</div><div class='add'>+{</div><div class='add'>+	u32 *buf = (u32 *)meters;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = efw_transaction(efw, EFC_CAT_HWINFO,</div><div class='add'>+			      EFC_CMD_HWINFO_GET_POLLED,</div><div class='add'>+			      NULL, 0, (__be32 *)meters, len);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		for (i = 0; i &lt; len / sizeof(u32); i++)</div><div class='add'>+			be32_to_cpus(&amp;buf[i]);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+command_get_clock(struct snd_efw *efw, struct efc_clock *clock)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = efw_transaction(efw, EFC_CAT_HWCTL,</div><div class='add'>+			      EFC_CMD_HWCTL_GET_CLOCK,</div><div class='add'>+			      NULL, 0,</div><div class='add'>+			      (__be32 *)clock, sizeof(struct efc_clock));</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		be32_to_cpus(&amp;clock-&gt;source);</div><div class='add'>+		be32_to_cpus(&amp;clock-&gt;sampling_rate);</div><div class='add'>+		be32_to_cpus(&amp;clock-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* give UINT_MAX if set nothing */</div><div class='add'>+static int</div><div class='add'>+command_set_clock(struct snd_efw *efw,</div><div class='add'>+		  unsigned int source, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct efc_clock clock = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* check arguments */</div><div class='add'>+	if ((source == UINT_MAX) &amp;&amp; (rate == UINT_MAX)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get current status */</div><div class='add'>+	err = command_get_clock(efw, &amp;clock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* no need */</div><div class='add'>+	if ((clock.source == source) &amp;&amp; (clock.sampling_rate == rate))</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* set params */</div><div class='add'>+	if ((source != UINT_MAX) &amp;&amp; (clock.source != source))</div><div class='add'>+		clock.source = source;</div><div class='add'>+	if ((rate != UINT_MAX) &amp;&amp; (clock.sampling_rate != rate))</div><div class='add'>+		clock.sampling_rate = rate;</div><div class='add'>+	clock.index = 0;</div><div class='add'>+</div><div class='add'>+	cpu_to_be32s(&amp;clock.source);</div><div class='add'>+	cpu_to_be32s(&amp;clock.sampling_rate);</div><div class='add'>+	cpu_to_be32s(&amp;clock.index);</div><div class='add'>+</div><div class='add'>+	err = efw_transaction(efw, EFC_CAT_HWCTL,</div><div class='add'>+			      EFC_CMD_HWCTL_SET_CLOCK,</div><div class='add'>+			      (__be32 *)&amp;clock, sizeof(struct efc_clock),</div><div class='add'>+			      NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * With firmware version 5.8, just after changing clock state, these</div><div class='add'>+	 * parameters are not immediately retrieved by get command. In my</div><div class='add'>+	 * trial, there needs to be 100msec to get changed parameters.</div><div class='add'>+	 */</div><div class='add'>+	msleep(150);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_command_get_clock_source(struct snd_efw *efw,</div><div class='add'>+				     enum snd_efw_clock_source *source)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct efc_clock clock = {0};</div><div class='add'>+</div><div class='add'>+	err = command_get_clock(efw, &amp;clock);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*source = clock.source;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_command_get_sampling_rate(struct snd_efw *efw, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct efc_clock clock = {0};</div><div class='add'>+</div><div class='add'>+	err = command_get_clock(efw, &amp;clock);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		*rate = clock.sampling_rate;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_command_set_sampling_rate(struct snd_efw *efw, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	return command_set_clock(efw, UINT_MAX, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_hwdep.c b/sound/firewire/fireworks/fireworks_hwdep.c<br/>new file mode 100644<br/>index 000000000000..7d6bd8ceeab3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_hwdep.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes have five functionalities.</div><div class='add'>+ *</div><div class='add'>+ * 1.get information about firewire node</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock streaming</div><div class='add'>+ * 4.transmit command of EFW transaction</div><div class='add'>+ * 5.receive response of EFW transaction</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "fireworks.h"</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+hwdep_read_resp_buf(struct snd_efw *efw, char __user *buf, long remained,</div><div class='add'>+		    loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	unsigned int length, till_end, type;</div><div class='add'>+	struct snd_efw_transaction *t;</div><div class='add'>+	u8 *pull_ptr;</div><div class='add'>+	long count = 0;</div><div class='add'>+</div><div class='add'>+	if (remained &lt; sizeof(type) + sizeof(struct snd_efw_transaction))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* data type is SNDRV_FIREWIRE_EVENT_EFW_RESPONSE */</div><div class='add'>+	type = SNDRV_FIREWIRE_EVENT_EFW_RESPONSE;</div><div class='add'>+	if (copy_to_user(buf, &amp;type, sizeof(type)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	count += sizeof(type);</div><div class='add'>+	remained -= sizeof(type);</div><div class='add'>+	buf += sizeof(type);</div><div class='add'>+</div><div class='add'>+	/* write into buffer as many responses as possible */</div><div class='add'>+	spin_lock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When another task reaches here during this task's access to user</div><div class='add'>+	 * space, it picks up current position in buffer and can read the same</div><div class='add'>+	 * series of responses.</div><div class='add'>+	 */</div><div class='add'>+	pull_ptr = efw-&gt;pull_ptr;</div><div class='add'>+</div><div class='add'>+	while (efw-&gt;push_ptr != pull_ptr) {</div><div class='add'>+		t = (struct snd_efw_transaction *)(pull_ptr);</div><div class='add'>+		length = be32_to_cpu(t-&gt;length) * sizeof(__be32);</div><div class='add'>+</div><div class='add'>+		/* confirm enough space for this response */</div><div class='add'>+		if (remained &lt; length)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* copy from ring buffer to user buffer */</div><div class='add'>+		while (length &gt; 0) {</div><div class='add'>+			till_end = snd_efw_resp_buf_size -</div><div class='add'>+				(unsigned int)(pull_ptr - efw-&gt;resp_buf);</div><div class='add'>+			till_end = min_t(unsigned int, length, till_end);</div><div class='add'>+</div><div class='add'>+			spin_unlock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+			if (copy_to_user(buf, pull_ptr, till_end))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			spin_lock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+			pull_ptr += till_end;</div><div class='add'>+			if (pull_ptr &gt;= efw-&gt;resp_buf + snd_efw_resp_buf_size)</div><div class='add'>+				pull_ptr -= snd_efw_resp_buf_size;</div><div class='add'>+</div><div class='add'>+			length -= till_end;</div><div class='add'>+			buf += till_end;</div><div class='add'>+			count += till_end;</div><div class='add'>+			remained -= till_end;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All of tasks can read from the buffer nearly simultaneously, but the</div><div class='add'>+	 * last position for each task is different depending on the length of</div><div class='add'>+	 * given buffer. Here, for simplicity, a position of buffer is set by</div><div class='add'>+	 * the latest task. It's better for a listening application to allow one</div><div class='add'>+	 * thread to read from the buffer. Unless, each task can read different</div><div class='add'>+	 * sequence of responses depending on variation of buffer length.</div><div class='add'>+	 */</div><div class='add'>+	efw-&gt;pull_ptr = pull_ptr;</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+hwdep_read_locked(struct snd_efw *efw, char __user *buf, long count,</div><div class='add'>+		  loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	union snd_firewire_event event = {</div><div class='add'>+		.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;efw-&gt;lock) {</div><div class='add'>+		event.lock_status.status = (efw-&gt;dev_lock_count &gt; 0);</div><div class='add'>+		efw-&gt;dev_lock_changed = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = min_t(long, count, sizeof(event.lock_status));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,</div><div class='add'>+	   loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	bool queued;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev_lock_changed = efw-&gt;dev_lock_changed;</div><div class='add'>+	queued = efw-&gt;push_ptr != efw-&gt;pull_ptr;</div><div class='add'>+</div><div class='add'>+	while (!dev_lock_changed &amp;&amp; !queued) {</div><div class='add'>+		prepare_to_wait(&amp;efw-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;efw-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;efw-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;efw-&gt;lock);</div><div class='add'>+		dev_lock_changed = efw-&gt;dev_lock_changed;</div><div class='add'>+		queued = efw-&gt;push_ptr != efw-&gt;pull_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (dev_lock_changed)</div><div class='add'>+		count = hwdep_read_locked(efw, buf, count, offset);</div><div class='add'>+	else if (queued)</div><div class='add'>+		count = hwdep_read_resp_buf(efw, buf, count, offset);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long</div><div class='add'>+hwdep_write(struct snd_hwdep *hwdep, const char __user *data, long count,</div><div class='add'>+	    loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = hwdep-&gt;private_data;</div><div class='add'>+	u32 seqnum;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	if (count &lt; sizeof(struct snd_efw_transaction) ||</div><div class='add'>+	    SND_EFW_RESPONSE_MAXIMUM_BYTES &lt; count)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = memdup_user(data, count);</div><div class='add'>+	if (IS_ERR(buf))</div><div class='add'>+		return PTR_ERR(buf);</div><div class='add'>+</div><div class='add'>+	/* check seqnum is not for kernel-land */</div><div class='add'>+	seqnum = be32_to_cpu(((struct snd_efw_transaction *)buf)-&gt;seqnum);</div><div class='add'>+	if (seqnum &gt; SND_EFW_TRANSACTION_USER_SEQNUM_MAX) {</div><div class='add'>+		count = -EINVAL;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (snd_efw_transaction_cmd(efw-&gt;unit, buf, count) &lt; 0)</div><div class='add'>+		count = -EIO;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t</div><div class='add'>+hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = hwdep-&gt;private_data;</div><div class='add'>+	__poll_t events;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;efw-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+	if (efw-&gt;dev_lock_changed || efw-&gt;pull_ptr != efw-&gt;push_ptr)</div><div class='add'>+		events = EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		events = 0;</div><div class='add'>+	return events | EPOLLOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_get_info(struct snd_efw *efw, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(efw-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_FIREWORKS;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_lock(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;dev_lock_count == 0) {</div><div class='add'>+		efw-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_unlock(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;dev_lock_count == -1) {</div><div class='add'>+		efw-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+	if (efw-&gt;dev_lock_count == -1)</div><div class='add'>+		efw-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+	    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(efw, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(efw);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(efw);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int</div><div class='add'>+hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+		   unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_efw_create_hwdep_device(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.write		= hwdep_write,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(efw-&gt;card, "Fireworks", 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	strscpy(hwdep-&gt;name, "Fireworks");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_FIREWORKS;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = efw;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_midi.c b/sound/firewire/fireworks/fireworks_midi.c<br/>new file mode 100644<br/>index 000000000000..405106a6aef9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_midi.c</a></div><div class='hunk'>@@ -0,0 +1,138 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_midi.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2010 Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+#include "fireworks.h"</div><div class='add'>+</div><div class='add'>+static int midi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_stream_lock_try(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;efw-&gt;mutex) {</div><div class='add'>+		err = snd_efw_stream_reserve_duplex(efw, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++efw-&gt;substreams_counter;</div><div class='add'>+			err = snd_efw_stream_start_duplex(efw);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--efw-&gt;substreams_counter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_efw_stream_lock_release(efw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;efw-&gt;mutex) {</div><div class='add'>+		--efw-&gt;substreams_counter;</div><div class='add'>+		snd_efw_stream_stop_duplex(efw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_efw_stream_lock_release(efw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;efw-&gt;tx_stream,</div><div class='add'>+					  substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;efw-&gt;tx_stream,</div><div class='add'>+					  substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;efw-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;efw-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_efw *efw,</div><div class='add'>+				     struct snd_rawmidi_str *str)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+		scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+			  "%s MIDI %d", efw-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_create_midi_devices(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* create midi ports */</div><div class='add'>+	err = snd_rawmidi_new(efw-&gt;card, efw-&gt;card-&gt;driver, 0,</div><div class='add'>+			      efw-&gt;midi_out_ports, efw-&gt;midi_in_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", efw-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = efw;</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;midi_in_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;capture_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(efw, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;midi_out_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;playback_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(efw, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((efw-&gt;midi_out_ports &gt; 0) &amp;&amp; (efw-&gt;midi_in_ports &gt; 0))</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_pcm.c b/sound/firewire/fireworks/fireworks_pcm.c<br/>new file mode 100644<br/>index 000000000000..9399293a9fe9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_pcm.c</a></div><div class='hunk'>@@ -0,0 +1,397 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_pcm.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2010 Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+#include "./fireworks.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE:</div><div class='add'>+ * Fireworks changes its AMDTP channels for PCM data according to its sampling</div><div class='add'>+ * rate. There are three modes. Here _XX is either _rx or _tx.</div><div class='add'>+ *  0:  32.0- 48.0 kHz then snd_efw_hwinfo.amdtp_XX_pcm_channels applied</div><div class='add'>+ *  1:  88.2- 96.0 kHz then snd_efw_hwinfo.amdtp_XX_pcm_channels_2x applied</div><div class='add'>+ *  2: 176.4-192.0 kHz then snd_efw_hwinfo.amdtp_XX_pcm_channels_4x applied</div><div class='add'>+ *</div><div class='add'>+ * The number of PCM channels for analog input and output are always fixed but</div><div class='add'>+ * the number of PCM channels for digital input and output are differed.</div><div class='add'>+ *</div><div class='add'>+ * Additionally, according to "AudioFire Owner's Manual Version 2.2", in some</div><div class='add'>+ * model, the number of PCM channels for digital input has more restriction</div><div class='add'>+ * depending on which digital interface is selected.</div><div class='add'>+ *  - S/PDIF coaxial and optical	: use input 1-2</div><div class='add'>+ *  - ADAT optical at 32.0-48.0 kHz	: use input 1-8</div><div class='add'>+ *  - ADAT optical at 88.2-96.0 kHz	: use input 1-4 (S/MUX format)</div><div class='add'>+ *</div><div class='add'>+ * The data in AMDTP channels for blank PCM channels are zero.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int freq_table[] = {</div><div class='add'>+	/* multiplier mode 0 */</div><div class='add'>+	[0] = 32000,</div><div class='add'>+	[1] = 44100,</div><div class='add'>+	[2] = 48000,</div><div class='add'>+	/* multiplier mode 1 */</div><div class='add'>+	[3] = 88200,</div><div class='add'>+	[4] = 96000,</div><div class='add'>+	/* multiplier mode 2 */</div><div class='add'>+	[5] = 176400,</div><div class='add'>+	[6] = 192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+get_multiplier_mode_with_index(unsigned int index)</div><div class='add'>+{</div><div class='add'>+	return ((int)index - 1) / 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_get_multiplier_mode(unsigned int sampling_rate, unsigned int *mode)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(freq_table); i++) {</div><div class='add'>+		if (freq_table[i] == sampling_rate) {</div><div class='add'>+			*mode = get_multiplier_mode_with_index(i);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hw_rule_rate(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	unsigned int *pcm_channels = rule-&gt;private;</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i, mode;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(freq_table); i++) {</div><div class='add'>+		mode = get_multiplier_mode_with_index(i);</div><div class='add'>+		if (!snd_interval_test(c, pcm_channels[mode]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, freq_table[i]);</div><div class='add'>+		t.max = max(t.max, freq_table[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(r, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hw_rule_channels(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	unsigned int *pcm_channels = rule-&gt;private;</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i, mode;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(freq_table); i++) {</div><div class='add'>+		mode = get_multiplier_mode_with_index(i);</div><div class='add'>+		if (!snd_interval_test(r, freq_table[i]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, pcm_channels[mode]);</div><div class='add'>+		t.max = max(t.max, pcm_channels[mode]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+limit_channels(struct snd_pcm_hardware *hw, unsigned int *pcm_channels)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, mode;</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(freq_table); i++) {</div><div class='add'>+		mode = get_multiplier_mode_with_index(i);</div><div class='add'>+		if (pcm_channels[mode] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, pcm_channels[mode]);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, pcm_channels[mode]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+pcm_init_hw_params(struct snd_efw *efw,</div><div class='add'>+		   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct amdtp_stream *s;</div><div class='add'>+	unsigned int *pcm_channels;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_IN_PCM_FORMAT_BITS;</div><div class='add'>+		s = &amp;efw-&gt;tx_stream;</div><div class='add'>+		pcm_channels = efw-&gt;pcm_capture_channels;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_OUT_PCM_FORMAT_BITS;</div><div class='add'>+		s = &amp;efw-&gt;rx_stream;</div><div class='add'>+		pcm_channels = efw-&gt;pcm_playback_channels;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* limit rates */</div><div class='add'>+	runtime-&gt;hw.rates = efw-&gt;supported_sampling_rate;</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+</div><div class='add'>+	limit_channels(&amp;runtime-&gt;hw, pcm_channels);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_channels, pcm_channels,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_rate, pcm_channels,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;efw-&gt;domain;</div><div class='add'>+	enum snd_efw_clock_source clock_source;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_stream_lock_try(efw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pcm_init_hw_params(efw, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_command_get_clock_source(efw, &amp;clock_source);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;efw-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if ((clock_source != SND_EFW_CLOCK_SOURCE_INTERNAL) ||</div><div class='add'>+		    (efw-&gt;substreams_counter &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0)) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int sampling_rate;</div><div class='add'>+</div><div class='add'>+			err = snd_efw_command_get_sampling_rate(efw, &amp;sampling_rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = sampling_rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = sampling_rate;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_efw_stream_lock_release(efw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+	snd_efw_stream_lock_release(efw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;efw-&gt;mutex);</div><div class='add'>+		err = snd_efw_stream_reserve_duplex(efw, rate,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++efw-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;efw-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--efw-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_efw_stream_stop_duplex(efw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_stream_start_duplex(efw);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;efw-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_stream_start_duplex(efw);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;efw-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;efw-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;efw-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;efw-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;efw-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;efw-&gt;domain, &amp;efw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;efw-&gt;domain, &amp;efw-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;efw-&gt;domain, &amp;efw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;efw-&gt;domain, &amp;efw-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_create_pcm_devices(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_capture_prepare,</div><div class='add'>+		.trigger	= pcm_capture_trigger,</div><div class='add'>+		.pointer	= pcm_capture_pointer,</div><div class='add'>+		.ack		= pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_playback_prepare,</div><div class='add'>+		.trigger	= pcm_playback_trigger,</div><div class='add'>+		.pointer	= pcm_playback_pointer,</div><div class='add'>+		.ack		= pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(efw-&gt;card, efw-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = efw;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name), "%s PCM", efw-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_proc.c b/sound/firewire/fireworks/fireworks_proc.c<br/>new file mode 100644<br/>index 000000000000..12288567b0cd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_proc.c</a></div><div class='hunk'>@@ -0,0 +1,223 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_proc.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009-2010 Clemens Ladisch</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./fireworks.h"</div><div class='add'>+</div><div class='add'>+static inline const char*</div><div class='add'>+get_phys_name(struct snd_efw_phys_grp *grp, bool input)</div><div class='add'>+{</div><div class='add'>+	static const char *const ch_type[] = {</div><div class='add'>+		"Analog", "S/PDIF", "ADAT", "S/PDIF or ADAT", "Mirroring",</div><div class='add'>+		"Headphones", "I2S", "Guitar", "Pirzo Guitar", "Guitar String",</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (grp-&gt;type &lt; ARRAY_SIZE(ch_type))</div><div class='add'>+		return ch_type[grp-&gt;type];</div><div class='add'>+	else if (input)</div><div class='add'>+		return "Input";</div><div class='add'>+	else</div><div class='add'>+		return "Output";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_hwinfo(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = entry-&gt;private_data;</div><div class='add'>+	unsigned short i;</div><div class='add'>+	struct snd_efw_hwinfo *hwinfo;</div><div class='add'>+</div><div class='add'>+	hwinfo = kmalloc(sizeof(struct snd_efw_hwinfo), GFP_KERNEL);</div><div class='add'>+	if (hwinfo == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (snd_efw_command_get_hwinfo(efw, hwinfo) &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "guid_hi: 0x%X\n", hwinfo-&gt;guid_hi);</div><div class='add'>+	snd_iprintf(buffer, "guid_lo: 0x%X\n", hwinfo-&gt;guid_lo);</div><div class='add'>+	snd_iprintf(buffer, "type: 0x%X\n", hwinfo-&gt;type);</div><div class='add'>+	snd_iprintf(buffer, "version: 0x%X\n", hwinfo-&gt;version);</div><div class='add'>+	snd_iprintf(buffer, "vendor_name: %s\n", hwinfo-&gt;vendor_name);</div><div class='add'>+	snd_iprintf(buffer, "model_name: %s\n", hwinfo-&gt;model_name);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "dsp_version: 0x%X\n", hwinfo-&gt;dsp_version);</div><div class='add'>+	snd_iprintf(buffer, "arm_version: 0x%X\n", hwinfo-&gt;arm_version);</div><div class='add'>+	snd_iprintf(buffer, "fpga_version: 0x%X\n", hwinfo-&gt;fpga_version);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "flags: 0x%X\n", hwinfo-&gt;flags);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "max_sample_rate: 0x%X\n", hwinfo-&gt;max_sample_rate);</div><div class='add'>+	snd_iprintf(buffer, "min_sample_rate: 0x%X\n", hwinfo-&gt;min_sample_rate);</div><div class='add'>+	snd_iprintf(buffer, "supported_clock: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;supported_clocks);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "phys out: 0x%X\n", hwinfo-&gt;phys_out);</div><div class='add'>+	snd_iprintf(buffer, "phys in: 0x%X\n", hwinfo-&gt;phys_in);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "phys in grps: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;phys_in_grp_count);</div><div class='add'>+	for (i = 0; i &lt; hwinfo-&gt;phys_in_grp_count; i++) {</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "phys in grp[%d]: type 0x%X, count 0x%X\n",</div><div class='add'>+			    i, hwinfo-&gt;phys_out_grps[i].type,</div><div class='add'>+			    hwinfo-&gt;phys_out_grps[i].count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "phys out grps: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;phys_out_grp_count);</div><div class='add'>+	for (i = 0; i &lt; hwinfo-&gt;phys_out_grp_count; i++) {</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "phys out grps[%d]: type 0x%X, count 0x%X\n",</div><div class='add'>+			    i, hwinfo-&gt;phys_out_grps[i].type,</div><div class='add'>+			    hwinfo-&gt;phys_out_grps[i].count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "amdtp rx pcm channels 1x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_rx_pcm_channels);</div><div class='add'>+	snd_iprintf(buffer, "amdtp tx pcm channels 1x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_tx_pcm_channels);</div><div class='add'>+	snd_iprintf(buffer, "amdtp rx pcm channels 2x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_rx_pcm_channels_2x);</div><div class='add'>+	snd_iprintf(buffer, "amdtp tx pcm channels 2x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_tx_pcm_channels_2x);</div><div class='add'>+	snd_iprintf(buffer, "amdtp rx pcm channels 4x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_rx_pcm_channels_4x);</div><div class='add'>+	snd_iprintf(buffer, "amdtp tx pcm channels 4x: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;amdtp_tx_pcm_channels_4x);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "midi out ports: 0x%X\n", hwinfo-&gt;midi_out_ports);</div><div class='add'>+	snd_iprintf(buffer, "midi in ports: 0x%X\n", hwinfo-&gt;midi_in_ports);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "mixer playback channels: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;mixer_playback_channels);</div><div class='add'>+	snd_iprintf(buffer, "mixer capture channels: 0x%X\n",</div><div class='add'>+		    hwinfo-&gt;mixer_capture_channels);</div><div class='add'>+end:</div><div class='add'>+	kfree(hwinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_clock(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = entry-&gt;private_data;</div><div class='add'>+	enum snd_efw_clock_source clock_source;</div><div class='add'>+	unsigned int sampling_rate;</div><div class='add'>+</div><div class='add'>+	if (snd_efw_command_get_clock_source(efw, &amp;clock_source) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (snd_efw_command_get_sampling_rate(efw, &amp;sampling_rate) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Clock Source: %d\n", clock_source);</div><div class='add'>+	snd_iprintf(buffer, "Sampling Rate: %d\n", sampling_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NOTE:</div><div class='add'>+ *  dB = 20 * log10(linear / 0x01000000)</div><div class='add'>+ *  -144.0 dB when linear is 0</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+proc_read_phys_meters(struct snd_info_entry *entry,</div><div class='add'>+		      struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = entry-&gt;private_data;</div><div class='add'>+	struct snd_efw_phys_meters *meters;</div><div class='add'>+	unsigned int g, c, m, max, size;</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 *linear;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	size = sizeof(struct snd_efw_phys_meters) +</div><div class='add'>+	       (efw-&gt;phys_in + efw-&gt;phys_out) * sizeof(u32);</div><div class='add'>+	meters = kzalloc(size, GFP_KERNEL);</div><div class='add'>+	if (meters == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = snd_efw_command_get_phys_meters(efw, meters, size);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Physical Meters:\n");</div><div class='add'>+</div><div class='add'>+	m = 0;</div><div class='add'>+	max = min(efw-&gt;phys_out, meters-&gt;out_meters);</div><div class='add'>+	linear = meters-&gt;values;</div><div class='add'>+	snd_iprintf(buffer, " %d Outputs:\n", max);</div><div class='add'>+	for (g = 0; g &lt; efw-&gt;phys_out_grp_count; g++) {</div><div class='add'>+		name = get_phys_name(&amp;efw-&gt;phys_out_grps[g], false);</div><div class='add'>+		for (c = 0; c &lt; efw-&gt;phys_out_grps[g].count; c++) {</div><div class='add'>+			if (m &lt; max)</div><div class='add'>+				snd_iprintf(buffer, "\t%s [%d]: %d\n",</div><div class='add'>+					    name, c, linear[m++]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m = 0;</div><div class='add'>+	max = min(efw-&gt;phys_in, meters-&gt;in_meters);</div><div class='add'>+	linear = meters-&gt;values + meters-&gt;out_meters;</div><div class='add'>+	snd_iprintf(buffer, " %d Inputs:\n", max);</div><div class='add'>+	for (g = 0; g &lt; efw-&gt;phys_in_grp_count; g++) {</div><div class='add'>+		name = get_phys_name(&amp;efw-&gt;phys_in_grps[g], true);</div><div class='add'>+		for (c = 0; c &lt; efw-&gt;phys_in_grps[g].count; c++)</div><div class='add'>+			if (m &lt; max)</div><div class='add'>+				snd_iprintf(buffer, "\t%s [%d]: %d\n",</div><div class='add'>+					    name, c, linear[m++]);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	kfree(meters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+proc_read_queues_state(struct snd_info_entry *entry,</div><div class='add'>+		       struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_efw *efw = entry-&gt;private_data;</div><div class='add'>+	unsigned int consumed;</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;pull_ptr &gt; efw-&gt;push_ptr)</div><div class='add'>+		consumed = snd_efw_resp_buf_size -</div><div class='add'>+			   (unsigned int)(efw-&gt;pull_ptr - efw-&gt;push_ptr);</div><div class='add'>+	else</div><div class='add'>+		consumed = (unsigned int)(efw-&gt;push_ptr - efw-&gt;pull_ptr);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "%d/%d\n",</div><div class='add'>+		    consumed, snd_efw_resp_buf_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+add_node(struct snd_efw *efw, struct snd_info_entry *root, const char *name,</div><div class='add'>+	 void (*op)(struct snd_info_entry *e, struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(efw-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, efw, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_proc_init(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(efw-&gt;card, "firewire",</div><div class='add'>+					  efw-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(efw, root, "clock", proc_read_clock);</div><div class='add'>+	add_node(efw, root, "firmware", proc_read_hwinfo);</div><div class='add'>+	add_node(efw, root, "meters", proc_read_phys_meters);</div><div class='add'>+	add_node(efw, root, "queues", proc_read_queues_state);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c<br/>new file mode 100644<br/>index 000000000000..974084e1c083<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_stream.c</a></div><div class='hunk'>@@ -0,0 +1,368 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_stream.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+#include "./fireworks.h"</div><div class='add'>+</div><div class='add'>+#define READY_TIMEOUT_MS	1000</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_efw *efw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	enum cmp_direction c_dir;</div><div class='add'>+	enum amdtp_stream_direction s_dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;efw-&gt;tx_stream) {</div><div class='add'>+		conn = &amp;efw-&gt;out_conn;</div><div class='add'>+		c_dir = CMP_OUTPUT;</div><div class='add'>+		s_dir = AMDTP_IN_STREAM;</div><div class='add'>+	} else {</div><div class='add'>+		conn = &amp;efw-&gt;in_conn;</div><div class='add'>+		c_dir = CMP_INPUT;</div><div class='add'>+		s_dir = AMDTP_OUT_STREAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_init(conn, efw-&gt;unit, c_dir, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_init(stream, efw-&gt;unit, s_dir, CIP_BLOCKING | CIP_UNAWARE_SYT);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		amdtp_stream_destroy(stream);</div><div class='add'>+		cmp_connection_destroy(conn);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;efw-&gt;tx_stream) {</div><div class='add'>+		// Fireworks transmits NODATA packets with TAG0.</div><div class='add'>+		efw-&gt;tx_stream.flags |= CIP_EMPTY_WITH_TAG0;</div><div class='add'>+		// Fireworks has its own meaning for dbc.</div><div class='add'>+		efw-&gt;tx_stream.flags |= CIP_DBC_IS_END_EVENT;</div><div class='add'>+		// Fireworks reset dbc at bus reset.</div><div class='add'>+		efw-&gt;tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK;</div><div class='add'>+		// But Recent firmwares starts packets with non-zero dbc.</div><div class='add'>+		// Driver version 5.7.6 installs firmware version 5.7.3.</div><div class='add'>+		if (efw-&gt;is_fireworks3 &amp;&amp;</div><div class='add'>+		    (efw-&gt;firmware_version == 0x5070000 ||</div><div class='add'>+		     efw-&gt;firmware_version == 0x5070300 ||</div><div class='add'>+		     efw-&gt;firmware_version == 0x5080000))</div><div class='add'>+			efw-&gt;tx_stream.flags |= CIP_UNALIGHED_DBC;</div><div class='add'>+		// AudioFire9 always reports wrong dbs. Onyx 1200F with the latest firmware (v4.6.0)</div><div class='add'>+		// also report wrong dbs at 88.2 kHz or greater.</div><div class='add'>+		if (efw-&gt;is_af9 || efw-&gt;firmware_version == 0x4060000)</div><div class='add'>+			efw-&gt;tx_stream.flags |= CIP_WRONG_DBS;</div><div class='add'>+		// Firmware version 5.5 reports fixed interval for dbc.</div><div class='add'>+		if (efw-&gt;firmware_version == 0x5050000)</div><div class='add'>+			efw-&gt;tx_stream.ctx_data.tx.dbc_interval = 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_stream(struct snd_efw *efw, struct amdtp_stream *stream,</div><div class='add'>+			unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;efw-&gt;tx_stream)</div><div class='add'>+		conn = &amp;efw-&gt;out_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;efw-&gt;in_conn;</div><div class='add'>+</div><div class='add'>+	// Establish connection via CMP.</div><div class='add'>+	err = cmp_connection_establish(conn);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Start amdtp stream.</div><div class='add'>+	err = amdtp_domain_add_stream(&amp;efw-&gt;domain, stream,</div><div class='add'>+				      conn-&gt;resources.channel, conn-&gt;speed);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cmp_connection_break(conn);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function should be called before starting the stream or after stopping</div><div class='add'>+// the streams.</div><div class='add'>+static void destroy_stream(struct snd_efw *efw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(stream);</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;efw-&gt;tx_stream)</div><div class='add'>+		cmp_connection_destroy(&amp;efw-&gt;out_conn);</div><div class='add'>+	else</div><div class='add'>+		cmp_connection_destroy(&amp;efw-&gt;in_conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+check_connection_used_by_others(struct snd_efw *efw, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	bool used;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;efw-&gt;tx_stream)</div><div class='add'>+		conn = &amp;efw-&gt;out_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;efw-&gt;in_conn;</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_check_used(conn, &amp;used);</div><div class='add'>+	if ((err &gt;= 0) &amp;&amp; used &amp;&amp; !amdtp_stream_running(s)) {</div><div class='add'>+		dev_err(&amp;efw-&gt;unit-&gt;device,</div><div class='add'>+			"Connection established by others: %cPCR[%d]\n",</div><div class='add'>+			(conn-&gt;direction == CMP_OUTPUT) ? 'o' : 'i',</div><div class='add'>+			conn-&gt;pcr_index);</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_stream_init_duplex(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(efw, &amp;efw-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(efw, &amp;efw-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(efw, &amp;efw-&gt;tx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;efw-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(efw, &amp;efw-&gt;tx_stream);</div><div class='add'>+		destroy_stream(efw, &amp;efw-&gt;rx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// set IEC61883 compliant mode (actually not fully compliant...).</div><div class='add'>+	err = snd_efw_command_set_tx_mode(efw, SND_EFW_TRANSPORT_MODE_IEC61883);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(efw, &amp;efw-&gt;tx_stream);</div><div class='add'>+		destroy_stream(efw, &amp;efw-&gt;rx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_efw *efw, struct amdtp_stream *stream,</div><div class='add'>+			  unsigned int rate, unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+	unsigned int midi_ports;</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;efw-&gt;tx_stream) {</div><div class='add'>+		pcm_channels = efw-&gt;pcm_capture_channels[mode];</div><div class='add'>+		midi_ports = efw-&gt;midi_out_ports;</div><div class='add'>+		conn = &amp;efw-&gt;out_conn;</div><div class='add'>+	} else {</div><div class='add'>+		pcm_channels = efw-&gt;pcm_playback_channels[mode];</div><div class='add'>+		midi_ports = efw-&gt;midi_in_ports;</div><div class='add'>+		conn = &amp;efw-&gt;in_conn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_set_parameters(stream, rate, pcm_channels,</div><div class='add'>+					 midi_ports, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate,</div><div class='add'>+				  unsigned int frames_per_period,</div><div class='add'>+				  unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Considering JACK/FFADO streaming:</div><div class='add'>+	// TODO: This can be removed hwdep functionality becomes popular.</div><div class='add'>+	err = check_connection_used_by_others(efw, &amp;efw-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// stop streams if rate is different.</div><div class='add'>+	err = snd_efw_command_get_sampling_rate(efw, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0)</div><div class='add'>+		rate = curr_rate;</div><div class='add'>+	if (rate != curr_rate) {</div><div class='add'>+		amdtp_domain_stop(&amp;efw-&gt;domain);</div><div class='add'>+</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;out_conn);</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+		cmp_connection_release(&amp;efw-&gt;out_conn);</div><div class='add'>+		cmp_connection_release(&amp;efw-&gt;in_conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;substreams_counter == 0 || rate != curr_rate) {</div><div class='add'>+		unsigned int mode;</div><div class='add'>+</div><div class='add'>+		err = snd_efw_command_set_sampling_rate(efw, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = snd_efw_get_multiplier_mode(rate, &amp;mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(efw, &amp;efw-&gt;tx_stream, rate, mode);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(efw, &amp;efw-&gt;rx_stream, rate, mode);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			cmp_connection_release(&amp;efw-&gt;in_conn);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;efw-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			cmp_connection_release(&amp;efw-&gt;in_conn);</div><div class='add'>+			cmp_connection_release(&amp;efw-&gt;out_conn);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_stream_start_duplex(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	// Need no substreams.</div><div class='add'>+	if (efw-&gt;substreams_counter == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;efw-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;efw-&gt;tx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;efw-&gt;domain);</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;out_conn);</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;in_conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_efw_command_get_sampling_rate(efw, &amp;rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(&amp;efw-&gt;rx_stream)) {</div><div class='add'>+		unsigned int tx_init_skip_cycles;</div><div class='add'>+</div><div class='add'>+		// Audiofire 2/4 skip an isochronous cycle several thousands after starting</div><div class='add'>+		// packet transmission.</div><div class='add'>+		if (efw-&gt;is_fireworks3 &amp;&amp; !efw-&gt;is_af9)</div><div class='add'>+			tx_init_skip_cycles = 6000;</div><div class='add'>+		else</div><div class='add'>+			tx_init_skip_cycles = 0;</div><div class='add'>+</div><div class='add'>+		err = start_stream(efw, &amp;efw-&gt;rx_stream, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = start_stream(efw, &amp;efw-&gt;tx_stream, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		// NOTE: The device ignores presentation time expressed by the value of syt field</div><div class='add'>+		// of CIP header in received packets. The sequence of the number of data blocks per</div><div class='add'>+		// packet is important for media clock recovery.</div><div class='add'>+		err = amdtp_domain_start(&amp;efw-&gt;domain, tx_init_skip_cycles, true, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;efw-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;efw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	cmp_connection_break(&amp;efw-&gt;out_conn);</div><div class='add'>+	cmp_connection_break(&amp;efw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_stream_stop_duplex(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	if (efw-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;efw-&gt;domain);</div><div class='add'>+</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;out_conn);</div><div class='add'>+		cmp_connection_break(&amp;efw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+		cmp_connection_release(&amp;efw-&gt;out_conn);</div><div class='add'>+		cmp_connection_release(&amp;efw-&gt;in_conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_stream_update_duplex(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_stop(&amp;efw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	cmp_connection_break(&amp;efw-&gt;out_conn);</div><div class='add'>+	cmp_connection_break(&amp;efw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;efw-&gt;rx_stream);</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;efw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_stream_destroy_duplex(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;efw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(efw, &amp;efw-&gt;rx_stream);</div><div class='add'>+	destroy_stream(efw, &amp;efw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_stream_lock_changed(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	efw-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;efw-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_stream_lock_try(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (efw-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (efw-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_efw_stream_lock_changed(efw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_stream_lock_release(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(efw-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--efw-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_efw_stream_lock_changed(efw);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/fireworks/fireworks_transaction.c b/sound/firewire/fireworks/fireworks_transaction.c<br/>new file mode 100644<br/>index 000000000000..5c859773fe06<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/fireworks/fireworks_transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/fireworks/fireworks_transaction.c</a></div><div class='hunk'>@@ -0,0 +1,313 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * fireworks_transaction.c - a part of driver for Fireworks based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2013-2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fireworks have its own transaction. The transaction can be delivered by AV/C</div><div class='add'>+ * Vendor Specific command frame or usual asynchronous transaction. At least,</div><div class='add'>+ * Windows driver and firmware version 5.5 or later don't use AV/C command.</div><div class='add'>+ *</div><div class='add'>+ * Transaction substance:</div><div class='add'>+ *  At first, 6 data exist. Following to the data, parameters for each command</div><div class='add'>+ *  exist. All of the parameters are 32 bit aligned to big endian.</div><div class='add'>+ *   data[0]:	Length of transaction substance</div><div class='add'>+ *   data[1]:	Transaction version</div><div class='add'>+ *   data[2]:	Sequence number. This is incremented by the device</div><div class='add'>+ *   data[3]:	Transaction category</div><div class='add'>+ *   data[4]:	Transaction command</div><div class='add'>+ *   data[5]:	Return value in response.</div><div class='add'>+ *   data[6-]:	Parameters</div><div class='add'>+ *</div><div class='add'>+ * Transaction address:</div><div class='add'>+ *  command:	0xecc000000000</div><div class='add'>+ *  response:	0xecc080000000 (default)</div><div class='add'>+ *</div><div class='add'>+ * I note that the address for response can be changed by command. But this</div><div class='add'>+ * module uses the default address.</div><div class='add'>+ */</div><div class='add'>+#include "./fireworks.h"</div><div class='add'>+</div><div class='add'>+#define MEMORY_SPACE_EFW_COMMAND	0xecc000000000ULL</div><div class='add'>+#define MEMORY_SPACE_EFW_RESPONSE	0xecc080000000ULL</div><div class='add'>+</div><div class='add'>+#define ERROR_RETRIES 3</div><div class='add'>+#define ERROR_DELAY_MS 5</div><div class='add'>+#define EFC_TIMEOUT_MS 125</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(instances_lock);</div><div class='add'>+static struct snd_efw *instances[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;</div><div class='add'>+</div><div class='add'>+static DEFINE_SPINLOCK(transaction_queues_lock);</div><div class='add'>+static LIST_HEAD(transaction_queues);</div><div class='add'>+</div><div class='add'>+enum transaction_queue_state {</div><div class='add'>+	STATE_PENDING,</div><div class='add'>+	STATE_BUS_RESET,</div><div class='add'>+	STATE_COMPLETE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct transaction_queue {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	void *buf;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	u32 seqnum;</div><div class='add'>+	enum transaction_queue_state state;</div><div class='add'>+	wait_queue_head_t wait;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_efw_transaction_cmd(struct fw_unit *unit,</div><div class='add'>+			    const void *cmd, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(unit, TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				  MEMORY_SPACE_EFW_COMMAND,</div><div class='add'>+				  (void *)cmd, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_efw_transaction_run(struct fw_unit *unit,</div><div class='add'>+			    const void *cmd, unsigned int cmd_size,</div><div class='add'>+			    void *resp, unsigned int resp_size)</div><div class='add'>+{</div><div class='add'>+	struct transaction_queue t;</div><div class='add'>+	unsigned int tries;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	t.unit = unit;</div><div class='add'>+	t.buf = resp;</div><div class='add'>+	t.size = resp_size;</div><div class='add'>+	t.seqnum = be32_to_cpu(((struct snd_efw_transaction *)cmd)-&gt;seqnum) + 1;</div><div class='add'>+	t.state = STATE_PENDING;</div><div class='add'>+	init_waitqueue_head(&amp;t.wait);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;transaction_queues_lock) {</div><div class='add'>+		list_add_tail(&amp;t.list, &amp;transaction_queues);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tries = 0;</div><div class='add'>+	do {</div><div class='add'>+		ret = snd_efw_transaction_cmd(t.unit, (void *)cmd, cmd_size);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		wait_event_timeout(t.wait, t.state != STATE_PENDING,</div><div class='add'>+				   msecs_to_jiffies(EFC_TIMEOUT_MS));</div><div class='add'>+</div><div class='add'>+		if (t.state == STATE_COMPLETE) {</div><div class='add'>+			ret = t.size;</div><div class='add'>+			break;</div><div class='add'>+		} else if (t.state == STATE_BUS_RESET) {</div><div class='add'>+			msleep(ERROR_DELAY_MS);</div><div class='add'>+		} else if (++tries &gt;= ERROR_RETRIES) {</div><div class='add'>+			dev_err(&amp;t.unit-&gt;device, "EFW transaction timed out\n");</div><div class='add'>+			ret = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;transaction_queues_lock) {</div><div class='add'>+		list_del(&amp;t.list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode)</div><div class='add'>+{</div><div class='add'>+	size_t capacity, till_end;</div><div class='add'>+	struct snd_efw_transaction *t;</div><div class='add'>+</div><div class='add'>+	t = (struct snd_efw_transaction *)data;</div><div class='add'>+	length = min_t(size_t, be32_to_cpu(t-&gt;length) * sizeof(u32), length);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;efw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (efw-&gt;push_ptr &lt; efw-&gt;pull_ptr)</div><div class='add'>+		capacity = (unsigned int)(efw-&gt;pull_ptr - efw-&gt;push_ptr);</div><div class='add'>+	else</div><div class='add'>+		capacity = snd_efw_resp_buf_size -</div><div class='add'>+			   (unsigned int)(efw-&gt;push_ptr - efw-&gt;pull_ptr);</div><div class='add'>+</div><div class='add'>+	/* confirm enough space for this response */</div><div class='add'>+	if (capacity &lt; length) {</div><div class='add'>+		*rcode = RCODE_CONFLICT_ERROR;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* copy to ring buffer */</div><div class='add'>+	while (length &gt; 0) {</div><div class='add'>+		till_end = snd_efw_resp_buf_size -</div><div class='add'>+			   (unsigned int)(efw-&gt;push_ptr - efw-&gt;resp_buf);</div><div class='add'>+		till_end = min_t(unsigned int, length, till_end);</div><div class='add'>+</div><div class='add'>+		memcpy(efw-&gt;push_ptr, data, till_end);</div><div class='add'>+</div><div class='add'>+		efw-&gt;push_ptr += till_end;</div><div class='add'>+		if (efw-&gt;push_ptr &gt;= efw-&gt;resp_buf + snd_efw_resp_buf_size)</div><div class='add'>+			efw-&gt;push_ptr -= snd_efw_resp_buf_size;</div><div class='add'>+</div><div class='add'>+		length -= till_end;</div><div class='add'>+		data += till_end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for hwdep */</div><div class='add'>+	wake_up(&amp;efw-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	*rcode = RCODE_COMPLETE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+handle_resp_for_user(struct fw_card *card, int generation, int source,</div><div class='add'>+		     void *data, size_t length, int *rcode)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device;</div><div class='add'>+	struct snd_efw *efw;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;instances_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='add'>+		efw = instances[i];</div><div class='add'>+		if (efw == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		device = fw_parent_device(efw-&gt;unit);</div><div class='add'>+		if ((device-&gt;card != card) ||</div><div class='add'>+		    (device-&gt;generation != generation))</div><div class='add'>+			continue;</div><div class='add'>+		smp_rmb();	/* node id vs. generation */</div><div class='add'>+		if (device-&gt;node_id != source)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (i == SNDRV_CARDS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	copy_resp_to_buf(efw, data, length, rcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+handle_resp_for_kernel(struct fw_card *card, int generation, int source,</div><div class='add'>+		       void *data, size_t length, int *rcode, u32 seqnum)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device;</div><div class='add'>+	struct transaction_queue *t;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;transaction_queues_lock);</div><div class='add'>+	list_for_each_entry(t, &amp;transaction_queues, list) {</div><div class='add'>+		device = fw_parent_device(t-&gt;unit);</div><div class='add'>+		if ((device-&gt;card != card) ||</div><div class='add'>+		    (device-&gt;generation != generation))</div><div class='add'>+			continue;</div><div class='add'>+		smp_rmb();	/* node_id vs. generation */</div><div class='add'>+		if (device-&gt;node_id != source)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((t-&gt;state == STATE_PENDING) &amp;&amp; (t-&gt;seqnum == seqnum)) {</div><div class='add'>+			t-&gt;state = STATE_COMPLETE;</div><div class='add'>+			t-&gt;size = min_t(unsigned int, length, t-&gt;size);</div><div class='add'>+			memcpy(t-&gt;buf, data, t-&gt;size);</div><div class='add'>+			wake_up(&amp;t-&gt;wait);</div><div class='add'>+			*rcode = RCODE_COMPLETE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+efw_response(struct fw_card *card, struct fw_request *request,</div><div class='add'>+	     int tcode, int destination, int source,</div><div class='add'>+	     int generation, unsigned long long offset,</div><div class='add'>+	     void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	int rcode, dummy;</div><div class='add'>+	u32 seqnum;</div><div class='add'>+</div><div class='add'>+	rcode = RCODE_TYPE_ERROR;</div><div class='add'>+	if (length &lt; sizeof(struct snd_efw_transaction)) {</div><div class='add'>+		rcode = RCODE_DATA_ERROR;</div><div class='add'>+		goto end;</div><div class='add'>+	} else if (offset != MEMORY_SPACE_EFW_RESPONSE) {</div><div class='add'>+		rcode = RCODE_ADDRESS_ERROR;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seqnum = be32_to_cpu(((struct snd_efw_transaction *)data)-&gt;seqnum);</div><div class='add'>+	if (seqnum &gt; SND_EFW_TRANSACTION_USER_SEQNUM_MAX + 1) {</div><div class='add'>+		handle_resp_for_kernel(card, generation, source,</div><div class='add'>+				       data, length, &amp;rcode, seqnum);</div><div class='add'>+		if (snd_efw_resp_buf_debug)</div><div class='add'>+			handle_resp_for_user(card, generation, source,</div><div class='add'>+					     data, length, &amp;dummy);</div><div class='add'>+	} else {</div><div class='add'>+		handle_resp_for_user(card, generation, source,</div><div class='add'>+				     data, length, &amp;rcode);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	fw_send_response(card, request, rcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_transaction_add_instance(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;instances_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='add'>+		if (instances[i] != NULL)</div><div class='add'>+			continue;</div><div class='add'>+		instances[i] = efw;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_transaction_remove_instance(struct snd_efw *efw)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;instances_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SNDRV_CARDS; i++) {</div><div class='add'>+		if (instances[i] != efw)</div><div class='add'>+			continue;</div><div class='add'>+		instances[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_transaction_bus_reset(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct transaction_queue *t;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;transaction_queues_lock);</div><div class='add'>+	list_for_each_entry(t, &amp;transaction_queues, list) {</div><div class='add'>+		if ((t-&gt;unit == unit) &amp;&amp;</div><div class='add'>+		    (t-&gt;state == STATE_PENDING)) {</div><div class='add'>+			t-&gt;state = STATE_BUS_RESET;</div><div class='add'>+			wake_up(&amp;t-&gt;wait);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fw_address_handler resp_register_handler = {</div><div class='add'>+	.length = SND_EFW_RESPONSE_MAXIMUM_BYTES,</div><div class='add'>+	.address_callback = efw_response</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_efw_transaction_register(void)</div><div class='add'>+{</div><div class='add'>+	static const struct fw_address_region resp_register_region = {</div><div class='add'>+		.start	= MEMORY_SPACE_EFW_RESPONSE,</div><div class='add'>+		.end	= MEMORY_SPACE_EFW_RESPONSE +</div><div class='add'>+			  SND_EFW_RESPONSE_MAXIMUM_BYTES</div><div class='add'>+	};</div><div class='add'>+	return fw_core_add_address_handler(&amp;resp_register_handler,</div><div class='add'>+					   &amp;resp_register_region);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_efw_transaction_unregister(void)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;transaction_queues));</div><div class='add'>+	fw_core_remove_address_handler(&amp;resp_register_handler);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c<br/>new file mode 100644<br/>index 000000000000..2b7f071d593b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/isight.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/isight.c</a></div><div class='hunk'>@@ -0,0 +1,733 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Apple iSight audio driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include "lib.h"</div><div class='add'>+#include "iso-resources.h"</div><div class='add'>+#include "packets-buffer.h"</div><div class='add'>+</div><div class='add'>+#define OUI_APPLE		0x000a27</div><div class='add'>+#define MODEL_APPLE_ISIGHT	0x000008</div><div class='add'>+#define SW_ISIGHT_AUDIO		0x000010</div><div class='add'>+</div><div class='add'>+#define REG_AUDIO_ENABLE	0x000</div><div class='add'>+#define  AUDIO_ENABLE		0x80000000</div><div class='add'>+#define REG_DEF_AUDIO_GAIN	0x204</div><div class='add'>+#define REG_GAIN_RAW_START	0x210</div><div class='add'>+#define REG_GAIN_RAW_END	0x214</div><div class='add'>+#define REG_GAIN_DB_START	0x218</div><div class='add'>+#define REG_GAIN_DB_END		0x21c</div><div class='add'>+#define REG_SAMPLE_RATE_INQUIRY	0x280</div><div class='add'>+#define REG_ISO_TX_CONFIG	0x300</div><div class='add'>+#define  SPEED_SHIFT		16</div><div class='add'>+#define REG_SAMPLE_RATE		0x400</div><div class='add'>+#define  RATE_48000		0x80000000</div><div class='add'>+#define REG_GAIN		0x500</div><div class='add'>+#define REG_MUTE		0x504</div><div class='add'>+</div><div class='add'>+#define MAX_FRAMES_PER_PACKET	475</div><div class='add'>+</div><div class='add'>+#define QUEUE_LENGTH		20</div><div class='add'>+</div><div class='add'>+struct isight {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	struct fw_device *device;</div><div class='add'>+	u64 audio_base;</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	struct iso_packets_buffer buffer;</div><div class='add'>+	struct fw_iso_resources resources;</div><div class='add'>+	struct fw_iso_context *context;</div><div class='add'>+	bool pcm_active;</div><div class='add'>+	bool pcm_running;</div><div class='add'>+	bool first_packet;</div><div class='add'>+	int packet_index;</div><div class='add'>+	u32 total_samples;</div><div class='add'>+	unsigned int buffer_pointer;</div><div class='add'>+	unsigned int period_counter;</div><div class='add'>+	s32 gain_min, gain_max;</div><div class='add'>+	unsigned int gain_tlv[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct audio_payload {</div><div class='add'>+	__be32 sample_count;</div><div class='add'>+	__be32 signature;</div><div class='add'>+	__be32 sample_total;</div><div class='add'>+	__be32 reserved;</div><div class='add'>+	__be16 samples[2 * MAX_FRAMES_PER_PACKET];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("iSight audio driver");</div><div class='add'>+MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static struct fw_iso_packet audio_packet = {</div><div class='add'>+	.payload_length = sizeof(struct audio_payload),</div><div class='add'>+	.interrupt = 1,</div><div class='add'>+	.header_length = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void isight_update_pointers(struct isight *isight, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = isight-&gt;pcm-&gt;runtime;</div><div class='add'>+	unsigned int ptr;</div><div class='add'>+</div><div class='add'>+	smp_wmb(); /* update buffer data before buffer pointer */</div><div class='add'>+</div><div class='add'>+	ptr = isight-&gt;buffer_pointer;</div><div class='add'>+	ptr += count;</div><div class='add'>+	if (ptr &gt;= runtime-&gt;buffer_size)</div><div class='add'>+		ptr -= runtime-&gt;buffer_size;</div><div class='add'>+	WRITE_ONCE(isight-&gt;buffer_pointer, ptr);</div><div class='add'>+</div><div class='add'>+	isight-&gt;period_counter += count;</div><div class='add'>+	if (isight-&gt;period_counter &gt;= runtime-&gt;period_size) {</div><div class='add'>+		isight-&gt;period_counter -= runtime-&gt;period_size;</div><div class='add'>+		snd_pcm_period_elapsed(isight-&gt;pcm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_samples(struct isight *isight,</div><div class='add'>+			   const __be16 *samples, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	unsigned int count1;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(isight-&gt;pcm_running))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	runtime = isight-&gt;pcm-&gt;runtime;</div><div class='add'>+	if (isight-&gt;buffer_pointer + count &lt;= runtime-&gt;buffer_size) {</div><div class='add'>+		memcpy(runtime-&gt;dma_area + isight-&gt;buffer_pointer * 4,</div><div class='add'>+		       samples, count * 4);</div><div class='add'>+	} else {</div><div class='add'>+		count1 = runtime-&gt;buffer_size - isight-&gt;buffer_pointer;</div><div class='add'>+		memcpy(runtime-&gt;dma_area + isight-&gt;buffer_pointer * 4,</div><div class='add'>+		       samples, count1 * 4);</div><div class='add'>+		samples += count1 * 2;</div><div class='add'>+		memcpy(runtime-&gt;dma_area, samples, (count - count1) * 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	isight_update_pointers(isight, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_pcm_abort(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	if (READ_ONCE(isight-&gt;pcm_active))</div><div class='add'>+		snd_pcm_stop_xrun(isight-&gt;pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_dropped_samples(struct isight *isight, unsigned int total)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	u32 dropped;</div><div class='add'>+	unsigned int count1;</div><div class='add'>+</div><div class='add'>+	if (!READ_ONCE(isight-&gt;pcm_running))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	runtime = isight-&gt;pcm-&gt;runtime;</div><div class='add'>+	dropped = total - isight-&gt;total_samples;</div><div class='add'>+	if (dropped &lt; runtime-&gt;buffer_size) {</div><div class='add'>+		if (isight-&gt;buffer_pointer + dropped &lt;= runtime-&gt;buffer_size) {</div><div class='add'>+			memset(runtime-&gt;dma_area + isight-&gt;buffer_pointer * 4,</div><div class='add'>+			       0, dropped * 4);</div><div class='add'>+		} else {</div><div class='add'>+			count1 = runtime-&gt;buffer_size - isight-&gt;buffer_pointer;</div><div class='add'>+			memset(runtime-&gt;dma_area + isight-&gt;buffer_pointer * 4,</div><div class='add'>+			       0, count1 * 4);</div><div class='add'>+			memset(runtime-&gt;dma_area, 0, (dropped - count1) * 4);</div><div class='add'>+		}</div><div class='add'>+		isight_update_pointers(isight, dropped);</div><div class='add'>+	} else {</div><div class='add'>+		isight_pcm_abort(isight);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_packet(struct fw_iso_context *context, u32 cycle,</div><div class='add'>+			  size_t header_length, void *header, void *data)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = data;</div><div class='add'>+	const struct audio_payload *payload;</div><div class='add'>+	unsigned int index, length, count, total;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (isight-&gt;packet_index &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	index = isight-&gt;packet_index;</div><div class='add'>+	payload = isight-&gt;buffer.packets[index].buffer;</div><div class='add'>+	length = be32_to_cpup(header) &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	if (likely(length &gt;= 16 &amp;&amp;</div><div class='add'>+		   payload-&gt;signature == cpu_to_be32(0x73676874/*"sght"*/))) {</div><div class='add'>+		count = be32_to_cpu(payload-&gt;sample_count);</div><div class='add'>+		if (likely(count &lt;= (length - 16) / 4)) {</div><div class='add'>+			total = be32_to_cpu(payload-&gt;sample_total);</div><div class='add'>+			if (unlikely(total != isight-&gt;total_samples)) {</div><div class='add'>+				if (!isight-&gt;first_packet)</div><div class='add'>+					isight_dropped_samples(isight, total);</div><div class='add'>+				isight-&gt;first_packet = false;</div><div class='add'>+				isight-&gt;total_samples = total;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			isight_samples(isight, payload-&gt;samples, count);</div><div class='add'>+			isight-&gt;total_samples += count;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fw_iso_context_queue(isight-&gt;context, &amp;audio_packet,</div><div class='add'>+				   &amp;isight-&gt;buffer.iso_buffer,</div><div class='add'>+				   isight-&gt;buffer.packets[index].offset);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;isight-&gt;unit-&gt;device, "queueing error: %d\n", err);</div><div class='add'>+		isight_pcm_abort(isight);</div><div class='add'>+		isight-&gt;packet_index = -1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	fw_iso_context_queue_flush(isight-&gt;context);</div><div class='add'>+</div><div class='add'>+	if (++index &gt;= QUEUE_LENGTH)</div><div class='add'>+		index = 0;</div><div class='add'>+	isight-&gt;packet_index = index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_connect(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	int ch, err;</div><div class='add'>+	__be32 value;</div><div class='add'>+</div><div class='add'>+retry_after_bus_reset:</div><div class='add'>+	ch = fw_iso_resources_allocate(&amp;isight-&gt;resources,</div><div class='add'>+				       sizeof(struct audio_payload),</div><div class='add'>+				       isight-&gt;device-&gt;max_speed);</div><div class='add'>+	if (ch &lt; 0) {</div><div class='add'>+		err = ch;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value = cpu_to_be32(ch | (isight-&gt;device-&gt;max_speed &lt;&lt; SPEED_SHIFT));</div><div class='add'>+	err = snd_fw_transaction(isight-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 isight-&gt;audio_base + REG_ISO_TX_CONFIG,</div><div class='add'>+				 &amp;value, 4, FW_FIXED_GENERATION |</div><div class='add'>+				 isight-&gt;resources.generation);</div><div class='add'>+	if (err == -EAGAIN) {</div><div class='add'>+		fw_iso_resources_free(&amp;isight-&gt;resources);</div><div class='add'>+		goto retry_after_bus_reset;</div><div class='add'>+	} else if (err &lt; 0) {</div><div class='add'>+		goto err_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_resources:</div><div class='add'>+	fw_iso_resources_free(&amp;isight-&gt;resources);</div><div class='add'>+error:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_hardware hardware = {</div><div class='add'>+		.info = SNDRV_PCM_INFO_MMAP |</div><div class='add'>+			SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+			SNDRV_PCM_INFO_BATCH |</div><div class='add'>+			SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+			SNDRV_PCM_INFO_BLOCK_TRANSFER,</div><div class='add'>+		.formats = SNDRV_PCM_FMTBIT_S16_BE,</div><div class='add'>+		.rates = SNDRV_PCM_RATE_48000,</div><div class='add'>+		.rate_min = 48000,</div><div class='add'>+		.rate_max = 48000,</div><div class='add'>+		.channels_min = 2,</div><div class='add'>+		.channels_max = 2,</div><div class='add'>+		.buffer_bytes_max = 4 * 1024 * 1024,</div><div class='add'>+		.period_bytes_min = MAX_FRAMES_PER_PACKET * 4,</div><div class='add'>+		.period_bytes_max = 1024 * 1024,</div><div class='add'>+		.periods_min = 2,</div><div class='add'>+		.periods_max = UINT_MAX,</div><div class='add'>+	};</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	substream-&gt;runtime-&gt;hw = hardware;</div><div class='add'>+</div><div class='add'>+	return iso_packets_buffer_init(&amp;isight-&gt;buffer, isight-&gt;unit,</div><div class='add'>+				       QUEUE_LENGTH,</div><div class='add'>+				       sizeof(struct audio_payload),</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	iso_packets_buffer_destroy(&amp;isight-&gt;buffer, isight-&gt;unit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			    struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(isight-&gt;pcm_active, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reg_read(struct isight *isight, int offset, __be32 *value)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(isight-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				  isight-&gt;audio_base + offset, value, 4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reg_write(struct isight *isight, int offset, __be32 value)</div><div class='add'>+{</div><div class='add'>+	return snd_fw_transaction(isight-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  isight-&gt;audio_base + offset, &amp;value, 4, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_stop_streaming(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	__be32 value;</div><div class='add'>+</div><div class='add'>+	if (!isight-&gt;context)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_iso_context_stop(isight-&gt;context);</div><div class='add'>+	fw_iso_context_destroy(isight-&gt;context);</div><div class='add'>+	isight-&gt;context = NULL;</div><div class='add'>+	fw_iso_resources_free(&amp;isight-&gt;resources);</div><div class='add'>+	value = 0;</div><div class='add'>+	snd_fw_transaction(isight-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   isight-&gt;audio_base + REG_AUDIO_ENABLE,</div><div class='add'>+			   &amp;value, 4, FW_QUIET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(isight-&gt;pcm_active, false);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;isight-&gt;mutex);</div><div class='add'>+	isight_stop_streaming(isight);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_start_streaming(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (isight-&gt;context) {</div><div class='add'>+		if (isight-&gt;packet_index &lt; 0)</div><div class='add'>+			isight_stop_streaming(isight);</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = reg_write(isight, REG_SAMPLE_RATE, cpu_to_be32(RATE_48000));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = isight_connect(isight);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = reg_write(isight, REG_AUDIO_ENABLE, cpu_to_be32(AUDIO_ENABLE));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_resources;</div><div class='add'>+</div><div class='add'>+	isight-&gt;context = fw_iso_context_create(isight-&gt;device-&gt;card,</div><div class='add'>+						FW_ISO_CONTEXT_RECEIVE,</div><div class='add'>+						isight-&gt;resources.channel,</div><div class='add'>+						isight-&gt;device-&gt;max_speed,</div><div class='add'>+						4, isight_packet, isight);</div><div class='add'>+	if (IS_ERR(isight-&gt;context)) {</div><div class='add'>+		err = PTR_ERR(isight-&gt;context);</div><div class='add'>+		isight-&gt;context = NULL;</div><div class='add'>+		goto err_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; QUEUE_LENGTH; ++i) {</div><div class='add'>+		err = fw_iso_context_queue(isight-&gt;context, &amp;audio_packet,</div><div class='add'>+					   &amp;isight-&gt;buffer.iso_buffer,</div><div class='add'>+					   isight-&gt;buffer.packets[i].offset);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_context;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	isight-&gt;first_packet = true;</div><div class='add'>+	isight-&gt;packet_index = 0;</div><div class='add'>+</div><div class='add'>+	err = fw_iso_context_start(isight-&gt;context, -1, 0,</div><div class='add'>+				   FW_ISO_CONTEXT_MATCH_ALL_TAGS/*?*/);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_context;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_context:</div><div class='add'>+	fw_iso_context_destroy(isight-&gt;context);</div><div class='add'>+	isight-&gt;context = NULL;</div><div class='add'>+err_resources:</div><div class='add'>+	fw_iso_resources_free(&amp;isight-&gt;resources);</div><div class='add'>+	reg_write(isight, REG_AUDIO_ENABLE, 0);</div><div class='add'>+error:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	isight-&gt;buffer_pointer = 0;</div><div class='add'>+	isight-&gt;period_counter = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;isight-&gt;mutex);</div><div class='add'>+	return isight_start_streaming(isight);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		WRITE_ONCE(isight-&gt;pcm_running, true);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		WRITE_ONCE(isight-&gt;pcm_running, false);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t isight_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return READ_ONCE(isight-&gt;buffer_pointer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_create_pcm(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops ops = {</div><div class='add'>+		.open      = isight_open,</div><div class='add'>+		.close     = isight_close,</div><div class='add'>+		.hw_params = isight_hw_params,</div><div class='add'>+		.hw_free   = isight_hw_free,</div><div class='add'>+		.prepare   = isight_prepare,</div><div class='add'>+		.trigger   = isight_trigger,</div><div class='add'>+		.pointer   = isight_pointer,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(isight-&gt;card, "iSight", 0, 0, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	pcm-&gt;private_data = isight;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	strscpy(pcm-&gt;name, "iSight");</div><div class='add'>+	isight-&gt;pcm = pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream;</div><div class='add'>+	isight-&gt;pcm-&gt;ops = &amp;ops;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_gain_info(struct snd_kcontrol *ctl,</div><div class='add'>+			    struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = ctl-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	info-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	info-&gt;count = 1;</div><div class='add'>+	info-&gt;value.integer.min = isight-&gt;gain_min;</div><div class='add'>+	info-&gt;value.integer.max = isight-&gt;gain_max;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_gain_get(struct snd_kcontrol *ctl,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = ctl-&gt;private_data;</div><div class='add'>+	__be32 gain;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_GAIN, &amp;gain);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	value-&gt;value.integer.value[0] = (s32)be32_to_cpu(gain);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_gain_put(struct snd_kcontrol *ctl,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = ctl-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (value-&gt;value.integer.value[0] &lt; isight-&gt;gain_min ||</div><div class='add'>+	    value-&gt;value.integer.value[0] &gt; isight-&gt;gain_max)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return reg_write(isight, REG_GAIN,</div><div class='add'>+			 cpu_to_be32(value-&gt;value.integer.value[0]));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_mute_get(struct snd_kcontrol *ctl,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = ctl-&gt;private_data;</div><div class='add'>+	__be32 mute;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_MUTE, &amp;mute);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	value-&gt;value.integer.value[0] = !mute;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_mute_put(struct snd_kcontrol *ctl,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = ctl-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return reg_write(isight, REG_MUTE,</div><div class='add'>+			 (__force __be32)!value-&gt;value.integer.value[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_create_mixer(struct isight *isight)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_kcontrol_new gain_control = {</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "Mic Capture Volume",</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			  SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='add'>+		.info = isight_gain_info,</div><div class='add'>+		.get = isight_gain_get,</div><div class='add'>+		.put = isight_gain_put,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_kcontrol_new mute_control = {</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "Mic Capture Switch",</div><div class='add'>+		.info = snd_ctl_boolean_mono_info,</div><div class='add'>+		.get = isight_mute_get,</div><div class='add'>+		.put = isight_mute_put,</div><div class='add'>+	};</div><div class='add'>+	__be32 value;</div><div class='add'>+	struct snd_kcontrol *ctl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_GAIN_RAW_START, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	isight-&gt;gain_min = be32_to_cpu(value);</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_GAIN_RAW_END, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	isight-&gt;gain_max = be32_to_cpu(value);</div><div class='add'>+</div><div class='add'>+	isight-&gt;gain_tlv[SNDRV_CTL_TLVO_TYPE] = SNDRV_CTL_TLVT_DB_MINMAX;</div><div class='add'>+	isight-&gt;gain_tlv[SNDRV_CTL_TLVO_LEN] = 2 * sizeof(unsigned int);</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_GAIN_DB_START, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	isight-&gt;gain_tlv[SNDRV_CTL_TLVO_DB_MINMAX_MIN] =</div><div class='add'>+						(s32)be32_to_cpu(value) * 100;</div><div class='add'>+</div><div class='add'>+	err = reg_read(isight, REG_GAIN_DB_END, &amp;value);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	isight-&gt;gain_tlv[SNDRV_CTL_TLVO_DB_MINMAX_MAX] =</div><div class='add'>+						(s32)be32_to_cpu(value) * 100;</div><div class='add'>+</div><div class='add'>+	ctl = snd_ctl_new1(&amp;gain_control, isight);</div><div class='add'>+	if (ctl)</div><div class='add'>+		ctl-&gt;tlv.p = isight-&gt;gain_tlv;</div><div class='add'>+	err = snd_ctl_add(isight-&gt;card, ctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_ctl_add(isight-&gt;card, snd_ctl_new1(&amp;mute_control, isight));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	fw_iso_resources_destroy(&amp;isight-&gt;resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 get_unit_base(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct fw_csr_iterator i;</div><div class='add'>+	int key, value;</div><div class='add'>+</div><div class='add'>+	fw_csr_iterator_init(&amp;i, unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;i, &amp;key, &amp;value))</div><div class='add'>+		if (key == CSR_OFFSET)</div><div class='add'>+			return CSR_REGISTER_BASE + value * 4;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int isight_probe(struct fw_unit *unit,</div><div class='add'>+			const struct ieee1394_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(unit);</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct isight *isight;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE,</div><div class='add'>+			   sizeof(*isight), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	isight = card-&gt;private_data;</div><div class='add'>+	isight-&gt;card = card;</div><div class='add'>+	mutex_init(&amp;isight-&gt;mutex);</div><div class='add'>+	isight-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	isight-&gt;device = fw_dev;</div><div class='add'>+	isight-&gt;audio_base = get_unit_base(unit);</div><div class='add'>+	if (!isight-&gt;audio_base) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device, "audio unit base not found\n");</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	fw_iso_resources_init(&amp;isight-&gt;resources, unit);</div><div class='add'>+</div><div class='add'>+	card-&gt;private_free = isight_card_free;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "iSight");</div><div class='add'>+	strscpy(card-&gt;shortname, "Apple iSight");</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "Apple iSight (GUID %08x%08x) at %s, S%d",</div><div class='add'>+		 fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		 dev_name(&amp;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+	strscpy(card-&gt;mixername, "iSight");</div><div class='add'>+</div><div class='add'>+	err = isight_create_pcm(isight);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = isight_create_mixer(isight);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, isight);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;isight-&gt;mutex);</div><div class='add'>+	fw_unit_put(isight-&gt;unit);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_bus_reset(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	if (fw_iso_resources_update(&amp;isight-&gt;resources) &lt; 0) {</div><div class='add'>+		isight_pcm_abort(isight);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;isight-&gt;mutex);</div><div class='add'>+		isight_stop_streaming(isight);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void isight_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct isight *isight = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	isight_pcm_abort(isight);</div><div class='add'>+</div><div class='add'>+	snd_card_disconnect(isight-&gt;card);</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;isight-&gt;mutex) {</div><div class='add'>+		isight_stop_streaming(isight);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(isight-&gt;card);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;isight-&gt;mutex);</div><div class='add'>+	fw_unit_put(isight-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id isight_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.match_flags  = IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				IEEE1394_MATCH_VERSION,</div><div class='add'>+		.specifier_id = OUI_APPLE,</div><div class='add'>+		.version      = SW_ISIGHT_AUDIO,</div><div class='add'>+	},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, isight_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver isight_driver = {</div><div class='add'>+	.driver   = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = isight_probe,</div><div class='add'>+	.update   = isight_bus_reset,</div><div class='add'>+	.remove   = isight_remove,</div><div class='add'>+	.id_table = isight_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init alsa_isight_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;isight_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit alsa_isight_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;isight_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(alsa_isight_init);</div><div class='add'>+module_exit(alsa_isight_exit);</div><div class='head'>diff --git a/sound/firewire/iso-resources.c b/sound/firewire/iso-resources.c<br/>new file mode 100644<br/>index 000000000000..4f63279225c5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/iso-resources.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/iso-resources.c</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * isochronous resources helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/jiffies.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include "iso-resources.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_resources_init - initializes a &amp;struct fw_iso_resources</div><div class='add'>+ * @r: the resource manager to initialize</div><div class='add'>+ * @unit: the device unit for which the resources will be needed</div><div class='add'>+ *</div><div class='add'>+ * If the device does not support all channel numbers, change @r-&gt;channels_mask</div><div class='add'>+ * after calling this function.</div><div class='add'>+ */</div><div class='add'>+int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	r-&gt;channels_mask = ~0uLL;</div><div class='add'>+	r-&gt;unit = unit;</div><div class='add'>+	mutex_init(&amp;r-&gt;mutex);</div><div class='add'>+	r-&gt;allocated = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_iso_resources_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_resources_destroy - destroy a resource manager</div><div class='add'>+ * @r: the resource manager that is no longer needed</div><div class='add'>+ */</div><div class='add'>+void fw_iso_resources_destroy(struct fw_iso_resources *r)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(r-&gt;allocated);</div><div class='add'>+	mutex_destroy(&amp;r-&gt;mutex);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_iso_resources_destroy);</div><div class='add'>+</div><div class='add'>+static unsigned int packet_bandwidth(unsigned int max_payload_bytes, int speed)</div><div class='add'>+{</div><div class='add'>+	unsigned int bytes, s400_bytes;</div><div class='add'>+</div><div class='add'>+	/* iso packets have three header quadlets and quadlet-aligned payload */</div><div class='add'>+	bytes = 3 * 4 + ALIGN(max_payload_bytes, 4);</div><div class='add'>+</div><div class='add'>+	/* convert to bandwidth units (quadlets at S1600 = bytes at S400) */</div><div class='add'>+	if (speed &lt;= SCODE_400)</div><div class='add'>+		s400_bytes = bytes * (1 &lt;&lt; (SCODE_400 - speed));</div><div class='add'>+	else</div><div class='add'>+		s400_bytes = DIV_ROUND_UP(bytes, 1 &lt;&lt; (speed - SCODE_400));</div><div class='add'>+</div><div class='add'>+	return s400_bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int current_bandwidth_overhead(struct fw_card *card)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Under the usual pessimistic assumption (cable length 4.5 m), the</div><div class='add'>+	 * isochronous overhead for N cables is 1.797 µs + N * 0.494 µs, or</div><div class='add'>+	 * 88.3 + N * 24.3 in bandwidth units.</div><div class='add'>+	 *</div><div class='add'>+	 * The calculation below tries to deduce N from the current gap count.</div><div class='add'>+	 * If the gap count has been optimized by measuring the actual packet</div><div class='add'>+	 * transmission time, this derived overhead should be near the actual</div><div class='add'>+	 * overhead as well.</div><div class='add'>+	 */</div><div class='add'>+	return card-&gt;gap_count &lt; 63 ? card-&gt;gap_count * 97 / 10 + 89 : 512;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int wait_isoch_resource_delay_after_bus_reset(struct fw_card *card)</div><div class='add'>+{</div><div class='add'>+	for (;;) {</div><div class='add'>+		s64 delay = (card-&gt;reset_jiffies + HZ) - get_jiffies_64();</div><div class='add'>+		if (delay &lt;= 0)</div><div class='add'>+			return 0;</div><div class='add'>+		if (schedule_timeout_interruptible(delay) &gt; 0)</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_resources_allocate - allocate isochronous channel and bandwidth</div><div class='add'>+ * @r: the resource manager</div><div class='add'>+ * @max_payload_bytes: the amount of data (including CIP headers) per packet</div><div class='add'>+ * @speed: the speed (e.g., SCODE_400) at which the packets will be sent</div><div class='add'>+ *</div><div class='add'>+ * This function allocates one isochronous channel and enough bandwidth for the</div><div class='add'>+ * specified packet size.</div><div class='add'>+ *</div><div class='add'>+ * Returns the channel number that the caller must use for streaming, or</div><div class='add'>+ * a negative error code.  Due to potentionally long delays, this function is</div><div class='add'>+ * interruptible and can return -ERESTARTSYS.  On success, the caller is</div><div class='add'>+ * responsible for calling fw_iso_resources_update() on bus resets, and</div><div class='add'>+ * fw_iso_resources_free() when the resources are not longer needed.</div><div class='add'>+ */</div><div class='add'>+int fw_iso_resources_allocate(struct fw_iso_resources *r,</div><div class='add'>+			      unsigned int max_payload_bytes, int speed)</div><div class='add'>+{</div><div class='add'>+	struct fw_card *card = fw_parent_device(r-&gt;unit)-&gt;card;</div><div class='add'>+	int bandwidth, channel, err;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(r-&gt;allocated))</div><div class='add'>+		return -EBADFD;</div><div class='add'>+</div><div class='add'>+	r-&gt;bandwidth = packet_bandwidth(max_payload_bytes, speed);</div><div class='add'>+</div><div class='add'>+retry_after_bus_reset:</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;card-&gt;lock) {</div><div class='add'>+		r-&gt;generation = card-&gt;generation;</div><div class='add'>+		r-&gt;bandwidth_overhead = current_bandwidth_overhead(card);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = wait_isoch_resource_delay_after_bus_reset(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;r-&gt;mutex) {</div><div class='add'>+		bandwidth = r-&gt;bandwidth + r-&gt;bandwidth_overhead;</div><div class='add'>+		fw_iso_resource_manage(card, r-&gt;generation, r-&gt;channels_mask,</div><div class='add'>+				       &amp;channel, &amp;bandwidth, true);</div><div class='add'>+		if (channel == -EAGAIN)</div><div class='add'>+			goto retry_after_bus_reset;</div><div class='add'>+		if (channel &gt;= 0) {</div><div class='add'>+			r-&gt;channel = channel;</div><div class='add'>+			r-&gt;allocated = true;</div><div class='add'>+		} else {</div><div class='add'>+			if (channel == -EBUSY)</div><div class='add'>+				dev_err(&amp;r-&gt;unit-&gt;device,</div><div class='add'>+					"isochronous resources exhausted\n");</div><div class='add'>+			else</div><div class='add'>+				dev_err(&amp;r-&gt;unit-&gt;device,</div><div class='add'>+					"isochronous resource allocation failed\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return channel;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_iso_resources_allocate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_resources_update - update resource allocations after a bus reset</div><div class='add'>+ * @r: the resource manager</div><div class='add'>+ *</div><div class='add'>+ * This function must be called from the driver's .update handler to reallocate</div><div class='add'>+ * any resources that were allocated before the bus reset.  It is safe to call</div><div class='add'>+ * this function if no resources are currently allocated.</div><div class='add'>+ *</div><div class='add'>+ * Returns a negative error code on failure.  If this happens, the caller must</div><div class='add'>+ * stop streaming.</div><div class='add'>+ */</div><div class='add'>+int fw_iso_resources_update(struct fw_iso_resources *r)</div><div class='add'>+{</div><div class='add'>+	struct fw_card *card = fw_parent_device(r-&gt;unit)-&gt;card;</div><div class='add'>+	int bandwidth, channel;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;r-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (!r-&gt;allocated)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;card-&gt;lock) {</div><div class='add'>+		r-&gt;generation = card-&gt;generation;</div><div class='add'>+		r-&gt;bandwidth_overhead = current_bandwidth_overhead(card);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bandwidth = r-&gt;bandwidth + r-&gt;bandwidth_overhead;</div><div class='add'>+</div><div class='add'>+	fw_iso_resource_manage(card, r-&gt;generation, 1uLL &lt;&lt; r-&gt;channel,</div><div class='add'>+			       &amp;channel, &amp;bandwidth, true);</div><div class='add'>+	/*</div><div class='add'>+	 * When another bus reset happens, pretend that the allocation</div><div class='add'>+	 * succeeded; we will try again for the new generation later.</div><div class='add'>+	 */</div><div class='add'>+	if (channel &lt; 0 &amp;&amp; channel != -EAGAIN) {</div><div class='add'>+		r-&gt;allocated = false;</div><div class='add'>+		if (channel == -EBUSY)</div><div class='add'>+			dev_err(&amp;r-&gt;unit-&gt;device,</div><div class='add'>+				"isochronous resources exhausted\n");</div><div class='add'>+		else</div><div class='add'>+			dev_err(&amp;r-&gt;unit-&gt;device,</div><div class='add'>+				"isochronous resource allocation failed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return channel;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_iso_resources_update);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * fw_iso_resources_free - frees allocated resources</div><div class='add'>+ * @r: the resource manager</div><div class='add'>+ *</div><div class='add'>+ * This function deallocates the channel and bandwidth, if allocated.</div><div class='add'>+ */</div><div class='add'>+void fw_iso_resources_free(struct fw_iso_resources *r)</div><div class='add'>+{</div><div class='add'>+	struct fw_card *card;</div><div class='add'>+	int bandwidth, channel;</div><div class='add'>+</div><div class='add'>+	/* Not initialized. */</div><div class='add'>+	if (r-&gt;unit == NULL)</div><div class='add'>+		return;</div><div class='add'>+	card = fw_parent_device(r-&gt;unit)-&gt;card;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;r-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (r-&gt;allocated) {</div><div class='add'>+		bandwidth = r-&gt;bandwidth + r-&gt;bandwidth_overhead;</div><div class='add'>+		fw_iso_resource_manage(card, r-&gt;generation, 1uLL &lt;&lt; r-&gt;channel,</div><div class='add'>+				       &amp;channel, &amp;bandwidth, false);</div><div class='add'>+		if (channel &lt; 0)</div><div class='add'>+			dev_err(&amp;r-&gt;unit-&gt;device,</div><div class='add'>+				"isochronous resource deallocation failed\n");</div><div class='add'>+</div><div class='add'>+		r-&gt;allocated = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(fw_iso_resources_free);</div><div class='head'>diff --git a/sound/firewire/iso-resources.h b/sound/firewire/iso-resources.h<br/>new file mode 100644<br/>index 000000000000..34f85e9e8830<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/iso-resources.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/iso-resources.h</a></div><div class='hunk'>@@ -0,0 +1,39 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_ISO_RESOURCES_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_ISO_RESOURCES_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct fw_unit;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct fw_iso_resources - manages channel/bandwidth allocation</div><div class='add'>+ * @channels_mask: if the device does not support all channel numbers, set this</div><div class='add'>+ *                 bit mask to something else than the default (all ones)</div><div class='add'>+ *</div><div class='add'>+ * This structure manages (de)allocation of isochronous resources (channel and</div><div class='add'>+ * bandwidth) for one isochronous stream.</div><div class='add'>+ */</div><div class='add'>+struct fw_iso_resources {</div><div class='add'>+	u64 channels_mask;</div><div class='add'>+	/* private: */</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	unsigned int channel;</div><div class='add'>+	unsigned int bandwidth; /* in bandwidth units, without overhead */</div><div class='add'>+	unsigned int bandwidth_overhead;</div><div class='add'>+	int generation; /* in which allocation is valid */</div><div class='add'>+	bool allocated;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int fw_iso_resources_init(struct fw_iso_resources *r,</div><div class='add'>+			  struct fw_unit *unit);</div><div class='add'>+void fw_iso_resources_destroy(struct fw_iso_resources *r);</div><div class='add'>+</div><div class='add'>+int fw_iso_resources_allocate(struct fw_iso_resources *r,</div><div class='add'>+			      unsigned int max_payload_bytes, int speed);</div><div class='add'>+int fw_iso_resources_update(struct fw_iso_resources *r);</div><div class='add'>+void fw_iso_resources_free(struct fw_iso_resources *r);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/lib.c b/sound/firewire/lib.c<br/>new file mode 100644<br/>index 000000000000..654e1a6050a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/lib.c</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * miscellaneous helper functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "lib.h"</div><div class='add'>+</div><div class='add'>+#define ERROR_RETRY_DELAY_MS	20</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_fw_transaction - send a request and wait for its completion</div><div class='add'>+ * @unit: the driver's unit on the target device</div><div class='add'>+ * @tcode: the transaction code</div><div class='add'>+ * @offset: the address in the target's address space</div><div class='add'>+ * @buffer: input/output data</div><div class='add'>+ * @length: length of @buffer</div><div class='add'>+ * @flags: use %FW_FIXED_GENERATION and add the generation value to attempt the</div><div class='add'>+ *         request only in that generation; use %FW_QUIET to suppress error</div><div class='add'>+ *         messages</div><div class='add'>+ *</div><div class='add'>+ * Submits an asynchronous request to the target device, and waits for the</div><div class='add'>+ * response.  The node ID and the current generation are derived from @unit.</div><div class='add'>+ * On a bus reset or an error, the transaction is retried a few times.</div><div class='add'>+ * Returns zero on success, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_fw_transaction(struct fw_unit *unit, int tcode,</div><div class='add'>+		       u64 offset, void *buffer, size_t length,</div><div class='add'>+		       unsigned int flags)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(unit);</div><div class='add'>+	int generation, rcode, tries = 0;</div><div class='add'>+</div><div class='add'>+	generation = flags &amp; FW_GENERATION_MASK;</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (!(flags &amp; FW_FIXED_GENERATION)) {</div><div class='add'>+			generation = device-&gt;generation;</div><div class='add'>+			smp_rmb(); /* node_id vs. generation */</div><div class='add'>+		}</div><div class='add'>+		rcode = fw_run_transaction(device-&gt;card, tcode,</div><div class='add'>+					   device-&gt;node_id, generation,</div><div class='add'>+					   device-&gt;max_speed, offset,</div><div class='add'>+					   buffer, length);</div><div class='add'>+</div><div class='add'>+		if (rcode == RCODE_COMPLETE)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (rcode == RCODE_GENERATION &amp;&amp; (flags &amp; FW_FIXED_GENERATION))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		if (rcode_is_permanent_error(rcode) || ++tries &gt;= 3) {</div><div class='add'>+			if (!(flags &amp; FW_QUIET))</div><div class='add'>+				dev_err(&amp;unit-&gt;device,</div><div class='add'>+					"transaction failed: %s\n",</div><div class='add'>+					fw_rcode_string(rcode));</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		msleep(ERROR_RETRY_DELAY_MS);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_fw_transaction);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("FireWire audio helper functions");</div><div class='add'>+MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h<br/>new file mode 100644<br/>index 000000000000..664dfdb9e58d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/lib.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_LIB_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_LIB_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+</div><div class='add'>+struct fw_unit;</div><div class='add'>+</div><div class='add'>+#define FW_GENERATION_MASK	0x00ff</div><div class='add'>+#define FW_FIXED_GENERATION	0x0100</div><div class='add'>+#define FW_QUIET		0x0200</div><div class='add'>+</div><div class='add'>+int snd_fw_transaction(struct fw_unit *unit, int tcode,</div><div class='add'>+		       u64 offset, void *buffer, size_t length,</div><div class='add'>+		       unsigned int flags);</div><div class='add'>+</div><div class='add'>+/* returns true if retrying the transaction would not make sense */</div><div class='add'>+static inline bool rcode_is_permanent_error(int rcode)</div><div class='add'>+{</div><div class='add'>+	return rcode == RCODE_TYPE_ERROR || rcode == RCODE_ADDRESS_ERROR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/motu/Makefile b/sound/firewire/motu/Makefile<br/>new file mode 100644<br/>index 000000000000..df0fe886dbc0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+CFLAGS_amdtp-motu.o	:= -I$(src)</div><div class='add'>+</div><div class='add'>+snd-firewire-motu-y := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \</div><div class='add'>+			  motu-proc.o motu-pcm.o motu-midi.o motu-hwdep.o \</div><div class='add'>+			  motu-protocol-v2.o motu-protocol-v3.o \</div><div class='add'>+			  motu-protocol-v1.o motu-register-dsp-message-parser.o \</div><div class='add'>+			  motu-command-dsp-message-parser.o</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_MOTU) += snd-firewire-motu.o</div><div class='head'>diff --git a/sound/firewire/motu/amdtp-motu-trace.h b/sound/firewire/motu/amdtp-motu-trace.h<br/>new file mode 100644<br/>index 000000000000..3d36f125cf6a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/amdtp-motu-trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/amdtp-motu-trace.h</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * amdtp-motu-trace.h - tracepoint definitions to dump a part of packet data</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM		snd_firewire_motu</div><div class='add'>+</div><div class='add'>+#if !defined(_SND_FIREWIRE_MOTU_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _SND_FIREWIRE_MOTU_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+static void copy_sph(u32 *frame, __be32 *buffer, unsigned int data_blocks,</div><div class='add'>+		     unsigned int data_block_quadlets);</div><div class='add'>+static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks,</div><div class='add'>+			 unsigned int data_block_quadlets);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(data_block_sph,</div><div class='add'>+	TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer),</div><div class='add'>+	TP_ARGS(s, data_blocks, buffer),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, src)</div><div class='add'>+		__field(int, dst)</div><div class='add'>+		__field(unsigned int, data_blocks)</div><div class='add'>+		__dynamic_array(u32, tstamps, data_blocks)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+			__entry-&gt;dst = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+		} else {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+			__entry-&gt;dst = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+		}</div><div class='add'>+		__entry-&gt;data_blocks = data_blocks;</div><div class='add'>+		copy_sph(__get_dynamic_array(tstamps), buffer, data_blocks, s-&gt;data_block_quadlets);</div><div class='add'>+	),</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%04x %04x %u %s",</div><div class='add'>+		__entry-&gt;src,</div><div class='add'>+		__entry-&gt;dst,</div><div class='add'>+		__entry-&gt;data_blocks,</div><div class='add'>+		__print_array(__get_dynamic_array(tstamps), __entry-&gt;data_blocks, 4)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(data_block_message,</div><div class='add'>+	TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer),</div><div class='add'>+	TP_ARGS(s, data_blocks, buffer),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, src)</div><div class='add'>+		__field(int, dst)</div><div class='add'>+		__field(unsigned int, data_blocks)</div><div class='add'>+		__dynamic_array(u64, messages, data_blocks)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		if (s-&gt;direction == AMDTP_IN_STREAM) {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+			__entry-&gt;dst = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+		} else {</div><div class='add'>+			__entry-&gt;src = fw_parent_device(s-&gt;unit)-&gt;card-&gt;node_id;</div><div class='add'>+			__entry-&gt;dst = fw_parent_device(s-&gt;unit)-&gt;node_id;</div><div class='add'>+		}</div><div class='add'>+		__entry-&gt;data_blocks = data_blocks;</div><div class='add'>+		copy_message(__get_dynamic_array(messages), buffer, data_blocks, s-&gt;data_block_quadlets);</div><div class='add'>+	),</div><div class='add'>+	TP_printk(</div><div class='add'>+		"%04x %04x %u %s",</div><div class='add'>+		__entry-&gt;src,</div><div class='add'>+		__entry-&gt;dst,</div><div class='add'>+		__entry-&gt;data_blocks,</div><div class='add'>+		__print_array(__get_dynamic_array(messages), __entry-&gt;data_blocks, 8)</div><div class='add'>+	)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH	.</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE	amdtp-motu-trace</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/firewire/motu/amdtp-motu.c b/sound/firewire/motu/amdtp-motu.c<br/>new file mode 100644<br/>index 000000000000..39ed57d2c5a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/amdtp-motu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/amdtp-motu.c</a></div><div class='hunk'>@@ -0,0 +1,485 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * amdtp-motu.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "amdtp-motu-trace.h"</div><div class='add'>+</div><div class='add'>+#define CIP_FMT_MOTU		0x02</div><div class='add'>+#define CIP_FMT_MOTU_TX_V3	0x22</div><div class='add'>+#define MOTU_FDF_AM824		0x22</div><div class='add'>+</div><div class='add'>+#define TICKS_PER_CYCLE		3072</div><div class='add'>+#define CYCLES_PER_SECOND	8000</div><div class='add'>+#define TICKS_PER_SECOND	(TICKS_PER_CYCLE * CYCLES_PER_SECOND)</div><div class='add'>+</div><div class='add'>+#define CIP_SPH_CYCLE_SHIFT	12</div><div class='add'>+#define CIP_SPH_CYCLE_MASK	0x01fff000</div><div class='add'>+#define CIP_SPH_OFFSET_MASK	0x00000fff</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Nominally 3125 bytes/second, but the MIDI port's clock might be</div><div class='add'>+ * 1% too slow, and the bus clock 100 ppm too fast.</div><div class='add'>+ */</div><div class='add'>+#define MIDI_BYTES_PER_SECOND	3093</div><div class='add'>+</div><div class='add'>+struct amdtp_motu {</div><div class='add'>+	unsigned int pcm_chunks;</div><div class='add'>+	unsigned int pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+	struct snd_rawmidi_substream *midi;</div><div class='add'>+	unsigned int midi_ports;</div><div class='add'>+	unsigned int midi_flag_offset;</div><div class='add'>+	unsigned int midi_byte_offset;</div><div class='add'>+</div><div class='add'>+	int midi_db_count;</div><div class='add'>+	unsigned int midi_db_interval;</div><div class='add'>+</div><div class='add'>+	struct amdtp_motu_cache *cache;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_motu_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			      unsigned int midi_ports,</div><div class='add'>+			      struct snd_motu_packet_format *formats)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	unsigned int pcm_chunks, data_chunks, data_block_quadlets;</div><div class='add'>+	unsigned int mode;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(s))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		if (snd_motu_clock_rates[i] == rate) {</div><div class='add'>+			mode = i &gt;&gt; 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(snd_motu_clock_rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// Each data block includes SPH in its head. Data chunks follow with</div><div class='add'>+	// 3 byte alignment. Padding follows with zero to conform to quadlet</div><div class='add'>+	// alignment.</div><div class='add'>+	pcm_chunks = formats-&gt;pcm_chunks[mode];</div><div class='add'>+	data_chunks = formats-&gt;msg_chunks + pcm_chunks;</div><div class='add'>+	data_block_quadlets = 1 + DIV_ROUND_UP(data_chunks * 3, 4);</div><div class='add'>+</div><div class='add'>+	err = amdtp_stream_set_parameters(s, rate, data_block_quadlets, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	p-&gt;pcm_chunks = pcm_chunks;</div><div class='add'>+	p-&gt;pcm_byte_offset = formats-&gt;pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+	p-&gt;midi_ports = midi_ports;</div><div class='add'>+	p-&gt;midi_flag_offset = formats-&gt;midi_flag_offset;</div><div class='add'>+	p-&gt;midi_byte_offset = formats-&gt;midi_byte_offset;</div><div class='add'>+</div><div class='add'>+	p-&gt;midi_db_count = 0;</div><div class='add'>+	p-&gt;midi_db_interval = rate / MIDI_BYTES_PER_SECOND;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			 __be32 *buffer, unsigned int data_blocks,</div><div class='add'>+			 unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_chunks;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u8 *byte;</div><div class='add'>+	u32 *dst;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	dst = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		byte = (u8 *)buffer + p-&gt;pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			*dst = (byte[0] &lt;&lt; 24) |</div><div class='add'>+			       (byte[1] &lt;&lt; 16) |</div><div class='add'>+			       (byte[2] &lt;&lt; 8);</div><div class='add'>+			byte += 3;</div><div class='add'>+			dst++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			dst = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			  __be32 *buffer, unsigned int data_blocks,</div><div class='add'>+			  unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_chunks;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u8 *byte;</div><div class='add'>+	const u32 *src;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	src = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		byte = (u8 *)buffer + p-&gt;pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			byte[0] = (*src &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+			byte[1] = (*src &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			byte[2] = (*src &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+			byte += 3;</div><div class='add'>+			src++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			src = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_silence(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			      unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels, i, c;</div><div class='add'>+	u8 *byte;</div><div class='add'>+</div><div class='add'>+	channels = p-&gt;pcm_chunks;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		byte = (u8 *)buffer + p-&gt;pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			byte[0] = 0;</div><div class='add'>+			byte[1] = 0;</div><div class='add'>+			byte[2] = 0;</div><div class='add'>+			byte += 3;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_motu_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				      struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* TODO: how to set an constraint for exactly 24bit PCM sample? */</div><div class='add'>+	err = snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void amdtp_motu_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			     struct snd_rawmidi_substream *midi)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	if (port &lt; p-&gt;midi_ports)</div><div class='add'>+		WRITE_ONCE(p-&gt;midi, midi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+				unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	struct snd_rawmidi_substream *midi = READ_ONCE(p-&gt;midi);</div><div class='add'>+	u8 *b;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; i++) {</div><div class='add'>+		b = (u8 *)buffer;</div><div class='add'>+</div><div class='add'>+		if (midi &amp;&amp; p-&gt;midi_db_count == 0 &amp;&amp;</div><div class='add'>+		    snd_rawmidi_transmit(midi, b + p-&gt;midi_byte_offset, 1) == 1) {</div><div class='add'>+			b[p-&gt;midi_flag_offset] = 0x01;</div><div class='add'>+		} else {</div><div class='add'>+			b[p-&gt;midi_byte_offset] = 0x00;</div><div class='add'>+			b[p-&gt;midi_flag_offset] = 0x00;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+</div><div class='add'>+		if (--p-&gt;midi_db_count &lt; 0)</div><div class='add'>+			p-&gt;midi_db_count = p-&gt;midi_db_interval;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_midi_messages(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			       unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	struct snd_rawmidi_substream *midi;</div><div class='add'>+	u8 *b;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; i++) {</div><div class='add'>+		b = (u8 *)buffer;</div><div class='add'>+		midi = READ_ONCE(p-&gt;midi);</div><div class='add'>+</div><div class='add'>+		if (midi &amp;&amp; (b[p-&gt;midi_flag_offset] &amp; 0x01))</div><div class='add'>+			snd_rawmidi_receive(midi, b + p-&gt;midi_byte_offset, 1);</div><div class='add'>+</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For tracepoints. */</div><div class='add'>+static void __maybe_unused copy_sph(u32 *frames, __be32 *buffer,</div><div class='add'>+				    unsigned int data_blocks,</div><div class='add'>+				    unsigned int data_block_quadlets)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		*frames = be32_to_cpu(*buffer);</div><div class='add'>+		buffer += data_block_quadlets;</div><div class='add'>+		frames++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For tracepoints. */</div><div class='add'>+static void __maybe_unused copy_message(u64 *frames, __be32 *buffer,</div><div class='add'>+					unsigned int data_blocks,</div><div class='add'>+					unsigned int data_block_quadlets)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* This is just for v2/v3 protocol. */</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		*frames = be32_to_cpu(buffer[1]);</div><div class='add'>+		*frames &lt;&lt;= 16;</div><div class='add'>+		*frames |= be32_to_cpu(buffer[2]) &gt;&gt; 16;</div><div class='add'>+		++frames;</div><div class='add'>+		buffer += data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void probe_tracepoints_events(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				     unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		trace_data_block_sph(s, data_blocks, buf);</div><div class='add'>+		trace_data_block_message(s, data_blocks, buf);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cache_event_offsets(struct amdtp_motu_cache *cache, const __be32 *buf,</div><div class='add'>+				unsigned int data_blocks, unsigned int data_block_quadlets)</div><div class='add'>+{</div><div class='add'>+	unsigned int *event_offsets = cache-&gt;event_offsets;</div><div class='add'>+	const unsigned int cache_size = cache-&gt;size;</div><div class='add'>+	unsigned int cache_tail = cache-&gt;tail;</div><div class='add'>+	unsigned int base_tick = cache-&gt;tx_cycle_count * TICKS_PER_CYCLE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		u32 sph = be32_to_cpu(*buf);</div><div class='add'>+		unsigned int tick;</div><div class='add'>+</div><div class='add'>+		tick = ((sph &amp; CIP_SPH_CYCLE_MASK) &gt;&gt; CIP_SPH_CYCLE_SHIFT) * TICKS_PER_CYCLE +</div><div class='add'>+		       (sph &amp; CIP_SPH_OFFSET_MASK);</div><div class='add'>+</div><div class='add'>+		if (tick &lt; base_tick)</div><div class='add'>+			tick += TICKS_PER_SECOND;</div><div class='add'>+		event_offsets[cache_tail] = tick - base_tick;</div><div class='add'>+</div><div class='add'>+		cache_tail = (cache_tail + 1) % cache_size;</div><div class='add'>+		buf += data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cache-&gt;tail = cache_tail;</div><div class='add'>+	cache-&gt;tx_cycle_count = (cache-&gt;tx_cycle_count + 1) % CYCLES_PER_SECOND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = container_of(s, struct snd_motu, tx_stream);</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	const struct pkt_desc *cursor = desc;</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;cache-&gt;tx_cycle_count == UINT_MAX)</div><div class='add'>+		p-&gt;cache-&gt;tx_cycle_count = (s-&gt;domain-&gt;processing_cycle.tx_start % CYCLES_PER_SECOND);</div><div class='add'>+</div><div class='add'>+	// For data block processing.</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		cache_event_offsets(p-&gt;cache, buf, data_blocks, s-&gt;data_block_quadlets);</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (p-&gt;midi_ports)</div><div class='add'>+			read_midi_messages(s, buf, data_blocks);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = cursor;</div><div class='add'>+	if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP)</div><div class='add'>+		snd_motu_register_dsp_message_parser_parse(s, desc, count);</div><div class='add'>+	else if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_COMMAND_DSP)</div><div class='add'>+		snd_motu_command_dsp_message_parser_parse(s, desc, count);</div><div class='add'>+</div><div class='add'>+	// For tracepoints.</div><div class='add'>+	if (trace_data_block_sph_enabled() ||</div><div class='add'>+	    trace_data_block_message_enabled())</div><div class='add'>+		probe_tracepoints_events(s, desc, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_sph(struct amdtp_motu_cache *cache, __be32 *buffer, unsigned int data_blocks,</div><div class='add'>+		      unsigned int data_block_quadlets)</div><div class='add'>+{</div><div class='add'>+	unsigned int *event_offsets = cache-&gt;event_offsets;</div><div class='add'>+	const unsigned int cache_size = cache-&gt;size;</div><div class='add'>+	unsigned int cache_head = cache-&gt;head;</div><div class='add'>+	unsigned int base_tick = cache-&gt;rx_cycle_count * TICKS_PER_CYCLE;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; i++) {</div><div class='add'>+		unsigned int tick = (base_tick + event_offsets[cache_head]) % TICKS_PER_SECOND;</div><div class='add'>+		u32 sph = ((tick / TICKS_PER_CYCLE) &lt;&lt; CIP_SPH_CYCLE_SHIFT) | (tick % TICKS_PER_CYCLE);</div><div class='add'>+		*buffer = cpu_to_be32(sph);</div><div class='add'>+</div><div class='add'>+		cache_head = (cache_head + 1) % cache_size;</div><div class='add'>+		buffer += data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cache-&gt;head = cache_head;</div><div class='add'>+	cache-&gt;rx_cycle_count = (cache-&gt;rx_cycle_count + 1) % CYCLES_PER_SECOND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_motu *p = s-&gt;protocol;</div><div class='add'>+	const struct pkt_desc *cursor = desc;</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;cache-&gt;rx_cycle_count == UINT_MAX)</div><div class='add'>+		p-&gt;cache-&gt;rx_cycle_count = (s-&gt;domain-&gt;processing_cycle.rx_start % CYCLES_PER_SECOND);</div><div class='add'>+</div><div class='add'>+	// For data block processing.</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		} else {</div><div class='add'>+			write_pcm_silence(s, buf, data_blocks);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (p-&gt;midi_ports)</div><div class='add'>+			write_midi_messages(s, buf, data_blocks);</div><div class='add'>+</div><div class='add'>+		write_sph(p-&gt;cache, buf, data_blocks, s-&gt;data_block_quadlets);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = cursor;</div><div class='add'>+</div><div class='add'>+	// For tracepoints.</div><div class='add'>+	if (trace_data_block_sph_enabled() ||</div><div class='add'>+	    trace_data_block_message_enabled())</div><div class='add'>+		probe_tracepoints_events(s, desc, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_motu_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		    enum amdtp_stream_direction dir,</div><div class='add'>+		    const struct snd_motu_spec *spec, struct amdtp_motu_cache *cache)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+	int fmt = CIP_FMT_MOTU;</div><div class='add'>+	unsigned int flags = CIP_BLOCKING | CIP_UNAWARE_SYT;</div><div class='add'>+	struct amdtp_motu *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+		process_ctx_payloads = process_ir_ctx_payloads;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Units of version 3 transmits packets with invalid CIP header</div><div class='add'>+		 * against IEC 61883-1.</div><div class='add'>+		 */</div><div class='add'>+		if (spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3) {</div><div class='add'>+			flags |= CIP_WRONG_DBS |</div><div class='add'>+				 CIP_SKIP_DBC_ZERO_CHECK |</div><div class='add'>+				 CIP_HEADER_WITHOUT_EOH;</div><div class='add'>+			fmt = CIP_FMT_MOTU_TX_V3;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (spec == &amp;snd_motu_spec_8pre ||</div><div class='add'>+		    spec == &amp;snd_motu_spec_ultralite) {</div><div class='add'>+			// 8pre has some quirks.</div><div class='add'>+			flags |= CIP_WRONG_DBS |</div><div class='add'>+				 CIP_SKIP_DBC_ZERO_CHECK;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		process_ctx_payloads = process_it_ctx_payloads;</div><div class='add'>+		flags |= CIP_DBC_IS_END_EVENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_stream_init(s, unit, dir, flags, fmt, process_ctx_payloads,</div><div class='add'>+				sizeof(struct amdtp_motu));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	s-&gt;sph = 1;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_OUT_STREAM) {</div><div class='add'>+		// Use fixed value for FDF field.</div><div class='add'>+		s-&gt;ctx_data.rx.fdf = MOTU_FDF_AM824;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p = s-&gt;protocol;</div><div class='add'>+	p-&gt;cache = cache;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-command-dsp-message-parser.c b/sound/firewire/motu/motu-command-dsp-message-parser.c<br/>new file mode 100644<br/>index 000000000000..c6440e6e360b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-command-dsp-message-parser.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-command-dsp-message-parser.c</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// motu-command-dsp-message-parser.c - a part of driver for MOTU FireWire series</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+</div><div class='add'>+// Below models allow software to configure their DSP function by command transferred in</div><div class='add'>+// asynchronous transaction:</div><div class='add'>+//  * 828 mk3 (FireWire only and Hybrid)</div><div class='add'>+//  * 896 mk3 (FireWire only and Hybrid)</div><div class='add'>+//  * Ultralite mk3 (FireWire only and Hybrid)</div><div class='add'>+//  * Traveler mk3</div><div class='add'>+//  * Track 16</div><div class='add'>+//</div><div class='add'>+// Isochronous packets from the above models includes messages to report state of hardware meter.</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+enum msg_parser_state {</div><div class='add'>+	INITIALIZED,</div><div class='add'>+	FRAGMENT_DETECTED,</div><div class='add'>+	AVAILABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct msg_parser {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	enum msg_parser_state state;</div><div class='add'>+	unsigned int interval;</div><div class='add'>+	unsigned int message_count;</div><div class='add'>+	unsigned int fragment_pos;</div><div class='add'>+	unsigned int value_index;</div><div class='add'>+	u64 value;</div><div class='add'>+	struct snd_firewire_motu_command_dsp_meter meter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_motu_command_dsp_message_parser_new(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser;</div><div class='add'>+</div><div class='add'>+	parser = devm_kzalloc(&amp;motu-&gt;card-&gt;card_dev, sizeof(*parser), GFP_KERNEL);</div><div class='add'>+	if (!parser)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spin_lock_init(&amp;parser-&gt;lock);</div><div class='add'>+	motu-&gt;message_parser = parser;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_command_dsp_message_parser_init(struct snd_motu *motu, enum cip_sfc sfc)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	parser-&gt;state = INITIALIZED;</div><div class='add'>+</div><div class='add'>+	// All of data blocks don't have messages with meaningful information.</div><div class='add'>+	switch (sfc) {</div><div class='add'>+	case CIP_SFC_176400:</div><div class='add'>+	case CIP_SFC_192000:</div><div class='add'>+		parser-&gt;interval = 4;</div><div class='add'>+		break;</div><div class='add'>+	case CIP_SFC_88200:</div><div class='add'>+	case CIP_SFC_96000:</div><div class='add'>+		parser-&gt;interval = 2;</div><div class='add'>+		break;</div><div class='add'>+	case CIP_SFC_32000:</div><div class='add'>+	case CIP_SFC_44100:</div><div class='add'>+	case CIP_SFC_48000:</div><div class='add'>+	default:</div><div class='add'>+		parser-&gt;interval = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FRAGMENT_POS			6</div><div class='add'>+#define MIDI_BYTE_POS			7</div><div class='add'>+#define MIDI_FLAG_POS			8</div><div class='add'>+// One value of hardware meter consists of 4 messages.</div><div class='add'>+#define FRAGMENTS_PER_VALUE		4</div><div class='add'>+#define VALUES_AT_IMAGE_END		0xffffffffffffffff</div><div class='add'>+</div><div class='add'>+void snd_motu_command_dsp_message_parser_parse(const struct amdtp_stream *s,</div><div class='add'>+					const struct pkt_desc *desc, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = container_of(s, struct snd_motu, tx_stream);</div><div class='add'>+	unsigned int data_block_quadlets = s-&gt;data_block_quadlets;</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+	unsigned int interval = parser-&gt;interval;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buffer = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; data_blocks; ++j) {</div><div class='add'>+			u8 *b = (u8 *)buffer;</div><div class='add'>+			buffer += data_block_quadlets;</div><div class='add'>+</div><div class='add'>+			switch (parser-&gt;state) {</div><div class='add'>+			case INITIALIZED:</div><div class='add'>+			{</div><div class='add'>+				u8 fragment = b[FRAGMENT_POS];</div><div class='add'>+</div><div class='add'>+				if (fragment &gt; 0) {</div><div class='add'>+					parser-&gt;value = fragment;</div><div class='add'>+					parser-&gt;message_count = 1;</div><div class='add'>+					parser-&gt;state = FRAGMENT_DETECTED;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case FRAGMENT_DETECTED:</div><div class='add'>+			{</div><div class='add'>+				if (parser-&gt;message_count % interval == 0) {</div><div class='add'>+					u8 fragment = b[FRAGMENT_POS];</div><div class='add'>+</div><div class='add'>+					parser-&gt;value &gt;&gt;= 8;</div><div class='add'>+					parser-&gt;value |= (u64)fragment &lt;&lt; 56;</div><div class='add'>+</div><div class='add'>+					if (parser-&gt;value == VALUES_AT_IMAGE_END) {</div><div class='add'>+						parser-&gt;state = AVAILABLE;</div><div class='add'>+						parser-&gt;fragment_pos = 0;</div><div class='add'>+						parser-&gt;value_index = 0;</div><div class='add'>+						parser-&gt;message_count = 0;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				++parser-&gt;message_count;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case AVAILABLE:</div><div class='add'>+			default:</div><div class='add'>+			{</div><div class='add'>+				if (parser-&gt;message_count % interval == 0) {</div><div class='add'>+					u8 fragment = b[FRAGMENT_POS];</div><div class='add'>+</div><div class='add'>+					parser-&gt;value &gt;&gt;= 8;</div><div class='add'>+					parser-&gt;value |= (u64)fragment &lt;&lt; 56;</div><div class='add'>+					++parser-&gt;fragment_pos;</div><div class='add'>+</div><div class='add'>+					if (parser-&gt;fragment_pos == 4) {</div><div class='add'>+						// Skip the last two quadlets since they could be</div><div class='add'>+						// invalid value (0xffffffff) as floating point</div><div class='add'>+						// number.</div><div class='add'>+						if (parser-&gt;value_index &lt;</div><div class='add'>+						    SNDRV_FIREWIRE_MOTU_COMMAND_DSP_METER_COUNT - 2) {</div><div class='add'>+							u32 val = (u32)(parser-&gt;value &gt;&gt; 32);</div><div class='add'>+							parser-&gt;meter.data[parser-&gt;value_index] = val;</div><div class='add'>+						}</div><div class='add'>+						++parser-&gt;value_index;</div><div class='add'>+						parser-&gt;fragment_pos = 0;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					if (parser-&gt;value == VALUES_AT_IMAGE_END) {</div><div class='add'>+						parser-&gt;value_index = 0;</div><div class='add'>+						parser-&gt;fragment_pos = 0;</div><div class='add'>+						parser-&gt;message_count = 0;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				++parser-&gt;message_count;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_command_dsp_message_parser_copy_meter(struct snd_motu *motu,</div><div class='add'>+					struct snd_firewire_motu_command_dsp_meter *meter)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+	memcpy(meter, &amp;parser-&gt;meter, sizeof(*meter));</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-hwdep.c b/sound/firewire/motu/motu-hwdep.c<br/>new file mode 100644<br/>index 000000000000..981c19430cb0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-hwdep.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes have five functionalities.</div><div class='add'>+ *</div><div class='add'>+ * 1.get information about firewire node</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock streaming</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+static bool has_dsp_event(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP)</div><div class='add'>+		return (snd_motu_register_dsp_message_parser_count_event(motu) &gt; 0);</div><div class='add'>+	else</div><div class='add'>+		return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,</div><div class='add'>+		       loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	union snd_firewire_event event;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!motu-&gt;dev_lock_changed &amp;&amp; motu-&gt;msg == 0 &amp;&amp; !has_dsp_event(motu)) {</div><div class='add'>+		prepare_to_wait(&amp;motu-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;motu-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;motu-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;motu-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;event, 0, sizeof(event));</div><div class='add'>+	if (motu-&gt;dev_lock_changed) {</div><div class='add'>+		event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;</div><div class='add'>+		event.lock_status.status = (motu-&gt;dev_lock_count &gt; 0);</div><div class='add'>+		motu-&gt;dev_lock_changed = false;</div><div class='add'>+		spin_unlock_irq(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event));</div><div class='add'>+		if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else if (motu-&gt;msg &gt; 0) {</div><div class='add'>+		event.motu_notification.type = SNDRV_FIREWIRE_EVENT_MOTU_NOTIFICATION;</div><div class='add'>+		event.motu_notification.message = motu-&gt;msg;</div><div class='add'>+		motu-&gt;msg = 0;</div><div class='add'>+		spin_unlock_irq(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+		count = min_t(long, count, sizeof(event));</div><div class='add'>+		if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else if (has_dsp_event(motu)) {</div><div class='add'>+		size_t consumed = 0;</div><div class='add'>+		u32 __user *ptr;</div><div class='add'>+		u32 ev;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irq(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+		// Header is filled later.</div><div class='add'>+		consumed += sizeof(event.motu_register_dsp_change);</div><div class='add'>+</div><div class='add'>+		while (consumed &lt; count &amp;&amp;</div><div class='add'>+		       snd_motu_register_dsp_message_parser_copy_event(motu, &amp;ev)) {</div><div class='add'>+			ptr = (u32 __user *)(buf + consumed);</div><div class='add'>+			if (put_user(ev, ptr))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			consumed += sizeof(ev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		event.motu_register_dsp_change.type = SNDRV_FIREWIRE_EVENT_MOTU_REGISTER_DSP_CHANGE;</div><div class='add'>+		event.motu_register_dsp_change.count =</div><div class='add'>+			(consumed - sizeof(event.motu_register_dsp_change)) / 4;</div><div class='add'>+		if (copy_to_user(buf, &amp;event, sizeof(event.motu_register_dsp_change)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		count = consumed;</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irq(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+		count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;motu-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+	if (motu-&gt;dev_lock_changed || motu-&gt;msg || has_dsp_event(motu))</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_motu *motu, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(motu-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_MOTU;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;dev_lock_count == 0) {</div><div class='add'>+		motu-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;dev_lock_count == -1) {</div><div class='add'>+		motu-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+	if (motu-&gt;dev_lock_count == -1)</div><div class='add'>+		motu-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+	    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(motu, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(motu);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(motu);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_MOTU_REGISTER_DSP_METER:</div><div class='add'>+	{</div><div class='add'>+		struct snd_firewire_motu_register_dsp_meter *meter;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP))</div><div class='add'>+			return -ENXIO;</div><div class='add'>+</div><div class='add'>+		meter = kzalloc(sizeof(*meter), GFP_KERNEL);</div><div class='add'>+		if (!meter)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		snd_motu_register_dsp_message_parser_copy_meter(motu, meter);</div><div class='add'>+</div><div class='add'>+		err = copy_to_user((void __user *)arg, meter, sizeof(*meter));</div><div class='add'>+		kfree(meter);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_MOTU_COMMAND_DSP_METER:</div><div class='add'>+	{</div><div class='add'>+		struct snd_firewire_motu_command_dsp_meter *meter;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_COMMAND_DSP))</div><div class='add'>+			return -ENXIO;</div><div class='add'>+</div><div class='add'>+		meter = kzalloc(sizeof(*meter), GFP_KERNEL);</div><div class='add'>+		if (!meter)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		snd_motu_command_dsp_message_parser_copy_meter(motu, meter);</div><div class='add'>+</div><div class='add'>+		err = copy_to_user((void __user *)arg, meter, sizeof(*meter));</div><div class='add'>+		kfree(meter);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_MOTU_REGISTER_DSP_PARAMETER:</div><div class='add'>+	{</div><div class='add'>+		struct snd_firewire_motu_register_dsp_parameter *param;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP))</div><div class='add'>+			return -ENXIO;</div><div class='add'>+</div><div class='add'>+		param = kzalloc(sizeof(*param), GFP_KERNEL);</div><div class='add'>+		if (!param)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		snd_motu_register_dsp_message_parser_copy_parameter(motu, param);</div><div class='add'>+</div><div class='add'>+		err = copy_to_user((void __user *)arg, param, sizeof(*param));</div><div class='add'>+		kfree(param);</div><div class='add'>+		if (err)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_motu_create_hwdep_device(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(motu-&gt;card, motu-&gt;card-&gt;driver, 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(hwdep-&gt;name, "MOTU");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_MOTU;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = motu;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+</div><div class='add'>+	motu-&gt;hwdep = hwdep;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-midi.c b/sound/firewire/motu/motu-midi.c<br/>new file mode 100644<br/>index 000000000000..85e3260f9349<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-midi.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-midi.h - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+static int midi_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_stream_lock_try(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;motu-&gt;mutex) {</div><div class='add'>+		err = snd_motu_stream_reserve_duplex(motu, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++motu-&gt;substreams_counter;</div><div class='add'>+			err = snd_motu_stream_start_duplex(motu);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--motu-&gt;substreams_counter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_motu_stream_lock_release(motu);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;motu-&gt;mutex) {</div><div class='add'>+		--motu-&gt;substreams_counter;</div><div class='add'>+		snd_motu_stream_stop_duplex(motu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_motu_stream_lock_release(motu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_motu_midi_trigger(&amp;motu-&gt;tx_stream, substrm-&gt;number,</div><div class='add'>+					substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_motu_midi_trigger(&amp;motu-&gt;tx_stream, substrm-&gt;number,</div><div class='add'>+					NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_motu_midi_trigger(&amp;motu-&gt;rx_stream, substrm-&gt;number,</div><div class='add'>+					substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_motu_midi_trigger(&amp;motu-&gt;rx_stream, substrm-&gt;number,</div><div class='add'>+					NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_motu *motu,</div><div class='add'>+				     struct snd_rawmidi_str *str)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+		scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+			  "%s MIDI %d", motu-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_create_midi_devices(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_open,</div><div class='add'>+		.close		= midi_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* create midi ports */</div><div class='add'>+	err = snd_rawmidi_new(motu-&gt;card, motu-&gt;card-&gt;driver, 0, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", motu-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = motu;</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT |</div><div class='add'>+			     SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='add'>+			     SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+			    &amp;capture_ops);</div><div class='add'>+	str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+	set_midi_substream_names(motu, str);</div><div class='add'>+</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+			    &amp;playback_ops);</div><div class='add'>+	str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+	set_midi_substream_names(motu, str);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c<br/>new file mode 100644<br/>index 000000000000..600c571edf02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,365 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-pcm.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+static int motu_rate_constraint(struct snd_pcm_hw_params *params,</div><div class='add'>+				struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu_packet_format *formats = rule-&gt;private;</div><div class='add'>+</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval rates = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i, pcm_channels, rate, mode;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		rate = snd_motu_clock_rates[i];</div><div class='add'>+		mode = i / 2;</div><div class='add'>+</div><div class='add'>+		pcm_channels = formats-&gt;pcm_chunks[mode];</div><div class='add'>+		if (!snd_interval_test(c, pcm_channels))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rates.min = min(rates.min, rate);</div><div class='add'>+		rates.max = max(rates.max, rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(r, &amp;rates);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int motu_channels_constraint(struct snd_pcm_hw_params *params,</div><div class='add'>+				    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu_packet_format *formats = rule-&gt;private;</div><div class='add'>+</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval channels = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	unsigned int i, pcm_channels, rate, mode;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		rate = snd_motu_clock_rates[i];</div><div class='add'>+		mode = i / 2;</div><div class='add'>+</div><div class='add'>+		if (!snd_interval_test(r, rate))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pcm_channels = formats-&gt;pcm_chunks[mode];</div><div class='add'>+		channels.min = min(channels.min, pcm_channels);</div><div class='add'>+		channels.max = max(channels.max, pcm_channels);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_refine(c, &amp;channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void limit_channels_and_rates(struct snd_motu *motu,</div><div class='add'>+				     struct snd_pcm_runtime *runtime,</div><div class='add'>+				     struct snd_motu_packet_format *formats)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	unsigned int i, pcm_channels, rate, mode;</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		rate = snd_motu_clock_rates[i];</div><div class='add'>+		mode = i / 2;</div><div class='add'>+</div><div class='add'>+		pcm_channels = formats-&gt;pcm_chunks[mode];</div><div class='add'>+		if (pcm_channels == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hw-&gt;rates |= snd_pcm_rate_to_rate_bit(rate);</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, pcm_channels);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, pcm_channels);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_hw_info(struct snd_motu *motu,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	struct snd_motu_packet_format *formats;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		hw-&gt;formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		stream = &amp;motu-&gt;tx_stream;</div><div class='add'>+		formats = &amp;motu-&gt;tx_packet_formats;</div><div class='add'>+	} else {</div><div class='add'>+		hw-&gt;formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		stream = &amp;motu-&gt;rx_stream;</div><div class='add'>+		formats = &amp;motu-&gt;rx_packet_formats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit_channels_and_rates(motu, runtime, formats);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  motu_rate_constraint, formats,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  motu_channels_constraint, formats,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_motu_add_pcm_hw_constraints(stream, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;motu-&gt;domain;</div><div class='add'>+	enum snd_motu_clock_source src;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_stream_lock_try(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;motu-&gt;mutex) {</div><div class='add'>+		err = snd_motu_stream_cache_packet_formats(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_locked;</div><div class='add'>+</div><div class='add'>+		err = init_hw_info(motu, substream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_locked;</div><div class='add'>+</div><div class='add'>+		err = snd_motu_protocol_get_clock_source(motu, &amp;src);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_locked;</div><div class='add'>+</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if ((src != SND_MOTU_CLOCK_SOURCE_INTERNAL &amp;&amp;</div><div class='add'>+		     src != SND_MOTU_CLOCK_SOURCE_SPH) ||</div><div class='add'>+		    (motu-&gt;substreams_counter &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0)) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int rate;</div><div class='add'>+</div><div class='add'>+			err = snd_motu_protocol_get_clock_rate(motu, &amp;rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_motu_stream_lock_release(motu);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_motu_stream_lock_release(motu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;motu-&gt;mutex);</div><div class='add'>+		err = snd_motu_stream_reserve_duplex(motu, rate,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++motu-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;motu-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--motu-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_motu_stream_stop_duplex(motu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;motu-&gt;mutex) {</div><div class='add'>+		err = snd_motu_stream_start_duplex(motu);</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;motu-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;motu-&gt;mutex) {</div><div class='add'>+		err = snd_motu_stream_start_duplex(motu);</div><div class='add'>+	}</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;motu-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;motu-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;motu-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;motu-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;motu-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t capture_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;motu-&gt;domain, &amp;motu-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+static snd_pcm_uframes_t playback_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;motu-&gt;domain, &amp;motu-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;motu-&gt;domain, &amp;motu-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;motu-&gt;domain, &amp;motu-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_create_pcm_devices(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_hw_params,</div><div class='add'>+		.hw_free   = pcm_hw_free,</div><div class='add'>+		.prepare   = capture_prepare,</div><div class='add'>+		.trigger   = capture_trigger,</div><div class='add'>+		.pointer   = capture_pointer,</div><div class='add'>+		.ack       = capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_hw_params,</div><div class='add'>+		.hw_free   = pcm_hw_free,</div><div class='add'>+		.prepare   = playback_prepare,</div><div class='add'>+		.trigger   = playback_trigger,</div><div class='add'>+		.pointer   = playback_pointer,</div><div class='add'>+		.ack       = playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(motu-&gt;card, motu-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	pcm-&gt;private_data = motu;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	strscpy(pcm-&gt;name, motu-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-proc.c b/sound/firewire/motu/motu-proc.c<br/>new file mode 100644<br/>index 000000000000..f009cf7aa074<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-proc.c</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-proc.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./motu.h"</div><div class='add'>+</div><div class='add'>+static const char *const clock_names[] = {</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_INTERNAL] = "Internal",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB] = "ADAT on Dsub-9pin interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT] = "ADAT on optical interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_A] = "ADAT on optical interface A",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_B] = "ADAT on optical interface B",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT] = "S/PDIF on optical interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_A] = "S/PDIF on optical interface A",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_B] = "S/PDIF on optical interface B",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX] = "S/PDIF on coaxial interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR] = "AESEBU on XLR interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC] = "Word clock on BNC interface",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_SPH] = "Source packet header",</div><div class='add'>+	[SND_MOTU_CLOCK_SOURCE_UNKNOWN] = "Unknown",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void proc_read_clock(struct snd_info_entry *entry,</div><div class='add'>+			    struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	struct snd_motu *motu = entry-&gt;private_data;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_motu_clock_source source;</div><div class='add'>+</div><div class='add'>+	if (snd_motu_protocol_get_clock_rate(motu, &amp;rate) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	if (snd_motu_protocol_get_clock_source(motu, &amp;source) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Rate:\t%d\n", rate);</div><div class='add'>+	snd_iprintf(buffer, "Source:\t%s\n", clock_names[source]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void proc_read_format(struct snd_info_entry *entry,</div><div class='add'>+			     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = entry-&gt;private_data;</div><div class='add'>+	unsigned int mode;</div><div class='add'>+	struct snd_motu_packet_format *formats;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (snd_motu_protocol_cache_packet_formats(motu) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "tx:\tmsg\tfixed\ttotal\n");</div><div class='add'>+	for (i = 0; i &lt; SND_MOTU_CLOCK_RATE_COUNT; ++i) {</div><div class='add'>+		mode = i &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+		formats = &amp;motu-&gt;tx_packet_formats;</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "%u:\t%u\t%u\t%u\n",</div><div class='add'>+			    snd_motu_clock_rates[i],</div><div class='add'>+			    formats-&gt;msg_chunks,</div><div class='add'>+			    motu-&gt;spec-&gt;tx_fixed_pcm_chunks[mode],</div><div class='add'>+			    formats-&gt;pcm_chunks[mode]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "rx:\tmsg\tfixed\ttotal\n");</div><div class='add'>+	for (i = 0; i &lt; SND_MOTU_CLOCK_RATE_COUNT; ++i) {</div><div class='add'>+		mode = i &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+		formats = &amp;motu-&gt;rx_packet_formats;</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			    "%u:\t%u\t%u\t%u\n",</div><div class='add'>+			    snd_motu_clock_rates[i],</div><div class='add'>+			    formats-&gt;msg_chunks,</div><div class='add'>+			    motu-&gt;spec-&gt;rx_fixed_pcm_chunks[mode],</div><div class='add'>+			    formats-&gt;pcm_chunks[mode]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_node(struct snd_motu *motu, struct snd_info_entry *root,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     void (*op)(struct snd_info_entry *e,</div><div class='add'>+				struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(motu-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, motu, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_proc_init(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(motu-&gt;card, "firewire",</div><div class='add'>+					  motu-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(motu, root, "clock", proc_read_clock);</div><div class='add'>+	add_node(motu, root, "format", proc_read_format);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-protocol-v1.c b/sound/firewire/motu/motu-protocol-v1.c<br/>new file mode 100644<br/>index 000000000000..e811629f167b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-protocol-v1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-protocol-v1.c</a></div><div class='hunk'>@@ -0,0 +1,467 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// motu-protocol-v1.c - a part of driver for MOTU FireWire series</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+// Status register for MOTU 828 (0x'ffff'f000'0b00).</div><div class='add'>+//</div><div class='add'>+// 0xffff0000: ISOC_COMM_CONTROL_MASK in motu-stream.c.</div><div class='add'>+// 0x00008000: mode of optical input interface.</div><div class='add'>+//   0x00008000: for S/PDIF signal.</div><div class='add'>+//   0x00000000: disabled or for ADAT signal.</div><div class='add'>+// 0x00004000: mode of optical output interface.</div><div class='add'>+//   0x00004000: for S/PDIF signal.</div><div class='add'>+//   0x00000000: disabled or for ADAT signal.</div><div class='add'>+// 0x00003f00: monitor input mode.</div><div class='add'>+//   0x00000800: analog-1/2</div><div class='add'>+//   0x00001a00: analog-3/4</div><div class='add'>+//   0x00002c00: analog-5/6</div><div class='add'>+//   0x00003e00: analog-7/8</div><div class='add'>+//   0x00000000: analog-1</div><div class='add'>+//   0x00000900: analog-2</div><div class='add'>+//   0x00001200: analog-3</div><div class='add'>+//   0x00001b00: analog-4</div><div class='add'>+//   0x00002400: analog-5</div><div class='add'>+//   0x00002d00: analog-6</div><div class='add'>+//   0x00003600: analog-7</div><div class='add'>+//   0x00003f00: analog-8</div><div class='add'>+// 0x00000080: enable stream input.</div><div class='add'>+// 0x00000040: disable monitor input.</div><div class='add'>+// 0x00000008: enable main out.</div><div class='add'>+// 0x00000004: rate of sampling clock.</div><div class='add'>+//   0x00000004: 48.0 kHz</div><div class='add'>+//   0x00000000: 44.1 kHz</div><div class='add'>+// 0x00000023: source of sampling clock.</div><div class='add'>+//   0x00000003: source packet header (SPH)</div><div class='add'>+//   0x00000002: S/PDIF on optical/coaxial interface.</div><div class='add'>+//   0x00000021: ADAT on optical interface</div><div class='add'>+//   0x00000001: ADAT on Dsub 9pin</div><div class='add'>+//   0x00000000: internal</div><div class='add'>+</div><div class='add'>+#define CLK_828_STATUS_OFFSET				0x0b00</div><div class='add'>+#define  CLK_828_STATUS_MASK				0x0000ffff</div><div class='add'>+#define  CLK_828_STATUS_FLAG_OPT_IN_IFACE_IS_SPDIF	0x00008000</div><div class='add'>+#define  CLK_828_STATUS_FLAG_OPT_OUT_IFACE_IS_SPDIF	0x00004000</div><div class='add'>+#define  CLK_828_STATUS_FLAG_FETCH_PCM_FRAMES		0x00000080</div><div class='add'>+#define  CLK_828_STATUS_FLAG_ENABLE_OUTPUT		0x00000008</div><div class='add'>+#define  CLK_828_STATUS_FLAG_RATE_48000			0x00000004</div><div class='add'>+#define  CLK_828_STATUS_MASK_SRC			0x00000023</div><div class='add'>+#define   CLK_828_STATUS_FLAG_SRC_ADAT_ON_OPT		0x00000021</div><div class='add'>+#define   CLK_828_STATUS_FLAG_SRC_SPH			0x00000003</div><div class='add'>+#define   CLK_828_STATUS_FLAG_SRC_SPDIF			0x00000002</div><div class='add'>+#define   CLK_828_STATUS_FLAG_SRC_ADAT_ON_DSUB		0x00000001</div><div class='add'>+#define   CLK_828_STATUS_FLAG_SRC_INTERNAL		0x00000000</div><div class='add'>+</div><div class='add'>+// Status register for MOTU 896 (0x'ffff'f000'0b14).</div><div class='add'>+//</div><div class='add'>+// 0xf0000000: enable physical and stream input to DAC.</div><div class='add'>+//   0x80000000: disable</div><div class='add'>+//   0x40000000: disable</div><div class='add'>+//   0x20000000: enable (prior to the other bits)</div><div class='add'>+//   0x10000000: disable</div><div class='add'>+//   0x00000000: disable</div><div class='add'>+// 0x08000000: speed of word clock signal output on BNC interface.</div><div class='add'>+//   0x00000000: force to low rate (44.1/48.0 kHz).</div><div class='add'>+//   0x08000000: follow to system clock.</div><div class='add'>+// 0x04000000: something relevant to clock.</div><div class='add'>+// 0x03000000: enable output.</div><div class='add'>+//  0x02000000: enabled irreversibly once standing unless the device voluntarily disables it.</div><div class='add'>+//  0x01000000: enabled irreversibly once standing unless the device voluntarily disables it.</div><div class='add'>+// 0x00ffff00: monitor input mode.</div><div class='add'>+//   0x00000000: disabled</div><div class='add'>+//   0x00004800: analog-1/2</div><div class='add'>+//   0x00005a00: analog-3/4</div><div class='add'>+//   0x00006c00: analog-5/6</div><div class='add'>+//   0x00007e00: analog-7/8</div><div class='add'>+//   0x00104800: AES/EBU-1/2</div><div class='add'>+//   0x00004000: analog-1</div><div class='add'>+//   0x00004900: analog-2</div><div class='add'>+//   0x00005200: analog-3</div><div class='add'>+//   0x00005b00: analog-4</div><div class='add'>+//   0x00006400: analog-5</div><div class='add'>+//   0x00006d00: analog-6</div><div class='add'>+//   0x00007600: analog-7</div><div class='add'>+//   0x00007f00: analog-8</div><div class='add'>+//   0x00104000: AES/EBU-1</div><div class='add'>+//   0x00104900: AES/EBU-2</div><div class='add'>+// 0x00000060: sample rate conversion for AES/EBU input/output.</div><div class='add'>+//   0x00000000: None</div><div class='add'>+//   0x00000020: input signal is converted to system rate</div><div class='add'>+//   0x00000040: output is slave to input, ignoring system rate</div><div class='add'>+//   0x00000060: output is double rate than system rate</div><div class='add'>+// 0x00000018: nominal rate of sampling clock.</div><div class='add'>+//   0x00000000: 44.1 kHz</div><div class='add'>+//   0x00000008: 48.0 kHz</div><div class='add'>+//   0x00000010: 88.2 kHz</div><div class='add'>+//   0x00000018: 96.0 kHz</div><div class='add'>+// 0x00000007: source of sampling clock.</div><div class='add'>+//   0x00000000: internal</div><div class='add'>+//   0x00000001: ADAT on optical interface</div><div class='add'>+//   0x00000002: AES/EBU on XLR</div><div class='add'>+//   0x00000003: source packet header (SPH)</div><div class='add'>+//   0x00000004: word clock on BNC</div><div class='add'>+//   0x00000005: ADAT on Dsub 9pin</div><div class='add'>+</div><div class='add'>+#define CLK_896_STATUS_OFFSET			0x0b14</div><div class='add'>+#define  CLK_896_STATUS_FLAG_FETCH_ENABLE	0x20000000</div><div class='add'>+#define  CLK_896_STATUS_FLAG_OUTPUT_ON		0x03000000</div><div class='add'>+#define  CLK_896_STATUS_MASK_SRC		0x00000007</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_INTERNAL	0x00000000</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_ADAT_ON_OPT	0x00000001</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_AESEBU	0x00000002</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_SPH		0x00000003</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_WORD		0x00000004</div><div class='add'>+#define   CLK_896_STATUS_FLAG_SRC_ADAT_ON_DSUB	0x00000005</div><div class='add'>+#define  CLK_896_STATUS_MASK_RATE		0x00000018</div><div class='add'>+#define   CLK_896_STATUS_FLAG_RATE_44100	0x00000000</div><div class='add'>+#define   CLK_896_STATUS_FLAG_RATE_48000	0x00000008</div><div class='add'>+#define   CLK_896_STATUS_FLAG_RATE_88200	0x00000010</div><div class='add'>+#define   CLK_896_STATUS_FLAG_RATE_96000	0x00000018</div><div class='add'>+</div><div class='add'>+static void parse_clock_rate_828(u32 data, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	if (data &amp; CLK_828_STATUS_FLAG_RATE_48000)</div><div class='add'>+		*rate = 48000;</div><div class='add'>+	else</div><div class='add'>+		*rate = 44100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock_rate_828(struct snd_motu *motu, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	parse_clock_rate_828(be32_to_cpu(reg), rate);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_clock_rate_896(u32 data, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	switch (data &amp; CLK_896_STATUS_MASK_RATE) {</div><div class='add'>+	case CLK_896_STATUS_FLAG_RATE_44100:</div><div class='add'>+		*rate = 44100;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_RATE_48000:</div><div class='add'>+		*rate = 48000;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_RATE_88200:</div><div class='add'>+		*rate = 88200;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_RATE_96000:</div><div class='add'>+		*rate = 96000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock_rate_896(struct snd_motu *motu, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return parse_clock_rate_896(be32_to_cpu(reg), rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_get_clock_rate(struct snd_motu *motu, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828)</div><div class='add'>+		return get_clock_rate_828(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec == &amp;snd_motu_spec_896)</div><div class='add'>+		return get_clock_rate_896(motu, rate);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_clock_rate_828(struct snd_motu *motu, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; CLK_828_STATUS_MASK;</div><div class='add'>+</div><div class='add'>+	data &amp;= ~CLK_828_STATUS_FLAG_RATE_48000;</div><div class='add'>+	if (rate == 48000)</div><div class='add'>+		data |= CLK_828_STATUS_FLAG_RATE_48000;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_clock_rate_896(struct snd_motu *motu, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int flag;</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	switch (rate) {</div><div class='add'>+	case 44100:</div><div class='add'>+		flag = CLK_896_STATUS_FLAG_RATE_44100;</div><div class='add'>+		break;</div><div class='add'>+	case 48000:</div><div class='add'>+		flag = CLK_896_STATUS_FLAG_RATE_48000;</div><div class='add'>+		break;</div><div class='add'>+	case 88200:</div><div class='add'>+		flag = CLK_896_STATUS_FLAG_RATE_88200;</div><div class='add'>+		break;</div><div class='add'>+	case 96000:</div><div class='add'>+		flag = CLK_896_STATUS_FLAG_RATE_96000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data &amp;= ~CLK_896_STATUS_MASK_RATE;</div><div class='add'>+	data |= flag;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_set_clock_rate(struct snd_motu *motu, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828)</div><div class='add'>+		return set_clock_rate_828(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec == &amp;snd_motu_spec_896)</div><div class='add'>+		return set_clock_rate_896(motu, rate);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock_source_828(struct snd_motu *motu, enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; CLK_828_STATUS_MASK;</div><div class='add'>+</div><div class='add'>+	switch (data &amp; CLK_828_STATUS_MASK_SRC) {</div><div class='add'>+	case CLK_828_STATUS_FLAG_SRC_ADAT_ON_OPT:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_828_STATUS_FLAG_SRC_SPH:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_SPH;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_828_STATUS_FLAG_SRC_SPDIF:</div><div class='add'>+	{</div><div class='add'>+		if (data &amp; CLK_828_STATUS_FLAG_OPT_IN_IFACE_IS_SPDIF)</div><div class='add'>+			*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;</div><div class='add'>+		else</div><div class='add'>+			*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case CLK_828_STATUS_FLAG_SRC_ADAT_ON_DSUB:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_828_STATUS_FLAG_SRC_INTERNAL:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock_source_896(struct snd_motu *motu, enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	switch (data &amp; CLK_896_STATUS_MASK_SRC) {</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_INTERNAL:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_ADAT_ON_OPT:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_AESEBU:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_SPH:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_SPH;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_WORD:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC;</div><div class='add'>+		break;</div><div class='add'>+	case CLK_896_STATUS_FLAG_SRC_ADAT_ON_DSUB:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_get_clock_source(struct snd_motu *motu, enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828)</div><div class='add'>+		return get_clock_source_828(motu, src);</div><div class='add'>+	else if (motu-&gt;spec == &amp;snd_motu_spec_896)</div><div class='add'>+		return get_clock_source_896(motu, src);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int switch_fetching_mode_828(struct snd_motu *motu, bool enable)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; CLK_828_STATUS_MASK;</div><div class='add'>+</div><div class='add'>+	data &amp;= ~(CLK_828_STATUS_FLAG_FETCH_PCM_FRAMES | CLK_828_STATUS_FLAG_ENABLE_OUTPUT);</div><div class='add'>+	if (enable) {</div><div class='add'>+		// This transaction should be initiated after the device receives batch of packets</div><div class='add'>+		// since the device voluntarily mutes outputs. As a workaround, yield processor over</div><div class='add'>+		// 100 msec.</div><div class='add'>+		msleep(100);</div><div class='add'>+		data |= CLK_828_STATUS_FLAG_FETCH_PCM_FRAMES | CLK_828_STATUS_FLAG_ENABLE_OUTPUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int switch_fetching_mode_896(struct snd_motu *motu, bool enable)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~CLK_896_STATUS_FLAG_FETCH_ENABLE;</div><div class='add'>+	if (enable)</div><div class='add'>+		data |= CLK_896_STATUS_FLAG_FETCH_ENABLE | CLK_896_STATUS_FLAG_OUTPUT_ON;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, CLK_896_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_switch_fetching_mode(struct snd_motu *motu, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828)</div><div class='add'>+		return switch_fetching_mode_828(motu, enable);</div><div class='add'>+	else if (motu-&gt;spec == &amp;snd_motu_spec_896)</div><div class='add'>+		return switch_fetching_mode_896(motu, enable);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_packet_formats_828(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_byte_offset = 4;</div><div class='add'>+	motu-&gt;tx_packet_formats.msg_chunks = 2;</div><div class='add'>+</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_byte_offset = 4;</div><div class='add'>+	motu-&gt;rx_packet_formats.msg_chunks = 0;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, CLK_828_STATUS_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; CLK_828_STATUS_MASK;</div><div class='add'>+</div><div class='add'>+	// The number of chunks is just reduced when SPDIF is activated.</div><div class='add'>+	if (!(data &amp; CLK_828_STATUS_FLAG_OPT_IN_IFACE_IS_SPDIF))</div><div class='add'>+		motu-&gt;tx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+</div><div class='add'>+	if (!(data &amp; CLK_828_STATUS_FLAG_OPT_OUT_IFACE_IS_SPDIF))</div><div class='add'>+		motu-&gt;rx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_packet_formats_896(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	// 24bit PCM frames follow to source packet header without message chunk.</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_byte_offset = 4;</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_byte_offset = 4;</div><div class='add'>+</div><div class='add'>+	// No message chunk in data block.</div><div class='add'>+	motu-&gt;tx_packet_formats.msg_chunks = 0;</div><div class='add'>+	motu-&gt;rx_packet_formats.msg_chunks = 0;</div><div class='add'>+</div><div class='add'>+	// Always enable optical interface for ADAT signal since the device have no registers</div><div class='add'>+	// to refer to current configuration.</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_chunks[1] += 8;</div><div class='add'>+</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_chunks[1] += 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_cache_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	memcpy(motu-&gt;tx_packet_formats.pcm_chunks, motu-&gt;spec-&gt;tx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;tx_packet_formats.pcm_chunks));</div><div class='add'>+	memcpy(motu-&gt;rx_packet_formats.pcm_chunks, motu-&gt;spec-&gt;rx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;rx_packet_formats.pcm_chunks));</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828)</div><div class='add'>+		return detect_packet_formats_828(motu);</div><div class='add'>+	else if (motu-&gt;spec == &amp;snd_motu_spec_896)</div><div class='add'>+		return detect_packet_formats_896(motu);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_828 = {</div><div class='add'>+	.name = "828",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V1,</div><div class='add'>+	.tx_fixed_pcm_chunks = {10, 0, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {10, 0, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_896 = {</div><div class='add'>+	.name = "896",</div><div class='add'>+	.tx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/motu/motu-protocol-v2.c b/sound/firewire/motu/motu-protocol-v2.c<br/>new file mode 100644<br/>index 000000000000..a5f70efa2e88<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-protocol-v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-protocol-v2.c</a></div><div class='hunk'>@@ -0,0 +1,321 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-protocol-v2.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define V2_CLOCK_STATUS_OFFSET			0x0b14</div><div class='add'>+#define  V2_CLOCK_RATE_MASK			0x00000038</div><div class='add'>+#define  V2_CLOCK_RATE_SHIFT			3</div><div class='add'>+#define  V2_CLOCK_SRC_MASK			0x00000007</div><div class='add'>+#define  V2_CLOCK_SRC_SHIFT			0</div><div class='add'>+#define   V2_CLOCK_SRC_AESEBU_ON_XLR		0x07	// In Traveler.</div><div class='add'>+#define   V2_CLOCK_SRC_ADAT_ON_DSUB		0x05</div><div class='add'>+#define   V2_CLOCK_SRC_WORD_ON_BNC		0x04</div><div class='add'>+#define   V2_CLOCK_SRC_SPH			0x03</div><div class='add'>+#define   V2_CLOCK_SRC_SPDIF			0x02	// on either coaxial or optical. AES/EBU in 896HD.</div><div class='add'>+#define   V2_CLOCK_SRC_ADAT_ON_OPT		0x01</div><div class='add'>+#define   V2_CLOCK_SRC_INTERNAL			0x00</div><div class='add'>+#define  V2_CLOCK_FETCH_ENABLE			0x02000000</div><div class='add'>+#define  V2_CLOCK_MODEL_SPECIFIC		0x04000000</div><div class='add'>+</div><div class='add'>+#define V2_IN_OUT_CONF_OFFSET			0x0c04</div><div class='add'>+#define  V2_OPT_OUT_IFACE_MASK			0x00000c00</div><div class='add'>+#define  V2_OPT_OUT_IFACE_SHIFT			10</div><div class='add'>+#define  V2_OPT_IN_IFACE_MASK			0x00000300</div><div class='add'>+#define  V2_OPT_IN_IFACE_SHIFT			8</div><div class='add'>+#define  V2_OPT_IFACE_MODE_NONE			0</div><div class='add'>+#define  V2_OPT_IFACE_MODE_ADAT			1</div><div class='add'>+#define  V2_OPT_IFACE_MODE_SPDIF		2</div><div class='add'>+</div><div class='add'>+static int get_clock_rate(u32 data, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int index = (data &amp; V2_CLOCK_RATE_MASK) &gt;&gt; V2_CLOCK_RATE_SHIFT;</div><div class='add'>+	if (index &gt;= ARRAY_SIZE(snd_motu_clock_rates))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	*rate = snd_motu_clock_rates[index];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V2_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return get_clock_rate(be32_to_cpu(reg), rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		if (snd_motu_clock_rates[i] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(snd_motu_clock_rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V2_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~V2_CLOCK_RATE_MASK;</div><div class='add'>+	data |= i &lt;&lt; V2_CLOCK_RATE_SHIFT;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, V2_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					  sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_clock_source(struct snd_motu *motu, u32 data,</div><div class='add'>+			    enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	switch (data &amp; V2_CLOCK_SRC_MASK) {</div><div class='add'>+	case V2_CLOCK_SRC_INTERNAL:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;</div><div class='add'>+		break;</div><div class='add'>+	case V2_CLOCK_SRC_ADAT_ON_OPT:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT;</div><div class='add'>+		break;</div><div class='add'>+	case V2_CLOCK_SRC_SPDIF:</div><div class='add'>+	{</div><div class='add'>+		bool support_iec60958_on_opt = (motu-&gt;spec == &amp;snd_motu_spec_828mk2 ||</div><div class='add'>+						motu-&gt;spec == &amp;snd_motu_spec_traveler);</div><div class='add'>+</div><div class='add'>+		if (motu-&gt;spec == &amp;snd_motu_spec_896hd) {</div><div class='add'>+			*src = SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR;</div><div class='add'>+		} else if (!support_iec60958_on_opt) {</div><div class='add'>+			*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;</div><div class='add'>+		} else {</div><div class='add'>+			__be32 reg;</div><div class='add'>+</div><div class='add'>+			// To check the configuration of optical interface.</div><div class='add'>+			int err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET, &amp;reg,</div><div class='add'>+							    sizeof(reg));</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			if (((data &amp; V2_OPT_IN_IFACE_MASK) &gt;&gt; V2_OPT_IN_IFACE_SHIFT) ==</div><div class='add'>+			    V2_OPT_IFACE_MODE_SPDIF)</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT;</div><div class='add'>+			else</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case V2_CLOCK_SRC_SPH:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_SPH;</div><div class='add'>+		break;</div><div class='add'>+	case V2_CLOCK_SRC_WORD_ON_BNC:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC;</div><div class='add'>+		break;</div><div class='add'>+	case V2_CLOCK_SRC_ADAT_ON_DSUB:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB;</div><div class='add'>+		break;</div><div class='add'>+	case V2_CLOCK_SRC_AESEBU_ON_XLR:</div><div class='add'>+		// For Traveler.</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					  enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V2_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return get_clock_source(motu, be32_to_cpu(reg), src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Expected for Traveler, which implements Altera Cyclone EP1C3.</div><div class='add'>+static int switch_fetching_mode_cyclone(struct snd_motu *motu, u32 *data,</div><div class='add'>+					bool enable)</div><div class='add'>+{</div><div class='add'>+	*data |= V2_CLOCK_MODEL_SPECIFIC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// For UltraLite and 8pre, which implements Xilinx Spartan XC3S200.</div><div class='add'>+static int switch_fetching_mode_spartan(struct snd_motu *motu, u32 *data,</div><div class='add'>+					bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	enum snd_motu_clock_source src;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock_source(motu, *data, &amp;src);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = get_clock_rate(*data, &amp;rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (src == SND_MOTU_CLOCK_SOURCE_SPH &amp;&amp; rate &gt; 48000)</div><div class='add'>+		*data |= V2_CLOCK_MODEL_SPECIFIC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+					      bool enable)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828mk2) {</div><div class='add'>+		// 828mkII implements Altera ACEX 1K EP1K30. Nothing to do.</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (motu-&gt;spec == &amp;snd_motu_spec_896hd) {</div><div class='add'>+		// 896HD implements Altera Cyclone EP1C3 but nothing to do.</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		__be32 reg;</div><div class='add'>+		u32 data;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = snd_motu_transaction_read(motu, V2_CLOCK_STATUS_OFFSET,</div><div class='add'>+						&amp;reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+		data &amp;= ~(V2_CLOCK_FETCH_ENABLE | V2_CLOCK_MODEL_SPECIFIC);</div><div class='add'>+		if (enable)</div><div class='add'>+			data |= V2_CLOCK_FETCH_ENABLE;</div><div class='add'>+</div><div class='add'>+		if (motu-&gt;spec == &amp;snd_motu_spec_traveler)</div><div class='add'>+			err = switch_fetching_mode_cyclone(motu, &amp;data, enable);</div><div class='add'>+		else</div><div class='add'>+			err = switch_fetching_mode_spartan(motu, &amp;data, enable);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		reg = cpu_to_be32(data);</div><div class='add'>+		return snd_motu_transaction_write(motu, V2_CLOCK_STATUS_OFFSET,</div><div class='add'>+						  &amp;reg, sizeof(reg));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_cache_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	bool has_two_opt_ifaces = (motu-&gt;spec == &amp;snd_motu_spec_8pre);</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_byte_offset = 10;</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_byte_offset = 10;</div><div class='add'>+</div><div class='add'>+	motu-&gt;tx_packet_formats.msg_chunks = 2;</div><div class='add'>+	motu-&gt;rx_packet_formats.msg_chunks = 2;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	memcpy(motu-&gt;tx_packet_formats.pcm_chunks,</div><div class='add'>+	       motu-&gt;spec-&gt;tx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;tx_packet_formats.pcm_chunks));</div><div class='add'>+	memcpy(motu-&gt;rx_packet_formats.pcm_chunks,</div><div class='add'>+	       motu-&gt;spec-&gt;rx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;rx_packet_formats.pcm_chunks));</div><div class='add'>+</div><div class='add'>+	if (((data &amp; V2_OPT_IN_IFACE_MASK) &gt;&gt; V2_OPT_IN_IFACE_SHIFT) == V2_OPT_IFACE_MODE_ADAT) {</div><div class='add'>+		motu-&gt;tx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+</div><div class='add'>+		if (!has_two_opt_ifaces)</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		else</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (((data &amp; V2_OPT_OUT_IFACE_MASK) &gt;&gt; V2_OPT_OUT_IFACE_SHIFT) == V2_OPT_IFACE_MODE_ADAT) {</div><div class='add'>+		motu-&gt;rx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+</div><div class='add'>+		if (!has_two_opt_ifaces)</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		else</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_828mk2 = {</div><div class='add'>+	.name = "828mk2",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {14, 14, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_896hd = {</div><div class='add'>+	.name = "896HD",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	.flags = SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {14, 14, 8},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 8},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_traveler = {</div><div class='add'>+	.name = "Traveler",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {14, 14, 8},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 8},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_ultralite = {</div><div class='add'>+	.name = "UltraLite",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {14, 14, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_8pre = {</div><div class='add'>+	.name = "8pre",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	// Two dummy chunks always in the end of data block.</div><div class='add'>+	.tx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {6, 6, 0},</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/motu/motu-protocol-v3.c b/sound/firewire/motu/motu-protocol-v3.c<br/>new file mode 100644<br/>index 000000000000..7254fdfe046a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-protocol-v3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-protocol-v3.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-protocol-v3.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define V3_CLOCK_STATUS_OFFSET		0x0b14</div><div class='add'>+#define  V3_FETCH_PCM_FRAMES		0x02000000</div><div class='add'>+#define  V3_CLOCK_RATE_MASK		0x0000ff00</div><div class='add'>+#define  V3_CLOCK_RATE_SHIFT		8</div><div class='add'>+#define  V3_CLOCK_SOURCE_MASK		0x000000ff</div><div class='add'>+#define   V3_CLOCK_SRC_INTERNAL		0x00</div><div class='add'>+#define   V3_CLOCK_SRC_WORD_ON_BNC	0x01</div><div class='add'>+#define   V3_CLOCK_SRC_SPH		0x02</div><div class='add'>+#define   V3_CLOCK_SRC_AESEBU_ON_XLR	0x08</div><div class='add'>+#define   V3_CLOCK_SRC_SPDIF_ON_COAX	0x10</div><div class='add'>+#define   V3_CLOCK_SRC_OPT_IFACE_A	0x18</div><div class='add'>+#define   V3_CLOCK_SRC_OPT_IFACE_B	0x19</div><div class='add'>+</div><div class='add'>+#define V3_OPT_IFACE_MODE_OFFSET	0x0c94</div><div class='add'>+#define  V3_ENABLE_OPT_IN_IFACE_A	0x00000001</div><div class='add'>+#define  V3_ENABLE_OPT_IN_IFACE_B	0x00000002</div><div class='add'>+#define  V3_ENABLE_OPT_OUT_IFACE_A	0x00000100</div><div class='add'>+#define  V3_ENABLE_OPT_OUT_IFACE_B	0x00000200</div><div class='add'>+#define  V3_NO_ADAT_OPT_IN_IFACE_A	0x00010000</div><div class='add'>+#define  V3_NO_ADAT_OPT_IN_IFACE_B	0x00100000</div><div class='add'>+#define  V3_NO_ADAT_OPT_OUT_IFACE_A	0x00040000</div><div class='add'>+#define  V3_NO_ADAT_OPT_OUT_IFACE_B	0x00400000</div><div class='add'>+</div><div class='add'>+#define V3_MSG_FLAG_CLK_CHANGED		0x00000002</div><div class='add'>+#define V3_CLK_WAIT_MSEC		4000</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data = (data &amp; V3_CLOCK_RATE_MASK) &gt;&gt; V3_CLOCK_RATE_SHIFT;</div><div class='add'>+	if (data &gt;= ARRAY_SIZE(snd_motu_clock_rates))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	*rate = snd_motu_clock_rates[data];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	bool need_to_wait;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_motu_clock_rates); ++i) {</div><div class='add'>+		if (snd_motu_clock_rates[i] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(snd_motu_clock_rates))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~(V3_CLOCK_RATE_MASK | V3_FETCH_PCM_FRAMES);</div><div class='add'>+	data |= i &lt;&lt; V3_CLOCK_RATE_SHIFT;</div><div class='add'>+</div><div class='add'>+	need_to_wait = data != be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	err = snd_motu_transaction_write(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					 sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (need_to_wait) {</div><div class='add'>+		int result;</div><div class='add'>+</div><div class='add'>+		motu-&gt;msg = 0;</div><div class='add'>+		result = wait_event_interruptible_timeout(motu-&gt;hwdep_wait,</div><div class='add'>+					motu-&gt;msg &amp; V3_MSG_FLAG_CLK_CHANGED,</div><div class='add'>+					msecs_to_jiffies(V3_CLK_WAIT_MSEC));</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			return result;</div><div class='add'>+		if (result == 0)</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					  enum snd_motu_clock_source *src)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; V3_CLOCK_SOURCE_MASK;</div><div class='add'>+</div><div class='add'>+	switch (data) {</div><div class='add'>+	case V3_CLOCK_SRC_INTERNAL:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;</div><div class='add'>+		break;</div><div class='add'>+	case V3_CLOCK_SRC_WORD_ON_BNC:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC;</div><div class='add'>+		break;</div><div class='add'>+	case V3_CLOCK_SRC_SPH:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_SPH;</div><div class='add'>+		break;</div><div class='add'>+	case V3_CLOCK_SRC_AESEBU_ON_XLR:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR;</div><div class='add'>+		break;</div><div class='add'>+	case V3_CLOCK_SRC_SPDIF_ON_COAX:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;</div><div class='add'>+		break;</div><div class='add'>+	case V3_CLOCK_SRC_OPT_IFACE_A:</div><div class='add'>+	case V3_CLOCK_SRC_OPT_IFACE_B:</div><div class='add'>+	{</div><div class='add'>+		__be32 reg;</div><div class='add'>+		u32 options;</div><div class='add'>+</div><div class='add'>+		err = snd_motu_transaction_read(motu,</div><div class='add'>+				V3_OPT_IFACE_MODE_OFFSET, &amp;reg, sizeof(reg));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		options = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+		if (data == V3_CLOCK_SRC_OPT_IFACE_A) {</div><div class='add'>+			if (options &amp; V3_NO_ADAT_OPT_IN_IFACE_A)</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_A;</div><div class='add'>+			else</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_A;</div><div class='add'>+		} else {</div><div class='add'>+			if (options &amp; V3_NO_ADAT_OPT_IN_IFACE_B)</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_B;</div><div class='add'>+			else</div><div class='add'>+				*src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_B;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		*src = SND_MOTU_CLOCK_SOURCE_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+					      bool enable)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		data |= V3_FETCH_PCM_FRAMES;</div><div class='add'>+	else</div><div class='add'>+		data &amp;= ~V3_FETCH_PCM_FRAMES;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, V3_CLOCK_STATUS_OFFSET, &amp;reg,</div><div class='add'>+					  sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_packet_formats_with_opt_ifaces(struct snd_motu *motu, u32 data)</div><div class='add'>+{</div><div class='add'>+	if (data &amp; V3_ENABLE_OPT_IN_IFACE_A) {</div><div class='add'>+		if (data &amp; V3_NO_ADAT_OPT_IN_IFACE_A) {</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[0] += 4;</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		} else {</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data &amp; V3_ENABLE_OPT_IN_IFACE_B) {</div><div class='add'>+		if (data &amp; V3_NO_ADAT_OPT_IN_IFACE_B) {</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[0] += 4;</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		} else {</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+			motu-&gt;tx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data &amp; V3_ENABLE_OPT_OUT_IFACE_A) {</div><div class='add'>+		if (data &amp; V3_NO_ADAT_OPT_OUT_IFACE_A) {</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[0] += 4;</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		} else {</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data &amp; V3_ENABLE_OPT_OUT_IFACE_B) {</div><div class='add'>+		if (data &amp; V3_NO_ADAT_OPT_OUT_IFACE_B) {</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[0] += 4;</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		} else {</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[0] += 8;</div><div class='add'>+			motu-&gt;rx_packet_formats.pcm_chunks[1] += 4;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_cache_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	motu-&gt;tx_packet_formats.pcm_byte_offset = 10;</div><div class='add'>+	motu-&gt;rx_packet_formats.pcm_byte_offset = 10;</div><div class='add'>+</div><div class='add'>+	motu-&gt;tx_packet_formats.msg_chunks = 2;</div><div class='add'>+	motu-&gt;rx_packet_formats.msg_chunks = 2;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, V3_OPT_IFACE_MODE_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	memcpy(motu-&gt;tx_packet_formats.pcm_chunks,</div><div class='add'>+	       motu-&gt;spec-&gt;tx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;tx_packet_formats.pcm_chunks));</div><div class='add'>+	memcpy(motu-&gt;rx_packet_formats.pcm_chunks,</div><div class='add'>+	       motu-&gt;spec-&gt;rx_fixed_pcm_chunks,</div><div class='add'>+	       sizeof(motu-&gt;rx_packet_formats.pcm_chunks));</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_828mk3_fw ||</div><div class='add'>+	    motu-&gt;spec == &amp;snd_motu_spec_828mk3_hybrid ||</div><div class='add'>+	    motu-&gt;spec == &amp;snd_motu_spec_896mk3 ||</div><div class='add'>+	    motu-&gt;spec == &amp;snd_motu_spec_traveler_mk3 ||</div><div class='add'>+	    motu-&gt;spec == &amp;snd_motu_spec_track16)</div><div class='add'>+		return detect_packet_formats_with_opt_ifaces(motu, data);</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_828mk3_fw = {</div><div class='add'>+	.name = "828mk3",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {18, 18, 14},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 10},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_828mk3_hybrid = {</div><div class='add'>+	.name = "828mk3",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {18, 18, 14},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 14},	// Additional 4 dummy chunks at higher rate.</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_896mk3 = {</div><div class='add'>+	.name = "896mk3",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {18, 14, 10},</div><div class='add'>+	.rx_fixed_pcm_chunks = {18, 14, 10},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_traveler_mk3 = {</div><div class='add'>+	.name = "TravelerMk3",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {18, 14, 10},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 10},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_ultralite_mk3 = {</div><div class='add'>+	.name = "UltraLiteMk3",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {18, 14, 10},</div><div class='add'>+	.rx_fixed_pcm_chunks = {14, 14, 14},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_audio_express = {</div><div class='add'>+	.name = "AudioExpress",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_track16 = {</div><div class='add'>+	.name = "Track16",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_TX_MIDI_3RD_Q |</div><div class='add'>+		 SND_MOTU_SPEC_COMMAND_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {14, 14, 14},</div><div class='add'>+	.rx_fixed_pcm_chunks = {6, 6, 6},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_motu_spec snd_motu_spec_4pre = {</div><div class='add'>+	.name = "4pre",</div><div class='add'>+	.protocol_version = SND_MOTU_PROTOCOL_V3,</div><div class='add'>+	.flags = SND_MOTU_SPEC_REGISTER_DSP,</div><div class='add'>+	.tx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+	.rx_fixed_pcm_chunks = {10, 10, 0},</div><div class='add'>+};</div><div class='head'>diff --git a/sound/firewire/motu/motu-register-dsp-message-parser.c b/sound/firewire/motu/motu-register-dsp-message-parser.c<br/>new file mode 100644<br/>index 000000000000..a8053e3ef065<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-register-dsp-message-parser.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-register-dsp-message-parser.c</a></div><div class='hunk'>@@ -0,0 +1,413 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// motu-register-dsp-message-parser.c - a part of driver for MOTU FireWire series</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+</div><div class='add'>+// Below models allow software to configure their DSP functions by asynchronous transaction</div><div class='add'>+// to access their internal registers.</div><div class='add'>+// * 828 mk2</div><div class='add'>+// * 896hd</div><div class='add'>+// * Traveler</div><div class='add'>+// * 8 pre</div><div class='add'>+// * Ultralite</div><div class='add'>+// * 4 pre</div><div class='add'>+// * Audio Express</div><div class='add'>+//</div><div class='add'>+// Additionally, isochronous packets from the above models include messages to notify state of</div><div class='add'>+// DSP. The messages are two set of 3 byte data in 2nd and 3rd quadlet of data block. When user</div><div class='add'>+// operates hardware components such as dial and switch, corresponding messages are transferred.</div><div class='add'>+// The messages include Hardware metering and MIDI messages as well.</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define MSG_FLAG_POS                    4</div><div class='add'>+#define MSG_FLAG_TYPE_MASK              0xf8</div><div class='add'>+#define MSG_FLAG_MIDI_MASK              0x01</div><div class='add'>+#define MSG_FLAG_MODEL_SPECIFIC_MASK    0x06</div><div class='add'>+#define   MSG_FLAG_8PRE                 0x00</div><div class='add'>+#define   MSG_FLAG_ULTRALITE            0x04</div><div class='add'>+#define   MSG_FLAG_TRAVELER             0x04</div><div class='add'>+#define   MSG_FLAG_828MK2               0x04</div><div class='add'>+#define   MSG_FLAG_896HD                0x04</div><div class='add'>+#define   MSG_FLAG_4PRE                 0x05 // MIDI mask is in 8th byte.</div><div class='add'>+#define   MSG_FLAG_AUDIOEXPRESS         0x05 // MIDI mask is in 8th byte.</div><div class='add'>+#define MSG_FLAG_TYPE_SHIFT             3</div><div class='add'>+#define MSG_VALUE_POS                   5</div><div class='add'>+#define MSG_MIDI_BYTE_POS		6</div><div class='add'>+#define MSG_METER_IDX_POS               7</div><div class='add'>+</div><div class='add'>+// In 4 pre and Audio express, meter index is in 6th byte. MIDI flag is in 8th byte and MIDI byte</div><div class='add'>+// is in 7th byte.</div><div class='add'>+#define MSG_METER_IDX_POS_4PRE_AE	6</div><div class='add'>+#define MSG_MIDI_BYTE_POS_4PRE_AE	7</div><div class='add'>+#define MSG_FLAG_MIDI_POS_4PRE_AE	8</div><div class='add'>+</div><div class='add'>+enum register_dsp_msg_type {</div><div class='add'>+	// Used for messages with no information.</div><div class='add'>+	INVALID = 0x00,</div><div class='add'>+	MIXER_SELECT = 0x01,</div><div class='add'>+	MIXER_SRC_GAIN = 0x02,</div><div class='add'>+	MIXER_SRC_PAN = 0x03,</div><div class='add'>+	MIXER_SRC_FLAG = 0x04,</div><div class='add'>+	MIXER_OUTPUT_PAIRED_VOLUME = 0x05,</div><div class='add'>+	MIXER_OUTPUT_PAIRED_FLAG = 0x06,</div><div class='add'>+	MAIN_OUTPUT_PAIRED_VOLUME = 0x07,</div><div class='add'>+	HP_OUTPUT_PAIRED_VOLUME = 0x08,</div><div class='add'>+	HP_OUTPUT_PAIRED_ASSIGNMENT = 0x09,</div><div class='add'>+	// Transferred by all models but the purpose is still unknown.</div><div class='add'>+	UNKNOWN_0 = 0x0a,</div><div class='add'>+	// Specific to 828mk2, 896hd, Traveler.</div><div class='add'>+	UNKNOWN_2 = 0x0c,</div><div class='add'>+	// Specific to 828mk2, Traveler, and 896hd (not functional).</div><div class='add'>+	LINE_INPUT_BOOST = 0x0d,</div><div class='add'>+	// Specific to 828mk2, Traveler, and 896hd (not functional).</div><div class='add'>+	LINE_INPUT_NOMINAL_LEVEL = 0x0e,</div><div class='add'>+	// Specific to Ultralite, 4 pre, Audio express, and 8 pre (not functional).</div><div class='add'>+	INPUT_GAIN_AND_INVERT = 0x15,</div><div class='add'>+	// Specific to 4 pre, and Audio express.</div><div class='add'>+	INPUT_FLAG = 0x16,</div><div class='add'>+	// Specific to 4 pre, and Audio express.</div><div class='add'>+	MIXER_SRC_PAIRED_BALANCE = 0x17,</div><div class='add'>+	// Specific to 4 pre, and Audio express.</div><div class='add'>+	MIXER_SRC_PAIRED_WIDTH = 0x18,</div><div class='add'>+	// Transferred by all models. This type of message interposes the series of the other</div><div class='add'>+	// messages. The message delivers signal level up to 96.0 kHz. In 828mk2, 896hd, and</div><div class='add'>+	// Traveler, one of physical outputs is selected for the message. The selection is done</div><div class='add'>+	// by LSB one byte in asynchronous write quadlet transaction to 0x'ffff'f000'0b2c.</div><div class='add'>+	METER = 0x1f,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EVENT_QUEUE_SIZE	16</div><div class='add'>+</div><div class='add'>+struct msg_parser {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct snd_firewire_motu_register_dsp_meter meter;</div><div class='add'>+	bool meter_pos_quirk;</div><div class='add'>+</div><div class='add'>+	struct snd_firewire_motu_register_dsp_parameter param;</div><div class='add'>+	u8 prev_mixer_src_type;</div><div class='add'>+	u8 mixer_ch;</div><div class='add'>+	u8 mixer_src_ch;</div><div class='add'>+</div><div class='add'>+	u8 input_ch;</div><div class='add'>+	u8 prev_msg_type;</div><div class='add'>+</div><div class='add'>+	u32 event_queue[EVENT_QUEUE_SIZE];</div><div class='add'>+	unsigned int push_pos;</div><div class='add'>+	unsigned int pull_pos;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_motu_register_dsp_message_parser_new(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser;</div><div class='add'>+	parser = devm_kzalloc(&amp;motu-&gt;card-&gt;card_dev, sizeof(*parser), GFP_KERNEL);</div><div class='add'>+	if (!parser)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spin_lock_init(&amp;parser-&gt;lock);</div><div class='add'>+	if (motu-&gt;spec == &amp;snd_motu_spec_4pre || motu-&gt;spec == &amp;snd_motu_spec_audio_express)</div><div class='add'>+		parser-&gt;meter_pos_quirk = true;</div><div class='add'>+	motu-&gt;message_parser = parser;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_register_dsp_message_parser_init(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	parser-&gt;prev_mixer_src_type = INVALID;</div><div class='add'>+	parser-&gt;mixer_ch = 0xff;</div><div class='add'>+	parser-&gt;mixer_src_ch = 0xff;</div><div class='add'>+	parser-&gt;prev_msg_type = INVALID;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Rough implementaion of queue without overrun check.</div><div class='add'>+static void queue_event(struct snd_motu *motu, u8 msg_type, u8 identifier0, u8 identifier1, u8 val)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+	unsigned int pos = parser-&gt;push_pos;</div><div class='add'>+	u32 entry;</div><div class='add'>+</div><div class='add'>+	if (!motu-&gt;hwdep || motu-&gt;hwdep-&gt;used == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	entry = (msg_type &lt;&lt; 24) | (identifier0 &lt;&lt; 16) | (identifier1 &lt;&lt; 8) | val;</div><div class='add'>+	parser-&gt;event_queue[pos] = entry;</div><div class='add'>+</div><div class='add'>+	++pos;</div><div class='add'>+	if (pos &gt;= EVENT_QUEUE_SIZE)</div><div class='add'>+		pos = 0;</div><div class='add'>+	parser-&gt;push_pos = pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_register_dsp_message_parser_parse(const struct amdtp_stream *s,</div><div class='add'>+						const struct pkt_desc *desc, unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = container_of(s, struct snd_motu, tx_stream);</div><div class='add'>+	unsigned int data_block_quadlets = s-&gt;data_block_quadlets;</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+	bool meter_pos_quirk = parser-&gt;meter_pos_quirk;</div><div class='add'>+	unsigned int pos = parser-&gt;push_pos;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buffer = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; data_blocks; ++j) {</div><div class='add'>+			u8 *b = (u8 *)buffer;</div><div class='add'>+			u8 msg_type = (b[MSG_FLAG_POS] &amp; MSG_FLAG_TYPE_MASK) &gt;&gt; MSG_FLAG_TYPE_SHIFT;</div><div class='add'>+			u8 val = b[MSG_VALUE_POS];</div><div class='add'>+</div><div class='add'>+			buffer += data_block_quadlets;</div><div class='add'>+</div><div class='add'>+			switch (msg_type) {</div><div class='add'>+			case MIXER_SELECT:</div><div class='add'>+			{</div><div class='add'>+				u8 mixer_ch = val / 0x20;</div><div class='add'>+				if (mixer_ch &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT) {</div><div class='add'>+					parser-&gt;mixer_src_ch = 0;</div><div class='add'>+					parser-&gt;mixer_ch = mixer_ch;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case MIXER_SRC_GAIN:</div><div class='add'>+			case MIXER_SRC_PAN:</div><div class='add'>+			case MIXER_SRC_FLAG:</div><div class='add'>+			case MIXER_SRC_PAIRED_BALANCE:</div><div class='add'>+			case MIXER_SRC_PAIRED_WIDTH:</div><div class='add'>+			{</div><div class='add'>+				struct snd_firewire_motu_register_dsp_parameter *param = &amp;parser-&gt;param;</div><div class='add'>+				u8 mixer_ch = parser-&gt;mixer_ch;</div><div class='add'>+				u8 mixer_src_ch = parser-&gt;mixer_src_ch;</div><div class='add'>+</div><div class='add'>+				if (msg_type != parser-&gt;prev_mixer_src_type)</div><div class='add'>+					mixer_src_ch = 0;</div><div class='add'>+				else</div><div class='add'>+					++mixer_src_ch;</div><div class='add'>+				parser-&gt;prev_mixer_src_type = msg_type;</div><div class='add'>+</div><div class='add'>+				if (mixer_ch &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT &amp;&amp;</div><div class='add'>+				    mixer_src_ch &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_SRC_COUNT) {</div><div class='add'>+					u8 mixer_ch = parser-&gt;mixer_ch;</div><div class='add'>+</div><div class='add'>+					switch (msg_type) {</div><div class='add'>+					case MIXER_SRC_GAIN:</div><div class='add'>+						if (param-&gt;mixer.source[mixer_ch].gain[mixer_src_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);</div><div class='add'>+							param-&gt;mixer.source[mixer_ch].gain[mixer_src_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case MIXER_SRC_PAN:</div><div class='add'>+						if (param-&gt;mixer.source[mixer_ch].pan[mixer_src_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);</div><div class='add'>+							param-&gt;mixer.source[mixer_ch].pan[mixer_src_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case MIXER_SRC_FLAG:</div><div class='add'>+						if (param-&gt;mixer.source[mixer_ch].flag[mixer_src_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);</div><div class='add'>+							param-&gt;mixer.source[mixer_ch].flag[mixer_src_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case MIXER_SRC_PAIRED_BALANCE:</div><div class='add'>+						if (param-&gt;mixer.source[mixer_ch].paired_balance[mixer_src_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);</div><div class='add'>+							param-&gt;mixer.source[mixer_ch].paired_balance[mixer_src_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case MIXER_SRC_PAIRED_WIDTH:</div><div class='add'>+						if (param-&gt;mixer.source[mixer_ch].paired_width[mixer_src_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, mixer_src_ch, val);</div><div class='add'>+							param-&gt;mixer.source[mixer_ch].paired_width[mixer_src_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+</div><div class='add'>+					parser-&gt;mixer_src_ch = mixer_src_ch;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case MIXER_OUTPUT_PAIRED_VOLUME:</div><div class='add'>+			case MIXER_OUTPUT_PAIRED_FLAG:</div><div class='add'>+			{</div><div class='add'>+				struct snd_firewire_motu_register_dsp_parameter *param = &amp;parser-&gt;param;</div><div class='add'>+				u8 mixer_ch = parser-&gt;mixer_ch;</div><div class='add'>+</div><div class='add'>+				if (mixer_ch &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_MIXER_COUNT) {</div><div class='add'>+					switch (msg_type) {</div><div class='add'>+					case MIXER_OUTPUT_PAIRED_VOLUME:</div><div class='add'>+						if (param-&gt;mixer.output.paired_volume[mixer_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, 0, val);</div><div class='add'>+							param-&gt;mixer.output.paired_volume[mixer_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case MIXER_OUTPUT_PAIRED_FLAG:</div><div class='add'>+						if (param-&gt;mixer.output.paired_flag[mixer_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, mixer_ch, 0, val);</div><div class='add'>+							param-&gt;mixer.output.paired_flag[mixer_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case MAIN_OUTPUT_PAIRED_VOLUME:</div><div class='add'>+				if (parser-&gt;param.output.main_paired_volume != val) {</div><div class='add'>+					queue_event(motu, msg_type, 0, 0, val);</div><div class='add'>+					parser-&gt;param.output.main_paired_volume = val;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case HP_OUTPUT_PAIRED_VOLUME:</div><div class='add'>+				if (parser-&gt;param.output.hp_paired_volume != val) {</div><div class='add'>+					queue_event(motu, msg_type, 0, 0, val);</div><div class='add'>+					parser-&gt;param.output.hp_paired_volume = val;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case HP_OUTPUT_PAIRED_ASSIGNMENT:</div><div class='add'>+				if (parser-&gt;param.output.hp_paired_assignment != val) {</div><div class='add'>+					queue_event(motu, msg_type, 0, 0, val);</div><div class='add'>+					parser-&gt;param.output.hp_paired_assignment = val;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case LINE_INPUT_BOOST:</div><div class='add'>+				if (parser-&gt;param.line_input.boost_flag != val) {</div><div class='add'>+					queue_event(motu, msg_type, 0, 0, val);</div><div class='add'>+					parser-&gt;param.line_input.boost_flag = val;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case LINE_INPUT_NOMINAL_LEVEL:</div><div class='add'>+				if (parser-&gt;param.line_input.nominal_level_flag != val) {</div><div class='add'>+					queue_event(motu, msg_type, 0, 0, val);</div><div class='add'>+					parser-&gt;param.line_input.nominal_level_flag = val;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			case INPUT_GAIN_AND_INVERT:</div><div class='add'>+			case INPUT_FLAG:</div><div class='add'>+			{</div><div class='add'>+				struct snd_firewire_motu_register_dsp_parameter *param = &amp;parser-&gt;param;</div><div class='add'>+				u8 input_ch = parser-&gt;input_ch;</div><div class='add'>+</div><div class='add'>+				if (parser-&gt;prev_msg_type != msg_type)</div><div class='add'>+					input_ch = 0;</div><div class='add'>+				else</div><div class='add'>+					++input_ch;</div><div class='add'>+</div><div class='add'>+				if (input_ch &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_INPUT_COUNT) {</div><div class='add'>+					switch (msg_type) {</div><div class='add'>+					case INPUT_GAIN_AND_INVERT:</div><div class='add'>+						if (param-&gt;input.gain_and_invert[input_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, input_ch, 0, val);</div><div class='add'>+							param-&gt;input.gain_and_invert[input_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					case INPUT_FLAG:</div><div class='add'>+						if (param-&gt;input.flag[input_ch] != val) {</div><div class='add'>+							queue_event(motu, msg_type, input_ch, 0, val);</div><div class='add'>+							param-&gt;input.flag[input_ch] = val;</div><div class='add'>+						}</div><div class='add'>+						break;</div><div class='add'>+					default:</div><div class='add'>+						break;</div><div class='add'>+					}</div><div class='add'>+					parser-&gt;input_ch = input_ch;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			case UNKNOWN_0:</div><div class='add'>+			case UNKNOWN_2:</div><div class='add'>+				break;</div><div class='add'>+			case METER:</div><div class='add'>+			{</div><div class='add'>+				u8 pos;</div><div class='add'>+</div><div class='add'>+				if (!meter_pos_quirk)</div><div class='add'>+					pos = b[MSG_METER_IDX_POS];</div><div class='add'>+				else</div><div class='add'>+					pos = b[MSG_METER_IDX_POS_4PRE_AE];</div><div class='add'>+</div><div class='add'>+				if (pos &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_METER_INPUT_COUNT) {</div><div class='add'>+					parser-&gt;meter.data[pos] = val;</div><div class='add'>+				} else if (pos &gt;= 0x80) {</div><div class='add'>+					pos -= (0x80 - SNDRV_FIREWIRE_MOTU_REGISTER_DSP_METER_INPUT_COUNT);</div><div class='add'>+</div><div class='add'>+					if (pos &lt; SNDRV_FIREWIRE_MOTU_REGISTER_DSP_METER_COUNT)</div><div class='add'>+						parser-&gt;meter.data[pos] = val;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				// The message for meter is interruptible to the series of other</div><div class='add'>+				// types of messages. Don't cache it.</div><div class='add'>+				fallthrough;</div><div class='add'>+			}</div><div class='add'>+			case INVALID:</div><div class='add'>+			default:</div><div class='add'>+				// Don't cache it.</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			parser-&gt;prev_msg_type = msg_type;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos != parser-&gt;push_pos)</div><div class='add'>+		wake_up(&amp;motu-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_register_dsp_message_parser_copy_meter(struct snd_motu *motu,</div><div class='add'>+						struct snd_firewire_motu_register_dsp_meter *meter)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+	memcpy(meter, &amp;parser-&gt;meter, sizeof(*meter));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_register_dsp_message_parser_copy_parameter(struct snd_motu *motu,</div><div class='add'>+					struct snd_firewire_motu_register_dsp_parameter *param)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+	memcpy(param, &amp;parser-&gt;param, sizeof(*param));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+</div><div class='add'>+	if (parser-&gt;pull_pos &gt; parser-&gt;push_pos)</div><div class='add'>+		return EVENT_QUEUE_SIZE - parser-&gt;pull_pos + parser-&gt;push_pos;</div><div class='add'>+	else</div><div class='add'>+		return parser-&gt;push_pos - parser-&gt;pull_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool snd_motu_register_dsp_message_parser_copy_event(struct snd_motu *motu, u32 *event)</div><div class='add'>+{</div><div class='add'>+	struct msg_parser *parser = motu-&gt;message_parser;</div><div class='add'>+	unsigned int pos = parser-&gt;pull_pos;</div><div class='add'>+</div><div class='add'>+	if (pos == parser-&gt;push_pos)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;parser-&gt;lock);</div><div class='add'>+</div><div class='add'>+	*event = parser-&gt;event_queue[pos];</div><div class='add'>+</div><div class='add'>+	++pos;</div><div class='add'>+	if (pos &gt;= EVENT_QUEUE_SIZE)</div><div class='add'>+		pos = 0;</div><div class='add'>+	parser-&gt;pull_pos = pos;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c<br/>new file mode 100644<br/>index 000000000000..e5f21360cfb7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-stream.c</a></div><div class='hunk'>@@ -0,0 +1,429 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-stream.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define	READY_TIMEOUT_MS	200</div><div class='add'>+</div><div class='add'>+#define ISOC_COMM_CONTROL_OFFSET		0x0b00</div><div class='add'>+#define  ISOC_COMM_CONTROL_MASK			0xffff0000</div><div class='add'>+#define  CHANGE_RX_ISOC_COMM_STATE		0x80000000</div><div class='add'>+#define  RX_ISOC_COMM_IS_ACTIVATED		0x40000000</div><div class='add'>+#define  RX_ISOC_COMM_CHANNEL_MASK		0x3f000000</div><div class='add'>+#define  RX_ISOC_COMM_CHANNEL_SHIFT		24</div><div class='add'>+#define  CHANGE_TX_ISOC_COMM_STATE		0x00800000</div><div class='add'>+#define  TX_ISOC_COMM_IS_ACTIVATED		0x00400000</div><div class='add'>+#define  TX_ISOC_COMM_CHANNEL_MASK		0x003f0000</div><div class='add'>+#define  TX_ISOC_COMM_CHANNEL_SHIFT		16</div><div class='add'>+</div><div class='add'>+#define PACKET_FORMAT_OFFSET			0x0b10</div><div class='add'>+#define  TX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS	0x00000080</div><div class='add'>+#define  RX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS	0x00000040</div><div class='add'>+#define  TX_PACKET_TRANSMISSION_SPEED_MASK	0x0000000f</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_motu *motu, unsigned int rate,</div><div class='add'>+			  struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	struct snd_motu_packet_format *packet_format;</div><div class='add'>+	unsigned int midi_ports = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;motu-&gt;rx_stream) {</div><div class='add'>+		resources = &amp;motu-&gt;rx_resources;</div><div class='add'>+		packet_format = &amp;motu-&gt;rx_packet_formats;</div><div class='add'>+</div><div class='add'>+		if ((motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_2ND_Q) ||</div><div class='add'>+		    (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_3RD_Q))</div><div class='add'>+			midi_ports = 1;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;motu-&gt;tx_resources;</div><div class='add'>+		packet_format = &amp;motu-&gt;tx_packet_formats;</div><div class='add'>+</div><div class='add'>+		if ((motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_2ND_Q) ||</div><div class='add'>+		    (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_3RD_Q))</div><div class='add'>+			midi_ports = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_motu_set_parameters(stream, rate, midi_ports,</div><div class='add'>+					packet_format);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return fw_iso_resources_allocate(resources,</div><div class='add'>+				amdtp_stream_get_max_payload(stream),</div><div class='add'>+				fw_parent_device(motu-&gt;unit)-&gt;max_speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int begin_session(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Configure the unit to start isochronous communication.</div><div class='add'>+	err = snd_motu_transaction_read(motu, ISOC_COMM_CONTROL_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg) &amp; ~ISOC_COMM_CONTROL_MASK;</div><div class='add'>+</div><div class='add'>+	data |= CHANGE_RX_ISOC_COMM_STATE | RX_ISOC_COMM_IS_ACTIVATED |</div><div class='add'>+		(motu-&gt;rx_resources.channel &lt;&lt; RX_ISOC_COMM_CHANNEL_SHIFT) |</div><div class='add'>+		CHANGE_TX_ISOC_COMM_STATE | TX_ISOC_COMM_IS_ACTIVATED |</div><div class='add'>+		(motu-&gt;tx_resources.channel &lt;&lt; TX_ISOC_COMM_CHANNEL_SHIFT);</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, ISOC_COMM_CONTROL_OFFSET, &amp;reg,</div><div class='add'>+					  sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_session(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_protocol_switch_fetching_mode(motu, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, ISOC_COMM_CONTROL_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~(RX_ISOC_COMM_IS_ACTIVATED | TX_ISOC_COMM_IS_ACTIVATED);</div><div class='add'>+	data |= CHANGE_RX_ISOC_COMM_STATE | CHANGE_TX_ISOC_COMM_STATE;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	snd_motu_transaction_write(motu, ISOC_COMM_CONTROL_OFFSET, &amp;reg,</div><div class='add'>+				   sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_cache_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_protocol_cache_packet_formats(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_2ND_Q) {</div><div class='add'>+		motu-&gt;tx_packet_formats.midi_flag_offset = 4;</div><div class='add'>+		motu-&gt;tx_packet_formats.midi_byte_offset = 6;</div><div class='add'>+	} else if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_3RD_Q) {</div><div class='add'>+		motu-&gt;tx_packet_formats.midi_flag_offset = 8;</div><div class='add'>+		motu-&gt;tx_packet_formats.midi_byte_offset = 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_2ND_Q) {</div><div class='add'>+		motu-&gt;rx_packet_formats.midi_flag_offset = 4;</div><div class='add'>+		motu-&gt;rx_packet_formats.midi_byte_offset = 6;</div><div class='add'>+	} else if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_3RD_Q) {</div><div class='add'>+		motu-&gt;rx_packet_formats.midi_flag_offset = 8;</div><div class='add'>+		motu-&gt;rx_packet_formats.midi_byte_offset = 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_protocol_get_clock_rate(motu, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0)</div><div class='add'>+		rate = curr_rate;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;substreams_counter == 0 || curr_rate != rate) {</div><div class='add'>+		amdtp_domain_stop(&amp;motu-&gt;domain);</div><div class='add'>+		finish_session(motu);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;motu-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;motu-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		kfree(motu-&gt;cache.event_offsets);</div><div class='add'>+		motu-&gt;cache.event_offsets = NULL;</div><div class='add'>+</div><div class='add'>+		err = snd_motu_protocol_set_clock_rate(motu, rate);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;motu-&gt;unit-&gt;device,</div><div class='add'>+				"fail to set sampling rate: %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = snd_motu_stream_cache_packet_formats(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(motu, rate, &amp;motu-&gt;tx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(motu, rate, &amp;motu-&gt;rx_stream);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;motu-&gt;tx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;motu-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;motu-&gt;tx_resources);</div><div class='add'>+			fw_iso_resources_free(&amp;motu-&gt;rx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		motu-&gt;cache.size = motu-&gt;tx_stream.syt_interval * frames_per_buffer;</div><div class='add'>+		motu-&gt;cache.event_offsets = kcalloc(motu-&gt;cache.size, sizeof(*motu-&gt;cache.event_offsets),</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+		if (!motu-&gt;cache.event_offsets) {</div><div class='add'>+			fw_iso_resources_free(&amp;motu-&gt;tx_resources);</div><div class='add'>+			fw_iso_resources_free(&amp;motu-&gt;rx_resources);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ensure_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_read(motu, PACKET_FORMAT_OFFSET, &amp;reg,</div><div class='add'>+					sizeof(reg));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data = be32_to_cpu(reg);</div><div class='add'>+</div><div class='add'>+	data &amp;= ~(TX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS |</div><div class='add'>+		  RX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS|</div><div class='add'>+		  TX_PACKET_TRANSMISSION_SPEED_MASK);</div><div class='add'>+	if (motu-&gt;spec-&gt;tx_fixed_pcm_chunks[0] == motu-&gt;tx_packet_formats.pcm_chunks[0])</div><div class='add'>+		data |= TX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS;</div><div class='add'>+	if (motu-&gt;spec-&gt;rx_fixed_pcm_chunks[0] == motu-&gt;rx_packet_formats.pcm_chunks[0])</div><div class='add'>+		data |= RX_PACKET_EXCLUDE_DIFFERED_DATA_CHUNKS;</div><div class='add'>+	data |= fw_parent_device(motu-&gt;unit)-&gt;max_speed;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_motu_transaction_write(motu, PACKET_FORMAT_OFFSET, &amp;reg,</div><div class='add'>+					  sizeof(reg));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_start_duplex(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = motu-&gt;rx_resources.generation;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;substreams_counter == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;motu-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;motu-&gt;tx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;motu-&gt;domain);</div><div class='add'>+		finish_session(motu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(motu-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;motu-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = fw_iso_resources_update(&amp;motu-&gt;tx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(&amp;motu-&gt;rx_stream)) {</div><div class='add'>+		int spd = fw_parent_device(motu-&gt;unit)-&gt;max_speed;</div><div class='add'>+</div><div class='add'>+		err = ensure_packet_formats(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP) {</div><div class='add'>+			err = snd_motu_register_dsp_message_parser_init(motu);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_COMMAND_DSP) {</div><div class='add'>+			err = snd_motu_command_dsp_message_parser_init(motu, motu-&gt;tx_stream.sfc);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = begin_session(motu);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;motu-&gt;unit-&gt;device,</div><div class='add'>+				"fail to start isochronous comm: %d\n", err);</div><div class='add'>+			goto stop_streams;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;motu-&gt;domain, &amp;motu-&gt;tx_stream,</div><div class='add'>+					      motu-&gt;tx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto stop_streams;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;motu-&gt;domain, &amp;motu-&gt;rx_stream,</div><div class='add'>+					      motu-&gt;rx_resources.channel, spd);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto stop_streams;</div><div class='add'>+</div><div class='add'>+		motu-&gt;cache.tail = 0;</div><div class='add'>+		motu-&gt;cache.tx_cycle_count = UINT_MAX;</div><div class='add'>+		motu-&gt;cache.head = 0;</div><div class='add'>+		motu-&gt;cache.rx_cycle_count = UINT_MAX;</div><div class='add'>+</div><div class='add'>+		// NOTE: The device requires both of replay; the sequence of the number of data</div><div class='add'>+		// blocks per packet, and the sequence of source packet header per data block as</div><div class='add'>+		// presentation time.</div><div class='add'>+		err = amdtp_domain_start(&amp;motu-&gt;domain, 0, true, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto stop_streams;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;motu-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto stop_streams;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = snd_motu_protocol_switch_fetching_mode(motu, true);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;motu-&gt;unit-&gt;device,</div><div class='add'>+				"fail to enable frame fetching: %d\n", err);</div><div class='add'>+			goto stop_streams;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+stop_streams:</div><div class='add'>+	amdtp_domain_stop(&amp;motu-&gt;domain);</div><div class='add'>+	finish_session(motu);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_stream_stop_duplex(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;motu-&gt;domain);</div><div class='add'>+		finish_session(motu);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;motu-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;motu-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		kfree(motu-&gt;cache.event_offsets);</div><div class='add'>+		motu-&gt;cache.event_offsets = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_motu *motu, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	enum amdtp_stream_direction dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;motu-&gt;tx_stream) {</div><div class='add'>+		resources = &amp;motu-&gt;tx_resources;</div><div class='add'>+		dir = AMDTP_IN_STREAM;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;motu-&gt;rx_resources;</div><div class='add'>+		dir = AMDTP_OUT_STREAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(resources, motu-&gt;unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_motu_init(s, motu-&gt;unit, dir, motu-&gt;spec, &amp;motu-&gt;cache);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_destroy(resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_motu *motu, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(s);</div><div class='add'>+</div><div class='add'>+	if (s == &amp;motu-&gt;tx_stream)</div><div class='add'>+		fw_iso_resources_destroy(&amp;motu-&gt;tx_resources);</div><div class='add'>+	else</div><div class='add'>+		fw_iso_resources_destroy(&amp;motu-&gt;rx_resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_init_duplex(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(motu, &amp;motu-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(motu, &amp;motu-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(motu, &amp;motu-&gt;tx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;motu-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(motu, &amp;motu-&gt;tx_stream);</div><div class='add'>+		destroy_stream(motu, &amp;motu-&gt;rx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function should be called before starting streams or after stopping</div><div class='add'>+// streams.</div><div class='add'>+void snd_motu_stream_destroy_duplex(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;motu-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(motu, &amp;motu-&gt;rx_stream);</div><div class='add'>+	destroy_stream(motu, &amp;motu-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	motu-&gt;substreams_counter = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void motu_lock_changed(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	motu-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;motu-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_lock_try(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;dev_lock_count++ == 0)</div><div class='add'>+		motu_lock_changed(motu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_stream_lock_release(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;motu-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(motu-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (--motu-&gt;dev_lock_count == 0)</div><div class='add'>+		motu_lock_changed(motu);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu-transaction.c b/sound/firewire/motu/motu-transaction.c<br/>new file mode 100644<br/>index 000000000000..804f4208cf81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu-transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu-transaction.c</a></div><div class='hunk'>@@ -0,0 +1,135 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu-transaction.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define SND_MOTU_ADDR_BASE	0xfffff0000000ULL</div><div class='add'>+#define ASYNC_ADDR_HI  0x0b04</div><div class='add'>+#define ASYNC_ADDR_LO  0x0b08</div><div class='add'>+</div><div class='add'>+int snd_motu_transaction_read(struct snd_motu *motu, u32 offset, __be32 *reg,</div><div class='add'>+			      size_t size)</div><div class='add'>+{</div><div class='add'>+	int tcode;</div><div class='add'>+</div><div class='add'>+	if (size % sizeof(__be32) &gt; 0 || size &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (size == sizeof(__be32))</div><div class='add'>+		tcode = TCODE_READ_QUADLET_REQUEST;</div><div class='add'>+	else</div><div class='add'>+		tcode = TCODE_READ_BLOCK_REQUEST;</div><div class='add'>+</div><div class='add'>+	return snd_fw_transaction(motu-&gt;unit, tcode,</div><div class='add'>+				  SND_MOTU_ADDR_BASE + offset, reg, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_transaction_write(struct snd_motu *motu, u32 offset, __be32 *reg,</div><div class='add'>+			       size_t size)</div><div class='add'>+{</div><div class='add'>+	int tcode;</div><div class='add'>+</div><div class='add'>+	if (size % sizeof(__be32) &gt; 0 || size &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (size == sizeof(__be32))</div><div class='add'>+		tcode = TCODE_WRITE_QUADLET_REQUEST;</div><div class='add'>+	else</div><div class='add'>+		tcode = TCODE_WRITE_BLOCK_REQUEST;</div><div class='add'>+</div><div class='add'>+	return snd_fw_transaction(motu-&gt;unit, tcode,</div><div class='add'>+				  SND_MOTU_ADDR_BASE + offset, reg, size, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_message(struct fw_card *card, struct fw_request *request,</div><div class='add'>+			   int tcode, int destination, int source,</div><div class='add'>+			   int generation, unsigned long long offset,</div><div class='add'>+			   void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = callback_data;</div><div class='add'>+	__be32 *buf = (__be32 *)data;</div><div class='add'>+</div><div class='add'>+	if (tcode != TCODE_WRITE_QUADLET_REQUEST) {</div><div class='add'>+		fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset != motu-&gt;async_handler.offset || length != 4) {</div><div class='add'>+		fw_send_response(card, request, RCODE_ADDRESS_ERROR);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;motu-&gt;lock) {</div><div class='add'>+		motu-&gt;msg = be32_to_cpu(*buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+</div><div class='add'>+	wake_up(&amp;motu-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_transaction_reregister(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(motu-&gt;unit);</div><div class='add'>+	__be32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;async_handler.callback_data == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Register messaging address. Block transaction is not allowed. */</div><div class='add'>+	data = cpu_to_be32((device-&gt;card-&gt;node_id &lt;&lt; 16) |</div><div class='add'>+			   (motu-&gt;async_handler.offset &gt;&gt; 32));</div><div class='add'>+	err = snd_motu_transaction_write(motu, ASYNC_ADDR_HI, &amp;data,</div><div class='add'>+					 sizeof(data));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = cpu_to_be32(motu-&gt;async_handler.offset);</div><div class='add'>+	return snd_motu_transaction_write(motu, ASYNC_ADDR_LO, &amp;data,</div><div class='add'>+					  sizeof(data));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_transaction_register(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	static const struct fw_address_region resp_register_region = {</div><div class='add'>+		.start	= 0xffffe0000000ull,</div><div class='add'>+		.end	= 0xffffe000ffffull,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Perhaps, 4 byte messages are transferred. */</div><div class='add'>+	motu-&gt;async_handler.length = 4;</div><div class='add'>+	motu-&gt;async_handler.address_callback = handle_message;</div><div class='add'>+	motu-&gt;async_handler.callback_data = motu;</div><div class='add'>+</div><div class='add'>+	err = fw_core_add_address_handler(&amp;motu-&gt;async_handler,</div><div class='add'>+					  &amp;resp_register_region);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_reregister(motu);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		fw_core_remove_address_handler(&amp;motu-&gt;async_handler);</div><div class='add'>+		motu-&gt;async_handler.address_callback = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_motu_transaction_unregister(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	__be32 data;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;async_handler.address_callback != NULL)</div><div class='add'>+		fw_core_remove_address_handler(&amp;motu-&gt;async_handler);</div><div class='add'>+	motu-&gt;async_handler.address_callback = NULL;</div><div class='add'>+</div><div class='add'>+	/* Unregister the address. */</div><div class='add'>+	data = cpu_to_be32(0x00000000);</div><div class='add'>+	snd_motu_transaction_write(motu, ASYNC_ADDR_HI, &amp;data, sizeof(data));</div><div class='add'>+	snd_motu_transaction_write(motu, ASYNC_ADDR_LO, &amp;data, sizeof(data));</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c<br/>new file mode 100644<br/>index 000000000000..fd2a9dddbfa6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu.c</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * motu.c - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "motu.h"</div><div class='add'>+</div><div class='add'>+#define OUI_MOTU	0x0001f2</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("MOTU FireWire driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+const unsigned int snd_motu_clock_rates[SND_MOTU_CLOCK_RATE_COUNT] = {</div><div class='add'>+	/* mode 0 */</div><div class='add'>+	[0] =  44100,</div><div class='add'>+	[1] =  48000,</div><div class='add'>+	/* mode 1 */</div><div class='add'>+	[2] =  88200,</div><div class='add'>+	[3] =  96000,</div><div class='add'>+	/* mode 2 */</div><div class='add'>+	[4] = 176400,</div><div class='add'>+	[5] = 192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void name_card(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(motu-&gt;unit);</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val;</div><div class='add'>+	u32 version = 0;</div><div class='add'>+</div><div class='add'>+	fw_csr_iterator_init(&amp;it, motu-&gt;unit-&gt;directory);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		switch (key) {</div><div class='add'>+		case CSR_MODEL:</div><div class='add'>+			version = val;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(motu-&gt;card-&gt;driver, "FW-MOTU");</div><div class='add'>+	strscpy(motu-&gt;card-&gt;shortname, motu-&gt;spec-&gt;name);</div><div class='add'>+	strscpy(motu-&gt;card-&gt;mixername, motu-&gt;spec-&gt;name);</div><div class='add'>+	snprintf(motu-&gt;card-&gt;longname, sizeof(motu-&gt;card-&gt;longname),</div><div class='add'>+		 "MOTU %s (version:%06x), GUID %08x%08x at %s, S%d",</div><div class='add'>+		 motu-&gt;spec-&gt;name, version,</div><div class='add'>+		 fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		 dev_name(&amp;motu-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void motu_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_motu_transaction_unregister(motu);</div><div class='add'>+	snd_motu_stream_destroy_duplex(motu);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;motu-&gt;mutex);</div><div class='add'>+	fw_unit_put(motu-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int motu_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_motu *motu;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*motu), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = motu_card_free;</div><div class='add'>+</div><div class='add'>+	motu = card-&gt;private_data;</div><div class='add'>+	motu-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, motu);</div><div class='add'>+	motu-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	motu-&gt;spec = (const struct snd_motu_spec *)entry-&gt;driver_data;</div><div class='add'>+	mutex_init(&amp;motu-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;motu-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;motu-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	name_card(motu);</div><div class='add'>+</div><div class='add'>+	err = snd_motu_transaction_register(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_motu_stream_init_duplex(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_motu_proc_init(motu);</div><div class='add'>+</div><div class='add'>+	err = snd_motu_create_pcm_devices(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if ((motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_2ND_Q) ||</div><div class='add'>+	    (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_RX_MIDI_3RD_Q) ||</div><div class='add'>+	    (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_2ND_Q) ||</div><div class='add'>+	    (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_TX_MIDI_3RD_Q)) {</div><div class='add'>+		err = snd_motu_create_midi_devices(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_motu_create_hwdep_device(motu);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_REGISTER_DSP) {</div><div class='add'>+		err = snd_motu_register_dsp_message_parser_new(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	} else if (motu-&gt;spec-&gt;flags &amp; SND_MOTU_SPEC_COMMAND_DSP) {</div><div class='add'>+		err = snd_motu_command_dsp_message_parser_new(motu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void motu_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(motu-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void motu_bus_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_motu *motu = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	/* The handler address register becomes initialized. */</div><div class='add'>+	snd_motu_transaction_reregister(motu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SND_MOTU_DEV_ENTRY(model, data)			\</div><div class='add'>+{							\</div><div class='add'>+	.match_flags	= IEEE1394_MATCH_VENDOR_ID |	\</div><div class='add'>+			  IEEE1394_MATCH_SPECIFIER_ID |	\</div><div class='add'>+			  IEEE1394_MATCH_VERSION,	\</div><div class='add'>+	.vendor_id	= OUI_MOTU,			\</div><div class='add'>+	.specifier_id	= OUI_MOTU,			\</div><div class='add'>+	.version	= model,			\</div><div class='add'>+	.driver_data	= (kernel_ulong_t)data,		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id motu_id_table[] = {</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000001, &amp;snd_motu_spec_828),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000002, &amp;snd_motu_spec_896),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000003, &amp;snd_motu_spec_828mk2),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000005, &amp;snd_motu_spec_896hd),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000009, &amp;snd_motu_spec_traveler),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x00000d, &amp;snd_motu_spec_ultralite),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x00000f, &amp;snd_motu_spec_8pre),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000015, &amp;snd_motu_spec_828mk3_fw), // FireWire only.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000017, &amp;snd_motu_spec_896mk3), // FireWire only.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000019, &amp;snd_motu_spec_ultralite_mk3), // FireWire only.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x00001b, &amp;snd_motu_spec_traveler_mk3),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000030, &amp;snd_motu_spec_ultralite_mk3), // Hybrid.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000035, &amp;snd_motu_spec_828mk3_hybrid), // Hybrid.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000037, &amp;snd_motu_spec_896mk3), // Hybrid.</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000033, &amp;snd_motu_spec_audio_express),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000039, &amp;snd_motu_spec_track16),</div><div class='add'>+	SND_MOTU_DEV_ENTRY(0x000045, &amp;snd_motu_spec_4pre),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, motu_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver motu_driver = {</div><div class='add'>+	.driver   = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = motu_probe,</div><div class='add'>+	.update   = motu_bus_update,</div><div class='add'>+	.remove   = motu_remove,</div><div class='add'>+	.id_table = motu_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init alsa_motu_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;motu_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit alsa_motu_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;motu_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(alsa_motu_init);</div><div class='add'>+module_exit(alsa_motu_exit);</div><div class='head'>diff --git a/sound/firewire/motu/motu.h b/sound/firewire/motu/motu.h<br/>new file mode 100644<br/>index 000000000000..c66be0a89ccf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/motu/motu.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/motu/motu.h</a></div><div class='hunk'>@@ -0,0 +1,299 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * motu.h - a part of driver for MOTU FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015-2017 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_FIREWIRE_MOTU_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_MOTU_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../amdtp-stream.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+</div><div class='add'>+struct snd_motu_packet_format {</div><div class='add'>+	unsigned char midi_flag_offset;</div><div class='add'>+	unsigned char midi_byte_offset;</div><div class='add'>+	unsigned char pcm_byte_offset;</div><div class='add'>+</div><div class='add'>+	unsigned char msg_chunks;</div><div class='add'>+	unsigned char pcm_chunks[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct amdtp_motu_cache {</div><div class='add'>+	unsigned int *event_offsets;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+	unsigned int tx_cycle_count;</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int rx_cycle_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_motu {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* Model dependent information. */</div><div class='add'>+	const struct snd_motu_spec *spec;</div><div class='add'>+</div><div class='add'>+	/* For packet streaming */</div><div class='add'>+	struct snd_motu_packet_format tx_packet_formats;</div><div class='add'>+	struct snd_motu_packet_format rx_packet_formats;</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	struct fw_iso_resources tx_resources;</div><div class='add'>+	struct fw_iso_resources rx_resources;</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	/* For notification. */</div><div class='add'>+	struct fw_address_handler async_handler;</div><div class='add'>+	u32 msg;</div><div class='add'>+</div><div class='add'>+	/* For uapi */</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+</div><div class='add'>+	struct amdtp_motu_cache cache;</div><div class='add'>+</div><div class='add'>+	void *message_parser;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_motu_spec_flags {</div><div class='add'>+	SND_MOTU_SPEC_RX_MIDI_2ND_Q	= 0x0001,</div><div class='add'>+	SND_MOTU_SPEC_RX_MIDI_3RD_Q	= 0x0002,</div><div class='add'>+	SND_MOTU_SPEC_TX_MIDI_2ND_Q	= 0x0004,</div><div class='add'>+	SND_MOTU_SPEC_TX_MIDI_3RD_Q	= 0x0008,</div><div class='add'>+	SND_MOTU_SPEC_REGISTER_DSP	= 0x0010,</div><div class='add'>+	SND_MOTU_SPEC_COMMAND_DSP	= 0x0020,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SND_MOTU_CLOCK_RATE_COUNT	6</div><div class='add'>+extern const unsigned int snd_motu_clock_rates[SND_MOTU_CLOCK_RATE_COUNT];</div><div class='add'>+</div><div class='add'>+enum snd_motu_clock_source {</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_INTERNAL,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_ADAT_ON_DSUB,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_A,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT_B,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_A,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_B,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_SPH,</div><div class='add'>+	SND_MOTU_CLOCK_SOURCE_UNKNOWN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_motu_protocol_version {</div><div class='add'>+	SND_MOTU_PROTOCOL_V1,</div><div class='add'>+	SND_MOTU_PROTOCOL_V2,</div><div class='add'>+	SND_MOTU_PROTOCOL_V3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_motu_spec {</div><div class='add'>+	const char *const name;</div><div class='add'>+	enum snd_motu_protocol_version protocol_version;</div><div class='add'>+	// The combination of snd_motu_spec_flags enumeration-constants.</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	unsigned char tx_fixed_pcm_chunks[3];</div><div class='add'>+	unsigned char rx_fixed_pcm_chunks[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_828;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_896;</div><div class='add'>+</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_828mk2;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_896hd;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_traveler;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_ultralite;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_8pre;</div><div class='add'>+</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_828mk3_fw;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_828mk3_hybrid;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_896mk3;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_traveler_mk3;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_ultralite_mk3;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_audio_express;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_track16;</div><div class='add'>+extern const struct snd_motu_spec snd_motu_spec_4pre;</div><div class='add'>+</div><div class='add'>+int amdtp_motu_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		    enum amdtp_stream_direction dir,</div><div class='add'>+		    const struct snd_motu_spec *spec,</div><div class='add'>+		    struct amdtp_motu_cache *cache);</div><div class='add'>+int amdtp_motu_set_parameters(struct amdtp_stream *s, unsigned int rate,</div><div class='add'>+			      unsigned int midi_ports,</div><div class='add'>+			      struct snd_motu_packet_format *formats);</div><div class='add'>+int amdtp_motu_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				      struct snd_pcm_runtime *runtime);</div><div class='add'>+void amdtp_motu_midi_trigger(struct amdtp_stream *s, unsigned int port,</div><div class='add'>+			     struct snd_rawmidi_substream *midi);</div><div class='add'>+</div><div class='add'>+int snd_motu_transaction_read(struct snd_motu *motu, u32 offset, __be32 *reg,</div><div class='add'>+			      size_t size);</div><div class='add'>+int snd_motu_transaction_write(struct snd_motu *motu, u32 offset, __be32 *reg,</div><div class='add'>+			       size_t size);</div><div class='add'>+int snd_motu_transaction_register(struct snd_motu *motu);</div><div class='add'>+int snd_motu_transaction_reregister(struct snd_motu *motu);</div><div class='add'>+void snd_motu_transaction_unregister(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_stream_init_duplex(struct snd_motu *motu);</div><div class='add'>+void snd_motu_stream_destroy_duplex(struct snd_motu *motu);</div><div class='add'>+int snd_motu_stream_cache_packet_formats(struct snd_motu *motu);</div><div class='add'>+int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer);</div><div class='add'>+int snd_motu_stream_start_duplex(struct snd_motu *motu);</div><div class='add'>+void snd_motu_stream_stop_duplex(struct snd_motu *motu);</div><div class='add'>+int snd_motu_stream_lock_try(struct snd_motu *motu);</div><div class='add'>+void snd_motu_stream_lock_release(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+void snd_motu_proc_init(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_create_pcm_devices(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_create_midi_devices(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_create_hwdep_device(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v1_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int *rate);</div><div class='add'>+int snd_motu_protocol_v1_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int rate);</div><div class='add'>+int snd_motu_protocol_v1_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					  enum snd_motu_clock_source *src);</div><div class='add'>+int snd_motu_protocol_v1_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+					      bool enable);</div><div class='add'>+int snd_motu_protocol_v1_cache_packet_formats(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v2_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int *rate);</div><div class='add'>+int snd_motu_protocol_v2_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int rate);</div><div class='add'>+int snd_motu_protocol_v2_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					  enum snd_motu_clock_source *src);</div><div class='add'>+int snd_motu_protocol_v2_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+					      bool enable);</div><div class='add'>+int snd_motu_protocol_v2_cache_packet_formats(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+int snd_motu_protocol_v3_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int *rate);</div><div class='add'>+int snd_motu_protocol_v3_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+					unsigned int rate);</div><div class='add'>+int snd_motu_protocol_v3_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					  enum snd_motu_clock_source *src);</div><div class='add'>+int snd_motu_protocol_v3_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+					      bool enable);</div><div class='add'>+int snd_motu_protocol_v3_cache_packet_formats(struct snd_motu *motu);</div><div class='add'>+</div><div class='add'>+static inline int snd_motu_protocol_get_clock_rate(struct snd_motu *motu,</div><div class='add'>+						   unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V2)</div><div class='add'>+		return snd_motu_protocol_v2_get_clock_rate(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3)</div><div class='add'>+		return snd_motu_protocol_v3_get_clock_rate(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V1)</div><div class='add'>+		return snd_motu_protocol_v1_get_clock_rate(motu, rate);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int snd_motu_protocol_set_clock_rate(struct snd_motu *motu,</div><div class='add'>+						   unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V2)</div><div class='add'>+		return snd_motu_protocol_v2_set_clock_rate(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3)</div><div class='add'>+		return snd_motu_protocol_v3_set_clock_rate(motu, rate);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V1)</div><div class='add'>+		return snd_motu_protocol_v1_set_clock_rate(motu, rate);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int snd_motu_protocol_get_clock_source(struct snd_motu *motu,</div><div class='add'>+					enum snd_motu_clock_source *source)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V2)</div><div class='add'>+		return snd_motu_protocol_v2_get_clock_source(motu, source);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3)</div><div class='add'>+		return snd_motu_protocol_v3_get_clock_source(motu, source);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V1)</div><div class='add'>+		return snd_motu_protocol_v1_get_clock_source(motu, source);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int snd_motu_protocol_switch_fetching_mode(struct snd_motu *motu,</div><div class='add'>+							 bool enable)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V2)</div><div class='add'>+		return snd_motu_protocol_v2_switch_fetching_mode(motu, enable);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3)</div><div class='add'>+		return snd_motu_protocol_v3_switch_fetching_mode(motu, enable);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V1)</div><div class='add'>+		return snd_motu_protocol_v1_switch_fetching_mode(motu, enable);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int snd_motu_protocol_cache_packet_formats(struct snd_motu *motu)</div><div class='add'>+{</div><div class='add'>+	if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V2)</div><div class='add'>+		return snd_motu_protocol_v2_cache_packet_formats(motu);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V3)</div><div class='add'>+		return snd_motu_protocol_v3_cache_packet_formats(motu);</div><div class='add'>+	else if (motu-&gt;spec-&gt;protocol_version == SND_MOTU_PROTOCOL_V1)</div><div class='add'>+		return snd_motu_protocol_v1_cache_packet_formats(motu);</div><div class='add'>+	else</div><div class='add'>+		return -ENXIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_motu_register_dsp_message_parser_new(struct snd_motu *motu);</div><div class='add'>+int snd_motu_register_dsp_message_parser_init(struct snd_motu *motu);</div><div class='add'>+void snd_motu_register_dsp_message_parser_parse(const struct amdtp_stream *s,</div><div class='add'>+					const struct pkt_desc *descs, unsigned int count);</div><div class='add'>+void snd_motu_register_dsp_message_parser_copy_meter(struct snd_motu *motu,</div><div class='add'>+					struct snd_firewire_motu_register_dsp_meter *meter);</div><div class='add'>+void snd_motu_register_dsp_message_parser_copy_parameter(struct snd_motu *motu,</div><div class='add'>+					struct snd_firewire_motu_register_dsp_parameter *params);</div><div class='add'>+unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *motu);</div><div class='add'>+bool snd_motu_register_dsp_message_parser_copy_event(struct snd_motu *motu, u32 *event);</div><div class='add'>+</div><div class='add'>+int snd_motu_command_dsp_message_parser_new(struct snd_motu *motu);</div><div class='add'>+int snd_motu_command_dsp_message_parser_init(struct snd_motu *motu, enum cip_sfc sfc);</div><div class='add'>+void snd_motu_command_dsp_message_parser_parse(const struct amdtp_stream *s,</div><div class='add'>+					const struct pkt_desc *descs, unsigned int count);</div><div class='add'>+void snd_motu_command_dsp_message_parser_copy_meter(struct snd_motu *motu,</div><div class='add'>+					struct snd_firewire_motu_command_dsp_meter *meter);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile<br/>new file mode 100644<br/>index 000000000000..9ac8893a926f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-oxfw-y := oxfw-command.o oxfw-stream.o oxfw-pcm.o oxfw-proc.o \</div><div class='add'>+		 oxfw-midi.o oxfw-hwdep.o oxfw-spkr.o oxfw-scs1x.o oxfw.o</div><div class='add'>+obj-$(CONFIG_SND_OXFW) += snd-oxfw.o</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-command.c b/sound/firewire/oxfw/oxfw-command.c<br/>new file mode 100644<br/>index 000000000000..d2e57c76070d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-command.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-command.c</a></div><div class='hunk'>@@ -0,0 +1,158 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_command.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+int avc_stream_set_format(struct fw_unit *unit, enum avc_general_plug_dir dir,</div><div class='add'>+			  unsigned int pid, u8 *format, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(len + 10, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x00;		/* CONTROL */</div><div class='add'>+	buf[1] = 0xff;		/* UNIT */</div><div class='add'>+	buf[2] = 0xbf;		/* EXTENDED STREAM FORMAT INFORMATION */</div><div class='add'>+	buf[3] = 0xc0;		/* SINGLE subfunction */</div><div class='add'>+	buf[4] = dir;		/* Plug Direction */</div><div class='add'>+	buf[5] = 0x00;		/* UNIT */</div><div class='add'>+	buf[6] = 0x00;		/* PCR (Isochronous Plug) */</div><div class='add'>+	buf[7] = 0xff &amp; pid;	/* Plug ID */</div><div class='add'>+	buf[8] = 0xff;		/* Padding */</div><div class='add'>+	buf[9] = 0xff;		/* Support status in response */</div><div class='add'>+	memcpy(buf + 10, format, len);</div><div class='add'>+</div><div class='add'>+	/* do transaction and check buf[1-8] are the same against command */</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, len + 10, buf, len + 10,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7) | BIT(8));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; len + 10)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08) /* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+	else if (buf[0] == 0x0a) /* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else</div><div class='add'>+		err = 0;</div><div class='add'>+</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_stream_get_format(struct fw_unit *unit,</div><div class='add'>+			  enum avc_general_plug_dir dir, unsigned int pid,</div><div class='add'>+			  u8 *buf, unsigned int *len, unsigned int eid)</div><div class='add'>+{</div><div class='add'>+	unsigned int subfunc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (eid == 0xff)</div><div class='add'>+		subfunc = 0xc0;	/* SINGLE */</div><div class='add'>+	else</div><div class='add'>+		subfunc = 0xc1;	/* LIST */</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x01;		/* STATUS */</div><div class='add'>+	buf[1] = 0xff;		/* UNIT */</div><div class='add'>+	buf[2] = 0xbf;		/* EXTENDED STREAM FORMAT INFORMATION */</div><div class='add'>+	buf[3] = subfunc;	/* SINGLE or LIST */</div><div class='add'>+	buf[4] = dir;		/* Plug Direction */</div><div class='add'>+	buf[5] = 0x00;		/* Unit */</div><div class='add'>+	buf[6] = 0x00;		/* PCR (Isochronous Plug) */</div><div class='add'>+	buf[7] = 0xff &amp; pid;	/* Plug ID */</div><div class='add'>+	buf[8] = 0xff;		/* Padding */</div><div class='add'>+	buf[9] = 0xff;		/* support status in response */</div><div class='add'>+	buf[10] = 0xff &amp; eid;	/* entry ID for LIST subfunction */</div><div class='add'>+	buf[11] = 0xff;		/* padding */</div><div class='add'>+</div><div class='add'>+	/* do transaction and check buf[1-7] are the same against command */</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, *len,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) |</div><div class='add'>+				  BIT(6) | BIT(7));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 12)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08)	/* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+	else if (buf[0] == 0x0a)	/* REJECTED */</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	else if (buf[0] == 0x0b)	/* IN TRANSITION */</div><div class='add'>+		err = -EAGAIN;</div><div class='add'>+	/* LIST subfunction has entry ID */</div><div class='add'>+	else if ((subfunc == 0xc1) &amp;&amp; (buf[10] != eid))</div><div class='add'>+		err = -EIO;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* keep just stream format information */</div><div class='add'>+	if (subfunc == 0xc0) {</div><div class='add'>+		memmove(buf, buf + 10, err - 10);</div><div class='add'>+		*len = err - 10;</div><div class='add'>+	} else {</div><div class='add'>+		memmove(buf, buf + 11, err - 11);</div><div class='add'>+		*len = err - 11;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int avc_general_inquiry_sig_fmt(struct fw_unit *unit, unsigned int rate,</div><div class='add'>+				enum avc_general_plug_dir dir,</div><div class='add'>+				unsigned short pid)</div><div class='add'>+{</div><div class='add'>+	unsigned int sfc;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (sfc = 0; sfc &lt; CIP_SFC_COUNT; sfc++) {</div><div class='add'>+		if (amdtp_rate_table[sfc] == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (sfc == CIP_SFC_COUNT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(8, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0x02;		/* SPECIFIC INQUIRY */</div><div class='add'>+	buf[1] = 0xff;		/* UNIT */</div><div class='add'>+	if (dir == AVC_GENERAL_PLUG_DIR_IN)</div><div class='add'>+		buf[2] = 0x19;	/* INPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	else</div><div class='add'>+		buf[2] = 0x18;	/* OUTPUT PLUG SIGNAL FORMAT */</div><div class='add'>+	buf[3] = 0xff &amp; pid;	/* plug id */</div><div class='add'>+	buf[4] = 0x90;		/* EOH_1, Form_1, FMT. AM824 */</div><div class='add'>+	buf[5] = 0x07 &amp; sfc;	/* FDF-hi. AM824, frequency */</div><div class='add'>+	buf[6] = 0xff;		/* FDF-mid. AM824, SYT hi (not used) */</div><div class='add'>+	buf[7] = 0xff;		/* FDF-low. AM824, SYT lo (not used) */</div><div class='add'>+</div><div class='add'>+	/* do transaction and check buf[1-5] are the same against command */</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 8, buf, 8,</div><div class='add'>+				  BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		;</div><div class='add'>+	else if (err &lt; 8)</div><div class='add'>+		err = -EIO;</div><div class='add'>+	else if (buf[0] == 0x08)	/* NOT IMPLEMENTED */</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-hwdep.c b/sound/firewire/oxfw/oxfw-hwdep.c<br/>new file mode 100644<br/>index 000000000000..f8ac362fc73a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,170 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_hwdep.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes give three functionality.</div><div class='add'>+ *</div><div class='add'>+ * 1.get firewire node information</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock stream</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,  long count,</div><div class='add'>+		       loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+	union snd_firewire_event event;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!oxfw-&gt;dev_lock_changed) {</div><div class='add'>+		prepare_to_wait(&amp;oxfw-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;oxfw-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;oxfw-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;oxfw-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;event, 0, sizeof(event));</div><div class='add'>+	event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;</div><div class='add'>+	event.lock_status.status = (oxfw-&gt;dev_lock_count &gt; 0);</div><div class='add'>+	oxfw-&gt;dev_lock_changed = false;</div><div class='add'>+</div><div class='add'>+	count = min_t(long, count, sizeof(event.lock_status));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;oxfw-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+	if (oxfw-&gt;dev_lock_changed)</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_oxfw *oxfw, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(oxfw-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_OXFW;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;dev_lock_count == 0) {</div><div class='add'>+		oxfw-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;dev_lock_count == -1) {</div><div class='add'>+		oxfw-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+	if (oxfw-&gt;dev_lock_count == -1)</div><div class='add'>+		oxfw-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+		       unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(oxfw, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(oxfw);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(oxfw);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_hwdep(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops hwdep_ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(oxfw-&gt;card, oxfw-&gt;card-&gt;driver, 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	strscpy(hwdep-&gt;name, oxfw-&gt;card-&gt;driver);</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_OXFW;</div><div class='add'>+	hwdep-&gt;ops = hwdep_ops;</div><div class='add'>+	hwdep-&gt;private_data = oxfw;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-midi.c b/sound/firewire/oxfw/oxfw-midi.c<br/>new file mode 100644<br/>index 000000000000..a16bf885f918<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-midi.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_midi.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+static int midi_capture_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_lock_try(oxfw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		err = snd_oxfw_stream_reserve_duplex(oxfw, &amp;oxfw-&gt;tx_stream, 0, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++oxfw-&gt;substreams_count;</div><div class='add'>+			err = snd_oxfw_stream_start_duplex(oxfw);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				--oxfw-&gt;substreams_count;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_lock_try(oxfw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		err = snd_oxfw_stream_reserve_duplex(oxfw, &amp;oxfw-&gt;rx_stream, 0, 0, 0, 0);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			++oxfw-&gt;substreams_count;</div><div class='add'>+			err = snd_oxfw_stream_start_duplex(oxfw);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_capture_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		--oxfw-&gt;substreams_count;</div><div class='add'>+		snd_oxfw_stream_stop_duplex(oxfw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		--oxfw-&gt;substreams_count;</div><div class='add'>+		snd_oxfw_stream_stop_duplex(oxfw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;oxfw-&gt;tx_stream,</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;oxfw-&gt;tx_stream,</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;oxfw-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, substrm);</div><div class='add'>+	else</div><div class='add'>+		amdtp_am824_midi_trigger(&amp;oxfw-&gt;rx_stream,</div><div class='add'>+					 substrm-&gt;number, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_midi_substream_names(struct snd_oxfw *oxfw,</div><div class='add'>+				     struct snd_rawmidi_str *str)</div><div class='add'>+{</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(subs, &amp;str-&gt;substreams, list) {</div><div class='add'>+		scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+			  "%s MIDI %d",</div><div class='add'>+			  oxfw-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_midi(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_capture_open,</div><div class='add'>+		.close		= midi_capture_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_playback_open,</div><div class='add'>+		.close		= midi_playback_close,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *str;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;midi_input_ports == 0 &amp;&amp; oxfw-&gt;midi_output_ports == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* create midi ports */</div><div class='add'>+	err = snd_rawmidi_new(oxfw-&gt;card, oxfw-&gt;card-&gt;driver, 0,</div><div class='add'>+			      oxfw-&gt;midi_output_ports, oxfw-&gt;midi_input_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", oxfw-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = oxfw;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;midi_input_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+				    &amp;capture_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(oxfw, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;midi_output_ports &gt; 0) {</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+</div><div class='add'>+		snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+				    &amp;playback_ops);</div><div class='add'>+</div><div class='add'>+		str = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+</div><div class='add'>+		set_midi_substream_names(oxfw, str);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((oxfw-&gt;midi_output_ports &gt; 0) &amp;&amp; (oxfw-&gt;midi_input_ports &gt; 0))</div><div class='add'>+		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c<br/>new file mode 100644<br/>index 000000000000..774b8a763795<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,435 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_pcm.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+static int hw_rule_rate(struct snd_pcm_hw_params *params,</div><div class='add'>+			struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	u8 **formats = rule-&gt;private;</div><div class='add'>+	struct snd_interval *r =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	const struct snd_interval *c =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	struct snd_interval t = {</div><div class='add'>+		.min = UINT_MAX, .max = 0, .integer = 1</div><div class='add'>+	};</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		if (formats[i] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(formats[i], &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (!snd_interval_test(c, formation.pcm))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		t.min = min(t.min, formation.rate);</div><div class='add'>+		t.max = max(t.max, formation.rate);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	return snd_interval_refine(r, &amp;t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_rule_channels(struct snd_pcm_hw_params *params,</div><div class='add'>+			    struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	u8 **formats = rule-&gt;private;</div><div class='add'>+	struct snd_interval *c =</div><div class='add'>+		hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);</div><div class='add'>+	const struct snd_interval *r =</div><div class='add'>+		hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	int i, j, err;</div><div class='add'>+	unsigned int count, list[SND_OXFW_STREAM_FORMAT_ENTRIES] = {0};</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		if (formats[i] == NULL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(formats[i], &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		if (!snd_interval_test(r, formation.rate))</div><div class='add'>+			continue;</div><div class='add'>+		if (list[count] == formation.pcm)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(list); j++) {</div><div class='add'>+			if (list[j] == formation.pcm)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (j == ARRAY_SIZE(list)) {</div><div class='add'>+			list[count] = formation.pcm;</div><div class='add'>+			if (++count == ARRAY_SIZE(list))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_interval_list(c, count, list, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void limit_channels_and_rates(struct snd_pcm_hardware *hw, u8 **formats)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	hw-&gt;channels_min = UINT_MAX;</div><div class='add'>+	hw-&gt;channels_max = 0;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rate_min = UINT_MAX;</div><div class='add'>+	hw-&gt;rate_max = 0;</div><div class='add'>+	hw-&gt;rates = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		if (formats[i] == NULL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(formats[i], &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hw-&gt;channels_min = min(hw-&gt;channels_min, formation.pcm);</div><div class='add'>+		hw-&gt;channels_max = max(hw-&gt;channels_max, formation.pcm);</div><div class='add'>+</div><div class='add'>+		hw-&gt;rate_min = min(hw-&gt;rate_min, formation.rate);</div><div class='add'>+		hw-&gt;rate_max = max(hw-&gt;rate_max, formation.rate);</div><div class='add'>+		hw-&gt;rates |= snd_pcm_rate_to_rate_bit(formation.rate);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_hw_params(struct snd_oxfw *oxfw,</div><div class='add'>+			  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	u8 **formats;</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_IN_PCM_FORMAT_BITS;</div><div class='add'>+		stream = &amp;oxfw-&gt;tx_stream;</div><div class='add'>+		formats = oxfw-&gt;tx_stream_formats;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.formats = AM824_OUT_PCM_FORMAT_BITS;</div><div class='add'>+		stream = &amp;oxfw-&gt;rx_stream;</div><div class='add'>+		formats = oxfw-&gt;rx_stream_formats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	limit_channels_and_rates(&amp;runtime-&gt;hw, formats);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_channels, formats,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_rate, formats,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_add_pcm_hw_constraints(stream, runtime);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int limit_to_current_params(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	enum avc_general_plug_dir dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_OUT;</div><div class='add'>+	else</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_IN;</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_get_current_formation(oxfw, dir, &amp;formation);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	substream-&gt;runtime-&gt;hw.channels_min = formation.pcm;</div><div class='add'>+	substream-&gt;runtime-&gt;hw.channels_max = formation.pcm;</div><div class='add'>+	substream-&gt;runtime-&gt;hw.rate_min = formation.rate;</div><div class='add'>+	substream-&gt;runtime-&gt;hw.rate_max = formation.rate;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;oxfw-&gt;domain;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_lock_try(oxfw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_hw_params(oxfw, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if (oxfw-&gt;substreams_count &gt; 0 &amp;&amp; d-&gt;events_per_period &gt; 0) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+</div><div class='add'>+			err = limit_to_current_params(substream);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+</div><div class='add'>+			if (frames_per_period &gt; 0) {</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+								   frames_per_period, frames_per_period);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+</div><div class='add'>+				err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+								   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+								   frames_per_buffer, frames_per_buffer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					goto err_locked;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_oxfw_stream_lock_release(oxfw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int channels = params_channels(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;oxfw-&gt;mutex);</div><div class='add'>+		err = snd_oxfw_stream_reserve_duplex(oxfw, &amp;oxfw-&gt;tx_stream,</div><div class='add'>+					rate, channels, frames_per_period,</div><div class='add'>+					frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++oxfw-&gt;substreams_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				  struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int channels = params_channels(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;oxfw-&gt;mutex);</div><div class='add'>+		err = snd_oxfw_stream_reserve_duplex(oxfw, &amp;oxfw-&gt;rx_stream,</div><div class='add'>+					rate, channels, frames_per_period,</div><div class='add'>+					frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++oxfw-&gt;substreams_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;oxfw-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--oxfw-&gt;substreams_count;</div><div class='add'>+</div><div class='add'>+	snd_oxfw_stream_stop_duplex(oxfw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;oxfw-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--oxfw-&gt;substreams_count;</div><div class='add'>+</div><div class='add'>+	snd_oxfw_stream_stop_duplex(oxfw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		err = snd_oxfw_stream_start_duplex(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amdtp_stream_pcm_prepare(&amp;oxfw-&gt;tx_stream);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;oxfw-&gt;mutex) {</div><div class='add'>+		err = snd_oxfw_stream_start_duplex(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amdtp_stream_pcm_prepare(&amp;oxfw-&gt;rx_stream);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		pcm = substream;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		pcm = NULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	amdtp_stream_pcm_trigger(&amp;oxfw-&gt;tx_stream, pcm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_substream *pcm;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		pcm = substream;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		pcm = NULL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	amdtp_stream_pcm_trigger(&amp;oxfw-&gt;rx_stream, pcm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstm)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = sbstm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;oxfw-&gt;domain, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstm)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = sbstm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;oxfw-&gt;domain, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;oxfw-&gt;domain, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;oxfw-&gt;domain, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_pcm(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_capture_hw_params,</div><div class='add'>+		.hw_free   = pcm_capture_hw_free,</div><div class='add'>+		.prepare   = pcm_capture_prepare,</div><div class='add'>+		.trigger   = pcm_capture_trigger,</div><div class='add'>+		.pointer   = pcm_capture_pointer,</div><div class='add'>+		.ack       = pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open      = pcm_open,</div><div class='add'>+		.close     = pcm_close,</div><div class='add'>+		.hw_params = pcm_playback_hw_params,</div><div class='add'>+		.hw_free   = pcm_playback_hw_free,</div><div class='add'>+		.prepare   = pcm_playback_prepare,</div><div class='add'>+		.trigger   = pcm_playback_trigger,</div><div class='add'>+		.pointer   = pcm_playback_pointer,</div><div class='add'>+		.ack       = pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	unsigned int cap = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output)</div><div class='add'>+		cap = 1;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(oxfw-&gt;card, oxfw-&gt;card-&gt;driver, 0, 1, cap, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = oxfw;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	strscpy(pcm-&gt;name, oxfw-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	if (cap &gt; 0)</div><div class='add'>+		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-proc.c b/sound/firewire/oxfw/oxfw-proc.c<br/>new file mode 100644<br/>index 000000000000..260c60364f39<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-proc.c</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_proc.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./oxfw.h"</div><div class='add'>+</div><div class='add'>+static void proc_read_formation(struct snd_info_entry *entry,</div><div class='add'>+				struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = entry-&gt;private_data;</div><div class='add'>+	struct snd_oxfw_stream_formation formation, curr;</div><div class='add'>+	u8 *format;</div><div class='add'>+	char flag;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* Show input. */</div><div class='add'>+	err = snd_oxfw_stream_get_current_formation(oxfw,</div><div class='add'>+						    AVC_GENERAL_PLUG_DIR_IN,</div><div class='add'>+						    &amp;curr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Input Stream to device:\n");</div><div class='add'>+	snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		format = oxfw-&gt;rx_stream_formats[i];</div><div class='add'>+		if (format == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(format, &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (memcmp(&amp;formation, &amp;curr, sizeof(curr)) == 0)</div><div class='add'>+			flag = '*';</div><div class='add'>+		else</div><div class='add'>+			flag = ' ';</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, "%c\t%d\t%d\t%d\n", flag,</div><div class='add'>+			    formation.rate, formation.pcm, formation.midi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!oxfw-&gt;has_output)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Show output. */</div><div class='add'>+	err = snd_oxfw_stream_get_current_formation(oxfw,</div><div class='add'>+						    AVC_GENERAL_PLUG_DIR_OUT,</div><div class='add'>+						    &amp;curr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Output Stream from device:\n");</div><div class='add'>+	snd_iprintf(buffer, "\tRate\tPCM\tMIDI\n");</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		format = oxfw-&gt;tx_stream_formats[i];</div><div class='add'>+		if (format == NULL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(format, &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (memcmp(&amp;formation, &amp;curr, sizeof(curr)) == 0)</div><div class='add'>+			flag = '*';</div><div class='add'>+		else</div><div class='add'>+			flag = ' ';</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, "%c\t%d\t%d\t%d\n", flag,</div><div class='add'>+			    formation.rate, formation.pcm, formation.midi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_node(struct snd_oxfw *oxfw, struct snd_info_entry *root,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     void (*op)(struct snd_info_entry *e,</div><div class='add'>+				struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(oxfw-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, oxfw, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_proc_init(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(oxfw-&gt;card, "firewire",</div><div class='add'>+					  oxfw-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(oxfw, root, "formation", proc_read_formation);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-scs1x.c b/sound/firewire/oxfw/oxfw-scs1x.c<br/>new file mode 100644<br/>index 000000000000..21412a3ca9f4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-scs1x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-scs1x.c</a></div><div class='hunk'>@@ -0,0 +1,420 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw-scs1x.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+#define HSS1394_ADDRESS			0xc007dedadadaULL</div><div class='add'>+#define HSS1394_MAX_PACKET_SIZE		64</div><div class='add'>+#define HSS1394_TAG_USER_DATA		0x00</div><div class='add'>+#define HSS1394_TAG_CHANGE_ADDRESS	0xf1</div><div class='add'>+</div><div class='add'>+struct fw_scs1x {</div><div class='add'>+	struct fw_address_handler hss_handler;</div><div class='add'>+	u8 input_escape_count;</div><div class='add'>+	struct snd_rawmidi_substream *input;</div><div class='add'>+</div><div class='add'>+	/* For MIDI playback. */</div><div class='add'>+	struct snd_rawmidi_substream *output;</div><div class='add'>+	bool output_idle;</div><div class='add'>+	u8 output_status;</div><div class='add'>+	u8 output_bytes;</div><div class='add'>+	bool output_escaped;</div><div class='add'>+	bool output_escape_high_nibble;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	wait_queue_head_t idle_wait;</div><div class='add'>+	u8 buffer[HSS1394_MAX_PACKET_SIZE];</div><div class='add'>+	bool transaction_running;</div><div class='add'>+	struct fw_transaction transaction;</div><div class='add'>+	unsigned int transaction_bytes;</div><div class='add'>+	bool error;</div><div class='add'>+	struct fw_device *fw_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 sysex_escape_prefix[] = {</div><div class='add'>+	0xf0,			/* SysEx begin */</div><div class='add'>+	0x00, 0x01, 0x60,	/* Stanton DJ */</div><div class='add'>+	0x48, 0x53, 0x53,	/* "HSS" */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void midi_input_escaped_byte(struct snd_rawmidi_substream *stream,</div><div class='add'>+				    u8 byte)</div><div class='add'>+{</div><div class='add'>+	u8 nibbles[2];</div><div class='add'>+</div><div class='add'>+	nibbles[0] = byte &gt;&gt; 4;</div><div class='add'>+	nibbles[1] = byte &amp; 0x0f;</div><div class='add'>+	snd_rawmidi_receive(stream, nibbles, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_input_byte(struct fw_scs1x *scs,</div><div class='add'>+			    struct snd_rawmidi_substream *stream, u8 byte)</div><div class='add'>+{</div><div class='add'>+	const u8 eox = 0xf7;</div><div class='add'>+</div><div class='add'>+	if (scs-&gt;input_escape_count &gt; 0) {</div><div class='add'>+		midi_input_escaped_byte(stream, byte);</div><div class='add'>+		scs-&gt;input_escape_count--;</div><div class='add'>+		if (scs-&gt;input_escape_count == 0)</div><div class='add'>+			snd_rawmidi_receive(stream, &amp;eox, sizeof(eox));</div><div class='add'>+	} else if (byte == 0xf9) {</div><div class='add'>+		snd_rawmidi_receive(stream, sysex_escape_prefix,</div><div class='add'>+				    ARRAY_SIZE(sysex_escape_prefix));</div><div class='add'>+		midi_input_escaped_byte(stream, 0x00);</div><div class='add'>+		midi_input_escaped_byte(stream, 0xf9);</div><div class='add'>+		scs-&gt;input_escape_count = 3;</div><div class='add'>+	} else {</div><div class='add'>+		snd_rawmidi_receive(stream, &amp;byte, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_input_packet(struct fw_scs1x *scs,</div><div class='add'>+			      struct snd_rawmidi_substream *stream,</div><div class='add'>+			      const u8 *data, unsigned int bytes)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	const u8 eox = 0xf7;</div><div class='add'>+</div><div class='add'>+	if (data[0] == HSS1394_TAG_USER_DATA) {</div><div class='add'>+		for (i = 1; i &lt; bytes; ++i)</div><div class='add'>+			midi_input_byte(scs, stream, data[i]);</div><div class='add'>+	} else {</div><div class='add'>+		snd_rawmidi_receive(stream, sysex_escape_prefix,</div><div class='add'>+				    ARRAY_SIZE(sysex_escape_prefix));</div><div class='add'>+		for (i = 0; i &lt; bytes; ++i)</div><div class='add'>+			midi_input_escaped_byte(stream, data[i]);</div><div class='add'>+		snd_rawmidi_receive(stream, &amp;eox, sizeof(eox));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_hss(struct fw_card *card, struct fw_request *request,</div><div class='add'>+		       int tcode, int destination, int source, int generation,</div><div class='add'>+		       unsigned long long offset, void *data, size_t length,</div><div class='add'>+		       void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = callback_data;</div><div class='add'>+	struct snd_rawmidi_substream *stream;</div><div class='add'>+	int rcode;</div><div class='add'>+</div><div class='add'>+	if (offset != scs-&gt;hss_handler.offset) {</div><div class='add'>+		rcode = RCODE_ADDRESS_ERROR;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+	if (tcode != TCODE_WRITE_QUADLET_REQUEST &amp;&amp;</div><div class='add'>+	    tcode != TCODE_WRITE_BLOCK_REQUEST) {</div><div class='add'>+		rcode = RCODE_TYPE_ERROR;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (length &gt;= 1) {</div><div class='add'>+		stream = READ_ONCE(scs-&gt;input);</div><div class='add'>+		if (stream)</div><div class='add'>+			midi_input_packet(scs, stream, data, length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcode = RCODE_COMPLETE;</div><div class='add'>+end:</div><div class='add'>+	fw_send_response(card, request, rcode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scs_write_callback(struct fw_card *card, int rcode,</div><div class='add'>+			       void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = callback_data;</div><div class='add'>+</div><div class='add'>+	if (!rcode_is_permanent_error(rcode)) {</div><div class='add'>+		/* Don't retry for this data. */</div><div class='add'>+		if (rcode == RCODE_COMPLETE)</div><div class='add'>+			scs-&gt;transaction_bytes = 0;</div><div class='add'>+	} else {</div><div class='add'>+		scs-&gt;error = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scs-&gt;transaction_running = false;</div><div class='add'>+	schedule_work(&amp;scs-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_valid_running_status(u8 status)</div><div class='add'>+{</div><div class='add'>+	return status &gt;= 0x80 &amp;&amp; status &lt;= 0xef;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_one_byte_cmd(u8 status)</div><div class='add'>+{</div><div class='add'>+	return status == 0xf6 ||</div><div class='add'>+	       status &gt;= 0xf8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_two_bytes_cmd(u8 status)</div><div class='add'>+{</div><div class='add'>+	return (status &gt;= 0xc0 &amp;&amp; status &lt;= 0xdf) ||</div><div class='add'>+	       status == 0xf1 ||</div><div class='add'>+	       status == 0xf3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_three_bytes_cmd(u8 status)</div><div class='add'>+{</div><div class='add'>+	return (status &gt;= 0x80 &amp;&amp; status &lt;= 0xbf) ||</div><div class='add'>+	       (status &gt;= 0xe0 &amp;&amp; status &lt;= 0xef) ||</div><div class='add'>+	       status == 0xf2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_invalid_cmd(u8 status)</div><div class='add'>+{</div><div class='add'>+	return status == 0xf4 ||</div><div class='add'>+	       status == 0xf5 ||</div><div class='add'>+	       status == 0xf9 ||</div><div class='add'>+	       status == 0xfd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void scs_output_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = container_of(work, struct fw_scs1x, work);</div><div class='add'>+	struct snd_rawmidi_substream *stream;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u8 byte;</div><div class='add'>+	int generation;</div><div class='add'>+</div><div class='add'>+	if (scs-&gt;transaction_running)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stream = READ_ONCE(scs-&gt;output);</div><div class='add'>+	if (!stream || scs-&gt;error) {</div><div class='add'>+		scs-&gt;output_idle = true;</div><div class='add'>+		wake_up(&amp;scs-&gt;idle_wait);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (scs-&gt;transaction_bytes &gt; 0)</div><div class='add'>+		goto retry;</div><div class='add'>+</div><div class='add'>+	i = scs-&gt;output_bytes;</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (snd_rawmidi_transmit(stream, &amp;byte, 1) != 1) {</div><div class='add'>+			scs-&gt;output_bytes = i;</div><div class='add'>+			scs-&gt;output_idle = true;</div><div class='add'>+			wake_up(&amp;scs-&gt;idle_wait);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * Convert from real MIDI to what I think the device expects (no</div><div class='add'>+		 * running status, one command per packet, unescaped SysExs).</div><div class='add'>+		 */</div><div class='add'>+		if (scs-&gt;output_escaped &amp;&amp; byte &lt; 0x80) {</div><div class='add'>+			if (scs-&gt;output_escape_high_nibble) {</div><div class='add'>+				if (i &lt; HSS1394_MAX_PACKET_SIZE) {</div><div class='add'>+					scs-&gt;buffer[i] = byte &lt;&lt; 4;</div><div class='add'>+					scs-&gt;output_escape_high_nibble = false;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				scs-&gt;buffer[i++] |= byte &amp; 0x0f;</div><div class='add'>+				scs-&gt;output_escape_high_nibble = true;</div><div class='add'>+			}</div><div class='add'>+		} else if (byte &lt; 0x80) {</div><div class='add'>+			if (i == 1) {</div><div class='add'>+				if (!is_valid_running_status(</div><div class='add'>+							scs-&gt;output_status))</div><div class='add'>+					continue;</div><div class='add'>+				scs-&gt;buffer[0] = HSS1394_TAG_USER_DATA;</div><div class='add'>+				scs-&gt;buffer[i++] = scs-&gt;output_status;</div><div class='add'>+			}</div><div class='add'>+			scs-&gt;buffer[i++] = byte;</div><div class='add'>+			if ((i == 3 &amp;&amp; is_two_bytes_cmd(scs-&gt;output_status)) ||</div><div class='add'>+			    (i == 4 &amp;&amp; is_three_bytes_cmd(scs-&gt;output_status)))</div><div class='add'>+				break;</div><div class='add'>+			if (i == 1 + ARRAY_SIZE(sysex_escape_prefix) &amp;&amp;</div><div class='add'>+			    !memcmp(scs-&gt;buffer + 1, sysex_escape_prefix,</div><div class='add'>+				    ARRAY_SIZE(sysex_escape_prefix))) {</div><div class='add'>+				scs-&gt;output_escaped = true;</div><div class='add'>+				scs-&gt;output_escape_high_nibble = true;</div><div class='add'>+				i = 0;</div><div class='add'>+			}</div><div class='add'>+			if (i &gt;= HSS1394_MAX_PACKET_SIZE)</div><div class='add'>+				i = 1;</div><div class='add'>+		} else if (byte == 0xf7) {</div><div class='add'>+			if (scs-&gt;output_escaped) {</div><div class='add'>+				if (i &gt;= 1 &amp;&amp; scs-&gt;output_escape_high_nibble &amp;&amp;</div><div class='add'>+				    scs-&gt;buffer[0] !=</div><div class='add'>+						HSS1394_TAG_CHANGE_ADDRESS)</div><div class='add'>+					break;</div><div class='add'>+			} else {</div><div class='add'>+				if (i &gt; 1 &amp;&amp; scs-&gt;output_status == 0xf0) {</div><div class='add'>+					scs-&gt;buffer[i++] = 0xf7;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			i = 1;</div><div class='add'>+			scs-&gt;output_escaped = false;</div><div class='add'>+		} else if (!is_invalid_cmd(byte) &amp;&amp; byte &lt; 0xf8) {</div><div class='add'>+			i = 1;</div><div class='add'>+			scs-&gt;buffer[0] = HSS1394_TAG_USER_DATA;</div><div class='add'>+			scs-&gt;buffer[i++] = byte;</div><div class='add'>+			scs-&gt;output_status = byte;</div><div class='add'>+			scs-&gt;output_escaped = false;</div><div class='add'>+			if (is_one_byte_cmd(byte))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	scs-&gt;output_bytes = 1;</div><div class='add'>+	scs-&gt;output_escaped = false;</div><div class='add'>+</div><div class='add'>+	scs-&gt;transaction_bytes = i;</div><div class='add'>+retry:</div><div class='add'>+	scs-&gt;transaction_running = true;</div><div class='add'>+	generation = scs-&gt;fw_dev-&gt;generation;</div><div class='add'>+	smp_rmb(); /* node_id vs. generation */</div><div class='add'>+	fw_send_request(scs-&gt;fw_dev-&gt;card, &amp;scs-&gt;transaction,</div><div class='add'>+			TCODE_WRITE_BLOCK_REQUEST, scs-&gt;fw_dev-&gt;node_id,</div><div class='add'>+			generation, scs-&gt;fw_dev-&gt;max_speed, HSS1394_ADDRESS,</div><div class='add'>+			scs-&gt;buffer, scs-&gt;transaction_bytes,</div><div class='add'>+			scs_write_callback, scs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_capture_open(struct snd_rawmidi_substream *stream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_capture_close(struct snd_rawmidi_substream *stream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *stream, int up)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = stream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (up) {</div><div class='add'>+		scs-&gt;input_escape_count = 0;</div><div class='add'>+		WRITE_ONCE(scs-&gt;input, stream);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_ONCE(scs-&gt;input, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_open(struct snd_rawmidi_substream *stream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_close(struct snd_rawmidi_substream *stream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *stream, int up)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = stream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (up) {</div><div class='add'>+		scs-&gt;output_status = 0;</div><div class='add'>+		scs-&gt;output_bytes = 1;</div><div class='add'>+		scs-&gt;output_escaped = false;</div><div class='add'>+		scs-&gt;output_idle = false;</div><div class='add'>+		scs-&gt;transaction_bytes = 0;</div><div class='add'>+		scs-&gt;error = false;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(scs-&gt;output, stream);</div><div class='add'>+		schedule_work(&amp;scs-&gt;work);</div><div class='add'>+	} else {</div><div class='add'>+		WRITE_ONCE(scs-&gt;output, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void midi_playback_drain(struct snd_rawmidi_substream *stream)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = stream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	wait_event(scs-&gt;idle_wait, scs-&gt;output_idle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int register_address(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = oxfw-&gt;spec;</div><div class='add'>+	__be64 data;</div><div class='add'>+</div><div class='add'>+	data = cpu_to_be64(((u64)HSS1394_TAG_CHANGE_ADDRESS &lt;&lt; 56) |</div><div class='add'>+			    scs-&gt;hss_handler.offset);</div><div class='add'>+	return snd_fw_transaction(oxfw-&gt;unit, TCODE_WRITE_BLOCK_REQUEST,</div><div class='add'>+				  HSS1394_ADDRESS, &amp;data, sizeof(data), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_scs1x(struct snd_rawmidi *rmidi)</div><div class='add'>+{</div><div class='add'>+	struct fw_scs1x *scs = rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	fw_core_remove_address_handler(&amp;scs-&gt;hss_handler);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_scs1x_update(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	register_address(oxfw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_scs1x_add(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops midi_capture_ops = {</div><div class='add'>+		.open    = midi_capture_open,</div><div class='add'>+		.close   = midi_capture_close,</div><div class='add'>+		.trigger = midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops midi_playback_ops = {</div><div class='add'>+		.open    = midi_playback_open,</div><div class='add'>+		.close   = midi_playback_close,</div><div class='add'>+		.trigger = midi_playback_trigger,</div><div class='add'>+		.drain   = midi_playback_drain,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct fw_scs1x *scs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	scs = devm_kzalloc(&amp;oxfw-&gt;card-&gt;card_dev, sizeof(struct fw_scs1x),</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (!scs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	scs-&gt;fw_dev = fw_parent_device(oxfw-&gt;unit);</div><div class='add'>+	oxfw-&gt;spec = scs;</div><div class='add'>+</div><div class='add'>+	/* Allocate own handler for imcoming asynchronous transaction. */</div><div class='add'>+	scs-&gt;hss_handler.length = HSS1394_MAX_PACKET_SIZE;</div><div class='add'>+	scs-&gt;hss_handler.address_callback = handle_hss;</div><div class='add'>+	scs-&gt;hss_handler.callback_data = scs;</div><div class='add'>+	err = fw_core_add_address_handler(&amp;scs-&gt;hss_handler,</div><div class='add'>+					  &amp;fw_high_memory_region);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = register_address(oxfw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_allocated;</div><div class='add'>+</div><div class='add'>+	/* Use unique name for backward compatibility to scs1x module. */</div><div class='add'>+	err = snd_rawmidi_new(oxfw-&gt;card, "SCS.1x", 0, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_allocated;</div><div class='add'>+	rmidi-&gt;private_data = scs;</div><div class='add'>+	rmidi-&gt;private_free = remove_scs1x;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", oxfw-&gt;card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_INPUT |</div><div class='add'>+			    SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='add'>+			    SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+			    &amp;midi_capture_ops);</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+			    &amp;midi_playback_ops);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;scs-&gt;work, scs_output_work);</div><div class='add'>+	init_waitqueue_head(&amp;scs-&gt;idle_wait);</div><div class='add'>+	scs-&gt;output_idle = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_allocated:</div><div class='add'>+	fw_core_remove_address_handler(&amp;scs-&gt;hss_handler);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-spkr.c b/sound/firewire/oxfw/oxfw-spkr.c<br/>new file mode 100644<br/>index 000000000000..f2767fb1965c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-spkr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-spkr.c</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw-spkr.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+struct fw_spkr {</div><div class='add'>+	bool mute;</div><div class='add'>+	s16 volume[6];</div><div class='add'>+	s16 volume_min;</div><div class='add'>+	s16 volume_max;</div><div class='add'>+</div><div class='add'>+	unsigned int mixer_channels;</div><div class='add'>+	u8 mute_fb_id;</div><div class='add'>+	u8 volume_fb_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum control_action { CTL_READ, CTL_WRITE };</div><div class='add'>+enum control_attribute {</div><div class='add'>+	CTL_MIN		= 0x02,</div><div class='add'>+	CTL_MAX		= 0x03,</div><div class='add'>+	CTL_CURRENT	= 0x10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int avc_audio_feature_mute(struct fw_unit *unit, u8 fb_id, bool *value,</div><div class='add'>+				  enum control_action action)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u8 response_ok;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(11, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (action == CTL_READ) {</div><div class='add'>+		buf[0] = 0x01;		/* AV/C, STATUS */</div><div class='add'>+		response_ok = 0x0c;	/*       STABLE */</div><div class='add'>+	} else {</div><div class='add'>+		buf[0] = 0x00;		/* AV/C, CONTROL */</div><div class='add'>+		response_ok = 0x09;	/*       ACCEPTED */</div><div class='add'>+	}</div><div class='add'>+	buf[1] = 0x08;			/* audio unit 0 */</div><div class='add'>+	buf[2] = 0xb8;			/* FUNCTION BLOCK */</div><div class='add'>+	buf[3] = 0x81;			/* function block type: feature */</div><div class='add'>+	buf[4] = fb_id;			/* function block ID */</div><div class='add'>+	buf[5] = 0x10;			/* control attribute: current */</div><div class='add'>+	buf[6] = 0x02;			/* selector length */</div><div class='add'>+	buf[7] = 0x00;			/* audio channel number */</div><div class='add'>+	buf[8] = 0x01;			/* control selector: mute */</div><div class='add'>+	buf[9] = 0x01;			/* control data length */</div><div class='add'>+	if (action == CTL_READ)</div><div class='add'>+		buf[10] = 0xff;</div><div class='add'>+	else</div><div class='add'>+		buf[10] = *value ? 0x70 : 0x60;</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 11, buf, 11, 0x3fe);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	if (err &lt; 11) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device, "short FCP response\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (buf[0] != response_ok) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device, "mute command failed\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (action == CTL_READ)</div><div class='add'>+		*value = buf[10] == 0x70;</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int avc_audio_feature_volume(struct fw_unit *unit, u8 fb_id, s16 *value,</div><div class='add'>+				    unsigned int channel,</div><div class='add'>+				    enum control_attribute attribute,</div><div class='add'>+				    enum control_action action)</div><div class='add'>+{</div><div class='add'>+	u8 *buf;</div><div class='add'>+	u8 response_ok;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(12, GFP_KERNEL);</div><div class='add'>+	if (!buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (action == CTL_READ) {</div><div class='add'>+		buf[0] = 0x01;		/* AV/C, STATUS */</div><div class='add'>+		response_ok = 0x0c;	/*       STABLE */</div><div class='add'>+	} else {</div><div class='add'>+		buf[0] = 0x00;		/* AV/C, CONTROL */</div><div class='add'>+		response_ok = 0x09;	/*       ACCEPTED */</div><div class='add'>+	}</div><div class='add'>+	buf[1] = 0x08;			/* audio unit 0 */</div><div class='add'>+	buf[2] = 0xb8;			/* FUNCTION BLOCK */</div><div class='add'>+	buf[3] = 0x81;			/* function block type: feature */</div><div class='add'>+	buf[4] = fb_id;			/* function block ID */</div><div class='add'>+	buf[5] = attribute;		/* control attribute */</div><div class='add'>+	buf[6] = 0x02;			/* selector length */</div><div class='add'>+	buf[7] = channel;		/* audio channel number */</div><div class='add'>+	buf[8] = 0x02;			/* control selector: volume */</div><div class='add'>+	buf[9] = 0x02;			/* control data length */</div><div class='add'>+	if (action == CTL_READ) {</div><div class='add'>+		buf[10] = 0xff;</div><div class='add'>+		buf[11] = 0xff;</div><div class='add'>+	} else {</div><div class='add'>+		buf[10] = *value &gt;&gt; 8;</div><div class='add'>+		buf[11] = *value;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fcp_avc_transaction(unit, buf, 12, buf, 12, 0x3fe);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	if (err &lt; 12) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device, "short FCP response\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (buf[0] != response_ok) {</div><div class='add'>+		dev_err(&amp;unit-&gt;device, "volume command failed\n");</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+	if (action == CTL_READ)</div><div class='add'>+		*value = (buf[10] &lt;&lt; 8) | buf[11];</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	kfree(buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spkr_mute_get(struct snd_kcontrol *control,</div><div class='add'>+			 struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = control-&gt;private_data;</div><div class='add'>+	struct fw_spkr *spkr = oxfw-&gt;spec;</div><div class='add'>+</div><div class='add'>+	value-&gt;value.integer.value[0] = !spkr-&gt;mute;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spkr_mute_put(struct snd_kcontrol *control,</div><div class='add'>+			 struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = control-&gt;private_data;</div><div class='add'>+	struct fw_spkr *spkr = oxfw-&gt;spec;</div><div class='add'>+	bool mute;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mute = !value-&gt;value.integer.value[0];</div><div class='add'>+</div><div class='add'>+	if (mute == spkr-&gt;mute)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = avc_audio_feature_mute(oxfw-&gt;unit, spkr-&gt;mute_fb_id, &amp;mute,</div><div class='add'>+				     CTL_WRITE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	spkr-&gt;mute = mute;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spkr_volume_info(struct snd_kcontrol *control,</div><div class='add'>+			    struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = control-&gt;private_data;</div><div class='add'>+	struct fw_spkr *spkr = oxfw-&gt;spec;</div><div class='add'>+</div><div class='add'>+	info-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	info-&gt;count = spkr-&gt;mixer_channels;</div><div class='add'>+	info-&gt;value.integer.min = spkr-&gt;volume_min;</div><div class='add'>+	info-&gt;value.integer.max = spkr-&gt;volume_max;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 channel_map[6] = { 0, 1, 4, 5, 2, 3 };</div><div class='add'>+</div><div class='add'>+static int spkr_volume_get(struct snd_kcontrol *control,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = control-&gt;private_data;</div><div class='add'>+	struct fw_spkr *spkr = oxfw-&gt;spec;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spkr-&gt;mixer_channels; ++i)</div><div class='add'>+		value-&gt;value.integer.value[channel_map[i]] = spkr-&gt;volume[i];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spkr_volume_put(struct snd_kcontrol *control,</div><div class='add'>+			   struct snd_ctl_elem_value *value)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = control-&gt;private_data;</div><div class='add'>+	struct fw_spkr *spkr = oxfw-&gt;spec;</div><div class='add'>+	unsigned int i, changed_channels;</div><div class='add'>+	bool equal_values = true;</div><div class='add'>+	s16 volume;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spkr-&gt;mixer_channels; ++i) {</div><div class='add'>+		if (value-&gt;value.integer.value[i] &lt; spkr-&gt;volume_min ||</div><div class='add'>+		    value-&gt;value.integer.value[i] &gt; spkr-&gt;volume_max)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (value-&gt;value.integer.value[i] !=</div><div class='add'>+		    value-&gt;value.integer.value[0])</div><div class='add'>+			equal_values = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	changed_channels = 0;</div><div class='add'>+	for (i = 0; i &lt; spkr-&gt;mixer_channels; ++i)</div><div class='add'>+		if (value-&gt;value.integer.value[channel_map[i]] !=</div><div class='add'>+							spkr-&gt;volume[i])</div><div class='add'>+			changed_channels |= 1 &lt;&lt; (i + 1);</div><div class='add'>+</div><div class='add'>+	if (equal_values &amp;&amp; changed_channels != 0)</div><div class='add'>+		changed_channels = 1 &lt;&lt; 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= spkr-&gt;mixer_channels; ++i) {</div><div class='add'>+		volume = value-&gt;value.integer.value[channel_map[i ? i - 1 : 0]];</div><div class='add'>+		if (changed_channels &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			err = avc_audio_feature_volume(oxfw-&gt;unit,</div><div class='add'>+						  spkr-&gt;volume_fb_id, &amp;volume,</div><div class='add'>+						  i, CTL_CURRENT, CTL_WRITE);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+		if (i &gt; 0)</div><div class='add'>+			spkr-&gt;volume[i - 1] = volume;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed_channels != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_add_spkr(struct snd_oxfw *oxfw, bool is_lacie)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_kcontrol_new controls[] = {</div><div class='add'>+		{</div><div class='add'>+			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+			.name = "PCM Playback Switch",</div><div class='add'>+			.info = snd_ctl_boolean_mono_info,</div><div class='add'>+			.get = spkr_mute_get,</div><div class='add'>+			.put = spkr_mute_put,</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+			.name = "PCM Playback Volume",</div><div class='add'>+			.info = spkr_volume_info,</div><div class='add'>+			.get = spkr_volume_get,</div><div class='add'>+			.put = spkr_volume_put,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct fw_spkr *spkr;</div><div class='add'>+	unsigned int i, first_ch;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spkr = devm_kzalloc(&amp;oxfw-&gt;card-&gt;card_dev, sizeof(struct fw_spkr),</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!spkr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	oxfw-&gt;spec = spkr;</div><div class='add'>+</div><div class='add'>+	if (is_lacie) {</div><div class='add'>+		spkr-&gt;mixer_channels = 1;</div><div class='add'>+		spkr-&gt;mute_fb_id = 0x01;</div><div class='add'>+		spkr-&gt;volume_fb_id = 0x01;</div><div class='add'>+	} else {</div><div class='add'>+		spkr-&gt;mixer_channels = 6;</div><div class='add'>+		spkr-&gt;mute_fb_id = 0x01;</div><div class='add'>+		spkr-&gt;volume_fb_id = 0x02;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = avc_audio_feature_volume(oxfw-&gt;unit, spkr-&gt;volume_fb_id,</div><div class='add'>+				       &amp;spkr-&gt;volume_min, 0, CTL_MIN, CTL_READ);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = avc_audio_feature_volume(oxfw-&gt;unit, spkr-&gt;volume_fb_id,</div><div class='add'>+				       &amp;spkr-&gt;volume_max, 0, CTL_MAX, CTL_READ);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = avc_audio_feature_mute(oxfw-&gt;unit, spkr-&gt;mute_fb_id, &amp;spkr-&gt;mute,</div><div class='add'>+				     CTL_READ);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	first_ch = spkr-&gt;mixer_channels == 1 ? 0 : 1;</div><div class='add'>+	for (i = 0; i &lt; spkr-&gt;mixer_channels; ++i) {</div><div class='add'>+		err = avc_audio_feature_volume(oxfw-&gt;unit, spkr-&gt;volume_fb_id,</div><div class='add'>+					       &amp;spkr-&gt;volume[i], first_ch + i,</div><div class='add'>+					       CTL_CURRENT, CTL_READ);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(controls); ++i) {</div><div class='add'>+		err = snd_ctl_add(oxfw-&gt;card,</div><div class='add'>+				  snd_ctl_new1(&amp;controls[i], oxfw));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c<br/>new file mode 100644<br/>index 000000000000..5e36d7153a7b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw-stream.c</a></div><div class='hunk'>@@ -0,0 +1,889 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw_stream.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+</div><div class='add'>+#define AVC_GENERIC_FRAME_MAXIMUM_BYTES	512</div><div class='add'>+#define READY_TIMEOUT_MS	600</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * According to datasheet of Oxford Semiconductor:</div><div class='add'>+ *  OXFW970: 32.0/44.1/48.0/96.0 Khz, 8 audio channels I/O</div><div class='add'>+ *  OXFW971: 32.0/44.1/48.0/88.2/96.0/192.0 kHz, 16 audio channels I/O, MIDI I/O</div><div class='add'>+ */</div><div class='add'>+static const unsigned int oxfw_rate_table[] = {</div><div class='add'>+	[0] = 32000,</div><div class='add'>+	[1] = 44100,</div><div class='add'>+	[2] = 48000,</div><div class='add'>+	[3] = 88200,</div><div class='add'>+	[4] = 96000,</div><div class='add'>+	[5] = 192000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See Table 5.7 – Sampling frequency for Multi-bit Audio</div><div class='add'>+ * in AV/C Stream Format Information Specification 1.1 (Apr 2005, 1394TA)</div><div class='add'>+ */</div><div class='add'>+static const unsigned int avc_stream_rate_table[] = {</div><div class='add'>+	[0] = 0x02,</div><div class='add'>+	[1] = 0x03,</div><div class='add'>+	[2] = 0x04,</div><div class='add'>+	[3] = 0x0a,</div><div class='add'>+	[4] = 0x05,</div><div class='add'>+	[5] = 0x07,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_rate(struct snd_oxfw *oxfw, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = avc_general_set_sig_fmt(oxfw-&gt;unit, rate,</div><div class='add'>+				      AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output)</div><div class='add'>+		err = avc_general_set_sig_fmt(oxfw-&gt;unit, rate,</div><div class='add'>+					      AVC_GENERAL_PLUG_DIR_OUT, 0);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_stream_format(struct snd_oxfw *oxfw, struct amdtp_stream *s,</div><div class='add'>+			     unsigned int rate, unsigned int pcm_channels)</div><div class='add'>+{</div><div class='add'>+	u8 **formats;</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	enum avc_general_plug_dir dir;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;oxfw-&gt;tx_stream) {</div><div class='add'>+		formats = oxfw-&gt;tx_stream_formats;</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_OUT;</div><div class='add'>+	} else {</div><div class='add'>+		formats = oxfw-&gt;rx_stream_formats;</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_IN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Seek stream format for requirements. */</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		err = snd_oxfw_stream_parse_format(formats[i], &amp;formation);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if ((formation.rate == rate) &amp;&amp; (formation.pcm == pcm_channels))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == SND_OXFW_STREAM_FORMAT_ENTRIES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If assumed, just change rate. */</div><div class='add'>+	if (oxfw-&gt;assumed)</div><div class='add'>+		return set_rate(oxfw, rate);</div><div class='add'>+</div><div class='add'>+	/* Calculate format length. */</div><div class='add'>+	len = 5 + formats[i][4] * 2;</div><div class='add'>+</div><div class='add'>+	err = avc_stream_set_format(oxfw-&gt;unit, dir, 0, formats[i], len);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Some requests just after changing format causes freezing. */</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;rx_stream)</div><div class='add'>+		conn = &amp;oxfw-&gt;in_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;oxfw-&gt;out_conn;</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_establish(conn);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_add_stream(&amp;oxfw-&gt;domain, stream,</div><div class='add'>+				      conn-&gt;resources.channel, conn-&gt;speed);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cmp_connection_break(conn);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_connection_used_by_others(struct snd_oxfw *oxfw,</div><div class='add'>+					   struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	bool used;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;tx_stream)</div><div class='add'>+		conn = &amp;oxfw-&gt;out_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;oxfw-&gt;in_conn;</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_check_used(conn, &amp;used);</div><div class='add'>+	if ((err &gt;= 0) &amp;&amp; used &amp;&amp; !amdtp_stream_running(stream)) {</div><div class='add'>+		dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+			"Connection established by others: %cPCR[%d]\n",</div><div class='add'>+			(conn-&gt;direction == CMP_OUTPUT) ? 'o' : 'i',</div><div class='add'>+			conn-&gt;pcr_index);</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	enum cmp_direction c_dir;</div><div class='add'>+	enum amdtp_stream_direction s_dir;</div><div class='add'>+	unsigned int flags = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_BLOCKING_TRANSMISSION))</div><div class='add'>+		flags |= CIP_NONBLOCKING;</div><div class='add'>+	else</div><div class='add'>+		flags |= CIP_BLOCKING;</div><div class='add'>+</div><div class='add'>+	// OXFW 970/971 has no function to generate playback timing according to the sequence</div><div class='add'>+	// of value in syt field, thus the packet should include NO_INFO value in the field.</div><div class='add'>+	// However, some models just ignore data blocks in packet with NO_INFO for audio data</div><div class='add'>+	// processing.</div><div class='add'>+	if (!(oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_IGNORE_NO_INFO_PACKET))</div><div class='add'>+		flags |= CIP_UNAWARE_SYT;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;tx_stream) {</div><div class='add'>+		conn = &amp;oxfw-&gt;out_conn;</div><div class='add'>+		c_dir = CMP_OUTPUT;</div><div class='add'>+		s_dir = AMDTP_IN_STREAM;</div><div class='add'>+</div><div class='add'>+		if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_JUMBO_PAYLOAD)</div><div class='add'>+			flags |= CIP_JUMBO_PAYLOAD;</div><div class='add'>+		if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_WRONG_DBS)</div><div class='add'>+			flags |= CIP_WRONG_DBS;</div><div class='add'>+		if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_DBC_IS_TOTAL_PAYLOAD_QUADLETS)</div><div class='add'>+			flags |= CIP_DBC_IS_END_EVENT | CIP_DBC_IS_PAYLOAD_QUADLETS;</div><div class='add'>+	} else {</div><div class='add'>+		conn = &amp;oxfw-&gt;in_conn;</div><div class='add'>+		c_dir = CMP_INPUT;</div><div class='add'>+		s_dir = AMDTP_OUT_STREAM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cmp_connection_init(conn, oxfw-&gt;unit, c_dir, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_init(stream, oxfw-&gt;unit, s_dir, flags);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cmp_connection_destroy(conn);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_oxfw *oxfw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	enum avc_general_plug_dir dir;</div><div class='add'>+	u8 **formats;</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;rx_stream) {</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_IN;</div><div class='add'>+		formats = oxfw-&gt;rx_stream_formats;</div><div class='add'>+		conn = &amp;oxfw-&gt;in_conn;</div><div class='add'>+	} else {</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_OUT;</div><div class='add'>+		formats = oxfw-&gt;tx_stream_formats;</div><div class='add'>+		conn = &amp;oxfw-&gt;out_conn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_get_current_formation(oxfw, dir, &amp;formation);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+		struct snd_oxfw_stream_formation fmt;</div><div class='add'>+</div><div class='add'>+		if (formats[i] == NULL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_stream_parse_format(formats[i], &amp;fmt);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (fmt.rate == formation.rate &amp;&amp; fmt.pcm == formation.pcm &amp;&amp;</div><div class='add'>+		    fmt.midi == formation.midi)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == SND_OXFW_STREAM_FORMAT_ENTRIES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	// The stream should have one pcm channels at least.</div><div class='add'>+	if (formation.pcm == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = amdtp_am824_set_parameters(stream, formation.rate, formation.pcm,</div><div class='add'>+					 formation.midi * 8, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_reserve_duplex(struct snd_oxfw *oxfw,</div><div class='add'>+				   struct amdtp_stream *stream,</div><div class='add'>+				   unsigned int rate, unsigned int pcm_channels,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	enum avc_general_plug_dir dir;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Considering JACK/FFADO streaming:</div><div class='add'>+	// TODO: This can be removed hwdep functionality becomes popular.</div><div class='add'>+	err = check_connection_used_by_others(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (oxfw-&gt;has_output) {</div><div class='add'>+		err = check_connection_used_by_others(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;tx_stream)</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_OUT;</div><div class='add'>+	else</div><div class='add'>+		dir = AVC_GENERAL_PLUG_DIR_IN;</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_get_current_formation(oxfw, dir, &amp;formation);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (rate == 0) {</div><div class='add'>+		rate = formation.rate;</div><div class='add'>+		pcm_channels = formation.pcm;</div><div class='add'>+	}</div><div class='add'>+	if (formation.rate != rate || formation.pcm != pcm_channels) {</div><div class='add'>+		amdtp_domain_stop(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+		cmp_connection_break(&amp;oxfw-&gt;in_conn);</div><div class='add'>+		cmp_connection_release(&amp;oxfw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+		if (oxfw-&gt;has_output) {</div><div class='add'>+			cmp_connection_break(&amp;oxfw-&gt;out_conn);</div><div class='add'>+			cmp_connection_release(&amp;oxfw-&gt;out_conn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;substreams_count == 0 ||</div><div class='add'>+	    formation.rate != rate || formation.pcm != pcm_channels) {</div><div class='add'>+		err = set_stream_format(oxfw, stream, rate, pcm_channels);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+				"fail to set stream format: %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = keep_resources(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (oxfw-&gt;has_output) {</div><div class='add'>+			err = keep_resources(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				cmp_connection_release(&amp;oxfw-&gt;in_conn);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;oxfw-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			cmp_connection_release(&amp;oxfw-&gt;in_conn);</div><div class='add'>+			if (oxfw-&gt;has_output)</div><div class='add'>+				cmp_connection_release(&amp;oxfw-&gt;out_conn);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;substreams_count == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;oxfw-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;oxfw-&gt;tx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+		cmp_connection_break(&amp;oxfw-&gt;in_conn);</div><div class='add'>+		if (oxfw-&gt;has_output)</div><div class='add'>+			cmp_connection_break(&amp;oxfw-&gt;out_conn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(&amp;oxfw-&gt;rx_stream)) {</div><div class='add'>+		unsigned int tx_init_skip_cycles = 0;</div><div class='add'>+		bool replay_seq = false;</div><div class='add'>+</div><div class='add'>+		err = start_stream(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+				"fail to prepare rx stream: %d\n", err);</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (oxfw-&gt;has_output &amp;&amp;</div><div class='add'>+		    !amdtp_stream_running(&amp;oxfw-&gt;tx_stream)) {</div><div class='add'>+			err = start_stream(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+					"fail to prepare tx stream: %d\n", err);</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_JUMBO_PAYLOAD) {</div><div class='add'>+				// Just after changing sampling transfer frequency, many cycles are</div><div class='add'>+				// skipped for packet transmission.</div><div class='add'>+				tx_init_skip_cycles = 400;</div><div class='add'>+			} else if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_VOLUNTARY_RECOVERY) {</div><div class='add'>+				// It takes a bit time for target device to adjust event frequency</div><div class='add'>+				// according to nominal event frequency in isochronous packets from</div><div class='add'>+				// ALSA oxfw driver.</div><div class='add'>+				tx_init_skip_cycles = 4000;</div><div class='add'>+			} else {</div><div class='add'>+				replay_seq = true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		// NOTE: The device ignores presentation time expressed by the value of syt field</div><div class='add'>+		// of CIP header in received packets. The sequence of the number of data blocks per</div><div class='add'>+		// packet is important for media clock recovery.</div><div class='add'>+		err = amdtp_domain_start(&amp;oxfw-&gt;domain, tx_init_skip_cycles, replay_seq, false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;oxfw-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	cmp_connection_break(&amp;oxfw-&gt;in_conn);</div><div class='add'>+	if (oxfw-&gt;has_output)</div><div class='add'>+		cmp_connection_break(&amp;oxfw-&gt;out_conn);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_stream_stop_duplex(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	if (oxfw-&gt;substreams_count == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+		cmp_connection_break(&amp;oxfw-&gt;in_conn);</div><div class='add'>+		cmp_connection_release(&amp;oxfw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+		if (oxfw-&gt;has_output) {</div><div class='add'>+			cmp_connection_break(&amp;oxfw-&gt;out_conn);</div><div class='add'>+			cmp_connection_release(&amp;oxfw-&gt;out_conn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct cmp_connection *conn;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;oxfw-&gt;tx_stream)</div><div class='add'>+		conn = &amp;oxfw-&gt;out_conn;</div><div class='add'>+	else</div><div class='add'>+		conn = &amp;oxfw-&gt;in_conn;</div><div class='add'>+</div><div class='add'>+	amdtp_stream_destroy(stream);</div><div class='add'>+	cmp_connection_destroy(conn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_init_duplex(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output) {</div><div class='add'>+		err = init_stream(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			destroy_stream(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;oxfw-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+		if (oxfw-&gt;has_output)</div><div class='add'>+			destroy_stream(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function should be called before starting the stream or after stopping</div><div class='add'>+// the streams.</div><div class='add'>+void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(oxfw, &amp;oxfw-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output)</div><div class='add'>+		destroy_stream(oxfw, &amp;oxfw-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_stream_update_duplex(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_stop(&amp;oxfw-&gt;domain);</div><div class='add'>+</div><div class='add'>+	cmp_connection_break(&amp;oxfw-&gt;in_conn);</div><div class='add'>+</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;oxfw-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output) {</div><div class='add'>+		cmp_connection_break(&amp;oxfw-&gt;out_conn);</div><div class='add'>+</div><div class='add'>+		amdtp_stream_pcm_abort(&amp;oxfw-&gt;tx_stream);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_get_current_formation(struct snd_oxfw *oxfw,</div><div class='add'>+				enum avc_general_plug_dir dir,</div><div class='add'>+				struct snd_oxfw_stream_formation *formation)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_STREAM_FORMAT_INFO_UNSUPPORTED)) {</div><div class='add'>+		u8 *format;</div><div class='add'>+		unsigned int len;</div><div class='add'>+</div><div class='add'>+		len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;</div><div class='add'>+		format = kmalloc(len, GFP_KERNEL);</div><div class='add'>+		if (format == NULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		err = avc_stream_get_format_single(oxfw-&gt;unit, dir, 0, format, &amp;len);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			if (len &lt; 3)</div><div class='add'>+				err = -EIO;</div><div class='add'>+			else</div><div class='add'>+				err = snd_oxfw_stream_parse_format(format, formation);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(format);</div><div class='add'>+	} else {</div><div class='add'>+		// Miglia Harmony Audio does not support Extended Stream Format Information</div><div class='add'>+		// command. Use the duplicated hard-coded format, instead.</div><div class='add'>+		unsigned int rate;</div><div class='add'>+		u8 *const *formats;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		err = avc_general_get_sig_fmt(oxfw-&gt;unit, &amp;rate, dir, 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (dir == AVC_GENERAL_PLUG_DIR_IN)</div><div class='add'>+			formats = oxfw-&gt;rx_stream_formats;</div><div class='add'>+		else</div><div class='add'>+			formats = oxfw-&gt;tx_stream_formats;</div><div class='add'>+</div><div class='add'>+		for (i = 0; (i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES); ++i) {</div><div class='add'>+			if (!formats[i])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			err = snd_oxfw_stream_parse_format(formats[i], formation);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (formation-&gt;rate == rate)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i == SND_OXFW_STREAM_FORMAT_ENTRIES)</div><div class='add'>+			return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * See Table 6.16 - AM824 Stream Format</div><div class='add'>+ *     Figure 6.19 - format_information field for AM824 Compound</div><div class='add'>+ * in AV/C Stream Format Information Specification 1.1 (Apr 2005, 1394TA)</div><div class='add'>+ * Also 'Clause 12 AM824 sequence adaption layers' in IEC 61883-6:2005</div><div class='add'>+ */</div><div class='add'>+int snd_oxfw_stream_parse_format(const u8 *format,</div><div class='add'>+				 struct snd_oxfw_stream_formation *formation)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, e, channels, type;</div><div class='add'>+</div><div class='add'>+	memset(formation, 0, sizeof(struct snd_oxfw_stream_formation));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * this module can support a hierarchy combination that:</div><div class='add'>+	 *  Root:	Audio and Music (0x90)</div><div class='add'>+	 *  Level 1:	AM824 Compound  (0x40)</div><div class='add'>+	 */</div><div class='add'>+	if ((format[0] != 0x90) || (format[1] != 0x40))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	/* check the sampling rate */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(avc_stream_rate_table); i++) {</div><div class='add'>+		if (format[2] == avc_stream_rate_table[i])</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == ARRAY_SIZE(avc_stream_rate_table))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	formation-&gt;rate = oxfw_rate_table[i];</div><div class='add'>+</div><div class='add'>+	for (e = 0; e &lt; format[4]; e++) {</div><div class='add'>+		channels = format[5 + e * 2];</div><div class='add'>+		type = format[6 + e * 2];</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		/* IEC 60958 Conformant, currently handled as MBLA */</div><div class='add'>+		case 0x00:</div><div class='add'>+		/* Multi Bit Linear Audio (Raw) */</div><div class='add'>+		case 0x06:</div><div class='add'>+			formation-&gt;pcm += channels;</div><div class='add'>+			break;</div><div class='add'>+		/* MIDI Conformant */</div><div class='add'>+		case 0x0d:</div><div class='add'>+			formation-&gt;midi = channels;</div><div class='add'>+			break;</div><div class='add'>+		/* IEC 61937-3 to 7 */</div><div class='add'>+		case 0x01:</div><div class='add'>+		case 0x02:</div><div class='add'>+		case 0x03:</div><div class='add'>+		case 0x04:</div><div class='add'>+		case 0x05:</div><div class='add'>+		/* Multi Bit Linear Audio */</div><div class='add'>+		case 0x07:	/* DVD-Audio */</div><div class='add'>+		case 0x0c:	/* High Precision */</div><div class='add'>+		/* One Bit Audio */</div><div class='add'>+		case 0x08:	/* (Plain) Raw */</div><div class='add'>+		case 0x09:	/* (Plain) SACD */</div><div class='add'>+		case 0x0a:	/* (Encoded) Raw */</div><div class='add'>+		case 0x0b:	/* (Encoded) SACD */</div><div class='add'>+		/* SMPTE Time-Code conformant */</div><div class='add'>+		case 0x0e:</div><div class='add'>+		/* Sample Count */</div><div class='add'>+		case 0x0f:</div><div class='add'>+		/* Anciliary Data */</div><div class='add'>+		case 0x10:</div><div class='add'>+		/* Synchronization Stream (Stereo Raw audio) */</div><div class='add'>+		case 0x40:</div><div class='add'>+		/* Don't care */</div><div class='add'>+		case 0xff:</div><div class='add'>+		default:</div><div class='add'>+			return -ENXIO;	/* not supported */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (formation-&gt;pcm  &gt; AM824_MAX_CHANNELS_FOR_PCM ||</div><div class='add'>+	    formation-&gt;midi &gt; AM824_MAX_CHANNELS_FOR_MIDI)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+assume_stream_formats(struct snd_oxfw *oxfw, enum avc_general_plug_dir dir,</div><div class='add'>+		      unsigned int pid, u8 *buf, unsigned int *len,</div><div class='add'>+		      u8 **formats)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	unsigned int i, eid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// get format at current sampling rate.</div><div class='add'>+	if (!(oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_STREAM_FORMAT_INFO_UNSUPPORTED)) {</div><div class='add'>+		err = avc_stream_get_format_single(oxfw-&gt;unit, dir, pid, buf, len);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+				"fail to get current stream format for isoc %s plug %d:%d\n",</div><div class='add'>+				(dir == AVC_GENERAL_PLUG_DIR_IN) ? "in" : "out",</div><div class='add'>+				pid, err);</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		// Miglia Harmony Audio does not support Extended Stream Format Information</div><div class='add'>+		// command. Use the hard-coded format, instead.</div><div class='add'>+		buf[0] = 0x90;</div><div class='add'>+		buf[1] = 0x40;</div><div class='add'>+		buf[2] = avc_stream_rate_table[0];</div><div class='add'>+		buf[3] = 0x00;</div><div class='add'>+		buf[4] = 0x01;</div><div class='add'>+</div><div class='add'>+		if (dir == AVC_GENERAL_PLUG_DIR_IN)</div><div class='add'>+			buf[5] = 0x08;</div><div class='add'>+		else</div><div class='add'>+			buf[5] = 0x02;</div><div class='add'>+</div><div class='add'>+		buf[6] = 0x06;</div><div class='add'>+</div><div class='add'>+		*len = 7;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* parse and set stream format */</div><div class='add'>+	eid = 0;</div><div class='add'>+	err = snd_oxfw_stream_parse_format(buf, &amp;formation);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	formats[eid] = devm_kmemdup(&amp;oxfw-&gt;card-&gt;card_dev, buf, *len,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+	if (!formats[eid]) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* apply the format for each available sampling rate */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(oxfw_rate_table); i++) {</div><div class='add'>+		if (formation.rate == oxfw_rate_table[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = avc_general_inquiry_sig_fmt(oxfw-&gt;unit,</div><div class='add'>+						  oxfw_rate_table[i],</div><div class='add'>+						  dir, pid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		eid++;</div><div class='add'>+		formats[eid] = devm_kmemdup(&amp;oxfw-&gt;card-&gt;card_dev, buf, *len,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (formats[eid] == NULL) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto end;</div><div class='add'>+		}</div><div class='add'>+		formats[eid][2] = avc_stream_rate_table[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = 0;</div><div class='add'>+	oxfw-&gt;assumed = true;</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_stream_formats(struct snd_oxfw *oxfw,</div><div class='add'>+			       enum avc_general_plug_dir dir,</div><div class='add'>+			       unsigned short pid)</div><div class='add'>+{</div><div class='add'>+	u8 *buf, **formats;</div><div class='add'>+	unsigned int len, eid = 0;</div><div class='add'>+	struct snd_oxfw_stream_formation dummy;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf = kmalloc(AVC_GENERIC_FRAME_MAXIMUM_BYTES, GFP_KERNEL);</div><div class='add'>+	if (buf == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (dir == AVC_GENERAL_PLUG_DIR_OUT)</div><div class='add'>+		formats = oxfw-&gt;tx_stream_formats;</div><div class='add'>+	else</div><div class='add'>+		formats = oxfw-&gt;rx_stream_formats;</div><div class='add'>+</div><div class='add'>+	/* get first entry */</div><div class='add'>+	len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;</div><div class='add'>+	err = avc_stream_get_format_list(oxfw-&gt;unit, dir, 0, buf, &amp;len, 0);</div><div class='add'>+	if (err == -ENXIO) {</div><div class='add'>+		/* LIST subfunction is not implemented */</div><div class='add'>+		len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;</div><div class='add'>+		err = assume_stream_formats(oxfw, dir, pid, buf, &amp;len,</div><div class='add'>+					    formats);</div><div class='add'>+		goto end;</div><div class='add'>+	} else if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get stream format %d for isoc %s plug %d:%d\n",</div><div class='add'>+			eid, (dir == AVC_GENERAL_PLUG_DIR_IN) ? "in" : "out",</div><div class='add'>+			pid, err);</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* LIST subfunction is implemented */</div><div class='add'>+	while (eid &lt; SND_OXFW_STREAM_FORMAT_ENTRIES) {</div><div class='add'>+		/* The format is too short. */</div><div class='add'>+		if (len &lt; 3) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* parse and set stream format */</div><div class='add'>+		err = snd_oxfw_stream_parse_format(buf, &amp;dummy);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		formats[eid] = devm_kmemdup(&amp;oxfw-&gt;card-&gt;card_dev, buf, len,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (!formats[eid]) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* get next entry */</div><div class='add'>+		len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;</div><div class='add'>+		err = avc_stream_get_format_list(oxfw-&gt;unit, dir, 0,</div><div class='add'>+						 buf, &amp;len, ++eid);</div><div class='add'>+		/* No entries remained. */</div><div class='add'>+		if (err == -EINVAL) {</div><div class='add'>+			err = 0;</div><div class='add'>+			break;</div><div class='add'>+		} else if (err &lt; 0) {</div><div class='add'>+			dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+			"fail to get stream format %d for isoc %s plug %d:%d\n",</div><div class='add'>+				eid, (dir == AVC_GENERAL_PLUG_DIR_IN) ? "in" :</div><div class='add'>+									"out",</div><div class='add'>+				pid, err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_discover(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	u8 plugs[AVC_PLUG_INFO_BUF_BYTES];</div><div class='add'>+	struct snd_oxfw_stream_formation formation;</div><div class='add'>+	u8 *format;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* the number of plugs for isoc in/out, ext in/out  */</div><div class='add'>+	err = avc_general_get_plug_info(oxfw-&gt;unit, 0x1f, 0x07, 0x00, plugs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;oxfw-&gt;unit-&gt;device,</div><div class='add'>+		"fail to get info for isoc/external in/out plugs: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		goto end;</div><div class='add'>+	} else if ((plugs[0] == 0) &amp;&amp; (plugs[1] == 0)) {</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* use oPCR[0] if exists */</div><div class='add'>+	if (plugs[1] &gt; 0) {</div><div class='add'>+		err = fill_stream_formats(oxfw, AVC_GENERAL_PLUG_DIR_OUT, 0);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			if (err != -ENXIO)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			// The oPCR is not available for isoc communication.</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+				format = oxfw-&gt;tx_stream_formats[i];</div><div class='add'>+				if (format == NULL)</div><div class='add'>+					continue;</div><div class='add'>+				err = snd_oxfw_stream_parse_format(format,</div><div class='add'>+								   &amp;formation);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				/* Add one MIDI port. */</div><div class='add'>+				if (formation.midi &gt; 0)</div><div class='add'>+					oxfw-&gt;midi_input_ports = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			oxfw-&gt;has_output = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* use iPCR[0] if exists */</div><div class='add'>+	if (plugs[0] &gt; 0) {</div><div class='add'>+		err = fill_stream_formats(oxfw, AVC_GENERAL_PLUG_DIR_IN, 0);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			if (err != -ENXIO)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			// The iPCR is not available for isoc communication.</div><div class='add'>+			err = 0;</div><div class='add'>+		} else {</div><div class='add'>+			for (i = 0; i &lt; SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {</div><div class='add'>+				format = oxfw-&gt;rx_stream_formats[i];</div><div class='add'>+				if (format == NULL)</div><div class='add'>+					continue;</div><div class='add'>+				err = snd_oxfw_stream_parse_format(format,</div><div class='add'>+								   &amp;formation);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				/* Add one MIDI port. */</div><div class='add'>+				if (formation.midi &gt; 0)</div><div class='add'>+					oxfw-&gt;midi_output_ports = 1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			oxfw-&gt;has_input = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_stream_lock_changed(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	oxfw-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;oxfw-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_lock_try(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (oxfw-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (oxfw-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_oxfw_stream_lock_changed(oxfw);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_oxfw_stream_lock_release(struct snd_oxfw *oxfw)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;oxfw-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(oxfw-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--oxfw-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_oxfw_stream_lock_changed(oxfw);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c<br/>new file mode 100644<br/>index 000000000000..5039bd79b18e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw.c</a></div><div class='hunk'>@@ -0,0 +1,404 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * oxfw.c - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "oxfw.h"</div><div class='add'>+</div><div class='add'>+#define OXFORD_FIRMWARE_ID_ADDRESS	(CSR_REGISTER_BASE + 0x50000)</div><div class='add'>+/* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */</div><div class='add'>+</div><div class='add'>+#define OXFORD_HARDWARE_ID_ADDRESS	(CSR_REGISTER_BASE + 0x90020)</div><div class='add'>+#define OXFORD_HARDWARE_ID_OXFW970	0x39443841</div><div class='add'>+#define OXFORD_HARDWARE_ID_OXFW971	0x39373100</div><div class='add'>+</div><div class='add'>+#define VENDOR_LOUD		0x000ff2</div><div class='add'>+#define VENDOR_GRIFFIN		0x001292</div><div class='add'>+#define VENDOR_BEHRINGER	0x001564</div><div class='add'>+#define VENDOR_LACIE		0x00d04b</div><div class='add'>+#define VENDOR_TASCAM		0x00022e</div><div class='add'>+#define OUI_STANTON		0x001260</div><div class='add'>+#define OUI_APOGEE		0x0003db</div><div class='add'>+#define OUI_OXFORD		0x0030e0</div><div class='add'>+</div><div class='add'>+#define MODEL_SATELLITE		0x00200f</div><div class='add'>+#define MODEL_SCS1M		0x001000</div><div class='add'>+#define MODEL_DUET_FW		0x01dddd</div><div class='add'>+#define MODEL_ONYX_1640I	0x001640</div><div class='add'>+</div><div class='add'>+#define SPECIFIER_1394TA	0x00a02d</div><div class='add'>+#define VERSION_AVC		0x010001</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Oxford Semiconductor FW970/971 driver");</div><div class='add'>+MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_ALIAS("snd-firewire-speakers");</div><div class='add'>+MODULE_ALIAS("snd-scs1x");</div><div class='add'>+</div><div class='add'>+struct compat_info {</div><div class='add'>+	const char *driver_name;</div><div class='add'>+	const char *vendor_name;</div><div class='add'>+	const char *model_name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool detect_loud_models(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	static const char *const models[] = {</div><div class='add'>+		"Onyxi",</div><div class='add'>+		"Onyx-i",</div><div class='add'>+		"Onyx 1640i",</div><div class='add'>+		"d.Pro",</div><div class='add'>+		"U.420"};</div><div class='add'>+	char model[32];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fw_csr_string(unit-&gt;directory, CSR_MODEL,</div><div class='add'>+			    model, sizeof(model));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return match_string(models, ARRAY_SIZE(models), model) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int name_card(struct snd_oxfw *oxfw, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(oxfw-&gt;unit);</div><div class='add'>+	const struct compat_info *info;</div><div class='add'>+	char vendor[24];</div><div class='add'>+	char model[32];</div><div class='add'>+	const char *d, *v, *m;</div><div class='add'>+	u32 firmware;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* get vendor name from root directory */</div><div class='add'>+	err = fw_csr_string(fw_dev-&gt;config_rom + 5, CSR_VENDOR,</div><div class='add'>+			    vendor, sizeof(vendor));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	/* get model name from unit directory */</div><div class='add'>+	err = fw_csr_string(oxfw-&gt;unit-&gt;directory, CSR_MODEL,</div><div class='add'>+			    model, sizeof(model));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(oxfw-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				 OXFORD_FIRMWARE_ID_ADDRESS, &amp;firmware, 4, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	be32_to_cpus(&amp;firmware);</div><div class='add'>+</div><div class='add'>+	if (firmware &gt;&gt; 20 == 0x970)</div><div class='add'>+		oxfw-&gt;quirks |= SND_OXFW_QUIRK_JUMBO_PAYLOAD;</div><div class='add'>+</div><div class='add'>+	/* to apply card definitions */</div><div class='add'>+	if (entry-&gt;vendor_id == VENDOR_GRIFFIN || entry-&gt;vendor_id == VENDOR_LACIE) {</div><div class='add'>+		info = (const struct compat_info *)entry-&gt;driver_data;</div><div class='add'>+		d = info-&gt;driver_name;</div><div class='add'>+		v = info-&gt;vendor_name;</div><div class='add'>+		m = info-&gt;model_name;</div><div class='add'>+	} else {</div><div class='add'>+		d = "OXFW";</div><div class='add'>+		v = vendor;</div><div class='add'>+		m = model;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(oxfw-&gt;card-&gt;driver, d);</div><div class='add'>+	strscpy(oxfw-&gt;card-&gt;mixername, m);</div><div class='add'>+	strscpy(oxfw-&gt;card-&gt;shortname, m);</div><div class='add'>+</div><div class='add'>+	scnprintf(oxfw-&gt;card-&gt;longname, sizeof(oxfw-&gt;card-&gt;longname),</div><div class='add'>+		  "%s %s (OXFW%x %04x), GUID %08x%08x at %s, S%d",</div><div class='add'>+		  v, m, firmware &gt;&gt; 20, firmware &amp; 0xffff,</div><div class='add'>+		  fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		  dev_name(&amp;oxfw-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+end:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oxfw_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output || oxfw-&gt;has_input)</div><div class='add'>+		snd_oxfw_stream_destroy_duplex(oxfw);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;oxfw-&gt;mutex);</div><div class='add'>+	fw_unit_put(oxfw-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int detect_quirks(struct snd_oxfw *oxfw, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(oxfw-&gt;unit);</div><div class='add'>+	struct fw_csr_iterator it;</div><div class='add'>+	int key, val;</div><div class='add'>+	int vendor, model;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Add ALSA control elements for two models to keep compatibility to</div><div class='add'>+	 * old firewire-speaker module.</div><div class='add'>+	 */</div><div class='add'>+	if (entry-&gt;vendor_id == VENDOR_GRIFFIN)</div><div class='add'>+		return snd_oxfw_add_spkr(oxfw, false);</div><div class='add'>+	if (entry-&gt;vendor_id == VENDOR_LACIE)</div><div class='add'>+		return snd_oxfw_add_spkr(oxfw, true);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Stanton models supports asynchronous transactions for unique MIDI</div><div class='add'>+	 * messages.</div><div class='add'>+	 */</div><div class='add'>+	if (entry-&gt;vendor_id == OUI_STANTON) {</div><div class='add'>+		oxfw-&gt;quirks |= SND_OXFW_QUIRK_SCS_TRANSACTION;</div><div class='add'>+		if (entry-&gt;model_id == MODEL_SCS1M)</div><div class='add'>+			oxfw-&gt;quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION;</div><div class='add'>+</div><div class='add'>+		// No physical MIDI ports.</div><div class='add'>+		oxfw-&gt;midi_input_ports = 0;</div><div class='add'>+		oxfw-&gt;midi_output_ports = 0;</div><div class='add'>+</div><div class='add'>+		return snd_oxfw_scs1x_add(oxfw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vendor_id == OUI_APOGEE &amp;&amp; entry-&gt;model_id == MODEL_DUET_FW) {</div><div class='add'>+		oxfw-&gt;quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION |</div><div class='add'>+				SND_OXFW_QUIRK_IGNORE_NO_INFO_PACKET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TASCAM FireOne has physical control and requires a pair of additional</div><div class='add'>+	 * MIDI ports.</div><div class='add'>+	 */</div><div class='add'>+	if (entry-&gt;vendor_id == VENDOR_TASCAM) {</div><div class='add'>+		oxfw-&gt;midi_input_ports++;</div><div class='add'>+		oxfw-&gt;midi_output_ports++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Seek from Root Directory of Config ROM. */</div><div class='add'>+	vendor = model = 0;</div><div class='add'>+	fw_csr_iterator_init(&amp;it, fw_dev-&gt;config_rom + 5);</div><div class='add'>+	while (fw_csr_iterator_next(&amp;it, &amp;key, &amp;val)) {</div><div class='add'>+		if (key == CSR_VENDOR)</div><div class='add'>+			vendor = val;</div><div class='add'>+		else if (key == CSR_MODEL)</div><div class='add'>+			model = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vendor == VENDOR_LOUD) {</div><div class='add'>+		// Mackie Onyx Satellite with base station has a quirk to report a wrong</div><div class='add'>+		// value in 'dbs' field of CIP header against its format information.</div><div class='add'>+		oxfw-&gt;quirks |= SND_OXFW_QUIRK_WRONG_DBS;</div><div class='add'>+</div><div class='add'>+		// OXFW971-based models may transfer events by blocking method.</div><div class='add'>+		if (!(oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_JUMBO_PAYLOAD))</div><div class='add'>+			oxfw-&gt;quirks |= SND_OXFW_QUIRK_BLOCKING_TRANSMISSION;</div><div class='add'>+</div><div class='add'>+		if (model == MODEL_ONYX_1640I) {</div><div class='add'>+			//Unless receiving packets without NOINFO packet, the device transfers</div><div class='add'>+			//mostly half of events in packets than expected.</div><div class='add'>+			oxfw-&gt;quirks |= SND_OXFW_QUIRK_IGNORE_NO_INFO_PACKET |</div><div class='add'>+					SND_OXFW_QUIRK_VOLUNTARY_RECOVERY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int oxfw_probe(struct fw_unit *unit, const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_oxfw *oxfw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vendor_id == VENDOR_LOUD &amp;&amp; entry-&gt;model_id == 0 &amp;&amp; !detect_loud_models(unit))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*oxfw), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = oxfw_card_free;</div><div class='add'>+</div><div class='add'>+	oxfw = card-&gt;private_data;</div><div class='add'>+	oxfw-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, oxfw);</div><div class='add'>+	oxfw-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;oxfw-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;oxfw-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;oxfw-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	err = name_card(oxfw, entry);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vendor_id == OUI_OXFORD &amp;&amp; entry-&gt;model_id == 0x00f970) {</div><div class='add'>+		oxfw-&gt;quirks |= SND_OXFW_QUIRK_STREAM_FORMAT_INFO_UNSUPPORTED |</div><div class='add'>+				SND_OXFW_QUIRK_DBC_IS_TOTAL_PAYLOAD_QUADLETS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_oxfw_stream_discover(oxfw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = detect_quirks(oxfw, entry);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output || oxfw-&gt;has_input) {</div><div class='add'>+		err = snd_oxfw_stream_init_duplex(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_create_pcm(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		snd_oxfw_proc_init(oxfw);</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_create_midi(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = snd_oxfw_create_hwdep(oxfw);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oxfw_bus_reset(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	fcp_bus_reset(oxfw-&gt;unit);</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;has_output || oxfw-&gt;has_input) {</div><div class='add'>+		guard(mutex)(&amp;oxfw-&gt;mutex);</div><div class='add'>+		snd_oxfw_stream_update_duplex(oxfw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oxfw-&gt;quirks &amp; SND_OXFW_QUIRK_SCS_TRANSACTION)</div><div class='add'>+		snd_oxfw_scs1x_update(oxfw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void oxfw_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_oxfw *oxfw = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(oxfw-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct compat_info griffin_firewave = {</div><div class='add'>+	.driver_name = "FireWave",</div><div class='add'>+	.vendor_name = "Griffin",</div><div class='add'>+	.model_name = "FireWave",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct compat_info lacie_speakers = {</div><div class='add'>+	.driver_name = "FWSpeakers",</div><div class='add'>+	.vendor_name = "LaCie",</div><div class='add'>+	.model_name = "FireWire Speakers",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define OXFW_DEV_ENTRY(vendor, model, data) \</div><div class='add'>+{ \</div><div class='add'>+	.match_flags  = IEEE1394_MATCH_VENDOR_ID | \</div><div class='add'>+			IEEE1394_MATCH_MODEL_ID | \</div><div class='add'>+			IEEE1394_MATCH_SPECIFIER_ID | \</div><div class='add'>+			IEEE1394_MATCH_VERSION, \</div><div class='add'>+	.vendor_id    = vendor, \</div><div class='add'>+	.model_id     = model, \</div><div class='add'>+	.specifier_id = SPECIFIER_1394TA, \</div><div class='add'>+	.version      = VERSION_AVC, \</div><div class='add'>+	.driver_data  = (kernel_ulong_t)data, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id oxfw_id_table[] = {</div><div class='add'>+	//</div><div class='add'>+	// OXFW970 devices:</div><div class='add'>+	// Initial firmware has a quirk to postpone isoc packet transmission during finishing async</div><div class='add'>+	// transaction. As a result, several isochronous cycles are skipped to transfer the packets</div><div class='add'>+	// and the audio data frames which should have been transferred during the cycles are put</div><div class='add'>+	// into packet at the first isoc cycle after the postpone. Furthermore, the value of SYT</div><div class='add'>+	// field in CIP header is not reliable as synchronization timing,</div><div class='add'>+	//</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_GRIFFIN, 0x00f970, &amp;griffin_firewave),</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_LACIE, 0x00f970, &amp;lacie_speakers),</div><div class='add'>+	// Miglia HarmonyAudio (HA02). The numeric vendor ID is ASIC vendor and the model ID is the</div><div class='add'>+	// default value of ASIC.</div><div class='add'>+	OXFW_DEV_ENTRY(OUI_OXFORD, 0x00f970, NULL),</div><div class='add'>+	// Behringer,F-Control Audio 202. The value of SYT field is not reliable at all.</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_BEHRINGER, 0x00fc22, NULL),</div><div class='add'>+	// Loud Technologies, Tapco Link.FireWire 4x6. The value of SYT field is always 0xffff.</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_LOUD, 0x000460, NULL),</div><div class='add'>+	// Loud Technologies, Mackie Onyx Satellite. Although revised version of firmware is</div><div class='add'>+	// installed to avoid the postpone, the value of SYT field is always 0xffff.</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_LOUD, MODEL_SATELLITE, NULL),</div><div class='add'>+</div><div class='add'>+	//</div><div class='add'>+	// OXFW971 devices:</div><div class='add'>+	// The value of SYT field in CIP header is enough reliable. Both of blocking and non-blocking</div><div class='add'>+	// transmission methods are available.</div><div class='add'>+	//</div><div class='add'>+	// Any Mackie(Loud) models (name string/model id):</div><div class='add'>+	//  Onyx-i series (former models):	0x081216</div><div class='add'>+	//  Onyx 1640i:				0x001640</div><div class='add'>+	//  d.2 pro/d.4 pro (built-in card):	Unknown</div><div class='add'>+	//  U.420:				Unknown</div><div class='add'>+	//  U.420d:				Unknown</div><div class='add'>+	{</div><div class='add'>+		.match_flags	= IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+				  IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+				  IEEE1394_MATCH_VERSION,</div><div class='add'>+		.vendor_id	= VENDOR_LOUD,</div><div class='add'>+		.model_id	= 0,</div><div class='add'>+		.specifier_id	= SPECIFIER_1394TA,</div><div class='add'>+		.version	= VERSION_AVC,</div><div class='add'>+	},</div><div class='add'>+	// TASCAM, FireOne.</div><div class='add'>+	OXFW_DEV_ENTRY(VENDOR_TASCAM, 0x800007, NULL),</div><div class='add'>+	// Stanton, Stanton Controllers &amp; Systems 1 Mixer (SCS.1m).</div><div class='add'>+	OXFW_DEV_ENTRY(OUI_STANTON, MODEL_SCS1M, NULL),</div><div class='add'>+	// Stanton, Stanton Controllers &amp; Systems 1 Deck (SCS.1d).</div><div class='add'>+	OXFW_DEV_ENTRY(OUI_STANTON, 0x002000, NULL),</div><div class='add'>+	// APOGEE, duet FireWire.</div><div class='add'>+	OXFW_DEV_ENTRY(OUI_APOGEE, MODEL_DUET_FW, NULL),</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, oxfw_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver oxfw_driver = {</div><div class='add'>+	.driver   = {</div><div class='add'>+		.owner	= THIS_MODULE,</div><div class='add'>+		.name	= KBUILD_MODNAME,</div><div class='add'>+		.bus	= &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = oxfw_probe,</div><div class='add'>+	.update   = oxfw_bus_reset,</div><div class='add'>+	.remove   = oxfw_remove,</div><div class='add'>+	.id_table = oxfw_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_oxfw_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;oxfw_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_oxfw_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;oxfw_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_oxfw_init);</div><div class='add'>+module_exit(snd_oxfw_exit);</div><div class='head'>diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h<br/>new file mode 100644<br/>index 000000000000..39ea9a6dde33<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/oxfw/oxfw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/oxfw/oxfw.h</a></div><div class='hunk'>@@ -0,0 +1,166 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * oxfw.h - a part of driver for OXFW970/971 based devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../fcp.h"</div><div class='add'>+#include "../packets-buffer.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+#include "../amdtp-am824.h"</div><div class='add'>+#include "../cmp.h"</div><div class='add'>+</div><div class='add'>+enum snd_oxfw_quirk {</div><div class='add'>+	// Postpone transferring packets during handling asynchronous transaction. As a result,</div><div class='add'>+	// next isochronous packet includes more events than one packet can include.</div><div class='add'>+	SND_OXFW_QUIRK_JUMBO_PAYLOAD = 0x01,</div><div class='add'>+	// The dbs field of CIP header in tx packet is wrong.</div><div class='add'>+	SND_OXFW_QUIRK_WRONG_DBS = 0x02,</div><div class='add'>+	// Blocking transmission mode is used.</div><div class='add'>+	SND_OXFW_QUIRK_BLOCKING_TRANSMISSION = 0x04,</div><div class='add'>+	// Stanton SCS1.d and SCS1.m support unique transaction.</div><div class='add'>+	SND_OXFW_QUIRK_SCS_TRANSACTION = 0x08,</div><div class='add'>+	// Apogee Duet FireWire ignores data blocks in packet with NO_INFO for audio data</div><div class='add'>+	// processing, while output level meter moves. Any value in syt field of packet takes</div><div class='add'>+	// the device to process audio data even if the value is invalid in a point of</div><div class='add'>+	// IEC 61883-1/6.</div><div class='add'>+	SND_OXFW_QUIRK_IGNORE_NO_INFO_PACKET = 0x10,</div><div class='add'>+	// Loud Technologies Mackie Onyx 1640i seems to configure OXFW971 ASIC so that it decides</div><div class='add'>+	// event frequency according to events in received isochronous packets. The device looks to</div><div class='add'>+	// performs media clock recovery voluntarily. In the recovery, the packets with NO_INFO</div><div class='add'>+	// are ignored, thus driver should transfer packets with timestamp.</div><div class='add'>+	SND_OXFW_QUIRK_VOLUNTARY_RECOVERY = 0x20,</div><div class='add'>+	// Miglia Harmony Audio does not support AV/C Stream Format Information command.</div><div class='add'>+	SND_OXFW_QUIRK_STREAM_FORMAT_INFO_UNSUPPORTED = 0x40,</div><div class='add'>+	// Miglia Harmony Audio transmits CIP in which the value of dbc field expresses the number</div><div class='add'>+	// of accumulated payload quadlets including the packet.</div><div class='add'>+	SND_OXFW_QUIRK_DBC_IS_TOTAL_PAYLOAD_QUADLETS = 0x80,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This is an arbitrary number for convinience. */</div><div class='add'>+#define	SND_OXFW_STREAM_FORMAT_ENTRIES	10</div><div class='add'>+struct snd_oxfw {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	// The combination of snd_oxfw_quirk enumeration-constants.</div><div class='add'>+	unsigned int quirks;</div><div class='add'>+	bool has_output;</div><div class='add'>+	bool has_input;</div><div class='add'>+	u8 *tx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];</div><div class='add'>+	u8 *rx_stream_formats[SND_OXFW_STREAM_FORMAT_ENTRIES];</div><div class='add'>+	bool assumed;</div><div class='add'>+	struct cmp_connection out_conn;</div><div class='add'>+	struct cmp_connection in_conn;</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	unsigned int substreams_count;</div><div class='add'>+</div><div class='add'>+	unsigned int midi_input_ports;</div><div class='add'>+	unsigned int midi_output_ports;</div><div class='add'>+</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	void *spec;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AV/C Stream Format Information Specification 1.1 Working Draft</div><div class='add'>+ * (Apr 2005, 1394TA)</div><div class='add'>+ */</div><div class='add'>+int avc_stream_set_format(struct fw_unit *unit, enum avc_general_plug_dir dir,</div><div class='add'>+			  unsigned int pid, u8 *format, unsigned int len);</div><div class='add'>+int avc_stream_get_format(struct fw_unit *unit,</div><div class='add'>+			  enum avc_general_plug_dir dir, unsigned int pid,</div><div class='add'>+			  u8 *buf, unsigned int *len, unsigned int eid);</div><div class='add'>+static inline int</div><div class='add'>+avc_stream_get_format_single(struct fw_unit *unit,</div><div class='add'>+			     enum avc_general_plug_dir dir, unsigned int pid,</div><div class='add'>+			     u8 *buf, unsigned int *len)</div><div class='add'>+{</div><div class='add'>+	return avc_stream_get_format(unit, dir, pid, buf, len, 0xff);</div><div class='add'>+}</div><div class='add'>+static inline int</div><div class='add'>+avc_stream_get_format_list(struct fw_unit *unit,</div><div class='add'>+			   enum avc_general_plug_dir dir, unsigned int pid,</div><div class='add'>+			   u8 *buf, unsigned int *len,</div><div class='add'>+			   unsigned int eid)</div><div class='add'>+{</div><div class='add'>+	return avc_stream_get_format(unit, dir, pid, buf, len, eid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AV/C Digital Interface Command Set General Specification 4.2</div><div class='add'>+ * (Sep 2004, 1394TA)</div><div class='add'>+ */</div><div class='add'>+int avc_general_inquiry_sig_fmt(struct fw_unit *unit, unsigned int rate,</div><div class='add'>+				enum avc_general_plug_dir dir,</div><div class='add'>+				unsigned short pid);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_init_duplex(struct snd_oxfw *oxfw);</div><div class='add'>+int snd_oxfw_stream_reserve_duplex(struct snd_oxfw *oxfw,</div><div class='add'>+				   struct amdtp_stream *stream,</div><div class='add'>+				   unsigned int rate, unsigned int pcm_channels,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer);</div><div class='add'>+int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw);</div><div class='add'>+void snd_oxfw_stream_stop_duplex(struct snd_oxfw *oxfw);</div><div class='add'>+void snd_oxfw_stream_destroy_duplex(struct snd_oxfw *oxfw);</div><div class='add'>+void snd_oxfw_stream_update_duplex(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+struct snd_oxfw_stream_formation {</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	unsigned int pcm;</div><div class='add'>+	unsigned int midi;</div><div class='add'>+};</div><div class='add'>+int snd_oxfw_stream_parse_format(const u8 *format,</div><div class='add'>+				 struct snd_oxfw_stream_formation *formation);</div><div class='add'>+int snd_oxfw_stream_get_current_formation(struct snd_oxfw *oxfw,</div><div class='add'>+				enum avc_general_plug_dir dir,</div><div class='add'>+				struct snd_oxfw_stream_formation *formation);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_stream_discover(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+void snd_oxfw_stream_lock_changed(struct snd_oxfw *oxfw);</div><div class='add'>+int snd_oxfw_stream_lock_try(struct snd_oxfw *oxfw);</div><div class='add'>+void snd_oxfw_stream_lock_release(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_pcm(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+void snd_oxfw_proc_init(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_midi(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_create_hwdep(struct snd_oxfw *oxfw);</div><div class='add'>+</div><div class='add'>+int snd_oxfw_add_spkr(struct snd_oxfw *oxfw, bool is_lacie);</div><div class='add'>+int snd_oxfw_scs1x_add(struct snd_oxfw *oxfw);</div><div class='add'>+void snd_oxfw_scs1x_update(struct snd_oxfw *oxfw);</div><div class='head'>diff --git a/sound/firewire/packets-buffer.c b/sound/firewire/packets-buffer.c<br/>new file mode 100644<br/>index 000000000000..0ecafd0c6722<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/packets-buffer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/packets-buffer.c</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * helpers for managing a buffer for many packets</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include "packets-buffer.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iso_packets_buffer_init - allocates the memory for packets</div><div class='add'>+ * @b: the buffer structure to initialize</div><div class='add'>+ * @unit: the device at the other end of the stream</div><div class='add'>+ * @count: the number of packets</div><div class='add'>+ * @packet_size: the (maximum) size of a packet, in bytes</div><div class='add'>+ * @direction: %DMA_TO_DEVICE or %DMA_FROM_DEVICE</div><div class='add'>+ */</div><div class='add'>+int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit,</div><div class='add'>+			    unsigned int count, unsigned int packet_size,</div><div class='add'>+			    enum dma_data_direction direction)</div><div class='add'>+{</div><div class='add'>+	unsigned int packets_per_page, pages;</div><div class='add'>+	unsigned int i, page_index, offset_in_page;</div><div class='add'>+	void *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	b-&gt;packets = kmalloc_array(count, sizeof(*b-&gt;packets), GFP_KERNEL);</div><div class='add'>+	if (!b-&gt;packets) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	packet_size = L1_CACHE_ALIGN(packet_size);</div><div class='add'>+	packets_per_page = PAGE_SIZE / packet_size;</div><div class='add'>+	if (WARN_ON(!packets_per_page)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_packets;</div><div class='add'>+	}</div><div class='add'>+	pages = DIV_ROUND_UP(count, packets_per_page);</div><div class='add'>+</div><div class='add'>+	err = fw_iso_buffer_init(&amp;b-&gt;iso_buffer, fw_parent_device(unit)-&gt;card,</div><div class='add'>+				 pages, direction);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_packets;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		page_index = i / packets_per_page;</div><div class='add'>+		p = page_address(b-&gt;iso_buffer.pages[page_index]);</div><div class='add'>+		offset_in_page = (i % packets_per_page) * packet_size;</div><div class='add'>+		b-&gt;packets[i].buffer = p + offset_in_page;</div><div class='add'>+		b-&gt;packets[i].offset = page_index * PAGE_SIZE + offset_in_page;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_packets:</div><div class='add'>+	kfree(b-&gt;packets);</div><div class='add'>+error:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iso_packets_buffer_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * iso_packets_buffer_destroy - frees packet buffer resources</div><div class='add'>+ * @b: the buffer structure to free</div><div class='add'>+ * @unit: the device at the other end of the stream</div><div class='add'>+ */</div><div class='add'>+void iso_packets_buffer_destroy(struct iso_packets_buffer *b,</div><div class='add'>+				struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	fw_iso_buffer_destroy(&amp;b-&gt;iso_buffer, fw_parent_device(unit)-&gt;card);</div><div class='add'>+	kfree(b-&gt;packets);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(iso_packets_buffer_destroy);</div><div class='head'>diff --git a/sound/firewire/packets-buffer.h b/sound/firewire/packets-buffer.h<br/>new file mode 100644<br/>index 000000000000..99e963c271e1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/packets-buffer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/packets-buffer.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef SOUND_FIREWIRE_PACKETS_BUFFER_H_INCLUDED</div><div class='add'>+#define SOUND_FIREWIRE_PACKETS_BUFFER_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct iso_packets_buffer - manages a buffer for many packets</div><div class='add'>+ * @iso_buffer: the memory containing the packets</div><div class='add'>+ * @packets: an array, with each element pointing to one packet</div><div class='add'>+ */</div><div class='add'>+struct iso_packets_buffer {</div><div class='add'>+	struct fw_iso_buffer iso_buffer;</div><div class='add'>+	struct {</div><div class='add'>+		void *buffer;</div><div class='add'>+		unsigned int offset;</div><div class='add'>+	} *packets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int iso_packets_buffer_init(struct iso_packets_buffer *b, struct fw_unit *unit,</div><div class='add'>+			    unsigned int count, unsigned int packet_size,</div><div class='add'>+			    enum dma_data_direction direction);</div><div class='add'>+void iso_packets_buffer_destroy(struct iso_packets_buffer *b,</div><div class='add'>+				struct fw_unit *unit);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/firewire/tascam/Makefile b/sound/firewire/tascam/Makefile<br/>new file mode 100644<br/>index 000000000000..43fed14cf172<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-firewire-tascam-y := tascam-proc.o amdtp-tascam.o tascam-stream.o \</div><div class='add'>+			    tascam-pcm.o tascam-hwdep.o tascam-transaction.o \</div><div class='add'>+			    tascam-midi.o tascam.o</div><div class='add'>+obj-$(CONFIG_SND_FIREWIRE_TASCAM) += snd-firewire-tascam.o</div><div class='head'>diff --git a/sound/firewire/tascam/amdtp-tascam.c b/sound/firewire/tascam/amdtp-tascam.c<br/>new file mode 100644<br/>index 000000000000..59c339d9b5fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/amdtp-tascam.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/amdtp-tascam.c</a></div><div class='hunk'>@@ -0,0 +1,252 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * amdtp-tascam.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+#define AMDTP_FMT_TSCM_TX	0x1e</div><div class='add'>+#define AMDTP_FMT_TSCM_RX	0x3e</div><div class='add'>+</div><div class='add'>+struct amdtp_tscm {</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_tscm_set_parameters(struct amdtp_stream *s, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_tscm *p = s-&gt;protocol;</div><div class='add'>+	unsigned int data_channels;</div><div class='add'>+</div><div class='add'>+	if (amdtp_stream_running(s))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	data_channels = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	/* Packets in in-stream have extra 2 data channels. */</div><div class='add'>+	if (s-&gt;direction == AMDTP_IN_STREAM)</div><div class='add'>+		data_channels += 2;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_set_parameters(s, rate, data_channels, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			  __be32 *buffer, unsigned int frames,</div><div class='add'>+			  unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_tscm *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	const u32 *src;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	src = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			buffer[c] = cpu_to_be32(*src);</div><div class='add'>+			src++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			src = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_pcm_s32(struct amdtp_stream *s, struct snd_pcm_substream *pcm,</div><div class='add'>+			 __be32 *buffer, unsigned int frames,</div><div class='add'>+			 unsigned int pcm_frames)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_tscm *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels = p-&gt;pcm_channels;</div><div class='add'>+	struct snd_pcm_runtime *runtime = pcm-&gt;runtime;</div><div class='add'>+	unsigned int pcm_buffer_pointer;</div><div class='add'>+	int remaining_frames;</div><div class='add'>+	u32 *dst;</div><div class='add'>+	int i, c;</div><div class='add'>+</div><div class='add'>+	pcm_buffer_pointer = s-&gt;pcm_buffer_pointer + pcm_frames;</div><div class='add'>+	pcm_buffer_pointer %= runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	dst  = (void *)runtime-&gt;dma_area +</div><div class='add'>+				frames_to_bytes(runtime, pcm_buffer_pointer);</div><div class='add'>+	remaining_frames = runtime-&gt;buffer_size - pcm_buffer_pointer;</div><div class='add'>+</div><div class='add'>+	/* The first data channel is for event counter. */</div><div class='add'>+	buffer += 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; frames; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c) {</div><div class='add'>+			*dst = be32_to_cpu(buffer[c]);</div><div class='add'>+			dst++;</div><div class='add'>+		}</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+		if (--remaining_frames == 0)</div><div class='add'>+			dst = (void *)runtime-&gt;dma_area;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_pcm_silence(struct amdtp_stream *s, __be32 *buffer,</div><div class='add'>+			      unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct amdtp_tscm *p = s-&gt;protocol;</div><div class='add'>+	unsigned int channels, i, c;</div><div class='add'>+</div><div class='add'>+	channels = p-&gt;pcm_channels;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; ++i) {</div><div class='add'>+		for (c = 0; c &lt; channels; ++c)</div><div class='add'>+			buffer[c] = 0x00000000;</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_tscm_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				      struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Our implementation allows this protocol to deliver 24 bit sample in</div><div class='add'>+	 * 32bit data channel.</div><div class='add'>+	 */</div><div class='add'>+	err = snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return amdtp_stream_add_pcm_hw_constraints(s, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void read_status_messages(struct amdtp_stream *s,</div><div class='add'>+				 __be32 *buffer, unsigned int data_blocks)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = container_of(s, struct snd_tscm, tx_stream);</div><div class='add'>+	bool used = READ_ONCE(tscm-&gt;hwdep-&gt;used);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; data_blocks; i++) {</div><div class='add'>+		unsigned int index;</div><div class='add'>+		__be32 before;</div><div class='add'>+		__be32 after;</div><div class='add'>+</div><div class='add'>+		index = be32_to_cpu(buffer[0]) % SNDRV_FIREWIRE_TASCAM_STATE_COUNT;</div><div class='add'>+		before = tscm-&gt;state[index];</div><div class='add'>+		after = buffer[s-&gt;data_block_quadlets - 1];</div><div class='add'>+</div><div class='add'>+		if (used &amp;&amp; index &gt; 4 &amp;&amp; index &lt; 16) {</div><div class='add'>+			__be32 mask;</div><div class='add'>+</div><div class='add'>+			if (index == 5)</div><div class='add'>+				mask = cpu_to_be32(~0x0000ffff);</div><div class='add'>+			else if (index == 6)</div><div class='add'>+				mask = cpu_to_be32(~0x0000ffff);</div><div class='add'>+			else if (index == 8)</div><div class='add'>+				mask = cpu_to_be32(~0x000f0f00);</div><div class='add'>+			else</div><div class='add'>+				mask = cpu_to_be32(~0x00000000);</div><div class='add'>+</div><div class='add'>+			if ((before ^ after) &amp; mask) {</div><div class='add'>+				struct snd_firewire_tascam_change *entry =</div><div class='add'>+						&amp;tscm-&gt;queue[tscm-&gt;push_pos];</div><div class='add'>+</div><div class='add'>+				scoped_guard(spinlock_irqsave, &amp;tscm-&gt;lock) {</div><div class='add'>+					entry-&gt;index = index;</div><div class='add'>+					entry-&gt;before = before;</div><div class='add'>+					entry-&gt;after = after;</div><div class='add'>+					if (++tscm-&gt;push_pos &gt;= SND_TSCM_QUEUE_COUNT)</div><div class='add'>+						tscm-&gt;push_pos = 0;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				wake_up(&amp;tscm-&gt;hwdep_wait);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tscm-&gt;state[index] = after;</div><div class='add'>+		buffer += s-&gt;data_block_quadlets;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_ir_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			read_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		read_status_messages(s, buf, data_blocks);</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_it_ctx_payloads(struct amdtp_stream *s, const struct pkt_desc *desc,</div><div class='add'>+				    unsigned int count, struct snd_pcm_substream *pcm)</div><div class='add'>+{</div><div class='add'>+	unsigned int pcm_frames = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; ++i) {</div><div class='add'>+		__be32 *buf = desc-&gt;ctx_payload;</div><div class='add'>+		unsigned int data_blocks = desc-&gt;data_blocks;</div><div class='add'>+</div><div class='add'>+		if (pcm) {</div><div class='add'>+			write_pcm_s32(s, pcm, buf, data_blocks, pcm_frames);</div><div class='add'>+			pcm_frames += data_blocks;</div><div class='add'>+		} else {</div><div class='add'>+			write_pcm_silence(s, buf, data_blocks);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = amdtp_stream_next_packet_desc(s, desc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		    enum amdtp_stream_direction dir, unsigned int pcm_channels)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_process_ctx_payloads_t process_ctx_payloads;</div><div class='add'>+	unsigned int flags = CIP_NONBLOCKING | CIP_SKIP_DBC_ZERO_CHECK | CIP_UNAWARE_SYT;</div><div class='add'>+	struct amdtp_tscm *p;</div><div class='add'>+	unsigned int fmt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_IN_STREAM) {</div><div class='add'>+		fmt = AMDTP_FMT_TSCM_TX;</div><div class='add'>+		process_ctx_payloads = process_ir_ctx_payloads;</div><div class='add'>+	} else {</div><div class='add'>+		fmt = AMDTP_FMT_TSCM_RX;</div><div class='add'>+		process_ctx_payloads = process_it_ctx_payloads;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_stream_init(s, unit, dir, flags, fmt,</div><div class='add'>+			process_ctx_payloads, sizeof(struct amdtp_tscm));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (dir == AMDTP_OUT_STREAM) {</div><div class='add'>+		// Use fixed value for FDF field.</div><div class='add'>+		s-&gt;ctx_data.rx.fdf = 0x00;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This protocol uses fixed number of data channels for PCM samples. */</div><div class='add'>+	p = s-&gt;protocol;</div><div class='add'>+	p-&gt;pcm_channels = pcm_channels;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-hwdep.c b/sound/firewire/tascam/tascam-hwdep.c<br/>new file mode 100644<br/>index 000000000000..867b4ea1096e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,260 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-hwdep.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This codes give three functionality.</div><div class='add'>+ *</div><div class='add'>+ * 1.get firewire node information</div><div class='add'>+ * 2.get notification about starting/stopping stream</div><div class='add'>+ * 3.lock/unlock stream</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+static long tscm_hwdep_read_locked(struct snd_tscm *tscm, char __user *buf,</div><div class='add'>+				   long count, loff_t *offset)</div><div class='add'>+	__releases(&amp;tscm-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	struct snd_firewire_event_lock_status event = {</div><div class='add'>+		.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	event.status = (tscm-&gt;dev_lock_count &gt; 0);</div><div class='add'>+	tscm-&gt;dev_lock_changed = false;</div><div class='add'>+	count = min_t(long, count, sizeof(event));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;event, count))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long tscm_hwdep_read_queue(struct snd_tscm *tscm, char __user *buf,</div><div class='add'>+				  long remained, loff_t *offset)</div><div class='add'>+	__releases(&amp;tscm-&gt;lock)</div><div class='add'>+{</div><div class='add'>+	char __user *pos = buf;</div><div class='add'>+	unsigned int type = SNDRV_FIREWIRE_EVENT_TASCAM_CONTROL;</div><div class='add'>+	struct snd_firewire_tascam_change *entries = tscm-&gt;queue;</div><div class='add'>+	long count;</div><div class='add'>+</div><div class='add'>+	// At least, one control event can be copied.</div><div class='add'>+	if (remained &lt; sizeof(type) + sizeof(*entries)) {</div><div class='add'>+		spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Copy the type field later.</div><div class='add'>+	count = sizeof(type);</div><div class='add'>+	remained -= sizeof(type);</div><div class='add'>+	pos += sizeof(type);</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		unsigned int head_pos;</div><div class='add'>+		unsigned int tail_pos;</div><div class='add'>+		unsigned int length;</div><div class='add'>+</div><div class='add'>+		if (tscm-&gt;pull_pos == tscm-&gt;push_pos)</div><div class='add'>+			break;</div><div class='add'>+		else if (tscm-&gt;pull_pos &lt; tscm-&gt;push_pos)</div><div class='add'>+			tail_pos = tscm-&gt;push_pos;</div><div class='add'>+		else</div><div class='add'>+			tail_pos = SND_TSCM_QUEUE_COUNT;</div><div class='add'>+		head_pos = tscm-&gt;pull_pos;</div><div class='add'>+</div><div class='add'>+		length = (tail_pos - head_pos) * sizeof(*entries);</div><div class='add'>+		if (remained &lt; length)</div><div class='add'>+			length = rounddown(remained, sizeof(*entries));</div><div class='add'>+		if (length == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+		if (copy_to_user(pos, &amp;entries[head_pos], length))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		spin_lock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+		tscm-&gt;pull_pos = tail_pos % SND_TSCM_QUEUE_COUNT;</div><div class='add'>+</div><div class='add'>+		count += length;</div><div class='add'>+		remained -= length;</div><div class='add'>+		pos += length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(buf, &amp;type, sizeof(type)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,</div><div class='add'>+		       loff_t *offset)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = hwdep-&gt;private_data;</div><div class='add'>+	DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (!tscm-&gt;dev_lock_changed &amp;&amp; tscm-&gt;push_pos == tscm-&gt;pull_pos) {</div><div class='add'>+		prepare_to_wait(&amp;tscm-&gt;hwdep_wait, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='add'>+		spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+		schedule();</div><div class='add'>+		finish_wait(&amp;tscm-&gt;hwdep_wait, &amp;wait);</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			return -ERESTARTSYS;</div><div class='add'>+		spin_lock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// NOTE: The acquired lock should be released in callee side.</div><div class='add'>+	if (tscm-&gt;dev_lock_changed) {</div><div class='add'>+		count = tscm_hwdep_read_locked(tscm, buf, count, offset);</div><div class='add'>+	} else if (tscm-&gt;push_pos != tscm-&gt;pull_pos) {</div><div class='add'>+		count = tscm_hwdep_read_queue(tscm, buf, count, offset);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irq(&amp;tscm-&gt;lock);</div><div class='add'>+		count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			       poll_table *wait)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	poll_wait(file, &amp;tscm-&gt;hwdep_wait, wait);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+	if (tscm-&gt;dev_lock_changed || tscm-&gt;push_pos != tscm-&gt;pull_pos)</div><div class='add'>+		return EPOLLIN | EPOLLRDNORM;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_get_info(struct snd_tscm *tscm, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *dev = fw_parent_device(tscm-&gt;unit);</div><div class='add'>+	struct snd_firewire_get_info info;</div><div class='add'>+</div><div class='add'>+	memset(&amp;info, 0, sizeof(info));</div><div class='add'>+	info.type = SNDRV_FIREWIRE_TYPE_TASCAM;</div><div class='add'>+	info.card = dev-&gt;card-&gt;index;</div><div class='add'>+	*(__be32 *)&amp;info.guid[0] = cpu_to_be32(dev-&gt;config_rom[3]);</div><div class='add'>+	*(__be32 *)&amp;info.guid[4] = cpu_to_be32(dev-&gt;config_rom[4]);</div><div class='add'>+	strscpy(info.device_name, dev_name(&amp;dev-&gt;device),</div><div class='add'>+		sizeof(info.device_name));</div><div class='add'>+</div><div class='add'>+	if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_lock(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;dev_lock_count == 0) {</div><div class='add'>+		tscm-&gt;dev_lock_count = -1;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_unlock(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;dev_lock_count == -1) {</div><div class='add'>+		tscm-&gt;dev_lock_count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EBADFD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tscm_hwdep_state(struct snd_tscm *tscm, void __user *arg)</div><div class='add'>+{</div><div class='add'>+	if (copy_to_user(arg, tscm-&gt;state, sizeof(tscm-&gt;state)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_release(struct snd_hwdep *hwdep, struct file *file)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+	if (tscm-&gt;dev_lock_count == -1)</div><div class='add'>+		tscm-&gt;dev_lock_count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hwdep_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+	    unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = hwdep-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_GET_INFO:</div><div class='add'>+		return hwdep_get_info(tscm, (void __user *)arg);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_LOCK:</div><div class='add'>+		return hwdep_lock(tscm);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_UNLOCK:</div><div class='add'>+		return hwdep_unlock(tscm);</div><div class='add'>+	case SNDRV_FIREWIRE_IOCTL_TASCAM_STATE:</div><div class='add'>+		return tscm_hwdep_state(tscm, (void __user *)arg);</div><div class='add'>+	default:</div><div class='add'>+		return -ENOIOCTLCMD;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file,</div><div class='add'>+			      unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hwdep_ioctl(hwdep, file, cmd,</div><div class='add'>+			   (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define hwdep_compat_ioctl NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_hwdep_device(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_hwdep_ops ops = {</div><div class='add'>+		.read		= hwdep_read,</div><div class='add'>+		.release	= hwdep_release,</div><div class='add'>+		.poll		= hwdep_poll,</div><div class='add'>+		.ioctl		= hwdep_ioctl,</div><div class='add'>+		.ioctl_compat	= hwdep_compat_ioctl,</div><div class='add'>+	};</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hwdep_new(tscm-&gt;card, "Tascam", 0, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(hwdep-&gt;name, "Tascam");</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_FW_TASCAM;</div><div class='add'>+	hwdep-&gt;ops = ops;</div><div class='add'>+	hwdep-&gt;private_data = tscm;</div><div class='add'>+	hwdep-&gt;exclusive = true;</div><div class='add'>+</div><div class='add'>+	tscm-&gt;hwdep = hwdep;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-midi.c b/sound/firewire/tascam/tascam-midi.c<br/>new file mode 100644<br/>index 000000000000..1bf9d7b3da33<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-midi.c</a></div><div class='hunk'>@@ -0,0 +1,129 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-midi.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+static int midi_capture_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_open(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_fw_async_midi_port_init(&amp;tscm-&gt;out_ports[substream-&gt;number]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_capture_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	/* Do nothing. */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int midi_playback_close(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_drain(struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_fw_async_midi_port_finish(&amp;tscm-&gt;out_ports[substream-&gt;number]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_capture_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		tscm-&gt;tx_midi_substreams[substrm-&gt;number] = substrm;</div><div class='add'>+	else</div><div class='add'>+		tscm-&gt;tx_midi_substreams[substrm-&gt;number] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_playback_trigger(struct snd_rawmidi_substream *substrm, int up)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substrm-&gt;rmidi-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		snd_fw_async_midi_port_run(&amp;tscm-&gt;out_ports[substrm-&gt;number],</div><div class='add'>+					   substrm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_midi_devices(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_rawmidi_ops capture_ops = {</div><div class='add'>+		.open		= midi_capture_open,</div><div class='add'>+		.close		= midi_capture_close,</div><div class='add'>+		.trigger	= midi_capture_trigger,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_rawmidi_ops playback_ops = {</div><div class='add'>+		.open		= midi_playback_open,</div><div class='add'>+		.close		= midi_playback_close,</div><div class='add'>+		.drain		= midi_playback_drain,</div><div class='add'>+		.trigger	= midi_playback_trigger,</div><div class='add'>+	};</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_str *stream;</div><div class='add'>+	struct snd_rawmidi_substream *subs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_rawmidi_new(tscm-&gt;card, tscm-&gt;card-&gt;driver, 0,</div><div class='add'>+			      tscm-&gt;spec-&gt;midi_playback_ports,</div><div class='add'>+			      tscm-&gt;spec-&gt;midi_capture_ports,</div><div class='add'>+			      &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(rmidi-&gt;name, sizeof(rmidi-&gt;name),</div><div class='add'>+		 "%s MIDI", tscm-&gt;card-&gt;shortname);</div><div class='add'>+	rmidi-&gt;private_data = tscm;</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='add'>+			    &amp;capture_ops);</div><div class='add'>+	stream = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_INPUT];</div><div class='add'>+</div><div class='add'>+	/* Set port names for MIDI input. */</div><div class='add'>+	list_for_each_entry(subs, &amp;stream-&gt;substreams, list) {</div><div class='add'>+		/* TODO: support virtual MIDI ports. */</div><div class='add'>+		if (subs-&gt;number &lt; tscm-&gt;spec-&gt;midi_capture_ports) {</div><div class='add'>+			/* Hardware MIDI ports. */</div><div class='add'>+			scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+				  "%s MIDI %d",</div><div class='add'>+				  tscm-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;</div><div class='add'>+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,</div><div class='add'>+			    &amp;playback_ops);</div><div class='add'>+	stream = &amp;rmidi-&gt;streams[SNDRV_RAWMIDI_STREAM_OUTPUT];</div><div class='add'>+</div><div class='add'>+	/* Set port names for MIDI ourput. */</div><div class='add'>+	list_for_each_entry(subs, &amp;stream-&gt;substreams, list) {</div><div class='add'>+		if (subs-&gt;number &lt; tscm-&gt;spec-&gt;midi_playback_ports) {</div><div class='add'>+			/* Hardware MIDI ports only. */</div><div class='add'>+			scnprintf(subs-&gt;name, sizeof(subs-&gt;name),</div><div class='add'>+				  "%s MIDI %d",</div><div class='add'>+				  tscm-&gt;card-&gt;shortname, subs-&gt;number + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c<br/>new file mode 100644<br/>index 000000000000..d885fef0c8ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-pcm.c</a></div><div class='hunk'>@@ -0,0 +1,275 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-pcm.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+static int pcm_init_hw_params(struct snd_tscm *tscm,</div><div class='add'>+			      struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_pcm_hardware *hw = &amp;runtime-&gt;hw;</div><div class='add'>+	struct amdtp_stream *stream;</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		stream = &amp;tscm-&gt;tx_stream;</div><div class='add'>+		pcm_channels = tscm-&gt;spec-&gt;pcm_capture_analog_channels;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32;</div><div class='add'>+		stream = &amp;tscm-&gt;rx_stream;</div><div class='add'>+		pcm_channels = tscm-&gt;spec-&gt;pcm_playback_analog_channels;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_adat)</div><div class='add'>+		pcm_channels += 8;</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_spdif)</div><div class='add'>+		pcm_channels += 2;</div><div class='add'>+	runtime-&gt;hw.channels_min = runtime-&gt;hw.channels_max = pcm_channels;</div><div class='add'>+</div><div class='add'>+	hw-&gt;rates = SNDRV_PCM_RATE_44100 |</div><div class='add'>+		    SNDRV_PCM_RATE_48000 |</div><div class='add'>+		    SNDRV_PCM_RATE_88200 |</div><div class='add'>+		    SNDRV_PCM_RATE_96000;</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+</div><div class='add'>+	return amdtp_tscm_add_pcm_hw_constraints(stream, runtime);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+	struct amdtp_domain *d = &amp;tscm-&gt;domain;</div><div class='add'>+	enum snd_tscm_clock clock;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_lock_try(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pcm_init_hw_params(tscm, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_get_clock(tscm, &amp;clock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_locked;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;tscm-&gt;mutex) {</div><div class='add'>+		// When source of clock is not internal or any stream is reserved for</div><div class='add'>+		// transmission of PCM frames, the available sampling rate is limited</div><div class='add'>+		// at current one.</div><div class='add'>+		if (clock != SND_TSCM_CLOCK_INTERNAL || tscm-&gt;substreams_counter &gt; 0) {</div><div class='add'>+			unsigned int frames_per_period = d-&gt;events_per_period;</div><div class='add'>+			unsigned int frames_per_buffer = d-&gt;events_per_buffer;</div><div class='add'>+			unsigned int rate;</div><div class='add'>+</div><div class='add'>+			err = snd_tscm_stream_get_rate(tscm, &amp;rate);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			substream-&gt;runtime-&gt;hw.rate_max = rate;</div><div class='add'>+</div><div class='add'>+			err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+							   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+							   frames_per_period, frames_per_period);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+</div><div class='add'>+			err = snd_pcm_hw_constraint_minmax(substream-&gt;runtime,</div><div class='add'>+							   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+							   frames_per_buffer, frames_per_buffer);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				goto err_locked;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err_locked:</div><div class='add'>+	snd_tscm_stream_lock_release(tscm);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_tscm_stream_lock_release(tscm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			 struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state == SNDRV_PCM_STATE_OPEN) {</div><div class='add'>+		unsigned int rate = params_rate(hw_params);</div><div class='add'>+		unsigned int frames_per_period = params_period_size(hw_params);</div><div class='add'>+		unsigned int frames_per_buffer = params_buffer_size(hw_params);</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;tscm-&gt;mutex);</div><div class='add'>+		err = snd_tscm_stream_reserve_duplex(tscm, rate,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &gt;= 0)</div><div class='add'>+			++tscm-&gt;substreams_counter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tscm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime-&gt;state != SNDRV_PCM_STATE_OPEN)</div><div class='add'>+		--tscm-&gt;substreams_counter;</div><div class='add'>+</div><div class='add'>+	snd_tscm_stream_stop_duplex(tscm);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tscm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_start_duplex(tscm, runtime-&gt;rate);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;tscm-&gt;tx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tscm-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_start_duplex(tscm, runtime-&gt;rate);</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		amdtp_stream_pcm_prepare(&amp;tscm-&gt;rx_stream);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;tscm-&gt;tx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;tscm-&gt;tx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;tscm-&gt;rx_stream, substream);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		amdtp_stream_pcm_trigger(&amp;tscm-&gt;rx_stream, NULL);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_capture_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;tscm-&gt;domain, &amp;tscm-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = sbstrm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_pointer(&amp;tscm-&gt;domain, &amp;tscm-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_capture_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;tscm-&gt;domain, &amp;tscm-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcm_playback_ack(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = substream-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return amdtp_domain_stream_pcm_ack(&amp;tscm-&gt;domain, &amp;tscm-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_pcm_devices(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_pcm_ops capture_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_capture_prepare,</div><div class='add'>+		.trigger	= pcm_capture_trigger,</div><div class='add'>+		.pointer	= pcm_capture_pointer,</div><div class='add'>+		.ack		= pcm_capture_ack,</div><div class='add'>+	};</div><div class='add'>+	static const struct snd_pcm_ops playback_ops = {</div><div class='add'>+		.open		= pcm_open,</div><div class='add'>+		.close		= pcm_close,</div><div class='add'>+		.hw_params	= pcm_hw_params,</div><div class='add'>+		.hw_free	= pcm_hw_free,</div><div class='add'>+		.prepare	= pcm_playback_prepare,</div><div class='add'>+		.trigger	= pcm_playback_trigger,</div><div class='add'>+		.pointer	= pcm_playback_pointer,</div><div class='add'>+		.ack		= pcm_playback_ack,</div><div class='add'>+	};</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(tscm-&gt;card, tscm-&gt;card-&gt;driver, 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = tscm;</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name),</div><div class='add'>+		 "%s PCM", tscm-&gt;card-&gt;shortname);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;playback_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-proc.c b/sound/firewire/tascam/tascam-proc.c<br/>new file mode 100644<br/>index 000000000000..53846aeff342<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-proc.c</a></div><div class='hunk'>@@ -0,0 +1,79 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-proc.h - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "./tascam.h"</div><div class='add'>+</div><div class='add'>+static void proc_read_firmware(struct snd_info_entry *entry,</div><div class='add'>+			       struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = entry-&gt;private_data;</div><div class='add'>+	__be32 data;</div><div class='add'>+	unsigned int reg, fpga, arm, hw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+			TSCM_ADDR_BASE + TSCM_OFFSET_FIRMWARE_REGISTER,</div><div class='add'>+			&amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	reg = be32_to_cpu(data);</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+			TSCM_ADDR_BASE + TSCM_OFFSET_FIRMWARE_FPGA,</div><div class='add'>+			&amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	fpga = be32_to_cpu(data);</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+			TSCM_ADDR_BASE + TSCM_OFFSET_FIRMWARE_ARM,</div><div class='add'>+			&amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	arm = be32_to_cpu(data);</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+			TSCM_ADDR_BASE + TSCM_OFFSET_FIRMWARE_HW,</div><div class='add'>+			&amp;data, sizeof(data), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	hw = be32_to_cpu(data);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "Register: %d (0x%08x)\n", reg &amp; 0xffff, reg);</div><div class='add'>+	snd_iprintf(buffer, "FPGA:     %d (0x%08x)\n", fpga &amp; 0xffff, fpga);</div><div class='add'>+	snd_iprintf(buffer, "ARM:      %d (0x%08x)\n", arm &amp; 0xffff, arm);</div><div class='add'>+	snd_iprintf(buffer, "Hardware: %d (0x%08x)\n", hw &gt;&gt; 16, hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_node(struct snd_tscm *tscm, struct snd_info_entry *root,</div><div class='add'>+		     const char *name,</div><div class='add'>+		     void (*op)(struct snd_info_entry *e,</div><div class='add'>+				struct snd_info_buffer *b))</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(tscm-&gt;card, name, root);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, tscm, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_tscm_proc_init(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	struct snd_info_entry *root;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * All nodes are automatically removed at snd_card_disconnect(),</div><div class='add'>+	 * by following to link list.</div><div class='add'>+	 */</div><div class='add'>+	root = snd_info_create_card_entry(tscm-&gt;card, "firewire",</div><div class='add'>+					  tscm-&gt;card-&gt;proc_root);</div><div class='add'>+	if (root == NULL)</div><div class='add'>+		return;</div><div class='add'>+	root-&gt;mode = S_IFDIR | 0555;</div><div class='add'>+</div><div class='add'>+	add_node(tscm, root, "firmware", proc_read_firmware);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c<br/>new file mode 100644<br/>index 000000000000..4ecd151a46c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-stream.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-stream.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+#define CLOCK_STATUS_MASK      0xffff0000</div><div class='add'>+#define CLOCK_CONFIG_MASK      0x0000ffff</div><div class='add'>+</div><div class='add'>+#define READY_TIMEOUT_MS	4000</div><div class='add'>+</div><div class='add'>+static int get_clock(struct snd_tscm *tscm, u32 *data)</div><div class='add'>+{</div><div class='add'>+	int trial = 0;</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	while (trial++ &lt; 5) {</div><div class='add'>+		err = snd_fw_transaction(tscm-&gt;unit, TCODE_READ_QUADLET_REQUEST,</div><div class='add'>+				TSCM_ADDR_BASE + TSCM_OFFSET_CLOCK_STATUS,</div><div class='add'>+				&amp;reg, sizeof(reg), 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		*data = be32_to_cpu(reg);</div><div class='add'>+		if (*data &amp; CLOCK_STATUS_MASK)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		// In intermediate state after changing clock status.</div><div class='add'>+		msleep(50);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// Still in the intermediate state.</div><div class='add'>+	if (trial &gt;= 5)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_clock(struct snd_tscm *tscm, unsigned int rate,</div><div class='add'>+		     enum snd_tscm_clock clock)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock(tscm, &amp;data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	data &amp;= CLOCK_CONFIG_MASK;</div><div class='add'>+</div><div class='add'>+	if (rate &gt; 0) {</div><div class='add'>+		data &amp;= 0x000000ff;</div><div class='add'>+		/* Base rate. */</div><div class='add'>+		if ((rate % 44100) == 0) {</div><div class='add'>+			data |= 0x00000100;</div><div class='add'>+			/* Multiplier. */</div><div class='add'>+			if (rate / 44100 == 2)</div><div class='add'>+				data |= 0x00008000;</div><div class='add'>+		} else if ((rate % 48000) == 0) {</div><div class='add'>+			data |= 0x00000200;</div><div class='add'>+			/* Multiplier. */</div><div class='add'>+			if (rate / 48000 == 2)</div><div class='add'>+				data |= 0x00008000;</div><div class='add'>+		} else {</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clock != INT_MAX) {</div><div class='add'>+		data &amp;= 0x0000ff00;</div><div class='add'>+		data |= clock + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_CLOCK_STATUS,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (data &amp; 0x00008000)</div><div class='add'>+		reg = cpu_to_be32(0x0000001a);</div><div class='add'>+	else</div><div class='add'>+		reg = cpu_to_be32(0x0000000d);</div><div class='add'>+</div><div class='add'>+	return snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  TSCM_ADDR_BASE + TSCM_OFFSET_MULTIPLEX_MODE,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_get_rate(struct snd_tscm *tscm, unsigned int *rate)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock(tscm, &amp;data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = (data &amp; 0xff000000) &gt;&gt; 24;</div><div class='add'>+</div><div class='add'>+	/* Check base rate. */</div><div class='add'>+	if ((data &amp; 0x0f) == 0x01)</div><div class='add'>+		*rate = 44100;</div><div class='add'>+	else if ((data &amp; 0x0f) == 0x02)</div><div class='add'>+		*rate = 48000;</div><div class='add'>+	else</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* Check multiplier. */</div><div class='add'>+	if ((data &amp; 0xf0) == 0x80)</div><div class='add'>+		*rate *= 2;</div><div class='add'>+	else if ((data &amp; 0xf0) != 0x00)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_get_clock(struct snd_tscm *tscm, enum snd_tscm_clock *clock)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = get_clock(tscm, &amp;data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*clock = ((data &amp; 0x00ff0000) &gt;&gt; 16) - 1;</div><div class='add'>+	if (*clock &lt; 0 || *clock &gt; SND_TSCM_CLOCK_ADAT)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enable_data_channels(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	u32 data;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	data = 0;</div><div class='add'>+	for (i = 0; i &lt; tscm-&gt;spec-&gt;pcm_capture_analog_channels; ++i)</div><div class='add'>+		data |= BIT(i);</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_adat)</div><div class='add'>+		data |= 0x0000ff00;</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_spdif)</div><div class='add'>+		data |= 0x00030000;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_TX_PCM_CHANNELS,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	data = 0;</div><div class='add'>+	for (i = 0; i &lt; tscm-&gt;spec-&gt;pcm_playback_analog_channels; ++i)</div><div class='add'>+		data |= BIT(i);</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_adat)</div><div class='add'>+		data |= 0x0000ff00;</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_spdif)</div><div class='add'>+		data |= 0x00030000;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(data);</div><div class='add'>+	return snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  TSCM_ADDR_BASE + TSCM_OFFSET_RX_PCM_CHANNELS,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_stream_formats(struct snd_tscm *tscm, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Set an option for unknown purpose.</div><div class='add'>+	reg = cpu_to_be32(0x00200000);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_SET_OPTION,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return enable_data_channels(tscm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void finish_session(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+</div><div class='add'>+	reg = 0;</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_START_STREAMING,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	reg = 0;</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_RX_ON,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	// Unregister channels.</div><div class='add'>+	reg = cpu_to_be32(0x00000000);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_TX_CH,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+	reg = cpu_to_be32(0x00000000);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_UNKNOWN,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+	reg = cpu_to_be32(0x00000000);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_RX_CH,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int begin_session(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// Register the isochronous channel for transmitting stream.</div><div class='add'>+	reg = cpu_to_be32(tscm-&gt;tx_resources.channel);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_TX_CH,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Unknown.</div><div class='add'>+	reg = cpu_to_be32(0x00000002);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_UNKNOWN,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Register the isochronous channel for receiving stream.</div><div class='add'>+	reg = cpu_to_be32(tscm-&gt;rx_resources.channel);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_RX_CH,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(0x00000001);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_START_STREAMING,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(0x00000001);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_RX_ON,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Set an option for unknown purpose.</div><div class='add'>+	reg = cpu_to_be32(0x00002000);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_SET_OPTION,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	// Start multiplexing PCM samples on packets.</div><div class='add'>+	reg = cpu_to_be32(0x00000001);</div><div class='add'>+	return snd_fw_transaction(tscm-&gt;unit,</div><div class='add'>+				  TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  TSCM_ADDR_BASE + TSCM_OFFSET_ISOC_TX_ON,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int keep_resources(struct snd_tscm *tscm, unsigned int rate,</div><div class='add'>+			  struct amdtp_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	int speed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (stream == &amp;tscm-&gt;tx_stream) {</div><div class='add'>+		resources = &amp;tscm-&gt;tx_resources;</div><div class='add'>+		speed = fw_parent_device(tscm-&gt;unit)-&gt;max_speed;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;tscm-&gt;rx_resources;</div><div class='add'>+		speed = SCODE_400;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_tscm_set_parameters(stream, rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return fw_iso_resources_allocate(resources, amdtp_stream_get_max_payload(stream), speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_stream(struct snd_tscm *tscm, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct fw_iso_resources *resources;</div><div class='add'>+	enum amdtp_stream_direction dir;</div><div class='add'>+	unsigned int pcm_channels;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (s == &amp;tscm-&gt;tx_stream) {</div><div class='add'>+		resources = &amp;tscm-&gt;tx_resources;</div><div class='add'>+		dir = AMDTP_IN_STREAM;</div><div class='add'>+		pcm_channels = tscm-&gt;spec-&gt;pcm_capture_analog_channels;</div><div class='add'>+	} else {</div><div class='add'>+		resources = &amp;tscm-&gt;rx_resources;</div><div class='add'>+		dir = AMDTP_OUT_STREAM;</div><div class='add'>+		pcm_channels = tscm-&gt;spec-&gt;pcm_playback_analog_channels;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_adat)</div><div class='add'>+		pcm_channels += 8;</div><div class='add'>+	if (tscm-&gt;spec-&gt;has_spdif)</div><div class='add'>+		pcm_channels += 2;</div><div class='add'>+</div><div class='add'>+	err = fw_iso_resources_init(resources, tscm-&gt;unit);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = amdtp_tscm_init(s, tscm-&gt;unit, dir, pcm_channels);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		fw_iso_resources_free(resources);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void destroy_stream(struct snd_tscm *tscm, struct amdtp_stream *s)</div><div class='add'>+{</div><div class='add'>+	amdtp_stream_destroy(s);</div><div class='add'>+</div><div class='add'>+	if (s == &amp;tscm-&gt;tx_stream)</div><div class='add'>+		fw_iso_resources_destroy(&amp;tscm-&gt;tx_resources);</div><div class='add'>+	else</div><div class='add'>+		fw_iso_resources_destroy(&amp;tscm-&gt;rx_resources);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_init_duplex(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(tscm, &amp;tscm-&gt;tx_stream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = init_stream(tscm, &amp;tscm-&gt;rx_stream);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(tscm, &amp;tscm-&gt;tx_stream);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = amdtp_domain_init(&amp;tscm-&gt;domain);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		destroy_stream(tscm, &amp;tscm-&gt;tx_stream);</div><div class='add'>+		destroy_stream(tscm, &amp;tscm-&gt;rx_stream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// At bus reset, streaming is stopped and some registers are clear.</div><div class='add'>+void snd_tscm_stream_update_duplex(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_stop(&amp;tscm-&gt;domain);</div><div class='add'>+</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;tscm-&gt;tx_stream);</div><div class='add'>+	amdtp_stream_pcm_abort(&amp;tscm-&gt;rx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This function should be called before starting streams or after stopping</div><div class='add'>+// streams.</div><div class='add'>+void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	amdtp_domain_destroy(&amp;tscm-&gt;domain);</div><div class='add'>+</div><div class='add'>+	destroy_stream(tscm, &amp;tscm-&gt;rx_stream);</div><div class='add'>+	destroy_stream(tscm, &amp;tscm-&gt;tx_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer)</div><div class='add'>+{</div><div class='add'>+	unsigned int curr_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_get_rate(tscm, &amp;curr_rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;substreams_counter == 0 || rate != curr_rate) {</div><div class='add'>+		amdtp_domain_stop(&amp;tscm-&gt;domain);</div><div class='add'>+</div><div class='add'>+		finish_session(tscm);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;tscm-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;tscm-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		err = set_clock(tscm, rate, INT_MAX);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(tscm, rate, &amp;tscm-&gt;tx_stream);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = keep_resources(tscm, rate, &amp;tscm-&gt;rx_stream);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;tscm-&gt;tx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_set_events_per_period(&amp;tscm-&gt;domain,</div><div class='add'>+					frames_per_period, frames_per_buffer);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			fw_iso_resources_free(&amp;tscm-&gt;tx_resources);</div><div class='add'>+			fw_iso_resources_free(&amp;tscm-&gt;rx_resources);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tscm-&gt;need_long_tx_init_skip = (rate != curr_rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int generation = tscm-&gt;rx_resources.generation;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;substreams_counter == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (amdtp_streaming_error(&amp;tscm-&gt;rx_stream) ||</div><div class='add'>+	    amdtp_streaming_error(&amp;tscm-&gt;tx_stream)) {</div><div class='add'>+		amdtp_domain_stop(&amp;tscm-&gt;domain);</div><div class='add'>+		finish_session(tscm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (generation != fw_parent_device(tscm-&gt;unit)-&gt;card-&gt;generation) {</div><div class='add'>+		err = fw_iso_resources_update(&amp;tscm-&gt;tx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = fw_iso_resources_update(&amp;tscm-&gt;rx_resources);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!amdtp_stream_running(&amp;tscm-&gt;rx_stream)) {</div><div class='add'>+		unsigned int tx_init_skip_cycles;</div><div class='add'>+</div><div class='add'>+		err = set_stream_formats(tscm, rate);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = begin_session(tscm);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;tscm-&gt;domain, &amp;tscm-&gt;rx_stream, tscm-&gt;rx_resources.channel,</div><div class='add'>+					      fw_parent_device(tscm-&gt;unit)-&gt;max_speed);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		err = amdtp_domain_add_stream(&amp;tscm-&gt;domain, &amp;tscm-&gt;tx_stream, tscm-&gt;tx_resources.channel,</div><div class='add'>+					      SCODE_400);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (tscm-&gt;need_long_tx_init_skip)</div><div class='add'>+			tx_init_skip_cycles = 16000;</div><div class='add'>+		else</div><div class='add'>+			tx_init_skip_cycles = 0;</div><div class='add'>+</div><div class='add'>+		// MEMO: Just after starting packet streaming, it transfers packets without any</div><div class='add'>+		// event. Enough after receiving the sequence of packets, it multiplexes events into</div><div class='add'>+		// the packet. However, just after changing sampling transfer frequency, it stops</div><div class='add'>+		// multiplexing during packet transmission. Enough after, it restarts multiplexing</div><div class='add'>+		// again. The device ignores presentation time expressed by the value of syt field</div><div class='add'>+		// of CIP header in received packets. The sequence of the number of data blocks per</div><div class='add'>+		// packet is important for media clock recovery.</div><div class='add'>+		err = amdtp_domain_start(&amp;tscm-&gt;domain, tx_init_skip_cycles, true, true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (!amdtp_domain_wait_ready(&amp;tscm-&gt;domain, READY_TIMEOUT_MS)) {</div><div class='add'>+			err = -ETIMEDOUT;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	amdtp_domain_stop(&amp;tscm-&gt;domain);</div><div class='add'>+	finish_session(tscm);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	if (tscm-&gt;substreams_counter == 0) {</div><div class='add'>+		amdtp_domain_stop(&amp;tscm-&gt;domain);</div><div class='add'>+		finish_session(tscm);</div><div class='add'>+</div><div class='add'>+		fw_iso_resources_free(&amp;tscm-&gt;tx_resources);</div><div class='add'>+		fw_iso_resources_free(&amp;tscm-&gt;rx_resources);</div><div class='add'>+</div><div class='add'>+		tscm-&gt;need_long_tx_init_skip = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_tscm_stream_lock_changed(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	tscm-&gt;dev_lock_changed = true;</div><div class='add'>+	wake_up(&amp;tscm-&gt;hwdep_wait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_lock_try(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* user land lock this */</div><div class='add'>+	if (tscm-&gt;dev_lock_count &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* this is the first time */</div><div class='add'>+	if (tscm-&gt;dev_lock_count++ == 0)</div><div class='add'>+		snd_tscm_stream_lock_changed(tscm);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_tscm_stream_lock_release(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;tscm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(tscm-&gt;dev_lock_count &lt;= 0))</div><div class='add'>+		return;</div><div class='add'>+	if (--tscm-&gt;dev_lock_count == 0)</div><div class='add'>+		snd_tscm_stream_lock_changed(tscm);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam-transaction.c b/sound/firewire/tascam/tascam-transaction.c<br/>new file mode 100644<br/>index 000000000000..a073cece4a7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam-transaction.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam-transaction.c</a></div><div class='hunk'>@@ -0,0 +1,399 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam-transaction.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When return minus value, given argument is not MIDI status.</div><div class='add'>+ * When return 0, given argument is a beginning of system exclusive.</div><div class='add'>+ * When return the others, given argument is MIDI data.</div><div class='add'>+ */</div><div class='add'>+static inline int calculate_message_bytes(u8 status)</div><div class='add'>+{</div><div class='add'>+	switch (status) {</div><div class='add'>+	case 0xf6:	/* Tune request. */</div><div class='add'>+	case 0xf8:	/* Timing clock. */</div><div class='add'>+	case 0xfa:	/* Start. */</div><div class='add'>+	case 0xfb:	/* Continue. */</div><div class='add'>+	case 0xfc:	/* Stop. */</div><div class='add'>+	case 0xfe:	/* Active sensing. */</div><div class='add'>+	case 0xff:	/* System reset. */</div><div class='add'>+		return 1;</div><div class='add'>+	case 0xf1:	/* MIDI time code quarter frame. */</div><div class='add'>+	case 0xf3:	/* Song select. */</div><div class='add'>+		return 2;</div><div class='add'>+	case 0xf2:	/* Song position pointer. */</div><div class='add'>+		return 3;</div><div class='add'>+	case 0xf0:	/* Exclusive. */</div><div class='add'>+		return 0;</div><div class='add'>+	case 0xf7:	/* End of exclusive. */</div><div class='add'>+		break;</div><div class='add'>+	case 0xf4:	/* Undefined. */</div><div class='add'>+	case 0xf5:	/* Undefined. */</div><div class='add'>+	case 0xf9:	/* Undefined. */</div><div class='add'>+	case 0xfd:	/* Undefined. */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		switch (status &amp; 0xf0) {</div><div class='add'>+		case 0x80:	/* Note on. */</div><div class='add'>+		case 0x90:	/* Note off. */</div><div class='add'>+		case 0xa0:	/* Polyphonic key pressure. */</div><div class='add'>+		case 0xb0:	/* Control change and Mode change. */</div><div class='add'>+		case 0xe0:	/* Pitch bend change. */</div><div class='add'>+			return 3;</div><div class='add'>+		case 0xc0:	/* Program change. */</div><div class='add'>+		case 0xd0:	/* Channel pressure. */</div><div class='add'>+			return 2;</div><div class='add'>+		default:</div><div class='add'>+		break;</div><div class='add'>+		}</div><div class='add'>+	break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_message(struct snd_fw_async_midi_port *port,</div><div class='add'>+			struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int i, len, consume;</div><div class='add'>+	u8 *label, *msg;</div><div class='add'>+	u8 status;</div><div class='add'>+</div><div class='add'>+	/* The first byte is used for label, the rest for MIDI bytes. */</div><div class='add'>+	label = port-&gt;buf;</div><div class='add'>+	msg = port-&gt;buf + 1;</div><div class='add'>+</div><div class='add'>+	consume = snd_rawmidi_transmit_peek(substream, msg, 3);</div><div class='add'>+	if (consume == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* On exclusive message. */</div><div class='add'>+	if (port-&gt;on_sysex) {</div><div class='add'>+		/* Seek the end of exclusives. */</div><div class='add'>+		for (i = 0; i &lt; consume; ++i) {</div><div class='add'>+			if (msg[i] == 0xf7) {</div><div class='add'>+				port-&gt;on_sysex = false;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* At the end of exclusive message, use label 0x07. */</div><div class='add'>+		if (!port-&gt;on_sysex) {</div><div class='add'>+			consume = i + 1;</div><div class='add'>+			*label = (substream-&gt;number &lt;&lt; 4) | 0x07;</div><div class='add'>+		/* During exclusive message, use label 0x04. */</div><div class='add'>+		} else if (consume == 3) {</div><div class='add'>+			*label = (substream-&gt;number &lt;&lt; 4) | 0x04;</div><div class='add'>+		/* We need to fill whole 3 bytes. Go to next change. */</div><div class='add'>+		} else {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = consume;</div><div class='add'>+	} else {</div><div class='add'>+		/* The beginning of exclusives. */</div><div class='add'>+		if (msg[0] == 0xf0) {</div><div class='add'>+			/* Transfer it in next chance in another condition. */</div><div class='add'>+			port-&gt;on_sysex = true;</div><div class='add'>+			return 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* On running-status. */</div><div class='add'>+			if ((msg[0] &amp; 0x80) != 0x80)</div><div class='add'>+				status = port-&gt;running_status;</div><div class='add'>+			else</div><div class='add'>+				status = msg[0];</div><div class='add'>+</div><div class='add'>+			/* Calculate consume bytes. */</div><div class='add'>+			len = calculate_message_bytes(status);</div><div class='add'>+			if (len &lt;= 0)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			/* On running-status. */</div><div class='add'>+			if ((msg[0] &amp; 0x80) != 0x80) {</div><div class='add'>+				/* Enough MIDI bytes were not retrieved. */</div><div class='add'>+				if (consume &lt; len - 1)</div><div class='add'>+					return 0;</div><div class='add'>+				consume = len - 1;</div><div class='add'>+</div><div class='add'>+				msg[2] = msg[1];</div><div class='add'>+				msg[1] = msg[0];</div><div class='add'>+				msg[0] = port-&gt;running_status;</div><div class='add'>+			} else {</div><div class='add'>+				/* Enough MIDI bytes were not retrieved. */</div><div class='add'>+				if (consume &lt; len)</div><div class='add'>+					return 0;</div><div class='add'>+				consume = len;</div><div class='add'>+</div><div class='add'>+				port-&gt;running_status = msg[0];</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*label = (substream-&gt;number &lt;&lt; 4) | (msg[0] &gt;&gt; 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &gt; 0 &amp;&amp; len &lt; 3)</div><div class='add'>+		memset(msg + len, 0, 3 - len);</div><div class='add'>+</div><div class='add'>+	return consume;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void async_midi_port_callback(struct fw_card *card, int rcode,</div><div class='add'>+				     void *data, size_t length,</div><div class='add'>+				     void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_fw_async_midi_port *port = callback_data;</div><div class='add'>+	struct snd_rawmidi_substream *substream = READ_ONCE(port-&gt;substream);</div><div class='add'>+</div><div class='add'>+	/* This port is closed. */</div><div class='add'>+	if (substream == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (rcode == RCODE_COMPLETE)</div><div class='add'>+		snd_rawmidi_transmit_ack(substream, port-&gt;consume_bytes);</div><div class='add'>+	else if (!rcode_is_permanent_error(rcode))</div><div class='add'>+		/* To start next transaction immediately for recovery. */</div><div class='add'>+		port-&gt;next_ktime = 0;</div><div class='add'>+	else</div><div class='add'>+		/* Don't continue processing. */</div><div class='add'>+		port-&gt;error = true;</div><div class='add'>+</div><div class='add'>+	port-&gt;idling = true;</div><div class='add'>+</div><div class='add'>+	if (!snd_rawmidi_transmit_empty(substream))</div><div class='add'>+		schedule_work(&amp;port-&gt;work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void midi_port_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_fw_async_midi_port *port =</div><div class='add'>+			container_of(work, struct snd_fw_async_midi_port, work);</div><div class='add'>+	struct snd_rawmidi_substream *substream = READ_ONCE(port-&gt;substream);</div><div class='add'>+	int generation;</div><div class='add'>+</div><div class='add'>+	/* Under transacting or error state. */</div><div class='add'>+	if (!port-&gt;idling || port-&gt;error)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Nothing to do. */</div><div class='add'>+	if (substream == NULL || snd_rawmidi_transmit_empty(substream))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Do it in next chance. */</div><div class='add'>+	if (ktime_after(port-&gt;next_ktime, ktime_get())) {</div><div class='add'>+		schedule_work(&amp;port-&gt;work);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fill the buffer. The callee must use snd_rawmidi_transmit_peek().</div><div class='add'>+	 * Later, snd_rawmidi_transmit_ack() is called.</div><div class='add'>+	 */</div><div class='add'>+	memset(port-&gt;buf, 0, 4);</div><div class='add'>+	port-&gt;consume_bytes = fill_message(port, substream);</div><div class='add'>+	if (port-&gt;consume_bytes &lt;= 0) {</div><div class='add'>+		/* Do it in next chance, immediately. */</div><div class='add'>+		if (port-&gt;consume_bytes == 0) {</div><div class='add'>+			port-&gt;next_ktime = 0;</div><div class='add'>+			schedule_work(&amp;port-&gt;work);</div><div class='add'>+		} else {</div><div class='add'>+			/* Fatal error. */</div><div class='add'>+			port-&gt;error = true;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set interval to next transaction. */</div><div class='add'>+	port-&gt;next_ktime = ktime_add_ns(ktime_get(),</div><div class='add'>+			port-&gt;consume_bytes * 8 * (NSEC_PER_SEC / 31250));</div><div class='add'>+</div><div class='add'>+	/* Start this transaction. */</div><div class='add'>+	port-&gt;idling = false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In Linux FireWire core, when generation is updated with memory</div><div class='add'>+	 * barrier, node id has already been updated. In this module, After</div><div class='add'>+	 * this smp_rmb(), load/store instructions to memory are completed.</div><div class='add'>+	 * Thus, both of generation and node id are available with recent</div><div class='add'>+	 * values. This is a light-serialization solution to handle bus reset</div><div class='add'>+	 * events on IEEE 1394 bus.</div><div class='add'>+	 */</div><div class='add'>+	generation = port-&gt;parent-&gt;generation;</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	fw_send_request(port-&gt;parent-&gt;card, &amp;port-&gt;transaction,</div><div class='add'>+			TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			port-&gt;parent-&gt;node_id, generation,</div><div class='add'>+			port-&gt;parent-&gt;max_speed,</div><div class='add'>+			TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_RX_QUAD,</div><div class='add'>+			port-&gt;buf, 4, async_midi_port_callback,</div><div class='add'>+			port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port)</div><div class='add'>+{</div><div class='add'>+	port-&gt;idling = true;</div><div class='add'>+	port-&gt;error = false;</div><div class='add'>+	port-&gt;running_status = 0;</div><div class='add'>+	port-&gt;on_sysex = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_midi_tx(struct fw_card *card, struct fw_request *request,</div><div class='add'>+			   int tcode, int destination, int source,</div><div class='add'>+			   int generation, unsigned long long offset,</div><div class='add'>+			   void *data, size_t length, void *callback_data)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = callback_data;</div><div class='add'>+	u32 *buf = (u32 *)data;</div><div class='add'>+	unsigned int messages;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int port;</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	u8 *b;</div><div class='add'>+	int bytes;</div><div class='add'>+</div><div class='add'>+	if (offset != tscm-&gt;async_handler.offset)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	messages = length / 8;</div><div class='add'>+	for (i = 0; i &lt; messages; i++) {</div><div class='add'>+		b = (u8 *)(buf + i * 2);</div><div class='add'>+</div><div class='add'>+		port = b[0] &gt;&gt; 4;</div><div class='add'>+		/* TODO: support virtual MIDI ports. */</div><div class='add'>+		if (port &gt;= tscm-&gt;spec-&gt;midi_capture_ports)</div><div class='add'>+			goto end;</div><div class='add'>+</div><div class='add'>+		/* Assume the message length. */</div><div class='add'>+		bytes = calculate_message_bytes(b[1]);</div><div class='add'>+		/* On MIDI data or exclusives. */</div><div class='add'>+		if (bytes &lt;= 0) {</div><div class='add'>+			/* Seek the end of exclusives. */</div><div class='add'>+			for (bytes = 1; bytes &lt; 4; bytes++) {</div><div class='add'>+				if (b[bytes] == 0xf7)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			if (bytes == 4)</div><div class='add'>+				bytes = 3;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		substream = READ_ONCE(tscm-&gt;tx_midi_substreams[port]);</div><div class='add'>+		if (substream != NULL)</div><div class='add'>+			snd_rawmidi_receive(substream, b + 1, bytes);</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	fw_send_response(card, request, RCODE_COMPLETE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_transaction_register(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	static const struct fw_address_region resp_register_region = {</div><div class='add'>+		.start	= 0xffffe0000000ull,</div><div class='add'>+		.end	= 0xffffe000ffffull,</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Usually, two quadlets are transferred by one transaction. The first</div><div class='add'>+	 * quadlet has MIDI messages, the rest includes timestamp.</div><div class='add'>+	 * Sometimes, 8 set of the data is transferred by a block transaction.</div><div class='add'>+	 */</div><div class='add'>+	tscm-&gt;async_handler.length = 8 * 8;</div><div class='add'>+	tscm-&gt;async_handler.address_callback = handle_midi_tx;</div><div class='add'>+	tscm-&gt;async_handler.callback_data = tscm;</div><div class='add'>+</div><div class='add'>+	err = fw_core_add_address_handler(&amp;tscm-&gt;async_handler,</div><div class='add'>+					  &amp;resp_register_region);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_transaction_reregister(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSCM_MIDI_OUT_PORT_MAX; i++) {</div><div class='add'>+		tscm-&gt;out_ports[i].parent = fw_parent_device(tscm-&gt;unit);</div><div class='add'>+		tscm-&gt;out_ports[i].next_ktime = 0;</div><div class='add'>+		INIT_WORK(&amp;tscm-&gt;out_ports[i].work, midi_port_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+error:</div><div class='add'>+	fw_core_remove_address_handler(&amp;tscm-&gt;async_handler);</div><div class='add'>+	tscm-&gt;async_handler.callback_data = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* At bus reset, these registers are cleared. */</div><div class='add'>+int snd_tscm_transaction_reregister(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *device = fw_parent_device(tscm-&gt;unit);</div><div class='add'>+	__be32 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Register messaging address. Block transaction is not allowed. */</div><div class='add'>+	reg = cpu_to_be32((device-&gt;card-&gt;node_id &lt;&lt; 16) |</div><div class='add'>+			  (tscm-&gt;async_handler.offset &gt;&gt; 32));</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ADDR_HI,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg = cpu_to_be32(tscm-&gt;async_handler.offset);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				 TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ADDR_LO,</div><div class='add'>+				 &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Turn on messaging. */</div><div class='add'>+	reg = cpu_to_be32(0x00000001);</div><div class='add'>+	err = snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ON,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Turn on FireWire LED. */</div><div class='add'>+	reg = cpu_to_be32(0x0001008e);</div><div class='add'>+	return snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+				  TSCM_ADDR_BASE + TSCM_OFFSET_LED_POWER,</div><div class='add'>+				  &amp;reg, sizeof(reg), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_tscm_transaction_unregister(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	__be32 reg;</div><div class='add'>+</div><div class='add'>+	if (tscm-&gt;async_handler.callback_data == NULL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Turn off FireWire LED. */</div><div class='add'>+	reg = cpu_to_be32(0x0000008e);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_LED_POWER,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	/* Turn off messaging. */</div><div class='add'>+	reg = cpu_to_be32(0x00000000);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ON,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	/* Unregister the address. */</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ADDR_HI,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+	snd_fw_transaction(tscm-&gt;unit, TCODE_WRITE_QUADLET_REQUEST,</div><div class='add'>+			   TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ADDR_LO,</div><div class='add'>+			   &amp;reg, sizeof(reg), 0);</div><div class='add'>+</div><div class='add'>+	fw_core_remove_address_handler(&amp;tscm-&gt;async_handler);</div><div class='add'>+	tscm-&gt;async_handler.callback_data = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c<br/>new file mode 100644<br/>index 000000000000..f4092df8650c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam.c</a></div><div class='hunk'>@@ -0,0 +1,235 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * tascam.c - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tascam.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("TASCAM FireWire series Driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Sakamoto &lt;o-takashi@sakamocchi.jp&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+static const struct snd_tscm_spec model_specs[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "FW-1884",</div><div class='add'>+		.has_adat = true,</div><div class='add'>+		.has_spdif = true,</div><div class='add'>+		.pcm_capture_analog_channels = 8,</div><div class='add'>+		.pcm_playback_analog_channels = 8,</div><div class='add'>+		.midi_capture_ports = 4,</div><div class='add'>+		.midi_playback_ports = 4,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "FW-1082",</div><div class='add'>+		.has_adat = false,</div><div class='add'>+		.has_spdif = true,</div><div class='add'>+		.pcm_capture_analog_channels = 8,</div><div class='add'>+		.pcm_playback_analog_channels = 2,</div><div class='add'>+		.midi_capture_ports = 2,</div><div class='add'>+		.midi_playback_ports = 2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "FW-1804",</div><div class='add'>+		.has_adat = true,</div><div class='add'>+		.has_spdif = true,</div><div class='add'>+		.pcm_capture_analog_channels = 8,</div><div class='add'>+		.pcm_playback_analog_channels = 2,</div><div class='add'>+		.midi_capture_ports = 2,</div><div class='add'>+		.midi_playback_ports = 4,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int identify_model(struct snd_tscm *tscm)</div><div class='add'>+{</div><div class='add'>+	struct fw_device *fw_dev = fw_parent_device(tscm-&gt;unit);</div><div class='add'>+	const u32 *config_rom = fw_dev-&gt;config_rom;</div><div class='add'>+	char model[9];</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u8 c;</div><div class='add'>+</div><div class='add'>+	if (fw_dev-&gt;config_rom_length &lt; 30) {</div><div class='add'>+		dev_err(&amp;tscm-&gt;unit-&gt;device,</div><div class='add'>+			"Configuration ROM is too short.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Pick up model name from certain addresses. */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		c = config_rom[28 + i / 4] &gt;&gt; (24 - 8 * (i % 4));</div><div class='add'>+		if (c == '\0')</div><div class='add'>+			break;</div><div class='add'>+		model[i] = c;</div><div class='add'>+	}</div><div class='add'>+	model[i] = '\0';</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(model_specs); i++) {</div><div class='add'>+		if (strcmp(model, model_specs[i].name) == 0) {</div><div class='add'>+			tscm-&gt;spec = &amp;model_specs[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (tscm-&gt;spec == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	strscpy(tscm-&gt;card-&gt;driver, "FW-TASCAM");</div><div class='add'>+	strscpy(tscm-&gt;card-&gt;shortname, model);</div><div class='add'>+	strscpy(tscm-&gt;card-&gt;mixername, model);</div><div class='add'>+	snprintf(tscm-&gt;card-&gt;longname, sizeof(tscm-&gt;card-&gt;longname),</div><div class='add'>+		 "TASCAM %s, GUID %08x%08x at %s, S%d", model,</div><div class='add'>+		 fw_dev-&gt;config_rom[3], fw_dev-&gt;config_rom[4],</div><div class='add'>+		 dev_name(&amp;tscm-&gt;unit-&gt;device), 100 &lt;&lt; fw_dev-&gt;max_speed);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tscm_card_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_tscm_transaction_unregister(tscm);</div><div class='add'>+	snd_tscm_stream_destroy_duplex(tscm);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;tscm-&gt;mutex);</div><div class='add'>+	fw_unit_put(tscm-&gt;unit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_tscm_probe(struct fw_unit *unit,</div><div class='add'>+			   const struct ieee1394_device_id *entry)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_tscm *tscm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;unit-&gt;device, -1, NULL, THIS_MODULE, sizeof(*tscm), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = tscm_card_free;</div><div class='add'>+</div><div class='add'>+	tscm = card-&gt;private_data;</div><div class='add'>+	tscm-&gt;unit = fw_unit_get(unit);</div><div class='add'>+	dev_set_drvdata(&amp;unit-&gt;device, tscm);</div><div class='add'>+	tscm-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;tscm-&gt;mutex);</div><div class='add'>+	spin_lock_init(&amp;tscm-&gt;lock);</div><div class='add'>+	init_waitqueue_head(&amp;tscm-&gt;hwdep_wait);</div><div class='add'>+</div><div class='add'>+	err = identify_model(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_transaction_register(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_stream_init_duplex(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_tscm_proc_init(tscm);</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_create_pcm_devices(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_create_midi_devices(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_tscm_create_hwdep_device(tscm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_tscm_update(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	snd_tscm_transaction_reregister(tscm);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tscm-&gt;mutex);</div><div class='add'>+	snd_tscm_stream_update_duplex(tscm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_tscm_remove(struct fw_unit *unit)</div><div class='add'>+{</div><div class='add'>+	struct snd_tscm *tscm = dev_get_drvdata(&amp;unit-&gt;device);</div><div class='add'>+</div><div class='add'>+	// Block till all of ALSA character devices are released.</div><div class='add'>+	snd_card_free(tscm-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ieee1394_device_id snd_tscm_id_table[] = {</div><div class='add'>+	// Tascam, FW-1884.</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+			       IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+			       IEEE1394_MATCH_VERSION,</div><div class='add'>+		.vendor_id = 0x00022e,</div><div class='add'>+		.specifier_id = 0x00022e,</div><div class='add'>+		.version = 0x800000,</div><div class='add'>+	},</div><div class='add'>+	// Tascam, FE-8 (.version = 0x800001)</div><div class='add'>+	// This kernel module doesn't support FE-8 because the most of features</div><div class='add'>+	// can be implemented in userspace without any specific support of this</div><div class='add'>+	// module.</div><div class='add'>+	//</div><div class='add'>+	// .version = 0x800002 is unknown.</div><div class='add'>+	//</div><div class='add'>+	// Tascam, FW-1082.</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+			       IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+			       IEEE1394_MATCH_VERSION,</div><div class='add'>+		.vendor_id = 0x00022e,</div><div class='add'>+		.specifier_id = 0x00022e,</div><div class='add'>+		.version = 0x800003,</div><div class='add'>+	},</div><div class='add'>+	// Tascam, FW-1804.</div><div class='add'>+	{</div><div class='add'>+		.match_flags = IEEE1394_MATCH_VENDOR_ID |</div><div class='add'>+			       IEEE1394_MATCH_SPECIFIER_ID |</div><div class='add'>+			       IEEE1394_MATCH_VERSION,</div><div class='add'>+		.vendor_id = 0x00022e,</div><div class='add'>+		.specifier_id = 0x00022e,</div><div class='add'>+		.version = 0x800004,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(ieee1394, snd_tscm_id_table);</div><div class='add'>+</div><div class='add'>+static struct fw_driver tscm_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.owner = THIS_MODULE,</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.bus = &amp;fw_bus_type,</div><div class='add'>+	},</div><div class='add'>+	.probe    = snd_tscm_probe,</div><div class='add'>+	.update   = snd_tscm_update,</div><div class='add'>+	.remove   = snd_tscm_remove,</div><div class='add'>+	.id_table = snd_tscm_id_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init snd_tscm_init(void)</div><div class='add'>+{</div><div class='add'>+	return driver_register(&amp;tscm_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit snd_tscm_exit(void)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;tscm_driver.driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(snd_tscm_init);</div><div class='add'>+module_exit(snd_tscm_exit);</div><div class='head'>diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h<br/>new file mode 100644<br/>index 000000000000..d07ffcb27be6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/firewire/tascam/tascam.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/firewire/tascam/tascam.h</a></div><div class='hunk'>@@ -0,0 +1,212 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * tascam.h - a part of driver for TASCAM FireWire series</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2015 Takashi Sakamoto</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef SOUND_TASCAM_H_INCLUDED</div><div class='add'>+#define SOUND_TASCAM_H_INCLUDED</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/firewire.h&gt;</div><div class='add'>+#include &lt;linux/firewire-constants.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include &lt;sound/firewire.h&gt;</div><div class='add'>+#include &lt;sound/hwdep.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../lib.h"</div><div class='add'>+#include "../amdtp-stream.h"</div><div class='add'>+#include "../iso-resources.h"</div><div class='add'>+</div><div class='add'>+struct snd_tscm_spec {</div><div class='add'>+	const char *const name;</div><div class='add'>+	bool has_adat;</div><div class='add'>+	bool has_spdif;</div><div class='add'>+	unsigned int pcm_capture_analog_channels;</div><div class='add'>+	unsigned int pcm_playback_analog_channels;</div><div class='add'>+	unsigned int midi_capture_ports;</div><div class='add'>+	unsigned int midi_playback_ports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSCM_MIDI_IN_PORT_MAX	4</div><div class='add'>+#define TSCM_MIDI_OUT_PORT_MAX	4</div><div class='add'>+</div><div class='add'>+struct snd_fw_async_midi_port {</div><div class='add'>+	struct fw_device *parent;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	bool idling;</div><div class='add'>+	ktime_t next_ktime;</div><div class='add'>+	bool error;</div><div class='add'>+</div><div class='add'>+	struct fw_transaction transaction;</div><div class='add'>+</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	u8 running_status;</div><div class='add'>+	bool on_sysex;</div><div class='add'>+</div><div class='add'>+	struct snd_rawmidi_substream *substream;</div><div class='add'>+	int consume_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define SND_TSCM_QUEUE_COUNT	16</div><div class='add'>+</div><div class='add'>+struct snd_tscm {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct fw_unit *unit;</div><div class='add'>+</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	const struct snd_tscm_spec *spec;</div><div class='add'>+</div><div class='add'>+	struct fw_iso_resources tx_resources;</div><div class='add'>+	struct fw_iso_resources rx_resources;</div><div class='add'>+	struct amdtp_stream tx_stream;</div><div class='add'>+	struct amdtp_stream rx_stream;</div><div class='add'>+	unsigned int substreams_counter;</div><div class='add'>+</div><div class='add'>+	int dev_lock_count;</div><div class='add'>+	bool dev_lock_changed;</div><div class='add'>+	wait_queue_head_t hwdep_wait;</div><div class='add'>+</div><div class='add'>+	/* For MIDI message incoming transactions. */</div><div class='add'>+	struct fw_address_handler async_handler;</div><div class='add'>+	struct snd_rawmidi_substream *tx_midi_substreams[TSCM_MIDI_IN_PORT_MAX];</div><div class='add'>+</div><div class='add'>+	/* For MIDI message outgoing transactions. */</div><div class='add'>+	struct snd_fw_async_midi_port out_ports[TSCM_MIDI_OUT_PORT_MAX];</div><div class='add'>+</div><div class='add'>+	// A cache of status information in tx isoc packets.</div><div class='add'>+	__be32 state[SNDRV_FIREWIRE_TASCAM_STATE_COUNT];</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	struct snd_firewire_tascam_change queue[SND_TSCM_QUEUE_COUNT];</div><div class='add'>+	unsigned int pull_pos;</div><div class='add'>+	unsigned int push_pos;</div><div class='add'>+</div><div class='add'>+	struct amdtp_domain domain;</div><div class='add'>+	bool need_long_tx_init_skip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSCM_ADDR_BASE			0xffff00000000ull</div><div class='add'>+</div><div class='add'>+#define TSCM_OFFSET_FIRMWARE_REGISTER	0x0000</div><div class='add'>+#define TSCM_OFFSET_FIRMWARE_FPGA	0x0004</div><div class='add'>+#define TSCM_OFFSET_FIRMWARE_ARM	0x0008</div><div class='add'>+#define TSCM_OFFSET_FIRMWARE_HW		0x000c</div><div class='add'>+</div><div class='add'>+#define TSCM_OFFSET_ISOC_TX_CH		0x0200</div><div class='add'>+#define TSCM_OFFSET_UNKNOWN		0x0204</div><div class='add'>+#define TSCM_OFFSET_START_STREAMING	0x0208</div><div class='add'>+#define TSCM_OFFSET_ISOC_RX_CH		0x020c</div><div class='add'>+#define TSCM_OFFSET_ISOC_RX_ON		0x0210	/* Little conviction. */</div><div class='add'>+#define TSCM_OFFSET_TX_PCM_CHANNELS	0x0214</div><div class='add'>+#define TSCM_OFFSET_RX_PCM_CHANNELS	0x0218</div><div class='add'>+#define TSCM_OFFSET_MULTIPLEX_MODE	0x021c</div><div class='add'>+#define TSCM_OFFSET_ISOC_TX_ON		0x0220</div><div class='add'>+/* Unknown				0x0224 */</div><div class='add'>+#define TSCM_OFFSET_CLOCK_STATUS	0x0228</div><div class='add'>+#define TSCM_OFFSET_SET_OPTION		0x022c</div><div class='add'>+</div><div class='add'>+#define TSCM_OFFSET_MIDI_TX_ON		0x0300</div><div class='add'>+#define TSCM_OFFSET_MIDI_TX_ADDR_HI	0x0304</div><div class='add'>+#define TSCM_OFFSET_MIDI_TX_ADDR_LO	0x0308</div><div class='add'>+</div><div class='add'>+#define TSCM_OFFSET_LED_POWER		0x0404</div><div class='add'>+</div><div class='add'>+#define TSCM_OFFSET_MIDI_RX_QUAD	0x4000</div><div class='add'>+</div><div class='add'>+// Although FE-8 supports the above registers, it has no I/O interfaces for</div><div class='add'>+// audio samples and music messages. Otherwise it supports another notification</div><div class='add'>+// for status and control message as well as LED brightening. The message</div><div class='add'>+// consists of quadlet-aligned data up to 32 quadlets. The first byte of message</div><div class='add'>+// is fixed to 0x40. The second byte is between 0x00 to 0x1f and represent each</div><div class='add'>+// control:</div><div class='add'>+//   fader:	0x00-0x07</div><div class='add'>+//   button:	0x0d, 0x0e</div><div class='add'>+//   knob:	0x14-0x1b</div><div class='add'>+//   sensing:	0x0b</div><div class='add'>+//</div><div class='add'>+// The rest two bytes represent state of the controls; e.g. current value for</div><div class='add'>+// fader and knob, bitmasks for button and sensing.</div><div class='add'>+// Just after turning on, 32 quadlets messages with 0x00-0x1f are immediately</div><div class='add'>+// sent in one transaction. After, several quadlets are sent in one transaction.</div><div class='add'>+//</div><div class='add'>+// TSCM_OFFSET_FE8_CTL_TX_ON		0x0310</div><div class='add'>+// TSCM_OFFSET_FE8_CTL_TX_ADDR_HI	0x0314</div><div class='add'>+// TSCM_OFFSET_FE8_CTL_TX_ADDR_LO	0x0318</div><div class='add'>+</div><div class='add'>+enum snd_tscm_clock {</div><div class='add'>+	SND_TSCM_CLOCK_INTERNAL = 0,</div><div class='add'>+	SND_TSCM_CLOCK_WORD	= 1,</div><div class='add'>+	SND_TSCM_CLOCK_SPDIF	= 2,</div><div class='add'>+	SND_TSCM_CLOCK_ADAT	= 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit,</div><div class='add'>+		  enum amdtp_stream_direction dir, unsigned int pcm_channels);</div><div class='add'>+int amdtp_tscm_set_parameters(struct amdtp_stream *s, unsigned int rate);</div><div class='add'>+int amdtp_tscm_add_pcm_hw_constraints(struct amdtp_stream *s,</div><div class='add'>+				      struct snd_pcm_runtime *runtime);</div><div class='add'>+</div><div class='add'>+int snd_tscm_stream_get_rate(struct snd_tscm *tscm, unsigned int *rate);</div><div class='add'>+int snd_tscm_stream_get_clock(struct snd_tscm *tscm,</div><div class='add'>+			      enum snd_tscm_clock *clock);</div><div class='add'>+int snd_tscm_stream_init_duplex(struct snd_tscm *tscm);</div><div class='add'>+void snd_tscm_stream_update_duplex(struct snd_tscm *tscm);</div><div class='add'>+void snd_tscm_stream_destroy_duplex(struct snd_tscm *tscm);</div><div class='add'>+int snd_tscm_stream_reserve_duplex(struct snd_tscm *tscm, unsigned int rate,</div><div class='add'>+				   unsigned int frames_per_period,</div><div class='add'>+				   unsigned int frames_per_buffer);</div><div class='add'>+int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate);</div><div class='add'>+void snd_tscm_stream_stop_duplex(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+void snd_tscm_stream_lock_changed(struct snd_tscm *tscm);</div><div class='add'>+int snd_tscm_stream_lock_try(struct snd_tscm *tscm);</div><div class='add'>+void snd_tscm_stream_lock_release(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+void snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port);</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_fw_async_midi_port_run(struct snd_fw_async_midi_port *port,</div><div class='add'>+			   struct snd_rawmidi_substream *substream)</div><div class='add'>+{</div><div class='add'>+	if (!port-&gt;error) {</div><div class='add'>+		port-&gt;substream = substream;</div><div class='add'>+		schedule_work(&amp;port-&gt;work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_fw_async_midi_port_finish(struct snd_fw_async_midi_port *port)</div><div class='add'>+{</div><div class='add'>+	port-&gt;substream = NULL;</div><div class='add'>+	cancel_work_sync(&amp;port-&gt;work);</div><div class='add'>+	port-&gt;error = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_tscm_transaction_register(struct snd_tscm *tscm);</div><div class='add'>+int snd_tscm_transaction_reregister(struct snd_tscm *tscm);</div><div class='add'>+void snd_tscm_transaction_unregister(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+void snd_tscm_proc_init(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_pcm_devices(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_midi_devices(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+int snd_tscm_create_hwdep_device(struct snd_tscm *tscm);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig<br/>new file mode 100644<br/>index 000000000000..7797f44b3d0c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+menu "HD-Audio"</div><div class='add'>+</div><div class='add'>+source "sound/hda/common/Kconfig"</div><div class='add'>+source "sound/hda/controllers/Kconfig"</div><div class='add'>+source "sound/hda/codecs/Kconfig"</div><div class='add'>+source "sound/hda/core/Kconfig"</div><div class='add'>+</div><div class='add'>+endmenu</div><div class='head'>diff --git a/sound/hda/Makefile b/sound/hda/Makefile<br/>new file mode 100644<br/>index 000000000000..d9a6def582ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-y += core/</div><div class='add'>+obj-$(CONFIG_SND_HDA) += common/</div><div class='add'>+obj-$(CONFIG_SND_HDA) += codecs/</div><div class='add'>+# this must be the last entry after codec drivers;</div><div class='add'>+# otherwise the codec drivers won't be hooked before the PCI probe</div><div class='add'>+# when built in kernel</div><div class='add'>+obj-$(CONFIG_SND_HDA) += controllers/</div><div class='head'>diff --git a/sound/hda/codecs/Kconfig b/sound/hda/codecs/Kconfig<br/>new file mode 100644<br/>index 000000000000..addbc9424336<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+if SND_HDA</div><div class='add'>+</div><div class='add'>+config SND_HDA_GENERIC_LEDS</div><div class='add'>+       bool</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ANALOG</div><div class='add'>+	tristate "Build Analog Devices HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Analog Devices HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as AD1986A.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_ANALOG=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_SIGMATEL</div><div class='add'>+	tristate "Build IDT/Sigmatel HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_HDA_GENERIC_LEDS</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include IDT (Sigmatel) HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as STAC9200.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_SIGMATEL=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_VIA</div><div class='add'>+	tristate "Build VIA HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include VIA HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as VT1708.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_VIA=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CONEXANT</div><div class='add'>+	tristate "Build Conexant HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_HDA_GENERIC_LEDS</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Conexant HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as CX20549.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CONEXANT=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_SENARYTECH</div><div class='add'>+	tristate "Build Senarytech HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_HDA_GENERIC_LEDS</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Senarytech HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as SN6186.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_SENARYTECH=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CA0110</div><div class='add'>+	tristate "Build Creative CA0110-IBG codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Creative CA0110-IBG codec support in</div><div class='add'>+	  snd-hda-intel driver, found on some Creative X-Fi cards.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CA0110=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CA0132</div><div class='add'>+	tristate "Build Creative CA0132 codec support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Creative CA0132 codec support in</div><div class='add'>+	  snd-hda-intel driver.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CA0132=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CA0132_DSP</div><div class='add'>+	bool "Support new DSP code for CA0132 codec"</div><div class='add'>+	depends on SND_HDA_CODEC_CA0132</div><div class='add'>+	default y</div><div class='add'>+	select SND_HDA_DSP_LOADER</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable the DSP for Creative CA0132 for extended</div><div class='add'>+	  features like equalizer or echo cancellation.</div><div class='add'>+</div><div class='add'>+	  Note that this option requires the external firmware file</div><div class='add'>+	  (ctefx.bin).</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CMEDIA</div><div class='add'>+	tristate "Build C-Media HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include C-Media HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver, such as CMI9880.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CMEDIA=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CM9825</div><div class='add'>+	tristate "Build C-Media CM9825 HD-audio codec support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include C-Media CM9825 HD-audio codec support in</div><div class='add'>+	  snd-hda-intel driver</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CM9825=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_SI3054</div><div class='add'>+	tristate "Build Silicon Labs 3054 HD-modem codec support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Silicon Labs 3054 HD-modem codec</div><div class='add'>+	  (and compatibles) support in snd-hda-intel driver.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_SI3054=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_GENERIC</div><div class='add'>+	tristate "Enable generic HD-audio codec parser"</div><div class='add'>+	select SND_CTL_LED if SND_HDA_GENERIC_LEDS</div><div class='add'>+	select LEDS_CLASS if SND_HDA_GENERIC_LEDS</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to enable the generic HD-audio codec parser</div><div class='add'>+	  in snd-hda-intel driver.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_GENERIC=m</div><div class='add'>+</div><div class='add'>+source "sound/hda/codecs/realtek/Kconfig"</div><div class='add'>+source "sound/hda/codecs/cirrus/Kconfig"</div><div class='add'>+source "sound/hda/codecs/hdmi/Kconfig"</div><div class='add'>+source "sound/hda/codecs/side-codecs/Kconfig"</div><div class='add'>+</div><div class='add'>+endif # SND_HDA</div><div class='head'>diff --git a/sound/hda/codecs/Makefile b/sound/hda/codecs/Makefile<br/>new file mode 100644<br/>index 000000000000..e7f03e281999<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/Makefile</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+subdir-ccflags-y += -I$(src)/../common</div><div class='add'>+</div><div class='add'>+snd-hda-codec-generic-y :=	generic.o</div><div class='add'>+snd-hda-codec-cmedia-y :=	cmedia.o</div><div class='add'>+snd-hda-codec-cm9825-y :=	cm9825.o</div><div class='add'>+snd-hda-codec-analog-y :=	analog.o</div><div class='add'>+snd-hda-codec-ca0110-y :=	ca0110.o</div><div class='add'>+snd-hda-codec-ca0132-y :=	ca0132.o</div><div class='add'>+snd-hda-codec-cmedia-y :=	cmedia.o</div><div class='add'>+snd-hda-codec-conexant-y :=	conexant.o</div><div class='add'>+snd-hda-codec-idt-y :=		sigmatel.o</div><div class='add'>+snd-hda-codec-senarytech-y :=	senarytech.o</div><div class='add'>+snd-hda-codec-si3054-y :=	si3054.o</div><div class='add'>+snd-hda-codec-via-y :=		via.o</div><div class='add'>+</div><div class='add'>+obj-y += cirrus/</div><div class='add'>+obj-y += hdmi/</div><div class='add'>+obj-y += realtek/</div><div class='add'>+obj-y += side-codecs/</div><div class='add'>+</div><div class='add'>+# codec drivers</div><div class='add'>+obj-$(CONFIG_SND_HDA_GENERIC) += snd-hda-codec-generic.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CMEDIA) += snd-hda-codec-cmedia.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CM9825) += snd-hda-codec-cm9825.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ANALOG) += snd-hda-codec-analog.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CA0110) += snd-hda-codec-ca0110.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CA0132) += snd-hda-codec-ca0132.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CMEDIA) += snd-hda-codec-cmedia.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CONEXANT) += snd-hda-codec-conexant.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_SIGMATEL) += snd-hda-codec-idt.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_SENARYTECH) += snd-hda-codec-senarytech.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_SI3054) += snd-hda-codec-si3054.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_VIA) += snd-hda-codec-via.o</div><div class='head'>diff --git a/sound/hda/codecs/analog.c b/sound/hda/codecs/analog.c<br/>new file mode 100644<br/>index 000000000000..357ad5a6c0db<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/analog.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/analog.c</a></div><div class='hunk'>@@ -0,0 +1,1176 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for AD1882, AD1884, AD1981HD, AD1983, AD1984,</div><div class='add'>+ *   AD1986A, AD1988</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005-2007 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_AD1882,</div><div class='add'>+	MODEL_AD1884,</div><div class='add'>+	MODEL_AD1981,</div><div class='add'>+	MODEL_AD1983,</div><div class='add'>+	MODEL_AD1986A,</div><div class='add'>+	MODEL_AD1988,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ad198x_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+	int model;</div><div class='add'>+</div><div class='add'>+	/* for auto parser */</div><div class='add'>+	int smux_paths[4];</div><div class='add'>+	unsigned int cur_smux;</div><div class='add'>+	hda_nid_t eapd_nid;</div><div class='add'>+</div><div class='add'>+	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */</div><div class='add'>+	int num_smux_conns;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+/* additional beep mixers; the actual parameters are overwritten at build */</div><div class='add'>+static const struct snd_kcontrol_new ad_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_OUTPUT),</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define set_beep_amp(spec, nid, idx, dir) \</div><div class='add'>+	((spec)-&gt;beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */</div><div class='add'>+#else</div><div class='add'>+#define set_beep_amp(spec, nid, idx, dir) /* NOP */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+static int create_beep_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct snd_kcontrol_new *knew;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;beep_amp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (knew = ad_beep_mixer ; knew-&gt;name; knew++) {</div><div class='add'>+		int err;</div><div class='add'>+		struct snd_kcontrol *kctl;</div><div class='add'>+		kctl = snd_ctl_new1(knew, codec);</div><div class='add'>+		if (!kctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kctl-&gt;private_value = spec-&gt;beep_amp;</div><div class='add'>+		err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define create_beep_ctls(codec)		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,</div><div class='add'>+				hda_nid_t hp)</div><div class='add'>+{</div><div class='add'>+	if (snd_hda_query_pin_caps(codec, front) &amp; AC_PINCAP_EAPD)</div><div class='add'>+		snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+			    !codec-&gt;inv_eapd ? 0x00 : 0x02);</div><div class='add'>+	if (snd_hda_query_pin_caps(codec, hp) &amp; AC_PINCAP_EAPD)</div><div class='add'>+		snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+			    !codec-&gt;inv_eapd ? 0x00 : 0x02);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ad198x_power_eapd(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* We currently only handle front, HP */</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x11d41882:</div><div class='add'>+	case 0x11d4882a:</div><div class='add'>+	case 0x11d41884:</div><div class='add'>+	case 0x11d41984:</div><div class='add'>+	case 0x11d41883:</div><div class='add'>+	case 0x11d4184a:</div><div class='add'>+	case 0x11d4194a:</div><div class='add'>+	case 0x11d4194b:</div><div class='add'>+	case 0x11d41988:</div><div class='add'>+	case 0x11d4198b:</div><div class='add'>+	case 0x11d4989a:</div><div class='add'>+	case 0x11d4989b:</div><div class='add'>+		ad198x_power_eapd_write(codec, 0x12, 0x11);</div><div class='add'>+		break;</div><div class='add'>+	case 0x11d41981:</div><div class='add'>+	case 0x11d41983:</div><div class='add'>+		ad198x_power_eapd_write(codec, 0x05, 0x06);</div><div class='add'>+		break;</div><div class='add'>+	case 0x11d41986:</div><div class='add'>+		ad198x_power_eapd_write(codec, 0x1b, 0x1a);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad_codec_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_shutup_pins(codec);</div><div class='add'>+	ad198x_power_eapd(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* follow EAPD via vmaster hook */</div><div class='add'>+static void ad_vmaster_eapd_hook(void *private_data, int enabled)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = private_data;</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;eapd_nid)</div><div class='add'>+		return;</div><div class='add'>+	if (codec-&gt;inv_eapd)</div><div class='add'>+		enabled = !enabled;</div><div class='add'>+	snd_hda_codec_write_cache(codec, spec-&gt;eapd_nid, 0,</div><div class='add'>+				   AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+				   enabled ? 0x02 : 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Automatic parse of I/O pins from the BIOS configuration</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ad_codec_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_beep_ctls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad198x_parse_auto_config(struct hda_codec *codec, bool indep_hp)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;spdif_status_reset = 1;</div><div class='add'>+	codec-&gt;no_trigger_sense = 1;</div><div class='add'>+	codec-&gt;no_sticky_stream = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.indep_hp = indep_hp;</div><div class='add'>+	if (!spec-&gt;gen.add_stereo_mix_input)</div><div class='add'>+		spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1986A specific</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int alloc_ad_spec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1986A fixup codes</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Lenovo N100 seems to report the reversed bit for HP jack-sensing */</div><div class='add'>+static void ad_fixup_inv_jack_detect(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		codec-&gt;inv_jack_detect = 1;</div><div class='add'>+		spec-&gt;gen.keep_eapd_on = 1;</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = ad_vmaster_eapd_hook;</div><div class='add'>+		spec-&gt;eapd_nid = 0x1b;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Toshiba Satellite L40 implements EAPD in a standard way unlike others */</div><div class='add'>+static void ad1986a_fixup_eapd(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		codec-&gt;inv_eapd = 0;</div><div class='add'>+		spec-&gt;gen.keep_eapd_on = 1;</div><div class='add'>+		spec-&gt;eapd_nid = 0x1b;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* enable stereo-mix input for avoiding regression on KDE (bko#88251) */</div><div class='add'>+static void ad1986a_fixup_eapd_mix_in(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		ad1986a_fixup_eapd(codec, fix, action);</div><div class='add'>+		spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_ENABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AD1986A_FIXUP_INV_JACK_DETECT,</div><div class='add'>+	AD1986A_FIXUP_ULTRA,</div><div class='add'>+	AD1986A_FIXUP_SAMSUNG,</div><div class='add'>+	AD1986A_FIXUP_3STACK,</div><div class='add'>+	AD1986A_FIXUP_LAPTOP,</div><div class='add'>+	AD1986A_FIXUP_LAPTOP_IMIC,</div><div class='add'>+	AD1986A_FIXUP_EAPD,</div><div class='add'>+	AD1986A_FIXUP_EAPD_MIX_IN,</div><div class='add'>+	AD1986A_FIXUP_EASYNOTE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup ad1986a_fixups[] = {</div><div class='add'>+	[AD1986A_FIXUP_INV_JACK_DETECT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad_fixup_inv_jack_detect,</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_ULTRA] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x1d, 0x90a7013e }, /* int mic */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_SAMSUNG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x1d, 0x90a7013e }, /* int mic */</div><div class='add'>+			{ 0x20, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x24, 0x411111f0 }, /* N/A */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_3STACK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x02214021 }, /* headphone */</div><div class='add'>+			{ 0x1b, 0x01014011 }, /* front */</div><div class='add'>+			{ 0x1c, 0x01813030 }, /* line-in */</div><div class='add'>+			{ 0x1d, 0x01a19020 }, /* rear mic */</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1f, 0x02a190f0 }, /* mic */</div><div class='add'>+			{ 0x20, 0x411111f0 }, /* N/A */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_LAPTOP] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x02214021 }, /* headphone */</div><div class='add'>+			{ 0x1b, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1f, 0x02a191f0 }, /* mic */</div><div class='add'>+			{ 0x20, 0x411111f0 }, /* N/A */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_LAPTOP_IMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1d, 0x90a7013e }, /* int mic */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained_before = 1,</div><div class='add'>+		.chain_id = AD1986A_FIXUP_LAPTOP,</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1986a_fixup_eapd,</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_EAPD_MIX_IN] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1986a_fixup_eapd_mix_in,</div><div class='add'>+	},</div><div class='add'>+	[AD1986A_FIXUP_EASYNOTE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x0421402f }, /* headphone */</div><div class='add'>+			{ 0x1b, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x90a70130 }, /* int mic */</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1f, 0x04a19040 }, /* mic */</div><div class='add'>+			{ 0x20, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x21, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x22, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x23, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x24, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x25, 0x411111f0 }, /* N/A */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = AD1986A_FIXUP_EAPD_MIX_IN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk ad1986a_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9V", AD1986A_FIXUP_LAPTOP_IMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS Z99He", AD1986A_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK),</div><div class='add'>+	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK),</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_FIXUP_3STACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba Satellite L40", AD1986A_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_FIXUP_LAPTOP),</div><div class='add'>+	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_FIXUP_SAMSUNG),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_FIXUP_ULTRA),</div><div class='add'>+	SND_PCI_QUIRK(0x1631, 0xc022, "PackardBell EasyNote MX65", AD1986A_FIXUP_EASYNOTE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_FIXUP_INV_JACK_DETECT),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_FIXUP_3STACK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_FIXUP_3STACK),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup ad1986a_fixup_models[] = {</div><div class='add'>+	{ .id = AD1986A_FIXUP_3STACK, .name = "3stack" },</div><div class='add'>+	{ .id = AD1986A_FIXUP_LAPTOP, .name = "laptop" },</div><div class='add'>+	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-imic" },</div><div class='add'>+	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-eapd" }, /* alias */</div><div class='add'>+	{ .id = AD1986A_FIXUP_EAPD, .name = "eapd" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int ad1986a_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x1a, 0x03,</div><div class='add'>+		0x1b, 0x03,</div><div class='add'>+		0x1c, 0x04,</div><div class='add'>+		0x1d, 0x05,</div><div class='add'>+		0x1e, 0x03,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* AD1986A has the inverted EAPD implementation */</div><div class='add'>+	codec-&gt;inv_eapd = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x07;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x19;</div><div class='add'>+	set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	/* AD1986A has a hardware problem that it can't share a stream</div><div class='add'>+	 * with multiple output pins.  The copy of front to surrounds</div><div class='add'>+	 * causes noisy or silent outputs at a certain timing, e.g.</div><div class='add'>+	 * changing the volume.</div><div class='add'>+	 * So, let's disable the shared stream.</div><div class='add'>+	 */</div><div class='add'>+	spec-&gt;gen.multiout.no_share_stream = 1;</div><div class='add'>+	/* give fixed DAC/pin pairs */</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+</div><div class='add'>+	/* AD1986A can't manage the dynamic pin on/off smoothly */</div><div class='add'>+	spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, ad1986a_fixup_models, ad1986a_fixup_tbl,</div><div class='add'>+			   ad1986a_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = ad198x_parse_auto_config(codec, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1983 specific</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPDIF mux control for AD1983 auto-parser</div><div class='add'>+ */</div><div class='add'>+static int ad1983_auto_smux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const char * const texts2[] = { "PCM", "ADC" };</div><div class='add'>+	static const char * const texts3[] = { "PCM", "ADC1", "ADC2" };</div><div class='add'>+	int num_conns = spec-&gt;num_smux_conns;</div><div class='add'>+</div><div class='add'>+	if (num_conns == 2)</div><div class='add'>+		return snd_hda_enum_helper_info(kcontrol, uinfo, 2, texts2);</div><div class='add'>+	else if (num_conns == 3)</div><div class='add'>+		return snd_hda_enum_helper_info(kcontrol, uinfo, 3, texts3);</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1983_auto_smux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_smux;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1983_auto_smux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	hda_nid_t dig_out = spec-&gt;gen.multiout.dig_out_nid;</div><div class='add'>+	int num_conns = spec-&gt;num_smux_conns;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= num_conns)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (spec-&gt;cur_smux == val)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;cur_smux = val;</div><div class='add'>+	snd_hda_codec_write_cache(codec, dig_out, 0,</div><div class='add'>+				  AC_VERB_SET_CONNECT_SEL, val);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new ad1983_auto_smux_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "IEC958 Playback Source",</div><div class='add'>+	.info = ad1983_auto_smux_enum_info,</div><div class='add'>+	.get = ad1983_auto_smux_enum_get,</div><div class='add'>+	.put = ad1983_auto_smux_enum_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ad1983_add_spdif_mux_ctl(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t dig_out = spec-&gt;gen.multiout.dig_out_nid;</div><div class='add'>+	int num_conns;</div><div class='add'>+</div><div class='add'>+	if (!dig_out)</div><div class='add'>+		return 0;</div><div class='add'>+	num_conns = snd_hda_get_num_conns(codec, dig_out);</div><div class='add'>+	if (num_conns != 2 &amp;&amp; num_conns != 3)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;num_smux_conns = num_conns;</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;ad1983_auto_smux_mixer))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1983_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn_0c[] = { 0x08 };</div><div class='add'>+	static const hda_nid_t conn_0d[] = { 0x09 };</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x0e;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x10;</div><div class='add'>+	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	/* limit the loopback routes not to confuse the parser */</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x0c, ARRAY_SIZE(conn_0c), conn_0c);</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x0d, ARRAY_SIZE(conn_0d), conn_0d);</div><div class='add'>+</div><div class='add'>+	err = ad198x_parse_auto_config(codec, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = ad1983_add_spdif_mux_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1981 HD specific</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void ad1981_fixup_hp_eapd(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = ad_vmaster_eapd_hook;</div><div class='add'>+		spec-&gt;eapd_nid = 0x05;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set the upper-limit for mixer amp to 0dB for avoiding the possible</div><div class='add'>+ * damage by overloading</div><div class='add'>+ */</div><div class='add'>+static void ad1981_fixup_amp_override(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,</div><div class='add'>+					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AD1981_FIXUP_AMP_OVERRIDE,</div><div class='add'>+	AD1981_FIXUP_HP_EAPD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup ad1981_fixups[] = {</div><div class='add'>+	[AD1981_FIXUP_AMP_OVERRIDE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1981_fixup_amp_override,</div><div class='add'>+	},</div><div class='add'>+	[AD1981_FIXUP_HP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1981_fixup_hp_eapd,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = AD1981_FIXUP_AMP_OVERRIDE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk ad1981_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1014, "Lenovo", AD1981_FIXUP_AMP_OVERRIDE),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1981_FIXUP_HP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", AD1981_FIXUP_AMP_OVERRIDE),</div><div class='add'>+	/* HP nx6320 (reversed SSID, H/W bug) */</div><div class='add'>+	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_FIXUP_HP_EAPD),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ad1981_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x0e;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x10;</div><div class='add'>+	set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, ad1981_fixup_tbl, ad1981_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = ad198x_parse_auto_config(codec, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = ad1983_add_spdif_mux_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1988</div><div class='add'>+ *</div><div class='add'>+ * Output pins and routes</div><div class='add'>+ *</div><div class='add'>+ *        Pin               Mix     Sel     DAC (*)</div><div class='add'>+ * port-A 0x11 (mute/hp) &lt;- 0x22 &lt;- 0x37 &lt;- 03/04/06</div><div class='add'>+ * port-B 0x14 (mute/hp) &lt;- 0x2b &lt;- 0x30 &lt;- 03/04/06</div><div class='add'>+ * port-C 0x15 (mute)    &lt;- 0x2c &lt;- 0x31 &lt;- 05/0a</div><div class='add'>+ * port-D 0x12 (mute/hp) &lt;- 0x29         &lt;- 04</div><div class='add'>+ * port-E 0x17 (mute/hp) &lt;- 0x26 &lt;- 0x32 &lt;- 05/0a</div><div class='add'>+ * port-F 0x16 (mute)    &lt;- 0x2a         &lt;- 06</div><div class='add'>+ * port-G 0x24 (mute)    &lt;- 0x27         &lt;- 05</div><div class='add'>+ * port-H 0x25 (mute)    &lt;- 0x28         &lt;- 0a</div><div class='add'>+ * mono   0x13 (mute/amp)&lt;- 0x1e &lt;- 0x36 &lt;- 03/04/06</div><div class='add'>+ *</div><div class='add'>+ * DAC0 = 03h, DAC1 = 04h, DAC2 = 05h, DAC3 = 06h, DAC4 = 0ah</div><div class='add'>+ * (*) DAC2/3/4 are swapped to DAC3/4/2 on AD198A rev.2 due to a h/w bug.</div><div class='add'>+ *</div><div class='add'>+ * Input pins and routes</div><div class='add'>+ *</div><div class='add'>+ *        pin     boost   mix input # / adc input #</div><div class='add'>+ * port-A 0x11 -&gt; 0x38 -&gt; mix 2, ADC 0</div><div class='add'>+ * port-B 0x14 -&gt; 0x39 -&gt; mix 0, ADC 1</div><div class='add'>+ * port-C 0x15 -&gt; 0x3a -&gt; 33:0 - mix 1, ADC 2</div><div class='add'>+ * port-D 0x12 -&gt; 0x3d -&gt; mix 3, ADC 8</div><div class='add'>+ * port-E 0x17 -&gt; 0x3c -&gt; 34:0 - mix 4, ADC 4</div><div class='add'>+ * port-F 0x16 -&gt; 0x3b -&gt; mix 5, ADC 3</div><div class='add'>+ * port-G 0x24 -&gt; N/A  -&gt; 33:1 - mix 1, 34:1 - mix 4, ADC 6</div><div class='add'>+ * port-H 0x25 -&gt; N/A  -&gt; 33:2 - mix 1, 34:2 - mix 4, ADC 7</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * DAC assignment</div><div class='add'>+ *   6stack - front/surr/CLFE/side/opt DACs - 04/06/05/0a/03</div><div class='add'>+ *   3stack - front/surr/CLFE/opt DACs - 04/05/0a/03</div><div class='add'>+ *</div><div class='add'>+ * Inputs of Analog Mix (0x20)</div><div class='add'>+ *   0:Port-B (front mic)</div><div class='add'>+ *   1:Port-C/G/H (line-in)</div><div class='add'>+ *   2:Port-A</div><div class='add'>+ *   3:Port-D (line-in/2)</div><div class='add'>+ *   4:Port-E/G/H (mic-in)</div><div class='add'>+ *   5:Port-F (mic2-in)</div><div class='add'>+ *   6:CD</div><div class='add'>+ *   7:Beep</div><div class='add'>+ *</div><div class='add'>+ * ADC selection</div><div class='add'>+ *   0:Port-A</div><div class='add'>+ *   1:Port-B (front mic-in)</div><div class='add'>+ *   2:Port-C (line-in)</div><div class='add'>+ *   3:Port-F (mic2-in)</div><div class='add'>+ *   4:Port-E (mic-in)</div><div class='add'>+ *   5:CD</div><div class='add'>+ *   6:Port-G</div><div class='add'>+ *   7:Port-H</div><div class='add'>+ *   8:Port-D (line-in/2)</div><div class='add'>+ *   9:Mix</div><div class='add'>+ *</div><div class='add'>+ * Proposed pin assignments by the datasheet</div><div class='add'>+ *</div><div class='add'>+ * 6-stack</div><div class='add'>+ * Port-A front headphone</div><div class='add'>+ *      B front mic-in</div><div class='add'>+ *      C rear line-in</div><div class='add'>+ *      D rear front-out</div><div class='add'>+ *      E rear mic-in</div><div class='add'>+ *      F rear surround</div><div class='add'>+ *      G rear CLFE</div><div class='add'>+ *      H rear side</div><div class='add'>+ *</div><div class='add'>+ * 3-stack</div><div class='add'>+ * Port-A front headphone</div><div class='add'>+ *      B front mic</div><div class='add'>+ *      C rear line-in/surround</div><div class='add'>+ *      D rear front-out</div><div class='add'>+ *      E rear mic-in/CLFE</div><div class='add'>+ *</div><div class='add'>+ * laptop</div><div class='add'>+ * Port-A headphone</div><div class='add'>+ *      B mic-in</div><div class='add'>+ *      C docking station</div><div class='add'>+ *      D internal speaker (with EAPD)</div><div class='add'>+ *      E/F quad mic array</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ad1988_auto_smux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const char * const texts[] = {</div><div class='add'>+		"PCM", "ADC1", "ADC2", "ADC3",</div><div class='add'>+	};</div><div class='add'>+	int num_conns = spec-&gt;num_smux_conns;</div><div class='add'>+</div><div class='add'>+	if (num_conns &gt; 4)</div><div class='add'>+		num_conns = 4;</div><div class='add'>+	return snd_hda_enum_helper_info(kcontrol, uinfo, num_conns, texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1988_auto_smux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_smux;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1988_auto_smux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int num_conns = spec-&gt;num_smux_conns;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= num_conns)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (spec-&gt;cur_smux == val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec,</div><div class='add'>+					 spec-&gt;smux_paths[spec-&gt;cur_smux]);</div><div class='add'>+	if (path)</div><div class='add'>+		snd_hda_activate_path(codec, path, false, true);</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, spec-&gt;smux_paths[val]);</div><div class='add'>+	if (path)</div><div class='add'>+		snd_hda_activate_path(codec, path, true, true);</div><div class='add'>+	spec-&gt;cur_smux = val;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new ad1988_auto_smux_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "IEC958 Playback Source",</div><div class='add'>+	.info = ad1988_auto_smux_enum_info,</div><div class='add'>+	.get = ad1988_auto_smux_enum_get,</div><div class='add'>+	.put = ad1988_auto_smux_enum_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ad_codec_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_init(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (spec-&gt;model != MODEL_AD1988)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!spec-&gt;gen.autocfg.dig_outs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;smux_paths[i]);</div><div class='add'>+		if (path)</div><div class='add'>+			snd_hda_activate_path(codec, path, path-&gt;active, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ad1988_add_spdif_mux_ctl(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, num_conns;</div><div class='add'>+	/* we create four static faked paths, since AD codecs have odd</div><div class='add'>+	 * widget connections regarding the SPDIF out source</div><div class='add'>+	 */</div><div class='add'>+	static const struct nid_path fake_paths[4] = {</div><div class='add'>+		{</div><div class='add'>+			.depth = 3,</div><div class='add'>+			.path = { 0x02, 0x1d, 0x1b },</div><div class='add'>+			.idx = { 0, 0, 0 },</div><div class='add'>+			.multi = { 0, 0, 0 },</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.depth = 4,</div><div class='add'>+			.path = { 0x08, 0x0b, 0x1d, 0x1b },</div><div class='add'>+			.idx = { 0, 0, 1, 0 },</div><div class='add'>+			.multi = { 0, 1, 0, 0 },</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.depth = 4,</div><div class='add'>+			.path = { 0x09, 0x0b, 0x1d, 0x1b },</div><div class='add'>+			.idx = { 0, 1, 1, 0 },</div><div class='add'>+			.multi = { 0, 1, 0, 0 },</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.depth = 4,</div><div class='add'>+			.path = { 0x0f, 0x0b, 0x1d, 0x1b },</div><div class='add'>+			.idx = { 0, 2, 1, 0 },</div><div class='add'>+			.multi = { 0, 1, 0, 0 },</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* SPDIF source mux appears to be present only on AD1988A */</div><div class='add'>+	if (!spec-&gt;gen.autocfg.dig_outs ||</div><div class='add'>+	    get_wcaps_type(get_wcaps(codec, 0x1d)) != AC_WID_AUD_MIX)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	num_conns = snd_hda_get_num_conns(codec, 0x0b) + 1;</div><div class='add'>+	if (num_conns != 3 &amp;&amp; num_conns != 4)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;num_smux_conns = num_conns;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_conns; i++) {</div><div class='add'>+		struct nid_path *path = snd_array_new(&amp;spec-&gt;gen.paths);</div><div class='add'>+		if (!path)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		*path = fake_paths[i];</div><div class='add'>+		if (!i)</div><div class='add'>+			path-&gt;active = 1;</div><div class='add'>+		spec-&gt;smux_paths[i] = snd_hda_get_path_idx(codec, path);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;ad1988_auto_smux_mixer))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AD1988_FIXUP_6STACK_DIG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup ad1988_fixups[] = {</div><div class='add'>+	[AD1988_FIXUP_6STACK_DIG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x11, 0x02214130 }, /* front-hp */</div><div class='add'>+			{ 0x12, 0x01014010 }, /* line-out */</div><div class='add'>+			{ 0x14, 0x02a19122 }, /* front-mic */</div><div class='add'>+			{ 0x15, 0x01813021 }, /* line-in */</div><div class='add'>+			{ 0x16, 0x01011012 }, /* line-out */</div><div class='add'>+			{ 0x17, 0x01a19020 }, /* mic */</div><div class='add'>+			{ 0x1b, 0x0145f1f0 }, /* SPDIF */</div><div class='add'>+			{ 0x24, 0x01016011 }, /* line-out */</div><div class='add'>+			{ 0x25, 0x01012013 }, /* line-out */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup ad1988_fixup_models[] = {</div><div class='add'>+	{ .id = AD1988_FIXUP_6STACK_DIG, .name = "6stack-dig" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ad1988_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x20;</div><div class='add'>+	spec-&gt;gen.mixer_merge_nid = 0x21;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x10;</div><div class='add'>+	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, ad1988_fixup_models, NULL, ad1988_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = ad198x_parse_auto_config(codec, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = ad1988_add_spdif_mux_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1884 / AD1984</div><div class='add'>+ *</div><div class='add'>+ * port-B - front line/mic-in</div><div class='add'>+ * port-E - aux in/out</div><div class='add'>+ * port-F - aux in/out</div><div class='add'>+ * port-C - rear line/mic-in</div><div class='add'>+ * port-D - rear line/hp-out</div><div class='add'>+ * port-A - front line/hp-out</div><div class='add'>+ *</div><div class='add'>+ * AD1984 = AD1884 + two digital mic-ins</div><div class='add'>+ *</div><div class='add'>+ * AD1883 / AD1884A / AD1984A / AD1984B</div><div class='add'>+ *</div><div class='add'>+ * port-B (0x14) - front mic-in</div><div class='add'>+ * port-E (0x1c) - rear mic-in</div><div class='add'>+ * port-F (0x16) - CD / ext out</div><div class='add'>+ * port-C (0x15) - rear line-in</div><div class='add'>+ * port-D (0x12) - rear line-out</div><div class='add'>+ * port-A (0x11) - front hp-out</div><div class='add'>+ *</div><div class='add'>+ * AD1984A = AD1884A + digital-mic</div><div class='add'>+ * AD1883 = equivalent with AD1984A</div><div class='add'>+ * AD1984B = AD1984A + extra SPDIF-out</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* set the upper-limit for mixer amp to 0dB for avoiding the possible</div><div class='add'>+ * damage by overloading</div><div class='add'>+ */</div><div class='add'>+static void ad1884_fixup_amp_override(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT,</div><div class='add'>+					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* toggle GPIO1 according to the mute state */</div><div class='add'>+static void ad1884_vmaster_hp_gpio_hook(void *private_data, int enabled)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = private_data;</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;eapd_nid)</div><div class='add'>+		ad_vmaster_eapd_hook(private_data, enabled);</div><div class='add'>+	snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='add'>+				   AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				   enabled ? 0x00 : 0x02);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ad1884_fixup_hp_eapd(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = ad1884_vmaster_hp_gpio_hook;</div><div class='add'>+		spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='add'>+					  AC_VERB_SET_GPIO_MASK, 0x02);</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='add'>+					  AC_VERB_SET_GPIO_DIRECTION, 0x02);</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='add'>+					  AC_VERB_SET_GPIO_DATA, 0x02);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		if (spec-&gt;gen.autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+			spec-&gt;eapd_nid = spec-&gt;gen.autocfg.line_out_pins[0];</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;eapd_nid = spec-&gt;gen.autocfg.speaker_pins[0];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ad1884_fixup_thinkpad(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gen.keep_eapd_on = 1;</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = ad_vmaster_eapd_hook;</div><div class='add'>+		spec-&gt;eapd_nid = 0x12;</div><div class='add'>+		/* Analog PC Beeper - allow firmware/ACPI beeps */</div><div class='add'>+		spec-&gt;beep_amp = HDA_COMPOSE_AMP_VAL(0x20, 3, 3, HDA_INPUT);</div><div class='add'>+		spec-&gt;gen.beep_nid = 0; /* no digital beep */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set magic COEFs for dmic */</div><div class='add'>+static const struct hda_verb ad1884_dmic_init_verbs[] = {</div><div class='add'>+	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},</div><div class='add'>+	{0x01, AC_VERB_SET_PROC_COEF, 0x08},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AD1884_FIXUP_AMP_OVERRIDE,</div><div class='add'>+	AD1884_FIXUP_HP_EAPD,</div><div class='add'>+	AD1884_FIXUP_DMIC_COEF,</div><div class='add'>+	AD1884_FIXUP_THINKPAD,</div><div class='add'>+	AD1884_FIXUP_HP_TOUCHSMART,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup ad1884_fixups[] = {</div><div class='add'>+	[AD1884_FIXUP_AMP_OVERRIDE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1884_fixup_amp_override,</div><div class='add'>+	},</div><div class='add'>+	[AD1884_FIXUP_HP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1884_fixup_hp_eapd,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = AD1884_FIXUP_AMP_OVERRIDE,</div><div class='add'>+	},</div><div class='add'>+	[AD1884_FIXUP_DMIC_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = ad1884_dmic_init_verbs,</div><div class='add'>+	},</div><div class='add'>+	[AD1884_FIXUP_THINKPAD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = ad1884_fixup_thinkpad,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = AD1884_FIXUP_DMIC_COEF,</div><div class='add'>+	},</div><div class='add'>+	[AD1884_FIXUP_HP_TOUCHSMART] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = ad1884_dmic_init_verbs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = AD1884_FIXUP_HP_EAPD,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk ad1884_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2a82, "HP Touchsmart", AD1884_FIXUP_HP_TOUCHSMART),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1884_FIXUP_HP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_THINKPAD),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int ad1884_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x20;</div><div class='add'>+	spec-&gt;gen.mixer_merge_nid = 0x21;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x10;</div><div class='add'>+	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, ad1884_fixup_tbl, ad1884_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = ad198x_parse_auto_config(codec, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = ad1983_add_spdif_mux_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * AD1882 / AD1882A</div><div class='add'>+ *</div><div class='add'>+ * port-A - front hp-out</div><div class='add'>+ * port-B - front mic-in</div><div class='add'>+ * port-C - rear line-in, shared surr-out (3stack)</div><div class='add'>+ * port-D - rear line-out</div><div class='add'>+ * port-E - rear mic-in, shared clfe-out (3stack)</div><div class='add'>+ * port-F - rear surr-out (6stack)</div><div class='add'>+ * port-G - rear clfe-out (6stack)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ad1882_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x20;</div><div class='add'>+	spec-&gt;gen.mixer_merge_nid = 0x21;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x10;</div><div class='add'>+	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='add'>+	err = ad198x_parse_auto_config(codec, true);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = ad1988_add_spdif_mux_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static int ad_codec_probe(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct ad198x_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alloc_ad_spec(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;model = id-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;model) {</div><div class='add'>+	case MODEL_AD1882:</div><div class='add'>+		err = ad1882_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_AD1884:</div><div class='add'>+		err = ad1884_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_AD1981:</div><div class='add'>+		err = ad1981_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_AD1983:</div><div class='add'>+		err = ad1983_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_AD1986A:</div><div class='add'>+		err = ad1986a_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_AD1988:</div><div class='add'>+		err = ad1988_probe(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_gen_remove(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops ad_codec_ops = {</div><div class='add'>+	.probe = ad_codec_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = ad_codec_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = ad_codec_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = ad_codec_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_analog[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4184a, "AD1884A", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41882, "AD1882", MODEL_AD1882),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41883, "AD1883", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41884, "AD1884", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4194a, "AD1984A", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4194b, "AD1984B", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41981, "AD1981", MODEL_AD1981),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41983, "AD1983", MODEL_AD1983),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41984, "AD1984", MODEL_AD1884),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41986, "AD1986A", MODEL_AD1986A),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d41988, "AD1988", MODEL_AD1988),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4198b, "AD1988B", MODEL_AD1988),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4882a, "AD1882A", MODEL_AD1882),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4989a, "AD1989A", MODEL_AD1988),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11d4989b, "AD1989B", MODEL_AD1988),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_analog);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Analog Devices HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver analog_driver = {</div><div class='add'>+	.id = snd_hda_id_analog,</div><div class='add'>+	.ops = &amp;ad_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(analog_driver);</div><div class='head'>diff --git a/sound/hda/codecs/ca0110.c b/sound/hda/codecs/ca0110.c<br/>new file mode 100644<br/>index 000000000000..c75a9ff9460d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/ca0110.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/ca0110.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Creative X-Fi CA0110-IBG chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static int ca0110_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0110_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_hda_gen_spec_init(spec);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;multi_cap_vol = 1;</div><div class='add'>+	codec-&gt;bus-&gt;core.needs_damn_long_delay = 1;</div><div class='add'>+</div><div class='add'>+	err = ca0110_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops ca0110_codec_ops = {</div><div class='add'>+	.probe = ca0110_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = snd_hda_gen_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_ca0110[] = {</div><div class='add'>+	HDA_CODEC_ID(0x1102000a, "CA0110-IBG"),</div><div class='add'>+	HDA_CODEC_ID(0x1102000b, "CA0110-IBG"),</div><div class='add'>+	HDA_CODEC_ID(0x1102000d, "SB0880 X-Fi"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_ca0110);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Creative CA0110-IBG HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver ca0110_driver = {</div><div class='add'>+	.id = snd_hda_id_ca0110,</div><div class='add'>+	.ops = &amp;ca0110_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(ca0110_driver);</div><div class='head'>diff --git a/sound/hda/codecs/ca0132.c b/sound/hda/codecs/ca0132.c<br/>new file mode 100644<br/>index 000000000000..dd054aedd501<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/ca0132.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/ca0132.c</a></div><div class='hunk'>@@ -0,0 +1,10078 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Creative CA0132 chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011, Creative Technology Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Based on ca0110.c</div><div class='add'>+ * Copyright (c) 2008 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+</div><div class='add'>+#include "ca0132_regs.h"</div><div class='add'>+</div><div class='add'>+/* Enable this to see controls for tuning purpose. */</div><div class='add'>+#define ENABLE_TUNING_CONTROLS</div><div class='add'>+</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define FLOAT_ZERO	0x00000000</div><div class='add'>+#define FLOAT_ONE	0x3f800000</div><div class='add'>+#define FLOAT_TWO	0x40000000</div><div class='add'>+#define FLOAT_THREE     0x40400000</div><div class='add'>+#define FLOAT_FIVE	0x40a00000</div><div class='add'>+#define FLOAT_SIX       0x40c00000</div><div class='add'>+#define FLOAT_EIGHT     0x41000000</div><div class='add'>+#define FLOAT_MINUS_5	0xc0a00000</div><div class='add'>+</div><div class='add'>+#define UNSOL_TAG_DSP	0x16</div><div class='add'>+</div><div class='add'>+#define DSP_DMA_WRITE_BUFLEN_INIT (1UL&lt;&lt;18)</div><div class='add'>+#define DSP_DMA_WRITE_BUFLEN_OVLY (1UL&lt;&lt;15)</div><div class='add'>+</div><div class='add'>+#define DMA_TRANSFER_FRAME_SIZE_NWORDS		8</div><div class='add'>+#define DMA_TRANSFER_MAX_FRAME_SIZE_NWORDS	32</div><div class='add'>+#define DMA_OVERLAY_FRAME_SIZE_NWORDS		2</div><div class='add'>+</div><div class='add'>+#define MASTERCONTROL				0x80</div><div class='add'>+#define MASTERCONTROL_ALLOC_DMA_CHAN		10</div><div class='add'>+#define MASTERCONTROL_QUERY_SPEAKER_EQ_ADDRESS	60</div><div class='add'>+</div><div class='add'>+#define WIDGET_CHIP_CTRL      0x15</div><div class='add'>+#define WIDGET_DSP_CTRL       0x16</div><div class='add'>+</div><div class='add'>+#define MEM_CONNID_MICIN1     3</div><div class='add'>+#define MEM_CONNID_MICIN2     5</div><div class='add'>+#define MEM_CONNID_MICOUT1    12</div><div class='add'>+#define MEM_CONNID_MICOUT2    14</div><div class='add'>+#define MEM_CONNID_WUH        10</div><div class='add'>+#define MEM_CONNID_DSP        16</div><div class='add'>+#define MEM_CONNID_DMIC       100</div><div class='add'>+</div><div class='add'>+#define SCP_SET    0</div><div class='add'>+#define SCP_GET    1</div><div class='add'>+</div><div class='add'>+#define EFX_FILE   "ctefx.bin"</div><div class='add'>+#define DESKTOP_EFX_FILE   "ctefx-desktop.bin"</div><div class='add'>+#define R3DI_EFX_FILE  "ctefx-r3di.bin"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP</div><div class='add'>+MODULE_FIRMWARE(EFX_FILE);</div><div class='add'>+MODULE_FIRMWARE(DESKTOP_EFX_FILE);</div><div class='add'>+MODULE_FIRMWARE(R3DI_EFX_FILE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const char *const dirstr[2] = { "Playback", "Capture" };</div><div class='add'>+</div><div class='add'>+#define NUM_OF_OUTPUTS 2</div><div class='add'>+static const char *const out_type_str[2] = { "Speakers", "Headphone" };</div><div class='add'>+enum {</div><div class='add'>+	SPEAKER_OUT,</div><div class='add'>+	HEADPHONE_OUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DIGITAL_MIC,</div><div class='add'>+	LINE_MIC_IN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Strings for Input Source Enum Control */</div><div class='add'>+static const char *const in_src_str[3] = { "Microphone", "Line In", "Front Microphone" };</div><div class='add'>+#define IN_SRC_NUM_OF_INPUTS 3</div><div class='add'>+enum {</div><div class='add'>+	REAR_MIC,</div><div class='add'>+	REAR_LINE_IN,</div><div class='add'>+	FRONT_MIC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+#define VNODE_START_NID    0x80</div><div class='add'>+	VNID_SPK = VNODE_START_NID,			/* Speaker vnid */</div><div class='add'>+	VNID_MIC,</div><div class='add'>+	VNID_HP_SEL,</div><div class='add'>+	VNID_AMIC1_SEL,</div><div class='add'>+	VNID_HP_ASEL,</div><div class='add'>+	VNID_AMIC1_ASEL,</div><div class='add'>+	VNODE_END_NID,</div><div class='add'>+#define VNODES_COUNT  (VNODE_END_NID - VNODE_START_NID)</div><div class='add'>+</div><div class='add'>+#define EFFECT_START_NID    0x90</div><div class='add'>+#define OUT_EFFECT_START_NID    EFFECT_START_NID</div><div class='add'>+	SURROUND = OUT_EFFECT_START_NID,</div><div class='add'>+	CRYSTALIZER,</div><div class='add'>+	DIALOG_PLUS,</div><div class='add'>+	SMART_VOLUME,</div><div class='add'>+	X_BASS,</div><div class='add'>+	EQUALIZER,</div><div class='add'>+	OUT_EFFECT_END_NID,</div><div class='add'>+#define OUT_EFFECTS_COUNT  (OUT_EFFECT_END_NID - OUT_EFFECT_START_NID)</div><div class='add'>+</div><div class='add'>+#define IN_EFFECT_START_NID  OUT_EFFECT_END_NID</div><div class='add'>+	ECHO_CANCELLATION = IN_EFFECT_START_NID,</div><div class='add'>+	VOICE_FOCUS,</div><div class='add'>+	MIC_SVM,</div><div class='add'>+	NOISE_REDUCTION,</div><div class='add'>+	IN_EFFECT_END_NID,</div><div class='add'>+#define IN_EFFECTS_COUNT  (IN_EFFECT_END_NID - IN_EFFECT_START_NID)</div><div class='add'>+</div><div class='add'>+	VOICEFX = IN_EFFECT_END_NID,</div><div class='add'>+	PLAY_ENHANCEMENT,</div><div class='add'>+	CRYSTAL_VOICE,</div><div class='add'>+	EFFECT_END_NID,</div><div class='add'>+	OUTPUT_SOURCE_ENUM,</div><div class='add'>+	INPUT_SOURCE_ENUM,</div><div class='add'>+	XBASS_XOVER,</div><div class='add'>+	EQ_PRESET_ENUM,</div><div class='add'>+	SMART_VOLUME_ENUM,</div><div class='add'>+	MIC_BOOST_ENUM,</div><div class='add'>+	AE5_HEADPHONE_GAIN_ENUM,</div><div class='add'>+	AE5_SOUND_FILTER_ENUM,</div><div class='add'>+	ZXR_HEADPHONE_GAIN,</div><div class='add'>+	SPEAKER_CHANNEL_CFG_ENUM,</div><div class='add'>+	SPEAKER_FULL_RANGE_FRONT,</div><div class='add'>+	SPEAKER_FULL_RANGE_REAR,</div><div class='add'>+	BASS_REDIRECTION,</div><div class='add'>+	BASS_REDIRECTION_XOVER,</div><div class='add'>+#define EFFECTS_COUNT  (EFFECT_END_NID - EFFECT_START_NID)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Effects values size*/</div><div class='add'>+#define EFFECT_VALS_MAX_COUNT 12</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default values for the effect slider controls, they are in order of their</div><div class='add'>+ * effect NID's. Surround, Crystalizer, Dialog Plus, Smart Volume, and then</div><div class='add'>+ * X-bass.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int effect_slider_defaults[] = {67, 65, 50, 74, 50};</div><div class='add'>+/* Amount of effect level sliders for ca0132_alt controls. */</div><div class='add'>+#define EFFECT_LEVEL_SLIDERS 5</div><div class='add'>+</div><div class='add'>+/* Latency introduced by DSP blocks in milliseconds. */</div><div class='add'>+#define DSP_CAPTURE_INIT_LATENCY        0</div><div class='add'>+#define DSP_CRYSTAL_VOICE_LATENCY       124</div><div class='add'>+#define DSP_PLAYBACK_INIT_LATENCY       13</div><div class='add'>+#define DSP_PLAY_ENHANCEMENT_LATENCY    30</div><div class='add'>+#define DSP_SPEAKER_OUT_LATENCY         7</div><div class='add'>+</div><div class='add'>+struct ct_effect {</div><div class='add'>+	const char *name;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int mid; /*effect module ID*/</div><div class='add'>+	int reqs[EFFECT_VALS_MAX_COUNT]; /*effect module request*/</div><div class='add'>+	int direct; /* 0:output; 1:input*/</div><div class='add'>+	int params; /* number of default non-on/off params */</div><div class='add'>+	/*effect default values, 1st is on/off. */</div><div class='add'>+	unsigned int def_vals[EFFECT_VALS_MAX_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define EFX_DIR_OUT 0</div><div class='add'>+#define EFX_DIR_IN  1</div><div class='add'>+</div><div class='add'>+static const struct ct_effect ca0132_effects[EFFECTS_COUNT] = {</div><div class='add'>+	{ .name = "Surround",</div><div class='add'>+	  .nid = SURROUND,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {0, 1},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 1,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x3F2B851F}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Crystalizer",</div><div class='add'>+	  .nid = CRYSTALIZER,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {7, 8},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 1,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x3F266666}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Dialog Plus",</div><div class='add'>+	  .nid = DIALOG_PLUS,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {2, 3},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 1,</div><div class='add'>+	  .def_vals = {0x00000000, 0x3F000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Smart Volume",</div><div class='add'>+	  .nid = SMART_VOLUME,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {4, 5, 6},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 2,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x3F3D70A4, 0x00000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "X-Bass",</div><div class='add'>+	  .nid = X_BASS,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {24, 23, 25},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 2,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x42A00000, 0x3F000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Equalizer",</div><div class='add'>+	  .nid = EQUALIZER,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .reqs = {9, 10, 11, 12, 13, 14,</div><div class='add'>+			15, 16, 17, 18, 19, 20},</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .params = 11,</div><div class='add'>+	  .def_vals = {0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		       0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		       0x00000000, 0x00000000, 0x00000000, 0x00000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Echo Cancellation",</div><div class='add'>+	  .nid = ECHO_CANCELLATION,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .reqs = {0, 1, 2, 3},</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .params = 3,</div><div class='add'>+	  .def_vals = {0x00000000, 0x3F3A9692, 0x00000000, 0x00000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Voice Focus",</div><div class='add'>+	  .nid = VOICE_FOCUS,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .reqs = {6, 7, 8, 9},</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .params = 3,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x3D7DF3B6, 0x41F00000, 0x41F00000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Mic SVM",</div><div class='add'>+	  .nid = MIC_SVM,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .reqs = {44, 45},</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .params = 1,</div><div class='add'>+	  .def_vals = {0x00000000, 0x3F3D70A4}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Noise Reduction",</div><div class='add'>+	  .nid = NOISE_REDUCTION,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .reqs = {4, 5},</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .params = 1,</div><div class='add'>+	  .def_vals = {0x3F800000, 0x3F000000}</div><div class='add'>+	},</div><div class='add'>+	{ .name = "VoiceFX",</div><div class='add'>+	  .nid = VOICEFX,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .reqs = {10, 11, 12, 13, 14, 15, 16, 17, 18},</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .params = 8,</div><div class='add'>+	  .def_vals = {0x00000000, 0x43C80000, 0x44AF0000, 0x44FA0000,</div><div class='add'>+		       0x3F800000, 0x3F800000, 0x3F800000, 0x00000000,</div><div class='add'>+		       0x00000000}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Tuning controls */</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+#define TUNING_CTL_START_NID  0xC0</div><div class='add'>+	WEDGE_ANGLE = TUNING_CTL_START_NID,</div><div class='add'>+	SVM_LEVEL,</div><div class='add'>+	EQUALIZER_BAND_0,</div><div class='add'>+	EQUALIZER_BAND_1,</div><div class='add'>+	EQUALIZER_BAND_2,</div><div class='add'>+	EQUALIZER_BAND_3,</div><div class='add'>+	EQUALIZER_BAND_4,</div><div class='add'>+	EQUALIZER_BAND_5,</div><div class='add'>+	EQUALIZER_BAND_6,</div><div class='add'>+	EQUALIZER_BAND_7,</div><div class='add'>+	EQUALIZER_BAND_8,</div><div class='add'>+	EQUALIZER_BAND_9,</div><div class='add'>+	TUNING_CTL_END_NID</div><div class='add'>+#define TUNING_CTLS_COUNT  (TUNING_CTL_END_NID - TUNING_CTL_START_NID)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ct_tuning_ctl {</div><div class='add'>+	const char *name;</div><div class='add'>+	hda_nid_t parent_nid;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int mid; /*effect module ID*/</div><div class='add'>+	int req; /*effect module request*/</div><div class='add'>+	int direct; /* 0:output; 1:input*/</div><div class='add'>+	unsigned int def_val;/*effect default values*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ct_tuning_ctl ca0132_tuning_ctls[] = {</div><div class='add'>+	{ .name = "Wedge Angle",</div><div class='add'>+	  .parent_nid = VOICE_FOCUS,</div><div class='add'>+	  .nid = WEDGE_ANGLE,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .req = 8,</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .def_val = 0x41F00000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "SVM Level",</div><div class='add'>+	  .parent_nid = MIC_SVM,</div><div class='add'>+	  .nid = SVM_LEVEL,</div><div class='add'>+	  .mid = 0x95,</div><div class='add'>+	  .req = 45,</div><div class='add'>+	  .direct = EFX_DIR_IN,</div><div class='add'>+	  .def_val = 0x3F3D70A4</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band0",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_0,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 11,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band1",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_1,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 12,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band2",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_2,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 13,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band3",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_3,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 14,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band4",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_4,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 15,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band5",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_5,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 16,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band6",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_6,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 17,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band7",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_7,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 18,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band8",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_8,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 19,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	},</div><div class='add'>+	{ .name = "EQ Band9",</div><div class='add'>+	  .parent_nid = EQUALIZER,</div><div class='add'>+	  .nid = EQUALIZER_BAND_9,</div><div class='add'>+	  .mid = 0x96,</div><div class='add'>+	  .req = 20,</div><div class='add'>+	  .direct = EFX_DIR_OUT,</div><div class='add'>+	  .def_val = 0x00000000</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Voice FX Presets */</div><div class='add'>+#define VOICEFX_MAX_PARAM_COUNT 9</div><div class='add'>+</div><div class='add'>+struct ct_voicefx {</div><div class='add'>+	const char *name;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int mid;</div><div class='add'>+	int reqs[VOICEFX_MAX_PARAM_COUNT]; /*effect module request*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ct_voicefx_preset {</div><div class='add'>+	const char *name; /*preset name*/</div><div class='add'>+	unsigned int vals[VOICEFX_MAX_PARAM_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ct_voicefx ca0132_voicefx = {</div><div class='add'>+	.name = "VoiceFX Capture Switch",</div><div class='add'>+	.nid = VOICEFX,</div><div class='add'>+	.mid = 0x95,</div><div class='add'>+	.reqs = {10, 11, 12, 13, 14, 15, 16, 17, 18}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ct_voicefx_preset ca0132_voicefx_presets[] = {</div><div class='add'>+	{ .name = "Neutral",</div><div class='add'>+	  .vals = { 0x00000000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x3F800000, 0x3F800000,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Female2Male",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x3F19999A, 0x3F866666,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Male2Female",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x450AC000, 0x4017AE14, 0x3F6B851F,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "ScrappyKid",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x40400000, 0x3F28F5C3,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Elderly",</div><div class='add'>+	  .vals = { 0x3F800000, 0x44324000, 0x44BB8000,</div><div class='add'>+		    0x44E10000, 0x3FB33333, 0x3FB9999A,</div><div class='add'>+		    0x3F800000, 0x3E3A2E43, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Orc",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43EA0000, 0x44A52000,</div><div class='add'>+		    0x45098000, 0x3F266666, 0x3FC00000,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Elf",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C70000, 0x44AE6000,</div><div class='add'>+		    0x45193000, 0x3F8E147B, 0x3F75C28F,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Dwarf",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43930000, 0x44BEE000,</div><div class='add'>+		    0x45007000, 0x3F451EB8, 0x3F7851EC,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "AlienBrute",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43BFC5AC, 0x44B28FDF,</div><div class='add'>+		    0x451F6000, 0x3F266666, 0x3FA7D945,</div><div class='add'>+		    0x3F800000, 0x3CF5C28F, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Robot",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x3FB2718B, 0x3F800000,</div><div class='add'>+		    0xBC07010E, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Marine",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C20000, 0x44906000,</div><div class='add'>+		    0x44E70000, 0x3F4CCCCD, 0x3F8A3D71,</div><div class='add'>+		    0x3F0A3D71, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Emo",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x3F800000, 0x3F800000,</div><div class='add'>+		    0x3E4CCCCD, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "DeepVoice",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43A9C5AC, 0x44AA4FDF,</div><div class='add'>+		    0x44FFC000, 0x3EDBB56F, 0x3F99C4CA,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Munchkin",</div><div class='add'>+	  .vals = { 0x3F800000, 0x43C80000, 0x44AF0000,</div><div class='add'>+		    0x44FA0000, 0x3F800000, 0x3F1A043C,</div><div class='add'>+		    0x3F800000, 0x00000000, 0x00000000 }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ca0132 EQ presets, taken from Windows Sound Blaster Z Driver */</div><div class='add'>+</div><div class='add'>+#define EQ_PRESET_MAX_PARAM_COUNT 11</div><div class='add'>+</div><div class='add'>+struct ct_eq {</div><div class='add'>+	const char *name;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int mid;</div><div class='add'>+	int reqs[EQ_PRESET_MAX_PARAM_COUNT]; /*effect module request*/</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ct_eq_preset {</div><div class='add'>+	const char *name; /*preset name*/</div><div class='add'>+	unsigned int vals[EQ_PRESET_MAX_PARAM_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ct_eq ca0132_alt_eq_enum = {</div><div class='add'>+	.name = "FX: Equalizer Preset Switch",</div><div class='add'>+	.nid = EQ_PRESET_ENUM,</div><div class='add'>+	.mid = 0x96,</div><div class='add'>+	.reqs = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct ct_eq_preset ca0132_alt_eq_presets[] = {</div><div class='add'>+	{ .name = "Flat",</div><div class='add'>+	 .vals = { 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x00000000, 0x00000000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Acoustic",</div><div class='add'>+	 .vals = { 0x00000000, 0x00000000, 0x3F8CCCCD,</div><div class='add'>+		   0x40000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x00000000, 0x00000000, 0x40000000,</div><div class='add'>+		   0x40000000, 0x40000000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Classical",</div><div class='add'>+	 .vals = { 0x00000000, 0x00000000, 0x40C00000,</div><div class='add'>+		   0x40C00000, 0x40466666, 0x00000000,</div><div class='add'>+		   0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x40466666, 0x40466666	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Country",</div><div class='add'>+	 .vals = { 0x00000000, 0xBF99999A, 0x00000000,</div><div class='add'>+		   0x3FA66666, 0x3FA66666, 0x3F8CCCCD,</div><div class='add'>+		   0x00000000, 0x00000000, 0x40000000,</div><div class='add'>+		   0x40466666, 0x40800000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Dance",</div><div class='add'>+	 .vals = { 0x00000000, 0xBF99999A, 0x40000000,</div><div class='add'>+		   0x40466666, 0x40866666, 0xBF99999A,</div><div class='add'>+		   0xBF99999A, 0x00000000, 0x00000000,</div><div class='add'>+		   0x40800000, 0x40800000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Jazz",</div><div class='add'>+	 .vals = { 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x3F8CCCCD, 0x40800000, 0x40800000,</div><div class='add'>+		   0x40800000, 0x00000000, 0x3F8CCCCD,</div><div class='add'>+		   0x40466666, 0x40466666	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "New Age",</div><div class='add'>+	 .vals = { 0x00000000, 0x00000000, 0x40000000,</div><div class='add'>+		   0x40000000, 0x00000000, 0x00000000,</div><div class='add'>+		   0x00000000, 0x3F8CCCCD, 0x40000000,</div><div class='add'>+		   0x40000000, 0x40000000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Pop",</div><div class='add'>+	 .vals = { 0x00000000, 0xBFCCCCCD, 0x00000000,</div><div class='add'>+		   0x40000000, 0x40000000, 0x00000000,</div><div class='add'>+		   0xBF99999A, 0xBF99999A, 0x00000000,</div><div class='add'>+		   0x40466666, 0x40C00000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Rock",</div><div class='add'>+	 .vals = { 0x00000000, 0xBF99999A, 0xBF99999A,</div><div class='add'>+		   0x3F8CCCCD, 0x40000000, 0xBF99999A,</div><div class='add'>+		   0xBF99999A, 0x00000000, 0x00000000,</div><div class='add'>+		   0x40800000, 0x40800000	     }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Vocal",</div><div class='add'>+	 .vals = { 0x00000000, 0xC0000000, 0xBF99999A,</div><div class='add'>+		   0xBF99999A, 0x00000000, 0x40466666,</div><div class='add'>+		   0x40800000, 0x40466666, 0x00000000,</div><div class='add'>+		   0x00000000, 0x3F8CCCCD	     }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DSP reqs for handling full-range speakers/bass redirection. If a speaker is</div><div class='add'>+ * set as not being full range, and bass redirection is enabled, all</div><div class='add'>+ * frequencies below the crossover frequency are redirected to the LFE</div><div class='add'>+ * channel. If the surround configuration has no LFE channel, this can't be</div><div class='add'>+ * enabled. X-Bass must be disabled when using these.</div><div class='add'>+ */</div><div class='add'>+enum speaker_range_reqs {</div><div class='add'>+	SPEAKER_BASS_REDIRECT            = 0x15,</div><div class='add'>+	SPEAKER_BASS_REDIRECT_XOVER_FREQ = 0x16,</div><div class='add'>+	/* Between 0x16-0x1a are the X-Bass reqs. */</div><div class='add'>+	SPEAKER_FULL_RANGE_FRONT_L_R     = 0x1a,</div><div class='add'>+	SPEAKER_FULL_RANGE_CENTER_LFE    = 0x1b,</div><div class='add'>+	SPEAKER_FULL_RANGE_REAR_L_R      = 0x1c,</div><div class='add'>+	SPEAKER_FULL_RANGE_SURROUND_L_R  = 0x1d,</div><div class='add'>+	SPEAKER_BASS_REDIRECT_SUB_GAIN   = 0x1e,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Definitions for the DSP req's to handle speaker tuning. These all belong to</div><div class='add'>+ * module ID 0x96, the output effects module.</div><div class='add'>+ */</div><div class='add'>+enum speaker_tuning_reqs {</div><div class='add'>+	/*</div><div class='add'>+	 * Currently, this value is always set to 0.0f. However, on Windows,</div><div class='add'>+	 * when selecting certain headphone profiles on the new Sound Blaster</div><div class='add'>+	 * connect software, the QUERY_SPEAKER_EQ_ADDRESS req on mid 0x80 is</div><div class='add'>+	 * sent. This gets the speaker EQ address area, which is then used to</div><div class='add'>+	 * send over (presumably) an equalizer profile for the specific</div><div class='add'>+	 * headphone setup. It is sent using the same method the DSP</div><div class='add'>+	 * firmware is uploaded with, which I believe is why the 'ctspeq.bin'</div><div class='add'>+	 * file exists in linux firmware tree but goes unused. It would also</div><div class='add'>+	 * explain why the QUERY_SPEAKER_EQ_ADDRESS req is defined but unused.</div><div class='add'>+	 * Once this profile is sent over, SPEAKER_TUNING_USE_SPEAKER_EQ is</div><div class='add'>+	 * set to 1.0f.</div><div class='add'>+	 */</div><div class='add'>+	SPEAKER_TUNING_USE_SPEAKER_EQ           = 0x1f,</div><div class='add'>+	SPEAKER_TUNING_ENABLE_CENTER_EQ         = 0x20,</div><div class='add'>+	SPEAKER_TUNING_FRONT_LEFT_VOL_LEVEL     = 0x21,</div><div class='add'>+	SPEAKER_TUNING_FRONT_RIGHT_VOL_LEVEL    = 0x22,</div><div class='add'>+	SPEAKER_TUNING_CENTER_VOL_LEVEL         = 0x23,</div><div class='add'>+	SPEAKER_TUNING_LFE_VOL_LEVEL            = 0x24,</div><div class='add'>+	SPEAKER_TUNING_REAR_LEFT_VOL_LEVEL      = 0x25,</div><div class='add'>+	SPEAKER_TUNING_REAR_RIGHT_VOL_LEVEL     = 0x26,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_LEFT_VOL_LEVEL  = 0x27,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_RIGHT_VOL_LEVEL = 0x28,</div><div class='add'>+	/*</div><div class='add'>+	 * Inversion is used when setting headphone virtualization to line</div><div class='add'>+	 * out. Not sure why this is, but it's the only place it's ever used.</div><div class='add'>+	 */</div><div class='add'>+	SPEAKER_TUNING_FRONT_LEFT_INVERT        = 0x29,</div><div class='add'>+	SPEAKER_TUNING_FRONT_RIGHT_INVERT       = 0x2a,</div><div class='add'>+	SPEAKER_TUNING_CENTER_INVERT            = 0x2b,</div><div class='add'>+	SPEAKER_TUNING_LFE_INVERT               = 0x2c,</div><div class='add'>+	SPEAKER_TUNING_REAR_LEFT_INVERT         = 0x2d,</div><div class='add'>+	SPEAKER_TUNING_REAR_RIGHT_INVERT        = 0x2e,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_LEFT_INVERT     = 0x2f,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_RIGHT_INVERT    = 0x30,</div><div class='add'>+	/* Delay is used when setting surround speaker distance in Windows. */</div><div class='add'>+	SPEAKER_TUNING_FRONT_LEFT_DELAY         = 0x31,</div><div class='add'>+	SPEAKER_TUNING_FRONT_RIGHT_DELAY        = 0x32,</div><div class='add'>+	SPEAKER_TUNING_CENTER_DELAY             = 0x33,</div><div class='add'>+	SPEAKER_TUNING_LFE_DELAY                = 0x34,</div><div class='add'>+	SPEAKER_TUNING_REAR_LEFT_DELAY          = 0x35,</div><div class='add'>+	SPEAKER_TUNING_REAR_RIGHT_DELAY         = 0x36,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_LEFT_DELAY      = 0x37,</div><div class='add'>+	SPEAKER_TUNING_SURROUND_RIGHT_DELAY     = 0x38,</div><div class='add'>+	/* Of these two, only mute seems to ever be used. */</div><div class='add'>+	SPEAKER_TUNING_MAIN_VOLUME              = 0x39,</div><div class='add'>+	SPEAKER_TUNING_MUTE                     = 0x3a,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Surround output channel count configuration structures. */</div><div class='add'>+#define SPEAKER_CHANNEL_CFG_COUNT 5</div><div class='add'>+enum {</div><div class='add'>+	SPEAKER_CHANNELS_2_0,</div><div class='add'>+	SPEAKER_CHANNELS_2_1,</div><div class='add'>+	SPEAKER_CHANNELS_4_0,</div><div class='add'>+	SPEAKER_CHANNELS_4_1,</div><div class='add'>+	SPEAKER_CHANNELS_5_1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ca0132_alt_speaker_channel_cfg {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ca0132_alt_speaker_channel_cfg speaker_channel_cfgs[] = {</div><div class='add'>+	{ .name = "2.0",</div><div class='add'>+	  .val = FLOAT_ONE</div><div class='add'>+	},</div><div class='add'>+	{ .name = "2.1",</div><div class='add'>+	  .val = FLOAT_TWO</div><div class='add'>+	},</div><div class='add'>+	{ .name = "4.0",</div><div class='add'>+	  .val = FLOAT_FIVE</div><div class='add'>+	},</div><div class='add'>+	{ .name = "4.1",</div><div class='add'>+	  .val = FLOAT_SIX</div><div class='add'>+	},</div><div class='add'>+	{ .name = "5.1",</div><div class='add'>+	  .val = FLOAT_EIGHT</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * DSP volume setting structs. Req 1 is left volume, req 2 is right volume,</div><div class='add'>+ * and I don't know what the third req is, but it's always zero. I assume it's</div><div class='add'>+ * some sort of update or set command to tell the DSP there's new volume info.</div><div class='add'>+ */</div><div class='add'>+#define DSP_VOL_OUT 0</div><div class='add'>+#define DSP_VOL_IN  1</div><div class='add'>+</div><div class='add'>+struct ct_dsp_volume_ctl {</div><div class='add'>+	hda_nid_t vnid;</div><div class='add'>+	int mid; /* module ID*/</div><div class='add'>+	unsigned int reqs[3]; /* scp req ID */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ct_dsp_volume_ctl ca0132_alt_vol_ctls[] = {</div><div class='add'>+	{ .vnid = VNID_SPK,</div><div class='add'>+	  .mid = 0x32,</div><div class='add'>+	  .reqs = {3, 4, 2}</div><div class='add'>+	},</div><div class='add'>+	{ .vnid = VNID_MIC,</div><div class='add'>+	  .mid = 0x37,</div><div class='add'>+	  .reqs = {2, 3, 1}</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Values for ca0113_mmio_command_set for selecting output. */</div><div class='add'>+#define AE_CA0113_OUT_SET_COMMANDS 6</div><div class='add'>+struct ae_ca0113_output_set {</div><div class='add'>+	unsigned int group[AE_CA0113_OUT_SET_COMMANDS];</div><div class='add'>+	unsigned int target[AE_CA0113_OUT_SET_COMMANDS];</div><div class='add'>+	unsigned int vals[NUM_OF_OUTPUTS][AE_CA0113_OUT_SET_COMMANDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ae_ca0113_output_set ae5_ca0113_output_presets = {</div><div class='add'>+	.group =  { 0x30, 0x30, 0x48, 0x48, 0x48, 0x30 },</div><div class='add'>+	.target = { 0x2e, 0x30, 0x0d, 0x17, 0x19, 0x32 },</div><div class='add'>+		    /* Speakers. */</div><div class='add'>+	.vals =   { { 0x00, 0x00, 0x40, 0x00, 0x00, 0x3f },</div><div class='add'>+		    /* Headphones. */</div><div class='add'>+		    { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ae_ca0113_output_set ae7_ca0113_output_presets = {</div><div class='add'>+	.group  = { 0x30, 0x30, 0x48, 0x48, 0x48, 0x30 },</div><div class='add'>+	.target = { 0x2e, 0x30, 0x0d, 0x17, 0x19, 0x32 },</div><div class='add'>+		    /* Speakers. */</div><div class='add'>+	.vals   = { { 0x00, 0x00, 0x40, 0x00, 0x00, 0x3f },</div><div class='add'>+		    /* Headphones. */</div><div class='add'>+		    { 0x3f, 0x3f, 0x00, 0x00, 0x02, 0x00 } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ae5 ca0113 command sequences to set headphone gain levels. */</div><div class='add'>+#define AE5_HEADPHONE_GAIN_PRESET_MAX_COMMANDS 4</div><div class='add'>+struct ae5_headphone_gain_set {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int vals[AE5_HEADPHONE_GAIN_PRESET_MAX_COMMANDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ae5_headphone_gain_set ae5_headphone_gain_presets[] = {</div><div class='add'>+	{ .name = "Low (16-31",</div><div class='add'>+	  .vals = { 0xff, 0x2c, 0xf5, 0x32 }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Medium (32-149",</div><div class='add'>+	  .vals = { 0x38, 0xa8, 0x3e, 0x4c }</div><div class='add'>+	},</div><div class='add'>+	{ .name = "High (150-600",</div><div class='add'>+	  .vals = { 0xff, 0xff, 0xff, 0x7f }</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ae5_filter_set {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ae5_filter_set ae5_filter_presets[] = {</div><div class='add'>+	{ .name = "Slow Roll Off",</div><div class='add'>+	  .val = 0xa0</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Minimum Phase",</div><div class='add'>+	  .val = 0xc0</div><div class='add'>+	},</div><div class='add'>+	{ .name = "Fast Roll Off",</div><div class='add'>+	  .val = 0x80</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Data structures for storing audio router remapping data. These are used to</div><div class='add'>+ * remap a currently active streams ports.</div><div class='add'>+ */</div><div class='add'>+struct chipio_stream_remap_data {</div><div class='add'>+	unsigned int stream_id;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	unsigned int offset[16];</div><div class='add'>+	unsigned int value[16];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct chipio_stream_remap_data stream_remap_data[] = {</div><div class='add'>+	{ .stream_id = 0x14,</div><div class='add'>+	  .count     = 0x04,</div><div class='add'>+	  .offset    = { 0x00, 0x04, 0x08, 0x0c },</div><div class='add'>+	  .value     = { 0x0001f8c0, 0x0001f9c1, 0x0001fac6, 0x0001fbc7 },</div><div class='add'>+	},</div><div class='add'>+	{ .stream_id = 0x0c,</div><div class='add'>+	  .count     = 0x0c,</div><div class='add'>+	  .offset    = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c,</div><div class='add'>+			 0x20, 0x24, 0x28, 0x2c },</div><div class='add'>+	  .value     = { 0x0001e0c0, 0x0001e1c1, 0x0001e4c2, 0x0001e5c3,</div><div class='add'>+			 0x0001e2c4, 0x0001e3c5, 0x0001e8c6, 0x0001e9c7,</div><div class='add'>+			 0x0001ecc8, 0x0001edc9, 0x0001eaca, 0x0001ebcb },</div><div class='add'>+	},</div><div class='add'>+	{ .stream_id = 0x0c,</div><div class='add'>+	  .count     = 0x08,</div><div class='add'>+	  .offset    = { 0x08, 0x0c, 0x10, 0x14, 0x20, 0x24, 0x28, 0x2c },</div><div class='add'>+	  .value     = { 0x000140c2, 0x000141c3, 0x000150c4, 0x000151c5,</div><div class='add'>+			 0x000142c8, 0x000143c9, 0x000152ca, 0x000153cb },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum hda_cmd_vendor_io {</div><div class='add'>+	/* for DspIO node */</div><div class='add'>+	VENDOR_DSPIO_SCP_WRITE_DATA_LOW      = 0x000,</div><div class='add'>+	VENDOR_DSPIO_SCP_WRITE_DATA_HIGH     = 0x100,</div><div class='add'>+</div><div class='add'>+	VENDOR_DSPIO_STATUS                  = 0xF01,</div><div class='add'>+	VENDOR_DSPIO_SCP_POST_READ_DATA      = 0x702,</div><div class='add'>+	VENDOR_DSPIO_SCP_READ_DATA           = 0xF02,</div><div class='add'>+	VENDOR_DSPIO_DSP_INIT                = 0x703,</div><div class='add'>+	VENDOR_DSPIO_SCP_POST_COUNT_QUERY    = 0x704,</div><div class='add'>+	VENDOR_DSPIO_SCP_READ_COUNT          = 0xF04,</div><div class='add'>+</div><div class='add'>+	/* for ChipIO node */</div><div class='add'>+	VENDOR_CHIPIO_ADDRESS_LOW            = 0x000,</div><div class='add'>+	VENDOR_CHIPIO_ADDRESS_HIGH           = 0x100,</div><div class='add'>+	VENDOR_CHIPIO_STREAM_FORMAT          = 0x200,</div><div class='add'>+	VENDOR_CHIPIO_DATA_LOW               = 0x300,</div><div class='add'>+	VENDOR_CHIPIO_DATA_HIGH              = 0x400,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_8051_WRITE_DIRECT      = 0x500,</div><div class='add'>+	VENDOR_CHIPIO_8051_READ_DIRECT       = 0xD00,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_GET_PARAMETER          = 0xF00,</div><div class='add'>+	VENDOR_CHIPIO_STATUS                 = 0xF01,</div><div class='add'>+	VENDOR_CHIPIO_HIC_POST_READ          = 0x702,</div><div class='add'>+	VENDOR_CHIPIO_HIC_READ_DATA          = 0xF03,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_8051_DATA_WRITE        = 0x707,</div><div class='add'>+	VENDOR_CHIPIO_8051_DATA_READ         = 0xF07,</div><div class='add'>+	VENDOR_CHIPIO_8051_PMEM_READ         = 0xF08,</div><div class='add'>+	VENDOR_CHIPIO_8051_IRAM_WRITE        = 0x709,</div><div class='add'>+	VENDOR_CHIPIO_8051_IRAM_READ         = 0xF09,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_CT_EXTENSIONS_ENABLE   = 0x70A,</div><div class='add'>+	VENDOR_CHIPIO_CT_EXTENSIONS_GET      = 0xF0A,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_PLL_PMU_WRITE          = 0x70C,</div><div class='add'>+	VENDOR_CHIPIO_PLL_PMU_READ           = 0xF0C,</div><div class='add'>+	VENDOR_CHIPIO_8051_ADDRESS_LOW       = 0x70D,</div><div class='add'>+	VENDOR_CHIPIO_8051_ADDRESS_HIGH      = 0x70E,</div><div class='add'>+	VENDOR_CHIPIO_FLAG_SET               = 0x70F,</div><div class='add'>+	VENDOR_CHIPIO_FLAGS_GET              = 0xF0F,</div><div class='add'>+	VENDOR_CHIPIO_PARAM_SET              = 0x710,</div><div class='add'>+	VENDOR_CHIPIO_PARAM_GET              = 0xF10,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_PORT_ALLOC_CONFIG_SET  = 0x711,</div><div class='add'>+	VENDOR_CHIPIO_PORT_ALLOC_SET         = 0x712,</div><div class='add'>+	VENDOR_CHIPIO_PORT_ALLOC_GET         = 0xF12,</div><div class='add'>+	VENDOR_CHIPIO_PORT_FREE_SET          = 0x713,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_PARAM_EX_ID_GET        = 0xF17,</div><div class='add'>+	VENDOR_CHIPIO_PARAM_EX_ID_SET        = 0x717,</div><div class='add'>+	VENDOR_CHIPIO_PARAM_EX_VALUE_GET     = 0xF18,</div><div class='add'>+	VENDOR_CHIPIO_PARAM_EX_VALUE_SET     = 0x718,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_DMIC_CTL_SET           = 0x788,</div><div class='add'>+	VENDOR_CHIPIO_DMIC_CTL_GET           = 0xF88,</div><div class='add'>+	VENDOR_CHIPIO_DMIC_PIN_SET           = 0x789,</div><div class='add'>+	VENDOR_CHIPIO_DMIC_PIN_GET           = 0xF89,</div><div class='add'>+	VENDOR_CHIPIO_DMIC_MCLK_SET          = 0x78A,</div><div class='add'>+	VENDOR_CHIPIO_DMIC_MCLK_GET          = 0xF8A,</div><div class='add'>+</div><div class='add'>+	VENDOR_CHIPIO_EAPD_SEL_SET           = 0x78D</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Control flag IDs</div><div class='add'>+ */</div><div class='add'>+enum control_flag_id {</div><div class='add'>+	/* Connection manager stream setup is bypassed/enabled */</div><div class='add'>+	CONTROL_FLAG_C_MGR                  = 0,</div><div class='add'>+	/* DSP DMA is bypassed/enabled */</div><div class='add'>+	CONTROL_FLAG_DMA                    = 1,</div><div class='add'>+	/* 8051 'idle' mode is disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_IDLE_ENABLE            = 2,</div><div class='add'>+	/* Tracker for the SPDIF-in path is bypassed/enabled */</div><div class='add'>+	CONTROL_FLAG_TRACKER                = 3,</div><div class='add'>+	/* DigitalOut to Spdif2Out connection is disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_SPDIF2OUT              = 4,</div><div class='add'>+	/* Digital Microphone is disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_DMIC                   = 5,</div><div class='add'>+	/* ADC_B rate is 48 kHz/96 kHz */</div><div class='add'>+	CONTROL_FLAG_ADC_B_96KHZ            = 6,</div><div class='add'>+	/* ADC_C rate is 48 kHz/96 kHz */</div><div class='add'>+	CONTROL_FLAG_ADC_C_96KHZ            = 7,</div><div class='add'>+	/* DAC rate is 48 kHz/96 kHz (affects all DACs) */</div><div class='add'>+	CONTROL_FLAG_DAC_96KHZ              = 8,</div><div class='add'>+	/* DSP rate is 48 kHz/96 kHz */</div><div class='add'>+	CONTROL_FLAG_DSP_96KHZ              = 9,</div><div class='add'>+	/* SRC clock is 98 MHz/196 MHz (196 MHz forces rate to 96 KHz) */</div><div class='add'>+	CONTROL_FLAG_SRC_CLOCK_196MHZ       = 10,</div><div class='add'>+	/* SRC rate is 48 kHz/96 kHz (48 kHz disabled when clock is 196 MHz) */</div><div class='add'>+	CONTROL_FLAG_SRC_RATE_96KHZ         = 11,</div><div class='add'>+	/* Decode Loop (DSP-&gt;SRC-&gt;DSP) is disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_DECODE_LOOP            = 12,</div><div class='add'>+	/* De-emphasis filter on DAC-1 disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_DAC1_DEEMPHASIS        = 13,</div><div class='add'>+	/* De-emphasis filter on DAC-2 disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_DAC2_DEEMPHASIS        = 14,</div><div class='add'>+	/* De-emphasis filter on DAC-3 disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_DAC3_DEEMPHASIS        = 15,</div><div class='add'>+	/* High-pass filter on ADC_B disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_ADC_B_HIGH_PASS        = 16,</div><div class='add'>+	/* High-pass filter on ADC_C disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_ADC_C_HIGH_PASS        = 17,</div><div class='add'>+	/* Common mode on Port_A disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_PORT_A_COMMON_MODE     = 18,</div><div class='add'>+	/* Common mode on Port_D disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_PORT_D_COMMON_MODE     = 19,</div><div class='add'>+	/* Impedance for ramp generator on Port_A 16 Ohm/10K Ohm */</div><div class='add'>+	CONTROL_FLAG_PORT_A_10KOHM_LOAD     = 20,</div><div class='add'>+	/* Impedance for ramp generator on Port_D, 16 Ohm/10K Ohm */</div><div class='add'>+	CONTROL_FLAG_PORT_D_10KOHM_LOAD     = 21,</div><div class='add'>+	/* ASI rate is 48kHz/96kHz */</div><div class='add'>+	CONTROL_FLAG_ASI_96KHZ              = 22,</div><div class='add'>+	/* DAC power settings able to control attached ports no/yes */</div><div class='add'>+	CONTROL_FLAG_DACS_CONTROL_PORTS     = 23,</div><div class='add'>+	/* Clock Stop OK reporting is disabled/enabled */</div><div class='add'>+	CONTROL_FLAG_CONTROL_STOP_OK_ENABLE = 24,</div><div class='add'>+	/* Number of control flags */</div><div class='add'>+	CONTROL_FLAGS_MAX = (CONTROL_FLAG_CONTROL_STOP_OK_ENABLE+1)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Control parameter IDs</div><div class='add'>+ */</div><div class='add'>+enum control_param_id {</div><div class='add'>+	/* 0: None, 1: Mic1In*/</div><div class='add'>+	CONTROL_PARAM_VIP_SOURCE               = 1,</div><div class='add'>+	/* 0: force HDA, 1: allow DSP if HDA Spdif1Out stream is idle */</div><div class='add'>+	CONTROL_PARAM_SPDIF1_SOURCE            = 2,</div><div class='add'>+	/* Port A output stage gain setting to use when 16 Ohm output</div><div class='add'>+	 * impedance is selected*/</div><div class='add'>+	CONTROL_PARAM_PORTA_160OHM_GAIN        = 8,</div><div class='add'>+	/* Port D output stage gain setting to use when 16 Ohm output</div><div class='add'>+	 * impedance is selected*/</div><div class='add'>+	CONTROL_PARAM_PORTD_160OHM_GAIN        = 10,</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This control param name was found in the 8051 memory, and makes</div><div class='add'>+	 * sense given the fact the AE-5 uses it and has the ASI flag set.</div><div class='add'>+	 */</div><div class='add'>+	CONTROL_PARAM_ASI                      = 23,</div><div class='add'>+</div><div class='add'>+	/* Stream Control */</div><div class='add'>+</div><div class='add'>+	/* Select stream with the given ID */</div><div class='add'>+	CONTROL_PARAM_STREAM_ID                = 24,</div><div class='add'>+	/* Source connection point for the selected stream */</div><div class='add'>+	CONTROL_PARAM_STREAM_SOURCE_CONN_POINT = 25,</div><div class='add'>+	/* Destination connection point for the selected stream */</div><div class='add'>+	CONTROL_PARAM_STREAM_DEST_CONN_POINT   = 26,</div><div class='add'>+	/* Number of audio channels in the selected stream */</div><div class='add'>+	CONTROL_PARAM_STREAMS_CHANNELS         = 27,</div><div class='add'>+	/*Enable control for the selected stream */</div><div class='add'>+	CONTROL_PARAM_STREAM_CONTROL           = 28,</div><div class='add'>+</div><div class='add'>+	/* Connection Point Control */</div><div class='add'>+</div><div class='add'>+	/* Select connection point with the given ID */</div><div class='add'>+	CONTROL_PARAM_CONN_POINT_ID            = 29,</div><div class='add'>+	/* Connection point sample rate */</div><div class='add'>+	CONTROL_PARAM_CONN_POINT_SAMPLE_RATE   = 30,</div><div class='add'>+</div><div class='add'>+	/* Node Control */</div><div class='add'>+</div><div class='add'>+	/* Select HDA node with the given ID */</div><div class='add'>+	CONTROL_PARAM_NODE_ID                  = 31</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Dsp Io Status codes</div><div class='add'>+ */</div><div class='add'>+enum hda_vendor_status_dspio {</div><div class='add'>+	/* Success */</div><div class='add'>+	VENDOR_STATUS_DSPIO_OK                       = 0x00,</div><div class='add'>+	/* Busy, unable to accept new command, the host must retry */</div><div class='add'>+	VENDOR_STATUS_DSPIO_BUSY                     = 0x01,</div><div class='add'>+	/* SCP command queue is full */</div><div class='add'>+	VENDOR_STATUS_DSPIO_SCP_COMMAND_QUEUE_FULL   = 0x02,</div><div class='add'>+	/* SCP response queue is empty */</div><div class='add'>+	VENDOR_STATUS_DSPIO_SCP_RESPONSE_QUEUE_EMPTY = 0x03</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Chip Io Status codes</div><div class='add'>+ */</div><div class='add'>+enum hda_vendor_status_chipio {</div><div class='add'>+	/* Success */</div><div class='add'>+	VENDOR_STATUS_CHIPIO_OK   = 0x00,</div><div class='add'>+	/* Busy, unable to accept new command, the host must retry */</div><div class='add'>+	VENDOR_STATUS_CHIPIO_BUSY = 0x01</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  CA0132 sample rate</div><div class='add'>+ */</div><div class='add'>+enum ca0132_sample_rate {</div><div class='add'>+	SR_6_000        = 0x00,</div><div class='add'>+	SR_8_000        = 0x01,</div><div class='add'>+	SR_9_600        = 0x02,</div><div class='add'>+	SR_11_025       = 0x03,</div><div class='add'>+	SR_16_000       = 0x04,</div><div class='add'>+	SR_22_050       = 0x05,</div><div class='add'>+	SR_24_000       = 0x06,</div><div class='add'>+	SR_32_000       = 0x07,</div><div class='add'>+	SR_44_100       = 0x08,</div><div class='add'>+	SR_48_000       = 0x09,</div><div class='add'>+	SR_88_200       = 0x0A,</div><div class='add'>+	SR_96_000       = 0x0B,</div><div class='add'>+	SR_144_000      = 0x0C,</div><div class='add'>+	SR_176_400      = 0x0D,</div><div class='add'>+	SR_192_000      = 0x0E,</div><div class='add'>+	SR_384_000      = 0x0F,</div><div class='add'>+</div><div class='add'>+	SR_COUNT        = 0x10,</div><div class='add'>+</div><div class='add'>+	SR_RATE_UNKNOWN = 0x1F</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum dsp_download_state {</div><div class='add'>+	DSP_DOWNLOAD_FAILED = -1,</div><div class='add'>+	DSP_DOWNLOAD_INIT   = 0,</div><div class='add'>+	DSP_DOWNLOADING     = 1,</div><div class='add'>+	DSP_DOWNLOADED      = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* retrieve parameters from hda format */</div><div class='add'>+#define get_hdafmt_chs(fmt)	(fmt &amp; 0xf)</div><div class='add'>+#define get_hdafmt_bits(fmt)	((fmt &gt;&gt; 4) &amp; 0x7)</div><div class='add'>+#define get_hdafmt_rate(fmt)	((fmt &gt;&gt; 8) &amp; 0x7f)</div><div class='add'>+#define get_hdafmt_type(fmt)	((fmt &gt;&gt; 15) &amp; 0x1)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 specific</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct ca0132_spec {</div><div class='add'>+	const struct snd_kcontrol_new *mixers[5];</div><div class='add'>+	unsigned int num_mixers;</div><div class='add'>+	const struct hda_verb *base_init_verbs;</div><div class='add'>+	const struct hda_verb *base_exit_verbs;</div><div class='add'>+	const struct hda_verb *chip_init_verbs;</div><div class='add'>+	const struct hda_verb *desktop_init_verbs;</div><div class='add'>+	struct hda_verb *spec_init_verbs;</div><div class='add'>+	struct auto_pin_cfg autocfg;</div><div class='add'>+</div><div class='add'>+	/* Nodes configurations */</div><div class='add'>+	struct hda_multi_out multiout;</div><div class='add'>+	hda_nid_t out_pins[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	hda_nid_t dacs[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	unsigned int num_outputs;</div><div class='add'>+	hda_nid_t input_pins[AUTO_PIN_LAST];</div><div class='add'>+	hda_nid_t adcs[AUTO_PIN_LAST];</div><div class='add'>+	hda_nid_t dig_out;</div><div class='add'>+	hda_nid_t dig_in;</div><div class='add'>+	unsigned int num_inputs;</div><div class='add'>+	hda_nid_t shared_mic_nid;</div><div class='add'>+	hda_nid_t shared_out_nid;</div><div class='add'>+	hda_nid_t unsol_tag_hp;</div><div class='add'>+	hda_nid_t unsol_tag_front_hp; /* for desktop ca0132 codecs */</div><div class='add'>+	hda_nid_t unsol_tag_amic1;</div><div class='add'>+</div><div class='add'>+	/* chip access */</div><div class='add'>+	struct mutex chipio_mutex; /* chip access mutex */</div><div class='add'>+	u32 curr_chip_addx;</div><div class='add'>+</div><div class='add'>+	/* DSP download related */</div><div class='add'>+	enum dsp_download_state dsp_state;</div><div class='add'>+	unsigned int dsp_stream_id;</div><div class='add'>+	unsigned int wait_scp;</div><div class='add'>+	unsigned int wait_scp_header;</div><div class='add'>+	unsigned int wait_num_data;</div><div class='add'>+	unsigned int scp_resp_header;</div><div class='add'>+	unsigned int scp_resp_data[4];</div><div class='add'>+	unsigned int scp_resp_count;</div><div class='add'>+	bool startup_check_entered;</div><div class='add'>+	bool dsp_reload;</div><div class='add'>+</div><div class='add'>+	/* mixer and effects related */</div><div class='add'>+	unsigned char dmic_ctl;</div><div class='add'>+	int cur_out_type;</div><div class='add'>+	int cur_mic_type;</div><div class='add'>+	long vnode_lvol[VNODES_COUNT];</div><div class='add'>+	long vnode_rvol[VNODES_COUNT];</div><div class='add'>+	long vnode_lswitch[VNODES_COUNT];</div><div class='add'>+	long vnode_rswitch[VNODES_COUNT];</div><div class='add'>+	long effects_switch[EFFECTS_COUNT];</div><div class='add'>+	long voicefx_val;</div><div class='add'>+	long cur_mic_boost;</div><div class='add'>+	/* ca0132_alt control related values */</div><div class='add'>+	unsigned char in_enum_val;</div><div class='add'>+	unsigned char out_enum_val;</div><div class='add'>+	unsigned char channel_cfg_val;</div><div class='add'>+	unsigned char speaker_range_val[2];</div><div class='add'>+	unsigned char mic_boost_enum_val;</div><div class='add'>+	unsigned char smart_volume_setting;</div><div class='add'>+	unsigned char bass_redirection_val;</div><div class='add'>+	long bass_redirect_xover_freq;</div><div class='add'>+	long fx_ctl_val[EFFECT_LEVEL_SLIDERS];</div><div class='add'>+	long xbass_xover_freq;</div><div class='add'>+	long eq_preset_val;</div><div class='add'>+	unsigned int tlv[4];</div><div class='add'>+	struct hda_vmaster_mute_hook vmaster_mute;</div><div class='add'>+	/* AE-5 Control values */</div><div class='add'>+	unsigned char ae5_headphone_gain_val;</div><div class='add'>+	unsigned char ae5_filter_val;</div><div class='add'>+	/* ZxR Control Values */</div><div class='add'>+	unsigned char zxr_gain_set;</div><div class='add'>+</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct delayed_work unsol_hp_work;</div><div class='add'>+</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+	long cur_ctl_vals[TUNING_CTLS_COUNT];</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * The Recon3D, Sound Blaster Z, Sound Blaster ZxR, and Sound Blaster</div><div class='add'>+	 * AE-5 all use PCI region 2 to toggle GPIO and other currently unknown</div><div class='add'>+	 * things.</div><div class='add'>+	 */</div><div class='add'>+	bool use_pci_mmio;</div><div class='add'>+	void __iomem *mem_base;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Whether or not to use the alt functions like alt_select_out,</div><div class='add'>+	 * alt_select_in, etc. Only used on desktop codecs for now, because of</div><div class='add'>+	 * surround sound support.</div><div class='add'>+	 */</div><div class='add'>+	bool use_alt_functions;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Whether or not to use alt controls:	volume effect sliders, EQ</div><div class='add'>+	 * presets, smart volume presets, and new control names with FX prefix.</div><div class='add'>+	 * Renames PlayEnhancement and CrystalVoice too.</div><div class='add'>+	 */</div><div class='add'>+	bool use_alt_controls;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 quirks table</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	QUIRK_ALIENWARE,</div><div class='add'>+	QUIRK_ALIENWARE_M17XR4,</div><div class='add'>+	QUIRK_SBZ,</div><div class='add'>+	QUIRK_ZXR,</div><div class='add'>+	QUIRK_ZXR_DBPRO,</div><div class='add'>+	QUIRK_R3DI,</div><div class='add'>+	QUIRK_R3D,</div><div class='add'>+	QUIRK_AE5,</div><div class='add'>+	QUIRK_AE7,</div><div class='add'>+	QUIRK_NONE = HDA_FIXUP_ID_NOT_SET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+#define ca0132_quirk(spec)		((spec)-&gt;codec-&gt;fixup_id)</div><div class='add'>+#define ca0132_use_pci_mmio(spec)	((spec)-&gt;use_pci_mmio)</div><div class='add'>+#define ca0132_use_alt_functions(spec)	((spec)-&gt;use_alt_functions)</div><div class='add'>+#define ca0132_use_alt_controls(spec)	((spec)-&gt;use_alt_controls)</div><div class='add'>+#else</div><div class='add'>+#define ca0132_quirk(spec)		({ (void)(spec); QUIRK_NONE; })</div><div class='add'>+#define ca0132_use_alt_functions(spec)	({ (void)(spec); false; })</div><div class='add'>+#define ca0132_use_pci_mmio(spec)	({ (void)(spec); false; })</div><div class='add'>+#define ca0132_use_alt_controls(spec)	({ (void)(spec); false; })</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl alienware_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x90170110 }, /* Builtin Speaker */</div><div class='add'>+	{ 0x0c, 0x411111f0 }, /* N/A */</div><div class='add'>+	{ 0x0d, 0x411111f0 }, /* N/A */</div><div class='add'>+	{ 0x0e, 0x411111f0 }, /* N/A */</div><div class='add'>+	{ 0x0f, 0x0321101f }, /* HP */</div><div class='add'>+	{ 0x10, 0x411111f0 }, /* Headset?  disabled for now */</div><div class='add'>+	{ 0x11, 0x03a11021 }, /* Mic */</div><div class='add'>+	{ 0x12, 0xd5a30140 }, /* Builtin Mic */</div><div class='add'>+	{ 0x13, 0x411111f0 }, /* N/A */</div><div class='add'>+	{ 0x18, 0x411111f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Sound Blaster Z pin configs taken from Windows Driver */</div><div class='add'>+static const struct hda_pintbl sbz_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01017010 }, /* Port G -- Lineout FRONT L/R */</div><div class='add'>+	{ 0x0c, 0x014510f0 }, /* SPDIF Out 1 */</div><div class='add'>+	{ 0x0d, 0x014510f0 }, /* Digital Out */</div><div class='add'>+	{ 0x0e, 0x01c510f0 }, /* SPDIF In */</div><div class='add'>+	{ 0x0f, 0x0221701f }, /* Port A -- BackPanel HP */</div><div class='add'>+	{ 0x10, 0x01017012 }, /* Port D -- Center/LFE or FP Hp */</div><div class='add'>+	{ 0x11, 0x01017014 }, /* Port B -- LineMicIn2 / Rear L/R */</div><div class='add'>+	{ 0x12, 0x01a170f0 }, /* Port C -- LineIn1 */</div><div class='add'>+	{ 0x13, 0x908700f0 }, /* What U Hear In*/</div><div class='add'>+	{ 0x18, 0x50d000f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Sound Blaster ZxR pin configs taken from Windows Driver */</div><div class='add'>+static const struct hda_pintbl zxr_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01047110 }, /* Port G -- Lineout FRONT L/R */</div><div class='add'>+	{ 0x0c, 0x414510f0 }, /* SPDIF Out 1 - Disabled*/</div><div class='add'>+	{ 0x0d, 0x014510f0 }, /* Digital Out */</div><div class='add'>+	{ 0x0e, 0x41c520f0 }, /* SPDIF In - Disabled*/</div><div class='add'>+	{ 0x0f, 0x0122711f }, /* Port A -- BackPanel HP */</div><div class='add'>+	{ 0x10, 0x01017111 }, /* Port D -- Center/LFE */</div><div class='add'>+	{ 0x11, 0x01017114 }, /* Port B -- LineMicIn2 / Rear L/R */</div><div class='add'>+	{ 0x12, 0x01a271f0 }, /* Port C -- LineIn1 */</div><div class='add'>+	{ 0x13, 0x908700f0 }, /* What U Hear In*/</div><div class='add'>+	{ 0x18, 0x50d000f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Recon3D pin configs taken from Windows Driver */</div><div class='add'>+static const struct hda_pintbl r3d_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01014110 }, /* Port G -- Lineout FRONT L/R */</div><div class='add'>+	{ 0x0c, 0x014510f0 }, /* SPDIF Out 1 */</div><div class='add'>+	{ 0x0d, 0x014510f0 }, /* Digital Out */</div><div class='add'>+	{ 0x0e, 0x01c520f0 }, /* SPDIF In */</div><div class='add'>+	{ 0x0f, 0x0221401f }, /* Port A -- BackPanel HP */</div><div class='add'>+	{ 0x10, 0x01016011 }, /* Port D -- Center/LFE or FP Hp */</div><div class='add'>+	{ 0x11, 0x01011014 }, /* Port B -- LineMicIn2 / Rear L/R */</div><div class='add'>+	{ 0x12, 0x02a090f0 }, /* Port C -- LineIn1 */</div><div class='add'>+	{ 0x13, 0x908700f0 }, /* What U Hear In*/</div><div class='add'>+	{ 0x18, 0x50d000f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Sound Blaster AE-5 pin configs taken from Windows Driver */</div><div class='add'>+static const struct hda_pintbl ae5_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01017010 }, /* Port G -- Lineout FRONT L/R */</div><div class='add'>+	{ 0x0c, 0x014510f0 }, /* SPDIF Out 1 */</div><div class='add'>+	{ 0x0d, 0x014510f0 }, /* Digital Out */</div><div class='add'>+	{ 0x0e, 0x01c510f0 }, /* SPDIF In */</div><div class='add'>+	{ 0x0f, 0x01017114 }, /* Port A -- Rear L/R. */</div><div class='add'>+	{ 0x10, 0x01017012 }, /* Port D -- Center/LFE or FP Hp */</div><div class='add'>+	{ 0x11, 0x012170ff }, /* Port B -- LineMicIn2 / Rear Headphone */</div><div class='add'>+	{ 0x12, 0x01a170f0 }, /* Port C -- LineIn1 */</div><div class='add'>+	{ 0x13, 0x908700f0 }, /* What U Hear In*/</div><div class='add'>+	{ 0x18, 0x50d000f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Recon3D integrated pin configs taken from Windows Driver */</div><div class='add'>+static const struct hda_pintbl r3di_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01014110 }, /* Port G -- Lineout FRONT L/R */</div><div class='add'>+	{ 0x0c, 0x014510f0 }, /* SPDIF Out 1 */</div><div class='add'>+	{ 0x0d, 0x014510f0 }, /* Digital Out */</div><div class='add'>+	{ 0x0e, 0x41c520f0 }, /* SPDIF In */</div><div class='add'>+	{ 0x0f, 0x0221401f }, /* Port A -- BackPanel HP */</div><div class='add'>+	{ 0x10, 0x01016011 }, /* Port D -- Center/LFE or FP Hp */</div><div class='add'>+	{ 0x11, 0x01011014 }, /* Port B -- LineMicIn2 / Rear L/R */</div><div class='add'>+	{ 0x12, 0x02a090f0 }, /* Port C -- LineIn1 */</div><div class='add'>+	{ 0x13, 0x908700f0 }, /* What U Hear In*/</div><div class='add'>+	{ 0x18, 0x500000f0 }, /* N/A */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ae7_pincfgs[] = {</div><div class='add'>+	{ 0x0b, 0x01017010 },</div><div class='add'>+	{ 0x0c, 0x014510f0 },</div><div class='add'>+	{ 0x0d, 0x414510f0 },</div><div class='add'>+	{ 0x0e, 0x01c520f0 },</div><div class='add'>+	{ 0x0f, 0x01017114 },</div><div class='add'>+	{ 0x10, 0x01017011 },</div><div class='add'>+	{ 0x11, 0x018170ff },</div><div class='add'>+	{ 0x12, 0x01a170f0 },</div><div class='add'>+	{ 0x13, 0x908700f0 },</div><div class='add'>+	{ 0x18, 0x500000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk ca0132_quirks[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x057b, "Alienware M17x R4", QUIRK_ALIENWARE_M17XR4),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0685, "Alienware 15 2015", QUIRK_ALIENWARE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0688, "Alienware 17 2015", QUIRK_ALIENWARE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0010, "Sound Blaster Z", QUIRK_SBZ),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0023, "Sound Blaster Z", QUIRK_SBZ),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0027, "Sound Blaster Z", QUIRK_SBZ),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0033, "Sound Blaster ZxR", QUIRK_SBZ),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x3842, 0x104b, "EVGA X299 Dark", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0191, "Sound Blaster AE-5 Plus", QUIRK_AE5),</div><div class='add'>+	SND_PCI_QUIRK(0x1102, 0x0081, "Sound Blaster AE-7", QUIRK_AE7),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup ca0132_quirk_models[] = {</div><div class='add'>+	{ .id = QUIRK_ALIENWARE, .name = "alienware" },</div><div class='add'>+	{ .id = QUIRK_ALIENWARE_M17XR4, .name = "alienware-m17xr4" },</div><div class='add'>+	{ .id = QUIRK_SBZ, .name = "sbz" },</div><div class='add'>+	{ .id = QUIRK_ZXR, .name = "zxr" },</div><div class='add'>+	{ .id = QUIRK_ZXR_DBPRO, .name = "zxr-dbpro" },</div><div class='add'>+	{ .id = QUIRK_R3DI, .name = "r3di" },</div><div class='add'>+	{ .id = QUIRK_R3D, .name = "r3d" },</div><div class='add'>+	{ .id = QUIRK_AE5, .name = "ae5" },</div><div class='add'>+	{ .id = QUIRK_AE7, .name = "ae7" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Output selection quirk info structures. */</div><div class='add'>+#define MAX_QUIRK_MMIO_GPIO_SET_VALS 3</div><div class='add'>+#define MAX_QUIRK_SCP_SET_VALS 2</div><div class='add'>+struct ca0132_alt_out_set_info {</div><div class='add'>+	unsigned int dac2port; /* ParamID 0x0d value. */</div><div class='add'>+</div><div class='add'>+	bool has_hda_gpio;</div><div class='add'>+	char hda_gpio_pin;</div><div class='add'>+	char hda_gpio_set;</div><div class='add'>+</div><div class='add'>+	unsigned int mmio_gpio_count;</div><div class='add'>+	char mmio_gpio_pin[MAX_QUIRK_MMIO_GPIO_SET_VALS];</div><div class='add'>+	char mmio_gpio_set[MAX_QUIRK_MMIO_GPIO_SET_VALS];</div><div class='add'>+</div><div class='add'>+	unsigned int scp_cmds_count;</div><div class='add'>+	unsigned int scp_cmd_mid[MAX_QUIRK_SCP_SET_VALS];</div><div class='add'>+	unsigned int scp_cmd_req[MAX_QUIRK_SCP_SET_VALS];</div><div class='add'>+	unsigned int scp_cmd_val[MAX_QUIRK_SCP_SET_VALS];</div><div class='add'>+</div><div class='add'>+	bool has_chipio_write;</div><div class='add'>+	unsigned int chipio_write_addr;</div><div class='add'>+	unsigned int chipio_write_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ca0132_alt_out_set_quirk_data {</div><div class='add'>+	int quirk_id;</div><div class='add'>+</div><div class='add'>+	bool has_headphone_gain;</div><div class='add'>+	bool is_ae_series;</div><div class='add'>+</div><div class='add'>+	struct ca0132_alt_out_set_info out_set_info[NUM_OF_OUTPUTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ca0132_alt_out_set_quirk_data quirk_out_set_data[] = {</div><div class='add'>+	{ .quirk_id = QUIRK_R3DI,</div><div class='add'>+	  .has_headphone_gain = false,</div><div class='add'>+	  .is_ae_series       = false,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port         = 0x24,</div><div class='add'>+		  .has_hda_gpio     = true,</div><div class='add'>+		  .hda_gpio_pin     = 2,</div><div class='add'>+		  .hda_gpio_set     = 1,</div><div class='add'>+		  .mmio_gpio_count  = 0,</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		},</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port         = 0x21,</div><div class='add'>+		  .has_hda_gpio     = true,</div><div class='add'>+		  .hda_gpio_pin     = 2,</div><div class='add'>+		  .hda_gpio_set     = 0,</div><div class='add'>+		  .mmio_gpio_count  = 0,</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	{ .quirk_id = QUIRK_R3D,</div><div class='add'>+	  .has_headphone_gain = false,</div><div class='add'>+	  .is_ae_series       = false,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port         = 0x24,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 1,</div><div class='add'>+		  .mmio_gpio_pin    = { 1 },</div><div class='add'>+		  .mmio_gpio_set    = { 1 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		},</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port         = 0x21,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 1,</div><div class='add'>+		  .mmio_gpio_pin    = { 1 },</div><div class='add'>+		  .mmio_gpio_set    = { 0 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	{ .quirk_id = QUIRK_SBZ,</div><div class='add'>+	  .has_headphone_gain = false,</div><div class='add'>+	  .is_ae_series       = false,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port         = 0x18,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 3,</div><div class='add'>+		  .mmio_gpio_pin    = { 7, 4, 1 },</div><div class='add'>+		  .mmio_gpio_set    = { 0, 1, 1 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false, },</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port         = 0x12,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 3,</div><div class='add'>+		  .mmio_gpio_pin    = { 7, 4, 1 },</div><div class='add'>+		  .mmio_gpio_set    = { 1, 1, 0 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	{ .quirk_id = QUIRK_ZXR,</div><div class='add'>+	  .has_headphone_gain = true,</div><div class='add'>+	  .is_ae_series       = false,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port         = 0x24,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 3,</div><div class='add'>+		  .mmio_gpio_pin    = { 2, 3, 5 },</div><div class='add'>+		  .mmio_gpio_set    = { 1, 1, 0 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		},</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port         = 0x21,</div><div class='add'>+		  .has_hda_gpio     = false,</div><div class='add'>+		  .mmio_gpio_count  = 3,</div><div class='add'>+		  .mmio_gpio_pin    = { 2, 3, 5 },</div><div class='add'>+		  .mmio_gpio_set    = { 0, 1, 1 },</div><div class='add'>+		  .scp_cmds_count   = 0,</div><div class='add'>+		  .has_chipio_write = false,</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	{ .quirk_id = QUIRK_AE5,</div><div class='add'>+	  .has_headphone_gain = true,</div><div class='add'>+	  .is_ae_series       = true,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port          = 0xa4,</div><div class='add'>+		  .has_hda_gpio      = false,</div><div class='add'>+		  .mmio_gpio_count   = 0,</div><div class='add'>+		  .scp_cmds_count    = 2,</div><div class='add'>+		  .scp_cmd_mid       = { 0x96, 0x96 },</div><div class='add'>+		  .scp_cmd_req       = { SPEAKER_TUNING_FRONT_LEFT_INVERT,</div><div class='add'>+					 SPEAKER_TUNING_FRONT_RIGHT_INVERT },</div><div class='add'>+		  .scp_cmd_val       = { FLOAT_ZERO, FLOAT_ZERO },</div><div class='add'>+		  .has_chipio_write  = true,</div><div class='add'>+		  .chipio_write_addr = 0x0018b03c,</div><div class='add'>+		  .chipio_write_data = 0x00000012</div><div class='add'>+		},</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port          = 0xa1,</div><div class='add'>+		  .has_hda_gpio      = false,</div><div class='add'>+		  .mmio_gpio_count   = 0,</div><div class='add'>+		  .scp_cmds_count    = 2,</div><div class='add'>+		  .scp_cmd_mid       = { 0x96, 0x96 },</div><div class='add'>+		  .scp_cmd_req       = { SPEAKER_TUNING_FRONT_LEFT_INVERT,</div><div class='add'>+					 SPEAKER_TUNING_FRONT_RIGHT_INVERT },</div><div class='add'>+		  .scp_cmd_val       = { FLOAT_ONE, FLOAT_ONE },</div><div class='add'>+		  .has_chipio_write  = true,</div><div class='add'>+		  .chipio_write_addr = 0x0018b03c,</div><div class='add'>+		  .chipio_write_data = 0x00000012</div><div class='add'>+		} },</div><div class='add'>+	},</div><div class='add'>+	{ .quirk_id = QUIRK_AE7,</div><div class='add'>+	  .has_headphone_gain = true,</div><div class='add'>+	  .is_ae_series       = true,</div><div class='add'>+	  .out_set_info = {</div><div class='add'>+		/* Speakers. */</div><div class='add'>+		{ .dac2port          = 0x58,</div><div class='add'>+		  .has_hda_gpio      = false,</div><div class='add'>+		  .mmio_gpio_count   = 1,</div><div class='add'>+		  .mmio_gpio_pin     = { 0 },</div><div class='add'>+		  .mmio_gpio_set     = { 1 },</div><div class='add'>+		  .scp_cmds_count    = 2,</div><div class='add'>+		  .scp_cmd_mid       = { 0x96, 0x96 },</div><div class='add'>+		  .scp_cmd_req       = { SPEAKER_TUNING_FRONT_LEFT_INVERT,</div><div class='add'>+					 SPEAKER_TUNING_FRONT_RIGHT_INVERT },</div><div class='add'>+		  .scp_cmd_val       = { FLOAT_ZERO, FLOAT_ZERO },</div><div class='add'>+		  .has_chipio_write  = true,</div><div class='add'>+		  .chipio_write_addr = 0x0018b03c,</div><div class='add'>+		  .chipio_write_data = 0x00000000</div><div class='add'>+		},</div><div class='add'>+		/* Headphones. */</div><div class='add'>+		{ .dac2port          = 0x58,</div><div class='add'>+		  .has_hda_gpio      = false,</div><div class='add'>+		  .mmio_gpio_count   = 1,</div><div class='add'>+		  .mmio_gpio_pin     = { 0 },</div><div class='add'>+		  .mmio_gpio_set     = { 1 },</div><div class='add'>+		  .scp_cmds_count    = 2,</div><div class='add'>+		  .scp_cmd_mid       = { 0x96, 0x96 },</div><div class='add'>+		  .scp_cmd_req       = { SPEAKER_TUNING_FRONT_LEFT_INVERT,</div><div class='add'>+					 SPEAKER_TUNING_FRONT_RIGHT_INVERT },</div><div class='add'>+		  .scp_cmd_val       = { FLOAT_ONE, FLOAT_ONE },</div><div class='add'>+		  .has_chipio_write  = true,</div><div class='add'>+		  .chipio_write_addr = 0x0018b03c,</div><div class='add'>+		  .chipio_write_data = 0x00000010</div><div class='add'>+		} },</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 codec access</div><div class='add'>+ */</div><div class='add'>+static unsigned int codec_send_command(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		unsigned int verb, unsigned int parm, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned int response;</div><div class='add'>+	response = snd_hda_codec_read(codec, nid, 0, verb, parm);</div><div class='add'>+	*res = response;</div><div class='add'>+</div><div class='add'>+	return ((response == -1) ? -1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int codec_set_converter_format(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		unsigned short converter_format, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	return codec_send_command(codec, nid, VENDOR_CHIPIO_STREAM_FORMAT,</div><div class='add'>+				converter_format &amp; 0xffff, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int codec_set_converter_stream_channel(struct hda_codec *codec,</div><div class='add'>+				hda_nid_t nid, unsigned char stream,</div><div class='add'>+				unsigned char channel, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned char converter_stream_channel = 0;</div><div class='add'>+</div><div class='add'>+	converter_stream_channel = (stream &lt;&lt; 4) | (channel &amp; 0x0f);</div><div class='add'>+	return codec_send_command(codec, nid, AC_VERB_SET_CHANNEL_STREAMID,</div><div class='add'>+				converter_stream_channel, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Chip access helper function */</div><div class='add'>+static int chipio_send(struct hda_codec *codec,</div><div class='add'>+		       unsigned int reg,</div><div class='add'>+		       unsigned int data)</div><div class='add'>+{</div><div class='add'>+	unsigned int res;</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+</div><div class='add'>+	/* send bits of data specified by reg */</div><div class='add'>+	do {</div><div class='add'>+		res = snd_hda_codec_read(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					 reg, data);</div><div class='add'>+		if (res == VENDOR_STATUS_CHIPIO_OK)</div><div class='add'>+			return 0;</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, timeout));</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write chip address through the vendor widget -- NOT protected by the Mutex!</div><div class='add'>+ */</div><div class='add'>+static int chipio_write_address(struct hda_codec *codec,</div><div class='add'>+				unsigned int chip_addx)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;curr_chip_addx == chip_addx)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+	/* send low 16 bits of the address */</div><div class='add'>+	res = chipio_send(codec, VENDOR_CHIPIO_ADDRESS_LOW,</div><div class='add'>+			  chip_addx &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	if (res != -EIO) {</div><div class='add'>+		/* send high 16 bits of the address */</div><div class='add'>+		res = chipio_send(codec, VENDOR_CHIPIO_ADDRESS_HIGH,</div><div class='add'>+				  chip_addx &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;curr_chip_addx = (res &lt; 0) ? ~0U : chip_addx;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data through the vendor widget -- NOT protected by the Mutex!</div><div class='add'>+ */</div><div class='add'>+static int chipio_write_data(struct hda_codec *codec, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* send low 16 bits of the data */</div><div class='add'>+	res = chipio_send(codec, VENDOR_CHIPIO_DATA_LOW, data &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	if (res != -EIO) {</div><div class='add'>+		/* send high 16 bits of the data */</div><div class='add'>+		res = chipio_send(codec, VENDOR_CHIPIO_DATA_HIGH,</div><div class='add'>+				  data &gt;&gt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*If no error encountered, automatically increment the address</div><div class='add'>+	as per chip behaviour*/</div><div class='add'>+	spec-&gt;curr_chip_addx = (res != -EIO) ?</div><div class='add'>+					(spec-&gt;curr_chip_addx + 4) : ~0U;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write multiple data through the vendor widget -- NOT protected by the Mutex!</div><div class='add'>+ */</div><div class='add'>+static int chipio_write_data_multiple(struct hda_codec *codec,</div><div class='add'>+				      const u32 *data,</div><div class='add'>+				      unsigned int count)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	if (data == NULL) {</div><div class='add'>+		codec_dbg(codec, "chipio_write_data null ptr\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((count-- != 0) &amp;&amp; (status == 0))</div><div class='add'>+		status = chipio_write_data(codec, *data++);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read data through the vendor widget -- NOT protected by the Mutex!</div><div class='add'>+ */</div><div class='add'>+static int chipio_read_data(struct hda_codec *codec, unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* post read */</div><div class='add'>+	res = chipio_send(codec, VENDOR_CHIPIO_HIC_POST_READ, 0);</div><div class='add'>+</div><div class='add'>+	if (res != -EIO) {</div><div class='add'>+		/* read status */</div><div class='add'>+		res = chipio_send(codec, VENDOR_CHIPIO_STATUS, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (res != -EIO) {</div><div class='add'>+		/* read data */</div><div class='add'>+		*data = snd_hda_codec_read(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					   VENDOR_CHIPIO_HIC_READ_DATA,</div><div class='add'>+					   0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*If no error encountered, automatically increment the address</div><div class='add'>+	as per chip behaviour*/</div><div class='add'>+	spec-&gt;curr_chip_addx = (res != -EIO) ?</div><div class='add'>+					(spec-&gt;curr_chip_addx + 4) : ~0U;</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write given value to the given address through the chip I/O widget.</div><div class='add'>+ * protected by the Mutex</div><div class='add'>+ */</div><div class='add'>+static int chipio_write(struct hda_codec *codec,</div><div class='add'>+		unsigned int chip_addx, const unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	/* write the address, and if successful proceed to write data */</div><div class='add'>+	err = chipio_write_address(codec, chip_addx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return chipio_write_data(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write given value to the given address through the chip I/O widget.</div><div class='add'>+ * not protected by the Mutex</div><div class='add'>+ */</div><div class='add'>+static int chipio_write_no_mutex(struct hda_codec *codec,</div><div class='add'>+		unsigned int chip_addx, const unsigned int data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* write the address, and if successful proceed to write data */</div><div class='add'>+	err = chipio_write_address(codec, chip_addx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	err = chipio_write_data(codec, data);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write multiple values to the given address through the chip I/O widget.</div><div class='add'>+ * protected by the Mutex</div><div class='add'>+ */</div><div class='add'>+static int chipio_write_multiple(struct hda_codec *codec,</div><div class='add'>+				 u32 chip_addx,</div><div class='add'>+				 const u32 *data,</div><div class='add'>+				 unsigned int count)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+	status = chipio_write_address(codec, chip_addx);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	return chipio_write_data_multiple(codec, data, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Read the given address through the chip I/O widget</div><div class='add'>+ * protected by the Mutex</div><div class='add'>+ */</div><div class='add'>+static int chipio_read(struct hda_codec *codec,</div><div class='add'>+		unsigned int chip_addx, unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	/* write the address, and if successful proceed to write data */</div><div class='add'>+	err = chipio_write_address(codec, chip_addx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return chipio_read_data(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set chip control flags through the chip I/O widget.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_control_flag(struct hda_codec *codec,</div><div class='add'>+				    enum control_flag_id flag_id,</div><div class='add'>+				    bool flag_state)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	unsigned int flag_bit;</div><div class='add'>+</div><div class='add'>+	flag_bit = (flag_state ? 1 : 0);</div><div class='add'>+	val = (flag_bit &lt;&lt; 7) | (flag_id);</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_FLAG_SET, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set chip parameters through the chip I/O widget.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_control_param(struct hda_codec *codec,</div><div class='add'>+		enum control_param_id param_id, int param_val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if ((param_id &lt; 32) &amp;&amp; (param_val &lt; 8)) {</div><div class='add'>+		val = (param_val &lt;&lt; 5) | (param_id);</div><div class='add'>+		snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+				    VENDOR_CHIPIO_PARAM_SET, val);</div><div class='add'>+	} else {</div><div class='add'>+		guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+		if (chipio_send(codec, VENDOR_CHIPIO_STATUS, 0) == 0) {</div><div class='add'>+			snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					    VENDOR_CHIPIO_PARAM_EX_ID_SET,</div><div class='add'>+					    param_id);</div><div class='add'>+			snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					    VENDOR_CHIPIO_PARAM_EX_VALUE_SET,</div><div class='add'>+					    param_val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set chip parameters through the chip I/O widget. NO MUTEX.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_control_param_no_mutex(struct hda_codec *codec,</div><div class='add'>+		enum control_param_id param_id, int param_val)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if ((param_id &lt; 32) &amp;&amp; (param_val &lt; 8)) {</div><div class='add'>+		val = (param_val &lt;&lt; 5) | (param_id);</div><div class='add'>+		snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+				    VENDOR_CHIPIO_PARAM_SET, val);</div><div class='add'>+	} else {</div><div class='add'>+		if (chipio_send(codec, VENDOR_CHIPIO_STATUS, 0) == 0) {</div><div class='add'>+			snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					    VENDOR_CHIPIO_PARAM_EX_ID_SET,</div><div class='add'>+					    param_id);</div><div class='add'>+			snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+					    VENDOR_CHIPIO_PARAM_EX_VALUE_SET,</div><div class='add'>+					    param_val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * Connect stream to a source point, and then connect</div><div class='add'>+ * that source point to a destination point.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_stream_source_dest(struct hda_codec *codec,</div><div class='add'>+				int streamid, int source_point, int dest_point)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_ID, streamid);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_SOURCE_CONN_POINT, source_point);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_DEST_CONN_POINT, dest_point);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set number of channels in the selected stream.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_stream_channels(struct hda_codec *codec,</div><div class='add'>+				int streamid, unsigned int channels)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_ID, streamid);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAMS_CHANNELS, channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable/Disable audio stream.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_stream_control(struct hda_codec *codec,</div><div class='add'>+				int streamid, int enable)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_ID, streamid);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_CONTROL, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Get ChipIO audio stream's status.</div><div class='add'>+ */</div><div class='add'>+static void chipio_get_stream_control(struct hda_codec *codec,</div><div class='add'>+				int streamid, unsigned int *enable)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_STREAM_ID, streamid);</div><div class='add'>+	*enable = snd_hda_codec_read(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			   VENDOR_CHIPIO_PARAM_GET,</div><div class='add'>+			   CONTROL_PARAM_STREAM_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set sampling rate of the connection point. NO MUTEX.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_conn_rate_no_mutex(struct hda_codec *codec,</div><div class='add'>+				int connid, enum ca0132_sample_rate rate)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_CONN_POINT_ID, connid);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec,</div><div class='add'>+			CONTROL_PARAM_CONN_POINT_SAMPLE_RATE, rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set sampling rate of the connection point.</div><div class='add'>+ */</div><div class='add'>+static void chipio_set_conn_rate(struct hda_codec *codec,</div><div class='add'>+				int connid, enum ca0132_sample_rate rate)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_CONN_POINT_ID, connid);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_CONN_POINT_SAMPLE_RATE,</div><div class='add'>+				 rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes to the 8051's internal address space directly instead of indirectly,</div><div class='add'>+ * giving access to the special function registers located at addresses</div><div class='add'>+ * 0x80-0xFF.</div><div class='add'>+ */</div><div class='add'>+static void chipio_8051_write_direct(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	unsigned int verb;</div><div class='add'>+</div><div class='add'>+	verb = VENDOR_CHIPIO_8051_WRITE_DIRECT | data;</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, verb, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Writes to the 8051's exram, which has 16-bits of address space.</div><div class='add'>+ * Data at addresses 0x2000-0x7fff is mirrored to 0x8000-0xdfff.</div><div class='add'>+ * Data at 0x8000-0xdfff can also be used as program memory for the 8051 by</div><div class='add'>+ * setting the pmem bank selection SFR.</div><div class='add'>+ * 0xe000-0xffff is always mapped as program memory, with only 0xf000-0xffff</div><div class='add'>+ * being writable.</div><div class='add'>+ */</div><div class='add'>+static void chipio_8051_set_address(struct hda_codec *codec, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	/* Lower 8-bits. */</div><div class='add'>+	tmp = addr &amp; 0xff;</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_8051_ADDRESS_LOW, tmp);</div><div class='add'>+</div><div class='add'>+	/* Upper 8-bits. */</div><div class='add'>+	tmp = (addr &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_8051_ADDRESS_HIGH, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipio_8051_set_data(struct hda_codec *codec, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	/* 8-bits of data. */</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_8051_DATA_WRITE, data &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int chipio_8051_get_data(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_codec_read(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+				   VENDOR_CHIPIO_8051_DATA_READ, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PLL_PMU writes share the lower address register of the 8051 exram writes. */</div><div class='add'>+static void chipio_8051_set_data_pll(struct hda_codec *codec, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	/* 8-bits of data. */</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PLL_PMU_WRITE, data &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipio_8051_write_exram(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_8051_set_address(codec, addr);</div><div class='add'>+	chipio_8051_set_data(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipio_8051_write_exram_no_mutex(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	chipio_8051_set_address(codec, addr);</div><div class='add'>+	chipio_8051_set_data(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Readback data from the 8051's exram. No mutex. */</div><div class='add'>+static void chipio_8051_read_exram(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	chipio_8051_set_address(codec, addr);</div><div class='add'>+	*data = chipio_8051_get_data(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipio_8051_write_pll_pmu(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_8051_set_address(codec, addr &amp; 0xff);</div><div class='add'>+	chipio_8051_set_data_pll(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chipio_8051_write_pll_pmu_no_mutex(struct hda_codec *codec,</div><div class='add'>+		unsigned int addr, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	chipio_8051_set_address(codec, addr &amp; 0xff);</div><div class='add'>+	chipio_8051_set_data_pll(codec, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable clocks.</div><div class='add'>+ */</div><div class='add'>+static void chipio_enable_clocks(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu_no_mutex(codec, 0x00, 0xff);</div><div class='add'>+	chipio_8051_write_pll_pmu_no_mutex(codec, 0x05, 0x0b);</div><div class='add'>+	chipio_8051_write_pll_pmu_no_mutex(codec, 0x06, 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 DSP IO stuffs</div><div class='add'>+ */</div><div class='add'>+static int dspio_send(struct hda_codec *codec, unsigned int reg,</div><div class='add'>+		      unsigned int data)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+</div><div class='add'>+	/* send bits of data specified by reg to dsp */</div><div class='add'>+	do {</div><div class='add'>+		res = snd_hda_codec_read(codec, WIDGET_DSP_CTRL, 0, reg, data);</div><div class='add'>+		if ((res &gt;= 0) &amp;&amp; (res != VENDOR_STATUS_DSPIO_BUSY))</div><div class='add'>+			return res;</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, timeout));</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait for DSP to be ready for commands</div><div class='add'>+ */</div><div class='add'>+static void dspio_write_wait(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = snd_hda_codec_read(codec, WIDGET_DSP_CTRL, 0,</div><div class='add'>+						VENDOR_DSPIO_STATUS, 0);</div><div class='add'>+		if ((status == VENDOR_STATUS_DSPIO_OK) ||</div><div class='add'>+		    (status == VENDOR_STATUS_DSPIO_SCP_RESPONSE_QUEUE_EMPTY))</div><div class='add'>+			break;</div><div class='add'>+		msleep(1);</div><div class='add'>+	} while (time_before(jiffies, timeout));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write SCP data to DSP</div><div class='add'>+ */</div><div class='add'>+static int dspio_write(struct hda_codec *codec, unsigned int scp_data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	dspio_write_wait(codec);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+	status = dspio_send(codec, VENDOR_DSPIO_SCP_WRITE_DATA_LOW,</div><div class='add'>+			    scp_data &amp; 0xffff);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = dspio_send(codec, VENDOR_DSPIO_SCP_WRITE_DATA_HIGH,</div><div class='add'>+				    scp_data &gt;&gt; 16);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	/* OK, now check if the write itself has executed*/</div><div class='add'>+	status = snd_hda_codec_read(codec, WIDGET_DSP_CTRL, 0,</div><div class='add'>+				    VENDOR_DSPIO_STATUS, 0);</div><div class='add'>+</div><div class='add'>+	return (status == VENDOR_STATUS_DSPIO_SCP_COMMAND_QUEUE_FULL) ?</div><div class='add'>+			-EIO : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write multiple SCP data to DSP</div><div class='add'>+ */</div><div class='add'>+static int dspio_write_multiple(struct hda_codec *codec,</div><div class='add'>+				unsigned int *buffer, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	if (buffer == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	while (count &lt; size) {</div><div class='add'>+		status = dspio_write(codec, *buffer++);</div><div class='add'>+		if (status != 0)</div><div class='add'>+			break;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dspio_read(struct hda_codec *codec, unsigned int *data)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = dspio_send(codec, VENDOR_DSPIO_SCP_POST_READ_DATA, 0);</div><div class='add'>+	if (status == -EIO)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	status = dspio_send(codec, VENDOR_DSPIO_STATUS, 0);</div><div class='add'>+	if (status == -EIO ||</div><div class='add'>+	    status == VENDOR_STATUS_DSPIO_SCP_RESPONSE_QUEUE_EMPTY)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	*data = snd_hda_codec_read(codec, WIDGET_DSP_CTRL, 0,</div><div class='add'>+				   VENDOR_DSPIO_SCP_READ_DATA, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dspio_read_multiple(struct hda_codec *codec, unsigned int *buffer,</div><div class='add'>+			       unsigned int *buf_size, unsigned int size_count)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int size = *buf_size;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned int skip_count;</div><div class='add'>+	unsigned int dummy;</div><div class='add'>+</div><div class='add'>+	if (buffer == NULL)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	while (count &lt; size &amp;&amp; count &lt; size_count) {</div><div class='add'>+		status = dspio_read(codec, buffer++);</div><div class='add'>+		if (status != 0)</div><div class='add'>+			break;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skip_count = count;</div><div class='add'>+	if (status == 0) {</div><div class='add'>+		while (skip_count &lt; size) {</div><div class='add'>+			status = dspio_read(codec, &amp;dummy);</div><div class='add'>+			if (status != 0)</div><div class='add'>+				break;</div><div class='add'>+			skip_count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*buf_size = count;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Construct the SCP header using corresponding fields</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int</div><div class='add'>+make_scp_header(unsigned int target_id, unsigned int source_id,</div><div class='add'>+		unsigned int get_flag, unsigned int req,</div><div class='add'>+		unsigned int device_flag, unsigned int resp_flag,</div><div class='add'>+		unsigned int error_flag, unsigned int data_size)</div><div class='add'>+{</div><div class='add'>+	unsigned int header = 0;</div><div class='add'>+</div><div class='add'>+	header = (data_size &amp; 0x1f) &lt;&lt; 27;</div><div class='add'>+	header |= (error_flag &amp; 0x01) &lt;&lt; 26;</div><div class='add'>+	header |= (resp_flag &amp; 0x01) &lt;&lt; 25;</div><div class='add'>+	header |= (device_flag &amp; 0x01) &lt;&lt; 24;</div><div class='add'>+	header |= (req &amp; 0x7f) &lt;&lt; 17;</div><div class='add'>+	header |= (get_flag &amp; 0x01) &lt;&lt; 16;</div><div class='add'>+	header |= (source_id &amp; 0xff) &lt;&lt; 8;</div><div class='add'>+	header |= target_id &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return header;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extract corresponding fields from SCP header</div><div class='add'>+ */</div><div class='add'>+static inline void</div><div class='add'>+extract_scp_header(unsigned int header,</div><div class='add'>+		   unsigned int *target_id, unsigned int *source_id,</div><div class='add'>+		   unsigned int *get_flag, unsigned int *req,</div><div class='add'>+		   unsigned int *device_flag, unsigned int *resp_flag,</div><div class='add'>+		   unsigned int *error_flag, unsigned int *data_size)</div><div class='add'>+{</div><div class='add'>+	if (data_size)</div><div class='add'>+		*data_size = (header &gt;&gt; 27) &amp; 0x1f;</div><div class='add'>+	if (error_flag)</div><div class='add'>+		*error_flag = (header &gt;&gt; 26) &amp; 0x01;</div><div class='add'>+	if (resp_flag)</div><div class='add'>+		*resp_flag = (header &gt;&gt; 25) &amp; 0x01;</div><div class='add'>+	if (device_flag)</div><div class='add'>+		*device_flag = (header &gt;&gt; 24) &amp; 0x01;</div><div class='add'>+	if (req)</div><div class='add'>+		*req = (header &gt;&gt; 17) &amp; 0x7f;</div><div class='add'>+	if (get_flag)</div><div class='add'>+		*get_flag = (header &gt;&gt; 16) &amp; 0x01;</div><div class='add'>+	if (source_id)</div><div class='add'>+		*source_id = (header &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	if (target_id)</div><div class='add'>+		*target_id = header &amp; 0xff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SCP_MAX_DATA_WORDS  (16)</div><div class='add'>+</div><div class='add'>+/* Structure to contain any SCP message */</div><div class='add'>+struct scp_msg {</div><div class='add'>+	unsigned int hdr;</div><div class='add'>+	unsigned int data[SCP_MAX_DATA_WORDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dspio_clear_response_queue(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+	unsigned int dummy = 0;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* clear all from the response queue */</div><div class='add'>+	do {</div><div class='add'>+		status = dspio_read(codec, &amp;dummy);</div><div class='add'>+	} while (status == 0 &amp;&amp; time_before(jiffies, timeout));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dspio_get_response_data(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int data = 0;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	if (dspio_read(codec, &amp;data) &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if ((data &amp; 0x00ffffff) == spec-&gt;wait_scp_header) {</div><div class='add'>+		spec-&gt;scp_resp_header = data;</div><div class='add'>+		spec-&gt;scp_resp_count = data &gt;&gt; 27;</div><div class='add'>+		count = spec-&gt;wait_num_data;</div><div class='add'>+		dspio_read_multiple(codec, spec-&gt;scp_resp_data,</div><div class='add'>+				    &amp;spec-&gt;scp_resp_count, count);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send SCP message to DSP</div><div class='add'>+ */</div><div class='add'>+static int dspio_send_scp_message(struct hda_codec *codec,</div><div class='add'>+				  unsigned char *send_buf,</div><div class='add'>+				  unsigned int send_buf_size,</div><div class='add'>+				  unsigned char *return_buf,</div><div class='add'>+				  unsigned int return_buf_size,</div><div class='add'>+				  unsigned int *bytes_returned)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int status;</div><div class='add'>+	unsigned int scp_send_size = 0;</div><div class='add'>+	unsigned int total_size;</div><div class='add'>+	bool waiting_for_resp = false;</div><div class='add'>+	unsigned int header;</div><div class='add'>+	struct scp_msg *ret_msg;</div><div class='add'>+	unsigned int resp_src_id, resp_target_id;</div><div class='add'>+	unsigned int data_size, src_id, target_id, get_flag, device_flag;</div><div class='add'>+</div><div class='add'>+	if (bytes_returned)</div><div class='add'>+		*bytes_returned = 0;</div><div class='add'>+</div><div class='add'>+	/* get scp header from buffer */</div><div class='add'>+	header = *((unsigned int *)send_buf);</div><div class='add'>+	extract_scp_header(header, &amp;target_id, &amp;src_id, &amp;get_flag, NULL,</div><div class='add'>+			   &amp;device_flag, NULL, NULL, &amp;data_size);</div><div class='add'>+	scp_send_size = data_size + 1;</div><div class='add'>+	total_size = (scp_send_size * 4);</div><div class='add'>+</div><div class='add'>+	if (send_buf_size &lt; total_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (get_flag || device_flag) {</div><div class='add'>+		if (!return_buf || return_buf_size &lt; 4 || !bytes_returned)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		spec-&gt;wait_scp_header = *((unsigned int *)send_buf);</div><div class='add'>+</div><div class='add'>+		/* swap source id with target id */</div><div class='add'>+		resp_target_id = src_id;</div><div class='add'>+		resp_src_id = target_id;</div><div class='add'>+		spec-&gt;wait_scp_header &amp;= 0xffff0000;</div><div class='add'>+		spec-&gt;wait_scp_header |= (resp_src_id &lt;&lt; 8) | (resp_target_id);</div><div class='add'>+		spec-&gt;wait_num_data = return_buf_size/sizeof(unsigned int) - 1;</div><div class='add'>+		spec-&gt;wait_scp = 1;</div><div class='add'>+		waiting_for_resp = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = dspio_write_multiple(codec, (unsigned int *)send_buf,</div><div class='add'>+				      scp_send_size);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		spec-&gt;wait_scp = 0;</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (waiting_for_resp) {</div><div class='add'>+		unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+		memset(return_buf, 0, return_buf_size);</div><div class='add'>+		do {</div><div class='add'>+			msleep(20);</div><div class='add'>+		} while (spec-&gt;wait_scp &amp;&amp; time_before(jiffies, timeout));</div><div class='add'>+		waiting_for_resp = false;</div><div class='add'>+		if (!spec-&gt;wait_scp) {</div><div class='add'>+			ret_msg = (struct scp_msg *)return_buf;</div><div class='add'>+			memcpy(&amp;ret_msg-&gt;hdr, &amp;spec-&gt;scp_resp_header, 4);</div><div class='add'>+			memcpy(&amp;ret_msg-&gt;data, spec-&gt;scp_resp_data,</div><div class='add'>+			       spec-&gt;wait_num_data);</div><div class='add'>+			*bytes_returned = (spec-&gt;scp_resp_count + 1) * 4;</div><div class='add'>+			status = 0;</div><div class='add'>+		} else {</div><div class='add'>+			status = -EIO;</div><div class='add'>+		}</div><div class='add'>+		spec-&gt;wait_scp = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dspio_scp - Prepare and send the SCP message to DSP</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mod_id: ID of the DSP module to send the command</div><div class='add'>+ * @src_id: ID of the source</div><div class='add'>+ * @req: ID of request to send to the DSP module</div><div class='add'>+ * @dir: SET or GET</div><div class='add'>+ * @data: pointer to the data to send with the request, request specific</div><div class='add'>+ * @len: length of the data, in bytes</div><div class='add'>+ * @reply: point to the buffer to hold data returned for a reply</div><div class='add'>+ * @reply_len: length of the reply buffer returned from GET</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int dspio_scp(struct hda_codec *codec,</div><div class='add'>+		int mod_id, int src_id, int req, int dir, const void *data,</div><div class='add'>+		unsigned int len, void *reply, unsigned int *reply_len)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	struct scp_msg scp_send, scp_reply;</div><div class='add'>+	unsigned int ret_bytes, send_size, ret_size;</div><div class='add'>+	unsigned int send_get_flag, reply_resp_flag, reply_error_flag;</div><div class='add'>+	unsigned int reply_data_size;</div><div class='add'>+</div><div class='add'>+	memset(&amp;scp_send, 0, sizeof(scp_send));</div><div class='add'>+	memset(&amp;scp_reply, 0, sizeof(scp_reply));</div><div class='add'>+</div><div class='add'>+	if ((len != 0 &amp;&amp; data == NULL) || (len &gt; SCP_MAX_DATA_WORDS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (dir == SCP_GET &amp;&amp; reply == NULL) {</div><div class='add'>+		codec_dbg(codec, "dspio_scp get but has no buffer\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reply != NULL &amp;&amp; (reply_len == NULL || (*reply_len == 0))) {</div><div class='add'>+		codec_dbg(codec, "dspio_scp bad resp buf len parms\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scp_send.hdr = make_scp_header(mod_id, src_id, (dir == SCP_GET), req,</div><div class='add'>+				       0, 0, 0, len/sizeof(unsigned int));</div><div class='add'>+	if (data != NULL &amp;&amp; len &gt; 0) {</div><div class='add'>+		len = min((unsigned int)(sizeof(scp_send.data)), len);</div><div class='add'>+		memcpy(scp_send.data, data, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret_bytes = 0;</div><div class='add'>+	send_size = sizeof(unsigned int) + len;</div><div class='add'>+	status = dspio_send_scp_message(codec, (unsigned char *)&amp;scp_send,</div><div class='add'>+					send_size, (unsigned char *)&amp;scp_reply,</div><div class='add'>+					sizeof(scp_reply), &amp;ret_bytes);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "dspio_scp: send scp msg failed\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* extract send and reply headers members */</div><div class='add'>+	extract_scp_header(scp_send.hdr, NULL, NULL, &amp;send_get_flag,</div><div class='add'>+			   NULL, NULL, NULL, NULL, NULL);</div><div class='add'>+	extract_scp_header(scp_reply.hdr, NULL, NULL, NULL, NULL, NULL,</div><div class='add'>+			   &amp;reply_resp_flag, &amp;reply_error_flag,</div><div class='add'>+			   &amp;reply_data_size);</div><div class='add'>+</div><div class='add'>+	if (!send_get_flag)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (reply_resp_flag &amp;&amp; !reply_error_flag) {</div><div class='add'>+		ret_size = (ret_bytes - sizeof(scp_reply.hdr))</div><div class='add'>+					/ sizeof(unsigned int);</div><div class='add'>+</div><div class='add'>+		if (*reply_len &lt; ret_size*sizeof(unsigned int)) {</div><div class='add'>+			codec_dbg(codec, "reply too long for buf\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		} else if (ret_size != reply_data_size) {</div><div class='add'>+			codec_dbg(codec, "RetLen and HdrLen .NE.\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		} else if (!reply) {</div><div class='add'>+			codec_dbg(codec, "NULL reply\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		} else {</div><div class='add'>+			*reply_len = ret_size*sizeof(unsigned int);</div><div class='add'>+			memcpy(reply, scp_reply.data, *reply_len);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "reply ill-formed or errflag set\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set DSP parameters</div><div class='add'>+ */</div><div class='add'>+static int dspio_set_param(struct hda_codec *codec, int mod_id,</div><div class='add'>+			int src_id, int req, const void *data, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return dspio_scp(codec, mod_id, src_id, req, SCP_SET, data, len, NULL,</div><div class='add'>+			NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dspio_set_uint_param(struct hda_codec *codec, int mod_id,</div><div class='add'>+			int req, const unsigned int data)</div><div class='add'>+{</div><div class='add'>+	return dspio_set_param(codec, mod_id, 0x20, req, &amp;data,</div><div class='add'>+			sizeof(unsigned int));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate a DSP DMA channel via an SCP message</div><div class='add'>+ */</div><div class='add'>+static int dspio_alloc_dma_chan(struct hda_codec *codec, unsigned int *dma_chan)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int size = sizeof(*dma_chan);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dspio_alloc_dma_chan() -- begin\n");</div><div class='add'>+	status = dspio_scp(codec, MASTERCONTROL, 0x20,</div><div class='add'>+			MASTERCONTROL_ALLOC_DMA_CHAN, SCP_GET, NULL, 0,</div><div class='add'>+			dma_chan, &amp;size);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "dspio_alloc_dma_chan: SCP Failed\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((*dma_chan + 1) == 0) {</div><div class='add'>+		codec_dbg(codec, "no free dma channels to allocate\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "dspio_alloc_dma_chan: chan=%d\n", *dma_chan);</div><div class='add'>+	codec_dbg(codec, "     dspio_alloc_dma_chan() -- complete\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free a DSP DMA via an SCP message</div><div class='add'>+ */</div><div class='add'>+static int dspio_free_dma_chan(struct hda_codec *codec, unsigned int dma_chan)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int dummy = 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dspio_free_dma_chan() -- begin\n");</div><div class='add'>+	codec_dbg(codec, "dspio_free_dma_chan: chan=%d\n", dma_chan);</div><div class='add'>+</div><div class='add'>+	status = dspio_scp(codec, MASTERCONTROL, 0x20,</div><div class='add'>+			MASTERCONTROL_ALLOC_DMA_CHAN, SCP_SET, &amp;dma_chan,</div><div class='add'>+			sizeof(dma_chan), NULL, &amp;dummy);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "dspio_free_dma_chan: SCP Failed\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dspio_free_dma_chan() -- complete\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * (Re)start the DSP</div><div class='add'>+ */</div><div class='add'>+static int dsp_set_run_state(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int dbg_ctrl_reg;</div><div class='add'>+	unsigned int halt_state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = chipio_read(codec, DSP_DBGCNTL_INST_OFFSET, &amp;dbg_ctrl_reg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	halt_state = (dbg_ctrl_reg &amp; DSP_DBGCNTL_STATE_MASK) &gt;&gt;</div><div class='add'>+		      DSP_DBGCNTL_STATE_LOBIT;</div><div class='add'>+</div><div class='add'>+	if (halt_state != 0) {</div><div class='add'>+		dbg_ctrl_reg &amp;= ~((halt_state &lt;&lt; DSP_DBGCNTL_SS_LOBIT) &amp;</div><div class='add'>+				  DSP_DBGCNTL_SS_MASK);</div><div class='add'>+		err = chipio_write(codec, DSP_DBGCNTL_INST_OFFSET,</div><div class='add'>+				   dbg_ctrl_reg);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		dbg_ctrl_reg |= (halt_state &lt;&lt; DSP_DBGCNTL_EXEC_LOBIT) &amp;</div><div class='add'>+				DSP_DBGCNTL_EXEC_MASK;</div><div class='add'>+		err = chipio_write(codec, DSP_DBGCNTL_INST_OFFSET,</div><div class='add'>+				   dbg_ctrl_reg);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Reset the DSP</div><div class='add'>+ */</div><div class='add'>+static int dsp_reset(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int res;</div><div class='add'>+	int retry = 20;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "dsp_reset\n");</div><div class='add'>+	do {</div><div class='add'>+		res = dspio_send(codec, VENDOR_DSPIO_DSP_INIT, 0);</div><div class='add'>+		retry--;</div><div class='add'>+	} while (res == -EIO &amp;&amp; retry);</div><div class='add'>+</div><div class='add'>+	if (!retry) {</div><div class='add'>+		codec_dbg(codec, "dsp_reset timeout\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert chip address to DSP address</div><div class='add'>+ */</div><div class='add'>+static unsigned int dsp_chip_to_dsp_addx(unsigned int chip_addx,</div><div class='add'>+					bool *code, bool *yram)</div><div class='add'>+{</div><div class='add'>+	*code = *yram = false;</div><div class='add'>+</div><div class='add'>+	if (UC_RANGE(chip_addx, 1)) {</div><div class='add'>+		*code = true;</div><div class='add'>+		return UC_OFF(chip_addx);</div><div class='add'>+	} else if (X_RANGE_ALL(chip_addx, 1)) {</div><div class='add'>+		return X_OFF(chip_addx);</div><div class='add'>+	} else if (Y_RANGE_ALL(chip_addx, 1)) {</div><div class='add'>+		*yram = true;</div><div class='add'>+		return Y_OFF(chip_addx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return INVALID_CHIP_ADDRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if the DSP DMA is active</div><div class='add'>+ */</div><div class='add'>+static bool dsp_is_dma_active(struct hda_codec *codec, unsigned int dma_chan)</div><div class='add'>+{</div><div class='add'>+	unsigned int dma_chnlstart_reg;</div><div class='add'>+</div><div class='add'>+	chipio_read(codec, DSPDMAC_CHNLSTART_INST_OFFSET, &amp;dma_chnlstart_reg);</div><div class='add'>+</div><div class='add'>+	return ((dma_chnlstart_reg &amp; (1 &lt;&lt;</div><div class='add'>+			(DSPDMAC_CHNLSTART_EN_LOBIT + dma_chan))) != 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsp_dma_setup_common(struct hda_codec *codec,</div><div class='add'>+				unsigned int chip_addx,</div><div class='add'>+				unsigned int dma_chan,</div><div class='add'>+				unsigned int port_map_mask,</div><div class='add'>+				bool ovly)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int chnl_prop;</div><div class='add'>+	unsigned int dsp_addx;</div><div class='add'>+	unsigned int active;</div><div class='add'>+	bool code, yram;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_setup_common() -- Begin ---------\n");</div><div class='add'>+</div><div class='add'>+	if (dma_chan &gt;= DSPDMAC_DMA_CFG_CHANNEL_COUNT) {</div><div class='add'>+		codec_dbg(codec, "dma chan num invalid\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsp_is_dma_active(codec, dma_chan)) {</div><div class='add'>+		codec_dbg(codec, "dma already active\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsp_addx = dsp_chip_to_dsp_addx(chip_addx, &amp;code, &amp;yram);</div><div class='add'>+</div><div class='add'>+	if (dsp_addx == INVALID_CHIP_ADDRESS) {</div><div class='add'>+		codec_dbg(codec, "invalid chip addr\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chnl_prop = DSPDMAC_CHNLPROP_AC_MASK;</div><div class='add'>+	active = 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup_common()    start reg pgm\n");</div><div class='add'>+</div><div class='add'>+	if (ovly) {</div><div class='add'>+		status = chipio_read(codec, DSPDMAC_CHNLPROP_INST_OFFSET,</div><div class='add'>+				     &amp;chnl_prop);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "read CHNLPROP Reg fail\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		codec_dbg(codec, "dsp_dma_setup_common() Read CHNLPROP\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!code)</div><div class='add'>+		chnl_prop &amp;= ~(1 &lt;&lt; (DSPDMAC_CHNLPROP_MSPCE_LOBIT + dma_chan));</div><div class='add'>+	else</div><div class='add'>+		chnl_prop |=  (1 &lt;&lt; (DSPDMAC_CHNLPROP_MSPCE_LOBIT + dma_chan));</div><div class='add'>+</div><div class='add'>+	chnl_prop &amp;= ~(1 &lt;&lt; (DSPDMAC_CHNLPROP_DCON_LOBIT + dma_chan));</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_CHNLPROP_INST_OFFSET, chnl_prop);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write CHNLPROP Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup_common()    Write CHNLPROP\n");</div><div class='add'>+</div><div class='add'>+	if (ovly) {</div><div class='add'>+		status = chipio_read(codec, DSPDMAC_ACTIVE_INST_OFFSET,</div><div class='add'>+				     &amp;active);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "read ACTIVE Reg fail\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		codec_dbg(codec, "dsp_dma_setup_common() Read ACTIVE\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	active &amp;= (~(1 &lt;&lt; (DSPDMAC_ACTIVE_AAR_LOBIT + dma_chan))) &amp;</div><div class='add'>+		DSPDMAC_ACTIVE_AAR_MASK;</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_ACTIVE_INST_OFFSET, active);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write ACTIVE Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup_common()    Write ACTIVE\n");</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_AUDCHSEL_INST_OFFSET(dma_chan),</div><div class='add'>+			      port_map_mask);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write AUDCHSEL Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup_common()    Write AUDCHSEL\n");</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_IRQCNT_INST_OFFSET(dma_chan),</div><div class='add'>+			DSPDMAC_IRQCNT_BICNT_MASK | DSPDMAC_IRQCNT_CICNT_MASK);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write IRQCNT Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup_common()    Write IRQCNT\n");</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		   "ChipA=0x%x,DspA=0x%x,dmaCh=%u, "</div><div class='add'>+		   "CHSEL=0x%x,CHPROP=0x%x,Active=0x%x\n",</div><div class='add'>+		   chip_addx, dsp_addx, dma_chan,</div><div class='add'>+		   port_map_mask, chnl_prop, active);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_setup_common() -- Complete ------\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup the DSP DMA per-transfer-specific registers</div><div class='add'>+ */</div><div class='add'>+static int dsp_dma_setup(struct hda_codec *codec,</div><div class='add'>+			unsigned int chip_addx,</div><div class='add'>+			unsigned int count,</div><div class='add'>+			unsigned int dma_chan)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	bool code, yram;</div><div class='add'>+	unsigned int dsp_addx;</div><div class='add'>+	unsigned int addr_field;</div><div class='add'>+	unsigned int incr_field;</div><div class='add'>+	unsigned int base_cnt;</div><div class='add'>+	unsigned int cur_cnt;</div><div class='add'>+	unsigned int dma_cfg = 0;</div><div class='add'>+	unsigned int adr_ofs = 0;</div><div class='add'>+	unsigned int xfr_cnt = 0;</div><div class='add'>+	const unsigned int max_dma_count = 1 &lt;&lt; (DSPDMAC_XFRCNT_BCNT_HIBIT -</div><div class='add'>+						DSPDMAC_XFRCNT_BCNT_LOBIT + 1);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_setup() -- Begin ---------\n");</div><div class='add'>+</div><div class='add'>+	if (count &gt; max_dma_count) {</div><div class='add'>+		codec_dbg(codec, "count too big\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsp_addx = dsp_chip_to_dsp_addx(chip_addx, &amp;code, &amp;yram);</div><div class='add'>+	if (dsp_addx == INVALID_CHIP_ADDRESS) {</div><div class='add'>+		codec_dbg(codec, "invalid chip addr\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup()    start reg pgm\n");</div><div class='add'>+</div><div class='add'>+	addr_field = dsp_addx &lt;&lt; DSPDMAC_DMACFG_DBADR_LOBIT;</div><div class='add'>+	incr_field   = 0;</div><div class='add'>+</div><div class='add'>+	if (!code) {</div><div class='add'>+		addr_field &lt;&lt;= 1;</div><div class='add'>+		if (yram)</div><div class='add'>+			addr_field |= (1 &lt;&lt; DSPDMAC_DMACFG_DBADR_LOBIT);</div><div class='add'>+</div><div class='add'>+		incr_field  = (1 &lt;&lt; DSPDMAC_DMACFG_AINCR_LOBIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_cfg = addr_field + incr_field;</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_DMACFG_INST_OFFSET(dma_chan),</div><div class='add'>+				dma_cfg);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write DMACFG Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup()    Write DMACFG\n");</div><div class='add'>+</div><div class='add'>+	adr_ofs = (count - 1) &lt;&lt; (DSPDMAC_DSPADROFS_BOFS_LOBIT +</div><div class='add'>+							(code ? 0 : 1));</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_DSPADROFS_INST_OFFSET(dma_chan),</div><div class='add'>+				adr_ofs);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write DSPADROFS Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup()    Write DSPADROFS\n");</div><div class='add'>+</div><div class='add'>+	base_cnt = (count - 1) &lt;&lt; DSPDMAC_XFRCNT_BCNT_LOBIT;</div><div class='add'>+</div><div class='add'>+	cur_cnt  = (count - 1) &lt;&lt; DSPDMAC_XFRCNT_CCNT_LOBIT;</div><div class='add'>+</div><div class='add'>+	xfr_cnt = base_cnt | cur_cnt;</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec,</div><div class='add'>+				DSPDMAC_XFRCNT_INST_OFFSET(dma_chan), xfr_cnt);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write XFRCNT Reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "   dsp_dma_setup()    Write XFRCNT\n");</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		   "ChipA=0x%x, cnt=0x%x, DMACFG=0x%x, "</div><div class='add'>+		   "ADROFS=0x%x, XFRCNT=0x%x\n",</div><div class='add'>+		   chip_addx, count, dma_cfg, adr_ofs, xfr_cnt);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_setup() -- Complete ---------\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Start the DSP DMA</div><div class='add'>+ */</div><div class='add'>+static int dsp_dma_start(struct hda_codec *codec,</div><div class='add'>+			 unsigned int dma_chan, bool ovly)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg = 0;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_start() -- Begin ---------\n");</div><div class='add'>+</div><div class='add'>+	if (ovly) {</div><div class='add'>+		status = chipio_read(codec,</div><div class='add'>+				     DSPDMAC_CHNLSTART_INST_OFFSET, &amp;reg);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "read CHNLSTART reg fail\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		codec_dbg(codec, "-- dsp_dma_start()    Read CHNLSTART\n");</div><div class='add'>+</div><div class='add'>+		reg &amp;= ~(DSPDMAC_CHNLSTART_EN_MASK |</div><div class='add'>+				DSPDMAC_CHNLSTART_DIS_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_CHNLSTART_INST_OFFSET,</div><div class='add'>+			reg | (1 &lt;&lt; (dma_chan + DSPDMAC_CHNLSTART_EN_LOBIT)));</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write CHNLSTART reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_start() -- Complete ---------\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stop the DSP DMA</div><div class='add'>+ */</div><div class='add'>+static int dsp_dma_stop(struct hda_codec *codec,</div><div class='add'>+			unsigned int dma_chan, bool ovly)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg = 0;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_stop() -- Begin ---------\n");</div><div class='add'>+</div><div class='add'>+	if (ovly) {</div><div class='add'>+		status = chipio_read(codec,</div><div class='add'>+				     DSPDMAC_CHNLSTART_INST_OFFSET, &amp;reg);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "read CHNLSTART reg fail\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		codec_dbg(codec, "-- dsp_dma_stop()    Read CHNLSTART\n");</div><div class='add'>+		reg &amp;= ~(DSPDMAC_CHNLSTART_EN_MASK |</div><div class='add'>+				DSPDMAC_CHNLSTART_DIS_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = chipio_write(codec, DSPDMAC_CHNLSTART_INST_OFFSET,</div><div class='add'>+			reg | (1 &lt;&lt; (dma_chan + DSPDMAC_CHNLSTART_DIS_LOBIT)));</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "write CHNLSTART reg fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "-- dsp_dma_stop() -- Complete ---------\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dsp_allocate_router_ports - Allocate router ports</div><div class='add'>+ *</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @num_chans: number of channels in the stream</div><div class='add'>+ * @ports_per_channel: number of ports per channel</div><div class='add'>+ * @start_device: start device</div><div class='add'>+ * @port_map: pointer to the port list to hold the allocated ports</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int dsp_allocate_router_ports(struct hda_codec *codec,</div><div class='add'>+				     unsigned int num_chans,</div><div class='add'>+				     unsigned int ports_per_channel,</div><div class='add'>+				     unsigned int start_device,</div><div class='add'>+				     unsigned int *port_map)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	int res;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	status = chipio_send(codec, VENDOR_CHIPIO_STATUS, 0);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	val = start_device &lt;&lt; 6;</div><div class='add'>+	val |= (ports_per_channel - 1) &lt;&lt; 4;</div><div class='add'>+	val |= num_chans - 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PORT_ALLOC_CONFIG_SET,</div><div class='add'>+			    val);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PORT_ALLOC_SET,</div><div class='add'>+			    MEM_CONNID_DSP);</div><div class='add'>+</div><div class='add'>+	status = chipio_send(codec, VENDOR_CHIPIO_STATUS, 0);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	res = snd_hda_codec_read(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+				VENDOR_CHIPIO_PORT_ALLOC_GET, 0);</div><div class='add'>+</div><div class='add'>+	*port_map = res;</div><div class='add'>+</div><div class='add'>+	return (res &lt; 0) ? res : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Free router ports</div><div class='add'>+ */</div><div class='add'>+static int dsp_free_router_ports(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	status = chipio_send(codec, VENDOR_CHIPIO_STATUS, 0);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PORT_FREE_SET,</div><div class='add'>+			    MEM_CONNID_DSP);</div><div class='add'>+</div><div class='add'>+	status = chipio_send(codec, VENDOR_CHIPIO_STATUS, 0);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Allocate DSP ports for the download stream</div><div class='add'>+ */</div><div class='add'>+static int dsp_allocate_ports(struct hda_codec *codec,</div><div class='add'>+			unsigned int num_chans,</div><div class='add'>+			unsigned int rate_multi, unsigned int *port_map)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dsp_allocate_ports() -- begin\n");</div><div class='add'>+</div><div class='add'>+	if ((rate_multi != 1) &amp;&amp; (rate_multi != 2) &amp;&amp; (rate_multi != 4)) {</div><div class='add'>+		codec_dbg(codec, "bad rate multiple\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = dsp_allocate_router_ports(codec, num_chans,</div><div class='add'>+					   rate_multi, 0, port_map);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dsp_allocate_ports() -- complete\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsp_allocate_ports_format(struct hda_codec *codec,</div><div class='add'>+			const unsigned short fmt,</div><div class='add'>+			unsigned int *port_map)</div><div class='add'>+{</div><div class='add'>+	unsigned int num_chans;</div><div class='add'>+</div><div class='add'>+	unsigned int sample_rate_div = ((get_hdafmt_rate(fmt) &gt;&gt; 0) &amp; 3) + 1;</div><div class='add'>+	unsigned int sample_rate_mul = ((get_hdafmt_rate(fmt) &gt;&gt; 3) &amp; 3) + 1;</div><div class='add'>+	unsigned int rate_multi = sample_rate_mul / sample_rate_div;</div><div class='add'>+</div><div class='add'>+	if ((rate_multi != 1) &amp;&amp; (rate_multi != 2) &amp;&amp; (rate_multi != 4)) {</div><div class='add'>+		codec_dbg(codec, "bad rate multiple\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_chans = get_hdafmt_chs(fmt) + 1;</div><div class='add'>+</div><div class='add'>+	return dsp_allocate_ports(codec, num_chans, rate_multi, port_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * free DSP ports</div><div class='add'>+ */</div><div class='add'>+static int dsp_free_ports(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "     dsp_free_ports() -- begin\n");</div><div class='add'>+</div><div class='add'>+	status = dsp_free_router_ports(codec);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "free router ports fail\n");</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "     dsp_free_ports() -- complete\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  HDA DMA engine stuffs for DSP code download</div><div class='add'>+ */</div><div class='add'>+struct dma_engine {</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	unsigned short m_converter_format;</div><div class='add'>+	struct snd_dma_buffer *dmab;</div><div class='add'>+	unsigned int buf_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+enum dma_state {</div><div class='add'>+	DMA_STATE_STOP  = 0,</div><div class='add'>+	DMA_STATE_RUN   = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dma_convert_to_hda_format(struct hda_codec *codec,</div><div class='add'>+		unsigned int sample_rate,</div><div class='add'>+		unsigned short channels,</div><div class='add'>+		unsigned short *hda_format)</div><div class='add'>+{</div><div class='add'>+	unsigned int format_val;</div><div class='add'>+</div><div class='add'>+	format_val = snd_hdac_stream_format(channels, 32, sample_rate);</div><div class='add'>+</div><div class='add'>+	if (hda_format)</div><div class='add'>+		*hda_format = (unsigned short)format_val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Reset DMA for DSP download</div><div class='add'>+ */</div><div class='add'>+static int dma_reset(struct dma_engine *dma)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dma-&gt;codec;</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (dma-&gt;dmab-&gt;area)</div><div class='add'>+		snd_hda_codec_load_dsp_cleanup(codec, dma-&gt;dmab);</div><div class='add'>+</div><div class='add'>+	status = snd_hda_codec_load_dsp_prepare(codec,</div><div class='add'>+			dma-&gt;m_converter_format,</div><div class='add'>+			dma-&gt;buf_size,</div><div class='add'>+			dma-&gt;dmab);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		return status;</div><div class='add'>+	spec-&gt;dsp_stream_id = status;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma_set_state(struct dma_engine *dma, enum dma_state state)</div><div class='add'>+{</div><div class='add'>+	bool cmd;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case DMA_STATE_STOP:</div><div class='add'>+		cmd = false;</div><div class='add'>+		break;</div><div class='add'>+	case DMA_STATE_RUN:</div><div class='add'>+		cmd = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_load_dsp_trigger(dma-&gt;codec, cmd);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int dma_get_buffer_size(struct dma_engine *dma)</div><div class='add'>+{</div><div class='add'>+	return dma-&gt;dmab-&gt;bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned char *dma_get_buffer_addr(struct dma_engine *dma)</div><div class='add'>+{</div><div class='add'>+	return dma-&gt;dmab-&gt;area;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dma_xfer(struct dma_engine *dma,</div><div class='add'>+		const unsigned int *data,</div><div class='add'>+		unsigned int count)</div><div class='add'>+{</div><div class='add'>+	memcpy(dma-&gt;dmab-&gt;area, data, count);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dma_get_converter_format(</div><div class='add'>+		struct dma_engine *dma,</div><div class='add'>+		unsigned short *format)</div><div class='add'>+{</div><div class='add'>+	if (format)</div><div class='add'>+		*format = dma-&gt;m_converter_format;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int dma_get_stream_id(struct dma_engine *dma)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = dma-&gt;codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return spec-&gt;dsp_stream_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dsp_image_seg {</div><div class='add'>+	u32 magic;</div><div class='add'>+	u32 chip_addr;</div><div class='add'>+	u32 count;</div><div class='add'>+	u32 data[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 g_magic_value = 0x4c46584d;</div><div class='add'>+static const u32 g_chip_addr_magic_value = 0xFFFFFF01;</div><div class='add'>+</div><div class='add'>+static bool is_valid(const struct dsp_image_seg *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;magic == g_magic_value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_hci_prog_list_seg(const struct dsp_image_seg *p)</div><div class='add'>+{</div><div class='add'>+	return g_chip_addr_magic_value == p-&gt;chip_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_last(const struct dsp_image_seg *p)</div><div class='add'>+{</div><div class='add'>+	return p-&gt;count == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t dsp_sizeof(const struct dsp_image_seg *p)</div><div class='add'>+{</div><div class='add'>+	return struct_size(p, data, p-&gt;count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsp_image_seg *get_next_seg_ptr(</div><div class='add'>+				const struct dsp_image_seg *p)</div><div class='add'>+{</div><div class='add'>+	return (struct dsp_image_seg *)((unsigned char *)(p) + dsp_sizeof(p));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 chip DSP transfer stuffs.  For DSP download.</div><div class='add'>+ */</div><div class='add'>+#define INVALID_DMA_CHANNEL (~0U)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Program a list of address/data pairs via the ChipIO widget.</div><div class='add'>+ * The segment data is in the format of successive pairs of words.</div><div class='add'>+ * These are repeated as indicated by the segment's count field.</div><div class='add'>+ */</div><div class='add'>+static int dspxfr_hci_write(struct hda_codec *codec,</div><div class='add'>+			const struct dsp_image_seg *fls)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+	const u32 *data;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	if (fls == NULL || fls-&gt;chip_addr != g_chip_addr_magic_value) {</div><div class='add'>+		codec_dbg(codec, "hci_write invalid params\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = fls-&gt;count;</div><div class='add'>+	data = (u32 *)(fls-&gt;data);</div><div class='add'>+	while (count &gt;= 2) {</div><div class='add'>+		status = chipio_write(codec, data[0], data[1]);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "hci_write chipio failed\n");</div><div class='add'>+			return status;</div><div class='add'>+		}</div><div class='add'>+		count -= 2;</div><div class='add'>+		data  += 2;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dspxfr_one_seg - Write a block of data into DSP code or data RAM using pre-allocated DMA engine.</div><div class='add'>+ *</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @fls: pointer to a fast load image</div><div class='add'>+ * @reloc: Relocation address for loading single-segment overlays, or 0 for</div><div class='add'>+ *	   no relocation</div><div class='add'>+ * @dma_engine: pointer to DMA engine to be used for DSP download</div><div class='add'>+ * @dma_chan: The number of DMA channels used for DSP download</div><div class='add'>+ * @port_map_mask: port mapping</div><div class='add'>+ * @ovly: TRUE if overlay format is required</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int dspxfr_one_seg(struct hda_codec *codec,</div><div class='add'>+			const struct dsp_image_seg *fls,</div><div class='add'>+			unsigned int reloc,</div><div class='add'>+			struct dma_engine *dma_engine,</div><div class='add'>+			unsigned int dma_chan,</div><div class='add'>+			unsigned int port_map_mask,</div><div class='add'>+			bool ovly)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	bool comm_dma_setup_done = false;</div><div class='add'>+	const unsigned int *data;</div><div class='add'>+	unsigned int chip_addx;</div><div class='add'>+	unsigned int words_to_write;</div><div class='add'>+	unsigned int buffer_size_words;</div><div class='add'>+	unsigned char *buffer_addx;</div><div class='add'>+	unsigned short hda_format;</div><div class='add'>+	unsigned int sample_rate_div;</div><div class='add'>+	unsigned int sample_rate_mul;</div><div class='add'>+	unsigned int num_chans;</div><div class='add'>+	unsigned int hda_frame_size_words;</div><div class='add'>+	unsigned int remainder_words;</div><div class='add'>+	const u32 *data_remainder;</div><div class='add'>+	u32 chip_addx_remainder;</div><div class='add'>+	unsigned int run_size_words;</div><div class='add'>+	const struct dsp_image_seg *hci_write = NULL;</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	bool dma_active;</div><div class='add'>+</div><div class='add'>+	if (fls == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (is_hci_prog_list_seg(fls)) {</div><div class='add'>+		hci_write = fls;</div><div class='add'>+		fls = get_next_seg_ptr(fls);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hci_write &amp;&amp; (!fls || is_last(fls))) {</div><div class='add'>+		codec_dbg(codec, "hci_write\n");</div><div class='add'>+		return dspxfr_hci_write(codec, hci_write);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fls == NULL || dma_engine == NULL || port_map_mask == 0) {</div><div class='add'>+		codec_dbg(codec, "Invalid Params\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = fls-&gt;data;</div><div class='add'>+	chip_addx = fls-&gt;chip_addr;</div><div class='add'>+	words_to_write = fls-&gt;count;</div><div class='add'>+</div><div class='add'>+	if (!words_to_write)</div><div class='add'>+		return hci_write ? dspxfr_hci_write(codec, hci_write) : 0;</div><div class='add'>+	if (reloc)</div><div class='add'>+		chip_addx = (chip_addx &amp; (0xFFFF0000 &lt;&lt; 2)) + (reloc &lt;&lt; 2);</div><div class='add'>+</div><div class='add'>+	if (!UC_RANGE(chip_addx, words_to_write) &amp;&amp;</div><div class='add'>+	    !X_RANGE_ALL(chip_addx, words_to_write) &amp;&amp;</div><div class='add'>+	    !Y_RANGE_ALL(chip_addx, words_to_write)) {</div><div class='add'>+		codec_dbg(codec, "Invalid chip_addx Params\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer_size_words = (unsigned int)dma_get_buffer_size(dma_engine) /</div><div class='add'>+					sizeof(u32);</div><div class='add'>+</div><div class='add'>+	buffer_addx = dma_get_buffer_addr(dma_engine);</div><div class='add'>+</div><div class='add'>+	if (buffer_addx == NULL) {</div><div class='add'>+		codec_dbg(codec, "dma_engine buffer NULL\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_get_converter_format(dma_engine, &amp;hda_format);</div><div class='add'>+	sample_rate_div = ((get_hdafmt_rate(hda_format) &gt;&gt; 0) &amp; 3) + 1;</div><div class='add'>+	sample_rate_mul = ((get_hdafmt_rate(hda_format) &gt;&gt; 3) &amp; 3) + 1;</div><div class='add'>+	num_chans = get_hdafmt_chs(hda_format) + 1;</div><div class='add'>+</div><div class='add'>+	hda_frame_size_words = ((sample_rate_div == 0) ? 0 :</div><div class='add'>+			(num_chans * sample_rate_mul / sample_rate_div));</div><div class='add'>+</div><div class='add'>+	if (hda_frame_size_words == 0) {</div><div class='add'>+		codec_dbg(codec, "frmsz zero\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buffer_size_words = min(buffer_size_words,</div><div class='add'>+				(unsigned int)(UC_RANGE(chip_addx, 1) ?</div><div class='add'>+				65536 : 32768));</div><div class='add'>+	buffer_size_words -= buffer_size_words % hda_frame_size_words;</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		   "chpadr=0x%08x frmsz=%u nchan=%u "</div><div class='add'>+		   "rate_mul=%u div=%u bufsz=%u\n",</div><div class='add'>+		   chip_addx, hda_frame_size_words, num_chans,</div><div class='add'>+		   sample_rate_mul, sample_rate_div, buffer_size_words);</div><div class='add'>+</div><div class='add'>+	if (buffer_size_words &lt; hda_frame_size_words) {</div><div class='add'>+		codec_dbg(codec, "dspxfr_one_seg:failed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	remainder_words = words_to_write % hda_frame_size_words;</div><div class='add'>+	data_remainder = data;</div><div class='add'>+	chip_addx_remainder = chip_addx;</div><div class='add'>+</div><div class='add'>+	data += remainder_words;</div><div class='add'>+	chip_addx += remainder_words*sizeof(u32);</div><div class='add'>+	words_to_write -= remainder_words;</div><div class='add'>+</div><div class='add'>+	while (words_to_write != 0) {</div><div class='add'>+		run_size_words = min(buffer_size_words, words_to_write);</div><div class='add'>+		codec_dbg(codec, "dspxfr (seg loop)cnt=%u rs=%u remainder=%u\n",</div><div class='add'>+			    words_to_write, run_size_words, remainder_words);</div><div class='add'>+		dma_xfer(dma_engine, data, run_size_words*sizeof(u32));</div><div class='add'>+		if (!comm_dma_setup_done) {</div><div class='add'>+			status = dsp_dma_stop(codec, dma_chan, ovly);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				return status;</div><div class='add'>+			status = dsp_dma_setup_common(codec, chip_addx,</div><div class='add'>+						dma_chan, port_map_mask, ovly);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				return status;</div><div class='add'>+			comm_dma_setup_done = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		status = dsp_dma_setup(codec, chip_addx,</div><div class='add'>+						run_size_words, dma_chan);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		status = dsp_dma_start(codec, dma_chan, ovly);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		if (!dsp_is_dma_active(codec, dma_chan)) {</div><div class='add'>+			codec_dbg(codec, "dspxfr:DMA did not start\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		status = dma_set_state(dma_engine, DMA_STATE_RUN);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+		if (remainder_words != 0) {</div><div class='add'>+			status = chipio_write_multiple(codec,</div><div class='add'>+						chip_addx_remainder,</div><div class='add'>+						data_remainder,</div><div class='add'>+						remainder_words);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				return status;</div><div class='add'>+			remainder_words = 0;</div><div class='add'>+		}</div><div class='add'>+		if (hci_write) {</div><div class='add'>+			status = dspxfr_hci_write(codec, hci_write);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				return status;</div><div class='add'>+			hci_write = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		timeout = jiffies + msecs_to_jiffies(2000);</div><div class='add'>+		do {</div><div class='add'>+			dma_active = dsp_is_dma_active(codec, dma_chan);</div><div class='add'>+			if (!dma_active)</div><div class='add'>+				break;</div><div class='add'>+			msleep(20);</div><div class='add'>+		} while (time_before(jiffies, timeout));</div><div class='add'>+		if (dma_active)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "+++++ DMA complete\n");</div><div class='add'>+		dma_set_state(dma_engine, DMA_STATE_STOP);</div><div class='add'>+		status = dma_reset(dma_engine);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			return status;</div><div class='add'>+</div><div class='add'>+		data += run_size_words;</div><div class='add'>+		chip_addx += run_size_words*sizeof(u32);</div><div class='add'>+		words_to_write -= run_size_words;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (remainder_words != 0) {</div><div class='add'>+		status = chipio_write_multiple(codec, chip_addx_remainder,</div><div class='add'>+					data_remainder, remainder_words);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dspxfr_image - Write the entire DSP image of a DSP code/data overlay to DSP memories</div><div class='add'>+ *</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @fls_data: pointer to a fast load image</div><div class='add'>+ * @reloc: Relocation address for loading single-segment overlays, or 0 for</div><div class='add'>+ *	   no relocation</div><div class='add'>+ * @sample_rate: sampling rate of the stream used for DSP download</div><div class='add'>+ * @channels: channels of the stream used for DSP download</div><div class='add'>+ * @ovly: TRUE if overlay format is required</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int dspxfr_image(struct hda_codec *codec,</div><div class='add'>+			const struct dsp_image_seg *fls_data,</div><div class='add'>+			unsigned int reloc,</div><div class='add'>+			unsigned int sample_rate,</div><div class='add'>+			unsigned short channels,</div><div class='add'>+			bool ovly)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int status;</div><div class='add'>+	unsigned short hda_format = 0;</div><div class='add'>+	unsigned int response;</div><div class='add'>+	unsigned char stream_id = 0;</div><div class='add'>+	struct dma_engine *dma_engine;</div><div class='add'>+	unsigned int dma_chan;</div><div class='add'>+	unsigned int port_map_mask;</div><div class='add'>+</div><div class='add'>+	if (fls_data == NULL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dma_engine = kzalloc(sizeof(*dma_engine), GFP_KERNEL);</div><div class='add'>+	if (!dma_engine)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dma_engine-&gt;dmab = kzalloc(sizeof(*dma_engine-&gt;dmab), GFP_KERNEL);</div><div class='add'>+	if (!dma_engine-&gt;dmab) {</div><div class='add'>+		kfree(dma_engine);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_engine-&gt;codec = codec;</div><div class='add'>+	dma_convert_to_hda_format(codec, sample_rate, channels, &amp;hda_format);</div><div class='add'>+	dma_engine-&gt;m_converter_format = hda_format;</div><div class='add'>+	dma_engine-&gt;buf_size = (ovly ? DSP_DMA_WRITE_BUFLEN_OVLY :</div><div class='add'>+			DSP_DMA_WRITE_BUFLEN_INIT) * 2;</div><div class='add'>+</div><div class='add'>+	dma_chan = ovly ? INVALID_DMA_CHANNEL : 0;</div><div class='add'>+</div><div class='add'>+	status = codec_set_converter_format(codec, WIDGET_CHIP_CTRL,</div><div class='add'>+					hda_format, &amp;response);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "set converter format fail\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = snd_hda_codec_load_dsp_prepare(codec,</div><div class='add'>+				dma_engine-&gt;m_converter_format,</div><div class='add'>+				dma_engine-&gt;buf_size,</div><div class='add'>+				dma_engine-&gt;dmab);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+	spec-&gt;dsp_stream_id = status;</div><div class='add'>+</div><div class='add'>+	if (ovly) {</div><div class='add'>+		status = dspio_alloc_dma_chan(codec, &amp;dma_chan);</div><div class='add'>+		if (status &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "alloc dmachan fail\n");</div><div class='add'>+			dma_chan = INVALID_DMA_CHANNEL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_map_mask = 0;</div><div class='add'>+	status = dsp_allocate_ports_format(codec, hda_format,</div><div class='add'>+					&amp;port_map_mask);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "alloc ports fail\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream_id = dma_get_stream_id(dma_engine);</div><div class='add'>+	status = codec_set_converter_stream_channel(codec,</div><div class='add'>+			WIDGET_CHIP_CTRL, stream_id, 0, &amp;response);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		codec_dbg(codec, "set stream chan fail\n");</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((fls_data != NULL) &amp;&amp; !is_last(fls_data)) {</div><div class='add'>+		if (!is_valid(fls_data)) {</div><div class='add'>+			codec_dbg(codec, "FLS check fail\n");</div><div class='add'>+			status = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		status = dspxfr_one_seg(codec, fls_data, reloc,</div><div class='add'>+					dma_engine, dma_chan,</div><div class='add'>+					port_map_mask, ovly);</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (is_hci_prog_list_seg(fls_data))</div><div class='add'>+			fls_data = get_next_seg_ptr(fls_data);</div><div class='add'>+</div><div class='add'>+		if ((fls_data != NULL) &amp;&amp; !is_last(fls_data))</div><div class='add'>+			fls_data = get_next_seg_ptr(fls_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_map_mask != 0)</div><div class='add'>+		status = dsp_free_ports(codec);</div><div class='add'>+</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	status = codec_set_converter_stream_channel(codec,</div><div class='add'>+				WIDGET_CHIP_CTRL, 0, 0, &amp;response);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (ovly &amp;&amp; (dma_chan != INVALID_DMA_CHANNEL))</div><div class='add'>+		dspio_free_dma_chan(codec, dma_chan);</div><div class='add'>+</div><div class='add'>+	if (dma_engine-&gt;dmab-&gt;area)</div><div class='add'>+		snd_hda_codec_load_dsp_cleanup(codec, dma_engine-&gt;dmab);</div><div class='add'>+	kfree(dma_engine-&gt;dmab);</div><div class='add'>+	kfree(dma_engine);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CA0132 DSP download stuffs.</div><div class='add'>+ */</div><div class='add'>+static void dspload_post_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	codec_dbg(codec, "---- dspload_post_setup ------\n");</div><div class='add'>+	if (!ca0132_use_alt_functions(spec)) {</div><div class='add'>+		/*set DSP speaker to 2.0 configuration*/</div><div class='add'>+		chipio_write(codec, XRAM_XRAM_INST_OFFSET(0x18), 0x08080080);</div><div class='add'>+		chipio_write(codec, XRAM_XRAM_INST_OFFSET(0x19), 0x3f800000);</div><div class='add'>+</div><div class='add'>+		/*update write pointer*/</div><div class='add'>+		chipio_write(codec, XRAM_XRAM_INST_OFFSET(0x29), 0x00000002);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dspload_image - Download DSP from a DSP Image Fast Load structure.</div><div class='add'>+ *</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @fls: pointer to a fast load image</div><div class='add'>+ * @ovly: TRUE if overlay format is required</div><div class='add'>+ * @reloc: Relocation address for loading single-segment overlays, or 0 for</div><div class='add'>+ *	   no relocation</div><div class='add'>+ * @autostart: TRUE if DSP starts after loading; ignored if ovly is TRUE</div><div class='add'>+ * @router_chans: number of audio router channels to be allocated (0 means use</div><div class='add'>+ *		  internal defaults; max is 32)</div><div class='add'>+ *</div><div class='add'>+ * Download DSP from a DSP Image Fast Load structure. This structure is a</div><div class='add'>+ * linear, non-constant sized element array of structures, each of which</div><div class='add'>+ * contain the count of the data to be loaded, the data itself, and the</div><div class='add'>+ * corresponding starting chip address of the starting data location.</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int dspload_image(struct hda_codec *codec,</div><div class='add'>+			const struct dsp_image_seg *fls,</div><div class='add'>+			bool ovly,</div><div class='add'>+			unsigned int reloc,</div><div class='add'>+			bool autostart,</div><div class='add'>+			int router_chans)</div><div class='add'>+{</div><div class='add'>+	int status = 0;</div><div class='add'>+	unsigned int sample_rate;</div><div class='add'>+	unsigned short channels;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "---- dspload_image begin ------\n");</div><div class='add'>+	if (router_chans == 0) {</div><div class='add'>+		if (!ovly)</div><div class='add'>+			router_chans = DMA_TRANSFER_FRAME_SIZE_NWORDS;</div><div class='add'>+		else</div><div class='add'>+			router_chans = DMA_OVERLAY_FRAME_SIZE_NWORDS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sample_rate = 48000;</div><div class='add'>+	channels = (unsigned short)router_chans;</div><div class='add'>+</div><div class='add'>+	while (channels &gt; 16) {</div><div class='add'>+		sample_rate *= 2;</div><div class='add'>+		channels /= 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		codec_dbg(codec, "Ready to program DMA\n");</div><div class='add'>+		if (!ovly)</div><div class='add'>+			status = dsp_reset(codec);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "dsp_reset() complete\n");</div><div class='add'>+		status = dspxfr_image(codec, fls, reloc, sample_rate, channels,</div><div class='add'>+				      ovly);</div><div class='add'>+</div><div class='add'>+		if (status &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "dspxfr_image() complete\n");</div><div class='add'>+		if (autostart &amp;&amp; !ovly) {</div><div class='add'>+			dspload_post_setup(codec);</div><div class='add'>+			status = dsp_set_run_state(codec);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "LOAD FINISHED\n");</div><div class='add'>+	} while (0);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP</div><div class='add'>+static bool dspload_is_loaded(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int data = 0;</div><div class='add'>+	int status = 0;</div><div class='add'>+</div><div class='add'>+	status = chipio_read(codec, 0x40004, &amp;data);</div><div class='add'>+	if ((status &lt; 0) || (data != 1))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define dspload_is_loaded(codec)	false</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool dspload_wait_loaded(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout = jiffies + msecs_to_jiffies(2000);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (dspload_is_loaded(codec)) {</div><div class='add'>+			codec_info(codec, "ca0132 DSP downloaded and running\n");</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, timeout));</div><div class='add'>+</div><div class='add'>+	codec_err(codec, "ca0132 failed to download DSP\n");</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ca0113 related functions. The ca0113 acts as the HDA bus for the pci-e</div><div class='add'>+ * based cards, and has a second mmio region, region2, that's used for special</div><div class='add'>+ * commands.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For cards with PCI-E region2 (Sound Blaster Z/ZxR, Recon3D, and AE-5)</div><div class='add'>+ * the mmio address 0x320 is used to set GPIO pins. The format for the data</div><div class='add'>+ * The first eight bits are just the number of the pin. So far, I've only seen</div><div class='add'>+ * this number go to 7.</div><div class='add'>+ * AE-5 note: The AE-5 seems to use pins 2 and 3 to somehow set the color value</div><div class='add'>+ * of the on-card LED. It seems to use pin 2 for data, then toggles 3 to on and</div><div class='add'>+ * then off to send that bit.</div><div class='add'>+ */</div><div class='add'>+static void ca0113_mmio_gpio_set(struct hda_codec *codec, unsigned int gpio_pin,</div><div class='add'>+		bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned short gpio_data;</div><div class='add'>+</div><div class='add'>+	gpio_data = gpio_pin &amp; 0xF;</div><div class='add'>+	gpio_data |= ((enable &lt;&lt; 8) &amp; 0x100);</div><div class='add'>+</div><div class='add'>+	writew(gpio_data, spec-&gt;mem_base + 0x320);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Special pci region2 commands that are only used by the AE-5. They follow</div><div class='add'>+ * a set format, and require reads at certain points to seemingly 'clear'</div><div class='add'>+ * the response data. My first tests didn't do these reads, and would cause</div><div class='add'>+ * the card to get locked up until the memory was read. These commands</div><div class='add'>+ * seem to work with three distinct values that I've taken to calling group,</div><div class='add'>+ * target-id, and value.</div><div class='add'>+ */</div><div class='add'>+static void ca0113_mmio_command_set(struct hda_codec *codec, unsigned int group,</div><div class='add'>+		unsigned int target, unsigned int value)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int write_val;</div><div class='add'>+</div><div class='add'>+	writel(0x0000007e, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	writel(0x0000005a, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+</div><div class='add'>+	writel(0x00800005, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	writel(group, spec-&gt;mem_base + 0x804);</div><div class='add'>+</div><div class='add'>+	writel(0x00800005, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	write_val = (target &amp; 0xff);</div><div class='add'>+	write_val |= (value &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	writel(write_val, spec-&gt;mem_base + 0x204);</div><div class='add'>+	/*</div><div class='add'>+	 * Need delay here or else it goes too fast and works inconsistently.</div><div class='add'>+	 */</div><div class='add'>+	msleep(20);</div><div class='add'>+</div><div class='add'>+	readl(spec-&gt;mem_base + 0x860);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x854);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x840);</div><div class='add'>+</div><div class='add'>+	writel(0x00800004, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	writel(0x00000000, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This second type of command is used for setting the sound filter type.</div><div class='add'>+ */</div><div class='add'>+static void ca0113_mmio_command_set_type2(struct hda_codec *codec,</div><div class='add'>+		unsigned int group, unsigned int target, unsigned int value)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int write_val;</div><div class='add'>+</div><div class='add'>+	writel(0x0000007e, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	writel(0x0000005a, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+</div><div class='add'>+	writel(0x00800003, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	writel(group, spec-&gt;mem_base + 0x804);</div><div class='add'>+</div><div class='add'>+	writel(0x00800005, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	write_val = (target &amp; 0xff);</div><div class='add'>+	write_val |= (value &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	writel(write_val, spec-&gt;mem_base + 0x204);</div><div class='add'>+	msleep(20);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x860);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x854);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x840);</div><div class='add'>+</div><div class='add'>+	writel(0x00800004, spec-&gt;mem_base + 0x20c);</div><div class='add'>+	writel(0x00000000, spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+	readl(spec-&gt;mem_base + 0x210);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup GPIO for the other variants of Core3D.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets up the GPIO pins so that they are discoverable. If this isn't done,</div><div class='add'>+ * the card shows as having no GPIO pins.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_gpio_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x53);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, 0x790, 0x23);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x5B);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sets the GPIO for audio output. */</div><div class='add'>+static void ca0132_gpio_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DIRECTION, 0x07);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_MASK, 0x07);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, 0x04);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, 0x06);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DIRECTION, 0x1E);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_MASK, 0x1F);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, 0x0C);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO control functions for the Recon3D integrated.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum r3di_gpio_bit {</div><div class='add'>+	/* Bit 1 - Switch between front/rear mic. 0 = rear, 1 = front */</div><div class='add'>+	R3DI_MIC_SELECT_BIT = 1,</div><div class='add'>+	/* Bit 2 - Switch between headphone/line out. 0 = Headphone, 1 = Line */</div><div class='add'>+	R3DI_OUT_SELECT_BIT = 2,</div><div class='add'>+	/*</div><div class='add'>+	 * I dunno what this actually does, but it stays on until the dsp</div><div class='add'>+	 * is downloaded.</div><div class='add'>+	 */</div><div class='add'>+	R3DI_GPIO_DSP_DOWNLOADING = 3,</div><div class='add'>+	/*</div><div class='add'>+	 * Same as above, no clue what it does, but it comes on after the dsp</div><div class='add'>+	 * is downloaded.</div><div class='add'>+	 */</div><div class='add'>+	R3DI_GPIO_DSP_DOWNLOADED = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum r3di_mic_select {</div><div class='add'>+	/* Set GPIO bit 1 to 0 for rear mic */</div><div class='add'>+	R3DI_REAR_MIC = 0,</div><div class='add'>+	/* Set GPIO bit 1 to 1 for front microphone*/</div><div class='add'>+	R3DI_FRONT_MIC = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum r3di_out_select {</div><div class='add'>+	/* Set GPIO bit 2 to 0 for headphone */</div><div class='add'>+	R3DI_HEADPHONE_OUT = 0,</div><div class='add'>+	/* Set GPIO bit 2 to 1 for speaker */</div><div class='add'>+	R3DI_LINE_OUT = 1</div><div class='add'>+};</div><div class='add'>+enum r3di_dsp_status {</div><div class='add'>+	/* Set GPIO bit 3 to 1 until DSP is downloaded */</div><div class='add'>+	R3DI_DSP_DOWNLOADING = 0,</div><div class='add'>+	/* Set GPIO bit 4 to 1 once DSP is downloaded */</div><div class='add'>+	R3DI_DSP_DOWNLOADED = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void r3di_gpio_mic_set(struct hda_codec *codec,</div><div class='add'>+		enum r3di_mic_select cur_mic)</div><div class='add'>+{</div><div class='add'>+	unsigned int cur_gpio;</div><div class='add'>+</div><div class='add'>+	/* Get the current GPIO Data setup */</div><div class='add'>+	cur_gpio = snd_hda_codec_read(codec, 0x01, 0, AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+</div><div class='add'>+	switch (cur_mic) {</div><div class='add'>+	case R3DI_REAR_MIC:</div><div class='add'>+		cur_gpio &amp;= ~(1 &lt;&lt; R3DI_MIC_SELECT_BIT);</div><div class='add'>+		break;</div><div class='add'>+	case R3DI_FRONT_MIC:</div><div class='add'>+		cur_gpio |= (1 &lt;&lt; R3DI_MIC_SELECT_BIT);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_GPIO_DATA, cur_gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r3di_gpio_dsp_status_set(struct hda_codec *codec,</div><div class='add'>+		enum r3di_dsp_status dsp_status)</div><div class='add'>+{</div><div class='add'>+	unsigned int cur_gpio;</div><div class='add'>+</div><div class='add'>+	/* Get the current GPIO Data setup */</div><div class='add'>+	cur_gpio = snd_hda_codec_read(codec, 0x01, 0, AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+</div><div class='add'>+	switch (dsp_status) {</div><div class='add'>+	case R3DI_DSP_DOWNLOADING:</div><div class='add'>+		cur_gpio |= (1 &lt;&lt; R3DI_GPIO_DSP_DOWNLOADING);</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, cur_gpio);</div><div class='add'>+		break;</div><div class='add'>+	case R3DI_DSP_DOWNLOADED:</div><div class='add'>+		/* Set DOWNLOADING bit to 0. */</div><div class='add'>+		cur_gpio &amp;= ~(1 &lt;&lt; R3DI_GPIO_DSP_DOWNLOADING);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, cur_gpio);</div><div class='add'>+</div><div class='add'>+		cur_gpio |= (1 &lt;&lt; R3DI_GPIO_DSP_DOWNLOADED);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_GPIO_DATA, cur_gpio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM callbacks</div><div class='add'>+ */</div><div class='add'>+static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			unsigned int stream_tag,</div><div class='add'>+			unsigned int format,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_setup_stream(codec, spec-&gt;dacs[0], stream_tag, 0, format);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state == DSP_DOWNLOADING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*If Playback effects are on, allow stream some time to flush</div><div class='add'>+	 *effects tail*/</div><div class='add'>+	if (spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID])</div><div class='add'>+		msleep(50);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, spec-&gt;dacs[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ca0132_playback_pcm_delay(struct hda_pcm_stream *info,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int latency = DSP_PLAYBACK_INIT_LATENCY;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Add latency if playback enhancement and either effect is enabled. */</div><div class='add'>+	if (spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]) {</div><div class='add'>+		if ((spec-&gt;effects_switch[SURROUND - EFFECT_START_NID]) ||</div><div class='add'>+		    (spec-&gt;effects_switch[DIALOG_PLUS - EFFECT_START_NID]))</div><div class='add'>+			latency += DSP_PLAY_ENHANCEMENT_LATENCY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Applying Speaker EQ adds latency as well. */</div><div class='add'>+	if (spec-&gt;cur_out_type == SPEAKER_OUT)</div><div class='add'>+		latency += DSP_SPEAKER_OUT_LATENCY;</div><div class='add'>+</div><div class='add'>+	return (latency * runtime-&gt;rate) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Digital out</div><div class='add'>+ */</div><div class='add'>+static int ca0132_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+					struct hda_codec *codec,</div><div class='add'>+					struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			unsigned int stream_tag,</div><div class='add'>+			unsigned int format,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='add'>+					     stream_tag, format, substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+					 struct hda_codec *codec,</div><div class='add'>+					 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Analog capture</div><div class='add'>+ */</div><div class='add'>+static int ca0132_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+					struct hda_codec *codec,</div><div class='add'>+					unsigned int stream_tag,</div><div class='add'>+					unsigned int format,</div><div class='add'>+					struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid,</div><div class='add'>+				   stream_tag, 0, format);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state == DSP_DOWNLOADING)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ca0132_capture_pcm_delay(struct hda_pcm_stream *info,</div><div class='add'>+			struct hda_codec *codec,</div><div class='add'>+			struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int latency = DSP_CAPTURE_INIT_LATENCY;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID])</div><div class='add'>+		latency += DSP_CRYSTAL_VOICE_LATENCY;</div><div class='add'>+</div><div class='add'>+	return (latency * runtime-&gt;rate) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Controls stuffs.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mixer controls helpers.</div><div class='add'>+ */</div><div class='add'>+#define CA0132_CODEC_VOL_MONO(xname, nid, channel, dir) \</div><div class='add'>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='add'>+	  .name = xname, \</div><div class='add'>+	  .subdevice = HDA_SUBDEV_AMP_FLAG, \</div><div class='add'>+	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_READ | \</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \</div><div class='add'>+	  .info = ca0132_volume_info, \</div><div class='add'>+	  .get = ca0132_volume_get, \</div><div class='add'>+	  .put = ca0132_volume_put, \</div><div class='add'>+	  .tlv = { .c = ca0132_volume_tlv }, \</div><div class='add'>+	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, 0, dir) }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Creates a mixer control that uses defaults of HDA_CODEC_VOL except for the</div><div class='add'>+ * volume put, which is used for setting the DSP volume. This was done because</div><div class='add'>+ * the ca0132 functions were taking too much time and causing lag.</div><div class='add'>+ */</div><div class='add'>+#define CA0132_ALT_CODEC_VOL_MONO(xname, nid, channel, dir) \</div><div class='add'>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='add'>+	  .name = xname, \</div><div class='add'>+	  .subdevice = HDA_SUBDEV_AMP_FLAG, \</div><div class='add'>+	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_READ | \</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \</div><div class='add'>+	  .info = snd_hda_mixer_amp_volume_info, \</div><div class='add'>+	  .get = snd_hda_mixer_amp_volume_get, \</div><div class='add'>+	  .put = ca0132_alt_volume_put, \</div><div class='add'>+	  .tlv = { .c = snd_hda_mixer_amp_tlv }, \</div><div class='add'>+	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, 0, dir) }</div><div class='add'>+</div><div class='add'>+#define CA0132_CODEC_MUTE_MONO(xname, nid, channel, dir) \</div><div class='add'>+	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='add'>+	  .name = xname, \</div><div class='add'>+	  .subdevice = HDA_SUBDEV_AMP_FLAG, \</div><div class='add'>+	  .info = snd_hda_mixer_amp_switch_info, \</div><div class='add'>+	  .get = ca0132_switch_get, \</div><div class='add'>+	  .put = ca0132_switch_put, \</div><div class='add'>+	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, 0, dir) }</div><div class='add'>+</div><div class='add'>+/* stereo */</div><div class='add'>+#define CA0132_CODEC_VOL(xname, nid, dir) \</div><div class='add'>+	CA0132_CODEC_VOL_MONO(xname, nid, 3, dir)</div><div class='add'>+#define CA0132_ALT_CODEC_VOL(xname, nid, dir) \</div><div class='add'>+	CA0132_ALT_CODEC_VOL_MONO(xname, nid, 3, dir)</div><div class='add'>+#define CA0132_CODEC_MUTE(xname, nid, dir) \</div><div class='add'>+	CA0132_CODEC_MUTE_MONO(xname, nid, 3, dir)</div><div class='add'>+</div><div class='add'>+/* lookup tables */</div><div class='add'>+/*</div><div class='add'>+ * Lookup table with decibel values for the DSP. When volume is changed in</div><div class='add'>+ * Windows, the DSP is also sent the dB value in floating point. In Windows,</div><div class='add'>+ * these values have decimal points, probably because the Windows driver</div><div class='add'>+ * actually uses floating point. We can't here, so I made a lookup table of</div><div class='add'>+ * values -90 to 9. -90 is the lowest decibel value for both the ADC's and the</div><div class='add'>+ * DAC's, and 9 is the maximum.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int float_vol_db_lookup[] = {</div><div class='add'>+0xC2B40000, 0xC2B20000, 0xC2B00000, 0xC2AE0000, 0xC2AC0000, 0xC2AA0000,</div><div class='add'>+0xC2A80000, 0xC2A60000, 0xC2A40000, 0xC2A20000, 0xC2A00000, 0xC29E0000,</div><div class='add'>+0xC29C0000, 0xC29A0000, 0xC2980000, 0xC2960000, 0xC2940000, 0xC2920000,</div><div class='add'>+0xC2900000, 0xC28E0000, 0xC28C0000, 0xC28A0000, 0xC2880000, 0xC2860000,</div><div class='add'>+0xC2840000, 0xC2820000, 0xC2800000, 0xC27C0000, 0xC2780000, 0xC2740000,</div><div class='add'>+0xC2700000, 0xC26C0000, 0xC2680000, 0xC2640000, 0xC2600000, 0xC25C0000,</div><div class='add'>+0xC2580000, 0xC2540000, 0xC2500000, 0xC24C0000, 0xC2480000, 0xC2440000,</div><div class='add'>+0xC2400000, 0xC23C0000, 0xC2380000, 0xC2340000, 0xC2300000, 0xC22C0000,</div><div class='add'>+0xC2280000, 0xC2240000, 0xC2200000, 0xC21C0000, 0xC2180000, 0xC2140000,</div><div class='add'>+0xC2100000, 0xC20C0000, 0xC2080000, 0xC2040000, 0xC2000000, 0xC1F80000,</div><div class='add'>+0xC1F00000, 0xC1E80000, 0xC1E00000, 0xC1D80000, 0xC1D00000, 0xC1C80000,</div><div class='add'>+0xC1C00000, 0xC1B80000, 0xC1B00000, 0xC1A80000, 0xC1A00000, 0xC1980000,</div><div class='add'>+0xC1900000, 0xC1880000, 0xC1800000, 0xC1700000, 0xC1600000, 0xC1500000,</div><div class='add'>+0xC1400000, 0xC1300000, 0xC1200000, 0xC1100000, 0xC1000000, 0xC0E00000,</div><div class='add'>+0xC0C00000, 0xC0A00000, 0xC0800000, 0xC0400000, 0xC0000000, 0xBF800000,</div><div class='add'>+0x00000000, 0x3F800000, 0x40000000, 0x40400000, 0x40800000, 0x40A00000,</div><div class='add'>+0x40C00000, 0x40E00000, 0x41000000, 0x41100000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This table counts from float 0 to 1 in increments of .01, which is</div><div class='add'>+ * useful for a few different sliders.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int float_zero_to_one_lookup[] = {</div><div class='add'>+0x00000000, 0x3C23D70A, 0x3CA3D70A, 0x3CF5C28F, 0x3D23D70A, 0x3D4CCCCD,</div><div class='add'>+0x3D75C28F, 0x3D8F5C29, 0x3DA3D70A, 0x3DB851EC, 0x3DCCCCCD, 0x3DE147AE,</div><div class='add'>+0x3DF5C28F, 0x3E051EB8, 0x3E0F5C29, 0x3E19999A, 0x3E23D70A, 0x3E2E147B,</div><div class='add'>+0x3E3851EC, 0x3E428F5C, 0x3E4CCCCD, 0x3E570A3D, 0x3E6147AE, 0x3E6B851F,</div><div class='add'>+0x3E75C28F, 0x3E800000, 0x3E851EB8, 0x3E8A3D71, 0x3E8F5C29, 0x3E947AE1,</div><div class='add'>+0x3E99999A, 0x3E9EB852, 0x3EA3D70A, 0x3EA8F5C3, 0x3EAE147B, 0x3EB33333,</div><div class='add'>+0x3EB851EC, 0x3EBD70A4, 0x3EC28F5C, 0x3EC7AE14, 0x3ECCCCCD, 0x3ED1EB85,</div><div class='add'>+0x3ED70A3D, 0x3EDC28F6, 0x3EE147AE, 0x3EE66666, 0x3EEB851F, 0x3EF0A3D7,</div><div class='add'>+0x3EF5C28F, 0x3EFAE148, 0x3F000000, 0x3F028F5C, 0x3F051EB8, 0x3F07AE14,</div><div class='add'>+0x3F0A3D71, 0x3F0CCCCD, 0x3F0F5C29, 0x3F11EB85, 0x3F147AE1, 0x3F170A3D,</div><div class='add'>+0x3F19999A, 0x3F1C28F6, 0x3F1EB852, 0x3F2147AE, 0x3F23D70A, 0x3F266666,</div><div class='add'>+0x3F28F5C3, 0x3F2B851F, 0x3F2E147B, 0x3F30A3D7, 0x3F333333, 0x3F35C28F,</div><div class='add'>+0x3F3851EC, 0x3F3AE148, 0x3F3D70A4, 0x3F400000, 0x3F428F5C, 0x3F451EB8,</div><div class='add'>+0x3F47AE14, 0x3F4A3D71, 0x3F4CCCCD, 0x3F4F5C29, 0x3F51EB85, 0x3F547AE1,</div><div class='add'>+0x3F570A3D, 0x3F59999A, 0x3F5C28F6, 0x3F5EB852, 0x3F6147AE, 0x3F63D70A,</div><div class='add'>+0x3F666666, 0x3F68F5C3, 0x3F6B851F, 0x3F6E147B, 0x3F70A3D7, 0x3F733333,</div><div class='add'>+0x3F75C28F, 0x3F7851EC, 0x3F7AE148, 0x3F7D70A4, 0x3F800000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This table counts from float 10 to 1000, which is the range of the x-bass</div><div class='add'>+ * crossover slider in Windows.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int float_xbass_xover_lookup[] = {</div><div class='add'>+0x41200000, 0x41A00000, 0x41F00000, 0x42200000, 0x42480000, 0x42700000,</div><div class='add'>+0x428C0000, 0x42A00000, 0x42B40000, 0x42C80000, 0x42DC0000, 0x42F00000,</div><div class='add'>+0x43020000, 0x430C0000, 0x43160000, 0x43200000, 0x432A0000, 0x43340000,</div><div class='add'>+0x433E0000, 0x43480000, 0x43520000, 0x435C0000, 0x43660000, 0x43700000,</div><div class='add'>+0x437A0000, 0x43820000, 0x43870000, 0x438C0000, 0x43910000, 0x43960000,</div><div class='add'>+0x439B0000, 0x43A00000, 0x43A50000, 0x43AA0000, 0x43AF0000, 0x43B40000,</div><div class='add'>+0x43B90000, 0x43BE0000, 0x43C30000, 0x43C80000, 0x43CD0000, 0x43D20000,</div><div class='add'>+0x43D70000, 0x43DC0000, 0x43E10000, 0x43E60000, 0x43EB0000, 0x43F00000,</div><div class='add'>+0x43F50000, 0x43FA0000, 0x43FF0000, 0x44020000, 0x44048000, 0x44070000,</div><div class='add'>+0x44098000, 0x440C0000, 0x440E8000, 0x44110000, 0x44138000, 0x44160000,</div><div class='add'>+0x44188000, 0x441B0000, 0x441D8000, 0x44200000, 0x44228000, 0x44250000,</div><div class='add'>+0x44278000, 0x442A0000, 0x442C8000, 0x442F0000, 0x44318000, 0x44340000,</div><div class='add'>+0x44368000, 0x44390000, 0x443B8000, 0x443E0000, 0x44408000, 0x44430000,</div><div class='add'>+0x44458000, 0x44480000, 0x444A8000, 0x444D0000, 0x444F8000, 0x44520000,</div><div class='add'>+0x44548000, 0x44570000, 0x44598000, 0x445C0000, 0x445E8000, 0x44610000,</div><div class='add'>+0x44638000, 0x44660000, 0x44688000, 0x446B0000, 0x446D8000, 0x44700000,</div><div class='add'>+0x44728000, 0x44750000, 0x44778000, 0x447A0000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The following are for tuning of products */</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+</div><div class='add'>+static const unsigned int voice_focus_vals_lookup[] = {</div><div class='add'>+0x41A00000, 0x41A80000, 0x41B00000, 0x41B80000, 0x41C00000, 0x41C80000,</div><div class='add'>+0x41D00000, 0x41D80000, 0x41E00000, 0x41E80000, 0x41F00000, 0x41F80000,</div><div class='add'>+0x42000000, 0x42040000, 0x42080000, 0x420C0000, 0x42100000, 0x42140000,</div><div class='add'>+0x42180000, 0x421C0000, 0x42200000, 0x42240000, 0x42280000, 0x422C0000,</div><div class='add'>+0x42300000, 0x42340000, 0x42380000, 0x423C0000, 0x42400000, 0x42440000,</div><div class='add'>+0x42480000, 0x424C0000, 0x42500000, 0x42540000, 0x42580000, 0x425C0000,</div><div class='add'>+0x42600000, 0x42640000, 0x42680000, 0x426C0000, 0x42700000, 0x42740000,</div><div class='add'>+0x42780000, 0x427C0000, 0x42800000, 0x42820000, 0x42840000, 0x42860000,</div><div class='add'>+0x42880000, 0x428A0000, 0x428C0000, 0x428E0000, 0x42900000, 0x42920000,</div><div class='add'>+0x42940000, 0x42960000, 0x42980000, 0x429A0000, 0x429C0000, 0x429E0000,</div><div class='add'>+0x42A00000, 0x42A20000, 0x42A40000, 0x42A60000, 0x42A80000, 0x42AA0000,</div><div class='add'>+0x42AC0000, 0x42AE0000, 0x42B00000, 0x42B20000, 0x42B40000, 0x42B60000,</div><div class='add'>+0x42B80000, 0x42BA0000, 0x42BC0000, 0x42BE0000, 0x42C00000, 0x42C20000,</div><div class='add'>+0x42C40000, 0x42C60000, 0x42C80000, 0x42CA0000, 0x42CC0000, 0x42CE0000,</div><div class='add'>+0x42D00000, 0x42D20000, 0x42D40000, 0x42D60000, 0x42D80000, 0x42DA0000,</div><div class='add'>+0x42DC0000, 0x42DE0000, 0x42E00000, 0x42E20000, 0x42E40000, 0x42E60000,</div><div class='add'>+0x42E80000, 0x42EA0000, 0x42EC0000, 0x42EE0000, 0x42F00000, 0x42F20000,</div><div class='add'>+0x42F40000, 0x42F60000, 0x42F80000, 0x42FA0000, 0x42FC0000, 0x42FE0000,</div><div class='add'>+0x43000000, 0x43010000, 0x43020000, 0x43030000, 0x43040000, 0x43050000,</div><div class='add'>+0x43060000, 0x43070000, 0x43080000, 0x43090000, 0x430A0000, 0x430B0000,</div><div class='add'>+0x430C0000, 0x430D0000, 0x430E0000, 0x430F0000, 0x43100000, 0x43110000,</div><div class='add'>+0x43120000, 0x43130000, 0x43140000, 0x43150000, 0x43160000, 0x43170000,</div><div class='add'>+0x43180000, 0x43190000, 0x431A0000, 0x431B0000, 0x431C0000, 0x431D0000,</div><div class='add'>+0x431E0000, 0x431F0000, 0x43200000, 0x43210000, 0x43220000, 0x43230000,</div><div class='add'>+0x43240000, 0x43250000, 0x43260000, 0x43270000, 0x43280000, 0x43290000,</div><div class='add'>+0x432A0000, 0x432B0000, 0x432C0000, 0x432D0000, 0x432E0000, 0x432F0000,</div><div class='add'>+0x43300000, 0x43310000, 0x43320000, 0x43330000, 0x43340000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int mic_svm_vals_lookup[] = {</div><div class='add'>+0x00000000, 0x3C23D70A, 0x3CA3D70A, 0x3CF5C28F, 0x3D23D70A, 0x3D4CCCCD,</div><div class='add'>+0x3D75C28F, 0x3D8F5C29, 0x3DA3D70A, 0x3DB851EC, 0x3DCCCCCD, 0x3DE147AE,</div><div class='add'>+0x3DF5C28F, 0x3E051EB8, 0x3E0F5C29, 0x3E19999A, 0x3E23D70A, 0x3E2E147B,</div><div class='add'>+0x3E3851EC, 0x3E428F5C, 0x3E4CCCCD, 0x3E570A3D, 0x3E6147AE, 0x3E6B851F,</div><div class='add'>+0x3E75C28F, 0x3E800000, 0x3E851EB8, 0x3E8A3D71, 0x3E8F5C29, 0x3E947AE1,</div><div class='add'>+0x3E99999A, 0x3E9EB852, 0x3EA3D70A, 0x3EA8F5C3, 0x3EAE147B, 0x3EB33333,</div><div class='add'>+0x3EB851EC, 0x3EBD70A4, 0x3EC28F5C, 0x3EC7AE14, 0x3ECCCCCD, 0x3ED1EB85,</div><div class='add'>+0x3ED70A3D, 0x3EDC28F6, 0x3EE147AE, 0x3EE66666, 0x3EEB851F, 0x3EF0A3D7,</div><div class='add'>+0x3EF5C28F, 0x3EFAE148, 0x3F000000, 0x3F028F5C, 0x3F051EB8, 0x3F07AE14,</div><div class='add'>+0x3F0A3D71, 0x3F0CCCCD, 0x3F0F5C29, 0x3F11EB85, 0x3F147AE1, 0x3F170A3D,</div><div class='add'>+0x3F19999A, 0x3F1C28F6, 0x3F1EB852, 0x3F2147AE, 0x3F23D70A, 0x3F266666,</div><div class='add'>+0x3F28F5C3, 0x3F2B851F, 0x3F2E147B, 0x3F30A3D7, 0x3F333333, 0x3F35C28F,</div><div class='add'>+0x3F3851EC, 0x3F3AE148, 0x3F3D70A4, 0x3F400000, 0x3F428F5C, 0x3F451EB8,</div><div class='add'>+0x3F47AE14, 0x3F4A3D71, 0x3F4CCCCD, 0x3F4F5C29, 0x3F51EB85, 0x3F547AE1,</div><div class='add'>+0x3F570A3D, 0x3F59999A, 0x3F5C28F6, 0x3F5EB852, 0x3F6147AE, 0x3F63D70A,</div><div class='add'>+0x3F666666, 0x3F68F5C3, 0x3F6B851F, 0x3F6E147B, 0x3F70A3D7, 0x3F733333,</div><div class='add'>+0x3F75C28F, 0x3F7851EC, 0x3F7AE148, 0x3F7D70A4, 0x3F800000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int equalizer_vals_lookup[] = {</div><div class='add'>+0xC1C00000, 0xC1B80000, 0xC1B00000, 0xC1A80000, 0xC1A00000, 0xC1980000,</div><div class='add'>+0xC1900000, 0xC1880000, 0xC1800000, 0xC1700000, 0xC1600000, 0xC1500000,</div><div class='add'>+0xC1400000, 0xC1300000, 0xC1200000, 0xC1100000, 0xC1000000, 0xC0E00000,</div><div class='add'>+0xC0C00000, 0xC0A00000, 0xC0800000, 0xC0400000, 0xC0000000, 0xBF800000,</div><div class='add'>+0x00000000, 0x3F800000, 0x40000000, 0x40400000, 0x40800000, 0x40A00000,</div><div class='add'>+0x40C00000, 0x40E00000, 0x41000000, 0x41100000, 0x41200000, 0x41300000,</div><div class='add'>+0x41400000, 0x41500000, 0x41600000, 0x41700000, 0x41800000, 0x41880000,</div><div class='add'>+0x41900000, 0x41980000, 0x41A00000, 0x41A80000, 0x41B00000, 0x41B80000,</div><div class='add'>+0x41C00000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tuning_ctl_set(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  const unsigned int *lookup, int idx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TUNING_CTLS_COUNT; i++) {</div><div class='add'>+		if (nid == ca0132_tuning_ctls[i].nid) {</div><div class='add'>+			CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+			dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,</div><div class='add'>+					ca0132_tuning_ctls[i].req,</div><div class='add'>+					&amp;(lookup[idx]), sizeof(unsigned int));</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tuning_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx = nid - TUNING_CTL_START_NID;</div><div class='add'>+</div><div class='add'>+	*valp = spec-&gt;cur_ctl_vals[idx];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int voice_focus_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 20;</div><div class='add'>+	uinfo-&gt;value.integer.max = 180;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int voice_focus_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = nid - TUNING_CTL_START_NID;</div><div class='add'>+	/* any change? */</div><div class='add'>+	if (spec-&gt;cur_ctl_vals[idx] == *valp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_ctl_vals[idx] = *valp;</div><div class='add'>+</div><div class='add'>+	idx = *valp - 20;</div><div class='add'>+	tuning_ctl_set(codec, nid, voice_focus_vals_lookup, idx);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mic_svm_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 100;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mic_svm_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = nid - TUNING_CTL_START_NID;</div><div class='add'>+	/* any change? */</div><div class='add'>+	if (spec-&gt;cur_ctl_vals[idx] == *valp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_ctl_vals[idx] = *valp;</div><div class='add'>+</div><div class='add'>+	idx = *valp;</div><div class='add'>+	tuning_ctl_set(codec, nid, mic_svm_vals_lookup, idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int equalizer_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 48;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int equalizer_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = nid - TUNING_CTL_START_NID;</div><div class='add'>+	/* any change? */</div><div class='add'>+	if (spec-&gt;cur_ctl_vals[idx] == *valp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_ctl_vals[idx] = *valp;</div><div class='add'>+</div><div class='add'>+	idx = *valp;</div><div class='add'>+	tuning_ctl_set(codec, nid, equalizer_vals_lookup, idx);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(voice_focus_db_scale, 2000, 100, 0);</div><div class='add'>+static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(eq_db_scale, -2400, 100, 0);</div><div class='add'>+</div><div class='add'>+static int add_tuning_control(struct hda_codec *codec,</div><div class='add'>+				hda_nid_t pnid, hda_nid_t nid,</div><div class='add'>+				const char *name, int dir)</div><div class='add'>+{</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int type = dir ? HDA_INPUT : HDA_OUTPUT;</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_VOLUME_MONO(namestr, nid, 1, 0, type);</div><div class='add'>+</div><div class='add'>+	knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='add'>+	knew.tlv.c = NULL;</div><div class='add'>+	knew.tlv.p = NULL;</div><div class='add'>+	switch (pnid) {</div><div class='add'>+	case VOICE_FOCUS:</div><div class='add'>+		knew.info = voice_focus_ctl_info;</div><div class='add'>+		knew.get = tuning_ctl_get;</div><div class='add'>+		knew.put = voice_focus_ctl_put;</div><div class='add'>+		knew.tlv.p = voice_focus_db_scale;</div><div class='add'>+		break;</div><div class='add'>+	case MIC_SVM:</div><div class='add'>+		knew.info = mic_svm_ctl_info;</div><div class='add'>+		knew.get = tuning_ctl_get;</div><div class='add'>+		knew.put = mic_svm_ctl_put;</div><div class='add'>+		break;</div><div class='add'>+	case EQUALIZER:</div><div class='add'>+		knew.info = equalizer_ctl_info;</div><div class='add'>+		knew.get = tuning_ctl_get;</div><div class='add'>+		knew.put = equalizer_ctl_put;</div><div class='add'>+		knew.tlv.p = eq_db_scale;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	knew.private_value =</div><div class='add'>+		HDA_COMPOSE_AMP_VAL(nid, 1, 0, type);</div><div class='add'>+	snprintf(namestr, sizeof(namestr), "%s %s Volume", name, dirstr[dir]);</div><div class='add'>+	return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_tuning_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TUNING_CTLS_COUNT; i++) {</div><div class='add'>+		err = add_tuning_control(codec,</div><div class='add'>+					ca0132_tuning_ctls[i].parent_nid,</div><div class='add'>+					ca0132_tuning_ctls[i].nid,</div><div class='add'>+					ca0132_tuning_ctls[i].name,</div><div class='add'>+					ca0132_tuning_ctls[i].direct);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_init_tuning_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Wedge Angle defaults to 30.  10 below is 30 - 20.  20 is min. */</div><div class='add'>+	spec-&gt;cur_ctl_vals[WEDGE_ANGLE - TUNING_CTL_START_NID] = 10;</div><div class='add'>+	/* SVM level defaults to 0.74. */</div><div class='add'>+	spec-&gt;cur_ctl_vals[SVM_LEVEL - TUNING_CTL_START_NID] = 74;</div><div class='add'>+</div><div class='add'>+	/* EQ defaults to 0dB. */</div><div class='add'>+	for (i = 2; i &lt; TUNING_CTLS_COUNT; i++)</div><div class='add'>+		spec-&gt;cur_ctl_vals[i] = 24;</div><div class='add'>+}</div><div class='add'>+#endif /*ENABLE_TUNING_CONTROLS*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select the active output.</div><div class='add'>+ * If autodetect is enabled, output will be selected based on jack detection.</div><div class='add'>+ * If jack inserted, headphone will be selected, else built-in speakers</div><div class='add'>+ * If autodetect is disabled, output will be selected based on selection.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_select_out(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int pin_ctl;</div><div class='add'>+	int jack_present;</div><div class='add'>+	int auto_jack;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_select_out\n");</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+</div><div class='add'>+	auto_jack = spec-&gt;vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	if (auto_jack)</div><div class='add'>+		jack_present = snd_hda_jack_detect(codec, spec-&gt;unsol_tag_hp);</div><div class='add'>+	else</div><div class='add'>+		jack_present =</div><div class='add'>+			spec-&gt;vnode_lswitch[VNID_HP_SEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	if (jack_present)</div><div class='add'>+		spec-&gt;cur_out_type = HEADPHONE_OUT;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;cur_out_type = SPEAKER_OUT;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cur_out_type == SPEAKER_OUT) {</div><div class='add'>+		codec_dbg(codec, "ca0132_select_out speaker\n");</div><div class='add'>+		/*speaker out config*/</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/*enable speaker EQ*/</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x8f, 0x00, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Setup EAPD */</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[1], 0,</div><div class='add'>+				    VENDOR_CHIPIO_EAPD_SEL_SET, 0x02);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    VENDOR_CHIPIO_EAPD_SEL_SET, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    AC_VERB_SET_EAPD_BTLENABLE, 0x02);</div><div class='add'>+</div><div class='add'>+		/* disable headphone node */</div><div class='add'>+		pin_ctl = snd_hda_codec_read(codec, spec-&gt;out_pins[1], 0,</div><div class='add'>+					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+		snd_hda_set_pin_ctl(codec, spec-&gt;out_pins[1],</div><div class='add'>+				    pin_ctl &amp; ~PIN_HP);</div><div class='add'>+		/* enable speaker node */</div><div class='add'>+		pin_ctl = snd_hda_codec_read(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+		snd_hda_set_pin_ctl(codec, spec-&gt;out_pins[0],</div><div class='add'>+				    pin_ctl | PIN_OUT);</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "ca0132_select_out hp\n");</div><div class='add'>+		/*headphone out config*/</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/*disable speaker EQ*/</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x8f, 0x00, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Setup EAPD */</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    VENDOR_CHIPIO_EAPD_SEL_SET, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[1], 0,</div><div class='add'>+				    VENDOR_CHIPIO_EAPD_SEL_SET, 0x02);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+				    AC_VERB_SET_EAPD_BTLENABLE, 0x02);</div><div class='add'>+</div><div class='add'>+		/* disable speaker*/</div><div class='add'>+		pin_ctl = snd_hda_codec_read(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+		snd_hda_set_pin_ctl(codec, spec-&gt;out_pins[0],</div><div class='add'>+				    pin_ctl &amp; ~PIN_HP);</div><div class='add'>+		/* enable headphone*/</div><div class='add'>+		pin_ctl = snd_hda_codec_read(codec, spec-&gt;out_pins[1], 0,</div><div class='add'>+					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+		snd_hda_set_pin_ctl(codec, spec-&gt;out_pins[1],</div><div class='add'>+				    pin_ctl | PIN_HP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_headphone_gain_set(struct hda_codec *codec, long val);</div><div class='add'>+static int zxr_headphone_gain_set(struct hda_codec *codec, long val);</div><div class='add'>+static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val);</div><div class='add'>+</div><div class='add'>+static void ae5_mmio_select_out(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct ae_ca0113_output_set *out_cmds;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE5)</div><div class='add'>+		out_cmds = &amp;ae5_ca0113_output_presets;</div><div class='add'>+	else</div><div class='add'>+		out_cmds = &amp;ae7_ca0113_output_presets;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AE_CA0113_OUT_SET_COMMANDS; i++)</div><div class='add'>+		ca0113_mmio_command_set(codec, out_cmds-&gt;group[i],</div><div class='add'>+				out_cmds-&gt;target[i],</div><div class='add'>+				out_cmds-&gt;vals[spec-&gt;cur_out_type][i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_set_full_range_speaker(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int quirk = ca0132_quirk(spec);</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* 2.0/4.0 setup has no LFE channel, so setting full-range does nothing. */</div><div class='add'>+	if (spec-&gt;channel_cfg_val == SPEAKER_CHANNELS_4_0</div><div class='add'>+			|| spec-&gt;channel_cfg_val == SPEAKER_CHANNELS_2_0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Set front L/R full range. Zero for full-range, one for redirection. */</div><div class='add'>+	tmp = spec-&gt;speaker_range_val[0] ? FLOAT_ZERO : FLOAT_ONE;</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_FULL_RANGE_FRONT_L_R, tmp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* When setting full-range rear, both rear and center/lfe are set. */</div><div class='add'>+	tmp = spec-&gt;speaker_range_val[1] ? FLOAT_ZERO : FLOAT_ONE;</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_FULL_RANGE_CENTER_LFE, tmp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_FULL_RANGE_REAR_L_R, tmp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Only the AE series cards set this value when setting full-range,</div><div class='add'>+	 * and it's always 1.0f.</div><div class='add'>+	 */</div><div class='add'>+	if (quirk == QUIRK_AE5 || quirk == QUIRK_AE7) {</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+				SPEAKER_FULL_RANGE_SURROUND_L_R, FLOAT_ONE);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_surround_set_bass_redirection(struct hda_codec *codec,</div><div class='add'>+		bool val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (val &amp;&amp; spec-&gt;channel_cfg_val != SPEAKER_CHANNELS_4_0 &amp;&amp;</div><div class='add'>+			spec-&gt;channel_cfg_val != SPEAKER_CHANNELS_2_0)</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+	else</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96, SPEAKER_BASS_REDIRECT, tmp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If it is enabled, make sure to set the crossover frequency. */</div><div class='add'>+	if (tmp) {</div><div class='add'>+		tmp = float_xbass_xover_lookup[spec-&gt;xbass_xover_freq];</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+				SPEAKER_BASS_REDIRECT_XOVER_FREQ, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are the commands needed to setup output on each of the different card</div><div class='add'>+ * types.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_select_out_get_quirk_data(struct hda_codec *codec,</div><div class='add'>+		const struct ca0132_alt_out_set_quirk_data **quirk_data)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int quirk = ca0132_quirk(spec);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	*quirk_data = NULL;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(quirk_out_set_data); i++) {</div><div class='add'>+		if (quirk_out_set_data[i].quirk_id == quirk) {</div><div class='add'>+			*quirk_data = &amp;quirk_out_set_data[i];</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_select_out_quirk_set(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct ca0132_alt_out_set_quirk_data *quirk_data;</div><div class='add'>+	const struct ca0132_alt_out_set_info *out_info;</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i, gpio_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_select_out_get_quirk_data(codec, &amp;quirk_data);</div><div class='add'>+	if (!quirk_data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	out_info = &amp;quirk_data-&gt;out_set_info[spec-&gt;cur_out_type];</div><div class='add'>+	if (quirk_data-&gt;is_ae_series)</div><div class='add'>+		ae5_mmio_select_out(codec);</div><div class='add'>+</div><div class='add'>+	if (out_info-&gt;has_hda_gpio) {</div><div class='add'>+		gpio_data = snd_hda_codec_read(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+</div><div class='add'>+		if (out_info-&gt;hda_gpio_set)</div><div class='add'>+			gpio_data |= (1 &lt;&lt; out_info-&gt;hda_gpio_pin);</div><div class='add'>+		else</div><div class='add'>+			gpio_data &amp;= ~(1 &lt;&lt; out_info-&gt;hda_gpio_pin);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				    AC_VERB_SET_GPIO_DATA, gpio_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (out_info-&gt;mmio_gpio_count) {</div><div class='add'>+		for (i = 0; i &lt; out_info-&gt;mmio_gpio_count; i++) {</div><div class='add'>+			ca0113_mmio_gpio_set(codec, out_info-&gt;mmio_gpio_pin[i],</div><div class='add'>+					out_info-&gt;mmio_gpio_set[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (out_info-&gt;scp_cmds_count) {</div><div class='add'>+		for (i = 0; i &lt; out_info-&gt;scp_cmds_count; i++) {</div><div class='add'>+			err = dspio_set_uint_param(codec,</div><div class='add'>+					out_info-&gt;scp_cmd_mid[i],</div><div class='add'>+					out_info-&gt;scp_cmd_req[i],</div><div class='add'>+					out_info-&gt;scp_cmd_val[i]);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, 0x0d, out_info-&gt;dac2port);</div><div class='add'>+</div><div class='add'>+	if (out_info-&gt;has_chipio_write) {</div><div class='add'>+		chipio_write(codec, out_info-&gt;chipio_write_addr,</div><div class='add'>+				out_info-&gt;chipio_write_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirk_data-&gt;has_headphone_gain) {</div><div class='add'>+		if (spec-&gt;cur_out_type != HEADPHONE_OUT) {</div><div class='add'>+			if (quirk_data-&gt;is_ae_series)</div><div class='add'>+				ae5_headphone_gain_set(codec, 2);</div><div class='add'>+			else</div><div class='add'>+				zxr_headphone_gain_set(codec, 0);</div><div class='add'>+		} else {</div><div class='add'>+			if (quirk_data-&gt;is_ae_series)</div><div class='add'>+				ae5_headphone_gain_set(codec,</div><div class='add'>+						spec-&gt;ae5_headphone_gain_val);</div><div class='add'>+			else</div><div class='add'>+				zxr_headphone_gain_set(codec,</div><div class='add'>+						spec-&gt;zxr_gain_set);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_set_out_node_pincfg(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		bool out_enable, bool hp_enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int pin_ctl;</div><div class='add'>+</div><div class='add'>+	pin_ctl = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+			AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	pin_ctl = hp_enable ? pin_ctl | PIN_HP_AMP : pin_ctl &amp; ~PIN_HP_AMP;</div><div class='add'>+	pin_ctl = out_enable ? pin_ctl | PIN_OUT : pin_ctl &amp; ~PIN_OUT;</div><div class='add'>+	snd_hda_set_pin_ctl(codec, nid, pin_ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function behaves similarly to the ca0132_select_out funciton above,</div><div class='add'>+ * except with a few differences. It adds the ability to select the current</div><div class='add'>+ * output with an enumerated control "output source" if the auto detect</div><div class='add'>+ * mute switch is set to off. If the auto detect mute switch is enabled, it</div><div class='add'>+ * will detect either headphone or lineout(SPEAKER_OUT) from jack detection.</div><div class='add'>+ * It also adds the ability to auto-detect the front headphone port.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_select_out(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp, outfx_set;</div><div class='add'>+	int jack_present;</div><div class='add'>+	int auto_jack;</div><div class='add'>+	int err;</div><div class='add'>+	/* Default Headphone is rear headphone */</div><div class='add'>+	hda_nid_t headphone_nid = spec-&gt;out_pins[1];</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+</div><div class='add'>+	auto_jack = spec-&gt;vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If headphone rear or front is plugged in, set to headphone.</div><div class='add'>+	 * If neither is plugged in, set to rear line out. Only if</div><div class='add'>+	 * hp/speaker auto detect is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (auto_jack) {</div><div class='add'>+		jack_present = snd_hda_jack_detect(codec, spec-&gt;unsol_tag_hp) ||</div><div class='add'>+			   snd_hda_jack_detect(codec, spec-&gt;unsol_tag_front_hp);</div><div class='add'>+</div><div class='add'>+		if (jack_present)</div><div class='add'>+			spec-&gt;cur_out_type = HEADPHONE_OUT;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;cur_out_type = SPEAKER_OUT;</div><div class='add'>+	} else</div><div class='add'>+		spec-&gt;cur_out_type = spec-&gt;out_enum_val;</div><div class='add'>+</div><div class='add'>+	outfx_set = spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID];</div><div class='add'>+</div><div class='add'>+	/* Begin DSP output switch, mute DSP volume. */</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96, SPEAKER_TUNING_MUTE, FLOAT_ONE);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ca0132_alt_select_out_quirk_set(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;cur_out_type) {</div><div class='add'>+	case SPEAKER_OUT:</div><div class='add'>+		codec_dbg(codec, "%s speaker\n", __func__);</div><div class='add'>+</div><div class='add'>+		/* Enable EAPD */</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+			AC_VERB_SET_EAPD_BTLENABLE, 0x01);</div><div class='add'>+</div><div class='add'>+		/* Disable headphone node. */</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[1], 0, 0);</div><div class='add'>+		/* Set front L-R to output. */</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[0], 1, 0);</div><div class='add'>+		/* Set Center/LFE to output. */</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[2], 1, 0);</div><div class='add'>+		/* Set rear surround to output. */</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[3], 1, 0);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Without PlayEnhancement being enabled, if we've got a 2.0</div><div class='add'>+		 * setup, set it to floating point eight to disable any DSP</div><div class='add'>+		 * processing effects.</div><div class='add'>+		 */</div><div class='add'>+		if (!outfx_set &amp;&amp; spec-&gt;channel_cfg_val == SPEAKER_CHANNELS_2_0)</div><div class='add'>+			tmp = FLOAT_EIGHT;</div><div class='add'>+		else</div><div class='add'>+			tmp = speaker_channel_cfgs[spec-&gt;channel_cfg_val].val;</div><div class='add'>+</div><div class='add'>+		err = dspio_set_uint_param(codec, 0x80, 0x04, tmp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case HEADPHONE_OUT:</div><div class='add'>+		codec_dbg(codec, "%s hp\n", __func__);</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;out_pins[0], 0,</div><div class='add'>+			AC_VERB_SET_EAPD_BTLENABLE, 0x00);</div><div class='add'>+</div><div class='add'>+		/* Disable all speaker nodes. */</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[0], 0, 0);</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[2], 0, 0);</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, spec-&gt;out_pins[3], 0, 0);</div><div class='add'>+</div><div class='add'>+		/* enable headphone, either front or rear */</div><div class='add'>+		if (snd_hda_jack_detect(codec, spec-&gt;unsol_tag_front_hp))</div><div class='add'>+			headphone_nid = spec-&gt;out_pins[2];</div><div class='add'>+		else if (snd_hda_jack_detect(codec, spec-&gt;unsol_tag_hp))</div><div class='add'>+			headphone_nid = spec-&gt;out_pins[1];</div><div class='add'>+</div><div class='add'>+		ca0132_set_out_node_pincfg(codec, headphone_nid, 1, 1);</div><div class='add'>+</div><div class='add'>+		if (outfx_set)</div><div class='add'>+			err = dspio_set_uint_param(codec, 0x80, 0x04, FLOAT_ONE);</div><div class='add'>+		else</div><div class='add'>+			err = dspio_set_uint_param(codec, 0x80, 0x04, FLOAT_ZERO);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * If output effects are enabled, set the X-Bass effect value again to</div><div class='add'>+	 * make sure that it's properly enabled/disabled for speaker</div><div class='add'>+	 * configurations with an LFE channel.</div><div class='add'>+	 */</div><div class='add'>+	if (outfx_set)</div><div class='add'>+		ca0132_effects_set(codec, X_BASS,</div><div class='add'>+			spec-&gt;effects_switch[X_BASS - EFFECT_START_NID]);</div><div class='add'>+</div><div class='add'>+	/* Set speaker EQ bypass attenuation to 0. */</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x8f, 0x01, FLOAT_ZERO);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Although unused on all cards but the AE series, this is always set</div><div class='add'>+	 * to zero when setting the output.</div><div class='add'>+	 */</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_TUNING_USE_SPEAKER_EQ, FLOAT_ZERO);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cur_out_type == SPEAKER_OUT)</div><div class='add'>+		err = ca0132_alt_surround_set_bass_redirection(codec,</div><div class='add'>+				spec-&gt;bass_redirection_val);</div><div class='add'>+	else</div><div class='add'>+		err = ca0132_alt_surround_set_bass_redirection(codec, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Unmute DSP now that we're done with output selection. */</div><div class='add'>+	err = dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_TUNING_MUTE, FLOAT_ZERO);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cur_out_type == SPEAKER_OUT) {</div><div class='add'>+		err = ca0132_alt_set_full_range_speaker(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_unsol_hp_delayed(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = container_of(</div><div class='add'>+		to_delayed_work(work), struct ca0132_spec, unsol_hp_work);</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_alt_select_out(spec-&gt;codec);</div><div class='add'>+	else</div><div class='add'>+		ca0132_select_out(spec-&gt;codec);</div><div class='add'>+</div><div class='add'>+	jack = snd_hda_jack_tbl_get(spec-&gt;codec, spec-&gt;unsol_tag_hp);</div><div class='add'>+	if (jack) {</div><div class='add'>+		jack-&gt;block_report = 0;</div><div class='add'>+		snd_hda_jack_report_sync(spec-&gt;codec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_set_dmic(struct hda_codec *codec, int enable);</div><div class='add'>+static int ca0132_mic_boost_set(struct hda_codec *codec, long val);</div><div class='add'>+static void resume_mic1(struct hda_codec *codec, unsigned int oldval);</div><div class='add'>+static int stop_mic1(struct hda_codec *codec);</div><div class='add'>+static int ca0132_cvoice_switch_set(struct hda_codec *codec);</div><div class='add'>+static int ca0132_alt_mic_boost_set(struct hda_codec *codec, long val);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select the active VIP source</div><div class='add'>+ */</div><div class='add'>+static int ca0132_set_vipsource(struct hda_codec *codec, int val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* if CrystalVoice if off, vipsource should be 0 */</div><div class='add'>+	if (!spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID] ||</div><div class='add'>+	    (val == 0)) {</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_VIP_SOURCE, 0);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+		if (spec-&gt;cur_mic_type == DIGITAL_MIC)</div><div class='add'>+			tmp = FLOAT_TWO;</div><div class='add'>+		else</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x05, tmp);</div><div class='add'>+	} else {</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_16_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_16_000);</div><div class='add'>+		if (spec-&gt;cur_mic_type == DIGITAL_MIC)</div><div class='add'>+			tmp = FLOAT_TWO;</div><div class='add'>+		else</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x05, tmp);</div><div class='add'>+		msleep(20);</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_VIP_SOURCE, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_set_vipsource(struct hda_codec *codec, int val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+</div><div class='add'>+	/* if CrystalVoice is off, vipsource should be 0 */</div><div class='add'>+	if (!spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID] ||</div><div class='add'>+	    (val == 0) || spec-&gt;in_enum_val == REAR_LINE_IN) {</div><div class='add'>+		codec_dbg(codec, "%s: off.", __func__);</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_VIP_SOURCE, 0);</div><div class='add'>+</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x05, tmp);</div><div class='add'>+</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+			chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;in_enum_val == REAR_LINE_IN)</div><div class='add'>+			tmp = FLOAT_ZERO;</div><div class='add'>+		else {</div><div class='add'>+			if (ca0132_quirk(spec) == QUIRK_SBZ)</div><div class='add'>+				tmp = FLOAT_THREE;</div><div class='add'>+			else</div><div class='add'>+				tmp = FLOAT_ONE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "%s: on.", __func__);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_16_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_16_000);</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+			chipio_set_conn_rate(codec, 0x0F, SR_16_000);</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;effects_switch[VOICE_FOCUS - EFFECT_START_NID])</div><div class='add'>+			tmp = FLOAT_TWO;</div><div class='add'>+		else</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x05, tmp);</div><div class='add'>+</div><div class='add'>+		msleep(20);</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_VIP_SOURCE, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 1);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 1);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select the active microphone.</div><div class='add'>+ * If autodetect is enabled, mic will be selected based on jack detection.</div><div class='add'>+ * If jack inserted, ext.mic will be selected, else built-in mic</div><div class='add'>+ * If autodetect is disabled, mic will be selected based on selection.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_select_mic(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int jack_present;</div><div class='add'>+	int auto_jack;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_select_mic\n");</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+</div><div class='add'>+	auto_jack = spec-&gt;vnode_lswitch[VNID_AMIC1_ASEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	if (auto_jack)</div><div class='add'>+		jack_present = snd_hda_jack_detect(codec, spec-&gt;unsol_tag_amic1);</div><div class='add'>+	else</div><div class='add'>+		jack_present =</div><div class='add'>+			spec-&gt;vnode_lswitch[VNID_AMIC1_SEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	if (jack_present)</div><div class='add'>+		spec-&gt;cur_mic_type = LINE_MIC_IN;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;cur_mic_type = DIGITAL_MIC;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cur_mic_type == DIGITAL_MIC) {</div><div class='add'>+		/* enable digital Mic */</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_DMIC, SR_32_000);</div><div class='add'>+		ca0132_set_dmic(codec, 1);</div><div class='add'>+		ca0132_mic_boost_set(codec, 0);</div><div class='add'>+		/* set voice focus */</div><div class='add'>+		ca0132_effects_set(codec, VOICE_FOCUS,</div><div class='add'>+				   spec-&gt;effects_switch</div><div class='add'>+				   [VOICE_FOCUS - EFFECT_START_NID]);</div><div class='add'>+	} else {</div><div class='add'>+		/* disable digital Mic */</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_DMIC, SR_96_000);</div><div class='add'>+		ca0132_set_dmic(codec, 0);</div><div class='add'>+		ca0132_mic_boost_set(codec, spec-&gt;cur_mic_boost);</div><div class='add'>+		/* disable voice focus */</div><div class='add'>+		ca0132_effects_set(codec, VOICE_FOCUS, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Select the active input.</div><div class='add'>+ * Mic detection isn't used, because it's kind of pointless on the SBZ.</div><div class='add'>+ * The front mic has no jack-detection, so the only way to switch to it</div><div class='add'>+ * is to do it manually in alsamixer.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_select_in(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_mic_type = spec-&gt;in_enum_val;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;cur_mic_type) {</div><div class='add'>+	case REAR_MIC:</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+		case QUIRK_R3D:</div><div class='add'>+			ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_ZXR:</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_R3DI:</div><div class='add'>+			r3di_gpio_mic_set(codec, R3DI_REAR_MIC);</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE7:</div><div class='add'>+			ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			chipio_set_conn_rate(codec, MEM_CONNID_MICIN2,</div><div class='add'>+					SR_96_000);</div><div class='add'>+			chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2,</div><div class='add'>+					SR_96_000);</div><div class='add'>+			dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+			chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		chipio_set_stream_control(codec, 0x03, 1);</div><div class='add'>+		chipio_set_stream_control(codec, 0x04, 1);</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x0000000C);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x0000000C);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_ZXR:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x0000000C);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x000000CC);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x0000000C);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x0000004C);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ca0132_alt_mic_boost_set(codec, spec-&gt;mic_boost_enum_val);</div><div class='add'>+		break;</div><div class='add'>+	case REAR_LINE_IN:</div><div class='add'>+		ca0132_mic_boost_set(codec, 0);</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+		case QUIRK_R3D:</div><div class='add'>+			ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_R3DI:</div><div class='add'>+			r3di_gpio_mic_set(codec, R3DI_REAR_MIC);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE7:</div><div class='add'>+			ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f);</div><div class='add'>+			chipio_set_conn_rate(codec, MEM_CONNID_MICIN2,</div><div class='add'>+					SR_96_000);</div><div class='add'>+			chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2,</div><div class='add'>+					SR_96_000);</div><div class='add'>+			dspio_set_uint_param(codec, 0x80, 0x01, FLOAT_ZERO);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+			chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_AE7)</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+		else</div><div class='add'>+			tmp = FLOAT_ZERO;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x00000000);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x00000000);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		chipio_set_stream_control(codec, 0x03, 1);</div><div class='add'>+		chipio_set_stream_control(codec, 0x04, 1);</div><div class='add'>+		break;</div><div class='add'>+	case FRONT_MIC:</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+		case QUIRK_R3D:</div><div class='add'>+			ca0113_mmio_gpio_set(codec, 0, true);</div><div class='add'>+			ca0113_mmio_gpio_set(codec, 5, false);</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_R3DI:</div><div class='add'>+			r3di_gpio_mic_set(codec, R3DI_FRONT_MIC);</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			ca0113_mmio_command_set(codec, 0x30, 0x28, 0x3f);</div><div class='add'>+			tmp = FLOAT_THREE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			tmp = FLOAT_ONE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+		if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+			chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		chipio_set_stream_control(codec, 0x03, 1);</div><div class='add'>+		chipio_set_stream_control(codec, 0x04, 1);</div><div class='add'>+</div><div class='add'>+		switch (ca0132_quirk(spec)) {</div><div class='add'>+		case QUIRK_SBZ:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x0000000C);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x000000CC);</div><div class='add'>+			break;</div><div class='add'>+		case QUIRK_AE5:</div><div class='add'>+			chipio_write(codec, 0x18B098, 0x0000000C);</div><div class='add'>+			chipio_write(codec, 0x18B09C, 0x0000004C);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		ca0132_alt_mic_boost_set(codec, spec-&gt;mic_boost_enum_val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ca0132_cvoice_switch_set(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if VNODE settings take effect immediately.</div><div class='add'>+ */</div><div class='add'>+static bool ca0132_is_vnode_effective(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t vnid,</div><div class='add'>+				     hda_nid_t *shared_nid)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	switch (vnid) {</div><div class='add'>+	case VNID_SPK:</div><div class='add'>+		nid = spec-&gt;shared_out_nid;</div><div class='add'>+		break;</div><div class='add'>+	case VNID_MIC:</div><div class='add'>+		nid = spec-&gt;shared_mic_nid;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (shared_nid)</div><div class='add'>+		*shared_nid = nid;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+* The following functions are control change helpers.</div><div class='add'>+* They return 0 if no changed.  Return 1 if changed.</div><div class='add'>+*/</div><div class='add'>+static int ca0132_voicefx_set(struct hda_codec *codec, int enable)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	/* based on CrystalVoice state to enable VoiceFX. */</div><div class='add'>+	if (enable) {</div><div class='add'>+		tmp = spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID] ?</div><div class='add'>+			FLOAT_ONE : FLOAT_ZERO;</div><div class='add'>+	} else {</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dspio_set_uint_param(codec, ca0132_voicefx.mid,</div><div class='add'>+			     ca0132_voicefx.reqs[0], tmp);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Set the effects parameters</div><div class='add'>+ */</div><div class='add'>+static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int on, tmp, channel_cfg;</div><div class='add'>+	int num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int idx = nid - EFFECT_START_NID;</div><div class='add'>+</div><div class='add'>+	if ((idx &lt; 0) || (idx &gt;= num_fx))</div><div class='add'>+		return 0; /* no changed */</div><div class='add'>+</div><div class='add'>+	/* for out effect, qualify with PE */</div><div class='add'>+	if ((nid &gt;= OUT_EFFECT_START_NID) &amp;&amp; (nid &lt; OUT_EFFECT_END_NID)) {</div><div class='add'>+		/* if PE if off, turn off out effects. */</div><div class='add'>+		if (!spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID])</div><div class='add'>+			val = 0;</div><div class='add'>+		if (spec-&gt;cur_out_type == SPEAKER_OUT &amp;&amp; nid == X_BASS) {</div><div class='add'>+			channel_cfg = spec-&gt;channel_cfg_val;</div><div class='add'>+			if (channel_cfg != SPEAKER_CHANNELS_2_0 &amp;&amp;</div><div class='add'>+					channel_cfg != SPEAKER_CHANNELS_4_0)</div><div class='add'>+				val = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for in effect, qualify with CrystalVoice */</div><div class='add'>+	if ((nid &gt;= IN_EFFECT_START_NID) &amp;&amp; (nid &lt; IN_EFFECT_END_NID)) {</div><div class='add'>+		/* if CrystalVoice if off, turn off in effects. */</div><div class='add'>+		if (!spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID])</div><div class='add'>+			val = 0;</div><div class='add'>+</div><div class='add'>+		/* Voice Focus applies to 2-ch Mic, Digital Mic */</div><div class='add'>+		if ((nid == VOICE_FOCUS) &amp;&amp; (spec-&gt;cur_mic_type != DIGITAL_MIC))</div><div class='add'>+			val = 0;</div><div class='add'>+</div><div class='add'>+		/* If Voice Focus on SBZ, set to two channel. */</div><div class='add'>+		if ((nid == VOICE_FOCUS) &amp;&amp; ca0132_use_pci_mmio(spec)</div><div class='add'>+				&amp;&amp; (spec-&gt;cur_mic_type != REAR_LINE_IN)) {</div><div class='add'>+			if (spec-&gt;effects_switch[CRYSTAL_VOICE -</div><div class='add'>+						 EFFECT_START_NID]) {</div><div class='add'>+</div><div class='add'>+				if (spec-&gt;effects_switch[VOICE_FOCUS -</div><div class='add'>+							 EFFECT_START_NID]) {</div><div class='add'>+					tmp = FLOAT_TWO;</div><div class='add'>+					val = 1;</div><div class='add'>+				} else</div><div class='add'>+					tmp = FLOAT_ONE;</div><div class='add'>+</div><div class='add'>+				dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/*</div><div class='add'>+		 * For SBZ noise reduction, there's an extra command</div><div class='add'>+		 * to module ID 0x47. No clue why.</div><div class='add'>+		 */</div><div class='add'>+		if ((nid == NOISE_REDUCTION) &amp;&amp; ca0132_use_pci_mmio(spec)</div><div class='add'>+				&amp;&amp; (spec-&gt;cur_mic_type != REAR_LINE_IN)) {</div><div class='add'>+			if (spec-&gt;effects_switch[CRYSTAL_VOICE -</div><div class='add'>+						 EFFECT_START_NID]) {</div><div class='add'>+				if (spec-&gt;effects_switch[NOISE_REDUCTION -</div><div class='add'>+							 EFFECT_START_NID])</div><div class='add'>+					tmp = FLOAT_ONE;</div><div class='add'>+				else</div><div class='add'>+					tmp = FLOAT_ZERO;</div><div class='add'>+			} else</div><div class='add'>+				tmp = FLOAT_ZERO;</div><div class='add'>+</div><div class='add'>+			dspio_set_uint_param(codec, 0x47, 0x00, tmp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If rear line in disable effects. */</div><div class='add'>+		if (ca0132_use_alt_functions(spec) &amp;&amp;</div><div class='add'>+				spec-&gt;in_enum_val == REAR_LINE_IN)</div><div class='add'>+			val = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_effect_set: nid=0x%x, val=%ld\n",</div><div class='add'>+		    nid, val);</div><div class='add'>+</div><div class='add'>+	on = (val == 0) ? FLOAT_ZERO : FLOAT_ONE;</div><div class='add'>+	err = dspio_set_uint_param(codec, ca0132_effects[idx].mid,</div><div class='add'>+				   ca0132_effects[idx].reqs[0], on);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return 0; /* no changed */</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Turn on/off Playback Enhancements</div><div class='add'>+ */</div><div class='add'>+static int ca0132_pe_switch_set(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_pe_switch_set: val=%ld\n",</div><div class='add'>+		    spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]);</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_alt_select_out(codec);</div><div class='add'>+</div><div class='add'>+	i = OUT_EFFECT_START_NID - EFFECT_START_NID;</div><div class='add'>+	nid = OUT_EFFECT_START_NID;</div><div class='add'>+	/* PE affects all out effects */</div><div class='add'>+	for (; nid &lt; OUT_EFFECT_END_NID; nid++, i++)</div><div class='add'>+		ret |= ca0132_effects_set(codec, nid, spec-&gt;effects_switch[i]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if Mic1 is streaming, if so, stop streaming */</div><div class='add'>+static int stop_mic1(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int oldval = snd_hda_codec_read(codec, spec-&gt;adcs[0], 0,</div><div class='add'>+						 AC_VERB_GET_CONV, 0);</div><div class='add'>+	if (oldval != 0)</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;adcs[0], 0,</div><div class='add'>+				    AC_VERB_SET_CHANNEL_STREAMID,</div><div class='add'>+				    0);</div><div class='add'>+	return oldval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Resume Mic1 streaming if it was stopped. */</div><div class='add'>+static void resume_mic1(struct hda_codec *codec, unsigned int oldval)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	/* Restore the previous stream and channel */</div><div class='add'>+	if (oldval != 0)</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;adcs[0], 0,</div><div class='add'>+				    AC_VERB_SET_CHANNEL_STREAMID,</div><div class='add'>+				    oldval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Turn on/off CrystalVoice</div><div class='add'>+ */</div><div class='add'>+static int ca0132_cvoice_switch_set(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	unsigned int oldval;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_cvoice_switch_set: val=%ld\n",</div><div class='add'>+		    spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID]);</div><div class='add'>+</div><div class='add'>+	i = IN_EFFECT_START_NID - EFFECT_START_NID;</div><div class='add'>+	nid = IN_EFFECT_START_NID;</div><div class='add'>+	/* CrystalVoice affects all in effects */</div><div class='add'>+	for (; nid &lt; IN_EFFECT_END_NID; nid++, i++)</div><div class='add'>+		ret |= ca0132_effects_set(codec, nid, spec-&gt;effects_switch[i]);</div><div class='add'>+</div><div class='add'>+	/* including VoiceFX */</div><div class='add'>+	ret |= ca0132_voicefx_set(codec, (spec-&gt;voicefx_val ? 1 : 0));</div><div class='add'>+</div><div class='add'>+	/* set correct vipsource */</div><div class='add'>+	oldval = stop_mic1(codec);</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ret |= ca0132_alt_set_vipsource(codec, 1);</div><div class='add'>+	else</div><div class='add'>+		ret |= ca0132_set_vipsource(codec, 1);</div><div class='add'>+	resume_mic1(codec, oldval);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_mic_boost_set(struct hda_codec *codec, long val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (val) /* on */</div><div class='add'>+		ret = snd_hda_codec_amp_update(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+					HDA_INPUT, 0, HDA_AMP_VOLMASK, 3);</div><div class='add'>+	else /* off */</div><div class='add'>+		ret = snd_hda_codec_amp_update(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+					HDA_INPUT, 0, HDA_AMP_VOLMASK, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_mic_boost_set(struct hda_codec *codec, long val)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = snd_hda_codec_amp_update(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+				HDA_INPUT, 0, HDA_AMP_VOLMASK, val);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_headphone_gain_set(struct hda_codec *codec, long val)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x48, 0x11 + i,</div><div class='add'>+				ae5_headphone_gain_presets[val].vals[i]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * gpio pin 1 is a relay that switches on/off, apparently setting the headphone</div><div class='add'>+ * amplifier to handle a 600 ohm load.</div><div class='add'>+ */</div><div class='add'>+static int zxr_headphone_gain_set(struct hda_codec *codec, long val)</div><div class='add'>+{</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_vnode_switch_set(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	hda_nid_t shared_nid = 0;</div><div class='add'>+	bool effective;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int auto_jack;</div><div class='add'>+</div><div class='add'>+	if (nid == VNID_HP_SEL) {</div><div class='add'>+		auto_jack =</div><div class='add'>+			spec-&gt;vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];</div><div class='add'>+		if (!auto_jack) {</div><div class='add'>+			if (ca0132_use_alt_functions(spec))</div><div class='add'>+				ca0132_alt_select_out(codec);</div><div class='add'>+			else</div><div class='add'>+				ca0132_select_out(codec);</div><div class='add'>+		}</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == VNID_AMIC1_SEL) {</div><div class='add'>+		auto_jack =</div><div class='add'>+			spec-&gt;vnode_lswitch[VNID_AMIC1_ASEL - VNODE_START_NID];</div><div class='add'>+		if (!auto_jack)</div><div class='add'>+			ca0132_select_mic(codec);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == VNID_HP_ASEL) {</div><div class='add'>+		if (ca0132_use_alt_functions(spec))</div><div class='add'>+			ca0132_alt_select_out(codec);</div><div class='add'>+		else</div><div class='add'>+			ca0132_select_out(codec);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == VNID_AMIC1_ASEL) {</div><div class='add'>+		ca0132_select_mic(codec);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if effective conditions, then update hw immediately. */</div><div class='add'>+	effective = ca0132_is_vnode_effective(codec, nid, &amp;shared_nid);</div><div class='add'>+	if (effective) {</div><div class='add'>+		int dir = get_amp_direction(kcontrol);</div><div class='add'>+		int ch = get_amp_channels(kcontrol);</div><div class='add'>+		unsigned long pval;</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+		pval = kcontrol-&gt;private_value;</div><div class='add'>+		kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(shared_nid, ch,</div><div class='add'>+								0, dir);</div><div class='add'>+		ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+		kcontrol-&gt;private_value = pval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+/* End of control change helpers. */</div><div class='add'>+</div><div class='add'>+static void ca0132_alt_bass_redirection_xover_set(struct hda_codec *codec,</div><div class='add'>+		long idx)</div><div class='add'>+{</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+</div><div class='add'>+	dspio_set_param(codec, 0x96, 0x20, SPEAKER_BASS_REDIRECT_XOVER_FREQ,</div><div class='add'>+			&amp;(float_xbass_xover_lookup[idx]), sizeof(unsigned int));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Below I've added controls to mess with the effect levels, I've only enabled</div><div class='add'>+ * them on the Sound Blaster Z, but they would probably also work on the</div><div class='add'>+ * Chromebook. I figured they were probably tuned specifically for it, and left</div><div class='add'>+ * out for a reason.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Sets DSP effect level from the sliders above the controls */</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_slider_ctl_set(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  const unsigned int *lookup, int idx)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+	unsigned int y;</div><div class='add'>+	/*</div><div class='add'>+	 * For X_BASS, req 2 is actually crossover freq instead of</div><div class='add'>+	 * effect level</div><div class='add'>+	 */</div><div class='add'>+	if (nid == X_BASS)</div><div class='add'>+		y = 2;</div><div class='add'>+	else</div><div class='add'>+		y = 1;</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+	if (nid == XBASS_XOVER) {</div><div class='add'>+		for (i = 0; i &lt; OUT_EFFECTS_COUNT; i++)</div><div class='add'>+			if (ca0132_effects[i].nid == X_BASS)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		dspio_set_param(codec, ca0132_effects[i].mid, 0x20,</div><div class='add'>+				ca0132_effects[i].reqs[1],</div><div class='add'>+				&amp;(lookup[idx - 1]), sizeof(unsigned int));</div><div class='add'>+	} else {</div><div class='add'>+		/* Find the actual effect structure */</div><div class='add'>+		for (i = 0; i &lt; OUT_EFFECTS_COUNT; i++)</div><div class='add'>+			if (nid == ca0132_effects[i].nid)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+		dspio_set_param(codec, ca0132_effects[i].mid, 0x20,</div><div class='add'>+				ca0132_effects[i].reqs[y],</div><div class='add'>+				&amp;(lookup[idx]), sizeof(unsigned int));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_xbass_xover_slider_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+</div><div class='add'>+	if (nid == BASS_REDIRECTION_XOVER)</div><div class='add'>+		*valp = spec-&gt;bass_redirect_xover_freq;</div><div class='add'>+	else</div><div class='add'>+		*valp = spec-&gt;xbass_xover_freq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_slider_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx = nid - OUT_EFFECT_START_NID;</div><div class='add'>+</div><div class='add'>+	*valp = spec-&gt;fx_ctl_val[idx];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The X-bass crossover starts at 10hz, so the min is 1. The</div><div class='add'>+ * frequency is set in multiples of 10.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_xbass_xover_slider_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+		struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 1;</div><div class='add'>+	uinfo-&gt;value.integer.max = 100;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_effect_slider_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+		struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 100;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_xbass_xover_slider_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	long *cur_val;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (nid == BASS_REDIRECTION_XOVER)</div><div class='add'>+		cur_val = &amp;spec-&gt;bass_redirect_xover_freq;</div><div class='add'>+	else</div><div class='add'>+		cur_val = &amp;spec-&gt;xbass_xover_freq;</div><div class='add'>+</div><div class='add'>+	/* any change? */</div><div class='add'>+	if (*cur_val == *valp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*cur_val = *valp;</div><div class='add'>+</div><div class='add'>+	idx = *valp;</div><div class='add'>+	if (nid == BASS_REDIRECTION_XOVER)</div><div class='add'>+		ca0132_alt_bass_redirection_xover_set(codec, *cur_val);</div><div class='add'>+	else</div><div class='add'>+		ca0132_alt_slider_ctl_set(codec, nid, float_xbass_xover_lookup, idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_effect_slider_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = nid - EFFECT_START_NID;</div><div class='add'>+	/* any change? */</div><div class='add'>+	if (spec-&gt;fx_ctl_val[idx] == *valp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;fx_ctl_val[idx] = *valp;</div><div class='add'>+</div><div class='add'>+	idx = *valp;</div><div class='add'>+	ca0132_alt_slider_ctl_set(codec, nid, float_zero_to_one_lookup, idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mic Boost Enum for alternative ca0132 codecs. I didn't like that the original</div><div class='add'>+ * only has off or full 30 dB, and didn't like making a volume slider that has</div><div class='add'>+ * traditional 0-100 in alsamixer that goes in big steps. I like enum better.</div><div class='add'>+ */</div><div class='add'>+#define MIC_BOOST_NUM_OF_STEPS 4</div><div class='add'>+#define MIC_BOOST_ENUM_MAX_STRLEN 10</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_mic_boost_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	const char *sfx = "dB";</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = MIC_BOOST_NUM_OF_STEPS;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= MIC_BOOST_NUM_OF_STEPS)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = MIC_BOOST_NUM_OF_STEPS - 1;</div><div class='add'>+	sprintf(namestr, "%d %s", (uinfo-&gt;value.enumerated.item * 10), sfx);</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, namestr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_mic_boost_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;mic_boost_enum_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_mic_boost_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = MIC_BOOST_NUM_OF_STEPS;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_alt_mic_boost: boost=%d\n",</div><div class='add'>+		    sel);</div><div class='add'>+</div><div class='add'>+	spec-&gt;mic_boost_enum_val = sel;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;in_enum_val != REAR_LINE_IN)</div><div class='add'>+		ca0132_alt_mic_boost_set(codec, spec-&gt;mic_boost_enum_val);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sound BlasterX AE-5 Headphone Gain Controls.</div><div class='add'>+ */</div><div class='add'>+#define AE5_HEADPHONE_GAIN_MAX 3</div><div class='add'>+static int ae5_headphone_gain_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	const char *sfx = " Ohms)";</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = AE5_HEADPHONE_GAIN_MAX;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= AE5_HEADPHONE_GAIN_MAX)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = AE5_HEADPHONE_GAIN_MAX - 1;</div><div class='add'>+	sprintf(namestr, "%s %s",</div><div class='add'>+		ae5_headphone_gain_presets[uinfo-&gt;value.enumerated.item].name,</div><div class='add'>+		sfx);</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, namestr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_headphone_gain_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;ae5_headphone_gain_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_headphone_gain_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = AE5_HEADPHONE_GAIN_MAX;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ae5_headphone_gain: boost=%d\n",</div><div class='add'>+		    sel);</div><div class='add'>+</div><div class='add'>+	spec-&gt;ae5_headphone_gain_val = sel;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;out_enum_val == HEADPHONE_OUT)</div><div class='add'>+		ae5_headphone_gain_set(codec, spec-&gt;ae5_headphone_gain_val);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sound BlasterX AE-5 sound filter enumerated control.</div><div class='add'>+ */</div><div class='add'>+#define AE5_SOUND_FILTER_MAX 3</div><div class='add'>+</div><div class='add'>+static int ae5_sound_filter_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = AE5_SOUND_FILTER_MAX;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= AE5_SOUND_FILTER_MAX)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = AE5_SOUND_FILTER_MAX - 1;</div><div class='add'>+	sprintf(namestr, "%s",</div><div class='add'>+			ae5_filter_presets[uinfo-&gt;value.enumerated.item].name);</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, namestr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_sound_filter_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;ae5_filter_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ae5_sound_filter_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = AE5_SOUND_FILTER_MAX;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ae5_sound_filter: %s\n",</div><div class='add'>+			ae5_filter_presets[sel].name);</div><div class='add'>+</div><div class='add'>+	spec-&gt;ae5_filter_val = sel;</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07,</div><div class='add'>+			ae5_filter_presets[sel].val);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Input Select Control for alternative ca0132 codecs. This exists because</div><div class='add'>+ * front microphone has no auto-detect, and we need a way to set the rear</div><div class='add'>+ * as line-in</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_input_source_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = IN_SRC_NUM_OF_INPUTS;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= IN_SRC_NUM_OF_INPUTS)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = IN_SRC_NUM_OF_INPUTS - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+			in_src_str[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_input_source_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;in_enum_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_input_source_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = IN_SRC_NUM_OF_INPUTS;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The AE-7 has no front microphone, so limit items to 2: rear mic and</div><div class='add'>+	 * line-in.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE7)</div><div class='add'>+		items = 2;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_alt_input_select: sel=%d, preset=%s\n",</div><div class='add'>+		    sel, in_src_str[sel]);</div><div class='add'>+</div><div class='add'>+	spec-&gt;in_enum_val = sel;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_select_in(codec);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sound Blaster Z Output Select Control */</div><div class='add'>+static int ca0132_alt_output_select_get_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = NUM_OF_OUTPUTS;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= NUM_OF_OUTPUTS)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = NUM_OF_OUTPUTS - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+			out_type_str[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_output_select_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;out_enum_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_output_select_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = NUM_OF_OUTPUTS;</div><div class='add'>+	unsigned int auto_jack;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_alt_output_select: sel=%d, preset=%s\n",</div><div class='add'>+		    sel, out_type_str[sel]);</div><div class='add'>+</div><div class='add'>+	spec-&gt;out_enum_val = sel;</div><div class='add'>+</div><div class='add'>+	auto_jack = spec-&gt;vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	if (!auto_jack)</div><div class='add'>+		ca0132_alt_select_out(codec);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Select surround output type: 2.1, 4.0, 4.1, or 5.1. */</div><div class='add'>+static int ca0132_alt_speaker_channel_cfg_get_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int items = SPEAKER_CHANNEL_CFG_COUNT;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = items;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= items)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = items - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+			speaker_channel_cfgs[uinfo-&gt;value.enumerated.item].name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_speaker_channel_cfg_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;channel_cfg_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_speaker_channel_cfg_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = SPEAKER_CHANNEL_CFG_COUNT;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_alt_speaker_channels: sel=%d, channels=%s\n",</div><div class='add'>+		    sel, speaker_channel_cfgs[sel].name);</div><div class='add'>+</div><div class='add'>+	spec-&gt;channel_cfg_val = sel;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;out_enum_val == SPEAKER_OUT)</div><div class='add'>+		ca0132_alt_select_out(codec);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Smart Volume output setting control. Three different settings, Normal,</div><div class='add'>+ * which takes the value from the smart volume slider. The two others, loud</div><div class='add'>+ * and night, disregard the slider value and have uneditable values.</div><div class='add'>+ */</div><div class='add'>+#define NUM_OF_SVM_SETTINGS 3</div><div class='add'>+static const char *const out_svm_set_enum_str[3] = {"Normal", "Loud", "Night" };</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_svm_setting_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = NUM_OF_SVM_SETTINGS;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= NUM_OF_SVM_SETTINGS)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = NUM_OF_SVM_SETTINGS - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+			out_svm_set_enum_str[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_svm_setting_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;smart_volume_setting;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_svm_setting_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = NUM_OF_SVM_SETTINGS;</div><div class='add'>+	unsigned int idx = SMART_VOLUME - EFFECT_START_NID;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_alt_svm_setting: sel=%d, preset=%s\n",</div><div class='add'>+		    sel, out_svm_set_enum_str[sel]);</div><div class='add'>+</div><div class='add'>+	spec-&gt;smart_volume_setting = sel;</div><div class='add'>+</div><div class='add'>+	switch (sel) {</div><div class='add'>+	case 0:</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		tmp = FLOAT_TWO;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		tmp = FLOAT_ZERO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/* Req 2 is the Smart Volume Setting req. */</div><div class='add'>+	dspio_set_uint_param(codec, ca0132_effects[idx].mid,</div><div class='add'>+			ca0132_effects[idx].reqs[2], tmp);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sound Blaster Z EQ preset controls */</div><div class='add'>+static int ca0132_alt_eq_preset_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int items = ARRAY_SIZE(ca0132_alt_eq_presets);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = items;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= items)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = items - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+		ca0132_alt_eq_presets[uinfo-&gt;value.enumerated.item].name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_eq_preset_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;eq_preset_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_eq_preset_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned int items = ARRAY_SIZE(ca0132_alt_eq_presets);</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s: sel=%d, preset=%s\n", __func__, sel,</div><div class='add'>+			ca0132_alt_eq_presets[sel].name);</div><div class='add'>+	/*</div><div class='add'>+	 * Idx 0 is default.</div><div class='add'>+	 * Default needs to qualify with CrystalVoice state.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; EQ_PRESET_MAX_PARAM_COUNT; i++) {</div><div class='add'>+		err = dspio_set_uint_param(codec, ca0132_alt_eq_enum.mid,</div><div class='add'>+				ca0132_alt_eq_enum.reqs[i],</div><div class='add'>+				ca0132_alt_eq_presets[sel].vals[i]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &gt;= 0)</div><div class='add'>+		spec-&gt;eq_preset_val = sel;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_voicefx_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int items = ARRAY_SIZE(ca0132_voicefx_presets);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = items;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= items)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = items - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+	       ca0132_voicefx_presets[uinfo-&gt;value.enumerated.item].name);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_voicefx_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;voicefx_val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_voicefx_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+</div><div class='add'>+	if (sel &gt;= ARRAY_SIZE(ca0132_voicefx_presets))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_voicefx_put: sel=%d, preset=%s\n",</div><div class='add'>+		    sel, ca0132_voicefx_presets[sel].name);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Idx 0 is default.</div><div class='add'>+	 * Default needs to qualify with CrystalVoice state.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; VOICEFX_MAX_PARAM_COUNT; i++) {</div><div class='add'>+		err = dspio_set_uint_param(codec, ca0132_voicefx.mid,</div><div class='add'>+				ca0132_voicefx.reqs[i],</div><div class='add'>+				ca0132_voicefx_presets[sel].vals[i]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		spec-&gt;voicefx_val = sel;</div><div class='add'>+		/* enable voice fx */</div><div class='add'>+		ca0132_voicefx_set(codec, (sel ? 1 : 0));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	/* vnode */</div><div class='add'>+	if ((nid &gt;= VNODE_START_NID) &amp;&amp; (nid &lt; VNODE_END_NID)) {</div><div class='add'>+		if (ch &amp; 1) {</div><div class='add'>+			*valp = spec-&gt;vnode_lswitch[nid - VNODE_START_NID];</div><div class='add'>+			valp++;</div><div class='add'>+		}</div><div class='add'>+		if (ch &amp; 2) {</div><div class='add'>+			*valp = spec-&gt;vnode_rswitch[nid - VNODE_START_NID];</div><div class='add'>+			valp++;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* effects, include PE and CrystalVoice */</div><div class='add'>+	if ((nid &gt;= EFFECT_START_NID) &amp;&amp; (nid &lt; EFFECT_END_NID)) {</div><div class='add'>+		*valp = spec-&gt;effects_switch[nid - EFFECT_START_NID];</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mic boost */</div><div class='add'>+	if (nid == spec-&gt;input_pins[0]) {</div><div class='add'>+		*valp = spec-&gt;cur_mic_boost;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == ZXR_HEADPHONE_GAIN) {</div><div class='add'>+		*valp = spec-&gt;zxr_gain_set;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == SPEAKER_FULL_RANGE_FRONT || nid == SPEAKER_FULL_RANGE_REAR) {</div><div class='add'>+		*valp = spec-&gt;speaker_range_val[nid - SPEAKER_FULL_RANGE_FRONT];</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == BASS_REDIRECTION) {</div><div class='add'>+		*valp = spec-&gt;bass_redirection_val;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_switch_put: nid=0x%x, val=%ld\n",</div><div class='add'>+		    nid, *valp);</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+	/* vnode */</div><div class='add'>+	if ((nid &gt;= VNODE_START_NID) &amp;&amp; (nid &lt; VNODE_END_NID)) {</div><div class='add'>+		if (ch &amp; 1) {</div><div class='add'>+			spec-&gt;vnode_lswitch[nid - VNODE_START_NID] = *valp;</div><div class='add'>+			valp++;</div><div class='add'>+		}</div><div class='add'>+		if (ch &amp; 2) {</div><div class='add'>+			spec-&gt;vnode_rswitch[nid - VNODE_START_NID] = *valp;</div><div class='add'>+			valp++;</div><div class='add'>+		}</div><div class='add'>+		return ca0132_vnode_switch_set(kcontrol, ucontrol);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PE */</div><div class='add'>+	if (nid == PLAY_ENHANCEMENT) {</div><div class='add'>+		spec-&gt;effects_switch[nid - EFFECT_START_NID] = *valp;</div><div class='add'>+		return ca0132_pe_switch_set(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CrystalVoice */</div><div class='add'>+	if (nid == CRYSTAL_VOICE) {</div><div class='add'>+		spec-&gt;effects_switch[nid - EFFECT_START_NID] = *valp;</div><div class='add'>+		return ca0132_cvoice_switch_set(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* out and in effects */</div><div class='add'>+	if (((nid &gt;= OUT_EFFECT_START_NID) &amp;&amp; (nid &lt; OUT_EFFECT_END_NID)) ||</div><div class='add'>+	    ((nid &gt;= IN_EFFECT_START_NID) &amp;&amp; (nid &lt; IN_EFFECT_END_NID))) {</div><div class='add'>+		spec-&gt;effects_switch[nid - EFFECT_START_NID] = *valp;</div><div class='add'>+		return ca0132_effects_set(codec, nid, *valp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mic boost */</div><div class='add'>+	if (nid == spec-&gt;input_pins[0]) {</div><div class='add'>+		spec-&gt;cur_mic_boost = *valp;</div><div class='add'>+		if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+			if (spec-&gt;in_enum_val != REAR_LINE_IN)</div><div class='add'>+				return ca0132_mic_boost_set(codec, *valp);</div><div class='add'>+		} else {</div><div class='add'>+			/* Mic boost does not apply to Digital Mic */</div><div class='add'>+			if (spec-&gt;cur_mic_type != DIGITAL_MIC)</div><div class='add'>+				return ca0132_mic_boost_set(codec, *valp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == ZXR_HEADPHONE_GAIN) {</div><div class='add'>+		spec-&gt;zxr_gain_set = *valp;</div><div class='add'>+		if (spec-&gt;cur_out_type == HEADPHONE_OUT)</div><div class='add'>+			return zxr_headphone_gain_set(codec, *valp);</div><div class='add'>+		else</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == SPEAKER_FULL_RANGE_FRONT || nid == SPEAKER_FULL_RANGE_REAR) {</div><div class='add'>+		spec-&gt;speaker_range_val[nid - SPEAKER_FULL_RANGE_FRONT] = *valp;</div><div class='add'>+		if (spec-&gt;cur_out_type == SPEAKER_OUT)</div><div class='add'>+			ca0132_alt_set_full_range_speaker(codec);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nid == BASS_REDIRECTION) {</div><div class='add'>+		spec-&gt;bass_redirection_val = *valp;</div><div class='add'>+		if (spec-&gt;cur_out_type == SPEAKER_OUT)</div><div class='add'>+			ca0132_alt_surround_set_bass_redirection(codec, *valp);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Volume related</div><div class='add'>+ */</div><div class='add'>+/*</div><div class='add'>+ * Sets the internal DSP decibel level to match the DAC for output, and the</div><div class='add'>+ * ADC for input. Currently only the SBZ sets dsp capture volume level, and</div><div class='add'>+ * all alternative codecs set DSP playback volume.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_dsp_volume_put(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int dsp_dir;</div><div class='add'>+	unsigned int lookup_val;</div><div class='add'>+</div><div class='add'>+	if (nid == VNID_SPK)</div><div class='add'>+		dsp_dir = DSP_VOL_OUT;</div><div class='add'>+	else</div><div class='add'>+		dsp_dir = DSP_VOL_IN;</div><div class='add'>+</div><div class='add'>+	lookup_val = spec-&gt;vnode_lvol[nid - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	dspio_set_uint_param(codec,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].mid,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].reqs[0],</div><div class='add'>+		float_vol_db_lookup[lookup_val]);</div><div class='add'>+</div><div class='add'>+	lookup_val = spec-&gt;vnode_rvol[nid - VNODE_START_NID];</div><div class='add'>+</div><div class='add'>+	dspio_set_uint_param(codec,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].mid,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].reqs[1],</div><div class='add'>+		float_vol_db_lookup[lookup_val]);</div><div class='add'>+</div><div class='add'>+	dspio_set_uint_param(codec,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].mid,</div><div class='add'>+		ca0132_alt_vol_ctls[dsp_dir].reqs[2], FLOAT_ZERO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_volume_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	unsigned long pval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case VNID_SPK:</div><div class='add'>+		/* follow shared_out info */</div><div class='add'>+		nid = spec-&gt;shared_out_nid;</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;control_mutex) {</div><div class='add'>+			pval = kcontrol-&gt;private_value;</div><div class='add'>+			kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(nid, ch, 0, dir);</div><div class='add'>+			err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);</div><div class='add'>+			kcontrol-&gt;private_value = pval;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case VNID_MIC:</div><div class='add'>+		/* follow shared_mic info */</div><div class='add'>+		nid = spec-&gt;shared_mic_nid;</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;control_mutex) {</div><div class='add'>+			pval = kcontrol-&gt;private_value;</div><div class='add'>+			kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(nid, ch, 0, dir);</div><div class='add'>+			err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);</div><div class='add'>+			kcontrol-&gt;private_value = pval;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_volume_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	/* store the left and right volume */</div><div class='add'>+	if (ch &amp; 1) {</div><div class='add'>+		*valp = spec-&gt;vnode_lvol[nid - VNODE_START_NID];</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	if (ch &amp; 2) {</div><div class='add'>+		*valp = spec-&gt;vnode_rvol[nid - VNODE_START_NID];</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_volume_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	hda_nid_t shared_nid = 0;</div><div class='add'>+	bool effective;</div><div class='add'>+	int changed = 1;</div><div class='add'>+</div><div class='add'>+	/* store the left and right volume */</div><div class='add'>+	if (ch &amp; 1) {</div><div class='add'>+		spec-&gt;vnode_lvol[nid - VNODE_START_NID] = *valp;</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	if (ch &amp; 2) {</div><div class='add'>+		spec-&gt;vnode_rvol[nid - VNODE_START_NID] = *valp;</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if effective conditions, then update hw immediately. */</div><div class='add'>+	effective = ca0132_is_vnode_effective(codec, nid, &amp;shared_nid);</div><div class='add'>+	if (effective) {</div><div class='add'>+		int dir = get_amp_direction(kcontrol);</div><div class='add'>+		unsigned long pval;</div><div class='add'>+</div><div class='add'>+		CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+		guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+		pval = kcontrol-&gt;private_value;</div><div class='add'>+		kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(shared_nid, ch,</div><div class='add'>+								0, dir);</div><div class='add'>+		changed = snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);</div><div class='add'>+		kcontrol-&gt;private_value = pval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function is the same as the one above, because using an if statement</div><div class='add'>+ * inside of the above volume control for the DSP volume would cause too much</div><div class='add'>+ * lag. This is a lot more smooth.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_volume_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	hda_nid_t vnid = 0;</div><div class='add'>+</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case 0x02:</div><div class='add'>+		vnid = VNID_SPK;</div><div class='add'>+		break;</div><div class='add'>+	case 0x07:</div><div class='add'>+		vnid = VNID_MIC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* store the left and right volume */</div><div class='add'>+	if (ch &amp; 1) {</div><div class='add'>+		spec-&gt;vnode_lvol[vnid - VNODE_START_NID] = *valp;</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	if (ch &amp; 2) {</div><div class='add'>+		spec-&gt;vnode_rvol[vnid - VNODE_START_NID] = *valp;</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+	ca0132_alt_dsp_volume_put(codec, vnid);</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+	return snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_volume_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='add'>+			     unsigned int size, unsigned int __user *tlv)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int ch = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	unsigned long pval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case VNID_SPK:</div><div class='add'>+		/* follow shared_out tlv */</div><div class='add'>+		nid = spec-&gt;shared_out_nid;</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;control_mutex) {</div><div class='add'>+			pval = kcontrol-&gt;private_value;</div><div class='add'>+			kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(nid, ch, 0, dir);</div><div class='add'>+			err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);</div><div class='add'>+			kcontrol-&gt;private_value = pval;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case VNID_MIC:</div><div class='add'>+		/* follow shared_mic tlv */</div><div class='add'>+		nid = spec-&gt;shared_mic_nid;</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;control_mutex) {</div><div class='add'>+			pval = kcontrol-&gt;private_value;</div><div class='add'>+			kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(nid, ch, 0, dir);</div><div class='add'>+			err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);</div><div class='add'>+			kcontrol-&gt;private_value = pval;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add volume slider control for effect level */</div><div class='add'>+static int ca0132_alt_add_effect_slider(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+					const char *pfx, int dir)</div><div class='add'>+{</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int type = dir ? HDA_INPUT : HDA_OUTPUT;</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_VOLUME_MONO(namestr, nid, 1, 0, type);</div><div class='add'>+</div><div class='add'>+	sprintf(namestr, "FX: %s %s Volume", pfx, dirstr[dir]);</div><div class='add'>+</div><div class='add'>+	knew.tlv.c = NULL;</div><div class='add'>+</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case XBASS_XOVER:</div><div class='add'>+		knew.info = ca0132_alt_xbass_xover_slider_info;</div><div class='add'>+		knew.get = ca0132_alt_xbass_xover_slider_ctl_get;</div><div class='add'>+		knew.put = ca0132_alt_xbass_xover_slider_put;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		knew.info = ca0132_alt_effect_slider_info;</div><div class='add'>+		knew.get = ca0132_alt_slider_ctl_get;</div><div class='add'>+		knew.put = ca0132_alt_effect_slider_put;</div><div class='add'>+		knew.private_value =</div><div class='add'>+			HDA_COMPOSE_AMP_VAL(nid, 1, 0, type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Added FX: prefix for the alternative codecs, because otherwise the surround</div><div class='add'>+ * effect would conflict with the Surround sound volume control. Also seems more</div><div class='add'>+ * clear as to what the switches do. Left alone for others.</div><div class='add'>+ */</div><div class='add'>+static int add_fx_switch(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			 const char *pfx, int dir)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	char namestr[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int type = dir ? HDA_INPUT : HDA_OUTPUT;</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		CA0132_CODEC_MUTE_MONO(namestr, nid, 1, type);</div><div class='add'>+	/* If using alt_controls, add FX: prefix. But, don't add FX:</div><div class='add'>+	 * prefix to OutFX or InFX enable controls.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_alt_controls(spec) &amp;&amp; (nid &lt;= IN_EFFECT_END_NID))</div><div class='add'>+		sprintf(namestr, "FX: %s %s Switch", pfx, dirstr[dir]);</div><div class='add'>+	else</div><div class='add'>+		sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_voicefx(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO(ca0132_voicefx.name,</div><div class='add'>+				    VOICEFX, 1, 0, HDA_INPUT);</div><div class='add'>+	knew.info = ca0132_voicefx_info;</div><div class='add'>+	knew.get = ca0132_voicefx_get;</div><div class='add'>+	knew.put = ca0132_voicefx_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, VOICEFX, snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Create the EQ Preset control */</div><div class='add'>+static int add_ca0132_alt_eq_presets(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO(ca0132_alt_eq_enum.name,</div><div class='add'>+				    EQ_PRESET_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ca0132_alt_eq_preset_info;</div><div class='add'>+	knew.get = ca0132_alt_eq_preset_get;</div><div class='add'>+	knew.put = ca0132_alt_eq_preset_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, EQ_PRESET_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add enumerated control for the three different settings of the smart volume</div><div class='add'>+ * output effect. Normal just uses the slider value, and loud and night are</div><div class='add'>+ * their own things that ignore that value.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_svm_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("FX: Smart Volume Setting",</div><div class='add'>+				    SMART_VOLUME_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ca0132_alt_svm_setting_info;</div><div class='add'>+	knew.get = ca0132_alt_svm_setting_get;</div><div class='add'>+	knew.put = ca0132_alt_svm_setting_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, SMART_VOLUME_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create an Output Select enumerated control for codecs with surround</div><div class='add'>+ * out capabilities.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_output_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("Output Select",</div><div class='add'>+				    OUTPUT_SOURCE_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ca0132_alt_output_select_get_info;</div><div class='add'>+	knew.get = ca0132_alt_output_select_get;</div><div class='add'>+	knew.put = ca0132_alt_output_select_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, OUTPUT_SOURCE_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add a control for selecting channel count on speaker output. Setting this</div><div class='add'>+ * allows the DSP to do bass redirection and channel upmixing on surround</div><div class='add'>+ * configurations.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_speaker_channel_cfg_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("Surround Channel Config",</div><div class='add'>+				    SPEAKER_CHANNEL_CFG_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ca0132_alt_speaker_channel_cfg_get_info;</div><div class='add'>+	knew.get = ca0132_alt_speaker_channel_cfg_get;</div><div class='add'>+	knew.put = ca0132_alt_speaker_channel_cfg_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, SPEAKER_CHANNEL_CFG_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Full range front stereo and rear surround switches. When these are set to</div><div class='add'>+ * full range, the lower frequencies from these channels are no longer</div><div class='add'>+ * redirected to the LFE channel.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_front_full_range_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		CA0132_CODEC_MUTE_MONO("Full-Range Front Speakers",</div><div class='add'>+				    SPEAKER_FULL_RANGE_FRONT, 1, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, SPEAKER_FULL_RANGE_FRONT,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_add_rear_full_range_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		CA0132_CODEC_MUTE_MONO("Full-Range Rear Speakers",</div><div class='add'>+				    SPEAKER_FULL_RANGE_REAR, 1, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, SPEAKER_FULL_RANGE_REAR,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bass redirection redirects audio below the crossover frequency to the LFE</div><div class='add'>+ * channel on speakers that are set as not being full-range. On configurations</div><div class='add'>+ * without an LFE channel, it does nothing. Bass redirection seems to be the</div><div class='add'>+ * replacement for X-Bass on configurations with an LFE channel.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_bass_redirection_crossover(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const char *namestr = "Bass Redirection Crossover";</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_VOLUME_MONO(namestr, BASS_REDIRECTION_XOVER, 1, 0,</div><div class='add'>+				HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	knew.tlv.c = NULL;</div><div class='add'>+	knew.info = ca0132_alt_xbass_xover_slider_info;</div><div class='add'>+	knew.get = ca0132_alt_xbass_xover_slider_ctl_get;</div><div class='add'>+	knew.put = ca0132_alt_xbass_xover_slider_put;</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, BASS_REDIRECTION_XOVER,</div><div class='add'>+			snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_alt_add_bass_redirection_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const char *namestr = "Bass Redirection";</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		CA0132_CODEC_MUTE_MONO(namestr, BASS_REDIRECTION, 1,</div><div class='add'>+				HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, BASS_REDIRECTION,</div><div class='add'>+			snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Create an Input Source enumerated control for the alternate ca0132 codecs</div><div class='add'>+ * because the front microphone has no auto-detect, and Line-in has to be set</div><div class='add'>+ * somehow.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_input_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("Input Source",</div><div class='add'>+				    INPUT_SOURCE_ENUM, 1, 0, HDA_INPUT);</div><div class='add'>+	knew.info = ca0132_alt_input_source_info;</div><div class='add'>+	knew.get = ca0132_alt_input_source_get;</div><div class='add'>+	knew.put = ca0132_alt_input_source_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, INPUT_SOURCE_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add mic boost enumerated control. Switches through 0dB to 30dB. This adds</div><div class='add'>+ * more control than the original mic boost, which is either full 30dB or off.</div><div class='add'>+ */</div><div class='add'>+static int ca0132_alt_add_mic_boost_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("Mic Boost Capture Switch",</div><div class='add'>+				    MIC_BOOST_ENUM, 1, 0, HDA_INPUT);</div><div class='add'>+	knew.info = ca0132_alt_mic_boost_info;</div><div class='add'>+	knew.get = ca0132_alt_mic_boost_get;</div><div class='add'>+	knew.put = ca0132_alt_mic_boost_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, MIC_BOOST_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add headphone gain enumerated control for the AE-5. This switches between</div><div class='add'>+ * three modes, low, medium, and high. When non-headphone outputs are selected,</div><div class='add'>+ * it is automatically set to high. This is the same behavior as Windows.</div><div class='add'>+ */</div><div class='add'>+static int ae5_add_headphone_gain_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("AE-5: Headphone Gain",</div><div class='add'>+				    AE5_HEADPHONE_GAIN_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ae5_headphone_gain_info;</div><div class='add'>+	knew.get = ae5_headphone_gain_get;</div><div class='add'>+	knew.put = ae5_headphone_gain_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, AE5_HEADPHONE_GAIN_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add sound filter enumerated control for the AE-5. This adds three different</div><div class='add'>+ * settings: Slow Roll Off, Minimum Phase, and Fast Roll Off. From what I've</div><div class='add'>+ * read into it, it changes the DAC's interpolation filter.</div><div class='add'>+ */</div><div class='add'>+static int ae5_add_sound_filter_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		HDA_CODEC_MUTE_MONO("AE-5: Sound Filter",</div><div class='add'>+				    AE5_SOUND_FILTER_ENUM, 1, 0, HDA_OUTPUT);</div><div class='add'>+	knew.info = ae5_sound_filter_info;</div><div class='add'>+	knew.get = ae5_sound_filter_get;</div><div class='add'>+	knew.put = ae5_sound_filter_put;</div><div class='add'>+	return snd_hda_ctl_add(codec, AE5_SOUND_FILTER_ENUM,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int zxr_add_headphone_gain_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new knew =</div><div class='add'>+		CA0132_CODEC_MUTE_MONO("ZxR: 600 Ohm Gain",</div><div class='add'>+				    ZXR_HEADPHONE_GAIN, 1, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return snd_hda_ctl_add(codec, ZXR_HEADPHONE_GAIN,</div><div class='add'>+				snd_ctl_new1(&amp;knew, codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Need to create follower controls for the alternate codecs that have surround</div><div class='add'>+ * capabilities.</div><div class='add'>+ */</div><div class='add'>+static const char * const ca0132_alt_follower_pfxs[] = {</div><div class='add'>+	"Front", "Surround", "Center", "LFE", NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Also need special channel map, because the default one is incorrect.</div><div class='add'>+ * I think this has to do with the pin for rear surround being 0x11,</div><div class='add'>+ * and the center/lfe being 0x10. Usually the pin order is the opposite.</div><div class='add'>+ */</div><div class='add'>+static const struct snd_pcm_chmap_elem ca0132_alt_chmaps[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },</div><div class='add'>+	{ .channels = 4,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ .channels = 6,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE,</div><div class='add'>+		   SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Add the correct chmap for streams with 6 channels. */</div><div class='add'>+static void ca0132_alt_add_chmap_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(pcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		struct hda_pcm_stream *hinfo =</div><div class='add'>+			&amp;pcm-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+		struct snd_pcm_chmap *chmap;</div><div class='add'>+		const struct snd_pcm_chmap_elem *elem;</div><div class='add'>+</div><div class='add'>+		elem = ca0132_alt_chmaps;</div><div class='add'>+		if (hinfo-&gt;channels_max == 6) {</div><div class='add'>+			err = snd_pcm_add_chmap_ctls(pcm-&gt;pcm,</div><div class='add'>+					SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+					elem, hinfo-&gt;channels_max, 0, &amp;chmap);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				codec_dbg(codec, "snd_pcm_add_chmap_ctls failed!");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * When changing Node IDs for Mixer Controls below, make sure to update</div><div class='add'>+ * Node IDs in ca0132_config() as well.</div><div class='add'>+ */</div><div class='add'>+static const struct snd_kcontrol_new ca0132_mixer[] = {</div><div class='add'>+	CA0132_CODEC_VOL("Master Playback Volume", VNID_SPK, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Master Playback Switch", VNID_SPK, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_VOL("Capture Volume", VNID_MIC, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Capture Switch", VNID_MIC, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("Analog-Mic2 Capture Volume", 0x08, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_MUTE("Analog-Mic2 Capture Switch", 0x08, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("What U Hear Capture Volume", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_MUTE("What U Hear Capture Switch", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("Mic1-Boost (30dB) Capture Switch",</div><div class='add'>+			       0x12, 1, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("HP/Speaker Playback Switch",</div><div class='add'>+			       VNID_HP_SEL, 1, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("AMic1/DMic Capture Switch",</div><div class='add'>+			       VNID_AMIC1_SEL, 1, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("HP/Speaker Auto Detect Playback Switch",</div><div class='add'>+			       VNID_HP_ASEL, 1, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("AMic1/DMic Auto Detect Capture Switch",</div><div class='add'>+			       VNID_AMIC1_ASEL, 1, HDA_INPUT),</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Desktop specific control mixer. Removes auto-detect for mic, and adds</div><div class='add'>+ * surround controls. Also sets both the Front Playback and Capture Volume</div><div class='add'>+ * controls to alt so they set the DSP's decibel level.</div><div class='add'>+ */</div><div class='add'>+static const struct snd_kcontrol_new desktop_mixer[] = {</div><div class='add'>+	CA0132_ALT_CODEC_VOL("Front Playback Volume", 0x02, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Front Playback Switch", VNID_SPK, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("Surround Playback Volume", 0x04, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x03, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x03, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x03, 2, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x03, 2, 0, HDA_OUTPUT),</div><div class='add'>+	CA0132_ALT_CODEC_VOL("Capture Volume", 0x07, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Capture Switch", VNID_MIC, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("What U Hear Capture Volume", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_MUTE("What U Hear Capture Switch", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("HP/Speaker Auto Detect Playback Switch",</div><div class='add'>+				VNID_HP_ASEL, 1, HDA_OUTPUT),</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Same as the Sound Blaster Z, except doesn't use the alt volume for capture</div><div class='add'>+ * because it doesn't set decibel levels for the DSP for capture.</div><div class='add'>+ */</div><div class='add'>+static const struct snd_kcontrol_new r3di_mixer[] = {</div><div class='add'>+	CA0132_ALT_CODEC_VOL("Front Playback Volume", 0x02, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Front Playback Switch", VNID_SPK, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("Surround Playback Volume", 0x04, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x03, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x03, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x03, 2, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x03, 2, 0, HDA_OUTPUT),</div><div class='add'>+	CA0132_CODEC_VOL("Capture Volume", VNID_MIC, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE("Capture Switch", VNID_MIC, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_VOLUME("What U Hear Capture Volume", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_MUTE("What U Hear Capture Switch", 0x0a, 0, HDA_INPUT),</div><div class='add'>+	CA0132_CODEC_MUTE_MONO("HP/Speaker Auto Detect Playback Switch",</div><div class='add'>+				VNID_HP_ASEL, 1, HDA_OUTPUT),</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ca0132_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, num_fx, num_sliders;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Add Mixer controls */</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='add'>+		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	/* Setup vmaster with surround followers for desktop ca0132 devices */</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		snd_hda_set_vmaster_tlv(codec, spec-&gt;dacs[0], HDA_OUTPUT,</div><div class='add'>+					spec-&gt;tlv);</div><div class='add'>+		snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='add'>+					spec-&gt;tlv, ca0132_alt_follower_pfxs,</div><div class='add'>+					"Playback Volume", 0);</div><div class='add'>+		err = __snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='add'>+					    NULL, ca0132_alt_follower_pfxs,</div><div class='add'>+					    "Playback Switch",</div><div class='add'>+					    true, 0, &amp;spec-&gt;vmaster_mute.sw_kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add in and out effects controls.</div><div class='add'>+	 * VoiceFX, PE and CrystalVoice are added separately.</div><div class='add'>+	 */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT;</div><div class='add'>+	for (i = 0; i &lt; num_fx; i++) {</div><div class='add'>+		/* Desktop cards break if Echo Cancellation is used. */</div><div class='add'>+		if (ca0132_use_pci_mmio(spec)) {</div><div class='add'>+			if (i == (ECHO_CANCELLATION - IN_EFFECT_START_NID +</div><div class='add'>+						OUT_EFFECTS_COUNT))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = add_fx_switch(codec, ca0132_effects[i].nid,</div><div class='add'>+				    ca0132_effects[i].name,</div><div class='add'>+				    ca0132_effects[i].direct);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * If codec has use_alt_controls set to true, add effect level sliders,</div><div class='add'>+	 * EQ presets, and Smart Volume presets. Also, change names to add FX</div><div class='add'>+	 * prefix, and change PlayEnhancement and CrystalVoice to match.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_alt_controls(spec)) {</div><div class='add'>+		err = ca0132_alt_add_svm_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = add_ca0132_alt_eq_presets(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = add_fx_switch(codec, PLAY_ENHANCEMENT,</div><div class='add'>+					"Enable OutFX", 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = add_fx_switch(codec, CRYSTAL_VOICE,</div><div class='add'>+					"Enable InFX", 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		num_sliders = OUT_EFFECTS_COUNT - 1;</div><div class='add'>+		for (i = 0; i &lt; num_sliders; i++) {</div><div class='add'>+			err = ca0132_alt_add_effect_slider(codec,</div><div class='add'>+					    ca0132_effects[i].nid,</div><div class='add'>+					    ca0132_effects[i].name,</div><div class='add'>+					    ca0132_effects[i].direct);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = ca0132_alt_add_effect_slider(codec, XBASS_XOVER,</div><div class='add'>+					"X-Bass Crossover", EFX_DIR_OUT);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		err = add_fx_switch(codec, PLAY_ENHANCEMENT,</div><div class='add'>+					"PlayEnhancement", 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = add_fx_switch(codec, CRYSTAL_VOICE,</div><div class='add'>+					"CrystalVoice", 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	err = add_voicefx(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the codec uses alt_functions, you need the enumerated controls</div><div class='add'>+	 * to select the new outputs and inputs, plus add the new mic boost</div><div class='add'>+	 * setting control.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		err = ca0132_alt_add_output_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_speaker_channel_cfg_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_front_full_range_switch(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_rear_full_range_switch(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_bass_redirection_crossover(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_bass_redirection_switch(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ca0132_alt_add_mic_boost_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/*</div><div class='add'>+		 * ZxR only has microphone input, there is no front panel</div><div class='add'>+		 * header on the card, and aux-in is handled by the DBPro board.</div><div class='add'>+		 */</div><div class='add'>+		if (ca0132_quirk(spec) != QUIRK_ZXR) {</div><div class='add'>+			err = ca0132_alt_add_input_enum(codec);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		err = ae5_add_headphone_gain_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = ae5_add_sound_filter_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		err = zxr_add_headphone_gain_switch(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+	add_tuning_ctls(codec);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	err = snd_hda_jack_add_kctls(codec, &amp;spec-&gt;autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dig_out) {</div><div class='add'>+		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;dig_out,</div><div class='add'>+						    spec-&gt;dig_out);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = snd_hda_create_spdif_share_sw(codec, &amp;spec-&gt;multiout);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/* spec-&gt;multiout.share_spdif = 1; */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dig_in) {</div><div class='add'>+		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_alt_add_chmap_ctls(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbpro_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dig_out) {</div><div class='add'>+		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;dig_out,</div><div class='add'>+				spec-&gt;dig_out);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dig_in) {</div><div class='add'>+		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM</div><div class='add'>+ */</div><div class='add'>+static const struct hda_pcm_stream ca0132_pcm_analog_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 6,</div><div class='add'>+	.ops = {</div><div class='add'>+		.prepare = ca0132_playback_pcm_prepare,</div><div class='add'>+		.cleanup = ca0132_playback_pcm_cleanup,</div><div class='add'>+		.get_delay = ca0132_playback_pcm_delay,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream ca0132_pcm_analog_capture = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	.ops = {</div><div class='add'>+		.prepare = ca0132_capture_pcm_prepare,</div><div class='add'>+		.cleanup = ca0132_capture_pcm_cleanup,</div><div class='add'>+		.get_delay = ca0132_capture_pcm_delay,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream ca0132_pcm_digital_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = ca0132_dig_playback_pcm_open,</div><div class='add'>+		.close = ca0132_dig_playback_pcm_close,</div><div class='add'>+		.prepare = ca0132_dig_playback_pcm_prepare,</div><div class='add'>+		.cleanup = ca0132_dig_playback_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream ca0132_pcm_digital_capture = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ca0132_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "CA0132 Analog");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		info-&gt;own_chmap = true;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].chmap</div><div class='add'>+			= ca0132_alt_chmaps;</div><div class='add'>+	}</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0132_pcm_analog_playback;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dacs[0];</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='add'>+		spec-&gt;multiout.max_channels;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adcs[0];</div><div class='add'>+</div><div class='add'>+	/* With the DSP enabled, desktops don't use this ADC. */</div><div class='add'>+	if (!ca0132_use_alt_functions(spec)) {</div><div class='add'>+		info = snd_hda_codec_pcm_new(codec, "CA0132 Analog Mic-In2");</div><div class='add'>+		if (!info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='add'>+			ca0132_pcm_analog_capture;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adcs[1];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "CA0132 What U Hear");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adcs[2];</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;dig_out &amp;&amp; !spec-&gt;dig_in)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "CA0132 Digital");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='add'>+	if (spec-&gt;dig_out) {</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='add'>+			ca0132_pcm_digital_playback;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dig_out;</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;dig_in) {</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='add'>+			ca0132_pcm_digital_capture;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbpro_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "CA0132 Alt Analog");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ca0132_pcm_analog_capture;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = 1;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adcs[0];</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;dig_out &amp;&amp; !spec-&gt;dig_in)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "CA0132 Digital");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='add'>+	if (spec-&gt;dig_out) {</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='add'>+			ca0132_pcm_digital_playback;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dig_out;</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;dig_in) {</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='add'>+			ca0132_pcm_digital_capture;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac)</div><div class='add'>+{</div><div class='add'>+	if (pin) {</div><div class='add'>+		snd_hda_set_pin_ctl(codec, pin, PIN_HP);</div><div class='add'>+		if (get_wcaps(codec, pin) &amp; AC_WCAP_OUT_AMP)</div><div class='add'>+			snd_hda_codec_write(codec, pin, 0,</div><div class='add'>+					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+					    AMP_OUT_UNMUTE);</div><div class='add'>+	}</div><div class='add'>+	if (dac &amp;&amp; (get_wcaps(codec, dac) &amp; AC_WCAP_OUT_AMP))</div><div class='add'>+		snd_hda_codec_write(codec, dac, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc)</div><div class='add'>+{</div><div class='add'>+	if (pin) {</div><div class='add'>+		snd_hda_set_pin_ctl(codec, pin, PIN_VREF80);</div><div class='add'>+		if (get_wcaps(codec, pin) &amp; AC_WCAP_IN_AMP)</div><div class='add'>+			snd_hda_codec_write(codec, pin, 0,</div><div class='add'>+					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+					    AMP_IN_UNMUTE(0));</div><div class='add'>+	}</div><div class='add'>+	if (adc &amp;&amp; (get_wcaps(codec, adc) &amp; AC_WCAP_IN_AMP)) {</div><div class='add'>+		snd_hda_codec_write(codec, adc, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+				    AMP_IN_UNMUTE(0));</div><div class='add'>+</div><div class='add'>+		/* init to 0 dB and unmute. */</div><div class='add'>+		snd_hda_codec_amp_stereo(codec, adc, HDA_INPUT, 0,</div><div class='add'>+					 HDA_AMP_VOLMASK, 0x5a);</div><div class='add'>+		snd_hda_codec_amp_stereo(codec, adc, HDA_INPUT, 0,</div><div class='add'>+					 HDA_AMP_MUTE, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void refresh_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir)</div><div class='add'>+{</div><div class='add'>+	unsigned int caps;</div><div class='add'>+</div><div class='add'>+	caps = snd_hda_param_read(codec, nid, dir == HDA_OUTPUT ?</div><div class='add'>+				  AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);</div><div class='add'>+	snd_hda_override_amp_caps(codec, nid, dir, caps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Switch between Digital built-in mic and analog mic.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_set_dmic(struct hda_codec *codec, int enable)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	u8 val;</div><div class='add'>+	unsigned int oldval;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_set_dmic: enable=%d\n", enable);</div><div class='add'>+</div><div class='add'>+	oldval = stop_mic1(codec);</div><div class='add'>+	ca0132_set_vipsource(codec, 0);</div><div class='add'>+	if (enable) {</div><div class='add'>+		/* set DMic input as 2-ch */</div><div class='add'>+		tmp = FLOAT_TWO;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		val = spec-&gt;dmic_ctl;</div><div class='add'>+		val |= 0x80;</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+				    VENDOR_CHIPIO_DMIC_CTL_SET, val);</div><div class='add'>+</div><div class='add'>+		if (!(spec-&gt;dmic_ctl &amp; 0x20))</div><div class='add'>+			chipio_set_control_flag(codec, CONTROL_FLAG_DMIC, 1);</div><div class='add'>+	} else {</div><div class='add'>+		/* set AMic input as mono */</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+		dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+		val = spec-&gt;dmic_ctl;</div><div class='add'>+		/* clear bit7 and bit5 to disable dmic */</div><div class='add'>+		val &amp;= 0x5f;</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+				    VENDOR_CHIPIO_DMIC_CTL_SET, val);</div><div class='add'>+</div><div class='add'>+		if (!(spec-&gt;dmic_ctl &amp; 0x20))</div><div class='add'>+			chipio_set_control_flag(codec, CONTROL_FLAG_DMIC, 0);</div><div class='add'>+	}</div><div class='add'>+	ca0132_set_vipsource(codec, 1);</div><div class='add'>+	resume_mic1(codec, oldval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization for Digital Mic.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_init_dmic(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* Setup Digital Mic here, but don't enable.</div><div class='add'>+	 * Enable based on jack detect.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* MCLK uses MPIO1, set to enable.</div><div class='add'>+	 * Bit 2-0: MPIO select</div><div class='add'>+	 * Bit   3: set to disable</div><div class='add'>+	 * Bit 7-4: reserved</div><div class='add'>+	 */</div><div class='add'>+	val = 0x01;</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+			    VENDOR_CHIPIO_DMIC_MCLK_SET, val);</div><div class='add'>+</div><div class='add'>+	/* Data1 uses MPIO3. Data2 not use</div><div class='add'>+	 * Bit 2-0: Data1 MPIO select</div><div class='add'>+	 * Bit   3: set disable Data1</div><div class='add'>+	 * Bit 6-4: Data2 MPIO select</div><div class='add'>+	 * Bit   7: set disable Data2</div><div class='add'>+	 */</div><div class='add'>+	val = 0x83;</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+			    VENDOR_CHIPIO_DMIC_PIN_SET, val);</div><div class='add'>+</div><div class='add'>+	/* Use Ch-0 and Ch-1. Rate is 48K, mode 1. Disable DMic first.</div><div class='add'>+	 * Bit 3-0: Channel mask</div><div class='add'>+	 * Bit   4: set for 48KHz, clear for 32KHz</div><div class='add'>+	 * Bit   5: mode</div><div class='add'>+	 * Bit   6: set to select Data2, clear for Data1</div><div class='add'>+	 * Bit   7: set to enable DMic, clear for AMic</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ALIENWARE_M17XR4)</div><div class='add'>+		val = 0x33;</div><div class='add'>+	else</div><div class='add'>+		val = 0x23;</div><div class='add'>+	/* keep a copy of dmic ctl val for enable/disable dmic purpuse */</div><div class='add'>+	spec-&gt;dmic_ctl = val;</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;input_pins[0], 0,</div><div class='add'>+			    VENDOR_CHIPIO_DMIC_CTL_SET, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization for Analog Mic 2</div><div class='add'>+ */</div><div class='add'>+static void ca0132_init_analog_mic2(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_exram_no_mutex(codec, 0x1920, 0x00);</div><div class='add'>+	chipio_8051_write_exram_no_mutex(codec, 0x192d, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_refresh_widget_caps(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_refresh_widget_caps.\n");</div><div class='add'>+	snd_hda_codec_update_widgets(codec);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++)</div><div class='add'>+		refresh_amp_caps(codec, spec-&gt;dacs[i], HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_outputs; i++)</div><div class='add'>+		refresh_amp_caps(codec, spec-&gt;out_pins[i], HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_inputs; i++) {</div><div class='add'>+		refresh_amp_caps(codec, spec-&gt;adcs[i], HDA_INPUT);</div><div class='add'>+		refresh_amp_caps(codec, spec-&gt;input_pins[i], HDA_INPUT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* If there is an active channel for some reason, find it and free it. */</div><div class='add'>+static void ca0132_alt_free_active_dma_channels(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, tmp;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	/* Read active DSPDMAC channel register. */</div><div class='add'>+	status = chipio_read(codec, DSPDMAC_CHNLSTART_MODULE_OFFSET, &amp;tmp);</div><div class='add'>+	if (status &gt;= 0) {</div><div class='add'>+		/* AND against 0xfff to get the active channel bits. */</div><div class='add'>+		tmp = tmp &amp; 0xfff;</div><div class='add'>+</div><div class='add'>+		/* If there are no active channels, nothing to free. */</div><div class='add'>+		if (!tmp)</div><div class='add'>+			return;</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "%s: Failed to read active DSP DMA channel register.\n",</div><div class='add'>+				__func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check each DSP DMA channel for activity, and if the channel is</div><div class='add'>+	 * active, free it.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; DSPDMAC_DMA_CFG_CHANNEL_COUNT; i++) {</div><div class='add'>+		if (dsp_is_dma_active(codec, i)) {</div><div class='add'>+			status = dspio_free_dma_chan(codec, i);</div><div class='add'>+			if (status &lt; 0)</div><div class='add'>+				codec_dbg(codec, "%s: Failed to free active DSP DMA channel %d.\n",</div><div class='add'>+						__func__, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In the case of CT_EXTENSIONS_ENABLE being set to 1, and the DSP being in</div><div class='add'>+ * use, audio is no longer routed directly to the DAC/ADC from the HDA stream.</div><div class='add'>+ * Instead, audio is now routed through the DSP's DMA controllers, which</div><div class='add'>+ * the DSP is tasked with setting up itself. Through debugging, it seems the</div><div class='add'>+ * cause of most of the no-audio on startup issues were due to improperly</div><div class='add'>+ * configured DSP DMA channels.</div><div class='add'>+ *</div><div class='add'>+ * Normally, the DSP configures these the first time an HDA audio stream is</div><div class='add'>+ * started post DSP firmware download. That is why creating a 'dummy' stream</div><div class='add'>+ * worked in fixing the audio in some cases. This works most of the time, but</div><div class='add'>+ * sometimes if a stream is started/stopped before the DSP can setup the DMA</div><div class='add'>+ * configuration registers, it ends up in a broken state. Issues can also</div><div class='add'>+ * arise if streams are started in an unusual order, i.e the audio output dma</div><div class='add'>+ * channel being sandwiched between the mic1 and mic2 dma channels.</div><div class='add'>+ *</div><div class='add'>+ * The solution to this is to make sure that the DSP has no DMA channels</div><div class='add'>+ * in use post DSP firmware download, and then to manually start each default</div><div class='add'>+ * DSP stream that uses the DMA channels. These are 0x0c, the audio output</div><div class='add'>+ * stream, 0x03, analog mic 1, and 0x04, analog mic 2.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_start_dsp_audio_streams(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int dsp_dma_stream_ids[] = { 0x0c, 0x03, 0x04 };</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i, tmp;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if any of the default streams are active, and if they are,</div><div class='add'>+	 * stop them.</div><div class='add'>+	 */</div><div class='add'>+	scoped_guard(mutex, &amp;spec-&gt;chipio_mutex) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(dsp_dma_stream_ids); i++) {</div><div class='add'>+			chipio_get_stream_control(codec, dsp_dma_stream_ids[i], &amp;tmp);</div><div class='add'>+</div><div class='add'>+			if (tmp) {</div><div class='add'>+				chipio_set_stream_control(codec,</div><div class='add'>+							  dsp_dma_stream_ids[i], 0);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If all DSP streams are inactive, there should be no active DSP DMA</div><div class='add'>+	 * channels. Check and make sure this is the case, and if it isn't,</div><div class='add'>+	 * free any active channels.</div><div class='add'>+	 */</div><div class='add'>+	ca0132_alt_free_active_dma_channels(codec);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	/* Make sure stream 0x0c is six channels. */</div><div class='add'>+	chipio_set_stream_channels(codec, 0x0c, 6);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dsp_dma_stream_ids); i++) {</div><div class='add'>+		chipio_set_stream_control(codec,</div><div class='add'>+				dsp_dma_stream_ids[i], 1);</div><div class='add'>+</div><div class='add'>+		/* Give the DSP some time to setup the DMA channel. */</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The region of ChipIO memory from 0x190000-0x1903fc is a sort of 'audio</div><div class='add'>+ * router', where each entry represents a 48khz audio channel, with a format</div><div class='add'>+ * of an 8-bit destination, an 8-bit source, and an unknown 2-bit number</div><div class='add'>+ * value. The 2-bit number value is seemingly 0 if inactive, 1 if active,</div><div class='add'>+ * and 3 if it's using Sample Rate Converter ports.</div><div class='add'>+ * An example is:</div><div class='add'>+ * 0x0001f8c0</div><div class='add'>+ * In this case, f8 is the destination, and c0 is the source. The number value</div><div class='add'>+ * is 1.</div><div class='add'>+ * This region of memory is normally managed internally by the 8051, where</div><div class='add'>+ * the region of exram memory from 0x1477-0x1575 has each byte represent an</div><div class='add'>+ * entry within the 0x190000 range, and when a range of entries is in use, the</div><div class='add'>+ * ending value is overwritten with 0xff.</div><div class='add'>+ * 0x1578 in exram is a table of 0x25 entries, corresponding to the ChipIO</div><div class='add'>+ * streamID's, where each entry is a starting 0x190000 port offset.</div><div class='add'>+ * 0x159d in exram is the same as 0x1578, except it contains the ending port</div><div class='add'>+ * offset for the corresponding streamID.</div><div class='add'>+ *</div><div class='add'>+ * On certain cards, such as the SBZ/ZxR/AE7, these are originally setup by</div><div class='add'>+ * the 8051, then manually overwritten to remap the ports to work with the</div><div class='add'>+ * new DACs.</div><div class='add'>+ *</div><div class='add'>+ * Currently known portID's:</div><div class='add'>+ * 0x00-0x1f: HDA audio stream input/output ports.</div><div class='add'>+ * 0x80-0xbf: Sample rate converter input/outputs. Only valid ports seem to</div><div class='add'>+ *            have the lower-nibble set to 0x1, 0x2, and 0x9.</div><div class='add'>+ * 0xc0-0xdf: DSP DMA input/output ports. Dynamically assigned.</div><div class='add'>+ * 0xe0-0xff: DAC/ADC audio input/output ports.</div><div class='add'>+ *</div><div class='add'>+ * Currently known streamID's:</div><div class='add'>+ * 0x03: Mic1 ADC to DSP.</div><div class='add'>+ * 0x04: Mic2 ADC to DSP.</div><div class='add'>+ * 0x05: HDA node 0x02 audio stream to DSP.</div><div class='add'>+ * 0x0f: DSP Mic exit to HDA node 0x07.</div><div class='add'>+ * 0x0c: DSP processed audio to DACs.</div><div class='add'>+ * 0x14: DAC0, front L/R.</div><div class='add'>+ *</div><div class='add'>+ * It is possible to route the HDA audio streams directly to the DAC and</div><div class='add'>+ * bypass the DSP entirely, with the only downside being that since the DSP</div><div class='add'>+ * does volume control, the only volume control you'll get is through PCM on</div><div class='add'>+ * the PC side, in the same way volume is handled for optical out. This may be</div><div class='add'>+ * useful for debugging.</div><div class='add'>+ */</div><div class='add'>+static void chipio_remap_stream(struct hda_codec *codec,</div><div class='add'>+		const struct chipio_stream_remap_data *remap_data)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, stream_offset;</div><div class='add'>+</div><div class='add'>+	/* Get the starting port for the stream to be remapped. */</div><div class='add'>+	chipio_8051_read_exram(codec, 0x1578 + remap_data-&gt;stream_id,</div><div class='add'>+			&amp;stream_offset);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check if the stream's port value is 0xff, because the 8051 may not</div><div class='add'>+	 * have gotten around to setting up the stream yet. Wait until it's</div><div class='add'>+	 * setup to remap it's ports.</div><div class='add'>+	 */</div><div class='add'>+	if (stream_offset == 0xff) {</div><div class='add'>+		for (i = 0; i &lt; 5; i++) {</div><div class='add'>+			msleep(25);</div><div class='add'>+</div><div class='add'>+			chipio_8051_read_exram(codec, 0x1578 + remap_data-&gt;stream_id,</div><div class='add'>+					&amp;stream_offset);</div><div class='add'>+</div><div class='add'>+			if (stream_offset != 0xff)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stream_offset == 0xff) {</div><div class='add'>+		codec_info(codec, "%s: Stream 0x%02x ports aren't allocated, remap failed!\n",</div><div class='add'>+				__func__, remap_data-&gt;stream_id);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Offset isn't in bytes, its in 32-bit words, so multiply it by 4. */</div><div class='add'>+	stream_offset *= 0x04;</div><div class='add'>+	stream_offset += 0x190000;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; remap_data-&gt;count; i++) {</div><div class='add'>+		chipio_write_no_mutex(codec,</div><div class='add'>+				stream_offset + remap_data-&gt;offset[i],</div><div class='add'>+				remap_data-&gt;value[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update stream map configuration. */</div><div class='add'>+	chipio_write_no_mutex(codec, 0x19042c, 0x00000001);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Default speaker tuning values setup for alternative codecs.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int sbz_default_delay_values[] = {</div><div class='add'>+	/* Non-zero values are floating point 0.000198. */</div><div class='add'>+	0x394f9e38, 0x394f9e38, 0x00000000, 0x00000000, 0x00000000, 0x00000000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int zxr_default_delay_values[] = {</div><div class='add'>+	/* Non-zero values are floating point 0.000220. */</div><div class='add'>+	0x00000000, 0x00000000, 0x3966afcd, 0x3966afcd, 0x3966afcd, 0x3966afcd</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int ae5_default_delay_values[] = {</div><div class='add'>+	/* Non-zero values are floating point 0.000100. */</div><div class='add'>+	0x00000000, 0x00000000, 0x38d1b717, 0x38d1b717, 0x38d1b717, 0x38d1b717</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If we never change these, probably only need them on initialization.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_init_speaker_tuning(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i, tmp, start_req, end_req;</div><div class='add'>+	const unsigned int *values;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		values = sbz_default_delay_values;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		values = zxr_default_delay_values;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		values = ae5_default_delay_values;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		values = sbz_default_delay_values;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, SPEAKER_TUNING_ENABLE_CENTER_EQ, tmp);</div><div class='add'>+</div><div class='add'>+	start_req = SPEAKER_TUNING_FRONT_LEFT_VOL_LEVEL;</div><div class='add'>+	end_req = SPEAKER_TUNING_REAR_RIGHT_VOL_LEVEL;</div><div class='add'>+	for (i = start_req; i &lt; end_req + 1; i++)</div><div class='add'>+		dspio_set_uint_param(codec, 0x96, i, tmp);</div><div class='add'>+</div><div class='add'>+	start_req = SPEAKER_TUNING_FRONT_LEFT_INVERT;</div><div class='add'>+	end_req = SPEAKER_TUNING_REAR_RIGHT_INVERT;</div><div class='add'>+	for (i = start_req; i &lt; end_req + 1; i++)</div><div class='add'>+		dspio_set_uint_param(codec, 0x96, i, tmp);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 6; i++)</div><div class='add'>+		dspio_set_uint_param(codec, 0x96,</div><div class='add'>+				SPEAKER_TUNING_FRONT_LEFT_DELAY + i, values[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialize mic for non-chromebook ca0132 implementations.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_init_analog_mics(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	/* Mic 1 Setup */</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_R3DI) {</div><div class='add'>+		chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+		tmp = FLOAT_ONE;</div><div class='add'>+	} else</div><div class='add'>+		tmp = FLOAT_THREE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	/* Mic 2 setup (not present on desktop cards) */</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, SR_96_000);</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+		chipio_set_conn_rate(codec, 0x0F, SR_96_000);</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x01, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sets the source of stream 0x14 to connpointID 0x48, and the destination</div><div class='add'>+ * connpointID to 0x91. If this isn't done, the destination is 0x71, and</div><div class='add'>+ * you get no sound. I'm guessing this has to do with the Sound Blaster Z</div><div class='add'>+ * having an updated DAC, which changes the destination to that DAC.</div><div class='add'>+ */</div><div class='add'>+static void sbz_connect_streams(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Connect Streams entered, mutex locked and loaded.\n");</div><div class='add'>+</div><div class='add'>+	/* This value is 0x43 for 96khz, and 0x83 for 192khz. */</div><div class='add'>+	chipio_write_no_mutex(codec, 0x18a020, 0x00000043);</div><div class='add'>+</div><div class='add'>+	/* Setup stream 0x14 with it's source and destination points */</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x14, 0x48, 0x91);</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0x48, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0x91, SR_96_000);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x14, 2);</div><div class='add'>+	chipio_set_stream_control(codec, 0x14, 1);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Connect Streams exited, mutex released.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Write data through ChipIO to setup proper stream destinations.</div><div class='add'>+ * Not sure how it exactly works, but it seems to direct data</div><div class='add'>+ * to different destinations. Example is f8 to c0, e0 to c0.</div><div class='add'>+ * All I know is, if you don't set these, you get no sound.</div><div class='add'>+ */</div><div class='add'>+static void sbz_chipio_startup_data(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct chipio_stream_remap_data *dsp_out_remap_data;</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+	codec_dbg(codec, "Startup Data entered, mutex locked and loaded.\n");</div><div class='add'>+</div><div class='add'>+	/* Remap DAC0's output ports. */</div><div class='add'>+	chipio_remap_stream(codec, &amp;stream_remap_data[0]);</div><div class='add'>+</div><div class='add'>+	/* Remap DSP audio output stream ports. */</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		dsp_out_remap_data = &amp;stream_remap_data[1];</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		dsp_out_remap_data = &amp;stream_remap_data[2];</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dsp_out_remap_data = NULL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsp_out_remap_data)</div><div class='add'>+		chipio_remap_stream(codec, dsp_out_remap_data);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Startup Data exited, mutex released.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_alt_dsp_initial_mic_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+</div><div class='add'>+	tmp = FLOAT_THREE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 1);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 1);</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		chipio_write(codec, 0x18b098, 0x0000000c);</div><div class='add'>+		chipio_write(codec, 0x18b09C, 0x0000000c);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		chipio_write(codec, 0x18b098, 0x0000000c);</div><div class='add'>+		chipio_write(codec, 0x18b09c, 0x0000004c);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_post_dsp_register_set(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_direct(codec, 0x93, 0x10);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x44, 0xc2);</div><div class='add'>+</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0x00, spec-&gt;mem_base + 0x100);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0x00, spec-&gt;mem_base + 0x100);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0x00, spec-&gt;mem_base + 0x100);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+	writeb(0x00, spec-&gt;mem_base + 0x100);</div><div class='add'>+	writeb(0xff, spec-&gt;mem_base + 0x304);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2b, 0x3f);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2d, 0x3f);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x07, 0x83);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_post_dsp_param_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Param3 in the 8051's memory is represented by the ascii string 'mch'</div><div class='add'>+	 * which seems to be 'multichannel'. This is also mentioned in the</div><div class='add'>+	 * AE-5's registry values in Windows.</div><div class='add'>+	 */</div><div class='add'>+	chipio_set_control_param(codec, 3, 0);</div><div class='add'>+	/*</div><div class='add'>+	 * I believe ASI is 'audio serial interface' and that it's used to</div><div class='add'>+	 * change colors on the external LED strip connected to the AE-5.</div><div class='add'>+	 */</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_ASI_96KHZ, 1);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x724, 0x83);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_ASI, 0);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_exram(codec, 0xfa92, 0x22);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_post_dsp_pll_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x41, 0xc8);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x45, 0xcc);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x40, 0xcb);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x43, 0xc7);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x51, 0x8d);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_post_dsp_stream_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x725, 0x81);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0x70, SR_96_000);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x5, 0x43, 0x0);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x18, 0x9, 0xd0);</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0xd0, SR_96_000);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x18, 6);</div><div class='add'>+	chipio_set_stream_control(codec, 0x18, 1);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_ASI, 4);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu_no_mutex(codec, 0x43, 0xc7);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x01, 0x80);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_post_dsp_startup_data(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189000, 0x0001f101);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189004, 0x0001f101);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189024, 0x00014004);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189028, 0x0002000f);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0a, 0x05);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_ASI, 7);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0b, 0x12);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x04, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x06, 0x48);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0a, 0x05);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0f, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x10, 0x00);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, true);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x07, 0x80);</div><div class='add'>+</div><div class='add'>+	chipio_write_no_mutex(codec, 0x18b03c, 0x00000012);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0f, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x10, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae7_post_dsp_setup_ports(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	/* Seems to share the same port remapping as the SBZ. */</div><div class='add'>+	chipio_remap_stream(codec, &amp;stream_remap_data[1]);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x30, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0d, 0x40);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x17, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x19, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x11, 0xff);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x12, 0xff);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x13, 0xff);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x14, 0x7f);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae7_post_dsp_asi_stream_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x725, 0x81);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2b, 0x00);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0x70, SR_96_000);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x05, 0x43, 0x00);</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x18, 0x09, 0xd0);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0xd0, SR_96_000);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x18, 6);</div><div class='add'>+	chipio_set_stream_control(codec, 0x18, 1);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_ASI, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae7_post_dsp_pll_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int addr[] = {</div><div class='add'>+		0x41, 0x45, 0x40, 0x43, 0x51</div><div class='add'>+	};</div><div class='add'>+	static const unsigned int data[] = {</div><div class='add'>+		0xc8, 0xcc, 0xcb, 0xc7, 0x8d</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(addr); i++)</div><div class='add'>+		chipio_8051_write_pll_pmu_no_mutex(codec, addr[i], data[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae7_post_dsp_asi_setup_ports(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const unsigned int target[] = {</div><div class='add'>+		0x0b, 0x04, 0x06, 0x0a, 0x0c, 0x11, 0x12, 0x13, 0x14</div><div class='add'>+	};</div><div class='add'>+	static const unsigned int data[] = {</div><div class='add'>+		0x12, 0x00, 0x48, 0x05, 0x5f, 0xff, 0xff, 0xff, 0x7f</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu_no_mutex(codec, 0x43, 0xc7);</div><div class='add'>+</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189000, 0x0001f101);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189004, 0x0001f101);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189024, 0x00014004);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x189028, 0x0002000f);</div><div class='add'>+</div><div class='add'>+	ae7_post_dsp_pll_setup(codec);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_ASI, 7);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(target); i++)</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x48, target[i], data[i]);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0f, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x10, 0x00);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x21, 0x64, 0x56);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x21, 2);</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0x56, SR_8_000);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_NODE_ID, 0x09);</div><div class='add'>+	/*</div><div class='add'>+	 * In the 8051's memory, this param is referred to as 'n2sid', which I</div><div class='add'>+	 * believe is 'node to streamID'. It seems to be a way to assign a</div><div class='add'>+	 * stream to a given HDA node.</div><div class='add'>+	 */</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, 0x20, 0x21);</div><div class='add'>+</div><div class='add'>+	chipio_write_no_mutex(codec, 0x18b038, 0x00000088);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Now, at this point on Windows, an actual stream is setup and</div><div class='add'>+	 * seemingly sends data to the HDA node 0x09, which is the digital</div><div class='add'>+	 * audio input node. This is left out here, because obviously I don't</div><div class='add'>+	 * know what data is being sent. Interestingly, the AE-5 seems to go</div><div class='add'>+	 * through the motions of getting here and never actually takes this</div><div class='add'>+	 * step, but the AE-7 does.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, 1);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, 1);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	chipio_write_no_mutex(codec, 0x18b03c, 0x00000000);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0f, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x10, 0x00);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x05, 0x43, 0x00);</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x18, 0x09, 0xd0);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate_no_mutex(codec, 0xd0, SR_96_000);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x18, 6);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Runs again, this has been repeated a few times, but I'm just</div><div class='add'>+	 * following what the Windows driver does.</div><div class='add'>+	 */</div><div class='add'>+	ae7_post_dsp_pll_setup(codec);</div><div class='add'>+	chipio_set_control_param_no_mutex(codec, CONTROL_PARAM_ASI, 7);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Windows driver has commands that seem to setup ASI, which I believe to</div><div class='add'>+ * be some sort of audio serial interface. My current speculation is that it's</div><div class='add'>+ * related to communicating with the new DAC.</div><div class='add'>+ */</div><div class='add'>+static void ae7_post_dsp_asi_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_8051_write_direct(codec, 0x93, 0x10);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x44, 0xc2);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2e, 0x3f);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, 3, 3);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_ASI_96KHZ, 1);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x724, 0x83);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_ASI, 0);</div><div class='add'>+	snd_hda_codec_write(codec, 0x17, 0, 0x794, 0x00);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_exram(codec, 0xfa92, 0x22);</div><div class='add'>+</div><div class='add'>+	ae7_post_dsp_pll_setup(codec);</div><div class='add'>+	ae7_post_dsp_asi_stream_setup(codec);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x43, 0xc7);</div><div class='add'>+</div><div class='add'>+	ae7_post_dsp_asi_setup_ports(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup default parameters for DSP</div><div class='add'>+ */</div><div class='add'>+static void ca0132_setup_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int idx, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* out, in effects + voicefx */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1;</div><div class='add'>+	for (idx = 0; idx &lt; num_fx; idx++) {</div><div class='add'>+		for (i = 0; i &lt;= ca0132_effects[idx].params; i++) {</div><div class='add'>+			dspio_set_uint_param(codec, ca0132_effects[idx].mid,</div><div class='add'>+					     ca0132_effects[idx].reqs[i],</div><div class='add'>+					     ca0132_effects[idx].def_vals[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*remove DSP headroom*/</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x3C, tmp);</div><div class='add'>+</div><div class='add'>+	/*set speaker EQ bypass attenuation*/</div><div class='add'>+	dspio_set_uint_param(codec, 0x8f, 0x01, tmp);</div><div class='add'>+</div><div class='add'>+	/* set AMic1 and AMic2 as mono mic */</div><div class='add'>+	tmp = FLOAT_ONE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x00, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x01, tmp);</div><div class='add'>+</div><div class='add'>+	/* set AMic1 as CrystalVoice input */</div><div class='add'>+	tmp = FLOAT_ONE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x05, tmp);</div><div class='add'>+</div><div class='add'>+	/* set WUH source */</div><div class='add'>+	tmp = FLOAT_TWO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x31, 0x00, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup default parameters for Recon3D/Recon3Di DSP.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void r3d_setup_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int idx, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_analog_mics(codec);</div><div class='add'>+	ca0132_alt_start_dsp_audio_streams(codec);</div><div class='add'>+</div><div class='add'>+	/*remove DSP headroom*/</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x3C, tmp);</div><div class='add'>+</div><div class='add'>+	/* set WUH source */</div><div class='add'>+	tmp = FLOAT_TWO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x31, 0x00, tmp);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+</div><div class='add'>+	/* Set speaker source? */</div><div class='add'>+	dspio_set_uint_param(codec, 0x32, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_R3DI)</div><div class='add'>+		r3di_gpio_dsp_status_set(codec, R3DI_DSP_DOWNLOADED);</div><div class='add'>+</div><div class='add'>+	/* Disable mute on Center/LFE. */</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_R3D) {</div><div class='add'>+		ca0113_mmio_gpio_set(codec, 2, false);</div><div class='add'>+		ca0113_mmio_gpio_set(codec, 4, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup effect defaults */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1;</div><div class='add'>+	for (idx = 0; idx &lt; num_fx; idx++) {</div><div class='add'>+		for (i = 0; i &lt;= ca0132_effects[idx].params; i++) {</div><div class='add'>+			dspio_set_uint_param(codec,</div><div class='add'>+					ca0132_effects[idx].mid,</div><div class='add'>+					ca0132_effects[idx].reqs[i],</div><div class='add'>+					ca0132_effects[idx].def_vals[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup default parameters for the Sound Blaster Z DSP. A lot more going on</div><div class='add'>+ * than the Chromebook setup.</div><div class='add'>+ */</div><div class='add'>+static void sbz_setup_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int idx, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_analog_mics(codec);</div><div class='add'>+	ca0132_alt_start_dsp_audio_streams(codec);</div><div class='add'>+	sbz_connect_streams(codec);</div><div class='add'>+	sbz_chipio_startup_data(codec);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Sets internal input loopback to off, used to have a switch to</div><div class='add'>+	 * enable input loopback, but turned out to be way too buggy.</div><div class='add'>+	 */</div><div class='add'>+	tmp = FLOAT_ONE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x08, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x10, tmp);</div><div class='add'>+</div><div class='add'>+	/*remove DSP headroom*/</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x3C, tmp);</div><div class='add'>+</div><div class='add'>+	/* set WUH source */</div><div class='add'>+	tmp = FLOAT_TWO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x31, 0x00, tmp);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+</div><div class='add'>+	/* Set speaker source? */</div><div class='add'>+	dspio_set_uint_param(codec, 0x32, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	ca0132_alt_dsp_initial_mic_setup(codec);</div><div class='add'>+</div><div class='add'>+	/* out, in effects + voicefx */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1;</div><div class='add'>+	for (idx = 0; idx &lt; num_fx; idx++) {</div><div class='add'>+		for (i = 0; i &lt;= ca0132_effects[idx].params; i++) {</div><div class='add'>+			dspio_set_uint_param(codec,</div><div class='add'>+					ca0132_effects[idx].mid,</div><div class='add'>+					ca0132_effects[idx].reqs[i],</div><div class='add'>+					ca0132_effects[idx].def_vals[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_speaker_tuning(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup default parameters for the Sound BlasterX AE-5 DSP.</div><div class='add'>+ */</div><div class='add'>+static void ae5_setup_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int idx, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_analog_mics(codec);</div><div class='add'>+	ca0132_alt_start_dsp_audio_streams(codec);</div><div class='add'>+</div><div class='add'>+	/* New, unknown SCP req's */</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x29, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x2a, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x0d, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x0e, tmp);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2e, 0x3f);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);</div><div class='add'>+</div><div class='add'>+	/* Internal loopback off */</div><div class='add'>+	tmp = FLOAT_ONE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x08, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x10, tmp);</div><div class='add'>+</div><div class='add'>+	/*remove DSP headroom*/</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x3C, tmp);</div><div class='add'>+</div><div class='add'>+	/* set WUH source */</div><div class='add'>+	tmp = FLOAT_TWO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x31, 0x00, tmp);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+</div><div class='add'>+	/* Set speaker source? */</div><div class='add'>+	dspio_set_uint_param(codec, 0x32, 0x00, tmp);</div><div class='add'>+</div><div class='add'>+	ca0132_alt_dsp_initial_mic_setup(codec);</div><div class='add'>+	ae5_post_dsp_register_set(codec);</div><div class='add'>+	ae5_post_dsp_param_setup(codec);</div><div class='add'>+	ae5_post_dsp_pll_setup(codec);</div><div class='add'>+	ae5_post_dsp_stream_setup(codec);</div><div class='add'>+	ae5_post_dsp_startup_data(codec);</div><div class='add'>+</div><div class='add'>+	/* out, in effects + voicefx */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1;</div><div class='add'>+	for (idx = 0; idx &lt; num_fx; idx++) {</div><div class='add'>+		for (i = 0; i &lt;= ca0132_effects[idx].params; i++) {</div><div class='add'>+			dspio_set_uint_param(codec,</div><div class='add'>+					ca0132_effects[idx].mid,</div><div class='add'>+					ca0132_effects[idx].reqs[i],</div><div class='add'>+					ca0132_effects[idx].def_vals[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_speaker_tuning(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Setup default parameters for the Sound Blaster AE-7 DSP.</div><div class='add'>+ */</div><div class='add'>+static void ae7_setup_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int idx, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_analog_mics(codec);</div><div class='add'>+	ca0132_alt_start_dsp_audio_streams(codec);</div><div class='add'>+	ae7_post_dsp_setup_ports(codec);</div><div class='add'>+</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_TUNING_FRONT_LEFT_INVERT, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x96,</div><div class='add'>+			SPEAKER_TUNING_FRONT_RIGHT_INVERT, tmp);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2e, 0x3f);</div><div class='add'>+</div><div class='add'>+	/* New, unknown SCP req's */</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x0d, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x80, 0x0e, tmp);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+</div><div class='add'>+	/* Internal loopback off */</div><div class='add'>+	tmp = FLOAT_ONE;</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x08, tmp);</div><div class='add'>+	dspio_set_uint_param(codec, 0x37, 0x10, tmp);</div><div class='add'>+</div><div class='add'>+	/*remove DSP headroom*/</div><div class='add'>+	tmp = FLOAT_ZERO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x96, 0x3C, tmp);</div><div class='add'>+</div><div class='add'>+	/* set WUH source */</div><div class='add'>+	tmp = FLOAT_TWO;</div><div class='add'>+	dspio_set_uint_param(codec, 0x31, 0x00, tmp);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+</div><div class='add'>+	/* Set speaker source? */</div><div class='add'>+	dspio_set_uint_param(codec, 0x32, 0x00, tmp);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x28, 0x00);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This is the second time we've called this, but this is seemingly</div><div class='add'>+	 * what Windows does.</div><div class='add'>+	 */</div><div class='add'>+	ca0132_alt_init_analog_mics(codec);</div><div class='add'>+</div><div class='add'>+	ae7_post_dsp_asi_setup(codec);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Not sure why, but these are both set to 1. They're only set to 0</div><div class='add'>+	 * upon shutdown.</div><div class='add'>+	 */</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, true);</div><div class='add'>+</div><div class='add'>+	/* Volume control related. */</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x0f, 0x04);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x10, 0x04);</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x80);</div><div class='add'>+</div><div class='add'>+	/* out, in effects + voicefx */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1;</div><div class='add'>+	for (idx = 0; idx &lt; num_fx; idx++) {</div><div class='add'>+		for (i = 0; i &lt;= ca0132_effects[idx].params; i++) {</div><div class='add'>+			dspio_set_uint_param(codec,</div><div class='add'>+					ca0132_effects[idx].mid,</div><div class='add'>+					ca0132_effects[idx].reqs[i],</div><div class='add'>+					ca0132_effects[idx].def_vals[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ca0132_alt_init_speaker_tuning(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization of flags in chip</div><div class='add'>+ */</div><div class='add'>+static void ca0132_init_flags(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_DSP_96KHZ, 1);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_DAC_96KHZ, 1);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_ADC_B_96KHZ, 1);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_ADC_C_96KHZ, 1);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_SRC_RATE_96KHZ, 1);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_IDLE_ENABLE, 0);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_SPDIF2OUT, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_D_10KOHM_LOAD, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_A_10KOHM_LOAD, 1);</div><div class='add'>+	} else {</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_IDLE_ENABLE, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_A_COMMON_MODE, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_D_COMMON_MODE, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_A_10KOHM_LOAD, 0);</div><div class='add'>+		chipio_set_control_flag(codec,</div><div class='add'>+				CONTROL_FLAG_PORT_D_10KOHM_LOAD, 0);</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_ADC_C_HIGH_PASS, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Initialization of parameters in chip</div><div class='add'>+ */</div><div class='add'>+static void ca0132_init_params(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+		chipio_set_conn_rate(codec, 0x0B, SR_48_000);</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_SPDIF1_SOURCE, 0);</div><div class='add'>+		chipio_set_control_param(codec, 0, 0);</div><div class='add'>+		chipio_set_control_param(codec, CONTROL_PARAM_VIP_SOURCE, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_PORTA_160OHM_GAIN, 6);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_PORTD_160OHM_GAIN, 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_set_dsp_msr(struct hda_codec *codec, bool is96k)</div><div class='add'>+{</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_DSP_96KHZ, is96k);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_DAC_96KHZ, is96k);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_SRC_RATE_96KHZ, is96k);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_SRC_CLOCK_196MHZ, is96k);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_ADC_B_96KHZ, is96k);</div><div class='add'>+	chipio_set_control_flag(codec, CONTROL_FLAG_ADC_C_96KHZ, is96k);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);</div><div class='add'>+	chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ca0132_download_dsp_images(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	bool dsp_loaded = false;</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct dsp_image_seg *dsp_os_image;</div><div class='add'>+	const struct firmware *fw_entry = NULL;</div><div class='add'>+	/*</div><div class='add'>+	 * Alternate firmwares for different variants. The Recon3Di apparently</div><div class='add'>+	 * can use the default firmware, but I'll leave the option in case</div><div class='add'>+	 * it needs it again.</div><div class='add'>+	 */</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		if (request_firmware(&amp;fw_entry, DESKTOP_EFX_FILE,</div><div class='add'>+					codec-&gt;card-&gt;dev) != 0)</div><div class='add'>+			codec_dbg(codec, "Desktop firmware not found.");</div><div class='add'>+		else</div><div class='add'>+			codec_dbg(codec, "Desktop firmware selected.");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		if (request_firmware(&amp;fw_entry, R3DI_EFX_FILE,</div><div class='add'>+					codec-&gt;card-&gt;dev) != 0)</div><div class='add'>+			codec_dbg(codec, "Recon3Di alt firmware not detected.");</div><div class='add'>+		else</div><div class='add'>+			codec_dbg(codec, "Recon3Di firmware selected.");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Use default ctefx.bin if no alt firmware is detected, or if none</div><div class='add'>+	 * exists for your particular codec.</div><div class='add'>+	 */</div><div class='add'>+	if (!fw_entry) {</div><div class='add'>+		codec_dbg(codec, "Default firmware selected.");</div><div class='add'>+		if (request_firmware(&amp;fw_entry, EFX_FILE,</div><div class='add'>+					codec-&gt;card-&gt;dev) != 0)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsp_os_image = (struct dsp_image_seg *)(fw_entry-&gt;data);</div><div class='add'>+	if (dspload_image(codec, dsp_os_image, 0, 0, true, 0)) {</div><div class='add'>+		codec_err(codec, "ca0132 DSP load image failed\n");</div><div class='add'>+		goto exit_download;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsp_loaded = dspload_wait_loaded(codec);</div><div class='add'>+</div><div class='add'>+exit_download:</div><div class='add'>+	release_firmware(fw_entry);</div><div class='add'>+</div><div class='add'>+	return dsp_loaded;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_download_dsp(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+#ifndef CONFIG_SND_HDA_CODEC_CA0132_DSP</div><div class='add'>+	return; /* NOP */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state == DSP_DOWNLOAD_FAILED)</div><div class='add'>+		return; /* don't retry failures */</div><div class='add'>+</div><div class='add'>+	chipio_enable_clocks(codec);</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOADED) {</div><div class='add'>+		spec-&gt;dsp_state = DSP_DOWNLOADING;</div><div class='add'>+</div><div class='add'>+		if (!ca0132_download_dsp_images(codec))</div><div class='add'>+			spec-&gt;dsp_state = DSP_DOWNLOAD_FAILED;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;dsp_state = DSP_DOWNLOADED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For codecs using alt functions, this is already done earlier */</div><div class='add'>+	if (spec-&gt;dsp_state == DSP_DOWNLOADED &amp;&amp; !ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_set_dsp_msr(codec, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_process_dsp_response(struct hda_codec *codec,</div><div class='add'>+					struct hda_jack_callback *callback)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "ca0132_process_dsp_response\n");</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	if (spec-&gt;wait_scp) {</div><div class='add'>+		if (dspio_get_response_data(codec) &gt;= 0)</div><div class='add'>+			spec-&gt;wait_scp = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dspio_clear_response_queue(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_jack_tbl *tbl;</div><div class='add'>+</div><div class='add'>+	/* Delay enabling the HP amp, to let the mic-detection</div><div class='add'>+	 * state machine run.</div><div class='add'>+	 */</div><div class='add'>+	tbl = snd_hda_jack_tbl_get(codec, cb-&gt;nid);</div><div class='add'>+	if (tbl)</div><div class='add'>+		tbl-&gt;block_report = 1;</div><div class='add'>+	schedule_delayed_work(&amp;spec-&gt;unsol_hp_work, msecs_to_jiffies(500));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_alt_select_in(codec);</div><div class='add'>+	else</div><div class='add'>+		ca0132_select_mic(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_setup_unsol(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	snd_hda_jack_detect_enable_callback(codec, spec-&gt;unsol_tag_hp, hp_callback);</div><div class='add'>+	snd_hda_jack_detect_enable_callback(codec, spec-&gt;unsol_tag_amic1,</div><div class='add'>+					    amic_callback);</div><div class='add'>+	snd_hda_jack_detect_enable_callback(codec, UNSOL_TAG_DSP,</div><div class='add'>+					    ca0132_process_dsp_response);</div><div class='add'>+	/* Front headphone jack detection */</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec,</div><div class='add'>+			spec-&gt;unsol_tag_front_hp, hp_callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Verbs tables.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Sends before DSP download. */</div><div class='add'>+static const struct hda_verb ca0132_base_init_verbs[] = {</div><div class='add'>+	/*enable ct extension*/</div><div class='add'>+	{0x15, VENDOR_CHIPIO_CT_EXTENSIONS_ENABLE, 0x1},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Send at exit. */</div><div class='add'>+static const struct hda_verb ca0132_base_exit_verbs[] = {</div><div class='add'>+	/*set afg to D3*/</div><div class='add'>+	{0x01, AC_VERB_SET_POWER_STATE, 0x03},</div><div class='add'>+	/*disable ct extension*/</div><div class='add'>+	{0x15, VENDOR_CHIPIO_CT_EXTENSIONS_ENABLE, 0},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Other verbs tables. Sends after DSP download. */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb ca0132_init_verbs0[] = {</div><div class='add'>+	/* chip init verbs */</div><div class='add'>+	{0x15, 0x70D, 0xF0},</div><div class='add'>+	{0x15, 0x70E, 0xFE},</div><div class='add'>+	{0x15, 0x707, 0x75},</div><div class='add'>+	{0x15, 0x707, 0xD3},</div><div class='add'>+	{0x15, 0x707, 0x09},</div><div class='add'>+	{0x15, 0x707, 0x53},</div><div class='add'>+	{0x15, 0x707, 0xD4},</div><div class='add'>+	{0x15, 0x707, 0xEF},</div><div class='add'>+	{0x15, 0x707, 0x75},</div><div class='add'>+	{0x15, 0x707, 0xD3},</div><div class='add'>+	{0x15, 0x707, 0x09},</div><div class='add'>+	{0x15, 0x707, 0x02},</div><div class='add'>+	{0x15, 0x707, 0x37},</div><div class='add'>+	{0x15, 0x707, 0x78},</div><div class='add'>+	{0x15, 0x53C, 0xCE},</div><div class='add'>+	{0x15, 0x575, 0xC9},</div><div class='add'>+	{0x15, 0x53D, 0xCE},</div><div class='add'>+	{0x15, 0x5B7, 0xC9},</div><div class='add'>+	{0x15, 0x70D, 0xE8},</div><div class='add'>+	{0x15, 0x70E, 0xFE},</div><div class='add'>+	{0x15, 0x707, 0x02},</div><div class='add'>+	{0x15, 0x707, 0x68},</div><div class='add'>+	{0x15, 0x707, 0x62},</div><div class='add'>+	{0x15, 0x53A, 0xCE},</div><div class='add'>+	{0x15, 0x546, 0xC9},</div><div class='add'>+	{0x15, 0x53B, 0xCE},</div><div class='add'>+	{0x15, 0x5E8, 0xC9},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Extra init verbs for desktop cards. */</div><div class='add'>+static const struct hda_verb ca0132_init_verbs1[] = {</div><div class='add'>+	{0x15, 0x70D, 0x20},</div><div class='add'>+	{0x15, 0x70E, 0x19},</div><div class='add'>+	{0x15, 0x707, 0x00},</div><div class='add'>+	{0x15, 0x539, 0xCE},</div><div class='add'>+	{0x15, 0x546, 0xC9},</div><div class='add'>+	{0x15, 0x70D, 0xB7},</div><div class='add'>+	{0x15, 0x70E, 0x09},</div><div class='add'>+	{0x15, 0x707, 0x10},</div><div class='add'>+	{0x15, 0x70D, 0xAF},</div><div class='add'>+	{0x15, 0x70E, 0x09},</div><div class='add'>+	{0x15, 0x707, 0x01},</div><div class='add'>+	{0x15, 0x707, 0x05},</div><div class='add'>+	{0x15, 0x70D, 0x73},</div><div class='add'>+	{0x15, 0x70E, 0x09},</div><div class='add'>+	{0x15, 0x707, 0x14},</div><div class='add'>+	{0x15, 0x6FF, 0xC4},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ca0132_init_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	int num_fx;</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int on;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;spec-&gt;chipio_mutex);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The Windows driver always does this upon startup, which seems to</div><div class='add'>+	 * clear out any previous configuration. This should help issues where</div><div class='add'>+	 * a boot into Windows prior to a boot into Linux breaks things. Also,</div><div class='add'>+	 * Windows always sends the reset twice.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		chipio_set_control_flag(codec, CONTROL_FLAG_IDLE_ENABLE, 0);</div><div class='add'>+		chipio_write_no_mutex(codec, 0x18b0a4, 0x000000c2);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_CODEC_RESET, 0);</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_CODEC_RESET, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_out_type = SPEAKER_OUT;</div><div class='add'>+	if (!ca0132_use_alt_functions(spec))</div><div class='add'>+		spec-&gt;cur_mic_type = DIGITAL_MIC;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;cur_mic_type = REAR_MIC;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_mic_boost = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VNODES_COUNT; i++) {</div><div class='add'>+		spec-&gt;vnode_lvol[i] = 0x5a;</div><div class='add'>+		spec-&gt;vnode_rvol[i] = 0x5a;</div><div class='add'>+		spec-&gt;vnode_lswitch[i] = 0;</div><div class='add'>+		spec-&gt;vnode_rswitch[i] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Default states for effects are in ca0132_effects[].</div><div class='add'>+	 */</div><div class='add'>+	num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT;</div><div class='add'>+	for (i = 0; i &lt; num_fx; i++) {</div><div class='add'>+		on = (unsigned int)ca0132_effects[i].reqs[0];</div><div class='add'>+		spec-&gt;effects_switch[i] = on ? 1 : 0;</div><div class='add'>+	}</div><div class='add'>+	/*</div><div class='add'>+	 * Sets defaults for the effect slider controls, only for alternative</div><div class='add'>+	 * ca0132 codecs. Also sets x-bass crossover frequency to 80hz.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_alt_controls(spec)) {</div><div class='add'>+		/* Set speakers to default to full range. */</div><div class='add'>+		spec-&gt;speaker_range_val[0] = 1;</div><div class='add'>+		spec-&gt;speaker_range_val[1] = 1;</div><div class='add'>+</div><div class='add'>+		spec-&gt;xbass_xover_freq = 8;</div><div class='add'>+		for (i = 0; i &lt; EFFECT_LEVEL_SLIDERS; i++)</div><div class='add'>+			spec-&gt;fx_ctl_val[i] = effect_slider_defaults[i];</div><div class='add'>+</div><div class='add'>+		spec-&gt;bass_redirect_xover_freq = 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;voicefx_val = 0;</div><div class='add'>+	spec-&gt;effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID] = 1;</div><div class='add'>+	spec-&gt;effects_switch[CRYSTAL_VOICE - EFFECT_START_NID] = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The ZxR doesn't have a front panel header, and it's line-in is on</div><div class='add'>+	 * the daughter board. So, there is no input enum control, and we need</div><div class='add'>+	 * to make sure that spec-&gt;in_enum_val is set properly.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ZXR)</div><div class='add'>+		spec-&gt;in_enum_val = REAR_MIC;</div><div class='add'>+</div><div class='add'>+#ifdef ENABLE_TUNING_CONTROLS</div><div class='add'>+	ca0132_init_tuning_defaults(codec);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Recon3Di exit specific commands.</div><div class='add'>+ */</div><div class='add'>+/* prevents popping noise on shutdown */</div><div class='add'>+static void r3di_gpio_shutdown(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sound Blaster Z exit specific commands.</div><div class='add'>+ */</div><div class='add'>+static void sbz_region2_exit(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		writeb(0x0, spec-&gt;mem_base + 0x100);</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		writeb(0xb3, spec-&gt;mem_base + 0x304);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 4, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 5, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 7, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sbz_set_pin_ctl_default(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t pins[] = {0x0B, 0x0C, 0x0E, 0x12, 0x13};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x11, 0,</div><div class='add'>+			AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pins); i++)</div><div class='add'>+		snd_hda_codec_write(codec, pins[i], 0,</div><div class='add'>+				AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_clear_unsolicited(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t pins[] = {0x0B, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pins); i++) {</div><div class='add'>+		snd_hda_codec_write(codec, pins[i], 0,</div><div class='add'>+				AC_VERB_SET_UNSOLICITED_ENABLE, 0x00);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On shutdown, sends commands in sets of three */</div><div class='add'>+static void sbz_gpio_shutdown_commands(struct hda_codec *codec, int dir,</div><div class='add'>+							int mask, int data)</div><div class='add'>+{</div><div class='add'>+	if (dir &gt;= 0)</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DIRECTION, dir);</div><div class='add'>+	if (mask &gt;= 0)</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_MASK, mask);</div><div class='add'>+</div><div class='add'>+	if (data &gt;= 0)</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				AC_VERB_SET_GPIO_DATA, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zxr_dbpro_power_state_shutdown(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t pins[] = {0x05, 0x0c, 0x09, 0x0e, 0x08, 0x11, 0x01};</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pins); i++)</div><div class='add'>+		snd_hda_codec_write(codec, pins[i], 0,</div><div class='add'>+				AC_VERB_SET_POWER_STATE, 0x03);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sbz_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+</div><div class='add'>+	/* Mess with GPIO */</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, -1);</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, 0x05);</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, 0x01);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x14, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x0C, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate(codec, 0x41, SR_192_000);</div><div class='add'>+	chipio_set_conn_rate(codec, 0x91, SR_192_000);</div><div class='add'>+</div><div class='add'>+	chipio_write(codec, 0x18a020, 0x00000083);</div><div class='add'>+</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, 0x03);</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, 0x07);</div><div class='add'>+	sbz_gpio_shutdown_commands(codec, 0x07, 0x07, 0x06);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x0C, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, 0x0D, 0x24);</div><div class='add'>+</div><div class='add'>+	ca0132_clear_unsolicited(codec);</div><div class='add'>+	sbz_set_pin_ctl_default(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x0B, 0,</div><div class='add'>+		AC_VERB_SET_EAPD_BTLENABLE, 0x00);</div><div class='add'>+</div><div class='add'>+	sbz_region2_exit(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r3d_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	ca0132_clear_unsolicited(codec);</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x5b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae5_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x30, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2b, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2d, 0x00);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, false);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x53);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_ASI, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x18, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x0c, 0);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x724, 0x83);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ae7_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_set_stream_control(codec, 0x18, 0);</div><div class='add'>+	chipio_set_stream_source_dest(codec, 0x21, 0xc8, 0xc8);</div><div class='add'>+	chipio_set_stream_channels(codec, 0x21, 0);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_NODE_ID, 0x09);</div><div class='add'>+	chipio_set_control_param(codec, 0x20, 0x01);</div><div class='add'>+</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_ASI, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_stream_control(codec, 0x18, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x0c, 0);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2b, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x15, 0, 0x724, 0x83);</div><div class='add'>+	ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x83);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x30, 0x00);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x2e, 0x00);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 1, false);</div><div class='add'>+	ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x53);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void zxr_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_set_stream_control(codec, 0x03, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x04, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x14, 0);</div><div class='add'>+	chipio_set_stream_control(codec, 0x0C, 0);</div><div class='add'>+</div><div class='add'>+	chipio_set_conn_rate(codec, 0x41, SR_192_000);</div><div class='add'>+	chipio_set_conn_rate(codec, 0x91, SR_192_000);</div><div class='add'>+</div><div class='add'>+	chipio_write(codec, 0x18a020, 0x00000083);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x53);</div><div class='add'>+</div><div class='add'>+	ca0132_clear_unsolicited(codec);</div><div class='add'>+	sbz_set_pin_ctl_default(codec);</div><div class='add'>+	snd_hda_codec_write(codec, 0x0B, 0, AC_VERB_SET_EAPD_BTLENABLE, 0x00);</div><div class='add'>+</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 5, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 2, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 3, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 4, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 0, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 5, true);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 2, false);</div><div class='add'>+	ca0113_mmio_gpio_set(codec, 3, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_exit_chip(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* put any chip cleanup stuffs here. */</div><div class='add'>+</div><div class='add'>+	if (dspload_is_loaded(codec))</div><div class='add'>+		dsp_reset(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This fixes a problem that was hard to reproduce. Very rarely, I would</div><div class='add'>+ * boot up, and there would be no sound, but the DSP indicated it had loaded</div><div class='add'>+ * properly. I did a few memory dumps to see if anything was different, and</div><div class='add'>+ * there were a few areas of memory uninitialized with a1a2a3a4. This function</div><div class='add'>+ * checks if those areas are uninitialized, and if they are, it'll attempt to</div><div class='add'>+ * reload the card 3 times. Usually it fixes by the second.</div><div class='add'>+ */</div><div class='add'>+static void sbz_dsp_startup_check(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int dsp_data_check[4];</div><div class='add'>+	unsigned int cur_address = 0x390;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int failure = 0;</div><div class='add'>+	unsigned int reload = 3;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;startup_check_entered)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;startup_check_entered = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		chipio_read(codec, cur_address, &amp;dsp_data_check[i]);</div><div class='add'>+		cur_address += 0x4;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (dsp_data_check[i] == 0xa1a2a3a4)</div><div class='add'>+			failure = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Startup Check: %d ", failure);</div><div class='add'>+	if (failure)</div><div class='add'>+		codec_info(codec, "DSP not initialized properly. Attempting to fix.");</div><div class='add'>+	/*</div><div class='add'>+	 * While the failure condition is true, and we haven't reached our</div><div class='add'>+	 * three reload limit, continue trying to reload the driver and</div><div class='add'>+	 * fix the issue.</div><div class='add'>+	 */</div><div class='add'>+	while (failure &amp;&amp; (reload != 0)) {</div><div class='add'>+		codec_info(codec, "Reloading... Tries left: %d", reload);</div><div class='add'>+		sbz_exit_chip(codec);</div><div class='add'>+		spec-&gt;dsp_state = DSP_DOWNLOAD_INIT;</div><div class='add'>+		snd_hda_codec_init(codec);</div><div class='add'>+		failure = 0;</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			chipio_read(codec, cur_address, &amp;dsp_data_check[i]);</div><div class='add'>+			cur_address += 0x4;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			if (dsp_data_check[i] == 0xa1a2a3a4)</div><div class='add'>+				failure = 1;</div><div class='add'>+		}</div><div class='add'>+		reload--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!failure &amp;&amp; reload &lt; 3)</div><div class='add'>+		codec_info(codec, "DSP fixed.");</div><div class='add'>+</div><div class='add'>+	if (!failure)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec_info(codec, "DSP failed to initialize properly. Either try a full shutdown or a suspend to clear the internal memory.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is for the extra volume verbs 0x797 (left) and 0x798 (right). These add</div><div class='add'>+ * extra precision for decibel values. If you had the dB value in floating point</div><div class='add'>+ * you would take the value after the decimal point, multiply by 64, and divide</div><div class='add'>+ * by 2. So for 8.59, it's (59 * 64) / 100. Useful if someone wanted to</div><div class='add'>+ * implement fixed point or floating point dB volumes. For now, I'll set them</div><div class='add'>+ * to 0 just incase a value has lingered from a boot into Windows.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_vol_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, 0x02, 0, 0x797, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x02, 0, 0x798, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x03, 0, 0x797, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x03, 0, 0x798, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x04, 0, 0x797, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x04, 0, 0x798, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x07, 0, 0x797, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x07, 0, 0x798, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extra commands that don't really fit anywhere else.</div><div class='add'>+ */</div><div class='add'>+static void sbz_pre_dsp_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	writel(0x00820680, spec-&gt;mem_base + 0x01C);</div><div class='add'>+	writel(0x00820680, spec-&gt;mem_base + 0x01C);</div><div class='add'>+</div><div class='add'>+	chipio_write(codec, 0x18b0a4, 0x000000c2);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x11, 0,</div><div class='add'>+			AC_VERB_SET_PIN_WIDGET_CONTROL, 0x44);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r3d_pre_dsp_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_write(codec, 0x18b0a4, 0x000000c2);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_exram(codec, 0x1c1e, 0x5b);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x11, 0,</div><div class='add'>+			AC_VERB_SET_PIN_WIDGET_CONTROL, 0x44);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void r3di_pre_dsp_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	chipio_write(codec, 0x18b0a4, 0x000000c2);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_exram(codec, 0x1c1e, 0x5b);</div><div class='add'>+	chipio_8051_write_exram(codec, 0x1920, 0x00);</div><div class='add'>+	chipio_8051_write_exram(codec, 0x1921, 0x40);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x11, 0,</div><div class='add'>+			AC_VERB_SET_PIN_WIDGET_CONTROL, 0x04);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The ZxR seems to use alternative DAC's for the surround channels, which</div><div class='add'>+ * require PLL PMU setup for the clock rate, I'm guessing. Without setting</div><div class='add'>+ * this up, we get no audio out of the surround jacks.</div><div class='add'>+ */</div><div class='add'>+static void zxr_pre_dsp_setup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int addr[] = { 0x43, 0x40, 0x41, 0x42, 0x45 };</div><div class='add'>+	static const unsigned int data[] = { 0x08, 0x0c, 0x0b, 0x07, 0x0d };</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	chipio_write(codec, 0x189000, 0x0001f100);</div><div class='add'>+	msleep(50);</div><div class='add'>+	chipio_write(codec, 0x18900c, 0x0001f100);</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This writes a RET instruction at the entry point of the function at</div><div class='add'>+	 * 0xfa92 in exram. This function seems to have something to do with</div><div class='add'>+	 * ASI. Might be some way to prevent the card from reconfiguring the</div><div class='add'>+	 * ASI stuff itself.</div><div class='add'>+	 */</div><div class='add'>+	chipio_8051_write_exram(codec, 0xfa92, 0x22);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x51, 0x98);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x725, 0x82);</div><div class='add'>+	chipio_set_control_param(codec, CONTROL_PARAM_ASI, 3);</div><div class='add'>+</div><div class='add'>+	chipio_write(codec, 0x18902c, 0x00000000);</div><div class='add'>+	msleep(50);</div><div class='add'>+	chipio_write(codec, 0x18902c, 0x00000003);</div><div class='add'>+	msleep(50);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(addr); i++)</div><div class='add'>+		chipio_8051_write_pll_pmu(codec, addr[i], data[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These are sent before the DSP is downloaded. Not sure</div><div class='add'>+ * what they do, or if they're necessary. Could possibly</div><div class='add'>+ * be removed. Figure they're better to leave in.</div><div class='add'>+ */</div><div class='add'>+static const unsigned int ca0113_mmio_init_address_sbz[] = {</div><div class='add'>+	0x400, 0x408, 0x40c, 0x01c, 0xc0c, 0xc00, 0xc04, 0xc0c, 0xc0c, 0xc0c,</div><div class='add'>+	0xc0c, 0xc08, 0xc08, 0xc08, 0xc08, 0xc08, 0xc04</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int ca0113_mmio_init_data_sbz[] = {</div><div class='add'>+	0x00000030, 0x00000000, 0x00000003, 0x00000003, 0x00000003,</div><div class='add'>+	0x00000003, 0x000000c1, 0x000000f1, 0x00000001, 0x000000c7,</div><div class='add'>+	0x000000c1, 0x00000080</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int ca0113_mmio_init_data_zxr[] = {</div><div class='add'>+	0x00000030, 0x00000000, 0x00000000, 0x00000003, 0x00000003,</div><div class='add'>+	0x00000003, 0x00000001, 0x000000f1, 0x00000001, 0x000000c7,</div><div class='add'>+	0x000000c1, 0x00000080</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int ca0113_mmio_init_address_ae5[] = {</div><div class='add'>+	0x400, 0x42c, 0x46c, 0x4ac, 0x4ec, 0x43c, 0x47c, 0x4bc, 0x4fc, 0x408,</div><div class='add'>+	0x100, 0x410, 0x40c, 0x100, 0x100, 0x830, 0x86c, 0x800, 0x86c, 0x800,</div><div class='add'>+	0x804, 0x20c, 0x01c, 0xc0c, 0xc00, 0xc04, 0xc0c, 0xc0c, 0xc0c, 0xc0c,</div><div class='add'>+	0xc08, 0xc08, 0xc08, 0xc08, 0xc08, 0xc04, 0x01c</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int ca0113_mmio_init_data_ae5[] = {</div><div class='add'>+	0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000,</div><div class='add'>+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,</div><div class='add'>+	0x00000600, 0x00000014, 0x00000001, 0x0000060f, 0x0000070f,</div><div class='add'>+	0x00000aff, 0x00000000, 0x0000006b, 0x00000001, 0x0000006b,</div><div class='add'>+	0x00000057, 0x00800000, 0x00880680, 0x00000080, 0x00000030,</div><div class='add'>+	0x00000000, 0x00000000, 0x00000003, 0x00000003, 0x00000003,</div><div class='add'>+	0x00000001, 0x000000f1, 0x00000001, 0x000000c7, 0x000000c1,</div><div class='add'>+	0x00000080, 0x00880680</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ca0132_mmio_init_sbz(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int tmp[2], i, count, cur_addr;</div><div class='add'>+	const unsigned int *addr, *data;</div><div class='add'>+</div><div class='add'>+	addr = ca0113_mmio_init_address_sbz;</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		writel(0x00000000, spec-&gt;mem_base + addr[i]);</div><div class='add'>+</div><div class='add'>+	cur_addr = i;</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		tmp[0] = 0x00880480;</div><div class='add'>+		tmp[1] = 0x00000080;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		tmp[0] = 0x00820680;</div><div class='add'>+		tmp[1] = 0x00000083;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		tmp[0] = 0x00880680;</div><div class='add'>+		tmp[1] = 0x00000083;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		tmp[0] = 0x00000000;</div><div class='add'>+		tmp[1] = 0x00000000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++)</div><div class='add'>+		writel(tmp[i], spec-&gt;mem_base + addr[cur_addr + i]);</div><div class='add'>+</div><div class='add'>+	cur_addr += i;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		count = ARRAY_SIZE(ca0113_mmio_init_data_zxr);</div><div class='add'>+		data = ca0113_mmio_init_data_zxr;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		count = ARRAY_SIZE(ca0113_mmio_init_data_sbz);</div><div class='add'>+		data = ca0113_mmio_init_data_sbz;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		writel(data[i], spec-&gt;mem_base + addr[cur_addr + i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_mmio_init_ae5(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	const unsigned int *addr, *data;</div><div class='add'>+	unsigned int i, count;</div><div class='add'>+</div><div class='add'>+	addr = ca0113_mmio_init_address_ae5;</div><div class='add'>+	data = ca0113_mmio_init_data_ae5;</div><div class='add'>+	count = ARRAY_SIZE(ca0113_mmio_init_data_ae5);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE7) {</div><div class='add'>+		writel(0x00000680, spec-&gt;mem_base + 0x1c);</div><div class='add'>+		writel(0x00880680, spec-&gt;mem_base + 0x1c);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		/*</div><div class='add'>+		 * AE-7 shares all writes with the AE-5, except that it writes</div><div class='add'>+		 * a different value to 0x20c.</div><div class='add'>+		 */</div><div class='add'>+		if (i == 21 &amp;&amp; ca0132_quirk(spec) == QUIRK_AE7) {</div><div class='add'>+			writel(0x00800001, spec-&gt;mem_base + addr[i]);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		writel(data[i], spec-&gt;mem_base + addr[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE5)</div><div class='add'>+		writel(0x00880680, spec-&gt;mem_base + 0x1c);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_mmio_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		ca0132_mmio_init_sbz(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		ca0132_mmio_init_ae5(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const unsigned int ca0132_ae5_register_set_addresses[] = {</div><div class='add'>+	0x304, 0x304, 0x304, 0x304, 0x100, 0x304, 0x100, 0x304, 0x100, 0x304,</div><div class='add'>+	0x100, 0x304, 0x86c, 0x800, 0x86c, 0x800, 0x804</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned char ca0132_ae5_register_set_data[] = {</div><div class='add'>+	0x0f, 0x0e, 0x1f, 0x0c, 0x3f, 0x08, 0x7f, 0x00, 0xff, 0x00, 0x6b,</div><div class='add'>+	0x01, 0x6b, 0x57</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This function writes to some SFR's, does some region2 writes, and then</div><div class='add'>+ * eventually resets the codec with the 0x7ff verb. Not quite sure why it does</div><div class='add'>+ * what it does.</div><div class='add'>+ */</div><div class='add'>+static void ae5_register_set(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int count = ARRAY_SIZE(ca0132_ae5_register_set_addresses);</div><div class='add'>+	const unsigned int *addr = ca0132_ae5_register_set_addresses;</div><div class='add'>+	const unsigned char *data = ca0132_ae5_register_set_data;</div><div class='add'>+	unsigned int i, cur_addr;</div><div class='add'>+	unsigned char tmp[3];</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE7)</div><div class='add'>+		chipio_8051_write_pll_pmu(codec, 0x41, 0xc8);</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_direct(codec, 0x93, 0x10);</div><div class='add'>+	chipio_8051_write_pll_pmu(codec, 0x44, 0xc2);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE7) {</div><div class='add'>+		tmp[0] = 0x03;</div><div class='add'>+		tmp[1] = 0x03;</div><div class='add'>+		tmp[2] = 0x07;</div><div class='add'>+	} else {</div><div class='add'>+		tmp[0] = 0x0f;</div><div class='add'>+		tmp[1] = 0x0f;</div><div class='add'>+		tmp[2] = 0x0f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = cur_addr = 0; i &lt; 3; i++, cur_addr++)</div><div class='add'>+		writeb(tmp[i], spec-&gt;mem_base + addr[cur_addr]);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * First writes are in single bytes, final are in 4 bytes. So, we use</div><div class='add'>+	 * writeb, then writel.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; cur_addr &lt; 12; i++, cur_addr++)</div><div class='add'>+		writeb(data[i], spec-&gt;mem_base + addr[cur_addr]);</div><div class='add'>+</div><div class='add'>+	for (; cur_addr &lt; count; i++, cur_addr++)</div><div class='add'>+		writel(data[i], spec-&gt;mem_base + addr[cur_addr]);</div><div class='add'>+</div><div class='add'>+	writel(0x00800001, spec-&gt;mem_base + 0x20c);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE7) {</div><div class='add'>+		ca0113_mmio_command_set_type2(codec, 0x48, 0x07, 0x83);</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x30, 0x2e, 0x3f);</div><div class='add'>+	} else {</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x30, 0x2d, 0x3f);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chipio_8051_write_direct(codec, 0x90, 0x00);</div><div class='add'>+	chipio_8051_write_direct(codec, 0x90, 0x10);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE5)</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x48, 0x07, 0x83);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Extra init functions for alternative ca0132 codecs. Done</div><div class='add'>+ * here so they don't clutter up the main ca0132_init function</div><div class='add'>+ * anymore than they have to.</div><div class='add'>+ */</div><div class='add'>+static void ca0132_alt_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ca0132_alt_vol_setup(codec);</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		codec_dbg(codec, "SBZ alt_init");</div><div class='add'>+		ca0132_gpio_init(codec);</div><div class='add'>+		sbz_pre_dsp_setup(codec);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;desktop_init_verbs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		codec_dbg(codec, "R3DI alt_init");</div><div class='add'>+		ca0132_gpio_init(codec);</div><div class='add'>+		ca0132_gpio_setup(codec);</div><div class='add'>+		r3di_gpio_dsp_status_set(codec, R3DI_DSP_DOWNLOADING);</div><div class='add'>+		r3di_pre_dsp_setup(codec);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0, 0x6FF, 0xC4);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		r3d_pre_dsp_setup(codec);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;desktop_init_verbs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		ca0132_gpio_init(codec);</div><div class='add'>+		chipio_8051_write_pll_pmu(codec, 0x49, 0x88);</div><div class='add'>+		chipio_write(codec, 0x18b030, 0x00000020);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;desktop_init_verbs);</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		ca0132_gpio_init(codec);</div><div class='add'>+		chipio_8051_write_pll_pmu(codec, 0x49, 0x88);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;desktop_init_verbs);</div><div class='add'>+		chipio_write(codec, 0x18b008, 0x000000f8);</div><div class='add'>+		chipio_write(codec, 0x18b008, 0x000000f0);</div><div class='add'>+		chipio_write(codec, 0x18b030, 0x00000020);</div><div class='add'>+		ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		chipio_8051_write_pll_pmu(codec, 0x49, 0x88);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;desktop_init_verbs);</div><div class='add'>+		zxr_pre_dsp_setup(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i;</div><div class='add'>+	bool dsp_loaded;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the DSP is already downloaded, and init has been entered again,</div><div class='add'>+	 * there's only two reasons for it. One, the codec has awaken from a</div><div class='add'>+	 * suspended state, and in that case dspload_is_loaded will return</div><div class='add'>+	 * false, and the init will be ran again. The other reason it gets</div><div class='add'>+	 * re entered is on startup for some reason it triggers a suspend and</div><div class='add'>+	 * resume state. In this case, it will check if the DSP is downloaded,</div><div class='add'>+	 * and not run the init function again. For codecs using alt_functions,</div><div class='add'>+	 * it will check if the DSP is loaded properly.</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;dsp_state == DSP_DOWNLOADED) {</div><div class='add'>+		dsp_loaded = dspload_is_loaded(codec);</div><div class='add'>+		if (!dsp_loaded) {</div><div class='add'>+			spec-&gt;dsp_reload = true;</div><div class='add'>+			spec-&gt;dsp_state = DSP_DOWNLOAD_INIT;</div><div class='add'>+		} else {</div><div class='add'>+			if (ca0132_quirk(spec) == QUIRK_SBZ)</div><div class='add'>+				sbz_dsp_startup_check(codec);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dsp_state != DSP_DOWNLOAD_FAILED)</div><div class='add'>+		spec-&gt;dsp_state = DSP_DOWNLOAD_INIT;</div><div class='add'>+	spec-&gt;curr_chip_addx = INVALID_CHIP_ADDRESS;</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_pci_mmio(spec))</div><div class='add'>+		ca0132_mmio_init(codec);</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_AE5 || ca0132_quirk(spec) == QUIRK_AE7)</div><div class='add'>+		ae5_register_set(codec);</div><div class='add'>+</div><div class='add'>+	ca0132_init_params(codec);</div><div class='add'>+	ca0132_init_flags(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_sequence_write(codec, spec-&gt;base_init_verbs);</div><div class='add'>+</div><div class='add'>+	if (ca0132_use_alt_functions(spec))</div><div class='add'>+		ca0132_alt_init(codec);</div><div class='add'>+</div><div class='add'>+	ca0132_download_dsp(codec);</div><div class='add'>+</div><div class='add'>+	ca0132_refresh_widget_caps(codec);</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		r3d_setup_defaults(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		sbz_setup_defaults(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		ae5_setup_defaults(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		ae7_setup_defaults(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ca0132_setup_defaults(codec);</div><div class='add'>+		ca0132_init_analog_mic2(codec);</div><div class='add'>+		ca0132_init_dmic(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_outputs; i++)</div><div class='add'>+		init_output(codec, spec-&gt;out_pins[i], spec-&gt;dacs[0]);</div><div class='add'>+</div><div class='add'>+	init_output(codec, cfg-&gt;dig_out_pins[0], spec-&gt;dig_out);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_inputs; i++)</div><div class='add'>+		init_input(codec, spec-&gt;input_pins[i], spec-&gt;adcs[i]);</div><div class='add'>+</div><div class='add'>+	init_input(codec, cfg-&gt;dig_in_pin, spec-&gt;dig_in);</div><div class='add'>+</div><div class='add'>+	if (!ca0132_use_alt_functions(spec)) {</div><div class='add'>+		snd_hda_sequence_write(codec, spec-&gt;chip_init_verbs);</div><div class='add'>+		snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PARAM_EX_ID_SET, 0x0D);</div><div class='add'>+		snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,</div><div class='add'>+			    VENDOR_CHIPIO_PARAM_EX_VALUE_SET, 0x20);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_SBZ)</div><div class='add'>+		ca0132_gpio_setup(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_sequence_write(codec, spec-&gt;spec_init_verbs);</div><div class='add'>+	if (ca0132_use_alt_functions(spec)) {</div><div class='add'>+		ca0132_alt_select_out(codec);</div><div class='add'>+		ca0132_alt_select_in(codec);</div><div class='add'>+	} else {</div><div class='add'>+		ca0132_select_out(codec);</div><div class='add'>+		ca0132_select_mic(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_jack_report_sync(codec);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re set the PlayEnhancement switch on a resume event, because the</div><div class='add'>+	 * controls will not be reloaded.</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;dsp_reload) {</div><div class='add'>+		spec-&gt;dsp_reload = false;</div><div class='add'>+		ca0132_pe_switch_set(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dbpro_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	init_output(codec, cfg-&gt;dig_out_pins[0], spec-&gt;dig_out);</div><div class='add'>+	init_input(codec, cfg-&gt;dig_in_pin, spec-&gt;dig_in);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_inputs; i++)</div><div class='add'>+		init_input(codec, spec-&gt;input_pins[i], spec-&gt;adcs[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_free(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;unsol_hp_work);</div><div class='add'>+	snd_hda_power_up(codec);</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		sbz_exit_chip(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		zxr_exit_chip(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		r3d_exit_chip(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		ae5_exit_chip(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		ae7_exit_chip(codec);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		r3di_gpio_shutdown(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_sequence_write(codec, spec-&gt;base_exit_verbs);</div><div class='add'>+	ca0132_exit_chip(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_power_down(codec);</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (spec-&gt;mem_base)</div><div class='add'>+		pci_iounmap(codec-&gt;bus-&gt;pci, spec-&gt;mem_base);</div><div class='add'>+#endif</div><div class='add'>+	kfree(spec-&gt;spec_init_verbs);</div><div class='add'>+	kfree(codec-&gt;spec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dbpro_free(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	zxr_dbpro_power_state_shutdown(codec);</div><div class='add'>+</div><div class='add'>+	kfree(spec-&gt;spec_init_verbs);</div><div class='add'>+	kfree(codec-&gt;spec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;dacs[0] = 0x2;</div><div class='add'>+	spec-&gt;dacs[1] = 0x3;</div><div class='add'>+	spec-&gt;dacs[2] = 0x4;</div><div class='add'>+</div><div class='add'>+	spec-&gt;multiout.dac_nids = spec-&gt;dacs;</div><div class='add'>+	spec-&gt;multiout.num_dacs = 3;</div><div class='add'>+</div><div class='add'>+	if (!ca0132_use_alt_functions(spec))</div><div class='add'>+		spec-&gt;multiout.max_channels = 2;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;multiout.max_channels = 6;</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_ALIENWARE:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_ALIENWARE applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, alienware_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_SBZ applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, sbz_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_ZXR applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, zxr_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_R3D applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, r3d_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_R3DI applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, r3di_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, ae5_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		codec_dbg(codec, "%s: QUIRK_AE7 applied.\n", __func__);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, ae7_pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_ALIENWARE:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0b; /* speaker out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x0f;</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = 0x0f;</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x7; /* digital mic / analog mic1 */</div><div class='add'>+		spec-&gt;adcs[1] = 0x8; /* analog mic2 */</div><div class='add'>+		spec-&gt;adcs[2] = 0xa; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 3;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12;</div><div class='add'>+		spec-&gt;input_pins[1] = 0x11;</div><div class='add'>+		spec-&gt;input_pins[2] = 0x13;</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = 0x11;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0B; /* Line out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x0F; /* Rear headphone out */</div><div class='add'>+		spec-&gt;out_pins[2] = 0x10; /* Front Headphone / Center/LFE*/</div><div class='add'>+		spec-&gt;out_pins[3] = 0x11; /* Rear surround */</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = spec-&gt;out_pins[1];</div><div class='add'>+		spec-&gt;unsol_tag_front_hp = spec-&gt;out_pins[2];</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x7; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;adcs[1] = 0x8; /* Front Mic, but only if no DSP */</div><div class='add'>+		spec-&gt;adcs[2] = 0xa; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 2;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;input_pins[1] = 0x13; /* What U Hear */</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = spec-&gt;input_pins[0];</div><div class='add'>+</div><div class='add'>+		/* SPDIF I/O */</div><div class='add'>+		spec-&gt;dig_out = 0x05;</div><div class='add'>+		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='add'>+		spec-&gt;dig_in = 0x09;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0B; /* Line out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x0F; /* Rear headphone out */</div><div class='add'>+		spec-&gt;out_pins[2] = 0x10; /* Center/LFE */</div><div class='add'>+		spec-&gt;out_pins[3] = 0x11; /* Rear surround */</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = spec-&gt;out_pins[1];</div><div class='add'>+		spec-&gt;unsol_tag_front_hp = spec-&gt;out_pins[2];</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x7; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;adcs[1] = 0x8; /* Not connected, no front mic */</div><div class='add'>+		spec-&gt;adcs[2] = 0xa; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 2;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;input_pins[1] = 0x13; /* What U Hear */</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = spec-&gt;input_pins[0];</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR_DBPRO:</div><div class='add'>+		spec-&gt;adcs[0] = 0x8; /* ZxR DBPro Aux In */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 1;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x11; /* RCA Line-in */</div><div class='add'>+</div><div class='add'>+		spec-&gt;dig_out = 0x05;</div><div class='add'>+		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='add'>+</div><div class='add'>+		spec-&gt;dig_in = 0x09;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0B; /* Line out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x11; /* Rear headphone out */</div><div class='add'>+		spec-&gt;out_pins[2] = 0x10; /* Front Headphone / Center/LFE*/</div><div class='add'>+		spec-&gt;out_pins[3] = 0x0F; /* Rear surround */</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = spec-&gt;out_pins[1];</div><div class='add'>+		spec-&gt;unsol_tag_front_hp = spec-&gt;out_pins[2];</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x7; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;adcs[1] = 0x8; /* Front Mic, but only if no DSP */</div><div class='add'>+		spec-&gt;adcs[2] = 0xa; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 2;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;input_pins[1] = 0x13; /* What U Hear */</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = spec-&gt;input_pins[0];</div><div class='add'>+</div><div class='add'>+		/* SPDIF I/O */</div><div class='add'>+		spec-&gt;dig_out = 0x05;</div><div class='add'>+		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0B; /* Line out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x0F; /* Rear headphone out */</div><div class='add'>+		spec-&gt;out_pins[2] = 0x10; /* Front Headphone / Center/LFE*/</div><div class='add'>+		spec-&gt;out_pins[3] = 0x11; /* Rear surround */</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = spec-&gt;out_pins[1];</div><div class='add'>+		spec-&gt;unsol_tag_front_hp = spec-&gt;out_pins[2];</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x07; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;adcs[1] = 0x08; /* Front Mic, but only if no DSP */</div><div class='add'>+		spec-&gt;adcs[2] = 0x0a; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 2;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12; /* Rear Mic / Line-in */</div><div class='add'>+		spec-&gt;input_pins[1] = 0x13; /* What U Hear */</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = spec-&gt;input_pins[0];</div><div class='add'>+</div><div class='add'>+		/* SPDIF I/O */</div><div class='add'>+		spec-&gt;dig_out = 0x05;</div><div class='add'>+		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spec-&gt;num_outputs = 2;</div><div class='add'>+		spec-&gt;out_pins[0] = 0x0b; /* speaker out */</div><div class='add'>+		spec-&gt;out_pins[1] = 0x10; /* headphone out */</div><div class='add'>+		spec-&gt;shared_out_nid = 0x2;</div><div class='add'>+		spec-&gt;unsol_tag_hp = spec-&gt;out_pins[1];</div><div class='add'>+</div><div class='add'>+		spec-&gt;adcs[0] = 0x7; /* digital mic / analog mic1 */</div><div class='add'>+		spec-&gt;adcs[1] = 0x8; /* analog mic2 */</div><div class='add'>+		spec-&gt;adcs[2] = 0xa; /* what u hear */</div><div class='add'>+</div><div class='add'>+		spec-&gt;num_inputs = 3;</div><div class='add'>+		spec-&gt;input_pins[0] = 0x12;</div><div class='add'>+		spec-&gt;input_pins[1] = 0x11;</div><div class='add'>+		spec-&gt;input_pins[2] = 0x13;</div><div class='add'>+		spec-&gt;shared_mic_nid = 0x7;</div><div class='add'>+		spec-&gt;unsol_tag_amic1 = spec-&gt;input_pins[0];</div><div class='add'>+</div><div class='add'>+		/* SPDIF I/O */</div><div class='add'>+		spec-&gt;dig_out = 0x05;</div><div class='add'>+		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='add'>+		spec-&gt;dig_in = 0x09;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_prepare_verbs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+/* Verbs + terminator (an empty element) */</div><div class='add'>+#define NUM_SPEC_VERBS 2</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;chip_init_verbs = ca0132_init_verbs0;</div><div class='add'>+	/*</div><div class='add'>+	 * Since desktop cards use pci_mmio, this can be used to determine</div><div class='add'>+	 * whether or not to use these verbs instead of a separate bool.</div><div class='add'>+	 */</div><div class='add'>+	if (ca0132_use_pci_mmio(spec))</div><div class='add'>+		spec-&gt;desktop_init_verbs = ca0132_init_verbs1;</div><div class='add'>+	spec-&gt;spec_init_verbs = kcalloc(NUM_SPEC_VERBS,</div><div class='add'>+					sizeof(struct hda_verb),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!spec-&gt;spec_init_verbs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* config EAPD */</div><div class='add'>+	spec-&gt;spec_init_verbs[0].nid = 0x0b;</div><div class='add'>+	spec-&gt;spec_init_verbs[0].param = 0x78D;</div><div class='add'>+	spec-&gt;spec_init_verbs[0].verb = 0x00;</div><div class='add'>+</div><div class='add'>+	/* Previously commented configuration */</div><div class='add'>+	/*</div><div class='add'>+	spec-&gt;spec_init_verbs[2].nid = 0x0b;</div><div class='add'>+	spec-&gt;spec_init_verbs[2].param = AC_VERB_SET_EAPD_BTLENABLE;</div><div class='add'>+	spec-&gt;spec_init_verbs[2].verb = 0x02;</div><div class='add'>+</div><div class='add'>+	spec-&gt;spec_init_verbs[3].nid = 0x10;</div><div class='add'>+	spec-&gt;spec_init_verbs[3].param = 0x78D;</div><div class='add'>+	spec-&gt;spec_init_verbs[3].verb = 0x02;</div><div class='add'>+</div><div class='add'>+	spec-&gt;spec_init_verbs[4].nid = 0x10;</div><div class='add'>+	spec-&gt;spec_init_verbs[4].param = AC_VERB_SET_EAPD_BTLENABLE;</div><div class='add'>+	spec-&gt;spec_init_verbs[4].verb = 0x02;</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* Terminator: spec-&gt;spec_init_verbs[NUM_SPEC_VERBS-1] */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The Sound Blaster ZxR shares the same PCI subsystem ID as some regular</div><div class='add'>+ * Sound Blaster Z cards. However, they have different HDA codec subsystem</div><div class='add'>+ * ID's. So, we check for the ZxR's subsystem ID, as well as the DBPro</div><div class='add'>+ * daughter boards ID.</div><div class='add'>+ */</div><div class='add'>+static void sbz_detect_quirk(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	switch (codec-&gt;core.subsystem_id) {</div><div class='add'>+	case 0x11020033:</div><div class='add'>+		codec-&gt;fixup_id = QUIRK_ZXR;</div><div class='add'>+		break;</div><div class='add'>+	case 0x1102003f:</div><div class='add'>+		codec-&gt;fixup_id = QUIRK_ZXR_DBPRO;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		codec-&gt;fixup_id = QUIRK_SBZ;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ca0132_codec_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ZXR_DBPRO)</div><div class='add'>+		return dbpro_free(codec);</div><div class='add'>+	else</div><div class='add'>+		return ca0132_free(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_codec_probe(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	spec-&gt;codec = codec;</div><div class='add'>+</div><div class='add'>+	/* Detect codec quirk */</div><div class='add'>+	snd_hda_pick_fixup(codec, ca0132_quirk_models, ca0132_quirks, NULL);</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_SBZ)</div><div class='add'>+		sbz_detect_quirk(codec);</div><div class='add'>+</div><div class='add'>+	codec-&gt;pcm_format_first = 1;</div><div class='add'>+	codec-&gt;no_sticky_stream = 1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	spec-&gt;dsp_state = DSP_DOWNLOAD_INIT;</div><div class='add'>+	spec-&gt;num_mixers = 1;</div><div class='add'>+</div><div class='add'>+	/* Set which mixers each quirk uses. */</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+		spec-&gt;mixers[0] = desktop_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Sound Blaster Z");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		spec-&gt;mixers[0] = desktop_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Sound Blaster ZxR");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_ZXR_DBPRO:</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+		spec-&gt;mixers[0] = desktop_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Recon3D");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		spec-&gt;mixers[0] = r3di_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Recon3Di");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+		spec-&gt;mixers[0] = desktop_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Sound BlasterX AE-5");</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+		spec-&gt;mixers[0] = desktop_mixer;</div><div class='add'>+		snd_hda_codec_set_name(codec, "Sound Blaster AE-7");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spec-&gt;mixers[0] = ca0132_mixer;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup whether or not to use alt functions/controls/pci_mmio */</div><div class='add'>+	switch (ca0132_quirk(spec)) {</div><div class='add'>+	case QUIRK_SBZ:</div><div class='add'>+	case QUIRK_R3D:</div><div class='add'>+	case QUIRK_AE5:</div><div class='add'>+	case QUIRK_AE7:</div><div class='add'>+	case QUIRK_ZXR:</div><div class='add'>+		spec-&gt;use_alt_controls = true;</div><div class='add'>+		spec-&gt;use_alt_functions = true;</div><div class='add'>+		spec-&gt;use_pci_mmio = true;</div><div class='add'>+		break;</div><div class='add'>+	case QUIRK_R3DI:</div><div class='add'>+		spec-&gt;use_alt_controls = true;</div><div class='add'>+		spec-&gt;use_alt_functions = true;</div><div class='add'>+		spec-&gt;use_pci_mmio = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		spec-&gt;use_alt_controls = false;</div><div class='add'>+		spec-&gt;use_alt_functions = false;</div><div class='add'>+		spec-&gt;use_pci_mmio = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PCI</div><div class='add'>+	if (spec-&gt;use_pci_mmio) {</div><div class='add'>+		spec-&gt;mem_base = pci_iomap(codec-&gt;bus-&gt;pci, 2, 0xC20);</div><div class='add'>+		if (spec-&gt;mem_base == NULL) {</div><div class='add'>+			codec_warn(codec, "pci_iomap failed! Setting quirk to QUIRK_NONE.");</div><div class='add'>+			codec-&gt;fixup_id = QUIRK_NONE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spec-&gt;base_init_verbs = ca0132_base_init_verbs;</div><div class='add'>+	spec-&gt;base_exit_verbs = ca0132_base_exit_verbs;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;spec-&gt;unsol_hp_work, ca0132_unsol_hp_delayed);</div><div class='add'>+</div><div class='add'>+	ca0132_init_chip(codec);</div><div class='add'>+</div><div class='add'>+	ca0132_config(codec);</div><div class='add'>+</div><div class='add'>+	err = ca0132_prepare_verbs(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ca0132_setup_unsol(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	ca0132_codec_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_codec_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ZXR_DBPRO)</div><div class='add'>+		return dbpro_build_controls(codec);</div><div class='add'>+	else</div><div class='add'>+		return ca0132_build_controls(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_codec_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ZXR_DBPRO)</div><div class='add'>+		return dbpro_build_pcms(codec);</div><div class='add'>+	else</div><div class='add'>+		return ca0132_build_pcms(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_codec_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (ca0132_quirk(spec) == QUIRK_ZXR_DBPRO)</div><div class='add'>+		return dbpro_init(codec);</div><div class='add'>+	else</div><div class='add'>+		return ca0132_init(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ca0132_codec_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct ca0132_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;unsol_hp_work);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops ca0132_codec_ops = {</div><div class='add'>+	.probe = ca0132_codec_probe,</div><div class='add'>+	.remove = ca0132_codec_remove,</div><div class='add'>+	.build_controls = ca0132_codec_build_controls,</div><div class='add'>+	.build_pcms = ca0132_codec_build_pcms,</div><div class='add'>+	.init = ca0132_codec_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = ca0132_codec_suspend,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_ca0132[] = {</div><div class='add'>+	HDA_CODEC_ID(0x11020011, "CA0132"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_ca0132);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Creative Sound Core3D codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver ca0132_driver = {</div><div class='add'>+	.id = snd_hda_id_ca0132,</div><div class='add'>+	.ops = &amp;ca0132_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(ca0132_driver);</div><div class='head'>diff --git a/sound/hda/codecs/ca0132_regs.h b/sound/hda/codecs/ca0132_regs.h<br/>new file mode 100644<br/>index 000000000000..dc0153df3d5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/ca0132_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/ca0132_regs.h</a></div><div class='hunk'>@@ -0,0 +1,396 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Creative CA0132 chip.</div><div class='add'>+ * CA0132 registers defines.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011, Creative Technology Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CA0132_REGS_H</div><div class='add'>+#define __CA0132_REGS_H</div><div class='add'>+</div><div class='add'>+#define DSP_CHIP_OFFSET                0x100000</div><div class='add'>+#define DSP_DBGCNTL_MODULE_OFFSET      0xE30</div><div class='add'>+#define DSP_DBGCNTL_INST_OFFSET \</div><div class='add'>+	(DSP_CHIP_OFFSET + DSP_DBGCNTL_MODULE_OFFSET)</div><div class='add'>+</div><div class='add'>+#define DSP_DBGCNTL_EXEC_LOBIT         0x0</div><div class='add'>+#define DSP_DBGCNTL_EXEC_HIBIT         0x3</div><div class='add'>+#define DSP_DBGCNTL_EXEC_MASK          0xF</div><div class='add'>+</div><div class='add'>+#define DSP_DBGCNTL_SS_LOBIT           0x4</div><div class='add'>+#define DSP_DBGCNTL_SS_HIBIT           0x7</div><div class='add'>+#define DSP_DBGCNTL_SS_MASK            0xF0</div><div class='add'>+</div><div class='add'>+#define DSP_DBGCNTL_STATE_LOBIT        0xA</div><div class='add'>+#define DSP_DBGCNTL_STATE_HIBIT        0xD</div><div class='add'>+#define DSP_DBGCNTL_STATE_MASK         0x3C00</div><div class='add'>+</div><div class='add'>+#define XRAM_CHIP_OFFSET               0x0</div><div class='add'>+#define XRAM_XRAM_CHANNEL_COUNT        0xE000</div><div class='add'>+#define XRAM_XRAM_MODULE_OFFSET        0x0</div><div class='add'>+#define XRAM_XRAM_CHAN_INCR            4</div><div class='add'>+#define XRAM_XRAM_INST_OFFSET(_chan) \</div><div class='add'>+	(XRAM_CHIP_OFFSET + XRAM_XRAM_MODULE_OFFSET + \</div><div class='add'>+	(_chan * XRAM_XRAM_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define YRAM_CHIP_OFFSET               0x40000</div><div class='add'>+#define YRAM_YRAM_CHANNEL_COUNT        0x8000</div><div class='add'>+#define YRAM_YRAM_MODULE_OFFSET        0x0</div><div class='add'>+#define YRAM_YRAM_CHAN_INCR            4</div><div class='add'>+#define YRAM_YRAM_INST_OFFSET(_chan) \</div><div class='add'>+	(YRAM_CHIP_OFFSET + YRAM_YRAM_MODULE_OFFSET + \</div><div class='add'>+	(_chan * YRAM_YRAM_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define UC_CHIP_OFFSET                 0x80000</div><div class='add'>+#define UC_UC_CHANNEL_COUNT            0x10000</div><div class='add'>+#define UC_UC_MODULE_OFFSET            0x0</div><div class='add'>+#define UC_UC_CHAN_INCR                4</div><div class='add'>+#define UC_UC_INST_OFFSET(_chan) \</div><div class='add'>+	(UC_CHIP_OFFSET + UC_UC_MODULE_OFFSET + \</div><div class='add'>+	(_chan * UC_UC_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define AXRAM_CHIP_OFFSET              0x3C000</div><div class='add'>+#define AXRAM_AXRAM_CHANNEL_COUNT      0x1000</div><div class='add'>+#define AXRAM_AXRAM_MODULE_OFFSET      0x0</div><div class='add'>+#define AXRAM_AXRAM_CHAN_INCR          4</div><div class='add'>+#define AXRAM_AXRAM_INST_OFFSET(_chan) \</div><div class='add'>+	(AXRAM_CHIP_OFFSET + AXRAM_AXRAM_MODULE_OFFSET + \</div><div class='add'>+	(_chan * AXRAM_AXRAM_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define AYRAM_CHIP_OFFSET              0x78000</div><div class='add'>+#define AYRAM_AYRAM_CHANNEL_COUNT      0x1000</div><div class='add'>+#define AYRAM_AYRAM_MODULE_OFFSET      0x0</div><div class='add'>+#define AYRAM_AYRAM_CHAN_INCR          4</div><div class='add'>+#define AYRAM_AYRAM_INST_OFFSET(_chan) \</div><div class='add'>+	(AYRAM_CHIP_OFFSET + AYRAM_AYRAM_MODULE_OFFSET + \</div><div class='add'>+	(_chan * AYRAM_AYRAM_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHIP_OFFSET            0x110000</div><div class='add'>+#define DSPDMAC_DMA_CFG_CHANNEL_COUNT  12</div><div class='add'>+#define DSPDMAC_DMACFG_MODULE_OFFSET   0xF00</div><div class='add'>+#define DSPDMAC_DMACFG_CHAN_INCR       0x10</div><div class='add'>+#define DSPDMAC_DMACFG_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_DMACFG_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_DMACFG_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_DBADR_LOBIT     0x0</div><div class='add'>+#define DSPDMAC_DMACFG_DBADR_HIBIT     0x10</div><div class='add'>+#define DSPDMAC_DMACFG_DBADR_MASK      0x1FFFF</div><div class='add'>+#define DSPDMAC_DMACFG_LP_LOBIT        0x11</div><div class='add'>+#define DSPDMAC_DMACFG_LP_HIBIT        0x11</div><div class='add'>+#define DSPDMAC_DMACFG_LP_MASK         0x20000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AINCR_LOBIT     0x12</div><div class='add'>+#define DSPDMAC_DMACFG_AINCR_HIBIT     0x12</div><div class='add'>+#define DSPDMAC_DMACFG_AINCR_MASK      0x40000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_DWR_LOBIT       0x13</div><div class='add'>+#define DSPDMAC_DMACFG_DWR_HIBIT       0x13</div><div class='add'>+#define DSPDMAC_DMACFG_DWR_MASK        0x80000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AJUMP_LOBIT     0x14</div><div class='add'>+#define DSPDMAC_DMACFG_AJUMP_HIBIT     0x17</div><div class='add'>+#define DSPDMAC_DMACFG_AJUMP_MASK      0xF00000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_LOBIT     0x18</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_HIBIT     0x19</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_MASK      0x3000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_LK_LOBIT        0x1A</div><div class='add'>+#define DSPDMAC_DMACFG_LK_HIBIT        0x1A</div><div class='add'>+#define DSPDMAC_DMACFG_LK_MASK         0x4000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AICS_LOBIT      0x1B</div><div class='add'>+#define DSPDMAC_DMACFG_AICS_HIBIT      0x1F</div><div class='add'>+#define DSPDMAC_DMACFG_AICS_MASK       0xF8000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_LP_SINGLE                 0</div><div class='add'>+#define DSPDMAC_DMACFG_LP_LOOPING                1</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AINCR_XANDY               0</div><div class='add'>+#define DSPDMAC_DMACFG_AINCR_XORY                1</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_DWR_DMA_RD                0</div><div class='add'>+#define DSPDMAC_DMACFG_DWR_DMA_WR                1</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_LINEAR              0</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_RSV1                1</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_WINTLV              2</div><div class='add'>+#define DSPDMAC_DMACFG_AMODE_GINTLV              3</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSP_ADR_OFS_CHANNEL_COUNT 12</div><div class='add'>+#define DSPDMAC_DSPADROFS_MODULE_OFFSET 0xF04</div><div class='add'>+#define DSPDMAC_DSPADROFS_CHAN_INCR    0x10</div><div class='add'>+#define DSPDMAC_DSPADROFS_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_DSPADROFS_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_DSPADROFS_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADROFS_COFS_LOBIT   0x0</div><div class='add'>+#define DSPDMAC_DSPADROFS_COFS_HIBIT   0xF</div><div class='add'>+#define DSPDMAC_DSPADROFS_COFS_MASK    0xFFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADROFS_BOFS_LOBIT   0x10</div><div class='add'>+#define DSPDMAC_DSPADROFS_BOFS_HIBIT   0x1F</div><div class='add'>+#define DSPDMAC_DSPADROFS_BOFS_MASK    0xFFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSP_ADR_WOFS_CHANNEL_COUNT 12</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_MODULE_OFFSET 0xF04</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_CHAN_INCR   0x10</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_DSPADRWOFS_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_DSPADRWOFS_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCOFS_LOBIT 0x0</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCOFS_HIBIT 0xA</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCOFS_MASK  0x7FF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCBFR_LOBIT 0xB</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCBFR_HIBIT 0xF</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WCBFR_MASK  0xF800</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBOFS_LOBIT 0x10</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBOFS_HIBIT 0x1A</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBOFS_MASK  0x7FF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBBFR_LOBIT 0x1B</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBBFR_HIBIT 0x1F</div><div class='add'>+#define DSPDMAC_DSPADRWOFS_WBBFR_MASK  0xF8000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSP_ADR_GOFS_CHANNEL_COUNT 12</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_MODULE_OFFSET 0xF04</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_CHAN_INCR   0x10</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_DSPADRGOFS_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_DSPADRGOFS_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCOFS_LOBIT 0x0</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCOFS_HIBIT 0x9</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCOFS_MASK  0x3FF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCS_LOBIT   0xA</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCS_HIBIT   0xC</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCS_MASK    0x1C00</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCBFR_LOBIT 0xD</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCBFR_HIBIT 0xF</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GCBFR_MASK  0xE000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBOFS_LOBIT 0x10</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBOFS_HIBIT 0x19</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBOFS_MASK  0x3FF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBS_LOBIT   0x1A</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBS_HIBIT   0x1C</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBS_MASK    0x1C000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBBFR_LOBIT 0x1D</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBBFR_HIBIT 0x1F</div><div class='add'>+#define DSPDMAC_DSPADRGOFS_GBBFR_MASK  0xE0000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_XFR_CNT_CHANNEL_COUNT  12</div><div class='add'>+#define DSPDMAC_XFRCNT_MODULE_OFFSET   0xF08</div><div class='add'>+#define DSPDMAC_XFRCNT_CHAN_INCR       0x10</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_XFRCNT_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_XFRCNT_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_XFRCNT_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_XFRCNT_CCNT_LOBIT      0x0</div><div class='add'>+#define DSPDMAC_XFRCNT_CCNT_HIBIT      0xF</div><div class='add'>+#define DSPDMAC_XFRCNT_CCNT_MASK       0xFFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_XFRCNT_BCNT_LOBIT      0x10</div><div class='add'>+#define DSPDMAC_XFRCNT_BCNT_HIBIT      0x1F</div><div class='add'>+#define DSPDMAC_XFRCNT_BCNT_MASK       0xFFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_IRQ_CNT_CHANNEL_COUNT  12</div><div class='add'>+#define DSPDMAC_IRQCNT_MODULE_OFFSET   0xF0C</div><div class='add'>+#define DSPDMAC_IRQCNT_CHAN_INCR       0x10</div><div class='add'>+#define DSPDMAC_IRQCNT_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_IRQCNT_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_IRQCNT_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_IRQCNT_CICNT_LOBIT     0x0</div><div class='add'>+#define DSPDMAC_IRQCNT_CICNT_HIBIT     0xF</div><div class='add'>+#define DSPDMAC_IRQCNT_CICNT_MASK      0xFFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_IRQCNT_BICNT_LOBIT     0x10</div><div class='add'>+#define DSPDMAC_IRQCNT_BICNT_HIBIT     0x1F</div><div class='add'>+#define DSPDMAC_IRQCNT_BICNT_MASK      0xFFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_AUD_CHSEL_CHANNEL_COUNT 12</div><div class='add'>+#define DSPDMAC_AUDCHSEL_MODULE_OFFSET 0xFC0</div><div class='add'>+#define DSPDMAC_AUDCHSEL_CHAN_INCR     0x4</div><div class='add'>+#define DSPDMAC_AUDCHSEL_INST_OFFSET(_chan) \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_AUDCHSEL_MODULE_OFFSET + \</div><div class='add'>+	(_chan * DSPDMAC_AUDCHSEL_CHAN_INCR))</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_AUDCHSEL_ACS_LOBIT     0x0</div><div class='add'>+#define DSPDMAC_AUDCHSEL_ACS_HIBIT     0x1F</div><div class='add'>+#define DSPDMAC_AUDCHSEL_ACS_MASK      0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTART_MODULE_OFFSET 0xFF0</div><div class='add'>+#define DSPDMAC_CHNLSTART_INST_OFFSET \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_CHNLSTART_MODULE_OFFSET)</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTART_EN_LOBIT     0x0</div><div class='add'>+#define DSPDMAC_CHNLSTART_EN_HIBIT     0xB</div><div class='add'>+#define DSPDMAC_CHNLSTART_EN_MASK      0xFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI1_LOBIT   0xC</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI1_HIBIT   0xF</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI1_MASK    0xF000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTART_DIS_LOBIT    0x10</div><div class='add'>+#define DSPDMAC_CHNLSTART_DIS_HIBIT    0x1B</div><div class='add'>+#define DSPDMAC_CHNLSTART_DIS_MASK     0xFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI2_LOBIT   0x1C</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI2_HIBIT   0x1F</div><div class='add'>+#define DSPDMAC_CHNLSTART_VAI2_MASK    0xF0000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_MODULE_OFFSET 0xFF4</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_INST_OFFSET \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_CHNLSTATUS_MODULE_OFFSET)</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_ISC_LOBIT   0x0</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_ISC_HIBIT   0xB</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_ISC_MASK    0xFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOO_LOBIT   0xC</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOO_HIBIT   0xC</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOO_MASK    0x1000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOU_LOBIT   0xD</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOU_HIBIT   0xD</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AOU_MASK    0x2000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIO_LOBIT   0xE</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIO_HIBIT   0xE</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIO_MASK    0x4000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIU_LOBIT   0xF</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIU_HIBIT   0xF</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_AIU_MASK    0x8000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_IEN_LOBIT   0x10</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_IEN_HIBIT   0x1B</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_IEN_MASK    0xFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_VAI0_LOBIT  0x1C</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_VAI0_HIBIT  0x1F</div><div class='add'>+#define DSPDMAC_CHNLSTATUS_VAI0_MASK   0xF0000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_MODULE_OFFSET 0xFF8</div><div class='add'>+#define DSPDMAC_CHNLPROP_INST_OFFSET \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_CHNLPROP_MODULE_OFFSET)</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_DCON_LOBIT    0x0</div><div class='add'>+#define DSPDMAC_CHNLPROP_DCON_HIBIT    0xB</div><div class='add'>+#define DSPDMAC_CHNLPROP_DCON_MASK     0xFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_FFS_LOBIT     0xC</div><div class='add'>+#define DSPDMAC_CHNLPROP_FFS_HIBIT     0xC</div><div class='add'>+#define DSPDMAC_CHNLPROP_FFS_MASK      0x1000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_NAJ_LOBIT     0xD</div><div class='add'>+#define DSPDMAC_CHNLPROP_NAJ_HIBIT     0xD</div><div class='add'>+#define DSPDMAC_CHNLPROP_NAJ_MASK      0x2000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_ENH_LOBIT     0xE</div><div class='add'>+#define DSPDMAC_CHNLPROP_ENH_HIBIT     0xE</div><div class='add'>+#define DSPDMAC_CHNLPROP_ENH_MASK      0x4000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_MSPCE_LOBIT   0x10</div><div class='add'>+#define DSPDMAC_CHNLPROP_MSPCE_HIBIT   0x1B</div><div class='add'>+#define DSPDMAC_CHNLPROP_MSPCE_MASK    0xFFF0000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_CHNLPROP_AC_LOBIT      0x1C</div><div class='add'>+#define DSPDMAC_CHNLPROP_AC_HIBIT      0x1F</div><div class='add'>+#define DSPDMAC_CHNLPROP_AC_MASK       0xF0000000</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_ACTIVE_MODULE_OFFSET   0xFFC</div><div class='add'>+#define DSPDMAC_ACTIVE_INST_OFFSET \</div><div class='add'>+	(DSPDMAC_CHIP_OFFSET + DSPDMAC_ACTIVE_MODULE_OFFSET)</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_ACTIVE_AAR_LOBIT       0x0</div><div class='add'>+#define DSPDMAC_ACTIVE_AAR_HIBIT       0xB</div><div class='add'>+#define DSPDMAC_ACTIVE_AAR_MASK        0xFFF</div><div class='add'>+</div><div class='add'>+#define DSPDMAC_ACTIVE_WFR_LOBIT       0xC</div><div class='add'>+#define DSPDMAC_ACTIVE_WFR_HIBIT       0x17</div><div class='add'>+#define DSPDMAC_ACTIVE_WFR_MASK        0xFFF000</div><div class='add'>+</div><div class='add'>+#define DSP_AUX_MEM_BASE            0xE000</div><div class='add'>+#define INVALID_CHIP_ADDRESS        (~0U)</div><div class='add'>+</div><div class='add'>+#define X_SIZE  (XRAM_XRAM_CHANNEL_COUNT   * XRAM_XRAM_CHAN_INCR)</div><div class='add'>+#define Y_SIZE  (YRAM_YRAM_CHANNEL_COUNT   * YRAM_YRAM_CHAN_INCR)</div><div class='add'>+#define AX_SIZE (AXRAM_AXRAM_CHANNEL_COUNT * AXRAM_AXRAM_CHAN_INCR)</div><div class='add'>+#define AY_SIZE (AYRAM_AYRAM_CHANNEL_COUNT * AYRAM_AYRAM_CHAN_INCR)</div><div class='add'>+#define UC_SIZE (UC_UC_CHANNEL_COUNT       * UC_UC_CHAN_INCR)</div><div class='add'>+</div><div class='add'>+#define XEXT_SIZE (X_SIZE + AX_SIZE)</div><div class='add'>+#define YEXT_SIZE (Y_SIZE + AY_SIZE)</div><div class='add'>+</div><div class='add'>+#define U64K 0x10000UL</div><div class='add'>+</div><div class='add'>+#define X_END  (XRAM_CHIP_OFFSET  + X_SIZE)</div><div class='add'>+#define X_EXT  (XRAM_CHIP_OFFSET  + XEXT_SIZE)</div><div class='add'>+#define AX_END (XRAM_CHIP_OFFSET  + U64K*4)</div><div class='add'>+</div><div class='add'>+#define Y_END  (YRAM_CHIP_OFFSET  + Y_SIZE)</div><div class='add'>+#define Y_EXT  (YRAM_CHIP_OFFSET  + YEXT_SIZE)</div><div class='add'>+#define AY_END (YRAM_CHIP_OFFSET  + U64K*4)</div><div class='add'>+</div><div class='add'>+#define UC_END (UC_CHIP_OFFSET    + UC_SIZE)</div><div class='add'>+</div><div class='add'>+#define X_RANGE_MAIN(a, s) \</div><div class='add'>+	(((a)+((s)-1)*XRAM_XRAM_CHAN_INCR &lt;  X_END))</div><div class='add'>+#define X_RANGE_AUX(a, s)  \</div><div class='add'>+	(((a) &gt;= X_END) &amp;&amp; ((a)+((s)-1)*XRAM_XRAM_CHAN_INCR &lt; AX_END))</div><div class='add'>+#define X_RANGE_EXT(a, s)  \</div><div class='add'>+	(((a)+((s)-1)*XRAM_XRAM_CHAN_INCR &lt;  X_EXT))</div><div class='add'>+#define X_RANGE_ALL(a, s)  \</div><div class='add'>+	(((a)+((s)-1)*XRAM_XRAM_CHAN_INCR &lt; AX_END))</div><div class='add'>+</div><div class='add'>+#define Y_RANGE_MAIN(a, s) \</div><div class='add'>+	(((a) &gt;= YRAM_CHIP_OFFSET) &amp;&amp; \</div><div class='add'>+	((a)+((s)-1)*YRAM_YRAM_CHAN_INCR &lt;  Y_END))</div><div class='add'>+#define Y_RANGE_AUX(a, s)  \</div><div class='add'>+	(((a) &gt;= Y_END) &amp;&amp; \</div><div class='add'>+	((a)+((s)-1)*YRAM_YRAM_CHAN_INCR &lt; AY_END))</div><div class='add'>+#define Y_RANGE_EXT(a, s)  \</div><div class='add'>+	(((a) &gt;= YRAM_CHIP_OFFSET) &amp;&amp; \</div><div class='add'>+	((a)+((s)-1)*YRAM_YRAM_CHAN_INCR &lt;  Y_EXT))</div><div class='add'>+#define Y_RANGE_ALL(a, s)  \</div><div class='add'>+	(((a) &gt;= YRAM_CHIP_OFFSET) &amp;&amp; \</div><div class='add'>+	((a)+((s)-1)*YRAM_YRAM_CHAN_INCR &lt; AY_END))</div><div class='add'>+</div><div class='add'>+#define UC_RANGE(a, s) \</div><div class='add'>+	(((a) &gt;= UC_CHIP_OFFSET) &amp;&amp; \</div><div class='add'>+	((a)+((s)-1)*UC_UC_CHAN_INCR     &lt; UC_END))</div><div class='add'>+</div><div class='add'>+#define X_OFF(a) \</div><div class='add'>+	(((a) - XRAM_CHIP_OFFSET) / XRAM_XRAM_CHAN_INCR)</div><div class='add'>+#define AX_OFF(a) \</div><div class='add'>+	(((a) % (AXRAM_AXRAM_CHANNEL_COUNT * \</div><div class='add'>+	AXRAM_AXRAM_CHAN_INCR)) / AXRAM_AXRAM_CHAN_INCR)</div><div class='add'>+</div><div class='add'>+#define Y_OFF(a) \</div><div class='add'>+	(((a) - YRAM_CHIP_OFFSET) / YRAM_YRAM_CHAN_INCR)</div><div class='add'>+#define AY_OFF(a) \</div><div class='add'>+	(((a) % (AYRAM_AYRAM_CHANNEL_COUNT * \</div><div class='add'>+	AYRAM_AYRAM_CHAN_INCR)) / AYRAM_AYRAM_CHAN_INCR)</div><div class='add'>+</div><div class='add'>+#define UC_OFF(a)  (((a) - UC_CHIP_OFFSET) / UC_UC_CHAN_INCR)</div><div class='add'>+</div><div class='add'>+#define X_EXT_MAIN_SIZE(a)  (XRAM_XRAM_CHANNEL_COUNT - X_OFF(a))</div><div class='add'>+#define X_EXT_AUX_SIZE(a, s) ((s) - X_EXT_MAIN_SIZE(a))</div><div class='add'>+</div><div class='add'>+#define Y_EXT_MAIN_SIZE(a)  (YRAM_YRAM_CHANNEL_COUNT - Y_OFF(a))</div><div class='add'>+#define Y_EXT_AUX_SIZE(a, s) ((s) - Y_EXT_MAIN_SIZE(a))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/Kconfig b/sound/hda/codecs/cirrus/Kconfig<br/>new file mode 100644<br/>index 000000000000..ec6cbcaf64f0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+menuconfig SND_HDA_CODEC_CIRRUS</div><div class='add'>+	tristate "Cirrus Logic HD-audio codec support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Cirrus Logic HD-audio codec support.</div><div class='add'>+</div><div class='add'>+	  This will enable both CS420x and CS421x HD-audio codec drivers</div><div class='add'>+	  as default, but you can enable/disable each codec driver</div><div class='add'>+	  individually, too (only when CONFIG_EXPERT is set).</div><div class='add'>+</div><div class='add'>+if SND_HDA_CODEC_CIRRUS</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CS420X</div><div class='add'>+	tristate "Build Cirrus Logic CS420x codec support" if EXPERT</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Cirrus Logic CS420x codec support</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CS420X=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CS421X</div><div class='add'>+	tristate "Build Cirrus Logic CS421x codec support" if EXPERT</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Cirrus Logic CS421x codec support</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CS421X=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_CS8409</div><div class='add'>+	tristate "Build Cirrus Logic HDA bridge support"</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Cirrus Logic HDA bridge support</div><div class='add'>+	  such as CS8409.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_CODEC_CS8409=m</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/Makefile b/sound/hda/codecs/cirrus/Makefile<br/>new file mode 100644<br/>index 000000000000..dda1873ebcf5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+subdir-ccflags-y += -I$(src)/../../common</div><div class='add'>+</div><div class='add'>+snd-hda-codec-cs420x-y :=	cs420x.o</div><div class='add'>+snd-hda-codec-cs421x-y :=	cs421x.o</div><div class='add'>+snd-hda-codec-cs8409-y :=	cs8409.o cs8409-tables.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CS420X) += snd-hda-codec-cs420x.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CS421X) += snd-hda-codec-cs421x.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_CS8409) += snd-hda-codec-cs8409.o</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/cs420x.c b/sound/hda/codecs/cirrus/cs420x.c<br/>new file mode 100644<br/>index 000000000000..13f5f1711fa4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/cs420x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/cs420x.c</a></div><div class='hunk'>@@ -0,0 +1,786 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Cirrus Logic CS420x HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2009 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+</div><div class='add'>+struct cs_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	unsigned int gpio_mask;</div><div class='add'>+	unsigned int gpio_dir;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+	unsigned int gpio_eapd_hp; /* EAPD GPIO bit for headphones */</div><div class='add'>+	unsigned int gpio_eapd_speaker; /* EAPD GPIO bit for speakers */</div><div class='add'>+</div><div class='add'>+	hda_nid_t vendor_nid;</div><div class='add'>+</div><div class='add'>+	/* for MBP SPDIF control */</div><div class='add'>+	int (*spdif_sw_put)(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* available models with CS420x */</div><div class='add'>+enum {</div><div class='add'>+	CS420X_MBP53,</div><div class='add'>+	CS420X_MBP55,</div><div class='add'>+	CS420X_IMAC27,</div><div class='add'>+	CS420X_GPIO_13,</div><div class='add'>+	CS420X_GPIO_23,</div><div class='add'>+	CS420X_MBP101,</div><div class='add'>+	CS420X_MBP81,</div><div class='add'>+	CS420X_MBA42,</div><div class='add'>+	CS420X_AUTO,</div><div class='add'>+	/* aliases */</div><div class='add'>+	CS420X_IMAC27_122 = CS420X_GPIO_23,</div><div class='add'>+	CS420X_APPLE = CS420X_GPIO_13,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor-specific processing widget */</div><div class='add'>+#define CS420X_VENDOR_NID	0x11</div><div class='add'>+#define CS_DIG_OUT1_PIN_NID	0x10</div><div class='add'>+#define CS_DIG_OUT2_PIN_NID	0x15</div><div class='add'>+#define CS_DMIC1_PIN_NID	0x0e</div><div class='add'>+#define CS_DMIC2_PIN_NID	0x12</div><div class='add'>+</div><div class='add'>+/* coef indices */</div><div class='add'>+#define IDX_SPDIF_STAT		0x0000</div><div class='add'>+#define IDX_SPDIF_CTL		0x0001</div><div class='add'>+#define IDX_ADC_CFG		0x0002</div><div class='add'>+/* SZC bitmask, 4 modes below:</div><div class='add'>+ * 0 = immediate,</div><div class='add'>+ * 1 = digital immediate, analog zero-cross</div><div class='add'>+ * 2 = digtail &amp; analog soft-ramp</div><div class='add'>+ * 3 = digital soft-ramp, analog zero-cross</div><div class='add'>+ */</div><div class='add'>+#define   CS_COEF_ADC_SZC_MASK		(3 &lt;&lt; 0)</div><div class='add'>+#define   CS_COEF_ADC_MIC_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for mic */</div><div class='add'>+#define   CS_COEF_ADC_LI_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for line-in */</div><div class='add'>+/* PGA mode: 0 = differential, 1 = signle-ended */</div><div class='add'>+#define   CS_COEF_ADC_MIC_PGA_MODE	(1 &lt;&lt; 5) /* PGA setup for mic */</div><div class='add'>+#define   CS_COEF_ADC_LI_PGA_MODE	(1 &lt;&lt; 6) /* PGA setup for line-in */</div><div class='add'>+#define IDX_DAC_CFG		0x0003</div><div class='add'>+/* SZC bitmask, 4 modes below:</div><div class='add'>+ * 0 = Immediate</div><div class='add'>+ * 1 = zero-cross</div><div class='add'>+ * 2 = soft-ramp</div><div class='add'>+ * 3 = soft-ramp on zero-cross</div><div class='add'>+ */</div><div class='add'>+#define   CS_COEF_DAC_HP_SZC_MODE	(3 &lt;&lt; 0) /* nid 0x02 */</div><div class='add'>+#define   CS_COEF_DAC_LO_SZC_MODE	(3 &lt;&lt; 2) /* nid 0x03 */</div><div class='add'>+#define   CS_COEF_DAC_SPK_SZC_MODE	(3 &lt;&lt; 4) /* nid 0x04 */</div><div class='add'>+</div><div class='add'>+#define IDX_BEEP_CFG		0x0004</div><div class='add'>+/* 0x0008 - test reg key */</div><div class='add'>+/* 0x0009 - 0x0014 -&gt; 12 test regs */</div><div class='add'>+/* 0x0015 - visibility reg */</div><div class='add'>+</div><div class='add'>+/* Cirrus Logic CS4208 */</div><div class='add'>+#define CS4208_VENDOR_NID	0x24</div><div class='add'>+</div><div class='add'>+static inline int cs_vendor_coef_get(struct hda_codec *codec, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	return snd_hda_codec_read(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				  AC_VERB_GET_PROC_COEF, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cs_vendor_coef_set(struct hda_codec *codec, unsigned int idx,</div><div class='add'>+				      unsigned int coef)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_PROC_COEF, coef);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * auto-mute and auto-mic switching</div><div class='add'>+ * CS421x auto-output redirecting</div><div class='add'>+ * HP/SPK/SPDIF</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void cs_automute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_eapd_hp || spec-&gt;gpio_eapd_speaker) {</div><div class='add'>+		if (spec-&gt;gen.automute_speaker)</div><div class='add'>+			spec-&gt;gpio_data = spec-&gt;gen.hp_jack_present ?</div><div class='add'>+				spec-&gt;gpio_eapd_hp : spec-&gt;gpio_eapd_speaker;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;gpio_data =</div><div class='add'>+				spec-&gt;gpio_eapd_hp | spec-&gt;gpio_eapd_speaker;</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				    AC_VERB_SET_GPIO_DATA, spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_active_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	return (get_defcfg_connect(val) != AC_JACK_PORT_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_input_coef(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int coef;</div><div class='add'>+</div><div class='add'>+	/* CS420x has multiple ADC, CS421x has single ADC */</div><div class='add'>+	if (spec-&gt;vendor_nid == CS420X_VENDOR_NID) {</div><div class='add'>+		coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG);</div><div class='add'>+		if (is_active_pin(codec, CS_DMIC2_PIN_NID))</div><div class='add'>+			coef |= 1 &lt;&lt; 4; /* DMIC2 2 chan on, GPIO1 off */</div><div class='add'>+		if (is_active_pin(codec, CS_DMIC1_PIN_NID))</div><div class='add'>+			coef |= 1 &lt;&lt; 3; /* DMIC1 2 chan on, GPIO0 off</div><div class='add'>+					 * No effect if SPDIF_OUT2 is</div><div class='add'>+					 * selected in IDX_SPDIF_CTL.</div><div class='add'>+					 */</div><div class='add'>+</div><div class='add'>+		cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cs_coef_init_verbs[] = {</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_STATE, 1},</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF,</div><div class='add'>+	 (0x002a /* DAC1/2/3 SZCMode Soft Ramp */</div><div class='add'>+	  | 0x0040 /* Mute DACs on FIFO error */</div><div class='add'>+	  | 0x1000 /* Enable DACs High Pass Filter */</div><div class='add'>+	  | 0x0400 /* Disable Coefficient Auto increment */</div><div class='add'>+	  )},</div><div class='add'>+	/* ADC1/2 - Digital and Analog Soft Ramp */</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, IDX_ADC_CFG},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x000a},</div><div class='add'>+	/* Beep */</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */</div><div class='add'>+</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cs4208_coef_init_verbs[] = {</div><div class='add'>+	{0x01, AC_VERB_SET_POWER_STATE, 0x00}, /* AFG: D0 */</div><div class='add'>+	{0x24, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */</div><div class='add'>+	{0x24, AC_VERB_SET_COEF_INDEX, 0x0033},</div><div class='add'>+	{0x24, AC_VERB_SET_PROC_COEF, 0x0001}, /* A1 ICS */</div><div class='add'>+	{0x24, AC_VERB_SET_COEF_INDEX, 0x0034},</div><div class='add'>+	{0x24, AC_VERB_SET_PROC_COEF, 0x1C01}, /* A1 Enable, A Thresh = 300mV */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Errata: CS4207 rev C0/C1/C2 Silicon</div><div class='add'>+ *</div><div class='add'>+ * http://www.cirrus.com/en/pubs/errata/ER880C3.pdf</div><div class='add'>+ *</div><div class='add'>+ * 6. At high temperature (TA &gt; +85°C), the digital supply current (IVD)</div><div class='add'>+ * may be excessive (up to an additional 200 μA), which is most easily</div><div class='add'>+ * observed while the part is being held in reset (RESET# active low).</div><div class='add'>+ *</div><div class='add'>+ * Root Cause: At initial powerup of the device, the logic that drives</div><div class='add'>+ * the clock and write enable to the S/PDIF SRC RAMs is not properly</div><div class='add'>+ * initialized.</div><div class='add'>+ * Certain random patterns will cause a steady leakage current in those</div><div class='add'>+ * RAM cells. The issue will resolve once the SRCs are used (turned on).</div><div class='add'>+ *</div><div class='add'>+ * Workaround: The following verb sequence briefly turns on the S/PDIF SRC</div><div class='add'>+ * blocks, which will alleviate the issue.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cs_errata_init_verbs[] = {</div><div class='add'>+	{0x01, AC_VERB_SET_POWER_STATE, 0x00}, /* AFG: D0 */</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */</div><div class='add'>+</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0008},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x9999},</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0017},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0xa412},</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0001},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x0009},</div><div class='add'>+</div><div class='add'>+	{0x07, AC_VERB_SET_POWER_STATE, 0x00}, /* S/PDIF Rx: D0 */</div><div class='add'>+	{0x08, AC_VERB_SET_POWER_STATE, 0x00}, /* S/PDIF Tx: D0 */</div><div class='add'>+</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0017},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x2412},</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0008},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x0000},</div><div class='add'>+	{0x11, AC_VERB_SET_COEF_INDEX, 0x0001},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_COEF, 0x0008},</div><div class='add'>+	{0x11, AC_VERB_SET_PROC_STATE, 0x00},</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPDIF setup */</div><div class='add'>+static void init_digital_coef(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int coef;</div><div class='add'>+</div><div class='add'>+	coef = 0x0002; /* SRC_MUTE soft-mute on SPDIF (if no lock) */</div><div class='add'>+	coef |= 0x0008; /* Replace with mute on error */</div><div class='add'>+	if (is_active_pin(codec, CS_DIG_OUT2_PIN_NID))</div><div class='add'>+		coef |= 0x4000; /* RX to TX1 or TX2 Loopthru / SPDIF2</div><div class='add'>+				 * SPDIF_OUT2 is shared with GPIO1 and</div><div class='add'>+				 * DMIC_SDA2.</div><div class='add'>+				 */</div><div class='add'>+	cs_vendor_coef_set(codec, IDX_SPDIF_CTL, coef);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS420X_VENDOR_NID) {</div><div class='add'>+		/* init_verb sequence for C0/C1/C2 errata*/</div><div class='add'>+		snd_hda_sequence_write(codec, cs_errata_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, cs_coef_init_verbs);</div><div class='add'>+	} else if (spec-&gt;vendor_nid == CS4208_VENDOR_NID) {</div><div class='add'>+		snd_hda_sequence_write(codec, cs4208_coef_init_verbs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mask) {</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+				    spec-&gt;gpio_mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+				    spec-&gt;gpio_dir);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS420X_VENDOR_NID) {</div><div class='add'>+		init_input_coef(codec);</div><div class='add'>+		init_digital_coef(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_BUILD);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* keep the ADCs powered up when it's dynamically switchable */</div><div class='add'>+	if (spec-&gt;gen.dyn_adc_switch) {</div><div class='add'>+		unsigned int done = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; spec-&gt;gen.input_mux.num_items; i++) {</div><div class='add'>+			int idx = spec-&gt;gen.dyn_adc_idx[i];</div><div class='add'>+</div><div class='add'>+			if (done &amp; (1 &lt;&lt; idx))</div><div class='add'>+				continue;</div><div class='add'>+			snd_hda_gen_fix_pin_power(codec,</div><div class='add'>+						  spec-&gt;gen.adc_nids[idx]);</div><div class='add'>+			done |= 1 &lt;&lt; idx;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cs420x_models[] = {</div><div class='add'>+	{ .id = CS420X_MBP53, .name = "mbp53" },</div><div class='add'>+	{ .id = CS420X_MBP55, .name = "mbp55" },</div><div class='add'>+	{ .id = CS420X_IMAC27, .name = "imac27" },</div><div class='add'>+	{ .id = CS420X_IMAC27_122, .name = "imac27_122" },</div><div class='add'>+	{ .id = CS420X_APPLE, .name = "apple" },</div><div class='add'>+	{ .id = CS420X_MBP101, .name = "mbp101" },</div><div class='add'>+	{ .id = CS420X_MBP81, .name = "mbp81" },</div><div class='add'>+	{ .id = CS420X_MBA42, .name = "mba42" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cs420x_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),</div><div class='add'>+	/* this conflicts with too many other models */</div><div class='add'>+	/*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/</div><div class='add'>+</div><div class='add'>+	/* codec SSID */</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0900, "iMac 12,1", CS420X_IMAC27_122),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x5600, "MacBookAir 5,2", CS420X_MBP81),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x5b00, "MacBookAir 4,2", CS420X_MBA42),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS420X_APPLE),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl mbp53_pincfgs[] = {</div><div class='add'>+	{ 0x09, 0x012b4050 },</div><div class='add'>+	{ 0x0a, 0x90100141 },</div><div class='add'>+	{ 0x0b, 0x90100140 },</div><div class='add'>+	{ 0x0c, 0x018b3020 },</div><div class='add'>+	{ 0x0d, 0x90a00110 },</div><div class='add'>+	{ 0x0e, 0x400000f0 },</div><div class='add'>+	{ 0x0f, 0x01cbe030 },</div><div class='add'>+	{ 0x10, 0x014be060 },</div><div class='add'>+	{ 0x12, 0x400000f0 },</div><div class='add'>+	{ 0x15, 0x400000f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl mbp55_pincfgs[] = {</div><div class='add'>+	{ 0x09, 0x012b4030 },</div><div class='add'>+	{ 0x0a, 0x90100121 },</div><div class='add'>+	{ 0x0b, 0x90100120 },</div><div class='add'>+	{ 0x0c, 0x400000f0 },</div><div class='add'>+	{ 0x0d, 0x90a00110 },</div><div class='add'>+	{ 0x0e, 0x400000f0 },</div><div class='add'>+	{ 0x0f, 0x400000f0 },</div><div class='add'>+	{ 0x10, 0x014be040 },</div><div class='add'>+	{ 0x12, 0x400000f0 },</div><div class='add'>+	{ 0x15, 0x400000f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl imac27_pincfgs[] = {</div><div class='add'>+	{ 0x09, 0x012b4050 },</div><div class='add'>+	{ 0x0a, 0x90100140 },</div><div class='add'>+	{ 0x0b, 0x90100142 },</div><div class='add'>+	{ 0x0c, 0x018b3020 },</div><div class='add'>+	{ 0x0d, 0x90a00110 },</div><div class='add'>+	{ 0x0e, 0x400000f0 },</div><div class='add'>+	{ 0x0f, 0x01cbe030 },</div><div class='add'>+	{ 0x10, 0x014be060 },</div><div class='add'>+	{ 0x12, 0x01ab9070 },</div><div class='add'>+	{ 0x15, 0x400000f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl mbp101_pincfgs[] = {</div><div class='add'>+	{ 0x0d, 0x40ab90f0 },</div><div class='add'>+	{ 0x0e, 0x90a600f0 },</div><div class='add'>+	{ 0x12, 0x50a600f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl mba42_pincfgs[] = {</div><div class='add'>+	{ 0x09, 0x012b4030 }, /* HP */</div><div class='add'>+	{ 0x0a, 0x400000f0 },</div><div class='add'>+	{ 0x0b, 0x90100120 }, /* speaker */</div><div class='add'>+	{ 0x0c, 0x400000f0 },</div><div class='add'>+	{ 0x0d, 0x90a00110 }, /* mic */</div><div class='add'>+	{ 0x0e, 0x400000f0 },</div><div class='add'>+	{ 0x0f, 0x400000f0 },</div><div class='add'>+	{ 0x10, 0x400000f0 },</div><div class='add'>+	{ 0x12, 0x400000f0 },</div><div class='add'>+	{ 0x15, 0x400000f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl mba6_pincfgs[] = {</div><div class='add'>+	{ 0x10, 0x032120f0 }, /* HP */</div><div class='add'>+	{ 0x11, 0x500000f0 },</div><div class='add'>+	{ 0x12, 0x90100010 }, /* Speaker */</div><div class='add'>+	{ 0x13, 0x500000f0 },</div><div class='add'>+	{ 0x14, 0x500000f0 },</div><div class='add'>+	{ 0x15, 0x770000f0 },</div><div class='add'>+	{ 0x16, 0x770000f0 },</div><div class='add'>+	{ 0x17, 0x430000f0 },</div><div class='add'>+	{ 0x18, 0x43ab9030 }, /* Mic */</div><div class='add'>+	{ 0x19, 0x770000f0 },</div><div class='add'>+	{ 0x1a, 0x770000f0 },</div><div class='add'>+	{ 0x1b, 0x770000f0 },</div><div class='add'>+	{ 0x1c, 0x90a00090 },</div><div class='add'>+	{ 0x1d, 0x500000f0 },</div><div class='add'>+	{ 0x1e, 0x500000f0 },</div><div class='add'>+	{ 0x1f, 0x500000f0 },</div><div class='add'>+	{ 0x20, 0x500000f0 },</div><div class='add'>+	{ 0x21, 0x430000f0 },</div><div class='add'>+	{ 0x22, 0x430000f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cs420x_fixup_gpio_13(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gpio_eapd_hp = 2; /* GPIO1 = headphones */</div><div class='add'>+		spec-&gt;gpio_eapd_speaker = 8; /* GPIO3 = speakers */</div><div class='add'>+		spec-&gt;gpio_mask = spec-&gt;gpio_dir =</div><div class='add'>+			spec-&gt;gpio_eapd_hp | spec-&gt;gpio_eapd_speaker;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs420x_fixup_gpio_23(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gpio_eapd_hp = 4; /* GPIO2 = headphones */</div><div class='add'>+		spec-&gt;gpio_eapd_speaker = 8; /* GPIO3 = speakers */</div><div class='add'>+		spec-&gt;gpio_mask = spec-&gt;gpio_dir =</div><div class='add'>+			spec-&gt;gpio_eapd_hp | spec-&gt;gpio_eapd_speaker;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup cs420x_fixups[] = {</div><div class='add'>+	[CS420X_MBP53] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = mbp53_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_APPLE,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_MBP55] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = mbp55_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_GPIO_13,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_IMAC27] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = imac27_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_GPIO_13,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_GPIO_13] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs420x_fixup_gpio_13,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_GPIO_23] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs420x_fixup_gpio_23,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_MBP101] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = mbp101_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_GPIO_13,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_MBP81] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* internal mic ADC2: right only, single ended */</div><div class='add'>+			{0x11, AC_VERB_SET_COEF_INDEX, IDX_ADC_CFG},</div><div class='add'>+			{0x11, AC_VERB_SET_PROC_COEF, 0x102a},</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_GPIO_13,</div><div class='add'>+	},</div><div class='add'>+	[CS420X_MBA42] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = mba42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS420X_GPIO_13,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cs_spec *cs_alloc_spec(struct hda_codec *codec, int vendor_nid)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return NULL;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	spec-&gt;vendor_nid = vendor_nid;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+</div><div class='add'>+	return spec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs420x_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;single_adc_amp = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, cs420x_models, cs420x_fixup_tbl,</div><div class='add'>+			   cs420x_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = cs_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CS4208 support:</div><div class='add'>+ * Its layout is no longer compatible with CS4206/CS4207</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CS4208_MAC_AUTO,</div><div class='add'>+	CS4208_MBA6,</div><div class='add'>+	CS4208_MBP11,</div><div class='add'>+	CS4208_MACMINI,</div><div class='add'>+	CS4208_GPIO0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cs4208_models[] = {</div><div class='add'>+	{ .id = CS4208_GPIO0, .name = "gpio0" },</div><div class='add'>+	{ .id = CS4208_MBA6, .name = "mba6" },</div><div class='add'>+	{ .id = CS4208_MBP11, .name = "mbp11" },</div><div class='add'>+	{ .id = CS4208_MACMINI, .name = "macmini" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cs4208_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS4208_MAC_AUTO),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* codec SSID matching */</div><div class='add'>+static const struct hda_quirk cs4208_mac_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x5e00, "MacBookPro 11,2", CS4208_MBP11),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x6c00, "MacMini 7,1", CS4208_MACMINI),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x7800, "MacPro 6,1", CS4208_MACMINI),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x7b00, "MacBookPro 12,1", CS4208_MBP11),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cs4208_fixup_gpio0(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gpio_eapd_hp = 0;</div><div class='add'>+		spec-&gt;gpio_eapd_speaker = 1;</div><div class='add'>+		spec-&gt;gpio_mask = spec-&gt;gpio_dir =</div><div class='add'>+			spec-&gt;gpio_eapd_hp | spec-&gt;gpio_eapd_speaker;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup cs4208_fixups[];</div><div class='add'>+</div><div class='add'>+/* remap the fixup from codec SSID and apply it */</div><div class='add'>+static void cs4208_fixup_mac(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec-&gt;fixup_id = HDA_FIXUP_ID_NOT_SET;</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, cs4208_mac_fixup_tbl, cs4208_fixups);</div><div class='add'>+	if (codec-&gt;fixup_id == HDA_FIXUP_ID_NOT_SET)</div><div class='add'>+		codec-&gt;fixup_id = CS4208_GPIO0; /* default fixup */</div><div class='add'>+	snd_hda_apply_fixup(codec, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* MacMini 7,1 has the inverted jack detection */</div><div class='add'>+static void cs4208_fixup_macmini(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x18, 0x00ab9150 }, /* mic (audio-in) jack: disable detect */</div><div class='add'>+		{ 0x21, 0x004be140 }, /* SPDIF: disable detect */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* HP pin (0x10) has an inverted detection */</div><div class='add'>+		codec-&gt;inv_jack_detect = 1;</div><div class='add'>+		/* disable the bogus Mic and SPDIF jack detections */</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs4208_spdif_sw_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t pin = spec-&gt;gen.autocfg.dig_out_pins[0];</div><div class='add'>+	int pinctl = ucontrol-&gt;value.integer.value[0] ? PIN_OUT : 0;</div><div class='add'>+</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, pin, pinctl);</div><div class='add'>+	return spec-&gt;spdif_sw_put(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hook the SPDIF switch */</div><div class='add'>+static void cs4208_fixup_spdif_switch(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_BUILD) {</div><div class='add'>+		struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+		struct snd_kcontrol *kctl;</div><div class='add'>+</div><div class='add'>+		if (!spec-&gt;gen.autocfg.dig_out_pins[0])</div><div class='add'>+			return;</div><div class='add'>+		kctl = snd_hda_find_mixer_ctl(codec, "IEC958 Playback Switch");</div><div class='add'>+		if (!kctl)</div><div class='add'>+			return;</div><div class='add'>+		spec-&gt;spdif_sw_put = kctl-&gt;put;</div><div class='add'>+		kctl-&gt;put = cs4208_spdif_sw_put;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup cs4208_fixups[] = {</div><div class='add'>+	[CS4208_MBA6] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = mba6_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS4208_GPIO0,</div><div class='add'>+	},</div><div class='add'>+	[CS4208_MBP11] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs4208_fixup_spdif_switch,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS4208_GPIO0,</div><div class='add'>+	},</div><div class='add'>+	[CS4208_MACMINI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs4208_fixup_macmini,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS4208_GPIO0,</div><div class='add'>+	},</div><div class='add'>+	[CS4208_GPIO0] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs4208_fixup_gpio0,</div><div class='add'>+	},</div><div class='add'>+	[CS4208_MAC_AUTO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs4208_fixup_mac,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* correct the 0dB offset of input pins */</div><div class='add'>+static void cs4208_fix_amp_caps(struct hda_codec *codec, hda_nid_t adc)</div><div class='add'>+{</div><div class='add'>+	unsigned int caps;</div><div class='add'>+</div><div class='add'>+	caps = query_amp_caps(codec, adc, HDA_INPUT);</div><div class='add'>+	caps &amp;= ~(AC_AMPCAP_OFFSET);</div><div class='add'>+	caps |= 0x02;</div><div class='add'>+	snd_hda_override_amp_caps(codec, adc, HDA_INPUT, caps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs4208_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* exclude NID 0x10 (HP) from output volumes due to different steps */</div><div class='add'>+	spec-&gt;gen.out_vol_mask = 1ULL &lt;&lt; 0x10;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, cs4208_models, cs4208_fixup_tbl,</div><div class='add'>+			   cs4208_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	snd_hda_override_wcaps(codec, 0x18,</div><div class='add'>+			       get_wcaps(codec, 0x18) | AC_WCAP_STEREO);</div><div class='add'>+	cs4208_fix_amp_caps(codec, 0x18);</div><div class='add'>+	cs4208_fix_amp_caps(codec, 0x1b);</div><div class='add'>+	cs4208_fix_amp_caps(codec, 0x1c);</div><div class='add'>+</div><div class='add'>+	err = cs_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs_codec_probe(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = cs_alloc_spec(codec, id-&gt;driver_data);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec-&gt;gen.automute_hook = cs_automute;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS4208_VENDOR_NID)</div><div class='add'>+		err = cs4208_probe(codec);</div><div class='add'>+	else</div><div class='add'>+		err = cs420x_probe(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cs_codec_ops = {</div><div class='add'>+	.probe = cs_codec_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = cs_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = cs_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_cs420x[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10134206, "CS4206", CS420X_VENDOR_NID),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10134207, "CS4207", CS420X_VENDOR_NID),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10134208, "CS4208", CS4208_VENDOR_NID),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cs420x);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Cirrus Logic CS420x HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver cs420x_driver = {</div><div class='add'>+	.id = snd_hda_id_cs420x,</div><div class='add'>+	.ops = &amp;cs_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(cs420x_driver);</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/cs421x.c b/sound/hda/codecs/cirrus/cs421x.c<br/>new file mode 100644<br/>index 000000000000..a93e2e0bb391<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/cs421x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/cs421x.c</a></div><div class='hunk'>@@ -0,0 +1,590 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Cirrus Logic CS421x HD-audio codec</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+</div><div class='add'>+struct cs_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	unsigned int gpio_mask;</div><div class='add'>+	unsigned int gpio_dir;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+	unsigned int gpio_eapd_hp; /* EAPD GPIO bit for headphones */</div><div class='add'>+	unsigned int gpio_eapd_speaker; /* EAPD GPIO bit for speakers */</div><div class='add'>+</div><div class='add'>+	/* CS421x */</div><div class='add'>+	unsigned int spdif_detect:1;</div><div class='add'>+	unsigned int spdif_present:1;</div><div class='add'>+	unsigned int sense_b:1;</div><div class='add'>+	hda_nid_t vendor_nid;</div><div class='add'>+</div><div class='add'>+	/* for MBP SPDIF control */</div><div class='add'>+	int (*spdif_sw_put)(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CS421x boards */</div><div class='add'>+enum {</div><div class='add'>+	CS421X_CDB4210,</div><div class='add'>+	CS421X_SENSE_B,</div><div class='add'>+	CS421X_STUMPY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor-specific processing widget */</div><div class='add'>+#define CS_DIG_OUT1_PIN_NID	0x10</div><div class='add'>+#define CS_DIG_OUT2_PIN_NID	0x15</div><div class='add'>+#define CS_DMIC1_PIN_NID	0x0e</div><div class='add'>+#define CS_DMIC2_PIN_NID	0x12</div><div class='add'>+</div><div class='add'>+/* coef indices */</div><div class='add'>+#define IDX_SPDIF_STAT		0x0000</div><div class='add'>+#define IDX_SPDIF_CTL		0x0001</div><div class='add'>+#define IDX_ADC_CFG		0x0002</div><div class='add'>+/* SZC bitmask, 4 modes below:</div><div class='add'>+ * 0 = immediate,</div><div class='add'>+ * 1 = digital immediate, analog zero-cross</div><div class='add'>+ * 2 = digtail &amp; analog soft-ramp</div><div class='add'>+ * 3 = digital soft-ramp, analog zero-cross</div><div class='add'>+ */</div><div class='add'>+#define   CS_COEF_ADC_SZC_MASK		(3 &lt;&lt; 0)</div><div class='add'>+#define   CS_COEF_ADC_MIC_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for mic */</div><div class='add'>+#define   CS_COEF_ADC_LI_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for line-in */</div><div class='add'>+/* PGA mode: 0 = differential, 1 = signle-ended */</div><div class='add'>+#define   CS_COEF_ADC_MIC_PGA_MODE	(1 &lt;&lt; 5) /* PGA setup for mic */</div><div class='add'>+#define   CS_COEF_ADC_LI_PGA_MODE	(1 &lt;&lt; 6) /* PGA setup for line-in */</div><div class='add'>+#define IDX_DAC_CFG		0x0003</div><div class='add'>+/* SZC bitmask, 4 modes below:</div><div class='add'>+ * 0 = Immediate</div><div class='add'>+ * 1 = zero-cross</div><div class='add'>+ * 2 = soft-ramp</div><div class='add'>+ * 3 = soft-ramp on zero-cross</div><div class='add'>+ */</div><div class='add'>+#define   CS_COEF_DAC_HP_SZC_MODE	(3 &lt;&lt; 0) /* nid 0x02 */</div><div class='add'>+#define   CS_COEF_DAC_LO_SZC_MODE	(3 &lt;&lt; 2) /* nid 0x03 */</div><div class='add'>+#define   CS_COEF_DAC_SPK_SZC_MODE	(3 &lt;&lt; 4) /* nid 0x04 */</div><div class='add'>+</div><div class='add'>+#define IDX_BEEP_CFG		0x0004</div><div class='add'>+/* 0x0008 - test reg key */</div><div class='add'>+/* 0x0009 - 0x0014 -&gt; 12 test regs */</div><div class='add'>+/* 0x0015 - visibility reg */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cirrus Logic CS4210</div><div class='add'>+ *</div><div class='add'>+ * 1 DAC =&gt; HP(sense) / Speakers,</div><div class='add'>+ * 1 ADC &lt;= LineIn(sense) / MicIn / DMicIn,</div><div class='add'>+ * 1 SPDIF OUT =&gt; SPDIF Transmitter(sense)</div><div class='add'>+ */</div><div class='add'>+#define CS4210_DAC_NID		0x02</div><div class='add'>+#define CS4210_ADC_NID		0x03</div><div class='add'>+#define CS4210_VENDOR_NID	0x0B</div><div class='add'>+#define CS421X_DMIC_PIN_NID	0x09 /* Port E */</div><div class='add'>+#define CS421X_SPDIF_PIN_NID	0x0A /* Port H */</div><div class='add'>+</div><div class='add'>+#define CS421X_IDX_DEV_CFG	0x01</div><div class='add'>+#define CS421X_IDX_ADC_CFG	0x02</div><div class='add'>+#define CS421X_IDX_DAC_CFG	0x03</div><div class='add'>+#define CS421X_IDX_SPK_CTL	0x04</div><div class='add'>+</div><div class='add'>+/* Cirrus Logic CS4213 is like CS4210 but does not have SPDIF input/output */</div><div class='add'>+#define CS4213_VENDOR_NID	0x09</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline int cs_vendor_coef_get(struct hda_codec *codec, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	return snd_hda_codec_read(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				  AC_VERB_GET_PROC_COEF, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cs_vendor_coef_set(struct hda_codec *codec, unsigned int idx,</div><div class='add'>+				      unsigned int coef)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+			    AC_VERB_SET_PROC_COEF, coef);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * auto-mute and auto-mic switching</div><div class='add'>+ * CS421x auto-output redirecting</div><div class='add'>+ * HP/SPK/SPDIF</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void cs_automute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* mute HPs if spdif jack (SENSE_B) is present */</div><div class='add'>+	spec-&gt;gen.master_mute = !!(spec-&gt;spdif_present &amp;&amp; spec-&gt;sense_b);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_eapd_hp || spec-&gt;gpio_eapd_speaker) {</div><div class='add'>+		if (spec-&gt;gen.automute_speaker)</div><div class='add'>+			spec-&gt;gpio_data = spec-&gt;gen.hp_jack_present ?</div><div class='add'>+				spec-&gt;gpio_eapd_hp : spec-&gt;gpio_eapd_speaker;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;gpio_data =</div><div class='add'>+				spec-&gt;gpio_eapd_hp | spec-&gt;gpio_eapd_speaker;</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0,</div><div class='add'>+				    AC_VERB_SET_GPIO_DATA, spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_active_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	return (get_defcfg_connect(val) != AC_JACK_PORT_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cs_spec *cs_alloc_spec(struct hda_codec *codec, int vendor_nid)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return NULL;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	spec-&gt;vendor_nid = vendor_nid;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+</div><div class='add'>+	return spec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Cirrus Logic CS4210</div><div class='add'>+ *</div><div class='add'>+ * 1 DAC =&gt; HP(sense) / Speakers,</div><div class='add'>+ * 1 ADC &lt;= LineIn(sense) / MicIn / DMicIn,</div><div class='add'>+ * 1 SPDIF OUT =&gt; SPDIF Transmitter(sense)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* CS4210 board names */</div><div class='add'>+static const struct hda_model_fixup cs421x_models[] = {</div><div class='add'>+	{ .id = CS421X_CDB4210, .name = "cdb4210" },</div><div class='add'>+	{ .id = CS421X_STUMPY, .name = "stumpy" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cs421x_fixup_tbl[] = {</div><div class='add'>+	/* Test Intel board + CDB2410  */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x5001, "DP45SG/CDB4210", CS421X_CDB4210),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CS4210 board pinconfigs */</div><div class='add'>+/* Default CS4210 (CDB4210)*/</div><div class='add'>+static const struct hda_pintbl cdb4210_pincfgs[] = {</div><div class='add'>+	{ 0x05, 0x0321401f },</div><div class='add'>+	{ 0x06, 0x90170010 },</div><div class='add'>+	{ 0x07, 0x03813031 },</div><div class='add'>+	{ 0x08, 0xb7a70037 },</div><div class='add'>+	{ 0x09, 0xb7a6003e },</div><div class='add'>+	{ 0x0a, 0x034510f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Stumpy ChromeBox */</div><div class='add'>+static const struct hda_pintbl stumpy_pincfgs[] = {</div><div class='add'>+	{ 0x05, 0x022120f0 },</div><div class='add'>+	{ 0x06, 0x901700f0 },</div><div class='add'>+	{ 0x07, 0x02a120f0 },</div><div class='add'>+	{ 0x08, 0x77a70037 },</div><div class='add'>+	{ 0x09, 0x77a6003e },</div><div class='add'>+	{ 0x0a, 0x434510f0 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Setup GPIO/SENSE for each board (if used) */</div><div class='add'>+static void cs421x_fixup_sense_b(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;sense_b = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup cs421x_fixups[] = {</div><div class='add'>+	[CS421X_CDB4210] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cdb4210_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS421X_SENSE_B,</div><div class='add'>+	},</div><div class='add'>+	[CS421X_SENSE_B] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs421x_fixup_sense_b,</div><div class='add'>+	},</div><div class='add'>+	[CS421X_STUMPY] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stumpy_pincfgs,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cs421x_coef_init_verbs[] = {</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_STATE, 1},</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_DEV_CFG},</div><div class='add'>+	/*</div><div class='add'>+	 *  Disable Coefficient Index Auto-Increment(DAI)=1,</div><div class='add'>+	 *  PDREF=0</div><div class='add'>+	 */</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_ADC_CFG},</div><div class='add'>+	/* ADC SZCMode = Digital Soft Ramp */</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, CS421X_IDX_DAC_CFG},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF,</div><div class='add'>+	 (0x0002 /* DAC SZCMode = Digital Soft Ramp */</div><div class='add'>+	  | 0x0004 /* Mute DAC on FIFO error */</div><div class='add'>+	  | 0x0008 /* Enable DAC High Pass Filter */</div><div class='add'>+	  )},</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Errata: CS4210 rev A1 Silicon</div><div class='add'>+ *</div><div class='add'>+ * http://www.cirrus.com/en/pubs/errata/</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * 1. Performance degredation is present in the ADC.</div><div class='add'>+ * 2. Speaker output is not completely muted upon HP detect.</div><div class='add'>+ * 3. Noise is present when clipping occurs on the amplified</div><div class='add'>+ *    speaker outputs.</div><div class='add'>+ *</div><div class='add'>+ * Workaround:</div><div class='add'>+ * The following verb sequence written to the registers during</div><div class='add'>+ * initialization will correct the issues listed above.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cs421x_coef_init_verbs_A1_silicon_fixes[] = {</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, 0x0006},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0x9999}, /* Test mode: on */</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, 0x000A},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0x14CB}, /* Chop double */</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, 0x0011},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0xA2D0}, /* Increase ADC current */</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, 0x001A},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0x02A9}, /* Mute speaker */</div><div class='add'>+</div><div class='add'>+	{0x0B, AC_VERB_SET_COEF_INDEX, 0x001B},</div><div class='add'>+	{0x0B, AC_VERB_SET_PROC_COEF, 0X1006}, /* Remove noise */</div><div class='add'>+</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Speaker Amp Gain is controlled by the vendor widget's coef 4 */</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(cs421x_speaker_boost_db_scale, 900, 300, 0);</div><div class='add'>+</div><div class='add'>+static int cs421x_boost_vol_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 3;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs421x_boost_vol_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] =</div><div class='add'>+		cs_vendor_coef_get(codec, CS421X_IDX_SPK_CTL) &amp; 0x0003;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs421x_boost_vol_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	unsigned int vol = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	unsigned int coef =</div><div class='add'>+		cs_vendor_coef_get(codec, CS421X_IDX_SPK_CTL);</div><div class='add'>+	unsigned int original_coef = coef;</div><div class='add'>+</div><div class='add'>+	coef &amp;= ~0x0003;</div><div class='add'>+	coef |= (vol &amp; 0x0003);</div><div class='add'>+	if (original_coef != coef) {</div><div class='add'>+		cs_vendor_coef_set(codec, CS421X_IDX_SPK_CTL, coef);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new cs421x_speaker_boost_ctl = {</div><div class='add'>+</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+	.name = "Speaker Boost Playback Volume",</div><div class='add'>+	.info = cs421x_boost_vol_info,</div><div class='add'>+	.get = cs421x_boost_vol_get,</div><div class='add'>+	.put = cs421x_boost_vol_put,</div><div class='add'>+	.tlv = { .p = cs421x_speaker_boost_db_scale },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cs4210_pinmux_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int def_conf, coef;</div><div class='add'>+</div><div class='add'>+	/* GPIO, DMIC_SCL, DMIC_SDA and SENSE_B are multiplexed */</div><div class='add'>+	coef = cs_vendor_coef_get(codec, CS421X_IDX_DEV_CFG);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mask)</div><div class='add'>+		coef |= 0x0008; /* B1,B2 are GPIOs */</div><div class='add'>+	else</div><div class='add'>+		coef &amp;= ~0x0008;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;sense_b)</div><div class='add'>+		coef |= 0x0010; /* B2 is SENSE_B, not inverted  */</div><div class='add'>+	else</div><div class='add'>+		coef &amp;= ~0x0010;</div><div class='add'>+</div><div class='add'>+	cs_vendor_coef_set(codec, CS421X_IDX_DEV_CFG, coef);</div><div class='add'>+</div><div class='add'>+	if ((spec-&gt;gpio_mask || spec-&gt;sense_b) &amp;&amp;</div><div class='add'>+	    is_active_pin(codec, CS421X_DMIC_PIN_NID)) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 *  GPIO or SENSE_B forced - disconnect the DMIC pin.</div><div class='add'>+		 */</div><div class='add'>+		def_conf = snd_hda_codec_get_pincfg(codec, CS421X_DMIC_PIN_NID);</div><div class='add'>+		def_conf &amp;= ~AC_DEFCFG_PORT_CONN;</div><div class='add'>+		def_conf |= (AC_JACK_PORT_NONE &lt;&lt; AC_DEFCFG_PORT_CONN_SHIFT);</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, CS421X_DMIC_PIN_NID, def_conf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs4210_spdif_automute(struct hda_codec *codec,</div><div class='add'>+				  struct hda_jack_callback *tbl)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool spdif_present = false;</div><div class='add'>+	hda_nid_t spdif_pin = spec-&gt;gen.autocfg.dig_out_pins[0];</div><div class='add'>+</div><div class='add'>+	/* detect on spdif is specific to CS4210 */</div><div class='add'>+	if (!spec-&gt;spdif_detect ||</div><div class='add'>+	    spec-&gt;vendor_nid != CS4210_VENDOR_NID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spdif_present = snd_hda_jack_detect(codec, spdif_pin);</div><div class='add'>+	if (spdif_present == spec-&gt;spdif_present)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;spdif_present = spdif_present;</div><div class='add'>+	/* SPDIF TX on/off */</div><div class='add'>+	snd_hda_set_pin_ctl(codec, spdif_pin, spdif_present ? PIN_OUT : 0);</div><div class='add'>+</div><div class='add'>+	cs_automute(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_cs421x_digital(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;dig_outs; i++) {</div><div class='add'>+		hda_nid_t nid = cfg-&gt;dig_out_pins[i];</div><div class='add'>+</div><div class='add'>+		if (get_wcaps(codec, nid) &amp; AC_WCAP_UNSOL_CAP) {</div><div class='add'>+			spec-&gt;spdif_detect = 1;</div><div class='add'>+			snd_hda_jack_detect_enable_callback(codec, nid,</div><div class='add'>+							    cs4210_spdif_automute);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs421x_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS4210_VENDOR_NID) {</div><div class='add'>+		snd_hda_sequence_write(codec, cs421x_coef_init_verbs);</div><div class='add'>+		snd_hda_sequence_write(codec, cs421x_coef_init_verbs_A1_silicon_fixes);</div><div class='add'>+		cs4210_pinmux_init(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mask) {</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+				    spec-&gt;gpio_mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+				    spec-&gt;gpio_dir);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs4210_spdif_automute(codec, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fix_volume_caps(struct hda_codec *codec, hda_nid_t dac)</div><div class='add'>+{</div><div class='add'>+	unsigned int caps;</div><div class='add'>+</div><div class='add'>+	/* set the upper-limit for mixer amp to 0dB */</div><div class='add'>+	caps = query_amp_caps(codec, dac, HDA_OUTPUT);</div><div class='add'>+	caps &amp;= ~(0x7f &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT);</div><div class='add'>+	caps |= ((caps &gt;&gt; AC_AMPCAP_OFFSET_SHIFT) &amp; 0x7f)</div><div class='add'>+		&lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='add'>+	snd_hda_override_amp_caps(codec, dac, HDA_OUTPUT, caps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs421x_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t dac = CS4210_DAC_NID;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	fix_volume_caps(codec, dac);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	parse_cs421x_digital(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gen.autocfg.speaker_outs &amp;&amp;</div><div class='add'>+	    spec-&gt;vendor_nid == CS4210_VENDOR_NID) {</div><div class='add'>+		if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+					  &amp;cs421x_speaker_boost_ctl))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *	Manage PDREF, when transitioning to D3hot</div><div class='add'>+ *	(DAC,ADC) -&gt; D3, PDREF=1, AFG-&gt;D3</div><div class='add'>+ */</div><div class='add'>+static int cs421x_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int coef;</div><div class='add'>+</div><div class='add'>+	snd_hda_shutup_pins(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, CS4210_DAC_NID, 0,</div><div class='add'>+			    AC_VERB_SET_POWER_STATE,  AC_PWRST_D3);</div><div class='add'>+	snd_hda_codec_write(codec, CS4210_ADC_NID, 0,</div><div class='add'>+			    AC_VERB_SET_POWER_STATE,  AC_PWRST_D3);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS4210_VENDOR_NID) {</div><div class='add'>+		coef = cs_vendor_coef_get(codec, CS421X_IDX_DEV_CFG);</div><div class='add'>+		coef |= 0x0004; /* PDREF */</div><div class='add'>+		cs_vendor_coef_set(codec, CS421X_IDX_DEV_CFG, coef);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs421x_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cs_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = cs_alloc_spec(codec, id-&gt;driver_data);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.automute_hook = cs_automute;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vendor_nid == CS4210_VENDOR_NID) {</div><div class='add'>+		snd_hda_pick_fixup(codec, cs421x_models, cs421x_fixup_tbl,</div><div class='add'>+				   cs421x_fixups);</div><div class='add'>+		snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 *  Update the GPIO/DMIC/SENSE_B pinmux before the configuration</div><div class='add'>+		 *   is auto-parsed. If GPIO or SENSE_B is forced, DMIC input</div><div class='add'>+		 *   is disabled.</div><div class='add'>+		 */</div><div class='add'>+		cs4210_pinmux_init(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cs421x_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cs421x_codec_ops = {</div><div class='add'>+	.probe = cs421x_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = cs421x_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = cs421x_suspend,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_cs421x[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10134210, "CS4210", CS4210_VENDOR_NID),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10134213, "CS4213", CS4213_VENDOR_NID),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cs421x);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Cirrus Logic CS421x HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver cs421x_driver = {</div><div class='add'>+	.id = snd_hda_id_cs421x,</div><div class='add'>+	.ops = &amp;cs421x_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(cs421x_driver);</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/cs8409-tables.c b/sound/hda/codecs/cirrus/cs8409-tables.c<br/>new file mode 100644<br/>index 000000000000..8c703b714a71<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/cs8409-tables.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/cs8409-tables.c</a></div><div class='hunk'>@@ -0,0 +1,623 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * cs8409-tables.c  --  HD audio codec driver for Cirrus Logic CS8409 HDA bridge chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ *</div><div class='add'>+ * Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "cs8409.h"</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                          CS42L42 Specific Data</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(cs42l42_dac_db_scale, CS42L42_HP_VOL_REAL_MIN * 100, 100, 1);</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(cs42l42_adc_db_scale, CS42L42_AMIC_VOL_REAL_MIN * 100, 100, 1);</div><div class='add'>+</div><div class='add'>+const struct snd_kcontrol_new cs42l42_dac_volume_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.index = 0,</div><div class='add'>+	.subdevice = (HDA_SUBDEV_AMP_FLAG | HDA_SUBDEV_NID_FLAG),</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+	.info = cs42l42_volume_info,</div><div class='add'>+	.get = cs42l42_volume_get,</div><div class='add'>+	.put = cs42l42_volume_put,</div><div class='add'>+	.tlv = { .p = cs42l42_dac_db_scale },</div><div class='add'>+	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_TRANSMITTER_A, 3, CS8409_CODEC0,</div><div class='add'>+			 HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct snd_kcontrol_new cs42l42_adc_volume_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.index = 0,</div><div class='add'>+	.subdevice = (HDA_SUBDEV_AMP_FLAG | HDA_SUBDEV_NID_FLAG),</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+	.info = cs42l42_volume_info,</div><div class='add'>+	.get = cs42l42_volume_get,</div><div class='add'>+	.put = cs42l42_volume_put,</div><div class='add'>+	.tlv = { .p = cs42l42_adc_db_scale },</div><div class='add'>+	.private_value = HDA_COMPOSE_AMP_VAL_OFS(CS8409_PIN_ASP1_RECEIVER_A, 1, CS8409_CODEC0,</div><div class='add'>+			 HDA_INPUT, CS42L42_VOL_ADC) | HDA_AMP_VAL_MIN_MUTE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct hda_pcm_stream cs42l42_48k_pcm_analog_playback = {</div><div class='add'>+	.rates = SNDRV_PCM_RATE_48000, /* fixed rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct hda_pcm_stream cs42l42_48k_pcm_analog_capture = {</div><div class='add'>+	.rates = SNDRV_PCM_RATE_48000, /* fixed rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                   BULLSEYE / WARLOCK / CYBORG Specific Arrays</div><div class='add'>+ *                               CS8409/CS42L42</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+const struct hda_verb cs8409_cs42l42_init_verbs[] = {</div><div class='add'>+	{ CS8409_PIN_AFG, AC_VERB_SET_GPIO_WAKE_MASK, 0x0018 },		/* WAKE from GPIO 3,4 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_STATE, 0x0001 },	/* Enable VPW processing */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_COEF_INDEX, 0x0002 },	/* Configure GPIO 6,7 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_COEF,  0x0080 },	/* I2C mode */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_COEF_INDEX, 0x005b },	/* Set I2C bus speed */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_COEF,  0x0200 },	/* 100kHz I2C_STO = 2 */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl cs8409_cs42l42_pincfgs[] = {</div><div class='add'>+	{ CS8409_PIN_ASP1_TRANSMITTER_A, 0x042120f0 },	/* ASP-1-TX */</div><div class='add'>+	{ CS8409_PIN_ASP1_RECEIVER_A, 0x04a12050 },	/* ASP-1-RX */</div><div class='add'>+	{ CS8409_PIN_ASP2_TRANSMITTER_A, 0x901000f0 },	/* ASP-2-TX */</div><div class='add'>+	{ CS8409_PIN_DMIC1_IN, 0x90a00090 },		/* DMIC-1 */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl cs8409_cs42l42_pincfgs_no_dmic[] = {</div><div class='add'>+	{ CS8409_PIN_ASP1_TRANSMITTER_A, 0x042120f0 },	/* ASP-1-TX */</div><div class='add'>+	{ CS8409_PIN_ASP1_RECEIVER_A, 0x04a12050 },	/* ASP-1-RX */</div><div class='add'>+	{ CS8409_PIN_ASP2_TRANSMITTER_A, 0x901000f0 },	/* ASP-2-TX */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor specific HW configuration for CS42L42 */</div><div class='add'>+static const struct cs8409_i2c_param cs42l42_init_reg_seq[] = {</div><div class='add'>+	{ CS42L42_I2C_TIMEOUT, 0xB0 },</div><div class='add'>+	{ CS42L42_ADC_CTL, 0x00 },</div><div class='add'>+	{ 0x1D02, 0x06 },</div><div class='add'>+	{ CS42L42_ADC_VOLUME, 0x9F },</div><div class='add'>+	{ CS42L42_OSC_SWITCH, 0x01 },</div><div class='add'>+	{ CS42L42_MCLK_CTL, 0x02 },</div><div class='add'>+	{ CS42L42_SRC_CTL, 0x03 },</div><div class='add'>+	{ CS42L42_MCLK_SRC_SEL, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_FRM_CFG, 0x13 },</div><div class='add'>+	{ CS42L42_FSYNC_P_LOWER, 0xFF },</div><div class='add'>+	{ CS42L42_FSYNC_P_UPPER, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_CLK_CFG, 0x20 },</div><div class='add'>+	{ CS42L42_SPDIF_CLK_CFG, 0x0D },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_LSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_LSB, 0x20 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH3_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH3_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH3_BIT_LSB, 0x80 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH4_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH4_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH4_BIT_LSB, 0xA0 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_EN, 0x0C },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_EN, 0x01 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_LSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_SZ_EN, 0x01 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x0A },</div><div class='add'>+	{ CS42L42_PWR_CTL2, 0x84 },</div><div class='add'>+	{ CS42L42_MIXER_CHA_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_CHB_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_ADC_VOL, 0x3f },</div><div class='add'>+	{ CS42L42_HP_CTL, 0x0D },</div><div class='add'>+	{ CS42L42_MIC_DET_CTL1, 0xB6 },</div><div class='add'>+	{ CS42L42_TIPSENSE_CTL, 0xC2 },</div><div class='add'>+	{ CS42L42_HS_CLAMP_DISABLE, 0x01 },</div><div class='add'>+	{ CS42L42_HS_SWITCH_CTL, 0xF3 },</div><div class='add'>+	{ CS42L42_PWR_CTL3, 0x20 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL2, 0x00 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL3, 0x00 },</div><div class='add'>+	{ CS42L42_TSENSE_CTL, 0x80 },</div><div class='add'>+	{ CS42L42_HS_BIAS_CTL, 0xC0 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x02, 10000 },</div><div class='add'>+	{ CS42L42_ADC_OVFL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_MIXER_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_RX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_TX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_CODEC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRCPL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_VPMON_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_PLL_LOCK_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_TSRS_PLUG_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT1_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT2_MASK, 0xff },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor specific hw configuration for CS8409 */</div><div class='add'>+const struct cs8409_cir_param cs8409_cs42l42_hw_cfg[] = {</div><div class='add'>+	/* +PLL1/2_EN, +I2C_EN */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG1, 0xb008 },</div><div class='add'>+	/* ASP1/2_EN=0, ASP1_STP=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG2, 0x0002 },</div><div class='add'>+	/* ASP1/2_BUS_IDLE=10, +GPIO_I2C */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG3, 0x0a80 },</div><div class='add'>+	/* ASP1.A: TX.LAP=0, TX.LSZ=24 bits, TX.LCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_TX_CTRL1, 0x0800 },</div><div class='add'>+	/* ASP1.A: TX.RAP=0, TX.RSZ=24 bits, TX.RCS=32 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_TX_CTRL2, 0x0820 },</div><div class='add'>+	/* ASP2.A: TX.LAP=0, TX.LSZ=24 bits, TX.LCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP2_A_TX_CTRL1, 0x0800 },</div><div class='add'>+	/* ASP2.A: TX.RAP=1, TX.RSZ=24 bits, TX.RCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP2_A_TX_CTRL2, 0x2800 },</div><div class='add'>+	/* ASP1.A: RX.LAP=0, RX.LSZ=24 bits, RX.LCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_RX_CTRL1, 0x0800 },</div><div class='add'>+	/* ASP1.A: RX.RAP=0, RX.RSZ=24 bits, RX.RCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_RX_CTRL2, 0x0800 },</div><div class='add'>+	/* ASP1: LCHI = 00h */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL1, 0x8000 },</div><div class='add'>+	/* ASP1: MC/SC_SRCSEL=PLL1, LCPR=FFh */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL2, 0x28ff },</div><div class='add'>+	/* ASP1: MCEN=0, FSD=011, SCPOL_IN/OUT=0, SCDIV=1:4 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL3, 0x0062 },</div><div class='add'>+	/* ASP2: LCHI=1Fh */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP2_CLK_CTRL1, 0x801f },</div><div class='add'>+	/* ASP2: MC/SC_SRCSEL=PLL1, LCPR=3Fh */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP2_CLK_CTRL2, 0x283f },</div><div class='add'>+	/* ASP2: 5050=1, MCEN=0, FSD=010, SCPOL_IN/OUT=1, SCDIV=1:16 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP2_CLK_CTRL3, 0x805c },</div><div class='add'>+	/* DMIC1_MO=10b, DMIC1/2_SR=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DMIC_CFG, 0x0023 },</div><div class='add'>+	/* ASP1/2_BEEP=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_BEEP_CFG, 0x0000 },</div><div class='add'>+	/* ASP1/2_EN=1, ASP1_STP=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG2, 0x0062 },</div><div class='add'>+	/* -PLL2_EN */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG1, 0x9008 },</div><div class='add'>+	/* TX2.A: pre-scale att.=0 dB */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PRE_SCALE_ATTN2, 0x0000 },</div><div class='add'>+	/* ASP1/2_xxx_EN=1, ASP1/2_MCLK_EN=0, DMIC1_SCL_EN=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PAD_CFG_SLW_RATE_CTRL, 0xfc03 },</div><div class='add'>+	/* test mode on */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc0, 0x9999 },</div><div class='add'>+	/* GPIO hysteresis = 30 us */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc5, 0x0000 },</div><div class='add'>+	/* test mode off */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc0, 0x0000 },</div><div class='add'>+	{} /* Terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct cs8409_cir_param cs8409_cs42l42_bullseye_atn[] = {</div><div class='add'>+	/* EQ_SEL=1, EQ1/2_EN=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_CTRL1, 0x4000 },</div><div class='add'>+	/* +EQ_ACC */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0x4000 },</div><div class='add'>+	/* +EQ2_EN */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_CTRL1, 0x4010 },</div><div class='add'>+	/* EQ_DATA_HI=0x0647 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x0647 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=0, EQ_DATA_LO=0x67 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc0c7 },</div><div class='add'>+	/* EQ_DATA_HI=0x0647 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x0647 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=1, EQ_DATA_LO=0x67 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc1c7 },</div><div class='add'>+	/* EQ_DATA_HI=0xf370 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0xf370 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=2, EQ_DATA_LO=0x71 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc271 },</div><div class='add'>+	/* EQ_DATA_HI=0x1ef8 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x1ef8 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=3, EQ_DATA_LO=0x48 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc348 },</div><div class='add'>+	/* EQ_DATA_HI=0xc110 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0xc110 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=4, EQ_DATA_LO=0x5a */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc45a },</div><div class='add'>+	/* EQ_DATA_HI=0x1f29 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x1f29 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=5, EQ_DATA_LO=0x74 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc574 },</div><div class='add'>+	/* EQ_DATA_HI=0x1d7a */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x1d7a },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=6, EQ_DATA_LO=0x53 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc653 },</div><div class='add'>+	/* EQ_DATA_HI=0xc38c */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0xc38c },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=7, EQ_DATA_LO=0x14 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc714 },</div><div class='add'>+	/* EQ_DATA_HI=0x1ca3 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0x1ca3 },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=8, EQ_DATA_LO=0xc7 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc8c7 },</div><div class='add'>+	/* EQ_DATA_HI=0xc38c */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W1, 0xc38c },</div><div class='add'>+	/* +EQ_WRT, +EQ_ACC, EQ_ADR=9, EQ_DATA_LO=0x14 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0xc914 },</div><div class='add'>+	/* -EQ_ACC, -EQ_WRT */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PFE_COEF_W2, 0x0000 },</div><div class='add'>+	{} /* Terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sub_codec cs8409_cs42l42_codec = {</div><div class='add'>+	.addr = CS42L42_I2C_ADDR,</div><div class='add'>+	.reset_gpio = CS8409_CS42L42_RESET,</div><div class='add'>+	.irq_mask = CS8409_CS42L42_INT,</div><div class='add'>+	.init_seq = cs42l42_init_reg_seq,</div><div class='add'>+	.init_seq_num = ARRAY_SIZE(cs42l42_init_reg_seq),</div><div class='add'>+	.hp_jack_in = 0,</div><div class='add'>+	.mic_jack_in = 0,</div><div class='add'>+	.paged = 1,</div><div class='add'>+	.suspended = 1,</div><div class='add'>+	.no_type_dect = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                          Dolphin Specific Arrays</div><div class='add'>+ *                            CS8409/ 2 X CS42L42</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+const struct hda_verb dolphin_init_verbs[] = {</div><div class='add'>+	{ 0x01, AC_VERB_SET_GPIO_WAKE_MASK, DOLPHIN_WAKE }, /* WAKE from GPIO 0,4 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_STATE, 0x0001 }, /* Enable VPW processing  */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_COEF_INDEX, 0x0002 }, /* Configure GPIO 6,7 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_COEF,  0x0080 }, /* I2C mode */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_COEF_INDEX, 0x005b }, /* Set I2C bus speed */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, AC_VERB_SET_PROC_COEF,  0x0200 }, /* 100kHz I2C_STO = 2 */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dolphin_pincfgs[] = {</div><div class='add'>+	{ 0x24, 0x022210f0 }, /* ASP-1-TX-A */</div><div class='add'>+	{ 0x25, 0x010240f0 }, /* ASP-1-TX-B */</div><div class='add'>+	{ 0x34, 0x02a21050 }, /* ASP-1-RX */</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor specific HW configuration for CS42L42 */</div><div class='add'>+static const struct cs8409_i2c_param dolphin_c0_init_reg_seq[] = {</div><div class='add'>+	{ CS42L42_I2C_TIMEOUT, 0xB0 },</div><div class='add'>+	{ CS42L42_ADC_CTL, 0x00 },</div><div class='add'>+	{ 0x1D02, 0x06 },</div><div class='add'>+	{ CS42L42_ADC_VOLUME, 0x9F },</div><div class='add'>+	{ CS42L42_OSC_SWITCH, 0x01 },</div><div class='add'>+	{ CS42L42_MCLK_CTL, 0x02 },</div><div class='add'>+	{ CS42L42_SRC_CTL, 0x03 },</div><div class='add'>+	{ CS42L42_MCLK_SRC_SEL, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_FRM_CFG, 0x13 },</div><div class='add'>+	{ CS42L42_FSYNC_P_LOWER, 0xFF },</div><div class='add'>+	{ CS42L42_FSYNC_P_UPPER, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_CLK_CFG, 0x20 },</div><div class='add'>+	{ CS42L42_SPDIF_CLK_CFG, 0x0D },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_LSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_LSB, 0x20 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_EN, 0x0C },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_EN, 0x01 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_LSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_SZ_EN, 0x01 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x0A },</div><div class='add'>+	{ CS42L42_PWR_CTL2, 0x84 },</div><div class='add'>+	{ CS42L42_HP_CTL, 0x0D },</div><div class='add'>+	{ CS42L42_MIXER_CHA_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_CHB_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_ADC_VOL, 0x3f },</div><div class='add'>+	{ CS42L42_MIC_DET_CTL1, 0xB6 },</div><div class='add'>+	{ CS42L42_TIPSENSE_CTL, 0xC2 },</div><div class='add'>+	{ CS42L42_HS_CLAMP_DISABLE, 0x01 },</div><div class='add'>+	{ CS42L42_HS_SWITCH_CTL, 0xF3 },</div><div class='add'>+	{ CS42L42_PWR_CTL3, 0x20 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL2, 0x00 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL3, 0x00 },</div><div class='add'>+	{ CS42L42_TSENSE_CTL, 0x80 },</div><div class='add'>+	{ CS42L42_HS_BIAS_CTL, 0xC0 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x02, 10000 },</div><div class='add'>+	{ CS42L42_ADC_OVFL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_MIXER_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_RX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_TX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_CODEC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRCPL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_VPMON_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_PLL_LOCK_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_TSRS_PLUG_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT1_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT2_MASK, 0xff }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cs8409_i2c_param dolphin_c1_init_reg_seq[] = {</div><div class='add'>+	{ CS42L42_I2C_TIMEOUT, 0xB0 },</div><div class='add'>+	{ CS42L42_ADC_CTL, 0x00 },</div><div class='add'>+	{ 0x1D02, 0x06 },</div><div class='add'>+	{ CS42L42_ADC_VOLUME, 0x9F },</div><div class='add'>+	{ CS42L42_OSC_SWITCH, 0x01 },</div><div class='add'>+	{ CS42L42_MCLK_CTL, 0x02 },</div><div class='add'>+	{ CS42L42_SRC_CTL, 0x03 },</div><div class='add'>+	{ CS42L42_MCLK_SRC_SEL, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_FRM_CFG, 0x13 },</div><div class='add'>+	{ CS42L42_FSYNC_P_LOWER, 0xFF },</div><div class='add'>+	{ CS42L42_FSYNC_P_UPPER, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_CLK_CFG, 0x20 },</div><div class='add'>+	{ CS42L42_SPDIF_CLK_CFG, 0x0D },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH1_BIT_LSB, 0x80 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_CH2_BIT_LSB, 0xA0 },</div><div class='add'>+	{ CS42L42_ASP_RX_DAI0_EN, 0x0C },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_EN, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH_AP_RES, 0x02 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_MSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_CH1_BIT_LSB, 0x00 },</div><div class='add'>+	{ CS42L42_ASP_TX_SZ_EN, 0x00 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x0E },</div><div class='add'>+	{ CS42L42_PWR_CTL2, 0x84 },</div><div class='add'>+	{ CS42L42_HP_CTL, 0x0D },</div><div class='add'>+	{ CS42L42_MIXER_CHA_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_CHB_VOL, 0x3F },</div><div class='add'>+	{ CS42L42_MIXER_ADC_VOL, 0x3f },</div><div class='add'>+	{ CS42L42_MIC_DET_CTL1, 0xB6 },</div><div class='add'>+	{ CS42L42_TIPSENSE_CTL, 0xC2 },</div><div class='add'>+	{ CS42L42_HS_CLAMP_DISABLE, 0x01 },</div><div class='add'>+	{ CS42L42_HS_SWITCH_CTL, 0xF3 },</div><div class='add'>+	{ CS42L42_PWR_CTL3, 0x20 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL2, 0x00 },</div><div class='add'>+	{ CS42L42_RSENSE_CTL3, 0x00 },</div><div class='add'>+	{ CS42L42_TSENSE_CTL, 0x80 },</div><div class='add'>+	{ CS42L42_HS_BIAS_CTL, 0xC0 },</div><div class='add'>+	{ CS42L42_PWR_CTL1, 0x06, 10000 },</div><div class='add'>+	{ CS42L42_ADC_OVFL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_MIXER_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_RX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_ASP_TX_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_CODEC_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_SRCPL_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_VPMON_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_PLL_LOCK_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_TSRS_PLUG_INT_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT1_MASK, 0xff },</div><div class='add'>+	{ CS42L42_DET_INT2_MASK, 0xff }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Vendor specific hw configuration for CS8409 */</div><div class='add'>+const struct cs8409_cir_param dolphin_hw_cfg[] = {</div><div class='add'>+	/* +PLL1/2_EN, +I2C_EN */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG1, 0xb008 },</div><div class='add'>+	/* ASP1_EN=0, ASP1_STP=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG2, 0x0002 },</div><div class='add'>+	/* ASP1/2_BUS_IDLE=10, +GPIO_I2C */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG3, 0x0a80 },</div><div class='add'>+	/* ASP1.A: TX.LAP=0, TX.LSZ=24 bits, TX.LCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_TX_CTRL1, 0x0800 },</div><div class='add'>+	/* ASP1.A: TX.RAP=0, TX.RSZ=24 bits, TX.RCS=32 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_TX_CTRL2, 0x0820 },</div><div class='add'>+	/* ASP1.B: TX.LAP=0, TX.LSZ=24 bits, TX.LCS=128 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_B_TX_CTRL1, 0x0880 },</div><div class='add'>+	/* ASP1.B: TX.RAP=0, TX.RSZ=24 bits, TX.RCS=160 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_B_TX_CTRL2, 0x08a0 },</div><div class='add'>+	/* ASP1.A: RX.LAP=0, RX.LSZ=24 bits, RX.LCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_RX_CTRL1, 0x0800 },</div><div class='add'>+	/* ASP1.A: RX.RAP=0, RX.RSZ=24 bits, RX.RCS=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, ASP1_A_RX_CTRL2, 0x0800 },</div><div class='add'>+	/* ASP1: LCHI = 00h */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL1, 0x8000 },</div><div class='add'>+	/* ASP1: MC/SC_SRCSEL=PLL1, LCPR=FFh */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL2, 0x28ff },</div><div class='add'>+	/* ASP1: MCEN=0, FSD=011, SCPOL_IN/OUT=0, SCDIV=1:4 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_ASP1_CLK_CTRL3, 0x0062 },</div><div class='add'>+	/* ASP1/2_BEEP=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_BEEP_CFG, 0x0000 },</div><div class='add'>+	/* ASP1_EN=1, ASP1_STP=1 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG2, 0x0022 },</div><div class='add'>+	/* -PLL2_EN */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_DEV_CFG1, 0x9008 },</div><div class='add'>+	/* ASP1_xxx_EN=1, ASP1_MCLK_EN=0 */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, CS8409_PAD_CFG_SLW_RATE_CTRL, 0x5400 },</div><div class='add'>+	/* test mode on */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc0, 0x9999 },</div><div class='add'>+	/* GPIO hysteresis = 30 us */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc5, 0x0000 },</div><div class='add'>+	/* test mode off */</div><div class='add'>+	{ CS8409_PIN_VENDOR_WIDGET, 0xc0, 0x0000 },</div><div class='add'>+	{} /* Terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sub_codec dolphin_cs42l42_0 = {</div><div class='add'>+	.addr = DOLPHIN_C0_I2C_ADDR,</div><div class='add'>+	.reset_gpio = DOLPHIN_C0_RESET,</div><div class='add'>+	.irq_mask = DOLPHIN_C0_INT,</div><div class='add'>+	.init_seq = dolphin_c0_init_reg_seq,</div><div class='add'>+	.init_seq_num = ARRAY_SIZE(dolphin_c0_init_reg_seq),</div><div class='add'>+	.hp_jack_in = 0,</div><div class='add'>+	.mic_jack_in = 0,</div><div class='add'>+	.paged = 1,</div><div class='add'>+	.suspended = 1,</div><div class='add'>+	.no_type_dect = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sub_codec dolphin_cs42l42_1 = {</div><div class='add'>+	.addr = DOLPHIN_C1_I2C_ADDR,</div><div class='add'>+	.reset_gpio = DOLPHIN_C1_RESET,</div><div class='add'>+	.irq_mask = DOLPHIN_C1_INT,</div><div class='add'>+	.init_seq = dolphin_c1_init_reg_seq,</div><div class='add'>+	.init_seq_num = ARRAY_SIZE(dolphin_c1_init_reg_seq),</div><div class='add'>+	.hp_jack_in = 0,</div><div class='add'>+	.mic_jack_in = 0,</div><div class='add'>+	.paged = 1,</div><div class='add'>+	.suspended = 1,</div><div class='add'>+	.no_type_dect = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                         CS8409 Patch Driver Structs</div><div class='add'>+ *                    Arrays Used for all projects using CS8409</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+const struct hda_quirk cs8409_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A11, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A12, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A23, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A24, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A25, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A29, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A2A, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A2B, "Bullseye", CS8409_BULLSEYE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A77, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A78, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A79, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A7A, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A7D, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A7E, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A7F, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0A80, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB0, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB2, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB1, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB3, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB4, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AB5, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0ACF, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AD0, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AD1, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AD2, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AD3, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AD9, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0ADA, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0ADB, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0ADC, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0ADF, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AE0, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AE1, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AE2, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AE9, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AEA, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AEB, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AEC, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AED, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AEE, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AEF, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AF0, "Cyborg", CS8409_CYBORG),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B92, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B93, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B94, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B95, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B96, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0B97, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BA5, "Odin", CS8409_ODIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BA6, "Odin", CS8409_ODIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BA8, "Odin", CS8409_ODIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BAA, "Odin", CS8409_ODIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BAE, "Odin", CS8409_ODIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB2, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB3, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB4, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB5, "Warlock N3 15 TGL-U Nuvoton EC", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB6, "Warlock V3 15 TGL-U Nuvoton EC", CS8409_WARLOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB8, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BB9, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BBA, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BBB, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BBC, "Warlock MLK", CS8409_WARLOCK_MLK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BBD, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BD4, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BD5, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BD6, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BD7, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0BD8, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C43, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C50, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C51, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C52, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C73, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C75, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C7D, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0C7F, "Dolphin", CS8409_DOLPHIN),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Dell Inspiron models with cs8409/cs42l42 */</div><div class='add'>+const struct hda_model_fixup cs8409_models[] = {</div><div class='add'>+	{ .id = CS8409_BULLSEYE, .name = "bullseye" },</div><div class='add'>+	{ .id = CS8409_WARLOCK, .name = "warlock" },</div><div class='add'>+	{ .id = CS8409_WARLOCK_MLK, .name = "warlock mlk" },</div><div class='add'>+	{ .id = CS8409_WARLOCK_MLK_DUAL_MIC, .name = "warlock mlk dual mic" },</div><div class='add'>+	{ .id = CS8409_CYBORG, .name = "cyborg" },</div><div class='add'>+	{ .id = CS8409_DOLPHIN, .name = "dolphin" },</div><div class='add'>+	{ .id = CS8409_ODIN, .name = "odin" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct hda_fixup cs8409_fixups[] = {</div><div class='add'>+	[CS8409_BULLSEYE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_WARLOCK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_WARLOCK_MLK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_WARLOCK_MLK_DUAL_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_CYBORG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_FIXUPS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs8409_cs42l42_fixups,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_DOLPHIN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dolphin_pincfgs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_DOLPHIN_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_DOLPHIN_FIXUPS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = dolphin_fixups,</div><div class='add'>+	},</div><div class='add'>+	[CS8409_ODIN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cs8409_cs42l42_pincfgs_no_dmic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CS8409_FIXUPS,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/cs8409.c b/sound/hda/codecs/cirrus/cs8409.c<br/>new file mode 100644<br/>index 000000000000..2c02d3be89ee<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/cs8409.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/cs8409.c</a></div><div class='hunk'>@@ -0,0 +1,1475 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Cirrus Logic CS8409 HDA bridge chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cs8409.h"</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                        CS8409 Specific Functions</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static int cs8409_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* keep the ADCs powered up when it's dynamically switchable */</div><div class='add'>+	if (spec-&gt;gen.dyn_adc_switch) {</div><div class='add'>+		unsigned int done = 0;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; spec-&gt;gen.input_mux.num_items; i++) {</div><div class='add'>+			int idx = spec-&gt;gen.dyn_adc_idx[i];</div><div class='add'>+</div><div class='add'>+			if (done &amp; (1 &lt;&lt; idx))</div><div class='add'>+				continue;</div><div class='add'>+			snd_hda_gen_fix_pin_power(codec, spec-&gt;gen.adc_nids[idx]);</div><div class='add'>+			done |= 1 &lt;&lt; idx;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs8409_disable_i2c_clock_worker(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static struct cs8409_spec *cs8409_alloc_spec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return NULL;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	spec-&gt;codec = codec;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	mutex_init(&amp;spec-&gt;i2c_mux);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;spec-&gt;i2c_clk_work, cs8409_disable_i2c_clock_worker);</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+</div><div class='add'>+	return spec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cs8409_vendor_coef_get(struct hda_codec *codec, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_VENDOR_WIDGET, 0, AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	return snd_hda_codec_read(codec, CS8409_PIN_VENDOR_WIDGET, 0, AC_VERB_GET_PROC_COEF, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cs8409_vendor_coef_set(struct hda_codec *codec, unsigned int idx,</div><div class='add'>+					  unsigned int coef)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_VENDOR_WIDGET, 0, AC_VERB_SET_COEF_INDEX, idx);</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_VENDOR_WIDGET, 0, AC_VERB_SET_PROC_COEF, coef);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cs8409_enable_i2c_clock - Disable I2C clocks</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ * Disable I2C clocks.</div><div class='add'>+ * This must be called when the i2c mutex is unlocked.</div><div class='add'>+ */</div><div class='add'>+static void cs8409_disable_i2c_clock(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;i2c_mux);</div><div class='add'>+	if (spec-&gt;i2c_clck_enabled) {</div><div class='add'>+		cs8409_vendor_coef_set(spec-&gt;codec, 0x0,</div><div class='add'>+			       cs8409_vendor_coef_get(spec-&gt;codec, 0x0) &amp; 0xfffffff7);</div><div class='add'>+		spec-&gt;i2c_clck_enabled = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cs8409_disable_i2c_clock_worker - Worker that disable the I2C Clock after 25ms without use</div><div class='add'>+ */</div><div class='add'>+static void cs8409_disable_i2c_clock_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = container_of(work, struct cs8409_spec, i2c_clk_work.work);</div><div class='add'>+</div><div class='add'>+	cs8409_disable_i2c_clock(spec-&gt;codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cs8409_enable_i2c_clock - Enable I2C clocks</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ * Enable I2C clocks.</div><div class='add'>+ * This must be called when the i2c mutex is locked.</div><div class='add'>+ */</div><div class='add'>+static void cs8409_enable_i2c_clock(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* Cancel the disable timer, but do not wait for any running disable functions to finish.</div><div class='add'>+	 * If the disable timer runs out before cancel, the delayed work thread will be blocked,</div><div class='add'>+	 * waiting for the mutex to become unlocked. This mutex will be locked for the duration of</div><div class='add'>+	 * any i2c transaction, so the disable function will run to completion immediately</div><div class='add'>+	 * afterwards in the scenario. The next enable call will re-enable the clock, regardless.</div><div class='add'>+	 */</div><div class='add'>+	cancel_delayed_work(&amp;spec-&gt;i2c_clk_work);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;i2c_clck_enabled) {</div><div class='add'>+		cs8409_vendor_coef_set(codec, 0x0, cs8409_vendor_coef_get(codec, 0x0) | 0x8);</div><div class='add'>+		spec-&gt;i2c_clck_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+	queue_delayed_work(system_power_efficient_wq, &amp;spec-&gt;i2c_clk_work, msecs_to_jiffies(25));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_wait_complete - Wait for I2C transaction</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ *</div><div class='add'>+ * Wait for I2C transaction to complete.</div><div class='add'>+ * Return -ETIMEDOUT if transaction wait times out.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_wait_complete(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int retval;</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(cs8409_vendor_coef_get, retval, retval &amp; 0x18,</div><div class='add'>+		CS42L42_I2C_SLEEP_US, CS42L42_I2C_TIMEOUT_US, false, codec, CS8409_I2C_STS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_set_i2c_dev_addr - Set i2c address for transaction</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ * @addr: I2C Address</div><div class='add'>+ */</div><div class='add'>+static void cs8409_set_i2c_dev_addr(struct hda_codec *codec, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dev_addr != addr) {</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_I2C_ADDR, addr);</div><div class='add'>+		spec-&gt;dev_addr = addr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_set_page - CS8409 I2C set page register.</div><div class='add'>+ * @scodec: the codec instance</div><div class='add'>+ * @i2c_reg: Page register</div><div class='add'>+ *</div><div class='add'>+ * Returns negative on error.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_set_page(struct sub_codec *scodec, unsigned int i2c_reg)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = scodec-&gt;codec;</div><div class='add'>+</div><div class='add'>+	if (scodec-&gt;paged &amp;&amp; (scodec-&gt;last_page != (i2c_reg &gt;&gt; 8))) {</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_I2C_QWRITE, i2c_reg &gt;&gt; 8);</div><div class='add'>+		if (cs8409_i2c_wait_complete(codec) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		scodec-&gt;last_page = i2c_reg &gt;&gt; 8;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_read - CS8409 I2C Read.</div><div class='add'>+ * @scodec: the codec instance</div><div class='add'>+ * @addr: Register to read</div><div class='add'>+ *</div><div class='add'>+ * Returns negative on error, otherwise returns read value in bits 0-7.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_read(struct sub_codec *scodec, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = scodec-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i2c_reg_data;</div><div class='add'>+	unsigned int read_data;</div><div class='add'>+</div><div class='add'>+	if (scodec-&gt;suspended)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;i2c_mux);</div><div class='add'>+	cs8409_enable_i2c_clock(codec);</div><div class='add'>+	cs8409_set_i2c_dev_addr(codec, scodec-&gt;addr);</div><div class='add'>+</div><div class='add'>+	if (cs8409_i2c_set_page(scodec, addr))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	i2c_reg_data = (addr &lt;&lt; 8) &amp; 0x0ffff;</div><div class='add'>+	cs8409_vendor_coef_set(codec, CS8409_I2C_QREAD, i2c_reg_data);</div><div class='add'>+	if (cs8409_i2c_wait_complete(codec) &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Register in bits 15-8 and the data in 7-0 */</div><div class='add'>+	read_data = cs8409_vendor_coef_get(codec, CS8409_I2C_QREAD);</div><div class='add'>+</div><div class='add'>+	return read_data &amp; 0x0ff;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	codec_err(codec, "%s() Failed 0x%02x : 0x%04x\n", __func__, scodec-&gt;addr, addr);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_bulk_read - CS8409 I2C Read Sequence.</div><div class='add'>+ * @scodec: the codec instance</div><div class='add'>+ * @seq: Register Sequence to read</div><div class='add'>+ * @count: Number of registeres to read</div><div class='add'>+ *</div><div class='add'>+ * Returns negative on error, values are read into value element of cs8409_i2c_param sequence.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_bulk_read(struct sub_codec *scodec, struct cs8409_i2c_param *seq, int count)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = scodec-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i2c_reg_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (scodec-&gt;suspended)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;i2c_mux);</div><div class='add'>+	cs8409_set_i2c_dev_addr(codec, scodec-&gt;addr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		cs8409_enable_i2c_clock(codec);</div><div class='add'>+		if (cs8409_i2c_set_page(scodec, seq[i].addr))</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		i2c_reg_data = (seq[i].addr &lt;&lt; 8) &amp; 0x0ffff;</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_I2C_QREAD, i2c_reg_data);</div><div class='add'>+</div><div class='add'>+		if (cs8409_i2c_wait_complete(codec) &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		seq[i].value = cs8409_vendor_coef_get(codec, CS8409_I2C_QREAD) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	codec_err(codec, "I2C Bulk Write Failed 0x%02x\n", scodec-&gt;addr);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_write - CS8409 I2C Write.</div><div class='add'>+ * @scodec: the codec instance</div><div class='add'>+ * @addr: Register to write to</div><div class='add'>+ * @value: Data to write</div><div class='add'>+ *</div><div class='add'>+ * Returns negative on error, otherwise returns 0.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_write(struct sub_codec *scodec, unsigned int addr, unsigned int value)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = scodec-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i2c_reg_data;</div><div class='add'>+</div><div class='add'>+	if (scodec-&gt;suspended)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;i2c_mux);</div><div class='add'>+</div><div class='add'>+	cs8409_enable_i2c_clock(codec);</div><div class='add'>+	cs8409_set_i2c_dev_addr(codec, scodec-&gt;addr);</div><div class='add'>+</div><div class='add'>+	if (cs8409_i2c_set_page(scodec, addr))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	i2c_reg_data = ((addr &lt;&lt; 8) &amp; 0x0ff00) | (value &amp; 0x0ff);</div><div class='add'>+	cs8409_vendor_coef_set(codec, CS8409_I2C_QWRITE, i2c_reg_data);</div><div class='add'>+</div><div class='add'>+	if (cs8409_i2c_wait_complete(codec) &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	codec_err(codec, "%s() Failed 0x%02x : 0x%04x\n", __func__, scodec-&gt;addr, addr);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * cs8409_i2c_bulk_write - CS8409 I2C Write Sequence.</div><div class='add'>+ * @scodec: the codec instance</div><div class='add'>+ * @seq: Register Sequence to write</div><div class='add'>+ * @count: Number of registeres to write</div><div class='add'>+ *</div><div class='add'>+ * Returns negative on error.</div><div class='add'>+ */</div><div class='add'>+static int cs8409_i2c_bulk_write(struct sub_codec *scodec, const struct cs8409_i2c_param *seq,</div><div class='add'>+				 int count)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = scodec-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i2c_reg_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (scodec-&gt;suspended)</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;i2c_mux);</div><div class='add'>+	cs8409_set_i2c_dev_addr(codec, scodec-&gt;addr);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		cs8409_enable_i2c_clock(codec);</div><div class='add'>+		if (cs8409_i2c_set_page(scodec, seq[i].addr))</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		i2c_reg_data = ((seq[i].addr &lt;&lt; 8) &amp; 0x0ff00) | (seq[i].value &amp; 0x0ff);</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_I2C_QWRITE, i2c_reg_data);</div><div class='add'>+</div><div class='add'>+		if (cs8409_i2c_wait_complete(codec) &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		/* Certain use cases may require a delay</div><div class='add'>+		 * after a write operation before proceeding.</div><div class='add'>+		 */</div><div class='add'>+		if (seq[i].delay)</div><div class='add'>+			fsleep(seq[i].delay);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	codec_err(codec, "I2C Bulk Write Failed 0x%02x\n", scodec-&gt;addr);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int ret = snd_hda_gen_init(codec);</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_BUILD);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable/Disable Unsolicited Response */</div><div class='add'>+static void cs8409_enable_ur(struct hda_codec *codec, int flag)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int ur_gpios = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_scodecs; i++)</div><div class='add'>+		ur_gpios |= spec-&gt;scodecs[i]-&gt;irq_mask;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK,</div><div class='add'>+			    flag ? ur_gpios : 0);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='add'>+			    flag ? AC_UNSOL_ENABLED : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs8409_fix_caps(struct hda_codec *codec, unsigned int nid)</div><div class='add'>+{</div><div class='add'>+	int caps;</div><div class='add'>+</div><div class='add'>+	/* CS8409 is simple HDA bridge and intended to be used with a remote</div><div class='add'>+	 * companion codec. Most of input/output PIN(s) have only basic</div><div class='add'>+	 * capabilities. Receive and Transmit NID(s) have only OUTC and INC</div><div class='add'>+	 * capabilities and no presence detect capable (PDC) and call to</div><div class='add'>+	 * snd_hda_gen_build_controls() will mark them as non detectable</div><div class='add'>+	 * phantom jacks. However, a companion codec may be</div><div class='add'>+	 * connected to these pins which supports jack detect</div><div class='add'>+	 * capabilities. We have to override pin capabilities,</div><div class='add'>+	 * otherwise they will not be created as input devices.</div><div class='add'>+	 */</div><div class='add'>+	caps = snd_hdac_read_parm(&amp;codec-&gt;core, nid, AC_PAR_PIN_CAP);</div><div class='add'>+	if (caps &gt;= 0)</div><div class='add'>+		snd_hdac_override_parm(&amp;codec-&gt;core, nid, AC_PAR_PIN_CAP,</div><div class='add'>+				       (caps | (AC_PINCAP_IMP_SENSE | AC_PINCAP_PRES_DETECT)));</div><div class='add'>+</div><div class='add'>+	snd_hda_override_wcaps(codec, nid, (get_wcaps(codec, nid) | AC_WCAP_UNSOL_CAP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_spk_sw_gpio_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = !!(spec-&gt;gpio_data &amp; spec-&gt;speaker_pdn_gpio);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_spk_sw_gpio_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+</div><div class='add'>+	gpio_data = (spec-&gt;gpio_data &amp; ~spec-&gt;speaker_pdn_gpio) |</div><div class='add'>+		(ucontrol-&gt;value.integer.value[0] ? spec-&gt;speaker_pdn_gpio : 0);</div><div class='add'>+	if (gpio_data == spec-&gt;gpio_data)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;gpio_data = gpio_data;</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA, spec-&gt;gpio_data);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new cs8409_spk_sw_ctrl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = snd_ctl_boolean_mono_info,</div><div class='add'>+	.get = cs8409_spk_sw_gpio_get,</div><div class='add'>+	.put = cs8409_spk_sw_gpio_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                        CS42L42 Specific Functions</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+int cs42l42_volume_info(struct snd_kcontrol *kctrl, struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int ofs = get_amp_offset(kctrl);</div><div class='add'>+	u8 chs = get_amp_channels(kctrl);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+</div><div class='add'>+	switch (ofs) {</div><div class='add'>+	case CS42L42_VOL_DAC:</div><div class='add'>+		uinfo-&gt;value.integer.min = CS42L42_HP_VOL_REAL_MIN;</div><div class='add'>+		uinfo-&gt;value.integer.max = CS42L42_HP_VOL_REAL_MAX;</div><div class='add'>+		break;</div><div class='add'>+	case CS42L42_VOL_ADC:</div><div class='add'>+		uinfo-&gt;value.integer.min = CS42L42_AMIC_VOL_REAL_MIN;</div><div class='add'>+		uinfo-&gt;value.integer.max = CS42L42_AMIC_VOL_REAL_MAX;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs42l42_volume_get(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uctrl)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kctrl);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[get_amp_index(kctrl)];</div><div class='add'>+	int chs = get_amp_channels(kctrl);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kctrl);</div><div class='add'>+	long *valp = uctrl-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	switch (ofs) {</div><div class='add'>+	case CS42L42_VOL_DAC:</div><div class='add'>+		if (chs &amp; BIT(0))</div><div class='add'>+			*valp++ = cs42l42-&gt;vol[ofs];</div><div class='add'>+		if (chs &amp; BIT(1))</div><div class='add'>+			*valp = cs42l42-&gt;vol[ofs+1];</div><div class='add'>+		break;</div><div class='add'>+	case CS42L42_VOL_ADC:</div><div class='add'>+		if (chs &amp; BIT(0))</div><div class='add'>+			*valp = cs42l42-&gt;vol[ofs];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs42l42_mute(struct sub_codec *cs42l42, int vol_type,</div><div class='add'>+	unsigned int chs, bool mute)</div><div class='add'>+{</div><div class='add'>+	if (mute) {</div><div class='add'>+		if (vol_type == CS42L42_VOL_DAC) {</div><div class='add'>+			if (chs &amp; BIT(0))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_MIXER_CHA_VOL, 0x3f);</div><div class='add'>+			if (chs &amp; BIT(1))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_MIXER_CHB_VOL, 0x3f);</div><div class='add'>+		} else if (vol_type == CS42L42_VOL_ADC) {</div><div class='add'>+			if (chs &amp; BIT(0))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_ADC_VOLUME, 0x9f);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (vol_type == CS42L42_VOL_DAC) {</div><div class='add'>+			if (chs &amp; BIT(0))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_MIXER_CHA_VOL,</div><div class='add'>+					-(cs42l42-&gt;vol[CS42L42_DAC_CH0_VOL_OFFSET])</div><div class='add'>+					&amp; CS42L42_MIXER_CH_VOL_MASK);</div><div class='add'>+			if (chs &amp; BIT(1))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_MIXER_CHB_VOL,</div><div class='add'>+					-(cs42l42-&gt;vol[CS42L42_DAC_CH1_VOL_OFFSET])</div><div class='add'>+					&amp; CS42L42_MIXER_CH_VOL_MASK);</div><div class='add'>+		} else if (vol_type == CS42L42_VOL_ADC) {</div><div class='add'>+			if (chs &amp; BIT(0))</div><div class='add'>+				cs8409_i2c_write(cs42l42, CS42L42_ADC_VOLUME,</div><div class='add'>+					cs42l42-&gt;vol[CS42L42_ADC_VOL_OFFSET]</div><div class='add'>+					&amp; CS42L42_REG_AMIC_VOL_MASK);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs42l42_volume_put(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uctrl)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kctrl);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[get_amp_index(kctrl)];</div><div class='add'>+	int chs = get_amp_channels(kctrl);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kctrl);</div><div class='add'>+	long *valp = uctrl-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	switch (ofs) {</div><div class='add'>+	case CS42L42_VOL_DAC:</div><div class='add'>+		if (chs &amp; BIT(0))</div><div class='add'>+			cs42l42-&gt;vol[ofs] = *valp;</div><div class='add'>+		if (chs &amp; BIT(1)) {</div><div class='add'>+			valp++;</div><div class='add'>+			cs42l42-&gt;vol[ofs + 1] = *valp;</div><div class='add'>+		}</div><div class='add'>+		if (spec-&gt;playback_started)</div><div class='add'>+			cs42l42_mute(cs42l42, CS42L42_VOL_DAC, chs, false);</div><div class='add'>+		break;</div><div class='add'>+	case CS42L42_VOL_ADC:</div><div class='add'>+		if (chs &amp; BIT(0))</div><div class='add'>+			cs42l42-&gt;vol[ofs] = *valp;</div><div class='add'>+		if (spec-&gt;capture_started)</div><div class='add'>+			cs42l42_mute(cs42l42, CS42L42_VOL_ADC, chs, false);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs42l42_playback_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42;</div><div class='add'>+	int i;</div><div class='add'>+	bool mute;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		mute = false;</div><div class='add'>+		spec-&gt;playback_started = 1;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		mute = true;</div><div class='add'>+		spec-&gt;playback_started = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_scodecs; i++) {</div><div class='add'>+		cs42l42 = spec-&gt;scodecs[i];</div><div class='add'>+		cs42l42_mute(cs42l42, CS42L42_VOL_DAC, 0x3, mute);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs42l42_capture_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42;</div><div class='add'>+	int i;</div><div class='add'>+	bool mute;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		mute = false;</div><div class='add'>+		spec-&gt;capture_started = 1;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		mute = true;</div><div class='add'>+		spec-&gt;capture_started = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_scodecs; i++) {</div><div class='add'>+		cs42l42 = spec-&gt;scodecs[i];</div><div class='add'>+		cs42l42_mute(cs42l42, CS42L42_VOL_ADC, 0x3, mute);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Configure CS42L42 slave codec for jack autodetect */</div><div class='add'>+static void cs42l42_enable_jack_detect(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSBIAS_SC_AUTOCTL, cs42l42-&gt;hsbias_hiz);</div><div class='add'>+	/* Clear WAKE# */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_WAKE_CTL, 0x00C1);</div><div class='add'>+	/* Wait ~2.5ms */</div><div class='add'>+	usleep_range(2500, 3000);</div><div class='add'>+	/* Set mode WAKE# output follows the combination logic directly */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_WAKE_CTL, 0x00C0);</div><div class='add'>+	/* Clear interrupts status */</div><div class='add'>+	cs8409_i2c_read(cs42l42, CS42L42_TSRS_PLUG_STATUS);</div><div class='add'>+	/* Enable interrupt */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_TSRS_PLUG_INT_MASK, 0xF3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enable and run CS42L42 slave codec jack auto detect */</div><div class='add'>+static void cs42l42_run_jack_detect(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	/* Clear interrupts */</div><div class='add'>+	cs8409_i2c_read(cs42l42, CS42L42_CODEC_STATUS);</div><div class='add'>+	cs8409_i2c_read(cs42l42, CS42L42_DET_STATUS1);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_TSRS_PLUG_INT_MASK, 0xFF);</div><div class='add'>+	cs8409_i2c_read(cs42l42, CS42L42_TSRS_PLUG_STATUS);</div><div class='add'>+</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_PWR_CTL2, 0x87);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_DAC_CTL2, 0x86);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_MISC_DET_CTL, 0x07);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_CODEC_INT_MASK, 0xFD);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL2, 0x80);</div><div class='add'>+	/* Wait ~20ms*/</div><div class='add'>+	usleep_range(20000, 25000);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL1, 0x77);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL2, 0xc0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs42l42_manual_hs_det(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	unsigned int hs_det_status;</div><div class='add'>+	unsigned int hs_det_comp1;</div><div class='add'>+	unsigned int hs_det_comp2;</div><div class='add'>+	unsigned int hs_det_sw;</div><div class='add'>+	unsigned int hs_type;</div><div class='add'>+</div><div class='add'>+	/* Set hs detect to manual, active mode */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL2,</div><div class='add'>+			 (1 &lt;&lt; CS42L42_HSDET_CTRL_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSDET_SET_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSBIAS_REF_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSDET_AUTO_TIME_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Configure HS DET comparator reference levels. */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL1,</div><div class='add'>+			 (CS42L42_HSDET_COMP1_LVL_VAL &lt;&lt; CS42L42_HSDET_COMP1_LVL_SHIFT) |</div><div class='add'>+			 (CS42L42_HSDET_COMP2_LVL_VAL &lt;&lt; CS42L42_HSDET_COMP2_LVL_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Open the SW_HSB_HS3 switch and close SW_HSB_HS4 for a Type 1 headset. */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HS_SWITCH_CTL, CS42L42_HSDET_SW_COMP1);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	hs_det_status = cs8409_i2c_read(cs42l42, CS42L42_HS_DET_STATUS);</div><div class='add'>+</div><div class='add'>+	hs_det_comp1 = (hs_det_status &amp; CS42L42_HSDET_COMP1_OUT_MASK) &gt;&gt;</div><div class='add'>+			CS42L42_HSDET_COMP1_OUT_SHIFT;</div><div class='add'>+	hs_det_comp2 = (hs_det_status &amp; CS42L42_HSDET_COMP2_OUT_MASK) &gt;&gt;</div><div class='add'>+			CS42L42_HSDET_COMP2_OUT_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* Close the SW_HSB_HS3 switch for a Type 2 headset. */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HS_SWITCH_CTL, CS42L42_HSDET_SW_COMP2);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	hs_det_status = cs8409_i2c_read(cs42l42, CS42L42_HS_DET_STATUS);</div><div class='add'>+</div><div class='add'>+	hs_det_comp1 |= ((hs_det_status &amp; CS42L42_HSDET_COMP1_OUT_MASK) &gt;&gt;</div><div class='add'>+			CS42L42_HSDET_COMP1_OUT_SHIFT) &lt;&lt; 1;</div><div class='add'>+	hs_det_comp2 |= ((hs_det_status &amp; CS42L42_HSDET_COMP2_OUT_MASK) &gt;&gt;</div><div class='add'>+			CS42L42_HSDET_COMP2_OUT_SHIFT) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	/* Use Comparator 1 with 1.25V Threshold. */</div><div class='add'>+	switch (hs_det_comp1) {</div><div class='add'>+	case CS42L42_HSDET_COMP_TYPE1:</div><div class='add'>+		hs_type = CS42L42_PLUG_CTIA;</div><div class='add'>+		hs_det_sw = CS42L42_HSDET_SW_TYPE1;</div><div class='add'>+		break;</div><div class='add'>+	case CS42L42_HSDET_COMP_TYPE2:</div><div class='add'>+		hs_type = CS42L42_PLUG_OMTP;</div><div class='add'>+		hs_det_sw = CS42L42_HSDET_SW_TYPE2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Fallback to Comparator 2 with 1.75V Threshold. */</div><div class='add'>+		switch (hs_det_comp2) {</div><div class='add'>+		case CS42L42_HSDET_COMP_TYPE1:</div><div class='add'>+			hs_type = CS42L42_PLUG_CTIA;</div><div class='add'>+			hs_det_sw = CS42L42_HSDET_SW_TYPE1;</div><div class='add'>+			break;</div><div class='add'>+		case CS42L42_HSDET_COMP_TYPE2:</div><div class='add'>+			hs_type = CS42L42_PLUG_OMTP;</div><div class='add'>+			hs_det_sw = CS42L42_HSDET_SW_TYPE2;</div><div class='add'>+			break;</div><div class='add'>+		case CS42L42_HSDET_COMP_TYPE3:</div><div class='add'>+			hs_type = CS42L42_PLUG_HEADPHONE;</div><div class='add'>+			hs_det_sw = CS42L42_HSDET_SW_TYPE3;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			hs_type = CS42L42_PLUG_INVALID;</div><div class='add'>+			hs_det_sw = CS42L42_HSDET_SW_TYPE4;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set Switches */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HS_SWITCH_CTL, hs_det_sw);</div><div class='add'>+</div><div class='add'>+	/* Set HSDET mode to Manual—Disabled */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL2,</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSDET_CTRL_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSDET_SET_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSBIAS_REF_SHIFT) |</div><div class='add'>+			 (0 &lt;&lt; CS42L42_HSDET_AUTO_TIME_SHIFT));</div><div class='add'>+</div><div class='add'>+	/* Configure HS DET comparator reference levels. */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL1,</div><div class='add'>+			 (CS42L42_HSDET_COMP1_LVL_DEFAULT &lt;&lt; CS42L42_HSDET_COMP1_LVL_SHIFT) |</div><div class='add'>+			 (CS42L42_HSDET_COMP2_LVL_DEFAULT &lt;&lt; CS42L42_HSDET_COMP2_LVL_SHIFT));</div><div class='add'>+</div><div class='add'>+	return hs_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs42l42_handle_tip_sense(struct sub_codec *cs42l42, unsigned int reg_ts_status)</div><div class='add'>+{</div><div class='add'>+	int status_changed = 0;</div><div class='add'>+</div><div class='add'>+	/* TIP_SENSE INSERT/REMOVE */</div><div class='add'>+	switch (reg_ts_status) {</div><div class='add'>+	case CS42L42_TS_PLUG:</div><div class='add'>+		if (cs42l42-&gt;no_type_dect) {</div><div class='add'>+			status_changed = 1;</div><div class='add'>+			cs42l42-&gt;hp_jack_in = 1;</div><div class='add'>+			cs42l42-&gt;mic_jack_in = 0;</div><div class='add'>+		} else {</div><div class='add'>+			cs42l42_run_jack_detect(cs42l42);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CS42L42_TS_UNPLUG:</div><div class='add'>+		status_changed = 1;</div><div class='add'>+		cs42l42-&gt;hp_jack_in = 0;</div><div class='add'>+		cs42l42-&gt;mic_jack_in = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* jack in transition */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(cs42l42-&gt;codec, "Tip Sense Detection: (%d)\n", reg_ts_status);</div><div class='add'>+</div><div class='add'>+	return status_changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs42l42_jack_unsol_event(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	int current_plug_status;</div><div class='add'>+	int status_changed = 0;</div><div class='add'>+	int reg_cdc_status;</div><div class='add'>+	int reg_hs_status;</div><div class='add'>+	int reg_ts_status;</div><div class='add'>+	int type;</div><div class='add'>+</div><div class='add'>+	/* Read jack detect status registers */</div><div class='add'>+	reg_cdc_status = cs8409_i2c_read(cs42l42, CS42L42_CODEC_STATUS);</div><div class='add'>+	reg_hs_status = cs8409_i2c_read(cs42l42, CS42L42_HS_DET_STATUS);</div><div class='add'>+	reg_ts_status = cs8409_i2c_read(cs42l42, CS42L42_TSRS_PLUG_STATUS);</div><div class='add'>+</div><div class='add'>+	/* If status values are &lt; 0, read error has occurred. */</div><div class='add'>+	if (reg_cdc_status &lt; 0 || reg_hs_status &lt; 0 || reg_ts_status &lt; 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	current_plug_status = (reg_ts_status &amp; (CS42L42_TS_PLUG_MASK | CS42L42_TS_UNPLUG_MASK))</div><div class='add'>+				&gt;&gt; CS42L42_TS_PLUG_SHIFT;</div><div class='add'>+</div><div class='add'>+	/* HSDET_AUTO_DONE */</div><div class='add'>+	if (reg_cdc_status &amp; CS42L42_HSDET_AUTO_DONE_MASK) {</div><div class='add'>+</div><div class='add'>+		/* Disable HSDET_AUTO_DONE */</div><div class='add'>+		cs8409_i2c_write(cs42l42, CS42L42_CODEC_INT_MASK, 0xFF);</div><div class='add'>+</div><div class='add'>+		type = (reg_hs_status &amp; CS42L42_HSDET_TYPE_MASK) &gt;&gt; CS42L42_HSDET_TYPE_SHIFT;</div><div class='add'>+</div><div class='add'>+		/* Configure the HSDET mode. */</div><div class='add'>+		cs8409_i2c_write(cs42l42, CS42L42_HSDET_CTL2, 0x80);</div><div class='add'>+</div><div class='add'>+		if (cs42l42-&gt;no_type_dect) {</div><div class='add'>+			status_changed = cs42l42_handle_tip_sense(cs42l42, current_plug_status);</div><div class='add'>+		} else {</div><div class='add'>+			if (type == CS42L42_PLUG_INVALID || type == CS42L42_PLUG_HEADPHONE) {</div><div class='add'>+				codec_dbg(cs42l42-&gt;codec,</div><div class='add'>+					  "Auto detect value not valid (%d), running manual det\n",</div><div class='add'>+					  type);</div><div class='add'>+				type = cs42l42_manual_hs_det(cs42l42);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			switch (type) {</div><div class='add'>+			case CS42L42_PLUG_CTIA:</div><div class='add'>+			case CS42L42_PLUG_OMTP:</div><div class='add'>+				status_changed = 1;</div><div class='add'>+				cs42l42-&gt;hp_jack_in = 1;</div><div class='add'>+				cs42l42-&gt;mic_jack_in = 1;</div><div class='add'>+				break;</div><div class='add'>+			case CS42L42_PLUG_HEADPHONE:</div><div class='add'>+				status_changed = 1;</div><div class='add'>+				cs42l42-&gt;hp_jack_in = 1;</div><div class='add'>+				cs42l42-&gt;mic_jack_in = 0;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				status_changed = 1;</div><div class='add'>+				cs42l42-&gt;hp_jack_in = 0;</div><div class='add'>+				cs42l42-&gt;mic_jack_in = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			codec_dbg(cs42l42-&gt;codec, "Detection done (%d)\n", type);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable the HPOUT ground clamp and configure the HP pull-down */</div><div class='add'>+		cs8409_i2c_write(cs42l42, CS42L42_DAC_CTL2, 0x02);</div><div class='add'>+		/* Re-Enable Tip Sense Interrupt */</div><div class='add'>+		cs8409_i2c_write(cs42l42, CS42L42_TSRS_PLUG_INT_MASK, 0xF3);</div><div class='add'>+	} else {</div><div class='add'>+		status_changed = cs42l42_handle_tip_sense(cs42l42, current_plug_status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return status_changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs42l42_resume(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = cs42l42-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct cs8409_i2c_param irq_regs[] = {</div><div class='add'>+		{ CS42L42_CODEC_STATUS, 0x00 },</div><div class='add'>+		{ CS42L42_DET_INT_STATUS1, 0x00 },</div><div class='add'>+		{ CS42L42_DET_INT_STATUS2, 0x00 },</div><div class='add'>+		{ CS42L42_TSRS_PLUG_STATUS, 0x00 },</div><div class='add'>+	};</div><div class='add'>+	unsigned int fsv;</div><div class='add'>+</div><div class='add'>+	/* Bring CS42L42 out of Reset */</div><div class='add'>+	spec-&gt;gpio_data = snd_hda_codec_read(codec, CS8409_PIN_AFG, 0, AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+	spec-&gt;gpio_data |= cs42l42-&gt;reset_gpio;</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA, spec-&gt;gpio_data);</div><div class='add'>+	usleep_range(10000, 15000);</div><div class='add'>+</div><div class='add'>+	cs42l42-&gt;suspended = 0;</div><div class='add'>+</div><div class='add'>+	/* Initialize CS42L42 companion codec */</div><div class='add'>+	cs8409_i2c_bulk_write(cs42l42, cs42l42-&gt;init_seq, cs42l42-&gt;init_seq_num);</div><div class='add'>+</div><div class='add'>+	/* Clear interrupts, by reading interrupt status registers */</div><div class='add'>+	cs8409_i2c_bulk_read(cs42l42, irq_regs, ARRAY_SIZE(irq_regs));</div><div class='add'>+</div><div class='add'>+	fsv = cs8409_i2c_read(cs42l42, CS42L42_HP_CTL);</div><div class='add'>+	if (cs42l42-&gt;full_scale_vol) {</div><div class='add'>+		// Set the full scale volume bit</div><div class='add'>+		fsv |= CS42L42_FULL_SCALE_VOL_MASK;</div><div class='add'>+		cs8409_i2c_write(cs42l42, CS42L42_HP_CTL, fsv);</div><div class='add'>+	}</div><div class='add'>+	// Unmute analog channels A and B</div><div class='add'>+	fsv = (fsv &amp; ~CS42L42_ANA_MUTE_AB);</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_HP_CTL, fsv);</div><div class='add'>+</div><div class='add'>+	/* we have to explicitly allow unsol event handling even during the</div><div class='add'>+	 * resume phase so that the jack event is processed properly</div><div class='add'>+	 */</div><div class='add'>+	snd_hda_codec_allow_unsol_events(cs42l42-&gt;codec);</div><div class='add'>+</div><div class='add'>+	cs42l42_enable_jack_detect(cs42l42);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs42l42_suspend(struct sub_codec *cs42l42)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = cs42l42-&gt;codec;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	int reg_cdc_status = 0;</div><div class='add'>+	const struct cs8409_i2c_param cs42l42_pwr_down_seq[] = {</div><div class='add'>+		{ CS42L42_DAC_CTL2, 0x02 },</div><div class='add'>+		{ CS42L42_HS_CLAMP_DISABLE, 0x00 },</div><div class='add'>+		{ CS42L42_MIXER_CHA_VOL, 0x3F },</div><div class='add'>+		{ CS42L42_MIXER_ADC_VOL, 0x3F },</div><div class='add'>+		{ CS42L42_MIXER_CHB_VOL, 0x3F },</div><div class='add'>+		{ CS42L42_HP_CTL, 0x0D },</div><div class='add'>+		{ CS42L42_ASP_RX_DAI0_EN, 0x00 },</div><div class='add'>+		{ CS42L42_ASP_CLK_CFG, 0x00 },</div><div class='add'>+		{ CS42L42_PWR_CTL1, 0xFE },</div><div class='add'>+		{ CS42L42_PWR_CTL2, 0x8C },</div><div class='add'>+		{ CS42L42_PWR_CTL1, 0xFF },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	cs8409_i2c_bulk_write(cs42l42, cs42l42_pwr_down_seq, ARRAY_SIZE(cs42l42_pwr_down_seq));</div><div class='add'>+</div><div class='add'>+	if (read_poll_timeout(cs8409_i2c_read, reg_cdc_status,</div><div class='add'>+			(reg_cdc_status &amp; 0x1), CS42L42_PDN_SLEEP_US, CS42L42_PDN_TIMEOUT_US,</div><div class='add'>+			true, cs42l42, CS42L42_CODEC_STATUS) &lt; 0)</div><div class='add'>+		codec_warn(codec, "Timeout waiting for PDN_DONE for CS42L42\n");</div><div class='add'>+</div><div class='add'>+	/* Power down CS42L42 ASP/EQ/MIX/HP */</div><div class='add'>+	cs8409_i2c_write(cs42l42, CS42L42_PWR_CTL2, 0x9C);</div><div class='add'>+	cs42l42-&gt;suspended = 1;</div><div class='add'>+	cs42l42-&gt;last_page = 0;</div><div class='add'>+	cs42l42-&gt;hp_jack_in = 0;</div><div class='add'>+	cs42l42-&gt;mic_jack_in = 0;</div><div class='add'>+</div><div class='add'>+	/* Put CS42L42 into Reset */</div><div class='add'>+	spec-&gt;gpio_data = snd_hda_codec_read(codec, CS8409_PIN_AFG, 0, AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+	spec-&gt;gpio_data &amp;= ~cs42l42-&gt;reset_gpio;</div><div class='add'>+	snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA, spec-&gt;gpio_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs8409_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* Cancel i2c clock disable timer, and disable clock if left enabled */</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;i2c_clk_work);</div><div class='add'>+	cs8409_disable_i2c_clock(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                   BULLSEYE / WARLOCK / CYBORG Specific Functions</div><div class='add'>+ *                               CS8409/CS42L42</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In the case of CS8409 we do not have unsolicited events from NID's 0x24</div><div class='add'>+ * and 0x34 where hs mic and hp are connected. Companion codec CS42L42 will</div><div class='add'>+ * generate interrupt via gpio 4 to notify jack events. We have to overwrite</div><div class='add'>+ * generic snd_hda_jack_unsol_event(), read CS42L42 jack detect status registers</div><div class='add'>+ * and then notify status via generic snd_hda_jack_unsol_event() call.</div><div class='add'>+ */</div><div class='add'>+static void cs8409_cs42l42_jack_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[CS8409_CODEC0];</div><div class='add'>+	struct hda_jack_tbl *jk;</div><div class='add'>+</div><div class='add'>+	/* jack_unsol_event() will be called every time gpio line changing state.</div><div class='add'>+	 * In this case gpio4 line goes up as a result of reading interrupt status</div><div class='add'>+	 * registers in previous cs8409_jack_unsol_event() call.</div><div class='add'>+	 * We don't need to handle this event, ignoring...</div><div class='add'>+	 */</div><div class='add'>+	if (res &amp; cs42l42-&gt;irq_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cs42l42_jack_unsol_event(cs42l42)) {</div><div class='add'>+		snd_hda_set_pin_ctl(codec, CS8409_CS42L42_SPK_PIN_NID,</div><div class='add'>+				    cs42l42-&gt;hp_jack_in ? 0 : PIN_OUT);</div><div class='add'>+		/* Report jack*/</div><div class='add'>+		jk = snd_hda_jack_tbl_get_mst(codec, CS8409_CS42L42_HP_PIN_NID, 0);</div><div class='add'>+		if (jk)</div><div class='add'>+			snd_hda_jack_unsol_event(codec, (jk-&gt;tag &lt;&lt; AC_UNSOL_RES_TAG_SHIFT) &amp;</div><div class='add'>+							AC_UNSOL_RES_TAG);</div><div class='add'>+		/* Report jack*/</div><div class='add'>+		jk = snd_hda_jack_tbl_get_mst(codec, CS8409_CS42L42_AMIC_PIN_NID, 0);</div><div class='add'>+		if (jk)</div><div class='add'>+			snd_hda_jack_unsol_event(codec, (jk-&gt;tag &lt;&lt; AC_UNSOL_RES_TAG_SHIFT) &amp;</div><div class='add'>+							 AC_UNSOL_RES_TAG);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs8409_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;unsol_event)</div><div class='add'>+		spec-&gt;unsol_event(codec, res);</div><div class='add'>+	else</div><div class='add'>+		cs8409_cs42l42_jack_unsol_event(codec, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Manage PDREF, when transition to D3hot */</div><div class='add'>+static int cs8409_cs42l42_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec-&gt;init_done = 0;</div><div class='add'>+</div><div class='add'>+	cs8409_enable_ur(codec, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_scodecs; i++)</div><div class='add'>+		cs42l42_suspend(spec-&gt;scodecs[i]);</div><div class='add'>+</div><div class='add'>+	/* Cancel i2c clock disable timer, and disable clock if left enabled */</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;i2c_clk_work);</div><div class='add'>+	cs8409_disable_i2c_clock(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_shutup_pins(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Vendor specific HW configuration</div><div class='add'>+ * PLL, ASP, I2C, SPI, GPIOs, DMIC etc...</div><div class='add'>+ */</div><div class='add'>+static void cs8409_cs42l42_hw_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct cs8409_cir_param *seq = cs8409_cs42l42_hw_cfg;</div><div class='add'>+	const struct cs8409_cir_param *seq_bullseye = cs8409_cs42l42_bullseye_atn;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[CS8409_CODEC0];</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mask) {</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+			spec-&gt;gpio_mask);</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+			spec-&gt;gpio_dir);</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+			spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; seq-&gt;nid; seq++)</div><div class='add'>+		cs8409_vendor_coef_set(codec, seq-&gt;cir, seq-&gt;coeff);</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;fixup_id == CS8409_BULLSEYE) {</div><div class='add'>+		for (; seq_bullseye-&gt;nid; seq_bullseye++)</div><div class='add'>+			cs8409_vendor_coef_set(codec, seq_bullseye-&gt;cir, seq_bullseye-&gt;coeff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;fixup_id) {</div><div class='add'>+	case CS8409_CYBORG:</div><div class='add'>+	case CS8409_WARLOCK_MLK_DUAL_MIC:</div><div class='add'>+		/* DMIC1_MO=00b, DMIC1/2_SR=1 */</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_DMIC_CFG, 0x0003);</div><div class='add'>+		break;</div><div class='add'>+	case CS8409_ODIN:</div><div class='add'>+		/* ASP1/2_xxx_EN=1, ASP1/2_MCLK_EN=0, DMIC1_SCL_EN=0 */</div><div class='add'>+		cs8409_vendor_coef_set(codec, CS8409_PAD_CFG_SLW_RATE_CTRL, 0xfc00);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs42l42_resume(cs42l42);</div><div class='add'>+</div><div class='add'>+	/* Enable Unsolicited Response */</div><div class='add'>+	cs8409_enable_ur(codec, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_cs42l42_exec_verb(struct hdac_device *dev, unsigned int cmd, unsigned int flags,</div><div class='add'>+				    unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = container_of(dev, struct hda_codec, core);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[CS8409_CODEC0];</div><div class='add'>+</div><div class='add'>+	unsigned int nid = ((cmd &gt;&gt; 20) &amp; 0x07f);</div><div class='add'>+	unsigned int verb = ((cmd &gt;&gt; 8) &amp; 0x0fff);</div><div class='add'>+</div><div class='add'>+	/* CS8409 pins have no AC_PINSENSE_PRESENCE</div><div class='add'>+	 * capabilities. We have to intercept 2 calls for pins 0x24 and 0x34</div><div class='add'>+	 * and return correct pin sense values for read_pin_sense() call from</div><div class='add'>+	 * hda_jack based on CS42L42 jack detect status.</div><div class='add'>+	 */</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case CS8409_CS42L42_HP_PIN_NID:</div><div class='add'>+		if (verb == AC_VERB_GET_PIN_SENSE) {</div><div class='add'>+			*res = (cs42l42-&gt;hp_jack_in) ? AC_PINSENSE_PRESENCE : 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CS8409_CS42L42_AMIC_PIN_NID:</div><div class='add'>+		if (verb == AC_VERB_GET_PIN_SENSE) {</div><div class='add'>+			*res = (cs42l42-&gt;mic_jack_in) ? AC_PINSENSE_PRESENCE : 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return spec-&gt;exec_verb(dev, cmd, flags, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_add_verbs(codec, cs8409_cs42l42_init_verbs);</div><div class='add'>+		/* verb exec op override */</div><div class='add'>+		spec-&gt;exec_verb = codec-&gt;core.exec_verb;</div><div class='add'>+		codec-&gt;core.exec_verb = cs8409_cs42l42_exec_verb;</div><div class='add'>+</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0] = &amp;cs8409_cs42l42_codec;</div><div class='add'>+		spec-&gt;num_scodecs = 1;</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0]-&gt;codec = codec;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+		spec-&gt;gen.no_primary_hp = 1;</div><div class='add'>+		spec-&gt;gen.suppress_vmaster = 1;</div><div class='add'>+</div><div class='add'>+		spec-&gt;speaker_pdn_gpio = 0;</div><div class='add'>+</div><div class='add'>+		/* GPIO 5 out, 3,4 in */</div><div class='add'>+		spec-&gt;gpio_dir = spec-&gt;scodecs[CS8409_CODEC0]-&gt;reset_gpio;</div><div class='add'>+		spec-&gt;gpio_data = 0;</div><div class='add'>+		spec-&gt;gpio_mask = 0x03f;</div><div class='add'>+</div><div class='add'>+		/* Basic initial sequence for specific hw configuration */</div><div class='add'>+		snd_hda_sequence_write(codec, cs8409_cs42l42_init_verbs);</div><div class='add'>+</div><div class='add'>+		cs8409_fix_caps(codec, CS8409_CS42L42_HP_PIN_NID);</div><div class='add'>+		cs8409_fix_caps(codec, CS8409_CS42L42_AMIC_PIN_NID);</div><div class='add'>+</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0]-&gt;hsbias_hiz = 0x0020;</div><div class='add'>+</div><div class='add'>+		switch (codec-&gt;fixup_id) {</div><div class='add'>+		case CS8409_CYBORG:</div><div class='add'>+			spec-&gt;scodecs[CS8409_CODEC0]-&gt;full_scale_vol =</div><div class='add'>+				CS42L42_FULL_SCALE_VOL_MINUS6DB;</div><div class='add'>+			spec-&gt;speaker_pdn_gpio = CS8409_CYBORG_SPEAKER_PDN;</div><div class='add'>+			break;</div><div class='add'>+		case CS8409_ODIN:</div><div class='add'>+			spec-&gt;scodecs[CS8409_CODEC0]-&gt;full_scale_vol = CS42L42_FULL_SCALE_VOL_0DB;</div><div class='add'>+			spec-&gt;speaker_pdn_gpio = CS8409_CYBORG_SPEAKER_PDN;</div><div class='add'>+			break;</div><div class='add'>+		case CS8409_WARLOCK_MLK:</div><div class='add'>+		case CS8409_WARLOCK_MLK_DUAL_MIC:</div><div class='add'>+			spec-&gt;scodecs[CS8409_CODEC0]-&gt;full_scale_vol = CS42L42_FULL_SCALE_VOL_0DB;</div><div class='add'>+			spec-&gt;speaker_pdn_gpio = CS8409_WARLOCK_SPEAKER_PDN;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			spec-&gt;scodecs[CS8409_CODEC0]-&gt;full_scale_vol =</div><div class='add'>+				CS42L42_FULL_SCALE_VOL_MINUS6DB;</div><div class='add'>+			spec-&gt;speaker_pdn_gpio = CS8409_WARLOCK_SPEAKER_PDN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;speaker_pdn_gpio &gt; 0) {</div><div class='add'>+			spec-&gt;gpio_dir |= spec-&gt;speaker_pdn_gpio;</div><div class='add'>+			spec-&gt;gpio_data |= spec-&gt;speaker_pdn_gpio;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		/* Fix Sample Rate to 48kHz */</div><div class='add'>+		spec-&gt;gen.stream_analog_playback = &amp;cs42l42_48k_pcm_analog_playback;</div><div class='add'>+		spec-&gt;gen.stream_analog_capture = &amp;cs42l42_48k_pcm_analog_capture;</div><div class='add'>+		/* add hooks */</div><div class='add'>+		spec-&gt;gen.pcm_playback_hook = cs42l42_playback_pcm_hook;</div><div class='add'>+		spec-&gt;gen.pcm_capture_hook = cs42l42_capture_pcm_hook;</div><div class='add'>+		if (codec-&gt;fixup_id != CS8409_ODIN)</div><div class='add'>+			/* Set initial DMIC volume to -26 dB */</div><div class='add'>+			snd_hda_codec_amp_init_stereo(codec, CS8409_CS42L42_DMIC_ADC_PIN_NID,</div><div class='add'>+						      HDA_INPUT, 0, 0xff, 0x19);</div><div class='add'>+		snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Headphone Playback Volume",</div><div class='add'>+				&amp;cs42l42_dac_volume_mixer);</div><div class='add'>+		snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Mic Capture Volume",</div><div class='add'>+				&amp;cs42l42_adc_volume_mixer);</div><div class='add'>+		if (spec-&gt;speaker_pdn_gpio &gt; 0)</div><div class='add'>+			snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Speaker Playback Switch",</div><div class='add'>+					     &amp;cs8409_spk_sw_ctrl);</div><div class='add'>+		/* Disable Unsolicited Response during boot */</div><div class='add'>+		cs8409_enable_ur(codec, 0);</div><div class='add'>+		snd_hda_codec_set_name(codec, "CS8409/CS42L42");</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		cs8409_cs42l42_hw_init(codec);</div><div class='add'>+		spec-&gt;init_done = 1;</div><div class='add'>+		if (spec-&gt;init_done &amp;&amp; spec-&gt;build_ctrl_done</div><div class='add'>+			&amp;&amp; !spec-&gt;scodecs[CS8409_CODEC0]-&gt;hp_jack_in)</div><div class='add'>+			cs42l42_run_jack_detect(spec-&gt;scodecs[CS8409_CODEC0]);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		spec-&gt;build_ctrl_done = 1;</div><div class='add'>+		/* Run jack auto detect first time on boot</div><div class='add'>+		 * after controls have been added, to check if jack has</div><div class='add'>+		 * been already plugged in.</div><div class='add'>+		 * Run immediately after init.</div><div class='add'>+		 */</div><div class='add'>+		if (spec-&gt;init_done &amp;&amp; spec-&gt;build_ctrl_done</div><div class='add'>+			&amp;&amp; !spec-&gt;scodecs[CS8409_CODEC0]-&gt;hp_jack_in)</div><div class='add'>+			cs42l42_run_jack_detect(spec-&gt;scodecs[CS8409_CODEC0]);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *                          Dolphin Specific Functions</div><div class='add'>+ *                               CS8409/ 2 X CS42L42</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In the case of CS8409 we do not have unsolicited events when</div><div class='add'>+ * hs mic and hp are connected. Companion codec CS42L42 will</div><div class='add'>+ * generate interrupt via irq_mask to notify jack events. We have to overwrite</div><div class='add'>+ * generic snd_hda_jack_unsol_event(), read CS42L42 jack detect status registers</div><div class='add'>+ * and then notify status via generic snd_hda_jack_unsol_event() call.</div><div class='add'>+ */</div><div class='add'>+static void dolphin_jack_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42;</div><div class='add'>+	struct hda_jack_tbl *jk;</div><div class='add'>+</div><div class='add'>+	cs42l42 = spec-&gt;scodecs[CS8409_CODEC0];</div><div class='add'>+	if (!cs42l42-&gt;suspended &amp;&amp; (~res &amp; cs42l42-&gt;irq_mask) &amp;&amp;</div><div class='add'>+	    cs42l42_jack_unsol_event(cs42l42)) {</div><div class='add'>+		jk = snd_hda_jack_tbl_get_mst(codec, DOLPHIN_HP_PIN_NID, 0);</div><div class='add'>+		if (jk)</div><div class='add'>+			snd_hda_jack_unsol_event(codec,</div><div class='add'>+						 (jk-&gt;tag &lt;&lt; AC_UNSOL_RES_TAG_SHIFT) &amp;</div><div class='add'>+						  AC_UNSOL_RES_TAG);</div><div class='add'>+</div><div class='add'>+		jk = snd_hda_jack_tbl_get_mst(codec, DOLPHIN_AMIC_PIN_NID, 0);</div><div class='add'>+		if (jk)</div><div class='add'>+			snd_hda_jack_unsol_event(codec,</div><div class='add'>+						 (jk-&gt;tag &lt;&lt; AC_UNSOL_RES_TAG_SHIFT) &amp;</div><div class='add'>+						  AC_UNSOL_RES_TAG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs42l42 = spec-&gt;scodecs[CS8409_CODEC1];</div><div class='add'>+	if (!cs42l42-&gt;suspended &amp;&amp; (~res &amp; cs42l42-&gt;irq_mask) &amp;&amp;</div><div class='add'>+	    cs42l42_jack_unsol_event(cs42l42)) {</div><div class='add'>+		jk = snd_hda_jack_tbl_get_mst(codec, DOLPHIN_LO_PIN_NID, 0);</div><div class='add'>+		if (jk)</div><div class='add'>+			snd_hda_jack_unsol_event(codec,</div><div class='add'>+						 (jk-&gt;tag &lt;&lt; AC_UNSOL_RES_TAG_SHIFT) &amp;</div><div class='add'>+						  AC_UNSOL_RES_TAG);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Vendor specific HW configuration</div><div class='add'>+ * PLL, ASP, I2C, SPI, GPIOs, DMIC etc...</div><div class='add'>+ */</div><div class='add'>+static void dolphin_hw_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct cs8409_cir_param *seq = dolphin_hw_cfg;</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mask) {</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+				    spec-&gt;gpio_mask);</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+				    spec-&gt;gpio_dir);</div><div class='add'>+		snd_hda_codec_write(codec, CS8409_PIN_AFG, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (; seq-&gt;nid; seq++)</div><div class='add'>+		cs8409_vendor_coef_set(codec, seq-&gt;cir, seq-&gt;coeff);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_scodecs; i++) {</div><div class='add'>+		cs42l42 = spec-&gt;scodecs[i];</div><div class='add'>+		cs42l42_resume(cs42l42);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable Unsolicited Response */</div><div class='add'>+	cs8409_enable_ur(codec, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dolphin_exec_verb(struct hdac_device *dev, unsigned int cmd, unsigned int flags,</div><div class='add'>+			     unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = container_of(dev, struct hda_codec, core);</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct sub_codec *cs42l42 = spec-&gt;scodecs[CS8409_CODEC0];</div><div class='add'>+</div><div class='add'>+	unsigned int nid = ((cmd &gt;&gt; 20) &amp; 0x07f);</div><div class='add'>+	unsigned int verb = ((cmd &gt;&gt; 8) &amp; 0x0fff);</div><div class='add'>+</div><div class='add'>+	/* CS8409 pins have no AC_PINSENSE_PRESENCE</div><div class='add'>+	 * capabilities. We have to intercept calls for CS42L42 pins</div><div class='add'>+	 * and return correct pin sense values for read_pin_sense() call from</div><div class='add'>+	 * hda_jack based on CS42L42 jack detect status.</div><div class='add'>+	 */</div><div class='add'>+	switch (nid) {</div><div class='add'>+	case DOLPHIN_HP_PIN_NID:</div><div class='add'>+	case DOLPHIN_LO_PIN_NID:</div><div class='add'>+		if (nid == DOLPHIN_LO_PIN_NID)</div><div class='add'>+			cs42l42 = spec-&gt;scodecs[CS8409_CODEC1];</div><div class='add'>+		if (verb == AC_VERB_GET_PIN_SENSE) {</div><div class='add'>+			*res = (cs42l42-&gt;hp_jack_in) ? AC_PINSENSE_PRESENCE : 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case DOLPHIN_AMIC_PIN_NID:</div><div class='add'>+		if (verb == AC_VERB_GET_PIN_SENSE) {</div><div class='add'>+			*res = (cs42l42-&gt;mic_jack_in) ? AC_PINSENSE_PRESENCE : 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return spec-&gt;exec_verb(dev, cmd, flags, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs8409_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_kcontrol_new *kctrl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_add_verbs(codec, dolphin_init_verbs);</div><div class='add'>+		/* verb exec op override */</div><div class='add'>+		spec-&gt;exec_verb = codec-&gt;core.exec_verb;</div><div class='add'>+		codec-&gt;core.exec_verb = dolphin_exec_verb;</div><div class='add'>+</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0] = &amp;dolphin_cs42l42_0;</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0]-&gt;codec = codec;</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC1] = &amp;dolphin_cs42l42_1;</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC1]-&gt;codec = codec;</div><div class='add'>+		spec-&gt;num_scodecs = 2;</div><div class='add'>+		spec-&gt;gen.suppress_vmaster = 1;</div><div class='add'>+</div><div class='add'>+		spec-&gt;unsol_event = dolphin_jack_unsol_event;</div><div class='add'>+</div><div class='add'>+		/* GPIO 1,5 out, 0,4 in */</div><div class='add'>+		spec-&gt;gpio_dir = spec-&gt;scodecs[CS8409_CODEC0]-&gt;reset_gpio |</div><div class='add'>+				 spec-&gt;scodecs[CS8409_CODEC1]-&gt;reset_gpio;</div><div class='add'>+		spec-&gt;gpio_data = 0;</div><div class='add'>+		spec-&gt;gpio_mask = 0x03f;</div><div class='add'>+</div><div class='add'>+		/* Basic initial sequence for specific hw configuration */</div><div class='add'>+		snd_hda_sequence_write(codec, dolphin_init_verbs);</div><div class='add'>+</div><div class='add'>+		snd_hda_jack_add_kctl(codec, DOLPHIN_LO_PIN_NID, "Line Out", true,</div><div class='add'>+				      SND_JACK_HEADPHONE, NULL);</div><div class='add'>+</div><div class='add'>+		snd_hda_jack_add_kctl(codec, DOLPHIN_AMIC_PIN_NID, "Microphone", true,</div><div class='add'>+				      SND_JACK_MICROPHONE, NULL);</div><div class='add'>+</div><div class='add'>+		cs8409_fix_caps(codec, DOLPHIN_HP_PIN_NID);</div><div class='add'>+		cs8409_fix_caps(codec, DOLPHIN_LO_PIN_NID);</div><div class='add'>+		cs8409_fix_caps(codec, DOLPHIN_AMIC_PIN_NID);</div><div class='add'>+</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC0]-&gt;full_scale_vol = CS42L42_FULL_SCALE_VOL_MINUS6DB;</div><div class='add'>+		spec-&gt;scodecs[CS8409_CODEC1]-&gt;full_scale_vol = CS42L42_FULL_SCALE_VOL_MINUS6DB;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		/* Fix Sample Rate to 48kHz */</div><div class='add'>+		spec-&gt;gen.stream_analog_playback = &amp;cs42l42_48k_pcm_analog_playback;</div><div class='add'>+		spec-&gt;gen.stream_analog_capture = &amp;cs42l42_48k_pcm_analog_capture;</div><div class='add'>+		/* add hooks */</div><div class='add'>+		spec-&gt;gen.pcm_playback_hook = cs42l42_playback_pcm_hook;</div><div class='add'>+		spec-&gt;gen.pcm_capture_hook = cs42l42_capture_pcm_hook;</div><div class='add'>+		snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Headphone Playback Volume",</div><div class='add'>+				     &amp;cs42l42_dac_volume_mixer);</div><div class='add'>+		snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Mic Capture Volume", &amp;cs42l42_adc_volume_mixer);</div><div class='add'>+		kctrl = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Line Out Playback Volume",</div><div class='add'>+					     &amp;cs42l42_dac_volume_mixer);</div><div class='add'>+		/* Update Line Out kcontrol template */</div><div class='add'>+		if (kctrl)</div><div class='add'>+			kctrl-&gt;private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1,</div><div class='add'>+					       HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE;</div><div class='add'>+		cs8409_enable_ur(codec, 0);</div><div class='add'>+		snd_hda_codec_set_name(codec, "CS8409/CS42L42");</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		dolphin_hw_init(codec);</div><div class='add'>+		spec-&gt;init_done = 1;</div><div class='add'>+		if (spec-&gt;init_done &amp;&amp; spec-&gt;build_ctrl_done) {</div><div class='add'>+			for (i = 0; i &lt; spec-&gt;num_scodecs; i++) {</div><div class='add'>+				if (!spec-&gt;scodecs[i]-&gt;hp_jack_in)</div><div class='add'>+					cs42l42_run_jack_detect(spec-&gt;scodecs[i]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		spec-&gt;build_ctrl_done = 1;</div><div class='add'>+		/* Run jack auto detect first time on boot</div><div class='add'>+		 * after controls have been added, to check if jack has</div><div class='add'>+		 * been already plugged in.</div><div class='add'>+		 * Run immediately after init.</div><div class='add'>+		 */</div><div class='add'>+		if (spec-&gt;init_done &amp;&amp; spec-&gt;build_ctrl_done) {</div><div class='add'>+			for (i = 0; i &lt; spec-&gt;num_scodecs; i++) {</div><div class='add'>+				if (!spec-&gt;scodecs[i]-&gt;hp_jack_in)</div><div class='add'>+					cs42l42_run_jack_detect(spec-&gt;scodecs[i]);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs8409_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!cs8409_alloc_spec(codec))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, cs8409_models, cs8409_fixup_tbl, cs8409_fixups);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Picked ID=%d, VID=%08x, DEV=%08x\n", codec-&gt;fixup_id,</div><div class='add'>+			 codec-&gt;bus-&gt;pci-&gt;subsystem_vendor,</div><div class='add'>+			 codec-&gt;bus-&gt;pci-&gt;subsystem_device);</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = cs8409_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		cs8409_remove(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cs8409_codec_ops = {</div><div class='add'>+	.probe = cs8409_probe,</div><div class='add'>+	.remove = cs8409_remove,</div><div class='add'>+	.build_controls = cs8409_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = cs8409_init,</div><div class='add'>+	.unsol_event = cs8409_unsol_event,</div><div class='add'>+	.suspend = cs8409_cs42l42_suspend,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_cs8409[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10138409, "CS8409"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cs8409);</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver cs8409_driver = {</div><div class='add'>+	.id = snd_hda_id_cs8409,</div><div class='add'>+	.ops = &amp;cs8409_codec_ops,</div><div class='add'>+};</div><div class='add'>+module_hda_codec_driver(cs8409_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Cirrus Logic HDA bridge");</div><div class='head'>diff --git a/sound/hda/codecs/cirrus/cs8409.h b/sound/hda/codecs/cirrus/cs8409.h<br/>new file mode 100644<br/>index 000000000000..7fe56f4a73bc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cirrus/cs8409.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cirrus/cs8409.h</a></div><div class='hunk'>@@ -0,0 +1,377 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Cirrus Logic CS8409 HDA bridge chip</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS8409_PATCH_H</div><div class='add'>+#define __CS8409_PATCH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;sound/cs42l42.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+</div><div class='add'>+/* CS8409 Specific Definitions */</div><div class='add'>+</div><div class='add'>+enum cs8409_pins {</div><div class='add'>+	CS8409_PIN_ROOT,</div><div class='add'>+	CS8409_PIN_AFG,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_A,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_B,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_C,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_D,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_E,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_F,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_G,</div><div class='add'>+	CS8409_PIN_ASP1_OUT_H,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_A,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_B,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_C,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_D,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_E,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_F,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_G,</div><div class='add'>+	CS8409_PIN_ASP2_OUT_H,</div><div class='add'>+	CS8409_PIN_ASP1_IN_A,</div><div class='add'>+	CS8409_PIN_ASP1_IN_B,</div><div class='add'>+	CS8409_PIN_ASP1_IN_C,</div><div class='add'>+	CS8409_PIN_ASP1_IN_D,</div><div class='add'>+	CS8409_PIN_ASP1_IN_E,</div><div class='add'>+	CS8409_PIN_ASP1_IN_F,</div><div class='add'>+	CS8409_PIN_ASP1_IN_G,</div><div class='add'>+	CS8409_PIN_ASP1_IN_H,</div><div class='add'>+	CS8409_PIN_ASP2_IN_A,</div><div class='add'>+	CS8409_PIN_ASP2_IN_B,</div><div class='add'>+	CS8409_PIN_ASP2_IN_C,</div><div class='add'>+	CS8409_PIN_ASP2_IN_D,</div><div class='add'>+	CS8409_PIN_ASP2_IN_E,</div><div class='add'>+	CS8409_PIN_ASP2_IN_F,</div><div class='add'>+	CS8409_PIN_ASP2_IN_G,</div><div class='add'>+	CS8409_PIN_ASP2_IN_H,</div><div class='add'>+	CS8409_PIN_DMIC1,</div><div class='add'>+	CS8409_PIN_DMIC2,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_A,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_B,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_C,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_D,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_E,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_F,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_G,</div><div class='add'>+	CS8409_PIN_ASP1_TRANSMITTER_H,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_A,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_B,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_C,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_D,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_E,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_F,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_G,</div><div class='add'>+	CS8409_PIN_ASP2_TRANSMITTER_H,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_A,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_B,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_C,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_D,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_E,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_F,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_G,</div><div class='add'>+	CS8409_PIN_ASP1_RECEIVER_H,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_A,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_B,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_C,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_D,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_E,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_F,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_G,</div><div class='add'>+	CS8409_PIN_ASP2_RECEIVER_H,</div><div class='add'>+	CS8409_PIN_DMIC1_IN,</div><div class='add'>+	CS8409_PIN_DMIC2_IN,</div><div class='add'>+	CS8409_PIN_BEEP_GEN,</div><div class='add'>+	CS8409_PIN_VENDOR_WIDGET</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cs8409_coefficient_index_registers {</div><div class='add'>+	CS8409_DEV_CFG1,</div><div class='add'>+	CS8409_DEV_CFG2,</div><div class='add'>+	CS8409_DEV_CFG3,</div><div class='add'>+	CS8409_ASP1_CLK_CTRL1,</div><div class='add'>+	CS8409_ASP1_CLK_CTRL2,</div><div class='add'>+	CS8409_ASP1_CLK_CTRL3,</div><div class='add'>+	CS8409_ASP2_CLK_CTRL1,</div><div class='add'>+	CS8409_ASP2_CLK_CTRL2,</div><div class='add'>+	CS8409_ASP2_CLK_CTRL3,</div><div class='add'>+	CS8409_DMIC_CFG,</div><div class='add'>+	CS8409_BEEP_CFG,</div><div class='add'>+	ASP1_RX_NULL_INS_RMV,</div><div class='add'>+	ASP1_Rx_RATE1,</div><div class='add'>+	ASP1_Rx_RATE2,</div><div class='add'>+	ASP1_Tx_NULL_INS_RMV,</div><div class='add'>+	ASP1_Tx_RATE1,</div><div class='add'>+	ASP1_Tx_RATE2,</div><div class='add'>+	ASP2_Rx_NULL_INS_RMV,</div><div class='add'>+	ASP2_Rx_RATE1,</div><div class='add'>+	ASP2_Rx_RATE2,</div><div class='add'>+	ASP2_Tx_NULL_INS_RMV,</div><div class='add'>+	ASP2_Tx_RATE1,</div><div class='add'>+	ASP2_Tx_RATE2,</div><div class='add'>+	ASP1_SYNC_CTRL,</div><div class='add'>+	ASP2_SYNC_CTRL,</div><div class='add'>+	ASP1_A_TX_CTRL1,</div><div class='add'>+	ASP1_A_TX_CTRL2,</div><div class='add'>+	ASP1_B_TX_CTRL1,</div><div class='add'>+	ASP1_B_TX_CTRL2,</div><div class='add'>+	ASP1_C_TX_CTRL1,</div><div class='add'>+	ASP1_C_TX_CTRL2,</div><div class='add'>+	ASP1_D_TX_CTRL1,</div><div class='add'>+	ASP1_D_TX_CTRL2,</div><div class='add'>+	ASP1_E_TX_CTRL1,</div><div class='add'>+	ASP1_E_TX_CTRL2,</div><div class='add'>+	ASP1_F_TX_CTRL1,</div><div class='add'>+	ASP1_F_TX_CTRL2,</div><div class='add'>+	ASP1_G_TX_CTRL1,</div><div class='add'>+	ASP1_G_TX_CTRL2,</div><div class='add'>+	ASP1_H_TX_CTRL1,</div><div class='add'>+	ASP1_H_TX_CTRL2,</div><div class='add'>+	ASP2_A_TX_CTRL1,</div><div class='add'>+	ASP2_A_TX_CTRL2,</div><div class='add'>+	ASP2_B_TX_CTRL1,</div><div class='add'>+	ASP2_B_TX_CTRL2,</div><div class='add'>+	ASP2_C_TX_CTRL1,</div><div class='add'>+	ASP2_C_TX_CTRL2,</div><div class='add'>+	ASP2_D_TX_CTRL1,</div><div class='add'>+	ASP2_D_TX_CTRL2,</div><div class='add'>+	ASP2_E_TX_CTRL1,</div><div class='add'>+	ASP2_E_TX_CTRL2,</div><div class='add'>+	ASP2_F_TX_CTRL1,</div><div class='add'>+	ASP2_F_TX_CTRL2,</div><div class='add'>+	ASP2_G_TX_CTRL1,</div><div class='add'>+	ASP2_G_TX_CTRL2,</div><div class='add'>+	ASP2_H_TX_CTRL1,</div><div class='add'>+	ASP2_H_TX_CTRL2,</div><div class='add'>+	ASP1_A_RX_CTRL1,</div><div class='add'>+	ASP1_A_RX_CTRL2,</div><div class='add'>+	ASP1_B_RX_CTRL1,</div><div class='add'>+	ASP1_B_RX_CTRL2,</div><div class='add'>+	ASP1_C_RX_CTRL1,</div><div class='add'>+	ASP1_C_RX_CTRL2,</div><div class='add'>+	ASP1_D_RX_CTRL1,</div><div class='add'>+	ASP1_D_RX_CTRL2,</div><div class='add'>+	ASP1_E_RX_CTRL1,</div><div class='add'>+	ASP1_E_RX_CTRL2,</div><div class='add'>+	ASP1_F_RX_CTRL1,</div><div class='add'>+	ASP1_F_RX_CTRL2,</div><div class='add'>+	ASP1_G_RX_CTRL1,</div><div class='add'>+	ASP1_G_RX_CTRL2,</div><div class='add'>+	ASP1_H_RX_CTRL1,</div><div class='add'>+	ASP1_H_RX_CTRL2,</div><div class='add'>+	ASP2_A_RX_CTRL1,</div><div class='add'>+	ASP2_A_RX_CTRL2,</div><div class='add'>+	ASP2_B_RX_CTRL1,</div><div class='add'>+	ASP2_B_RX_CTRL2,</div><div class='add'>+	ASP2_C_RX_CTRL1,</div><div class='add'>+	ASP2_C_RX_CTRL2,</div><div class='add'>+	ASP2_D_RX_CTRL1,</div><div class='add'>+	ASP2_D_RX_CTRL2,</div><div class='add'>+	ASP2_E_RX_CTRL1,</div><div class='add'>+	ASP2_E_RX_CTRL2,</div><div class='add'>+	ASP2_F_RX_CTRL1,</div><div class='add'>+	ASP2_F_RX_CTRL2,</div><div class='add'>+	ASP2_G_RX_CTRL1,</div><div class='add'>+	ASP2_G_RX_CTRL2,</div><div class='add'>+	ASP2_H_RX_CTRL1,</div><div class='add'>+	ASP2_H_RX_CTRL2,</div><div class='add'>+	CS8409_I2C_ADDR,</div><div class='add'>+	CS8409_I2C_DATA,</div><div class='add'>+	CS8409_I2C_CTRL,</div><div class='add'>+	CS8409_I2C_STS,</div><div class='add'>+	CS8409_I2C_QWRITE,</div><div class='add'>+	CS8409_I2C_QREAD,</div><div class='add'>+	CS8409_SPI_CTRL,</div><div class='add'>+	CS8409_SPI_TX_DATA,</div><div class='add'>+	CS8409_SPI_RX_DATA,</div><div class='add'>+	CS8409_SPI_STS,</div><div class='add'>+	CS8409_PFE_COEF_W1, /* Parametric filter engine coefficient write 1*/</div><div class='add'>+	CS8409_PFE_COEF_W2,</div><div class='add'>+	CS8409_PFE_CTRL1,</div><div class='add'>+	CS8409_PFE_CTRL2,</div><div class='add'>+	CS8409_PRE_SCALE_ATTN1,</div><div class='add'>+	CS8409_PRE_SCALE_ATTN2,</div><div class='add'>+	CS8409_PFE_COEF_MON1, /* Parametric filter engine coefficient monitor 1*/</div><div class='add'>+	CS8409_PFE_COEF_MON2,</div><div class='add'>+	CS8409_ASP1_INTRN_STS,</div><div class='add'>+	CS8409_ASP2_INTRN_STS,</div><div class='add'>+	CS8409_ASP1_RX_SCLK_COUNT,</div><div class='add'>+	CS8409_ASP1_TX_SCLK_COUNT,</div><div class='add'>+	CS8409_ASP2_RX_SCLK_COUNT,</div><div class='add'>+	CS8409_ASP2_TX_SCLK_COUNT,</div><div class='add'>+	CS8409_ASP_UNS_RESP_MASK,</div><div class='add'>+	CS8409_LOOPBACK_CTRL = 0x80,</div><div class='add'>+	CS8409_PAD_CFG_SLW_RATE_CTRL = 0x82, /* Pad Config and Slew Rate Control (CIR = 0x0082) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CS42L42 Specific Definitions */</div><div class='add'>+</div><div class='add'>+#define CS8409_MAX_CODECS			8</div><div class='add'>+#define CS42L42_VOLUMES				(4U)</div><div class='add'>+#define CS42L42_HP_VOL_REAL_MIN			(-63)</div><div class='add'>+#define CS42L42_HP_VOL_REAL_MAX			(0)</div><div class='add'>+#define CS42L42_AMIC_VOL_REAL_MIN		(-97)</div><div class='add'>+#define CS42L42_AMIC_VOL_REAL_MAX		(12)</div><div class='add'>+#define CS42L42_REG_AMIC_VOL_MASK		(0x00FF)</div><div class='add'>+#define CS42L42_HSTYPE_MASK			(0x03)</div><div class='add'>+#define CS42L42_I2C_TIMEOUT_US			(20000)</div><div class='add'>+#define CS42L42_I2C_SLEEP_US			(2000)</div><div class='add'>+#define CS42L42_PDN_TIMEOUT_US			(250000)</div><div class='add'>+#define CS42L42_PDN_SLEEP_US			(2000)</div><div class='add'>+#define CS42L42_ANA_MUTE_AB			(0x0C)</div><div class='add'>+#define CS42L42_FULL_SCALE_VOL_MASK		(2)</div><div class='add'>+#define CS42L42_FULL_SCALE_VOL_0DB		(0)</div><div class='add'>+#define CS42L42_FULL_SCALE_VOL_MINUS6DB		(1)</div><div class='add'>+</div><div class='add'>+/* Dell BULLSEYE / WARLOCK / CYBORG Specific Definitions */</div><div class='add'>+</div><div class='add'>+#define CS42L42_I2C_ADDR			(0x48 &lt;&lt; 1)</div><div class='add'>+#define CS8409_CS42L42_RESET			GENMASK(5, 5) /* CS8409_GPIO5 */</div><div class='add'>+#define CS8409_CS42L42_INT			GENMASK(4, 4) /* CS8409_GPIO4 */</div><div class='add'>+#define CS8409_CYBORG_SPEAKER_PDN		GENMASK(2, 2) /* CS8409_GPIO2 */</div><div class='add'>+#define CS8409_WARLOCK_SPEAKER_PDN		GENMASK(1, 1) /* CS8409_GPIO1 */</div><div class='add'>+#define CS8409_CS42L42_HP_PIN_NID		CS8409_PIN_ASP1_TRANSMITTER_A</div><div class='add'>+#define CS8409_CS42L42_SPK_PIN_NID		CS8409_PIN_ASP2_TRANSMITTER_A</div><div class='add'>+#define CS8409_CS42L42_AMIC_PIN_NID		CS8409_PIN_ASP1_RECEIVER_A</div><div class='add'>+#define CS8409_CS42L42_DMIC_PIN_NID		CS8409_PIN_DMIC1_IN</div><div class='add'>+#define CS8409_CS42L42_DMIC_ADC_PIN_NID		CS8409_PIN_DMIC1</div><div class='add'>+</div><div class='add'>+/* Dolphin */</div><div class='add'>+</div><div class='add'>+#define DOLPHIN_C0_I2C_ADDR			(0x48 &lt;&lt; 1)</div><div class='add'>+#define DOLPHIN_C1_I2C_ADDR			(0x49 &lt;&lt; 1)</div><div class='add'>+#define DOLPHIN_HP_PIN_NID			CS8409_PIN_ASP1_TRANSMITTER_A</div><div class='add'>+#define DOLPHIN_LO_PIN_NID			CS8409_PIN_ASP1_TRANSMITTER_B</div><div class='add'>+#define DOLPHIN_AMIC_PIN_NID			CS8409_PIN_ASP1_RECEIVER_A</div><div class='add'>+</div><div class='add'>+#define DOLPHIN_C0_INT				GENMASK(4, 4)</div><div class='add'>+#define DOLPHIN_C1_INT				GENMASK(0, 0)</div><div class='add'>+#define DOLPHIN_C0_RESET			GENMASK(5, 5)</div><div class='add'>+#define DOLPHIN_C1_RESET			GENMASK(1, 1)</div><div class='add'>+#define DOLPHIN_WAKE				(DOLPHIN_C0_INT | DOLPHIN_C1_INT)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CS8409_BULLSEYE,</div><div class='add'>+	CS8409_WARLOCK,</div><div class='add'>+	CS8409_WARLOCK_MLK,</div><div class='add'>+	CS8409_WARLOCK_MLK_DUAL_MIC,</div><div class='add'>+	CS8409_CYBORG,</div><div class='add'>+	CS8409_FIXUPS,</div><div class='add'>+	CS8409_DOLPHIN,</div><div class='add'>+	CS8409_DOLPHIN_FIXUPS,</div><div class='add'>+	CS8409_ODIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CS8409_CODEC0,</div><div class='add'>+	CS8409_CODEC1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CS42L42_VOL_ADC,</div><div class='add'>+	CS42L42_VOL_DAC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CS42L42_ADC_VOL_OFFSET			(CS42L42_VOL_ADC)</div><div class='add'>+#define CS42L42_DAC_CH0_VOL_OFFSET		(CS42L42_VOL_DAC)</div><div class='add'>+#define CS42L42_DAC_CH1_VOL_OFFSET		(CS42L42_VOL_DAC + 1)</div><div class='add'>+</div><div class='add'>+struct cs8409_i2c_param {</div><div class='add'>+	unsigned int addr;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	unsigned int delay;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs8409_cir_param {</div><div class='add'>+	unsigned int nid;</div><div class='add'>+	unsigned int cir;</div><div class='add'>+	unsigned int coeff;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sub_codec {</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	unsigned int addr;</div><div class='add'>+	unsigned int reset_gpio;</div><div class='add'>+	unsigned int irq_mask;</div><div class='add'>+	const struct cs8409_i2c_param *init_seq;</div><div class='add'>+	unsigned int init_seq_num;</div><div class='add'>+</div><div class='add'>+	unsigned int hp_jack_in:1;</div><div class='add'>+	unsigned int mic_jack_in:1;</div><div class='add'>+	unsigned int suspended:1;</div><div class='add'>+	unsigned int paged:1;</div><div class='add'>+	unsigned int last_page;</div><div class='add'>+	unsigned int hsbias_hiz;</div><div class='add'>+	unsigned int full_scale_vol:1;</div><div class='add'>+	unsigned int no_type_dect:1;</div><div class='add'>+</div><div class='add'>+	s8 vol[CS42L42_VOLUMES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs8409_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	struct sub_codec *scodecs[CS8409_MAX_CODECS];</div><div class='add'>+	unsigned int num_scodecs;</div><div class='add'>+</div><div class='add'>+	unsigned int gpio_mask;</div><div class='add'>+	unsigned int gpio_dir;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+</div><div class='add'>+	int speaker_pdn_gpio;</div><div class='add'>+</div><div class='add'>+	struct mutex i2c_mux;</div><div class='add'>+	unsigned int i2c_clck_enabled;</div><div class='add'>+	unsigned int dev_addr;</div><div class='add'>+	struct delayed_work i2c_clk_work;</div><div class='add'>+</div><div class='add'>+	unsigned int playback_started:1;</div><div class='add'>+	unsigned int capture_started:1;</div><div class='add'>+	unsigned int init_done:1;</div><div class='add'>+	unsigned int build_ctrl_done:1;</div><div class='add'>+</div><div class='add'>+	/* verb exec op override */</div><div class='add'>+	int (*exec_verb)(struct hdac_device *dev, unsigned int cmd, unsigned int flags,</div><div class='add'>+			 unsigned int *res);</div><div class='add'>+	/* unsol_event op override */</div><div class='add'>+	void (*unsol_event)(struct hda_codec *codec, unsigned int res);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct snd_kcontrol_new cs42l42_dac_volume_mixer;</div><div class='add'>+extern const struct snd_kcontrol_new cs42l42_adc_volume_mixer;</div><div class='add'>+</div><div class='add'>+int cs42l42_volume_info(struct snd_kcontrol *kctrl, struct snd_ctl_elem_info *uinfo);</div><div class='add'>+int cs42l42_volume_get(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uctrl);</div><div class='add'>+int cs42l42_volume_put(struct snd_kcontrol *kctrl, struct snd_ctl_elem_value *uctrl);</div><div class='add'>+</div><div class='add'>+extern const struct hda_pcm_stream cs42l42_48k_pcm_analog_playback;</div><div class='add'>+extern const struct hda_pcm_stream cs42l42_48k_pcm_analog_capture;</div><div class='add'>+extern const struct hda_quirk cs8409_fixup_tbl[];</div><div class='add'>+extern const struct hda_model_fixup cs8409_models[];</div><div class='add'>+extern const struct hda_fixup cs8409_fixups[];</div><div class='add'>+extern const struct hda_verb cs8409_cs42l42_init_verbs[];</div><div class='add'>+extern const struct cs8409_cir_param cs8409_cs42l42_hw_cfg[];</div><div class='add'>+extern const struct cs8409_cir_param cs8409_cs42l42_bullseye_atn[];</div><div class='add'>+extern struct sub_codec cs8409_cs42l42_codec;</div><div class='add'>+</div><div class='add'>+extern const struct hda_verb dolphin_init_verbs[];</div><div class='add'>+extern const struct cs8409_cir_param dolphin_hw_cfg[];</div><div class='add'>+extern struct sub_codec dolphin_cs42l42_0;</div><div class='add'>+extern struct sub_codec dolphin_cs42l42_1;</div><div class='add'>+</div><div class='add'>+void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int action);</div><div class='add'>+void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int action);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/codecs/cm9825.c b/sound/hda/codecs/cm9825.c<br/>new file mode 100644<br/>index 000000000000..5c474ce44348<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cm9825.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cm9825.c</a></div><div class='hunk'>@@ -0,0 +1,312 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * CM9825 HD-audio codec</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+/* CM9825 Offset Definitions */</div><div class='add'>+</div><div class='add'>+#define CM9825_VERB_SET_HPF_1 0x781</div><div class='add'>+#define CM9825_VERB_SET_HPF_2 0x785</div><div class='add'>+#define CM9825_VERB_SET_PLL 0x7a0</div><div class='add'>+#define CM9825_VERB_SET_NEG 0x7a1</div><div class='add'>+#define CM9825_VERB_SET_ADCL 0x7a2</div><div class='add'>+#define CM9825_VERB_SET_DACL 0x7a3</div><div class='add'>+#define CM9825_VERB_SET_MBIAS 0x7a4</div><div class='add'>+#define CM9825_VERB_SET_VNEG 0x7a8</div><div class='add'>+#define CM9825_VERB_SET_D2S 0x7a9</div><div class='add'>+#define CM9825_VERB_SET_DACTRL 0x7aa</div><div class='add'>+#define CM9825_VERB_SET_PDNEG 0x7ac</div><div class='add'>+#define CM9825_VERB_SET_VDO 0x7ad</div><div class='add'>+#define CM9825_VERB_SET_CDALR 0x7b0</div><div class='add'>+#define CM9825_VERB_SET_MTCBA 0x7b1</div><div class='add'>+#define CM9825_VERB_SET_OTP 0x7b2</div><div class='add'>+#define CM9825_VERB_SET_OCP 0x7b3</div><div class='add'>+#define CM9825_VERB_SET_GAD 0x7b4</div><div class='add'>+#define CM9825_VERB_SET_TMOD 0x7b5</div><div class='add'>+#define CM9825_VERB_SET_SNR 0x7b6</div><div class='add'>+</div><div class='add'>+struct cmi_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+	const struct hda_verb *chip_d0_verbs;</div><div class='add'>+	const struct hda_verb *chip_d3_verbs;</div><div class='add'>+	const struct hda_verb *chip_hp_present_verbs;</div><div class='add'>+	const struct hda_verb *chip_hp_remove_verbs;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct delayed_work unsol_hp_work;</div><div class='add'>+	int quirk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cm9825_std_d3_verbs[] = {</div><div class='add'>+	/* chip sleep verbs */</div><div class='add'>+	{0x43, CM9825_VERB_SET_D2S, 0x62},	/* depop */</div><div class='add'>+	{0x43, CM9825_VERB_SET_PLL, 0x01},	/* PLL set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_NEG, 0xc2},	/* NEG set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_ADCL, 0x00},	/* ADC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACL, 0x02},	/* DACL */</div><div class='add'>+	{0x43, CM9825_VERB_SET_VNEG, 0x50},	/* VOL NEG */</div><div class='add'>+	{0x43, CM9825_VERB_SET_MBIAS, 0x00},	/* MBIAS */</div><div class='add'>+	{0x43, CM9825_VERB_SET_PDNEG, 0x04},	/* SEL OSC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_CDALR, 0xf6},	/* Class D */</div><div class='add'>+	{0x43, CM9825_VERB_SET_OTP, 0xcd},	/* OTP set */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cm9825_std_d0_verbs[] = {</div><div class='add'>+	/* chip init verbs */</div><div class='add'>+	{0x34, AC_VERB_SET_EAPD_BTLENABLE, 0x02},	/* EAPD set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_SNR, 0x30},	/* SNR set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_PLL, 0x00},	/* PLL set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_ADCL, 0x00},	/* ADC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACL, 0x02},	/* DACL */</div><div class='add'>+	{0x43, CM9825_VERB_SET_MBIAS, 0x00},	/* MBIAS */</div><div class='add'>+	{0x43, CM9825_VERB_SET_VNEG, 0x56},	/* VOL NEG */</div><div class='add'>+	{0x43, CM9825_VERB_SET_D2S, 0x62},	/* depop */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACTRL, 0x00},	/* DACTRL set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_PDNEG, 0x0c},	/* SEL OSC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_VDO, 0x80},	/* VDO set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_CDALR, 0xf4},	/* Class D */</div><div class='add'>+	{0x43, CM9825_VERB_SET_OTP, 0xcd},	/* OTP set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_MTCBA, 0x61},	/* SR set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_OCP, 0x33},	/* OTP set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_GAD, 0x07},	/* ADC -3db */</div><div class='add'>+	{0x43, CM9825_VERB_SET_TMOD, 0x26},	/* Class D clk */</div><div class='add'>+	{0x3C, AC_VERB_SET_AMP_GAIN_MUTE |</div><div class='add'>+		AC_AMP_SET_OUTPUT | AC_AMP_SET_RIGHT, 0x2d},	/* Gain set */</div><div class='add'>+	{0x3C, AC_VERB_SET_AMP_GAIN_MUTE |</div><div class='add'>+		AC_AMP_SET_OUTPUT | AC_AMP_SET_LEFT, 0x2d},	/* Gain set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_HPF_1, 0x40},	/* HPF set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_HPF_2, 0x40},	/* HPF set */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cm9825_hp_present_verbs[] = {</div><div class='add'>+	{0x42, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00},	/* PIN off */</div><div class='add'>+	{0x43, CM9825_VERB_SET_ADCL, 0x88},	/* ADC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACL, 0xaa},	/* DACL */</div><div class='add'>+	{0x43, CM9825_VERB_SET_MBIAS, 0x10},	/* MBIAS */</div><div class='add'>+	{0x43, CM9825_VERB_SET_D2S, 0xf2},	/* depop */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACTRL, 0x00},	/* DACTRL set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_VDO, 0xc4},	/* VDO set */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb cm9825_hp_remove_verbs[] = {</div><div class='add'>+	{0x43, CM9825_VERB_SET_ADCL, 0x00},	/* ADC */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACL, 0x56},	/* DACL */</div><div class='add'>+	{0x43, CM9825_VERB_SET_MBIAS, 0x00},	/* MBIAS */</div><div class='add'>+	{0x43, CM9825_VERB_SET_D2S, 0x62},	/* depop */</div><div class='add'>+	{0x43, CM9825_VERB_SET_DACTRL, 0xe0},	/* DACTRL set */</div><div class='add'>+	{0x43, CM9825_VERB_SET_VDO, 0x80},	/* VDO set */</div><div class='add'>+	{0x42, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},	/* PIN on */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cm9825_unsol_hp_delayed(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec =</div><div class='add'>+	    container_of(to_delayed_work(work), struct cmi_spec, unsol_hp_work);</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+	hda_nid_t hp_pin = spec-&gt;gen.autocfg.hp_pins[0];</div><div class='add'>+	bool hp_jack_plugin = false;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	hp_jack_plugin = snd_hda_jack_detect(spec-&gt;codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	codec_dbg(spec-&gt;codec, "hp_jack_plugin %d, hp_pin 0x%X\n",</div><div class='add'>+		  (int)hp_jack_plugin, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (!hp_jack_plugin) {</div><div class='add'>+		err =</div><div class='add'>+		    snd_hda_codec_write(spec-&gt;codec, 0x42, 0,</div><div class='add'>+					AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40);</div><div class='add'>+		if (err)</div><div class='add'>+			codec_dbg(spec-&gt;codec, "codec_write err %d\n", err);</div><div class='add'>+</div><div class='add'>+		snd_hda_sequence_write(spec-&gt;codec, spec-&gt;chip_hp_remove_verbs);</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_sequence_write(spec-&gt;codec,</div><div class='add'>+				       spec-&gt;chip_hp_present_verbs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jack = snd_hda_jack_tbl_get(spec-&gt;codec, hp_pin);</div><div class='add'>+	if (jack) {</div><div class='add'>+		jack-&gt;block_report = 0;</div><div class='add'>+		snd_hda_jack_report_sync(spec-&gt;codec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_jack_tbl *tbl;</div><div class='add'>+</div><div class='add'>+	/* Delay enabling the HP amp, to let the mic-detection</div><div class='add'>+	 * state machine run.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	codec_dbg(spec-&gt;codec, "cb-&gt;nid 0x%X\n", cb-&gt;nid);</div><div class='add'>+</div><div class='add'>+	tbl = snd_hda_jack_tbl_get(codec, cb-&gt;nid);</div><div class='add'>+	if (tbl)</div><div class='add'>+		tbl-&gt;block_report = 1;</div><div class='add'>+	schedule_delayed_work(&amp;spec-&gt;unsol_hp_work, msecs_to_jiffies(200));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm9825_setup_unsol(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	hda_nid_t hp_pin = spec-&gt;gen.autocfg.hp_pins[0];</div><div class='add'>+</div><div class='add'>+	snd_hda_jack_detect_enable_callback(codec, hp_pin, hp_callback);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm9825_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cm9825_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;unsol_hp_work);</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm9825_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;unsol_hp_work);</div><div class='add'>+</div><div class='add'>+	snd_hda_sequence_write(codec, spec-&gt;chip_d3_verbs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm9825_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = 0;</div><div class='add'>+	bool hp_jack_plugin = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err =</div><div class='add'>+	    snd_hda_codec_write(spec-&gt;codec, 0x42, 0,</div><div class='add'>+				AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00);</div><div class='add'>+	if (err)</div><div class='add'>+		codec_dbg(codec, "codec_write err %d\n", err);</div><div class='add'>+</div><div class='add'>+	msleep(150);		/* for depop noise */</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_init(codec);</div><div class='add'>+</div><div class='add'>+	hp_pin = spec-&gt;gen.autocfg.hp_pins[0];</div><div class='add'>+	hp_jack_plugin = snd_hda_jack_detect(spec-&gt;codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	codec_dbg(spec-&gt;codec, "hp_jack_plugin %d, hp_pin 0x%X\n",</div><div class='add'>+		  (int)hp_jack_plugin, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (!hp_jack_plugin) {</div><div class='add'>+		err =</div><div class='add'>+		    snd_hda_codec_write(spec-&gt;codec, 0x42, 0,</div><div class='add'>+					AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			codec_dbg(codec, "codec_write err %d\n", err);</div><div class='add'>+</div><div class='add'>+		snd_hda_sequence_write(codec, cm9825_hp_remove_verbs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+	hda_call_check_power_status(codec, 0x01);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cm9825_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct cmi_spec *spec;</div><div class='add'>+	struct auto_pin_cfg *cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (spec == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;spec-&gt;unsol_hp_work, cm9825_unsol_hp_delayed);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	spec-&gt;codec = codec;</div><div class='add'>+	cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	spec-&gt;chip_d0_verbs = cm9825_std_d0_verbs;</div><div class='add'>+	spec-&gt;chip_d3_verbs = cm9825_std_d3_verbs;</div><div class='add'>+	spec-&gt;chip_hp_present_verbs = cm9825_hp_present_verbs;</div><div class='add'>+	spec-&gt;chip_hp_remove_verbs = cm9825_hp_remove_verbs;</div><div class='add'>+</div><div class='add'>+	snd_hda_sequence_write(codec, spec-&gt;chip_d0_verbs);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	cm9825_setup_unsol(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	cm9825_remove(codec);</div><div class='add'>+</div><div class='add'>+	codec_info(codec, "Enter err %d\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cm9825_codec_ops = {</div><div class='add'>+	.probe = cm9825_probe,</div><div class='add'>+	.remove = cm9825_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = cm9825_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = cm9825_suspend,</div><div class='add'>+	.resume = cm9825_resume,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_cm9825[] = {</div><div class='add'>+	HDA_CODEC_ID(0x13f69825, "CM9825"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cm9825);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("CM9825 HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver cm9825_driver = {</div><div class='add'>+	.id = snd_hda_id_cm9825,</div><div class='add'>+	.ops = &amp;cm9825_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(cm9825_driver);</div><div class='head'>diff --git a/sound/hda/codecs/cmedia.c b/sound/hda/codecs/cmedia.c<br/>new file mode 100644<br/>index 000000000000..15e5a1118a6e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/cmedia.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/cmedia.c</a></div><div class='hunk'>@@ -0,0 +1,106 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal codec driver for Intel High Definition Audio Codec</div><div class='add'>+ *</div><div class='add'>+ * HD audio codec driver for C-Media CMI9880</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+static int cmedia_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec;</div><div class='add'>+	struct auto_pin_cfg *cfg;</div><div class='add'>+	bool is_cmi8888 = id-&gt;vendor_id == 0x13f68888;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (spec == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	snd_hda_gen_spec_init(spec);</div><div class='add'>+</div><div class='add'>+	if (is_cmi8888) {</div><div class='add'>+		/* mask NID 0x10 from the playback volume selection;</div><div class='add'>+		 * it's a headphone boost volume handled manually below</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;out_vol_mask = (1ULL &lt;&lt; 0x10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (is_cmi8888) {</div><div class='add'>+		if (get_defcfg_device(snd_hda_codec_get_pincfg(codec, 0x10)) ==</div><div class='add'>+		    AC_JACK_HP_OUT) {</div><div class='add'>+			static const struct snd_kcontrol_new amp_kctl =</div><div class='add'>+				HDA_CODEC_VOLUME("Headphone Amp Playback Volume",</div><div class='add'>+						 0x10, 0, HDA_OUTPUT);</div><div class='add'>+			if (!snd_hda_gen_add_kctl(spec, NULL, &amp;amp_kctl)) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cmedia_codec_ops = {</div><div class='add'>+	.probe = cmedia_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = snd_hda_gen_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_cmedia[] = {</div><div class='add'>+	HDA_CODEC_ID(0x13f68888, "CMI8888"),</div><div class='add'>+	HDA_CODEC_ID(0x13f69880, "CMI9880"),</div><div class='add'>+	HDA_CODEC_ID(0x434d4980, "CMI9880"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_cmedia);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("C-Media HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver cmedia_driver = {</div><div class='add'>+	.id = snd_hda_id_cmedia,</div><div class='add'>+	.ops = &amp;cmedia_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(cmedia_driver);</div><div class='head'>diff --git a/sound/hda/codecs/conexant.c b/sound/hda/codecs/conexant.c<br/>new file mode 100644<br/>index 000000000000..5fcbc1312c69<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/conexant.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/conexant.c</a></div><div class='hunk'>@@ -0,0 +1,1333 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Conexant HDA audio codec</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2006 Pototskiy Akex &lt;alex.pototskiy@gmail.com&gt;</div><div class='add'>+ * 		      Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ * 		      Tobin Davis  &lt;tdavis@dsl-only.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+struct conexant_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	/* extra EAPD pins */</div><div class='add'>+	unsigned int num_eapds;</div><div class='add'>+	hda_nid_t eapds[4];</div><div class='add'>+	bool dynamic_eapd;</div><div class='add'>+	hda_nid_t mute_led_eapd;</div><div class='add'>+</div><div class='add'>+	unsigned int parse_flags; /* flag for snd_hda_parse_pin_defcfg() */</div><div class='add'>+</div><div class='add'>+	/* OLPC XO specific */</div><div class='add'>+	bool recording;</div><div class='add'>+	bool dc_enable;</div><div class='add'>+	unsigned int dc_input_bias; /* offset into olpc_xo_dc_bias */</div><div class='add'>+	struct nid_path *dc_mode_path;</div><div class='add'>+</div><div class='add'>+	int mute_led_polarity;</div><div class='add'>+	unsigned int gpio_led;</div><div class='add'>+	unsigned int gpio_mute_led_mask;</div><div class='add'>+	unsigned int gpio_mic_led_mask;</div><div class='add'>+	bool is_cx11880_sn6140;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+/* additional beep mixers; private_value will be overwritten */</div><div class='add'>+static const struct snd_kcontrol_new cxt_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_beep_amp(struct conexant_spec *spec, hda_nid_t nid,</div><div class='add'>+			int idx, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = nid;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cxt_beep_mixer); i++) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+					    &amp;cxt_beep_mixer[i]);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value = beep_amp;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx_auto_parse_beep(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec)</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP)</div><div class='add'>+			return set_beep_amp(spec, nid, 0, HDA_OUTPUT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define cx_auto_parse_beep(codec)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Automatic parser for CX20641 &amp; co</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* parse EAPDs */</div><div class='add'>+static void cx_auto_parse_eapd(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='add'>+			continue;</div><div class='add'>+		if (!(snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD))</div><div class='add'>+			continue;</div><div class='add'>+		spec-&gt;eapds[spec-&gt;num_eapds++] = nid;</div><div class='add'>+		if (spec-&gt;num_eapds &gt;= ARRAY_SIZE(spec-&gt;eapds))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NOTE: below is a wild guess; if we have more than two EAPDs,</div><div class='add'>+	 * it's a new chip, where EAPDs are supposed to be associated to</div><div class='add'>+	 * pins, and we can control EAPD per pin.</div><div class='add'>+	 * OTOH, if only one or two EAPDs are found, it's an old chip,</div><div class='add'>+	 * thus it might control over all pins.</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;num_eapds &gt; 2)</div><div class='add'>+		spec-&gt;dynamic_eapd = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_auto_turn_eapd(struct hda_codec *codec, int num_pins,</div><div class='add'>+			      const hda_nid_t *pins, bool on)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		if (snd_hda_query_pin_caps(codec, pins[i]) &amp; AC_PINCAP_EAPD)</div><div class='add'>+			snd_hda_codec_write(codec, pins[i], 0,</div><div class='add'>+					    AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+					    on ? 0x02 : 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD according to Master switch */</div><div class='add'>+static void cx_auto_vmaster_hook(void *private_data, int enabled)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = private_data;</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cx_auto_turn_eapd(codec, spec-&gt;num_eapds, spec-&gt;eapds, enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD according to Master switch (inversely!) for mute LED */</div><div class='add'>+static int cx_auto_vmaster_mute_led(struct led_classdev *led_cdev,</div><div class='add'>+				    enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, spec-&gt;mute_led_eapd, 0,</div><div class='add'>+			    AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+			    brightness ? 0x02 : 0x00);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_init_gpio_led(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int mask = spec-&gt;gpio_mute_led_mask | spec-&gt;gpio_mic_led_mask;</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+				    mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+				    mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_led);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_fixup_headset_recog(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int mic_present;</div><div class='add'>+</div><div class='add'>+	/* fix some headset type recognize fail issue, such as EDIFIER headset */</div><div class='add'>+	/* set micbias output current comparator threshold from 66% to 55%. */</div><div class='add'>+	snd_hda_codec_write(codec, 0x1c, 0, 0x320, 0x010);</div><div class='add'>+	/* set OFF voltage for DFET from -1.2V to -0.8V, set headset micbias register</div><div class='add'>+	 * value adjustment trim from 2.2K ohms to 2.0K ohms.</div><div class='add'>+	 */</div><div class='add'>+	snd_hda_codec_write(codec, 0x1c, 0, 0x3b0, 0xe10);</div><div class='add'>+	/* fix reboot headset type recognize fail issue */</div><div class='add'>+	mic_present = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);</div><div class='add'>+	if (mic_present &amp; AC_PINSENSE_PRESENCE)</div><div class='add'>+		/* enable headset mic VREF */</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);</div><div class='add'>+	else</div><div class='add'>+		/* disable headset mic VREF */</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+	if (!spec-&gt;dynamic_eapd)</div><div class='add'>+		cx_auto_turn_eapd(codec, spec-&gt;num_eapds, spec-&gt;eapds, true);</div><div class='add'>+</div><div class='add'>+	cxt_init_gpio_led(codec);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;is_cx11880_sn6140)</div><div class='add'>+		cx_fixup_headset_recog(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_auto_shutdown(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* Turn the problematic codec into D3 to avoid spurious noises</div><div class='add'>+	   from the internal speaker during (and after) reboot */</div><div class='add'>+	cx_auto_turn_eapd(codec, spec-&gt;num_eapds, spec-&gt;eapds, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	cx_auto_shutdown(codec);</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_process_headset_plugin(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	unsigned int count = 0;</div><div class='add'>+</div><div class='add'>+	/* Wait headset detect done. */</div><div class='add'>+	do {</div><div class='add'>+		val = snd_hda_codec_read(codec, 0x1c, 0, 0xca0, 0x0);</div><div class='add'>+		if (val &amp; 0x080) {</div><div class='add'>+			codec_dbg(codec, "headset type detect done!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msleep(20);</div><div class='add'>+		count++;</div><div class='add'>+	} while (count &lt; 3);</div><div class='add'>+	val = snd_hda_codec_read(codec, 0x1c, 0, 0xcb0, 0x0);</div><div class='add'>+	if (val &amp; 0x800) {</div><div class='add'>+		codec_dbg(codec, "headset plugin, type is CTIA\n");</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);</div><div class='add'>+	} else if (val &amp; 0x400) {</div><div class='add'>+		codec_dbg(codec, "headset plugin, type is OMTP\n");</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24);</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "headphone plugin\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cx_update_headset_mic_vref(struct hda_codec *codec, struct hda_jack_callback *event)</div><div class='add'>+{</div><div class='add'>+	unsigned int mic_present;</div><div class='add'>+</div><div class='add'>+	/* In cx11880 and sn6140, the node 16 can only be configured to headphone or disabled,</div><div class='add'>+	 * the node 19 can only be configured to microphone or disabled.</div><div class='add'>+	 * Check hp&amp;mic tag to process headset plugin &amp; plugout.</div><div class='add'>+	 */</div><div class='add'>+	mic_present = snd_hda_codec_read(codec, 0x19, 0, AC_VERB_GET_PIN_SENSE, 0x0);</div><div class='add'>+	if (!(mic_present &amp; AC_PINSENSE_PRESENCE)) /* mic plugout */</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20);</div><div class='add'>+	else</div><div class='add'>+		cx_process_headset_plugin(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	cx_auto_shutdown(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pin fix-up</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	CXT_PINCFG_LENOVO_X200,</div><div class='add'>+	CXT_PINCFG_LENOVO_TP410,</div><div class='add'>+	CXT_PINCFG_LEMOTE_A1004,</div><div class='add'>+	CXT_PINCFG_LEMOTE_A1205,</div><div class='add'>+	CXT_PINCFG_COMPAQ_CQ60,</div><div class='add'>+	CXT_FIXUP_STEREO_DMIC,</div><div class='add'>+	CXT_PINCFG_LENOVO_NOTEBOOK,</div><div class='add'>+	CXT_FIXUP_INC_MIC_BOOST,</div><div class='add'>+	CXT_FIXUP_HEADPHONE_MIC_PIN,</div><div class='add'>+	CXT_FIXUP_HEADPHONE_MIC,</div><div class='add'>+	CXT_FIXUP_GPIO1,</div><div class='add'>+	CXT_FIXUP_ASPIRE_DMIC,</div><div class='add'>+	CXT_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	CXT_FIXUP_LENOVO_XPAD_ACPI,</div><div class='add'>+	CXT_FIXUP_OLPC_XO,</div><div class='add'>+	CXT_FIXUP_CAP_MIX_AMP,</div><div class='add'>+	CXT_FIXUP_TOSHIBA_P105,</div><div class='add'>+	CXT_FIXUP_HP_530,</div><div class='add'>+	CXT_FIXUP_CAP_MIX_AMP_5047,</div><div class='add'>+	CXT_FIXUP_MUTE_LED_EAPD,</div><div class='add'>+	CXT_FIXUP_HP_DOCK,</div><div class='add'>+	CXT_FIXUP_HP_SPECTRE,</div><div class='add'>+	CXT_FIXUP_HP_GATE_MIC,</div><div class='add'>+	CXT_FIXUP_MUTE_LED_GPIO,</div><div class='add'>+	CXT_FIXUP_HP_ELITEONE_OUT_DIS,</div><div class='add'>+	CXT_FIXUP_HP_ZBOOK_MUTE_LED,</div><div class='add'>+	CXT_FIXUP_HEADSET_MIC,</div><div class='add'>+	CXT_FIXUP_HP_MIC_NO_PRESENCE,</div><div class='add'>+	CXT_PINCFG_SWS_JS201D,</div><div class='add'>+	CXT_PINCFG_TOP_SPEAKER,</div><div class='add'>+	CXT_FIXUP_HP_A_U,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* for hda_fixup_thinkpad_acpi() */</div><div class='add'>+#include "helpers/thinkpad.c"</div><div class='add'>+</div><div class='add'>+/* for hda_fixup_ideapad_acpi() */</div><div class='add'>+#include "helpers/ideapad_hotkey_led.c"</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_stereo_dmic(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;gen.inv_dmic_split = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fix widget control pin settings */</div><div class='add'>+static void cxt_fixup_update_pinctl(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		/* Unset OUT_EN for this Node pin, leaving only HP_EN.</div><div class='add'>+		 * This is the value stored in the codec register after</div><div class='add'>+		 * the correct initialization of the previous windows boot.</div><div class='add'>+		 */</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x1d, AC_PINCTL_HP_EN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt5066_increase_mic_boost(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT,</div><div class='add'>+				  (0x3 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (0x4 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (0x27 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_update_headset_mode(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* The verbs used in this function were tested on a Conexant CX20751/2 codec. */</div><div class='add'>+	int i;</div><div class='add'>+	bool mic_mode = false;</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+</div><div class='add'>+	hda_nid_t mux_pin = spec-&gt;gen.imux_pins[spec-&gt;gen.cur_mux[0]];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='add'>+		if (cfg-&gt;inputs[i].pin == mux_pin) {</div><div class='add'>+			mic_mode = !!cfg-&gt;inputs[i].is_headphone_mic;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (mic_mode) {</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x1c, 0, 0x410, 0x7c); /* enable merged mode for analog int-mic */</div><div class='add'>+		spec-&gt;gen.hp_jack_present = false;</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x1c, 0, 0x410, 0x54); /* disable merged mode for analog int-mic */</div><div class='add'>+		spec-&gt;gen.hp_jack_present = snd_hda_jack_detect(codec, spec-&gt;gen.autocfg.hp_pins[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_update_headset_mode_hook(struct hda_codec *codec,</div><div class='add'>+					 struct snd_kcontrol *kcontrol,</div><div class='add'>+					 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	cxt_update_headset_mode(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_headphone_mic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADPHONE_MIC;</div><div class='add'>+		snd_hdac_regmap_add_vendor_verb(&amp;codec-&gt;core, 0x410);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		WARN_ON(spec-&gt;gen.cap_sync_hook);</div><div class='add'>+		spec-&gt;gen.cap_sync_hook = cxt_update_headset_mode_hook;</div><div class='add'>+		spec-&gt;gen.automute_hook = cxt_update_headset_mode;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		cxt_update_headset_mode(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_headset_mic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* OLPC XO 1.5 fixup */</div><div class='add'>+</div><div class='add'>+/* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)</div><div class='add'>+ * through the microphone jack.</div><div class='add'>+ * When the user enables this through a mixer switch, both internal and</div><div class='add'>+ * external microphones are disabled. Gain is fixed at 0dB. In this mode,</div><div class='add'>+ * we also allow the bias to be configured through a separate mixer</div><div class='add'>+ * control. */</div><div class='add'>+</div><div class='add'>+#define update_mic_pin(codec, nid, val)					\</div><div class='add'>+	snd_hda_codec_write_cache(codec, nid, 0,			\</div><div class='add'>+				   AC_VERB_SET_PIN_WIDGET_CONTROL, val)</div><div class='add'>+</div><div class='add'>+static const struct hda_input_mux olpc_xo_dc_bias = {</div><div class='add'>+	.num_items = 3,</div><div class='add'>+	.items = {</div><div class='add'>+		{ "Off", PIN_IN },</div><div class='add'>+		{ "50%", PIN_VREF50 },</div><div class='add'>+		{ "80%", PIN_VREF80 },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void olpc_xo_update_mic_boost(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	int ch, val;</div><div class='add'>+</div><div class='add'>+	for (ch = 0; ch &lt; 2; ch++) {</div><div class='add'>+		val = AC_AMP_SET_OUTPUT |</div><div class='add'>+			(ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT);</div><div class='add'>+		if (!spec-&gt;dc_enable)</div><div class='add'>+			val |= snd_hda_codec_amp_read(codec, 0x17, ch, HDA_OUTPUT, 0);</div><div class='add'>+		snd_hda_codec_write(codec, 0x17, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void olpc_xo_update_mic_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	int cur_input, val;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	cur_input = spec-&gt;gen.input_paths[0][spec-&gt;gen.cur_mux[0]];</div><div class='add'>+</div><div class='add'>+	/* Set up mic pins for port-B, C and F dynamically as the recording</div><div class='add'>+	 * LED is turned on/off by these pin controls</div><div class='add'>+	 */</div><div class='add'>+	if (!spec-&gt;dc_enable) {</div><div class='add'>+		/* disable DC bias path and pin for port F */</div><div class='add'>+		update_mic_pin(codec, 0x1e, 0);</div><div class='add'>+		snd_hda_activate_path(codec, spec-&gt;dc_mode_path, false, false);</div><div class='add'>+</div><div class='add'>+		/* update port B (ext mic) and C (int mic) */</div><div class='add'>+		/* OLPC defers mic widget control until when capture is</div><div class='add'>+		 * started because the microphone LED comes on as soon as</div><div class='add'>+		 * these settings are put in place. if we did this before</div><div class='add'>+		 * recording, it would give the false indication that</div><div class='add'>+		 * recording is happening when it is not.</div><div class='add'>+		 */</div><div class='add'>+		update_mic_pin(codec, 0x1a, spec-&gt;recording ?</div><div class='add'>+			       snd_hda_codec_get_pin_target(codec, 0x1a) : 0);</div><div class='add'>+		update_mic_pin(codec, 0x1b, spec-&gt;recording ?</div><div class='add'>+			       snd_hda_codec_get_pin_target(codec, 0x1b) : 0);</div><div class='add'>+		/* enable normal mic path */</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, cur_input);</div><div class='add'>+		if (path)</div><div class='add'>+			snd_hda_activate_path(codec, path, true, false);</div><div class='add'>+	} else {</div><div class='add'>+		/* disable normal mic path */</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, cur_input);</div><div class='add'>+		if (path)</div><div class='add'>+			snd_hda_activate_path(codec, path, false, false);</div><div class='add'>+</div><div class='add'>+		/* Even though port F is the DC input, the bias is controlled</div><div class='add'>+		 * on port B.  We also leave that port as an active input (but</div><div class='add'>+		 * unselected) in DC mode just in case that is necessary to</div><div class='add'>+		 * make the bias setting take effect.</div><div class='add'>+		 */</div><div class='add'>+		if (spec-&gt;recording)</div><div class='add'>+			val = olpc_xo_dc_bias.items[spec-&gt;dc_input_bias].index;</div><div class='add'>+		else</div><div class='add'>+			val = 0;</div><div class='add'>+		update_mic_pin(codec, 0x1a, val);</div><div class='add'>+		update_mic_pin(codec, 0x1b, 0);</div><div class='add'>+		/* enable DC bias path and pin */</div><div class='add'>+		update_mic_pin(codec, 0x1e, spec-&gt;recording ? PIN_IN : 0);</div><div class='add'>+		snd_hda_activate_path(codec, spec-&gt;dc_mode_path, true, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mic_autoswitch hook */</div><div class='add'>+static void olpc_xo_automic(struct hda_codec *codec,</div><div class='add'>+			    struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* in DC mode, we don't handle automic */</div><div class='add'>+	if (!spec-&gt;dc_enable)</div><div class='add'>+		snd_hda_gen_mic_autoswitch(codec, jack);</div><div class='add'>+	olpc_xo_update_mic_pins(codec);</div><div class='add'>+	if (spec-&gt;dc_enable)</div><div class='add'>+		olpc_xo_update_mic_boost(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* pcm_capture hook */</div><div class='add'>+static void olpc_xo_capture_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream,</div><div class='add'>+				 int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* toggle spec-&gt;recording flag and update mic pins accordingly</div><div class='add'>+	 * for turning on/off LED</div><div class='add'>+	 */</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		spec-&gt;recording = 1;</div><div class='add'>+		olpc_xo_update_mic_pins(codec);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		spec-&gt;recording = 0;</div><div class='add'>+		olpc_xo_update_mic_pins(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int olpc_xo_dc_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = spec-&gt;dc_enable;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int olpc_xo_dc_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	int dc_enable = !!ucontrol-&gt;value.integer.value[0];</div><div class='add'>+</div><div class='add'>+	if (dc_enable == spec-&gt;dc_enable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;dc_enable = dc_enable;</div><div class='add'>+	olpc_xo_update_mic_pins(codec);</div><div class='add'>+	olpc_xo_update_mic_boost(codec);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int olpc_xo_dc_bias_enum_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;dc_input_bias;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int olpc_xo_dc_bias_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_input_mux_info(&amp;olpc_xo_dc_bias, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int olpc_xo_dc_bias_enum_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct hda_input_mux *imux = &amp;olpc_xo_dc_bias;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (idx &gt;= imux-&gt;num_items)</div><div class='add'>+		idx = imux-&gt;num_items - 1;</div><div class='add'>+	if (spec-&gt;dc_input_bias == idx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;dc_input_bias = idx;</div><div class='add'>+	if (spec-&gt;dc_enable)</div><div class='add'>+		olpc_xo_update_mic_pins(codec);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new olpc_xo_mixers[] = {</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "DC Mode Enable Switch",</div><div class='add'>+		.info = snd_ctl_boolean_mono_info,</div><div class='add'>+		.get = olpc_xo_dc_mode_get,</div><div class='add'>+		.put = olpc_xo_dc_mode_put,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "DC Input Bias Enum",</div><div class='add'>+		.info = olpc_xo_dc_bias_enum_info,</div><div class='add'>+		.get = olpc_xo_dc_bias_enum_get,</div><div class='add'>+		.put = olpc_xo_dc_bias_enum_put,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* overriding mic boost put callback; update mic boost volume only when</div><div class='add'>+ * DC mode is disabled</div><div class='add'>+ */</div><div class='add'>+static int olpc_xo_mic_boost_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	int ret = snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);</div><div class='add'>+	if (ret &gt; 0 &amp;&amp; spec-&gt;dc_enable)</div><div class='add'>+		olpc_xo_update_mic_boost(codec);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_olpc_xo(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_kcontrol_new *kctl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mic_autoswitch_hook = olpc_xo_automic;</div><div class='add'>+	spec-&gt;gen.pcm_capture_hook = olpc_xo_capture_hook;</div><div class='add'>+	spec-&gt;dc_mode_path = snd_hda_add_new_path(codec, 0x1e, 0x14, 0);</div><div class='add'>+</div><div class='add'>+	snd_hda_add_new_ctls(codec, olpc_xo_mixers);</div><div class='add'>+</div><div class='add'>+	/* OLPC's microphone port is DC coupled for use with external sensors,</div><div class='add'>+	 * therefore we use a 50% mic bias in order to center the input signal</div><div class='add'>+	 * with the DC input range of the codec.</div><div class='add'>+	 */</div><div class='add'>+	snd_hda_codec_set_pin_target(codec, 0x1a, PIN_VREF50);</div><div class='add'>+</div><div class='add'>+	/* override mic boost control */</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;gen.kctls, i, kctl) {</div><div class='add'>+		if (!strcmp(kctl-&gt;name, "Mic Boost Volume")) {</div><div class='add'>+			kctl-&gt;put = olpc_xo_mic_boost_put;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_mute_led_eapd(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_eapd = 0x1b;</div><div class='add'>+		spec-&gt;dynamic_eapd = true;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, cx_auto_vmaster_mute_led);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fix max input level on mixer widget to 0dB</div><div class='add'>+ * (originally it has 0x2b steps with 0dB offset 0x14)</div><div class='add'>+ */</div><div class='add'>+static void cxt_fixup_cap_mix_amp(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,</div><div class='add'>+				  (0x14 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (0x14 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fix max input level on mixer widget to 0dB</div><div class='add'>+ * (originally it has 0x1e steps with 0 dB offset 0x17)</div><div class='add'>+ */</div><div class='add'>+static void cxt_fixup_cap_mix_amp_5047(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	snd_hda_override_amp_caps(codec, 0x10, HDA_INPUT,</div><div class='add'>+				  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_hp_gate_mic_jack(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix,</div><div class='add'>+				       int action)</div><div class='add'>+{</div><div class='add'>+	/* the mic pin (0x19) doesn't give an unsolicited event;</div><div class='add'>+	 * probe the mic pin together with the headphone pin (0x16)</div><div class='add'>+	 */</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		snd_hda_jack_set_gating_jack(codec, 0x19, 0x16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update LED status via GPIO */</div><div class='add'>+static void cxt_update_gpio_led(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+				bool led_on)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int oldval = spec-&gt;gpio_led;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;mute_led_polarity)</div><div class='add'>+		led_on = !led_on;</div><div class='add'>+</div><div class='add'>+	if (led_on)</div><div class='add'>+		spec-&gt;gpio_led |= mask;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;gpio_led &amp;= ~mask;</div><div class='add'>+	codec_dbg(codec, "mask:%d enabled:%d gpio_led:%d\n",</div><div class='add'>+			mask, led_on, spec-&gt;gpio_led);</div><div class='add'>+	if (spec-&gt;gpio_led != oldval)</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_led);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off mute LED via GPIO per vmaster hook */</div><div class='add'>+static int cxt_gpio_mute_update(struct led_classdev *led_cdev,</div><div class='add'>+				enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cxt_update_gpio_led(codec, spec-&gt;gpio_mute_led_mask, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off mic-mute LED via GPIO per capture hook */</div><div class='add'>+static int cxt_gpio_micmute_update(struct led_classdev *led_cdev,</div><div class='add'>+				   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cxt_update_gpio_led(codec, spec-&gt;gpio_mic_led_mask, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_setup_mute_led(struct hda_codec *codec,</div><div class='add'>+			       unsigned int mute, unsigned int mic_mute)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_led = 0;</div><div class='add'>+	spec-&gt;mute_led_polarity = 0;</div><div class='add'>+	if (mute) {</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, cxt_gpio_mute_update);</div><div class='add'>+		spec-&gt;gpio_mute_led_mask = mute;</div><div class='add'>+	}</div><div class='add'>+	if (mic_mute) {</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, cxt_gpio_micmute_update);</div><div class='add'>+		spec-&gt;gpio_mic_led_mask = mic_mute;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_setup_gpio_unmute(struct hda_codec *codec,</div><div class='add'>+				  unsigned int gpio_mute_mask)</div><div class='add'>+{</div><div class='add'>+	if (gpio_mute_mask) {</div><div class='add'>+		// set gpio data to 0.</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK, gpio_mute_mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION, gpio_mute_mask);</div><div class='add'>+		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_STICKY_MASK, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		cxt_setup_mute_led(codec, 0x01, 0x02);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec,</div><div class='add'>+					const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		cxt_setup_mute_led(codec, 0x10, 0x20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxt_fixup_hp_a_u(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	// Init vers in BIOS mute the spk/hp by set gpio high to avoid pop noise,</div><div class='add'>+	// so need to unmute once by clearing the gpio data when runs into the system.</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		cxt_setup_gpio_unmute(codec, 0x2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ThinkPad X200 &amp; co with cxt5051 */</div><div class='add'>+static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = {</div><div class='add'>+	{ 0x16, 0x042140ff }, /* HP (seq# overridden) */</div><div class='add'>+	{ 0x17, 0x21a11000 }, /* dock-mic */</div><div class='add'>+	{ 0x19, 0x2121103f }, /* dock-HP */</div><div class='add'>+	{ 0x1c, 0x21440100 }, /* dock SPDIF out */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ThinkPad 410/420/510/520, X201 &amp; co with cxt5066 */</div><div class='add'>+static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = {</div><div class='add'>+	{ 0x19, 0x042110ff }, /* HP (seq# overridden) */</div><div class='add'>+	{ 0x1a, 0x21a190f0 }, /* dock-mic */</div><div class='add'>+	{ 0x1c, 0x212140ff }, /* dock-HP */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Lemote A1004/A1205 with cxt5066 */</div><div class='add'>+static const struct hda_pintbl cxt_pincfg_lemote[] = {</div><div class='add'>+	{ 0x1a, 0x90a10020 }, /* Internal mic */</div><div class='add'>+	{ 0x1b, 0x03a11020 }, /* External mic */</div><div class='add'>+	{ 0x1d, 0x400101f0 }, /* Not used */</div><div class='add'>+	{ 0x1e, 0x40a701f0 }, /* Not used */</div><div class='add'>+	{ 0x20, 0x404501f0 }, /* Not used */</div><div class='add'>+	{ 0x22, 0x404401f0 }, /* Not used */</div><div class='add'>+	{ 0x23, 0x40a701f0 }, /* Not used */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SuoWoSi/South-holding JS201D with sn6140 */</div><div class='add'>+static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {</div><div class='add'>+	{ 0x16, 0x03211040 }, /* hp out */</div><div class='add'>+	{ 0x17, 0x91170110 }, /* SPK/Class_D */</div><div class='add'>+	{ 0x18, 0x95a70130 }, /* Internal mic */</div><div class='add'>+	{ 0x19, 0x03a11020 }, /* Headset Mic */</div><div class='add'>+	{ 0x1a, 0x40f001f0 }, /* Not used */</div><div class='add'>+	{ 0x21, 0x40f001f0 }, /* Not used */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup cxt_fixups[] = {</div><div class='add'>+	[CXT_PINCFG_LENOVO_X200] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cxt_pincfg_lenovo_x200,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_LENOVO_TP410] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cxt_pincfg_lenovo_tp410,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_LEMOTE_A1004] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_INC_MIC_BOOST,</div><div class='add'>+		.v.pins = cxt_pincfg_lemote,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_LEMOTE_A1205] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cxt_pincfg_lemote,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_COMPAQ_CQ60] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* 0x17 was falsely set up as a mic, it should 0x1d */</div><div class='add'>+			{ 0x17, 0x400001f0 },</div><div class='add'>+			{ 0x1d, 0x97a70120 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_STEREO_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_stereo_dmic,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_LENOVO_NOTEBOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x05d71030 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = CXT_FIXUP_STEREO_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_INC_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt5066_increase_mic_boost,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HEADPHONE_MIC_PIN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_HEADPHONE_MIC,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x03a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HEADPHONE_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_headphone_mic,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x01, AC_VERB_SET_GPIO_MASK, 0x01 },</div><div class='add'>+			{ 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01 },</div><div class='add'>+			{ 0x01, AC_VERB_SET_GPIO_DATA, 0x01 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_ASPIRE_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_stereo_dmic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_THINKPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = hda_fixup_thinkpad_acpi,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_LENOVO_XPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = hda_fixup_ideapad_acpi,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_OLPC_XO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_olpc_xo,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_CAP_MIX_AMP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_cap_mix_amp,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_TOSHIBA_P105] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x10, 0x961701f0 }, /* speaker/hp */</div><div class='add'>+			{ 0x12, 0x02a1901e }, /* ext mic */</div><div class='add'>+			{ 0x14, 0x95a70110 }, /* int mic */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_530] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x90a60160 }, /* int mic */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_CAP_MIX_AMP,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_CAP_MIX_AMP_5047] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_cap_mix_amp_5047,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_MUTE_LED_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_mute_led_eapd,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_DOCK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x21011020 }, /* line-out */</div><div class='add'>+			{ 0x18, 0x2181103f }, /* line-in */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_MUTE_LED_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_SPECTRE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* enable NID 0x1d for the speaker on top */</div><div class='add'>+			{ 0x1d, 0x91170111 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_GATE_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_hp_gate_mic_jack,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_MUTE_LED_GPIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_mute_led_gpio,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_update_pinctl,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_hp_zbook_mute_led,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x02a1113c },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = CXT_FIXUP_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_SWS_JS201D] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = cxt_pincfg_sws_js201d,</div><div class='add'>+	},</div><div class='add'>+	[CXT_PINCFG_TOP_SPEAKER] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1d, 0x82170111 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[CXT_FIXUP_HP_A_U] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cxt_fixup_hp_a_u,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cxt5045_fixups[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT_FIXUP_HP_530),</div><div class='add'>+	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT_FIXUP_TOSHIBA_P105),</div><div class='add'>+	/* HP, Packard Bell, Fujitsu-Siemens &amp; Lenovo laptops have</div><div class='add'>+	 * really bad sound over 0dB on NID 0x17.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x103c, "HP", CXT_FIXUP_CAP_MIX_AMP),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1631, "Packard Bell", CXT_FIXUP_CAP_MIX_AMP),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1734, "Fujitsu", CXT_FIXUP_CAP_MIX_AMP),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT_FIXUP_CAP_MIX_AMP),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cxt5045_fixup_models[] = {</div><div class='add'>+	{ .id = CXT_FIXUP_CAP_MIX_AMP, .name = "cap-mix-amp" },</div><div class='add'>+	{ .id = CXT_FIXUP_TOSHIBA_P105, .name = "toshiba-p105" },</div><div class='add'>+	{ .id = CXT_FIXUP_HP_530, .name = "hp-530" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cxt5047_fixups[] = {</div><div class='add'>+	/* HP laptops have really bad sound over 0 dB on NID 0x10.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x103c, "HP", CXT_FIXUP_CAP_MIX_AMP_5047),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cxt5047_fixup_models[] = {</div><div class='add'>+	{ .id = CXT_FIXUP_CAP_MIX_AMP_5047, .name = "cap-mix-amp" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cxt5051_fixups[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x360b, "Compaq CQ60", CXT_PINCFG_COMPAQ_CQ60),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT_PINCFG_LENOVO_X200),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cxt5051_fixup_models[] = {</div><div class='add'>+	{ .id = CXT_PINCFG_LENOVO_X200, .name = "lenovo-x200" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk cxt5066_fixups[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT_FIXUP_ASPIRE_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x054f, "Acer Aspire 4830T", CXT_FIXUP_ASPIRE_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x807C, "HP EliteBook 820 G3", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8231, "HP ProBook 450 G4", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x828c, "HP EliteBook 840 G4", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x82b4, "HP ProDesk 600 G3", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8458, "HP Z2 G4 mini premium", CXT_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x14f1, 0x0252, "MBX-Z60MR100", CXT_FIXUP_HP_A_U),</div><div class='add'>+	SND_PCI_QUIRK(0x14f1, 0x0265, "SWS JS201D", CXT_PINCFG_SWS_JS201D),</div><div class='add'>+	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21d2, "Lenovo T420s", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT_PINCFG_LENOVO_TP410),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3905, "Lenovo G50-30", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	/* NOTE: we'd need to extend the quirk for 17aa:3977 as the same</div><div class='add'>+	 * PCI SSID is used on multiple Lenovo models</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad/Ideapad", CXT_FIXUP_LENOVO_XPAD_ACPI),</div><div class='add'>+	SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),</div><div class='add'>+	SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),</div><div class='add'>+	HDA_CODEC_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER),</div><div class='add'>+	HDA_CODEC_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup cxt5066_fixup_models[] = {</div><div class='add'>+	{ .id = CXT_FIXUP_STEREO_DMIC, .name = "stereo-dmic" },</div><div class='add'>+	{ .id = CXT_FIXUP_GPIO1, .name = "gpio1" },</div><div class='add'>+	{ .id = CXT_FIXUP_HEADPHONE_MIC_PIN, .name = "headphone-mic-pin" },</div><div class='add'>+	{ .id = CXT_PINCFG_LENOVO_TP410, .name = "tp410" },</div><div class='add'>+	{ .id = CXT_FIXUP_THINKPAD_ACPI, .name = "thinkpad" },</div><div class='add'>+	{ .id = CXT_FIXUP_LENOVO_XPAD_ACPI, .name = "thinkpad-ideapad" },</div><div class='add'>+	{ .id = CXT_PINCFG_LEMOTE_A1004, .name = "lemote-a1004" },</div><div class='add'>+	{ .id = CXT_PINCFG_LEMOTE_A1205, .name = "lemote-a1205" },</div><div class='add'>+	{ .id = CXT_FIXUP_OLPC_XO, .name = "olpc-xo" },</div><div class='add'>+	{ .id = CXT_FIXUP_MUTE_LED_EAPD, .name = "mute-led-eapd" },</div><div class='add'>+	{ .id = CXT_FIXUP_HP_DOCK, .name = "hp-dock" },</div><div class='add'>+	{ .id = CXT_FIXUP_MUTE_LED_GPIO, .name = "mute-led-gpio" },</div><div class='add'>+	{ .id = CXT_FIXUP_HP_ZBOOK_MUTE_LED, .name = "hp-zbook-mute-led" },</div><div class='add'>+	{ .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },</div><div class='add'>+	{ .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" },</div><div class='add'>+	{ .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" },</div><div class='add'>+	{ .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" },</div><div class='add'>+	{ .id = CXT_FIXUP_HP_A_U, .name = "HP-U-support" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* add "fake" mute amp-caps to DACs on cx5051 so that mixer mute switches</div><div class='add'>+ * can be created (bko#42825)</div><div class='add'>+ */</div><div class='add'>+static void add_cx5051_fake_mutes(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t out_nids[] = {</div><div class='add'>+		0x10, 0x11, 0</div><div class='add'>+	};</div><div class='add'>+	const hda_nid_t *p;</div><div class='add'>+</div><div class='add'>+	for (p = out_nids; *p; p++)</div><div class='add'>+		snd_hda_override_amp_caps(codec, *p, HDA_OUTPUT,</div><div class='add'>+					  AC_AMPCAP_MIN_MUTE |</div><div class='add'>+					  query_amp_caps(codec, *p, HDA_OUTPUT));</div><div class='add'>+	spec-&gt;gen.dac_min_mute = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cx_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct conexant_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec_info(codec, "%s: BIOS auto-probing.\n", codec-&gt;core.chip_name);</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+</div><div class='add'>+	/* init cx11880/sn6140 flag and reset headset_present_flag */</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x14f11f86:</div><div class='add'>+	case 0x14f11f87:</div><div class='add'>+		spec-&gt;is_cx11880_sn6140 = true;</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x19, cx_update_headset_mic_vref);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cx_auto_parse_eapd(codec);</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x14f15045:</div><div class='add'>+		codec-&gt;single_adc_amp = 1;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0x17;</div><div class='add'>+		spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;</div><div class='add'>+		snd_hda_pick_fixup(codec, cxt5045_fixup_models,</div><div class='add'>+				   cxt5045_fixups, cxt_fixups);</div><div class='add'>+		break;</div><div class='add'>+	case 0x14f15047:</div><div class='add'>+		codec-&gt;pin_amp_workaround = 1;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0x19;</div><div class='add'>+		spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;</div><div class='add'>+		snd_hda_pick_fixup(codec, cxt5047_fixup_models,</div><div class='add'>+				   cxt5047_fixups, cxt_fixups);</div><div class='add'>+		break;</div><div class='add'>+	case 0x14f15051:</div><div class='add'>+		add_cx5051_fake_mutes(codec);</div><div class='add'>+		codec-&gt;pin_amp_workaround = 1;</div><div class='add'>+		snd_hda_pick_fixup(codec, cxt5051_fixup_models,</div><div class='add'>+				   cxt5051_fixups, cxt_fixups);</div><div class='add'>+		break;</div><div class='add'>+	case 0x14f15098:</div><div class='add'>+		codec-&gt;pin_amp_workaround = 1;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0x22;</div><div class='add'>+		spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;</div><div class='add'>+		snd_hda_pick_fixup(codec, cxt5066_fixup_models,</div><div class='add'>+				   cxt5066_fixups, cxt_fixups);</div><div class='add'>+		break;</div><div class='add'>+	case 0x14f150f2:</div><div class='add'>+		codec-&gt;power_save_node = 1;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		codec-&gt;pin_amp_workaround = 1;</div><div class='add'>+		snd_hda_pick_fixup(codec, cxt5066_fixup_models,</div><div class='add'>+				   cxt5066_fixups, cxt_fixups);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.vmaster_mute.hook &amp;&amp; spec-&gt;dynamic_eapd)</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = cx_auto_vmaster_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL,</div><div class='add'>+				       spec-&gt;parse_flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = cx_auto_parse_beep(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Some laptops with Conexant chips show stalls in S3 resume,</div><div class='add'>+	 * which falls into the single-cmd mode.</div><div class='add'>+	 * Better to make reset, then.</div><div class='add'>+	 */</div><div class='add'>+	if (!codec-&gt;bus-&gt;core.sync_write) {</div><div class='add'>+		codec_info(codec,</div><div class='add'>+			   "Enable sync_write for stable communication\n");</div><div class='add'>+		codec-&gt;bus-&gt;core.sync_write = 1;</div><div class='add'>+		codec-&gt;bus-&gt;allow_bus_reset = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	cx_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops cx_codec_ops = {</div><div class='add'>+	.probe = cx_probe,</div><div class='add'>+	.remove = cx_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = cx_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = cx_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_conexant[] = {</div><div class='add'>+	HDA_CODEC_ID(0x14f11f86, "CX11880"),</div><div class='add'>+	HDA_CODEC_ID(0x14f11f87, "SN6140"),</div><div class='add'>+	HDA_CODEC_ID(0x14f12008, "CX8200"),</div><div class='add'>+	HDA_CODEC_ID(0x14f120d0, "CX11970"),</div><div class='add'>+	HDA_CODEC_ID(0x14f120d1, "SN6180"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15045, "CX20549 (Venice)"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15047, "CX20551 (Waikiki)"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15051, "CX20561 (Hermosa)"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15066, "CX20582 (Pebble)"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15067, "CX20583 (Pebble HSF)"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15068, "CX20584"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15069, "CX20585"),</div><div class='add'>+	HDA_CODEC_ID(0x14f1506c, "CX20588"),</div><div class='add'>+	HDA_CODEC_ID(0x14f1506e, "CX20590"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15097, "CX20631"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15098, "CX20632"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150a1, "CX20641"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150a2, "CX20642"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150ab, "CX20651"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150ac, "CX20652"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150b8, "CX20664"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150b9, "CX20665"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150f1, "CX21722"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150f2, "CX20722"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150f3, "CX21724"),</div><div class='add'>+	HDA_CODEC_ID(0x14f150f4, "CX20724"),</div><div class='add'>+	HDA_CODEC_ID(0x14f1510f, "CX20751/2"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15110, "CX20751/2"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15111, "CX20753/4"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15113, "CX20755"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15114, "CX20756"),</div><div class='add'>+	HDA_CODEC_ID(0x14f15115, "CX20757"),</div><div class='add'>+	HDA_CODEC_ID(0x14f151d7, "CX20952"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_conexant);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Conexant HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver conexant_driver = {</div><div class='add'>+	.id = snd_hda_id_conexant,</div><div class='add'>+	.ops = &amp;cx_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(conexant_driver);</div><div class='head'>diff --git a/sound/hda/codecs/generic.c b/sound/hda/codecs/generic.c<br/>new file mode 100644<br/>index 000000000000..7bcf9aef8275<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/generic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/generic.c</a></div><div class='hunk'>@@ -0,0 +1,6145 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal Interface for Intel High Definition Audio Codec</div><div class='add'>+ *</div><div class='add'>+ * Generic widget tree parser</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_spec_init - initialize hda_gen_spec struct</div><div class='add'>+ * @spec: hda_gen_spec object to initialize</div><div class='add'>+ *</div><div class='add'>+ * Initialize the given hda_gen_spec object.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_spec_init(struct hda_gen_spec *spec)</div><div class='add'>+{</div><div class='add'>+	snd_array_init(&amp;spec-&gt;kctls, sizeof(struct snd_kcontrol_new), 32);</div><div class='add'>+	snd_array_init(&amp;spec-&gt;paths, sizeof(struct nid_path), 8);</div><div class='add'>+	snd_array_init(&amp;spec-&gt;loopback_list, sizeof(struct hda_amp_list), 8);</div><div class='add'>+	mutex_init(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_spec_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_add_kctl - Add a new kctl_new struct from the template</div><div class='add'>+ * @spec: hda_gen_spec object</div><div class='add'>+ * @name: name string to override the template, NULL if unchanged</div><div class='add'>+ * @temp: template for the new kctl</div><div class='add'>+ *</div><div class='add'>+ * Add a new kctl (actually snd_kcontrol_new to be instantiated later)</div><div class='add'>+ * element based on the given snd_kcontrol_new template @temp and the</div><div class='add'>+ * name string @name to the list in @spec.</div><div class='add'>+ * Returns the newly created object or NULL as error.</div><div class='add'>+ */</div><div class='add'>+struct snd_kcontrol_new *</div><div class='add'>+snd_hda_gen_add_kctl(struct hda_gen_spec *spec, const char *name,</div><div class='add'>+		     const struct snd_kcontrol_new *temp)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='add'>+	if (!knew)</div><div class='add'>+		return NULL;</div><div class='add'>+	*knew = *temp;</div><div class='add'>+	if (name)</div><div class='add'>+		knew-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='add'>+	else if (knew-&gt;name)</div><div class='add'>+		knew-&gt;name = kstrdup(knew-&gt;name, GFP_KERNEL);</div><div class='add'>+	if (!knew-&gt;name)</div><div class='add'>+		return NULL;</div><div class='add'>+	return knew;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_add_kctl);</div><div class='add'>+</div><div class='add'>+static void free_kctls(struct hda_gen_spec *spec)</div><div class='add'>+{</div><div class='add'>+	if (spec-&gt;kctls.list) {</div><div class='add'>+		struct snd_kcontrol_new *kctl = spec-&gt;kctls.list;</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; spec-&gt;kctls.used; i++)</div><div class='add'>+			kfree(kctl[i].name);</div><div class='add'>+	}</div><div class='add'>+	snd_array_free(&amp;spec-&gt;kctls);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_hda_gen_spec_free(struct hda_gen_spec *spec)</div><div class='add'>+{</div><div class='add'>+	if (!spec)</div><div class='add'>+		return;</div><div class='add'>+	free_kctls(spec);</div><div class='add'>+	snd_array_free(&amp;spec-&gt;paths);</div><div class='add'>+	snd_array_free(&amp;spec-&gt;loopback_list);</div><div class='add'>+#ifdef CONFIG_SND_HDA_GENERIC_LEDS</div><div class='add'>+	if (spec-&gt;led_cdevs[LED_AUDIO_MUTE])</div><div class='add'>+		led_classdev_unregister(spec-&gt;led_cdevs[LED_AUDIO_MUTE]);</div><div class='add'>+	if (spec-&gt;led_cdevs[LED_AUDIO_MICMUTE])</div><div class='add'>+		led_classdev_unregister(spec-&gt;led_cdevs[LED_AUDIO_MICMUTE]);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * store user hints</div><div class='add'>+ */</div><div class='add'>+static void parse_user_hints(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "jack_detect");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;no_jack_detect = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "inv_jack_detect");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;inv_jack_detect = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "trigger_sense");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;no_trigger_sense = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "inv_eapd");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;inv_eapd = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "pcm_format_first");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;pcm_format_first = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "sticky_stream");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;no_sticky_stream = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "spdif_status_reset");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;spdif_status_reset = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "pin_amp_workaround");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;pin_amp_workaround = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "single_adc_amp");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;single_adc_amp = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "power_save_node");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		codec-&gt;power_save_node = !!val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "auto_mute");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;suppress_auto_mute = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "auto_mic");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;suppress_auto_mic = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "line_in_auto_switch");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;line_in_auto_switch = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "auto_mute_via_amp");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;auto_mute_via_amp = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "need_dac_fix");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;need_dac_fix = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "primary_hp");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;no_primary_hp = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "multi_io");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;no_multi_io = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "multi_cap_vol");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;multi_cap_vol = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "inv_dmic_split");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;inv_dmic_split = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "indep_hp");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;indep_hp = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "add_stereo_mix_input");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;add_stereo_mix_input = !!val;</div><div class='add'>+	/* the following two are just for compatibility */</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "add_out_jack_modes");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;add_jack_modes = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "add_in_jack_modes");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;add_jack_modes = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "add_jack_modes");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;add_jack_modes = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "power_down_unused");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;power_down_unused = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "add_hp_mic");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;hp_mic = !!val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "hp_mic_detect");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;suppress_hp_mic_detect = !val;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "vmaster");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;suppress_vmaster = !val;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_get_int_hint(codec, "mixer_nid", &amp;val))</div><div class='add'>+		spec-&gt;mixer_nid = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pin control value accesses</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define update_pin_ctl(codec, pin, val) \</div><div class='add'>+	snd_hda_codec_write_cache(codec, pin, 0, \</div><div class='add'>+				   AC_VERB_SET_PIN_WIDGET_CONTROL, val)</div><div class='add'>+</div><div class='add'>+/* restore the pinctl based on the cached value */</div><div class='add'>+static inline void restore_pin_ctl(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	update_pin_ctl(codec, pin, snd_hda_codec_get_pin_target(codec, pin));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set the pinctl target value and write it if requested */</div><div class='add'>+static void set_pin_target(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			   unsigned int val, bool do_write)</div><div class='add'>+{</div><div class='add'>+	if (!pin)</div><div class='add'>+		return;</div><div class='add'>+	val = snd_hda_correct_pin_ctl(codec, pin, val);</div><div class='add'>+	snd_hda_codec_set_pin_target(codec, pin, val);</div><div class='add'>+	if (do_write)</div><div class='add'>+		update_pin_ctl(codec, pin, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set pinctl target values for all given pins */</div><div class='add'>+static void set_pin_targets(struct hda_codec *codec, int num_pins,</div><div class='add'>+			    hda_nid_t *pins, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++)</div><div class='add'>+		set_pin_target(codec, pins[i], val, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * parsing paths</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* return the position of NID in the list, or -1 if not found */</div><div class='add'>+static int find_idx_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; nums; i++)</div><div class='add'>+		if (list[i] == nid)</div><div class='add'>+			return i;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return true if the given NID is contained in the path */</div><div class='add'>+static bool is_nid_contained(struct nid_path *path, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return find_idx_in_nid_list(nid, path-&gt;path, path-&gt;depth) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct nid_path *get_nid_path(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t from_nid, hda_nid_t to_nid,</div><div class='add'>+				     int anchor_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;paths, i, path) {</div><div class='add'>+		if (path-&gt;depth &lt;= 0)</div><div class='add'>+			continue;</div><div class='add'>+		if ((!from_nid || path-&gt;path[0] == from_nid) &amp;&amp;</div><div class='add'>+		    (!to_nid || path-&gt;path[path-&gt;depth - 1] == to_nid)) {</div><div class='add'>+			if (!anchor_nid ||</div><div class='add'>+			    (anchor_nid &gt; 0 &amp;&amp; is_nid_contained(path, anchor_nid)) ||</div><div class='add'>+			    (anchor_nid &lt; 0 &amp;&amp; !is_nid_contained(path, anchor_nid)))</div><div class='add'>+				return path;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_path_idx - get the index number corresponding to the path</div><div class='add'>+ * instance</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @path: nid_path object</div><div class='add'>+ *</div><div class='add'>+ * The returned index starts from 1, i.e. the actual array index with offset 1,</div><div class='add'>+ * and zero is handled as an invalid path</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_path_idx(struct hda_codec *codec, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *array = spec-&gt;paths.list;</div><div class='add'>+	ssize_t idx;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;paths.used)</div><div class='add'>+		return 0;</div><div class='add'>+	idx = path - array;</div><div class='add'>+	if (idx &lt; 0 || idx &gt;= spec-&gt;paths.used)</div><div class='add'>+		return 0;</div><div class='add'>+	return idx + 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_path_idx);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_path_from_idx - get the path instance corresponding to the</div><div class='add'>+ * given index number</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @idx: the path index</div><div class='add'>+ */</div><div class='add'>+struct nid_path *snd_hda_get_path_from_idx(struct hda_codec *codec, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (idx &lt;= 0 || idx &gt; spec-&gt;paths.used)</div><div class='add'>+		return NULL;</div><div class='add'>+	return snd_array_elem(&amp;spec-&gt;paths, idx - 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_path_from_idx);</div><div class='add'>+</div><div class='add'>+/* check whether the given DAC is already found in any existing paths */</div><div class='add'>+static bool is_dac_already_used(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;paths, i, path) {</div><div class='add'>+		if (path-&gt;path[0] == nid)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the given two widgets can be connected */</div><div class='add'>+static bool is_reachable_path(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t from_nid, hda_nid_t to_nid)</div><div class='add'>+{</div><div class='add'>+	if (!from_nid || !to_nid)</div><div class='add'>+		return false;</div><div class='add'>+	return snd_hda_get_conn_index(codec, to_nid, from_nid, true) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* nid, dir and idx */</div><div class='add'>+#define AMP_VAL_COMPARE_MASK	(0xffff | (1U &lt;&lt; 18) | (0x0f &lt;&lt; 19))</div><div class='add'>+</div><div class='add'>+/* check whether the given ctl is already assigned in any path elements */</div><div class='add'>+static bool is_ctl_used(struct hda_codec *codec, unsigned int val, int type)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val &amp;= AMP_VAL_COMPARE_MASK;</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;paths, i, path) {</div><div class='add'>+		if ((path-&gt;ctls[type] &amp; AMP_VAL_COMPARE_MASK) == val)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether a control with the given (nid, dir, idx) was assigned */</div><div class='add'>+static bool is_ctl_associated(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			      int dir, int idx, int type)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir);</div><div class='add'>+	return is_ctl_used(codec, val, type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_nid_path(struct hda_codec *codec,</div><div class='add'>+			   const char *pfx, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	char buf[40];</div><div class='add'>+	char *pos = buf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*pos = 0;</div><div class='add'>+	for (i = 0; i &lt; path-&gt;depth; i++)</div><div class='add'>+		pos += scnprintf(pos, sizeof(buf) - (pos - buf), "%s%02x",</div><div class='add'>+				 pos != buf ? ":" : "",</div><div class='add'>+				 path-&gt;path[i]);</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s path: depth=%d '%s'\n", pfx, path-&gt;depth, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called recursively */</div><div class='add'>+static bool __parse_nid_path(struct hda_codec *codec,</div><div class='add'>+			     hda_nid_t from_nid, hda_nid_t to_nid,</div><div class='add'>+			     int anchor_nid, struct nid_path *path,</div><div class='add'>+			     int depth)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *conn;</div><div class='add'>+	int i, nums;</div><div class='add'>+</div><div class='add'>+	if (to_nid == anchor_nid)</div><div class='add'>+		anchor_nid = 0; /* anchor passed */</div><div class='add'>+	else if (to_nid == (hda_nid_t)(-anchor_nid))</div><div class='add'>+		return false; /* hit the exclusive nid */</div><div class='add'>+</div><div class='add'>+	nums = snd_hda_get_conn_list(codec, to_nid, &amp;conn);</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		if (conn[i] != from_nid) {</div><div class='add'>+			/* special case: when from_nid is 0,</div><div class='add'>+			 * try to find an empty DAC</div><div class='add'>+			 */</div><div class='add'>+			if (from_nid ||</div><div class='add'>+			    get_wcaps_type(get_wcaps(codec, conn[i])) != AC_WID_AUD_OUT ||</div><div class='add'>+			    is_dac_already_used(codec, conn[i]))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		/* anchor is not requested or already passed? */</div><div class='add'>+		if (anchor_nid &lt;= 0)</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	if (depth &gt;= MAX_NID_PATH_DEPTH)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		unsigned int type;</div><div class='add'>+		type = get_wcaps_type(get_wcaps(codec, conn[i]));</div><div class='add'>+		if (type == AC_WID_AUD_OUT || type == AC_WID_AUD_IN ||</div><div class='add'>+		    type == AC_WID_PIN)</div><div class='add'>+			continue;</div><div class='add'>+		if (__parse_nid_path(codec, from_nid, conn[i],</div><div class='add'>+				     anchor_nid, path, depth + 1))</div><div class='add'>+			goto found;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+ found:</div><div class='add'>+	path-&gt;path[path-&gt;depth] = conn[i];</div><div class='add'>+	path-&gt;idx[path-&gt;depth + 1] = i;</div><div class='add'>+	if (nums &gt; 1 &amp;&amp; get_wcaps_type(get_wcaps(codec, to_nid)) != AC_WID_AUD_MIX)</div><div class='add'>+		path-&gt;multi[path-&gt;depth + 1] = 1;</div><div class='add'>+	path-&gt;depth++;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * snd_hda_parse_nid_path - parse the widget path from the given nid to</div><div class='add'>+ * the target nid</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @from_nid: the NID where the path start from</div><div class='add'>+ * @to_nid: the NID where the path ends at</div><div class='add'>+ * @anchor_nid: the anchor indication</div><div class='add'>+ * @path: the path object to store the result</div><div class='add'>+ *</div><div class='add'>+ * Returns true if a matching path is found.</div><div class='add'>+ *</div><div class='add'>+ * The parsing behavior depends on parameters:</div><div class='add'>+ * when @from_nid is 0, try to find an empty DAC;</div><div class='add'>+ * when @anchor_nid is set to a positive value, only paths through the widget</div><div class='add'>+ * with the given value are evaluated.</div><div class='add'>+ * when @anchor_nid is set to a negative value, paths through the widget</div><div class='add'>+ * with the negative of given value are excluded, only other paths are chosen.</div><div class='add'>+ * when @anchor_nid is zero, no special handling about path selection.</div><div class='add'>+ */</div><div class='add'>+static bool snd_hda_parse_nid_path(struct hda_codec *codec, hda_nid_t from_nid,</div><div class='add'>+			    hda_nid_t to_nid, int anchor_nid,</div><div class='add'>+			    struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	if (__parse_nid_path(codec, from_nid, to_nid, anchor_nid, path, 1)) {</div><div class='add'>+		path-&gt;path[path-&gt;depth] = to_nid;</div><div class='add'>+		path-&gt;depth++;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_add_new_path - parse the path between the given NIDs and</div><div class='add'>+ * add to the path list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @from_nid: the NID where the path start from</div><div class='add'>+ * @to_nid: the NID where the path ends at</div><div class='add'>+ * @anchor_nid: the anchor indication, see snd_hda_parse_nid_path()</div><div class='add'>+ *</div><div class='add'>+ * If no valid path is found, returns NULL.</div><div class='add'>+ */</div><div class='add'>+struct nid_path *</div><div class='add'>+snd_hda_add_new_path(struct hda_codec *codec, hda_nid_t from_nid,</div><div class='add'>+		     hda_nid_t to_nid, int anchor_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	if (from_nid &amp;&amp; to_nid &amp;&amp; !is_reachable_path(codec, from_nid, to_nid))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* check whether the path has been already added */</div><div class='add'>+	path = get_nid_path(codec, from_nid, to_nid, anchor_nid);</div><div class='add'>+	if (path)</div><div class='add'>+		return path;</div><div class='add'>+</div><div class='add'>+	path = snd_array_new(&amp;spec-&gt;paths);</div><div class='add'>+	if (!path)</div><div class='add'>+		return NULL;</div><div class='add'>+	memset(path, 0, sizeof(*path));</div><div class='add'>+	if (snd_hda_parse_nid_path(codec, from_nid, to_nid, anchor_nid, path))</div><div class='add'>+		return path;</div><div class='add'>+	/* push back */</div><div class='add'>+	spec-&gt;paths.used--;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_add_new_path);</div><div class='add'>+</div><div class='add'>+/* clear the given path as invalid so that it won't be picked up later */</div><div class='add'>+static void invalidate_nid_path(struct hda_codec *codec, int idx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path = snd_hda_get_path_from_idx(codec, idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return;</div><div class='add'>+	memset(path, 0, sizeof(*path));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return a DAC if paired to the given pin by codec driver */</div><div class='add'>+static hda_nid_t get_preferred_dac(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const hda_nid_t *list = spec-&gt;preferred_dacs;</div><div class='add'>+</div><div class='add'>+	if (!list)</div><div class='add'>+		return 0;</div><div class='add'>+	for (; *list; list += 2)</div><div class='add'>+		if (*list == pin)</div><div class='add'>+			return list[1];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look for an empty DAC slot */</div><div class='add'>+static hda_nid_t look_for_dac(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			      bool is_digital)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool cap_digital;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_all_dacs; i++) {</div><div class='add'>+		hda_nid_t nid = spec-&gt;all_dacs[i];</div><div class='add'>+		if (!nid || is_dac_already_used(codec, nid))</div><div class='add'>+			continue;</div><div class='add'>+		cap_digital = !!(get_wcaps(codec, nid) &amp; AC_WCAP_DIGITAL);</div><div class='add'>+		if (is_digital != cap_digital)</div><div class='add'>+			continue;</div><div class='add'>+		if (is_reachable_path(codec, nid, pin))</div><div class='add'>+			return nid;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* replace the channels in the composed amp value with the given number */</div><div class='add'>+static unsigned int amp_val_replace_channels(unsigned int val, unsigned int chs)</div><div class='add'>+{</div><div class='add'>+	val &amp;= ~(0x3U &lt;&lt; 16);</div><div class='add'>+	val |= chs &lt;&lt; 16;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool same_amp_caps(struct hda_codec *codec, hda_nid_t nid1,</div><div class='add'>+			  hda_nid_t nid2, int dir)</div><div class='add'>+{</div><div class='add'>+	if (!(get_wcaps(codec, nid1) &amp; (1 &lt;&lt; (dir + 1))))</div><div class='add'>+		return !(get_wcaps(codec, nid2) &amp; (1 &lt;&lt; (dir + 1)));</div><div class='add'>+	return (query_amp_caps(codec, nid1, dir) ==</div><div class='add'>+		query_amp_caps(codec, nid2, dir));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look for a widget suitable for assigning a mute switch in the path */</div><div class='add'>+static hda_nid_t look_for_out_mute_nid(struct hda_codec *codec,</div><div class='add'>+				       struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = path-&gt;depth - 1; i &gt;= 0; i--) {</div><div class='add'>+		if (nid_has_mute(codec, path-&gt;path[i], HDA_OUTPUT))</div><div class='add'>+			return path-&gt;path[i];</div><div class='add'>+		if (i != path-&gt;depth - 1 &amp;&amp; i != 0 &amp;&amp;</div><div class='add'>+		    nid_has_mute(codec, path-&gt;path[i], HDA_INPUT))</div><div class='add'>+			return path-&gt;path[i];</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look for a widget suitable for assigning a volume ctl in the path */</div><div class='add'>+static hda_nid_t look_for_out_vol_nid(struct hda_codec *codec,</div><div class='add'>+				      struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = path-&gt;depth - 1; i &gt;= 0; i--) {</div><div class='add'>+		hda_nid_t nid = path-&gt;path[i];</div><div class='add'>+		if ((spec-&gt;out_vol_mask &gt;&gt; nid) &amp; 1)</div><div class='add'>+			continue;</div><div class='add'>+		if (nid_has_volume(codec, nid, HDA_OUTPUT))</div><div class='add'>+			return nid;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * path activation / deactivation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* can have the amp-in capability? */</div><div class='add'>+static bool has_amp_in(struct hda_codec *codec, struct nid_path *path, int idx)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid = path-&gt;path[idx];</div><div class='add'>+	unsigned int caps = get_wcaps(codec, nid);</div><div class='add'>+	unsigned int type = get_wcaps_type(caps);</div><div class='add'>+</div><div class='add'>+	if (!(caps &amp; AC_WCAP_IN_AMP))</div><div class='add'>+		return false;</div><div class='add'>+	if (type == AC_WID_PIN &amp;&amp; idx &gt; 0) /* only for input pins */</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* can have the amp-out capability? */</div><div class='add'>+static bool has_amp_out(struct hda_codec *codec, struct nid_path *path, int idx)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid = path-&gt;path[idx];</div><div class='add'>+	unsigned int caps = get_wcaps(codec, nid);</div><div class='add'>+	unsigned int type = get_wcaps_type(caps);</div><div class='add'>+</div><div class='add'>+	if (!(caps &amp; AC_WCAP_OUT_AMP))</div><div class='add'>+		return false;</div><div class='add'>+	if (type == AC_WID_PIN &amp;&amp; !idx) /* only for output pins */</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the given (nid,dir,idx) is active */</div><div class='add'>+static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  unsigned int dir, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='add'>+	const struct nid_path *path;</div><div class='add'>+	int i, n;</div><div class='add'>+</div><div class='add'>+	if (nid == codec-&gt;core.afg)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;paths, n, path) {</div><div class='add'>+		if (!path-&gt;active)</div><div class='add'>+			continue;</div><div class='add'>+		if (codec-&gt;power_save_node) {</div><div class='add'>+			if (!path-&gt;stream_enabled)</div><div class='add'>+				continue;</div><div class='add'>+			/* ignore unplugged paths except for DAC/ADC */</div><div class='add'>+			if (!(path-&gt;pin_enabled || path-&gt;pin_fixed) &amp;&amp;</div><div class='add'>+			    type != AC_WID_AUD_OUT &amp;&amp; type != AC_WID_AUD_IN)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; path-&gt;depth; i++) {</div><div class='add'>+			if (path-&gt;path[i] == nid) {</div><div class='add'>+				if (dir == HDA_OUTPUT || idx == -1 ||</div><div class='add'>+				    path-&gt;idx[i] == idx)</div><div class='add'>+					return true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the NID is referred by any active paths */</div><div class='add'>+#define is_active_nid_for_any(codec, nid) \</div><div class='add'>+	is_active_nid(codec, nid, HDA_OUTPUT, -1)</div><div class='add'>+</div><div class='add'>+/* get the default amp value for the target state */</div><div class='add'>+static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				   int dir, unsigned int caps, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+</div><div class='add'>+	if (caps &amp; AC_AMPCAP_NUM_STEPS) {</div><div class='add'>+		/* set to 0dB */</div><div class='add'>+		if (enable)</div><div class='add'>+			val = (caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT;</div><div class='add'>+	}</div><div class='add'>+	if (caps &amp; (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)) {</div><div class='add'>+		if (!enable)</div><div class='add'>+			val |= HDA_AMP_MUTE;</div><div class='add'>+	}</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* is this a stereo widget or a stereo-to-mono mix? */</div><div class='add'>+static bool is_stereo_amps(struct hda_codec *codec, hda_nid_t nid, int dir)</div><div class='add'>+{</div><div class='add'>+	unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+	hda_nid_t conn;</div><div class='add'>+</div><div class='add'>+	if (wcaps &amp; AC_WCAP_STEREO)</div><div class='add'>+		return true;</div><div class='add'>+	if (dir != HDA_INPUT || get_wcaps_type(wcaps) != AC_WID_AUD_MIX)</div><div class='add'>+		return false;</div><div class='add'>+	if (snd_hda_get_num_conns(codec, nid) != 1)</div><div class='add'>+		return false;</div><div class='add'>+	if (snd_hda_get_connections(codec, nid, &amp;conn, 1) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	return !!(get_wcaps(codec, conn) &amp; AC_WCAP_STEREO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize the amp value (only at the first time) */</div><div class='add'>+static void init_amp(struct hda_codec *codec, hda_nid_t nid, int dir, int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int caps = query_amp_caps(codec, nid, dir);</div><div class='add'>+	int val = get_amp_val_to_activate(codec, nid, dir, caps, false);</div><div class='add'>+</div><div class='add'>+	if (is_stereo_amps(codec, nid, dir))</div><div class='add'>+		snd_hda_codec_amp_init_stereo(codec, nid, dir, idx, 0xff, val);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_codec_amp_init(codec, nid, 0, dir, idx, 0xff, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update the amp, doing in stereo or mono depending on NID */</div><div class='add'>+static int update_amp(struct hda_codec *codec, hda_nid_t nid, int dir, int idx,</div><div class='add'>+		      unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	if (is_stereo_amps(codec, nid, dir))</div><div class='add'>+		return snd_hda_codec_amp_stereo(codec, nid, dir, idx,</div><div class='add'>+						mask, val);</div><div class='add'>+	else</div><div class='add'>+		return snd_hda_codec_amp_update(codec, nid, 0, dir, idx,</div><div class='add'>+						mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* calculate amp value mask we can modify;</div><div class='add'>+ * if the given amp is controlled by mixers, don't touch it</div><div class='add'>+ */</div><div class='add'>+static unsigned int get_amp_mask_to_modify(struct hda_codec *codec,</div><div class='add'>+					   hda_nid_t nid, int dir, int idx,</div><div class='add'>+					   unsigned int caps)</div><div class='add'>+{</div><div class='add'>+	unsigned int mask = 0xff;</div><div class='add'>+</div><div class='add'>+	if (caps &amp; (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)) {</div><div class='add'>+		if (is_ctl_associated(codec, nid, dir, idx, NID_PATH_MUTE_CTL))</div><div class='add'>+			mask &amp;= ~0x80;</div><div class='add'>+	}</div><div class='add'>+	if (caps &amp; AC_AMPCAP_NUM_STEPS) {</div><div class='add'>+		if (is_ctl_associated(codec, nid, dir, idx, NID_PATH_VOL_CTL) ||</div><div class='add'>+		    is_ctl_associated(codec, nid, dir, idx, NID_PATH_BOOST_CTL))</div><div class='add'>+			mask &amp;= ~0x7f;</div><div class='add'>+	}</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='add'>+			 int idx, int idx_to_check, bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int caps;</div><div class='add'>+	unsigned int mask, val;</div><div class='add'>+</div><div class='add'>+	caps = query_amp_caps(codec, nid, dir);</div><div class='add'>+	val = get_amp_val_to_activate(codec, nid, dir, caps, enable);</div><div class='add'>+	mask = get_amp_mask_to_modify(codec, nid, dir, idx_to_check, caps);</div><div class='add'>+	if (!mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val &amp;= mask;</div><div class='add'>+	update_amp(codec, nid, dir, idx, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_and_activate_amp(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				   int dir, int idx, int idx_to_check,</div><div class='add'>+				   bool enable)</div><div class='add'>+{</div><div class='add'>+	/* check whether the given amp is still used by others */</div><div class='add'>+	if (!enable &amp;&amp; is_active_nid(codec, nid, dir, idx_to_check))</div><div class='add'>+		return;</div><div class='add'>+	activate_amp(codec, nid, dir, idx, idx_to_check, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void activate_amp_out(struct hda_codec *codec, struct nid_path *path,</div><div class='add'>+			     int i, bool enable)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid = path-&gt;path[i];</div><div class='add'>+	init_amp(codec, nid, HDA_OUTPUT, 0);</div><div class='add'>+	check_and_activate_amp(codec, nid, HDA_OUTPUT, 0, 0, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void activate_amp_in(struct hda_codec *codec, struct nid_path *path,</div><div class='add'>+			    int i, bool enable, bool add_aamix)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const hda_nid_t *conn;</div><div class='add'>+	int n, nums, idx;</div><div class='add'>+	int type;</div><div class='add'>+	hda_nid_t nid = path-&gt;path[i];</div><div class='add'>+</div><div class='add'>+	nums = snd_hda_get_conn_list(codec, nid, &amp;conn);</div><div class='add'>+	if (nums &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='add'>+	if (type == AC_WID_PIN ||</div><div class='add'>+	    (type == AC_WID_AUD_IN &amp;&amp; codec-&gt;single_adc_amp)) {</div><div class='add'>+		nums = 1;</div><div class='add'>+		idx = 0;</div><div class='add'>+	} else</div><div class='add'>+		idx = path-&gt;idx[i];</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; nums; n++)</div><div class='add'>+		init_amp(codec, nid, HDA_INPUT, n);</div><div class='add'>+</div><div class='add'>+	/* here is a little bit tricky in comparison with activate_amp_out();</div><div class='add'>+	 * when aa-mixer is available, we need to enable the path as well</div><div class='add'>+	 */</div><div class='add'>+	for (n = 0; n &lt; nums; n++) {</div><div class='add'>+		if (n != idx) {</div><div class='add'>+			if (conn[n] != spec-&gt;mixer_merge_nid)</div><div class='add'>+				continue;</div><div class='add'>+			/* when aamix is disabled, force to off */</div><div class='add'>+			if (!add_aamix) {</div><div class='add'>+				activate_amp(codec, nid, HDA_INPUT, n, n, false);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		check_and_activate_amp(codec, nid, HDA_INPUT, n, idx, enable);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sync power of each widget in the given path */</div><div class='add'>+static hda_nid_t path_power_update(struct hda_codec *codec,</div><div class='add'>+				   struct nid_path *path,</div><div class='add'>+				   bool allow_powerdown)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid, changed = 0;</div><div class='add'>+	int i, state, power;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; path-&gt;depth; i++) {</div><div class='add'>+		nid = path-&gt;path[i];</div><div class='add'>+		if (!(get_wcaps(codec, nid) &amp; AC_WCAP_POWER))</div><div class='add'>+			continue;</div><div class='add'>+		if (nid == codec-&gt;core.afg)</div><div class='add'>+			continue;</div><div class='add'>+		if (!allow_powerdown || is_active_nid_for_any(codec, nid))</div><div class='add'>+			state = AC_PWRST_D0;</div><div class='add'>+		else</div><div class='add'>+			state = AC_PWRST_D3;</div><div class='add'>+		power = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					   AC_VERB_GET_POWER_STATE, 0);</div><div class='add'>+		if (power != (state | (state &lt;&lt; 4))) {</div><div class='add'>+			snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_POWER_STATE, state);</div><div class='add'>+			changed = nid;</div><div class='add'>+			/* all known codecs seem to be capable to handl</div><div class='add'>+			 * widgets state even in D3, so far.</div><div class='add'>+			 * if any new codecs need to restore the widget</div><div class='add'>+			 * states after D0 transition, call the function</div><div class='add'>+			 * below.</div><div class='add'>+			 */</div><div class='add'>+#if 0 /* disabled */</div><div class='add'>+			if (state == AC_PWRST_D0)</div><div class='add'>+				snd_hdac_regmap_sync_node(&amp;codec-&gt;core, nid);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* do sync with the last power state change */</div><div class='add'>+static void sync_power_state_change(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (nid) {</div><div class='add'>+		msleep(10);</div><div class='add'>+		snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_POWER_STATE, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_activate_path - activate or deactivate the given path</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @path: the path to activate/deactivate</div><div class='add'>+ * @enable: flag to activate or not</div><div class='add'>+ * @add_aamix: enable the input from aamix NID</div><div class='add'>+ *</div><div class='add'>+ * If @add_aamix is set, enable the input from aa-mix NID as well (if any).</div><div class='add'>+ */</div><div class='add'>+void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path,</div><div class='add'>+			   bool enable, bool add_aamix)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	path-&gt;active = enable;</div><div class='add'>+</div><div class='add'>+	/* make sure the widget is powered up */</div><div class='add'>+	if (enable &amp;&amp; (spec-&gt;power_down_unused || codec-&gt;power_save_node))</div><div class='add'>+		path_power_update(codec, path, codec-&gt;power_save_node);</div><div class='add'>+</div><div class='add'>+	for (i = path-&gt;depth - 1; i &gt;= 0; i--) {</div><div class='add'>+		hda_nid_t nid = path-&gt;path[i];</div><div class='add'>+</div><div class='add'>+		if (enable &amp;&amp; path-&gt;multi[i])</div><div class='add'>+			snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+					    path-&gt;idx[i]);</div><div class='add'>+		if (has_amp_in(codec, path, i))</div><div class='add'>+			activate_amp_in(codec, path, i, enable, add_aamix);</div><div class='add'>+		if (has_amp_out(codec, path, i))</div><div class='add'>+			activate_amp_out(codec, path, i, enable);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_activate_path);</div><div class='add'>+</div><div class='add'>+/* if the given path is inactive, put widgets into D3 (only if suitable) */</div><div class='add'>+static void path_power_down_sync(struct hda_codec *codec, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!(spec-&gt;power_down_unused || codec-&gt;power_save_node) || path-&gt;active)</div><div class='add'>+		return;</div><div class='add'>+	sync_power_state_change(codec, path_power_update(codec, path, true));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD on the given pin */</div><div class='add'>+static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;own_eapd_ctl ||</div><div class='add'>+	    !(snd_hda_query_pin_caps(codec, pin) &amp; AC_PINCAP_EAPD))</div><div class='add'>+		return;</div><div class='add'>+	if (spec-&gt;keep_eapd_on &amp;&amp; !enable)</div><div class='add'>+		return;</div><div class='add'>+	if (codec-&gt;inv_eapd)</div><div class='add'>+		enable = !enable;</div><div class='add'>+	snd_hda_codec_write_cache(codec, pin, 0,</div><div class='add'>+				   AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+				   enable ? 0x02 : 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* re-initialize the path specified by the given path index */</div><div class='add'>+static void resume_path_from_idx(struct hda_codec *codec, int path_idx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path = snd_hda_get_path_from_idx(codec, path_idx);</div><div class='add'>+	if (path)</div><div class='add'>+		snd_hda_activate_path(codec, path, path-&gt;active, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper functions for creating mixer ctl elements</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int hda_gen_mixer_mute_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+static int hda_gen_bind_mute_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+static int hda_gen_bind_mute_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	HDA_CTL_WIDGET_VOL,</div><div class='add'>+	HDA_CTL_WIDGET_MUTE,</div><div class='add'>+	HDA_CTL_BIND_MUTE,</div><div class='add'>+};</div><div class='add'>+static const struct snd_kcontrol_new control_templates[] = {</div><div class='add'>+	HDA_CODEC_VOLUME(NULL, 0, 0, 0),</div><div class='add'>+	/* only the put callback is replaced for handling the special mute */</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='add'>+		.info = snd_hda_mixer_amp_switch_info,</div><div class='add'>+		.get = snd_hda_mixer_amp_switch_get,</div><div class='add'>+		.put = hda_gen_mixer_mute_put, /* replaced */</div><div class='add'>+		.private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.info = snd_hda_mixer_amp_switch_info,</div><div class='add'>+		.get = hda_gen_bind_mute_get,</div><div class='add'>+		.put = hda_gen_bind_mute_put, /* replaced */</div><div class='add'>+		.private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* add dynamic controls from template */</div><div class='add'>+static struct snd_kcontrol_new *</div><div class='add'>+add_control(struct hda_gen_spec *spec, int type, const char *name,</div><div class='add'>+		       int cidx, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+</div><div class='add'>+	knew = snd_hda_gen_add_kctl(spec, name, &amp;control_templates[type]);</div><div class='add'>+	if (!knew)</div><div class='add'>+		return NULL;</div><div class='add'>+	knew-&gt;index = cidx;</div><div class='add'>+	if (get_amp_nid_(val))</div><div class='add'>+		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='add'>+	if (knew-&gt;access == 0)</div><div class='add'>+		knew-&gt;access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+	knew-&gt;private_value = val;</div><div class='add'>+	return knew;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_control_with_pfx(struct hda_gen_spec *spec, int type,</div><div class='add'>+				const char *pfx, const char *dir,</div><div class='add'>+				const char *sfx, int cidx, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);</div><div class='add'>+	if (snd_BUG_ON(len &gt;= sizeof(name)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!add_control(spec, type, name, cidx, val))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define add_pb_vol_ctrl(spec, type, pfx, val)			\</div><div class='add'>+	add_control_with_pfx(spec, type, pfx, "Playback", "Volume", 0, val)</div><div class='add'>+#define add_pb_sw_ctrl(spec, type, pfx, val)			\</div><div class='add'>+	add_control_with_pfx(spec, type, pfx, "Playback", "Switch", 0, val)</div><div class='add'>+#define __add_pb_vol_ctrl(spec, type, pfx, cidx, val)			\</div><div class='add'>+	add_control_with_pfx(spec, type, pfx, "Playback", "Volume", cidx, val)</div><div class='add'>+#define __add_pb_sw_ctrl(spec, type, pfx, cidx, val)			\</div><div class='add'>+	add_control_with_pfx(spec, type, pfx, "Playback", "Switch", cidx, val)</div><div class='add'>+</div><div class='add'>+static int add_vol_ctl(struct hda_codec *codec, const char *pfx, int cidx,</div><div class='add'>+		       unsigned int chs, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	val = path-&gt;ctls[NID_PATH_VOL_CTL];</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+	val = amp_val_replace_channels(val, chs);</div><div class='add'>+	return __add_pb_vol_ctrl(codec-&gt;spec, HDA_CTL_WIDGET_VOL, pfx, cidx, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return the channel bits suitable for the given path-&gt;ctls[] */</div><div class='add'>+static int get_default_ch_nums(struct hda_codec *codec, struct nid_path *path,</div><div class='add'>+			       int type)</div><div class='add'>+{</div><div class='add'>+	int chs = 1; /* mono (left only) */</div><div class='add'>+	if (path) {</div><div class='add'>+		hda_nid_t nid = get_amp_nid_(path-&gt;ctls[type]);</div><div class='add'>+		if (nid &amp;&amp; (get_wcaps(codec, nid) &amp; AC_WCAP_STEREO))</div><div class='add'>+			chs = 3; /* stereo */</div><div class='add'>+	}</div><div class='add'>+	return chs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_stereo_vol(struct hda_codec *codec, const char *pfx, int cidx,</div><div class='add'>+			  struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	int chs = get_default_ch_nums(codec, path, NID_PATH_VOL_CTL);</div><div class='add'>+	return add_vol_ctl(codec, pfx, cidx, chs, path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a mute-switch for the given mixer widget;</div><div class='add'>+ * if it has multiple sources (e.g. DAC and loopback), create a bind-mute</div><div class='add'>+ */</div><div class='add'>+static int add_sw_ctl(struct hda_codec *codec, const char *pfx, int cidx,</div><div class='add'>+		      unsigned int chs, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int type = HDA_CTL_WIDGET_MUTE;</div><div class='add'>+</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	val = path-&gt;ctls[NID_PATH_MUTE_CTL];</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+	val = amp_val_replace_channels(val, chs);</div><div class='add'>+	if (get_amp_direction_(val) == HDA_INPUT) {</div><div class='add'>+		hda_nid_t nid = get_amp_nid_(val);</div><div class='add'>+		int nums = snd_hda_get_num_conns(codec, nid);</div><div class='add'>+		if (nums &gt; 1) {</div><div class='add'>+			type = HDA_CTL_BIND_MUTE;</div><div class='add'>+			val |= nums &lt;&lt; 19;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return __add_pb_sw_ctrl(codec-&gt;spec, type, pfx, cidx, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_stereo_sw(struct hda_codec *codec, const char *pfx,</div><div class='add'>+				  int cidx, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	int chs = get_default_ch_nums(codec, path, NID_PATH_MUTE_CTL);</div><div class='add'>+	return add_sw_ctl(codec, pfx, cidx, chs, path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* playback mute control with the software mute bit check */</div><div class='add'>+static void sync_auto_mute_bits(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;auto_mute_via_amp) {</div><div class='add'>+		hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+		bool enabled = !((spec-&gt;mute_bits &gt;&gt; nid) &amp; 1);</div><div class='add'>+		ucontrol-&gt;value.integer.value[0] &amp;= enabled;</div><div class='add'>+		ucontrol-&gt;value.integer.value[1] &amp;= enabled;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_gen_mixer_mute_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	sync_auto_mute_bits(kcontrol, ucontrol);</div><div class='add'>+	return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Bound mute controls</div><div class='add'>+ */</div><div class='add'>+#define AMP_VAL_IDX_SHIFT	19</div><div class='add'>+#define AMP_VAL_IDX_MASK	(0x0f&lt;&lt;19)</div><div class='add'>+</div><div class='add'>+static int hda_gen_bind_mute_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned long pval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+	pval = kcontrol-&gt;private_value;</div><div class='add'>+	kcontrol-&gt;private_value = pval &amp; ~AMP_VAL_IDX_MASK; /* index 0 */</div><div class='add'>+	err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);</div><div class='add'>+	kcontrol-&gt;private_value = pval;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_gen_bind_mute_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned long pval;</div><div class='add'>+	int i, indices, err = 0, change = 0;</div><div class='add'>+</div><div class='add'>+	sync_auto_mute_bits(kcontrol, ucontrol);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+	pval = kcontrol-&gt;private_value;</div><div class='add'>+	indices = (pval &amp; AMP_VAL_IDX_MASK) &gt;&gt; AMP_VAL_IDX_SHIFT;</div><div class='add'>+	for (i = 0; i &lt; indices; i++) {</div><div class='add'>+		kcontrol-&gt;private_value = (pval &amp; ~AMP_VAL_IDX_MASK) |</div><div class='add'>+			(i &lt;&lt; AMP_VAL_IDX_SHIFT);</div><div class='add'>+		err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+		change |= err;</div><div class='add'>+	}</div><div class='add'>+	kcontrol-&gt;private_value = pval;</div><div class='add'>+	return err &lt; 0 ? err : change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* any ctl assigned to the path with the given index? */</div><div class='add'>+static bool path_has_mixer(struct hda_codec *codec, int path_idx, int ctl_type)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path = snd_hda_get_path_from_idx(codec, path_idx);</div><div class='add'>+	return path &amp;&amp; path-&gt;ctls[ctl_type];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const channel_name[] = {</div><div class='add'>+	"Front", "Surround", "CLFE", "Side", "Back",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* give some appropriate ctl name prefix for the given line out channel */</div><div class='add'>+static const char *get_line_out_pfx(struct hda_codec *codec, int ch,</div><div class='add'>+				    int *index, int ctl_type)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+</div><div class='add'>+	*index = 0;</div><div class='add'>+	if (cfg-&gt;line_outs == 1 &amp;&amp; !spec-&gt;multi_ios &amp;&amp;</div><div class='add'>+	    !codec-&gt;force_pin_prefix &amp;&amp;</div><div class='add'>+	    !cfg-&gt;hp_outs &amp;&amp; !cfg-&gt;speaker_outs)</div><div class='add'>+		return spec-&gt;vmaster_mute.hook ? "PCM" : "Master";</div><div class='add'>+</div><div class='add'>+	/* if there is really a single DAC used in the whole output paths,</div><div class='add'>+	 * use it master (or "PCM" if a vmaster hook is present)</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;multiout.num_dacs == 1 &amp;&amp; !spec-&gt;mixer_nid &amp;&amp;</div><div class='add'>+	    !codec-&gt;force_pin_prefix &amp;&amp;</div><div class='add'>+	    !spec-&gt;multiout.hp_out_nid[0] &amp;&amp; !spec-&gt;multiout.extra_out_nid[0])</div><div class='add'>+		return spec-&gt;vmaster_mute.hook ? "PCM" : "Master";</div><div class='add'>+</div><div class='add'>+	/* multi-io channels */</div><div class='add'>+	if (ch &gt;= cfg-&gt;line_outs)</div><div class='add'>+		goto fixed_name;</div><div class='add'>+</div><div class='add'>+	switch (cfg-&gt;line_out_type) {</div><div class='add'>+	case AUTO_PIN_SPEAKER_OUT:</div><div class='add'>+		/* if the primary channel vol/mute is shared with HP volume,</div><div class='add'>+		 * don't name it as Speaker</div><div class='add'>+		 */</div><div class='add'>+		if (!ch &amp;&amp; cfg-&gt;hp_outs &amp;&amp;</div><div class='add'>+		    !path_has_mixer(codec, spec-&gt;hp_paths[0], ctl_type))</div><div class='add'>+			break;</div><div class='add'>+		if (cfg-&gt;line_outs == 1)</div><div class='add'>+			return "Speaker";</div><div class='add'>+		if (cfg-&gt;line_outs == 2)</div><div class='add'>+			return ch ? "Bass Speaker" : "Speaker";</div><div class='add'>+		break;</div><div class='add'>+	case AUTO_PIN_HP_OUT:</div><div class='add'>+		/* if the primary channel vol/mute is shared with spk volume,</div><div class='add'>+		 * don't name it as Headphone</div><div class='add'>+		 */</div><div class='add'>+		if (!ch &amp;&amp; cfg-&gt;speaker_outs &amp;&amp;</div><div class='add'>+		    !path_has_mixer(codec, spec-&gt;speaker_paths[0], ctl_type))</div><div class='add'>+			break;</div><div class='add'>+		/* for multi-io case, only the primary out */</div><div class='add'>+		if (ch &amp;&amp; spec-&gt;multi_ios)</div><div class='add'>+			break;</div><div class='add'>+		*index = ch;</div><div class='add'>+		return "Headphone";</div><div class='add'>+	case AUTO_PIN_LINE_OUT:</div><div class='add'>+		/* This deals with the case where one HP or one Speaker or</div><div class='add'>+		 * one HP + one Speaker need to share the DAC with LO</div><div class='add'>+		 */</div><div class='add'>+		if (!ch) {</div><div class='add'>+			bool hp_lo_shared = false, spk_lo_shared = false;</div><div class='add'>+</div><div class='add'>+			if (cfg-&gt;speaker_outs)</div><div class='add'>+				spk_lo_shared = !path_has_mixer(codec,</div><div class='add'>+								spec-&gt;speaker_paths[0],	ctl_type);</div><div class='add'>+			if (cfg-&gt;hp_outs)</div><div class='add'>+				hp_lo_shared = !path_has_mixer(codec, spec-&gt;hp_paths[0], ctl_type);</div><div class='add'>+			if (hp_lo_shared &amp;&amp; spk_lo_shared)</div><div class='add'>+				return spec-&gt;vmaster_mute.hook ? "PCM" : "Master";</div><div class='add'>+			if (hp_lo_shared)</div><div class='add'>+				return "Headphone+LO";</div><div class='add'>+			if (spk_lo_shared)</div><div class='add'>+				return "Speaker+LO";</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for a single channel output, we don't have to name the channel */</div><div class='add'>+	if (cfg-&gt;line_outs == 1 &amp;&amp; !spec-&gt;multi_ios)</div><div class='add'>+		return "Line Out";</div><div class='add'>+</div><div class='add'>+ fixed_name:</div><div class='add'>+	if (ch &gt;= ARRAY_SIZE(channel_name)) {</div><div class='add'>+		snd_BUG();</div><div class='add'>+		return "PCM";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return channel_name[ch];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse output paths</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* badness definition */</div><div class='add'>+enum {</div><div class='add'>+	/* No primary DAC is found for the main output */</div><div class='add'>+	BAD_NO_PRIMARY_DAC = 0x10000,</div><div class='add'>+	/* No DAC is found for the extra output */</div><div class='add'>+	BAD_NO_DAC = 0x4000,</div><div class='add'>+	/* No possible multi-ios */</div><div class='add'>+	BAD_MULTI_IO = 0x120,</div><div class='add'>+	/* No individual DAC for extra output */</div><div class='add'>+	BAD_NO_EXTRA_DAC = 0x102,</div><div class='add'>+	/* No individual DAC for extra surrounds */</div><div class='add'>+	BAD_NO_EXTRA_SURR_DAC = 0x101,</div><div class='add'>+	/* Primary DAC shared with main surrounds */</div><div class='add'>+	BAD_SHARED_SURROUND = 0x100,</div><div class='add'>+	/* No independent HP possible */</div><div class='add'>+	BAD_NO_INDEP_HP = 0x10,</div><div class='add'>+	/* Primary DAC shared with main CLFE */</div><div class='add'>+	BAD_SHARED_CLFE = 0x10,</div><div class='add'>+	/* Primary DAC shared with extra surrounds */</div><div class='add'>+	BAD_SHARED_EXTRA_SURROUND = 0x10,</div><div class='add'>+	/* Volume widget is shared */</div><div class='add'>+	BAD_SHARED_VOL = 0x10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* look for widgets in the given path which are appropriate for</div><div class='add'>+ * volume and mute controls, and assign the values to ctls[].</div><div class='add'>+ *</div><div class='add'>+ * When no appropriate widget is found in the path, the badness value</div><div class='add'>+ * is incremented depending on the situation.  The function returns the</div><div class='add'>+ * total badness for both volume and mute controls.</div><div class='add'>+ */</div><div class='add'>+static int assign_out_path_ctls(struct hda_codec *codec, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int badness = 0;</div><div class='add'>+</div><div class='add'>+	if (!path)</div><div class='add'>+		return BAD_SHARED_VOL * 2;</div><div class='add'>+</div><div class='add'>+	if (path-&gt;ctls[NID_PATH_VOL_CTL] ||</div><div class='add'>+	    path-&gt;ctls[NID_PATH_MUTE_CTL])</div><div class='add'>+		return 0; /* already evaluated */</div><div class='add'>+</div><div class='add'>+	nid = look_for_out_vol_nid(codec, path);</div><div class='add'>+	if (nid) {</div><div class='add'>+		val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+		if (spec-&gt;dac_min_mute)</div><div class='add'>+			val |= HDA_AMP_VAL_MIN_MUTE;</div><div class='add'>+		if (is_ctl_used(codec, val, NID_PATH_VOL_CTL))</div><div class='add'>+			badness += BAD_SHARED_VOL;</div><div class='add'>+		else</div><div class='add'>+			path-&gt;ctls[NID_PATH_VOL_CTL] = val;</div><div class='add'>+	} else</div><div class='add'>+		badness += BAD_SHARED_VOL;</div><div class='add'>+	nid = look_for_out_mute_nid(codec, path);</div><div class='add'>+	if (nid) {</div><div class='add'>+		unsigned int wid_type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='add'>+		if (wid_type == AC_WID_PIN || wid_type == AC_WID_AUD_OUT ||</div><div class='add'>+		    nid_has_mute(codec, nid, HDA_OUTPUT))</div><div class='add'>+			val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+		else</div><div class='add'>+			val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT);</div><div class='add'>+		if (is_ctl_used(codec, val, NID_PATH_MUTE_CTL))</div><div class='add'>+			badness += BAD_SHARED_VOL;</div><div class='add'>+		else</div><div class='add'>+			path-&gt;ctls[NID_PATH_MUTE_CTL] = val;</div><div class='add'>+	} else</div><div class='add'>+		badness += BAD_SHARED_VOL;</div><div class='add'>+	return badness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct badness_table hda_main_out_badness = {</div><div class='add'>+	.no_primary_dac = BAD_NO_PRIMARY_DAC,</div><div class='add'>+	.no_dac = BAD_NO_DAC,</div><div class='add'>+	.shared_primary = BAD_NO_PRIMARY_DAC,</div><div class='add'>+	.shared_surr = BAD_SHARED_SURROUND,</div><div class='add'>+	.shared_clfe = BAD_SHARED_CLFE,</div><div class='add'>+	.shared_surr_main = BAD_SHARED_SURROUND,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(hda_main_out_badness);</div><div class='add'>+</div><div class='add'>+const struct badness_table hda_extra_out_badness = {</div><div class='add'>+	.no_primary_dac = BAD_NO_DAC,</div><div class='add'>+	.no_dac = BAD_NO_DAC,</div><div class='add'>+	.shared_primary = BAD_NO_EXTRA_DAC,</div><div class='add'>+	.shared_surr = BAD_SHARED_EXTRA_SURROUND,</div><div class='add'>+	.shared_clfe = BAD_SHARED_EXTRA_SURROUND,</div><div class='add'>+	.shared_surr_main = BAD_NO_EXTRA_SURR_DAC,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(hda_extra_out_badness);</div><div class='add'>+</div><div class='add'>+/* get the DAC of the primary output corresponding to the given array index */</div><div class='add'>+static hda_nid_t get_primary_out(struct hda_codec *codec, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;line_outs &gt; idx)</div><div class='add'>+		return spec-&gt;private_dac_nids[idx];</div><div class='add'>+	idx -= cfg-&gt;line_outs;</div><div class='add'>+	if (spec-&gt;multi_ios &gt; idx)</div><div class='add'>+		return spec-&gt;multi_io[idx].dac;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return the DAC if it's reachable, otherwise zero */</div><div class='add'>+static inline hda_nid_t try_dac(struct hda_codec *codec,</div><div class='add'>+				hda_nid_t dac, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	return is_reachable_path(codec, dac, pin) ? dac : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* try to assign DACs to pins and return the resultant badness */</div><div class='add'>+static int try_assign_dacs(struct hda_codec *codec, int num_outs,</div><div class='add'>+			   const hda_nid_t *pins, hda_nid_t *dacs,</div><div class='add'>+			   int *path_idx,</div><div class='add'>+			   const struct badness_table *bad)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, j;</div><div class='add'>+	int badness = 0;</div><div class='add'>+	hda_nid_t dac;</div><div class='add'>+</div><div class='add'>+	if (!num_outs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_outs; i++) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		hda_nid_t pin = pins[i];</div><div class='add'>+</div><div class='add'>+		if (!spec-&gt;preferred_dacs) {</div><div class='add'>+			path = snd_hda_get_path_from_idx(codec, path_idx[i]);</div><div class='add'>+			if (path) {</div><div class='add'>+				badness += assign_out_path_ctls(codec, path);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dacs[i] = get_preferred_dac(codec, pin);</div><div class='add'>+		if (dacs[i]) {</div><div class='add'>+			if (is_dac_already_used(codec, dacs[i]))</div><div class='add'>+				badness += bad-&gt;shared_primary;</div><div class='add'>+		} else if (spec-&gt;preferred_dacs) {</div><div class='add'>+			badness += BAD_NO_PRIMARY_DAC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dacs[i])</div><div class='add'>+			dacs[i] = look_for_dac(codec, pin, false);</div><div class='add'>+		if (!dacs[i] &amp;&amp; !i) {</div><div class='add'>+			/* try to steal the DAC of surrounds for the front */</div><div class='add'>+			for (j = 1; j &lt; num_outs; j++) {</div><div class='add'>+				if (is_reachable_path(codec, dacs[j], pin)) {</div><div class='add'>+					dacs[0] = dacs[j];</div><div class='add'>+					dacs[j] = 0;</div><div class='add'>+					invalidate_nid_path(codec, path_idx[j]);</div><div class='add'>+					path_idx[j] = 0;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		dac = dacs[i];</div><div class='add'>+		if (!dac) {</div><div class='add'>+			if (num_outs &gt; 2)</div><div class='add'>+				dac = try_dac(codec, get_primary_out(codec, i), pin);</div><div class='add'>+			if (!dac)</div><div class='add'>+				dac = try_dac(codec, dacs[0], pin);</div><div class='add'>+			if (!dac)</div><div class='add'>+				dac = try_dac(codec, get_primary_out(codec, i), pin);</div><div class='add'>+			if (dac) {</div><div class='add'>+				if (!i)</div><div class='add'>+					badness += bad-&gt;shared_primary;</div><div class='add'>+				else if (i == 1)</div><div class='add'>+					badness += bad-&gt;shared_surr;</div><div class='add'>+				else</div><div class='add'>+					badness += bad-&gt;shared_clfe;</div><div class='add'>+			} else if (is_reachable_path(codec, spec-&gt;private_dac_nids[0], pin)) {</div><div class='add'>+				dac = spec-&gt;private_dac_nids[0];</div><div class='add'>+				badness += bad-&gt;shared_surr_main;</div><div class='add'>+			} else if (!i)</div><div class='add'>+				badness += bad-&gt;no_primary_dac;</div><div class='add'>+			else</div><div class='add'>+				badness += bad-&gt;no_dac;</div><div class='add'>+		}</div><div class='add'>+		if (!dac)</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_hda_add_new_path(codec, dac, pin, -spec-&gt;mixer_nid);</div><div class='add'>+		if (!path &amp;&amp; !i &amp;&amp; spec-&gt;mixer_nid) {</div><div class='add'>+			/* try with aamix */</div><div class='add'>+			path = snd_hda_add_new_path(codec, dac, pin, 0);</div><div class='add'>+		}</div><div class='add'>+		if (!path) {</div><div class='add'>+			dacs[i] = 0;</div><div class='add'>+			badness += bad-&gt;no_dac;</div><div class='add'>+		} else {</div><div class='add'>+			/* print_nid_path(codec, "output", path); */</div><div class='add'>+			path-&gt;active = true;</div><div class='add'>+			path_idx[i] = snd_hda_get_path_idx(codec, path);</div><div class='add'>+			badness += assign_out_path_ctls(codec, path);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return badness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return NID if the given pin has only a single connection to a certain DAC */</div><div class='add'>+static hda_nid_t get_dac_if_single(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+	hda_nid_t nid_found = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_all_dacs; i++) {</div><div class='add'>+		hda_nid_t nid = spec-&gt;all_dacs[i];</div><div class='add'>+		if (!nid || is_dac_already_used(codec, nid))</div><div class='add'>+			continue;</div><div class='add'>+		if (is_reachable_path(codec, nid, pin)) {</div><div class='add'>+			if (nid_found)</div><div class='add'>+				return 0;</div><div class='add'>+			nid_found = nid;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return nid_found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the given pin can be a multi-io pin */</div><div class='add'>+static bool can_be_multiio_pin(struct hda_codec *codec,</div><div class='add'>+			       unsigned int location, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int defcfg, caps;</div><div class='add'>+</div><div class='add'>+	defcfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	if (get_defcfg_connect(defcfg) != AC_JACK_PORT_COMPLEX)</div><div class='add'>+		return false;</div><div class='add'>+	if (location &amp;&amp; get_defcfg_location(defcfg) != location)</div><div class='add'>+		return false;</div><div class='add'>+	caps = snd_hda_query_pin_caps(codec, nid);</div><div class='add'>+	if (!(caps &amp; AC_PINCAP_OUT))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* count the number of input pins that are capable to be multi-io */</div><div class='add'>+static int count_multiio_pins(struct hda_codec *codec, hda_nid_t reference_pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int defcfg = snd_hda_codec_get_pincfg(codec, reference_pin);</div><div class='add'>+	unsigned int location = get_defcfg_location(defcfg);</div><div class='add'>+	int type, i;</div><div class='add'>+	int num_pins = 0;</div><div class='add'>+</div><div class='add'>+	for (type = AUTO_PIN_LINE_IN; type &gt;= AUTO_PIN_MIC; type--) {</div><div class='add'>+		for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+			if (cfg-&gt;inputs[i].type != type)</div><div class='add'>+				continue;</div><div class='add'>+			if (can_be_multiio_pin(codec, location,</div><div class='add'>+					       cfg-&gt;inputs[i].pin))</div><div class='add'>+				num_pins++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return num_pins;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * multi-io helper</div><div class='add'>+ *</div><div class='add'>+ * When hardwired is set, try to fill ony hardwired pins, and returns</div><div class='add'>+ * zero if any pins are filled, non-zero if nothing found.</div><div class='add'>+ * When hardwired is off, try to fill possible input pins, and returns</div><div class='add'>+ * the badness value.</div><div class='add'>+ */</div><div class='add'>+static int fill_multi_ios(struct hda_codec *codec,</div><div class='add'>+			  hda_nid_t reference_pin,</div><div class='add'>+			  bool hardwired)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int type, i, j, num_pins, old_pins;</div><div class='add'>+	unsigned int defcfg = snd_hda_codec_get_pincfg(codec, reference_pin);</div><div class='add'>+	unsigned int location = get_defcfg_location(defcfg);</div><div class='add'>+	int badness = 0;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	old_pins = spec-&gt;multi_ios;</div><div class='add'>+	if (old_pins &gt;= 2)</div><div class='add'>+		goto end_fill;</div><div class='add'>+</div><div class='add'>+	num_pins = count_multiio_pins(codec, reference_pin);</div><div class='add'>+	if (num_pins &lt; 2)</div><div class='add'>+		goto end_fill;</div><div class='add'>+</div><div class='add'>+	for (type = AUTO_PIN_LINE_IN; type &gt;= AUTO_PIN_MIC; type--) {</div><div class='add'>+		for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+			hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='add'>+			hda_nid_t dac = 0;</div><div class='add'>+</div><div class='add'>+			if (cfg-&gt;inputs[i].type != type)</div><div class='add'>+				continue;</div><div class='add'>+			if (!can_be_multiio_pin(codec, location, nid))</div><div class='add'>+				continue;</div><div class='add'>+			for (j = 0; j &lt; spec-&gt;multi_ios; j++) {</div><div class='add'>+				if (nid == spec-&gt;multi_io[j].pin)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			if (j &lt; spec-&gt;multi_ios)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (hardwired)</div><div class='add'>+				dac = get_dac_if_single(codec, nid);</div><div class='add'>+			else if (!dac)</div><div class='add'>+				dac = look_for_dac(codec, nid, false);</div><div class='add'>+			if (!dac) {</div><div class='add'>+				badness++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			path = snd_hda_add_new_path(codec, dac, nid,</div><div class='add'>+						    -spec-&gt;mixer_nid);</div><div class='add'>+			if (!path) {</div><div class='add'>+				badness++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* print_nid_path(codec, "multiio", path); */</div><div class='add'>+			spec-&gt;multi_io[spec-&gt;multi_ios].pin = nid;</div><div class='add'>+			spec-&gt;multi_io[spec-&gt;multi_ios].dac = dac;</div><div class='add'>+			spec-&gt;out_paths[cfg-&gt;line_outs + spec-&gt;multi_ios] =</div><div class='add'>+				snd_hda_get_path_idx(codec, path);</div><div class='add'>+			spec-&gt;multi_ios++;</div><div class='add'>+			if (spec-&gt;multi_ios &gt;= 2)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+ end_fill:</div><div class='add'>+	if (badness)</div><div class='add'>+		badness = BAD_MULTI_IO;</div><div class='add'>+	if (old_pins == spec-&gt;multi_ios) {</div><div class='add'>+		if (hardwired)</div><div class='add'>+			return 1; /* nothing found */</div><div class='add'>+		else</div><div class='add'>+			return badness; /* no badness if nothing found */</div><div class='add'>+	}</div><div class='add'>+	if (!hardwired &amp;&amp; spec-&gt;multi_ios &lt; 2) {</div><div class='add'>+		/* cancel newly assigned paths */</div><div class='add'>+		spec-&gt;paths.used -= spec-&gt;multi_ios - old_pins;</div><div class='add'>+		spec-&gt;multi_ios = old_pins;</div><div class='add'>+		return badness;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* assign volume and mute controls */</div><div class='add'>+	for (i = old_pins; i &lt; spec-&gt;multi_ios; i++) {</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;out_paths[cfg-&gt;line_outs + i]);</div><div class='add'>+		badness += assign_out_path_ctls(codec, path);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return badness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* map DACs for all pins in the list if they are single connections */</div><div class='add'>+static bool map_singles(struct hda_codec *codec, int outs,</div><div class='add'>+			const hda_nid_t *pins, hda_nid_t *dacs, int *path_idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+	bool found = false;</div><div class='add'>+	for (i = 0; i &lt; outs; i++) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		hda_nid_t dac;</div><div class='add'>+		if (dacs[i])</div><div class='add'>+			continue;</div><div class='add'>+		dac = get_dac_if_single(codec, pins[i]);</div><div class='add'>+		if (!dac)</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_hda_add_new_path(codec, dac, pins[i],</div><div class='add'>+					    -spec-&gt;mixer_nid);</div><div class='add'>+		if (!path &amp;&amp; !i &amp;&amp; spec-&gt;mixer_nid)</div><div class='add'>+			path = snd_hda_add_new_path(codec, dac, pins[i], 0);</div><div class='add'>+		if (path) {</div><div class='add'>+			dacs[i] = dac;</div><div class='add'>+			found = true;</div><div class='add'>+			/* print_nid_path(codec, "output", path); */</div><div class='add'>+			path-&gt;active = true;</div><div class='add'>+			path_idx[i] = snd_hda_get_path_idx(codec, path);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return found;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool has_aamix_out_paths(struct hda_gen_spec *spec)</div><div class='add'>+{</div><div class='add'>+	return spec-&gt;aamix_out_paths[0] || spec-&gt;aamix_out_paths[1] ||</div><div class='add'>+		spec-&gt;aamix_out_paths[2];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a new path including aamix if available, and return its index */</div><div class='add'>+static int check_aamix_out_path(struct hda_codec *codec, int path_idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	hda_nid_t path_dac, dac, pin;</div><div class='add'>+</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, path_idx);</div><div class='add'>+	if (!path || !path-&gt;depth ||</div><div class='add'>+	    is_nid_contained(path, spec-&gt;mixer_nid))</div><div class='add'>+		return 0;</div><div class='add'>+	path_dac = path-&gt;path[0];</div><div class='add'>+	dac = spec-&gt;private_dac_nids[0];</div><div class='add'>+	pin = path-&gt;path[path-&gt;depth - 1];</div><div class='add'>+	path = snd_hda_add_new_path(codec, dac, pin, spec-&gt;mixer_nid);</div><div class='add'>+	if (!path) {</div><div class='add'>+		if (dac != path_dac)</div><div class='add'>+			dac = path_dac;</div><div class='add'>+		else if (spec-&gt;multiout.hp_out_nid[0])</div><div class='add'>+			dac = spec-&gt;multiout.hp_out_nid[0];</div><div class='add'>+		else if (spec-&gt;multiout.extra_out_nid[0])</div><div class='add'>+			dac = spec-&gt;multiout.extra_out_nid[0];</div><div class='add'>+		else</div><div class='add'>+			dac = 0;</div><div class='add'>+		if (dac)</div><div class='add'>+			path = snd_hda_add_new_path(codec, dac, pin,</div><div class='add'>+						    spec-&gt;mixer_nid);</div><div class='add'>+	}</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	/* print_nid_path(codec, "output-aamix", path); */</div><div class='add'>+	path-&gt;active = false; /* unused as default */</div><div class='add'>+	path-&gt;pin_fixed = true; /* static route */</div><div class='add'>+	return snd_hda_get_path_idx(codec, path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the independent HP is available with the current config */</div><div class='add'>+static bool indep_hp_possible(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i, idx;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+		idx = spec-&gt;out_paths[0];</div><div class='add'>+	else</div><div class='add'>+		idx = spec-&gt;hp_paths[0];</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* assume no path conflicts unless aamix is involved */</div><div class='add'>+	if (!spec-&gt;mixer_nid || !is_nid_contained(path, spec-&gt;mixer_nid))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* check whether output paths contain aamix */</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='add'>+		if (spec-&gt;out_paths[i] == idx)</div><div class='add'>+			break;</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;out_paths[i]);</div><div class='add'>+		if (path &amp;&amp; is_nid_contained(path, spec-&gt;mixer_nid))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;speaker_paths[i]);</div><div class='add'>+		if (path &amp;&amp; is_nid_contained(path, spec-&gt;mixer_nid))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill the empty entries in the dac array for speaker/hp with the</div><div class='add'>+ * shared dac pointed by the paths</div><div class='add'>+ */</div><div class='add'>+static void refill_shared_dacs(struct hda_codec *codec, int num_outs,</div><div class='add'>+			       hda_nid_t *dacs, int *path_idx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_outs; i++) {</div><div class='add'>+		if (dacs[i])</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, path_idx[i]);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+		dacs[i] = path-&gt;path[0];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fill in the dac_nids table from the parsed pin configuration */</div><div class='add'>+static int fill_and_eval_dacs(struct hda_codec *codec,</div><div class='add'>+			      bool fill_hardwired,</div><div class='add'>+			      bool fill_mio_first)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i, err, badness;</div><div class='add'>+</div><div class='add'>+	/* set num_dacs once to full for look_for_dac() */</div><div class='add'>+	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='add'>+	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='add'>+	memset(spec-&gt;private_dac_nids, 0, sizeof(spec-&gt;private_dac_nids));</div><div class='add'>+	memset(spec-&gt;multiout.hp_out_nid, 0, sizeof(spec-&gt;multiout.hp_out_nid));</div><div class='add'>+	memset(spec-&gt;multiout.extra_out_nid, 0, sizeof(spec-&gt;multiout.extra_out_nid));</div><div class='add'>+	spec-&gt;multi_ios = 0;</div><div class='add'>+	snd_array_free(&amp;spec-&gt;paths);</div><div class='add'>+</div><div class='add'>+	/* clear path indices */</div><div class='add'>+	memset(spec-&gt;out_paths, 0, sizeof(spec-&gt;out_paths));</div><div class='add'>+	memset(spec-&gt;hp_paths, 0, sizeof(spec-&gt;hp_paths));</div><div class='add'>+	memset(spec-&gt;speaker_paths, 0, sizeof(spec-&gt;speaker_paths));</div><div class='add'>+	memset(spec-&gt;aamix_out_paths, 0, sizeof(spec-&gt;aamix_out_paths));</div><div class='add'>+	memset(spec-&gt;digout_paths, 0, sizeof(spec-&gt;digout_paths));</div><div class='add'>+	memset(spec-&gt;input_paths, 0, sizeof(spec-&gt;input_paths));</div><div class='add'>+	memset(spec-&gt;loopback_paths, 0, sizeof(spec-&gt;loopback_paths));</div><div class='add'>+	memset(&amp;spec-&gt;digin_path, 0, sizeof(spec-&gt;digin_path));</div><div class='add'>+</div><div class='add'>+	badness = 0;</div><div class='add'>+</div><div class='add'>+	/* fill hard-wired DACs first */</div><div class='add'>+	if (fill_hardwired) {</div><div class='add'>+		bool mapped;</div><div class='add'>+		do {</div><div class='add'>+			mapped = map_singles(codec, cfg-&gt;line_outs,</div><div class='add'>+					     cfg-&gt;line_out_pins,</div><div class='add'>+					     spec-&gt;private_dac_nids,</div><div class='add'>+					     spec-&gt;out_paths);</div><div class='add'>+			mapped |= map_singles(codec, cfg-&gt;hp_outs,</div><div class='add'>+					      cfg-&gt;hp_pins,</div><div class='add'>+					      spec-&gt;multiout.hp_out_nid,</div><div class='add'>+					      spec-&gt;hp_paths);</div><div class='add'>+			mapped |= map_singles(codec, cfg-&gt;speaker_outs,</div><div class='add'>+					      cfg-&gt;speaker_pins,</div><div class='add'>+					      spec-&gt;multiout.extra_out_nid,</div><div class='add'>+					      spec-&gt;speaker_paths);</div><div class='add'>+			if (!spec-&gt;no_multi_io &amp;&amp;</div><div class='add'>+			    fill_mio_first &amp;&amp; cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='add'>+			    cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+				err = fill_multi_ios(codec, cfg-&gt;line_out_pins[0], true);</div><div class='add'>+				if (!err)</div><div class='add'>+					mapped = true;</div><div class='add'>+			}</div><div class='add'>+		} while (mapped);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	badness += try_assign_dacs(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins,</div><div class='add'>+				   spec-&gt;private_dac_nids, spec-&gt;out_paths,</div><div class='add'>+				   spec-&gt;main_out_badness);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_multi_io &amp;&amp; fill_mio_first &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_outs == 1 &amp;&amp; cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		/* try to fill multi-io first */</div><div class='add'>+		err = fill_multi_ios(codec, cfg-&gt;line_out_pins[0], false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/* we don't count badness at this stage yet */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT) {</div><div class='add'>+		err = try_assign_dacs(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins,</div><div class='add'>+				      spec-&gt;multiout.hp_out_nid,</div><div class='add'>+				      spec-&gt;hp_paths,</div><div class='add'>+				      spec-&gt;extra_out_badness);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		badness += err;</div><div class='add'>+	}</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		err = try_assign_dacs(codec, cfg-&gt;speaker_outs,</div><div class='add'>+				      cfg-&gt;speaker_pins,</div><div class='add'>+				      spec-&gt;multiout.extra_out_nid,</div><div class='add'>+				      spec-&gt;speaker_paths,</div><div class='add'>+				      spec-&gt;extra_out_badness);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		badness += err;</div><div class='add'>+	}</div><div class='add'>+	if (!spec-&gt;no_multi_io &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_outs == 1 &amp;&amp; cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		err = fill_multi_ios(codec, cfg-&gt;line_out_pins[0], false);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		badness += err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;mixer_nid) {</div><div class='add'>+		spec-&gt;aamix_out_paths[0] =</div><div class='add'>+			check_aamix_out_path(codec, spec-&gt;out_paths[0]);</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+			spec-&gt;aamix_out_paths[1] =</div><div class='add'>+				check_aamix_out_path(codec, spec-&gt;hp_paths[0]);</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+			spec-&gt;aamix_out_paths[2] =</div><div class='add'>+				check_aamix_out_path(codec, spec-&gt;speaker_paths[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_multi_io &amp;&amp;</div><div class='add'>+	    cfg-&gt;hp_outs &amp;&amp; cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		if (count_multiio_pins(codec, cfg-&gt;hp_pins[0]) &gt;= 2)</div><div class='add'>+			spec-&gt;multi_ios = 1; /* give badness */</div><div class='add'>+</div><div class='add'>+	/* re-count num_dacs and squash invalid entries */</div><div class='add'>+	spec-&gt;multiout.num_dacs = 0;</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='add'>+		if (spec-&gt;private_dac_nids[i])</div><div class='add'>+			spec-&gt;multiout.num_dacs++;</div><div class='add'>+		else {</div><div class='add'>+			memmove(spec-&gt;private_dac_nids + i,</div><div class='add'>+				spec-&gt;private_dac_nids + i + 1,</div><div class='add'>+				sizeof(hda_nid_t) * (cfg-&gt;line_outs - i - 1));</div><div class='add'>+			spec-&gt;private_dac_nids[cfg-&gt;line_outs - 1] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;ext_channel_count = spec-&gt;min_channel_count =</div><div class='add'>+		spec-&gt;multiout.num_dacs * 2;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multi_ios == 2) {</div><div class='add'>+		for (i = 0; i &lt; 2; i++)</div><div class='add'>+			spec-&gt;private_dac_nids[spec-&gt;multiout.num_dacs++] =</div><div class='add'>+				spec-&gt;multi_io[i].dac;</div><div class='add'>+	} else if (spec-&gt;multi_ios) {</div><div class='add'>+		spec-&gt;multi_ios = 0;</div><div class='add'>+		badness += BAD_MULTI_IO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;indep_hp &amp;&amp; !indep_hp_possible(codec))</div><div class='add'>+		badness += BAD_NO_INDEP_HP;</div><div class='add'>+</div><div class='add'>+	/* re-fill the shared DAC for speaker / headphone */</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		refill_shared_dacs(codec, cfg-&gt;hp_outs,</div><div class='add'>+				   spec-&gt;multiout.hp_out_nid,</div><div class='add'>+				   spec-&gt;hp_paths);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		refill_shared_dacs(codec, cfg-&gt;speaker_outs,</div><div class='add'>+				   spec-&gt;multiout.extra_out_nid,</div><div class='add'>+				   spec-&gt;speaker_paths);</div><div class='add'>+</div><div class='add'>+	return badness;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEBUG_BADNESS</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_BADNESS</div><div class='add'>+#define debug_badness(fmt, ...)						\</div><div class='add'>+	codec_dbg(codec, fmt, ##__VA_ARGS__)</div><div class='add'>+#else</div><div class='add'>+#define debug_badness(fmt, ...)						\</div><div class='add'>+	do { if (0) codec_dbg(codec, fmt, ##__VA_ARGS__); } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG_BADNESS</div><div class='add'>+static inline void print_nid_path_idx(struct hda_codec *codec,</div><div class='add'>+				      const char *pfx, int idx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, idx);</div><div class='add'>+	if (path)</div><div class='add'>+		print_nid_path(codec, pfx, path);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void debug_show_configs(struct hda_codec *codec,</div><div class='add'>+			       struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const char * const lo_type[3] = { "LO", "SP", "HP" };</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	debug_badness("multi_outs = %x/%x/%x/%x : %x/%x/%x/%x (type %s)\n",</div><div class='add'>+		      cfg-&gt;line_out_pins[0], cfg-&gt;line_out_pins[1],</div><div class='add'>+		      cfg-&gt;line_out_pins[2], cfg-&gt;line_out_pins[3],</div><div class='add'>+		      spec-&gt;multiout.dac_nids[0],</div><div class='add'>+		      spec-&gt;multiout.dac_nids[1],</div><div class='add'>+		      spec-&gt;multiout.dac_nids[2],</div><div class='add'>+		      spec-&gt;multiout.dac_nids[3],</div><div class='add'>+		      lo_type[cfg-&gt;line_out_type]);</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='add'>+		print_nid_path_idx(codec, "  out", spec-&gt;out_paths[i]);</div><div class='add'>+	if (spec-&gt;multi_ios &gt; 0)</div><div class='add'>+		debug_badness("multi_ios(%d) = %x/%x : %x/%x\n",</div><div class='add'>+			      spec-&gt;multi_ios,</div><div class='add'>+			      spec-&gt;multi_io[0].pin, spec-&gt;multi_io[1].pin,</div><div class='add'>+			      spec-&gt;multi_io[0].dac, spec-&gt;multi_io[1].dac);</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;multi_ios; i++)</div><div class='add'>+		print_nid_path_idx(codec, "  mio",</div><div class='add'>+				   spec-&gt;out_paths[cfg-&gt;line_outs + i]);</div><div class='add'>+	if (cfg-&gt;hp_outs)</div><div class='add'>+		debug_badness("hp_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",</div><div class='add'>+		      cfg-&gt;hp_pins[0], cfg-&gt;hp_pins[1],</div><div class='add'>+		      cfg-&gt;hp_pins[2], cfg-&gt;hp_pins[3],</div><div class='add'>+		      spec-&gt;multiout.hp_out_nid[0],</div><div class='add'>+		      spec-&gt;multiout.hp_out_nid[1],</div><div class='add'>+		      spec-&gt;multiout.hp_out_nid[2],</div><div class='add'>+		      spec-&gt;multiout.hp_out_nid[3]);</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;hp_outs; i++)</div><div class='add'>+		print_nid_path_idx(codec, "  hp ", spec-&gt;hp_paths[i]);</div><div class='add'>+	if (cfg-&gt;speaker_outs)</div><div class='add'>+		debug_badness("spk_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",</div><div class='add'>+		      cfg-&gt;speaker_pins[0], cfg-&gt;speaker_pins[1],</div><div class='add'>+		      cfg-&gt;speaker_pins[2], cfg-&gt;speaker_pins[3],</div><div class='add'>+		      spec-&gt;multiout.extra_out_nid[0],</div><div class='add'>+		      spec-&gt;multiout.extra_out_nid[1],</div><div class='add'>+		      spec-&gt;multiout.extra_out_nid[2],</div><div class='add'>+		      spec-&gt;multiout.extra_out_nid[3]);</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++)</div><div class='add'>+		print_nid_path_idx(codec, "  spk", spec-&gt;speaker_paths[i]);</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		print_nid_path_idx(codec, "  mix", spec-&gt;aamix_out_paths[i]);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define debug_show_configs(codec, cfg) /* NOP */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* find all available DACs of the codec */</div><div class='add'>+static void fill_all_dac_nids(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	spec-&gt;num_all_dacs = 0;</div><div class='add'>+	memset(spec-&gt;all_dacs, 0, sizeof(spec-&gt;all_dacs));</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_AUD_OUT)</div><div class='add'>+			continue;</div><div class='add'>+		if (spec-&gt;num_all_dacs &gt;= ARRAY_SIZE(spec-&gt;all_dacs)) {</div><div class='add'>+			codec_err(codec, "Too many DACs!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		spec-&gt;all_dacs[spec-&gt;num_all_dacs++] = nid;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_output_paths(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	struct auto_pin_cfg *best_cfg __free(kfree) = NULL;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int best_badness = INT_MAX;</div><div class='add'>+	int badness;</div><div class='add'>+	bool fill_hardwired = true, fill_mio_first = true;</div><div class='add'>+	bool best_wired = true, best_mio = true;</div><div class='add'>+	bool hp_spk_swapped = false;</div><div class='add'>+</div><div class='add'>+	best_cfg = kmalloc(sizeof(*best_cfg), GFP_KERNEL);</div><div class='add'>+	if (!best_cfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*best_cfg = *cfg;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		badness = fill_and_eval_dacs(codec, fill_hardwired,</div><div class='add'>+					     fill_mio_first);</div><div class='add'>+		if (badness &lt; 0)</div><div class='add'>+			return badness;</div><div class='add'>+		debug_badness("==&gt; lo_type=%d, wired=%d, mio=%d, badness=0x%x\n",</div><div class='add'>+			      cfg-&gt;line_out_type, fill_hardwired, fill_mio_first,</div><div class='add'>+			      badness);</div><div class='add'>+		debug_show_configs(codec, cfg);</div><div class='add'>+		if (badness &lt; best_badness) {</div><div class='add'>+			best_badness = badness;</div><div class='add'>+			*best_cfg = *cfg;</div><div class='add'>+			best_wired = fill_hardwired;</div><div class='add'>+			best_mio = fill_mio_first;</div><div class='add'>+		}</div><div class='add'>+		if (!badness)</div><div class='add'>+			break;</div><div class='add'>+		fill_mio_first = !fill_mio_first;</div><div class='add'>+		if (!fill_mio_first)</div><div class='add'>+			continue;</div><div class='add'>+		fill_hardwired = !fill_hardwired;</div><div class='add'>+		if (!fill_hardwired)</div><div class='add'>+			continue;</div><div class='add'>+		if (hp_spk_swapped)</div><div class='add'>+			break;</div><div class='add'>+		hp_spk_swapped = true;</div><div class='add'>+		if (cfg-&gt;speaker_outs &gt; 0 &amp;&amp;</div><div class='add'>+		    cfg-&gt;line_out_type == AUTO_PIN_HP_OUT) {</div><div class='add'>+			cfg-&gt;hp_outs = cfg-&gt;line_outs;</div><div class='add'>+			memcpy(cfg-&gt;hp_pins, cfg-&gt;line_out_pins,</div><div class='add'>+			       sizeof(cfg-&gt;hp_pins));</div><div class='add'>+			cfg-&gt;line_outs = cfg-&gt;speaker_outs;</div><div class='add'>+			memcpy(cfg-&gt;line_out_pins, cfg-&gt;speaker_pins,</div><div class='add'>+			       sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+			cfg-&gt;speaker_outs = 0;</div><div class='add'>+			memset(cfg-&gt;speaker_pins, 0, sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+			cfg-&gt;line_out_type = AUTO_PIN_SPEAKER_OUT;</div><div class='add'>+			fill_hardwired = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (cfg-&gt;hp_outs &gt; 0 &amp;&amp;</div><div class='add'>+		    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+			cfg-&gt;speaker_outs = cfg-&gt;line_outs;</div><div class='add'>+			memcpy(cfg-&gt;speaker_pins, cfg-&gt;line_out_pins,</div><div class='add'>+			       sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+			cfg-&gt;line_outs = cfg-&gt;hp_outs;</div><div class='add'>+			memcpy(cfg-&gt;line_out_pins, cfg-&gt;hp_pins,</div><div class='add'>+			       sizeof(cfg-&gt;hp_pins));</div><div class='add'>+			cfg-&gt;hp_outs = 0;</div><div class='add'>+			memset(cfg-&gt;hp_pins, 0, sizeof(cfg-&gt;hp_pins));</div><div class='add'>+			cfg-&gt;line_out_type = AUTO_PIN_HP_OUT;</div><div class='add'>+			fill_hardwired = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (badness) {</div><div class='add'>+		debug_badness("==&gt; restoring best_cfg\n");</div><div class='add'>+		*cfg = *best_cfg;</div><div class='add'>+		fill_and_eval_dacs(codec, best_wired, best_mio);</div><div class='add'>+	}</div><div class='add'>+	debug_badness("==&gt; Best config: lo_type=%d, wired=%d, mio=%d\n",</div><div class='add'>+		      cfg-&gt;line_out_type, best_wired, best_mio);</div><div class='add'>+	debug_show_configs(codec, cfg);</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;line_out_pins[0]) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;out_paths[0]);</div><div class='add'>+		if (path)</div><div class='add'>+			spec-&gt;vmaster_nid = look_for_out_vol_nid(codec, path);</div><div class='add'>+		if (spec-&gt;vmaster_nid) {</div><div class='add'>+			snd_hda_set_vmaster_tlv(codec, spec-&gt;vmaster_nid,</div><div class='add'>+						HDA_OUTPUT, spec-&gt;vmaster_tlv);</div><div class='add'>+			if (spec-&gt;dac_min_mute)</div><div class='add'>+				spec-&gt;vmaster_tlv[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] |= TLV_DB_SCALE_MUTE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set initial pinctl targets */</div><div class='add'>+	if (spec-&gt;prefer_hp_amp || cfg-&gt;line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+		val = PIN_HP;</div><div class='add'>+	else</div><div class='add'>+		val = PIN_OUT;</div><div class='add'>+	set_pin_targets(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins, val);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		set_pin_targets(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins, PIN_HP);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		val = spec-&gt;prefer_hp_amp ? PIN_HP : PIN_OUT;</div><div class='add'>+		set_pin_targets(codec, cfg-&gt;speaker_outs,</div><div class='add'>+				cfg-&gt;speaker_pins, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear indep_hp flag if not available */</div><div class='add'>+	if (spec-&gt;indep_hp &amp;&amp; !indep_hp_possible(codec))</div><div class='add'>+		spec-&gt;indep_hp = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* add playback controls from the parsed DAC table */</div><div class='add'>+static int create_multi_out_ctls(struct hda_codec *codec,</div><div class='add'>+				 const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err, noutputs;</div><div class='add'>+</div><div class='add'>+	noutputs = cfg-&gt;line_outs;</div><div class='add'>+	if (spec-&gt;multi_ios &gt; 0 &amp;&amp; cfg-&gt;line_outs &lt; 3)</div><div class='add'>+		noutputs += spec-&gt;multi_ios;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; noutputs; i++) {</div><div class='add'>+		const char *name;</div><div class='add'>+		int index;</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, spec-&gt;out_paths[i]);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		name = get_line_out_pfx(codec, i, &amp;index, NID_PATH_VOL_CTL);</div><div class='add'>+		if (!name || !strcmp(name, "CLFE")) {</div><div class='add'>+			/* Center/LFE */</div><div class='add'>+			err = add_vol_ctl(codec, "Center", 0, 1, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			err = add_vol_ctl(codec, "LFE", 0, 2, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			err = add_stereo_vol(codec, name, index, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		name = get_line_out_pfx(codec, i, &amp;index, NID_PATH_MUTE_CTL);</div><div class='add'>+		if (!name || !strcmp(name, "CLFE")) {</div><div class='add'>+			err = add_sw_ctl(codec, "Center", 0, 1, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			err = add_sw_ctl(codec, "LFE", 0, 2, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		} else {</div><div class='add'>+			err = add_stereo_sw(codec, name, index, path);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_extra_out(struct hda_codec *codec, int path_idx,</div><div class='add'>+			    const char *pfx, int cidx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, path_idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	err = add_stereo_vol(codec, pfx, cidx, path);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = add_stereo_sw(codec, pfx, cidx, path);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* add playback controls for speaker and HP outputs */</div><div class='add'>+static int create_extra_outs(struct hda_codec *codec, int num_pins,</div><div class='add'>+			     const int *paths, const char *pfx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		const char *name;</div><div class='add'>+		char tmp[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+		int err, idx = 0;</div><div class='add'>+</div><div class='add'>+		if (num_pins == 2 &amp;&amp; i == 1 &amp;&amp; !strcmp(pfx, "Speaker"))</div><div class='add'>+			name = "Bass Speaker";</div><div class='add'>+		else if (num_pins &gt;= 3) {</div><div class='add'>+			snprintf(tmp, sizeof(tmp), "%s %s",</div><div class='add'>+				 pfx, channel_name[i]);</div><div class='add'>+			name = tmp;</div><div class='add'>+		} else {</div><div class='add'>+			name = pfx;</div><div class='add'>+			idx = i;</div><div class='add'>+		}</div><div class='add'>+		err = create_extra_out(codec, paths[i], name, idx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_hp_out_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return create_extra_outs(codec, spec-&gt;autocfg.hp_outs,</div><div class='add'>+				 spec-&gt;hp_paths,</div><div class='add'>+				 "Headphone");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_speaker_out_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return create_extra_outs(codec, spec-&gt;autocfg.speaker_outs,</div><div class='add'>+				 spec-&gt;speaker_paths,</div><div class='add'>+				 "Speaker");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * independent HP controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void call_hp_automute(struct hda_codec *codec,</div><div class='add'>+			     struct hda_jack_callback *jack);</div><div class='add'>+static int indep_hp_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_enum_bool_helper_info(kcontrol, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int indep_hp_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;indep_hp_enabled;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_aamix_paths(struct hda_codec *codec, bool do_mix,</div><div class='add'>+			       int nomix_path_idx, int mix_path_idx,</div><div class='add'>+			       int out_type);</div><div class='add'>+</div><div class='add'>+static int indep_hp_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int select = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	if (spec-&gt;active_streams)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;indep_hp_enabled != select) {</div><div class='add'>+		hda_nid_t *dacp;</div><div class='add'>+		if (spec-&gt;autocfg.line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+			dacp = &amp;spec-&gt;private_dac_nids[0];</div><div class='add'>+		else</div><div class='add'>+			dacp = &amp;spec-&gt;multiout.hp_out_nid[0];</div><div class='add'>+</div><div class='add'>+		/* update HP aamix paths in case it conflicts with indep HP */</div><div class='add'>+		if (spec-&gt;have_aamix_ctl) {</div><div class='add'>+			if (spec-&gt;autocfg.line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+				update_aamix_paths(codec, spec-&gt;aamix_mode,</div><div class='add'>+						   spec-&gt;out_paths[0],</div><div class='add'>+						   spec-&gt;aamix_out_paths[0],</div><div class='add'>+						   spec-&gt;autocfg.line_out_type);</div><div class='add'>+			else</div><div class='add'>+				update_aamix_paths(codec, spec-&gt;aamix_mode,</div><div class='add'>+						   spec-&gt;hp_paths[0],</div><div class='add'>+						   spec-&gt;aamix_out_paths[1],</div><div class='add'>+						   AUTO_PIN_HP_OUT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spec-&gt;indep_hp_enabled = select;</div><div class='add'>+		if (spec-&gt;indep_hp_enabled)</div><div class='add'>+			*dacp = 0;</div><div class='add'>+		else</div><div class='add'>+			*dacp = spec-&gt;alt_dac_nid;</div><div class='add'>+</div><div class='add'>+		call_hp_automute(codec, NULL);</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new indep_hp_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Independent HP",</div><div class='add'>+	.info = indep_hp_info,</div><div class='add'>+	.get = indep_hp_get,</div><div class='add'>+	.put = indep_hp_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int create_indep_hp_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t dac;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;indep_hp)</div><div class='add'>+		return 0;</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+		dac = spec-&gt;multiout.dac_nids[0];</div><div class='add'>+	else</div><div class='add'>+		dac = spec-&gt;multiout.hp_out_nid[0];</div><div class='add'>+	if (!dac) {</div><div class='add'>+		spec-&gt;indep_hp = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;indep_hp_enabled = false;</div><div class='add'>+	spec-&gt;alt_dac_nid = dac;</div><div class='add'>+	if (!snd_hda_gen_add_kctl(spec, NULL, &amp;indep_hp_ctl))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * channel mode enum control</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int ch_mode_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int chs;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = spec-&gt;multi_ios + 1;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt; spec-&gt;multi_ios)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = spec-&gt;multi_ios;</div><div class='add'>+	chs = uinfo-&gt;value.enumerated.item * 2 + spec-&gt;min_channel_count;</div><div class='add'>+	sprintf(uinfo-&gt;value.enumerated.name, "%dch", chs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ch_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+		       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] =</div><div class='add'>+		(spec-&gt;ext_channel_count - spec-&gt;min_channel_count) / 2;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct nid_path *</div><div class='add'>+get_multiio_path(struct hda_codec *codec, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_get_path_from_idx(codec,</div><div class='add'>+		spec-&gt;out_paths[spec-&gt;autocfg.line_outs + idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_automute_all(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+/* Default value to be passed as aamix argument for snd_hda_activate_path();</div><div class='add'>+ * used for output paths</div><div class='add'>+ */</div><div class='add'>+static bool aamix_default(struct hda_gen_spec *spec)</div><div class='add'>+{</div><div class='add'>+	return !spec-&gt;have_aamix_ctl || spec-&gt;aamix_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_multi_io(struct hda_codec *codec, int idx, bool output)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid = spec-&gt;multi_io[idx].pin;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	path = get_multiio_path(codec, idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (path-&gt;active == output)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (output) {</div><div class='add'>+		set_pin_target(codec, nid, PIN_OUT, true);</div><div class='add'>+		snd_hda_activate_path(codec, path, true, aamix_default(spec));</div><div class='add'>+		set_pin_eapd(codec, nid, true);</div><div class='add'>+	} else {</div><div class='add'>+		set_pin_eapd(codec, nid, false);</div><div class='add'>+		snd_hda_activate_path(codec, path, false, aamix_default(spec));</div><div class='add'>+		set_pin_target(codec, nid, spec-&gt;multi_io[idx].ctl_in, true);</div><div class='add'>+		path_power_down_sync(codec, path);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update jack retasking in case it modifies any of them */</div><div class='add'>+	update_automute_all(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ch_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+		       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, ch;</div><div class='add'>+</div><div class='add'>+	ch = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (ch &lt; 0 || ch &gt; spec-&gt;multi_ios)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (ch == (spec-&gt;ext_channel_count - spec-&gt;min_channel_count) / 2)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;ext_channel_count = ch * 2 + spec-&gt;min_channel_count;</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;multi_ios; i++)</div><div class='add'>+		set_multi_io(codec, i, i &lt; ch);</div><div class='add'>+	spec-&gt;multiout.max_channels = max(spec-&gt;ext_channel_count,</div><div class='add'>+					  spec-&gt;const_channel_count);</div><div class='add'>+	if (spec-&gt;need_dac_fix)</div><div class='add'>+		spec-&gt;multiout.num_dacs = spec-&gt;multiout.max_channels / 2;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new channel_mode_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Channel Mode",</div><div class='add'>+	.info = ch_mode_info,</div><div class='add'>+	.get = ch_mode_get,</div><div class='add'>+	.put = ch_mode_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_multi_channel_mode(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multi_ios &gt; 0) {</div><div class='add'>+		if (!snd_hda_gen_add_kctl(spec, NULL, &amp;channel_mode_enum))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * aamix loopback enable/disable switch</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define loopback_mixing_info	indep_hp_info</div><div class='add'>+</div><div class='add'>+static int loopback_mixing_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;aamix_mode;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void update_aamix_paths(struct hda_codec *codec, bool do_mix,</div><div class='add'>+			       int nomix_path_idx, int mix_path_idx,</div><div class='add'>+			       int out_type)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *nomix_path, *mix_path;</div><div class='add'>+</div><div class='add'>+	nomix_path = snd_hda_get_path_from_idx(codec, nomix_path_idx);</div><div class='add'>+	mix_path = snd_hda_get_path_from_idx(codec, mix_path_idx);</div><div class='add'>+	if (!nomix_path || !mix_path)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* if HP aamix path is driven from a different DAC and the</div><div class='add'>+	 * independent HP mode is ON, can't turn on aamix path</div><div class='add'>+	 */</div><div class='add'>+	if (out_type == AUTO_PIN_HP_OUT &amp;&amp; spec-&gt;indep_hp_enabled &amp;&amp;</div><div class='add'>+	    mix_path-&gt;path[0] != spec-&gt;alt_dac_nid)</div><div class='add'>+		do_mix = false;</div><div class='add'>+</div><div class='add'>+	if (do_mix) {</div><div class='add'>+		snd_hda_activate_path(codec, nomix_path, false, true);</div><div class='add'>+		snd_hda_activate_path(codec, mix_path, true, true);</div><div class='add'>+		path_power_down_sync(codec, nomix_path);</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_activate_path(codec, mix_path, false, false);</div><div class='add'>+		snd_hda_activate_path(codec, nomix_path, true, false);</div><div class='add'>+		path_power_down_sync(codec, mix_path);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* re-initialize the output paths; only called from loopback_mixing_put() */</div><div class='add'>+static void update_output_paths(struct hda_codec *codec, int num_outs,</div><div class='add'>+				const int *paths)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_outs; i++) {</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, paths[i]);</div><div class='add'>+		if (path)</div><div class='add'>+			snd_hda_activate_path(codec, path, path-&gt;active,</div><div class='add'>+					      spec-&gt;aamix_mode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int loopback_mixing_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+</div><div class='add'>+	if (val == spec-&gt;aamix_mode)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;aamix_mode = val;</div><div class='add'>+	if (has_aamix_out_paths(spec)) {</div><div class='add'>+		update_aamix_paths(codec, val, spec-&gt;out_paths[0],</div><div class='add'>+				   spec-&gt;aamix_out_paths[0],</div><div class='add'>+				   cfg-&gt;line_out_type);</div><div class='add'>+		update_aamix_paths(codec, val, spec-&gt;hp_paths[0],</div><div class='add'>+				   spec-&gt;aamix_out_paths[1],</div><div class='add'>+				   AUTO_PIN_HP_OUT);</div><div class='add'>+		update_aamix_paths(codec, val, spec-&gt;speaker_paths[0],</div><div class='add'>+				   spec-&gt;aamix_out_paths[2],</div><div class='add'>+				   AUTO_PIN_SPEAKER_OUT);</div><div class='add'>+	} else {</div><div class='add'>+		update_output_paths(codec, cfg-&gt;line_outs, spec-&gt;out_paths);</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+			update_output_paths(codec, cfg-&gt;hp_outs, spec-&gt;hp_paths);</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+			update_output_paths(codec, cfg-&gt;speaker_outs,</div><div class='add'>+					    spec-&gt;speaker_paths);</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new loopback_mixing_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Loopback Mixing",</div><div class='add'>+	.info = loopback_mixing_info,</div><div class='add'>+	.get = loopback_mixing_get,</div><div class='add'>+	.put = loopback_mixing_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_loopback_mixing_ctl(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;mixer_nid)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!snd_hda_gen_add_kctl(spec, NULL, &amp;loopback_mixing_enum))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec-&gt;have_aamix_ctl = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * shared headphone/mic handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void call_update_outputs(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+/* for shared I/O, change the pin-control accordingly */</div><div class='add'>+static void update_hp_mic(struct hda_codec *codec, int adc_mux, bool force)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool as_mic;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	hda_nid_t pin;</div><div class='add'>+</div><div class='add'>+	pin = spec-&gt;hp_mic_pin;</div><div class='add'>+	as_mic = spec-&gt;cur_mux[adc_mux] == spec-&gt;hp_mic_mux_idx;</div><div class='add'>+</div><div class='add'>+	if (!force) {</div><div class='add'>+		val = snd_hda_codec_get_pin_target(codec, pin);</div><div class='add'>+		if (as_mic) {</div><div class='add'>+			if (val &amp; PIN_IN)</div><div class='add'>+				return;</div><div class='add'>+		} else {</div><div class='add'>+			if (val &amp; PIN_OUT)</div><div class='add'>+				return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = snd_hda_get_default_vref(codec, pin);</div><div class='add'>+	/* if the HP pin doesn't support VREF and the codec driver gives an</div><div class='add'>+	 * alternative pin, set up the VREF on that pin instead</div><div class='add'>+	 */</div><div class='add'>+	if (val == AC_PINCTL_VREF_HIZ &amp;&amp; spec-&gt;shared_mic_vref_pin) {</div><div class='add'>+		const hda_nid_t vref_pin = spec-&gt;shared_mic_vref_pin;</div><div class='add'>+		unsigned int vref_val = snd_hda_get_default_vref(codec, vref_pin);</div><div class='add'>+		if (vref_val != AC_PINCTL_VREF_HIZ)</div><div class='add'>+			snd_hda_set_pin_ctl_cache(codec, vref_pin,</div><div class='add'>+						  PIN_IN | (as_mic ? vref_val : 0));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;hp_mic_jack_modes) {</div><div class='add'>+		if (as_mic)</div><div class='add'>+			val |= PIN_IN;</div><div class='add'>+		else</div><div class='add'>+			val = PIN_HP;</div><div class='add'>+		set_pin_target(codec, pin, val, true);</div><div class='add'>+		call_hp_automute(codec, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create a shared input with the headphone out */</div><div class='add'>+static int create_hp_mic(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int defcfg;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;hp_mic) {</div><div class='add'>+		if (spec-&gt;suppress_hp_mic_detect)</div><div class='add'>+			return 0;</div><div class='add'>+		/* automatic detection: only if no input or a single internal</div><div class='add'>+		 * input pin is found, try to detect the shared hp/mic</div><div class='add'>+		 */</div><div class='add'>+		if (cfg-&gt;num_inputs &gt; 1)</div><div class='add'>+			return 0;</div><div class='add'>+		else if (cfg-&gt;num_inputs == 1) {</div><div class='add'>+			defcfg = snd_hda_codec_get_pincfg(codec, cfg-&gt;inputs[0].pin);</div><div class='add'>+			if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT)</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;hp_mic = 0; /* clear once */</div><div class='add'>+	if (cfg-&gt;num_inputs &gt;= AUTO_CFG_MAX_INS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nid = 0;</div><div class='add'>+	if (cfg-&gt;line_out_type == AUTO_PIN_HP_OUT &amp;&amp; cfg-&gt;line_outs &gt; 0)</div><div class='add'>+		nid = cfg-&gt;line_out_pins[0];</div><div class='add'>+	else if (cfg-&gt;hp_outs &gt; 0)</div><div class='add'>+		nid = cfg-&gt;hp_pins[0];</div><div class='add'>+	if (!nid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_IN))</div><div class='add'>+		return 0; /* no input */</div><div class='add'>+</div><div class='add'>+	cfg-&gt;inputs[cfg-&gt;num_inputs].pin = nid;</div><div class='add'>+	cfg-&gt;inputs[cfg-&gt;num_inputs].type = AUTO_PIN_MIC;</div><div class='add'>+	cfg-&gt;inputs[cfg-&gt;num_inputs].is_headphone_mic = 1;</div><div class='add'>+	cfg-&gt;num_inputs++;</div><div class='add'>+	spec-&gt;hp_mic = 1;</div><div class='add'>+	spec-&gt;hp_mic_pin = nid;</div><div class='add'>+	/* we can't handle auto-mic together with HP-mic */</div><div class='add'>+	spec-&gt;suppress_auto_mic = 1;</div><div class='add'>+	codec_dbg(codec, "Enable shared I/O jack on NID 0x%x\n", nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * output jack mode</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int create_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t pin);</div><div class='add'>+</div><div class='add'>+static const char * const out_jack_texts[] = {</div><div class='add'>+	"Line Out", "Headphone Out",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int out_jack_mode_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_enum_helper_info(kcontrol, uinfo, 2, out_jack_texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int out_jack_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	if (snd_hda_codec_get_pin_target(codec, nid) == PIN_HP)</div><div class='add'>+		ucontrol-&gt;value.enumerated.item[0] = 1;</div><div class='add'>+	else</div><div class='add'>+		ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int out_jack_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = ucontrol-&gt;value.enumerated.item[0] ? PIN_HP : PIN_OUT;</div><div class='add'>+	if (snd_hda_codec_get_pin_target(codec, nid) == val)</div><div class='add'>+		return 0;</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, nid, val);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new out_jack_mode_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = out_jack_mode_info,</div><div class='add'>+	.get = out_jack_mode_get,</div><div class='add'>+	.put = out_jack_mode_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool find_kctl_name(struct hda_codec *codec, const char *name, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct snd_kcontrol_new *kctl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;kctls, i, kctl) {</div><div class='add'>+		if (!strcmp(kctl-&gt;name, name) &amp;&amp; kctl-&gt;index == idx)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void get_jack_mode_name(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			       char *name, size_t name_len)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	snd_hda_get_pin_label(codec, pin, &amp;spec-&gt;autocfg, name, name_len, &amp;idx);</div><div class='add'>+	strlcat(name, " Jack Mode", name_len);</div><div class='add'>+</div><div class='add'>+	for (; find_kctl_name(codec, name, idx); idx++)</div><div class='add'>+		;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_out_jack_num_items(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;add_jack_modes) {</div><div class='add'>+		unsigned int pincap = snd_hda_query_pin_caps(codec, pin);</div><div class='add'>+		if ((pincap &amp; AC_PINCAP_OUT) &amp;&amp; (pincap &amp; AC_PINCAP_HP_DRV))</div><div class='add'>+			return 2;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_out_jack_modes(struct hda_codec *codec, int num_pins,</div><div class='add'>+				 hda_nid_t *pins)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		hda_nid_t pin = pins[i];</div><div class='add'>+		if (pin == spec-&gt;hp_mic_pin)</div><div class='add'>+			continue;</div><div class='add'>+		if (get_out_jack_num_items(codec, pin) &gt; 1) {</div><div class='add'>+			struct snd_kcontrol_new *knew;</div><div class='add'>+			char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+			get_jack_mode_name(codec, pin, name, sizeof(name));</div><div class='add'>+			knew = snd_hda_gen_add_kctl(spec, name,</div><div class='add'>+						    &amp;out_jack_mode_enum);</div><div class='add'>+			if (!knew)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			knew-&gt;private_value = pin;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * input jack mode</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* from AC_PINCTL_VREF_HIZ to AC_PINCTL_VREF_100 */</div><div class='add'>+#define NUM_VREFS	6</div><div class='add'>+</div><div class='add'>+static const char * const vref_texts[NUM_VREFS] = {</div><div class='add'>+	"Line In", "Mic 50pc Bias", "Mic 0V Bias",</div><div class='add'>+	"", "Mic 80pc Bias", "Mic 100pc Bias"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned int get_vref_caps(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int pincap;</div><div class='add'>+</div><div class='add'>+	pincap = snd_hda_query_pin_caps(codec, pin);</div><div class='add'>+	pincap = (pincap &amp; AC_PINCAP_VREF) &gt;&gt; AC_PINCAP_VREF_SHIFT;</div><div class='add'>+	/* filter out unusual vrefs */</div><div class='add'>+	pincap &amp;= ~(AC_PINCAP_VREF_GRD | AC_PINCAP_VREF_100);</div><div class='add'>+	return pincap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert from the enum item index to the vref ctl index (0=HIZ, 1=50%...) */</div><div class='add'>+static int get_vref_idx(unsigned int vref_caps, unsigned int item_idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, n = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_VREFS; i++) {</div><div class='add'>+		if (vref_caps &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			if (n == item_idx)</div><div class='add'>+				return i;</div><div class='add'>+			n++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert back from the vref ctl index to the enum item index */</div><div class='add'>+static int cvt_from_vref_idx(unsigned int vref_caps, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, n = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_VREFS; i++) {</div><div class='add'>+		if (i == idx)</div><div class='add'>+			return n;</div><div class='add'>+		if (vref_caps &amp; (1 &lt;&lt; i))</div><div class='add'>+			n++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_jack_mode_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+</div><div class='add'>+	snd_hda_enum_helper_info(kcontrol, uinfo, hweight32(vref_caps),</div><div class='add'>+				 vref_texts);</div><div class='add'>+	/* set the right text */</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+	       vref_texts[get_vref_idx(vref_caps, uinfo-&gt;value.enumerated.item)]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_jack_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	idx = snd_hda_codec_get_pin_target(codec, nid) &amp; AC_PINCTL_VREFEN;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = cvt_from_vref_idx(vref_caps, idx);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int in_jack_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+	unsigned int val, idx;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_codec_get_pin_target(codec, nid);</div><div class='add'>+	idx = cvt_from_vref_idx(vref_caps, val &amp; AC_PINCTL_VREFEN);</div><div class='add'>+	if (idx == ucontrol-&gt;value.enumerated.item[0])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~AC_PINCTL_VREFEN;</div><div class='add'>+	val |= get_vref_idx(vref_caps, ucontrol-&gt;value.enumerated.item[0]);</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, nid, val);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new in_jack_mode_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = in_jack_mode_info,</div><div class='add'>+	.get = in_jack_mode_get,</div><div class='add'>+	.put = in_jack_mode_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_in_jack_num_items(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int nitems = 0;</div><div class='add'>+	if (spec-&gt;add_jack_modes)</div><div class='add'>+		nitems = hweight32(get_vref_caps(codec, pin));</div><div class='add'>+	return nitems ? nitems : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	unsigned int defcfg;</div><div class='add'>+</div><div class='add'>+	if (pin == spec-&gt;hp_mic_pin)</div><div class='add'>+		return 0; /* already done in create_out_jack_mode() */</div><div class='add'>+</div><div class='add'>+	/* no jack mode for fixed pins */</div><div class='add'>+	defcfg = snd_hda_codec_get_pincfg(codec, pin);</div><div class='add'>+	if (snd_hda_get_input_pin_attr(defcfg) == INPUT_PIN_ATTR_INT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* no multiple vref caps? */</div><div class='add'>+	if (get_in_jack_num_items(codec, pin) &lt;= 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	get_jack_mode_name(codec, pin, name, sizeof(name));</div><div class='add'>+	knew = snd_hda_gen_add_kctl(spec, name, &amp;in_jack_mode_enum);</div><div class='add'>+	if (!knew)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	knew-&gt;private_value = pin;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HP/mic shared jack mode</div><div class='add'>+ */</div><div class='add'>+static int hp_mic_jack_mode_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	int out_jacks = get_out_jack_num_items(codec, nid);</div><div class='add'>+	int in_jacks = get_in_jack_num_items(codec, nid);</div><div class='add'>+	const char *text = NULL;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = out_jacks + in_jacks;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='add'>+	idx = uinfo-&gt;value.enumerated.item;</div><div class='add'>+	if (idx &lt; out_jacks) {</div><div class='add'>+		if (out_jacks &gt; 1)</div><div class='add'>+			text = out_jack_texts[idx];</div><div class='add'>+		else</div><div class='add'>+			text = "Headphone Out";</div><div class='add'>+	} else {</div><div class='add'>+		idx -= out_jacks;</div><div class='add'>+		if (in_jacks &gt; 1) {</div><div class='add'>+			unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+			text = vref_texts[get_vref_idx(vref_caps, idx)];</div><div class='add'>+		} else</div><div class='add'>+			text = "Mic In";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, text);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_cur_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	int out_jacks = get_out_jack_num_items(codec, nid);</div><div class='add'>+	int in_jacks = get_in_jack_num_items(codec, nid);</div><div class='add'>+	unsigned int val = snd_hda_codec_get_pin_target(codec, nid);</div><div class='add'>+	int idx = 0;</div><div class='add'>+</div><div class='add'>+	if (val &amp; PIN_OUT) {</div><div class='add'>+		if (out_jacks &gt; 1 &amp;&amp; val == PIN_HP)</div><div class='add'>+			idx = 1;</div><div class='add'>+	} else if (val &amp; PIN_IN) {</div><div class='add'>+		idx = out_jacks;</div><div class='add'>+		if (in_jacks &gt; 1) {</div><div class='add'>+			unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+			val &amp;= AC_PINCTL_VREFEN;</div><div class='add'>+			idx += cvt_from_vref_idx(vref_caps, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hp_mic_jack_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] =</div><div class='add'>+		get_cur_hp_mic_jack_mode(codec, nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	int out_jacks = get_out_jack_num_items(codec, nid);</div><div class='add'>+	int in_jacks = get_in_jack_num_items(codec, nid);</div><div class='add'>+	unsigned int val, oldval, idx;</div><div class='add'>+</div><div class='add'>+	oldval = get_cur_hp_mic_jack_mode(codec, nid);</div><div class='add'>+	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (oldval == idx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (idx &lt; out_jacks) {</div><div class='add'>+		if (out_jacks &gt; 1)</div><div class='add'>+			val = idx ? PIN_HP : PIN_OUT;</div><div class='add'>+		else</div><div class='add'>+			val = PIN_HP;</div><div class='add'>+	} else {</div><div class='add'>+		idx -= out_jacks;</div><div class='add'>+		if (in_jacks &gt; 1) {</div><div class='add'>+			unsigned int vref_caps = get_vref_caps(codec, nid);</div><div class='add'>+			val = snd_hda_codec_get_pin_target(codec, nid);</div><div class='add'>+			val &amp;= ~(AC_PINCTL_VREFEN | PIN_HP);</div><div class='add'>+			val |= get_vref_idx(vref_caps, idx) | PIN_IN;</div><div class='add'>+		} else</div><div class='add'>+			val = snd_hda_get_default_vref(codec, nid) | PIN_IN;</div><div class='add'>+	}</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, nid, val);</div><div class='add'>+	call_hp_automute(codec, NULL);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new hp_mic_jack_mode_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = hp_mic_jack_mode_info,</div><div class='add'>+	.get = hp_mic_jack_mode_get,</div><div class='add'>+	.put = hp_mic_jack_mode_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+</div><div class='add'>+	knew = snd_hda_gen_add_kctl(spec, "Headphone Mic Jack Mode",</div><div class='add'>+				    &amp;hp_mic_jack_mode_enum);</div><div class='add'>+	if (!knew)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	knew-&gt;private_value = pin;</div><div class='add'>+	spec-&gt;hp_mic_jack_modes = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse input paths</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* add the powersave loopback-list entry */</div><div class='add'>+static int add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_amp_list *list;</div><div class='add'>+</div><div class='add'>+	list = snd_array_new(&amp;spec-&gt;loopback_list);</div><div class='add'>+	if (!list)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	list-&gt;nid = mix;</div><div class='add'>+	list-&gt;dir = HDA_INPUT;</div><div class='add'>+	list-&gt;idx = idx;</div><div class='add'>+	spec-&gt;loopback.amplist = spec-&gt;loopback_list.list;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return true if either a volume or a mute amp is found for the given</div><div class='add'>+ * aamix path; the amp has to be either in the mixer node or its direct leaf</div><div class='add'>+ */</div><div class='add'>+static bool look_for_mix_leaf_ctls(struct hda_codec *codec, hda_nid_t mix_nid,</div><div class='add'>+				   hda_nid_t pin, unsigned int *mix_val,</div><div class='add'>+				   unsigned int *mute_val)</div><div class='add'>+{</div><div class='add'>+	int idx, num_conns;</div><div class='add'>+	const hda_nid_t *list;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	idx = snd_hda_get_conn_index(codec, mix_nid, pin, true);</div><div class='add'>+	if (idx &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*mix_val = *mute_val = 0;</div><div class='add'>+	if (nid_has_volume(codec, mix_nid, HDA_INPUT))</div><div class='add'>+		*mix_val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT);</div><div class='add'>+	if (nid_has_mute(codec, mix_nid, HDA_INPUT))</div><div class='add'>+		*mute_val = HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT);</div><div class='add'>+	if (*mix_val &amp;&amp; *mute_val)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* check leaf node */</div><div class='add'>+	num_conns = snd_hda_get_conn_list(codec, mix_nid, &amp;list);</div><div class='add'>+	if (num_conns &lt; idx)</div><div class='add'>+		return false;</div><div class='add'>+	nid = list[idx];</div><div class='add'>+	if (!*mix_val &amp;&amp; nid_has_volume(codec, nid, HDA_OUTPUT) &amp;&amp;</div><div class='add'>+	    !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_VOL_CTL))</div><div class='add'>+		*mix_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+	if (!*mute_val &amp;&amp; nid_has_mute(codec, nid, HDA_OUTPUT) &amp;&amp;</div><div class='add'>+	    !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_MUTE_CTL))</div><div class='add'>+		*mute_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+	return *mix_val || *mute_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create input playback/capture controls for the given pin */</div><div class='add'>+static int new_analog_input(struct hda_codec *codec, int input_idx,</div><div class='add'>+			    hda_nid_t pin, const char *ctlname, int ctlidx,</div><div class='add'>+			    hda_nid_t mix_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	unsigned int mix_val, mute_val;</div><div class='add'>+	int err, idx;</div><div class='add'>+</div><div class='add'>+	if (!look_for_mix_leaf_ctls(codec, mix_nid, pin, &amp;mix_val, &amp;mute_val))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	path = snd_hda_add_new_path(codec, pin, mix_nid, 0);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	print_nid_path(codec, "loopback", path);</div><div class='add'>+	spec-&gt;loopback_paths[input_idx] = snd_hda_get_path_idx(codec, path);</div><div class='add'>+</div><div class='add'>+	idx = path-&gt;idx[path-&gt;depth - 1];</div><div class='add'>+	if (mix_val) {</div><div class='add'>+		err = __add_pb_vol_ctrl(spec, HDA_CTL_WIDGET_VOL, ctlname, ctlidx, mix_val);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		path-&gt;ctls[NID_PATH_VOL_CTL] = mix_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mute_val) {</div><div class='add'>+		err = __add_pb_sw_ctrl(spec, HDA_CTL_WIDGET_MUTE, ctlname, ctlidx, mute_val);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		path-&gt;ctls[NID_PATH_MUTE_CTL] = mute_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	path-&gt;active = true;</div><div class='add'>+	path-&gt;stream_enabled = true; /* no DAC/ADC involved */</div><div class='add'>+	err = add_loopback_list(spec, mix_nid, idx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;mixer_nid != spec-&gt;mixer_merge_nid &amp;&amp;</div><div class='add'>+	    !spec-&gt;loopback_merge_path) {</div><div class='add'>+		path = snd_hda_add_new_path(codec, spec-&gt;mixer_nid,</div><div class='add'>+					    spec-&gt;mixer_merge_nid, 0);</div><div class='add'>+		if (path) {</div><div class='add'>+			print_nid_path(codec, "loopback-merge", path);</div><div class='add'>+			path-&gt;active = true;</div><div class='add'>+			path-&gt;pin_fixed = true; /* static route */</div><div class='add'>+			path-&gt;stream_enabled = true; /* no DAC/ADC involved */</div><div class='add'>+			spec-&gt;loopback_merge_path =</div><div class='add'>+				snd_hda_get_path_idx(codec, path);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_input_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='add'>+	return (pincap &amp; AC_PINCAP_IN) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Parse the codec tree and retrieve ADCs */</div><div class='add'>+static int fill_adc_nids(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	hda_nid_t *adc_nids = spec-&gt;adc_nids;</div><div class='add'>+	int max_nums = ARRAY_SIZE(spec-&gt;adc_nids);</div><div class='add'>+	int nums = 0;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int caps = get_wcaps(codec, nid);</div><div class='add'>+		int type = get_wcaps_type(caps);</div><div class='add'>+</div><div class='add'>+		if (type != AC_WID_AUD_IN || (caps &amp; AC_WCAP_DIGITAL))</div><div class='add'>+			continue;</div><div class='add'>+		adc_nids[nums] = nid;</div><div class='add'>+		if (++nums &gt;= max_nums)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	spec-&gt;num_adc_nids = nums;</div><div class='add'>+</div><div class='add'>+	/* copy the detected ADCs to all_adcs[] */</div><div class='add'>+	spec-&gt;num_all_adcs = nums;</div><div class='add'>+	memcpy(spec-&gt;all_adcs, spec-&gt;adc_nids, nums * sizeof(hda_nid_t));</div><div class='add'>+</div><div class='add'>+	return nums;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* filter out invalid adc_nids that don't give all active input pins;</div><div class='add'>+ * if needed, check whether dynamic ADC-switching is available</div><div class='add'>+ */</div><div class='add'>+static int check_dyn_adc_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	unsigned int ok_bits;</div><div class='add'>+	int i, n, nums;</div><div class='add'>+</div><div class='add'>+	nums = 0;</div><div class='add'>+	ok_bits = 0;</div><div class='add'>+	for (n = 0; n &lt; spec-&gt;num_adc_nids; n++) {</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			if (!spec-&gt;input_paths[i][n])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i &gt;= imux-&gt;num_items) {</div><div class='add'>+			ok_bits |= (1 &lt;&lt; n);</div><div class='add'>+			nums++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ok_bits) {</div><div class='add'>+		/* check whether ADC-switch is possible */</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			for (n = 0; n &lt; spec-&gt;num_adc_nids; n++) {</div><div class='add'>+				if (spec-&gt;input_paths[i][n]) {</div><div class='add'>+					spec-&gt;dyn_adc_idx[i] = n;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "enabling ADC switching\n");</div><div class='add'>+		spec-&gt;dyn_adc_switch = 1;</div><div class='add'>+	} else if (nums != spec-&gt;num_adc_nids) {</div><div class='add'>+		/* shrink the invalid adcs and input paths */</div><div class='add'>+		nums = 0;</div><div class='add'>+		for (n = 0; n &lt; spec-&gt;num_adc_nids; n++) {</div><div class='add'>+			if (!(ok_bits &amp; (1 &lt;&lt; n)))</div><div class='add'>+				continue;</div><div class='add'>+			if (n != nums) {</div><div class='add'>+				spec-&gt;adc_nids[nums] = spec-&gt;adc_nids[n];</div><div class='add'>+				for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+					invalidate_nid_path(codec,</div><div class='add'>+						spec-&gt;input_paths[i][nums]);</div><div class='add'>+					spec-&gt;input_paths[i][nums] =</div><div class='add'>+						spec-&gt;input_paths[i][n];</div><div class='add'>+					spec-&gt;input_paths[i][n] = 0;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			nums++;</div><div class='add'>+		}</div><div class='add'>+		spec-&gt;num_adc_nids = nums;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (imux-&gt;num_items == 1 ||</div><div class='add'>+	    (imux-&gt;num_items == 2 &amp;&amp; spec-&gt;hp_mic)) {</div><div class='add'>+		codec_dbg(codec, "reducing to a single ADC\n");</div><div class='add'>+		spec-&gt;num_adc_nids = 1; /* reduce to a single ADC */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* single index for individual volumes ctls */</div><div class='add'>+	if (!spec-&gt;dyn_adc_switch &amp;&amp; spec-&gt;multi_cap_vol)</div><div class='add'>+		spec-&gt;num_adc_nids = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse capture source paths from the given pin and create imux items */</div><div class='add'>+static int parse_capture_source(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+				int cfg_idx, int num_adcs,</div><div class='add'>+				const char *label, int anchor)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	int imux_idx = imux-&gt;num_items;</div><div class='add'>+	bool imux_added = false;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; num_adcs; c++) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		hda_nid_t adc = spec-&gt;adc_nids[c];</div><div class='add'>+</div><div class='add'>+		if (!is_reachable_path(codec, pin, adc))</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_hda_add_new_path(codec, pin, adc, anchor);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+		print_nid_path(codec, "input", path);</div><div class='add'>+		spec-&gt;input_paths[imux_idx][c] =</div><div class='add'>+			snd_hda_get_path_idx(codec, path);</div><div class='add'>+</div><div class='add'>+		if (!imux_added) {</div><div class='add'>+			if (spec-&gt;hp_mic_pin == pin)</div><div class='add'>+				spec-&gt;hp_mic_mux_idx = imux-&gt;num_items;</div><div class='add'>+			spec-&gt;imux_pins[imux-&gt;num_items] = pin;</div><div class='add'>+			snd_hda_add_imux_item(codec, imux, label, cfg_idx, NULL);</div><div class='add'>+			imux_added = true;</div><div class='add'>+			if (spec-&gt;dyn_adc_switch)</div><div class='add'>+				spec-&gt;dyn_adc_idx[imux_idx] = c;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * create playback/capture controls for input pins</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* fill the label for each input at first */</div><div class='add'>+static int fill_input_pin_labels(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		hda_nid_t pin = cfg-&gt;inputs[i].pin;</div><div class='add'>+		const char *label;</div><div class='add'>+		int j, idx;</div><div class='add'>+</div><div class='add'>+		if (!is_input_pin(codec, pin))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='add'>+		idx = 0;</div><div class='add'>+		for (j = i - 1; j &gt;= 0; j--) {</div><div class='add'>+			if (spec-&gt;input_labels[j] &amp;&amp;</div><div class='add'>+			    !strcmp(spec-&gt;input_labels[j], label)) {</div><div class='add'>+				idx = spec-&gt;input_label_idxs[j] + 1;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spec-&gt;input_labels[i] = label;</div><div class='add'>+		spec-&gt;input_label_idxs[i] = idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CFG_IDX_MIX	99	/* a dummy cfg-&gt;input idx for stereo mix */</div><div class='add'>+</div><div class='add'>+static int create_input_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	hda_nid_t mixer = spec-&gt;mixer_nid;</div><div class='add'>+	int num_adcs;</div><div class='add'>+	int i, err;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	num_adcs = fill_adc_nids(codec);</div><div class='add'>+	if (num_adcs &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = fill_input_pin_labels(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		hda_nid_t pin;</div><div class='add'>+</div><div class='add'>+		pin = cfg-&gt;inputs[i].pin;</div><div class='add'>+		if (!is_input_pin(codec, pin))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		val = PIN_IN;</div><div class='add'>+		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC)</div><div class='add'>+			val |= snd_hda_get_default_vref(codec, pin);</div><div class='add'>+		if (pin != spec-&gt;hp_mic_pin &amp;&amp;</div><div class='add'>+		    !snd_hda_codec_get_pin_target(codec, pin))</div><div class='add'>+			set_pin_target(codec, pin, val, false);</div><div class='add'>+</div><div class='add'>+		if (mixer) {</div><div class='add'>+			if (is_reachable_path(codec, pin, mixer)) {</div><div class='add'>+				err = new_analog_input(codec, i, pin,</div><div class='add'>+						       spec-&gt;input_labels[i],</div><div class='add'>+						       spec-&gt;input_label_idxs[i],</div><div class='add'>+						       mixer);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = parse_capture_source(codec, pin, i, num_adcs,</div><div class='add'>+					   spec-&gt;input_labels[i], -mixer);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;add_jack_modes) {</div><div class='add'>+			err = create_in_jack_mode(codec, pin);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add stereo mix when explicitly enabled via hint */</div><div class='add'>+	if (mixer &amp;&amp; spec-&gt;add_stereo_mix_input == HDA_HINT_STEREO_MIX_ENABLE) {</div><div class='add'>+		err = parse_capture_source(codec, mixer, CFG_IDX_MIX, num_adcs,</div><div class='add'>+					   "Stereo Mix", 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;suppress_auto_mic = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * input source mux</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* get the input path specified by the given adc and imux indices */</div><div class='add'>+static struct nid_path *get_input_path(struct hda_codec *codec, int adc_idx, int imux_idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (imux_idx &lt; 0 || imux_idx &gt;= HDA_MAX_NUM_INPUTS) {</div><div class='add'>+		snd_BUG();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;dyn_adc_switch)</div><div class='add'>+		adc_idx = spec-&gt;dyn_adc_idx[imux_idx];</div><div class='add'>+	if (adc_idx &lt; 0 || adc_idx &gt;= AUTO_CFG_MAX_INS) {</div><div class='add'>+		snd_BUG();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	return snd_hda_get_path_from_idx(codec, spec-&gt;input_paths[imux_idx][adc_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mux_select(struct hda_codec *codec, unsigned int adc_idx,</div><div class='add'>+		      unsigned int idx);</div><div class='add'>+</div><div class='add'>+static int mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			 struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_input_mux_info(&amp;spec-&gt;input_mux, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	/* the ctls are created at once with multiple counts */</div><div class='add'>+	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+	return mux_select(codec, adc_idx,</div><div class='add'>+			  ucontrol-&gt;value.enumerated.item[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new cap_src_temp = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Input Source",</div><div class='add'>+	.info = mux_enum_info,</div><div class='add'>+	.get = mux_enum_get,</div><div class='add'>+	.put = mux_enum_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * capture volume and capture switch ctls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+typedef int (*put_call_t)(struct snd_kcontrol *kcontrol,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+</div><div class='add'>+/* call the given amp update function for all amps in the imux list at once */</div><div class='add'>+static int cap_put_caller(struct snd_kcontrol *kcontrol,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol,</div><div class='add'>+			  put_call_t func, int type)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct hda_input_mux *imux;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i, adc_idx, ret, err = 0;</div><div class='add'>+</div><div class='add'>+	imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	adc_idx = kcontrol-&gt;id.index;</div><div class='add'>+	scoped_guard(mutex, &amp;codec-&gt;control_mutex) {</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			path = get_input_path(codec, adc_idx, i);</div><div class='add'>+			if (!path || !path-&gt;ctls[type])</div><div class='add'>+				continue;</div><div class='add'>+			kcontrol-&gt;private_value = path-&gt;ctls[type];</div><div class='add'>+			ret = func(kcontrol, ucontrol);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+			if (ret &gt; 0)</div><div class='add'>+				err = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;cap_sync_hook)</div><div class='add'>+		spec-&gt;cap_sync_hook(codec, kcontrol, ucontrol);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* capture volume ctl callbacks */</div><div class='add'>+#define cap_vol_info		snd_hda_mixer_amp_volume_info</div><div class='add'>+#define cap_vol_get		snd_hda_mixer_amp_volume_get</div><div class='add'>+#define cap_vol_tlv		snd_hda_mixer_amp_tlv</div><div class='add'>+</div><div class='add'>+static int cap_vol_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+		       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	return cap_put_caller(kcontrol, ucontrol,</div><div class='add'>+			      snd_hda_mixer_amp_volume_put,</div><div class='add'>+			      NID_PATH_VOL_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new cap_vol_temp = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Capture Volume",</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_READ |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK),</div><div class='add'>+	.info = cap_vol_info,</div><div class='add'>+	.get = cap_vol_get,</div><div class='add'>+	.put = cap_vol_put,</div><div class='add'>+	.tlv = { .c = cap_vol_tlv },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* capture switch ctl callbacks */</div><div class='add'>+#define cap_sw_info		snd_ctl_boolean_stereo_info</div><div class='add'>+#define cap_sw_get		snd_hda_mixer_amp_switch_get</div><div class='add'>+</div><div class='add'>+static int cap_sw_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+		      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	return cap_put_caller(kcontrol, ucontrol,</div><div class='add'>+			      snd_hda_mixer_amp_switch_put,</div><div class='add'>+			      NID_PATH_MUTE_CTL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new cap_sw_temp = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Capture Switch",</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info = cap_sw_info,</div><div class='add'>+	.get = cap_sw_get,</div><div class='add'>+	.put = cap_sw_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int parse_capvol_in_path(struct hda_codec *codec, struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int i, depth;</div><div class='add'>+</div><div class='add'>+	path-&gt;ctls[NID_PATH_VOL_CTL] = path-&gt;ctls[NID_PATH_MUTE_CTL] = 0;</div><div class='add'>+	for (depth = 0; depth &lt; 3; depth++) {</div><div class='add'>+		if (depth &gt;= path-&gt;depth)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		i = path-&gt;depth - depth - 1;</div><div class='add'>+		nid = path-&gt;path[i];</div><div class='add'>+		if (!path-&gt;ctls[NID_PATH_VOL_CTL]) {</div><div class='add'>+			if (nid_has_volume(codec, nid, HDA_OUTPUT))</div><div class='add'>+				path-&gt;ctls[NID_PATH_VOL_CTL] =</div><div class='add'>+					HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+			else if (nid_has_volume(codec, nid, HDA_INPUT)) {</div><div class='add'>+				int idx = path-&gt;idx[i];</div><div class='add'>+				if (!depth &amp;&amp; codec-&gt;single_adc_amp)</div><div class='add'>+					idx = 0;</div><div class='add'>+				path-&gt;ctls[NID_PATH_VOL_CTL] =</div><div class='add'>+					HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_INPUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!path-&gt;ctls[NID_PATH_MUTE_CTL]) {</div><div class='add'>+			if (nid_has_mute(codec, nid, HDA_OUTPUT))</div><div class='add'>+				path-&gt;ctls[NID_PATH_MUTE_CTL] =</div><div class='add'>+					HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+			else if (nid_has_mute(codec, nid, HDA_INPUT)) {</div><div class='add'>+				int idx = path-&gt;idx[i];</div><div class='add'>+				if (!depth &amp;&amp; codec-&gt;single_adc_amp)</div><div class='add'>+					idx = 0;</div><div class='add'>+				path-&gt;ctls[NID_PATH_MUTE_CTL] =</div><div class='add'>+					HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_INPUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_inv_dmic_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;inv_dmic_split)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		if (cfg-&gt;inputs[i].pin != nid)</div><div class='add'>+			continue;</div><div class='add'>+		if (cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='add'>+			return false;</div><div class='add'>+		val = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		return snd_hda_get_input_pin_attr(val) == INPUT_PIN_ATTR_INT;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* capture switch put callback for a single control with hook call */</div><div class='add'>+static int cap_single_sw_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cap_sync_hook)</div><div class='add'>+		spec-&gt;cap_sync_hook(codec, kcontrol, ucontrol);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_single_cap_ctl(struct hda_codec *codec, const char *label,</div><div class='add'>+			      int idx, bool is_switch, unsigned int ctl,</div><div class='add'>+			      bool inv_dmic)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	char tmpname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int type = is_switch ? HDA_CTL_WIDGET_MUTE : HDA_CTL_WIDGET_VOL;</div><div class='add'>+	const char *sfx = is_switch ? "Switch" : "Volume";</div><div class='add'>+	unsigned int chs = inv_dmic ? 1 : 3;</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+</div><div class='add'>+	if (!ctl)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (label)</div><div class='add'>+		snprintf(tmpname, sizeof(tmpname),</div><div class='add'>+			 "%s Capture %s", label, sfx);</div><div class='add'>+	else</div><div class='add'>+		snprintf(tmpname, sizeof(tmpname),</div><div class='add'>+			 "Capture %s", sfx);</div><div class='add'>+	knew = add_control(spec, type, tmpname, idx,</div><div class='add'>+			   amp_val_replace_channels(ctl, chs));</div><div class='add'>+	if (!knew)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (is_switch) {</div><div class='add'>+		knew-&gt;put = cap_single_sw_put;</div><div class='add'>+		if (spec-&gt;mic_mute_led)</div><div class='add'>+			knew-&gt;access |= SNDRV_CTL_ELEM_ACCESS_MIC_LED;</div><div class='add'>+	}</div><div class='add'>+	if (!inv_dmic)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Make independent right kcontrol */</div><div class='add'>+	if (label)</div><div class='add'>+		snprintf(tmpname, sizeof(tmpname),</div><div class='add'>+			 "Inverted %s Capture %s", label, sfx);</div><div class='add'>+	else</div><div class='add'>+		snprintf(tmpname, sizeof(tmpname),</div><div class='add'>+			 "Inverted Capture %s", sfx);</div><div class='add'>+	knew = add_control(spec, type, tmpname, idx,</div><div class='add'>+			   amp_val_replace_channels(ctl, 2));</div><div class='add'>+	if (!knew)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (is_switch) {</div><div class='add'>+		knew-&gt;put = cap_single_sw_put;</div><div class='add'>+		if (spec-&gt;mic_mute_led)</div><div class='add'>+			knew-&gt;access |= SNDRV_CTL_ELEM_ACCESS_MIC_LED;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create single (and simple) capture volume and switch controls */</div><div class='add'>+static int create_single_cap_vol_ctl(struct hda_codec *codec, int idx,</div><div class='add'>+				     unsigned int vol_ctl, unsigned int sw_ctl,</div><div class='add'>+				     bool inv_dmic)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	err = add_single_cap_ctl(codec, NULL, idx, false, vol_ctl, inv_dmic);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = add_single_cap_ctl(codec, NULL, idx, true, sw_ctl, inv_dmic);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create bound capture volume and switch controls */</div><div class='add'>+static int create_bind_cap_vol_ctl(struct hda_codec *codec, int idx,</div><div class='add'>+				   unsigned int vol_ctl, unsigned int sw_ctl)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+</div><div class='add'>+	if (vol_ctl) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(spec, NULL, &amp;cap_vol_temp);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;index = idx;</div><div class='add'>+		knew-&gt;private_value = vol_ctl;</div><div class='add'>+		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='add'>+	}</div><div class='add'>+	if (sw_ctl) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(spec, NULL, &amp;cap_sw_temp);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;index = idx;</div><div class='add'>+		knew-&gt;private_value = sw_ctl;</div><div class='add'>+		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='add'>+		if (spec-&gt;mic_mute_led)</div><div class='add'>+			knew-&gt;access |= SNDRV_CTL_ELEM_ACCESS_MIC_LED;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* return the vol ctl when used first in the imux list */</div><div class='add'>+static unsigned int get_first_cap_ctl(struct hda_codec *codec, int idx, int type)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	unsigned int ctl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	path = get_input_path(codec, 0, idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	ctl = path-&gt;ctls[type];</div><div class='add'>+	if (!ctl)</div><div class='add'>+		return 0;</div><div class='add'>+	for (i = 0; i &lt; idx - 1; i++) {</div><div class='add'>+		path = get_input_path(codec, 0, i);</div><div class='add'>+		if (path &amp;&amp; path-&gt;ctls[type] == ctl)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return ctl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create individual capture volume and switch controls per input */</div><div class='add'>+static int create_multi_cap_vol_ctl(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	int i, err, type;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+		bool inv_dmic;</div><div class='add'>+		int idx;</div><div class='add'>+</div><div class='add'>+		idx = imux-&gt;items[i].index;</div><div class='add'>+		if (idx &gt;= spec-&gt;autocfg.num_inputs)</div><div class='add'>+			continue;</div><div class='add'>+		inv_dmic = is_inv_dmic_pin(codec, spec-&gt;imux_pins[i]);</div><div class='add'>+</div><div class='add'>+		for (type = 0; type &lt; 2; type++) {</div><div class='add'>+			err = add_single_cap_ctl(codec,</div><div class='add'>+						 spec-&gt;input_labels[idx],</div><div class='add'>+						 spec-&gt;input_label_idxs[idx],</div><div class='add'>+						 type,</div><div class='add'>+						 get_first_cap_ctl(codec, i, type),</div><div class='add'>+						 inv_dmic);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int create_capture_mixers(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	int i, n, nums, err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dyn_adc_switch)</div><div class='add'>+		nums = 1;</div><div class='add'>+	else</div><div class='add'>+		nums = spec-&gt;num_adc_nids;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;auto_mic &amp;&amp; imux-&gt;num_items &gt; 1) {</div><div class='add'>+		struct snd_kcontrol_new *knew;</div><div class='add'>+		const char *name;</div><div class='add'>+		name = nums &gt; 1 ? "Input Source" : "Capture Source";</div><div class='add'>+		knew = snd_hda_gen_add_kctl(spec, name, &amp;cap_src_temp);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;count = nums;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; nums; n++) {</div><div class='add'>+		bool multi = false;</div><div class='add'>+		bool multi_cap_vol = spec-&gt;multi_cap_vol;</div><div class='add'>+		bool inv_dmic = false;</div><div class='add'>+		int vol, sw;</div><div class='add'>+</div><div class='add'>+		vol = sw = 0;</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			struct nid_path *path;</div><div class='add'>+			path = get_input_path(codec, n, i);</div><div class='add'>+			if (!path)</div><div class='add'>+				continue;</div><div class='add'>+			parse_capvol_in_path(codec, path);</div><div class='add'>+			if (!vol)</div><div class='add'>+				vol = path-&gt;ctls[NID_PATH_VOL_CTL];</div><div class='add'>+			else if (vol != path-&gt;ctls[NID_PATH_VOL_CTL]) {</div><div class='add'>+				multi = true;</div><div class='add'>+				if (!same_amp_caps(codec, vol,</div><div class='add'>+				    path-&gt;ctls[NID_PATH_VOL_CTL], HDA_INPUT))</div><div class='add'>+					multi_cap_vol = true;</div><div class='add'>+			}</div><div class='add'>+			if (!sw)</div><div class='add'>+				sw = path-&gt;ctls[NID_PATH_MUTE_CTL];</div><div class='add'>+			else if (sw != path-&gt;ctls[NID_PATH_MUTE_CTL]) {</div><div class='add'>+				multi = true;</div><div class='add'>+				if (!same_amp_caps(codec, sw,</div><div class='add'>+				    path-&gt;ctls[NID_PATH_MUTE_CTL], HDA_INPUT))</div><div class='add'>+					multi_cap_vol = true;</div><div class='add'>+			}</div><div class='add'>+			if (is_inv_dmic_pin(codec, spec-&gt;imux_pins[i]))</div><div class='add'>+				inv_dmic = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!multi)</div><div class='add'>+			err = create_single_cap_vol_ctl(codec, n, vol, sw,</div><div class='add'>+							inv_dmic);</div><div class='add'>+		else if (!multi_cap_vol &amp;&amp; !inv_dmic)</div><div class='add'>+			err = create_bind_cap_vol_ctl(codec, n, vol, sw);</div><div class='add'>+		else</div><div class='add'>+			err = create_multi_cap_vol_ctl(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * add mic boosts if needed</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* check whether the given amp is feasible as a boost volume */</div><div class='add'>+static bool check_boost_vol(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			    int dir, int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int step;</div><div class='add'>+</div><div class='add'>+	if (!nid_has_volume(codec, nid, dir) ||</div><div class='add'>+	    is_ctl_associated(codec, nid, dir, idx, NID_PATH_VOL_CTL) ||</div><div class='add'>+	    is_ctl_associated(codec, nid, dir, idx, NID_PATH_BOOST_CTL))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	step = (query_amp_caps(codec, nid, dir) &amp; AC_AMPCAP_STEP_SIZE)</div><div class='add'>+		&gt;&gt; AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='add'>+	if (step &lt; 0x20)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look for a boost amp in a widget close to the pin */</div><div class='add'>+static unsigned int look_for_boost_amp(struct hda_codec *codec,</div><div class='add'>+				       struct nid_path *path)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int depth;</div><div class='add'>+</div><div class='add'>+	for (depth = 0; depth &lt; 3; depth++) {</div><div class='add'>+		if (depth &gt;= path-&gt;depth - 1)</div><div class='add'>+			break;</div><div class='add'>+		nid = path-&gt;path[depth];</div><div class='add'>+		if (depth &amp;&amp; check_boost_vol(codec, nid, HDA_OUTPUT, 0)) {</div><div class='add'>+			val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='add'>+			break;</div><div class='add'>+		} else if (check_boost_vol(codec, nid, HDA_INPUT,</div><div class='add'>+					   path-&gt;idx[depth])) {</div><div class='add'>+			val = HDA_COMPOSE_AMP_VAL(nid, 3, path-&gt;idx[depth],</div><div class='add'>+						  HDA_INPUT);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_mic_boost(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;num_adc_nids)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		unsigned int val;</div><div class='add'>+		int idx;</div><div class='add'>+		char boost_label[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='add'>+		idx = imux-&gt;items[i].index;</div><div class='add'>+		if (idx &gt;= imux-&gt;num_items)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* check only line-in and mic pins */</div><div class='add'>+		if (cfg-&gt;inputs[idx].type &gt; AUTO_PIN_LINE_IN)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		path = get_input_path(codec, 0, i);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		val = look_for_boost_amp(codec, path);</div><div class='add'>+		if (!val)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* create a boost control */</div><div class='add'>+		snprintf(boost_label, sizeof(boost_label),</div><div class='add'>+			 "%s Boost Volume", spec-&gt;input_labels[idx]);</div><div class='add'>+		if (!add_control(spec, HDA_CTL_WIDGET_VOL, boost_label,</div><div class='add'>+				 spec-&gt;input_label_idxs[idx], val))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		path-&gt;ctls[NID_PATH_BOOST_CTL] = val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_GENERIC_LEDS</div><div class='add'>+/*</div><div class='add'>+ * vmaster mute LED hook helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int create_mute_led_cdev(struct hda_codec *codec,</div><div class='add'>+				int (*callback)(struct led_classdev *,</div><div class='add'>+						enum led_brightness),</div><div class='add'>+				bool micmute)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct led_classdev *cdev;</div><div class='add'>+	int idx = micmute ? LED_AUDIO_MICMUTE : LED_AUDIO_MUTE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cdev = devm_kzalloc(&amp;codec-&gt;core.dev, sizeof(*cdev), GFP_KERNEL);</div><div class='add'>+	if (!cdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cdev-&gt;name = micmute ? "hda::micmute" : "hda::mute";</div><div class='add'>+	cdev-&gt;max_brightness = 1;</div><div class='add'>+	cdev-&gt;default_trigger = micmute ? "audio-micmute" : "audio-mute";</div><div class='add'>+	cdev-&gt;brightness_set_blocking = callback;</div><div class='add'>+	cdev-&gt;flags = LED_CORE_SUSPENDRESUME;</div><div class='add'>+</div><div class='add'>+	err = led_classdev_register(&amp;codec-&gt;core.dev, cdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	spec-&gt;led_cdevs[idx] = cdev;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_add_mute_led_cdev - Create a LED classdev and enable as vmaster mute LED</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @callback: the callback for LED classdev brightness_set_blocking</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_add_mute_led_cdev(struct hda_codec *codec,</div><div class='add'>+				  int (*callback)(struct led_classdev *,</div><div class='add'>+						  enum led_brightness))</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (callback) {</div><div class='add'>+		err = create_mute_led_cdev(codec, callback, false);</div><div class='add'>+		if (err) {</div><div class='add'>+			codec_warn(codec, "failed to create a mute LED cdev\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vmaster_mute.hook)</div><div class='add'>+		codec_err(codec, "vmaster hook already present before cdev!\n");</div><div class='add'>+</div><div class='add'>+	spec-&gt;vmaster_mute_led = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_add_mute_led_cdev);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_add_micmute_led_cdev - Create a LED classdev and enable as mic-mute LED</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @callback: the callback for LED classdev brightness_set_blocking</div><div class='add'>+ *</div><div class='add'>+ * Called from the codec drivers for offering the mic mute LED controls.</div><div class='add'>+ * This creates a LED classdev and sets up the cap_sync_hook that is called at</div><div class='add'>+ * each time when the capture mixer switch changes.</div><div class='add'>+ *</div><div class='add'>+ * When NULL is passed to @callback, no classdev is created but only the</div><div class='add'>+ * LED-trigger is set up.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 or a negative error.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_add_micmute_led_cdev(struct hda_codec *codec,</div><div class='add'>+				     int (*callback)(struct led_classdev *,</div><div class='add'>+						     enum led_brightness))</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (callback) {</div><div class='add'>+		err = create_mute_led_cdev(codec, callback, true);</div><div class='add'>+		if (err) {</div><div class='add'>+			codec_warn(codec, "failed to create a mic-mute LED cdev\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;mic_mute_led = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_add_micmute_led_cdev);</div><div class='add'>+#endif /* CONFIG_SND_HDA_GENERIC_LEDS */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * parse digital I/Os and set up NIDs in BIOS auto-parse mode</div><div class='add'>+ */</div><div class='add'>+static void parse_digital(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i, nums;</div><div class='add'>+	hda_nid_t dig_nid, pin;</div><div class='add'>+</div><div class='add'>+	/* support multiple SPDIFs; the secondary is set up as a follower */</div><div class='add'>+	nums = 0;</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;autocfg.dig_outs; i++) {</div><div class='add'>+		pin = spec-&gt;autocfg.dig_out_pins[i];</div><div class='add'>+		dig_nid = look_for_dac(codec, pin, true);</div><div class='add'>+		if (!dig_nid)</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_hda_add_new_path(codec, dig_nid, pin, 0);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+		print_nid_path(codec, "digout", path);</div><div class='add'>+		path-&gt;active = true;</div><div class='add'>+		path-&gt;pin_fixed = true; /* no jack detection */</div><div class='add'>+		spec-&gt;digout_paths[i] = snd_hda_get_path_idx(codec, path);</div><div class='add'>+		set_pin_target(codec, pin, PIN_OUT, false);</div><div class='add'>+		if (!nums) {</div><div class='add'>+			spec-&gt;multiout.dig_out_nid = dig_nid;</div><div class='add'>+			spec-&gt;dig_out_type = spec-&gt;autocfg.dig_out_type[0];</div><div class='add'>+		} else {</div><div class='add'>+			spec-&gt;multiout.follower_dig_outs = spec-&gt;follower_dig_outs;</div><div class='add'>+			if (nums &gt;= ARRAY_SIZE(spec-&gt;follower_dig_outs) - 1)</div><div class='add'>+				break;</div><div class='add'>+			spec-&gt;follower_dig_outs[nums - 1] = dig_nid;</div><div class='add'>+		}</div><div class='add'>+		nums++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;autocfg.dig_in_pin) {</div><div class='add'>+		pin = spec-&gt;autocfg.dig_in_pin;</div><div class='add'>+		for_each_hda_codec_node(dig_nid, codec) {</div><div class='add'>+			unsigned int wcaps = get_wcaps(codec, dig_nid);</div><div class='add'>+			if (get_wcaps_type(wcaps) != AC_WID_AUD_IN)</div><div class='add'>+				continue;</div><div class='add'>+			if (!(wcaps &amp; AC_WCAP_DIGITAL))</div><div class='add'>+				continue;</div><div class='add'>+			path = snd_hda_add_new_path(codec, pin, dig_nid, 0);</div><div class='add'>+			if (path) {</div><div class='add'>+				print_nid_path(codec, "digin", path);</div><div class='add'>+				path-&gt;active = true;</div><div class='add'>+				path-&gt;pin_fixed = true; /* no jack */</div><div class='add'>+				spec-&gt;dig_in_nid = dig_nid;</div><div class='add'>+				spec-&gt;digin_path = snd_hda_get_path_idx(codec, path);</div><div class='add'>+				set_pin_target(codec, pin, PIN_IN, false);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * input MUX handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static bool dyn_adc_pcm_resetup(struct hda_codec *codec, int cur);</div><div class='add'>+</div><div class='add'>+/* select the given imux item; either unmute exclusively or select the route */</div><div class='add'>+static int mux_select(struct hda_codec *codec, unsigned int adc_idx,</div><div class='add'>+		      unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct hda_input_mux *imux;</div><div class='add'>+	struct nid_path *old_path, *path;</div><div class='add'>+</div><div class='add'>+	imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	if (!imux-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= imux-&gt;num_items)</div><div class='add'>+		idx = imux-&gt;num_items - 1;</div><div class='add'>+	if (spec-&gt;cur_mux[adc_idx] == idx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	old_path = get_input_path(codec, adc_idx, spec-&gt;cur_mux[adc_idx]);</div><div class='add'>+	if (!old_path)</div><div class='add'>+		return 0;</div><div class='add'>+	if (old_path-&gt;active)</div><div class='add'>+		snd_hda_activate_path(codec, old_path, false, false);</div><div class='add'>+</div><div class='add'>+	spec-&gt;cur_mux[adc_idx] = idx;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;hp_mic)</div><div class='add'>+		update_hp_mic(codec, adc_idx, false);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dyn_adc_switch)</div><div class='add'>+		dyn_adc_pcm_resetup(codec, idx);</div><div class='add'>+</div><div class='add'>+	path = get_input_path(codec, adc_idx, idx);</div><div class='add'>+	if (!path)</div><div class='add'>+		return 0;</div><div class='add'>+	if (path-&gt;active)</div><div class='add'>+		return 0;</div><div class='add'>+	snd_hda_activate_path(codec, path, true, false);</div><div class='add'>+	if (spec-&gt;cap_sync_hook)</div><div class='add'>+		spec-&gt;cap_sync_hook(codec, NULL, NULL);</div><div class='add'>+	path_power_down_sync(codec, old_path);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* power up/down widgets in the all paths that match with the given NID</div><div class='add'>+ * as terminals (either start- or endpoint)</div><div class='add'>+ *</div><div class='add'>+ * returns the last changed NID, or zero if unchanged.</div><div class='add'>+ */</div><div class='add'>+static hda_nid_t set_path_power(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				int pin_state, int stream_state)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t last, changed = 0;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;spec-&gt;paths, n, path) {</div><div class='add'>+		if (!path-&gt;depth)</div><div class='add'>+			continue;</div><div class='add'>+		if (path-&gt;path[0] == nid ||</div><div class='add'>+		    path-&gt;path[path-&gt;depth - 1] == nid) {</div><div class='add'>+			bool pin_old = path-&gt;pin_enabled;</div><div class='add'>+			bool stream_old = path-&gt;stream_enabled;</div><div class='add'>+</div><div class='add'>+			if (pin_state &gt;= 0)</div><div class='add'>+				path-&gt;pin_enabled = pin_state;</div><div class='add'>+			if (stream_state &gt;= 0)</div><div class='add'>+				path-&gt;stream_enabled = stream_state;</div><div class='add'>+			if ((!path-&gt;pin_fixed &amp;&amp; path-&gt;pin_enabled != pin_old)</div><div class='add'>+			    || path-&gt;stream_enabled != stream_old) {</div><div class='add'>+				last = path_power_update(codec, path, true);</div><div class='add'>+				if (last)</div><div class='add'>+					changed = last;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check the jack status for power control */</div><div class='add'>+static bool detect_pin_state(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	if (!is_jack_detectable(codec, pin))</div><div class='add'>+		return true;</div><div class='add'>+	return snd_hda_jack_detect_state(codec, pin) != HDA_JACK_NOT_PRESENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* power up/down the paths of the given pin according to the jack state;</div><div class='add'>+ * power = 0/1 : only power up/down if it matches with the jack state,</div><div class='add'>+ *       &lt; 0   : force power up/down to follow the jack sate</div><div class='add'>+ *</div><div class='add'>+ * returns the last changed NID, or zero if unchanged.</div><div class='add'>+ */</div><div class='add'>+static hda_nid_t set_pin_power_jack(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+				    int power)</div><div class='add'>+{</div><div class='add'>+	bool on;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;power_save_node)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	on = detect_pin_state(codec, pin);</div><div class='add'>+</div><div class='add'>+	if (power &gt;= 0 &amp;&amp; on != power)</div><div class='add'>+		return 0;</div><div class='add'>+	return set_path_power(codec, pin, on, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pin_power_callback(struct hda_codec *codec,</div><div class='add'>+			       struct hda_jack_callback *jack,</div><div class='add'>+			       bool on)</div><div class='add'>+{</div><div class='add'>+	if (jack &amp;&amp; jack-&gt;nid)</div><div class='add'>+		sync_power_state_change(codec,</div><div class='add'>+					set_pin_power_jack(codec, jack-&gt;nid, on));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* callback only doing power up -- called at first */</div><div class='add'>+static void pin_power_up_callback(struct hda_codec *codec,</div><div class='add'>+				  struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	pin_power_callback(codec, jack, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* callback only doing power down -- called at last */</div><div class='add'>+static void pin_power_down_callback(struct hda_codec *codec,</div><div class='add'>+				    struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	pin_power_callback(codec, jack, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up the power up/down callbacks */</div><div class='add'>+static void add_pin_power_ctls(struct hda_codec *codec, int num_pins,</div><div class='add'>+			       const hda_nid_t *pins, bool on)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	hda_jack_callback_fn cb =</div><div class='add'>+		on ? pin_power_up_callback : pin_power_down_callback;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins &amp;&amp; pins[i]; i++) {</div><div class='add'>+		if (is_jack_detectable(codec, pins[i]))</div><div class='add'>+			snd_hda_jack_detect_enable_callback(codec, pins[i], cb);</div><div class='add'>+		else</div><div class='add'>+			set_path_power(codec, pins[i], true, -1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* enabled power callback to each available I/O pin with jack detections;</div><div class='add'>+ * the digital I/O pins are excluded because of the unreliable detectsion</div><div class='add'>+ */</div><div class='add'>+static void add_all_pin_power_ctls(struct hda_codec *codec, bool on)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;power_save_node)</div><div class='add'>+		return;</div><div class='add'>+	add_pin_power_ctls(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins, on);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		add_pin_power_ctls(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins, on);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		add_pin_power_ctls(codec, cfg-&gt;speaker_outs, cfg-&gt;speaker_pins, on);</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='add'>+		add_pin_power_ctls(codec, 1, &amp;cfg-&gt;inputs[i].pin, on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sync path power up/down with the jack states of given pins */</div><div class='add'>+static void sync_pin_power_ctls(struct hda_codec *codec, int num_pins,</div><div class='add'>+				const hda_nid_t *pins)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins &amp;&amp; pins[i]; i++)</div><div class='add'>+		if (is_jack_detectable(codec, pins[i]))</div><div class='add'>+			set_pin_power_jack(codec, pins[i], -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sync path power up/down with pins; called at init and resume */</div><div class='add'>+static void sync_all_pin_power_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;power_save_node)</div><div class='add'>+		return;</div><div class='add'>+	sync_pin_power_ctls(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		sync_pin_power_ctls(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		sync_pin_power_ctls(codec, cfg-&gt;speaker_outs, cfg-&gt;speaker_pins);</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='add'>+		sync_pin_power_ctls(codec, 1, &amp;cfg-&gt;inputs[i].pin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* add fake paths if not present yet */</div><div class='add'>+static int add_fake_paths(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   int num_pins, const hda_nid_t *pins)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		if (!pins[i])</div><div class='add'>+			break;</div><div class='add'>+		if (get_nid_path(codec, nid, pins[i], 0))</div><div class='add'>+			continue;</div><div class='add'>+		path = snd_array_new(&amp;spec-&gt;paths);</div><div class='add'>+		if (!path)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		memset(path, 0, sizeof(*path));</div><div class='add'>+		path-&gt;depth = 2;</div><div class='add'>+		path-&gt;path[0] = nid;</div><div class='add'>+		path-&gt;path[1] = pins[i];</div><div class='add'>+		path-&gt;active = true;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create fake paths to all outputs from beep */</div><div class='add'>+static int add_fake_beep_paths(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	hda_nid_t nid = spec-&gt;beep_nid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;power_save_node || !nid)</div><div class='add'>+		return 0;</div><div class='add'>+	err = add_fake_paths(codec, nid, cfg-&gt;line_outs, cfg-&gt;line_out_pins);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT) {</div><div class='add'>+		err = add_fake_paths(codec, nid, cfg-&gt;hp_outs, cfg-&gt;hp_pins);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		err = add_fake_paths(codec, nid, cfg-&gt;speaker_outs,</div><div class='add'>+				     cfg-&gt;speaker_pins);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* power up/down beep widget and its output paths */</div><div class='add'>+static void beep_power_hook(struct hda_beep *beep, bool on)</div><div class='add'>+{</div><div class='add'>+	set_path_power(beep-&gt;codec, beep-&gt;nid, -1, on);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_fix_pin_power - Fix the power of the given pin widget to D0</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @pin: NID of pin to fix</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_fix_pin_power(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+</div><div class='add'>+	path = snd_array_new(&amp;spec-&gt;paths);</div><div class='add'>+	if (!path)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	memset(path, 0, sizeof(*path));</div><div class='add'>+	path-&gt;depth = 1;</div><div class='add'>+	path-&gt;path[0] = pin;</div><div class='add'>+	path-&gt;active = true;</div><div class='add'>+	path-&gt;pin_fixed = true;</div><div class='add'>+	path-&gt;stream_enabled = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_fix_pin_power);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Jack detections for HP auto-mute and mic-switch</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* check each pin in the given array; returns true if any of them is plugged */</div><div class='add'>+static bool detect_jacks(struct hda_codec *codec, int num_pins, const hda_nid_t *pins)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	bool present = false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		hda_nid_t nid = pins[i];</div><div class='add'>+		if (!nid)</div><div class='add'>+			break;</div><div class='add'>+		/* don't detect pins retasked as inputs */</div><div class='add'>+		if (snd_hda_codec_get_pin_target(codec, nid) &amp; AC_PINCTL_IN_EN)</div><div class='add'>+			continue;</div><div class='add'>+		if (snd_hda_jack_detect_state(codec, nid) == HDA_JACK_PRESENT)</div><div class='add'>+			present = true;</div><div class='add'>+	}</div><div class='add'>+	return present;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* standard HP/line-out auto-mute helper */</div><div class='add'>+static void do_automute(struct hda_codec *codec, int num_pins, const hda_nid_t *pins,</div><div class='add'>+			int *paths, bool mute)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		hda_nid_t nid = pins[i];</div><div class='add'>+		unsigned int val, oldval;</div><div class='add'>+		if (!nid)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		oldval = snd_hda_codec_get_pin_target(codec, nid);</div><div class='add'>+		if (oldval &amp; PIN_IN)</div><div class='add'>+			continue; /* no mute for inputs */</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;auto_mute_via_amp) {</div><div class='add'>+			struct nid_path *path;</div><div class='add'>+			hda_nid_t mute_nid;</div><div class='add'>+</div><div class='add'>+			path = snd_hda_get_path_from_idx(codec, paths[i]);</div><div class='add'>+			if (!path)</div><div class='add'>+				continue;</div><div class='add'>+			mute_nid = get_amp_nid_(path-&gt;ctls[NID_PATH_MUTE_CTL]);</div><div class='add'>+			if (!mute_nid)</div><div class='add'>+				continue;</div><div class='add'>+			if (mute)</div><div class='add'>+				spec-&gt;mute_bits |= (1ULL &lt;&lt; mute_nid);</div><div class='add'>+			else</div><div class='add'>+				spec-&gt;mute_bits &amp;= ~(1ULL &lt;&lt; mute_nid);</div><div class='add'>+			continue;</div><div class='add'>+		} else {</div><div class='add'>+			/* don't reset VREF value in case it's controlling</div><div class='add'>+			 * the amp (see alc861_fixup_asus_amp_vref_0f())</div><div class='add'>+			 */</div><div class='add'>+			if (spec-&gt;keep_vref_in_automute)</div><div class='add'>+				val = oldval &amp; ~PIN_HP;</div><div class='add'>+			else</div><div class='add'>+				val = 0;</div><div class='add'>+			if (!mute)</div><div class='add'>+				val |= oldval;</div><div class='add'>+			/* here we call update_pin_ctl() so that the pinctl is</div><div class='add'>+			 * changed without changing the pinctl target value;</div><div class='add'>+			 * the original target value will be still referred at</div><div class='add'>+			 * the init / resume again</div><div class='add'>+			 */</div><div class='add'>+			update_pin_ctl(codec, nid, val);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_pin_eapd(codec, nid, !mute);</div><div class='add'>+		if (codec-&gt;power_save_node) {</div><div class='add'>+			bool on = !mute;</div><div class='add'>+			if (on)</div><div class='add'>+				on = detect_pin_state(codec, nid);</div><div class='add'>+			set_path_power(codec, nid, on, -1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_update_outputs - Toggle outputs muting</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Update the mute status of all outputs based on the current jack states.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_update_outputs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int *paths;</div><div class='add'>+	int on;</div><div class='add'>+</div><div class='add'>+	/* Control HP pins/amps depending on master_mute state;</div><div class='add'>+	 * in general, HP pins/amps control should be enabled in all cases,</div><div class='add'>+	 * but currently set only for master_mute, just to be safe</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type == AUTO_PIN_HP_OUT)</div><div class='add'>+		paths = spec-&gt;out_paths;</div><div class='add'>+	else</div><div class='add'>+		paths = spec-&gt;hp_paths;</div><div class='add'>+	do_automute(codec, ARRAY_SIZE(spec-&gt;autocfg.hp_pins),</div><div class='add'>+		    spec-&gt;autocfg.hp_pins, paths, spec-&gt;master_mute);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;automute_speaker)</div><div class='add'>+		on = 0;</div><div class='add'>+	else</div><div class='add'>+		on = spec-&gt;hp_jack_present | spec-&gt;line_jack_present;</div><div class='add'>+	on |= spec-&gt;master_mute;</div><div class='add'>+	spec-&gt;speaker_muted = on;</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		paths = spec-&gt;out_paths;</div><div class='add'>+	else</div><div class='add'>+		paths = spec-&gt;speaker_paths;</div><div class='add'>+	do_automute(codec, ARRAY_SIZE(spec-&gt;autocfg.speaker_pins),</div><div class='add'>+		    spec-&gt;autocfg.speaker_pins, paths, on);</div><div class='add'>+</div><div class='add'>+	/* toggle line-out mutes if needed, too */</div><div class='add'>+	/* if LO is a copy of either HP or Speaker, don't need to handle it */</div><div class='add'>+	if (spec-&gt;autocfg.line_out_pins[0] == spec-&gt;autocfg.hp_pins[0] ||</div><div class='add'>+	    spec-&gt;autocfg.line_out_pins[0] == spec-&gt;autocfg.speaker_pins[0])</div><div class='add'>+		return;</div><div class='add'>+	if (!spec-&gt;automute_lo)</div><div class='add'>+		on = 0;</div><div class='add'>+	else</div><div class='add'>+		on = spec-&gt;hp_jack_present;</div><div class='add'>+	on |= spec-&gt;master_mute;</div><div class='add'>+	spec-&gt;line_out_muted = on;</div><div class='add'>+	paths = spec-&gt;out_paths;</div><div class='add'>+	do_automute(codec, ARRAY_SIZE(spec-&gt;autocfg.line_out_pins),</div><div class='add'>+		    spec-&gt;autocfg.line_out_pins, paths, on);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_update_outputs);</div><div class='add'>+</div><div class='add'>+static void call_update_outputs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;automute_hook)</div><div class='add'>+		spec-&gt;automute_hook(codec);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_gen_update_outputs(codec);</div><div class='add'>+</div><div class='add'>+	/* sync the whole vmaster followers to reflect the new auto-mute status */</div><div class='add'>+	if (spec-&gt;auto_mute_via_amp &amp;&amp; !codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		snd_ctl_sync_vmaster(spec-&gt;vmaster_mute.sw_kctl, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_hp_automute - standard HP-automute helper</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @jack: jack object, NULL for the whole</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_hp_automute(struct hda_codec *codec,</div><div class='add'>+			     struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t *pins = spec-&gt;autocfg.hp_pins;</div><div class='add'>+	int num_pins = ARRAY_SIZE(spec-&gt;autocfg.hp_pins);</div><div class='add'>+</div><div class='add'>+	/* No detection for the first HP jack during indep-HP mode */</div><div class='add'>+	if (spec-&gt;indep_hp_enabled) {</div><div class='add'>+		pins++;</div><div class='add'>+		num_pins--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;hp_jack_present = detect_jacks(codec, num_pins, pins);</div><div class='add'>+	if (!spec-&gt;detect_hp || (!spec-&gt;automute_speaker &amp;&amp; !spec-&gt;automute_lo))</div><div class='add'>+		return;</div><div class='add'>+	call_update_outputs(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_hp_automute);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_line_automute - standard line-out-automute helper</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @jack: jack object, NULL for the whole</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_line_automute(struct hda_codec *codec,</div><div class='add'>+			       struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		return;</div><div class='add'>+	/* check LO jack only when it's different from HP */</div><div class='add'>+	if (spec-&gt;autocfg.line_out_pins[0] == spec-&gt;autocfg.hp_pins[0])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;line_jack_present =</div><div class='add'>+		detect_jacks(codec, ARRAY_SIZE(spec-&gt;autocfg.line_out_pins),</div><div class='add'>+			     spec-&gt;autocfg.line_out_pins);</div><div class='add'>+	if (!spec-&gt;automute_speaker || !spec-&gt;detect_lo)</div><div class='add'>+		return;</div><div class='add'>+	call_update_outputs(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_line_automute);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_mic_autoswitch - standard mic auto-switch helper</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @jack: jack object, NULL for the whole</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_mic_autoswitch(struct hda_codec *codec,</div><div class='add'>+				struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;auto_mic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = spec-&gt;am_num_entries - 1; i &gt; 0; i--) {</div><div class='add'>+		hda_nid_t pin = spec-&gt;am_entry[i].pin;</div><div class='add'>+		/* don't detect pins retasked as outputs */</div><div class='add'>+		if (snd_hda_codec_get_pin_target(codec, pin) &amp; AC_PINCTL_OUT_EN)</div><div class='add'>+			continue;</div><div class='add'>+		if (snd_hda_jack_detect_state(codec, pin) == HDA_JACK_PRESENT) {</div><div class='add'>+			mux_select(codec, 0, spec-&gt;am_entry[i].idx);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mux_select(codec, 0, spec-&gt;am_entry[0].idx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_mic_autoswitch);</div><div class='add'>+</div><div class='add'>+/* call appropriate hooks */</div><div class='add'>+static void call_hp_automute(struct hda_codec *codec,</div><div class='add'>+			     struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;hp_automute_hook)</div><div class='add'>+		spec-&gt;hp_automute_hook(codec, jack);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void call_line_automute(struct hda_codec *codec,</div><div class='add'>+			       struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;line_automute_hook)</div><div class='add'>+		spec-&gt;line_automute_hook(codec, jack);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_gen_line_automute(codec, jack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void call_mic_autoswitch(struct hda_codec *codec,</div><div class='add'>+				struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;mic_autoswitch_hook)</div><div class='add'>+		spec-&gt;mic_autoswitch_hook(codec, jack);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_gen_mic_autoswitch(codec, jack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update jack retasking */</div><div class='add'>+static void update_automute_all(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	call_hp_automute(codec, NULL);</div><div class='add'>+	call_line_automute(codec, NULL);</div><div class='add'>+	call_mic_autoswitch(codec, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Auto-Mute mode mixer enum support</div><div class='add'>+ */</div><div class='add'>+static int automute_mode_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const char * const texts3[] = {</div><div class='add'>+		"Disabled", "Speaker Only", "Line Out+Speaker"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;automute_speaker_possible &amp;&amp; spec-&gt;automute_lo_possible)</div><div class='add'>+		return snd_hda_enum_helper_info(kcontrol, uinfo, 3, texts3);</div><div class='add'>+	return snd_hda_enum_bool_helper_info(kcontrol, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int automute_mode_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	if (spec-&gt;automute_speaker)</div><div class='add'>+		val++;</div><div class='add'>+	if (spec-&gt;automute_lo)</div><div class='add'>+		val++;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int automute_mode_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (ucontrol-&gt;value.enumerated.item[0]) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (!spec-&gt;automute_speaker &amp;&amp; !spec-&gt;automute_lo)</div><div class='add'>+			return 0;</div><div class='add'>+		spec-&gt;automute_speaker = 0;</div><div class='add'>+		spec-&gt;automute_lo = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		if (spec-&gt;automute_speaker_possible) {</div><div class='add'>+			if (!spec-&gt;automute_lo &amp;&amp; spec-&gt;automute_speaker)</div><div class='add'>+				return 0;</div><div class='add'>+			spec-&gt;automute_speaker = 1;</div><div class='add'>+			spec-&gt;automute_lo = 0;</div><div class='add'>+		} else if (spec-&gt;automute_lo_possible) {</div><div class='add'>+			if (spec-&gt;automute_lo)</div><div class='add'>+				return 0;</div><div class='add'>+			spec-&gt;automute_lo = 1;</div><div class='add'>+		} else</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		if (!spec-&gt;automute_lo_possible || !spec-&gt;automute_speaker_possible)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (spec-&gt;automute_speaker &amp;&amp; spec-&gt;automute_lo)</div><div class='add'>+			return 0;</div><div class='add'>+		spec-&gt;automute_speaker = 1;</div><div class='add'>+		spec-&gt;automute_lo = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	call_update_outputs(codec);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new automute_mode_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Auto-Mute Mode",</div><div class='add'>+	.info = automute_mode_info,</div><div class='add'>+	.get = automute_mode_get,</div><div class='add'>+	.put = automute_mode_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int add_automute_mode_enum(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(spec, NULL, &amp;automute_mode_enum))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the availability of HP/line-out auto-mute;</div><div class='add'>+ * Set up appropriately if really supported</div><div class='add'>+ */</div><div class='add'>+static int check_auto_mute_availability(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int present = 0;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;suppress_auto_mute)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;hp_pins[0])</div><div class='add'>+		present++;</div><div class='add'>+	if (cfg-&gt;line_out_pins[0])</div><div class='add'>+		present++;</div><div class='add'>+	if (cfg-&gt;speaker_pins[0])</div><div class='add'>+		present++;</div><div class='add'>+	if (present &lt; 2) /* need two different output types */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;speaker_pins[0] &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		memcpy(cfg-&gt;speaker_pins, cfg-&gt;line_out_pins,</div><div class='add'>+		       sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+		cfg-&gt;speaker_outs = cfg-&gt;line_outs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;hp_pins[0] &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_out_type == AUTO_PIN_HP_OUT) {</div><div class='add'>+		memcpy(cfg-&gt;hp_pins, cfg-&gt;line_out_pins,</div><div class='add'>+		       sizeof(cfg-&gt;hp_pins));</div><div class='add'>+		cfg-&gt;hp_outs = cfg-&gt;line_outs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='add'>+		hda_nid_t nid = cfg-&gt;hp_pins[i];</div><div class='add'>+		if (!is_jack_detectable(codec, nid))</div><div class='add'>+			continue;</div><div class='add'>+		codec_dbg(codec, "Enable HP auto-muting on NID 0x%x\n", nid);</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, nid,</div><div class='add'>+						    call_hp_automute);</div><div class='add'>+		spec-&gt;detect_hp = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;line_out_type == AUTO_PIN_LINE_OUT &amp;&amp; cfg-&gt;line_outs) {</div><div class='add'>+		if (cfg-&gt;speaker_outs)</div><div class='add'>+			for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='add'>+				hda_nid_t nid = cfg-&gt;line_out_pins[i];</div><div class='add'>+				if (!is_jack_detectable(codec, nid))</div><div class='add'>+					continue;</div><div class='add'>+				codec_dbg(codec, "Enable Line-Out auto-muting on NID 0x%x\n", nid);</div><div class='add'>+				snd_hda_jack_detect_enable_callback(codec, nid,</div><div class='add'>+								    call_line_automute);</div><div class='add'>+				spec-&gt;detect_lo = 1;</div><div class='add'>+			}</div><div class='add'>+		spec-&gt;automute_lo_possible = spec-&gt;detect_hp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;automute_speaker_possible = cfg-&gt;speaker_outs &amp;&amp;</div><div class='add'>+		(spec-&gt;detect_hp || spec-&gt;detect_lo);</div><div class='add'>+</div><div class='add'>+	spec-&gt;automute_lo = spec-&gt;automute_lo_possible;</div><div class='add'>+	spec-&gt;automute_speaker = spec-&gt;automute_speaker_possible;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;automute_speaker_possible || spec-&gt;automute_lo_possible) {</div><div class='add'>+		/* create a control for automute mode */</div><div class='add'>+		err = add_automute_mode_enum(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether all auto-mic pins are valid; setup indices if OK */</div><div class='add'>+static bool auto_mic_check_imux(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct hda_input_mux *imux;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;am_num_entries; i++) {</div><div class='add'>+		spec-&gt;am_entry[i].idx =</div><div class='add'>+			find_idx_in_nid_list(spec-&gt;am_entry[i].pin,</div><div class='add'>+					     spec-&gt;imux_pins, imux-&gt;num_items);</div><div class='add'>+		if (spec-&gt;am_entry[i].idx &lt; 0)</div><div class='add'>+			return false; /* no corresponding imux */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we don't need the jack detection for the first pin */</div><div class='add'>+	for (i = 1; i &lt; spec-&gt;am_num_entries; i++)</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec,</div><div class='add'>+						    spec-&gt;am_entry[i].pin,</div><div class='add'>+						    call_mic_autoswitch);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compare_attr(const void *ap, const void *bp)</div><div class='add'>+{</div><div class='add'>+	const struct automic_entry *a = ap;</div><div class='add'>+	const struct automic_entry *b = bp;</div><div class='add'>+	return (int)(a-&gt;attr - b-&gt;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check the availability of auto-mic switch;</div><div class='add'>+ * Set up if really supported</div><div class='add'>+ */</div><div class='add'>+static int check_auto_mic_availability(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	unsigned int types;</div><div class='add'>+	int i, num_pins;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;suppress_auto_mic)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	types = 0;</div><div class='add'>+	num_pins = 0;</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='add'>+		unsigned int attr;</div><div class='add'>+		attr = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		attr = snd_hda_get_input_pin_attr(attr);</div><div class='add'>+		if (types &amp; (1 &lt;&lt; attr))</div><div class='add'>+			return 0; /* already occupied */</div><div class='add'>+		switch (attr) {</div><div class='add'>+		case INPUT_PIN_ATTR_INT:</div><div class='add'>+			if (cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='add'>+				return 0; /* invalid type */</div><div class='add'>+			break;</div><div class='add'>+		case INPUT_PIN_ATTR_UNUSED:</div><div class='add'>+			return 0; /* invalid entry */</div><div class='add'>+		default:</div><div class='add'>+			if (cfg-&gt;inputs[i].type &gt; AUTO_PIN_LINE_IN)</div><div class='add'>+				return 0; /* invalid type */</div><div class='add'>+			if (!spec-&gt;line_in_auto_switch &amp;&amp;</div><div class='add'>+			    cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='add'>+				return 0; /* only mic is allowed */</div><div class='add'>+			if (!is_jack_detectable(codec, nid))</div><div class='add'>+				return 0; /* no unsol support */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (num_pins &gt;= MAX_AUTO_MIC_PINS)</div><div class='add'>+			return 0;</div><div class='add'>+		types |= (1 &lt;&lt; attr);</div><div class='add'>+		spec-&gt;am_entry[num_pins].pin = nid;</div><div class='add'>+		spec-&gt;am_entry[num_pins].attr = attr;</div><div class='add'>+		num_pins++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_pins &lt; 2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;am_num_entries = num_pins;</div><div class='add'>+	/* sort the am_entry in the order of attr so that the pin with a</div><div class='add'>+	 * higher attr will be selected when the jack is plugged.</div><div class='add'>+	 */</div><div class='add'>+	sort(spec-&gt;am_entry, num_pins, sizeof(spec-&gt;am_entry[0]),</div><div class='add'>+	     compare_attr, NULL);</div><div class='add'>+</div><div class='add'>+	if (!auto_mic_check_imux(codec))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;auto_mic = 1;</div><div class='add'>+	spec-&gt;num_adc_nids = 1;</div><div class='add'>+	spec-&gt;cur_mux[0] = spec-&gt;am_entry[0].idx;</div><div class='add'>+	codec_dbg(codec, "Enable auto-mic switch on NID 0x%x/0x%x/0x%x\n",</div><div class='add'>+		    spec-&gt;am_entry[0].pin,</div><div class='add'>+		    spec-&gt;am_entry[1].pin,</div><div class='add'>+		    spec-&gt;am_entry[2].pin);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_path_power_filter - power_filter hook to make inactive widgets</div><div class='add'>+ * into power down</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to evalute</div><div class='add'>+ * @power_state: target power state</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec,</div><div class='add'>+						  hda_nid_t nid,</div><div class='add'>+						  unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;power_down_unused &amp;&amp; !codec-&gt;power_save_node)</div><div class='add'>+		return power_state;</div><div class='add'>+	if (power_state != AC_PWRST_D0 || nid == codec-&gt;core.afg)</div><div class='add'>+		return power_state;</div><div class='add'>+	if (get_wcaps_type(get_wcaps(codec, nid)) &gt;= AC_WID_POWER)</div><div class='add'>+		return power_state;</div><div class='add'>+	if (is_active_nid_for_any(codec, nid))</div><div class='add'>+		return power_state;</div><div class='add'>+	return AC_PWRST_D3;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_path_power_filter);</div><div class='add'>+</div><div class='add'>+/* mute all aamix inputs initially; parse up to the first leaves */</div><div class='add'>+static void mute_all_mixer_nid(struct hda_codec *codec, hda_nid_t mix)</div><div class='add'>+{</div><div class='add'>+	int i, nums;</div><div class='add'>+	const hda_nid_t *conn;</div><div class='add'>+	bool has_amp;</div><div class='add'>+</div><div class='add'>+	nums = snd_hda_get_conn_list(codec, mix, &amp;conn);</div><div class='add'>+	has_amp = nid_has_mute(codec, mix, HDA_INPUT);</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		if (has_amp)</div><div class='add'>+			update_amp(codec, mix, HDA_INPUT, i,</div><div class='add'>+				   0xff, HDA_AMP_MUTE);</div><div class='add'>+		else if (nid_has_volume(codec, conn[i], HDA_OUTPUT))</div><div class='add'>+			update_amp(codec, conn[i], HDA_OUTPUT, 0,</div><div class='add'>+				   0xff, HDA_AMP_MUTE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_stream_pm - Stream power management callback</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: audio widget</div><div class='add'>+ * @on: power on/off flag</div><div class='add'>+ *</div><div class='add'>+ * Set this in hda_codec_ops.stream_pm.  Only valid with power_save_node flag.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_stream_pm(struct hda_codec *codec, hda_nid_t nid, bool on)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;power_save_node)</div><div class='add'>+		set_path_power(codec, nid, -1, on);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_stream_pm);</div><div class='add'>+</div><div class='add'>+/* forcibly mute the speaker output without caching; return true if updated */</div><div class='add'>+static bool force_mute_output_path(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (!nid)</div><div class='add'>+		return false;</div><div class='add'>+	if (!nid_has_mute(codec, nid, HDA_OUTPUT))</div><div class='add'>+		return false; /* no mute, skip */</div><div class='add'>+	if (snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &amp;</div><div class='add'>+	    snd_hda_codec_amp_read(codec, nid, 1, HDA_OUTPUT, 0) &amp;</div><div class='add'>+	    HDA_AMP_MUTE)</div><div class='add'>+		return false; /* both channels already muted, skip */</div><div class='add'>+</div><div class='add'>+	/* direct amp update without caching */</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+			    AC_AMP_SET_OUTPUT | AC_AMP_SET_LEFT |</div><div class='add'>+			    AC_AMP_SET_RIGHT | HDA_AMP_MUTE);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_shutup_speakers - Forcibly mute the speaker outputs</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Forcibly mute the speaker outputs, to be called at suspend or shutdown.</div><div class='add'>+ *</div><div class='add'>+ * The mute state done by this function isn't cached, hence the original state</div><div class='add'>+ * will be restored at resume.</div><div class='add'>+ *</div><div class='add'>+ * Return true if the mute state has been changed.</div><div class='add'>+ */</div><div class='add'>+bool snd_hda_gen_shutup_speakers(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	const int *paths;</div><div class='add'>+	const struct nid_path *path;</div><div class='add'>+	int i, p, num_paths;</div><div class='add'>+	bool updated = false;</div><div class='add'>+</div><div class='add'>+	/* if already powered off, do nothing */</div><div class='add'>+	if (!snd_hdac_is_power_on(&amp;codec-&gt;core))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		paths = spec-&gt;out_paths;</div><div class='add'>+		num_paths = spec-&gt;autocfg.line_outs;</div><div class='add'>+	} else {</div><div class='add'>+		paths = spec-&gt;speaker_paths;</div><div class='add'>+		num_paths = spec-&gt;autocfg.speaker_outs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_paths; i++) {</div><div class='add'>+		path = snd_hda_get_path_from_idx(codec, paths[i]);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+		for (p = 0; p &lt; path-&gt;depth; p++)</div><div class='add'>+			if (force_mute_output_path(codec, path-&gt;path[p]))</div><div class='add'>+				updated = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return updated;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_shutup_speakers);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_parse_auto_config - Parse the given BIOS configuration and</div><div class='add'>+ * set up the hda_gen_spec</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @cfg: Parsed pin configuration</div><div class='add'>+ *</div><div class='add'>+ * return 1 if successful, 0 if the proper config is not found,</div><div class='add'>+ * or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_parse_auto_config(struct hda_codec *codec,</div><div class='add'>+				  struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	parse_user_hints(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vmaster_mute_led || spec-&gt;mic_mute_led)</div><div class='add'>+		snd_ctl_led_request();</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;mixer_nid &amp;&amp; !spec-&gt;mixer_merge_nid)</div><div class='add'>+		spec-&gt;mixer_merge_nid = spec-&gt;mixer_nid;</div><div class='add'>+</div><div class='add'>+	if (cfg != &amp;spec-&gt;autocfg) {</div><div class='add'>+		spec-&gt;autocfg = *cfg;</div><div class='add'>+		cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;main_out_badness)</div><div class='add'>+		spec-&gt;main_out_badness = &amp;hda_main_out_badness;</div><div class='add'>+	if (!spec-&gt;extra_out_badness)</div><div class='add'>+		spec-&gt;extra_out_badness = &amp;hda_extra_out_badness;</div><div class='add'>+</div><div class='add'>+	fill_all_dac_nids(codec);</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;line_outs) {</div><div class='add'>+		if (cfg-&gt;dig_outs || cfg-&gt;dig_in_pin) {</div><div class='add'>+			spec-&gt;multiout.max_channels = 2;</div><div class='add'>+			spec-&gt;no_analog = 1;</div><div class='add'>+			goto dig_only;</div><div class='add'>+		}</div><div class='add'>+		if (!cfg-&gt;num_inputs &amp;&amp; !cfg-&gt;dig_in_pin)</div><div class='add'>+			return 0; /* can't find valid BIOS pin config */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_primary_hp &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT &amp;&amp;</div><div class='add'>+	    cfg-&gt;line_outs &lt;= cfg-&gt;hp_outs) {</div><div class='add'>+		/* use HP as primary out */</div><div class='add'>+		cfg-&gt;speaker_outs = cfg-&gt;line_outs;</div><div class='add'>+		memcpy(cfg-&gt;speaker_pins, cfg-&gt;line_out_pins,</div><div class='add'>+		       sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+		cfg-&gt;line_outs = cfg-&gt;hp_outs;</div><div class='add'>+		memcpy(cfg-&gt;line_out_pins, cfg-&gt;hp_pins, sizeof(cfg-&gt;hp_pins));</div><div class='add'>+		cfg-&gt;hp_outs = 0;</div><div class='add'>+		memset(cfg-&gt;hp_pins, 0, sizeof(cfg-&gt;hp_pins));</div><div class='add'>+		cfg-&gt;line_out_type = AUTO_PIN_HP_OUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = parse_output_paths(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_multi_channel_mode(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_multi_out_ctls(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_hp_out_ctls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_speaker_out_ctls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_indep_hp_ctls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_loopback_mixing_ctl(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_hp_mic(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_input_ctls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* add power-down pin callbacks at first */</div><div class='add'>+	add_all_pin_power_ctls(codec, false);</div><div class='add'>+</div><div class='add'>+	spec-&gt;const_channel_count = spec-&gt;ext_channel_count;</div><div class='add'>+	/* check the multiple speaker and headphone pins */</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		spec-&gt;const_channel_count = max(spec-&gt;const_channel_count,</div><div class='add'>+						cfg-&gt;speaker_outs * 2);</div><div class='add'>+	if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		spec-&gt;const_channel_count = max(spec-&gt;const_channel_count,</div><div class='add'>+						cfg-&gt;hp_outs * 2);</div><div class='add'>+	spec-&gt;multiout.max_channels = max(spec-&gt;ext_channel_count,</div><div class='add'>+					  spec-&gt;const_channel_count);</div><div class='add'>+</div><div class='add'>+	err = check_auto_mute_availability(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = check_dyn_adc_switch(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = check_auto_mic_availability(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* add stereo mix if available and not enabled yet */</div><div class='add'>+	if (!spec-&gt;auto_mic &amp;&amp; spec-&gt;mixer_nid &amp;&amp;</div><div class='add'>+	    spec-&gt;add_stereo_mix_input == HDA_HINT_STEREO_MIX_AUTO &amp;&amp;</div><div class='add'>+	    spec-&gt;input_mux.num_items &gt; 1) {</div><div class='add'>+		err = parse_capture_source(codec, spec-&gt;mixer_nid,</div><div class='add'>+					   CFG_IDX_MIX, spec-&gt;num_all_adcs,</div><div class='add'>+					   "Stereo Mix", 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	err = create_capture_mixers(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = parse_mic_boost(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* create "Headphone Mic Jack Mode" if no input selection is</div><div class='add'>+	 * available (or user specifies add_jack_modes hint)</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;hp_mic_pin &amp;&amp;</div><div class='add'>+	    (spec-&gt;auto_mic || spec-&gt;input_mux.num_items == 1 ||</div><div class='add'>+	     spec-&gt;add_jack_modes)) {</div><div class='add'>+		err = create_hp_mic_jack_mode(codec, spec-&gt;hp_mic_pin);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;add_jack_modes) {</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+			err = create_out_jack_modes(codec, cfg-&gt;line_outs,</div><div class='add'>+						    cfg-&gt;line_out_pins);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT) {</div><div class='add'>+			err = create_out_jack_modes(codec, cfg-&gt;hp_outs,</div><div class='add'>+						    cfg-&gt;hp_pins);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add power-up pin callbacks at last */</div><div class='add'>+	add_all_pin_power_ctls(codec, true);</div><div class='add'>+</div><div class='add'>+	/* mute all aamix input initially */</div><div class='add'>+	if (spec-&gt;mixer_nid)</div><div class='add'>+		mute_all_mixer_nid(codec, spec-&gt;mixer_nid);</div><div class='add'>+</div><div class='add'>+ dig_only:</div><div class='add'>+	parse_digital(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;power_down_unused || codec-&gt;power_save_node) {</div><div class='add'>+		if (!codec-&gt;power_filter)</div><div class='add'>+			codec-&gt;power_filter = snd_hda_gen_path_power_filter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_analog &amp;&amp; spec-&gt;beep_nid) {</div><div class='add'>+		err = snd_hda_attach_beep_device(codec, spec-&gt;beep_nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (codec-&gt;beep &amp;&amp; codec-&gt;power_save_node) {</div><div class='add'>+			err = add_fake_beep_paths(codec);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			codec-&gt;beep-&gt;power_hook = beep_power_hook;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_parse_auto_config);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Build control elements</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* follower controls for virtual master */</div><div class='add'>+static const char * const follower_pfxs[] = {</div><div class='add'>+	"Front", "Surround", "Center", "LFE", "Side",</div><div class='add'>+	"Headphone", "Speaker", "Mono", "Line Out",</div><div class='add'>+	"CLFE", "Bass Speaker", "PCM",</div><div class='add'>+	"Speaker Front", "Speaker Surround", "Speaker CLFE", "Speaker Side",</div><div class='add'>+	"Headphone Front", "Headphone Surround", "Headphone CLFE",</div><div class='add'>+	"Headphone Side", "Headphone+LO", "Speaker+LO",</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_build_controls - Build controls from the parsed results</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Pass this to build_controls hda_codec_ops.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;kctls.used) {</div><div class='add'>+		err = snd_hda_add_new_ctls(codec, spec-&gt;kctls.list);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multiout.dig_out_nid) {</div><div class='add'>+		err = snd_hda_create_dig_out_ctls(codec,</div><div class='add'>+						  spec-&gt;multiout.dig_out_nid,</div><div class='add'>+						  spec-&gt;multiout.dig_out_nid,</div><div class='add'>+						  spec-&gt;pcm_rec[1]-&gt;pcm_type);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (!spec-&gt;no_analog) {</div><div class='add'>+			err = snd_hda_create_spdif_share_sw(codec,</div><div class='add'>+							    &amp;spec-&gt;multiout);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			spec-&gt;multiout.share_spdif = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;dig_in_nid) {</div><div class='add'>+		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if we have no master control, let's create it */</div><div class='add'>+	if (!spec-&gt;no_analog &amp;&amp; !spec-&gt;suppress_vmaster &amp;&amp;</div><div class='add'>+	    !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {</div><div class='add'>+		err = snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='add'>+					  spec-&gt;vmaster_tlv, follower_pfxs,</div><div class='add'>+					  "Playback Volume", 0);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (!spec-&gt;no_analog &amp;&amp; !spec-&gt;suppress_vmaster &amp;&amp;</div><div class='add'>+	    !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {</div><div class='add'>+		err = __snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='add'>+					    NULL, follower_pfxs,</div><div class='add'>+					    "Playback Switch", true,</div><div class='add'>+					    spec-&gt;vmaster_mute_led ?</div><div class='add'>+						SNDRV_CTL_ELEM_ACCESS_SPK_LED : 0,</div><div class='add'>+					    &amp;spec-&gt;vmaster_mute.sw_kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (spec-&gt;vmaster_mute.hook) {</div><div class='add'>+			snd_hda_add_vmaster_hook(codec, &amp;spec-&gt;vmaster_mute);</div><div class='add'>+			snd_hda_sync_vmaster_hook(&amp;spec-&gt;vmaster_mute);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_kctls(spec); /* no longer needed */</div><div class='add'>+</div><div class='add'>+	err = snd_hda_jack_add_kctls(codec, &amp;spec-&gt;autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_build_controls);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM definitions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void call_pcm_playback_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;pcm_playback_hook)</div><div class='add'>+		spec-&gt;pcm_playback_hook(hinfo, codec, substream, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void call_pcm_capture_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  int action)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;pcm_capture_hook)</div><div class='add'>+		spec-&gt;pcm_capture_hook(hinfo, codec, substream, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Analog playback callbacks</div><div class='add'>+ */</div><div class='add'>+static int playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+			     struct hda_codec *codec,</div><div class='add'>+			     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	err = snd_hda_multi_out_analog_open(codec,</div><div class='add'>+					    &amp;spec-&gt;multiout, substream,</div><div class='add'>+					     hinfo);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;active_streams |= 1 &lt;&lt; STREAM_MULTI_OUT;</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_OPEN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				struct hda_codec *codec,</div><div class='add'>+				unsigned int stream_tag,</div><div class='add'>+				unsigned int format,</div><div class='add'>+				struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout,</div><div class='add'>+					       stream_tag, format, substream);</div><div class='add'>+	if (!err)</div><div class='add'>+		call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+				       HDA_GEN_PCM_ACT_PREPARE);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				struct hda_codec *codec,</div><div class='add'>+				struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='add'>+	if (!err)</div><div class='add'>+		call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+				       HDA_GEN_PCM_ACT_CLEANUP);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+			      struct hda_codec *codec,</div><div class='add'>+			      struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	spec-&gt;active_streams &amp;= ~(1 &lt;&lt; STREAM_MULTI_OUT);</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_CLOSE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+			    struct hda_codec *codec,</div><div class='add'>+			    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_OPEN);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+			       struct hda_codec *codec,</div><div class='add'>+			       unsigned int stream_tag,</div><div class='add'>+			       unsigned int format,</div><div class='add'>+			       struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid, stream_tag, 0, format);</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream,</div><div class='add'>+			      HDA_GEN_PCM_ACT_PREPARE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+			       struct hda_codec *codec,</div><div class='add'>+			       struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream,</div><div class='add'>+			      HDA_GEN_PCM_ACT_CLEANUP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int capture_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+			     struct hda_codec *codec,</div><div class='add'>+			     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_CLOSE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alt_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	if (spec-&gt;indep_hp &amp;&amp; !spec-&gt;indep_hp_enabled)</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;active_streams |= 1 &lt;&lt; STREAM_INDEP_HP;</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_OPEN);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alt_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_mutex);</div><div class='add'>+	spec-&gt;active_streams &amp;= ~(1 &lt;&lt; STREAM_INDEP_HP);</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_CLOSE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alt_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				    struct hda_codec *codec,</div><div class='add'>+				    unsigned int stream_tag,</div><div class='add'>+				    unsigned int format,</div><div class='add'>+				    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid, stream_tag, 0, format);</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_PREPARE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alt_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				    struct hda_codec *codec,</div><div class='add'>+				    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='add'>+	call_pcm_playback_hook(hinfo, codec, substream,</div><div class='add'>+			       HDA_GEN_PCM_ACT_CLEANUP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Digital out</div><div class='add'>+ */</div><div class='add'>+static int dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				    struct hda_codec *codec,</div><div class='add'>+				    unsigned int stream_tag,</div><div class='add'>+				    unsigned int format,</div><div class='add'>+				    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='add'>+					     stream_tag, format, substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				    struct hda_codec *codec,</div><div class='add'>+				    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Analog capture</div><div class='add'>+ */</div><div class='add'>+#define alt_capture_pcm_open	capture_pcm_open</div><div class='add'>+#define alt_capture_pcm_close	capture_pcm_close</div><div class='add'>+</div><div class='add'>+static int alt_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   unsigned int stream_tag,</div><div class='add'>+				   unsigned int format,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number + 1],</div><div class='add'>+				   stream_tag, 0, format);</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream,</div><div class='add'>+			      HDA_GEN_PCM_ACT_PREPARE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alt_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec,</div><div class='add'>+				     spec-&gt;adc_nids[substream-&gt;number + 1]);</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream,</div><div class='add'>+			      HDA_GEN_PCM_ACT_CLEANUP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static const struct hda_pcm_stream pcm_analog_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 8,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = playback_pcm_open,</div><div class='add'>+		.close = playback_pcm_close,</div><div class='add'>+		.prepare = playback_pcm_prepare,</div><div class='add'>+		.cleanup = playback_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream pcm_analog_capture = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = capture_pcm_open,</div><div class='add'>+		.close = capture_pcm_close,</div><div class='add'>+		.prepare = capture_pcm_prepare,</div><div class='add'>+		.cleanup = capture_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream pcm_analog_alt_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = alt_playback_pcm_open,</div><div class='add'>+		.close = alt_playback_pcm_close,</div><div class='add'>+		.prepare = alt_playback_pcm_prepare,</div><div class='add'>+		.cleanup = alt_playback_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream pcm_analog_alt_capture = {</div><div class='add'>+	.substreams = 2, /* can be overridden */</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = alt_capture_pcm_open,</div><div class='add'>+		.close = alt_capture_pcm_close,</div><div class='add'>+		.prepare = alt_capture_pcm_prepare,</div><div class='add'>+		.cleanup = alt_capture_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream pcm_digital_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = dig_playback_pcm_open,</div><div class='add'>+		.close = dig_playback_pcm_close,</div><div class='add'>+		.prepare = dig_playback_pcm_prepare,</div><div class='add'>+		.cleanup = dig_playback_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream pcm_digital_capture = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	/* NID is set in build_pcms */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Used by build_pcms to flag that a PCM has no playback stream */</div><div class='add'>+static const struct hda_pcm_stream pcm_null_stream = {</div><div class='add'>+	.substreams = 0,</div><div class='add'>+	.channels_min = 0,</div><div class='add'>+	.channels_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dynamic changing ADC PCM streams</div><div class='add'>+ */</div><div class='add'>+static bool dyn_adc_pcm_resetup(struct hda_codec *codec, int cur)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t new_adc = spec-&gt;adc_nids[spec-&gt;dyn_adc_idx[cur]];</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cur_adc &amp;&amp; spec-&gt;cur_adc != new_adc) {</div><div class='add'>+		/* stream is running, let's swap the current ADC */</div><div class='add'>+		__snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc, 1);</div><div class='add'>+		spec-&gt;cur_adc = new_adc;</div><div class='add'>+		snd_hda_codec_setup_stream(codec, new_adc,</div><div class='add'>+					   spec-&gt;cur_adc_stream_tag, 0,</div><div class='add'>+					   spec-&gt;cur_adc_format);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* analog capture with dynamic dual-adc changes */</div><div class='add'>+static int dyn_adc_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				       struct hda_codec *codec,</div><div class='add'>+				       unsigned int stream_tag,</div><div class='add'>+				       unsigned int format,</div><div class='add'>+				       struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;cur_adc = spec-&gt;adc_nids[spec-&gt;dyn_adc_idx[spec-&gt;cur_mux[0]]];</div><div class='add'>+	spec-&gt;cur_adc_stream_tag = stream_tag;</div><div class='add'>+	spec-&gt;cur_adc_format = format;</div><div class='add'>+	snd_hda_codec_setup_stream(codec, spec-&gt;cur_adc, stream_tag, 0, format);</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_PREPARE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dyn_adc_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				       struct hda_codec *codec,</div><div class='add'>+				       struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc);</div><div class='add'>+	spec-&gt;cur_adc = 0;</div><div class='add'>+	call_pcm_capture_hook(hinfo, codec, substream, HDA_GEN_PCM_ACT_CLEANUP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream dyn_adc_pcm_analog_capture = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	.nid = 0, /* fill later */</div><div class='add'>+	.ops = {</div><div class='add'>+		.prepare = dyn_adc_capture_pcm_prepare,</div><div class='add'>+		.cleanup = dyn_adc_capture_pcm_cleanup</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void fill_pcm_stream_name(char *str, size_t len, const char *sfx,</div><div class='add'>+				 const char *chip_name)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	if (*str)</div><div class='add'>+		return;</div><div class='add'>+	strscpy(str, chip_name, len);</div><div class='add'>+</div><div class='add'>+	/* drop non-alnum chars after a space */</div><div class='add'>+	for (p = strchr(str, ' '); p; p = strchr(p + 1, ' ')) {</div><div class='add'>+		if (!isalnum(p[1])) {</div><div class='add'>+			*p = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	strlcat(str, sfx, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copy PCM stream info from @default_str, and override non-NULL entries</div><div class='add'>+ * from @spec_str and @nid</div><div class='add'>+ */</div><div class='add'>+static void setup_pcm_stream(struct hda_pcm_stream *str,</div><div class='add'>+			     const struct hda_pcm_stream *default_str,</div><div class='add'>+			     const struct hda_pcm_stream *spec_str,</div><div class='add'>+			     hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	*str = *default_str;</div><div class='add'>+	if (nid)</div><div class='add'>+		str-&gt;nid = nid;</div><div class='add'>+	if (spec_str) {</div><div class='add'>+		if (spec_str-&gt;substreams)</div><div class='add'>+			str-&gt;substreams = spec_str-&gt;substreams;</div><div class='add'>+		if (spec_str-&gt;channels_min)</div><div class='add'>+			str-&gt;channels_min = spec_str-&gt;channels_min;</div><div class='add'>+		if (spec_str-&gt;channels_max)</div><div class='add'>+			str-&gt;channels_max = spec_str-&gt;channels_max;</div><div class='add'>+		if (spec_str-&gt;rates)</div><div class='add'>+			str-&gt;rates = spec_str-&gt;rates;</div><div class='add'>+		if (spec_str-&gt;formats)</div><div class='add'>+			str-&gt;formats = spec_str-&gt;formats;</div><div class='add'>+		if (spec_str-&gt;maxbps)</div><div class='add'>+			str-&gt;maxbps = spec_str-&gt;maxbps;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_build_pcms - build PCM streams based on the parsed results</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Pass this to build_pcms hda_codec_ops.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+	bool have_multi_adcs;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;no_analog)</div><div class='add'>+		goto skip_analog;</div><div class='add'>+</div><div class='add'>+	fill_pcm_stream_name(spec-&gt;stream_name_analog,</div><div class='add'>+			     sizeof(spec-&gt;stream_name_analog),</div><div class='add'>+			     " Analog", codec-&gt;core.chip_name);</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "%s", spec-&gt;stream_name_analog);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec-&gt;pcm_rec[0] = info;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multiout.num_dacs &gt; 0) {</div><div class='add'>+		setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='add'>+				 &amp;pcm_analog_playback,</div><div class='add'>+				 spec-&gt;stream_analog_playback,</div><div class='add'>+				 spec-&gt;multiout.dac_nids[0]);</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='add'>+			spec-&gt;multiout.max_channels;</div><div class='add'>+		if (spec-&gt;autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT &amp;&amp;</div><div class='add'>+		    spec-&gt;autocfg.line_outs == 2)</div><div class='add'>+			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].chmap =</div><div class='add'>+				snd_pcm_2_1_chmaps;</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;num_adc_nids) {</div><div class='add'>+		setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE],</div><div class='add'>+				 (spec-&gt;dyn_adc_switch ?</div><div class='add'>+				  &amp;dyn_adc_pcm_analog_capture : &amp;pcm_analog_capture),</div><div class='add'>+				 spec-&gt;stream_analog_capture,</div><div class='add'>+				 spec-&gt;adc_nids[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ skip_analog:</div><div class='add'>+	/* SPDIF for stream index #1 */</div><div class='add'>+	if (spec-&gt;multiout.dig_out_nid || spec-&gt;dig_in_nid) {</div><div class='add'>+		fill_pcm_stream_name(spec-&gt;stream_name_digital,</div><div class='add'>+				     sizeof(spec-&gt;stream_name_digital),</div><div class='add'>+				     " Digital", codec-&gt;core.chip_name);</div><div class='add'>+		info = snd_hda_codec_pcm_new(codec, "%s",</div><div class='add'>+					     spec-&gt;stream_name_digital);</div><div class='add'>+		if (!info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		codec-&gt;follower_dig_outs = spec-&gt;multiout.follower_dig_outs;</div><div class='add'>+		spec-&gt;pcm_rec[1] = info;</div><div class='add'>+		if (spec-&gt;dig_out_type)</div><div class='add'>+			info-&gt;pcm_type = spec-&gt;dig_out_type;</div><div class='add'>+		else</div><div class='add'>+			info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='add'>+		if (spec-&gt;multiout.dig_out_nid)</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='add'>+					 &amp;pcm_digital_playback,</div><div class='add'>+					 spec-&gt;stream_digital_playback,</div><div class='add'>+					 spec-&gt;multiout.dig_out_nid);</div><div class='add'>+		if (spec-&gt;dig_in_nid)</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE],</div><div class='add'>+					 &amp;pcm_digital_capture,</div><div class='add'>+					 spec-&gt;stream_digital_capture,</div><div class='add'>+					 spec-&gt;dig_in_nid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;no_analog)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If the use of more than one ADC is requested for the current</div><div class='add'>+	 * model, configure a second analog capture-only PCM.</div><div class='add'>+	 */</div><div class='add'>+	have_multi_adcs = (spec-&gt;num_adc_nids &gt; 1) &amp;&amp;</div><div class='add'>+		!spec-&gt;dyn_adc_switch &amp;&amp; !spec-&gt;auto_mic;</div><div class='add'>+	/* Additional Analaog capture for index #2 */</div><div class='add'>+	if (spec-&gt;alt_dac_nid || have_multi_adcs) {</div><div class='add'>+		fill_pcm_stream_name(spec-&gt;stream_name_alt_analog,</div><div class='add'>+				     sizeof(spec-&gt;stream_name_alt_analog),</div><div class='add'>+			     " Alt Analog", codec-&gt;core.chip_name);</div><div class='add'>+		info = snd_hda_codec_pcm_new(codec, "%s",</div><div class='add'>+					     spec-&gt;stream_name_alt_analog);</div><div class='add'>+		if (!info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		spec-&gt;pcm_rec[2] = info;</div><div class='add'>+		if (spec-&gt;alt_dac_nid)</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='add'>+					 &amp;pcm_analog_alt_playback,</div><div class='add'>+					 spec-&gt;stream_analog_alt_playback,</div><div class='add'>+					 spec-&gt;alt_dac_nid);</div><div class='add'>+		else</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK],</div><div class='add'>+					 &amp;pcm_null_stream, NULL, 0);</div><div class='add'>+		if (have_multi_adcs) {</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE],</div><div class='add'>+					 &amp;pcm_analog_alt_capture,</div><div class='add'>+					 spec-&gt;stream_analog_alt_capture,</div><div class='add'>+					 spec-&gt;adc_nids[1]);</div><div class='add'>+			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams =</div><div class='add'>+				spec-&gt;num_adc_nids - 1;</div><div class='add'>+		} else {</div><div class='add'>+			setup_pcm_stream(&amp;info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE],</div><div class='add'>+					 &amp;pcm_null_stream, NULL, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_build_pcms);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Standard auto-parser initializations</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* configure the given path as a proper output */</div><div class='add'>+static void set_output_and_unmute(struct hda_codec *codec, int path_idx)</div><div class='add'>+{</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	hda_nid_t pin;</div><div class='add'>+</div><div class='add'>+	path = snd_hda_get_path_from_idx(codec, path_idx);</div><div class='add'>+	if (!path || !path-&gt;depth)</div><div class='add'>+		return;</div><div class='add'>+	pin = path-&gt;path[path-&gt;depth - 1];</div><div class='add'>+	restore_pin_ctl(codec, pin);</div><div class='add'>+	snd_hda_activate_path(codec, path, path-&gt;active,</div><div class='add'>+			      aamix_default(codec-&gt;spec));</div><div class='add'>+	set_pin_eapd(codec, pin, path-&gt;active);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize primary output paths */</div><div class='add'>+static void init_multi_out(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='add'>+		set_output_and_unmute(codec, spec-&gt;out_paths[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void __init_extra_out(struct hda_codec *codec, int num_outs, int *paths)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_outs; i++)</div><div class='add'>+		set_output_and_unmute(codec, paths[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize hp and speaker paths */</div><div class='add'>+static void init_extra_out(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type != AUTO_PIN_HP_OUT)</div><div class='add'>+		__init_extra_out(codec, spec-&gt;autocfg.hp_outs, spec-&gt;hp_paths);</div><div class='add'>+	if (spec-&gt;autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='add'>+		__init_extra_out(codec, spec-&gt;autocfg.speaker_outs,</div><div class='add'>+				 spec-&gt;speaker_paths);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize multi-io paths */</div><div class='add'>+static void init_multi_io(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;multi_ios; i++) {</div><div class='add'>+		hda_nid_t pin = spec-&gt;multi_io[i].pin;</div><div class='add'>+		struct nid_path *path;</div><div class='add'>+		path = get_multiio_path(codec, i);</div><div class='add'>+		if (!path)</div><div class='add'>+			continue;</div><div class='add'>+		if (!spec-&gt;multi_io[i].ctl_in)</div><div class='add'>+			spec-&gt;multi_io[i].ctl_in =</div><div class='add'>+				snd_hda_codec_get_pin_target(codec, pin);</div><div class='add'>+		snd_hda_activate_path(codec, path, path-&gt;active,</div><div class='add'>+				      aamix_default(spec));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_aamix_paths(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;have_aamix_ctl)</div><div class='add'>+		return;</div><div class='add'>+	if (!has_aamix_out_paths(spec))</div><div class='add'>+		return;</div><div class='add'>+	update_aamix_paths(codec, spec-&gt;aamix_mode, spec-&gt;out_paths[0],</div><div class='add'>+			   spec-&gt;aamix_out_paths[0],</div><div class='add'>+			   spec-&gt;autocfg.line_out_type);</div><div class='add'>+	update_aamix_paths(codec, spec-&gt;aamix_mode, spec-&gt;hp_paths[0],</div><div class='add'>+			   spec-&gt;aamix_out_paths[1],</div><div class='add'>+			   AUTO_PIN_HP_OUT);</div><div class='add'>+	update_aamix_paths(codec, spec-&gt;aamix_mode, spec-&gt;speaker_paths[0],</div><div class='add'>+			   spec-&gt;aamix_out_paths[2],</div><div class='add'>+			   AUTO_PIN_SPEAKER_OUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up input pins and loopback paths */</div><div class='add'>+static void init_analog_input(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='add'>+		if (is_input_pin(codec, nid))</div><div class='add'>+			restore_pin_ctl(codec, nid);</div><div class='add'>+</div><div class='add'>+		/* init loopback inputs */</div><div class='add'>+		if (spec-&gt;mixer_nid) {</div><div class='add'>+			resume_path_from_idx(codec, spec-&gt;loopback_paths[i]);</div><div class='add'>+			resume_path_from_idx(codec, spec-&gt;loopback_merge_path);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize ADC paths */</div><div class='add'>+static void init_input_src(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;input_mux;</div><div class='add'>+	struct nid_path *path;</div><div class='add'>+	int i, c, nums;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dyn_adc_switch)</div><div class='add'>+		nums = 1;</div><div class='add'>+	else</div><div class='add'>+		nums = spec-&gt;num_adc_nids;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; nums; c++) {</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			path = get_input_path(codec, c, i);</div><div class='add'>+			if (path) {</div><div class='add'>+				bool active = path-&gt;active;</div><div class='add'>+				if (i == spec-&gt;cur_mux[c])</div><div class='add'>+					active = true;</div><div class='add'>+				snd_hda_activate_path(codec, path, active, false);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (spec-&gt;hp_mic)</div><div class='add'>+			update_hp_mic(codec, c, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cap_sync_hook)</div><div class='add'>+		spec-&gt;cap_sync_hook(codec, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set right pin controls for digital I/O */</div><div class='add'>+static void init_digital(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+	hda_nid_t pin;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;autocfg.dig_outs; i++)</div><div class='add'>+		set_output_and_unmute(codec, spec-&gt;digout_paths[i]);</div><div class='add'>+	pin = spec-&gt;autocfg.dig_in_pin;</div><div class='add'>+	if (pin) {</div><div class='add'>+		restore_pin_ctl(codec, pin);</div><div class='add'>+		resume_path_from_idx(codec, spec-&gt;digin_path);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clear unsol-event tags on unused pins; Conexant codecs seem to leave</div><div class='add'>+ * invalid unsol tags by some reason</div><div class='add'>+ */</div><div class='add'>+static void clear_unsol_on_unused_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_pins, i, pin) {</div><div class='add'>+		hda_nid_t nid = pin-&gt;nid;</div><div class='add'>+		if (is_jack_detectable(codec, nid) &amp;&amp;</div><div class='add'>+		    !snd_hda_jack_tbl_get(codec, nid))</div><div class='add'>+			snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+					AC_VERB_SET_UNSOLICITED_ENABLE, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_init - initialize the generic spec</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * This can be put as hda_codec_ops init function.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;init_hook)</div><div class='add'>+		spec-&gt;init_hook(codec);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;skip_verbs)</div><div class='add'>+		snd_hda_apply_verbs(codec);</div><div class='add'>+</div><div class='add'>+	init_multi_out(codec);</div><div class='add'>+	init_extra_out(codec);</div><div class='add'>+	init_multi_io(codec);</div><div class='add'>+	init_aamix_paths(codec);</div><div class='add'>+	init_analog_input(codec);</div><div class='add'>+	init_input_src(codec);</div><div class='add'>+	init_digital(codec);</div><div class='add'>+</div><div class='add'>+	clear_unsol_on_unused_pins(codec);</div><div class='add'>+</div><div class='add'>+	sync_all_pin_power_ctls(codec);</div><div class='add'>+</div><div class='add'>+	/* call init functions of standard auto-mute helpers */</div><div class='add'>+	update_automute_all(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vmaster_mute.sw_kctl &amp;&amp; spec-&gt;vmaster_mute.hook)</div><div class='add'>+		snd_hda_sync_vmaster_hook(&amp;spec-&gt;vmaster_mute);</div><div class='add'>+</div><div class='add'>+	hda_call_check_power_status(codec, 0x01);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_remove - free the generic spec</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * This can be put as hda_codec_ops remove function.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_gen_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_FREE);</div><div class='add'>+	snd_hda_gen_spec_free(codec-&gt;spec);</div><div class='add'>+	kfree(codec-&gt;spec);</div><div class='add'>+	codec-&gt;spec = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_remove);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_gen_check_power_status - check the loopback power save state</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to inspect</div><div class='add'>+ *</div><div class='add'>+ * This can be put as hda_codec_ops check_power_status function.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;loopback, nid);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_gen_check_power_status);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the generic codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int snd_hda_gen_probe(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hda_gen_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_hda_gen_spec_init(spec);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops generic_codec_ops = {</div><div class='add'>+	.probe = snd_hda_gen_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = snd_hda_gen_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_generic[] = {</div><div class='add'>+	HDA_CODEC_ID(0x1af40021, "Generic"), /* QEMU */</div><div class='add'>+	HDA_CODEC_ID(HDA_CODEC_ID_GENERIC, "Generic"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_generic);</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver generic_driver = {</div><div class='add'>+	.id = snd_hda_id_generic,</div><div class='add'>+	.ops = &amp;generic_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(generic_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Generic HD-audio codec parser");</div><div class='head'>diff --git a/sound/hda/codecs/generic.h b/sound/hda/codecs/generic.h<br/>new file mode 100644<br/>index 000000000000..524591821f8c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/generic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/generic.h</a></div><div class='hunk'>@@ -0,0 +1,357 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Generic BIOS auto-parser helper functions for HD-audio</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_HDA_GENERIC_H</div><div class='add'>+#define __SOUND_HDA_GENERIC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+</div><div class='add'>+struct hda_jack_callback;</div><div class='add'>+</div><div class='add'>+/* table entry for multi-io paths */</div><div class='add'>+struct hda_multi_io {</div><div class='add'>+	hda_nid_t pin;		/* multi-io widget pin NID */</div><div class='add'>+	hda_nid_t dac;		/* DAC to be connected */</div><div class='add'>+	unsigned int ctl_in;	/* cached input-pin control value */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Widget connection path</div><div class='add'>+ *</div><div class='add'>+ * For output, stored in the order of DAC -&gt; ... -&gt; pin,</div><div class='add'>+ * for input, pin -&gt; ... -&gt; ADC.</div><div class='add'>+ *</div><div class='add'>+ * idx[i] contains the source index number to select on of the widget path[i];</div><div class='add'>+ * e.g. idx[1] is the index of the DAC (path[0]) selected by path[1] widget</div><div class='add'>+ * multi[] indicates whether it's a selector widget with multi-connectors</div><div class='add'>+ * (i.e. the connection selection is mandatory)</div><div class='add'>+ * vol_ctl and mute_ctl contains the NIDs for the assigned mixers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MAX_NID_PATH_DEPTH	10</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NID_PATH_VOL_CTL,</div><div class='add'>+	NID_PATH_MUTE_CTL,</div><div class='add'>+	NID_PATH_BOOST_CTL,</div><div class='add'>+	NID_PATH_NUM_CTLS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nid_path {</div><div class='add'>+	int depth;</div><div class='add'>+	hda_nid_t path[MAX_NID_PATH_DEPTH];</div><div class='add'>+	unsigned char idx[MAX_NID_PATH_DEPTH];</div><div class='add'>+	unsigned char multi[MAX_NID_PATH_DEPTH];</div><div class='add'>+	unsigned int ctls[NID_PATH_NUM_CTLS]; /* NID_PATH_XXX_CTL */</div><div class='add'>+	bool active:1;		/* activated by driver */</div><div class='add'>+	bool pin_enabled:1;	/* pins are enabled */</div><div class='add'>+	bool pin_fixed:1;	/* path with fixed pin */</div><div class='add'>+	bool stream_enabled:1;	/* stream is active */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mic/line-in auto switching entry */</div><div class='add'>+</div><div class='add'>+#define MAX_AUTO_MIC_PINS	3</div><div class='add'>+</div><div class='add'>+struct automic_entry {</div><div class='add'>+	hda_nid_t pin;		/* pin */</div><div class='add'>+	int idx;		/* imux index, -1 = invalid */</div><div class='add'>+	unsigned int attr;	/* pin attribute (INPUT_PIN_ATTR_*) */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* active stream id */</div><div class='add'>+enum { STREAM_MULTI_OUT, STREAM_INDEP_HP };</div><div class='add'>+</div><div class='add'>+/* PCM hook action */</div><div class='add'>+enum {</div><div class='add'>+	HDA_GEN_PCM_ACT_OPEN,</div><div class='add'>+	HDA_GEN_PCM_ACT_PREPARE,</div><div class='add'>+	HDA_GEN_PCM_ACT_CLEANUP,</div><div class='add'>+	HDA_GEN_PCM_ACT_CLOSE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DAC assignment badness table */</div><div class='add'>+struct badness_table {</div><div class='add'>+	int no_primary_dac;	/* no primary DAC */</div><div class='add'>+	int no_dac;		/* no secondary DACs */</div><div class='add'>+	int shared_primary;	/* primary DAC is shared with main output */</div><div class='add'>+	int shared_surr;	/* secondary DAC shared with main or primary */</div><div class='add'>+	int shared_clfe;	/* third DAC shared with main or primary */</div><div class='add'>+	int shared_surr_main;	/* secondary DAC sahred with main/DAC0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct badness_table hda_main_out_badness;</div><div class='add'>+extern const struct badness_table hda_extra_out_badness;</div><div class='add'>+</div><div class='add'>+struct hda_gen_spec {</div><div class='add'>+	char stream_name_analog[32];	/* analog PCM stream */</div><div class='add'>+	const struct hda_pcm_stream *stream_analog_playback;</div><div class='add'>+	const struct hda_pcm_stream *stream_analog_capture;</div><div class='add'>+</div><div class='add'>+	char stream_name_alt_analog[32]; /* alternative analog PCM stream */</div><div class='add'>+	const struct hda_pcm_stream *stream_analog_alt_playback;</div><div class='add'>+	const struct hda_pcm_stream *stream_analog_alt_capture;</div><div class='add'>+</div><div class='add'>+	char stream_name_digital[32];	/* digital PCM stream */</div><div class='add'>+	const struct hda_pcm_stream *stream_digital_playback;</div><div class='add'>+	const struct hda_pcm_stream *stream_digital_capture;</div><div class='add'>+</div><div class='add'>+	/* PCM */</div><div class='add'>+	unsigned int active_streams;</div><div class='add'>+	struct mutex pcm_mutex;</div><div class='add'>+</div><div class='add'>+	/* playback */</div><div class='add'>+	struct hda_multi_out multiout;	/* playback set-up</div><div class='add'>+					 * max_channels, dacs must be set</div><div class='add'>+					 * dig_out_nid and hp_nid are optional</div><div class='add'>+					 */</div><div class='add'>+	hda_nid_t alt_dac_nid;</div><div class='add'>+	hda_nid_t follower_dig_outs[3];	/* optional - for auto-parsing */</div><div class='add'>+	int dig_out_type;</div><div class='add'>+</div><div class='add'>+	/* capture */</div><div class='add'>+	unsigned int num_adc_nids;</div><div class='add'>+	hda_nid_t adc_nids[AUTO_CFG_MAX_INS];</div><div class='add'>+	hda_nid_t dig_in_nid;		/* digital-in NID; optional */</div><div class='add'>+	hda_nid_t mixer_nid;		/* analog-mixer NID */</div><div class='add'>+	hda_nid_t mixer_merge_nid;	/* aamix merge-point NID (optional) */</div><div class='add'>+	const char *input_labels[HDA_MAX_NUM_INPUTS];</div><div class='add'>+	int input_label_idxs[HDA_MAX_NUM_INPUTS];</div><div class='add'>+</div><div class='add'>+	/* capture setup for dynamic dual-adc switch */</div><div class='add'>+	hda_nid_t cur_adc;</div><div class='add'>+	unsigned int cur_adc_stream_tag;</div><div class='add'>+	unsigned int cur_adc_format;</div><div class='add'>+</div><div class='add'>+	/* capture source */</div><div class='add'>+	struct hda_input_mux input_mux;</div><div class='add'>+	unsigned int cur_mux[3];</div><div class='add'>+</div><div class='add'>+	/* channel model */</div><div class='add'>+	/* min_channel_count contains the minimum channel count for primary</div><div class='add'>+	 * outputs.  When multi_ios is set, the channels can be configured</div><div class='add'>+	 * between min_channel_count and (min_channel_count + multi_ios * 2).</div><div class='add'>+	 *</div><div class='add'>+	 * ext_channel_count contains the current channel count of the primary</div><div class='add'>+	 * out.  This varies in the range above.</div><div class='add'>+	 *</div><div class='add'>+	 * Meanwhile, const_channel_count is the channel count for all outputs</div><div class='add'>+	 * including headphone and speakers.  It's a constant value, and the</div><div class='add'>+	 * PCM is set up as max(ext_channel_count, const_channel_count).</div><div class='add'>+	 */</div><div class='add'>+	int min_channel_count;		/* min. channel count for primary out */</div><div class='add'>+	int ext_channel_count;		/* current channel count for primary */</div><div class='add'>+	int const_channel_count;	/* channel count for all */</div><div class='add'>+</div><div class='add'>+	/* PCM information */</div><div class='add'>+	struct hda_pcm *pcm_rec[3];	/* used in build_pcms() */</div><div class='add'>+</div><div class='add'>+	/* dynamic controls, init_verbs and input_mux */</div><div class='add'>+	struct auto_pin_cfg autocfg;</div><div class='add'>+	struct snd_array kctls;</div><div class='add'>+	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	hda_nid_t imux_pins[HDA_MAX_NUM_INPUTS];</div><div class='add'>+	unsigned int dyn_adc_idx[HDA_MAX_NUM_INPUTS];</div><div class='add'>+	/* shared hp/mic */</div><div class='add'>+	hda_nid_t shared_mic_vref_pin;</div><div class='add'>+	hda_nid_t hp_mic_pin;</div><div class='add'>+	int hp_mic_mux_idx;</div><div class='add'>+</div><div class='add'>+	/* DAC/ADC lists */</div><div class='add'>+	int num_all_dacs;</div><div class='add'>+	hda_nid_t all_dacs[16];</div><div class='add'>+	int num_all_adcs;</div><div class='add'>+	hda_nid_t all_adcs[AUTO_CFG_MAX_INS];</div><div class='add'>+</div><div class='add'>+	/* path list */</div><div class='add'>+	struct snd_array paths;</div><div class='add'>+</div><div class='add'>+	/* path indices */</div><div class='add'>+	int out_paths[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int hp_paths[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int speaker_paths[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int aamix_out_paths[3];</div><div class='add'>+	int digout_paths[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int input_paths[HDA_MAX_NUM_INPUTS][AUTO_CFG_MAX_INS];</div><div class='add'>+	int loopback_paths[HDA_MAX_NUM_INPUTS];</div><div class='add'>+	int loopback_merge_path;</div><div class='add'>+	int digin_path;</div><div class='add'>+</div><div class='add'>+	/* auto-mic stuff */</div><div class='add'>+	int am_num_entries;</div><div class='add'>+	struct automic_entry am_entry[MAX_AUTO_MIC_PINS];</div><div class='add'>+</div><div class='add'>+	/* for pin sensing */</div><div class='add'>+	/* current status; set in hda_generic.c */</div><div class='add'>+	unsigned int hp_jack_present:1;</div><div class='add'>+	unsigned int line_jack_present:1;</div><div class='add'>+	unsigned int speaker_muted:1; /* current status of speaker mute */</div><div class='add'>+	unsigned int line_out_muted:1; /* current status of LO mute */</div><div class='add'>+</div><div class='add'>+	/* internal states of automute / autoswitch behavior */</div><div class='add'>+	unsigned int auto_mic:1;</div><div class='add'>+	unsigned int automute_speaker:1; /* automute speaker outputs */</div><div class='add'>+	unsigned int automute_lo:1; /* automute LO outputs */</div><div class='add'>+</div><div class='add'>+	/* capabilities detected by parser */</div><div class='add'>+	unsigned int detect_hp:1;	/* Headphone detection enabled */</div><div class='add'>+	unsigned int detect_lo:1;	/* Line-out detection enabled */</div><div class='add'>+	unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */</div><div class='add'>+	unsigned int automute_lo_possible:1;	  /* there are line outs and HP */</div><div class='add'>+</div><div class='add'>+	/* additional parameters set by codec drivers */</div><div class='add'>+	unsigned int master_mute:1;	/* master mute over all */</div><div class='add'>+	unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */</div><div class='add'>+	unsigned int line_in_auto_switch:1; /* allow line-in auto switch */</div><div class='add'>+	unsigned int auto_mute_via_amp:1; /* auto-mute via amp instead of pinctl */</div><div class='add'>+</div><div class='add'>+	/* parser behavior flags; set before snd_hda_gen_parse_auto_config() */</div><div class='add'>+	unsigned int suppress_auto_mute:1; /* suppress input jack auto mute */</div><div class='add'>+	unsigned int suppress_auto_mic:1; /* suppress input jack auto switch */</div><div class='add'>+</div><div class='add'>+	/* other parse behavior flags */</div><div class='add'>+	unsigned int need_dac_fix:1; /* need to limit DACs for multi channels */</div><div class='add'>+	unsigned int hp_mic:1; /* Allow HP as a mic-in */</div><div class='add'>+	unsigned int suppress_hp_mic_detect:1; /* Don't detect HP/mic */</div><div class='add'>+	unsigned int no_primary_hp:1; /* Don't prefer HP pins to speaker pins */</div><div class='add'>+	unsigned int no_multi_io:1; /* Don't try multi I/O config */</div><div class='add'>+	unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */</div><div class='add'>+	unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */</div><div class='add'>+	unsigned int own_eapd_ctl:1; /* set EAPD by own function */</div><div class='add'>+	unsigned int keep_eapd_on:1; /* don't turn off EAPD automatically */</div><div class='add'>+	unsigned int vmaster_mute_led:1; /* add SPK-LED flag to vmaster mute switch */</div><div class='add'>+	unsigned int mic_mute_led:1; /* add MIC-LED flag to capture mute switch */</div><div class='add'>+	unsigned int indep_hp:1; /* independent HP supported */</div><div class='add'>+	unsigned int prefer_hp_amp:1; /* enable HP amp for speaker if any */</div><div class='add'>+	unsigned int add_stereo_mix_input:2; /* add aamix as a capture src */</div><div class='add'>+	unsigned int add_jack_modes:1; /* add i/o jack mode enum ctls */</div><div class='add'>+	unsigned int power_down_unused:1; /* power down unused widgets */</div><div class='add'>+	unsigned int dac_min_mute:1; /* minimal = mute for DACs */</div><div class='add'>+	unsigned int suppress_vmaster:1; /* don't create vmaster kctls */</div><div class='add'>+</div><div class='add'>+	/* other internal flags */</div><div class='add'>+	unsigned int no_analog:1; /* digital I/O only */</div><div class='add'>+	unsigned int dyn_adc_switch:1; /* switch ADCs (for ALC275) */</div><div class='add'>+	unsigned int indep_hp_enabled:1; /* independent HP enabled */</div><div class='add'>+	unsigned int have_aamix_ctl:1;</div><div class='add'>+	unsigned int hp_mic_jack_modes:1;</div><div class='add'>+	unsigned int skip_verbs:1; /* don't apply verbs at snd_hda_gen_init() */</div><div class='add'>+</div><div class='add'>+	/* additional mute flags (only effective with auto_mute_via_amp=1) */</div><div class='add'>+	u64 mute_bits;</div><div class='add'>+</div><div class='add'>+	/* bitmask for skipping volume controls */</div><div class='add'>+	u64 out_vol_mask;</div><div class='add'>+</div><div class='add'>+	/* badness tables for output path evaluations */</div><div class='add'>+	const struct badness_table *main_out_badness;</div><div class='add'>+	const struct badness_table *extra_out_badness;</div><div class='add'>+</div><div class='add'>+	/* preferred pin/DAC pairs; an array of paired NIDs */</div><div class='add'>+	const hda_nid_t *preferred_dacs;</div><div class='add'>+</div><div class='add'>+	/* loopback mixing mode */</div><div class='add'>+	bool aamix_mode;</div><div class='add'>+</div><div class='add'>+	/* digital beep */</div><div class='add'>+	hda_nid_t beep_nid;</div><div class='add'>+</div><div class='add'>+	/* for virtual master */</div><div class='add'>+	hda_nid_t vmaster_nid;</div><div class='add'>+	unsigned int vmaster_tlv[4];</div><div class='add'>+	struct hda_vmaster_mute_hook vmaster_mute;</div><div class='add'>+</div><div class='add'>+	struct hda_loopback_check loopback;</div><div class='add'>+	struct snd_array loopback_list;</div><div class='add'>+</div><div class='add'>+	/* multi-io */</div><div class='add'>+	int multi_ios;</div><div class='add'>+	struct hda_multi_io multi_io[4];</div><div class='add'>+</div><div class='add'>+	/* hooks */</div><div class='add'>+	void (*init_hook)(struct hda_codec *codec);</div><div class='add'>+	void (*automute_hook)(struct hda_codec *codec);</div><div class='add'>+	void (*cap_sync_hook)(struct hda_codec *codec,</div><div class='add'>+			      struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol);</div><div class='add'>+</div><div class='add'>+	/* PCM hooks */</div><div class='add'>+	void (*pcm_playback_hook)(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  int action);</div><div class='add'>+	void (*pcm_capture_hook)(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream,</div><div class='add'>+				 int action);</div><div class='add'>+</div><div class='add'>+	/* automute / autoswitch hooks */</div><div class='add'>+	void (*hp_automute_hook)(struct hda_codec *codec,</div><div class='add'>+				 struct hda_jack_callback *cb);</div><div class='add'>+	void (*line_automute_hook)(struct hda_codec *codec,</div><div class='add'>+				   struct hda_jack_callback *cb);</div><div class='add'>+	void (*mic_autoswitch_hook)(struct hda_codec *codec,</div><div class='add'>+				    struct hda_jack_callback *cb);</div><div class='add'>+</div><div class='add'>+	/* leds */</div><div class='add'>+	struct led_classdev *led_cdevs[NUM_AUDIO_LEDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* values for add_stereo_mix_input flag */</div><div class='add'>+enum {</div><div class='add'>+	HDA_HINT_STEREO_MIX_DISABLE,	/* No stereo mix input */</div><div class='add'>+	HDA_HINT_STEREO_MIX_ENABLE,	/* Add stereo mix input */</div><div class='add'>+	HDA_HINT_STEREO_MIX_AUTO,	/* Add only if auto-mic is disabled */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_gen_spec_init(struct hda_gen_spec *spec);</div><div class='add'>+</div><div class='add'>+int snd_hda_gen_init(struct hda_codec *codec);</div><div class='add'>+void snd_hda_gen_remove(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int snd_hda_get_path_idx(struct hda_codec *codec, struct nid_path *path);</div><div class='add'>+struct nid_path *snd_hda_get_path_from_idx(struct hda_codec *codec, int idx);</div><div class='add'>+struct nid_path *</div><div class='add'>+snd_hda_add_new_path(struct hda_codec *codec, hda_nid_t from_nid,</div><div class='add'>+		     hda_nid_t to_nid, int anchor_nid);</div><div class='add'>+void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path,</div><div class='add'>+			   bool enable, bool add_aamix);</div><div class='add'>+</div><div class='add'>+struct snd_kcontrol_new *</div><div class='add'>+snd_hda_gen_add_kctl(struct hda_gen_spec *spec, const char *name,</div><div class='add'>+		     const struct snd_kcontrol_new *temp);</div><div class='add'>+</div><div class='add'>+int snd_hda_gen_parse_auto_config(struct hda_codec *codec,</div><div class='add'>+				  struct auto_pin_cfg *cfg);</div><div class='add'>+int snd_hda_gen_build_controls(struct hda_codec *codec);</div><div class='add'>+int snd_hda_gen_build_pcms(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+/* standard jack event callbacks */</div><div class='add'>+void snd_hda_gen_hp_automute(struct hda_codec *codec,</div><div class='add'>+			     struct hda_jack_callback *jack);</div><div class='add'>+void snd_hda_gen_line_automute(struct hda_codec *codec,</div><div class='add'>+			       struct hda_jack_callback *jack);</div><div class='add'>+void snd_hda_gen_mic_autoswitch(struct hda_codec *codec,</div><div class='add'>+				struct hda_jack_callback *jack);</div><div class='add'>+void snd_hda_gen_update_outputs(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid);</div><div class='add'>+unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec,</div><div class='add'>+					   hda_nid_t nid,</div><div class='add'>+					   unsigned int power_state);</div><div class='add'>+void snd_hda_gen_stream_pm(struct hda_codec *codec, hda_nid_t nid, bool on);</div><div class='add'>+int snd_hda_gen_fix_pin_power(struct hda_codec *codec, hda_nid_t pin);</div><div class='add'>+</div><div class='add'>+int snd_hda_gen_add_mute_led_cdev(struct hda_codec *codec,</div><div class='add'>+				  int (*callback)(struct led_classdev *,</div><div class='add'>+						  enum led_brightness));</div><div class='add'>+int snd_hda_gen_add_micmute_led_cdev(struct hda_codec *codec,</div><div class='add'>+				     int (*callback)(struct led_classdev *,</div><div class='add'>+						     enum led_brightness));</div><div class='add'>+bool snd_hda_gen_shutup_speakers(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_HDA_GENERIC_H */</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/Kconfig b/sound/hda/codecs/hdmi/Kconfig<br/>new file mode 100644<br/>index 000000000000..6ea3553ba9f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+menuconfig SND_HDA_CODEC_HDMI</div><div class='add'>+	tristate "HD-audio HDMI codec support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include HD-audio HDMI/DislayPort codec support.</div><div class='add'>+</div><div class='add'>+	  This will enable all HDMI/DP codec drivers as default, but you can</div><div class='add'>+	  enable/disable each codec driver individually, too (only when</div><div class='add'>+	  CONFIG_EXPERT is set).</div><div class='add'>+</div><div class='add'>+if SND_HDA_CODEC_HDMI</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_GENERIC</div><div class='add'>+	tristate "Generic HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_DYNAMIC_MINORS</div><div class='add'>+	select SND_PCM_ELD</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Generic HDMI and DisplayPort HD-audio</div><div class='add'>+	  codec support.</div><div class='add'>+</div><div class='add'>+	  Note that this option mandatorily enables CONFIG_SND_DYNAMIC_MINORS</div><div class='add'>+	  to assure the multiple streams for DP-MST support.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_SIMPLE</div><div class='add'>+	tristate "Simple HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Simple HDMI and DisplayPort HD-audio</div><div class='add'>+	  codec support for VIA and other codecs.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_INTEL</div><div class='add'>+	tristate "Intel HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_HDA_CODEC_HDMI_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Intel graphics HDMI and DisplayPort</div><div class='add'>+	  HD-audio codec support.</div><div class='add'>+</div><div class='add'>+config SND_HDA_INTEL_HDMI_SILENT_STREAM</div><div class='add'>+	bool "Enable Silent Stream always for HDMI"</div><div class='add'>+	depends on SND_HDA_CODEC_HDMI_INTEL</div><div class='add'>+	help</div><div class='add'>+	  Say Y to enable HD-Audio Keep Alive (KAE) aka Silent Stream</div><div class='add'>+	  for HDMI on hardware that supports the feature.</div><div class='add'>+</div><div class='add'>+	  When enabled, the HDMI/DisplayPort codec will continue to provide</div><div class='add'>+	  a continuous clock and a valid but silent data stream to</div><div class='add'>+	  any connected external receiver. This allows to avoid gaps</div><div class='add'>+	  at start of playback. Many receivers require multiple seconds</div><div class='add'>+	  to start playing audio after the clock has been stopped.</div><div class='add'>+	  This feature can impact power consumption as resources</div><div class='add'>+	  are kept reserved both at transmitter and receiver.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_ATI</div><div class='add'>+	tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_HDA_CODEC_HDMI_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include AMD/ATI graphics HDMI and DisplayPort</div><div class='add'>+	  HD-audio codec support.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_NVIDIA</div><div class='add'>+	tristate "Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_HDA_CODEC_HDMI_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include HDMI and DisplayPort HD-audio codec</div><div class='add'>+	  support for the recent Nvidia graphics cards.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_NVIDIA_MCP</div><div class='add'>+	tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_HDA_CODEC_HDMI_SIMPLE</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include HDMI and DisplayPort HD-audio codec</div><div class='add'>+	  support for the legacy Nvidia graphics like MCP73, MCP67, MCP77/78.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_HDMI_TEGRA</div><div class='add'>+	tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support" if EXPERT</div><div class='add'>+	select SND_HDA_CODEC_HDMI_GENERIC</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include HDMI and DisplayPort HD-audio codec</div><div class='add'>+	  support for Nvidia Tegra.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/Makefile b/sound/hda/codecs/hdmi/Makefile<br/>new file mode 100644<br/>index 000000000000..0e49a9421e3b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+subdir-ccflags-y += -I$(src)/../../common</div><div class='add'>+</div><div class='add'>+snd-hda-codec-hdmi-y :=		hdmi.o eld.o</div><div class='add'>+snd-hda-codec-simplehdmi-y :=	simplehdmi.o</div><div class='add'>+snd-hda-codec-intelhdmi-y :=	intelhdmi.o</div><div class='add'>+snd-hda-codec-atihdmi-y :=	atihdmi.o</div><div class='add'>+snd-hda-codec-nvhdmi-y :=	nvhdmi.o</div><div class='add'>+snd-hda-codec-nvhdmi-mcp-y :=	nvhdmi-mcp.o</div><div class='add'>+snd-hda-codec-tegrahdmi-y :=	tegrahdmi.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_GENERIC) += snd-hda-codec-hdmi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_SIMPLE) += snd-hda-codec-simplehdmi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_INTEL) += snd-hda-codec-intelhdmi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_ATI) += snd-hda-codec-atihdmi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_NVIDIA) += snd-hda-codec-nvhdmi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_NVIDIA_MCP) += snd-hda-codec-nvhdmi-mcp.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_HDMI_TEGRA) += snd-hda-codec-tegrahdmi.o</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/atihdmi.c b/sound/hda/codecs/hdmi/atihdmi.c<br/>new file mode 100644<br/>index 000000000000..44366f75de33<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/atihdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/atihdmi.c</a></div><div class='hunk'>@@ -0,0 +1,615 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * ATI/AMD codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+#define is_amdhdmi_rev3_or_later(codec) \</div><div class='add'>+	((codec)-&gt;core.vendor_id == 0x1002aa01 &amp;&amp; \</div><div class='add'>+	 ((codec)-&gt;core.revision_id &amp; 0xff00) &gt;= 0x0300)</div><div class='add'>+#define has_amd_full_remap_support(codec) is_amdhdmi_rev3_or_later(codec)</div><div class='add'>+</div><div class='add'>+/* ATI/AMD specific HDA pin verbs, see the AMD HDA Verbs specification */</div><div class='add'>+#define ATI_VERB_SET_CHANNEL_ALLOCATION	0x771</div><div class='add'>+#define ATI_VERB_SET_DOWNMIX_INFO	0x772</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_01	0x777</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_23	0x778</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_45	0x779</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_67	0x77a</div><div class='add'>+#define ATI_VERB_SET_HBR_CONTROL	0x77c</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_1	0x785</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_3	0x786</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_5	0x787</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_7	0x788</div><div class='add'>+#define ATI_VERB_SET_MULTICHANNEL_MODE	0x789</div><div class='add'>+#define ATI_VERB_GET_CHANNEL_ALLOCATION	0xf71</div><div class='add'>+#define ATI_VERB_GET_DOWNMIX_INFO	0xf72</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_01	0xf77</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_23	0xf78</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_45	0xf79</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_67	0xf7a</div><div class='add'>+#define ATI_VERB_GET_HBR_CONTROL	0xf7c</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_1	0xf85</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_3	0xf86</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_5	0xf87</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_7	0xf88</div><div class='add'>+#define ATI_VERB_GET_MULTICHANNEL_MODE	0xf89</div><div class='add'>+</div><div class='add'>+/* AMD specific HDA cvt verbs */</div><div class='add'>+#define ATI_VERB_SET_RAMP_RATE		0x770</div><div class='add'>+#define ATI_VERB_GET_RAMP_RATE		0xf70</div><div class='add'>+</div><div class='add'>+#define ATI_OUT_ENABLE 0x1</div><div class='add'>+</div><div class='add'>+#define ATI_MULTICHANNEL_MODE_PAIRED	0</div><div class='add'>+#define ATI_MULTICHANNEL_MODE_SINGLE	1</div><div class='add'>+</div><div class='add'>+#define ATI_HBR_CAPABLE 0x01</div><div class='add'>+#define ATI_HBR_ENABLE 0x10</div><div class='add'>+</div><div class='add'>+/* ATI/AMD specific ELD emulation */</div><div class='add'>+</div><div class='add'>+#define ATI_VERB_SET_AUDIO_DESCRIPTOR	0x776</div><div class='add'>+#define ATI_VERB_SET_SINK_INFO_INDEX	0x780</div><div class='add'>+#define ATI_VERB_GET_SPEAKER_ALLOCATION	0xf70</div><div class='add'>+#define ATI_VERB_GET_AUDIO_DESCRIPTOR	0xf76</div><div class='add'>+#define ATI_VERB_GET_AUDIO_VIDEO_DELAY	0xf7b</div><div class='add'>+#define ATI_VERB_GET_SINK_INFO_INDEX	0xf80</div><div class='add'>+#define ATI_VERB_GET_SINK_INFO_DATA	0xf81</div><div class='add'>+</div><div class='add'>+#define ATI_SPKALLOC_SPKALLOC		0x007f</div><div class='add'>+#define ATI_SPKALLOC_TYPE_HDMI		0x0100</div><div class='add'>+#define ATI_SPKALLOC_TYPE_DISPLAYPORT	0x0200</div><div class='add'>+</div><div class='add'>+/* first three bytes are just standard SAD */</div><div class='add'>+#define ATI_AUDIODESC_CHANNELS		0x00000007</div><div class='add'>+#define ATI_AUDIODESC_RATES		0x0000ff00</div><div class='add'>+#define ATI_AUDIODESC_LPCM_STEREO_RATES	0xff000000</div><div class='add'>+</div><div class='add'>+/* in standard HDMI VSDB format */</div><div class='add'>+#define ATI_DELAY_VIDEO_LATENCY		0x000000ff</div><div class='add'>+#define ATI_DELAY_AUDIO_LATENCY		0x0000ff00</div><div class='add'>+</div><div class='add'>+enum ati_sink_info_idx {</div><div class='add'>+	ATI_INFO_IDX_MANUFACTURER_ID	= 0,</div><div class='add'>+	ATI_INFO_IDX_PRODUCT_ID		= 1,</div><div class='add'>+	ATI_INFO_IDX_SINK_DESC_LEN	= 2,</div><div class='add'>+	ATI_INFO_IDX_PORT_ID_LOW	= 3,</div><div class='add'>+	ATI_INFO_IDX_PORT_ID_HIGH	= 4,</div><div class='add'>+	ATI_INFO_IDX_SINK_DESC_FIRST	= 5,</div><div class='add'>+	ATI_INFO_IDX_SINK_DESC_LAST	= 22, /* max len 18 bytes */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_eld_ati(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		       unsigned char *buf, int *eld_size, bool rev3_or_later)</div><div class='add'>+{</div><div class='add'>+	int spkalloc, ati_sad, aud_synch;</div><div class='add'>+	int sink_desc_len = 0;</div><div class='add'>+	int pos, i;</div><div class='add'>+</div><div class='add'>+	/* ATI/AMD does not have ELD, emulate it */</div><div class='add'>+</div><div class='add'>+	spkalloc = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SPEAKER_ALLOCATION, 0);</div><div class='add'>+</div><div class='add'>+	if (spkalloc &lt;= 0) {</div><div class='add'>+		codec_info(codec, "HDMI ATI/AMD: no speaker allocation for ELD\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, ELD_FIXED_BYTES + ELD_MAX_MNL + ELD_MAX_SAD * 3);</div><div class='add'>+</div><div class='add'>+	/* version */</div><div class='add'>+	buf[0] = ELD_VER_CEA_861D &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	/* speaker allocation from EDID */</div><div class='add'>+	buf[7] = spkalloc &amp; ATI_SPKALLOC_SPKALLOC;</div><div class='add'>+</div><div class='add'>+	/* is DisplayPort? */</div><div class='add'>+	if (spkalloc &amp; ATI_SPKALLOC_TYPE_DISPLAYPORT)</div><div class='add'>+		buf[5] |= 0x04;</div><div class='add'>+</div><div class='add'>+	pos = ELD_FIXED_BYTES;</div><div class='add'>+</div><div class='add'>+	if (rev3_or_later) {</div><div class='add'>+		int sink_info;</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PORT_ID_LOW);</div><div class='add'>+		sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+		put_unaligned_le32(sink_info, buf + 8);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PORT_ID_HIGH);</div><div class='add'>+		sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+		put_unaligned_le32(sink_info, buf + 12);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_MANUFACTURER_ID);</div><div class='add'>+		sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+		put_unaligned_le16(sink_info, buf + 16);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PRODUCT_ID);</div><div class='add'>+		sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+		put_unaligned_le16(sink_info, buf + 18);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_SINK_DESC_LEN);</div><div class='add'>+		sink_desc_len = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+</div><div class='add'>+		if (sink_desc_len &gt; ELD_MAX_MNL) {</div><div class='add'>+			codec_info(codec, "HDMI ATI/AMD: Truncating HDMI sink description with length %d\n",</div><div class='add'>+				   sink_desc_len);</div><div class='add'>+			sink_desc_len = ELD_MAX_MNL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf[4] |= sink_desc_len;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; sink_desc_len; i++) {</div><div class='add'>+			snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_SINK_DESC_FIRST + i);</div><div class='add'>+			buf[pos++] = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = AUDIO_CODING_TYPE_LPCM; i &lt;= AUDIO_CODING_TYPE_WMAPRO; i++) {</div><div class='add'>+		if (i == AUDIO_CODING_TYPE_SACD || i == AUDIO_CODING_TYPE_DST)</div><div class='add'>+			continue; /* not handled by ATI/AMD */</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_AUDIO_DESCRIPTOR, i &lt;&lt; 3);</div><div class='add'>+		ati_sad = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_AUDIO_DESCRIPTOR, 0);</div><div class='add'>+</div><div class='add'>+		if (ati_sad &lt;= 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ati_sad &amp; ATI_AUDIODESC_RATES) {</div><div class='add'>+			/* format is supported, copy SAD as-is */</div><div class='add'>+			buf[pos++] = (ati_sad &amp; 0x0000ff) &gt;&gt; 0;</div><div class='add'>+			buf[pos++] = (ati_sad &amp; 0x00ff00) &gt;&gt; 8;</div><div class='add'>+			buf[pos++] = (ati_sad &amp; 0xff0000) &gt;&gt; 16;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == AUDIO_CODING_TYPE_LPCM</div><div class='add'>+		    &amp;&amp; (ati_sad &amp; ATI_AUDIODESC_LPCM_STEREO_RATES)</div><div class='add'>+		    &amp;&amp; (ati_sad &amp; ATI_AUDIODESC_LPCM_STEREO_RATES) &gt;&gt; 16 != (ati_sad &amp; ATI_AUDIODESC_RATES)) {</div><div class='add'>+			/* for PCM there is a separate stereo rate mask */</div><div class='add'>+			buf[pos++] = ((ati_sad &amp; 0x000000ff) &amp; ~ATI_AUDIODESC_CHANNELS) | 0x1;</div><div class='add'>+			/* rates from the extra byte */</div><div class='add'>+			buf[pos++] = (ati_sad &amp; 0xff000000) &gt;&gt; 24;</div><div class='add'>+			buf[pos++] = (ati_sad &amp; 0x00ff0000) &gt;&gt; 16;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos == ELD_FIXED_BYTES + sink_desc_len) {</div><div class='add'>+		codec_info(codec, "HDMI ATI/AMD: no audio descriptors for ELD\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HDMI VSDB latency format:</div><div class='add'>+	 * separately for both audio and video:</div><div class='add'>+	 *  0          field not valid or unknown latency</div><div class='add'>+	 *  [1..251]   msecs = (x-1)*2  (max 500ms with x = 251 = 0xfb)</div><div class='add'>+	 *  255        audio/video not supported</div><div class='add'>+	 *</div><div class='add'>+	 * HDA latency format:</div><div class='add'>+	 * single value indicating video latency relative to audio:</div><div class='add'>+	 *  0          unknown or 0ms</div><div class='add'>+	 *  [1..250]   msecs = x*2  (max 500ms with x = 250 = 0xfa)</div><div class='add'>+	 *  [251..255] reserved</div><div class='add'>+	 */</div><div class='add'>+	aud_synch = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_AUDIO_VIDEO_DELAY, 0);</div><div class='add'>+	if ((aud_synch &amp; ATI_DELAY_VIDEO_LATENCY) &amp;&amp; (aud_synch &amp; ATI_DELAY_AUDIO_LATENCY)) {</div><div class='add'>+		int video_latency_hdmi = (aud_synch &amp; ATI_DELAY_VIDEO_LATENCY);</div><div class='add'>+		int audio_latency_hdmi = (aud_synch &amp; ATI_DELAY_AUDIO_LATENCY) &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+		if (video_latency_hdmi &lt;= 0xfb &amp;&amp; audio_latency_hdmi &lt;= 0xfb &amp;&amp;</div><div class='add'>+		    video_latency_hdmi &gt; audio_latency_hdmi)</div><div class='add'>+			buf[6] = video_latency_hdmi - audio_latency_hdmi;</div><div class='add'>+		/* else unknown/invalid or 0ms or video ahead of audio, so use zero */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* SAD count */</div><div class='add'>+	buf[5] |= ((pos - ELD_FIXED_BYTES - sink_desc_len) / 3) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	/* Baseline ELD block length is 4-byte aligned */</div><div class='add'>+	pos = round_up(pos, 4);</div><div class='add'>+</div><div class='add'>+	/* Baseline ELD length (4-byte header is not counted in) */</div><div class='add'>+	buf[2] = (pos - 4) / 4;</div><div class='add'>+</div><div class='add'>+	*eld_size = pos;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_pin_get_eld(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			       int dev_id, unsigned char *buf, int *eld_size)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(dev_id != 0);</div><div class='add'>+	/* call hda_eld.c ATI/AMD-specific function */</div><div class='add'>+	return get_eld_ati(codec, nid, buf, eld_size,</div><div class='add'>+			   is_amdhdmi_rev3_or_later(codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atihdmi_pin_setup_infoframe(struct hda_codec *codec,</div><div class='add'>+					hda_nid_t pin_nid, int dev_id, int ca,</div><div class='add'>+					int active_channels, int conn_type)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(dev_id != 0);</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0, ATI_VERB_SET_CHANNEL_ALLOCATION, ca);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_paired_swap_fc_lfe(int pos)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * ATI/AMD have automatic FC/LFE swap built-in</div><div class='add'>+	 * when in pairwise mapping mode.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	switch (pos) {</div><div class='add'>+	/* see channel_allocations[].speakers[] */</div><div class='add'>+	case 2: return 3;</div><div class='add'>+	case 3: return 2;</div><div class='add'>+	default: return pos;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_paired_chmap_validate(struct hdac_chmap *chmap,</div><div class='add'>+			int ca, int chs, unsigned char *map)</div><div class='add'>+{</div><div class='add'>+	struct hdac_cea_channel_speaker_allocation *cap;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	/* check that only channel pairs need to be remapped on old pre-rev3 ATI/AMD */</div><div class='add'>+</div><div class='add'>+	cap = snd_hdac_get_ch_alloc_from_ca(ca);</div><div class='add'>+	for (i = 0; i &lt; chs; ++i) {</div><div class='add'>+		int mask = snd_hdac_chmap_to_spk_mask(map[i]);</div><div class='add'>+		bool ok = false;</div><div class='add'>+		bool companion_ok = false;</div><div class='add'>+</div><div class='add'>+		if (!mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0 + i % 2; j &lt; 8; j += 2) {</div><div class='add'>+			int chan_idx = 7 - atihdmi_paired_swap_fc_lfe(j);</div><div class='add'>+</div><div class='add'>+			if (cap-&gt;speakers[chan_idx] == mask) {</div><div class='add'>+				/* channel is in a supported position */</div><div class='add'>+				ok = true;</div><div class='add'>+</div><div class='add'>+				if (i % 2 == 0 &amp;&amp; i + 1 &lt; chs) {</div><div class='add'>+					/* even channel, check the odd companion */</div><div class='add'>+					int comp_chan_idx = 7 - atihdmi_paired_swap_fc_lfe(j + 1);</div><div class='add'>+					int comp_mask_req = snd_hdac_chmap_to_spk_mask(map[i+1]);</div><div class='add'>+					int comp_mask_act = cap-&gt;speakers[comp_chan_idx];</div><div class='add'>+</div><div class='add'>+					if (comp_mask_req == comp_mask_act)</div><div class='add'>+						companion_ok = true;</div><div class='add'>+					else</div><div class='add'>+						return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ok)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (companion_ok)</div><div class='add'>+			i++; /* companion channel already checked */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_pin_set_slot_channel(struct hdac_device *hdac,</div><div class='add'>+		hda_nid_t pin_nid, int hdmi_slot, int stream_channel)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	int verb;</div><div class='add'>+	int ati_channel_setup = 0;</div><div class='add'>+</div><div class='add'>+	if (hdmi_slot &gt; 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!has_amd_full_remap_support(codec)) {</div><div class='add'>+		hdmi_slot = atihdmi_paired_swap_fc_lfe(hdmi_slot);</div><div class='add'>+</div><div class='add'>+		/* In case this is an odd slot but without stream channel, do not</div><div class='add'>+		 * disable the slot since the corresponding even slot could have a</div><div class='add'>+		 * channel. In case neither have a channel, the slot pair will be</div><div class='add'>+		 * disabled when this function is called for the even slot.</div><div class='add'>+		 */</div><div class='add'>+		if (hdmi_slot % 2 != 0 &amp;&amp; stream_channel == 0xf)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		hdmi_slot -= hdmi_slot % 2;</div><div class='add'>+</div><div class='add'>+		if (stream_channel != 0xf)</div><div class='add'>+			stream_channel -= stream_channel % 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	verb = ATI_VERB_SET_MULTICHANNEL_01 + hdmi_slot/2 + (hdmi_slot % 2) * 0x00e;</div><div class='add'>+</div><div class='add'>+	/* ati_channel_setup format: [7..4] = stream_channel_id, [1] = mute, [0] = enable */</div><div class='add'>+</div><div class='add'>+	if (stream_channel != 0xf)</div><div class='add'>+		ati_channel_setup = (stream_channel &lt;&lt; 4) | ATI_OUT_ENABLE;</div><div class='add'>+</div><div class='add'>+	return snd_hda_codec_write(codec, pin_nid, 0, verb, ati_channel_setup);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_pin_get_slot_channel(struct hdac_device *hdac,</div><div class='add'>+				hda_nid_t pin_nid, int asp_slot)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	bool was_odd = false;</div><div class='add'>+	int ati_asp_slot = asp_slot;</div><div class='add'>+	int verb;</div><div class='add'>+	int ati_channel_setup;</div><div class='add'>+</div><div class='add'>+	if (asp_slot &gt; 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!has_amd_full_remap_support(codec)) {</div><div class='add'>+		ati_asp_slot = atihdmi_paired_swap_fc_lfe(asp_slot);</div><div class='add'>+		if (ati_asp_slot % 2 != 0) {</div><div class='add'>+			ati_asp_slot -= 1;</div><div class='add'>+			was_odd = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	verb = ATI_VERB_GET_MULTICHANNEL_01 + ati_asp_slot/2 + (ati_asp_slot % 2) * 0x00e;</div><div class='add'>+</div><div class='add'>+	ati_channel_setup = snd_hda_codec_read(codec, pin_nid, 0, verb, 0);</div><div class='add'>+</div><div class='add'>+	if (!(ati_channel_setup &amp; ATI_OUT_ENABLE))</div><div class='add'>+		return 0xf;</div><div class='add'>+</div><div class='add'>+	return ((ati_channel_setup &amp; 0xf0) &gt;&gt; 4) + !!was_odd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_paired_chmap_cea_alloc_validate_get_type(</div><div class='add'>+		struct hdac_chmap *chmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap,</div><div class='add'>+		int channels)</div><div class='add'>+{</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Pre-rev3 ATI/AMD codecs operate in a paired channel mode, so</div><div class='add'>+	 * we need to take that into account (a single channel may take 2</div><div class='add'>+	 * channel slots if we need to carry a silent channel next to it).</div><div class='add'>+	 * On Rev3+ AMD codecs this function is not used.</div><div class='add'>+	 */</div><div class='add'>+	int chanpairs = 0;</div><div class='add'>+</div><div class='add'>+	/* We only produce even-numbered channel count TLVs */</div><div class='add'>+	if ((channels % 2) != 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; 7; c += 2) {</div><div class='add'>+		if (cap-&gt;speakers[c] || cap-&gt;speakers[c+1])</div><div class='add'>+			chanpairs++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chanpairs * 2 != channels)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return SNDRV_CTL_TLVT_CHMAP_PAIRED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atihdmi_paired_cea_alloc_to_tlv_chmap(struct hdac_chmap *hchmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap,</div><div class='add'>+		unsigned int *chmap, int channels)</div><div class='add'>+{</div><div class='add'>+	/* produce paired maps for pre-rev3 ATI/AMD codecs */</div><div class='add'>+	int count = 0;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	for (c = 7; c &gt;= 0; c--) {</div><div class='add'>+		int chan = 7 - atihdmi_paired_swap_fc_lfe(7 - c);</div><div class='add'>+		int spk = cap-&gt;speakers[chan];</div><div class='add'>+</div><div class='add'>+		if (!spk) {</div><div class='add'>+			/* add N/A channel if the companion channel is occupied */</div><div class='add'>+			if (cap-&gt;speakers[chan + (chan % 2 ? -1 : 1)])</div><div class='add'>+				chmap[count++] = SNDRV_CHMAP_NA;</div><div class='add'>+</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		chmap[count++] = snd_hdac_spk_to_chmap(spk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(count != channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_pin_hbr_setup(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				 int dev_id, bool hbr)</div><div class='add'>+{</div><div class='add'>+	int hbr_ctl, hbr_ctl_new;</div><div class='add'>+</div><div class='add'>+	WARN_ON(dev_id != 0);</div><div class='add'>+</div><div class='add'>+	hbr_ctl = snd_hda_codec_read(codec, pin_nid, 0, ATI_VERB_GET_HBR_CONTROL, 0);</div><div class='add'>+	if (hbr_ctl &gt;= 0 &amp;&amp; (hbr_ctl &amp; ATI_HBR_CAPABLE)) {</div><div class='add'>+		if (hbr)</div><div class='add'>+			hbr_ctl_new = hbr_ctl | ATI_HBR_ENABLE;</div><div class='add'>+		else</div><div class='add'>+			hbr_ctl_new = hbr_ctl &amp; ~ATI_HBR_ENABLE;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec,</div><div class='add'>+			  "%s: NID=0x%x, %shbr-ctl=0x%x\n",</div><div class='add'>+			  __func__,</div><div class='add'>+			  pin_nid,</div><div class='add'>+			  hbr_ctl == hbr_ctl_new ? "" : "new-",</div><div class='add'>+			  hbr_ctl_new);</div><div class='add'>+</div><div class='add'>+		if (hbr_ctl != hbr_ctl_new)</div><div class='add'>+			snd_hda_codec_write(codec, pin_nid, 0,</div><div class='add'>+						ATI_VERB_SET_HBR_CONTROL,</div><div class='add'>+						hbr_ctl_new);</div><div class='add'>+</div><div class='add'>+	} else if (hbr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atihdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,</div><div class='add'>+				hda_nid_t pin_nid, int dev_id,</div><div class='add'>+				u32 stream_tag, int format)</div><div class='add'>+{</div><div class='add'>+	if (is_amdhdmi_rev3_or_later(codec)) {</div><div class='add'>+		int ramp_rate = 180; /* default as per AMD spec */</div><div class='add'>+		/* disable ramp-up/down for non-pcm as per AMD spec */</div><div class='add'>+		if (format &amp; AC_FMT_TYPE_NON_PCM)</div><div class='add'>+			ramp_rate = 0;</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, cvt_nid, 0, ATI_VERB_SET_RAMP_RATE, ramp_rate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_hda_hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,</div><div class='add'>+					 stream_tag, format);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int atihdmi_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx, err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_init(codec);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+		/* make sure downmix information in infoframe is zero */</div><div class='add'>+		snd_hda_codec_write(codec, per_pin-&gt;pin_nid, 0, ATI_VERB_SET_DOWNMIX_INFO, 0);</div><div class='add'>+</div><div class='add'>+		/* enable channel-wise remap mode if supported */</div><div class='add'>+		if (has_amd_full_remap_support(codec))</div><div class='add'>+			snd_hda_codec_write(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+					    ATI_VERB_SET_MULTICHANNEL_MODE,</div><div class='add'>+					    ATI_MULTICHANNEL_MODE_SINGLE);</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;auto_runtime_pm = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* map from pin NID to port; port is 0-based */</div><div class='add'>+/* for AMD: assume widget NID starting from 3, with step 2 (3, 5, 7, ...) */</div><div class='add'>+static int atihdmi_pin2port(void *audio_ptr, int pin_nid)</div><div class='add'>+{</div><div class='add'>+	return pin_nid / 2 - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* reverse-map from port to pin NID: see above */</div><div class='add'>+static int atihdmi_port2pin(struct hda_codec *codec, int port)</div><div class='add'>+{</div><div class='add'>+	return port * 2 + 3;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_audio_component_audio_ops atihdmi_audio_ops = {</div><div class='add'>+	.pin2port = atihdmi_pin2port,</div><div class='add'>+	.pin_eld_notify = snd_hda_hdmi_acomp_pin_eld_notify,</div><div class='add'>+	.master_bind = snd_hda_hdmi_acomp_master_bind,</div><div class='add'>+	.master_unbind = snd_hda_hdmi_acomp_master_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int atihdmi_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	int err, cvt_idx;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_probe(codec);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;static_pcm_mapping = true;</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.pin_get_eld = atihdmi_pin_get_eld;</div><div class='add'>+	spec-&gt;ops.pin_setup_infoframe = atihdmi_pin_setup_infoframe;</div><div class='add'>+	spec-&gt;ops.pin_hbr_setup = atihdmi_pin_hbr_setup;</div><div class='add'>+	spec-&gt;ops.setup_stream = atihdmi_setup_stream;</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.ops.pin_get_slot_channel = atihdmi_pin_get_slot_channel;</div><div class='add'>+	spec-&gt;chmap.ops.pin_set_slot_channel = atihdmi_pin_set_slot_channel;</div><div class='add'>+</div><div class='add'>+	if (!has_amd_full_remap_support(codec)) {</div><div class='add'>+		/* override to ATI/AMD-specific versions with pairwise mapping */</div><div class='add'>+		spec-&gt;chmap.ops.chmap_cea_alloc_validate_get_type =</div><div class='add'>+			atihdmi_paired_chmap_cea_alloc_validate_get_type;</div><div class='add'>+		spec-&gt;chmap.ops.cea_alloc_to_tlv_chmap =</div><div class='add'>+				atihdmi_paired_cea_alloc_to_tlv_chmap;</div><div class='add'>+		spec-&gt;chmap.ops.chmap_validate = atihdmi_paired_chmap_validate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ATI/AMD converters do not advertise all of their capabilities */</div><div class='add'>+	for (cvt_idx = 0; cvt_idx &lt; spec-&gt;num_cvts; cvt_idx++) {</div><div class='add'>+		per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+		per_cvt-&gt;channels_max = max(per_cvt-&gt;channels_max, 8u);</div><div class='add'>+		per_cvt-&gt;rates |= SUPPORTED_RATES;</div><div class='add'>+		per_cvt-&gt;formats |= SUPPORTED_FORMATS;</div><div class='add'>+		per_cvt-&gt;maxbps = max(per_cvt-&gt;maxbps, 24u);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.channels_max = max(spec-&gt;chmap.channels_max, 8u);</div><div class='add'>+</div><div class='add'>+	/* AMD GPUs have neither EPSS nor CLKSTOP bits, hence preventing</div><div class='add'>+	 * the link-down as is.  Tell the core to allow it.</div><div class='add'>+	 */</div><div class='add'>+	codec-&gt;link_down_at_suspend = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_acomp_init(codec, &amp;atihdmi_audio_ops, atihdmi_port2pin);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops atihdmi_codec_ops = {</div><div class='add'>+	.probe = atihdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_generic_remove,</div><div class='add'>+	.init = atihdmi_init,</div><div class='add'>+	.build_pcms = snd_hda_hdmi_generic_build_pcms,</div><div class='add'>+	.build_controls = snd_hda_hdmi_generic_build_controls,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_generic_unsol_event,</div><div class='add'>+	.suspend = snd_hda_hdmi_generic_suspend,</div><div class='add'>+	.resume	 = snd_hda_hdmi_generic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_atihdmi[] = {</div><div class='add'>+	HDA_CODEC_ID(0x1002793c, "RS600 HDMI"),</div><div class='add'>+	HDA_CODEC_ID(0x10027919, "RS600 HDMI"),</div><div class='add'>+	HDA_CODEC_ID(0x1002791a, "RS690/780 HDMI"),</div><div class='add'>+	HDA_CODEC_ID(0x1002aa01, "R6xx HDMI"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_atihdmi);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("AMD/ATI HDMI HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver atihdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_atihdmi,</div><div class='add'>+	.ops = &amp;atihdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(atihdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/eld.c b/sound/hda/codecs/hdmi/eld.c<br/>new file mode 100644<br/>index 000000000000..1464fd1c675b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/eld.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/eld.c</a></div><div class='hunk'>@@ -0,0 +1,230 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Generic routines and proc interface for ELD(EDID Like Data) information</div><div class='add'>+ *</div><div class='add'>+ * Copyright(c) 2008 Intel Corporation.</div><div class='add'>+ * Copyright (c) 2013 Anssi Hannula &lt;anssi.hannula@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ * Authors:</div><div class='add'>+ * 		Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_chmap.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+enum cea_edid_versions {</div><div class='add'>+	CEA_EDID_VER_NONE	= 0,</div><div class='add'>+	CEA_EDID_VER_CEA861	= 1,</div><div class='add'>+	CEA_EDID_VER_CEA861A	= 2,</div><div class='add'>+	CEA_EDID_VER_CEA861BCD	= 3,</div><div class='add'>+	CEA_EDID_VER_RESERVED	= 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The following two lists are shared between</div><div class='add'>+ * 	- HDMI audio InfoFrame (source to sink)</div><div class='add'>+ * 	- CEA E-EDID Extension (sink to source)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static unsigned int hdmi_get_eld_data(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+					int byte_index)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					AC_VERB_GET_HDMI_ELDD, byte_index);</div><div class='add'>+#ifdef BE_PARANOID</div><div class='add'>+	codec_info(codec, "HDMI: ELD data byte %d: 0x%x\n", byte_index, val);</div><div class='add'>+#endif</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,</div><div class='add'>+						 AC_DIPSIZE_ELD_BUF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		     unsigned char *buf, int *eld_size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ELD size is initialized to zero in caller function. If no errors and</div><div class='add'>+	 * ELD is valid, actual eld_size is assigned.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	size = snd_hdmi_get_eld_size(codec, nid);</div><div class='add'>+	if (size == 0) {</div><div class='add'>+		/* wfg: workaround for ASUS P5E-VM HDMI board */</div><div class='add'>+		codec_info(codec, "HDMI: ELD buf size is 0, force 128\n");</div><div class='add'>+		size = 128;</div><div class='add'>+	}</div><div class='add'>+	if (size &lt; ELD_FIXED_BYTES || size &gt; ELD_MAX_SIZE) {</div><div class='add'>+		codec_info(codec, "HDMI: invalid ELD buf size %d\n", size);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set ELD buffer */</div><div class='add'>+	for (i = 0; i &lt; size; i++) {</div><div class='add'>+		unsigned int val = hdmi_get_eld_data(codec, nid, i);</div><div class='add'>+		/*</div><div class='add'>+		 * Graphics driver might be writing to ELD buffer right now.</div><div class='add'>+		 * Just abort. The caller will repoll after a while.</div><div class='add'>+		 */</div><div class='add'>+		if (!(val &amp; AC_ELDD_ELD_VALID)) {</div><div class='add'>+			codec_info(codec, "HDMI: invalid ELD data byte %d\n", i);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		val &amp;= AC_ELDD_ELD_DATA;</div><div class='add'>+		/*</div><div class='add'>+		 * The first byte cannot be zero. This can happen on some DVI</div><div class='add'>+		 * connections. Some Intel chips may also need some 250ms delay</div><div class='add'>+		 * to return non-zero ELD data, even when the graphics driver</div><div class='add'>+		 * correctly writes ELD content before setting ELD_valid bit.</div><div class='add'>+		 */</div><div class='add'>+		if (!val &amp;&amp; !i) {</div><div class='add'>+			codec_dbg(codec, "HDMI: 0 ELD data\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto error;</div><div class='add'>+		}</div><div class='add'>+		buf[i] = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*eld_size = size;</div><div class='add'>+error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+void snd_hdmi_print_eld_info(struct hdmi_eld *eld,</div><div class='add'>+			     struct snd_info_buffer *buffer,</div><div class='add'>+			     hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	snd_iprintf(buffer, "monitor_present\t\t%d\n", eld-&gt;monitor_present);</div><div class='add'>+	snd_iprintf(buffer, "eld_valid\t\t%d\n", eld-&gt;eld_valid);</div><div class='add'>+	snd_iprintf(buffer, "codec_pin_nid\t\t0x%x\n", pin_nid);</div><div class='add'>+	snd_iprintf(buffer, "codec_dev_id\t\t0x%x\n", dev_id);</div><div class='add'>+	snd_iprintf(buffer, "codec_cvt_nid\t\t0x%x\n", cvt_nid);</div><div class='add'>+</div><div class='add'>+	if (!eld-&gt;eld_valid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_print_eld_info(&amp;eld-&gt;info, buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hdmi_write_eld_info(struct hdmi_eld *eld,</div><div class='add'>+			     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct snd_parsed_hdmi_eld *e = &amp;eld-&gt;info;</div><div class='add'>+	char line[64];</div><div class='add'>+	char name[64];</div><div class='add'>+	char *sname;</div><div class='add'>+	long long val;</div><div class='add'>+	unsigned int n;</div><div class='add'>+</div><div class='add'>+	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='add'>+		if (sscanf(line, "%s %llx", name, &amp;val) != 2)</div><div class='add'>+			continue;</div><div class='add'>+		/*</div><div class='add'>+		 * We don't allow modification to these fields:</div><div class='add'>+		 * 	monitor_name manufacture_id product_id</div><div class='add'>+		 * 	eld_version edid_version</div><div class='add'>+		 */</div><div class='add'>+		if (!strcmp(name, "monitor_present"))</div><div class='add'>+			eld-&gt;monitor_present = val;</div><div class='add'>+		else if (!strcmp(name, "eld_valid"))</div><div class='add'>+			eld-&gt;eld_valid = val;</div><div class='add'>+		else if (!strcmp(name, "connection_type"))</div><div class='add'>+			e-&gt;conn_type = val;</div><div class='add'>+		else if (!strcmp(name, "port_id"))</div><div class='add'>+			e-&gt;port_id = val;</div><div class='add'>+		else if (!strcmp(name, "support_hdcp"))</div><div class='add'>+			e-&gt;support_hdcp = val;</div><div class='add'>+		else if (!strcmp(name, "support_ai"))</div><div class='add'>+			e-&gt;support_ai = val;</div><div class='add'>+		else if (!strcmp(name, "audio_sync_delay"))</div><div class='add'>+			e-&gt;aud_synch_delay = val;</div><div class='add'>+		else if (!strcmp(name, "speakers"))</div><div class='add'>+			e-&gt;spk_alloc = val;</div><div class='add'>+		else if (!strcmp(name, "sad_count"))</div><div class='add'>+			e-&gt;sad_count = val;</div><div class='add'>+		else if (!strncmp(name, "sad", 3)) {</div><div class='add'>+			sname = name + 4;</div><div class='add'>+			n = name[3] - '0';</div><div class='add'>+			if (name[4] &gt;= '0' &amp;&amp; name[4] &lt;= '9') {</div><div class='add'>+				sname++;</div><div class='add'>+				n = 10 * n + name[4] - '0';</div><div class='add'>+			}</div><div class='add'>+			if (n &gt;= ELD_MAX_SAD)</div><div class='add'>+				continue;</div><div class='add'>+			if (!strcmp(sname, "_coding_type"))</div><div class='add'>+				e-&gt;sad[n].format = val;</div><div class='add'>+			else if (!strcmp(sname, "_channels"))</div><div class='add'>+				e-&gt;sad[n].channels = val;</div><div class='add'>+			else if (!strcmp(sname, "_rates"))</div><div class='add'>+				e-&gt;sad[n].rates = val;</div><div class='add'>+			else if (!strcmp(sname, "_bits"))</div><div class='add'>+				e-&gt;sad[n].sample_bits = val;</div><div class='add'>+			else if (!strcmp(sname, "_max_bitrate"))</div><div class='add'>+				e-&gt;sad[n].max_bitrate = val;</div><div class='add'>+			else if (!strcmp(sname, "_profile"))</div><div class='add'>+				e-&gt;sad[n].profile = val;</div><div class='add'>+			if (n &gt;= e-&gt;sad_count)</div><div class='add'>+				e-&gt;sad_count = n + 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='add'>+</div><div class='add'>+/* update PCM info based on ELD */</div><div class='add'>+void snd_hdmi_eld_update_pcm_info(struct snd_parsed_hdmi_eld *e,</div><div class='add'>+			      struct hda_pcm_stream *hinfo)</div><div class='add'>+{</div><div class='add'>+	u32 rates;</div><div class='add'>+	u64 formats;</div><div class='add'>+	unsigned int maxbps;</div><div class='add'>+	unsigned int channels_max;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* assume basic audio support (the basic audio flag is not in ELD;</div><div class='add'>+	 * however, all audio capable sinks are required to support basic</div><div class='add'>+	 * audio) */</div><div class='add'>+	rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |</div><div class='add'>+		SNDRV_PCM_RATE_48000;</div><div class='add'>+	formats = SNDRV_PCM_FMTBIT_S16_LE;</div><div class='add'>+	maxbps = 16;</div><div class='add'>+	channels_max = 2;</div><div class='add'>+	for (i = 0; i &lt; e-&gt;sad_count; i++) {</div><div class='add'>+		struct snd_cea_sad *a = &amp;e-&gt;sad[i];</div><div class='add'>+		rates |= a-&gt;rates;</div><div class='add'>+		if (a-&gt;channels &gt; channels_max)</div><div class='add'>+			channels_max = a-&gt;channels;</div><div class='add'>+		if (a-&gt;format == AUDIO_CODING_TYPE_LPCM) {</div><div class='add'>+			if (a-&gt;sample_bits &amp; ELD_PCM_BITS_20) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='add'>+				if (maxbps &lt; 20)</div><div class='add'>+					maxbps = 20;</div><div class='add'>+			}</div><div class='add'>+			if (a-&gt;sample_bits &amp; ELD_PCM_BITS_24) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='add'>+				if (maxbps &lt; 24)</div><div class='add'>+					maxbps = 24;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* restrict the parameters by the values the codec provides */</div><div class='add'>+	hinfo-&gt;rates &amp;= rates;</div><div class='add'>+	hinfo-&gt;formats &amp;= formats;</div><div class='add'>+	hinfo-&gt;maxbps = min(hinfo-&gt;maxbps, maxbps);</div><div class='add'>+	hinfo-&gt;channels_max = min(hinfo-&gt;channels_max, channels_max);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/hdmi.c b/sound/hda/codecs/hdmi/hdmi.c<br/>new file mode 100644<br/>index 000000000000..111c9b5335af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/hdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/hdmi.c</a></div><div class='hunk'>@@ -0,0 +1,2363 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  hdmi.c - routines for HDMI/DisplayPort codecs</div><div class='add'>+ *</div><div class='add'>+ *  Copyright(c) 2008-2010 Intel Corporation</div><div class='add'>+ *  Copyright (c) 2006 ATI Technologies Inc.</div><div class='add'>+ *  Copyright (c) 2008 NVIDIA Corp.  All rights reserved.</div><div class='add'>+ *  Copyright (c) 2008 Wei Ni &lt;wni@nvidia.com&gt;</div><div class='add'>+ *  Copyright (c) 2013 Anssi Hannula &lt;anssi.hannula@iki.fi&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Authors:</div><div class='add'>+ *			Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='add'>+ *</div><div class='add'>+ *  Maintained by:</div><div class='add'>+ *			Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/asoundef.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_i915.h&gt;</div><div class='add'>+#include &lt;sound/hda_chmap.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "hda_controller.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+static bool static_hdmi_pcm;</div><div class='add'>+module_param(static_hdmi_pcm, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");</div><div class='add'>+</div><div class='add'>+static bool enable_acomp = true;</div><div class='add'>+module_param(enable_acomp, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable_acomp, "Enable audio component binding (default=yes)");</div><div class='add'>+</div><div class='add'>+static bool enable_all_pins;</div><div class='add'>+module_param(enable_all_pins, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable_all_pins, "Forcibly enable all pins");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_pin_id_to_pin_index(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t pin_nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * (dev_id == -1) means it is NON-MST pin</div><div class='add'>+	 * return the first virtual pin on this port</div><div class='add'>+	 */</div><div class='add'>+	if (dev_id == -1)</div><div class='add'>+		dev_id = 0;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		if ((per_pin-&gt;pin_nid == pin_nid) &amp;&amp;</div><div class='add'>+			(per_pin-&gt;dev_id == dev_id))</div><div class='add'>+			return pin_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_warn(codec, "HDMI: pin NID 0x%x not registered\n", pin_nid);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_pin_id_to_pin_index, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static int hinfo_to_pcm_index(struct hda_codec *codec,</div><div class='add'>+			struct hda_pcm_stream *hinfo)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pcm_idx;</div><div class='add'>+</div><div class='add'>+	for (pcm_idx = 0; pcm_idx &lt; spec-&gt;pcm_used; pcm_idx++)</div><div class='add'>+		if (get_pcm_rec(spec, pcm_idx)-&gt;stream == hinfo)</div><div class='add'>+			return pcm_idx;</div><div class='add'>+</div><div class='add'>+	codec_warn(codec, "HDMI: hinfo %p not tied to a PCM\n", hinfo);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hinfo_to_pin_index(struct hda_codec *codec,</div><div class='add'>+			      struct hda_pcm_stream *hinfo)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		if (per_pin-&gt;pcm &amp;&amp;</div><div class='add'>+			per_pin-&gt;pcm-&gt;pcm-&gt;stream == hinfo)</div><div class='add'>+			return pin_idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "HDMI: hinfo %p (pcm %d) not registered\n", hinfo,</div><div class='add'>+		  hinfo_to_pcm_index(codec, hinfo));</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hdmi_spec_per_pin *pcm_idx_to_pin(struct hdmi_spec *spec,</div><div class='add'>+						int pcm_idx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_pins; i++) {</div><div class='add'>+		per_pin = get_pin(spec, i);</div><div class='add'>+		if (per_pin-&gt;pcm_idx == pcm_idx)</div><div class='add'>+			return per_pin;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cvt_nid_to_cvt_index(struct hda_codec *codec, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int cvt_idx;</div><div class='add'>+</div><div class='add'>+	for (cvt_idx = 0; cvt_idx &lt; spec-&gt;num_cvts; cvt_idx++)</div><div class='add'>+		if (get_cvt(spec, cvt_idx)-&gt;cvt_nid == cvt_nid)</div><div class='add'>+			return cvt_idx;</div><div class='add'>+</div><div class='add'>+	codec_warn(codec, "HDMI: cvt NID 0x%x not registered\n", cvt_nid);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_eld_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	struct hdmi_eld *eld;</div><div class='add'>+	int pcm_idx;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BYTES;</div><div class='add'>+</div><div class='add'>+	pcm_idx = kcontrol-&gt;private_value;</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+	if (!per_pin) {</div><div class='add'>+		/* no pin is bound to the pcm */</div><div class='add'>+		uinfo-&gt;count = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+	uinfo-&gt;count = eld-&gt;eld_valid ? eld-&gt;eld_size : 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	struct hdmi_eld *eld;</div><div class='add'>+	int pcm_idx;</div><div class='add'>+</div><div class='add'>+	pcm_idx = kcontrol-&gt;private_value;</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+	if (!per_pin) {</div><div class='add'>+		/* no pin is bound to the pcm */</div><div class='add'>+		memset(ucontrol-&gt;value.bytes.data, 0,</div><div class='add'>+		       ARRAY_SIZE(ucontrol-&gt;value.bytes.data));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+	if (eld-&gt;eld_size &gt; ARRAY_SIZE(ucontrol-&gt;value.bytes.data) ||</div><div class='add'>+	    eld-&gt;eld_size &gt; ELD_MAX_SIZE) {</div><div class='add'>+		snd_BUG();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(ucontrol-&gt;value.bytes.data, 0,</div><div class='add'>+	       ARRAY_SIZE(ucontrol-&gt;value.bytes.data));</div><div class='add'>+	if (eld-&gt;eld_valid)</div><div class='add'>+		memcpy(ucontrol-&gt;value.bytes.data, eld-&gt;eld_buffer,</div><div class='add'>+		       eld-&gt;eld_size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new eld_bytes_ctl = {</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE |</div><div class='add'>+		SNDRV_CTL_ELEM_ACCESS_SKIP_CHECK,</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='add'>+	.name = "ELD",</div><div class='add'>+	.info = hdmi_eld_ctl_info,</div><div class='add'>+	.get = hdmi_eld_ctl_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hdmi_create_eld_ctl(struct hda_codec *codec, int pcm_idx,</div><div class='add'>+			int device)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;eld_bytes_ctl, codec);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kctl-&gt;private_value = pcm_idx;</div><div class='add'>+	kctl-&gt;id.device = device;</div><div class='add'>+</div><div class='add'>+	/* no pin nid is associated with the kctl now</div><div class='add'>+	 * tbd: associate pin nid to eld ctl later</div><div class='add'>+	 */</div><div class='add'>+	err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	get_hdmi_pcm(spec, pcm_idx)-&gt;eld_ctl = kctl;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef BE_PARANOID</div><div class='add'>+static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				int *packet_index, int *byte_index)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+				 AC_VERB_GET_HDMI_DIP_INDEX, 0);</div><div class='add'>+</div><div class='add'>+	*packet_index = val &gt;&gt; 5;</div><div class='add'>+	*byte_index = val &amp; 0x1f;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				int packet_index, int byte_index)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	val = (packet_index &lt;&lt; 5) | (byte_index &amp; 0x1f);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				unsigned char val)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_init_pin(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_out;</div><div class='add'>+</div><div class='add'>+	/* Unmute */</div><div class='add'>+	if (get_wcaps(codec, pin_nid) &amp; AC_WCAP_OUT_AMP)</div><div class='add'>+		snd_hda_codec_write(codec, pin_nid, 0,</div><div class='add'>+				AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;dyn_pin_out)</div><div class='add'>+		/* Disable pin out until stream is active */</div><div class='add'>+		pin_out = 0;</div><div class='add'>+	else</div><div class='add'>+		/* Enable pin out: some machines with GM965 gets broken output</div><div class='add'>+		 * when the pin is disabled or changed while using with HDMI</div><div class='add'>+		 */</div><div class='add'>+		pin_out = PIN_OUT;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, pin_out);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ELD proc files</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+static void print_eld_info(struct snd_info_entry *entry,</div><div class='add'>+			   struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+	snd_hdmi_print_eld_info(&amp;per_pin-&gt;sink_eld, buffer, per_pin-&gt;pin_nid,</div><div class='add'>+				per_pin-&gt;dev_id, per_pin-&gt;cvt_nid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void write_eld_info(struct snd_info_entry *entry,</div><div class='add'>+			   struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = entry-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+	snd_hdmi_write_eld_info(&amp;per_pin-&gt;sink_eld, buffer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eld_proc_new(struct hdmi_spec_per_pin *per_pin, int index)</div><div class='add'>+{</div><div class='add'>+	char name[32];</div><div class='add'>+	struct hda_codec *codec = per_pin-&gt;codec;</div><div class='add'>+	struct snd_info_entry *entry;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "eld#%d.%d", codec-&gt;addr, index);</div><div class='add'>+	err = snd_card_proc_new(codec-&gt;card, name, &amp;entry);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_info_set_text_ops(entry, per_pin, print_eld_info);</div><div class='add'>+	entry-&gt;c.text.write = write_eld_info;</div><div class='add'>+	entry-&gt;mode |= 0200;</div><div class='add'>+	per_pin-&gt;proc_entry = entry;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eld_proc_free(struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	if (!per_pin-&gt;codec-&gt;bus-&gt;shutdown) {</div><div class='add'>+		snd_info_free_entry(per_pin-&gt;proc_entry);</div><div class='add'>+		per_pin-&gt;proc_entry = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline int eld_proc_new(struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+			       int index)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void eld_proc_free(struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Audio InfoFrame routines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Enable Audio InfoFrame Transmission</div><div class='add'>+ */</div><div class='add'>+static void hdmi_start_infoframe_trans(struct hda_codec *codec,</div><div class='add'>+				       hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,</div><div class='add'>+						AC_DIPXMIT_BEST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Disable Audio InfoFrame Transmission</div><div class='add'>+ */</div><div class='add'>+static void hdmi_stop_infoframe_trans(struct hda_codec *codec,</div><div class='add'>+				      hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='add'>+	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,</div><div class='add'>+						AC_DIPXMIT_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_debug_dip_size(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+	int i;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	size = snd_hdmi_get_eld_size(codec, pin_nid);</div><div class='add'>+	codec_dbg(codec, "HDMI: ELD buf size is %d\n", size);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		size = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+						AC_VERB_GET_HDMI_DIP_SIZE, i);</div><div class='add'>+		codec_dbg(codec, "HDMI: DIP GP[%d] buf size is %d\n", i, size);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_clear_dip_buffers(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+#ifdef BE_PARANOID</div><div class='add'>+	int i, j;</div><div class='add'>+	int size;</div><div class='add'>+	int pi, bi;</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		size = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+						AC_VERB_GET_HDMI_DIP_SIZE, i);</div><div class='add'>+		if (size == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hdmi_set_dip_index(codec, pin_nid, i, 0x0);</div><div class='add'>+		for (j = 1; j &lt; 1000; j++) {</div><div class='add'>+			hdmi_write_dip_byte(codec, pin_nid, 0x0);</div><div class='add'>+			hdmi_get_dip_index(codec, pin_nid, &amp;pi, &amp;bi);</div><div class='add'>+			if (pi != i)</div><div class='add'>+				codec_dbg(codec, "dip index %d: %d != %d\n",</div><div class='add'>+						bi, pi, i);</div><div class='add'>+			if (bi == 0) /* byte index wrapped around */</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		codec_dbg(codec,</div><div class='add'>+			"HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",</div><div class='add'>+			i, size, j);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *hdmi_ai)</div><div class='add'>+{</div><div class='add'>+	u8 *bytes = (u8 *)hdmi_ai;</div><div class='add'>+	u8 sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdmi_ai-&gt;checksum = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(*hdmi_ai); i++)</div><div class='add'>+		sum += bytes[i];</div><div class='add'>+</div><div class='add'>+	hdmi_ai-&gt;checksum = -sum;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_fill_audio_infoframe(struct hda_codec *codec,</div><div class='add'>+				      hda_nid_t pin_nid,</div><div class='add'>+				      u8 *dip, int size)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdmi_debug_dip_size(codec, pin_nid);</div><div class='add'>+	hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */</div><div class='add'>+</div><div class='add'>+	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='add'>+	for (i = 0; i &lt; size; i++)</div><div class='add'>+		hdmi_write_dip_byte(codec, pin_nid, dip[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				    u8 *dip, int size)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='add'>+	if (snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_HDMI_DIP_XMIT, 0)</div><div class='add'>+							    != AC_DIPXMIT_BEST)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; size; i++) {</div><div class='add'>+		val = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+					 AC_VERB_GET_HDMI_DIP_DATA, 0);</div><div class='add'>+		if (val != dip[i])</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_pin_get_eld(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			    int dev_id, unsigned char *buf, int *eld_size)</div><div class='add'>+{</div><div class='add'>+	snd_hda_set_dev_select(codec, nid, dev_id);</div><div class='add'>+</div><div class='add'>+	return snd_hdmi_get_eld(codec, nid, buf, eld_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_pin_setup_infoframe(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t pin_nid, int dev_id,</div><div class='add'>+				     int ca, int active_channels,</div><div class='add'>+				     int conn_type)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	union audio_infoframe ai;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ai, 0, sizeof(ai));</div><div class='add'>+	if ((conn_type == 0) || /* HDMI */</div><div class='add'>+		/* Nvidia DisplayPort: Nvidia HW expects same layout as HDMI */</div><div class='add'>+		(conn_type == 1 &amp;&amp; spec-&gt;nv_dp_workaround)) {</div><div class='add'>+		struct hdmi_audio_infoframe *hdmi_ai = &amp;ai.hdmi;</div><div class='add'>+</div><div class='add'>+		if (conn_type == 0) { /* HDMI */</div><div class='add'>+			hdmi_ai-&gt;type		= 0x84;</div><div class='add'>+			hdmi_ai-&gt;ver		= 0x01;</div><div class='add'>+			hdmi_ai-&gt;len		= 0x0a;</div><div class='add'>+		} else {/* Nvidia DP */</div><div class='add'>+			hdmi_ai-&gt;type		= 0x84;</div><div class='add'>+			hdmi_ai-&gt;ver		= 0x1b;</div><div class='add'>+			hdmi_ai-&gt;len		= 0x11 &lt;&lt; 2;</div><div class='add'>+		}</div><div class='add'>+		hdmi_ai-&gt;CC02_CT47	= active_channels - 1;</div><div class='add'>+		hdmi_ai-&gt;CA		= ca;</div><div class='add'>+		hdmi_checksum_audio_infoframe(hdmi_ai);</div><div class='add'>+	} else if (conn_type == 1) { /* DisplayPort */</div><div class='add'>+		struct dp_audio_infoframe *dp_ai = &amp;ai.dp;</div><div class='add'>+</div><div class='add'>+		dp_ai-&gt;type		= 0x84;</div><div class='add'>+		dp_ai-&gt;len		= 0x1b;</div><div class='add'>+		dp_ai-&gt;ver		= 0x11 &lt;&lt; 2;</div><div class='add'>+		dp_ai-&gt;CC02_CT47	= active_channels - 1;</div><div class='add'>+		dp_ai-&gt;CA		= ca;</div><div class='add'>+	} else {</div><div class='add'>+		codec_dbg(codec, "HDMI: unknown connection type at pin NID 0x%x\n", pin_nid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, pin_nid, dev_id);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * sizeof(ai) is used instead of sizeof(*hdmi_ai) or</div><div class='add'>+	 * sizeof(*dp_ai) to avoid partial match/update problems when</div><div class='add'>+	 * the user switches between HDMI/DP monitors.</div><div class='add'>+	 */</div><div class='add'>+	if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes,</div><div class='add'>+					sizeof(ai))) {</div><div class='add'>+		codec_dbg(codec, "%s: pin NID=0x%x channels=%d ca=0x%02x\n",</div><div class='add'>+			  __func__, pin_nid, active_channels, ca);</div><div class='add'>+		hdmi_stop_infoframe_trans(codec, pin_nid);</div><div class='add'>+		hdmi_fill_audio_infoframe(codec, pin_nid,</div><div class='add'>+					    ai.bytes, sizeof(ai));</div><div class='add'>+		hdmi_start_infoframe_trans(codec, pin_nid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_setup_audio_infoframe(struct hda_codec *codec,</div><div class='add'>+					struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+					bool non_pcm)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdac_chmap *chmap = &amp;spec-&gt;chmap;</div><div class='add'>+	hda_nid_t pin_nid = per_pin-&gt;pin_nid;</div><div class='add'>+	int dev_id = per_pin-&gt;dev_id;</div><div class='add'>+	int channels = per_pin-&gt;channels;</div><div class='add'>+	int active_channels;</div><div class='add'>+	struct hdmi_eld *eld;</div><div class='add'>+	int ca;</div><div class='add'>+</div><div class='add'>+	if (!channels)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, pin_nid, dev_id);</div><div class='add'>+</div><div class='add'>+	/* some HW (e.g. HSW+) needs reprogramming the amp at each time */</div><div class='add'>+	if (get_wcaps(codec, pin_nid) &amp; AC_WCAP_OUT_AMP)</div><div class='add'>+		snd_hda_codec_write(codec, pin_nid, 0,</div><div class='add'>+					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+					    AMP_OUT_UNMUTE);</div><div class='add'>+</div><div class='add'>+	eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+</div><div class='add'>+	ca = snd_hdac_channel_allocation(&amp;codec-&gt;core,</div><div class='add'>+			eld-&gt;info.spk_alloc, channels,</div><div class='add'>+			per_pin-&gt;chmap_set, non_pcm, per_pin-&gt;chmap);</div><div class='add'>+</div><div class='add'>+	active_channels = snd_hdac_get_active_channels(ca);</div><div class='add'>+</div><div class='add'>+	chmap-&gt;ops.set_channel_count(&amp;codec-&gt;core, per_pin-&gt;cvt_nid,</div><div class='add'>+						active_channels);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * always configure channel mapping, it may have been changed by the</div><div class='add'>+	 * user in the meantime</div><div class='add'>+	 */</div><div class='add'>+	snd_hdac_setup_channel_mapping(&amp;spec-&gt;chmap,</div><div class='add'>+				pin_nid, non_pcm, ca, channels,</div><div class='add'>+				per_pin-&gt;chmap, per_pin-&gt;chmap_set);</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.pin_setup_infoframe(codec, pin_nid, dev_id,</div><div class='add'>+				      ca, active_channels, eld-&gt;info.conn_type);</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;non_pcm = non_pcm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_setup_audio_infoframe, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Unsolicited events</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_check_presence_and_report(struct hda_codec *codec,</div><div class='add'>+					    hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx = pin_id_to_pin_index(codec, nid, dev_id);</div><div class='add'>+</div><div class='add'>+	if (pin_idx &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	hdmi_present_sense(get_pin(spec, pin_idx), 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_check_presence_and_report,</div><div class='add'>+		     "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static void jack_callback(struct hda_codec *codec,</div><div class='add'>+			  struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	/* stop polling when notification is enabled */</div><div class='add'>+	if (codec_has_acomp(codec))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_check_presence_and_report(codec, jack-&gt;nid, jack-&gt;dev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res,</div><div class='add'>+				 struct hda_jack_tbl *jack)</div><div class='add'>+{</div><div class='add'>+	jack-&gt;jack_dirty = 1;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		"HDMI hot plug event: Codec=%d NID=0x%x Device=%d Inactive=%d Presence_Detect=%d ELD_Valid=%d\n",</div><div class='add'>+		codec-&gt;addr, jack-&gt;nid, jack-&gt;dev_id, !!(res &amp; AC_UNSOL_RES_IA),</div><div class='add'>+		!!(res &amp; AC_UNSOL_RES_PD), !!(res &amp; AC_UNSOL_RES_ELDV));</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_check_presence_and_report(codec, jack-&gt;nid, jack-&gt;dev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	int tag = res &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='add'>+	int subtag = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; AC_UNSOL_RES_SUBTAG_SHIFT;</div><div class='add'>+	int cp_state = !!(res &amp; AC_UNSOL_RES_CP_STATE);</div><div class='add'>+	int cp_ready = !!(res &amp; AC_UNSOL_RES_CP_READY);</div><div class='add'>+</div><div class='add'>+	codec_info(codec,</div><div class='add'>+		"HDMI CP event: CODEC=%d TAG=%d SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",</div><div class='add'>+		codec-&gt;addr,</div><div class='add'>+		tag,</div><div class='add'>+		subtag,</div><div class='add'>+		cp_state,</div><div class='add'>+		cp_ready);</div><div class='add'>+</div><div class='add'>+	/* TODO */</div><div class='add'>+	if (cp_state) {</div><div class='add'>+		;</div><div class='add'>+	}</div><div class='add'>+	if (cp_ready) {</div><div class='add'>+		;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_generic_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	int tag = res &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='add'>+	int subtag = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; AC_UNSOL_RES_SUBTAG_SHIFT;</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+</div><div class='add'>+	if (codec_has_acomp(codec))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;dp_mst) {</div><div class='add'>+		int dev_entry =</div><div class='add'>+			(res &amp; AC_UNSOL_RES_DE) &gt;&gt; AC_UNSOL_RES_DE_SHIFT;</div><div class='add'>+</div><div class='add'>+		jack = snd_hda_jack_tbl_get_from_tag(codec, tag, dev_entry);</div><div class='add'>+	} else {</div><div class='add'>+		jack = snd_hda_jack_tbl_get_from_tag(codec, tag, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!jack) {</div><div class='add'>+		codec_dbg(codec, "Unexpected HDMI event tag 0x%x\n", tag);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (subtag == 0)</div><div class='add'>+		hdmi_intrinsic_event(codec, res, jack);</div><div class='add'>+	else</div><div class='add'>+		hdmi_non_intrinsic_event(codec, res);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_unsol_event, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Callbacks</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* HBR should be Non-PCM, 8 channels */</div><div class='add'>+#define is_hbr_format(format) \</div><div class='add'>+	((format &amp; AC_FMT_TYPE_NON_PCM) &amp;&amp; (format &amp; AC_FMT_CHAN_MASK) == 7)</div><div class='add'>+</div><div class='add'>+static int hdmi_pin_hbr_setup(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+			      int dev_id, bool hbr)</div><div class='add'>+{</div><div class='add'>+	int pinctl, new_pinctl;</div><div class='add'>+</div><div class='add'>+	if (snd_hda_query_pin_caps(codec, pin_nid) &amp; AC_PINCAP_HBR) {</div><div class='add'>+		snd_hda_set_dev_select(codec, pin_nid, dev_id);</div><div class='add'>+		pinctl = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+		if (pinctl &lt; 0)</div><div class='add'>+			return hbr ? -EINVAL : 0;</div><div class='add'>+</div><div class='add'>+		new_pinctl = pinctl &amp; ~AC_PINCTL_EPT;</div><div class='add'>+		if (hbr)</div><div class='add'>+			new_pinctl |= AC_PINCTL_EPT_HBR;</div><div class='add'>+		else</div><div class='add'>+			new_pinctl |= AC_PINCTL_EPT_NATIVE;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec,</div><div class='add'>+			  "hdmi_pin_hbr_setup: NID=0x%x, %spinctl=0x%x\n",</div><div class='add'>+			    pin_nid,</div><div class='add'>+			    pinctl == new_pinctl ? "" : "new-",</div><div class='add'>+			    new_pinctl);</div><div class='add'>+</div><div class='add'>+		if (pinctl != new_pinctl)</div><div class='add'>+			snd_hda_codec_write(codec, pin_nid, 0,</div><div class='add'>+					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+					    new_pinctl);</div><div class='add'>+	} else if (hbr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_setup_stream(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t cvt_nid,</div><div class='add'>+			      hda_nid_t pin_nid, int dev_id,</div><div class='add'>+			      u32 stream_tag, int format)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int param;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = spec-&gt;ops.pin_hbr_setup(codec, pin_nid, dev_id,</div><div class='add'>+				      is_hbr_format(format));</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		codec_dbg(codec, "hdmi_setup_stream: HBR is not supported\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;intel_hsw_fixup) {</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * on recent platforms IEC Coding Type is required for HBR</div><div class='add'>+		 * support, read current Digital Converter settings and set</div><div class='add'>+		 * ICT bitfield if needed.</div><div class='add'>+		 */</div><div class='add'>+		param = snd_hda_codec_read(codec, cvt_nid, 0,</div><div class='add'>+					   AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='add'>+</div><div class='add'>+		param = (param &gt;&gt; 16) &amp; ~(AC_DIG3_ICT);</div><div class='add'>+</div><div class='add'>+		/* on recent platforms ICT mode is required for HBR support */</div><div class='add'>+		if (is_hbr_format(format))</div><div class='add'>+			param |= 0x1;</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, cvt_nid, 0,</div><div class='add'>+				    AC_VERB_SET_DIGI_CONVERT_3, param);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_setup_stream(codec, cvt_nid, stream_tag, 0, format);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_setup_stream, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* Try to find an available converter</div><div class='add'>+ * If pin_idx is less then zero, just try to find an available converter.</div><div class='add'>+ * Otherwise, try to find an available converter and get the cvt mux index</div><div class='add'>+ * of the pin.</div><div class='add'>+ */</div><div class='add'>+static int hdmi_choose_cvt(struct hda_codec *codec,</div><div class='add'>+			   int pin_idx, int *cvt_id,</div><div class='add'>+			   bool silent)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt = NULL;</div><div class='add'>+	int cvt_idx, mux_idx = 0;</div><div class='add'>+</div><div class='add'>+	/* pin_idx &lt; 0 means no pin will be bound to the converter */</div><div class='add'>+	if (pin_idx &lt; 0)</div><div class='add'>+		per_pin = NULL;</div><div class='add'>+	else</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+	if (per_pin &amp;&amp; per_pin-&gt;silent_stream) {</div><div class='add'>+		cvt_idx = cvt_nid_to_cvt_index(codec, per_pin-&gt;cvt_nid);</div><div class='add'>+		per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+		if (per_cvt-&gt;assigned &amp;&amp; !silent)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		if (cvt_id)</div><div class='add'>+			*cvt_id = cvt_idx;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Dynamically assign converter to stream */</div><div class='add'>+	for (cvt_idx = 0; cvt_idx &lt; spec-&gt;num_cvts; cvt_idx++) {</div><div class='add'>+		per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+</div><div class='add'>+		/* Must not already be assigned */</div><div class='add'>+		if (per_cvt-&gt;assigned || per_cvt-&gt;silent_stream)</div><div class='add'>+			continue;</div><div class='add'>+		if (per_pin == NULL)</div><div class='add'>+			break;</div><div class='add'>+		/* Must be in pin's mux's list of converters */</div><div class='add'>+		for (mux_idx = 0; mux_idx &lt; per_pin-&gt;num_mux_nids; mux_idx++)</div><div class='add'>+			if (per_pin-&gt;mux_nids[mux_idx] == per_cvt-&gt;cvt_nid)</div><div class='add'>+				break;</div><div class='add'>+		/* Not in mux list */</div><div class='add'>+		if (mux_idx == per_pin-&gt;num_mux_nids)</div><div class='add'>+			continue;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No free converters */</div><div class='add'>+	if (cvt_idx == spec-&gt;num_cvts)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (per_pin != NULL)</div><div class='add'>+		per_pin-&gt;mux_idx = mux_idx;</div><div class='add'>+</div><div class='add'>+	if (cvt_id)</div><div class='add'>+		*cvt_id = cvt_idx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* skeleton caller of pin_cvt_fixup ops */</div><div class='add'>+static void pin_cvt_fixup(struct hda_codec *codec,</div><div class='add'>+			  struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+			  hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;ops.pin_cvt_fixup)</div><div class='add'>+		spec-&gt;ops.pin_cvt_fixup(codec, per_pin, cvt_nid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called in hdmi_pcm_open when no pin is assigned to the PCM */</div><div class='add'>+static int hdmi_pcm_open_no_pin(struct hda_pcm_stream *hinfo,</div><div class='add'>+			 struct hda_codec *codec,</div><div class='add'>+			 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int cvt_idx, pcm_idx;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pcm_idx = hinfo_to_pcm_index(codec, hinfo);</div><div class='add'>+	if (pcm_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = hdmi_choose_cvt(codec, -1, &amp;cvt_idx, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+	per_cvt-&gt;assigned = true;</div><div class='add'>+	hinfo-&gt;nid = per_cvt-&gt;cvt_nid;</div><div class='add'>+</div><div class='add'>+	pin_cvt_fixup(codec, NULL, per_cvt-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	set_bit(pcm_idx, &amp;spec-&gt;pcm_in_use);</div><div class='add'>+	/* todo: setup spdif ctls assign */</div><div class='add'>+</div><div class='add'>+	/* Initially set the converter's capabilities */</div><div class='add'>+	hinfo-&gt;channels_min = per_cvt-&gt;channels_min;</div><div class='add'>+	hinfo-&gt;channels_max = per_cvt-&gt;channels_max;</div><div class='add'>+	hinfo-&gt;rates = per_cvt-&gt;rates;</div><div class='add'>+	hinfo-&gt;formats = per_cvt-&gt;formats;</div><div class='add'>+	hinfo-&gt;maxbps = per_cvt-&gt;maxbps;</div><div class='add'>+</div><div class='add'>+	/* Store the updated parameters */</div><div class='add'>+	runtime-&gt;hw.channels_min = hinfo-&gt;channels_min;</div><div class='add'>+	runtime-&gt;hw.channels_max = hinfo-&gt;channels_max;</div><div class='add'>+	runtime-&gt;hw.formats = hinfo-&gt;formats;</div><div class='add'>+	runtime-&gt;hw.rates = hinfo-&gt;rates;</div><div class='add'>+</div><div class='add'>+	snd_pcm_hw_constraint_step(substream-&gt;runtime, 0,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HDA PCM callbacks</div><div class='add'>+ */</div><div class='add'>+static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+			 struct hda_codec *codec,</div><div class='add'>+			 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int pin_idx, cvt_idx, pcm_idx;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	struct hdmi_eld *eld;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Validate hinfo */</div><div class='add'>+	pcm_idx = hinfo_to_pcm_index(codec, hinfo);</div><div class='add'>+	if (pcm_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	pin_idx = hinfo_to_pin_index(codec, hinfo);</div><div class='add'>+	/* no pin is assigned to the PCM</div><div class='add'>+	 * PA need pcm open successfully when probe</div><div class='add'>+	 */</div><div class='add'>+	if (pin_idx &lt; 0)</div><div class='add'>+		return hdmi_pcm_open_no_pin(hinfo, codec, substream);</div><div class='add'>+</div><div class='add'>+	err = hdmi_choose_cvt(codec, pin_idx, &amp;cvt_idx, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+	/* Claim converter */</div><div class='add'>+	per_cvt-&gt;assigned = true;</div><div class='add'>+</div><div class='add'>+	set_bit(pcm_idx, &amp;spec-&gt;pcm_in_use);</div><div class='add'>+	per_pin = get_pin(spec, pin_idx);</div><div class='add'>+	per_pin-&gt;cvt_nid = per_cvt-&gt;cvt_nid;</div><div class='add'>+	hinfo-&gt;nid = per_cvt-&gt;cvt_nid;</div><div class='add'>+</div><div class='add'>+	/* flip stripe flag for the assigned stream if supported */</div><div class='add'>+	if (get_wcaps(codec, per_cvt-&gt;cvt_nid) &amp; AC_WCAP_STRIPE)</div><div class='add'>+		azx_stream(get_azx_dev(substream))-&gt;stripe = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid, per_pin-&gt;dev_id);</div><div class='add'>+	snd_hda_codec_write_cache(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+			    AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+			    per_pin-&gt;mux_idx);</div><div class='add'>+</div><div class='add'>+	/* configure unused pins to choose other converters */</div><div class='add'>+	pin_cvt_fixup(codec, per_pin, 0);</div><div class='add'>+</div><div class='add'>+	snd_hda_spdif_ctls_assign(codec, pcm_idx, per_cvt-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	/* Initially set the converter's capabilities */</div><div class='add'>+	hinfo-&gt;channels_min = per_cvt-&gt;channels_min;</div><div class='add'>+	hinfo-&gt;channels_max = per_cvt-&gt;channels_max;</div><div class='add'>+	hinfo-&gt;rates = per_cvt-&gt;rates;</div><div class='add'>+	hinfo-&gt;formats = per_cvt-&gt;formats;</div><div class='add'>+	hinfo-&gt;maxbps = per_cvt-&gt;maxbps;</div><div class='add'>+</div><div class='add'>+	eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+	/* Restrict capabilities by ELD if this isn't disabled */</div><div class='add'>+	if (!static_hdmi_pcm &amp;&amp; eld-&gt;eld_valid) {</div><div class='add'>+		snd_hdmi_eld_update_pcm_info(&amp;eld-&gt;info, hinfo);</div><div class='add'>+		if (hinfo-&gt;channels_min &gt; hinfo-&gt;channels_max ||</div><div class='add'>+		    !hinfo-&gt;rates || !hinfo-&gt;formats) {</div><div class='add'>+			per_cvt-&gt;assigned = false;</div><div class='add'>+			hinfo-&gt;nid = 0;</div><div class='add'>+			snd_hda_spdif_ctls_unassign(codec, pcm_idx);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store the updated parameters */</div><div class='add'>+	runtime-&gt;hw.channels_min = hinfo-&gt;channels_min;</div><div class='add'>+	runtime-&gt;hw.channels_max = hinfo-&gt;channels_max;</div><div class='add'>+	runtime-&gt;hw.formats = hinfo-&gt;formats;</div><div class='add'>+	runtime-&gt;hw.rates = hinfo-&gt;rates;</div><div class='add'>+</div><div class='add'>+	snd_pcm_hw_constraint_step(substream-&gt;runtime, 0,</div><div class='add'>+				   SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HDA/HDMI auto parsing</div><div class='add'>+ */</div><div class='add'>+static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+	hda_nid_t pin_nid = per_pin-&gt;pin_nid;</div><div class='add'>+	int dev_id = per_pin-&gt;dev_id;</div><div class='add'>+	int conns;</div><div class='add'>+</div><div class='add'>+	if (!(get_wcaps(codec, pin_nid) &amp; AC_WCAP_CONN_LIST)) {</div><div class='add'>+		codec_warn(codec,</div><div class='add'>+			   "HDMI: pin NID 0x%x wcaps %#x does not support connection list\n",</div><div class='add'>+			   pin_nid, get_wcaps(codec, pin_nid));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, pin_nid, dev_id);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;intel_hsw_fixup) {</div><div class='add'>+		conns = spec-&gt;num_cvts;</div><div class='add'>+		memcpy(per_pin-&gt;mux_nids, spec-&gt;cvt_nids,</div><div class='add'>+		       sizeof(hda_nid_t) * conns);</div><div class='add'>+	} else {</div><div class='add'>+		conns = snd_hda_get_raw_connections(codec, pin_nid,</div><div class='add'>+						    per_pin-&gt;mux_nids,</div><div class='add'>+						    HDA_MAX_CONNECTIONS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* all the device entries on the same pin have the same conn list */</div><div class='add'>+	per_pin-&gt;num_mux_nids = conns;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_find_pcm_slot(struct hdmi_spec *spec,</div><div class='add'>+			      struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;pcm_used; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;spec-&gt;pcm_bitmap))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_attach_hda_pcm(struct hdmi_spec *spec,</div><div class='add'>+				struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	/* pcm already be attached to the pin */</div><div class='add'>+	if (per_pin-&gt;pcm)</div><div class='add'>+		return;</div><div class='add'>+	/* try the previously used slot at first */</div><div class='add'>+	idx = per_pin-&gt;prev_pcm_idx;</div><div class='add'>+	if (idx &gt;= 0) {</div><div class='add'>+		if (!test_bit(idx, &amp;spec-&gt;pcm_bitmap))</div><div class='add'>+			goto found;</div><div class='add'>+		per_pin-&gt;prev_pcm_idx = -1; /* no longer valid, clear it */</div><div class='add'>+	}</div><div class='add'>+	idx = hdmi_find_pcm_slot(spec, per_pin);</div><div class='add'>+	if (idx == -EBUSY)</div><div class='add'>+		return;</div><div class='add'>+ found:</div><div class='add'>+	per_pin-&gt;pcm_idx = idx;</div><div class='add'>+	per_pin-&gt;pcm = get_hdmi_pcm(spec, idx);</div><div class='add'>+	set_bit(idx, &amp;spec-&gt;pcm_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_detach_hda_pcm(struct hdmi_spec *spec,</div><div class='add'>+				struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	/* pcm already be detached from the pin */</div><div class='add'>+	if (!per_pin-&gt;pcm)</div><div class='add'>+		return;</div><div class='add'>+	idx = per_pin-&gt;pcm_idx;</div><div class='add'>+	per_pin-&gt;pcm_idx = -1;</div><div class='add'>+	per_pin-&gt;prev_pcm_idx = idx; /* remember the previous index */</div><div class='add'>+	per_pin-&gt;pcm = NULL;</div><div class='add'>+	if (idx &gt;= 0 &amp;&amp; idx &lt; spec-&gt;pcm_used)</div><div class='add'>+		clear_bit(idx, &amp;spec-&gt;pcm_bitmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_get_pin_cvt_mux(struct hdmi_spec *spec,</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	int mux_idx;</div><div class='add'>+</div><div class='add'>+	for (mux_idx = 0; mux_idx &lt; per_pin-&gt;num_mux_nids; mux_idx++)</div><div class='add'>+		if (per_pin-&gt;mux_nids[mux_idx] == cvt_nid)</div><div class='add'>+			break;</div><div class='add'>+	return mux_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid);</div><div class='add'>+</div><div class='add'>+static void hdmi_pcm_setup_pin(struct hdmi_spec *spec,</div><div class='add'>+			   struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = per_pin-&gt;codec;</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+	struct hda_pcm_stream *hinfo;</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	int mux_idx;</div><div class='add'>+	bool non_pcm;</div><div class='add'>+</div><div class='add'>+	if (per_pin-&gt;pcm_idx &lt; 0 || per_pin-&gt;pcm_idx &gt;= spec-&gt;pcm_used)</div><div class='add'>+		return;</div><div class='add'>+	pcm = get_pcm_rec(spec, per_pin-&gt;pcm_idx);</div><div class='add'>+	if (!pcm-&gt;pcm)</div><div class='add'>+		return;</div><div class='add'>+	if (!test_bit(per_pin-&gt;pcm_idx, &amp;spec-&gt;pcm_in_use))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* hdmi audio only uses playback and one substream */</div><div class='add'>+	hinfo = pcm-&gt;stream;</div><div class='add'>+	substream = pcm-&gt;pcm-&gt;streams[0].substream;</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;cvt_nid = hinfo-&gt;nid;</div><div class='add'>+</div><div class='add'>+	mux_idx = hdmi_get_pin_cvt_mux(spec, per_pin, hinfo-&gt;nid);</div><div class='add'>+	if (mux_idx &lt; per_pin-&gt;num_mux_nids) {</div><div class='add'>+		snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid,</div><div class='add'>+				   per_pin-&gt;dev_id);</div><div class='add'>+		snd_hda_codec_write_cache(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+				AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+				mux_idx);</div><div class='add'>+	}</div><div class='add'>+	snd_hda_spdif_ctls_assign(codec, per_pin-&gt;pcm_idx, hinfo-&gt;nid);</div><div class='add'>+</div><div class='add'>+	non_pcm = check_non_pcm_per_cvt(codec, hinfo-&gt;nid);</div><div class='add'>+	if (substream-&gt;runtime)</div><div class='add'>+		per_pin-&gt;channels = substream-&gt;runtime-&gt;channels;</div><div class='add'>+	per_pin-&gt;setup = true;</div><div class='add'>+	per_pin-&gt;mux_idx = mux_idx;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_setup_audio_infoframe(codec, per_pin, non_pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_pcm_reset_pin(struct hdmi_spec *spec,</div><div class='add'>+			   struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	if (per_pin-&gt;pcm_idx &gt;= 0 &amp;&amp; per_pin-&gt;pcm_idx &lt; spec-&gt;pcm_used)</div><div class='add'>+		snd_hda_spdif_ctls_unassign(per_pin-&gt;codec, per_pin-&gt;pcm_idx);</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;chmap_set = false;</div><div class='add'>+	memset(per_pin-&gt;chmap, 0, sizeof(per_pin-&gt;chmap));</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;setup = false;</div><div class='add'>+	per_pin-&gt;channels = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_jack *pin_idx_to_pcm_jack(struct hda_codec *codec,</div><div class='add'>+					    struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (per_pin-&gt;pcm_idx &gt;= 0)</div><div class='add'>+		return spec-&gt;pcm_rec[per_pin-&gt;pcm_idx].jack;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update per_pin ELD from the given new ELD;</div><div class='add'>+ * setup info frame and notification accordingly</div><div class='add'>+ * also notify ELD kctl and report jack status changes</div><div class='add'>+ */</div><div class='add'>+static void update_eld(struct hda_codec *codec,</div><div class='add'>+		       struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+		       struct hdmi_eld *eld,</div><div class='add'>+		       int repoll)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_eld *pin_eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_jack *pcm_jack;</div><div class='add'>+	bool old_eld_valid = pin_eld-&gt;eld_valid;</div><div class='add'>+	bool eld_changed;</div><div class='add'>+	int pcm_idx;</div><div class='add'>+</div><div class='add'>+	if (eld-&gt;eld_valid) {</div><div class='add'>+		if (eld-&gt;eld_size &lt;= 0 ||</div><div class='add'>+		    snd_parse_eld(hda_codec_dev(codec), &amp;eld-&gt;info,</div><div class='add'>+				  eld-&gt;eld_buffer, eld-&gt;eld_size) &lt; 0) {</div><div class='add'>+			eld-&gt;eld_valid = false;</div><div class='add'>+			if (repoll) {</div><div class='add'>+				schedule_delayed_work(&amp;per_pin-&gt;work,</div><div class='add'>+						      msecs_to_jiffies(300));</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!eld-&gt;eld_valid || eld-&gt;eld_size &lt;= 0 || eld-&gt;info.sad_count &lt;= 0) {</div><div class='add'>+		eld-&gt;eld_valid = false;</div><div class='add'>+		eld-&gt;eld_size = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* for monitor disconnection, save pcm_idx firstly */</div><div class='add'>+	pcm_idx = per_pin-&gt;pcm_idx;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * pcm_idx &gt;=0 before update_eld() means it is in monitor</div><div class='add'>+	 * disconnected event. Jack must be fetched before update_eld().</div><div class='add'>+	 */</div><div class='add'>+	pcm_jack = pin_idx_to_pcm_jack(codec, per_pin);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;static_pcm_mapping) {</div><div class='add'>+		if (eld-&gt;eld_valid) {</div><div class='add'>+			hdmi_attach_hda_pcm(spec, per_pin);</div><div class='add'>+			hdmi_pcm_setup_pin(spec, per_pin);</div><div class='add'>+		} else {</div><div class='add'>+			hdmi_pcm_reset_pin(spec, per_pin);</div><div class='add'>+			hdmi_detach_hda_pcm(spec, per_pin);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if pcm_idx == -1, it means this is in monitor connection event</div><div class='add'>+	 * we can get the correct pcm_idx now.</div><div class='add'>+	 */</div><div class='add'>+	if (pcm_idx == -1)</div><div class='add'>+		pcm_idx = per_pin-&gt;pcm_idx;</div><div class='add'>+	if (!pcm_jack)</div><div class='add'>+		pcm_jack = pin_idx_to_pcm_jack(codec, per_pin);</div><div class='add'>+</div><div class='add'>+	if (eld-&gt;eld_valid)</div><div class='add'>+		snd_show_eld(hda_codec_dev(codec), &amp;eld-&gt;info);</div><div class='add'>+</div><div class='add'>+	eld_changed = (pin_eld-&gt;eld_valid != eld-&gt;eld_valid);</div><div class='add'>+	eld_changed |= (pin_eld-&gt;monitor_present != eld-&gt;monitor_present);</div><div class='add'>+	if (!eld_changed &amp;&amp; eld-&gt;eld_valid &amp;&amp; pin_eld-&gt;eld_valid)</div><div class='add'>+		if (pin_eld-&gt;eld_size != eld-&gt;eld_size ||</div><div class='add'>+		    memcmp(pin_eld-&gt;eld_buffer, eld-&gt;eld_buffer,</div><div class='add'>+			   eld-&gt;eld_size) != 0)</div><div class='add'>+			eld_changed = true;</div><div class='add'>+</div><div class='add'>+	if (eld_changed) {</div><div class='add'>+		pin_eld-&gt;monitor_present = eld-&gt;monitor_present;</div><div class='add'>+		pin_eld-&gt;eld_valid = eld-&gt;eld_valid;</div><div class='add'>+		pin_eld-&gt;eld_size = eld-&gt;eld_size;</div><div class='add'>+		if (eld-&gt;eld_valid)</div><div class='add'>+			memcpy(pin_eld-&gt;eld_buffer, eld-&gt;eld_buffer,</div><div class='add'>+			       eld-&gt;eld_size);</div><div class='add'>+		pin_eld-&gt;info = eld-&gt;info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Re-setup pin and infoframe. This is needed e.g. when</div><div class='add'>+	 * - sink is first plugged-in</div><div class='add'>+	 * - transcoder can change during stream playback on Haswell</div><div class='add'>+	 *   and this can make HW reset converter selection on a pin.</div><div class='add'>+	 */</div><div class='add'>+	if (eld-&gt;eld_valid &amp;&amp; !old_eld_valid &amp;&amp; per_pin-&gt;setup) {</div><div class='add'>+		pin_cvt_fixup(codec, per_pin, 0);</div><div class='add'>+		snd_hda_hdmi_setup_audio_infoframe(codec, per_pin, per_pin-&gt;non_pcm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eld_changed &amp;&amp; pcm_idx &gt;= 0)</div><div class='add'>+		snd_ctl_notify(codec-&gt;card,</div><div class='add'>+			       SNDRV_CTL_EVENT_MASK_VALUE |</div><div class='add'>+			       SNDRV_CTL_EVENT_MASK_INFO,</div><div class='add'>+			       &amp;get_hdmi_pcm(spec, pcm_idx)-&gt;eld_ctl-&gt;id);</div><div class='add'>+</div><div class='add'>+	if (eld_changed &amp;&amp; pcm_jack)</div><div class='add'>+		snd_jack_report(pcm_jack,</div><div class='add'>+				(eld-&gt;monitor_present &amp;&amp; eld-&gt;eld_valid) ?</div><div class='add'>+				SND_JACK_AVOUT : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update ELD and jack state via HD-audio verbs */</div><div class='add'>+static void hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+					 int repoll)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = per_pin-&gt;codec;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_eld *eld = &amp;spec-&gt;temp_eld;</div><div class='add'>+	struct device *dev = hda_codec_dev(codec);</div><div class='add'>+	hda_nid_t pin_nid = per_pin-&gt;pin_nid;</div><div class='add'>+	int dev_id = per_pin-&gt;dev_id;</div><div class='add'>+	/*</div><div class='add'>+	 * Always execute a GetPinSense verb here, even when called from</div><div class='add'>+	 * hdmi_intrinsic_event; for some NVIDIA HW, the unsolicited</div><div class='add'>+	 * response's PD bit is not the real PD value, but indicates that</div><div class='add'>+	 * the real PD value changed. An older version of the HD-audio</div><div class='add'>+	 * specification worked this way. Hence, we just ignore the data in</div><div class='add'>+	 * the unsolicited response to avoid custom WARs.</div><div class='add'>+	 */</div><div class='add'>+	int present;</div><div class='add'>+</div><div class='add'>+#ifdef	CONFIG_PM</div><div class='add'>+	if (dev-&gt;power.runtime_status == RPM_SUSPENDING)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	if (pm.err &lt; 0 &amp;&amp; pm_runtime_suspended(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	present = snd_hda_jack_pin_sense(codec, pin_nid, dev_id);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+	eld-&gt;monitor_present = !!(present &amp; AC_PINSENSE_PRESENCE);</div><div class='add'>+	if (eld-&gt;monitor_present)</div><div class='add'>+		eld-&gt;eld_valid  = !!(present &amp; AC_PINSENSE_ELDV);</div><div class='add'>+	else</div><div class='add'>+		eld-&gt;eld_valid = false;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		"HDMI status: Codec=%d NID=0x%x Presence_Detect=%d ELD_Valid=%d\n",</div><div class='add'>+		codec-&gt;addr, pin_nid, eld-&gt;monitor_present, eld-&gt;eld_valid);</div><div class='add'>+</div><div class='add'>+	if (eld-&gt;eld_valid) {</div><div class='add'>+		if (spec-&gt;ops.pin_get_eld(codec, pin_nid, dev_id,</div><div class='add'>+					  eld-&gt;eld_buffer, &amp;eld-&gt;eld_size) &lt; 0)</div><div class='add'>+			eld-&gt;eld_valid = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	update_eld(codec, per_pin, eld, repoll);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void silent_stream_enable(struct hda_codec *codec,</div><div class='add'>+				 struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	int cvt_idx, pin_idx, err;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Power-up will call hdmi_present_sense, so the PM calls</div><div class='add'>+	 * have to be done without mutex held.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	if (pm.err &lt; 0 &amp;&amp; pm.err != -EACCES) {</div><div class='add'>+		codec_err(codec,</div><div class='add'>+			  "Failed to power up codec for silent stream enable ret=[%d]\n", pm.err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (per_pin-&gt;setup) {</div><div class='add'>+		codec_dbg(codec, "hdmi: PCM already open, no silent stream\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pin_idx = pin_id_to_pin_index(codec, per_pin-&gt;pin_nid, per_pin-&gt;dev_id);</div><div class='add'>+	err = hdmi_choose_cvt(codec, pin_idx, &amp;cvt_idx, true);</div><div class='add'>+	if (err) {</div><div class='add'>+		codec_err(codec, "hdmi: no free converter to enable silent mode\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+	per_cvt-&gt;silent_stream = true;</div><div class='add'>+	per_pin-&gt;cvt_nid = per_cvt-&gt;cvt_nid;</div><div class='add'>+	per_pin-&gt;silent_stream = true;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "hdmi: enabling silent stream pin-NID=0x%x cvt-NID=0x%x\n",</div><div class='add'>+		  per_pin-&gt;pin_nid, per_cvt-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid, per_pin-&gt;dev_id);</div><div class='add'>+	snd_hda_codec_write_cache(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+				  AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+				  per_pin-&gt;mux_idx);</div><div class='add'>+</div><div class='add'>+	/* configure unused pins to choose other converters */</div><div class='add'>+	pin_cvt_fixup(codec, per_pin, 0);</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.silent_stream(codec, per_pin, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void silent_stream_disable(struct hda_codec *codec,</div><div class='add'>+				  struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	int cvt_idx;</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	if (pm.err &lt; 0 &amp;&amp; pm.err != -EACCES) {</div><div class='add'>+		codec_err(codec,</div><div class='add'>+			  "Failed to power up codec for silent stream disable ret=[%d]\n",</div><div class='add'>+			  pm.err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+	if (!per_pin-&gt;silent_stream)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "HDMI: disable silent stream on pin-NID=0x%x cvt-NID=0x%x\n",</div><div class='add'>+		  per_pin-&gt;pin_nid, per_pin-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	cvt_idx = cvt_nid_to_cvt_index(codec, per_pin-&gt;cvt_nid);</div><div class='add'>+	if (cvt_idx &gt;= 0 &amp;&amp; cvt_idx &lt; spec-&gt;num_cvts) {</div><div class='add'>+		per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+		per_cvt-&gt;silent_stream = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.silent_stream(codec, per_pin, false);</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;cvt_nid = 0;</div><div class='add'>+	per_pin-&gt;silent_stream = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update ELD and jack state via audio component */</div><div class='add'>+static void sync_eld_via_acomp(struct hda_codec *codec,</div><div class='add'>+			       struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_eld *eld = &amp;spec-&gt;temp_eld;</div><div class='add'>+	bool monitor_prev, monitor_next;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;per_pin-&gt;lock) {</div><div class='add'>+		eld-&gt;monitor_present = false;</div><div class='add'>+		monitor_prev = per_pin-&gt;sink_eld.monitor_present;</div><div class='add'>+		eld-&gt;eld_size = snd_hdac_acomp_get_eld(&amp;codec-&gt;core, per_pin-&gt;pin_nid,</div><div class='add'>+						       per_pin-&gt;dev_id, &amp;eld-&gt;monitor_present,</div><div class='add'>+						       eld-&gt;eld_buffer, ELD_MAX_SIZE);</div><div class='add'>+		eld-&gt;eld_valid = (eld-&gt;eld_size &gt; 0);</div><div class='add'>+		update_eld(codec, per_pin, eld, 0);</div><div class='add'>+		monitor_next = per_pin-&gt;sink_eld.monitor_present;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;silent_stream_type) {</div><div class='add'>+		if (!monitor_prev &amp;&amp; monitor_next)</div><div class='add'>+			silent_stream_enable(codec, per_pin);</div><div class='add'>+		else if (monitor_prev &amp;&amp; !monitor_next)</div><div class='add'>+			silent_stream_disable(codec, per_pin);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = per_pin-&gt;codec;</div><div class='add'>+</div><div class='add'>+	if (!codec_has_acomp(codec))</div><div class='add'>+		hdmi_present_sense_via_verbs(per_pin, repoll);</div><div class='add'>+	else</div><div class='add'>+		sync_eld_via_acomp(codec, per_pin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_repoll_eld(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin =</div><div class='add'>+	container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work);</div><div class='add'>+	struct hda_codec *codec = per_pin-&gt;codec;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+</div><div class='add'>+	jack = snd_hda_jack_tbl_get_mst(codec, per_pin-&gt;pin_nid,</div><div class='add'>+					per_pin-&gt;dev_id);</div><div class='add'>+	if (jack)</div><div class='add'>+		jack-&gt;jack_dirty = 1;</div><div class='add'>+</div><div class='add'>+	if (per_pin-&gt;repoll_count++ &gt; 6)</div><div class='add'>+		per_pin-&gt;repoll_count = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	hdmi_present_sense(per_pin, per_pin-&gt;repoll_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int caps, config;</div><div class='add'>+	int pin_idx;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	int err;</div><div class='add'>+	int dev_num, i;</div><div class='add'>+</div><div class='add'>+	caps = snd_hda_query_pin_caps(codec, pin_nid);</div><div class='add'>+	if (!(caps &amp; (AC_PINCAP_HDMI | AC_PINCAP_DP)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For DP MST audio, Configuration Default is the same for</div><div class='add'>+	 * all device entries on the same pin</div><div class='add'>+	 */</div><div class='add'>+	config = snd_hda_codec_get_pincfg(codec, pin_nid);</div><div class='add'>+	if (get_defcfg_connect(config) == AC_JACK_PORT_NONE &amp;&amp;</div><div class='add'>+	    !spec-&gt;force_connect)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * To simplify the implementation, malloc all</div><div class='add'>+	 * the virtual pins in the initialization statically</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;intel_hsw_fixup) {</div><div class='add'>+		/*</div><div class='add'>+		 * On Intel platforms, device entries count returned</div><div class='add'>+		 * by AC_PAR_DEVLIST_LEN is dynamic, and depends on</div><div class='add'>+		 * the type of receiver that is connected. Allocate pin</div><div class='add'>+		 * structures based on worst case.</div><div class='add'>+		 */</div><div class='add'>+		dev_num = spec-&gt;dev_num;</div><div class='add'>+	} else if (codec-&gt;dp_mst) {</div><div class='add'>+		dev_num = snd_hda_get_num_devices(codec, pin_nid) + 1;</div><div class='add'>+		/*</div><div class='add'>+		 * spec-&gt;dev_num is the maxinum number of device entries</div><div class='add'>+		 * among all the pins</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;dev_num = (spec-&gt;dev_num &gt; dev_num) ?</div><div class='add'>+			spec-&gt;dev_num : dev_num;</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * If the platform doesn't support DP MST,</div><div class='add'>+		 * manually set dev_num to 1. This means</div><div class='add'>+		 * the pin has only one device entry.</div><div class='add'>+		 */</div><div class='add'>+		dev_num = 1;</div><div class='add'>+		spec-&gt;dev_num = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev_num; i++) {</div><div class='add'>+		pin_idx = spec-&gt;num_pins;</div><div class='add'>+		per_pin = snd_array_new(&amp;spec-&gt;pins);</div><div class='add'>+</div><div class='add'>+		if (!per_pin)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		per_pin-&gt;pcm = NULL;</div><div class='add'>+		per_pin-&gt;pcm_idx = -1;</div><div class='add'>+		per_pin-&gt;prev_pcm_idx = -1;</div><div class='add'>+		per_pin-&gt;pin_nid = pin_nid;</div><div class='add'>+		per_pin-&gt;pin_nid_idx = spec-&gt;num_nids;</div><div class='add'>+		per_pin-&gt;dev_id = i;</div><div class='add'>+		per_pin-&gt;non_pcm = false;</div><div class='add'>+		snd_hda_set_dev_select(codec, pin_nid, i);</div><div class='add'>+		err = hdmi_read_pin_conn(codec, pin_idx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (!is_jack_detectable(codec, pin_nid))</div><div class='add'>+			codec_warn(codec, "HDMI: pin NID 0x%x - jack not detectable\n", pin_nid);</div><div class='add'>+		spec-&gt;num_pins++;</div><div class='add'>+	}</div><div class='add'>+	spec-&gt;num_nids++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	unsigned int chans;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	chans = get_wcaps(codec, cvt_nid);</div><div class='add'>+	chans = get_wcaps_channels(chans);</div><div class='add'>+</div><div class='add'>+	per_cvt = snd_array_new(&amp;spec-&gt;cvts);</div><div class='add'>+	if (!per_cvt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	per_cvt-&gt;cvt_nid = cvt_nid;</div><div class='add'>+	per_cvt-&gt;channels_min = 2;</div><div class='add'>+	if (chans &lt;= 16) {</div><div class='add'>+		per_cvt-&gt;channels_max = chans;</div><div class='add'>+		if (chans &gt; spec-&gt;chmap.channels_max)</div><div class='add'>+			spec-&gt;chmap.channels_max = chans;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_hda_query_supported_pcm(codec, cvt_nid,</div><div class='add'>+					  &amp;per_cvt-&gt;rates,</div><div class='add'>+					  &amp;per_cvt-&gt;formats,</div><div class='add'>+					  NULL,</div><div class='add'>+					  &amp;per_cvt-&gt;maxbps);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;num_cvts &lt; ARRAY_SIZE(spec-&gt;cvt_nids))</div><div class='add'>+		spec-&gt;cvt_nids[spec-&gt;num_cvts] = cvt_nid;</div><div class='add'>+	spec-&gt;num_cvts++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pci_quirk force_connect_list[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83e2, "HP EliteDesk 800 G4", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83ef, "HP MP9 G4 Retail System AMS", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x845a, "HP EliteDesk 800 G4 DM 65W", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83f3, "HP ProDesk 400", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x86ae, "ASUS", 1),  /* Z170 PRO */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x86c7, "ASUS", 1),  /* Z170M PLUS */</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2060, "Intel NUC5CPYB", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_parse_codec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t start_nid;</div><div class='add'>+	unsigned int caps;</div><div class='add'>+	int i, nodes;</div><div class='add'>+	const struct snd_pci_quirk *q;</div><div class='add'>+</div><div class='add'>+	nodes = snd_hda_get_sub_nodes(codec, codec-&gt;core.afg, &amp;start_nid);</div><div class='add'>+	if (!start_nid || nodes &lt; 0) {</div><div class='add'>+		codec_warn(codec, "HDMI: failed to get afg sub nodes\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable_all_pins)</div><div class='add'>+		spec-&gt;force_connect = true;</div><div class='add'>+</div><div class='add'>+	q = snd_pci_quirk_lookup(codec-&gt;bus-&gt;pci, force_connect_list);</div><div class='add'>+</div><div class='add'>+	if (q &amp;&amp; q-&gt;value)</div><div class='add'>+		spec-&gt;force_connect = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * hdmi_add_pin() assumes total amount of converters to</div><div class='add'>+	 * be known, so first discover all converters</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nodes; i++) {</div><div class='add'>+		hda_nid_t nid = start_nid + i;</div><div class='add'>+</div><div class='add'>+		caps = get_wcaps(codec, nid);</div><div class='add'>+</div><div class='add'>+		if (!(caps &amp; AC_WCAP_DIGITAL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (get_wcaps_type(caps) == AC_WID_AUD_OUT)</div><div class='add'>+			hdmi_add_cvt(codec, nid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* discover audio pins */</div><div class='add'>+	for (i = 0; i &lt; nodes; i++) {</div><div class='add'>+		hda_nid_t nid = start_nid + i;</div><div class='add'>+</div><div class='add'>+		caps = get_wcaps(codec, nid);</div><div class='add'>+</div><div class='add'>+		if (!(caps &amp; AC_WCAP_DIGITAL))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (get_wcaps_type(caps) == AC_WID_PIN)</div><div class='add'>+			hdmi_add_pin(codec, nid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_parse_codec, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid);</div><div class='add'>+	/* Add sanity check to pass klockwork check.</div><div class='add'>+	 * This should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(spdif == NULL))</div><div class='add'>+		return true;</div><div class='add'>+	return !!(spdif-&gt;status &amp; IEC958_AES0_NONAUDIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HDMI callbacks</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     unsigned int stream_tag,</div><div class='add'>+				     unsigned int format,</div><div class='add'>+				     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t cvt_nid = hinfo-&gt;nid;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	bool non_pcm;</div><div class='add'>+	int pinctl, stripe;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	pin_idx = hinfo_to_pin_index(codec, hinfo);</div><div class='add'>+	if (pin_idx &lt; 0) {</div><div class='add'>+		/* when pcm is not bound to a pin skip pin setup and return 0</div><div class='add'>+		 * to make audio playback be ongoing</div><div class='add'>+		 */</div><div class='add'>+		pin_cvt_fixup(codec, NULL, cvt_nid);</div><div class='add'>+		snd_hda_codec_setup_stream(codec, cvt_nid,</div><div class='add'>+					stream_tag, 0, format);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+	/* Verify pin:cvt selections to avoid silent audio after S3.</div><div class='add'>+	 * After S3, the audio driver restores pin:cvt selections</div><div class='add'>+	 * but this can happen before gfx is ready and such selection</div><div class='add'>+	 * is overlooked by HW. Thus multiple pins can share a same</div><div class='add'>+	 * default convertor and mute control will affect each other,</div><div class='add'>+	 * which can cause a resumed audio playback become silent</div><div class='add'>+	 * after S3.</div><div class='add'>+	 */</div><div class='add'>+	pin_cvt_fixup(codec, per_pin, 0);</div><div class='add'>+</div><div class='add'>+	/* Call sync_audio_rate to set the N/CTS/M manually if necessary */</div><div class='add'>+	/* Todo: add DP1.2 MST audio support later */</div><div class='add'>+	if (codec_has_acomp(codec))</div><div class='add'>+		snd_hdac_sync_audio_rate(&amp;codec-&gt;core, per_pin-&gt;pin_nid,</div><div class='add'>+					 per_pin-&gt;dev_id, runtime-&gt;rate);</div><div class='add'>+</div><div class='add'>+	non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);</div><div class='add'>+	scoped_guard(mutex, &amp;per_pin-&gt;lock) {</div><div class='add'>+		per_pin-&gt;channels = substream-&gt;runtime-&gt;channels;</div><div class='add'>+		per_pin-&gt;setup = true;</div><div class='add'>+</div><div class='add'>+		if (get_wcaps(codec, cvt_nid) &amp; AC_WCAP_STRIPE) {</div><div class='add'>+			stripe = snd_hdac_get_stream_stripe_ctl(&amp;codec-&gt;bus-&gt;core,</div><div class='add'>+								substream);</div><div class='add'>+			snd_hda_codec_write(codec, cvt_nid, 0,</div><div class='add'>+					    AC_VERB_SET_STRIPE_CONTROL,</div><div class='add'>+					    stripe);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snd_hda_hdmi_setup_audio_infoframe(codec, per_pin, non_pcm);</div><div class='add'>+	}</div><div class='add'>+	if (spec-&gt;dyn_pin_out) {</div><div class='add'>+		snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid,</div><div class='add'>+				       per_pin-&gt;dev_id);</div><div class='add'>+		pinctl = snd_hda_codec_read(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+		snd_hda_codec_write(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+				    pinctl | PIN_OUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* snd_hda_set_dev_select() has been called before */</div><div class='add'>+	return spec-&gt;ops.setup_stream(codec, cvt_nid, per_pin-&gt;pin_nid,</div><div class='add'>+				      per_pin-&gt;dev_id, stream_tag, format);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_pcm_prepare, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_pcm_cleanup, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+			  struct hda_codec *codec,</div><div class='add'>+			  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int cvt_idx, pin_idx, pcm_idx;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	int pinctl;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	if (hinfo-&gt;nid) {</div><div class='add'>+		pcm_idx = hinfo_to_pcm_index(codec, hinfo);</div><div class='add'>+		if (snd_BUG_ON(pcm_idx &lt; 0))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cvt_idx = cvt_nid_to_cvt_index(codec, hinfo-&gt;nid);</div><div class='add'>+		if (snd_BUG_ON(cvt_idx &lt; 0))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+		per_cvt-&gt;assigned = false;</div><div class='add'>+		hinfo-&gt;nid = 0;</div><div class='add'>+</div><div class='add'>+		azx_stream(get_azx_dev(substream))-&gt;stripe = 0;</div><div class='add'>+</div><div class='add'>+		snd_hda_spdif_ctls_unassign(codec, pcm_idx);</div><div class='add'>+		clear_bit(pcm_idx, &amp;spec-&gt;pcm_in_use);</div><div class='add'>+		pin_idx = hinfo_to_pin_index(codec, hinfo);</div><div class='add'>+		/*</div><div class='add'>+		 * In such a case, return 0 to match the behavior in</div><div class='add'>+		 * hdmi_pcm_open()</div><div class='add'>+		 */</div><div class='add'>+		if (pin_idx &lt; 0)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;dyn_pin_out) {</div><div class='add'>+			snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid,</div><div class='add'>+					       per_pin-&gt;dev_id);</div><div class='add'>+			pinctl = snd_hda_codec_read(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+			snd_hda_codec_write(codec, per_pin-&gt;pin_nid, 0,</div><div class='add'>+					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+					    pinctl &amp; ~PIN_OUT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+		per_pin-&gt;chmap_set = false;</div><div class='add'>+		memset(per_pin-&gt;chmap, 0, sizeof(per_pin-&gt;chmap));</div><div class='add'>+</div><div class='add'>+		per_pin-&gt;setup = false;</div><div class='add'>+		per_pin-&gt;channels = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_ops generic_ops = {</div><div class='add'>+	.open = hdmi_pcm_open,</div><div class='add'>+	.close = hdmi_pcm_close,</div><div class='add'>+	.prepare = snd_hda_hdmi_generic_pcm_prepare,</div><div class='add'>+	.cleanup = snd_hda_hdmi_generic_pcm_cleanup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hdmi_get_spk_alloc(struct hdac_device *hdac, int pcm_idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+</div><div class='add'>+	if (!per_pin)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return per_pin-&gt;sink_eld.info.spk_alloc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_get_chmap(struct hdac_device *hdac, int pcm_idx,</div><div class='add'>+					unsigned char *chmap)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+</div><div class='add'>+	/* chmap is already set to 0 in caller */</div><div class='add'>+	if (!per_pin)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(chmap, per_pin-&gt;chmap, ARRAY_SIZE(per_pin-&gt;chmap));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_set_chmap(struct hdac_device *hdac, int pcm_idx,</div><div class='add'>+				unsigned char *chmap, int prepared)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+</div><div class='add'>+	if (!per_pin)</div><div class='add'>+		return;</div><div class='add'>+	guard(mutex)(&amp;per_pin-&gt;lock);</div><div class='add'>+	per_pin-&gt;chmap_set = true;</div><div class='add'>+	memcpy(per_pin-&gt;chmap, chmap, ARRAY_SIZE(per_pin-&gt;chmap));</div><div class='add'>+	if (prepared)</div><div class='add'>+		snd_hda_hdmi_setup_audio_infoframe(codec, per_pin, per_pin-&gt;non_pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hdac_to_hda_codec(hdac);</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);</div><div class='add'>+</div><div class='add'>+	return per_pin ? true:false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int idx, pcm_num;</div><div class='add'>+</div><div class='add'>+	/* limit the PCM devices to the codec converters or available PINs */</div><div class='add'>+	pcm_num = min(spec-&gt;num_cvts, spec-&gt;num_pins);</div><div class='add'>+	codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; pcm_num; idx++) {</div><div class='add'>+		struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+		struct hda_pcm *info;</div><div class='add'>+		struct hda_pcm_stream *pstr;</div><div class='add'>+</div><div class='add'>+		info = snd_hda_codec_pcm_new(codec, "HDMI %d", idx);</div><div class='add'>+		if (!info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		spec-&gt;pcm_rec[idx].pcm = info;</div><div class='add'>+		spec-&gt;pcm_used++;</div><div class='add'>+		info-&gt;pcm_type = HDA_PCM_TYPE_HDMI;</div><div class='add'>+		info-&gt;own_chmap = true;</div><div class='add'>+</div><div class='add'>+		pstr = &amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+		pstr-&gt;substreams = 1;</div><div class='add'>+		pstr-&gt;ops = generic_ops;</div><div class='add'>+</div><div class='add'>+		per_cvt = get_cvt(spec, 0);</div><div class='add'>+		pstr-&gt;channels_min = per_cvt-&gt;channels_min;</div><div class='add'>+		pstr-&gt;channels_max = per_cvt-&gt;channels_max;</div><div class='add'>+</div><div class='add'>+		/* pcm number is less than pcm_rec array size */</div><div class='add'>+		if (spec-&gt;pcm_used &gt;= ARRAY_SIZE(spec-&gt;pcm_rec))</div><div class='add'>+			break;</div><div class='add'>+		/* other pstr fields are set in open */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_build_pcms, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static void free_hdmi_jack_priv(struct snd_jack *jack)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_pcm *pcm = jack-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;jack = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_hdmi_build_jack(struct hda_codec *codec, int pcm_idx)</div><div class='add'>+{</div><div class='add'>+	char hdmi_str[32] = "HDMI/DP";</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_jack *jack;</div><div class='add'>+	int pcmdev = get_pcm_rec(spec, pcm_idx)-&gt;device;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pcmdev &gt; 0)</div><div class='add'>+		sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);</div><div class='add'>+</div><div class='add'>+	err = snd_jack_new(codec-&gt;card, hdmi_str, SND_JACK_AVOUT, &amp;jack,</div><div class='add'>+			   true, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;pcm_rec[pcm_idx].jack = jack;</div><div class='add'>+	jack-&gt;private_data = &amp;spec-&gt;pcm_rec[pcm_idx];</div><div class='add'>+	jack-&gt;private_free = free_hdmi_jack_priv;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int dev, err;</div><div class='add'>+	int pin_idx, pcm_idx;</div><div class='add'>+</div><div class='add'>+	for (pcm_idx = 0; pcm_idx &lt; spec-&gt;pcm_used; pcm_idx++) {</div><div class='add'>+		if (!get_pcm_rec(spec, pcm_idx)-&gt;pcm) {</div><div class='add'>+			/* no PCM: mark this for skipping permanently */</div><div class='add'>+			set_bit(pcm_idx, &amp;spec-&gt;pcm_bitmap);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = generic_hdmi_build_jack(codec, pcm_idx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* create the spdif for each pcm</div><div class='add'>+		 * pin will be bound when monitor is connected</div><div class='add'>+		 */</div><div class='add'>+		err = snd_hda_create_dig_out_ctls(codec,</div><div class='add'>+					  0, spec-&gt;cvt_nids[0],</div><div class='add'>+					  HDA_PCM_TYPE_HDMI);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		snd_hda_spdif_ctls_unassign(codec, pcm_idx);</div><div class='add'>+</div><div class='add'>+		dev = get_pcm_rec(spec, pcm_idx)-&gt;device;</div><div class='add'>+		if (dev != SNDRV_PCM_INVALID_DEVICE) {</div><div class='add'>+			/* add control for ELD Bytes */</div><div class='add'>+			err = hdmi_create_eld_ctl(codec, pcm_idx, dev);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		struct hdmi_eld *pin_eld = &amp;per_pin-&gt;sink_eld;</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;static_pcm_mapping) {</div><div class='add'>+			hdmi_attach_hda_pcm(spec, per_pin);</div><div class='add'>+			hdmi_pcm_setup_pin(spec, per_pin);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pin_eld-&gt;eld_valid = false;</div><div class='add'>+		hdmi_present_sense(per_pin, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add channel maps */</div><div class='add'>+	for (pcm_idx = 0; pcm_idx &lt; spec-&gt;pcm_used; pcm_idx++) {</div><div class='add'>+		struct hda_pcm *pcm;</div><div class='add'>+</div><div class='add'>+		pcm = get_pcm_rec(spec, pcm_idx);</div><div class='add'>+		if (!pcm || !pcm-&gt;pcm)</div><div class='add'>+			break;</div><div class='add'>+		err = snd_hdac_add_chmap_ctls(pcm-&gt;pcm, pcm_idx, &amp;spec-&gt;chmap);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_build_controls, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_init_per_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+		per_pin-&gt;codec = codec;</div><div class='add'>+		mutex_init(&amp;per_pin-&gt;lock);</div><div class='add'>+		INIT_DELAYED_WORK(&amp;per_pin-&gt;work, hdmi_repoll_eld);</div><div class='add'>+		eld_proc_new(per_pin, pin_idx);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_init_per_pins, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;bind_lock);</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		hda_nid_t pin_nid = per_pin-&gt;pin_nid;</div><div class='add'>+		int dev_id = per_pin-&gt;dev_id;</div><div class='add'>+</div><div class='add'>+		snd_hda_set_dev_select(codec, pin_nid, dev_id);</div><div class='add'>+		hdmi_init_pin(codec, pin_nid);</div><div class='add'>+		if (codec_has_acomp(codec))</div><div class='add'>+			continue;</div><div class='add'>+		snd_hda_jack_detect_enable_callback_mst(codec, pin_nid, dev_id,</div><div class='add'>+							jack_callback);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_init, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static void hdmi_array_init(struct hdmi_spec *spec, int nums)</div><div class='add'>+{</div><div class='add'>+	snd_array_init(&amp;spec-&gt;pins, sizeof(struct hdmi_spec_per_pin), nums);</div><div class='add'>+	snd_array_init(&amp;spec-&gt;cvts, sizeof(struct hdmi_spec_per_cvt), nums);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_array_free(struct hdmi_spec *spec)</div><div class='add'>+{</div><div class='add'>+	snd_array_free(&amp;spec-&gt;pins);</div><div class='add'>+	snd_array_free(&amp;spec-&gt;cvts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_generic_spec_free(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec) {</div><div class='add'>+		hdmi_array_free(spec);</div><div class='add'>+		kfree(spec);</div><div class='add'>+		codec-&gt;spec = NULL;</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;dp_mst = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_spec_free, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_generic_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx, pcm_idx;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;acomp_registered) {</div><div class='add'>+		snd_hdac_acomp_exit(&amp;codec-&gt;bus-&gt;core);</div><div class='add'>+	} else if (codec_has_acomp(codec)) {</div><div class='add'>+		snd_hdac_acomp_register_notifier(&amp;codec-&gt;bus-&gt;core, NULL);</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;relaxed_resume = 0;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		cancel_delayed_work_sync(&amp;per_pin-&gt;work);</div><div class='add'>+		eld_proc_free(per_pin);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pcm_idx = 0; pcm_idx &lt; spec-&gt;pcm_used; pcm_idx++) {</div><div class='add'>+		if (spec-&gt;pcm_rec[pcm_idx].jack == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		snd_device_free(codec-&gt;card, spec-&gt;pcm_rec[pcm_idx].jack);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_generic_spec_free(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_remove, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		cancel_delayed_work_sync(&amp;per_pin-&gt;work);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_suspend, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_init(codec);</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		hdmi_present_sense(per_pin, 1);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_resume, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static const struct hdmi_ops generic_standard_hdmi_ops = {</div><div class='add'>+	.pin_get_eld				= hdmi_pin_get_eld,</div><div class='add'>+	.pin_setup_infoframe			= hdmi_pin_setup_infoframe,</div><div class='add'>+	.pin_hbr_setup				= hdmi_pin_hbr_setup,</div><div class='add'>+	.setup_stream				= snd_hda_hdmi_setup_stream,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* allocate codec-&gt;spec and assign/initialize generic parser ops */</div><div class='add'>+int snd_hda_hdmi_generic_alloc(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;codec = codec;</div><div class='add'>+	spec-&gt;ops = generic_standard_hdmi_ops;</div><div class='add'>+	spec-&gt;dev_num = 1;	/* initialize to 1 */</div><div class='add'>+	mutex_init(&amp;spec-&gt;pcm_lock);</div><div class='add'>+	mutex_init(&amp;spec-&gt;bind_lock);</div><div class='add'>+	snd_hdac_register_chmap_ops(&amp;codec-&gt;core, &amp;spec-&gt;chmap);</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.ops.get_chmap = hdmi_get_chmap;</div><div class='add'>+	spec-&gt;chmap.ops.set_chmap = hdmi_set_chmap;</div><div class='add'>+	spec-&gt;chmap.ops.is_pcm_attached = is_hdmi_pcm_attached;</div><div class='add'>+	spec-&gt;chmap.ops.get_spk_alloc = hdmi_get_spk_alloc;</div><div class='add'>+</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	hdmi_array_init(spec, 4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_alloc, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* generic HDMI parser */</div><div class='add'>+int snd_hda_hdmi_generic_probe(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_alloc(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_parse_codec(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_hdmi_generic_spec_free(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_generic_init_per_pins(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_generic_probe, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * generic audio component binding</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* turn on / off the unsol event jack detection dynamically */</div><div class='add'>+static void reprogram_jack_detect(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  int dev_id, bool use_acomp)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *tbl;</div><div class='add'>+</div><div class='add'>+	tbl = snd_hda_jack_tbl_get_mst(codec, nid, dev_id);</div><div class='add'>+	if (tbl) {</div><div class='add'>+		/* clear unsol even if component notifier is used, or re-enable</div><div class='add'>+		 * if notifier is cleared</div><div class='add'>+		 */</div><div class='add'>+		unsigned int val = use_acomp ? 0 : (AC_USRSP_EN | tbl-&gt;tag);</div><div class='add'>+		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+					  AC_VERB_SET_UNSOLICITED_ENABLE, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up / clear component notifier dynamically */</div><div class='add'>+static void generic_acomp_notifier_set(struct drm_audio_component *acomp,</div><div class='add'>+				       bool use_acomp)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec = container_of(acomp-&gt;audio_ops, struct hdmi_spec, drm_audio_ops);</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;bind_lock);</div><div class='add'>+	spec-&gt;use_acomp_notifier = use_acomp;</div><div class='add'>+	spec-&gt;codec-&gt;relaxed_resume = use_acomp;</div><div class='add'>+	spec-&gt;codec-&gt;bus-&gt;keep_power = 0;</div><div class='add'>+	/* reprogram each jack detection logic depending on the notifier */</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_pins; i++)</div><div class='add'>+		reprogram_jack_detect(spec-&gt;codec,</div><div class='add'>+				      get_pin(spec, i)-&gt;pin_nid,</div><div class='add'>+				      get_pin(spec, i)-&gt;dev_id,</div><div class='add'>+				      use_acomp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* enable / disable the notifier via master bind / unbind */</div><div class='add'>+int snd_hda_hdmi_acomp_master_bind(struct device *dev,</div><div class='add'>+				   struct drm_audio_component *acomp)</div><div class='add'>+{</div><div class='add'>+	generic_acomp_notifier_set(acomp, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_acomp_master_bind, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_acomp_master_unbind(struct device *dev,</div><div class='add'>+				      struct drm_audio_component *acomp)</div><div class='add'>+{</div><div class='add'>+	generic_acomp_notifier_set(acomp, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_acomp_master_unbind, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* check whether both HD-audio and DRM PCI devices belong to the same bus */</div><div class='add'>+static int match_bound_vga(struct device *dev, int subtype, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = data;</div><div class='add'>+	struct pci_dev *pci, *master;</div><div class='add'>+</div><div class='add'>+	if (!dev_is_pci(dev) || !dev_is_pci(bus-&gt;dev))</div><div class='add'>+		return 0;</div><div class='add'>+	master = to_pci_dev(bus-&gt;dev);</div><div class='add'>+	pci = to_pci_dev(dev);</div><div class='add'>+	return master-&gt;bus == pci-&gt;bus;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* audio component notifier for AMD/Nvidia HDMI codecs */</div><div class='add'>+void snd_hda_hdmi_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = audio_ptr;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t pin_nid = spec-&gt;port2pin(codec, port);</div><div class='add'>+</div><div class='add'>+	if (!pin_nid)</div><div class='add'>+		return;</div><div class='add'>+	if (get_wcaps_type(get_wcaps(codec, pin_nid)) != AC_WID_PIN)</div><div class='add'>+		return;</div><div class='add'>+	/* skip notification during system suspend (but not in runtime PM);</div><div class='add'>+	 * the state will be updated at resume</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;core.dev.power.power_state.event == PM_EVENT_SUSPEND)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_check_presence_and_report(codec, pin_nid, dev_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_acomp_pin_eld_notify, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* set up the private drm_audio_ops from the template */</div><div class='add'>+void snd_hda_hdmi_setup_drm_audio_ops(struct hda_codec *codec,</div><div class='add'>+				      const struct drm_audio_component_audio_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;drm_audio_ops.audio_ptr = codec;</div><div class='add'>+	/* intel_audio_codec_enable() or intel_audio_codec_disable()</div><div class='add'>+	 * will call pin_eld_notify with using audio_ptr pointer</div><div class='add'>+	 * We need make sure audio_ptr is really setup</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+	spec-&gt;drm_audio_ops.pin2port = ops-&gt;pin2port;</div><div class='add'>+	spec-&gt;drm_audio_ops.pin_eld_notify = ops-&gt;pin_eld_notify;</div><div class='add'>+	spec-&gt;drm_audio_ops.master_bind = ops-&gt;master_bind;</div><div class='add'>+	spec-&gt;drm_audio_ops.master_unbind = ops-&gt;master_unbind;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_setup_drm_audio_ops, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* initialize the generic HDMI audio component */</div><div class='add'>+void snd_hda_hdmi_acomp_init(struct hda_codec *codec,</div><div class='add'>+			     const struct drm_audio_component_audio_ops *ops,</div><div class='add'>+			     int (*port2pin)(struct hda_codec *, int))</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!enable_acomp) {</div><div class='add'>+		codec_info(codec, "audio component disabled by module option\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;port2pin = port2pin;</div><div class='add'>+	snd_hda_hdmi_setup_drm_audio_ops(codec, ops);</div><div class='add'>+	if (!snd_hdac_acomp_init(&amp;codec-&gt;bus-&gt;core, &amp;spec-&gt;drm_audio_ops,</div><div class='add'>+				 match_bound_vga, 0)) {</div><div class='add'>+		spec-&gt;acomp_registered = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_acomp_init, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_GENERIC,</div><div class='add'>+	MODEL_GF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int generichdmi_probe(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_probe(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	/*</div><div class='add'>+	 * Glenfly GPUs have two codecs, stream switches from one codec to</div><div class='add'>+	 * another, need to do actual clean-ups in codec_cleanup_stream</div><div class='add'>+	 */</div><div class='add'>+	if (id-&gt;driver_data == MODEL_GF)</div><div class='add'>+		codec-&gt;no_sticky_stream = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops generichdmi_codec_ops = {</div><div class='add'>+	.probe = generichdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_generic_remove,</div><div class='add'>+	.init = snd_hda_hdmi_generic_init,</div><div class='add'>+	.build_pcms = snd_hda_hdmi_generic_build_pcms,</div><div class='add'>+	.build_controls = snd_hda_hdmi_generic_build_controls,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_generic_unsol_event,</div><div class='add'>+	.suspend = snd_hda_hdmi_generic_suspend,</div><div class='add'>+	.resume	 = snd_hda_hdmi_generic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_generichdmi[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x00147a47, "Loongson HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10951390, "SiI1390 HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10951392, "SiI1392 HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11069f84, "VX11 HDMI/DP",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11069f85, "VX11 HDMI/DP",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x17e80047, "Chrontel HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f86, "ZX-100S HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f87, "ZX-100S HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f88, "KX-5000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f89, "KX-5000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8a, "KX-6000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8b, "KX-6000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8c, "KX-6000G HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8d, "KX-6000G HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8e, "KX-7000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f8f, "KX-7000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1d179f90, "KX-7000 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d82, "Arise 82 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d83, "Arise 83 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d84, "Arise 84 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d85, "Arise 85 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d86, "Arise 86 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x67663d87, "Arise 87 HDMI/DP",	MODEL_GF),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862801, "Bearlake HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862802, "Cantiga HDMI",		MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862803, "Eaglelake HDMI",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862880, "CedarTrail HDMI",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x808629fb, "Crestline HDMI",	MODEL_GENERIC),</div><div class='add'>+	/* special ID for generic HDMI */</div><div class='add'>+	HDA_CODEC_ID_MODEL(HDA_CODEC_ID_GENERIC_HDMI, "Generic HDMI", MODEL_GENERIC),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_generichdmi);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Generic HDMI HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver generichdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_generichdmi,</div><div class='add'>+	.ops = &amp;generichdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(generichdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/hdmi_local.h b/sound/hda/codecs/hdmi/hdmi_local.h<br/>new file mode 100644<br/>index 000000000000..548241ad3fa9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/hdmi_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/hdmi_local.h</a></div><div class='hunk'>@@ -0,0 +1,302 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD-audio HDMI codec driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HDA_HDMI_LOCAL_H</div><div class='add'>+#define __HDA_HDMI_LOCAL_H</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_i915.h&gt;</div><div class='add'>+#include &lt;sound/hda_chmap.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+struct hdmi_spec_per_cvt {</div><div class='add'>+	hda_nid_t cvt_nid;</div><div class='add'>+	bool assigned;		/* the stream has been assigned */</div><div class='add'>+	bool silent_stream;	/* silent stream activated */</div><div class='add'>+	unsigned int channels_min;</div><div class='add'>+	unsigned int channels_max;</div><div class='add'>+	u32 rates;</div><div class='add'>+	u64 formats;</div><div class='add'>+	unsigned int maxbps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* max. connections to a widget */</div><div class='add'>+#define HDA_MAX_CONNECTIONS	32</div><div class='add'>+</div><div class='add'>+struct hdmi_spec_per_pin {</div><div class='add'>+	hda_nid_t pin_nid;</div><div class='add'>+	int dev_id;</div><div class='add'>+	/* pin idx, different device entries on the same pin use the same idx */</div><div class='add'>+	int pin_nid_idx;</div><div class='add'>+	int num_mux_nids;</div><div class='add'>+	hda_nid_t mux_nids[HDA_MAX_CONNECTIONS];</div><div class='add'>+	int mux_idx;</div><div class='add'>+	hda_nid_t cvt_nid;</div><div class='add'>+</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct hdmi_eld sink_eld;</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	struct delayed_work work;</div><div class='add'>+	struct hdmi_pcm *pcm; /* pointer to spec-&gt;pcm_rec[n] dynamically*/</div><div class='add'>+	int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */</div><div class='add'>+	int prev_pcm_idx; /* previously assigned pcm index */</div><div class='add'>+	int repoll_count;</div><div class='add'>+	bool setup; /* the stream has been set up by prepare callback */</div><div class='add'>+	bool silent_stream;</div><div class='add'>+	int channels; /* current number of channels */</div><div class='add'>+	bool non_pcm;</div><div class='add'>+	bool chmap_set;		/* channel-map override by ALSA API? */</div><div class='add'>+	unsigned char chmap[8]; /* ALSA API channel-map */</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+	struct snd_info_entry *proc_entry;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* operations used by generic code that can be overridden by codec drivers */</div><div class='add'>+struct hdmi_ops {</div><div class='add'>+	int (*pin_get_eld)(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+			   int dev_id, unsigned char *buf, int *eld_size);</div><div class='add'>+</div><div class='add'>+	void (*pin_setup_infoframe)(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+				    int dev_id,</div><div class='add'>+				    int ca, int active_channels, int conn_type);</div><div class='add'>+</div><div class='add'>+	/* enable/disable HBR (HD passthrough) */</div><div class='add'>+	int (*pin_hbr_setup)(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='add'>+			     int dev_id, bool hbr);</div><div class='add'>+</div><div class='add'>+	int (*setup_stream)(struct hda_codec *codec, hda_nid_t cvt_nid,</div><div class='add'>+			    hda_nid_t pin_nid, int dev_id, u32 stream_tag,</div><div class='add'>+			    int format);</div><div class='add'>+</div><div class='add'>+	void (*pin_cvt_fixup)(struct hda_codec *codec,</div><div class='add'>+			      struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+			      hda_nid_t cvt_nid);</div><div class='add'>+</div><div class='add'>+	void (*silent_stream)(struct hda_codec *codec,</div><div class='add'>+			      struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+			      bool enable);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_pcm {</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+	struct snd_jack *jack;</div><div class='add'>+	struct snd_kcontrol *eld_ctl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SILENT_STREAM_OFF = 0,</div><div class='add'>+	SILENT_STREAM_KAE,	/* use standard HDA Keep-Alive */</div><div class='add'>+	SILENT_STREAM_I915,	/* Intel i915 extension */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hdmi_spec {</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int num_cvts;</div><div class='add'>+	struct snd_array cvts; /* struct hdmi_spec_per_cvt */</div><div class='add'>+	hda_nid_t cvt_nids[4]; /* only for haswell fix */</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * num_pins is the number of virtual pins</div><div class='add'>+	 * for example, there are 3 pins, and each pin</div><div class='add'>+	 * has 4 device entries, then the num_pins is 12</div><div class='add'>+	 */</div><div class='add'>+	int num_pins;</div><div class='add'>+	/*</div><div class='add'>+	 * num_nids is the number of real pins</div><div class='add'>+	 * In the above example, num_nids is 3</div><div class='add'>+	 */</div><div class='add'>+	int num_nids;</div><div class='add'>+	/*</div><div class='add'>+	 * dev_num is the number of device entries</div><div class='add'>+	 * on each pin.</div><div class='add'>+	 * In the above example, dev_num is 4</div><div class='add'>+	 */</div><div class='add'>+	int dev_num;</div><div class='add'>+	struct snd_array pins; /* struct hdmi_spec_per_pin */</div><div class='add'>+	struct hdmi_pcm pcm_rec[8];</div><div class='add'>+	struct mutex pcm_lock;</div><div class='add'>+	struct mutex bind_lock; /* for audio component binding */</div><div class='add'>+	/* pcm_bitmap means which pcms have been assigned to pins*/</div><div class='add'>+	unsigned long pcm_bitmap;</div><div class='add'>+	int pcm_used;	/* counter of pcm_rec[] */</div><div class='add'>+	/* bitmap shows whether the pcm is opened in user space</div><div class='add'>+	 * bit 0 means the first playback PCM (PCM3);</div><div class='add'>+	 * bit 1 means the second playback PCM, and so on.</div><div class='add'>+	 */</div><div class='add'>+	unsigned long pcm_in_use;</div><div class='add'>+</div><div class='add'>+	struct hdmi_eld temp_eld;</div><div class='add'>+	struct hdmi_ops ops;</div><div class='add'>+</div><div class='add'>+	bool dyn_pin_out;</div><div class='add'>+	bool static_pcm_mapping;</div><div class='add'>+	/* hdmi interrupt trigger control flag for Nvidia codec */</div><div class='add'>+	bool hdmi_intr_trig_ctrl;</div><div class='add'>+	bool nv_dp_workaround; /* workaround DP audio infoframe for Nvidia */</div><div class='add'>+</div><div class='add'>+	bool intel_hsw_fixup;	/* apply Intel platform-specific fixups */</div><div class='add'>+	/*</div><div class='add'>+	 * Non-generic VIA/NVIDIA specific</div><div class='add'>+	 */</div><div class='add'>+	struct hda_multi_out multiout;</div><div class='add'>+	struct hda_pcm_stream pcm_playback;</div><div class='add'>+</div><div class='add'>+	bool use_acomp_notifier; /* use eld_notify callback for hotplug */</div><div class='add'>+	bool acomp_registered; /* audio component registered in this driver */</div><div class='add'>+	bool force_connect; /* force connectivity */</div><div class='add'>+	struct drm_audio_component_audio_ops drm_audio_ops;</div><div class='add'>+	int (*port2pin)(struct hda_codec *codec, int port); /* reverse port/pin mapping */</div><div class='add'>+</div><div class='add'>+	struct hdac_chmap chmap;</div><div class='add'>+	hda_nid_t vendor_nid;</div><div class='add'>+	const int *port_map;</div><div class='add'>+	int port_num;</div><div class='add'>+	int silent_stream_type;</div><div class='add'>+</div><div class='add'>+	const struct snd_pcm_hw_constraint_list *hw_constraints_channels;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_COMPONENT</div><div class='add'>+static inline bool codec_has_acomp(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return spec-&gt;use_acomp_notifier;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define codec_has_acomp(codec)	false</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct hdmi_audio_infoframe {</div><div class='add'>+	u8 type; /* 0x84 */</div><div class='add'>+	u8 ver;  /* 0x01 */</div><div class='add'>+	u8 len;  /* 0x0a */</div><div class='add'>+</div><div class='add'>+	u8 checksum;</div><div class='add'>+</div><div class='add'>+	u8 CC02_CT47;	/* CC in bits 0:2, CT in 4:7 */</div><div class='add'>+	u8 SS01_SF24;</div><div class='add'>+	u8 CXT04;</div><div class='add'>+	u8 CA;</div><div class='add'>+	u8 LFEPBL01_LSV36_DM_INH7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dp_audio_infoframe {</div><div class='add'>+	u8 type; /* 0x84 */</div><div class='add'>+	u8 len;  /* 0x1b */</div><div class='add'>+	u8 ver;  /* 0x11 &lt;&lt; 2 */</div><div class='add'>+</div><div class='add'>+	u8 CC02_CT47;	/* match with HDMI infoframe from this on */</div><div class='add'>+	u8 SS01_SF24;</div><div class='add'>+	u8 CXT04;</div><div class='add'>+	u8 CA;</div><div class='add'>+	u8 LFEPBL01_LSV36_DM_INH7;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union audio_infoframe {</div><div class='add'>+	struct hdmi_audio_infoframe hdmi;</div><div class='add'>+	struct dp_audio_infoframe dp;</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, bytes);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef LIMITED_RATE_FMT_SUPPORT</div><div class='add'>+/* support only the safe format and rate */</div><div class='add'>+#define SUPPORTED_RATES		SNDRV_PCM_RATE_48000</div><div class='add'>+#define SUPPORTED_MAXBPS	16</div><div class='add'>+#define SUPPORTED_FORMATS	SNDRV_PCM_FMTBIT_S16_LE</div><div class='add'>+#else</div><div class='add'>+/* support all rates and formats */</div><div class='add'>+#define SUPPORTED_RATES \</div><div class='add'>+	(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\</div><div class='add'>+	SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\</div><div class='add'>+	 SNDRV_PCM_RATE_192000)</div><div class='add'>+#define SUPPORTED_MAXBPS	24</div><div class='add'>+#define SUPPORTED_FORMATS \</div><div class='add'>+	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * HDMI routines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define get_pin(spec, idx) \</div><div class='add'>+	((struct hdmi_spec_per_pin *)snd_array_elem(&amp;spec-&gt;pins, idx))</div><div class='add'>+#define get_cvt(spec, idx) \</div><div class='add'>+	((struct hdmi_spec_per_cvt  *)snd_array_elem(&amp;spec-&gt;cvts, idx))</div><div class='add'>+/* obtain hdmi_pcm object assigned to idx */</div><div class='add'>+#define get_hdmi_pcm(spec, idx)	(&amp;(spec)-&gt;pcm_rec[idx])</div><div class='add'>+/* obtain hda_pcm object assigned to idx */</div><div class='add'>+#define get_pcm_rec(spec, idx)	(get_hdmi_pcm(spec, idx)-&gt;pcm)</div><div class='add'>+</div><div class='add'>+/* Generic HDMI codec support */</div><div class='add'>+int snd_hda_hdmi_generic_alloc(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_parse_codec(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_generic_probe(struct hda_codec *codec);</div><div class='add'>+void snd_hda_hdmi_generic_remove(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_build_pcms(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_generic_build_controls(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_generic_init(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_generic_suspend(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_generic_resume(struct hda_codec *codec);</div><div class='add'>+void snd_hda_hdmi_generic_unsol_event(struct hda_codec *codec, unsigned int res);</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_pin_id_to_pin_index(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t pin_nid, int dev_id);</div><div class='add'>+#define pin_id_to_pin_index(codec, pin, dev) \</div><div class='add'>+	snd_hda_hdmi_pin_id_to_pin_index(codec, pin, dev)</div><div class='add'>+int snd_hda_hdmi_generic_init_per_pins(struct hda_codec *codec);</div><div class='add'>+void snd_hda_hdmi_generic_spec_free(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_setup_stream(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t cvt_nid,</div><div class='add'>+			      hda_nid_t pin_nid, int dev_id,</div><div class='add'>+			      u32 stream_tag, int format);</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_generic_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     unsigned int stream_tag,</div><div class='add'>+				     unsigned int format,</div><div class='add'>+				     struct snd_pcm_substream *substream);</div><div class='add'>+int snd_hda_hdmi_generic_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_check_presence_and_report(struct hda_codec *codec,</div><div class='add'>+					    hda_nid_t nid, int dev_id);</div><div class='add'>+void snd_hda_hdmi_setup_audio_infoframe(struct hda_codec *codec,</div><div class='add'>+					struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+					bool non_pcm);</div><div class='add'>+</div><div class='add'>+/* Audio component support */</div><div class='add'>+void snd_hda_hdmi_setup_drm_audio_ops(struct hda_codec *codec,</div><div class='add'>+				      const struct drm_audio_component_audio_ops *ops);</div><div class='add'>+void snd_hda_hdmi_acomp_init(struct hda_codec *codec,</div><div class='add'>+			     const struct drm_audio_component_audio_ops *ops,</div><div class='add'>+			     int (*port2pin)(struct hda_codec *, int));</div><div class='add'>+void snd_hda_hdmi_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id);</div><div class='add'>+int snd_hda_hdmi_acomp_master_bind(struct device *dev,</div><div class='add'>+				   struct drm_audio_component *acomp);</div><div class='add'>+void snd_hda_hdmi_acomp_master_unbind(struct device *dev,</div><div class='add'>+				      struct drm_audio_component *acomp);</div><div class='add'>+</div><div class='add'>+/* Simple / legacy HDMI codec support */</div><div class='add'>+int snd_hda_hdmi_simple_probe(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t cvt_nid, hda_nid_t pin_nid);</div><div class='add'>+void snd_hda_hdmi_simple_remove(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_build_pcms(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_simple_build_controls(struct hda_codec *codec);</div><div class='add'>+int snd_hda_hdmi_simple_init(struct hda_codec *codec);</div><div class='add'>+void snd_hda_hdmi_simple_unsol_event(struct hda_codec *codec,</div><div class='add'>+				     unsigned int res);</div><div class='add'>+int snd_hda_hdmi_simple_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream);</div><div class='add'>+</div><div class='add'>+#endif /* __HDA_HDMI_LOCAL_H */</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/intelhdmi.c b/sound/hda/codecs/hdmi/intelhdmi.c<br/>new file mode 100644<br/>index 000000000000..9460c8db39a9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/intelhdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/intelhdmi.c</a></div><div class='hunk'>@@ -0,0 +1,812 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Intel HDMI codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_i915.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+static bool enable_silent_stream =</div><div class='add'>+IS_ENABLED(CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM);</div><div class='add'>+module_param(enable_silent_stream, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(enable_silent_stream, "Enable Silent Stream for HDMI devices");</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_HSW,</div><div class='add'>+	MODEL_GLK,</div><div class='add'>+	MODEL_ICL,</div><div class='add'>+	MODEL_TGL,</div><div class='add'>+	MODEL_ADLP,</div><div class='add'>+	MODEL_BYT,</div><div class='add'>+	MODEL_CPT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INTEL_GET_VENDOR_VERB	0xf81</div><div class='add'>+#define INTEL_SET_VENDOR_VERB	0x781</div><div class='add'>+#define INTEL_EN_DP12		0x02	/* enable DP 1.2 features */</div><div class='add'>+#define INTEL_EN_ALL_PIN_CVTS	0x01	/* enable 2nd &amp; 3rd pins and convertors */</div><div class='add'>+</div><div class='add'>+static void intel_haswell_enable_all_pins(struct hda_codec *codec,</div><div class='add'>+					  bool update_tree)</div><div class='add'>+{</div><div class='add'>+	unsigned int vendor_param;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	vendor_param = snd_hda_codec_read(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				INTEL_GET_VENDOR_VERB, 0);</div><div class='add'>+	if (vendor_param == -1 || vendor_param &amp; INTEL_EN_ALL_PIN_CVTS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vendor_param |= INTEL_EN_ALL_PIN_CVTS;</div><div class='add'>+	vendor_param = snd_hda_codec_read(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				INTEL_SET_VENDOR_VERB, vendor_param);</div><div class='add'>+	if (vendor_param == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (update_tree)</div><div class='add'>+		snd_hda_codec_update_widgets(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_haswell_fixup_enable_dp12(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int vendor_param;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	vendor_param = snd_hda_codec_read(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				INTEL_GET_VENDOR_VERB, 0);</div><div class='add'>+	if (vendor_param == -1 || vendor_param &amp; INTEL_EN_DP12)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* enable DP1.2 mode */</div><div class='add'>+	vendor_param |= INTEL_EN_DP12;</div><div class='add'>+	snd_hdac_regmap_add_vendor_verb(&amp;codec-&gt;core, INTEL_SET_VENDOR_VERB);</div><div class='add'>+	snd_hda_codec_write_cache(codec, spec-&gt;vendor_nid, 0,</div><div class='add'>+				INTEL_SET_VENDOR_VERB, vendor_param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Haswell needs to re-issue the vendor-specific verbs before turning to D0.</div><div class='add'>+ * Otherwise you may get severe h/w communication errors.</div><div class='add'>+ */</div><div class='add'>+static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg,</div><div class='add'>+				unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	/* check codec-&gt;spec: it can be called before the probe gets called */</div><div class='add'>+	if (codec-&gt;spec) {</div><div class='add'>+		if (power_state == AC_PWRST_D0) {</div><div class='add'>+			intel_haswell_enable_all_pins(codec, false);</div><div class='add'>+			intel_haswell_fixup_enable_dp12(codec);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE, power_state);</div><div class='add'>+	snd_hda_codec_set_power_to_all(codec, fg, power_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There is a fixed mapping between audio pin node and display port.</div><div class='add'>+ * on SNB, IVY, HSW, BSW, SKL, BXT, KBL:</div><div class='add'>+ * Pin Widget 5 - PORT B (port = 1 in i915 driver)</div><div class='add'>+ * Pin Widget 6 - PORT C (port = 2 in i915 driver)</div><div class='add'>+ * Pin Widget 7 - PORT D (port = 3 in i915 driver)</div><div class='add'>+ *</div><div class='add'>+ * on VLV, ILK:</div><div class='add'>+ * Pin Widget 4 - PORT B (port = 1 in i915 driver)</div><div class='add'>+ * Pin Widget 5 - PORT C (port = 2 in i915 driver)</div><div class='add'>+ * Pin Widget 6 - PORT D (port = 3 in i915 driver)</div><div class='add'>+ */</div><div class='add'>+static int intel_base_nid(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x80860054: /* ILK */</div><div class='add'>+	case 0x80862804: /* ILK */</div><div class='add'>+	case 0x80862882: /* VLV */</div><div class='add'>+		return 4;</div><div class='add'>+	default:</div><div class='add'>+		return 5;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_pin2port(void *audio_ptr, int pin_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = audio_ptr;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int base_nid, i;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;port_num) {</div><div class='add'>+		base_nid = intel_base_nid(codec);</div><div class='add'>+		if (WARN_ON(pin_nid &lt; base_nid || pin_nid &gt;= base_nid + 3))</div><div class='add'>+			return -1;</div><div class='add'>+		return pin_nid - base_nid + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * looking for the pin number in the mapping table and return</div><div class='add'>+	 * the index which indicate the port number</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;port_num; i++) {</div><div class='add'>+		if (pin_nid == spec-&gt;port_map[i])</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_info(codec, "Can't find the HDMI/DP port for pin NID 0x%x\n", pin_nid);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_port2pin(struct hda_codec *codec, int port)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;port_num) {</div><div class='add'>+		/* we assume only from port-B to port-D */</div><div class='add'>+		if (port &lt; 1 || port &gt; 3)</div><div class='add'>+			return 0;</div><div class='add'>+		return port + intel_base_nid(codec) - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port &lt; 0 || port &gt;= spec-&gt;port_num)</div><div class='add'>+		return 0;</div><div class='add'>+	return spec-&gt;port_map[port];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = audio_ptr;</div><div class='add'>+	int pin_nid;</div><div class='add'>+	int dev_id = pipe;</div><div class='add'>+</div><div class='add'>+	pin_nid = intel_port2pin(codec, port);</div><div class='add'>+	if (!pin_nid)</div><div class='add'>+		return;</div><div class='add'>+	/* skip notification during system suspend (but not in runtime PM);</div><div class='add'>+	 * the state will be updated at resume</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;core.dev.power.power_state.event == PM_EVENT_SUSPEND)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hdac_i915_set_bclk(&amp;codec-&gt;bus-&gt;core);</div><div class='add'>+	snd_hda_hdmi_check_presence_and_report(codec, pin_nid, dev_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_audio_component_audio_ops intel_audio_ops = {</div><div class='add'>+	.pin2port = intel_pin2port,</div><div class='add'>+	.pin_eld_notify = intel_pin_eld_notify,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* register i915 component pin_eld_notify callback */</div><div class='add'>+static void register_i915_notifier(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;use_acomp_notifier = true;</div><div class='add'>+	spec-&gt;port2pin = intel_port2pin;</div><div class='add'>+	snd_hda_hdmi_setup_drm_audio_ops(codec, &amp;intel_audio_ops);</div><div class='add'>+	snd_hdac_acomp_register_notifier(&amp;codec-&gt;bus-&gt;core,</div><div class='add'>+					&amp;spec-&gt;drm_audio_ops);</div><div class='add'>+	/* no need for forcible resume for jack check thanks to notifier */</div><div class='add'>+	codec-&gt;relaxed_resume = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define I915_SILENT_RATE		48000</div><div class='add'>+#define I915_SILENT_CHANNELS		2</div><div class='add'>+#define I915_SILENT_FORMAT_BITS	16</div><div class='add'>+#define I915_SILENT_FMT_MASK		0xf</div><div class='add'>+</div><div class='add'>+static void silent_stream_enable_i915(struct hda_codec *codec,</div><div class='add'>+				      struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int format;</div><div class='add'>+</div><div class='add'>+	snd_hdac_sync_audio_rate(&amp;codec-&gt;core, per_pin-&gt;pin_nid,</div><div class='add'>+				 per_pin-&gt;dev_id, I915_SILENT_RATE);</div><div class='add'>+</div><div class='add'>+	/* trigger silent stream generation in hw */</div><div class='add'>+	format = snd_hdac_stream_format(I915_SILENT_CHANNELS, I915_SILENT_FORMAT_BITS,</div><div class='add'>+					I915_SILENT_RATE);</div><div class='add'>+	snd_hda_codec_setup_stream(codec, per_pin-&gt;cvt_nid,</div><div class='add'>+				   I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format);</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+	snd_hda_codec_setup_stream(codec, per_pin-&gt;cvt_nid, I915_SILENT_FMT_MASK, 0, format);</div><div class='add'>+</div><div class='add'>+	per_pin-&gt;channels = I915_SILENT_CHANNELS;</div><div class='add'>+	snd_hda_hdmi_setup_audio_infoframe(codec, per_pin, per_pin-&gt;non_pcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void silent_stream_set_kae(struct hda_codec *codec,</div><div class='add'>+				  struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+				  bool enable)</div><div class='add'>+{</div><div class='add'>+	unsigned int param;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "HDMI: KAE %d cvt-NID=0x%x\n", enable, per_pin-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	param = snd_hda_codec_read(codec, per_pin-&gt;cvt_nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='add'>+	param = (param &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		param |= AC_DIG3_KAE;</div><div class='add'>+	else</div><div class='add'>+		param &amp;= ~AC_DIG3_KAE;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, per_pin-&gt;cvt_nid, 0, AC_VERB_SET_DIGI_CONVERT_3, param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void i915_set_silent_stream(struct hda_codec *codec,</div><div class='add'>+				   struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+				   bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;silent_stream_type) {</div><div class='add'>+	case SILENT_STREAM_KAE:</div><div class='add'>+		if (enable) {</div><div class='add'>+			silent_stream_enable_i915(codec, per_pin);</div><div class='add'>+			silent_stream_set_kae(codec, per_pin, true);</div><div class='add'>+		} else {</div><div class='add'>+			silent_stream_set_kae(codec, per_pin, false);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SILENT_STREAM_I915:</div><div class='add'>+		if (enable) {</div><div class='add'>+			silent_stream_enable_i915(codec, per_pin);</div><div class='add'>+			snd_hda_power_up_pm(codec);</div><div class='add'>+		} else {</div><div class='add'>+			/* release ref taken in silent_stream_enable() */</div><div class='add'>+			snd_hda_power_down_pm(codec);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void haswell_verify_D0(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t cvt_nid, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	int pwr;</div><div class='add'>+</div><div class='add'>+	/* For Haswell, the converter 1/2 may keep in D3 state after bootup,</div><div class='add'>+	 * thus pins could only choose converter 0 for use. Make sure the</div><div class='add'>+	 * converters are in correct power state</div><div class='add'>+	 */</div><div class='add'>+	if (!snd_hda_check_power_state(codec, cvt_nid, AC_PWRST_D0))</div><div class='add'>+		snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_check_power_state(codec, nid, AC_PWRST_D0)) {</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE,</div><div class='add'>+				    AC_PWRST_D0);</div><div class='add'>+		msleep(40);</div><div class='add'>+		pwr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_POWER_STATE, 0);</div><div class='add'>+		pwr = (pwr &amp; AC_PWRST_ACTUAL) &gt;&gt; AC_PWRST_ACTUAL_SHIFT;</div><div class='add'>+		codec_dbg(codec, "Haswell HDMI audio: Power for NID 0x%x is now D%d\n", nid, pwr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Assure the pin select the right convetor */</div><div class='add'>+static void intel_verify_pin_cvt_connect(struct hda_codec *codec,</div><div class='add'>+			struct hdmi_spec_per_pin *per_pin)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t pin_nid = per_pin-&gt;pin_nid;</div><div class='add'>+	int mux_idx, curr;</div><div class='add'>+</div><div class='add'>+	mux_idx = per_pin-&gt;mux_idx;</div><div class='add'>+	curr = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='add'>+					  AC_VERB_GET_CONNECT_SEL, 0);</div><div class='add'>+	if (curr != mux_idx)</div><div class='add'>+		snd_hda_codec_write_cache(codec, pin_nid, 0,</div><div class='add'>+					    AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+					    mux_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get the mux index for the converter of the pins</div><div class='add'>+ * converter's mux index is the same for all pins on Intel platform</div><div class='add'>+ */</div><div class='add'>+static int intel_cvt_id_to_mux_idx(struct hdmi_spec *spec,</div><div class='add'>+			hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_cvts; i++)</div><div class='add'>+		if (spec-&gt;cvt_nids[i] == cvt_nid)</div><div class='add'>+			return i;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intel HDMI workaround to fix audio routing issue:</div><div class='add'>+ * For some Intel display codecs, pins share the same connection list.</div><div class='add'>+ * So a conveter can be selected by multiple pins and playback on any of these</div><div class='add'>+ * pins will generate sound on the external display, because audio flows from</div><div class='add'>+ * the same converter to the display pipeline. Also muting one pin may make</div><div class='add'>+ * other pins have no sound output.</div><div class='add'>+ * So this function assures that an assigned converter for a pin is not selected</div><div class='add'>+ * by any other pins.</div><div class='add'>+ */</div><div class='add'>+static void intel_not_share_assigned_cvt(struct hda_codec *codec,</div><div class='add'>+					 hda_nid_t pin_nid,</div><div class='add'>+					 int dev_id, int mux_idx)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int cvt_idx, curr;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	int pin_idx;</div><div class='add'>+</div><div class='add'>+	/* configure the pins connections */</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		int dev_id_saved;</div><div class='add'>+		int dev_num;</div><div class='add'>+</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+		/*</div><div class='add'>+		 * pin not connected to monitor</div><div class='add'>+		 * no need to operate on it</div><div class='add'>+		 */</div><div class='add'>+		if (!per_pin-&gt;pcm)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if ((per_pin-&gt;pin_nid == pin_nid) &amp;&amp;</div><div class='add'>+			(per_pin-&gt;dev_id == dev_id))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * if per_pin-&gt;dev_id &gt;= dev_num,</div><div class='add'>+		 * snd_hda_get_dev_select() will fail,</div><div class='add'>+		 * and the following operation is unpredictable.</div><div class='add'>+		 * So skip this situation.</div><div class='add'>+		 */</div><div class='add'>+		dev_num = snd_hda_get_num_devices(codec, per_pin-&gt;pin_nid) + 1;</div><div class='add'>+		if (per_pin-&gt;dev_id &gt;= dev_num)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nid = per_pin-&gt;pin_nid;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Calling this function should not impact</div><div class='add'>+		 * on the device entry selection</div><div class='add'>+		 * So let's save the dev id for each pin,</div><div class='add'>+		 * and restore it when return</div><div class='add'>+		 */</div><div class='add'>+		dev_id_saved = snd_hda_get_dev_select(codec, nid);</div><div class='add'>+		snd_hda_set_dev_select(codec, nid, per_pin-&gt;dev_id);</div><div class='add'>+		curr = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					  AC_VERB_GET_CONNECT_SEL, 0);</div><div class='add'>+		if (curr != mux_idx) {</div><div class='add'>+			snd_hda_set_dev_select(codec, nid, dev_id_saved);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+		/* choose an unassigned converter. The conveters in the</div><div class='add'>+		 * connection list are in the same order as in the codec.</div><div class='add'>+		 */</div><div class='add'>+		for (cvt_idx = 0; cvt_idx &lt; spec-&gt;num_cvts; cvt_idx++) {</div><div class='add'>+			per_cvt = get_cvt(spec, cvt_idx);</div><div class='add'>+			if (!per_cvt-&gt;assigned) {</div><div class='add'>+				codec_dbg(codec,</div><div class='add'>+					  "choose cvt %d for pin NID 0x%x\n",</div><div class='add'>+					  cvt_idx, nid);</div><div class='add'>+				snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+					    cvt_idx);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		snd_hda_set_dev_select(codec, nid, dev_id_saved);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A wrapper of intel_not_share_asigned_cvt() */</div><div class='add'>+static void intel_not_share_assigned_cvt_nid(struct hda_codec *codec,</div><div class='add'>+			hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	int mux_idx;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* On Intel platform, the mapping of converter nid to</div><div class='add'>+	 * mux index of the pins are always the same.</div><div class='add'>+	 * The pin nid may be 0, this means all pins will not</div><div class='add'>+	 * share the converter.</div><div class='add'>+	 */</div><div class='add'>+	mux_idx = intel_cvt_id_to_mux_idx(spec, cvt_nid);</div><div class='add'>+	if (mux_idx &gt;= 0)</div><div class='add'>+		intel_not_share_assigned_cvt(codec, pin_nid, dev_id, mux_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* setup_stream ops override for HSW+ */</div><div class='add'>+static int i915_hsw_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,</div><div class='add'>+				 hda_nid_t pin_nid, int dev_id, u32 stream_tag,</div><div class='add'>+				 int format)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx = pin_id_to_pin_index(codec, pin_nid, dev_id);</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (pin_idx &lt; 0)</div><div class='add'>+		per_pin = NULL;</div><div class='add'>+	else</div><div class='add'>+		per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+	haswell_verify_D0(codec, cvt_nid, pin_nid);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;silent_stream_type == SILENT_STREAM_KAE &amp;&amp; per_pin &amp;&amp; per_pin-&gt;silent_stream) {</div><div class='add'>+		silent_stream_set_kae(codec, per_pin, false);</div><div class='add'>+		/* wait for pending transfers in codec to clear */</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = snd_hda_hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,</div><div class='add'>+					stream_tag, format);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;silent_stream_type == SILENT_STREAM_KAE &amp;&amp; per_pin &amp;&amp; per_pin-&gt;silent_stream) {</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+		silent_stream_set_kae(codec, per_pin, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* pin_cvt_fixup ops override for HSW+ and VLV+ */</div><div class='add'>+static void i915_pin_cvt_fixup(struct hda_codec *codec,</div><div class='add'>+			       struct hdmi_spec_per_pin *per_pin,</div><div class='add'>+			       hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	if (per_pin) {</div><div class='add'>+		haswell_verify_D0(codec, per_pin-&gt;cvt_nid, per_pin-&gt;pin_nid);</div><div class='add'>+		snd_hda_set_dev_select(codec, per_pin-&gt;pin_nid,</div><div class='add'>+			       per_pin-&gt;dev_id);</div><div class='add'>+		intel_verify_pin_cvt_connect(codec, per_pin);</div><div class='add'>+		intel_not_share_assigned_cvt(codec, per_pin-&gt;pin_nid,</div><div class='add'>+				     per_pin-&gt;dev_id, per_pin-&gt;mux_idx);</div><div class='add'>+	} else {</div><div class='add'>+		intel_not_share_assigned_cvt_nid(codec, 0, 0, cvt_nid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_hdmi_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool silent_streams = false;</div><div class='add'>+	int pin_idx, res;</div><div class='add'>+</div><div class='add'>+	res = snd_hda_hdmi_generic_suspend(codec);</div><div class='add'>+	if (spec-&gt;silent_stream_type != SILENT_STREAM_KAE)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+		if (per_pin-&gt;silent_stream) {</div><div class='add'>+			silent_streams = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (silent_streams) {</div><div class='add'>+		/*</div><div class='add'>+		 * stream-id should remain programmed when codec goes</div><div class='add'>+		 * to runtime suspend</div><div class='add'>+		 */</div><div class='add'>+		codec-&gt;no_stream_clean_at_suspend = 1;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * the system might go to S3, in which case keep-alive</div><div class='add'>+		 * must be reprogrammed upon resume</div><div class='add'>+		 */</div><div class='add'>+		codec-&gt;forced_resume = 1;</div><div class='add'>+</div><div class='add'>+		codec_dbg(codec, "HDMI: KAE active at suspend\n");</div><div class='add'>+	} else {</div><div class='add'>+		codec-&gt;no_stream_clean_at_suspend = 0;</div><div class='add'>+		codec-&gt;forced_resume = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_hdmi_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int pin_idx, res;</div><div class='add'>+</div><div class='add'>+	res = snd_hda_hdmi_generic_resume(codec);</div><div class='add'>+	if (spec-&gt;silent_stream_type != SILENT_STREAM_KAE)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* KAE not programmed at suspend, nothing to do here */</div><div class='add'>+	if (!codec-&gt;no_stream_clean_at_suspend)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	for (pin_idx = 0; pin_idx &lt; spec-&gt;num_pins; pin_idx++) {</div><div class='add'>+		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If system was in suspend with monitor connected,</div><div class='add'>+		 * the codec setting may have been lost. Re-enable</div><div class='add'>+		 * keep-alive.</div><div class='add'>+		 */</div><div class='add'>+		if (per_pin-&gt;silent_stream) {</div><div class='add'>+			unsigned int param;</div><div class='add'>+</div><div class='add'>+			param = snd_hda_codec_read(codec, per_pin-&gt;cvt_nid, 0,</div><div class='add'>+						   AC_VERB_GET_CONV, 0);</div><div class='add'>+			if (!param) {</div><div class='add'>+				codec_dbg(codec, "HDMI: KAE: restore stream id\n");</div><div class='add'>+				silent_stream_enable_i915(codec, per_pin);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			param = snd_hda_codec_read(codec, per_pin-&gt;cvt_nid, 0,</div><div class='add'>+						   AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='add'>+			if (!(param &amp; (AC_DIG3_KAE &lt;&lt; 16))) {</div><div class='add'>+				codec_dbg(codec, "HDMI: KAE: restore DIG3_KAE\n");</div><div class='add'>+				silent_stream_set_kae(codec, per_pin, true);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* precondition and allocation for Intel codecs */</div><div class='add'>+static int alloc_intel_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* requires i915 binding */</div><div class='add'>+	if (!codec-&gt;bus-&gt;core.audio_component) {</div><div class='add'>+		codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n");</div><div class='add'>+		/* set probe_id here to prevent generic fallback binding */</div><div class='add'>+		codec-&gt;probe_id = HDA_CODEC_ID_SKIP_PROBE;</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_hda_hdmi_generic_alloc(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse and post-process for Intel codecs */</div><div class='add'>+static int parse_intel_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err, retries = 3;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = snd_hda_hdmi_parse_codec(codec);</div><div class='add'>+	} while (err &lt; 0 &amp;&amp; retries--);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_generic_init_per_pins(codec);</div><div class='add'>+	register_i915_notifier(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intel Haswell and onwards; audio component with eld notifier */</div><div class='add'>+static int intel_hsw_common_init(struct hda_codec *codec, hda_nid_t vendor_nid,</div><div class='add'>+				 const int *port_map, int port_num, int dev_num,</div><div class='add'>+				 bool send_silent_stream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	codec-&gt;dp_mst = true;</div><div class='add'>+	spec-&gt;vendor_nid = vendor_nid;</div><div class='add'>+	spec-&gt;port_map = port_map;</div><div class='add'>+	spec-&gt;port_num = port_num;</div><div class='add'>+	spec-&gt;intel_hsw_fixup = true;</div><div class='add'>+	spec-&gt;dev_num = dev_num;</div><div class='add'>+</div><div class='add'>+	intel_haswell_enable_all_pins(codec, true);</div><div class='add'>+	intel_haswell_fixup_enable_dp12(codec);</div><div class='add'>+</div><div class='add'>+	codec-&gt;display_power_control = 1;</div><div class='add'>+</div><div class='add'>+	codec-&gt;depop_delay = 0;</div><div class='add'>+	codec-&gt;auto_runtime_pm = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.setup_stream = i915_hsw_setup_stream;</div><div class='add'>+	spec-&gt;ops.pin_cvt_fixup = i915_pin_cvt_fixup;</div><div class='add'>+	spec-&gt;ops.silent_stream = i915_set_silent_stream;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Enable silent stream feature, if it is enabled via</div><div class='add'>+	 * module param or Kconfig option</div><div class='add'>+	 */</div><div class='add'>+	if (send_silent_stream)</div><div class='add'>+		spec-&gt;silent_stream_type = SILENT_STREAM_I915;</div><div class='add'>+</div><div class='add'>+	return parse_intel_hdmi(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_i915_hsw_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return intel_hsw_common_init(codec, 0x08, NULL, 0, 3,</div><div class='add'>+				     enable_silent_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_i915_glk_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * Silent stream calls audio component .get_power() from</div><div class='add'>+	 * .pin_eld_notify(). On GLK this will deadlock in i915 due</div><div class='add'>+	 * to the audio vs. CDCLK workaround.</div><div class='add'>+	 */</div><div class='add'>+	return intel_hsw_common_init(codec, 0x0b, NULL, 0, 3, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_i915_icl_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * pin to port mapping table where the value indicate the pin number and</div><div class='add'>+	 * the index indicate the port number.</div><div class='add'>+	 */</div><div class='add'>+	static const int map[] = {0x0, 0x4, 0x6, 0x8, 0xa, 0xb};</div><div class='add'>+</div><div class='add'>+	return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map), 3,</div><div class='add'>+				     enable_silent_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_i915_tgl_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * pin to port mapping table where the value indicate the pin number and</div><div class='add'>+	 * the index indicate the port number.</div><div class='add'>+	 */</div><div class='add'>+	static const int map[] = {0x4, 0x6, 0x8, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf};</div><div class='add'>+</div><div class='add'>+	return intel_hsw_common_init(codec, 0x02, map, ARRAY_SIZE(map), 4,</div><div class='add'>+				     enable_silent_stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_i915_adlp_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = probe_i915_tgl_hdmi(codec);</div><div class='add'>+	if (!res) {</div><div class='add'>+		spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+		if (spec-&gt;silent_stream_type)</div><div class='add'>+			spec-&gt;silent_stream_type = SILENT_STREAM_KAE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intel Baytrail and Braswell; with eld notifier */</div><div class='add'>+static int probe_i915_byt_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* For Valleyview/Cherryview, only the display codec is in the display</div><div class='add'>+	 * power well and can use link_power ops to request/release the power.</div><div class='add'>+	 */</div><div class='add'>+	codec-&gt;display_power_control = 1;</div><div class='add'>+</div><div class='add'>+	codec-&gt;depop_delay = 0;</div><div class='add'>+	codec-&gt;auto_runtime_pm = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;ops.pin_cvt_fixup = i915_pin_cvt_fixup;</div><div class='add'>+</div><div class='add'>+	return parse_intel_hdmi(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Intel IronLake, SandyBridge and IvyBridge; with eld notifier */</div><div class='add'>+static int probe_i915_cpt_hdmi(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return parse_intel_hdmi(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * common driver probe</div><div class='add'>+ */</div><div class='add'>+static int intelhdmi_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alloc_intel_hdmi(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;driver_data) {</div><div class='add'>+	case MODEL_HSW:</div><div class='add'>+		err = probe_i915_hsw_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_GLK:</div><div class='add'>+		err = probe_i915_glk_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_ICL:</div><div class='add'>+		err = probe_i915_icl_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_TGL:</div><div class='add'>+		err = probe_i915_tgl_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_ADLP:</div><div class='add'>+		err = probe_i915_adlp_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_BYT:</div><div class='add'>+		err = probe_i915_byt_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_CPT:</div><div class='add'>+		err = probe_i915_cpt_hdmi(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_hdmi_generic_spec_free(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops intelhdmi_codec_ops = {</div><div class='add'>+	.probe = intelhdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_generic_remove,</div><div class='add'>+	.init = snd_hda_hdmi_generic_init,</div><div class='add'>+	.build_pcms = snd_hda_hdmi_generic_build_pcms,</div><div class='add'>+	.build_controls = snd_hda_hdmi_generic_build_controls,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_generic_unsol_event,</div><div class='add'>+	.suspend = i915_hdmi_suspend,</div><div class='add'>+	.resume = i915_hdmi_resume,</div><div class='add'>+	.set_power_state = haswell_set_power_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_intelhdmi[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80860054, "IbexPeak HDMI",		MODEL_CPT),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862800, "Geminilake HDMI",	MODEL_GLK),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862804, "IbexPeak HDMI",		MODEL_CPT),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862805, "CougarPoint HDMI",	MODEL_CPT),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862806, "PantherPoint HDMI",	MODEL_CPT),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862807, "Haswell HDMI",		MODEL_HSW),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862808, "Broadwell HDMI",	MODEL_HSW),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862809, "Skylake HDMI",		MODEL_HSW),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086280a, "Broxton HDMI",		MODEL_HSW),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086280b, "Kabylake HDMI",		MODEL_HSW),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086280c, "Cannonlake HDMI",	MODEL_GLK),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086280d, "Geminilake HDMI",	MODEL_GLK),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086280f, "Icelake HDMI",		MODEL_ICL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862812, "Tigerlake HDMI",	MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862814, "DG1 HDMI",		MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862815, "Alderlake HDMI",	MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862816, "Rocketlake HDMI",	MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862818, "Raptorlake HDMI",	MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862819, "DG2 HDMI",		MODEL_TGL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281a, "Jasperlake HDMI",	MODEL_ICL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281b, "Elkhartlake HDMI",	MODEL_ICL),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281c, "Alderlake-P HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281d, "Meteor Lake HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281e, "Battlemage HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x8086281f, "Raptor Lake P HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862820, "Lunar Lake HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862822, "Panther Lake HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862823, "Wildcat Lake HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862824, "Nova Lake HDMI",	MODEL_ADLP),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862882, "Valleyview2 HDMI",	MODEL_BYT),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x80862883, "Braswell HDMI",		MODEL_BYT),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_intelhdmi);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Intel HDMI HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver intelhdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_intelhdmi,</div><div class='add'>+	.ops = &amp;intelhdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(intelhdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/nvhdmi-mcp.c b/sound/hda/codecs/hdmi/nvhdmi-mcp.c<br/>new file mode 100644<br/>index 000000000000..1c5fdfe872f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/nvhdmi-mcp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/nvhdmi-mcp.c</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Legacy Nvidia HDMI codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+enum { MODEL_2CH, MODEL_8CH };</div><div class='add'>+</div><div class='add'>+#define Nv_VERB_SET_Channel_Allocation          0xF79</div><div class='add'>+#define Nv_VERB_SET_Info_Frame_Checksum         0xF7A</div><div class='add'>+#define Nv_VERB_SET_Audio_Protection_On         0xF98</div><div class='add'>+#define Nv_VERB_SET_Audio_Protection_Off        0xF99</div><div class='add'>+</div><div class='add'>+#define nvhdmi_master_con_nid_7x	0x04</div><div class='add'>+#define nvhdmi_master_pin_nid_7x	0x05</div><div class='add'>+</div><div class='add'>+static const hda_nid_t nvhdmi_con_nids_7x[4] = {</div><div class='add'>+	/*front, rear, clfe, rear_surr */</div><div class='add'>+	0x6, 0x8, 0xa, 0xc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb nvhdmi_basic_init_7x_2ch[] = {</div><div class='add'>+	/* set audio protect on */</div><div class='add'>+	{ 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},</div><div class='add'>+	/* enable digital output on pin widget */</div><div class='add'>+	{ 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb nvhdmi_basic_init_7x_8ch[] = {</div><div class='add'>+	/* set audio protect on */</div><div class='add'>+	{ 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},</div><div class='add'>+	/* enable digital output on pin widget */</div><div class='add'>+	{ 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{ 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{ 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{ 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{ 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nvhdmi_mcp_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multiout.max_channels == 2)</div><div class='add'>+		snd_hda_sequence_write(codec, nvhdmi_basic_init_7x_2ch);</div><div class='add'>+	else</div><div class='add'>+		snd_hda_sequence_write(codec, nvhdmi_basic_init_7x_8ch);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nvhdmi_8ch_7x_set_info_frame_parameters(struct hda_codec *codec,</div><div class='add'>+						    int channels)</div><div class='add'>+{</div><div class='add'>+	unsigned int chanmask;</div><div class='add'>+	int chan = channels ? (channels - 1) : 1;</div><div class='add'>+</div><div class='add'>+	switch (channels) {</div><div class='add'>+	default:</div><div class='add'>+	case 0:</div><div class='add'>+	case 2:</div><div class='add'>+		chanmask = 0x00;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		chanmask = 0x08;</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		chanmask = 0x0b;</div><div class='add'>+		break;</div><div class='add'>+	case 8:</div><div class='add'>+		chanmask = 0x13;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the audio infoframe channel allocation and checksum fields.  The</div><div class='add'>+	 * channel count is computed implicitly by the hardware.</div><div class='add'>+	 */</div><div class='add'>+	snd_hda_codec_write(codec, 0x1, 0,</div><div class='add'>+			Nv_VERB_SET_Channel_Allocation, chanmask);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x1, 0,</div><div class='add'>+			Nv_VERB_SET_Info_Frame_Checksum,</div><div class='add'>+			(0x71 - chan - chanmask));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_8ch_7x_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x,</div><div class='add'>+			0, AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		/* set the stream id */</div><div class='add'>+		snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,</div><div class='add'>+				AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='add'>+		/* set the stream format */</div><div class='add'>+		snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,</div><div class='add'>+				AC_VERB_SET_STREAM_FORMAT, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The audio hardware sends a channel count of 0x7 (8ch) when all the</div><div class='add'>+	 * streams are disabled.</div><div class='add'>+	 */</div><div class='add'>+	nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);</div><div class='add'>+</div><div class='add'>+	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     unsigned int stream_tag,</div><div class='add'>+				     unsigned int format,</div><div class='add'>+				     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int chs;</div><div class='add'>+	unsigned int dataDCC2, channel_id;</div><div class='add'>+	int i;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	per_cvt = get_cvt(spec, 0);</div><div class='add'>+	spdif = snd_hda_spdif_out_of_nid(codec, per_cvt-&gt;cvt_nid);</div><div class='add'>+</div><div class='add'>+	chs = substream-&gt;runtime-&gt;channels;</div><div class='add'>+</div><div class='add'>+	dataDCC2 = 0x2;</div><div class='add'>+</div><div class='add'>+	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */</div><div class='add'>+	if (codec-&gt;spdif_status_reset &amp;&amp; (spdif-&gt;ctls &amp; AC_DIG1_ENABLE))</div><div class='add'>+		snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_master_con_nid_7x,</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+				spdif-&gt;ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* set the stream id */</div><div class='add'>+	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,</div><div class='add'>+			AC_VERB_SET_CHANNEL_STREAMID, (stream_tag &lt;&lt; 4) | 0x0);</div><div class='add'>+</div><div class='add'>+	/* set the stream format */</div><div class='add'>+	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,</div><div class='add'>+			AC_VERB_SET_STREAM_FORMAT, format);</div><div class='add'>+</div><div class='add'>+	/* turn on again (if needed) */</div><div class='add'>+	/* enable and set the channel status audio/data flag */</div><div class='add'>+	if (codec-&gt;spdif_status_reset &amp;&amp; (spdif-&gt;ctls &amp; AC_DIG1_ENABLE)) {</div><div class='add'>+		snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_master_con_nid_7x,</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+				spdif-&gt;ctls &amp; 0xff);</div><div class='add'>+		snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_master_con_nid_7x,</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		if (chs == 2)</div><div class='add'>+			channel_id = 0;</div><div class='add'>+		else</div><div class='add'>+			channel_id = i * 2;</div><div class='add'>+</div><div class='add'>+		/* turn off SPDIF once;</div><div class='add'>+		 *otherwise the IEC958 bits won't be updated</div><div class='add'>+		 */</div><div class='add'>+		if (codec-&gt;spdif_status_reset &amp;&amp;</div><div class='add'>+		(spdif-&gt;ctls &amp; AC_DIG1_ENABLE))</div><div class='add'>+			snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_con_nids_7x[i],</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+				spdif-&gt;ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff);</div><div class='add'>+		/* set the stream id */</div><div class='add'>+		snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_con_nids_7x[i],</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_CHANNEL_STREAMID,</div><div class='add'>+				(stream_tag &lt;&lt; 4) | channel_id);</div><div class='add'>+		/* set the stream format */</div><div class='add'>+		snd_hda_codec_write(codec,</div><div class='add'>+				nvhdmi_con_nids_7x[i],</div><div class='add'>+				0,</div><div class='add'>+				AC_VERB_SET_STREAM_FORMAT,</div><div class='add'>+				format);</div><div class='add'>+		/* turn on again (if needed) */</div><div class='add'>+		/* enable and set the channel status audio/data flag */</div><div class='add'>+		if (codec-&gt;spdif_status_reset &amp;&amp;</div><div class='add'>+		(spdif-&gt;ctls &amp; AC_DIG1_ENABLE)) {</div><div class='add'>+			snd_hda_codec_write(codec,</div><div class='add'>+					nvhdmi_con_nids_7x[i],</div><div class='add'>+					0,</div><div class='add'>+					AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+					spdif-&gt;ctls &amp; 0xff);</div><div class='add'>+			snd_hda_codec_write(codec,</div><div class='add'>+					nvhdmi_con_nids_7x[i],</div><div class='add'>+					0,</div><div class='add'>+					AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nvhdmi_8ch_7x_set_info_frame_parameters(codec, chs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 8,</div><div class='add'>+	.nid = nvhdmi_master_con_nid_7x,</div><div class='add'>+	.rates = SUPPORTED_RATES,</div><div class='add'>+	.maxbps = SUPPORTED_MAXBPS,</div><div class='add'>+	.formats = SUPPORTED_FORMATS,</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = snd_hda_hdmi_simple_pcm_open,</div><div class='add'>+		.close = nvhdmi_8ch_7x_pcm_close,</div><div class='add'>+		.prepare = nvhdmi_8ch_7x_pcm_prepare</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nvhdmi_mcp_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_simple_build_pcms(codec);</div><div class='add'>+	if (!err &amp;&amp; spec-&gt;multiout.max_channels == 8) {</div><div class='add'>+		struct hda_pcm *info = get_pcm_rec(spec, 0);</div><div class='add'>+</div><div class='add'>+		info-&gt;own_chmap = true;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_mcp_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+	struct snd_pcm_chmap *chmap;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_simple_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;multiout.max_channels != 8)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* add channel maps */</div><div class='add'>+	info = get_pcm_rec(spec, 0);</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(info-&gt;pcm,</div><div class='add'>+				     SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_alt_chmaps, 8, 0, &amp;chmap);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	switch (codec-&gt;preset-&gt;vendor_id) {</div><div class='add'>+	case 0x10de0002:</div><div class='add'>+	case 0x10de0003:</div><div class='add'>+	case 0x10de0005:</div><div class='add'>+	case 0x10de0006:</div><div class='add'>+		chmap-&gt;channel_mask = (1U &lt;&lt; 2) | (1U &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10de0007:</div><div class='add'>+		chmap-&gt;channel_mask = (1U &lt;&lt; 2) | (1U &lt;&lt; 6) | (1U &lt;&lt; 8);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const unsigned int channels_2_6_8[] = {</div><div class='add'>+	2, 6, 8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int channels_2_8[] = {</div><div class='add'>+	2, 8</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_2_6_8_channels = {</div><div class='add'>+	.count = ARRAY_SIZE(channels_2_6_8),</div><div class='add'>+	.list = channels_2_6_8,</div><div class='add'>+	.mask = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_2_8_channels = {</div><div class='add'>+	.count = ARRAY_SIZE(channels_2_8),</div><div class='add'>+	.list = channels_2_8,</div><div class='add'>+	.mask = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nvhdmi_mcp_probe(struct hda_codec *codec,</div><div class='add'>+			    const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_simple_probe(codec, nvhdmi_master_con_nid_7x,</div><div class='add'>+					nvhdmi_master_pin_nid_7x);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* override the PCM rates, etc, as the codec doesn't give full list */</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;pcm_playback.rates = SUPPORTED_RATES;</div><div class='add'>+	spec-&gt;pcm_playback.maxbps = SUPPORTED_MAXBPS;</div><div class='add'>+	spec-&gt;pcm_playback.formats = SUPPORTED_FORMATS;</div><div class='add'>+	spec-&gt;nv_dp_workaround = true;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_data == MODEL_2CH)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;multiout.max_channels = 8;</div><div class='add'>+	spec-&gt;pcm_playback = nvhdmi_pcm_playback_8ch_7x;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;preset-&gt;vendor_id) {</div><div class='add'>+	case 0x10de0002:</div><div class='add'>+	case 0x10de0003:</div><div class='add'>+	case 0x10de0005:</div><div class='add'>+	case 0x10de0006:</div><div class='add'>+		spec-&gt;hw_constraints_channels = &amp;hw_constraints_2_8_channels;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10de0007:</div><div class='add'>+		spec-&gt;hw_constraints_channels = &amp;hw_constraints_2_6_8_channels;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize the audio infoframe channel mask and checksum to something</div><div class='add'>+	 * valid</div><div class='add'>+	 */</div><div class='add'>+	nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops nvhdmi_mcp_codec_ops = {</div><div class='add'>+	.probe = nvhdmi_mcp_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_simple_remove,</div><div class='add'>+	.build_pcms = nvhdmi_mcp_build_pcms,</div><div class='add'>+	.build_controls = nvhdmi_mcp_build_controls,</div><div class='add'>+	.init = nvhdmi_mcp_init,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_simple_unsol_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_nvhdmi_mcp[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0001, "MCP73 HDMI",	MODEL_2CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0002, "MCP77/78 HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0003, "MCP77/78 HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0004, "GPU 04 HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0005, "MCP77/78 HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0006, "MCP77/78 HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0007, "MCP79/7A HDMI",	MODEL_8CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0067, "MCP67 HDMI",	MODEL_2CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de8001, "MCP73 HDMI",	MODEL_2CH),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de8067, "MCP67/68 HDMI",	MODEL_2CH),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_nvhdmi_mcp);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Legacy Nvidia HDMI HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver nvhdmi_mcp_driver = {</div><div class='add'>+	.id = snd_hda_id_nvhdmi_mcp,</div><div class='add'>+	.ops = &amp;nvhdmi_mcp_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(nvhdmi_mcp_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/nvhdmi.c b/sound/hda/codecs/hdmi/nvhdmi.c<br/>new file mode 100644<br/>index 000000000000..94671ad24b5e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/nvhdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/nvhdmi.c</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Nvidia HDMI codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_GENERIC,</div><div class='add'>+	MODEL_LEGACY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NVIDIA codecs ignore ASP mapping for 2ch - confirmed on:</div><div class='add'>+ * - 0x10de0015</div><div class='add'>+ * - 0x10de0040</div><div class='add'>+ */</div><div class='add'>+static int nvhdmi_chmap_cea_alloc_validate_get_type(struct hdac_chmap *chmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap, int channels)</div><div class='add'>+{</div><div class='add'>+	if (cap-&gt;ca_index == 0x00 &amp;&amp; channels == 2)</div><div class='add'>+		return SNDRV_CTL_TLVT_CHMAP_FIXED;</div><div class='add'>+</div><div class='add'>+	/* If the speaker allocation matches the channel count, it is OK. */</div><div class='add'>+	if (cap-&gt;channels != channels)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* all channels are remappable freely */</div><div class='add'>+	return SNDRV_CTL_TLVT_CHMAP_VAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_chmap_validate(struct hdac_chmap *chmap,</div><div class='add'>+		int ca, int chs, unsigned char *map)</div><div class='add'>+{</div><div class='add'>+	if (ca == 0x00 &amp;&amp; (map[0] != SNDRV_CHMAP_FL || map[1] != SNDRV_CHMAP_FR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* map from pin NID to port; port is 0-based */</div><div class='add'>+/* for Nvidia: assume widget NID starting from 4, with step 1 (4, 5, 6, ...) */</div><div class='add'>+static int nvhdmi_pin2port(void *audio_ptr, int pin_nid)</div><div class='add'>+{</div><div class='add'>+	return pin_nid - 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* reverse-map from port to pin NID: see above */</div><div class='add'>+static int nvhdmi_port2pin(struct hda_codec *codec, int port)</div><div class='add'>+{</div><div class='add'>+	return port + 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct drm_audio_component_audio_ops nvhdmi_audio_ops = {</div><div class='add'>+	.pin2port = nvhdmi_pin2port,</div><div class='add'>+	.pin_eld_notify = snd_hda_hdmi_acomp_pin_eld_notify,</div><div class='add'>+	.master_bind = snd_hda_hdmi_acomp_master_bind,</div><div class='add'>+	.master_unbind = snd_hda_hdmi_acomp_master_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_generic(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_alloc(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	codec-&gt;dp_mst = true;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_parse_codec(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_hdmi_generic_spec_free(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_generic_init_per_pins(codec);</div><div class='add'>+</div><div class='add'>+	spec-&gt;dyn_pin_out = true;</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.ops.chmap_cea_alloc_validate_get_type =</div><div class='add'>+		nvhdmi_chmap_cea_alloc_validate_get_type;</div><div class='add'>+	spec-&gt;chmap.ops.chmap_validate = nvhdmi_chmap_validate;</div><div class='add'>+	spec-&gt;nv_dp_workaround = true;</div><div class='add'>+</div><div class='add'>+	codec-&gt;link_down_at_suspend = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_acomp_init(codec, &amp;nvhdmi_audio_ops, nvhdmi_port2pin);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_legacy(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_probe(codec);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;dyn_pin_out = true;</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.ops.chmap_cea_alloc_validate_get_type =</div><div class='add'>+		nvhdmi_chmap_cea_alloc_validate_get_type;</div><div class='add'>+	spec-&gt;chmap.ops.chmap_validate = nvhdmi_chmap_validate;</div><div class='add'>+	spec-&gt;nv_dp_workaround = true;</div><div class='add'>+</div><div class='add'>+	codec-&gt;link_down_at_suspend = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	if (id-&gt;driver_data == MODEL_LEGACY)</div><div class='add'>+		return probe_legacy(codec);</div><div class='add'>+	else</div><div class='add'>+		return probe_generic(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops nvhdmi_codec_ops = {</div><div class='add'>+	.probe = nvhdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_generic_remove,</div><div class='add'>+	.init = snd_hda_hdmi_generic_init,</div><div class='add'>+	.build_pcms = snd_hda_hdmi_generic_build_pcms,</div><div class='add'>+	.build_controls = snd_hda_hdmi_generic_build_controls,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_generic_unsol_event,</div><div class='add'>+	.suspend = snd_hda_hdmi_generic_suspend,</div><div class='add'>+	.resume	 = snd_hda_hdmi_generic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_nvhdmi[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0008, "GPU 08 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0009, "GPU 09 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de000a, "GPU 0a HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de000b, "GPU 0b HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de000c, "MCP89 HDMI",		MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de000d, "GPU 0d HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0010, "GPU 10 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0011, "GPU 11 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0012, "GPU 12 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0013, "GPU 13 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0014, "GPU 14 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0015, "GPU 15 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0016, "GPU 16 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	/* 17 is known to be absent */</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0018, "GPU 18 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0019, "GPU 19 HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de001a, "GPU 1a HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de001b, "GPU 1b HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de001c, "GPU 1c HDMI/DP",	MODEL_LEGACY),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0040, "GPU 40 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0041, "GPU 41 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0042, "GPU 42 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0043, "GPU 43 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0044, "GPU 44 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0045, "GPU 45 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0050, "GPU 50 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0051, "GPU 51 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0052, "GPU 52 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0060, "GPU 60 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0061, "GPU 61 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0062, "GPU 62 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0070, "GPU 70 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0071, "GPU 71 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0072, "GPU 72 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0073, "GPU 73 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0074, "GPU 74 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0076, "GPU 76 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de007b, "GPU 7b HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de007c, "GPU 7c HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de007d, "GPU 7d HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de007e, "GPU 7e HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0080, "GPU 80 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0081, "GPU 81 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0082, "GPU 82 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0083, "GPU 83 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0084, "GPU 84 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0090, "GPU 90 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0091, "GPU 91 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0092, "GPU 92 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0093, "GPU 93 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0094, "GPU 94 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0095, "GPU 95 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0097, "GPU 97 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0098, "GPU 98 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0099, "GPU 99 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009a, "GPU 9a HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009b, "GPU 9b HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009c, "GPU 9c HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009d, "GPU 9d HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009e, "GPU 9e HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de009f, "GPU 9f HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a0, "GPU a0 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a1, "GPU a1 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a3, "GPU a3 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a4, "GPU a4 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a5, "GPU a5 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a6, "GPU a6 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a7, "GPU a7 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a8, "GPU a8 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00a9, "GPU a9 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00aa, "GPU aa HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00ab, "GPU ab HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00ad, "GPU ad HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00ae, "GPU ae HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00af, "GPU af HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00b0, "GPU b0 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00b1, "GPU b1 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00c0, "GPU c0 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00c1, "GPU c1 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00c3, "GPU c3 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00c4, "GPU c4 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de00c5, "GPU c5 HDMI/DP",	MODEL_GENERIC),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_nvhdmi);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver nvhdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_nvhdmi,</div><div class='add'>+	.ops = &amp;nvhdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(nvhdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/simplehdmi.c b/sound/hda/codecs/hdmi/simplehdmi.c<br/>new file mode 100644<br/>index 000000000000..193c8dc882af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/simplehdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/simplehdmi.c</a></div><div class='hunk'>@@ -0,0 +1,251 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Non-generic simple HDMI codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+	unsigned int chans;</div><div class='add'>+	struct hda_pcm_stream *pstr;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+</div><div class='add'>+	per_cvt = get_cvt(spec, 0);</div><div class='add'>+	chans = get_wcaps(codec, per_cvt-&gt;cvt_nid);</div><div class='add'>+	chans = get_wcaps_channels(chans);</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "HDMI 0");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	spec-&gt;pcm_rec[0].pcm = info;</div><div class='add'>+	info-&gt;pcm_type = HDA_PCM_TYPE_HDMI;</div><div class='add'>+	pstr = &amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+	*pstr = spec-&gt;pcm_playback;</div><div class='add'>+	pstr-&gt;nid = per_cvt-&gt;cvt_nid;</div><div class='add'>+	if (pstr-&gt;channels_max &lt;= 2 &amp;&amp; chans &amp;&amp; chans &lt;= 16)</div><div class='add'>+		pstr-&gt;channels_max = chans;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_build_pcms, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/* unsolicited event for jack sensing */</div><div class='add'>+void snd_hda_hdmi_simple_unsol_event(struct hda_codec *codec,</div><div class='add'>+				     unsigned int res)</div><div class='add'>+{</div><div class='add'>+	snd_hda_jack_set_dirty_all(codec);</div><div class='add'>+	snd_hda_jack_report_sync(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_unsol_event, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static void free_hdmi_jack_priv(struct snd_jack *jack)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_pcm *pcm = jack-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;jack = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simple_hdmi_build_jack(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	char hdmi_str[32] = "HDMI/DP";</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct snd_jack *jack;</div><div class='add'>+	struct hdmi_pcm *pcmp = get_hdmi_pcm(spec, 0);</div><div class='add'>+	int pcmdev = pcmp-&gt;pcm-&gt;device;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pcmdev &gt; 0)</div><div class='add'>+		sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);</div><div class='add'>+</div><div class='add'>+	err = snd_jack_new(codec-&gt;card, hdmi_str, SND_JACK_AVOUT, &amp;jack,</div><div class='add'>+			   true, false);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcmp-&gt;jack = jack;</div><div class='add'>+	jack-&gt;private_data = pcmp;</div><div class='add'>+	jack-&gt;private_free = free_hdmi_jack_priv;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	per_cvt = get_cvt(spec, 0);</div><div class='add'>+	err = snd_hda_create_dig_out_ctls(codec, per_cvt-&gt;cvt_nid,</div><div class='add'>+					  per_cvt-&gt;cvt_nid,</div><div class='add'>+					  HDA_PCM_TYPE_HDMI);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return simple_hdmi_build_jack(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_build_controls, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin = get_pin(spec, 0);</div><div class='add'>+	hda_nid_t pin = per_pin-&gt;pin_nid;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, pin, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+	/* some codecs require to unmute the pin */</div><div class='add'>+	if (get_wcaps(codec, pin) &amp; AC_WCAP_OUT_AMP)</div><div class='add'>+		snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='add'>+				    AMP_OUT_UNMUTE);</div><div class='add'>+	snd_hda_jack_detect_enable(codec, pin, per_pin-&gt;dev_id);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_init, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+void snd_hda_hdmi_simple_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_array_free(&amp;spec-&gt;pins);</div><div class='add'>+	snd_array_free(&amp;spec-&gt;cvts);</div><div class='add'>+	kfree(spec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_remove, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='add'>+				 struct hda_codec *codec,</div><div class='add'>+				 struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;hw_constraints_channels) {</div><div class='add'>+		snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='add'>+				SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				spec-&gt;hw_constraints_channels);</div><div class='add'>+	} else {</div><div class='add'>+		snd_pcm_hw_constraint_step(substream-&gt;runtime, 0,</div><div class='add'>+					   SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_pcm_open, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static int simple_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+				     struct hda_codec *codec,</div><div class='add'>+				     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int simple_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				       struct hda_codec *codec,</div><div class='add'>+				       unsigned int stream_tag,</div><div class='add'>+				       unsigned int format,</div><div class='add'>+				       struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='add'>+					     stream_tag, format, substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream simple_pcm_playback = {</div><div class='add'>+	.substreams = 1,</div><div class='add'>+	.channels_min = 2,</div><div class='add'>+	.channels_max = 2,</div><div class='add'>+	.ops = {</div><div class='add'>+		.open = snd_hda_hdmi_simple_pcm_open,</div><div class='add'>+		.close = simple_playback_pcm_close,</div><div class='add'>+		.prepare = simple_playback_pcm_prepare</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_hdmi_simple_probe(struct hda_codec *codec,</div><div class='add'>+			      hda_nid_t cvt_nid, hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	struct hdmi_spec_per_cvt *per_cvt;</div><div class='add'>+	struct hdmi_spec_per_pin *per_pin;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;codec = codec;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	snd_array_init(&amp;spec-&gt;pins, sizeof(struct hdmi_spec_per_pin), 1);</div><div class='add'>+	snd_array_init(&amp;spec-&gt;cvts, sizeof(struct hdmi_spec_per_cvt), 1);</div><div class='add'>+</div><div class='add'>+	spec-&gt;multiout.num_dacs = 0;  /* no analog */</div><div class='add'>+	spec-&gt;multiout.max_channels = 2;</div><div class='add'>+	spec-&gt;multiout.dig_out_nid = cvt_nid;</div><div class='add'>+	spec-&gt;num_cvts = 1;</div><div class='add'>+	spec-&gt;num_pins = 1;</div><div class='add'>+	per_pin = snd_array_new(&amp;spec-&gt;pins);</div><div class='add'>+	per_cvt = snd_array_new(&amp;spec-&gt;cvts);</div><div class='add'>+	if (!per_pin || !per_cvt) {</div><div class='add'>+		snd_hda_hdmi_simple_remove(codec);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	per_cvt-&gt;cvt_nid = cvt_nid;</div><div class='add'>+	per_pin-&gt;pin_nid = pin_nid;</div><div class='add'>+	spec-&gt;pcm_playback = simple_pcm_playback;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(snd_hda_hdmi_simple_probe, "SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum { MODEL_VIA };</div><div class='add'>+</div><div class='add'>+/* VIA HDMI Implementation */</div><div class='add'>+#define VIAHDMI_CVT_NID	0x02	/* audio converter1 */</div><div class='add'>+#define VIAHDMI_PIN_NID	0x03	/* HDMI output pin1 */</div><div class='add'>+</div><div class='add'>+static int simplehdmi_probe(struct hda_codec *codec,</div><div class='add'>+			    const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	switch (id-&gt;driver_data) {</div><div class='add'>+	case MODEL_VIA:</div><div class='add'>+		return snd_hda_hdmi_simple_probe(codec, VIAHDMI_CVT_NID,</div><div class='add'>+						 VIAHDMI_PIN_NID);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops simplehdmi_codec_ops = {</div><div class='add'>+	.probe = simplehdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_simple_remove,</div><div class='add'>+	.build_controls = snd_hda_hdmi_simple_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_hdmi_simple_build_pcms,</div><div class='add'>+	.init = snd_hda_hdmi_simple_init,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_simple_unsol_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_simplehdmi[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11069f80, "VX900 HDMI/DP",	MODEL_VIA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11069f81, "VX900 HDMI/DP",	MODEL_VIA),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Simple HDMI HD-audio codec support");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver simplehdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_simplehdmi,</div><div class='add'>+	.ops = &amp;simplehdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(simplehdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/hdmi/tegrahdmi.c b/sound/hda/codecs/hdmi/tegrahdmi.c<br/>new file mode 100644<br/>index 000000000000..5f6fe31aa202<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/hdmi/tegrahdmi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/hdmi/tegrahdmi.c</a></div><div class='hunk'>@@ -0,0 +1,318 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Nvidia Tegra HDMI codec support</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hdmi_local.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_TEGRA,</div><div class='add'>+	MODEL_TEGRA234,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The HDA codec on NVIDIA Tegra contains two scratch registers that are</div><div class='add'>+ * accessed using vendor-defined verbs. These registers can be used for</div><div class='add'>+ * interoperability between the HDA and HDMI drivers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Audio Function Group node */</div><div class='add'>+#define NVIDIA_AFG_NID 0x01</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The SCRATCH0 register is used to notify the HDMI codec of changes in audio</div><div class='add'>+ * format. On Tegra, bit 31 is used as a trigger that causes an interrupt to</div><div class='add'>+ * be raised in the HDMI codec. The remainder of the bits is arbitrary. This</div><div class='add'>+ * implementation stores the HDA format (see AC_FMT_*) in bits [15:0] and an</div><div class='add'>+ * additional bit (at position 30) to signal the validity of the format.</div><div class='add'>+ *</div><div class='add'>+ * | 31      | 30    | 29  16 | 15   0 |</div><div class='add'>+ * +---------+-------+--------+--------+</div><div class='add'>+ * | TRIGGER | VALID | UNUSED | FORMAT |</div><div class='add'>+ * +-----------------------------------|</div><div class='add'>+ *</div><div class='add'>+ * Note that for the trigger bit to take effect it needs to change value</div><div class='add'>+ * (i.e. it needs to be toggled). The trigger bit is not applicable from</div><div class='add'>+ * TEGRA234 chip onwards, as new verb id 0xf80 will be used for interrupt</div><div class='add'>+ * trigger to hdmi.</div><div class='add'>+ */</div><div class='add'>+#define NVIDIA_SET_HOST_INTR		0xf80</div><div class='add'>+#define NVIDIA_GET_SCRATCH0		0xfa6</div><div class='add'>+#define NVIDIA_SET_SCRATCH0_BYTE0	0xfa7</div><div class='add'>+#define NVIDIA_SET_SCRATCH0_BYTE1	0xfa8</div><div class='add'>+#define NVIDIA_SET_SCRATCH0_BYTE2	0xfa9</div><div class='add'>+#define NVIDIA_SET_SCRATCH0_BYTE3	0xfaa</div><div class='add'>+#define NVIDIA_SCRATCH_TRIGGER (1 &lt;&lt; 7)</div><div class='add'>+#define NVIDIA_SCRATCH_VALID   (1 &lt;&lt; 6)</div><div class='add'>+</div><div class='add'>+#define NVIDIA_GET_SCRATCH1		0xfab</div><div class='add'>+#define NVIDIA_SET_SCRATCH1_BYTE0	0xfac</div><div class='add'>+#define NVIDIA_SET_SCRATCH1_BYTE1	0xfad</div><div class='add'>+#define NVIDIA_SET_SCRATCH1_BYTE2	0xfae</div><div class='add'>+#define NVIDIA_SET_SCRATCH1_BYTE3	0xfaf</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The format parameter is the HDA audio format (see AC_FMT_*). If set to 0,</div><div class='add'>+ * the format is invalidated so that the HDMI codec can be disabled.</div><div class='add'>+ */</div><div class='add'>+static void tegra_hdmi_set_format(struct hda_codec *codec,</div><div class='add'>+				  hda_nid_t cvt_nid,</div><div class='add'>+				  unsigned int format)</div><div class='add'>+{</div><div class='add'>+	unsigned int value;</div><div class='add'>+	unsigned int nid = NVIDIA_AFG_NID;</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tegra HDA codec design from TEGRA234 chip onwards support DP MST.</div><div class='add'>+	 * This resulted in moving scratch registers from audio function</div><div class='add'>+	 * group to converter widget context. So CVT NID should be used for</div><div class='add'>+	 * scratch register read/write for DP MST supported Tegra HDA codec.</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;dp_mst)</div><div class='add'>+		nid = cvt_nid;</div><div class='add'>+</div><div class='add'>+	/* bits [31:30] contain the trigger and valid bits */</div><div class='add'>+	value = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+				   NVIDIA_GET_SCRATCH0, 0);</div><div class='add'>+	value = (value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	/* bits [15:0] are used to store the HDA format */</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+			    NVIDIA_SET_SCRATCH0_BYTE0,</div><div class='add'>+			    (format &gt;&gt; 0) &amp; 0xff);</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+			    NVIDIA_SET_SCRATCH0_BYTE1,</div><div class='add'>+			    (format &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* bits [16:24] are unused */</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+			    NVIDIA_SET_SCRATCH0_BYTE2, 0);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Bit 30 signals that the data is valid and hence that HDMI audio can</div><div class='add'>+	 * be enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (format == 0)</div><div class='add'>+		value &amp;= ~NVIDIA_SCRATCH_VALID;</div><div class='add'>+	else</div><div class='add'>+		value |= NVIDIA_SCRATCH_VALID;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;hdmi_intr_trig_ctrl) {</div><div class='add'>+		/*</div><div class='add'>+		 * For Tegra HDA Codec design from TEGRA234 onwards, the</div><div class='add'>+		 * Interrupt to hdmi driver is triggered by writing</div><div class='add'>+		 * non-zero values to verb 0xF80 instead of 31st bit of</div><div class='add'>+		 * scratch register.</div><div class='add'>+		 */</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+				NVIDIA_SET_SCRATCH0_BYTE3, value);</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+				NVIDIA_SET_HOST_INTR, 0x1);</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Whenever the 31st trigger bit is toggled, an interrupt is raised</div><div class='add'>+		 * in the HDMI codec. The HDMI driver will use that as trigger</div><div class='add'>+		 * to update its configuration.</div><div class='add'>+		 */</div><div class='add'>+		value ^= NVIDIA_SCRATCH_TRIGGER;</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+				NVIDIA_SET_SCRATCH0_BYTE3, value);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_hdmi_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  unsigned int stream_tag,</div><div class='add'>+				  unsigned int format,</div><div class='add'>+				  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_pcm_prepare(hinfo, codec, stream_tag,</div><div class='add'>+					       format, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* notify the HDMI codec of the format change */</div><div class='add'>+	tegra_hdmi_set_format(codec, hinfo-&gt;nid, format);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_hdmi_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	/* invalidate the format in the HDMI codec */</div><div class='add'>+	tegra_hdmi_set_format(codec, hinfo-&gt;nid, 0);</div><div class='add'>+</div><div class='add'>+	return snd_hda_hdmi_generic_pcm_cleanup(hinfo, codec, substream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hda_pcm *hda_find_pcm_by_type(struct hda_codec *codec, int type)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_pins; i++) {</div><div class='add'>+		struct hda_pcm *pcm = get_pcm_rec(spec, i);</div><div class='add'>+</div><div class='add'>+		if (pcm-&gt;pcm_type == type)</div><div class='add'>+			return pcm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_hdmi_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm_stream *stream;</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_build_pcms(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pcm = hda_find_pcm_by_type(codec, HDA_PCM_TYPE_HDMI);</div><div class='add'>+	if (!pcm)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Override -&gt;prepare() and -&gt;cleanup() operations to notify the HDMI</div><div class='add'>+	 * codec about format changes.</div><div class='add'>+	 */</div><div class='add'>+	stream = &amp;pcm-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+	stream-&gt;ops.prepare = tegra_hdmi_pcm_prepare;</div><div class='add'>+	stream-&gt;ops.cleanup = tegra_hdmi_pcm_cleanup;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * NVIDIA codecs ignore ASP mapping for 2ch - confirmed on:</div><div class='add'>+ * - 0x10de0015</div><div class='add'>+ * - 0x10de0040</div><div class='add'>+ */</div><div class='add'>+static int nvhdmi_chmap_cea_alloc_validate_get_type(struct hdac_chmap *chmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap, int channels)</div><div class='add'>+{</div><div class='add'>+	if (cap-&gt;ca_index == 0x00 &amp;&amp; channels == 2)</div><div class='add'>+		return SNDRV_CTL_TLVT_CHMAP_FIXED;</div><div class='add'>+</div><div class='add'>+	/* If the speaker allocation matches the channel count, it is OK. */</div><div class='add'>+	if (cap-&gt;channels != channels)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* all channels are remappable freely */</div><div class='add'>+	return SNDRV_CTL_TLVT_CHMAP_VAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nvhdmi_chmap_validate(struct hdac_chmap *chmap,</div><div class='add'>+		int ca, int chs, unsigned char *map)</div><div class='add'>+{</div><div class='add'>+	if (ca == 0x00 &amp;&amp; (map[0] != SNDRV_CHMAP_FL || map[1] != SNDRV_CHMAP_FR))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegra_hdmi_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_parse_codec(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_hdmi_generic_spec_free(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_cvts; i++)</div><div class='add'>+		snd_hda_codec_write(codec, spec-&gt;cvt_nids[i], 0,</div><div class='add'>+					AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+					AC_DIG1_ENABLE);</div><div class='add'>+</div><div class='add'>+	snd_hda_hdmi_generic_init_per_pins(codec);</div><div class='add'>+</div><div class='add'>+	codec-&gt;depop_delay = 10;</div><div class='add'>+	spec-&gt;chmap.ops.chmap_cea_alloc_validate_get_type =</div><div class='add'>+		nvhdmi_chmap_cea_alloc_validate_get_type;</div><div class='add'>+	spec-&gt;chmap.ops.chmap_validate = nvhdmi_chmap_validate;</div><div class='add'>+</div><div class='add'>+	spec-&gt;chmap.ops.chmap_cea_alloc_validate_get_type =</div><div class='add'>+		nvhdmi_chmap_cea_alloc_validate_get_type;</div><div class='add'>+	spec-&gt;chmap.ops.chmap_validate = nvhdmi_chmap_validate;</div><div class='add'>+	spec-&gt;nv_dp_workaround = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tegrahdmi_probe(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct hdmi_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_hdmi_generic_alloc(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (id-&gt;driver_data == MODEL_TEGRA234) {</div><div class='add'>+		codec-&gt;dp_mst = true;</div><div class='add'>+		spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;dyn_pin_out = true;</div><div class='add'>+		spec-&gt;hdmi_intr_trig_ctrl = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tegra_hdmi_init(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops tegrahdmi_codec_ops = {</div><div class='add'>+	.probe = tegrahdmi_probe,</div><div class='add'>+	.remove = snd_hda_hdmi_generic_remove,</div><div class='add'>+	.init = snd_hda_hdmi_generic_init,</div><div class='add'>+	.build_pcms = tegra_hdmi_build_pcms,</div><div class='add'>+	.build_controls = snd_hda_hdmi_generic_build_controls,</div><div class='add'>+	.unsol_event = snd_hda_hdmi_generic_unsol_event,</div><div class='add'>+	.suspend = snd_hda_hdmi_generic_suspend,</div><div class='add'>+	.resume = snd_hda_hdmi_generic_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_tegrahdmi[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0020, "Tegra30 HDMI",		MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0022, "Tegra114 HDMI",		MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0028, "Tegra124 HDMI",		MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0029, "Tegra210 HDMI/DP",	MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de002d, "Tegra186 HDMI/DP0",	MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de002e, "Tegra186 HDMI/DP1",	MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de002f, "Tegra194 HDMI/DP2",	MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0030, "Tegra194 HDMI/DP3",	MODEL_TEGRA),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0031, "Tegra234 HDMI/DP",	MODEL_TEGRA234),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0033, "SoC 33 HDMI/DP",	MODEL_TEGRA234),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0034, "Tegra264 HDMI/DP",	MODEL_TEGRA234),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x10de0035, "SoC 35 HDMI/DP",	MODEL_TEGRA234),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_tegrahdmi);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Nvidia Tegra HDMI HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_HDMI");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver tegrahdmi_driver = {</div><div class='add'>+	.id = snd_hda_id_tegrahdmi,</div><div class='add'>+	.ops = &amp;tegrahdmi_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(tegrahdmi_driver);</div><div class='head'>diff --git a/sound/hda/codecs/helpers/hp_x360.c b/sound/hda/codecs/helpers/hp_x360.c<br/>new file mode 100644<br/>index 000000000000..969542c57358<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/helpers/hp_x360.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/helpers/hp_x360.c</a></div><div class='hunk'>@@ -0,0 +1,95 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Fixes for HP X360 laptops with top B&amp;O speakers</div><div class='add'>+ * to be included from codec driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void alc295_fixup_hp_top_speakers(struct hda_codec *codec,</div><div class='add'>+		const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x17, 0x90170110 },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw alc295_hp_speakers_coefs[] = {</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0000), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003f), WRITE_COEF(0x28, 0x1000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0004), WRITE_COEF(0x28, 0x0600), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006a), WRITE_COEF(0x28, 0x0006), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006c), WRITE_COEF(0x28, 0xc0c0), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0008), WRITE_COEF(0x28, 0xb000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x002e), WRITE_COEF(0x28, 0x0800), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006a), WRITE_COEF(0x28, 0x00c1), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006c), WRITE_COEF(0x28, 0x0320), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0039), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003b), WRITE_COEF(0x28, 0xffff), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003c), WRITE_COEF(0x28, 0xffd0), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003a), WRITE_COEF(0x28, 0x1dfe), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0080), WRITE_COEF(0x28, 0x0880), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003a), WRITE_COEF(0x28, 0x0dfe), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0018), WRITE_COEF(0x28, 0x0219), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006a), WRITE_COEF(0x28, 0x005d), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006c), WRITE_COEF(0x28, 0x9142), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c0), WRITE_COEF(0x28, 0x01ce), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c1), WRITE_COEF(0x28, 0xed0c), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c2), WRITE_COEF(0x28, 0x1c00), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c3), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c4), WRITE_COEF(0x28, 0x0200), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c5), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c6), WRITE_COEF(0x28, 0x0399), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c7), WRITE_COEF(0x28, 0x2330), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c8), WRITE_COEF(0x28, 0x1e5d), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00c9), WRITE_COEF(0x28, 0x6eff), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00ca), WRITE_COEF(0x28, 0x01c0), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00cb), WRITE_COEF(0x28, 0xed0c), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00cc), WRITE_COEF(0x28, 0x1c00), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00cd), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00ce), WRITE_COEF(0x28, 0x0200), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00cf), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00d0), WRITE_COEF(0x28, 0x0399), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00d1), WRITE_COEF(0x28, 0x2330), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00d2), WRITE_COEF(0x28, 0x1e5d), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x00d3), WRITE_COEF(0x28, 0x6eff), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0062), WRITE_COEF(0x28, 0x8000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0063), WRITE_COEF(0x28, 0x5f5f), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0064), WRITE_COEF(0x28, 0x1000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0065), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0066), WRITE_COEF(0x28, 0x4004), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0067), WRITE_COEF(0x28, 0x0802), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0068), WRITE_COEF(0x28, 0x890f), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0069), WRITE_COEF(0x28, 0xe021), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0070), WRITE_COEF(0x28, 0x8012), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0071), WRITE_COEF(0x28, 0x3450), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0072), WRITE_COEF(0x28, 0x0123), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0073), WRITE_COEF(0x28, 0x4543), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0074), WRITE_COEF(0x28, 0x2100), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0075), WRITE_COEF(0x28, 0x4321), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0076), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0050), WRITE_COEF(0x28, 0x8200), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003a), WRITE_COEF(0x28, 0x1dfe), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0051), WRITE_COEF(0x28, 0x0707), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0052), WRITE_COEF(0x28, 0x4090), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006a), WRITE_COEF(0x28, 0x0090), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006c), WRITE_COEF(0x28, 0x721f), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0012), WRITE_COEF(0x28, 0xebeb), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x009e), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0060), WRITE_COEF(0x28, 0x2213), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006a), WRITE_COEF(0x28, 0x0006), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x006c), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x003f), WRITE_COEF(0x28, 0x3000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0004), WRITE_COEF(0x28, 0x0500), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0040), WRITE_COEF(0x28, 0x800c), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0046), WRITE_COEF(0x28, 0xc22e), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x004b), WRITE_COEF(0x28, 0x0000), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+		WRITE_COEF(0x24, 0x0012), WRITE_COEF(0x26, 0x0050), WRITE_COEF(0x28, 0x82ec), WRITE_COEF(0x29, 0xb024),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		alc295_fixup_disable_dac3(codec, fix, action);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_process_coef_fw(codec, alc295_hp_speakers_coefs);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/codecs/helpers/ideapad_hotkey_led.c b/sound/hda/codecs/helpers/ideapad_hotkey_led.c<br/>new file mode 100644<br/>index 000000000000..c10d97964d49<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/helpers/ideapad_hotkey_led.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/helpers/ideapad_hotkey_led.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Ideapad helper functions for Lenovo Ideapad LED control,</div><div class='add'>+ * It should be included from codec driver.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IDEAPAD_LAPTOP)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+static bool is_ideapad(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return (codec-&gt;core.subsystem_id &gt;&gt; 16 == 0x17aa) &amp;&amp;</div><div class='add'>+	       (acpi_dev_found("LHK2019") || acpi_dev_found("VPC2004"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_fixup_ideapad_acpi(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		if (!is_ideapad(codec))</div><div class='add'>+			return;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, NULL);</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_IDEAPAD_LAPTOP */</div><div class='add'>+</div><div class='add'>+static void hda_fixup_ideapad_acpi(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_IDEAPAD_LAPTOP */</div><div class='head'>diff --git a/sound/hda/codecs/helpers/ideapad_s740.c b/sound/hda/codecs/helpers/ideapad_s740.c<br/>new file mode 100644<br/>index 000000000000..564b9086e52d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/helpers/ideapad_s740.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/helpers/ideapad_s740.c</a></div><div class='hunk'>@@ -0,0 +1,492 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Fixes for Lenovo Ideapad S740, to be included from codec driver */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb alc285_ideapad_s740_coefs[] = {</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x10 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0320 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0041 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0041 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x007f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x007f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x003c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0011 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x003c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0011 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0042 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0042 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0003 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0009 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0003 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0009 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001d },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004e },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001d },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004e },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001b },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001b },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0019 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0025 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0019 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0025 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0018 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0037 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0018 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0037 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0016 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0076 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0016 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0076 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0017 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0017 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0007 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0086 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0007 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0086 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0042 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0042 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x007f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x007f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x003c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0011 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x003c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0011 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x002a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x002a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0046 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x000f },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0046 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0044 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0044 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0003 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0009 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0003 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0009 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x004c },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001b },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001b },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0019 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0025 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0019 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0025 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0018 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0037 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0018 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0037 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x001a },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0040 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0016 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0076 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0016 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0076 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0017 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0017 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0010 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0015 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0007 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0086 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0007 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0086 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0001 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x29 },</div><div class='add'>+{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0002 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_ideapad_s740_coef(struct hda_codec *codec,</div><div class='add'>+					   const struct hda_fixup *fix,</div><div class='add'>+					   int action)</div><div class='add'>+{</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_add_verbs(codec, alc285_ideapad_s740_coefs);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/codecs/helpers/thinkpad.c b/sound/hda/codecs/helpers/thinkpad.c<br/>new file mode 100644<br/>index 000000000000..de4d8deed102<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/helpers/thinkpad.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/helpers/thinkpad.c</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Helper functions for Thinkpad LED control;</div><div class='add'>+ * to be included from codec driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_THINKPAD_ACPI)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+</div><div class='add'>+static bool is_thinkpad(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return (codec-&gt;core.subsystem_id &gt;&gt; 16 == 0x17aa) &amp;&amp;</div><div class='add'>+	       (acpi_dev_found("LEN0068") || acpi_dev_found("LEN0268") ||</div><div class='add'>+		acpi_dev_found("IBM0068"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		if (!is_thinkpad(codec))</div><div class='add'>+			return;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, NULL);</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_THINKPAD_ACPI */</div><div class='add'>+</div><div class='add'>+static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_THINKPAD_ACPI */</div><div class='head'>diff --git a/sound/hda/codecs/realtek/Kconfig b/sound/hda/codecs/realtek/Kconfig<br/>new file mode 100644<br/>index 000000000000..cdc6d9509a01<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+menuconfig SND_HDA_CODEC_REALTEK</div><div class='add'>+	tristate "Realtek HD-audio codec support"</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek HD-audio codec support.</div><div class='add'>+</div><div class='add'>+	  This will enable all Realtek HD-audio codec drivers as default,</div><div class='add'>+	  but you can enable/disable each codec driver individually, too</div><div class='add'>+	  (only when CONFIG_EXPERT is set).</div><div class='add'>+</div><div class='add'>+if SND_HDA_CODEC_REALTEK</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	tristate</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_HDA_GENERIC_LEDS</div><div class='add'>+	select SND_HDA_SCODEC_COMPONENT</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC260</div><div class='add'>+	tristate "Build Realtek ALC260 HD-audio codec support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC260 HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC262</div><div class='add'>+	tristate "Build Realtek ALC262 HD-audio codec support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC262 HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC268</div><div class='add'>+	tristate "Build Realtek ALC268 HD-audio codec support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC268 and compatible HD-audio</div><div class='add'>+	  codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC269</div><div class='add'>+	tristate "Build Realtek ALC269 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC269 and compatible HD-audio</div><div class='add'>+	  codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC662</div><div class='add'>+	tristate "Build Realtek ALC662 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC662 and compatible HD-audio</div><div class='add'>+	  codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC680</div><div class='add'>+	tristate "Build Realtek ALC680 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC680 HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC861</div><div class='add'>+	tristate "Build Realtek ALC861 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC861 HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC861VD</div><div class='add'>+	tristate "Build Realtek ALC861-VD HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC861-VD HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC880</div><div class='add'>+	tristate "Build Realtek ALC880 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC880 HD-audio codec support</div><div class='add'>+</div><div class='add'>+config SND_HDA_CODEC_ALC882</div><div class='add'>+	tristate "Build Realtek ALC882 HD-audio codecs support" if EXPERT</div><div class='add'>+	depends on INPUT</div><div class='add'>+	select SND_HDA_CODEC_REALTEK_LIB</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include Realtek ALC882 and compatible HD-audio</div><div class='add'>+	  codec support</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/sound/hda/codecs/realtek/Makefile b/sound/hda/codecs/realtek/Makefile<br/>new file mode 100644<br/>index 000000000000..c6ee4e526a40<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/Makefile</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+subdir-ccflags-y += -I$(src)/../../common</div><div class='add'>+</div><div class='add'>+snd-hda-codec-realtek-lib-y :=	realtek.o</div><div class='add'>+snd-hda-codec-alc260-y :=	alc260.o</div><div class='add'>+snd-hda-codec-alc262-y :=	alc262.o</div><div class='add'>+snd-hda-codec-alc268-y :=	alc268.o</div><div class='add'>+snd-hda-codec-alc269-y :=	alc269.o</div><div class='add'>+snd-hda-codec-alc662-y :=	alc662.o</div><div class='add'>+snd-hda-codec-alc680-y :=	alc680.o</div><div class='add'>+snd-hda-codec-alc861-y :=	alc861.o</div><div class='add'>+snd-hda-codec-alc861vd-y :=	alc861vd.o</div><div class='add'>+snd-hda-codec-alc880-y :=	alc880.o</div><div class='add'>+snd-hda-codec-alc882-y :=	alc882.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_REALTEK_LIB) += snd-hda-codec-realtek-lib.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC260) += snd-hda-codec-alc260.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC262) += snd-hda-codec-alc262.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC268) += snd-hda-codec-alc268.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC269) += snd-hda-codec-alc269.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC662) += snd-hda-codec-alc662.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC680) += snd-hda-codec-alc680.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC861) += snd-hda-codec-alc861.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC861VD) += snd-hda-codec-alc861vd.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC880) += snd-hda-codec-alc880.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CODEC_ALC882) += snd-hda-codec-alc882.o</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc260.c b/sound/hda/codecs/realtek/alc260.c<br/>new file mode 100644<br/>index 000000000000..8bd47079dccb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc260.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc260.c</a></div><div class='hunk'>@@ -0,0 +1,290 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC260 codec</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int alc260_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc260_ignore[] = { 0x17, 0 };</div><div class='add'>+	static const hda_nid_t alc260_ssids[] = { 0x10, 0x15, 0x0f, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc260_ignore, alc260_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pin config fixes</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ALC260_FIXUP_HP_DC5750,</div><div class='add'>+	ALC260_FIXUP_HP_PIN_0F,</div><div class='add'>+	ALC260_FIXUP_COEF,</div><div class='add'>+	ALC260_FIXUP_GPIO1,</div><div class='add'>+	ALC260_FIXUP_GPIO1_TOGGLE,</div><div class='add'>+	ALC260_FIXUP_REPLACER,</div><div class='add'>+	ALC260_FIXUP_HP_B1900,</div><div class='add'>+	ALC260_FIXUP_KN1,</div><div class='add'>+	ALC260_FIXUP_FSC_S7020,</div><div class='add'>+	ALC260_FIXUP_FSC_S7020_JWSE,</div><div class='add'>+	ALC260_FIXUP_VAIO_PINS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc260_gpio1_automute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_gpio_data(codec, 0x01, spec-&gt;gen.hp_jack_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc260_fixup_gpio1_toggle(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		/* although the machine has only one output pin, we need to</div><div class='add'>+		 * toggle GPIO1 according to the jack state</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;gen.automute_hook = alc260_gpio1_automute;</div><div class='add'>+		spec-&gt;gen.detect_hp = 1;</div><div class='add'>+		spec-&gt;gen.automute_speaker = 1;</div><div class='add'>+		spec-&gt;gen.autocfg.hp_pins[0] = 0x0f; /* copy it for automute */</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x0f,</div><div class='add'>+						    snd_hda_gen_hp_automute);</div><div class='add'>+		alc_setup_gpio(codec, 0x01);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc260_fixup_kn1(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x0f, 0x02214000 }, /* HP/speaker */</div><div class='add'>+		{ 0x12, 0x90a60160 }, /* int mic */</div><div class='add'>+		{ 0x13, 0x02a19000 }, /* ext mic */</div><div class='add'>+		{ 0x18, 0x01446000 }, /* SPDIF out */</div><div class='add'>+		/* disable bogus I/O pins */</div><div class='add'>+		{ 0x10, 0x411111f0 },</div><div class='add'>+		{ 0x11, 0x411111f0 },</div><div class='add'>+		{ 0x14, 0x411111f0 },</div><div class='add'>+		{ 0x15, 0x411111f0 },</div><div class='add'>+		{ 0x16, 0x411111f0 },</div><div class='add'>+		{ 0x17, 0x411111f0 },</div><div class='add'>+		{ 0x19, 0x411111f0 },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_NONE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc260_fixup_fsc_s7020(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc260_fixup_fsc_s7020_jwse(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gen.add_jack_modes = 1;</div><div class='add'>+		spec-&gt;gen.hp_mic = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc260_fixups[] = {</div><div class='add'>+	[ALC260_FIXUP_HP_DC5750] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x11, 0x90130110 }, /* speaker */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_HP_PIN_0F] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x0f, 0x01214000 }, /* HP */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x1a, AC_VERB_SET_PROC_COEF,  0x3040 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio1,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_GPIO1_TOGGLE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc260_fixup_gpio1_toggle,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC260_FIXUP_HP_PIN_0F,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_REPLACER] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x1a, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x1a, AC_VERB_SET_PROC_COEF,  0x3050 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC260_FIXUP_GPIO1_TOGGLE,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_HP_B1900] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc260_fixup_gpio1_toggle,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC260_FIXUP_COEF,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_KN1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc260_fixup_kn1,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_FSC_S7020] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc260_fixup_fsc_s7020,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_FSC_S7020_JWSE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc260_fixup_fsc_s7020_jwse,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC260_FIXUP_FSC_S7020,</div><div class='add'>+	},</div><div class='add'>+	[ALC260_FIXUP_VAIO_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* Pin configs are missing completely on some VAIOs */</div><div class='add'>+			{ 0x0f, 0x01211020 },</div><div class='add'>+			{ 0x10, 0x0001003f },</div><div class='add'>+			{ 0x11, 0x411111f0 },</div><div class='add'>+			{ 0x12, 0x01a15930 },</div><div class='add'>+			{ 0x13, 0x411111f0 },</div><div class='add'>+			{ 0x14, 0x411111f0 },</div><div class='add'>+			{ 0x15, 0x411111f0 },</div><div class='add'>+			{ 0x16, 0x411111f0 },</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x411111f0 },</div><div class='add'>+			{ 0x19, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc260_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_FIXUP_GPIO1),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x007f, "Acer Aspire 9500", ALC260_FIXUP_COEF),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_FIXUP_VAIO_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020),</div><div class='add'>+	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),</div><div class='add'>+	SND_PCI_QUIRK(0x152d, 0x0729, "Quanta KN1", ALC260_FIXUP_KN1),</div><div class='add'>+	SND_PCI_QUIRK(0x161f, 0x2057, "Replacer 672V", ALC260_FIXUP_REPLACER),</div><div class='add'>+	SND_PCI_QUIRK(0x1631, 0xc017, "PB V7900", ALC260_FIXUP_COEF),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc260_fixup_models[] = {</div><div class='add'>+	{.id = ALC260_FIXUP_GPIO1, .name = "gpio1"},</div><div class='add'>+	{.id = ALC260_FIXUP_COEF, .name = "coef"},</div><div class='add'>+	{.id = ALC260_FIXUP_FSC_S7020, .name = "fujitsu"},</div><div class='add'>+	{.id = ALC260_FIXUP_FSC_S7020_JWSE, .name = "fujitsu-jwse"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc260_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x07);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	/* as quite a few machines require HP amp for speaker outputs,</div><div class='add'>+	 * it's easier to enable it unconditionally; even if it's unneeded,</div><div class='add'>+	 * it's almost harmless.</div><div class='add'>+	 */</div><div class='add'>+	spec-&gt;gen.prefer_hp_amp = 1;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_eapd_shutup;</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc260_fixup_models, alc260_fixup_tbl,</div><div class='add'>+			   alc260_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc260_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog) {</div><div class='add'>+		err = set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc260_codec_ops = {</div><div class='add'>+	.probe = alc260_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc260[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0260, "ALC260"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc260);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC260 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc260_driver = {</div><div class='add'>+	.id = snd_hda_id_alc260,</div><div class='add'>+	.ops = &amp;alc260_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc260_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc262.c b/sound/hda/codecs/realtek/alc262.c<br/>new file mode 100644<br/>index 000000000000..3ec06cf5d2a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc262.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc262.c</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC262 codec</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int alc262_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc262_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc262_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc262_ignore, alc262_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pin config fixes</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ALC262_FIXUP_FSC_H270,</div><div class='add'>+	ALC262_FIXUP_FSC_S7110,</div><div class='add'>+	ALC262_FIXUP_HP_Z200,</div><div class='add'>+	ALC262_FIXUP_TYAN,</div><div class='add'>+	ALC262_FIXUP_LENOVO_3000,</div><div class='add'>+	ALC262_FIXUP_BENQ,</div><div class='add'>+	ALC262_FIXUP_BENQ_T31,</div><div class='add'>+	ALC262_FIXUP_INV_DMIC,</div><div class='add'>+	ALC262_FIXUP_INTEL_BAYLEYBAY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc262_fixups[] = {</div><div class='add'>+	[ALC262_FIXUP_FSC_H270] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0221142f }, /* front HP */</div><div class='add'>+			{ 0x1b, 0x0121141f }, /* rear HP */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_FSC_S7110] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x90170110 }, /* speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC262_FIXUP_BENQ,</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_HP_Z200] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x99130120 }, /* internal speaker */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_TYAN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x1993e1f0 }, /* int AUX */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_LENOVO_3000] = {</div><div class='add'>+		.type = HDA_FIXUP_PINCTLS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, PIN_VREF50 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC262_FIXUP_BENQ,</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_BENQ] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3070 },</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_BENQ_T31] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3050 },</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC262_FIXUP_INTEL_BAYLEYBAY] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_depop_delay,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc262_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200", ALC262_FIXUP_HP_Z200),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu Lifebook S7110", ALC262_FIXUP_FSC_S7110),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FIXUP_BENQ),</div><div class='add'>+	SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_FIXUP_TYAN),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x1141, "FSC ESPRIMO U9210", ALC262_FIXUP_FSC_H270),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", ALC262_FIXUP_FSC_H270),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000", ALC262_FIXUP_LENOVO_3000),</div><div class='add'>+	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_FIXUP_BENQ),</div><div class='add'>+	SND_PCI_QUIRK(0x17ff, 0x058d, "Benq T31-16", ALC262_FIXUP_BENQ_T31),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x7270, "BayleyBay", ALC262_FIXUP_INTEL_BAYLEYBAY),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc262_fixup_models[] = {</div><div class='add'>+	{.id = ALC262_FIXUP_INV_DMIC, .name = "inv-dmic"},</div><div class='add'>+	{.id = ALC262_FIXUP_FSC_H270, .name = "fsc-h270"},</div><div class='add'>+	{.id = ALC262_FIXUP_FSC_S7110, .name = "fsc-s7110"},</div><div class='add'>+	{.id = ALC262_FIXUP_HP_Z200, .name = "hp-z200"},</div><div class='add'>+	{.id = ALC262_FIXUP_TYAN, .name = "tyan"},</div><div class='add'>+	{.id = ALC262_FIXUP_LENOVO_3000, .name = "lenovo-3000"},</div><div class='add'>+	{.id = ALC262_FIXUP_BENQ, .name = "benq"},</div><div class='add'>+	{.id = ALC262_FIXUP_BENQ_T31, .name = "benq-t31"},</div><div class='add'>+	{.id = ALC262_FIXUP_INTEL_BAYLEYBAY, .name = "bayleybay"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc262_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;gen.shared_mic_vref_pin = 0x18;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_eapd_shutup;</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is</div><div class='add'>+	 * under-run</div><div class='add'>+	 */</div><div class='add'>+	alc_update_coefex_idx(codec, 0x1a, 7, 0, 0x80);</div><div class='add'>+#endif</div><div class='add'>+	alc_fix_pll_init(codec, 0x20, 0x0a, 10);</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc262_fixup_models, alc262_fixup_tbl,</div><div class='add'>+		       alc262_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	alc_auto_parse_customize_define(codec);</div><div class='add'>+</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc262_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog &amp;&amp; spec-&gt;gen.beep_nid) {</div><div class='add'>+		err = set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc262_codec_ops = {</div><div class='add'>+	.probe = alc262_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc262[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0262, "ALC262"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc262);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC262 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc262_driver = {</div><div class='add'>+	.id = snd_hda_id_alc262,</div><div class='add'>+	.ops = &amp;alc262_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc262_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc268.c b/sound/hda/codecs/realtek/alc268.c<br/>new file mode 100644<br/>index 000000000000..4b565fb7bd1c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc268.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc268.c</a></div><div class='hunk'>@@ -0,0 +1,189 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+/* bind Beep switches of both NID 0x0f and 0x10 */</div><div class='add'>+static int alc268_beep_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned long pval;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;control_mutex);</div><div class='add'>+	pval = kcontrol-&gt;private_value;</div><div class='add'>+	kcontrol-&gt;private_value = (pval &amp; ~0xff) | 0x0f;</div><div class='add'>+	err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		kcontrol-&gt;private_value = (pval &amp; ~0xff) | 0x10;</div><div class='add'>+		err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+	}</div><div class='add'>+	kcontrol-&gt;private_value = pval;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new alc268_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT),</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "Beep Playback Switch",</div><div class='add'>+		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='add'>+		.info = snd_hda_mixer_amp_switch_info,</div><div class='add'>+		.get = snd_hda_mixer_amp_switch_get,</div><div class='add'>+		.put = alc268_beep_switch_put,</div><div class='add'>+		.private_value = HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT)</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* set PCBEEP vol = 0, mute connections */</div><div class='add'>+static const struct hda_verb alc268_beep_init_verbs[] = {</div><div class='add'>+	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='add'>+	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='add'>+	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC268_FIXUP_INV_DMIC,</div><div class='add'>+	ALC268_FIXUP_HP_EAPD,</div><div class='add'>+	ALC268_FIXUP_SPDIF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc268_fixups[] = {</div><div class='add'>+	[ALC268_FIXUP_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC268_FIXUP_HP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x15, AC_VERB_SET_EAPD_BTLENABLE, 0},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC268_FIXUP_SPDIF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x014b1180 }, /* enable SPDIF out */</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc268_fixup_models[] = {</div><div class='add'>+	{.id = ALC268_FIXUP_INV_DMIC, .name = "inv-dmic"},</div><div class='add'>+	{.id = ALC268_FIXUP_HP_EAPD, .name = "hp-eapd"},</div><div class='add'>+	{.id = ALC268_FIXUP_SPDIF, .name = "spdif"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc268_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0139, "Acer TravelMate 6293", ALC268_FIXUP_SPDIF),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x015b, "Acer AOA 150 (ZG5)", ALC268_FIXUP_INV_DMIC),</div><div class='add'>+	/* below is codec SSID since multiple Toshiba laptops have the</div><div class='add'>+	 * same PCI SSID 1179:ff00</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x1179, 0xff06, "Toshiba P200", ALC268_FIXUP_HP_EAPD),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto configuration</div><div class='add'>+ */</div><div class='add'>+static int alc268_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc268_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, NULL, alc268_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc268_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* ALC268 has no aa-loopback mixer */</div><div class='add'>+	err = alc_alloc_spec(codec, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_eapd_shutup;</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc268_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (err &gt; 0 &amp;&amp; !spec-&gt;gen.no_analog &amp;&amp;</div><div class='add'>+	    spec-&gt;gen.autocfg.speaker_pins[0] != 0x1d) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(alc268_beep_mixer); i++) {</div><div class='add'>+			if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+						  &amp;alc268_beep_mixer[i])) {</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		snd_hda_add_verbs(codec, alc268_beep_init_verbs);</div><div class='add'>+		if (!query_amp_caps(codec, 0x1d, HDA_INPUT))</div><div class='add'>+			/* override the amp caps for beep generator */</div><div class='add'>+			snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,</div><div class='add'>+					  (0x0c &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+					  (0x0c &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+					  (0x07 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+					  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc268_codec_ops = {</div><div class='add'>+	.probe = alc268_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc268[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0267, "ALC267"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0268, "ALC268"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc268);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC267/268 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc268_driver = {</div><div class='add'>+	.id = snd_hda_id_alc268,</div><div class='add'>+	.ops = &amp;alc268_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc268_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc269.c b/sound/hda/codecs/realtek/alc269.c<br/>new file mode 100644<br/>index 000000000000..d90a6c01f63b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc269.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc269.c</a></div><div class='hunk'>@@ -0,0 +1,8311 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC269 and compatible codecs</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+/* keep halting ALC5505 DSP, for power saving */</div><div class='add'>+#define HALT_REALTEK_ALC5505</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream alc269_44k_pcm_analog_playback = {</div><div class='add'>+	.rates = SNDRV_PCM_RATE_44100, /* fixed rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pcm_stream alc269_44k_pcm_analog_capture = {</div><div class='add'>+	.rates = SNDRV_PCM_RATE_44100, /* fixed rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* different alc269-variants */</div><div class='add'>+enum {</div><div class='add'>+	ALC269_TYPE_ALC269VA,</div><div class='add'>+	ALC269_TYPE_ALC269VB,</div><div class='add'>+	ALC269_TYPE_ALC269VC,</div><div class='add'>+	ALC269_TYPE_ALC269VD,</div><div class='add'>+	ALC269_TYPE_ALC280,</div><div class='add'>+	ALC269_TYPE_ALC282,</div><div class='add'>+	ALC269_TYPE_ALC283,</div><div class='add'>+	ALC269_TYPE_ALC284,</div><div class='add'>+	ALC269_TYPE_ALC293,</div><div class='add'>+	ALC269_TYPE_ALC286,</div><div class='add'>+	ALC269_TYPE_ALC298,</div><div class='add'>+	ALC269_TYPE_ALC255,</div><div class='add'>+	ALC269_TYPE_ALC256,</div><div class='add'>+	ALC269_TYPE_ALC257,</div><div class='add'>+	ALC269_TYPE_ALC215,</div><div class='add'>+	ALC269_TYPE_ALC225,</div><div class='add'>+	ALC269_TYPE_ALC245,</div><div class='add'>+	ALC269_TYPE_ALC287,</div><div class='add'>+	ALC269_TYPE_ALC294,</div><div class='add'>+	ALC269_TYPE_ALC300,</div><div class='add'>+	ALC269_TYPE_ALC623,</div><div class='add'>+	ALC269_TYPE_ALC700,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto configuration</div><div class='add'>+ */</div><div class='add'>+static int alc269_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc269_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc269_ssids[] = { 0, 0x1b, 0x14, 0x21 };</div><div class='add'>+	static const hda_nid_t alc269va_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	const hda_nid_t *ssids;</div><div class='add'>+</div><div class='add'>+	switch (spec-&gt;codec_variant) {</div><div class='add'>+	case ALC269_TYPE_ALC269VA:</div><div class='add'>+	case ALC269_TYPE_ALC269VC:</div><div class='add'>+	case ALC269_TYPE_ALC280:</div><div class='add'>+	case ALC269_TYPE_ALC284:</div><div class='add'>+	case ALC269_TYPE_ALC293:</div><div class='add'>+		ssids = alc269va_ssids;</div><div class='add'>+		break;</div><div class='add'>+	case ALC269_TYPE_ALC269VB:</div><div class='add'>+	case ALC269_TYPE_ALC269VD:</div><div class='add'>+	case ALC269_TYPE_ALC282:</div><div class='add'>+	case ALC269_TYPE_ALC283:</div><div class='add'>+	case ALC269_TYPE_ALC286:</div><div class='add'>+	case ALC269_TYPE_ALC298:</div><div class='add'>+	case ALC269_TYPE_ALC255:</div><div class='add'>+	case ALC269_TYPE_ALC256:</div><div class='add'>+	case ALC269_TYPE_ALC257:</div><div class='add'>+	case ALC269_TYPE_ALC215:</div><div class='add'>+	case ALC269_TYPE_ALC225:</div><div class='add'>+	case ALC269_TYPE_ALC245:</div><div class='add'>+	case ALC269_TYPE_ALC287:</div><div class='add'>+	case ALC269_TYPE_ALC294:</div><div class='add'>+	case ALC269_TYPE_ALC300:</div><div class='add'>+	case ALC269_TYPE_ALC623:</div><div class='add'>+	case ALC269_TYPE_ALC700:</div><div class='add'>+		ssids = alc269_ssids;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ssids = alc269_ssids;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return alc_parse_auto_config(codec, alc269_ignore, ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_jack_keymap alc_headset_btn_keymap[] = {</div><div class='add'>+	{ SND_JACK_BTN_0, KEY_PLAYPAUSE },</div><div class='add'>+	{ SND_JACK_BTN_1, KEY_VOICECOMMAND },</div><div class='add'>+	{ SND_JACK_BTN_2, KEY_VOLUMEUP },</div><div class='add'>+	{ SND_JACK_BTN_3, KEY_VOLUMEDOWN },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc_headset_btn_callback(struct hda_codec *codec,</div><div class='add'>+				     struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	int report = 0;</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;unsol_res &amp; (7 &lt;&lt; 13))</div><div class='add'>+		report |= SND_JACK_BTN_0;</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;unsol_res  &amp; (1 &lt;&lt; 16 | 3 &lt;&lt; 8))</div><div class='add'>+		report |= SND_JACK_BTN_1;</div><div class='add'>+</div><div class='add'>+	/* Volume up key */</div><div class='add'>+	if (jack-&gt;unsol_res &amp; (7 &lt;&lt; 23))</div><div class='add'>+		report |= SND_JACK_BTN_2;</div><div class='add'>+</div><div class='add'>+	/* Volume down key */</div><div class='add'>+	if (jack-&gt;unsol_res &amp; (7 &lt;&lt; 10))</div><div class='add'>+		report |= SND_JACK_BTN_3;</div><div class='add'>+</div><div class='add'>+	snd_hda_jack_set_button_state(codec, jack-&gt;nid, report);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_disable_headset_jack_key(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;has_hs_key)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0287:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_write_coef_idx(codec, 0x48, 0x0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x49, 0x0045, 0x0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x44, 0x0045 &lt;&lt; 8, 0x0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_write_coef_idx(codec, 0x48, 0x0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x49, 0x0045, 0x0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_enable_headset_jack_key(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;has_hs_key)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0287:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_write_coef_idx(codec, 0x48, 0xd011);</div><div class='add'>+		alc_update_coef_idx(codec, 0x49, 0x007f, 0x0045);</div><div class='add'>+		alc_update_coef_idx(codec, 0x44, 0x007f &lt;&lt; 8, 0x0045 &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_write_coef_idx(codec, 0x48, 0xd011);</div><div class='add'>+		alc_update_coef_idx(codec, 0x49, 0x007f, 0x0045);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_jack(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;has_hs_key = 1;</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x55,</div><div class='add'>+						    alc_headset_btn_callback);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+		if (!hp_pin || snd_hda_jack_bind_keymap(codec, 0x55,</div><div class='add'>+							alc_headset_btn_keymap,</div><div class='add'>+							hp_pin))</div><div class='add'>+			snd_hda_jack_add_kctl(codec, 0x55, "Headset Jack",</div><div class='add'>+					      false, SND_JACK_HEADSET,</div><div class='add'>+					      alc_headset_btn_keymap);</div><div class='add'>+</div><div class='add'>+		alc_enable_headset_jack_key(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)</div><div class='add'>+{</div><div class='add'>+	alc_update_coef_idx(codec, 0x04, 1 &lt;&lt; 11, power_up ? (1 &lt;&lt; 11) : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB)</div><div class='add'>+		alc269vb_toggle_power_output(codec, 0);</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB &amp;&amp;</div><div class='add'>+			(alc_get_coef0(codec) &amp; 0x00ff) == 0x018) {</div><div class='add'>+		msleep(150);</div><div class='add'>+	}</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc282_coefs[] = {</div><div class='add'>+	WRITE_COEF(0x03, 0x0002), /* Power Down Control */</div><div class='add'>+	UPDATE_COEF(0x05, 0xff3f, 0x0700), /* FIFO and filter clock */</div><div class='add'>+	WRITE_COEF(0x07, 0x0200), /* DMIC control */</div><div class='add'>+	UPDATE_COEF(0x06, 0x00f0, 0), /* Analog clock */</div><div class='add'>+	UPDATE_COEF(0x08, 0xfffc, 0x0c2c), /* JD */</div><div class='add'>+	WRITE_COEF(0x0a, 0xcccc), /* JD offset1 */</div><div class='add'>+	WRITE_COEF(0x0b, 0xcccc), /* JD offset2 */</div><div class='add'>+	WRITE_COEF(0x0e, 0x6e00), /* LDO1/2/3, DAC/ADC */</div><div class='add'>+	UPDATE_COEF(0x0f, 0xf800, 0x1000), /* JD */</div><div class='add'>+	UPDATE_COEF(0x10, 0xfc00, 0x0c00), /* Capless */</div><div class='add'>+	WRITE_COEF(0x6f, 0x0), /* Class D test 4 */</div><div class='add'>+	UPDATE_COEF(0x0c, 0xfe00, 0), /* IO power down directly */</div><div class='add'>+	WRITE_COEF(0x34, 0xa0c0), /* ANC */</div><div class='add'>+	UPDATE_COEF(0x16, 0x0008, 0), /* AGC MUX */</div><div class='add'>+	UPDATE_COEF(0x1d, 0x00e0, 0), /* DAC simple content protection */</div><div class='add'>+	UPDATE_COEF(0x1f, 0x00e0, 0), /* ADC simple content protection */</div><div class='add'>+	WRITE_COEF(0x21, 0x8804), /* DAC ADC Zero Detection */</div><div class='add'>+	WRITE_COEF(0x63, 0x2902), /* PLL */</div><div class='add'>+	WRITE_COEF(0x68, 0xa080), /* capless control 2 */</div><div class='add'>+	WRITE_COEF(0x69, 0x3400), /* capless control 3 */</div><div class='add'>+	WRITE_COEF(0x6a, 0x2f3e), /* capless control 4 */</div><div class='add'>+	WRITE_COEF(0x6b, 0x0), /* capless control 5 */</div><div class='add'>+	UPDATE_COEF(0x6d, 0x0fff, 0x0900), /* class D test 2 */</div><div class='add'>+	WRITE_COEF(0x6e, 0x110a), /* class D test 3 */</div><div class='add'>+	UPDATE_COEF(0x70, 0x00f8, 0x00d8), /* class D test 5 */</div><div class='add'>+	WRITE_COEF(0x71, 0x0014), /* class D test 6 */</div><div class='add'>+	WRITE_COEF(0x72, 0xc2ba), /* classD OCP */</div><div class='add'>+	UPDATE_COEF(0x77, 0x0f80, 0), /* classD pure DC test */</div><div class='add'>+	WRITE_COEF(0x6c, 0xfc06), /* Class D amp control */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc282_restore_default_value(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc_process_coef_fw(codec, alc282_coefs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc282_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+	int coef78;</div><div class='add'>+</div><div class='add'>+	alc282_restore_default_value(codec);</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		return;</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	coef78 = alc_read_coef_idx(codec, 0x78);</div><div class='add'>+</div><div class='add'>+	/* Index 0x78 Direct Drive HP AMP LPM Control 1 */</div><div class='add'>+	/* Headphone capless set to high power mode */</div><div class='add'>+	alc_write_coef_idx(codec, 0x78, 0x9004);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(85);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+	/* Headphone capless set to normal mode */</div><div class='add'>+	alc_write_coef_idx(codec, 0x78, coef78);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc282_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+	int coef78;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin) {</div><div class='add'>+		alc269_shutup(codec);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	coef78 = alc_read_coef_idx(codec, 0x78);</div><div class='add'>+	alc_write_coef_idx(codec, 0x78, 0x9004);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(85);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_shutup_pins)</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+	alc_write_coef_idx(codec, 0x78, coef78);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc283_coefs[] = {</div><div class='add'>+	WRITE_COEF(0x03, 0x0002), /* Power Down Control */</div><div class='add'>+	UPDATE_COEF(0x05, 0xff3f, 0x0700), /* FIFO and filter clock */</div><div class='add'>+	WRITE_COEF(0x07, 0x0200), /* DMIC control */</div><div class='add'>+	UPDATE_COEF(0x06, 0x00f0, 0), /* Analog clock */</div><div class='add'>+	UPDATE_COEF(0x08, 0xfffc, 0x0c2c), /* JD */</div><div class='add'>+	WRITE_COEF(0x0a, 0xcccc), /* JD offset1 */</div><div class='add'>+	WRITE_COEF(0x0b, 0xcccc), /* JD offset2 */</div><div class='add'>+	WRITE_COEF(0x0e, 0x6fc0), /* LDO1/2/3, DAC/ADC */</div><div class='add'>+	UPDATE_COEF(0x0f, 0xf800, 0x1000), /* JD */</div><div class='add'>+	UPDATE_COEF(0x10, 0xfc00, 0x0c00), /* Capless */</div><div class='add'>+	WRITE_COEF(0x3a, 0x0), /* Class D test 4 */</div><div class='add'>+	UPDATE_COEF(0x0c, 0xfe00, 0x0), /* IO power down directly */</div><div class='add'>+	WRITE_COEF(0x22, 0xa0c0), /* ANC */</div><div class='add'>+	UPDATE_COEFEX(0x53, 0x01, 0x000f, 0x0008), /* AGC MUX */</div><div class='add'>+	UPDATE_COEF(0x1d, 0x00e0, 0), /* DAC simple content protection */</div><div class='add'>+	UPDATE_COEF(0x1f, 0x00e0, 0), /* ADC simple content protection */</div><div class='add'>+	WRITE_COEF(0x21, 0x8804), /* DAC ADC Zero Detection */</div><div class='add'>+	WRITE_COEF(0x2e, 0x2902), /* PLL */</div><div class='add'>+	WRITE_COEF(0x33, 0xa080), /* capless control 2 */</div><div class='add'>+	WRITE_COEF(0x34, 0x3400), /* capless control 3 */</div><div class='add'>+	WRITE_COEF(0x35, 0x2f3e), /* capless control 4 */</div><div class='add'>+	WRITE_COEF(0x36, 0x0), /* capless control 5 */</div><div class='add'>+	UPDATE_COEF(0x38, 0x0fff, 0x0900), /* class D test 2 */</div><div class='add'>+	WRITE_COEF(0x39, 0x110a), /* class D test 3 */</div><div class='add'>+	UPDATE_COEF(0x3b, 0x00f8, 0x00d8), /* class D test 5 */</div><div class='add'>+	WRITE_COEF(0x3c, 0x0014), /* class D test 6 */</div><div class='add'>+	WRITE_COEF(0x3d, 0xc2ba), /* classD OCP */</div><div class='add'>+	UPDATE_COEF(0x42, 0x0f80, 0x0), /* classD pure DC test */</div><div class='add'>+	WRITE_COEF(0x49, 0x0), /* test mode */</div><div class='add'>+	UPDATE_COEF(0x40, 0xf800, 0x9800), /* Class D DC enable */</div><div class='add'>+	UPDATE_COEF(0x42, 0xf000, 0x2000), /* DC offset */</div><div class='add'>+	WRITE_COEF(0x37, 0xfc06), /* Class D amp control */</div><div class='add'>+	UPDATE_COEF(0x1b, 0x8000, 0), /* HP JD control */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc283_restore_default_value(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc_process_coef_fw(codec, alc283_coefs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc283_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	alc283_restore_default_value(codec);</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msleep(30);</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	/* Index 0x43 Direct Drive HP AMP LPM Control 1 */</div><div class='add'>+	/* Headphone capless set to high power mode */</div><div class='add'>+	alc_write_coef_idx(codec, 0x43, 0x9004);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(85);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(85);</div><div class='add'>+	/* Index 0x46 Combo jack auto switch control 2 */</div><div class='add'>+	/* 3k pull low control for Headset jack. */</div><div class='add'>+	alc_update_coef_idx(codec, 0x46, 3 &lt;&lt; 12, 0);</div><div class='add'>+	/* Headphone capless set to normal mode */</div><div class='add'>+	alc_write_coef_idx(codec, 0x43, 0x9614);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc283_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin) {</div><div class='add'>+		alc269_shutup(codec);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	alc_write_coef_idx(codec, 0x43, 0x9004);</div><div class='add'>+</div><div class='add'>+	/*depop hp during suspend*/</div><div class='add'>+	alc_write_coef_idx(codec, 0x06, 0x2100);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_shutup_pins)</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+	alc_update_coef_idx(codec, 0x46, 0, 3 &lt;&lt; 12);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense)</div><div class='add'>+		msleep(100);</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+	alc_write_coef_idx(codec, 0x43, 0x9614);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;ultra_low_power) {</div><div class='add'>+		alc_update_coef_idx(codec, 0x03, 1&lt;&lt;1, 1&lt;&lt;1);</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 3&lt;&lt;2, 3&lt;&lt;2);</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 7&lt;&lt;4, 0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x3b, 1&lt;&lt;15, 0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x0e, 7&lt;&lt;6, 7&lt;&lt;6);</div><div class='add'>+		msleep(30);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		hp_pin = 0x21;</div><div class='add'>+</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */</div><div class='add'>+	}</div><div class='add'>+	alc_update_coef_idx(codec, 0x46, 3 &lt;&lt; 12, 0);</div><div class='add'>+	alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 1 &lt;&lt; 15); /* Clear bit */</div><div class='add'>+	alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 0 &lt;&lt; 15);</div><div class='add'>+	/*</div><div class='add'>+	 * Expose headphone mic (or possibly Line In on some machines) instead</div><div class='add'>+	 * of PC Beep on 1Ah, and disable 1Ah loopback for all outputs. See</div><div class='add'>+	 * Documentation/sound/hd-audio/realtek-pc-beep.rst for details of</div><div class='add'>+	 * this register.</div><div class='add'>+	 */</div><div class='add'>+	alc_write_coef_idx(codec, 0x36, 0x5757);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		hp_pin = 0x21;</div><div class='add'>+</div><div class='add'>+	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */</div><div class='add'>+</div><div class='add'>+	/* 3k pull low control for Headset jack. */</div><div class='add'>+	/* NOTE: call this before clearing the pin, otherwise codec stalls */</div><div class='add'>+	/* If disable 3k pulldown control for alc257, the Mic detection will not work correctly</div><div class='add'>+	 * when booting with headset plugged. So skip setting it for the codec alc257</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;en_3kpull_low)</div><div class='add'>+		alc_update_coef_idx(codec, 0x46, 0, 3 &lt;&lt; 12);</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (!spec-&gt;no_shutup_pins)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+	if (spec-&gt;ultra_low_power) {</div><div class='add'>+		msleep(50);</div><div class='add'>+		alc_update_coef_idx(codec, 0x03, 1&lt;&lt;1, 0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 7&lt;&lt;4, 7&lt;&lt;4);</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 3&lt;&lt;2, 0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x3b, 1&lt;&lt;15, 1&lt;&lt;15);</div><div class='add'>+		alc_update_coef_idx(codec, 0x0e, 7&lt;&lt;6, 0);</div><div class='add'>+		msleep(30);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_hp_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	int i, val;</div><div class='add'>+	int coef38, coef0d, coef36;</div><div class='add'>+</div><div class='add'>+	alc_write_coefex_idx(codec, 0x58, 0x00, 0x1888); /* write default value */</div><div class='add'>+	alc_update_coef_idx(codec, 0x4a, 1&lt;&lt;15, 1&lt;&lt;15); /* Reset HP JD */</div><div class='add'>+	coef38 = alc_read_coef_idx(codec, 0x38); /* Amp control */</div><div class='add'>+	coef0d = alc_read_coef_idx(codec, 0x0d); /* Digital Misc control */</div><div class='add'>+	coef36 = alc_read_coef_idx(codec, 0x36); /* Passthrough Control */</div><div class='add'>+	alc_update_coef_idx(codec, 0x38, 1&lt;&lt;4, 0x0);</div><div class='add'>+	alc_update_coef_idx(codec, 0x0d, 0x110, 0x0);</div><div class='add'>+</div><div class='add'>+	alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);</div><div class='add'>+</div><div class='add'>+	if (hp_pin)</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	msleep(130);</div><div class='add'>+	alc_update_coef_idx(codec, 0x36, 1&lt;&lt;14, 1&lt;&lt;14);</div><div class='add'>+	alc_update_coef_idx(codec, 0x36, 1&lt;&lt;13, 0x0);</div><div class='add'>+</div><div class='add'>+	if (hp_pin)</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+	msleep(10);</div><div class='add'>+	alc_write_coef_idx(codec, 0x67, 0x0); /* Set HP depop to manual mode */</div><div class='add'>+	alc_write_coefex_idx(codec, 0x58, 0x00, 0x7880);</div><div class='add'>+	alc_write_coefex_idx(codec, 0x58, 0x0f, 0xf049);</div><div class='add'>+	alc_update_coefex_idx(codec, 0x58, 0x03, 0x00f0, 0x00c0);</div><div class='add'>+</div><div class='add'>+	alc_write_coefex_idx(codec, 0x58, 0x00, 0xf888); /* HP depop procedure start */</div><div class='add'>+	val = alc_read_coefex_idx(codec, 0x58, 0x00);</div><div class='add'>+	for (i = 0; i &lt; 20 &amp;&amp; val &amp; 0x8000; i++) {</div><div class='add'>+		msleep(50);</div><div class='add'>+		val = alc_read_coefex_idx(codec, 0x58, 0x00);</div><div class='add'>+	} /* Wait for depop procedure finish  */</div><div class='add'>+</div><div class='add'>+	alc_write_coefex_idx(codec, 0x58, 0x00, val); /* write back the result */</div><div class='add'>+	alc_update_coef_idx(codec, 0x38, 1&lt;&lt;4, coef38);</div><div class='add'>+	alc_update_coef_idx(codec, 0x0d, 0x110, coef0d);</div><div class='add'>+	alc_update_coef_idx(codec, 0x36, 3&lt;&lt;13, coef36);</div><div class='add'>+</div><div class='add'>+	msleep(50);</div><div class='add'>+	alc_update_coef_idx(codec, 0x4a, 1&lt;&lt;15, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc225_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp1_pin_sense, hp2_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;ultra_low_power) {</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 0x0f &lt;&lt; 2, 3&lt;&lt;2);</div><div class='add'>+		alc_update_coef_idx(codec, 0x0e, 7&lt;&lt;6, 7&lt;&lt;6);</div><div class='add'>+		alc_update_coef_idx(codec, 0x33, 1&lt;&lt;11, 0);</div><div class='add'>+		msleep(30);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_variant != ALC269_TYPE_ALC287 &amp;&amp;</div><div class='add'>+		spec-&gt;codec_variant != ALC269_TYPE_ALC245)</div><div class='add'>+		/* required only at boot or S3 and S4 resume time */</div><div class='add'>+		if (!spec-&gt;done_hp_init ||</div><div class='add'>+			is_s3_resume(codec) ||</div><div class='add'>+			is_s4_resume(codec)) {</div><div class='add'>+			alc285_hp_init(codec);</div><div class='add'>+			spec-&gt;done_hp_init = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		hp_pin = 0x21;</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);</div><div class='add'>+</div><div class='add'>+	if (hp1_pin_sense || hp2_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x16, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x16, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 3 &lt;&lt; 10, 0);</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc225_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp1_pin_sense, hp2_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		hp_pin = 0x21;</div><div class='add'>+</div><div class='add'>+	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	hp2_pin_sense = snd_hda_jack_detect(codec, 0x16);</div><div class='add'>+</div><div class='add'>+	if (hp1_pin_sense || hp2_pin_sense) {</div><div class='add'>+		alc_disable_headset_jack_key(codec);</div><div class='add'>+		/* 3k pull low control for Headset jack. */</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 0, 3 &lt;&lt; 10);</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x16, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x16, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 3 &lt;&lt; 10, 0);</div><div class='add'>+		alc_enable_headset_jack_key(codec);</div><div class='add'>+	}</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+	if (spec-&gt;ultra_low_power) {</div><div class='add'>+		msleep(50);</div><div class='add'>+		alc_update_coef_idx(codec, 0x08, 0x0f &lt;&lt; 2, 0x0c &lt;&lt; 2);</div><div class='add'>+		alc_update_coef_idx(codec, 0x0e, 7&lt;&lt;6, 0);</div><div class='add'>+		alc_update_coef_idx(codec, 0x33, 1&lt;&lt;11, 1&lt;&lt;11);</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 3&lt;&lt;4, 2&lt;&lt;4);</div><div class='add'>+		msleep(30);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc222_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp1_pin_sense, hp2_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);</div><div class='add'>+</div><div class='add'>+	if (hp1_pin_sense || hp2_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x14, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x14, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc222_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp1_pin_sense, hp2_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		hp_pin = 0x21;</div><div class='add'>+</div><div class='add'>+	hp1_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+	hp2_pin_sense = snd_hda_jack_detect(codec, 0x14);</div><div class='add'>+</div><div class='add'>+	if (hp1_pin_sense || hp2_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x14, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (hp1_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+		if (hp2_pin_sense)</div><div class='add'>+			snd_hda_codec_write(codec, 0x14, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_default_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msleep(30);</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_default_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	bool hp_pin_sense;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin) {</div><div class='add'>+		alc269_shutup(codec);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);</div><div class='add'>+</div><div class='add'>+	if (hp_pin_sense) {</div><div class='add'>+		msleep(2);</div><div class='add'>+</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+</div><div class='add'>+		if (!spec-&gt;no_shutup_pins)</div><div class='add'>+			snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+					    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+		msleep(75);</div><div class='add'>+	}</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc294_hp_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+	int i, val;</div><div class='add'>+</div><div class='add'>+	if (!hp_pin)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_shutup_pins)</div><div class='add'>+		snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+</div><div class='add'>+	alc_update_coef_idx(codec, 0x6f, 0x000f, 0);/* Set HP depop to manual mode */</div><div class='add'>+	alc_update_coefex_idx(codec, 0x58, 0x00, 0x8000, 0x8000); /* HP depop procedure start */</div><div class='add'>+</div><div class='add'>+	/* Wait for depop procedure finish  */</div><div class='add'>+	val = alc_read_coefex_idx(codec, 0x58, 0x01);</div><div class='add'>+	for (i = 0; i &lt; 20 &amp;&amp; val &amp; 0x0080; i++) {</div><div class='add'>+		msleep(50);</div><div class='add'>+		val = alc_read_coefex_idx(codec, 0x58, 0x01);</div><div class='add'>+	}</div><div class='add'>+	/* Set HP depop to auto mode */</div><div class='add'>+	alc_update_coef_idx(codec, 0x6f, 0x000f, 0x000b);</div><div class='add'>+	msleep(50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc294_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* required only at boot or S4 resume time */</div><div class='add'>+	if (!spec-&gt;done_hp_init || is_s4_resume(codec)) {</div><div class='add'>+		alc294_hp_init(codec);</div><div class='add'>+		spec-&gt;done_hp_init = true;</div><div class='add'>+	}</div><div class='add'>+	alc_default_init(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc5505_coef_set(struct hda_codec *codec, unsigned int index_reg,</div><div class='add'>+			     unsigned int val)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, 0x51, 0, AC_VERB_SET_COEF_INDEX, index_reg &gt;&gt; 1);</div><div class='add'>+	snd_hda_codec_write(codec, 0x51, 0, AC_VERB_SET_PROC_COEF, val &amp; 0xffff); /* LSB */</div><div class='add'>+	snd_hda_codec_write(codec, 0x51, 0, AC_VERB_SET_PROC_COEF, val &gt;&gt; 16); /* MSB */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alc5505_coef_get(struct hda_codec *codec, unsigned int index_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x51, 0, AC_VERB_SET_COEF_INDEX, index_reg &gt;&gt; 1);</div><div class='add'>+	val = snd_hda_codec_read(codec, 0x51, 0, AC_VERB_GET_PROC_COEF, 0)</div><div class='add'>+		&amp; 0xffff;</div><div class='add'>+	val |= snd_hda_codec_read(codec, 0x51, 0, AC_VERB_GET_PROC_COEF, 0)</div><div class='add'>+		&lt;&lt; 16;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc5505_dsp_halt(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	alc5505_coef_set(codec, 0x3000, 0x000c); /* DSP CPU stop */</div><div class='add'>+	alc5505_coef_set(codec, 0x880c, 0x0008); /* DDR enter self refresh */</div><div class='add'>+	alc5505_coef_set(codec, 0x61c0, 0x11110080); /* Clock control for PLL and CPU */</div><div class='add'>+	alc5505_coef_set(codec, 0x6230, 0xfc0d4011); /* Disable Input OP */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b4, 0x040a2b03); /* Stop PLL2 */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b0, 0x00005b17); /* Stop PLL1 */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x04133303); /* Stop PLL3 */</div><div class='add'>+	val = alc5505_coef_get(codec, 0x6220);</div><div class='add'>+	alc5505_coef_set(codec, 0x6220, (val | 0x3000)); /* switch Ringbuffer clock to DBUS clock */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc5505_dsp_back_from_halt(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x04133302);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b0, 0x00005b16);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b4, 0x040a2b02);</div><div class='add'>+	alc5505_coef_set(codec, 0x6230, 0xf80d4011);</div><div class='add'>+	alc5505_coef_set(codec, 0x6220, 0x2002010f);</div><div class='add'>+	alc5505_coef_set(codec, 0x880c, 0x00000004);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc5505_dsp_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	alc5505_dsp_halt(codec);</div><div class='add'>+	alc5505_dsp_back_from_halt(codec);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b0, 0x5b14); /* PLL1 control */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b0, 0x5b16);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b4, 0x04132b00); /* PLL2 control */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b4, 0x04132b02);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x041f3300); /* PLL3 control*/</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x041f3302);</div><div class='add'>+	snd_hda_codec_write(codec, 0x51, 0, AC_VERB_SET_CODEC_RESET, 0); /* Function reset */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x041b3302);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x04173302);</div><div class='add'>+	alc5505_coef_set(codec, 0x61b8, 0x04163302);</div><div class='add'>+	alc5505_coef_set(codec, 0x8800, 0x348b328b); /* DRAM control */</div><div class='add'>+	alc5505_coef_set(codec, 0x8808, 0x00020022); /* DRAM control */</div><div class='add'>+	alc5505_coef_set(codec, 0x8818, 0x00000400); /* DRAM control */</div><div class='add'>+</div><div class='add'>+	val = alc5505_coef_get(codec, 0x6200) &gt;&gt; 16; /* Read revision ID */</div><div class='add'>+	if (val &lt;= 3)</div><div class='add'>+		alc5505_coef_set(codec, 0x6220, 0x2002010f); /* I/O PAD Configuration */</div><div class='add'>+	else</div><div class='add'>+		alc5505_coef_set(codec, 0x6220, 0x6002018f);</div><div class='add'>+</div><div class='add'>+	alc5505_coef_set(codec, 0x61ac, 0x055525f0); /**/</div><div class='add'>+	alc5505_coef_set(codec, 0x61c0, 0x12230080); /* Clock control */</div><div class='add'>+	alc5505_coef_set(codec, 0x61b4, 0x040e2b02); /* PLL2 control */</div><div class='add'>+	alc5505_coef_set(codec, 0x61bc, 0x010234f8); /* OSC Control */</div><div class='add'>+	alc5505_coef_set(codec, 0x880c, 0x00000004); /* DRAM Function control */</div><div class='add'>+	alc5505_coef_set(codec, 0x880c, 0x00000003);</div><div class='add'>+	alc5505_coef_set(codec, 0x880c, 0x00000010);</div><div class='add'>+</div><div class='add'>+#ifdef HALT_REALTEK_ALC5505</div><div class='add'>+	alc5505_dsp_halt(codec);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef HALT_REALTEK_ALC5505</div><div class='add'>+#define alc5505_dsp_suspend(codec)	do { } while (0) /* NOP */</div><div class='add'>+#define alc5505_dsp_resume(codec)	do { } while (0) /* NOP */</div><div class='add'>+#else</div><div class='add'>+#define alc5505_dsp_suspend(codec)	alc5505_dsp_halt(codec)</div><div class='add'>+#define alc5505_dsp_resume(codec)	alc5505_dsp_back_from_halt(codec)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int alc269_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;has_alc5505_dsp)</div><div class='add'>+		alc5505_dsp_suspend(codec);</div><div class='add'>+</div><div class='add'>+	return alc_suspend(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alc269_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB)</div><div class='add'>+		alc269vb_toggle_power_output(codec, 0);</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB &amp;&amp;</div><div class='add'>+			(alc_get_coef0(codec) &amp; 0x00ff) == 0x018) {</div><div class='add'>+		msleep(150);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_init(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB)</div><div class='add'>+		alc269vb_toggle_power_output(codec, 1);</div><div class='add'>+	if (spec-&gt;codec_variant == ALC269_TYPE_ALC269VB &amp;&amp;</div><div class='add'>+			(alc_get_coef0(codec) &amp; 0x00ff) == 0x017) {</div><div class='add'>+		msleep(200);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+	hda_call_check_power_status(codec, 0x01);</div><div class='add'>+</div><div class='add'>+	/* on some machine, the BIOS will clear the codec gpio data when enter</div><div class='add'>+	 * suspend, and won't restore the data after resume, so we restore it</div><div class='add'>+	 * in the driver.</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;gpio_data)</div><div class='add'>+		alc_write_gpio_data(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;has_alc5505_dsp)</div><div class='add'>+		alc5505_dsp_resume(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,</div><div class='add'>+						 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;parse_flags = HDA_PINCFG_NO_HP_FIXUP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_pincfg_U7x7_headset_mic(struct hda_codec *codec,</div><div class='add'>+						 const struct hda_fixup *fix,</div><div class='add'>+						 int action)</div><div class='add'>+{</div><div class='add'>+	unsigned int cfg_headphone = snd_hda_codec_get_pincfg(codec, 0x21);</div><div class='add'>+	unsigned int cfg_headset_mic = snd_hda_codec_get_pincfg(codec, 0x19);</div><div class='add'>+</div><div class='add'>+	if (cfg_headphone &amp;&amp; cfg_headset_mic == 0x411111f0)</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x19,</div><div class='add'>+			(cfg_headphone &amp; ~AC_DEFCFG_DEVICE) |</div><div class='add'>+			(AC_JACK_MIC_IN &lt;&lt; AC_DEFCFG_DEVICE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hweq(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc_update_coef_idx(codec, 0x1e, 0, 0x80);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc271_fixup_dmic(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_verb verbs[] = {</div><div class='add'>+		{0x20, AC_VERB_SET_COEF_INDEX, 0x0d},</div><div class='add'>+		{0x20, AC_VERB_SET_PROC_COEF, 0x4000},</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	unsigned int cfg;</div><div class='add'>+</div><div class='add'>+	if (strcmp(codec-&gt;core.chip_name, "ALC271X") &amp;&amp;</div><div class='add'>+	    strcmp(codec-&gt;core.chip_name, "ALC269VB"))</div><div class='add'>+		return;</div><div class='add'>+	cfg = snd_hda_codec_get_pincfg(codec, 0x12);</div><div class='add'>+	if (get_defcfg_connect(cfg) == AC_JACK_PORT_FIXED)</div><div class='add'>+		snd_hda_sequence_write(codec, verbs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fix the speaker amp after resume, etc */</div><div class='add'>+static void alc269vb_fixup_aspire_e1_coef(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc_update_coef_idx(codec, 0x0d, 0x6000, 0x6000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_pcm_44k(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Due to a hardware problem on Lenovo Ideadpad, we need to</div><div class='add'>+	 * fix the sample rate of analog I/O to 44.1kHz</div><div class='add'>+	 */</div><div class='add'>+	spec-&gt;gen.stream_analog_playback = &amp;alc269_44k_pcm_analog_playback;</div><div class='add'>+	spec-&gt;gen.stream_analog_capture = &amp;alc269_44k_pcm_analog_capture;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_stereo_dmic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/* The digital-mic unit sends PDM (differential signal) instead of</div><div class='add'>+	 * the standard PCM, thus you can't record a valid mono stream as is.</div><div class='add'>+	 * Below is a workaround specific to ALC269 to control the dmic</div><div class='add'>+	 * signal source as mono.</div><div class='add'>+	 */</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc_update_coef_idx(codec, 0x07, 0, 0x80);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_quanta_automute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+</div><div class='add'>+	alc_write_coef_idx(codec, 0x0c, 0x680);</div><div class='add'>+	alc_write_coef_idx(codec, 0x0c, 0x480);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_quanta_mute(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	spec-&gt;gen.automute_hook = alc269_quanta_automute;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_x101_hp_automute_hook(struct hda_codec *codec,</div><div class='add'>+					 struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int vref;</div><div class='add'>+	msleep(200);</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+</div><div class='add'>+	vref = spec-&gt;gen.hp_jack_present ? PIN_VREF80 : 0;</div><div class='add'>+	msleep(100);</div><div class='add'>+	snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+			    vref);</div><div class='add'>+	msleep(500);</div><div class='add'>+	snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+			    vref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Magic sequence to make Huawei Matebook X right speaker working (bko#197801)</div><div class='add'>+ */</div><div class='add'>+struct hda_alc298_mbxinit {</div><div class='add'>+	unsigned char value_0x23;</div><div class='add'>+	unsigned char value_0x25;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc298_huawei_mbx_stereo_seq(struct hda_codec *codec,</div><div class='add'>+					 const struct hda_alc298_mbxinit *initval,</div><div class='add'>+					 bool first)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, 0x06, 0, AC_VERB_SET_DIGI_CONVERT_3, 0x0);</div><div class='add'>+	alc_write_coef_idx(codec, 0x26, 0xb000);</div><div class='add'>+</div><div class='add'>+	if (first)</div><div class='add'>+		snd_hda_codec_write(codec, 0x21, 0, AC_VERB_GET_PIN_SENSE, 0x0);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x6, 0, AC_VERB_SET_DIGI_CONVERT_3, 0x80);</div><div class='add'>+	alc_write_coef_idx(codec, 0x26, 0xf000);</div><div class='add'>+	alc_write_coef_idx(codec, 0x23, initval-&gt;value_0x23);</div><div class='add'>+</div><div class='add'>+	if (initval-&gt;value_0x23 != 0x1e)</div><div class='add'>+		alc_write_coef_idx(codec, 0x25, initval-&gt;value_0x25);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0x26);</div><div class='add'>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF, 0xb010);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_fixup_huawei_mbx_stereo(struct hda_codec *codec,</div><div class='add'>+					   const struct hda_fixup *fix,</div><div class='add'>+					   int action)</div><div class='add'>+{</div><div class='add'>+	/* Initialization magic */</div><div class='add'>+	static const struct hda_alc298_mbxinit dac_init[] = {</div><div class='add'>+		{0x0c, 0x00}, {0x0d, 0x00}, {0x0e, 0x00}, {0x0f, 0x00},</div><div class='add'>+		{0x10, 0x00}, {0x1a, 0x40}, {0x1b, 0x82}, {0x1c, 0x00},</div><div class='add'>+		{0x1d, 0x00}, {0x1e, 0x00}, {0x1f, 0x00},</div><div class='add'>+		{0x20, 0xc2}, {0x21, 0xc8}, {0x22, 0x26}, {0x23, 0x24},</div><div class='add'>+		{0x27, 0xff}, {0x28, 0xff}, {0x29, 0xff}, {0x2a, 0x8f},</div><div class='add'>+		{0x2b, 0x02}, {0x2c, 0x48}, {0x2d, 0x34}, {0x2e, 0x00},</div><div class='add'>+		{0x2f, 0x00},</div><div class='add'>+		{0x30, 0x00}, {0x31, 0x00}, {0x32, 0x00}, {0x33, 0x00},</div><div class='add'>+		{0x34, 0x00}, {0x35, 0x01}, {0x36, 0x93}, {0x37, 0x0c},</div><div class='add'>+		{0x38, 0x00}, {0x39, 0x00}, {0x3a, 0xf8}, {0x38, 0x80},</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	const struct hda_alc298_mbxinit *seq;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Start */</div><div class='add'>+	snd_hda_codec_write(codec, 0x06, 0, AC_VERB_SET_DIGI_CONVERT_3, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x06, 0, AC_VERB_SET_DIGI_CONVERT_3, 0x80);</div><div class='add'>+	alc_write_coef_idx(codec, 0x26, 0xf000);</div><div class='add'>+	alc_write_coef_idx(codec, 0x22, 0x31);</div><div class='add'>+	alc_write_coef_idx(codec, 0x23, 0x0b);</div><div class='add'>+	alc_write_coef_idx(codec, 0x25, 0x00);</div><div class='add'>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0x26);</div><div class='add'>+	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF, 0xb010);</div><div class='add'>+</div><div class='add'>+	for (seq = dac_init; seq-&gt;value_0x23; seq++)</div><div class='add'>+		alc298_huawei_mbx_stereo_seq(codec, seq, seq == dac_init);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_x101_headset_mic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc269_x101_hp_automute_hook;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_update_vref_led(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+				bool polarity, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned int pinval;</div><div class='add'>+</div><div class='add'>+	if (!pin)</div><div class='add'>+		return;</div><div class='add'>+	if (polarity)</div><div class='add'>+		on = !on;</div><div class='add'>+	pinval = snd_hda_codec_get_pin_target(codec, pin);</div><div class='add'>+	pinval &amp;= ~AC_PINCTL_VREFEN;</div><div class='add'>+	pinval |= on ? AC_PINCTL_VREF_80 : AC_PINCTL_VREF_HIZ;</div><div class='add'>+	/* temporarily power up/down for setting VREF */</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, pin, pinval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update mute-LED according to the speaker mute state via mic VREF pin */</div><div class='add'>+static int vref_mute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_vref_led(codec, spec-&gt;mute_led_nid,</div><div class='add'>+			    spec-&gt;mute_led_polarity, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make sure the led works even in runtime suspend */</div><div class='add'>+static unsigned int led_power_filter(struct hda_codec *codec,</div><div class='add'>+						  hda_nid_t nid,</div><div class='add'>+						  unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (power_state != AC_PWRST_D3 || nid == 0 ||</div><div class='add'>+	    (nid != spec-&gt;mute_led_nid &amp;&amp; nid != spec-&gt;cap_mute_led_nid))</div><div class='add'>+		return power_state;</div><div class='add'>+</div><div class='add'>+	/* Set pin ctl again, it might have just been set to 0 */</div><div class='add'>+	snd_hda_set_pin_ctl(codec, nid,</div><div class='add'>+			    snd_hda_codec_get_pin_target(codec, nid));</div><div class='add'>+</div><div class='add'>+	return snd_hda_gen_path_power_filter(codec, nid, power_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_mute_led(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct dmi_device *dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {</div><div class='add'>+		int pol, pin;</div><div class='add'>+		if (sscanf(dev-&gt;name, "HP_Mute_LED_%d_%x", &amp;pol, &amp;pin) != 2)</div><div class='add'>+			continue;</div><div class='add'>+		if (pin &lt; 0x0a || pin &gt;= 0x10)</div><div class='add'>+			break;</div><div class='add'>+		spec-&gt;mute_led_polarity = pol;</div><div class='add'>+		spec-&gt;mute_led_nid = pin - 0x0a + 0x18;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, vref_mute_led_set);</div><div class='add'>+		codec-&gt;power_filter = led_power_filter;</div><div class='add'>+		codec_dbg(codec,</div><div class='add'>+			  "Detected mute LED for %x:%d\n", spec-&gt;mute_led_nid,</div><div class='add'>+			   spec-&gt;mute_led_polarity);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_mute_led_micx(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_nid = pin;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, vref_mute_led_set);</div><div class='add'>+		codec-&gt;power_filter = led_power_filter;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_mute_led_mic1(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x18);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x19);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_mute_led_mic3(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x1b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x02, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x08, 0x10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x04, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc286_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x02, 0x20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x10, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc245_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;micmute_led_polarity = 1;</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0, 0x04);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off mic-mute LED per capture hook via VREF change */</div><div class='add'>+static int vref_micmute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+				enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_vref_led(codec, spec-&gt;cap_mute_led_nid,</div><div class='add'>+			    spec-&gt;micmute_led_polarity, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_gpio_mic1_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x08, 0);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* Like hp_gpio_mic1_led, but also needs GPIO4 low to</div><div class='add'>+		 * enable headphone amp</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x10;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x10;</div><div class='add'>+		spec-&gt;cap_mute_led_nid = 0x18;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, vref_micmute_led_set);</div><div class='add'>+		codec-&gt;power_filter = led_power_filter;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc280_fixup_hp_gpio4(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x08, 0);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;cap_mute_led_nid = 0x18;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, vref_micmute_led_set);</div><div class='add'>+		codec-&gt;power_filter = led_power_filter;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HP Spectre x360 14 model needs a unique workaround for enabling the amp;</div><div class='add'>+ * it needs to toggle the GPIO0 once on and off at each time (bko#210633)</div><div class='add'>+ */</div><div class='add'>+static void alc245_fixup_hp_x360_amp(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gpio_mask |= 0x01;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x01;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* need to toggle GPIO to enable the amp */</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, true);</div><div class='add'>+		msleep(100);</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* toggle GPIO2 at each time stream is started; we use PREPARE state instead */</div><div class='add'>+static void alc274_hp_envy_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				    struct hda_codec *codec,</div><div class='add'>+				    struct snd_pcm_substream *substream,</div><div class='add'>+				    int action)</div><div class='add'>+{</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		alc_update_gpio_data(codec, 0x04, true);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		alc_update_gpio_data(codec, 0x04, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc274_fixup_hp_envy_gpio(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix,</div><div class='add'>+				      int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		spec-&gt;gpio_mask |= 0x04;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x04;</div><div class='add'>+		spec-&gt;gen.pcm_playback_hook = alc274_hp_envy_pcm_hook;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_update_coef_led(struct hda_codec *codec,</div><div class='add'>+				struct alc_coef_led *led,</div><div class='add'>+				bool polarity, bool on)</div><div class='add'>+{</div><div class='add'>+	if (polarity)</div><div class='add'>+		on = !on;</div><div class='add'>+	/* temporarily power up/down for setting COEF bit */</div><div class='add'>+	alc_update_coef_idx(codec, led-&gt;idx, led-&gt;mask,</div><div class='add'>+			    on ? led-&gt;on : led-&gt;off);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update mute-LED according to the speaker mute state via COEF bit */</div><div class='add'>+static int coef_mute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_coef_led(codec, &amp;spec-&gt;mute_led_coef,</div><div class='add'>+			    spec-&gt;mute_led_polarity, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_mute_led_coefbit(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0x0b;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 1 &lt;&lt; 3;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 1 &lt;&lt; 3;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 0;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_mute_led_coefbit(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0x34;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 1 &lt;&lt; 5;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 1 &lt;&lt; 5;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_mute_led_coefbit2(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0x07;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 1;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 1;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 0;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc245_fixup_hp_mute_led_coefbit(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0x0b;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 3 &lt;&lt; 2;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 2 &lt;&lt; 2;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 1 &lt;&lt; 2;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc245_fixup_hp_mute_led_v1_coefbit(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0x0b;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 3 &lt;&lt; 2;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 1 &lt;&lt; 3;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 0;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off mic-mute LED per capture hook by coef bit */</div><div class='add'>+static int coef_micmute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+				enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_coef_led(codec, &amp;spec-&gt;mic_led_coef,</div><div class='add'>+			    spec-&gt;micmute_led_polarity, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_coef_micmute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mic_led_coef.idx = 0x19;</div><div class='add'>+		spec-&gt;mic_led_coef.mask = 1 &lt;&lt; 13;</div><div class='add'>+		spec-&gt;mic_led_coef.on = 1 &lt;&lt; 13;</div><div class='add'>+		spec-&gt;mic_led_coef.off = 0;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_gpio_micmute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;micmute_led_polarity = 1;</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0, 0x04);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_coef_micmute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mic_led_coef.idx = 0x35;</div><div class='add'>+		spec-&gt;mic_led_coef.mask = 3 &lt;&lt; 2;</div><div class='add'>+		spec-&gt;mic_led_coef.on = 2 &lt;&lt; 2;</div><div class='add'>+		spec-&gt;mic_led_coef.off = 1 &lt;&lt; 2;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, coef_micmute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc295_fixup_hp_mute_led_coefbit11(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 0;</div><div class='add'>+		spec-&gt;mute_led_coef.idx = 0xb;</div><div class='add'>+		spec-&gt;mute_led_coef.mask = 3 &lt;&lt; 3;</div><div class='add'>+		spec-&gt;mute_led_coef.on = 1 &lt;&lt; 3;</div><div class='add'>+		spec-&gt;mute_led_coef.off = 1 &lt;&lt; 4;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_mute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc285_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc285_fixup_hp_coef_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_spectre_x360_mute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc285_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc285_fixup_hp_gpio_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_mute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc236_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc236_fixup_hp_coef_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_micmute_led_vref(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;cap_mute_led_nid = 0x1a;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, vref_micmute_led_set);</div><div class='add'>+		codec-&gt;power_filter = led_power_filter;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc236_fixup_hp_mute_led_micmute_vref(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc236_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc236_fixup_hp_micmute_led_vref(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void alc298_samsung_write_coef_pack(struct hda_codec *codec,</div><div class='add'>+						  const unsigned short coefs[2])</div><div class='add'>+{</div><div class='add'>+	alc_write_coef_idx(codec, 0x23, coefs[0]);</div><div class='add'>+	alc_write_coef_idx(codec, 0x25, coefs[1]);</div><div class='add'>+	alc_write_coef_idx(codec, 0x26, 0xb011);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct alc298_samsung_amp_desc {</div><div class='add'>+	unsigned char nid;</div><div class='add'>+	unsigned short init_seq[2][2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc298_fixup_samsung_amp(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	static const unsigned short init_seq[][2] = {</div><div class='add'>+		{ 0x19, 0x00 }, { 0x20, 0xc0 }, { 0x22, 0x44 }, { 0x23, 0x08 },</div><div class='add'>+		{ 0x24, 0x85 }, { 0x25, 0x41 }, { 0x35, 0x40 }, { 0x36, 0x01 },</div><div class='add'>+		{ 0x38, 0x81 }, { 0x3a, 0x03 }, { 0x3b, 0x81 }, { 0x40, 0x3e },</div><div class='add'>+		{ 0x41, 0x07 }, { 0x400, 0x1 }</div><div class='add'>+	};</div><div class='add'>+	static const struct alc298_samsung_amp_desc amps[] = {</div><div class='add'>+		{ 0x3a, { { 0x18, 0x1 }, { 0x26, 0x0 } } },</div><div class='add'>+		{ 0x39, { { 0x18, 0x2 }, { 0x26, 0x1 } } }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(amps); i++) {</div><div class='add'>+		alc_write_coef_idx(codec, 0x22, amps[i].nid);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(amps[i].init_seq); j++)</div><div class='add'>+			alc298_samsung_write_coef_pack(codec, amps[i].init_seq[j]);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(init_seq); j++)</div><div class='add'>+			alc298_samsung_write_coef_pack(codec, init_seq[j]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct alc298_samsung_v2_amp_desc {</div><div class='add'>+	unsigned short nid;</div><div class='add'>+	int init_seq_size;</div><div class='add'>+	unsigned short init_seq[18][2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct alc298_samsung_v2_amp_desc</div><div class='add'>+alc298_samsung_v2_amp_desc_tbl[] = {</div><div class='add'>+	{ 0x38, 18, {</div><div class='add'>+		{ 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },</div><div class='add'>+		{ 0x201b, 0x0001 }, { 0x201d, 0x0001 }, { 0x201f, 0x00fe },</div><div class='add'>+		{ 0x2021, 0x0000 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },</div><div class='add'>+		{ 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },</div><div class='add'>+		{ 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x2399, 0x0003 },</div><div class='add'>+		{ 0x23a4, 0x00b5 }, { 0x23a5, 0x0001 }, { 0x23ba, 0x0094 }</div><div class='add'>+	}},</div><div class='add'>+	{ 0x39, 18, {</div><div class='add'>+		{ 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },</div><div class='add'>+		{ 0x201b, 0x0002 }, { 0x201d, 0x0002 }, { 0x201f, 0x00fd },</div><div class='add'>+		{ 0x2021, 0x0001 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },</div><div class='add'>+		{ 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },</div><div class='add'>+		{ 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x2399, 0x0003 },</div><div class='add'>+		{ 0x23a4, 0x00b5 }, { 0x23a5, 0x0001 }, { 0x23ba, 0x0094 }</div><div class='add'>+	}},</div><div class='add'>+	{ 0x3c, 15, {</div><div class='add'>+		{ 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },</div><div class='add'>+		{ 0x201b, 0x0001 }, { 0x201d, 0x0001 }, { 0x201f, 0x00fe },</div><div class='add'>+		{ 0x2021, 0x0000 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },</div><div class='add'>+		{ 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },</div><div class='add'>+		{ 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x23ba, 0x008d }</div><div class='add'>+	}},</div><div class='add'>+	{ 0x3d, 15, {</div><div class='add'>+		{ 0x23e1, 0x0000 }, { 0x2012, 0x006f }, { 0x2014, 0x0000 },</div><div class='add'>+		{ 0x201b, 0x0002 }, { 0x201d, 0x0002 }, { 0x201f, 0x00fd },</div><div class='add'>+		{ 0x2021, 0x0001 }, { 0x2022, 0x0010 }, { 0x203d, 0x0005 },</div><div class='add'>+		{ 0x203f, 0x0003 }, { 0x2050, 0x002c }, { 0x2076, 0x000e },</div><div class='add'>+		{ 0x207c, 0x004a }, { 0x2081, 0x0003 }, { 0x23ba, 0x008d }</div><div class='add'>+	}}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc298_samsung_v2_enable_amps(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const unsigned short enable_seq[][2] = {</div><div class='add'>+		{ 0x203a, 0x0081 }, { 0x23ff, 0x0001 },</div><div class='add'>+	};</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_speaker_amps; i++) {</div><div class='add'>+		alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(enable_seq); j++)</div><div class='add'>+			alc298_samsung_write_coef_pack(codec, enable_seq[j]);</div><div class='add'>+		codec_dbg(codec, "alc298_samsung_v2: Enabled speaker amp 0x%02x\n",</div><div class='add'>+				alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_samsung_v2_disable_amps(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const unsigned short disable_seq[][2] = {</div><div class='add'>+		{ 0x23ff, 0x0000 }, { 0x203a, 0x0080 },</div><div class='add'>+	};</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_speaker_amps; i++) {</div><div class='add'>+		alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(disable_seq); j++)</div><div class='add'>+			alc298_samsung_write_coef_pack(codec, disable_seq[j]);</div><div class='add'>+		codec_dbg(codec, "alc298_samsung_v2: Disabled speaker amp 0x%02x\n",</div><div class='add'>+				alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_samsung_v2_playback_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				struct hda_codec *codec,</div><div class='add'>+				struct snd_pcm_substream *substream,</div><div class='add'>+				int action)</div><div class='add'>+{</div><div class='add'>+	/* Dynamically enable/disable speaker amps before and after playback */</div><div class='add'>+	if (action == HDA_GEN_PCM_ACT_OPEN)</div><div class='add'>+		alc298_samsung_v2_enable_amps(codec);</div><div class='add'>+	if (action == HDA_GEN_PCM_ACT_CLOSE)</div><div class='add'>+		alc298_samsung_v2_disable_amps(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_samsung_v2_init_amps(struct hda_codec *codec,</div><div class='add'>+				int num_speaker_amps)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	/* Set spec's num_speaker_amps before doing anything else */</div><div class='add'>+	spec-&gt;num_speaker_amps = num_speaker_amps;</div><div class='add'>+</div><div class='add'>+	/* Disable speaker amps before init to prevent any physical damage */</div><div class='add'>+	alc298_samsung_v2_disable_amps(codec);</div><div class='add'>+</div><div class='add'>+	/* Initialize the speaker amps */</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_speaker_amps; i++) {</div><div class='add'>+		alc_write_coef_idx(codec, 0x22, alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+		for (j = 0; j &lt; alc298_samsung_v2_amp_desc_tbl[i].init_seq_size; j++) {</div><div class='add'>+			alc298_samsung_write_coef_pack(codec,</div><div class='add'>+					alc298_samsung_v2_amp_desc_tbl[i].init_seq[j]);</div><div class='add'>+		}</div><div class='add'>+		alc_write_coef_idx(codec, 0x89, 0x0);</div><div class='add'>+		codec_dbg(codec, "alc298_samsung_v2: Initialized speaker amp 0x%02x\n",</div><div class='add'>+				alc298_samsung_v2_amp_desc_tbl[i].nid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* register hook to enable speaker amps only when they are needed */</div><div class='add'>+	spec-&gt;gen.pcm_playback_hook = alc298_samsung_v2_playback_hook;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_fixup_samsung_amp_v2_2_amps(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		alc298_samsung_v2_init_amps(codec, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_fixup_samsung_amp_v2_4_amps(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		alc298_samsung_v2_init_amps(codec, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gpio2_mic_hotkey_event(struct hda_codec *codec,</div><div class='add'>+				   struct hda_jack_callback *event)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* GPIO2 just toggles on a keypress/keyrelease cycle. Therefore</div><div class='add'>+	   send both key on and key off event for every interrupt. */</div><div class='add'>+	input_report_key(spec-&gt;kb_dev, spec-&gt;alc_mute_keycode_map[ALC_KEY_MICMUTE_INDEX], 1);</div><div class='add'>+	input_sync(spec-&gt;kb_dev);</div><div class='add'>+	input_report_key(spec-&gt;kb_dev, spec-&gt;alc_mute_keycode_map[ALC_KEY_MICMUTE_INDEX], 0);</div><div class='add'>+	input_sync(spec-&gt;kb_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alc_register_micmute_input_device(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec-&gt;kb_dev = input_allocate_device();</div><div class='add'>+	if (!spec-&gt;kb_dev) {</div><div class='add'>+		codec_err(codec, "Out of memory (input_allocate_device)\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;alc_mute_keycode_map[ALC_KEY_MICMUTE_INDEX] = KEY_MICMUTE;</div><div class='add'>+</div><div class='add'>+	spec-&gt;kb_dev-&gt;name = "Microphone Mute Button";</div><div class='add'>+	spec-&gt;kb_dev-&gt;evbit[0] = BIT_MASK(EV_KEY);</div><div class='add'>+	spec-&gt;kb_dev-&gt;keycodesize = sizeof(spec-&gt;alc_mute_keycode_map[0]);</div><div class='add'>+	spec-&gt;kb_dev-&gt;keycodemax = ARRAY_SIZE(spec-&gt;alc_mute_keycode_map);</div><div class='add'>+	spec-&gt;kb_dev-&gt;keycode = spec-&gt;alc_mute_keycode_map;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;alc_mute_keycode_map); i++)</div><div class='add'>+		set_bit(spec-&gt;alc_mute_keycode_map[i], spec-&gt;kb_dev-&gt;keybit);</div><div class='add'>+</div><div class='add'>+	if (input_register_device(spec-&gt;kb_dev)) {</div><div class='add'>+		codec_err(codec, "input_register_device failed\n");</div><div class='add'>+		input_free_device(spec-&gt;kb_dev);</div><div class='add'>+		spec-&gt;kb_dev = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GPIO1 = set according to SKU external amp</div><div class='add'>+ * GPIO2 = mic mute hotkey</div><div class='add'>+ * GPIO3 = mute LED</div><div class='add'>+ * GPIO4 = mic mute LED</div><div class='add'>+ */</div><div class='add'>+static void alc280_fixup_hp_gpio2_mic_hotkey(struct hda_codec *codec,</div><div class='add'>+					     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x08, 0x10);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+		if (alc_register_micmute_input_device(codec) != 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gpio_mask |= 0x06;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x02;</div><div class='add'>+		spec-&gt;gpio_data |= 0x02;</div><div class='add'>+		snd_hda_codec_write_cache(codec, codec-&gt;core.afg, 0,</div><div class='add'>+					  AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x04);</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, codec-&gt;core.afg,</div><div class='add'>+						    gpio2_mic_hotkey_event);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;kb_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_FREE:</div><div class='add'>+		input_unregister_device(spec-&gt;kb_dev);</div><div class='add'>+		spec-&gt;kb_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Line2 = mic mute hotkey</div><div class='add'>+ * GPIO2 = mic mute LED</div><div class='add'>+ */</div><div class='add'>+static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec,</div><div class='add'>+					     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0, 0x04);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+		if (alc_register_micmute_input_device(codec) != 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x1b,</div><div class='add'>+						    gpio2_mic_hotkey_event);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;kb_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_FREE:</div><div class='add'>+		input_unregister_device(spec-&gt;kb_dev);</div><div class='add'>+		spec-&gt;kb_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc269_fixup_hp_mute_led_micx(codec, fix, action, 0x1a);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;cap_mute_led_nid = 0x18;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, vref_micmute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc233_fixup_lenovo_low_en_micmute_led(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;micmute_led_polarity = 1;</div><div class='add'>+	alc233_fixup_lenovo_line2_mic_hotkey(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc255_set_default_jack_type(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* Set to iphone type */</div><div class='add'>+	static const struct coef_fw alc255fw[] = {</div><div class='add'>+		WRITE_COEF(0x1b, 0x880b),</div><div class='add'>+		WRITE_COEF(0x45, 0xd089),</div><div class='add'>+		WRITE_COEF(0x1b, 0x080b),</div><div class='add'>+		WRITE_COEF(0x46, 0x0004),</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c0b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw alc256fw[] = {</div><div class='add'>+		WRITE_COEF(0x1b, 0x884b),</div><div class='add'>+		WRITE_COEF(0x45, 0xd089),</div><div class='add'>+		WRITE_COEF(0x1b, 0x084b),</div><div class='add'>+		WRITE_COEF(0x46, 0x0004),</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c4b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, alc255fw);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_process_coef_fw(codec, alc256fw);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	msleep(30);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_mode_alc255(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		alc255_set_default_jack_type(codec);</div><div class='add'>+	}</div><div class='add'>+	alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_mode_alc255_no_hp_mic(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		alc255_set_default_jack_type(codec);</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc288_update_headset_jack_cb(struct hda_codec *codec,</div><div class='add'>+				       struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_headset_jack_cb(codec, jack);</div><div class='add'>+	/* Headset Mic enable or disable, only for Dell Dino */</div><div class='add'>+	alc_update_gpio_data(codec, 0x40, spec-&gt;gen.hp_jack_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_mode_dell_alc288(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		/* toggled via hp_automute_hook */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x40;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x40;</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc288_update_headset_jack_cb;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_no_shutup(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;no_shutup_pins = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fixup for Thinkpad docks: add dock pins, avoid HP parser fixup */</div><div class='add'>+static void alc_fixup_tpt440_dock(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x16, 0x21211010 }, /* dock headphone */</div><div class='add'>+		{ 0x19, 0x21a11010 }, /* dock mic */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags = HDA_PINCFG_NO_HP_FIXUP;</div><div class='add'>+		codec-&gt;power_save_node = 0; /* avoid click noises */</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_tpt470_dock(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x17, 0x21211010 }, /* dock headphone */</div><div class='add'>+		{ 0x19, 0x21a11010 }, /* dock mic */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags = HDA_PINCFG_NO_HP_FIXUP;</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+	} else if (action == HDA_FIXUP_ACT_INIT) {</div><div class='add'>+		/* Enable DOCK device */</div><div class='add'>+		snd_hda_codec_write(codec, 0x17, 0,</div><div class='add'>+			    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);</div><div class='add'>+		/* Enable DOCK device */</div><div class='add'>+		snd_hda_codec_write(codec, 0x19, 0,</div><div class='add'>+			    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_tpt470_dacs(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise</div><div class='add'>+	 * the speaker output becomes too low by some reason on Thinkpads with</div><div class='add'>+	 * ALC298 codec</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x14, 0x03, 0x17, 0x02, 0x21, 0x02,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc295_fixup_asus_dacs(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x17, 0x02, 0x21, 0x03, 0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc271_hp_gate_mic_jack(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix,</div><div class='add'>+				    int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		int mic_pin = alc_find_ext_mic_pin(codec);</div><div class='add'>+		int hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+</div><div class='add'>+		if (snd_BUG_ON(!mic_pin || !hp_pin))</div><div class='add'>+			return;</div><div class='add'>+		snd_hda_jack_set_gating_jack(codec, mic_pin, hp_pin);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec,</div><div class='add'>+					     const struct hda_fixup *fix,</div><div class='add'>+					     int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* The mic boosts on level 2 and 3 are too noisy</div><div class='add'>+	   on the internal mic input.</div><div class='add'>+	   Therefore limit the boost to 0 or 1. */</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='add'>+		unsigned int defcfg;</div><div class='add'>+		if (cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='add'>+			continue;</div><div class='add'>+		defcfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		snd_hda_override_amp_caps(codec, nid, HDA_INPUT,</div><div class='add'>+					  (0x00 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+					  (0x01 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+					  (0x2f &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+					  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc283_hp_automute_hook(struct hda_codec *codec,</div><div class='add'>+				    struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int vref;</div><div class='add'>+</div><div class='add'>+	msleep(200);</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+</div><div class='add'>+	vref = spec-&gt;gen.hp_jack_present ? PIN_VREF80 : 0;</div><div class='add'>+</div><div class='add'>+	msleep(600);</div><div class='add'>+	snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+			    vref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc283_fixup_chromebook(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_override_wcaps(codec, 0x03, 0);</div><div class='add'>+		/* Disable AA-loopback as it causes white noise */</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* MIC2-VREF control */</div><div class='add'>+		/* Set to manual mode */</div><div class='add'>+		alc_update_coef_idx(codec, 0x06, 0x000c, 0);</div><div class='add'>+		/* Enable Line1 input control by verb */</div><div class='add'>+		alc_update_coef_idx(codec, 0x1a, 0, 1 &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc283_fixup_sense_combo_jack(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc283_hp_automute_hook;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* MIC2-VREF control */</div><div class='add'>+		/* Set to manual mode */</div><div class='add'>+		alc_update_coef_idx(codec, 0x06, 0x000c, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mute tablet speaker pin (0x14) via dock plugging in addition */</div><div class='add'>+static void asus_tx300_automute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+	if (snd_hda_jack_detect(codec, 0x1b))</div><div class='add'>+		spec-&gt;gen.mute_bits |= (1ULL &lt;&lt; 0x14);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc282_fixup_asus_tx300(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct hda_pintbl dock_pins[] = {</div><div class='add'>+		{ 0x1b, 0x21114000 }, /* dock speaker pin */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+		/* TX300 needs to set up GPIO2 for the speaker amp */</div><div class='add'>+		alc_setup_gpio(codec, 0x04);</div><div class='add'>+		snd_hda_apply_pincfgs(codec, dock_pins);</div><div class='add'>+		spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+		spec-&gt;gen.automute_hook = asus_tx300_automute;</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x1b,</div><div class='add'>+						    snd_hda_gen_hp_automute);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		/* this is a bit tricky; give more sane names for the main</div><div class='add'>+		 * (tablet) speaker and the dock speaker, respectively</div><div class='add'>+		 */</div><div class='add'>+		rename_ctl(codec, "Speaker Playback Switch",</div><div class='add'>+			   "Dock Speaker Playback Switch");</div><div class='add'>+		rename_ctl(codec, "Bass Speaker Playback Switch",</div><div class='add'>+			   "Speaker Playback Switch");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc290_fixup_mono_speakers(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* DAC node 0x03 is giving mono output. We therefore want to</div><div class='add'>+		   make sure 0x14 (front speaker) and 0x15 (headphones) use the</div><div class='add'>+		   stereo DAC, while leaving 0x17 (bass speaker) for node 0x03. */</div><div class='add'>+		static const hda_nid_t conn1[] = { 0x0c };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x15, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc298_fixup_speaker_volume(struct hda_codec *codec,</div><div class='add'>+					const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* The speaker is routed to the Node 0x06 by a mistake, as a result</div><div class='add'>+		   we can't adjust the speaker's volume since this node does not has</div><div class='add'>+		   Amp-out capability. we change the speaker's route to:</div><div class='add'>+		   Node 0x02 (Audio Output) -&gt; Node 0x0c (Audio Mixer) -&gt; Node 0x17 (</div><div class='add'>+		   Pin Complex), since Node 0x02 has Amp-out caps, we can adjust</div><div class='add'>+		   speaker's volume now. */</div><div class='add'>+</div><div class='add'>+		static const hda_nid_t conn1[] = { 0x0c };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* disable DAC3 (0x06) selection on NID 0x17 as it has no volume amp control */</div><div class='add'>+static void alc295_fixup_disable_dac3(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		static const hda_nid_t conn[] = { 0x02, 0x03 };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* force NID 0x17 (Bass Speaker) to DAC1 to share it with the main speaker */</div><div class='add'>+static void alc285_fixup_speaker2_to_dac1(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* disable DAC3 (0x06) selection on NID 0x15 - share Speaker/Bass Speaker DAC 0x03 */</div><div class='add'>+static void alc294_fixup_bass_speaker_15(struct hda_codec *codec,</div><div class='add'>+					 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		static const hda_nid_t conn[] = { 0x02, 0x03 };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x15, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Hook to update amp GPIO4 for automute */</div><div class='add'>+static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec,</div><div class='add'>+					  struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+	/* mute_led_polarity is set to 0, so we pass inverted value here */</div><div class='add'>+	alc_update_gpio_led(codec, 0x10, spec-&gt;mute_led_polarity,</div><div class='add'>+			    !spec-&gt;gen.hp_jack_present);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Manage GPIOs for HP EliteBook Folio 9480m.</div><div class='add'>+ *</div><div class='add'>+ * GPIO4 is the headphone amplifier power control</div><div class='add'>+ * GPIO3 is the audio output mute indicator LED</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void alc280_fixup_hp_9480m(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix,</div><div class='add'>+				  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x08, 0);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* amp at GPIO4; toggled via alc280_hp_gpio4_automute_hook() */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x10;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x10;</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc280_hp_gpio4_automute_hook;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc275_fixup_gpio4_off(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gpio_mask |= 0x04;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x04;</div><div class='add'>+		/* set data bit low */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Quirk for Thinkpad X1 7th and 8th Gen</div><div class='add'>+ * The following fixed routing needed</div><div class='add'>+ * DAC1 (NID 0x02) -&gt; Speaker (NID 0x14); some eq applied secretly</div><div class='add'>+ * DAC2 (NID 0x03) -&gt; Bass (NID 0x17) &amp; Headphone (NID 0x21); sharing a DAC</div><div class='add'>+ * DAC3 (NID 0x06) -&gt; Unused, due to the lack of volume amp</div><div class='add'>+ */</div><div class='add'>+static void alc285_fixup_thinkpad_x1_gen7(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x14, 0x02, 0x17, 0x03, 0x21, 0x03, 0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		/* The generic parser creates somewhat unintuitive volume ctls</div><div class='add'>+		 * with the fixed routing above, and the shared DAC2 may be</div><div class='add'>+		 * confusing for PA.</div><div class='add'>+		 * Rename those to unique names so that PA doesn't touch them</div><div class='add'>+		 * and use only Master volume.</div><div class='add'>+		 */</div><div class='add'>+		rename_ctl(codec, "Front Playback Volume", "DAC1 Playback Volume");</div><div class='add'>+		rename_ctl(codec, "Bass Speaker Playback Volume", "DAC2 Playback Volume");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc225_fixup_s3_pop_noise(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */</div><div class='add'>+static void alc274_fixup_bind_dacs(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x21, 0x03, 0x1b, 0x03, 0x16, 0x02,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+	spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+	codec-&gt;power_save_node = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* avoid DAC 0x06 for speaker switch 0x17; it has no volume control */</div><div class='add'>+static void alc274_fixup_hp_aio_bind_dacs(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */</div><div class='add'>+	/* The speaker is routed to the Node 0x06 by a mistake, thus the</div><div class='add'>+	 * speaker's volume can't be adjusted since the node doesn't have</div><div class='add'>+	 * Amp-out capability. Assure the speaker and lineout pin to be</div><div class='add'>+	 * coupled with DAC NID 0x02.</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x16, 0x02, 0x17, 0x02, 0x21, 0x03, 0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* avoid DAC 0x06 for bass speaker 0x17; it has no volume control */</div><div class='add'>+static void alc289_fixup_asus_ga401(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x14, 0x02, 0x17, 0x02, 0x21, 0x03, 0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */</div><div class='add'>+static void alc285_fixup_invalidate_dacs(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_override_wcaps(codec, 0x03, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_combo_jack_hp_jd_restart(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 0x8000, 1 &lt;&lt; 15); /* Reset HP JD */</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 0x8000, 0 &lt;&lt; 15);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0235:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_update_coef_idx(codec, 0x1b, 0x8000, 1 &lt;&lt; 15); /* Reset HP JD */</div><div class='add'>+		alc_update_coef_idx(codec, 0x1b, 0x8000, 0 &lt;&lt; 15);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc295_fixup_chromebook(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;ultra_low_power = true;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_combo_jack_hp_jd_restart(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_fixup_chromebook(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		if (codec-&gt;core.subsystem_id == 0x10280d76)</div><div class='add'>+			spec-&gt;gen.suppress_auto_mute = 0;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+		spec-&gt;gen.suppress_auto_mic = 1;</div><div class='add'>+		spec-&gt;en_3kpull_low = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_disable_mic_vref(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void alc294_gx502_toggle_output(struct hda_codec *codec,</div><div class='add'>+					struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	/* The Windows driver sets the codec up in a very different way where</div><div class='add'>+	 * it appears to leave 0x10 = 0x8a20 set. For Linux we need to toggle it</div><div class='add'>+	 */</div><div class='add'>+	if (snd_hda_jack_detect_state(codec, 0x21) == HDA_JACK_PRESENT)</div><div class='add'>+		alc_write_coef_idx(codec, 0x10, 0x8a20);</div><div class='add'>+	else</div><div class='add'>+		alc_write_coef_idx(codec, 0x10, 0x0a20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc294_fixup_gx502_hp(struct hda_codec *codec,</div><div class='add'>+					const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/* Pin 0x21: headphones/headset mic */</div><div class='add'>+	if (!is_jack_detectable(codec, 0x21))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x21,</div><div class='add'>+				alc294_gx502_toggle_output);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* Make sure to start in a correct state, i.e. if</div><div class='add'>+		 * headphones have been plugged in before powering up the system</div><div class='add'>+		 */</div><div class='add'>+		alc294_gx502_toggle_output(codec, NULL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc294_gu502_toggle_output(struct hda_codec *codec,</div><div class='add'>+				       struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	/* Windows sets 0x10 to 0x8420 for Node 0x20 which is</div><div class='add'>+	 * responsible from changes between speakers and headphones</div><div class='add'>+	 */</div><div class='add'>+	if (snd_hda_jack_detect_state(codec, 0x21) == HDA_JACK_PRESENT)</div><div class='add'>+		alc_write_coef_idx(codec, 0x10, 0x8420);</div><div class='add'>+	else</div><div class='add'>+		alc_write_coef_idx(codec, 0x10, 0x0a20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc294_fixup_gu502_hp(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (!is_jack_detectable(codec, 0x21))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x21,</div><div class='add'>+				alc294_gu502_toggle_output);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc294_gu502_toggle_output(codec, NULL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void  alc285_fixup_hp_gpio_amp_init(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	msleep(100);</div><div class='add'>+	alc_write_coef_idx(codec, 0x65, 0x0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc274_fixup_hp_headset_mic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_combo_jack_hp_jd_restart(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_no_int_mic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* Mic RING SLEEVE swap for combo jack */</div><div class='add'>+		alc_update_coef_idx(codec, 0x45, 0xf&lt;&lt;12 | 1&lt;&lt;10, 5&lt;&lt;12);</div><div class='add'>+		spec-&gt;no_internal_mic_pin = true;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_combo_jack_hp_jd_restart(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GPIO1 = amplifier on/off</div><div class='add'>+ * GPIO3 = mic mute LED</div><div class='add'>+ */</div><div class='add'>+static void alc285_fixup_hp_spectre_x360_eb1(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170110 },  /* front/high speakers */</div><div class='add'>+		{ 0x17, 0x90170130 },  /* back/bass speakers */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	//enable micmute led</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x00, 0x04);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;micmute_led_polarity = 1;</div><div class='add'>+		/* needed for amp of back speakers */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x01;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x01;</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		/* share DAC to have unified volume control */</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* need to toggle GPIO to enable the amp of back speakers */</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, true);</div><div class='add'>+		msleep(100);</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* GPIO1 = amplifier on/off */</div><div class='add'>+static void alc285_fixup_hp_spectre_x360_df1(struct hda_codec *codec,</div><div class='add'>+					     const struct hda_fixup *fix,</div><div class='add'>+					     int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170110 },  /* front/high speakers */</div><div class='add'>+		{ 0x17, 0x90170130 },  /* back/bass speakers */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	// enable mute led</div><div class='add'>+	alc285_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* needed for amp of back speakers */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x01;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x01;</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		/* share DAC to have unified volume control */</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* need to toggle GPIO to enable the amp of back speakers */</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, true);</div><div class='add'>+		msleep(100);</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_spectre_x360(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170110 },  /* rear speaker */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		/* force front speaker to DAC1 */</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_envy_x360(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix,</div><div class='add'>+				      int action)</div><div class='add'>+{</div><div class='add'>+	static const struct coef_fw coefs[] = {</div><div class='add'>+		WRITE_COEF(0x08, 0x6a0c), WRITE_COEF(0x0d, 0xa023),</div><div class='add'>+		WRITE_COEF(0x10, 0x0320), WRITE_COEF(0x1a, 0x8c03),</div><div class='add'>+		WRITE_COEF(0x25, 0x1800), WRITE_COEF(0x26, 0x003a),</div><div class='add'>+		WRITE_COEF(0x28, 0x1dfe), WRITE_COEF(0x29, 0xb014),</div><div class='add'>+		WRITE_COEF(0x2b, 0x1dfe), WRITE_COEF(0x37, 0xfe15),</div><div class='add'>+		WRITE_COEF(0x38, 0x7909), WRITE_COEF(0x45, 0xd489),</div><div class='add'>+		WRITE_COEF(0x46, 0x00f4), WRITE_COEF(0x4a, 0x21e0),</div><div class='add'>+		WRITE_COEF(0x66, 0x03f0), WRITE_COEF(0x67, 0x1000),</div><div class='add'>+		WRITE_COEF(0x6e, 0x1005), { }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x12, 0xb7a60130 },  /* Internal microphone*/</div><div class='add'>+		{ 0x14, 0x90170150 },  /* B&amp;O soundbar speakers */</div><div class='add'>+		{ 0x17, 0x90170153 },  /* Side speakers */</div><div class='add'>+		{ 0x19, 0x03a11040 },  /* Headset microphone */</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+</div><div class='add'>+		/* Fixes volume control problem for side speakers */</div><div class='add'>+		alc295_fixup_disable_dac3(codec, fix, action);</div><div class='add'>+</div><div class='add'>+		/* Fixes no sound from headset speaker */</div><div class='add'>+		snd_hda_codec_amp_stereo(codec, 0x21, HDA_OUTPUT, 0, -1, 0);</div><div class='add'>+</div><div class='add'>+		/* Auto-enable headset mic when plugged */</div><div class='add'>+		snd_hda_jack_set_gating_jack(codec, 0x19, 0x21);</div><div class='add'>+</div><div class='add'>+		/* Headset mic volume enhancement */</div><div class='add'>+		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_process_coef_fw(codec, coefs);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		rename_ctl(codec, "Bass Speaker Playback Volume",</div><div class='add'>+			   "B&amp;O-Tuned Playback Volume");</div><div class='add'>+		rename_ctl(codec, "Front Playback Switch",</div><div class='add'>+			   "B&amp;O Soundbar Playback Switch");</div><div class='add'>+		rename_ctl(codec, "Bass Speaker Playback Switch",</div><div class='add'>+			   "Side Speaker Playback Switch");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_hp_beep(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		codec-&gt;beep_just_power_on = true;</div><div class='add'>+	} else  if (action == HDA_FIXUP_ACT_INIT) {</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+		/*</div><div class='add'>+		 * Just enable loopback to internal speaker and headphone jack.</div><div class='add'>+		 * Disable amplification to get about the same beep volume as</div><div class='add'>+		 * was on pure BIOS setup before loading the driver.</div><div class='add'>+		 */</div><div class='add'>+		alc_update_coef_idx(codec, 0x36, 0x7070, BIT(13));</div><div class='add'>+</div><div class='add'>+		snd_hda_enable_beep_device(codec, 1);</div><div class='add'>+</div><div class='add'>+#if !IS_ENABLED(CONFIG_INPUT_PCSPKR)</div><div class='add'>+		dev_warn_once(hda_codec_dev(codec),</div><div class='add'>+			      "enable CONFIG_INPUT_PCSPKR to get PC beeps\n");</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* for hda_fixup_thinkpad_acpi() */</div><div class='add'>+#include "../helpers/thinkpad.c"</div><div class='add'>+</div><div class='add'>+static void alc_fixup_thinkpad_acpi(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_no_shutup(codec, fix, action); /* reduce click noise */</div><div class='add'>+	hda_fixup_thinkpad_acpi(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* for hda_fixup_ideapad_acpi() */</div><div class='add'>+#include "../helpers/ideapad_hotkey_led.c"</div><div class='add'>+</div><div class='add'>+static void alc_fixup_ideapad_acpi(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	hda_fixup_ideapad_acpi(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fixup for Lenovo Legion 15IMHg05 speaker output on headset removal. */</div><div class='add'>+static void alc287_fixup_legion_15imhg05_speakers(struct hda_codec *codec,</div><div class='add'>+						  const struct hda_fixup *fix,</div><div class='add'>+						  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void comp_acpi_device_notify(acpi_handle handle, u32 event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *cdc = data;</div><div class='add'>+	struct alc_spec *spec = cdc-&gt;spec;</div><div class='add'>+</div><div class='add'>+	codec_info(cdc, "ACPI Notification %d\n", event);</div><div class='add'>+</div><div class='add'>+	hda_component_acpi_device_notify(&amp;spec-&gt;comps, handle, event, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int comp_bind(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *cdc = dev_to_hda_codec(dev);</div><div class='add'>+	struct alc_spec *spec = cdc-&gt;spec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hda_component_manager_bind(cdc, &amp;spec-&gt;comps);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return hda_component_manager_bind_acpi_notifications(cdc,</div><div class='add'>+							     &amp;spec-&gt;comps,</div><div class='add'>+							     comp_acpi_device_notify, cdc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void comp_unbind(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *cdc = dev_to_hda_codec(dev);</div><div class='add'>+	struct alc_spec *spec = cdc-&gt;spec;</div><div class='add'>+</div><div class='add'>+	hda_component_manager_unbind_acpi_notifications(cdc, &amp;spec-&gt;comps, comp_acpi_device_notify);</div><div class='add'>+	hda_component_manager_unbind(cdc, &amp;spec-&gt;comps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_master_ops comp_master_ops = {</div><div class='add'>+	.bind = comp_bind,</div><div class='add'>+	.unbind = comp_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, struct hda_codec *cdc,</div><div class='add'>+				       struct snd_pcm_substream *sub, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = cdc-&gt;spec;</div><div class='add'>+</div><div class='add'>+	hda_component_manager_playback_hook(&amp;spec-&gt;comps, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void comp_generic_fixup(struct hda_codec *cdc, int action, const char *bus,</div><div class='add'>+			       const char *hid, const char *match_str, int count)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = cdc-&gt;spec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		ret = hda_component_manager_init(cdc, &amp;spec-&gt;comps, count, bus, hid,</div><div class='add'>+						 match_str, &amp;comp_master_ops);</div><div class='add'>+		if (ret)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gen.pcm_playback_hook = comp_generic_playback_hook;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_FREE:</div><div class='add'>+		hda_component_manager_free(&amp;spec-&gt;comps, &amp;comp_master_ops);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void find_cirrus_companion_amps(struct hda_codec *cdc)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = hda_codec_dev(cdc);</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct fwnode_handle *fwnode __free(fwnode_handle) = NULL;</div><div class='add'>+	const char *bus = NULL;</div><div class='add'>+	static const struct {</div><div class='add'>+		const char *hid;</div><div class='add'>+		const char *name;</div><div class='add'>+	} acpi_ids[] = {{ "CSC3554", "cs35l54-hda" },</div><div class='add'>+			{ "CSC3556", "cs35l56-hda" },</div><div class='add'>+			{ "CSC3557", "cs35l57-hda" }};</div><div class='add'>+	char *match;</div><div class='add'>+	int i, count = 0, count_devindex = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(acpi_ids); ++i) {</div><div class='add'>+		adev = acpi_dev_get_first_match_dev(acpi_ids[i].hid, NULL, -1);</div><div class='add'>+		if (adev)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!adev) {</div><div class='add'>+		codec_dbg(cdc, "Did not find ACPI entry for a Cirrus Amp\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	count = i2c_acpi_client_count(adev);</div><div class='add'>+	if (count &gt; 0) {</div><div class='add'>+		bus = "i2c";</div><div class='add'>+	} else {</div><div class='add'>+		count = acpi_spi_count_resources(adev);</div><div class='add'>+		if (count &gt; 0)</div><div class='add'>+			bus = "spi";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode = fwnode_handle_get(acpi_fwnode_handle(adev));</div><div class='add'>+	acpi_dev_put(adev);</div><div class='add'>+</div><div class='add'>+	if (!bus) {</div><div class='add'>+		codec_err(cdc, "Did not find any buses for %s\n", acpi_ids[i].hid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!fwnode) {</div><div class='add'>+		codec_err(cdc, "Could not get fwnode for %s\n", acpi_ids[i].hid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * When available the cirrus,dev-index property is an accurate</div><div class='add'>+	 * count of the amps in a system and is used in preference to</div><div class='add'>+	 * the count of bus devices that can contain additional address</div><div class='add'>+	 * alias entries.</div><div class='add'>+	 */</div><div class='add'>+	count_devindex = fwnode_property_count_u32(fwnode, "cirrus,dev-index");</div><div class='add'>+	if (count_devindex &gt; 0)</div><div class='add'>+		count = count_devindex;</div><div class='add'>+</div><div class='add'>+	match = devm_kasprintf(dev, GFP_KERNEL, "-%%s:00-%s.%%d", acpi_ids[i].name);</div><div class='add'>+	if (!match)</div><div class='add'>+		return;</div><div class='add'>+	codec_info(cdc, "Found %d %s on %s (%s)\n", count, acpi_ids[i].hid, bus, match);</div><div class='add'>+	comp_generic_fixup(cdc, HDA_FIXUP_ACT_PRE_PROBE, bus, acpi_ids[i].hid, match, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fixup_i2c_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "CSC3551", "-%s:00-cs35l41-hda.%d", 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fixup_i2c_four(struct hda_codec *cdc, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "CSC3551", "-%s:00-cs35l41-hda.%d", 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fixup_spi_two(struct hda_codec *codec, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(codec, action, "spi", "CSC3551", "-%s:00-cs35l41-hda.%d", 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fixup_spi_one(struct hda_codec *codec, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(codec, action, "spi", "CSC3551", "-%s:00-cs35l41-hda.%d", 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fixup_spi_four(struct hda_codec *codec, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(codec, action, "spi", "CSC3551", "-%s:00-cs35l41-hda.%d", 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_fixup_legion_16achg6_speakers(struct hda_codec *cdc, const struct hda_fixup *fix,</div><div class='add'>+						 int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "CLSA0100", "-%s:00-cs35l41-hda.%d", 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_fixup_legion_16ithg6_speakers(struct hda_codec *cdc, const struct hda_fixup *fix,</div><div class='add'>+						 int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "CLSA0101", "-%s:00-cs35l41-hda.%d", 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc285_fixup_asus_ga403u(struct hda_codec *cdc, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The same SSID has been re-used in different hardware, they have</div><div class='add'>+	 * different codecs and the newer GA403U has a ALC285.</div><div class='add'>+	 */</div><div class='add'>+	if (cdc-&gt;core.vendor_id != 0x10ec0285)</div><div class='add'>+		alc_fixup_inv_dmic(cdc, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_fixup_tias_i2c(struct hda_codec *cdc,</div><div class='add'>+	const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "TIAS2781", "-%s:00", 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_fixup_spi(struct hda_codec *cdc, const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "spi", "TXNW2781", "-%s:00-tas2781-hda.%d", 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_fixup_txnw_i2c(struct hda_codec *cdc,</div><div class='add'>+	const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "TXNW2781", "-%s:00-tas2781-hda.%d", 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void yoga7_14arb7_fixup_i2c(struct hda_codec *cdc,</div><div class='add'>+	const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	comp_generic_fixup(cdc, action, "i2c", "INT8866", "-%s:00", 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_fixup_acer_sfg16_micmute_led(struct hda_codec *codec,</div><div class='add'>+	const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0, 0x04);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* for alc295_fixup_hp_top_speakers */</div><div class='add'>+#include "../helpers/hp_x360.c"</div><div class='add'>+</div><div class='add'>+/* for alc285_fixup_ideapad_s740_coef() */</div><div class='add'>+#include "../helpers/ideapad_s740.c"</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc256_fixup_set_coef_defaults_coefs[] = {</div><div class='add'>+	WRITE_COEF(0x10, 0x0020), WRITE_COEF(0x24, 0x0000),</div><div class='add'>+	WRITE_COEF(0x26, 0x0000), WRITE_COEF(0x29, 0x3000),</div><div class='add'>+	WRITE_COEF(0x37, 0xfe05), WRITE_COEF(0x45, 0x5089),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc256_fixup_set_coef_defaults(struct hda_codec *codec,</div><div class='add'>+					   const struct hda_fixup *fix,</div><div class='add'>+					   int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * A certain other OS sets these coeffs to different values. On at least</div><div class='add'>+	 * one TongFang barebone these settings might survive even a cold</div><div class='add'>+	 * reboot. So to restore a clean slate the values are explicitly reset</div><div class='add'>+	 * to default here. Without this, the external microphone is always in a</div><div class='add'>+	 * plugged-in state, while the internal microphone is always in an</div><div class='add'>+	 * unplugged state, breaking the ability to use the internal microphone.</div><div class='add'>+	 */</div><div class='add'>+	alc_process_coef_fw(codec, alc256_fixup_set_coef_defaults_coefs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc233_fixup_no_audio_jack_coefs[] = {</div><div class='add'>+	WRITE_COEF(0x1a, 0x9003), WRITE_COEF(0x1b, 0x0e2b), WRITE_COEF(0x37, 0xfe06),</div><div class='add'>+	WRITE_COEF(0x38, 0x4981), WRITE_COEF(0x45, 0xd489), WRITE_COEF(0x46, 0x0074),</div><div class='add'>+	WRITE_COEF(0x49, 0x0149),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc233_fixup_no_audio_jack(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix,</div><div class='add'>+				       int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The audio jack input and output is not detected on the ASRock NUC Box</div><div class='add'>+	 * 1100 series when cold booting without this fix. Warm rebooting from a</div><div class='add'>+	 * certain other OS makes the audio functional, as COEF settings are</div><div class='add'>+	 * preserved in this case. This fix sets these altered COEF values as</div><div class='add'>+	 * the default.</div><div class='add'>+	 */</div><div class='add'>+	alc_process_coef_fw(codec, alc233_fixup_no_audio_jack_coefs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_fixup_mic_no_presence_and_resume(struct hda_codec *codec,</div><div class='add'>+						    const struct hda_fixup *fix,</div><div class='add'>+						    int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The Clevo NJ51CU comes either with the ALC293 or the ALC256 codec,</div><div class='add'>+	 * but uses the 0x8686 subproduct id in both cases. The ALC256 codec</div><div class='add'>+	 * needs an additional quirk for sound working after suspend and resume.</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x10ec0256) {</div><div class='add'>+		alc_update_coef_idx(codec, 0x10, 1&lt;&lt;9, 0);</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x19, 0x04a11120);</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x1a, 0x04a1113c);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc256_decrease_headphone_amp_val(struct hda_codec *codec,</div><div class='add'>+					      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	u32 caps;</div><div class='add'>+	u8 nsteps, offs;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	caps = query_amp_caps(codec, 0x3, HDA_OUTPUT);</div><div class='add'>+	nsteps = ((caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT) - 10;</div><div class='add'>+	offs = ((caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT) - 10;</div><div class='add'>+	caps &amp;= ~AC_AMPCAP_NUM_STEPS &amp; ~AC_AMPCAP_OFFSET;</div><div class='add'>+	caps |= (nsteps &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) | (offs &lt;&lt; AC_AMPCAP_OFFSET_SHIFT);</div><div class='add'>+</div><div class='add'>+	if (snd_hda_override_amp_caps(codec, 0x3, HDA_OUTPUT, caps))</div><div class='add'>+		codec_warn(codec, "failed to override amp caps for NID 0x3\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_dell4_mic_no_presence_quiet(struct hda_codec *codec,</div><div class='add'>+						  const struct hda_fixup *fix,</div><div class='add'>+						  int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;gen.input_mux;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	alc269_fixup_limit_int_mic_boost(codec, fix, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/**</div><div class='add'>+		 * Set the vref of pin 0x19 (Headset Mic) and pin 0x1b (Headphone Mic)</div><div class='add'>+		 * to Hi-Z to avoid pop noises at startup and when plugging and</div><div class='add'>+		 * unplugging headphones.</div><div class='add'>+		 */</div><div class='add'>+		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);</div><div class='add'>+		snd_hda_codec_set_pin_target(codec, 0x1b, PIN_VREFHIZ);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		/**</div><div class='add'>+		 * Make the internal mic (0x12) the default input source to</div><div class='add'>+		 * prevent pop noises on cold boot.</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			if (spec-&gt;gen.imux_pins[i] == 0x12) {</div><div class='add'>+				spec-&gt;gen.cur_mux[0] = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_fixup_yoga9_14iap7_bass_spk_pin(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The Pin Complex 0x17 for the bass speakers is wrongly reported as</div><div class='add'>+	 * unconnected.</div><div class='add'>+	 */</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x17, 0x90170121 },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	/*</div><div class='add'>+	 * Avoid DAC 0x06 and 0x08, as they have no volume controls.</div><div class='add'>+	 * DAC 0x02 and 0x03 would be fine.</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02, 0x03 };</div><div class='add'>+	/*</div><div class='add'>+	 * Prefer both speakerbar (0x14) and bass speakers (0x17) connected to DAC 0x02.</div><div class='add'>+	 * Headphones (0x21) are connected to DAC 0x03.</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x14, 0x02,</div><div class='add'>+		0x17, 0x02,</div><div class='add'>+		0x21, 0x03,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* Support Audio mute LED and Mic mute LED on keyboard */</div><div class='add'>+	hda_fixup_ideapad_acpi(codec, fix, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc295_fixup_dell_inspiron_top_speakers(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170151 },</div><div class='add'>+		{ 0x17, 0x90170150 },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02, 0x03 };</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x14, 0x02,</div><div class='add'>+		0x17, 0x03,</div><div class='add'>+		0x21, 0x02,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_no_shutup(codec, fix, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Forcibly assign NID 0x03 to HP while NID 0x02 to SPK */</div><div class='add'>+static void alc287_fixup_bind_dacs(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x17, 0x02, 0x21, 0x03, 0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+	spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+	if (spec-&gt;gen.autocfg.speaker_pins[0] != 0x14) {</div><div class='add'>+		snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+					0x0); /* Make sure 0x14 was disable */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fix none verb table of Headset Mic pin */</div><div class='add'>+static void alc2xx_fixup_headset_mic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x19, 0x03a1103c },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		alc_update_coef_idx(codec, 0x45, 0xf&lt;&lt;12 | 1&lt;&lt;10, 5&lt;&lt;12);</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc245_fixup_hp_spectre_x360_eu0xxx(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The Pin Complex 0x14 for the treble speakers is wrongly reported as</div><div class='add'>+	 * unconnected.</div><div class='add'>+	 * The Pin Complex 0x17 for the bass speakers has the lowest association</div><div class='add'>+	 * and sequence values so shift it up a bit to squeeze 0x14 in.</div><div class='add'>+	 */</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170110 }, // top/treble</div><div class='add'>+		{ 0x17, 0x90170111 }, // bottom/bass</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force DAC 0x02 for the bass speakers 0x17.</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41_fixup_i2c_two(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_gpio_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* some changes for Spectre x360 16, 2024 model */</div><div class='add'>+static void alc245_fixup_hp_spectre_x360_16_aa0xxx(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * The Pin Complex 0x14 for the treble speakers is wrongly reported as</div><div class='add'>+	 * unconnected.</div><div class='add'>+	 * The Pin Complex 0x17 for the bass speakers has the lowest association</div><div class='add'>+	 * and sequence values so shift it up a bit to squeeze 0x14 in.</div><div class='add'>+	 */</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x14, 0x90170110 }, // top/treble</div><div class='add'>+		{ 0x17, 0x90170111 }, // bottom/bass</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Force DAC 0x02 for the bass speakers 0x17.</div><div class='add'>+	 */</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* needed for amp of back speakers */</div><div class='add'>+		spec-&gt;gpio_mask |= 0x01;</div><div class='add'>+		spec-&gt;gpio_dir |= 0x01;</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* need to toggle GPIO to enable the amp of back speakers */</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, true);</div><div class='add'>+		msleep(100);</div><div class='add'>+		alc_update_gpio_data(codec, 0x01, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41_fixup_i2c_two(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_gpio_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc245_fixup_hp_zbook_firefly_g12a(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41_fixup_i2c_two(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc285_fixup_hp_coef_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ALC287 PCM hooks</div><div class='add'>+ */</div><div class='add'>+static void alc287_alc1318_playback_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_OPEN:</div><div class='add'>+		alc_write_coefex_idx(codec, 0x5a, 0x00, 0x954f); /* write gpio3 to high */</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLOSE:</div><div class='add'>+		alc_write_coefex_idx(codec, 0x5a, 0x00, 0x554f); /* write gpio3 as default value */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_s4_power_gpio3_default(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (is_s4_suspend(codec)) {</div><div class='add'>+		alc_write_coefex_idx(codec, 0x5a, 0x00, 0x554f); /* write gpio3 as default value */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc287_fixup_lenovo_thinkpad_with_alc1318(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct coef_fw coefs[] = {</div><div class='add'>+		WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC300),</div><div class='add'>+		WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),</div><div class='add'>+		WRITE_COEF(0x24, 0x0013), WRITE_COEF(0x25, 0x0000), WRITE_COEF(0x26, 0xC301),</div><div class='add'>+		WRITE_COEF(0x28, 0x0001), WRITE_COEF(0x29, 0xb023),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	alc_update_coef_idx(codec, 0x10, 1&lt;&lt;11, 1&lt;&lt;11);</div><div class='add'>+	alc_process_coef_fw(codec, coefs);</div><div class='add'>+	spec-&gt;power_hook = alc287_s4_power_gpio3_default;</div><div class='add'>+	spec-&gt;gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook;</div><div class='add'>+}</div><div class='add'>+/* GPIO2: mute led GPIO3: micmute led */</div><div class='add'>+static void alc245_tas2781_spi_hp_fixup_muteled(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas2781_fixup_spi(codec, fix, action);</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x04, 0x0);</div><div class='add'>+	alc285_fixup_hp_coef_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+/* JD2: mute led GPIO3: micmute led */</div><div class='add'>+static void alc245_tas2781_i2c_hp_fixup_muteled(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t conn[] = { 0x02 };</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas2781_fixup_txnw_i2c(codec, fix, action);</div><div class='add'>+	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);</div><div class='add'>+	alc285_fixup_hp_coef_micmute_led(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+/*</div><div class='add'>+ * Clear COEF 0x0d (PCBEEP passthrough) bit 0x40 where BIOS sets it wrongly</div><div class='add'>+ * at PM resume</div><div class='add'>+ */</div><div class='add'>+static void alc283_fixup_dell_hp_resume(struct hda_codec *codec,</div><div class='add'>+					const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc_write_coef_idx(codec, 0xd, 0x2800);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Swap DAC assignments for HP and speaker */</div><div class='add'>+static void alc288_fixup_surface_swap_dacs(struct hda_codec *codec,</div><div class='add'>+					   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0x21, 0x03, 0x14, 0x02, 0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC269_FIXUP_GPIO2,</div><div class='add'>+	ALC269_FIXUP_SONY_VAIO,</div><div class='add'>+	ALC275_FIXUP_SONY_VAIO_GPIO2,</div><div class='add'>+	ALC269_FIXUP_DELL_M101Z,</div><div class='add'>+	ALC269_FIXUP_SKU_IGNORE,</div><div class='add'>+	ALC269_FIXUP_ASUS_G73JW,</div><div class='add'>+	ALC269_FIXUP_ASUS_N7601ZM_PINS,</div><div class='add'>+	ALC269_FIXUP_ASUS_N7601ZM,</div><div class='add'>+	ALC269_FIXUP_LENOVO_EAPD,</div><div class='add'>+	ALC275_FIXUP_SONY_HWEQ,</div><div class='add'>+	ALC275_FIXUP_SONY_DISABLE_AAMIX,</div><div class='add'>+	ALC271_FIXUP_DMIC,</div><div class='add'>+	ALC269_FIXUP_PCM_44K,</div><div class='add'>+	ALC269_FIXUP_STEREO_DMIC,</div><div class='add'>+	ALC269_FIXUP_HEADSET_MIC,</div><div class='add'>+	ALC269_FIXUP_QUANTA_MUTE,</div><div class='add'>+	ALC269_FIXUP_LIFEBOOK,</div><div class='add'>+	ALC269_FIXUP_LIFEBOOK_EXTMIC,</div><div class='add'>+	ALC269_FIXUP_LIFEBOOK_HP_PIN,</div><div class='add'>+	ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT,</div><div class='add'>+	ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC,</div><div class='add'>+	ALC269_FIXUP_AMIC,</div><div class='add'>+	ALC269_FIXUP_DMIC,</div><div class='add'>+	ALC269VB_FIXUP_AMIC,</div><div class='add'>+	ALC269VB_FIXUP_DMIC,</div><div class='add'>+	ALC269_FIXUP_HP_MUTE_LED,</div><div class='add'>+	ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+	ALC269_FIXUP_HP_MUTE_LED_MIC2,</div><div class='add'>+	ALC269_FIXUP_HP_MUTE_LED_MIC3,</div><div class='add'>+	ALC269_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC269_FIXUP_HP_GPIO_MIC1_LED,</div><div class='add'>+	ALC269_FIXUP_HP_LINE1_MIC1_LED,</div><div class='add'>+	ALC269_FIXUP_INV_DMIC,</div><div class='add'>+	ALC269_FIXUP_LENOVO_DOCK,</div><div class='add'>+	ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST,</div><div class='add'>+	ALC269_FIXUP_NO_SHUTUP,</div><div class='add'>+	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,</div><div class='add'>+	ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,</div><div class='add'>+	ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,</div><div class='add'>+	ALC269_FIXUP_ASPIRE_HEADSET_MIC,</div><div class='add'>+	ALC269_FIXUP_ASUS_X101_FUNC,</div><div class='add'>+	ALC269_FIXUP_ASUS_X101_VERB,</div><div class='add'>+	ALC269_FIXUP_ASUS_X101,</div><div class='add'>+	ALC271_FIXUP_AMIC_MIC2,</div><div class='add'>+	ALC271_FIXUP_HP_GATE_MIC_JACK,</div><div class='add'>+	ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572,</div><div class='add'>+	ALC269_FIXUP_ACER_AC700,</div><div class='add'>+	ALC269_FIXUP_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC269VB_FIXUP_ASUS_ZENBOOK,</div><div class='add'>+	ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A,</div><div class='add'>+	ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED,</div><div class='add'>+	ALC269VB_FIXUP_ORDISSIMO_EVE2,</div><div class='add'>+	ALC283_FIXUP_CHROME_BOOK,</div><div class='add'>+	ALC283_FIXUP_SENSE_COMBO_JACK,</div><div class='add'>+	ALC282_FIXUP_ASUS_TX300,</div><div class='add'>+	ALC283_FIXUP_INT_MIC,</div><div class='add'>+	ALC290_FIXUP_MONO_SPEAKERS,</div><div class='add'>+	ALC290_FIXUP_MONO_SPEAKERS_HSJACK,</div><div class='add'>+	ALC290_FIXUP_SUBWOOFER,</div><div class='add'>+	ALC290_FIXUP_SUBWOOFER_HSJACK,</div><div class='add'>+	ALC295_FIXUP_HP_MUTE_LED_COEFBIT11,</div><div class='add'>+	ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	ALC269_FIXUP_LENOVO_XPAD_ACPI,</div><div class='add'>+	ALC269_FIXUP_DMIC_THINKPAD_ACPI,</div><div class='add'>+	ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13,</div><div class='add'>+	ALC269VC_FIXUP_INFINIX_Y4_MAX,</div><div class='add'>+	ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO,</div><div class='add'>+	ALC255_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+	ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+	ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,</div><div class='add'>+	ALC255_FIXUP_HEADSET_MODE,</div><div class='add'>+	ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,</div><div class='add'>+	ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC292_FIXUP_TPT440_DOCK,</div><div class='add'>+	ALC292_FIXUP_TPT440,</div><div class='add'>+	ALC283_FIXUP_HEADSET_MIC,</div><div class='add'>+	ALC255_FIXUP_MIC_MUTE_LED,</div><div class='add'>+	ALC282_FIXUP_ASPIRE_V5_PINS,</div><div class='add'>+	ALC269VB_FIXUP_ASPIRE_E1_COEF,</div><div class='add'>+	ALC280_FIXUP_HP_GPIO4,</div><div class='add'>+	ALC286_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY,</div><div class='add'>+	ALC280_FIXUP_HP_DOCK_PINS,</div><div class='add'>+	ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED,</div><div class='add'>+	ALC280_FIXUP_HP_9480M,</div><div class='add'>+	ALC245_FIXUP_HP_X360_AMP,</div><div class='add'>+	ALC285_FIXUP_HP_SPECTRE_X360_EB1,</div><div class='add'>+	ALC285_FIXUP_HP_SPECTRE_X360_DF1,</div><div class='add'>+	ALC285_FIXUP_HP_ENVY_X360,</div><div class='add'>+	ALC288_FIXUP_DELL_HEADSET_MODE,</div><div class='add'>+	ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC288_FIXUP_DELL_XPS_13,</div><div class='add'>+	ALC288_FIXUP_DISABLE_AAMIX,</div><div class='add'>+	ALC292_FIXUP_DELL_E7X_AAMIX,</div><div class='add'>+	ALC292_FIXUP_DELL_E7X,</div><div class='add'>+	ALC292_FIXUP_DISABLE_AAMIX,</div><div class='add'>+	ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK,</div><div class='add'>+	ALC298_FIXUP_ALIENWARE_MIC_NO_PRESENCE,</div><div class='add'>+	ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,</div><div class='add'>+	ALC275_FIXUP_DELL_XPS,</div><div class='add'>+	ALC293_FIXUP_LENOVO_SPK_NOISE,</div><div class='add'>+	ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,</div><div class='add'>+	ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED,</div><div class='add'>+	ALC255_FIXUP_DELL_SPK_NOISE,</div><div class='add'>+	ALC225_FIXUP_DISABLE_MIC_VREF,</div><div class='add'>+	ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	ALC295_FIXUP_DISABLE_DAC3,</div><div class='add'>+	ALC285_FIXUP_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC285_FIXUP_ASUS_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS,</div><div class='add'>+	ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC285_FIXUP_ASUS_I2C_HEADSET_MIC,</div><div class='add'>+	ALC280_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+	ALC221_FIXUP_HP_FRONT_MIC,</div><div class='add'>+	ALC292_FIXUP_TPT460,</div><div class='add'>+	ALC298_FIXUP_SPK_VOLUME,</div><div class='add'>+	ALC298_FIXUP_LENOVO_SPK_VOLUME,</div><div class='add'>+	ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER,</div><div class='add'>+	ALC269_FIXUP_ATIV_BOOK_8,</div><div class='add'>+	ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE,</div><div class='add'>+	ALC221_FIXUP_HP_MIC_NO_PRESENCE,</div><div class='add'>+	ALC256_FIXUP_ASUS_HEADSET_MODE,</div><div class='add'>+	ALC256_FIXUP_ASUS_MIC,</div><div class='add'>+	ALC256_FIXUP_ASUS_AIO_GPIO2,</div><div class='add'>+	ALC233_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+	ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE,</div><div class='add'>+	ALC233_FIXUP_LENOVO_MULTI_CODECS,</div><div class='add'>+	ALC233_FIXUP_ACER_HEADSET_MIC,</div><div class='add'>+	ALC294_FIXUP_LENOVO_MIC_LOCATION,</div><div class='add'>+	ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,</div><div class='add'>+	ALC225_FIXUP_S3_POP_NOISE,</div><div class='add'>+	ALC700_FIXUP_INTEL_REFERENCE,</div><div class='add'>+	ALC274_FIXUP_DELL_BIND_DACS,</div><div class='add'>+	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,</div><div class='add'>+	ALC298_FIXUP_TPT470_DOCK_FIX,</div><div class='add'>+	ALC298_FIXUP_TPT470_DOCK,</div><div class='add'>+	ALC255_FIXUP_DUMMY_LINEOUT_VERB,</div><div class='add'>+	ALC255_FIXUP_DELL_HEADSET_MIC,</div><div class='add'>+	ALC256_FIXUP_HUAWEI_MACH_WX9_PINS,</div><div class='add'>+	ALC298_FIXUP_HUAWEI_MBX_STEREO,</div><div class='add'>+	ALC295_FIXUP_HP_X360,</div><div class='add'>+	ALC221_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,</div><div class='add'>+	ALC295_FIXUP_HP_AUTO_MUTE,</div><div class='add'>+	ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,</div><div class='add'>+	ALC294_FIXUP_ASUS_MIC,</div><div class='add'>+	ALC294_FIXUP_ASUS_HEADSET_MIC,</div><div class='add'>+	ALC294_FIXUP_ASUS_I2C_HEADSET_MIC,</div><div class='add'>+	ALC294_FIXUP_ASUS_SPK,</div><div class='add'>+	ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE,</div><div class='add'>+	ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,</div><div class='add'>+	ALC255_FIXUP_ACER_HEADSET_MIC,</div><div class='add'>+	ALC295_FIXUP_CHROME_BOOK,</div><div class='add'>+	ALC225_FIXUP_HEADSET_JACK,</div><div class='add'>+	ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE,</div><div class='add'>+	ALC225_FIXUP_WYSE_AUTO_MUTE,</div><div class='add'>+	ALC225_FIXUP_WYSE_DISABLE_MIC_VREF,</div><div class='add'>+	ALC286_FIXUP_ACER_AIO_HEADSET_MIC,</div><div class='add'>+	ALC256_FIXUP_ASUS_HEADSET_MIC,</div><div class='add'>+	ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+	ALC255_FIXUP_PREDATOR_SUBWOOFER,</div><div class='add'>+	ALC299_FIXUP_PREDATOR_SPK,</div><div class='add'>+	ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,</div><div class='add'>+	ALC289_FIXUP_DELL_SPK1,</div><div class='add'>+	ALC289_FIXUP_DELL_SPK2,</div><div class='add'>+	ALC289_FIXUP_DUAL_SPK,</div><div class='add'>+	ALC289_FIXUP_RTK_AMP_DUAL_SPK,</div><div class='add'>+	ALC294_FIXUP_SPK2_TO_DAC1,</div><div class='add'>+	ALC294_FIXUP_ASUS_DUAL_SPK,</div><div class='add'>+	ALC285_FIXUP_THINKPAD_X1_GEN7,</div><div class='add'>+	ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+	ALC294_FIXUP_ASUS_ALLY,</div><div class='add'>+	ALC294_FIXUP_ASUS_ALLY_PINS,</div><div class='add'>+	ALC294_FIXUP_ASUS_ALLY_VERBS,</div><div class='add'>+	ALC294_FIXUP_ASUS_ALLY_SPEAKER,</div><div class='add'>+	ALC294_FIXUP_ASUS_HPE,</div><div class='add'>+	ALC294_FIXUP_ASUS_COEF_1B,</div><div class='add'>+	ALC294_FIXUP_ASUS_GX502_HP,</div><div class='add'>+	ALC294_FIXUP_ASUS_GX502_PINS,</div><div class='add'>+	ALC294_FIXUP_ASUS_GX502_VERBS,</div><div class='add'>+	ALC294_FIXUP_ASUS_GU502_HP,</div><div class='add'>+	ALC294_FIXUP_ASUS_GU502_PINS,</div><div class='add'>+	ALC294_FIXUP_ASUS_GU502_VERBS,</div><div class='add'>+	ALC294_FIXUP_ASUS_G513_PINS,</div><div class='add'>+	ALC285_FIXUP_ASUS_G533Z_PINS,</div><div class='add'>+	ALC285_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC285_FIXUP_HP_MUTE_LED,</div><div class='add'>+	ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED,</div><div class='add'>+	ALC285_FIXUP_HP_BEEP_MICMUTE_LED,</div><div class='add'>+	ALC236_FIXUP_HP_MUTE_LED_COEFBIT2,</div><div class='add'>+	ALC236_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC236_FIXUP_HP_MUTE_LED,</div><div class='add'>+	ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,</div><div class='add'>+	ALC236_FIXUP_LENOVO_INV_DMIC,</div><div class='add'>+	ALC298_FIXUP_SAMSUNG_AMP,</div><div class='add'>+	ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS,</div><div class='add'>+	ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS,</div><div class='add'>+	ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,</div><div class='add'>+	ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,</div><div class='add'>+	ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+	ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS,</div><div class='add'>+	ALC269VC_FIXUP_ACER_HEADSET_MIC,</div><div class='add'>+	ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+	ALC289_FIXUP_ASUS_GA401,</div><div class='add'>+	ALC289_FIXUP_ASUS_GA502,</div><div class='add'>+	ALC256_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+	ALC285_FIXUP_HP_GPIO_AMP_INIT,</div><div class='add'>+	ALC269_FIXUP_CZC_B20,</div><div class='add'>+	ALC269_FIXUP_CZC_TMI,</div><div class='add'>+	ALC269_FIXUP_CZC_L101,</div><div class='add'>+	ALC269_FIXUP_LEMOTE_A1802,</div><div class='add'>+	ALC269_FIXUP_LEMOTE_A190X,</div><div class='add'>+	ALC256_FIXUP_INTEL_NUC8_RUGGED,</div><div class='add'>+	ALC233_FIXUP_INTEL_NUC8_DMIC,</div><div class='add'>+	ALC233_FIXUP_INTEL_NUC8_BOOST,</div><div class='add'>+	ALC256_FIXUP_INTEL_NUC10,</div><div class='add'>+	ALC255_FIXUP_XIAOMI_HEADSET_MIC,</div><div class='add'>+	ALC274_FIXUP_HP_MIC,</div><div class='add'>+	ALC274_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+	ALC274_FIXUP_HP_ENVY_GPIO,</div><div class='add'>+	ALC274_FIXUP_ASUS_ZEN_AIO_27,</div><div class='add'>+	ALC256_FIXUP_ASUS_HPE,</div><div class='add'>+	ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,</div><div class='add'>+	ALC287_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC256_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+	ALC245_FIXUP_HP_GPIO_LED,</div><div class='add'>+	ALC236_FIXUP_DELL_AIO_HEADSET_MIC,</div><div class='add'>+	ALC282_FIXUP_ACER_DISABLE_LINEOUT,</div><div class='add'>+	ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC256_FIXUP_ACER_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_IDEAPAD_S740_COEF,</div><div class='add'>+	ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC295_FIXUP_ASUS_DACS,</div><div class='add'>+	ALC295_FIXUP_HP_OMEN,</div><div class='add'>+	ALC285_FIXUP_HP_SPECTRE_X360,</div><div class='add'>+	ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,</div><div class='add'>+	ALC623_FIXUP_LENOVO_THINKSTATION_P340,</div><div class='add'>+	ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,</div><div class='add'>+	ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST,</div><div class='add'>+	ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS,</div><div class='add'>+	ALC287_FIXUP_LEGION_15IMHG05_AUTOMUTE,</div><div class='add'>+	ALC287_FIXUP_YOGA7_14ITL_SPEAKERS,</div><div class='add'>+	ALC298_FIXUP_LENOVO_C940_DUET7,</div><div class='add'>+	ALC287_FIXUP_13S_GEN2_SPEAKERS,</div><div class='add'>+	ALC256_FIXUP_SET_COEF_DEFAULTS,</div><div class='add'>+	ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,</div><div class='add'>+	ALC233_FIXUP_NO_AUDIO_JACK,</div><div class='add'>+	ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME,</div><div class='add'>+	ALC285_FIXUP_LEGION_Y9000X_SPEAKERS,</div><div class='add'>+	ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE,</div><div class='add'>+	ALC287_FIXUP_LEGION_16ACHG6,</div><div class='add'>+	ALC287_FIXUP_CS35L41_I2C_2,</div><div class='add'>+	ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED,</div><div class='add'>+	ALC287_FIXUP_CS35L41_I2C_4,</div><div class='add'>+	ALC245_FIXUP_CS35L41_SPI_1,</div><div class='add'>+	ALC245_FIXUP_CS35L41_SPI_2,</div><div class='add'>+	ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED,</div><div class='add'>+	ALC245_FIXUP_CS35L41_SPI_4,</div><div class='add'>+	ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED,</div><div class='add'>+	ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED,</div><div class='add'>+	ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE,</div><div class='add'>+	ALC287_FIXUP_LEGION_16ITHG6,</div><div class='add'>+	ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK,</div><div class='add'>+	ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN,</div><div class='add'>+	ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN,</div><div class='add'>+	ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS,</div><div class='add'>+	ALC236_FIXUP_DELL_DUAL_CODECS,</div><div class='add'>+	ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,</div><div class='add'>+	ALC287_FIXUP_TAS2781_I2C,</div><div class='add'>+	ALC295_FIXUP_DELL_TAS2781_I2C,</div><div class='add'>+	ALC245_FIXUP_TAS2781_SPI_2,</div><div class='add'>+	ALC287_FIXUP_TXNW2781_I2C,</div><div class='add'>+	ALC287_FIXUP_YOGA7_14ARB7_I2C,</div><div class='add'>+	ALC245_FIXUP_HP_MUTE_LED_COEFBIT,</div><div class='add'>+	ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT,</div><div class='add'>+	ALC245_FIXUP_HP_X360_MUTE_LEDS,</div><div class='add'>+	ALC287_FIXUP_THINKPAD_I2S_SPK,</div><div class='add'>+	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,</div><div class='add'>+	ALC2XX_FIXUP_HEADSET_MIC,</div><div class='add'>+	ALC289_FIXUP_DELL_CS35L41_SPI_2,</div><div class='add'>+	ALC294_FIXUP_CS35L41_I2C_2,</div><div class='add'>+	ALC256_FIXUP_ACER_SFG16_MICMUTE_LED,</div><div class='add'>+	ALC256_FIXUP_HEADPHONE_AMP_VOL,</div><div class='add'>+	ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX,</div><div class='add'>+	ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX,</div><div class='add'>+	ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A,</div><div class='add'>+	ALC285_FIXUP_ASUS_GA403U,</div><div class='add'>+	ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318,</div><div class='add'>+	ALC256_FIXUP_CHROME_BOOK,</div><div class='add'>+	ALC245_FIXUP_CLEVO_NOISY_MIC,</div><div class='add'>+	ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE,</div><div class='add'>+	ALC233_FIXUP_MEDION_MTL_SPK,</div><div class='add'>+	ALC294_FIXUP_BASS_SPEAKER_15,</div><div class='add'>+	ALC283_FIXUP_DELL_HP_RESUME,</div><div class='add'>+	ALC294_FIXUP_ASUS_CS35L41_SPI_2,</div><div class='add'>+	ALC274_FIXUP_HP_AIO_BIND_DACS,</div><div class='add'>+	ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2,</div><div class='add'>+	ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC,</div><div class='add'>+	ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1,</div><div class='add'>+	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,</div><div class='add'>+	ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK,</div><div class='add'>+	ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE,</div><div class='add'>+	ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED,</div><div class='add'>+	ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED,</div><div class='add'>+	ALC288_FIXUP_SURFACE_SWAP_DACS,</div><div class='add'>+	ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A special fixup for Lenovo C940 and Yoga Duet 7;</div><div class='add'>+ * both have the very same PCI SSID, and we need to apply different fixups</div><div class='add'>+ * depending on the codec ID</div><div class='add'>+ */</div><div class='add'>+static void alc298_fixup_lenovo_c940_duet7(struct hda_codec *codec,</div><div class='add'>+					   const struct hda_fixup *fix,</div><div class='add'>+					   int action)</div><div class='add'>+{</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x10ec0298)</div><div class='add'>+		id = ALC298_FIXUP_LENOVO_SPK_VOLUME; /* C940 */</div><div class='add'>+	else</div><div class='add'>+		id = ALC287_FIXUP_YOGA7_14ITL_SPEAKERS; /* Duet 7 */</div><div class='add'>+	__snd_hda_apply_fixup(codec, id, action, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc269_fixups[] = {</div><div class='add'>+	[ALC269_FIXUP_GPIO2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio2,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_SONY_VAIO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINCTLS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x19, PIN_VREFGRD},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC275_FIXUP_SONY_VAIO_GPIO2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc275_fixup_gpio4_off,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_SONY_VAIO</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL_M101Z] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Enables internal speaker */</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 13},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x4040},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_SKU_IGNORE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_sku_ignore,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_G73JW] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x99130111 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_N7601ZM_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03A11050 },</div><div class='add'>+			{ 0x1a, 0x03A11C30 },</div><div class='add'>+			{ 0x21, 0x03211420 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_N7601ZM] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x62},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0xa007},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x10},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x8420},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x0f},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x7774},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_ASUS_N7601ZM_PINS,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LENOVO_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC275_FIXUP_SONY_HWEQ] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hweq,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2</div><div class='add'>+	},</div><div class='add'>+	[ALC275_FIXUP_SONY_DISABLE_AAMIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_SONY_VAIO</div><div class='add'>+	},</div><div class='add'>+	[ALC271_FIXUP_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc271_fixup_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_PCM_44K] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_pcm_44k,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_QUANTA_MUTE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_STEREO_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_stereo_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_QUANTA_MUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_quanta_mute,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIFEBOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x2101103f }, /* dock line-out */</div><div class='add'>+			{ 0x1b, 0x23a11040 }, /* dock mic-in */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_QUANTA_MUTE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIFEBOOK_EXTMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1903c }, /* headset mic, with jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIFEBOOK_HP_PIN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x21, 0x0221102f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_pincfg_U7x7_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x90170151 }, /* use as internal speaker (LFE) */</div><div class='add'>+			{ 0x1b, 0x90170152 }, /* use as internal speaker (back) */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC269VC_FIXUP_INFINIX_Y4_MAX] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x90170150 }, /* use as internal speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x03a19020 }, /* headset mic */</div><div class='add'>+			{ 0x1b, 0x90170150 }, /* speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_AMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121401f }, /* HP out */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121401f }, /* HP out */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_AMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_mute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_MUTE_LED_MIC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_mute_led_mic1,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_MUTE_LED_MIC2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_mute_led_mic2,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_MUTE_LED_MIC3] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_mute_led_mic3,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC295_FIXUP_HP_AUTO_MUTE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_GPIO_MIC1_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_gpio_mic1_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_LINE1_MIC1_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_hp_line1_mic1_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_NO_SHUTUP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_shutup,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LENOVO_DOCK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x23a11040 }, /* dock mic */</div><div class='add'>+			{ 0x1b, 0x2121103f }, /* dock headphone */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LENOVO_DOCK,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL2_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x21014020 }, /* dock line out */</div><div class='add'>+			{ 0x19, 0x21a19030 }, /* dock mic */</div><div class='add'>+			{ 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL3_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL4_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1b, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_MIC_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_no_hp_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASPIRE_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* headset mic w/o jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC286_FIXUP_SONY_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_HUAWEI_MACH_WX9_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x12, 0x90a60130},</div><div class='add'>+			{0x13, 0x40000000},</div><div class='add'>+			{0x14, 0x90170110},</div><div class='add'>+			{0x18, 0x411111f0},</div><div class='add'>+			{0x19, 0x04a11040},</div><div class='add'>+			{0x1a, 0x411111f0},</div><div class='add'>+			{0x1b, 0x90170112},</div><div class='add'>+			{0x1d, 0x40759a05},</div><div class='add'>+			{0x1e, 0x411111f0},</div><div class='add'>+			{0x21, 0x04211020},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_MIC_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_HUAWEI_MBX_STEREO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_huawei_mbx_stereo,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_MIC_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_X101_FUNC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_x101_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_X101_VERB] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x08},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF,  0x0310},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_ASUS_X101_FUNC</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ASUS_X101] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x04a1182c }, /* Headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_ASUS_X101_VERB</div><div class='add'>+	},</div><div class='add'>+	[ALC271_FIXUP_AMIC_MIC2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x19, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ 0x1b, 0x99a7012f }, /* int-mic */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC271_FIXUP_HP_GATE_MIC_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc271_hp_gate_mic_jack,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC271_FIXUP_AMIC_MIC2,</div><div class='add'>+	},</div><div class='add'>+	[ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC271_FIXUP_HP_GATE_MIC_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ACER_AC700] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x03a11c20 }, /* mic */</div><div class='add'>+			{ 0x1e, 0x0346101e }, /* SPDIF1 */</div><div class='add'>+			{ 0x21, 0x0321101f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC271_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_ASUS_ZENBOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269VB_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* class-D output amp +5dB */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x12 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2800 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269VB_FIXUP_ASUS_ZENBOOK,</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a110f0 },  /* use as headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_ORDISSIMO_EVE2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x18, 0x03a11d20 }, /* mic */</div><div class='add'>+			{ 0x19, 0x411111f0 }, /* Unused bogus pin */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC283_FIXUP_CHROME_BOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc283_fixup_chromebook,</div><div class='add'>+	},</div><div class='add'>+	[ALC283_FIXUP_SENSE_COMBO_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc283_fixup_sense_combo_jack,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC283_FIXUP_CHROME_BOOK,</div><div class='add'>+	},</div><div class='add'>+	[ALC282_FIXUP_ASUS_TX300] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc282_fixup_asus_tx300,</div><div class='add'>+	},</div><div class='add'>+	[ALC283_FIXUP_INT_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x1a},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x0011},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC290_FIXUP_SUBWOOFER_HSJACK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170112 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC290_FIXUP_MONO_SPEAKERS_HSJACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC290_FIXUP_SUBWOOFER] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170112 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC290_FIXUP_MONO_SPEAKERS,</div><div class='add'>+	},</div><div class='add'>+	[ALC290_FIXUP_MONO_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc290_fixup_mono_speakers,</div><div class='add'>+	},</div><div class='add'>+	[ALC290_FIXUP_MONO_SPEAKERS_HSJACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc290_fixup_mono_speakers,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_THINKPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_thinkpad_acpi,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_SKU_IGNORE,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LENOVO_XPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_ideapad_acpi,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DMIC_THINKPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_ACER_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_ASUS_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DELL2_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_alc255,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_MIC_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_alc255_no_hp_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC293_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_TPT440_DOCK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_tpt440_dock,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_TPT440] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC292_FIXUP_TPT440_DOCK,</div><div class='add'>+	},</div><div class='add'>+	[ALC283_FIXUP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x04a110f0 },</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_MIC_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_micmute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC282_FIXUP_ASPIRE_V5_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x90a60130 },</div><div class='add'>+			{ 0x14, 0x90170110 },</div><div class='add'>+			{ 0x17, 0x40000008 },</div><div class='add'>+			{ 0x18, 0x411111f0 },</div><div class='add'>+			{ 0x19, 0x01a1913c },</div><div class='add'>+			{ 0x1a, 0x411111f0 },</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x1d, 0x40f89b2d },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ 0x21, 0x0321101f },</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC269VB_FIXUP_ASPIRE_E1_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269vb_fixup_aspire_e1_coef,</div><div class='add'>+	},</div><div class='add'>+	[ALC280_FIXUP_HP_GPIO4] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc280_fixup_hp_gpio4,</div><div class='add'>+	},</div><div class='add'>+	[ALC286_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc286_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc280_fixup_hp_gpio2_mic_hotkey,</div><div class='add'>+	},</div><div class='add'>+	[ALC280_FIXUP_HP_DOCK_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x21011020 }, /* line-out */</div><div class='add'>+			{ 0x1a, 0x01a1903c }, /* headset mic */</div><div class='add'>+			{ 0x18, 0x2181103f }, /* line-in */</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC280_FIXUP_HP_GPIO4</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x21011020 }, /* line-out */</div><div class='add'>+			{ 0x18, 0x2181103f }, /* line-in */</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HP_GPIO_MIC1_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC280_FIXUP_HP_9480M] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc280_fixup_hp_9480m,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_X360_AMP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_x360_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC245_FIXUP_HP_GPIO_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC288_FIXUP_DELL_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_dell_alc288,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_MIC_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC288_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC288_FIXUP_DELL_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC288_FIXUP_DISABLE_AAMIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC288_FIXUP_DELL_XPS_13] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_dell_xps13,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC288_FIXUP_DISABLE_AAMIX</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_DISABLE_AAMIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_DELL_E7X_AAMIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_dell_xps13,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC292_FIXUP_DISABLE_AAMIX</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_DELL_E7X] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_micmute_led,</div><div class='add'>+		/* micmute fixup must be applied at last */</div><div class='add'>+		.chained_before = true,</div><div class='add'>+		.chain_id = ALC292_FIXUP_DELL_E7X_AAMIX,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_ALIENWARE_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* headset mic w/o jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained_before = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC275_FIXUP_DELL_XPS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Enables internal speaker */</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x1f},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x00c0},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x30},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x00b1},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC293_FIXUP_LENOVO_SPK_NOISE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc233_fixup_lenovo_line2_mic_hotkey,</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc233_fixup_lenovo_low_en_micmute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_INTEL_NUC8_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC233_FIXUP_INTEL_NUC8_BOOST,</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_INTEL_NUC8_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DELL_SPK_NOISE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_DISABLE_MIC_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_mic_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Disable pass-through path for FRONT 14h */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x36 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_DISABLE_MIC_VREF</div><div class='add'>+	},</div><div class='add'>+	[ALC280_FIXUP_HP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC221_FIXUP_HP_FRONT_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x02a19020 }, /* Front Mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC292_FIXUP_TPT460] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_tpt440_dock,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_SPK_VOLUME] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_speaker_volume,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_LENOVO_SPK_VOLUME] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_speaker_volume,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_DISABLE_DAC3] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_disable_dac3,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC245_FIXUP_CS35L41_SPI_2</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1b, 0x03a11c30 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x90170120 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_CS35L41_I2C_2</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_I2C_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1b, 0x03a11c30 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_I2C_SPEAKER2_TO_DAC1</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x90170151 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_ATIV_BOOK_8] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_auto_mute_via_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_NO_SHUTUP</div><div class='add'>+	},</div><div class='add'>+	[ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01813030 }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC221_FIXUP_HP_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x13, 0x90a60160 }, /* use as internal mic */</div><div class='add'>+			{ 0x19, 0x04a11120 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_AIO_GPIO2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		/* Set up GPIO2 for the speaker amp */</div><div class='add'>+		.v.func = alc_fixup_gpio4,</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_ASUS_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Enables internal speaker */</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x40},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x8800},</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_LENOVO_MULTI_CODECS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc233_alc662_fixup_lenovo_dual_codecs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_GPIO2</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_ACER_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_LENOVO_MIC_LOCATION] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* Change the mic location from front to right, otherwise there are</div><div class='add'>+			   two front mics with the same name, pulseaudio can't handle them.</div><div class='add'>+			   This is just a temporary workaround, after applying this fixup,</div><div class='add'>+			   there will be one "Front Mic" and one "Mic" in this machine.</div><div class='add'>+			 */</div><div class='add'>+			{ 0x1a, 0x04a19040 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x0101102f }, /* Rear Headset HP */</div><div class='add'>+			{ 0x19, 0x02a1913c }, /* use as Front headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01a19030 }, /* Rear Headset MIC */</div><div class='add'>+			{ 0x1b, 0x02011020 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_S3_POP_NOISE</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_S3_POP_NOISE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc225_fixup_s3_pop_noise,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC700_FIXUP_INTEL_REFERENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Enables internal speaker */</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x45},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x5289},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x4A},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x001b},</div><div class='add'>+			{0x58, AC_VERB_SET_COEF_INDEX, 0x00},</div><div class='add'>+			{0x58, AC_VERB_SET_PROC_COEF, 0x3888},</div><div class='add'>+			{0x20, AC_VERB_SET_COEF_INDEX, 0x6f},</div><div class='add'>+			{0x20, AC_VERB_SET_PROC_COEF, 0x2c0b},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_DELL_BIND_DACS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc274_fixup_bind_dacs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_DELL_AIO_LINEOUT_VERB] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x0401102f },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC274_FIXUP_DELL_BIND_DACS</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_TPT470_DOCK_FIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_tpt470_dock,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_TPT470_DOCK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_tpt470_dacs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC298_FIXUP_TPT470_DOCK_FIX</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DUMMY_LINEOUT_VERB] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x0201101f },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_DELL_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_HP_X360] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_hp_top_speakers,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HP_MUTE_LED_MIC3</div><div class='add'>+	},</div><div class='add'>+	[ALC221_FIXUP_HP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x0181313f},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_invalidate_dacs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_HP_AUTO_MUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_auto_mute_via_amp,</div><div class='add'>+	},</div><div class='add'>+	[ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x13, 0x90a60160 }, /* use as internal mic */</div><div class='add'>+			{ 0x19, 0x04a11120 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1103c }, /* use as headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_I2C_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a19020 }, /* use as headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_CS35L41_I2C_2</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Set EAPD high */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x40 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0f },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x7774 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_CHROME_BOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_chromebook,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_HEADSET_JACK</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_HEADSET_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_jack,</div><div class='add'>+	},</div><div class='add'>+	[ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Disable PCBEEP-IN passthrough */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x36 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_LENOVO_HEADPHONE_NOISE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_ACER_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11130 },</div><div class='add'>+			{ 0x1a, 0x90a60140 }, /* use as internal mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x01011020 }, /* Rear Line out */</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as Front headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_WYSE_AUTO_MUTE</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_WYSE_AUTO_MUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_auto_mute_via_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_WYSE_DISABLE_MIC_VREF</div><div class='add'>+	},</div><div class='add'>+	[ALC225_FIXUP_WYSE_DISABLE_MIC_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_mic_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC286_FIXUP_ACER_AIO_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x4f },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5029 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x04a11120 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_PREDATOR_SUBWOOFER] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170151 }, /* use as internal speaker (LFE) */</div><div class='add'>+			{ 0x1b, 0x90170152 } /* use as internal speaker (back) */</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC299_FIXUP_PREDATOR_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x21, 0x90170150 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_PREDATOR_SUBWOOFER</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x04a11040 },</div><div class='add'>+			{ 0x21, 0x04211020 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_DELL_SPK1] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x90170140 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_DELL_SPK2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170130 }, /* bass spk */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_DUAL_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_DELL_SPK2</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_RTK_AMP_DUAL_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_DELL_SPK1</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_SPK2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_DUAL_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		/* The GPIO must be pulled to initialize the AMP */</div><div class='add'>+		.v.func = alc_fixup_gpio4,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_SPK2_TO_DAC1</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_ALLY] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_ALLY_PINS</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_ALLY_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1a, 0x03a11c30 },</div><div class='add'>+			{ 0x21, 0x03211420 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_ALLY_VERBS</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_ALLY_VERBS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x46 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0004 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x47 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xa47a },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x49 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0049},</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x4a },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x201b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x6b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x4278},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_ALLY_SPEAKER</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_ALLY_SPEAKER] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_THINKPAD_X1_GEN7] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_thinkpad_x1_gen7,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_THINKPAD_HEADSET_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_jack,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_X1_GEN7</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_HPE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Set EAPD high */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0f },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x7774 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GX502_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 }, /* front HP mic */</div><div class='add'>+			{ 0x1a, 0x01a11830 }, /* rear external mic */</div><div class='add'>+			{ 0x21, 0x03211020 }, /* front HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_GX502_VERBS</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GX502_VERBS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* set 0x15 to HP-OUT ctrl */</div><div class='add'>+			{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='add'>+			/* unmute the 0x15 amp */</div><div class='add'>+			{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_GX502_HP</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GX502_HP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc294_fixup_gx502_hp,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_DELL_TAS2781_I2C] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = tas2781_fixup_tias_i2c,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_DUAL_SPK</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GU502_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a11050 }, /* rear HP mic */</div><div class='add'>+			{ 0x1a, 0x01a11830 }, /* rear external mic */</div><div class='add'>+			{ 0x21, 0x012110f0 }, /* rear HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_GU502_VERBS</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GU502_VERBS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* set 0x15 to HP-OUT ctrl */</div><div class='add'>+			{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='add'>+			/* unmute the 0x15 amp */</div><div class='add'>+			{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },</div><div class='add'>+			/* set 0x1b to HP-OUT */</div><div class='add'>+			{ 0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_GU502_HP</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_GU502_HP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc294_fixup_gu502_hp,</div><div class='add'>+	},</div><div class='add'>+	 [ALC294_FIXUP_ASUS_G513_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+				{ 0x19, 0x03a11050 }, /* front HP mic */</div><div class='add'>+				{ 0x1a, 0x03a11c30 }, /* rear external mic */</div><div class='add'>+				{ 0x21, 0x03211420 }, /* front HP out */</div><div class='add'>+				{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_G533Z_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x90170152 }, /* Speaker Surround Playback Switch */</div><div class='add'>+			{ 0x19, 0x03a19020 }, /* Mic Boost Volume */</div><div class='add'>+			{ 0x1a, 0x03a11c30 }, /* Mic Boost Volume */</div><div class='add'>+			{ 0x1e, 0x90170151 }, /* Rear jack, IN OUT EAPD Detect */</div><div class='add'>+			{ 0x21, 0x03211420 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_COEF_1B] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Set bit 10 to correct noisy output after reboot from</div><div class='add'>+			 * Windows 10 (due to pop noise reduction?)</div><div class='add'>+			 */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x1b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x4e4b },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_ASUS_GA401,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_mute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_spectre_x360_mute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_BEEP_MICMUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_beep,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_MUTE_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_MUTE_LED_COEFBIT2] = {</div><div class='add'>+	    .type = HDA_FIXUP_FUNC,</div><div class='add'>+	    .v.func = alc236_fixup_hp_mute_led_coefbit2,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc236_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc236_fixup_hp_mute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc236_fixup_hp_mute_led_micmute_vref,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc236_fixup_hp_mute_led_coefbit2,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC236_FIXUP_HP_GPIO_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_LENOVO_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC283_FIXUP_INT_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_HP_MUTE_LED_COEFBIT11] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_hp_mute_led_coefbit11,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_SAMSUNG_AMP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_samsung_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_samsung_amp_v2_2_amps</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_samsung_amp_v2_4_amps</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc5 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x08},</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2fcf},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_ASUS_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x90100120 }, /* use as internal speaker */</div><div class='add'>+			{ 0x18, 0x02a111f0 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x01011020 }, /* use as line out */</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC269VC_FIXUP_ACER_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x02a11030 }, /* use as headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, 0x01a11130 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_ASUS_GA401] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc289_fixup_asus_ga401,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_ASUS_GA502,</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_ASUS_GA502] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11020 }, /* headset mic with jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ACER_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x02a11120 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_GPIO_AMP_INIT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_gpio_amp_init,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_GPIO_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_CZC_B20] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x411111f0 },</div><div class='add'>+			{ 0x14, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x032f1020 }, /* HP out */</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x03ab1040 }, /* mic */</div><div class='add'>+			{ 0x19, 0xb7a7013f },</div><div class='add'>+			{ 0x1a, 0x0181305f },</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x1d, 0x411111f0 },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = ALC269_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_CZC_TMI] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x4000c000 },</div><div class='add'>+			{ 0x14, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0421401f }, /* HP out */</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x04a19020 }, /* mic */</div><div class='add'>+			{ 0x19, 0x411111f0 },</div><div class='add'>+			{ 0x1a, 0x411111f0 },</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x1d, 0x40448505 },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ 0x20, 0x8000ffff },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = ALC269_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_CZC_L101] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x40000000 },</div><div class='add'>+			{ 0x14, 0x01014010 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x411111f0 }, /* HP out */</div><div class='add'>+			{ 0x16, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x01a19020 }, /* mic */</div><div class='add'>+			{ 0x19, 0x02a19021 },</div><div class='add'>+			{ 0x1a, 0x0181302f },</div><div class='add'>+			{ 0x1b, 0x0221401f },</div><div class='add'>+			{ 0x1c, 0x411111f0 },</div><div class='add'>+			{ 0x1d, 0x4044c601 },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = ALC269_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LEMOTE_A1802] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0x40000000 },</div><div class='add'>+			{ 0x14, 0x90170110 }, /* speaker */</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x03a19040 }, /* mic1 */</div><div class='add'>+			{ 0x19, 0x90a70130 }, /* mic2 */</div><div class='add'>+			{ 0x1a, 0x411111f0 },</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x1d, 0x40489d2d },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ 0x20, 0x0003ffff },</div><div class='add'>+			{ 0x21, 0x03214020 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = ALC269_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_LEMOTE_A190X] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121401f }, /* HP out */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* rear  mic */</div><div class='add'>+			{ 0x19, 0x99a3092f }, /* front mic */</div><div class='add'>+			{ 0x1b, 0x0201401f }, /* front lineout */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chain_id = ALC269_FIXUP_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_INTEL_NUC8_RUGGED] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_INTEL_NUC10] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_XIAOMI_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_ASUS_GA502</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_HP_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x45 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5089 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_HP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc274_fixup_hp_headset_mic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC274_FIXUP_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_HP_ENVY_GPIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc274_fixup_hp_envy_gpio,</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_ASUS_ZEN_AIO_27] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x10 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xc420 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x40 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x8800 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x49 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0249 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x4a },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x202b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x62 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xa007 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x6b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x5060 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC2XX_FIXUP_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ASUS_HPE] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Set EAPD high */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0f },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x7778 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_jack,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_HP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc274_fixup_hp_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_DELL_AIO_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_int_mic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC282_FIXUP_ACER_DISABLE_LINEOUT] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ACER_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x02a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x90a1092f }, /* use as internal mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_IDEAPAD_S740_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_ideapad_s740_coef,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_MUTE_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_ASUS_DACS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_asus_dacs,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_HP_OMEN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x12, 0xb7a60130 },</div><div class='add'>+			{ 0x13, 0x40000000 },</div><div class='add'>+			{ 0x14, 0x411111f0 },</div><div class='add'>+			{ 0x16, 0x411111f0 },</div><div class='add'>+			{ 0x17, 0x90170110 },</div><div class='add'>+			{ 0x18, 0x411111f0 },</div><div class='add'>+			{ 0x19, 0x02a11030 },</div><div class='add'>+			{ 0x1a, 0x411111f0 },</div><div class='add'>+			{ 0x1b, 0x04a19030 },</div><div class='add'>+			{ 0x1d, 0x40600001 },</div><div class='add'>+			{ 0x1e, 0x411111f0 },</div><div class='add'>+			{ 0x21, 0x03211020 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HP_LINE1_MIC1_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_SPECTRE_X360] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_spectre_x360,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_SPECTRE_X360_EB1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_spectre_x360_eb1</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_SPECTRE_X360_DF1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_spectre_x360_df1</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_ENVY_X360] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_hp_envy_x360,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_GPIO_AMP_INIT,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_ideapad_s740_coef,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC623_FIXUP_LENOVO_THINKSTATION_P340] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_shutup,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC283_FIXUP_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC255_FIXUP_ACER_HEADPHONE_AND_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x21, 0x03211030 }, /* Change the Headphone location to Left */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_XIAOMI_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_LEGION_Y9000X_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_ideapad_s740_coef,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_legion_15imhg05_speakers,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		//.v.verbs = legion_15imhg05_coefs,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			 // set left speaker Legion 7i.</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x41 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x1a },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 // set right speaker Legion 7i.</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x42 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2a },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+			 {}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_LEGION_15IMHG05_AUTOMUTE,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_LEGION_15IMHG05_AUTOMUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_legion_15imhg05_speakers,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_YOGA7_14ITL_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			 // set left speaker Yoga 7i.</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x41 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x1a },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 // set right speaker Yoga 7i.</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x46 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2a },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+			 {}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC298_FIXUP_LENOVO_C940_DUET7] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc298_fixup_lenovo_c940_duet7,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_13S_GEN2_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x41 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x42 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_SET_COEF_DEFAULTS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc256_fixup_set_coef_defaults,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_gpio_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11120 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_NO_AUDIO_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc233_fixup_no_audio_jack,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc256_fixup_mic_no_presence_and_resume,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_LEGION_16ACHG6] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_legion_16achg6_speakers,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_CS35L41_I2C_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_MUTE_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_CS35L41_I2C_4] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_four,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CS35L41_SPI_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_two,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CS35L41_SPI_1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_one,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_GPIO_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CS35L41_SPI_4] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_four,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_four,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_GPIO_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			 { 0x20, AC_VERB_SET_COEF_INDEX, 0x19 },</div><div class='add'>+			 { 0x20, AC_VERB_SET_PROC_COEF, 0x8e11 },</div><div class='add'>+			 { }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_MUTE_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_dell4_mic_no_presence_quiet,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x02a1112c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_LEGION_16ITHG6] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_legion_16ithg6_speakers,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			// enable left speaker</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x41 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x1a },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xf },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x42 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x10 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x40 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			// enable right speaker</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x24 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x46 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xc },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2a },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xf },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x46 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x10 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x44 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x26 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x2 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0xb020 },</div><div class='add'>+</div><div class='add'>+			{ },</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_yoga9_14iap7_bass_spk_pin,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_yoga9_14iap7_bass_spk_pin,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_CS35L41_I2C_2,</div><div class='add'>+	},</div><div class='add'>+	[ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc295_fixup_dell_inspiron_top_speakers,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC236_FIXUP_DELL_DUAL_CODECS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.func = alc1220_fixup_gb_dual_codecs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_TAS2781_I2C] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = tas2781_fixup_tias_i2c,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_TAS2781_SPI_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = tas2781_fixup_spi,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_HP_GPIO_LED,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_TXNW2781_I2C] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = tas2781_fixup_txnw_i2c,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_YOGA7_14ARB7_I2C] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = yoga7_14arb7_fixup_i2c,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_mute_led_coefbit,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_mute_led_v1_coefbit,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_X360_MUTE_LEDS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_mute_led_coefbit,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC245_FIXUP_HP_GPIO_LED</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_THINKPAD_I2S_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_bind_dacs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_bind_dacs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,</div><div class='add'>+	},</div><div class='add'>+	[ALC2XX_FIXUP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc2xx_fixup_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_DELL_CS35L41_SPI_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC289_FIXUP_DUAL_SPK</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_CS35L41_I2C_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_i2c_two,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_ACER_SFG16_MICMUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc256_fixup_acer_sfg16_micmute_led,</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_HEADPHONE_AMP_VOL] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc256_decrease_headphone_amp_val,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_spectre_x360_eu0xxx,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_spectre_x360_16_aa0xxx,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_fixup_hp_zbook_firefly_g12a,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GA403U] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_asus_ga403u,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1b, 0x03a11c30 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GU605_SPI_2_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1b, 0x03a11c30 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GA403U_I2C_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_GA403U,</div><div class='add'>+	},</div><div class='add'>+	[ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc287_fixup_lenovo_thinkpad_with_alc1318,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_THINKPAD_ACPI</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_CHROME_BOOK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc256_fixup_chromebook,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC225_FIXUP_HEADSET_JACK</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_CLEVO_NOISY_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1b, 0x20a11040 }, /* dock mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC233_FIXUP_MEDION_MTL_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x90170110 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_BASS_SPEAKER_15] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc294_fixup_bass_speaker_15,</div><div class='add'>+	},</div><div class='add'>+	[ALC283_FIXUP_DELL_HP_RESUME] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc283_fixup_dell_hp_resume,</div><div class='add'>+	},</div><div class='add'>+	[ALC294_FIXUP_ASUS_CS35L41_SPI_2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = cs35l41_fixup_spi_two,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC,</div><div class='add'>+	},</div><div class='add'>+	[ALC274_FIXUP_HP_AIO_BIND_DACS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc274_fixup_hp_aio_bind_dacs,</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 },</div><div class='add'>+			{ 0x1b, 0x03a11c30 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1</div><div class='add'>+	},</div><div class='add'>+	[ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc285_fixup_speaker2_to_dac1,</div><div class='add'>+	},</div><div class='add'>+	[ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc269_fixup_limit_int_mic_boost,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+	},</div><div class='add'>+	[ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170151 }, /* Internal Speaker LFE */</div><div class='add'>+			{ 0x1e, 0x90170150 }, /* Internal Speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x22a190a0 }, /* dock mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_tas2781_spi_hp_fixup_muteled,</div><div class='add'>+	},</div><div class='add'>+	[ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc245_tas2781_i2c_hp_fixup_muteled,</div><div class='add'>+	},</div><div class='add'>+	[ALC288_FIXUP_SURFACE_SWAP_DACS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc288_fixup_surface_swap_dacs,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc269_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0283, "Acer TravelMate 8371", ALC269_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x047c, "Acer AC700", ALC269_FIXUP_ACER_AC700),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x072d, "Acer Aspire V5-571G", ALC269_FIXUP_ASPIRE_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0840, "Acer Aspire E1", ALC269VB_FIXUP_ASPIRE_E1_COEF),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x100c, "Acer Aspire E5-574G", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x101c, "Acer Veriton N2510G", ALC269_FIXUP_LIFEBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x102b, "Acer Aspire C24-860", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1065, "Acer Aspire C20-820", ALC269VC_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1094, "Acer Aspire E5-575T", ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1099, "Acer Aspire E5-523G", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x110e, "Acer Aspire ES1-432", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1166, "Acer Veriton N4640G", ALC269_FIXUP_LIFEBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1167, "Acer Veriton N6640G", ALC269_FIXUP_LIFEBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1177, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1178, "Acer Predator G9-593", ALC255_FIXUP_PREDATOR_SUBWOOFER),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1246, "Acer Predator Helios 500", ALC299_FIXUP_PREDATOR_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1247, "Acer vCopperbox", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1248, "Acer Veriton N4660G", ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1269, "Acer SWIFT SF314-54", ALC256_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x126a, "Acer Swift SF114-32", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x128f, "Acer Veriton Z6860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x129c, "Acer SWIFT SF314-55", ALC256_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x129d, "Acer SWIFT SF313-51", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1300, "Acer SWIFT SF314-56", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1360, "Acer Aspire A115", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x141f, "Acer Spin SP513-54N", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x142b, "Acer Swift SF314-42", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1534, "Acer Predator PH315-54", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x159c, "Acer Nitro 5 AN515-58", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x169a, "Acer Swift SFG16", ALC256_FIXUP_ACER_SFG16_MICMUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1826, "Acer Helios ZPC", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x182c, "Acer Helios ZPD", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x1844, "Acer Helios ZPS", ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x053c, "Dell Latitude E5430", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05be, "Dell Latitude E6540", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05ca, "Dell Latitude E7240", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05cb, "Dell Latitude E7440", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05da, "Dell Vostro 5460", ALC290_FIXUP_SUBWOOFER),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05f4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05f5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05f6, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0604, "Dell Venue 11 Pro 7130", ALC283_FIXUP_DELL_HP_RESUME),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0615, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x062c, "Dell Latitude E5550", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x062e, "Dell Latitude E7450", ALC292_FIXUP_DELL_E7X),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0665, "Dell XPS 13", ALC288_FIXUP_DELL_XPS_13),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0669, "Dell Optiplex 9020m", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x069a, "Dell Vostro 5480", ALC290_FIXUP_SUBWOOFER_HSJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06c7, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06dd, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0706, "Dell Inspiron 7559", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0738, "Dell Precision 5820", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x075c, "Dell XPS 27 7760", ALC298_FIXUP_SPK_VOLUME),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x07b0, "Dell Precision 7520", ALC295_FIXUP_DISABLE_DAC3),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x080c, "Dell WYSE", ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x084b, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x084e, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0879, "Dell Latitude 5420 Rugged", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x097e, "Dell Precision", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x098d, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a38, "Dell Latitude 7520", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a61, "Dell XPS 15 9510", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a62, "Dell Precision 5560", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a9d, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b27, "Dell", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b28, "Dell", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b37, "Dell Inspiron 16 Plus 7620 2-in-1", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0b71, "Dell Inspiron 16 Plus 7620", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0beb, "Dell XPS 15 9530 (2023)", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c03, "Dell Precision 5340", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c0b, "Dell Oasis 14 RPL-P", ALC289_FIXUP_RTK_AMP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c0d, "Dell Oasis", ALC289_FIXUP_RTK_AMP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c0e, "Dell Oasis 16", ALC289_FIXUP_RTK_AMP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c19, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c1a, "Dell Precision 3340", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c1b, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c1c, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c1d, "Dell Precision 3440", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c1e, "Dell Precision 3540", ALC236_FIXUP_DELL_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c28, "Dell Inspiron 16 Plus 7630", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c4d, "Dell", ALC287_FIXUP_CS35L41_I2C_4),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c94, "Dell Polaris 3 metal", ALC295_FIXUP_DELL_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0c96, "Dell Polaris 2in1", ALC295_FIXUP_DELL_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cbd, "Dell Oasis 13 CS MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cbe, "Dell Oasis 13 2-IN-1 MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cbf, "Dell Oasis 13 Low Weight MTU-L", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc0, "Dell Oasis 13", ALC289_FIXUP_RTK_AMP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc1, "Dell Oasis 14 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc2, "Dell Oasis 14 2-in-1 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc3, "Dell Oasis 14 Low Weight MTL-U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc4, "Dell Oasis 16 MTL-H/U", ALC289_FIXUP_DELL_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0cc5, "Dell Oasis 14", ALC289_FIXUP_RTK_AMP_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x18e6, "HP", ALC269_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x21f9, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2210, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2214, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x221b, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2221, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2225, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2236, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2237, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2238, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2239, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x224b, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2253, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2254, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2255, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2256, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2257, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2259, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x225a, "HP", ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x225f, "HP", ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2263, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2264, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2265, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2268, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x226a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2271, "HP", ALC286_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2272, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2272, "HP", ALC280_FIXUP_HP_DOCK_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2273, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2273, "HP", ALC280_FIXUP_HP_DOCK_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2278, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x227f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2282, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x228b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x228e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22b2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22c5, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22c7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22cf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22db, "HP", ALC280_FIXUP_HP_9480M),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22dc, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x22fb, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2334, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2b5e, "HP 288 Pro G2 MT", ALC221_FIXUP_HP_288PRO_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x802e, "HP Z240 SFF", ALC221_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x802f, "HP Z240", ALC221_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8077, "HP", ALC256_FIXUP_HP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8158, "HP", ALC256_FIXUP_HP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC295_FIXUP_HP_X360),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x827f, "HP x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x82bf, "HP G3 mini", ALC221_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x82c0, "HP G3 mini premium", ALC221_FIXUP_HP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x841c, "HP Pavilion 15-CK0xx", ALC269_FIXUP_HP_MUTE_LED_MIC3),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x84a6, "HP 250 G7 Notebook PC", ALC269_FIXUP_HP_LINE1_MIC1_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x84ae, "HP 15-db0403ng", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8537, "HP ProBook 440 G6", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8548, "HP EliteBook x360 830 G6", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x854a, "HP EliteBook 830 G6", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x85c6, "HP Pavilion x360 Convertible 14-dy1xxx", ALC295_FIXUP_HP_MUTE_LED_COEFBIT11),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x85de, "HP Envy x360 13-ar0xxx", ALC285_FIXUP_HP_ENVY_X360),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8603, "HP Omen 17-cb0xxx", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x860c, "HP ZBook 17 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x860f, "HP ZBook 15 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x861f, "HP Elite Dragonfly G1", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x86c1, "HP Laptop 15-da3001TU", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x86e7, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x863e, "HP Spectre x360 15-df1xxx", ALC285_FIXUP_HP_SPECTRE_X360_DF1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x86e8, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x86f9, "HP Spectre x360 13-aw0xxx", ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8720, "HP EliteBook x360 1040 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8724, "HP EliteBook 850 G7", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8728, "HP EliteBook 840 G7", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8730, "HP ProBook 445 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8735, "HP ProBook 435 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8760, "HP EliteBook 8{4,5}5 G7", ALC285_FIXUP_HP_BEEP_MICMUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x876e, "HP ENVY x360 Convertible 13-ay0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8780, "HP ZBook Fury 17 G7 Mobile Workstation",</div><div class='add'>+		      ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation",</div><div class='add'>+		      ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8786, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8787, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87cc, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f1, "HP ProBook 630 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f2, "HP ProBook 640 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f4, "HP", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87fd, "HP Laptop 14-dq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x87fe, "HP Laptop 15s-fq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8812, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x881d, "HP 250 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x881e, "HP Laptop 15s-du3xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8847, "HP EliteBook x360 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8862, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8863, "HP ProBook 445 G8 Notebook PC", ALC236_FIXUP_HP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x887a, "HP Laptop 15s-eq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x887c, "HP Laptop 14s-fq1xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x888a, "HP ENVY x360 Convertible 15-eu0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8895, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x88dd, "HP Pavilion 15z-ec200", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8902, "HP OMEN 16", ALC285_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x890e, "HP 255 G8 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8919, "HP Pavilion Aero Laptop 13-be0xxx", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x896d, "HP ZBook Firefly 16 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x896e, "HP EliteBook x360 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8971, "HP EliteBook 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8972, "HP EliteBook 840 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8973, "HP EliteBook 860 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8974, "HP EliteBook 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8975, "HP EliteBook x360 840 Aero G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x897d, "HP mt440 Mobile Thin Client U74", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8981, "HP Elite Dragonfly G3", ALC245_FIXUP_CS35L41_SPI_4),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x898a, "HP Pavilion 15-eg100", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x898e, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x898f, "HP EliteBook 835 G9", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8991, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8992, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8994, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8995, "HP EliteBook 855 G9", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89a0, "HP Laptop 15-dw4xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89a4, "HP ProBook 440 G9", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89a6, "HP ProBook 450 G9", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89aa, "HP EliteBook 630 G9", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89ac, "HP EliteBook 640 G9", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89ae, "HP EliteBook 650 G9", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89c0, "HP ZBook Power 15.6 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89d3, "HP EliteBook 645 G9 (MB 89D2)", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89da, "HP Spectre x360 14t-ea100", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x89e7, "HP Elite x2 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a0f, "HP Pavilion 14-ec1xxx", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a20, "HP Laptop 15s-fq5xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a25, "HP Victus 16-d1xxx (MB 8A25)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a26, "HP Victus 16-d1xxx (MB 8A26)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a28, "HP Envy 13", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a29, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a2a, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a2b, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a2c, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a2d, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a2e, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a30, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a31, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a75, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a76, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a77, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8aa8, "HP EliteBook 640 G9 (MB 8AA6)", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8aab, "HP EliteBook 650 G9 (MB 8AA9)", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ab9, "HP EliteBook 840 G8 (MB 8AB8)", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ad8, "HP 800 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b0f, "HP Elite mt645 G7 Mobile Thin Client U81", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b2f, "HP 255 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b3a, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b3f, "HP mt440 Mobile Thin Client U91", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b42, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b43, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b44, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b45, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b46, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b47, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b59, "HP Elite mt645 G7 Mobile Thin Client U89", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b5f, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b63, "HP Elite Dragonfly 13.5 inch G4", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b65, "HP ProBook 455 15.6 inch G10 Notebook PC", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b66, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b70, "HP EliteBook 835 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b72, "HP EliteBook 845 G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b74, "HP EliteBook 845W G10", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b77, "HP ElieBook 865 G10", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b7a, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b7d, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b87, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b8a, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b8b, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b8f, "HP", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b92, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bb3, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bb4, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bbe, "HP Victus 16-r0xxx (MB 8BBE)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bc8, "HP Victus 15-fa1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bd4, "HP Victus 16-s0xxx (MB 8BD4)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bd6, "HP Pavilion Aero Laptop 13z-be200", ALC287_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bdf, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be0, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be1, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be2, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be3, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be5, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be6, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be7, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be8, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8be9, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8bf0, "HP", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c15, "HP Spectre x360 2-in-1 Laptop 14-eu0xxx", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c16, "HP Spectre x360 2-in-1 Laptop 16-aa0xxx", ALC245_FIXUP_HP_SPECTRE_X360_16_AA0XXX),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c17, "HP Spectre 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c21, "HP Pavilion Plus Laptop 14-ey0XXX", ALC245_FIXUP_HP_X360_MUTE_LEDS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c2d, "HP Victus 15-fa1xxx (MB 8C2D)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c30, "HP Victus 15-fb1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c46, "HP EliteBook 830 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c47, "HP EliteBook 840 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c48, "HP EliteBook 860 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c49, "HP Elite x360 830 2-in-1 G11", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c4d, "HP Omen", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c4e, "HP Omen", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c4f, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c50, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c51, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c52, "HP EliteBook 1040 G11", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c53, "HP Elite x360 1040 2-in-1 G11", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c66, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c67, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c68, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c6a, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c70, "HP EliteBook 835 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c71, "HP EliteBook 845 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c72, "HP EliteBook 865 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c7b, "HP ProBook 445 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c7c, "HP ProBook 445 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c7d, "HP ProBook 465 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c7e, "HP ProBook 465 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c7f, "HP EliteBook 645 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c80, "HP EliteBook 645 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c81, "HP EliteBook 665 G11", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c89, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c8a, "HP EliteBook 630", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c8c, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c8d, "HP ProBook 440 G11", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c8e, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c90, "HP EliteBook 640", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c91, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c97, "HP ZBook", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c99, "HP Victus 16-r1xxx (MB 8C99)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8c9c, "HP Victus 16-s1xxx (MB 8C9C)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ca1, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ca2, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ca4, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ca7, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8caf, "HP Elite mt645 G8 Mobile Thin Client", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8cbd, "HP Pavilion Aero Laptop 13-bg0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8cdd, "HP Spectre", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8cde, "HP OmniBook Ultra Flip Laptop 14t", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8cdf, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ce0, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d01, "HP ZBook Power 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d07, "HP Victus 15-fb2xxx (MB 8D07)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d18, "HP EliteStudio 8 AIO", ALC274_FIXUP_HP_AIO_BIND_DACS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d84, "HP EliteBook X G1i", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d85, "HP EliteBook 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d86, "HP Elite X360 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d8c, "HP EliteBook 13 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d8d, "HP Elite X360 13 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d8e, "HP EliteBook 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d8f, "HP EliteBook 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d90, "HP EliteBook 16 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d91, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d92, "HP ZBook Firefly 16 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d9b, "HP 17 Turbine OmniBook 7 UMA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d9c, "HP 17 Turbine OmniBook 7 DIS", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d9d, "HP 17 Turbine OmniBook X UMA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d9e, "HP 17 Turbine OmniBook X DIS", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8d9f, "HP 14 Cadet (x360)", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8da0, "HP 16 Clipper OmniBook 7(X360)", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8da1, "HP 16 Clipper OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8da7, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8da8, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dd4, "HP EliteStudio 8 AIO", ALC274_FIXUP_HP_AIO_BIND_DACS),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8de8, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8de9, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dec, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ded, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dee, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8def, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8df0, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8df1, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dfb, "HP EliteBook 6 G1a 14", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dfc, "HP EliteBook 645 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dfd, "HP EliteBook 6 G1a 16", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8dfe, "HP EliteBook 665 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e11, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e12, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e13, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e14, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e15, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e16, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e17, "HP ZBook Firefly 14 G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e18, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e19, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e1a, "HP ZBook Firefly 14 G12A", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e1b, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e1c, "HP EliteBook G12", ALC245_FIXUP_HP_ZBOOK_FIREFLY_G12A),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e1d, "HP ZBook X Gli 16 G12", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e2c, "HP EliteBook 16 G12", ALC285_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e36, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e37, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e3a, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e3b, "HP Agusta", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8eb6, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8eb7, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8eb8, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ec1, "HP 200 G2i", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ec4, "HP Bantie I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ec5, "HP Bantie I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ece, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ecf, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed2, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed5, "HP EliteBook 8 Flip G2i 13", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed6, "HP EliteBook 8 G2i 13", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed7, "HP EliteBook 8 G2i 14", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed8, "HP EliteBook 8 G2i 16", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ed9, "HP ZBook Firefly 14W", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8eda, "HP ZBook Firefly 16W", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ee4, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8ee5, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f0c, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f0e, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f40, "HP ZBook 8 G2a 14", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f41, "HP ZBook 8 G2a 16", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f42, "HP ZBook 8 G2a 14W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8f62, "HP ZBook 8 G2a 16W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1054, "ASUS G614FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x106f, "ASUS VivoBook X515UA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1074, "ASUS G614PH/PM/PP", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10a1, "ASUS UX391UA", ALC294_FIXUP_ASUS_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10a4, "ASUS TP3407SA", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10c0, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10d3, "ASUS K6500ZC", ALC294_FIXUP_ASUS_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1154, "ASUS TP3607SH", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1194, "ASUS UM3406KA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1204, "ASUS Strix G615JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1214, "ASUS Strix G615LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x125e, "ASUS Q524UQK", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1271, "ASUS X430UN", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1294, "ASUS B3405CVA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12af, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12b4, "ASUS B3405CCA / P3405CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1314, "ASUS GA605K", ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1384, "ASUS RC73XA", ALC287_FIXUP_TXNW2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1394, "ASUS RC73YA", ALC287_FIXUP_TXNW2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1454, "ASUS PM3406CKA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1460, "Asus VivoBook 15", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1463, "Asus GA402X/GA402N", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604VI/VC/VE/VG/VJ/VQ/VU/VV/VY/VZ", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1483, "ASUS GU603VQ/VU/VV/VJ/VI", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1493, "ASUS GV601VV/VU/VJ/VQ/VI", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G614JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS G513PI/PU/PV", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14f2, "ASUS VivoBook X515JA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1503, "ASUS G733PY/PZ/PZV/PYV", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1533, "ASUS GV302XA/XJ/XQ/XU/XV/XI", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1573, "ASUS GZ301VV/VQ/VU/VJ/VA/VC/VE/VVC/VQC/VUC/VJC/VEC/VCC", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1652, "ASUS ROG Zephyrus Do 15 SE", ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1663, "ASUS GU603ZI/ZJ/ZQ/ZU/ZV", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1683, "ASUS UM3402YAR", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS UX3402VA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16d3, "ASUS UX5304VA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS UX7602VI/BZ", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1863, "ASUS UX6404VI/VV", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS UM3504DA", ALC294_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x194e, "ASUS UX563FD", ALC294_FIXUP_ASUS_HPE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1970, "ASUS UX550VE", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1982, "ASUS B1400CEPE", ALC256_FIXUP_ASUS_HPE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1a63, "ASUS UX3405MA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1a83, "ASUS UM5302LA", ALC294_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1a8e, "ASUS G712LWS", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1a8f, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1b13, "ASUS U41SV/GA403U", ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1b93, "ASUS G614JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c03, "ASUS UM3406HA", ALC294_FIXUP_ASUS_I2C_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c33, "ASUS UX5304MA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c43, "ASUS UX8406MA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c63, "ASUS GU605M", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c80, "ASUS VivoBook TP401", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c9f, "ASUS G614JU/JV/JI", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JY/JZ/JI/JG", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1ccf, "ASUS G814JU/JV/JI", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1cdf, "ASUS G814JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1cef, "ASUS G834JY/JZ/JI/JG", ALC285_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1d1f, "ASUS G713PI/PU/PV/PVN", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1df3, "ASUS UM5606WA", ALC294_FIXUP_BASS_SPEAKER_15),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1264, "ASUS UM5606KA", ALC294_FIXUP_BASS_SPEAKER_15),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e02, "ASUS UX3402ZA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e10, "ASUS VivoBook X507UAR", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e12, "ASUS UM3402", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e63, "ASUS H7606W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1e93, "ASUS ExpertBook B9403CVAR", ALC294_FIXUP_ASUS_HPE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f1f, "ASUS H7604JI/JV/J3D", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f63, "ASUS P5405CSA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1fb3, "ASUS ROG Flow Z13 GZ302EA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3011, "ASUS B5605CVA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3061, "ASUS B3405CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3071, "ASUS B5405CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x30c1, "ASUS B3605CCA / P3605CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x30d1, "ASUS B5405CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x30e1, "ASUS B5605CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x31d0, "ASUS Zen AIO 27 Z272SD_A272SD", ALC274_FIXUP_ASUS_ZEN_AIO_27),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x31e1, "ASUS B5605CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x31f1, "ASUS B3605CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3391, "ASUS PM3606CKA", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3d78, "ASUS GA603KH", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3d88, "ASUS GA603KM", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3e00, "ASUS G814FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3e20, "ASUS G814PH/PM/PP", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3e30, "ASUS TP3607SA", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3ee0, "ASUS Strix G815_JHR_JMR_JPR", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3ef0, "ASUS Strix G635LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3f00, "ASUS Strix G815LH_LM_LP", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3f10, "ASUS Strix G835LR_LW_LX", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3f20, "ASUS Strix G615LR_LW", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3f30, "ASUS Strix G815LR_LW", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3fd0, "ASUS B3605CVA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x3ff0, "ASUS B5405CVA", ALC245_FIXUP_CS35L41_SPI_2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x88f4, "ASUS NUC14LNS", ALC245_FIXUP_CS35L41_SPI_1),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x90b5, "Sony VAIO Pro 11", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1629, "Lifebook U7x7", ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x119e, "Positivo SU C1400", ALC269_FIXUP_ASPIRE_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x11bc, "VAIO VJFE-IL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x1230, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x12f6, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_ASPIRE_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1414, 0x9c20, "Microsoft Surface Pro 2/3", ALC288_FIXUP_SURFACE_SWAP_DACS),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc1a4, "Samsung Galaxy Book Pro 360 (NT935QBD)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc1a6, "Samsung Galaxy Book Pro 360 (NP930QBD)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc832, "Samsung Galaxy Book Flex Alpha (NP730QCJ)", ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xca03, "Samsung Galaxy Book2 Pro 360 (NP930QED)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xca06, "Samsung Galaxy Book3 360 (NP730QFG)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc868, "Samsung Galaxy Book2 Pro (NP930XED)", ALC298_FIXUP_SAMSUNG_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc870, "Samsung Galaxy Book2 Pro (NP950XED)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc872, "Samsung Galaxy Book2 Pro (NP950XEE)", ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc886, "Samsung Galaxy Book3 Pro (NP964XFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc1ca, "Samsung Galaxy Book3 Pro 360 (NP960QFG)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc1cc, "Samsung Galaxy Book3 Ultra (NT960XFH)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x152d, 0x1082, "Quanta NL3", ALC269_FIXUP_LIFEBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x152d, 0x1262, "Huawei NBLB-WAX9N", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x0353, "Clevo V35[05]SN[CDE]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x1323, "Clevo N130ZU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x1325, "Clevo N15[01][CW]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x1401, "Clevo L140[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x1403, "Clevo N140CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x35a1, "Clevo V3[56]0EN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x35b1, "Clevo V3[57]0WN[MNP]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x4041, "Clevo NV4[15]PZ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x40a1, "Clevo NL40GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x40c1, "Clevo NL40[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x40d1, "Clevo NL41DU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5015, "Clevo NH5[58]H[HJK]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5017, "Clevo NH7[79]H[HJK]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50a3, "Clevo NJ51GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50b3, "Clevo NK50S[BEZ]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50b6, "Clevo NK50S5", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50b8, "Clevo NK50SZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50d5, "Clevo NP50D5", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50e1, "Clevo NH5[58]HPQ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50e2, "Clevo NH7[79]HPQ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50f0, "Clevo NH50A[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50f2, "Clevo NH50E[PR]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50f3, "Clevo NH58DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50f5, "Clevo NH55EPY", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50f6, "Clevo NH55DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5101, "Clevo S510WU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5157, "Clevo W517GU1", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x51a1, "Clevo NS50MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x51b1, "Clevo NS50AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x51b3, "Clevo NS70AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5630, "Clevo NP50RNJS", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5700, "Clevo X560WN[RST]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70a1, "Clevo NB70T[HJK]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70b3, "Clevo NK70SB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70f2, "Clevo NH79EPY", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70f3, "Clevo NH77DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70f4, "Clevo NH77EPY", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70f6, "Clevo NH77DPQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7716, "Clevo NS50PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7717, "Clevo NS70PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7718, "Clevo L140PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7724, "Clevo L140AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8228, "Clevo NR40BU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8520, "Clevo NH50D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8521, "Clevo NH77D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8535, "Clevo NH50D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8536, "Clevo NH79D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8550, "Clevo NH[57][0-9][ER][ACDH]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8551, "Clevo NH[57][0-9][ER][ACDH]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8560, "Clevo NH[57][0-9][ER][ACDH]Q", ALC269_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8561, "Clevo NH[57][0-9][ER][ACDH]Q", ALC269_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8562, "Clevo NH[57][0-9]RZ[Q]", ALC269_FIXUP_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8668, "Clevo NP50B[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x866d, "Clevo NP5[05]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x867c, "Clevo NP7[01]PNP", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x867d, "Clevo NP7[01]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8680, "Clevo NJ50LU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8a20, "Clevo NH55DCQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8a51, "Clevo NH70RCQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x8d50, "Clevo NH55RCQ-M", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x951d, "Clevo N950T[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x9600, "Clevo N960K[PR]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x961d, "Clevo N960S[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x971d, "Clevo N970T[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa500, "Clevo NL5[03]RU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa554, "VAIO VJFH52", ALC269_FIXUP_VAIO_VJFH52_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa559, "VAIO RPL", ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa600, "Clevo NL50NU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa650, "Clevo NP[567]0SN[CD]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa671, "Clevo NP70SN[CDE]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa741, "Clevo V54x_6x_TNE", ALC245_FIXUP_CLEVO_NOISY_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa743, "Clevo V54x_6x_TU", ALC245_FIXUP_CLEVO_NOISY_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xa763, "Clevo V54x_6x_TU", ALC245_FIXUP_CLEVO_NOISY_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xb018, "Clevo NP50D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xb019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xb022, "Clevo NH77D[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xc018, "Clevo NP50D[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xc019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xc022, "Clevo NH77[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21f3, "Thinkpad T430", ALC269_FIXUP_LENOVO_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2211, "Thinkpad W541", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x222d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x222e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2234, "Thinkpad ICE-1", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2245, "Thinkpad T470", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2246, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2247, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2249, "Thinkpad", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x224b, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x231e, "Thinkpad", ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x231f, "Thinkpad", ALC287_FIXUP_LENOVO_THKPAD_WH_ALC1318),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2326, "Hera2", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3111, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x312a, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3151, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3176, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x334b, "Lenovo ThinkCentre M70 Gen5", ALC283_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3384, "ThinkCentre M90a PRO", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3386, "ThinkCentre M90a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3387, "ThinkCentre M70a Gen6", ALC233_FIXUP_LENOVO_L2MH_LOW_ENLED),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3801, "Lenovo Yoga9 14IAP7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	HDA_CODEC_QUIRK(0x17aa, 0x3802, "DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga Pro 9 14IRP8", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940 / Yoga Duet 7", ALC298_FIXUP_LENOVO_C940_DUET7),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS),</div><div class='add'>+	HDA_CODEC_QUIRK(0x17aa, 0x3820, "IdeaPad 330-17IKB 81DM", ALC269_FIXUP_ASPIRE_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x383d, "Legion Y9000X 2019", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3847, "Legion 7 16ACHG6", ALC287_FIXUP_LEGION_16ACHG6),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x384a, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3852, "Lenovo Yoga 7 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3855, "Legion 7 16ITHG6", ALC287_FIXUP_LEGION_16ITHG6),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3865, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3866, "Lenovo 13X", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3869, "Lenovo Yoga7 14IAL7", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	HDA_CODEC_QUIRK(0x17aa, 0x386e, "Legion Y9000X 2022 IAH7", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x386e, "Yoga Pro 7 14ARP8", ALC285_FIXUP_SPEAKER2_TO_DAC1),</div><div class='add'>+	HDA_CODEC_QUIRK(0x17aa, 0x38a8, "Legion Pro 7 16ARX8H", ALC287_FIXUP_TAS2781_I2C), /* this must match before PCI SSID 17aa:386f below */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x386f, "Legion Pro 7i 16IAX7", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3870, "Lenovo Yoga 7 14ARB7", ALC287_FIXUP_YOGA7_14ARB7_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3877, "Lenovo Legion 7 Slim 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3878, "Lenovo Legion 7 Slim 16ARHA7", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x387d, "Yoga S780-16 pro Quad AAC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x387e, "Yoga S780-16 pro Quad YC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x387f, "Yoga S780-16 pro dual LX", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3880, "Yoga S780-16 pro dual YC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3881, "YB9 dual power mode2 YC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3882, "Lenovo Yoga Pro 7 14APH8", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3884, "Y780 YG DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3891, "Lenovo Yoga Pro 7 14AHP9", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38a5, "Y580P AMD dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38a9, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38ab, "Thinkbook 16P", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b4, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	HDA_CODEC_QUIRK(0x17aa, 0x391c, "Lenovo Yoga 7 2-in-1 14AKP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b5, "Legion Slim 7 16IRH8", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b6, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b7, "Legion Slim 7 16APH8", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b8, "Yoga S780-14.5 proX AMD YC Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38b9, "Yoga S780-14.5 proX AMD LX Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38ba, "Yoga S780-14.5 Air AMD quad YC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38bb, "Yoga S780-14.5 Air AMD quad AAC", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38bf, "Yoga S980-14.5 proX LX Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38c3, "Y980 DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38c7, "Thinkbook 13x Gen 4", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38c8, "Thinkbook 13x Gen 4", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38cb, "Y790 YG DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38cd, "Y790 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d2, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d3, "Yoga S990-16 Pro IMH YC Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d4, "Yoga S990-16 Pro IMH VECO Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d5, "Yoga S990-16 Pro IMH YC Quad", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d6, "Yoga S990-16 Pro IMH VECO Quad", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38d7, "Lenovo Yoga 9 14IMH9", ALC287_FIXUP_YOGA9_14IMH9_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38df, "Yoga Y990 Intel YC Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38e0, "Yoga Y990 Intel VECO Dual", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38f8, "Yoga Book 9i", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38df, "Y990 YG DUAL", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38f9, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38fa, "Thinkbook 16P Gen5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38fd, "ThinkBook plus Gen5 Hybrid", ALC287_FIXUP_TAS2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x390d, "Lenovo Yoga Pro 7 14ASP10", ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3913, "Lenovo 145", ALC236_FIXUP_LENOVO_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x391f, "Yoga S990-16 pro Quad YC Quad", ALC287_FIXUP_TXNW2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TXNW2781_I2C),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3929, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x392b, "Thinkbook 13x Gen 5", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5034, "Thinkpad T450", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5051, "Thinkpad L460", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x505d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x505f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5062, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x508b, "Thinkpad X12 Gen 1", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x9e56, "Lenovo ZhaoYang CF4620Z", ALC286_FIXUP_SONY_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x0269, "Positivo Master C6400", ALC269VB_FIXUP_ASUS_ZENBOOK),</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK),</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0xa233, "Positivo Master C6300", ALC269_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0440, "LG CQ6", ALC256_FIXUP_HEADPHONE_AMP_VOL),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0441, "LG CQ6 AIO", ALC256_FIXUP_HEADPHONE_AMP_VOL),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0488, "LG gram 16 (16Z90R)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0489, "LG gram 16 (16Z90R-A)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x048a, "LG gram 17 (17ZD90R)", ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS),</div><div class='add'>+	SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x19e5, 0x3212, "Huawei KLV-WX9 ", ALC256_FIXUP_ACER_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),</div><div class='add'>+	SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),</div><div class='add'>+	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),</div><div class='add'>+	SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */</div><div class='add'>+	SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),</div><div class='add'>+	SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),</div><div class='add'>+	SND_PCI_QUIRK(0x1c6c, 0x122a, "Positivo N14AP7", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x1c6c, 0x1251, "Positivo N14KP6-TG", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1132, "TongFang PHxTxX1", ALC256_FIXUP_SET_COEF_DEFAULTS),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1096, "TongFang GMxMRxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1100, "TongFang GKxNRxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1111, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1119, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1129, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x1409, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x300f, "TongFang X6AR5xxY", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d05, 0x3019, "TongFang X6FR5xxY", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d17, 0x3288, "Haier Boyue G42", ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1ee7, 0x2078, "HONOR BRB-X M1010", ALC2XX_FIXUP_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1f66, 0x0105, "Ayaneo Portable Game Player", ALC287_FIXUP_CS35L41_I2C_2),</div><div class='add'>+	SND_PCI_QUIRK(0x2014, 0x800a, "Positivo ARN50", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x1407, "Positivo P15X", ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x1409, "Positivo K116J", ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x1701, "Infinix Y4 Max", ALC269VC_FIXUP_INFINIX_Y4_MAX),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x1705, "MEDION E15433", ALC269VC_FIXUP_INFINIX_Y4_MAX),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),</div><div class='add'>+	SND_PCI_QUIRK(0x2782, 0x4900, "MEDION E15443", ALC233_FIXUP_MEDION_MTL_SPK),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x3038, "Intel NUC 13", ALC295_FIXUP_CHROME_BOOK),</div><div class='add'>+	SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0xf111, 0x0006, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0xf111, 0x0009, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0xf111, 0x000b, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0xf111, 0x000c, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* Below is a quirk table taken from the old code.</div><div class='add'>+	 * Basically the device should work as is without the fixup table.</div><div class='add'>+	 * If BIOS doesn't give a proper info, enable the corresponding</div><div class='add'>+	 * fixup entry.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",</div><div class='add'>+		      ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11b3, "ASUS K52DR", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82JV", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1593, "ASUS N51Vn", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x152d, 0x1778, "Quanta ON1", ALC269_FIXUP_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3be9, "Quanta Wistron", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17ff, 0x059a, "Quanta EL3", ALC269_FIXUP_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x17ff, 0x059b, "Quanta JR1", ALC269_FIXUP_DMIC),</div><div class='add'>+#endif</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc269_fixup_vendor_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo XPAD", ALC269_FIXUP_LENOVO_XPAD_ACPI),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x19e5, "Huawei Matebook", ALC255_FIXUP_MIC_MUTE_LED),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc269_fixup_models[] = {</div><div class='add'>+	{.id = ALC269_FIXUP_AMIC, .name = "laptop-amic"},</div><div class='add'>+	{.id = ALC269_FIXUP_DMIC, .name = "laptop-dmic"},</div><div class='add'>+	{.id = ALC269_FIXUP_STEREO_DMIC, .name = "alc269-dmic"},</div><div class='add'>+	{.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"},</div><div class='add'>+	{.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},</div><div class='add'>+	{.id = ALC269_FIXUP_HEADSET_MIC, .name = "headset-mic"},</div><div class='add'>+	{.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},</div><div class='add'>+	{.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},</div><div class='add'>+	{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},</div><div class='add'>+	{.id = ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST, .name = "lenovo-dock-limit-boost"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED, .name = "hp-dock-gpio-mic1-led"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, .name = "dell-headset3"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, .name = "dell-headset4"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET, .name = "dell-headset4-quiet"},</div><div class='add'>+	{.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},</div><div class='add'>+	{.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},</div><div class='add'>+	{.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},</div><div class='add'>+	{.id = ALC292_FIXUP_TPT440, .name = "tpt440"},</div><div class='add'>+	{.id = ALC292_FIXUP_TPT460, .name = "tpt460"},</div><div class='add'>+	{.id = ALC298_FIXUP_TPT470_DOCK_FIX, .name = "tpt470-dock-fix"},</div><div class='add'>+	{.id = ALC298_FIXUP_TPT470_DOCK, .name = "tpt470-dock"},</div><div class='add'>+	{.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},</div><div class='add'>+	{.id = ALC700_FIXUP_INTEL_REFERENCE, .name = "alc700-ref"},</div><div class='add'>+	{.id = ALC269_FIXUP_SONY_VAIO, .name = "vaio"},</div><div class='add'>+	{.id = ALC269_FIXUP_DELL_M101Z, .name = "dell-m101z"},</div><div class='add'>+	{.id = ALC269_FIXUP_ASUS_G73JW, .name = "asus-g73jw"},</div><div class='add'>+	{.id = ALC269_FIXUP_LENOVO_EAPD, .name = "lenovo-eapd"},</div><div class='add'>+	{.id = ALC275_FIXUP_SONY_HWEQ, .name = "sony-hweq"},</div><div class='add'>+	{.id = ALC269_FIXUP_PCM_44K, .name = "pcm44k"},</div><div class='add'>+	{.id = ALC269_FIXUP_LIFEBOOK, .name = "lifebook"},</div><div class='add'>+	{.id = ALC269_FIXUP_LIFEBOOK_EXTMIC, .name = "lifebook-extmic"},</div><div class='add'>+	{.id = ALC269_FIXUP_LIFEBOOK_HP_PIN, .name = "lifebook-hp-pin"},</div><div class='add'>+	{.id = ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC, .name = "lifebook-u7x7"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_AMIC, .name = "alc269vb-amic"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_DMIC, .name = "alc269vb-dmic"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_MUTE_LED_MIC1, .name = "hp-mute-led-mic1"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_MUTE_LED_MIC2, .name = "hp-mute-led-mic2"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_MUTE_LED_MIC3, .name = "hp-mute-led-mic3"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_GPIO_MIC1_LED, .name = "hp-gpio-mic1"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_LINE1_MIC1_LED, .name = "hp-line1-mic1"},</div><div class='add'>+	{.id = ALC269_FIXUP_NO_SHUTUP, .name = "noshutup"},</div><div class='add'>+	{.id = ALC286_FIXUP_SONY_MIC_NO_PRESENCE, .name = "sony-nomic"},</div><div class='add'>+	{.id = ALC269_FIXUP_ASPIRE_HEADSET_MIC, .name = "aspire-headset-mic"},</div><div class='add'>+	{.id = ALC269_FIXUP_ASUS_X101, .name = "asus-x101"},</div><div class='add'>+	{.id = ALC271_FIXUP_HP_GATE_MIC_JACK, .name = "acer-ao7xx"},</div><div class='add'>+	{.id = ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572, .name = "acer-aspire-e1"},</div><div class='add'>+	{.id = ALC269_FIXUP_ACER_AC700, .name = "acer-ac700"},</div><div class='add'>+	{.id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST, .name = "limit-mic-boost"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_ASUS_ZENBOOK, .name = "asus-zenbook"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A, .name = "asus-zenbook-ux31a"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_ORDISSIMO_EVE2, .name = "ordissimo"},</div><div class='add'>+	{.id = ALC282_FIXUP_ASUS_TX300, .name = "asus-tx300"},</div><div class='add'>+	{.id = ALC283_FIXUP_INT_MIC, .name = "alc283-int-mic"},</div><div class='add'>+	{.id = ALC290_FIXUP_MONO_SPEAKERS_HSJACK, .name = "mono-speakers"},</div><div class='add'>+	{.id = ALC290_FIXUP_SUBWOOFER_HSJACK, .name = "alc290-subwoofer"},</div><div class='add'>+	{.id = ALC269_FIXUP_THINKPAD_ACPI, .name = "thinkpad"},</div><div class='add'>+	{.id = ALC269_FIXUP_LENOVO_XPAD_ACPI, .name = "lenovo-xpad-led"},</div><div class='add'>+	{.id = ALC269_FIXUP_DMIC_THINKPAD_ACPI, .name = "dmic-thinkpad"},</div><div class='add'>+	{.id = ALC255_FIXUP_ACER_MIC_NO_PRESENCE, .name = "alc255-acer"},</div><div class='add'>+	{.id = ALC255_FIXUP_ASUS_MIC_NO_PRESENCE, .name = "alc255-asus"},</div><div class='add'>+	{.id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc255-dell1"},</div><div class='add'>+	{.id = ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "alc255-dell2"},</div><div class='add'>+	{.id = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc293-dell1"},</div><div class='add'>+	{.id = ALC283_FIXUP_HEADSET_MIC, .name = "alc283-headset"},</div><div class='add'>+	{.id = ALC255_FIXUP_MIC_MUTE_LED, .name = "alc255-dell-mute"},</div><div class='add'>+	{.id = ALC282_FIXUP_ASPIRE_V5_PINS, .name = "aspire-v5"},</div><div class='add'>+	{.id = ALC269VB_FIXUP_ASPIRE_E1_COEF, .name = "aspire-e1-coef"},</div><div class='add'>+	{.id = ALC280_FIXUP_HP_GPIO4, .name = "hp-gpio4"},</div><div class='add'>+	{.id = ALC286_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},</div><div class='add'>+	{.id = ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY, .name = "hp-gpio2-hotkey"},</div><div class='add'>+	{.id = ALC280_FIXUP_HP_DOCK_PINS, .name = "hp-dock-pins"},</div><div class='add'>+	{.id = ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED, .name = "hp-dock-gpio-mic"},</div><div class='add'>+	{.id = ALC280_FIXUP_HP_9480M, .name = "hp-9480m"},</div><div class='add'>+	{.id = ALC288_FIXUP_DELL_HEADSET_MODE, .name = "alc288-dell-headset"},</div><div class='add'>+	{.id = ALC288_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc288-dell1"},</div><div class='add'>+	{.id = ALC288_FIXUP_DELL_XPS_13, .name = "alc288-dell-xps13"},</div><div class='add'>+	{.id = ALC292_FIXUP_DELL_E7X, .name = "dell-e7x"},</div><div class='add'>+	{.id = ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK, .name = "alc293-dell"},</div><div class='add'>+	{.id = ALC298_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc298-dell1"},</div><div class='add'>+	{.id = ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE, .name = "alc298-dell-aio"},</div><div class='add'>+	{.id = ALC275_FIXUP_DELL_XPS, .name = "alc275-dell-xps"},</div><div class='add'>+	{.id = ALC293_FIXUP_LENOVO_SPK_NOISE, .name = "lenovo-spk-noise"},</div><div class='add'>+	{.id = ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, .name = "lenovo-hotkey"},</div><div class='add'>+	{.id = ALC255_FIXUP_DELL_SPK_NOISE, .name = "dell-spk-noise"},</div><div class='add'>+	{.id = ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc225-dell1"},</div><div class='add'>+	{.id = ALC295_FIXUP_DISABLE_DAC3, .name = "alc295-disable-dac3"},</div><div class='add'>+	{.id = ALC285_FIXUP_SPEAKER2_TO_DAC1, .name = "alc285-speaker2-to-dac1"},</div><div class='add'>+	{.id = ALC280_FIXUP_HP_HEADSET_MIC, .name = "alc280-hp-headset"},</div><div class='add'>+	{.id = ALC221_FIXUP_HP_FRONT_MIC, .name = "alc221-hp-mic"},</div><div class='add'>+	{.id = ALC298_FIXUP_SPK_VOLUME, .name = "alc298-spk-volume"},</div><div class='add'>+	{.id = ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER, .name = "dell-inspiron-7559"},</div><div class='add'>+	{.id = ALC269_FIXUP_ATIV_BOOK_8, .name = "ativ-book"},</div><div class='add'>+	{.id = ALC221_FIXUP_HP_MIC_NO_PRESENCE, .name = "alc221-hp-mic"},</div><div class='add'>+	{.id = ALC256_FIXUP_ASUS_HEADSET_MODE, .name = "alc256-asus-headset"},</div><div class='add'>+	{.id = ALC256_FIXUP_ASUS_MIC, .name = "alc256-asus-mic"},</div><div class='add'>+	{.id = ALC256_FIXUP_ASUS_AIO_GPIO2, .name = "alc256-asus-aio"},</div><div class='add'>+	{.id = ALC233_FIXUP_ASUS_MIC_NO_PRESENCE, .name = "alc233-asus"},</div><div class='add'>+	{.id = ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE, .name = "alc233-eapd"},</div><div class='add'>+	{.id = ALC294_FIXUP_LENOVO_MIC_LOCATION, .name = "alc294-lenovo-mic"},</div><div class='add'>+	{.id = ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE, .name = "alc225-wyse"},</div><div class='add'>+	{.id = ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, .name = "alc274-dell-aio"},</div><div class='add'>+	{.id = ALC255_FIXUP_DUMMY_LINEOUT_VERB, .name = "alc255-dummy-lineout"},</div><div class='add'>+	{.id = ALC255_FIXUP_DELL_HEADSET_MIC, .name = "alc255-dell-headset"},</div><div class='add'>+	{.id = ALC295_FIXUP_HP_X360, .name = "alc295-hp-x360"},</div><div class='add'>+	{.id = ALC225_FIXUP_HEADSET_JACK, .name = "alc-headset-jack"},</div><div class='add'>+	{.id = ALC295_FIXUP_CHROME_BOOK, .name = "alc-chrome-book"},</div><div class='add'>+	{.id = ALC256_FIXUP_CHROME_BOOK, .name = "alc-2024y-chromebook"},</div><div class='add'>+	{.id = ALC299_FIXUP_PREDATOR_SPK, .name = "predator-spk"},</div><div class='add'>+	{.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"},</div><div class='add'>+	{.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"},</div><div class='add'>+	{.id = ALC298_FIXUP_SAMSUNG_AMP, .name = "alc298-samsung-amp"},</div><div class='add'>+	{.id = ALC298_FIXUP_SAMSUNG_AMP_V2_2_AMPS, .name = "alc298-samsung-amp-v2-2-amps"},</div><div class='add'>+	{.id = ALC298_FIXUP_SAMSUNG_AMP_V2_4_AMPS, .name = "alc298-samsung-amp-v2-4-amps"},</div><div class='add'>+	{.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"},</div><div class='add'>+	{.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"},</div><div class='add'>+	{.id = ALC274_FIXUP_HP_MIC, .name = "alc274-hp-mic-detect"},</div><div class='add'>+	{.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"},</div><div class='add'>+	{.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"},</div><div class='add'>+	{.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},</div><div class='add'>+	{.id = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"},</div><div class='add'>+	{.id = ALC285_FIXUP_HP_SPECTRE_X360_DF1, .name = "alc285-hp-spectre-x360-df1"},</div><div class='add'>+	{.id = ALC285_FIXUP_HP_ENVY_X360, .name = "alc285-hp-envy-x360"},</div><div class='add'>+	{.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},</div><div class='add'>+	{.id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, .name = "alc287-yoga9-bass-spk-pin"},</div><div class='add'>+	{.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},</div><div class='add'>+	{.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},</div><div class='add'>+	{.id = ALC285_FIXUP_HP_GPIO_AMP_INIT, .name = "alc285-hp-amp-init"},</div><div class='add'>+	{.id = ALC236_FIXUP_LENOVO_INV_DMIC, .name = "alc236-fixup-lenovo-inv-mic"},</div><div class='add'>+	{.id = ALC2XX_FIXUP_HEADSET_MIC, .name = "alc2xx-fixup-headset-mic"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+#define ALC225_STANDARD_PINS \</div><div class='add'>+	{0x21, 0x04211020}</div><div class='add'>+</div><div class='add'>+#define ALC256_STANDARD_PINS \</div><div class='add'>+	{0x12, 0x90a60140}, \</div><div class='add'>+	{0x14, 0x90170110}, \</div><div class='add'>+	{0x21, 0x02211020}</div><div class='add'>+</div><div class='add'>+#define ALC282_STANDARD_PINS \</div><div class='add'>+	{0x14, 0x90170110}</div><div class='add'>+</div><div class='add'>+#define ALC290_STANDARD_PINS \</div><div class='add'>+	{0x12, 0x99a30130}</div><div class='add'>+</div><div class='add'>+#define ALC292_STANDARD_PINS \</div><div class='add'>+	{0x14, 0x90170110}, \</div><div class='add'>+	{0x15, 0x0221401f}</div><div class='add'>+</div><div class='add'>+#define ALC295_STANDARD_PINS \</div><div class='add'>+	{0x12, 0xb7a60130}, \</div><div class='add'>+	{0x14, 0x90170110}, \</div><div class='add'>+	{0x21, 0x04211020}</div><div class='add'>+</div><div class='add'>+#define ALC298_STANDARD_PINS \</div><div class='add'>+	{0x12, 0x90a60130}, \</div><div class='add'>+	{0x21, 0x03211020}</div><div class='add'>+</div><div class='add'>+static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0221, 0x103c, "HP Workstation", ALC221_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+		{0x14, 0x01014020},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x18, 0x02a11030},</div><div class='add'>+		{0x19, 0x0181303F},</div><div class='add'>+		{0x21, 0x0221102f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1025, "Acer", ALC255_FIXUP_ACER_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a601c0},</div><div class='add'>+		{0x14, 0x90171120},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1043, "ASUS", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x90a70130},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1043, "ASUS", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x1a, 0x90a70130},</div><div class='add'>+		{0x1b, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60130},</div><div class='add'>+		{0x14, 0x901701a0}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60130},</div><div class='add'>+		{0x14, 0x901701b0}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60150},</div><div class='add'>+		{0x14, 0x901701a0}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60150},</div><div class='add'>+		{0x14, 0x901701b0}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60130},</div><div class='add'>+		{0x1b, 0x90170110}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0233, 0x8086, "Intel NUC Skull Canyon", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x1b, 0x01111010},</div><div class='add'>+		{0x1e, 0x01451130},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11030},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11030},</div><div class='add'>+		{0x1a, 0x02a11040},</div><div class='add'>+		{0x1b, 0x01014020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11030},</div><div class='add'>+		{0x1a, 0x02a11040},</div><div class='add'>+		{0x1b, 0x01011020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11020},</div><div class='add'>+		{0x1a, 0x02a11030},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC,</div><div class='add'>+		{0x21, 0x02211010}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0236, 0x103c, "HP", ALC256_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11020},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x21, 0x02211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60160},</div><div class='add'>+		{0x14, 0x90170120},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x02011020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x01011020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x1b, 0x01014020},</div><div class='add'>+		{0x21, 0x0221103f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x1b, 0x01011020},</div><div class='add'>+		{0x21, 0x0221103f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x1b, 0x02011020},</div><div class='add'>+		{0x21, 0x0221103f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170150},</div><div class='add'>+		{0x1b, 0x02011020},</div><div class='add'>+		{0x21, 0x0221105f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x01014020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60160},</div><div class='add'>+		{0x14, 0x90170120},</div><div class='add'>+		{0x17, 0x90170140},</div><div class='add'>+		{0x21, 0x0321102f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60160},</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x21, 0x02211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60160},</div><div class='add'>+		{0x14, 0x90170140},</div><div class='add'>+		{0x21, 0x02211050}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60170},</div><div class='add'>+		{0x14, 0x90170120},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60170},</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x21, 0x02211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60170},</div><div class='add'>+		{0x14, 0x90171130},</div><div class='add'>+		{0x21, 0x02211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60170},</div><div class='add'>+		{0x14, 0x90170140},</div><div class='add'>+		{0x21, 0x02211050}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5548", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60180},</div><div class='add'>+		{0x14, 0x90170130},</div><div class='add'>+		{0x21, 0x02211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5565", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60180},</div><div class='add'>+		{0x14, 0x90170120},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x1b, 0x01011020},</div><div class='add'>+		{0x21, 0x02211010}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x90a70130},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x90a70130},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x1a, 0x90a70130},</div><div class='add'>+		{0x1b, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+       SND_HDA_PIN_QUIRK(0x10ec0256, 0x103c, "HP", ALC256_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x02a11020},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+       SND_HDA_PIN_QUIRK(0x10ec0274, 0x103c, "HP", ALC274_FIXUP_HP_HEADSET_MIC,</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x19, 0x03a11030},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0421101f},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0421101f},</div><div class='add'>+		{0x18, 0x02811030},</div><div class='add'>+		{0x1a, 0x04a1103f},</div><div class='add'>+		{0x1b, 0x02011020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP 15 Touchsmart", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x99a30130},</div><div class='add'>+		{0x19, 0x03a11020},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x99a30130},</div><div class='add'>+		{0x19, 0x03a11020},</div><div class='add'>+		{0x21, 0x03211040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x99a30130},</div><div class='add'>+		{0x19, 0x03a11030},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x99a30130},</div><div class='add'>+		{0x19, 0x04a11020},</div><div class='add'>+		{0x21, 0x0421101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x103c, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x19, 0x04a11030},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x1025, "Acer", ALC282_FIXUP_ACER_DISABLE_LINEOUT,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a609c0},</div><div class='add'>+		{0x18, 0x03a11830},</div><div class='add'>+		{0x19, 0x04a19831},</div><div class='add'>+		{0x1a, 0x0481303f},</div><div class='add'>+		{0x1b, 0x04211020},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0282, 0x1025, "Acer", ALC282_FIXUP_ACER_DISABLE_LINEOUT,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60940},</div><div class='add'>+		{0x18, 0x03a11830},</div><div class='add'>+		{0x19, 0x04a19831},</div><div class='add'>+		{0x1a, 0x0481303f},</div><div class='add'>+		{0x1b, 0x04211020},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60160},</div><div class='add'>+		{0x14, 0x90170120},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC282_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x19, 0x03a11020},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x04a11040},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x04a11040},</div><div class='add'>+		{0x1d, 0x40600001},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x19, 0x04a11040},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC285_FIXUP_THINKPAD_HEADSET_JACK,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x17, 0x90170111},</div><div class='add'>+		{0x19, 0x03a11030},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x19, 0x03a11030},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0287, 0x17aa, "Lenovo", ALC287_FIXUP_THINKPAD_I2S_SPK,</div><div class='add'>+		{0x17, 0x90170110}, /* 0x231f with RTK I2S AMP */</div><div class='add'>+		{0x19, 0x04a11040},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0286, 0x1025, "Acer", ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60120},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x21, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x15, 0x04211040},</div><div class='add'>+		{0x18, 0x90170112},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x15, 0x04211040},</div><div class='add'>+		{0x18, 0x90170110},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x15, 0x0421101f},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x15, 0x04211020},</div><div class='add'>+		{0x1a, 0x04a11040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x04211020},</div><div class='add'>+		{0x1a, 0x04a11040}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x04211020},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,</div><div class='add'>+		ALC290_STANDARD_PINS,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0421101f},</div><div class='add'>+		{0x1a, 0x04a11020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,</div><div class='add'>+		ALC292_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x16, 0x01014020},</div><div class='add'>+		{0x19, 0x01a19030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,</div><div class='add'>+		ALC292_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60140},</div><div class='add'>+		{0x16, 0x01014020},</div><div class='add'>+		{0x18, 0x02a19031},</div><div class='add'>+		{0x19, 0x01a1903e}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,</div><div class='add'>+		ALC292_STANDARD_PINS,</div><div class='add'>+		{0x12, 0x90a60140}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC292_STANDARD_PINS,</div><div class='add'>+		{0x13, 0x90a60140},</div><div class='add'>+		{0x16, 0x21014020},</div><div class='add'>+		{0x19, 0x21a19030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC292_STANDARD_PINS,</div><div class='add'>+		{0x13, 0x90a60140}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_HPE,</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_MIC,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x1b, 0x90a70130},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x04211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60120},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x04211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC298_STANDARD_PINS,</div><div class='add'>+		{0x17, 0x90170110}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC298_STANDARD_PINS,</div><div class='add'>+		{0x17, 0x90170140}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		ALC298_STANDARD_PINS,</div><div class='add'>+		{0x17, 0x90170150}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_SPK_VOLUME,</div><div class='add'>+		{0x12, 0xb7a60140},</div><div class='add'>+		{0x13, 0xb7a60150},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x1a, 0x03011020},</div><div class='add'>+		{0x21, 0x03211030}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0298, 0x1028, "Dell", ALC298_FIXUP_ALIENWARE_MIC_NO_PRESENCE,</div><div class='add'>+		{0x12, 0xb7a60140},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x1a, 0x03a11030},</div><div class='add'>+		{0x21, 0x03211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0299, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,</div><div class='add'>+		ALC225_STANDARD_PINS,</div><div class='add'>+		{0x12, 0xb7a60130},</div><div class='add'>+		{0x17, 0x90170110}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0623, 0x17aa, "Lenovo", ALC283_FIXUP_HEADSET_MIC,</div><div class='add'>+		{0x14, 0x01014010},</div><div class='add'>+		{0x17, 0x90170120},</div><div class='add'>+		{0x18, 0x02a11030},</div><div class='add'>+		{0x19, 0x02a1103f},</div><div class='add'>+		{0x21, 0x0221101f}),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This is the fallback pin_fixup_tbl for alc269 family, to make the tbl match</div><div class='add'>+ * more machines, don't need to match all valid pins, just need to match</div><div class='add'>+ * all the pins defined in the tbl. Just because of this reason, it is possible</div><div class='add'>+ * that a single machine matches multiple tbls, so there is one limitation:</div><div class='add'>+ *   at most one tbl is allowed to define for the same vendor and same codec</div><div class='add'>+ */</div><div class='add'>+static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1025, "Acer", ALC2XX_FIXUP_HEADSET_MIC,</div><div class='add'>+		{0x19, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,</div><div class='add'>+		{0x19, 0x40000000},</div><div class='add'>+		{0x1b, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET,</div><div class='add'>+		{0x19, 0x40000000},</div><div class='add'>+		{0x1b, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,</div><div class='add'>+		{0x19, 0x40000000},</div><div class='add'>+		{0x1a, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,</div><div class='add'>+		{0x19, 0x40000000},</div><div class='add'>+		{0x1a, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC269_FIXUP_DELL1_LIMIT_INT_MIC_BOOST,</div><div class='add'>+		{0x19, 0x40000000},</div><div class='add'>+		{0x1a, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC2XX_FIXUP_HEADSET_MIC,</div><div class='add'>+		{0x19, 0x40000000}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1558, "Clevo", ALC2XX_FIXUP_HEADSET_MIC,</div><div class='add'>+		{0x19, 0x40000000}),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc269_fill_coef(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_variant != ALC269_TYPE_ALC269VB)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((alc_get_coef0(codec) &amp; 0x00ff) &lt; 0x015) {</div><div class='add'>+		alc_write_coef_idx(codec, 0xf, 0x960b);</div><div class='add'>+		alc_write_coef_idx(codec, 0xe, 0x8817);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((alc_get_coef0(codec) &amp; 0x00ff) == 0x016) {</div><div class='add'>+		alc_write_coef_idx(codec, 0xf, 0x960b);</div><div class='add'>+		alc_write_coef_idx(codec, 0xe, 0x8814);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((alc_get_coef0(codec) &amp; 0x00ff) == 0x017) {</div><div class='add'>+		/* Power up output pin */</div><div class='add'>+		alc_update_coef_idx(codec, 0x04, 0, 1&lt;&lt;11);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((alc_get_coef0(codec) &amp; 0x00ff) == 0x018) {</div><div class='add'>+		val = alc_read_coef_idx(codec, 0xd);</div><div class='add'>+		if (val != -1 &amp;&amp; (val &amp; 0x0c00) &gt;&gt; 10 != 0x1) {</div><div class='add'>+			/* Capless ramp up clock control */</div><div class='add'>+			alc_write_coef_idx(codec, 0xd, val | (1&lt;&lt;10));</div><div class='add'>+		}</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x17);</div><div class='add'>+		if (val != -1 &amp;&amp; (val &amp; 0x01c0) &gt;&gt; 6 != 0x4) {</div><div class='add'>+			/* Class D power on reset */</div><div class='add'>+			alc_write_coef_idx(codec, 0x17, val | (1&lt;&lt;7));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HP */</div><div class='add'>+	alc_update_coef_idx(codec, 0x4, 0, 1&lt;&lt;11);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc269_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec)</div><div class='add'>+		hda_component_manager_free(&amp;spec-&gt;comps, &amp;comp_master_ops);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc269_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;gen.shared_mic_vref_pin = 0x18;</div><div class='add'>+	codec-&gt;power_save_node = 0;</div><div class='add'>+	spec-&gt;en_3kpull_low = true;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_default_shutup;</div><div class='add'>+	spec-&gt;init_hook = alc_default_init;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0269:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC269VA;</div><div class='add'>+		switch (alc_get_coef0(codec) &amp; 0x00f0) {</div><div class='add'>+		case 0x0010:</div><div class='add'>+			if (codec-&gt;bus-&gt;pci &amp;&amp;</div><div class='add'>+			    codec-&gt;bus-&gt;pci-&gt;subsystem_vendor == 0x1025 &amp;&amp;</div><div class='add'>+			    spec-&gt;cdefine.platform_type == 1)</div><div class='add'>+				err = alc_codec_rename(codec, "ALC271X");</div><div class='add'>+			spec-&gt;codec_variant = ALC269_TYPE_ALC269VB;</div><div class='add'>+			break;</div><div class='add'>+		case 0x0020:</div><div class='add'>+			if (codec-&gt;bus-&gt;pci &amp;&amp;</div><div class='add'>+			    codec-&gt;bus-&gt;pci-&gt;subsystem_vendor == 0x17aa &amp;&amp;</div><div class='add'>+			    codec-&gt;bus-&gt;pci-&gt;subsystem_device == 0x21f3)</div><div class='add'>+				err = alc_codec_rename(codec, "ALC3202");</div><div class='add'>+			spec-&gt;codec_variant = ALC269_TYPE_ALC269VC;</div><div class='add'>+			break;</div><div class='add'>+		case 0x0030:</div><div class='add'>+			spec-&gt;codec_variant = ALC269_TYPE_ALC269VD;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			alc_fix_pll_init(codec, 0x20, 0x04, 15);</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+		spec-&gt;shutup = alc269_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc269_fill_coef;</div><div class='add'>+		alc269_fill_coef(codec);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 0x10ec0280:</div><div class='add'>+	case 0x10ec0290:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC280;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0282:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC282;</div><div class='add'>+		spec-&gt;shutup = alc282_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc282_init;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC283;</div><div class='add'>+		spec-&gt;shutup = alc283_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc283_init;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0284:</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC284;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC293;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC286;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC298;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0235:</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC255;</div><div class='add'>+		spec-&gt;shutup = alc256_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc256_init;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC256;</div><div class='add'>+		spec-&gt;shutup = alc256_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc256_init;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */</div><div class='add'>+		if (codec-&gt;core.vendor_id == 0x10ec0236 &amp;&amp;</div><div class='add'>+		    codec-&gt;bus-&gt;pci-&gt;vendor != PCI_VENDOR_ID_AMD)</div><div class='add'>+			spec-&gt;en_3kpull_low = false;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC257;</div><div class='add'>+		spec-&gt;shutup = alc256_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc256_init;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+		spec-&gt;en_3kpull_low = false;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0245:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+		if (alc_get_coef0(codec) &amp; 0x0010)</div><div class='add'>+			spec-&gt;codec_variant = ALC269_TYPE_ALC245;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;codec_variant = ALC269_TYPE_ALC215;</div><div class='add'>+		spec-&gt;shutup = alc225_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc225_init;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC225;</div><div class='add'>+		spec-&gt;shutup = alc225_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc225_init;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* no loopback on ALC225, ALC295 and ALC299 */</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0287:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC287;</div><div class='add'>+		spec-&gt;shutup = alc225_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc225_init;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* no loopback on ALC287 */</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC294;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* ALC2x4 does not have any loopback mixer path */</div><div class='add'>+		alc_update_coef_idx(codec, 0x6b, 0x0018, (1&lt;&lt;4) | (1&lt;&lt;3)); /* UAJ MIC Vref control by verb */</div><div class='add'>+		spec-&gt;init_hook = alc294_init;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0300:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC300;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* no loopback on ALC300 */</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0222:</div><div class='add'>+	case 0x10ec0623:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC623;</div><div class='add'>+		spec-&gt;shutup = alc222_shutup;</div><div class='add'>+		spec-&gt;init_hook = alc222_init;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0700:</div><div class='add'>+	case 0x10ec0701:</div><div class='add'>+	case 0x10ec0703:</div><div class='add'>+	case 0x10ec0711:</div><div class='add'>+		spec-&gt;codec_variant = ALC269_TYPE_ALC700;</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0; /* ALC700 does not have any loopback mixer path */</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 1 &lt;&lt; 15, 0); /* Combo jack auto trigger control */</div><div class='add'>+		spec-&gt;init_hook = alc294_init;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (snd_hda_codec_read(codec, 0x51, 0, AC_VERB_PARAMETERS, 0) == 0x10ec5505) {</div><div class='add'>+		spec-&gt;has_alc5505_dsp = 1;</div><div class='add'>+		spec-&gt;init_hook = alc5505_dsp_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc269_fixup_models,</div><div class='add'>+		       alc269_fixup_tbl, alc269_fixups);</div><div class='add'>+	/* FIXME: both TX300 and ROG Strix G17 have the same SSID, and</div><div class='add'>+	 * the quirk breaks the latter (bko#214101).</div><div class='add'>+	 * Clear the wrong entry.</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;fixup_id == ALC282_FIXUP_ASUS_TX300 &amp;&amp;</div><div class='add'>+	    codec-&gt;core.vendor_id == 0x10ec0294) {</div><div class='add'>+		codec_dbg(codec, "Clear wrong fixup for ASUS ROG Strix G17\n");</div><div class='add'>+		codec-&gt;fixup_id = HDA_FIXUP_ID_NOT_SET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups, true);</div><div class='add'>+	snd_hda_pick_pin_fixup(codec, alc269_fallback_pin_fixup_tbl, alc269_fixups, false);</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL,	alc269_fixup_vendor_tbl,</div><div class='add'>+			   alc269_fixups);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Check whether ACPI describes companion amplifiers that require</div><div class='add'>+	 * component binding</div><div class='add'>+	 */</div><div class='add'>+	find_cirrus_companion_amps(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	alc_auto_parse_customize_define(codec);</div><div class='add'>+</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc269_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog &amp;&amp; spec-&gt;gen.beep_nid &amp;&amp; spec-&gt;gen.mixer_nid) {</div><div class='add'>+		err = set_beep_amp(spec, spec-&gt;gen.mixer_nid, 0x04, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	alc269_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc269_codec_ops = {</div><div class='add'>+	.probe = alc269_probe,</div><div class='add'>+	.remove = alc269_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = alc269_suspend,</div><div class='add'>+	.resume = alc269_resume,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc269[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0215, "ALC215"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0221, "ALC221"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0222, "ALC222"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0225, "ALC225"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0230, "ALC236"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0231, "ALC231"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0233, "ALC233"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0234, "ALC234"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0235, "ALC233"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0236, "ALC236"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0245, "ALC245"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0255, "ALC255"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0256, "ALC256"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0257, "ALC257"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0269, "ALC269"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0270, "ALC270"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0274, "ALC274"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0275, "ALC275"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0276, "ALC276"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0280, "ALC280"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0282, "ALC282"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0283, "ALC283"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0284, "ALC284"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0285, "ALC285"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0286, "ALC286"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0287, "ALC287"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0288, "ALC288"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0289, "ALC289"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0290, "ALC290"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0292, "ALC292"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0293, "ALC293"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0294, "ALC294"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0295, "ALC295"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0298, "ALC298"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0299, "ALC299"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0300, "ALC300"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0623, "ALC623"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0700, "ALC700"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0701, "ALC701"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0703, "ALC703"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0711, "ALC711"),</div><div class='add'>+	HDA_CODEC_ID(0x19e58326, "HW8326"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc269);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC269 and compatible HD-audio codecs");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc269_driver = {</div><div class='add'>+	.id = snd_hda_id_alc269,</div><div class='add'>+	.ops = &amp;alc269_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc269_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc662.c b/sound/hda/codecs/realtek/alc662.c<br/>new file mode 100644<br/>index 000000000000..5073165d1f3c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc662.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc662.c</a></div><div class='hunk'>@@ -0,0 +1,1116 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC662 and compatible codecs</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ALC662 support</div><div class='add'>+ *</div><div class='add'>+ * ALC662 is almost identical with ALC880 but has cleaner and more flexible</div><div class='add'>+ * configuration.  Each pin widget can choose any input DACs and a mixer.</div><div class='add'>+ * Each ADC is connected from a mixer of all inputs.  This makes possible</div><div class='add'>+ * 6-channel independent captures.</div><div class='add'>+ *</div><div class='add'>+ * In addition, an independent DAC for the multi-playback (not used in this</div><div class='add'>+ * driver yet).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto configuration</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int alc662_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc662_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc663_ssids[] = { 0x15, 0x1b, 0x14, 0x21 };</div><div class='add'>+	static const hda_nid_t alc662_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	const hda_nid_t *ssids;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x10ec0272 || codec-&gt;core.vendor_id == 0x10ec0663 ||</div><div class='add'>+	    codec-&gt;core.vendor_id == 0x10ec0665 || codec-&gt;core.vendor_id == 0x10ec0670 ||</div><div class='add'>+	    codec-&gt;core.vendor_id == 0x10ec0671)</div><div class='add'>+		ssids = alc663_ssids;</div><div class='add'>+	else</div><div class='add'>+		ssids = alc662_ssids;</div><div class='add'>+	return alc_parse_auto_config(codec, alc662_ignore, ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc272_fixup_mario(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,</div><div class='add'>+				      (0x3b &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				      (0x3b &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				      (0x03 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				      (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT)))</div><div class='add'>+		codec_warn(codec, "failed to override amp caps for NID 0x2\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* avoid D3 for keeping GPIO up */</div><div class='add'>+static unsigned int gpio_led_power_filter(struct hda_codec *codec,</div><div class='add'>+					  hda_nid_t nid,</div><div class='add'>+					  unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (nid == codec-&gt;core.afg &amp;&amp; power_state == AC_PWRST_D3 &amp;&amp; spec-&gt;gpio_data)</div><div class='add'>+		return AC_PWRST_D0;</div><div class='add'>+	return power_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc662_fixup_led_gpio1(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_hp_gpio_led(codec, action, 0x01, 0);</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mute_led_polarity = 1;</div><div class='add'>+		codec-&gt;power_filter = gpio_led_power_filter;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc662_usi_automute_hook(struct hda_codec *codec,</div><div class='add'>+					 struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int vref;</div><div class='add'>+	msleep(200);</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+</div><div class='add'>+	vref = spec-&gt;gen.hp_jack_present ? PIN_VREF80 : 0;</div><div class='add'>+	msleep(100);</div><div class='add'>+	snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+			    vref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc662_fixup_usi_headset_mic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc662_usi_automute_hook;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc662_aspire_ethos_mute_speakers(struct hda_codec *codec,</div><div class='add'>+					struct hda_jack_callback *cb)</div><div class='add'>+{</div><div class='add'>+	/* surround speakers at 0x1b already get muted automatically when</div><div class='add'>+	 * headphones are plugged in, but we have to mute/unmute the remaining</div><div class='add'>+	 * channels manually:</div><div class='add'>+	 * 0x15 - front left/front right</div><div class='add'>+	 * 0x18 - front center/ LFE</div><div class='add'>+	 */</div><div class='add'>+	if (snd_hda_jack_detect_state(codec, 0x1b) == HDA_JACK_PRESENT) {</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x15, 0);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x18, 0);</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x15, PIN_OUT);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x18, PIN_OUT);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc662_fixup_aspire_ethos_hp(struct hda_codec *codec,</div><div class='add'>+					const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+    /* Pin 0x1b: shared headphones jack and surround speakers */</div><div class='add'>+	if (!is_jack_detectable(codec, 0x1b))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x1b,</div><div class='add'>+				alc662_aspire_ethos_mute_speakers);</div><div class='add'>+		/* subwoofer needs an extra GPIO setting to become audible */</div><div class='add'>+		alc_setup_gpio(codec, 0x02);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		/* Make sure to start in a correct state, i.e. if</div><div class='add'>+		 * headphones have been plugged in before powering up the system</div><div class='add'>+		 */</div><div class='add'>+		alc662_aspire_ethos_mute_speakers(codec, NULL);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc671_fixup_hp_headset_mic2(struct hda_codec *codec,</div><div class='add'>+					     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	static const struct hda_pintbl pincfgs[] = {</div><div class='add'>+		{ 0x19, 0x02a11040 }, /* use as headset mic, with its own jack detect */</div><div class='add'>+		{ 0x1b, 0x0181304f },</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		snd_hda_apply_pincfgs(codec, pincfgs);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_write_coef_idx(codec, 0x19, 0xa054);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc897_hp_automute_hook(struct hda_codec *codec,</div><div class='add'>+					 struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int vref;</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+	vref = spec-&gt;gen.hp_jack_present ? (PIN_HP | AC_PINCTL_VREF_100) : PIN_HP;</div><div class='add'>+	snd_hda_set_pin_ctl(codec, 0x1b, vref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc897_hp_automute_hook;</div><div class='add'>+		spec-&gt;no_shutup_pins = 1;</div><div class='add'>+	}</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x1a, PIN_IN | AC_PINCTL_VREF_100);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		spec-&gt;gen.hp_automute_hook = alc897_hp_automute_hook;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc668_coefs[] = {</div><div class='add'>+	WRITE_COEF(0x01, 0xbebe), WRITE_COEF(0x02, 0xaaaa), WRITE_COEF(0x03,    0x0),</div><div class='add'>+	WRITE_COEF(0x04, 0x0180), WRITE_COEF(0x06,    0x0), WRITE_COEF(0x07, 0x0f80),</div><div class='add'>+	WRITE_COEF(0x08, 0x0031), WRITE_COEF(0x0a, 0x0060), WRITE_COEF(0x0b,    0x0),</div><div class='add'>+	WRITE_COEF(0x0c, 0x7cf7), WRITE_COEF(0x0d, 0x1080), WRITE_COEF(0x0e, 0x7f7f),</div><div class='add'>+	WRITE_COEF(0x0f, 0xcccc), WRITE_COEF(0x10, 0xddcc), WRITE_COEF(0x11, 0x0001),</div><div class='add'>+	WRITE_COEF(0x13,    0x0), WRITE_COEF(0x14, 0x2aa0), WRITE_COEF(0x17, 0xa940),</div><div class='add'>+	WRITE_COEF(0x19,    0x0), WRITE_COEF(0x1a,    0x0), WRITE_COEF(0x1b,    0x0),</div><div class='add'>+	WRITE_COEF(0x1c,    0x0), WRITE_COEF(0x1d,    0x0), WRITE_COEF(0x1e, 0x7418),</div><div class='add'>+	WRITE_COEF(0x1f, 0x0804), WRITE_COEF(0x20, 0x4200), WRITE_COEF(0x21, 0x0468),</div><div class='add'>+	WRITE_COEF(0x22, 0x8ccc), WRITE_COEF(0x23, 0x0250), WRITE_COEF(0x24, 0x7418),</div><div class='add'>+	WRITE_COEF(0x27,    0x0), WRITE_COEF(0x28, 0x8ccc), WRITE_COEF(0x2a, 0xff00),</div><div class='add'>+	WRITE_COEF(0x2b, 0x8000), WRITE_COEF(0xa7, 0xff00), WRITE_COEF(0xa8, 0x8000),</div><div class='add'>+	WRITE_COEF(0xaa, 0x2e17), WRITE_COEF(0xab, 0xa0c0), WRITE_COEF(0xac,    0x0),</div><div class='add'>+	WRITE_COEF(0xad,    0x0), WRITE_COEF(0xae, 0x2ac6), WRITE_COEF(0xaf, 0xa480),</div><div class='add'>+	WRITE_COEF(0xb0,    0x0), WRITE_COEF(0xb1,    0x0), WRITE_COEF(0xb2,    0x0),</div><div class='add'>+	WRITE_COEF(0xb3,    0x0), WRITE_COEF(0xb4,    0x0), WRITE_COEF(0xb5, 0x1040),</div><div class='add'>+	WRITE_COEF(0xb6, 0xd697), WRITE_COEF(0xb7, 0x902b), WRITE_COEF(0xb8, 0xd697),</div><div class='add'>+	WRITE_COEF(0xb9, 0x902b), WRITE_COEF(0xba, 0xb8ba), WRITE_COEF(0xbb, 0xaaab),</div><div class='add'>+	WRITE_COEF(0xbc, 0xaaaf), WRITE_COEF(0xbd, 0x6aaa), WRITE_COEF(0xbe, 0x1c02),</div><div class='add'>+	WRITE_COEF(0xc0, 0x00ff), WRITE_COEF(0xc1, 0x0fa6),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc668_restore_default_value(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc_process_coef_fw(codec, alc668_coefs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_mode_alc662(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+		spec-&gt;gen.hp_mic = 1; /* Mic-in is same pin as headphone */</div><div class='add'>+</div><div class='add'>+		/* Disable boost for mic-in permanently. (This code is only called</div><div class='add'>+		   from quirks that guarantee that the headphone is at NID 0x1b.) */</div><div class='add'>+		snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000);</div><div class='add'>+		snd_hda_override_wcaps(codec, 0x1b, get_wcaps(codec, 0x1b) &amp; ~AC_WCAP_IN_AMP);</div><div class='add'>+	} else</div><div class='add'>+		alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_fixup_headset_mode_alc668(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		alc_write_coef_idx(codec, 0xc4, 0x8000);</div><div class='add'>+		alc_update_coef_idx(codec, 0xc2, ~0xfe, 0);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, 0x18, 0);</div><div class='add'>+	}</div><div class='add'>+	alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC662_FIXUP_ASPIRE,</div><div class='add'>+	ALC662_FIXUP_LED_GPIO1,</div><div class='add'>+	ALC662_FIXUP_IDEAPAD,</div><div class='add'>+	ALC272_FIXUP_MARIO,</div><div class='add'>+	ALC662_FIXUP_CZC_ET26,</div><div class='add'>+	ALC662_FIXUP_CZC_P10T,</div><div class='add'>+	ALC662_FIXUP_SKU_IGNORE,</div><div class='add'>+	ALC662_FIXUP_HP_RP5800,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE1,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE2,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE3,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE4,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE5,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE6,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE7,</div><div class='add'>+	ALC662_FIXUP_ASUS_MODE8,</div><div class='add'>+	ALC662_FIXUP_NO_JACK_DETECT,</div><div class='add'>+	ALC662_FIXUP_ZOTAC_Z68,</div><div class='add'>+	ALC662_FIXUP_INV_DMIC,</div><div class='add'>+	ALC662_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+	ALC668_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+	ALC662_FIXUP_HEADSET_MODE,</div><div class='add'>+	ALC668_FIXUP_HEADSET_MODE,</div><div class='add'>+	ALC662_FIXUP_BASS_MODE4_CHMAP,</div><div class='add'>+	ALC662_FIXUP_BASS_16,</div><div class='add'>+	ALC662_FIXUP_BASS_1A,</div><div class='add'>+	ALC662_FIXUP_BASS_CHMAP,</div><div class='add'>+	ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+	ALC668_FIXUP_DELL_DISABLE_AAMIX,</div><div class='add'>+	ALC668_FIXUP_DELL_XPS13,</div><div class='add'>+	ALC662_FIXUP_ASUS_Nx50,</div><div class='add'>+	ALC668_FIXUP_ASUS_Nx51_HEADSET_MODE,</div><div class='add'>+	ALC668_FIXUP_ASUS_Nx51,</div><div class='add'>+	ALC668_FIXUP_MIC_COEF,</div><div class='add'>+	ALC668_FIXUP_ASUS_G751,</div><div class='add'>+	ALC891_FIXUP_HEADSET_MODE,</div><div class='add'>+	ALC891_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+	ALC662_FIXUP_ACER_VERITON,</div><div class='add'>+	ALC892_FIXUP_ASROCK_MOBO,</div><div class='add'>+	ALC662_FIXUP_USI_FUNC,</div><div class='add'>+	ALC662_FIXUP_USI_HEADSET_MODE,</div><div class='add'>+	ALC662_FIXUP_LENOVO_MULTI_CODECS,</div><div class='add'>+	ALC669_FIXUP_ACER_ASPIRE_ETHOS,</div><div class='add'>+	ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET,</div><div class='add'>+	ALC671_FIXUP_HP_HEADSET_MIC2,</div><div class='add'>+	ALC662_FIXUP_ACER_X2660G_HEADSET_MODE,</div><div class='add'>+	ALC662_FIXUP_ACER_NITRO_HEADSET_MODE,</div><div class='add'>+	ALC668_FIXUP_ASUS_NO_HEADSET_MIC,</div><div class='add'>+	ALC668_FIXUP_HEADSET_MIC,</div><div class='add'>+	ALC668_FIXUP_MIC_DET_COEF,</div><div class='add'>+	ALC897_FIXUP_LENOVO_HEADSET_MIC,</div><div class='add'>+	ALC897_FIXUP_HEADSET_MIC_PIN,</div><div class='add'>+	ALC897_FIXUP_HP_HSMIC_VERB,</div><div class='add'>+	ALC897_FIXUP_LENOVO_HEADSET_MODE,</div><div class='add'>+	ALC897_FIXUP_HEADSET_MIC_PIN2,</div><div class='add'>+	ALC897_FIXUP_UNIS_H3C_X500S,</div><div class='add'>+	ALC897_FIXUP_HEADSET_MIC_PIN3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc662_fixups[] = {</div><div class='add'>+	[ALC662_FIXUP_ASPIRE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x99130112 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_LED_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc662_fixup_led_gpio1,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_IDEAPAD] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x99130112 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_LED_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC272_FIXUP_MARIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc272_fixup_mario,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_CZC_ET26] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x12, 0x403cc000},</div><div class='add'>+			{0x14, 0x90170110}, /* speaker */</div><div class='add'>+			{0x15, 0x411111f0},</div><div class='add'>+			{0x16, 0x411111f0},</div><div class='add'>+			{0x18, 0x01a19030}, /* mic */</div><div class='add'>+			{0x19, 0x90a7013f}, /* int-mic */</div><div class='add'>+			{0x1a, 0x01014020},</div><div class='add'>+			{0x1b, 0x0121401f},</div><div class='add'>+			{0x1c, 0x411111f0},</div><div class='add'>+			{0x1d, 0x411111f0},</div><div class='add'>+			{0x1e, 0x40478e35},</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_CZC_P10T] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_SKU_IGNORE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_sku_ignore,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_HP_RP5800] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x0221201f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE1] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19c20 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19820 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3092f }, /* int-mic */</div><div class='add'>+			{ 0x1b, 0x0121401f }, /* HP out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121441f }, /* HP */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3094f }, /* int-mic */</div><div class='add'>+			{ 0x21, 0x01211420 }, /* HP2 */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE4] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x16, 0x99130111 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3094f }, /* int-mic */</div><div class='add'>+			{ 0x21, 0x0121441f }, /* HP */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE5] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121441f }, /* HP */</div><div class='add'>+			{ 0x16, 0x99130111 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3094f }, /* int-mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE6] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x01211420 }, /* HP2 */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3094f }, /* int-mic */</div><div class='add'>+			{ 0x1b, 0x0121441f }, /* HP */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE7] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x17, 0x99130111 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x19, 0x99a3094f }, /* int-mic */</div><div class='add'>+			{ 0x1b, 0x01214020 }, /* HP */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_MODE8] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x99130110 }, /* speaker */</div><div class='add'>+			{ 0x12, 0x99a30970 }, /* int-mic */</div><div class='add'>+			{ 0x15, 0x01214020 }, /* HP */</div><div class='add'>+			{ 0x17, 0x99130111 }, /* speaker */</div><div class='add'>+			{ 0x18, 0x01a19840 }, /* mic */</div><div class='add'>+			{ 0x21, 0x0121401f }, /* HP */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_SKU_IGNORE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_NO_JACK_DETECT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_jack_detect,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ZOTAC_Z68] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x02214020 }, /* Front HP */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_DELL_XPS13] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_dell_xps13,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_DELL_DISABLE_AAMIX</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_DELL_DISABLE_AAMIX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_disable_aamix,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_AUTO_MUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_auto_mute_via_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_DELL_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			/* headphone mic by setting pin control of 0x1b (headphone out) to in + vref_50 */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_alc662,</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_DELL_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ 0x1b, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_alc668,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_BASS_MODE4_CHMAP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_bass_chmap,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_ASUS_MODE4</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_BASS_16] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x16, 0x80106111}, /* bass speaker */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_BASS_CHMAP,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_BASS_1A] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x1a, 0x80106111}, /* bass speaker */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_BASS_CHMAP,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_BASS_CHMAP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_bass_chmap,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ASUS_Nx50] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_auto_mute_via_amp,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_BASS_1A</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_ASUS_Nx51_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode_alc668,</div><div class='add'>+		.chain_id = ALC662_FIXUP_BASS_CHMAP</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_ASUS_Nx51] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ 0x1a, 0x90170151 }, /* bass speaker */</div><div class='add'>+			{ 0x1b, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_ASUS_Nx51_HEADSET_MODE,</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_MIC_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0xc3 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x4000 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_ASUS_G751] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x0421101f }, /* HP */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_MIC_COEF</div><div class='add'>+	},</div><div class='add'>+	[ALC891_FIXUP_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mode,</div><div class='add'>+	},</div><div class='add'>+	[ALC891_FIXUP_DELL_MIC_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a1913d }, /* use as headphone mic, without its own jack detect */</div><div class='add'>+			{ 0x1b, 0x03a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC891_FIXUP_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ACER_VERITON] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x50170120 }, /* no internal speaker */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC892_FIXUP_ASROCK_MOBO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x40f000f0 }, /* disabled */</div><div class='add'>+			{ 0x16, 0x40f000f0 }, /* disabled */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_USI_FUNC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc662_fixup_usi_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_USI_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x02a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x18, 0x01a1903d },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_USI_FUNC</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_LENOVO_MULTI_CODECS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc233_alc662_fixup_lenovo_dual_codecs,</div><div class='add'>+	},</div><div class='add'>+	[ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc662_fixup_aspire_ethos_hp,</div><div class='add'>+	},</div><div class='add'>+	[ALC669_FIXUP_ACER_ASPIRE_ETHOS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x92130110 }, /* front speakers */</div><div class='add'>+			{ 0x18, 0x99130111 }, /* center/subwoofer */</div><div class='add'>+			{ 0x1b, 0x11130012 }, /* surround plus jack for HP */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET</div><div class='add'>+	},</div><div class='add'>+	[ALC671_FIXUP_HP_HEADSET_MIC2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc671_fixup_hp_headset_mic2,</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ACER_X2660G_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x02a1113c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_USI_FUNC</div><div class='add'>+	},</div><div class='add'>+	[ALC662_FIXUP_ACER_NITRO_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x1b, 0x0221144f },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC662_FIXUP_USI_FUNC</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_ASUS_NO_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x04a1112c },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_headset_mic,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC668_FIXUP_MIC_DET_COEF</div><div class='add'>+	},</div><div class='add'>+	[ALC668_FIXUP_MIC_DET_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x15 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0d60 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_LENOVO_HEADSET_MIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc897_fixup_lenovo_headset_mic,</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_HEADSET_MIC_PIN] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x03a11050 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC897_FIXUP_LENOVO_HEADSET_MIC</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_HP_HSMIC_VERB] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_LENOVO_HEADSET_MODE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc897_fixup_lenovo_headset_mode,</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_HEADSET_MIC_PIN2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_UNIS_H3C_X500S] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x14, AC_VERB_SET_EAPD_BTLENABLE, 0 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC897_FIXUP_HEADSET_MIC_PIN3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x03a11050 }, /* use as headset mic */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc662_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1019, 0x9859, "JP-IK LEAP W502", ALC897_FIXUP_HEADSET_MIC_PIN3),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0241, "Packard Bell DOTS", ALC662_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x034a, "Gateway LT27", ALC662_FIXUP_INV_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0566, "Acer Aspire Ethos 8951G", ALC669_FIXUP_ACER_ASPIRE_ETHOS),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x123c, "Acer Nitro N50-600", ALC662_FIXUP_ACER_NITRO_HEADSET_MODE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x124e, "Acer 2660G", ALC662_FIXUP_ACER_X2660G_HEADSET_MODE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x05fe, "Dell XPS 15", ALC668_FIXUP_DELL_XPS13),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x060a, "Dell XPS 13", ALC668_FIXUP_DELL_XPS13),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x060d, "Dell M3800", ALC668_FIXUP_DELL_XPS13),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0625, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0626, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0696, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x870c, "HP", ALC897_FIXUP_HP_HSMIC_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x872b, "HP", ALC897_FIXUP_HP_HSMIC_VERB),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x8768, "HP Slim Desktop S01", ALC671_FIXUP_HP_HEADSET_MIC2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x885f, "HP 288 Pro G8", ALC671_FIXUP_HP_HEADSET_MIC2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x12ff, "ASUS G751", ALC668_FIXUP_ASUS_G751),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13df, "Asus N550JX", ALC662_FIXUP_BASS_1A),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x185d, "ASUS G551JW", ALC668_FIXUP_ASUS_NO_HEADSET_MIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71SL", ALC662_FIXUP_ASUS_MODE8),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),</div><div class='add'>+	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x14cd, 0x5003, "USI", ALC662_FIXUP_USI_HEADSET_MODE),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC662_FIXUP_LENOVO_MULTI_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1057, "Lenovo P360", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x1064, "Lenovo P3 Tower", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x32ca, "Lenovo ThinkCentre M80", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3364, "Lenovo ThinkCentre M90 Gen5", ALC897_FIXUP_HEADSET_MIC_PIN),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),</div><div class='add'>+	SND_PCI_QUIRK(0x19da, 0xa130, "Zotac Z68", ALC662_FIXUP_ZOTAC_Z68),</div><div class='add'>+	SND_PCI_QUIRK(0x1b0a, 0x01b8, "ACER Veriton", ALC662_FIXUP_ACER_VERITON),</div><div class='add'>+	SND_PCI_QUIRK(0x1b35, 0x1234, "CZC ET26", ALC662_FIXUP_CZC_ET26),</div><div class='add'>+	SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),</div><div class='add'>+	SND_PCI_QUIRK(0x1c6c, 0x1239, "Compaq N14JP6-V2", ALC897_FIXUP_HP_HSMIC_VERB),</div><div class='add'>+</div><div class='add'>+#if 0</div><div class='add'>+	/* Below is a quirk table taken from the old code.</div><div class='add'>+	 * Basically the device should work as is without the fixup table.</div><div class='add'>+	 * If BIOS doesn't give a proper info, enable the corresponding</div><div class='add'>+	 * fixup entry.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1173, "ASUS K73Jn", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11d3, "ASUS NB", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x11f3, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1203, "ASUS NB", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1303, "ASUS G60J", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1333, "ASUS G60Jx", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13e3, "ASUS N71JA", ALC662_FIXUP_ASUS_MODE7),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1463, "ASUS N71", ALC662_FIXUP_ASUS_MODE7),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G72", ALC662_FIXUP_ASUS_MODE8),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1563, "ASUS N90", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x15d3, "ASUS N50SF F50SF", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS K40C K50C", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1733, "ASUS N81De", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1753, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC662_FIXUP_ASUS_MODE6),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC662_FIXUP_ASUS_MODE6),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1793, "ASUS F50GX", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x17b3, "ASUS F70SL", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x17f3, "ASUS X58LE", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1813, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC662_FIXUP_ASUS_MODE5),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC662_FIXUP_ASUS_MODE6),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1853, "ASUS F50Z", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1864, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18b3, "ASUS N80Vc", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18c3, "ASUS VX5", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS N81Te", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x18f3, "ASUS N505Tp", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1943, "ASUS Vx3V", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC662_FIXUP_ASUS_MODE3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1983, "ASUS N5051A", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_FIXUP_ASUS_MODE2),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC662_FIXUP_ASUS_MODE1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x19f3, "ASUS NB", ALC662_FIXUP_ASUS_MODE4),</div><div class='add'>+#endif</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc662_fixup_models[] = {</div><div class='add'>+	{.id = ALC662_FIXUP_ASPIRE, .name = "aspire"},</div><div class='add'>+	{.id = ALC662_FIXUP_IDEAPAD, .name = "ideapad"},</div><div class='add'>+	{.id = ALC272_FIXUP_MARIO, .name = "mario"},</div><div class='add'>+	{.id = ALC662_FIXUP_HP_RP5800, .name = "hp-rp5800"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE1, .name = "asus-mode1"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE2, .name = "asus-mode2"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE3, .name = "asus-mode3"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE4, .name = "asus-mode4"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE5, .name = "asus-mode5"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE6, .name = "asus-mode6"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE7, .name = "asus-mode7"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"},</div><div class='add'>+	{.id = ALC662_FIXUP_ZOTAC_Z68, .name = "zotac-z68"},</div><div class='add'>+	{.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"},</div><div class='add'>+	{.id = ALC662_FIXUP_DELL_MIC_NO_PRESENCE, .name = "alc662-headset-multi"},</div><div class='add'>+	{.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"},</div><div class='add'>+	{.id = ALC662_FIXUP_HEADSET_MODE, .name = "alc662-headset"},</div><div class='add'>+	{.id = ALC668_FIXUP_HEADSET_MODE, .name = "alc668-headset"},</div><div class='add'>+	{.id = ALC662_FIXUP_BASS_16, .name = "bass16"},</div><div class='add'>+	{.id = ALC662_FIXUP_BASS_1A, .name = "bass1a"},</div><div class='add'>+	{.id = ALC668_FIXUP_AUTO_MUTE, .name = "automute"},</div><div class='add'>+	{.id = ALC668_FIXUP_DELL_XPS13, .name = "dell-xps13"},</div><div class='add'>+	{.id = ALC662_FIXUP_ASUS_Nx50, .name = "asus-nx50"},</div><div class='add'>+	{.id = ALC668_FIXUP_ASUS_Nx51, .name = "asus-nx51"},</div><div class='add'>+	{.id = ALC668_FIXUP_ASUS_G751, .name = "asus-g751"},</div><div class='add'>+	{.id = ALC891_FIXUP_HEADSET_MODE, .name = "alc891-headset"},</div><div class='add'>+	{.id = ALC891_FIXUP_DELL_MIC_NO_PRESENCE, .name = "alc891-headset-multi"},</div><div class='add'>+	{.id = ALC662_FIXUP_ACER_VERITON, .name = "acer-veriton"},</div><div class='add'>+	{.id = ALC892_FIXUP_ASROCK_MOBO, .name = "asrock-mobo"},</div><div class='add'>+	{.id = ALC662_FIXUP_USI_HEADSET_MODE, .name = "usi-headset"},</div><div class='add'>+	{.id = ALC662_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},</div><div class='add'>+	{.id = ALC669_FIXUP_ACER_ASPIRE_ETHOS, .name = "aspire-ethos"},</div><div class='add'>+	{.id = ALC897_FIXUP_UNIS_H3C_X500S, .name = "unis-h3c-x500s"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0867, 0x1028, "Dell", ALC891_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+		{0x17, 0x02211010},</div><div class='add'>+		{0x18, 0x01a19030},</div><div class='add'>+		{0x1a, 0x01813040},</div><div class='add'>+		{0x21, 0x01014020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0867, 0x1028, "Dell", ALC891_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+		{0x16, 0x01813030},</div><div class='add'>+		{0x17, 0x02211010},</div><div class='add'>+		{0x18, 0x01a19040},</div><div class='add'>+		{0x21, 0x01014020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0662, 0x1028, "Dell", ALC662_FIXUP_DELL_MIC_NO_PRESENCE,</div><div class='add'>+		{0x14, 0x01014010},</div><div class='add'>+		{0x18, 0x01a19020},</div><div class='add'>+		{0x1a, 0x0181302f},</div><div class='add'>+		{0x1b, 0x0221401f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+		{0x12, 0x99a30130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0321101f},</div><div class='add'>+		{0x16, 0x03011020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+		{0x12, 0x99a30140},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0321101f},</div><div class='add'>+		{0x16, 0x03011020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+		{0x12, 0x99a30150},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0321101f},</div><div class='add'>+		{0x16, 0x03011020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0321101f},</div><div class='add'>+		{0x16, 0x03011020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell XPS 15", ALC668_FIXUP_AUTO_MUTE,</div><div class='add'>+		{0x12, 0x90a60130},</div><div class='add'>+		{0x14, 0x90170110},</div><div class='add'>+		{0x15, 0x0321101f}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0671, 0x103c, "HP cPC", ALC671_FIXUP_HP_HEADSET_MIC2,</div><div class='add'>+		{0x14, 0x01014010},</div><div class='add'>+		{0x17, 0x90170150},</div><div class='add'>+		{0x19, 0x02a11060},</div><div class='add'>+		{0x1b, 0x01813030},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0671, 0x103c, "HP cPC", ALC671_FIXUP_HP_HEADSET_MIC2,</div><div class='add'>+		{0x14, 0x01014010},</div><div class='add'>+		{0x18, 0x01a19040},</div><div class='add'>+		{0x1b, 0x01813030},</div><div class='add'>+		{0x21, 0x02211020}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec0671, 0x103c, "HP cPC", ALC671_FIXUP_HP_HEADSET_MIC2,</div><div class='add'>+		{0x14, 0x01014020},</div><div class='add'>+		{0x17, 0x90170110},</div><div class='add'>+		{0x18, 0x01a19050},</div><div class='add'>+		{0x1b, 0x01813040},</div><div class='add'>+		{0x21, 0x02211030}),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc662_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_eapd_shutup;</div><div class='add'>+</div><div class='add'>+	/* handle multiple HPs as is */</div><div class='add'>+	spec-&gt;parse_flags = HDA_PINCFG_NO_HP_FIXUP;</div><div class='add'>+</div><div class='add'>+	alc_fix_pll_init(codec, 0x20, 0x04, 15);</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		spec-&gt;init_hook = alc668_restore_default_value;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc662_fixup_models,</div><div class='add'>+		       alc662_fixup_tbl, alc662_fixups);</div><div class='add'>+	snd_hda_pick_pin_fixup(codec, alc662_pin_fixup_tbl, alc662_fixups, true);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	alc_auto_parse_customize_define(codec);</div><div class='add'>+</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	if ((alc_get_coef0(codec) &amp; (1 &lt;&lt; 14)) &amp;&amp;</div><div class='add'>+	    codec-&gt;bus-&gt;pci &amp;&amp; codec-&gt;bus-&gt;pci-&gt;subsystem_vendor == 0x1025 &amp;&amp;</div><div class='add'>+	    spec-&gt;cdefine.platform_type == 1) {</div><div class='add'>+		err = alc_codec_rename(codec, "ALC272X");</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc662_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog &amp;&amp; spec-&gt;gen.beep_nid) {</div><div class='add'>+		switch (codec-&gt;core.vendor_id) {</div><div class='add'>+		case 0x10ec0662:</div><div class='add'>+			err = set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='add'>+			break;</div><div class='add'>+		case 0x10ec0272:</div><div class='add'>+		case 0x10ec0663:</div><div class='add'>+		case 0x10ec0665:</div><div class='add'>+		case 0x10ec0668:</div><div class='add'>+			err = set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);</div><div class='add'>+			break;</div><div class='add'>+		case 0x10ec0273:</div><div class='add'>+			err = set_beep_amp(spec, 0x0b, 0x03, HDA_INPUT);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc662_codec_ops = {</div><div class='add'>+	.probe = alc662_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc662[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0272, "ALC272"),</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0662, 0x100101, "ALC662 rev1"),</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0662, 0x100300, "ALC662 rev3"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0663, "ALC663"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0665, "ALC665"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0667, "ALC667"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0668, "ALC668"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0670, "ALC670"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0671, "ALC671"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0867, "ALC891"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0892, "ALC892"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0897, "ALC897"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc662);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC662 and compatible HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc662_driver = {</div><div class='add'>+	.id = snd_hda_id_alc662,</div><div class='add'>+	.ops = &amp;alc662_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc662_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc680.c b/sound/hda/codecs/realtek/alc680.c<br/>new file mode 100644<br/>index 000000000000..8aab1026243c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc680.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc680.c</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC680 codec</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int alc680_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return alc_parse_auto_config(codec, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc680_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* ALC680 has no aa-loopback mixer */</div><div class='add'>+	err = alc_alloc_spec(codec, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc680_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_gen_remove(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc680_codec_ops = {</div><div class='add'>+	.probe = alc680_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc680[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0680, "ALC680"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc680);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC680 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc680_driver = {</div><div class='add'>+	.id = snd_hda_id_alc680,</div><div class='add'>+	.ops = &amp;alc680_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc680_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc861.c b/sound/hda/codecs/realtek/alc861.c<br/>new file mode 100644<br/>index 000000000000..270037c6504a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc861.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc861.c</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC861 codec</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int alc861_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc861_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc861_ssids[] = { 0x0e, 0x0f, 0x0b, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc861_ignore, alc861_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Pin config fixes */</div><div class='add'>+enum {</div><div class='add'>+	ALC861_FIXUP_FSC_AMILO_PI1505,</div><div class='add'>+	ALC861_FIXUP_AMP_VREF_0F,</div><div class='add'>+	ALC861_FIXUP_NO_JACK_DETECT,</div><div class='add'>+	ALC861_FIXUP_ASUS_A6RP,</div><div class='add'>+	ALC660_FIXUP_ASUS_W7J,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */</div><div class='add'>+static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec,</div><div class='add'>+			const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+	val = snd_hda_codec_get_pin_target(codec, 0x0f);</div><div class='add'>+	if (!(val &amp; (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN)))</div><div class='add'>+		val |= AC_PINCTL_IN_EN;</div><div class='add'>+	val |= AC_PINCTL_VREF_50;</div><div class='add'>+	snd_hda_set_pin_ctl(codec, 0x0f, val);</div><div class='add'>+	spec-&gt;gen.keep_vref_in_automute = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc861_fixups[] = {</div><div class='add'>+	[ALC861_FIXUP_FSC_AMILO_PI1505] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x0b, 0x0221101f }, /* HP */</div><div class='add'>+			{ 0x0f, 0x90170310 }, /* speaker */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC861_FIXUP_AMP_VREF_0F] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc861_fixup_asus_amp_vref_0f,</div><div class='add'>+	},</div><div class='add'>+	[ALC861_FIXUP_NO_JACK_DETECT] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_no_jack_detect,</div><div class='add'>+	},</div><div class='add'>+	[ALC861_FIXUP_ASUS_A6RP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc861_fixup_asus_amp_vref_0f,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC861_FIXUP_NO_JACK_DETECT,</div><div class='add'>+	},</div><div class='add'>+	[ALC660_FIXUP_ASUS_W7J] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* ASUS W7J needs a magic pin setup on unused NID 0x10</div><div class='add'>+			 * for enabling outputs</div><div class='add'>+			 */</div><div class='add'>+			{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc861_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1253, "ASUS W7J", ALC660_FIXUP_ASUS_W7J),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1263, "ASUS Z35HL", ALC660_FIXUP_ASUS_W7J),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", ALC861_FIXUP_ASUS_A6RP),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", ALC861_FIXUP_AMP_VREF_0F),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x7254, "HP DX2200", ALC861_FIXUP_NO_JACK_DETECT),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1584, "Haier/Uniwill", ALC861_FIXUP_AMP_VREF_0F),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", ALC861_FIXUP_FSC_AMILO_PI1505),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc861_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x15);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x23;</div><div class='add'>+</div><div class='add'>+	spec-&gt;power_hook = alc_power_eapd;</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc861_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog) {</div><div class='add'>+		err = set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc861_codec_ops = {</div><div class='add'>+	.probe = alc861_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc861[] = {</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0861, 0x100340, "ALC660"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0861, "ALC861"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc861);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC861 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc861_driver = {</div><div class='add'>+	.id = snd_hda_id_alc861,</div><div class='add'>+	.ops = &amp;alc861_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc861_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc861vd.c b/sound/hda/codecs/realtek/alc861vd.c<br/>new file mode 100644<br/>index 000000000000..44264e0d6e56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc861vd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc861vd.c</a></div><div class='hunk'>@@ -0,0 +1,137 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC861-VD codec</div><div class='add'>+// Based on ALC882</div><div class='add'>+// In addition, an independent DAC</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int alc861vd_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc861vd_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc861vd_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc861vd_ignore, alc861vd_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC660VD_FIX_ASUS_GPIO1,</div><div class='add'>+	ALC861VD_FIX_DALLAS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* exclude VREF80 */</div><div class='add'>+static void alc861vd_fixup_dallas(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		snd_hda_override_pin_caps(codec, 0x18, 0x00000734);</div><div class='add'>+		snd_hda_override_pin_caps(codec, 0x19, 0x0000073c);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* reset GPIO1 */</div><div class='add'>+static void alc660vd_fixup_asus_gpio1(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;gpio_mask |= 0x02;</div><div class='add'>+	alc_fixup_gpio(codec, action, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc861vd_fixups[] = {</div><div class='add'>+	[ALC660VD_FIX_ASUS_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc660vd_fixup_asus_gpio1,</div><div class='add'>+	},</div><div class='add'>+	[ALC861VD_FIX_DALLAS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc861vd_fixup_dallas,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc861vd_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_FIX_DALLAS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1339, "ASUS A7-K", ALC660VD_FIX_ASUS_GPIO1),</div><div class='add'>+	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_FIX_DALLAS),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc861vd_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x23;</div><div class='add'>+</div><div class='add'>+	spec-&gt;shutup = alc_eapd_shutup;</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc861vd_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog) {</div><div class='add'>+		err = set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc861vd_codec_ops = {</div><div class='add'>+	.probe = alc861vd_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc861vd[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0660, "ALC660-VD"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0862, "ALC861-VD"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc861vd);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC861-VD HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc861vd_driver = {</div><div class='add'>+	.id = snd_hda_id_alc861vd,</div><div class='add'>+	.ops = &amp;alc861vd_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc861vd_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc880.c b/sound/hda/codecs/realtek/alc880.c<br/>new file mode 100644<br/>index 000000000000..bf1bdf11ec2d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc880.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc880.c</a></div><div class='hunk'>@@ -0,0 +1,509 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC880 codec</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static void alc880_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	/* For some reason, the res given from ALC880 is broken.</div><div class='add'>+	   Here we adjust it properly. */</div><div class='add'>+	snd_hda_jack_unsol_event(codec, res &gt;&gt; 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alc880_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc880_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc880_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc880_ignore, alc880_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ALC880 fix-ups</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ALC880_FIXUP_GPIO1,</div><div class='add'>+	ALC880_FIXUP_GPIO2,</div><div class='add'>+	ALC880_FIXUP_MEDION_RIM,</div><div class='add'>+	ALC880_FIXUP_LG,</div><div class='add'>+	ALC880_FIXUP_LG_LW25,</div><div class='add'>+	ALC880_FIXUP_W810,</div><div class='add'>+	ALC880_FIXUP_EAPD_COEF,</div><div class='add'>+	ALC880_FIXUP_TCL_S700,</div><div class='add'>+	ALC880_FIXUP_VOL_KNOB,</div><div class='add'>+	ALC880_FIXUP_FUJITSU,</div><div class='add'>+	ALC880_FIXUP_F1734,</div><div class='add'>+	ALC880_FIXUP_UNIWILL,</div><div class='add'>+	ALC880_FIXUP_UNIWILL_DIG,</div><div class='add'>+	ALC880_FIXUP_Z71V,</div><div class='add'>+	ALC880_FIXUP_ASUS_W5A,</div><div class='add'>+	ALC880_FIXUP_3ST_BASE,</div><div class='add'>+	ALC880_FIXUP_3ST,</div><div class='add'>+	ALC880_FIXUP_3ST_DIG,</div><div class='add'>+	ALC880_FIXUP_5ST_BASE,</div><div class='add'>+	ALC880_FIXUP_5ST,</div><div class='add'>+	ALC880_FIXUP_5ST_DIG,</div><div class='add'>+	ALC880_FIXUP_6ST_BASE,</div><div class='add'>+	ALC880_FIXUP_6ST,</div><div class='add'>+	ALC880_FIXUP_6ST_DIG,</div><div class='add'>+	ALC880_FIXUP_6ST_AUTOMUTE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* enable the volume-knob widget support on NID 0x21 */</div><div class='add'>+static void alc880_fixup_vol_knob(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		snd_hda_jack_detect_enable_callback(codec, 0x21,</div><div class='add'>+						    alc_update_knob_master);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc880_fixups[] = {</div><div class='add'>+	[ALC880_FIXUP_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio1,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_GPIO2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio2,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_MEDION_RIM] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF,  0x3060 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_GPIO2,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_LG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* disable bogus unused pins */</div><div class='add'>+			{ 0x16, 0x411111f0 },</div><div class='add'>+			{ 0x18, 0x411111f0 },</div><div class='add'>+			{ 0x1a, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_LG_LW25] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1a, 0x0181344f }, /* line-in */</div><div class='add'>+			{ 0x1b, 0x0321403f }, /* headphone */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_W810] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* disable bogus unused pins */</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_GPIO2,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_EAPD_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* change to EAPD mode */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF,  0x3060 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_TCL_S700] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* change to EAPD mode */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF,  0x3070 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_GPIO2,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_VOL_KNOB] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc880_fixup_vol_knob,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_FUJITSU] = {</div><div class='add'>+		/* override all pins as BIOS on old Amilo is broken */</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x0121401f }, /* HP */</div><div class='add'>+			{ 0x15, 0x99030120 }, /* speaker */</div><div class='add'>+			{ 0x16, 0x99030130 }, /* bass speaker */</div><div class='add'>+			{ 0x17, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x18, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x19, 0x01a19950 }, /* mic-in */</div><div class='add'>+			{ 0x1a, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1b, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1e, 0x01454140 }, /* SPDIF out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_VOL_KNOB,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_F1734] = {</div><div class='add'>+		/* almost compatible with FUJITSU, but no bass and SPDIF */</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x0121401f }, /* HP */</div><div class='add'>+			{ 0x15, 0x99030120 }, /* speaker */</div><div class='add'>+			{ 0x16, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x17, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x18, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x19, 0x01a19950 }, /* mic-in */</div><div class='add'>+			{ 0x1a, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1b, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_VOL_KNOB,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_UNIWILL] = {</div><div class='add'>+		/* need to fix HP and speaker pins to be parsed correctly */</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x15, 0x99030120 }, /* speaker */</div><div class='add'>+			{ 0x16, 0x99030130 }, /* bass speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_UNIWILL_DIG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* disable bogus unused pins */</div><div class='add'>+			{ 0x17, 0x411111f0 },</div><div class='add'>+			{ 0x19, 0x411111f0 },</div><div class='add'>+			{ 0x1b, 0x411111f0 },</div><div class='add'>+			{ 0x1f, 0x411111f0 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_Z71V] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* set up the whole pins as BIOS is utterly broken */</div><div class='add'>+			{ 0x14, 0x99030120 }, /* speaker */</div><div class='add'>+			{ 0x15, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x16, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x17, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x18, 0x01a19950 }, /* mic-in */</div><div class='add'>+			{ 0x19, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1a, 0x01813031 }, /* line-in */</div><div class='add'>+			{ 0x1b, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1e, 0x0144111e }, /* SPDIF */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_ASUS_W5A] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* set up the whole pins as BIOS is utterly broken */</div><div class='add'>+			{ 0x14, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x15, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x16, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x17, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x18, 0x90a60160 }, /* mic */</div><div class='add'>+			{ 0x19, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1a, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1b, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1e, 0xb743111e }, /* SPDIF out */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_3ST_BASE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x01014010 }, /* line-out */</div><div class='add'>+			{ 0x15, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x16, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x17, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x18, 0x01a19c30 }, /* mic-in */</div><div class='add'>+			{ 0x19, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x1a, 0x01813031 }, /* line-in */</div><div class='add'>+			{ 0x1b, 0x02a19c40 }, /* front-mic */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			/* 0x1e is filled in below */</div><div class='add'>+			{ 0x1f, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_3ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_3ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_3ST_DIG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x0144111e }, /* SPDIF */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_3ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_5ST_BASE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x01014010 }, /* front */</div><div class='add'>+			{ 0x15, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x16, 0x01011411 }, /* CLFE */</div><div class='add'>+			{ 0x17, 0x01016412 }, /* surr */</div><div class='add'>+			{ 0x18, 0x01a19c30 }, /* mic-in */</div><div class='add'>+			{ 0x19, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x1a, 0x01813031 }, /* line-in */</div><div class='add'>+			{ 0x1b, 0x02a19c40 }, /* front-mic */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			/* 0x1e is filled in below */</div><div class='add'>+			{ 0x1f, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_5ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_5ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_5ST_DIG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x0144111e }, /* SPDIF */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_5ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_6ST_BASE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x14, 0x01014010 }, /* front */</div><div class='add'>+			{ 0x15, 0x01016412 }, /* surr */</div><div class='add'>+			{ 0x16, 0x01011411 }, /* CLFE */</div><div class='add'>+			{ 0x17, 0x01012414 }, /* side */</div><div class='add'>+			{ 0x18, 0x01a19c30 }, /* mic-in */</div><div class='add'>+			{ 0x19, 0x02a19c40 }, /* front-mic */</div><div class='add'>+			{ 0x1a, 0x01813031 }, /* line-in */</div><div class='add'>+			{ 0x1b, 0x0121411f }, /* HP */</div><div class='add'>+			{ 0x1c, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ 0x1d, 0x411111f0 }, /* N/A */</div><div class='add'>+			/* 0x1e is filled in below */</div><div class='add'>+			{ 0x1f, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_6ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x411111f0 }, /* N/A */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_6ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_6ST_DIG] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1e, 0x0144111e }, /* SPDIF */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_6ST_BASE,</div><div class='add'>+	},</div><div class='add'>+	[ALC880_FIXUP_6ST_AUTOMUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x0121401f }, /* HP with jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained_before = true,</div><div class='add'>+		.chain_id = ALC880_FIXUP_6ST_BASE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc880_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS W5A", ALC880_FIXUP_ASUS_W5A),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1964, "ASUS Z71V", ALC880_FIXUP_Z71V),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1043, "ASUS", ALC880_FIXUP_GPIO1),</div><div class='add'>+	SND_PCI_QUIRK(0x147b, 0x1045, "ABit AA8XE", ALC880_FIXUP_6ST_AUTOMUTE),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5401, "Clevo GPIO2", ALC880_FIXUP_GPIO2),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", ALC880_FIXUP_EAPD_COEF),</div><div class='add'>+	SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_FIXUP_UNIWILL_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_FIXUP_F1734),</div><div class='add'>+	SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_FIXUP_UNIWILL),</div><div class='add'>+	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),</div><div class='add'>+	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),</div><div class='add'>+	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),</div><div class='add'>+	SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST_AUTOMUTE),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x107c, "FSC Amilo M1437", ALC880_FIXUP_FUJITSU),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x10b0, "FSC Amilo Pi1556", ALC880_FIXUP_FUJITSU),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_FIXUP_LG),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x005f, "LG P1 Express", ALC880_FIXUP_LG),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_FIXUP_LG),</div><div class='add'>+	SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_FIXUP_LG_LW25),</div><div class='add'>+	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_FIXUP_TCL_S700),</div><div class='add'>+</div><div class='add'>+	/* Below is the copied entries from alc880_quirks.c.</div><div class='add'>+	 * It's not quite sure whether BIOS sets the correct pin-config table</div><div class='add'>+	 * on these machines, thus they are kept to be compatible with</div><div class='add'>+	 * the old static quirks.  Once when it's confirmed to work without</div><div class='add'>+	 * these overrides, it'd be better to remove.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x1019, 0xa880, "ECS", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1019, 0xa884, "Acer APFV", ALC880_FIXUP_6ST),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0070, "ULI", ALC880_FIXUP_3ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0077, "ULI", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0078, "ULI", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0087, "ULI", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_FIXUP_3ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_FIXUP_3ST),</div><div class='add'>+	SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x81a0, "Sony", ALC880_FIXUP_3ST),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x81d6, "Sony", ALC880_FIXUP_3ST),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x3032, "Gateway", ALC880_FIXUP_5ST),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x3033, "Gateway", ALC880_FIXUP_5ST),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x4039, "Gateway", ALC880_FIXUP_5ST),</div><div class='add'>+	SND_PCI_QUIRK(0x1297, 0xc790, "Shuttle ST20G5", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa102, "Gigabyte K8", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1150, "MSI", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1509, 0x925d, "FIC P4M", ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_FIXUP_6ST_DIG), /* broken BIOS */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2668, NULL, ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xa100, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xd400, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xd401, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xd402, "Intel mobo", ALC880_FIXUP_3ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe224, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe305, "Intel mobo", ALC880_FIXUP_3ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe308, "Intel mobo", ALC880_FIXUP_3ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe400, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe401, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xe402, "Intel mobo", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	/* default Intel */</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x8086, "Intel mobo", ALC880_FIXUP_3ST),</div><div class='add'>+	SND_PCI_QUIRK(0xa0a0, 0x0560, "AOpen i915GMm-HFS", ALC880_FIXUP_5ST_DIG),</div><div class='add'>+	SND_PCI_QUIRK(0xe803, 0x1019, NULL, ALC880_FIXUP_6ST_DIG),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc880_fixup_models[] = {</div><div class='add'>+	{.id = ALC880_FIXUP_3ST, .name = "3stack"},</div><div class='add'>+	{.id = ALC880_FIXUP_3ST_DIG, .name = "3stack-digout"},</div><div class='add'>+	{.id = ALC880_FIXUP_5ST, .name = "5stack"},</div><div class='add'>+	{.id = ALC880_FIXUP_5ST_DIG, .name = "5stack-digout"},</div><div class='add'>+	{.id = ALC880_FIXUP_6ST, .name = "6stack"},</div><div class='add'>+	{.id = ALC880_FIXUP_6ST_DIG, .name = "6stack-digout"},</div><div class='add'>+	{.id = ALC880_FIXUP_6ST_AUTOMUTE, .name = "6stack-automute"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * OK, here we have finally the probe for ALC880</div><div class='add'>+ */</div><div class='add'>+static int alc880_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;gen.need_dac_fix = 1;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,</div><div class='add'>+		       alc880_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc880_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog) {</div><div class='add'>+		err = set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc880_codec_ops = {</div><div class='add'>+	.probe = alc880_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = alc880_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc880[] = {</div><div class='add'>+	HDA_CODEC_ID(0x10ec0880, "ALC880"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc880);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC880 HD-audio codec");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc880_driver = {</div><div class='add'>+	.id = snd_hda_id_alc880,</div><div class='add'>+	.ops = &amp;alc880_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc880_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/alc882.c b/sound/hda/codecs/realtek/alc882.c<br/>new file mode 100644<br/>index 000000000000..529fecd5baa0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/alc882.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/alc882.c</a></div><div class='hunk'>@@ -0,0 +1,861 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek ALC882/883/885/888/889 codec support</div><div class='add'>+//</div><div class='add'>+// ALC882 is almost identical with ALC880 but has cleaner and more flexible</div><div class='add'>+// configuration.  Each pin widget can choose any input DACs and a mixer.</div><div class='add'>+// Each ADC is connected from a mixer of all inputs.  This makes possible</div><div class='add'>+// 6-channel independent captures.</div><div class='add'>+//</div><div class='add'>+// In addition, an independent DAC for the multi-playback (not used in this</div><div class='add'>+// driver yet).</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Pin config fixes</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ALC882_FIXUP_ABIT_AW9D_MAX,</div><div class='add'>+	ALC882_FIXUP_LENOVO_Y530,</div><div class='add'>+	ALC882_FIXUP_PB_M5210,</div><div class='add'>+	ALC882_FIXUP_ACER_ASPIRE_7736,</div><div class='add'>+	ALC882_FIXUP_ASUS_W90V,</div><div class='add'>+	ALC889_FIXUP_CD,</div><div class='add'>+	ALC889_FIXUP_FRONT_HP_NO_PRESENCE,</div><div class='add'>+	ALC889_FIXUP_VAIO_TT,</div><div class='add'>+	ALC888_FIXUP_EEE1601,</div><div class='add'>+	ALC886_FIXUP_EAPD,</div><div class='add'>+	ALC882_FIXUP_EAPD,</div><div class='add'>+	ALC883_FIXUP_EAPD,</div><div class='add'>+	ALC883_FIXUP_ACER_EAPD,</div><div class='add'>+	ALC882_FIXUP_GPIO1,</div><div class='add'>+	ALC882_FIXUP_GPIO2,</div><div class='add'>+	ALC882_FIXUP_GPIO3,</div><div class='add'>+	ALC889_FIXUP_COEF,</div><div class='add'>+	ALC882_FIXUP_ASUS_W2JC,</div><div class='add'>+	ALC882_FIXUP_ACER_ASPIRE_4930G,</div><div class='add'>+	ALC882_FIXUP_ACER_ASPIRE_8930G,</div><div class='add'>+	ALC882_FIXUP_ASPIRE_8930G_VERBS,</div><div class='add'>+	ALC885_FIXUP_MACPRO_GPIO,</div><div class='add'>+	ALC889_FIXUP_DAC_ROUTE,</div><div class='add'>+	ALC889_FIXUP_MBP_VREF,</div><div class='add'>+	ALC889_FIXUP_IMAC91_VREF,</div><div class='add'>+	ALC889_FIXUP_MBA11_VREF,</div><div class='add'>+	ALC889_FIXUP_MBA21_VREF,</div><div class='add'>+	ALC889_FIXUP_MP11_VREF,</div><div class='add'>+	ALC889_FIXUP_MP41_VREF,</div><div class='add'>+	ALC882_FIXUP_INV_DMIC,</div><div class='add'>+	ALC882_FIXUP_NO_PRIMARY_HP,</div><div class='add'>+	ALC887_FIXUP_ASUS_BASS,</div><div class='add'>+	ALC887_FIXUP_BASS_CHMAP,</div><div class='add'>+	ALC1220_FIXUP_GB_DUAL_CODECS,</div><div class='add'>+	ALC1220_FIXUP_GB_X570,</div><div class='add'>+	ALC1220_FIXUP_CLEVO_P950,</div><div class='add'>+	ALC1220_FIXUP_CLEVO_PB51ED,</div><div class='add'>+	ALC1220_FIXUP_CLEVO_PB51ED_PINS,</div><div class='add'>+	ALC887_FIXUP_ASUS_AUDIO,</div><div class='add'>+	ALC887_FIXUP_ASUS_HMIC,</div><div class='add'>+	ALCS1200A_FIXUP_MIC_VREF,</div><div class='add'>+	ALC888VD_FIXUP_MIC_100VREF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc889_fixup_coef(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+	alc_update_coef_idx(codec, 7, 0, 0x2030);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up GPIO at initialization */</div><div class='add'>+static void alc885_fixup_macpro_gpio(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_write_delay = true;</div><div class='add'>+	alc_fixup_gpio3(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Fix the connection of some pins for ALC889:</div><div class='add'>+ * At least, Acer Aspire 5935 shows the connections to DAC3/4 don't</div><div class='add'>+ * work correctly (bko#42740)</div><div class='add'>+ */</div><div class='add'>+static void alc889_fixup_dac_route(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		/* fake the connections during parsing the tree */</div><div class='add'>+		static const hda_nid_t conn1[] = { 0x0c, 0x0d };</div><div class='add'>+		static const hda_nid_t conn2[] = { 0x0e, 0x0f };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x15, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x18, ARRAY_SIZE(conn2), conn2);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x1a, ARRAY_SIZE(conn2), conn2);</div><div class='add'>+	} else if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		/* restore the connections */</div><div class='add'>+		static const hda_nid_t conn[] = { 0x0c, 0x0d, 0x0e, 0x0f, 0x26 };</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x15, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x18, ARRAY_SIZE(conn), conn);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x1a, ARRAY_SIZE(conn), conn);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set VREF on HP pin */</div><div class='add'>+static void alc889_fixup_mbp_vref(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t nids[] = { 0x14, 0x15, 0x19 };</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_INIT)</div><div class='add'>+		return;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nids); i++) {</div><div class='add'>+		unsigned int val = snd_hda_codec_get_pincfg(codec, nids[i]);</div><div class='add'>+		if (get_defcfg_device(val) != AC_JACK_HP_OUT)</div><div class='add'>+			continue;</div><div class='add'>+		val = snd_hda_codec_get_pin_target(codec, nids[i]);</div><div class='add'>+		val |= AC_PINCTL_VREF_80;</div><div class='add'>+		snd_hda_set_pin_ctl(codec, nids[i], val);</div><div class='add'>+		spec-&gt;gen.keep_vref_in_automute = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc889_fixup_mac_pins(struct hda_codec *codec,</div><div class='add'>+				  const hda_nid_t *nids, int num_nids)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_nids; i++) {</div><div class='add'>+		unsigned int val;</div><div class='add'>+		val = snd_hda_codec_get_pin_target(codec, nids[i]);</div><div class='add'>+		val |= AC_PINCTL_VREF_50;</div><div class='add'>+		snd_hda_set_pin_ctl(codec, nids[i], val);</div><div class='add'>+	}</div><div class='add'>+	spec-&gt;gen.keep_vref_in_automute = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set VREF on speaker pins on imac91 */</div><div class='add'>+static void alc889_fixup_imac91_vref(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t nids[] = { 0x18, 0x1a };</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc889_fixup_mac_pins(codec, nids, ARRAY_SIZE(nids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set VREF on speaker pins on mba11 */</div><div class='add'>+static void alc889_fixup_mba11_vref(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t nids[] = { 0x18 };</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc889_fixup_mac_pins(codec, nids, ARRAY_SIZE(nids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set VREF on speaker pins on mba21 */</div><div class='add'>+static void alc889_fixup_mba21_vref(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t nids[] = { 0x18, 0x19 };</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_INIT)</div><div class='add'>+		alc889_fixup_mac_pins(codec, nids, ARRAY_SIZE(nids));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Don't take HP output as primary</div><div class='add'>+ * Strangely, the speaker output doesn't work on Vaio Z and some Vaio</div><div class='add'>+ * all-in-one desktop PCs (for example VGC-LN51JGB) through DAC 0x05</div><div class='add'>+ */</div><div class='add'>+static void alc882_fixup_no_primary_hp(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gen.no_primary_hp = 1;</div><div class='add'>+		spec-&gt;gen.no_multi_io = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc1220_fixup_gb_x570(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix,</div><div class='add'>+				     int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn1[] = { 0x0c };</div><div class='add'>+	static const struct coef_fw gb_x570_coefs[] = {</div><div class='add'>+		WRITE_COEF(0x07, 0x03c0),</div><div class='add'>+		WRITE_COEF(0x1a, 0x01c1),</div><div class='add'>+		WRITE_COEF(0x1b, 0x0202),</div><div class='add'>+		WRITE_COEF(0x43, 0x3005),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+		snd_hda_override_conn_list(codec, 0x1b, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		alc_process_coef_fw(codec, gb_x570_coefs);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc1220_fixup_clevo_p950(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix,</div><div class='add'>+				     int action)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn1[] = { 0x0c };</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	alc_update_coef_idx(codec, 0x7, 0, 0x3c3);</div><div class='add'>+	/* We therefore want to make sure 0x14 (front headphone) and</div><div class='add'>+	 * 0x1b (speakers) use the stereo DAC 0x02</div><div class='add'>+	 */</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x1b, ARRAY_SIZE(conn1), conn1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc1220_fixup_clevo_pb51ed(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix,</div><div class='add'>+				     int action)</div><div class='add'>+{</div><div class='add'>+	alc1220_fixup_clevo_p950(codec, fix, action);</div><div class='add'>+	alc_fixup_headset_mode_no_hp_mic(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc887_asus_hp_automute_hook(struct hda_codec *codec,</div><div class='add'>+					 struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int vref;</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gen.hp_jack_present)</div><div class='add'>+		vref = AC_PINCTL_VREF_80;</div><div class='add'>+	else</div><div class='add'>+		vref = AC_PINCTL_VREF_HIZ;</div><div class='add'>+	snd_hda_set_pin_ctl(codec, 0x19, PIN_HP | vref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc887_fixup_asus_jack(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	snd_hda_set_pin_ctl_cache(codec, 0x1b, PIN_HP);</div><div class='add'>+	spec-&gt;gen.hp_automute_hook = alc887_asus_hp_automute_hook;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup alc882_fixups[] = {</div><div class='add'>+	[ALC882_FIXUP_ABIT_AW9D_MAX] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x01080104 }, /* side */</div><div class='add'>+			{ 0x16, 0x01011012 }, /* rear */</div><div class='add'>+			{ 0x17, 0x01016011 }, /* clfe */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_LENOVO_Y530] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x99130112 }, /* rear int speakers */</div><div class='add'>+			{ 0x16, 0x99130111 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_PB_M5210] = {</div><div class='add'>+		.type = HDA_FIXUP_PINCTLS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, PIN_VREF50 },</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ACER_ASPIRE_7736] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_sku_ignore,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ASUS_W90V] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x99130110 }, /* fix sequence for CLFE */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_CD] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1c, 0x993301f0 }, /* CD */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_FRONT_HP_NO_PRESENCE] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x1b, 0x02214120 }, /* Front HP jack is flaky, disable jack detect */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC889_FIXUP_CD,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_VAIO_TT] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x17, 0x90170111 }, /* hidden surround speaker */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC888_FIXUP_EEE1601] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF,  0x0838 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC886_FIXUP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* change to EAPD mode */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0068 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* change to EAPD mode */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3060 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC883_FIXUP_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* change to EAPD mode */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3070 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC883_FIXUP_ACER_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* eanable EAPD on Acer laptops */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3050 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_GPIO1] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio1,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_GPIO2] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio2,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_GPIO3] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio3,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ASUS_W2JC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_gpio1,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_EAPD,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_COEF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_coef,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ACER_ASPIRE_4930G] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x99130111 }, /* CLFE speaker */</div><div class='add'>+			{ 0x17, 0x99130112 }, /* surround speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ACER_ASPIRE_8930G] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x16, 0x99130111 }, /* CLFE speaker */</div><div class='add'>+			{ 0x1b, 0x99130112 }, /* surround speaker */</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_ASPIRE_8930G_VERBS,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_ASPIRE_8930G_VERBS] = {</div><div class='add'>+		/* additional init verbs for Acer Aspire 8930G */</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			/* Enable all DACs */</div><div class='add'>+			/* DAC DISABLE/MUTE 1? */</div><div class='add'>+			/*  setting bits 1-5 disables DAC nids 0x02-0x06</div><div class='add'>+			 *  apparently. Init=0x38 */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x03 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+			/* DAC DISABLE/MUTE 2? */</div><div class='add'>+			/*  some bit here disables the other DACs.</div><div class='add'>+			 *  Init=0x4900 */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x08 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0000 },</div><div class='add'>+			/* DMIC fix</div><div class='add'>+			 * This laptop has a stereo digital microphone.</div><div class='add'>+			 * The mics are only 1cm apart which makes the stereo</div><div class='add'>+			 * useless. However, either the mic or the ALC889</div><div class='add'>+			 * makes the signal become a difference/sum signal</div><div class='add'>+			 * instead of standard stereo, which is annoying.</div><div class='add'>+			 * So instead we flip this bit which makes the</div><div class='add'>+			 * codec replicate the sum signal to both channels,</div><div class='add'>+			 * turning it into a normal mono mic.</div><div class='add'>+			 */</div><div class='add'>+			/* DMIC_CONTROL? Init value = 0x0001 */</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0b },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x0003 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x07 },</div><div class='add'>+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x3050 },</div><div class='add'>+			{ }</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC885_FIXUP_MACPRO_GPIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc885_fixup_macpro_gpio,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_DAC_ROUTE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_dac_route,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_MBP_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_mbp_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_IMAC91_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_imac91_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC882_FIXUP_GPIO1,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_MBA11_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_mba11_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC889_FIXUP_MBP_VREF,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_MBA21_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_mba21_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC889_FIXUP_MBP_VREF,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_MP11_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_mba11_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC885_FIXUP_MACPRO_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[ALC889_FIXUP_MP41_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc889_fixup_mbp_vref,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC885_FIXUP_MACPRO_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_INV_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_inv_dmic,</div><div class='add'>+	},</div><div class='add'>+	[ALC882_FIXUP_NO_PRIMARY_HP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc882_fixup_no_primary_hp,</div><div class='add'>+	},</div><div class='add'>+	[ALC887_FIXUP_ASUS_BASS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{0x16, 0x99130130}, /* bass speaker */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC887_FIXUP_BASS_CHMAP,</div><div class='add'>+	},</div><div class='add'>+	[ALC887_FIXUP_BASS_CHMAP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc_fixup_bass_chmap,</div><div class='add'>+	},</div><div class='add'>+	[ALC1220_FIXUP_GB_DUAL_CODECS] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc1220_fixup_gb_dual_codecs,</div><div class='add'>+	},</div><div class='add'>+	[ALC1220_FIXUP_GB_X570] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc1220_fixup_gb_x570,</div><div class='add'>+	},</div><div class='add'>+	[ALC1220_FIXUP_CLEVO_P950] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc1220_fixup_clevo_p950,</div><div class='add'>+	},</div><div class='add'>+	[ALC1220_FIXUP_CLEVO_PB51ED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc1220_fixup_clevo_pb51ed,</div><div class='add'>+	},</div><div class='add'>+	[ALC1220_FIXUP_CLEVO_PB51ED_PINS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC1220_FIXUP_CLEVO_PB51ED,</div><div class='add'>+	},</div><div class='add'>+	[ALC887_FIXUP_ASUS_AUDIO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x15, 0x02a14150 }, /* use as headset mic, without its own jack detect */</div><div class='add'>+			{ 0x19, 0x22219420 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[ALC887_FIXUP_ASUS_HMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = alc887_fixup_asus_jack,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = ALC887_FIXUP_ASUS_AUDIO,</div><div class='add'>+	},</div><div class='add'>+	[ALCS1200A_FIXUP_MIC_VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINCTLS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, PIN_VREF50 }, /* rear mic */</div><div class='add'>+			{ 0x19, PIN_VREF50 }, /* front mic */</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[ALC888VD_FIXUP_MIC_100VREF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINCTLS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x18, PIN_VREF100 }, /* headset mic */</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk alc882_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0107, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x010a, "Acer Ferrari 5000", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_FIXUP_ACER_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_8930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0146, "Acer Aspire 6935G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_8930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x021e, "Acer Aspire 5739G",</div><div class='add'>+		      ALC882_FIXUP_ACER_ASPIRE_4930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x026b, "Acer Aspire 8940G", ALC882_FIXUP_ACER_ASPIRE_8930G),</div><div class='add'>+	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x2390, "Asus D700SA", ALC887_FIXUP_ASUS_HMIC),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8797, "ASUS TUF B550M-PLUS", ALCS1200A_FIXUP_MIC_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9060, "Sony Vaio VPCL14M1R", ALC882_FIXUP_NO_PRIMARY_HP),</div><div class='add'>+</div><div class='add'>+	/* All Apple entries are in codec SSIDs */</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x00a1, "Macbook", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x00a4, "MacbookPro 4,1", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0c00, "Mac Pro", ALC889_FIXUP_MP11_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1000, "iMac 24", ALC885_FIXUP_MACPRO_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_FIXUP_MACPRO_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC889_FIXUP_MBA11_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC889_FIXUP_MBA21_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC889_FIXUP_MBP_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_FIXUP_MACPRO_GPIO),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4200, "Mac Pro 4,1/5,1", ALC889_FIXUP_MP41_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4300, "iMac 9,1", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC889_FIXUP_IMAC91_VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC889_FIXUP_MBA11_VREF),</div><div class='add'>+</div><div class='add'>+	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x10ec, 0x12d8, "iBase Elo Touch", ALC888VD_FIXUP_MIC_100VREF),</div><div class='add'>+	SND_PCI_QUIRK(0x13fe, 0x1009, "Advantech MIT-W101", ALC886_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_GB_X570),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_GB_X570),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa0d5, "Gigabyte X570S Aorus Master", ALC1220_FIXUP_GB_X570),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x11f7, "MSI-GE63", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1229, "MSI-GP73", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0xcc34, "MSI Godlike X570", ALC1220_FIXUP_GB_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),</div><div class='add'>+	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x5802, "Clevo X58[05]WN[RST]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65d2, "Clevo PB51R[CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65e1, "Clevo PB51[ED][DF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65e5, "Clevo PC50D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65f1, "Clevo PC50HS", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x65f5, "Clevo PD50PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x66a2, "Clevo PE60RNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x66a6, "Clevo PE60SN[CDE]-[GS]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x67e1, "Clevo PB71[DE][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x67f1, "Clevo PC70H[PRS]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x67f5, "Clevo PD70PN[NRT]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170SM", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x9506, "Clevo P955HQ", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x950a, "Clevo P955H[PR]", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e3, "Clevo P955[ER]T", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e4, "Clevo P955ER", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e5, "Clevo P955EE6", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x95e6, "Clevo P950R[CDF]", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x96e1, "Clevo P960[ER][CDFN]-K", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x97e2, "Clevo P970RC-M", ALC1220_FIXUP_CLEVO_P950),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0xd502, "Clevo PD50SNE", ALC1220_FIXUP_CLEVO_PB51ED_PINS),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC889_FIXUP_COEF),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup alc882_fixup_models[] = {</div><div class='add'>+	{.id = ALC882_FIXUP_ABIT_AW9D_MAX, .name = "abit-aw9d"},</div><div class='add'>+	{.id = ALC882_FIXUP_LENOVO_Y530, .name = "lenovo-y530"},</div><div class='add'>+	{.id = ALC882_FIXUP_ACER_ASPIRE_7736, .name = "acer-aspire-7736"},</div><div class='add'>+	{.id = ALC882_FIXUP_ASUS_W90V, .name = "asus-w90v"},</div><div class='add'>+	{.id = ALC889_FIXUP_CD, .name = "cd"},</div><div class='add'>+	{.id = ALC889_FIXUP_FRONT_HP_NO_PRESENCE, .name = "no-front-hp"},</div><div class='add'>+	{.id = ALC889_FIXUP_VAIO_TT, .name = "vaio-tt"},</div><div class='add'>+	{.id = ALC888_FIXUP_EEE1601, .name = "eee1601"},</div><div class='add'>+	{.id = ALC882_FIXUP_EAPD, .name = "alc882-eapd"},</div><div class='add'>+	{.id = ALC883_FIXUP_EAPD, .name = "alc883-eapd"},</div><div class='add'>+	{.id = ALC882_FIXUP_GPIO1, .name = "gpio1"},</div><div class='add'>+	{.id = ALC882_FIXUP_GPIO2, .name = "gpio2"},</div><div class='add'>+	{.id = ALC882_FIXUP_GPIO3, .name = "gpio3"},</div><div class='add'>+	{.id = ALC889_FIXUP_COEF, .name = "alc889-coef"},</div><div class='add'>+	{.id = ALC882_FIXUP_ASUS_W2JC, .name = "asus-w2jc"},</div><div class='add'>+	{.id = ALC882_FIXUP_ACER_ASPIRE_4930G, .name = "acer-aspire-4930g"},</div><div class='add'>+	{.id = ALC882_FIXUP_ACER_ASPIRE_8930G, .name = "acer-aspire-8930g"},</div><div class='add'>+	{.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"},</div><div class='add'>+	{.id = ALC885_FIXUP_MACPRO_GPIO, .name = "macpro-gpio"},</div><div class='add'>+	{.id = ALC889_FIXUP_DAC_ROUTE, .name = "dac-route"},</div><div class='add'>+	{.id = ALC889_FIXUP_MBP_VREF, .name = "mbp-vref"},</div><div class='add'>+	{.id = ALC889_FIXUP_IMAC91_VREF, .name = "imac91-vref"},</div><div class='add'>+	{.id = ALC889_FIXUP_MBA11_VREF, .name = "mba11-vref"},</div><div class='add'>+	{.id = ALC889_FIXUP_MBA21_VREF, .name = "mba21-vref"},</div><div class='add'>+	{.id = ALC889_FIXUP_MP11_VREF, .name = "mp11-vref"},</div><div class='add'>+	{.id = ALC889_FIXUP_MP41_VREF, .name = "mp41-vref"},</div><div class='add'>+	{.id = ALC882_FIXUP_INV_DMIC, .name = "inv-dmic"},</div><div class='add'>+	{.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},</div><div class='add'>+	{.id = ALC887_FIXUP_ASUS_BASS, .name = "asus-bass"},</div><div class='add'>+	{.id = ALC1220_FIXUP_GB_DUAL_CODECS, .name = "dual-codecs"},</div><div class='add'>+	{.id = ALC1220_FIXUP_GB_X570, .name = "gb-x570"},</div><div class='add'>+	{.id = ALC1220_FIXUP_CLEVO_P950, .name = "clevo-p950"},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_hda_pin_quirk alc882_pin_fixup_tbl[] = {</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec1220, 0x1043, "ASUS", ALC1220_FIXUP_CLEVO_P950,</div><div class='add'>+		{0x14, 0x01014010},</div><div class='add'>+		{0x15, 0x01011012},</div><div class='add'>+		{0x16, 0x01016011},</div><div class='add'>+		{0x18, 0x01a19040},</div><div class='add'>+		{0x19, 0x02a19050},</div><div class='add'>+		{0x1a, 0x0181304f},</div><div class='add'>+		{0x1b, 0x0221401f},</div><div class='add'>+		{0x1e, 0x01456130}),</div><div class='add'>+	SND_HDA_PIN_QUIRK(0x10ec1220, 0x1462, "MS-7C35", ALC1220_FIXUP_CLEVO_P950,</div><div class='add'>+		{0x14, 0x01015010},</div><div class='add'>+		{0x15, 0x01011012},</div><div class='add'>+		{0x16, 0x01011011},</div><div class='add'>+		{0x18, 0x01a11040},</div><div class='add'>+		{0x19, 0x02a19050},</div><div class='add'>+		{0x1a, 0x0181104f},</div><div class='add'>+		{0x1b, 0x0221401f},</div><div class='add'>+		{0x1e, 0x01451130}),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto configuration</div><div class='add'>+ */</div><div class='add'>+/* almost identical with ALC880 parser... */</div><div class='add'>+static int alc882_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t alc882_ignore[] = { 0x1d, 0 };</div><div class='add'>+	static const hda_nid_t alc882_ssids[] = { 0x15, 0x1b, 0x14, 0 };</div><div class='add'>+	return alc_parse_auto_config(codec, alc882_ignore, alc882_ssids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int alc882_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alc_alloc_spec(codec, 0x0b);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0882:</div><div class='add'>+	case 0x10ec0885:</div><div class='add'>+	case 0x10ec0900:</div><div class='add'>+	case 0x10ec0b00:</div><div class='add'>+	case 0x10ec1220:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* ALC883 and variants */</div><div class='add'>+		alc_fix_pll_init(codec, 0x20, 0x0a, 10);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,</div><div class='add'>+		       alc882_fixups);</div><div class='add'>+	snd_hda_pick_pin_fixup(codec, alc882_pin_fixup_tbl, alc882_fixups, true);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	alc_auto_parse_customize_define(codec);</div><div class='add'>+</div><div class='add'>+	if (has_cdefine_beep(codec))</div><div class='add'>+		spec-&gt;gen.beep_nid = 0x01;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = alc882_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.no_analog &amp;&amp; spec-&gt;gen.beep_nid) {</div><div class='add'>+		err = set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops alc882_codec_ops = {</div><div class='add'>+	.probe = alc882_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = alc_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = alc_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.resume = alc_resume,</div><div class='add'>+	.suspend = alc_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_alc882[] = {</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0662, 0x100002, "ALC662 rev2"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0882, "ALC882"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0883, "ALC883"),</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0885, 0x100101, "ALC889A"),</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0885, 0x100103, "ALC889A"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0885, "ALC885"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0887, "ALC887"),</div><div class='add'>+	HDA_CODEC_ID_REV(0x10ec0888, 0x100101, "ALC1200"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0888, "ALC888"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0889, "ALC889"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0899, "ALC898"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0900, "ALC1150"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec0b00, "ALCS1200A"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec1168, "ALC1220"),</div><div class='add'>+	HDA_CODEC_ID(0x10ec1220, "ALC1220"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_alc882);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek ALC882 and compatible HD-audio codecs");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver alc882_driver = {</div><div class='add'>+	.id = snd_hda_id_alc882,</div><div class='add'>+	.ops = &amp;alc882_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(alc882_driver);</div><div class='head'>diff --git a/sound/hda/codecs/realtek/realtek.c b/sound/hda/codecs/realtek/realtek.c<br/>new file mode 100644<br/>index 000000000000..ca377a5adadb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/realtek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/realtek.c</a></div><div class='hunk'>@@ -0,0 +1,2271 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek HD-audio codec support code</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+static int __alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				 unsigned int coef_idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, coef_idx);</div><div class='add'>+	val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PROC_COEF, 0);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			unsigned int coef_idx)</div><div class='add'>+{</div><div class='add'>+	guard(coef_mutex)(codec);</div><div class='add'>+	return __alc_read_coefex_idx(codec, nid, coef_idx);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_read_coefex_idx, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static void __alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				   unsigned int coef_idx, unsigned int coef_val)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, coef_idx);</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PROC_COEF, coef_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  unsigned int coef_idx, unsigned int coef_val)</div><div class='add'>+{</div><div class='add'>+	guard(coef_mutex)(codec);</div><div class='add'>+	__alc_write_coefex_idx(codec, nid, coef_idx, coef_val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_write_coefex_idx, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static void __alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				    unsigned int coef_idx, unsigned int mask,</div><div class='add'>+				    unsigned int bits_set)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = __alc_read_coefex_idx(codec, nid, coef_idx);</div><div class='add'>+</div><div class='add'>+	if (val != -1)</div><div class='add'>+		__alc_write_coefex_idx(codec, nid, coef_idx,</div><div class='add'>+				       (val &amp; ~mask) | bits_set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   unsigned int coef_idx, unsigned int mask,</div><div class='add'>+			   unsigned int bits_set)</div><div class='add'>+{</div><div class='add'>+	guard(coef_mutex)(codec);</div><div class='add'>+	__alc_update_coefex_idx(codec, nid, coef_idx, mask, bits_set);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_update_coefex_idx, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* a special bypass for COEF 0; read the cached value at the second time */</div><div class='add'>+unsigned int alc_get_coef0(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;coef0)</div><div class='add'>+		spec-&gt;coef0 = alc_read_coef_idx(codec, 0);</div><div class='add'>+	return spec-&gt;coef0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_get_coef0, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_process_coef_fw(struct hda_codec *codec, const struct coef_fw *fw)</div><div class='add'>+{</div><div class='add'>+	guard(coef_mutex)(codec);</div><div class='add'>+	for (; fw-&gt;nid; fw++) {</div><div class='add'>+		if (fw-&gt;mask == (unsigned short)-1)</div><div class='add'>+			__alc_write_coefex_idx(codec, fw-&gt;nid, fw-&gt;idx, fw-&gt;val);</div><div class='add'>+		else</div><div class='add'>+			__alc_update_coefex_idx(codec, fw-&gt;nid, fw-&gt;idx,</div><div class='add'>+						fw-&gt;mask, fw-&gt;val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_process_coef_fw, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO setup tables, used in initialization</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Enable GPIO mask and set output */</div><div class='add'>+void alc_setup_gpio(struct hda_codec *codec, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_mask |= mask;</div><div class='add'>+	spec-&gt;gpio_dir |= mask;</div><div class='add'>+	spec-&gt;gpio_data |= mask;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_setup_gpio, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_write_gpio_data(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+			    spec-&gt;gpio_data);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_write_gpio_data, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_update_gpio_data(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+			  bool on)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int oldval = spec-&gt;gpio_data;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		spec-&gt;gpio_data |= mask;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;gpio_data &amp;= ~mask;</div><div class='add'>+	if (oldval != spec-&gt;gpio_data)</div><div class='add'>+		alc_write_gpio_data(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_update_gpio_data, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_write_gpio(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gpio_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_GPIO_MASK, spec-&gt;gpio_mask);</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_SET_GPIO_DIRECTION, spec-&gt;gpio_dir);</div><div class='add'>+	if (spec-&gt;gpio_write_delay)</div><div class='add'>+		msleep(1);</div><div class='add'>+	alc_write_gpio_data(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_write_gpio, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_gpio(struct hda_codec *codec, int action, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		alc_setup_gpio(codec, mask);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_gpio, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_gpio1(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_gpio(codec, action, 0x01);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_gpio1, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_gpio2(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_gpio(codec, action, 0x02);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_gpio2, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_gpio3(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_gpio(codec, action, 0x03);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_gpio3, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_gpio4(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_gpio(codec, action, 0x04);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_gpio4, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_micmute_led(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_micmute_led, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Fix hardware PLL issue</div><div class='add'>+ * On some codecs, the analog PLL gating control must be off while</div><div class='add'>+ * the default value is 1.</div><div class='add'>+ */</div><div class='add'>+void alc_fix_pll(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;pll_nid)</div><div class='add'>+		alc_update_coefex_idx(codec, spec-&gt;pll_nid, spec-&gt;pll_coef_idx,</div><div class='add'>+				      1 &lt;&lt; spec-&gt;pll_coef_bit, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fix_pll, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		      unsigned int coef_idx, unsigned int coef_bit)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;pll_nid = nid;</div><div class='add'>+	spec-&gt;pll_coef_idx = coef_idx;</div><div class='add'>+	spec-&gt;pll_coef_bit = coef_bit;</div><div class='add'>+	alc_fix_pll(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fix_pll_init, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* update the master volume per volume-knob's unsol event */</div><div class='add'>+void alc_update_knob_master(struct hda_codec *codec,</div><div class='add'>+			    struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_ctl_elem_value *uctl __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	kctl = snd_hda_find_mixer_ctl(codec, "Master Playback Volume");</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return;</div><div class='add'>+	uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);</div><div class='add'>+	if (!uctl)</div><div class='add'>+		return;</div><div class='add'>+	val = snd_hda_codec_read(codec, jack-&gt;nid, 0,</div><div class='add'>+				 AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);</div><div class='add'>+	val &amp;= HDA_AMP_VOLMASK;</div><div class='add'>+	uctl-&gt;value.integer.value[0] = val;</div><div class='add'>+	uctl-&gt;value.integer.value[1] = val;</div><div class='add'>+	kctl-&gt;put(kctl, uctl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_update_knob_master, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* Change EAPD to verb control */</div><div class='add'>+void alc_fill_eapd_coef(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int coef;</div><div class='add'>+</div><div class='add'>+	coef = alc_get_coef0(codec);</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0262:</div><div class='add'>+		alc_update_coef_idx(codec, 0x7, 0, 1&lt;&lt;5);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0267:</div><div class='add'>+	case 0x10ec0268:</div><div class='add'>+		alc_update_coef_idx(codec, 0x7, 0, 1&lt;&lt;13);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0269:</div><div class='add'>+		if ((coef &amp; 0x00f0) == 0x0010)</div><div class='add'>+			alc_update_coef_idx(codec, 0xd, 0, 1&lt;&lt;14);</div><div class='add'>+		if ((coef &amp; 0x00f0) == 0x0020)</div><div class='add'>+			alc_update_coef_idx(codec, 0x4, 1&lt;&lt;15, 0);</div><div class='add'>+		if ((coef &amp; 0x00f0) == 0x0030)</div><div class='add'>+			alc_update_coef_idx(codec, 0x10, 1&lt;&lt;9, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0280:</div><div class='add'>+	case 0x10ec0284:</div><div class='add'>+	case 0x10ec0290:</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_update_coef_idx(codec, 0x4, 1&lt;&lt;15, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0245:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+		alc_update_coef_idx(codec, 0x36, 1&lt;&lt;13, 0);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0235:</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+	case 0x10ec0282:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+	case 0x10ec0300:</div><div class='add'>+		alc_update_coef_idx(codec, 0x10, 1&lt;&lt;9, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0275:</div><div class='add'>+		alc_update_coef_idx(codec, 0xe, 0, 1&lt;&lt;0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0287:</div><div class='add'>+		alc_update_coef_idx(codec, 0x10, 1&lt;&lt;9, 0);</div><div class='add'>+		alc_write_coef_idx(codec, 0x8, 0x4ab7);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_update_coef_idx(codec, 0xa, 1&lt;&lt;13, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+		alc_write_coef_idx(codec, 0x6e, 0x0c25);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+	case 0x10ec0700:</div><div class='add'>+	case 0x10ec0701:</div><div class='add'>+	case 0x10ec0703:</div><div class='add'>+	case 0x10ec0711:</div><div class='add'>+		alc_update_coef_idx(codec, 0x10, 1&lt;&lt;15, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0662:</div><div class='add'>+		if ((coef &amp; 0x00f0) == 0x0030)</div><div class='add'>+			alc_update_coef_idx(codec, 0x4, 1&lt;&lt;10, 0); /* EAPD Ctrl */</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0272:</div><div class='add'>+	case 0x10ec0273:</div><div class='add'>+	case 0x10ec0663:</div><div class='add'>+	case 0x10ec0665:</div><div class='add'>+	case 0x10ec0670:</div><div class='add'>+	case 0x10ec0671:</div><div class='add'>+	case 0x10ec0672:</div><div class='add'>+		alc_update_coef_idx(codec, 0xd, 0, 1&lt;&lt;14); /* EAPD Ctrl */</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0222:</div><div class='add'>+	case 0x10ec0623:</div><div class='add'>+		alc_update_coef_idx(codec, 0x19, 1&lt;&lt;13, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_update_coef_idx(codec, 0x7, 3&lt;&lt;13, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		alc_update_coef_idx(codec, 0x4, 1&lt;&lt;10, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0888:</div><div class='add'>+		if ((coef &amp; 0x00f0) == 0x0020 || (coef &amp; 0x00f0) == 0x0030)</div><div class='add'>+			alc_update_coef_idx(codec, 0x7, 1&lt;&lt;5, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0892:</div><div class='add'>+	case 0x10ec0897:</div><div class='add'>+		alc_update_coef_idx(codec, 0x7, 1&lt;&lt;5, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0899:</div><div class='add'>+	case 0x10ec0900:</div><div class='add'>+	case 0x10ec0b00:</div><div class='add'>+	case 0x10ec1168:</div><div class='add'>+	case 0x10ec1220:</div><div class='add'>+		alc_update_coef_idx(codec, 0x7, 1&lt;&lt;1, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fill_eapd_coef, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD control (only if available) */</div><div class='add'>+static void set_eapd(struct hda_codec *codec, hda_nid_t nid, int on)</div><div class='add'>+{</div><div class='add'>+	if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='add'>+		return;</div><div class='add'>+	if (snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD)</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+				    on ? 2 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD controls of the codec */</div><div class='add'>+void alc_auto_setup_eapd(struct hda_codec *codec, bool on)</div><div class='add'>+{</div><div class='add'>+	/* We currently only handle front, HP */</div><div class='add'>+	static const hda_nid_t pins[] = {</div><div class='add'>+		0x0f, 0x10, 0x14, 0x15, 0x17, 0</div><div class='add'>+	};</div><div class='add'>+	const hda_nid_t *p;</div><div class='add'>+	for (p = pins; *p; p++)</div><div class='add'>+		set_eapd(codec, *p, on);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_auto_setup_eapd, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* Returns the nid of the external mic input pin, or 0 if it cannot be found. */</div><div class='add'>+int alc_find_ext_mic_pin(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	unsigned int defcfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		if (cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='add'>+			continue;</div><div class='add'>+		nid = cfg-&gt;inputs[i].pin;</div><div class='add'>+		defcfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		if (snd_hda_get_input_pin_attr(defcfg) == INPUT_PIN_ATTR_INT)</div><div class='add'>+			continue;</div><div class='add'>+		return nid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_find_ext_mic_pin, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_headset_mic_no_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int mic_pin = alc_find_ext_mic_pin(codec);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* don't shut up pins when unloading the driver; otherwise it breaks</div><div class='add'>+	 * the default pin setup at the next load of the driver</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_pins, i, pin) {</div><div class='add'>+		/* use read here for syncing after issuing each verb */</div><div class='add'>+		if (pin-&gt;nid != mic_pin)</div><div class='add'>+			snd_hda_codec_read(codec, pin-&gt;nid, 0,</div><div class='add'>+					AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;pins_shutup = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_headset_mic_no_shutup, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_shutup_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;no_shutup_pins)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x10ec0257:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0287:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		alc_headset_mic_no_shutup(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		snd_hda_shutup_pins(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_shutup_pins, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* generic shutup callback;</div><div class='add'>+ * just turning off EAPD and a little pause for avoiding pop-noise</div><div class='add'>+ */</div><div class='add'>+void alc_eapd_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+	if (!spec-&gt;no_depop_delay)</div><div class='add'>+		msleep(200);</div><div class='add'>+	alc_shutup_pins(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_eapd_shutup, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* additional initialization for ALC888 variants */</div><div class='add'>+static void alc888_coef_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	switch (alc_get_coef0(codec) &amp; 0x00f0) {</div><div class='add'>+	/* alc888-VA */</div><div class='add'>+	case 0x00:</div><div class='add'>+	/* alc888-VB */</div><div class='add'>+	case 0x10:</div><div class='add'>+		alc_update_coef_idx(codec, 7, 0, 0x2030); /* Turn EAPD to High */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* generic EAPD initialization */</div><div class='add'>+void alc_auto_init_amp(struct hda_codec *codec, int type)</div><div class='add'>+{</div><div class='add'>+	alc_auto_setup_eapd(codec, true);</div><div class='add'>+	alc_write_gpio(codec);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case ALC_INIT_DEFAULT:</div><div class='add'>+		switch (codec-&gt;core.vendor_id) {</div><div class='add'>+		case 0x10ec0260:</div><div class='add'>+			alc_update_coefex_idx(codec, 0x1a, 7, 0, 0x2010);</div><div class='add'>+			break;</div><div class='add'>+		case 0x10ec0880:</div><div class='add'>+		case 0x10ec0882:</div><div class='add'>+		case 0x10ec0883:</div><div class='add'>+		case 0x10ec0885:</div><div class='add'>+			alc_update_coef_idx(codec, 7, 0, 0x2030);</div><div class='add'>+			break;</div><div class='add'>+		case 0x10ec0888:</div><div class='add'>+			alc888_coef_init(codec);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_auto_init_amp, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* get a primary headphone pin if available */</div><div class='add'>+hda_nid_t alc_get_hp_pin(struct alc_spec *spec)</div><div class='add'>+{</div><div class='add'>+	if (spec-&gt;gen.autocfg.hp_pins[0])</div><div class='add'>+		return spec-&gt;gen.autocfg.hp_pins[0];</div><div class='add'>+	if (spec-&gt;gen.autocfg.line_out_type == AC_JACK_HP_OUT)</div><div class='add'>+		return spec-&gt;gen.autocfg.line_out_pins[0];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_get_hp_pin, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Realtek SSID verification</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Could be any non-zero and even value. When used as fixup, tells</div><div class='add'>+ * the driver to ignore any present sku defines.</div><div class='add'>+ */</div><div class='add'>+#define ALC_FIXUP_SKU_IGNORE (2)</div><div class='add'>+</div><div class='add'>+void alc_fixup_sku_ignore(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;cdefine.fixup = 1;</div><div class='add'>+		spec-&gt;cdefine.sku_cfg = ALC_FIXUP_SKU_IGNORE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_sku_ignore, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_no_depop_delay(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PROBE) {</div><div class='add'>+		spec-&gt;no_depop_delay = 1;</div><div class='add'>+		codec-&gt;depop_delay = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_no_depop_delay, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+int alc_auto_parse_customize_define(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	unsigned int ass, tmp, i;</div><div class='add'>+	unsigned nid = 0;</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cdefine.enable_pcbeep = 1; /* assume always enabled */</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cdefine.fixup) {</div><div class='add'>+		ass = spec-&gt;cdefine.sku_cfg;</div><div class='add'>+		if (ass == ALC_FIXUP_SKU_IGNORE)</div><div class='add'>+			return -1;</div><div class='add'>+		goto do_sku;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;bus-&gt;pci)</div><div class='add'>+		return -1;</div><div class='add'>+	ass = codec-&gt;core.subsystem_id &amp; 0xffff;</div><div class='add'>+	if (ass != codec-&gt;bus-&gt;pci-&gt;subsystem_device &amp;&amp; (ass &amp; 1))</div><div class='add'>+		goto do_sku;</div><div class='add'>+</div><div class='add'>+	nid = 0x1d;</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x10ec0260)</div><div class='add'>+		nid = 0x17;</div><div class='add'>+	ass = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+</div><div class='add'>+	if (!(ass &amp; 1)) {</div><div class='add'>+		codec_info(codec, "%s: SKU not ready 0x%08x\n",</div><div class='add'>+			   codec-&gt;core.chip_name, ass);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check sum */</div><div class='add'>+	tmp = 0;</div><div class='add'>+	for (i = 1; i &lt; 16; i++) {</div><div class='add'>+		if ((ass &gt;&gt; i) &amp; 1)</div><div class='add'>+			tmp++;</div><div class='add'>+	}</div><div class='add'>+	if (((ass &gt;&gt; 16) &amp; 0xf) != tmp)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;cdefine.port_connectivity = ass &gt;&gt; 30;</div><div class='add'>+	spec-&gt;cdefine.enable_pcbeep = (ass &amp; 0x100000) &gt;&gt; 20;</div><div class='add'>+	spec-&gt;cdefine.check_sum = (ass &gt;&gt; 16) &amp; 0xf;</div><div class='add'>+	spec-&gt;cdefine.customization = ass &gt;&gt; 8;</div><div class='add'>+do_sku:</div><div class='add'>+	spec-&gt;cdefine.sku_cfg = ass;</div><div class='add'>+	spec-&gt;cdefine.external_amp = (ass &amp; 0x38) &gt;&gt; 3;</div><div class='add'>+	spec-&gt;cdefine.platform_type = (ass &amp; 0x4) &gt;&gt; 2;</div><div class='add'>+	spec-&gt;cdefine.swap = (ass &amp; 0x2) &gt;&gt; 1;</div><div class='add'>+	spec-&gt;cdefine.override = ass &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "SKU: Nid=0x%x sku_cfg=0x%08x\n",</div><div class='add'>+		   nid, spec-&gt;cdefine.sku_cfg);</div><div class='add'>+	codec_dbg(codec, "SKU: port_connectivity=0x%x\n",</div><div class='add'>+		   spec-&gt;cdefine.port_connectivity);</div><div class='add'>+	codec_dbg(codec, "SKU: enable_pcbeep=0x%x\n", spec-&gt;cdefine.enable_pcbeep);</div><div class='add'>+	codec_dbg(codec, "SKU: check_sum=0x%08x\n", spec-&gt;cdefine.check_sum);</div><div class='add'>+	codec_dbg(codec, "SKU: customization=0x%08x\n", spec-&gt;cdefine.customization);</div><div class='add'>+	codec_dbg(codec, "SKU: external_amp=0x%x\n", spec-&gt;cdefine.external_amp);</div><div class='add'>+	codec_dbg(codec, "SKU: platform_type=0x%x\n", spec-&gt;cdefine.platform_type);</div><div class='add'>+	codec_dbg(codec, "SKU: swap=0x%x\n", spec-&gt;cdefine.swap);</div><div class='add'>+	codec_dbg(codec, "SKU: override=0x%x\n", spec-&gt;cdefine.override);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_auto_parse_customize_define, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* return the position of NID in the list, or -1 if not found */</div><div class='add'>+static int find_idx_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; nums; i++)</div><div class='add'>+		if (list[i] == nid)</div><div class='add'>+			return i;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+/* return true if the given NID is found in the list */</div><div class='add'>+static bool found_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)</div><div class='add'>+{</div><div class='add'>+	return find_idx_in_nid_list(nid, list, nums) &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check subsystem ID and set up device-specific initialization;</div><div class='add'>+ * return 1 if initialized, 0 if invalid SSID</div><div class='add'>+ */</div><div class='add'>+/* 32-bit subsystem ID for BIOS loading in HD Audio codec.</div><div class='add'>+ *	31 ~ 16 :	Manufacture ID</div><div class='add'>+ *	15 ~ 8	:	SKU ID</div><div class='add'>+ *	7  ~ 0	:	Assembly ID</div><div class='add'>+ *	port-A --&gt; pin 39/41, port-E --&gt; pin 14/15, port-D --&gt; pin 35/36</div><div class='add'>+ */</div><div class='add'>+int alc_subsystem_id(struct hda_codec *codec, const hda_nid_t *ports)</div><div class='add'>+{</div><div class='add'>+	unsigned int ass, tmp, i;</div><div class='add'>+	unsigned nid;</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;cdefine.fixup) {</div><div class='add'>+		ass = spec-&gt;cdefine.sku_cfg;</div><div class='add'>+		if (ass == ALC_FIXUP_SKU_IGNORE)</div><div class='add'>+			return 0;</div><div class='add'>+		goto do_sku;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ass = codec-&gt;core.subsystem_id &amp; 0xffff;</div><div class='add'>+	if (codec-&gt;bus-&gt;pci &amp;&amp;</div><div class='add'>+	    ass != codec-&gt;bus-&gt;pci-&gt;subsystem_device &amp;&amp; (ass &amp; 1))</div><div class='add'>+		goto do_sku;</div><div class='add'>+</div><div class='add'>+	/* invalid SSID, check the special NID pin defcfg instead */</div><div class='add'>+	/*</div><div class='add'>+	 * 31~30	: port connectivity</div><div class='add'>+	 * 29~21	: reserve</div><div class='add'>+	 * 20		: PCBEEP input</div><div class='add'>+	 * 19~16	: Check sum (15:1)</div><div class='add'>+	 * 15~1		: Custom</div><div class='add'>+	 * 0		: override</div><div class='add'>+	*/</div><div class='add'>+	nid = 0x1d;</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x10ec0260)</div><div class='add'>+		nid = 0x17;</div><div class='add'>+	ass = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		  "realtek: No valid SSID, checking pincfg 0x%08x for NID 0x%x\n",</div><div class='add'>+		   ass, nid);</div><div class='add'>+	if (!(ass &amp; 1))</div><div class='add'>+		return 0;</div><div class='add'>+	if ((ass &gt;&gt; 30) != 1)	/* no physical connection */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* check sum */</div><div class='add'>+	tmp = 0;</div><div class='add'>+	for (i = 1; i &lt; 16; i++) {</div><div class='add'>+		if ((ass &gt;&gt; i) &amp; 1)</div><div class='add'>+			tmp++;</div><div class='add'>+	}</div><div class='add'>+	if (((ass &gt;&gt; 16) &amp; 0xf) != tmp)</div><div class='add'>+		return 0;</div><div class='add'>+do_sku:</div><div class='add'>+	codec_dbg(codec, "realtek: Enabling init ASM_ID=0x%04x CODEC_ID=%08x\n",</div><div class='add'>+		   ass &amp; 0xffff, codec-&gt;core.vendor_id);</div><div class='add'>+	/*</div><div class='add'>+	 * 0 : override</div><div class='add'>+	 * 1 :	Swap Jack</div><div class='add'>+	 * 2 : 0 --&gt; Desktop, 1 --&gt; Laptop</div><div class='add'>+	 * 3~5 : External Amplifier control</div><div class='add'>+	 * 7~6 : Reserved</div><div class='add'>+	*/</div><div class='add'>+	tmp = (ass &amp; 0x38) &gt;&gt; 3;	/* external Amp control */</div><div class='add'>+	if (spec-&gt;init_amp == ALC_INIT_UNDEFINED) {</div><div class='add'>+		switch (tmp) {</div><div class='add'>+		case 1:</div><div class='add'>+			alc_setup_gpio(codec, 0x01);</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			alc_setup_gpio(codec, 0x02);</div><div class='add'>+			break;</div><div class='add'>+		case 7:</div><div class='add'>+			alc_setup_gpio(codec, 0x04);</div><div class='add'>+			break;</div><div class='add'>+		case 5:</div><div class='add'>+		default:</div><div class='add'>+			spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* is laptop or Desktop and enable the function "Mute internal speaker</div><div class='add'>+	 * when the external headphone out jack is plugged"</div><div class='add'>+	 */</div><div class='add'>+	if (!(ass &amp; 0x8000))</div><div class='add'>+		return 1;</div><div class='add'>+	/*</div><div class='add'>+	 * 10~8 : Jack location</div><div class='add'>+	 * 12~11: Headphone out -&gt; 00: PortA, 01: PortE, 02: PortD, 03: Resvered</div><div class='add'>+	 * 14~13: Resvered</div><div class='add'>+	 * 15   : 1 --&gt; enable the function "Mute internal speaker</div><div class='add'>+	 *	        when the external headphone out jack is plugged"</div><div class='add'>+	 */</div><div class='add'>+	if (!alc_get_hp_pin(spec)) {</div><div class='add'>+		hda_nid_t nid;</div><div class='add'>+		tmp = (ass &gt;&gt; 11) &amp; 0x3;	/* HP to chassis */</div><div class='add'>+		nid = ports[tmp];</div><div class='add'>+		if (found_in_nid_list(nid, spec-&gt;gen.autocfg.line_out_pins,</div><div class='add'>+				      spec-&gt;gen.autocfg.line_outs))</div><div class='add'>+			return 1;</div><div class='add'>+		spec-&gt;gen.autocfg.hp_pins[0] = nid;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_subsystem_id, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* Check the validity of ALC subsystem-id</div><div class='add'>+ * ports contains an array of 4 pin NIDs for port-A, E, D and I */</div><div class='add'>+void alc_ssid_check(struct hda_codec *codec, const hda_nid_t *ports)</div><div class='add'>+{</div><div class='add'>+	if (!alc_subsystem_id(codec, ports)) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		if (spec-&gt;init_amp == ALC_INIT_UNDEFINED) {</div><div class='add'>+			codec_dbg(codec,</div><div class='add'>+				  "realtek: Enable default setup for auto mode as fallback\n");</div><div class='add'>+			spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_ssid_check, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* inverted digital-mic */</div><div class='add'>+void alc_fixup_inv_dmic(struct hda_codec *codec,</div><div class='add'>+			const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.inv_dmic_split = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_inv_dmic, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+int alc_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_BUILD);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_build_controls, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+int alc_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* hibernation resume needs the full chip initialization */</div><div class='add'>+	if (is_s4_resume(codec))</div><div class='add'>+		alc_pre_init(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;init_hook)</div><div class='add'>+		spec-&gt;init_hook(codec);</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.skip_verbs = 1; /* applied in below */</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+	alc_fix_pll(codec);</div><div class='add'>+	alc_auto_init_amp(codec, spec-&gt;init_amp);</div><div class='add'>+	snd_hda_apply_verbs(codec); /* apply verbs here after own init */</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_init, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_shutup(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_get_bool_hint(codec, "shutup"))</div><div class='add'>+		return; /* disabled explicitly by hints */</div><div class='add'>+</div><div class='add'>+	if (spec &amp;&amp; spec-&gt;shutup)</div><div class='add'>+		spec-&gt;shutup(codec);</div><div class='add'>+	else</div><div class='add'>+		alc_shutup_pins(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_shutup, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_power_eapd(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc_auto_setup_eapd(codec, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_power_eapd, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+int alc_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	alc_shutup(codec);</div><div class='add'>+	if (spec &amp;&amp; spec-&gt;power_hook)</div><div class='add'>+		spec-&gt;power_hook(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_suspend, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+int alc_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;no_depop_delay)</div><div class='add'>+		msleep(150); /* to avoid pop noise */</div><div class='add'>+	snd_hda_codec_init(codec);</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+	hda_call_check_power_status(codec, 0x01);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_resume, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Rename codecs appropriately from COEF value or subvendor id</div><div class='add'>+ */</div><div class='add'>+struct alc_codec_rename_table {</div><div class='add'>+	unsigned int vendor_id;</div><div class='add'>+	unsigned short coef_mask;</div><div class='add'>+	unsigned short coef_bits;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alc_codec_rename_pci_table {</div><div class='add'>+	unsigned int codec_vendor_id;</div><div class='add'>+	unsigned short pci_subvendor;</div><div class='add'>+	unsigned short pci_subdevice;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct alc_codec_rename_table rename_tbl[] = {</div><div class='add'>+	{ 0x10ec0221, 0xf00f, 0x1003, "ALC231" },</div><div class='add'>+	{ 0x10ec0269, 0xfff0, 0x3010, "ALC277" },</div><div class='add'>+	{ 0x10ec0269, 0xf0f0, 0x2010, "ALC259" },</div><div class='add'>+	{ 0x10ec0269, 0xf0f0, 0x3010, "ALC258" },</div><div class='add'>+	{ 0x10ec0269, 0x00f0, 0x0010, "ALC269VB" },</div><div class='add'>+	{ 0x10ec0269, 0xffff, 0xa023, "ALC259" },</div><div class='add'>+	{ 0x10ec0269, 0xffff, 0x6023, "ALC281X" },</div><div class='add'>+	{ 0x10ec0269, 0x00f0, 0x0020, "ALC269VC" },</div><div class='add'>+	{ 0x10ec0269, 0x00f0, 0x0030, "ALC269VD" },</div><div class='add'>+	{ 0x10ec0662, 0xffff, 0x4020, "ALC656" },</div><div class='add'>+	{ 0x10ec0887, 0x00f0, 0x0030, "ALC887-VD" },</div><div class='add'>+	{ 0x10ec0888, 0x00f0, 0x0030, "ALC888-VD" },</div><div class='add'>+	{ 0x10ec0888, 0xf0f0, 0x3020, "ALC886" },</div><div class='add'>+	{ 0x10ec0899, 0x2000, 0x2000, "ALC899" },</div><div class='add'>+	{ 0x10ec0892, 0xffff, 0x8020, "ALC661" },</div><div class='add'>+	{ 0x10ec0892, 0xffff, 0x8011, "ALC661" },</div><div class='add'>+	{ 0x10ec0892, 0xffff, 0x4011, "ALC656" },</div><div class='add'>+	{ } /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct alc_codec_rename_pci_table rename_pci_tbl[] = {</div><div class='add'>+	{ 0x10ec0280, 0x1028, 0, "ALC3220" },</div><div class='add'>+	{ 0x10ec0282, 0x1028, 0, "ALC3221" },</div><div class='add'>+	{ 0x10ec0283, 0x1028, 0, "ALC3223" },</div><div class='add'>+	{ 0x10ec0288, 0x1028, 0, "ALC3263" },</div><div class='add'>+	{ 0x10ec0292, 0x1028, 0, "ALC3226" },</div><div class='add'>+	{ 0x10ec0293, 0x1028, 0, "ALC3235" },</div><div class='add'>+	{ 0x10ec0255, 0x1028, 0, "ALC3234" },</div><div class='add'>+	{ 0x10ec0668, 0x1028, 0, "ALC3661" },</div><div class='add'>+	{ 0x10ec0275, 0x1028, 0, "ALC3260" },</div><div class='add'>+	{ 0x10ec0899, 0x1028, 0, "ALC3861" },</div><div class='add'>+	{ 0x10ec0298, 0x1028, 0, "ALC3266" },</div><div class='add'>+	{ 0x10ec0236, 0x1028, 0, "ALC3204" },</div><div class='add'>+	{ 0x10ec0256, 0x1028, 0, "ALC3246" },</div><div class='add'>+	{ 0x10ec0225, 0x1028, 0, "ALC3253" },</div><div class='add'>+	{ 0x10ec0295, 0x1028, 0, "ALC3254" },</div><div class='add'>+	{ 0x10ec0299, 0x1028, 0, "ALC3271" },</div><div class='add'>+	{ 0x10ec0670, 0x1025, 0, "ALC669X" },</div><div class='add'>+	{ 0x10ec0676, 0x1025, 0, "ALC679X" },</div><div class='add'>+	{ 0x10ec0282, 0x1043, 0, "ALC3229" },</div><div class='add'>+	{ 0x10ec0233, 0x1043, 0, "ALC3236" },</div><div class='add'>+	{ 0x10ec0280, 0x103c, 0, "ALC3228" },</div><div class='add'>+	{ 0x10ec0282, 0x103c, 0, "ALC3227" },</div><div class='add'>+	{ 0x10ec0286, 0x103c, 0, "ALC3242" },</div><div class='add'>+	{ 0x10ec0290, 0x103c, 0, "ALC3241" },</div><div class='add'>+	{ 0x10ec0668, 0x103c, 0, "ALC3662" },</div><div class='add'>+	{ 0x10ec0283, 0x17aa, 0, "ALC3239" },</div><div class='add'>+	{ 0x10ec0292, 0x17aa, 0, "ALC3232" },</div><div class='add'>+	{ 0x10ec0257, 0x12f0, 0, "ALC3328" },</div><div class='add'>+	{ } /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int alc_codec_rename_from_preset(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct alc_codec_rename_table *p;</div><div class='add'>+	const struct alc_codec_rename_pci_table *q;</div><div class='add'>+</div><div class='add'>+	for (p = rename_tbl; p-&gt;vendor_id; p++) {</div><div class='add'>+		if (p-&gt;vendor_id != codec-&gt;core.vendor_id)</div><div class='add'>+			continue;</div><div class='add'>+		if ((alc_get_coef0(codec) &amp; p-&gt;coef_mask) == p-&gt;coef_bits)</div><div class='add'>+			return alc_codec_rename(codec, p-&gt;name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;bus-&gt;pci)</div><div class='add'>+		return 0;</div><div class='add'>+	for (q = rename_pci_tbl; q-&gt;codec_vendor_id; q++) {</div><div class='add'>+		if (q-&gt;codec_vendor_id != codec-&gt;core.vendor_id)</div><div class='add'>+			continue;</div><div class='add'>+		if (q-&gt;pci_subvendor != codec-&gt;bus-&gt;pci-&gt;subsystem_vendor)</div><div class='add'>+			continue;</div><div class='add'>+		if (!q-&gt;pci_subdevice ||</div><div class='add'>+		    q-&gt;pci_subdevice == codec-&gt;bus-&gt;pci-&gt;subsystem_device)</div><div class='add'>+			return alc_codec_rename(codec, q-&gt;name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Digital-beep handlers</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+</div><div class='add'>+/* additional beep mixers; private_value will be overwritten */</div><div class='add'>+static const struct snd_kcontrol_new alc_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_INPUT),</div><div class='add'>+	HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_INPUT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* set up and create beep controls */</div><div class='add'>+int alc_set_beep_amp(struct alc_spec *spec, hda_nid_t nid, int idx, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(alc_beep_mixer); i++) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+					    &amp;alc_beep_mixer[i]);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value = beep_amp;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_set_beep_amp, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static const struct snd_pci_quirk beep_allow_list[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x103c, "ASUS", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x115d, "ASUS", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8376, "EeePC", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x83ce, "EeePC", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x831a, "EeePC", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x834a, "EeePC", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa002, "GA-MA790X", 1),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0xd613, "Intel", 1),</div><div class='add'>+	/* denylist -- no beep available */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x309e, "Lenovo ThinkCentre M73", 0),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x30a3, "Lenovo ThinkCentre M93", 0),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int alc_has_cdefine_beep(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct snd_pci_quirk *q;</div><div class='add'>+	q = snd_pci_quirk_lookup(codec-&gt;bus-&gt;pci, beep_allow_list);</div><div class='add'>+	if (q)</div><div class='add'>+		return q-&gt;value;</div><div class='add'>+	return spec-&gt;cdefine.enable_pcbeep;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_has_cdefine_beep, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_SND_HDA_INPUT_BEEP */</div><div class='add'>+</div><div class='add'>+/* parse the BIOS configuration and set up the alc_spec */</div><div class='add'>+/* return 1 if successful, 0 if the proper config is not found,</div><div class='add'>+ * or a negative error code</div><div class='add'>+ */</div><div class='add'>+int alc_parse_auto_config(struct hda_codec *codec,</div><div class='add'>+			  const hda_nid_t *ignore_nids,</div><div class='add'>+			  const hda_nid_t *ssid_nids)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, cfg, ignore_nids,</div><div class='add'>+				       spec-&gt;parse_flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ssid_nids)</div><div class='add'>+		alc_ssid_check(codec, ssid_nids);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, cfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_parse_auto_config, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* common preparation job for alc_spec */</div><div class='add'>+int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	spec-&gt;gen.mixer_nid = mixer_nid;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	codec-&gt;single_adc_amp = 1;</div><div class='add'>+	/* FIXME: do we need this for all Realtek codec models? */</div><div class='add'>+	codec-&gt;spdif_status_reset = 1;</div><div class='add'>+	codec-&gt;forced_resume = 1;</div><div class='add'>+	mutex_init(&amp;spec-&gt;coef_mutex);</div><div class='add'>+</div><div class='add'>+	err = alc_codec_rename_from_preset(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(spec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_alloc_spec, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* For dual-codec configuration, we need to disable some features to avoid</div><div class='add'>+ * conflicts of kctls and PCM streams</div><div class='add'>+ */</div><div class='add'>+void alc_fixup_dual_codecs(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	/* disable vmaster */</div><div class='add'>+	spec-&gt;gen.suppress_vmaster = 1;</div><div class='add'>+	/* auto-mute and auto-mic switch don't work with multiple codecs */</div><div class='add'>+	spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+	spec-&gt;gen.suppress_auto_mic = 1;</div><div class='add'>+	/* disable aamix as well */</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+	/* add location prefix to avoid conflicts */</div><div class='add'>+	codec-&gt;force_pin_prefix = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_dual_codecs, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem asus_pcm_2_1_chmaps[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },</div><div class='add'>+	{ .channels = 4,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_NA, SNDRV_CHMAP_LFE } }, /* LFE only on right */</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* override the 2.1 chmap */</div><div class='add'>+void alc_fixup_bass_chmap(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_BUILD) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;gen.pcm_rec[0]-&gt;stream[0].chmap = asus_pcm_2_1_chmaps;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_bass_chmap, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* exported as it's used by multiple codecs */</div><div class='add'>+void alc1220_fixup_gb_dual_codecs(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix,</div><div class='add'>+				  int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_dual_codecs(codec, fix, action);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* override card longname to provide a unique UCM profile */</div><div class='add'>+		strscpy(codec-&gt;card-&gt;longname, "HDAudio-Gigabyte-ALC1220DualCodecs");</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		/* rename Capture controls depending on the codec */</div><div class='add'>+		rename_ctl(codec, "Capture Volume",</div><div class='add'>+			   codec-&gt;addr == 0 ?</div><div class='add'>+			   "Rear-Panel Capture Volume" :</div><div class='add'>+			   "Front-Panel Capture Volume");</div><div class='add'>+		rename_ctl(codec, "Capture Switch",</div><div class='add'>+			   codec-&gt;addr == 0 ?</div><div class='add'>+			   "Rear-Panel Capture Switch" :</div><div class='add'>+			   "Front-Panel Capture Switch");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc1220_fixup_gb_dual_codecs, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,</div><div class='add'>+					    const struct hda_fixup *fix,</div><div class='add'>+					    int action)</div><div class='add'>+{</div><div class='add'>+	alc_fixup_dual_codecs(codec, fix, action);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* override card longname to provide a unique UCM profile */</div><div class='add'>+		strscpy(codec-&gt;card-&gt;longname, "HDAudio-Lenovo-DualCodecs");</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_BUILD:</div><div class='add'>+		/* rename Capture controls depending on the codec */</div><div class='add'>+		rename_ctl(codec, "Capture Volume",</div><div class='add'>+			   codec-&gt;addr == 0 ?</div><div class='add'>+			   "Rear-Panel Capture Volume" :</div><div class='add'>+			   "Front-Panel Capture Volume");</div><div class='add'>+		rename_ctl(codec, "Capture Switch",</div><div class='add'>+			   codec-&gt;addr == 0 ?</div><div class='add'>+			   "Rear-Panel Capture Switch" :</div><div class='add'>+			   "Front-Panel Capture Switch");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc233_alc662_fixup_lenovo_dual_codecs, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static void alc_shutup_dell_xps13(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	int hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+</div><div class='add'>+	/* Prevent pop noises when headphones are plugged in */</div><div class='add'>+	snd_hda_codec_write(codec, hp_pin, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+	msleep(20);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void alc_fixup_dell_xps13(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_input_mux *imux = &amp;spec-&gt;gen.input_mux;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		/* mic pin 0x19 must be initialized with Vref Hi-Z, otherwise</div><div class='add'>+		 * it causes a click noise at start up</div><div class='add'>+		 */</div><div class='add'>+		snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);</div><div class='add'>+		spec-&gt;shutup = alc_shutup_dell_xps13;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		/* Make the internal mic the default input source. */</div><div class='add'>+		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+			if (spec-&gt;gen.imux_pins[i] == 0x12) {</div><div class='add'>+				spec-&gt;gen.cur_mux[0] = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_dell_xps13, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * headset handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay)</div><div class='add'>+{</div><div class='add'>+	if (delay &lt;= 0)</div><div class='add'>+		delay = 75;</div><div class='add'>+	snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+		    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+	msleep(delay);</div><div class='add'>+	snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+		    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+	msleep(delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay)</div><div class='add'>+{</div><div class='add'>+	if (delay &lt;= 0)</div><div class='add'>+		delay = 75;</div><div class='add'>+	snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+		    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='add'>+	msleep(delay);</div><div class='add'>+	snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+		    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+	msleep(delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct coef_fw alc225_pre_hsmode[] = {</div><div class='add'>+	UPDATE_COEF(0x4a, 1&lt;&lt;8, 0),</div><div class='add'>+	UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 0),</div><div class='add'>+	UPDATE_COEF(0x63, 3&lt;&lt;14, 3&lt;&lt;14),</div><div class='add'>+	UPDATE_COEF(0x4a, 3&lt;&lt;4, 2&lt;&lt;4),</div><div class='add'>+	UPDATE_COEF(0x4a, 3&lt;&lt;10, 3&lt;&lt;10),</div><div class='add'>+	UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x34&lt;&lt;10),</div><div class='add'>+	UPDATE_COEF(0x4a, 3&lt;&lt;10, 0),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void alc_headset_mode_unplugged(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c0b), /* LDO and MISC control */</div><div class='add'>+		WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 0), /* Direct Drive HP Amp control(Set to verb control)*/</div><div class='add'>+		WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x8aa6), /* Direct Drive HP Amp control */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0256[] = {</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c4b), /* LDO and MISC control */</div><div class='add'>+		WRITE_COEF(0x45, 0xd089), /* UAJ function set to menual mode */</div><div class='add'>+		WRITE_COEF(0x06, 0x6104), /* Set MIC2 Vref gate with HP */</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x09a3), /* Direct Drive HP Amp control */</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 0), /* Direct Drive HP Amp control(Set to verb control)*/</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0233[] = {</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c0b),</div><div class='add'>+		WRITE_COEF(0x45, 0xc429),</div><div class='add'>+		UPDATE_COEF(0x35, 0x4000, 0),</div><div class='add'>+		WRITE_COEF(0x06, 0x2104),</div><div class='add'>+		WRITE_COEF(0x1a, 0x0001),</div><div class='add'>+		WRITE_COEF(0x26, 0x0004),</div><div class='add'>+		WRITE_COEF(0x32, 0x42a3),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x4f, 0xfcc0, 0xc400),</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0x2000),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0x0006),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0298[] = {</div><div class='add'>+		UPDATE_COEF(0x19, 0x1300, 0x0300),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0292[] = {</div><div class='add'>+		WRITE_COEF(0x76, 0x000e),</div><div class='add'>+		WRITE_COEF(0x6c, 0x2400),</div><div class='add'>+		WRITE_COEF(0x18, 0x7308),</div><div class='add'>+		WRITE_COEF(0x6b, 0xc429),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		UPDATE_COEF(0x10, 7&lt;&lt;8, 6&lt;&lt;8), /* SET Line1 JD to 0 */</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;15|1&lt;&lt;13, 0x0), /* SET charge pump by verb */</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x03, 1&lt;&lt;10, 1&lt;&lt;10), /* SET EN_OSW to 1 */</div><div class='add'>+		UPDATE_COEF(0x1a, 1&lt;&lt;3, 1&lt;&lt;3), /* Combo JD gating with LINE1-VREFO */</div><div class='add'>+		WRITE_COEF(0x45, 0xc429), /* Set to TRS type */</div><div class='add'>+		UPDATE_COEF(0x4a, 0x000f, 0x000e), /* Combo Jack auto detect */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0668[] = {</div><div class='add'>+		WRITE_COEF(0x15, 0x0d40),</div><div class='add'>+		WRITE_COEF(0xb7, 0x802b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0225[] = {</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0274[] = {</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0100, 0),</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 0x4000, 0),</div><div class='add'>+		UPDATE_COEF(0x6b, 0xf000, 0x5000),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0010, 0),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0c00, 0x0c00),</div><div class='add'>+		WRITE_COEF(0x45, 0x5289),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0c00, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;no_internal_mic_pin) {</div><div class='add'>+		alc_update_coef_idx(codec, 0x45, 0xf&lt;&lt;12 | 1&lt;&lt;10, 5&lt;&lt;12);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_hp_mute_disable(codec, 75);</div><div class='add'>+		alc_process_coef_fw(codec, coef0256);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_process_coef_fw(codec, coef0274);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_process_coef_fw(codec, coef0233);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		alc_process_coef_fw(codec, coef0298);</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_process_coef_fw(codec, coef0292);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_process_coef_fw(codec, coef0668);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_hp_mute_disable(codec, 75);</div><div class='add'>+		alc_process_coef_fw(codec, alc225_pre_hsmode);</div><div class='add'>+		alc_process_coef_fw(codec, coef0225);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x5, 1&lt;&lt;14, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "Headset jack set to unplugged mode.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,</div><div class='add'>+				    hda_nid_t mic_pin)</div><div class='add'>+{</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x8aa6),</div><div class='add'>+		WRITE_COEF(0x06, 0x6100), /* Set MIC2 Vref gate to normal */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0256[] = {</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 1&lt;&lt;14), /* Direct Drive HP Amp control(Set to verb control)*/</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x09a3),</div><div class='add'>+		WRITE_COEF(0x06, 0x6100), /* Set MIC2 Vref gate to normal */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0233[] = {</div><div class='add'>+		UPDATE_COEF(0x35, 0, 1&lt;&lt;14),</div><div class='add'>+		WRITE_COEF(0x06, 0x2100),</div><div class='add'>+		WRITE_COEF(0x1a, 0x0021),</div><div class='add'>+		WRITE_COEF(0x26, 0x008c),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x4f, 0x00c0, 0),</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0),</div><div class='add'>+		UPDATE_COEF(0x4f, 0xfcc0, 0xc400),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0x0008),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0x2000),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0292[] = {</div><div class='add'>+		WRITE_COEF(0x19, 0xa208),</div><div class='add'>+		WRITE_COEF(0x2e, 0xacf0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 0, 1&lt;&lt;15|1&lt;&lt;13), /* SET charge pump by verb */</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x03, 1&lt;&lt;10, 0), /* SET EN_OSW to 0 */</div><div class='add'>+		UPDATE_COEF(0x1a, 1&lt;&lt;3, 0), /* Combo JD gating without LINE1-VREFO */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0688[] = {</div><div class='add'>+		WRITE_COEF(0xb7, 0x802b),</div><div class='add'>+		WRITE_COEF(0xb5, 0x1040),</div><div class='add'>+		UPDATE_COEF(0xc3, 0, 1&lt;&lt;12),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0225[] = {</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 1&lt;&lt;14),</div><div class='add'>+		UPDATE_COEF(0x4a, 3&lt;&lt;4, 2&lt;&lt;4),</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0274[] = {</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 0x4000, 0x4000),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0010, 0),</div><div class='add'>+		UPDATE_COEF(0x6b, 0xf000, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xc489);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xc489);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0256);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0x4689);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0274);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xc429);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0233);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0292);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		/* Set to TRS mode */</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xc429);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x5, 0, 1&lt;&lt;14);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 0x10ec0221:</div><div class='add'>+	case 0x10ec0662:</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_write_coef_idx(codec, 0x11, 0x0001);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0688);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_process_coef_fw(codec, alc225_pre_hsmode);</div><div class='add'>+		alc_update_coef_idx(codec, 0x45, 0x3f&lt;&lt;10, 0x31&lt;&lt;10);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);</div><div class='add'>+		alc_process_coef_fw(codec, coef0225);</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "Headset jack set to mic-in mode.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_headset_mode_default(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const struct coef_fw coef0225[] = {</div><div class='add'>+		UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x30&lt;&lt;10),</div><div class='add'>+		UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x31&lt;&lt;10),</div><div class='add'>+		UPDATE_COEF(0x49, 3&lt;&lt;8, 0&lt;&lt;8),</div><div class='add'>+		UPDATE_COEF(0x4a, 3&lt;&lt;4, 3&lt;&lt;4),</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0xf000, 0x3000),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xc089),</div><div class='add'>+		WRITE_COEF(0x45, 0xc489),</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x8ea6),</div><div class='add'>+		WRITE_COEF(0x49, 0x0049),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0256[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xc489),</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x0da3),</div><div class='add'>+		WRITE_COEF(0x49, 0x0049),</div><div class='add'>+		UPDATE_COEFEX(0x57, 0x05, 1&lt;&lt;14, 0), /* Direct Drive HP Amp control(Set to verb control)*/</div><div class='add'>+		WRITE_COEF(0x06, 0x6100),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0233[] = {</div><div class='add'>+		WRITE_COEF(0x06, 0x2100),</div><div class='add'>+		WRITE_COEF(0x32, 0x4ea3),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x4f, 0xfcc0, 0xc400), /* Set to TRS type */</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0x2000),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0x0006),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0292[] = {</div><div class='add'>+		WRITE_COEF(0x76, 0x000e),</div><div class='add'>+		WRITE_COEF(0x6c, 0x2400),</div><div class='add'>+		WRITE_COEF(0x6b, 0xc429),</div><div class='add'>+		WRITE_COEF(0x18, 0x7308),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		UPDATE_COEF(0x4a, 0x000f, 0x000e), /* Combo Jack auto detect */</div><div class='add'>+		WRITE_COEF(0x45, 0xC429), /* Set to TRS type */</div><div class='add'>+		UPDATE_COEF(0x1a, 1&lt;&lt;3, 0), /* Combo JD gating without LINE1-VREFO */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0688[] = {</div><div class='add'>+		WRITE_COEF(0x11, 0x0041),</div><div class='add'>+		WRITE_COEF(0x15, 0x0d40),</div><div class='add'>+		WRITE_COEF(0xb7, 0x802b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0274[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0x4289),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0010, 0x0010),</div><div class='add'>+		UPDATE_COEF(0x6b, 0x0f00, 0),</div><div class='add'>+		UPDATE_COEF(0x49, 0x0300, 0x0300),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_process_coef_fw(codec, alc225_pre_hsmode);</div><div class='add'>+		alc_process_coef_fw(codec, coef0225);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_write_coef_idx(codec, 0x1b, 0x0e4b);</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xc089);</div><div class='add'>+		msleep(50);</div><div class='add'>+		alc_process_coef_fw(codec, coef0256);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_process_coef_fw(codec, coef0274);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_process_coef_fw(codec, coef0233);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_process_coef_fw(codec, coef0292);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_process_coef_fw(codec, coef0688);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x5, 1&lt;&lt;14, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "Headset jack set to headphone (default) mode.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Iphone type */</div><div class='add'>+static void alc_headset_mode_ctia(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c2b),</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x8ea6),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0256[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */</div><div class='add'>+		WRITE_COEF(0x1b, 0x0e6b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0233[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xd429),</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c2b),</div><div class='add'>+		WRITE_COEF(0x32, 0x4ea3),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0x2000),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0x0006),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0292[] = {</div><div class='add'>+		WRITE_COEF(0x6b, 0xd429),</div><div class='add'>+		WRITE_COEF(0x76, 0x0008),</div><div class='add'>+		WRITE_COEF(0x18, 0x7388),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xd429), /* Set to ctia type */</div><div class='add'>+		UPDATE_COEF(0x10, 7&lt;&lt;8, 7&lt;&lt;8), /* SET Line1 JD to 1 */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0688[] = {</div><div class='add'>+		WRITE_COEF(0x11, 0x0001),</div><div class='add'>+		WRITE_COEF(0x15, 0x0d60),</div><div class='add'>+		WRITE_COEF(0xc3, 0x0000),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0225_1[] = {</div><div class='add'>+		UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x35&lt;&lt;10),</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 2&lt;&lt;14),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0225_2[] = {</div><div class='add'>+		UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x35&lt;&lt;10),</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 1&lt;&lt;14),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_process_coef_fw(codec, coef0256);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xd689);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_process_coef_fw(codec, coef0233);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x50);</div><div class='add'>+		if (val &amp; (1 &lt;&lt; 12)) {</div><div class='add'>+			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);</div><div class='add'>+			alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);</div><div class='add'>+			msleep(300);</div><div class='add'>+		} else {</div><div class='add'>+			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);</div><div class='add'>+			alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);</div><div class='add'>+			msleep(300);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400);</div><div class='add'>+		msleep(300);</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_process_coef_fw(codec, coef0292);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_process_coef_fw(codec, coef0688);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x45);</div><div class='add'>+		if (val &amp; (1 &lt;&lt; 9))</div><div class='add'>+			alc_process_coef_fw(codec, coef0225_2);</div><div class='add'>+		else</div><div class='add'>+			alc_process_coef_fw(codec, coef0225_1);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x5, 1&lt;&lt;14, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "Headset jack set to iPhone-style headset mode.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Nokia type */</div><div class='add'>+static void alc_headset_mode_omtp(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c2b),</div><div class='add'>+		WRITE_COEFEX(0x57, 0x03, 0x8ea6),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0256[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */</div><div class='add'>+		WRITE_COEF(0x1b, 0x0e6b),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0233[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xe429),</div><div class='add'>+		WRITE_COEF(0x1b, 0x0c2b),</div><div class='add'>+		WRITE_COEF(0x32, 0x4ea3),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0x2000),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0x0006),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0292[] = {</div><div class='add'>+		WRITE_COEF(0x6b, 0xe429),</div><div class='add'>+		WRITE_COEF(0x76, 0x0008),</div><div class='add'>+		WRITE_COEF(0x18, 0x7388),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xe429), /* Set to omtp type */</div><div class='add'>+		UPDATE_COEF(0x10, 7&lt;&lt;8, 7&lt;&lt;8), /* SET Line1 JD to 1 */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0688[] = {</div><div class='add'>+		WRITE_COEF(0x11, 0x0001),</div><div class='add'>+		WRITE_COEF(0x15, 0x0d50),</div><div class='add'>+		WRITE_COEF(0xc3, 0x0000),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0225[] = {</div><div class='add'>+		UPDATE_COEF(0x45, 0x3f&lt;&lt;10, 0x39&lt;&lt;10),</div><div class='add'>+		UPDATE_COEF(0x63, 3&lt;&lt;14, 2&lt;&lt;14),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_process_coef_fw(codec, coef0256);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xe689);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_process_coef_fw(codec, coef0233);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);/* Headset output enable */</div><div class='add'>+		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);</div><div class='add'>+		msleep(300);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+		alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400);</div><div class='add'>+		msleep(300);</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_process_coef_fw(codec, coef0292);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_process_coef_fw(codec, coef0688);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_process_coef_fw(codec, coef0225);</div><div class='add'>+		alc_hp_enable_unmute(codec, 75);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_determine_headset_type(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+	bool is_ctia = false;</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const struct coef_fw coef0255[] = {</div><div class='add'>+		WRITE_COEF(0x45, 0xd089), /* combo jack auto switch control(Check type)*/</div><div class='add'>+		WRITE_COEF(0x49, 0x0149), /* combo jack auto switch control(Vref</div><div class='add'>+ conteol) */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0288[] = {</div><div class='add'>+		UPDATE_COEF(0x4f, 0xfcc0, 0xd400), /* Check Type */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0298[] = {</div><div class='add'>+		UPDATE_COEF(0x50, 0x2000, 0x2000),</div><div class='add'>+		UPDATE_COEF(0x56, 0x0006, 0x0006),</div><div class='add'>+		UPDATE_COEF(0x66, 0x0008, 0),</div><div class='add'>+		UPDATE_COEF(0x67, 0x2000, 0),</div><div class='add'>+		UPDATE_COEF(0x19, 0x1300, 0x1300),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0293[] = {</div><div class='add'>+		UPDATE_COEF(0x4a, 0x000f, 0x0008), /* Combo Jack auto detect */</div><div class='add'>+		WRITE_COEF(0x45, 0xD429), /* Set to ctia type */</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0688[] = {</div><div class='add'>+		WRITE_COEF(0x11, 0x0001),</div><div class='add'>+		WRITE_COEF(0xb7, 0x802b),</div><div class='add'>+		WRITE_COEF(0x15, 0x0d60),</div><div class='add'>+		WRITE_COEF(0xc3, 0x0c00),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	static const struct coef_fw coef0274[] = {</div><div class='add'>+		UPDATE_COEF(0x4a, 0x0010, 0),</div><div class='add'>+		UPDATE_COEF(0x4a, 0x8000, 0),</div><div class='add'>+		WRITE_COEF(0x45, 0xd289),</div><div class='add'>+		UPDATE_COEF(0x49, 0x0300, 0x0300),</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;no_internal_mic_pin) {</div><div class='add'>+		alc_update_coef_idx(codec, 0x45, 0xf&lt;&lt;12 | 1&lt;&lt;10, 5&lt;&lt;12);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x10ec0255:</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+		is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0230:</div><div class='add'>+	case 0x10ec0236:</div><div class='add'>+	case 0x10ec0256:</div><div class='add'>+	case 0x19e58326:</div><div class='add'>+		alc_write_coef_idx(codec, 0x1b, 0x0e4b);</div><div class='add'>+		alc_write_coef_idx(codec, 0x06, 0x6104);</div><div class='add'>+		alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3);</div><div class='add'>+</div><div class='add'>+		alc_process_coef_fw(codec, coef0255);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+		is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		if (!is_ctia) {</div><div class='add'>+			alc_write_coef_idx(codec, 0x45, 0xe089);</div><div class='add'>+			msleep(100);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+			if ((val &amp; 0x0070) == 0x0070)</div><div class='add'>+				is_ctia = false;</div><div class='add'>+			else</div><div class='add'>+				is_ctia = true;</div><div class='add'>+		}</div><div class='add'>+		alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3);</div><div class='add'>+		alc_update_coefex_idx(codec, 0x57, 0x5, 1&lt;&lt;14, 0);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0234:</div><div class='add'>+	case 0x10ec0274:</div><div class='add'>+	case 0x10ec0294:</div><div class='add'>+		alc_process_coef_fw(codec, coef0274);</div><div class='add'>+		msleep(850);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+		is_ctia = (val &amp; 0x00f0) == 0x00f0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0233:</div><div class='add'>+	case 0x10ec0283:</div><div class='add'>+		alc_write_coef_idx(codec, 0x45, 0xd029);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+		is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0298:</div><div class='add'>+		snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='add'>+		msleep(100);</div><div class='add'>+		snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);</div><div class='add'>+		msleep(200);</div><div class='add'>+</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x50);</div><div class='add'>+		if (val &amp; (1 &lt;&lt; 12)) {</div><div class='add'>+			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0020);</div><div class='add'>+			alc_process_coef_fw(codec, coef0288);</div><div class='add'>+			msleep(350);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x50);</div><div class='add'>+			is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		} else {</div><div class='add'>+			alc_update_coef_idx(codec, 0x8e, 0x0070, 0x0010);</div><div class='add'>+			alc_process_coef_fw(codec, coef0288);</div><div class='add'>+			msleep(350);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x50);</div><div class='add'>+			is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		}</div><div class='add'>+		alc_process_coef_fw(codec, coef0298);</div><div class='add'>+		snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);</div><div class='add'>+		msleep(75);</div><div class='add'>+		snd_hda_codec_write(codec, 0x21, 0,</div><div class='add'>+			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0286:</div><div class='add'>+	case 0x10ec0288:</div><div class='add'>+		alc_process_coef_fw(codec, coef0288);</div><div class='add'>+		msleep(350);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x50);</div><div class='add'>+		is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0292:</div><div class='add'>+		alc_write_coef_idx(codec, 0x6b, 0xd429);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x6c);</div><div class='add'>+		is_ctia = (val &amp; 0x001c) == 0x001c;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0293:</div><div class='add'>+		alc_process_coef_fw(codec, coef0293);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+		is_ctia = (val &amp; 0x0070) == 0x0070;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0668:</div><div class='add'>+		alc_process_coef_fw(codec, coef0688);</div><div class='add'>+		msleep(300);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0xbe);</div><div class='add'>+		is_ctia = (val &amp; 0x1c02) == 0x1c02;</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0215:</div><div class='add'>+	case 0x10ec0225:</div><div class='add'>+	case 0x10ec0285:</div><div class='add'>+	case 0x10ec0295:</div><div class='add'>+	case 0x10ec0289:</div><div class='add'>+	case 0x10ec0299:</div><div class='add'>+		alc_process_coef_fw(codec, alc225_pre_hsmode);</div><div class='add'>+		alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000);</div><div class='add'>+		val = alc_read_coef_idx(codec, 0x45);</div><div class='add'>+		if (val &amp; (1 &lt;&lt; 9)) {</div><div class='add'>+			alc_update_coef_idx(codec, 0x45, 0x3f&lt;&lt;10, 0x34&lt;&lt;10);</div><div class='add'>+			alc_update_coef_idx(codec, 0x49, 3&lt;&lt;8, 2&lt;&lt;8);</div><div class='add'>+			msleep(800);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+			is_ctia = (val &amp; 0x00f0) == 0x00f0;</div><div class='add'>+		} else {</div><div class='add'>+			alc_update_coef_idx(codec, 0x45, 0x3f&lt;&lt;10, 0x34&lt;&lt;10);</div><div class='add'>+			alc_update_coef_idx(codec, 0x49, 3&lt;&lt;8, 1&lt;&lt;8);</div><div class='add'>+			msleep(800);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+			is_ctia = (val &amp; 0x00f0) == 0x00f0;</div><div class='add'>+		}</div><div class='add'>+		if (!is_ctia) {</div><div class='add'>+			alc_update_coef_idx(codec, 0x45, 0x3f&lt;&lt;10, 0x38&lt;&lt;10);</div><div class='add'>+			alc_update_coef_idx(codec, 0x49, 3&lt;&lt;8, 1&lt;&lt;8);</div><div class='add'>+			msleep(100);</div><div class='add'>+			val = alc_read_coef_idx(codec, 0x46);</div><div class='add'>+			if ((val &amp; 0x00f0) == 0x00f0)</div><div class='add'>+				is_ctia = false;</div><div class='add'>+			else</div><div class='add'>+				is_ctia = true;</div><div class='add'>+		}</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 7&lt;&lt;6, 7&lt;&lt;6);</div><div class='add'>+		alc_update_coef_idx(codec, 0x4a, 3&lt;&lt;4, 3&lt;&lt;4);</div><div class='add'>+		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);</div><div class='add'>+		break;</div><div class='add'>+	case 0x10ec0867:</div><div class='add'>+		is_ctia = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "Headset jack detected iPhone-style headset: %s\n",</div><div class='add'>+		  str_yes_no(is_ctia));</div><div class='add'>+	spec-&gt;current_headset_type = is_ctia ? ALC_HEADSET_TYPE_CTIA : ALC_HEADSET_TYPE_OMTP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_update_headset_mode(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	hda_nid_t mux_pin = spec-&gt;gen.imux_pins[spec-&gt;gen.cur_mux[0]];</div><div class='add'>+	hda_nid_t hp_pin = alc_get_hp_pin(spec);</div><div class='add'>+</div><div class='add'>+	int new_headset_mode;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_jack_detect(codec, hp_pin))</div><div class='add'>+		new_headset_mode = ALC_HEADSET_MODE_UNPLUGGED;</div><div class='add'>+	else if (mux_pin == spec-&gt;headset_mic_pin)</div><div class='add'>+		new_headset_mode = ALC_HEADSET_MODE_HEADSET;</div><div class='add'>+	else if (mux_pin == spec-&gt;headphone_mic_pin)</div><div class='add'>+		new_headset_mode = ALC_HEADSET_MODE_MIC;</div><div class='add'>+	else</div><div class='add'>+		new_headset_mode = ALC_HEADSET_MODE_HEADPHONE;</div><div class='add'>+</div><div class='add'>+	if (new_headset_mode == spec-&gt;current_headset_mode) {</div><div class='add'>+		snd_hda_gen_update_outputs(codec);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (new_headset_mode) {</div><div class='add'>+	case ALC_HEADSET_MODE_UNPLUGGED:</div><div class='add'>+		alc_headset_mode_unplugged(codec);</div><div class='add'>+		spec-&gt;current_headset_mode = ALC_HEADSET_MODE_UNKNOWN;</div><div class='add'>+		spec-&gt;current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;</div><div class='add'>+		spec-&gt;gen.hp_jack_present = false;</div><div class='add'>+		break;</div><div class='add'>+	case ALC_HEADSET_MODE_HEADSET:</div><div class='add'>+		if (spec-&gt;current_headset_type == ALC_HEADSET_TYPE_UNKNOWN)</div><div class='add'>+			alc_determine_headset_type(codec);</div><div class='add'>+		if (spec-&gt;current_headset_type == ALC_HEADSET_TYPE_CTIA)</div><div class='add'>+			alc_headset_mode_ctia(codec);</div><div class='add'>+		else if (spec-&gt;current_headset_type == ALC_HEADSET_TYPE_OMTP)</div><div class='add'>+			alc_headset_mode_omtp(codec);</div><div class='add'>+		spec-&gt;gen.hp_jack_present = true;</div><div class='add'>+		break;</div><div class='add'>+	case ALC_HEADSET_MODE_MIC:</div><div class='add'>+		alc_headset_mode_mic_in(codec, hp_pin, spec-&gt;headphone_mic_pin);</div><div class='add'>+		spec-&gt;gen.hp_jack_present = false;</div><div class='add'>+		break;</div><div class='add'>+	case ALC_HEADSET_MODE_HEADPHONE:</div><div class='add'>+		alc_headset_mode_default(codec);</div><div class='add'>+		spec-&gt;gen.hp_jack_present = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (new_headset_mode != ALC_HEADSET_MODE_MIC) {</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, hp_pin,</div><div class='add'>+					  AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);</div><div class='add'>+		if (spec-&gt;headphone_mic_pin &amp;&amp; spec-&gt;headphone_mic_pin != hp_pin)</div><div class='add'>+			snd_hda_set_pin_ctl_cache(codec, spec-&gt;headphone_mic_pin,</div><div class='add'>+						  PIN_VREFHIZ);</div><div class='add'>+	}</div><div class='add'>+	spec-&gt;current_headset_mode = new_headset_mode;</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alc_update_headset_mode_hook(struct hda_codec *codec,</div><div class='add'>+					 struct snd_kcontrol *kcontrol,</div><div class='add'>+					 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	alc_update_headset_mode(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void alc_update_headset_jack_cb(struct hda_codec *codec,</div><div class='add'>+				struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	snd_hda_gen_hp_automute(codec, jack);</div><div class='add'>+	alc_update_headset_mode(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_update_headset_jack_cb, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+static void alc_probe_headset_mode(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+</div><div class='add'>+	/* Find mic pins */</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		if (cfg-&gt;inputs[i].is_headset_mic &amp;&amp; !spec-&gt;headset_mic_pin)</div><div class='add'>+			spec-&gt;headset_mic_pin = cfg-&gt;inputs[i].pin;</div><div class='add'>+		if (cfg-&gt;inputs[i].is_headphone_mic &amp;&amp; !spec-&gt;headphone_mic_pin)</div><div class='add'>+			spec-&gt;headphone_mic_pin = cfg-&gt;inputs[i].pin;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(spec-&gt;gen.cap_sync_hook);</div><div class='add'>+	spec-&gt;gen.cap_sync_hook = alc_update_headset_mode_hook;</div><div class='add'>+	spec-&gt;gen.automute_hook = alc_update_headset_mode;</div><div class='add'>+	spec-&gt;gen.hp_automute_hook = alc_update_headset_jack_cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void alc_fixup_headset_mode(struct hda_codec *codec,</div><div class='add'>+			    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC | HDA_PINCFG_HEADPHONE_MIC;</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		alc_probe_headset_mode(codec);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_FIXUP_ACT_INIT:</div><div class='add'>+		if (is_s3_resume(codec) || is_s4_resume(codec)) {</div><div class='add'>+			spec-&gt;current_headset_mode = ALC_HEADSET_MODE_UNKNOWN;</div><div class='add'>+			spec-&gt;current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;</div><div class='add'>+		}</div><div class='add'>+		alc_update_headset_mode(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_headset_mode, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+	}</div><div class='add'>+	else</div><div class='add'>+		alc_fixup_headset_mode(codec, fix, action);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_headset_mode_no_hp_mic, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_headset_mic(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;parse_flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_headset_mic, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* update LED status via GPIO */</div><div class='add'>+void alc_update_gpio_led(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+			 int polarity, bool enabled)</div><div class='add'>+{</div><div class='add'>+	if (polarity)</div><div class='add'>+		enabled = !enabled;</div><div class='add'>+	alc_update_gpio_data(codec, mask, !enabled); /* muted -&gt; LED on */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_update_gpio_led, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* turn on/off mic-mute LED via GPIO per capture hook */</div><div class='add'>+static int micmute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+			   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_gpio_led(codec, spec-&gt;gpio_mic_led_mask,</div><div class='add'>+			    spec-&gt;micmute_led_polarity, !brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off mute LED via GPIO per vmaster hook */</div><div class='add'>+static int gpio_mute_led_set(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_update_gpio_led(codec, spec-&gt;gpio_mute_led_mask,</div><div class='add'>+			    spec-&gt;mute_led_polarity, !brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* setup mute and mic-mute GPIO bits, add hooks appropriately */</div><div class='add'>+void alc_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+			   int action,</div><div class='add'>+			   unsigned int mute_mask,</div><div class='add'>+			   unsigned int micmute_mask)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	alc_fixup_gpio(codec, action, mute_mask | micmute_mask);</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	if (mute_mask) {</div><div class='add'>+		spec-&gt;gpio_mute_led_mask = mute_mask;</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, gpio_mute_led_set);</div><div class='add'>+	}</div><div class='add'>+	if (micmute_mask) {</div><div class='add'>+		spec-&gt;gpio_mic_led_mask = micmute_mask;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, micmute_led_set);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_hp_gpio_led, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+/* suppress the jack-detection */</div><div class='add'>+void alc_fixup_no_jack_detect(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		codec-&gt;no_jack_detect = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_no_jack_detect, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_disable_aamix(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		/* Disable AA-loopback as it causes white noise */</div><div class='add'>+		spec-&gt;gen.mixer_nid = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_disable_aamix, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+void alc_fixup_auto_mute_via_amp(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+		spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(alc_fixup_auto_mute_via_amp, "SND_HDA_CODEC_REALTEK");</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Realtek HD-audio codec helper");</div><div class='head'>diff --git a/sound/hda/codecs/realtek/realtek.h b/sound/hda/codecs/realtek/realtek.h<br/>new file mode 100644<br/>index 000000000000..b2a919904c4c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/realtek/realtek.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/realtek/realtek.h</a></div><div class='hunk'>@@ -0,0 +1,319 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+//</div><div class='add'>+// Realtek HD-audio codec support code</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#ifndef __HDA_REALTEK_H</div><div class='add'>+#define __HDA_REALTEK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+#include "../side-codecs/hda_component.h"</div><div class='add'>+</div><div class='add'>+/* extra amp-initialization sequence types */</div><div class='add'>+enum {</div><div class='add'>+	ALC_INIT_UNDEFINED,</div><div class='add'>+	ALC_INIT_NONE,</div><div class='add'>+	ALC_INIT_DEFAULT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC_HEADSET_MODE_UNKNOWN,</div><div class='add'>+	ALC_HEADSET_MODE_UNPLUGGED,</div><div class='add'>+	ALC_HEADSET_MODE_HEADSET,</div><div class='add'>+	ALC_HEADSET_MODE_MIC,</div><div class='add'>+	ALC_HEADSET_MODE_HEADPHONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC_HEADSET_TYPE_UNKNOWN,</div><div class='add'>+	ALC_HEADSET_TYPE_CTIA,</div><div class='add'>+	ALC_HEADSET_TYPE_OMTP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	ALC_KEY_MICMUTE_INDEX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alc_customize_define {</div><div class='add'>+	unsigned int  sku_cfg;</div><div class='add'>+	unsigned char port_connectivity;</div><div class='add'>+	unsigned char check_sum;</div><div class='add'>+	unsigned char customization;</div><div class='add'>+	unsigned char external_amp;</div><div class='add'>+	unsigned int  enable_pcbeep:1;</div><div class='add'>+	unsigned int  platform_type:1;</div><div class='add'>+	unsigned int  swap:1;</div><div class='add'>+	unsigned int  override:1;</div><div class='add'>+	unsigned int  fixup:1; /* Means that this sku is set by driver, not read from hw */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alc_coef_led {</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	unsigned int mask;</div><div class='add'>+	unsigned int on;</div><div class='add'>+	unsigned int off;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alc_spec {</div><div class='add'>+	struct hda_gen_spec gen; /* must be at head */</div><div class='add'>+</div><div class='add'>+	/* codec parameterization */</div><div class='add'>+	struct alc_customize_define cdefine;</div><div class='add'>+	unsigned int parse_flags; /* flag for snd_hda_parse_pin_defcfg() */</div><div class='add'>+</div><div class='add'>+	/* GPIO bits */</div><div class='add'>+	unsigned int gpio_mask;</div><div class='add'>+	unsigned int gpio_dir;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+	bool gpio_write_delay;	/* add a delay before writing gpio_data */</div><div class='add'>+</div><div class='add'>+	/* mute LED for HP laptops, see vref_mute_led_set() */</div><div class='add'>+	int mute_led_polarity;</div><div class='add'>+	int micmute_led_polarity;</div><div class='add'>+	hda_nid_t mute_led_nid;</div><div class='add'>+	hda_nid_t cap_mute_led_nid;</div><div class='add'>+</div><div class='add'>+	unsigned int gpio_mute_led_mask;</div><div class='add'>+	unsigned int gpio_mic_led_mask;</div><div class='add'>+	struct alc_coef_led mute_led_coef;</div><div class='add'>+	struct alc_coef_led mic_led_coef;</div><div class='add'>+	struct mutex coef_mutex;</div><div class='add'>+</div><div class='add'>+	hda_nid_t headset_mic_pin;</div><div class='add'>+	hda_nid_t headphone_mic_pin;</div><div class='add'>+	int current_headset_mode;</div><div class='add'>+	int current_headset_type;</div><div class='add'>+</div><div class='add'>+	/* hooks */</div><div class='add'>+	void (*init_hook)(struct hda_codec *codec);</div><div class='add'>+	void (*power_hook)(struct hda_codec *codec);</div><div class='add'>+	void (*shutup)(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+	int init_amp;</div><div class='add'>+	int codec_variant;	/* flag for other variants */</div><div class='add'>+	unsigned int has_alc5505_dsp:1;</div><div class='add'>+	unsigned int no_depop_delay:1;</div><div class='add'>+	unsigned int done_hp_init:1;</div><div class='add'>+	unsigned int no_shutup_pins:1;</div><div class='add'>+	unsigned int ultra_low_power:1;</div><div class='add'>+	unsigned int has_hs_key:1;</div><div class='add'>+	unsigned int no_internal_mic_pin:1;</div><div class='add'>+	unsigned int en_3kpull_low:1;</div><div class='add'>+	int num_speaker_amps;</div><div class='add'>+</div><div class='add'>+	/* for PLL fix */</div><div class='add'>+	hda_nid_t pll_nid;</div><div class='add'>+	unsigned int pll_coef_idx, pll_coef_bit;</div><div class='add'>+	unsigned int coef0;</div><div class='add'>+	struct input_dev *kb_dev;</div><div class='add'>+	u8 alc_mute_keycode_map[1];</div><div class='add'>+</div><div class='add'>+	/* component binding */</div><div class='add'>+	struct hda_component_parent comps;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			unsigned int coef_idx);</div><div class='add'>+void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  unsigned int coef_idx, unsigned int coef_val);</div><div class='add'>+void alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   unsigned int coef_idx, unsigned int mask,</div><div class='add'>+			   unsigned int bits_set);</div><div class='add'>+#define alc_read_coef_idx(codec, coef_idx) \</div><div class='add'>+	alc_read_coefex_idx(codec, 0x20, coef_idx)</div><div class='add'>+#define alc_write_coef_idx(codec, coef_idx, coef_val) \</div><div class='add'>+	alc_write_coefex_idx(codec, 0x20, coef_idx, coef_val)</div><div class='add'>+#define alc_update_coef_idx(codec, coef_idx, mask, bits_set)	\</div><div class='add'>+	alc_update_coefex_idx(codec, 0x20, coef_idx, mask, bits_set)</div><div class='add'>+</div><div class='add'>+unsigned int alc_get_coef0(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+/* coef writes/updates batch */</div><div class='add'>+struct coef_fw {</div><div class='add'>+	unsigned char nid;</div><div class='add'>+	unsigned char idx;</div><div class='add'>+	unsigned short mask;</div><div class='add'>+	unsigned short val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define UPDATE_COEFEX(_nid, _idx, _mask, _val) \</div><div class='add'>+	{ .nid = (_nid), .idx = (_idx), .mask = (_mask), .val = (_val) }</div><div class='add'>+#define WRITE_COEFEX(_nid, _idx, _val) UPDATE_COEFEX(_nid, _idx, -1, _val)</div><div class='add'>+#define WRITE_COEF(_idx, _val) WRITE_COEFEX(0x20, _idx, _val)</div><div class='add'>+#define UPDATE_COEF(_idx, _mask, _val) UPDATE_COEFEX(0x20, _idx, _mask, _val)</div><div class='add'>+</div><div class='add'>+void alc_process_coef_fw(struct hda_codec *codec, const struct coef_fw *fw);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GPIO helpers</div><div class='add'>+ */</div><div class='add'>+void alc_setup_gpio(struct hda_codec *codec, unsigned int mask);</div><div class='add'>+void alc_write_gpio_data(struct hda_codec *codec);</div><div class='add'>+void alc_update_gpio_data(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+			  bool on);</div><div class='add'>+void alc_write_gpio(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+/* common GPIO fixups */</div><div class='add'>+void alc_fixup_gpio(struct hda_codec *codec, int action, unsigned int mask);</div><div class='add'>+void alc_fixup_gpio1(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_gpio2(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_gpio3(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_gpio4(struct hda_codec *codec,</div><div class='add'>+		     const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_micmute_led(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Common init code, callbacks and helpers</div><div class='add'>+ */</div><div class='add'>+void alc_fix_pll(struct hda_codec *codec);</div><div class='add'>+void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		      unsigned int coef_idx, unsigned int coef_bit);</div><div class='add'>+void alc_fill_eapd_coef(struct hda_codec *codec);</div><div class='add'>+void alc_auto_setup_eapd(struct hda_codec *codec, bool on);</div><div class='add'>+</div><div class='add'>+int alc_find_ext_mic_pin(struct hda_codec *codec);</div><div class='add'>+void alc_headset_mic_no_shutup(struct hda_codec *codec);</div><div class='add'>+void alc_shutup_pins(struct hda_codec *codec);</div><div class='add'>+void alc_eapd_shutup(struct hda_codec *codec);</div><div class='add'>+void alc_auto_init_amp(struct hda_codec *codec, int type);</div><div class='add'>+hda_nid_t alc_get_hp_pin(struct alc_spec *spec);</div><div class='add'>+int alc_auto_parse_customize_define(struct hda_codec *codec);</div><div class='add'>+int alc_subsystem_id(struct hda_codec *codec, const hda_nid_t *ports);</div><div class='add'>+void alc_ssid_check(struct hda_codec *codec, const hda_nid_t *ports);</div><div class='add'>+int alc_build_controls(struct hda_codec *codec);</div><div class='add'>+void alc_update_knob_master(struct hda_codec *codec,</div><div class='add'>+			    struct hda_jack_callback *jack);</div><div class='add'>+</div><div class='add'>+static inline void alc_pre_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	alc_fill_eapd_coef(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define is_s3_resume(codec) \</div><div class='add'>+	((codec)-&gt;core.dev.power.power_state.event == PM_EVENT_RESUME)</div><div class='add'>+#define is_s4_resume(codec) \</div><div class='add'>+	((codec)-&gt;core.dev.power.power_state.event == PM_EVENT_RESTORE)</div><div class='add'>+#define is_s4_suspend(codec) \</div><div class='add'>+	((codec)-&gt;core.dev.power.power_state.event == PM_EVENT_FREEZE)</div><div class='add'>+</div><div class='add'>+int alc_init(struct hda_codec *codec);</div><div class='add'>+void alc_shutup(struct hda_codec *codec);</div><div class='add'>+void alc_power_eapd(struct hda_codec *codec);</div><div class='add'>+int alc_suspend(struct hda_codec *codec);</div><div class='add'>+int alc_resume(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int alc_parse_auto_config(struct hda_codec *codec,</div><div class='add'>+			  const hda_nid_t *ignore_nids,</div><div class='add'>+			  const hda_nid_t *ssid_nids);</div><div class='add'>+int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid);</div><div class='add'>+</div><div class='add'>+#define alc_codec_rename(codec, name) snd_hda_codec_set_name(codec, name)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+int alc_set_beep_amp(struct alc_spec *spec, hda_nid_t nid, int idx, int dir);</div><div class='add'>+int alc_has_cdefine_beep(struct hda_codec *codec);</div><div class='add'>+#define set_beep_amp		alc_set_beep_amp</div><div class='add'>+#define has_cdefine_beep	alc_has_cdefine_beep</div><div class='add'>+#else</div><div class='add'>+#define set_beep_amp(spec, nid, idx, dir)	0</div><div class='add'>+#define has_cdefine_beep(codec)		0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline void rename_ctl(struct hda_codec *codec, const char *oldname,</div><div class='add'>+			      const char *newname)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+</div><div class='add'>+	kctl = snd_hda_find_mixer_ctl(codec, oldname);</div><div class='add'>+	if (kctl)</div><div class='add'>+		snd_ctl_rename(codec-&gt;card, kctl, newname);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common fixups */</div><div class='add'>+void alc_fixup_sku_ignore(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_no_depop_delay(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_inv_dmic(struct hda_codec *codec,</div><div class='add'>+			const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_dual_codecs(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_bass_chmap(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_headset_mode(struct hda_codec *codec,</div><div class='add'>+			    const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_headset_mic(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_update_headset_jack_cb(struct hda_codec *codec,</div><div class='add'>+				struct hda_jack_callback *jack);</div><div class='add'>+void alc_update_gpio_led(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+			 int polarity, bool enabled);</div><div class='add'>+void alc_fixup_hp_gpio_led(struct hda_codec *codec,</div><div class='add'>+			   int action,</div><div class='add'>+			   unsigned int mute_mask,</div><div class='add'>+			   unsigned int micmute_mask);</div><div class='add'>+void alc_fixup_no_jack_detect(struct hda_codec *codec,</div><div class='add'>+			      const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_disable_aamix(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix, int action);</div><div class='add'>+void alc_fixup_auto_mute_via_amp(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action);</div><div class='add'>+</div><div class='add'>+/* device-specific, but used by multiple codec drivers */</div><div class='add'>+void alc1220_fixup_gb_dual_codecs(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix,</div><div class='add'>+				  int action);</div><div class='add'>+void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,</div><div class='add'>+					    const struct hda_fixup *fix,</div><div class='add'>+					    int action);</div><div class='add'>+void alc_fixup_dell_xps13(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_fixup *fix, int action);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * COEF access helper functions</div><div class='add'>+ */</div><div class='add'>+static inline void coef_mutex_lock(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_power_up_pm(codec);</div><div class='add'>+	mutex_lock(&amp;spec-&gt;coef_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void coef_mutex_unlock(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct alc_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;spec-&gt;coef_mutex);</div><div class='add'>+	snd_hda_power_down_pm(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_GUARD(coef_mutex, struct hda_codec *, coef_mutex_lock(_T), coef_mutex_unlock(_T))</div><div class='add'>+</div><div class='add'>+#endif /* __HDA_REALTEK_H */</div><div class='head'>diff --git a/sound/hda/codecs/senarytech.c b/sound/hda/codecs/senarytech.c<br/>new file mode 100644<br/>index 000000000000..63cda57cf786<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/senarytech.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/senarytech.c</a></div><div class='hunk'>@@ -0,0 +1,249 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio codec driver for Senary HDA audio codec</div><div class='add'>+ *</div><div class='add'>+ * Initially based on conexant.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+/* GPIO node ID */</div><div class='add'>+#define SENARY_GPIO_NODE	0x01</div><div class='add'>+</div><div class='add'>+struct senary_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	/* extra EAPD pins */</div><div class='add'>+	unsigned int num_eapds;</div><div class='add'>+	hda_nid_t eapds[4];</div><div class='add'>+	hda_nid_t mute_led_eapd;</div><div class='add'>+</div><div class='add'>+	unsigned int parse_flags; /* flag for snd_hda_parse_pin_defcfg() */</div><div class='add'>+</div><div class='add'>+	int mute_led_polarity;</div><div class='add'>+	unsigned int gpio_led;</div><div class='add'>+	unsigned int gpio_mute_led_mask;</div><div class='add'>+	unsigned int gpio_mic_led_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+/* additional beep mixers; private_value will be overwritten */</div><div class='add'>+static const struct snd_kcontrol_new senary_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_beep_amp(struct senary_spec *spec, hda_nid_t nid,</div><div class='add'>+			int idx, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = nid;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(senary_beep_mixer); i++) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+					    &amp;senary_beep_mixer[i]);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value = beep_amp;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int senary_auto_parse_beep(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct senary_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec)</div><div class='add'>+		if ((get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP) &amp;&amp;</div><div class='add'>+			(get_wcaps(codec, nid) &amp; (AC_WCAP_OUT_AMP | AC_WCAP_AMP_OVRD)))</div><div class='add'>+			return set_beep_amp(spec, nid, 0, HDA_OUTPUT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define senary_auto_parse_beep(codec)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* parse EAPDs */</div><div class='add'>+static void senary_auto_parse_eapd(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct senary_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='add'>+			continue;</div><div class='add'>+		if (!(snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD))</div><div class='add'>+			continue;</div><div class='add'>+		spec-&gt;eapds[spec-&gt;num_eapds++] = nid;</div><div class='add'>+		if (spec-&gt;num_eapds &gt;= ARRAY_SIZE(spec-&gt;eapds))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void senary_auto_turn_eapd(struct hda_codec *codec, int num_pins,</div><div class='add'>+			      const hda_nid_t *pins, bool on)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++) {</div><div class='add'>+		if (snd_hda_query_pin_caps(codec, pins[i]) &amp; AC_PINCAP_EAPD)</div><div class='add'>+			snd_hda_codec_write(codec, pins[i], 0,</div><div class='add'>+					    AC_VERB_SET_EAPD_BTLENABLE,</div><div class='add'>+					    on ? 0x02 : 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* turn on/off EAPD according to Master switch */</div><div class='add'>+static void senary_auto_vmaster_hook(void *private_data, int enabled)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = private_data;</div><div class='add'>+	struct senary_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	senary_auto_turn_eapd(codec, spec-&gt;num_eapds, spec-&gt;eapds, enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void senary_init_gpio_led(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct senary_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int mask = spec-&gt;gpio_mute_led_mask | spec-&gt;gpio_mic_led_mask;</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_MASK,</div><div class='add'>+				    mask);</div><div class='add'>+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='add'>+				    mask);</div><div class='add'>+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_DATA,</div><div class='add'>+				    spec-&gt;gpio_led);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int senary_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+	senary_init_gpio_led(codec);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void senary_shutdown(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct senary_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	/* Turn the problematic codec into D3 to avoid spurious noises</div><div class='add'>+	 * from the internal speaker during (and after) reboot</div><div class='add'>+	 */</div><div class='add'>+	senary_auto_turn_eapd(codec, spec-&gt;num_eapds, spec-&gt;eapds, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void senary_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	senary_shutdown(codec);</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int senary_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	senary_shutdown(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int senary_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct senary_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	codec_info(codec, "%s: BIOS auto-probing.\n", codec-&gt;core.chip_name);</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+</div><div class='add'>+	senary_auto_parse_eapd(codec);</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.vmaster_mute.hook)</div><div class='add'>+		spec-&gt;gen.vmaster_mute.hook = senary_auto_vmaster_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL,</div><div class='add'>+				       spec-&gt;parse_flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = senary_auto_parse_beep(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Some laptops with Senary chips show stalls in S3 resume,</div><div class='add'>+	 * which falls into the single-cmd mode.</div><div class='add'>+	 * Better to make reset, then.</div><div class='add'>+	 */</div><div class='add'>+	if (!codec-&gt;bus-&gt;core.sync_write) {</div><div class='add'>+		codec_info(codec,</div><div class='add'>+			   "Enable sync_write for stable communication\n");</div><div class='add'>+		codec-&gt;bus-&gt;core.sync_write = 1;</div><div class='add'>+		codec-&gt;bus-&gt;allow_bus_reset = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	senary_remove(codec);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops senary_codec_ops = {</div><div class='add'>+	.probe = senary_probe,</div><div class='add'>+	.remove = senary_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = senary_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = senary_suspend,</div><div class='add'>+	.check_power_status = snd_hda_gen_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_device_id snd_hda_id_senary[] = {</div><div class='add'>+	HDA_CODEC_ID(0x1fa86186, "SN6186"),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_senary);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Senarytech HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver senary_driver = {</div><div class='add'>+	.id = snd_hda_id_senary,</div><div class='add'>+	.ops = &amp;senary_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(senary_driver);</div><div class='head'>diff --git a/sound/pci/hda/patch_si3054.c b/sound/hda/codecs/si3054.c<br/>index f419ee8d75f0..87cf9da9f3bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_si3054.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_si3054.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/si3054.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/si3054.c</a></div><div class='hunk'>@@ -1,32 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Universal Interface for Intel High Definition Audio Codec</div><div class='ctx'>  *</div><div class='del'>- * HD audio interface patch for Silicon Labs 3054/5 modem codec</div><div class='add'>+ * HD audio codec driver for Silicon Labs 3054/5 modem codec</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2005 Sasha Khapyorsky &lt;sashak@alsa-project.org&gt;</div><div class='ctx'>  *                    Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='ctx'> #include "hda_local.h"</div><div class='ctx'> </div><div class='ctx'> /* si3054 verbs */</div><div class='hunk'>@@ -82,7 +69,6 @@</div><div class='ctx'> </div><div class='ctx'> struct si3054_spec {</div><div class='ctx'> 	unsigned international;</div><div class='del'>-	struct hda_pcm pcm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +116,7 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> 		</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new si3054_modem_mixer[] = {</div><div class='add'>+static const struct snd_kcontrol_new si3054_modem_mixer[] = {</div><div class='ctx'> 	SI3054_KCONTROL("Off-hook Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_OH),</div><div class='ctx'> 	SI3054_KCONTROL("Caller ID Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_CID),</div><div class='ctx'> 	{}</div><div class='hunk'>@@ -169,8 +155,8 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='ctx'> 			   struct hda_codec *codec,</div><div class='ctx'> 			    struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int rates[] = { 8000, 9600, 16000 };</div><div class='del'>-	static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+	static const unsigned int rates[] = { 8000, 9600, 16000 };</div><div class='add'>+	static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 		.count = ARRAY_SIZE(rates),</div><div class='ctx'> 		.list = rates,</div><div class='ctx'> 		.mask = 0,</div><div class='hunk'>@@ -181,7 +167,7 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct hda_pcm_stream si3054_pcm = {</div><div class='add'>+static const struct hda_pcm_stream si3054_pcm = {</div><div class='ctx'> 	.substreams = 1,</div><div class='ctx'> 	.channels_min = 1,</div><div class='ctx'> 	.channels_max = 1,</div><div class='hunk'>@@ -198,14 +184,15 @@ static struct hda_pcm_stream si3054_pcm = {</div><div class='ctx'> </div><div class='ctx'> static int si3054_build_pcms(struct hda_codec *codec)</div><div class='ctx'> {</div><div class='del'>-	struct si3054_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = &amp;spec-&gt;pcm;</div><div class='del'>-	si3054_pcm.nid = codec-&gt;mfg;</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-	info-&gt;name = "Si3054 Modem";</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+</div><div class='add'>+	info = snd_hda_codec_pcm_new(codec, "Si3054 Modem");</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = si3054_pcm;</div><div class='ctx'> 	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE]  = si3054_pcm;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = codec-&gt;core.mfg;</div><div class='add'>+	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = codec-&gt;core.mfg;</div><div class='ctx'> 	info-&gt;pcm_type = HDA_PCM_TYPE_MODEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -221,8 +208,12 @@ static int si3054_init(struct hda_codec *codec)</div><div class='ctx'> 	unsigned wait_count;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='add'>+	if (snd_hdac_regmap_add_vendor_verb(&amp;codec-&gt;core,</div><div class='add'>+					    SI3054_VERB_WRITE_NODE))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	snd_hda_codec_write(codec, AC_NODE_ROOT, 0, AC_VERB_SET_CODEC_RESET, 0);</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;mfg, 0, AC_VERB_SET_STREAM_FORMAT, 0);</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.mfg, 0, AC_VERB_SET_STREAM_FORMAT, 0);</div><div class='ctx'> 	SET_REG(codec, SI3054_LINE_RATE, 9600);</div><div class='ctx'> 	SET_REG(codec, SI3054_LINE_LEVEL, SI3054_DTAG_MASK|SI3054_ATAG_MASK);</div><div class='ctx'> 	SET_REG(codec, SI3054_EXTENDED_MID, 0);</div><div class='hunk'>@@ -234,7 +225,7 @@ static int si3054_init(struct hda_codec *codec)</div><div class='ctx'> 	} while ((val &amp; SI3054_MEI_READY) != SI3054_MEI_READY &amp;&amp; wait_count--);</div><div class='ctx'> </div><div class='ctx'> 	if((val&amp;SI3054_MEI_READY) != SI3054_MEI_READY) {</div><div class='del'>-		snd_printk(KERN_ERR "si3054: cannot initialize. EXT MID = %04x\n", val);</div><div class='add'>+		codec_err(codec, "si3054: cannot initialize. EXT MID = %04x\n", val);</div><div class='ctx'> 		/* let's pray that this is no fatal error */</div><div class='ctx'> 		/* return -EACCES; */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -245,7 +236,8 @@ static int si3054_init(struct hda_codec *codec)</div><div class='ctx'> 	SET_REG(codec, SI3054_LINE_CFG1,0x200);</div><div class='ctx'> </div><div class='ctx'> 	if((GET_REG(codec,SI3054_LINE_STATUS) &amp; (1&lt;&lt;6)) == 0) {</div><div class='del'>-		snd_printd("Link Frame Detect(FDT) is not ready (line status: %04x)\n",</div><div class='add'>+		codec_dbg(codec,</div><div class='add'>+			  "Link Frame Detect(FDT) is not ready (line status: %04x)\n",</div><div class='ctx'> 				GET_REG(codec,SI3054_LINE_STATUS));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -254,82 +246,58 @@ static int si3054_init(struct hda_codec *codec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void si3054_free(struct hda_codec *codec)</div><div class='add'>+static void si3054_remove(struct hda_codec *codec)</div><div class='ctx'> {</div><div class='ctx'> 	kfree(codec-&gt;spec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct hda_codec_ops si3054_patch_ops = {</div><div class='del'>-	.build_controls = si3054_build_controls,</div><div class='del'>-	.build_pcms = si3054_build_pcms,</div><div class='del'>-	.init = si3054_init,</div><div class='del'>-	.free = si3054_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_si3054(struct hda_codec *codec)</div><div class='add'>+static int si3054_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct si3054_spec *spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='add'>+	codec-&gt;spec = kzalloc(sizeof(struct si3054_spec), GFP_KERNEL);</div><div class='add'>+	if (!codec-&gt;spec)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	codec-&gt;patch_ops = si3054_patch_ops;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct hda_codec_ops si3054_codec_ops = {</div><div class='add'>+	.probe = si3054_probe,</div><div class='add'>+	.remove = si3054_remove,</div><div class='add'>+	.build_controls = si3054_build_controls,</div><div class='add'>+	.build_pcms = si3054_build_pcms,</div><div class='add'>+	.init = si3054_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * patch entries</div><div class='add'>+ * driver entries</div><div class='ctx'>  */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_si3054[] = {</div><div class='del'>- 	{ .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x11c13055, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x11c13155, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x10573055, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x10573057, .name = "Si3054", .patch = patch_si3054 },</div><div class='del'>- 	{ .id = 0x10573155, .name = "Si3054", .patch = patch_si3054 },</div><div class='add'>+static const struct hda_device_id snd_hda_id_si3054[] = {</div><div class='add'>+	HDA_CODEC_ID(0x163c3055, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x163c3155, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x11c13026, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x11c13055, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x11c13155, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x10573055, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x10573057, "Si3054"),</div><div class='add'>+	HDA_CODEC_ID(0x10573155, "Si3054"),</div><div class='ctx'> 	/* VIA HDA on Clevo m540 */</div><div class='del'>-	{ .id = 0x11063288, .name = "Si3054", .patch = patch_si3054 },</div><div class='add'>+	HDA_CODEC_ID(0x11063288, "Si3054"),</div><div class='ctx'> 	/* Asus A8J Modem (SM56) */</div><div class='del'>-	{ .id = 0x15433155, .name = "Si3054", .patch = patch_si3054 },</div><div class='add'>+	HDA_CODEC_ID(0x15433155, "Si3054"),</div><div class='ctx'> 	/* LG LW20 modem */</div><div class='del'>-	{ .id = 0x18540018, .name = "Si3054", .patch = patch_si3054 },</div><div class='add'>+	HDA_CODEC_ID(0x18540018, "Si3054"),</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:163c3055");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:163c3155");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:11c13026");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:11c13055");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:11c13155");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10573055");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10573057");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10573155");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:11063288");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:15433155");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:18540018");</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_si3054);</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Si3054 HD-audio modem codec");</div><div class='ctx'> </div><div class='del'>-static struct hda_codec_preset_list si3054_list = {</div><div class='del'>-	.preset = snd_hda_preset_si3054,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='add'>+static struct hda_codec_driver si3054_driver = {</div><div class='add'>+	.id = snd_hda_id_si3054,</div><div class='add'>+	.ops = &amp;si3054_codec_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init patch_si3054_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;si3054_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_si3054_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;si3054_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_si3054_init)</div><div class='del'>-module_exit(patch_si3054_exit)</div><div class='add'>+module_hda_codec_driver(si3054_driver);</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/Kconfig b/sound/hda/codecs/side-codecs/Kconfig<br/>new file mode 100644<br/>index 000000000000..f674e9a9c7d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+config SND_HDA_CIRRUS_SCODEC</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_HDA_CIRRUS_SCODEC_KUNIT_TEST</div><div class='add'>+	tristate "KUnit test for Cirrus side-codec library" if !KUNIT_ALL_TESTS</div><div class='add'>+	depends on SND_HDA_CIRRUS_SCODEC &amp;&amp; GPIOLIB &amp;&amp; KUNIT</div><div class='add'>+	default KUNIT_ALL_TESTS</div><div class='add'>+	help</div><div class='add'>+	  This builds KUnit tests for the cirrus side-codec library.</div><div class='add'>+	  For more information on KUnit and unit tests in general,</div><div class='add'>+	  please refer to the KUnit documentation in</div><div class='add'>+	  Documentation/dev-tools/kunit/.</div><div class='add'>+	  If in doubt, say "N".</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L41</div><div class='add'>+	tristate</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select REGMAP_IRQ</div><div class='add'>+	select FW_CS_DSP</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_COMPONENT</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L41_I2C</div><div class='add'>+	tristate "Build CS35L41 HD-audio side codec support for I2C Bus"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on EFI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select SND_SOC_CS35L41_LIB</div><div class='add'>+	select SND_HDA_SCODEC_CS35L41</div><div class='add'>+	select SND_SOC_CS_AMP_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include CS35L41 I2C HD-audio side codec support</div><div class='add'>+	  in snd-hda-intel driver, such as ALC287.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the side codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_SCODEC_CS35L41_I2C=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L41_SPI</div><div class='add'>+	tristate "Build CS35L41 HD-audio codec support for SPI Bus"</div><div class='add'>+	depends on SPI_MASTER</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on EFI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select SND_SOC_CS35L41_LIB</div><div class='add'>+	select SND_HDA_SCODEC_CS35L41</div><div class='add'>+	select SND_SOC_CS_AMP_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include CS35L41 SPI HD-audio side codec support</div><div class='add'>+	  in snd-hda-intel driver, such as ALC287.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the side codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_SCODEC_CS35L41_SPI=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L56</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L56_I2C</div><div class='add'>+	tristate "Build CS35L56 HD-audio side codec support for I2C Bus"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select FW_CS_DSP</div><div class='add'>+	imply SERIAL_MULTI_INSTANTIATE</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_SOC_CS35L56_SHARED</div><div class='add'>+	select SND_HDA_SCODEC_CS35L56</div><div class='add'>+	select SND_HDA_CIRRUS_SCODEC</div><div class='add'>+	select SND_SOC_CS_AMP_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include CS35L56 amplifier support with</div><div class='add'>+	  I2C control.</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L56_SPI</div><div class='add'>+	tristate "Build CS35L56 HD-audio side codec support for SPI Bus"</div><div class='add'>+	depends on SPI_MASTER</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select FW_CS_DSP</div><div class='add'>+	imply SERIAL_MULTI_INSTANTIATE</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+	select SND_SOC_CS35L56_SHARED</div><div class='add'>+	select SND_HDA_SCODEC_CS35L56</div><div class='add'>+	select SND_HDA_CIRRUS_SCODEC</div><div class='add'>+	select SND_SOC_CS_AMP_LIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include CS35L56 amplifier support with</div><div class='add'>+	  SPI control.</div><div class='add'>+</div><div class='add'>+menu "CS35L56 driver options"</div><div class='add'>+	depends on SND_HDA_SCODEC_CS35L56</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_CS35L56_CAL_DEBUGFS</div><div class='add'>+	bool "CS35L56 create debugfs for factory calibration"</div><div class='add'>+	default N</div><div class='add'>+	depends on DEBUG_FS</div><div class='add'>+	select SND_SOC_CS35L56_CAL_DEBUGFS_COMMON</div><div class='add'>+	help</div><div class='add'>+	  Create debugfs entries used during factory-line manufacture</div><div class='add'>+	  for factory calibration.</div><div class='add'>+</div><div class='add'>+	  If unsure select "N".</div><div class='add'>+endmenu</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_TAS2781</div><div class='add'>+	tristate</div><div class='add'>+	select SND_HDA_GENERIC</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_TAS2781_I2C</div><div class='add'>+	tristate "Build TAS2781 HD-audio side codec support for I2C Bus"</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on EFI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select SND_HDA_SCODEC_TAS2781</div><div class='add'>+	select SND_SOC_TAS2781_COMLIB_I2C</div><div class='add'>+	select SND_SOC_TAS2781_FMWLIB</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include TAS2781 I2C HD-audio side codec support</div><div class='add'>+	  in snd-hda-intel driver, such as ALC287.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the side codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_SCODEC_TAS2781_I2C=m</div><div class='add'>+</div><div class='add'>+config SND_HDA_SCODEC_TAS2781_SPI</div><div class='add'>+	tristate "Build TAS2781 HD-audio side codec support for SPI Bus"</div><div class='add'>+	depends on SPI_MASTER</div><div class='add'>+	depends on ACPI</div><div class='add'>+	depends on EFI</div><div class='add'>+	depends on SND_SOC</div><div class='add'>+	select SND_HDA_SCODEC_TAS2781</div><div class='add'>+	select SND_SOC_TAS2781_COMLIB</div><div class='add'>+	select SND_SOC_TAS2781_FMWLIB</div><div class='add'>+	select CRC8</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here to include TAS2781 SPI HD-audio side codec support</div><div class='add'>+	  in snd-hda-intel driver, such as ALC287.</div><div class='add'>+</div><div class='add'>+comment "Set to Y if you want auto-loading the side codec driver"</div><div class='add'>+	depends on SND_HDA=y &amp;&amp; SND_HDA_SCODEC_TAS2781_SPI=m</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/Makefile b/sound/hda/codecs/side-codecs/Makefile<br/>new file mode 100644<br/>index 000000000000..245e84f6a121<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/Makefile</a></div><div class='hunk'>@@ -0,0 +1,28 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+subdir-ccflags-y += -I$(src)/../../common</div><div class='add'>+</div><div class='add'>+snd-hda-cirrus-scodec-y :=	cirrus_scodec.o</div><div class='add'>+snd-hda-cirrus-scodec-test-y :=	cirrus_scodec_test.o</div><div class='add'>+snd-hda-scodec-cs35l41-y :=	cs35l41_hda.o cs35l41_hda_property.o</div><div class='add'>+snd-hda-scodec-cs35l41-i2c-y :=	cs35l41_hda_i2c.o</div><div class='add'>+snd-hda-scodec-cs35l41-spi-y :=	cs35l41_hda_spi.o</div><div class='add'>+snd-hda-scodec-cs35l56-y :=	cs35l56_hda.o</div><div class='add'>+snd-hda-scodec-cs35l56-i2c-y :=	cs35l56_hda_i2c.o</div><div class='add'>+snd-hda-scodec-cs35l56-spi-y :=	cs35l56_hda_spi.o</div><div class='add'>+snd-hda-scodec-component-y :=	hda_component.o</div><div class='add'>+snd-hda-scodec-tas2781-y :=	tas2781_hda.o</div><div class='add'>+snd-hda-scodec-tas2781-i2c-y :=	tas2781_hda_i2c.o</div><div class='add'>+snd-hda-scodec-tas2781-spi-y :=	tas2781_hda_spi.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_CIRRUS_SCODEC) += snd-hda-cirrus-scodec.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_CIRRUS_SCODEC_KUNIT_TEST) += snd-hda-cirrus-scodec-test.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L41) += snd-hda-scodec-cs35l41.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L41_I2C) += snd-hda-scodec-cs35l41-i2c.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L41_SPI) += snd-hda-scodec-cs35l41-spi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L56) += snd-hda-scodec-cs35l56.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_I2C) += snd-hda-scodec-cs35l56-i2c.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_SPI) += snd-hda-scodec-cs35l56-spi.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_COMPONENT) += snd-hda-scodec-component.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_TAS2781) += snd-hda-scodec-tas2781.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cirrus_scodec.c b/sound/hda/codecs/side-codecs/cirrus_scodec.c<br/>new file mode 100644<br/>index 000000000000..3c670207ba30<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cirrus_scodec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cirrus_scodec.c</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// Common code for Cirrus side-codecs.</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2021, 2023 Cirrus Logic, Inc. and</div><div class='add'>+//               Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dev_printk.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cirrus_scodec.h"</div><div class='add'>+</div><div class='add'>+int cirrus_scodec_get_speaker_id(struct device *dev, int amp_index,</div><div class='add'>+				 int num_amps, int fixed_gpio_id)</div><div class='add'>+{</div><div class='add'>+	struct gpio_desc *speaker_id_desc;</div><div class='add'>+	int speaker_id = -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (fixed_gpio_id &gt;= 0) {</div><div class='add'>+		dev_dbg(dev, "Found Fixed Speaker ID GPIO (index = %d)\n", fixed_gpio_id);</div><div class='add'>+		speaker_id_desc = gpiod_get_index(dev, NULL, fixed_gpio_id, GPIOD_IN);</div><div class='add'>+		if (IS_ERR(speaker_id_desc)) {</div><div class='add'>+			speaker_id = PTR_ERR(speaker_id_desc);</div><div class='add'>+			return speaker_id;</div><div class='add'>+		}</div><div class='add'>+		speaker_id = gpiod_get_value_cansleep(speaker_id_desc);</div><div class='add'>+		gpiod_put(speaker_id_desc);</div><div class='add'>+	} else {</div><div class='add'>+		int base_index;</div><div class='add'>+		int gpios_per_amp;</div><div class='add'>+		int count;</div><div class='add'>+		int tmp;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		count = gpiod_count(dev, "spk-id");</div><div class='add'>+		if (count &gt; 0) {</div><div class='add'>+			speaker_id = 0;</div><div class='add'>+			gpios_per_amp = count / num_amps;</div><div class='add'>+			base_index = gpios_per_amp * amp_index;</div><div class='add'>+</div><div class='add'>+			if (count % num_amps)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			dev_dbg(dev, "Found %d Speaker ID GPIOs per Amp\n", gpios_per_amp);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; gpios_per_amp; i++) {</div><div class='add'>+				speaker_id_desc = gpiod_get_index(dev, "spk-id", i + base_index,</div><div class='add'>+								  GPIOD_IN);</div><div class='add'>+				if (IS_ERR(speaker_id_desc)) {</div><div class='add'>+					speaker_id = PTR_ERR(speaker_id_desc);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				tmp = gpiod_get_value_cansleep(speaker_id_desc);</div><div class='add'>+				gpiod_put(speaker_id_desc);</div><div class='add'>+				if (tmp &lt; 0) {</div><div class='add'>+					speaker_id = tmp;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				speaker_id |= tmp &lt;&lt; i;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Speaker ID = %d\n", speaker_id);</div><div class='add'>+</div><div class='add'>+	return speaker_id;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cirrus_scodec_get_speaker_id, "SND_HDA_CIRRUS_SCODEC");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA Cirrus side-codec library");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cirrus_scodec.h b/sound/hda/codecs/side-codecs/cirrus_scodec.h<br/>new file mode 100644<br/>index 000000000000..ba2041d8ef24<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cirrus_scodec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cirrus_scodec.h</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CIRRUS_SCODEC_H</div><div class='add'>+#define CIRRUS_SCODEC_H</div><div class='add'>+</div><div class='add'>+int cirrus_scodec_get_speaker_id(struct device *dev, int amp_index,</div><div class='add'>+				 int num_amps, int fixed_gpio_id);</div><div class='add'>+</div><div class='add'>+#endif /* CIRRUS_SCODEC_H */</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cirrus_scodec_test.c b/sound/hda/codecs/side-codecs/cirrus_scodec_test.c<br/>new file mode 100644<br/>index 000000000000..3cca750857b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cirrus_scodec_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cirrus_scodec_test.c</a></div><div class='hunk'>@@ -0,0 +1,332 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// KUnit test for the Cirrus side-codec library.</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+//                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+</div><div class='add'>+#include &lt;kunit/platform_device.h&gt;</div><div class='add'>+#include &lt;kunit/resource.h&gt;</div><div class='add'>+#include &lt;kunit/test.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/device/faux.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cirrus_scodec.h"</div><div class='add'>+</div><div class='add'>+KUNIT_DEFINE_ACTION_WRAPPER(faux_device_destroy_wrapper, faux_device_destroy,</div><div class='add'>+			    struct faux_device *)</div><div class='add'>+KUNIT_DEFINE_ACTION_WRAPPER(device_remove_software_node_wrapper,</div><div class='add'>+			    device_remove_software_node,</div><div class='add'>+			    struct device *)</div><div class='add'>+</div><div class='add'>+struct cirrus_scodec_test_gpio {</div><div class='add'>+	unsigned int pin_state;</div><div class='add'>+	struct gpio_chip chip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cirrus_scodec_test_priv {</div><div class='add'>+	struct faux_device *amp_dev;</div><div class='add'>+	struct platform_device *gpio_pdev;</div><div class='add'>+	struct cirrus_scodec_test_gpio *gpio_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_get_direction(struct gpio_chip *chip,</div><div class='add'>+						 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return GPIO_LINE_DIRECTION_IN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_direction_in(struct gpio_chip *chip,</div><div class='add'>+						unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_gpio *gpio_priv = gpiochip_get_data(chip);</div><div class='add'>+</div><div class='add'>+	return !!(gpio_priv-&gt;pin_state &amp; BIT(offset));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_direction_out(struct gpio_chip *chip,</div><div class='add'>+						 unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_set(struct gpio_chip *chip,</div><div class='add'>+				       unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_set_config(struct gpio_chip *gc,</div><div class='add'>+					      unsigned int offset,</div><div class='add'>+					      unsigned long config)</div><div class='add'>+{</div><div class='add'>+	switch (pinconf_to_config_param(config)) {</div><div class='add'>+	case PIN_CONFIG_LEVEL:</div><div class='add'>+	case PIN_CONFIG_OUTPUT_ENABLE:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct gpio_chip cirrus_scodec_test_gpio_chip = {</div><div class='add'>+	.label			= "cirrus_scodec_test_gpio",</div><div class='add'>+	.owner			= THIS_MODULE,</div><div class='add'>+	.request		= gpiochip_generic_request,</div><div class='add'>+	.free			= gpiochip_generic_free,</div><div class='add'>+	.get_direction		= cirrus_scodec_test_gpio_get_direction,</div><div class='add'>+	.direction_input	= cirrus_scodec_test_gpio_direction_in,</div><div class='add'>+	.get			= cirrus_scodec_test_gpio_get,</div><div class='add'>+	.direction_output	= cirrus_scodec_test_gpio_direction_out,</div><div class='add'>+	.set			= cirrus_scodec_test_gpio_set,</div><div class='add'>+	.set_config		= cirrus_scodec_test_gpio_set_config,</div><div class='add'>+	.base			= -1,</div><div class='add'>+	.ngpio			= 32,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_gpio_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_gpio *gpio_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	gpio_priv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*gpio_priv), GFP_KERNEL);</div><div class='add'>+	if (!gpio_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* GPIO core modifies our struct gpio_chip so use a copy */</div><div class='add'>+	gpio_priv-&gt;chip = cirrus_scodec_test_gpio_chip;</div><div class='add'>+	ret = devm_gpiochip_add_data(&amp;pdev-&gt;dev, &amp;gpio_priv-&gt;chip, gpio_priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, ret, "Failed to add gpiochip\n");</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, gpio_priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver cirrus_scodec_test_gpio_driver = {</div><div class='add'>+	.driver.name	= "cirrus_scodec_test_gpio_drv",</div><div class='add'>+	.driver.owner	= THIS_MODULE,</div><div class='add'>+	.probe		= cirrus_scodec_test_gpio_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* software_node referencing the gpio driver */</div><div class='add'>+static const struct software_node cirrus_scodec_test_gpio_swnode = {</div><div class='add'>+	.name = "cirrus_scodec_test_gpio",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cirrus_scodec_test_create_gpio(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_priv *priv = test-&gt;priv;</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, 0,</div><div class='add'>+			kunit_platform_driver_register(test, &amp;cirrus_scodec_test_gpio_driver));</div><div class='add'>+</div><div class='add'>+	priv-&gt;gpio_pdev = kunit_platform_device_alloc(test,</div><div class='add'>+						      cirrus_scodec_test_gpio_driver.driver.name,</div><div class='add'>+						      PLATFORM_DEVID_NONE);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, priv-&gt;gpio_pdev);</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, 0, device_add_software_node(&amp;priv-&gt;gpio_pdev-&gt;dev,</div><div class='add'>+							  &amp;cirrus_scodec_test_gpio_swnode));</div><div class='add'>+	KUNIT_ASSERT_EQ(test, 0, kunit_add_action_or_reset(test,</div><div class='add'>+							   device_remove_software_node_wrapper,</div><div class='add'>+							   &amp;priv-&gt;gpio_pdev-&gt;dev));</div><div class='add'>+</div><div class='add'>+	KUNIT_ASSERT_EQ(test, 0, kunit_platform_device_add(test, priv-&gt;gpio_pdev));</div><div class='add'>+</div><div class='add'>+	priv-&gt;gpio_priv = dev_get_drvdata(&amp;priv-&gt;gpio_pdev-&gt;dev);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, priv-&gt;gpio_priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cirrus_scodec_test_set_gpio_ref_arg(struct software_node_ref_args *arg,</div><div class='add'>+						int gpio_num)</div><div class='add'>+{</div><div class='add'>+	struct software_node_ref_args template =</div><div class='add'>+		SOFTWARE_NODE_REFERENCE(&amp;cirrus_scodec_test_gpio_swnode, gpio_num, 0);</div><div class='add'>+</div><div class='add'>+	*arg = template;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_set_spkid_swnode(struct kunit *test,</div><div class='add'>+					       struct device *dev,</div><div class='add'>+					       struct software_node_ref_args *args,</div><div class='add'>+					       int num_args)</div><div class='add'>+{</div><div class='add'>+	const struct property_entry props_template[] = {</div><div class='add'>+		PROPERTY_ENTRY_REF_ARRAY_LEN("spk-id-gpios", args, num_args),</div><div class='add'>+		{ }</div><div class='add'>+	};</div><div class='add'>+	struct property_entry *props;</div><div class='add'>+	struct software_node *node;</div><div class='add'>+</div><div class='add'>+	node = kunit_kzalloc(test, sizeof(*node), GFP_KERNEL);</div><div class='add'>+	if (!node)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	props = kunit_kzalloc(test, sizeof(props_template), GFP_KERNEL);</div><div class='add'>+	if (!props)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memcpy(props, props_template, sizeof(props_template));</div><div class='add'>+	node-&gt;properties = props;</div><div class='add'>+</div><div class='add'>+	return device_add_software_node(dev, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cirrus_scodec_test_spkid_param {</div><div class='add'>+	int num_amps;</div><div class='add'>+	int gpios_per_amp;</div><div class='add'>+	int num_amps_sharing;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cirrus_scodec_test_spkid_parse(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_priv *priv = test-&gt;priv;</div><div class='add'>+	const struct cirrus_scodec_test_spkid_param *param = test-&gt;param_value;</div><div class='add'>+	int num_spk_id_refs = param-&gt;num_amps * param-&gt;gpios_per_amp;</div><div class='add'>+	struct software_node_ref_args *refs;</div><div class='add'>+	struct device *dev = &amp;priv-&gt;amp_dev-&gt;dev;</div><div class='add'>+	unsigned int v;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	refs = kunit_kcalloc(test, num_spk_id_refs, sizeof(*refs), GFP_KERNEL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, refs);</div><div class='add'>+</div><div class='add'>+	for (i = 0, v = 0; i &lt; num_spk_id_refs; ) {</div><div class='add'>+		cirrus_scodec_test_set_gpio_ref_arg(&amp;refs[i++], v++);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If amps are sharing GPIOs repeat the last set of</div><div class='add'>+		 * GPIOs until we've done that number of amps.</div><div class='add'>+		 * We have done all GPIOs for an amp when i is a multiple</div><div class='add'>+		 * of gpios_per_amp.</div><div class='add'>+		 * We have done all amps sharing the same GPIOs when i is</div><div class='add'>+		 * a multiple of (gpios_per_amp * num_amps_sharing).</div><div class='add'>+		 */</div><div class='add'>+		if (!(i % param-&gt;gpios_per_amp) &amp;&amp;</div><div class='add'>+		    (i % (param-&gt;gpios_per_amp * param-&gt;num_amps_sharing)))</div><div class='add'>+			v -= param-&gt;gpios_per_amp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cirrus_scodec_test_set_spkid_swnode(test, dev, refs, num_spk_id_refs);</div><div class='add'>+	KUNIT_EXPECT_EQ_MSG(test, ret, 0, "Failed to add swnode\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; param-&gt;num_amps; ++i) {</div><div class='add'>+		for (v = 0; v &lt; (1 &lt;&lt; param-&gt;gpios_per_amp); ++v) {</div><div class='add'>+			/* Set only the GPIO bits used by this amp */</div><div class='add'>+			priv-&gt;gpio_priv-&gt;pin_state =</div><div class='add'>+				v &lt;&lt; (param-&gt;gpios_per_amp * (i / param-&gt;num_amps_sharing));</div><div class='add'>+</div><div class='add'>+			ret = cirrus_scodec_get_speaker_id(dev, i, param-&gt;num_amps, -1);</div><div class='add'>+			KUNIT_EXPECT_EQ_MSG(test, ret, v,</div><div class='add'>+					    "get_speaker_id failed amp:%d pin_state:%#x\n",</div><div class='add'>+					    i, priv-&gt;gpio_priv-&gt;pin_state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cirrus_scodec_test_no_spkid(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_priv *priv = test-&gt;priv;</div><div class='add'>+	struct device *dev = &amp;priv-&gt;amp_dev-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cirrus_scodec_get_speaker_id(dev, 0, 4, -1);</div><div class='add'>+	KUNIT_EXPECT_EQ(test, ret, -ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cirrus_scodec_test_case_init(struct kunit *test)</div><div class='add'>+{</div><div class='add'>+	struct cirrus_scodec_test_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	test-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	/* Create dummy GPIO */</div><div class='add'>+	cirrus_scodec_test_create_gpio(test);</div><div class='add'>+</div><div class='add'>+	/* Create dummy amp driver dev */</div><div class='add'>+	priv-&gt;amp_dev = faux_device_create("cirrus_scodec_test_amp_drv", NULL, NULL);</div><div class='add'>+	KUNIT_ASSERT_NOT_NULL(test, priv-&gt;amp_dev);</div><div class='add'>+	KUNIT_ASSERT_EQ(test, 0, kunit_add_action_or_reset(test,</div><div class='add'>+							   faux_device_destroy_wrapper,</div><div class='add'>+							   priv-&gt;amp_dev));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cirrus_scodec_test_spkid_param cirrus_scodec_test_spkid_param_cases[] = {</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 1, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 2, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 3, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 4, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 1, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 2, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 3, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 4, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 1, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 2, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 3, .num_amps_sharing = 1 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 4, .num_amps_sharing = 1 },</div><div class='add'>+</div><div class='add'>+	/* Same GPIO shared by all amps */</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 1, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 2, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 3, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 2, .gpios_per_amp = 4, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 1, .num_amps_sharing = 3 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 2, .num_amps_sharing = 3 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 3, .num_amps_sharing = 3 },</div><div class='add'>+	{ .num_amps = 3, .gpios_per_amp = 4, .num_amps_sharing = 3 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 1, .num_amps_sharing = 4 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 2, .num_amps_sharing = 4 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 3, .num_amps_sharing = 4 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 4, .num_amps_sharing = 4 },</div><div class='add'>+</div><div class='add'>+	/* Two sets of shared GPIOs */</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 1, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 2, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 3, .num_amps_sharing = 2 },</div><div class='add'>+	{ .num_amps = 4, .gpios_per_amp = 4, .num_amps_sharing = 2 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cirrus_scodec_test_spkid_param_desc(const struct cirrus_scodec_test_spkid_param *param,</div><div class='add'>+						char *desc)</div><div class='add'>+{</div><div class='add'>+	snprintf(desc, KUNIT_PARAM_DESC_SIZE, "amps:%d gpios_per_amp:%d num_amps_sharing:%d",</div><div class='add'>+		 param-&gt;num_amps, param-&gt;gpios_per_amp, param-&gt;num_amps_sharing);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+KUNIT_ARRAY_PARAM(cirrus_scodec_test_spkid, cirrus_scodec_test_spkid_param_cases,</div><div class='add'>+		  cirrus_scodec_test_spkid_param_desc);</div><div class='add'>+</div><div class='add'>+static struct kunit_case cirrus_scodec_test_cases[] = {</div><div class='add'>+	KUNIT_CASE_PARAM(cirrus_scodec_test_spkid_parse, cirrus_scodec_test_spkid_gen_params),</div><div class='add'>+	KUNIT_CASE(cirrus_scodec_test_no_spkid),</div><div class='add'>+	{ } /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct kunit_suite cirrus_scodec_test_suite = {</div><div class='add'>+	.name = "snd-hda-scodec-cs35l56-test",</div><div class='add'>+	.init = cirrus_scodec_test_case_init,</div><div class='add'>+	.test_cases = cirrus_scodec_test_cases,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+kunit_test_suite(cirrus_scodec_test_suite);</div><div class='add'>+</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CIRRUS_SCODEC");</div><div class='add'>+MODULE_DESCRIPTION("KUnit test for the Cirrus side-codec library");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda.c b/sound/hda/codecs/side-codecs/cs35l41_hda.c<br/>new file mode 100644<br/>index 000000000000..c0f2a3ff77a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda.c</a></div><div class='hunk'>@@ -0,0 +1,2098 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// CS35l41 ALSA HDA audio driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2021 Cirrus Logic, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+#include "hda_component.h"</div><div class='add'>+#include "cs35l41_hda.h"</div><div class='add'>+#include "cs35l41_hda_property.h"</div><div class='add'>+</div><div class='add'>+#define CS35L41_PART "cs35l41"</div><div class='add'>+</div><div class='add'>+#define HALO_STATE_DSP_CTL_NAME		"HALO_STATE"</div><div class='add'>+#define HALO_STATE_DSP_CTL_TYPE		5</div><div class='add'>+#define HALO_STATE_DSP_CTL_ALG		262308</div><div class='add'>+#define CAL_R_DSP_CTL_NAME		"CAL_R"</div><div class='add'>+#define CAL_STATUS_DSP_CTL_NAME		"CAL_STATUS"</div><div class='add'>+#define CAL_CHECKSUM_DSP_CTL_NAME	"CAL_CHECKSUM"</div><div class='add'>+#define CAL_AMBIENT_DSP_CTL_NAME	"CAL_AMBIENT"</div><div class='add'>+#define CAL_DSP_CTL_TYPE		5</div><div class='add'>+#define CAL_DSP_CTL_ALG			205</div><div class='add'>+#define CS35L41_UUID			"50d90cdc-3de4-4f18-b528-c7fe3b71f40d"</div><div class='add'>+#define CS35L41_DSM_GET_MUTE		5</div><div class='add'>+#define CS35L41_NOTIFY_EVENT		0x91</div><div class='add'>+#define CS35L41_TUNING_SIG		0x109A4A35</div><div class='add'>+</div><div class='add'>+enum cs35l41_tuning_param_types {</div><div class='add'>+	TUNING_PARAM_GAIN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs35l41_tuning_param_hdr {</div><div class='add'>+	__le32 tuning_index;</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 size;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cs35l41_tuning_param {</div><div class='add'>+	struct cs35l41_tuning_param_hdr hdr;</div><div class='add'>+	union {</div><div class='add'>+		__le32 gain;</div><div class='add'>+	};</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cs35l41_tuning_params {</div><div class='add'>+	__le32 signature;</div><div class='add'>+	__le32 version;</div><div class='add'>+	__le32 size;</div><div class='add'>+	__le32 num_entries;</div><div class='add'>+	u8 data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Firmware calibration controls */</div><div class='add'>+static const struct cirrus_amp_cal_controls cs35l41_calibration_controls = {</div><div class='add'>+	.alg_id =	CAL_DSP_CTL_ALG,</div><div class='add'>+	.mem_region =	CAL_DSP_CTL_TYPE,</div><div class='add'>+	.ambient =	CAL_AMBIENT_DSP_CTL_NAME,</div><div class='add'>+	.calr =		CAL_R_DSP_CTL_NAME,</div><div class='add'>+	.status =	CAL_STATUS_DSP_CTL_NAME,</div><div class='add'>+	.checksum =	CAL_CHECKSUM_DSP_CTL_NAME,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cs35l41_hda_fw_id {</div><div class='add'>+	CS35L41_HDA_FW_SPK_PROT,</div><div class='add'>+	CS35L41_HDA_FW_SPK_CALI,</div><div class='add'>+	CS35L41_HDA_FW_SPK_DIAG,</div><div class='add'>+	CS35L41_HDA_FW_MISC,</div><div class='add'>+	CS35L41_HDA_NUM_FW</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cs35l41_hda_fw_ids[CS35L41_HDA_NUM_FW] = {</div><div class='add'>+	[CS35L41_HDA_FW_SPK_PROT] = "spk-prot",</div><div class='add'>+	[CS35L41_HDA_FW_SPK_CALI] = "spk-cali",</div><div class='add'>+	[CS35L41_HDA_FW_SPK_DIAG] = "spk-diag",</div><div class='add'>+	[CS35L41_HDA_FW_MISC] =     "misc",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool firmware_autostart = 1;</div><div class='add'>+module_param(firmware_autostart, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(firmware_autostart, "Allow automatic firmware download on boot"</div><div class='add'>+			     "(0=Disable, 1=Enable) (default=1); ");</div><div class='add'>+</div><div class='add'>+static const char channel_name[3] = { 'L', 'R', 'C' };</div><div class='add'>+</div><div class='add'>+static const struct reg_sequence cs35l41_hda_config[] = {</div><div class='add'>+	{ CS35L41_PLL_CLK_CTRL,		0x00000430 }, // 3072000Hz, BCLK Input, PLL_REFCLK_EN = 1</div><div class='add'>+	{ CS35L41_DSP_CLK_CTRL,		0x00000003 }, // DSP CLK EN</div><div class='add'>+	{ CS35L41_GLOBAL_CLK_CTRL,	0x00000003 }, // GLOBAL_FS = 48 kHz</div><div class='add'>+	{ CS35L41_SP_RATE_CTRL,		0x00000021 }, // ASP_BCLK_FREQ = 3.072 MHz</div><div class='add'>+	{ CS35L41_SP_FORMAT,		0x20200200 }, // 32 bits RX/TX slots, I2S, clk consumer</div><div class='add'>+	{ CS35L41_SP_TX_WL,		0x00000018 }, // 24 cycles/slot</div><div class='add'>+	{ CS35L41_SP_RX_WL,		0x00000018 }, // 24 cycles/slot</div><div class='add'>+	{ CS35L41_ASP_TX1_SRC,		0x00000018 }, // ASPTX1 SRC = VMON</div><div class='add'>+	{ CS35L41_ASP_TX2_SRC,		0x00000019 }, // ASPTX2 SRC = IMON</div><div class='add'>+	{ CS35L41_DSP1_RX3_SRC,         0x00000018 }, // DSP1RX3 SRC = VMON</div><div class='add'>+	{ CS35L41_DSP1_RX4_SRC,         0x00000019 }, // DSP1RX4 SRC = IMON</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_sequence cs35l41_hda_config_no_dsp[] = {</div><div class='add'>+	{ CS35L41_SP_HIZ_CTRL,		0x00000002 }, // Hi-Z unused</div><div class='add'>+	{ CS35L41_DAC_PCM1_SRC,		0x00000008 }, // DACPCM1_SRC = ASPRX1</div><div class='add'>+	{ CS35L41_ASP_TX3_SRC,		0x00000000 }, // ASPTX3 SRC = ZERO FILL</div><div class='add'>+	{ CS35L41_ASP_TX4_SRC,		0x00000000 }, // ASPTX4 SRC = ZERO FILL</div><div class='add'>+	{ CS35L41_DSP1_RX5_SRC,         0x00000020 }, // DSP1RX5 SRC = ERRVOL</div><div class='add'>+	{ CS35L41_DSP1_RX6_SRC,         0x00000021 }, // DSP1RX6 SRC = CLASSH_TGT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_sequence cs35l41_hda_config_dsp[] = {</div><div class='add'>+	{ CS35L41_SP_HIZ_CTRL,		0x00000003 }, // Hi-Z unused/disabled</div><div class='add'>+	{ CS35L41_DAC_PCM1_SRC,		0x00000032 }, // DACPCM1_SRC = DSP1TX1</div><div class='add'>+	{ CS35L41_ASP_TX3_SRC,		0x00000028 }, // ASPTX3 SRC = VPMON</div><div class='add'>+	{ CS35L41_ASP_TX4_SRC,		0x00000029 }, // ASPTX4 SRC = VBSTMON</div><div class='add'>+	{ CS35L41_DSP1_RX6_SRC,         0x00000029 }, // DSP1RX6 SRC = VBSTMON</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_sequence cs35l41_hda_unmute[] = {</div><div class='add'>+	{ CS35L41_AMP_DIG_VOL_CTRL,	0x00008000 }, // AMP_HPF_PCM_EN = 1, AMP_VOL_PCM  0.0 dB</div><div class='add'>+	{ CS35L41_AMP_GAIN_CTRL,	0x00000084 }, // AMP_GAIN_PCM 4.5 dB</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_sequence cs35l41_hda_mute[] = {</div><div class='add'>+	{ CS35L41_AMP_GAIN_CTRL,	0x00000000 }, // AMP_GAIN_PCM 0.5 dB</div><div class='add'>+	{ CS35L41_AMP_DIG_VOL_CTRL,	0x0000A678 }, // AMP_HPF_PCM_EN = 1, AMP_VOL_PCM Mute</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cs_dsp_client_ops client_ops = {</div><div class='add'>+	/* cs_dsp requires the client to provide this even if it is empty */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l41_request_tuning_param_file(struct cs35l41_hda *cs35l41, char *tuning_filename,</div><div class='add'>+					     const struct firmware **firmware, char **filename,</div><div class='add'>+					     const char *ssid)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Filename is the same as the tuning file with "cfg" suffix */</div><div class='add'>+	*filename = kasprintf(GFP_KERNEL, "%scfg", tuning_filename);</div><div class='add'>+	if (*filename == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = firmware_request_nowarn(firmware, *filename, cs35l41-&gt;dev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Failed to request '%s'\n", *filename);</div><div class='add'>+		kfree(*filename);</div><div class='add'>+		*filename = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_request_firmware_file(struct cs35l41_hda *cs35l41,</div><div class='add'>+					 const struct firmware **firmware, char **filename,</div><div class='add'>+					 const char *ssid, const char *amp_name,</div><div class='add'>+					 int spkid, const char *filetype)</div><div class='add'>+{</div><div class='add'>+	const char * const dsp_name = cs35l41-&gt;cs_dsp.name;</div><div class='add'>+	char *s, c;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (spkid &gt; -1 &amp;&amp; ssid &amp;&amp; amp_name)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d-%s.%s", CS35L41_PART,</div><div class='add'>+				      dsp_name, cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type],</div><div class='add'>+				      ssid, spkid, amp_name, filetype);</div><div class='add'>+	else if (spkid &gt; -1 &amp;&amp; ssid)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d.%s", CS35L41_PART,</div><div class='add'>+				      dsp_name, cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type],</div><div class='add'>+				      ssid, spkid, filetype);</div><div class='add'>+	else if (ssid &amp;&amp; amp_name)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-%s.%s", CS35L41_PART,</div><div class='add'>+				      dsp_name, cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type],</div><div class='add'>+				      ssid, amp_name, filetype);</div><div class='add'>+	else if (ssid)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s.%s", CS35L41_PART,</div><div class='add'>+				      dsp_name, cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type],</div><div class='add'>+				      ssid, filetype);</div><div class='add'>+	else</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s.%s", CS35L41_PART,</div><div class='add'>+				      dsp_name, cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type],</div><div class='add'>+				      filetype);</div><div class='add'>+</div><div class='add'>+	if (*filename == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that filename is lower-case and any non alpha-numeric</div><div class='add'>+	 * characters except full stop and '/' are replaced with hyphens.</div><div class='add'>+	 */</div><div class='add'>+	s = *filename;</div><div class='add'>+	while (*s) {</div><div class='add'>+		c = *s;</div><div class='add'>+		if (isalnum(c))</div><div class='add'>+			*s = tolower(c);</div><div class='add'>+		else if (c != '.' &amp;&amp; c != '/')</div><div class='add'>+			*s = '-';</div><div class='add'>+		s++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = firmware_request_nowarn(firmware, *filename, cs35l41-&gt;dev);</div><div class='add'>+	if (ret != 0) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Failed to request '%s'\n", *filename);</div><div class='add'>+		kfree(*filename);</div><div class='add'>+		*filename = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_request_firmware_files_spkid(struct cs35l41_hda *cs35l41,</div><div class='add'>+						const struct firmware **wmfw_firmware,</div><div class='add'>+						char **wmfw_filename,</div><div class='add'>+						const struct firmware **coeff_firmware,</div><div class='add'>+						char **coeff_filename)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;&lt;-ampname&gt;.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;amp_name,</div><div class='add'>+					    cs35l41-&gt;speaker_id, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;amp_name,</div><div class='add'>+						    cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub&lt;-ampname&gt;.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+					    cs35l41-&gt;amp_name, -1, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;amp_name,</div><div class='add'>+						    cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+					    NULL, cs35l41-&gt;speaker_id, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+						    cs35l41-&gt;amp_name, cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;.bin */</div><div class='add'>+			ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware,</div><div class='add'>+							    coeff_filename,</div><div class='add'>+							    cs35l41-&gt;acpi_subsystem_id, NULL,</div><div class='add'>+							    cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+					    NULL, -1, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;amp_name,</div><div class='add'>+						    cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			/* try cirrus/part-dspN-fwtype-sub&lt;-spkidN&gt;.bin */</div><div class='add'>+			ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware,</div><div class='add'>+							    coeff_filename,</div><div class='add'>+							    cs35l41-&gt;acpi_subsystem_id, NULL,</div><div class='add'>+							    cs35l41-&gt;speaker_id, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+coeff_err:</div><div class='add'>+	release_firmware(*wmfw_firmware);</div><div class='add'>+	kfree(*wmfw_filename);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fallback_firmware_file(struct cs35l41_hda *cs35l41,</div><div class='add'>+					  const struct firmware **wmfw_firmware,</div><div class='add'>+					  char **wmfw_filename,</div><div class='add'>+					  const struct firmware **coeff_firmware,</div><div class='add'>+					  char **coeff_filename)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Handle fallback */</div><div class='add'>+	dev_warn(cs35l41-&gt;dev, "Falling back to default firmware.\n");</div><div class='add'>+</div><div class='add'>+	/* fallback try cirrus/part-dspN-fwtype.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    NULL, NULL, -1, "wmfw");</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* fallback try cirrus/part-dspN-fwtype.bin */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+					    NULL, NULL, -1, "bin");</div><div class='add'>+	if (ret) {</div><div class='add'>+		release_firmware(*wmfw_firmware);</div><div class='add'>+		kfree(*wmfw_filename);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_warn(cs35l41-&gt;dev, "Unable to find firmware and tuning\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_request_firmware_files(struct cs35l41_hda *cs35l41,</div><div class='add'>+					  const struct firmware **wmfw_firmware,</div><div class='add'>+					  char **wmfw_filename,</div><div class='add'>+					  const struct firmware **coeff_firmware,</div><div class='add'>+					  char **coeff_filename)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;speaker_id &gt; -1) {</div><div class='add'>+		ret = cs35l41_request_firmware_files_spkid(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+							   coeff_firmware, coeff_filename);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub&lt;-ampname&gt;.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+					    cs35l41-&gt;amp_name, -1, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;amp_name,</div><div class='add'>+						    -1, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* try cirrus/part-dspN-fwtype-sub.wmfw */</div><div class='add'>+	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+					    NULL, -1, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		/* try cirrus/part-dspN-fwtype-sub&lt;-ampname&gt;.bin */</div><div class='add'>+		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+						    cs35l41-&gt;acpi_subsystem_id,</div><div class='add'>+						    cs35l41-&gt;amp_name, -1, "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			/* try cirrus/part-dspN-fwtype-sub.bin */</div><div class='add'>+			ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,</div><div class='add'>+							    cs35l41-&gt;acpi_subsystem_id, NULL, -1,</div><div class='add'>+							    "bin");</div><div class='add'>+		if (ret)</div><div class='add'>+			goto coeff_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		/* if all attempts at finding firmware fail, try fallback */</div><div class='add'>+		goto fallback;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+coeff_err:</div><div class='add'>+	release_firmware(*wmfw_firmware);</div><div class='add'>+	kfree(*wmfw_filename);</div><div class='add'>+fallback:</div><div class='add'>+	return cs35l41_fallback_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,</div><div class='add'>+					      coeff_firmware, coeff_filename);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_apply_calibration(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;cal_data_valid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = cs_amp_write_cal_coeffs(&amp;cs35l41-&gt;cs_dsp, &amp;cs35l41_calibration_controls,</div><div class='add'>+				      &amp;cs35l41-&gt;cal_data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "Failed to apply calibration: %d\n", ret);</div><div class='add'>+	else</div><div class='add'>+		dev_info(cs35l41-&gt;dev, "Calibration applied: R0=%d\n", cs35l41-&gt;cal_data.calR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_read_silicon_uid(struct cs35l41_hda *cs35l41, u64 *uid)</div><div class='add'>+{</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_DIE_STS2, &amp;tmp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Cannot obtain CS35L41_DIE_STS2: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*uid = tmp;</div><div class='add'>+	*uid &lt;&lt;= 32;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_DIE_STS1, &amp;tmp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Cannot obtain CS35L41_DIE_STS1: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*uid |= tmp;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "UniqueID = %#llx\n", *uid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_get_calibration(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	u64 silicon_uid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_read_silicon_uid(cs35l41, &amp;silicon_uid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cs_amp_get_efi_calibration_data(cs35l41-&gt;dev, silicon_uid,</div><div class='add'>+					      cs35l41-&gt;index,</div><div class='add'>+					      &amp;cs35l41-&gt;cal_data);</div><div class='add'>+</div><div class='add'>+	/* Only return an error status if probe should be aborted */</div><div class='add'>+	if ((ret == -ENOENT) || (ret == -EOVERFLOW))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;cal_data_valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void cs35l41_set_default_tuning_params(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	cs35l41-&gt;tuning_gain = DEFAULT_AMP_GAIN_PCM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_read_tuning_params(struct cs35l41_hda *cs35l41, const struct firmware *firmware)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_tuning_params *params;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	unsigned int end;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	params = (void *)&amp;firmware-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(params-&gt;size) != firmware-&gt;size) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Wrong Size for Tuning Param file. Expected %d got %zu\n",</div><div class='add'>+			le32_to_cpu(params-&gt;size), firmware-&gt;size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(params-&gt;version) != 1) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Unsupported Tuning Param Version: %d\n",</div><div class='add'>+			le32_to_cpu(params-&gt;version));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(params-&gt;signature) != CS35L41_TUNING_SIG) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev,</div><div class='add'>+			"Mismatched Signature for Tuning Param file. Expected %#x got %#x\n",</div><div class='add'>+			CS35L41_TUNING_SIG, le32_to_cpu(params-&gt;signature));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	end = firmware-&gt;size - sizeof(struct cs35l41_tuning_params);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; le32_to_cpu(params-&gt;num_entries); i++) {</div><div class='add'>+		struct cs35l41_tuning_param *param;</div><div class='add'>+</div><div class='add'>+		if ((offset &gt;= end) || ((offset + sizeof(struct cs35l41_tuning_param_hdr)) &gt;= end))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		param = (void *)&amp;params-&gt;data[offset];</div><div class='add'>+		offset += le32_to_cpu(param-&gt;hdr.size);</div><div class='add'>+</div><div class='add'>+		if (offset &gt; end)</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		switch (le32_to_cpu(param-&gt;hdr.type)) {</div><div class='add'>+		case TUNING_PARAM_GAIN:</div><div class='add'>+			cs35l41-&gt;tuning_gain = le32_to_cpu(param-&gt;gain);</div><div class='add'>+			dev_dbg(cs35l41-&gt;dev, "Applying Gain: %d\n", cs35l41-&gt;tuning_gain);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_load_tuning_params(struct cs35l41_hda *cs35l41, char *tuning_filename)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *tuning_param_file = NULL;</div><div class='add'>+	char *tuning_param_filename = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_request_tuning_param_file(cs35l41, tuning_filename, &amp;tuning_param_file,</div><div class='add'>+						&amp;tuning_param_filename, cs35l41-&gt;acpi_subsystem_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Missing Tuning Param for file: %s: %d\n", tuning_filename,</div><div class='add'>+			ret);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_read_tuning_params(cs35l41, tuning_param_file);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Error reading Tuning Params from file: %s: %d\n",</div><div class='add'>+			tuning_param_filename, ret);</div><div class='add'>+		/* Reset to default Tuning Parameters */</div><div class='add'>+		cs35l41_set_default_tuning_params(cs35l41);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_firmware(tuning_param_file);</div><div class='add'>+	kfree(tuning_param_filename);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *coeff_firmware = NULL;</div><div class='add'>+	const struct firmware *wmfw_firmware = NULL;</div><div class='add'>+	struct cs_dsp *dsp = &amp;cs35l41-&gt;cs_dsp;</div><div class='add'>+	char *coeff_filename = NULL;</div><div class='add'>+	char *wmfw_filename = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;halo_initialized) {</div><div class='add'>+		cs35l41_configure_cs_dsp(cs35l41-&gt;dev, cs35l41-&gt;regmap, dsp);</div><div class='add'>+		dsp-&gt;client_ops = &amp;client_ops;</div><div class='add'>+</div><div class='add'>+		ret = cs_dsp_halo_init(&amp;cs35l41-&gt;cs_dsp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		cs35l41-&gt;halo_initialized = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41_set_default_tuning_params(cs35l41);</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_request_firmware_files(cs35l41, &amp;wmfw_firmware, &amp;wmfw_filename,</div><div class='add'>+					     &amp;coeff_firmware, &amp;coeff_filename);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Loading WMFW Firmware: %s\n", wmfw_filename);</div><div class='add'>+	if (coeff_filename) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Loading Coefficient File: %s\n", coeff_filename);</div><div class='add'>+		ret = cs35l41_load_tuning_params(cs35l41, coeff_filename);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_warn(cs35l41-&gt;dev, "Unable to load Tuning Parameters: %d\n", ret);</div><div class='add'>+	} else {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "No Coefficient File available.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs_dsp_power_up(dsp, wmfw_firmware, wmfw_filename, coeff_firmware, coeff_filename,</div><div class='add'>+			      cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type]);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	cs35l41_hda_apply_calibration(cs35l41);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret)</div><div class='add'>+		cs35l41_set_default_tuning_params(cs35l41);</div><div class='add'>+	release_firmware(wmfw_firmware);</div><div class='add'>+	release_firmware(coeff_firmware);</div><div class='add'>+	kfree(wmfw_filename);</div><div class='add'>+	kfree(coeff_filename);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_shutdown_dsp(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	struct cs_dsp *dsp = &amp;cs35l41-&gt;cs_dsp;</div><div class='add'>+</div><div class='add'>+	cs35l41_set_default_tuning_params(cs35l41);</div><div class='add'>+	cs_dsp_stop(dsp);</div><div class='add'>+	cs_dsp_power_down(dsp);</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Unloaded Firmware\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_remove_dsp(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	struct cs_dsp *dsp = &amp;cs35l41-&gt;cs_dsp;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;cs35l41-&gt;fw_load_work);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+	cs35l41_shutdown_dsp(cs35l41);</div><div class='add'>+	cs_dsp_remove(dsp);</div><div class='add'>+	cs35l41-&gt;halo_initialized = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Protection release cycle to get the speaker out of Safe-Mode */</div><div class='add'>+static void cs35l41_error_release(struct device *dev, struct regmap *regmap, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	regmap_write(regmap, CS35L41_PROTECT_REL_ERR_IGN, 0);</div><div class='add'>+	regmap_set_bits(regmap, CS35L41_PROTECT_REL_ERR_IGN, mask);</div><div class='add'>+	regmap_clear_bits(regmap, CS35L41_PROTECT_REL_ERR_IGN, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Clear all errors to release safe mode. Global Enable must be cleared first. */</div><div class='add'>+static void cs35l41_irq_release(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	cs35l41_error_release(cs35l41-&gt;dev, cs35l41-&gt;regmap, cs35l41-&gt;irq_errors);</div><div class='add'>+	cs35l41-&gt;irq_errors = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_update_mixer(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+	unsigned int asp_en = 0;</div><div class='add'>+	unsigned int dsp1rx2_src = 0;</div><div class='add'>+</div><div class='add'>+	regmap_multi_reg_write(reg, cs35l41_hda_config, ARRAY_SIZE(cs35l41_hda_config));</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+		asp_en |= CS35L41_ASP_TX1_EN_MASK; // ASP_TX1_EN = 1</div><div class='add'>+		regmap_multi_reg_write(reg, cs35l41_hda_config_dsp,</div><div class='add'>+				       ARRAY_SIZE(cs35l41_hda_config_dsp));</div><div class='add'>+		if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_INT_BOOST)</div><div class='add'>+			regmap_write(reg, CS35L41_DSP1_RX5_SRC, CS35L41_INPUT_SRC_VPMON);</div><div class='add'>+		else</div><div class='add'>+			regmap_write(reg, CS35L41_DSP1_RX5_SRC, CS35L41_INPUT_SRC_VBSTMON);</div><div class='add'>+	} else {</div><div class='add'>+		regmap_multi_reg_write(reg, cs35l41_hda_config_no_dsp,</div><div class='add'>+				       ARRAY_SIZE(cs35l41_hda_config_no_dsp));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.spk_pos == CS35L41_CENTER) {</div><div class='add'>+		asp_en |= CS35L41_ASP_RX2_EN_MASK; // ASP_RX2_EN = 1</div><div class='add'>+		dsp1rx2_src = 0x00000009; // DSP1RX2 SRC = ASPRX2</div><div class='add'>+	} else {</div><div class='add'>+		dsp1rx2_src = 0x00000008; // DSP1RX2 SRC = ASPRX1</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	asp_en |= CS35L41_ASP_RX1_EN_MASK; // ASP_RX1_EN = 1</div><div class='add'>+</div><div class='add'>+	regmap_write(reg, CS35L41_SP_ENABLES, asp_en);</div><div class='add'>+	regmap_write(reg, CS35L41_DSP1_RX1_SRC, 0x00000008); // DSP1RX1 SRC = ASPRX1</div><div class='add'>+	regmap_write(reg, CS35L41_DSP1_RX2_SRC, dsp1rx2_src);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_play_start(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Play (Start)\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;playback_started) {</div><div class='add'>+		dev_dbg(dev, "Playback already started.");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;playback_started = true;</div><div class='add'>+</div><div class='add'>+	cs35l41_update_mixer(cs35l41);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+		regmap_update_bits(reg, CS35L41_PWR_CTRL2,</div><div class='add'>+				   CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,</div><div class='add'>+				   1 &lt;&lt; CS35L41_VMON_EN_SHIFT | 1 &lt;&lt; CS35L41_IMON_EN_SHIFT);</div><div class='add'>+		cs35l41_set_cspl_mbox_cmd(cs35l41-&gt;dev, reg, CSPL_MBOX_CMD_RESUME);</div><div class='add'>+	}</div><div class='add'>+	regmap_update_bits(reg, CS35L41_PWR_CTRL2, CS35L41_AMP_EN_MASK, 1 &lt;&lt; CS35L41_AMP_EN_SHIFT);</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST)</div><div class='add'>+		regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00008001);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_mute(struct device *dev, bool mute)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+	unsigned int amp_gain;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Mute(%d:%d) Playback Started: %d\n", mute, cs35l41-&gt;mute_override,</div><div class='add'>+		cs35l41-&gt;playback_started);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;playback_started) {</div><div class='add'>+		if (mute || cs35l41-&gt;mute_override) {</div><div class='add'>+			dev_dbg(dev, "Muting\n");</div><div class='add'>+			regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(dev, "Unmuting\n");</div><div class='add'>+			if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+				dev_dbg(dev, "Using Tuned Gain: %d\n", cs35l41-&gt;tuning_gain);</div><div class='add'>+				amp_gain = (cs35l41-&gt;tuning_gain &lt;&lt; CS35L41_AMP_GAIN_PCM_SHIFT) |</div><div class='add'>+					(DEFAULT_AMP_GAIN_PDM &lt;&lt; CS35L41_AMP_GAIN_PDM_SHIFT);</div><div class='add'>+</div><div class='add'>+				/* AMP_HPF_PCM_EN = 1, AMP_VOL_PCM  0.0 dB */</div><div class='add'>+				regmap_write(reg, CS35L41_AMP_DIG_VOL_CTRL, 0x00008000);</div><div class='add'>+				regmap_write(reg, CS35L41_AMP_GAIN_CTRL, amp_gain);</div><div class='add'>+			} else {</div><div class='add'>+				regmap_multi_reg_write(reg, cs35l41_hda_unmute,</div><div class='add'>+						ARRAY_SIZE(cs35l41_hda_unmute));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_play_done(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Play (Complete)\n");</div><div class='add'>+</div><div class='add'>+	cs35l41_global_enable(dev, reg, cs35l41-&gt;hw_cfg.bst_type, 1,</div><div class='add'>+			      &amp;cs35l41-&gt;cs_dsp);</div><div class='add'>+	cs35l41_mute(dev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_pause_start(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Pause (Start)\n");</div><div class='add'>+</div><div class='add'>+	cs35l41_mute(dev, true);</div><div class='add'>+	cs35l41_global_enable(dev, reg, cs35l41-&gt;hw_cfg.bst_type, 0,</div><div class='add'>+			      &amp;cs35l41-&gt;cs_dsp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_pause_done(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct regmap *reg = cs35l41-&gt;regmap;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Pause (Complete)\n");</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(reg, CS35L41_PWR_CTRL2, CS35L41_AMP_EN_MASK, 0 &lt;&lt; CS35L41_AMP_EN_SHIFT);</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST)</div><div class='add'>+		regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00000001);</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+		cs35l41_set_cspl_mbox_cmd(dev, reg, CSPL_MBOX_CMD_PAUSE);</div><div class='add'>+		regmap_update_bits(reg, CS35L41_PWR_CTRL2,</div><div class='add'>+				   CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,</div><div class='add'>+				   0 &lt;&lt; CS35L41_VMON_EN_SHIFT | 0 &lt;&lt; CS35L41_IMON_EN_SHIFT);</div><div class='add'>+	}</div><div class='add'>+	cs35l41_irq_release(cs35l41);</div><div class='add'>+	cs35l41-&gt;playback_started = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_pre_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+			cs35l41_hda_pause_start(dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+static void cs35l41_hda_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_OPEN:</div><div class='add'>+		/*</div><div class='add'>+		 * All amps must be resumed before we can start playing back.</div><div class='add'>+		 * This ensures, for external boost, that all amps are in AMP_SAFE mode.</div><div class='add'>+		 * Do this in HDA_GEN_PCM_ACT_OPEN, since this is run prior to any of the</div><div class='add'>+		 * other actions.</div><div class='add'>+		 */</div><div class='add'>+		pm_runtime_get_sync(dev);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+			cs35l41_hda_play_start(dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+			cs35l41_hda_pause_done(dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLOSE:</div><div class='add'>+		scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+			if (!cs35l41-&gt;cs_dsp.running &amp;&amp; cs35l41-&gt;request_fw_load &amp;&amp;</div><div class='add'>+			    !cs35l41-&gt;fw_request_ongoing) {</div><div class='add'>+				dev_info(dev, "Requesting Firmware Load after HDA_GEN_PCM_ACT_CLOSE\n");</div><div class='add'>+				cs35l41-&gt;fw_request_ongoing = true;</div><div class='add'>+				schedule_work(&amp;cs35l41-&gt;fw_load_work);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Playback must be finished for all amps before we start runtime suspend.</div><div class='add'>+		 * This ensures no amps are playing back when we start putting them to sleep.</div><div class='add'>+		 */</div><div class='add'>+		pm_runtime_put_autosuspend(dev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_post_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+			cs35l41_hda_play_done(dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_channel_map(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	unsigned int tx_num = 0;</div><div class='add'>+	unsigned int *tx_slot = NULL;</div><div class='add'>+	unsigned int rx_num;</div><div class='add'>+	unsigned int *rx_slot;</div><div class='add'>+	unsigned int mono = 0;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;amp_name) {</div><div class='add'>+		if (cs35l41-&gt;hw_cfg.spk_pos &gt;= ARRAY_SIZE(channel_name))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		cs35l41-&gt;amp_name = devm_kasprintf(cs35l41-&gt;dev, GFP_KERNEL, "%c%d",</div><div class='add'>+						   channel_name[cs35l41-&gt;hw_cfg.spk_pos],</div><div class='add'>+						   cs35l41-&gt;channel_index);</div><div class='add'>+		if (!cs35l41-&gt;amp_name)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_num = 1;</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.spk_pos == CS35L41_CENTER)</div><div class='add'>+		rx_slot = &amp;mono;</div><div class='add'>+	else</div><div class='add'>+		rx_slot = &amp;cs35l41-&gt;hw_cfg.spk_pos;</div><div class='add'>+</div><div class='add'>+	return cs35l41_set_channels(cs35l41-&gt;dev, cs35l41-&gt;regmap, tx_num, tx_slot, rx_num,</div><div class='add'>+				    rx_slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_verify_id(struct cs35l41_hda *cs35l41, unsigned int *regid, unsigned int *reg_revid)</div><div class='add'>+{</div><div class='add'>+	unsigned int mtl_revid, chipid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_DEVID, regid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(cs35l41-&gt;dev, ret, "Get Device ID failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_REVID, reg_revid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(cs35l41-&gt;dev, ret, "Get Revision ID failed\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtl_revid = *reg_revid &amp; CS35L41_MTLREVID_MASK;</div><div class='add'>+</div><div class='add'>+	chipid = (mtl_revid % 2) ? CS35L41R_CHIP_ID : CS35L41_CHIP_ID;</div><div class='add'>+	if (*regid != chipid) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "CS35L41 Device ID (%X). Expected ID %X\n", *regid, chipid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_ready_for_reset(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+		cs35l41-&gt;cs_dsp.running = false;</div><div class='add'>+		cs35l41-&gt;cs_dsp.booted = false;</div><div class='add'>+	}</div><div class='add'>+	regcache_mark_dirty(cs35l41-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_system_suspend_prep(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "System Suspend Prepare\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) {</div><div class='add'>+		dev_err_once(cs35l41-&gt;dev, "System Suspend not supported\n");</div><div class='add'>+		return 0; /* don't block the whole system suspend */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+	if (cs35l41-&gt;playback_started)</div><div class='add'>+		cs35l41_hda_pause_start(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_system_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "System Suspend\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) {</div><div class='add'>+		dev_err_once(cs35l41-&gt;dev, "System Suspend not supported\n");</div><div class='add'>+		return 0; /* don't block the whole system suspend */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+		if (cs35l41-&gt;playback_started)</div><div class='add'>+			cs35l41_hda_pause_done(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_suspend(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "System Suspend Failed, unable to runtime suspend: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Shutdown DSP before system suspend */</div><div class='add'>+	ret = cs35l41_ready_for_reset(cs35l41);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev, "System Suspend Failed, not ready for Reset: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;reset_gpio) {</div><div class='add'>+		dev_info(cs35l41-&gt;dev, "Asserting Reset\n");</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 0);</div><div class='add'>+		usleep_range(2000, 2100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "System Suspended\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_wait_boot_done(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	unsigned int int_status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(cs35l41-&gt;regmap, CS35L41_IRQ1_STATUS4, int_status,</div><div class='add'>+				       int_status &amp; CS35L41_OTP_BOOT_DONE, 1000, 100000);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed waiting for OTP_BOOT_DONE\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_IRQ1_STATUS3, &amp;int_status);</div><div class='add'>+	if (ret || (int_status &amp; CS35L41_OTP_BOOT_ERR)) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "OTP Boot status %x error\n",</div><div class='add'>+			int_status &amp; CS35L41_OTP_BOOT_ERR);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = -EIO;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_system_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "System Resume\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) {</div><div class='add'>+		dev_err_once(cs35l41-&gt;dev, "System Resume not supported\n");</div><div class='add'>+		return 0; /* don't block the whole system resume */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;reset_gpio) {</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 0);</div><div class='add'>+		usleep_range(2000, 2100);</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usleep_range(2000, 2100);</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l41-&gt;regmap, false);</div><div class='add'>+</div><div class='add'>+	regmap_write(cs35l41-&gt;regmap, CS35L41_SFT_RESET, CS35L41_SOFTWARE_RESET);</div><div class='add'>+	usleep_range(2000, 2100);</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_wait_boot_done(cs35l41);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l41-&gt;regmap, true);</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_resume(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "System Resume Failed: Unable to runtime resume: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;request_fw_load &amp;&amp; !cs35l41-&gt;fw_request_ongoing) {</div><div class='add'>+		cs35l41-&gt;fw_request_ongoing = true;</div><div class='add'>+		schedule_work(&amp;cs35l41-&gt;fw_load_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH)</div><div class='add'>+		return -EBUSY; /* suspend not supported yet on this model */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Runtime Suspend\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Runtime Suspend not supported\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running) {</div><div class='add'>+		ret = cs35l41_enter_hibernate(cs35l41-&gt;dev, cs35l41-&gt;regmap,</div><div class='add'>+					      cs35l41-&gt;hw_cfg.bst_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		cs35l41_safe_reset(cs35l41-&gt;regmap, cs35l41-&gt;hw_cfg.bst_type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l41-&gt;regmap, true);</div><div class='add'>+	regcache_mark_dirty(cs35l41-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	unsigned int regid, reg_revid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Runtime Resume\n");</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Runtime Resume not supported\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l41-&gt;regmap, false);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running)	{</div><div class='add'>+		ret = cs35l41_exit_hibernate(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_warn(cs35l41-&gt;dev, "Unable to exit Hibernate.");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_verify_id(cs35l41, &amp;regid, &amp;reg_revid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Test key needs to be unlocked to allow the OTP settings to re-apply */</div><div class='add'>+	cs35l41_test_key_unlock(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	ret = regcache_sync(cs35l41-&gt;regmap);</div><div class='add'>+	cs35l41_test_key_lock(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed to restore register cache: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;hw_cfg.bst_type == CS35L41_EXT_BOOST)</div><div class='add'>+		cs35l41_init_boost(cs35l41-&gt;dev, cs35l41-&gt;regmap, &amp;cs35l41-&gt;hw_cfg);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "CS35L41 Resumed (%x), Revision: %02X\n", regid, reg_revid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_read_ctl(struct cs_dsp *dsp, const char *name, int type,</div><div class='add'>+				unsigned int alg, void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;dsp-&gt;pwr_lock);</div><div class='add'>+	return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	unsigned int fw_status;</div><div class='add'>+	__be32 halo_sts;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;bypass_fw) {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "Bypassing Firmware.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_init_dsp(cs35l41);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "Cannot Initialize Firmware. Error: %d\n", ret);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_write_fs_errata(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Cannot Write FS Errata: %d\n", ret);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs_dsp_run(&amp;cs35l41-&gt;cs_dsp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Fail to start dsp: %d\n", ret);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(cs35l41_hda_read_ctl, ret,</div><div class='add'>+				be32_to_cpu(halo_sts) == HALO_STATE_CODE_RUN,</div><div class='add'>+				1000, 15000, false, &amp;cs35l41-&gt;cs_dsp, HALO_STATE_DSP_CTL_NAME,</div><div class='add'>+				HALO_STATE_DSP_CTL_TYPE, HALO_STATE_DSP_CTL_ALG,</div><div class='add'>+				&amp;halo_sts, sizeof(halo_sts));</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Timeout waiting for HALO Core to start. State: %u\n",</div><div class='add'>+			 halo_sts);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l41-&gt;regmap, CS35L41_DSP_MBOX_2, &amp;fw_status);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev,</div><div class='add'>+			"Failed to read firmware status: %d\n", ret);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (fw_status) {</div><div class='add'>+	case CSPL_MBOX_STS_RUNNING:</div><div class='add'>+	case CSPL_MBOX_STS_PAUSED:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Firmware status is invalid: %u\n",</div><div class='add'>+			fw_status);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_set_cspl_mbox_cmd(cs35l41-&gt;dev, cs35l41-&gt;regmap, CSPL_MBOX_CMD_PAUSE);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Error waiting for DSP to pause: %u\n", ret);</div><div class='add'>+		goto clean_dsp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l41-&gt;dev, "Firmware Loaded - Type: %s, Gain: %d\n",</div><div class='add'>+		 cs35l41_hda_fw_ids[cs35l41-&gt;firmware_type], cs35l41-&gt;tuning_gain);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+clean_dsp:</div><div class='add'>+	cs35l41_shutdown_dsp(cs35l41);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_load_firmware(struct cs35l41_hda *cs35l41, bool load)</div><div class='add'>+{</div><div class='add'>+	if (cs35l41-&gt;cs_dsp.running &amp;&amp; !load) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Unloading Firmware\n");</div><div class='add'>+		cs35l41_shutdown_dsp(cs35l41);</div><div class='add'>+	} else if (!cs35l41-&gt;cs_dsp.running &amp;&amp; load) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Loading Firmware\n");</div><div class='add'>+		cs35l41_smart_amp(cs35l41);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Unable to Load firmware.\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fw_load_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = cs35l41-&gt;request_fw_load;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_mute_override_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+					 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = cs35l41-&gt;mute_override;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_fw_load_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = container_of(work, struct cs35l41_hda, fw_load_work);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;cs35l41-&gt;fw_mutex) {</div><div class='add'>+		/* Recheck if playback is ongoing, mutex will block playback during firmware loading */</div><div class='add'>+		if (cs35l41-&gt;playback_started)</div><div class='add'>+			dev_err(cs35l41-&gt;dev, "Cannot Load/Unload firmware during Playback. Retrying...\n");</div><div class='add'>+		else</div><div class='add'>+			cs35l41_load_firmware(cs35l41, cs35l41-&gt;request_fw_load);</div><div class='add'>+</div><div class='add'>+		cs35l41-&gt;fw_request_ongoing = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(cs35l41-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fw_load_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;request_fw_load == ucontrol-&gt;value.integer.value[0])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;fw_request_ongoing) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Existing request not complete\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if playback is ongoing when initial request is made */</div><div class='add'>+	if (cs35l41-&gt;playback_started) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Cannot Load/Unload firmware during Playback\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;fw_request_ongoing = true;</div><div class='add'>+	cs35l41-&gt;request_fw_load = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	schedule_work(&amp;cs35l41-&gt;fw_load_work);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fw_type_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = cs35l41-&gt;firmware_type;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	if (ucontrol-&gt;value.enumerated.item[0] &lt; CS35L41_HDA_NUM_FW) {</div><div class='add'>+		if (cs35l41-&gt;firmware_type != ucontrol-&gt;value.enumerated.item[0]) {</div><div class='add'>+			cs35l41-&gt;firmware_type = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+			return 1;</div><div class='add'>+		} else {</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_fw_type_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(cs35l41_hda_fw_ids), cs35l41_hda_fw_ids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	char fw_type_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	char fw_load_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	char mute_override_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	struct snd_kcontrol_new fw_type_ctl = {</div><div class='add'>+		.name = fw_type_ctl_name,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+		.info = cs35l41_fw_type_ctl_info,</div><div class='add'>+		.get = cs35l41_fw_type_ctl_get,</div><div class='add'>+		.put = cs35l41_fw_type_ctl_put,</div><div class='add'>+	};</div><div class='add'>+	struct snd_kcontrol_new fw_load_ctl = {</div><div class='add'>+		.name = fw_load_ctl_name,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+		.info = snd_ctl_boolean_mono_info,</div><div class='add'>+		.get = cs35l41_fw_load_ctl_get,</div><div class='add'>+		.put = cs35l41_fw_load_ctl_put,</div><div class='add'>+	};</div><div class='add'>+	struct snd_kcontrol_new mute_override_ctl = {</div><div class='add'>+		.name = mute_override_ctl_name,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+		.info = snd_ctl_boolean_mono_info,</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='add'>+		.get = cs35l41_mute_override_ctl_get,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	scnprintf(fw_type_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s DSP1 Firmware Type",</div><div class='add'>+		  cs35l41-&gt;amp_name);</div><div class='add'>+	scnprintf(fw_load_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s DSP1 Firmware Load",</div><div class='add'>+		  cs35l41-&gt;amp_name);</div><div class='add'>+	scnprintf(mute_override_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s Forced Mute Status",</div><div class='add'>+		  cs35l41-&gt;amp_name);</div><div class='add'>+</div><div class='add'>+	ret = snd_ctl_add(cs35l41-&gt;codec-&gt;card, snd_ctl_new1(&amp;fw_type_ctl, cs35l41));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed to add KControl %s = %d\n", fw_type_ctl.name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Added Control %s\n", fw_type_ctl.name);</div><div class='add'>+</div><div class='add'>+	ret = snd_ctl_add(cs35l41-&gt;codec-&gt;card, snd_ctl_new1(&amp;fw_load_ctl, cs35l41));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed to add KControl %s = %d\n", fw_load_ctl.name, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Added Control %s\n", fw_load_ctl.name);</div><div class='add'>+</div><div class='add'>+	ret = snd_ctl_add(cs35l41-&gt;codec-&gt;card, snd_ctl_new1(&amp;mute_override_ctl, cs35l41));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed to add KControl %s = %d\n", mute_override_ctl.name,</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Added Control %s\n", mute_override_ctl.name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool cs35l41_dsm_supported(acpi_handle handle, unsigned int commands)</div><div class='add'>+{</div><div class='add'>+	guid_t guid;</div><div class='add'>+</div><div class='add'>+	guid_parse(CS35L41_UUID, &amp;guid);</div><div class='add'>+</div><div class='add'>+	return acpi_check_dsm(handle, &amp;guid, 0, BIT(commands));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_get_acpi_mute_state(struct cs35l41_hda *cs35l41, acpi_handle handle)</div><div class='add'>+{</div><div class='add'>+	guid_t guid;</div><div class='add'>+	union acpi_object *ret;</div><div class='add'>+	int mute = -ENODEV;</div><div class='add'>+</div><div class='add'>+	guid_parse(CS35L41_UUID, &amp;guid);</div><div class='add'>+</div><div class='add'>+	if (cs35l41_dsm_supported(handle, CS35L41_DSM_GET_MUTE)) {</div><div class='add'>+		ret = acpi_evaluate_dsm(handle, &amp;guid, 0, CS35L41_DSM_GET_MUTE, NULL);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		mute = *ret-&gt;buffer.pointer;</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "CS35L41_DSM_GET_MUTE: %d\n", mute);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "%s: %d\n", __func__, mute);</div><div class='add'>+</div><div class='add'>+	return mute;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_acpi_device_notify(acpi_handle handle, u32 event, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	int mute;</div><div class='add'>+</div><div class='add'>+	if (event != CS35L41_NOTIFY_EVENT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mute = cs35l41_get_acpi_mute_state(cs35l41, handle);</div><div class='add'>+	if (mute &lt; 0) {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "Unable to retrieve mute state: %d\n", mute);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l41-&gt;dev, "Requesting mute value: %d\n", mute);</div><div class='add'>+	cs35l41-&gt;mute_override = (mute &gt; 0);</div><div class='add'>+	cs35l41_mute(cs35l41-&gt;dev, cs35l41-&gt;mute_override);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_bind(struct device *dev, struct device *master, void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	unsigned int sleep_flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, cs35l41-&gt;index);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;dev)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	comp-&gt;dev = dev;</div><div class='add'>+	cs35l41-&gt;codec = parent-&gt;codec;</div><div class='add'>+	if (!cs35l41-&gt;acpi_subsystem_id)</div><div class='add'>+		cs35l41-&gt;acpi_subsystem_id = kasprintf(GFP_KERNEL, "%.8x",</div><div class='add'>+						       cs35l41-&gt;codec-&gt;core.subsystem_id);</div><div class='add'>+</div><div class='add'>+	strscpy(comp-&gt;name, dev_name(dev), sizeof(comp-&gt;name));</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;firmware_type = CS35L41_HDA_FW_SPK_PROT;</div><div class='add'>+</div><div class='add'>+	if (firmware_autostart) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Firmware Autostart.\n");</div><div class='add'>+		cs35l41-&gt;request_fw_load = true;</div><div class='add'>+		if (cs35l41_smart_amp(cs35l41) &lt; 0)</div><div class='add'>+			dev_warn(cs35l41-&gt;dev, "Cannot Run Firmware, reverting to dsp bypass...\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Firmware Autostart is disabled.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_create_controls(cs35l41);</div><div class='add'>+</div><div class='add'>+	comp-&gt;playback_hook = cs35l41_hda_playback_hook;</div><div class='add'>+	comp-&gt;pre_playback_hook = cs35l41_hda_pre_playback_hook;</div><div class='add'>+	comp-&gt;post_playback_hook = cs35l41_hda_post_playback_hook;</div><div class='add'>+	comp-&gt;acpi_notify = cs35l41_acpi_device_notify;</div><div class='add'>+	comp-&gt;adev = cs35l41-&gt;dacpi;</div><div class='add'>+</div><div class='add'>+	comp-&gt;acpi_notifications_supported = cs35l41_dsm_supported(acpi_device_handle(comp-&gt;adev),</div><div class='add'>+		CS35L41_DSM_GET_MUTE);</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;mute_override = cs35l41_get_acpi_mute_state(cs35l41,</div><div class='add'>+						acpi_device_handle(cs35l41-&gt;dacpi)) &gt; 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	sleep_flags = lock_system_sleep();</div><div class='add'>+	if (!device_link_add(&amp;cs35l41-&gt;codec-&gt;core.dev, cs35l41-&gt;dev, DL_FLAG_STATELESS))</div><div class='add'>+		dev_warn(dev, "Unable to create device link\n");</div><div class='add'>+	unlock_system_sleep(sleep_flags);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(dev);</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l41-&gt;dev,</div><div class='add'>+		 "CS35L41 Bound - SSID: %s, BST: %d, VSPK: %d, CH: %c, FW EN: %d, SPKID: %d\n",</div><div class='add'>+		 cs35l41-&gt;acpi_subsystem_id, cs35l41-&gt;hw_cfg.bst_type,</div><div class='add'>+		 cs35l41-&gt;hw_cfg.gpio1.func == CS35l41_VSPK_SWITCH,</div><div class='add'>+		 channel_name[cs35l41-&gt;hw_cfg.spk_pos],</div><div class='add'>+		 cs35l41-&gt;cs_dsp.running, cs35l41-&gt;speaker_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_unbind(struct device *dev, struct device *master, void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	unsigned int sleep_flags;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, cs35l41-&gt;index);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;dev == dev) {</div><div class='add'>+		sleep_flags = lock_system_sleep();</div><div class='add'>+		device_link_remove(&amp;cs35l41-&gt;codec-&gt;core.dev, cs35l41-&gt;dev);</div><div class='add'>+		unlock_system_sleep(sleep_flags);</div><div class='add'>+		memset(comp, 0, sizeof(*comp));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_ops cs35l41_hda_comp_ops = {</div><div class='add'>+	.bind = cs35l41_hda_bind,</div><div class='add'>+	.unbind = cs35l41_hda_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_bst_short_err(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "LBST Error\n");</div><div class='add'>+	set_bit(CS35L41_BST_SHORT_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_bst_dcm_uvp_err(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "DCM VBST Under Voltage Error\n");</div><div class='add'>+	set_bit(CS35L41_BST_UVP_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_bst_ovp_err(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "VBST Over Voltage error\n");</div><div class='add'>+	set_bit(CS35L41_BST_OVP_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_temp_err(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "Over temperature error\n");</div><div class='add'>+	set_bit(CS35L41_TEMP_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_temp_warn(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "Over temperature warning\n");</div><div class='add'>+	set_bit(CS35L41_TEMP_WARN_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t cs35l41_amp_short(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = data;</div><div class='add'>+</div><div class='add'>+	dev_crit_ratelimited(cs35l41-&gt;dev, "Amp short error\n");</div><div class='add'>+	set_bit(CS35L41_AMP_SHORT_ERR_RLS_SHIFT, &amp;cs35l41-&gt;irq_errors);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cs35l41_irq cs35l41_irqs[] = {</div><div class='add'>+	CS35L41_IRQ(BST_OVP_ERR, "Boost Overvoltage Error", cs35l41_bst_ovp_err),</div><div class='add'>+	CS35L41_IRQ(BST_DCM_UVP_ERR, "Boost Undervoltage Error", cs35l41_bst_dcm_uvp_err),</div><div class='add'>+	CS35L41_IRQ(BST_SHORT_ERR, "Boost Inductor Short Error", cs35l41_bst_short_err),</div><div class='add'>+	CS35L41_IRQ(TEMP_WARN, "Temperature Warning", cs35l41_temp_warn),</div><div class='add'>+	CS35L41_IRQ(TEMP_ERR, "Temperature Error", cs35l41_temp_err),</div><div class='add'>+	CS35L41_IRQ(AMP_SHORT_ERR, "Amp Short", cs35l41_amp_short),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_irq cs35l41_reg_irqs[] = {</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, BST_OVP_ERR),</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, BST_DCM_UVP_ERR),</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, BST_SHORT_ERR),</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, TEMP_WARN),</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, TEMP_ERR),</div><div class='add'>+	CS35L41_REG_IRQ(IRQ1_STATUS1, AMP_SHORT_ERR),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_irq_chip cs35l41_regmap_irq_chip = {</div><div class='add'>+	.name = "cs35l41 IRQ1 Controller",</div><div class='add'>+	.status_base = CS35L41_IRQ1_STATUS1,</div><div class='add'>+	.mask_base = CS35L41_IRQ1_MASK1,</div><div class='add'>+	.ack_base = CS35L41_IRQ1_STATUS1,</div><div class='add'>+	.num_regs = 4,</div><div class='add'>+	.irqs = cs35l41_reg_irqs,</div><div class='add'>+	.num_irqs = ARRAY_SIZE(cs35l41_reg_irqs),</div><div class='add'>+	.runtime_pm = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cs35l41_configure_interrupt(struct cs35l41_hda *cs35l41, int irq_pol)</div><div class='add'>+{</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;irq) {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "No Interrupt Found");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_regmap_add_irq_chip(cs35l41-&gt;dev, cs35l41-&gt;regmap, cs35l41-&gt;irq,</div><div class='add'>+					IRQF_ONESHOT | IRQF_SHARED | irq_pol,</div><div class='add'>+					0, &amp;cs35l41_regmap_irq_chip, &amp;cs35l41-&gt;irq_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(cs35l41-&gt;dev, "Unable to add IRQ Chip: %d.", ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cs35l41_irqs); i++) {</div><div class='add'>+		irq = regmap_irq_get_virq(cs35l41-&gt;irq_data, cs35l41_irqs[i].irq);</div><div class='add'>+		if (irq &lt; 0) {</div><div class='add'>+			ret = irq;</div><div class='add'>+			dev_dbg(cs35l41-&gt;dev, "Unable to map IRQ %s: %d.", cs35l41_irqs[i].name,</div><div class='add'>+				ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = devm_request_threaded_irq(cs35l41-&gt;dev, irq, NULL,</div><div class='add'>+						cs35l41_irqs[i].handler,</div><div class='add'>+						IRQF_ONESHOT | IRQF_SHARED | irq_pol,</div><div class='add'>+						cs35l41_irqs[i].name, cs35l41);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_dbg(cs35l41-&gt;dev, "Unable to allocate IRQ %s:: %d.",</div><div class='add'>+				cs35l41_irqs[i].name, ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+err:</div><div class='add'>+	dev_warn(cs35l41-&gt;dev,</div><div class='add'>+		 "IRQ Config Failed. Amp errors may not be recoverable without reboot.");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hw_cfg *hw_cfg = &amp;cs35l41-&gt;hw_cfg;</div><div class='add'>+	bool using_irq = false;</div><div class='add'>+	int irq_pol;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;hw_cfg.valid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_init_boost(cs35l41-&gt;dev, cs35l41-&gt;regmap, hw_cfg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (hw_cfg-&gt;gpio1.valid) {</div><div class='add'>+		switch (hw_cfg-&gt;gpio1.func) {</div><div class='add'>+		case CS35L41_NOT_USED:</div><div class='add'>+			break;</div><div class='add'>+		case CS35l41_VSPK_SWITCH:</div><div class='add'>+			hw_cfg-&gt;gpio1.func = CS35L41_GPIO1_GPIO;</div><div class='add'>+			hw_cfg-&gt;gpio1.out_en = true;</div><div class='add'>+			break;</div><div class='add'>+		case CS35l41_SYNC:</div><div class='add'>+			hw_cfg-&gt;gpio1.func = CS35L41_GPIO1_MDSYNC;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(cs35l41-&gt;dev, "Invalid function %d for GPIO1\n",</div><div class='add'>+				hw_cfg-&gt;gpio1.func);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_cfg-&gt;gpio2.valid) {</div><div class='add'>+		switch (hw_cfg-&gt;gpio2.func) {</div><div class='add'>+		case CS35L41_NOT_USED:</div><div class='add'>+			break;</div><div class='add'>+		case CS35L41_INTERRUPT:</div><div class='add'>+			using_irq = true;</div><div class='add'>+			hw_cfg-&gt;gpio2.func = CS35L41_GPIO2_INT_OPEN_DRAIN;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(cs35l41-&gt;dev, "Invalid GPIO2 function %d\n", hw_cfg-&gt;gpio2.func);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_pol = cs35l41_gpio_config(cs35l41-&gt;regmap, hw_cfg);</div><div class='add'>+</div><div class='add'>+	if (using_irq)</div><div class='add'>+		cs35l41_configure_interrupt(cs35l41, irq_pol);</div><div class='add'>+</div><div class='add'>+	return cs35l41_hda_channel_map(cs35l41);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs35l41_get_speaker_id(struct device *dev, int amp_index, int num_amps, int fixed_gpio_id)</div><div class='add'>+{</div><div class='add'>+	struct gpio_desc *speaker_id_desc;</div><div class='add'>+	int speaker_id = -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (fixed_gpio_id &gt;= 0) {</div><div class='add'>+		dev_dbg(dev, "Found Fixed Speaker ID GPIO (index = %d)\n", fixed_gpio_id);</div><div class='add'>+		speaker_id_desc = gpiod_get_index(dev, NULL, fixed_gpio_id, GPIOD_IN);</div><div class='add'>+		if (IS_ERR(speaker_id_desc)) {</div><div class='add'>+			speaker_id = PTR_ERR(speaker_id_desc);</div><div class='add'>+			return speaker_id;</div><div class='add'>+		}</div><div class='add'>+		speaker_id = gpiod_get_value_cansleep(speaker_id_desc);</div><div class='add'>+		gpiod_put(speaker_id_desc);</div><div class='add'>+		dev_dbg(dev, "Speaker ID = %d\n", speaker_id);</div><div class='add'>+	} else {</div><div class='add'>+		int base_index;</div><div class='add'>+		int gpios_per_amp;</div><div class='add'>+		int count;</div><div class='add'>+		int tmp;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		count = gpiod_count(dev, "spk-id");</div><div class='add'>+		if (count &gt; 0) {</div><div class='add'>+			speaker_id = 0;</div><div class='add'>+			gpios_per_amp = count / num_amps;</div><div class='add'>+			base_index = gpios_per_amp * amp_index;</div><div class='add'>+</div><div class='add'>+			if (count % num_amps)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			dev_dbg(dev, "Found %d Speaker ID GPIOs per Amp\n", gpios_per_amp);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; gpios_per_amp; i++) {</div><div class='add'>+				speaker_id_desc = gpiod_get_index(dev, "spk-id", i + base_index,</div><div class='add'>+								  GPIOD_IN);</div><div class='add'>+				if (IS_ERR(speaker_id_desc)) {</div><div class='add'>+					speaker_id = PTR_ERR(speaker_id_desc);</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				tmp = gpiod_get_value_cansleep(speaker_id_desc);</div><div class='add'>+				gpiod_put(speaker_id_desc);</div><div class='add'>+				if (tmp &lt; 0) {</div><div class='add'>+					speaker_id = tmp;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				speaker_id |= tmp &lt;&lt; i;</div><div class='add'>+			}</div><div class='add'>+			dev_dbg(dev, "Speaker ID = %d\n", speaker_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return speaker_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs35l41_hda_parse_acpi(struct cs35l41_hda *cs35l41, struct device *physdev, int id)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hw_cfg *hw_cfg = &amp;cs35l41-&gt;hw_cfg;</div><div class='add'>+	u32 values[HDA_MAX_COMPONENTS];</div><div class='add'>+	char *property;</div><div class='add'>+	size_t nval;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,dev-index";</div><div class='add'>+	ret = device_property_count_u32(physdev, property);</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (ret &gt; ARRAY_SIZE(values)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	nval = ret;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;index = -1;</div><div class='add'>+	for (i = 0; i &lt; nval; i++) {</div><div class='add'>+		if (values[i] == id) {</div><div class='add'>+			cs35l41-&gt;index = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (cs35l41-&gt;index == -1) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "No index found in %s\n", property);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* To use the same release code for all laptop variants we can't use devm_ version of</div><div class='add'>+	 * gpiod_get here, as CLSA010* don't have a fully functional bios with an _DSD node</div><div class='add'>+	 */</div><div class='add'>+	cs35l41-&gt;reset_gpio = fwnode_gpiod_get_index(acpi_fwnode_handle(cs35l41-&gt;dacpi), "reset",</div><div class='add'>+						     cs35l41-&gt;index, GPIOD_OUT_LOW,</div><div class='add'>+						     "cs35l41-reset");</div><div class='add'>+</div><div class='add'>+	property = "cirrus,speaker-position";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	hw_cfg-&gt;spk_pos = values[cs35l41-&gt;index];</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;channel_index = 0;</div><div class='add'>+	for (i = 0; i &lt; cs35l41-&gt;index; i++)</div><div class='add'>+		if (values[i] == hw_cfg-&gt;spk_pos)</div><div class='add'>+			cs35l41-&gt;channel_index++;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,gpio1-func";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	hw_cfg-&gt;gpio1.func = values[cs35l41-&gt;index];</div><div class='add'>+	hw_cfg-&gt;gpio1.valid = true;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,gpio2-func";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+	hw_cfg-&gt;gpio2.func = values[cs35l41-&gt;index];</div><div class='add'>+	hw_cfg-&gt;gpio2.valid = true;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,boost-peak-milliamp";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		hw_cfg-&gt;bst_ipk = values[cs35l41-&gt;index];</div><div class='add'>+	else</div><div class='add'>+		hw_cfg-&gt;bst_ipk = -1;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,boost-ind-nanohenry";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		hw_cfg-&gt;bst_ind = values[cs35l41-&gt;index];</div><div class='add'>+	else</div><div class='add'>+		hw_cfg-&gt;bst_ind = -1;</div><div class='add'>+</div><div class='add'>+	property = "cirrus,boost-cap-microfarad";</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		hw_cfg-&gt;bst_cap = values[cs35l41-&gt;index];</div><div class='add'>+	else</div><div class='add'>+		hw_cfg-&gt;bst_cap = -1;</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;speaker_id = cs35l41_get_speaker_id(physdev, cs35l41-&gt;index, nval, -1);</div><div class='add'>+</div><div class='add'>+	if (hw_cfg-&gt;bst_ind &gt; 0 || hw_cfg-&gt;bst_cap &gt; 0 || hw_cfg-&gt;bst_ipk &gt; 0)</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_INT_BOOST;</div><div class='add'>+	else</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_EXT_BOOST;</div><div class='add'>+</div><div class='add'>+	hw_cfg-&gt;valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_err(cs35l41-&gt;dev, "Failed property %s: %d\n", property, ret);</div><div class='add'>+	hw_cfg-&gt;valid = false;</div><div class='add'>+	hw_cfg-&gt;gpio1.valid = false;</div><div class='add'>+	hw_cfg-&gt;gpio2.valid = false;</div><div class='add'>+	acpi_dev_put(cs35l41-&gt;dacpi);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, int id)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct device *physdev;</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	const char *sub;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adev = acpi_dev_get_first_match_dev(hid, NULL, -1);</div><div class='add'>+	if (!adev) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Failed to find an ACPI device for %s\n", hid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;dacpi = adev;</div><div class='add'>+	physdev = get_device(acpi_get_first_physical_node(adev));</div><div class='add'>+</div><div class='add'>+	sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));</div><div class='add'>+	if (IS_ERR(sub))</div><div class='add'>+		sub = NULL;</div><div class='add'>+	cs35l41-&gt;acpi_subsystem_id = sub;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_add_dsd_properties(cs35l41, physdev, id, hid);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dev_info(cs35l41-&gt;dev, "Using extra _DSD properties, bypassing _DSD in ACPI\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_hda_parse_acpi(cs35l41, physdev, id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		put_device(physdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	put_device(physdev);</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;bypass_fw = false;</div><div class='add'>+	if (cs35l41-&gt;control_bus == SPI) {</div><div class='add'>+		spi = to_spi_device(cs35l41-&gt;dev);</div><div class='add'>+		if (spi-&gt;max_speed_hz &lt; CS35L41_MAX_ACCEPTABLE_SPI_SPEED_HZ) {</div><div class='add'>+			dev_warn(cs35l41-&gt;dev,</div><div class='add'>+				 "SPI speed is too slow to support firmware download: %d Hz.\n",</div><div class='add'>+				 spi-&gt;max_speed_hz);</div><div class='add'>+			cs35l41-&gt;bypass_fw = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,</div><div class='add'>+		      struct regmap *regmap, enum control_bus control_bus)</div><div class='add'>+{</div><div class='add'>+	unsigned int regid, reg_revid;</div><div class='add'>+	struct cs35l41_hda *cs35l41;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cs35l41_irqs) != ARRAY_SIZE(cs35l41_reg_irqs));</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cs35l41_irqs) != CS35L41_NUM_IRQ);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+</div><div class='add'>+	cs35l41 = devm_kzalloc(dev, sizeof(*cs35l41), GFP_KERNEL);</div><div class='add'>+	if (!cs35l41)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;dev = dev;</div><div class='add'>+	cs35l41-&gt;irq = irq;</div><div class='add'>+	cs35l41-&gt;regmap = regmap;</div><div class='add'>+	cs35l41-&gt;control_bus = control_bus;</div><div class='add'>+	dev_set_drvdata(dev, cs35l41);</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_hda_read_acpi(cs35l41, device_name, id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(cs35l41-&gt;dev, ret, "Platform not supported\n");</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(cs35l41-&gt;reset_gpio)) {</div><div class='add'>+		ret = PTR_ERR(cs35l41-&gt;reset_gpio);</div><div class='add'>+		cs35l41-&gt;reset_gpio = NULL;</div><div class='add'>+		if (ret == -EBUSY) {</div><div class='add'>+			dev_info(cs35l41-&gt;dev, "Reset line busy, assuming shared reset\n");</div><div class='add'>+		} else {</div><div class='add'>+			dev_err_probe(cs35l41-&gt;dev, ret, "Failed to get reset GPIO\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (cs35l41-&gt;reset_gpio) {</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 0);</div><div class='add'>+		usleep_range(2000, 2100);</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usleep_range(2000, 2100);</div><div class='add'>+	regmap_write(cs35l41-&gt;regmap, CS35L41_SFT_RESET, CS35L41_SOFTWARE_RESET);</div><div class='add'>+	usleep_range(2000, 2100);</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_wait_boot_done(cs35l41);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_verify_id(cs35l41, &amp;regid, &amp;reg_revid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_test_key_unlock(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_register_errata_patch(cs35l41-&gt;dev, cs35l41-&gt;regmap, reg_revid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_otp_unpack(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(cs35l41-&gt;dev, ret, "OTP Unpack failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_test_key_lock(cs35l41-&gt;dev, cs35l41-&gt;regmap);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_get_calibration(cs35l41);</div><div class='add'>+	if (ret &amp;&amp; ret != -ENOENT)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	cs35l41_mute(cs35l41-&gt;dev, true);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;cs35l41-&gt;fw_load_work, cs35l41_fw_load_work);</div><div class='add'>+	mutex_init(&amp;cs35l41-&gt;fw_mutex);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(cs35l41-&gt;dev, 3000);</div><div class='add'>+	pm_runtime_use_autosuspend(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_set_active(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_get_noresume(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_enable(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_hda_apply_properties(cs35l41);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pm;</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = component_add(cs35l41-&gt;dev, &amp;cs35l41_hda_comp_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(cs35l41-&gt;dev, ret, "Register component failed\n");</div><div class='add'>+		goto err_pm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l41-&gt;dev, "Cirrus Logic CS35L41 (%x), Revision: %02X\n", regid, reg_revid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pm:</div><div class='add'>+	pm_runtime_dont_use_autosuspend(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_disable(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_put_noidle(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (cs35l41_safe_reset(cs35l41-&gt;regmap, cs35l41-&gt;hw_cfg.bst_type))</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 0);</div><div class='add'>+	gpiod_put(cs35l41-&gt;reset_gpio);</div><div class='add'>+	gpiod_put(cs35l41-&gt;cs_gpio);</div><div class='add'>+	acpi_dev_put(cs35l41-&gt;dacpi);</div><div class='add'>+	kfree(cs35l41-&gt;acpi_subsystem_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l41_hda_probe, "SND_HDA_SCODEC_CS35L41");</div><div class='add'>+</div><div class='add'>+void cs35l41_hda_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	component_del(cs35l41-&gt;dev, &amp;cs35l41_hda_comp_ops);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_dont_use_autosuspend(cs35l41-&gt;dev);</div><div class='add'>+	pm_runtime_disable(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;halo_initialized)</div><div class='add'>+		cs35l41_remove_dsp(cs35l41);</div><div class='add'>+</div><div class='add'>+	acpi_dev_put(cs35l41-&gt;dacpi);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_noidle(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (cs35l41_safe_reset(cs35l41-&gt;regmap, cs35l41-&gt;hw_cfg.bst_type))</div><div class='add'>+		gpiod_set_value_cansleep(cs35l41-&gt;reset_gpio, 0);</div><div class='add'>+	gpiod_put(cs35l41-&gt;reset_gpio);</div><div class='add'>+	gpiod_put(cs35l41-&gt;cs_gpio);</div><div class='add'>+	kfree(cs35l41-&gt;acpi_subsystem_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, "SND_HDA_SCODEC_CS35L41");</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops cs35l41_hda_pm_ops = {</div><div class='add'>+	RUNTIME_PM_OPS(cs35l41_runtime_suspend, cs35l41_runtime_resume,</div><div class='add'>+		       cs35l41_runtime_idle)</div><div class='add'>+	.prepare = cs35l41_system_suspend_prep,</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(cs35l41_system_suspend, cs35l41_system_resume)</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l41_hda_pm_ops, "SND_HDA_SCODEC_CS35L41");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("CS35L41 HDA Driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");</div><div class='add'>+MODULE_AUTHOR("Lucas Tanure, Cirrus Logic Inc, &lt;tanureal@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("FW_CS_DSP");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l41-*.wmfw");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l41-*.bin");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda.h b/sound/hda/codecs/side-codecs/cs35l41_hda.h<br/>new file mode 100644<br/>index 000000000000..7d003c598e93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda.h</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * CS35L41 ALSA HDA audio driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2021 Cirrus Logic, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS35L41_HDA_H__</div><div class='add'>+#define __CS35L41_HDA_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;sound/cs35l41.h&gt;</div><div class='add'>+#include &lt;sound/cs-amp-lib.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/firmware/cirrus/cs_dsp.h&gt;</div><div class='add'>+#include &lt;linux/firmware/cirrus/wmfw.h&gt;</div><div class='add'>+</div><div class='add'>+#define CS35L41_MAX_ACCEPTABLE_SPI_SPEED_HZ	1000000</div><div class='add'>+#define DEFAULT_AMP_GAIN_PCM			17	/* 17.5dB Gain */</div><div class='add'>+#define DEFAULT_AMP_GAIN_PDM			19	/* 19.5dB Gain */</div><div class='add'>+</div><div class='add'>+struct cs35l41_amp_cal_data {</div><div class='add'>+	u32 calTarget[2];</div><div class='add'>+	u32 calTime[2];</div><div class='add'>+	s8 calAmbient;</div><div class='add'>+	u8 calStatus;</div><div class='add'>+	u16 calR;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct cs35l41_amp_efi_data {</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 count;</div><div class='add'>+	struct cs35l41_amp_cal_data data[];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+enum cs35l41_hda_spk_pos {</div><div class='add'>+	CS35L41_LEFT,</div><div class='add'>+	CS35L41_RIGHT,</div><div class='add'>+	CS35L41_CENTER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cs35l41_hda_gpio_function {</div><div class='add'>+	CS35L41_NOT_USED,</div><div class='add'>+	CS35l41_VSPK_SWITCH,</div><div class='add'>+	CS35L41_INTERRUPT,</div><div class='add'>+	CS35l41_SYNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum control_bus {</div><div class='add'>+	I2C,</div><div class='add'>+	SPI</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cs35l41_hda {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct gpio_desc *cs_gpio;</div><div class='add'>+	struct cs35l41_hw_cfg hw_cfg;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	int irq;</div><div class='add'>+	int index;</div><div class='add'>+	int channel_index;</div><div class='add'>+	unsigned volatile long irq_errors;</div><div class='add'>+	const char *amp_name;</div><div class='add'>+	const char *acpi_subsystem_id;</div><div class='add'>+	int firmware_type;</div><div class='add'>+	int speaker_id;</div><div class='add'>+	struct mutex fw_mutex;</div><div class='add'>+	struct work_struct fw_load_work;</div><div class='add'>+</div><div class='add'>+	struct regmap_irq_chip_data *irq_data;</div><div class='add'>+	bool firmware_running;</div><div class='add'>+	bool request_fw_load;</div><div class='add'>+	bool fw_request_ongoing;</div><div class='add'>+	bool halo_initialized;</div><div class='add'>+	bool playback_started;</div><div class='add'>+	struct cs_dsp cs_dsp;</div><div class='add'>+	struct acpi_device *dacpi;</div><div class='add'>+	bool mute_override;</div><div class='add'>+	enum control_bus control_bus;</div><div class='add'>+	bool bypass_fw;</div><div class='add'>+	unsigned int tuning_gain;</div><div class='add'>+	struct cirrus_amp_cal_data cal_data;</div><div class='add'>+	bool cal_data_valid;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum halo_state {</div><div class='add'>+	HALO_STATE_CODE_INIT_DOWNLOAD = 0,</div><div class='add'>+	HALO_STATE_CODE_START,</div><div class='add'>+	HALO_STATE_CODE_RUN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct dev_pm_ops cs35l41_hda_pm_ops;</div><div class='add'>+</div><div class='add'>+int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,</div><div class='add'>+		      struct regmap *regmap, enum control_bus control_bus);</div><div class='add'>+void cs35l41_hda_remove(struct device *dev);</div><div class='add'>+int cs35l41_get_speaker_id(struct device *dev, int amp_index, int num_amps, int fixed_gpio_id);</div><div class='add'>+int cs35l41_hda_parse_acpi(struct cs35l41_hda *cs35l41, struct device *physdev, int id);</div><div class='add'>+</div><div class='add'>+#endif /*__CS35L41_HDA_H__*/</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c b/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c<br/>new file mode 100644<br/>index 000000000000..e77495413c21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// CS35l41 HDA I2C driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2021 Cirrus Logic, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cs35l41_hda.h"</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_i2c_probe(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	const char *device_name;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compare against the device name so it works for SPI, normal ACPI</div><div class='add'>+	 * and for ACPI by serial-multi-instantiate matching cases.</div><div class='add'>+	 */</div><div class='add'>+	if (strstr(dev_name(&amp;clt-&gt;dev), "CLSA0100"))</div><div class='add'>+		device_name = "CLSA0100";</div><div class='add'>+	else if (strstr(dev_name(&amp;clt-&gt;dev), "CLSA0101"))</div><div class='add'>+		device_name = "CLSA0101";</div><div class='add'>+	else if (strstr(dev_name(&amp;clt-&gt;dev), "CSC3551"))</div><div class='add'>+		device_name = "CSC3551";</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return cs35l41_hda_probe(&amp;clt-&gt;dev, device_name, clt-&gt;addr, clt-&gt;irq,</div><div class='add'>+				 devm_regmap_init_i2c(clt, &amp;cs35l41_regmap_i2c), I2C);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_i2c_remove(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	cs35l41_hda_remove(&amp;clt-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id cs35l41_hda_i2c_id[] = {</div><div class='add'>+	{ "cs35l41-hda" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id cs35l41_acpi_hda_match[] = {</div><div class='add'>+	{"CLSA0100", 0 },</div><div class='add'>+	{"CLSA0101", 0 },</div><div class='add'>+	{"CSC3551", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, cs35l41_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver cs35l41_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "cs35l41-hda",</div><div class='add'>+		.acpi_match_table = cs35l41_acpi_hda_match,</div><div class='add'>+		.pm		= &amp;cs35l41_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= cs35l41_hda_i2c_id,</div><div class='add'>+	.probe		= cs35l41_hda_i2c_probe,</div><div class='add'>+	.remove		= cs35l41_hda_i2c_remove,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(cs35l41_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA CS35L41 driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_CS35L41");</div><div class='add'>+MODULE_AUTHOR("Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_property.c b/sound/hda/codecs/side-codecs/cs35l41_hda_property.c<br/>new file mode 100644<br/>index 000000000000..16d5ea77192f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda_property.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda_property.c</a></div><div class='hunk'>@@ -0,0 +1,582 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// CS35L41 ALSA HDA Property driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2023 Cirrus Logic, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Stefan Binding &lt;sbinding@opensource.cirrus.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include "cs35l41_hda_property.h"</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#define MAX_AMPS 4</div><div class='add'>+</div><div class='add'>+struct cs35l41_config {</div><div class='add'>+	const char *ssid;</div><div class='add'>+	int num_amps;</div><div class='add'>+	enum {</div><div class='add'>+		INTERNAL,</div><div class='add'>+		EXTERNAL</div><div class='add'>+	} boost_type;</div><div class='add'>+	u8 channel[MAX_AMPS];</div><div class='add'>+	int reset_gpio_index; /* -1 if no reset gpio */</div><div class='add'>+	int spkid_gpio_index; /* -1 if no spkid gpio */</div><div class='add'>+	int cs_gpio_index; /* -1 if no cs gpio, or cs-gpios already exists, max num amps == 2 */</div><div class='add'>+	int boost_ind_nanohenry; /* Required if boost_type == Internal */</div><div class='add'>+	int boost_peak_milliamp; /* Required if boost_type == Internal */</div><div class='add'>+	int boost_cap_microfarad; /* Required if boost_type == Internal */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cs35l41_config cs35l41_config_table[] = {</div><div class='add'>+	{ "10251826", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "1025182C", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "10251844", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "10280B27", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10280B28", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10280BEB", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 },</div><div class='add'>+	{ "10280C4D", 4, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+/*</div><div class='add'>+ * Device 103C89C6 does have _DSD, however it is setup to use the wrong boost type.</div><div class='add'>+ * We can override the _DSD to correct the boost type here.</div><div class='add'>+ * Since this laptop has valid ACPI, we do not need to handle cs-gpios, since that already exists</div><div class='add'>+ * in the ACPI. The Reset GPIO is also valid, so we can use the Reset defined in _DSD.</div><div class='add'>+ */</div><div class='add'>+	{ "103C89C6", 2, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, 0, 0 }, -1, -1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "103C8A28", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A29", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A2A", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A2B", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A2C", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A2D", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A2E", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A30", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A31", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8A6E", 4, EXTERNAL, { CS35L41_LEFT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_RIGHT }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "103C8BB3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BB4", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BDD", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BDE", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BDF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE0", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE1", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE2", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE5", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE6", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE7", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE8", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8BE9", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8B3A", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8C15", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4000, 24 },</div><div class='add'>+	{ "103C8C16", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4000, 24 },</div><div class='add'>+	{ "103C8C17", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4000, 24 },</div><div class='add'>+	{ "103C8C4D", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8C4E", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8C4F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8C50", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8C51", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8CDD", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4100, 24 },</div><div class='add'>+	{ "103C8CDE", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 3900, 24 },</div><div class='add'>+	{ "104312AF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431433", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431463", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431473", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431483", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431493", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "104314D3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "104314E3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431503", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431533", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431573", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431663", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431683", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "104316A3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "104316D3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "104316F3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "104317F3", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431863", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "104318D3", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "10431A83", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431B93", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431C9F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431CAF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431CCF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431CDF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431CEF", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10431D1F", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431DA2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "10431E02", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "10431E12", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "10431EE2", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "10431F12", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "10431F1F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 },</div><div class='add'>+	{ "10431F62", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },</div><div class='add'>+	{ "10433A20", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10433A30", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10433A40", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10433A50", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "10433A60", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },</div><div class='add'>+	{ "17AA3865", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA3866", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA386E", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA386F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA3877", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA3878", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38A9", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38AB", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38B4", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38B5", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38B6", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38B7", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38C7", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "17AA38C8", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "17AA38F9", 2, EXTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, 0, 0 }, 0, 2, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA38FA", 2, EXTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, 0, 0 }, 0, 2, -1, 0, 0, 0 },</div><div class='add'>+	{ "17AA3929", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },</div><div class='add'>+	{ "17AA392B", 4, INTERNAL, { CS35L41_RIGHT, CS35L41_LEFT, CS35L41_RIGHT, CS35L41_LEFT }, 0, 2, -1, 1000, 4500, 24 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l41_add_gpios(struct cs35l41_hda *cs35l41, struct device *physdev, int reset_gpio,</div><div class='add'>+			     int spkid_gpio, int cs_gpio_index, int num_amps)</div><div class='add'>+{</div><div class='add'>+	struct acpi_gpio_mapping *gpio_mapping = NULL;</div><div class='add'>+	struct acpi_gpio_params *reset_gpio_params = NULL;</div><div class='add'>+	struct acpi_gpio_params *spkid_gpio_params = NULL;</div><div class='add'>+	struct acpi_gpio_params *cs_gpio_params = NULL;</div><div class='add'>+	unsigned int num_entries = 0;</div><div class='add'>+	unsigned int reset_index, spkid_index, csgpio_index;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * GPIO Mapping only needs to be done once, since it would be available for subsequent amps</div><div class='add'>+	 */</div><div class='add'>+	if (cs35l41-&gt;dacpi-&gt;driver_gpios)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (reset_gpio &gt;= 0) {</div><div class='add'>+		reset_index = num_entries;</div><div class='add'>+		num_entries++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spkid_gpio &gt;= 0) {</div><div class='add'>+		spkid_index = num_entries;</div><div class='add'>+		num_entries++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cs_gpio_index &gt;= 0)  &amp;&amp; (num_amps == 2)) {</div><div class='add'>+		csgpio_index = num_entries;</div><div class='add'>+		num_entries++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!num_entries)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* must include termination entry */</div><div class='add'>+	num_entries++;</div><div class='add'>+</div><div class='add'>+	gpio_mapping = devm_kcalloc(physdev, num_entries, sizeof(struct acpi_gpio_mapping),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!gpio_mapping)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (reset_gpio &gt;= 0) {</div><div class='add'>+		gpio_mapping[reset_index].name = "reset-gpios";</div><div class='add'>+		reset_gpio_params = devm_kcalloc(physdev, num_amps, sizeof(struct acpi_gpio_params),</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+		if (!reset_gpio_params)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_amps; i++)</div><div class='add'>+			reset_gpio_params[i].crs_entry_index = reset_gpio;</div><div class='add'>+</div><div class='add'>+		gpio_mapping[reset_index].data = reset_gpio_params;</div><div class='add'>+		gpio_mapping[reset_index].size = num_amps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spkid_gpio &gt;= 0) {</div><div class='add'>+		gpio_mapping[spkid_index].name = "spk-id-gpios";</div><div class='add'>+		spkid_gpio_params = devm_kcalloc(physdev, num_amps, sizeof(struct acpi_gpio_params),</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+		if (!spkid_gpio_params)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_amps; i++)</div><div class='add'>+			spkid_gpio_params[i].crs_entry_index = spkid_gpio;</div><div class='add'>+</div><div class='add'>+		gpio_mapping[spkid_index].data = spkid_gpio_params;</div><div class='add'>+		gpio_mapping[spkid_index].size = num_amps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cs_gpio_index &gt;= 0) &amp;&amp; (num_amps == 2)) {</div><div class='add'>+		gpio_mapping[csgpio_index].name = "cs-gpios";</div><div class='add'>+		/* only one GPIO CS is supported without using _DSD, obtained using index 0 */</div><div class='add'>+		cs_gpio_params = devm_kzalloc(physdev, sizeof(struct acpi_gpio_params), GFP_KERNEL);</div><div class='add'>+		if (!cs_gpio_params)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		cs_gpio_params-&gt;crs_entry_index = cs_gpio_index;</div><div class='add'>+</div><div class='add'>+		gpio_mapping[csgpio_index].data = cs_gpio_params;</div><div class='add'>+		gpio_mapping[csgpio_index].size = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return devm_acpi_dev_add_driver_gpios(physdev, gpio_mapping);</div><div class='add'>+err:</div><div class='add'>+	devm_kfree(physdev, gpio_mapping);</div><div class='add'>+	devm_kfree(physdev, reset_gpio_params);</div><div class='add'>+	devm_kfree(physdev, spkid_gpio_params);</div><div class='add'>+	devm_kfree(physdev, cs_gpio_params);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int generic_dsd_config(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+			      const char *hid)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hw_cfg *hw_cfg = &amp;cs35l41-&gt;hw_cfg;</div><div class='add'>+	const struct cs35l41_config *cfg;</div><div class='add'>+	struct gpio_desc *cs_gpiod;</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	bool dsd_found;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (cfg = cs35l41_config_table; cfg-&gt;ssid; cfg++) {</div><div class='add'>+		if (!strcasecmp(cfg-&gt;ssid, cs35l41-&gt;acpi_subsystem_id))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cfg-&gt;ssid)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (!cs35l41-&gt;dacpi || cs35l41-&gt;dacpi != ACPI_COMPANION(physdev)) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "ACPI Device does not match, cannot override _DSD.\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l41-&gt;dev, "Adding DSD properties for %s\n", cs35l41-&gt;acpi_subsystem_id);</div><div class='add'>+</div><div class='add'>+	dsd_found = acpi_dev_has_props(cs35l41-&gt;dacpi);</div><div class='add'>+</div><div class='add'>+	if (!dsd_found) {</div><div class='add'>+		ret = cs35l41_add_gpios(cs35l41, physdev, cfg-&gt;reset_gpio_index,</div><div class='add'>+						 cfg-&gt;spkid_gpio_index, cfg-&gt;cs_gpio_index,</div><div class='add'>+						 cfg-&gt;num_amps);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(cs35l41-&gt;dev, "Error adding GPIO mapping: %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	} else if (cfg-&gt;reset_gpio_index &gt;= 0 || cfg-&gt;spkid_gpio_index &gt;= 0) {</div><div class='add'>+		dev_warn(cs35l41-&gt;dev, "Cannot add Reset/Speaker ID/SPI CS GPIO Mapping, "</div><div class='add'>+			 "_DSD already exists.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cs35l41-&gt;control_bus == SPI) {</div><div class='add'>+		cs35l41-&gt;index = id;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Manually set the Chip Select for the second amp &lt;cs_gpio_index&gt; in the node.</div><div class='add'>+		 * This is only supported for systems with 2 amps, since we cannot expand the</div><div class='add'>+		 * default number of chip selects without using cs-gpios</div><div class='add'>+		 * The CS GPIO must be set high prior to communicating with the first amp (which</div><div class='add'>+		 * uses a native chip select), to ensure the second amp does not clash with the</div><div class='add'>+		 * first.</div><div class='add'>+		 */</div><div class='add'>+		if (IS_ENABLED(CONFIG_SPI) &amp;&amp; cfg-&gt;cs_gpio_index &gt;= 0) {</div><div class='add'>+			spi = to_spi_device(cs35l41-&gt;dev);</div><div class='add'>+</div><div class='add'>+			if (cfg-&gt;num_amps != 2) {</div><div class='add'>+				dev_warn(cs35l41-&gt;dev,</div><div class='add'>+					 "Cannot update SPI CS, Number of Amps (%d) != 2\n",</div><div class='add'>+					 cfg-&gt;num_amps);</div><div class='add'>+			} else if (dsd_found) {</div><div class='add'>+				dev_warn(cs35l41-&gt;dev,</div><div class='add'>+					"Cannot update SPI CS, _DSD already exists.\n");</div><div class='add'>+			} else {</div><div class='add'>+				/*</div><div class='add'>+				 * This is obtained using driver_gpios, since only one GPIO for CS</div><div class='add'>+				 * exists, this can be obtained using index 0.</div><div class='add'>+				 */</div><div class='add'>+				cs_gpiod = gpiod_get_index(physdev, "cs", 0, GPIOD_OUT_LOW);</div><div class='add'>+				if (IS_ERR(cs_gpiod)) {</div><div class='add'>+					dev_err(cs35l41-&gt;dev,</div><div class='add'>+						"Unable to get Chip Select GPIO descriptor\n");</div><div class='add'>+					return PTR_ERR(cs_gpiod);</div><div class='add'>+				}</div><div class='add'>+				if (id == 1) {</div><div class='add'>+					spi_set_csgpiod(spi, 0, cs_gpiod);</div><div class='add'>+					cs35l41-&gt;cs_gpio = cs_gpiod;</div><div class='add'>+				} else {</div><div class='add'>+					gpiod_set_value_cansleep(cs_gpiod, true);</div><div class='add'>+					gpiod_put(cs_gpiod);</div><div class='add'>+				}</div><div class='add'>+				spi_setup(spi);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (cfg-&gt;num_amps &gt; 2)</div><div class='add'>+			/*</div><div class='add'>+			 * i2c addresses for 3/4 amps are used in order: 0x40, 0x41, 0x42, 0x43,</div><div class='add'>+			 * subtracting 0x40 would give zero-based index</div><div class='add'>+			 */</div><div class='add'>+			cs35l41-&gt;index = id - 0x40;</div><div class='add'>+		else</div><div class='add'>+			/* i2c addr 0x40 for first amp (always), 0x41/0x42 for 2nd amp */</div><div class='add'>+			cs35l41-&gt;index = id == 0x40 ? 0 : 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;reset_gpio = fwnode_gpiod_get_index(acpi_fwnode_handle(cs35l41-&gt;dacpi), "reset",</div><div class='add'>+						     cs35l41-&gt;index, GPIOD_OUT_LOW,</div><div class='add'>+						     "cs35l41-reset");</div><div class='add'>+	cs35l41-&gt;speaker_id = cs35l41_get_speaker_id(physdev, cs35l41-&gt;index, cfg-&gt;num_amps, -1);</div><div class='add'>+</div><div class='add'>+	hw_cfg-&gt;spk_pos = cfg-&gt;channel[cs35l41-&gt;index];</div><div class='add'>+</div><div class='add'>+	cs35l41-&gt;channel_index = 0;</div><div class='add'>+	for (i = 0; i &lt; cs35l41-&gt;index; i++)</div><div class='add'>+		if (cfg-&gt;channel[i] == hw_cfg-&gt;spk_pos)</div><div class='add'>+			cs35l41-&gt;channel_index++;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;boost_type == INTERNAL) {</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_INT_BOOST;</div><div class='add'>+		hw_cfg-&gt;bst_ind = cfg-&gt;boost_ind_nanohenry;</div><div class='add'>+		hw_cfg-&gt;bst_ipk = cfg-&gt;boost_peak_milliamp;</div><div class='add'>+		hw_cfg-&gt;bst_cap = cfg-&gt;boost_cap_microfarad;</div><div class='add'>+		hw_cfg-&gt;gpio1.func = CS35L41_NOT_USED;</div><div class='add'>+		hw_cfg-&gt;gpio1.valid = true;</div><div class='add'>+	} else {</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_EXT_BOOST;</div><div class='add'>+		hw_cfg-&gt;bst_ind = -1;</div><div class='add'>+		hw_cfg-&gt;bst_ipk = -1;</div><div class='add'>+		hw_cfg-&gt;bst_cap = -1;</div><div class='add'>+		hw_cfg-&gt;gpio1.func = CS35l41_VSPK_SWITCH;</div><div class='add'>+		hw_cfg-&gt;gpio1.valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_cfg-&gt;gpio2.func = CS35L41_INTERRUPT;</div><div class='add'>+	hw_cfg-&gt;gpio2.valid = true;</div><div class='add'>+	hw_cfg-&gt;valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Systems 103C8C66, 103C8C67, 103C8C68, 103C8C6A use a dual speaker id system - each speaker has</div><div class='add'>+ * its own speaker id.</div><div class='add'>+ */</div><div class='add'>+static int hp_i2c_int_2amp_dual_spkid(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+				      const char *hid)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hw_cfg *hw_cfg = &amp;cs35l41-&gt;hw_cfg;</div><div class='add'>+</div><div class='add'>+	/* If _DSD exists for this laptop, we cannot support it through here */</div><div class='add'>+	if (acpi_dev_has_props(cs35l41-&gt;dacpi))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	/* check I2C address to assign the index */</div><div class='add'>+	cs35l41-&gt;index = id == 0x40 ? 0 : 1;</div><div class='add'>+	cs35l41-&gt;channel_index = 0;</div><div class='add'>+	cs35l41-&gt;reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);</div><div class='add'>+	if (cs35l41-&gt;index == 0)</div><div class='add'>+		cs35l41-&gt;speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 1);</div><div class='add'>+	else</div><div class='add'>+		cs35l41-&gt;speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 2);</div><div class='add'>+	hw_cfg-&gt;spk_pos = cs35l41-&gt;index;</div><div class='add'>+	hw_cfg-&gt;gpio2.func = CS35L41_INTERRUPT;</div><div class='add'>+	hw_cfg-&gt;gpio2.valid = true;</div><div class='add'>+	hw_cfg-&gt;valid = true;</div><div class='add'>+</div><div class='add'>+	hw_cfg-&gt;bst_type = CS35L41_INT_BOOST;</div><div class='add'>+	hw_cfg-&gt;bst_ind = 1000;</div><div class='add'>+	hw_cfg-&gt;bst_ipk = 4100;</div><div class='add'>+	hw_cfg-&gt;bst_cap = 24;</div><div class='add'>+	hw_cfg-&gt;gpio1.func = CS35L41_NOT_USED;</div><div class='add'>+	hw_cfg-&gt;gpio1.valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Device CLSA010(0/1) doesn't have _DSD so a gpiod_get by the label reset won't work.</div><div class='add'>+ * And devices created by serial-multi-instantiate don't have their device struct</div><div class='add'>+ * pointing to the correct fwnode, so acpi_dev must be used here.</div><div class='add'>+ * And devm functions expect that the device requesting the resource has the correct</div><div class='add'>+ * fwnode.</div><div class='add'>+ */</div><div class='add'>+static int lenovo_legion_no_acpi(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+				 const char *hid)</div><div class='add'>+{</div><div class='add'>+	struct cs35l41_hw_cfg *hw_cfg = &amp;cs35l41-&gt;hw_cfg;</div><div class='add'>+</div><div class='add'>+	/* check I2C address to assign the index */</div><div class='add'>+	cs35l41-&gt;index = id == 0x40 ? 0 : 1;</div><div class='add'>+	cs35l41-&gt;channel_index = 0;</div><div class='add'>+	cs35l41-&gt;reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);</div><div class='add'>+	cs35l41-&gt;speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 2);</div><div class='add'>+	hw_cfg-&gt;spk_pos = cs35l41-&gt;index;</div><div class='add'>+	hw_cfg-&gt;gpio2.func = CS35L41_INTERRUPT;</div><div class='add'>+	hw_cfg-&gt;gpio2.valid = true;</div><div class='add'>+	hw_cfg-&gt;valid = true;</div><div class='add'>+</div><div class='add'>+	if (strcmp(hid, "CLSA0100") == 0) {</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH;</div><div class='add'>+	} else if (strcmp(hid, "CLSA0101") == 0) {</div><div class='add'>+		hw_cfg-&gt;bst_type = CS35L41_EXT_BOOST;</div><div class='add'>+		hw_cfg-&gt;gpio1.func = CS35l41_VSPK_SWITCH;</div><div class='add'>+		hw_cfg-&gt;gpio1.valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int missing_speaker_id_gpio2(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+				    const char *hid)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l41_add_gpios(cs35l41, physdev, -1, 2, -1, 2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l41-&gt;dev, "Error adding GPIO mapping: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cs35l41_hda_parse_acpi(cs35l41, physdev, id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct cs35l41_prop_model {</div><div class='add'>+	const char *hid;</div><div class='add'>+	const char *ssid;</div><div class='add'>+	int (*add_prop)(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+			const char *hid);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct cs35l41_prop_model cs35l41_prop_model_table[] = {</div><div class='add'>+	{ "CLSA0100", NULL, lenovo_legion_no_acpi },</div><div class='add'>+	{ "CLSA0101", NULL, lenovo_legion_no_acpi },</div><div class='add'>+	{ "CSC3551", "10251826", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "1025182C", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10251844", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10280B27", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10280B28", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10280BEB", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10280C4D", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C89C6", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A28", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A29", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A2A", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A2B", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A2C", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A2D", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A2E", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A30", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A31", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8A6E", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BB3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BB4", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BDD", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BDE", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BDF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE0", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE1", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE2", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE5", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE6", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE7", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE8", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8BE9", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8B3A", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C15", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C16", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C17", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C4D", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C4E", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C4F", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C50", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C51", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8C66", hp_i2c_int_2amp_dual_spkid },</div><div class='add'>+	{ "CSC3551", "103C8C67", hp_i2c_int_2amp_dual_spkid },</div><div class='add'>+	{ "CSC3551", "103C8C68", hp_i2c_int_2amp_dual_spkid },</div><div class='add'>+	{ "CSC3551", "103C8C6A", hp_i2c_int_2amp_dual_spkid },</div><div class='add'>+	{ "CSC3551", "103C8CDD", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "103C8CDE", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104312AF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431433", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431463", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431473", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431483", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431493", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104314D3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104314E3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431503", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431533", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431573", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431663", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431683", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104316A3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104316D3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104316F3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104317F3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431863", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "104318D3", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431A63", missing_speaker_id_gpio2 },</div><div class='add'>+	{ "CSC3551", "10431A83", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431B93", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431C9F", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431CAF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431CCF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431CDF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431CEF", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431D1F", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431DA2", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431E02", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431E12", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431EE2", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431F12", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431F1F", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10431F62", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10433A20", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10433A30", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10433A40", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10433A50", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "10433A60", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA3865", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA3866", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA386E", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA386F", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA3877", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA3878", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38A9", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38AB", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38B4", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38B5", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38B6", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38B7", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38C7", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38C8", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38F9", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA38FA", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA3929", generic_dsd_config },</div><div class='add'>+	{ "CSC3551", "17AA392B", generic_dsd_config },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cs35l41_add_dsd_properties(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+			       const char *hid)</div><div class='add'>+{</div><div class='add'>+	const struct cs35l41_prop_model *model;</div><div class='add'>+</div><div class='add'>+	for (model = cs35l41_prop_model_table; model-&gt;hid; model++) {</div><div class='add'>+		if (!strcmp(model-&gt;hid, hid) &amp;&amp;</div><div class='add'>+		    (!model-&gt;ssid ||</div><div class='add'>+		     (cs35l41-&gt;acpi_subsystem_id &amp;&amp;</div><div class='add'>+		      !strcasecmp(model-&gt;ssid, cs35l41-&gt;acpi_subsystem_id))))</div><div class='add'>+			return model-&gt;add_prop(cs35l41, physdev, id, hid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_property.h b/sound/hda/codecs/side-codecs/cs35l41_hda_property.h<br/>new file mode 100644<br/>index 000000000000..fd834042e2fd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda_property.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda_property.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * CS35L41 ALSA HDA Property driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2023 Cirrus Logic, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Author: Stefan Binding &lt;sbinding@opensource.cirrus.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef CS35L41_HDA_PROP_H</div><div class='add'>+#define CS35L41_HDA_PROP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include "cs35l41_hda.h"</div><div class='add'>+</div><div class='add'>+int cs35l41_add_dsd_properties(struct cs35l41_hda *cs35l41, struct device *physdev, int id,</div><div class='add'>+			       const char *hid);</div><div class='add'>+#endif /* CS35L41_HDA_PROP_H */</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c b/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c<br/>new file mode 100644<br/>index 000000000000..2acbaf8467a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l41_hda_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l41_hda_spi.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// CS35l41 HDA SPI driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2021 Cirrus Logic, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cs35l41_hda.h"</div><div class='add'>+</div><div class='add'>+static int cs35l41_hda_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const char *device_name;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Compare against the device name so it works for SPI, normal ACPI</div><div class='add'>+	 * and for ACPI by serial-multi-instantiate matching cases.</div><div class='add'>+	 */</div><div class='add'>+	if (strstr(dev_name(&amp;spi-&gt;dev), "CSC3551"))</div><div class='add'>+		device_name = "CSC3551";</div><div class='add'>+	else</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return cs35l41_hda_probe(&amp;spi-&gt;dev, device_name, spi_get_chipselect(spi, 0), spi-&gt;irq,</div><div class='add'>+				 devm_regmap_init_spi(spi, &amp;cs35l41_regmap_spi), SPI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l41_hda_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	cs35l41_hda_remove(&amp;spi-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id cs35l41_hda_spi_id[] = {</div><div class='add'>+	{ "cs35l41-hda", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, cs35l41_hda_spi_id);</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id cs35l41_acpi_hda_match[] = {</div><div class='add'>+	{ "CSC3551", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, cs35l41_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver cs35l41_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "cs35l41-hda",</div><div class='add'>+		.acpi_match_table = cs35l41_acpi_hda_match,</div><div class='add'>+		.pm		= &amp;cs35l41_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= cs35l41_hda_spi_id,</div><div class='add'>+	.probe		= cs35l41_hda_spi_probe,</div><div class='add'>+	.remove		= cs35l41_hda_spi_remove,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(cs35l41_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA CS35L41 driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_CS35L41");</div><div class='add'>+MODULE_AUTHOR("Lucas Tanure &lt;tanureal@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l56_hda.c b/sound/hda/codecs/side-codecs/cs35l56_hda.c<br/>new file mode 100644<br/>index 000000000000..f7ba92e11957<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l56_hda.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l56_hda.c</a></div><div class='hunk'>@@ -0,0 +1,1286 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// HDA audio driver for Cirrus Logic CS35L56 smart amp</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+//                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/cs-amp-lib.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include "cirrus_scodec.h"</div><div class='add'>+#include "cs35l56_hda.h"</div><div class='add'>+#include "hda_component.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+</div><div class='add'>+ /*</div><div class='add'>+  * The cs35l56_hda_dai_config[] reg sequence configures the device as</div><div class='add'>+  *  ASP1_BCLK_FREQ = 3.072 MHz</div><div class='add'>+  *  ASP1_RX_WIDTH = 32 cycles per slot, ASP1_TX_WIDTH = 32 cycles per slot, ASP1_FMT = I2S</div><div class='add'>+  *  ASP1_DOUT_HIZ_CONTROL = Hi-Z during unused timeslots</div><div class='add'>+  *  ASP1_RX_WL = 24 bits per sample</div><div class='add'>+  *  ASP1_TX_WL = 24 bits per sample</div><div class='add'>+  *  ASP1_RXn_EN 1..3 and ASP1_TXn_EN 1..4 disabled</div><div class='add'>+  *</div><div class='add'>+  * Override any Windows-specific mixer settings applied by the firmware.</div><div class='add'>+  */</div><div class='add'>+static const struct reg_sequence cs35l56_hda_dai_config[] = {</div><div class='add'>+	{ CS35L56_ASP1_CONTROL1,	0x00000021 },</div><div class='add'>+	{ CS35L56_ASP1_CONTROL2,	0x20200200 },</div><div class='add'>+	{ CS35L56_ASP1_CONTROL3,	0x00000003 },</div><div class='add'>+	{ CS35L56_ASP1_FRAME_CONTROL1,	0x03020100 },</div><div class='add'>+	{ CS35L56_ASP1_FRAME_CONTROL5,	0x00020100 },</div><div class='add'>+	{ CS35L56_ASP1_DATA_CONTROL5,	0x00000018 },</div><div class='add'>+	{ CS35L56_ASP1_DATA_CONTROL1,	0x00000018 },</div><div class='add'>+	{ CS35L56_ASP1_ENABLES1,	0x00000000 },</div><div class='add'>+	{ CS35L56_ASP1TX1_INPUT,	0x00000018 },</div><div class='add'>+	{ CS35L56_ASP1TX2_INPUT,	0x00000019 },</div><div class='add'>+	{ CS35L56_ASP1TX3_INPUT,	0x00000020 },</div><div class='add'>+	{ CS35L56_ASP1TX4_INPUT,	0x00000028 },</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_wait_dsp_ready(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	/* Wait for patching to complete */</div><div class='add'>+	flush_work(&amp;cs35l56-&gt;dsp_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_play(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(cs35l56-&gt;base.dev);</div><div class='add'>+	ret = cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_AUDIO_PLAY);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		/* Wait for firmware to enter PS0 power state */</div><div class='add'>+		ret = regmap_read_poll_timeout(cs35l56-&gt;base.regmap,</div><div class='add'>+					       cs35l56-&gt;base.fw_reg-&gt;transducer_actual_ps,</div><div class='add'>+					       val, (val == CS35L56_PS0),</div><div class='add'>+					       CS35L56_PS0_POLL_US,</div><div class='add'>+					       CS35L56_PS0_TIMEOUT_US);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_warn(cs35l56-&gt;base.dev, "PS0 wait failed: %d\n", ret);</div><div class='add'>+	}</div><div class='add'>+	regmap_set_bits(cs35l56-&gt;base.regmap, CS35L56_ASP1_ENABLES1,</div><div class='add'>+			BIT(CS35L56_ASP_RX1_EN_SHIFT) | BIT(CS35L56_ASP_RX2_EN_SHIFT) |</div><div class='add'>+			cs35l56-&gt;asp_tx_mask);</div><div class='add'>+	cs35l56-&gt;playing = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_pause(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	cs35l56-&gt;playing = false;</div><div class='add'>+	cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_AUDIO_PAUSE);</div><div class='add'>+	regmap_clear_bits(cs35l56-&gt;base.regmap, CS35L56_ASP1_ENABLES1,</div><div class='add'>+			  BIT(CS35L56_ASP_RX1_EN_SHIFT) | BIT(CS35L56_ASP_RX2_EN_SHIFT) |</div><div class='add'>+			  BIT(CS35L56_ASP_TX1_EN_SHIFT) | BIT(CS35L56_ASP_TX2_EN_SHIFT) |</div><div class='add'>+			  BIT(CS35L56_ASP_TX3_EN_SHIFT) | BIT(CS35L56_ASP_TX4_EN_SHIFT));</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(cs35l56-&gt;base.dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l56-&gt;base.dev, "%s()%d: action: %d\n", __func__, __LINE__, action);</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_PREPARE:</div><div class='add'>+		if (cs35l56-&gt;playing)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* If we're suspended: flag that resume should start playback */</div><div class='add'>+		if (cs35l56-&gt;suspended) {</div><div class='add'>+			cs35l56-&gt;playing = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cs35l56_hda_play(cs35l56);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLEANUP:</div><div class='add'>+		if (!cs35l56-&gt;playing)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cs35l56_hda_pause(cs35l56);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;cs_dsp.booted)</div><div class='add'>+		cs_dsp_stop(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+	return cs35l56_runtime_suspend_common(&amp;cs35l56-&gt;base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_runtime_resume_common(&amp;cs35l56-&gt;base, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;cs_dsp.booted) {</div><div class='add'>+		ret = cs_dsp_run(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_dbg(cs35l56-&gt;base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_ALLOW_AUTO_HIBERNATE);</div><div class='add'>+	regmap_write(cs35l56-&gt;base.regmap, CS35L56_DSP_VIRTUAL1_MBOX_1,</div><div class='add'>+		     CS35L56_MBOX_CMD_HIBERNATE_NOW);</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l56-&gt;base.regmap, true);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_mixer_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = CS35L56_NUM_INPUT_SRC;</div><div class='add'>+	if (uinfo-&gt;value.enumerated.item &gt;= CS35L56_NUM_INPUT_SRC)</div><div class='add'>+		uinfo-&gt;value.enumerated.item = CS35L56_NUM_INPUT_SRC - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, cs35l56_tx_input_texts[uinfo-&gt;value.enumerated.item],</div><div class='add'>+		sizeof(uinfo-&gt;value.enumerated.name));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_mixer_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int reg_val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	regmap_read(cs35l56-&gt;base.regmap, kcontrol-&gt;private_value, &amp;reg_val);</div><div class='add'>+	reg_val &amp;= CS35L56_ASP_TXn_SRC_MASK;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CS35L56_NUM_INPUT_SRC; ++i) {</div><div class='add'>+		if (cs35l56_tx_input_values[i] == reg_val) {</div><div class='add'>+			ucontrol-&gt;value.enumerated.item[0] = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_mixer_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int item = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	bool changed;</div><div class='add'>+</div><div class='add'>+	if (item &gt;= CS35L56_NUM_INPUT_SRC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits_check(cs35l56-&gt;base.regmap, kcontrol-&gt;private_value,</div><div class='add'>+				 CS35L56_INPUT_MASK, cs35l56_tx_input_values[item],</div><div class='add'>+				 &amp;changed);</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_posture_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = CS35L56_MAIN_POSTURE_MIN;</div><div class='add'>+	uinfo-&gt;value.integer.max = CS35L56_MAIN_POSTURE_MAX;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_posture_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int pos;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l56-&gt;base.regmap,</div><div class='add'>+			  cs35l56-&gt;base.fw_reg-&gt;posture_number, &amp;pos);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = pos;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_posture_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned long pos = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	bool changed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((pos &lt; CS35L56_MAIN_POSTURE_MIN) ||</div><div class='add'>+	    (pos &gt; CS35L56_MAIN_POSTURE_MAX))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits_check(cs35l56-&gt;base.regmap, cs35l56-&gt;base.fw_reg-&gt;posture_number,</div><div class='add'>+				       CS35L56_MAIN_POSTURE_MASK, pos, &amp;changed);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int reg;</div><div class='add'>+} cs35l56_hda_mixer_controls[] = {</div><div class='add'>+	{ "ASP1 TX1 Source", CS35L56_ASP1TX1_INPUT },</div><div class='add'>+	{ "ASP1 TX2 Source", CS35L56_ASP1TX2_INPUT },</div><div class='add'>+	{ "ASP1 TX3 Source", CS35L56_ASP1TX3_INPUT },</div><div class='add'>+	{ "ASP1 TX4 Source", CS35L56_ASP1TX4_INPUT },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(cs35l56_hda_vol_tlv, -10000, 25, 0);</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_vol_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.step = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = CS35L56_MAIN_RENDER_USER_VOLUME_MAX -</div><div class='add'>+				   CS35L56_MAIN_RENDER_USER_VOLUME_MIN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_vol_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int raw_vol;</div><div class='add'>+	int vol;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(cs35l56-&gt;base.regmap, cs35l56-&gt;base.fw_reg-&gt;user_volume, &amp;raw_vol);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	vol = (s16)(raw_vol &amp; 0xFFFF);</div><div class='add'>+	vol &gt;&gt;= CS35L56_MAIN_RENDER_USER_VOLUME_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (vol &amp; BIT(CS35L56_MAIN_RENDER_USER_VOLUME_SIGNBIT))</div><div class='add'>+		vol |= ~((int)(BIT(CS35L56_MAIN_RENDER_USER_VOLUME_SIGNBIT) - 1));</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = vol - CS35L56_MAIN_RENDER_USER_VOLUME_MIN;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_vol_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	long vol = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	unsigned int raw_vol;</div><div class='add'>+	bool changed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if ((vol &lt; 0) || (vol &gt; (CS35L56_MAIN_RENDER_USER_VOLUME_MAX -</div><div class='add'>+				 CS35L56_MAIN_RENDER_USER_VOLUME_MIN)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	raw_vol = (vol + CS35L56_MAIN_RENDER_USER_VOLUME_MIN) &lt;&lt;</div><div class='add'>+		  CS35L56_MAIN_RENDER_USER_VOLUME_SHIFT;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits_check(cs35l56-&gt;base.regmap, cs35l56-&gt;base.fw_reg-&gt;user_volume,</div><div class='add'>+				       CS35L56_MAIN_RENDER_USER_VOLUME_MASK, raw_vol, &amp;changed);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_create_controls(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new ctl_template = {</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+		.info = cs35l56_hda_posture_info,</div><div class='add'>+		.get = cs35l56_hda_posture_get,</div><div class='add'>+		.put = cs35l56_hda_posture_put,</div><div class='add'>+	};</div><div class='add'>+	char name[64];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "%s Posture Number", cs35l56-&gt;amp_name);</div><div class='add'>+	ctl_template.name = name;</div><div class='add'>+	cs35l56-&gt;posture_ctl = snd_ctl_new1(&amp;ctl_template, cs35l56);</div><div class='add'>+	if (snd_ctl_add(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;posture_ctl))</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed to add KControl: %s\n", ctl_template.name);</div><div class='add'>+</div><div class='add'>+	/* Mixer controls */</div><div class='add'>+	ctl_template.info = cs35l56_hda_mixer_info;</div><div class='add'>+	ctl_template.get = cs35l56_hda_mixer_get;</div><div class='add'>+	ctl_template.put = cs35l56_hda_mixer_put;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(cs35l56-&gt;mixer_ctl) != ARRAY_SIZE(cs35l56_hda_mixer_controls));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cs35l56_hda_mixer_controls); ++i) {</div><div class='add'>+		snprintf(name, sizeof(name), "%s %s", cs35l56-&gt;amp_name,</div><div class='add'>+			 cs35l56_hda_mixer_controls[i].name);</div><div class='add'>+		ctl_template.private_value = cs35l56_hda_mixer_controls[i].reg;</div><div class='add'>+		cs35l56-&gt;mixer_ctl[i] = snd_ctl_new1(&amp;ctl_template, cs35l56);</div><div class='add'>+		if (snd_ctl_add(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;mixer_ctl[i])) {</div><div class='add'>+			dev_err(cs35l56-&gt;base.dev, "Failed to add KControl: %s\n",</div><div class='add'>+				ctl_template.name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctl_template.info = cs35l56_hda_vol_info;</div><div class='add'>+	ctl_template.get = cs35l56_hda_vol_get;</div><div class='add'>+	ctl_template.put = cs35l56_hda_vol_put;</div><div class='add'>+	ctl_template.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ);</div><div class='add'>+	ctl_template.tlv.p = cs35l56_hda_vol_tlv;</div><div class='add'>+	snprintf(name, sizeof(name), "%s Speaker Playback Volume", cs35l56-&gt;amp_name);</div><div class='add'>+	ctl_template.name = name;</div><div class='add'>+	cs35l56-&gt;volume_ctl = snd_ctl_new1(&amp;ctl_template, cs35l56);</div><div class='add'>+	if (snd_ctl_add(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;volume_ctl))</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed to add KControl: %s\n", ctl_template.name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_remove_controls(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ARRAY_SIZE(cs35l56-&gt;mixer_ctl) - 1; i &gt;= 0; i--)</div><div class='add'>+		snd_ctl_remove(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;mixer_ctl[i]);</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;posture_ctl);</div><div class='add'>+	snd_ctl_remove(cs35l56-&gt;codec-&gt;card, cs35l56-&gt;volume_ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cs_dsp_client_ops cs35l56_hda_client_ops = {</div><div class='add'>+	/* cs_dsp requires the client to provide this even if it is empty */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_request_firmware_file(struct cs35l56_hda *cs35l56,</div><div class='add'>+					     const struct firmware **firmware, char **filename,</div><div class='add'>+					     const char *base_name, const char *system_name,</div><div class='add'>+					     const char *amp_name,</div><div class='add'>+					     const char *filetype)</div><div class='add'>+{</div><div class='add'>+	char *s, c;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (system_name &amp;&amp; amp_name)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "%s-%s-%s.%s", base_name,</div><div class='add'>+				      system_name, amp_name, filetype);</div><div class='add'>+	else if (system_name)</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "%s-%s.%s", base_name,</div><div class='add'>+				      system_name, filetype);</div><div class='add'>+	else</div><div class='add'>+		*filename = kasprintf(GFP_KERNEL, "%s.%s", base_name, filetype);</div><div class='add'>+</div><div class='add'>+	if (!*filename)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure that filename is lower-case and any non alpha-numeric</div><div class='add'>+	 * characters except full stop and forward slash are replaced with</div><div class='add'>+	 * hyphens.</div><div class='add'>+	 */</div><div class='add'>+	s = *filename;</div><div class='add'>+	while (*s) {</div><div class='add'>+		c = *s;</div><div class='add'>+		if (isalnum(c))</div><div class='add'>+			*s = tolower(c);</div><div class='add'>+		else if (c != '.' &amp;&amp; c != '/')</div><div class='add'>+			*s = '-';</div><div class='add'>+		s++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = firmware_request_nowarn(firmware, *filename, cs35l56-&gt;base.dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "Failed to request '%s'\n", *filename);</div><div class='add'>+		kfree(*filename);</div><div class='add'>+		*filename = NULL;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l56-&gt;base.dev, "Found '%s'\n", *filename);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_request_firmware_files(struct cs35l56_hda *cs35l56,</div><div class='add'>+					       unsigned int preloaded_fw_ver,</div><div class='add'>+					       const struct firmware **wmfw_firmware,</div><div class='add'>+					       char **wmfw_filename,</div><div class='add'>+					       const struct firmware **coeff_firmware,</div><div class='add'>+					       char **coeff_filename)</div><div class='add'>+{</div><div class='add'>+	const char *system_name = cs35l56-&gt;system_name;</div><div class='add'>+	const char *amp_name = cs35l56-&gt;amp_name;</div><div class='add'>+	char base_name[37];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (preloaded_fw_ver) {</div><div class='add'>+		snprintf(base_name, sizeof(base_name),</div><div class='add'>+			 "cirrus/cs35l%02x-%02x%s-%06x-dsp1-misc",</div><div class='add'>+			 cs35l56-&gt;base.type,</div><div class='add'>+			 cs35l56-&gt;base.rev,</div><div class='add'>+			 cs35l56-&gt;base.secured ? "-s" : "",</div><div class='add'>+			 preloaded_fw_ver &amp; 0xffffff);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(base_name, sizeof(base_name),</div><div class='add'>+			 "cirrus/cs35l%02x-%02x%s-dsp1-misc",</div><div class='add'>+			 cs35l56-&gt;base.type,</div><div class='add'>+			 cs35l56-&gt;base.rev,</div><div class='add'>+			 cs35l56-&gt;base.secured ? "-s" : "");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (system_name &amp;&amp; amp_name) {</div><div class='add'>+		if (!cs35l56_hda_request_firmware_file(cs35l56, wmfw_firmware, wmfw_filename,</div><div class='add'>+						       base_name, system_name, amp_name, "wmfw")) {</div><div class='add'>+			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,</div><div class='add'>+							  base_name, system_name, amp_name, "bin");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (system_name) {</div><div class='add'>+		if (!cs35l56_hda_request_firmware_file(cs35l56, wmfw_firmware, wmfw_filename,</div><div class='add'>+						       base_name, system_name, NULL, "wmfw")) {</div><div class='add'>+			if (amp_name)</div><div class='add'>+				cs35l56_hda_request_firmware_file(cs35l56,</div><div class='add'>+								  coeff_firmware, coeff_filename,</div><div class='add'>+								  base_name, system_name,</div><div class='add'>+								  amp_name, "bin");</div><div class='add'>+			if (!*coeff_firmware)</div><div class='add'>+				cs35l56_hda_request_firmware_file(cs35l56,</div><div class='add'>+								  coeff_firmware, coeff_filename,</div><div class='add'>+								  base_name, system_name,</div><div class='add'>+								  NULL, "bin");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Check for system-specific bin files without wmfw before</div><div class='add'>+		 * falling back to generic firmware</div><div class='add'>+		 */</div><div class='add'>+		if (amp_name)</div><div class='add'>+			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,</div><div class='add'>+							  base_name, system_name, amp_name, "bin");</div><div class='add'>+		if (!*coeff_firmware)</div><div class='add'>+			cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,</div><div class='add'>+							  base_name, system_name, NULL, "bin");</div><div class='add'>+</div><div class='add'>+		if (*coeff_firmware)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hda_request_firmware_file(cs35l56, wmfw_firmware, wmfw_filename,</div><div class='add'>+						base_name, NULL, NULL, "wmfw");</div><div class='add'>+	if (!ret) {</div><div class='add'>+		cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,</div><div class='add'>+						  base_name, NULL, NULL, "bin");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!*coeff_firmware)</div><div class='add'>+		cs35l56_hda_request_firmware_file(cs35l56, coeff_firmware, coeff_filename,</div><div class='add'>+						  base_name, NULL, NULL, "bin");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_release_firmware_files(const struct firmware *wmfw_firmware,</div><div class='add'>+					       char *wmfw_filename,</div><div class='add'>+					       const struct firmware *coeff_firmware,</div><div class='add'>+					       char *coeff_filename)</div><div class='add'>+{</div><div class='add'>+	release_firmware(wmfw_firmware);</div><div class='add'>+	kfree(wmfw_filename);</div><div class='add'>+</div><div class='add'>+	release_firmware(coeff_firmware);</div><div class='add'>+	kfree(coeff_filename);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_apply_calibration(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!cs35l56-&gt;base.cal_data_valid || cs35l56-&gt;base.secured)</div><div class='add'>+		return -EACCES;</div><div class='add'>+</div><div class='add'>+	ret = cs_amp_write_cal_coeffs(&amp;cs35l56-&gt;cs_dsp,</div><div class='add'>+				      &amp;cs35l56_calibration_controls,</div><div class='add'>+				      &amp;cs35l56-&gt;base.cal_data);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_warn(cs35l56-&gt;base.dev, "Failed to write calibration: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l56-&gt;base.dev, "Calibration applied\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *coeff_firmware = NULL;</div><div class='add'>+	const struct firmware *wmfw_firmware = NULL;</div><div class='add'>+	char *coeff_filename = NULL;</div><div class='add'>+	char *wmfw_filename = NULL;</div><div class='add'>+	unsigned int preloaded_fw_ver;</div><div class='add'>+	bool firmware_missing;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Prepare for a new DSP power-up. If the DSP has had firmware</div><div class='add'>+	 * downloaded previously then it needs to be powered down so that it</div><div class='add'>+	 * can be updated.</div><div class='add'>+	 */</div><div class='add'>+	if (cs35l56-&gt;base.fw_patched)</div><div class='add'>+		cs_dsp_power_down(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.fw_patched = false;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(cs35l56-&gt;base.dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed to resume and get %d\n", ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The firmware can only be upgraded if it is currently running</div><div class='add'>+	 * from the built-in ROM. If not, the wmfw/bin must be for the</div><div class='add'>+	 * version of firmware that is running on the chip.</div><div class='add'>+	 */</div><div class='add'>+	ret = cs35l56_read_prot_status(&amp;cs35l56-&gt;base, &amp;firmware_missing, &amp;preloaded_fw_ver);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pm_put;</div><div class='add'>+</div><div class='add'>+	if (firmware_missing)</div><div class='add'>+		preloaded_fw_ver = 0;</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_request_firmware_files(cs35l56, preloaded_fw_ver,</div><div class='add'>+					   &amp;wmfw_firmware, &amp;wmfw_filename,</div><div class='add'>+					   &amp;coeff_firmware, &amp;coeff_filename);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the BIOS didn't patch the firmware a bin file is mandatory to</div><div class='add'>+	 * enable the ASP·</div><div class='add'>+	 */</div><div class='add'>+	if (!coeff_firmware &amp;&amp; firmware_missing) {</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, ".bin file required but not found\n");</div><div class='add'>+		goto err_fw_release;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cs35l56-&gt;base.irq_lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the firmware hasn't been patched it must be shutdown before</div><div class='add'>+	 * doing a full patch and reset afterwards. If it is already</div><div class='add'>+	 * running a patched version the firmware files only contain</div><div class='add'>+	 * tunings and we can use the lower cost reinit sequence instead.</div><div class='add'>+	 */</div><div class='add'>+	if (firmware_missing &amp;&amp; (wmfw_firmware || coeff_firmware)) {</div><div class='add'>+		ret = cs35l56_firmware_shutdown(&amp;cs35l56-&gt;base);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs_dsp_power_up(&amp;cs35l56-&gt;cs_dsp, wmfw_firmware, wmfw_filename,</div><div class='add'>+			      coeff_firmware, coeff_filename, "misc");</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "%s: cs_dsp_power_up ret %d\n", __func__, ret);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wmfw_filename)</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "Loaded WMFW Firmware: %s\n", wmfw_filename);</div><div class='add'>+</div><div class='add'>+	if (coeff_filename)</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "Loaded Coefficients: %s\n", coeff_filename);</div><div class='add'>+</div><div class='add'>+	/* If we downloaded firmware, reset the device and wait for it to boot */</div><div class='add'>+	if (firmware_missing &amp;&amp; (wmfw_firmware || coeff_firmware)) {</div><div class='add'>+		cs35l56_system_reset(&amp;cs35l56-&gt;base, false);</div><div class='add'>+		regcache_mark_dirty(cs35l56-&gt;base.regmap);</div><div class='add'>+		ret = cs35l56_wait_for_firmware_boot(&amp;cs35l56-&gt;base);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_powered_up;</div><div class='add'>+</div><div class='add'>+		regcache_cache_only(cs35l56-&gt;base.regmap, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable auto-hibernate so that runtime_pm has control */</div><div class='add'>+	ret = cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_PREVENT_AUTO_HIBERNATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_powered_up;</div><div class='add'>+</div><div class='add'>+	regcache_sync(cs35l56-&gt;base.regmap);</div><div class='add'>+</div><div class='add'>+	regmap_clear_bits(cs35l56-&gt;base.regmap,</div><div class='add'>+			  cs35l56-&gt;base.fw_reg-&gt;prot_sts,</div><div class='add'>+			  CS35L56_FIRMWARE_MISSING);</div><div class='add'>+	cs35l56-&gt;base.fw_patched = true;</div><div class='add'>+</div><div class='add'>+	ret = cs_dsp_run(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	/* Don't need to check return code, it's not fatal if this fails */</div><div class='add'>+	cs35l56_hda_apply_calibration(cs35l56);</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_AUDIO_REINIT);</div><div class='add'>+	if (ret)</div><div class='add'>+		cs_dsp_stop(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+	cs35l56_log_tuning(&amp;cs35l56-&gt;base, &amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+err_powered_up:</div><div class='add'>+	if (!cs35l56-&gt;base.fw_patched)</div><div class='add'>+		cs_dsp_power_down(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;cs35l56-&gt;base.irq_lock);</div><div class='add'>+err_fw_release:</div><div class='add'>+	cs35l56_hda_release_firmware_files(wmfw_firmware, wmfw_filename,</div><div class='add'>+					   coeff_firmware, coeff_filename);</div><div class='add'>+err_pm_put:</div><div class='add'>+	pm_runtime_put(cs35l56-&gt;base.dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_dsp_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = container_of(work, struct cs35l56_hda, dsp_work);</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_fw_load(cs35l56);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cs35l56_hda_debugfs_calibrate_write(struct file *file,</div><div class='add'>+						   const char __user *from,</div><div class='add'>+						   size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_base *cs35l56_base = file-&gt;private_data;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(cs35l56_base-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_calibrate_debugfs_write(cs35l56_base, from, count, ppos);</div><div class='add'>+	pm_runtime_autosuspend(cs35l56_base-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cs35l56_hda_debugfs_cal_temperature_write(struct file *file,</div><div class='add'>+							 const char __user *from,</div><div class='add'>+							 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_base *cs35l56_base = file-&gt;private_data;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(cs35l56_base-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_cal_ambient_debugfs_write(cs35l56_base, from, count, ppos);</div><div class='add'>+	pm_runtime_autosuspend(cs35l56_base-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cs35l56_hda_debugfs_cal_data_read(struct file *file,</div><div class='add'>+						 char __user *to,</div><div class='add'>+						 size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_base *cs35l56_base = file-&gt;private_data;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(cs35l56_base-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_cal_data_debugfs_read(cs35l56_base, to, count, ppos);</div><div class='add'>+	pm_runtime_autosuspend(cs35l56_base-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t cs35l56_hda_debugfs_cal_data_write(struct file *file,</div><div class='add'>+						  const char __user *from,</div><div class='add'>+						  size_t count, loff_t *ppos)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_base *cs35l56_base = file-&gt;private_data;</div><div class='add'>+	struct cs35l56_hda *cs35l56 = cs35l56_hda_from_base(cs35l56_base);</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_cal_data_debugfs_write(cs35l56_base, from, count, ppos);</div><div class='add'>+	if (ret == -ENODATA)</div><div class='add'>+		return count;	/* Ignore writes of empty cal blobs */</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(cs35l56_base-&gt;dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hda_apply_calibration(cs35l56);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_AUDIO_REINIT);</div><div class='add'>+	else</div><div class='add'>+		count = -EIO;</div><div class='add'>+</div><div class='add'>+	pm_runtime_autosuspend(cs35l56_base-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct cs35l56_cal_debugfs_fops cs35l56_hda_cal_debugfs_fops = {</div><div class='add'>+	.calibrate = {</div><div class='add'>+		.write = cs35l56_hda_debugfs_calibrate_write,</div><div class='add'>+	},</div><div class='add'>+	.cal_temperature = {</div><div class='add'>+		.write = cs35l56_hda_debugfs_cal_temperature_write,</div><div class='add'>+	},</div><div class='add'>+	.cal_data = {</div><div class='add'>+		.read = cs35l56_hda_debugfs_cal_data_read,</div><div class='add'>+		.write = cs35l56_hda_debugfs_cal_data_write,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_bind(struct device *dev, struct device *master, void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, cs35l56-&gt;index);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;dev)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	comp-&gt;dev = dev;</div><div class='add'>+	cs35l56-&gt;codec = parent-&gt;codec;</div><div class='add'>+	strscpy(comp-&gt;name, dev_name(dev), sizeof(comp-&gt;name));</div><div class='add'>+	comp-&gt;playback_hook = cs35l56_hda_playback_hook;</div><div class='add'>+</div><div class='add'>+	queue_work(system_long_wq, &amp;cs35l56-&gt;dsp_work);</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_create_controls(cs35l56);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_DEBUG)</div><div class='add'>+	cs35l56-&gt;debugfs_root = debugfs_create_dir(dev_name(cs35l56-&gt;base.dev), sound_debugfs_root);</div><div class='add'>+	cs_dsp_init_debugfs(&amp;cs35l56-&gt;cs_dsp, cs35l56-&gt;debugfs_root);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_SND_HDA_SCODEC_CS35L56_CAL_DEBUGFS))</div><div class='add'>+		cs35l56_create_cal_debugfs(&amp;cs35l56-&gt;base, &amp;cs35l56_hda_cal_debugfs_fops);</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l56-&gt;base.dev, "Bound\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_unbind(struct device *dev, struct device *master, void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;cs35l56-&gt;dsp_work);</div><div class='add'>+</div><div class='add'>+	cs35l56_remove_cal_debugfs(&amp;cs35l56-&gt;base);</div><div class='add'>+	cs35l56_hda_remove_controls(cs35l56);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_DEBUG)</div><div class='add'>+	cs_dsp_cleanup_debugfs(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+	debugfs_remove_recursive(cs35l56-&gt;debugfs_root);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;base.fw_patched)</div><div class='add'>+		cs_dsp_power_down(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, cs35l56-&gt;index);</div><div class='add'>+	if (comp &amp;&amp; (comp-&gt;dev == dev))</div><div class='add'>+		memset(comp, 0, sizeof(*comp));</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;codec = NULL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(cs35l56-&gt;base.dev, "Unbound\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_ops cs35l56_hda_comp_ops = {</div><div class='add'>+	.bind = cs35l56_hda_bind,</div><div class='add'>+	.unbind = cs35l56_hda_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	cs35l56_hda_wait_dsp_ready(cs35l56);</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;playing)</div><div class='add'>+		cs35l56_hda_pause(cs35l56);</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;suspended = true;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The interrupt line is normally shared, but after we start suspending</div><div class='add'>+	 * we can't check if our device is the source of an interrupt, and can't</div><div class='add'>+	 * clear it. Prevent this race by temporarily disabling the parent irq</div><div class='add'>+	 * until we reach _no_irq.</div><div class='add'>+	 */</div><div class='add'>+	if (cs35l56-&gt;base.irq)</div><div class='add'>+		disable_irq(cs35l56-&gt;base.irq);</div><div class='add'>+</div><div class='add'>+	return pm_runtime_force_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_suspend_late(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * RESET is usually shared by all amps so it must not be asserted until</div><div class='add'>+	 * all driver instances have done their suspend() stage.</div><div class='add'>+	 */</div><div class='add'>+	if (cs35l56-&gt;base.reset_gpio) {</div><div class='add'>+		gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 0);</div><div class='add'>+		cs35l56_wait_min_reset_pulse();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_suspend_no_irq(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/* Handlers are now disabled so the parent IRQ can safely be re-enabled. */</div><div class='add'>+	if (cs35l56-&gt;base.irq)</div><div class='add'>+		enable_irq(cs35l56-&gt;base.irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_resume_no_irq(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * WAKE interrupts unmask if the CS35L56 hibernates, which can cause</div><div class='add'>+	 * spurious interrupts, and the interrupt line is normally shared.</div><div class='add'>+	 * We can't check if our device is the source of an interrupt, and can't</div><div class='add'>+	 * clear it, until it has fully resumed. Prevent this race by temporarily</div><div class='add'>+	 * disabling the parent irq until we complete resume().</div><div class='add'>+	 */</div><div class='add'>+	if (cs35l56-&gt;base.irq)</div><div class='add'>+		disable_irq(cs35l56-&gt;base.irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_resume_early(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/* Ensure a spec-compliant RESET pulse. */</div><div class='add'>+	if (cs35l56-&gt;base.reset_gpio) {</div><div class='add'>+		gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 0);</div><div class='add'>+		cs35l56_wait_min_reset_pulse();</div><div class='add'>+</div><div class='add'>+		/* Release shared RESET before drivers start resume(). */</div><div class='add'>+		gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 1);</div><div class='add'>+		cs35l56_wait_control_port_ready();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_system_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Undo pm_runtime_force_suspend() before re-enabling the irq */</div><div class='add'>+	ret = pm_runtime_force_resume(dev);</div><div class='add'>+	if (cs35l56-&gt;base.irq)</div><div class='add'>+		enable_irq(cs35l56-&gt;base.irq);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;suspended = false;</div><div class='add'>+</div><div class='add'>+	if (!cs35l56-&gt;codec)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_is_fw_reload_needed(&amp;cs35l56-&gt;base);</div><div class='add'>+	dev_dbg(cs35l56-&gt;base.dev, "fw_reload_needed: %d\n", ret);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		queue_work(system_long_wq, &amp;cs35l56-&gt;dsp_work);</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;playing)</div><div class='add'>+		cs35l56_hda_play(cs35l56);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_fixup_yoga9(struct cs35l56_hda *cs35l56, int *bus_addr)</div><div class='add'>+{</div><div class='add'>+	/* The cirrus,dev-index property has the wrong values */</div><div class='add'>+	switch (*bus_addr) {</div><div class='add'>+	case 0x30:</div><div class='add'>+		cs35l56-&gt;index = 1;</div><div class='add'>+		return 0;</div><div class='add'>+	case 0x31:</div><div class='add'>+		cs35l56-&gt;index = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		/* There is a pseudo-address for broadcast to both amps - ignore it */</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "Ignoring I2C address %#x\n", *bus_addr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	const char *sub;</div><div class='add'>+	int (*fixup_fn)(struct cs35l56_hda *cs35l56, int *bus_addr);</div><div class='add'>+} cs35l56_hda_fixups[] = {</div><div class='add'>+	{</div><div class='add'>+		.sub = "17AA390B", /* Lenovo Yoga Book 9i GenX */</div><div class='add'>+		.fixup_fn = cs35l56_hda_fixup_yoga9,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_apply_platform_fixups(struct cs35l56_hda *cs35l56, const char *sub,</div><div class='add'>+					     int *bus_addr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(sub))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cs35l56_hda_fixups); i++) {</div><div class='add'>+		if (strcasecmp(cs35l56_hda_fixups[i].sub, sub) == 0) {</div><div class='add'>+			dev_dbg(cs35l56-&gt;base.dev, "Applying fixup for %s\n",</div><div class='add'>+				cs35l56_hda_fixups[i].sub);</div><div class='add'>+			return (cs35l56_hda_fixups[i].fixup_fn)(cs35l56, bus_addr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id)</div><div class='add'>+{</div><div class='add'>+	u32 values[HDA_MAX_COMPONENTS];</div><div class='add'>+	char hid_string[8];</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	const char *property, *sub;</div><div class='add'>+	size_t nval;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ACPI_COMPANION isn't available when this driver was instantiated by</div><div class='add'>+	 * the serial-multi-instantiate driver, so lookup the node by HID</div><div class='add'>+	 */</div><div class='add'>+	if (!ACPI_COMPANION(cs35l56-&gt;base.dev)) {</div><div class='add'>+		snprintf(hid_string, sizeof(hid_string), "CSC%04X", hid);</div><div class='add'>+		adev = acpi_dev_get_first_match_dev(hid_string, NULL, -1);</div><div class='add'>+		if (!adev) {</div><div class='add'>+			dev_err(cs35l56-&gt;base.dev, "Failed to find an ACPI device for %s\n",</div><div class='add'>+				dev_name(cs35l56-&gt;base.dev));</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		ACPI_COMPANION_SET(cs35l56-&gt;base.dev, adev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize things that could be overwritten by a fixup */</div><div class='add'>+	cs35l56-&gt;index = -1;</div><div class='add'>+</div><div class='add'>+	sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56-&gt;base.dev));</div><div class='add'>+	ret = cs35l56_hda_apply_platform_fixups(cs35l56, sub, &amp;id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;index == -1) {</div><div class='add'>+		property = "cirrus,dev-index";</div><div class='add'>+		ret = device_property_count_u32(cs35l56-&gt;base.dev, property);</div><div class='add'>+		if (ret &lt;= 0)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		if (ret &gt; ARRAY_SIZE(values)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		nval = ret;</div><div class='add'>+</div><div class='add'>+		ret = device_property_read_u32_array(cs35l56-&gt;base.dev, property, values, nval);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nval; i++) {</div><div class='add'>+			if (values[i] == id) {</div><div class='add'>+				cs35l56-&gt;index = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * It's not an error for the ID to be missing: for I2C there can be</div><div class='add'>+		 * an alias address that is not a real device. So reject silently.</div><div class='add'>+		 */</div><div class='add'>+		if (cs35l56-&gt;index == -1) {</div><div class='add'>+			dev_dbg(cs35l56-&gt;base.dev, "No index found in %s\n", property);</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(sub)) {</div><div class='add'>+		dev_info(cs35l56-&gt;base.dev,</div><div class='add'>+			 "Read ACPI _SUB failed(%ld): fallback to generic firmware\n",</div><div class='add'>+			 PTR_ERR(sub));</div><div class='add'>+	} else {</div><div class='add'>+		ret = cirrus_scodec_get_speaker_id(cs35l56-&gt;base.dev, cs35l56-&gt;index, nval, -1);</div><div class='add'>+		if (ret == -ENOENT) {</div><div class='add'>+			cs35l56-&gt;system_name = sub;</div><div class='add'>+		} else if (ret &gt;= 0) {</div><div class='add'>+			cs35l56-&gt;system_name = kasprintf(GFP_KERNEL, "%s-spkid%d", sub, ret);</div><div class='add'>+			kfree(sub);</div><div class='add'>+			if (!cs35l56-&gt;system_name)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+		} else {</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.reset_gpio = devm_gpiod_get_index_optional(cs35l56-&gt;base.dev,</div><div class='add'>+								 "reset",</div><div class='add'>+								 cs35l56-&gt;index,</div><div class='add'>+								 GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(cs35l56-&gt;base.reset_gpio)) {</div><div class='add'>+		ret = PTR_ERR(cs35l56-&gt;base.reset_gpio);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If RESET is shared the first amp to probe will grab the reset</div><div class='add'>+		 * line and reset all the amps</div><div class='add'>+		 */</div><div class='add'>+		if (ret != -EBUSY)</div><div class='add'>+			return dev_err_probe(cs35l56-&gt;base.dev, ret, "Failed to get reset GPIO\n");</div><div class='add'>+</div><div class='add'>+		dev_info(cs35l56-&gt;base.dev, "Reset GPIO busy, assume shared reset\n");</div><div class='add'>+		cs35l56-&gt;base.reset_gpio = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret != -ENODEV)</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed property %s: %d\n", property, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;cs35l56-&gt;base.irq_lock);</div><div class='add'>+	dev_set_drvdata(cs35l56-&gt;base.dev, cs35l56);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;cs35l56-&gt;dsp_work, cs35l56_hda_dsp_work);</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hda_read_acpi(cs35l56, hid, id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;amp_name = devm_kasprintf(cs35l56-&gt;base.dev, GFP_KERNEL, "AMP%d",</div><div class='add'>+					   cs35l56-&gt;index + 1);</div><div class='add'>+	if (!cs35l56-&gt;amp_name) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.type = hid &amp; 0xff;</div><div class='add'>+	cs35l56-&gt;base.cal_index = cs35l56-&gt;index;</div><div class='add'>+</div><div class='add'>+	cs35l56_init_cs_dsp(&amp;cs35l56-&gt;base, &amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+	cs35l56-&gt;cs_dsp.client_ops = &amp;cs35l56_hda_client_ops;</div><div class='add'>+</div><div class='add'>+	if (cs35l56-&gt;base.reset_gpio) {</div><div class='add'>+		dev_dbg(cs35l56-&gt;base.dev, "Hard reset\n");</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The GPIOD_OUT_LOW to *_gpiod_get_*() will be ignored if the</div><div class='add'>+		 * ACPI defines a different default state. So explicitly set low.</div><div class='add'>+		 */</div><div class='add'>+		gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 0);</div><div class='add'>+		cs35l56_wait_min_reset_pulse();</div><div class='add'>+		gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hw_init(&amp;cs35l56-&gt;base);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	/* Reset the device and wait for it to boot */</div><div class='add'>+	cs35l56_system_reset(&amp;cs35l56-&gt;base, false);</div><div class='add'>+	ret = cs35l56_wait_for_firmware_boot(&amp;cs35l56-&gt;base);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	regcache_cache_only(cs35l56-&gt;base.regmap, false);</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_set_patch(&amp;cs35l56-&gt;base);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	regcache_mark_dirty(cs35l56-&gt;base.regmap);</div><div class='add'>+	regcache_sync(cs35l56-&gt;base.regmap);</div><div class='add'>+</div><div class='add'>+	/* Disable auto-hibernate so that runtime_pm has control */</div><div class='add'>+	ret = cs35l56_mbox_send(&amp;cs35l56-&gt;base, CS35L56_MBOX_CMD_PREVENT_AUTO_HIBERNATE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_get_calibration(&amp;cs35l56-&gt;base);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = cs_dsp_halo_init(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(cs35l56-&gt;base.dev, ret, "cs_dsp_halo_init failed\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(cs35l56-&gt;base.dev, "DSP system name: '%s', amp name: '%s'\n",</div><div class='add'>+		 cs35l56-&gt;system_name, cs35l56-&gt;amp_name);</div><div class='add'>+</div><div class='add'>+	regmap_multi_reg_write(cs35l56-&gt;base.regmap, cs35l56_hda_dai_config,</div><div class='add'>+			       ARRAY_SIZE(cs35l56_hda_dai_config));</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * By default only enable one ASP1TXn, where n=amplifier index,</div><div class='add'>+	 * This prevents multiple amps trying to drive the same slot.</div><div class='add'>+	 */</div><div class='add'>+	cs35l56-&gt;asp_tx_mask = BIT(cs35l56-&gt;index);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(cs35l56-&gt;base.dev, 3000);</div><div class='add'>+	pm_runtime_use_autosuspend(cs35l56-&gt;base.dev);</div><div class='add'>+	pm_runtime_set_active(cs35l56-&gt;base.dev);</div><div class='add'>+	pm_runtime_mark_last_busy(cs35l56-&gt;base.dev);</div><div class='add'>+	pm_runtime_enable(cs35l56-&gt;base.dev);</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.init_done = true;</div><div class='add'>+</div><div class='add'>+	ret = component_add(cs35l56-&gt;base.dev, &amp;cs35l56_hda_comp_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Register component failed: %d\n", ret);</div><div class='add'>+		goto pm_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+pm_err:</div><div class='add'>+	pm_runtime_disable(cs35l56-&gt;base.dev);</div><div class='add'>+	cs_dsp_remove(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+err:</div><div class='add'>+	gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l56_hda_common_probe, "SND_HDA_SCODEC_CS35L56");</div><div class='add'>+</div><div class='add'>+void cs35l56_hda_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	component_del(cs35l56-&gt;base.dev, &amp;cs35l56_hda_comp_ops);</div><div class='add'>+</div><div class='add'>+	pm_runtime_dont_use_autosuspend(cs35l56-&gt;base.dev);</div><div class='add'>+	pm_runtime_get_sync(cs35l56-&gt;base.dev);</div><div class='add'>+	pm_runtime_disable(cs35l56-&gt;base.dev);</div><div class='add'>+</div><div class='add'>+	cs_dsp_remove(&amp;cs35l56-&gt;cs_dsp);</div><div class='add'>+</div><div class='add'>+	kfree(cs35l56-&gt;system_name);</div><div class='add'>+	pm_runtime_put_noidle(cs35l56-&gt;base.dev);</div><div class='add'>+</div><div class='add'>+	gpiod_set_value_cansleep(cs35l56-&gt;base.reset_gpio, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l56_hda_remove, "SND_HDA_SCODEC_CS35L56");</div><div class='add'>+</div><div class='add'>+const struct dev_pm_ops cs35l56_hda_pm_ops = {</div><div class='add'>+	RUNTIME_PM_OPS(cs35l56_hda_runtime_suspend, cs35l56_hda_runtime_resume, NULL)</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(cs35l56_hda_system_suspend, cs35l56_hda_system_resume)</div><div class='add'>+	LATE_SYSTEM_SLEEP_PM_OPS(cs35l56_hda_system_suspend_late,</div><div class='add'>+				 cs35l56_hda_system_resume_early)</div><div class='add'>+	NOIRQ_SYSTEM_SLEEP_PM_OPS(cs35l56_hda_system_suspend_no_irq,</div><div class='add'>+				  cs35l56_hda_system_resume_no_irq)</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(cs35l56_hda_pm_ops, "SND_HDA_SCODEC_CS35L56");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("CS35L56 HDA Driver");</div><div class='add'>+MODULE_IMPORT_NS("FW_CS_DSP");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_CIRRUS_SCODEC");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Simon Trimmer &lt;simont@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l54-*.wmfw");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l54-*.bin");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l56-*.wmfw");</div><div class='add'>+MODULE_FIRMWARE("cirrus/cs35l56-*.bin");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l56_hda.h b/sound/hda/codecs/side-codecs/cs35l56_hda.h<br/>new file mode 100644<br/>index 000000000000..cb4b5e7356a3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l56_hda.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l56_hda.h</a></div><div class='hunk'>@@ -0,0 +1,56 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ *</div><div class='add'>+ * HDA audio driver for Cirrus Logic CS35L56 smart amp</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS35L56_HDA_H__</div><div class='add'>+#define __CS35L56_HDA_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/firmware/cirrus/cs_dsp.h&gt;</div><div class='add'>+#include &lt;linux/firmware/cirrus/wmfw.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;sound/cs35l56.h&gt;</div><div class='add'>+</div><div class='add'>+struct dentry;</div><div class='add'>+</div><div class='add'>+struct cs35l56_hda {</div><div class='add'>+	struct cs35l56_base base;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct work_struct dsp_work;</div><div class='add'>+</div><div class='add'>+	int index;</div><div class='add'>+	const char *system_name;</div><div class='add'>+	const char *amp_name;</div><div class='add'>+</div><div class='add'>+	struct cs_dsp cs_dsp;</div><div class='add'>+	bool playing;</div><div class='add'>+	bool suspended;</div><div class='add'>+	u8 asp_tx_mask;</div><div class='add'>+</div><div class='add'>+	struct snd_kcontrol *posture_ctl;</div><div class='add'>+	struct snd_kcontrol *volume_ctl;</div><div class='add'>+	struct snd_kcontrol *mixer_ctl[4];</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_DEBUG)</div><div class='add'>+	struct dentry *debugfs_root;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct cs35l56_hda *cs35l56_hda_from_base(struct cs35l56_base *cs35l56_base)</div><div class='add'>+{</div><div class='add'>+	return container_of(cs35l56_base, struct cs35l56_hda, base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+extern const struct dev_pm_ops cs35l56_hda_pm_ops;</div><div class='add'>+</div><div class='add'>+int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id);</div><div class='add'>+void cs35l56_hda_remove(struct device *dev);</div><div class='add'>+</div><div class='add'>+#endif /*__CS35L56_HDA_H__*/</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c b/sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c<br/>new file mode 100644<br/>index 000000000000..1072f17385ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// CS35L56 HDA audio driver I2C binding</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+//                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cs35l56_hda.h"</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_i2c_probe(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	const struct i2c_device_id *id = i2c_client_get_device_id(clt);</div><div class='add'>+	struct cs35l56_hda *cs35l56;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cs35l56 = devm_kzalloc(&amp;clt-&gt;dev, sizeof(*cs35l56), GFP_KERNEL);</div><div class='add'>+	if (!cs35l56)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.dev = &amp;clt-&gt;dev;</div><div class='add'>+</div><div class='add'>+#ifdef CS35L56_WAKE_HOLD_TIME_US</div><div class='add'>+	cs35l56-&gt;base.can_hibernate = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.regmap = devm_regmap_init_i2c(clt, &amp;cs35l56_regmap_i2c);</div><div class='add'>+	if (IS_ERR(cs35l56-&gt;base.regmap)) {</div><div class='add'>+		ret = PTR_ERR(cs35l56-&gt;base.regmap);</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed to allocate register map: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hda_common_probe(cs35l56, id-&gt;driver_data, clt-&gt;addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = cs35l56_irq_request(&amp;cs35l56-&gt;base, clt-&gt;irq);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		cs35l56_hda_remove(cs35l56-&gt;base.dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_i2c_remove(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	cs35l56_hda_remove(&amp;clt-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id cs35l56_hda_i2c_id[] = {</div><div class='add'>+	{ "cs35l54-hda", 0x3554 },</div><div class='add'>+	{ "cs35l56-hda", 0x3556 },</div><div class='add'>+	{ "cs35l57-hda", 0x3557 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id cs35l56_acpi_hda_match[] = {</div><div class='add'>+	{ "CSC3554", 0 },</div><div class='add'>+	{ "CSC3556", 0 },</div><div class='add'>+	{ "CSC3557", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver cs35l56_hda_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		  = "cs35l56-hda",</div><div class='add'>+		.acpi_match_table = cs35l56_acpi_hda_match,</div><div class='add'>+		.pm		  = &amp;cs35l56_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= cs35l56_hda_i2c_id,</div><div class='add'>+	.probe		= cs35l56_hda_i2c_probe,</div><div class='add'>+	.remove		= cs35l56_hda_i2c_remove,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(cs35l56_hda_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA CS35L56 I2C driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_CS35L56");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Simon Trimmer &lt;simont@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/cs35l56_hda_spi.c b/sound/hda/codecs/side-codecs/cs35l56_hda_spi.c<br/>new file mode 100644<br/>index 000000000000..f802c83c57b4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/cs35l56_hda_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/cs35l56_hda_spi.c</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+//</div><div class='add'>+// CS35L56 HDA audio driver SPI binding</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2023 Cirrus Logic, Inc. and</div><div class='add'>+//                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "cs35l56_hda.h"</div><div class='add'>+</div><div class='add'>+static int cs35l56_hda_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct spi_device_id *id = spi_get_device_id(spi);</div><div class='add'>+	struct cs35l56_hda *cs35l56;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cs35l56 = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*cs35l56), GFP_KERNEL);</div><div class='add'>+	if (!cs35l56)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.dev = &amp;spi-&gt;dev;</div><div class='add'>+	ret = cs35l56_init_config_for_spi(&amp;cs35l56-&gt;base, spi);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+#ifdef CS35L56_WAKE_HOLD_TIME_US</div><div class='add'>+	cs35l56-&gt;base.can_hibernate = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cs35l56-&gt;base.regmap = devm_regmap_init_spi(spi, &amp;cs35l56_regmap_spi);</div><div class='add'>+	if (IS_ERR(cs35l56-&gt;base.regmap)) {</div><div class='add'>+		ret = PTR_ERR(cs35l56-&gt;base.regmap);</div><div class='add'>+		dev_err(cs35l56-&gt;base.dev, "Failed to allocate register map: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cs35l56_hda_common_probe(cs35l56, id-&gt;driver_data, spi_get_chipselect(spi, 0));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = cs35l56_irq_request(&amp;cs35l56-&gt;base, spi-&gt;irq);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		cs35l56_hda_remove(cs35l56-&gt;base.dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cs35l56_hda_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	cs35l56_hda_remove(&amp;spi-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id cs35l56_hda_spi_id[] = {</div><div class='add'>+	{ "cs35l54-hda", 0x3554 },</div><div class='add'>+	{ "cs35l56-hda", 0x3556 },</div><div class='add'>+	{ "cs35l57-hda", 0x3557 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id cs35l56_acpi_hda_match[] = {</div><div class='add'>+	{ "CSC3554", 0 },</div><div class='add'>+	{ "CSC3556", 0 },</div><div class='add'>+	{ "CSC3557", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver cs35l56_hda_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		  = "cs35l56-hda",</div><div class='add'>+		.acpi_match_table = cs35l56_acpi_hda_match,</div><div class='add'>+		.pm		  = &amp;cs35l56_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= cs35l56_hda_spi_id,</div><div class='add'>+	.probe		= cs35l56_hda_spi_probe,</div><div class='add'>+	.remove		= cs35l56_hda_spi_remove,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(cs35l56_hda_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA CS35L56 SPI driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_CS35L56");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Simon Trimmer &lt;simont@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/hda_component.c b/sound/hda/codecs/side-codecs/hda_component.c<br/>new file mode 100644<br/>index 000000000000..8a2a200600a7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/hda_component.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/hda_component.c</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HD audio Component Binding Interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021, 2023 Cirrus Logic, Inc. and</div><div class='add'>+ *			Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/component.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_component.h"</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+void hda_component_acpi_device_notify(struct hda_component_parent *parent,</div><div class='add'>+				      acpi_handle handle, u32 event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;parent-&gt;mutex);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(parent-&gt;comps); i++) {</div><div class='add'>+		comp = hda_component_from_index(parent, i);</div><div class='add'>+		if (comp-&gt;dev &amp;&amp; comp-&gt;acpi_notify)</div><div class='add'>+			comp-&gt;acpi_notify(acpi_device_handle(comp-&gt;adev), event, comp-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_acpi_device_notify, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+int hda_component_manager_bind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+						  struct hda_component_parent *parent,</div><div class='add'>+						  acpi_notify_handler handler, void *data)</div><div class='add'>+{</div><div class='add'>+	bool support_notifications = false;</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	adev = parent-&gt;comps[0].adev;</div><div class='add'>+	if (!acpi_device_handle(adev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(parent-&gt;comps); i++) {</div><div class='add'>+		comp = hda_component_from_index(parent, i);</div><div class='add'>+		support_notifications = support_notifications ||</div><div class='add'>+			comp-&gt;acpi_notifications_supported;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (support_notifications) {</div><div class='add'>+		ret = acpi_install_notify_handler(adev-&gt;handle, ACPI_DEVICE_NOTIFY,</div><div class='add'>+						  handler, data);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			codec_warn(cdc, "Failed to install notify handler: %d\n", ret);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		codec_dbg(cdc, "Notify handler installed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_bind_acpi_notifications, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+void hda_component_manager_unbind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+						     struct hda_component_parent *parent,</div><div class='add'>+						     acpi_notify_handler handler)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adev = parent-&gt;comps[0].adev;</div><div class='add'>+	if (!acpi_device_handle(adev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = acpi_remove_notify_handler(adev-&gt;handle, ACPI_DEVICE_NOTIFY, handler);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		codec_warn(cdc, "Failed to uninstall notify handler: %d\n", ret);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_unbind_acpi_notifications, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+#endif /* ifdef CONFIG_ACPI */</div><div class='add'>+</div><div class='add'>+void hda_component_manager_playback_hook(struct hda_component_parent *parent, int action)</div><div class='add'>+{</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;parent-&gt;mutex);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(parent-&gt;comps); i++) {</div><div class='add'>+		comp = hda_component_from_index(parent, i);</div><div class='add'>+		if (comp-&gt;dev &amp;&amp; comp-&gt;pre_playback_hook)</div><div class='add'>+			comp-&gt;pre_playback_hook(comp-&gt;dev, action);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(parent-&gt;comps); i++) {</div><div class='add'>+		comp = hda_component_from_index(parent, i);</div><div class='add'>+		if (comp-&gt;dev &amp;&amp; comp-&gt;playback_hook)</div><div class='add'>+			comp-&gt;playback_hook(comp-&gt;dev, action);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(parent-&gt;comps); i++) {</div><div class='add'>+		comp = hda_component_from_index(parent, i);</div><div class='add'>+		if (comp-&gt;dev &amp;&amp; comp-&gt;post_playback_hook)</div><div class='add'>+			comp-&gt;post_playback_hook(comp-&gt;dev, action);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_playback_hook, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+struct hda_scodec_match {</div><div class='add'>+	const char *bus;</div><div class='add'>+	const char *hid;</div><div class='add'>+	const char *match_str;</div><div class='add'>+	int index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* match the device name in a slightly relaxed manner */</div><div class='add'>+static int hda_comp_match_dev_name(struct device *dev, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hda_scodec_match *p = data;</div><div class='add'>+	const char *d = dev_name(dev);</div><div class='add'>+	int n = strlen(p-&gt;bus);</div><div class='add'>+	char tmp[32];</div><div class='add'>+</div><div class='add'>+	/* check the bus name */</div><div class='add'>+	if (strncmp(d, p-&gt;bus, n))</div><div class='add'>+		return 0;</div><div class='add'>+	/* skip the bus number */</div><div class='add'>+	if (isdigit(d[n]))</div><div class='add'>+		n++;</div><div class='add'>+	/* the rest must be exact matching */</div><div class='add'>+	snprintf(tmp, sizeof(tmp), p-&gt;match_str, p-&gt;hid, p-&gt;index);</div><div class='add'>+	return !strcmp(d + n, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hda_component_manager_bind(struct hda_codec *cdc,</div><div class='add'>+			       struct hda_component_parent *parent)</div><div class='add'>+{</div><div class='add'>+	/* Init shared and component specific data */</div><div class='add'>+	memset(parent-&gt;comps, 0, sizeof(parent-&gt;comps));</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;parent-&gt;mutex);</div><div class='add'>+	return component_bind_all(hda_codec_dev(cdc), parent);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_bind, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+int hda_component_manager_init(struct hda_codec *cdc,</div><div class='add'>+			       struct hda_component_parent *parent, int count,</div><div class='add'>+			       const char *bus, const char *hid,</div><div class='add'>+			       const char *match_str,</div><div class='add'>+			       const struct component_master_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = hda_codec_dev(cdc);</div><div class='add'>+	struct component_match *match = NULL;</div><div class='add'>+	struct hda_scodec_match *sm;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (parent-&gt;codec) {</div><div class='add'>+		codec_err(cdc, "Component binding already created (SSID: %x)\n",</div><div class='add'>+			  cdc-&gt;core.subsystem_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	parent-&gt;codec = cdc;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;parent-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		sm = devm_kmalloc(dev, sizeof(*sm), GFP_KERNEL);</div><div class='add'>+		if (!sm)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		sm-&gt;bus = bus;</div><div class='add'>+		sm-&gt;hid = hid;</div><div class='add'>+		sm-&gt;match_str = match_str;</div><div class='add'>+		sm-&gt;index = i;</div><div class='add'>+		component_match_add(dev, &amp;match, hda_comp_match_dev_name, sm);</div><div class='add'>+		if (IS_ERR(match)) {</div><div class='add'>+			codec_err(cdc, "Fail to add component %ld\n", PTR_ERR(match));</div><div class='add'>+			return PTR_ERR(match);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = component_master_add_with_match(dev, ops, match);</div><div class='add'>+	if (ret)</div><div class='add'>+		codec_err(cdc, "Fail to register component aggregator %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_init, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+void hda_component_manager_free(struct hda_component_parent *parent,</div><div class='add'>+				const struct component_master_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	if (!parent-&gt;codec)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev = hda_codec_dev(parent-&gt;codec);</div><div class='add'>+</div><div class='add'>+	component_master_del(dev, ops);</div><div class='add'>+</div><div class='add'>+	parent-&gt;codec = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(hda_component_manager_free, "SND_HDA_SCODEC_COMPONENT");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HD Audio component binding library");</div><div class='add'>+MODULE_AUTHOR("Richard Fitzgerald &lt;rf@opensource.cirrus.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/hda_component.h b/sound/hda/codecs/side-codecs/hda_component.h<br/>new file mode 100644<br/>index 000000000000..075137a73bae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/hda_component.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/hda_component.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * HD audio Component Binding Interface</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Cirrus Logic, Inc. and</div><div class='add'>+ *                    Cirrus Logic International Semiconductor Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HDA_COMPONENT_H__</div><div class='add'>+#define __HDA_COMPONENT_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/component.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+</div><div class='add'>+#define HDA_MAX_COMPONENTS	4</div><div class='add'>+#define HDA_MAX_NAME_SIZE	50</div><div class='add'>+</div><div class='add'>+struct hda_component {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	char name[HDA_MAX_NAME_SIZE];</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	bool acpi_notifications_supported;</div><div class='add'>+	void (*acpi_notify)(acpi_handle handle, u32 event, struct device *dev);</div><div class='add'>+	void (*pre_playback_hook)(struct device *dev, int action);</div><div class='add'>+	void (*playback_hook)(struct device *dev, int action);</div><div class='add'>+	void (*post_playback_hook)(struct device *dev, int action);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hda_component_parent {</div><div class='add'>+	struct mutex mutex;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct hda_component comps[HDA_MAX_COMPONENTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+void hda_component_acpi_device_notify(struct hda_component_parent *parent,</div><div class='add'>+				      acpi_handle handle, u32 event, void *data);</div><div class='add'>+int hda_component_manager_bind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+						  struct hda_component_parent *parent,</div><div class='add'>+						  acpi_notify_handler handler, void *data);</div><div class='add'>+void hda_component_manager_unbind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+						     struct hda_component_parent *parent,</div><div class='add'>+						     acpi_notify_handler handler);</div><div class='add'>+#else</div><div class='add'>+static inline void hda_component_acpi_device_notify(struct hda_component_parent *parent,</div><div class='add'>+						    acpi_handle handle,</div><div class='add'>+						    u32 event,</div><div class='add'>+						    void *data)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hda_component_manager_bind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+								struct hda_component_parent *parent,</div><div class='add'>+								acpi_notify_handler handler,</div><div class='add'>+								void *data)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hda_component_manager_unbind_acpi_notifications(struct hda_codec *cdc,</div><div class='add'>+								   struct hda_component_parent *parent,</div><div class='add'>+								   acpi_notify_handler handler)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif /* ifdef CONFIG_ACPI */</div><div class='add'>+</div><div class='add'>+void hda_component_manager_playback_hook(struct hda_component_parent *parent, int action);</div><div class='add'>+</div><div class='add'>+int hda_component_manager_init(struct hda_codec *cdc,</div><div class='add'>+			       struct hda_component_parent *parent, int count,</div><div class='add'>+			       const char *bus, const char *hid,</div><div class='add'>+			       const char *match_str,</div><div class='add'>+			       const struct component_master_ops *ops);</div><div class='add'>+</div><div class='add'>+void hda_component_manager_free(struct hda_component_parent *parent,</div><div class='add'>+				const struct component_master_ops *ops);</div><div class='add'>+</div><div class='add'>+int hda_component_manager_bind(struct hda_codec *cdc, struct hda_component_parent *parent);</div><div class='add'>+</div><div class='add'>+static inline struct hda_component *hda_component_from_index(struct hda_component_parent *parent,</div><div class='add'>+							     int index)</div><div class='add'>+{</div><div class='add'>+	if (!parent)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (index &lt; 0 || index &gt;= ARRAY_SIZE(parent-&gt;comps))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return &amp;parent-&gt;comps[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void hda_component_manager_unbind(struct hda_codec *cdc,</div><div class='add'>+						struct hda_component_parent *parent)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;parent-&gt;mutex);</div><div class='add'>+	component_unbind_all(hda_codec_dev(cdc), parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* ifndef __HDA_COMPONENT_H__ */</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/tas2781_hda.c b/sound/hda/codecs/side-codecs/tas2781_hda.c<br/>new file mode 100644<br/>index 000000000000..96e6d82dc69e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/tas2781_hda.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/tas2781_hda.c</a></div><div class='hunk'>@@ -0,0 +1,416 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// TAS2781 HDA Shared Lib for I2C&amp;SPI driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2025 Texas Instruments, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Shenghao Ding &lt;shenghao-ding@ti.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/component.h&gt;</div><div class='add'>+#include &lt;linux/crc8.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+#include &lt;sound/tas2781.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tas2781_hda.h"</div><div class='add'>+</div><div class='add'>+#define CALIBRATION_DATA_AREA_NUM 2</div><div class='add'>+</div><div class='add'>+const efi_guid_t tasdev_fct_efi_guid[] = {</div><div class='add'>+	/* DELL */</div><div class='add'>+	EFI_GUID(0xcc92382d, 0x6337, 0x41cb, 0xa8, 0x8b, 0x8e, 0xce, 0x74,</div><div class='add'>+		0x91, 0xea, 0x9f),</div><div class='add'>+	/* HP */</div><div class='add'>+	EFI_GUID(0x02f9af02, 0x7734, 0x4233, 0xb4, 0x3d, 0x93, 0xfe, 0x5a,</div><div class='add'>+		0xa3, 0x5d, 0xb3),</div><div class='add'>+	/* LENOVO &amp; OTHERS */</div><div class='add'>+	EFI_GUID(0x1f52d2a1, 0xbb3a, 0x457d, 0xbc, 0x09, 0x43, 0xa3, 0xf4,</div><div class='add'>+		0x31, 0x0a, 0x92),</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdev_fct_efi_guid, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The order of calibrated-data writing function is a bit different from the</div><div class='add'>+ * order in UEFI. Here is the conversion to match the order of calibrated-data</div><div class='add'>+ * writing function.</div><div class='add'>+ */</div><div class='add'>+static void cali_cnv(unsigned char *data, unsigned int base, int offset)</div><div class='add'>+{</div><div class='add'>+	struct cali_reg reg_data;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;reg_data, &amp;data[base], sizeof(reg_data));</div><div class='add'>+	/* the data order has to be swapped between r0_low_reg and inv0_reg */</div><div class='add'>+	swap(reg_data.r0_low_reg, reg_data.invr0_reg);</div><div class='add'>+</div><div class='add'>+	cpu_to_be32_array((__force __be32 *)(data + offset + 1),</div><div class='add'>+		(u32 *)&amp;reg_data, TASDEV_CALIB_N);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_apply_calib(struct tasdevice_priv *p)</div><div class='add'>+{</div><div class='add'>+	struct calidata *cali_data = &amp;p-&gt;cali_data;</div><div class='add'>+	struct cali_reg *r = &amp;cali_data-&gt;cali_reg_array;</div><div class='add'>+	unsigned char *data = cali_data-&gt;data;</div><div class='add'>+	unsigned int *tmp_val = (unsigned int *)data;</div><div class='add'>+	unsigned int cali_reg[TASDEV_CALIB_N] = {</div><div class='add'>+		TASDEVICE_REG(0, 0x17, 0x74),</div><div class='add'>+		TASDEVICE_REG(0, 0x18, 0x0c),</div><div class='add'>+		TASDEVICE_REG(0, 0x18, 0x14),</div><div class='add'>+		TASDEVICE_REG(0, 0x13, 0x70),</div><div class='add'>+		TASDEVICE_REG(0, 0x18, 0x7c),</div><div class='add'>+	};</div><div class='add'>+	unsigned int crc, oft, node_num;</div><div class='add'>+	unsigned char *buf;</div><div class='add'>+	int i, j, k, l;</div><div class='add'>+</div><div class='add'>+	if (tmp_val[0] == 2781) {</div><div class='add'>+		/*</div><div class='add'>+		 * New features were added in calibrated Data V3:</div><div class='add'>+		 *     1. Added calibration registers address define in</div><div class='add'>+		 *	    a node, marked as Device id == 0x80.</div><div class='add'>+		 * New features were added in calibrated Data V2:</div><div class='add'>+		 *     1. Added some the fields to store the link_id and</div><div class='add'>+		 *	    uniqie_id for multi-link solutions</div><div class='add'>+		 *     2. Support flexible number of devices instead of</div><div class='add'>+		 *	    fixed one in V1.</div><div class='add'>+		 * Layout of calibrated data V2 in UEFI(total 256 bytes):</div><div class='add'>+		 *     ChipID (2781, 4 bytes)</div><div class='add'>+		 *     Data-Group-Sum (4 bytes)</div><div class='add'>+		 *     TimeStamp of Calibration (4 bytes)</div><div class='add'>+		 *     for (i = 0; i &lt; Data-Group-Sum; i++) {</div><div class='add'>+		 *	    if (Data type != 0x80) (4 bytes)</div><div class='add'>+		 *		 Calibrated Data of Device #i (20 bytes)</div><div class='add'>+		 *	    else</div><div class='add'>+		 *		 Calibration registers address (5*4 = 20 bytes)</div><div class='add'>+		 *		 # V2: No reg addr in data grp section.</div><div class='add'>+		 *		 # V3: Normally the last grp is the reg addr.</div><div class='add'>+		 *     }</div><div class='add'>+		 *     CRC (4 bytes)</div><div class='add'>+		 *     Reserved (the rest)</div><div class='add'>+		 */</div><div class='add'>+		crc = crc32(~0, data, (3 + tmp_val[1] * 6) * 4) ^ ~0;</div><div class='add'>+</div><div class='add'>+		if (crc != tmp_val[3 + tmp_val[1] * 6]) {</div><div class='add'>+			cali_data-&gt;total_sz = 0;</div><div class='add'>+			dev_err(p-&gt;dev, "%s: CRC error\n", __func__);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		node_num = tmp_val[1];</div><div class='add'>+</div><div class='add'>+		for (j = 0, k = 0; j &lt; node_num; j++) {</div><div class='add'>+			oft = j * 6 + 3;</div><div class='add'>+			if (tmp_val[oft] == TASDEV_UEFI_CALI_REG_ADDR_FLG) {</div><div class='add'>+				for (i = 0; i &lt; TASDEV_CALIB_N; i++) {</div><div class='add'>+					buf = &amp;data[(oft + i + 1) * 4];</div><div class='add'>+					cali_reg[i] = TASDEVICE_REG(buf[1],</div><div class='add'>+						buf[2], buf[3]);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				l = j * (cali_data-&gt;cali_dat_sz_per_dev + 1);</div><div class='add'>+				if (k &gt;= p-&gt;ndev || l &gt; oft * 4) {</div><div class='add'>+					dev_err(p-&gt;dev, "%s: dev sum error\n",</div><div class='add'>+						__func__);</div><div class='add'>+					cali_data-&gt;total_sz = 0;</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				data[l] = k;</div><div class='add'>+				oft++;</div><div class='add'>+				cali_cnv(data, 4 * oft, l);</div><div class='add'>+				k++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/*</div><div class='add'>+		 * Calibration data is in V1 format.</div><div class='add'>+		 * struct cali_data {</div><div class='add'>+		 *     char cali_data[20];</div><div class='add'>+		 * }</div><div class='add'>+		 *</div><div class='add'>+		 * struct {</div><div class='add'>+		 *     struct cali_data cali_data[4];</div><div class='add'>+		 *     int  TimeStamp of Calibration (4 bytes)</div><div class='add'>+		 *     int CRC (4 bytes)</div><div class='add'>+		 * } ueft;</div><div class='add'>+		 */</div><div class='add'>+		crc = crc32(~0, data, 84) ^ ~0;</div><div class='add'>+		if (crc != tmp_val[21]) {</div><div class='add'>+			cali_data-&gt;total_sz = 0;</div><div class='add'>+			dev_err(p-&gt;dev, "%s: V1 CRC error\n", __func__);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = p-&gt;ndev - 1; j &gt;= 0; j--) {</div><div class='add'>+			l = j * (cali_data-&gt;cali_dat_sz_per_dev + 1);</div><div class='add'>+			cali_cnv(data, cali_data-&gt;cali_dat_sz_per_dev * j, l);</div><div class='add'>+			data[l] = j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;dspbin_typ == TASDEV_BASIC) {</div><div class='add'>+		r-&gt;r0_reg = cali_reg[0];</div><div class='add'>+		r-&gt;invr0_reg = cali_reg[1];</div><div class='add'>+		r-&gt;r0_low_reg = cali_reg[2];</div><div class='add'>+		r-&gt;pow_reg = cali_reg[3];</div><div class='add'>+		r-&gt;tlimit_reg = cali_reg[4];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;is_user_space_calidata = true;</div><div class='add'>+	cali_data-&gt;total_sz = p-&gt;ndev * (cali_data-&gt;cali_dat_sz_per_dev + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Update the calibration data, including speaker impedance, f0, etc,</div><div class='add'>+ * into algo. Calibrate data is done by manufacturer in the factory.</div><div class='add'>+ * The data is used by Algo for calculating the speaker temperature,</div><div class='add'>+ * speaker membrane excursion and f0 in real time during playback.</div><div class='add'>+ * Calibration data format in EFI is V2, since 2024.</div><div class='add'>+ */</div><div class='add'>+int tas2781_save_calibration(struct tas2781_hda *hda)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * GUID was used for data access in BIOS, it was provided by board</div><div class='add'>+	 * manufactory.</div><div class='add'>+	 */</div><div class='add'>+	efi_guid_t efi_guid = tasdev_fct_efi_guid[LENOVO];</div><div class='add'>+	/*</div><div class='add'>+	 * Some devices save the calibrated data into L"CALI_DATA",</div><div class='add'>+	 * and others into L"SmartAmpCalibrationData".</div><div class='add'>+	 */</div><div class='add'>+	static efi_char16_t *efi_name[CALIBRATION_DATA_AREA_NUM] = {</div><div class='add'>+		L"CALI_DATA",</div><div class='add'>+		L"SmartAmpCalibrationData",</div><div class='add'>+	};</div><div class='add'>+	struct tasdevice_priv *p = hda-&gt;priv;</div><div class='add'>+	struct calidata *cali_data = &amp;p-&gt;cali_data;</div><div class='add'>+	unsigned long total_sz = 0;</div><div class='add'>+	unsigned int attr, size;</div><div class='add'>+	unsigned char *data;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE)) {</div><div class='add'>+		dev_err(p-&gt;dev, "%s: NO EFI FOUND!\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hda-&gt;catlog_id &lt; LENOVO)</div><div class='add'>+		efi_guid = tasdev_fct_efi_guid[hda-&gt;catlog_id];</div><div class='add'>+</div><div class='add'>+	cali_data-&gt;cali_dat_sz_per_dev = 20;</div><div class='add'>+	size = p-&gt;ndev * (cali_data-&gt;cali_dat_sz_per_dev + 1);</div><div class='add'>+	for (i = 0; i &lt; CALIBRATION_DATA_AREA_NUM; i++) {</div><div class='add'>+		/* Get real size of UEFI variable */</div><div class='add'>+		status = efi.get_variable(efi_name[i], &amp;efi_guid, &amp;attr,</div><div class='add'>+			&amp;total_sz, NULL);</div><div class='add'>+		cali_data-&gt;total_sz = total_sz &gt; size ? total_sz : size;</div><div class='add'>+		if (status == EFI_BUFFER_TOO_SMALL) {</div><div class='add'>+			/* Allocate data buffer of data_size bytes */</div><div class='add'>+			data = cali_data-&gt;data = devm_kzalloc(p-&gt;dev,</div><div class='add'>+				cali_data-&gt;total_sz, GFP_KERNEL);</div><div class='add'>+			if (!data) {</div><div class='add'>+				status = -ENOMEM;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* Get variable contents into buffer */</div><div class='add'>+			status = efi.get_variable(efi_name[i], &amp;efi_guid,</div><div class='add'>+				&amp;attr, &amp;cali_data-&gt;total_sz, data);</div><div class='add'>+		}</div><div class='add'>+		/* Check whether get the calibrated data */</div><div class='add'>+		if (status == EFI_SUCCESS)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status != EFI_SUCCESS) {</div><div class='add'>+		cali_data-&gt;total_sz = 0;</div><div class='add'>+		return status;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas2781_apply_calib(p);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tas2781_save_calibration, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+void tas2781_hda_remove(struct device *dev,</div><div class='add'>+	const struct component_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	component_del(tas_hda-&gt;dev, ops);</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(tas_hda-&gt;dev);</div><div class='add'>+	pm_runtime_disable(tas_hda-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_noidle(tas_hda-&gt;dev);</div><div class='add'>+</div><div class='add'>+	tasdevice_remove(tas_hda-&gt;priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tas2781_hda_remove, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_info_profile(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = tas_priv-&gt;rcabin.ncfgs - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_info_profile, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_info_programs(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = tas_priv-&gt;fmw-&gt;nr_programs - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_info_programs, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_info_config(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct tasdevice_fw *tas_fw = tas_priv-&gt;fmw;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = tas_fw-&gt;nr_configurations - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_info_config, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_get_profile_id(struct snd_kcontrol *kcontrol,</div><div class='add'>+			struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = tas_priv-&gt;rcabin.profile_cfg_id;</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;rcabin.profile_cfg_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_get_profile_id, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_set_profile_id(struct snd_kcontrol *kcontrol,</div><div class='add'>+		struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int profile_id = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	int max = tas_priv-&gt;rcabin.ncfgs - 1;</div><div class='add'>+	int val, ret = 0;</div><div class='add'>+</div><div class='add'>+	val = clamp(profile_id, 0, max);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d -&gt; %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;rcabin.profile_cfg_id, val);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;rcabin.profile_cfg_id != val) {</div><div class='add'>+		tas_priv-&gt;rcabin.profile_cfg_id = val;</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_set_profile_id, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_program_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = tas_priv-&gt;cur_prog;</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;cur_prog);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_program_get, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_program_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct tasdevice_fw *tas_fw = tas_priv-&gt;fmw;</div><div class='add'>+	int nr_program = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	int max = tas_fw-&gt;nr_programs - 1;</div><div class='add'>+	int val, ret = 0;</div><div class='add'>+</div><div class='add'>+	val = clamp(nr_program, 0, max);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d -&gt; %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;cur_prog, val);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;cur_prog != val) {</div><div class='add'>+		tas_priv-&gt;cur_prog = val;</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_program_put, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_config_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = tas_priv-&gt;cur_conf;</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;cur_conf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_config_get, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+int tasdevice_config_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct tasdevice_fw *tas_fw = tas_priv-&gt;fmw;</div><div class='add'>+	int nr_config = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	int max = tas_fw-&gt;nr_configurations - 1;</div><div class='add'>+	int val, ret = 0;</div><div class='add'>+</div><div class='add'>+	val = clamp(nr_config, 0, max);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d -&gt; %d\n", __func__,</div><div class='add'>+		kcontrol-&gt;id.name, tas_priv-&gt;cur_conf, val);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;cur_conf != val) {</div><div class='add'>+		tas_priv-&gt;cur_conf = val;</div><div class='add'>+		ret = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(tasdevice_config_put, "SND_HDA_SCODEC_TAS2781");</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("TAS2781 HDA Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Shenghao Ding, TI, &lt;shenghao-ding@ti.com&gt;");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/tas2781_hda.h b/sound/hda/codecs/side-codecs/tas2781_hda.h<br/>new file mode 100644<br/>index 000000000000..66188909a0bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/tas2781_hda.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/tas2781_hda.h</a></div><div class='hunk'>@@ -0,0 +1,90 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ *</div><div class='add'>+ * HDA audio driver for Texas Instruments TAS2781 smart amp</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Texas Instruments, Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __TAS2781_HDA_H__</div><div class='add'>+#define __TAS2781_HDA_H__</div><div class='add'>+</div><div class='add'>+#include &lt;sound/asound.h&gt;</div><div class='add'>+</div><div class='add'>+/* Flag of calibration registers address. */</div><div class='add'>+#define TASDEV_UEFI_CALI_REG_ADDR_FLG	BIT(7)</div><div class='add'>+</div><div class='add'>+#define TASDEV_CALIB_N			5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD</div><div class='add'>+ * Define two controls, one is Volume control callbacks, the other is</div><div class='add'>+ * flag setting control callbacks.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Volume control callbacks for tas2781 */</div><div class='add'>+#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \</div><div class='add'>+	xhandler_get, xhandler_put, tlv_array) { \</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \</div><div class='add'>+		SNDRV_CTL_ELEM_ACCESS_READWRITE, \</div><div class='add'>+	.tlv.p = (tlv_array), \</div><div class='add'>+	.info = snd_soc_info_volsw, \</div><div class='add'>+	.get = xhandler_get, .put = xhandler_put, \</div><div class='add'>+	.private_value = (unsigned long)&amp;(struct soc_mixer_control) { \</div><div class='add'>+		.reg = xreg, .rreg = xreg, \</div><div class='add'>+		.shift = xshift, .rshift = xshift,\</div><div class='add'>+		.min = xmin, .max = xmax, .invert = xinvert, \</div><div class='add'>+	} \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Flag control callbacks for tas2781 */</div><div class='add'>+#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD, \</div><div class='add'>+	.name = xname, \</div><div class='add'>+	.info = snd_ctl_boolean_mono_info, \</div><div class='add'>+	.get = xhandler_get, \</div><div class='add'>+	.put = xhandler_put, \</div><div class='add'>+	.private_value = xdata, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum device_catlog_id {</div><div class='add'>+	DELL = 0,</div><div class='add'>+	HP,</div><div class='add'>+	LENOVO,</div><div class='add'>+	OTHERS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tas2781_hda {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct tasdevice_priv *priv;</div><div class='add'>+	struct snd_kcontrol *dsp_prog_ctl;</div><div class='add'>+	struct snd_kcontrol *dsp_conf_ctl;</div><div class='add'>+	struct snd_kcontrol *prof_ctl;</div><div class='add'>+	enum device_catlog_id catlog_id;</div><div class='add'>+	void *hda_priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const efi_guid_t tasdev_fct_efi_guid[];</div><div class='add'>+</div><div class='add'>+int tas2781_save_calibration(struct tas2781_hda *p);</div><div class='add'>+void tas2781_hda_remove(struct device *dev,</div><div class='add'>+	const struct component_ops *ops);</div><div class='add'>+int tasdevice_info_profile(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_info *uctl);</div><div class='add'>+int tasdevice_info_programs(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_info *uctl);</div><div class='add'>+int tasdevice_info_config(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_info *uctl);</div><div class='add'>+int tasdevice_set_profile_id(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+int tasdevice_get_profile_id(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+int tasdevice_program_get(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+int tasdevice_program_put(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+int tasdevice_config_put(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+int tasdevice_config_get(struct snd_kcontrol *kctl,</div><div class='add'>+	struct snd_ctl_elem_value *uctl);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c b/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c<br/>new file mode 100644<br/>index 000000000000..c8619995b1d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/tas2781_hda_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,834 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// TAS2781 HDA I2C driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2023 - 2025 Texas Instruments, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Shenghao Ding &lt;shenghao-ding@ti.com&gt;</div><div class='add'>+// Current maintainer: Baojun Xu &lt;baojun.xu@ti.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/crc8.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+#include &lt;sound/tas2781.h&gt;</div><div class='add'>+#include &lt;sound/tas2781-comlib-i2c.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/tas2770-tlv.h&gt;</div><div class='add'>+#include &lt;sound/tas2781-tlv.h&gt;</div><div class='add'>+#include &lt;sound/tas5825-tlv.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_component.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+#include "tas2781_hda.h"</div><div class='add'>+</div><div class='add'>+#define TAS2563_CAL_VAR_NAME_MAX	16</div><div class='add'>+#define TAS2563_CAL_ARRAY_SIZE		80</div><div class='add'>+#define TAS2563_CAL_DATA_SIZE		4</div><div class='add'>+#define TAS2563_MAX_CHANNELS		4</div><div class='add'>+#define TAS2563_CAL_CH_SIZE		20</div><div class='add'>+</div><div class='add'>+#define TAS2563_CAL_R0_LOW		TASDEVICE_REG(0, 0x0f, 0x48)</div><div class='add'>+#define TAS2563_CAL_POWER		TASDEVICE_REG(0, 0x0d, 0x3c)</div><div class='add'>+#define TAS2563_CAL_INVR0		TASDEVICE_REG(0, 0x0f, 0x40)</div><div class='add'>+#define TAS2563_CAL_TLIM		TASDEVICE_REG(0, 0x10, 0x14)</div><div class='add'>+#define TAS2563_CAL_R0			TASDEVICE_REG(0, 0x0f, 0x34)</div><div class='add'>+</div><div class='add'>+enum device_chip_id {</div><div class='add'>+	HDA_TAS2563,</div><div class='add'>+	HDA_TAS2770,</div><div class='add'>+	HDA_TAS2781,</div><div class='add'>+	HDA_TAS5825,</div><div class='add'>+	HDA_OTHERS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tas2781_hda_i2c_priv {</div><div class='add'>+	struct snd_kcontrol *snd_ctls[2];</div><div class='add'>+	int (*save_calibration)(struct tas2781_hda *h);</div><div class='add'>+</div><div class='add'>+	int hda_chip_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tas2781_get_i2c_res(struct acpi_resource *ares, void *data)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = data;</div><div class='add'>+	struct acpi_resource_i2c_serialbus *sb;</div><div class='add'>+</div><div class='add'>+	if (i2c_acpi_get_i2c_resource(ares, &amp;sb)) {</div><div class='add'>+		if (tas_priv-&gt;ndev &lt; TASDEVICE_MAX_CHANNELS &amp;&amp;</div><div class='add'>+			sb-&gt;slave_address != tas_priv-&gt;global_addr) {</div><div class='add'>+			tas_priv-&gt;tasdevice[tas_priv-&gt;ndev].dev_addr =</div><div class='add'>+				(unsigned int)sb-&gt;slave_address;</div><div class='add'>+			tas_priv-&gt;ndev++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct acpi_gpio_params speakerid_gpios = { 0, 0, false };</div><div class='add'>+</div><div class='add'>+static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = {</div><div class='add'>+	{ "speakerid-gpios", &amp;speakerid_gpios, 1 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid)</div><div class='add'>+{</div><div class='add'>+	struct gpio_desc *speaker_id;</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct device *physdev;</div><div class='add'>+	LIST_HEAD(resources);</div><div class='add'>+	const char *sub;</div><div class='add'>+	uint32_t subid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	adev = acpi_dev_get_first_match_dev(hid, NULL, -1);</div><div class='add'>+	if (!adev) {</div><div class='add'>+		dev_err(p-&gt;dev,</div><div class='add'>+			"Failed to find an ACPI device for %s\n", hid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	physdev = get_device(acpi_get_first_physical_node(adev));</div><div class='add'>+	ret = acpi_dev_get_resources(adev, &amp;resources, tas2781_get_i2c_res, p);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to get ACPI resource.\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));</div><div class='add'>+	if (IS_ERR(sub)) {</div><div class='add'>+		/* No subsys id in older tas2563 projects. */</div><div class='add'>+		if (!strncmp(hid, "INT8866", sizeof("INT8866")))</div><div class='add'>+			goto end_2563;</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to get SUBSYS ID.\n");</div><div class='add'>+		ret = PTR_ERR(sub);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	/* Speaker id was needed for ASUS projects. */</div><div class='add'>+	ret = kstrtou32(sub, 16, &amp;subid);</div><div class='add'>+	if (!ret &amp;&amp; upper_16_bits(subid) == PCI_VENDOR_ID_ASUSTEK) {</div><div class='add'>+		ret = acpi_dev_add_driver_gpios(adev, tas2781_speaker_id_gpios);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(p-&gt;dev, "Failed to add driver gpio %d.\n",</div><div class='add'>+				ret);</div><div class='add'>+			p-&gt;speaker_id = -1;</div><div class='add'>+			goto end_2563;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		speaker_id = fwnode_gpiod_get_index(acpi_fwnode_handle(adev),</div><div class='add'>+			"speakerid", 0, GPIOD_IN, NULL);</div><div class='add'>+		if (!IS_ERR(speaker_id)) {</div><div class='add'>+			p-&gt;speaker_id = gpiod_get_value_cansleep(speaker_id);</div><div class='add'>+			dev_dbg(p-&gt;dev, "Got speaker id gpio from ACPI: %d.\n",</div><div class='add'>+				p-&gt;speaker_id);</div><div class='add'>+			gpiod_put(speaker_id);</div><div class='add'>+		} else {</div><div class='add'>+			p-&gt;speaker_id = -1;</div><div class='add'>+			ret = PTR_ERR(speaker_id);</div><div class='add'>+			dev_err(p-&gt;dev, "Get speaker id gpio failed %d.\n",</div><div class='add'>+				ret);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acpi_dev_remove_driver_gpios(adev);</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;speaker_id = -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end_2563:</div><div class='add'>+	acpi_dev_free_resource_list(&amp;resources);</div><div class='add'>+	strscpy(p-&gt;dev_name, hid, sizeof(p-&gt;dev_name));</div><div class='add'>+	put_device(physdev);</div><div class='add'>+	acpi_dev_put(adev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_err(p-&gt;dev, "read acpi error, ret: %d\n", ret);</div><div class='add'>+	put_device(physdev);</div><div class='add'>+	acpi_dev_put(adev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_hda-&gt;dev, "%s: action = %d\n", __func__, action);</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_OPEN:</div><div class='add'>+		pm_runtime_get_sync(dev);</div><div class='add'>+		scoped_guard(mutex, &amp;tas_hda-&gt;priv-&gt;codec_lock) {</div><div class='add'>+			tasdevice_tuning_switch(tas_hda-&gt;priv, 0);</div><div class='add'>+			tas_hda-&gt;priv-&gt;playback_started = true;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLOSE:</div><div class='add'>+		scoped_guard(mutex, &amp;tas_hda-&gt;priv-&gt;codec_lock) {</div><div class='add'>+			tasdevice_tuning_switch(tas_hda-&gt;priv, 1);</div><div class='add'>+			tas_hda-&gt;priv-&gt;playback_started = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pm_runtime_put_autosuspend(dev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_amp_getvol(tas_priv, ucontrol, mc);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %ld\n",</div><div class='add'>+		__func__, kcontrol-&gt;id.name, ucontrol-&gt;value.integer.value[0]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: -&gt; %ld\n",</div><div class='add'>+		__func__, kcontrol-&gt;id.name, ucontrol-&gt;value.integer.value[0]);</div><div class='add'>+</div><div class='add'>+	/* The check of the given value is in tasdevice_amp_putvol. */</div><div class='add'>+	return tasdevice_amp_putvol(tas_priv, ucontrol, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_force_fwload_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = (int)tas_priv-&gt;force_fwload_status;</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d\n",</div><div class='add'>+		__func__, kcontrol-&gt;id.name, tas_priv-&gt;force_fwload_status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	bool change, val = (bool)ucontrol-&gt;value.integer.value[0];</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s: kcontrol %s: %d -&gt; %d\n",</div><div class='add'>+		__func__, kcontrol-&gt;id.name,</div><div class='add'>+		tas_priv-&gt;force_fwload_status, val);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;force_fwload_status == val)</div><div class='add'>+		change = false;</div><div class='add'>+	else {</div><div class='add'>+		change = true;</div><div class='add'>+		tas_priv-&gt;force_fwload_status = val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tas2770_snd_controls[] = {</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2770_AMP_LEVEL,</div><div class='add'>+		0, 0, 20, 0, tas2781_amp_getvol,</div><div class='add'>+		tas2781_amp_putvol, tas2770_amp_tlv),</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Digital Volume", TAS2770_DVC_LEVEL,</div><div class='add'>+		0, 0, 200, 1, tas2781_amp_getvol,</div><div class='add'>+		tas2781_amp_putvol, tas2770_dvc_tlv),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tas2781_snd_controls[] = {</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,</div><div class='add'>+		1, 0, 20, 0, tas2781_amp_getvol,</div><div class='add'>+		tas2781_amp_putvol, tas2781_amp_tlv),</div><div class='add'>+	ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,</div><div class='add'>+		tas2781_force_fwload_get, tas2781_force_fwload_put),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tas5825_snd_controls[] = {</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS5825_AMP_LEVEL,</div><div class='add'>+		0, 0, 31, 1, tas2781_amp_getvol,</div><div class='add'>+		tas2781_amp_putvol, tas5825_amp_tlv),</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Digital Volume", TAS5825_DVC_LEVEL,</div><div class='add'>+		0, 0, 254, 1, tas2781_amp_getvol,</div><div class='add'>+		tas2781_amp_putvol, tas5825_dvc_tlv),</div><div class='add'>+	ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,</div><div class='add'>+		tas2781_force_fwload_get, tas2781_force_fwload_put),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tasdevice_prof_ctrl = {</div><div class='add'>+	.name = "Speaker Profile Id",</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+	.info = tasdevice_info_profile,</div><div class='add'>+	.get = tasdevice_get_profile_id,</div><div class='add'>+	.put = tasdevice_set_profile_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tasdevice_dsp_prog_ctrl = {</div><div class='add'>+	.name = "Speaker Program Id",</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+	.info = tasdevice_info_programs,</div><div class='add'>+	.get = tasdevice_program_get,</div><div class='add'>+	.put = tasdevice_program_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new tasdevice_dsp_conf_ctrl = {</div><div class='add'>+	.name = "Speaker Config Id",</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+	.info = tasdevice_info_config,</div><div class='add'>+	.get = tasdevice_config_get,</div><div class='add'>+	.put = tasdevice_config_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tas2563_save_calibration(struct tas2781_hda *h)</div><div class='add'>+{</div><div class='add'>+	efi_guid_t efi_guid = tasdev_fct_efi_guid[LENOVO];</div><div class='add'>+	char *vars[TASDEV_CALIB_N] = {</div><div class='add'>+		"R0_%d", "R0_Low_%d", "InvR0_%d", "Power_%d", "TLim_%d"</div><div class='add'>+	};</div><div class='add'>+	efi_char16_t efi_name[TAS2563_CAL_VAR_NAME_MAX];</div><div class='add'>+	unsigned long max_size = TAS2563_CAL_DATA_SIZE;</div><div class='add'>+	unsigned char var8[TAS2563_CAL_VAR_NAME_MAX];</div><div class='add'>+	struct tasdevice_priv *p = h-&gt;priv;</div><div class='add'>+	struct calidata *cd = &amp;p-&gt;cali_data;</div><div class='add'>+	struct cali_reg *r = &amp;cd-&gt;cali_reg_array;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	unsigned char *data;</div><div class='add'>+	__be32 bedata;</div><div class='add'>+	efi_status_t status;</div><div class='add'>+	unsigned int attr;</div><div class='add'>+	int ret, i, j, k;</div><div class='add'>+</div><div class='add'>+	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE)) {</div><div class='add'>+		dev_err(p-&gt;dev, "%s: NO EFI FOUND!\n", __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cd-&gt;cali_dat_sz_per_dev = TAS2563_CAL_DATA_SIZE * TASDEV_CALIB_N;</div><div class='add'>+</div><div class='add'>+	/* extra byte for each device is the device number */</div><div class='add'>+	cd-&gt;total_sz = (cd-&gt;cali_dat_sz_per_dev + 1) * p-&gt;ndev;</div><div class='add'>+	data = cd-&gt;data = devm_kzalloc(p-&gt;dev, cd-&gt;total_sz,</div><div class='add'>+		GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; p-&gt;ndev; ++i) {</div><div class='add'>+		data[offset] = i;</div><div class='add'>+		offset++;</div><div class='add'>+		for (j = 0; j &lt; TASDEV_CALIB_N; ++j) {</div><div class='add'>+			/* EFI name for calibration started with 1, not 0 */</div><div class='add'>+			ret = snprintf(var8, sizeof(var8), vars[j], i + 1);</div><div class='add'>+			if (ret &lt; 0 || ret &gt;= sizeof(var8) - 1) {</div><div class='add'>+				dev_err(p-&gt;dev, "%s: Read %s failed\n",</div><div class='add'>+					__func__, var8);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			/*</div><div class='add'>+			 * Our variable names are ASCII by construction, but</div><div class='add'>+			 * EFI names are wide chars.  Convert and zero-pad.</div><div class='add'>+			 */</div><div class='add'>+			memset(efi_name, 0, sizeof(efi_name));</div><div class='add'>+			for (k = 0; k &lt; sizeof(var8) &amp;&amp; var8[k]; k++)</div><div class='add'>+				efi_name[k] = var8[k];</div><div class='add'>+			status = efi.get_variable(efi_name,</div><div class='add'>+				&amp;efi_guid, &amp;attr, &amp;max_size,</div><div class='add'>+				&amp;data[offset]);</div><div class='add'>+			if (status != EFI_SUCCESS ||</div><div class='add'>+				max_size != TAS2563_CAL_DATA_SIZE) {</div><div class='add'>+				dev_warn(p-&gt;dev,</div><div class='add'>+					"Dev %d: Caldat[%d] read failed %ld\n",</div><div class='add'>+					i, j, status);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			bedata = cpu_to_be32(*(uint32_t *)&amp;data[offset]);</div><div class='add'>+			memcpy(&amp;data[offset], &amp;bedata, sizeof(bedata));</div><div class='add'>+			offset += TAS2563_CAL_DATA_SIZE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cd-&gt;total_sz != offset) {</div><div class='add'>+		dev_err(p-&gt;dev, "%s: tot_size(%lu) and offset(%u) mismatch\n",</div><div class='add'>+			__func__, cd-&gt;total_sz, offset);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r-&gt;r0_reg = TAS2563_CAL_R0;</div><div class='add'>+	r-&gt;invr0_reg = TAS2563_CAL_INVR0;</div><div class='add'>+	r-&gt;r0_low_reg = TAS2563_CAL_R0_LOW;</div><div class='add'>+	r-&gt;pow_reg = TAS2563_CAL_POWER;</div><div class='add'>+	r-&gt;tlimit_reg = TAS2563_CAL_TLIM;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * TAS2781_FMWLIB supports two solutions of calibrated data. One is</div><div class='add'>+	 * from the driver itself: driver reads the calibrated files directly</div><div class='add'>+	 * during probe; The other from user space: during init of audio hal,</div><div class='add'>+	 * the audio hal will pass the calibrated data via kcontrol interface.</div><div class='add'>+	 * Driver will store this data in "struct calidata" for use. For hda</div><div class='add'>+	 * device, calibrated data are usunally saved into UEFI. So Hda side</div><div class='add'>+	 * codec driver use the mixture of these two solutions, driver reads</div><div class='add'>+	 * the data from UEFI, then store this data in "struct calidata" for</div><div class='add'>+	 * use.</div><div class='add'>+	 */</div><div class='add'>+	p-&gt;is_user_space_calidata = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_remove_controls(struct tas2781_hda *tas_hda)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda_i2c_priv *hda_priv = tas_hda-&gt;hda_priv;</div><div class='add'>+	struct hda_codec *codec = tas_hda-&gt;priv-&gt;codec;</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;dsp_prog_ctl);</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;dsp_conf_ctl);</div><div class='add'>+</div><div class='add'>+	for (int i = ARRAY_SIZE(hda_priv-&gt;snd_ctls) - 1; i &gt;= 0; i--)</div><div class='add'>+		snd_ctl_remove(codec-&gt;card, hda_priv-&gt;snd_ctls[i]);</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;prof_ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tasdev_add_kcontrols(struct tasdevice_priv *tas_priv,</div><div class='add'>+	struct snd_kcontrol **ctls, struct hda_codec *codec,</div><div class='add'>+	const struct snd_kcontrol_new *tas_snd_ctrls, int num_ctls)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_ctls; i++) {</div><div class='add'>+		ctls[i] = snd_ctl_new1(</div><div class='add'>+			&amp;tas_snd_ctrls[i], tas_priv);</div><div class='add'>+		ret = snd_ctl_add(codec-&gt;card, ctls[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(tas_priv-&gt;dev,</div><div class='add'>+				"Failed to add KControl %s = %d\n",</div><div class='add'>+				tas_snd_ctrls[i].name, ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tasdevice_dspfw_init(void *context)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = context;</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv-&gt;dev);</div><div class='add'>+	struct tas2781_hda_i2c_priv *hda_priv = tas_hda-&gt;hda_priv;</div><div class='add'>+	struct hda_codec *codec = tas_priv-&gt;codec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tasdevice_dsp_remove(tas_priv);</div><div class='add'>+	tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_PENDING;</div><div class='add'>+	if (tas_priv-&gt;speaker_id &gt;= 0) {</div><div class='add'>+		snprintf(tas_priv-&gt;coef_binaryname,</div><div class='add'>+			  sizeof(tas_priv-&gt;coef_binaryname),</div><div class='add'>+			  "TAS2XXX%04X%d.bin",</div><div class='add'>+			  lower_16_bits(codec-&gt;core.subsystem_id),</div><div class='add'>+			  tas_priv-&gt;speaker_id);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(tas_priv-&gt;coef_binaryname,</div><div class='add'>+			  sizeof(tas_priv-&gt;coef_binaryname),</div><div class='add'>+			  "TAS2XXX%04X.bin",</div><div class='add'>+			  lower_16_bits(codec-&gt;core.subsystem_id));</div><div class='add'>+	}</div><div class='add'>+	ret = tasdevice_dsp_parser(tas_priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "dspfw load %s error\n",</div><div class='add'>+			tas_priv-&gt;coef_binaryname);</div><div class='add'>+		tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_FAIL;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	tasdev_add_kcontrols(tas_priv, &amp;tas_hda-&gt;dsp_prog_ctl, codec,</div><div class='add'>+			     &amp;tasdevice_dsp_prog_ctrl, 1);</div><div class='add'>+	tasdev_add_kcontrols(tas_priv, &amp;tas_hda-&gt;dsp_conf_ctl, codec,</div><div class='add'>+			     &amp;tasdevice_dsp_conf_ctrl, 1);</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_ALL_OK;</div><div class='add'>+	tasdevice_prmg_load(tas_priv, 0);</div><div class='add'>+	if (tas_priv-&gt;fmw-&gt;nr_programs &gt; 0)</div><div class='add'>+		tas_priv-&gt;cur_prog = 0;</div><div class='add'>+	if (tas_priv-&gt;fmw-&gt;nr_configurations &gt; 0)</div><div class='add'>+		tas_priv-&gt;cur_conf = 0;</div><div class='add'>+</div><div class='add'>+	/* Init common setting for different audio profiles */</div><div class='add'>+	if (tas_priv-&gt;rcabin.init_profile_id &gt;= 0)</div><div class='add'>+		tasdevice_select_cfg_blk(tas_priv,</div><div class='add'>+			tas_priv-&gt;rcabin.init_profile_id,</div><div class='add'>+			TASDEVICE_BIN_BLK_PRE_POWER_UP);</div><div class='add'>+</div><div class='add'>+	/* If calibrated data occurs error, dsp will still works with default</div><div class='add'>+	 * calibrated data inside algo.</div><div class='add'>+	 */</div><div class='add'>+	hda_priv-&gt;save_calibration(tas_hda);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tasdev_fw_ready(const struct firmware *fmw, void *context)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = context;</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv-&gt;dev);</div><div class='add'>+	struct tas2781_hda_i2c_priv *hda_priv = tas_hda-&gt;hda_priv;</div><div class='add'>+	struct hda_codec *codec = tas_priv-&gt;codec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(tas_priv-&gt;dev);</div><div class='add'>+	mutex_lock(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_rca_parser(tas_priv, fmw);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;fw_state = TASDEVICE_RCA_FW_OK;</div><div class='add'>+	tasdev_add_kcontrols(tas_priv, &amp;tas_hda-&gt;prof_ctl, codec,</div><div class='add'>+		&amp;tasdevice_prof_ctrl, 1);</div><div class='add'>+</div><div class='add'>+	switch (hda_priv-&gt;hda_chip_id) {</div><div class='add'>+	case HDA_TAS2770:</div><div class='add'>+		tasdev_add_kcontrols(tas_priv, hda_priv-&gt;snd_ctls, codec,</div><div class='add'>+				     &amp;tas2770_snd_controls[0],</div><div class='add'>+				     ARRAY_SIZE(tas2770_snd_controls));</div><div class='add'>+		break;</div><div class='add'>+	case HDA_TAS2781:</div><div class='add'>+		tasdev_add_kcontrols(tas_priv, hda_priv-&gt;snd_ctls, codec,</div><div class='add'>+				     &amp;tas2781_snd_controls[0],</div><div class='add'>+				     ARRAY_SIZE(tas2781_snd_controls));</div><div class='add'>+		tasdevice_dspfw_init(context);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_TAS5825:</div><div class='add'>+		tasdev_add_kcontrols(tas_priv, hda_priv-&gt;snd_ctls, codec,</div><div class='add'>+				     &amp;tas5825_snd_controls[0],</div><div class='add'>+				     ARRAY_SIZE(tas5825_snd_controls));</div><div class='add'>+		tasdevice_dspfw_init(context);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_TAS2563:</div><div class='add'>+		tasdevice_dspfw_init(context);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;tas_hda-&gt;priv-&gt;codec_lock);</div><div class='add'>+	release_firmware(fmw);</div><div class='add'>+	pm_runtime_put_autosuspend(tas_hda-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_bind(struct device *dev, struct device *master,</div><div class='add'>+	void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	unsigned int subid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, tas_hda-&gt;priv-&gt;index);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;dev)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	codec = parent-&gt;codec;</div><div class='add'>+	subid = codec-&gt;core.subsystem_id &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	switch (subid) {</div><div class='add'>+	case 0x1028:</div><div class='add'>+		tas_hda-&gt;catlog_id = DELL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		tas_hda-&gt;catlog_id = LENOVO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(dev);</div><div class='add'>+</div><div class='add'>+	comp-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	strscpy(comp-&gt;name, dev_name(dev), sizeof(comp-&gt;name));</div><div class='add'>+</div><div class='add'>+	ret = tascodec_init(tas_hda-&gt;priv, codec, THIS_MODULE, tasdev_fw_ready);</div><div class='add'>+	if (!ret)</div><div class='add'>+		comp-&gt;playback_hook = tas2781_hda_playback_hook;</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_unbind(struct device *dev,</div><div class='add'>+	struct device *master, void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, tas_hda-&gt;priv-&gt;index);</div><div class='add'>+	if (comp &amp;&amp; (comp-&gt;dev == dev)) {</div><div class='add'>+		comp-&gt;dev = NULL;</div><div class='add'>+		memset(comp-&gt;name, 0, sizeof(comp-&gt;name));</div><div class='add'>+		comp-&gt;playback_hook = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas2781_hda_remove_controls(tas_hda);</div><div class='add'>+</div><div class='add'>+	tasdevice_config_info_remove(tas_hda-&gt;priv);</div><div class='add'>+	tasdevice_dsp_remove(tas_hda-&gt;priv);</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;priv-&gt;fw_state = TASDEVICE_DSP_FW_PENDING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_ops tas2781_hda_comp_ops = {</div><div class='add'>+	.bind = tas2781_hda_bind,</div><div class='add'>+	.unbind = tas2781_hda_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_i2c_probe(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda_i2c_priv *hda_priv;</div><div class='add'>+	struct tas2781_hda *tas_hda;</div><div class='add'>+	const char *device_name;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tas_hda = devm_kzalloc(&amp;clt-&gt;dev, sizeof(*tas_hda), GFP_KERNEL);</div><div class='add'>+	if (!tas_hda)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hda_priv = devm_kzalloc(&amp;clt-&gt;dev, sizeof(*hda_priv), GFP_KERNEL);</div><div class='add'>+	if (!hda_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;hda_priv = hda_priv;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;clt-&gt;dev, tas_hda);</div><div class='add'>+	tas_hda-&gt;dev = &amp;clt-&gt;dev;</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;priv = tasdevice_kzalloc(clt);</div><div class='add'>+	if (!tas_hda-&gt;priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (strstr(dev_name(&amp;clt-&gt;dev), "TIAS2781")) {</div><div class='add'>+		/*</div><div class='add'>+		 * TAS2781, integrated on-chip DSP with</div><div class='add'>+		 * global I2C address supported.</div><div class='add'>+		 */</div><div class='add'>+		device_name = "TIAS2781";</div><div class='add'>+		hda_priv-&gt;hda_chip_id = HDA_TAS2781;</div><div class='add'>+		hda_priv-&gt;save_calibration = tas2781_save_calibration;</div><div class='add'>+		tas_hda-&gt;priv-&gt;global_addr = TAS2781_GLOBAL_ADDR;</div><div class='add'>+	} else if (strstarts(dev_name(&amp;clt-&gt;dev), "i2c-TXNW2770")) {</div><div class='add'>+		/*</div><div class='add'>+		 * TAS2770, has no on-chip DSP, so no calibration data</div><div class='add'>+		 * required; has no global I2C address supported.</div><div class='add'>+		 */</div><div class='add'>+		device_name = "TXNW2770";</div><div class='add'>+		hda_priv-&gt;hda_chip_id = HDA_TAS2770;</div><div class='add'>+	} else if (strstarts(dev_name(&amp;clt-&gt;dev),</div><div class='add'>+			     "i2c-TXNW2781:00-tas2781-hda.0")) {</div><div class='add'>+		device_name = "TXNW2781";</div><div class='add'>+		hda_priv-&gt;hda_chip_id = HDA_TAS2781;</div><div class='add'>+		hda_priv-&gt;save_calibration = tas2781_save_calibration;</div><div class='add'>+		tas_hda-&gt;priv-&gt;global_addr = TAS2781_GLOBAL_ADDR;</div><div class='add'>+	} else if (strstr(dev_name(&amp;clt-&gt;dev), "INT8866")) {</div><div class='add'>+		/*</div><div class='add'>+		 * TAS2563, integrated on-chip DSP with</div><div class='add'>+		 * global I2C address supported.</div><div class='add'>+		 */</div><div class='add'>+		device_name = "INT8866";</div><div class='add'>+		hda_priv-&gt;hda_chip_id = HDA_TAS2563;</div><div class='add'>+		hda_priv-&gt;save_calibration = tas2563_save_calibration;</div><div class='add'>+		tas_hda-&gt;priv-&gt;global_addr = TAS2563_GLOBAL_ADDR;</div><div class='add'>+	} else if (strstarts(dev_name(&amp;clt-&gt;dev), "i2c-TXNW5825")) {</div><div class='add'>+		/*</div><div class='add'>+		 * TAS5825, integrated on-chip DSP without</div><div class='add'>+		 * global I2C address and calibration supported.</div><div class='add'>+		 */</div><div class='add'>+		device_name = "TXNW5825";</div><div class='add'>+		hda_priv-&gt;hda_chip_id = HDA_TAS5825;</div><div class='add'>+		tas_hda-&gt;priv-&gt;chip_id = TAS5825;</div><div class='add'>+	} else {</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;priv-&gt;irq = clt-&gt;irq;</div><div class='add'>+	ret = tas2781_read_acpi(tas_hda-&gt;priv, device_name);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(tas_hda-&gt;dev, ret,</div><div class='add'>+			"Platform not supported\n");</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_init(tas_hda-&gt;priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(tas_hda-&gt;dev, 3000);</div><div class='add'>+	pm_runtime_use_autosuspend(tas_hda-&gt;dev);</div><div class='add'>+	pm_runtime_mark_last_busy(tas_hda-&gt;dev);</div><div class='add'>+	pm_runtime_set_active(tas_hda-&gt;dev);</div><div class='add'>+	pm_runtime_enable(tas_hda-&gt;dev);</div><div class='add'>+</div><div class='add'>+	tasdevice_reset(tas_hda-&gt;priv);</div><div class='add'>+</div><div class='add'>+	ret = component_add(tas_hda-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(tas_hda-&gt;dev, "Register component failed: %d\n", ret);</div><div class='add'>+		pm_runtime_disable(tas_hda-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (ret)</div><div class='add'>+		tas2781_hda_remove(&amp;clt-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_i2c_remove(struct i2c_client *clt)</div><div class='add'>+{</div><div class='add'>+	tas2781_hda_remove(&amp;clt-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_hda-&gt;dev, "Runtime Suspend\n");</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_hda-&gt;priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	/* The driver powers up the amplifiers at module load time.</div><div class='add'>+	 * Stop the playback if it's unused.</div><div class='add'>+	 */</div><div class='add'>+	if (tas_hda-&gt;priv-&gt;playback_started) {</div><div class='add'>+		tasdevice_tuning_switch(tas_hda-&gt;priv, 1);</div><div class='add'>+		tas_hda-&gt;priv-&gt;playback_started = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_hda-&gt;dev, "Runtime Resume\n");</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_hda-&gt;priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	tasdevice_prmg_load(tas_hda-&gt;priv, tas_hda-&gt;priv-&gt;cur_prog);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_system_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_hda-&gt;priv-&gt;dev, "System Suspend\n");</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_hda-&gt;priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	/* Shutdown chip before system suspend */</div><div class='add'>+	if (tas_hda-&gt;priv-&gt;playback_started)</div><div class='add'>+		tasdevice_tuning_switch(tas_hda-&gt;priv, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Reset GPIO may be shared, so cannot reset here.</div><div class='add'>+	 * However beyond this point, amps may be powered down.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_system_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(tas_hda-&gt;priv-&gt;dev, "System Resume\n");</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_hda-&gt;priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tas_hda-&gt;priv-&gt;ndev; i++) {</div><div class='add'>+		tas_hda-&gt;priv-&gt;tasdevice[i].cur_book = -1;</div><div class='add'>+		tas_hda-&gt;priv-&gt;tasdevice[i].cur_prog = -1;</div><div class='add'>+		tas_hda-&gt;priv-&gt;tasdevice[i].cur_conf = -1;</div><div class='add'>+	}</div><div class='add'>+	tasdevice_reset(tas_hda-&gt;priv);</div><div class='add'>+	tasdevice_prmg_load(tas_hda-&gt;priv, tas_hda-&gt;priv-&gt;cur_prog);</div><div class='add'>+</div><div class='add'>+	/* Init common setting for different audio profiles */</div><div class='add'>+	if (tas_hda-&gt;priv-&gt;rcabin.init_profile_id &gt;= 0)</div><div class='add'>+		tasdevice_select_cfg_blk(tas_hda-&gt;priv,</div><div class='add'>+			tas_hda-&gt;priv-&gt;rcabin.init_profile_id,</div><div class='add'>+			TASDEVICE_BIN_BLK_PRE_POWER_UP);</div><div class='add'>+</div><div class='add'>+	if (tas_hda-&gt;priv-&gt;playback_started)</div><div class='add'>+		tasdevice_tuning_switch(tas_hda-&gt;priv, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops tas2781_hda_pm_ops = {</div><div class='add'>+	RUNTIME_PM_OPS(tas2781_runtime_suspend, tas2781_runtime_resume, NULL)</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(tas2781_system_suspend, tas2781_system_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id tas2781_hda_i2c_id[] = {</div><div class='add'>+	{ "tas2781-hda" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id tas2781_acpi_hda_match[] = {</div><div class='add'>+	{"INT8866", 0 },</div><div class='add'>+	{"TIAS2781", 0 },</div><div class='add'>+	{"TXNW2770", 0 },</div><div class='add'>+	{"TXNW2781", 0 },</div><div class='add'>+	{"TXNW5825", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, tas2781_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver tas2781_hda_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "tas2781-hda",</div><div class='add'>+		.acpi_match_table = tas2781_acpi_hda_match,</div><div class='add'>+		.pm		= &amp;tas2781_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= tas2781_hda_i2c_id,</div><div class='add'>+	.probe		= tas2781_hda_i2c_probe,</div><div class='add'>+	.remove		= tas2781_hda_i2c_remove,</div><div class='add'>+};</div><div class='add'>+module_i2c_driver(tas2781_hda_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("TAS2781 HDA Driver");</div><div class='add'>+MODULE_AUTHOR("Shenghao Ding, TI, &lt;shenghao-ding@ti.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_TAS2781_FMWLIB");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_TAS2781");</div><div class='head'>diff --git a/sound/hda/codecs/side-codecs/tas2781_hda_spi.c b/sound/hda/codecs/side-codecs/tas2781_hda_spi.c<br/>new file mode 100644<br/>index 000000000000..b9a55672bf15<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/side-codecs/tas2781_hda_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/side-codecs/tas2781_hda_spi.c</a></div><div class='hunk'>@@ -0,0 +1,956 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// TAS2781 HDA SPI driver</div><div class='add'>+//</div><div class='add'>+// Copyright 2024 - 2025 Texas Instruments, Inc.</div><div class='add'>+//</div><div class='add'>+// Author: Baojun Xu &lt;baojun.xu@ti.com&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/cleanup.h&gt;</div><div class='add'>+#include &lt;linux/crc8.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/efi.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/soc.h&gt;</div><div class='add'>+#include &lt;sound/tas2781.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/tas2781-tlv.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_component.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "../generic.h"</div><div class='add'>+#include "tas2781_hda.h"</div><div class='add'>+</div><div class='add'>+#define TASDEVICE_RANGE_MAX_SIZE	(256 * 128)</div><div class='add'>+#define TASDEVICE_WIN_LEN		128</div><div class='add'>+#define TAS2781_SPI_MAX_FREQ		(4 * HZ_PER_MHZ)</div><div class='add'>+/* Flag of calibration registers address. */</div><div class='add'>+#define TASDEVICE_CALIBRATION_REG_ADDRESS	BIT(7)</div><div class='add'>+#define TASDEV_UEFI_CALI_REG_ADDR_FLG	BIT(7)</div><div class='add'>+</div><div class='add'>+/* System Reset Check Register */</div><div class='add'>+#define TAS2781_REG_CLK_CONFIG		TASDEVICE_REG(0x0, 0x0, 0x5c)</div><div class='add'>+#define TAS2781_REG_CLK_CONFIG_RESET	0x19</div><div class='add'>+</div><div class='add'>+struct tas2781_hda_spi_priv {</div><div class='add'>+	struct snd_kcontrol *snd_ctls[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range_cfg tasdevice_ranges[] = {</div><div class='add'>+	{</div><div class='add'>+		.range_min = 0,</div><div class='add'>+		.range_max = TASDEVICE_RANGE_MAX_SIZE,</div><div class='add'>+		.selector_reg = TASDEVICE_PAGE_SELECT,</div><div class='add'>+		.selector_mask = GENMASK(7, 0),</div><div class='add'>+		.selector_shift = 0,</div><div class='add'>+		.window_start = 0,</div><div class='add'>+		.window_len = TASDEVICE_WIN_LEN,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config tasdevice_regmap = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.zero_flag_mask = true,</div><div class='add'>+	.read_flag_mask = 0x01,</div><div class='add'>+	.reg_shift = -1,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.ranges = tasdevice_ranges,</div><div class='add'>+	.num_ranges = ARRAY_SIZE(tasdevice_ranges),</div><div class='add'>+	.max_register = TASDEVICE_RANGE_MAX_SIZE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv,</div><div class='add'>+	unsigned short chn, unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In our TAS2781 SPI mode, if read from other book (not book 0),</div><div class='add'>+	 * or read from page number larger than 1 in book 0, one more byte</div><div class='add'>+	 * read is needed, and first byte is a dummy byte, need to be ignored.</div><div class='add'>+	 */</div><div class='add'>+	if ((TASDEVICE_BOOK_ID(reg) &gt; 0) || (TASDEVICE_PAGE_ID(reg) &gt; 1)) {</div><div class='add'>+		unsigned char data[2];</div><div class='add'>+</div><div class='add'>+		ret = tasdevice_dev_bulk_read(tas_priv, chn, reg,</div><div class='add'>+			data, sizeof(data));</div><div class='add'>+		*val = data[1];</div><div class='add'>+	} else {</div><div class='add'>+		ret = tasdevice_dev_read(tas_priv, chn, reg, val);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "%s, E=%d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_dev_bulk_read(struct tasdevice_priv *tas_priv,</div><div class='add'>+	unsigned short chn, unsigned int reg, unsigned char *data,</div><div class='add'>+	unsigned int len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In our TAS2781 SPI mode, if read from other book (not book 0),</div><div class='add'>+	 * or read from page number larger than 1 in book 0, one more byte</div><div class='add'>+	 * read is needed, and first byte is a dummy byte, need to be ignored.</div><div class='add'>+	 */</div><div class='add'>+	if ((TASDEVICE_BOOK_ID(reg) &gt; 0) || (TASDEVICE_PAGE_ID(reg) &gt; 1)) {</div><div class='add'>+		unsigned char buf[TASDEVICE_WIN_LEN + 1];</div><div class='add'>+</div><div class='add'>+		ret = tasdevice_dev_bulk_read(tas_priv, chn, reg,</div><div class='add'>+			buf, len + 1);</div><div class='add'>+		memcpy(data, buf + 1, len);</div><div class='add'>+	} else {</div><div class='add'>+		ret = tasdevice_dev_bulk_read(tas_priv, chn, reg, data, len);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "%s, E=%d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_dev_update_bits(struct tasdevice_priv *tas_priv,</div><div class='add'>+	unsigned short chn, unsigned int reg, unsigned int mask,</div><div class='add'>+	unsigned int value)</div><div class='add'>+{</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In our TAS2781 SPI mode, read/write was masked in last bit of</div><div class='add'>+	 * address, it cause regmap_update_bits() not work as expected.</div><div class='add'>+	 */</div><div class='add'>+	ret = tasdevice_dev_read(tas_priv, chn, reg, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "%s, E=%d\n", __func__, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_dev_write(tas_priv, chn, TASDEVICE_PAGE_REG(reg),</div><div class='add'>+		(val &amp; ~mask) | (mask &amp; value));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "%s, E=%d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_change_chn_book(struct tasdevice_priv *p,</div><div class='add'>+	unsigned short chn, int book)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (chn == p-&gt;index) {</div><div class='add'>+		struct tasdevice *tasdev = &amp;p-&gt;tasdevice[chn];</div><div class='add'>+		struct regmap *map = p-&gt;regmap;</div><div class='add'>+</div><div class='add'>+		if (tasdev-&gt;cur_book != book) {</div><div class='add'>+			ret = regmap_write(map, TASDEVICE_BOOKCTL_REG, book);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				dev_err(p-&gt;dev, "%s, E=%d\n", __func__, ret);</div><div class='add'>+			else</div><div class='add'>+				tasdev-&gt;cur_book = book;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EXDEV;</div><div class='add'>+		dev_dbg(p-&gt;dev, "Not error, %s ignore channel(%d)\n",</div><div class='add'>+			__func__, chn);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_spi_reset(struct tasdevice_priv *tas_dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (tas_dev-&gt;reset) {</div><div class='add'>+		gpiod_set_value_cansleep(tas_dev-&gt;reset, 0);</div><div class='add'>+		fsleep(800);</div><div class='add'>+		gpiod_set_value_cansleep(tas_dev-&gt;reset, 1);</div><div class='add'>+	} else {</div><div class='add'>+		ret = tasdevice_dev_write(tas_dev, tas_dev-&gt;index,</div><div class='add'>+			TASDEVICE_REG_SWRESET, TASDEVICE_REG_SWRESET_RESET);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(tas_dev-&gt;dev, "dev sw-reset fail, %d\n", ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		fsleep(1000);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tascodec_spi_init(struct tasdevice_priv *tas_priv,</div><div class='add'>+	void *codec, struct module *module,</div><div class='add'>+	void (*cont)(const struct firmware *fw, void *context))</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Codec Lock Hold to ensure that codec_probe and firmware parsing and</div><div class='add'>+	 * loading do not simultaneously execute.</div><div class='add'>+	 */</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	scnprintf(tas_priv-&gt;rca_binaryname,</div><div class='add'>+		sizeof(tas_priv-&gt;rca_binaryname), "%sRCA%d.bin",</div><div class='add'>+		tas_priv-&gt;dev_name, tas_priv-&gt;ndev);</div><div class='add'>+	crc8_populate_msb(tas_priv-&gt;crc8_lkp_tbl, TASDEVICE_CRC8_POLYNOMIAL);</div><div class='add'>+	tas_priv-&gt;codec = codec;</div><div class='add'>+	ret = request_firmware_nowait(module, FW_ACTION_UEVENT,</div><div class='add'>+		tas_priv-&gt;rca_binaryname, tas_priv-&gt;dev, GFP_KERNEL, tas_priv,</div><div class='add'>+		cont);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "request_firmware_nowait err:0x%08x\n",</div><div class='add'>+			ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tasdevice_spi_init(struct tasdevice_priv *tas_priv)</div><div class='add'>+{</div><div class='add'>+	tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_book = -1;</div><div class='add'>+	tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_conf = -1;</div><div class='add'>+	tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_prog = -1;</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;isspi = true;</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;update_bits = tasdevice_spi_dev_update_bits;</div><div class='add'>+	tas_priv-&gt;change_chn_book = tasdevice_spi_change_chn_book;</div><div class='add'>+	tas_priv-&gt;dev_read = tasdevice_spi_dev_read;</div><div class='add'>+	tas_priv-&gt;dev_bulk_read = tasdevice_spi_dev_bulk_read;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_amp_putvol(struct tasdevice_priv *tas_priv,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc)</div><div class='add'>+{</div><div class='add'>+	unsigned int invert = mc-&gt;invert;</div><div class='add'>+	unsigned char mask;</div><div class='add'>+	int max = mc-&gt;max;</div><div class='add'>+	int val, ret;</div><div class='add'>+</div><div class='add'>+	mask = rounddown_pow_of_two(max);</div><div class='add'>+	mask &lt;&lt;= mc-&gt;shift;</div><div class='add'>+	val =  clamp(invert ? max - ucontrol-&gt;value.integer.value[0] :</div><div class='add'>+		ucontrol-&gt;value.integer.value[0], 0, max);</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_spi_dev_update_bits(tas_priv, tas_priv-&gt;index,</div><div class='add'>+		mc-&gt;reg, mask, (unsigned int)(val &lt;&lt; mc-&gt;shift));</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "set AMP vol error in dev %d\n",</div><div class='add'>+			tas_priv-&gt;index);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_amp_getvol(struct tasdevice_priv *tas_priv,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc)</div><div class='add'>+{</div><div class='add'>+	unsigned int invert = mc-&gt;invert;</div><div class='add'>+	unsigned char mask = 0;</div><div class='add'>+	int max = mc-&gt;max;</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_spi_dev_read(tas_priv, tas_priv-&gt;index, mc-&gt;reg, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "%s, get AMP vol error\n", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask = rounddown_pow_of_two(max);</div><div class='add'>+	mask &lt;&lt;= mc-&gt;shift;</div><div class='add'>+	val = (val &amp; mask) &gt;&gt; mc-&gt;shift;</div><div class='add'>+	val = clamp(invert ? max - val : val, 0, max);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = val;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_digital_putvol(struct tasdevice_priv *p,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc)</div><div class='add'>+{</div><div class='add'>+	unsigned int invert = mc-&gt;invert;</div><div class='add'>+	int max = mc-&gt;max;</div><div class='add'>+	int val, ret;</div><div class='add'>+</div><div class='add'>+	val = clamp(invert ? max - ucontrol-&gt;value.integer.value[0] :</div><div class='add'>+		ucontrol-&gt;value.integer.value[0], 0, max);</div><div class='add'>+	ret = tasdevice_dev_write(p, p-&gt;index, mc-&gt;reg, (unsigned int)val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(p-&gt;dev, "set digital vol err in dev %d\n", p-&gt;index);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tasdevice_spi_digital_getvol(struct tasdevice_priv *p,</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc)</div><div class='add'>+{</div><div class='add'>+	unsigned int invert = mc-&gt;invert;</div><div class='add'>+	int max = mc-&gt;max;</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_spi_dev_read(p, p-&gt;index, mc-&gt;reg, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(p-&gt;dev, "%s, get digital vol err\n", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = clamp(invert ? max - val : val, 0, max);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = val;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_read_acpi(struct tas2781_hda *tas_hda,</div><div class='add'>+	const char *hid, int id)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *p = tas_hda-&gt;priv;</div><div class='add'>+	struct acpi_device *adev;</div><div class='add'>+	struct device *physdev;</div><div class='add'>+	u32 values[HDA_MAX_COMPONENTS];</div><div class='add'>+	const char *property;</div><div class='add'>+	size_t nval;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	adev = acpi_dev_get_first_match_dev(hid, NULL, -1);</div><div class='add'>+	if (!adev) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to find ACPI device: %s\n", hid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(p-&gt;dev_name, hid, sizeof(p-&gt;dev_name));</div><div class='add'>+	physdev = get_device(acpi_get_first_physical_node(adev));</div><div class='add'>+	acpi_dev_put(adev);</div><div class='add'>+</div><div class='add'>+	property = "ti,dev-index";</div><div class='add'>+	ret = device_property_count_u32(physdev, property);</div><div class='add'>+	if (ret &lt;= 0 || ret &gt; ARRAY_SIZE(values)) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	p-&gt;ndev = nval = ret;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32_array(physdev, property, values, nval);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	p-&gt;index = U8_MAX;</div><div class='add'>+	for (i = 0; i &lt; nval; i++) {</div><div class='add'>+		if (values[i] == id) {</div><div class='add'>+			p-&gt;index = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (p-&gt;index == U8_MAX) {</div><div class='add'>+		dev_dbg(p-&gt;dev, "No index found in %s\n", property);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;index == 0) {</div><div class='add'>+		/* All of amps share same RESET pin. */</div><div class='add'>+		p-&gt;reset = devm_gpiod_get_index_optional(physdev, "reset",</div><div class='add'>+			p-&gt;index, GPIOD_OUT_LOW);</div><div class='add'>+		if (IS_ERR(p-&gt;reset)) {</div><div class='add'>+			ret = PTR_ERR(p-&gt;reset);</div><div class='add'>+			dev_err_probe(p-&gt;dev, ret, "Failed on reset GPIO\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	put_device(physdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_err(p-&gt;dev, "read acpi error, ret: %d\n", ret);</div><div class='add'>+	put_device(physdev);</div><div class='add'>+	acpi_dev_put(adev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_playback_hook(struct device *dev, int action)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_GEN_PCM_ACT_OPEN) {</div><div class='add'>+		pm_runtime_get_sync(dev);</div><div class='add'>+		guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+		if (tas_priv-&gt;fw_state == TASDEVICE_DSP_FW_ALL_OK)</div><div class='add'>+			tasdevice_tuning_switch(tas_hda-&gt;priv, 0);</div><div class='add'>+	} else if (action == HDA_GEN_PCM_ACT_CLOSE) {</div><div class='add'>+		guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+		if (tas_priv-&gt;fw_state == TASDEVICE_DSP_FW_ALL_OK)</div><div class='add'>+			tasdevice_tuning_switch(tas_priv, 1);</div><div class='add'>+		pm_runtime_put_autosuspend(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * tas2781_digital_getvol - get the volum control</div><div class='add'>+ * @kcontrol: control pointer</div><div class='add'>+ * @ucontrol: User data</div><div class='add'>+ *</div><div class='add'>+ * Customer Kcontrol for tas2781 is primarily for regmap booking, paging</div><div class='add'>+ * depends on internal regmap mechanism.</div><div class='add'>+ * tas2781 contains book and page two-level register map, especially</div><div class='add'>+ * book switching will set the register BXXP00R7F, after switching to the</div><div class='add'>+ * correct book, then leverage the mechanism for paging to access the</div><div class='add'>+ * register.</div><div class='add'>+ *</div><div class='add'>+ * Return 0 if succeeded.</div><div class='add'>+ */</div><div class='add'>+static int tas2781_digital_getvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+	return tasdevice_spi_digital_getvol(tas_priv, ucontrol, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+	return tasdevice_spi_amp_getvol(tas_priv, ucontrol, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_digital_putvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+	return tasdevice_spi_digital_putvol(tas_priv, ucontrol, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct soc_mixer_control *mc =</div><div class='add'>+		(struct soc_mixer_control *)kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+	return tasdevice_spi_amp_putvol(tas_priv, ucontrol, mc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_force_fwload_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = (int)tas_priv-&gt;force_fwload_status;</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s : Force FWload %s\n", __func__,</div><div class='add'>+		str_on_off(tas_priv-&gt;force_fwload_status));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_force_fwload_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	bool change, val = (bool)ucontrol-&gt;value.integer.value[0];</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;force_fwload_status == val) {</div><div class='add'>+		change = false;</div><div class='add'>+	} else {</div><div class='add'>+		change = true;</div><div class='add'>+		tas_priv-&gt;force_fwload_status = val;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(tas_priv-&gt;dev, "%s : Force FWload %s\n", __func__,</div><div class='add'>+		str_on_off(tas_priv-&gt;force_fwload_status));</div><div class='add'>+</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new tas2781_snd_ctls[] = {</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_AMP_LEVEL, 1, 0, 20, 0,</div><div class='add'>+		tas2781_amp_getvol, tas2781_amp_putvol,</div><div class='add'>+		tas2781_amp_tlv),</div><div class='add'>+	ACARD_SINGLE_RANGE_EXT_TLV(NULL, TAS2781_DVC_LVL, 0, 0, 200, 1,</div><div class='add'>+		tas2781_digital_getvol, tas2781_digital_putvol,</div><div class='add'>+		tas2781_dvc_tlv),</div><div class='add'>+	ACARD_SINGLE_BOOL_EXT(NULL, 0, tas2781_force_fwload_get,</div><div class='add'>+		tas2781_force_fwload_put),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new tas2781_prof_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+	.info = tasdevice_info_profile,</div><div class='add'>+	.get = tasdevice_get_profile_id,</div><div class='add'>+	.put = tasdevice_set_profile_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new tas2781_dsp_ctls[] = {</div><div class='add'>+	/* Speaker Program */</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+		.info = tasdevice_info_programs,</div><div class='add'>+		.get = tasdevice_program_get,</div><div class='add'>+		.put = tasdevice_program_put,</div><div class='add'>+	},</div><div class='add'>+	/* Speaker Config */</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='add'>+		.info = tasdevice_info_config,</div><div class='add'>+		.get = tasdevice_config_get,</div><div class='add'>+		.put = tasdevice_config_put,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_remove_controls(struct tas2781_hda *tas_hda)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = tas_hda-&gt;priv-&gt;codec;</div><div class='add'>+	struct tas2781_hda_spi_priv *h_priv = tas_hda-&gt;hda_priv;</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;dsp_prog_ctl);</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;dsp_conf_ctl);</div><div class='add'>+</div><div class='add'>+	for (int i = ARRAY_SIZE(h_priv-&gt;snd_ctls) - 1; i &gt;= 0; i--)</div><div class='add'>+		snd_ctl_remove(codec-&gt;card, h_priv-&gt;snd_ctls[i]);</div><div class='add'>+</div><div class='add'>+	snd_ctl_remove(codec-&gt;card, tas_hda-&gt;prof_ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_spi_prf_ctl(struct tas2781_hda *h)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *p = h-&gt;priv;</div><div class='add'>+	struct hda_codec *c = p-&gt;codec;</div><div class='add'>+	char name[64];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "Speaker-%d Profile Id", p-&gt;index);</div><div class='add'>+	tas2781_prof_ctl.name = name;</div><div class='add'>+	h-&gt;prof_ctl = snd_ctl_new1(&amp;tas2781_prof_ctl, p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h-&gt;prof_ctl);</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_prof_ctl.name, rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_spi_snd_ctls(struct tas2781_hda *h)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda_spi_priv *h_priv = h-&gt;hda_priv;</div><div class='add'>+	struct tasdevice_priv *p = h-&gt;priv;</div><div class='add'>+	struct hda_codec *c = p-&gt;codec;</div><div class='add'>+	char name[64];</div><div class='add'>+	int i = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "Speaker-%d Analog Volume", p-&gt;index);</div><div class='add'>+	tas2781_snd_ctls[i].name = name;</div><div class='add'>+	h_priv-&gt;snd_ctls[i] = snd_ctl_new1(&amp;tas2781_snd_ctls[i], p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h_priv-&gt;snd_ctls[i]);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_snd_ctls[i].name, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	i++;</div><div class='add'>+	snprintf(name, sizeof(name), "Speaker-%d Digital Volume", p-&gt;index);</div><div class='add'>+	tas2781_snd_ctls[i].name = name;</div><div class='add'>+	h_priv-&gt;snd_ctls[i] = snd_ctl_new1(&amp;tas2781_snd_ctls[i], p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h_priv-&gt;snd_ctls[i]);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_snd_ctls[i].name, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	i++;</div><div class='add'>+	snprintf(name, sizeof(name), "Froce Speaker-%d FW Load", p-&gt;index);</div><div class='add'>+	tas2781_snd_ctls[i].name = name;</div><div class='add'>+	h_priv-&gt;snd_ctls[i] = snd_ctl_new1(&amp;tas2781_snd_ctls[i], p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h_priv-&gt;snd_ctls[i]);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_snd_ctls[i].name, rc);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_spi_dsp_ctls(struct tas2781_hda *h)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *p = h-&gt;priv;</div><div class='add'>+	struct hda_codec *c = p-&gt;codec;</div><div class='add'>+	char name[64];</div><div class='add'>+	int i = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "Speaker-%d Program Id", p-&gt;index);</div><div class='add'>+	tas2781_dsp_ctls[i].name = name;</div><div class='add'>+	h-&gt;dsp_prog_ctl = snd_ctl_new1(&amp;tas2781_dsp_ctls[i], p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h-&gt;dsp_prog_ctl);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_dsp_ctls[i].name, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	i++;</div><div class='add'>+	snprintf(name, sizeof(name), "Speaker-%d Config Id", p-&gt;index);</div><div class='add'>+	tas2781_dsp_ctls[i].name = name;</div><div class='add'>+	h-&gt;dsp_conf_ctl = snd_ctl_new1(&amp;tas2781_dsp_ctls[i], p);</div><div class='add'>+	rc = snd_ctl_add(c-&gt;card, h-&gt;dsp_conf_ctl);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(p-&gt;dev, "Failed to add KControl: %s, rc = %d\n",</div><div class='add'>+			tas2781_dsp_ctls[i].name, rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tasdev_fw_ready(const struct firmware *fmw, void *context)</div><div class='add'>+{</div><div class='add'>+	struct tasdevice_priv *tas_priv = context;</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv-&gt;dev);</div><div class='add'>+	struct hda_codec *codec = tas_priv-&gt;codec;</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(tas_priv-&gt;dev);</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	ret = tasdevice_rca_parser(tas_priv, fmw);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Add control one time only. */</div><div class='add'>+	ret = tas2781_hda_spi_prf_ctl(tas_hda);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = tas2781_hda_spi_snd_ctls(tas_hda);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tasdevice_dsp_remove(tas_priv);</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_PENDING;</div><div class='add'>+	scnprintf(tas_priv-&gt;coef_binaryname, 64, "TAS2XXX%04X-%01d.bin",</div><div class='add'>+		lower_16_bits(codec-&gt;core.subsystem_id), tas_priv-&gt;index);</div><div class='add'>+	ret = tasdevice_dsp_parser(tas_priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "dspfw load %s error\n",</div><div class='add'>+			tas_priv-&gt;coef_binaryname);</div><div class='add'>+		tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_FAIL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tas2781_hda_spi_dsp_ctls(tas_hda);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Perform AMP reset before firmware download. */</div><div class='add'>+	tas2781_spi_reset(tas_priv);</div><div class='add'>+	tas_priv-&gt;rcabin.profile_cfg_id = 0;</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_ALL_OK;</div><div class='add'>+	ret = tasdevice_spi_dev_read(tas_priv, tas_priv-&gt;index,</div><div class='add'>+		TAS2781_REG_CLK_CONFIG, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (val == TAS2781_REG_CLK_CONFIG_RESET) {</div><div class='add'>+		ret = tasdevice_prmg_load(tas_priv, 0);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(tas_priv-&gt;dev, "FW download failed = %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_ALL_OK;</div><div class='add'>+	}</div><div class='add'>+	if (tas_priv-&gt;fmw-&gt;nr_programs &gt; 0)</div><div class='add'>+		tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_prog = 0;</div><div class='add'>+	if (tas_priv-&gt;fmw-&gt;nr_configurations &gt; 0)</div><div class='add'>+		tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_conf = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If calibrated data occurs error, dsp will still works with default</div><div class='add'>+	 * calibrated data inside algo.</div><div class='add'>+	 */</div><div class='add'>+	tas2781_save_calibration(tas_hda);</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fmw);</div><div class='add'>+	pm_runtime_put_autosuspend(tas_hda-&gt;priv-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_bind(struct device *dev, struct device *master,</div><div class='add'>+	void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, tas_hda-&gt;priv-&gt;index);</div><div class='add'>+	if (!comp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (comp-&gt;dev)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	codec = parent-&gt;codec;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(dev);</div><div class='add'>+</div><div class='add'>+	comp-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	strscpy(comp-&gt;name, dev_name(dev), sizeof(comp-&gt;name));</div><div class='add'>+</div><div class='add'>+	ret = tascodec_spi_init(tas_hda-&gt;priv, codec, THIS_MODULE,</div><div class='add'>+		tasdev_fw_ready);</div><div class='add'>+	if (!ret)</div><div class='add'>+		comp-&gt;playback_hook = tas2781_hda_playback_hook;</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_unbind(struct device *dev, struct device *master,</div><div class='add'>+			       void *master_data)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct hda_component_parent *parent = master_data;</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+	struct hda_component *comp;</div><div class='add'>+</div><div class='add'>+	comp = hda_component_from_index(parent, tas_priv-&gt;index);</div><div class='add'>+	if (comp &amp;&amp; (comp-&gt;dev == dev)) {</div><div class='add'>+		comp-&gt;dev = NULL;</div><div class='add'>+		memset(comp-&gt;name, 0, sizeof(comp-&gt;name));</div><div class='add'>+		comp-&gt;playback_hook = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas2781_hda_remove_controls(tas_hda);</div><div class='add'>+</div><div class='add'>+	tasdevice_config_info_remove(tas_priv);</div><div class='add'>+	tasdevice_dsp_remove(tas_priv);</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;priv-&gt;fw_state = TASDEVICE_DSP_FW_PENDING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_ops tas2781_hda_comp_ops = {</div><div class='add'>+	.bind = tas2781_hda_bind,</div><div class='add'>+	.unbind = tas2781_hda_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tas2781_hda_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda_spi_priv *hda_priv;</div><div class='add'>+	struct tasdevice_priv *tas_priv;</div><div class='add'>+	struct tas2781_hda *tas_hda;</div><div class='add'>+	const char *device_name;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	tas_hda = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*tas_hda), GFP_KERNEL);</div><div class='add'>+	if (!tas_hda)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hda_priv = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*hda_priv), GFP_KERNEL);</div><div class='add'>+	if (!hda_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tas_hda-&gt;hda_priv = hda_priv;</div><div class='add'>+	spi-&gt;max_speed_hz = TAS2781_SPI_MAX_FREQ;</div><div class='add'>+</div><div class='add'>+	tas_priv = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*tas_priv), GFP_KERNEL);</div><div class='add'>+	if (!tas_priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	tas_priv-&gt;dev = &amp;spi-&gt;dev;</div><div class='add'>+	tas_hda-&gt;priv = tas_priv;</div><div class='add'>+	tas_priv-&gt;regmap = devm_regmap_init_spi(spi, &amp;tasdevice_regmap);</div><div class='add'>+	if (IS_ERR(tas_priv-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(tas_priv-&gt;regmap);</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "Failed to allocate regmap: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (strstr(dev_name(&amp;spi-&gt;dev), "TXNW2781")) {</div><div class='add'>+		device_name = "TXNW2781";</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "Unmatched spi dev %s\n",</div><div class='add'>+			dev_name(&amp;spi-&gt;dev));</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;irq = spi-&gt;irq;</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, tas_hda);</div><div class='add'>+	ret = tas2781_read_acpi(tas_hda, device_name,</div><div class='add'>+				spi_get_chipselect(spi, 0));</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(tas_priv-&gt;dev, ret,</div><div class='add'>+				"Platform not supported\n");</div><div class='add'>+</div><div class='add'>+	tasdevice_spi_init(tas_priv);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(tas_priv-&gt;dev, 3000);</div><div class='add'>+	pm_runtime_use_autosuspend(tas_priv-&gt;dev);</div><div class='add'>+	pm_runtime_set_active(tas_priv-&gt;dev);</div><div class='add'>+	pm_runtime_get_noresume(tas_priv-&gt;dev);</div><div class='add'>+	pm_runtime_enable(tas_priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put_autosuspend(tas_priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = component_add(tas_priv-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(tas_priv-&gt;dev, "Register component fail: %d\n", ret);</div><div class='add'>+		pm_runtime_disable(tas_priv-&gt;dev);</div><div class='add'>+		tas2781_hda_remove(&amp;spi-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tas2781_hda_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	tas2781_hda_remove(&amp;spi-&gt;dev, &amp;tas2781_hda_comp_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;fw_state == TASDEVICE_DSP_FW_ALL_OK</div><div class='add'>+		&amp;&amp; tas_priv-&gt;playback_started)</div><div class='add'>+		tasdevice_tuning_switch(tas_priv, 1);</div><div class='add'>+</div><div class='add'>+	tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_book = -1;</div><div class='add'>+	tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_conf = -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+</div><div class='add'>+	if (tas_priv-&gt;fw_state == TASDEVICE_DSP_FW_ALL_OK</div><div class='add'>+		&amp;&amp; tas_priv-&gt;playback_started)</div><div class='add'>+		tasdevice_tuning_switch(tas_priv, 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_system_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_suspend(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Shutdown chip before system suspend */</div><div class='add'>+	if (tas_priv-&gt;fw_state == TASDEVICE_DSP_FW_ALL_OK</div><div class='add'>+		&amp;&amp; tas_priv-&gt;playback_started)</div><div class='add'>+		tasdevice_tuning_switch(tas_priv, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tas2781_system_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);</div><div class='add'>+	struct tasdevice_priv *tas_priv = tas_hda-&gt;priv;</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_force_resume(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;tas_priv-&gt;codec_lock);</div><div class='add'>+	ret = tas_priv-&gt;dev_read(tas_priv, tas_priv-&gt;index,</div><div class='add'>+		TAS2781_REG_CLK_CONFIG, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (val == TAS2781_REG_CLK_CONFIG_RESET) {</div><div class='add'>+		tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_book = -1;</div><div class='add'>+		tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_conf = -1;</div><div class='add'>+		tas_priv-&gt;tasdevice[tas_priv-&gt;index].cur_prog = -1;</div><div class='add'>+</div><div class='add'>+		ret = tasdevice_prmg_load(tas_priv, 0);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(tas_priv-&gt;dev,</div><div class='add'>+				"FW download failed = %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		tas_priv-&gt;fw_state = TASDEVICE_DSP_FW_ALL_OK;</div><div class='add'>+</div><div class='add'>+		if (tas_priv-&gt;playback_started)</div><div class='add'>+			tasdevice_tuning_switch(tas_priv, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops tas2781_hda_pm_ops = {</div><div class='add'>+	RUNTIME_PM_OPS(tas2781_runtime_suspend, tas2781_runtime_resume, NULL)</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(tas2781_system_suspend, tas2781_system_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id tas2781_hda_spi_id[] = {</div><div class='add'>+	{ "tas2781-hda", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id tas2781_acpi_hda_match[] = {</div><div class='add'>+	{"TXNW2781", },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, tas2781_acpi_hda_match);</div><div class='add'>+</div><div class='add'>+static struct spi_driver tas2781_hda_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "tas2781-hda",</div><div class='add'>+		.acpi_match_table = tas2781_acpi_hda_match,</div><div class='add'>+		.pm		= &amp;tas2781_hda_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table	= tas2781_hda_spi_id,</div><div class='add'>+	.probe		= tas2781_hda_spi_probe,</div><div class='add'>+	.remove		= tas2781_hda_spi_remove,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(tas2781_hda_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("TAS2781 HDA SPI Driver");</div><div class='add'>+MODULE_AUTHOR("Baojun, Xu, &lt;baojun.xug@ti.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("SND_SOC_TAS2781_FMWLIB");</div><div class='add'>+MODULE_IMPORT_NS("SND_HDA_SCODEC_TAS2781");</div><div class='head'>diff --git a/sound/hda/codecs/sigmatel.c b/sound/hda/codecs/sigmatel.c<br/>new file mode 100644<br/>index 000000000000..ecbee408d771<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/sigmatel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/sigmatel.c</a></div><div class='hunk'>@@ -0,0 +1,5169 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal Interface for Intel High Definition Audio Codec</div><div class='add'>+ *</div><div class='add'>+ * HD audio codec driver for SigmaTel STAC92xx</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005 Embedded Alley Solutions, Inc.</div><div class='add'>+ * Matt Porter &lt;mporter@embeddedalley.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on cmedia.c and realtek.c</div><div class='add'>+ * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_REF,</div><div class='add'>+	STAC_9200_OQO,</div><div class='add'>+	STAC_9200_DELL_D21,</div><div class='add'>+	STAC_9200_DELL_D22,</div><div class='add'>+	STAC_9200_DELL_D23,</div><div class='add'>+	STAC_9200_DELL_M21,</div><div class='add'>+	STAC_9200_DELL_M22,</div><div class='add'>+	STAC_9200_DELL_M23,</div><div class='add'>+	STAC_9200_DELL_M24,</div><div class='add'>+	STAC_9200_DELL_M25,</div><div class='add'>+	STAC_9200_DELL_M26,</div><div class='add'>+	STAC_9200_DELL_M27,</div><div class='add'>+	STAC_9200_M4,</div><div class='add'>+	STAC_9200_M4_2,</div><div class='add'>+	STAC_9200_PANASONIC,</div><div class='add'>+	STAC_9200_EAPD_INIT,</div><div class='add'>+	STAC_9200_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_9205_REF,</div><div class='add'>+	STAC_9205_DELL_M42,</div><div class='add'>+	STAC_9205_DELL_M43,</div><div class='add'>+	STAC_9205_DELL_M44,</div><div class='add'>+	STAC_9205_EAPD,</div><div class='add'>+	STAC_9205_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_92HD73XX_NO_JD, /* no jack-detection */</div><div class='add'>+	STAC_92HD73XX_REF,</div><div class='add'>+	STAC_92HD73XX_INTEL,</div><div class='add'>+	STAC_DELL_M6_AMIC,</div><div class='add'>+	STAC_DELL_M6_DMIC,</div><div class='add'>+	STAC_DELL_M6_BOTH,</div><div class='add'>+	STAC_DELL_EQ,</div><div class='add'>+	STAC_ALIENWARE_M17X,</div><div class='add'>+	STAC_ELO_VUPOINT_15MX,</div><div class='add'>+	STAC_92HD89XX_HP_FRONT_JACK,</div><div class='add'>+	STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK,</div><div class='add'>+	STAC_92HD73XX_ASUS_MOBO,</div><div class='add'>+	STAC_92HD73XX_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_92HD83XXX_REF,</div><div class='add'>+	STAC_92HD83XXX_PWR_REF,</div><div class='add'>+	STAC_DELL_S14,</div><div class='add'>+	STAC_DELL_VOSTRO_3500,</div><div class='add'>+	STAC_92HD83XXX_HP_cNB11_INTQUAD,</div><div class='add'>+	STAC_HP_DV7_4000,</div><div class='add'>+	STAC_HP_ZEPHYR,</div><div class='add'>+	STAC_92HD83XXX_HP_LED,</div><div class='add'>+	STAC_92HD83XXX_HP_INV_LED,</div><div class='add'>+	STAC_92HD83XXX_HP_MIC_LED,</div><div class='add'>+	STAC_HP_LED_GPIO10,</div><div class='add'>+	STAC_92HD83XXX_HEADSET_JACK,</div><div class='add'>+	STAC_92HD83XXX_HP,</div><div class='add'>+	STAC_HP_ENVY_BASS,</div><div class='add'>+	STAC_HP_BNB13_EQ,</div><div class='add'>+	STAC_HP_ENVY_TS_BASS,</div><div class='add'>+	STAC_HP_ENVY_TS_DAC_BIND,</div><div class='add'>+	STAC_92HD83XXX_GPIO10_EAPD,</div><div class='add'>+	STAC_92HD83XXX_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_92HD71BXX_REF,</div><div class='add'>+	STAC_DELL_M4_1,</div><div class='add'>+	STAC_DELL_M4_2,</div><div class='add'>+	STAC_DELL_M4_3,</div><div class='add'>+	STAC_HP_M4,</div><div class='add'>+	STAC_HP_DV4,</div><div class='add'>+	STAC_HP_DV5,</div><div class='add'>+	STAC_HP_HDX,</div><div class='add'>+	STAC_92HD71BXX_HP,</div><div class='add'>+	STAC_92HD71BXX_NO_DMIC,</div><div class='add'>+	STAC_92HD71BXX_NO_SMUX,</div><div class='add'>+	STAC_92HD71BXX_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_92HD95_HP_LED,</div><div class='add'>+	STAC_92HD95_HP_BASS,</div><div class='add'>+	STAC_92HD95_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_925x_REF,</div><div class='add'>+	STAC_M1,</div><div class='add'>+	STAC_M1_2,</div><div class='add'>+	STAC_M2,</div><div class='add'>+	STAC_M2_2,</div><div class='add'>+	STAC_M3,</div><div class='add'>+	STAC_M5,</div><div class='add'>+	STAC_M6,</div><div class='add'>+	STAC_925x_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_D945_REF,</div><div class='add'>+	STAC_D945GTP3,</div><div class='add'>+	STAC_D945GTP5,</div><div class='add'>+	STAC_INTEL_MAC_V1,</div><div class='add'>+	STAC_INTEL_MAC_V2,</div><div class='add'>+	STAC_INTEL_MAC_V3,</div><div class='add'>+	STAC_INTEL_MAC_V4,</div><div class='add'>+	STAC_INTEL_MAC_V5,</div><div class='add'>+	STAC_INTEL_MAC_AUTO,</div><div class='add'>+	STAC_ECS_202,</div><div class='add'>+	STAC_922X_DELL_D81,</div><div class='add'>+	STAC_922X_DELL_D82,</div><div class='add'>+	STAC_922X_DELL_M81,</div><div class='add'>+	STAC_922X_DELL_M82,</div><div class='add'>+	STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	STAC_922X_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_D965_REF_NO_JD, /* no jack-detection */</div><div class='add'>+	STAC_D965_REF,</div><div class='add'>+	STAC_D965_3ST,</div><div class='add'>+	STAC_D965_5ST,</div><div class='add'>+	STAC_D965_5ST_NO_FP,</div><div class='add'>+	STAC_D965_VERBS,</div><div class='add'>+	STAC_DELL_3ST,</div><div class='add'>+	STAC_DELL_BIOS,</div><div class='add'>+	STAC_NEMO_DEFAULT,</div><div class='add'>+	STAC_DELL_BIOS_AMIC,</div><div class='add'>+	STAC_DELL_BIOS_SPDIF,</div><div class='add'>+	STAC_927X_DELL_DMIC,</div><div class='add'>+	STAC_927X_VOLKNOB,</div><div class='add'>+	STAC_927X_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	STAC_9872_VAIO,</div><div class='add'>+	STAC_9872_MODELS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sigmatel_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	unsigned int eapd_switch: 1;</div><div class='add'>+	unsigned int linear_tone_beep:1;</div><div class='add'>+	unsigned int headset_jack:1; /* 4-pin headset jack (hp + mono mic) */</div><div class='add'>+	unsigned int volknob_init:1; /* special volume-knob initialization */</div><div class='add'>+	unsigned int powerdown_adcs:1;</div><div class='add'>+	unsigned int have_spdif_mux:1;</div><div class='add'>+</div><div class='add'>+	/* gpio lines */</div><div class='add'>+	unsigned int eapd_mask;</div><div class='add'>+	unsigned int gpio_mask;</div><div class='add'>+	unsigned int gpio_dir;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+	unsigned int gpio_mute;</div><div class='add'>+	unsigned int gpio_led;</div><div class='add'>+	unsigned int gpio_led_polarity;</div><div class='add'>+	unsigned int vref_mute_led_nid; /* pin NID for mute-LED vref control */</div><div class='add'>+	unsigned int vref_led;</div><div class='add'>+	int default_polarity;</div><div class='add'>+</div><div class='add'>+	unsigned int mic_mute_led_gpio; /* capture mute LED GPIO */</div><div class='add'>+	unsigned int mic_enabled; /* current mic mute state (bitmask) */</div><div class='add'>+</div><div class='add'>+	/* stream */</div><div class='add'>+	unsigned int stream_delay;</div><div class='add'>+</div><div class='add'>+	/* analog loopback */</div><div class='add'>+	const struct snd_kcontrol_new *aloopback_ctl;</div><div class='add'>+	unsigned int aloopback;</div><div class='add'>+	unsigned char aloopback_mask;</div><div class='add'>+	unsigned char aloopback_shift;</div><div class='add'>+</div><div class='add'>+	/* power management */</div><div class='add'>+	unsigned int power_map_bits;</div><div class='add'>+	unsigned int num_pwrs;</div><div class='add'>+	const hda_nid_t *pwr_nids;</div><div class='add'>+	unsigned int active_adcs;</div><div class='add'>+</div><div class='add'>+	/* beep widgets */</div><div class='add'>+	hda_nid_t anabeep_nid;</div><div class='add'>+	bool beep_power_on;</div><div class='add'>+</div><div class='add'>+	/* SPDIF-out mux */</div><div class='add'>+	const char * const *spdif_labels;</div><div class='add'>+	struct hda_input_mux spdif_mux;</div><div class='add'>+	unsigned int cur_smux[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AC_VERB_IDT_SET_POWER_MAP	0x7ec</div><div class='add'>+#define AC_VERB_IDT_GET_POWER_MAP	0xfec</div><div class='add'>+</div><div class='add'>+static const hda_nid_t stac92hd73xx_pwr_nids[8] = {</div><div class='add'>+	0x0a, 0x0b, 0x0c, 0xd, 0x0e,</div><div class='add'>+	0x0f, 0x10, 0x11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const hda_nid_t stac92hd83xxx_pwr_nids[7] = {</div><div class='add'>+	0x0a, 0x0b, 0x0c, 0xd, 0x0e,</div><div class='add'>+	0x0f, 0x10</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const hda_nid_t stac92hd71bxx_pwr_nids[3] = {</div><div class='add'>+	0x0a, 0x0d, 0x0f</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM hooks</div><div class='add'>+ */</div><div class='add'>+static void stac_playback_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (action == HDA_GEN_PCM_ACT_OPEN &amp;&amp; spec-&gt;stream_delay)</div><div class='add'>+		msleep(spec-&gt;stream_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac_capture_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, idx = 0;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;powerdown_adcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;gen.num_all_adcs; i++) {</div><div class='add'>+		if (spec-&gt;gen.all_adcs[i] == hinfo-&gt;nid) {</div><div class='add'>+			idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_GEN_PCM_ACT_OPEN:</div><div class='add'>+		msleep(40);</div><div class='add'>+		snd_hda_codec_write(codec, hinfo-&gt;nid, 0,</div><div class='add'>+				    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='add'>+		spec-&gt;active_adcs |= (1 &lt;&lt; idx);</div><div class='add'>+		break;</div><div class='add'>+	case HDA_GEN_PCM_ACT_CLOSE:</div><div class='add'>+		snd_hda_codec_write(codec, hinfo-&gt;nid, 0,</div><div class='add'>+				    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='add'>+		spec-&gt;active_adcs &amp;= ~(1 &lt;&lt; idx);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Early 2006 Intel Macintoshes with STAC9220X5 codecs seem to have a</div><div class='add'>+ * funky external mute control using GPIO pins.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void stac_gpio_set(struct hda_codec *codec, unsigned int mask,</div><div class='add'>+			  unsigned int dir_mask, unsigned int data)</div><div class='add'>+{</div><div class='add'>+	unsigned int gpiostate, gpiomask, gpiodir;</div><div class='add'>+	hda_nid_t fg = codec-&gt;core.afg;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s msk %x dir %x gpio %x\n", __func__, mask, dir_mask, data);</div><div class='add'>+</div><div class='add'>+	gpiostate = snd_hda_codec_read(codec, fg, 0,</div><div class='add'>+				       AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+	gpiostate = (gpiostate &amp; ~dir_mask) | (data &amp; dir_mask);</div><div class='add'>+</div><div class='add'>+	gpiomask = snd_hda_codec_read(codec, fg, 0,</div><div class='add'>+				      AC_VERB_GET_GPIO_MASK, 0);</div><div class='add'>+	gpiomask |= mask;</div><div class='add'>+</div><div class='add'>+	gpiodir = snd_hda_codec_read(codec, fg, 0,</div><div class='add'>+				     AC_VERB_GET_GPIO_DIRECTION, 0);</div><div class='add'>+	gpiodir |= dir_mask;</div><div class='add'>+</div><div class='add'>+	/* Configure GPIOx as CMOS */</div><div class='add'>+	snd_hda_codec_write(codec, fg, 0, 0x7e7, 0);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, fg, 0,</div><div class='add'>+			    AC_VERB_SET_GPIO_MASK, gpiomask);</div><div class='add'>+	snd_hda_codec_read(codec, fg, 0,</div><div class='add'>+			   AC_VERB_SET_GPIO_DIRECTION, gpiodir); /* sync */</div><div class='add'>+</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_read(codec, fg, 0,</div><div class='add'>+			   AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* hook for controlling mic-mute LED GPIO */</div><div class='add'>+static int stac_capture_led_update(struct led_classdev *led_cdev,</div><div class='add'>+				   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (brightness)</div><div class='add'>+		spec-&gt;gpio_data |= spec-&gt;mic_mute_led_gpio;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;gpio_data &amp;= ~spec-&gt;mic_mute_led_gpio;</div><div class='add'>+	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_vrefout_set(struct hda_codec *codec,</div><div class='add'>+					hda_nid_t nid, unsigned int new_vref)</div><div class='add'>+{</div><div class='add'>+	int error, pinctl;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "%s, nid %x ctl %x\n", __func__, nid, new_vref);</div><div class='add'>+	pinctl = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+				AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+</div><div class='add'>+	if (pinctl &lt; 0)</div><div class='add'>+		return pinctl;</div><div class='add'>+</div><div class='add'>+	pinctl &amp;= 0xff;</div><div class='add'>+	pinctl &amp;= ~AC_PINCTL_VREFEN;</div><div class='add'>+	pinctl |= (new_vref &amp; AC_PINCTL_VREFEN);</div><div class='add'>+</div><div class='add'>+	error = snd_hda_set_pin_ctl_cache(codec, nid, pinctl);</div><div class='add'>+	if (error &lt; 0)</div><div class='add'>+		return error;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* prevent codec AFG to D3 state when vref-out pin is used for mute LED */</div><div class='add'>+/* this hook is set in stac_setup_gpio() */</div><div class='add'>+static unsigned int stac_vref_led_power_filter(struct hda_codec *codec,</div><div class='add'>+					       hda_nid_t nid,</div><div class='add'>+					       unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;core.afg &amp;&amp; power_state == AC_PWRST_D3)</div><div class='add'>+		return AC_PWRST_D1;</div><div class='add'>+	return snd_hda_gen_path_power_filter(codec, nid, power_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update mute-LED accoring to the master switch */</div><div class='add'>+static void stac_update_led_status(struct hda_codec *codec, bool muted)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gpio_led)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* LED state is inverted on these systems */</div><div class='add'>+	if (spec-&gt;gpio_led_polarity)</div><div class='add'>+		muted = !muted;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;vref_mute_led_nid) {</div><div class='add'>+		if (muted)</div><div class='add'>+			spec-&gt;gpio_data |= spec-&gt;gpio_led;</div><div class='add'>+		else</div><div class='add'>+			spec-&gt;gpio_data &amp;= ~spec-&gt;gpio_led;</div><div class='add'>+		stac_gpio_set(codec, spec-&gt;gpio_mask,</div><div class='add'>+				spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='add'>+	} else {</div><div class='add'>+		spec-&gt;vref_led = muted ? AC_PINCTL_VREF_50 : AC_PINCTL_VREF_GRD;</div><div class='add'>+		stac_vrefout_set(codec,	spec-&gt;vref_mute_led_nid,</div><div class='add'>+				 spec-&gt;vref_led);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* vmaster hook to update mute LED */</div><div class='add'>+static int stac_vmaster_hook(struct led_classdev *led_cdev,</div><div class='add'>+			     enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(led_cdev-&gt;dev-&gt;parent);</div><div class='add'>+</div><div class='add'>+	stac_update_led_status(codec, brightness);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* automute hook to handle GPIO mute and EAPD updates */</div><div class='add'>+static void stac_update_outputs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_mute)</div><div class='add'>+		spec-&gt;gen.master_mute =</div><div class='add'>+			!(snd_hda_codec_read(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				AC_VERB_GET_GPIO_DATA, 0) &amp; spec-&gt;gpio_mute);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_update_outputs(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;eapd_mask &amp;&amp; spec-&gt;eapd_switch) {</div><div class='add'>+		unsigned int val = spec-&gt;gpio_data;</div><div class='add'>+		if (spec-&gt;gen.speaker_muted)</div><div class='add'>+			val &amp;= ~spec-&gt;eapd_mask;</div><div class='add'>+		else</div><div class='add'>+			val |= spec-&gt;eapd_mask;</div><div class='add'>+		if (spec-&gt;gpio_data != val) {</div><div class='add'>+			spec-&gt;gpio_data = val;</div><div class='add'>+			stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir,</div><div class='add'>+				      val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  bool enable, bool do_write)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int idx, val;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; spec-&gt;num_pwrs; idx++) {</div><div class='add'>+		if (spec-&gt;pwr_nids[idx] == nid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (idx &gt;= spec-&gt;num_pwrs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	idx = 1 &lt;&lt; idx;</div><div class='add'>+</div><div class='add'>+	val = spec-&gt;power_map_bits;</div><div class='add'>+	if (enable)</div><div class='add'>+		val &amp;= ~idx;</div><div class='add'>+	else</div><div class='add'>+		val |= idx;</div><div class='add'>+</div><div class='add'>+	/* power down unused output ports */</div><div class='add'>+	if (val != spec-&gt;power_map_bits) {</div><div class='add'>+		spec-&gt;power_map_bits = val;</div><div class='add'>+		if (do_write)</div><div class='add'>+			snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+					    AC_VERB_IDT_SET_POWER_MAP, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update power bit per jack plug/unplug */</div><div class='add'>+static void jack_update_power(struct hda_codec *codec,</div><div class='add'>+			      struct hda_jack_callback *jack)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;num_pwrs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (jack &amp;&amp; jack-&gt;nid) {</div><div class='add'>+		stac_toggle_power_map(codec, jack-&gt;nid,</div><div class='add'>+				      snd_hda_jack_detect(codec, jack-&gt;nid),</div><div class='add'>+				      true);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update all jacks */</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_pwrs; i++) {</div><div class='add'>+		hda_nid_t nid = spec-&gt;pwr_nids[i];</div><div class='add'>+		if (!snd_hda_jack_tbl_get(codec, nid))</div><div class='add'>+			continue;</div><div class='add'>+		stac_toggle_power_map(codec, nid,</div><div class='add'>+				      snd_hda_jack_detect(codec, nid),</div><div class='add'>+				      false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			    AC_VERB_IDT_SET_POWER_MAP,</div><div class='add'>+			    spec-&gt;power_map_bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac_vref_event(struct hda_codec *codec,</div><div class='add'>+			    struct hda_jack_callback *event)</div><div class='add'>+{</div><div class='add'>+	unsigned int data;</div><div class='add'>+</div><div class='add'>+	data = snd_hda_codec_read(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				  AC_VERB_GET_GPIO_DATA, 0);</div><div class='add'>+	/* toggle VREF state based on GPIOx status */</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0, 0x7e0,</div><div class='add'>+			    !!(data &amp; (1 &lt;&lt; event-&gt;private_data)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize the power map and enable the power event to jacks that</div><div class='add'>+ * haven't been assigned to automute</div><div class='add'>+ */</div><div class='add'>+static void stac_init_power_map(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; spec-&gt;num_pwrs; i++)  {</div><div class='add'>+		hda_nid_t nid = spec-&gt;pwr_nids[i];</div><div class='add'>+		unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		def_conf = get_defcfg_connect(def_conf);</div><div class='add'>+		if (def_conf == AC_JACK_PORT_COMPLEX &amp;&amp;</div><div class='add'>+		    spec-&gt;vref_mute_led_nid != nid &amp;&amp;</div><div class='add'>+		    is_jack_detectable(codec, nid)) {</div><div class='add'>+			snd_hda_jack_detect_enable_callback(codec, nid,</div><div class='add'>+							    jack_update_power);</div><div class='add'>+		} else {</div><div class='add'>+			if (def_conf == AC_JACK_PORT_NONE)</div><div class='add'>+				stac_toggle_power_map(codec, nid, false, false);</div><div class='add'>+			else</div><div class='add'>+				stac_toggle_power_map(codec, nid, true, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline bool get_int_hint(struct hda_codec *codec, const char *key,</div><div class='add'>+				int *valp)</div><div class='add'>+{</div><div class='add'>+	return !snd_hda_get_int_hint(codec, key, valp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* override some hints from the hwdep entry */</div><div class='add'>+static void stac_store_hints(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (get_int_hint(codec, "gpio_mask", &amp;spec-&gt;gpio_mask)) {</div><div class='add'>+		spec-&gt;eapd_mask = spec-&gt;gpio_dir = spec-&gt;gpio_data =</div><div class='add'>+			spec-&gt;gpio_mask;</div><div class='add'>+	}</div><div class='add'>+	if (get_int_hint(codec, "gpio_dir", &amp;spec-&gt;gpio_dir))</div><div class='add'>+		spec-&gt;gpio_dir &amp;= spec-&gt;gpio_mask;</div><div class='add'>+	if (get_int_hint(codec, "gpio_data", &amp;spec-&gt;gpio_data))</div><div class='add'>+		spec-&gt;gpio_data &amp;= spec-&gt;gpio_mask;</div><div class='add'>+	if (get_int_hint(codec, "eapd_mask", &amp;spec-&gt;eapd_mask))</div><div class='add'>+		spec-&gt;eapd_mask &amp;= spec-&gt;gpio_mask;</div><div class='add'>+	if (get_int_hint(codec, "gpio_mute", &amp;spec-&gt;gpio_mute))</div><div class='add'>+		spec-&gt;gpio_mute &amp;= spec-&gt;gpio_mask;</div><div class='add'>+	val = snd_hda_get_bool_hint(codec, "eapd_switch");</div><div class='add'>+	if (val &gt;= 0)</div><div class='add'>+		spec-&gt;eapd_switch = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * loopback controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define stac_aloopback_info snd_ctl_boolean_mono_info</div><div class='add'>+</div><div class='add'>+static int stac_aloopback_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = !!(spec-&gt;aloopback &amp;</div><div class='add'>+					      (spec-&gt;aloopback_mask &lt;&lt; idx));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_aloopback_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+	unsigned int dac_mode;</div><div class='add'>+	unsigned int val, idx_val;</div><div class='add'>+</div><div class='add'>+	idx_val = spec-&gt;aloopback_mask &lt;&lt; idx;</div><div class='add'>+	if (ucontrol-&gt;value.integer.value[0])</div><div class='add'>+		val = spec-&gt;aloopback | idx_val;</div><div class='add'>+	else</div><div class='add'>+		val = spec-&gt;aloopback &amp; ~idx_val;</div><div class='add'>+	if (spec-&gt;aloopback == val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;aloopback = val;</div><div class='add'>+</div><div class='add'>+	/* Only return the bits defined by the shift value of the</div><div class='add'>+	 * first two bytes of the mask</div><div class='add'>+	 */</div><div class='add'>+	dac_mode = snd_hda_codec_read(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				      kcontrol-&gt;private_value &amp; 0xFFFF, 0x0);</div><div class='add'>+	dac_mode &gt;&gt;= spec-&gt;aloopback_shift;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;aloopback &amp; idx_val) {</div><div class='add'>+		snd_hda_power_up(codec);</div><div class='add'>+		dac_mode |= idx_val;</div><div class='add'>+	} else {</div><div class='add'>+		snd_hda_power_down(codec);</div><div class='add'>+		dac_mode &amp;= ~idx_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write_cache(codec, codec-&gt;core.afg, 0,</div><div class='add'>+		kcontrol-&gt;private_value &gt;&gt; 16, dac_mode);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define STAC_ANALOG_LOOPBACK(verb_read, verb_write, cnt) \</div><div class='add'>+	{ \</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='add'>+		.name  = "Analog Loopback", \</div><div class='add'>+		.count = cnt, \</div><div class='add'>+		.info  = stac_aloopback_info, \</div><div class='add'>+		.get   = stac_aloopback_get, \</div><div class='add'>+		.put   = stac_aloopback_put, \</div><div class='add'>+		.private_value = verb_read | (verb_write &lt;&lt; 16), \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Mute LED handling on HP laptops</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* check whether it's a HP laptop with a docking port */</div><div class='add'>+static bool hp_bnb2011_with_dock(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;core.vendor_id != 0x111d7605 &amp;&amp;</div><div class='add'>+	    codec-&gt;core.vendor_id != 0x111d76d1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.subsystem_id) {</div><div class='add'>+	case 0x103c1618:</div><div class='add'>+	case 0x103c1619:</div><div class='add'>+	case 0x103c161a:</div><div class='add'>+	case 0x103c161b:</div><div class='add'>+	case 0x103c161c:</div><div class='add'>+	case 0x103c161d:</div><div class='add'>+	case 0x103c161e:</div><div class='add'>+	case 0x103c161f:</div><div class='add'>+</div><div class='add'>+	case 0x103c162a:</div><div class='add'>+	case 0x103c162b:</div><div class='add'>+</div><div class='add'>+	case 0x103c1630:</div><div class='add'>+	case 0x103c1631:</div><div class='add'>+</div><div class='add'>+	case 0x103c1633:</div><div class='add'>+	case 0x103c1634:</div><div class='add'>+	case 0x103c1635:</div><div class='add'>+</div><div class='add'>+	case 0x103c3587:</div><div class='add'>+	case 0x103c3588:</div><div class='add'>+	case 0x103c3589:</div><div class='add'>+	case 0x103c358a:</div><div class='add'>+</div><div class='add'>+	case 0x103c3667:</div><div class='add'>+	case 0x103c3668:</div><div class='add'>+	case 0x103c3669:</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hp_blike_system(u32 subsystem_id)</div><div class='add'>+{</div><div class='add'>+	switch (subsystem_id) {</div><div class='add'>+	case 0x103c1473: /* HP ProBook 6550b */</div><div class='add'>+	case 0x103c1520:</div><div class='add'>+	case 0x103c1521:</div><div class='add'>+	case 0x103c1523:</div><div class='add'>+	case 0x103c1524:</div><div class='add'>+	case 0x103c1525:</div><div class='add'>+	case 0x103c1722:</div><div class='add'>+	case 0x103c1723:</div><div class='add'>+	case 0x103c1724:</div><div class='add'>+	case 0x103c1725:</div><div class='add'>+	case 0x103c1726:</div><div class='add'>+	case 0x103c1727:</div><div class='add'>+	case 0x103c1728:</div><div class='add'>+	case 0x103c1729:</div><div class='add'>+	case 0x103c172a:</div><div class='add'>+	case 0x103c172b:</div><div class='add'>+	case 0x103c307e:</div><div class='add'>+	case 0x103c307f:</div><div class='add'>+	case 0x103c3080:</div><div class='add'>+	case 0x103c3081:</div><div class='add'>+	case 0x103c7007:</div><div class='add'>+	case 0x103c7008:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_hp_led_gpio(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int gpio;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_led)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gpio = snd_hda_param_read(codec, codec-&gt;core.afg, AC_PAR_GPIO_CAP);</div><div class='add'>+	gpio &amp;= AC_GPIO_IO_COUNT;</div><div class='add'>+	if (gpio &gt; 3)</div><div class='add'>+		spec-&gt;gpio_led = 0x08; /* GPIO 3 */</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;gpio_led = 0x01; /* GPIO 0 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This method searches for the mute LED GPIO configuration</div><div class='add'>+ * provided as OEM string in SMBIOS. The format of that string</div><div class='add'>+ * is HP_Mute_LED_P_G or HP_Mute_LED_P</div><div class='add'>+ * where P can be 0 or 1 and defines mute LED GPIO control state (low/high)</div><div class='add'>+ * that corresponds to the NOT muted state of the master volume</div><div class='add'>+ * and G is the index of the GPIO to use as the mute LED control (0..9)</div><div class='add'>+ * If _G portion is missing it is assigned based on the codec ID</div><div class='add'>+ *</div><div class='add'>+ * So, HP B-series like systems may have HP_Mute_LED_0 (current models)</div><div class='add'>+ * or  HP_Mute_LED_0_3 (future models) OEM SMBIOS strings</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * The dv-series laptops don't seem to have the HP_Mute_LED* strings in</div><div class='add'>+ * SMBIOS - at least the ones I have seen do not have them - which include</div><div class='add'>+ * my own system (HP Pavilion dv6-1110ax) and my cousin's</div><div class='add'>+ * HP Pavilion dv9500t CTO.</div><div class='add'>+ * Need more information on whether it is true across the entire series.</div><div class='add'>+ * -- kunal</div><div class='add'>+ */</div><div class='add'>+static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct dmi_device *dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (get_int_hint(codec, "gpio_led", &amp;spec-&gt;gpio_led)) {</div><div class='add'>+		get_int_hint(codec, "gpio_led_polarity",</div><div class='add'>+			     &amp;spec-&gt;gpio_led_polarity);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {</div><div class='add'>+		if (sscanf(dev-&gt;name, "HP_Mute_LED_%u_%x",</div><div class='add'>+			   &amp;spec-&gt;gpio_led_polarity,</div><div class='add'>+			   &amp;spec-&gt;gpio_led) == 2) {</div><div class='add'>+			unsigned int max_gpio;</div><div class='add'>+			max_gpio = snd_hda_param_read(codec, codec-&gt;core.afg,</div><div class='add'>+						      AC_PAR_GPIO_CAP);</div><div class='add'>+			max_gpio &amp;= AC_GPIO_IO_COUNT;</div><div class='add'>+			if (spec-&gt;gpio_led &lt; max_gpio)</div><div class='add'>+				spec-&gt;gpio_led = 1 &lt;&lt; spec-&gt;gpio_led;</div><div class='add'>+			else</div><div class='add'>+				spec-&gt;vref_mute_led_nid = spec-&gt;gpio_led;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		if (sscanf(dev-&gt;name, "HP_Mute_LED_%u",</div><div class='add'>+			   &amp;spec-&gt;gpio_led_polarity) == 1) {</div><div class='add'>+			set_hp_led_gpio(codec);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		/* BIOS bug: unfilled OEM string */</div><div class='add'>+		if (strstr(dev-&gt;name, "HP_Mute_LED_P_G")) {</div><div class='add'>+			set_hp_led_gpio(codec);</div><div class='add'>+			if (default_polarity &gt;= 0)</div><div class='add'>+				spec-&gt;gpio_led_polarity = default_polarity;</div><div class='add'>+			else</div><div class='add'>+				spec-&gt;gpio_led_polarity = 1;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Fallback case - if we don't find the DMI strings,</div><div class='add'>+	 * we statically set the GPIO - if not a B-series system</div><div class='add'>+	 * and default polarity is provided</div><div class='add'>+	 */</div><div class='add'>+	if (!hp_blike_system(codec-&gt;core.subsystem_id) &amp;&amp;</div><div class='add'>+	    (default_polarity == 0 || default_polarity == 1)) {</div><div class='add'>+		set_hp_led_gpio(codec);</div><div class='add'>+		spec-&gt;gpio_led_polarity = default_polarity;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether a built-in speaker is included in parsed pins */</div><div class='add'>+static bool has_builtin_speaker(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	const hda_nid_t *nid_pin;</div><div class='add'>+	int nids, i;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gen.autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='add'>+		nid_pin = spec-&gt;gen.autocfg.line_out_pins;</div><div class='add'>+		nids = spec-&gt;gen.autocfg.line_outs;</div><div class='add'>+	} else {</div><div class='add'>+		nid_pin = spec-&gt;gen.autocfg.speaker_pins;</div><div class='add'>+		nids = spec-&gt;gen.autocfg.speaker_outs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nids; i++) {</div><div class='add'>+		unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid_pin[i]);</div><div class='add'>+		if (snd_hda_get_input_pin_attr(def_conf) == INPUT_PIN_ATTR_INT)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PC beep controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* create PC beep volume controls */</div><div class='add'>+static int stac_auto_create_beep_ctls(struct hda_codec *codec,</div><div class='add'>+						hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	u32 caps = query_amp_caps(codec, nid, HDA_OUTPUT);</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	static const struct snd_kcontrol_new abeep_mute_ctl =</div><div class='add'>+		HDA_CODEC_MUTE(NULL, 0, 0, 0);</div><div class='add'>+	static const struct snd_kcontrol_new dbeep_mute_ctl =</div><div class='add'>+		HDA_CODEC_MUTE_BEEP(NULL, 0, 0, 0);</div><div class='add'>+	static const struct snd_kcontrol_new beep_vol_ctl =</div><div class='add'>+		HDA_CODEC_VOLUME(NULL, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	/* check for mute support for the amp */</div><div class='add'>+	if ((caps &amp; AC_AMPCAP_MUTE) &gt;&gt; AC_AMPCAP_MUTE_SHIFT) {</div><div class='add'>+		const struct snd_kcontrol_new *temp;</div><div class='add'>+		if (spec-&gt;anabeep_nid == nid)</div><div class='add'>+			temp = &amp;abeep_mute_ctl;</div><div class='add'>+		else</div><div class='add'>+			temp = &amp;dbeep_mute_ctl;</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen,</div><div class='add'>+					    "Beep Playback Switch", temp);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value =</div><div class='add'>+			HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check to see if there is volume support for the amp */</div><div class='add'>+	if ((caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen,</div><div class='add'>+					    "Beep Playback Volume",</div><div class='add'>+					    &amp;beep_vol_ctl);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value =</div><div class='add'>+			HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+#define stac_dig_beep_switch_info snd_ctl_boolean_mono_info</div><div class='add'>+</div><div class='add'>+static int stac_dig_beep_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = codec-&gt;beep-&gt;enabled;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_dig_beep_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	return snd_hda_enable_beep_device(codec, ucontrol-&gt;value.integer.value[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac_dig_beep_ctrl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Beep Playback Switch",</div><div class='add'>+	.info = stac_dig_beep_switch_info,</div><div class='add'>+	.get = stac_dig_beep_switch_get,</div><div class='add'>+	.put = stac_dig_beep_switch_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stac_beep_switch_ctl(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;stac_dig_beep_ctrl))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPDIF-out mux controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int stac_smux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	return snd_hda_input_mux_info(&amp;spec-&gt;spdif_mux, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_smux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int smux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_smux[smux_idx];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_smux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int smux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+</div><div class='add'>+	return snd_hda_input_mux_put(codec, &amp;spec-&gt;spdif_mux, ucontrol,</div><div class='add'>+				     spec-&gt;gen.autocfg.dig_out_pins[smux_idx],</div><div class='add'>+				     &amp;spec-&gt;cur_smux[smux_idx]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac_smux_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "IEC958 Playback Source",</div><div class='add'>+	/* count set later */</div><div class='add'>+	.info = stac_smux_enum_info,</div><div class='add'>+	.get = stac_smux_enum_get,</div><div class='add'>+	.put = stac_smux_enum_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const stac_spdif_labels[] = {</div><div class='add'>+	"Digital Playback", "Analog Mux 1", "Analog Mux 2", NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stac_create_spdif_mux_ctls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct auto_pin_cfg *cfg = &amp;spec-&gt;gen.autocfg;</div><div class='add'>+	const char * const *labels = spec-&gt;spdif_labels;</div><div class='add'>+	struct snd_kcontrol_new *kctl;</div><div class='add'>+	int i, num_cons;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;dig_outs &lt; 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	num_cons = snd_hda_get_num_conns(codec, cfg-&gt;dig_out_pins[0]);</div><div class='add'>+	if (num_cons &lt;= 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!labels)</div><div class='add'>+		labels = stac_spdif_labels;</div><div class='add'>+	for (i = 0; i &lt; num_cons; i++) {</div><div class='add'>+		if (snd_BUG_ON(!labels[i]))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		snd_hda_add_imux_item(codec, &amp;spec-&gt;spdif_mux, labels[i], i, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kctl = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;stac_smux_mixer);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kctl-&gt;count = cfg-&gt;dig_outs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac9200_eapd_init[] = {</div><div class='add'>+	/* set dac0mux for dac converter */</div><div class='add'>+	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='add'>+	{0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb dell_eq_core_init[] = {</div><div class='add'>+	/* set master volume to max value without distortion</div><div class='add'>+	 * and direct control */</div><div class='add'>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac92hd73xx_core_init[] = {</div><div class='add'>+	/* set master volume and direct control */</div><div class='add'>+	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac92hd83xxx_core_init[] = {</div><div class='add'>+	/* power state controls amps */</div><div class='add'>+	{ 0x01, AC_VERB_SET_EAPD, 1 &lt;&lt; 2},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac92hd83xxx_hp_zephyr_init[] = {</div><div class='add'>+	{ 0x22, 0x785, 0x43 },</div><div class='add'>+	{ 0x22, 0x782, 0xe0 },</div><div class='add'>+	{ 0x22, 0x795, 0x00 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac92hd71bxx_core_init[] = {</div><div class='add'>+	/* set master volume and direct control */</div><div class='add'>+	{ 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const hda_nid_t stac92hd71bxx_unmute_nids[] = {</div><div class='add'>+	/* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */</div><div class='add'>+	0x0f, 0x0a, 0x0d, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac925x_core_init[] = {</div><div class='add'>+	/* set dac0mux for dac converter */</div><div class='add'>+	{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='add'>+	/* mute the master volume */</div><div class='add'>+	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac922x_core_init[] = {</div><div class='add'>+	/* set master volume and direct control */</div><div class='add'>+	{ 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb d965_core_init[] = {</div><div class='add'>+	/* unmute node 0x1b */</div><div class='add'>+	{ 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='add'>+	/* select node 0x03 as DAC */</div><div class='add'>+	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb dell_3st_core_init[] = {</div><div class='add'>+	/* don't set delta bit */</div><div class='add'>+	{0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},</div><div class='add'>+	/* unmute node 0x1b */</div><div class='add'>+	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='add'>+	/* select node 0x03 as DAC */</div><div class='add'>+	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac927x_core_init[] = {</div><div class='add'>+	/* set master volume and direct control */</div><div class='add'>+	{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='add'>+	/* enable analog pc beep path */</div><div class='add'>+	{ 0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac927x_volknob_core_init[] = {</div><div class='add'>+	/* don't set delta bit */</div><div class='add'>+	{0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},</div><div class='add'>+	/* enable analog pc beep path */</div><div class='add'>+	{0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac9205_core_init[] = {</div><div class='add'>+	/* set master volume and direct control */</div><div class='add'>+	{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='add'>+	/* enable analog pc beep path */</div><div class='add'>+	{ 0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac92hd73xx_6ch_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac92hd73xx_8ch_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac92hd73xx_10ch_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac92hd71bxx_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac9205_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac927x_loopback =</div><div class='add'>+	STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1);</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref9200_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x01c47010 },</div><div class='add'>+	{ 0x09, 0x01447010 },</div><div class='add'>+	{ 0x0d, 0x0221401f },</div><div class='add'>+	{ 0x0e, 0x01114010 },</div><div class='add'>+	{ 0x0f, 0x02a19020 },</div><div class='add'>+	{ 0x10, 0x01a19021 },</div><div class='add'>+	{ 0x11, 0x90100140 },</div><div class='add'>+	{ 0x12, 0x01813122 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl gateway9200_m4_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x400000fe },</div><div class='add'>+	{ 0x09, 0x404500f4 },</div><div class='add'>+	{ 0x0d, 0x400100f0 },</div><div class='add'>+	{ 0x0e, 0x90110010 },</div><div class='add'>+	{ 0x0f, 0x400100f1 },</div><div class='add'>+	{ 0x10, 0x02a1902e },</div><div class='add'>+	{ 0x11, 0x500000f2 },</div><div class='add'>+	{ 0x12, 0x500000f3 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl gateway9200_m4_2_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x400000fe },</div><div class='add'>+	{ 0x09, 0x404500f4 },</div><div class='add'>+	{ 0x0d, 0x400100f0 },</div><div class='add'>+	{ 0x0e, 0x90110010 },</div><div class='add'>+	{ 0x0f, 0x400100f1 },</div><div class='add'>+	{ 0x10, 0x02a1902e },</div><div class='add'>+	{ 0x11, 0x500000f2 },</div><div class='add'>+	{ 0x12, 0x500000f3 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200 pin configs for</div><div class='add'>+    102801A8</div><div class='add'>+    102801DE</div><div class='add'>+    102801E8</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_d21_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x400001f0 },</div><div class='add'>+	{ 0x09, 0x400001f1 },</div><div class='add'>+	{ 0x0d, 0x02214030 },</div><div class='add'>+	{ 0x0e, 0x01014010 },</div><div class='add'>+	{ 0x0f, 0x02a19020 },</div><div class='add'>+	{ 0x10, 0x01a19021 },</div><div class='add'>+	{ 0x11, 0x90100140 },</div><div class='add'>+	{ 0x12, 0x01813122 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200 pin configs for</div><div class='add'>+    102801C0</div><div class='add'>+    102801C1</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_d22_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x400001f0 },</div><div class='add'>+	{ 0x09, 0x400001f1 },</div><div class='add'>+	{ 0x0d, 0x0221401f },</div><div class='add'>+	{ 0x0e, 0x01014010 },</div><div class='add'>+	{ 0x0f, 0x01813020 },</div><div class='add'>+	{ 0x10, 0x02a19021 },</div><div class='add'>+	{ 0x11, 0x90100140 },</div><div class='add'>+	{ 0x12, 0x400001f2 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200 pin configs for</div><div class='add'>+    102801C4 (Dell Dimension E310)</div><div class='add'>+    102801C5</div><div class='add'>+    102801C7</div><div class='add'>+    102801D9</div><div class='add'>+    102801DA</div><div class='add'>+    102801E3</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_d23_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x400001f0 },</div><div class='add'>+	{ 0x09, 0x400001f1 },</div><div class='add'>+	{ 0x0d, 0x0221401f },</div><div class='add'>+	{ 0x0e, 0x01014010 },</div><div class='add'>+	{ 0x0f, 0x01813020 },</div><div class='add'>+	{ 0x10, 0x01a19021 },</div><div class='add'>+	{ 0x11, 0x90100140 },</div><div class='add'>+	{ 0x12, 0x400001f2 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* </div><div class='add'>+    STAC 9200-32 pin configs for</div><div class='add'>+    102801B5 (Dell Inspiron 630m)</div><div class='add'>+    102801D8 (Dell Inspiron 640m)</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m21_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x03441340 },</div><div class='add'>+	{ 0x0d, 0x0321121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x408003fb },</div><div class='add'>+	{ 0x10, 0x03a11020 },</div><div class='add'>+	{ 0x11, 0x401003fc },</div><div class='add'>+	{ 0x12, 0x403003fd },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* </div><div class='add'>+    STAC 9200-32 pin configs for</div><div class='add'>+    102801C2 (Dell Latitude D620)</div><div class='add'>+    102801C8 </div><div class='add'>+    102801CC (Dell Latitude D820)</div><div class='add'>+    102801D4 </div><div class='add'>+    102801D6 </div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m22_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x0144131f },</div><div class='add'>+	{ 0x0d, 0x0321121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x90a70321 },</div><div class='add'>+	{ 0x10, 0x03a11020 },</div><div class='add'>+	{ 0x11, 0x401003fb },</div><div class='add'>+	{ 0x12, 0x40f000fc },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* </div><div class='add'>+    STAC 9200-32 pin configs for</div><div class='add'>+    102801CE (Dell XPS M1710)</div><div class='add'>+    102801CF (Dell Precision M90)</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m23_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x01441340 },</div><div class='add'>+	{ 0x0d, 0x0421421f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x408003fb },</div><div class='add'>+	{ 0x10, 0x04a1102e },</div><div class='add'>+	{ 0x11, 0x90170311 },</div><div class='add'>+	{ 0x12, 0x403003fc },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200-32 pin configs for </div><div class='add'>+    102801C9</div><div class='add'>+    102801CA</div><div class='add'>+    102801CB (Dell Latitude 120L)</div><div class='add'>+    102801D3</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m24_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x404003fb },</div><div class='add'>+	{ 0x0d, 0x0321121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x408003fc },</div><div class='add'>+	{ 0x10, 0x03a11020 },</div><div class='add'>+	{ 0x11, 0x401003fd },</div><div class='add'>+	{ 0x12, 0x403003fe },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200-32 pin configs for</div><div class='add'>+    102801BD (Dell Inspiron E1505n)</div><div class='add'>+    102801EE</div><div class='add'>+    102801EF</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m25_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x01441340 },</div><div class='add'>+	{ 0x0d, 0x0421121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x408003fb },</div><div class='add'>+	{ 0x10, 0x04a11020 },</div><div class='add'>+	{ 0x11, 0x401003fc },</div><div class='add'>+	{ 0x12, 0x403003fd },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200-32 pin configs for</div><div class='add'>+    102801F5 (Dell Inspiron 1501)</div><div class='add'>+    102801F6</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m26_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x404003fb },</div><div class='add'>+	{ 0x0d, 0x0421121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x408003fc },</div><div class='add'>+	{ 0x10, 0x04a11020 },</div><div class='add'>+	{ 0x11, 0x401003fd },</div><div class='add'>+	{ 0x12, 0x403003fe },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9200-32</div><div class='add'>+    102801CD (Dell Inspiron E1705/9400)</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell9200_m27_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c003fa },</div><div class='add'>+	{ 0x09, 0x01441340 },</div><div class='add'>+	{ 0x0d, 0x0421121f },</div><div class='add'>+	{ 0x0e, 0x90170310 },</div><div class='add'>+	{ 0x0f, 0x90170310 },</div><div class='add'>+	{ 0x10, 0x04a11020 },</div><div class='add'>+	{ 0x11, 0x90170310 },</div><div class='add'>+	{ 0x12, 0x40f003fc },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl oqo9200_pin_configs[] = {</div><div class='add'>+	{ 0x08, 0x40c000f0 },</div><div class='add'>+	{ 0x09, 0x404000f1 },</div><div class='add'>+	{ 0x0d, 0x0221121f },</div><div class='add'>+	{ 0x0e, 0x02211210 },</div><div class='add'>+	{ 0x0f, 0x90170111 },</div><div class='add'>+	{ 0x10, 0x90a70120 },</div><div class='add'>+	{ 0x11, 0x400000f2 },</div><div class='add'>+	{ 0x12, 0x400000f3 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  STAC 92HD700</div><div class='add'>+ *  18881000 Amigaone X1000</div><div class='add'>+ */</div><div class='add'>+static const struct hda_pintbl nemo_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214020 },	/* Front panel HP socket */</div><div class='add'>+	{ 0x0b, 0x02a19080 },	/* Front Mic */</div><div class='add'>+	{ 0x0c, 0x0181304e },	/* Line in */</div><div class='add'>+	{ 0x0d, 0x01014010 },	/* Line out */</div><div class='add'>+	{ 0x0e, 0x01a19040 },	/* Rear Mic */</div><div class='add'>+	{ 0x0f, 0x01011012 },	/* Rear speakers */</div><div class='add'>+	{ 0x10, 0x01016011 },	/* Center speaker */</div><div class='add'>+	{ 0x11, 0x01012014 },	/* Side speakers (7.1) */</div><div class='add'>+	{ 0x12, 0x103301f0 },	/* Motherboard CD line in connector */</div><div class='add'>+	{ 0x13, 0x411111f0 },	/* Unused */</div><div class='add'>+	{ 0x14, 0x411111f0 },	/* Unused */</div><div class='add'>+	{ 0x21, 0x01442170 },	/* S/PDIF line out */</div><div class='add'>+	{ 0x22, 0x411111f0 },	/* Unused */</div><div class='add'>+	{ 0x23, 0x411111f0 },	/* Unused */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac9200_fixup_panasonic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x09;</div><div class='add'>+		spec-&gt;gpio_data = 0x00;</div><div class='add'>+		/* CF-74 has no headphone detection, and the driver should *NOT*</div><div class='add'>+		 * do detection and HP/speaker toggle because the hardware does it.</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac9200_fixups[] = {</div><div class='add'>+	[STAC_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ref9200_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_OQO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = oqo9200_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_9200_EAPD_INIT,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_D21] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_d21_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_D22] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_d22_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_D23] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_d23_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M21] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m21_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M22] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m22_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M23] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m23_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M24] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m24_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M25] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m25_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M26] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m26_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_DELL_M27] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell9200_m27_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_M4] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = gateway9200_m4_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_9200_EAPD_INIT,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_M4_2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = gateway9200_m4_2_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_9200_EAPD_INIT,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_PANASONIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac9200_fixup_panasonic,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9200_EAPD_INIT] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac9200_models[] = {</div><div class='add'>+	{ .id = STAC_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_9200_OQO, .name = "oqo" },</div><div class='add'>+	{ .id = STAC_9200_DELL_D21, .name = "dell-d21" },</div><div class='add'>+	{ .id = STAC_9200_DELL_D22, .name = "dell-d22" },</div><div class='add'>+	{ .id = STAC_9200_DELL_D23, .name = "dell-d23" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M21, .name = "dell-m21" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M22, .name = "dell-m22" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M23, .name = "dell-m23" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M24, .name = "dell-m24" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M25, .name = "dell-m25" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M26, .name = "dell-m26" },</div><div class='add'>+	{ .id = STAC_9200_DELL_M27, .name = "dell-m27" },</div><div class='add'>+	{ .id = STAC_9200_M4, .name = "gateway-m4" },</div><div class='add'>+	{ .id = STAC_9200_M4_2, .name = "gateway-m4-2" },</div><div class='add'>+	{ .id = STAC_9200_PANASONIC, .name = "panasonic" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac9200_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_REF),</div><div class='add'>+	/* Dell laptops have BIOS problem */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a8,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01b5,</div><div class='add'>+		      "Dell Inspiron 630m", STAC_9200_DELL_M21),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bd,</div><div class='add'>+		      "Dell Inspiron E1505n", STAC_9200_DELL_M25),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c0,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c1,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c2,</div><div class='add'>+		      "Dell Latitude D620", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c5,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c7,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c8,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c9,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M24),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ca,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M24),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cb,</div><div class='add'>+		      "Dell Latitude 120L", STAC_9200_DELL_M24),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc,</div><div class='add'>+		      "Dell Latitude D820", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cd,</div><div class='add'>+		      "Dell Inspiron E1705/9400", STAC_9200_DELL_M27),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ce,</div><div class='add'>+		      "Dell XPS M1710", STAC_9200_DELL_M23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf,</div><div class='add'>+		      "Dell Precision M90", STAC_9200_DELL_M23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d3,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d4,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d6,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d8,</div><div class='add'>+		      "Dell Inspiron 640m", STAC_9200_DELL_M21),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d9,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01da,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01de,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e3,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e8,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ee,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M25),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ef,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M25),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f5,</div><div class='add'>+		      "Dell Inspiron 1501", STAC_9200_DELL_M26),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6,</div><div class='add'>+		      "unknown Dell", STAC_9200_DELL_M26),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0201,</div><div class='add'>+		      "Dell Latitude D430", STAC_9200_DELL_M22),</div><div class='add'>+	/* Panasonic */</div><div class='add'>+	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC),</div><div class='add'>+	/* Gateway machines needs EAPD to be set on resume */</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_M4),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*", STAC_9200_M4_2),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707", STAC_9200_M4_2),</div><div class='add'>+	/* OQO Mobile */</div><div class='add'>+	SND_PCI_QUIRK(0x1106, 0x3288, "OQO Model 2", STAC_9200_OQO),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref925x_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f0 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x01813022 },</div><div class='add'>+	{ 0x0b, 0x02a19021 },</div><div class='add'>+	{ 0x0c, 0x90a70320 },</div><div class='add'>+	{ 0x0d, 0x02214210 },</div><div class='add'>+	{ 0x10, 0x01019020 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM1_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM1_2_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM2_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM2_2_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM3_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x503303f3 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM5_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x9033032e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac925xM6_pin_configs[] = {</div><div class='add'>+	{ 0x07, 0x40c003f4 },</div><div class='add'>+	{ 0x08, 0x424503f2 },</div><div class='add'>+	{ 0x0a, 0x400000f3 },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x40a000f0 },</div><div class='add'>+	{ 0x0d, 0x90100210 },</div><div class='add'>+	{ 0x10, 0x400003f1 },</div><div class='add'>+	{ 0x11, 0x90330320 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac925x_fixups[] = {</div><div class='add'>+	[STAC_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ref925x_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M1] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM1_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M1_2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM1_2_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM2_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M2_2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM2_2_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM3_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M5] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM5_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_M6] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac925xM6_pin_configs,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac925x_models[] = {</div><div class='add'>+	{ .id = STAC_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_M1, .name = "m1" },</div><div class='add'>+	{ .id = STAC_M1_2, .name = "m1-2" },</div><div class='add'>+	{ .id = STAC_M2, .name = "m2" },</div><div class='add'>+	{ .id = STAC_M2_2, .name = "m2-2" },</div><div class='add'>+	{ .id = STAC_M3, .name = "m3" },</div><div class='add'>+	{ .id = STAC_M5, .name = "m5" },</div><div class='add'>+	{ .id = STAC_M6, .name = "m6" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac925x_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, "DFI LanParty", STAC_REF),</div><div class='add'>+	SND_PCI_QUIRK(0x8384, 0x7632, "Stac9202 Reference Board", STAC_REF),</div><div class='add'>+</div><div class='add'>+	/* Default table for unknown ID */</div><div class='add'>+	SND_PCI_QUIRK(0x1002, 0x437b, "Gateway mobile", STAC_M2_2),</div><div class='add'>+</div><div class='add'>+	/* gateway machines are checked via codec ssid */</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_M2),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_M5),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_M1),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0681, "Gateway NX860", STAC_M2),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0367, "Gateway MX6453", STAC_M1_2),</div><div class='add'>+	/* Not sure about the brand name for those */</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M1),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0507, "Gateway mobile", STAC_M3),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M6),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0685, "Gateway mobile", STAC_M2_2),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref92hd73xx_pin_configs[] = {</div><div class='add'>+	// Port A-H</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x02a19040 },</div><div class='add'>+	{ 0x0c, 0x01a19020 },</div><div class='add'>+	{ 0x0d, 0x02214030 },</div><div class='add'>+	{ 0x0e, 0x0181302e },</div><div class='add'>+	{ 0x0f, 0x01014010 },</div><div class='add'>+	{ 0x10, 0x01014020 },</div><div class='add'>+	{ 0x11, 0x01014030 },</div><div class='add'>+	// CD in</div><div class='add'>+	{ 0x12, 0x02319040 },</div><div class='add'>+	// Digial Mic ins</div><div class='add'>+	{ 0x13, 0x90a000f0 },</div><div class='add'>+	{ 0x14, 0x90a000f0 },</div><div class='add'>+	// Digital outs</div><div class='add'>+	{ 0x22, 0x01452050 },</div><div class='add'>+	{ 0x23, 0x01452050 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_m6_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321101f },</div><div class='add'>+	{ 0x0b, 0x4f00000f },</div><div class='add'>+	{ 0x0c, 0x4f0000f0 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x03a11020 },</div><div class='add'>+	{ 0x0f, 0x0321101f },</div><div class='add'>+	{ 0x10, 0x4f0000f0 },</div><div class='add'>+	{ 0x11, 0x4f0000f0 },</div><div class='add'>+	{ 0x12, 0x4f0000f0 },</div><div class='add'>+	{ 0x13, 0x90a60160 },</div><div class='add'>+	{ 0x14, 0x4f0000f0 },</div><div class='add'>+	{ 0x22, 0x4f0000f0 },</div><div class='add'>+	{ 0x23, 0x4f0000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl alienware_m17x_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321101f },</div><div class='add'>+	{ 0x0b, 0x0321101f },</div><div class='add'>+	{ 0x0c, 0x03a11020 },</div><div class='add'>+	{ 0x0d, 0x03014020 },</div><div class='add'>+	{ 0x0e, 0x90170110 },</div><div class='add'>+	{ 0x0f, 0x4f0000f0 },</div><div class='add'>+	{ 0x10, 0x4f0000f0 },</div><div class='add'>+	{ 0x11, 0x4f0000f0 },</div><div class='add'>+	{ 0x12, 0x4f0000f0 },</div><div class='add'>+	{ 0x13, 0x90a60160 },</div><div class='add'>+	{ 0x14, 0x4f0000f0 },</div><div class='add'>+	{ 0x22, 0x4f0000f0 },</div><div class='add'>+	{ 0x23, 0x904601b0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_dg45id_pin_configs[] = {</div><div class='add'>+	// Analog outputs</div><div class='add'>+	{ 0x0a, 0x02214230 },</div><div class='add'>+	{ 0x0b, 0x02A19240 },</div><div class='add'>+	{ 0x0c, 0x01013214 },</div><div class='add'>+	{ 0x0d, 0x01014210 },</div><div class='add'>+	{ 0x0e, 0x01A19250 },</div><div class='add'>+	{ 0x0f, 0x01011212 },</div><div class='add'>+	{ 0x10, 0x01016211 },</div><div class='add'>+	// Digital output</div><div class='add'>+	{ 0x22, 0x01451380 },</div><div class='add'>+	{ 0x23, 0x40f000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac92hd89xx_hp_front_jack_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x02A19010 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs[] = {</div><div class='add'>+	{ 0x0e, 0x400000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_fixup_ref(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_pincfgs(codec, ref92hd73xx_pin_configs);</div><div class='add'>+	spec-&gt;gpio_mask = spec-&gt;gpio_dir = spec-&gt;gpio_data = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_fixup_dell(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_pincfgs(codec, dell_m6_pin_configs);</div><div class='add'>+	spec-&gt;eapd_switch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_fixup_dell_eq(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stac92hd73xx_fixup_dell(codec);</div><div class='add'>+	snd_hda_add_verbs(codec, dell_eq_core_init);</div><div class='add'>+	spec-&gt;volknob_init = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Analog Mics */</div><div class='add'>+static void stac92hd73xx_fixup_dell_m6_amic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stac92hd73xx_fixup_dell(codec);</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Digital Mics */</div><div class='add'>+static void stac92hd73xx_fixup_dell_m6_dmic(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stac92hd73xx_fixup_dell(codec);</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Both */</div><div class='add'>+static void stac92hd73xx_fixup_dell_m6_both(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	stac92hd73xx_fixup_dell(codec);</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_fixup_alienware_m17x(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_pincfgs(codec, alienware_m17x_pin_configs);</div><div class='add'>+	spec-&gt;eapd_switch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_fixup_no_jd(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		codec-&gt;no_jack_detect = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void stac92hd73xx_disable_automute(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.suppress_auto_mute = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac92hd73xx_fixups[] = {</div><div class='add'>+	[STAC_92HD73XX_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_ref,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M6_AMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_dell_m6_amic,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M6_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_dell_m6_dmic,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M6_BOTH] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_dell_m6_both,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_EQ]	= {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_dell_eq,</div><div class='add'>+	},</div><div class='add'>+	[STAC_ALIENWARE_M17X] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_alienware_m17x,</div><div class='add'>+	},</div><div class='add'>+	[STAC_ELO_VUPOINT_15MX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_disable_automute,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD73XX_INTEL] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_dg45id_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD73XX_NO_JD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd73xx_fixup_no_jd,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD89XX_HP_FRONT_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac92hd89xx_hp_front_jack_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac92hd89xx_hp_z1_g2_right_mic_jack_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD73XX_ASUS_MOBO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* enable 5.1 and SPDIF out */</div><div class='add'>+			{ 0x0c, 0x01014411 },</div><div class='add'>+			{ 0x0d, 0x01014410 },</div><div class='add'>+			{ 0x0e, 0x01014412 },</div><div class='add'>+			{ 0x22, 0x014b1180 },</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac92hd73xx_models[] = {</div><div class='add'>+	{ .id = STAC_92HD73XX_NO_JD, .name = "no-jd" },</div><div class='add'>+	{ .id = STAC_92HD73XX_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_92HD73XX_INTEL, .name = "intel" },</div><div class='add'>+	{ .id = STAC_DELL_M6_AMIC, .name = "dell-m6-amic" },</div><div class='add'>+	{ .id = STAC_DELL_M6_DMIC, .name = "dell-m6-dmic" },</div><div class='add'>+	{ .id = STAC_DELL_M6_BOTH, .name = "dell-m6" },</div><div class='add'>+	{ .id = STAC_DELL_EQ, .name = "dell-eq" },</div><div class='add'>+	{ .id = STAC_ALIENWARE_M17X, .name = "alienware" },</div><div class='add'>+	{ .id = STAC_ELO_VUPOINT_15MX, .name = "elo-vupoint-15mx" },</div><div class='add'>+	{ .id = STAC_92HD73XX_ASUS_MOBO, .name = "asus-mobo" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac92hd73xx_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+				"DFI LanParty", STAC_92HD73XX_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+				"DFI LanParty", STAC_92HD73XX_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5001,</div><div class='add'>+				"Intel DP45SG", STAC_92HD73XX_INTEL),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,</div><div class='add'>+				"Intel DG45ID", STAC_92HD73XX_INTEL),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,</div><div class='add'>+				"Intel DG45FC", STAC_92HD73XX_INTEL),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,</div><div class='add'>+				"Dell Studio 1535", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_BOTH),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_BOTH),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_AMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0272,</div><div class='add'>+				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f,</div><div class='add'>+				"Dell Studio 1537", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,</div><div class='add'>+				"Dell Studio 17", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be,</div><div class='add'>+				"Dell Studio 1555", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,</div><div class='add'>+				"Dell Studio 1557", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,</div><div class='add'>+				"Dell Studio XPS 1645", STAC_DELL_M6_DMIC),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,</div><div class='add'>+				"Dell Studio 1558", STAC_DELL_M6_DMIC),</div><div class='add'>+	/* codec SSID matching */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a1,</div><div class='add'>+		      "Alienware M17x", STAC_ALIENWARE_M17X),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,</div><div class='add'>+		      "Alienware M17x", STAC_ALIENWARE_M17X),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,</div><div class='add'>+		      "Alienware M17x R3", STAC_DELL_EQ),</div><div class='add'>+	SND_PCI_QUIRK(0x1059, 0x1011,</div><div class='add'>+		      "ELO VuPoint 15MX", STAC_ELO_VUPOINT_15MX),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1927,</div><div class='add'>+				"HP Z1 G2", STAC_92HD89XX_HP_Z1_G2_RIGHT_MIC_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17,</div><div class='add'>+				"unknown HP", STAC_92HD89XX_HP_FRONT_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_ASUSTEK, 0x83f8, "ASUS AT4NM10",</div><div class='add'>+		      STAC_92HD73XX_ASUS_MOBO),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref92hd83xxx_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x02211010 },</div><div class='add'>+	{ 0x0c, 0x02a19020 },</div><div class='add'>+	{ 0x0d, 0x02170130 },</div><div class='add'>+	{ 0x0e, 0x01014050 },</div><div class='add'>+	{ 0x0f, 0x01819040 },</div><div class='add'>+	{ 0x10, 0x01014020 },</div><div class='add'>+	{ 0x11, 0x90a3014e },</div><div class='add'>+	{ 0x1f, 0x01451160 },</div><div class='add'>+	{ 0x20, 0x98560170 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_s14_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0221403f },</div><div class='add'>+	{ 0x0b, 0x0221101f },</div><div class='add'>+	{ 0x0c, 0x02a19020 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x40f000f0 },</div><div class='add'>+	{ 0x0f, 0x40f000f0 },</div><div class='add'>+	{ 0x10, 0x40f000f0 },</div><div class='add'>+	{ 0x11, 0x90a60160 },</div><div class='add'>+	{ 0x1f, 0x40f000f0 },</div><div class='add'>+	{ 0x20, 0x40f000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_vostro_3500_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02a11020 },</div><div class='add'>+	{ 0x0b, 0x0221101f },</div><div class='add'>+	{ 0x0c, 0x400000f0 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x400000f1 },</div><div class='add'>+	{ 0x0f, 0x400000f2 },</div><div class='add'>+	{ 0x10, 0x400000f3 },</div><div class='add'>+	{ 0x11, 0x90a60160 },</div><div class='add'>+	{ 0x1f, 0x400000f4 },</div><div class='add'>+	{ 0x20, 0x400000f5 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl hp_dv7_4000_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x03a12050 },</div><div class='add'>+	{ 0x0b, 0x0321201f },</div><div class='add'>+	{ 0x0c, 0x40f000f0 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x40f000f0 },</div><div class='add'>+	{ 0x0f, 0x40f000f0 },</div><div class='add'>+	{ 0x10, 0x90170110 },</div><div class='add'>+	{ 0x11, 0xd5a30140 },</div><div class='add'>+	{ 0x1f, 0x40f000f0 },</div><div class='add'>+	{ 0x20, 0x40f000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl hp_zephyr_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x01813050 },</div><div class='add'>+	{ 0x0b, 0x0421201f },</div><div class='add'>+	{ 0x0c, 0x04a1205e },</div><div class='add'>+	{ 0x0d, 0x96130310 },</div><div class='add'>+	{ 0x0e, 0x96130310 },</div><div class='add'>+	{ 0x0f, 0x0101401f },</div><div class='add'>+	{ 0x10, 0x1111611f },</div><div class='add'>+	{ 0x11, 0xd5a30130 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl hp_cNB11_intquad_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x40f000f0 },</div><div class='add'>+	{ 0x0b, 0x0221101f },</div><div class='add'>+	{ 0x0c, 0x02a11020 },</div><div class='add'>+	{ 0x0d, 0x92170110 },</div><div class='add'>+	{ 0x0e, 0x40f000f0 },</div><div class='add'>+	{ 0x0f, 0x92170110 },</div><div class='add'>+	{ 0x10, 0x40f000f0 },</div><div class='add'>+	{ 0x11, 0xd5a30130 },</div><div class='add'>+	{ 0x1f, 0x40f000f0 },</div><div class='add'>+	{ 0x20, 0x40f000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hp_bnb2011_with_dock(codec)) {</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0xa, 0x2101201f);</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0xf, 0x2181205e);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (find_mute_led_cfg(codec, spec-&gt;default_polarity))</div><div class='add'>+		codec_dbg(codec, "mute LED gpio %d polarity %d\n",</div><div class='add'>+				spec-&gt;gpio_led,</div><div class='add'>+				spec-&gt;gpio_led_polarity);</div><div class='add'>+</div><div class='add'>+	/* allow auto-switching of dock line-in */</div><div class='add'>+	spec-&gt;gen.line_in_auto_switch = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp_zephyr(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_pincfgs(codec, hp_zephyr_pin_configs);</div><div class='add'>+	snd_hda_add_verbs(codec, stac92hd83xxx_hp_zephyr_init);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp_led(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;default_polarity = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp_inv_led(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;default_polarity = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp_mic_led(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;mic_mute_led_gpio = 0x08; /* GPIO3 */</div><div class='add'>+		/* resetting controller clears GPIO, so we need to keep on */</div><div class='add'>+		codec-&gt;core.power_caps &amp;= ~AC_PWRST_CLKSTOP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_hp_led_gpio10(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gpio_led = 0x10; /* GPIO4 */</div><div class='add'>+		spec-&gt;default_polarity = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_headset_jack(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;headset_jack = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd83xxx_fixup_gpio10_eapd(struct hda_codec *codec,</div><div class='add'>+					    const struct hda_fixup *fix,</div><div class='add'>+					    int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir =</div><div class='add'>+		spec-&gt;gpio_data = 0x10;</div><div class='add'>+	spec-&gt;eapd_switch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hp_envy_ts_fixup_dac_bind(struct hda_codec *codec,</div><div class='add'>+					    const struct hda_fixup *fix,</div><div class='add'>+					    int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	static const hda_nid_t preferred_pairs[] = {</div><div class='add'>+		0xd, 0x13,</div><div class='add'>+		0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.preferred_dacs = preferred_pairs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_verb hp_bnb13_eq_verbs[] = {</div><div class='add'>+	/* 44.1KHz base */</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x68 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x17 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x68 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x17 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x83 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x2F },</div><div class='add'>+	{ 0x22, 0x7A8, 0xD1 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x83 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x2F },</div><div class='add'>+	{ 0x22, 0x7AB, 0xD1 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x01 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x68 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x17 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x68 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x17 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x02 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x7C },</div><div class='add'>+	{ 0x22, 0x7A7, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x0C },</div><div class='add'>+	{ 0x22, 0x7A9, 0x7C },</div><div class='add'>+	{ 0x22, 0x7AA, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x0C },</div><div class='add'>+	{ 0x22, 0x7AC, 0x03 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC3 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x25 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xAF },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC3 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x25 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xAF },</div><div class='add'>+	{ 0x22, 0x7AC, 0x04 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x85 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x73 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x85 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x73 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x05 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x85 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x39 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xC7 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x85 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x39 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xC7 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x06 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3C },</div><div class='add'>+	{ 0x22, 0x7A7, 0x90 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xB0 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3C },</div><div class='add'>+	{ 0x22, 0x7AA, 0x90 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xB0 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x07 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x7A },</div><div class='add'>+	{ 0x22, 0x7A7, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x39 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x7A },</div><div class='add'>+	{ 0x22, 0x7AA, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x39 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x08 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC4 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xE9 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xDC },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC4 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xE9 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xDC },</div><div class='add'>+	{ 0x22, 0x7AC, 0x09 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3D },</div><div class='add'>+	{ 0x22, 0x7A7, 0xE1 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x0D },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3D },</div><div class='add'>+	{ 0x22, 0x7AA, 0xE1 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x0D },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0A },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x89 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xB6 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xEB },</div><div class='add'>+	{ 0x22, 0x7A9, 0x89 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xB6 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xEB },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0B },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x39 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x9D },</div><div class='add'>+	{ 0x22, 0x7A8, 0xFE },</div><div class='add'>+	{ 0x22, 0x7A9, 0x39 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x9D },</div><div class='add'>+	{ 0x22, 0x7AB, 0xFE },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0C },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x76 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x49 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x15 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x76 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x49 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x15 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0D },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC8 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xF5 },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC8 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x80 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xF5 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0E },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x0F },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x90 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x68 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xF1 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x90 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x68 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xF1 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x10 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x34 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x47 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x6C },</div><div class='add'>+	{ 0x22, 0x7A9, 0x34 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x47 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x6C },</div><div class='add'>+	{ 0x22, 0x7AC, 0x11 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x6F },</div><div class='add'>+	{ 0x22, 0x7A7, 0x97 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x0F },</div><div class='add'>+	{ 0x22, 0x7A9, 0x6F },</div><div class='add'>+	{ 0x22, 0x7AA, 0x97 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x0F },</div><div class='add'>+	{ 0x22, 0x7AC, 0x12 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xCB },</div><div class='add'>+	{ 0x22, 0x7A7, 0xB8 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x94 },</div><div class='add'>+	{ 0x22, 0x7A9, 0xCB },</div><div class='add'>+	{ 0x22, 0x7AA, 0xB8 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x94 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x13 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x14 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x95 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x76 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x5B },</div><div class='add'>+	{ 0x22, 0x7A9, 0x95 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x76 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x5B },</div><div class='add'>+	{ 0x22, 0x7AC, 0x15 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x31 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xAC },</div><div class='add'>+	{ 0x22, 0x7A8, 0x31 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x31 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xAC },</div><div class='add'>+	{ 0x22, 0x7AB, 0x31 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x16 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x6A },</div><div class='add'>+	{ 0x22, 0x7A7, 0x89 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xA5 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x6A },</div><div class='add'>+	{ 0x22, 0x7AA, 0x89 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xA5 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x17 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xCE },</div><div class='add'>+	{ 0x22, 0x7A7, 0x53 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xCF },</div><div class='add'>+	{ 0x22, 0x7A9, 0xCE },</div><div class='add'>+	{ 0x22, 0x7AA, 0x53 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xCF },</div><div class='add'>+	{ 0x22, 0x7AC, 0x18 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x19 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	/* 48KHz base */</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x88 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xDC },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x88 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xDC },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1A },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x82 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xEE },</div><div class='add'>+	{ 0x22, 0x7A8, 0x46 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x82 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xEE },</div><div class='add'>+	{ 0x22, 0x7AB, 0x46 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1B },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x88 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xDC },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x88 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xDC },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1C },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x7D },</div><div class='add'>+	{ 0x22, 0x7A7, 0x09 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x28 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x7D },</div><div class='add'>+	{ 0x22, 0x7AA, 0x09 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x28 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1D },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC2 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xE5 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xB4 },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC2 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xE5 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xB4 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1E },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0xA3 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x1F },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0xA3 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x1F },</div><div class='add'>+	{ 0x22, 0x7AC, 0x1F },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x84 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xCA },</div><div class='add'>+	{ 0x22, 0x7A8, 0xF1 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x84 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xCA },</div><div class='add'>+	{ 0x22, 0x7AB, 0xF1 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x20 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3C },</div><div class='add'>+	{ 0x22, 0x7A7, 0xD5 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x9C },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3C },</div><div class='add'>+	{ 0x22, 0x7AA, 0xD5 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x9C },</div><div class='add'>+	{ 0x22, 0x7AC, 0x21 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x7B },</div><div class='add'>+	{ 0x22, 0x7A7, 0x35 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x0F },</div><div class='add'>+	{ 0x22, 0x7A9, 0x7B },</div><div class='add'>+	{ 0x22, 0x7AA, 0x35 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x0F },</div><div class='add'>+	{ 0x22, 0x7AC, 0x22 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC4 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x87 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x45 },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC4 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x87 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x45 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x23 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3E },</div><div class='add'>+	{ 0x22, 0x7A7, 0x0A },</div><div class='add'>+	{ 0x22, 0x7A8, 0x78 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3E },</div><div class='add'>+	{ 0x22, 0x7AA, 0x0A },</div><div class='add'>+	{ 0x22, 0x7AB, 0x78 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x24 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x88 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xE2 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x05 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x88 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xE2 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x05 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x25 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x3A },</div><div class='add'>+	{ 0x22, 0x7A7, 0x1A },</div><div class='add'>+	{ 0x22, 0x7A8, 0xA3 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x3A },</div><div class='add'>+	{ 0x22, 0x7AA, 0x1A },</div><div class='add'>+	{ 0x22, 0x7AB, 0xA3 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x26 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x77 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x1D },</div><div class='add'>+	{ 0x22, 0x7A8, 0xFB },</div><div class='add'>+	{ 0x22, 0x7A9, 0x77 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x1D },</div><div class='add'>+	{ 0x22, 0x7AB, 0xFB },</div><div class='add'>+	{ 0x22, 0x7AC, 0x27 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xC7 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xDA },</div><div class='add'>+	{ 0x22, 0x7A8, 0xE5 },</div><div class='add'>+	{ 0x22, 0x7A9, 0xC7 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xDA },</div><div class='add'>+	{ 0x22, 0x7AB, 0xE5 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x28 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x29 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x8E },</div><div class='add'>+	{ 0x22, 0x7A7, 0xD7 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x22 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x8E },</div><div class='add'>+	{ 0x22, 0x7AA, 0xD7 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x22 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2A },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x35 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x26 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x35 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x26 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xC6 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2B },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x71 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x28 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xDE },</div><div class='add'>+	{ 0x22, 0x7A9, 0x71 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x28 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xDE },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2C },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xCA },</div><div class='add'>+	{ 0x22, 0x7A7, 0xD9 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x3A },</div><div class='add'>+	{ 0x22, 0x7A9, 0xCA },</div><div class='add'>+	{ 0x22, 0x7AA, 0xD9 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x3A },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2D },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2E },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x93 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x5E },</div><div class='add'>+	{ 0x22, 0x7A8, 0xD8 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x93 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x5E },</div><div class='add'>+	{ 0x22, 0x7AB, 0xD8 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x2F },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x32 },</div><div class='add'>+	{ 0x22, 0x7A7, 0xB7 },</div><div class='add'>+	{ 0x22, 0x7A8, 0xB1 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x32 },</div><div class='add'>+	{ 0x22, 0x7AA, 0xB7 },</div><div class='add'>+	{ 0x22, 0x7AB, 0xB1 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x30 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x6C },</div><div class='add'>+	{ 0x22, 0x7A7, 0xA1 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x28 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x6C },</div><div class='add'>+	{ 0x22, 0x7AA, 0xA1 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x28 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x31 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0xCD },</div><div class='add'>+	{ 0x22, 0x7A7, 0x48 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x4F },</div><div class='add'>+	{ 0x22, 0x7A9, 0xCD },</div><div class='add'>+	{ 0x22, 0x7AA, 0x48 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x4F },</div><div class='add'>+	{ 0x22, 0x7AC, 0x32 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	{ 0x22, 0x7A6, 0x40 },</div><div class='add'>+	{ 0x22, 0x7A7, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A8, 0x00 },</div><div class='add'>+	{ 0x22, 0x7A9, 0x40 },</div><div class='add'>+	{ 0x22, 0x7AA, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AB, 0x00 },</div><div class='add'>+	{ 0x22, 0x7AC, 0x33 },</div><div class='add'>+	{ 0x22, 0x7AD, 0x80 },</div><div class='add'>+	/* common */</div><div class='add'>+	{ 0x22, 0x782, 0xC1 },</div><div class='add'>+	{ 0x22, 0x771, 0x2C },</div><div class='add'>+	{ 0x22, 0x772, 0x2C },</div><div class='add'>+	{ 0x22, 0x788, 0x04 },</div><div class='add'>+	{ 0x01, 0x7B0, 0x08 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac92hd83xxx_fixups[] = {</div><div class='add'>+	[STAC_92HD83XXX_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ref92hd83xxx_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_PWR_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ref92hd83xxx_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_S14] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_s14_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_VOSTRO_3500] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_vostro_3500_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HP_cNB11_INTQUAD] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = hp_cNB11_intquad_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_DV7_4000] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = hp_dv7_4000_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_ZEPHYR] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp_zephyr,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HP_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp_led,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HP_INV_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp_inv_led,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HP_MIC_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp_mic_led,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_LED_GPIO10] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_hp_led_gpio10,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_HEADSET_JACK] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_headset_jack,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_ENVY_BASS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x0f, 0x90170111 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_BNB13_EQ] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = hp_bnb13_eq_verbs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD83XXX_HP_MIC_LED,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_ENVY_TS_BASS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			{ 0x10, 0x92170111 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_ENVY_TS_DAC_BIND] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = hp_envy_ts_fixup_dac_bind,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_HP_ENVY_TS_BASS,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD83XXX_GPIO10_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd83xxx_fixup_gpio10_eapd,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac92hd83xxx_models[] = {</div><div class='add'>+	{ .id = STAC_92HD83XXX_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_PWR_REF, .name = "mic-ref" },</div><div class='add'>+	{ .id = STAC_DELL_S14, .name = "dell-s14" },</div><div class='add'>+	{ .id = STAC_DELL_VOSTRO_3500, .name = "dell-vostro-3500" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_HP_cNB11_INTQUAD, .name = "hp_cNB11_intquad" },</div><div class='add'>+	{ .id = STAC_HP_DV7_4000, .name = "hp-dv7-4000" },</div><div class='add'>+	{ .id = STAC_HP_ZEPHYR, .name = "hp-zephyr" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_HP_LED, .name = "hp-led" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_HP_INV_LED, .name = "hp-inv-led" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_HP_MIC_LED, .name = "hp-mic-led" },</div><div class='add'>+	{ .id = STAC_92HD83XXX_HEADSET_JACK, .name = "headset-jack" },</div><div class='add'>+	{ .id = STAC_HP_ENVY_BASS, .name = "hp-envy-bass" },</div><div class='add'>+	{ .id = STAC_HP_BNB13_EQ, .name = "hp-bnb13-eq" },</div><div class='add'>+	{ .id = STAC_HP_ENVY_TS_BASS, .name = "hp-envy-ts-bass" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac92hd83xxx_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_92HD83XXX_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_92HD83XXX_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,</div><div class='add'>+		      "unknown Dell", STAC_DELL_S14),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0532,</div><div class='add'>+		      "Dell Latitude E6230", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0533,</div><div class='add'>+		      "Dell Latitude E6330", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0534,</div><div class='add'>+		      "Dell Latitude E6430", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0535,</div><div class='add'>+		      "Dell Latitude E6530", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x053c,</div><div class='add'>+		      "Dell Latitude E5430", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x053d,</div><div class='add'>+		      "Dell Latitude E5530", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0549,</div><div class='add'>+		      "Dell Latitude E5430", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x057d,</div><div class='add'>+		      "Dell Latitude E6430s", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0584,</div><div class='add'>+		      "Dell Latitude E6430U", STAC_92HD83XXX_HEADSET_JACK),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x1028,</div><div class='add'>+		      "Dell Vostro 3500", STAC_DELL_VOSTRO_3500),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1658,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1659,</div><div class='add'>+			  "HP Pavilion dv7", STAC_HP_DV7_4000),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165A,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165B,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1888,</div><div class='add'>+			  "HP Envy Spectre", STAC_HP_ENVY_BASS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1899,</div><div class='add'>+			  "HP Folio 13", STAC_HP_LED_GPIO10),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18df,</div><div class='add'>+			  "HP Folio", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x18F8,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1909,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190A,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x190e,</div><div class='add'>+			  "HP ENVY TS", STAC_HP_ENVY_TS_BASS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1967,</div><div class='add'>+			  "HP ENVY TS", STAC_HP_ENVY_TS_DAC_BIND),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1940,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1941,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1942,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1943,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1944,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1945,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1946,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1948,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1949,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x194A,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x194B,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x194C,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x194E,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x194F,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1950,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1951,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x195A,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x195B,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x195C,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1991,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2103,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2104,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2105,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2106,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2107,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2108,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2109,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x210A,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x210B,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x211C,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x211D,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x211E,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x211F,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2120,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2121,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2122,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2123,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x213E,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x213F,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2140,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x21B2,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x21B3,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x21B5,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x21B6,</div><div class='add'>+			  "HP bNB13", STAC_HP_BNB13_EQ),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x1900,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_MIC_LED),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x2000,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_MIC_LED),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x2100,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_MIC_LED),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3388,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3389,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355B,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355C,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355D,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355E,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x355F,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3560,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358B,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358C,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x358D,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3591,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3592,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3593,</div><div class='add'>+			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3561,</div><div class='add'>+			  "HP", STAC_HP_ZEPHYR),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3660,</div><div class='add'>+			  "HP Mini", STAC_92HD83XXX_HP_LED),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x144E,</div><div class='add'>+			  "HP Pavilion dv5", STAC_92HD83XXX_HP_INV_LED),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x148a,</div><div class='add'>+		      "HP Mini", STAC_92HD83XXX_HP_LED),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(PCI_VENDOR_ID_HP, "HP", STAC_92HD83XXX_HP),</div><div class='add'>+	/* match both for 0xfa91 and 0xfa93 */</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_TOSHIBA, 0xfffd, 0xfa91,</div><div class='add'>+		      "Toshiba Satellite S50D", STAC_92HD83XXX_GPIO10_EAPD),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* HP dv7 bass switch - GPIO5 */</div><div class='add'>+#define stac_hp_bass_gpio_info	snd_ctl_boolean_mono_info</div><div class='add'>+static int stac_hp_bass_gpio_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = !!(spec-&gt;gpio_data &amp; 0x20);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_hp_bass_gpio_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	unsigned int gpio_data;</div><div class='add'>+</div><div class='add'>+	gpio_data = (spec-&gt;gpio_data &amp; ~0x20) |</div><div class='add'>+		(ucontrol-&gt;value.integer.value[0] ? 0x20 : 0);</div><div class='add'>+	if (gpio_data == spec-&gt;gpio_data)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;gpio_data = gpio_data;</div><div class='add'>+	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new stac_hp_bass_sw_ctrl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = stac_hp_bass_gpio_info,</div><div class='add'>+	.get = stac_hp_bass_gpio_get,</div><div class='add'>+	.put = stac_hp_bass_gpio_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stac_add_hp_bass_switch(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, "Bass Speaker Playback Switch",</div><div class='add'>+				  &amp;stac_hp_bass_sw_ctrl))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_mask |= 0x20;</div><div class='add'>+	spec-&gt;gpio_dir |= 0x20;</div><div class='add'>+	spec-&gt;gpio_data |= 0x20;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref92hd71bxx_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x02a19040 },</div><div class='add'>+	{ 0x0c, 0x01a19020 },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x0181302e },</div><div class='add'>+	{ 0x0f, 0x01014010 },</div><div class='add'>+	{ 0x14, 0x01019020 },</div><div class='add'>+	{ 0x18, 0x90a000f0 },</div><div class='add'>+	{ 0x19, 0x90a000f0 },</div><div class='add'>+	{ 0x1e, 0x01452050 },</div><div class='add'>+	{ 0x1f, 0x01452050 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_m4_1_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0421101f },</div><div class='add'>+	{ 0x0b, 0x04a11221 },</div><div class='add'>+	{ 0x0c, 0x40f000f0 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x23a1902e },</div><div class='add'>+	{ 0x0f, 0x23014250 },</div><div class='add'>+	{ 0x14, 0x40f000f0 },</div><div class='add'>+	{ 0x18, 0x90a000f0 },</div><div class='add'>+	{ 0x19, 0x40f000f0 },</div><div class='add'>+	{ 0x1e, 0x4f0000f0 },</div><div class='add'>+	{ 0x1f, 0x4f0000f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_m4_2_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0421101f },</div><div class='add'>+	{ 0x0b, 0x04a11221 },</div><div class='add'>+	{ 0x0c, 0x90a70330 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x23a1902e },</div><div class='add'>+	{ 0x0f, 0x23014250 },</div><div class='add'>+	{ 0x14, 0x40f000f0 },</div><div class='add'>+	{ 0x18, 0x40f000f0 },</div><div class='add'>+	{ 0x19, 0x40f000f0 },</div><div class='add'>+	{ 0x1e, 0x044413b0 },</div><div class='add'>+	{ 0x1f, 0x044413b0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_m4_3_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0421101f },</div><div class='add'>+	{ 0x0b, 0x04a11221 },</div><div class='add'>+	{ 0x0c, 0x90a70330 },</div><div class='add'>+	{ 0x0d, 0x90170110 },</div><div class='add'>+	{ 0x0e, 0x40f000f0 },</div><div class='add'>+	{ 0x0f, 0x40f000f0 },</div><div class='add'>+	{ 0x14, 0x40f000f0 },</div><div class='add'>+	{ 0x18, 0x90a000f0 },</div><div class='add'>+	{ 0x19, 0x40f000f0 },</div><div class='add'>+	{ 0x1e, 0x044413b0 },</div><div class='add'>+	{ 0x1f, 0x044413b0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_ref(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_pincfgs(codec, ref92hd71bxx_pin_configs);</div><div class='add'>+	spec-&gt;gpio_mask = spec-&gt;gpio_dir = spec-&gt;gpio_data = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_hp_m4(struct hda_codec *codec,</div><div class='add'>+				      const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_jack_callback *jack;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Enable VREF power saving on GPIO1 detect */</div><div class='add'>+	snd_hda_codec_write_cache(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				  AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x02);</div><div class='add'>+	jack = snd_hda_jack_detect_enable_callback(codec, codec-&gt;core.afg,</div><div class='add'>+						   stac_vref_event);</div><div class='add'>+	if (!IS_ERR(jack))</div><div class='add'>+		jack-&gt;private_data = 0x02;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_mask |= 0x02;</div><div class='add'>+</div><div class='add'>+	/* enable internal microphone */</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, 0x0e, 0x01813040);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_hp_dv4(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	spec-&gt;gpio_led = 0x01;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_hp_dv5(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	unsigned int cap;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case HDA_FIXUP_ACT_PRE_PROBE:</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HDA_FIXUP_ACT_PROBE:</div><div class='add'>+		/* enable bass on HP dv7 */</div><div class='add'>+		cap = snd_hda_param_read(codec, 0x1, AC_PAR_GPIO_CAP);</div><div class='add'>+		cap &amp;= AC_GPIO_IO_COUNT;</div><div class='add'>+		if (cap &gt;= 6)</div><div class='add'>+			stac_add_hp_bass_switch(codec);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_hp_hdx(struct hda_codec *codec,</div><div class='add'>+				       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+	spec-&gt;gpio_led = 0x08;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_hp_output(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int pin_cfg = snd_hda_codec_get_pincfg(codec, pin);</div><div class='add'>+</div><div class='add'>+	/* count line-out, too, as BIOS sets often so */</div><div class='add'>+	return get_defcfg_connect(pin_cfg) != AC_JACK_PORT_NONE &amp;&amp;</div><div class='add'>+		(get_defcfg_device(pin_cfg) == AC_JACK_LINE_OUT ||</div><div class='add'>+		 get_defcfg_device(pin_cfg) == AC_JACK_HP_OUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void fixup_hp_headphone(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int pin_cfg = snd_hda_codec_get_pincfg(codec, pin);</div><div class='add'>+</div><div class='add'>+	/* It was changed in the BIOS to just satisfy MS DTM.</div><div class='add'>+	 * Lets turn it back into follower HP</div><div class='add'>+	 */</div><div class='add'>+	pin_cfg = (pin_cfg &amp; (~AC_DEFCFG_DEVICE)) |</div><div class='add'>+		(AC_JACK_HP_OUT &lt;&lt; AC_DEFCFG_DEVICE_SHIFT);</div><div class='add'>+	pin_cfg = (pin_cfg &amp; (~(AC_DEFCFG_DEF_ASSOC | AC_DEFCFG_SEQUENCE))) |</div><div class='add'>+		0x1f;</div><div class='add'>+	snd_hda_codec_set_pincfg(codec, pin, pin_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac92hd71bxx_fixup_hp(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* when both output A and F are assigned, these are supposedly</div><div class='add'>+	 * dock and built-in headphones; fix both pin configs</div><div class='add'>+	 */</div><div class='add'>+	if (is_hp_output(codec, 0x0a) &amp;&amp; is_hp_output(codec, 0x0f)) {</div><div class='add'>+		fixup_hp_headphone(codec, 0x0a);</div><div class='add'>+		fixup_hp_headphone(codec, 0x0f);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (find_mute_led_cfg(codec, 1))</div><div class='add'>+		codec_dbg(codec, "mute LED gpio %d polarity %d\n",</div><div class='add'>+				spec-&gt;gpio_led,</div><div class='add'>+				spec-&gt;gpio_led_polarity);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac92hd71bxx_fixups[] = {</div><div class='add'>+	[STAC_92HD71BXX_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_ref,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M4_1] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_m4_1_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M4_2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_m4_2_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_M4_3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_m4_3_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_M4] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_hp_m4,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD71BXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_DV4] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_hp_dv4,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_HP_DV5,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_DV5] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_hp_dv5,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD71BXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_HP_HDX] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_hp_hdx,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD71BXX_HP,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD71BXX_HP] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd71bxx_fixup_hp,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac92hd71bxx_models[] = {</div><div class='add'>+	{ .id = STAC_92HD71BXX_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_DELL_M4_1, .name = "dell-m4-1" },</div><div class='add'>+	{ .id = STAC_DELL_M4_2, .name = "dell-m4-2" },</div><div class='add'>+	{ .id = STAC_DELL_M4_3, .name = "dell-m4-3" },</div><div class='add'>+	{ .id = STAC_HP_M4, .name = "hp-m4" },</div><div class='add'>+	{ .id = STAC_HP_DV4, .name = "hp-dv4" },</div><div class='add'>+	{ .id = STAC_HP_DV5, .name = "hp-dv5" },</div><div class='add'>+	{ .id = STAC_HP_HDX, .name = "hp-hdx" },</div><div class='add'>+	{ .id = STAC_HP_DV4, .name = "hp-dv4-1222nr" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac92hd71bxx_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_92HD71BXX_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_92HD71BXX_REF),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x1720,</div><div class='add'>+			  "HP", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,</div><div class='add'>+		      "HP", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,</div><div class='add'>+		      "HP dv4-7", STAC_HP_DV4),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,</div><div class='add'>+		      "HP dv4-7", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610,</div><div class='add'>+		      "HP HDX", STAC_HP_HDX),  /* HDX18 */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,</div><div class='add'>+		      "HP mini 1000", STAC_HP_M4),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b,</div><div class='add'>+		      "HP HDX", STAC_HP_HDX),  /* HDX16 */</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,</div><div class='add'>+		      "HP dv6", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,</div><div class='add'>+		      "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x363e,</div><div class='add'>+		      "HP DV6", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,</div><div class='add'>+		      "HP", STAC_HP_DV5),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(PCI_VENDOR_ID_HP, "HP", STAC_92HD71BXX_HP),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0250,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024f,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024d,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0251,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0277,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_1),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0263,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_2),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0265,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_2),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0262,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_2),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_2),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa,</div><div class='add'>+				"unknown Dell", STAC_DELL_M4_3),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref922x_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x01014010 },</div><div class='add'>+	{ 0x0b, 0x01016011 },</div><div class='add'>+	{ 0x0c, 0x01012012 },</div><div class='add'>+	{ 0x0d, 0x0221401f },</div><div class='add'>+	{ 0x0e, 0x01813122 },</div><div class='add'>+	{ 0x0f, 0x01011014 },</div><div class='add'>+	{ 0x10, 0x01441030 },</div><div class='add'>+	{ 0x11, 0x01c41030 },</div><div class='add'>+	{ 0x15, 0x40000100 },</div><div class='add'>+	{ 0x1b, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 922X pin configs for</div><div class='add'>+    102801A7</div><div class='add'>+    102801AB</div><div class='add'>+    102801A9</div><div class='add'>+    102801D1</div><div class='add'>+    102801D2</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_922x_d81_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x01a19021 },</div><div class='add'>+	{ 0x0c, 0x01111012 },</div><div class='add'>+	{ 0x0d, 0x01114010 },</div><div class='add'>+	{ 0x0e, 0x02a19020 },</div><div class='add'>+	{ 0x0f, 0x01117011 },</div><div class='add'>+	{ 0x10, 0x400001f0 },</div><div class='add'>+	{ 0x11, 0x400001f1 },</div><div class='add'>+	{ 0x15, 0x01813122 },</div><div class='add'>+	{ 0x1b, 0x400001f2 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 922X pin configs for</div><div class='add'>+    102801AC</div><div class='add'>+    102801D0</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_922x_d82_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214030 },</div><div class='add'>+	{ 0x0b, 0x01a19021 },</div><div class='add'>+	{ 0x0c, 0x01111012 },</div><div class='add'>+	{ 0x0d, 0x01114010 },</div><div class='add'>+	{ 0x0e, 0x02a19020 },</div><div class='add'>+	{ 0x0f, 0x01117011 },</div><div class='add'>+	{ 0x10, 0x01451140 },</div><div class='add'>+	{ 0x11, 0x400001f0 },</div><div class='add'>+	{ 0x15, 0x01813122 },</div><div class='add'>+	{ 0x1b, 0x400001f1 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 922X pin configs for</div><div class='add'>+    102801BF</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_922x_m81_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321101f },</div><div class='add'>+	{ 0x0b, 0x01112024 },</div><div class='add'>+	{ 0x0c, 0x01111222 },</div><div class='add'>+	{ 0x0d, 0x91174220 },</div><div class='add'>+	{ 0x0e, 0x03a11050 },</div><div class='add'>+	{ 0x0f, 0x01116221 },</div><div class='add'>+	{ 0x10, 0x90a70330 },</div><div class='add'>+	{ 0x11, 0x01452340 },</div><div class='add'>+	{ 0x15, 0x40C003f1 },</div><div class='add'>+	{ 0x1b, 0x405003f0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9221 A1 pin configs for</div><div class='add'>+    102801D7 (Dell XPS M1210)</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_922x_m82_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02211211 },</div><div class='add'>+	{ 0x0b, 0x408103ff },</div><div class='add'>+	{ 0x0c, 0x02a1123e },</div><div class='add'>+	{ 0x0d, 0x90100310 },</div><div class='add'>+	{ 0x0e, 0x408003f1 },</div><div class='add'>+	{ 0x0f, 0x0221121f },</div><div class='add'>+	{ 0x10, 0x03451340 },</div><div class='add'>+	{ 0x11, 0x40c003f2 },</div><div class='add'>+	{ 0x15, 0x508003f3 },</div><div class='add'>+	{ 0x1b, 0x405003f4 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl d945gtp3_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0221401f },</div><div class='add'>+	{ 0x0b, 0x01a19022 },</div><div class='add'>+	{ 0x0c, 0x01813021 },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x40000100 },</div><div class='add'>+	{ 0x0f, 0x40000100 },</div><div class='add'>+	{ 0x10, 0x40000100 },</div><div class='add'>+	{ 0x11, 0x40000100 },</div><div class='add'>+	{ 0x15, 0x02a19120 },</div><div class='add'>+	{ 0x1b, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl d945gtp5_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0221401f },</div><div class='add'>+	{ 0x0b, 0x01011012 },</div><div class='add'>+	{ 0x0c, 0x01813024 },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x01a19021 },</div><div class='add'>+	{ 0x0f, 0x01016011 },</div><div class='add'>+	{ 0x10, 0x01452130 },</div><div class='add'>+	{ 0x11, 0x40000100 },</div><div class='add'>+	{ 0x15, 0x02a19320 },</div><div class='add'>+	{ 0x1b, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_mac_v1_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0121e21f },</div><div class='add'>+	{ 0x0b, 0x400000ff },</div><div class='add'>+	{ 0x0c, 0x9017e110 },</div><div class='add'>+	{ 0x0d, 0x400000fd },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x0181e020 },</div><div class='add'>+	{ 0x10, 0x1145e030 },</div><div class='add'>+	{ 0x11, 0x11c5e240 },</div><div class='add'>+	{ 0x15, 0x400000fc },</div><div class='add'>+	{ 0x1b, 0x400000fb },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_mac_v2_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0121e21f },</div><div class='add'>+	{ 0x0b, 0x90a7012e },</div><div class='add'>+	{ 0x0c, 0x9017e110 },</div><div class='add'>+	{ 0x0d, 0x400000fd },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x0181e020 },</div><div class='add'>+	{ 0x10, 0x1145e230 },</div><div class='add'>+	{ 0x11, 0x500000fa },</div><div class='add'>+	{ 0x15, 0x400000fc },</div><div class='add'>+	{ 0x1b, 0x400000fb },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_mac_v3_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0121e21f },</div><div class='add'>+	{ 0x0b, 0x90a7012e },</div><div class='add'>+	{ 0x0c, 0x9017e110 },</div><div class='add'>+	{ 0x0d, 0x400000fd },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x0181e020 },</div><div class='add'>+	{ 0x10, 0x1145e230 },</div><div class='add'>+	{ 0x11, 0x11c5e240 },</div><div class='add'>+	{ 0x15, 0x400000fc },</div><div class='add'>+	{ 0x1b, 0x400000fb },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_mac_v4_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321e21f },</div><div class='add'>+	{ 0x0b, 0x03a1e02e },</div><div class='add'>+	{ 0x0c, 0x9017e110 },</div><div class='add'>+	{ 0x0d, 0x9017e11f },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x0381e020 },</div><div class='add'>+	{ 0x10, 0x1345e230 },</div><div class='add'>+	{ 0x11, 0x13c5e240 },</div><div class='add'>+	{ 0x15, 0x400000fc },</div><div class='add'>+	{ 0x1b, 0x400000fb },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl intel_mac_v5_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321e21f },</div><div class='add'>+	{ 0x0b, 0x03a1e02e },</div><div class='add'>+	{ 0x0c, 0x9017e110 },</div><div class='add'>+	{ 0x0d, 0x9017e11f },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x0381e020 },</div><div class='add'>+	{ 0x10, 0x1345e230 },</div><div class='add'>+	{ 0x11, 0x13c5e240 },</div><div class='add'>+	{ 0x15, 0x400000fc },</div><div class='add'>+	{ 0x1b, 0x400000fb },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ecs202_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0221401f },</div><div class='add'>+	{ 0x0b, 0x02a19020 },</div><div class='add'>+	{ 0x0c, 0x01a19020 },</div><div class='add'>+	{ 0x0d, 0x01114010 },</div><div class='add'>+	{ 0x0e, 0x408000f0 },</div><div class='add'>+	{ 0x0f, 0x01813022 },</div><div class='add'>+	{ 0x10, 0x074510a0 },</div><div class='add'>+	{ 0x11, 0x40c400f1 },</div><div class='add'>+	{ 0x15, 0x9037012e },</div><div class='add'>+	{ 0x1b, 0x40e000f2 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */</div><div class='add'>+static const struct hda_quirk stac922x_intel_mac_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0e00, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0f00, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1600, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1700, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0200, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1e00, "Mac", STAC_INTEL_MAC_V3),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x1a00, "Mac", STAC_INTEL_MAC_V4),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x0a00, "Mac", STAC_INTEL_MAC_V5),</div><div class='add'>+	SND_PCI_QUIRK(0x106b, 0x2200, "Mac", STAC_INTEL_MAC_V5),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac922x_fixups[];</div><div class='add'>+</div><div class='add'>+/* remap the fixup from codec SSID and apply it */</div><div class='add'>+static void stac922x_fixup_intel_mac_auto(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec-&gt;fixup_id = HDA_FIXUP_ID_NOT_SET;</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, stac922x_intel_mac_fixup_tbl,</div><div class='add'>+			   stac922x_fixups);</div><div class='add'>+	if (codec-&gt;fixup_id != HDA_FIXUP_ID_NOT_SET)</div><div class='add'>+		snd_hda_apply_fixup(codec, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac922x_fixup_intel_mac_gpio(struct hda_codec *codec,</div><div class='add'>+					  const struct hda_fixup *fix,</div><div class='add'>+					  int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x03;</div><div class='add'>+		spec-&gt;gpio_data = 0x03;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac922x_fixups[] = {</div><div class='add'>+	[STAC_D945_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ref922x_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D945GTP3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = d945gtp3_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D945GTP5] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = d945gtp5_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_AUTO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac922x_fixup_intel_mac_auto,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_V1] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_mac_v1_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_V2] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_mac_v2_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_V3] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_mac_v3_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_V4] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_mac_v4_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[STAC_INTEL_MAC_V5] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = intel_mac_v5_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_922X_INTEL_MAC_GPIO,</div><div class='add'>+	},</div><div class='add'>+	[STAC_922X_INTEL_MAC_GPIO] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac922x_fixup_intel_mac_gpio,</div><div class='add'>+	},</div><div class='add'>+	[STAC_ECS_202] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = ecs202_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_922X_DELL_D81] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_922x_d81_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_922X_DELL_D82] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_922x_d82_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_922X_DELL_M81] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_922x_m81_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_922X_DELL_M82] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_922x_m82_pin_configs,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac922x_models[] = {</div><div class='add'>+	{ .id = STAC_D945_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_D945GTP5, .name = "5stack" },</div><div class='add'>+	{ .id = STAC_D945GTP3, .name = "3stack" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V1, .name = "intel-mac-v1" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V2, .name = "intel-mac-v2" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V3, .name = "intel-mac-v3" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V4, .name = "intel-mac-v4" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V5, .name = "intel-mac-v5" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_AUTO, .name = "intel-mac-auto" },</div><div class='add'>+	{ .id = STAC_ECS_202, .name = "ecs202" },</div><div class='add'>+	{ .id = STAC_922X_DELL_D81, .name = "dell-d81" },</div><div class='add'>+	{ .id = STAC_922X_DELL_D82, .name = "dell-d82" },</div><div class='add'>+	{ .id = STAC_922X_DELL_M81, .name = "dell-m81" },</div><div class='add'>+	{ .id = STAC_922X_DELL_M82, .name = "dell-m82" },</div><div class='add'>+	/* for backward compatibility */</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V3, .name = "macmini" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V5, .name = "macbook" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V3, .name = "macbook-pro-v1" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V3, .name = "macbook-pro" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V2, .name = "imac-intel" },</div><div class='add'>+	{ .id = STAC_INTEL_MAC_V3, .name = "imac-intel-20" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac922x_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_D945_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_D945_REF),</div><div class='add'>+	/* Intel 945G based systems */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0101,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0202,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0606,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0601,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0111,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1115,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1116,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1117,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1118,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1119,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x8826,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5049,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5055,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5048,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0110,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP3),</div><div class='add'>+	/* Intel D945G 5-stack systems */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0404,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP5),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0303,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP5),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0013,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP5),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0417,</div><div class='add'>+		      "Intel D945G", STAC_D945GTP5),</div><div class='add'>+	/* Intel 945P based systems */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0b0b,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0112,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0d0d,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0909,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0505,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP3),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0707,</div><div class='add'>+		      "Intel D945P", STAC_D945GTP5),</div><div class='add'>+	/* other intel */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0204,</div><div class='add'>+		      "Intel D945", STAC_D945_REF),</div><div class='add'>+	/* other systems  */</div><div class='add'>+</div><div class='add'>+	/* Apple Intel Mac (Mac Mini, MacBook, MacBook Pro...) */</div><div class='add'>+	SND_PCI_QUIRK(0x8384, 0x7680, "Mac", STAC_INTEL_MAC_AUTO),</div><div class='add'>+</div><div class='add'>+	/* Dell systems  */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a9,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ab,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ac,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D82),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bf,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_M81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d0,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D82),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d1,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d2,</div><div class='add'>+		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,</div><div class='add'>+		      "Dell XPS M1210", STAC_922X_DELL_M82),</div><div class='add'>+	/* ECS/PC Chips boards */</div><div class='add'>+	SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,</div><div class='add'>+		      "ECS/PC chips", STAC_ECS_202),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref927x_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214020 },</div><div class='add'>+	{ 0x0b, 0x02a19080 },</div><div class='add'>+	{ 0x0c, 0x0181304e },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x01a19040 },</div><div class='add'>+	{ 0x0f, 0x01011012 },</div><div class='add'>+	{ 0x10, 0x01016011 },</div><div class='add'>+	{ 0x11, 0x0101201f },</div><div class='add'>+	{ 0x12, 0x183301f0 },</div><div class='add'>+	{ 0x13, 0x18a001f0 },</div><div class='add'>+	{ 0x14, 0x18a001f0 },</div><div class='add'>+	{ 0x21, 0x01442070 },</div><div class='add'>+	{ 0x22, 0x01c42190 },</div><div class='add'>+	{ 0x23, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl d965_3st_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0221401f },</div><div class='add'>+	{ 0x0b, 0x02a19120 },</div><div class='add'>+	{ 0x0c, 0x40000100 },</div><div class='add'>+	{ 0x0d, 0x01014011 },</div><div class='add'>+	{ 0x0e, 0x01a19021 },</div><div class='add'>+	{ 0x0f, 0x01813024 },</div><div class='add'>+	{ 0x10, 0x40000100 },</div><div class='add'>+	{ 0x11, 0x40000100 },</div><div class='add'>+	{ 0x12, 0x40000100 },</div><div class='add'>+	{ 0x13, 0x40000100 },</div><div class='add'>+	{ 0x14, 0x40000100 },</div><div class='add'>+	{ 0x21, 0x40000100 },</div><div class='add'>+	{ 0x22, 0x40000100 },</div><div class='add'>+	{ 0x23, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl d965_5st_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02214020 },</div><div class='add'>+	{ 0x0b, 0x02a19080 },</div><div class='add'>+	{ 0x0c, 0x0181304e },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x01a19040 },</div><div class='add'>+	{ 0x0f, 0x01011012 },</div><div class='add'>+	{ 0x10, 0x01016011 },</div><div class='add'>+	{ 0x11, 0x40000100 },</div><div class='add'>+	{ 0x12, 0x40000100 },</div><div class='add'>+	{ 0x13, 0x40000100 },</div><div class='add'>+	{ 0x14, 0x40000100 },</div><div class='add'>+	{ 0x21, 0x01442070 },</div><div class='add'>+	{ 0x22, 0x40000100 },</div><div class='add'>+	{ 0x23, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl d965_5st_no_fp_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x40000100 },</div><div class='add'>+	{ 0x0b, 0x40000100 },</div><div class='add'>+	{ 0x0c, 0x0181304e },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x01a19040 },</div><div class='add'>+	{ 0x0f, 0x01011012 },</div><div class='add'>+	{ 0x10, 0x01016011 },</div><div class='add'>+	{ 0x11, 0x40000100 },</div><div class='add'>+	{ 0x12, 0x40000100 },</div><div class='add'>+	{ 0x13, 0x40000100 },</div><div class='add'>+	{ 0x14, 0x40000100 },</div><div class='add'>+	{ 0x21, 0x01442070 },</div><div class='add'>+	{ 0x22, 0x40000100 },</div><div class='add'>+	{ 0x23, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_3st_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x02211230 },</div><div class='add'>+	{ 0x0b, 0x02a11220 },</div><div class='add'>+	{ 0x0c, 0x01a19040 },</div><div class='add'>+	{ 0x0d, 0x01114210 },</div><div class='add'>+	{ 0x0e, 0x01111212 },</div><div class='add'>+	{ 0x0f, 0x01116211 },</div><div class='add'>+	{ 0x10, 0x01813050 },</div><div class='add'>+	{ 0x11, 0x01112214 },</div><div class='add'>+	{ 0x12, 0x403003fa },</div><div class='add'>+	{ 0x13, 0x90a60040 },</div><div class='add'>+	{ 0x14, 0x90a60040 },</div><div class='add'>+	{ 0x21, 0x404003fb },</div><div class='add'>+	{ 0x22, 0x40c003fc },</div><div class='add'>+	{ 0x23, 0x40000100 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac927x_fixup_ref_no_jd(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	/* no jack detecion for ref-no-jd model */</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		codec-&gt;no_jack_detect = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac927x_fixup_ref(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		snd_hda_apply_pincfgs(codec, ref927x_pin_configs);</div><div class='add'>+		spec-&gt;eapd_mask = spec-&gt;gpio_mask = 0;</div><div class='add'>+		spec-&gt;gpio_dir = spec-&gt;gpio_data = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac927x_fixup_dell_dmic(struct hda_codec *codec,</div><div class='add'>+				     const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;core.subsystem_id != 0x1028022f) {</div><div class='add'>+		/* GPIO2 High = Enable EAPD */</div><div class='add'>+		spec-&gt;eapd_mask = spec-&gt;gpio_mask = 0x04;</div><div class='add'>+		spec-&gt;gpio_dir = spec-&gt;gpio_data = 0x04;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, dell_3st_core_init);</div><div class='add'>+	spec-&gt;volknob_init = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac927x_fixup_volknob(struct hda_codec *codec,</div><div class='add'>+				   const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		snd_hda_add_verbs(codec, stac927x_volknob_core_init);</div><div class='add'>+		spec-&gt;volknob_init = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac927x_fixups[] = {</div><div class='add'>+	[STAC_D965_REF_NO_JD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac927x_fixup_ref_no_jd,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_D965_REF,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D965_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac927x_fixup_ref,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D965_3ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = d965_3st_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_D965_VERBS,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D965_5ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = d965_5st_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_D965_VERBS,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D965_VERBS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = d965_core_init,</div><div class='add'>+	},</div><div class='add'>+	[STAC_D965_5ST_NO_FP] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = d965_5st_no_fp_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_NEMO_DEFAULT] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = nemo_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_3ST] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_3st_pin_configs,</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_927X_DELL_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_BIOS] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* correct the front output jack as a hp out */</div><div class='add'>+			{ 0x0f, 0x0221101f },</div><div class='add'>+			/* correct the front input jack as a mic */</div><div class='add'>+			{ 0x0e, 0x02a79130 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_927X_DELL_DMIC,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_BIOS_AMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* configure the analog microphone on some laptops */</div><div class='add'>+			{ 0x0c, 0x90a79130 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_DELL_BIOS,</div><div class='add'>+	},</div><div class='add'>+	[STAC_DELL_BIOS_SPDIF] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* correct the device field to SPDIF out */</div><div class='add'>+			{ 0x21, 0x01442070 },</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_DELL_BIOS,</div><div class='add'>+	},</div><div class='add'>+	[STAC_927X_DELL_DMIC] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac927x_fixup_dell_dmic,</div><div class='add'>+	},</div><div class='add'>+	[STAC_927X_VOLKNOB] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac927x_fixup_volknob,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac927x_models[] = {</div><div class='add'>+	{ .id = STAC_D965_REF_NO_JD, .name = "ref-no-jd" },</div><div class='add'>+	{ .id = STAC_D965_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_D965_3ST, .name = "3stack" },</div><div class='add'>+	{ .id = STAC_D965_5ST, .name = "5stack" },</div><div class='add'>+	{ .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" },</div><div class='add'>+	{ .id = STAC_DELL_3ST, .name = "dell-3stack" },</div><div class='add'>+	{ .id = STAC_DELL_BIOS, .name = "dell-bios" },</div><div class='add'>+	{ .id = STAC_NEMO_DEFAULT, .name = "nemo-default" },</div><div class='add'>+	{ .id = STAC_DELL_BIOS_AMIC, .name = "dell-bios-amic" },</div><div class='add'>+	{ .id = STAC_927X_VOLKNOB, .name = "volknob" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac927x_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_D965_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_D965_REF),</div><div class='add'>+	 /* Intel 946 based systems */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),</div><div class='add'>+	/* 965 based 3 stack systems */</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,</div><div class='add'>+			   "Intel D965", STAC_D965_3ST),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,</div><div class='add'>+			   "Intel D965", STAC_D965_3ST),</div><div class='add'>+	/* Dell 3 stack systems */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01ed, "Dell     ", STAC_DELL_3ST),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f4, "Dell     ", STAC_DELL_3ST),</div><div class='add'>+	/* Dell 3 stack systems with verb table in BIOS */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0227, "Dell Vostro 1400  ", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022e, "Dell     ", STAC_DELL_BIOS_SPDIF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell Inspiron 1525", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0242, "Dell     ", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0243, "Dell     ", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS_SPDIF),</div><div class='add'>+	/* 965 based 5 stack systems */</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,</div><div class='add'>+			   "Intel D965", STAC_D965_5ST),</div><div class='add'>+	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,</div><div class='add'>+			   "Intel D965", STAC_D965_5ST),</div><div class='add'>+	/* Nemo */</div><div class='add'>+	SND_PCI_QUIRK(0x1888, 0x1000, "AmigaOne X1000", STAC_NEMO_DEFAULT),</div><div class='add'>+	/* volume-knob fixes */</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x10cf, "FSC", STAC_927X_VOLKNOB),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl ref9205_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x40000100 },</div><div class='add'>+	{ 0x0b, 0x40000100 },</div><div class='add'>+	{ 0x0c, 0x01016011 },</div><div class='add'>+	{ 0x0d, 0x01014010 },</div><div class='add'>+	{ 0x0e, 0x01813122 },</div><div class='add'>+	{ 0x0f, 0x01a19021 },</div><div class='add'>+	{ 0x14, 0x01019020 },</div><div class='add'>+	{ 0x16, 0x40000100 },</div><div class='add'>+	{ 0x17, 0x90a000f0 },</div><div class='add'>+	{ 0x18, 0x90a000f0 },</div><div class='add'>+	{ 0x21, 0x01441030 },</div><div class='add'>+	{ 0x22, 0x01c41030 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9205 pin configs for</div><div class='add'>+    102801F1</div><div class='add'>+    102801F2</div><div class='add'>+    102801FC</div><div class='add'>+    102801FD</div><div class='add'>+    10280204</div><div class='add'>+    1028021F</div><div class='add'>+    10280228 (Dell Vostro 1500)</div><div class='add'>+    10280229 (Dell Vostro 1700)</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_9205_m42_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321101F },</div><div class='add'>+	{ 0x0b, 0x03A11020 },</div><div class='add'>+	{ 0x0c, 0x400003FA },</div><div class='add'>+	{ 0x0d, 0x90170310 },</div><div class='add'>+	{ 0x0e, 0x400003FB },</div><div class='add'>+	{ 0x0f, 0x400003FC },</div><div class='add'>+	{ 0x14, 0x400003FD },</div><div class='add'>+	{ 0x16, 0x40F000F9 },</div><div class='add'>+	{ 0x17, 0x90A60330 },</div><div class='add'>+	{ 0x18, 0x400003FF },</div><div class='add'>+	{ 0x21, 0x0144131F },</div><div class='add'>+	{ 0x22, 0x40C003FE },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    STAC 9205 pin configs for</div><div class='add'>+    102801F9</div><div class='add'>+    102801FA</div><div class='add'>+    102801FE</div><div class='add'>+    102801FF (Dell Precision M4300)</div><div class='add'>+    10280206</div><div class='add'>+    10280200</div><div class='add'>+    10280201</div><div class='add'>+*/</div><div class='add'>+static const struct hda_pintbl dell_9205_m43_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0321101f },</div><div class='add'>+	{ 0x0b, 0x03a11020 },</div><div class='add'>+	{ 0x0c, 0x90a70330 },</div><div class='add'>+	{ 0x0d, 0x90170310 },</div><div class='add'>+	{ 0x0e, 0x400000fe },</div><div class='add'>+	{ 0x0f, 0x400000ff },</div><div class='add'>+	{ 0x14, 0x400000fd },</div><div class='add'>+	{ 0x16, 0x40f000f9 },</div><div class='add'>+	{ 0x17, 0x400000fa },</div><div class='add'>+	{ 0x18, 0x400000fc },</div><div class='add'>+	{ 0x21, 0x0144131f },</div><div class='add'>+	{ 0x22, 0x40c003f8 },</div><div class='add'>+	/* Enable SPDIF in/out */</div><div class='add'>+	{ 0x1f, 0x01441030 },</div><div class='add'>+	{ 0x20, 0x1c410030 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl dell_9205_m44_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x0421101f },</div><div class='add'>+	{ 0x0b, 0x04a11020 },</div><div class='add'>+	{ 0x0c, 0x400003fa },</div><div class='add'>+	{ 0x0d, 0x90170310 },</div><div class='add'>+	{ 0x0e, 0x400003fb },</div><div class='add'>+	{ 0x0f, 0x400003fc },</div><div class='add'>+	{ 0x14, 0x400003fd },</div><div class='add'>+	{ 0x16, 0x400003f9 },</div><div class='add'>+	{ 0x17, 0x90a60330 },</div><div class='add'>+	{ 0x18, 0x400003ff },</div><div class='add'>+	{ 0x21, 0x01441340 },</div><div class='add'>+	{ 0x22, 0x40c003fe },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac9205_fixup_ref(struct hda_codec *codec,</div><div class='add'>+			       const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		snd_hda_apply_pincfgs(codec, ref9205_pin_configs);</div><div class='add'>+		/* SPDIF-In enabled */</div><div class='add'>+		spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac9205_fixup_dell_m43(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	struct hda_jack_callback *jack;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE) {</div><div class='add'>+		snd_hda_apply_pincfgs(codec, dell_9205_m43_pin_configs);</div><div class='add'>+</div><div class='add'>+		/* Enable unsol response for GPIO4/Dock HP connection */</div><div class='add'>+		snd_hda_codec_write_cache(codec, codec-&gt;core.afg, 0,</div><div class='add'>+			AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10);</div><div class='add'>+		jack = snd_hda_jack_detect_enable_callback(codec, codec-&gt;core.afg,</div><div class='add'>+							   stac_vref_event);</div><div class='add'>+		if (!IS_ERR(jack))</div><div class='add'>+			jack-&gt;private_data = 0x01;</div><div class='add'>+</div><div class='add'>+		spec-&gt;gpio_dir = 0x0b;</div><div class='add'>+		spec-&gt;eapd_mask = 0x01;</div><div class='add'>+		spec-&gt;gpio_mask = 0x1b;</div><div class='add'>+		spec-&gt;gpio_mute = 0x10;</div><div class='add'>+		/* GPIO0 High = EAPD, GPIO1 Low = Headphone Mute,</div><div class='add'>+		 * GPIO3 Low = DRM</div><div class='add'>+		 */</div><div class='add'>+		spec-&gt;gpio_data = 0x01;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac9205_fixup_eapd(struct hda_codec *codec,</div><div class='add'>+				const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		spec-&gt;eapd_switch = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac9205_fixups[] = {</div><div class='add'>+	[STAC_9205_REF] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac9205_fixup_ref,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9205_DELL_M42] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_9205_m42_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9205_DELL_M43] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac9205_fixup_dell_m43,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9205_DELL_M44] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = dell_9205_m44_pin_configs,</div><div class='add'>+	},</div><div class='add'>+	[STAC_9205_EAPD] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac9205_fixup_eapd,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac9205_models[] = {</div><div class='add'>+	{ .id = STAC_9205_REF, .name = "ref" },</div><div class='add'>+	{ .id = STAC_9205_DELL_M42, .name = "dell-m42" },</div><div class='add'>+	{ .id = STAC_9205_DELL_M43, .name = "dell-m43" },</div><div class='add'>+	{ .id = STAC_9205_DELL_M44, .name = "dell-m44" },</div><div class='add'>+	{ .id = STAC_9205_EAPD, .name = "eapd" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac9205_fixup_tbl[] = {</div><div class='add'>+	/* SigmaTel reference board */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='add'>+		      "DFI LanParty", STAC_9205_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30,</div><div class='add'>+		      "SigmaTel", STAC_9205_REF),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='add'>+		      "DFI LanParty", STAC_9205_REF),</div><div class='add'>+	/* Dell */</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,</div><div class='add'>+		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,</div><div class='add'>+		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fa,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fc,</div><div class='add'>+		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,</div><div class='add'>+		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fe,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ff,</div><div class='add'>+		      "Dell Precision M4300", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0204,</div><div class='add'>+		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0206,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,</div><div class='add'>+		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021f,</div><div class='add'>+		      "Dell Inspiron", STAC_9205_DELL_M44),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,</div><div class='add'>+		      "Dell Vostro 1500", STAC_9205_DELL_M42),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0229,</div><div class='add'>+		      "Dell Vostro 1700", STAC_9205_DELL_M42),</div><div class='add'>+	/* Gateway */</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),</div><div class='add'>+	SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void stac92hd95_fixup_hp_led(struct hda_codec *codec,</div><div class='add'>+				    const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (action != HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (find_mute_led_cfg(codec, spec-&gt;default_polarity))</div><div class='add'>+		codec_dbg(codec, "mute LED gpio %d polarity %d\n",</div><div class='add'>+				spec-&gt;gpio_led,</div><div class='add'>+				spec-&gt;gpio_led_polarity);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac92hd95_fixups[] = {</div><div class='add'>+	[STAC_92HD95_HP_LED] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = stac92hd95_fixup_hp_led,</div><div class='add'>+	},</div><div class='add'>+	[STAC_92HD95_HP_BASS] = {</div><div class='add'>+		.type = HDA_FIXUP_VERBS,</div><div class='add'>+		.v.verbs = (const struct hda_verb[]) {</div><div class='add'>+			{0x1a, 0x795, 0x00}, /* HPF to 100Hz */</div><div class='add'>+			{}</div><div class='add'>+		},</div><div class='add'>+		.chained = true,</div><div class='add'>+		.chain_id = STAC_92HD95_HP_LED,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac92hd95_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1911, "HP Spectre 13", STAC_92HD95_HP_BASS),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac92hd95_models[] = {</div><div class='add'>+	{ .id = STAC_92HD95_HP_LED, .name = "hp-led" },</div><div class='add'>+	{ .id = STAC_92HD95_HP_BASS, .name = "hp-bass" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int stac_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+	int flags = 0;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;headset_jack)</div><div class='add'>+		flags |= HDA_PINCFG_HEADSET_MIC;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL, flags);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* add hooks */</div><div class='add'>+	spec-&gt;gen.pcm_playback_hook = stac_playback_pcm_hook;</div><div class='add'>+	spec-&gt;gen.pcm_capture_hook = stac_capture_pcm_hook;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.automute_hook = stac_update_outputs;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;gpio_led)</div><div class='add'>+		snd_hda_gen_add_mute_led_cdev(codec, stac_vmaster_hook);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;vref_mute_led_nid) {</div><div class='add'>+		err = snd_hda_gen_fix_pin_power(codec, spec-&gt;vref_mute_led_nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup analog beep controls */</div><div class='add'>+	if (spec-&gt;anabeep_nid &gt; 0) {</div><div class='add'>+		err = stac_auto_create_beep_ctls(codec,</div><div class='add'>+						 spec-&gt;anabeep_nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup digital beep controls and input device */</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+	if (spec-&gt;gen.beep_nid) {</div><div class='add'>+		hda_nid_t nid = spec-&gt;gen.beep_nid;</div><div class='add'>+		unsigned int caps;</div><div class='add'>+</div><div class='add'>+		err = stac_auto_create_beep_ctls(codec, nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (codec-&gt;beep) {</div><div class='add'>+			/* IDT/STAC codecs have linear beep tone parameter */</div><div class='add'>+			codec-&gt;beep-&gt;linear_tone = spec-&gt;linear_tone_beep;</div><div class='add'>+			/* keep power up while beep is enabled */</div><div class='add'>+			codec-&gt;beep-&gt;keep_power_at_enable = 1;</div><div class='add'>+			/* if no beep switch is available, make its own one */</div><div class='add'>+			caps = query_amp_caps(codec, nid, HDA_OUTPUT);</div><div class='add'>+			if (!(caps &amp; AC_AMPCAP_MUTE)) {</div><div class='add'>+				err = stac_beep_switch_ctl(codec);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;aloopback_ctl &amp;&amp;</div><div class='add'>+	    snd_hda_get_bool_hint(codec, "loopback") == 1) {</div><div class='add'>+		unsigned int wr_verb =</div><div class='add'>+			spec-&gt;aloopback_ctl-&gt;private_value &gt;&gt; 16;</div><div class='add'>+		if (snd_hdac_regmap_add_vendor_verb(&amp;codec-&gt;core, wr_verb))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, spec-&gt;aloopback_ctl))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;have_spdif_mux) {</div><div class='add'>+		err = stac_create_spdif_mux_ctls(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stac_init_power_map(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int stac_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* override some hints */</div><div class='add'>+	stac_store_hints(codec);</div><div class='add'>+</div><div class='add'>+	/* set up GPIO */</div><div class='add'>+	/* turn on EAPD statically when spec-&gt;eapd_switch isn't set.</div><div class='add'>+	 * otherwise, unsol event will turn it on/off dynamically</div><div class='add'>+	 */</div><div class='add'>+	if (!spec-&gt;eapd_switch)</div><div class='add'>+		spec-&gt;gpio_data |= spec-&gt;eapd_mask;</div><div class='add'>+	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+</div><div class='add'>+	/* sync the power-map */</div><div class='add'>+	if (spec-&gt;num_pwrs)</div><div class='add'>+		snd_hda_codec_write(codec, codec-&gt;core.afg, 0,</div><div class='add'>+				    AC_VERB_IDT_SET_POWER_MAP,</div><div class='add'>+				    spec-&gt;power_map_bits);</div><div class='add'>+</div><div class='add'>+	/* power down inactive ADCs */</div><div class='add'>+	if (spec-&gt;powerdown_adcs) {</div><div class='add'>+		for (i = 0; i &lt; spec-&gt;gen.num_all_adcs; i++) {</div><div class='add'>+			if (spec-&gt;active_adcs &amp; (1 &lt;&lt; i))</div><div class='add'>+				continue;</div><div class='add'>+			snd_hda_codec_write(codec, spec-&gt;gen.all_adcs[i], 0,</div><div class='add'>+					    AC_VERB_SET_POWER_STATE,</div><div class='add'>+					    AC_PWRST_D3);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+static void stac92hd_proc_hook(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;core.afg)</div><div class='add'>+		snd_iprintf(buffer, "Power-Map: 0x%02x\n", </div><div class='add'>+			    snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					       AC_VERB_IDT_GET_POWER_MAP, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void analog_loop_proc_hook(struct snd_info_buffer *buffer,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  unsigned int verb)</div><div class='add'>+{</div><div class='add'>+	snd_iprintf(buffer, "Analog Loopback: 0x%02x\n",</div><div class='add'>+		    snd_hda_codec_read(codec, codec-&gt;core.afg, 0, verb, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* stac92hd71bxx, stac92hd73xx */</div><div class='add'>+static void stac92hd7x_proc_hook(struct snd_info_buffer *buffer,</div><div class='add'>+				 struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	stac92hd_proc_hook(buffer, codec, nid);</div><div class='add'>+	if (nid == codec-&gt;core.afg)</div><div class='add'>+		analog_loop_proc_hook(buffer, codec, 0xfa0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac9205_proc_hook(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;core.afg)</div><div class='add'>+		analog_loop_proc_hook(buffer, codec, 0xfe0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac927x_proc_hook(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;core.afg)</div><div class='add'>+		analog_loop_proc_hook(buffer, codec, 0xfeb);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define stac92hd_proc_hook	NULL</div><div class='add'>+#define stac92hd7x_proc_hook	NULL</div><div class='add'>+#define stac9205_proc_hook	NULL</div><div class='add'>+#define stac927x_proc_hook	NULL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int stac_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_hda_shutup_pins(codec);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;eapd_mask)</div><div class='add'>+		stac_gpio_set(codec, spec-&gt;gpio_mask,</div><div class='add'>+				spec-&gt;gpio_dir, spec-&gt;gpio_data &amp;</div><div class='add'>+				~spec-&gt;eapd_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_stac_spec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	codec-&gt;no_trigger_sense = 1; /* seems common with STAC/IDT codecs */</div><div class='add'>+	spec-&gt;gen.dac_min_mute = true;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac9200(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	codec-&gt;power_filter = snd_hda_codec_eapd_power_filter;</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac9200_eapd_init);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac9200_models, stac9200_fixup_tbl,</div><div class='add'>+			   stac9200_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac925x(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac925x_core_init);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac925x_models, stac925x_fixup_tbl,</div><div class='add'>+			   stac925x_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac92hd73xx(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+	int num_dacs;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	/* enable power_save_node only for new 92HD89xx chips, as it causes</div><div class='add'>+	 * click noises on old 92HD73xx chips.</div><div class='add'>+	 */</div><div class='add'>+	if ((codec-&gt;core.vendor_id &amp; 0xfffffff0) != 0x111d7670)</div><div class='add'>+		codec-&gt;power_save_node = 1;</div><div class='add'>+	spec-&gt;linear_tone_beep = 0;</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x1d;</div><div class='add'>+	spec-&gt;have_spdif_mux = 1;</div><div class='add'>+</div><div class='add'>+	num_dacs = snd_hda_get_num_conns(codec, 0x0a) - 1;</div><div class='add'>+	if (num_dacs &lt; 3 || num_dacs &gt; 5) {</div><div class='add'>+		codec_warn(codec,</div><div class='add'>+			   "Could not determine number of channels defaulting to DAC count\n");</div><div class='add'>+		num_dacs = 5;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (num_dacs) {</div><div class='add'>+	case 0x3: /* 6 Channel */</div><div class='add'>+		spec-&gt;aloopback_ctl = &amp;stac92hd73xx_6ch_loopback;</div><div class='add'>+		break;</div><div class='add'>+	case 0x4: /* 8 Channel */</div><div class='add'>+		spec-&gt;aloopback_ctl = &amp;stac92hd73xx_8ch_loopback;</div><div class='add'>+		break;</div><div class='add'>+	case 0x5: /* 10 Channel */</div><div class='add'>+		spec-&gt;aloopback_ctl = &amp;stac92hd73xx_10ch_loopback;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;aloopback_mask = 0x01;</div><div class='add'>+	spec-&gt;aloopback_shift = 8;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x1c; /* digital beep */</div><div class='add'>+</div><div class='add'>+	/* GPIO0 High = Enable EAPD */</div><div class='add'>+	spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x1;</div><div class='add'>+	spec-&gt;gpio_data = 0x01;</div><div class='add'>+</div><div class='add'>+	spec-&gt;eapd_switch = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);</div><div class='add'>+	spec-&gt;pwr_nids = stac92hd73xx_pwr_nids;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac92hd73xx_models, stac92hd73xx_fixup_tbl,</div><div class='add'>+			   stac92hd73xx_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;volknob_init)</div><div class='add'>+		snd_hda_add_verbs(codec, stac92hd73xx_core_init);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Don't GPIO-mute speakers if there are no internal speakers, because</div><div class='add'>+	 * the GPIO might be necessary for Headphone</div><div class='add'>+	 */</div><div class='add'>+	if (spec-&gt;eapd_switch &amp;&amp; !has_builtin_speaker(codec))</div><div class='add'>+		spec-&gt;eapd_switch = 0;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac92hd7x_proc_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stac_setup_gpio(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gpio_mask |= spec-&gt;eapd_mask;</div><div class='add'>+	if (spec-&gt;gpio_led) {</div><div class='add'>+		if (!spec-&gt;vref_mute_led_nid) {</div><div class='add'>+			spec-&gt;gpio_mask |= spec-&gt;gpio_led;</div><div class='add'>+			spec-&gt;gpio_dir |= spec-&gt;gpio_led;</div><div class='add'>+			spec-&gt;gpio_data |= spec-&gt;gpio_led;</div><div class='add'>+		} else {</div><div class='add'>+			codec-&gt;power_filter = stac_vref_led_power_filter;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;mic_mute_led_gpio) {</div><div class='add'>+		spec-&gt;gpio_mask |= spec-&gt;mic_mute_led_gpio;</div><div class='add'>+		spec-&gt;gpio_dir |= spec-&gt;mic_mute_led_gpio;</div><div class='add'>+		spec-&gt;mic_enabled = 0;</div><div class='add'>+		spec-&gt;gpio_data |= spec-&gt;mic_mute_led_gpio;</div><div class='add'>+		snd_hda_gen_add_micmute_led_cdev(codec, stac_capture_led_update);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac92hd83xxx(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* longer delay needed for D3 */</div><div class='add'>+	codec-&gt;core.power_caps &amp;= ~AC_PWRST_EPSS;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	spec-&gt;linear_tone_beep = 0;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 1;</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x1b;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x21; /* digital beep */</div><div class='add'>+	spec-&gt;pwr_nids = stac92hd83xxx_pwr_nids;</div><div class='add'>+	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);</div><div class='add'>+	spec-&gt;default_polarity = -1; /* no default cfg */</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac92hd83xxx_core_init);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac92hd83xxx_models, stac92hd83xxx_fixup_tbl,</div><div class='add'>+			   stac92hd83xxx_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	stac_setup_gpio(codec);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac92hd_proc_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const hda_nid_t stac92hd95_pwr_nids[] = {</div><div class='add'>+	0x0a, 0x0b, 0x0c, 0x0d</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_stac92hd95(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* longer delay needed for D3 */</div><div class='add'>+	codec-&gt;core.power_caps &amp;= ~AC_PWRST_EPSS;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	spec-&gt;linear_tone_beep = 0;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x19; /* digital beep */</div><div class='add'>+	spec-&gt;pwr_nids = stac92hd95_pwr_nids;</div><div class='add'>+	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);</div><div class='add'>+	spec-&gt;default_polarity = 0;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac92hd95_models, stac92hd95_fixup_tbl,</div><div class='add'>+			   stac92hd95_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	stac_setup_gpio(codec);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac92hd_proc_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac92hd71bxx(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	const hda_nid_t *unmute_nids = stac92hd71bxx_unmute_nids;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	/* disabled power_save_node since it causes noises on a Dell machine */</div><div class='add'>+	/* codec-&gt;power_save_node = 1; */</div><div class='add'>+	spec-&gt;linear_tone_beep = 0;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 1;</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x17;</div><div class='add'>+	spec-&gt;have_spdif_mux = 1;</div><div class='add'>+</div><div class='add'>+	/* GPIO0 = EAPD */</div><div class='add'>+	spec-&gt;gpio_mask = 0x01;</div><div class='add'>+	spec-&gt;gpio_dir = 0x01;</div><div class='add'>+	spec-&gt;gpio_data = 0x01;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;core.vendor_id) {</div><div class='add'>+	case 0x111d76b6: /* 4 Port without Analog Mixer */</div><div class='add'>+	case 0x111d76b7:</div><div class='add'>+		unmute_nids++;</div><div class='add'>+		break;</div><div class='add'>+	case 0x111d7608: /* 5 Port with Analog Mixer */</div><div class='add'>+		if ((codec-&gt;core.revision_id &amp; 0xf) == 0 ||</div><div class='add'>+		    (codec-&gt;core.revision_id &amp; 0xf) == 1)</div><div class='add'>+			spec-&gt;stream_delay = 40; /* 40 milliseconds */</div><div class='add'>+</div><div class='add'>+		/* disable VSW */</div><div class='add'>+		unmute_nids++;</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0);</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3);</div><div class='add'>+		break;</div><div class='add'>+	case 0x111d7603: /* 6 Port with Analog Mixer */</div><div class='add'>+		if ((codec-&gt;core.revision_id &amp; 0xf) == 1)</div><div class='add'>+			spec-&gt;stream_delay = 40; /* 40 milliseconds */</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (get_wcaps_type(get_wcaps(codec, 0x28)) == AC_WID_VOL_KNB)</div><div class='add'>+		snd_hda_add_verbs(codec, stac92hd71bxx_core_init);</div><div class='add'>+</div><div class='add'>+	if (get_wcaps(codec, 0xa) &amp; AC_WCAP_IN_AMP) {</div><div class='add'>+		const hda_nid_t *p;</div><div class='add'>+		for (p = unmute_nids; *p; p++)</div><div class='add'>+			snd_hda_codec_amp_init_stereo(codec, *p, HDA_INPUT, 0,</div><div class='add'>+						      0xff, 0x00);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spec-&gt;aloopback_ctl = &amp;stac92hd71bxx_loopback;</div><div class='add'>+	spec-&gt;aloopback_mask = 0x50;</div><div class='add'>+	spec-&gt;aloopback_shift = 0;</div><div class='add'>+</div><div class='add'>+	spec-&gt;powerdown_adcs = 1;</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x26; /* digital beep */</div><div class='add'>+	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);</div><div class='add'>+	spec-&gt;pwr_nids = stac92hd71bxx_pwr_nids;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac92hd71bxx_models, stac92hd71bxx_fixup_tbl,</div><div class='add'>+			   stac92hd71bxx_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	stac_setup_gpio(codec);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac92hd7x_proc_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac922x(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac922x_core_init);</div><div class='add'>+</div><div class='add'>+	/* Fix Mux capture level; max to 2 */</div><div class='add'>+	snd_hda_override_amp_caps(codec, 0x12, HDA_OUTPUT,</div><div class='add'>+				  (0 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (2 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (0x27 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac922x_models, stac922x_fixup_tbl,</div><div class='add'>+			   stac922x_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const stac927x_spdif_labels[] = {</div><div class='add'>+	"Digital Playback", "ADAT", "Analog Mux 1",</div><div class='add'>+	"Analog Mux 2", "Analog Mux 3", NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_stac927x(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;have_spdif_mux = 1;</div><div class='add'>+	spec-&gt;spdif_labels = stac927x_spdif_labels;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x23; /* digital beep */</div><div class='add'>+</div><div class='add'>+	/* GPIO0 High = Enable EAPD */</div><div class='add'>+	spec-&gt;eapd_mask = spec-&gt;gpio_mask = 0x01;</div><div class='add'>+	spec-&gt;gpio_dir = spec-&gt;gpio_data = 0x01;</div><div class='add'>+</div><div class='add'>+	spec-&gt;aloopback_ctl = &amp;stac927x_loopback;</div><div class='add'>+	spec-&gt;aloopback_mask = 0x40;</div><div class='add'>+	spec-&gt;aloopback_shift = 0;</div><div class='add'>+	spec-&gt;eapd_switch = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac927x_models, stac927x_fixup_tbl,</div><div class='add'>+			   stac927x_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;volknob_init)</div><div class='add'>+		snd_hda_add_verbs(codec, stac927x_core_init);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac927x_proc_hook;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * !!FIXME!!</div><div class='add'>+	 * The STAC927x seem to require fairly long delays for certain</div><div class='add'>+	 * command sequences.  With too short delays (even if the answer</div><div class='add'>+	 * is set to RIRB properly), it results in the silence output</div><div class='add'>+	 * on some hardwares like Dell.</div><div class='add'>+	 *</div><div class='add'>+	 * The below flag enables the longer delay (see get_response</div><div class='add'>+	 * in hda_intel.c).</div><div class='add'>+	 */</div><div class='add'>+	codec-&gt;bus-&gt;core.needs_damn_long_delay = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_stac9205(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+	spec-&gt;have_spdif_mux = 1;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = 0x23; /* digital beep */</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac9205_core_init);</div><div class='add'>+	spec-&gt;aloopback_ctl = &amp;stac9205_loopback;</div><div class='add'>+</div><div class='add'>+	spec-&gt;aloopback_mask = 0x40;</div><div class='add'>+	spec-&gt;aloopback_shift = 0;</div><div class='add'>+	</div><div class='add'>+	/* GPIO0 High = EAPD */</div><div class='add'>+	spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x1;</div><div class='add'>+	spec-&gt;gpio_data = 0x01;</div><div class='add'>+</div><div class='add'>+	/* Turn on/off EAPD per HP plugging */</div><div class='add'>+	spec-&gt;eapd_switch = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac9205_models, stac9205_fixup_tbl,</div><div class='add'>+			   stac9205_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;proc_widget_hook = stac9205_proc_hook;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * STAC9872 hack</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb stac9872_core_init[] = {</div><div class='add'>+	{0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */</div><div class='add'>+	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -&gt; 0x9 */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_pintbl stac9872_vaio_pin_configs[] = {</div><div class='add'>+	{ 0x0a, 0x03211020 },</div><div class='add'>+	{ 0x0b, 0x411111f0 },</div><div class='add'>+	{ 0x0c, 0x411111f0 },</div><div class='add'>+	{ 0x0d, 0x03a15030 },</div><div class='add'>+	{ 0x0e, 0x411111f0 },</div><div class='add'>+	{ 0x0f, 0x90170110 },</div><div class='add'>+	{ 0x11, 0x411111f0 },</div><div class='add'>+	{ 0x13, 0x411111f0 },</div><div class='add'>+	{ 0x14, 0x90a7013e },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_model_fixup stac9872_models[] = {</div><div class='add'>+	{ .id = STAC_9872_VAIO, .name = "vaio" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup stac9872_fixups[] = {</div><div class='add'>+	[STAC_9872_VAIO] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = stac9872_vaio_pin_configs,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk stac9872_fixup_tbl[] = {</div><div class='add'>+	SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,</div><div class='add'>+			   "Sony VAIO F/S", STAC_9872_VAIO),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_stac9872(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct sigmatel_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec = codec-&gt;spec;</div><div class='add'>+	spec-&gt;linear_tone_beep = 1;</div><div class='add'>+	spec-&gt;gen.own_eapd_ctl = 1;</div><div class='add'>+</div><div class='add'>+	snd_hda_add_verbs(codec, stac9872_core_init);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, stac9872_models, stac9872_fixup_tbl,</div><div class='add'>+			   stac9872_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	err = stac_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * common driver probe</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	MODEL_STAC9200,</div><div class='add'>+	MODEL_STAC9205,</div><div class='add'>+	MODEL_STAC922X,</div><div class='add'>+	MODEL_STAC925X,</div><div class='add'>+	MODEL_STAC927X,</div><div class='add'>+	MODEL_STAC9872,</div><div class='add'>+	MODEL_STAC92HD71BXX,</div><div class='add'>+	MODEL_STAC92HD73XX,</div><div class='add'>+	MODEL_STAC92HD83XXX,</div><div class='add'>+	MODEL_STAC92HD95,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int stac_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = alloc_stac_spec(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;driver_data) {</div><div class='add'>+	case MODEL_STAC9200:</div><div class='add'>+		err = probe_stac9200(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC9205:</div><div class='add'>+		err = probe_stac9205(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC922X:</div><div class='add'>+		err = probe_stac922x(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC925X:</div><div class='add'>+		err = probe_stac925x(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC927X:</div><div class='add'>+		err = probe_stac927x(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC9872:</div><div class='add'>+		err = probe_stac9872(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC92HD71BXX:</div><div class='add'>+		err = probe_stac92hd71bxx(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC92HD73XX:</div><div class='add'>+		err = probe_stac92hd73xx(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC92HD83XXX:</div><div class='add'>+		err = probe_stac92hd83xxx(codec);</div><div class='add'>+		break;</div><div class='add'>+	case MODEL_STAC92HD95:</div><div class='add'>+		err = probe_stac92hd95(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		snd_hda_gen_remove(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops stac_codec_ops = {</div><div class='add'>+	.probe = stac_probe,</div><div class='add'>+	.remove = snd_hda_gen_remove,</div><div class='add'>+	.build_controls = snd_hda_gen_build_controls,</div><div class='add'>+	.build_pcms = snd_hda_gen_build_pcms,</div><div class='add'>+	.init = stac_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = stac_suspend,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_sigmatel[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847690, "STAC9200", MODEL_STAC9200),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847882, "STAC9220 A1", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847680, "STAC9221 A1", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847880, "STAC9220 A2", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847681, "STAC9220D/9223D A2", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847682, "STAC9221 A2", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847683, "STAC9221D A2", MODEL_STAC922X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847618, "STAC9227", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847619, "STAC9227", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847638, "STAC92HD700", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847616, "STAC9228", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847617, "STAC9228", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847614, "STAC9229", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847615, "STAC9229", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847620, "STAC9274", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847621, "STAC9274D", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847622, "STAC9273X", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847623, "STAC9273D", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847624, "STAC9272X", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847625, "STAC9272D", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847626, "STAC9271X", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847627, "STAC9271D", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847628, "STAC9274X5NH", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847629, "STAC9274D5NH", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847632, "STAC9202",  MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847633, "STAC9202D", MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847634, "STAC9250", MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847635, "STAC9250D", MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847636, "STAC9251", MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847637, "STAC9250D", MODEL_STAC925X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847645, "92HD206X", MODEL_STAC927X),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847646, "92HD206D", MODEL_STAC927X),</div><div class='add'>+	/* The following does not take into account .id=0x83847661 when subsys =</div><div class='add'>+	 * 104D0C00 which is STAC9225s. Because of this, some SZ Notebooks are</div><div class='add'>+	 * currently not fully supported.</div><div class='add'>+	 */</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847661, "CXD9872RD/K", MODEL_STAC9872),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847662, "STAC9872AK", MODEL_STAC9872),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847664, "CXD9872AKD", MODEL_STAC9872),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x83847698, "STAC9205", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a0, "STAC9205", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a1, "STAC9205D", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a2, "STAC9204", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a3, "STAC9204D", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a4, "STAC9255", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a5, "STAC9255D", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a6, "STAC9254", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x838476a7, "STAC9254D", MODEL_STAC9205),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7603, "92HD75B3X5", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7604, "92HD83C1X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76d4, "92HD83C1C5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7605, "92HD81B1X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76d5, "92HD81B1C5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76d1, "92HD87B1/3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76d9, "92HD87B2/4", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7666, "92HD88B3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7667, "92HD88B1", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7668, "92HD88B2", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7669, "92HD88B4", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7608, "92HD75B2X5", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7674, "92HD73D1X5", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7675, "92HD73C1X5", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7676, "92HD73E1X5", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d7695, "92HD95", MODEL_STAC92HD95),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b0, "92HD71B8X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b1, "92HD71B8X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b2, "92HD71B7X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b3, "92HD71B7X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b4, "92HD71B6X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b5, "92HD71B6X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b6, "92HD71B5X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76b7, "92HD71B5X", MODEL_STAC92HD71BXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c0, "92HD89C3", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c1, "92HD89C2", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c2, "92HD89C1", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c3, "92HD89B3", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c4, "92HD89B2", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c5, "92HD89B1", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c6, "92HD89E3", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c7, "92HD89E2", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c8, "92HD89E1", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76c9, "92HD89D3", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ca, "92HD89D2", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76cb, "92HD89D1", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76cc, "92HD89F3", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76cd, "92HD89F2", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ce, "92HD89F1", MODEL_STAC92HD73XX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76df, "92HD93BXX", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e0, "92HD91BXX", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e3, "92HD98BXX", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e5, "92HD99BXX", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e7, "92HD90BXX", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e8, "92HD66B1X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76e9, "92HD66B2X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ea, "92HD66B3X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76eb, "92HD66C1X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ec, "92HD66C2X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ed, "92HD66C3X5", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ee, "92HD66B1X3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76ef, "92HD66B2X3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76f0, "92HD66B3X3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76f1, "92HD66C1X3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76f2, "92HD66C2X3", MODEL_STAC92HD83XXX),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x111d76f3, "92HD66C3/65", MODEL_STAC92HD83XXX),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_sigmatel);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("IDT/Sigmatel HD-audio codec");</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver sigmatel_driver = {</div><div class='add'>+	.id = snd_hda_id_sigmatel,</div><div class='add'>+	.ops = &amp;stac_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(sigmatel_driver);</div><div class='head'>diff --git a/sound/hda/codecs/via.c b/sound/hda/codecs/via.c<br/>new file mode 100644<br/>index 000000000000..6becea9bb810<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/codecs/via.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/codecs/via.c</a></div><div class='hunk'>@@ -0,0 +1,1174 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal Interface for Intel High Definition Audio Codec</div><div class='add'>+ *</div><div class='add'>+ * HD audio codec driver for VIA VT17xx/VT18xx/VT20xx codec</div><div class='add'>+ *</div><div class='add'>+ *  (C) 2006-2009 VIA Technology, Inc.</div><div class='add'>+ *  (C) 2006-2008 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* * * * * * * * * * * * * * Release History * * * * * * * * * * * * * * * * */</div><div class='add'>+/*									     */</div><div class='add'>+/* 2006-03-03  Lydia Wang  Create the basic patch to support VT1708 codec    */</div><div class='add'>+/* 2006-03-14  Lydia Wang  Modify hard code for some pin widget nid	     */</div><div class='add'>+/* 2006-08-02  Lydia Wang  Add support to VT1709 codec			     */</div><div class='add'>+/* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */</div><div class='add'>+/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization	     */</div><div class='add'>+/* 2007-09-17  Lydia Wang  Add VT1708B codec support			    */</div><div class='add'>+/* 2007-11-14  Lydia Wang  Add VT1708A codec HP and CD pin connect config    */</div><div class='add'>+/* 2008-02-03  Lydia Wang  Fix Rear channels and Back channels inverse issue */</div><div class='add'>+/* 2008-03-06  Lydia Wang  Add VT1702 codec and VT1708S codec support	     */</div><div class='add'>+/* 2008-04-09  Lydia Wang  Add mute front speaker when HP plugin	     */</div><div class='add'>+/* 2008-04-09  Lydia Wang  Add Independent HP feature			     */</div><div class='add'>+/* 2008-05-28  Lydia Wang  Add second S/PDIF Out support for VT1702	     */</div><div class='add'>+/* 2008-09-15  Logan Li	   Add VT1708S Mic Boost workaround/backdoor	     */</div><div class='add'>+/* 2009-02-16  Logan Li	   Add support for VT1718S			     */</div><div class='add'>+/* 2009-03-13  Logan Li	   Add support for VT1716S			     */</div><div class='add'>+/* 2009-04-14  Lydai Wang  Add support for VT1828S and VT2020		     */</div><div class='add'>+/* 2009-07-08  Lydia Wang  Add support for VT2002P			     */</div><div class='add'>+/* 2009-07-21  Lydia Wang  Add support for VT1812			     */</div><div class='add'>+/* 2009-09-19  Lydia Wang  Add support for VT1818S			     */</div><div class='add'>+/*									     */</div><div class='add'>+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/asoundef.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include "generic.h"</div><div class='add'>+</div><div class='add'>+/* Pin Widget NID */</div><div class='add'>+#define VT1708_HP_PIN_NID	0x20</div><div class='add'>+#define VT1708_CD_PIN_NID	0x24</div><div class='add'>+</div><div class='add'>+enum VIA_HDA_CODEC {</div><div class='add'>+	UNKNOWN = -1,</div><div class='add'>+	VT1708,</div><div class='add'>+	VT1709,</div><div class='add'>+	VT1709_10CH,</div><div class='add'>+	VT1709_6CH,</div><div class='add'>+	VT1708B,</div><div class='add'>+	VT1708B_8CH,</div><div class='add'>+	VT1708B_4CH,</div><div class='add'>+	VT1708S,</div><div class='add'>+	VT1708BCE,</div><div class='add'>+	VT1702,</div><div class='add'>+	VT1718S,</div><div class='add'>+	VT1716S,</div><div class='add'>+	VT2002P,</div><div class='add'>+	VT1812,</div><div class='add'>+	VT1802,</div><div class='add'>+	VT1705CF,</div><div class='add'>+	VT1808,</div><div class='add'>+	VT3476,</div><div class='add'>+	CODEC_TYPES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VT2002P_COMPATIBLE(spec) \</div><div class='add'>+	((spec)-&gt;codec_type == VT2002P ||\</div><div class='add'>+	 (spec)-&gt;codec_type == VT1812 ||\</div><div class='add'>+	 (spec)-&gt;codec_type == VT1802)</div><div class='add'>+</div><div class='add'>+struct via_spec {</div><div class='add'>+	struct hda_gen_spec gen;</div><div class='add'>+</div><div class='add'>+	/* HP mode source */</div><div class='add'>+	unsigned int dmic_enabled;</div><div class='add'>+	enum VIA_HDA_CODEC codec_type;</div><div class='add'>+</div><div class='add'>+	/* analog low-power control */</div><div class='add'>+	bool alc_mode;</div><div class='add'>+</div><div class='add'>+	/* work to check hp jack state */</div><div class='add'>+	int hp_work_active;</div><div class='add'>+	int vt1708_jack_detect;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec);</div><div class='add'>+static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  int action);</div><div class='add'>+</div><div class='add'>+static struct via_spec *via_new_spec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (spec == NULL)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	codec-&gt;spec = spec;</div><div class='add'>+	snd_hda_gen_spec_init(&amp;spec-&gt;gen);</div><div class='add'>+	spec-&gt;codec_type = get_codec_type(codec);</div><div class='add'>+	/* VT1708BCE &amp; VT1708S are almost same */</div><div class='add'>+	if (spec-&gt;codec_type == VT1708BCE)</div><div class='add'>+		spec-&gt;codec_type = VT1708S;</div><div class='add'>+	spec-&gt;gen.indep_hp = 1;</div><div class='add'>+	spec-&gt;gen.keep_eapd_on = 1;</div><div class='add'>+	spec-&gt;gen.dac_min_mute = 1;</div><div class='add'>+	spec-&gt;gen.pcm_playback_hook = via_playback_pcm_hook;</div><div class='add'>+	spec-&gt;gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO;</div><div class='add'>+	codec-&gt;power_save_node = 1;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 1;</div><div class='add'>+	return spec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	u32 vendor_id = codec-&gt;core.vendor_id;</div><div class='add'>+	u16 ven_id = vendor_id &gt;&gt; 16;</div><div class='add'>+	u16 dev_id = vendor_id &amp; 0xffff;</div><div class='add'>+	enum VIA_HDA_CODEC codec_type;</div><div class='add'>+</div><div class='add'>+	/* get codec type */</div><div class='add'>+	if (ven_id != 0x1106)</div><div class='add'>+		codec_type = UNKNOWN;</div><div class='add'>+	else if (dev_id &gt;= 0x1708 &amp;&amp; dev_id &lt;= 0x170b)</div><div class='add'>+		codec_type = VT1708;</div><div class='add'>+	else if (dev_id &gt;= 0xe710 &amp;&amp; dev_id &lt;= 0xe713)</div><div class='add'>+		codec_type = VT1709_10CH;</div><div class='add'>+	else if (dev_id &gt;= 0xe714 &amp;&amp; dev_id &lt;= 0xe717)</div><div class='add'>+		codec_type = VT1709_6CH;</div><div class='add'>+	else if (dev_id &gt;= 0xe720 &amp;&amp; dev_id &lt;= 0xe723) {</div><div class='add'>+		codec_type = VT1708B_8CH;</div><div class='add'>+		if (snd_hda_param_read(codec, 0x16, AC_PAR_CONNLIST_LEN) == 0x7)</div><div class='add'>+			codec_type = VT1708BCE;</div><div class='add'>+	} else if (dev_id &gt;= 0xe724 &amp;&amp; dev_id &lt;= 0xe727)</div><div class='add'>+		codec_type = VT1708B_4CH;</div><div class='add'>+	else if ((dev_id &amp; 0xfff) == 0x397</div><div class='add'>+		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='add'>+		codec_type = VT1708S;</div><div class='add'>+	else if ((dev_id &amp; 0xfff) == 0x398</div><div class='add'>+		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='add'>+		codec_type = VT1702;</div><div class='add'>+	else if ((dev_id &amp; 0xfff) == 0x428</div><div class='add'>+		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='add'>+		codec_type = VT1718S;</div><div class='add'>+	else if (dev_id == 0x0433 || dev_id == 0xa721)</div><div class='add'>+		codec_type = VT1716S;</div><div class='add'>+	else if (dev_id == 0x0441 || dev_id == 0x4441)</div><div class='add'>+		codec_type = VT1718S;</div><div class='add'>+	else if (dev_id == 0x0438 || dev_id == 0x4438)</div><div class='add'>+		codec_type = VT2002P;</div><div class='add'>+	else if (dev_id == 0x0448)</div><div class='add'>+		codec_type = VT1812;</div><div class='add'>+	else if (dev_id == 0x0440)</div><div class='add'>+		codec_type = VT1708S;</div><div class='add'>+	else if ((dev_id &amp; 0xfff) == 0x446)</div><div class='add'>+		codec_type = VT1802;</div><div class='add'>+	else if (dev_id == 0x4760)</div><div class='add'>+		codec_type = VT1705CF;</div><div class='add'>+	else if (dev_id == 0x4761 || dev_id == 0x4762)</div><div class='add'>+		codec_type = VT1808;</div><div class='add'>+	else</div><div class='add'>+		codec_type = UNKNOWN;</div><div class='add'>+	return codec_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void analog_low_current_mode(struct hda_codec *codec);</div><div class='add'>+static bool is_aa_path_mute(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+#define hp_detect_with_aa(codec) \</div><div class='add'>+	(snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1 &amp;&amp; \</div><div class='add'>+	 !is_aa_path_mute(codec))</div><div class='add'>+</div><div class='add'>+static void vt1708_stop_hp_work(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;codec_type != VT1708 || !spec-&gt;gen.autocfg.hp_outs)</div><div class='add'>+		return;</div><div class='add'>+	if (spec-&gt;hp_work_active) {</div><div class='add'>+		snd_hda_codec_write(codec, 0x1, 0, 0xf81, 1);</div><div class='add'>+		codec-&gt;jackpoll_interval = 0;</div><div class='add'>+		cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+		spec-&gt;hp_work_active = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vt1708_update_hp_work(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	if (spec-&gt;codec_type != VT1708 || !spec-&gt;gen.autocfg.hp_outs)</div><div class='add'>+		return;</div><div class='add'>+	if (spec-&gt;vt1708_jack_detect) {</div><div class='add'>+		if (!spec-&gt;hp_work_active) {</div><div class='add'>+			codec-&gt;jackpoll_interval = msecs_to_jiffies(100);</div><div class='add'>+			snd_hda_codec_write(codec, 0x1, 0, 0xf81, 0);</div><div class='add'>+			schedule_delayed_work(&amp;codec-&gt;jackpoll_work, 0);</div><div class='add'>+			spec-&gt;hp_work_active = true;</div><div class='add'>+		}</div><div class='add'>+	} else if (!hp_detect_with_aa(codec))</div><div class='add'>+		vt1708_stop_hp_work(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_pin_power_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_enum_bool_helper_info(kcontrol, uinfo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_pin_power_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;gen.power_down_unused;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool val = !!ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+</div><div class='add'>+	if (val == spec-&gt;gen.power_down_unused)</div><div class='add'>+		return 0;</div><div class='add'>+	/* codec-&gt;power_save_node = val; */ /* widget PM seems yet broken */</div><div class='add'>+	spec-&gt;gen.power_down_unused = val;</div><div class='add'>+	analog_low_current_mode(codec);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new via_pin_power_ctl_enum = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Dynamic Power-Control",</div><div class='add'>+	.info = via_pin_power_ctl_info,</div><div class='add'>+	.get = via_pin_power_ctl_get,</div><div class='add'>+	.put = via_pin_power_ctl_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+/* additional beep mixers; the actual parameters are overwritten at build */</div><div class='add'>+static const struct snd_kcontrol_new via_beep_mixer[] = {</div><div class='add'>+	HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+	HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int set_beep_amp(struct via_spec *spec, hda_nid_t nid,</div><div class='add'>+			int idx, int dir)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new *knew;</div><div class='add'>+	unsigned int beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.beep_nid = nid;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(via_beep_mixer); i++) {</div><div class='add'>+		knew = snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL,</div><div class='add'>+					    &amp;via_beep_mixer[i]);</div><div class='add'>+		if (!knew)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		knew-&gt;private_value = beep_amp;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int auto_parse_beep(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec)</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP)</div><div class='add'>+			return set_beep_amp(spec, nid, 0, HDA_OUTPUT);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define auto_parse_beep(codec)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* check AA path's mute status */</div><div class='add'>+static bool is_aa_path_mute(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	const struct hda_amp_list *p;</div><div class='add'>+	int ch, v;</div><div class='add'>+</div><div class='add'>+	p = spec-&gt;gen.loopback.amplist;</div><div class='add'>+	if (!p)</div><div class='add'>+		return true;</div><div class='add'>+	for (; p-&gt;nid; p++) {</div><div class='add'>+		for (ch = 0; ch &lt; 2; ch++) {</div><div class='add'>+			v = snd_hda_codec_amp_read(codec, p-&gt;nid, ch, p-&gt;dir,</div><div class='add'>+						   p-&gt;idx);</div><div class='add'>+			if (!(v &amp; HDA_AMP_MUTE) &amp;&amp; v &gt; 0)</div><div class='add'>+				return false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* enter/exit analog low-current mode */</div><div class='add'>+static void __analog_low_current_mode(struct hda_codec *codec, bool force)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	bool enable;</div><div class='add'>+	unsigned int verb, parm;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;power_save_node)</div><div class='add'>+		enable = false;</div><div class='add'>+	else</div><div class='add'>+		enable = is_aa_path_mute(codec) &amp;&amp; !spec-&gt;gen.active_streams;</div><div class='add'>+	if (enable == spec-&gt;alc_mode &amp;&amp; !force)</div><div class='add'>+		return;</div><div class='add'>+	spec-&gt;alc_mode = enable;</div><div class='add'>+</div><div class='add'>+	/* decide low current mode's verb &amp; parameter */</div><div class='add'>+	switch (spec-&gt;codec_type) {</div><div class='add'>+	case VT1708B_8CH:</div><div class='add'>+	case VT1708B_4CH:</div><div class='add'>+		verb = 0xf70;</div><div class='add'>+		parm = enable ? 0x02 : 0x00; /* 0x02: 2/3x, 0x00: 1x */</div><div class='add'>+		break;</div><div class='add'>+	case VT1708S:</div><div class='add'>+	case VT1718S:</div><div class='add'>+	case VT1716S:</div><div class='add'>+		verb = 0xf73;</div><div class='add'>+		parm = enable ? 0x51 : 0xe1; /* 0x51: 4/28x, 0xe1: 1x */</div><div class='add'>+		break;</div><div class='add'>+	case VT1702:</div><div class='add'>+		verb = 0xf73;</div><div class='add'>+		parm = enable ? 0x01 : 0x1d; /* 0x01: 4/40x, 0x1d: 1x */</div><div class='add'>+		break;</div><div class='add'>+	case VT2002P:</div><div class='add'>+	case VT1812:</div><div class='add'>+	case VT1802:</div><div class='add'>+		verb = 0xf93;</div><div class='add'>+		parm = enable ? 0x00 : 0xe0; /* 0x00: 4/40x, 0xe0: 1x */</div><div class='add'>+		break;</div><div class='add'>+	case VT1705CF:</div><div class='add'>+	case VT1808:</div><div class='add'>+		verb = 0xf82;</div><div class='add'>+		parm = enable ? 0x00 : 0xe0;  /* 0x00: 4/40x, 0xe0: 1x */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;		/* other codecs are not supported */</div><div class='add'>+	}</div><div class='add'>+	/* send verb */</div><div class='add'>+	snd_hda_codec_write(codec, codec-&gt;core.afg, 0, verb, parm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void analog_low_current_mode(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return __analog_low_current_mode(codec, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo,</div><div class='add'>+				  struct hda_codec *codec,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  int action)</div><div class='add'>+{</div><div class='add'>+	analog_low_current_mode(codec);</div><div class='add'>+	vt1708_update_hp_work(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void via_remove(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	vt1708_stop_hp_work(codec);</div><div class='add'>+	snd_hda_gen_remove(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	vt1708_stop_hp_work(codec);</div><div class='add'>+</div><div class='add'>+	/* Fix pop noise on headphones */</div><div class='add'>+	if (spec-&gt;codec_type == VT1802)</div><div class='add'>+		snd_hda_shutup_pins(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* some delay here to make jack detection working (bko#98921) */</div><div class='add'>+	msleep(10);</div><div class='add'>+	snd_hda_codec_init(codec);</div><div class='add'>+	snd_hda_regmap_sync(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	analog_low_current_mode(codec);</div><div class='add'>+	vt1708_update_hp_work(codec);</div><div class='add'>+	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;gen.loopback, nid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1708_init_verbs[] = {</div><div class='add'>+	/* power down jack detect function */</div><div class='add'>+	{0x1, 0xf81, 0x1},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf;</div><div class='add'>+	unsigned char seqassoc;</div><div class='add'>+</div><div class='add'>+	def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	seqassoc = (unsigned char) get_defcfg_association(def_conf);</div><div class='add'>+	seqassoc = (seqassoc &lt;&lt; 4) | get_defcfg_sequence(def_conf);</div><div class='add'>+	if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE</div><div class='add'>+	    &amp;&amp; (seqassoc == 0xf0 || seqassoc == 0xff)) {</div><div class='add'>+		def_conf = def_conf &amp; (~(AC_JACK_PORT_BOTH &lt;&lt; 30));</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, nid, def_conf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vt1708_jack_detect_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_type != VT1708)</div><div class='add'>+		return 0;</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = spec-&gt;vt1708_jack_detect;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vt1708_jack_detect_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_type != VT1708)</div><div class='add'>+		return 0;</div><div class='add'>+	val = !!ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	if (spec-&gt;vt1708_jack_detect == val)</div><div class='add'>+		return 0;</div><div class='add'>+	spec-&gt;vt1708_jack_detect = val;</div><div class='add'>+	vt1708_update_hp_work(codec);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new vt1708_jack_detect_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Jack Detect",</div><div class='add'>+	.count = 1,</div><div class='add'>+	.info = snd_ctl_boolean_mono_info,</div><div class='add'>+	.get = vt1708_jack_detect_get,</div><div class='add'>+	.put = vt1708_jack_detect_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct badness_table via_main_out_badness = {</div><div class='add'>+	.no_primary_dac = 0x10000,</div><div class='add'>+	.no_dac = 0x4000,</div><div class='add'>+	.shared_primary = 0x10000,</div><div class='add'>+	.shared_surr = 0x20,</div><div class='add'>+	.shared_clfe = 0x20,</div><div class='add'>+	.shared_surr_main = 0x20,</div><div class='add'>+};</div><div class='add'>+static const struct badness_table via_extra_out_badness = {</div><div class='add'>+	.no_primary_dac = 0x4000,</div><div class='add'>+	.no_dac = 0x4000,</div><div class='add'>+	.shared_primary = 0x12,</div><div class='add'>+	.shared_surr = 0x20,</div><div class='add'>+	.shared_clfe = 0x20,</div><div class='add'>+	.shared_surr_main = 0x10,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int via_parse_auto_config(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.main_out_badness = &amp;via_main_out_badness;</div><div class='add'>+	spec-&gt;gen.extra_out_badness = &amp;via_extra_out_badness;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_parse_pin_defcfg(codec, &amp;spec-&gt;gen.autocfg, NULL, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = auto_parse_beep(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_parse_auto_config(codec, &amp;spec-&gt;gen.autocfg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;via_pin_power_ctl_enum))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* disable widget PM at start for compatibility */</div><div class='add'>+	codec-&gt;power_save_node = 0;</div><div class='add'>+	spec-&gt;gen.power_down_unused = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* init power states */</div><div class='add'>+	__analog_low_current_mode(codec, true);</div><div class='add'>+</div><div class='add'>+	snd_hda_gen_init(codec);</div><div class='add'>+</div><div class='add'>+	vt1708_update_hp_work(codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	/* In order not to create "Phantom Jack" controls,</div><div class='add'>+	   temporary enable jackpoll */</div><div class='add'>+	int err;</div><div class='add'>+	int old_interval = codec-&gt;jackpoll_interval;</div><div class='add'>+	if (old_interval)</div><div class='add'>+		codec-&gt;jackpoll_interval = msecs_to_jiffies(100);</div><div class='add'>+	err = snd_hda_gen_build_controls(codec);</div><div class='add'>+	if (old_interval)</div><div class='add'>+		codec-&gt;jackpoll_interval = old_interval;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int via_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_gen_build_pcms(codec);</div><div class='add'>+	if (err &lt; 0 || codec-&gt;core.vendor_id != 0x11061708)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* We got noisy outputs on the right channel on VT1708 when</div><div class='add'>+	 * 24bit samples are used.  Until any workaround is found,</div><div class='add'>+	 * disable the 24bit format, so far.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;gen.pcm_rec); i++) {</div><div class='add'>+		struct hda_pcm *info = spec-&gt;gen.pcm_rec[i];</div><div class='add'>+		if (!info)</div><div class='add'>+			continue;</div><div class='add'>+		if (!info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].substreams ||</div><div class='add'>+		    info-&gt;pcm_type != HDA_PCM_TYPE_AUDIO)</div><div class='add'>+			continue;</div><div class='add'>+		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].formats =</div><div class='add'>+			SNDRV_PCM_FMTBIT_S16_LE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_vt1708(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x17;</div><div class='add'>+</div><div class='add'>+	/* set jackpoll_interval while parsing the codec */</div><div class='add'>+	codec-&gt;jackpoll_interval = msecs_to_jiffies(100);</div><div class='add'>+	spec-&gt;vt1708_jack_detect = 1;</div><div class='add'>+</div><div class='add'>+	/* don't support the input jack switching due to lack of unsol event */</div><div class='add'>+	/* (it may work with polling, though, but it needs testing) */</div><div class='add'>+	spec-&gt;gen.suppress_auto_mic = 1;</div><div class='add'>+	/* Some machines show the broken speaker mute */</div><div class='add'>+	spec-&gt;gen.auto_mute_via_amp = 1;</div><div class='add'>+</div><div class='add'>+	/* Add HP and CD pin config connect bit re-config action */</div><div class='add'>+	vt1708_set_pinconfig_connect(codec, VT1708_HP_PIN_NID);</div><div class='add'>+	vt1708_set_pinconfig_connect(codec, VT1708_CD_PIN_NID);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1708_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = via_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* add jack detect on/off control */</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;vt1708_jack_detect_ctl))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* clear jackpoll_interval again; it's set dynamically */</div><div class='add'>+	codec-&gt;jackpoll_interval = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_vt1709(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x18;</div><div class='add'>+</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_vt1708S(struct hda_codec *codec);</div><div class='add'>+static int probe_vt1708B(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (get_codec_type(codec) == VT1708BCE)</div><div class='add'>+		return probe_vt1708S(codec);</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x16;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for VT1708S */</div><div class='add'>+static const struct hda_verb vt1708S_init_verbs[] = {</div><div class='add'>+	/* Enable Mic Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xf98, 0x1},</div><div class='add'>+	/* don't bybass mixer */</div><div class='add'>+	{0x1, 0xf88, 0xc0},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void override_mic_boost(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			       int offset, int num_steps, int step_size)</div><div class='add'>+{</div><div class='add'>+	snd_hda_override_wcaps(codec, pin,</div><div class='add'>+			       get_wcaps(codec, pin) | AC_WCAP_IN_AMP);</div><div class='add'>+	snd_hda_override_amp_caps(codec, pin, HDA_INPUT,</div><div class='add'>+				  (offset &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (num_steps &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (step_size &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int probe_vt1708S(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x16;</div><div class='add'>+	override_mic_boost(codec, 0x1a, 0, 3, 40);</div><div class='add'>+	override_mic_boost(codec, 0x1e, 0, 3, 40);</div><div class='add'>+</div><div class='add'>+	/* correct names for VT1708BCE */</div><div class='add'>+	if (get_codec_type(codec) == VT1708BCE)</div><div class='add'>+		snd_hda_codec_set_name(codec, "VT1708BCE");</div><div class='add'>+	/* correct names for VT1705 */</div><div class='add'>+	if (codec-&gt;core.vendor_id == 0x11064397)</div><div class='add'>+		snd_hda_codec_set_name(codec, "VT1705");</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1708S_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for VT1702 */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1702_init_verbs[] = {</div><div class='add'>+	/* mixer enable */</div><div class='add'>+	{0x1, 0xF88, 0x3},</div><div class='add'>+	/* GPIO 0~2 */</div><div class='add'>+	{0x1, 0xF82, 0x3F},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_vt1702(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x1a;</div><div class='add'>+</div><div class='add'>+	/* limit AA path volume to 0 dB */</div><div class='add'>+	snd_hda_override_amp_caps(codec, 0x1A, HDA_INPUT,</div><div class='add'>+				  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='add'>+				  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='add'>+				  (0x5 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='add'>+				  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1702_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for VT1718S */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1718S_init_verbs[] = {</div><div class='add'>+	/* Enable MW0 adjust Gain 5 */</div><div class='add'>+	{0x1, 0xfb2, 0x10},</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xf88, 0x8},</div><div class='add'>+</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Add a connection to the primary DAC from AA-mixer for some codecs</div><div class='add'>+ * This isn't listed from the raw info, but the chip has a secret connection.</div><div class='add'>+ */</div><div class='add'>+static int add_secret_dac_path(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int i, nums;</div><div class='add'>+	hda_nid_t conn[8];</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	if (!spec-&gt;gen.mixer_nid)</div><div class='add'>+		return 0;</div><div class='add'>+	nums = snd_hda_get_connections(codec, spec-&gt;gen.mixer_nid, conn,</div><div class='add'>+				       ARRAY_SIZE(conn) - 1);</div><div class='add'>+	if (nums &lt; 0)</div><div class='add'>+		return nums;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		if (get_wcaps_type(get_wcaps(codec, conn[i])) == AC_WID_AUD_OUT)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* find the primary DAC and add to the connection list */</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int caps = get_wcaps(codec, nid);</div><div class='add'>+		if (get_wcaps_type(caps) == AC_WID_AUD_OUT &amp;&amp;</div><div class='add'>+		    !(caps &amp; AC_WCAP_DIGITAL)) {</div><div class='add'>+			conn[nums++] = nid;</div><div class='add'>+			return snd_hda_override_conn_list(codec,</div><div class='add'>+							  spec-&gt;gen.mixer_nid,</div><div class='add'>+							  nums, conn);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int probe_vt1718S(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x21;</div><div class='add'>+	override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='add'>+	override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='add'>+	add_secret_dac_path(codec);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1718S_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for VT1716S */</div><div class='add'>+</div><div class='add'>+static int vt1716s_dmic_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			    struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vt1716s_dmic_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int index = 0;</div><div class='add'>+</div><div class='add'>+	index = snd_hda_codec_read(codec, 0x26, 0,</div><div class='add'>+					       AC_VERB_GET_CONNECT_SEL, 0);</div><div class='add'>+	if (index != -1)</div><div class='add'>+		*ucontrol-&gt;value.integer.value = index;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vt1716s_dmic_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int index = *ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_write(codec, 0x26, 0,</div><div class='add'>+					       AC_VERB_SET_CONNECT_SEL, index);</div><div class='add'>+	spec-&gt;dmic_enabled = index;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new vt1716s_dmic_mixer_vol =</div><div class='add'>+	HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT);</div><div class='add'>+static const struct snd_kcontrol_new vt1716s_dmic_mixer_sw = {</div><div class='add'>+	 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	 .name = "Digital Mic Capture Switch",</div><div class='add'>+	 .subdevice = HDA_SUBDEV_NID_FLAG | 0x26,</div><div class='add'>+	 .count = 1,</div><div class='add'>+	 .info = vt1716s_dmic_info,</div><div class='add'>+	 .get = vt1716s_dmic_get,</div><div class='add'>+	 .put = vt1716s_dmic_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* mono-out mixer elements */</div><div class='add'>+static const struct snd_kcontrol_new vt1716S_mono_out_mixer =</div><div class='add'>+	HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT);</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1716S_init_verbs[] = {</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xf8a, 0x80},</div><div class='add'>+	/* don't bybass mixer */</div><div class='add'>+	{0x1, 0xf88, 0xc0},</div><div class='add'>+	/* Enable mono output */</div><div class='add'>+	{0x1, 0xf90, 0x08},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_vt1716S(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x16;</div><div class='add'>+	override_mic_boost(codec, 0x1a, 0, 3, 40);</div><div class='add'>+	override_mic_boost(codec, 0x1e, 0, 3, 40);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1716S_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	err = via_parse_auto_config(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;vt1716s_dmic_mixer_vol) ||</div><div class='add'>+	    !snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;vt1716s_dmic_mixer_sw) ||</div><div class='add'>+	    !snd_hda_gen_add_kctl(&amp;spec-&gt;gen, NULL, &amp;vt1716S_mono_out_mixer))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* for vt2002P */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt2002P_init_verbs[] = {</div><div class='add'>+	/* Class-D speaker related verbs */</div><div class='add'>+	{0x1, 0xfe0, 0x4},</div><div class='add'>+	{0x1, 0xfe9, 0x80},</div><div class='add'>+	{0x1, 0xfe2, 0x22},</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xfb9, 0x24},</div><div class='add'>+	/* Enable AOW0 to MW9 */</div><div class='add'>+	{0x1, 0xfb8, 0x88},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1802_init_verbs[] = {</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xfb9, 0x24},</div><div class='add'>+	/* Enable AOW0 to MW9 */</div><div class='add'>+	{0x1, 0xfb8, 0x88},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pin fix-up</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	VIA_FIXUP_INTMIC_BOOST,</div><div class='add'>+	VIA_FIXUP_ASUS_G75,</div><div class='add'>+	VIA_FIXUP_POWER_SAVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void via_fixup_intmic_boost(struct hda_codec *codec,</div><div class='add'>+				  const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		override_mic_boost(codec, 0x30, 0, 2, 40);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void via_fixup_power_save(struct hda_codec *codec,</div><div class='add'>+				 const struct hda_fixup *fix, int action)</div><div class='add'>+{</div><div class='add'>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)</div><div class='add'>+		codec-&gt;power_save_node = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_fixup via_fixups[] = {</div><div class='add'>+	[VIA_FIXUP_INTMIC_BOOST] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = via_fixup_intmic_boost,</div><div class='add'>+	},</div><div class='add'>+	[VIA_FIXUP_ASUS_G75] = {</div><div class='add'>+		.type = HDA_FIXUP_PINS,</div><div class='add'>+		.v.pins = (const struct hda_pintbl[]) {</div><div class='add'>+			/* set 0x24 and 0x33 as speakers */</div><div class='add'>+			{ 0x24, 0x991301f0 },</div><div class='add'>+			{ 0x33, 0x991301f1 }, /* subwoofer */</div><div class='add'>+			{ }</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	[VIA_FIXUP_POWER_SAVE] = {</div><div class='add'>+		.type = HDA_FIXUP_FUNC,</div><div class='add'>+		.v.func = via_fixup_power_save,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_quirk vt2002p_fixups[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x13f7, "Asus B23E", VIA_FIXUP_POWER_SAVE),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),</div><div class='add'>+	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", VIA_FIXUP_POWER_SAVE),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NIDs 0x24 and 0x33 on VT1802 have connections to non-existing NID 0x3e</div><div class='add'>+ * Replace this with mixer NID 0x1c</div><div class='add'>+ */</div><div class='add'>+static void fix_vt1802_connections(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	static const hda_nid_t conn_24[] = { 0x14, 0x1c };</div><div class='add'>+	static const hda_nid_t conn_33[] = { 0x1c };</div><div class='add'>+</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x24, ARRAY_SIZE(conn_24), conn_24);</div><div class='add'>+	snd_hda_override_conn_list(codec, 0x33, ARRAY_SIZE(conn_33), conn_33);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for vt2002P */</div><div class='add'>+static int probe_vt2002P(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x21;</div><div class='add'>+	override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='add'>+	override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='add'>+	if (spec-&gt;codec_type == VT1802)</div><div class='add'>+		fix_vt1802_connections(codec);</div><div class='add'>+	add_secret_dac_path(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_pick_fixup(codec, NULL, vt2002p_fixups, via_fixups);</div><div class='add'>+	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;codec_type == VT1802)</div><div class='add'>+		err = snd_hda_add_verbs(codec, vt1802_init_verbs);</div><div class='add'>+	else</div><div class='add'>+		err = snd_hda_add_verbs(codec, vt2002P_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* for vt1812 */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt1812_init_verbs[] = {</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xfb9, 0x24},</div><div class='add'>+	/* Enable AOW0 to MW9 */</div><div class='add'>+	{0x1, 0xfb8, 0xa8},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_vt1812(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x21;</div><div class='add'>+	override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='add'>+	override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='add'>+	add_secret_dac_path(codec);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt1812_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Support for vt3476 */</div><div class='add'>+</div><div class='add'>+static const struct hda_verb vt3476_init_verbs[] = {</div><div class='add'>+	/* Enable DMic 8/16/32K */</div><div class='add'>+	{0x1, 0xF7B, 0x30},</div><div class='add'>+	/* Enable Boost Volume backdoor */</div><div class='add'>+	{0x1, 0xFB9, 0x20},</div><div class='add'>+	/* Enable AOW-MW9 path */</div><div class='add'>+	{0x1, 0xFB8, 0x10},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int probe_vt3476(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec = codec-&gt;spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spec-&gt;gen.mixer_nid = 0x3f;</div><div class='add'>+	add_secret_dac_path(codec);</div><div class='add'>+</div><div class='add'>+	err = snd_hda_add_verbs(codec, vt3476_init_verbs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* automatic parse from the BIOS config */</div><div class='add'>+	return via_parse_auto_config(codec);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * common driver probe</div><div class='add'>+ */</div><div class='add'>+static int via_probe(struct hda_codec *codec, const struct hda_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct via_spec *spec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* create a codec specific record */</div><div class='add'>+	spec = via_new_spec(codec);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	switch (id-&gt;driver_data) {</div><div class='add'>+	case VT1708:</div><div class='add'>+		err = probe_vt1708(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1709:</div><div class='add'>+		err = probe_vt1709(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1708B:</div><div class='add'>+		err = probe_vt1708B(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1708S:</div><div class='add'>+		err = probe_vt1708S(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1702:</div><div class='add'>+		err = probe_vt1702(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1718S:</div><div class='add'>+		err = probe_vt1718S(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1716S:</div><div class='add'>+		err = probe_vt1716S(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT2002P:</div><div class='add'>+		err = probe_vt2002P(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT1812:</div><div class='add'>+		err = probe_vt1812(codec);</div><div class='add'>+		break;</div><div class='add'>+	case VT3476:</div><div class='add'>+		err = probe_vt3476(codec);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		via_remove(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_codec_ops via_codec_ops = {</div><div class='add'>+	.probe = via_probe,</div><div class='add'>+	.remove = via_remove,</div><div class='add'>+	.build_controls = via_build_controls,</div><div class='add'>+	.build_pcms = via_build_pcms,</div><div class='add'>+	.init = via_init,</div><div class='add'>+	.unsol_event = snd_hda_jack_unsol_event,</div><div class='add'>+	.suspend = via_suspend,</div><div class='add'>+	.resume = via_resume,</div><div class='add'>+	.check_power_status = via_check_power_status,</div><div class='add'>+	.stream_pm = snd_hda_gen_stream_pm,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * driver entries</div><div class='add'>+ */</div><div class='add'>+static const struct hda_device_id snd_hda_id_via[] = {</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11061708, "VT1708", VT1708),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11061709, "VT1708", VT1708),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106170a, "VT1708", VT1708),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106170b, "VT1708", VT1708),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e710, "VT1709 10-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e711, "VT1709 10-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e712, "VT1709 10-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e713, "VT1709 10-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e714, "VT1709 6-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e715, "VT1709 6-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e716, "VT1709 6-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e717, "VT1709 6-Ch", VT1709),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e720, "VT1708B 8-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e721, "VT1708B 8-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e722, "VT1708B 8-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e723, "VT1708B 8-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e724, "VT1708B 4-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e725, "VT1708B 4-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e726, "VT1708B 4-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106e727, "VT1708B 4-Ch", VT1708B),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11061397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11062397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11063397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064397, "VT1705", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11065397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11066397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11067397, "VT1708S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11061398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11062398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11063398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11065398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11066398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11067398, "VT1702", VT1702),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060428, "VT1718S", VT1718S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064428, "VT1718S", VT1718S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060441, "VT2020", VT1718S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064441, "VT1828S", VT1718S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060433, "VT1716S", VT1716S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x1106a721, "VT1716S", VT1716S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060438, "VT2002P", VT2002P),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064438, "VT2002P", VT2002P),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060448, "VT1812", VT1812),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060440, "VT1818S", VT1708S),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11060446, "VT1802", VT2002P),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11068446, "VT1802", VT2002P),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064760, "VT1705CF", VT3476),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064761, "VT1708SCE", VT3476),</div><div class='add'>+	HDA_CODEC_ID_MODEL(0x11064762, "VT1808", VT3476),</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(hdaudio, snd_hda_id_via);</div><div class='add'>+</div><div class='add'>+static struct hda_codec_driver via_driver = {</div><div class='add'>+	.id = snd_hda_id_via,</div><div class='add'>+	.ops = &amp;via_codec_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("VIA HD-audio codec");</div><div class='add'>+</div><div class='add'>+module_hda_codec_driver(via_driver);</div><div class='head'>diff --git a/sound/hda/common/Kconfig b/sound/hda/common/Kconfig<br/>new file mode 100644<br/>index 000000000000..f38e1947fb3e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+config SND_HDA</div><div class='add'>+	tristate</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_VMASTER</div><div class='add'>+	select SND_JACK</div><div class='add'>+	select SND_HDA_CORE</div><div class='add'>+</div><div class='add'>+if SND_HDA</div><div class='add'>+</div><div class='add'>+config SND_HDA_HWDEP</div><div class='add'>+	bool "Build hwdep interface for HD-audio driver"</div><div class='add'>+	select SND_HWDEP</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build a hwdep interface for HD-audio driver.</div><div class='add'>+	  This interface can be used for out-of-band communication</div><div class='add'>+	  with codecs for debugging purposes.</div><div class='add'>+</div><div class='add'>+config SND_HDA_RECONFIG</div><div class='add'>+	bool "Allow dynamic codec reconfiguration"</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable the HD-audio codec re-configuration feature.</div><div class='add'>+	  It allows user to clear the whole codec configuration, change the</div><div class='add'>+	  codec setup, add extra verbs, and re-configure the codec dynamically.</div><div class='add'>+</div><div class='add'>+	  Note that this item alone doesn't provide the sysfs interface, but</div><div class='add'>+	  enables the feature just for the patch loader below.</div><div class='add'>+	  If you need the traditional sysfs entries for the manual interaction,</div><div class='add'>+	  turn on CONFIG_SND_HDA_HWDEP as well.</div><div class='add'>+</div><div class='add'>+config SND_HDA_INPUT_BEEP</div><div class='add'>+	bool "Support digital beep via input layer"</div><div class='add'>+	depends on INPUT=y || INPUT=SND_HDA</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to build a digital beep interface for HD-audio</div><div class='add'>+	  driver. This interface is used to generate digital beeps.</div><div class='add'>+</div><div class='add'>+config SND_HDA_INPUT_BEEP_MODE</div><div class='add'>+	int "Digital beep registration mode (0=off, 1=on)"</div><div class='add'>+	depends on SND_HDA_INPUT_BEEP=y</div><div class='add'>+	default "1"</div><div class='add'>+	range 0 1</div><div class='add'>+	help</div><div class='add'>+	  Set 0 to disable the digital beep interface for HD-audio by default.</div><div class='add'>+	  Set 1 to always enable the digital beep interface for HD-audio by</div><div class='add'>+	  default.</div><div class='add'>+</div><div class='add'>+config SND_HDA_PATCH_LOADER</div><div class='add'>+	bool "Support initialization patch loading for HD-audio"</div><div class='add'>+	select FW_LOADER</div><div class='add'>+	select SND_HDA_RECONFIG</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to allow the HD-audio driver to load a pseudo</div><div class='add'>+	  firmware file ("patch") for overriding the BIOS setup at</div><div class='add'>+	  start up.  The "patch" file can be specified via patch module</div><div class='add'>+	  option, such as patch=hda-init.</div><div class='add'>+</div><div class='add'>+config SND_HDA_POWER_SAVE_DEFAULT</div><div class='add'>+	int "Default time-out for HD-audio power-save mode"</div><div class='add'>+	depends on PM</div><div class='add'>+	default 0</div><div class='add'>+	help</div><div class='add'>+	  The default time-out value in seconds for HD-audio automatic</div><div class='add'>+	  power-save mode.  0 means to disable the power-save mode.</div><div class='add'>+</div><div class='add'>+config SND_HDA_CTL_DEV_ID</div><div class='add'>+	bool "Use the device identifier field for controls"</div><div class='add'>+	depends on SND_HDA_INTEL</div><div class='add'>+	help</div><div class='add'>+	  Say Y to use the device identifier field for (mixer)</div><div class='add'>+	  controls (old behaviour until this option is available).</div><div class='add'>+</div><div class='add'>+	  When enabled, the multiple HDA codecs may set the device</div><div class='add'>+	  field in control (mixer) element identifiers. The use</div><div class='add'>+	  of this field is not recommended and defined for mixer controls.</div><div class='add'>+</div><div class='add'>+	  The old behaviour (Y) is obsolete and will be removed. Consider</div><div class='add'>+	  to not enable this option.</div><div class='add'>+</div><div class='add'>+config SND_HDA_PREALLOC_SIZE</div><div class='add'>+	int "Pre-allocated buffer size for HD-audio driver"</div><div class='add'>+	range 0 32768</div><div class='add'>+	default 0 if SND_DMA_SGBUF</div><div class='add'>+	default 64 if !SND_DMA_SGBUF</div><div class='add'>+	help</div><div class='add'>+	  Specifies the default pre-allocated buffer-size in kB for the</div><div class='add'>+	  HD-audio driver.  A larger buffer (e.g. 2048) is preferred</div><div class='add'>+	  for systems using PulseAudio.  The default 64 is chosen just</div><div class='add'>+	  for compatibility reasons.</div><div class='add'>+	  On x86 systems, the default is zero as S/G allocation works</div><div class='add'>+	  and no preallocation is needed in most cases.</div><div class='add'>+</div><div class='add'>+	  Note that the pre-allocation size can be changed dynamically</div><div class='add'>+	  via a proc file (/proc/asound/card*/pcm*/sub*/prealloc), too.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/sound/hda/common/Makefile b/sound/hda/common/Makefile<br/>new file mode 100644<br/>index 000000000000..3344fa0efe75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-hda-codec-y := bind.o codec.o jack.o auto_parser.o sysfs.o</div><div class='add'>+snd-hda-codec-y += controller.o</div><div class='add'>+snd-hda-codec-$(CONFIG_SND_PROC_FS) += proc.o</div><div class='add'>+</div><div class='add'>+snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hwdep.o</div><div class='add'>+snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += beep.o</div><div class='add'>+</div><div class='add'>+# for trace-points</div><div class='add'>+CFLAGS_controller.o := -I$(src)</div><div class='add'>+</div><div class='add'>+# common driver</div><div class='add'>+obj-$(CONFIG_SND_HDA) := snd-hda-codec.o</div><div class='head'>diff --git a/sound/hda/common/auto_parser.c b/sound/hda/common/auto_parser.c<br/>new file mode 100644<br/>index 000000000000..8923813ce424<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/auto_parser.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/auto_parser.c</a></div><div class='hunk'>@@ -0,0 +1,1104 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto-parser helper functions for HD-audio</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/sort.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper for automatic pin configuration</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int is_in_nid_list(hda_nid_t nid, const hda_nid_t *list)</div><div class='add'>+{</div><div class='add'>+	for (; *list; list++)</div><div class='add'>+		if (*list == nid)</div><div class='add'>+			return 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* a pair of input pin and its sequence */</div><div class='add'>+struct auto_out_pin {</div><div class='add'>+	hda_nid_t pin;</div><div class='add'>+	short seq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int compare_seq(const void *ap, const void *bp)</div><div class='add'>+{</div><div class='add'>+	const struct auto_out_pin *a = ap;</div><div class='add'>+	const struct auto_out_pin *b = bp;</div><div class='add'>+	return (int)(a-&gt;seq - b-&gt;seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Sort an associated group of pins according to their sequence numbers.</div><div class='add'>+ * then store it to a pin array.</div><div class='add'>+ */</div><div class='add'>+static void sort_pins_by_sequence(hda_nid_t *pins, struct auto_out_pin *list,</div><div class='add'>+				  int num_pins)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	sort(list, num_pins, sizeof(list[0]), compare_seq, NULL);</div><div class='add'>+	for (i = 0; i &lt; num_pins; i++)</div><div class='add'>+		pins[i] = list[i].pin;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* add the found input-pin to the cfg-&gt;inputs[] table */</div><div class='add'>+static void add_auto_cfg_input_pin(struct hda_codec *codec, struct auto_pin_cfg *cfg,</div><div class='add'>+				   hda_nid_t nid, int type)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;num_inputs &lt; AUTO_CFG_MAX_INS) {</div><div class='add'>+		cfg-&gt;inputs[cfg-&gt;num_inputs].pin = nid;</div><div class='add'>+		cfg-&gt;inputs[cfg-&gt;num_inputs].type = type;</div><div class='add'>+		cfg-&gt;inputs[cfg-&gt;num_inputs].has_boost_on_pin =</div><div class='add'>+			nid_has_volume(codec, nid, HDA_INPUT);</div><div class='add'>+		cfg-&gt;num_inputs++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int compare_input_type(const void *ap, const void *bp)</div><div class='add'>+{</div><div class='add'>+	const struct auto_pin_cfg_item *a = ap;</div><div class='add'>+	const struct auto_pin_cfg_item *b = bp;</div><div class='add'>+	if (a-&gt;type != b-&gt;type)</div><div class='add'>+		return (int)(a-&gt;type - b-&gt;type);</div><div class='add'>+</div><div class='add'>+	/* If has both hs_mic and hp_mic, pick the hs_mic ahead of hp_mic. */</div><div class='add'>+	if (a-&gt;is_headset_mic &amp;&amp; b-&gt;is_headphone_mic)</div><div class='add'>+		return -1; /* don't swap */</div><div class='add'>+	else if (a-&gt;is_headphone_mic &amp;&amp; b-&gt;is_headset_mic)</div><div class='add'>+		return 1; /* swap */</div><div class='add'>+</div><div class='add'>+	/* In case one has boost and the other one has not,</div><div class='add'>+	   pick the one with boost first. */</div><div class='add'>+	if (a-&gt;has_boost_on_pin != b-&gt;has_boost_on_pin)</div><div class='add'>+		return (int)(b-&gt;has_boost_on_pin - a-&gt;has_boost_on_pin);</div><div class='add'>+</div><div class='add'>+	/* Keep the original order */</div><div class='add'>+	return a-&gt;order - b-&gt;order;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reorder the surround channels</div><div class='add'>+ * ALSA sequence is front/surr/clfe/side</div><div class='add'>+ * HDA sequence is:</div><div class='add'>+ *    4-ch: front/surr  =&gt;  OK as it is</div><div class='add'>+ *    6-ch: front/clfe/surr</div><div class='add'>+ *    8-ch: front/clfe/rear/side|fc</div><div class='add'>+ */</div><div class='add'>+static void reorder_outputs(unsigned int nums, hda_nid_t *pins)</div><div class='add'>+{</div><div class='add'>+	switch (nums) {</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+		swap(pins[1], pins[2]);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether the given pin has a proper pin I/O capability bit */</div><div class='add'>+static bool check_pincap_validity(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+				  unsigned int dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int pincap = snd_hda_query_pin_caps(codec, pin);</div><div class='add'>+</div><div class='add'>+	/* some old hardware don't return the proper pincaps */</div><div class='add'>+	if (!pincap)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	switch (dev) {</div><div class='add'>+	case AC_JACK_LINE_OUT:</div><div class='add'>+	case AC_JACK_SPEAKER:</div><div class='add'>+	case AC_JACK_HP_OUT:</div><div class='add'>+	case AC_JACK_SPDIF_OUT:</div><div class='add'>+	case AC_JACK_DIG_OTHER_OUT:</div><div class='add'>+		return !!(pincap &amp; AC_PINCAP_OUT);</div><div class='add'>+	default:</div><div class='add'>+		return !!(pincap &amp; AC_PINCAP_IN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool can_be_headset_mic(struct hda_codec *codec,</div><div class='add'>+			       struct auto_pin_cfg_item *item,</div><div class='add'>+			       int seq_number)</div><div class='add'>+{</div><div class='add'>+	int attr;</div><div class='add'>+	unsigned int def_conf;</div><div class='add'>+	if (item-&gt;type != AUTO_PIN_MIC)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (item-&gt;is_headset_mic || item-&gt;is_headphone_mic)</div><div class='add'>+		return false; /* Already assigned */</div><div class='add'>+</div><div class='add'>+	def_conf = snd_hda_codec_get_pincfg(codec, item-&gt;pin);</div><div class='add'>+	attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='add'>+	if (attr &lt;= INPUT_PIN_ATTR_DOCK)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (seq_number &gt;= 0) {</div><div class='add'>+		int seq = get_defcfg_sequence(def_conf);</div><div class='add'>+		if (seq != seq_number)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse all pin widgets and store the useful pin nids to cfg</div><div class='add'>+ *</div><div class='add'>+ * The number of line-outs or any primary output is stored in line_outs,</div><div class='add'>+ * and the corresponding output pins are assigned to line_out_pins[],</div><div class='add'>+ * in the order of front, rear, CLFE, side, ...</div><div class='add'>+ *</div><div class='add'>+ * If more extra outputs (speaker and headphone) are found, the pins are</div><div class='add'>+ * assisnged to hp_pins[] and speaker_pins[], respectively.  If no line-out jack</div><div class='add'>+ * is detected, one of speaker of HP pins is assigned as the primary</div><div class='add'>+ * output, i.e. to line_out_pins[0].  So, line_outs is always positive</div><div class='add'>+ * if any analog output exists.</div><div class='add'>+ *</div><div class='add'>+ * The analog input pins are assigned to inputs array.</div><div class='add'>+ * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,</div><div class='add'>+ * respectively.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_parse_pin_defcfg(struct hda_codec *codec,</div><div class='add'>+			     struct auto_pin_cfg *cfg,</div><div class='add'>+			     const hda_nid_t *ignore_nids,</div><div class='add'>+			     unsigned int cond_flags)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	short seq, assoc_line_out;</div><div class='add'>+	struct auto_out_pin line_out[ARRAY_SIZE(cfg-&gt;line_out_pins)];</div><div class='add'>+	struct auto_out_pin speaker_out[ARRAY_SIZE(cfg-&gt;speaker_pins)];</div><div class='add'>+	struct auto_out_pin hp_out[ARRAY_SIZE(cfg-&gt;hp_pins)];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!snd_hda_get_int_hint(codec, "parser_flags", &amp;i))</div><div class='add'>+		cond_flags = i;</div><div class='add'>+</div><div class='add'>+	memset(cfg, 0, sizeof(*cfg));</div><div class='add'>+</div><div class='add'>+	memset(line_out, 0, sizeof(line_out));</div><div class='add'>+	memset(speaker_out, 0, sizeof(speaker_out));</div><div class='add'>+	memset(hp_out, 0, sizeof(hp_out));</div><div class='add'>+	assoc_line_out = 0;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int wid_caps = get_wcaps(codec, nid);</div><div class='add'>+		unsigned int wid_type = get_wcaps_type(wid_caps);</div><div class='add'>+		unsigned int def_conf;</div><div class='add'>+		short assoc, loc, conn, dev;</div><div class='add'>+</div><div class='add'>+		/* read all default configuration for pin complex */</div><div class='add'>+		if (wid_type != AC_WID_PIN)</div><div class='add'>+			continue;</div><div class='add'>+		/* ignore the given nids (e.g. pc-beep returns error) */</div><div class='add'>+		if (ignore_nids &amp;&amp; is_in_nid_list(nid, ignore_nids))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+		conn = get_defcfg_connect(def_conf);</div><div class='add'>+		if (conn == AC_JACK_PORT_NONE)</div><div class='add'>+			continue;</div><div class='add'>+		loc = get_defcfg_location(def_conf);</div><div class='add'>+		dev = get_defcfg_device(def_conf);</div><div class='add'>+</div><div class='add'>+		/* workaround for buggy BIOS setups */</div><div class='add'>+		if (dev == AC_JACK_LINE_OUT) {</div><div class='add'>+			if (conn == AC_JACK_PORT_FIXED ||</div><div class='add'>+			    conn == AC_JACK_PORT_BOTH)</div><div class='add'>+				dev = AC_JACK_SPEAKER;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!check_pincap_validity(codec, nid, dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (dev) {</div><div class='add'>+		case AC_JACK_LINE_OUT:</div><div class='add'>+			seq = get_defcfg_sequence(def_conf);</div><div class='add'>+			assoc = get_defcfg_association(def_conf);</div><div class='add'>+</div><div class='add'>+			if (!(wid_caps &amp; AC_WCAP_STEREO))</div><div class='add'>+				if (!cfg-&gt;mono_out_pin)</div><div class='add'>+					cfg-&gt;mono_out_pin = nid;</div><div class='add'>+			if (!assoc)</div><div class='add'>+				continue;</div><div class='add'>+			if (!assoc_line_out)</div><div class='add'>+				assoc_line_out = assoc;</div><div class='add'>+			else if (assoc_line_out != assoc) {</div><div class='add'>+				codec_info(codec,</div><div class='add'>+					   "ignore pin 0x%x with mismatching assoc# 0x%x vs 0x%x\n",</div><div class='add'>+					   nid, assoc, assoc_line_out);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (cfg-&gt;line_outs &gt;= ARRAY_SIZE(cfg-&gt;line_out_pins)) {</div><div class='add'>+				codec_info(codec,</div><div class='add'>+					   "ignore pin 0x%x, too many assigned pins\n",</div><div class='add'>+					   nid);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			line_out[cfg-&gt;line_outs].pin = nid;</div><div class='add'>+			line_out[cfg-&gt;line_outs].seq = seq;</div><div class='add'>+			cfg-&gt;line_outs++;</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_SPEAKER:</div><div class='add'>+			seq = get_defcfg_sequence(def_conf);</div><div class='add'>+			assoc = get_defcfg_association(def_conf);</div><div class='add'>+			if (cfg-&gt;speaker_outs &gt;= ARRAY_SIZE(cfg-&gt;speaker_pins)) {</div><div class='add'>+				codec_info(codec,</div><div class='add'>+					   "ignore pin 0x%x, too many assigned pins\n",</div><div class='add'>+					   nid);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			speaker_out[cfg-&gt;speaker_outs].pin = nid;</div><div class='add'>+			speaker_out[cfg-&gt;speaker_outs].seq = (assoc &lt;&lt; 4) | seq;</div><div class='add'>+			cfg-&gt;speaker_outs++;</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_HP_OUT:</div><div class='add'>+			seq = get_defcfg_sequence(def_conf);</div><div class='add'>+			assoc = get_defcfg_association(def_conf);</div><div class='add'>+			if (cfg-&gt;hp_outs &gt;= ARRAY_SIZE(cfg-&gt;hp_pins)) {</div><div class='add'>+				codec_info(codec,</div><div class='add'>+					   "ignore pin 0x%x, too many assigned pins\n",</div><div class='add'>+					   nid);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			hp_out[cfg-&gt;hp_outs].pin = nid;</div><div class='add'>+			hp_out[cfg-&gt;hp_outs].seq = (assoc &lt;&lt; 4) | seq;</div><div class='add'>+			cfg-&gt;hp_outs++;</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_MIC_IN:</div><div class='add'>+			add_auto_cfg_input_pin(codec, cfg, nid, AUTO_PIN_MIC);</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_LINE_IN:</div><div class='add'>+			add_auto_cfg_input_pin(codec, cfg, nid, AUTO_PIN_LINE_IN);</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_CD:</div><div class='add'>+			add_auto_cfg_input_pin(codec, cfg, nid, AUTO_PIN_CD);</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_AUX:</div><div class='add'>+			add_auto_cfg_input_pin(codec, cfg, nid, AUTO_PIN_AUX);</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_SPDIF_OUT:</div><div class='add'>+		case AC_JACK_DIG_OTHER_OUT:</div><div class='add'>+			if (cfg-&gt;dig_outs &gt;= ARRAY_SIZE(cfg-&gt;dig_out_pins)) {</div><div class='add'>+				codec_info(codec,</div><div class='add'>+					   "ignore pin 0x%x, too many assigned pins\n",</div><div class='add'>+					   nid);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			cfg-&gt;dig_out_pins[cfg-&gt;dig_outs] = nid;</div><div class='add'>+			cfg-&gt;dig_out_type[cfg-&gt;dig_outs] =</div><div class='add'>+				(loc == AC_JACK_LOC_HDMI) ?</div><div class='add'>+				HDA_PCM_TYPE_HDMI : HDA_PCM_TYPE_SPDIF;</div><div class='add'>+			cfg-&gt;dig_outs++;</div><div class='add'>+			break;</div><div class='add'>+		case AC_JACK_SPDIF_IN:</div><div class='add'>+		case AC_JACK_DIG_OTHER_IN:</div><div class='add'>+			cfg-&gt;dig_in_pin = nid;</div><div class='add'>+			if (loc == AC_JACK_LOC_HDMI)</div><div class='add'>+				cfg-&gt;dig_in_type = HDA_PCM_TYPE_HDMI;</div><div class='add'>+			else</div><div class='add'>+				cfg-&gt;dig_in_type = HDA_PCM_TYPE_SPDIF;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find a pin that could be a headset or headphone mic */</div><div class='add'>+	if (cond_flags &amp; HDA_PINCFG_HEADSET_MIC || cond_flags &amp; HDA_PINCFG_HEADPHONE_MIC) {</div><div class='add'>+		bool hsmic = !!(cond_flags &amp; HDA_PINCFG_HEADSET_MIC);</div><div class='add'>+		bool hpmic = !!(cond_flags &amp; HDA_PINCFG_HEADPHONE_MIC);</div><div class='add'>+		for (i = 0; (hsmic || hpmic) &amp;&amp; (i &lt; cfg-&gt;num_inputs); i++)</div><div class='add'>+			if (hsmic &amp;&amp; can_be_headset_mic(codec, &amp;cfg-&gt;inputs[i], 0xc)) {</div><div class='add'>+				cfg-&gt;inputs[i].is_headset_mic = 1;</div><div class='add'>+				hsmic = false;</div><div class='add'>+			} else if (hpmic &amp;&amp; can_be_headset_mic(codec, &amp;cfg-&gt;inputs[i], 0xd)) {</div><div class='add'>+				cfg-&gt;inputs[i].is_headphone_mic = 1;</div><div class='add'>+				hpmic = false;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		/* If we didn't find our sequence number mark, fall back to any sequence number */</div><div class='add'>+		for (i = 0; (hsmic || hpmic) &amp;&amp; (i &lt; cfg-&gt;num_inputs); i++) {</div><div class='add'>+			if (!can_be_headset_mic(codec, &amp;cfg-&gt;inputs[i], -1))</div><div class='add'>+				continue;</div><div class='add'>+			if (hsmic) {</div><div class='add'>+				cfg-&gt;inputs[i].is_headset_mic = 1;</div><div class='add'>+				hsmic = false;</div><div class='add'>+			} else if (hpmic) {</div><div class='add'>+				cfg-&gt;inputs[i].is_headphone_mic = 1;</div><div class='add'>+				hpmic = false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hsmic)</div><div class='add'>+			codec_dbg(codec, "Told to look for a headset mic, but didn't find any.\n");</div><div class='add'>+		if (hpmic)</div><div class='add'>+			codec_dbg(codec, "Told to look for a headphone mic, but didn't find any.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIX-UP:</div><div class='add'>+	 * If no line-out is defined but multiple HPs are found,</div><div class='add'>+	 * some of them might be the real line-outs.</div><div class='add'>+	 */</div><div class='add'>+	if (!cfg-&gt;line_outs &amp;&amp; cfg-&gt;hp_outs &gt; 1 &amp;&amp;</div><div class='add'>+	    !(cond_flags &amp; HDA_PINCFG_NO_HP_FIXUP)) {</div><div class='add'>+		i = 0;</div><div class='add'>+		while (i &lt; cfg-&gt;hp_outs) {</div><div class='add'>+			/* The real HPs should have the sequence 0x0f */</div><div class='add'>+			if ((hp_out[i].seq &amp; 0x0f) == 0x0f) {</div><div class='add'>+				i++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			/* Move it to the line-out table */</div><div class='add'>+			line_out[cfg-&gt;line_outs++] = hp_out[i];</div><div class='add'>+			cfg-&gt;hp_outs--;</div><div class='add'>+			memmove(hp_out + i, hp_out + i + 1,</div><div class='add'>+				sizeof(hp_out[0]) * (cfg-&gt;hp_outs - i));</div><div class='add'>+		}</div><div class='add'>+		memset(hp_out + cfg-&gt;hp_outs, 0,</div><div class='add'>+		       sizeof(hp_out[0]) * (AUTO_CFG_MAX_OUTS - cfg-&gt;hp_outs));</div><div class='add'>+		if (!cfg-&gt;hp_outs)</div><div class='add'>+			cfg-&gt;line_out_type = AUTO_PIN_HP_OUT;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* sort by sequence */</div><div class='add'>+	sort_pins_by_sequence(cfg-&gt;line_out_pins, line_out, cfg-&gt;line_outs);</div><div class='add'>+	sort_pins_by_sequence(cfg-&gt;speaker_pins, speaker_out,</div><div class='add'>+			      cfg-&gt;speaker_outs);</div><div class='add'>+	sort_pins_by_sequence(cfg-&gt;hp_pins, hp_out, cfg-&gt;hp_outs);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * FIX-UP: if no line-outs are detected, try to use speaker or HP pin</div><div class='add'>+	 * as a primary output</div><div class='add'>+	 */</div><div class='add'>+	if (!cfg-&gt;line_outs &amp;&amp;</div><div class='add'>+	    !(cond_flags &amp; HDA_PINCFG_NO_LO_FIXUP)) {</div><div class='add'>+		if (cfg-&gt;speaker_outs) {</div><div class='add'>+			cfg-&gt;line_outs = cfg-&gt;speaker_outs;</div><div class='add'>+			memcpy(cfg-&gt;line_out_pins, cfg-&gt;speaker_pins,</div><div class='add'>+			       sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+			cfg-&gt;speaker_outs = 0;</div><div class='add'>+			memset(cfg-&gt;speaker_pins, 0, sizeof(cfg-&gt;speaker_pins));</div><div class='add'>+			cfg-&gt;line_out_type = AUTO_PIN_SPEAKER_OUT;</div><div class='add'>+		} else if (cfg-&gt;hp_outs) {</div><div class='add'>+			cfg-&gt;line_outs = cfg-&gt;hp_outs;</div><div class='add'>+			memcpy(cfg-&gt;line_out_pins, cfg-&gt;hp_pins,</div><div class='add'>+			       sizeof(cfg-&gt;hp_pins));</div><div class='add'>+			cfg-&gt;hp_outs = 0;</div><div class='add'>+			memset(cfg-&gt;hp_pins, 0, sizeof(cfg-&gt;hp_pins));</div><div class='add'>+			cfg-&gt;line_out_type = AUTO_PIN_HP_OUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reorder_outputs(cfg-&gt;line_outs, cfg-&gt;line_out_pins);</div><div class='add'>+	reorder_outputs(cfg-&gt;hp_outs, cfg-&gt;hp_pins);</div><div class='add'>+	reorder_outputs(cfg-&gt;speaker_outs, cfg-&gt;speaker_pins);</div><div class='add'>+</div><div class='add'>+	/* sort inputs in the order of AUTO_PIN_* type */</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='add'>+		cfg-&gt;inputs[i].order = i;</div><div class='add'>+	sort(cfg-&gt;inputs, cfg-&gt;num_inputs, sizeof(cfg-&gt;inputs[0]),</div><div class='add'>+	     compare_input_type, NULL);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * debug prints of the parsed results</div><div class='add'>+	 */</div><div class='add'>+	codec_info(codec, "autoconfig for %s: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x) type:%s\n",</div><div class='add'>+		   codec-&gt;core.chip_name, cfg-&gt;line_outs, cfg-&gt;line_out_pins[0],</div><div class='add'>+		   cfg-&gt;line_out_pins[1], cfg-&gt;line_out_pins[2],</div><div class='add'>+		   cfg-&gt;line_out_pins[3], cfg-&gt;line_out_pins[4],</div><div class='add'>+		   cfg-&gt;line_out_type == AUTO_PIN_HP_OUT ? "hp" :</div><div class='add'>+		   (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT ?</div><div class='add'>+		    "speaker" : "line"));</div><div class='add'>+	codec_info(codec, "   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='add'>+		   cfg-&gt;speaker_outs, cfg-&gt;speaker_pins[0],</div><div class='add'>+		   cfg-&gt;speaker_pins[1], cfg-&gt;speaker_pins[2],</div><div class='add'>+		   cfg-&gt;speaker_pins[3], cfg-&gt;speaker_pins[4]);</div><div class='add'>+	codec_info(codec, "   hp_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='add'>+		   cfg-&gt;hp_outs, cfg-&gt;hp_pins[0],</div><div class='add'>+		   cfg-&gt;hp_pins[1], cfg-&gt;hp_pins[2],</div><div class='add'>+		   cfg-&gt;hp_pins[3], cfg-&gt;hp_pins[4]);</div><div class='add'>+	codec_info(codec, "   mono: mono_out=0x%x\n", cfg-&gt;mono_out_pin);</div><div class='add'>+	if (cfg-&gt;dig_outs)</div><div class='add'>+		codec_info(codec, "   dig-out=0x%x/0x%x\n",</div><div class='add'>+			   cfg-&gt;dig_out_pins[0], cfg-&gt;dig_out_pins[1]);</div><div class='add'>+	codec_info(codec, "   inputs:\n");</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		codec_info(codec, "     %s=0x%x\n",</div><div class='add'>+			    hda_get_autocfg_input_label(codec, cfg, i),</div><div class='add'>+			    cfg-&gt;inputs[i].pin);</div><div class='add'>+	}</div><div class='add'>+	if (cfg-&gt;dig_in_pin)</div><div class='add'>+		codec_info(codec, "   dig-in=0x%x\n", cfg-&gt;dig_in_pin);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_parse_pin_defcfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_input_pin_attr - Get the input pin attribute from pin config</div><div class='add'>+ * @def_conf: pin configuration value</div><div class='add'>+ *</div><div class='add'>+ * Guess the input pin attribute (INPUT_PIN_ATTR_XXX) from the given</div><div class='add'>+ * default pin configuration value.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_input_pin_attr(unsigned int def_conf)</div><div class='add'>+{</div><div class='add'>+	unsigned int loc = get_defcfg_location(def_conf);</div><div class='add'>+	unsigned int conn = get_defcfg_connect(def_conf);</div><div class='add'>+	if (conn == AC_JACK_PORT_NONE)</div><div class='add'>+		return INPUT_PIN_ATTR_UNUSED;</div><div class='add'>+	/* Windows may claim the internal mic to be BOTH, too */</div><div class='add'>+	if (conn == AC_JACK_PORT_FIXED || conn == AC_JACK_PORT_BOTH)</div><div class='add'>+		return INPUT_PIN_ATTR_INT;</div><div class='add'>+	if ((loc &amp; 0x30) == AC_JACK_LOC_INTERNAL)</div><div class='add'>+		return INPUT_PIN_ATTR_INT;</div><div class='add'>+	if ((loc &amp; 0x30) == AC_JACK_LOC_SEPARATE)</div><div class='add'>+		return INPUT_PIN_ATTR_DOCK;</div><div class='add'>+	if (loc == AC_JACK_LOC_REAR)</div><div class='add'>+		return INPUT_PIN_ATTR_REAR;</div><div class='add'>+	if (loc == AC_JACK_LOC_FRONT)</div><div class='add'>+		return INPUT_PIN_ATTR_FRONT;</div><div class='add'>+	return INPUT_PIN_ATTR_NORMAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_input_pin_attr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hda_get_input_pin_label - Give a label for the given input pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @item: ping config item to refer</div><div class='add'>+ * @pin: the pin NID</div><div class='add'>+ * @check_location: flag to add the jack location prefix</div><div class='add'>+ *</div><div class='add'>+ * When @check_location is true, the function checks the pin location</div><div class='add'>+ * for mic and line-in pins, and set an appropriate prefix like "Front",</div><div class='add'>+ * "Rear", "Internal".</div><div class='add'>+ */</div><div class='add'>+static const char *hda_get_input_pin_label(struct hda_codec *codec,</div><div class='add'>+					   const struct auto_pin_cfg_item *item,</div><div class='add'>+					   hda_nid_t pin, bool check_location)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf;</div><div class='add'>+	static const char * const mic_names[] = {</div><div class='add'>+		"Internal Mic", "Dock Mic", "Mic", "Rear Mic", "Front Mic"</div><div class='add'>+	};</div><div class='add'>+	int attr;</div><div class='add'>+</div><div class='add'>+	def_conf = snd_hda_codec_get_pincfg(codec, pin);</div><div class='add'>+</div><div class='add'>+	switch (get_defcfg_device(def_conf)) {</div><div class='add'>+	case AC_JACK_MIC_IN:</div><div class='add'>+		if (item &amp;&amp; item-&gt;is_headset_mic)</div><div class='add'>+			return "Headset Mic";</div><div class='add'>+		if (item &amp;&amp; item-&gt;is_headphone_mic)</div><div class='add'>+			return "Headphone Mic";</div><div class='add'>+		if (!check_location)</div><div class='add'>+			return "Mic";</div><div class='add'>+		attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='add'>+		if (!attr)</div><div class='add'>+			return "None";</div><div class='add'>+		return mic_names[attr - 1];</div><div class='add'>+	case AC_JACK_LINE_IN:</div><div class='add'>+		if (!check_location)</div><div class='add'>+			return "Line";</div><div class='add'>+		attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='add'>+		if (!attr)</div><div class='add'>+			return "None";</div><div class='add'>+		if (attr == INPUT_PIN_ATTR_DOCK)</div><div class='add'>+			return "Dock Line";</div><div class='add'>+		return "Line";</div><div class='add'>+	case AC_JACK_AUX:</div><div class='add'>+		return "Aux";</div><div class='add'>+	case AC_JACK_CD:</div><div class='add'>+		return "CD";</div><div class='add'>+	case AC_JACK_SPDIF_IN:</div><div class='add'>+		return "SPDIF In";</div><div class='add'>+	case AC_JACK_DIG_OTHER_IN:</div><div class='add'>+		return "Digital In";</div><div class='add'>+	case AC_JACK_HP_OUT:</div><div class='add'>+		return "Headphone Mic";</div><div class='add'>+	default:</div><div class='add'>+		return "Misc";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check whether the location prefix needs to be added to the label.</div><div class='add'>+ * If all mic-jacks are in the same location (e.g. rear panel), we don't</div><div class='add'>+ * have to put "Front" prefix to each label.  In such a case, returns false.</div><div class='add'>+ */</div><div class='add'>+static int check_mic_location_need(struct hda_codec *codec,</div><div class='add'>+				   const struct auto_pin_cfg *cfg,</div><div class='add'>+				   int input)</div><div class='add'>+{</div><div class='add'>+	unsigned int defc;</div><div class='add'>+	int i, attr, attr2;</div><div class='add'>+</div><div class='add'>+	defc = snd_hda_codec_get_pincfg(codec, cfg-&gt;inputs[input].pin);</div><div class='add'>+	attr = snd_hda_get_input_pin_attr(defc);</div><div class='add'>+	/* for internal or docking mics, we need locations */</div><div class='add'>+	if (attr &lt;= INPUT_PIN_ATTR_NORMAL)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	attr = 0;</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		defc = snd_hda_codec_get_pincfg(codec, cfg-&gt;inputs[i].pin);</div><div class='add'>+		attr2 = snd_hda_get_input_pin_attr(defc);</div><div class='add'>+		if (attr2 &gt;= INPUT_PIN_ATTR_NORMAL) {</div><div class='add'>+			if (attr &amp;&amp; attr != attr2)</div><div class='add'>+				return 1; /* different locations found */</div><div class='add'>+			attr = attr2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hda_get_autocfg_input_label - Get a label for the given input</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @cfg: the parsed pin configuration</div><div class='add'>+ * @input: the input index number</div><div class='add'>+ *</div><div class='add'>+ * Get a label for the given input pin defined by the autocfg item.</div><div class='add'>+ * Unlike hda_get_input_pin_label(), this function checks all inputs</div><div class='add'>+ * defined in autocfg and avoids the redundant mic/line prefix as much as</div><div class='add'>+ * possible.</div><div class='add'>+ */</div><div class='add'>+const char *hda_get_autocfg_input_label(struct hda_codec *codec,</div><div class='add'>+					const struct auto_pin_cfg *cfg,</div><div class='add'>+					int input)</div><div class='add'>+{</div><div class='add'>+	int type = cfg-&gt;inputs[input].type;</div><div class='add'>+	int has_multiple_pins = 0;</div><div class='add'>+</div><div class='add'>+	if ((input &gt; 0 &amp;&amp; cfg-&gt;inputs[input - 1].type == type) ||</div><div class='add'>+	    (input &lt; cfg-&gt;num_inputs - 1 &amp;&amp; cfg-&gt;inputs[input + 1].type == type))</div><div class='add'>+		has_multiple_pins = 1;</div><div class='add'>+	if (has_multiple_pins &amp;&amp; type == AUTO_PIN_MIC)</div><div class='add'>+		has_multiple_pins &amp;= check_mic_location_need(codec, cfg, input);</div><div class='add'>+	has_multiple_pins |= codec-&gt;force_pin_prefix;</div><div class='add'>+	return hda_get_input_pin_label(codec, &amp;cfg-&gt;inputs[input],</div><div class='add'>+				       cfg-&gt;inputs[input].pin,</div><div class='add'>+				       has_multiple_pins);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hda_get_autocfg_input_label);</div><div class='add'>+</div><div class='add'>+/* return the position of NID in the list, or -1 if not found */</div><div class='add'>+static int find_idx_in_nid_list(hda_nid_t nid, const hda_nid_t *list, int nums)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; nums; i++)</div><div class='add'>+		if (list[i] == nid)</div><div class='add'>+			return i;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get a unique suffix or an index number */</div><div class='add'>+static const char *check_output_sfx(hda_nid_t nid, const hda_nid_t *pins,</div><div class='add'>+				    int num_pins, int *indexp)</div><div class='add'>+{</div><div class='add'>+	static const char * const channel_sfx[] = {</div><div class='add'>+		" Front", " Surround", " CLFE", " Side"</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	i = find_idx_in_nid_list(nid, pins, num_pins);</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (num_pins == 1)</div><div class='add'>+		return "";</div><div class='add'>+	if (num_pins &gt; ARRAY_SIZE(channel_sfx)) {</div><div class='add'>+		if (indexp)</div><div class='add'>+			*indexp = i;</div><div class='add'>+		return "";</div><div class='add'>+	}</div><div class='add'>+	return channel_sfx[i];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *check_output_pfx(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	int attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='add'>+</div><div class='add'>+	/* check the location */</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case INPUT_PIN_ATTR_DOCK:</div><div class='add'>+		return "Dock ";</div><div class='add'>+	case INPUT_PIN_ATTR_FRONT:</div><div class='add'>+		return "Front ";</div><div class='add'>+	}</div><div class='add'>+	return "";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_hp_label_index(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			      const hda_nid_t *pins, int num_pins)</div><div class='add'>+{</div><div class='add'>+	int i, j, idx = 0;</div><div class='add'>+</div><div class='add'>+	const char *pfx = check_output_pfx(codec, nid);</div><div class='add'>+</div><div class='add'>+	i = find_idx_in_nid_list(nid, pins, num_pins);</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		if (pfx == check_output_pfx(codec, pins[j]))</div><div class='add'>+			idx++;</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fill_audio_out_name(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			       const struct auto_pin_cfg *cfg,</div><div class='add'>+			       const char *name, char *label, int maxlen,</div><div class='add'>+			       int *indexp)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	int attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='add'>+	const char *pfx, *sfx = "";</div><div class='add'>+</div><div class='add'>+	/* handle as a speaker if it's a fixed line-out */</div><div class='add'>+	if (!strcmp(name, "Line Out") &amp;&amp; attr == INPUT_PIN_ATTR_INT)</div><div class='add'>+		name = "Speaker";</div><div class='add'>+	pfx = check_output_pfx(codec, nid);</div><div class='add'>+</div><div class='add'>+	if (cfg) {</div><div class='add'>+		/* try to give a unique suffix if needed */</div><div class='add'>+		sfx = check_output_sfx(nid, cfg-&gt;line_out_pins, cfg-&gt;line_outs,</div><div class='add'>+				       indexp);</div><div class='add'>+		if (!sfx)</div><div class='add'>+			sfx = check_output_sfx(nid, cfg-&gt;speaker_pins, cfg-&gt;speaker_outs,</div><div class='add'>+					       indexp);</div><div class='add'>+		if (!sfx) {</div><div class='add'>+			/* don't add channel suffix for Headphone controls */</div><div class='add'>+			int idx = get_hp_label_index(codec, nid, cfg-&gt;hp_pins,</div><div class='add'>+						     cfg-&gt;hp_outs);</div><div class='add'>+			if (idx &gt;= 0 &amp;&amp; indexp)</div><div class='add'>+				*indexp = idx;</div><div class='add'>+			sfx = "";</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	snprintf(label, maxlen, "%s%s%s", pfx, name, sfx);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define is_hdmi_cfg(conf) \</div><div class='add'>+	(get_defcfg_location(conf) == AC_JACK_LOC_HDMI)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_pin_label - Get a label for the given I/O pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID</div><div class='add'>+ * @cfg: the parsed pin configuration</div><div class='add'>+ * @label: the string buffer to store</div><div class='add'>+ * @maxlen: the max length of string buffer (including termination)</div><div class='add'>+ * @indexp: the pointer to return the index number (for multiple ctls)</div><div class='add'>+ *</div><div class='add'>+ * Get a label for the given pin.  This function works for both input and</div><div class='add'>+ * output pins.  When @cfg is given as non-NULL, the function tries to get</div><div class='add'>+ * an optimized label using hda_get_autocfg_input_label().</div><div class='add'>+ *</div><div class='add'>+ * This function tries to give a unique label string for the pin as much as</div><div class='add'>+ * possible.  For example, when the multiple line-outs are present, it adds</div><div class='add'>+ * the channel suffix like "Front", "Surround", etc (only when @cfg is given).</div><div class='add'>+ * If no unique name with a suffix is available and @indexp is non-NULL, the</div><div class='add'>+ * index number is stored in the pointer.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  const struct auto_pin_cfg *cfg,</div><div class='add'>+			  char *label, int maxlen, int *indexp)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+	int i;</div><div class='add'>+	bool hdmi;</div><div class='add'>+</div><div class='add'>+	if (indexp)</div><div class='add'>+		*indexp = 0;</div><div class='add'>+	if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (get_defcfg_device(def_conf)) {</div><div class='add'>+	case AC_JACK_LINE_OUT:</div><div class='add'>+		return fill_audio_out_name(codec, nid, cfg, "Line Out",</div><div class='add'>+					   label, maxlen, indexp);</div><div class='add'>+	case AC_JACK_SPEAKER:</div><div class='add'>+		return fill_audio_out_name(codec, nid, cfg, "Speaker",</div><div class='add'>+					   label, maxlen, indexp);</div><div class='add'>+	case AC_JACK_HP_OUT:</div><div class='add'>+		return fill_audio_out_name(codec, nid, cfg, "Headphone",</div><div class='add'>+					   label, maxlen, indexp);</div><div class='add'>+	case AC_JACK_SPDIF_OUT:</div><div class='add'>+	case AC_JACK_DIG_OTHER_OUT:</div><div class='add'>+		hdmi = is_hdmi_cfg(def_conf);</div><div class='add'>+		name = hdmi ? "HDMI" : "SPDIF";</div><div class='add'>+		if (cfg &amp;&amp; indexp)</div><div class='add'>+			for (i = 0; i &lt; cfg-&gt;dig_outs; i++) {</div><div class='add'>+				hda_nid_t pin = cfg-&gt;dig_out_pins[i];</div><div class='add'>+				unsigned int c;</div><div class='add'>+				if (pin == nid)</div><div class='add'>+					break;</div><div class='add'>+				c = snd_hda_codec_get_pincfg(codec, pin);</div><div class='add'>+				if (hdmi == is_hdmi_cfg(c))</div><div class='add'>+					(*indexp)++;</div><div class='add'>+			}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		if (cfg) {</div><div class='add'>+			for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+				if (cfg-&gt;inputs[i].pin != nid)</div><div class='add'>+					continue;</div><div class='add'>+				name = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='add'>+				if (name)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!name)</div><div class='add'>+			name = hda_get_input_pin_label(codec, NULL, nid, true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!name)</div><div class='add'>+		return 0;</div><div class='add'>+	strscpy(label, name, maxlen);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_pin_label);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_add_verbs - Add verbs to the init list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @list: zero-terminated verb list to add</div><div class='add'>+ *</div><div class='add'>+ * Append the given verb list to the execution list.  The verbs will be</div><div class='add'>+ * performed at init and resume time via snd_hda_apply_verbs().</div><div class='add'>+ */</div><div class='add'>+int snd_hda_add_verbs(struct hda_codec *codec,</div><div class='add'>+		      const struct hda_verb *list)</div><div class='add'>+{</div><div class='add'>+	const struct hda_verb **v;</div><div class='add'>+	v = snd_array_new(&amp;codec-&gt;verbs);</div><div class='add'>+	if (!v)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*v = list;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_add_verbs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_apply_verbs - Execute the init verb lists</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ */</div><div class='add'>+void snd_hda_apply_verbs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_verb **v;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;verbs, i, v)</div><div class='add'>+		snd_hda_sequence_write(codec, *v);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_apply_verbs);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_apply_pincfgs - Set each pin config in the given list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @cfg: NULL-terminated pin config table</div><div class='add'>+ */</div><div class='add'>+void snd_hda_apply_pincfgs(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_pintbl *cfg)</div><div class='add'>+{</div><div class='add'>+	for (; cfg-&gt;nid; cfg++)</div><div class='add'>+		snd_hda_codec_set_pincfg(codec, cfg-&gt;nid, cfg-&gt;val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_apply_pincfgs);</div><div class='add'>+</div><div class='add'>+static void set_pin_targets(struct hda_codec *codec,</div><div class='add'>+			    const struct hda_pintbl *cfg)</div><div class='add'>+{</div><div class='add'>+	for (; cfg-&gt;nid; cfg++)</div><div class='add'>+		snd_hda_set_pin_ctl_cache(codec, cfg-&gt;nid, cfg-&gt;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __snd_hda_apply_fixup(struct hda_codec *codec, int id, int action, int depth)</div><div class='add'>+{</div><div class='add'>+	const char *modelname = codec-&gt;fixup_name;</div><div class='add'>+</div><div class='add'>+	while (id &gt;= 0) {</div><div class='add'>+		const struct hda_fixup *fix = codec-&gt;fixup_list + id;</div><div class='add'>+</div><div class='add'>+		if (++depth &gt; 10)</div><div class='add'>+			break;</div><div class='add'>+		if (fix-&gt;chained_before)</div><div class='add'>+			__snd_hda_apply_fixup(codec, fix-&gt;chain_id, action, depth + 1);</div><div class='add'>+</div><div class='add'>+		switch (fix-&gt;type) {</div><div class='add'>+		case HDA_FIXUP_PINS:</div><div class='add'>+			if (action != HDA_FIXUP_ACT_PRE_PROBE || !fix-&gt;v.pins)</div><div class='add'>+				break;</div><div class='add'>+			codec_dbg(codec, "%s: Apply pincfg for %s\n",</div><div class='add'>+				    codec-&gt;core.chip_name, modelname);</div><div class='add'>+			snd_hda_apply_pincfgs(codec, fix-&gt;v.pins);</div><div class='add'>+			break;</div><div class='add'>+		case HDA_FIXUP_VERBS:</div><div class='add'>+			if (action != HDA_FIXUP_ACT_PROBE || !fix-&gt;v.verbs)</div><div class='add'>+				break;</div><div class='add'>+			codec_dbg(codec, "%s: Apply fix-verbs for %s\n",</div><div class='add'>+				    codec-&gt;core.chip_name, modelname);</div><div class='add'>+			snd_hda_add_verbs(codec, fix-&gt;v.verbs);</div><div class='add'>+			break;</div><div class='add'>+		case HDA_FIXUP_FUNC:</div><div class='add'>+			if (!fix-&gt;v.func)</div><div class='add'>+				break;</div><div class='add'>+			codec_dbg(codec, "%s: Apply fix-func for %s\n",</div><div class='add'>+				    codec-&gt;core.chip_name, modelname);</div><div class='add'>+			fix-&gt;v.func(codec, fix, action);</div><div class='add'>+			break;</div><div class='add'>+		case HDA_FIXUP_PINCTLS:</div><div class='add'>+			if (action != HDA_FIXUP_ACT_PROBE || !fix-&gt;v.pins)</div><div class='add'>+				break;</div><div class='add'>+			codec_dbg(codec, "%s: Apply pinctl for %s\n",</div><div class='add'>+				    codec-&gt;core.chip_name, modelname);</div><div class='add'>+			set_pin_targets(codec, fix-&gt;v.pins);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			codec_err(codec, "%s: Invalid fixup type %d\n",</div><div class='add'>+				   codec-&gt;core.chip_name, fix-&gt;type);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!fix-&gt;chained || fix-&gt;chained_before)</div><div class='add'>+			break;</div><div class='add'>+		id = fix-&gt;chain_id;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__snd_hda_apply_fixup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_apply_fixup - Apply the fixup chain with the given action</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @action: fixup action (HDA_FIXUP_ACT_XXX)</div><div class='add'>+ */</div><div class='add'>+void snd_hda_apply_fixup(struct hda_codec *codec, int action)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;fixup_list)</div><div class='add'>+		__snd_hda_apply_fixup(codec, codec-&gt;fixup_id, action, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);</div><div class='add'>+</div><div class='add'>+#define IGNORE_SEQ_ASSOC (~(AC_DEFCFG_SEQUENCE | AC_DEFCFG_DEF_ASSOC))</div><div class='add'>+</div><div class='add'>+static bool pin_config_match(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_pintbl *pins,</div><div class='add'>+			     bool match_all_pins)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_pins, i, pin) {</div><div class='add'>+		hda_nid_t nid = pin-&gt;nid;</div><div class='add'>+		u32 cfg = pin-&gt;cfg;</div><div class='add'>+		const struct hda_pintbl *t_pins;</div><div class='add'>+		int found;</div><div class='add'>+</div><div class='add'>+		t_pins = pins;</div><div class='add'>+		found = 0;</div><div class='add'>+		for (; t_pins-&gt;nid; t_pins++) {</div><div class='add'>+			if (t_pins-&gt;nid == nid) {</div><div class='add'>+				found = 1;</div><div class='add'>+				if ((t_pins-&gt;val &amp; IGNORE_SEQ_ASSOC) == (cfg &amp; IGNORE_SEQ_ASSOC))</div><div class='add'>+					break;</div><div class='add'>+				else if ((cfg &amp; 0xf0000000) == 0x40000000 &amp;&amp; (t_pins-&gt;val &amp; 0xf0000000) == 0x40000000)</div><div class='add'>+					break;</div><div class='add'>+				else</div><div class='add'>+					return false;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (match_all_pins &amp;&amp;</div><div class='add'>+		    !found &amp;&amp; (cfg &amp; 0xf0000000) != 0x40000000)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_pick_pin_fixup - Pick up a fixup matching with the pin quirk list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @pin_quirk: zero-terminated pin quirk list</div><div class='add'>+ * @fixlist: the fixup list</div><div class='add'>+ * @match_all_pins: all valid pins must match with the table entries</div><div class='add'>+ */</div><div class='add'>+void snd_hda_pick_pin_fixup(struct hda_codec *codec,</div><div class='add'>+			    const struct snd_hda_pin_quirk *pin_quirk,</div><div class='add'>+			    const struct hda_fixup *fixlist,</div><div class='add'>+			    bool match_all_pins)</div><div class='add'>+{</div><div class='add'>+	const struct snd_hda_pin_quirk *pq;</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;fixup_id != HDA_FIXUP_ID_NOT_SET)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (pq = pin_quirk; pq-&gt;subvendor; pq++) {</div><div class='add'>+		if ((codec-&gt;core.subsystem_id &amp; 0xffff0000) != (pq-&gt;subvendor &lt;&lt; 16))</div><div class='add'>+			continue;</div><div class='add'>+		if (codec-&gt;core.vendor_id != pq-&gt;codec)</div><div class='add'>+			continue;</div><div class='add'>+		if (pin_config_match(codec, pq-&gt;pins, match_all_pins)) {</div><div class='add'>+			codec-&gt;fixup_id = pq-&gt;value;</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+			codec-&gt;fixup_name = pq-&gt;name;</div><div class='add'>+			name = pq-&gt;name;</div><div class='add'>+#endif</div><div class='add'>+			codec_info(codec, "%s: picked fixup %s (pin match)\n",</div><div class='add'>+				   codec-&gt;core.chip_name, name ? name : "");</div><div class='add'>+			codec-&gt;fixup_list = fixlist;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_pick_pin_fixup);</div><div class='add'>+</div><div class='add'>+/* check whether the given quirk entry matches with vendor/device pair */</div><div class='add'>+static bool hda_quirk_match(u16 vendor, u16 device, const struct hda_quirk *q)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;subvendor != vendor)</div><div class='add'>+		return false;</div><div class='add'>+	return !q-&gt;subdevice ||</div><div class='add'>+		(device &amp; q-&gt;subdevice_mask) == q-&gt;subdevice;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look through the quirk list and return the matching entry */</div><div class='add'>+static const struct hda_quirk *</div><div class='add'>+hda_quirk_lookup_id(u16 vendor, u16 device, const struct hda_quirk *list)</div><div class='add'>+{</div><div class='add'>+	const struct hda_quirk *q;</div><div class='add'>+</div><div class='add'>+	for (q = list; q-&gt;subvendor || q-&gt;subdevice; q++) {</div><div class='add'>+		if (hda_quirk_match(vendor, device, q))</div><div class='add'>+			return q;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_pick_fixup - Pick up a fixup matching with PCI/codec SSID or model string</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @models: NULL-terminated model string list</div><div class='add'>+ * @quirk: zero-terminated PCI/codec SSID quirk list</div><div class='add'>+ * @fixlist: the fixup list</div><div class='add'>+ *</div><div class='add'>+ * Pick up a fixup entry matching with the given model string or SSID.</div><div class='add'>+ * If a fixup was already set beforehand, the function doesn't do anything.</div><div class='add'>+ * When a special model string "nofixup" is given, also no fixup is applied.</div><div class='add'>+ *</div><div class='add'>+ * The function tries to find the matching model name at first, if given.</div><div class='add'>+ * If the model string contains the SSID alias, try to look up with the given</div><div class='add'>+ * alias ID.</div><div class='add'>+ * If nothing matched, try to look up the PCI SSID.</div><div class='add'>+ * If still nothing matched, try to look up the codec SSID.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_pick_fixup(struct hda_codec *codec,</div><div class='add'>+			const struct hda_model_fixup *models,</div><div class='add'>+			const struct hda_quirk *quirk,</div><div class='add'>+			const struct hda_fixup *fixlist)</div><div class='add'>+{</div><div class='add'>+	const struct hda_quirk *q;</div><div class='add'>+	int id = HDA_FIXUP_ID_NOT_SET;</div><div class='add'>+	const char *name = NULL;</div><div class='add'>+	const char *type = NULL;</div><div class='add'>+	unsigned int vendor, device;</div><div class='add'>+	u16 pci_vendor, pci_device;</div><div class='add'>+	u16 codec_vendor, codec_device;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;fixup_id != HDA_FIXUP_ID_NOT_SET)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* when model=nofixup is given, don't pick up any fixups */</div><div class='add'>+	if (codec-&gt;modelname &amp;&amp; !strcmp(codec-&gt;modelname, "nofixup")) {</div><div class='add'>+		id = HDA_FIXUP_ID_NO_FIXUP;</div><div class='add'>+		fixlist = NULL;</div><div class='add'>+		codec_info(codec, "%s: picked no fixup (nofixup specified)\n",</div><div class='add'>+			   codec-&gt;core.chip_name);</div><div class='add'>+		goto found;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* match with the model name string */</div><div class='add'>+	if (codec-&gt;modelname &amp;&amp; models) {</div><div class='add'>+		while (models-&gt;name) {</div><div class='add'>+			if (!strcmp(codec-&gt;modelname, models-&gt;name)) {</div><div class='add'>+				id = models-&gt;id;</div><div class='add'>+				name = models-&gt;name;</div><div class='add'>+				codec_info(codec, "%s: picked fixup %s (model specified)\n",</div><div class='add'>+					   codec-&gt;core.chip_name, name);</div><div class='add'>+				goto found;</div><div class='add'>+			}</div><div class='add'>+			models++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!quirk)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;bus-&gt;pci) {</div><div class='add'>+		pci_vendor = codec-&gt;bus-&gt;pci-&gt;subsystem_vendor;</div><div class='add'>+		pci_device = codec-&gt;bus-&gt;pci-&gt;subsystem_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec_vendor = codec-&gt;core.subsystem_id &gt;&gt; 16;</div><div class='add'>+	codec_device = codec-&gt;core.subsystem_id &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	/* match with the SSID alias given by the model string "XXXX:YYYY" */</div><div class='add'>+	if (codec-&gt;modelname &amp;&amp;</div><div class='add'>+	    sscanf(codec-&gt;modelname, "%04x:%04x", &amp;vendor, &amp;device) == 2) {</div><div class='add'>+		q = hda_quirk_lookup_id(vendor, device, quirk);</div><div class='add'>+		if (q) {</div><div class='add'>+			type = "alias SSID";</div><div class='add'>+			goto found_device;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* match primarily with the PCI SSID */</div><div class='add'>+	for (q = quirk; q-&gt;subvendor || q-&gt;subdevice; q++) {</div><div class='add'>+		/* if the entry is specific to codec SSID, check with it */</div><div class='add'>+		if (!codec-&gt;bus-&gt;pci || q-&gt;match_codec_ssid) {</div><div class='add'>+			if (hda_quirk_match(codec_vendor, codec_device, q)) {</div><div class='add'>+				type = "codec SSID";</div><div class='add'>+				goto found_device;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (hda_quirk_match(pci_vendor, pci_device, q)) {</div><div class='add'>+				type = "PCI SSID";</div><div class='add'>+				goto found_device;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* match with the codec SSID */</div><div class='add'>+	q = hda_quirk_lookup_id(codec_vendor, codec_device, quirk);</div><div class='add'>+	if (q) {</div><div class='add'>+		type = "codec SSID";</div><div class='add'>+		goto found_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return; /* no matching */</div><div class='add'>+</div><div class='add'>+ found_device:</div><div class='add'>+	id = q-&gt;value;</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+	name = q-&gt;name;</div><div class='add'>+#endif</div><div class='add'>+	codec_info(codec, "%s: picked fixup %s for %s %04x:%04x\n",</div><div class='add'>+		   codec-&gt;core.chip_name, name ? name : "",</div><div class='add'>+		   type, q-&gt;subvendor, q-&gt;subdevice);</div><div class='add'>+ found:</div><div class='add'>+	codec-&gt;fixup_id = id;</div><div class='add'>+	codec-&gt;fixup_list = fixlist;</div><div class='add'>+	codec-&gt;fixup_name = name;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_pick_fixup);</div><div class='head'>diff --git a/sound/hda/common/beep.c b/sound/hda/common/beep.c<br/>new file mode 100644<br/>index 000000000000..13a7d92e8d8d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/beep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/beep.c</a></div><div class='hunk'>@@ -0,0 +1,345 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/*</div><div class='add'>+ * Digital Beep Input Interface for HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * Author: Matt Ranostay &lt;matt.ranostay@konsulko.com&gt;</div><div class='add'>+ * Copyright (c) 2008 Embedded Alley Solutions Inc</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/input.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DIGBEEP_HZ_STEP = 46875,	/* 46.875 Hz */</div><div class='add'>+	DIGBEEP_HZ_MIN = 93750,		/* 93.750 Hz */</div><div class='add'>+	DIGBEEP_HZ_MAX = 12000000,	/* 12 KHz */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* generate or stop tone */</div><div class='add'>+static void generate_tone(struct hda_beep *beep, int tone)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = beep-&gt;codec;</div><div class='add'>+</div><div class='add'>+	if (tone &amp;&amp; !beep-&gt;playing) {</div><div class='add'>+		snd_hda_power_up(codec);</div><div class='add'>+		if (beep-&gt;power_hook)</div><div class='add'>+			beep-&gt;power_hook(beep, true);</div><div class='add'>+		beep-&gt;playing = 1;</div><div class='add'>+	}</div><div class='add'>+	if (!codec-&gt;beep_just_power_on)</div><div class='add'>+		snd_hda_codec_write(codec, beep-&gt;nid, 0,</div><div class='add'>+				    AC_VERB_SET_BEEP_CONTROL, tone);</div><div class='add'>+	if (!tone &amp;&amp; beep-&gt;playing) {</div><div class='add'>+		beep-&gt;playing = 0;</div><div class='add'>+		if (beep-&gt;power_hook)</div><div class='add'>+			beep-&gt;power_hook(beep, false);</div><div class='add'>+		snd_hda_power_down(codec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_hda_generate_beep(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep =</div><div class='add'>+		container_of(work, struct hda_beep, beep_work);</div><div class='add'>+</div><div class='add'>+	if (beep-&gt;enabled)</div><div class='add'>+		generate_tone(beep, beep-&gt;tone);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* (non-standard) Linear beep tone calculation for IDT/STAC codecs </div><div class='add'>+ *</div><div class='add'>+ * The tone frequency of beep generator on IDT/STAC codecs is</div><div class='add'>+ * defined from the 8bit tone parameter, in Hz,</div><div class='add'>+ *    freq = 48000 * (257 - tone) / 1024</div><div class='add'>+ * that is from 12kHz to 93.75Hz in steps of 46.875 Hz</div><div class='add'>+ */</div><div class='add'>+static int beep_linear_tone(struct hda_beep *beep, int hz)</div><div class='add'>+{</div><div class='add'>+	if (hz &lt;= 0)</div><div class='add'>+		return 0;</div><div class='add'>+	hz *= 1000; /* fixed point */</div><div class='add'>+	hz = hz - DIGBEEP_HZ_MIN</div><div class='add'>+		+ DIGBEEP_HZ_STEP / 2; /* round to nearest step */</div><div class='add'>+	if (hz &lt; 0)</div><div class='add'>+		hz = 0; /* turn off PC beep*/</div><div class='add'>+	else if (hz &gt;= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN))</div><div class='add'>+		hz = 1; /* max frequency */</div><div class='add'>+	else {</div><div class='add'>+		hz /= DIGBEEP_HZ_STEP;</div><div class='add'>+		hz = 255 - hz;</div><div class='add'>+	}</div><div class='add'>+	return hz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HD-audio standard beep tone parameter calculation</div><div class='add'>+ *</div><div class='add'>+ * The tone frequency in Hz is calculated as</div><div class='add'>+ *   freq = 48000 / (tone * 4)</div><div class='add'>+ * from 47Hz to 12kHz</div><div class='add'>+ */</div><div class='add'>+static int beep_standard_tone(struct hda_beep *beep, int hz)</div><div class='add'>+{</div><div class='add'>+	if (hz &lt;= 0)</div><div class='add'>+		return 0; /* disabled */</div><div class='add'>+	hz = 12000 / hz;</div><div class='add'>+	if (hz &gt; 0xff)</div><div class='add'>+		return 0xff;</div><div class='add'>+	if (hz &lt;= 0)</div><div class='add'>+		return 1;</div><div class='add'>+	return hz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,</div><div class='add'>+				unsigned int code, int hz)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep = input_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	switch (code) {</div><div class='add'>+	case SND_BELL:</div><div class='add'>+		if (hz)</div><div class='add'>+			hz = 1000;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case SND_TONE:</div><div class='add'>+		if (beep-&gt;linear_tone)</div><div class='add'>+			beep-&gt;tone = beep_linear_tone(beep, hz);</div><div class='add'>+		else</div><div class='add'>+			beep-&gt;tone = beep_standard_tone(beep, hz);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* schedule beep event */</div><div class='add'>+	schedule_work(&amp;beep-&gt;beep_work);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void turn_on_beep(struct hda_beep *beep)</div><div class='add'>+{</div><div class='add'>+	if (beep-&gt;keep_power_at_enable)</div><div class='add'>+		snd_hda_power_up_pm(beep-&gt;codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void turn_off_beep(struct hda_beep *beep)</div><div class='add'>+{</div><div class='add'>+	cancel_work_sync(&amp;beep-&gt;beep_work);</div><div class='add'>+	if (beep-&gt;playing) {</div><div class='add'>+		/* turn off beep */</div><div class='add'>+		generate_tone(beep, 0);</div><div class='add'>+	}</div><div class='add'>+	if (beep-&gt;keep_power_at_enable)</div><div class='add'>+		snd_hda_power_down_pm(beep-&gt;codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_enable_beep_device - Turn on/off beep sound</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @enable: flag to turn on/off</div><div class='add'>+ */</div><div class='add'>+int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep = codec-&gt;beep;</div><div class='add'>+	if (!beep)</div><div class='add'>+		return 0;</div><div class='add'>+	enable = !!enable;</div><div class='add'>+	if (beep-&gt;enabled != enable) {</div><div class='add'>+		beep-&gt;enabled = enable;</div><div class='add'>+		if (enable)</div><div class='add'>+			turn_on_beep(beep);</div><div class='add'>+		else</div><div class='add'>+			turn_off_beep(beep);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_enable_beep_device);</div><div class='add'>+</div><div class='add'>+static int beep_dev_register(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep = device-&gt;device_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = input_register_device(beep-&gt;dev);</div><div class='add'>+	if (!err)</div><div class='add'>+		beep-&gt;registered = true;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int beep_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	if (beep-&gt;registered)</div><div class='add'>+		input_unregister_device(beep-&gt;dev);</div><div class='add'>+	else</div><div class='add'>+		input_free_device(beep-&gt;dev);</div><div class='add'>+	if (beep-&gt;enabled)</div><div class='add'>+		turn_off_beep(beep);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int beep_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct hda_beep *beep = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	beep-&gt;codec-&gt;beep = NULL;</div><div class='add'>+	kfree(beep);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_attach_beep_device - Attach a beep input device</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: beep NID</div><div class='add'>+ *</div><div class='add'>+ * Attach a beep object to the given widget.  If beep hint is turned off</div><div class='add'>+ * explicitly or beep_mode of the codec is turned off, this doesn't nothing.</div><div class='add'>+ *</div><div class='add'>+ * Currently, only one beep device is allowed to each codec.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_register = beep_dev_register,</div><div class='add'>+		.dev_disconnect = beep_dev_disconnect,</div><div class='add'>+		.dev_free = beep_dev_free,</div><div class='add'>+	};</div><div class='add'>+	struct input_dev *input_dev;</div><div class='add'>+	struct hda_beep *beep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;beep_just_power_on) {</div><div class='add'>+		if (!snd_hda_get_bool_hint(codec, "beep"))</div><div class='add'>+			return 0; /* disabled explicitly by hints */</div><div class='add'>+		if (codec-&gt;beep_mode == HDA_BEEP_MODE_OFF)</div><div class='add'>+			return 0; /* disabled by module option */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	beep = kzalloc(sizeof(*beep), GFP_KERNEL);</div><div class='add'>+	if (beep == NULL)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	snprintf(beep-&gt;phys, sizeof(beep-&gt;phys),</div><div class='add'>+		"card%d/codec#%d/beep0", codec-&gt;card-&gt;number, codec-&gt;addr);</div><div class='add'>+	/* enable linear scale */</div><div class='add'>+	snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+		AC_VERB_SET_DIGI_CONVERT_2, 0x01);</div><div class='add'>+</div><div class='add'>+	beep-&gt;nid = nid;</div><div class='add'>+	beep-&gt;codec = codec;</div><div class='add'>+	codec-&gt;beep = beep;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;beep-&gt;beep_work, &amp;snd_hda_generate_beep);</div><div class='add'>+</div><div class='add'>+	input_dev = input_allocate_device();</div><div class='add'>+	if (!input_dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* setup digital beep device */</div><div class='add'>+	input_dev-&gt;name = "HDA Digital PCBeep";</div><div class='add'>+	input_dev-&gt;phys = beep-&gt;phys;</div><div class='add'>+	input_dev-&gt;id.bustype = BUS_PCI;</div><div class='add'>+	input_dev-&gt;dev.parent = &amp;codec-&gt;card-&gt;card_dev;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;id.vendor = codec-&gt;core.vendor_id &gt;&gt; 16;</div><div class='add'>+	input_dev-&gt;id.product = codec-&gt;core.vendor_id &amp; 0xffff;</div><div class='add'>+	input_dev-&gt;id.version = 0x01;</div><div class='add'>+</div><div class='add'>+	input_dev-&gt;evbit[0] = BIT_MASK(EV_SND);</div><div class='add'>+	input_dev-&gt;sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);</div><div class='add'>+	input_dev-&gt;event = snd_hda_beep_event;</div><div class='add'>+	input_set_drvdata(input_dev, beep);</div><div class='add'>+</div><div class='add'>+	beep-&gt;dev = input_dev;</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(codec-&gt;card, SNDRV_DEV_JACK, beep, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_input;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_input:</div><div class='add'>+	input_free_device(beep-&gt;dev);</div><div class='add'>+ err_free:</div><div class='add'>+	kfree(beep);</div><div class='add'>+	codec-&gt;beep = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_attach_beep_device);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_detach_beep_device - Detach the beep device</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ */</div><div class='add'>+void snd_hda_detach_beep_device(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (!codec-&gt;bus-&gt;shutdown &amp;&amp; codec-&gt;beep)</div><div class='add'>+		snd_device_free(codec-&gt;card, codec-&gt;beep);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_detach_beep_device);</div><div class='add'>+</div><div class='add'>+static bool ctl_has_mute(struct snd_kcontrol *kcontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	return query_amp_caps(codec, get_amp_nid(kcontrol),</div><div class='add'>+			      get_amp_direction(kcontrol)) &amp; AC_AMPCAP_MUTE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get/put callbacks for beep mute mixer switches */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_switch_get_beep - Get callback for beep controls</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_beep *beep = codec-&gt;beep;</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+</div><div class='add'>+	if (beep &amp;&amp; (!beep-&gt;enabled || !ctl_has_mute(kcontrol))) {</div><div class='add'>+		if (chs &amp; 1)</div><div class='add'>+			ucontrol-&gt;value.integer.value[0] = beep-&gt;enabled;</div><div class='add'>+		if (chs &amp; 2)</div><div class='add'>+			ucontrol-&gt;value.integer.value[1] = beep-&gt;enabled;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_switch_get_beep);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_switch_put_beep - Put callback for beep controls</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hda_beep *beep = codec-&gt;beep;</div><div class='add'>+	if (beep) {</div><div class='add'>+		u8 chs = get_amp_channels(kcontrol);</div><div class='add'>+		int enable = 0;</div><div class='add'>+		long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+		if (chs &amp; 1) {</div><div class='add'>+			enable |= *valp;</div><div class='add'>+			valp++;</div><div class='add'>+		}</div><div class='add'>+		if (chs &amp; 2)</div><div class='add'>+			enable |= *valp;</div><div class='add'>+		snd_hda_enable_beep_device(codec, enable);</div><div class='add'>+	}</div><div class='add'>+	if (!ctl_has_mute(kcontrol))</div><div class='add'>+		return 0;</div><div class='add'>+	return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_switch_put_beep);</div><div class='head'>diff --git a/sound/hda/common/bind.c b/sound/hda/common/bind.c<br/>new file mode 100644<br/>index 000000000000..bb1090b65699<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/bind.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/bind.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio codec driver binding</div><div class='add'>+ * Copyright (c) Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * find a matching codec id</div><div class='add'>+ */</div><div class='add'>+static int hda_codec_match(struct hdac_device *dev, const struct hdac_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = container_of(dev, struct hda_codec, core);</div><div class='add'>+	const struct hda_codec_driver *driver =</div><div class='add'>+		container_of(drv, struct hda_codec_driver, core);</div><div class='add'>+	const struct hda_device_id *list;</div><div class='add'>+	/* check probe_id instead of vendor_id if set */</div><div class='add'>+	u32 id = codec-&gt;probe_id ? codec-&gt;probe_id : codec-&gt;core.vendor_id;</div><div class='add'>+	u32 rev_id = codec-&gt;core.revision_id;</div><div class='add'>+</div><div class='add'>+	for (list = driver-&gt;id; list-&gt;vendor_id; list++) {</div><div class='add'>+		if (list-&gt;vendor_id == id &amp;&amp;</div><div class='add'>+		    (!list-&gt;rev_id || list-&gt;rev_id == rev_id)) {</div><div class='add'>+			codec-&gt;preset = list;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* process an unsolicited event */</div><div class='add'>+static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = container_of(dev, struct hda_codec, core);</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+</div><div class='add'>+	/* ignore unsol events during shutdown */</div><div class='add'>+	if (codec-&gt;card-&gt;shutdown || codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* ignore unsol events during system suspend/resume */</div><div class='add'>+	if (codec-&gt;core.dev.power.power_state.event != PM_EVENT_ON)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;unsol_event)</div><div class='add'>+		driver-&gt;ops-&gt;unsol_event(codec, ev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_set_name - set the codec name</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @name: name string to set</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_set_name(struct hda_codec *codec, const char *name)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return 0;</div><div class='add'>+	err = snd_hdac_device_set_chip_name(&amp;codec-&gt;core, name);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* update the mixer name */</div><div class='add'>+	if (!*codec-&gt;card-&gt;mixername ||</div><div class='add'>+	    codec-&gt;bus-&gt;mixer_assigned &gt;= codec-&gt;core.addr) {</div><div class='add'>+		snprintf(codec-&gt;card-&gt;mixername,</div><div class='add'>+			 sizeof(codec-&gt;card-&gt;mixername), "%s %s",</div><div class='add'>+			 codec-&gt;core.vendor_name, codec-&gt;core.chip_name);</div><div class='add'>+		codec-&gt;bus-&gt;mixer_assigned = codec-&gt;core.addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_set_name);</div><div class='add'>+</div><div class='add'>+static int hda_codec_driver_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+	struct module *owner = dev-&gt;driver-&gt;owner;</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;bus-&gt;core.ext_ops) {</div><div class='add'>+		if (WARN_ON(!codec-&gt;bus-&gt;core.ext_ops-&gt;hdev_attach))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return codec-&gt;bus-&gt;core.ext_ops-&gt;hdev_attach(&amp;codec-&gt;core);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!codec-&gt;preset))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_codec_set_name(codec, codec-&gt;preset-&gt;name);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_hdac_regmap_init(&amp;codec-&gt;core);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(owner)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(driver-&gt;ops &amp;&amp; driver-&gt;ops-&gt;probe))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = driver-&gt;ops-&gt;probe(codec, codec-&gt;preset);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_module_put;</div><div class='add'>+	err = snd_hda_codec_build_pcms(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_module;</div><div class='add'>+	err = snd_hda_codec_build_controls(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error_module;</div><div class='add'>+	/* only register after the bus probe finished; otherwise it's racy */</div><div class='add'>+	if (!codec-&gt;bus-&gt;bus_probing &amp;&amp; codec-&gt;card-&gt;registered) {</div><div class='add'>+		err = snd_card_register(codec-&gt;card);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error_module;</div><div class='add'>+		snd_hda_codec_register(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;core.lazy_cache = true;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error_module:</div><div class='add'>+	if (driver-&gt;ops-&gt;remove)</div><div class='add'>+		driver-&gt;ops-&gt;remove(codec);</div><div class='add'>+ error_module_put:</div><div class='add'>+	module_put(owner);</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_hda_codec_cleanup_for_unbind(codec);</div><div class='add'>+	codec-&gt;preset = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_driver_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;bus-&gt;core.ext_ops) {</div><div class='add'>+		if (WARN_ON(!codec-&gt;bus-&gt;core.ext_ops-&gt;hdev_detach))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return codec-&gt;bus-&gt;core.ext_ops-&gt;hdev_detach(&amp;codec-&gt;core);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_disconnect_pcms(codec);</div><div class='add'>+	snd_hda_jack_tbl_disconnect(codec);</div><div class='add'>+	if (!refcount_dec_and_test(&amp;codec-&gt;pcm_ref))</div><div class='add'>+		wait_event(codec-&gt;remove_sleep, !refcount_read(&amp;codec-&gt;pcm_ref));</div><div class='add'>+	snd_power_sync_ref(codec-&gt;bus-&gt;card);</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;remove)</div><div class='add'>+		driver-&gt;ops-&gt;remove(codec);</div><div class='add'>+	snd_hda_codec_cleanup_for_unbind(codec);</div><div class='add'>+	codec-&gt;preset = NULL;</div><div class='add'>+	module_put(dev-&gt;driver-&gt;owner);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_codec_driver_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_shutdown(dev_to_hda_codec(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __hda_codec_driver_register(struct hda_codec_driver *drv, const char *name,</div><div class='add'>+			       struct module *owner)</div><div class='add'>+{</div><div class='add'>+	drv-&gt;core.driver.name = name;</div><div class='add'>+	drv-&gt;core.driver.owner = owner;</div><div class='add'>+	drv-&gt;core.driver.bus = &amp;snd_hda_bus_type;</div><div class='add'>+	drv-&gt;core.driver.probe = hda_codec_driver_probe;</div><div class='add'>+	drv-&gt;core.driver.remove = hda_codec_driver_remove;</div><div class='add'>+	drv-&gt;core.driver.shutdown = hda_codec_driver_shutdown;</div><div class='add'>+	drv-&gt;core.driver.pm = pm_ptr(&amp;hda_codec_driver_pm);</div><div class='add'>+	drv-&gt;core.type = HDA_DEV_LEGACY;</div><div class='add'>+	drv-&gt;core.match = hda_codec_match;</div><div class='add'>+	drv-&gt;core.unsol_event = hda_codec_unsol_event;</div><div class='add'>+	return driver_register(&amp;drv-&gt;core.driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__hda_codec_driver_register);</div><div class='add'>+</div><div class='add'>+void hda_codec_driver_unregister(struct hda_codec_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;core.driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hda_codec_driver_unregister);</div><div class='add'>+</div><div class='add'>+static inline bool codec_probed(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	return device_attach(hda_codec_dev(codec)) &gt; 0 &amp;&amp; codec-&gt;preset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* try to auto-load codec module */</div><div class='add'>+static void request_codec_module(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+#ifdef MODULE</div><div class='add'>+	char modalias[32];</div><div class='add'>+	const char *mod = NULL;</div><div class='add'>+</div><div class='add'>+	switch (codec-&gt;probe_id) {</div><div class='add'>+	case HDA_CODEC_ID_GENERIC_HDMI:</div><div class='add'>+#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI)</div><div class='add'>+		mod = "snd-hda-codec-hdmi";</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case HDA_CODEC_ID_GENERIC:</div><div class='add'>+#if IS_MODULE(CONFIG_SND_HDA_GENERIC)</div><div class='add'>+		mod = "snd-hda-codec-generic";</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		snd_hdac_codec_modalias(&amp;codec-&gt;core, modalias, sizeof(modalias));</div><div class='add'>+		mod = modalias;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mod)</div><div class='add'>+		request_module(mod);</div><div class='add'>+#endif /* MODULE */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* try to auto-load and bind the codec module */</div><div class='add'>+static void codec_bind_module(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+#ifdef MODULE</div><div class='add'>+	request_codec_module(codec);</div><div class='add'>+	if (codec_probed(codec))</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)</div><div class='add'>+/* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */</div><div class='add'>+static bool is_likely_hdmi_codec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * For ASoC users, if snd_hda_hdmi_codec module is denylisted and any</div><div class='add'>+	 * event causes i915 enumeration to fail, -&gt;wcaps remains uninitialized.</div><div class='add'>+	 */</div><div class='add'>+	if (!codec-&gt;wcaps)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+		switch (get_wcaps_type(wcaps)) {</div><div class='add'>+		case AC_WID_AUD_IN:</div><div class='add'>+			return false; /* HDMI parser supports only HDMI out */</div><div class='add'>+		case AC_WID_AUD_OUT:</div><div class='add'>+			if (!(wcaps &amp; AC_WCAP_DIGITAL))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+/* no HDMI codec parser support */</div><div class='add'>+#define is_likely_hdmi_codec(codec)	false</div><div class='add'>+#endif /* CONFIG_SND_HDA_CODEC_HDMI */</div><div class='add'>+</div><div class='add'>+static int codec_bind_generic(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;probe_id)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (is_likely_hdmi_codec(codec)) {</div><div class='add'>+		codec-&gt;probe_id = HDA_CODEC_ID_GENERIC_HDMI;</div><div class='add'>+		request_codec_module(codec);</div><div class='add'>+		if (codec_probed(codec))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;probe_id = HDA_CODEC_ID_GENERIC;</div><div class='add'>+	request_codec_module(codec);</div><div class='add'>+	if (codec_probed(codec))</div><div class='add'>+		return 0;</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_HDA_GENERIC)</div><div class='add'>+#define is_generic_config(codec) \</div><div class='add'>+	(codec-&gt;modelname &amp;&amp; !strcmp(codec-&gt;modelname, "generic"))</div><div class='add'>+#else</div><div class='add'>+#define is_generic_config(codec)	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_configure - (Re-)configure the HD-audio codec</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Start parsing of the given codec tree and (re-)initialize the whole</div><div class='add'>+ * codec driver binding.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_configure(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;configured)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (is_generic_config(codec))</div><div class='add'>+		codec-&gt;probe_id = HDA_CODEC_ID_GENERIC;</div><div class='add'>+	else</div><div class='add'>+		codec-&gt;probe_id = 0;</div><div class='add'>+</div><div class='add'>+	if (!device_is_registered(&amp;codec-&gt;core.dev)) {</div><div class='add'>+		err = snd_hdac_device_register(&amp;codec-&gt;core);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;preset)</div><div class='add'>+		codec_bind_module(codec);</div><div class='add'>+	if (!codec-&gt;preset) {</div><div class='add'>+		err = codec_bind_generic(codec);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			codec_dbg(codec, "Unable to bind the codec\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;configured = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_configure);</div><div class='head'>diff --git a/sound/hda/common/codec.c b/sound/hda/common/codec.c<br/>new file mode 100644<br/>index 000000000000..c6d44168c7f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/codec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/codec.c</a></div><div class='hunk'>@@ -0,0 +1,4048 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Universal Interface for Intel High Definition Audio Codec</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/asoundef.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_beep.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+#include &lt;sound/hda_hwdep.h&gt;</div><div class='add'>+#include &lt;sound/hda_component.h&gt;</div><div class='add'>+</div><div class='add'>+#define codec_in_pm(codec)		snd_hdac_is_in_pm(&amp;codec-&gt;core)</div><div class='add'>+#define hda_codec_is_power_on(codec)	snd_hdac_is_power_on(&amp;codec-&gt;core)</div><div class='add'>+#define codec_has_epss(codec) \</div><div class='add'>+	((codec)-&gt;core.power_caps &amp; AC_PWRST_EPSS)</div><div class='add'>+#define codec_has_clkstop(codec) \</div><div class='add'>+	((codec)-&gt;core.power_caps &amp; AC_PWRST_CLKSTOP)</div><div class='add'>+</div><div class='add'>+static int call_exec_verb(struct hda_bus *bus, struct hda_codec *codec,</div><div class='add'>+			  unsigned int cmd, unsigned int flags,</div><div class='add'>+			  unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power_pm, pm)(codec);</div><div class='add'>+	guard(mutex)(&amp;bus-&gt;core.cmd_mutex);</div><div class='add'>+	if (flags &amp; HDA_RW_NO_RESPONSE_FALLBACK)</div><div class='add'>+		bus-&gt;no_response_fallback = 1;</div><div class='add'>+	err = snd_hdac_bus_exec_verb_unlocked(&amp;bus-&gt;core, codec-&gt;core.addr,</div><div class='add'>+					      cmd, res);</div><div class='add'>+	bus-&gt;no_response_fallback = 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send and receive a verb - passed to exec_verb override for hdac_device</div><div class='add'>+ */</div><div class='add'>+static int codec_exec_verb(struct hdac_device *dev, unsigned int cmd,</div><div class='add'>+			   unsigned int flags, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = container_of(dev, struct hda_codec, core);</div><div class='add'>+	struct hda_bus *bus = codec-&gt;bus;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cmd == ~0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+ again:</div><div class='add'>+	err = call_exec_verb(bus, codec, cmd, flags, res);</div><div class='add'>+	if (!codec_in_pm(codec) &amp;&amp; res &amp;&amp; err == -EAGAIN) {</div><div class='add'>+		if (bus-&gt;response_reset) {</div><div class='add'>+			codec_dbg(codec,</div><div class='add'>+				  "resetting BUS due to fatal communication error\n");</div><div class='add'>+			snd_hda_bus_reset(bus);</div><div class='add'>+		}</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	/* clear reset-flag when the communication gets recovered */</div><div class='add'>+	if (!err || codec_in_pm(codec))</div><div class='add'>+		bus-&gt;response_reset = 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_sequence_write - sequence writes</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @seq: VERB array to send</div><div class='add'>+ *</div><div class='add'>+ * Send the commands sequentially from the given array.</div><div class='add'>+ * The array must be terminated with NID=0.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq)</div><div class='add'>+{</div><div class='add'>+	for (; seq-&gt;nid; seq++)</div><div class='add'>+		snd_hda_codec_write(codec, seq-&gt;nid, 0, seq-&gt;verb, seq-&gt;param);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_sequence_write);</div><div class='add'>+</div><div class='add'>+/* connection list element */</div><div class='add'>+struct hda_conn_list {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	int len;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	hda_nid_t conns[] __counted_by(len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* look up the cached results */</div><div class='add'>+static struct hda_conn_list *</div><div class='add'>+lookup_conn_list(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_conn_list *p;</div><div class='add'>+	list_for_each_entry(p, &amp;codec-&gt;conn_list, list) {</div><div class='add'>+		if (p-&gt;nid == nid)</div><div class='add'>+			return p;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_conn_list(struct hda_codec *codec, hda_nid_t nid, int len,</div><div class='add'>+			 const hda_nid_t *list)</div><div class='add'>+{</div><div class='add'>+	struct hda_conn_list *p;</div><div class='add'>+</div><div class='add'>+	p = kmalloc(struct_size(p, conns, len), GFP_KERNEL);</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	p-&gt;len = len;</div><div class='add'>+	p-&gt;nid = nid;</div><div class='add'>+	memcpy(p-&gt;conns, list, len * sizeof(hda_nid_t));</div><div class='add'>+	list_add(&amp;p-&gt;list, &amp;codec-&gt;conn_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_conn_list(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	while (!list_empty(&amp;codec-&gt;conn_list)) {</div><div class='add'>+		struct hda_conn_list *p;</div><div class='add'>+		p = list_first_entry(&amp;codec-&gt;conn_list, typeof(*p), list);</div><div class='add'>+		list_del(&amp;p-&gt;list);</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read the connection and add to the cache */</div><div class='add'>+static int read_and_add_raw_conns(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t list[32];</div><div class='add'>+	hda_nid_t *result = list;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = snd_hda_get_raw_connections(codec, nid, list, ARRAY_SIZE(list));</div><div class='add'>+	if (len == -ENOSPC) {</div><div class='add'>+		len = snd_hda_get_num_raw_conns(codec, nid);</div><div class='add'>+		result = kmalloc_array(len, sizeof(hda_nid_t), GFP_KERNEL);</div><div class='add'>+		if (!result)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		len = snd_hda_get_raw_connections(codec, nid, result, len);</div><div class='add'>+	}</div><div class='add'>+	if (len &gt;= 0)</div><div class='add'>+		len = snd_hda_override_conn_list(codec, nid, len, result);</div><div class='add'>+	if (result != list)</div><div class='add'>+		kfree(result);</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_conn_list - get connection list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to parse</div><div class='add'>+ * @listp: the pointer to store NID list</div><div class='add'>+ *</div><div class='add'>+ * Parses the connection list of the given widget and stores the pointer</div><div class='add'>+ * to the list of NIDs.</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of connections, or a negative error code.</div><div class='add'>+ *</div><div class='add'>+ * Note that the returned pointer isn't protected against the list</div><div class='add'>+ * modification.  If snd_hda_override_conn_list() might be called</div><div class='add'>+ * concurrently, protect with a mutex appropriately.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_conn_list(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  const hda_nid_t **listp)</div><div class='add'>+{</div><div class='add'>+	bool added = false;</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		int err;</div><div class='add'>+		const struct hda_conn_list *p;</div><div class='add'>+</div><div class='add'>+		/* if the connection-list is already cached, read it */</div><div class='add'>+		p = lookup_conn_list(codec, nid);</div><div class='add'>+		if (p) {</div><div class='add'>+			if (listp)</div><div class='add'>+				*listp = p-&gt;conns;</div><div class='add'>+			return p-&gt;len;</div><div class='add'>+		}</div><div class='add'>+		if (snd_BUG_ON(added))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		err = read_and_add_raw_conns(codec, nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		added = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_conn_list);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_connections - copy connection list</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to parse</div><div class='add'>+ * @conn_list: connection list array; when NULL, checks only the size</div><div class='add'>+ * @max_conns: max. number of connections to store</div><div class='add'>+ *</div><div class='add'>+ * Parses the connection list of the given widget and stores the list</div><div class='add'>+ * of NIDs.</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of connections, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			    hda_nid_t *conn_list, int max_conns)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *list;</div><div class='add'>+	int len = snd_hda_get_conn_list(codec, nid, &amp;list);</div><div class='add'>+</div><div class='add'>+	if (len &gt; 0 &amp;&amp; conn_list) {</div><div class='add'>+		if (len &gt; max_conns) {</div><div class='add'>+			codec_err(codec, "Too many connections %d for NID 0x%x\n",</div><div class='add'>+				   len, nid);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		memcpy(conn_list, list, len * sizeof(hda_nid_t));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_connections);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_override_conn_list - add/modify the connection-list to cache</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to parse</div><div class='add'>+ * @len: number of connection list entries</div><div class='add'>+ * @list: the list of connection entries</div><div class='add'>+ *</div><div class='add'>+ * Add or modify the given connection-list to the cache.  If the corresponding</div><div class='add'>+ * cache already exists, invalidate it and append a new one.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int len,</div><div class='add'>+			       const hda_nid_t *list)</div><div class='add'>+{</div><div class='add'>+	struct hda_conn_list *p;</div><div class='add'>+</div><div class='add'>+	p = lookup_conn_list(codec, nid);</div><div class='add'>+	if (p) {</div><div class='add'>+		list_del(&amp;p-&gt;list);</div><div class='add'>+		kfree(p);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return add_conn_list(codec, nid, len, list);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_override_conn_list);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_conn_index - get the connection index of the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mux: NID containing the list</div><div class='add'>+ * @nid: NID to select</div><div class='add'>+ * @recursive: 1 when searching NID recursively, otherwise 0</div><div class='add'>+ *</div><div class='add'>+ * Parses the connection list of the widget @mux and checks whether the</div><div class='add'>+ * widget @nid is present.  If it is, return the connection index.</div><div class='add'>+ * Otherwise it returns -1.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,</div><div class='add'>+			   hda_nid_t nid, int recursive)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *conn;</div><div class='add'>+	int i, nums;</div><div class='add'>+</div><div class='add'>+	nums = snd_hda_get_conn_list(codec, mux, &amp;conn);</div><div class='add'>+	for (i = 0; i &lt; nums; i++)</div><div class='add'>+		if (conn[i] == nid)</div><div class='add'>+			return i;</div><div class='add'>+	if (!recursive)</div><div class='add'>+		return -1;</div><div class='add'>+	if (recursive &gt; 10) {</div><div class='add'>+		codec_dbg(codec, "too deep connection for 0x%x\n", nid);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	recursive++;</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		unsigned int type = get_wcaps_type(get_wcaps(codec, conn[i]));</div><div class='add'>+		if (type == AC_WID_PIN || type == AC_WID_AUD_OUT)</div><div class='add'>+			continue;</div><div class='add'>+		if (snd_hda_get_conn_index(codec, conn[i], nid, recursive) &gt;= 0)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_conn_index);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_num_devices - get DEVLIST_LEN parameter of the given widget</div><div class='add'>+ *  @codec: the HDA codec</div><div class='add'>+ *  @nid: NID of the pin to parse</div><div class='add'>+ *</div><div class='add'>+ * Get the device entry number on the given widget. This is a feature of</div><div class='add'>+ * DP MST audio. Each pin can have several device entries in it.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_get_num_devices(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+	int parm;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;dp_mst || !(wcaps &amp; AC_WCAP_DIGITAL) ||</div><div class='add'>+	    get_wcaps_type(wcaps) != AC_WID_PIN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parm = snd_hdac_read_parm_uncached(&amp;codec-&gt;core, nid, AC_PAR_DEVLIST_LEN);</div><div class='add'>+	if (parm == -1)</div><div class='add'>+		parm = 0;</div><div class='add'>+	return parm &amp; AC_DEV_LIST_LEN_MASK;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_num_devices);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_devices - copy device list without cache</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID of the pin to parse</div><div class='add'>+ * @dev_list: device list array</div><div class='add'>+ * @max_devices: max. number of devices to store</div><div class='add'>+ *</div><div class='add'>+ * Copy the device list. This info is dynamic and so not cached.</div><div class='add'>+ * Currently called only from hda_proc.c, so not exported.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				u8 *dev_list, unsigned int max_devices)</div><div class='add'>+{</div><div class='add'>+	unsigned int parm, i, dev_len, devices;</div><div class='add'>+</div><div class='add'>+	parm = snd_hda_get_num_devices(codec, nid);</div><div class='add'>+	if (!parm)	/* not multi-stream capable */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_len = min(parm + 1, max_devices);</div><div class='add'>+</div><div class='add'>+	devices = 0;</div><div class='add'>+	while (devices &lt; dev_len) {</div><div class='add'>+		if (snd_hdac_read(&amp;codec-&gt;core, nid,</div><div class='add'>+				  AC_VERB_GET_DEVICE_LIST, devices, &amp;parm))</div><div class='add'>+			break; /* error */</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			dev_list[devices] = (u8)parm;</div><div class='add'>+			parm &gt;&gt;= 4;</div><div class='add'>+			devices++;</div><div class='add'>+			if (devices &gt;= dev_len)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return devices;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_dev_select - get device entry select on the pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID of the pin to get device entry select</div><div class='add'>+ *</div><div class='add'>+ * Get the devcie entry select on the pin. Return the device entry</div><div class='add'>+ * id selected on the pin. Return 0 means the first device entry</div><div class='add'>+ * is selected or MST is not supported.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_dev_select(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	/* not support dp_mst will always return 0, using first dev_entry */</div><div class='add'>+	if (!codec-&gt;dp_mst)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DEVICE_SEL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_dev_select);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_set_dev_select - set device entry select on the pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID of the pin to set device entry select</div><div class='add'>+ * @dev_id: device entry id to be set</div><div class='add'>+ *</div><div class='add'>+ * Set the device entry select on the pin nid.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_set_dev_select(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	int ret, num_devices;</div><div class='add'>+</div><div class='add'>+	/* not support dp_mst will always return 0, using first dev_entry */</div><div class='add'>+	if (!codec-&gt;dp_mst)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* AC_PAR_DEVLIST_LEN is 0 based. */</div><div class='add'>+	num_devices = snd_hda_get_num_devices(codec, nid) + 1;</div><div class='add'>+	/* If Device List Length is 0 (num_device = 1),</div><div class='add'>+	 * the pin is not multi stream capable.</div><div class='add'>+	 * Do nothing in this case.</div><div class='add'>+	 */</div><div class='add'>+	if (num_devices == 1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Behavior of setting index being equal to or greater than</div><div class='add'>+	 * Device List Length is not predictable</div><div class='add'>+	 */</div><div class='add'>+	if (num_devices &lt;= dev_id)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+			AC_VERB_SET_DEVICE_SEL, dev_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_set_dev_select);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * read widget caps for each widget and store in cache</div><div class='add'>+ */</div><div class='add'>+static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	codec-&gt;wcaps = kmalloc_array(codec-&gt;core.num_nodes, 4, GFP_KERNEL);</div><div class='add'>+	if (!codec-&gt;wcaps)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	nid = codec-&gt;core.start_nid;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;core.num_nodes; i++, nid++)</div><div class='add'>+		codec-&gt;wcaps[i] = snd_hdac_read_parm_uncached(&amp;codec-&gt;core,</div><div class='add'>+					nid, AC_PAR_AUDIO_WIDGET_CAP);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read all pin default configurations and save codec-&gt;init_pins */</div><div class='add'>+static int read_pin_defaults(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		struct hda_pincfg *pin;</div><div class='add'>+		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+		unsigned int wid_type = get_wcaps_type(wcaps);</div><div class='add'>+		if (wid_type != AC_WID_PIN)</div><div class='add'>+			continue;</div><div class='add'>+		pin = snd_array_new(&amp;codec-&gt;init_pins);</div><div class='add'>+		if (!pin)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pin-&gt;nid = nid;</div><div class='add'>+		pin-&gt;cfg = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					      AC_VERB_GET_CONFIG_DEFAULT, 0);</div><div class='add'>+		/*</div><div class='add'>+		 * all device entries are the same widget control so far</div><div class='add'>+		 * fixme: if any codec is different, need fix here</div><div class='add'>+		 */</div><div class='add'>+		pin-&gt;ctrl = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					       AC_VERB_GET_PIN_WIDGET_CONTROL,</div><div class='add'>+					       0);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* look up the given pin config list and return the item matching with NID */</div><div class='add'>+static struct hda_pincfg *look_up_pincfg(struct hda_codec *codec,</div><div class='add'>+					 struct snd_array *array,</div><div class='add'>+					 hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_pincfg *pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(array, i, pin) {</div><div class='add'>+		if (pin-&gt;nid == nid)</div><div class='add'>+			return pin;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set the current pin config value for the given NID.</div><div class='add'>+ * the value is cached, and read via snd_hda_codec_get_pincfg()</div><div class='add'>+ */</div><div class='add'>+int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,</div><div class='add'>+		       hda_nid_t nid, unsigned int cfg)</div><div class='add'>+{</div><div class='add'>+	struct hda_pincfg *pin;</div><div class='add'>+</div><div class='add'>+	pin = look_up_pincfg(codec, list, nid);</div><div class='add'>+	if (!pin) {</div><div class='add'>+		pin = snd_array_new(list);</div><div class='add'>+		if (!pin)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pin-&gt;nid = nid;</div><div class='add'>+	}</div><div class='add'>+	pin-&gt;cfg = cfg;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_set_pincfg - Override a pin default configuration</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to set the pin config</div><div class='add'>+ * @cfg: the pin default config value</div><div class='add'>+ *</div><div class='add'>+ * Override a pin default configuration value in the cache.</div><div class='add'>+ * This value can be read by snd_hda_codec_get_pincfg() in a higher</div><div class='add'>+ * priority than the real hardware value.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_set_pincfg(struct hda_codec *codec,</div><div class='add'>+			     hda_nid_t nid, unsigned int cfg)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_add_pincfg(codec, &amp;codec-&gt;driver_pins, nid, cfg);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_set_pincfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_get_pincfg - Obtain a pin-default configuration</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to get the pin config</div><div class='add'>+ *</div><div class='add'>+ * Get the current pin config value of the given pin NID.</div><div class='add'>+ * If the pincfg value is cached or overridden via sysfs or driver,</div><div class='add'>+ * returns the cached value.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_pincfg *pin;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+	{</div><div class='add'>+		unsigned int cfg = 0;</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;user_mutex) {</div><div class='add'>+			pin = look_up_pincfg(codec, &amp;codec-&gt;user_pins, nid);</div><div class='add'>+			if (pin)</div><div class='add'>+				cfg = pin-&gt;cfg;</div><div class='add'>+		}</div><div class='add'>+		if (cfg)</div><div class='add'>+			return cfg;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	pin = look_up_pincfg(codec, &amp;codec-&gt;driver_pins, nid);</div><div class='add'>+	if (pin)</div><div class='add'>+		return pin-&gt;cfg;</div><div class='add'>+	pin = look_up_pincfg(codec, &amp;codec-&gt;init_pins, nid);</div><div class='add'>+	if (pin)</div><div class='add'>+		return pin-&gt;cfg;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_get_pincfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_set_pin_target - remember the current pinctl target value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID</div><div class='add'>+ * @val: assigned pinctl value</div><div class='add'>+ *</div><div class='add'>+ * This function stores the given value to a pinctl target value in the</div><div class='add'>+ * pincfg table.  This isn't always as same as the actually written value</div><div class='add'>+ * but can be referred at any time via snd_hda_codec_get_pin_target().</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_set_pin_target(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				 unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct hda_pincfg *pin;</div><div class='add'>+</div><div class='add'>+	pin = look_up_pincfg(codec, &amp;codec-&gt;init_pins, nid);</div><div class='add'>+	if (!pin)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pin-&gt;target = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_set_pin_target);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_get_pin_target - return the current pinctl target value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_get_pin_target(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_pincfg *pin;</div><div class='add'>+</div><div class='add'>+	pin = look_up_pincfg(codec, &amp;codec-&gt;init_pins, nid);</div><div class='add'>+	if (!pin)</div><div class='add'>+		return 0;</div><div class='add'>+	return pin-&gt;target;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_get_pin_target);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_shutup_pins - Shut up all pins</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Clear all pin controls to shup up before suspend for avoiding click noise.</div><div class='add'>+ * The controls aren't cached so that they can be resumed properly.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_shutup_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* don't shut up pins when unloading the driver; otherwise it breaks</div><div class='add'>+	 * the default pin setup at the next load of the driver</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_pins, i, pin) {</div><div class='add'>+		/* use read here for syncing after issuing each verb */</div><div class='add'>+		snd_hda_codec_read(codec, pin-&gt;nid, 0,</div><div class='add'>+				   AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;pins_shutup = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_shutup_pins);</div><div class='add'>+</div><div class='add'>+/* Restore the pin controls cleared previously via snd_hda_shutup_pins() */</div><div class='add'>+static void restore_shutup_pins(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;pins_shutup)</div><div class='add'>+		return;</div><div class='add'>+	if (codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_pins, i, pin) {</div><div class='add'>+		snd_hda_codec_write(codec, pin-&gt;nid, 0,</div><div class='add'>+				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='add'>+				    pin-&gt;ctrl);</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;pins_shutup = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_jackpoll_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec =</div><div class='add'>+		container_of(work, struct hda_codec, jackpoll_work.work);</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;jackpoll_interval)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* the power-up/down sequence triggers the runtime resume */</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+	/* update jacks manually if polling is required, too */</div><div class='add'>+	snd_hda_jack_set_dirty_all(codec);</div><div class='add'>+	snd_hda_jack_poll_all(codec);</div><div class='add'>+	schedule_delayed_work(&amp;codec-&gt;jackpoll_work, codec-&gt;jackpoll_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* release all pincfg lists */</div><div class='add'>+static void free_init_pincfgs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	snd_array_free(&amp;codec-&gt;driver_pins);</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+	snd_array_free(&amp;codec-&gt;user_pins);</div><div class='add'>+#endif</div><div class='add'>+	snd_array_free(&amp;codec-&gt;init_pins);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * audio-converter setup caches</div><div class='add'>+ */</div><div class='add'>+struct hda_cvt_setup {</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	u8 stream_tag;</div><div class='add'>+	u8 channel_id;</div><div class='add'>+	u16 format_id;</div><div class='add'>+	unsigned char active;	/* cvt is currently used */</div><div class='add'>+	unsigned char dirty;	/* setups should be cleared */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* get or create a cache entry for the given audio converter NID */</div><div class='add'>+static struct hda_cvt_setup *</div><div class='add'>+get_hda_cvt_setup(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_cvt_setup *p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;cvt_setups, i, p) {</div><div class='add'>+		if (p-&gt;nid == nid)</div><div class='add'>+			return p;</div><div class='add'>+	}</div><div class='add'>+	p = snd_array_new(&amp;codec-&gt;cvt_setups);</div><div class='add'>+	if (p)</div><div class='add'>+		p-&gt;nid = nid;</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM device</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_pcm_put(struct hda_pcm *pcm)</div><div class='add'>+{</div><div class='add'>+	if (refcount_dec_and_test(&amp;pcm-&gt;codec-&gt;pcm_ref))</div><div class='add'>+		wake_up(&amp;pcm-&gt;codec-&gt;remove_sleep);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_pcm_put);</div><div class='add'>+</div><div class='add'>+struct hda_pcm *snd_hda_codec_pcm_new(struct hda_codec *codec,</div><div class='add'>+				      const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+	va_list args;</div><div class='add'>+</div><div class='add'>+	pcm = kzalloc(sizeof(*pcm), GFP_KERNEL);</div><div class='add'>+	if (!pcm)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;codec = codec;</div><div class='add'>+	va_start(args, fmt);</div><div class='add'>+	pcm-&gt;name = kvasprintf(GFP_KERNEL, fmt, args);</div><div class='add'>+	va_end(args);</div><div class='add'>+	if (!pcm-&gt;name) {</div><div class='add'>+		kfree(pcm);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;pcm-&gt;list, &amp;codec-&gt;pcm_list_head);</div><div class='add'>+	refcount_inc(&amp;codec-&gt;pcm_ref);</div><div class='add'>+	return pcm;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_pcm_new);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * codec destructor</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_disconnect_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(pcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		if (pcm-&gt;disconnected)</div><div class='add'>+			continue;</div><div class='add'>+		if (pcm-&gt;pcm)</div><div class='add'>+			snd_device_disconnect(codec-&gt;card, pcm-&gt;pcm);</div><div class='add'>+		snd_hda_codec_pcm_put(pcm);</div><div class='add'>+		pcm-&gt;disconnected = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void codec_release_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm *pcm, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(pcm, n, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		list_del(&amp;pcm-&gt;list);</div><div class='add'>+		if (pcm-&gt;pcm)</div><div class='add'>+			snd_device_free(pcm-&gt;codec-&gt;card, pcm-&gt;pcm);</div><div class='add'>+		clear_bit(pcm-&gt;device, pcm-&gt;codec-&gt;bus-&gt;pcm_dev_bits);</div><div class='add'>+		kfree(pcm-&gt;name);</div><div class='add'>+		kfree(pcm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_cleanup_for_unbind - Prepare codec for removal</div><div class='add'>+ * @codec: codec device to cleanup</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;core.registered) {</div><div class='add'>+		/* pm_runtime_put() is called in snd_hdac_device_exit() */</div><div class='add'>+		pm_runtime_get_noresume(hda_codec_dev(codec));</div><div class='add'>+		pm_runtime_disable(hda_codec_dev(codec));</div><div class='add'>+		codec-&gt;core.registered = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_disconnect_pcms(codec);</div><div class='add'>+	cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+	if (!codec-&gt;in_freeing)</div><div class='add'>+		snd_hda_ctls_clear(codec);</div><div class='add'>+	codec_release_pcms(codec);</div><div class='add'>+	snd_hda_detach_beep_device(codec);</div><div class='add'>+	snd_hda_jack_tbl_clear(codec);</div><div class='add'>+	codec-&gt;proc_widget_hook = NULL;</div><div class='add'>+	codec-&gt;spec = NULL;</div><div class='add'>+</div><div class='add'>+	/* free only driver_pins so that init_pins + user_pins are restored */</div><div class='add'>+	snd_array_free(&amp;codec-&gt;driver_pins);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;cvt_setups);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;spdif_out);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;verbs);</div><div class='add'>+	codec-&gt;follower_dig_outs = NULL;</div><div class='add'>+	codec-&gt;spdif_status_reset = 0;</div><div class='add'>+	snd_array_free(&amp;codec-&gt;mixers);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;nids);</div><div class='add'>+	remove_conn_list(codec);</div><div class='add'>+	snd_hdac_regmap_exit(&amp;codec-&gt;core);</div><div class='add'>+	codec-&gt;configured = 0;</div><div class='add'>+	refcount_set(&amp;codec-&gt;pcm_ref, 1); /* reset refcount */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup_for_unbind);</div><div class='add'>+</div><div class='add'>+static unsigned int hda_set_power_state(struct hda_codec *codec,</div><div class='add'>+				unsigned int power_state);</div><div class='add'>+</div><div class='add'>+/* enable/disable display power per codec */</div><div class='add'>+void snd_hda_codec_display_power(struct hda_codec *codec, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;display_power_control)</div><div class='add'>+		snd_hdac_display_power(&amp;codec-&gt;bus-&gt;core, codec-&gt;addr, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_register - Finalize codec initialization</div><div class='add'>+ * @codec: codec device to register</div><div class='add'>+ *</div><div class='add'>+ * Also called from hda_bind.c</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_register(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;core.registered)</div><div class='add'>+		return;</div><div class='add'>+	if (device_is_registered(hda_codec_dev(codec))) {</div><div class='add'>+		snd_hda_codec_display_power(codec, true);</div><div class='add'>+		pm_runtime_enable(hda_codec_dev(codec));</div><div class='add'>+		/* it was powered up in snd_hda_codec_new(), now all done */</div><div class='add'>+		snd_hda_power_down(codec);</div><div class='add'>+		codec-&gt;core.registered = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_register);</div><div class='add'>+</div><div class='add'>+static int snd_hda_codec_dev_register(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_register(device-&gt;device_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_unregister - Unregister specified codec device</div><div class='add'>+ * @codec: codec device to unregister</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_unregister(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	codec-&gt;in_freeing = 1;</div><div class='add'>+	/*</div><div class='add'>+	 * snd_hda_codec_device_new() is used by legacy HDA and ASoC driver.</div><div class='add'>+	 * We can't unregister ASoC device since it will be unregistered in</div><div class='add'>+	 * snd_hdac_ext_bus_device_remove().</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;core.type == HDA_DEV_LEGACY)</div><div class='add'>+		snd_hdac_device_unregister(&amp;codec-&gt;core);</div><div class='add'>+	snd_hda_codec_display_power(codec, false);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * In the case of ASoC HD-audio bus, the device refcount is released in</div><div class='add'>+	 * snd_hdac_ext_bus_device_remove() explicitly.</div><div class='add'>+	 */</div><div class='add'>+	if (codec-&gt;core.type == HDA_DEV_LEGACY)</div><div class='add'>+		put_device(hda_codec_dev(codec));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_unregister);</div><div class='add'>+</div><div class='add'>+static int snd_hda_codec_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_unregister(device-&gt;device_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_hda_codec_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	free_init_pincfgs(codec);</div><div class='add'>+	snd_hdac_device_exit(&amp;codec-&gt;core);</div><div class='add'>+	snd_hda_sysfs_clear(codec);</div><div class='add'>+	kfree(codec-&gt;modelname);</div><div class='add'>+	kfree(codec-&gt;wcaps);</div><div class='add'>+	kfree(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEV_NAME_LEN 31</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_device_init - allocate HDA codec device</div><div class='add'>+ * @bus: codec's parent bus</div><div class='add'>+ * @codec_addr: the codec address on the parent bus</div><div class='add'>+ * @fmt: format string for the device's name</div><div class='add'>+ *</div><div class='add'>+ * Returns newly allocated codec device or ERR_PTR() on failure.</div><div class='add'>+ */</div><div class='add'>+struct hda_codec *</div><div class='add'>+snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr,</div><div class='add'>+			  const char *fmt, ...)</div><div class='add'>+{</div><div class='add'>+	va_list vargs;</div><div class='add'>+	char name[DEV_NAME_LEN];</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!bus))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+	if (snd_BUG_ON(codec_addr &gt; HDA_MAX_CODEC_ADDRESS))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	codec = kzalloc(sizeof(*codec), GFP_KERNEL);</div><div class='add'>+	if (!codec)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	va_start(vargs, fmt);</div><div class='add'>+	vsprintf(name, fmt, vargs);</div><div class='add'>+	va_end(vargs);</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_device_init(&amp;codec-&gt;core, &amp;bus-&gt;core, name, codec_addr);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(codec);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;bus = bus;</div><div class='add'>+	codec-&gt;depop_delay = -1;</div><div class='add'>+	codec-&gt;fixup_id = HDA_FIXUP_ID_NOT_SET;</div><div class='add'>+	codec-&gt;core.dev.release = snd_hda_codec_dev_release;</div><div class='add'>+	codec-&gt;core.type = HDA_DEV_LEGACY;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	mutex_init(&amp;codec-&gt;control_mutex);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;mixers, sizeof(struct hda_nid_item), 32);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;nids, sizeof(struct hda_nid_item), 32);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;init_pins, sizeof(struct hda_pincfg), 16);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;driver_pins, sizeof(struct hda_pincfg), 16);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;cvt_setups, sizeof(struct hda_cvt_setup), 8);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;spdif_out, sizeof(struct hda_spdif_out), 16);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;jacktbl, sizeof(struct hda_jack_tbl), 16);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;verbs, sizeof(struct hda_verb *), 8);</div><div class='add'>+	INIT_LIST_HEAD(&amp;codec-&gt;conn_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;codec-&gt;pcm_list_head);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;codec-&gt;jackpoll_work, hda_jackpoll_work);</div><div class='add'>+	refcount_set(&amp;codec-&gt;pcm_ref, 1);</div><div class='add'>+	init_waitqueue_head(&amp;codec-&gt;remove_sleep);</div><div class='add'>+</div><div class='add'>+	return codec;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_device_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_new - create a HDA codec</div><div class='add'>+ * @bus: the bus to assign</div><div class='add'>+ * @card: card for this codec</div><div class='add'>+ * @codec_addr: the codec address</div><div class='add'>+ * @codecp: the pointer to store the generated codec</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,</div><div class='add'>+		      unsigned int codec_addr, struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	codec = snd_hda_codec_device_init(bus, codec_addr, "hdaudioC%dD%d",</div><div class='add'>+					  card-&gt;number, codec_addr);</div><div class='add'>+	if (IS_ERR(codec))</div><div class='add'>+		return PTR_ERR(codec);</div><div class='add'>+	*codecp = codec;</div><div class='add'>+</div><div class='add'>+	ret = snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		put_device(hda_codec_dev(*codecp));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_new);</div><div class='add'>+</div><div class='add'>+int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,</div><div class='add'>+			unsigned int codec_addr, struct hda_codec *codec,</div><div class='add'>+			bool snddev_managed)</div><div class='add'>+{</div><div class='add'>+	char component[31];</div><div class='add'>+	hda_nid_t fg;</div><div class='add'>+	int err;</div><div class='add'>+	static const struct snd_device_ops dev_ops = {</div><div class='add'>+		.dev_register = snd_hda_codec_dev_register,</div><div class='add'>+		.dev_free = snd_hda_codec_dev_free,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	dev_dbg(card-&gt;dev, "%s: entry\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!bus))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (snd_BUG_ON(codec_addr &gt; HDA_MAX_CODEC_ADDRESS))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	codec-&gt;core.exec_verb = codec_exec_verb;</div><div class='add'>+	codec-&gt;card = card;</div><div class='add'>+	codec-&gt;addr = codec_addr;</div><div class='add'>+</div><div class='add'>+	codec-&gt;power_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	snd_hda_sysfs_init(codec);</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;bus-&gt;modelname) {</div><div class='add'>+		codec-&gt;modelname = kstrdup(codec-&gt;bus-&gt;modelname, GFP_KERNEL);</div><div class='add'>+		if (!codec-&gt;modelname)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fg = codec-&gt;core.afg ? codec-&gt;core.afg : codec-&gt;core.mfg;</div><div class='add'>+	err = read_widget_caps(codec, fg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = read_pin_defaults(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* power-up all before initialization */</div><div class='add'>+	hda_set_power_state(codec, AC_PWRST_D0);</div><div class='add'>+	codec-&gt;core.dev.power.power_state = PMSG_ON;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_proc_new(codec);</div><div class='add'>+</div><div class='add'>+	snd_hda_create_hwdep(codec);</div><div class='add'>+</div><div class='add'>+	sprintf(component, "HDA:%08x,%08x,%08x", codec-&gt;core.vendor_id,</div><div class='add'>+		codec-&gt;core.subsystem_id, codec-&gt;core.revision_id);</div><div class='add'>+	snd_component_add(card, component);</div><div class='add'>+</div><div class='add'>+	if (snddev_managed) {</div><div class='add'>+		/* ASoC features component management instead */</div><div class='add'>+		err = snd_device_new(card, SNDRV_DEV_CODEC, codec, &amp;dev_ops);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	/* PM runtime needs to be enabled later after binding codec */</div><div class='add'>+	if (codec-&gt;core.dev.power.runtime_auto)</div><div class='add'>+		pm_runtime_forbid(&amp;codec-&gt;core.dev);</div><div class='add'>+	else</div><div class='add'>+		/* Keep the usage_count consistent across subsequent probing */</div><div class='add'>+		pm_runtime_get_noresume(&amp;codec-&gt;core.dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_device_new);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_update_widgets - Refresh widget caps and pin defaults</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Forcibly refresh the all widget caps and the init pin configurations of</div><div class='add'>+ * the given codec.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_update_widgets(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t fg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_refresh_widgets(&amp;codec-&gt;core);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Assume the function group node does not change,</div><div class='add'>+	 * only the widget nodes may change.</div><div class='add'>+	 */</div><div class='add'>+	kfree(codec-&gt;wcaps);</div><div class='add'>+	fg = codec-&gt;core.afg ? codec-&gt;core.afg : codec-&gt;core.mfg;</div><div class='add'>+	err = read_widget_caps(codec, fg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_array_free(&amp;codec-&gt;init_pins);</div><div class='add'>+	err = read_pin_defaults(codec);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_update_widgets);</div><div class='add'>+</div><div class='add'>+/* update the stream-id if changed */</div><div class='add'>+static void update_pcm_stream_id(struct hda_codec *codec,</div><div class='add'>+				 struct hda_cvt_setup *p, hda_nid_t nid,</div><div class='add'>+				 u32 stream_tag, int channel_id)</div><div class='add'>+{</div><div class='add'>+	unsigned int oldval, newval;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;stream_tag != stream_tag || p-&gt;channel_id != channel_id) {</div><div class='add'>+		oldval = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);</div><div class='add'>+		newval = (stream_tag &lt;&lt; 4) | channel_id;</div><div class='add'>+		if (oldval != newval)</div><div class='add'>+			snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_CHANNEL_STREAMID,</div><div class='add'>+					    newval);</div><div class='add'>+		p-&gt;stream_tag = stream_tag;</div><div class='add'>+		p-&gt;channel_id = channel_id;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* update the format-id if changed */</div><div class='add'>+static void update_pcm_format(struct hda_codec *codec, struct hda_cvt_setup *p,</div><div class='add'>+			      hda_nid_t nid, int format)</div><div class='add'>+{</div><div class='add'>+	unsigned int oldval;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;format_id != format) {</div><div class='add'>+		oldval = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					    AC_VERB_GET_STREAM_FORMAT, 0);</div><div class='add'>+		if (oldval != format) {</div><div class='add'>+			msleep(1);</div><div class='add'>+			snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_STREAM_FORMAT,</div><div class='add'>+					    format);</div><div class='add'>+		}</div><div class='add'>+		p-&gt;format_id = format;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_setup_stream - set up the codec for streaming</div><div class='add'>+ * @codec: the CODEC to set up</div><div class='add'>+ * @nid: the NID to set up</div><div class='add'>+ * @stream_tag: stream tag to pass, it's between 0x1 and 0xf.</div><div class='add'>+ * @channel_id: channel id to pass, zero based.</div><div class='add'>+ * @format: stream format.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				u32 stream_tag,</div><div class='add'>+				int channel_id, int format)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	struct hda_codec *c;</div><div class='add'>+	struct hda_cvt_setup *p;</div><div class='add'>+	int type;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec,</div><div class='add'>+		  "hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",</div><div class='add'>+		  nid, stream_tag, channel_id, format);</div><div class='add'>+	p = get_hda_cvt_setup(codec, nid);</div><div class='add'>+	if (!p)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;stream_pm)</div><div class='add'>+		driver-&gt;ops-&gt;stream_pm(codec, nid, true);</div><div class='add'>+	if (codec-&gt;pcm_format_first)</div><div class='add'>+		update_pcm_format(codec, p, nid, format);</div><div class='add'>+	update_pcm_stream_id(codec, p, nid, stream_tag, channel_id);</div><div class='add'>+	if (!codec-&gt;pcm_format_first)</div><div class='add'>+		update_pcm_format(codec, p, nid, format);</div><div class='add'>+</div><div class='add'>+	p-&gt;active = 1;</div><div class='add'>+	p-&gt;dirty = 0;</div><div class='add'>+</div><div class='add'>+	/* make other inactive cvts with the same stream-tag dirty */</div><div class='add'>+	type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='add'>+	list_for_each_codec(c, codec-&gt;bus) {</div><div class='add'>+		snd_array_for_each(&amp;c-&gt;cvt_setups, i, p) {</div><div class='add'>+			if (!p-&gt;active &amp;&amp; p-&gt;stream_tag == stream_tag &amp;&amp;</div><div class='add'>+			    get_wcaps_type(get_wcaps(c, p-&gt;nid)) == type)</div><div class='add'>+				p-&gt;dirty = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_setup_stream);</div><div class='add'>+</div><div class='add'>+static void really_cleanup_stream(struct hda_codec *codec,</div><div class='add'>+				  struct hda_cvt_setup *q);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __snd_hda_codec_cleanup_stream - clean up the codec for closing</div><div class='add'>+ * @codec: the CODEC to clean up</div><div class='add'>+ * @nid: the NID to clean up</div><div class='add'>+ * @do_now: really clean up the stream instead of clearing the active flag</div><div class='add'>+ */</div><div class='add'>+void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				    int do_now)</div><div class='add'>+{</div><div class='add'>+	struct hda_cvt_setup *p;</div><div class='add'>+</div><div class='add'>+	if (!nid)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;no_sticky_stream)</div><div class='add'>+		do_now = 1;</div><div class='add'>+</div><div class='add'>+	codec_dbg(codec, "hda_codec_cleanup_stream: NID=0x%x\n", nid);</div><div class='add'>+	p = get_hda_cvt_setup(codec, nid);</div><div class='add'>+	if (p) {</div><div class='add'>+		/* here we just clear the active flag when do_now isn't set;</div><div class='add'>+		 * actual clean-ups will be done later in</div><div class='add'>+		 * purify_inactive_streams() called from snd_hda_codec_prpapre()</div><div class='add'>+		 */</div><div class='add'>+		if (do_now)</div><div class='add'>+			really_cleanup_stream(codec, p);</div><div class='add'>+		else</div><div class='add'>+			p-&gt;active = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__snd_hda_codec_cleanup_stream);</div><div class='add'>+</div><div class='add'>+static void really_cleanup_stream(struct hda_codec *codec,</div><div class='add'>+				  struct hda_cvt_setup *q)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	hda_nid_t nid = q-&gt;nid;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;stream_tag || q-&gt;channel_id)</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='add'>+	if (q-&gt;format_id)</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0</div><div class='add'>+);</div><div class='add'>+	memset(q, 0, sizeof(*q));</div><div class='add'>+	q-&gt;nid = nid;</div><div class='add'>+	if (driver-&gt;ops-&gt;stream_pm)</div><div class='add'>+		driver-&gt;ops-&gt;stream_pm(codec, nid, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clean up the all conflicting obsolete streams */</div><div class='add'>+static void purify_inactive_streams(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *c;</div><div class='add'>+	struct hda_cvt_setup *p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	list_for_each_codec(c, codec-&gt;bus) {</div><div class='add'>+		snd_array_for_each(&amp;c-&gt;cvt_setups, i, p) {</div><div class='add'>+			if (p-&gt;dirty)</div><div class='add'>+				really_cleanup_stream(c, p);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clean up all streams; called from suspend */</div><div class='add'>+static void hda_cleanup_all_streams(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_cvt_setup *p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;cvt_setups, i, p) {</div><div class='add'>+		if (p-&gt;stream_tag)</div><div class='add'>+			really_cleanup_stream(codec, p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * amp access functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * query_amp_caps - query AMP capabilities</div><div class='add'>+ * @codec: the HD-auio codec</div><div class='add'>+ * @nid: the NID to query</div><div class='add'>+ * @direction: either #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ *</div><div class='add'>+ * Query AMP capabilities for the given widget and direction.</div><div class='add'>+ * Returns the obtained capability bits.</div><div class='add'>+ *</div><div class='add'>+ * When cap bits have been already read, this doesn't read again but</div><div class='add'>+ * returns the cached value.</div><div class='add'>+ */</div><div class='add'>+u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)</div><div class='add'>+{</div><div class='add'>+	if (!(get_wcaps(codec, nid) &amp; AC_WCAP_AMP_OVRD))</div><div class='add'>+		nid = codec-&gt;core.afg;</div><div class='add'>+	return snd_hda_param_read(codec, nid,</div><div class='add'>+				  direction == HDA_OUTPUT ?</div><div class='add'>+				  AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(query_amp_caps);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_check_amp_caps - query AMP capabilities</div><div class='add'>+ * @codec: the HD-audio codec</div><div class='add'>+ * @nid: the NID to query</div><div class='add'>+ * @dir: either #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @bits: bit mask to check the result</div><div class='add'>+ *</div><div class='add'>+ * Check whether the widget has the given amp capability for the direction.</div><div class='add'>+ */</div><div class='add'>+bool snd_hda_check_amp_caps(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   int dir, unsigned int bits)</div><div class='add'>+{</div><div class='add'>+	if (!nid)</div><div class='add'>+		return false;</div><div class='add'>+	if (get_wcaps(codec, nid) &amp; (1 &lt;&lt; (dir + 1)))</div><div class='add'>+		if (query_amp_caps(codec, nid, dir) &amp; bits)</div><div class='add'>+			return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_check_amp_caps);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_override_amp_caps - Override the AMP capabilities</div><div class='add'>+ * @codec: the CODEC to clean up</div><div class='add'>+ * @nid: the NID to clean up</div><div class='add'>+ * @dir: either #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @caps: the capability bits to set</div><div class='add'>+ *</div><div class='add'>+ * Override the cached AMP caps bits value by the given one.</div><div class='add'>+ * This function is useful if the driver needs to adjust the AMP ranges,</div><div class='add'>+ * e.g. limit to 0dB, etc.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='add'>+			      unsigned int caps)</div><div class='add'>+{</div><div class='add'>+	unsigned int parm;</div><div class='add'>+</div><div class='add'>+	snd_hda_override_wcaps(codec, nid,</div><div class='add'>+			       get_wcaps(codec, nid) | AC_WCAP_AMP_OVRD);</div><div class='add'>+	parm = dir == HDA_OUTPUT ? AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP;</div><div class='add'>+	return snd_hdac_override_parm(&amp;codec-&gt;core, nid, parm, caps);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_override_amp_caps);</div><div class='add'>+</div><div class='add'>+static unsigned int encode_amp(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			       int ch, int dir, int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = snd_hdac_regmap_encode_amp(nid, ch, dir, idx);</div><div class='add'>+</div><div class='add'>+	/* enable fake mute if no h/w mute but min=mute */</div><div class='add'>+	if ((query_amp_caps(codec, nid, dir) &amp;</div><div class='add'>+	     (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)) == AC_AMPCAP_MIN_MUTE)</div><div class='add'>+		cmd |= AC_AMP_FAKE_MUTE;</div><div class='add'>+	return cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_amp_update - update the AMP mono value</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @nid: NID to read the AMP value</div><div class='add'>+ * @ch: channel to update (0 or 1)</div><div class='add'>+ * @dir: #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @idx: the index value (only for input direction)</div><div class='add'>+ * @mask: bit mask to set</div><div class='add'>+ * @val: the bits value to set</div><div class='add'>+ *</div><div class='add'>+ * Update the AMP values for the given channel, direction and index.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			     int ch, int dir, int idx, int mask, int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = encode_amp(codec, nid, ch, dir, idx);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_regmap_update_raw(&amp;codec-&gt;core, cmd, mask, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_amp_update);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_amp_stereo - update the AMP stereo values</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @nid: NID to read the AMP value</div><div class='add'>+ * @direction: #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @idx: the index value (only for input direction)</div><div class='add'>+ * @mask: bit mask to set</div><div class='add'>+ * @val: the bits value to set</div><div class='add'>+ *</div><div class='add'>+ * Update the AMP values like snd_hda_codec_amp_update(), but for a</div><div class='add'>+ * stereo widget with the same mask and value.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			     int direction, int idx, int mask, int val)</div><div class='add'>+{</div><div class='add'>+	int ch, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(mask &amp; ~0xff))</div><div class='add'>+		mask &amp;= 0xff;</div><div class='add'>+	for (ch = 0; ch &lt; 2; ch++)</div><div class='add'>+		ret |= snd_hda_codec_amp_update(codec, nid, ch, direction,</div><div class='add'>+						idx, mask, val);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_amp_stereo);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_amp_init - initialize the AMP value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to read the AMP value</div><div class='add'>+ * @ch: channel (left=0 or right=1)</div><div class='add'>+ * @dir: #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @idx: the index value (only for input direction)</div><div class='add'>+ * @mask: bit mask to set</div><div class='add'>+ * @val: the bits value to set</div><div class='add'>+ *</div><div class='add'>+ * Works like snd_hda_codec_amp_update() but it writes the value only at</div><div class='add'>+ * the first access.  If the amp was already initialized / updated beforehand,</div><div class='add'>+ * this does nothing.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_amp_init(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='add'>+			   int dir, int idx, int mask, int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = encode_amp(codec, nid, ch, dir, idx);</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;core.regmap)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return snd_hdac_regmap_update_raw_once(&amp;codec-&gt;core, cmd, mask, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_amp_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_amp_init_stereo - initialize the stereo AMP value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: NID to read the AMP value</div><div class='add'>+ * @dir: #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @idx: the index value (only for input direction)</div><div class='add'>+ * @mask: bit mask to set</div><div class='add'>+ * @val: the bits value to set</div><div class='add'>+ *</div><div class='add'>+ * Call snd_hda_codec_amp_init() for both stereo channels.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_amp_init_stereo(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  int dir, int idx, int mask, int val)</div><div class='add'>+{</div><div class='add'>+	int ch, ret = 0;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(mask &amp; ~0xff))</div><div class='add'>+		mask &amp;= 0xff;</div><div class='add'>+	for (ch = 0; ch &lt; 2; ch++)</div><div class='add'>+		ret |= snd_hda_codec_amp_init(codec, nid, ch, dir,</div><div class='add'>+					      idx, mask, val);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_amp_init_stereo);</div><div class='add'>+</div><div class='add'>+static u32 get_amp_max_value(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='add'>+			     unsigned int ofs)</div><div class='add'>+{</div><div class='add'>+	u32 caps = query_amp_caps(codec, nid, dir);</div><div class='add'>+	/* get num steps */</div><div class='add'>+	caps = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='add'>+	if (ofs &lt; caps)</div><div class='add'>+		caps -= ofs;</div><div class='add'>+	return caps;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_volume_info - Info callback for a standard AMP mixer</div><div class='add'>+ * @kcontrol: referred ctl element</div><div class='add'>+ * @uinfo: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	u16 nid = get_amp_nid(kcontrol);</div><div class='add'>+	u8 chs = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = get_amp_max_value(codec, nid, dir, ofs);</div><div class='add'>+	if (!uinfo-&gt;value.integer.max) {</div><div class='add'>+		codec_warn(codec,</div><div class='add'>+			   "num_steps = 0 for NID=0x%x (ctl = %s)\n",</div><div class='add'>+			   nid, kcontrol-&gt;id.name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_volume_info);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+read_amp_value(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+	       int ch, int dir, int idx, unsigned int ofs)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	val = snd_hda_codec_amp_read(codec, nid, ch, dir, idx);</div><div class='add'>+	val &amp;= HDA_AMP_VOLMASK;</div><div class='add'>+	if (val &gt;= ofs)</div><div class='add'>+		val -= ofs;</div><div class='add'>+	else</div><div class='add'>+		val = 0;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+update_amp_value(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		 int ch, int dir, int idx, unsigned int ofs,</div><div class='add'>+		 unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int maxval;</div><div class='add'>+</div><div class='add'>+	if (val &gt; 0)</div><div class='add'>+		val += ofs;</div><div class='add'>+	/* ofs = 0: raw max value */</div><div class='add'>+	maxval = get_amp_max_value(codec, nid, dir, 0);</div><div class='add'>+	if (val &gt; maxval)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return snd_hda_codec_amp_update(codec, nid, ch, dir, idx,</div><div class='add'>+					HDA_AMP_VOLMASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_volume_get - Get callback for a standard AMP mixer volume</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	int idx = get_amp_index(kcontrol);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	if (chs &amp; 1)</div><div class='add'>+		*valp++ = read_amp_value(codec, nid, 0, dir, idx, ofs);</div><div class='add'>+	if (chs &amp; 2)</div><div class='add'>+		*valp = read_amp_value(codec, nid, 1, dir, idx, ofs);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_volume_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_volume_put - Put callback for a standard AMP mixer volume</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	int idx = get_amp_index(kcontrol);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int change = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (chs &amp; 1) {</div><div class='add'>+		err = update_amp_value(codec, nid, 0, dir, idx, ofs, *valp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		change |= err;</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	if (chs &amp; 2) {</div><div class='add'>+		err = update_amp_value(codec, nid, 1, dir, idx, ofs, *valp);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		change |= err;</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_volume_put);</div><div class='add'>+</div><div class='add'>+/* inquiry the amp caps and convert to TLV */</div><div class='add'>+static void get_ctl_amp_tlv(struct snd_kcontrol *kcontrol, unsigned int *tlv)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='add'>+	bool min_mute = get_amp_min_mute(kcontrol);</div><div class='add'>+	u32 caps, val1, val2;</div><div class='add'>+</div><div class='add'>+	caps = query_amp_caps(codec, nid, dir);</div><div class='add'>+	val2 = (caps &amp; AC_AMPCAP_STEP_SIZE) &gt;&gt; AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='add'>+	val2 = (val2 + 1) * 25;</div><div class='add'>+	val1 = -((caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT);</div><div class='add'>+	val1 += ofs;</div><div class='add'>+	val1 = ((int)val1) * ((int)val2);</div><div class='add'>+	if (min_mute || (caps &amp; AC_AMPCAP_MIN_MUTE))</div><div class='add'>+		val2 |= TLV_DB_SCALE_MUTE;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_TYPE] = SNDRV_CTL_TLVT_DB_SCALE;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_LEN] = 2 * sizeof(unsigned int);</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] = val1;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] = val2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_tlv - TLV callback for a standard AMP mixer volume</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @op_flag: operation flag</div><div class='add'>+ * @size: byte size of input TLV</div><div class='add'>+ * @_tlv: TLV data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='add'>+			  unsigned int size, unsigned int __user *_tlv)</div><div class='add'>+{</div><div class='add'>+	unsigned int tlv[4];</div><div class='add'>+</div><div class='add'>+	if (size &lt; 4 * sizeof(unsigned int))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	get_ctl_amp_tlv(kcontrol, tlv);</div><div class='add'>+	if (copy_to_user(_tlv, tlv, sizeof(tlv)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_tlv);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_set_vmaster_tlv - Set TLV for a virtual master control</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @nid: NID of a reference widget</div><div class='add'>+ * @dir: #HDA_INPUT or #HDA_OUTPUT</div><div class='add'>+ * @tlv: TLV data to be stored, at least 4 elements</div><div class='add'>+ *</div><div class='add'>+ * Set (static) TLV data for a virtual master volume using the AMP caps</div><div class='add'>+ * obtained from the reference NID.</div><div class='add'>+ * The volume range is recalculated as if the max volume is 0dB.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='add'>+			     unsigned int *tlv)</div><div class='add'>+{</div><div class='add'>+	u32 caps;</div><div class='add'>+	int nums, step;</div><div class='add'>+</div><div class='add'>+	caps = query_amp_caps(codec, nid, dir);</div><div class='add'>+	nums = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='add'>+	step = (caps &amp; AC_AMPCAP_STEP_SIZE) &gt;&gt; AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='add'>+	step = (step + 1) * 25;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_TYPE] = SNDRV_CTL_TLVT_DB_SCALE;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_LEN] = 2 * sizeof(unsigned int);</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] = -nums * step;</div><div class='add'>+	tlv[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] = step;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_set_vmaster_tlv);</div><div class='add'>+</div><div class='add'>+/* find a mixer control element with the given name */</div><div class='add'>+static struct snd_kcontrol *</div><div class='add'>+find_mixer_ctl(struct hda_codec *codec, const char *name, int dev, int idx)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+	memset(&amp;id, 0, sizeof(id));</div><div class='add'>+	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	id.device = dev;</div><div class='add'>+	id.index = idx;</div><div class='add'>+	if (snd_BUG_ON(strlen(name) &gt;= sizeof(id.name)))</div><div class='add'>+		return NULL;</div><div class='add'>+	strscpy(id.name, name);</div><div class='add'>+	return snd_ctl_find_id(codec-&gt;card, &amp;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_find_mixer_ctl - Find a mixer control element with the given name</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @name: ctl id name string</div><div class='add'>+ *</div><div class='add'>+ * Get the control element with the given id string and IFACE_MIXER.</div><div class='add'>+ */</div><div class='add'>+struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,</div><div class='add'>+					    const char *name)</div><div class='add'>+{</div><div class='add'>+	return find_mixer_ctl(codec, name, 0, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_find_mixer_ctl);</div><div class='add'>+</div><div class='add'>+static int find_empty_mixer_ctl_idx(struct hda_codec *codec, const char *name,</div><div class='add'>+				    int start_idx)</div><div class='add'>+{</div><div class='add'>+	int i, idx;</div><div class='add'>+	/* 16 ctlrs should be large enough */</div><div class='add'>+	for (i = 0, idx = start_idx; i &lt; 16; i++, idx++) {</div><div class='add'>+		if (!find_mixer_ctl(codec, name, 0, idx))</div><div class='add'>+			return idx;</div><div class='add'>+	}</div><div class='add'>+	return -EBUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_ctl_add - Add a control element and assign to the codec</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @nid: corresponding NID (optional)</div><div class='add'>+ * @kctl: the control element to assign</div><div class='add'>+ *</div><div class='add'>+ * Add the given control element to an array inside the codec instance.</div><div class='add'>+ * All control elements belonging to a codec are supposed to be added</div><div class='add'>+ * by this function so that a proper clean-up works at the free or</div><div class='add'>+ * reconfiguration time.</div><div class='add'>+ *</div><div class='add'>+ * If non-zero @nid is passed, the NID is assigned to the control element.</div><div class='add'>+ * The assignment is shown in the codec proc file.</div><div class='add'>+ *</div><div class='add'>+ * snd_hda_ctl_add() checks the control subdev id field whether</div><div class='add'>+ * #HDA_SUBDEV_NID_FLAG bit is set.  If set (and @nid is zero), the lower</div><div class='add'>+ * bits value is taken as the NID to assign. The #HDA_NID_ITEM_AMP bit</div><div class='add'>+ * specifies if kctl-&gt;private_value is a HDA amplifier value.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		    struct snd_kcontrol *kctl)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	unsigned short flags = 0;</div><div class='add'>+	struct hda_nid_item *item;</div><div class='add'>+</div><div class='add'>+	if (kctl-&gt;id.subdevice &amp; HDA_SUBDEV_AMP_FLAG) {</div><div class='add'>+		flags |= HDA_NID_ITEM_AMP;</div><div class='add'>+		if (nid == 0)</div><div class='add'>+			nid = get_amp_nid_(kctl-&gt;private_value);</div><div class='add'>+	}</div><div class='add'>+	if ((kctl-&gt;id.subdevice &amp; HDA_SUBDEV_NID_FLAG) != 0 &amp;&amp; nid == 0)</div><div class='add'>+		nid = kctl-&gt;id.subdevice &amp; 0xffff;</div><div class='add'>+	if (kctl-&gt;id.subdevice &amp; (HDA_SUBDEV_NID_FLAG|HDA_SUBDEV_AMP_FLAG))</div><div class='add'>+		kctl-&gt;id.subdevice = 0;</div><div class='add'>+	err = snd_ctl_add(codec-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	item = snd_array_new(&amp;codec-&gt;mixers);</div><div class='add'>+	if (!item)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	item-&gt;kctl = kctl;</div><div class='add'>+	item-&gt;nid = nid;</div><div class='add'>+	item-&gt;flags = flags;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_ctl_add);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_ctls_clear - Clear all controls assigned to the given codec</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ */</div><div class='add'>+void snd_hda_ctls_clear(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	struct hda_nid_item *items = codec-&gt;mixers.list;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;mixers.used; i++)</div><div class='add'>+		snd_ctl_remove(codec-&gt;card, items[i].kctl);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;mixers);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;nids);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_lock_devices - pseudo device locking</div><div class='add'>+ * @bus: the BUS</div><div class='add'>+ *</div><div class='add'>+ * toggle card-&gt;shutdown to allow/disallow the device access (as a hack)</div><div class='add'>+ */</div><div class='add'>+int snd_hda_lock_devices(struct hda_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = bus-&gt;card;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;card-&gt;files_lock);</div><div class='add'>+	if (card-&gt;shutdown)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	card-&gt;shutdown = 1;</div><div class='add'>+	if (!list_empty(&amp;card-&gt;ctl_files))</div><div class='add'>+		goto err_clear;</div><div class='add'>+</div><div class='add'>+	list_for_each_codec(codec, bus) {</div><div class='add'>+		struct hda_pcm *cpcm;</div><div class='add'>+		list_for_each_entry(cpcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+			if (!cpcm-&gt;pcm)</div><div class='add'>+				continue;</div><div class='add'>+			if (cpcm-&gt;pcm-&gt;streams[0].substream_opened ||</div><div class='add'>+			    cpcm-&gt;pcm-&gt;streams[1].substream_opened)</div><div class='add'>+				goto err_clear;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ err_clear:</div><div class='add'>+	card-&gt;shutdown = 0;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_lock_devices);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_unlock_devices - pseudo device unlocking</div><div class='add'>+ * @bus: the BUS</div><div class='add'>+ */</div><div class='add'>+void snd_hda_unlock_devices(struct hda_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = bus-&gt;card;</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;card-&gt;files_lock);</div><div class='add'>+	card-&gt;shutdown = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_unlock_devices);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_reset - Clear all objects assigned to the codec</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * This frees the all PCM and control elements assigned to the codec, and</div><div class='add'>+ * clears the caches and restores the pin default configurations.</div><div class='add'>+ *</div><div class='add'>+ * When a device is being used, it returns -EBSY.  If successfully freed,</div><div class='add'>+ * returns zero.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_reset(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_bus *bus = codec-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (snd_hda_lock_devices(bus) &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* OK, let it free */</div><div class='add'>+	device_release_driver(hda_codec_dev(codec));</div><div class='add'>+</div><div class='add'>+	/* allow device access again */</div><div class='add'>+	snd_hda_unlock_devices(bus);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef int (*map_follower_func_t)(struct hda_codec *, void *, struct snd_kcontrol *);</div><div class='add'>+</div><div class='add'>+/* apply the function to all matching follower ctls in the mixer list */</div><div class='add'>+static int map_followers(struct hda_codec *codec, const char * const *followers,</div><div class='add'>+			 const char *suffix, map_follower_func_t func, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hda_nid_item *items;</div><div class='add'>+	const char * const *s;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	items = codec-&gt;mixers.list;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;mixers.used; i++) {</div><div class='add'>+		struct snd_kcontrol *sctl = items[i].kctl;</div><div class='add'>+		if (!sctl || sctl-&gt;id.iface != SNDRV_CTL_ELEM_IFACE_MIXER)</div><div class='add'>+			continue;</div><div class='add'>+		for (s = followers; *s; s++) {</div><div class='add'>+			char tmpname[sizeof(sctl-&gt;id.name)];</div><div class='add'>+			const char *name = *s;</div><div class='add'>+			if (suffix) {</div><div class='add'>+				snprintf(tmpname, sizeof(tmpname), "%s %s",</div><div class='add'>+					 name, suffix);</div><div class='add'>+				name = tmpname;</div><div class='add'>+			}</div><div class='add'>+			if (!strcmp(sctl-&gt;id.name, name)) {</div><div class='add'>+				err = func(codec, data, sctl);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int check_follower_present(struct hda_codec *codec,</div><div class='add'>+				  void *data, struct snd_kcontrol *sctl)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call kctl-&gt;put with the given value(s) */</div><div class='add'>+static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_value *ucontrol __free(kfree) = NULL;</div><div class='add'>+</div><div class='add'>+	ucontrol = kzalloc(sizeof(*ucontrol), GFP_KERNEL);</div><div class='add'>+	if (!ucontrol)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = val;</div><div class='add'>+	ucontrol-&gt;value.integer.value[1] = val;</div><div class='add'>+	kctl-&gt;put(kctl, ucontrol);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct follower_init_arg {</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int step;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* initialize the follower volume with 0dB via snd_ctl_apply_vmaster_followers() */</div><div class='add'>+static int init_follower_0dB(struct snd_kcontrol *follower,</div><div class='add'>+			     struct snd_kcontrol *kctl,</div><div class='add'>+			     void *_arg)</div><div class='add'>+{</div><div class='add'>+	struct follower_init_arg *arg = _arg;</div><div class='add'>+	int _tlv[4];</div><div class='add'>+	const int *tlv = NULL;</div><div class='add'>+	int step;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	if (kctl-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {</div><div class='add'>+		if (kctl-&gt;tlv.c != snd_hda_mixer_amp_tlv) {</div><div class='add'>+			codec_err(arg-&gt;codec,</div><div class='add'>+				  "Unexpected TLV callback for follower %s:%d\n",</div><div class='add'>+				  kctl-&gt;id.name, kctl-&gt;id.index);</div><div class='add'>+			return 0; /* ignore */</div><div class='add'>+		}</div><div class='add'>+		get_ctl_amp_tlv(kctl, _tlv);</div><div class='add'>+		tlv = _tlv;</div><div class='add'>+	} else if (kctl-&gt;vd[0].access &amp; SNDRV_CTL_ELEM_ACCESS_TLV_READ)</div><div class='add'>+		tlv = kctl-&gt;tlv.p;</div><div class='add'>+</div><div class='add'>+	if (!tlv || tlv[SNDRV_CTL_TLVO_TYPE] != SNDRV_CTL_TLVT_DB_SCALE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	step = tlv[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP];</div><div class='add'>+	step &amp;= ~TLV_DB_SCALE_MUTE;</div><div class='add'>+	if (!step)</div><div class='add'>+		return 0;</div><div class='add'>+	if (arg-&gt;step &amp;&amp; arg-&gt;step != step) {</div><div class='add'>+		codec_err(arg-&gt;codec,</div><div class='add'>+			  "Mismatching dB step for vmaster follower (%d!=%d)\n",</div><div class='add'>+			  arg-&gt;step, step);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	arg-&gt;step = step;</div><div class='add'>+	val = -tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] / step;</div><div class='add'>+	if (val &gt; 0) {</div><div class='add'>+		put_kctl_with_value(follower, val);</div><div class='add'>+		return val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* unmute the follower via snd_ctl_apply_vmaster_followers() */</div><div class='add'>+static int init_follower_unmute(struct snd_kcontrol *follower,</div><div class='add'>+				struct snd_kcontrol *kctl,</div><div class='add'>+				void *_arg)</div><div class='add'>+{</div><div class='add'>+	return put_kctl_with_value(follower, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_follower(struct hda_codec *codec,</div><div class='add'>+			void *data, struct snd_kcontrol *follower)</div><div class='add'>+{</div><div class='add'>+	return snd_ctl_add_follower(data, follower);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __snd_hda_add_vmaster - create a virtual master control and add followers</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @name: vmaster control name</div><div class='add'>+ * @tlv: TLV data (optional)</div><div class='add'>+ * @followers: follower control names (optional)</div><div class='add'>+ * @suffix: suffix string to each follower name (optional)</div><div class='add'>+ * @init_follower_vol: initialize followers to unmute/0dB</div><div class='add'>+ * @access: kcontrol access rights</div><div class='add'>+ * @ctl_ret: store the vmaster kcontrol in return</div><div class='add'>+ *</div><div class='add'>+ * Create a virtual master control with the given name.  The TLV data</div><div class='add'>+ * must be either NULL or a valid data.</div><div class='add'>+ *</div><div class='add'>+ * @followers is a NULL-terminated array of strings, each of which is a</div><div class='add'>+ * follower control name.  All controls with these names are assigned to</div><div class='add'>+ * the new virtual master control.</div><div class='add'>+ *</div><div class='add'>+ * This function returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,</div><div class='add'>+			  unsigned int *tlv, const char * const *followers,</div><div class='add'>+			  const char *suffix, bool init_follower_vol,</div><div class='add'>+			  unsigned int access, struct snd_kcontrol **ctl_ret)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (ctl_ret)</div><div class='add'>+		*ctl_ret = NULL;</div><div class='add'>+</div><div class='add'>+	err = map_followers(codec, followers, suffix, check_follower_present, NULL);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		codec_dbg(codec, "No follower found for %s\n", name);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	kctl = snd_ctl_make_virtual_master(name, tlv);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kctl-&gt;vd[0].access |= access;</div><div class='add'>+	err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = map_followers(codec, followers, suffix, add_follower, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* init with master mute &amp; zero volume */</div><div class='add'>+	put_kctl_with_value(kctl, 0);</div><div class='add'>+	if (init_follower_vol) {</div><div class='add'>+		struct follower_init_arg arg = {</div><div class='add'>+			.codec = codec,</div><div class='add'>+			.step = 0,</div><div class='add'>+		};</div><div class='add'>+		snd_ctl_apply_vmaster_followers(kctl,</div><div class='add'>+						tlv ? init_follower_0dB : init_follower_unmute,</div><div class='add'>+						&amp;arg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctl_ret)</div><div class='add'>+		*ctl_ret = kctl;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(__snd_hda_add_vmaster);</div><div class='add'>+</div><div class='add'>+/* meta hook to call each driver's vmaster hook */</div><div class='add'>+static void vmaster_hook(void *private_data, int enabled)</div><div class='add'>+{</div><div class='add'>+	struct hda_vmaster_mute_hook *hook = private_data;</div><div class='add'>+</div><div class='add'>+	hook-&gt;hook(hook-&gt;codec, enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_add_vmaster_hook - Add a vmaster hw specific hook</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @hook: the vmaster hook object</div><div class='add'>+ *</div><div class='add'>+ * Add a hw specific hook (like EAPD) with the given vmaster switch kctl.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_add_vmaster_hook(struct hda_codec *codec,</div><div class='add'>+			     struct hda_vmaster_mute_hook *hook)</div><div class='add'>+{</div><div class='add'>+	if (!hook-&gt;hook || !hook-&gt;sw_kctl)</div><div class='add'>+		return 0;</div><div class='add'>+	hook-&gt;codec = codec;</div><div class='add'>+	snd_ctl_add_vmaster_hook(hook-&gt;sw_kctl, vmaster_hook, hook);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_add_vmaster_hook);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_sync_vmaster_hook - Sync vmaster hook</div><div class='add'>+ * @hook: the vmaster hook</div><div class='add'>+ *</div><div class='add'>+ * Call the hook with the current value for synchronization.</div><div class='add'>+ * Should be called in init callback.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook)</div><div class='add'>+{</div><div class='add'>+	if (!hook-&gt;hook || !hook-&gt;codec)</div><div class='add'>+		return;</div><div class='add'>+	/* don't call vmaster hook in the destructor since it might have</div><div class='add'>+	 * been already destroyed</div><div class='add'>+	 */</div><div class='add'>+	if (hook-&gt;codec-&gt;bus-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+	snd_ctl_sync_vmaster_hook(hook-&gt;sw_kctl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_sync_vmaster_hook);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_switch_info - Info callback for a standard AMP mixer switch</div><div class='add'>+ * @kcontrol: referred ctl element</div><div class='add'>+ * @uinfo: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='add'>+	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_switch_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_switch_get - Get callback for a standard AMP mixer switch</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	int idx = get_amp_index(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+</div><div class='add'>+	if (chs &amp; 1)</div><div class='add'>+		*valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) &amp;</div><div class='add'>+			   HDA_AMP_MUTE) ? 0 : 1;</div><div class='add'>+	if (chs &amp; 2)</div><div class='add'>+		*valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) &amp;</div><div class='add'>+			 HDA_AMP_MUTE) ? 0 : 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_switch_get);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_mixer_amp_switch_put - Put callback for a standard AMP mixer switch</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ *</div><div class='add'>+ * The control element is supposed to have the private_value field</div><div class='add'>+ * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='add'>+	int chs = get_amp_channels(kcontrol);</div><div class='add'>+	int dir = get_amp_direction(kcontrol);</div><div class='add'>+	int idx = get_amp_index(kcontrol);</div><div class='add'>+	long *valp = ucontrol-&gt;value.integer.value;</div><div class='add'>+	int change = 0;</div><div class='add'>+</div><div class='add'>+	if (chs &amp; 1) {</div><div class='add'>+		if (*valp &lt; 0 || *valp &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,</div><div class='add'>+						  HDA_AMP_MUTE,</div><div class='add'>+						  *valp ? 0 : HDA_AMP_MUTE);</div><div class='add'>+		valp++;</div><div class='add'>+	}</div><div class='add'>+	if (chs &amp; 2) {</div><div class='add'>+		if (*valp &lt; 0 || *valp &gt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,</div><div class='add'>+						   HDA_AMP_MUTE,</div><div class='add'>+						   *valp ? 0 : HDA_AMP_MUTE);</div><div class='add'>+	}</div><div class='add'>+	hda_call_check_power_status(codec, nid);</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_mixer_amp_switch_put);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPDIF out controls</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_IEC958;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	ucontrol-&gt;value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |</div><div class='add'>+					   IEC958_AES0_NONAUDIO |</div><div class='add'>+					   IEC958_AES0_CON_EMPHASIS_5015 |</div><div class='add'>+					   IEC958_AES0_CON_NOT_COPYRIGHT;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[1] = IEC958_AES1_CON_CATEGORY |</div><div class='add'>+					   IEC958_AES1_CON_ORIGINAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	ucontrol-&gt;value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |</div><div class='add'>+					   IEC958_AES0_NONAUDIO |</div><div class='add'>+					   IEC958_AES0_PRO_EMPHASIS_5015;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int idx = kcontrol-&gt;private_value;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	ucontrol-&gt;value.iec958.status[0] = spdif-&gt;status &amp; 0xff;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[1] = (spdif-&gt;status &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[2] = (spdif-&gt;status &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[3] = (spdif-&gt;status &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert from SPDIF status bits to HDA SPDIF bits</div><div class='add'>+ * bit 0 (DigEn) is always set zero (to be filled later)</div><div class='add'>+ */</div><div class='add'>+static unsigned short convert_from_spdif_status(unsigned int sbits)</div><div class='add'>+{</div><div class='add'>+	unsigned short val = 0;</div><div class='add'>+</div><div class='add'>+	if (sbits &amp; IEC958_AES0_PROFESSIONAL)</div><div class='add'>+		val |= AC_DIG1_PROFESSIONAL;</div><div class='add'>+	if (sbits &amp; IEC958_AES0_NONAUDIO)</div><div class='add'>+		val |= AC_DIG1_NONAUDIO;</div><div class='add'>+	if (sbits &amp; IEC958_AES0_PROFESSIONAL) {</div><div class='add'>+		if ((sbits &amp; IEC958_AES0_PRO_EMPHASIS) ==</div><div class='add'>+		    IEC958_AES0_PRO_EMPHASIS_5015)</div><div class='add'>+			val |= AC_DIG1_EMPHASIS;</div><div class='add'>+	} else {</div><div class='add'>+		if ((sbits &amp; IEC958_AES0_CON_EMPHASIS) ==</div><div class='add'>+		    IEC958_AES0_CON_EMPHASIS_5015)</div><div class='add'>+			val |= AC_DIG1_EMPHASIS;</div><div class='add'>+		if (!(sbits &amp; IEC958_AES0_CON_NOT_COPYRIGHT))</div><div class='add'>+			val |= AC_DIG1_COPYRIGHT;</div><div class='add'>+		if (sbits &amp; (IEC958_AES1_CON_ORIGINAL &lt;&lt; 8))</div><div class='add'>+			val |= AC_DIG1_LEVEL;</div><div class='add'>+		val |= sbits &amp; (IEC958_AES1_CON_CATEGORY &lt;&lt; 8);</div><div class='add'>+	}</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* convert to SPDIF status bits from HDA SPDIF bits</div><div class='add'>+ */</div><div class='add'>+static unsigned int convert_to_spdif_status(unsigned short val)</div><div class='add'>+{</div><div class='add'>+	unsigned int sbits = 0;</div><div class='add'>+</div><div class='add'>+	if (val &amp; AC_DIG1_NONAUDIO)</div><div class='add'>+		sbits |= IEC958_AES0_NONAUDIO;</div><div class='add'>+	if (val &amp; AC_DIG1_PROFESSIONAL)</div><div class='add'>+		sbits |= IEC958_AES0_PROFESSIONAL;</div><div class='add'>+	if (sbits &amp; IEC958_AES0_PROFESSIONAL) {</div><div class='add'>+		if (val &amp; AC_DIG1_EMPHASIS)</div><div class='add'>+			sbits |= IEC958_AES0_PRO_EMPHASIS_5015;</div><div class='add'>+	} else {</div><div class='add'>+		if (val &amp; AC_DIG1_EMPHASIS)</div><div class='add'>+			sbits |= IEC958_AES0_CON_EMPHASIS_5015;</div><div class='add'>+		if (!(val &amp; AC_DIG1_COPYRIGHT))</div><div class='add'>+			sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;</div><div class='add'>+		if (val &amp; AC_DIG1_LEVEL)</div><div class='add'>+			sbits |= (IEC958_AES1_CON_ORIGINAL &lt;&lt; 8);</div><div class='add'>+		sbits |= val &amp; (0x7f &lt;&lt; 8);</div><div class='add'>+	}</div><div class='add'>+	return sbits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set digital convert verbs both for the given NID and its followers */</div><div class='add'>+static void set_dig_out(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			int mask, int val)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *d;</div><div class='add'>+</div><div class='add'>+	snd_hdac_regmap_update(&amp;codec-&gt;core, nid, AC_VERB_SET_DIGI_CONVERT_1,</div><div class='add'>+			       mask, val);</div><div class='add'>+	d = codec-&gt;follower_dig_outs;</div><div class='add'>+	if (!d)</div><div class='add'>+		return;</div><div class='add'>+	for (; *d; d++)</div><div class='add'>+		snd_hdac_regmap_update(&amp;codec-&gt;core, *d,</div><div class='add'>+				       AC_VERB_SET_DIGI_CONVERT_1, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				       int dig1, int dig2)</div><div class='add'>+{</div><div class='add'>+	unsigned int mask = 0;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+</div><div class='add'>+	if (dig1 != -1) {</div><div class='add'>+		mask |= 0xff;</div><div class='add'>+		val = dig1;</div><div class='add'>+	}</div><div class='add'>+	if (dig2 != -1) {</div><div class='add'>+		mask |= 0xff00;</div><div class='add'>+		val |= dig2 &lt;&lt; 8;</div><div class='add'>+	}</div><div class='add'>+	set_dig_out(codec, nid, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int idx = kcontrol-&gt;private_value;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	unsigned short val;</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	nid = spdif-&gt;nid;</div><div class='add'>+	spdif-&gt;status = ucontrol-&gt;value.iec958.status[0] |</div><div class='add'>+		((unsigned int)ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='add'>+		((unsigned int)ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='add'>+		((unsigned int)ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='add'>+	val = convert_from_spdif_status(spdif-&gt;status);</div><div class='add'>+	val |= spdif-&gt;ctls &amp; 1;</div><div class='add'>+	change = spdif-&gt;ctls != val;</div><div class='add'>+	spdif-&gt;ctls = val;</div><div class='add'>+	if (change &amp;&amp; nid != (u16)-1)</div><div class='add'>+		set_dig_out_convert(codec, nid, val &amp; 0xff, (val &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define snd_hda_spdif_out_switch_info	snd_ctl_boolean_mono_info</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int idx = kcontrol-&gt;private_value;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = spdif-&gt;ctls &amp; AC_DIG1_ENABLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void set_spdif_ctls(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  int dig1, int dig2)</div><div class='add'>+{</div><div class='add'>+	set_dig_out_convert(codec, nid, dig1, dig2);</div><div class='add'>+	/* unmute amp switch (if any) */</div><div class='add'>+	if ((get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP) &amp;&amp;</div><div class='add'>+	    (dig1 &amp; AC_DIG1_ENABLE))</div><div class='add'>+		snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='add'>+					    HDA_AMP_MUTE, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int idx = kcontrol-&gt;private_value;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	unsigned short val;</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	nid = spdif-&gt;nid;</div><div class='add'>+	val = spdif-&gt;ctls &amp; ~AC_DIG1_ENABLE;</div><div class='add'>+	if (ucontrol-&gt;value.integer.value[0])</div><div class='add'>+		val |= AC_DIG1_ENABLE;</div><div class='add'>+	change = spdif-&gt;ctls != val;</div><div class='add'>+	spdif-&gt;ctls = val;</div><div class='add'>+	if (change &amp;&amp; nid != (u16)-1)</div><div class='add'>+		set_spdif_ctls(codec, nid, val &amp; 0xff, -1);</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new dig_mixes[] = {</div><div class='add'>+	{</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK),</div><div class='add'>+		.info = snd_hda_spdif_mask_info,</div><div class='add'>+		.get = snd_hda_spdif_cmask_get,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK),</div><div class='add'>+		.info = snd_hda_spdif_mask_info,</div><div class='add'>+		.get = snd_hda_spdif_pmask_get,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),</div><div class='add'>+		.info = snd_hda_spdif_mask_info,</div><div class='add'>+		.get = snd_hda_spdif_default_get,</div><div class='add'>+		.put = snd_hda_spdif_default_put,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),</div><div class='add'>+		.info = snd_hda_spdif_out_switch_info,</div><div class='add'>+		.get = snd_hda_spdif_out_switch_get,</div><div class='add'>+		.put = snd_hda_spdif_out_switch_put,</div><div class='add'>+	},</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_create_dig_out_ctls - create Output SPDIF-related controls</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @associated_nid: NID that new ctls associated with</div><div class='add'>+ * @cvt_nid: converter NID</div><div class='add'>+ * @type: HDA_PCM_TYPE_*</div><div class='add'>+ * Creates controls related with the digital output.</div><div class='add'>+ * Called from each codec driver supporting the digital out.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_create_dig_out_ctls(struct hda_codec *codec,</div><div class='add'>+				hda_nid_t associated_nid,</div><div class='add'>+				hda_nid_t cvt_nid,</div><div class='add'>+				int type)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	const struct snd_kcontrol_new *dig_mix;</div><div class='add'>+	int idx = 0;</div><div class='add'>+	int val = 0;</div><div class='add'>+	const int spdif_index = 16;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	struct hda_bus *bus = codec-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;primary_dig_out_type == HDA_PCM_TYPE_HDMI &amp;&amp;</div><div class='add'>+	    type == HDA_PCM_TYPE_SPDIF) {</div><div class='add'>+		idx = spdif_index;</div><div class='add'>+	} else if (bus-&gt;primary_dig_out_type == HDA_PCM_TYPE_SPDIF &amp;&amp;</div><div class='add'>+		   type == HDA_PCM_TYPE_HDMI) {</div><div class='add'>+		/* suppose a single SPDIF device */</div><div class='add'>+		for (dig_mix = dig_mixes; dig_mix-&gt;name; dig_mix++) {</div><div class='add'>+			struct snd_ctl_elem_id id;</div><div class='add'>+</div><div class='add'>+			kctl = find_mixer_ctl(codec, dig_mix-&gt;name, 0, 0);</div><div class='add'>+			if (!kctl)</div><div class='add'>+				break;</div><div class='add'>+			id = kctl-&gt;id;</div><div class='add'>+			id.index = spdif_index;</div><div class='add'>+			err = snd_ctl_rename_id(codec-&gt;card, &amp;kctl-&gt;id, &amp;id);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+		bus-&gt;primary_dig_out_type = HDA_PCM_TYPE_HDMI;</div><div class='add'>+	}</div><div class='add'>+	if (!bus-&gt;primary_dig_out_type)</div><div class='add'>+		bus-&gt;primary_dig_out_type = type;</div><div class='add'>+</div><div class='add'>+	idx = find_empty_mixer_ctl_idx(codec, "IEC958 Playback Switch", idx);</div><div class='add'>+	if (idx &lt; 0) {</div><div class='add'>+		codec_err(codec, "too many IEC958 outputs\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	spdif = snd_array_new(&amp;codec-&gt;spdif_out);</div><div class='add'>+	if (!spdif)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	for (dig_mix = dig_mixes; dig_mix-&gt;name; dig_mix++) {</div><div class='add'>+		kctl = snd_ctl_new1(dig_mix, codec);</div><div class='add'>+		if (!kctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kctl-&gt;id.index = idx;</div><div class='add'>+		kctl-&gt;private_value = codec-&gt;spdif_out.used - 1;</div><div class='add'>+		err = snd_hda_ctl_add(codec, associated_nid, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	spdif-&gt;nid = cvt_nid;</div><div class='add'>+	snd_hdac_regmap_read(&amp;codec-&gt;core, cvt_nid,</div><div class='add'>+			     AC_VERB_GET_DIGI_CONVERT_1, &amp;val);</div><div class='add'>+	spdif-&gt;ctls = val;</div><div class='add'>+	spdif-&gt;status = convert_to_spdif_status(spdif-&gt;ctls);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_create_dig_out_ctls);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_spdif_out_of_nid - get the hda_spdif_out entry from the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: widget NID</div><div class='add'>+ *</div><div class='add'>+ * call within spdif_mutex lock</div><div class='add'>+ */</div><div class='add'>+struct hda_spdif_out *snd_hda_spdif_out_of_nid(struct hda_codec *codec,</div><div class='add'>+					       hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;spdif_out, i, spdif) {</div><div class='add'>+		if (spdif-&gt;nid == nid)</div><div class='add'>+			return spdif;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_spdif_out_of_nid);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_spdif_ctls_unassign - Unassign the given SPDIF ctl</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @idx: the SPDIF ctl index</div><div class='add'>+ *</div><div class='add'>+ * Unassign the widget from the given SPDIF control.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_spdif_ctls_unassign(struct hda_codec *codec, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	spdif-&gt;nid = (u16)-1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_spdif_ctls_unassign);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_spdif_ctls_assign - Assign the SPDIF controls to the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @idx: the SPDIF ctl idx</div><div class='add'>+ * @nid: widget NID</div><div class='add'>+ *</div><div class='add'>+ * Assign the widget to the SPDIF control with the given index.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_spdif_ctls_assign(struct hda_codec *codec, int idx, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	unsigned short val;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(codec-&gt;spdif_out.used &lt;= idx))</div><div class='add'>+		return;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	spdif = snd_array_elem(&amp;codec-&gt;spdif_out, idx);</div><div class='add'>+	if (spdif-&gt;nid != nid) {</div><div class='add'>+		spdif-&gt;nid = nid;</div><div class='add'>+		val = spdif-&gt;ctls;</div><div class='add'>+		set_spdif_ctls(codec, nid, val &amp; 0xff, (val &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_spdif_ctls_assign);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPDIF sharing with analog output</div><div class='add'>+ */</div><div class='add'>+static int spdif_share_sw_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = mout-&gt;share_spdif;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spdif_share_sw_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	mout-&gt;share_spdif = !!ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new spdif_share_sw = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "IEC958 Default PCM Playback Switch",</div><div class='add'>+	.info = snd_ctl_boolean_mono_info,</div><div class='add'>+	.get = spdif_share_sw_get,</div><div class='add'>+	.put = spdif_share_sw_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_create_spdif_share_sw - create Default PCM switch</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: multi-out instance</div><div class='add'>+ */</div><div class='add'>+int snd_hda_create_spdif_share_sw(struct hda_codec *codec,</div><div class='add'>+				  struct hda_multi_out *mout)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+</div><div class='add'>+	if (!mout-&gt;dig_out_nid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_new1(&amp;spdif_share_sw, mout);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* ATTENTION: here mout is passed as private_data, instead of codec */</div><div class='add'>+	return snd_hda_ctl_add(codec, mout-&gt;dig_out_nid, kctl);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_create_spdif_share_sw);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SPDIF input</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define snd_hda_spdif_in_switch_info	snd_hda_spdif_out_switch_info</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_in_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = codec-&gt;spdif_in_enable;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int val = !!ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	change = codec-&gt;spdif_in_enable != val;</div><div class='add'>+	if (change) {</div><div class='add'>+		codec-&gt;spdif_in_enable = val;</div><div class='add'>+		snd_hdac_regmap_write(&amp;codec-&gt;core, nid,</div><div class='add'>+				      AC_VERB_SET_DIGI_CONVERT_1, val);</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	unsigned int sbits;</div><div class='add'>+</div><div class='add'>+	snd_hdac_regmap_read(&amp;codec-&gt;core, nid,</div><div class='add'>+			     AC_VERB_GET_DIGI_CONVERT_1, &amp;val);</div><div class='add'>+	sbits = convert_to_spdif_status(val);</div><div class='add'>+	ucontrol-&gt;value.iec958.status[0] = sbits;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[1] = sbits &gt;&gt; 8;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[2] = sbits &gt;&gt; 16;</div><div class='add'>+	ucontrol-&gt;value.iec958.status[3] = sbits &gt;&gt; 24;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new dig_in_ctls[] = {</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),</div><div class='add'>+		.info = snd_hda_spdif_in_switch_info,</div><div class='add'>+		.get = snd_hda_spdif_in_switch_get,</div><div class='add'>+		.put = snd_hda_spdif_in_switch_put,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT),</div><div class='add'>+		.info = snd_hda_spdif_mask_info,</div><div class='add'>+		.get = snd_hda_spdif_in_status_get,</div><div class='add'>+	},</div><div class='add'>+	{ } /* end */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_create_spdif_in_ctls - create Input SPDIF-related controls</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: audio in widget NID</div><div class='add'>+ *</div><div class='add'>+ * Creates controls related with the SPDIF input.</div><div class='add'>+ * Called from each codec driver supporting the SPDIF in.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	const struct snd_kcontrol_new *dig_mix;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	idx = find_empty_mixer_ctl_idx(codec, "IEC958 Capture Switch", 0);</div><div class='add'>+	if (idx &lt; 0) {</div><div class='add'>+		codec_err(codec, "too many IEC958 inputs\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	for (dig_mix = dig_in_ctls; dig_mix-&gt;name; dig_mix++) {</div><div class='add'>+		kctl = snd_ctl_new1(dig_mix, codec);</div><div class='add'>+		if (!kctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kctl-&gt;private_value = nid;</div><div class='add'>+		err = snd_hda_ctl_add(codec, nid, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	codec-&gt;spdif_in_enable =</div><div class='add'>+		snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+				   AC_VERB_GET_DIGI_CONVERT_1, 0) &amp;</div><div class='add'>+		AC_DIG1_ENABLE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_create_spdif_in_ctls);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_set_power_to_all - Set the power state to all widgets</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @fg: function group (not used now)</div><div class='add'>+ * @power_state: the power state to set (AC_PWRST_*)</div><div class='add'>+ *</div><div class='add'>+ * Set the given power state to all widgets that have the power control.</div><div class='add'>+ * If the codec has power_filter set, it evaluates the power state and</div><div class='add'>+ * filter out if it's unchanged as D3.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_set_power_to_all(struct hda_codec *codec, hda_nid_t fg,</div><div class='add'>+				    unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+		unsigned int state = power_state;</div><div class='add'>+		if (!(wcaps &amp; AC_WCAP_POWER))</div><div class='add'>+			continue;</div><div class='add'>+		if (codec-&gt;power_filter) {</div><div class='add'>+			state = codec-&gt;power_filter(codec, nid, power_state);</div><div class='add'>+			if (state != power_state &amp;&amp; power_state == AC_PWRST_D3)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE,</div><div class='add'>+				    state);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_set_power_to_all);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_eapd_power_filter - A power filter callback for EAPD</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: widget NID</div><div class='add'>+ * @power_state: power state to evalue</div><div class='add'>+ *</div><div class='add'>+ * Don't power down the widget if it controls eapd and EAPD_BTLENABLE is set.</div><div class='add'>+ * This can be used a codec power_filter callback.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,</div><div class='add'>+					     hda_nid_t nid,</div><div class='add'>+					     unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;core.afg || nid == codec-&gt;core.mfg)</div><div class='add'>+		return power_state;</div><div class='add'>+	if (power_state == AC_PWRST_D3 &amp;&amp;</div><div class='add'>+	    get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_PIN &amp;&amp;</div><div class='add'>+	    (snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD)) {</div><div class='add'>+		int eapd = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					      AC_VERB_GET_EAPD_BTLENABLE, 0);</div><div class='add'>+		if (eapd &amp; 0x02)</div><div class='add'>+			return AC_PWRST_D0;</div><div class='add'>+	}</div><div class='add'>+	return power_state;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_eapd_power_filter);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set power state of the codec, and return the power state</div><div class='add'>+ */</div><div class='add'>+static unsigned int hda_set_power_state(struct hda_codec *codec,</div><div class='add'>+					unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	hda_nid_t fg = codec-&gt;core.afg ? codec-&gt;core.afg : codec-&gt;core.mfg;</div><div class='add'>+	int count;</div><div class='add'>+	unsigned int state;</div><div class='add'>+	int flags = 0;</div><div class='add'>+</div><div class='add'>+	/* this delay seems necessary to avoid click noise at power-down */</div><div class='add'>+	if (power_state == AC_PWRST_D3) {</div><div class='add'>+		if (codec-&gt;depop_delay &lt; 0)</div><div class='add'>+			msleep(codec_has_epss(codec) ? 10 : 100);</div><div class='add'>+		else if (codec-&gt;depop_delay &gt; 0)</div><div class='add'>+			msleep(codec-&gt;depop_delay);</div><div class='add'>+		flags = HDA_RW_NO_RESPONSE_FALLBACK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* repeat power states setting at most 10 times*/</div><div class='add'>+	for (count = 0; count &lt; 10; count++) {</div><div class='add'>+		/* might be called before binding to driver, too */</div><div class='add'>+		if (driver &amp;&amp; driver-&gt;ops &amp;&amp; driver-&gt;ops-&gt;set_power_state)</div><div class='add'>+			driver-&gt;ops-&gt;set_power_state(codec, fg, power_state);</div><div class='add'>+		else {</div><div class='add'>+			state = power_state;</div><div class='add'>+			if (codec-&gt;power_filter)</div><div class='add'>+				state = codec-&gt;power_filter(codec, fg, state);</div><div class='add'>+			if (state == power_state || power_state != AC_PWRST_D3)</div><div class='add'>+				snd_hda_codec_read(codec, fg, flags,</div><div class='add'>+						   AC_VERB_SET_POWER_STATE,</div><div class='add'>+						   state);</div><div class='add'>+			snd_hda_codec_set_power_to_all(codec, fg, power_state);</div><div class='add'>+		}</div><div class='add'>+		state = snd_hda_sync_power_state(codec, fg, power_state);</div><div class='add'>+		if (!(state &amp; AC_PWRST_ERROR))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sync power states of all widgets;</div><div class='add'>+ * this is called at the end of codec parsing</div><div class='add'>+ */</div><div class='add'>+static void sync_power_up_states(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	/* don't care if no filter is used */</div><div class='add'>+	if (!codec-&gt;power_filter)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for_each_hda_codec_node(nid, codec) {</div><div class='add'>+		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='add'>+		unsigned int target;</div><div class='add'>+		if (!(wcaps &amp; AC_WCAP_POWER))</div><div class='add'>+			continue;</div><div class='add'>+		target = codec-&gt;power_filter(codec, nid, AC_PWRST_D0);</div><div class='add'>+		if (target == AC_PWRST_D0)</div><div class='add'>+			continue;</div><div class='add'>+		if (!snd_hda_check_power_state(codec, nid, target))</div><div class='add'>+			snd_hda_codec_write(codec, nid, 0,</div><div class='add'>+					    AC_VERB_SET_POWER_STATE, target);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+/* execute additional init verbs */</div><div class='add'>+static void hda_exec_init_verbs(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;init_verbs.list)</div><div class='add'>+		snd_hda_sequence_write(codec, codec-&gt;init_verbs.list);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void hda_exec_init_verbs(struct hda_codec *codec) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* update the power on/off account with the current jiffies */</div><div class='add'>+static void update_power_acct(struct hda_codec *codec, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned long delta = jiffies - codec-&gt;power_jiffies;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		codec-&gt;power_on_acct += delta;</div><div class='add'>+	else</div><div class='add'>+		codec-&gt;power_off_acct += delta;</div><div class='add'>+	codec-&gt;power_jiffies += delta;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_update_power_acct(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	update_power_acct(codec, hda_codec_is_power_on(codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * call suspend and power-down; used both from PM and power-save</div><div class='add'>+ * this function returns the power state in the end</div><div class='add'>+ */</div><div class='add'>+static unsigned int hda_call_codec_suspend(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	unsigned int state;</div><div class='add'>+</div><div class='add'>+	snd_hdac_enter_pm(&amp;codec-&gt;core);</div><div class='add'>+	if (driver-&gt;ops-&gt;suspend)</div><div class='add'>+		driver-&gt;ops-&gt;suspend(codec);</div><div class='add'>+	if (!codec-&gt;no_stream_clean_at_suspend)</div><div class='add'>+		hda_cleanup_all_streams(codec);</div><div class='add'>+	state = hda_set_power_state(codec, AC_PWRST_D3);</div><div class='add'>+	update_power_acct(codec, true);</div><div class='add'>+	snd_hdac_leave_pm(&amp;codec-&gt;core);</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * kick up codec; used both from PM and power-save</div><div class='add'>+ */</div><div class='add'>+static void hda_call_codec_resume(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+</div><div class='add'>+	snd_hdac_enter_pm(&amp;codec-&gt;core);</div><div class='add'>+	if (codec-&gt;core.regmap)</div><div class='add'>+		regcache_mark_dirty(codec-&gt;core.regmap);</div><div class='add'>+</div><div class='add'>+	codec-&gt;power_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	hda_set_power_state(codec, AC_PWRST_D0);</div><div class='add'>+	restore_shutup_pins(codec);</div><div class='add'>+	hda_exec_init_verbs(codec);</div><div class='add'>+	snd_hda_jack_set_dirty_all(codec);</div><div class='add'>+	if (driver-&gt;ops-&gt;resume)</div><div class='add'>+		driver-&gt;ops-&gt;resume(codec);</div><div class='add'>+	else {</div><div class='add'>+		snd_hda_codec_init(codec);</div><div class='add'>+		snd_hda_regmap_sync(codec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hda_jack_report_sync(codec);</div><div class='add'>+	codec-&gt;core.dev.power.power_state = PMSG_ON;</div><div class='add'>+	snd_hdac_leave_pm(&amp;codec-&gt;core);</div><div class='add'>+	if (codec-&gt;jackpoll_interval)</div><div class='add'>+		schedule_delayed_work(&amp;codec-&gt;jackpoll_work,</div><div class='add'>+				      codec-&gt;jackpoll_interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+	unsigned int state;</div><div class='add'>+</div><div class='add'>+	/* Nothing to do if card registration fails and the component driver never probes */</div><div class='add'>+	if (!codec-&gt;card)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	state = hda_call_codec_suspend(codec);</div><div class='add'>+	if (codec-&gt;link_down_at_suspend ||</div><div class='add'>+	    (codec_has_clkstop(codec) &amp;&amp; codec_has_epss(codec) &amp;&amp;</div><div class='add'>+	     (state &amp; AC_PWRST_CLK_STOP_OK)))</div><div class='add'>+		snd_hdac_codec_link_down(&amp;codec-&gt;core);</div><div class='add'>+	snd_hda_codec_display_power(codec, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	/* Nothing to do if card registration fails and the component driver never probes */</div><div class='add'>+	if (!codec-&gt;card)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_display_power(codec, true);</div><div class='add'>+	snd_hdac_codec_link_up(&amp;codec-&gt;core);</div><div class='add'>+	hda_call_codec_resume(codec);</div><div class='add'>+	pm_runtime_mark_last_busy(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;jackpoll_interval &amp;&amp; !codec-&gt;bus-&gt;jackpoll_in_suspend)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_prepare(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+	dev-&gt;power.power_state = PMSG_SUSPEND;</div><div class='add'>+	return pm_runtime_suspended(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_codec_pm_complete(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	/* If no other pm-functions are called between prepare() and complete() */</div><div class='add'>+	if (dev-&gt;power.power_state.event == PM_EVENT_SUSPEND)</div><div class='add'>+		dev-&gt;power.power_state = PMSG_RESUME;</div><div class='add'>+</div><div class='add'>+	if (pm_runtime_suspended(dev) &amp;&amp; (codec-&gt;jackpoll_interval ||</div><div class='add'>+	    hda_codec_need_resume(codec) || codec-&gt;forced_resume))</div><div class='add'>+		pm_request_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.power_state = PMSG_SUSPEND;</div><div class='add'>+	return pm_runtime_force_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.power_state = PMSG_RESUME;</div><div class='add'>+	return pm_runtime_force_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_freeze(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_to_hda_codec(dev);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+	dev-&gt;power.power_state = PMSG_FREEZE;</div><div class='add'>+	return pm_runtime_force_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_thaw(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.power_state = PMSG_THAW;</div><div class='add'>+	return pm_runtime_force_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_codec_pm_restore(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;power.power_state = PMSG_RESTORE;</div><div class='add'>+	return pm_runtime_force_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* referred in hda_bind.c */</div><div class='add'>+const struct dev_pm_ops hda_codec_driver_pm = {</div><div class='add'>+	.prepare = pm_sleep_ptr(hda_codec_pm_prepare),</div><div class='add'>+	.complete = pm_sleep_ptr(hda_codec_pm_complete),</div><div class='add'>+	.suspend = pm_sleep_ptr(hda_codec_pm_suspend),</div><div class='add'>+	.resume = pm_sleep_ptr(hda_codec_pm_resume),</div><div class='add'>+	.freeze = pm_sleep_ptr(hda_codec_pm_freeze),</div><div class='add'>+	.thaw = pm_sleep_ptr(hda_codec_pm_thaw),</div><div class='add'>+	.poweroff = pm_sleep_ptr(hda_codec_pm_suspend),</div><div class='add'>+	.restore = pm_sleep_ptr(hda_codec_pm_restore),</div><div class='add'>+	RUNTIME_PM_OPS(hda_codec_runtime_suspend, hda_codec_runtime_resume,</div><div class='add'>+		       hda_codec_runtime_idle)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* suspend the codec at shutdown; called from driver's shutdown callback */</div><div class='add'>+void snd_hda_codec_shutdown(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm *cpcm;</div><div class='add'>+</div><div class='add'>+	/* Skip the shutdown if codec is not registered */</div><div class='add'>+	if (!codec-&gt;core.registered)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	codec-&gt;jackpoll_interval = 0; /* don't poll any longer */</div><div class='add'>+	cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+	list_for_each_entry(cpcm, &amp;codec-&gt;pcm_list_head, list)</div><div class='add'>+		snd_pcm_suspend_all(cpcm-&gt;pcm);</div><div class='add'>+</div><div class='add'>+	pm_runtime_force_suspend(hda_codec_dev(codec));</div><div class='add'>+	pm_runtime_disable(hda_codec_dev(codec));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * add standard channel maps if not specified</div><div class='add'>+ */</div><div class='add'>+static int add_std_chmaps(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_pcm *pcm;</div><div class='add'>+	int str, err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(pcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		for (str = 0; str &lt; 2; str++) {</div><div class='add'>+			struct hda_pcm_stream *hinfo = &amp;pcm-&gt;stream[str];</div><div class='add'>+			struct snd_pcm_chmap *chmap;</div><div class='add'>+			const struct snd_pcm_chmap_elem *elem;</div><div class='add'>+</div><div class='add'>+			if (!pcm-&gt;pcm || pcm-&gt;own_chmap || !hinfo-&gt;substreams)</div><div class='add'>+				continue;</div><div class='add'>+			elem = hinfo-&gt;chmap ? hinfo-&gt;chmap : snd_pcm_std_chmaps;</div><div class='add'>+			err = snd_pcm_add_chmap_ctls(pcm-&gt;pcm, str, elem,</div><div class='add'>+						     hinfo-&gt;channels_max,</div><div class='add'>+						     0, &amp;chmap);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+			chmap-&gt;channel_mask = SND_PCM_CHMAP_MASK_2468;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* default channel maps for 2.1 speakers;</div><div class='add'>+ * since HD-audio supports only stereo, odd number channels are omitted</div><div class='add'>+ */</div><div class='add'>+const struct snd_pcm_chmap_elem snd_pcm_2_1_chmaps[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },</div><div class='add'>+	{ .channels = 4,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR,</div><div class='add'>+		   SNDRV_CHMAP_LFE, SNDRV_CHMAP_LFE } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_pcm_2_1_chmaps);</div><div class='add'>+</div><div class='add'>+int snd_hda_codec_build_controls(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hda_exec_init_verbs(codec);</div><div class='add'>+	/* continue to initialize... */</div><div class='add'>+	err = snd_hda_codec_init(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;build_controls) {</div><div class='add'>+		err = driver-&gt;ops-&gt;build_controls(codec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* we create chmaps here instead of build_pcms */</div><div class='add'>+	err = add_std_chmaps(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hda_jack_report_sync(codec); /* call at the last init point */</div><div class='add'>+	if (codec-&gt;jackpoll_interval)</div><div class='add'>+		schedule_delayed_work(&amp;codec-&gt;jackpoll_work,</div><div class='add'>+				      codec-&gt;jackpoll_interval);</div><div class='add'>+</div><div class='add'>+	sync_power_up_states(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_build_controls);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM stuff</div><div class='add'>+ */</div><div class='add'>+static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,</div><div class='add'>+				      struct hda_codec *codec,</div><div class='add'>+				      struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_pcm_default_prepare(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   unsigned int stream_tag,</div><div class='add'>+				   unsigned int format,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid, stream_tag, 0, format);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,</div><div class='add'>+				   struct hda_codec *codec,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_pcm_default_values(struct hda_codec *codec,</div><div class='add'>+				  struct hda_pcm_stream *info)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* query support PCM information from the given NID */</div><div class='add'>+	if (info-&gt;nid &amp;&amp; (!info-&gt;rates || !info-&gt;formats)) {</div><div class='add'>+		err = snd_hda_query_supported_pcm(codec, info-&gt;nid,</div><div class='add'>+				info-&gt;rates ? NULL : &amp;info-&gt;rates,</div><div class='add'>+				info-&gt;formats ? NULL : &amp;info-&gt;formats,</div><div class='add'>+				info-&gt;subformats ? NULL : &amp;info-&gt;subformats,</div><div class='add'>+				info-&gt;maxbps ? NULL : &amp;info-&gt;maxbps);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;ops.open == NULL)</div><div class='add'>+		info-&gt;ops.open = hda_pcm_default_open_close;</div><div class='add'>+	if (info-&gt;ops.close == NULL)</div><div class='add'>+		info-&gt;ops.close = hda_pcm_default_open_close;</div><div class='add'>+	if (info-&gt;ops.prepare == NULL) {</div><div class='add'>+		if (snd_BUG_ON(!info-&gt;nid))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		info-&gt;ops.prepare = hda_pcm_default_prepare;</div><div class='add'>+	}</div><div class='add'>+	if (info-&gt;ops.cleanup == NULL) {</div><div class='add'>+		if (snd_BUG_ON(!info-&gt;nid))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		info-&gt;ops.cleanup = hda_pcm_default_cleanup;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * codec prepare/cleanup entries</div><div class='add'>+ */</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_prepare - Prepare a stream</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @hinfo: PCM information</div><div class='add'>+ * @stream: stream tag to assign</div><div class='add'>+ * @format: format id to assign</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ *</div><div class='add'>+ * Calls the prepare callback set by the codec with the given arguments.</div><div class='add'>+ * Clean up the inactive streams when successful.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_codec_prepare(struct hda_codec *codec,</div><div class='add'>+			  struct hda_pcm_stream *hinfo,</div><div class='add'>+			  unsigned int stream,</div><div class='add'>+			  unsigned int format,</div><div class='add'>+			  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='add'>+	if (hinfo-&gt;ops.prepare)</div><div class='add'>+		ret = hinfo-&gt;ops.prepare(hinfo, codec, stream, format,</div><div class='add'>+					 substream);</div><div class='add'>+	else</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		purify_inactive_streams(codec);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_prepare);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_cleanup - Clean up stream resources</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @hinfo: PCM information</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ *</div><div class='add'>+ * Calls the cleanup callback set by the codec with the given arguments.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_cleanup(struct hda_codec *codec,</div><div class='add'>+			   struct hda_pcm_stream *hinfo,</div><div class='add'>+			   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='add'>+	if (hinfo-&gt;ops.cleanup)</div><div class='add'>+		hinfo-&gt;ops.cleanup(hinfo, codec, substream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup);</div><div class='add'>+</div><div class='add'>+/* global */</div><div class='add'>+const char *snd_hda_pcm_type_name[HDA_PCM_NTYPES] = {</div><div class='add'>+	"Audio", "SPDIF", "HDMI", "Modem"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * get the empty PCM device number to assign</div><div class='add'>+ */</div><div class='add'>+static int get_empty_pcm_device(struct hda_bus *bus, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	/* audio device indices; not linear to keep compatibility */</div><div class='add'>+	/* assigned to static slots up to dev#10; if more needed, assign</div><div class='add'>+	 * the later slot dynamically (when CONFIG_SND_DYNAMIC_MINORS=y)</div><div class='add'>+	 */</div><div class='add'>+	static const int audio_idx[HDA_PCM_NTYPES][5] = {</div><div class='add'>+		[HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },</div><div class='add'>+		[HDA_PCM_TYPE_SPDIF] = { 1, -1 },</div><div class='add'>+		[HDA_PCM_TYPE_HDMI]  = { 3, 7, 8, 9, -1 },</div><div class='add'>+		[HDA_PCM_TYPE_MODEM] = { 6, -1 },</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (type &gt;= HDA_PCM_NTYPES) {</div><div class='add'>+		dev_err(bus-&gt;card-&gt;dev, "Invalid PCM type %d\n", type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; audio_idx[type][i] &gt;= 0; i++) {</div><div class='add'>+#ifndef CONFIG_SND_DYNAMIC_MINORS</div><div class='add'>+		if (audio_idx[type][i] &gt;= 8)</div><div class='add'>+			break;</div><div class='add'>+#endif</div><div class='add'>+		if (!test_and_set_bit(audio_idx[type][i], bus-&gt;pcm_dev_bits))</div><div class='add'>+			return audio_idx[type][i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DYNAMIC_MINORS</div><div class='add'>+	/* non-fixed slots starting from 10 */</div><div class='add'>+	for (i = 10; i &lt; 32; i++) {</div><div class='add'>+		if (!test_and_set_bit(i, bus-&gt;pcm_dev_bits))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	dev_warn(bus-&gt;card-&gt;dev, "Too many %s devices\n",</div><div class='add'>+		snd_hda_pcm_type_name[type]);</div><div class='add'>+#ifndef CONFIG_SND_DYNAMIC_MINORS</div><div class='add'>+	dev_warn(bus-&gt;card-&gt;dev,</div><div class='add'>+		 "Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y\n");</div><div class='add'>+#endif</div><div class='add'>+	return -EAGAIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call build_pcms ops of the given codec and set up the default parameters */</div><div class='add'>+int snd_hda_codec_parse_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+	struct hda_pcm *cpcm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;codec-&gt;pcm_list_head))</div><div class='add'>+		return 0; /* already parsed */</div><div class='add'>+</div><div class='add'>+	if (!driver-&gt;ops-&gt;build_pcms)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = driver-&gt;ops-&gt;build_pcms(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		codec_err(codec, "cannot build PCMs for #%d (error %d)\n",</div><div class='add'>+			  codec-&gt;core.addr, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cpcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		int stream;</div><div class='add'>+</div><div class='add'>+		for_each_pcm_streams(stream) {</div><div class='add'>+			struct hda_pcm_stream *info = &amp;cpcm-&gt;stream[stream];</div><div class='add'>+</div><div class='add'>+			if (!info-&gt;substreams)</div><div class='add'>+				continue;</div><div class='add'>+			err = set_pcm_default_values(codec, info);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				codec_warn(codec,</div><div class='add'>+					   "fail to setup default for PCM %s\n",</div><div class='add'>+					   cpcm-&gt;name);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_parse_pcms);</div><div class='add'>+</div><div class='add'>+/* assign all PCMs of the given codec */</div><div class='add'>+int snd_hda_codec_build_pcms(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_bus *bus = codec-&gt;bus;</div><div class='add'>+	struct hda_pcm *cpcm;</div><div class='add'>+	int dev, err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_codec_parse_pcms(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* attach a new PCM streams */</div><div class='add'>+	list_for_each_entry(cpcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='add'>+		if (cpcm-&gt;pcm)</div><div class='add'>+			continue; /* already attached */</div><div class='add'>+		if (!cpcm-&gt;stream[0].substreams &amp;&amp; !cpcm-&gt;stream[1].substreams)</div><div class='add'>+			continue; /* no substreams assigned */</div><div class='add'>+</div><div class='add'>+		dev = get_empty_pcm_device(bus, cpcm-&gt;pcm_type);</div><div class='add'>+		if (dev &lt; 0) {</div><div class='add'>+			cpcm-&gt;device = SNDRV_PCM_INVALID_DEVICE;</div><div class='add'>+			continue; /* no fatal error */</div><div class='add'>+		}</div><div class='add'>+		cpcm-&gt;device = dev;</div><div class='add'>+		err =  snd_hda_attach_pcm_stream(bus, codec, cpcm);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			codec_err(codec,</div><div class='add'>+				  "cannot attach PCM stream %d for codec #%d\n",</div><div class='add'>+				  dev, codec-&gt;core.addr);</div><div class='add'>+			continue; /* no fatal error */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_add_new_ctls - create controls from the array</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @knew: the array of struct snd_kcontrol_new</div><div class='add'>+ *</div><div class='add'>+ * This helper function creates and add new controls in the given array.</div><div class='add'>+ * The array must be terminated with an empty entry as terminator.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_add_new_ctls(struct hda_codec *codec,</div><div class='add'>+			 const struct snd_kcontrol_new *knew)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (; knew-&gt;name; knew++) {</div><div class='add'>+		struct snd_kcontrol *kctl;</div><div class='add'>+		int addr = 0, idx = 0;</div><div class='add'>+		if (knew-&gt;iface == (__force snd_ctl_elem_iface_t)-1)</div><div class='add'>+			continue; /* skip this codec private value */</div><div class='add'>+		for (;;) {</div><div class='add'>+			kctl = snd_ctl_new1(knew, codec);</div><div class='add'>+			if (!kctl)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			/* Do not use the id.device field for MIXER elements.</div><div class='add'>+			 * This field is for real device numbers (like PCM) but codecs</div><div class='add'>+			 * are hidden components from the user space view (unrelated</div><div class='add'>+			 * to the mixer element identification).</div><div class='add'>+			 */</div><div class='add'>+			if (addr &gt; 0 &amp;&amp; codec-&gt;ctl_dev_id)</div><div class='add'>+				kctl-&gt;id.device = addr;</div><div class='add'>+			if (idx &gt; 0)</div><div class='add'>+				kctl-&gt;id.index = idx;</div><div class='add'>+			err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='add'>+			if (!err)</div><div class='add'>+				break;</div><div class='add'>+			/* try first with another device index corresponding to</div><div class='add'>+			 * the codec addr; if it still fails (or it's the</div><div class='add'>+			 * primary codec), then try another control index</div><div class='add'>+			 */</div><div class='add'>+			if (!addr &amp;&amp; codec-&gt;core.addr) {</div><div class='add'>+				addr = codec-&gt;core.addr;</div><div class='add'>+				if (!codec-&gt;ctl_dev_id)</div><div class='add'>+					idx += 10 * addr;</div><div class='add'>+			} else if (!idx &amp;&amp; !knew-&gt;index) {</div><div class='add'>+				idx = find_empty_mixer_ctl_idx(codec,</div><div class='add'>+							       knew-&gt;name, 0);</div><div class='add'>+				if (idx &lt;= 0)</div><div class='add'>+					return err;</div><div class='add'>+			} else</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_add_new_ctls);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_codec_set_power_save - Configure codec's runtime PM</div><div class='add'>+ * @codec: codec device to configure</div><div class='add'>+ * @delay: autosuspend delay</div><div class='add'>+ */</div><div class='add'>+void snd_hda_codec_set_power_save(struct hda_codec *codec, int delay)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = hda_codec_dev(codec);</div><div class='add'>+</div><div class='add'>+	if (delay == 0 &amp;&amp; codec-&gt;auto_runtime_pm)</div><div class='add'>+		delay = 3000;</div><div class='add'>+</div><div class='add'>+	if (delay &gt; 0) {</div><div class='add'>+		pm_runtime_set_autosuspend_delay(dev, delay);</div><div class='add'>+		pm_runtime_use_autosuspend(dev);</div><div class='add'>+		pm_runtime_allow(dev);</div><div class='add'>+		if (!pm_runtime_suspended(dev))</div><div class='add'>+			pm_runtime_mark_last_busy(dev);</div><div class='add'>+	} else {</div><div class='add'>+		pm_runtime_dont_use_autosuspend(dev);</div><div class='add'>+		pm_runtime_forbid(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_set_power_save);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_set_power_save - reprogram autosuspend for the given delay</div><div class='add'>+ * @bus: HD-audio bus</div><div class='add'>+ * @delay: autosuspend delay in msec, 0 = off</div><div class='add'>+ *</div><div class='add'>+ * Synchronize the runtime PM autosuspend state from the power_save option.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_set_power_save(struct hda_bus *bus, int delay)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *c;</div><div class='add'>+</div><div class='add'>+	list_for_each_codec(c, bus)</div><div class='add'>+		snd_hda_codec_set_power_save(c, delay);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_set_power_save);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_check_amp_list_power - Check the amp list and update the power</div><div class='add'>+ * @codec: HD-audio codec</div><div class='add'>+ * @check: the object containing an AMP list and the status</div><div class='add'>+ * @nid: NID to check / update</div><div class='add'>+ *</div><div class='add'>+ * Check whether the given NID is in the amp list.  If it's in the list,</div><div class='add'>+ * check the current AMP status, and update the power-status according</div><div class='add'>+ * to the mute status.</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be set or called from the check_power_status</div><div class='add'>+ * patch ops.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_check_amp_list_power(struct hda_codec *codec,</div><div class='add'>+				 struct hda_loopback_check *check,</div><div class='add'>+				 hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	const struct hda_amp_list *p;</div><div class='add'>+	int ch, v;</div><div class='add'>+</div><div class='add'>+	if (!check-&gt;amplist)</div><div class='add'>+		return 0;</div><div class='add'>+	for (p = check-&gt;amplist; p-&gt;nid; p++) {</div><div class='add'>+		if (p-&gt;nid == nid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!p-&gt;nid)</div><div class='add'>+		return 0; /* nothing changed */</div><div class='add'>+</div><div class='add'>+	for (p = check-&gt;amplist; p-&gt;nid; p++) {</div><div class='add'>+		for (ch = 0; ch &lt; 2; ch++) {</div><div class='add'>+			v = snd_hda_codec_amp_read(codec, p-&gt;nid, ch, p-&gt;dir,</div><div class='add'>+						   p-&gt;idx);</div><div class='add'>+			if (!(v &amp; HDA_AMP_MUTE) &amp;&amp; v &gt; 0) {</div><div class='add'>+				if (!check-&gt;power_on) {</div><div class='add'>+					check-&gt;power_on = 1;</div><div class='add'>+					snd_hda_power_up_pm(codec);</div><div class='add'>+				}</div><div class='add'>+				return 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (check-&gt;power_on) {</div><div class='add'>+		check-&gt;power_on = 0;</div><div class='add'>+		snd_hda_power_down_pm(codec);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_check_amp_list_power);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * input MUX helper</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_input_mux_info - Info callback helper for the input-mux enum</div><div class='add'>+ * @imux: imux helper object</div><div class='add'>+ * @uinfo: pointer to get/store the data</div><div class='add'>+ */</div><div class='add'>+int snd_hda_input_mux_info(const struct hda_input_mux *imux,</div><div class='add'>+			   struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int index;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='add'>+	uinfo-&gt;count = 1;</div><div class='add'>+	uinfo-&gt;value.enumerated.items = imux-&gt;num_items;</div><div class='add'>+	if (!imux-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+	index = uinfo-&gt;value.enumerated.item;</div><div class='add'>+	if (index &gt;= imux-&gt;num_items)</div><div class='add'>+		index = imux-&gt;num_items - 1;</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name, imux-&gt;items[index].label);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_input_mux_info);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_input_mux_put - Put callback helper for the input-mux enum</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @imux: imux helper object</div><div class='add'>+ * @ucontrol: pointer to get/store the data</div><div class='add'>+ * @nid: input mux NID</div><div class='add'>+ * @cur_val: pointer to get/store the current imux value</div><div class='add'>+ */</div><div class='add'>+int snd_hda_input_mux_put(struct hda_codec *codec,</div><div class='add'>+			  const struct hda_input_mux *imux,</div><div class='add'>+			  struct snd_ctl_elem_value *ucontrol,</div><div class='add'>+			  hda_nid_t nid,</div><div class='add'>+			  unsigned int *cur_val)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	if (!imux-&gt;num_items)</div><div class='add'>+		return 0;</div><div class='add'>+	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (idx &gt;= imux-&gt;num_items)</div><div class='add'>+		idx = imux-&gt;num_items - 1;</div><div class='add'>+	if (*cur_val == idx)</div><div class='add'>+		return 0;</div><div class='add'>+	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='add'>+				  imux-&gt;items[idx].index);</div><div class='add'>+	*cur_val = idx;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_input_mux_put);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_enum_helper_info - Helper for simple enum ctls</div><div class='add'>+ * @kcontrol: ctl element</div><div class='add'>+ * @uinfo: pointer to get/store the data</div><div class='add'>+ * @num_items: number of enum items</div><div class='add'>+ * @texts: enum item string array</div><div class='add'>+ *</div><div class='add'>+ * process kcontrol info callback of a simple string enum array</div><div class='add'>+ * when @num_items is 0 or @texts is NULL, assume a boolean enum array</div><div class='add'>+ */</div><div class='add'>+int snd_hda_enum_helper_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_info *uinfo,</div><div class='add'>+			     int num_items, const char * const *texts)</div><div class='add'>+{</div><div class='add'>+	static const char * const texts_default[] = {</div><div class='add'>+		"Disabled", "Enabled"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!texts || !num_items) {</div><div class='add'>+		num_items = 2;</div><div class='add'>+		texts = texts_default;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, num_items, texts);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_enum_helper_info);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Multi-channel / digital-out PCM helper functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* setup SPDIF output stream */</div><div class='add'>+static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				 unsigned int stream_tag, unsigned int format)</div><div class='add'>+{</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	unsigned int curr_fmt;</div><div class='add'>+	bool reset;</div><div class='add'>+</div><div class='add'>+	spdif = snd_hda_spdif_out_of_nid(codec, nid);</div><div class='add'>+	/* Add sanity check to pass klockwork check.</div><div class='add'>+	 * This should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(spdif == NULL))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	curr_fmt = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+				      AC_VERB_GET_STREAM_FORMAT, 0);</div><div class='add'>+	reset = codec-&gt;spdif_status_reset &amp;&amp;</div><div class='add'>+		(spdif-&gt;ctls &amp; AC_DIG1_ENABLE) &amp;&amp;</div><div class='add'>+		curr_fmt != format;</div><div class='add'>+</div><div class='add'>+	/* turn off SPDIF if needed; otherwise the IEC958 bits won't be</div><div class='add'>+	   updated */</div><div class='add'>+	if (reset)</div><div class='add'>+		set_dig_out_convert(codec, nid,</div><div class='add'>+				    spdif-&gt;ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff,</div><div class='add'>+				    -1);</div><div class='add'>+	snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);</div><div class='add'>+	if (codec-&gt;follower_dig_outs) {</div><div class='add'>+		const hda_nid_t *d;</div><div class='add'>+		for (d = codec-&gt;follower_dig_outs; *d; d++)</div><div class='add'>+			snd_hda_codec_setup_stream(codec, *d, stream_tag, 0,</div><div class='add'>+						   format);</div><div class='add'>+	}</div><div class='add'>+	/* turn on again (if needed) */</div><div class='add'>+	if (reset)</div><div class='add'>+		set_dig_out_convert(codec, nid,</div><div class='add'>+				    spdif-&gt;ctls &amp; 0xff, -1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_cleanup_stream(codec, nid);</div><div class='add'>+	if (codec-&gt;follower_dig_outs) {</div><div class='add'>+		const hda_nid_t *d;</div><div class='add'>+		for (d = codec-&gt;follower_dig_outs; *d; d++)</div><div class='add'>+			snd_hda_codec_cleanup_stream(codec, *d);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_dig_open - open the digital out in the exclusive mode</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_dig_open(struct hda_codec *codec,</div><div class='add'>+			       struct hda_multi_out *mout)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	if (mout-&gt;dig_out_used == HDA_DIG_ANALOG_DUP)</div><div class='add'>+		/* already opened as analog dup; reset it once */</div><div class='add'>+		cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='add'>+	mout-&gt;dig_out_used = HDA_DIG_EXCLUSIVE;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_open);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_dig_prepare - prepare the digital out stream</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ * @stream_tag: stream tag to assign</div><div class='add'>+ * @format: format id to assign</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,</div><div class='add'>+				  struct hda_multi_out *mout,</div><div class='add'>+				  unsigned int stream_tag,</div><div class='add'>+				  unsigned int format,</div><div class='add'>+				  struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	setup_dig_out_stream(codec, mout-&gt;dig_out_nid, stream_tag, format);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_prepare);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_dig_cleanup - clean-up the digital out stream</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,</div><div class='add'>+				  struct hda_multi_out *mout)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_cleanup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_dig_close - release the digital out stream</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_dig_close(struct hda_codec *codec,</div><div class='add'>+				struct hda_multi_out *mout)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	mout-&gt;dig_out_used = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_close);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_analog_open - open analog outputs</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ * @hinfo: PCM information to assign</div><div class='add'>+ *</div><div class='add'>+ * Open analog outputs and set up the hw-constraints.</div><div class='add'>+ * If the digital outputs can be opened as follower, open the digital</div><div class='add'>+ * outputs, too.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_analog_open(struct hda_codec *codec,</div><div class='add'>+				  struct hda_multi_out *mout,</div><div class='add'>+				  struct snd_pcm_substream *substream,</div><div class='add'>+				  struct hda_pcm_stream *hinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	runtime-&gt;hw.channels_max = mout-&gt;max_channels;</div><div class='add'>+	if (mout-&gt;dig_out_nid) {</div><div class='add'>+		if (!mout-&gt;analog_rates) {</div><div class='add'>+			mout-&gt;analog_rates = hinfo-&gt;rates;</div><div class='add'>+			mout-&gt;analog_formats = hinfo-&gt;formats;</div><div class='add'>+			mout-&gt;analog_maxbps = hinfo-&gt;maxbps;</div><div class='add'>+		} else {</div><div class='add'>+			runtime-&gt;hw.rates = mout-&gt;analog_rates;</div><div class='add'>+			runtime-&gt;hw.formats = mout-&gt;analog_formats;</div><div class='add'>+			hinfo-&gt;maxbps = mout-&gt;analog_maxbps;</div><div class='add'>+		}</div><div class='add'>+		if (!mout-&gt;spdif_rates) {</div><div class='add'>+			snd_hda_query_supported_pcm(codec, mout-&gt;dig_out_nid,</div><div class='add'>+						    &amp;mout-&gt;spdif_rates,</div><div class='add'>+						    &amp;mout-&gt;spdif_formats,</div><div class='add'>+						    NULL,</div><div class='add'>+						    &amp;mout-&gt;spdif_maxbps);</div><div class='add'>+		}</div><div class='add'>+		guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+		if (mout-&gt;share_spdif) {</div><div class='add'>+			if ((runtime-&gt;hw.rates &amp; mout-&gt;spdif_rates) &amp;&amp;</div><div class='add'>+			    (runtime-&gt;hw.formats &amp; mout-&gt;spdif_formats)) {</div><div class='add'>+				runtime-&gt;hw.rates &amp;= mout-&gt;spdif_rates;</div><div class='add'>+				runtime-&gt;hw.formats &amp;= mout-&gt;spdif_formats;</div><div class='add'>+				if (mout-&gt;spdif_maxbps &lt; hinfo-&gt;maxbps)</div><div class='add'>+					hinfo-&gt;maxbps = mout-&gt;spdif_maxbps;</div><div class='add'>+			} else {</div><div class='add'>+				mout-&gt;share_spdif = 0;</div><div class='add'>+				/* FIXME: need notify? */</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return snd_pcm_hw_constraint_step(substream-&gt;runtime, 0,</div><div class='add'>+					  SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_open);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_analog_prepare - Preapre the analog outputs.</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ * @stream_tag: stream tag to assign</div><div class='add'>+ * @format: format id to assign</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ *</div><div class='add'>+ * Set up the i/o for analog out.</div><div class='add'>+ * When the digital out is available, copy the front out to digital out, too.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,</div><div class='add'>+				     struct hda_multi_out *mout,</div><div class='add'>+				     unsigned int stream_tag,</div><div class='add'>+				     unsigned int format,</div><div class='add'>+				     struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='add'>+	int chs = substream-&gt;runtime-&gt;channels;</div><div class='add'>+	struct hda_spdif_out *spdif;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;codec-&gt;spdif_mutex) {</div><div class='add'>+		spdif = snd_hda_spdif_out_of_nid(codec, mout-&gt;dig_out_nid);</div><div class='add'>+		if (mout-&gt;dig_out_nid &amp;&amp; mout-&gt;share_spdif &amp;&amp;</div><div class='add'>+		    mout-&gt;dig_out_used != HDA_DIG_EXCLUSIVE) {</div><div class='add'>+			if (chs == 2 &amp;&amp; spdif != NULL &amp;&amp;</div><div class='add'>+			    snd_hda_is_supported_format(codec, mout-&gt;dig_out_nid,</div><div class='add'>+							format) &amp;&amp;</div><div class='add'>+			    !(spdif-&gt;status &amp; IEC958_AES0_NONAUDIO)) {</div><div class='add'>+				mout-&gt;dig_out_used = HDA_DIG_ANALOG_DUP;</div><div class='add'>+				setup_dig_out_stream(codec, mout-&gt;dig_out_nid,</div><div class='add'>+						     stream_tag, format);</div><div class='add'>+			} else {</div><div class='add'>+				mout-&gt;dig_out_used = 0;</div><div class='add'>+				cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* front */</div><div class='add'>+	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag,</div><div class='add'>+				   0, format);</div><div class='add'>+	if (!mout-&gt;no_share_stream &amp;&amp;</div><div class='add'>+	    mout-&gt;hp_nid &amp;&amp; mout-&gt;hp_nid != nids[HDA_FRONT])</div><div class='add'>+		/* headphone out will just decode front left/right (stereo) */</div><div class='add'>+		snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid, stream_tag,</div><div class='add'>+					   0, format);</div><div class='add'>+	/* extra outputs copied from front */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;hp_out_nid); i++)</div><div class='add'>+		if (!mout-&gt;no_share_stream &amp;&amp; mout-&gt;hp_out_nid[i])</div><div class='add'>+			snd_hda_codec_setup_stream(codec,</div><div class='add'>+						   mout-&gt;hp_out_nid[i],</div><div class='add'>+						   stream_tag, 0, format);</div><div class='add'>+</div><div class='add'>+	/* surrounds */</div><div class='add'>+	for (i = 1; i &lt; mout-&gt;num_dacs; i++) {</div><div class='add'>+		if (chs &gt;= (i + 1) * 2) /* independent out */</div><div class='add'>+			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='add'>+						   i * 2, format);</div><div class='add'>+		else if (!mout-&gt;no_share_stream) /* copy front */</div><div class='add'>+			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='add'>+						   0, format);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* extra surrounds */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++) {</div><div class='add'>+		int ch = 0;</div><div class='add'>+		if (!mout-&gt;extra_out_nid[i])</div><div class='add'>+			break;</div><div class='add'>+		if (chs &gt;= (i + 1) * 2)</div><div class='add'>+			ch = i * 2;</div><div class='add'>+		else if (!mout-&gt;no_share_stream)</div><div class='add'>+			break;</div><div class='add'>+		snd_hda_codec_setup_stream(codec, mout-&gt;extra_out_nid[i],</div><div class='add'>+					   stream_tag, ch, format);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_prepare);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_multi_out_analog_cleanup - clean up the setting for analog out</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @mout: hda_multi_out object</div><div class='add'>+ */</div><div class='add'>+int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,</div><div class='add'>+				     struct hda_multi_out *mout)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mout-&gt;num_dacs; i++)</div><div class='add'>+		snd_hda_codec_cleanup_stream(codec, nids[i]);</div><div class='add'>+	if (mout-&gt;hp_nid)</div><div class='add'>+		snd_hda_codec_cleanup_stream(codec, mout-&gt;hp_nid);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;hp_out_nid); i++)</div><div class='add'>+		if (mout-&gt;hp_out_nid[i])</div><div class='add'>+			snd_hda_codec_cleanup_stream(codec,</div><div class='add'>+						     mout-&gt;hp_out_nid[i]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++)</div><div class='add'>+		if (mout-&gt;extra_out_nid[i])</div><div class='add'>+			snd_hda_codec_cleanup_stream(codec,</div><div class='add'>+						     mout-&gt;extra_out_nid[i]);</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;spdif_mutex);</div><div class='add'>+	if (mout-&gt;dig_out_nid &amp;&amp; mout-&gt;dig_out_used == HDA_DIG_ANALOG_DUP) {</div><div class='add'>+		cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='add'>+		mout-&gt;dig_out_used = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_multi_out_analog_cleanup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_default_vref - Get the default (mic) VREF pin bits</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @pin: referred pin NID</div><div class='add'>+ *</div><div class='add'>+ * Guess the suitable VREF pin bits to be set as the pin-control value.</div><div class='add'>+ * Note: the function doesn't set the AC_PINCTL_IN_EN bit.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_get_default_vref(struct hda_codec *codec, hda_nid_t pin)</div><div class='add'>+{</div><div class='add'>+	unsigned int pincap;</div><div class='add'>+	unsigned int oldval;</div><div class='add'>+	oldval = snd_hda_codec_read(codec, pin, 0,</div><div class='add'>+				    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='add'>+	pincap = snd_hda_query_pin_caps(codec, pin);</div><div class='add'>+	pincap = (pincap &amp; AC_PINCAP_VREF) &gt;&gt; AC_PINCAP_VREF_SHIFT;</div><div class='add'>+	/* Exception: if the default pin setup is vref50, we give it priority */</div><div class='add'>+	if ((pincap &amp; AC_PINCAP_VREF_80) &amp;&amp; oldval != PIN_VREF50)</div><div class='add'>+		return AC_PINCTL_VREF_80;</div><div class='add'>+	else if (pincap &amp; AC_PINCAP_VREF_50)</div><div class='add'>+		return AC_PINCTL_VREF_50;</div><div class='add'>+	else if (pincap &amp; AC_PINCAP_VREF_100)</div><div class='add'>+		return AC_PINCTL_VREF_100;</div><div class='add'>+	else if (pincap &amp; AC_PINCAP_VREF_GRD)</div><div class='add'>+		return AC_PINCTL_VREF_GRD;</div><div class='add'>+	return AC_PINCTL_VREF_HIZ;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_default_vref);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_correct_pin_ctl - correct the pin ctl value for matching with the pin cap</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @pin: referred pin NID</div><div class='add'>+ * @val: pin ctl value to audit</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hda_correct_pin_ctl(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t pin, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int cap_lists[][2] = {</div><div class='add'>+		{ AC_PINCTL_VREF_100, AC_PINCAP_VREF_100 },</div><div class='add'>+		{ AC_PINCTL_VREF_80, AC_PINCAP_VREF_80 },</div><div class='add'>+		{ AC_PINCTL_VREF_50, AC_PINCAP_VREF_50 },</div><div class='add'>+		{ AC_PINCTL_VREF_GRD, AC_PINCAP_VREF_GRD },</div><div class='add'>+	};</div><div class='add'>+	unsigned int cap;</div><div class='add'>+</div><div class='add'>+	if (!val)</div><div class='add'>+		return 0;</div><div class='add'>+	cap = snd_hda_query_pin_caps(codec, pin);</div><div class='add'>+	if (!cap)</div><div class='add'>+		return val; /* don't know what to do... */</div><div class='add'>+</div><div class='add'>+	if (val &amp; AC_PINCTL_OUT_EN) {</div><div class='add'>+		if (!(cap &amp; AC_PINCAP_OUT))</div><div class='add'>+			val &amp;= ~(AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);</div><div class='add'>+		else if ((val &amp; AC_PINCTL_HP_EN) &amp;&amp; !(cap &amp; AC_PINCAP_HP_DRV))</div><div class='add'>+			val &amp;= ~AC_PINCTL_HP_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val &amp; AC_PINCTL_IN_EN) {</div><div class='add'>+		if (!(cap &amp; AC_PINCAP_IN))</div><div class='add'>+			val &amp;= ~(AC_PINCTL_IN_EN | AC_PINCTL_VREFEN);</div><div class='add'>+		else {</div><div class='add'>+			unsigned int vcap, vref;</div><div class='add'>+			int i;</div><div class='add'>+			vcap = (cap &amp; AC_PINCAP_VREF) &gt;&gt; AC_PINCAP_VREF_SHIFT;</div><div class='add'>+			vref = val &amp; AC_PINCTL_VREFEN;</div><div class='add'>+			for (i = 0; i &lt; ARRAY_SIZE(cap_lists); i++) {</div><div class='add'>+				if (vref == cap_lists[i][0] &amp;&amp;</div><div class='add'>+				    !(vcap &amp; cap_lists[i][1])) {</div><div class='add'>+					if (i == ARRAY_SIZE(cap_lists) - 1)</div><div class='add'>+						vref = AC_PINCTL_VREF_HIZ;</div><div class='add'>+					else</div><div class='add'>+						vref = cap_lists[i + 1][0];</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			val &amp;= ~AC_PINCTL_VREFEN;</div><div class='add'>+			val |= vref;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_correct_pin_ctl);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _snd_hda_set_pin_ctl - Helper to set pin ctl value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @pin: referred pin NID</div><div class='add'>+ * @val: pin control value to set</div><div class='add'>+ * @cached: access over codec pinctl cache or direct write</div><div class='add'>+ *</div><div class='add'>+ * This function is a helper to set a pin ctl value more safely.</div><div class='add'>+ * It corrects the pin ctl value via snd_hda_correct_pin_ctl(), stores the</div><div class='add'>+ * value in pin target array via snd_hda_codec_set_pin_target(), then</div><div class='add'>+ * actually writes the value via either snd_hda_codec_write_cache() or</div><div class='add'>+ * snd_hda_codec_write() depending on @cached flag.</div><div class='add'>+ */</div><div class='add'>+int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			 unsigned int val, bool cached)</div><div class='add'>+{</div><div class='add'>+	val = snd_hda_correct_pin_ctl(codec, pin, val);</div><div class='add'>+	snd_hda_codec_set_pin_target(codec, pin, val);</div><div class='add'>+	if (cached)</div><div class='add'>+		return snd_hda_codec_write_cache(codec, pin, 0,</div><div class='add'>+				AC_VERB_SET_PIN_WIDGET_CONTROL, val);</div><div class='add'>+	else</div><div class='add'>+		return snd_hda_codec_write(codec, pin, 0,</div><div class='add'>+					   AC_VERB_SET_PIN_WIDGET_CONTROL, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(_snd_hda_set_pin_ctl);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_add_imux_item - Add an item to input_mux</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @imux: imux helper object</div><div class='add'>+ * @label: the name of imux item to assign</div><div class='add'>+ * @index: index number of imux item to assign</div><div class='add'>+ * @type_idx: pointer to store the resultant label index</div><div class='add'>+ *</div><div class='add'>+ * When the same label is used already in the existing items, the number</div><div class='add'>+ * suffix is appended to the label.  This label index number is stored</div><div class='add'>+ * to type_idx when non-NULL pointer is given.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_add_imux_item(struct hda_codec *codec,</div><div class='add'>+			  struct hda_input_mux *imux, const char *label,</div><div class='add'>+			  int index, int *type_idx)</div><div class='add'>+{</div><div class='add'>+	int i, label_idx = 0;</div><div class='add'>+	if (imux-&gt;num_items &gt;= HDA_MAX_NUM_INPUTS) {</div><div class='add'>+		codec_err(codec, "hda_codec: Too many imux items!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='add'>+		if (!strncmp(label, imux-&gt;items[i].label, strlen(label)))</div><div class='add'>+			label_idx++;</div><div class='add'>+	}</div><div class='add'>+	if (type_idx)</div><div class='add'>+		*type_idx = label_idx;</div><div class='add'>+	if (label_idx &gt; 0)</div><div class='add'>+		snprintf(imux-&gt;items[imux-&gt;num_items].label,</div><div class='add'>+			 sizeof(imux-&gt;items[imux-&gt;num_items].label),</div><div class='add'>+			 "%s %d", label, label_idx);</div><div class='add'>+	else</div><div class='add'>+		strscpy(imux-&gt;items[imux-&gt;num_items].label, label,</div><div class='add'>+			sizeof(imux-&gt;items[imux-&gt;num_items].label));</div><div class='add'>+	imux-&gt;items[imux-&gt;num_items].index = index;</div><div class='add'>+	imux-&gt;num_items++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_add_imux_item);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_bus_reset_codecs - Reset the bus</div><div class='add'>+ * @bus: HD-audio bus</div><div class='add'>+ */</div><div class='add'>+void snd_hda_bus_reset_codecs(struct hda_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	list_for_each_codec(codec, bus) {</div><div class='add'>+		/* FIXME: maybe a better way needed for forced reset */</div><div class='add'>+		if (current_work() != &amp;codec-&gt;jackpoll_work.work)</div><div class='add'>+			cancel_delayed_work_sync(&amp;codec-&gt;jackpoll_work);</div><div class='add'>+		if (hda_codec_is_power_on(codec)) {</div><div class='add'>+			hda_call_codec_suspend(codec);</div><div class='add'>+			hda_call_codec_resume(codec);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer</div><div class='add'>+ * @pcm: PCM caps bits</div><div class='add'>+ * @buf: the string buffer to write</div><div class='add'>+ * @buflen: the max buffer length</div><div class='add'>+ *</div><div class='add'>+ * used by hda_proc.c and hda_eld.c</div><div class='add'>+ */</div><div class='add'>+void snd_print_pcm_bits(int pcm, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	static const unsigned int bits[] = { 8, 16, 20, 24, 32 };</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(bits); i++)</div><div class='add'>+		if (pcm &amp; (AC_SUPPCM_BITS_8 &lt;&lt; i))</div><div class='add'>+			j += scnprintf(buf + j, buflen - j,  " %d", bits[i]);</div><div class='add'>+</div><div class='add'>+	buf[j] = '\0'; /* necessary when j == 0 */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_print_pcm_bits);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA codec core");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/common/controller.c b/sound/hda/common/controller.c<br/>new file mode 100644<br/>index 000000000000..b1cfd9bd4dcb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/controller.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/controller.c</a></div><div class='hunk'>@@ -0,0 +1,1322 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  Implementation of primary alsa driver code base for Intel HD Audio.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright(c) 2004 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ *                     PeiSen Hou &lt;pshou@realtek.com.tw&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+/* for art-tsc conversion */</div><div class='add'>+#include &lt;asm/tsc.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include "hda_controller.h"</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "controller_trace.h"</div><div class='add'>+</div><div class='add'>+/* DSP lock helpers */</div><div class='add'>+#ifdef CONFIG_SND_HDA_DSP_LOADER</div><div class='add'>+#define guard_dsp_lock(dev)	guard(snd_hdac_dsp_lock)(azx_stream(dev))</div><div class='add'>+#else</div><div class='add'>+#define guard_dsp_lock(dev)	do {} while (0)</div><div class='add'>+#endif</div><div class='add'>+#define dsp_is_locked(dev)	snd_hdac_stream_is_locked(azx_stream(dev))</div><div class='add'>+</div><div class='add'>+/* assign a stream for the PCM */</div><div class='add'>+static inline struct azx_dev *</div><div class='add'>+azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	s = snd_hdac_stream_assign(azx_bus(chip), substream);</div><div class='add'>+	if (!s)</div><div class='add'>+		return NULL;</div><div class='add'>+	return stream_to_azx_dev(s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* release the assigned stream */</div><div class='add'>+static inline void azx_release_device(struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_stream_release(azx_stream(azx_dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hda_pcm_stream *</div><div class='add'>+to_hda_pcm_stream(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	return &amp;apcm-&gt;info-&gt;stream[substream-&gt;stream];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 azx_adjust_codec_delay(struct snd_pcm_substream *substream,</div><div class='add'>+				u64 nsec)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+	u64 codec_frames, codec_nsecs;</div><div class='add'>+</div><div class='add'>+	if (!hinfo-&gt;ops.get_delay)</div><div class='add'>+		return nsec;</div><div class='add'>+</div><div class='add'>+	codec_frames = hinfo-&gt;ops.get_delay(hinfo, apcm-&gt;codec, substream);</div><div class='add'>+	codec_nsecs = div_u64(codec_frames * 1000000000LL,</div><div class='add'>+			      substream-&gt;runtime-&gt;rate);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+		return nsec + codec_nsecs;</div><div class='add'>+</div><div class='add'>+	return (nsec &gt; codec_nsecs) ? nsec - codec_nsecs : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * PCM ops</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int azx_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+</div><div class='add'>+	trace_azx_pcm_close(chip, azx_dev);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;open_mutex) {</div><div class='add'>+		azx_release_device(azx_dev);</div><div class='add'>+		if (hinfo-&gt;ops.close)</div><div class='add'>+			hinfo-&gt;ops.close(hinfo, apcm-&gt;codec, substream);</div><div class='add'>+		snd_hda_power_down(apcm-&gt;codec);</div><div class='add'>+	}</div><div class='add'>+	snd_hda_codec_pcm_put(apcm-&gt;info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			     struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	struct hdac_stream *hdas = azx_stream(azx_dev);</div><div class='add'>+</div><div class='add'>+	trace_azx_pcm_hw_params(chip, azx_dev);</div><div class='add'>+	guard_dsp_lock(azx_dev);</div><div class='add'>+	if (dsp_is_locked(azx_dev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Set up BDLEs here, return -ENOMEM if too many BDLEs are required */</div><div class='add'>+	hdas-&gt;bufsize = params_buffer_bytes(hw_params);</div><div class='add'>+	hdas-&gt;period_bytes = params_period_bytes(hw_params);</div><div class='add'>+	hdas-&gt;format_val = 0;</div><div class='add'>+	hdas-&gt;no_period_wakeup =</div><div class='add'>+		(hw_params-&gt;info &amp; SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) &amp;&amp;</div><div class='add'>+		(hw_params-&gt;flags &amp; SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP);</div><div class='add'>+	if (snd_hdac_stream_setup_periods(hdas) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+</div><div class='add'>+	/* reset BDL address */</div><div class='add'>+	guard_dsp_lock(azx_dev);</div><div class='add'>+	if (!dsp_is_locked(azx_dev))</div><div class='add'>+		snd_hdac_stream_cleanup(azx_stream(azx_dev));</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_cleanup(apcm-&gt;codec, hinfo, substream);</div><div class='add'>+</div><div class='add'>+	azx_stream(azx_dev)-&gt;prepared = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int format_val, stream_tag, bits;</div><div class='add'>+	int err;</div><div class='add'>+	struct hda_spdif_out *spdif =</div><div class='add'>+		snd_hda_spdif_out_of_nid(apcm-&gt;codec, hinfo-&gt;nid);</div><div class='add'>+	unsigned short ctls = spdif ? spdif-&gt;ctls : 0;</div><div class='add'>+</div><div class='add'>+	trace_azx_pcm_prepare(chip, azx_dev);</div><div class='add'>+	guard_dsp_lock(azx_dev);</div><div class='add'>+	if (dsp_is_locked(azx_dev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_reset(azx_stream(azx_dev));</div><div class='add'>+	bits = snd_hdac_stream_format_bits(runtime-&gt;format, SNDRV_PCM_SUBFORMAT_STD, hinfo-&gt;maxbps);</div><div class='add'>+</div><div class='add'>+	format_val = snd_hdac_spdif_stream_format(runtime-&gt;channels, bits, runtime-&gt;rate, ctls);</div><div class='add'>+	if (!format_val) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"invalid format_val, rate=%d, ch=%d, format=%d\n",</div><div class='add'>+			runtime-&gt;rate, runtime-&gt;channels, runtime-&gt;format);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_stream_set_params(azx_stream(azx_dev), format_val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_setup(azx_stream(azx_dev), false);</div><div class='add'>+</div><div class='add'>+	stream_tag = azx_dev-&gt;core.stream_tag;</div><div class='add'>+	/* CA-IBG chips need the playback stream starting from 1 */</div><div class='add'>+	if ((chip-&gt;driver_caps &amp; AZX_DCAPS_CTX_WORKAROUND) &amp;&amp;</div><div class='add'>+	    stream_tag &gt; chip-&gt;capture_streams)</div><div class='add'>+		stream_tag -= chip-&gt;capture_streams;</div><div class='add'>+	err = snd_hda_codec_prepare(apcm-&gt;codec, hinfo, stream_tag,</div><div class='add'>+				     azx_dev-&gt;core.format_val, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	azx_stream(azx_dev)-&gt;prepared = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct azx_dev *azx_dev;</div><div class='add'>+	struct snd_pcm_substream *s;</div><div class='add'>+	struct hdac_stream *hstr;</div><div class='add'>+	bool start;</div><div class='add'>+	int sbits = 0;</div><div class='add'>+	int sync_reg;</div><div class='add'>+</div><div class='add'>+	azx_dev = get_azx_dev(substream);</div><div class='add'>+	trace_azx_pcm_trigger(chip, azx_dev, cmd);</div><div class='add'>+</div><div class='add'>+	hstr = azx_stream(azx_dev);</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_OLD_SSYNC)</div><div class='add'>+		sync_reg = AZX_REG_OLD_SSYNC;</div><div class='add'>+	else</div><div class='add'>+		sync_reg = AZX_REG_SSYNC;</div><div class='add'>+</div><div class='add'>+	if (dsp_is_locked(azx_dev) || !hstr-&gt;prepared)</div><div class='add'>+		return -EPIPE;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='add'>+		start = true;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		start = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+		if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='add'>+			continue;</div><div class='add'>+		azx_dev = get_azx_dev(s);</div><div class='add'>+		sbits |= 1 &lt;&lt; azx_dev-&gt;core.index;</div><div class='add'>+		snd_pcm_trigger_done(s, substream);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;bus-&gt;reg_lock) {</div><div class='add'>+		/* first, set SYNC bits of corresponding streams */</div><div class='add'>+		snd_hdac_stream_sync_trigger(hstr, true, sbits, sync_reg);</div><div class='add'>+</div><div class='add'>+		snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+			if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='add'>+				continue;</div><div class='add'>+			azx_dev = get_azx_dev(s);</div><div class='add'>+			if (start) {</div><div class='add'>+				azx_dev-&gt;insufficient = 1;</div><div class='add'>+				snd_hdac_stream_start(azx_stream(azx_dev));</div><div class='add'>+			} else {</div><div class='add'>+				snd_hdac_stream_stop(azx_stream(azx_dev));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_sync(hstr, start, sbits);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	/* reset SYNC bits */</div><div class='add'>+	snd_hdac_stream_sync_trigger(hstr, false, sbits, sync_reg);</div><div class='add'>+	snd_hdac_stream_timecounter_init(hstr, sbits, start);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_get_pos_lpib);</div><div class='add'>+</div><div class='add'>+unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_stream_get_pos_posbuf(azx_stream(azx_dev));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_get_pos_posbuf);</div><div class='add'>+</div><div class='add'>+unsigned int azx_get_position(struct azx *chip,</div><div class='add'>+			      struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;core.substream;</div><div class='add'>+	unsigned int pos;</div><div class='add'>+	int stream = substream-&gt;stream;</div><div class='add'>+	int delay = 0;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;get_position[stream])</div><div class='add'>+		pos = chip-&gt;get_position[stream](chip, azx_dev);</div><div class='add'>+	else /* use the position buffer as default */</div><div class='add'>+		pos = azx_get_pos_posbuf(chip, azx_dev);</div><div class='add'>+</div><div class='add'>+	if (pos &gt;= azx_dev-&gt;core.bufsize)</div><div class='add'>+		pos = 0;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;runtime) {</div><div class='add'>+		struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+		struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+</div><div class='add'>+		if (chip-&gt;get_delay[stream])</div><div class='add'>+			delay += chip-&gt;get_delay[stream](chip, azx_dev, pos);</div><div class='add'>+		if (hinfo-&gt;ops.get_delay)</div><div class='add'>+			delay += hinfo-&gt;ops.get_delay(hinfo, apcm-&gt;codec,</div><div class='add'>+						      substream);</div><div class='add'>+		substream-&gt;runtime-&gt;delay = delay;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	trace_azx_get_position(chip, azx_dev, pos, delay);</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_get_position);</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime,</div><div class='add'>+			       azx_get_position(chip, azx_dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * azx_scale64: Scale base by mult/div while not overflowing sanely</div><div class='add'>+ *</div><div class='add'>+ * Derived from scale64_check_overflow in kernel/time/timekeeping.c</div><div class='add'>+ *</div><div class='add'>+ * The tmestamps for a 48Khz stream can overflow after (2^64/10^9)/48K which</div><div class='add'>+ * is about 384307 ie ~4.5 days.</div><div class='add'>+ *</div><div class='add'>+ * This scales the calculation so that overflow will happen but after 2^64 /</div><div class='add'>+ * 48000 secs, which is pretty large!</div><div class='add'>+ *</div><div class='add'>+ * In caln below:</div><div class='add'>+ *	base may overflow, but since there isn’t any additional division</div><div class='add'>+ *	performed on base it’s OK</div><div class='add'>+ *	rem can’t overflow because both are 32-bit values</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+static u64 azx_scale64(u64 base, u32 num, u32 den)</div><div class='add'>+{</div><div class='add'>+	u64 rem;</div><div class='add'>+</div><div class='add'>+	rem = do_div(base, den);</div><div class='add'>+</div><div class='add'>+	base *= num;</div><div class='add'>+	rem *= num;</div><div class='add'>+</div><div class='add'>+	do_div(rem, den);</div><div class='add'>+</div><div class='add'>+	return base + rem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_get_sync_time(ktime_t *device,</div><div class='add'>+		struct system_counterval_t *system, void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = ctx;</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	u64 ll_counter, ll_counter_l, ll_counter_h;</div><div class='add'>+	u64 tsc_counter, tsc_counter_l, tsc_counter_h;</div><div class='add'>+	u32 wallclk_ctr, wallclk_cycles;</div><div class='add'>+	bool direction;</div><div class='add'>+	u32 dma_select;</div><div class='add'>+	u32 timeout;</div><div class='add'>+	u32 retry_count = 0;</div><div class='add'>+</div><div class='add'>+	runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		direction = 1;</div><div class='add'>+	else</div><div class='add'>+		direction = 0;</div><div class='add'>+</div><div class='add'>+	/* 0th stream tag is not used, so DMA ch 0 is for 1st stream tag */</div><div class='add'>+	do {</div><div class='add'>+		timeout = 100;</div><div class='add'>+		dma_select = (direction &lt;&lt; GTSCC_CDMAS_DMA_DIR_SHIFT) |</div><div class='add'>+					(azx_dev-&gt;core.stream_tag - 1);</div><div class='add'>+		snd_hdac_chip_writel(azx_bus(chip), GTSCC, dma_select);</div><div class='add'>+</div><div class='add'>+		/* Enable the capture */</div><div class='add'>+		snd_hdac_chip_updatel(azx_bus(chip), GTSCC, 0, GTSCC_TSCCI_MASK);</div><div class='add'>+</div><div class='add'>+		while (timeout) {</div><div class='add'>+			if (snd_hdac_chip_readl(azx_bus(chip), GTSCC) &amp;</div><div class='add'>+						GTSCC_TSCCD_MASK)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			timeout--;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!timeout) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "GTSCC capture Timedout!\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Read wall clock counter */</div><div class='add'>+		wallclk_ctr = snd_hdac_chip_readl(azx_bus(chip), WALFCC);</div><div class='add'>+</div><div class='add'>+		/* Read TSC counter */</div><div class='add'>+		tsc_counter_l = snd_hdac_chip_readl(azx_bus(chip), TSCCL);</div><div class='add'>+		tsc_counter_h = snd_hdac_chip_readl(azx_bus(chip), TSCCU);</div><div class='add'>+</div><div class='add'>+		/* Read Link counter */</div><div class='add'>+		ll_counter_l = snd_hdac_chip_readl(azx_bus(chip), LLPCL);</div><div class='add'>+		ll_counter_h = snd_hdac_chip_readl(azx_bus(chip), LLPCU);</div><div class='add'>+</div><div class='add'>+		/* Ack: registers read done */</div><div class='add'>+		snd_hdac_chip_writel(azx_bus(chip), GTSCC, GTSCC_TSCCD_SHIFT);</div><div class='add'>+</div><div class='add'>+		tsc_counter = (tsc_counter_h &lt;&lt; TSCCU_CCU_SHIFT) |</div><div class='add'>+						tsc_counter_l;</div><div class='add'>+</div><div class='add'>+		ll_counter = (ll_counter_h &lt;&lt; LLPC_CCU_SHIFT) |	ll_counter_l;</div><div class='add'>+		wallclk_cycles = wallclk_ctr &amp; WALFCC_CIF_MASK;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * An error occurs near frame "rollover". The clocks in</div><div class='add'>+		 * frame value indicates whether this error may have</div><div class='add'>+		 * occurred. Here we use the value of 10 i.e.,</div><div class='add'>+		 * HDA_MAX_CYCLE_OFFSET</div><div class='add'>+		 */</div><div class='add'>+		if (wallclk_cycles &lt; HDA_MAX_CYCLE_VALUE - HDA_MAX_CYCLE_OFFSET</div><div class='add'>+					&amp;&amp; wallclk_cycles &gt; HDA_MAX_CYCLE_OFFSET)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Sleep before we read again, else we may again get</div><div class='add'>+		 * value near to MAX_CYCLE. Try to sleep for different</div><div class='add'>+		 * amount of time so we dont hit the same number again</div><div class='add'>+		 */</div><div class='add'>+		udelay(retry_count++);</div><div class='add'>+</div><div class='add'>+	} while (retry_count != HDA_MAX_CYCLE_READ_RETRY);</div><div class='add'>+</div><div class='add'>+	if (retry_count == HDA_MAX_CYCLE_READ_RETRY) {</div><div class='add'>+		dev_err_ratelimited(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Error in WALFCC cycle count\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*device = ns_to_ktime(azx_scale64(ll_counter,</div><div class='add'>+				NSEC_PER_SEC, runtime-&gt;rate));</div><div class='add'>+	*device = ktime_add_ns(*device, (wallclk_cycles * NSEC_PER_SEC) /</div><div class='add'>+			       ((HDA_MAX_CYCLE_VALUE + 1) * runtime-&gt;rate));</div><div class='add'>+</div><div class='add'>+	system-&gt;cycles = tsc_counter;</div><div class='add'>+	system-&gt;cs_id = CSID_X86_ART;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+static int azx_get_sync_time(ktime_t *device,</div><div class='add'>+		struct system_counterval_t *system, void *ctx)</div><div class='add'>+{</div><div class='add'>+	return -ENXIO;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int azx_get_crosststamp(struct snd_pcm_substream *substream,</div><div class='add'>+			      struct system_device_crosststamp *xtstamp)</div><div class='add'>+{</div><div class='add'>+	return get_device_system_crosststamp(azx_get_sync_time,</div><div class='add'>+					substream, NULL, xtstamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_link_time_supported(struct snd_pcm_runtime *runtime,</div><div class='add'>+				struct snd_pcm_audio_tstamp_config *ts)</div><div class='add'>+{</div><div class='add'>+	if (runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME)</div><div class='add'>+		if (ts-&gt;type_requested == SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_get_time_info(struct snd_pcm_substream *substream,</div><div class='add'>+			struct timespec64 *system_ts, struct timespec64 *audio_ts,</div><div class='add'>+			struct snd_pcm_audio_tstamp_config *audio_tstamp_config,</div><div class='add'>+			struct snd_pcm_audio_tstamp_report *audio_tstamp_report)</div><div class='add'>+{</div><div class='add'>+	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct system_device_crosststamp xtstamp;</div><div class='add'>+	int ret;</div><div class='add'>+	u64 nsec;</div><div class='add'>+</div><div class='add'>+	if ((substream-&gt;runtime-&gt;hw.info &amp; SNDRV_PCM_INFO_HAS_LINK_ATIME) &amp;&amp;</div><div class='add'>+		(audio_tstamp_config-&gt;type_requested == SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK)) {</div><div class='add'>+</div><div class='add'>+		snd_pcm_gettime(substream-&gt;runtime, system_ts);</div><div class='add'>+</div><div class='add'>+		nsec = timecounter_read(&amp;azx_dev-&gt;core.tc);</div><div class='add'>+		if (audio_tstamp_config-&gt;report_delay)</div><div class='add'>+			nsec = azx_adjust_codec_delay(substream, nsec);</div><div class='add'>+</div><div class='add'>+		*audio_ts = ns_to_timespec64(nsec);</div><div class='add'>+</div><div class='add'>+		audio_tstamp_report-&gt;actual_type = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK;</div><div class='add'>+		audio_tstamp_report-&gt;accuracy_report = 1; /* rest of structure is valid */</div><div class='add'>+		audio_tstamp_report-&gt;accuracy = 42; /* 24 MHz WallClock == 42ns resolution */</div><div class='add'>+</div><div class='add'>+	} else if (is_link_time_supported(runtime, audio_tstamp_config)) {</div><div class='add'>+</div><div class='add'>+		ret = azx_get_crosststamp(substream, &amp;xtstamp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		switch (runtime-&gt;tstamp_type) {</div><div class='add'>+		case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		case SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW:</div><div class='add'>+			*system_ts = ktime_to_timespec64(xtstamp.sys_monoraw);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			*system_ts = ktime_to_timespec64(xtstamp.sys_realtime);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*audio_ts = ktime_to_timespec64(xtstamp.device);</div><div class='add'>+</div><div class='add'>+		audio_tstamp_report-&gt;actual_type =</div><div class='add'>+			SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED;</div><div class='add'>+		audio_tstamp_report-&gt;accuracy_report = 1;</div><div class='add'>+		/* 24 MHz WallClock == 42ns resolution */</div><div class='add'>+		audio_tstamp_report-&gt;accuracy = 42;</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		audio_tstamp_report-&gt;actual_type = SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hardware azx_pcm_hw = {</div><div class='add'>+	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='add'>+				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+				 /* No full-resume yet implemented */</div><div class='add'>+				 /* SNDRV_PCM_INFO_RESUME |*/</div><div class='add'>+				 SNDRV_PCM_INFO_PAUSE |</div><div class='add'>+				 SNDRV_PCM_INFO_SYNC_START |</div><div class='add'>+				 SNDRV_PCM_INFO_HAS_WALL_CLOCK | /* legacy */</div><div class='add'>+				 SNDRV_PCM_INFO_HAS_LINK_ATIME |</div><div class='add'>+				 SNDRV_PCM_INFO_NO_PERIOD_WAKEUP),</div><div class='add'>+	.formats =		SNDRV_PCM_FMTBIT_S16_LE,</div><div class='add'>+	.rates =		SNDRV_PCM_RATE_48000,</div><div class='add'>+	.rate_min =		48000,</div><div class='add'>+	.rate_max =		48000,</div><div class='add'>+	.channels_min =		2,</div><div class='add'>+	.channels_max =		2,</div><div class='add'>+	.buffer_bytes_max =	AZX_MAX_BUF_SIZE,</div><div class='add'>+	.period_bytes_min =	128,</div><div class='add'>+	.period_bytes_max =	AZX_MAX_BUF_SIZE / 2,</div><div class='add'>+	.periods_min =		2,</div><div class='add'>+	.periods_max =		AZX_MAX_FRAG,</div><div class='add'>+	.fifo_size =		0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int azx_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);</div><div class='add'>+	struct azx *chip = apcm-&gt;chip;</div><div class='add'>+	struct azx_dev *azx_dev;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+	int buff_step;</div><div class='add'>+</div><div class='add'>+	snd_hda_codec_pcm_get(apcm-&gt;info);</div><div class='add'>+	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	azx_dev = azx_assign_device(chip, substream);</div><div class='add'>+	trace_azx_pcm_open(chip, azx_dev);</div><div class='add'>+	if (azx_dev == NULL) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	runtime-&gt;private_data = azx_dev;</div><div class='add'>+</div><div class='add'>+	runtime-&gt;hw = azx_pcm_hw;</div><div class='add'>+	if (chip-&gt;gts_present)</div><div class='add'>+		runtime-&gt;hw.info |= SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME;</div><div class='add'>+	runtime-&gt;hw.channels_min = hinfo-&gt;channels_min;</div><div class='add'>+	runtime-&gt;hw.channels_max = hinfo-&gt;channels_max;</div><div class='add'>+	runtime-&gt;hw.formats = hinfo-&gt;formats;</div><div class='add'>+	runtime-&gt;hw.rates = hinfo-&gt;rates;</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+</div><div class='add'>+	/* avoid wrap-around with wall-clock */</div><div class='add'>+	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_TIME,</div><div class='add'>+				     20,</div><div class='add'>+				     178000000);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;align_buffer_size)</div><div class='add'>+		/* constrain buffer sizes to be multiple of 128</div><div class='add'>+		   bytes. This is more efficient in terms of memory</div><div class='add'>+		   access but isn't required by the HDA spec and</div><div class='add'>+		   prevents users from specifying exact period/buffer</div><div class='add'>+		   sizes. For example for 44.1kHz, a period size set</div><div class='add'>+		   to 20ms will be rounded to 19.59ms. */</div><div class='add'>+		buff_step = 128;</div><div class='add'>+	else</div><div class='add'>+		/* Don't enforce steps on buffer sizes, still need to</div><div class='add'>+		   be multiple of 4 bytes (HDA spec). Tested on Intel</div><div class='add'>+		   HDA controllers, may not work on all devices where</div><div class='add'>+		   option needs to be disabled */</div><div class='add'>+		buff_step = 4;</div><div class='add'>+</div><div class='add'>+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='add'>+				   buff_step);</div><div class='add'>+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='add'>+				   buff_step);</div><div class='add'>+	snd_hda_power_up(apcm-&gt;codec);</div><div class='add'>+	if (hinfo-&gt;ops.open)</div><div class='add'>+		err = hinfo-&gt;ops.open(hinfo, apcm-&gt;codec, substream);</div><div class='add'>+	else</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		azx_release_device(azx_dev);</div><div class='add'>+		goto powerdown;</div><div class='add'>+	}</div><div class='add'>+	snd_pcm_limit_hw_rates(runtime);</div><div class='add'>+	/* sanity check */</div><div class='add'>+	if (snd_BUG_ON(!runtime-&gt;hw.channels_min) ||</div><div class='add'>+	    snd_BUG_ON(!runtime-&gt;hw.channels_max) ||</div><div class='add'>+	    snd_BUG_ON(!runtime-&gt;hw.formats) ||</div><div class='add'>+	    snd_BUG_ON(!runtime-&gt;hw.rates)) {</div><div class='add'>+		azx_release_device(azx_dev);</div><div class='add'>+		if (hinfo-&gt;ops.close)</div><div class='add'>+			hinfo-&gt;ops.close(hinfo, apcm-&gt;codec, substream);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto powerdown;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* disable LINK_ATIME timestamps for capture streams</div><div class='add'>+	   until we figure out how to handle digital inputs */</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		runtime-&gt;hw.info &amp;= ~SNDRV_PCM_INFO_HAS_WALL_CLOCK; /* legacy */</div><div class='add'>+		runtime-&gt;hw.info &amp;= ~SNDRV_PCM_INFO_HAS_LINK_ATIME;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_sync(substream);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ powerdown:</div><div class='add'>+	snd_hda_power_down(apcm-&gt;codec);</div><div class='add'>+ unlock:</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	snd_hda_codec_pcm_put(apcm-&gt;info);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops azx_pcm_ops = {</div><div class='add'>+	.open = azx_pcm_open,</div><div class='add'>+	.close = azx_pcm_close,</div><div class='add'>+	.hw_params = azx_pcm_hw_params,</div><div class='add'>+	.hw_free = azx_pcm_hw_free,</div><div class='add'>+	.prepare = azx_pcm_prepare,</div><div class='add'>+	.trigger = azx_pcm_trigger,</div><div class='add'>+	.pointer = azx_pcm_pointer,</div><div class='add'>+	.get_time_info =  azx_get_time_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void azx_pcm_free(struct snd_pcm *pcm)</div><div class='add'>+{</div><div class='add'>+	struct azx_pcm *apcm = pcm-&gt;private_data;</div><div class='add'>+	if (apcm) {</div><div class='add'>+		list_del(&amp;apcm-&gt;list);</div><div class='add'>+		apcm-&gt;info-&gt;pcm = NULL;</div><div class='add'>+		kfree(apcm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_PREALLOC_SIZE	(32 * 1024 * 1024)</div><div class='add'>+</div><div class='add'>+int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec,</div><div class='add'>+			      struct hda_pcm *cpcm)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = &amp;_bus-&gt;core;</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	struct azx_pcm *apcm;</div><div class='add'>+	int pcm_dev = cpcm-&gt;device;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	int s, err;</div><div class='add'>+	int type = SNDRV_DMA_TYPE_DEV_SG;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(apcm, &amp;chip-&gt;pcm_list, list) {</div><div class='add'>+		if (apcm-&gt;pcm-&gt;device == pcm_dev) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "PCM %d already exists\n",</div><div class='add'>+				pcm_dev);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, cpcm-&gt;name, pcm_dev,</div><div class='add'>+			  cpcm-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].substreams,</div><div class='add'>+			  cpcm-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams,</div><div class='add'>+			  &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	strscpy(pcm-&gt;name, cpcm-&gt;name, sizeof(pcm-&gt;name));</div><div class='add'>+	apcm = kzalloc(sizeof(*apcm), GFP_KERNEL);</div><div class='add'>+	if (apcm == NULL) {</div><div class='add'>+		snd_device_free(chip-&gt;card, pcm);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	apcm-&gt;chip = chip;</div><div class='add'>+	apcm-&gt;pcm = pcm;</div><div class='add'>+	apcm-&gt;codec = codec;</div><div class='add'>+	apcm-&gt;info = cpcm;</div><div class='add'>+	pcm-&gt;private_data = apcm;</div><div class='add'>+	pcm-&gt;private_free = azx_pcm_free;</div><div class='add'>+	if (cpcm-&gt;pcm_type == HDA_PCM_TYPE_MODEM)</div><div class='add'>+		pcm-&gt;dev_class = SNDRV_PCM_CLASS_MODEM;</div><div class='add'>+	list_add_tail(&amp;apcm-&gt;list, &amp;chip-&gt;pcm_list);</div><div class='add'>+	cpcm-&gt;pcm = pcm;</div><div class='add'>+	for (s = 0; s &lt; 2; s++) {</div><div class='add'>+		if (cpcm-&gt;stream[s].substreams)</div><div class='add'>+			snd_pcm_set_ops(pcm, s, &amp;azx_pcm_ops);</div><div class='add'>+	}</div><div class='add'>+	/* buffer pre-allocation */</div><div class='add'>+	size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024;</div><div class='add'>+	if (size &gt; MAX_PREALLOC_SIZE)</div><div class='add'>+		size = MAX_PREALLOC_SIZE;</div><div class='add'>+	if (chip-&gt;uc_buffer)</div><div class='add'>+		type = SNDRV_DMA_TYPE_DEV_WC_SG;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, type, chip-&gt;card-&gt;dev,</div><div class='add'>+				       size, MAX_PREALLOC_SIZE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int azx_command_addr(u32 cmd)</div><div class='add'>+{</div><div class='add'>+	unsigned int addr = cmd &gt;&gt; 28;</div><div class='add'>+</div><div class='add'>+	if (addr &gt;= AZX_MAX_CODECS) {</div><div class='add'>+		snd_BUG();</div><div class='add'>+		addr = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* receive a response */</div><div class='add'>+static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+				 unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct hda_bus *hbus = &amp;chip-&gt;bus;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+ again:</div><div class='add'>+	err = snd_hdac_bus_get_response(bus, addr, res);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (hbus-&gt;no_response_fallback)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;polling_mode) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "azx_get_response timeout, switching to polling mode: last cmd=0x%08x\n",</div><div class='add'>+			 bus-&gt;last_cmd[addr]);</div><div class='add'>+		bus-&gt;polling_mode = 1;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;msi) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "No response from codec, disabling MSI: last cmd=0x%08x\n",</div><div class='add'>+			 bus-&gt;last_cmd[addr]);</div><div class='add'>+		if (chip-&gt;ops-&gt;disable_msi_reset_irq &amp;&amp;</div><div class='add'>+		    chip-&gt;ops-&gt;disable_msi_reset_irq(chip) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;probing) {</div><div class='add'>+		/* If this critical timeout happens during the codec probing</div><div class='add'>+		 * phase, this is likely an access to a non-existing codec</div><div class='add'>+		 * slot.  Better to return an error and reset the system.</div><div class='add'>+		 */</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no fallback mechanism? */</div><div class='add'>+	if (!chip-&gt;fallback_to_single_cmd)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* a fatal communication error; need either to reset or to fallback</div><div class='add'>+	 * to the single_cmd mode</div><div class='add'>+	 */</div><div class='add'>+	if (hbus-&gt;allow_bus_reset &amp;&amp; !hbus-&gt;response_reset &amp;&amp; !hbus-&gt;in_reset) {</div><div class='add'>+		hbus-&gt;response_reset = 1;</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"No response from codec, resetting bus: last cmd=0x%08x\n",</div><div class='add'>+			bus-&gt;last_cmd[addr]);</div><div class='add'>+		return -EAGAIN; /* give a chance to retry */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n",</div><div class='add'>+		bus-&gt;last_cmd[addr]);</div><div class='add'>+	chip-&gt;single_cmd = 1;</div><div class='add'>+	hbus-&gt;response_reset = 0;</div><div class='add'>+	snd_hdac_bus_stop_cmd_io(bus);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Use the single immediate command instead of CORB/RIRB for simplicity</div><div class='add'>+ *</div><div class='add'>+ * Note: according to Intel, this is not preferred use.  The command was</div><div class='add'>+ *       intended for the BIOS only, and may get confused with unsolicited</div><div class='add'>+ *       responses.  So, we shouldn't use it for normal operation from the</div><div class='add'>+ *       driver.</div><div class='add'>+ *       I left the codes, however, for debugging/testing purposes.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* receive a response */</div><div class='add'>+static int azx_single_wait_for_response(struct azx *chip, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	int timeout = 50;</div><div class='add'>+</div><div class='add'>+	while (timeout--) {</div><div class='add'>+		/* check IRV busy bit */</div><div class='add'>+		if (azx_readw(chip, IRS) &amp; AZX_IRS_VALID) {</div><div class='add'>+			/* reuse rirb.res as the response return value */</div><div class='add'>+			azx_bus(chip)-&gt;rirb.res[addr] = azx_readl(chip, IR);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+	if (printk_ratelimit())</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "get_response timeout: IRS=0x%x\n",</div><div class='add'>+			azx_readw(chip, IRS));</div><div class='add'>+	azx_bus(chip)-&gt;rirb.res[addr] = -1;</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* send a command */</div><div class='add'>+static int azx_single_send_cmd(struct hdac_bus *bus, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	unsigned int addr = azx_command_addr(val);</div><div class='add'>+	int timeout = 50;</div><div class='add'>+</div><div class='add'>+	bus-&gt;last_cmd[azx_command_addr(val)] = val;</div><div class='add'>+	while (timeout--) {</div><div class='add'>+		/* check ICB busy bit */</div><div class='add'>+		if (!((azx_readw(chip, IRS) &amp; AZX_IRS_BUSY))) {</div><div class='add'>+			/* Clear IRV valid bit */</div><div class='add'>+			azx_writew(chip, IRS, azx_readw(chip, IRS) |</div><div class='add'>+				   AZX_IRS_VALID);</div><div class='add'>+			azx_writel(chip, IC, val);</div><div class='add'>+			azx_writew(chip, IRS, azx_readw(chip, IRS) |</div><div class='add'>+				   AZX_IRS_BUSY);</div><div class='add'>+			return azx_single_wait_for_response(chip, addr);</div><div class='add'>+		}</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+	if (printk_ratelimit())</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"send_cmd timeout: IRS=0x%x, val=0x%x\n",</div><div class='add'>+			azx_readw(chip, IRS), val);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* receive a response */</div><div class='add'>+static int azx_single_get_response(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+				   unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	if (res)</div><div class='add'>+		*res = bus-&gt;rirb.res[addr];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The below are the main callbacks from hda_codec.</div><div class='add'>+ *</div><div class='add'>+ * They are just the skeleton to call sub-callbacks according to the</div><div class='add'>+ * current setting of chip-&gt;single_cmd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* send a command */</div><div class='add'>+static int azx_send_cmd(struct hdac_bus *bus, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;disabled)</div><div class='add'>+		return 0;</div><div class='add'>+	if (chip-&gt;single_cmd || bus-&gt;use_pio_for_commands)</div><div class='add'>+		return azx_single_send_cmd(bus, val);</div><div class='add'>+	else</div><div class='add'>+		return snd_hdac_bus_send_cmd(bus, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get a response */</div><div class='add'>+static int azx_get_response(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+			    unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;disabled)</div><div class='add'>+		return 0;</div><div class='add'>+	if (chip-&gt;single_cmd || bus-&gt;use_pio_for_commands)</div><div class='add'>+		return azx_single_get_response(bus, addr, res);</div><div class='add'>+	else</div><div class='add'>+		return azx_rirb_get_response(bus, addr, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hdac_bus_ops bus_core_ops = {</div><div class='add'>+	.command = azx_send_cmd,</div><div class='add'>+	.get_response = azx_get_response,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_DSP_LOADER</div><div class='add'>+/*</div><div class='add'>+ * DSP loading code (e.g. for CA0132)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* use the first stream for loading DSP */</div><div class='add'>+static struct azx_dev *</div><div class='add'>+azx_get_dsp_loader_dev(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list)</div><div class='add'>+		if (s-&gt;index == chip-&gt;playback_index_offset)</div><div class='add'>+			return stream_to_azx_dev(s);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_codec_load_dsp_prepare(struct hda_codec *codec, unsigned int format,</div><div class='add'>+				   unsigned int byte_size,</div><div class='add'>+				   struct snd_dma_buffer *bufp)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = &amp;codec-&gt;bus-&gt;core;</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct azx_dev *azx_dev;</div><div class='add'>+	struct hdac_stream *hstr;</div><div class='add'>+	bool saved = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	azx_dev = azx_get_dsp_loader_dev(chip);</div><div class='add'>+	hstr = azx_stream(azx_dev);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+		if (hstr-&gt;opened) {</div><div class='add'>+			chip-&gt;saved_azx_dev = *azx_dev;</div><div class='add'>+			saved = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_dsp_prepare(hstr, format, byte_size, bufp);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+		if (saved)</div><div class='add'>+			*azx_dev = chip-&gt;saved_azx_dev;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hstr-&gt;prepared = 0;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_prepare);</div><div class='add'>+</div><div class='add'>+void snd_hda_codec_load_dsp_trigger(struct hda_codec *codec, bool start)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = &amp;codec-&gt;bus-&gt;core;</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);</div><div class='add'>+</div><div class='add'>+	snd_hdac_dsp_trigger(azx_stream(azx_dev), start);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_trigger);</div><div class='add'>+</div><div class='add'>+void snd_hda_codec_load_dsp_cleanup(struct hda_codec *codec,</div><div class='add'>+				    struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = &amp;codec-&gt;bus-&gt;core;</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);</div><div class='add'>+	struct hdac_stream *hstr = azx_stream(azx_dev);</div><div class='add'>+</div><div class='add'>+	if (!dmab-&gt;area || !hstr-&gt;locked)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hdac_dsp_cleanup(hstr, dmab);</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	if (hstr-&gt;opened)</div><div class='add'>+		*azx_dev = chip-&gt;saved_azx_dev;</div><div class='add'>+	hstr-&gt;locked = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_codec_load_dsp_cleanup);</div><div class='add'>+#endif /* CONFIG_SND_HDA_DSP_LOADER */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * reset and start the controller registers</div><div class='add'>+ */</div><div class='add'>+void azx_init_chip(struct azx *chip, bool full_reset)</div><div class='add'>+{</div><div class='add'>+	if (snd_hdac_bus_init_chip(azx_bus(chip), full_reset)) {</div><div class='add'>+		/* correct RINTCNT for CXT */</div><div class='add'>+		if (chip-&gt;driver_caps &amp; AZX_DCAPS_CTX_WORKAROUND)</div><div class='add'>+			azx_writew(chip, RINTCNT, 0xc0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_init_chip);</div><div class='add'>+</div><div class='add'>+void azx_stop_all_streams(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+</div><div class='add'>+	snd_hdac_stop_streams(bus);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_stop_all_streams);</div><div class='add'>+</div><div class='add'>+void azx_stop_chip(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_bus_stop_chip(azx_bus(chip));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_stop_chip);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * interrupt handler</div><div class='add'>+ */</div><div class='add'>+static void stream_update(struct hdac_bus *bus, struct hdac_stream *s)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(bus);</div><div class='add'>+	struct azx_dev *azx_dev = stream_to_azx_dev(s);</div><div class='add'>+</div><div class='add'>+	/* check whether this IRQ is really acceptable */</div><div class='add'>+	if (!chip-&gt;ops-&gt;position_check ||</div><div class='add'>+	    chip-&gt;ops-&gt;position_check(chip, azx_dev)) {</div><div class='add'>+		spin_unlock(&amp;bus-&gt;reg_lock);</div><div class='add'>+		snd_pcm_period_elapsed(azx_stream(azx_dev)-&gt;substream);</div><div class='add'>+		spin_lock(&amp;bus-&gt;reg_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t azx_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = dev_id;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	u32 status;</div><div class='add'>+	bool active, handled = false;</div><div class='add'>+	int repeat = 0; /* count for avoiding endless loop */</div><div class='add'>+</div><div class='add'>+	if (azx_has_pm_runtime(chip))</div><div class='add'>+		if (!pm_runtime_active(chip-&gt;card-&gt;dev))</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;bus-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;disabled)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		status = azx_readl(chip, INTSTS);</div><div class='add'>+		if (status == 0 || status == 0xffffffff)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		handled = true;</div><div class='add'>+		active = false;</div><div class='add'>+		if (snd_hdac_bus_handle_stream_irq(bus, status, stream_update))</div><div class='add'>+			active = true;</div><div class='add'>+</div><div class='add'>+		status = azx_readb(chip, RIRBSTS);</div><div class='add'>+		if (status &amp; RIRB_INT_MASK) {</div><div class='add'>+			/*</div><div class='add'>+			 * Clearing the interrupt status here ensures that no</div><div class='add'>+			 * interrupt gets masked after the RIRB wp is read in</div><div class='add'>+			 * snd_hdac_bus_update_rirb. This avoids a possible</div><div class='add'>+			 * race condition where codec response in RIRB may</div><div class='add'>+			 * remain unserviced by IRQ, eventually falling back</div><div class='add'>+			 * to polling mode in azx_rirb_get_response.</div><div class='add'>+			 */</div><div class='add'>+			azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);</div><div class='add'>+			active = true;</div><div class='add'>+			if (status &amp; RIRB_INT_RESPONSE) {</div><div class='add'>+				if (chip-&gt;driver_caps &amp; AZX_DCAPS_CTX_WORKAROUND)</div><div class='add'>+					udelay(80);</div><div class='add'>+				snd_hdac_bus_update_rirb(bus);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (active &amp;&amp; ++repeat &lt; 10);</div><div class='add'>+</div><div class='add'>+	return IRQ_RETVAL(handled);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_interrupt);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Codec initerface</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Probe the given codec address</div><div class='add'>+ */</div><div class='add'>+static int probe_codec(struct azx *chip, int addr)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = (addr &lt;&lt; 28) | (AC_NODE_ROOT &lt;&lt; 20) |</div><div class='add'>+		(AC_VERB_PARAMETERS &lt;&lt; 8) | AC_PAR_VENDOR_ID;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int res = -1;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;bus-&gt;cmd_mutex) {</div><div class='add'>+		chip-&gt;probing = 1;</div><div class='add'>+		azx_send_cmd(bus, cmd);</div><div class='add'>+		err = azx_get_response(bus, addr, &amp;res);</div><div class='add'>+		chip-&gt;probing = 0;</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0 || res == -1)</div><div class='add'>+		return -EIO;</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "codec #%d probed OK\n", addr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_bus_reset(struct hda_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = bus_to_azx(&amp;bus-&gt;core);</div><div class='add'>+</div><div class='add'>+	bus-&gt;in_reset = 1;</div><div class='add'>+	azx_stop_chip(chip);</div><div class='add'>+	azx_init_chip(chip, true);</div><div class='add'>+	if (bus-&gt;core.chip_init)</div><div class='add'>+		snd_hda_bus_reset_codecs(bus);</div><div class='add'>+	bus-&gt;in_reset = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* HD-audio bus initialization */</div><div class='add'>+int azx_bus_init(struct azx *chip, const char *model)</div><div class='add'>+{</div><div class='add'>+	struct hda_bus *bus = &amp;chip-&gt;bus;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_bus_init(&amp;bus-&gt;core, chip-&gt;card-&gt;dev, &amp;bus_core_ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bus-&gt;card = chip-&gt;card;</div><div class='add'>+	mutex_init(&amp;bus-&gt;prepare_mutex);</div><div class='add'>+	bus-&gt;pci = chip-&gt;pci;</div><div class='add'>+	bus-&gt;modelname = model;</div><div class='add'>+	bus-&gt;mixer_assigned = -1;</div><div class='add'>+	bus-&gt;core.snoop = azx_snoop(chip);</div><div class='add'>+	if (chip-&gt;get_position[0] != azx_get_pos_lpib ||</div><div class='add'>+	    chip-&gt;get_position[1] != azx_get_pos_lpib)</div><div class='add'>+		bus-&gt;core.use_posbuf = true;</div><div class='add'>+	bus-&gt;core.bdl_pos_adj = chip-&gt;bdl_pos_adj;</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_CORBRP_SELF_CLEAR)</div><div class='add'>+		bus-&gt;core.corbrp_self_clear = true;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_4K_BDLE_BOUNDARY)</div><div class='add'>+		bus-&gt;core.align_bdle_4k = true;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_PIO_COMMANDS)</div><div class='add'>+		bus-&gt;core.use_pio_for_commands = true;</div><div class='add'>+</div><div class='add'>+	/* enable sync_write flag for stable communication as default */</div><div class='add'>+	bus-&gt;core.sync_write = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_bus_init);</div><div class='add'>+</div><div class='add'>+/* Probe codecs */</div><div class='add'>+int azx_probe_codecs(struct azx *chip, unsigned int max_slots)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	int c, codecs, err;</div><div class='add'>+</div><div class='add'>+	codecs = 0;</div><div class='add'>+	if (!max_slots)</div><div class='add'>+		max_slots = AZX_DEFAULT_CODECS;</div><div class='add'>+</div><div class='add'>+	/* First try to probe all given codec slots */</div><div class='add'>+	for (c = 0; c &lt; max_slots; c++) {</div><div class='add'>+		if ((bus-&gt;codec_mask &amp; (1 &lt;&lt; c)) &amp; chip-&gt;codec_probe_mask) {</div><div class='add'>+			if (probe_codec(chip, c) &lt; 0) {</div><div class='add'>+				/* Some BIOSen give you wrong codec addresses</div><div class='add'>+				 * that don't exist</div><div class='add'>+				 */</div><div class='add'>+				dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+					 "Codec #%d probe error; disabling it...\n", c);</div><div class='add'>+				bus-&gt;codec_mask &amp;= ~(1 &lt;&lt; c);</div><div class='add'>+				/* no codecs */</div><div class='add'>+				if (bus-&gt;codec_mask == 0)</div><div class='add'>+					break;</div><div class='add'>+				/* More badly, accessing to a non-existing</div><div class='add'>+				 * codec often screws up the controller chip,</div><div class='add'>+				 * and disturbs the further communications.</div><div class='add'>+				 * Thus if an error occurs during probing,</div><div class='add'>+				 * better to reset the controller chip to</div><div class='add'>+				 * get back to the sanity state.</div><div class='add'>+				 */</div><div class='add'>+				azx_stop_chip(chip);</div><div class='add'>+				azx_init_chip(chip, true);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Then create codec instances */</div><div class='add'>+	for (c = 0; c &lt; max_slots; c++) {</div><div class='add'>+		if ((bus-&gt;codec_mask &amp; (1 &lt;&lt; c)) &amp; chip-&gt;codec_probe_mask) {</div><div class='add'>+			struct hda_codec *codec;</div><div class='add'>+			err = snd_hda_codec_new(&amp;chip-&gt;bus, chip-&gt;card, c, &amp;codec);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				continue;</div><div class='add'>+			codec-&gt;jackpoll_interval = chip-&gt;jackpoll_interval;</div><div class='add'>+			codec-&gt;beep_mode = chip-&gt;beep_mode;</div><div class='add'>+			codec-&gt;ctl_dev_id = chip-&gt;ctl_dev_id;</div><div class='add'>+			codecs++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!codecs) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "no codecs initialized\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_probe_codecs);</div><div class='add'>+</div><div class='add'>+/* configure each codec instance */</div><div class='add'>+int azx_codec_configure(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec, *next;</div><div class='add'>+	int success = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_codec(codec, &amp;chip-&gt;bus) {</div><div class='add'>+		if (!snd_hda_codec_configure(codec))</div><div class='add'>+			success++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (success) {</div><div class='add'>+		/* unregister failed codecs if any codec has been probed */</div><div class='add'>+		list_for_each_codec_safe(codec, next, &amp;chip-&gt;bus) {</div><div class='add'>+			if (!codec-&gt;configured) {</div><div class='add'>+				codec_err(codec, "Unable to configure, disabling\n");</div><div class='add'>+				snd_hdac_device_unregister(&amp;codec-&gt;core);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return success ? 0 : -ENODEV;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_codec_configure);</div><div class='add'>+</div><div class='add'>+static int stream_direction(struct azx *chip, unsigned char index)</div><div class='add'>+{</div><div class='add'>+	if (index &gt;= chip-&gt;capture_index_offset &amp;&amp;</div><div class='add'>+	    index &lt; chip-&gt;capture_index_offset + chip-&gt;capture_streams)</div><div class='add'>+		return SNDRV_PCM_STREAM_CAPTURE;</div><div class='add'>+	return SNDRV_PCM_STREAM_PLAYBACK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* initialize SD streams */</div><div class='add'>+int azx_init_streams(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int stream_tags[2] = { 0, 0 };</div><div class='add'>+</div><div class='add'>+	/* initialize each stream (aka device)</div><div class='add'>+	 * assign the starting bdl address to each stream (device)</div><div class='add'>+	 * and initialize</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='add'>+		struct azx_dev *azx_dev = kzalloc(sizeof(*azx_dev), GFP_KERNEL);</div><div class='add'>+		int dir, tag;</div><div class='add'>+</div><div class='add'>+		if (!azx_dev)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		dir = stream_direction(chip, i);</div><div class='add'>+		/* stream tag must be unique throughout</div><div class='add'>+		 * the stream direction group,</div><div class='add'>+		 * valid values 1...15</div><div class='add'>+		 * use separate stream tag if the flag</div><div class='add'>+		 * AZX_DCAPS_SEPARATE_STREAM_TAG is used</div><div class='add'>+		 */</div><div class='add'>+		if (chip-&gt;driver_caps &amp; AZX_DCAPS_SEPARATE_STREAM_TAG)</div><div class='add'>+			tag = ++stream_tags[dir];</div><div class='add'>+		else</div><div class='add'>+			tag = i + 1;</div><div class='add'>+		snd_hdac_stream_init(azx_bus(chip), azx_stream(azx_dev),</div><div class='add'>+				     i, dir, tag);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_init_streams);</div><div class='add'>+</div><div class='add'>+void azx_free_streams(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;bus-&gt;stream_list)) {</div><div class='add'>+		s = list_first_entry(&amp;bus-&gt;stream_list, struct hdac_stream, list);</div><div class='add'>+		list_del(&amp;s-&gt;list);</div><div class='add'>+		kfree(stream_to_azx_dev(s));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(azx_free_streams);</div><div class='head'>diff --git a/sound/hda/common/controller_trace.h b/sound/hda/common/controller_trace.h<br/>new file mode 100644<br/>index 000000000000..7f5841f8919e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/controller_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/controller_trace.h</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM hda_controller</div><div class='add'>+#define TRACE_INCLUDE_FILE controller_trace</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_HDA_CONTROLLER_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_HDA_CONTROLLER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+struct azx;</div><div class='add'>+struct azx_dev;</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(azx_pcm_trigger,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *dev, int cmd),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(chip, dev, cmd),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( int, card )</div><div class='add'>+		__field( int, idx )</div><div class='add'>+		__field( int, cmd )</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = (chip)-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;idx = (dev)-&gt;core.index;</div><div class='add'>+		__entry-&gt;cmd = cmd;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("[%d:%d] cmd=%d", __entry-&gt;card, __entry-&gt;idx, __entry-&gt;cmd)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(azx_get_position,</div><div class='add'>+</div><div class='add'>+    TP_PROTO(struct azx *chip, struct azx_dev *dev, unsigned int pos, unsigned int delay),</div><div class='add'>+</div><div class='add'>+	    TP_ARGS(chip, dev, pos, delay),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( int, card )</div><div class='add'>+		__field( int, idx )</div><div class='add'>+		__field( unsigned int, pos )</div><div class='add'>+		__field( unsigned int, delay )</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;card = (chip)-&gt;card-&gt;number;</div><div class='add'>+		__entry-&gt;idx = (dev)-&gt;core.index;</div><div class='add'>+		__entry-&gt;pos = pos;</div><div class='add'>+		__entry-&gt;delay = delay;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("[%d:%d] pos=%u, delay=%u", __entry-&gt;card, __entry-&gt;idx, __entry-&gt;pos, __entry-&gt;delay)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(azx_pcm,</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(chip, azx_dev),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field( unsigned char, stream_tag )</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;stream_tag = (azx_dev)-&gt;core.stream_tag;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("stream_tag: %d", __entry-&gt;stream_tag)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(azx_pcm, azx_pcm_open,</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),</div><div class='add'>+	TP_ARGS(chip, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(azx_pcm, azx_pcm_close,</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),</div><div class='add'>+	TP_ARGS(chip, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(azx_pcm, azx_pcm_hw_params,</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),</div><div class='add'>+	TP_ARGS(chip, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(azx_pcm, azx_pcm_prepare,</div><div class='add'>+	TP_PROTO(struct azx *chip, struct azx_dev *azx_dev),</div><div class='add'>+	TP_ARGS(chip, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_HDA_CONTROLLER_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/hda/common/hda_auto_parser.h b/sound/hda/common/hda_auto_parser.h<br/>new file mode 100644<br/>index 000000000000..87af3d8c02f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hda_auto_parser.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hda_auto_parser.h</a></div><div class='hunk'>@@ -0,0 +1,118 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * BIOS auto-parser helper functions for HD-audio</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_HDA_AUTO_PARSER_H</div><div class='add'>+#define __SOUND_HDA_AUTO_PARSER_H</div><div class='add'>+</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Helper for automatic pin configuration</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AUTO_PIN_MIC,</div><div class='add'>+	AUTO_PIN_LINE_IN,</div><div class='add'>+	AUTO_PIN_CD,</div><div class='add'>+	AUTO_PIN_AUX,</div><div class='add'>+	AUTO_PIN_LAST</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AUTO_PIN_LINE_OUT,</div><div class='add'>+	AUTO_PIN_SPEAKER_OUT,</div><div class='add'>+	AUTO_PIN_HP_OUT</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AUTO_CFG_MAX_OUTS	HDA_MAX_OUTS</div><div class='add'>+#define AUTO_CFG_MAX_INS	18</div><div class='add'>+</div><div class='add'>+struct auto_pin_cfg_item {</div><div class='add'>+	hda_nid_t pin;</div><div class='add'>+	int type;</div><div class='add'>+	unsigned int is_headset_mic:1;</div><div class='add'>+	unsigned int is_headphone_mic:1; /* Mic-only in headphone jack */</div><div class='add'>+	unsigned int has_boost_on_pin:1;</div><div class='add'>+	int order;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct auto_pin_cfg;</div><div class='add'>+const char *hda_get_autocfg_input_label(struct hda_codec *codec,</div><div class='add'>+					const struct auto_pin_cfg *cfg,</div><div class='add'>+					int input);</div><div class='add'>+int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  const struct auto_pin_cfg *cfg,</div><div class='add'>+			  char *label, int maxlen, int *indexp);</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	INPUT_PIN_ATTR_UNUSED,	/* pin not connected */</div><div class='add'>+	INPUT_PIN_ATTR_INT,	/* internal mic/line-in */</div><div class='add'>+	INPUT_PIN_ATTR_DOCK,	/* docking mic/line-in */</div><div class='add'>+	INPUT_PIN_ATTR_NORMAL,	/* mic/line-in jack */</div><div class='add'>+	INPUT_PIN_ATTR_REAR,	/* mic/line-in jack in rear */</div><div class='add'>+	INPUT_PIN_ATTR_FRONT,	/* mic/line-in jack in front */</div><div class='add'>+	INPUT_PIN_ATTR_LAST = INPUT_PIN_ATTR_FRONT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_get_input_pin_attr(unsigned int def_conf);</div><div class='add'>+</div><div class='add'>+struct auto_pin_cfg {</div><div class='add'>+	int line_outs;</div><div class='add'>+	/* sorted in the order of Front/Surr/CLFE/Side */</div><div class='add'>+	hda_nid_t line_out_pins[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int speaker_outs;</div><div class='add'>+	hda_nid_t speaker_pins[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int hp_outs;</div><div class='add'>+	int line_out_type;	/* AUTO_PIN_XXX_OUT */</div><div class='add'>+	hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS];</div><div class='add'>+	int num_inputs;</div><div class='add'>+	struct auto_pin_cfg_item inputs[AUTO_CFG_MAX_INS];</div><div class='add'>+	int dig_outs;</div><div class='add'>+	hda_nid_t dig_out_pins[2];</div><div class='add'>+	hda_nid_t dig_in_pin;</div><div class='add'>+	hda_nid_t mono_out_pin;</div><div class='add'>+	int dig_out_type[2]; /* HDA_PCM_TYPE_XXX */</div><div class='add'>+	int dig_in_type; /* HDA_PCM_TYPE_XXX */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* bit-flags for snd_hda_parse_pin_def_config() behavior */</div><div class='add'>+#define HDA_PINCFG_NO_HP_FIXUP   (1 &lt;&lt; 0) /* no HP-split */</div><div class='add'>+#define HDA_PINCFG_NO_LO_FIXUP   (1 &lt;&lt; 1) /* don't take other outs as LO */</div><div class='add'>+#define HDA_PINCFG_HEADSET_MIC   (1 &lt;&lt; 2) /* Try to find headset mic; mark seq number as 0xc to trigger */</div><div class='add'>+#define HDA_PINCFG_HEADPHONE_MIC (1 &lt;&lt; 3) /* Try to find headphone mic; mark seq number as 0xd to trigger */</div><div class='add'>+</div><div class='add'>+int snd_hda_parse_pin_defcfg(struct hda_codec *codec,</div><div class='add'>+			     struct auto_pin_cfg *cfg,</div><div class='add'>+			     const hda_nid_t *ignore_nids,</div><div class='add'>+			     unsigned int cond_flags);</div><div class='add'>+</div><div class='add'>+/* older function */</div><div class='add'>+#define snd_hda_parse_pin_def_config(codec, cfg, ignore) \</div><div class='add'>+	snd_hda_parse_pin_defcfg(codec, cfg, ignore, 0)</div><div class='add'>+</div><div class='add'>+static inline int auto_cfg_hp_outs(const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return (cfg-&gt;line_out_type == AUTO_PIN_HP_OUT) ?</div><div class='add'>+	       cfg-&gt;line_outs : cfg-&gt;hp_outs;</div><div class='add'>+}</div><div class='add'>+static inline const hda_nid_t *auto_cfg_hp_pins(const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return (cfg-&gt;line_out_type == AUTO_PIN_HP_OUT) ?</div><div class='add'>+	       cfg-&gt;line_out_pins : cfg-&gt;hp_pins;</div><div class='add'>+}</div><div class='add'>+static inline int auto_cfg_speaker_outs(const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) ?</div><div class='add'>+	       cfg-&gt;line_outs : cfg-&gt;speaker_outs;</div><div class='add'>+}</div><div class='add'>+static inline const hda_nid_t *auto_cfg_speaker_pins(const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	return (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) ?</div><div class='add'>+	       cfg-&gt;line_out_pins : cfg-&gt;speaker_pins;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_HDA_AUTO_PARSER_H */</div><div class='head'>diff --git a/sound/hda/common/hda_beep.h b/sound/hda/common/hda_beep.h<br/>new file mode 100644<br/>index 000000000000..923ea862446a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hda_beep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hda_beep.h</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/*</div><div class='add'>+ * Digital Beep Input Interface for HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * Author: Matt Ranostay &lt;matt.ranostay@konsulko.com&gt;</div><div class='add'>+ * Copyright (c) 2008 Embedded Alley Solutions Inc</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_HDA_BEEP_H</div><div class='add'>+#define __SOUND_HDA_BEEP_H</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+</div><div class='add'>+#define HDA_BEEP_MODE_OFF	0</div><div class='add'>+#define HDA_BEEP_MODE_ON	1</div><div class='add'>+</div><div class='add'>+/* beep information */</div><div class='add'>+struct hda_beep {</div><div class='add'>+	struct input_dev *dev;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	char phys[32];</div><div class='add'>+	int tone;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	unsigned int registered:1;</div><div class='add'>+	unsigned int enabled:1;</div><div class='add'>+	unsigned int linear_tone:1;	/* linear tone for IDT/STAC codec */</div><div class='add'>+	unsigned int playing:1;</div><div class='add'>+	unsigned int keep_power_at_enable:1;	/* set by driver */</div><div class='add'>+	struct work_struct beep_work; /* scheduled task for beep event */</div><div class='add'>+	void (*power_hook)(struct hda_beep *beep, bool on);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);</div><div class='add'>+int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);</div><div class='add'>+void snd_hda_detach_beep_device(struct hda_codec *codec);</div><div class='add'>+#else</div><div class='add'>+static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/common/hda_controller.h b/sound/hda/common/hda_controller.h<br/>new file mode 100644<br/>index 000000000000..c2d0109866e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hda_controller.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hda_controller.h</a></div><div class='hunk'>@@ -0,0 +1,215 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *  Common functionality for the alsa driver code base for HD Audio.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_HDA_CONTROLLER_H</div><div class='add'>+#define __SOUND_HDA_CONTROLLER_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+</div><div class='add'>+#define AZX_MAX_CODECS		HDA_MAX_CODECS</div><div class='add'>+#define AZX_DEFAULT_CODECS	4</div><div class='add'>+</div><div class='add'>+/* driver quirks (capabilities) */</div><div class='add'>+/* bits 0-7 are used for indicating driver type */</div><div class='add'>+#define AZX_DCAPS_NO_TCSEL	(1 &lt;&lt; 8)	/* No Intel TCSEL bit */</div><div class='add'>+#define AZX_DCAPS_NO_MSI	(1 &lt;&lt; 9)	/* No MSI support */</div><div class='add'>+#define AZX_DCAPS_SNOOP_MASK	(3 &lt;&lt; 10)	/* snoop type mask */</div><div class='add'>+#define AZX_DCAPS_SNOOP_OFF	(1 &lt;&lt; 12)	/* snoop default off */</div><div class='add'>+#ifdef CONFIG_SND_HDA_I915</div><div class='add'>+#define AZX_DCAPS_I915_COMPONENT (1 &lt;&lt; 13)	/* bind with i915 gfx */</div><div class='add'>+#else</div><div class='add'>+#define AZX_DCAPS_I915_COMPONENT 0		/* NOP */</div><div class='add'>+#endif</div><div class='add'>+/* 14 unused */</div><div class='add'>+#define AZX_DCAPS_CTX_WORKAROUND (1 &lt;&lt; 15)	/* X-Fi workaround */</div><div class='add'>+#define AZX_DCAPS_POSFIX_LPIB	(1 &lt;&lt; 16)	/* Use LPIB as default */</div><div class='add'>+#define AZX_DCAPS_AMD_WORKAROUND (1 &lt;&lt; 17)	/* AMD-specific workaround */</div><div class='add'>+#define AZX_DCAPS_NO_64BIT	(1 &lt;&lt; 18)	/* No 64bit address */</div><div class='add'>+/* 19 unused */</div><div class='add'>+#define AZX_DCAPS_OLD_SSYNC	(1 &lt;&lt; 20)	/* Old SSYNC reg for ICH */</div><div class='add'>+#define AZX_DCAPS_NO_ALIGN_BUFSIZE (1 &lt;&lt; 21)	/* no buffer size alignment */</div><div class='add'>+/* 22 unused */</div><div class='add'>+#define AZX_DCAPS_4K_BDLE_BOUNDARY (1 &lt;&lt; 23)	/* BDLE in 4k boundary */</div><div class='add'>+/* 24 unused */</div><div class='add'>+#define AZX_DCAPS_COUNT_LPIB_DELAY  (1 &lt;&lt; 25)	/* Take LPIB as delay */</div><div class='add'>+#define AZX_DCAPS_PM_RUNTIME	(1 &lt;&lt; 26)	/* runtime PM support */</div><div class='add'>+#define AZX_DCAPS_RETRY_PROBE	(1 &lt;&lt; 27)	/* retry probe if no codec is configured */</div><div class='add'>+#define AZX_DCAPS_CORBRP_SELF_CLEAR (1 &lt;&lt; 28)	/* CORBRP clears itself after reset */</div><div class='add'>+#define AZX_DCAPS_NO_MSI64      (1 &lt;&lt; 29)	/* Stick to 32-bit MSIs */</div><div class='add'>+#define AZX_DCAPS_SEPARATE_STREAM_TAG	(1 &lt;&lt; 30) /* capture and playback use separate stream tag */</div><div class='add'>+#define AZX_DCAPS_PIO_COMMANDS (1 &lt;&lt; 31)	/* Use PIO instead of CORB for commands */</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AZX_SNOOP_TYPE_NONE,</div><div class='add'>+	AZX_SNOOP_TYPE_SCH,</div><div class='add'>+	AZX_SNOOP_TYPE_ATI,</div><div class='add'>+	AZX_SNOOP_TYPE_NVIDIA,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct azx_dev {</div><div class='add'>+	struct hdac_stream core;</div><div class='add'>+</div><div class='add'>+	unsigned int irq_pending:1;</div><div class='add'>+	/*</div><div class='add'>+	 * For VIA:</div><div class='add'>+	 *  A flag to ensure DMA position is 0</div><div class='add'>+	 *  when link position is not greater than FIFO size</div><div class='add'>+	 */</div><div class='add'>+	unsigned int insufficient:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define azx_stream(dev)		(&amp;(dev)-&gt;core)</div><div class='add'>+#define stream_to_azx_dev(s)	container_of(s, struct azx_dev, core)</div><div class='add'>+</div><div class='add'>+struct azx;</div><div class='add'>+</div><div class='add'>+/* Functions to read/write to hda registers. */</div><div class='add'>+struct hda_controller_ops {</div><div class='add'>+	/* Disable msi if supported, PCI only */</div><div class='add'>+	int (*disable_msi_reset_irq)(struct azx *);</div><div class='add'>+	/* Check if current position is acceptable */</div><div class='add'>+	int (*position_check)(struct azx *chip, struct azx_dev *azx_dev);</div><div class='add'>+	/* enable/disable the link power */</div><div class='add'>+	int (*link_power)(struct azx *chip, bool enable);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct azx_pcm {</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	struct hda_pcm *info;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef unsigned int (*azx_get_pos_callback_t)(struct azx *, struct azx_dev *);</div><div class='add'>+typedef int (*azx_get_delay_callback_t)(struct azx *, struct azx_dev *, unsigned int pos);</div><div class='add'>+</div><div class='add'>+struct azx {</div><div class='add'>+	struct hda_bus bus;</div><div class='add'>+</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct pci_dev *pci;</div><div class='add'>+	int dev_index;</div><div class='add'>+</div><div class='add'>+	/* chip type specific */</div><div class='add'>+	int driver_type;</div><div class='add'>+	unsigned int driver_caps;</div><div class='add'>+	int playback_streams;</div><div class='add'>+	int playback_index_offset;</div><div class='add'>+	int capture_streams;</div><div class='add'>+	int capture_index_offset;</div><div class='add'>+	int num_streams;</div><div class='add'>+	int jackpoll_interval; /* jack poll interval in jiffies */</div><div class='add'>+</div><div class='add'>+	/* Register interaction. */</div><div class='add'>+	const struct hda_controller_ops *ops;</div><div class='add'>+</div><div class='add'>+	/* position adjustment callbacks */</div><div class='add'>+	azx_get_pos_callback_t get_position[2];</div><div class='add'>+	azx_get_delay_callback_t get_delay[2];</div><div class='add'>+</div><div class='add'>+	/* locks */</div><div class='add'>+	struct mutex open_mutex; /* Prevents concurrent open/close operations */</div><div class='add'>+</div><div class='add'>+	/* PCM */</div><div class='add'>+	struct list_head pcm_list; /* azx_pcm list */</div><div class='add'>+</div><div class='add'>+	/* HD codec */</div><div class='add'>+	int  codec_probe_mask; /* copied from probe_mask option */</div><div class='add'>+	unsigned int beep_mode;</div><div class='add'>+	bool ctl_dev_id;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* flags */</div><div class='add'>+	int bdl_pos_adj;</div><div class='add'>+	unsigned int running:1;</div><div class='add'>+	unsigned int fallback_to_single_cmd:1;</div><div class='add'>+	unsigned int single_cmd:1;</div><div class='add'>+	unsigned int msi:1;</div><div class='add'>+	unsigned int probing:1; /* codec probing phase */</div><div class='add'>+	unsigned int snoop:1;</div><div class='add'>+	unsigned int uc_buffer:1; /* non-cached pages for stream buffers */</div><div class='add'>+	unsigned int align_buffer_size:1;</div><div class='add'>+	unsigned int disabled:1; /* disabled by vga_switcheroo */</div><div class='add'>+	unsigned int pm_prepared:1;</div><div class='add'>+</div><div class='add'>+	/* GTS present */</div><div class='add'>+	unsigned int gts_present:1;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_DSP_LOADER</div><div class='add'>+	struct azx_dev saved_azx_dev;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define azx_bus(chip)	(&amp;(chip)-&gt;bus.core)</div><div class='add'>+#define bus_to_azx(_bus)	container_of(_bus, struct azx, bus.core)</div><div class='add'>+</div><div class='add'>+static inline bool azx_snoop(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	return !IS_ENABLED(CONFIG_X86) || chip-&gt;snoop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * macros for easy use</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define azx_writel(chip, reg, value) \</div><div class='add'>+	snd_hdac_chip_writel(azx_bus(chip), reg, value)</div><div class='add'>+#define azx_readl(chip, reg) \</div><div class='add'>+	snd_hdac_chip_readl(azx_bus(chip), reg)</div><div class='add'>+#define azx_writew(chip, reg, value) \</div><div class='add'>+	snd_hdac_chip_writew(azx_bus(chip), reg, value)</div><div class='add'>+#define azx_readw(chip, reg) \</div><div class='add'>+	snd_hdac_chip_readw(azx_bus(chip), reg)</div><div class='add'>+#define azx_writeb(chip, reg, value) \</div><div class='add'>+	snd_hdac_chip_writeb(azx_bus(chip), reg, value)</div><div class='add'>+#define azx_readb(chip, reg) \</div><div class='add'>+	snd_hdac_chip_readb(azx_bus(chip), reg)</div><div class='add'>+</div><div class='add'>+#define azx_has_pm_runtime(chip) \</div><div class='add'>+	((chip)-&gt;driver_caps &amp; AZX_DCAPS_PM_RUNTIME)</div><div class='add'>+</div><div class='add'>+/* PCM setup */</div><div class='add'>+static inline struct azx_dev *get_azx_dev(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	return substream-&gt;runtime-&gt;private_data;</div><div class='add'>+}</div><div class='add'>+unsigned int azx_get_position(struct azx *chip, struct azx_dev *azx_dev);</div><div class='add'>+unsigned int azx_get_pos_lpib(struct azx *chip, struct azx_dev *azx_dev);</div><div class='add'>+unsigned int azx_get_pos_posbuf(struct azx *chip, struct azx_dev *azx_dev);</div><div class='add'>+</div><div class='add'>+/* Stream control. */</div><div class='add'>+void azx_stop_all_streams(struct azx *chip);</div><div class='add'>+</div><div class='add'>+/* Allocation functions. */</div><div class='add'>+#define azx_alloc_stream_pages(chip) \</div><div class='add'>+	snd_hdac_bus_alloc_stream_pages(azx_bus(chip))</div><div class='add'>+#define azx_free_stream_pages(chip) \</div><div class='add'>+	snd_hdac_bus_free_stream_pages(azx_bus(chip))</div><div class='add'>+</div><div class='add'>+/* Low level azx interface */</div><div class='add'>+void azx_init_chip(struct azx *chip, bool full_reset);</div><div class='add'>+void azx_stop_chip(struct azx *chip);</div><div class='add'>+#define azx_enter_link_reset(chip) \</div><div class='add'>+	snd_hdac_bus_enter_link_reset(azx_bus(chip))</div><div class='add'>+irqreturn_t azx_interrupt(int irq, void *dev_id);</div><div class='add'>+</div><div class='add'>+/* Codec interface */</div><div class='add'>+int azx_bus_init(struct azx *chip, const char *model);</div><div class='add'>+int azx_probe_codecs(struct azx *chip, unsigned int max_slots);</div><div class='add'>+int azx_codec_configure(struct azx *chip);</div><div class='add'>+int azx_init_streams(struct azx *chip);</div><div class='add'>+void azx_free_streams(struct azx *chip);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_HDA_CONTROLLER_H */</div><div class='head'>diff --git a/sound/hda/common/hda_jack.h b/sound/hda/common/hda_jack.h<br/>new file mode 100644<br/>index 000000000000..ff7d289c034b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hda_jack.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hda_jack.h</a></div><div class='hunk'>@@ -0,0 +1,195 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Jack-detection handling for HD-audio</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SOUND_HDA_JACK_H</div><div class='add'>+#define __SOUND_HDA_JACK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+</div><div class='add'>+struct auto_pin_cfg;</div><div class='add'>+struct hda_jack_tbl;</div><div class='add'>+struct hda_jack_callback;</div><div class='add'>+</div><div class='add'>+typedef void (*hda_jack_callback_fn) (struct hda_codec *, struct hda_jack_callback *);</div><div class='add'>+</div><div class='add'>+struct hda_jack_callback {</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int dev_id;</div><div class='add'>+	hda_jack_callback_fn func;</div><div class='add'>+	unsigned int private_data;	/* arbitrary data */</div><div class='add'>+	unsigned int unsol_res;		/* unsolicited event bits */</div><div class='add'>+	struct hda_jack_tbl *jack;	/* associated jack entry */</div><div class='add'>+	struct hda_jack_callback *next;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hda_jack_tbl {</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int dev_id;</div><div class='add'>+	unsigned char tag;		/* unsol event tag */</div><div class='add'>+	struct hda_jack_callback *callback;</div><div class='add'>+	/* jack-detection stuff */</div><div class='add'>+	unsigned int pin_sense;		/* cached pin-sense value */</div><div class='add'>+	unsigned int jack_detect:1;	/* capable of jack-detection? */</div><div class='add'>+	unsigned int jack_dirty:1;	/* needs to update? */</div><div class='add'>+	unsigned int phantom_jack:1;    /* a fixed, always present port? */</div><div class='add'>+	unsigned int block_report:1;    /* in a transitional state - do not report to userspace */</div><div class='add'>+	hda_nid_t gating_jack;		/* valid when gating jack plugged */</div><div class='add'>+	hda_nid_t gated_jack;		/* gated is dependent on this jack */</div><div class='add'>+	hda_nid_t key_report_jack;	/* key reports to this jack */</div><div class='add'>+	int type;</div><div class='add'>+	int button_state;</div><div class='add'>+	struct snd_jack *jack;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hda_jack_keymap {</div><div class='add'>+	enum snd_jack_types type;</div><div class='add'>+	int key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_get_mst(struct hda_codec *codec, hda_nid_t nid, int dev_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_tbl_get - query the jack-table entry for the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to refer to</div><div class='add'>+ */</div><div class='add'>+static inline struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_get(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_tbl_get_mst(codec, nid, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_get_from_tag(struct hda_codec *codec,</div><div class='add'>+			      unsigned char tag, int dev_id);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_tbl_disconnect(struct hda_codec *codec);</div><div class='add'>+void snd_hda_jack_tbl_clear(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_set_dirty_all(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			       int dev_id);</div><div class='add'>+</div><div class='add'>+struct hda_jack_callback *</div><div class='add'>+snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+					int dev_id, hda_jack_callback_fn func);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_enable - enable the jack-detection</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to enable</div><div class='add'>+ * @func: callback function to register</div><div class='add'>+ *</div><div class='add'>+ * In the case of error, the return value will be a pointer embedded with</div><div class='add'>+ * errno.  Check and handle the return value appropriately with standard</div><div class='add'>+ * macros such as @IS_ERR() and @PTR_ERR().</div><div class='add'>+ */</div><div class='add'>+static inline struct hda_jack_callback *</div><div class='add'>+snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				    hda_jack_callback_fn cb)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_detect_enable_callback_mst(codec, nid, 0, cb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid,</div><div class='add'>+				 hda_nid_t gating_nid);</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_bind_keymap(struct hda_codec *codec, hda_nid_t key_nid,</div><div class='add'>+			     const struct hda_jack_keymap *keymap,</div><div class='add'>+			     hda_nid_t jack_nid);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_set_button_state(struct hda_codec *codec, hda_nid_t jack_nid,</div><div class='add'>+				   int button_state);</div><div class='add'>+</div><div class='add'>+u32 snd_hda_jack_pin_sense(struct hda_codec *codec, hda_nid_t nid, int dev_id);</div><div class='add'>+</div><div class='add'>+/* the jack state returned from snd_hda_jack_detect_state() */</div><div class='add'>+enum {</div><div class='add'>+	HDA_JACK_NOT_PRESENT, HDA_JACK_PRESENT, HDA_JACK_PHANTOM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_detect_state_mst(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  int dev_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_state - query pin Presence Detect status</div><div class='add'>+ * @codec: the CODEC to sense</div><div class='add'>+ * @nid: the pin NID to sense</div><div class='add'>+ *</div><div class='add'>+ * Query and return the pin's Presence Detect status, as either</div><div class='add'>+ * HDA_JACK_NOT_PRESENT, HDA_JACK_PRESENT or HDA_JACK_PHANTOM.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+snd_hda_jack_detect_state(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_detect_state_mst(codec, nid, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_mst - Detect the jack</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to check jack detection</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ */</div><div class='add'>+static inline bool</div><div class='add'>+snd_hda_jack_detect_mst(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_detect_state_mst(codec, nid, dev_id) !=</div><div class='add'>+			HDA_JACK_NOT_PRESENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect - Detect the jack</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to check jack detection</div><div class='add'>+ */</div><div class='add'>+static inline bool</div><div class='add'>+snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_detect_mst(codec, nid, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid);</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_add_kctl_mst(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			      int dev_id, const char *name, bool phantom_jack,</div><div class='add'>+			      int type, const struct hda_jack_keymap *keymap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_add_kctl - Add a kctl for the given pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to assign</div><div class='add'>+ * @name: string name for the jack</div><div class='add'>+ * @phantom_jack: flag to deal as a phantom jack</div><div class='add'>+ * @type: jack type bits to be reported, 0 for guessing from pincfg</div><div class='add'>+ * @keymap: optional jack / key mapping</div><div class='add'>+ *</div><div class='add'>+ * This assigns a jack-detection kctl to the given pin.  The kcontrol</div><div class='add'>+ * will have the given name and index.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		      const char *name, bool phantom_jack,</div><div class='add'>+		      int type, const struct hda_jack_keymap *keymap)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_jack_add_kctl_mst(codec, nid, 0,</div><div class='add'>+					 name, phantom_jack, type, keymap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_jack_add_kctls(struct hda_codec *codec,</div><div class='add'>+			   const struct auto_pin_cfg *cfg);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_report_sync(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_unsol_event(struct hda_codec *codec, unsigned int res);</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_poll_all(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_HDA_JACK_H */</div><div class='head'>diff --git a/sound/pci/hda/hda_local.h b/sound/hda/common/hda_local.h<br/>index 46bbefe2e4a9..a7e53277a0fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_local.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_local.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hda_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hda_local.h</a></div><div class='hunk'>@@ -1,28 +1,17 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  * Universal Interface for Intel High Definition Audio Codec</div><div class='ctx'>  *</div><div class='ctx'>  * Local helper functions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the Free</div><div class='del'>- *  Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- *  any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- *  more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along with</div><div class='del'>- *  this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __SOUND_HDA_LOCAL_H</div><div class='ctx'> #define __SOUND_HDA_LOCAL_H</div><div class='ctx'> </div><div class='add'>+#include &lt;sound/pcm_drm_eld.h&gt;</div><div class='add'>+</div><div class='ctx'> /* We abuse kcontrol_new.subdev field to pass the NID corresponding to</div><div class='ctx'>  * the given new control.  If id.subdev has a bit flag HDA_SUBDEV_NID_FLAG,</div><div class='ctx'>  * snd_hda_ctl_add() takes the lower-bit subdev value as a valid NID.</div><div class='hunk'>@@ -89,7 +78,7 @@</div><div class='ctx'> 	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \</div><div class='ctx'> 	  .subdevice = HDA_SUBDEV_AMP_FLAG, \</div><div class='ctx'> 	  .info = snd_hda_mixer_amp_switch_info, \</div><div class='del'>-	  .get = snd_hda_mixer_amp_switch_get, \</div><div class='add'>+	  .get = snd_hda_mixer_amp_switch_get_beep, \</div><div class='ctx'> 	  .put = snd_hda_mixer_amp_switch_put_beep, \</div><div class='ctx'> 	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }</div><div class='ctx'> #else</div><div class='hunk'>@@ -113,7 +102,7 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol);</div><div class='ctx'> int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='del'>-			  unsigned int size, unsigned int __user *tlv);</div><div class='add'>+			  unsigned int size, unsigned int __user *_tlv);</div><div class='ctx'> int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo);</div><div class='ctx'> int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -121,104 +110,70 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol);</div><div class='ctx'> #ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_value *ucontrol);</div><div class='ctx'> int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				      struct snd_ctl_elem_value *ucontrol);</div><div class='ctx'> #endif</div><div class='ctx'> /* lowlevel accessor with caching; use carefully */</div><div class='del'>-int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='del'>-			   int direction, int index);</div><div class='del'>-int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='del'>-			     int direction, int idx, int mask, int val);</div><div class='add'>+#define snd_hda_codec_amp_read(codec, nid, ch, dir, idx) \</div><div class='add'>+	snd_hdac_regmap_get_amp(&amp;(codec)-&gt;core, nid, ch, dir, idx)</div><div class='add'>+int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			     int ch, int dir, int idx, int mask, int val);</div><div class='ctx'> int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			     int dir, int idx, int mask, int val);</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-void snd_hda_codec_resume_amp(struct hda_codec *codec);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+			     int direction, int idx, int mask, int val);</div><div class='add'>+int snd_hda_codec_amp_init(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='add'>+			   int direction, int idx, int mask, int val);</div><div class='add'>+int snd_hda_codec_amp_init_stereo(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				  int dir, int idx, int mask, int val);</div><div class='ctx'> void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='ctx'> 			     unsigned int *tlv);</div><div class='ctx'> struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,</div><div class='ctx'> 					    const char *name);</div><div class='del'>-int snd_hda_add_vmaster(struct hda_codec *codec, char *name,</div><div class='del'>-			unsigned int *tlv, const char **slaves);</div><div class='add'>+int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,</div><div class='add'>+			  unsigned int *tlv, const char * const *followers,</div><div class='add'>+			  const char *suffix, bool init_follower_vol,</div><div class='add'>+			  unsigned int access, struct snd_kcontrol **ctl_ret);</div><div class='add'>+#define snd_hda_add_vmaster(codec, name, tlv, followers, suffix, access) \</div><div class='add'>+	__snd_hda_add_vmaster(codec, name, tlv, followers, suffix, true, access, NULL)</div><div class='ctx'> int snd_hda_codec_reset(struct hda_codec *codec);</div><div class='add'>+void snd_hda_codec_disconnect_pcms(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+#define snd_hda_regmap_sync(codec)	snd_hdac_regmap_sync(&amp;(codec)-&gt;core)</div><div class='add'>+</div><div class='add'>+struct hda_vmaster_mute_hook {</div><div class='add'>+	/* below two fields must be filled by the caller of</div><div class='add'>+	 * snd_hda_add_vmaster_hook() beforehand</div><div class='add'>+	 */</div><div class='add'>+	struct snd_kcontrol *sw_kctl;</div><div class='add'>+	void (*hook)(void *, int);</div><div class='add'>+	/* below are initialized automatically */</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_hda_add_vmaster_hook(struct hda_codec *codec,</div><div class='add'>+			     struct hda_vmaster_mute_hook *hook);</div><div class='add'>+void snd_hda_sync_vmaster_hook(struct hda_vmaster_mute_hook *hook);</div><div class='ctx'> </div><div class='ctx'> /* amp value bits */</div><div class='ctx'> #define HDA_AMP_MUTE	0x80</div><div class='ctx'> #define HDA_AMP_UNMUTE	0x00</div><div class='ctx'> #define HDA_AMP_VOLMASK	0x7f</div><div class='ctx'> </div><div class='del'>-/* mono switch binding multiple inputs */</div><div class='del'>-#define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .info = snd_hda_mixer_amp_switch_info, \</div><div class='del'>-	  .get = snd_hda_mixer_bind_switch_get, \</div><div class='del'>-	  .put = snd_hda_mixer_bind_switch_put, \</div><div class='del'>-	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) }</div><div class='del'>-</div><div class='del'>-/* stereo switch binding multiple inputs */</div><div class='del'>-#define HDA_BIND_MUTE(xname,nid,indices,dir) \</div><div class='del'>-	HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir)</div><div class='del'>-</div><div class='del'>-int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-</div><div class='del'>-/* more generic bound controls */</div><div class='del'>-struct hda_ctl_ops {</div><div class='del'>-	snd_kcontrol_info_t *info;</div><div class='del'>-	snd_kcontrol_get_t *get;</div><div class='del'>-	snd_kcontrol_put_t *put;</div><div class='del'>-	snd_kcontrol_tlv_rw_t *tlv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct hda_ctl_ops snd_hda_bind_vol;	/* for bind-volume with TLV */</div><div class='del'>-extern struct hda_ctl_ops snd_hda_bind_sw;	/* for bind-switch */</div><div class='del'>-</div><div class='del'>-struct hda_bind_ctls {</div><div class='del'>-	struct hda_ctl_ops *ops;</div><div class='del'>-	unsigned long values[];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_info *uinfo);</div><div class='del'>-int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='del'>-			   unsigned int size, unsigned int __user *tlv);</div><div class='del'>-</div><div class='del'>-#define HDA_BIND_VOL(xname, bindrec) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-	  .name = xname, \</div><div class='del'>-	  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\</div><div class='del'>-			  SNDRV_CTL_ELEM_ACCESS_TLV_READ |\</div><div class='del'>-			  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,\</div><div class='del'>-	  .info = snd_hda_mixer_bind_ctls_info,\</div><div class='del'>-	  .get =  snd_hda_mixer_bind_ctls_get,\</div><div class='del'>-	  .put = snd_hda_mixer_bind_ctls_put,\</div><div class='del'>-	  .tlv = { .c = snd_hda_mixer_bind_tlv },\</div><div class='del'>-	  .private_value = (long) (bindrec) }</div><div class='del'>-#define HDA_BIND_SW(xname, bindrec) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,\</div><div class='del'>-	  .name = xname, \</div><div class='del'>-	  .info = snd_hda_mixer_bind_ctls_info,\</div><div class='del'>-	  .get =  snd_hda_mixer_bind_ctls_get,\</div><div class='del'>-	  .put = snd_hda_mixer_bind_ctls_put,\</div><div class='del'>-	  .private_value = (long) (bindrec) }</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * SPDIF I/O</div><div class='ctx'>  */</div><div class='del'>-int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid);</div><div class='add'>+int snd_hda_create_dig_out_ctls(struct hda_codec *codec,</div><div class='add'>+				hda_nid_t associated_nid,</div><div class='add'>+				hda_nid_t cvt_nid, int type);</div><div class='add'>+#define snd_hda_create_spdif_out_ctls(codec, anid, cnid) \</div><div class='add'>+	snd_hda_create_dig_out_ctls(codec, anid, cnid, HDA_PCM_TYPE_SPDIF)</div><div class='ctx'> int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * input MUX helper</div><div class='ctx'>  */</div><div class='del'>-#define HDA_MAX_NUM_INPUTS	16</div><div class='add'>+#define HDA_MAX_NUM_INPUTS	36</div><div class='ctx'> struct hda_input_mux_item {</div><div class='ctx'> 	char label[32];</div><div class='ctx'> 	unsigned int index;</div><div class='hunk'>@@ -234,29 +189,9 @@ int snd_hda_input_mux_put(struct hda_codec *codec,</div><div class='ctx'> 			  const struct hda_input_mux *imux,</div><div class='ctx'> 			  struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,</div><div class='ctx'> 			  unsigned int *cur_val);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Channel mode helper</div><div class='del'>- */</div><div class='del'>-struct hda_channel_mode {</div><div class='del'>-	int channels;</div><div class='del'>-	const struct hda_verb *sequence;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int snd_hda_ch_mode_info(struct hda_codec *codec,</div><div class='del'>-			 struct snd_ctl_elem_info *uinfo,</div><div class='del'>-			 const struct hda_channel_mode *chmode,</div><div class='del'>-			 int num_chmodes);</div><div class='del'>-int snd_hda_ch_mode_get(struct hda_codec *codec,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			const struct hda_channel_mode *chmode,</div><div class='del'>-			int num_chmodes,</div><div class='del'>-			int max_channels);</div><div class='del'>-int snd_hda_ch_mode_put(struct hda_codec *codec,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			const struct hda_channel_mode *chmode,</div><div class='del'>-			int num_chmodes,</div><div class='del'>-			int *max_channelsp);</div><div class='add'>+int snd_hda_add_imux_item(struct hda_codec *codec,</div><div class='add'>+			  struct hda_input_mux *imux, const char *label,</div><div class='add'>+			  int index, int *type_idx);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Multi-channel / digital-out PCM helper</div><div class='hunk'>@@ -265,13 +200,16 @@ int snd_hda_ch_mode_put(struct hda_codec *codec,</div><div class='ctx'> enum { HDA_FRONT, HDA_REAR, HDA_CLFE, HDA_SIDE }; /* index for dac_nidx */</div><div class='ctx'> enum { HDA_DIG_NONE, HDA_DIG_EXCLUSIVE, HDA_DIG_ANALOG_DUP }; /* dig_out_used */</div><div class='ctx'> </div><div class='add'>+#define HDA_MAX_OUTS	5</div><div class='add'>+</div><div class='ctx'> struct hda_multi_out {</div><div class='ctx'> 	int num_dacs;		/* # of DACs, must be more than 1 */</div><div class='del'>-	hda_nid_t *dac_nids;	/* DAC list */</div><div class='add'>+	const hda_nid_t *dac_nids;	/* DAC list */</div><div class='ctx'> 	hda_nid_t hp_nid;	/* optional DAC for HP, 0 when not exists */</div><div class='del'>-	hda_nid_t extra_out_nid[3];	/* optional DACs, 0 when not exists */</div><div class='add'>+	hda_nid_t hp_out_nid[HDA_MAX_OUTS];	/* DACs for multiple HPs */</div><div class='add'>+	hda_nid_t extra_out_nid[HDA_MAX_OUTS];	/* other (e.g. speaker) DACs */</div><div class='ctx'> 	hda_nid_t dig_out_nid;	/* digital out audio widget */</div><div class='del'>-	hda_nid_t *slave_dig_outs;</div><div class='add'>+	const hda_nid_t *follower_dig_outs;</div><div class='ctx'> 	int max_channels;	/* currently supported analog channels */</div><div class='ctx'> 	int dig_out_used;	/* current usage of digital out (HDA_DIG_XXX) */</div><div class='ctx'> 	int no_share_stream;	/* don't share a stream with multiple pins */</div><div class='hunk'>@@ -311,125 +249,144 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,</div><div class='ctx'> 				     struct hda_multi_out *mout);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * generic codec parser</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_HDA_GENERIC</div><div class='del'>-int snd_hda_parse_generic_codec(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-static inline int snd_hda_parse_generic_codec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * generic proc interface</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> int snd_hda_codec_proc_new(struct hda_codec *codec);</div><div class='ctx'> #else</div><div class='ctx'> static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define SND_PRINT_RATES_ADVISED_BUFSIZE	80</div><div class='del'>-void snd_print_pcm_rates(int pcm, char *buf, int buflen);</div><div class='del'>-</div><div class='ctx'> #define SND_PRINT_BITS_ADVISED_BUFSIZE	16</div><div class='ctx'> void snd_print_pcm_bits(int pcm, char *buf, int buflen);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Misc</div><div class='ctx'>  */</div><div class='del'>-int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,</div><div class='del'>-			       const char **modelnames,</div><div class='del'>-			       const struct snd_pci_quirk *pci_list);</div><div class='del'>-int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,</div><div class='del'>-                               int num_configs, const char **models,</div><div class='del'>-                               const struct snd_pci_quirk *tbl);</div><div class='ctx'> int snd_hda_add_new_ctls(struct hda_codec *codec,</div><div class='del'>-			 struct snd_kcontrol_new *knew);</div><div class='add'>+			 const struct snd_kcontrol_new *knew);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * unsolicited event handler</div><div class='add'>+ * Fix-up pin default configurations and add default verbs</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define HDA_UNSOL_QUEUE_SIZE	64</div><div class='add'>+struct hda_pintbl {</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-struct hda_bus_unsolicited {</div><div class='del'>-	/* ring buffer */</div><div class='del'>-	u32 queue[HDA_UNSOL_QUEUE_SIZE * 2];</div><div class='del'>-	unsigned int rp, wp;</div><div class='add'>+struct hda_model_fixup {</div><div class='add'>+	const int id;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	/* workqueue */</div><div class='del'>-	struct work_struct work;</div><div class='del'>-	struct hda_bus *bus;</div><div class='add'>+struct hda_fixup {</div><div class='add'>+	int type;</div><div class='add'>+	bool chained:1;		/* call the chained fixup(s) after this */</div><div class='add'>+	bool chained_before:1;	/* call the chained fixup(s) before this */</div><div class='add'>+	int chain_id;</div><div class='add'>+	union {</div><div class='add'>+		const struct hda_pintbl *pins;</div><div class='add'>+		const struct hda_verb *verbs;</div><div class='add'>+		void (*func)(struct hda_codec *codec,</div><div class='add'>+			     const struct hda_fixup *fix,</div><div class='add'>+			     int action);</div><div class='add'>+	} v;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Helper for automatic pin configuration</div><div class='add'>+ * extended form of snd_pci_quirk:</div><div class='add'>+ * for PCI SSID matching, use SND_PCI_QUIRK() like before;</div><div class='add'>+ * for codec SSID matching, use the new HDA_CODEC_QUIRK() instead</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	AUTO_PIN_MIC,</div><div class='del'>-	AUTO_PIN_LINE_IN,</div><div class='del'>-	AUTO_PIN_CD,</div><div class='del'>-	AUTO_PIN_AUX,</div><div class='del'>-	AUTO_PIN_LAST</div><div class='add'>+struct hda_quirk {</div><div class='add'>+	unsigned short subvendor;	/* PCI subvendor ID */</div><div class='add'>+	unsigned short subdevice;	/* PCI subdevice ID */</div><div class='add'>+	unsigned short subdevice_mask;	/* bitmask to match */</div><div class='add'>+	bool match_codec_ssid;		/* match only with codec SSID */</div><div class='add'>+	int value;			/* value */</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+	const char *name;		/* name of the device (optional) */</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='del'>-	AUTO_PIN_LINE_OUT,</div><div class='del'>-	AUTO_PIN_SPEAKER_OUT,</div><div class='del'>-	AUTO_PIN_HP_OUT</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+#define HDA_CODEC_QUIRK(vend, dev, xname, val) \</div><div class='add'>+	{ _SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname),\</div><div class='add'>+			.match_codec_ssid = true }</div><div class='add'>+#else</div><div class='add'>+#define HDA_CODEC_QUIRK(vend, dev, xname, val) \</div><div class='add'>+	{ _SND_PCI_QUIRK_ID(vend, dev), .value = (val), \</div><div class='add'>+			.match_codec_ssid = true }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct snd_hda_pin_quirk {</div><div class='add'>+	unsigned int codec;             /* Codec vendor/device ID */</div><div class='add'>+	unsigned short subvendor;	/* PCI subvendor ID */</div><div class='add'>+	const struct hda_pintbl *pins;  /* list of matching pins */</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+	const char *name;</div><div class='add'>+#endif</div><div class='add'>+	int value;			/* quirk value */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define AUTO_CFG_MAX_OUTS	5</div><div class='del'>-#define AUTO_CFG_MAX_INS	8</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='ctx'> </div><div class='del'>-struct auto_pin_cfg_item {</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	int type;</div><div class='del'>-};</div><div class='add'>+#define SND_HDA_PIN_QUIRK(_codec, _subvendor, _name, _value, _pins...) \</div><div class='add'>+	{ .codec = _codec,\</div><div class='add'>+	  .subvendor = _subvendor,\</div><div class='add'>+	  .name = _name,\</div><div class='add'>+	  .value = _value,\</div><div class='add'>+	  .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+#define SND_HDA_PIN_QUIRK(_codec, _subvendor, _name, _value, _pins...) \</div><div class='add'>+	{ .codec = _codec,\</div><div class='add'>+	  .subvendor = _subvendor,\</div><div class='add'>+	  .value = _value,\</div><div class='add'>+	  .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-struct auto_pin_cfg;</div><div class='del'>-const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-				    int check_location);</div><div class='del'>-const char *hda_get_autocfg_input_label(struct hda_codec *codec,</div><div class='del'>-					const struct auto_pin_cfg *cfg,</div><div class='del'>-					int input);</div><div class='del'>-int snd_hda_add_imux_item(struct hda_input_mux *imux, const char *label,</div><div class='del'>-			  int index, int *type_index_ret);</div><div class='add'>+#define HDA_FIXUP_ID_NOT_SET -1</div><div class='add'>+#define HDA_FIXUP_ID_NO_FIXUP -2</div><div class='ctx'> </div><div class='add'>+/* fixup types */</div><div class='ctx'> enum {</div><div class='del'>-	INPUT_PIN_ATTR_UNUSED,	/* pin not connected */</div><div class='del'>-	INPUT_PIN_ATTR_INT,	/* internal mic/line-in */</div><div class='del'>-	INPUT_PIN_ATTR_DOCK,	/* docking mic/line-in */</div><div class='del'>-	INPUT_PIN_ATTR_NORMAL,	/* mic/line-in jack */</div><div class='del'>-	INPUT_PIN_ATTR_FRONT,	/* mic/line-in jack in front */</div><div class='del'>-	INPUT_PIN_ATTR_REAR,	/* mic/line-in jack in rear */</div><div class='add'>+	HDA_FIXUP_INVALID,</div><div class='add'>+	HDA_FIXUP_PINS,</div><div class='add'>+	HDA_FIXUP_VERBS,</div><div class='add'>+	HDA_FIXUP_FUNC,</div><div class='add'>+	HDA_FIXUP_PINCTLS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_hda_get_input_pin_attr(unsigned int def_conf);</div><div class='del'>-</div><div class='del'>-struct auto_pin_cfg {</div><div class='del'>-	int line_outs;</div><div class='del'>-	/* sorted in the order of Front/Surr/CLFE/Side */</div><div class='del'>-	hda_nid_t line_out_pins[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	int speaker_outs;</div><div class='del'>-	hda_nid_t speaker_pins[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	int hp_outs;</div><div class='del'>-	int line_out_type;	/* AUTO_PIN_XXX_OUT */</div><div class='del'>-	hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	int num_inputs;</div><div class='del'>-	struct auto_pin_cfg_item inputs[AUTO_CFG_MAX_INS];</div><div class='del'>-	int dig_outs;</div><div class='del'>-	hda_nid_t dig_out_pins[2];</div><div class='del'>-	hda_nid_t dig_in_pin;</div><div class='del'>-	hda_nid_t mono_out_pin;</div><div class='del'>-	int dig_out_type[2]; /* HDA_PCM_TYPE_XXX */</div><div class='del'>-	int dig_in_type; /* HDA_PCM_TYPE_XXX */</div><div class='add'>+/* fixup action definitions */</div><div class='add'>+enum {</div><div class='add'>+	HDA_FIXUP_ACT_PRE_PROBE,</div><div class='add'>+	HDA_FIXUP_ACT_PROBE,</div><div class='add'>+	HDA_FIXUP_ACT_INIT,</div><div class='add'>+	HDA_FIXUP_ACT_BUILD,</div><div class='add'>+	HDA_FIXUP_ACT_FREE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+int snd_hda_add_verbs(struct hda_codec *codec, const struct hda_verb *list);</div><div class='add'>+void snd_hda_apply_verbs(struct hda_codec *codec);</div><div class='add'>+void snd_hda_apply_pincfgs(struct hda_codec *codec,</div><div class='add'>+			   const struct hda_pintbl *cfg);</div><div class='add'>+void snd_hda_apply_fixup(struct hda_codec *codec, int action);</div><div class='add'>+void __snd_hda_apply_fixup(struct hda_codec *codec, int id, int action, int depth);</div><div class='add'>+void snd_hda_pick_fixup(struct hda_codec *codec,</div><div class='add'>+			const struct hda_model_fixup *models,</div><div class='add'>+			const struct hda_quirk *quirk,</div><div class='add'>+			const struct hda_fixup *fixlist);</div><div class='add'>+void snd_hda_pick_pin_fixup(struct hda_codec *codec,</div><div class='add'>+			    const struct snd_hda_pin_quirk *pin_quirk,</div><div class='add'>+			    const struct hda_fixup *fixlist,</div><div class='add'>+			    bool match_all_pins);</div><div class='add'>+</div><div class='add'>+/* helper macros to retrieve pin default-config values */</div><div class='ctx'> #define get_defcfg_connect(cfg) \</div><div class='ctx'> 	((cfg &amp; AC_DEFCFG_PORT_CONN) &gt;&gt; AC_DEFCFG_PORT_CONN_SHIFT)</div><div class='ctx'> #define get_defcfg_association(cfg) \</div><div class='hunk'>@@ -440,10 +397,8 @@ struct auto_pin_cfg {</div><div class='ctx'> 	(cfg &amp; AC_DEFCFG_SEQUENCE)</div><div class='ctx'> #define get_defcfg_device(cfg) \</div><div class='ctx'> 	((cfg &amp; AC_DEFCFG_DEVICE) &gt;&gt; AC_DEFCFG_DEVICE_SHIFT)</div><div class='del'>-</div><div class='del'>-int snd_hda_parse_pin_def_config(struct hda_codec *codec,</div><div class='del'>-				 struct auto_pin_cfg *cfg,</div><div class='del'>-				 hda_nid_t *ignore_nids);</div><div class='add'>+#define get_defcfg_misc(cfg) \</div><div class='add'>+	((cfg &amp; AC_DEFCFG_MISC) &gt;&gt; AC_DEFCFG_MISC_SHIFT)</div><div class='ctx'> </div><div class='ctx'> /* amp values */</div><div class='ctx'> #define AMP_IN_MUTE(idx)	(0x7080 | ((idx)&lt;&lt;8))</div><div class='hunk'>@@ -462,19 +417,82 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,</div><div class='ctx'> #define PIN_HP			(AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN)</div><div class='ctx'> #define PIN_HP_AMP		(AC_PINCTL_HP_EN)</div><div class='ctx'> </div><div class='add'>+unsigned int snd_hda_get_default_vref(struct hda_codec *codec, hda_nid_t pin);</div><div class='add'>+unsigned int snd_hda_correct_pin_ctl(struct hda_codec *codec,</div><div class='add'>+				     hda_nid_t pin, unsigned int val);</div><div class='add'>+int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			 unsigned int val, bool cached);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _snd_hda_set_pin_ctl - Set a pin-control value safely</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ * @pin: the pin NID to set the control</div><div class='add'>+ * @val: the pin-control value (AC_PINCTL_* bits)</div><div class='add'>+ *</div><div class='add'>+ * This function sets the pin-control value to the given pin, but</div><div class='add'>+ * filters out the invalid pin-control bits when the pin has no such</div><div class='add'>+ * capabilities.  For example, when PIN_HP is passed but the pin has no</div><div class='add'>+ * HP-drive capability, the HP bit is omitted.</div><div class='add'>+ *</div><div class='add'>+ * The function doesn't check the input VREF capability bits, though.</div><div class='add'>+ * Use snd_hda_get_default_vref() to guess the right value.</div><div class='add'>+ * Also, this function is only for analog pins, not for HDMI pins.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return _snd_hda_set_pin_ctl(codec, pin, val, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_set_pin_ctl_cache - Set a pin-control value safely</div><div class='add'>+ * @codec: the codec instance</div><div class='add'>+ * @pin: the pin NID to set the control</div><div class='add'>+ * @val: the pin-control value (AC_PINCTL_* bits)</div><div class='add'>+ *</div><div class='add'>+ * Just like snd_hda_set_pin_ctl() but write to cache as well.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+snd_hda_set_pin_ctl_cache(struct hda_codec *codec, hda_nid_t pin,</div><div class='add'>+			  unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return _snd_hda_set_pin_ctl(codec, pin, val, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_codec_get_pin_target(struct hda_codec *codec, hda_nid_t nid);</div><div class='add'>+int snd_hda_codec_set_pin_target(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+				 unsigned int val);</div><div class='add'>+</div><div class='add'>+#define for_each_hda_codec_node(nid, codec) \</div><div class='add'>+	for ((nid) = (codec)-&gt;core.start_nid; (nid) &lt; (codec)-&gt;core.end_nid; (nid)++)</div><div class='add'>+</div><div class='add'>+/* Set the codec power_state flag to indicate to allow unsol event handling;</div><div class='add'>+ * see hda_codec_unsol_event() in hda_bind.c.  Calling this might confuse the</div><div class='add'>+ * state tracking, so use with care.</div><div class='add'>+ */</div><div class='add'>+static inline void snd_hda_codec_allow_unsol_events(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	codec-&gt;core.dev.power.power_state = PMSG_ON;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * get widget capabilities</div><div class='ctx'>  */</div><div class='ctx'> static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	if (nid &lt; codec-&gt;start_nid ||</div><div class='del'>-	    nid &gt;= codec-&gt;start_nid + codec-&gt;num_nodes)</div><div class='add'>+	if (nid &lt; codec-&gt;core.start_nid ||</div><div class='add'>+	    nid &gt;= codec-&gt;core.start_nid + codec-&gt;core.num_nodes)</div><div class='ctx'> 		return 0;</div><div class='del'>-	return codec-&gt;wcaps[nid - codec-&gt;start_nid];</div><div class='add'>+	return codec-&gt;wcaps[nid - codec-&gt;core.start_nid];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* get the widget type from widget capability bits */</div><div class='del'>-#define get_wcaps_type(wcaps) (((wcaps) &amp; AC_WCAP_TYPE) &gt;&gt; AC_WCAP_TYPE_SHIFT)</div><div class='add'>+static inline int get_wcaps_type(unsigned int wcaps)</div><div class='add'>+{</div><div class='add'>+	if (!wcaps)</div><div class='add'>+		return -1; /* invalid type */</div><div class='add'>+	return (wcaps &amp; AC_WCAP_TYPE) &gt;&gt; AC_WCAP_TYPE_SHIFT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int get_wcaps_channels(u32 wcaps)</div><div class='ctx'> {</div><div class='hunk'>@@ -486,12 +504,60 @@ static inline unsigned int get_wcaps_channels(u32 wcaps)</div><div class='ctx'> 	return chans;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void snd_hda_override_wcaps(struct hda_codec *codec,</div><div class='add'>+					  hda_nid_t nid, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (nid &gt;= codec-&gt;core.start_nid &amp;&amp;</div><div class='add'>+	    nid &lt; codec-&gt;core.start_nid + codec-&gt;core.num_nodes)</div><div class='add'>+		codec-&gt;wcaps[nid - codec-&gt;core.start_nid] = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction);</div><div class='ctx'> int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='ctx'> 			      unsigned int caps);</div><div class='del'>-u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_query_pin_caps - Query PIN capabilities</div><div class='add'>+ * @codec: the HD-auio codec</div><div class='add'>+ * @nid: the NID to query</div><div class='add'>+ *</div><div class='add'>+ * Query PIN capabilities for the given widget.</div><div class='add'>+ * Returns the obtained capability bits.</div><div class='add'>+ *</div><div class='add'>+ * When cap bits have been already read, this doesn't read again but</div><div class='add'>+ * returns the cached value.</div><div class='add'>+ */</div><div class='add'>+static inline u32</div><div class='add'>+snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	return snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_override_pin_caps - Override the pin capabilities</div><div class='add'>+ * @codec: the CODEC</div><div class='add'>+ * @nid: the NID to override</div><div class='add'>+ * @caps: the capability bits to set</div><div class='add'>+ *</div><div class='add'>+ * Override the cached PIN capabilitiy bits value by the given one.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+snd_hda_override_pin_caps(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  unsigned int caps)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_override_parm(&amp;codec-&gt;core, nid, AC_PAR_PIN_CAP, caps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool snd_hda_check_amp_caps(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   int dir, unsigned int bits);</div><div class='add'>+</div><div class='add'>+#define nid_has_mute(codec, nid, dir) \</div><div class='add'>+	snd_hda_check_amp_caps(codec, nid, dir, (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE))</div><div class='add'>+#define nid_has_volume(codec, nid, dir) \</div><div class='add'>+	snd_hda_check_amp_caps(codec, nid, dir, AC_AMPCAP_NUM_STEPS)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* flags for hda_nid_item */</div><div class='ctx'> #define HDA_NID_ITEM_AMP	(1&lt;&lt;0)</div><div class='hunk'>@@ -505,8 +571,6 @@ struct hda_nid_item {</div><div class='ctx'> </div><div class='ctx'> int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,</div><div class='ctx'> 		    struct snd_kcontrol *kctl);</div><div class='del'>-int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,</div><div class='del'>-		    unsigned int index, hda_nid_t nid);</div><div class='ctx'> void snd_hda_ctls_clear(struct hda_codec *codec);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -518,27 +582,15 @@ int snd_hda_create_hwdep(struct hda_codec *codec);</div><div class='ctx'> static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_HDA_POWER_SAVE) &amp;&amp; defined(CONFIG_SND_HDA_HWDEP)</div><div class='del'>-int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-static inline int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+void snd_hda_sysfs_init(struct hda_codec *codec);</div><div class='add'>+void snd_hda_sysfs_clear(struct hda_codec *codec);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='del'>-int snd_hda_hwdep_add_sysfs(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-static inline int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+extern const struct attribute_group *snd_hda_dev_attr_groups[];</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_HDA_RECONFIG</div><div class='ctx'> const char *snd_hda_get_hint(struct hda_codec *codec, const char *key);</div><div class='ctx'> int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key);</div><div class='add'>+int snd_hda_get_int_hint(struct hda_codec *codec, const char *key, int *valp);</div><div class='ctx'> #else</div><div class='ctx'> static inline</div><div class='ctx'> const char *snd_hda_get_hint(struct hda_codec *codec, const char *key)</div><div class='hunk'>@@ -551,13 +603,18 @@ int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+int snd_hda_get_int_hint(struct hda_codec *codec, const char *key, int *valp)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * power-management</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='ctx'> void snd_hda_schedule_power_save(struct hda_codec *codec);</div><div class='ctx'> </div><div class='ctx'> struct hda_amp_list {</div><div class='hunk'>@@ -567,14 +624,42 @@ struct hda_amp_list {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hda_loopback_check {</div><div class='del'>-	struct hda_amp_list *amplist;</div><div class='add'>+	const struct hda_amp_list *amplist;</div><div class='ctx'> 	int power_on;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int snd_hda_check_amp_list_power(struct hda_codec *codec,</div><div class='ctx'> 				 struct hda_loopback_check *check,</div><div class='ctx'> 				 hda_nid_t nid);</div><div class='del'>-#endif /* CONFIG_SND_HDA_POWER_SAVE */</div><div class='add'>+</div><div class='add'>+/* check whether the actual power state matches with the target state */</div><div class='add'>+static inline bool</div><div class='add'>+snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			  unsigned int target_state)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_check_power_state(&amp;codec-&gt;core, nid, target_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int snd_hda_sync_power_state(struct hda_codec *codec,</div><div class='add'>+						    hda_nid_t nid,</div><div class='add'>+						    unsigned int target_state)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_sync_power_state(&amp;codec-&gt;core, nid, target_state);</div><div class='add'>+}</div><div class='add'>+unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,</div><div class='add'>+					     hda_nid_t nid,</div><div class='add'>+					     unsigned int power_state);</div><div class='add'>+</div><div class='add'>+void snd_hda_codec_shutdown(struct hda_codec *codec);</div><div class='add'>+</div><div class='add'>+static inline int snd_hda_codec_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec_driver *driver = hda_codec_to_driver(codec);</div><div class='add'>+</div><div class='add'>+	if (driver-&gt;ops-&gt;init)</div><div class='add'>+		return driver-&gt;ops-&gt;init(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * AMP control callbacks</div><div class='hunk'>@@ -583,77 +668,58 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,</div><div class='ctx'> #define get_amp_nid_(pv)	((pv) &amp; 0xffff)</div><div class='ctx'> #define get_amp_nid(kc)		get_amp_nid_((kc)-&gt;private_value)</div><div class='ctx'> #define get_amp_channels(kc)	(((kc)-&gt;private_value &gt;&gt; 16) &amp; 0x3)</div><div class='del'>-#define get_amp_direction(kc)	(((kc)-&gt;private_value &gt;&gt; 18) &amp; 0x1)</div><div class='del'>-#define get_amp_index(kc)	(((kc)-&gt;private_value &gt;&gt; 19) &amp; 0xf)</div><div class='add'>+#define get_amp_direction_(pv)	(((pv) &gt;&gt; 18) &amp; 0x1)</div><div class='add'>+#define get_amp_direction(kc)	get_amp_direction_((kc)-&gt;private_value)</div><div class='add'>+#define get_amp_index_(pv)	(((pv) &gt;&gt; 19) &amp; 0xf)</div><div class='add'>+#define get_amp_index(kc)	get_amp_index_((kc)-&gt;private_value)</div><div class='ctx'> #define get_amp_offset(kc)	(((kc)-&gt;private_value &gt;&gt; 23) &amp; 0x3f)</div><div class='ctx'> #define get_amp_min_mute(kc)	(((kc)-&gt;private_value &gt;&gt; 29) &amp; 0x1)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * CEA Short Audio Descriptor data</div><div class='add'>+ * enum control helper</div><div class='ctx'>  */</div><div class='del'>-struct cea_sad {</div><div class='del'>-	int	channels;</div><div class='del'>-	int	format;		/* (format == 0) indicates invalid SAD */</div><div class='del'>-	int	rates;</div><div class='del'>-	int	sample_bits;	/* for LPCM */</div><div class='del'>-	int	max_bitrate;	/* for AC3...ATRAC */</div><div class='del'>-	int	profile;	/* for WMAPRO */</div><div class='del'>-};</div><div class='add'>+int snd_hda_enum_helper_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_info *uinfo,</div><div class='add'>+			     int num_items, const char * const *texts);</div><div class='add'>+#define snd_hda_enum_bool_helper_info(kcontrol, uinfo) \</div><div class='add'>+	snd_hda_enum_helper_info(kcontrol, uinfo, 0, NULL)</div><div class='ctx'> </div><div class='del'>-#define ELD_FIXED_BYTES	20</div><div class='del'>-#define ELD_MAX_MNL	16</div><div class='del'>-#define ELD_MAX_SAD	16</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ELD: EDID Like Data</div><div class='del'>- */</div><div class='ctx'> struct hdmi_eld {</div><div class='ctx'> 	bool	monitor_present;</div><div class='ctx'> 	bool	eld_valid;</div><div class='ctx'> 	int	eld_size;</div><div class='del'>-	int	baseline_len;</div><div class='del'>-	int	eld_ver;</div><div class='del'>-	int	cea_edid_ver;</div><div class='del'>-	char	monitor_name[ELD_MAX_MNL + 1];</div><div class='del'>-	int	manufacture_id;</div><div class='del'>-	int	product_id;</div><div class='del'>-	u64	port_id;</div><div class='del'>-	int	support_hdcp;</div><div class='del'>-	int	support_ai;</div><div class='del'>-	int	conn_type;</div><div class='del'>-	int	aud_synch_delay;</div><div class='del'>-	int	spk_alloc;</div><div class='del'>-	int	sad_count;</div><div class='del'>-	struct cea_sad sad[ELD_MAX_SAD];</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-	struct snd_info_entry *proc_entry;</div><div class='del'>-#endif</div><div class='add'>+	char    eld_buffer[ELD_MAX_SIZE];</div><div class='add'>+	struct snd_parsed_hdmi_eld info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);</div><div class='del'>-void snd_hdmi_show_eld(struct hdmi_eld *eld);</div><div class='del'>-void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,</div><div class='del'>-			      struct hda_pcm_stream *codec_pars);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,</div><div class='del'>-			 int index);</div><div class='del'>-void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld);</div><div class='del'>-#else</div><div class='del'>-static inline int snd_hda_eld_proc_new(struct hda_codec *codec,</div><div class='del'>-				       struct hdmi_eld *eld,</div><div class='del'>-				       int index)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static inline void snd_hda_eld_proc_free(struct hda_codec *codec,</div><div class='del'>-					 struct hdmi_eld *eld)</div><div class='del'>-{</div><div class='del'>-}</div><div class='add'>+int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+		     unsigned char *buf, int *eld_size);</div><div class='add'>+void snd_hdmi_eld_update_pcm_info(struct snd_parsed_hdmi_eld *e,</div><div class='add'>+			      struct hda_pcm_stream *hinfo);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='add'>+void snd_hdmi_print_eld_info(struct hdmi_eld *eld,</div><div class='add'>+			     struct snd_info_buffer *buffer,</div><div class='add'>+			     hda_nid_t pin_nid, int dev_id, hda_nid_t cvt_nid);</div><div class='add'>+void snd_hdmi_write_eld_info(struct hdmi_eld *eld,</div><div class='add'>+			     struct snd_info_buffer *buffer);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80</div><div class='ctx'> void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);</div><div class='ctx'> </div><div class='add'>+void snd_hda_codec_display_power(struct hda_codec *codec, bool enable);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+#define codec_err(codec, fmt, args...) \</div><div class='add'>+	dev_err(hda_codec_dev(codec), fmt, ##args)</div><div class='add'>+#define codec_warn(codec, fmt, args...) \</div><div class='add'>+	dev_warn(hda_codec_dev(codec), fmt, ##args)</div><div class='add'>+#define codec_info(codec, fmt, args...) \</div><div class='add'>+	dev_info(hda_codec_dev(codec), fmt, ##args)</div><div class='add'>+#define codec_dbg(codec, fmt, args...) \</div><div class='add'>+	dev_dbg(hda_codec_dev(codec), fmt, ##args)</div><div class='add'>+</div><div class='ctx'> #endif /* __SOUND_HDA_LOCAL_H */</div><div class='head'>diff --git a/sound/hda/common/hwdep.c b/sound/hda/common/hwdep.c<br/>new file mode 100644<br/>index 000000000000..9325e5c3cbe6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/hwdep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/hwdep.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * HWDEP Interface for HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2007 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include &lt;sound/hda_hwdep.h&gt;</div><div class='add'>+#include &lt;sound/minors.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * write/read an out-of-bound verb</div><div class='add'>+ */</div><div class='add'>+static int verb_write_ioctl(struct hda_codec *codec,</div><div class='add'>+			    struct hda_verb_ioctl __user *arg)</div><div class='add'>+{</div><div class='add'>+	u32 verb, res;</div><div class='add'>+</div><div class='add'>+	if (get_user(verb, &amp;arg-&gt;verb))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	res = snd_hda_codec_read(codec, verb &gt;&gt; 24, 0,</div><div class='add'>+				 (verb &gt;&gt; 8) &amp; 0xffff, verb &amp; 0xff);</div><div class='add'>+	if (put_user(res, &amp;arg-&gt;res))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_wcap_ioctl(struct hda_codec *codec,</div><div class='add'>+			  struct hda_verb_ioctl __user *arg)</div><div class='add'>+{</div><div class='add'>+	u32 verb, res;</div><div class='add'>+	</div><div class='add'>+	if (get_user(verb, &amp;arg-&gt;verb))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	/* open-code get_wcaps(verb&gt;&gt;24) with nospec */</div><div class='add'>+	verb &gt;&gt;= 24;</div><div class='add'>+	if (verb &lt; codec-&gt;core.start_nid ||</div><div class='add'>+	    verb &gt;= codec-&gt;core.start_nid + codec-&gt;core.num_nodes) {</div><div class='add'>+		res = 0;</div><div class='add'>+	} else {</div><div class='add'>+		verb -= codec-&gt;core.start_nid;</div><div class='add'>+		verb = array_index_nospec(verb, codec-&gt;core.num_nodes);</div><div class='add'>+		res = codec-&gt;wcaps[verb];</div><div class='add'>+	}</div><div class='add'>+	if (put_user(res, &amp;arg-&gt;res))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int hda_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,</div><div class='add'>+			   unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = hw-&gt;private_data;</div><div class='add'>+	void __user *argp = (void __user *)arg;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case HDA_IOCTL_PVERSION:</div><div class='add'>+		return put_user(HDA_HWDEP_VERSION, (int __user *)argp);</div><div class='add'>+	case HDA_IOCTL_VERB_WRITE:</div><div class='add'>+		return verb_write_ioctl(codec, argp);</div><div class='add'>+	case HDA_IOCTL_GET_WCAP:</div><div class='add'>+		return get_wcap_ioctl(codec, argp);</div><div class='add'>+	}</div><div class='add'>+	return -ENOIOCTLCMD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+static int hda_hwdep_ioctl_compat(struct snd_hwdep *hw, struct file *file,</div><div class='add'>+				  unsigned int cmd, unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	return hda_hwdep_ioctl(hw, file, cmd, (unsigned long)compat_ptr(arg));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)</div><div class='add'>+{</div><div class='add'>+	if (!capable(CAP_SYS_RAWIO))</div><div class='add'>+		return -EACCES;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_hda_create_hwdep(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	char hwname[16];</div><div class='add'>+	struct snd_hwdep *hwdep;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sprintf(hwname, "HDA Codec %d", codec-&gt;addr);</div><div class='add'>+	err = snd_hwdep_new(codec-&gt;card, hwname, codec-&gt;addr, &amp;hwdep);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	codec-&gt;hwdep = hwdep;</div><div class='add'>+	sprintf(hwdep-&gt;name, "HDA Codec %d", codec-&gt;addr);</div><div class='add'>+	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_HDA;</div><div class='add'>+	hwdep-&gt;private_data = codec;</div><div class='add'>+	hwdep-&gt;exclusive = 1;</div><div class='add'>+</div><div class='add'>+	hwdep-&gt;ops.open = hda_hwdep_open;</div><div class='add'>+	hwdep-&gt;ops.ioctl = hda_hwdep_ioctl;</div><div class='add'>+#ifdef CONFIG_COMPAT</div><div class='add'>+	hwdep-&gt;ops.ioctl_compat = hda_hwdep_ioctl_compat;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* for sysfs */</div><div class='add'>+	hwdep-&gt;dev-&gt;groups = snd_hda_dev_attr_groups;</div><div class='add'>+	dev_set_drvdata(hwdep-&gt;dev, codec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/common/jack.c b/sound/hda/common/jack.c<br/>new file mode 100644<br/>index 000000000000..7d7786df60ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/jack.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/jack.c</a></div><div class='hunk'>@@ -0,0 +1,770 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Jack-detection handling for HD-audio</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/jack.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include "hda_auto_parser.h"</div><div class='add'>+#include "hda_jack.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * is_jack_detectable - Check whether the given pin is jack-detectable</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID</div><div class='add'>+ *</div><div class='add'>+ * Check whether the given pin is capable to report the jack detection.</div><div class='add'>+ * The jack detection might not work by various reasons, e.g. the jack</div><div class='add'>+ * detection is prohibited in the codec level, the pin config has</div><div class='add'>+ * AC_DEFCFG_MISC_NO_PRESENCE bit, no unsol support, etc.</div><div class='add'>+ */</div><div class='add'>+bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;no_jack_detect)</div><div class='add'>+		return false;</div><div class='add'>+	if (!(snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_PRES_DETECT))</div><div class='add'>+		return false;</div><div class='add'>+	if (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) &amp;</div><div class='add'>+	     AC_DEFCFG_MISC_NO_PRESENCE)</div><div class='add'>+		return false;</div><div class='add'>+	if (!(get_wcaps(codec, nid) &amp; AC_WCAP_UNSOL_CAP) &amp;&amp;</div><div class='add'>+	    !codec-&gt;jackpoll_interval)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(is_jack_detectable);</div><div class='add'>+</div><div class='add'>+/* execute pin sense measurement */</div><div class='add'>+static u32 read_pin_sense(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	u32 pincap;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;no_trigger_sense) {</div><div class='add'>+		pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='add'>+		if (pincap &amp; AC_PINCAP_TRIG_REQ) /* need trigger? */</div><div class='add'>+			snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					AC_VERB_SET_PIN_SENSE, 0);</div><div class='add'>+	}</div><div class='add'>+	val = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+				  AC_VERB_GET_PIN_SENSE, dev_id);</div><div class='add'>+	if (codec-&gt;inv_jack_detect)</div><div class='add'>+		val ^= AC_PINSENSE_PRESENCE;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_tbl_get_mst - query the jack-table entry for the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to refer to</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ */</div><div class='add'>+struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_get_mst(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nid || !jack)</div><div class='add'>+		return NULL;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;nid == nid &amp;&amp; jack-&gt;dev_id == dev_id)</div><div class='add'>+			return jack;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_tbl_get_mst);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_tbl_get_from_tag - query the jack-table entry for the given tag</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @tag: tag value to refer to</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ */</div><div class='add'>+struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_get_from_tag(struct hda_codec *codec,</div><div class='add'>+			      unsigned char tag, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!tag || !jack)</div><div class='add'>+		return NULL;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;tag == tag &amp;&amp; jack-&gt;dev_id == dev_id)</div><div class='add'>+			return jack;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_tbl_get_from_tag);</div><div class='add'>+</div><div class='add'>+static struct hda_jack_tbl *</div><div class='add'>+any_jack_tbl_get_from_nid(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nid || !jack)</div><div class='add'>+		return NULL;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;nid == nid)</div><div class='add'>+			return jack;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_tbl_new - create a jack-table entry for the given NID</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to assign</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ */</div><div class='add'>+static struct hda_jack_tbl *</div><div class='add'>+snd_hda_jack_tbl_new(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack =</div><div class='add'>+		snd_hda_jack_tbl_get_mst(codec, nid, dev_id);</div><div class='add'>+	struct hda_jack_tbl *existing_nid_jack =</div><div class='add'>+		any_jack_tbl_get_from_nid(codec, nid);</div><div class='add'>+</div><div class='add'>+	WARN_ON(dev_id != 0 &amp;&amp; !codec-&gt;dp_mst);</div><div class='add'>+</div><div class='add'>+	if (jack)</div><div class='add'>+		return jack;</div><div class='add'>+	jack = snd_array_new(&amp;codec-&gt;jacktbl);</div><div class='add'>+	if (!jack)</div><div class='add'>+		return NULL;</div><div class='add'>+	jack-&gt;nid = nid;</div><div class='add'>+	jack-&gt;dev_id = dev_id;</div><div class='add'>+	jack-&gt;jack_dirty = 1;</div><div class='add'>+	if (existing_nid_jack) {</div><div class='add'>+		jack-&gt;tag = existing_nid_jack-&gt;tag;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Copy jack_detect from existing_nid_jack to avoid</div><div class='add'>+		 * snd_hda_jack_detect_enable_callback_mst() making multiple</div><div class='add'>+		 * SET_UNSOLICITED_ENABLE calls on the same pin.</div><div class='add'>+		 */</div><div class='add'>+		jack-&gt;jack_detect = existing_nid_jack-&gt;jack_detect;</div><div class='add'>+	} else {</div><div class='add'>+		jack-&gt;tag = codec-&gt;jacktbl.used;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return jack;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_tbl_disconnect(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++) {</div><div class='add'>+		if (!codec-&gt;bus-&gt;shutdown &amp;&amp; jack-&gt;jack)</div><div class='add'>+			snd_device_disconnect(codec-&gt;card, jack-&gt;jack);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_jack_tbl_clear(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++) {</div><div class='add'>+		struct hda_jack_callback *cb, *next;</div><div class='add'>+</div><div class='add'>+		/* free jack instances manually when clearing/reconfiguring */</div><div class='add'>+		if (!codec-&gt;bus-&gt;shutdown &amp;&amp; jack-&gt;jack)</div><div class='add'>+			snd_device_free(codec-&gt;card, jack-&gt;jack);</div><div class='add'>+</div><div class='add'>+		for (cb = jack-&gt;callback; cb; cb = next) {</div><div class='add'>+			next = cb-&gt;next;</div><div class='add'>+			kfree(cb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	snd_array_free(&amp;codec-&gt;jacktbl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define get_jack_plug_state(sense) !!(sense &amp; AC_PINSENSE_PRESENCE)</div><div class='add'>+</div><div class='add'>+/* update the cached value and notification flag if needed */</div><div class='add'>+static void jack_detect_update(struct hda_codec *codec,</div><div class='add'>+			       struct hda_jack_tbl *jack)</div><div class='add'>+{</div><div class='add'>+	if (!jack-&gt;jack_dirty)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;phantom_jack)</div><div class='add'>+		jack-&gt;pin_sense = AC_PINSENSE_PRESENCE;</div><div class='add'>+	else</div><div class='add'>+		jack-&gt;pin_sense = read_pin_sense(codec, jack-&gt;nid,</div><div class='add'>+						 jack-&gt;dev_id);</div><div class='add'>+</div><div class='add'>+	/* A gating jack indicates the jack is invalid if gating is unplugged */</div><div class='add'>+	if (jack-&gt;gating_jack &amp;&amp;</div><div class='add'>+	    !snd_hda_jack_detect_mst(codec, jack-&gt;gating_jack, jack-&gt;dev_id))</div><div class='add'>+		jack-&gt;pin_sense &amp;= ~AC_PINSENSE_PRESENCE;</div><div class='add'>+</div><div class='add'>+	jack-&gt;jack_dirty = 0;</div><div class='add'>+</div><div class='add'>+	/* If a jack is gated by this one update it. */</div><div class='add'>+	if (jack-&gt;gated_jack) {</div><div class='add'>+		struct hda_jack_tbl *gated =</div><div class='add'>+			snd_hda_jack_tbl_get_mst(codec, jack-&gt;gated_jack,</div><div class='add'>+						 jack-&gt;dev_id);</div><div class='add'>+		if (gated) {</div><div class='add'>+			gated-&gt;jack_dirty = 1;</div><div class='add'>+			jack_detect_update(codec, gated);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_set_dirty_all - Mark all the cached as dirty</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * This function sets the dirty flag to all entries of jack table.</div><div class='add'>+ * It's called from the resume path in hda_codec.c.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_jack_set_dirty_all(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;nid)</div><div class='add'>+			jack-&gt;jack_dirty = 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_set_dirty_all);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_pin_sense - execute pin sense measurement</div><div class='add'>+ * @codec: the CODEC to sense</div><div class='add'>+ * @nid: the pin NID to sense</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ *</div><div class='add'>+ * Execute necessary pin sense measurement and return its Presence Detect,</div><div class='add'>+ * Impedance, ELD Valid etc. status bits.</div><div class='add'>+ */</div><div class='add'>+u32 snd_hda_jack_pin_sense(struct hda_codec *codec, hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack =</div><div class='add'>+		snd_hda_jack_tbl_get_mst(codec, nid, dev_id);</div><div class='add'>+	if (jack) {</div><div class='add'>+		jack_detect_update(codec, jack);</div><div class='add'>+		return jack-&gt;pin_sense;</div><div class='add'>+	}</div><div class='add'>+	return read_pin_sense(codec, nid, dev_id);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_pin_sense);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_state_mst - query pin Presence Detect status</div><div class='add'>+ * @codec: the CODEC to sense</div><div class='add'>+ * @nid: the pin NID to sense</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ *</div><div class='add'>+ * Query and return the pin's Presence Detect status, as either</div><div class='add'>+ * HDA_JACK_NOT_PRESENT, HDA_JACK_PRESENT or HDA_JACK_PHANTOM.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_detect_state_mst(struct hda_codec *codec,</div><div class='add'>+				  hda_nid_t nid, int dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack =</div><div class='add'>+		snd_hda_jack_tbl_get_mst(codec, nid, dev_id);</div><div class='add'>+	if (jack &amp;&amp; jack-&gt;phantom_jack)</div><div class='add'>+		return HDA_JACK_PHANTOM;</div><div class='add'>+	else if (snd_hda_jack_pin_sense(codec, nid, dev_id) &amp;</div><div class='add'>+		 AC_PINSENSE_PRESENCE)</div><div class='add'>+		return HDA_JACK_PRESENT;</div><div class='add'>+	else</div><div class='add'>+		return HDA_JACK_NOT_PRESENT;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_detect_state_mst);</div><div class='add'>+</div><div class='add'>+static struct hda_jack_callback *</div><div class='add'>+find_callback_from_list(struct hda_jack_tbl *jack,</div><div class='add'>+			hda_jack_callback_fn func)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_callback *cb;</div><div class='add'>+</div><div class='add'>+	if (!func)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (cb = jack-&gt;callback; cb; cb = cb-&gt;next) {</div><div class='add'>+		if (cb-&gt;func == func)</div><div class='add'>+			return cb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_enable_callback_mst - enable the jack-detection</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to enable</div><div class='add'>+ * @func: callback function to register</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ *</div><div class='add'>+ * In the case of error, the return value will be a pointer embedded with</div><div class='add'>+ * errno.  Check and handle the return value appropriately with standard</div><div class='add'>+ * macros such as @IS_ERR() and @PTR_ERR().</div><div class='add'>+ */</div><div class='add'>+struct hda_jack_callback *</div><div class='add'>+snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+					int dev_id, hda_jack_callback_fn func)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+	struct hda_jack_callback *callback = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	jack = snd_hda_jack_tbl_new(codec, nid, dev_id);</div><div class='add'>+	if (!jack)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	callback = find_callback_from_list(jack, func);</div><div class='add'>+</div><div class='add'>+	if (func &amp;&amp; !callback) {</div><div class='add'>+		callback = kzalloc(sizeof(*callback), GFP_KERNEL);</div><div class='add'>+		if (!callback)</div><div class='add'>+			return ERR_PTR(-ENOMEM);</div><div class='add'>+		callback-&gt;func = func;</div><div class='add'>+		callback-&gt;nid = jack-&gt;nid;</div><div class='add'>+		callback-&gt;dev_id = jack-&gt;dev_id;</div><div class='add'>+		callback-&gt;next = jack-&gt;callback;</div><div class='add'>+		jack-&gt;callback = callback;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;jack_detect)</div><div class='add'>+		return callback; /* already registered */</div><div class='add'>+	jack-&gt;jack_detect = 1;</div><div class='add'>+	if (codec-&gt;jackpoll_interval &gt; 0)</div><div class='add'>+		return callback; /* No unsol if we're polling instead */</div><div class='add'>+	err = snd_hda_codec_write_cache(codec, nid, 0,</div><div class='add'>+					 AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='add'>+					 AC_USRSP_EN | jack-&gt;tag);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	return callback;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable_callback_mst);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_detect_enable - Enable the jack detection on the given pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to enable jack detection</div><div class='add'>+ * @dev_id: pin device entry id</div><div class='add'>+ *</div><div class='add'>+ * Enable the jack detection with the default callback.  Returns zero if</div><div class='add'>+ * successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			       int dev_id)</div><div class='add'>+{</div><div class='add'>+	return PTR_ERR_OR_ZERO(snd_hda_jack_detect_enable_callback_mst(codec,</div><div class='add'>+								       nid,</div><div class='add'>+								       dev_id,</div><div class='add'>+								       NULL));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_set_gating_jack - Set gating jack.</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @gated_nid: gated pin NID</div><div class='add'>+ * @gating_nid: gating pin NID</div><div class='add'>+ *</div><div class='add'>+ * Indicates the gated jack is only valid when the gating jack is plugged.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid,</div><div class='add'>+				 hda_nid_t gating_nid)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *gated = snd_hda_jack_tbl_new(codec, gated_nid, 0);</div><div class='add'>+	struct hda_jack_tbl *gating =</div><div class='add'>+		snd_hda_jack_tbl_new(codec, gating_nid, 0);</div><div class='add'>+</div><div class='add'>+	WARN_ON(codec-&gt;dp_mst);</div><div class='add'>+</div><div class='add'>+	if (!gated || !gating)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	gated-&gt;gating_jack = gating_nid;</div><div class='add'>+	gating-&gt;gated_jack = gated_nid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_set_gating_jack);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_bind_keymap - bind keys generated from one NID to another jack.</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @key_nid: key event is generated by this pin NID</div><div class='add'>+ * @keymap: map of key type and key code</div><div class='add'>+ * @jack_nid: key reports to the jack of this pin NID</div><div class='add'>+ *</div><div class='add'>+ * This function is used in the case of key is generated from one NID while is</div><div class='add'>+ * reported to the jack of another NID.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_bind_keymap(struct hda_codec *codec, hda_nid_t key_nid,</div><div class='add'>+			     const struct hda_jack_keymap *keymap,</div><div class='add'>+			     hda_nid_t jack_nid)</div><div class='add'>+{</div><div class='add'>+	const struct hda_jack_keymap *map;</div><div class='add'>+	struct hda_jack_tbl *key_gen = snd_hda_jack_tbl_get(codec, key_nid);</div><div class='add'>+	struct hda_jack_tbl *report_to = snd_hda_jack_tbl_get(codec, jack_nid);</div><div class='add'>+</div><div class='add'>+	WARN_ON(codec-&gt;dp_mst);</div><div class='add'>+</div><div class='add'>+	if (!key_gen || !report_to || !report_to-&gt;jack)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	key_gen-&gt;key_report_jack = jack_nid;</div><div class='add'>+</div><div class='add'>+	if (keymap)</div><div class='add'>+		for (map = keymap; map-&gt;type; map++)</div><div class='add'>+			snd_jack_set_key(report_to-&gt;jack, map-&gt;type, map-&gt;key);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_bind_keymap);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_set_button_state - report button event to the hda_jack_tbl button_state.</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @jack_nid: the button event reports to the jack_tbl of this NID</div><div class='add'>+ * @button_state: the button event captured by codec</div><div class='add'>+ *</div><div class='add'>+ * Codec driver calls this function to report the button event.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_jack_set_button_state(struct hda_codec *codec, hda_nid_t jack_nid,</div><div class='add'>+				   int button_state)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = snd_hda_jack_tbl_get(codec, jack_nid);</div><div class='add'>+</div><div class='add'>+	if (!jack)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (jack-&gt;key_report_jack) {</div><div class='add'>+		struct hda_jack_tbl *report_to =</div><div class='add'>+			snd_hda_jack_tbl_get(codec, jack-&gt;key_report_jack);</div><div class='add'>+</div><div class='add'>+		if (report_to) {</div><div class='add'>+			report_to-&gt;button_state = button_state;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	jack-&gt;button_state = button_state;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_set_button_state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_report_sync - sync the states of all jacks and report if changed</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ */</div><div class='add'>+void snd_hda_jack_report_sync(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+	int i, state;</div><div class='add'>+</div><div class='add'>+	/* update all jacks at first */</div><div class='add'>+	jack = codec-&gt;jacktbl.list;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;nid)</div><div class='add'>+			jack_detect_update(codec, jack);</div><div class='add'>+</div><div class='add'>+	/* report the updated jacks; it's done after updating all jacks</div><div class='add'>+	 * to make sure that all gating jacks properly have been set</div><div class='add'>+	 */</div><div class='add'>+	jack = codec-&gt;jacktbl.list;</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++)</div><div class='add'>+		if (jack-&gt;nid) {</div><div class='add'>+			if (!jack-&gt;jack || jack-&gt;block_report)</div><div class='add'>+				continue;</div><div class='add'>+			state = jack-&gt;button_state;</div><div class='add'>+			if (get_jack_plug_state(jack-&gt;pin_sense))</div><div class='add'>+				state |= jack-&gt;type;</div><div class='add'>+			snd_jack_report(jack-&gt;jack, state);</div><div class='add'>+			if (jack-&gt;button_state) {</div><div class='add'>+				snd_jack_report(jack-&gt;jack,</div><div class='add'>+						state &amp; ~jack-&gt;button_state);</div><div class='add'>+				jack-&gt;button_state = 0; /* button released */</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_report_sync);</div><div class='add'>+</div><div class='add'>+/* guess the jack type from the pin-config */</div><div class='add'>+static int get_input_jack_type(struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	switch (get_defcfg_device(def_conf)) {</div><div class='add'>+	case AC_JACK_LINE_OUT:</div><div class='add'>+	case AC_JACK_SPEAKER:</div><div class='add'>+		return SND_JACK_LINEOUT;</div><div class='add'>+	case AC_JACK_HP_OUT:</div><div class='add'>+		return SND_JACK_HEADPHONE;</div><div class='add'>+	case AC_JACK_SPDIF_OUT:</div><div class='add'>+	case AC_JACK_DIG_OTHER_OUT:</div><div class='add'>+		return SND_JACK_AVOUT;</div><div class='add'>+	case AC_JACK_MIC_IN:</div><div class='add'>+		return SND_JACK_MICROPHONE;</div><div class='add'>+	default:</div><div class='add'>+		return SND_JACK_LINEIN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_free_jack_priv(struct snd_jack *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jacks = jack-&gt;private_data;</div><div class='add'>+	jacks-&gt;nid = 0;</div><div class='add'>+	jacks-&gt;jack = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_add_kctl_mst - Add a kctl for the given pin</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @nid: pin NID to assign</div><div class='add'>+ * @dev_id : pin device entry id</div><div class='add'>+ * @name: string name for the jack</div><div class='add'>+ * @phantom_jack: flag to deal as a phantom jack</div><div class='add'>+ * @type: jack type bits to be reported, 0 for guessing from pincfg</div><div class='add'>+ * @keymap: optional jack / key mapping</div><div class='add'>+ *</div><div class='add'>+ * This assigns a jack-detection kctl to the given pin.  The kcontrol</div><div class='add'>+ * will have the given name and index.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_add_kctl_mst(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			      int dev_id, const char *name, bool phantom_jack,</div><div class='add'>+			      int type, const struct hda_jack_keymap *keymap)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack;</div><div class='add'>+	const struct hda_jack_keymap *map;</div><div class='add'>+	int err, state, buttons;</div><div class='add'>+</div><div class='add'>+	jack = snd_hda_jack_tbl_new(codec, nid, dev_id);</div><div class='add'>+	if (!jack)</div><div class='add'>+		return 0;</div><div class='add'>+	if (jack-&gt;jack)</div><div class='add'>+		return 0; /* already created */</div><div class='add'>+</div><div class='add'>+	if (!type)</div><div class='add'>+		type = get_input_jack_type(codec, nid);</div><div class='add'>+</div><div class='add'>+	buttons = 0;</div><div class='add'>+	if (keymap) {</div><div class='add'>+		for (map = keymap; map-&gt;type; map++)</div><div class='add'>+			buttons |= map-&gt;type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_jack_new(codec-&gt;card, name, type | buttons,</div><div class='add'>+			   &amp;jack-&gt;jack, true, phantom_jack);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	jack-&gt;phantom_jack = !!phantom_jack;</div><div class='add'>+	jack-&gt;type = type;</div><div class='add'>+	jack-&gt;button_state = 0;</div><div class='add'>+	jack-&gt;jack-&gt;private_data = jack;</div><div class='add'>+	jack-&gt;jack-&gt;private_free = hda_free_jack_priv;</div><div class='add'>+	if (keymap) {</div><div class='add'>+		for (map = keymap; map-&gt;type; map++)</div><div class='add'>+			snd_jack_set_key(jack-&gt;jack, map-&gt;type, map-&gt;key);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state = snd_hda_jack_detect_mst(codec, nid, dev_id);</div><div class='add'>+	snd_jack_report(jack-&gt;jack, state ? jack-&gt;type : 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctl_mst);</div><div class='add'>+</div><div class='add'>+static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			 const struct auto_pin_cfg *cfg,</div><div class='add'>+			 const char *base_name)</div><div class='add'>+{</div><div class='add'>+	unsigned int def_conf, conn;</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+	int err;</div><div class='add'>+	bool phantom_jack;</div><div class='add'>+</div><div class='add'>+	WARN_ON(codec-&gt;dp_mst);</div><div class='add'>+</div><div class='add'>+	if (!nid)</div><div class='add'>+		return 0;</div><div class='add'>+	def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='add'>+	conn = get_defcfg_connect(def_conf);</div><div class='add'>+	if (conn == AC_JACK_PORT_NONE)</div><div class='add'>+		return 0;</div><div class='add'>+	phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||</div><div class='add'>+		       !is_jack_detectable(codec, nid);</div><div class='add'>+</div><div class='add'>+	if (base_name)</div><div class='add'>+		strscpy(name, base_name, sizeof(name));</div><div class='add'>+	else</div><div class='add'>+		snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), NULL);</div><div class='add'>+	if (phantom_jack)</div><div class='add'>+		/* Example final name: "Internal Mic Phantom Jack" */</div><div class='add'>+		strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);</div><div class='add'>+	err = snd_hda_jack_add_kctl(codec, nid, name, phantom_jack, 0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!phantom_jack)</div><div class='add'>+		return snd_hda_jack_detect_enable(codec, nid, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_add_kctls - Add kctls for all pins included in the given pincfg</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @cfg: pin config table to parse</div><div class='add'>+ */</div><div class='add'>+int snd_hda_jack_add_kctls(struct hda_codec *codec,</div><div class='add'>+			   const struct auto_pin_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	const hda_nid_t *p;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='add'>+		/* If we have headphone mics; make sure they get the right name</div><div class='add'>+		   before grabbed by output pins */</div><div class='add'>+		if (cfg-&gt;inputs[i].is_headphone_mic) {</div><div class='add'>+			if (auto_cfg_hp_outs(cfg) == 1)</div><div class='add'>+				err = add_jack_kctl(codec, auto_cfg_hp_pins(cfg)[0],</div><div class='add'>+						    cfg, "Headphone Mic");</div><div class='add'>+			else</div><div class='add'>+				err = add_jack_kctl(codec, cfg-&gt;inputs[i].pin,</div><div class='add'>+						    cfg, "Headphone Mic");</div><div class='add'>+		} else</div><div class='add'>+			err = add_jack_kctl(codec, cfg-&gt;inputs[i].pin, cfg,</div><div class='add'>+					    NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0, p = cfg-&gt;line_out_pins; i &lt; cfg-&gt;line_outs; i++, p++) {</div><div class='add'>+		err = add_jack_kctl(codec, *p, cfg, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0, p = cfg-&gt;hp_pins; i &lt; cfg-&gt;hp_outs; i++, p++) {</div><div class='add'>+		if (*p == *cfg-&gt;line_out_pins) /* might be duplicated */</div><div class='add'>+			break;</div><div class='add'>+		err = add_jack_kctl(codec, *p, cfg, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0, p = cfg-&gt;speaker_pins; i &lt; cfg-&gt;speaker_outs; i++, p++) {</div><div class='add'>+		if (*p == *cfg-&gt;line_out_pins) /* might be duplicated */</div><div class='add'>+			break;</div><div class='add'>+		err = add_jack_kctl(codec, *p, cfg, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0, p = cfg-&gt;dig_out_pins; i &lt; cfg-&gt;dig_outs; i++, p++) {</div><div class='add'>+		err = add_jack_kctl(codec, *p, cfg, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	err = add_jack_kctl(codec, cfg-&gt;dig_in_pin, cfg, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = add_jack_kctl(codec, cfg-&gt;mono_out_pin, cfg, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctls);</div><div class='add'>+</div><div class='add'>+static void call_jack_callback(struct hda_codec *codec, unsigned int res,</div><div class='add'>+			       struct hda_jack_tbl *jack)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_callback *cb;</div><div class='add'>+</div><div class='add'>+	for (cb = jack-&gt;callback; cb; cb = cb-&gt;next) {</div><div class='add'>+		cb-&gt;jack = jack;</div><div class='add'>+		cb-&gt;unsol_res = res;</div><div class='add'>+		cb-&gt;func(codec, cb);</div><div class='add'>+	}</div><div class='add'>+	if (jack-&gt;gated_jack) {</div><div class='add'>+		struct hda_jack_tbl *gated =</div><div class='add'>+			snd_hda_jack_tbl_get_mst(codec, jack-&gt;gated_jack,</div><div class='add'>+						 jack-&gt;dev_id);</div><div class='add'>+		if (gated) {</div><div class='add'>+			for (cb = gated-&gt;callback; cb; cb = cb-&gt;next) {</div><div class='add'>+				cb-&gt;jack = gated;</div><div class='add'>+				cb-&gt;unsol_res = res;</div><div class='add'>+				cb-&gt;func(codec, cb);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_unsol_event - Handle an unsolicited event</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @res: the unsolicited event data</div><div class='add'>+ */</div><div class='add'>+void snd_hda_jack_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *event;</div><div class='add'>+	int tag = (res &amp; AC_UNSOL_RES_TAG) &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;dp_mst) {</div><div class='add'>+		int dev_entry =</div><div class='add'>+			(res &amp; AC_UNSOL_RES_DE) &gt;&gt; AC_UNSOL_RES_DE_SHIFT;</div><div class='add'>+</div><div class='add'>+		event = snd_hda_jack_tbl_get_from_tag(codec, tag, dev_entry);</div><div class='add'>+	} else {</div><div class='add'>+		event = snd_hda_jack_tbl_get_from_tag(codec, tag, 0);</div><div class='add'>+	}</div><div class='add'>+	if (!event)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;key_report_jack) {</div><div class='add'>+		struct hda_jack_tbl *report_to =</div><div class='add'>+			snd_hda_jack_tbl_get_mst(codec, event-&gt;key_report_jack,</div><div class='add'>+						 event-&gt;dev_id);</div><div class='add'>+		if (report_to)</div><div class='add'>+			report_to-&gt;jack_dirty = 1;</div><div class='add'>+	} else</div><div class='add'>+		event-&gt;jack_dirty = 1;</div><div class='add'>+</div><div class='add'>+	call_jack_callback(codec, res, event);</div><div class='add'>+	snd_hda_jack_report_sync(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_unsol_event);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_jack_poll_all - Poll all jacks</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ *</div><div class='add'>+ * Poll all detectable jacks with dirty flag, update the status, call</div><div class='add'>+ * callbacks and call snd_hda_jack_report_sync() if any changes are found.</div><div class='add'>+ */</div><div class='add'>+void snd_hda_jack_poll_all(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	struct hda_jack_tbl *jack = codec-&gt;jacktbl.list;</div><div class='add'>+	int i, changes = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; codec-&gt;jacktbl.used; i++, jack++) {</div><div class='add'>+		unsigned int old_sense;</div><div class='add'>+		if (!jack-&gt;nid || !jack-&gt;jack_dirty || jack-&gt;phantom_jack)</div><div class='add'>+			continue;</div><div class='add'>+		old_sense = get_jack_plug_state(jack-&gt;pin_sense);</div><div class='add'>+		jack_detect_update(codec, jack);</div><div class='add'>+		if (old_sense == get_jack_plug_state(jack-&gt;pin_sense))</div><div class='add'>+			continue;</div><div class='add'>+		changes = 1;</div><div class='add'>+		call_jack_callback(codec, 0, jack);</div><div class='add'>+	}</div><div class='add'>+	if (changes)</div><div class='add'>+		snd_hda_jack_report_sync(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_jack_poll_all);</div><div class='add'>+</div><div class='head'>diff --git a/sound/pci/hda/hda_proc.c b/sound/hda/common/proc.c<br/>index f025200f2a62..5f3f61519ba6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_proc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/proc.c</a></div><div class='hunk'>@@ -1,49 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Universal Interface for Intel High Definition Audio Codec</div><div class='ctx'>  * </div><div class='ctx'>  * Generic proc interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='ctx'> #include "hda_local.h"</div><div class='ctx'> </div><div class='del'>-static char *bits_names(unsigned int bits, char *names[], int size)</div><div class='del'>-{</div><div class='del'>-	int i, n;</div><div class='del'>-	static char buf[128];</div><div class='del'>-</div><div class='del'>-	for (i = 0, n = 0; i &lt; size; i++) {</div><div class='del'>-		if (bits &amp; (1U&lt;&lt;i) &amp;&amp; names[i])</div><div class='del'>-			n += snprintf(buf + n, sizeof(buf) - n, " %s",</div><div class='del'>-				      names[i]);</div><div class='del'>-	}</div><div class='del'>-	buf[n] = '\0';</div><div class='add'>+static int dump_coef = -1;</div><div class='add'>+module_param(dump_coef, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(dump_coef, "Dump processing coefficients in codec proc file (-1=auto, 0=disable, 1=enable)");</div><div class='ctx'> </div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='add'>+/* always use noncached version */</div><div class='add'>+#define param_read(codec, nid, parm) \</div><div class='add'>+	snd_hdac_read_parm_uncached(&amp;(codec)-&gt;core, nid, parm)</div><div class='ctx'> </div><div class='ctx'> static const char *get_wid_type_name(unsigned int wid_value)</div><div class='ctx'> {</div><div class='del'>-	static char *names[16] = {</div><div class='add'>+	static const char * const names[16] = {</div><div class='ctx'> 		[AC_WID_AUD_OUT] = "Audio Output",</div><div class='ctx'> 		[AC_WID_AUD_IN] = "Audio Input",</div><div class='ctx'> 		[AC_WID_AUD_MIX] = "Audio Mixer",</div><div class='hunk'>@@ -54,6 +35,8 @@ static const char *get_wid_type_name(unsigned int wid_value)</div><div class='ctx'> 		[AC_WID_BEEP] = "Beep Generator Widget",</div><div class='ctx'> 		[AC_WID_VENDOR] = "Vendor Defined Widget",</div><div class='ctx'> 	};</div><div class='add'>+	if (wid_value == -1)</div><div class='add'>+		return "UNKNOWN Widget";</div><div class='ctx'> 	wid_value &amp;= 0xf;</div><div class='ctx'> 	if (names[wid_value])</div><div class='ctx'> 		return names[wid_value];</div><div class='hunk'>@@ -91,10 +74,10 @@ static void print_nid_array(struct snd_info_buffer *buffer,</div><div class='ctx'> static void print_nid_pcms(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	int pcm, type;</div><div class='add'>+	int type;</div><div class='ctx'> 	struct hda_pcm *cpcm;</div><div class='del'>-	for (pcm = 0; pcm &lt; codec-&gt;num_pcms; pcm++) {</div><div class='del'>-		cpcm = &amp;codec-&gt;pcm_info[pcm];</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cpcm, &amp;codec-&gt;pcm_list_head, list) {</div><div class='ctx'> 		for (type = 0; type &lt; 2; type++) {</div><div class='ctx'> 			if (cpcm-&gt;stream[type].nid != nid || cpcm-&gt;pcm == NULL)</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -111,9 +94,8 @@ static void print_amp_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid, int dir)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int caps;</div><div class='del'>-	caps = snd_hda_param_read(codec, nid,</div><div class='del'>-				  dir == HDA_OUTPUT ?</div><div class='del'>-				    AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);</div><div class='add'>+	caps = param_read(codec, nid, dir == HDA_OUTPUT ?</div><div class='add'>+			  AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP);</div><div class='ctx'> 	if (caps == -1 || caps == 0) {</div><div class='ctx'> 		snd_iprintf(buffer, "N/A\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -126,38 +108,70 @@ static void print_amp_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 		    (caps &amp; AC_AMPCAP_MUTE) &gt;&gt; AC_AMPCAP_MUTE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* is this a stereo widget or a stereo-to-mono mix? */</div><div class='add'>+static bool is_stereo_amps(struct hda_codec *codec, hda_nid_t nid,</div><div class='add'>+			   int dir, unsigned int wcaps, int indices)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t conn;</div><div class='add'>+</div><div class='add'>+	if (wcaps &amp; AC_WCAP_STEREO)</div><div class='add'>+		return true;</div><div class='add'>+	/* check for a stereo-to-mono mix; it must be:</div><div class='add'>+	 * only a single connection, only for input, and only a mixer widget</div><div class='add'>+	 */</div><div class='add'>+	if (indices != 1 || dir != HDA_INPUT ||</div><div class='add'>+	    get_wcaps_type(wcaps) != AC_WID_AUD_MIX)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (snd_hda_get_raw_connections(codec, nid, &amp;conn, 1) &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+	/* the connection source is a stereo? */</div><div class='add'>+	wcaps = snd_hda_param_read(codec, conn, AC_PAR_AUDIO_WIDGET_CAP);</div><div class='add'>+	return !!(wcaps &amp; AC_WCAP_STEREO);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void print_amp_vals(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			   int dir, int stereo, int indices)</div><div class='add'>+			   int dir, unsigned int wcaps, int indices)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='add'>+	bool stereo;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	stereo = is_stereo_amps(codec, nid, dir, wcaps, indices);</div><div class='add'>+</div><div class='ctx'> 	dir = dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;</div><div class='ctx'> 	for (i = 0; i &lt; indices; i++) {</div><div class='ctx'> 		snd_iprintf(buffer, " [");</div><div class='add'>+		val = snd_hda_codec_read(codec, nid, 0,</div><div class='add'>+					 AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='add'>+					 AC_AMP_GET_LEFT | dir | i);</div><div class='add'>+		snd_iprintf(buffer, "0x%02x", val);</div><div class='ctx'> 		if (stereo) {</div><div class='ctx'> 			val = snd_hda_codec_read(codec, nid, 0,</div><div class='ctx'> 						 AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-						 AC_AMP_GET_LEFT | dir | i);</div><div class='del'>-			snd_iprintf(buffer, "0x%02x ", val);</div><div class='add'>+						 AC_AMP_GET_RIGHT | dir | i);</div><div class='add'>+			snd_iprintf(buffer, " 0x%02x", val);</div><div class='ctx'> 		}</div><div class='del'>-		val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					 AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-					 AC_AMP_GET_RIGHT | dir | i);</div><div class='del'>-		snd_iprintf(buffer, "0x%02x]", val);</div><div class='add'>+		snd_iprintf(buffer, "]");</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)</div><div class='ctx'> {</div><div class='del'>-	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];</div><div class='add'>+	static const unsigned int rates[] = {</div><div class='add'>+		8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,</div><div class='add'>+		96000, 176400, 192000, 384000</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	pcm &amp;= AC_SUPPCM_RATES;</div><div class='ctx'> 	snd_iprintf(buffer, "    rates [0x%x]:", pcm);</div><div class='del'>-	snd_print_pcm_rates(pcm, buf, sizeof(buf));</div><div class='del'>-	snd_iprintf(buffer, "%s\n", buf);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rates); i++)</div><div class='add'>+		if (pcm &amp; (1 &lt;&lt; i))</div><div class='add'>+			snd_iprintf(buffer,  " %d", rates[i]);</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)</div><div class='hunk'>@@ -185,8 +199,8 @@ static void print_pcm_formats(struct snd_info_buffer *buffer,</div><div class='ctx'> static void print_pcm_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	unsigned int pcm = snd_hda_param_read(codec, nid, AC_PAR_PCM);</div><div class='del'>-	unsigned int stream = snd_hda_param_read(codec, nid, AC_PAR_STREAM);</div><div class='add'>+	unsigned int pcm = param_read(codec, nid, AC_PAR_PCM);</div><div class='add'>+	unsigned int stream = param_read(codec, nid, AC_PAR_STREAM);</div><div class='ctx'> 	if (pcm == -1 || stream == -1) {</div><div class='ctx'> 		snd_iprintf(buffer, "N/A\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -198,7 +212,7 @@ static void print_pcm_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> </div><div class='ctx'> static const char *get_jack_connection(u32 cfg)</div><div class='ctx'> {</div><div class='del'>-	static char *names[16] = {</div><div class='add'>+	static const char * const names[16] = {</div><div class='ctx'> 		"Unknown", "1/8", "1/4", "ATAPI",</div><div class='ctx'> 		"RCA", "Optical","Digital", "Analog",</div><div class='ctx'> 		"DIN", "XLR", "RJ11", "Comb",</div><div class='hunk'>@@ -213,7 +227,7 @@ static const char *get_jack_connection(u32 cfg)</div><div class='ctx'> </div><div class='ctx'> static const char *get_jack_color(u32 cfg)</div><div class='ctx'> {</div><div class='del'>-	static char *names[16] = {</div><div class='add'>+	static const char * const names[16] = {</div><div class='ctx'> 		"Unknown", "Black", "Grey", "Blue",</div><div class='ctx'> 		"Green", "Red", "Orange", "Yellow",</div><div class='ctx'> 		"Purple", "Pink", NULL, NULL,</div><div class='hunk'>@@ -226,14 +240,77 @@ static const char *get_jack_color(u32 cfg)</div><div class='ctx'> 		return "UNKNOWN";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * Parse the pin default config value and returns the string of the</div><div class='add'>+ * jack location, e.g. "Rear", "Front", etc.</div><div class='add'>+ */</div><div class='add'>+static const char *get_jack_location(u32 cfg)</div><div class='add'>+{</div><div class='add'>+	static const char * const bases[7] = {</div><div class='add'>+		"N/A", "Rear", "Front", "Left", "Right", "Top", "Bottom",</div><div class='add'>+	};</div><div class='add'>+	static const unsigned char specials_idx[] = {</div><div class='add'>+		0x07, 0x08,</div><div class='add'>+		0x17, 0x18, 0x19,</div><div class='add'>+		0x37, 0x38</div><div class='add'>+	};</div><div class='add'>+	static const char * const specials[] = {</div><div class='add'>+		"Rear Panel", "Drive Bar",</div><div class='add'>+		"Riser", "HDMI", "ATAPI",</div><div class='add'>+		"Mobile-In", "Mobile-Out"</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cfg = (cfg &amp; AC_DEFCFG_LOCATION) &gt;&gt; AC_DEFCFG_LOCATION_SHIFT;</div><div class='add'>+	if ((cfg &amp; 0x0f) &lt; 7)</div><div class='add'>+		return bases[cfg &amp; 0x0f];</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(specials_idx); i++) {</div><div class='add'>+		if (cfg == specials_idx[i])</div><div class='add'>+			return specials[i];</div><div class='add'>+	}</div><div class='add'>+	return "UNKNOWN";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse the pin default config value and returns the string of the</div><div class='add'>+ * jack connectivity, i.e. external or internal connection.</div><div class='add'>+ */</div><div class='add'>+static const char *get_jack_connectivity(u32 cfg)</div><div class='add'>+{</div><div class='add'>+	static const char * const jack_locations[4] = {</div><div class='add'>+		"Ext", "Int", "Sep", "Oth"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return jack_locations[(cfg &gt;&gt; (AC_DEFCFG_LOCATION_SHIFT + 4)) &amp; 3];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Parse the pin default config value and returns the string of the</div><div class='add'>+ * jack type, i.e. the purpose of the jack, such as Line-Out or CD.</div><div class='add'>+ */</div><div class='add'>+static const char *get_jack_type(u32 cfg)</div><div class='add'>+{</div><div class='add'>+	static const char * const jack_types[16] = {</div><div class='add'>+		"Line Out", "Speaker", "HP Out", "CD",</div><div class='add'>+		"SPDIF Out", "Digital Out", "Modem Line", "Modem Hand",</div><div class='add'>+		"Line In", "Aux", "Mic", "Telephony",</div><div class='add'>+		"SPDIF In", "Digital In", "Reserved", "Other"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return jack_types[(cfg &amp; AC_DEFCFG_DEVICE)</div><div class='add'>+				&gt;&gt; AC_DEFCFG_DEVICE_SHIFT];</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void print_pin_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid,</div><div class='ctx'> 			   int *supports_vref)</div><div class='ctx'> {</div><div class='del'>-	static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };</div><div class='add'>+	static const char * const jack_conns[4] = {</div><div class='add'>+		"Jack", "N/A", "Fixed", "Both"</div><div class='add'>+	};</div><div class='ctx'> 	unsigned int caps, val;</div><div class='ctx'> </div><div class='del'>-	caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);</div><div class='add'>+	caps = param_read(codec, nid, AC_PAR_PIN_CAP);</div><div class='ctx'> 	snd_iprintf(buffer, "  Pincap 0x%08x:", caps);</div><div class='ctx'> 	if (caps &amp; AC_PINCAP_IN)</div><div class='ctx'> 		snd_iprintf(buffer, " IN");</div><div class='hunk'>@@ -249,7 +326,7 @@ static void print_pin_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 		snd_iprintf(buffer, " Balanced");</div><div class='ctx'> 	if (caps &amp; AC_PINCAP_HDMI) {</div><div class='ctx'> 		/* Realtek uses this bit as a different meaning */</div><div class='del'>-		if ((codec-&gt;vendor_id &gt;&gt; 16) == 0x10ec)</div><div class='add'>+		if ((codec-&gt;core.vendor_id &gt;&gt; 16) == 0x10ec)</div><div class='ctx'> 			snd_iprintf(buffer, " R/L");</div><div class='ctx'> 		else {</div><div class='ctx'> 			if (caps &amp; AC_PINCAP_HBR)</div><div class='hunk'>@@ -297,9 +374,9 @@ static void print_pin_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 	caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);</div><div class='ctx'> 	snd_iprintf(buffer, "  Pin Default 0x%08x: [%s] %s at %s %s\n", caps,</div><div class='ctx'> 		    jack_conns[(caps &amp; AC_DEFCFG_PORT_CONN) &gt;&gt; AC_DEFCFG_PORT_CONN_SHIFT],</div><div class='del'>-		    snd_hda_get_jack_type(caps),</div><div class='del'>-		    snd_hda_get_jack_connectivity(caps),</div><div class='del'>-		    snd_hda_get_jack_location(caps));</div><div class='add'>+		    get_jack_type(caps),</div><div class='add'>+		    get_jack_connectivity(caps),</div><div class='add'>+		    get_jack_location(caps));</div><div class='ctx'> 	snd_iprintf(buffer, "    Conn = %s, Color = %s\n",</div><div class='ctx'> 		    get_jack_connection(caps),</div><div class='ctx'> 		    get_jack_color(caps));</div><div class='hunk'>@@ -361,8 +438,7 @@ static void print_pin_ctls(struct snd_info_buffer *buffer,</div><div class='ctx'> static void print_vol_knob(struct snd_info_buffer *buffer,</div><div class='ctx'> 			   struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	unsigned int cap = snd_hda_param_read(codec, nid,</div><div class='del'>-					      AC_PAR_VOL_KNB_CAP);</div><div class='add'>+	unsigned int cap = param_read(codec, nid, AC_PAR_VOL_KNB_CAP);</div><div class='ctx'> 	snd_iprintf(buffer, "  Volume-Knob: delta=%d, steps=%d, ",</div><div class='ctx'> 		    (cap &gt;&gt; 7) &amp; 1, cap &amp; 0x7f);</div><div class='ctx'> 	cap = snd_hda_codec_read(codec, nid, 0,</div><div class='hunk'>@@ -394,6 +470,9 @@ static void print_digital_conv(struct snd_info_buffer *buffer,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int digi1 = snd_hda_codec_read(codec, nid, 0,</div><div class='ctx'> 						AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='add'>+	unsigned char digi2 = digi1 &gt;&gt; 8;</div><div class='add'>+	unsigned char digi3 = digi1 &gt;&gt; 16;</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer, "  Digital:");</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_ENABLE)</div><div class='ctx'> 		snd_iprintf(buffer, " Enabled");</div><div class='hunk'>@@ -404,24 +483,28 @@ static void print_digital_conv(struct snd_info_buffer *buffer,</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_EMPHASIS)</div><div class='ctx'> 		snd_iprintf(buffer, " Preemphasis");</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_COPYRIGHT)</div><div class='del'>-		snd_iprintf(buffer, " Copyright");</div><div class='add'>+		snd_iprintf(buffer, " Non-Copyright");</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_NONAUDIO)</div><div class='ctx'> 		snd_iprintf(buffer, " Non-Audio");</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_PROFESSIONAL)</div><div class='ctx'> 		snd_iprintf(buffer, " Pro");</div><div class='ctx'> 	if (digi1 &amp; AC_DIG1_LEVEL)</div><div class='ctx'> 		snd_iprintf(buffer, " GenLevel");</div><div class='add'>+	if (digi3 &amp; AC_DIG3_KAE)</div><div class='add'>+		snd_iprintf(buffer, " KAE");</div><div class='ctx'> 	snd_iprintf(buffer, "\n");</div><div class='ctx'> 	snd_iprintf(buffer, "  Digital category: 0x%x\n",</div><div class='del'>-		    (digi1 &gt;&gt; 8) &amp; AC_DIG2_CC);</div><div class='add'>+		    digi2 &amp; AC_DIG2_CC);</div><div class='add'>+	snd_iprintf(buffer, "  IEC Coding Type: 0x%x\n",</div><div class='add'>+			digi3 &amp; AC_DIG3_ICT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const char *get_pwr_state(u32 state)</div><div class='ctx'> {</div><div class='del'>-	static const char *buf[4] = {</div><div class='del'>-		"D0", "D1", "D2", "D3"</div><div class='add'>+	static const char * const buf[] = {</div><div class='add'>+		"D0", "D1", "D2", "D3", "D3cold"</div><div class='ctx'> 	};</div><div class='del'>-	if (state &lt; 4)</div><div class='add'>+	if (state &lt; ARRAY_SIZE(buf))</div><div class='ctx'> 		return buf[state];</div><div class='ctx'> 	return "UNKNOWN";</div><div class='ctx'> }</div><div class='hunk'>@@ -429,7 +512,7 @@ static const char *get_pwr_state(u32 state)</div><div class='ctx'> static void print_power_state(struct snd_info_buffer *buffer,</div><div class='ctx'> 			      struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	static char *names[] = {</div><div class='add'>+	static const char * const names[] = {</div><div class='ctx'> 		[ilog2(AC_PWRST_D0SUP)]		= "D0",</div><div class='ctx'> 		[ilog2(AC_PWRST_D1SUP)]		= "D1",</div><div class='ctx'> 		[ilog2(AC_PWRST_D2SUP)]		= "D2",</div><div class='hunk'>@@ -440,17 +523,31 @@ static void print_power_state(struct snd_info_buffer *buffer,</div><div class='ctx'> 		[ilog2(AC_PWRST_EPSS)]		= "EPSS",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	int sup = snd_hda_param_read(codec, nid, AC_PAR_POWER_STATE);</div><div class='add'>+	int sup = param_read(codec, nid, AC_PAR_POWER_STATE);</div><div class='ctx'> 	int pwr = snd_hda_codec_read(codec, nid, 0,</div><div class='ctx'> 				     AC_VERB_GET_POWER_STATE, 0);</div><div class='del'>-	if (sup)</div><div class='del'>-		snd_iprintf(buffer, "  Power states: %s\n",</div><div class='del'>-			    bits_names(sup, names, ARRAY_SIZE(names)));</div><div class='add'>+	if (sup != -1) {</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-	snd_iprintf(buffer, "  Power: setting=%s, actual=%s\n",</div><div class='add'>+		snd_iprintf(buffer, "  Power states: ");</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(names); i++) {</div><div class='add'>+			if (sup &amp; (1U &lt;&lt; i))</div><div class='add'>+				snd_iprintf(buffer, " %s", names[i]);</div><div class='add'>+		}</div><div class='add'>+		snd_iprintf(buffer, "\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "  Power: setting=%s, actual=%s",</div><div class='ctx'> 		    get_pwr_state(pwr &amp; AC_PWRST_SETTING),</div><div class='ctx'> 		    get_pwr_state((pwr &amp; AC_PWRST_ACTUAL) &gt;&gt;</div><div class='ctx'> 				  AC_PWRST_ACTUAL_SHIFT));</div><div class='add'>+	if (pwr &amp; AC_PWRST_ERROR)</div><div class='add'>+		snd_iprintf(buffer, ", Error");</div><div class='add'>+	if (pwr &amp; AC_PWRST_CLK_STOP_OK)</div><div class='add'>+		snd_iprintf(buffer, ", Clock-stop-OK");</div><div class='add'>+	if (pwr &amp; AC_PWRST_SETTING_RESET)</div><div class='add'>+		snd_iprintf(buffer, ", Setting-reset");</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_unsol_cap(struct snd_info_buffer *buffer,</div><div class='hunk'>@@ -464,14 +561,38 @@ static void print_unsol_cap(struct snd_info_buffer *buffer,</div><div class='ctx'> 		    (unsol &amp; AC_UNSOL_ENABLED) ? 1 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool can_dump_coef(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	switch (dump_coef) {</div><div class='add'>+	case 0: return false;</div><div class='add'>+	case 1: return true;</div><div class='add'>+	default: return codec-&gt;dump_coef;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void print_proc_caps(struct snd_info_buffer *buffer,</div><div class='ctx'> 			    struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='del'>-	unsigned int proc_caps = snd_hda_param_read(codec, nid,</div><div class='del'>-						    AC_PAR_PROC_CAP);</div><div class='add'>+	unsigned int i, ncoeff, oldindex;</div><div class='add'>+	unsigned int proc_caps = param_read(codec, nid, AC_PAR_PROC_CAP);</div><div class='add'>+	ncoeff = (proc_caps &amp; AC_PCAP_NUM_COEF) &gt;&gt; AC_PCAP_NUM_COEF_SHIFT;</div><div class='ctx'> 	snd_iprintf(buffer, "  Processing caps: benign=%d, ncoeff=%d\n",</div><div class='del'>-		    proc_caps &amp; AC_PCAP_BENIGN,</div><div class='del'>-		    (proc_caps &amp; AC_PCAP_NUM_COEF) &gt;&gt; AC_PCAP_NUM_COEF_SHIFT);</div><div class='add'>+		    proc_caps &amp; AC_PCAP_BENIGN, ncoeff);</div><div class='add'>+</div><div class='add'>+	if (!can_dump_coef(codec))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Note: This is racy - another process could run in parallel and change</div><div class='add'>+	   the coef index too. */</div><div class='add'>+	oldindex = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_COEF_INDEX, 0);</div><div class='add'>+	for (i = 0; i &lt; ncoeff; i++) {</div><div class='add'>+		unsigned int val;</div><div class='add'>+		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, i);</div><div class='add'>+		val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PROC_COEF,</div><div class='add'>+					 0);</div><div class='add'>+		snd_iprintf(buffer, "    Coeff 0x%02x: 0x%04x\n", i, val);</div><div class='add'>+	}</div><div class='add'>+	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, oldindex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_conn_list(struct snd_info_buffer *buffer,</div><div class='hunk'>@@ -480,6 +601,8 @@ static void print_conn_list(struct snd_info_buffer *buffer,</div><div class='ctx'> 			    int conn_len)</div><div class='ctx'> {</div><div class='ctx'> 	int c, curr = -1;</div><div class='add'>+	const hda_nid_t *list;</div><div class='add'>+	int cache_len;</div><div class='ctx'> </div><div class='ctx'> 	if (conn_len &gt; 1 &amp;&amp;</div><div class='ctx'> 	    wid_type != AC_WID_AUD_MIX &amp;&amp;</div><div class='hunk'>@@ -497,13 +620,26 @@ static void print_conn_list(struct snd_info_buffer *buffer,</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_iprintf(buffer, "\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Get Cache connections info */</div><div class='add'>+	cache_len = snd_hda_get_conn_list(codec, nid, &amp;list);</div><div class='add'>+	if (cache_len &gt;= 0 &amp;&amp; (cache_len != conn_len ||</div><div class='add'>+			      memcmp(list, conn, conn_len) != 0)) {</div><div class='add'>+		snd_iprintf(buffer, "  In-driver Connection: %d\n", cache_len);</div><div class='add'>+		if (cache_len &gt; 0) {</div><div class='add'>+			snd_iprintf(buffer, "    ");</div><div class='add'>+			for (c = 0; c &lt; cache_len; c++)</div><div class='add'>+				snd_iprintf(buffer, " 0x%02x", list[c]);</div><div class='add'>+			snd_iprintf(buffer, "\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void print_gpio(struct snd_info_buffer *buffer,</div><div class='ctx'> 		       struct hda_codec *codec, hda_nid_t nid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int gpio =</div><div class='del'>-		snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_GPIO_CAP);</div><div class='add'>+		param_read(codec, codec-&gt;core.afg, AC_PAR_GPIO_CAP);</div><div class='ctx'> 	unsigned int enable, direction, wake, unsol, sticky, data;</div><div class='ctx'> 	int i, max;</div><div class='ctx'> 	snd_iprintf(buffer, "GPIO: io=%d, o=%d, i=%d, "</div><div class='hunk'>@@ -543,13 +679,74 @@ static void print_gpio(struct snd_info_buffer *buffer,</div><div class='ctx'> 	print_nid_array(buffer, codec, nid, &amp;codec-&gt;nids);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void print_codec_info(struct snd_info_entry *entry,</div><div class='del'>-			     struct snd_info_buffer *buffer)</div><div class='add'>+static void print_dpmst_connections(struct snd_info_buffer *buffer, struct hda_codec *codec,</div><div class='add'>+				    hda_nid_t nid, int dev_num)</div><div class='ctx'> {</div><div class='del'>-	struct hda_codec *codec = entry-&gt;private_data;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, nodes;</div><div class='add'>+	int c, conn_len, curr, dev_id_saved;</div><div class='add'>+	hda_nid_t *conn;</div><div class='add'>+</div><div class='add'>+	conn_len = snd_hda_get_num_raw_conns(codec, nid);</div><div class='add'>+	if (conn_len &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	conn = kmalloc_array(conn_len, sizeof(hda_nid_t), GFP_KERNEL);</div><div class='add'>+	if (!conn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_id_saved = snd_hda_get_dev_select(codec, nid);</div><div class='add'>+</div><div class='add'>+	snd_hda_set_dev_select(codec, nid, dev_num);</div><div class='add'>+	curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);</div><div class='add'>+	if (snd_hda_get_raw_connections(codec, nid, conn, conn_len) &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (c = 0; c &lt; conn_len; c++) {</div><div class='add'>+		snd_iprintf(buffer, " 0x%02x", conn[c]);</div><div class='add'>+		if (c == curr)</div><div class='add'>+			snd_iprintf(buffer, "*");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree(conn);</div><div class='add'>+	snd_hda_set_dev_select(codec, nid, dev_id_saved);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void print_device_list(struct snd_info_buffer *buffer,</div><div class='add'>+			    struct hda_codec *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	int i, curr = -1;</div><div class='add'>+	u8 dev_list[AC_MAX_DEV_LIST_LEN];</div><div class='add'>+	unsigned int devlist_len;</div><div class='add'>+</div><div class='add'>+	devlist_len = snd_hda_get_devices(codec, nid, dev_list,</div><div class='add'>+					AC_MAX_DEV_LIST_LEN);</div><div class='add'>+	snd_iprintf(buffer, "  Devices: %u\n", devlist_len);</div><div class='add'>+	if (devlist_len == 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	curr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DEVICE_SEL, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; devlist_len; i++) {</div><div class='add'>+		if (i == curr)</div><div class='add'>+			snd_iprintf(buffer, "    *");</div><div class='add'>+		else</div><div class='add'>+			snd_iprintf(buffer, "     ");</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer,</div><div class='add'>+			"Dev %02d: PD = %d, ELDV = %d, IA = %d, Connections [", i,</div><div class='add'>+			!!(dev_list[i] &amp; AC_DE_PD),</div><div class='add'>+			!!(dev_list[i] &amp; AC_DE_ELDV),</div><div class='add'>+			!!(dev_list[i] &amp; AC_DE_IA));</div><div class='add'>+</div><div class='add'>+		print_dpmst_connections(buffer, codec, nid, i);</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, " ]\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_codec_core_info(struct hdac_device *codec,</div><div class='add'>+				  struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='ctx'> 	snd_iprintf(buffer, "Codec: ");</div><div class='ctx'> 	if (codec-&gt;vendor_name &amp;&amp; codec-&gt;chip_name)</div><div class='ctx'> 		snd_iprintf(buffer, "%s %s\n",</div><div class='hunk'>@@ -571,34 +768,44 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> 		snd_iprintf(buffer, "Modem Function Group: 0x%x\n", codec-&gt;mfg);</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_iprintf(buffer, "No Modem Function Group found\n");</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (! codec-&gt;afg)</div><div class='add'>+static void print_codec_info(struct snd_info_entry *entry,</div><div class='add'>+			     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = entry-&gt;private_data;</div><div class='add'>+	hda_nid_t nid, fg;</div><div class='add'>+	int i, nodes;</div><div class='add'>+</div><div class='add'>+	print_codec_core_info(&amp;codec-&gt;core, buffer);</div><div class='add'>+	fg = codec-&gt;core.afg;</div><div class='add'>+	if (!fg)</div><div class='ctx'> 		return;</div><div class='del'>-	snd_hda_power_up(codec);</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='ctx'> 	snd_iprintf(buffer, "Default PCM:\n");</div><div class='del'>-	print_pcm_caps(buffer, codec, codec-&gt;afg);</div><div class='add'>+	print_pcm_caps(buffer, codec, fg);</div><div class='ctx'> 	snd_iprintf(buffer, "Default Amp-In caps: ");</div><div class='del'>-	print_amp_caps(buffer, codec, codec-&gt;afg, HDA_INPUT);</div><div class='add'>+	print_amp_caps(buffer, codec, fg, HDA_INPUT);</div><div class='ctx'> 	snd_iprintf(buffer, "Default Amp-Out caps: ");</div><div class='del'>-	print_amp_caps(buffer, codec, codec-&gt;afg, HDA_OUTPUT);</div><div class='add'>+	print_amp_caps(buffer, codec, fg, HDA_OUTPUT);</div><div class='add'>+	snd_iprintf(buffer, "State of AFG node 0x%02x:\n", fg);</div><div class='add'>+	print_power_state(buffer, codec, fg);</div><div class='ctx'> </div><div class='del'>-	nodes = snd_hda_get_sub_nodes(codec, codec-&gt;afg, &amp;nid);</div><div class='add'>+	nodes = snd_hda_get_sub_nodes(codec, fg, &amp;nid);</div><div class='ctx'> 	if (! nid || nodes &lt; 0) {</div><div class='ctx'> 		snd_iprintf(buffer, "Invalid AFG subtree\n");</div><div class='del'>-		snd_hda_power_down(codec);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	print_gpio(buffer, codec, codec-&gt;afg);</div><div class='add'>+	print_gpio(buffer, codec, fg);</div><div class='ctx'> 	if (codec-&gt;proc_widget_hook)</div><div class='del'>-		codec-&gt;proc_widget_hook(buffer, codec, codec-&gt;afg);</div><div class='add'>+		codec-&gt;proc_widget_hook(buffer, codec, fg);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nodes; i++, nid++) {</div><div class='ctx'> 		unsigned int wid_caps =</div><div class='del'>-			snd_hda_param_read(codec, nid,</div><div class='del'>-					   AC_PAR_AUDIO_WIDGET_CAP);</div><div class='add'>+			param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);</div><div class='ctx'> 		unsigned int wid_type = get_wcaps_type(wid_caps);</div><div class='del'>-		hda_nid_t conn[HDA_MAX_CONNECTIONS];</div><div class='add'>+		hda_nid_t *conn = NULL;</div><div class='ctx'> 		int conn_len = 0;</div><div class='ctx'> </div><div class='ctx'> 		snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,</div><div class='hunk'>@@ -635,17 +842,32 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> 		if (wid_type == AC_WID_VOL_KNB)</div><div class='ctx'> 			wid_caps |= AC_WCAP_CONN_LIST;</div><div class='ctx'> </div><div class='del'>-		if (wid_caps &amp; AC_WCAP_CONN_LIST)</div><div class='del'>-			conn_len = snd_hda_get_connections(codec, nid, conn,</div><div class='del'>-							   HDA_MAX_CONNECTIONS);</div><div class='add'>+		if (wid_caps &amp; AC_WCAP_CONN_LIST) {</div><div class='add'>+			conn_len = snd_hda_get_num_raw_conns(codec, nid);</div><div class='add'>+			if (conn_len &gt; 0) {</div><div class='add'>+				conn = kmalloc_array(conn_len,</div><div class='add'>+						     sizeof(hda_nid_t),</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+				if (!conn)</div><div class='add'>+					return;</div><div class='add'>+				if (snd_hda_get_raw_connections(codec, nid, conn,</div><div class='add'>+								conn_len) &lt; 0)</div><div class='add'>+					conn_len = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (wid_caps &amp; AC_WCAP_IN_AMP) {</div><div class='ctx'> 			snd_iprintf(buffer, "  Amp-In caps: ");</div><div class='ctx'> 			print_amp_caps(buffer, codec, nid, HDA_INPUT);</div><div class='ctx'> 			snd_iprintf(buffer, "  Amp-In vals: ");</div><div class='del'>-			print_amp_vals(buffer, codec, nid, HDA_INPUT,</div><div class='del'>-				       wid_caps &amp; AC_WCAP_STEREO,</div><div class='del'>-				       wid_type == AC_WID_PIN ? 1 : conn_len);</div><div class='add'>+			if (wid_type == AC_WID_PIN ||</div><div class='add'>+			    (codec-&gt;single_adc_amp &amp;&amp;</div><div class='add'>+			     wid_type == AC_WID_AUD_IN))</div><div class='add'>+				print_amp_vals(buffer, codec, nid, HDA_INPUT,</div><div class='add'>+					       wid_caps, 1);</div><div class='add'>+			else</div><div class='add'>+				print_amp_vals(buffer, codec, nid, HDA_INPUT,</div><div class='add'>+					       wid_caps, conn_len);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (wid_caps &amp; AC_WCAP_OUT_AMP) {</div><div class='ctx'> 			snd_iprintf(buffer, "  Amp-Out caps: ");</div><div class='hunk'>@@ -654,11 +876,10 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> 			if (wid_type == AC_WID_PIN &amp;&amp;</div><div class='ctx'> 			    codec-&gt;pin_amp_workaround)</div><div class='ctx'> 				print_amp_vals(buffer, codec, nid, HDA_OUTPUT,</div><div class='del'>-					       wid_caps &amp; AC_WCAP_STEREO,</div><div class='del'>-					       conn_len);</div><div class='add'>+					       wid_caps, conn_len);</div><div class='ctx'> 			else</div><div class='ctx'> 				print_amp_vals(buffer, codec, nid, HDA_OUTPUT,</div><div class='del'>-					       wid_caps &amp; AC_WCAP_STEREO, 1);</div><div class='add'>+					       wid_caps, 1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		switch (wid_type) {</div><div class='hunk'>@@ -694,6 +915,9 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> 				    (wid_caps &amp; AC_WCAP_DELAY) &gt;&gt;</div><div class='ctx'> 				    AC_WCAP_DELAY_SHIFT);</div><div class='ctx'> </div><div class='add'>+		if (wid_type == AC_WID_PIN &amp;&amp; codec-&gt;dp_mst)</div><div class='add'>+			print_device_list(buffer, codec, nid);</div><div class='add'>+</div><div class='ctx'> 		if (wid_caps &amp; AC_WCAP_CONN_LIST)</div><div class='ctx'> 			print_conn_list(buffer, codec, nid, wid_type,</div><div class='ctx'> 					conn, conn_len);</div><div class='hunk'>@@ -703,8 +927,9 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 		if (codec-&gt;proc_widget_hook)</div><div class='ctx'> 			codec-&gt;proc_widget_hook(buffer, codec, nid);</div><div class='add'>+</div><div class='add'>+		kfree(conn);</div><div class='ctx'> 	}</div><div class='del'>-	snd_hda_power_down(codec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -713,15 +938,8 @@ static void print_codec_info(struct snd_info_entry *entry,</div><div class='ctx'> int snd_hda_codec_proc_new(struct hda_codec *codec)</div><div class='ctx'> {</div><div class='ctx'> 	char name[32];</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "codec#%d", codec-&gt;addr);</div><div class='del'>-	err = snd_card_proc_new(codec-&gt;bus-&gt;card, name, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> </div><div class='del'>-	snd_info_set_text_ops(entry, codec, print_codec_info);</div><div class='del'>-	return 0;</div><div class='add'>+	snprintf(name, sizeof(name), "codec#%d", codec-&gt;core.addr);</div><div class='add'>+	return snd_card_ro_proc_new(codec-&gt;card, name, codec, print_codec_info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/hda/common/sysfs.c b/sound/hda/common/sysfs.c<br/>new file mode 100644<br/>index 000000000000..f8c8483fd5e5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/common/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/common/sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,764 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * sysfs interface for HD-audio codec</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2014 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ *</div><div class='add'>+ * split from hda_hwdep.c</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_local.h"</div><div class='add'>+#include &lt;sound/hda_hwdep.h&gt;</div><div class='add'>+#include &lt;sound/minors.h&gt;</div><div class='add'>+</div><div class='add'>+/* hint string pair */</div><div class='add'>+struct hda_hint {</div><div class='add'>+	const char *key;</div><div class='add'>+	const char *val;	/* contained in the same alloc as key */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t power_on_acct_show(struct device *dev,</div><div class='add'>+				  struct device_attribute *attr,</div><div class='add'>+				  char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	snd_hda_update_power_acct(codec);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", jiffies_to_msecs(codec-&gt;power_on_acct));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t power_off_acct_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr,</div><div class='add'>+				   char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	snd_hda_update_power_acct(codec);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", jiffies_to_msecs(codec-&gt;power_off_acct));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RO(power_on_acct);</div><div class='add'>+static DEVICE_ATTR_RO(power_off_acct);</div><div class='add'>+</div><div class='add'>+#define CODEC_INFO_SHOW(type, field)				\</div><div class='add'>+static ssize_t type##_show(struct device *dev,			\</div><div class='add'>+			   struct device_attribute *attr,	\</div><div class='add'>+			   char *buf)				\</div><div class='add'>+{								\</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);		\</div><div class='add'>+	return sysfs_emit(buf, "0x%x\n", codec-&gt;field);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CODEC_INFO_STR_SHOW(type, field)			\</div><div class='add'>+static ssize_t type##_show(struct device *dev,			\</div><div class='add'>+			     struct device_attribute *attr,	\</div><div class='add'>+					char *buf)		\</div><div class='add'>+{								\</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);		\</div><div class='add'>+	return sysfs_emit(buf, "%s\n",				\</div><div class='add'>+			  codec-&gt;field ? codec-&gt;field : "");	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CODEC_INFO_SHOW(vendor_id, core.vendor_id);</div><div class='add'>+CODEC_INFO_SHOW(subsystem_id, core.subsystem_id);</div><div class='add'>+CODEC_INFO_SHOW(revision_id, core.revision_id);</div><div class='add'>+CODEC_INFO_SHOW(afg, core.afg);</div><div class='add'>+CODEC_INFO_SHOW(mfg, core.mfg);</div><div class='add'>+CODEC_INFO_STR_SHOW(vendor_name, core.vendor_name);</div><div class='add'>+CODEC_INFO_STR_SHOW(chip_name, core.chip_name);</div><div class='add'>+CODEC_INFO_STR_SHOW(modelname, modelname);</div><div class='add'>+</div><div class='add'>+static ssize_t pin_configs_show(struct hda_codec *codec,</div><div class='add'>+				struct snd_array *list,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	const struct hda_pincfg *pin;</div><div class='add'>+	int i, len = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	snd_array_for_each(list, i, pin) {</div><div class='add'>+		len += sysfs_emit_at(buf, len, "0x%02x 0x%08x\n",</div><div class='add'>+				     pin-&gt;nid, pin-&gt;cfg);</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t init_pin_configs_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='add'>+				     char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	return pin_configs_show(codec, &amp;codec-&gt;init_pins, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t driver_pin_configs_show(struct device *dev,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	return pin_configs_show(codec, &amp;codec-&gt;driver_pins, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sysfs interface</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int clear_codec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snd_hda_codec_reset(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		codec_err(codec, "The codec is being used, can't free.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	snd_hda_sysfs_clear(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reconfig_codec(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	CLASS(snd_hda_power, pm)(codec);</div><div class='add'>+	codec_info(codec, "hda-codec: reconfiguring\n");</div><div class='add'>+	err = snd_hda_codec_reset(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		codec_err(codec,</div><div class='add'>+			   "The codec is being used, can't reconfigure.\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = device_reprobe(hda_codec_dev(codec));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return snd_card_register(codec-&gt;card);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * allocate a string at most len chars, and remove the trailing EOL</div><div class='add'>+ */</div><div class='add'>+static char *kstrndup_noeol(const char *src, size_t len)</div><div class='add'>+{</div><div class='add'>+	char *s = kstrndup(src, len, GFP_KERNEL);</div><div class='add'>+	char *p;</div><div class='add'>+	if (!s)</div><div class='add'>+		return NULL;</div><div class='add'>+	p = strchr(s, '\n');</div><div class='add'>+	if (p)</div><div class='add'>+		*p = 0;</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CODEC_INFO_STORE(type, field)				\</div><div class='add'>+static ssize_t type##_store(struct device *dev,			\</div><div class='add'>+			    struct device_attribute *attr,	\</div><div class='add'>+			    const char *buf, size_t count)	\</div><div class='add'>+{								\</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);		\</div><div class='add'>+	unsigned long val;					\</div><div class='add'>+	int err = kstrtoul(buf, 0, &amp;val);			\</div><div class='add'>+	if (err &lt; 0)						\</div><div class='add'>+		return err;					\</div><div class='add'>+	codec-&gt;field = val;					\</div><div class='add'>+	return count;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CODEC_INFO_STR_STORE(type, field)			\</div><div class='add'>+static ssize_t type##_store(struct device *dev,			\</div><div class='add'>+			    struct device_attribute *attr,	\</div><div class='add'>+			    const char *buf, size_t count)	\</div><div class='add'>+{								\</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);		\</div><div class='add'>+	char *s = kstrndup_noeol(buf, 64);			\</div><div class='add'>+	if (!s)							\</div><div class='add'>+		return -ENOMEM;					\</div><div class='add'>+	kfree(codec-&gt;field);					\</div><div class='add'>+	codec-&gt;field = s;					\</div><div class='add'>+	return count;						\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CODEC_INFO_STORE(vendor_id, core.vendor_id);</div><div class='add'>+CODEC_INFO_STORE(subsystem_id, core.subsystem_id);</div><div class='add'>+CODEC_INFO_STORE(revision_id, core.revision_id);</div><div class='add'>+CODEC_INFO_STR_STORE(vendor_name, core.vendor_name);</div><div class='add'>+CODEC_INFO_STR_STORE(chip_name, core.chip_name);</div><div class='add'>+CODEC_INFO_STR_STORE(modelname, modelname);</div><div class='add'>+</div><div class='add'>+#define CODEC_ACTION_STORE(type)				\</div><div class='add'>+static ssize_t type##_store(struct device *dev,			\</div><div class='add'>+			    struct device_attribute *attr,	\</div><div class='add'>+			    const char *buf, size_t count)	\</div><div class='add'>+{								\</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);		\</div><div class='add'>+	int err = 0;						\</div><div class='add'>+	if (*buf)						\</div><div class='add'>+		err = type##_codec(codec);			\</div><div class='add'>+	return err &lt; 0 ? err : count;				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CODEC_ACTION_STORE(reconfig);</div><div class='add'>+CODEC_ACTION_STORE(clear);</div><div class='add'>+</div><div class='add'>+static ssize_t init_verbs_show(struct device *dev,</div><div class='add'>+			       struct device_attribute *attr,</div><div class='add'>+			       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	const struct hda_verb *v;</div><div class='add'>+	int i, len = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;init_verbs, i, v) {</div><div class='add'>+		len += sysfs_emit_at(buf, len, "0x%02x 0x%03x 0x%04x\n",</div><div class='add'>+				     v-&gt;nid, v-&gt;verb, v-&gt;param);</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_init_verbs(struct hda_codec *codec, const char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_verb *v;</div><div class='add'>+	int nid, verb, param;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%i %i %i", &amp;nid, &amp;verb, &amp;param) != 3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!nid || !verb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	v = snd_array_new(&amp;codec-&gt;init_verbs);</div><div class='add'>+	if (!v)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	v-&gt;nid = nid;</div><div class='add'>+	v-&gt;verb = verb;</div><div class='add'>+	v-&gt;param = param;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t init_verbs_store(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	int err = parse_init_verbs(codec, buf);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hints_show(struct device *dev,</div><div class='add'>+			  struct device_attribute *attr,</div><div class='add'>+			  char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	const struct hda_hint *hint;</div><div class='add'>+	int i, len = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;hints, i, hint) {</div><div class='add'>+		len += sysfs_emit_at(buf, len, "%s = %s\n",</div><div class='add'>+				     hint-&gt;key, hint-&gt;val);</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hda_hint *get_hint(struct hda_codec *codec, const char *key)</div><div class='add'>+{</div><div class='add'>+	struct hda_hint *hint;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;hints, i, hint) {</div><div class='add'>+		if (!strcmp(hint-&gt;key, key))</div><div class='add'>+			return hint;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void remove_trail_spaces(char *str)</div><div class='add'>+{</div><div class='add'>+	char *p;</div><div class='add'>+	if (!*str)</div><div class='add'>+		return;</div><div class='add'>+	p = str + strlen(str) - 1;</div><div class='add'>+	for (; isspace(*p); p--) {</div><div class='add'>+		*p = 0;</div><div class='add'>+		if (p == str)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_HINTS	1024</div><div class='add'>+</div><div class='add'>+static int parse_hints(struct hda_codec *codec, const char *buf)</div><div class='add'>+{</div><div class='add'>+	char *key __free(kfree) = NULL;</div><div class='add'>+	char *val;</div><div class='add'>+	struct hda_hint *hint;</div><div class='add'>+</div><div class='add'>+	buf = skip_spaces(buf);</div><div class='add'>+	if (!*buf || *buf == '#' || *buf == '\n')</div><div class='add'>+		return 0;</div><div class='add'>+	if (*buf == '=')</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	key = kstrndup_noeol(buf, 1024);</div><div class='add'>+	if (!key)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* extract key and val */</div><div class='add'>+	val = strchr(key, '=');</div><div class='add'>+	if (!val)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	*val++ = 0;</div><div class='add'>+	val = skip_spaces(val);</div><div class='add'>+	remove_trail_spaces(key);</div><div class='add'>+	remove_trail_spaces(val);</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	hint = get_hint(codec, key);</div><div class='add'>+	if (hint) {</div><div class='add'>+		/* replace */</div><div class='add'>+		kfree(hint-&gt;key);</div><div class='add'>+		goto replace;</div><div class='add'>+	}</div><div class='add'>+	/* allocate a new hint entry */</div><div class='add'>+	if (codec-&gt;hints.used &gt;= MAX_HINTS)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	hint = snd_array_new(&amp;codec-&gt;hints);</div><div class='add'>+	if (!hint)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+ replace:</div><div class='add'>+	hint-&gt;key = no_free_ptr(key);</div><div class='add'>+	hint-&gt;val = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t hints_store(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='add'>+			   const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	int err = parse_hints(codec, buf);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t user_pin_configs_show(struct device *dev,</div><div class='add'>+				     struct device_attribute *attr,</div><div class='add'>+				     char *buf)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	return pin_configs_show(codec, &amp;codec-&gt;user_pins, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int parse_user_pin_configs(struct hda_codec *codec, const char *buf)</div><div class='add'>+{</div><div class='add'>+	int nid, cfg;</div><div class='add'>+</div><div class='add'>+	if (sscanf(buf, "%i %i", &amp;nid, &amp;cfg) != 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!nid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	return snd_hda_add_pincfg(codec, &amp;codec-&gt;user_pins, nid, cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t user_pin_configs_store(struct device *dev,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='add'>+				      const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct hda_codec *codec = dev_get_drvdata(dev);</div><div class='add'>+	int err = parse_user_pin_configs(codec, buf);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sysfs attributes exposed only when CONFIG_SND_HDA_RECONFIG=y */</div><div class='add'>+static DEVICE_ATTR_RW(init_verbs);</div><div class='add'>+static DEVICE_ATTR_RW(hints);</div><div class='add'>+static DEVICE_ATTR_RW(user_pin_configs);</div><div class='add'>+static DEVICE_ATTR_WO(reconfig);</div><div class='add'>+static DEVICE_ATTR_WO(clear);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_hint - Look for hint string</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @key: the hint key string</div><div class='add'>+ *</div><div class='add'>+ * Look for a hint key/value pair matching with the given key string</div><div class='add'>+ * and returns the value string.  If nothing found, returns NULL.</div><div class='add'>+ */</div><div class='add'>+const char *snd_hda_get_hint(struct hda_codec *codec, const char *key)</div><div class='add'>+{</div><div class='add'>+	struct hda_hint *hint = get_hint(codec, key);</div><div class='add'>+	return hint ? hint-&gt;val : NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_hint);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_bool_hint - Get a boolean hint value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @key: the hint key string</div><div class='add'>+ *</div><div class='add'>+ * Look for a hint key/value pair matching with the given key string</div><div class='add'>+ * and returns a boolean value parsed from the value.  If no matching</div><div class='add'>+ * key is found, return a negative value.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)</div><div class='add'>+{</div><div class='add'>+	const char *p;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	p = snd_hda_get_hint(codec, key);</div><div class='add'>+	if (!p || !*p)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	switch (toupper(*p)) {</div><div class='add'>+	case 'T': /* true */</div><div class='add'>+	case 'Y': /* yes */</div><div class='add'>+	case '1':</div><div class='add'>+		return 1;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_bool_hint);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_get_int_hint - Get an integer hint value</div><div class='add'>+ * @codec: the HDA codec</div><div class='add'>+ * @key: the hint key string</div><div class='add'>+ * @valp: pointer to store a value</div><div class='add'>+ *</div><div class='add'>+ * Look for a hint key/value pair matching with the given key string</div><div class='add'>+ * and stores the integer value to @valp.  If no matching key is found,</div><div class='add'>+ * return a negative error code.  Otherwise it returns zero.</div><div class='add'>+ */</div><div class='add'>+int snd_hda_get_int_hint(struct hda_codec *codec, const char *key, int *valp)</div><div class='add'>+{</div><div class='add'>+	const char *p;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;user_mutex);</div><div class='add'>+	p = snd_hda_get_hint(codec, key);</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	else if (kstrtoul(p, 0, &amp;val))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	else {</div><div class='add'>+		*valp = val;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_get_int_hint);</div><div class='add'>+#endif /* CONFIG_SND_HDA_RECONFIG */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * common sysfs attributes</div><div class='add'>+ */</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+#define RECONFIG_DEVICE_ATTR(name)	DEVICE_ATTR_RW(name)</div><div class='add'>+#else</div><div class='add'>+#define RECONFIG_DEVICE_ATTR(name)	DEVICE_ATTR_RO(name)</div><div class='add'>+#endif</div><div class='add'>+static RECONFIG_DEVICE_ATTR(vendor_id);</div><div class='add'>+static RECONFIG_DEVICE_ATTR(subsystem_id);</div><div class='add'>+static RECONFIG_DEVICE_ATTR(revision_id);</div><div class='add'>+static DEVICE_ATTR_RO(afg);</div><div class='add'>+static DEVICE_ATTR_RO(mfg);</div><div class='add'>+static RECONFIG_DEVICE_ATTR(vendor_name);</div><div class='add'>+static RECONFIG_DEVICE_ATTR(chip_name);</div><div class='add'>+static RECONFIG_DEVICE_ATTR(modelname);</div><div class='add'>+static DEVICE_ATTR_RO(init_pin_configs);</div><div class='add'>+static DEVICE_ATTR_RO(driver_pin_configs);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+</div><div class='add'>+/* parser mode */</div><div class='add'>+enum {</div><div class='add'>+	LINE_MODE_NONE,</div><div class='add'>+	LINE_MODE_CODEC,</div><div class='add'>+	LINE_MODE_MODEL,</div><div class='add'>+	LINE_MODE_PINCFG,</div><div class='add'>+	LINE_MODE_VERB,</div><div class='add'>+	LINE_MODE_HINT,</div><div class='add'>+	LINE_MODE_VENDOR_ID,</div><div class='add'>+	LINE_MODE_SUBSYSTEM_ID,</div><div class='add'>+	LINE_MODE_REVISION_ID,</div><div class='add'>+	LINE_MODE_CHIP_NAME,</div><div class='add'>+	NUM_LINE_MODES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int strmatch(const char *a, const char *b)</div><div class='add'>+{</div><div class='add'>+	return strncasecmp(a, b, strlen(b)) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse the contents after the line "[codec]"</div><div class='add'>+ * accept only the line with three numbers, and assign the current codec</div><div class='add'>+ */</div><div class='add'>+static void parse_codec_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+			     struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	int vendorid, subid, caddr;</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	*codecp = NULL;</div><div class='add'>+	if (sscanf(buf, "%i %i %i", &amp;vendorid, &amp;subid, &amp;caddr) == 3) {</div><div class='add'>+		list_for_each_codec(codec, bus) {</div><div class='add'>+			if ((vendorid &lt;= 0 || codec-&gt;core.vendor_id == vendorid) &amp;&amp;</div><div class='add'>+			    (subid &lt;= 0 || codec-&gt;core.subsystem_id == subid) &amp;&amp;</div><div class='add'>+			    codec-&gt;core.addr == caddr) {</div><div class='add'>+				*codecp = codec;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse the contents after the other command tags, [pincfg], [verb],</div><div class='add'>+ * [vendor_id], [subsystem_id], [revision_id], [chip_name], [hint] and [model]</div><div class='add'>+ * just pass to the sysfs helper (only when any codec was specified)</div><div class='add'>+ */</div><div class='add'>+static void parse_pincfg_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+			      struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	parse_user_pin_configs(*codecp, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_verb_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+			    struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	parse_init_verbs(*codecp, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_hint_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+			    struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	parse_hints(*codecp, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_model_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+			     struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	kfree((*codecp)-&gt;modelname);</div><div class='add'>+	(*codecp)-&gt;modelname = kstrdup(buf, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void parse_chip_name_mode(char *buf, struct hda_bus *bus,</div><div class='add'>+				 struct hda_codec **codecp)</div><div class='add'>+{</div><div class='add'>+	snd_hda_codec_set_name(*codecp, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DEFINE_PARSE_ID_MODE(name) \</div><div class='add'>+static void parse_##name##_mode(char *buf, struct hda_bus *bus, \</div><div class='add'>+				 struct hda_codec **codecp) \</div><div class='add'>+{ \</div><div class='add'>+	unsigned long val; \</div><div class='add'>+	if (!kstrtoul(buf, 0, &amp;val)) \</div><div class='add'>+		(*codecp)-&gt;core.name = val; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_PARSE_ID_MODE(vendor_id);</div><div class='add'>+DEFINE_PARSE_ID_MODE(subsystem_id);</div><div class='add'>+DEFINE_PARSE_ID_MODE(revision_id);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct hda_patch_item {</div><div class='add'>+	const char *tag;</div><div class='add'>+	const char *alias;</div><div class='add'>+	void (*parser)(char *buf, struct hda_bus *bus, struct hda_codec **retc);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_patch_item patch_items[NUM_LINE_MODES] = {</div><div class='add'>+	[LINE_MODE_CODEC] = {</div><div class='add'>+		.tag = "[codec]",</div><div class='add'>+		.parser = parse_codec_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_MODEL] = {</div><div class='add'>+		.tag = "[model]",</div><div class='add'>+		.parser = parse_model_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_VERB] = {</div><div class='add'>+		.tag = "[verb]",</div><div class='add'>+		.alias = "[init_verbs]",</div><div class='add'>+		.parser = parse_verb_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_PINCFG] = {</div><div class='add'>+		.tag = "[pincfg]",</div><div class='add'>+		.alias = "[user_pin_configs]",</div><div class='add'>+		.parser = parse_pincfg_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_HINT] = {</div><div class='add'>+		.tag = "[hint]",</div><div class='add'>+		.alias = "[hints]",</div><div class='add'>+		.parser = parse_hint_mode</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_VENDOR_ID] = {</div><div class='add'>+		.tag = "[vendor_id]",</div><div class='add'>+		.parser = parse_vendor_id_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_SUBSYSTEM_ID] = {</div><div class='add'>+		.tag = "[subsystem_id]",</div><div class='add'>+		.parser = parse_subsystem_id_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_REVISION_ID] = {</div><div class='add'>+		.tag = "[revision_id]",</div><div class='add'>+		.parser = parse_revision_id_mode,</div><div class='add'>+	},</div><div class='add'>+	[LINE_MODE_CHIP_NAME] = {</div><div class='add'>+		.tag = "[chip_name]",</div><div class='add'>+		.parser = parse_chip_name_mode,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* check the line starting with '[' -- change the parser mode accordingly */</div><div class='add'>+static int parse_line_mode(char *buf, struct hda_bus *bus)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(patch_items); i++) {</div><div class='add'>+		if (!patch_items[i].tag)</div><div class='add'>+			continue;</div><div class='add'>+		if (strmatch(buf, patch_items[i].tag))</div><div class='add'>+			return i;</div><div class='add'>+		if (patch_items[i].alias &amp;&amp; strmatch(buf, patch_items[i].alias))</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	return LINE_MODE_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* copy one line from the buffer in fw, and update the fields in fw</div><div class='add'>+ * return zero if it reaches to the end of the buffer, or non-zero</div><div class='add'>+ * if successfully copied a line</div><div class='add'>+ *</div><div class='add'>+ * the spaces at the beginning and the end of the line are stripped</div><div class='add'>+ */</div><div class='add'>+static int get_line_from_fw(char *buf, int size, size_t *fw_size_p,</div><div class='add'>+			    const void **fw_data_p)</div><div class='add'>+{</div><div class='add'>+	int len;</div><div class='add'>+	size_t fw_size = *fw_size_p;</div><div class='add'>+	const char *p = *fw_data_p;</div><div class='add'>+</div><div class='add'>+	while (isspace(*p) &amp;&amp; fw_size) {</div><div class='add'>+		p++;</div><div class='add'>+		fw_size--;</div><div class='add'>+	}</div><div class='add'>+	if (!fw_size)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (len = 0; len &lt; fw_size; len++) {</div><div class='add'>+		if (!*p)</div><div class='add'>+			break;</div><div class='add'>+		if (*p == '\n') {</div><div class='add'>+			p++;</div><div class='add'>+			len++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (len &lt; size)</div><div class='add'>+			*buf++ = *p++;</div><div class='add'>+	}</div><div class='add'>+	*buf = 0;</div><div class='add'>+	*fw_size_p = fw_size - len;</div><div class='add'>+	*fw_data_p = p;</div><div class='add'>+	remove_trail_spaces(buf);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_load_patch - load a "patch" firmware file and parse it</div><div class='add'>+ * @bus: HD-audio bus</div><div class='add'>+ * @fw_size: the firmware byte size</div><div class='add'>+ * @fw_buf: the firmware data</div><div class='add'>+ */</div><div class='add'>+int snd_hda_load_patch(struct hda_bus *bus, size_t fw_size, const void *fw_buf)</div><div class='add'>+{</div><div class='add'>+	char buf[128];</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int line_mode;</div><div class='add'>+</div><div class='add'>+	line_mode = LINE_MODE_NONE;</div><div class='add'>+	codec = NULL;</div><div class='add'>+	while (get_line_from_fw(buf, sizeof(buf) - 1, &amp;fw_size, &amp;fw_buf)) {</div><div class='add'>+		if (!*buf || *buf == '#' || *buf == '\n')</div><div class='add'>+			continue;</div><div class='add'>+		if (*buf == '[')</div><div class='add'>+			line_mode = parse_line_mode(buf, bus);</div><div class='add'>+		else if (patch_items[line_mode].parser &amp;&amp;</div><div class='add'>+			 (codec || line_mode &lt;= LINE_MODE_CODEC))</div><div class='add'>+			patch_items[line_mode].parser(buf, bus, &amp;codec);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_load_patch);</div><div class='add'>+#endif /* CONFIG_SND_HDA_PATCH_LOADER */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * sysfs entries</div><div class='add'>+ */</div><div class='add'>+static struct attribute *hda_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_vendor_id.attr,</div><div class='add'>+	&amp;dev_attr_subsystem_id.attr,</div><div class='add'>+	&amp;dev_attr_revision_id.attr,</div><div class='add'>+	&amp;dev_attr_afg.attr,</div><div class='add'>+	&amp;dev_attr_mfg.attr,</div><div class='add'>+	&amp;dev_attr_vendor_name.attr,</div><div class='add'>+	&amp;dev_attr_chip_name.attr,</div><div class='add'>+	&amp;dev_attr_modelname.attr,</div><div class='add'>+	&amp;dev_attr_init_pin_configs.attr,</div><div class='add'>+	&amp;dev_attr_driver_pin_configs.attr,</div><div class='add'>+	&amp;dev_attr_power_on_acct.attr,</div><div class='add'>+	&amp;dev_attr_power_off_acct.attr,</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+	&amp;dev_attr_init_verbs.attr,</div><div class='add'>+	&amp;dev_attr_hints.attr,</div><div class='add'>+	&amp;dev_attr_user_pin_configs.attr,</div><div class='add'>+	&amp;dev_attr_reconfig.attr,</div><div class='add'>+	&amp;dev_attr_clear.attr,</div><div class='add'>+#endif</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group hda_dev_attr_group = {</div><div class='add'>+	.attrs	= hda_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct attribute_group *snd_hda_dev_attr_groups[] = {</div><div class='add'>+	&amp;hda_dev_attr_group,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void snd_hda_sysfs_init(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+	mutex_init(&amp;codec-&gt;user_mutex);</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+	snd_array_init(&amp;codec-&gt;init_verbs, sizeof(struct hda_verb), 32);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;hints, sizeof(struct hda_hint), 32);</div><div class='add'>+	snd_array_init(&amp;codec-&gt;user_pins, sizeof(struct hda_pincfg), 16);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hda_sysfs_clear(struct hda_codec *codec)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='add'>+	struct hda_hint *hint;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* clear init verbs */</div><div class='add'>+	snd_array_free(&amp;codec-&gt;init_verbs);</div><div class='add'>+	/* clear hints */</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;hints, i, hint) {</div><div class='add'>+		kfree(hint-&gt;key); /* we don't need to free hint-&gt;val */</div><div class='add'>+	}</div><div class='add'>+	snd_array_free(&amp;codec-&gt;hints);</div><div class='add'>+	snd_array_free(&amp;codec-&gt;user_pins);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/controllers/Kconfig b/sound/hda/controllers/Kconfig<br/>new file mode 100644<br/>index 000000000000..34721f50b055<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config SND_HDA_INTEL</div><div class='add'>+	tristate "HD Audio PCI"</div><div class='add'>+	depends on SND_PCI</div><div class='add'>+	select SND_HDA</div><div class='add'>+	select SND_INTEL_DSP_CONFIG</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for Intel "High Definition</div><div class='add'>+	  Audio" (Azalia) and its compatible devices.</div><div class='add'>+</div><div class='add'>+	  This option enables the HD-audio controller.  Don't forget</div><div class='add'>+	  to choose the appropriate HD-audio codec options.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-hda-intel.</div><div class='add'>+</div><div class='add'>+config SND_HDA_TEGRA</div><div class='add'>+	tristate "NVIDIA Tegra HD Audio"</div><div class='add'>+	depends on ARCH_TEGRA</div><div class='add'>+	select SND_HDA</div><div class='add'>+	select SND_HDA_ALIGNED_MMIO</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to support the HDA controller present in NVIDIA</div><div class='add'>+	  Tegra SoCs</div><div class='add'>+</div><div class='add'>+	  This options enables support for the HD Audio controller</div><div class='add'>+	  present in some NVIDIA Tegra SoCs, used to communicate audio</div><div class='add'>+	  to the HDMI output.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-hda-tegra.</div><div class='add'>+</div><div class='add'>+config SND_HDA_ACPI</div><div class='add'>+	tristate "HD Audio ACPI"</div><div class='add'>+	depends on ACPI</div><div class='add'>+	select SND_HDA</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for Azalia-compatible HDA controllers</div><div class='add'>+	  which are advertised via ACPI objects.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-hda-acpi.</div><div class='head'>diff --git a/sound/hda/controllers/Makefile b/sound/hda/controllers/Makefile<br/>new file mode 100644<br/>index 000000000000..a4bcd055e9ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-hda-intel-y := intel.o</div><div class='add'>+snd-hda-tegra-y := tegra.o</div><div class='add'>+snd-hda-acpi-y := acpi.o</div><div class='add'>+</div><div class='add'>+subdir-ccflags-y += -I$(src)/../common</div><div class='add'>+</div><div class='add'>+# for trace-points</div><div class='add'>+CFLAGS_intel.o := -I$(src)</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o</div><div class='add'>+obj-$(CONFIG_SND_HDA_ACPI) += snd-hda-acpi.o</div><div class='head'>diff --git a/sound/hda/controllers/acpi.c b/sound/hda/controllers/acpi.c<br/>new file mode 100644<br/>index 000000000000..505cc97e0ee9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/acpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/acpi.c</a></div><div class='hunk'>@@ -0,0 +1,325 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * ALSA driver for ACPI-based HDA Controllers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hda_controller.h"</div><div class='add'>+</div><div class='add'>+struct hda_acpi {</div><div class='add'>+	struct azx azx;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	struct work_struct probe_work;</div><div class='add'>+	const struct hda_data *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct hda_data - Optional device-specific data</div><div class='add'>+ * @short_name: Used for the ALSA card name; defaults to KBUILD_MODNAME</div><div class='add'>+ * @long_name:  Used for longer description; defaults to short_name</div><div class='add'>+ * @flags:      Passed to &amp;azx-&gt;driver_caps</div><div class='add'>+ *</div><div class='add'>+ * A pointer to a record of this type may be stored in the</div><div class='add'>+ * &amp;acpi_device_id-&gt;driver_data field of an ACPI match table entry in order to</div><div class='add'>+ * customize the naming and behavior of a particular device. All fields are</div><div class='add'>+ * optional and sensible defaults will be selected in their absence.</div><div class='add'>+ */</div><div class='add'>+struct hda_data {</div><div class='add'>+	const char *short_name;</div><div class='add'>+	const char *long_name;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hda_acpi_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	chip-&gt;bus.shutdown = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct azx *azx = device-&gt;device_data;</div><div class='add'>+	struct hda_acpi *hda = container_of(azx, struct hda_acpi, azx);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;hda-&gt;probe_work);</div><div class='add'>+	if (azx_bus(azx)-&gt;chip_init) {</div><div class='add'>+		azx_stop_all_streams(azx);</div><div class='add'>+		azx_stop_chip(azx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	azx_free_stream_pages(azx);</div><div class='add'>+	azx_free_streams(azx);</div><div class='add'>+	snd_hdac_bus_exit(azx_bus(azx));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_init(struct hda_acpi *hda)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(&amp;hda-&gt;azx);</div><div class='add'>+	struct snd_card *card = hda-&gt;azx.card;</div><div class='add'>+	struct device *dev = &amp;hda-&gt;pdev-&gt;dev;</div><div class='add'>+	struct azx *azx = &amp;hda-&gt;azx;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	unsigned short gcap;</div><div class='add'>+	const char *sname, *lname;</div><div class='add'>+	int err, irq;</div><div class='add'>+</div><div class='add'>+	/* The base address for the HDA registers and the interrupt are wrapped</div><div class='add'>+	 * in an ACPI _CRS object which can be parsed by platform_get_irq() and</div><div class='add'>+	 * devm_platform_get_and_ioremap_resource()</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(hda-&gt;pdev, 0);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	hda-&gt;regs = devm_platform_get_and_ioremap_resource(hda-&gt;pdev, 0, &amp;res);</div><div class='add'>+	if (IS_ERR(hda-&gt;regs))</div><div class='add'>+		return PTR_ERR(hda-&gt;regs);</div><div class='add'>+</div><div class='add'>+	bus-&gt;remap_addr = hda-&gt;regs;</div><div class='add'>+	bus-&gt;addr = res-&gt;start;</div><div class='add'>+</div><div class='add'>+	err = devm_request_irq(dev, irq, azx_interrupt,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, azx);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "unable to request IRQ %d, disabling device\n",</div><div class='add'>+			irq);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	bus-&gt;irq = irq;</div><div class='add'>+	bus-&gt;dma_stop_delay = 100;</div><div class='add'>+	card-&gt;sync_irq = bus-&gt;irq;</div><div class='add'>+</div><div class='add'>+	gcap = azx_readw(azx, GCAP);</div><div class='add'>+	dev_dbg(dev, "chipset global capabilities = 0x%x\n", gcap);</div><div class='add'>+</div><div class='add'>+	azx-&gt;align_buffer_size = 1;</div><div class='add'>+</div><div class='add'>+	azx-&gt;capture_streams = (gcap &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+	azx-&gt;playback_streams = (gcap &gt;&gt; 12) &amp; 0x0f;</div><div class='add'>+</div><div class='add'>+	azx-&gt;capture_index_offset = 0;</div><div class='add'>+	azx-&gt;playback_index_offset = azx-&gt;capture_streams;</div><div class='add'>+	azx-&gt;num_streams = azx-&gt;playback_streams + azx-&gt;capture_streams;</div><div class='add'>+</div><div class='add'>+	err = azx_init_streams(azx);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to initialize streams: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = azx_alloc_stream_pages(azx);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to allocate stream pages: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	azx_init_chip(azx, 1);</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;codec_mask) {</div><div class='add'>+		dev_err(dev, "no codecs found!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "hda-acpi");</div><div class='add'>+</div><div class='add'>+	sname = hda-&gt;data-&gt;short_name ? hda-&gt;data-&gt;short_name : KBUILD_MODNAME;</div><div class='add'>+</div><div class='add'>+	if (strlen(sname) &gt; sizeof(card-&gt;shortname))</div><div class='add'>+		dev_info(dev, "truncating shortname for card %s\n", sname);</div><div class='add'>+	strscpy(card-&gt;shortname, sname);</div><div class='add'>+</div><div class='add'>+	lname = hda-&gt;data-&gt;long_name ? hda-&gt;data-&gt;long_name : sname;</div><div class='add'>+</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "%s at 0x%lx irq %i", lname, bus-&gt;addr, bus-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_acpi_probe_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_acpi *hda = container_of(work, struct hda_acpi, probe_work);</div><div class='add'>+	struct azx *chip = &amp;hda-&gt;azx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hda_acpi_init(hda);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = azx_probe_codecs(chip, 8);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = azx_codec_configure(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(chip-&gt;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chip-&gt;running = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_create(struct hda_acpi *hda)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_disconnect = hda_acpi_dev_disconnect,</div><div class='add'>+		.dev_free = hda_acpi_dev_free,</div><div class='add'>+	};</div><div class='add'>+	static const struct hda_controller_ops null_ops;</div><div class='add'>+	struct azx *azx = &amp;hda-&gt;azx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;azx-&gt;open_mutex);</div><div class='add'>+	azx-&gt;card = hda-&gt;card;</div><div class='add'>+	INIT_LIST_HEAD(&amp;azx-&gt;pcm_list);</div><div class='add'>+</div><div class='add'>+	azx-&gt;ops = &amp;null_ops;</div><div class='add'>+	azx-&gt;driver_caps = hda-&gt;data-&gt;flags;</div><div class='add'>+	azx-&gt;driver_type = hda-&gt;data-&gt;flags &amp; 0xff;</div><div class='add'>+	azx-&gt;codec_probe_mask = -1;</div><div class='add'>+</div><div class='add'>+	err = azx_bus_init(azx, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(hda-&gt;card, SNDRV_DEV_LOWLEVEL, &amp;hda-&gt;azx, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;hda-&gt;pdev-&gt;dev, "Error creating device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hda_acpi *hda;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hda = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*hda), GFP_KERNEL);</div><div class='add'>+	if (!hda)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hda-&gt;pdev = pdev;</div><div class='add'>+	hda-&gt;data = acpi_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Fall back to defaults if the table didn't have a *struct hda_data */</div><div class='add'>+	if (!hda-&gt;data)</div><div class='add'>+		hda-&gt;data = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*hda-&gt;data),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+	if (!hda-&gt;data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='add'>+			   THIS_MODULE, 0, &amp;hda-&gt;card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error creating card!\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;hda-&gt;probe_work, hda_acpi_probe_work);</div><div class='add'>+</div><div class='add'>+	err = hda_acpi_create(hda);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+	hda-&gt;card-&gt;private_data = &amp;hda-&gt;azx;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, hda-&gt;card);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;hda-&gt;probe_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	snd_card_free(hda-&gt;card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_acpi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	snd_card_free(dev_get_drvdata(&amp;pdev-&gt;dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_acpi_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!card)</div><div class='add'>+		return;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	if (chip &amp;&amp; chip-&gt;running)</div><div class='add'>+		azx_stop_chip(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = pm_runtime_force_suspend(dev);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_acpi_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = pm_runtime_force_resume(dev);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops hda_acpi_pm = {</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_data nvidia_hda_data = {</div><div class='add'>+	.short_name = "NVIDIA",</div><div class='add'>+	.long_name = "NVIDIA HDA Controller",</div><div class='add'>+	.flags = AZX_DCAPS_CORBRP_SELF_CLEAR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id hda_acpi_match[] = {</div><div class='add'>+	{ .id = "NVDA2014", .driver_data = (uintptr_t) &amp;nvidia_hda_data },</div><div class='add'>+	{ .id = "NVDA2015", .driver_data = (uintptr_t) &amp;nvidia_hda_data },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, hda_acpi_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver hda_acpi_platform_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.pm = &amp;hda_acpi_pm,</div><div class='add'>+		.acpi_match_table = hda_acpi_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = hda_acpi_probe,</div><div class='add'>+	.remove = hda_acpi_remove,</div><div class='add'>+	.shutdown = hda_acpi_shutdown,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(hda_acpi_platform_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Driver for ACPI-based HDA Controllers");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/hda/controllers/intel.c b/sound/hda/controllers/intel.c<br/>new file mode 100644<br/>index 000000000000..1e8e3d61291a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/intel.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/intel.c</a></div><div class='hunk'>@@ -0,0 +1,2834 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ *  hda_intel.c - Implementation of primary alsa driver code base</div><div class='add'>+ *                for Intel HD Audio.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright(c) 2004 Intel Corporation</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ *                     PeiSen Hou &lt;pshou@realtek.com.tw&gt;</div><div class='add'>+ *</div><div class='add'>+ *  CONTACTS:</div><div class='add'>+ *</div><div class='add'>+ *  Matt Jared		matt.jared@intel.com</div><div class='add'>+ *  Andy Kopp		andy.kopp@intel.com</div><div class='add'>+ *  Dan Kogan		dan.d.kogan@intel.com</div><div class='add'>+ *</div><div class='add'>+ *  CHANGES:</div><div class='add'>+ *</div><div class='add'>+ *  2004.12.01	Major rewrite by tiwai, merged the work of pshou</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+/* for snoop control */</div><div class='add'>+#include &lt;asm/set_memory.h&gt;</div><div class='add'>+#include &lt;asm/cpufeature.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_i915.h&gt;</div><div class='add'>+#include &lt;sound/intel-dsp-config.h&gt;</div><div class='add'>+#include &lt;linux/vgaarb.h&gt;</div><div class='add'>+#include &lt;linux/vga_switcheroo.h&gt;</div><div class='add'>+#include &lt;linux/apple-gmux.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "intel.h"</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "intel_trace.h"</div><div class='add'>+</div><div class='add'>+/* position fix mode */</div><div class='add'>+enum {</div><div class='add'>+	POS_FIX_AUTO,</div><div class='add'>+	POS_FIX_LPIB,</div><div class='add'>+	POS_FIX_POSBUF,</div><div class='add'>+	POS_FIX_VIACOMBO,</div><div class='add'>+	POS_FIX_COMBO,</div><div class='add'>+	POS_FIX_SKL,</div><div class='add'>+	POS_FIX_FIFO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Defines for ATI HD Audio support in SB450 south bridge */</div><div class='add'>+#define ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR   0x42</div><div class='add'>+#define ATI_SB450_HDAUDIO_ENABLE_SNOOP      0x02</div><div class='add'>+</div><div class='add'>+/* Defines for Nvidia HDA support */</div><div class='add'>+#define NVIDIA_HDA_TRANSREG_ADDR      0x4e</div><div class='add'>+#define NVIDIA_HDA_ENABLE_COHBITS     0x0f</div><div class='add'>+#define NVIDIA_HDA_ISTRM_COH          0x4d</div><div class='add'>+#define NVIDIA_HDA_OSTRM_COH          0x4c</div><div class='add'>+#define NVIDIA_HDA_ENABLE_COHBIT      0x01</div><div class='add'>+</div><div class='add'>+/* Defines for Intel SCH HDA snoop control */</div><div class='add'>+#define INTEL_HDA_CGCTL	 0x48</div><div class='add'>+#define INTEL_HDA_CGCTL_MISCBDCGE        (0x1 &lt;&lt; 6)</div><div class='add'>+#define INTEL_SCH_HDA_DEVC      0x78</div><div class='add'>+#define INTEL_SCH_HDA_DEVC_NOSNOOP       (0x1&lt;&lt;11)</div><div class='add'>+</div><div class='add'>+/* max number of SDs */</div><div class='add'>+/* ICH, ATI and VIA have 4 playback and 4 capture */</div><div class='add'>+#define ICH6_NUM_CAPTURE	4</div><div class='add'>+#define ICH6_NUM_PLAYBACK	4</div><div class='add'>+</div><div class='add'>+/* ULI has 6 playback and 5 capture */</div><div class='add'>+#define ULI_NUM_CAPTURE		5</div><div class='add'>+#define ULI_NUM_PLAYBACK	6</div><div class='add'>+</div><div class='add'>+/* ATI HDMI may have up to 8 playbacks and 0 capture */</div><div class='add'>+#define ATIHDMI_NUM_CAPTURE	0</div><div class='add'>+#define ATIHDMI_NUM_PLAYBACK	8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='add'>+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static char *model[SNDRV_CARDS];</div><div class='add'>+static int position_fix[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};</div><div class='add'>+static int bdl_pos_adj[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};</div><div class='add'>+static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};</div><div class='add'>+static int probe_only[SNDRV_CARDS];</div><div class='add'>+static int jackpoll_ms[SNDRV_CARDS];</div><div class='add'>+static int single_cmd = -1;</div><div class='add'>+static int enable_msi = -1;</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+static char *patch[SNDRV_CARDS];</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+static bool beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =</div><div class='add'>+					CONFIG_SND_HDA_INPUT_BEEP_MODE};</div><div class='add'>+#endif</div><div class='add'>+static bool dmic_detect = 1;</div><div class='add'>+static bool ctl_dev_id = IS_ENABLED(CONFIG_SND_HDA_CTL_DEV_ID) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");</div><div class='add'>+module_param_array(model, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(model, "Use the given board model.");</div><div class='add'>+module_param_array(position_fix, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(position_fix, "DMA pointer read method."</div><div class='add'>+		 "(-1 = system default, 0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO, 4 = COMBO, 5 = SKL+, 6 = FIFO).");</div><div class='add'>+module_param_array(bdl_pos_adj, int, NULL, 0644);</div><div class='add'>+MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset.");</div><div class='add'>+module_param_array(probe_mask, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");</div><div class='add'>+module_param_array(probe_only, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(probe_only, "Only probing and no codec initialization.");</div><div class='add'>+module_param_array(jackpoll_ms, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(jackpoll_ms, "Ms between polling for jack events (default = 0, using unsol events only)");</div><div class='add'>+module_param(single_cmd, bint, 0444);</div><div class='add'>+MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "</div><div class='add'>+		 "(for debugging only).");</div><div class='add'>+module_param(enable_msi, bint, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+module_param_array(patch, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(patch, "Patch file for Intel HD audio interface.");</div><div class='add'>+#endif</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+module_param_array(beep_mode, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "</div><div class='add'>+			    "(0=off, 1=on) (default=1).");</div><div class='add'>+#endif</div><div class='add'>+module_param(dmic_detect, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(dmic_detect, "Allow DSP driver selection (bypass this driver) "</div><div class='add'>+			     "(0=off, 1=on) (default=1); "</div><div class='add'>+		 "deprecated, use snd-intel-dspcfg.dsp_driver option instead");</div><div class='add'>+module_param(ctl_dev_id, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(ctl_dev_id, "Use control device identifier (based on codec address).");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int param_set_xint(const char *val, const struct kernel_param *kp);</div><div class='add'>+static const struct kernel_param_ops param_ops_xint = {</div><div class='add'>+	.set = param_set_xint,</div><div class='add'>+	.get = param_get_int,</div><div class='add'>+};</div><div class='add'>+#define param_check_xint param_check_int</div><div class='add'>+</div><div class='add'>+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;</div><div class='add'>+module_param(power_save, xint, 0644);</div><div class='add'>+MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "</div><div class='add'>+		 "(in second, 0 = disable).");</div><div class='add'>+</div><div class='add'>+static int pm_blacklist = -1;</div><div class='add'>+module_param(pm_blacklist, bint, 0644);</div><div class='add'>+MODULE_PARM_DESC(pm_blacklist, "Enable power-management denylist");</div><div class='add'>+</div><div class='add'>+/* reset the HD-audio controller in power save mode.</div><div class='add'>+ * this may give more power-saving, but will take longer time to</div><div class='add'>+ * wake up.</div><div class='add'>+ */</div><div class='add'>+static bool power_save_controller = 1;</div><div class='add'>+module_param(power_save_controller, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");</div><div class='add'>+#else /* CONFIG_PM */</div><div class='add'>+#define power_save	0</div><div class='add'>+#define pm_blacklist	0</div><div class='add'>+#define power_save_controller	false</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static int align_buffer_size = -1;</div><div class='add'>+module_param(align_buffer_size, bint, 0644);</div><div class='add'>+MODULE_PARM_DESC(align_buffer_size,</div><div class='add'>+		"Force buffer and period sizes to be multiple of 128 bytes.");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+static int hda_snoop = -1;</div><div class='add'>+module_param_named(snoop, hda_snoop, bint, 0444);</div><div class='add'>+MODULE_PARM_DESC(snoop, "Enable/disable snooping");</div><div class='add'>+#else</div><div class='add'>+#define hda_snoop		true</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Intel HDA driver");</div><div class='add'>+</div><div class='add'>+#if defined(CONFIG_PM) &amp;&amp; defined(CONFIG_VGA_SWITCHEROO)</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)</div><div class='add'>+#define SUPPORT_VGA_SWITCHEROO</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* driver types */</div><div class='add'>+enum {</div><div class='add'>+	AZX_DRIVER_ICH,</div><div class='add'>+	AZX_DRIVER_PCH,</div><div class='add'>+	AZX_DRIVER_SCH,</div><div class='add'>+	AZX_DRIVER_SKL,</div><div class='add'>+	AZX_DRIVER_HDMI,</div><div class='add'>+	AZX_DRIVER_ATI,</div><div class='add'>+	AZX_DRIVER_ATIHDMI,</div><div class='add'>+	AZX_DRIVER_ATIHDMI_NS,</div><div class='add'>+	AZX_DRIVER_GFHDMI,</div><div class='add'>+	AZX_DRIVER_VIA,</div><div class='add'>+	AZX_DRIVER_SIS,</div><div class='add'>+	AZX_DRIVER_ULI,</div><div class='add'>+	AZX_DRIVER_NVIDIA,</div><div class='add'>+	AZX_DRIVER_TERA,</div><div class='add'>+	AZX_DRIVER_CTX,</div><div class='add'>+	AZX_DRIVER_CTHDA,</div><div class='add'>+	AZX_DRIVER_CMEDIA,</div><div class='add'>+	AZX_DRIVER_ZHAOXIN,</div><div class='add'>+	AZX_DRIVER_ZHAOXINHDMI,</div><div class='add'>+	AZX_DRIVER_LOONGSON,</div><div class='add'>+	AZX_DRIVER_GENERIC,</div><div class='add'>+	AZX_NUM_DRIVERS, /* keep this as last entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define azx_get_snoop_type(chip) \</div><div class='add'>+	(((chip)-&gt;driver_caps &amp; AZX_DCAPS_SNOOP_MASK) &gt;&gt; 10)</div><div class='add'>+#define AZX_DCAPS_SNOOP_TYPE(type) ((AZX_SNOOP_TYPE_ ## type) &lt;&lt; 10)</div><div class='add'>+</div><div class='add'>+/* quirks for old Intel chipsets */</div><div class='add'>+#define AZX_DCAPS_INTEL_ICH \</div><div class='add'>+	(AZX_DCAPS_OLD_SSYNC | AZX_DCAPS_NO_ALIGN_BUFSIZE)</div><div class='add'>+</div><div class='add'>+/* quirks for Intel PCH */</div><div class='add'>+#define AZX_DCAPS_INTEL_PCH_BASE \</div><div class='add'>+	(AZX_DCAPS_NO_ALIGN_BUFSIZE | AZX_DCAPS_COUNT_LPIB_DELAY |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(SCH))</div><div class='add'>+</div><div class='add'>+/* PCH up to IVB; no runtime PM; bind with i915 gfx */</div><div class='add'>+#define AZX_DCAPS_INTEL_PCH_NOPM \</div><div class='add'>+	(AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_I915_COMPONENT)</div><div class='add'>+</div><div class='add'>+/* PCH for HSW/BDW; with runtime PM */</div><div class='add'>+/* no i915 binding for this as HSW/BDW has another controller for HDMI */</div><div class='add'>+#define AZX_DCAPS_INTEL_PCH \</div><div class='add'>+	(AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME)</div><div class='add'>+</div><div class='add'>+/* HSW HDMI */</div><div class='add'>+#define AZX_DCAPS_INTEL_HASWELL \</div><div class='add'>+	(/*AZX_DCAPS_ALIGN_BUFSIZE |*/ AZX_DCAPS_COUNT_LPIB_DELAY |\</div><div class='add'>+	 AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_COMPONENT |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(SCH))</div><div class='add'>+</div><div class='add'>+/* Broadwell HDMI can't use position buffer reliably, force to use LPIB */</div><div class='add'>+#define AZX_DCAPS_INTEL_BROADWELL \</div><div class='add'>+	(/*AZX_DCAPS_ALIGN_BUFSIZE |*/ AZX_DCAPS_POSFIX_LPIB |\</div><div class='add'>+	 AZX_DCAPS_PM_RUNTIME | AZX_DCAPS_I915_COMPONENT |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(SCH))</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_INTEL_BAYTRAIL \</div><div class='add'>+	(AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_I915_COMPONENT)</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_INTEL_BRASWELL \</div><div class='add'>+	(AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\</div><div class='add'>+	 AZX_DCAPS_I915_COMPONENT)</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_INTEL_SKYLAKE \</div><div class='add'>+	(AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\</div><div class='add'>+	 AZX_DCAPS_SEPARATE_STREAM_TAG | AZX_DCAPS_I915_COMPONENT)</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_INTEL_BROXTON		AZX_DCAPS_INTEL_SKYLAKE</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_INTEL_LNL \</div><div class='add'>+	(AZX_DCAPS_INTEL_SKYLAKE | AZX_DCAPS_PIO_COMMANDS)</div><div class='add'>+</div><div class='add'>+/* quirks for ATI SB / AMD Hudson */</div><div class='add'>+#define AZX_DCAPS_PRESET_ATI_SB \</div><div class='add'>+	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_POSFIX_LPIB |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(ATI))</div><div class='add'>+</div><div class='add'>+/* quirks for ATI/AMD HDMI */</div><div class='add'>+#define AZX_DCAPS_PRESET_ATI_HDMI \</div><div class='add'>+	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_POSFIX_LPIB|\</div><div class='add'>+	 AZX_DCAPS_NO_MSI64)</div><div class='add'>+</div><div class='add'>+/* quirks for ATI HDMI with snoop off */</div><div class='add'>+#define AZX_DCAPS_PRESET_ATI_HDMI_NS \</div><div class='add'>+	(AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_SNOOP_OFF)</div><div class='add'>+</div><div class='add'>+/* quirks for AMD SB */</div><div class='add'>+#define AZX_DCAPS_PRESET_AMD_SB \</div><div class='add'>+	(AZX_DCAPS_NO_TCSEL | AZX_DCAPS_AMD_WORKAROUND |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME |\</div><div class='add'>+	 AZX_DCAPS_RETRY_PROBE)</div><div class='add'>+</div><div class='add'>+/* quirks for Nvidia */</div><div class='add'>+#define AZX_DCAPS_PRESET_NVIDIA \</div><div class='add'>+	(AZX_DCAPS_NO_MSI | AZX_DCAPS_CORBRP_SELF_CLEAR |\</div><div class='add'>+	 AZX_DCAPS_SNOOP_TYPE(NVIDIA))</div><div class='add'>+</div><div class='add'>+#define AZX_DCAPS_PRESET_CTHDA \</div><div class='add'>+	(AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB |\</div><div class='add'>+	 AZX_DCAPS_NO_64BIT |\</div><div class='add'>+	 AZX_DCAPS_4K_BDLE_BOUNDARY | AZX_DCAPS_SNOOP_OFF)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * vga_switcheroo support</div><div class='add'>+ */</div><div class='add'>+#ifdef SUPPORT_VGA_SWITCHEROO</div><div class='add'>+#define use_vga_switcheroo(chip)	((chip)-&gt;use_vga_switcheroo)</div><div class='add'>+#define needs_eld_notify_link(chip)	((chip)-&gt;bus.keep_power)</div><div class='add'>+#else</div><div class='add'>+#define use_vga_switcheroo(chip)	0</div><div class='add'>+#define needs_eld_notify_link(chip)	false</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const char * const driver_short_names[] = {</div><div class='add'>+	[AZX_DRIVER_ICH] = "HDA Intel",</div><div class='add'>+	[AZX_DRIVER_PCH] = "HDA Intel PCH",</div><div class='add'>+	[AZX_DRIVER_SCH] = "HDA Intel MID",</div><div class='add'>+	[AZX_DRIVER_SKL] = "HDA Intel PCH", /* kept old name for compatibility */</div><div class='add'>+	[AZX_DRIVER_HDMI] = "HDA Intel HDMI",</div><div class='add'>+	[AZX_DRIVER_ATI] = "HDA ATI SB",</div><div class='add'>+	[AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",</div><div class='add'>+	[AZX_DRIVER_ATIHDMI_NS] = "HDA ATI HDMI",</div><div class='add'>+	[AZX_DRIVER_GFHDMI] = "HDA GF HDMI",</div><div class='add'>+	[AZX_DRIVER_VIA] = "HDA VIA VT82xx",</div><div class='add'>+	[AZX_DRIVER_SIS] = "HDA SIS966",</div><div class='add'>+	[AZX_DRIVER_ULI] = "HDA ULI M5461",</div><div class='add'>+	[AZX_DRIVER_NVIDIA] = "HDA NVidia",</div><div class='add'>+	[AZX_DRIVER_TERA] = "HDA Teradici", </div><div class='add'>+	[AZX_DRIVER_CTX] = "HDA Creative", </div><div class='add'>+	[AZX_DRIVER_CTHDA] = "HDA Creative",</div><div class='add'>+	[AZX_DRIVER_CMEDIA] = "HDA C-Media",</div><div class='add'>+	[AZX_DRIVER_ZHAOXIN] = "HDA Zhaoxin",</div><div class='add'>+	[AZX_DRIVER_ZHAOXINHDMI] = "HDA Zhaoxin HDMI",</div><div class='add'>+	[AZX_DRIVER_LOONGSON] = "HDA Loongson",</div><div class='add'>+	[AZX_DRIVER_GENERIC] = "HD-Audio Generic",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int azx_acquire_irq(struct azx *chip, int do_disconnect);</div><div class='add'>+static void set_default_power_save(struct azx *chip);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * initialize the PCI registers</div><div class='add'>+ */</div><div class='add'>+/* update bits in a PCI register byte */</div><div class='add'>+static void update_pci_byte(struct pci_dev *pci, unsigned int reg,</div><div class='add'>+			    unsigned char mask, unsigned char val)</div><div class='add'>+{</div><div class='add'>+	unsigned char data;</div><div class='add'>+</div><div class='add'>+	pci_read_config_byte(pci, reg, &amp;data);</div><div class='add'>+	data &amp;= ~mask;</div><div class='add'>+	data |= (val &amp; mask);</div><div class='add'>+	pci_write_config_byte(pci, reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_init_pci(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	int snoop_type = azx_get_snoop_type(chip);</div><div class='add'>+</div><div class='add'>+	/* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)</div><div class='add'>+	 * TCSEL == Traffic Class Select Register, which sets PCI express QOS</div><div class='add'>+	 * Ensuring these bits are 0 clears playback static on some HD Audio</div><div class='add'>+	 * codecs.</div><div class='add'>+	 * The PCI register TCSEL is defined in the Intel manuals.</div><div class='add'>+	 */</div><div class='add'>+	if (!(chip-&gt;driver_caps &amp; AZX_DCAPS_NO_TCSEL)) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Clearing TCSEL\n");</div><div class='add'>+		update_pci_byte(chip-&gt;pci, AZX_PCIREG_TCSEL, 0x07, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For ATI SB450/600/700/800/900 and AMD Hudson azalia HD audio,</div><div class='add'>+	 * we need to enable snoop.</div><div class='add'>+	 */</div><div class='add'>+	if (snoop_type == AZX_SNOOP_TYPE_ATI) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Setting ATI snoop: %d\n",</div><div class='add'>+			azx_snoop(chip));</div><div class='add'>+		update_pci_byte(chip-&gt;pci,</div><div class='add'>+				ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 0x07,</div><div class='add'>+				azx_snoop(chip) ? ATI_SB450_HDAUDIO_ENABLE_SNOOP : 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For NVIDIA HDA, enable snoop */</div><div class='add'>+	if (snoop_type == AZX_SNOOP_TYPE_NVIDIA) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Setting Nvidia snoop: %d\n",</div><div class='add'>+			azx_snoop(chip));</div><div class='add'>+		update_pci_byte(chip-&gt;pci,</div><div class='add'>+				NVIDIA_HDA_TRANSREG_ADDR,</div><div class='add'>+				0x0f, NVIDIA_HDA_ENABLE_COHBITS);</div><div class='add'>+		update_pci_byte(chip-&gt;pci,</div><div class='add'>+				NVIDIA_HDA_ISTRM_COH,</div><div class='add'>+				0x01, NVIDIA_HDA_ENABLE_COHBIT);</div><div class='add'>+		update_pci_byte(chip-&gt;pci,</div><div class='add'>+				NVIDIA_HDA_OSTRM_COH,</div><div class='add'>+				0x01, NVIDIA_HDA_ENABLE_COHBIT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable SCH/PCH snoop if needed */</div><div class='add'>+	if (snoop_type == AZX_SNOOP_TYPE_SCH) {</div><div class='add'>+		unsigned short snoop;</div><div class='add'>+		pci_read_config_word(chip-&gt;pci, INTEL_SCH_HDA_DEVC, &amp;snoop);</div><div class='add'>+		if ((!azx_snoop(chip) &amp;&amp; !(snoop &amp; INTEL_SCH_HDA_DEVC_NOSNOOP)) ||</div><div class='add'>+		    (azx_snoop(chip) &amp;&amp; (snoop &amp; INTEL_SCH_HDA_DEVC_NOSNOOP))) {</div><div class='add'>+			snoop &amp;= ~INTEL_SCH_HDA_DEVC_NOSNOOP;</div><div class='add'>+			if (!azx_snoop(chip))</div><div class='add'>+				snoop |= INTEL_SCH_HDA_DEVC_NOSNOOP;</div><div class='add'>+			pci_write_config_word(chip-&gt;pci, INTEL_SCH_HDA_DEVC, snoop);</div><div class='add'>+			pci_read_config_word(chip-&gt;pci,</div><div class='add'>+				INTEL_SCH_HDA_DEVC, &amp;snoop);</div><div class='add'>+		}</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "SCH snoop: %s\n",</div><div class='add'>+			(snoop &amp; INTEL_SCH_HDA_DEVC_NOSNOOP) ?</div><div class='add'>+			"Disabled" : "Enabled");</div><div class='add'>+        }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * In BXT-P A0, HD-Audio DMA requests is later than expected,</div><div class='add'>+ * and makes an audio stream sensitive to system latencies when</div><div class='add'>+ * 24/32 bits are playing.</div><div class='add'>+ * Adjusting threshold of DMA fifo to force the DMA request</div><div class='add'>+ * sooner to improve latency tolerance at the expense of power.</div><div class='add'>+ */</div><div class='add'>+static void bxt_reduce_dma_latency(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = azx_readl(chip, VS_EM4L);</div><div class='add'>+	val &amp;= (0x3 &lt;&lt; 20);</div><div class='add'>+	azx_writel(chip, VS_EM4L, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ML_LCAP bits:</div><div class='add'>+ *  bit 0: 6 MHz Supported</div><div class='add'>+ *  bit 1: 12 MHz Supported</div><div class='add'>+ *  bit 2: 24 MHz Supported</div><div class='add'>+ *  bit 3: 48 MHz Supported</div><div class='add'>+ *  bit 4: 96 MHz Supported</div><div class='add'>+ *  bit 5: 192 MHz Supported</div><div class='add'>+ */</div><div class='add'>+static int intel_get_lctl_scf(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	static const int preferred_bits[] = { 2, 3, 1, 4, 5 };</div><div class='add'>+	u32 val, t;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = readl(bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCAP);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(preferred_bits); i++) {</div><div class='add'>+		t = preferred_bits[i];</div><div class='add'>+		if (val &amp; (1 &lt;&lt; t))</div><div class='add'>+			return t;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "set audio clock frequency to 6MHz");</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int intel_ml_lctl_set_power(struct azx *chip, int state)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+	int timeout;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Changes to LCTL.SCF are only needed for the first multi-link dealing</div><div class='add'>+	 * with external codecs</div><div class='add'>+	 */</div><div class='add'>+	val = readl(bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);</div><div class='add'>+	val &amp;= ~AZX_ML_LCTL_SPA;</div><div class='add'>+	val |= state &lt;&lt; AZX_ML_LCTL_SPA_SHIFT;</div><div class='add'>+	writel(val, bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);</div><div class='add'>+	/* wait for CPA */</div><div class='add'>+	timeout = 50;</div><div class='add'>+	while (timeout) {</div><div class='add'>+		if (((readl(bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL)) &amp;</div><div class='add'>+		    AZX_ML_LCTL_CPA) == (state &lt;&lt; AZX_ML_LCTL_CPA_SHIFT))</div><div class='add'>+			return 0;</div><div class='add'>+		timeout--;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void intel_init_lctl(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* 0. check lctl register value is correct or not */</div><div class='add'>+	val = readl(bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);</div><div class='add'>+	/* only perform additional configurations if the SCF is initially based on 6MHz */</div><div class='add'>+	if ((val &amp; AZX_ML_LCTL_SCF) != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Before operating on SPA, CPA must match SPA.</div><div class='add'>+	 * Any deviation may result in undefined behavior.</div><div class='add'>+	 */</div><div class='add'>+	if (((val &amp; AZX_ML_LCTL_SPA) &gt;&gt; AZX_ML_LCTL_SPA_SHIFT) !=</div><div class='add'>+		((val &amp; AZX_ML_LCTL_CPA) &gt;&gt; AZX_ML_LCTL_CPA_SHIFT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* 1. turn link down: set SPA to 0 and wait CPA to 0 */</div><div class='add'>+	ret = intel_ml_lctl_set_power(chip, 0);</div><div class='add'>+	udelay(100);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto set_spa;</div><div class='add'>+</div><div class='add'>+	/* 2. update SCF to select an audio clock different from 6MHz */</div><div class='add'>+	val &amp;= ~AZX_ML_LCTL_SCF;</div><div class='add'>+	val |= intel_get_lctl_scf(chip);</div><div class='add'>+	writel(val, bus-&gt;mlcap + AZX_ML_BASE + AZX_REG_ML_LCTL);</div><div class='add'>+</div><div class='add'>+set_spa:</div><div class='add'>+	/* 4. turn link up: set SPA to 1 and wait CPA to 1 */</div><div class='add'>+	intel_ml_lctl_set_power(chip, 1);</div><div class='add'>+	udelay(100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_intel_init_chip(struct azx *chip, bool full_reset)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct pci_dev *pci = chip-&gt;pci;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	snd_hdac_set_codec_wakeup(bus, true);</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL) {</div><div class='add'>+		pci_read_config_dword(pci, INTEL_HDA_CGCTL, &amp;val);</div><div class='add'>+		val = val &amp; ~INTEL_HDA_CGCTL_MISCBDCGE;</div><div class='add'>+		pci_write_config_dword(pci, INTEL_HDA_CGCTL, val);</div><div class='add'>+	}</div><div class='add'>+	azx_init_chip(chip, full_reset);</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL) {</div><div class='add'>+		pci_read_config_dword(pci, INTEL_HDA_CGCTL, &amp;val);</div><div class='add'>+		val = val | INTEL_HDA_CGCTL_MISCBDCGE;</div><div class='add'>+		pci_write_config_dword(pci, INTEL_HDA_CGCTL, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hdac_set_codec_wakeup(bus, false);</div><div class='add'>+</div><div class='add'>+	/* reduce dma latency to avoid noise */</div><div class='add'>+	if (HDA_CONTROLLER_IS_APL(pci))</div><div class='add'>+		bxt_reduce_dma_latency(chip);</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;mlcap != NULL)</div><div class='add'>+		intel_init_lctl(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* calculate runtime delay from LPIB */</div><div class='add'>+static int azx_get_delay_from_lpib(struct azx *chip, struct azx_dev *azx_dev,</div><div class='add'>+				   unsigned int pos)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;core.substream;</div><div class='add'>+	int stream = substream-&gt;stream;</div><div class='add'>+	unsigned int lpib_pos = azx_get_pos_lpib(chip, azx_dev);</div><div class='add'>+	int delay;</div><div class='add'>+</div><div class='add'>+	if (stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='add'>+		delay = pos - lpib_pos;</div><div class='add'>+	else</div><div class='add'>+		delay = lpib_pos - pos;</div><div class='add'>+	if (delay &lt; 0) {</div><div class='add'>+		if (delay &gt;= azx_dev-&gt;core.delay_negative_threshold)</div><div class='add'>+			delay = 0;</div><div class='add'>+		else</div><div class='add'>+			delay += azx_dev-&gt;core.bufsize;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (delay &gt;= azx_dev-&gt;core.period_bytes) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Unstable LPIB (%d &gt;= %d); disabling LPIB delay counting\n",</div><div class='add'>+			 delay, azx_dev-&gt;core.period_bytes);</div><div class='add'>+		delay = 0;</div><div class='add'>+		chip-&gt;driver_caps &amp;= ~AZX_DCAPS_COUNT_LPIB_DELAY;</div><div class='add'>+		chip-&gt;get_delay[stream] = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev);</div><div class='add'>+</div><div class='add'>+/* called from IRQ */</div><div class='add'>+static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	int ok;</div><div class='add'>+</div><div class='add'>+	ok = azx_position_ok(chip, azx_dev);</div><div class='add'>+	if (ok == 1) {</div><div class='add'>+		azx_dev-&gt;irq_pending = 0;</div><div class='add'>+		return ok;</div><div class='add'>+	} else if (ok == 0) {</div><div class='add'>+		/* bogus IRQ, process it later */</div><div class='add'>+		azx_dev-&gt;irq_pending = 1;</div><div class='add'>+		schedule_work(&amp;hda-&gt;irq_pending_work);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define display_power(chip, enable) \</div><div class='add'>+	snd_hdac_display_power(azx_bus(chip), HDA_CODEC_IDX_CONTROLLER, enable)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check whether the current DMA position is acceptable for updating</div><div class='add'>+ * periods.  Returns non-zero if it's OK.</div><div class='add'>+ *</div><div class='add'>+ * Many HD-audio controllers appear pretty inaccurate about</div><div class='add'>+ * the update-IRQ timing.  The IRQ is issued before actually the</div><div class='add'>+ * data is processed.  So, we need to process it afterwords in a</div><div class='add'>+ * workqueue.</div><div class='add'>+ *</div><div class='add'>+ * Returns 1 if OK to proceed, 0 for delay handling, -1 for skipping update</div><div class='add'>+ */</div><div class='add'>+static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;core.substream;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int stream = substream-&gt;stream;</div><div class='add'>+	u32 wallclk;</div><div class='add'>+	unsigned int pos;</div><div class='add'>+	snd_pcm_uframes_t hwptr, target;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The value of the WALLCLK register is always 0</div><div class='add'>+	 * on the Loongson controller, so we return directly.</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_LOONGSON)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	wallclk = azx_readl(chip, WALLCLK) - azx_dev-&gt;core.start_wallclk;</div><div class='add'>+	if (wallclk &lt; (azx_dev-&gt;core.period_wallclk * 2) / 3)</div><div class='add'>+		return -1;	/* bogus (too early) interrupt */</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;get_position[stream])</div><div class='add'>+		pos = chip-&gt;get_position[stream](chip, azx_dev);</div><div class='add'>+	else { /* use the position buffer as default */</div><div class='add'>+		pos = azx_get_pos_posbuf(chip, azx_dev);</div><div class='add'>+		if (!pos || pos == (u32)-1) {</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "Invalid position buffer, using LPIB read method instead.\n");</div><div class='add'>+			chip-&gt;get_position[stream] = azx_get_pos_lpib;</div><div class='add'>+			if (chip-&gt;get_position[0] == azx_get_pos_lpib &amp;&amp;</div><div class='add'>+			    chip-&gt;get_position[1] == azx_get_pos_lpib)</div><div class='add'>+				azx_bus(chip)-&gt;use_posbuf = false;</div><div class='add'>+			pos = azx_get_pos_lpib(chip, azx_dev);</div><div class='add'>+			chip-&gt;get_delay[stream] = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			chip-&gt;get_position[stream] = azx_get_pos_posbuf;</div><div class='add'>+			if (chip-&gt;driver_caps &amp; AZX_DCAPS_COUNT_LPIB_DELAY)</div><div class='add'>+				chip-&gt;get_delay[stream] = azx_get_delay_from_lpib;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pos &gt;= azx_dev-&gt;core.bufsize)</div><div class='add'>+		pos = 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ONCE(!azx_dev-&gt;core.period_bytes,</div><div class='add'>+		      "hda-intel: zero azx_dev-&gt;period_bytes"))</div><div class='add'>+		return -1; /* this shouldn't happen! */</div><div class='add'>+	if (wallclk &lt; (azx_dev-&gt;core.period_wallclk * 5) / 4 &amp;&amp;</div><div class='add'>+	    pos % azx_dev-&gt;core.period_bytes &gt; azx_dev-&gt;core.period_bytes / 2)</div><div class='add'>+		/* NG - it's below the first next period boundary */</div><div class='add'>+		return chip-&gt;bdl_pos_adj ? 0 : -1;</div><div class='add'>+	azx_dev-&gt;core.start_wallclk += wallclk;</div><div class='add'>+</div><div class='add'>+	if (azx_dev-&gt;core.no_period_wakeup)</div><div class='add'>+		return 1; /* OK, no need to check period boundary */</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;hw_ptr_base != runtime-&gt;hw_ptr_interrupt)</div><div class='add'>+		return 1; /* OK, already in hwptr updating process */</div><div class='add'>+</div><div class='add'>+	/* check whether the period gets really elapsed */</div><div class='add'>+	pos = bytes_to_frames(runtime, pos);</div><div class='add'>+	hwptr = runtime-&gt;hw_ptr_base + pos;</div><div class='add'>+	if (hwptr &lt; runtime-&gt;status-&gt;hw_ptr)</div><div class='add'>+		hwptr += runtime-&gt;buffer_size;</div><div class='add'>+	target = runtime-&gt;hw_ptr_interrupt + runtime-&gt;period_size;</div><div class='add'>+	if (hwptr &lt; target) {</div><div class='add'>+		/* too early wakeup, process it later */</div><div class='add'>+		return chip-&gt;bdl_pos_adj ? 0 : -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1; /* OK, it's fine */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The work for pending PCM period updates.</div><div class='add'>+ */</div><div class='add'>+static void azx_irq_pending_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(work, struct hda_intel, irq_pending_work);</div><div class='add'>+	struct azx *chip = &amp;hda-&gt;chip;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+	int pending, ok;</div><div class='add'>+</div><div class='add'>+	if (!hda-&gt;irq_pending_warned) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "IRQ timing workaround is activated for card #%d. Suggest a bigger bdl_pos_adj.\n",</div><div class='add'>+			 chip-&gt;card-&gt;number);</div><div class='add'>+		hda-&gt;irq_pending_warned = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		pending = 0;</div><div class='add'>+		spin_lock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+		list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+			struct azx_dev *azx_dev = stream_to_azx_dev(s);</div><div class='add'>+			if (!azx_dev-&gt;irq_pending ||</div><div class='add'>+			    !s-&gt;substream ||</div><div class='add'>+			    !s-&gt;running)</div><div class='add'>+				continue;</div><div class='add'>+			ok = azx_position_ok(chip, azx_dev);</div><div class='add'>+			if (ok &gt; 0) {</div><div class='add'>+				azx_dev-&gt;irq_pending = 0;</div><div class='add'>+				spin_unlock(&amp;bus-&gt;reg_lock);</div><div class='add'>+				snd_pcm_period_elapsed(s-&gt;substream);</div><div class='add'>+				spin_lock(&amp;bus-&gt;reg_lock);</div><div class='add'>+			} else if (ok &lt; 0) {</div><div class='add'>+				pending = 0;	/* too early */</div><div class='add'>+			} else</div><div class='add'>+				pending++;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+		if (!pending)</div><div class='add'>+			return;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clear irq_pending flags and assure no on-going workq */</div><div class='add'>+static void azx_clear_irq_pending(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		struct azx_dev *azx_dev = stream_to_azx_dev(s);</div><div class='add'>+		azx_dev-&gt;irq_pending = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_acquire_irq(struct azx *chip, int do_disconnect)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;msi || pci_alloc_irq_vectors(chip-&gt;pci, 1, 1, PCI_IRQ_MSI) &lt; 0) {</div><div class='add'>+		ret = pci_alloc_irq_vectors(chip-&gt;pci, 1, 1, PCI_IRQ_INTX);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		chip-&gt;msi = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (request_irq(chip-&gt;pci-&gt;irq, azx_interrupt,</div><div class='add'>+			chip-&gt;msi ? 0 : IRQF_SHARED,</div><div class='add'>+			chip-&gt;card-&gt;irq_descr, chip)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"unable to grab IRQ %d, disabling device\n",</div><div class='add'>+			chip-&gt;pci-&gt;irq);</div><div class='add'>+		if (do_disconnect)</div><div class='add'>+			snd_card_disconnect(chip-&gt;card);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	bus-&gt;irq = chip-&gt;pci-&gt;irq;</div><div class='add'>+	chip-&gt;card-&gt;sync_irq = bus-&gt;irq;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get the current DMA position with correction on VIA chips */</div><div class='add'>+static unsigned int azx_via_get_position(struct azx *chip,</div><div class='add'>+					 struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int link_pos, mini_pos, bound_pos;</div><div class='add'>+	unsigned int mod_link_pos, mod_dma_pos, mod_mini_pos;</div><div class='add'>+	unsigned int fifo_size;</div><div class='add'>+</div><div class='add'>+	link_pos = snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));</div><div class='add'>+	if (azx_dev-&gt;core.substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+		/* Playback, no problem using link position */</div><div class='add'>+		return link_pos;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Capture */</div><div class='add'>+	/* For new chipset,</div><div class='add'>+	 * use mod to get the DMA position just like old chipset</div><div class='add'>+	 */</div><div class='add'>+	mod_dma_pos = le32_to_cpu(*azx_dev-&gt;core.posbuf);</div><div class='add'>+	mod_dma_pos %= azx_dev-&gt;core.period_bytes;</div><div class='add'>+</div><div class='add'>+	fifo_size = azx_stream(azx_dev)-&gt;fifo_size;</div><div class='add'>+</div><div class='add'>+	if (azx_dev-&gt;insufficient) {</div><div class='add'>+		/* Link position never gather than FIFO size */</div><div class='add'>+		if (link_pos &lt;= fifo_size)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		azx_dev-&gt;insufficient = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_pos &lt;= fifo_size)</div><div class='add'>+		mini_pos = azx_dev-&gt;core.bufsize + link_pos - fifo_size;</div><div class='add'>+	else</div><div class='add'>+		mini_pos = link_pos - fifo_size;</div><div class='add'>+</div><div class='add'>+	/* Find nearest previous boudary */</div><div class='add'>+	mod_mini_pos = mini_pos % azx_dev-&gt;core.period_bytes;</div><div class='add'>+	mod_link_pos = link_pos % azx_dev-&gt;core.period_bytes;</div><div class='add'>+	if (mod_link_pos &gt;= fifo_size)</div><div class='add'>+		bound_pos = link_pos - mod_link_pos;</div><div class='add'>+	else if (mod_dma_pos &gt;= mod_mini_pos)</div><div class='add'>+		bound_pos = mini_pos - mod_mini_pos;</div><div class='add'>+	else {</div><div class='add'>+		bound_pos = mini_pos - mod_mini_pos + azx_dev-&gt;core.period_bytes;</div><div class='add'>+		if (bound_pos &gt;= azx_dev-&gt;core.bufsize)</div><div class='add'>+			bound_pos = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate real DMA position we want */</div><div class='add'>+	return bound_pos + mod_dma_pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define AMD_FIFO_SIZE	32</div><div class='add'>+</div><div class='add'>+/* get the current DMA position with FIFO size correction */</div><div class='add'>+static unsigned int azx_get_pos_fifo(struct azx *chip, struct azx_dev *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;core.substream;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int pos, delay;</div><div class='add'>+</div><div class='add'>+	pos = snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));</div><div class='add'>+	if (!runtime)</div><div class='add'>+		return pos;</div><div class='add'>+</div><div class='add'>+	runtime-&gt;delay = AMD_FIFO_SIZE;</div><div class='add'>+	delay = frames_to_bytes(runtime, AMD_FIFO_SIZE);</div><div class='add'>+	if (azx_dev-&gt;insufficient) {</div><div class='add'>+		if (pos &lt; delay) {</div><div class='add'>+			delay = pos;</div><div class='add'>+			runtime-&gt;delay = bytes_to_frames(runtime, pos);</div><div class='add'>+		} else {</div><div class='add'>+			azx_dev-&gt;insufficient = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* correct the DMA position for capture stream */</div><div class='add'>+	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='add'>+		if (pos &lt; delay)</div><div class='add'>+			pos += azx_dev-&gt;core.bufsize;</div><div class='add'>+		pos -= delay;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_get_delay_from_fifo(struct azx *chip, struct azx_dev *azx_dev,</div><div class='add'>+				   unsigned int pos)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;core.substream;</div><div class='add'>+</div><div class='add'>+	/* just read back the calculated value in the above */</div><div class='add'>+	return substream-&gt;runtime-&gt;delay;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __azx_shutdown_chip(struct azx *chip, bool skip_link_reset)</div><div class='add'>+{</div><div class='add'>+	azx_stop_chip(chip);</div><div class='add'>+	if (!skip_link_reset)</div><div class='add'>+		azx_enter_link_reset(chip);</div><div class='add'>+	azx_clear_irq_pending(chip);</div><div class='add'>+	display_power(chip, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(card_list_lock);</div><div class='add'>+static LIST_HEAD(card_list);</div><div class='add'>+</div><div class='add'>+static void azx_shutdown_chip(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	__azx_shutdown_chip(chip, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_add_card_list(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;card_list_lock);</div><div class='add'>+	list_add(&amp;hda-&gt;list, &amp;card_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_del_card_list(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;card_list_lock);</div><div class='add'>+	list_del_init(&amp;hda-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* trigger power-save check at writing parameter */</div><div class='add'>+static int __maybe_unused param_set_xint(const char *val, const struct kernel_param *kp)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	int prev = power_save;</div><div class='add'>+	int ret = param_set_int(val, kp);</div><div class='add'>+</div><div class='add'>+	if (ret || prev == power_save)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (pm_blacklist &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;card_list_lock);</div><div class='add'>+	list_for_each_entry(hda, &amp;card_list, list) {</div><div class='add'>+		chip = &amp;hda-&gt;chip;</div><div class='add'>+		if (!hda-&gt;probe_continued || chip-&gt;disabled ||</div><div class='add'>+		    hda-&gt;runtime_pm_disabled)</div><div class='add'>+			continue;</div><div class='add'>+		snd_hda_set_power_save(&amp;chip-&gt;bus, power_save * 1000);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * power management</div><div class='add'>+ */</div><div class='add'>+static bool azx_is_pm_ready(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+</div><div class='add'>+	if (!card)</div><div class='add'>+		return false;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	if (chip-&gt;disabled || hda-&gt;init_failed || !chip-&gt;running)</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __azx_runtime_resume(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	display_power(chip, true);</div><div class='add'>+	if (hda-&gt;need_i915_power)</div><div class='add'>+		snd_hdac_i915_set_bclk(bus);</div><div class='add'>+</div><div class='add'>+	/* Read STATESTS before controller reset */</div><div class='add'>+	status = azx_readw(chip, STATESTS);</div><div class='add'>+</div><div class='add'>+	azx_init_pci(chip);</div><div class='add'>+	hda_intel_init_chip(chip, true);</div><div class='add'>+</div><div class='add'>+	/* Avoid codec resume if runtime resume is for system suspend */</div><div class='add'>+	if (!chip-&gt;pm_prepared) {</div><div class='add'>+		list_for_each_codec(codec, &amp;chip-&gt;bus) {</div><div class='add'>+			if (codec-&gt;relaxed_resume)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (codec-&gt;forced_resume || (status &amp; (1 &lt;&lt; codec-&gt;addr)))</div><div class='add'>+				pm_request_resume(hda_codec_dev(codec));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* power down again for link-controlled chips */</div><div class='add'>+	if (!hda-&gt;need_i915_power)</div><div class='add'>+		display_power(chip, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_prepare(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	chip-&gt;pm_prepared = 1;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;azx_bus(chip)-&gt;unsol_work);</div><div class='add'>+</div><div class='add'>+	/* HDA controller always requires different WAKEEN for runtime suspend</div><div class='add'>+	 * and system suspend, so don't use direct-complete here.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_complete(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+	chip-&gt;pm_prepared = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	azx_shutdown_chip(chip);</div><div class='add'>+</div><div class='add'>+	trace_azx_suspend(chip);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	__azx_runtime_resume(chip);</div><div class='add'>+</div><div class='add'>+	trace_azx_resume(chip);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* put codec down to D3 at hibernation for Intel SKL+;</div><div class='add'>+ * otherwise BIOS may still access the codec and screw up the driver</div><div class='add'>+ */</div><div class='add'>+static int azx_freeze_noirq(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL)</div><div class='add'>+		pci_set_power_state(pci, PCI_D3hot);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_thaw_noirq(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL)</div><div class='add'>+		pci_set_power_state(pci, PCI_D0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	/* enable controller wake up event */</div><div class='add'>+	azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) | STATESTS_INT_MASK);</div><div class='add'>+</div><div class='add'>+	azx_shutdown_chip(chip);</div><div class='add'>+	trace_azx_runtime_suspend(chip);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!azx_is_pm_ready(card))</div><div class='add'>+		return 0;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	__azx_runtime_resume(chip);</div><div class='add'>+</div><div class='add'>+	/* disable controller Wake Up event*/</div><div class='add'>+	azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &amp; ~STATESTS_INT_MASK);</div><div class='add'>+</div><div class='add'>+	trace_azx_runtime_resume(chip);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_runtime_idle(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+</div><div class='add'>+	if (!card)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	if (chip-&gt;disabled || hda-&gt;init_failed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!power_save_controller || !azx_has_pm_runtime(chip) ||</div><div class='add'>+	    azx_bus(chip)-&gt;codec_powered || !chip-&gt;running)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* ELD notification gets broken when HD-audio bus is off */</div><div class='add'>+	if (needs_eld_notify_link(chip))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops azx_pm = {</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)</div><div class='add'>+	.prepare = pm_sleep_ptr(azx_prepare),</div><div class='add'>+	.complete = pm_sleep_ptr(azx_complete),</div><div class='add'>+	.freeze_noirq = pm_sleep_ptr(azx_freeze_noirq),</div><div class='add'>+	.thaw_noirq = pm_sleep_ptr(azx_thaw_noirq),</div><div class='add'>+	RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static int azx_probe_continue(struct azx *chip);</div><div class='add'>+</div><div class='add'>+#ifdef SUPPORT_VGA_SWITCHEROO</div><div class='add'>+static struct pci_dev *get_bound_vga(struct pci_dev *pci);</div><div class='add'>+</div><div class='add'>+static void azx_vs_set_state(struct pci_dev *pci,</div><div class='add'>+			     enum vga_switcheroo_state state)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+	bool disabled;</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;hda-&gt;probe_wait);</div><div class='add'>+	if (hda-&gt;init_failed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	disabled = (state == VGA_SWITCHEROO_OFF);</div><div class='add'>+	if (chip-&gt;disabled == disabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!hda-&gt;probe_continued) {</div><div class='add'>+		chip-&gt;disabled = disabled;</div><div class='add'>+		if (!disabled) {</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "Start delayed initialization\n");</div><div class='add'>+			if (azx_probe_continue(chip) &lt; 0)</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev, "initialization error\n");</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "%s via vga_switcheroo\n",</div><div class='add'>+			 disabled ? "Disabling" : "Enabling");</div><div class='add'>+		if (disabled) {</div><div class='add'>+			list_for_each_codec(codec, &amp;chip-&gt;bus) {</div><div class='add'>+				pm_runtime_suspend(hda_codec_dev(codec));</div><div class='add'>+				pm_runtime_disable(hda_codec_dev(codec));</div><div class='add'>+			}</div><div class='add'>+			pm_runtime_suspend(card-&gt;dev);</div><div class='add'>+			pm_runtime_disable(card-&gt;dev);</div><div class='add'>+			/* when we get suspended by vga_switcheroo we end up in D3cold,</div><div class='add'>+			 * however we have no ACPI handle, so pci/acpi can't put us there,</div><div class='add'>+			 * put ourselves there */</div><div class='add'>+			pci-&gt;current_state = PCI_D3cold;</div><div class='add'>+			chip-&gt;disabled = true;</div><div class='add'>+			if (snd_hda_lock_devices(&amp;chip-&gt;bus))</div><div class='add'>+				dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+					 "Cannot lock devices!\n");</div><div class='add'>+		} else {</div><div class='add'>+			snd_hda_unlock_devices(&amp;chip-&gt;bus);</div><div class='add'>+			chip-&gt;disabled = false;</div><div class='add'>+			pm_runtime_enable(card-&gt;dev);</div><div class='add'>+			list_for_each_codec(codec, &amp;chip-&gt;bus) {</div><div class='add'>+				pm_runtime_enable(hda_codec_dev(codec));</div><div class='add'>+				pm_runtime_resume(hda_codec_dev(codec));</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool azx_vs_can_switch(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+</div><div class='add'>+	wait_for_completion(&amp;hda-&gt;probe_wait);</div><div class='add'>+	if (hda-&gt;init_failed)</div><div class='add'>+		return false;</div><div class='add'>+	if (chip-&gt;disabled || !hda-&gt;probe_continued)</div><div class='add'>+		return true;</div><div class='add'>+	if (snd_hda_lock_devices(&amp;chip-&gt;bus))</div><div class='add'>+		return false;</div><div class='add'>+	snd_hda_unlock_devices(&amp;chip-&gt;bus);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The discrete GPU cannot power down unless the HDA controller runtime</div><div class='add'>+ * suspends, so activate runtime PM on codecs even if power_save == 0.</div><div class='add'>+ */</div><div class='add'>+static void setup_vga_switcheroo_runtime_pm(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct hda_codec *codec;</div><div class='add'>+</div><div class='add'>+	if (hda-&gt;use_vga_switcheroo &amp;&amp; !needs_eld_notify_link(chip)) {</div><div class='add'>+		list_for_each_codec(codec, &amp;chip-&gt;bus)</div><div class='add'>+			codec-&gt;auto_runtime_pm = 1;</div><div class='add'>+		/* reset the power save setup */</div><div class='add'>+		if (chip-&gt;running)</div><div class='add'>+			set_default_power_save(chip);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_vs_gpu_bound(struct pci_dev *pci,</div><div class='add'>+			     enum vga_switcheroo_client_id client_id)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (client_id == VGA_SWITCHEROO_DIS)</div><div class='add'>+		chip-&gt;bus.keep_power = 0;</div><div class='add'>+	setup_vga_switcheroo_runtime_pm(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void init_vga_switcheroo(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct pci_dev *p = get_bound_vga(chip-&gt;pci);</div><div class='add'>+	struct pci_dev *parent;</div><div class='add'>+	if (p) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Handle vga_switcheroo audio client\n");</div><div class='add'>+		hda-&gt;use_vga_switcheroo = 1;</div><div class='add'>+</div><div class='add'>+		/* cleared in either gpu_bound op or codec probe, or when its</div><div class='add'>+		 * upstream port has _PR3 (i.e. dGPU).</div><div class='add'>+		 */</div><div class='add'>+		parent = pci_upstream_bridge(p);</div><div class='add'>+		chip-&gt;bus.keep_power = parent ? !pci_pr3_present(parent) : 1;</div><div class='add'>+		chip-&gt;driver_caps |= AZX_DCAPS_PM_RUNTIME;</div><div class='add'>+		pci_dev_put(p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vga_switcheroo_client_ops azx_vs_ops = {</div><div class='add'>+	.set_gpu_state = azx_vs_set_state,</div><div class='add'>+	.can_switch = azx_vs_can_switch,</div><div class='add'>+	.gpu_bound = azx_vs_gpu_bound,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int register_vga_switcheroo(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct pci_dev *p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hda-&gt;use_vga_switcheroo)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	p = get_bound_vga(chip-&gt;pci);</div><div class='add'>+	err = vga_switcheroo_register_audio_client(chip-&gt;pci, &amp;azx_vs_ops, p);</div><div class='add'>+	pci_dev_put(p);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	hda-&gt;vga_switcheroo_registered = 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+#define init_vga_switcheroo(chip)		/* NOP */</div><div class='add'>+#define register_vga_switcheroo(chip)		0</div><div class='add'>+#define check_hdmi_disabled(pci)	false</div><div class='add'>+#define setup_vga_switcheroo_runtime_pm(chip)	/* NOP */</div><div class='add'>+#endif /* SUPPORT_VGA_SWITCHER */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * destructor</div><div class='add'>+ */</div><div class='add'>+static void azx_free(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pci = chip-&gt;pci;</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+</div><div class='add'>+	if (hda-&gt;freed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (azx_has_pm_runtime(chip) &amp;&amp; chip-&gt;running) {</div><div class='add'>+		pm_runtime_get_noresume(&amp;pci-&gt;dev);</div><div class='add'>+		pm_runtime_forbid(&amp;pci-&gt;dev);</div><div class='add'>+		pm_runtime_dont_use_autosuspend(&amp;pci-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;running = 0;</div><div class='add'>+</div><div class='add'>+	azx_del_card_list(chip);</div><div class='add'>+</div><div class='add'>+	hda-&gt;init_failed = 1; /* to be sure */</div><div class='add'>+	complete_all(&amp;hda-&gt;probe_wait);</div><div class='add'>+</div><div class='add'>+	if (use_vga_switcheroo(hda)) {</div><div class='add'>+		if (chip-&gt;disabled &amp;&amp; hda-&gt;probe_continued)</div><div class='add'>+			snd_hda_unlock_devices(&amp;chip-&gt;bus);</div><div class='add'>+		if (hda-&gt;vga_switcheroo_registered) {</div><div class='add'>+			vga_switcheroo_unregister_client(chip-&gt;pci);</div><div class='add'>+</div><div class='add'>+			/* Some GPUs don't have sound, and azx_first_init fails,</div><div class='add'>+			 * leaving the device probed but non-functional. As long</div><div class='add'>+			 * as it's probed, the PCI subsystem keeps its runtime</div><div class='add'>+			 * PM status as active. Force it to suspended (as we</div><div class='add'>+			 * actually stop the chip) to allow GPU to suspend via</div><div class='add'>+			 * vga_switcheroo, and print a warning.</div><div class='add'>+			 */</div><div class='add'>+			dev_warn(&amp;pci-&gt;dev, "GPU sound probed, but not operational: please add a quirk to driver_denylist\n");</div><div class='add'>+			pm_runtime_disable(&amp;pci-&gt;dev);</div><div class='add'>+			pm_runtime_set_suspended(&amp;pci-&gt;dev);</div><div class='add'>+			pm_runtime_enable(&amp;pci-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;chip_init) {</div><div class='add'>+		azx_clear_irq_pending(chip);</div><div class='add'>+		azx_stop_all_streams(chip);</div><div class='add'>+		azx_stop_chip(chip);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;irq &gt;= 0)</div><div class='add'>+		free_irq(bus-&gt;irq, (void*)chip);</div><div class='add'>+</div><div class='add'>+	azx_free_stream_pages(chip);</div><div class='add'>+	azx_free_streams(chip);</div><div class='add'>+	snd_hdac_bus_exit(bus);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+	release_firmware(chip-&gt;fw);</div><div class='add'>+#endif</div><div class='add'>+	display_power(chip, false);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_I915_COMPONENT)</div><div class='add'>+		snd_hdac_i915_exit(bus);</div><div class='add'>+</div><div class='add'>+	hda-&gt;freed = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = device-&gt;device_data;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+</div><div class='add'>+	chip-&gt;bus.shutdown = 1;</div><div class='add'>+	cancel_work_sync(&amp;bus-&gt;unsol_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	azx_free(device-&gt;device_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef SUPPORT_VGA_SWITCHEROO</div><div class='add'>+#ifdef CONFIG_ACPI</div><div class='add'>+/* ATPX is in the integrated GPU's namespace */</div><div class='add'>+static bool atpx_present(void)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = NULL;</div><div class='add'>+	acpi_handle dhandle, atpx_handle;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {</div><div class='add'>+		if ((pdev-&gt;class != PCI_CLASS_DISPLAY_VGA &lt;&lt; 8) &amp;&amp;</div><div class='add'>+		    (pdev-&gt;class != PCI_CLASS_DISPLAY_OTHER &lt;&lt; 8))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dhandle = ACPI_HANDLE(&amp;pdev-&gt;dev);</div><div class='add'>+		if (dhandle) {</div><div class='add'>+			status = acpi_get_handle(dhandle, "ATPX", &amp;atpx_handle);</div><div class='add'>+			if (ACPI_SUCCESS(status)) {</div><div class='add'>+				pci_dev_put(pdev);</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static bool atpx_present(void)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check of disabled HDMI controller by vga_switcheroo</div><div class='add'>+ */</div><div class='add'>+static struct pci_dev *get_bound_vga(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *p;</div><div class='add'>+</div><div class='add'>+	/* check only discrete GPU */</div><div class='add'>+	switch (pci-&gt;vendor) {</div><div class='add'>+	case PCI_VENDOR_ID_ATI:</div><div class='add'>+	case PCI_VENDOR_ID_AMD:</div><div class='add'>+		if (pci-&gt;devfn == 1) {</div><div class='add'>+			p = pci_get_domain_bus_and_slot(pci_domain_nr(pci-&gt;bus),</div><div class='add'>+							pci-&gt;bus-&gt;number, 0);</div><div class='add'>+			if (p) {</div><div class='add'>+				/* ATPX is in the integrated GPU's ACPI namespace</div><div class='add'>+				 * rather than the dGPU's namespace. However,</div><div class='add'>+				 * the dGPU is the one who is involved in</div><div class='add'>+				 * vgaswitcheroo.</div><div class='add'>+				 */</div><div class='add'>+				if (pci_is_display(p) &amp;&amp;</div><div class='add'>+				    (atpx_present() || apple_gmux_detect(NULL, NULL)))</div><div class='add'>+					return p;</div><div class='add'>+				pci_dev_put(p);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PCI_VENDOR_ID_NVIDIA:</div><div class='add'>+		if (pci-&gt;devfn == 1) {</div><div class='add'>+			p = pci_get_domain_bus_and_slot(pci_domain_nr(pci-&gt;bus),</div><div class='add'>+							pci-&gt;bus-&gt;number, 0);</div><div class='add'>+			if (p) {</div><div class='add'>+				if (pci_is_display(p))</div><div class='add'>+					return p;</div><div class='add'>+				pci_dev_put(p);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_hdmi_disabled(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	bool vga_inactive = false;</div><div class='add'>+	struct pci_dev *p = get_bound_vga(pci);</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		if (vga_switcheroo_get_client_state(p) == VGA_SWITCHEROO_OFF)</div><div class='add'>+			vga_inactive = true;</div><div class='add'>+		pci_dev_put(p);</div><div class='add'>+	}</div><div class='add'>+	return vga_inactive;</div><div class='add'>+}</div><div class='add'>+#endif /* SUPPORT_VGA_SWITCHEROO */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * allow/deny-listing for position_fix</div><div class='add'>+ */</div><div class='add'>+static const struct snd_pci_quirk position_fix_list[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB),</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int check_position_fix(struct azx *chip, int fix)</div><div class='add'>+{</div><div class='add'>+	const struct snd_pci_quirk *q;</div><div class='add'>+</div><div class='add'>+	switch (fix) {</div><div class='add'>+	case POS_FIX_AUTO:</div><div class='add'>+	case POS_FIX_LPIB:</div><div class='add'>+	case POS_FIX_POSBUF:</div><div class='add'>+	case POS_FIX_VIACOMBO:</div><div class='add'>+	case POS_FIX_COMBO:</div><div class='add'>+	case POS_FIX_SKL:</div><div class='add'>+	case POS_FIX_FIFO:</div><div class='add'>+		return fix;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q = snd_pci_quirk_lookup(chip-&gt;pci, position_fix_list);</div><div class='add'>+	if (q) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "position_fix set to %d for device %04x:%04x\n",</div><div class='add'>+			 q-&gt;value, q-&gt;subvendor, q-&gt;subdevice);</div><div class='add'>+		return q-&gt;value;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check VIA/ATI HD Audio Controller exist */</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_VIA) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Using VIACOMBO position fix\n");</div><div class='add'>+		return POS_FIX_VIACOMBO;</div><div class='add'>+	}</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_AMD_WORKAROUND) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Using FIFO position fix\n");</div><div class='add'>+		return POS_FIX_FIFO;</div><div class='add'>+	}</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_POSFIX_LPIB) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Using LPIB position fix\n");</div><div class='add'>+		return POS_FIX_LPIB;</div><div class='add'>+	}</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Using SKL position fix\n");</div><div class='add'>+		return POS_FIX_SKL;</div><div class='add'>+	}</div><div class='add'>+	return POS_FIX_AUTO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void assign_position_fix(struct azx *chip, int fix)</div><div class='add'>+{</div><div class='add'>+	static const azx_get_pos_callback_t callbacks[] = {</div><div class='add'>+		[POS_FIX_AUTO] = NULL,</div><div class='add'>+		[POS_FIX_LPIB] = azx_get_pos_lpib,</div><div class='add'>+		[POS_FIX_POSBUF] = azx_get_pos_posbuf,</div><div class='add'>+		[POS_FIX_VIACOMBO] = azx_via_get_position,</div><div class='add'>+		[POS_FIX_COMBO] = azx_get_pos_lpib,</div><div class='add'>+		[POS_FIX_SKL] = azx_get_pos_posbuf,</div><div class='add'>+		[POS_FIX_FIFO] = azx_get_pos_fifo,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	chip-&gt;get_position[0] = chip-&gt;get_position[1] = callbacks[fix];</div><div class='add'>+</div><div class='add'>+	/* combo mode uses LPIB only for playback */</div><div class='add'>+	if (fix == POS_FIX_COMBO)</div><div class='add'>+		chip-&gt;get_position[1] = NULL;</div><div class='add'>+</div><div class='add'>+	if ((fix == POS_FIX_POSBUF || fix == POS_FIX_SKL) &amp;&amp;</div><div class='add'>+	    (chip-&gt;driver_caps &amp; AZX_DCAPS_COUNT_LPIB_DELAY)) {</div><div class='add'>+		chip-&gt;get_delay[0] = chip-&gt;get_delay[1] =</div><div class='add'>+			azx_get_delay_from_lpib;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fix == POS_FIX_FIFO)</div><div class='add'>+		chip-&gt;get_delay[0] = chip-&gt;get_delay[1] =</div><div class='add'>+			azx_get_delay_from_fifo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * deny-lists for probe_mask</div><div class='add'>+ */</div><div class='add'>+static const struct snd_pci_quirk probe_mask_list[] = {</div><div class='add'>+	/* Thinkpad often breaks the controller communication when accessing</div><div class='add'>+	 * to the non-working (or non-existing) modem codec slot.</div><div class='add'>+	 */</div><div class='add'>+	SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01),</div><div class='add'>+	/* broken BIOS */</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),</div><div class='add'>+	/* including bogus ALC268 in slot#2 that conflicts with ALC888 */</div><div class='add'>+	SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),</div><div class='add'>+	/* forced codec slots */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x1262, "ASUS W5Fm", 0x103),</div><div class='add'>+	SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),</div><div class='add'>+	SND_PCI_QUIRK(0x1558, 0x0351, "Schenker Dock 15", 0x105),</div><div class='add'>+	/* WinFast VP200 H (Teradici) user reported broken communication */</div><div class='add'>+	SND_PCI_QUIRK(0x3a21, 0x040d, "WinFast VP200 H", 0x101),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AZX_FORCE_CODEC_MASK	0x100</div><div class='add'>+</div><div class='add'>+static void check_probe_mask(struct azx *chip, int dev)</div><div class='add'>+{</div><div class='add'>+	const struct snd_pci_quirk *q;</div><div class='add'>+</div><div class='add'>+	chip-&gt;codec_probe_mask = probe_mask[dev];</div><div class='add'>+	if (chip-&gt;codec_probe_mask == -1) {</div><div class='add'>+		q = snd_pci_quirk_lookup(chip-&gt;pci, probe_mask_list);</div><div class='add'>+		if (q) {</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "probe_mask set to 0x%x for device %04x:%04x\n",</div><div class='add'>+				 q-&gt;value, q-&gt;subvendor, q-&gt;subdevice);</div><div class='add'>+			chip-&gt;codec_probe_mask = q-&gt;value;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check forced option */</div><div class='add'>+	if (chip-&gt;codec_probe_mask != -1 &amp;&amp;</div><div class='add'>+	    (chip-&gt;codec_probe_mask &amp; AZX_FORCE_CODEC_MASK)) {</div><div class='add'>+		azx_bus(chip)-&gt;codec_mask = chip-&gt;codec_probe_mask &amp; 0xff;</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "codec_mask forced to 0x%x\n",</div><div class='add'>+			 (int)azx_bus(chip)-&gt;codec_mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * allow/deny-list for enable_msi</div><div class='add'>+ */</div><div class='add'>+static const struct snd_pci_quirk msi_deny_list[] = {</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2191, "HP", 0), /* AMD Hudson */</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x2192, "HP", 0), /* AMD Hudson */</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x21f7, "HP", 0), /* AMD Hudson */</div><div class='add'>+	SND_PCI_QUIRK(0x103c, 0x21fa, "HP", 0), /* AMD Hudson */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */</div><div class='add'>+	SND_PCI_QUIRK(0x1179, 0xfb44, "Toshiba Satellite C870", 0), /* AMD Hudson */</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */</div><div class='add'>+	SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void check_msi(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	const struct snd_pci_quirk *q;</div><div class='add'>+</div><div class='add'>+	if (enable_msi &gt;= 0) {</div><div class='add'>+		chip-&gt;msi = !!enable_msi;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;msi = 1;	/* enable MSI as default */</div><div class='add'>+	q = snd_pci_quirk_lookup(chip-&gt;pci, msi_deny_list);</div><div class='add'>+	if (q) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "msi for device %04x:%04x set to %d\n",</div><div class='add'>+			 q-&gt;subvendor, q-&gt;subdevice, q-&gt;value);</div><div class='add'>+		chip-&gt;msi = q-&gt;value;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NVidia chipsets seem to cause troubles with MSI */</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_NO_MSI) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "Disabling MSI\n");</div><div class='add'>+		chip-&gt;msi = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check the snoop mode availability */</div><div class='add'>+static void azx_check_snoop_available(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	int snoop = hda_snoop;</div><div class='add'>+</div><div class='add'>+	if (snoop &gt;= 0) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "Force to %s mode by module option\n",</div><div class='add'>+			 snoop ? "snoop" : "non-snoop");</div><div class='add'>+		chip-&gt;snoop = snoop;</div><div class='add'>+		chip-&gt;uc_buffer = !snoop;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snoop = true;</div><div class='add'>+	if (azx_get_snoop_type(chip) == AZX_SNOOP_TYPE_NONE &amp;&amp;</div><div class='add'>+	    chip-&gt;driver_type == AZX_DRIVER_VIA) {</div><div class='add'>+		/* force to non-snoop mode for a new VIA controller</div><div class='add'>+		 * when BIOS is set</div><div class='add'>+		 */</div><div class='add'>+		u8 val;</div><div class='add'>+		pci_read_config_byte(chip-&gt;pci, 0x42, &amp;val);</div><div class='add'>+		if (!(val &amp; 0x80) &amp;&amp; (chip-&gt;pci-&gt;revision == 0x30 ||</div><div class='add'>+				      chip-&gt;pci-&gt;revision == 0x20))</div><div class='add'>+			snoop = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_SNOOP_OFF)</div><div class='add'>+		snoop = false;</div><div class='add'>+</div><div class='add'>+	chip-&gt;snoop = snoop;</div><div class='add'>+	if (!snoop) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "Force to non-snoop mode\n");</div><div class='add'>+		/* C-Media requires non-cached pages only for CORB/RIRB */</div><div class='add'>+		if (chip-&gt;driver_type != AZX_DRIVER_CMEDIA)</div><div class='add'>+			chip-&gt;uc_buffer = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_probe_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work);</div><div class='add'>+	azx_probe_continue(&amp;hda-&gt;chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int default_bdl_pos_adj(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	/* some exceptions: Atoms seem problematic with value 1 */</div><div class='add'>+	if (chip-&gt;pci-&gt;vendor == PCI_VENDOR_ID_INTEL) {</div><div class='add'>+		switch (chip-&gt;pci-&gt;device) {</div><div class='add'>+		case PCI_DEVICE_ID_INTEL_HDA_BYT:</div><div class='add'>+		case PCI_DEVICE_ID_INTEL_HDA_BSW:</div><div class='add'>+			return 32;</div><div class='add'>+		case PCI_DEVICE_ID_INTEL_HDA_APL:</div><div class='add'>+			return 64;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (chip-&gt;driver_type) {</div><div class='add'>+	/*</div><div class='add'>+	 * increase the bdl size for Glenfly Gpus for hardware</div><div class='add'>+	 * limitation on hdac interrupt interval</div><div class='add'>+	 */</div><div class='add'>+	case AZX_DRIVER_GFHDMI:</div><div class='add'>+		return 128;</div><div class='add'>+	case AZX_DRIVER_ICH:</div><div class='add'>+	case AZX_DRIVER_PCH:</div><div class='add'>+		return 1;</div><div class='add'>+	case AZX_DRIVER_ZHAOXINHDMI:</div><div class='add'>+		return 128;</div><div class='add'>+	default:</div><div class='add'>+		return 32;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * constructor</div><div class='add'>+ */</div><div class='add'>+static const struct hda_controller_ops pci_hda_ops;</div><div class='add'>+</div><div class='add'>+static int azx_create(struct snd_card *card, struct pci_dev *pci,</div><div class='add'>+		      int dev, unsigned int driver_caps,</div><div class='add'>+		      struct azx **rchip)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_disconnect = azx_dev_disconnect,</div><div class='add'>+		.dev_free = azx_dev_free,</div><div class='add'>+	};</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	*rchip = NULL;</div><div class='add'>+</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hda = devm_kzalloc(&amp;pci-&gt;dev, sizeof(*hda), GFP_KERNEL);</div><div class='add'>+	if (!hda)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip = &amp;hda-&gt;chip;</div><div class='add'>+	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='add'>+	chip-&gt;card = card;</div><div class='add'>+	chip-&gt;pci = pci;</div><div class='add'>+	chip-&gt;ops = &amp;pci_hda_ops;</div><div class='add'>+	chip-&gt;driver_caps = driver_caps;</div><div class='add'>+	chip-&gt;driver_type = driver_caps &amp; 0xff;</div><div class='add'>+	check_msi(chip);</div><div class='add'>+	chip-&gt;dev_index = dev;</div><div class='add'>+	if (jackpoll_ms[dev] &gt;= 50 &amp;&amp; jackpoll_ms[dev] &lt;= 60000)</div><div class='add'>+		chip-&gt;jackpoll_interval = msecs_to_jiffies(jackpoll_ms[dev]);</div><div class='add'>+	INIT_LIST_HEAD(&amp;chip-&gt;pcm_list);</div><div class='add'>+	INIT_WORK(&amp;hda-&gt;irq_pending_work, azx_irq_pending_work);</div><div class='add'>+	INIT_LIST_HEAD(&amp;hda-&gt;list);</div><div class='add'>+	init_vga_switcheroo(chip);</div><div class='add'>+	init_completion(&amp;hda-&gt;probe_wait);</div><div class='add'>+</div><div class='add'>+	assign_position_fix(chip, check_position_fix(chip, position_fix[dev]));</div><div class='add'>+</div><div class='add'>+	if (single_cmd &lt; 0) /* allow fallback to single_cmd at errors */</div><div class='add'>+		chip-&gt;fallback_to_single_cmd = 1;</div><div class='add'>+	else /* explicitly set to single_cmd or not */</div><div class='add'>+		chip-&gt;single_cmd = single_cmd;</div><div class='add'>+</div><div class='add'>+	azx_check_snoop_available(chip);</div><div class='add'>+</div><div class='add'>+	if (bdl_pos_adj[dev] &lt; 0)</div><div class='add'>+		chip-&gt;bdl_pos_adj = default_bdl_pos_adj(chip);</div><div class='add'>+	else</div><div class='add'>+		chip-&gt;bdl_pos_adj = bdl_pos_adj[dev];</div><div class='add'>+</div><div class='add'>+	err = azx_bus_init(chip, model[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* use the non-cached pages in non-snoop mode */</div><div class='add'>+	if (!azx_snoop(chip))</div><div class='add'>+		azx_bus(chip)-&gt;dma_type = SNDRV_DMA_TYPE_DEV_WC;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_NVIDIA) {</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Enable delay in RIRB handling\n");</div><div class='add'>+		chip-&gt;bus.core.needs_damn_long_delay = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	check_probe_mask(chip, dev);</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Error creating device [card]!\n");</div><div class='add'>+		azx_free(chip);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* continue probing in work context as may trigger request module */</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hda-&gt;probe_work, azx_probe_work);</div><div class='add'>+</div><div class='add'>+	*rchip = chip;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int azx_first_init(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	int dev = chip-&gt;dev_index;</div><div class='add'>+	struct pci_dev *pci = chip-&gt;pci;</div><div class='add'>+	struct snd_card *card = chip-&gt;card;</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	int err;</div><div class='add'>+	unsigned short gcap;</div><div class='add'>+	unsigned int dma_bits = 64;</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG != 64</div><div class='add'>+	/* Fix up base address on ULI M5461 */</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_ULI) {</div><div class='add'>+		u16 tmp3;</div><div class='add'>+		pci_read_config_word(pci, 0x40, &amp;tmp3);</div><div class='add'>+		pci_write_config_word(pci, 0x40, tmp3 | 0x10);</div><div class='add'>+		pci_write_config_dword(pci, PCI_BASE_ADDRESS_1, 0);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	/*</div><div class='add'>+	 * Fix response write request not synced to memory when handle</div><div class='add'>+	 * hdac interrupt on Glenfly Gpus</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_GFHDMI)</div><div class='add'>+		bus-&gt;polling_mode = 1;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_LOONGSON) {</div><div class='add'>+		bus-&gt;polling_mode = 1;</div><div class='add'>+		bus-&gt;not_use_interrupts = 1;</div><div class='add'>+		bus-&gt;access_sdnctl_in_dword = 1;</div><div class='add'>+		if (!chip-&gt;jackpoll_interval)</div><div class='add'>+			chip-&gt;jackpoll_interval = msecs_to_jiffies(1500);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_ZHAOXINHDMI)</div><div class='add'>+		bus-&gt;polling_mode = 1;</div><div class='add'>+</div><div class='add'>+	bus-&gt;remap_addr = pcim_iomap_region(pci, 0, "ICH HD audio");</div><div class='add'>+	if (IS_ERR(bus-&gt;remap_addr))</div><div class='add'>+		return PTR_ERR(bus-&gt;remap_addr);</div><div class='add'>+</div><div class='add'>+	bus-&gt;addr = pci_resource_start(pci, 0);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;driver_type == AZX_DRIVER_SKL)</div><div class='add'>+		snd_hdac_bus_parse_capabilities(bus);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Some Intel CPUs has always running timer (ART) feature and</div><div class='add'>+	 * controller may have Global time sync reporting capability, so</div><div class='add'>+	 * check both of these before declaring synchronized time reporting</div><div class='add'>+	 * capability SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;gts_present = false;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_X86</div><div class='add'>+	if (bus-&gt;ppcap &amp;&amp; boot_cpu_has(X86_FEATURE_ART))</div><div class='add'>+		chip-&gt;gts_present = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;msi &amp;&amp; chip-&gt;driver_caps &amp; AZX_DCAPS_NO_MSI64) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Disabling 64bit MSI\n");</div><div class='add'>+		pci-&gt;no_64bit_msi = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pci);</div><div class='add'>+</div><div class='add'>+	gcap = azx_readw(chip, GCAP);</div><div class='add'>+	dev_dbg(card-&gt;dev, "chipset global capabilities = 0x%x\n", gcap);</div><div class='add'>+</div><div class='add'>+	/* AMD devices support 40 or 48bit DMA, take the safe one */</div><div class='add'>+	if (chip-&gt;pci-&gt;vendor == PCI_VENDOR_ID_AMD)</div><div class='add'>+		dma_bits = 40;</div><div class='add'>+</div><div class='add'>+	/* disable SB600 64bit support for safety */</div><div class='add'>+	if (chip-&gt;pci-&gt;vendor == PCI_VENDOR_ID_ATI) {</div><div class='add'>+		struct pci_dev *p_smbus;</div><div class='add'>+		dma_bits = 40;</div><div class='add'>+		p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,</div><div class='add'>+					 PCI_DEVICE_ID_ATI_SBX00_SMBUS,</div><div class='add'>+					 NULL);</div><div class='add'>+		if (p_smbus) {</div><div class='add'>+			if (p_smbus-&gt;revision &lt; 0x30)</div><div class='add'>+				gcap &amp;= ~AZX_GCAP_64OK;</div><div class='add'>+			pci_dev_put(p_smbus);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* NVidia hardware normally only supports up to 40 bits of DMA */</div><div class='add'>+	if (chip-&gt;pci-&gt;vendor == PCI_VENDOR_ID_NVIDIA)</div><div class='add'>+		dma_bits = 40;</div><div class='add'>+</div><div class='add'>+	/* disable 64bit DMA address on some devices */</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_NO_64BIT) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "Disabling 64bit DMA\n");</div><div class='add'>+		gcap &amp;= ~AZX_GCAP_64OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* disable buffer size rounding to 128-byte multiples if supported */</div><div class='add'>+	if (align_buffer_size &gt;= 0)</div><div class='add'>+		chip-&gt;align_buffer_size = !!align_buffer_size;</div><div class='add'>+	else {</div><div class='add'>+		if (chip-&gt;driver_caps &amp; AZX_DCAPS_NO_ALIGN_BUFSIZE)</div><div class='add'>+			chip-&gt;align_buffer_size = 0;</div><div class='add'>+		else</div><div class='add'>+			chip-&gt;align_buffer_size = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allow 64bit DMA address if supported by H/W */</div><div class='add'>+	if (!(gcap &amp; AZX_GCAP_64OK))</div><div class='add'>+		dma_bits = 32;</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(dma_bits)))</div><div class='add'>+		dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	dma_set_max_seg_size(&amp;pci-&gt;dev, UINT_MAX);</div><div class='add'>+</div><div class='add'>+	/* read number of streams from GCAP register instead of using</div><div class='add'>+	 * hardcoded value</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;capture_streams = (gcap &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+	chip-&gt;playback_streams = (gcap &gt;&gt; 12) &amp; 0x0f;</div><div class='add'>+	if (!chip-&gt;playback_streams &amp;&amp; !chip-&gt;capture_streams) {</div><div class='add'>+		/* gcap didn't give any info, switching to old method */</div><div class='add'>+</div><div class='add'>+		switch (chip-&gt;driver_type) {</div><div class='add'>+		case AZX_DRIVER_ULI:</div><div class='add'>+			chip-&gt;playback_streams = ULI_NUM_PLAYBACK;</div><div class='add'>+			chip-&gt;capture_streams = ULI_NUM_CAPTURE;</div><div class='add'>+			break;</div><div class='add'>+		case AZX_DRIVER_ATIHDMI:</div><div class='add'>+		case AZX_DRIVER_ATIHDMI_NS:</div><div class='add'>+			chip-&gt;playback_streams = ATIHDMI_NUM_PLAYBACK;</div><div class='add'>+			chip-&gt;capture_streams = ATIHDMI_NUM_CAPTURE;</div><div class='add'>+			break;</div><div class='add'>+		case AZX_DRIVER_GFHDMI:</div><div class='add'>+		case AZX_DRIVER_ZHAOXINHDMI:</div><div class='add'>+		case AZX_DRIVER_GENERIC:</div><div class='add'>+		default:</div><div class='add'>+			chip-&gt;playback_streams = ICH6_NUM_PLAYBACK;</div><div class='add'>+			chip-&gt;capture_streams = ICH6_NUM_CAPTURE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;capture_index_offset = 0;</div><div class='add'>+	chip-&gt;playback_index_offset = chip-&gt;capture_streams;</div><div class='add'>+	chip-&gt;num_streams = chip-&gt;playback_streams + chip-&gt;capture_streams;</div><div class='add'>+</div><div class='add'>+	/* sanity check for the SDxCTL.STRM field overflow */</div><div class='add'>+	if (chip-&gt;num_streams &gt; 15 &amp;&amp;</div><div class='add'>+	    (chip-&gt;driver_caps &amp; AZX_DCAPS_SEPARATE_STREAM_TAG) == 0) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "number of I/O streams is %d, "</div><div class='add'>+			 "forcing separate stream tags", chip-&gt;num_streams);</div><div class='add'>+		chip-&gt;driver_caps |= AZX_DCAPS_SEPARATE_STREAM_TAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize streams */</div><div class='add'>+	err = azx_init_streams(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = azx_alloc_stream_pages(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* initialize chip */</div><div class='add'>+	azx_init_pci(chip);</div><div class='add'>+</div><div class='add'>+	snd_hdac_i915_set_bclk(bus);</div><div class='add'>+</div><div class='add'>+	hda_intel_init_chip(chip, (probe_only[dev] &amp; 2) == 0);</div><div class='add'>+</div><div class='add'>+	/* codec detection */</div><div class='add'>+	if (!azx_bus(chip)-&gt;codec_mask) {</div><div class='add'>+		dev_err(card-&gt;dev, "no codecs found!\n");</div><div class='add'>+		/* keep running the rest for the runtime PM */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (azx_acquire_irq(chip, 0) &lt; 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "HDA-Intel");</div><div class='add'>+	strscpy(card-&gt;shortname, driver_short_names[chip-&gt;driver_type],</div><div class='add'>+		sizeof(card-&gt;shortname));</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "%s at 0x%lx irq %i",</div><div class='add'>+		 card-&gt;shortname, bus-&gt;addr, bus-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+/* callback from request_firmware_nowait() */</div><div class='add'>+static void azx_firmware_cb(const struct firmware *fw, void *context)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = context;</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (fw)</div><div class='add'>+		chip-&gt;fw = fw;</div><div class='add'>+	else</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot load firmware, continue without patching\n");</div><div class='add'>+	if (!chip-&gt;disabled) {</div><div class='add'>+		/* continue probing */</div><div class='add'>+		azx_probe_continue(chip);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int disable_msi_reset_irq(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	free_irq(bus-&gt;irq, chip);</div><div class='add'>+	bus-&gt;irq = -1;</div><div class='add'>+	chip-&gt;card-&gt;sync_irq = -1;</div><div class='add'>+	pci_free_irq_vectors(chip-&gt;pci);</div><div class='add'>+	chip-&gt;msi = 0;</div><div class='add'>+	err = azx_acquire_irq(chip, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Denylist for skipping the whole probe:</div><div class='add'>+ * some HD-audio PCI entries are exposed without any codecs, and such devices</div><div class='add'>+ * should be ignored from the beginning.</div><div class='add'>+ */</div><div class='add'>+static const struct pci_device_id driver_denylist[] = {</div><div class='add'>+	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */</div><div class='add'>+	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */</div><div class='add'>+	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */</div><div class='add'>+	{ PCI_DEVICE_SUB(0x1022, 0x15e3, 0x1462, 0xee59) }, /* MSI X870E Tomahawk WiFi */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_device_id driver_denylist_ideapad_z570[] = {</div><div class='add'>+	{ PCI_DEVICE_SUB(0x10de, 0x0bea, 0x0000, 0x0000) }, /* NVIDIA GF108 HDA */</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DMI-based denylist, to be used when:</div><div class='add'>+ *  - PCI subsystem IDs are zero, impossible to distinguish from valid sound cards.</div><div class='add'>+ *  - Different modifications of the same laptop use different GPU models.</div><div class='add'>+ */</div><div class='add'>+static const struct dmi_system_id driver_denylist_dmi[] = {</div><div class='add'>+	{</div><div class='add'>+		/* No HDA in NVIDIA DGPU. BIOS disables it, but quirk_nvidia_hda() reenables. */</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"),</div><div class='add'>+		},</div><div class='add'>+		.driver_data = &amp;driver_denylist_ideapad_z570,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_controller_ops pci_hda_ops = {</div><div class='add'>+	.disable_msi_reset_irq = disable_msi_reset_irq,</div><div class='add'>+	.position_check = azx_position_check,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DECLARE_BITMAP(probed_devs, SNDRV_CARDS);</div><div class='add'>+</div><div class='add'>+static int azx_probe(struct pci_dev *pci,</div><div class='add'>+		     const struct pci_device_id *pci_id)</div><div class='add'>+{</div><div class='add'>+	const struct dmi_system_id *dmi;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	bool schedule_probe;</div><div class='add'>+	int dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pci_match_id(driver_denylist, pci)) {</div><div class='add'>+		dev_info(&amp;pci-&gt;dev, "Skipping the device on the denylist\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dmi = dmi_first_match(driver_denylist_dmi);</div><div class='add'>+	if (dmi &amp;&amp; pci_match_id(dmi-&gt;driver_data, pci)) {</div><div class='add'>+		dev_info(&amp;pci-&gt;dev, "Skipping the device on the DMI denylist\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = find_first_zero_bit(probed_devs, SNDRV_CARDS);</div><div class='add'>+	if (dev &gt;= SNDRV_CARDS)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!enable[dev]) {</div><div class='add'>+		set_bit(dev, probed_devs);</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * stop probe if another Intel's DSP driver should be activated</div><div class='add'>+	 */</div><div class='add'>+	if (dmic_detect) {</div><div class='add'>+		err = snd_intel_dsp_driver_probe(pci);</div><div class='add'>+		if (err != SND_INTEL_DSP_DRIVER_ANY &amp;&amp; err != SND_INTEL_DSP_DRIVER_LEGACY) {</div><div class='add'>+			dev_dbg(&amp;pci-&gt;dev, "HDAudio driver not selected, aborting probe\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_warn(&amp;pci-&gt;dev, "dmic_detect option is deprecated, pass snd-intel-dspcfg.dsp_driver=1 option instead\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+			   0, &amp;card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "Error creating card!\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = azx_create(card, pci, dev, pci_id-&gt;driver_data, &amp;chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+	card-&gt;private_data = chip;</div><div class='add'>+	hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pci, card);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_I915</div><div class='add'>+	/* bind with i915 if needed */</div><div class='add'>+	if (chip-&gt;driver_caps &amp; AZX_DCAPS_I915_COMPONENT) {</div><div class='add'>+		err = snd_hdac_i915_init(azx_bus(chip));</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			if (err == -EPROBE_DEFER)</div><div class='add'>+				goto out_free;</div><div class='add'>+</div><div class='add'>+			/* if the controller is bound only with HDMI/DP</div><div class='add'>+			 * (for HSW and BDW), we need to abort the probe;</div><div class='add'>+			 * for other chips, still continue probing as other</div><div class='add'>+			 * codecs can be on the same link.</div><div class='add'>+			 */</div><div class='add'>+			if (HDA_CONTROLLER_IN_GPU(pci)) {</div><div class='add'>+				dev_err_probe(card-&gt;dev, err,</div><div class='add'>+					     "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");</div><div class='add'>+</div><div class='add'>+				goto out_free;</div><div class='add'>+			} else {</div><div class='add'>+				/* don't bother any longer */</div><div class='add'>+				chip-&gt;driver_caps &amp;= ~AZX_DCAPS_I915_COMPONENT;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* HSW/BDW controllers need this power */</div><div class='add'>+		if (HDA_CONTROLLER_IN_GPU(pci))</div><div class='add'>+			hda-&gt;need_i915_power = true;</div><div class='add'>+	}</div><div class='add'>+#else</div><div class='add'>+	if (HDA_CONTROLLER_IN_GPU(pci))</div><div class='add'>+		dev_err(card-&gt;dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	err = register_vga_switcheroo(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Error registering vga_switcheroo client\n");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (check_hdmi_disabled(pci)) {</div><div class='add'>+		dev_info(card-&gt;dev, "VGA controller is disabled\n");</div><div class='add'>+		dev_info(card-&gt;dev, "Delaying initialization\n");</div><div class='add'>+		chip-&gt;disabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schedule_probe = !chip-&gt;disabled;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+	if (patch[dev] &amp;&amp; *patch[dev]) {</div><div class='add'>+		dev_info(card-&gt;dev, "Applying patch firmware '%s'\n",</div><div class='add'>+			 patch[dev]);</div><div class='add'>+		err = request_firmware_nowait(THIS_MODULE, true, patch[dev],</div><div class='add'>+					      &amp;pci-&gt;dev, GFP_KERNEL, card,</div><div class='add'>+					      azx_firmware_cb);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_free;</div><div class='add'>+		schedule_probe = false; /* continued in azx_firmware_cb() */</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_SND_HDA_PATCH_LOADER */</div><div class='add'>+</div><div class='add'>+	if (schedule_probe)</div><div class='add'>+		schedule_delayed_work(&amp;hda-&gt;probe_work, 0);</div><div class='add'>+</div><div class='add'>+	set_bit(dev, probed_devs);</div><div class='add'>+	if (chip-&gt;disabled)</div><div class='add'>+		complete_all(&amp;hda-&gt;probe_wait);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	pci_set_drvdata(pci, NULL);</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On some boards setting power_save to a non 0 value leads to clicking /</div><div class='add'>+ * popping sounds when ever we enter/leave powersaving mode. Ideally we would</div><div class='add'>+ * figure out how to avoid these sounds, but that is not always feasible.</div><div class='add'>+ * So we keep a list of devices where we disable powersaving as its known</div><div class='add'>+ * to causes problems on these devices.</div><div class='add'>+ */</div><div class='add'>+static const struct snd_pci_quirk power_save_denylist[] = {</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x0397, "Asrock N68C-S UCC", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0497, "Dell Precision T3600", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	/* Note the P55A-UD3 and Z87-D3HP share the subsys id for the HDA dev */</div><div class='add'>+	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P55A-UD3 / Z87-D3HP", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2040, "Intel DZ77BH-55K", 0),</div><div class='add'>+	/* https://bugzilla.kernel.org/show_bug.cgi?id=199607 */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2057, "Intel NUC5i7RYB", 0),</div><div class='add'>+	/* https://bugs.launchpad.net/bugs/1821663 */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2064, "Intel SDP 8086:2064", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1520902 */</div><div class='add'>+	SND_PCI_QUIRK(0x8086, 0x2068, "Intel NUC7i3BNB", 0),</div><div class='add'>+	/* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x316e, "Lenovo ThinkCentre M70q", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0),</div><div class='add'>+	/* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0),</div><div class='add'>+	/* https://bugs.launchpad.net/bugs/1821663 */</div><div class='add'>+	SND_PCI_QUIRK(0x1631, 0xe017, "Packard Bell NEC IMEDIA 5204", 0),</div><div class='add'>+	/* KONTRON SinglePC may cause a stall at runtime resume */</div><div class='add'>+	SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0),</div><div class='add'>+	/* Dell ALC3271 */</div><div class='add'>+	SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0),</div><div class='add'>+	/* https://bugzilla.kernel.org/show_bug.cgi?id=220210 */</div><div class='add'>+	SND_PCI_QUIRK(0x17aa, 0x5079, "Lenovo Thinkpad E15", 0),</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void set_default_power_save(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	int val = power_save;</div><div class='add'>+</div><div class='add'>+	if (pm_blacklist &lt; 0) {</div><div class='add'>+		const struct snd_pci_quirk *q;</div><div class='add'>+</div><div class='add'>+		q = snd_pci_quirk_lookup(chip-&gt;pci, power_save_denylist);</div><div class='add'>+		if (q &amp;&amp; val) {</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev, "device %04x:%04x is on the power_save denylist, forcing power_save to 0\n",</div><div class='add'>+				 q-&gt;subvendor, q-&gt;subdevice);</div><div class='add'>+			val = 0;</div><div class='add'>+			hda-&gt;runtime_pm_disabled = 1;</div><div class='add'>+		}</div><div class='add'>+	} else if (pm_blacklist &gt; 0) {</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "Forcing power_save to 0 via option\n");</div><div class='add'>+		val = 0;</div><div class='add'>+	}</div><div class='add'>+	snd_hda_set_power_save(&amp;chip-&gt;bus, val * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */</div><div class='add'>+static const unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {</div><div class='add'>+	[AZX_DRIVER_NVIDIA] = 8,</div><div class='add'>+	[AZX_DRIVER_TERA] = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int azx_probe_continue(struct azx *chip)</div><div class='add'>+{</div><div class='add'>+	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct pci_dev *pci = chip-&gt;pci;</div><div class='add'>+	int dev = chip-&gt;dev_index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;disabled || hda-&gt;init_failed)</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (hda-&gt;probe_retry)</div><div class='add'>+		goto probe_retry;</div><div class='add'>+</div><div class='add'>+	to_hda_bus(bus)-&gt;bus_probing = 1;</div><div class='add'>+	hda-&gt;probe_continued = 1;</div><div class='add'>+</div><div class='add'>+	/* Request display power well for the HDA controller or codec. For</div><div class='add'>+	 * Haswell/Broadwell, both the display HDA controller and codec need</div><div class='add'>+	 * this power. For other platforms, like Baytrail/Braswell, only the</div><div class='add'>+	 * display codec needs the power and it can be released after probe.</div><div class='add'>+	 */</div><div class='add'>+	display_power(chip, true);</div><div class='add'>+</div><div class='add'>+	err = azx_first_init(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='add'>+	chip-&gt;beep_mode = beep_mode[dev];</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	chip-&gt;ctl_dev_id = ctl_dev_id;</div><div class='add'>+</div><div class='add'>+	/* create codec instances */</div><div class='add'>+	if (bus-&gt;codec_mask) {</div><div class='add'>+		err = azx_probe_codecs(chip, azx_max_codecs[chip-&gt;driver_type]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='add'>+	if (chip-&gt;fw) {</div><div class='add'>+		err = snd_hda_load_patch(&amp;chip-&gt;bus, chip-&gt;fw-&gt;size,</div><div class='add'>+					 chip-&gt;fw-&gt;data);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+ probe_retry:</div><div class='add'>+	if (bus-&gt;codec_mask &amp;&amp; !(probe_only[dev] &amp; 1)) {</div><div class='add'>+		err = azx_codec_configure(chip);</div><div class='add'>+		if (err) {</div><div class='add'>+			if ((chip-&gt;driver_caps &amp; AZX_DCAPS_RETRY_PROBE) &amp;&amp;</div><div class='add'>+			    ++hda-&gt;probe_retry &lt; 60) {</div><div class='add'>+				schedule_delayed_work(&amp;hda-&gt;probe_work,</div><div class='add'>+						      msecs_to_jiffies(1000));</div><div class='add'>+				return 0; /* keep things up */</div><div class='add'>+			}</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "Cannot probe codecs, giving up\n");</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(chip-&gt;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	setup_vga_switcheroo_runtime_pm(chip);</div><div class='add'>+</div><div class='add'>+	chip-&gt;running = 1;</div><div class='add'>+	azx_add_card_list(chip);</div><div class='add'>+</div><div class='add'>+	set_default_power_save(chip);</div><div class='add'>+</div><div class='add'>+	if (azx_has_pm_runtime(chip)) {</div><div class='add'>+		pm_runtime_use_autosuspend(&amp;pci-&gt;dev);</div><div class='add'>+		pm_runtime_allow(&amp;pci-&gt;dev);</div><div class='add'>+		pm_runtime_put_autosuspend(&amp;pci-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		pci_set_drvdata(pci, NULL);</div><div class='add'>+		snd_card_free(chip-&gt;card);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!hda-&gt;need_i915_power)</div><div class='add'>+		display_power(chip, false);</div><div class='add'>+	complete_all(&amp;hda-&gt;probe_wait);</div><div class='add'>+	to_hda_bus(bus)-&gt;bus_probing = 0;</div><div class='add'>+	hda-&gt;probe_retry = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_remove(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	struct hda_intel *hda;</div><div class='add'>+</div><div class='add'>+	if (card) {</div><div class='add'>+		/* cancel the pending probing work */</div><div class='add'>+		chip = card-&gt;private_data;</div><div class='add'>+		hda = container_of(chip, struct hda_intel, chip);</div><div class='add'>+		/* FIXME: below is an ugly workaround.</div><div class='add'>+		 * Both device_release_driver() and driver_probe_device()</div><div class='add'>+		 * take *both* the device's and its parent's lock before</div><div class='add'>+		 * calling the remove() and probe() callbacks.  The codec</div><div class='add'>+		 * probe takes the locks of both the codec itself and its</div><div class='add'>+		 * parent, i.e. the PCI controller dev.  Meanwhile, when</div><div class='add'>+		 * the PCI controller is unbound, it takes its lock, too</div><div class='add'>+		 * ==&gt; ouch, a deadlock!</div><div class='add'>+		 * As a workaround, we unlock temporarily here the controller</div><div class='add'>+		 * device during cancel_work_sync() call.</div><div class='add'>+		 */</div><div class='add'>+		device_unlock(&amp;pci-&gt;dev);</div><div class='add'>+		cancel_delayed_work_sync(&amp;hda-&gt;probe_work);</div><div class='add'>+		device_lock(&amp;pci-&gt;dev);</div><div class='add'>+</div><div class='add'>+		clear_bit(chip-&gt;dev_index, probed_devs);</div><div class='add'>+		pci_set_drvdata(pci, NULL);</div><div class='add'>+		snd_card_free(card);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_shutdown(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!card)</div><div class='add'>+		return;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	if (chip &amp;&amp; chip-&gt;running)</div><div class='add'>+		__azx_shutdown_chip(chip, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PCI IDs */</div><div class='add'>+static const struct pci_device_id azx_ids[] = {</div><div class='add'>+	/* CPT */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },</div><div class='add'>+	/* PBG */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },</div><div class='add'>+	/* Panther Point */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },</div><div class='add'>+	/* Lynx Point */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* 9 Series */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* Wellsburg */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* Lewisburg */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Lynx Point-LP */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* Lynx Point-LP */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* Wildcat Point-LP */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },</div><div class='add'>+	/* Skylake (Sunrise Point) */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Skylake-LP (Sunrise Point-LP) */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Kabylake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Kabylake-LP */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Kabylake-H */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Coffelake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Cannonlake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* CometLake-LP */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* CometLake-H */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* CometLake-S */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* CometLake-R */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Icelake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Icelake-H */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Jasperlake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Tigerlake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Tigerlake-H */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* DG1 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* DG2 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Alderlake-S */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Alderlake-P */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Alderlake-M */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Alderlake-N */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Elkhart Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Raptor Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Battlemage */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_BMG, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Lunarlake-P */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },</div><div class='add'>+	/* Arrow Lake-S */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Arrow Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ARL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },</div><div class='add'>+	/* Panther Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_PTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },</div><div class='add'>+	/* Panther Lake-H */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_PTL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },</div><div class='add'>+	/* Wildcat Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_WCL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },</div><div class='add'>+	/* Nova Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },</div><div class='add'>+	/* Apollolake (Broxton-P) */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },</div><div class='add'>+	/* Gemini-Lake */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },</div><div class='add'>+	/* Haswell */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },</div><div class='add'>+	/* Broadwell */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },</div><div class='add'>+	/* 5 Series/3400 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },</div><div class='add'>+	/* Poulsbo */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |</div><div class='add'>+	  AZX_DCAPS_POSFIX_LPIB) },</div><div class='add'>+	/* Oaktrail */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },</div><div class='add'>+	/* BayTrail */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },</div><div class='add'>+	/* Braswell */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },</div><div class='add'>+	/* ICH6 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH7 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ESB2 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH8 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH9 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH9 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH10 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* ICH10 */</div><div class='add'>+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },</div><div class='add'>+	/* Generic Intel */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },</div><div class='add'>+	/* ATI SB 450/600/700/800/900 */</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x437b),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x4383),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },</div><div class='add'>+	/* AMD Hudson */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x780d),</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },</div><div class='add'>+	/* AMD, X370 &amp; co */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x1457),</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },</div><div class='add'>+	/* AMD, X570 &amp; co */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x1487),</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },</div><div class='add'>+	/* AMD Stoney */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x157a),</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |</div><div class='add'>+			 AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	/* AMD Raven */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x15e3),</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },</div><div class='add'>+	/* ATI HDMI */</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x0002),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x1308),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x157a),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x15b3),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x793b),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x7919),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x960f),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x970f),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x9840),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa00),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa08),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa10),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa18),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa20),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa28),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa30),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa38),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa40),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa48),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa50),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa58),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa60),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa68),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa80),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa88),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa90),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaa98),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0x9902),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaaa0),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaaa8),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaab0),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaac0),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaac8),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaad8),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaae0),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaae8),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaaf0),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xaaf8),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab00),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab08),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab10),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab18),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab20),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab28),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab30),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab38),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	{ PCI_VDEVICE(ATI, 0xab40),</div><div class='add'>+	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |</div><div class='add'>+	  AZX_DCAPS_PM_RUNTIME },</div><div class='add'>+	/* GLENFLY */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	  AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	/* VIA VT8251/VT8237A */</div><div class='add'>+	{ PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },</div><div class='add'>+	/* VIA GFX VT7122/VX900 */</div><div class='add'>+	{ PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },</div><div class='add'>+	/* VIA GFX VT6122/VX11 */</div><div class='add'>+	{ PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },</div><div class='add'>+	/* SIS966 */</div><div class='add'>+	{ PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },</div><div class='add'>+	/* ULI M5461 */</div><div class='add'>+	{ PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },</div><div class='add'>+	/* NVIDIA MCP */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_NVIDIA | AZX_DCAPS_PRESET_NVIDIA },</div><div class='add'>+	/* Teradici */</div><div class='add'>+	{ PCI_DEVICE(0x6549, 0x1200),</div><div class='add'>+	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	{ PCI_DEVICE(0x6549, 0x2200),</div><div class='add'>+	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	/* Creative X-Fi (CA0110-IBG) */</div><div class='add'>+	/* CTHDA chips */</div><div class='add'>+	{ PCI_VDEVICE(CREATIVE, 0x0010),</div><div class='add'>+	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },</div><div class='add'>+	{ PCI_VDEVICE(CREATIVE, 0x0012),</div><div class='add'>+	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },</div><div class='add'>+#if !IS_ENABLED(CONFIG_SND_CTXFI)</div><div class='add'>+	/* the following entry conflicts with snd-ctxfi driver,</div><div class='add'>+	 * as ctxfi driver mutates from HD-audio to native mode with</div><div class='add'>+	 * a special command sequence.</div><div class='add'>+	 */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |</div><div class='add'>+	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },</div><div class='add'>+#else</div><div class='add'>+	/* this entry seems still valid -- i.e. without emu20kx chip */</div><div class='add'>+	{ PCI_VDEVICE(CREATIVE, 0x0009),</div><div class='add'>+	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |</div><div class='add'>+	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },</div><div class='add'>+#endif</div><div class='add'>+	/* CM8888 */</div><div class='add'>+	{ PCI_VDEVICE(CMEDIA, 0x5011),</div><div class='add'>+	  .driver_data = AZX_DRIVER_CMEDIA |</div><div class='add'>+	  AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },</div><div class='add'>+	/* Vortex86MX */</div><div class='add'>+	{ PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },</div><div class='add'>+	/* VMware HDAudio */</div><div class='add'>+	{ PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },</div><div class='add'>+	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_ANY_ID),</div><div class='add'>+	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='add'>+	  .class_mask = 0xffffff,</div><div class='add'>+	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },</div><div class='add'>+	/* Zhaoxin */</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x9141),</div><div class='add'>+	 .driver_data = AZX_DRIVER_ZHAOXINHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	 AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x9142),</div><div class='add'>+	 .driver_data = AZX_DRIVER_ZHAOXINHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	 AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x9144),</div><div class='add'>+	 .driver_data = AZX_DRIVER_ZHAOXINHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	 AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x9145),</div><div class='add'>+	 .driver_data = AZX_DRIVER_ZHAOXINHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	 AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	{ PCI_VDEVICE(ZHAOXIN, 0x9146),</div><div class='add'>+	 .driver_data = AZX_DRIVER_ZHAOXINHDMI | AZX_DCAPS_POSFIX_LPIB |</div><div class='add'>+	 AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },</div><div class='add'>+	/* Loongson HDAudio*/</div><div class='add'>+	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),</div><div class='add'>+	  .driver_data = AZX_DRIVER_LOONGSON | AZX_DCAPS_NO_TCSEL },</div><div class='add'>+	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),</div><div class='add'>+	  .driver_data = AZX_DRIVER_LOONGSON | AZX_DCAPS_NO_TCSEL },</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, azx_ids);</div><div class='add'>+</div><div class='add'>+/* pci_driver definition */</div><div class='add'>+static struct pci_driver azx_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.id_table = azx_ids,</div><div class='add'>+	.probe = azx_probe,</div><div class='add'>+	.remove = azx_remove,</div><div class='add'>+	.shutdown = azx_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = pm_ptr(&amp;azx_pm),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(azx_driver);</div><div class='head'>diff --git a/sound/hda/controllers/intel.h b/sound/hda/controllers/intel.h<br/>new file mode 100644<br/>index 000000000000..2d1725f86ef1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/intel.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/intel.h</a></div><div class='hunk'>@@ -0,0 +1,38 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+#ifndef __SOUND_HDA_INTEL_H</div><div class='add'>+#define __SOUND_HDA_INTEL_H</div><div class='add'>+</div><div class='add'>+#include "hda_controller.h"</div><div class='add'>+</div><div class='add'>+struct hda_intel {</div><div class='add'>+	struct azx chip;</div><div class='add'>+</div><div class='add'>+	/* for pending irqs */</div><div class='add'>+	struct work_struct irq_pending_work;</div><div class='add'>+</div><div class='add'>+	/* sync probing */</div><div class='add'>+	struct completion probe_wait;</div><div class='add'>+	struct delayed_work probe_work;</div><div class='add'>+</div><div class='add'>+	/* card list (for power_save trigger) */</div><div class='add'>+	struct list_head list;</div><div class='add'>+</div><div class='add'>+	/* extra flags */</div><div class='add'>+	unsigned int irq_pending_warned:1;</div><div class='add'>+	unsigned int probe_continued:1;</div><div class='add'>+	unsigned int runtime_pm_disabled:1;</div><div class='add'>+</div><div class='add'>+	/* vga_switcheroo setup */</div><div class='add'>+	unsigned int use_vga_switcheroo:1;</div><div class='add'>+	unsigned int vga_switcheroo_registered:1;</div><div class='add'>+	unsigned int init_failed:1; /* delayed init failed */</div><div class='add'>+	unsigned int freed:1; /* resources already released */</div><div class='add'>+</div><div class='add'>+	bool need_i915_power:1; /* the hda controller needs i915 power */</div><div class='add'>+</div><div class='add'>+	int probe_retry;	/* being probe-retry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/hda/controllers/intel_trace.h b/sound/hda/controllers/intel_trace.h<br/>new file mode 100644<br/>index 000000000000..fb10ab9e7e55<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/intel_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/intel_trace.h</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM hda_intel</div><div class='add'>+#define TRACE_INCLUDE_FILE intel_trace</div><div class='add'>+</div><div class='add'>+#if !defined(_TRACE_HDA_INTEL_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _TRACE_HDA_INTEL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(hda_pm,</div><div class='add'>+	TP_PROTO(struct azx *chip),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(chip),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(int, dev_index)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;dev_index = (chip)-&gt;dev_index;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("card index: %d", __entry-&gt;dev_index)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hda_pm, azx_suspend,</div><div class='add'>+	TP_PROTO(struct azx *chip),</div><div class='add'>+	TP_ARGS(chip)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hda_pm, azx_resume,</div><div class='add'>+	TP_PROTO(struct azx *chip),</div><div class='add'>+	TP_ARGS(chip)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hda_pm, azx_runtime_suspend,</div><div class='add'>+	TP_PROTO(struct azx *chip),</div><div class='add'>+	TP_ARGS(chip)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hda_pm, azx_runtime_resume,</div><div class='add'>+	TP_PROTO(struct azx *chip),</div><div class='add'>+	TP_ARGS(chip)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* _TRACE_HDA_INTEL_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/hda/controllers/tegra.c b/sound/hda/controllers/tegra.c<br/>new file mode 100644<br/>index 000000000000..6ab338f37db5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/controllers/tegra.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/controllers/tegra.c</a></div><div class='hunk'>@@ -0,0 +1,652 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ * Implementation of primary ALSA driver code base for NVIDIA Tegra HDA.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/hda_codec.h&gt;</div><div class='add'>+#include "hda_controller.h"</div><div class='add'>+</div><div class='add'>+/* Defines for Nvidia Tegra HDA support */</div><div class='add'>+#define HDA_BAR0           0x8000</div><div class='add'>+</div><div class='add'>+#define HDA_CFG_CMD        0x1004</div><div class='add'>+#define HDA_CFG_BAR0       0x1010</div><div class='add'>+</div><div class='add'>+#define HDA_ENABLE_IO_SPACE       (1 &lt;&lt; 0)</div><div class='add'>+#define HDA_ENABLE_MEM_SPACE      (1 &lt;&lt; 1)</div><div class='add'>+#define HDA_ENABLE_BUS_MASTER     (1 &lt;&lt; 2)</div><div class='add'>+#define HDA_ENABLE_SERR           (1 &lt;&lt; 8)</div><div class='add'>+#define HDA_DISABLE_INTR          (1 &lt;&lt; 10)</div><div class='add'>+#define HDA_BAR0_INIT_PROGRAM     0xFFFFFFFF</div><div class='add'>+#define HDA_BAR0_FINAL_PROGRAM    (1 &lt;&lt; 14)</div><div class='add'>+</div><div class='add'>+/* IPFS */</div><div class='add'>+#define HDA_IPFS_CONFIG           0x180</div><div class='add'>+#define HDA_IPFS_EN_FPCI          0x1</div><div class='add'>+</div><div class='add'>+#define HDA_IPFS_FPCI_BAR0        0x80</div><div class='add'>+#define HDA_FPCI_BAR0_START       0x40</div><div class='add'>+</div><div class='add'>+#define HDA_IPFS_INTR_MASK        0x188</div><div class='add'>+#define HDA_IPFS_EN_INTR          (1 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+/* FPCI */</div><div class='add'>+#define FPCI_DBG_CFG_2		  0x10F4</div><div class='add'>+#define FPCI_GCAP_NSDO_SHIFT	  18</div><div class='add'>+#define FPCI_GCAP_NSDO_MASK	  (0x3 &lt;&lt; FPCI_GCAP_NSDO_SHIFT)</div><div class='add'>+</div><div class='add'>+/* max number of SDs */</div><div class='add'>+#define NUM_CAPTURE_SD 1</div><div class='add'>+#define NUM_PLAYBACK_SD 1</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Tegra194 does not reflect correct number of SDO lines. Below macro</div><div class='add'>+ * is used to update the GCAP register to workaround the issue.</div><div class='add'>+ */</div><div class='add'>+#define TEGRA194_NUM_SDO_LINES	  4</div><div class='add'>+</div><div class='add'>+struct hda_tegra_soc {</div><div class='add'>+	bool has_hda2codec_2x_reset;</div><div class='add'>+	bool has_hda2hdmi;</div><div class='add'>+	bool has_hda2codec_2x;</div><div class='add'>+	bool input_stream;</div><div class='add'>+	bool always_on;</div><div class='add'>+	bool requires_init;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hda_tegra {</div><div class='add'>+	struct azx chip;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct reset_control_bulk_data resets[3];</div><div class='add'>+	struct clk_bulk_data clocks[3];</div><div class='add'>+	unsigned int nresets;</div><div class='add'>+	unsigned int nclocks;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	struct work_struct probe_work;</div><div class='add'>+	const struct hda_tegra_soc *soc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;</div><div class='add'>+module_param(power_save, bint, 0644);</div><div class='add'>+MODULE_PARM_DESC(power_save,</div><div class='add'>+		 "Automatic power-saving timeout (in seconds, 0 = disable).");</div><div class='add'>+#else</div><div class='add'>+#define power_save	0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct hda_controller_ops hda_tegra_ops; /* nothing special */</div><div class='add'>+</div><div class='add'>+static void hda_tegra_init(struct hda_tegra *hda)</div><div class='add'>+{</div><div class='add'>+	u32 v;</div><div class='add'>+</div><div class='add'>+	/* Enable PCI access */</div><div class='add'>+	v = readl(hda-&gt;regs + HDA_IPFS_CONFIG);</div><div class='add'>+	v |= HDA_IPFS_EN_FPCI;</div><div class='add'>+	writel(v, hda-&gt;regs + HDA_IPFS_CONFIG);</div><div class='add'>+</div><div class='add'>+	/* Enable MEM/IO space and bus master */</div><div class='add'>+	v = readl(hda-&gt;regs + HDA_CFG_CMD);</div><div class='add'>+	v &amp;= ~HDA_DISABLE_INTR;</div><div class='add'>+	v |= HDA_ENABLE_MEM_SPACE | HDA_ENABLE_IO_SPACE |</div><div class='add'>+		HDA_ENABLE_BUS_MASTER | HDA_ENABLE_SERR;</div><div class='add'>+	writel(v, hda-&gt;regs + HDA_CFG_CMD);</div><div class='add'>+</div><div class='add'>+	writel(HDA_BAR0_INIT_PROGRAM, hda-&gt;regs + HDA_CFG_BAR0);</div><div class='add'>+	writel(HDA_BAR0_FINAL_PROGRAM, hda-&gt;regs + HDA_CFG_BAR0);</div><div class='add'>+	writel(HDA_FPCI_BAR0_START, hda-&gt;regs + HDA_IPFS_FPCI_BAR0);</div><div class='add'>+</div><div class='add'>+	v = readl(hda-&gt;regs + HDA_IPFS_INTR_MASK);</div><div class='add'>+	v |= HDA_IPFS_EN_INTR;</div><div class='add'>+	writel(v, hda-&gt;regs + HDA_IPFS_INTR_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * power management</div><div class='add'>+ */</div><div class='add'>+static int hda_tegra_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = pm_runtime_force_suspend(dev);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_tegra_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = pm_runtime_force_resume(dev);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_tegra_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);</div><div class='add'>+</div><div class='add'>+	if (chip &amp;&amp; chip-&gt;running) {</div><div class='add'>+		/* enable controller wake up event */</div><div class='add'>+		azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) |</div><div class='add'>+			   STATESTS_INT_MASK);</div><div class='add'>+</div><div class='add'>+		azx_stop_chip(chip);</div><div class='add'>+		azx_enter_link_reset(chip);</div><div class='add'>+	}</div><div class='add'>+	clk_bulk_disable_unprepare(hda-&gt;nclocks, hda-&gt;clocks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_tegra_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct azx *chip = card-&gt;private_data;</div><div class='add'>+	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;running) {</div><div class='add'>+		rc = reset_control_bulk_assert(hda-&gt;nresets, hda-&gt;resets);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = clk_bulk_prepare_enable(hda-&gt;nclocks, hda-&gt;clocks);</div><div class='add'>+	if (rc != 0)</div><div class='add'>+		return rc;</div><div class='add'>+	if (chip-&gt;running) {</div><div class='add'>+		if (hda-&gt;soc-&gt;requires_init)</div><div class='add'>+			hda_tegra_init(hda);</div><div class='add'>+</div><div class='add'>+		azx_init_chip(chip, 1);</div><div class='add'>+		/* disable controller wake up event*/</div><div class='add'>+		azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) &amp;</div><div class='add'>+			   ~STATESTS_INT_MASK);</div><div class='add'>+	} else {</div><div class='add'>+		usleep_range(10, 100);</div><div class='add'>+</div><div class='add'>+		rc = reset_control_bulk_deassert(hda-&gt;nresets, hda-&gt;resets);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops hda_tegra_pm = {</div><div class='add'>+	SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume)</div><div class='add'>+	RUNTIME_PM_OPS(hda_tegra_runtime_suspend, hda_tegra_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hda_tegra_dev_disconnect(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = device-&gt;device_data;</div><div class='add'>+</div><div class='add'>+	chip-&gt;bus.shutdown = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * destructor</div><div class='add'>+ */</div><div class='add'>+static int hda_tegra_dev_free(struct snd_device *device)</div><div class='add'>+{</div><div class='add'>+	struct azx *chip = device-&gt;device_data;</div><div class='add'>+	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;hda-&gt;probe_work);</div><div class='add'>+	if (azx_bus(chip)-&gt;chip_init) {</div><div class='add'>+		azx_stop_all_streams(chip);</div><div class='add'>+		azx_stop_chip(chip);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	azx_free_stream_pages(chip);</div><div class='add'>+	azx_free_streams(chip);</div><div class='add'>+	snd_hdac_bus_exit(azx_bus(chip));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	hda-&gt;regs = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;res);</div><div class='add'>+	if (IS_ERR(hda-&gt;regs))</div><div class='add'>+		return PTR_ERR(hda-&gt;regs);</div><div class='add'>+</div><div class='add'>+	bus-&gt;remap_addr = hda-&gt;regs + HDA_BAR0;</div><div class='add'>+	bus-&gt;addr = res-&gt;start + HDA_BAR0;</div><div class='add'>+</div><div class='add'>+	if (hda-&gt;soc-&gt;requires_init)</div><div class='add'>+		hda_tegra_init(hda);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);</div><div class='add'>+	struct hdac_bus *bus = azx_bus(chip);</div><div class='add'>+	struct snd_card *card = chip-&gt;card;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned short gcap;</div><div class='add'>+	int irq_id = platform_get_irq(pdev, 0);</div><div class='add'>+	const char *sname, *drv_name = "tegra-hda";</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	if (irq_id &lt; 0)</div><div class='add'>+		return irq_id;</div><div class='add'>+</div><div class='add'>+	err = hda_tegra_init_chip(chip, pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = devm_request_irq(chip-&gt;card-&gt;dev, irq_id, azx_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"unable to request IRQ %d, disabling device\n",</div><div class='add'>+			irq_id);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	bus-&gt;irq = irq_id;</div><div class='add'>+	bus-&gt;dma_stop_delay = 100;</div><div class='add'>+	card-&gt;sync_irq = bus-&gt;irq;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tegra194 has 4 SDO lines and the STRIPE can be used to</div><div class='add'>+	 * indicate how many of the SDO lines the stream should be</div><div class='add'>+	 * striped. But GCAP register does not reflect the true</div><div class='add'>+	 * capability of HW. Below workaround helps to fix this.</div><div class='add'>+	 *</div><div class='add'>+	 * GCAP_NSDO is bits 19:18 in T_AZA_DBG_CFG_2,</div><div class='add'>+	 * 0 for 1 SDO, 1 for 2 SDO, 2 for 4 SDO lines.</div><div class='add'>+	 */</div><div class='add'>+	if (of_device_is_compatible(np, "nvidia,tegra194-hda")) {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		dev_info(card-&gt;dev, "Override SDO lines to %u\n",</div><div class='add'>+			 TEGRA194_NUM_SDO_LINES);</div><div class='add'>+</div><div class='add'>+		val = readl(hda-&gt;regs + FPCI_DBG_CFG_2) &amp; ~FPCI_GCAP_NSDO_MASK;</div><div class='add'>+		val |= (TEGRA194_NUM_SDO_LINES &gt;&gt; 1) &lt;&lt; FPCI_GCAP_NSDO_SHIFT;</div><div class='add'>+		writel(val, hda-&gt;regs + FPCI_DBG_CFG_2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gcap = azx_readw(chip, GCAP);</div><div class='add'>+	dev_dbg(card-&gt;dev, "chipset global capabilities = 0x%x\n", gcap);</div><div class='add'>+</div><div class='add'>+	chip-&gt;align_buffer_size = 1;</div><div class='add'>+</div><div class='add'>+	/* read number of streams from GCAP register instead of using</div><div class='add'>+	 * hardcoded value</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;capture_streams = (gcap &gt;&gt; 8) &amp; 0x0f;</div><div class='add'>+</div><div class='add'>+	/* The GCAP register on Tegra234 implies no Input Streams(ISS) support,</div><div class='add'>+	 * but the HW output stream descriptor programming should start with</div><div class='add'>+	 * offset 0x20*4 from base stream descriptor address. This will be a</div><div class='add'>+	 * problem while calculating the offset for output stream descriptor</div><div class='add'>+	 * which will be considering input stream also. So here output stream</div><div class='add'>+	 * starts with offset 0 which is wrong as HW register for output stream</div><div class='add'>+	 * offset starts with 4.</div><div class='add'>+	 */</div><div class='add'>+	if (!hda-&gt;soc-&gt;input_stream)</div><div class='add'>+		chip-&gt;capture_streams = 4;</div><div class='add'>+</div><div class='add'>+	chip-&gt;playback_streams = (gcap &gt;&gt; 12) &amp; 0x0f;</div><div class='add'>+	if (!chip-&gt;playback_streams &amp;&amp; !chip-&gt;capture_streams) {</div><div class='add'>+		/* gcap didn't give any info, switching to old method */</div><div class='add'>+		chip-&gt;playback_streams = NUM_PLAYBACK_SD;</div><div class='add'>+		chip-&gt;capture_streams = NUM_CAPTURE_SD;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;capture_index_offset = 0;</div><div class='add'>+	chip-&gt;playback_index_offset = chip-&gt;capture_streams;</div><div class='add'>+	chip-&gt;num_streams = chip-&gt;playback_streams + chip-&gt;capture_streams;</div><div class='add'>+</div><div class='add'>+	/* initialize streams */</div><div class='add'>+	err = azx_init_streams(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "failed to initialize streams: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = azx_alloc_stream_pages(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "failed to allocate stream pages: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize chip */</div><div class='add'>+	azx_init_chip(chip, 1);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Playback (for 44.1K/48K, 2-channel, 16-bps) fails with</div><div class='add'>+	 * 4 SDO lines due to legacy design limitation. Following</div><div class='add'>+	 * is, from HD Audio Specification (Revision 1.0a), used to</div><div class='add'>+	 * control striping of the stream across multiple SDO lines</div><div class='add'>+	 * for sample rates &lt;= 48K.</div><div class='add'>+	 *</div><div class='add'>+	 * { ((num_channels * bits_per_sample) / number of SDOs) &gt;= 8 }</div><div class='add'>+	 *</div><div class='add'>+	 * Due to legacy design issue it is recommended that above</div><div class='add'>+	 * ratio must be greater than 8. Since number of SDO lines is</div><div class='add'>+	 * in powers of 2, next available ratio is 16 which can be</div><div class='add'>+	 * used as a limiting factor here.</div><div class='add'>+	 */</div><div class='add'>+	if (of_device_is_compatible(np, "nvidia,tegra30-hda"))</div><div class='add'>+		chip-&gt;bus.core.sdo_limit = 16;</div><div class='add'>+</div><div class='add'>+	/* codec detection */</div><div class='add'>+	if (!bus-&gt;codec_mask) {</div><div class='add'>+		dev_err(card-&gt;dev, "no codecs found!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* driver name */</div><div class='add'>+	strscpy(card-&gt;driver, drv_name);</div><div class='add'>+	/* shortname for card */</div><div class='add'>+	sname = of_get_property(np, "nvidia,model", NULL);</div><div class='add'>+	if (!sname)</div><div class='add'>+		sname = drv_name;</div><div class='add'>+	if (strlen(sname) &gt; sizeof(card-&gt;shortname))</div><div class='add'>+		dev_info(card-&gt;dev, "truncating shortname for card\n");</div><div class='add'>+	strscpy(card-&gt;shortname, sname);</div><div class='add'>+</div><div class='add'>+	/* longname for card */</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "%s at 0x%lx irq %i",</div><div class='add'>+		 card-&gt;shortname, bus-&gt;addr, bus-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * constructor</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void hda_tegra_probe_work(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static int hda_tegra_create(struct snd_card *card,</div><div class='add'>+			    unsigned int driver_caps,</div><div class='add'>+			    struct hda_tegra *hda)</div><div class='add'>+{</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='add'>+		.dev_disconnect = hda_tegra_dev_disconnect,</div><div class='add'>+		.dev_free = hda_tegra_dev_free,</div><div class='add'>+	};</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	chip = &amp;hda-&gt;chip;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='add'>+	chip-&gt;card = card;</div><div class='add'>+	chip-&gt;ops = &amp;hda_tegra_ops;</div><div class='add'>+	chip-&gt;driver_caps = driver_caps;</div><div class='add'>+	chip-&gt;driver_type = driver_caps &amp; 0xff;</div><div class='add'>+	chip-&gt;dev_index = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;chip-&gt;pcm_list);</div><div class='add'>+</div><div class='add'>+	chip-&gt;codec_probe_mask = -1;</div><div class='add'>+</div><div class='add'>+	chip-&gt;single_cmd = false;</div><div class='add'>+	chip-&gt;snoop = true;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;hda-&gt;probe_work, hda_tegra_probe_work);</div><div class='add'>+</div><div class='add'>+	err = azx_bus_init(chip, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	chip-&gt;bus.core.sync_write = 0;</div><div class='add'>+	chip-&gt;bus.core.needs_damn_long_delay = 1;</div><div class='add'>+	chip-&gt;bus.core.aligned_mmio = 1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * HDA power domain and clocks are always on for Tegra264 and</div><div class='add'>+	 * the jack detection logic would work always, so no need of</div><div class='add'>+	 * jack polling mechanism running.</div><div class='add'>+	 */</div><div class='add'>+	if (!hda-&gt;soc-&gt;always_on) {</div><div class='add'>+		chip-&gt;jackpoll_interval = msecs_to_jiffies(5000);</div><div class='add'>+		chip-&gt;bus.jackpoll_in_suspend = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Error creating device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hda_tegra_soc tegra30_data = {</div><div class='add'>+	.has_hda2codec_2x_reset = true,</div><div class='add'>+	.has_hda2hdmi = true,</div><div class='add'>+	.has_hda2codec_2x = true,</div><div class='add'>+	.input_stream = true,</div><div class='add'>+	.always_on = false,</div><div class='add'>+	.requires_init = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_tegra_soc tegra194_data = {</div><div class='add'>+	.has_hda2codec_2x_reset = false,</div><div class='add'>+	.has_hda2hdmi = true,</div><div class='add'>+	.has_hda2codec_2x = true,</div><div class='add'>+	.input_stream = true,</div><div class='add'>+	.always_on = false,</div><div class='add'>+	.requires_init = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_tegra_soc tegra234_data = {</div><div class='add'>+	.has_hda2codec_2x_reset = true,</div><div class='add'>+	.has_hda2hdmi = false,</div><div class='add'>+	.has_hda2codec_2x = true,</div><div class='add'>+	.input_stream = false,</div><div class='add'>+	.always_on = false,</div><div class='add'>+	.requires_init = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_tegra_soc tegra264_data = {</div><div class='add'>+	.has_hda2codec_2x_reset = true,</div><div class='add'>+	.has_hda2hdmi = false,</div><div class='add'>+	.has_hda2codec_2x = false,</div><div class='add'>+	.input_stream = false,</div><div class='add'>+	.always_on = true,</div><div class='add'>+	.requires_init = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hda_tegra_match[] = {</div><div class='add'>+	{ .compatible = "nvidia,tegra30-hda", .data = &amp;tegra30_data },</div><div class='add'>+	{ .compatible = "nvidia,tegra194-hda", .data = &amp;tegra194_data },</div><div class='add'>+	{ .compatible = "nvidia,tegra234-hda", .data = &amp;tegra234_data },</div><div class='add'>+	{ .compatible = "nvidia,tegra264-hda", .data = &amp;tegra264_data },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hda_tegra_match);</div><div class='add'>+</div><div class='add'>+static int hda_tegra_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const unsigned int driver_flags = AZX_DCAPS_CORBRP_SELF_CLEAR |</div><div class='add'>+					  AZX_DCAPS_PM_RUNTIME |</div><div class='add'>+					  AZX_DCAPS_4K_BDLE_BOUNDARY;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct azx *chip;</div><div class='add'>+	struct hda_tegra *hda;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hda = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*hda), GFP_KERNEL);</div><div class='add'>+	if (!hda)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	hda-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	chip = &amp;hda-&gt;chip;</div><div class='add'>+</div><div class='add'>+	hda-&gt;soc = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,</div><div class='add'>+			   THIS_MODULE, 0, &amp;card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error creating card!\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hda-&gt;resets[hda-&gt;nresets++].id = "hda";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * "hda2hdmi" is not applicable for Tegra234. This is because the</div><div class='add'>+	 * codec is separate IP and not under display SOR partition now.</div><div class='add'>+	 */</div><div class='add'>+	if (hda-&gt;soc-&gt;has_hda2hdmi)</div><div class='add'>+		hda-&gt;resets[hda-&gt;nresets++].id = "hda2hdmi";</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * "hda2codec_2x" reset is not present on Tegra194. Though DT would</div><div class='add'>+	 * be updated to reflect this, but to have backward compatibility</div><div class='add'>+	 * below is necessary.</div><div class='add'>+	 */</div><div class='add'>+	if (hda-&gt;soc-&gt;has_hda2codec_2x_reset)</div><div class='add'>+		hda-&gt;resets[hda-&gt;nresets++].id = "hda2codec_2x";</div><div class='add'>+</div><div class='add'>+	err = devm_reset_control_bulk_get_exclusive(&amp;pdev-&gt;dev, hda-&gt;nresets,</div><div class='add'>+						    hda-&gt;resets);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	hda-&gt;clocks[hda-&gt;nclocks++].id = "hda";</div><div class='add'>+	if (hda-&gt;soc-&gt;has_hda2hdmi)</div><div class='add'>+		hda-&gt;clocks[hda-&gt;nclocks++].id = "hda2hdmi";</div><div class='add'>+</div><div class='add'>+	if (hda-&gt;soc-&gt;has_hda2codec_2x)</div><div class='add'>+		hda-&gt;clocks[hda-&gt;nclocks++].id = "hda2codec_2x";</div><div class='add'>+</div><div class='add'>+	err = devm_clk_bulk_get(&amp;pdev-&gt;dev, hda-&gt;nclocks, hda-&gt;clocks);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	err = hda_tegra_create(card, driver_flags, hda);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+	card-&gt;private_data = chip;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, card);</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(hda-&gt;dev);</div><div class='add'>+	if (!azx_has_pm_runtime(chip))</div><div class='add'>+		pm_runtime_forbid(hda-&gt;dev);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;hda-&gt;probe_work);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_tegra_probe_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hda_tegra *hda = container_of(work, struct hda_tegra, probe_work);</div><div class='add'>+	struct azx *chip = &amp;hda-&gt;chip;</div><div class='add'>+	struct platform_device *pdev = to_platform_device(hda-&gt;dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_sync(hda-&gt;dev);</div><div class='add'>+	err = hda_tegra_first_init(chip, pdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	/* create codec instances */</div><div class='add'>+	err = azx_probe_codecs(chip, 8);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	err = azx_codec_configure(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(chip-&gt;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	chip-&gt;running = 1;</div><div class='add'>+	snd_hda_set_power_save(&amp;chip-&gt;bus, power_save * 1000);</div><div class='add'>+</div><div class='add'>+ out_free:</div><div class='add'>+	pm_runtime_put(hda-&gt;dev);</div><div class='add'>+	return; /* no error return from async probe */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_tegra_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	snd_card_free(dev_get_drvdata(&amp;pdev-&gt;dev));</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hda_tegra_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+	struct azx *chip;</div><div class='add'>+</div><div class='add'>+	if (!card)</div><div class='add'>+		return;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	if (chip &amp;&amp; chip-&gt;running)</div><div class='add'>+		azx_stop_chip(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver tegra_platform_hda = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "tegra-hda",</div><div class='add'>+		.pm = pm_ptr(&amp;hda_tegra_pm),</div><div class='add'>+		.of_match_table = hda_tegra_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = hda_tegra_probe,</div><div class='add'>+	.remove = hda_tegra_remove,</div><div class='add'>+	.shutdown = hda_tegra_shutdown,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(tegra_platform_hda);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Tegra HDA bus driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/sound/hda/core/Kconfig b/sound/hda/core/Kconfig<br/>new file mode 100644<br/>index 000000000000..bfdcf6384c52<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config SND_HDA_CORE</div><div class='add'>+	tristate</div><div class='add'>+	select REGMAP</div><div class='add'>+</div><div class='add'>+config SND_HDA_DSP_LOADER</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_HDA_ALIGNED_MMIO</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_HDA_COMPONENT</div><div class='add'>+	bool</div><div class='add'>+</div><div class='add'>+config SND_HDA_I915</div><div class='add'>+	bool</div><div class='add'>+	select SND_HDA_COMPONENT</div><div class='add'>+</div><div class='add'>+config SND_HDA_EXT_CORE</div><div class='add'>+       tristate</div><div class='add'>+       select SND_HDA_CORE</div><div class='add'>+</div><div class='add'>+config SND_INTEL_NHLT</div><div class='add'>+	bool</div><div class='add'>+	# this config should be selected only for Intel ACPI platforms.</div><div class='add'>+	# A fallback is provided so that the code compiles in all cases.</div><div class='add'>+</div><div class='add'>+config SND_INTEL_DSP_CONFIG</div><div class='add'>+	tristate</div><div class='add'>+	select ACPI_NHLT if ACPI</div><div class='add'>+	select SND_INTEL_NHLT if ACPI</div><div class='add'>+	select SND_INTEL_SOUNDWIRE_ACPI if ACPI</div><div class='add'>+	# this config should be selected only for Intel DSP platforms.</div><div class='add'>+	# A fallback is provided so that the code compiles in all cases.</div><div class='add'>+</div><div class='add'>+config SND_INTEL_SOUNDWIRE_ACPI</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config SND_INTEL_BYT_PREFER_SOF</div><div class='add'>+	bool "Prefer SOF driver over SST on BY/CHT platforms"</div><div class='add'>+	depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI &amp;&amp; SND_SOC_SOF_BAYTRAIL</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  The kernel has 2 drivers for the Low Power Engine audio-block on</div><div class='add'>+	  Bay- and Cherry-Trail SoCs. The old SST driver and the new SOF</div><div class='add'>+	  driver. If both drivers are enabled then the kernel will default</div><div class='add'>+	  to using the old SST driver, unless told otherwise through the</div><div class='add'>+	  snd_intel_dspcfg.dsp_driver module-parameter.</div><div class='add'>+</div><div class='add'>+	  Set this option to Y to make the kernel default to the new SOF</div><div class='add'>+	  driver instead.</div><div class='head'>diff --git a/sound/hda/core/Makefile b/sound/hda/core/Makefile<br/>new file mode 100644<br/>index 000000000000..89cb46143050<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/Makefile</a></div><div class='hunk'>@@ -0,0 +1,22 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-hda-core-y := hda_bus_type.o bus.o device.o sysfs.o \</div><div class='add'>+	regmap.o controller.o stream.o array.o hdmi_chmap.o</div><div class='add'>+</div><div class='add'>+snd-hda-core-y += trace.o</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='add'>+</div><div class='add'>+# for sync with i915 gfx driver</div><div class='add'>+snd-hda-core-$(CONFIG_SND_HDA_COMPONENT) += component.o</div><div class='add'>+snd-hda-core-$(CONFIG_SND_HDA_I915) += i915.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_CORE) += snd-hda-core.o</div><div class='add'>+</div><div class='add'>+#extended hda</div><div class='add'>+obj-$(CONFIG_SND_HDA_EXT_CORE) += ext/</div><div class='add'>+</div><div class='add'>+snd-intel-dspcfg-y := intel-dsp-config.o</div><div class='add'>+snd-intel-dspcfg-$(CONFIG_SND_INTEL_NHLT) += intel-nhlt.o</div><div class='add'>+obj-$(CONFIG_SND_INTEL_DSP_CONFIG) += snd-intel-dspcfg.o</div><div class='add'>+</div><div class='add'>+snd-intel-sdw-acpi-y := intel-sdw-acpi.o</div><div class='add'>+obj-$(CONFIG_SND_INTEL_SOUNDWIRE_ACPI) += snd-intel-sdw-acpi.o</div><div class='head'>diff --git a/sound/hda/core/array.c b/sound/hda/core/array.c<br/>new file mode 100644<br/>index 000000000000..a204dcee0034<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/array.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/array.c</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * generic arrays</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_array_new - get a new element from the given array</div><div class='add'>+ * @array: the array object</div><div class='add'>+ *</div><div class='add'>+ * Get a new element from the given array.  If it exceeds the</div><div class='add'>+ * pre-allocated array size, re-allocate the array.</div><div class='add'>+ *</div><div class='add'>+ * Returns NULL if allocation failed.</div><div class='add'>+ */</div><div class='add'>+void *snd_array_new(struct snd_array *array)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!array-&gt;elem_size))</div><div class='add'>+		return NULL;</div><div class='add'>+	if (array-&gt;used &gt;= array-&gt;alloced) {</div><div class='add'>+		int num = array-&gt;alloced + array-&gt;alloc_align;</div><div class='add'>+		int oldsize = array-&gt;alloced * array-&gt;elem_size;</div><div class='add'>+		int size = (num + 1) * array-&gt;elem_size;</div><div class='add'>+		void *nlist;</div><div class='add'>+		if (snd_BUG_ON(num &gt;= 4096))</div><div class='add'>+			return NULL;</div><div class='add'>+		nlist = krealloc(array-&gt;list, size, GFP_KERNEL);</div><div class='add'>+		if (!nlist)</div><div class='add'>+			return NULL;</div><div class='add'>+		memset(nlist + oldsize, 0, size - oldsize);</div><div class='add'>+		array-&gt;list = nlist;</div><div class='add'>+		array-&gt;alloced = num;</div><div class='add'>+	}</div><div class='add'>+	return snd_array_elem(array, array-&gt;used++);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_array_new);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_array_free - free the given array elements</div><div class='add'>+ * @array: the array object</div><div class='add'>+ */</div><div class='add'>+void snd_array_free(struct snd_array *array)</div><div class='add'>+{</div><div class='add'>+	kfree(array-&gt;list);</div><div class='add'>+	array-&gt;used = 0;</div><div class='add'>+	array-&gt;alloced = 0;</div><div class='add'>+	array-&gt;list = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_array_free);</div><div class='head'>diff --git a/sound/hda/core/bus.c b/sound/hda/core/bus.c<br/>new file mode 100644<br/>index 000000000000..9b196c915f37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/bus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/bus.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio core bus driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include "local.h"</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+static void snd_hdac_bus_process_unsol_events(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+static const struct hdac_bus_ops default_ops = {</div><div class='add'>+	.command = snd_hdac_bus_send_cmd,</div><div class='add'>+	.get_response = snd_hdac_bus_get_response,</div><div class='add'>+	.link_power = snd_hdac_bus_link_power,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_init - initialize a HD-audio bas bus</div><div class='add'>+ * @bus: the pointer to bus object</div><div class='add'>+ * @dev: device pointer</div><div class='add'>+ * @ops: bus verb operators</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,</div><div class='add'>+		      const struct hdac_bus_ops *ops)</div><div class='add'>+{</div><div class='add'>+	memset(bus, 0, sizeof(*bus));</div><div class='add'>+	bus-&gt;dev = dev;</div><div class='add'>+	if (ops)</div><div class='add'>+		bus-&gt;ops = ops;</div><div class='add'>+	else</div><div class='add'>+		bus-&gt;ops = &amp;default_ops;</div><div class='add'>+	bus-&gt;dma_type = SNDRV_DMA_TYPE_DEV;</div><div class='add'>+	INIT_LIST_HEAD(&amp;bus-&gt;stream_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bus-&gt;codec_list);</div><div class='add'>+	INIT_WORK(&amp;bus-&gt;unsol_work, snd_hdac_bus_process_unsol_events);</div><div class='add'>+	spin_lock_init(&amp;bus-&gt;reg_lock);</div><div class='add'>+	mutex_init(&amp;bus-&gt;cmd_mutex);</div><div class='add'>+	mutex_init(&amp;bus-&gt;lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;bus-&gt;hlink_list);</div><div class='add'>+	init_waitqueue_head(&amp;bus-&gt;rirb_wq);</div><div class='add'>+	bus-&gt;irq = -1;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Default value of '8' is as per the HD audio specification (Rev 1.0a).</div><div class='add'>+	 * Following relation is used to derive STRIPE control value.</div><div class='add'>+	 *  For sample rate &lt;= 48K:</div><div class='add'>+	 *   { ((num_channels * bits_per_sample) / number of SDOs) &gt;= 8 }</div><div class='add'>+	 *  For sample rate &gt; 48K:</div><div class='add'>+	 *   { ((num_channels * bits_per_sample * rate/48000) /</div><div class='add'>+	 *	number of SDOs) &gt;= 8 }</div><div class='add'>+	 */</div><div class='add'>+	bus-&gt;sdo_limit = 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_exit - clean up a HD-audio bas bus</div><div class='add'>+ * @bus: the pointer to bus object</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_exit(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!list_empty(&amp;bus-&gt;stream_list));</div><div class='add'>+	WARN_ON(!list_empty(&amp;bus-&gt;codec_list));</div><div class='add'>+	cancel_work_sync(&amp;bus-&gt;unsol_work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_exec_verb - execute a HD-audio verb on the given bus</div><div class='add'>+ * @bus: bus object</div><div class='add'>+ * @addr: the HDAC device address</div><div class='add'>+ * @cmd: HD-audio encoded verb</div><div class='add'>+ * @res: pointer to store the response, NULL if performing asynchronously</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_exec_verb(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+			   unsigned int cmd, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;bus-&gt;cmd_mutex);</div><div class='add'>+	return snd_hdac_bus_exec_verb_unlocked(bus, addr, cmd, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_exec_verb_unlocked - unlocked version</div><div class='add'>+ * @bus: bus object</div><div class='add'>+ * @addr: the HDAC device address</div><div class='add'>+ * @cmd: HD-audio encoded verb</div><div class='add'>+ * @res: pointer to store the response, NULL if performing asynchronously</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_exec_verb_unlocked(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+				    unsigned int cmd, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (cmd == ~0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		*res = -1;</div><div class='add'>+	else if (bus-&gt;sync_write)</div><div class='add'>+		res = &amp;tmp;</div><div class='add'>+	for (;;) {</div><div class='add'>+		trace_hda_send_cmd(bus, cmd);</div><div class='add'>+		err = bus-&gt;ops-&gt;command(bus, cmd);</div><div class='add'>+		if (err != -EAGAIN)</div><div class='add'>+			break;</div><div class='add'>+		/* process pending verbs */</div><div class='add'>+		err = bus-&gt;ops-&gt;get_response(bus, addr, &amp;tmp);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!err &amp;&amp; res) {</div><div class='add'>+		err = bus-&gt;ops-&gt;get_response(bus, addr, res);</div><div class='add'>+		trace_hda_get_response(bus, addr, *res);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_exec_verb_unlocked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_queue_event - add an unsolicited event to queue</div><div class='add'>+ * @bus: the BUS</div><div class='add'>+ * @res: unsolicited event (lower 32bit of RIRB entry)</div><div class='add'>+ * @res_ex: codec addr and flags (upper 32bit or RIRB entry)</div><div class='add'>+ *</div><div class='add'>+ * Adds the given event to the queue.  The events are processed in</div><div class='add'>+ * the workqueue asynchronously.  Call this function in the interrupt</div><div class='add'>+ * hanlder when RIRB receives an unsolicited event.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_queue_event(struct hdac_bus *bus, u32 res, u32 res_ex)</div><div class='add'>+{</div><div class='add'>+	unsigned int wp;</div><div class='add'>+</div><div class='add'>+	if (!bus)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	trace_hda_unsol_event(bus, res, res_ex);</div><div class='add'>+	wp = (bus-&gt;unsol_wp + 1) % HDA_UNSOL_QUEUE_SIZE;</div><div class='add'>+	bus-&gt;unsol_wp = wp;</div><div class='add'>+</div><div class='add'>+	wp &lt;&lt;= 1;</div><div class='add'>+	bus-&gt;unsol_queue[wp] = res;</div><div class='add'>+	bus-&gt;unsol_queue[wp + 1] = res_ex;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;bus-&gt;unsol_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * process queued unsolicited events</div><div class='add'>+ */</div><div class='add'>+static void snd_hdac_bus_process_unsol_events(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = container_of(work, struct hdac_bus, unsol_work);</div><div class='add'>+	struct hdac_device *codec;</div><div class='add'>+	struct hdac_driver *drv;</div><div class='add'>+	unsigned int rp, caddr, res;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+	while (bus-&gt;unsol_rp != bus-&gt;unsol_wp) {</div><div class='add'>+		rp = (bus-&gt;unsol_rp + 1) % HDA_UNSOL_QUEUE_SIZE;</div><div class='add'>+		bus-&gt;unsol_rp = rp;</div><div class='add'>+		rp &lt;&lt;= 1;</div><div class='add'>+		res = bus-&gt;unsol_queue[rp];</div><div class='add'>+		caddr = bus-&gt;unsol_queue[rp + 1];</div><div class='add'>+		if (!(caddr &amp; (1 &lt;&lt; 4))) /* no unsolicited event? */</div><div class='add'>+			continue;</div><div class='add'>+		codec = bus-&gt;caddr_tbl[caddr &amp; 0x0f];</div><div class='add'>+		if (!codec || !codec-&gt;registered)</div><div class='add'>+			continue;</div><div class='add'>+		spin_unlock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+		drv = drv_to_hdac_driver(codec-&gt;dev.driver);</div><div class='add'>+		if (drv-&gt;unsol_event)</div><div class='add'>+			drv-&gt;unsol_event(codec, res);</div><div class='add'>+		spin_lock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irq(&amp;bus-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_add_device - Add a codec to bus</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @codec: HDA core device to add</div><div class='add'>+ *</div><div class='add'>+ * Adds the given codec to the list in the bus.  The caddr_tbl array</div><div class='add'>+ * and codec_powered bits are updated, as well.</div><div class='add'>+ * Returns zero if success, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;caddr_tbl[codec-&gt;addr]) {</div><div class='add'>+		dev_err(bus-&gt;dev, "address 0x%x is already occupied\n",</div><div class='add'>+			codec-&gt;addr);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;codec-&gt;list, &amp;bus-&gt;codec_list);</div><div class='add'>+	bus-&gt;caddr_tbl[codec-&gt;addr] = codec;</div><div class='add'>+	set_bit(codec-&gt;addr, &amp;bus-&gt;codec_powered);</div><div class='add'>+	bus-&gt;num_codecs++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_remove_device - Remove a codec from bus</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @codec: HDA core device to remove</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_remove_device(struct hdac_bus *bus,</div><div class='add'>+				struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(bus != codec-&gt;bus);</div><div class='add'>+	if (list_empty(&amp;codec-&gt;list))</div><div class='add'>+		return;</div><div class='add'>+	list_del_init(&amp;codec-&gt;list);</div><div class='add'>+	bus-&gt;caddr_tbl[codec-&gt;addr] = NULL;</div><div class='add'>+	clear_bit(codec-&gt;addr, &amp;bus-&gt;codec_powered);</div><div class='add'>+	bus-&gt;num_codecs--;</div><div class='add'>+	flush_work(&amp;bus-&gt;unsol_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_ALIGNED_MMIO</div><div class='add'>+/* Helpers for aligned read/write of mmio space, for Tegra */</div><div class='add'>+unsigned int snd_hdac_aligned_read(void __iomem *addr, unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *aligned_addr =</div><div class='add'>+		(void __iomem *)((unsigned long)(addr) &amp; ~0x3);</div><div class='add'>+	unsigned int shift = ((unsigned long)(addr) &amp; 0x3) &lt;&lt; 3;</div><div class='add'>+	unsigned int v;</div><div class='add'>+</div><div class='add'>+	v = readl(aligned_addr);</div><div class='add'>+	return (v &gt;&gt; shift) &amp; mask;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_aligned_read);</div><div class='add'>+</div><div class='add'>+void snd_hdac_aligned_write(unsigned int val, void __iomem *addr,</div><div class='add'>+			    unsigned int mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *aligned_addr =</div><div class='add'>+		(void __iomem *)((unsigned long)(addr) &amp; ~0x3);</div><div class='add'>+	unsigned int shift = ((unsigned long)(addr) &amp; 0x3) &lt;&lt; 3;</div><div class='add'>+	unsigned int v;</div><div class='add'>+</div><div class='add'>+	v = readl(aligned_addr);</div><div class='add'>+	v &amp;= ~(mask &lt;&lt; shift);</div><div class='add'>+	v |= val &lt;&lt; shift;</div><div class='add'>+	writel(v, aligned_addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_aligned_write);</div><div class='add'>+#endif /* CONFIG_SND_HDA_ALIGNED_MMIO */</div><div class='add'>+</div><div class='add'>+void snd_hdac_codec_link_up(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = codec-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;ops-&gt;link_power)</div><div class='add'>+		bus-&gt;ops-&gt;link_power(codec, true);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_bus_link_power(codec, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_codec_link_up);</div><div class='add'>+</div><div class='add'>+void snd_hdac_codec_link_down(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = codec-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;ops-&gt;link_power)</div><div class='add'>+		bus-&gt;ops-&gt;link_power(codec, false);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_bus_link_power(codec, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_codec_link_down);</div><div class='head'>diff --git a/sound/hda/core/component.c b/sound/hda/core/component.c<br/>new file mode 100644<br/>index 000000000000..04755903880e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/component.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/component.c</a></div><div class='hunk'>@@ -0,0 +1,351 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// hdac_component.c - routines for sync between HD-A core and DRM driver</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/component.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_component.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+</div><div class='add'>+static void hdac_acomp_release(struct device *dev, void *res)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct drm_audio_component *hdac_get_acomp(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return devres_find(dev, hdac_acomp_release, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_set_codec_wakeup - Enable / disable HDMI/DP codec wakeup</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @enable: enable or disable the wakeup</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function should be called during the chip reset, also called at</div><div class='add'>+ * resume for updating STATESTS register read.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+</div><div class='add'>+	if (!acomp || !acomp-&gt;ops)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!acomp-&gt;ops-&gt;codec_wake_override)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(bus-&gt;dev, "%s codec wakeup\n", str_enable_disable(enable));</div><div class='add'>+</div><div class='add'>+	acomp-&gt;ops-&gt;codec_wake_override(acomp-&gt;dev, enable);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_set_codec_wakeup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_display_power - Power up / down the power refcount</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @idx: HDA codec address, pass HDA_CODEC_IDX_CONTROLLER for controller</div><div class='add'>+ * @enable: power up or down</div><div class='add'>+ *</div><div class='add'>+ * This function is used by either HD-audio controller or codec driver that</div><div class='add'>+ * needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function updates the power status, and calls the get_power() and</div><div class='add'>+ * put_power() ops accordingly, toggling the codec wakeup, too.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_display_power(struct hdac_bus *bus, unsigned int idx, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+</div><div class='add'>+	dev_dbg(bus-&gt;dev, "display power %s\n", str_enable_disable(enable));</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bus-&gt;lock);</div><div class='add'>+	if (enable)</div><div class='add'>+		set_bit(idx, &amp;bus-&gt;display_power_status);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(idx, &amp;bus-&gt;display_power_status);</div><div class='add'>+</div><div class='add'>+	if (!acomp || !acomp-&gt;ops)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;display_power_status) {</div><div class='add'>+		if (!bus-&gt;display_power_active) {</div><div class='add'>+			unsigned long cookie = -1;</div><div class='add'>+</div><div class='add'>+			if (acomp-&gt;ops-&gt;get_power)</div><div class='add'>+				cookie = acomp-&gt;ops-&gt;get_power(acomp-&gt;dev);</div><div class='add'>+</div><div class='add'>+			snd_hdac_set_codec_wakeup(bus, true);</div><div class='add'>+			snd_hdac_set_codec_wakeup(bus, false);</div><div class='add'>+			bus-&gt;display_power_active = cookie;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (bus-&gt;display_power_active) {</div><div class='add'>+			unsigned long cookie = bus-&gt;display_power_active;</div><div class='add'>+</div><div class='add'>+			if (acomp-&gt;ops-&gt;put_power)</div><div class='add'>+				acomp-&gt;ops-&gt;put_power(acomp-&gt;dev, cookie);</div><div class='add'>+</div><div class='add'>+			bus-&gt;display_power_active = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_display_power);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_sync_audio_rate - Set N/CTS based on the sample rate</div><div class='add'>+ * @codec: HDA codec</div><div class='add'>+ * @nid: the pin widget NID</div><div class='add'>+ * @dev_id: device identifier</div><div class='add'>+ * @rate: the sample rate to set</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function sets N/CTS value based on the given sample rate.</div><div class='add'>+ * Returns zero for success, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			     int dev_id, int rate)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = codec-&gt;bus;</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+	int port, pipe;</div><div class='add'>+</div><div class='add'>+	if (!acomp || !acomp-&gt;ops || !acomp-&gt;ops-&gt;sync_audio_rate)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	port = nid;</div><div class='add'>+	if (acomp-&gt;audio_ops &amp;&amp; acomp-&gt;audio_ops-&gt;pin2port) {</div><div class='add'>+		port = acomp-&gt;audio_ops-&gt;pin2port(codec, nid);</div><div class='add'>+		if (port &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	pipe = dev_id;</div><div class='add'>+	return acomp-&gt;ops-&gt;sync_audio_rate(acomp-&gt;dev, port, pipe, rate);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_sync_audio_rate);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_acomp_get_eld - Get the audio state and ELD via component</div><div class='add'>+ * @codec: HDA codec</div><div class='add'>+ * @nid: the pin widget NID</div><div class='add'>+ * @dev_id: device identifier</div><div class='add'>+ * @audio_enabled: the pointer to store the current audio state</div><div class='add'>+ * @buffer: the buffer pointer to store ELD bytes</div><div class='add'>+ * @max_bytes: the max bytes to be stored on @buffer</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function queries the current state of the audio on the given</div><div class='add'>+ * digital port and fetches the ELD bytes onto the given buffer.</div><div class='add'>+ * It returns the number of bytes for the total ELD data, zero for</div><div class='add'>+ * invalid ELD, or a negative error code.</div><div class='add'>+ *</div><div class='add'>+ * The return size is the total bytes required for the whole ELD bytes,</div><div class='add'>+ * thus it may be over @max_bytes.  If it's over @max_bytes, it implies</div><div class='add'>+ * that only a part of ELD bytes have been fetched.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id,</div><div class='add'>+			   bool *audio_enabled, char *buffer, int max_bytes)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = codec-&gt;bus;</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+	int port, pipe;</div><div class='add'>+</div><div class='add'>+	if (!acomp || !acomp-&gt;ops || !acomp-&gt;ops-&gt;get_eld)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	port = nid;</div><div class='add'>+	if (acomp-&gt;audio_ops &amp;&amp; acomp-&gt;audio_ops-&gt;pin2port) {</div><div class='add'>+		port = acomp-&gt;audio_ops-&gt;pin2port(codec, nid);</div><div class='add'>+		if (port &lt; 0)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	pipe = dev_id;</div><div class='add'>+	return acomp-&gt;ops-&gt;get_eld(acomp-&gt;dev, port, pipe, audio_enabled,</div><div class='add'>+				   buffer, max_bytes);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_acomp_get_eld);</div><div class='add'>+</div><div class='add'>+static int hdac_component_master_bind(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp = hdac_get_acomp(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!acomp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = component_bind_all(dev, acomp);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!(acomp-&gt;dev &amp;&amp; acomp-&gt;ops))) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pin the module to avoid dynamic unbinding, but only if given */</div><div class='add'>+	if (!try_module_get(acomp-&gt;ops-&gt;owner)) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_unbind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (acomp-&gt;audio_ops &amp;&amp; acomp-&gt;audio_ops-&gt;master_bind) {</div><div class='add'>+		ret = acomp-&gt;audio_ops-&gt;master_bind(dev, acomp);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete_all(&amp;acomp-&gt;master_bind_complete);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ module_put:</div><div class='add'>+	module_put(acomp-&gt;ops-&gt;owner);</div><div class='add'>+out_unbind:</div><div class='add'>+	component_unbind_all(dev, acomp);</div><div class='add'>+	complete_all(&amp;acomp-&gt;master_bind_complete);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdac_component_master_unbind(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp = hdac_get_acomp(dev);</div><div class='add'>+</div><div class='add'>+	if (acomp-&gt;audio_ops &amp;&amp; acomp-&gt;audio_ops-&gt;master_unbind)</div><div class='add'>+		acomp-&gt;audio_ops-&gt;master_unbind(dev, acomp);</div><div class='add'>+	module_put(acomp-&gt;ops-&gt;owner);</div><div class='add'>+	component_unbind_all(dev, acomp);</div><div class='add'>+	WARN_ON(acomp-&gt;ops || acomp-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct component_master_ops hdac_component_master_ops = {</div><div class='add'>+	.bind = hdac_component_master_bind,</div><div class='add'>+	.unbind = hdac_component_master_unbind,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_acomp_register_notifier - Register audio component ops</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @aops: audio component ops</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function sets the given ops to be called by the graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_acomp_register_notifier(struct hdac_bus *bus,</div><div class='add'>+				    const struct drm_audio_component_audio_ops *aops)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;audio_component)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	bus-&gt;audio_component-&gt;audio_ops = aops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_acomp_init - Initialize audio component</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ * @aops: audio component ops</div><div class='add'>+ * @match_master: match function for finding components</div><div class='add'>+ * @extra_size: Extra bytes to allocate</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function initializes and sets up the audio component to communicate</div><div class='add'>+ * with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * Unlike snd_hdac_i915_init(), this function doesn't synchronize with the</div><div class='add'>+ * binding with the DRM component.  Each caller needs to sync via master_bind</div><div class='add'>+ * audio_ops.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_acomp_init(struct hdac_bus *bus,</div><div class='add'>+			const struct drm_audio_component_audio_ops *aops,</div><div class='add'>+			int (*match_master)(struct device *, int, void *),</div><div class='add'>+			size_t extra_size)</div><div class='add'>+{</div><div class='add'>+	struct component_match *match = NULL;</div><div class='add'>+	struct device *dev = bus-&gt;dev;</div><div class='add'>+	struct drm_audio_component *acomp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(hdac_get_acomp(dev)))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	acomp = devres_alloc(hdac_acomp_release, sizeof(*acomp) + extra_size,</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!acomp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	acomp-&gt;audio_ops = aops;</div><div class='add'>+	init_completion(&amp;acomp-&gt;master_bind_complete);</div><div class='add'>+	bus-&gt;audio_component = acomp;</div><div class='add'>+	devres_add(dev, acomp);</div><div class='add'>+</div><div class='add'>+	component_match_add_typed(dev, &amp;match, match_master, bus);</div><div class='add'>+	ret = component_master_add_with_match(dev, &amp;hdac_component_master_ops,</div><div class='add'>+					      match);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	bus-&gt;audio_component = NULL;</div><div class='add'>+	devres_destroy(dev, hdac_acomp_release, NULL, NULL);</div><div class='add'>+	dev_info(dev, "failed to add audio component master (%d)\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_acomp_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_acomp_exit - Finalize audio component</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * This function releases the audio component that has been used.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_acomp_exit(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = bus-&gt;dev;</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+</div><div class='add'>+	if (!acomp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(bus-&gt;display_power_active) &amp;&amp; acomp-&gt;ops)</div><div class='add'>+		acomp-&gt;ops-&gt;put_power(acomp-&gt;dev, bus-&gt;display_power_active);</div><div class='add'>+</div><div class='add'>+	bus-&gt;display_power_active = 0;</div><div class='add'>+	bus-&gt;display_power_status = 0;</div><div class='add'>+</div><div class='add'>+	component_master_del(dev, &amp;hdac_component_master_ops);</div><div class='add'>+</div><div class='add'>+	bus-&gt;audio_component = NULL;</div><div class='add'>+	devres_destroy(dev, hdac_acomp_release, NULL, NULL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_acomp_exit);</div><div class='head'>diff --git a/sound/hda/core/controller.c b/sound/hda/core/controller.c<br/>new file mode 100644<br/>index 000000000000..a7c00ad80117<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/controller.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/controller.c</a></div><div class='hunk'>@@ -0,0 +1,766 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio controller helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+#include "local.h"</div><div class='add'>+</div><div class='add'>+/* clear CORB read pointer properly */</div><div class='add'>+static void azx_clear_corbrp(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	int timeout;</div><div class='add'>+</div><div class='add'>+	for (timeout = 1000; timeout &gt; 0; timeout--) {</div><div class='add'>+		if (snd_hdac_chip_readw(bus, CORBRP) &amp; AZX_CORBRP_RST)</div><div class='add'>+			break;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+	if (timeout &lt;= 0)</div><div class='add'>+		dev_err(bus-&gt;dev, "CORB reset timeout#1, CORBRP = %d\n",</div><div class='add'>+			snd_hdac_chip_readw(bus, CORBRP));</div><div class='add'>+</div><div class='add'>+	snd_hdac_chip_writew(bus, CORBRP, 0);</div><div class='add'>+	for (timeout = 1000; timeout &gt; 0; timeout--) {</div><div class='add'>+		if (snd_hdac_chip_readw(bus, CORBRP) == 0)</div><div class='add'>+			break;</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+	if (timeout &lt;= 0)</div><div class='add'>+		dev_err(bus-&gt;dev, "CORB reset timeout#2, CORBRP = %d\n",</div><div class='add'>+			snd_hdac_chip_readw(bus, CORBRP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_init_cmd_io - set up CORB/RIRB buffers</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	WARN_ON_ONCE(!bus-&gt;rb.area);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	/* CORB set up */</div><div class='add'>+	bus-&gt;corb.addr = bus-&gt;rb.addr;</div><div class='add'>+	bus-&gt;corb.buf = (__le32 *)bus-&gt;rb.area;</div><div class='add'>+	snd_hdac_chip_writel(bus, CORBLBASE, (u32)bus-&gt;corb.addr);</div><div class='add'>+	snd_hdac_chip_writel(bus, CORBUBASE, upper_32_bits(bus-&gt;corb.addr));</div><div class='add'>+</div><div class='add'>+	/* set the corb size to 256 entries (ULI requires explicitly) */</div><div class='add'>+	snd_hdac_chip_writeb(bus, CORBSIZE, 0x02);</div><div class='add'>+	/* set the corb write pointer to 0 */</div><div class='add'>+	snd_hdac_chip_writew(bus, CORBWP, 0);</div><div class='add'>+</div><div class='add'>+	/* reset the corb hw read pointer */</div><div class='add'>+	snd_hdac_chip_writew(bus, CORBRP, AZX_CORBRP_RST);</div><div class='add'>+	if (!bus-&gt;corbrp_self_clear)</div><div class='add'>+		azx_clear_corbrp(bus);</div><div class='add'>+</div><div class='add'>+	/* enable corb dma */</div><div class='add'>+	if (!bus-&gt;use_pio_for_commands)</div><div class='add'>+		snd_hdac_chip_writeb(bus, CORBCTL, AZX_CORBCTL_RUN);</div><div class='add'>+</div><div class='add'>+	/* RIRB set up */</div><div class='add'>+	bus-&gt;rirb.addr = bus-&gt;rb.addr + 2048;</div><div class='add'>+	bus-&gt;rirb.buf = (__le32 *)(bus-&gt;rb.area + 2048);</div><div class='add'>+	bus-&gt;rirb.wp = bus-&gt;rirb.rp = 0;</div><div class='add'>+	memset(bus-&gt;rirb.cmds, 0, sizeof(bus-&gt;rirb.cmds));</div><div class='add'>+	snd_hdac_chip_writel(bus, RIRBLBASE, (u32)bus-&gt;rirb.addr);</div><div class='add'>+	snd_hdac_chip_writel(bus, RIRBUBASE, upper_32_bits(bus-&gt;rirb.addr));</div><div class='add'>+</div><div class='add'>+	/* set the rirb size to 256 entries (ULI requires explicitly) */</div><div class='add'>+	snd_hdac_chip_writeb(bus, RIRBSIZE, 0x02);</div><div class='add'>+	/* reset the rirb hw write pointer */</div><div class='add'>+	snd_hdac_chip_writew(bus, RIRBWP, AZX_RIRBWP_RST);</div><div class='add'>+	/* set N=1, get RIRB response interrupt for new entry */</div><div class='add'>+	snd_hdac_chip_writew(bus, RINTCNT, 1);</div><div class='add'>+	/* enable rirb dma and response irq */</div><div class='add'>+	if (bus-&gt;not_use_interrupts)</div><div class='add'>+		snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_chip_writeb(bus, RIRBCTL, AZX_RBCTL_DMA_EN | AZX_RBCTL_IRQ_EN);</div><div class='add'>+	/* Accept unsolicited responses */</div><div class='add'>+	snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, AZX_GCTL_UNSOL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_init_cmd_io);</div><div class='add'>+</div><div class='add'>+/* wait for cmd dmas till they are stopped */</div><div class='add'>+static void hdac_wait_for_cmd_dmas(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(100);</div><div class='add'>+	while ((snd_hdac_chip_readb(bus, RIRBCTL) &amp; AZX_RBCTL_DMA_EN)</div><div class='add'>+		&amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(100);</div><div class='add'>+	while ((snd_hdac_chip_readb(bus, CORBCTL) &amp; AZX_CORBCTL_RUN)</div><div class='add'>+		&amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		udelay(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_stop_cmd_io - clean up CORB/RIRB buffers</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+		/* disable ringbuffer DMAs */</div><div class='add'>+		snd_hdac_chip_writeb(bus, RIRBCTL, 0);</div><div class='add'>+		snd_hdac_chip_writeb(bus, CORBCTL, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdac_wait_for_cmd_dmas(bus);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	/* disable unsolicited responses */</div><div class='add'>+	snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_stop_cmd_io);</div><div class='add'>+</div><div class='add'>+static unsigned int azx_command_addr(u32 cmd)</div><div class='add'>+{</div><div class='add'>+	unsigned int addr = cmd &gt;&gt; 28;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(addr &gt;= HDA_MAX_CODECS))</div><div class='add'>+		addr = 0;</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* receive an Immediate Response with PIO */</div><div class='add'>+static int snd_hdac_bus_wait_for_pio_response(struct hdac_bus *bus,</div><div class='add'>+					      unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	int timeout = 50;</div><div class='add'>+</div><div class='add'>+	while (timeout--) {</div><div class='add'>+		/* check IRV bit */</div><div class='add'>+		if (snd_hdac_chip_readw(bus, IRS) &amp; AZX_IRS_VALID) {</div><div class='add'>+			/* reuse rirb.res as the response return value */</div><div class='add'>+			bus-&gt;rirb.res[addr] = snd_hdac_chip_readl(bus, IR);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_ratelimited(bus-&gt;dev, "get_response_pio timeout: IRS=%#x\n",</div><div class='add'>+			    snd_hdac_chip_readw(bus, IRS));</div><div class='add'>+</div><div class='add'>+	bus-&gt;rirb.res[addr] = -1;</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_send_cmd_pio - send a command verb via Immediate Command</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @val: encoded verb value to send</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_bus_send_cmd_pio(struct hdac_bus *bus, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int addr = azx_command_addr(val);</div><div class='add'>+	int timeout = 50;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	while (timeout--) {</div><div class='add'>+		/* check ICB bit */</div><div class='add'>+		if (!((snd_hdac_chip_readw(bus, IRS) &amp; AZX_IRS_BUSY))) {</div><div class='add'>+			/* Clear IRV bit */</div><div class='add'>+			snd_hdac_chip_updatew(bus, IRS, AZX_IRS_VALID, AZX_IRS_VALID);</div><div class='add'>+			snd_hdac_chip_writel(bus, IC, val);</div><div class='add'>+			/* Set ICB bit */</div><div class='add'>+			snd_hdac_chip_updatew(bus, IRS, AZX_IRS_BUSY, AZX_IRS_BUSY);</div><div class='add'>+</div><div class='add'>+			return snd_hdac_bus_wait_for_pio_response(bus, addr);</div><div class='add'>+		}</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg_ratelimited(bus-&gt;dev, "send_cmd_pio timeout: IRS=%#x, val=%#x\n",</div><div class='add'>+			    snd_hdac_chip_readw(bus, IRS), val);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_get_response_pio - receive a response via Immediate Response</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @addr: codec address</div><div class='add'>+ * @res: pointer to store the value, NULL when not needed</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if a value is read, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_bus_get_response_pio(struct hdac_bus *bus,</div><div class='add'>+					 unsigned int addr, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	if (res)</div><div class='add'>+		*res = bus-&gt;rirb.res[addr];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_send_cmd_corb - send a command verb via CORB</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @val: encoded verb value to send</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_bus_send_cmd_corb(struct hdac_bus *bus, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int addr = azx_command_addr(val);</div><div class='add'>+	unsigned int wp, rp;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	bus-&gt;last_cmd[azx_command_addr(val)] = val;</div><div class='add'>+</div><div class='add'>+	/* add command to corb */</div><div class='add'>+	wp = snd_hdac_chip_readw(bus, CORBWP);</div><div class='add'>+	if (wp == 0xffff) {</div><div class='add'>+		/* something wrong, controller likely turned to D3 */</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	wp++;</div><div class='add'>+	wp %= AZX_MAX_CORB_ENTRIES;</div><div class='add'>+</div><div class='add'>+	rp = snd_hdac_chip_readw(bus, CORBRP);</div><div class='add'>+	if (wp == rp) {</div><div class='add'>+		/* oops, it's full */</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;rirb.cmds[addr]++;</div><div class='add'>+	bus-&gt;corb.buf[wp] = cpu_to_le32(val);</div><div class='add'>+	snd_hdac_chip_writew(bus, CORBWP, wp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define AZX_RIRB_EX_UNSOL_EV	(1&lt;&lt;4)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_update_rirb - retrieve RIRB entries</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ *</div><div class='add'>+ * Usually called from interrupt handler.</div><div class='add'>+ * The caller needs bus-&gt;reg_lock spinlock before calling this.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_update_rirb(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	unsigned int rp, wp;</div><div class='add'>+	unsigned int addr;</div><div class='add'>+	u32 res, res_ex;</div><div class='add'>+</div><div class='add'>+	wp = snd_hdac_chip_readw(bus, RIRBWP);</div><div class='add'>+	if (wp == 0xffff) {</div><div class='add'>+		/* something wrong, controller likely turned to D3 */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wp == bus-&gt;rirb.wp)</div><div class='add'>+		return;</div><div class='add'>+	bus-&gt;rirb.wp = wp;</div><div class='add'>+</div><div class='add'>+	while (bus-&gt;rirb.rp != wp) {</div><div class='add'>+		bus-&gt;rirb.rp++;</div><div class='add'>+		bus-&gt;rirb.rp %= AZX_MAX_RIRB_ENTRIES;</div><div class='add'>+</div><div class='add'>+		rp = bus-&gt;rirb.rp &lt;&lt; 1; /* an RIRB entry is 8-bytes */</div><div class='add'>+		res_ex = le32_to_cpu(bus-&gt;rirb.buf[rp + 1]);</div><div class='add'>+		res = le32_to_cpu(bus-&gt;rirb.buf[rp]);</div><div class='add'>+		addr = res_ex &amp; 0xf;</div><div class='add'>+		if (addr &gt;= HDA_MAX_CODECS) {</div><div class='add'>+			dev_err(bus-&gt;dev,</div><div class='add'>+				"spurious response %#x:%#x, rp = %d, wp = %d",</div><div class='add'>+				res, res_ex, bus-&gt;rirb.rp, wp);</div><div class='add'>+			snd_BUG();</div><div class='add'>+		} else if (res_ex &amp; AZX_RIRB_EX_UNSOL_EV)</div><div class='add'>+			snd_hdac_bus_queue_event(bus, res, res_ex);</div><div class='add'>+		else if (bus-&gt;rirb.cmds[addr]) {</div><div class='add'>+			bus-&gt;rirb.res[addr] = res;</div><div class='add'>+			bus-&gt;rirb.cmds[addr]--;</div><div class='add'>+			if (!bus-&gt;rirb.cmds[addr] &amp;&amp;</div><div class='add'>+			    waitqueue_active(&amp;bus-&gt;rirb_wq))</div><div class='add'>+				wake_up(&amp;bus-&gt;rirb_wq);</div><div class='add'>+		} else {</div><div class='add'>+			dev_err_ratelimited(bus-&gt;dev,</div><div class='add'>+				"spurious response %#x:%#x, last cmd=%#08x\n",</div><div class='add'>+				res, res_ex, bus-&gt;last_cmd[addr]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_update_rirb);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_get_response_rirb - receive a response via RIRB</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @addr: codec address</div><div class='add'>+ * @res: pointer to store the value, NULL when not needed</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if a value is read, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_bus_get_response_rirb(struct hdac_bus *bus,</div><div class='add'>+					  unsigned int addr, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+	unsigned long loopcounter;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='add'>+	bool warned = false;</div><div class='add'>+</div><div class='add'>+	init_wait_entry(&amp;wait, 0);</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+</div><div class='add'>+	for (loopcounter = 0;; loopcounter++) {</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+			if (!bus-&gt;polling_mode)</div><div class='add'>+				prepare_to_wait(&amp;bus-&gt;rirb_wq, &amp;wait,</div><div class='add'>+						TASK_UNINTERRUPTIBLE);</div><div class='add'>+			if (bus-&gt;polling_mode)</div><div class='add'>+				snd_hdac_bus_update_rirb(bus);</div><div class='add'>+			if (!bus-&gt;rirb.cmds[addr]) {</div><div class='add'>+				if (res)</div><div class='add'>+					*res = bus-&gt;rirb.res[addr]; /* the last value */</div><div class='add'>+				if (!bus-&gt;polling_mode)</div><div class='add'>+					finish_wait(&amp;bus-&gt;rirb_wq, &amp;wait);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (time_after(jiffies, timeout))</div><div class='add'>+			break;</div><div class='add'>+#define LOOP_COUNT_MAX	3000</div><div class='add'>+		if (!bus-&gt;polling_mode) {</div><div class='add'>+			schedule_timeout(msecs_to_jiffies(2));</div><div class='add'>+		} else if (bus-&gt;needs_damn_long_delay ||</div><div class='add'>+			   loopcounter &gt; LOOP_COUNT_MAX) {</div><div class='add'>+			if (loopcounter &gt; LOOP_COUNT_MAX &amp;&amp; !warned) {</div><div class='add'>+				dev_dbg_ratelimited(bus-&gt;dev,</div><div class='add'>+						    "too slow response, last cmd=%#08x\n",</div><div class='add'>+						    bus-&gt;last_cmd[addr]);</div><div class='add'>+				warned = true;</div><div class='add'>+			}</div><div class='add'>+			msleep(2); /* temporary workaround */</div><div class='add'>+		} else {</div><div class='add'>+			udelay(10);</div><div class='add'>+			cond_resched();</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;polling_mode)</div><div class='add'>+		finish_wait(&amp;bus-&gt;rirb_wq, &amp;wait);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_send_cmd - send a command verb via CORB or PIO</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @val: encoded verb value to send</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_send_cmd(struct hdac_bus *bus, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;use_pio_for_commands)</div><div class='add'>+		return snd_hdac_bus_send_cmd_pio(bus, val);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_bus_send_cmd_corb(bus, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_send_cmd);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_get_response - receive a response via RIRB or PIO</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @addr: codec address</div><div class='add'>+ * @res: pointer to store the value, NULL when not needed</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if a value is read, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+			      unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;use_pio_for_commands)</div><div class='add'>+		return snd_hdac_bus_get_response_pio(bus, addr, res);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_bus_get_response_rirb(bus, addr, res);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_get_response);</div><div class='add'>+</div><div class='add'>+#define HDAC_MAX_CAPS 10</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_parse_capabilities - parse capability structure</div><div class='add'>+ * @bus: the pointer to bus object</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	unsigned int cur_cap;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	unsigned int counter = 0;</div><div class='add'>+</div><div class='add'>+	offset = snd_hdac_chip_readw(bus, LLCH);</div><div class='add'>+</div><div class='add'>+	/* Lets walk the linked capabilities list */</div><div class='add'>+	do {</div><div class='add'>+		cur_cap = _snd_hdac_chip_readl(bus, offset);</div><div class='add'>+</div><div class='add'>+		dev_dbg(bus-&gt;dev, "Capability version: 0x%x\n",</div><div class='add'>+			(cur_cap &amp; AZX_CAP_HDR_VER_MASK) &gt;&gt; AZX_CAP_HDR_VER_OFF);</div><div class='add'>+</div><div class='add'>+		dev_dbg(bus-&gt;dev, "HDA capability ID: 0x%x\n",</div><div class='add'>+			(cur_cap &amp; AZX_CAP_HDR_ID_MASK) &gt;&gt; AZX_CAP_HDR_ID_OFF);</div><div class='add'>+</div><div class='add'>+		if (cur_cap == -1) {</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Invalid capability reg read\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch ((cur_cap &amp; AZX_CAP_HDR_ID_MASK) &gt;&gt; AZX_CAP_HDR_ID_OFF) {</div><div class='add'>+		case AZX_ML_CAP_ID:</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Found ML capability\n");</div><div class='add'>+			bus-&gt;mlcap = bus-&gt;remap_addr + offset;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AZX_GTS_CAP_ID:</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Found GTS capability offset=%x\n", offset);</div><div class='add'>+			bus-&gt;gtscap = bus-&gt;remap_addr + offset;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AZX_PP_CAP_ID:</div><div class='add'>+			/* PP capability found, the Audio DSP is present */</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Found PP capability offset=%x\n", offset);</div><div class='add'>+			bus-&gt;ppcap = bus-&gt;remap_addr + offset;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AZX_SPB_CAP_ID:</div><div class='add'>+			/* SPIB capability found, handler function */</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Found SPB capability\n");</div><div class='add'>+			bus-&gt;spbcap = bus-&gt;remap_addr + offset;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case AZX_DRSM_CAP_ID:</div><div class='add'>+			/* DMA resume  capability found, handler function */</div><div class='add'>+			dev_dbg(bus-&gt;dev, "Found DRSM capability\n");</div><div class='add'>+			bus-&gt;drsmcap = bus-&gt;remap_addr + offset;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			dev_err(bus-&gt;dev, "Unknown capability %d\n", cur_cap);</div><div class='add'>+			cur_cap = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		counter++;</div><div class='add'>+</div><div class='add'>+		if (counter &gt; HDAC_MAX_CAPS) {</div><div class='add'>+			dev_err(bus-&gt;dev, "We exceeded HDAC capabilities!!!\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* read the offset of next capability */</div><div class='add'>+		offset = cur_cap &amp; AZX_CAP_HDR_NXT_PTR_MASK;</div><div class='add'>+</div><div class='add'>+	} while (offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_parse_capabilities);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lowlevel interface</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_enter_link_reset - enter link reset</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ *</div><div class='add'>+ * Enter to the link reset state.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	/* reset controller */</div><div class='add'>+	snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_RESET, 0);</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(100);</div><div class='add'>+	while ((snd_hdac_chip_readb(bus, GCTL) &amp; AZX_GCTL_RESET) &amp;&amp;</div><div class='add'>+	       time_before(jiffies, timeout))</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_enter_link_reset);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_exit_link_reset - exit link reset</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ *</div><div class='add'>+ * Exit from the link reset state.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+	snd_hdac_chip_updateb(bus, GCTL, AZX_GCTL_RESET, AZX_GCTL_RESET);</div><div class='add'>+</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(100);</div><div class='add'>+	while (!snd_hdac_chip_readb(bus, GCTL) &amp;&amp; time_before(jiffies, timeout))</div><div class='add'>+		usleep_range(500, 1000);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_exit_link_reset);</div><div class='add'>+</div><div class='add'>+/* reset codec link */</div><div class='add'>+int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)</div><div class='add'>+{</div><div class='add'>+	if (!full_reset)</div><div class='add'>+		goto skip_reset;</div><div class='add'>+</div><div class='add'>+	/* clear STATESTS if not in reset */</div><div class='add'>+	if (snd_hdac_chip_readb(bus, GCTL) &amp; AZX_GCTL_RESET)</div><div class='add'>+		snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);</div><div class='add'>+</div><div class='add'>+	/* reset controller */</div><div class='add'>+	snd_hdac_bus_enter_link_reset(bus);</div><div class='add'>+</div><div class='add'>+	/* delay for &gt;= 100us for codec PLL to settle per spec</div><div class='add'>+	 * Rev 0.9 section 5.5.1</div><div class='add'>+	 */</div><div class='add'>+	usleep_range(500, 1000);</div><div class='add'>+</div><div class='add'>+	/* Bring controller out of reset */</div><div class='add'>+	snd_hdac_bus_exit_link_reset(bus);</div><div class='add'>+</div><div class='add'>+	/* Brent Chartrand said to wait &gt;= 540us for codecs to initialize */</div><div class='add'>+	usleep_range(1000, 1200);</div><div class='add'>+</div><div class='add'>+ skip_reset:</div><div class='add'>+	/* check to see if controller is ready */</div><div class='add'>+	if (!snd_hdac_chip_readb(bus, GCTL)) {</div><div class='add'>+		dev_dbg(bus-&gt;dev, "controller not ready!\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* detect codecs */</div><div class='add'>+	if (!bus-&gt;codec_mask) {</div><div class='add'>+		bus-&gt;codec_mask = snd_hdac_chip_readw(bus, STATESTS);</div><div class='add'>+		dev_dbg(bus-&gt;dev, "codec_mask = 0x%lx\n", bus-&gt;codec_mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_reset_link);</div><div class='add'>+</div><div class='add'>+/* enable interrupts */</div><div class='add'>+static void azx_int_enable(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	/* enable controller CIE and GIE */</div><div class='add'>+	snd_hdac_chip_updatel(bus, INTCTL,</div><div class='add'>+			      AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN,</div><div class='add'>+			      AZX_INT_CTRL_EN | AZX_INT_GLOBAL_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* disable interrupts */</div><div class='add'>+static void azx_int_disable(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *azx_dev;</div><div class='add'>+</div><div class='add'>+	/* disable interrupts in stream descriptor */</div><div class='add'>+	list_for_each_entry(azx_dev, &amp;bus-&gt;stream_list, list)</div><div class='add'>+		snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_INT_MASK, 0);</div><div class='add'>+</div><div class='add'>+	/* disable SIE for all streams &amp; disable controller CIE and GIE */</div><div class='add'>+	snd_hdac_chip_writel(bus, INTCTL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clear interrupts */</div><div class='add'>+static void azx_int_clear(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *azx_dev;</div><div class='add'>+</div><div class='add'>+	/* clear stream status */</div><div class='add'>+	list_for_each_entry(azx_dev, &amp;bus-&gt;stream_list, list)</div><div class='add'>+		snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);</div><div class='add'>+</div><div class='add'>+	/* clear STATESTS */</div><div class='add'>+	snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK);</div><div class='add'>+</div><div class='add'>+	/* clear rirb status */</div><div class='add'>+	snd_hdac_chip_writeb(bus, RIRBSTS, RIRB_INT_MASK);</div><div class='add'>+</div><div class='add'>+	/* clear int status */</div><div class='add'>+	snd_hdac_chip_writel(bus, INTSTS, AZX_INT_CTRL_EN | AZX_INT_ALL_STREAM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_init_chip - reset and start the controller registers</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @full_reset: Do full reset</div><div class='add'>+ */</div><div class='add'>+bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;chip_init)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* reset controller */</div><div class='add'>+	snd_hdac_bus_reset_link(bus, full_reset);</div><div class='add'>+</div><div class='add'>+	/* clear interrupts */</div><div class='add'>+	azx_int_clear(bus);</div><div class='add'>+</div><div class='add'>+	/* initialize the codec command I/O */</div><div class='add'>+	snd_hdac_bus_init_cmd_io(bus);</div><div class='add'>+</div><div class='add'>+	/* enable interrupts after CORB/RIRB buffers are initialized above */</div><div class='add'>+	azx_int_enable(bus);</div><div class='add'>+</div><div class='add'>+	/* program the position buffer */</div><div class='add'>+	if (bus-&gt;use_posbuf &amp;&amp; bus-&gt;posbuf.addr) {</div><div class='add'>+		snd_hdac_chip_writel(bus, DPLBASE, (u32)bus-&gt;posbuf.addr);</div><div class='add'>+		snd_hdac_chip_writel(bus, DPUBASE, upper_32_bits(bus-&gt;posbuf.addr));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;chip_init = true;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_init_chip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_stop_chip - disable the whole IRQ and I/Os</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_stop_chip(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;chip_init)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	azx_int_disable(bus);</div><div class='add'>+	azx_int_clear(bus);</div><div class='add'>+</div><div class='add'>+	/* disable CORB/RIRB */</div><div class='add'>+	snd_hdac_bus_stop_cmd_io(bus);</div><div class='add'>+</div><div class='add'>+	/* disable position buffer */</div><div class='add'>+	if (bus-&gt;posbuf.addr) {</div><div class='add'>+		snd_hdac_chip_writel(bus, DPLBASE, 0);</div><div class='add'>+		snd_hdac_chip_writel(bus, DPUBASE, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;chip_init = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_stop_chip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_handle_stream_irq - interrupt handler for streams</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @status: INTSTS register value</div><div class='add'>+ * @ack: callback to be called for woken streams</div><div class='add'>+ *</div><div class='add'>+ * Returns the bits of handled streams, or zero if no stream is handled.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,</div><div class='add'>+				    void (*ack)(struct hdac_bus *,</div><div class='add'>+						struct hdac_stream *))</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *azx_dev;</div><div class='add'>+	u8 sd_status;</div><div class='add'>+	int handled = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(azx_dev, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		if (status &amp; azx_dev-&gt;sd_int_sta_mask) {</div><div class='add'>+			sd_status = snd_hdac_stream_readb(azx_dev, SD_STS);</div><div class='add'>+			snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);</div><div class='add'>+			handled |= 1 &lt;&lt; azx_dev-&gt;index;</div><div class='add'>+			if ((!azx_dev-&gt;substream &amp;&amp; !azx_dev-&gt;cstream) ||</div><div class='add'>+			    !azx_dev-&gt;running || !(sd_status &amp; SD_INT_COMPLETE))</div><div class='add'>+				continue;</div><div class='add'>+			if (ack)</div><div class='add'>+				ack(bus, azx_dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_handle_stream_irq);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_alloc_stream_pages - allocate BDL and other buffers</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ *</div><div class='add'>+ * Call this after assigning the all streams.</div><div class='add'>+ * Returns zero for success, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_bus_alloc_stream_pages(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+	int num_streams = 0;</div><div class='add'>+	int dma_type = bus-&gt;dma_type ? bus-&gt;dma_type : SNDRV_DMA_TYPE_DEV;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		/* allocate memory for the BDL for each stream */</div><div class='add'>+		err = snd_dma_alloc_pages(dma_type, bus-&gt;dev,</div><div class='add'>+					  BDL_SIZE, &amp;s-&gt;bdl);</div><div class='add'>+		num_streams++;</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!num_streams))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* allocate memory for the position buffer */</div><div class='add'>+	err = snd_dma_alloc_pages(dma_type, bus-&gt;dev,</div><div class='add'>+				  num_streams * 8, &amp;bus-&gt;posbuf);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list)</div><div class='add'>+		s-&gt;posbuf = (__le32 *)(bus-&gt;posbuf.area + s-&gt;index * 8);</div><div class='add'>+</div><div class='add'>+	/* single page (at least 4096 bytes) must suffice for both ringbuffes */</div><div class='add'>+	return snd_dma_alloc_pages(dma_type, bus-&gt;dev, PAGE_SIZE, &amp;bus-&gt;rb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_alloc_stream_pages);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_free_stream_pages - release BDL and other buffers</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_free_stream_pages(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		if (s-&gt;bdl.area)</div><div class='add'>+			snd_dma_free_pages(&amp;s-&gt;bdl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;rb.area)</div><div class='add'>+		snd_dma_free_pages(&amp;bus-&gt;rb);</div><div class='add'>+	if (bus-&gt;posbuf.area)</div><div class='add'>+		snd_dma_free_pages(&amp;bus-&gt;posbuf);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_free_stream_pages);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_bus_link_power - power up/down codec link</div><div class='add'>+ * @codec: HD-audio device</div><div class='add'>+ * @enable: whether to power-up the link</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_bus_link_power(struct hdac_device *codec, bool enable)</div><div class='add'>+{</div><div class='add'>+	if (enable)</div><div class='add'>+		set_bit(codec-&gt;addr, &amp;codec-&gt;bus-&gt;codec_powered);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(codec-&gt;addr, &amp;codec-&gt;bus-&gt;codec_powered);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_bus_link_power);</div><div class='head'>diff --git a/sound/hda/core/device.c b/sound/hda/core/device.c<br/>new file mode 100644<br/>index 000000000000..160c8d0453b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/device.c</a></div><div class='hunk'>@@ -0,0 +1,1167 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio codec core device</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_regmap.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+#include "local.h"</div><div class='add'>+</div><div class='add'>+static void setup_fg_nodes(struct hdac_device *codec);</div><div class='add'>+static int get_codec_vendor_name(struct hdac_device *codec);</div><div class='add'>+</div><div class='add'>+static void default_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_device_exit(dev_to_hdac_dev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_device_init - initialize the HD-audio codec base device</div><div class='add'>+ * @codec: device to initialize</div><div class='add'>+ * @bus: but to attach</div><div class='add'>+ * @name: device name string</div><div class='add'>+ * @addr: codec address</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ *</div><div class='add'>+ * This function increments the runtime PM counter and marks it active.</div><div class='add'>+ * The caller needs to turn it off appropriately later.</div><div class='add'>+ *</div><div class='add'>+ * The caller needs to set the device's release op properly by itself.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus,</div><div class='add'>+			 const char *name, unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	struct device *dev;</div><div class='add'>+	hda_nid_t fg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev = &amp;codec-&gt;dev;</div><div class='add'>+	device_initialize(dev);</div><div class='add'>+	dev-&gt;parent = bus-&gt;dev;</div><div class='add'>+	dev-&gt;bus = &amp;snd_hda_bus_type;</div><div class='add'>+	dev-&gt;release = default_release;</div><div class='add'>+	dev-&gt;groups = hdac_dev_attr_groups;</div><div class='add'>+	dev_set_name(dev, "%s", name);</div><div class='add'>+	device_enable_async_suspend(dev);</div><div class='add'>+</div><div class='add'>+	codec-&gt;bus = bus;</div><div class='add'>+	codec-&gt;addr = addr;</div><div class='add'>+	codec-&gt;type = HDA_DEV_CORE;</div><div class='add'>+	mutex_init(&amp;codec-&gt;widget_lock);</div><div class='add'>+	mutex_init(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	pm_runtime_set_active(&amp;codec-&gt;dev);</div><div class='add'>+	pm_runtime_get_noresume(&amp;codec-&gt;dev);</div><div class='add'>+	atomic_set(&amp;codec-&gt;in_pm, 0);</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_bus_add_device(bus, codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* fill parameters */</div><div class='add'>+	codec-&gt;vendor_id = snd_hdac_read_parm(codec, AC_NODE_ROOT,</div><div class='add'>+					      AC_PAR_VENDOR_ID);</div><div class='add'>+	if (codec-&gt;vendor_id == -1) {</div><div class='add'>+		/* read again, hopefully the access method was corrected</div><div class='add'>+		 * in the last read...</div><div class='add'>+		 */</div><div class='add'>+		codec-&gt;vendor_id = snd_hdac_read_parm(codec, AC_NODE_ROOT,</div><div class='add'>+						      AC_PAR_VENDOR_ID);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;subsystem_id = snd_hdac_read_parm(codec, AC_NODE_ROOT,</div><div class='add'>+						 AC_PAR_SUBSYSTEM_ID);</div><div class='add'>+	codec-&gt;revision_id = snd_hdac_read_parm(codec, AC_NODE_ROOT,</div><div class='add'>+						AC_PAR_REV_ID);</div><div class='add'>+</div><div class='add'>+	setup_fg_nodes(codec);</div><div class='add'>+	if (!codec-&gt;afg &amp;&amp; !codec-&gt;mfg) {</div><div class='add'>+		dev_err(dev, "no AFG or MFG node found\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fg = codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg;</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_refresh_widgets(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	codec-&gt;power_caps = snd_hdac_read_parm(codec, fg, AC_PAR_POWER_STATE);</div><div class='add'>+	/* reread ssid if not set by parameter */</div><div class='add'>+	if (codec-&gt;subsystem_id == -1 || codec-&gt;subsystem_id == 0)</div><div class='add'>+		snd_hdac_read(codec, fg, AC_VERB_GET_SUBSYSTEM_ID, 0,</div><div class='add'>+			      &amp;codec-&gt;subsystem_id);</div><div class='add'>+</div><div class='add'>+	err = get_codec_vendor_name(codec);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	codec-&gt;chip_name = kasprintf(GFP_KERNEL, "ID %x",</div><div class='add'>+				     codec-&gt;vendor_id &amp; 0xffff);</div><div class='add'>+	if (!codec-&gt;chip_name) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	put_device(&amp;codec-&gt;dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_device_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_device_exit - clean up the HD-audio codec base device</div><div class='add'>+ * @codec: device to clean up</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_device_exit(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	pm_runtime_put_noidle(&amp;codec-&gt;dev);</div><div class='add'>+	/* keep balance of runtime PM child_count in parent device */</div><div class='add'>+	pm_runtime_set_suspended(&amp;codec-&gt;dev);</div><div class='add'>+	snd_hdac_bus_remove_device(codec-&gt;bus, codec);</div><div class='add'>+	kfree(codec-&gt;vendor_name);</div><div class='add'>+	kfree(codec-&gt;chip_name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_device_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_device_register - register the hd-audio codec base device</div><div class='add'>+ * @codec: the device to register</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_device_register(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = device_add(&amp;codec-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	scoped_guard(mutex, &amp;codec-&gt;widget_lock) {</div><div class='add'>+		err = hda_widget_sysfs_init(codec);</div><div class='add'>+	}</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		device_del(&amp;codec-&gt;dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_device_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_device_unregister - unregister the hd-audio codec base device</div><div class='add'>+ * @codec: the device to unregister</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_device_unregister(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (device_is_registered(&amp;codec-&gt;dev)) {</div><div class='add'>+		scoped_guard(mutex, &amp;codec-&gt;widget_lock) {</div><div class='add'>+			hda_widget_sysfs_exit(codec);</div><div class='add'>+		}</div><div class='add'>+		device_del(&amp;codec-&gt;dev);</div><div class='add'>+		snd_hdac_bus_remove_device(codec-&gt;bus, codec);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_device_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_device_set_chip_name - set/update the codec name</div><div class='add'>+ * @codec: the HDAC device</div><div class='add'>+ * @name: name string to set</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if the name is set or updated, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name)</div><div class='add'>+{</div><div class='add'>+	char *newname;</div><div class='add'>+</div><div class='add'>+	if (!name)</div><div class='add'>+		return 0;</div><div class='add'>+	newname = kstrdup(name, GFP_KERNEL);</div><div class='add'>+	if (!newname)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kfree(codec-&gt;chip_name);</div><div class='add'>+	codec-&gt;chip_name = newname;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_device_set_chip_name);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_codec_modalias - give the module alias name</div><div class='add'>+ * @codec: HDAC device</div><div class='add'>+ * @buf: string buffer to store</div><div class='add'>+ * @size: string buffer size</div><div class='add'>+ *</div><div class='add'>+ * Returns the size of string, like snprintf(), or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_codec_modalias(const struct hdac_device *codec, char *buf, size_t size)</div><div class='add'>+{</div><div class='add'>+	return scnprintf(buf, size, "hdaudio:v%08Xr%08Xa%02X\n",</div><div class='add'>+			codec-&gt;vendor_id, codec-&gt;revision_id, codec-&gt;type);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_codec_modalias);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_make_cmd - compose a 32bit command word to be sent to the</div><div class='add'>+ *	HD-audio controller</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to encode</div><div class='add'>+ * @verb: verb to encode</div><div class='add'>+ * @parm: parameter to encode</div><div class='add'>+ *</div><div class='add'>+ * Return an encoded command verb or -1 for error.</div><div class='add'>+ */</div><div class='add'>+static unsigned int snd_hdac_make_cmd(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				      unsigned int verb, unsigned int parm)</div><div class='add'>+{</div><div class='add'>+	u32 val, addr;</div><div class='add'>+</div><div class='add'>+	addr = codec-&gt;addr;</div><div class='add'>+	if ((addr &amp; ~0xf) || (nid &amp; ~0x7f) ||</div><div class='add'>+	    (verb &amp; ~0xfff) || (parm &amp; ~0xffff)) {</div><div class='add'>+		dev_err(&amp;codec-&gt;dev, "out of range cmd %x:%x:%x:%x\n",</div><div class='add'>+			addr, nid, verb, parm);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = addr &lt;&lt; 28;</div><div class='add'>+	val |= (u32)nid &lt;&lt; 20;</div><div class='add'>+	val |= verb &lt;&lt; 8;</div><div class='add'>+	val |= parm;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_exec_verb - execute an encoded verb</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @cmd: encoded verb to execute</div><div class='add'>+ * @flags: optional flags, pass zero for default</div><div class='add'>+ * @res: the pointer to store the result, NULL if running async</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ *</div><div class='add'>+ * This calls the exec_verb op when set in hdac_codec.  If not,</div><div class='add'>+ * call the default snd_hdac_bus_exec_verb().</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_exec_verb(struct hdac_device *codec, unsigned int cmd,</div><div class='add'>+		       unsigned int flags, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;exec_verb)</div><div class='add'>+		return codec-&gt;exec_verb(codec, cmd, flags, res);</div><div class='add'>+	return snd_hdac_bus_exec_verb(codec-&gt;bus, codec-&gt;addr, cmd, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_read - execute a verb</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to execute a verb</div><div class='add'>+ * @verb: verb to execute</div><div class='add'>+ * @parm: parameter for a verb</div><div class='add'>+ * @res: the pointer to store the result, NULL if running async</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_read(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+		  unsigned int verb, unsigned int parm, unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = snd_hdac_make_cmd(codec, nid, verb, parm);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_exec_verb(codec, cmd, 0, res);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_read);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * _snd_hdac_read_parm - read a parmeter</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to read a parameter</div><div class='add'>+ * @parm: parameter to read</div><div class='add'>+ * @res: pointer to store the read value</div><div class='add'>+ *</div><div class='add'>+ * This function returns zero or an error unlike snd_hdac_read_parm().</div><div class='add'>+ */</div><div class='add'>+int _snd_hdac_read_parm(struct hdac_device *codec, hda_nid_t nid, int parm,</div><div class='add'>+			unsigned int *res)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd;</div><div class='add'>+</div><div class='add'>+	cmd = snd_hdac_regmap_encode_verb(nid, AC_VERB_PARAMETERS) | parm;</div><div class='add'>+	return snd_hdac_regmap_read_raw(codec, cmd, res);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(_snd_hdac_read_parm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_read_parm_uncached - read a codec parameter without caching</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to read a parameter</div><div class='add'>+ * @parm: parameter to read</div><div class='add'>+ *</div><div class='add'>+ * Returns -1 for error.  If you need to distinguish the error more</div><div class='add'>+ * strictly, use snd_hdac_read() directly.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_read_parm_uncached(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				int parm)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd, val;</div><div class='add'>+</div><div class='add'>+	cmd = snd_hdac_regmap_encode_verb(nid, AC_VERB_PARAMETERS) | parm;</div><div class='add'>+	if (snd_hdac_regmap_read_raw_uncached(codec, cmd, &amp;val) &lt; 0)</div><div class='add'>+		return -1;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_read_parm_uncached);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_override_parm - override read-only parameters</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID for the parameter</div><div class='add'>+ * @parm: the parameter to change</div><div class='add'>+ * @val: the parameter value to overwrite</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_override_parm(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			   unsigned int parm, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int verb = (AC_VERB_PARAMETERS &lt;&lt; 8) | (nid &lt;&lt; 20) | parm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;regmap)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	codec-&gt;caps_overwriting = true;</div><div class='add'>+	err = snd_hdac_regmap_write_raw(codec, verb, val);</div><div class='add'>+	codec-&gt;caps_overwriting = false;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_override_parm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_get_sub_nodes - get start NID and number of subtree nodes</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to inspect</div><div class='add'>+ * @start_id: the pointer to store the starting NID</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of subtree nodes or zero if not found.</div><div class='add'>+ * This function reads parameters always without caching.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_get_sub_nodes(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			   hda_nid_t *start_id)</div><div class='add'>+{</div><div class='add'>+	unsigned int parm;</div><div class='add'>+</div><div class='add'>+	parm = snd_hdac_read_parm_uncached(codec, nid, AC_PAR_NODE_COUNT);</div><div class='add'>+	if (parm == -1) {</div><div class='add'>+		*start_id = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	*start_id = (parm &gt;&gt; 16) &amp; 0x7fff;</div><div class='add'>+	return (int)(parm &amp; 0x7fff);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_sub_nodes);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * look for an AFG and MFG nodes</div><div class='add'>+ */</div><div class='add'>+static void setup_fg_nodes(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	int i, total_nodes, function_id;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	total_nodes = snd_hdac_get_sub_nodes(codec, AC_NODE_ROOT, &amp;nid);</div><div class='add'>+	for (i = 0; i &lt; total_nodes; i++, nid++) {</div><div class='add'>+		function_id = snd_hdac_read_parm(codec, nid,</div><div class='add'>+						 AC_PAR_FUNCTION_TYPE);</div><div class='add'>+		switch (function_id &amp; 0xff) {</div><div class='add'>+		case AC_GRP_AUDIO_FUNCTION:</div><div class='add'>+			codec-&gt;afg = nid;</div><div class='add'>+			codec-&gt;afg_function_id = function_id &amp; 0xff;</div><div class='add'>+			codec-&gt;afg_unsol = (function_id &gt;&gt; 8) &amp; 1;</div><div class='add'>+			break;</div><div class='add'>+		case AC_GRP_MODEM_FUNCTION:</div><div class='add'>+			codec-&gt;mfg = nid;</div><div class='add'>+			codec-&gt;mfg_function_id = function_id &amp; 0xff;</div><div class='add'>+			codec-&gt;mfg_unsol = (function_id &gt;&gt; 8) &amp; 1;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_refresh_widgets - Reset the widget start/end nodes</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_refresh_widgets(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t start_nid;</div><div class='add'>+	int nums, err = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Serialize against multiple threads trying to update the sysfs</div><div class='add'>+	 * widgets array.</div><div class='add'>+	 */</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;widget_lock);</div><div class='add'>+	nums = snd_hdac_get_sub_nodes(codec, codec-&gt;afg, &amp;start_nid);</div><div class='add'>+	if (!start_nid || nums &lt;= 0 || nums &gt;= 0xff) {</div><div class='add'>+		dev_err(&amp;codec-&gt;dev, "cannot read sub nodes for FG 0x%02x\n",</div><div class='add'>+			codec-&gt;afg);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = hda_widget_sysfs_reinit(codec, start_nid, nums);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	codec-&gt;num_nodes = nums;</div><div class='add'>+	codec-&gt;start_nid = start_nid;</div><div class='add'>+	codec-&gt;end_nid = start_nid + nums;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_refresh_widgets);</div><div class='add'>+</div><div class='add'>+/* return CONNLIST_LEN parameter of the given widget */</div><div class='add'>+static unsigned int get_num_conns(struct hdac_device *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int wcaps = snd_hdac_get_wcaps(codec, nid);</div><div class='add'>+	unsigned int parm;</div><div class='add'>+</div><div class='add'>+	if (!(wcaps &amp; AC_WCAP_CONN_LIST) &amp;&amp;</div><div class='add'>+	    snd_hdac_get_wcaps_type(wcaps) != AC_WID_VOL_KNB)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parm = snd_hdac_read_parm(codec, nid, AC_PAR_CONNLIST_LEN);</div><div class='add'>+	if (parm == -1)</div><div class='add'>+		parm = 0;</div><div class='add'>+	return parm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_get_connections - get a widget connection list</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID</div><div class='add'>+ * @conn_list: the array to store the results, can be NULL</div><div class='add'>+ * @max_conns: the max size of the given array</div><div class='add'>+ *</div><div class='add'>+ * Returns the number of connected widgets, zero for no connection, or a</div><div class='add'>+ * negative error code.  When the number of elements don't fit with the</div><div class='add'>+ * given array size, it returns -ENOSPC.</div><div class='add'>+ *</div><div class='add'>+ * When @conn_list is NULL, it just checks the number of connections.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_get_connections(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			     hda_nid_t *conn_list, int max_conns)</div><div class='add'>+{</div><div class='add'>+	unsigned int parm;</div><div class='add'>+	int i, conn_len, conns, err;</div><div class='add'>+	unsigned int shift, num_elems, mask;</div><div class='add'>+	hda_nid_t prev_nid;</div><div class='add'>+	int null_count = 0;</div><div class='add'>+</div><div class='add'>+	parm = get_num_conns(codec, nid);</div><div class='add'>+	if (!parm)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (parm &amp; AC_CLIST_LONG) {</div><div class='add'>+		/* long form */</div><div class='add'>+		shift = 16;</div><div class='add'>+		num_elems = 2;</div><div class='add'>+	} else {</div><div class='add'>+		/* short form */</div><div class='add'>+		shift = 8;</div><div class='add'>+		num_elems = 4;</div><div class='add'>+	}</div><div class='add'>+	conn_len = parm &amp; AC_CLIST_LENGTH;</div><div class='add'>+	mask = (1 &lt;&lt; (shift-1)) - 1;</div><div class='add'>+</div><div class='add'>+	if (!conn_len)</div><div class='add'>+		return 0; /* no connection */</div><div class='add'>+</div><div class='add'>+	if (conn_len == 1) {</div><div class='add'>+		/* single connection */</div><div class='add'>+		err = snd_hdac_read(codec, nid, AC_VERB_GET_CONNECT_LIST, 0,</div><div class='add'>+				    &amp;parm);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (conn_list)</div><div class='add'>+			conn_list[0] = parm &amp; mask;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* multi connection */</div><div class='add'>+	conns = 0;</div><div class='add'>+	prev_nid = 0;</div><div class='add'>+	for (i = 0; i &lt; conn_len; i++) {</div><div class='add'>+		int range_val;</div><div class='add'>+		hda_nid_t val, n;</div><div class='add'>+</div><div class='add'>+		if (i % num_elems == 0) {</div><div class='add'>+			err = snd_hdac_read(codec, nid,</div><div class='add'>+					    AC_VERB_GET_CONNECT_LIST, i,</div><div class='add'>+					    &amp;parm);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return -EIO;</div><div class='add'>+		}</div><div class='add'>+		range_val = !!(parm &amp; (1 &lt;&lt; (shift-1))); /* ranges */</div><div class='add'>+		val = parm &amp; mask;</div><div class='add'>+		if (val == 0 &amp;&amp; null_count++) {  /* no second chance */</div><div class='add'>+			dev_dbg(&amp;codec-&gt;dev,</div><div class='add'>+				"invalid CONNECT_LIST verb %x[%i]:%x\n",</div><div class='add'>+				nid, i, parm);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		parm &gt;&gt;= shift;</div><div class='add'>+		if (range_val) {</div><div class='add'>+			/* ranges between the previous and this one */</div><div class='add'>+			if (!prev_nid || prev_nid &gt;= val) {</div><div class='add'>+				dev_warn(&amp;codec-&gt;dev,</div><div class='add'>+					 "invalid dep_range_val %x:%x\n",</div><div class='add'>+					 prev_nid, val);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			for (n = prev_nid + 1; n &lt;= val; n++) {</div><div class='add'>+				if (conn_list) {</div><div class='add'>+					if (conns &gt;= max_conns)</div><div class='add'>+						return -ENOSPC;</div><div class='add'>+					conn_list[conns] = n;</div><div class='add'>+				}</div><div class='add'>+				conns++;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (conn_list) {</div><div class='add'>+				if (conns &gt;= max_conns)</div><div class='add'>+					return -ENOSPC;</div><div class='add'>+				conn_list[conns] = val;</div><div class='add'>+			}</div><div class='add'>+			conns++;</div><div class='add'>+		}</div><div class='add'>+		prev_nid = val;</div><div class='add'>+	}</div><div class='add'>+	return conns;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_connections);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_power_up - power up the codec</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ *</div><div class='add'>+ * This function calls the runtime PM helper to power up the given codec.</div><div class='add'>+ * Unlike snd_hdac_power_up_pm(), you should call this only for the code</div><div class='add'>+ * path that isn't included in PM path.  Otherwise it gets stuck.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_power_up(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	return pm_runtime_get_sync(&amp;codec-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_power_up);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_power_down - power down the codec</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_power_down(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;codec-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return pm_runtime_put_autosuspend(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_power_down);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_power_up_pm - power up the codec</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ *</div><div class='add'>+ * This function can be called in a recursive code path like init code</div><div class='add'>+ * which may be called by PM suspend/resume again.  OTOH, if a power-up</div><div class='add'>+ * call must wake up the sleeper (e.g. in a kctl callback), use</div><div class='add'>+ * snd_hdac_power_up() instead.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_power_up_pm(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (!atomic_inc_not_zero(&amp;codec-&gt;in_pm))</div><div class='add'>+		return snd_hdac_power_up(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_power_up_pm);</div><div class='add'>+</div><div class='add'>+/* like snd_hdac_power_up_pm(), but only increment the pm count when</div><div class='add'>+ * already powered up.  Returns -1 if not powered up, 1 if incremented</div><div class='add'>+ * or 0 if unchanged.  Only used in hdac_regmap.c</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_keep_power_up(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (!atomic_inc_not_zero(&amp;codec-&gt;in_pm)) {</div><div class='add'>+		int ret = pm_runtime_get_if_active(&amp;codec-&gt;dev);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return -1;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_power_down_pm - power down the codec</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ *</div><div class='add'>+ * Like snd_hdac_power_up_pm(), this function is used in a recursive</div><div class='add'>+ * code path like init code which may be called by PM suspend/resume again.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_power_down_pm(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (atomic_dec_if_positive(&amp;codec-&gt;in_pm) &lt; 0)</div><div class='add'>+		return snd_hdac_power_down(codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_power_down_pm);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* codec vendor labels */</div><div class='add'>+struct hda_vendor_id {</div><div class='add'>+	unsigned int id;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hda_vendor_id hda_vendor_ids[] = {</div><div class='add'>+	{ 0x0014, "Loongson" },</div><div class='add'>+	{ 0x1002, "ATI" },</div><div class='add'>+	{ 0x1013, "Cirrus Logic" },</div><div class='add'>+	{ 0x1057, "Motorola" },</div><div class='add'>+	{ 0x1095, "Silicon Image" },</div><div class='add'>+	{ 0x10de, "Nvidia" },</div><div class='add'>+	{ 0x10ec, "Realtek" },</div><div class='add'>+	{ 0x1102, "Creative" },</div><div class='add'>+	{ 0x1106, "VIA" },</div><div class='add'>+	{ 0x111d, "IDT" },</div><div class='add'>+	{ 0x11c1, "LSI" },</div><div class='add'>+	{ 0x11d4, "Analog Devices" },</div><div class='add'>+	{ 0x13f6, "C-Media" },</div><div class='add'>+	{ 0x14f1, "Conexant" },</div><div class='add'>+	{ 0x17e8, "Chrontel" },</div><div class='add'>+	{ 0x1854, "LG" },</div><div class='add'>+	{ 0x19e5, "Huawei" },</div><div class='add'>+	{ 0x1aec, "Wolfson Microelectronics" },</div><div class='add'>+	{ 0x1af4, "QEMU" },</div><div class='add'>+	{ 0x1fa8, "Senarytech" },</div><div class='add'>+	{ 0x434d, "C-Media" },</div><div class='add'>+	{ 0x8086, "Intel" },</div><div class='add'>+	{ 0x8384, "SigmaTel" },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* store the codec vendor name */</div><div class='add'>+static int get_codec_vendor_name(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	const struct hda_vendor_id *c;</div><div class='add'>+	u16 vendor_id = codec-&gt;vendor_id &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	for (c = hda_vendor_ids; c-&gt;id; c++) {</div><div class='add'>+		if (c-&gt;id == vendor_id) {</div><div class='add'>+			codec-&gt;vendor_name = kstrdup(c-&gt;name, GFP_KERNEL);</div><div class='add'>+			return codec-&gt;vendor_name ? 0 : -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	codec-&gt;vendor_name = kasprintf(GFP_KERNEL, "Generic %04x", vendor_id);</div><div class='add'>+	return codec-&gt;vendor_name ? 0 : -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * stream formats</div><div class='add'>+ */</div><div class='add'>+struct hda_rate_tbl {</div><div class='add'>+	unsigned int hz;</div><div class='add'>+	unsigned int alsa_bits;</div><div class='add'>+	unsigned int hda_fmt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* rate = base * mult / div */</div><div class='add'>+#define HDA_RATE(base, mult, div) \</div><div class='add'>+	(AC_FMT_BASE_##base##K | (((mult) - 1) &lt;&lt; AC_FMT_MULT_SHIFT) | \</div><div class='add'>+	 (((div) - 1) &lt;&lt; AC_FMT_DIV_SHIFT))</div><div class='add'>+</div><div class='add'>+static const struct hda_rate_tbl rate_bits[] = {</div><div class='add'>+	/* rate in Hz, ALSA rate bitmask, HDA format value */</div><div class='add'>+</div><div class='add'>+	/* autodetected value used in snd_hda_query_supported_pcm */</div><div class='add'>+	{ 8000, SNDRV_PCM_RATE_8000, HDA_RATE(48, 1, 6) },</div><div class='add'>+	{ 11025, SNDRV_PCM_RATE_11025, HDA_RATE(44, 1, 4) },</div><div class='add'>+	{ 16000, SNDRV_PCM_RATE_16000, HDA_RATE(48, 1, 3) },</div><div class='add'>+	{ 22050, SNDRV_PCM_RATE_22050, HDA_RATE(44, 1, 2) },</div><div class='add'>+	{ 32000, SNDRV_PCM_RATE_32000, HDA_RATE(48, 2, 3) },</div><div class='add'>+	{ 44100, SNDRV_PCM_RATE_44100, HDA_RATE(44, 1, 1) },</div><div class='add'>+	{ 48000, SNDRV_PCM_RATE_48000, HDA_RATE(48, 1, 1) },</div><div class='add'>+	{ 88200, SNDRV_PCM_RATE_88200, HDA_RATE(44, 2, 1) },</div><div class='add'>+	{ 96000, SNDRV_PCM_RATE_96000, HDA_RATE(48, 2, 1) },</div><div class='add'>+	{ 176400, SNDRV_PCM_RATE_176400, HDA_RATE(44, 4, 1) },</div><div class='add'>+	{ 192000, SNDRV_PCM_RATE_192000, HDA_RATE(48, 4, 1) },</div><div class='add'>+#define AC_PAR_PCM_RATE_BITS	11</div><div class='add'>+	/* up to bits 10, 384kHZ isn't supported properly */</div><div class='add'>+</div><div class='add'>+	/* not autodetected value */</div><div class='add'>+	{ 9600, SNDRV_PCM_RATE_KNOT, HDA_RATE(48, 1, 5) },</div><div class='add'>+</div><div class='add'>+	{ 0 } /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static snd_pcm_format_t snd_hdac_format_normalize(snd_pcm_format_t format)</div><div class='add'>+{</div><div class='add'>+	switch (format) {</div><div class='add'>+	case SNDRV_PCM_FORMAT_S20_LE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_S24_LE:</div><div class='add'>+		return SNDRV_PCM_FORMAT_S32_LE;</div><div class='add'>+</div><div class='add'>+	case SNDRV_PCM_FORMAT_U20_LE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_U24_LE:</div><div class='add'>+		return SNDRV_PCM_FORMAT_U32_LE;</div><div class='add'>+</div><div class='add'>+	case SNDRV_PCM_FORMAT_S20_BE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_S24_BE:</div><div class='add'>+		return SNDRV_PCM_FORMAT_S32_BE;</div><div class='add'>+</div><div class='add'>+	case SNDRV_PCM_FORMAT_U20_BE:</div><div class='add'>+	case SNDRV_PCM_FORMAT_U24_BE:</div><div class='add'>+		return SNDRV_PCM_FORMAT_U32_BE;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return format;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_format_bits - obtain bits per sample value.</div><div class='add'>+ * @format:	the PCM format.</div><div class='add'>+ * @subformat:	the PCM subformat.</div><div class='add'>+ * @maxbits:	the maximum bits per sample.</div><div class='add'>+ *</div><div class='add'>+ * Return: The number of bits per sample.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hdac_stream_format_bits(snd_pcm_format_t format, snd_pcm_subformat_t subformat,</div><div class='add'>+					 unsigned int maxbits)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_hw_params params;</div><div class='add'>+	unsigned int bits;</div><div class='add'>+</div><div class='add'>+	memset(&amp;params, 0, sizeof(params));</div><div class='add'>+</div><div class='add'>+	params_set_format(&amp;params, snd_hdac_format_normalize(format));</div><div class='add'>+	snd_mask_set(hw_param_mask(&amp;params, SNDRV_PCM_HW_PARAM_SUBFORMAT),</div><div class='add'>+		     (__force unsigned int)subformat);</div><div class='add'>+</div><div class='add'>+	bits = snd_pcm_hw_params_bits(&amp;params);</div><div class='add'>+	if (maxbits)</div><div class='add'>+		return min(bits, maxbits);</div><div class='add'>+	return bits;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_format_bits);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_format - convert format parameters to SDxFMT value.</div><div class='add'>+ * @channels:	the number of channels.</div><div class='add'>+ * @bits:	bits per sample.</div><div class='add'>+ * @rate:	the sample rate.</div><div class='add'>+ *</div><div class='add'>+ * Return: The format bitset or zero if invalid.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hdac_stream_format(unsigned int channels, unsigned int bits, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; rate_bits[i].hz; i++) {</div><div class='add'>+		if (rate_bits[i].hz == rate) {</div><div class='add'>+			val = rate_bits[i].hda_fmt;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rate_bits[i].hz)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (channels == 0 || channels &gt; 16)</div><div class='add'>+		return 0;</div><div class='add'>+	val |= channels - 1;</div><div class='add'>+</div><div class='add'>+	switch (bits) {</div><div class='add'>+	case 8:</div><div class='add'>+		val |= AC_FMT_BITS_8;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		val |= AC_FMT_BITS_16;</div><div class='add'>+		break;</div><div class='add'>+	case 20:</div><div class='add'>+		val |= AC_FMT_BITS_20;</div><div class='add'>+		break;</div><div class='add'>+	case 24:</div><div class='add'>+		val |= AC_FMT_BITS_24;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		val |= AC_FMT_BITS_32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_format);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_spdif_stream_format - convert format parameters to SDxFMT value.</div><div class='add'>+ * @channels:	the number of channels.</div><div class='add'>+ * @bits:	bits per sample.</div><div class='add'>+ * @rate:	the sample rate.</div><div class='add'>+ * @spdif_ctls:	HD-audio SPDIF status bits (0 if irrelevant).</div><div class='add'>+ *</div><div class='add'>+ * Return: The format bitset or zero if invalid.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hdac_spdif_stream_format(unsigned int channels, unsigned int bits,</div><div class='add'>+					  unsigned int rate, unsigned short spdif_ctls)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = snd_hdac_stream_format(channels, bits, rate);</div><div class='add'>+</div><div class='add'>+	if (val &amp;&amp; spdif_ctls &amp; AC_DIG1_NONAUDIO)</div><div class='add'>+		val |= AC_FMT_TYPE_NON_PCM;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_spdif_stream_format);</div><div class='add'>+</div><div class='add'>+static unsigned int query_pcm_param(struct hdac_device *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+</div><div class='add'>+	if (nid != codec-&gt;afg &amp;&amp;</div><div class='add'>+	    (snd_hdac_get_wcaps(codec, nid) &amp; AC_WCAP_FORMAT_OVRD))</div><div class='add'>+		val = snd_hdac_read_parm(codec, nid, AC_PAR_PCM);</div><div class='add'>+	if (!val || val == -1)</div><div class='add'>+		val = snd_hdac_read_parm(codec, codec-&gt;afg, AC_PAR_PCM);</div><div class='add'>+	if (!val || val == -1)</div><div class='add'>+		return 0;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int query_stream_param(struct hdac_device *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int streams = snd_hdac_read_parm(codec, nid, AC_PAR_STREAM);</div><div class='add'>+</div><div class='add'>+	if (!streams || streams == -1)</div><div class='add'>+		streams = snd_hdac_read_parm(codec, codec-&gt;afg, AC_PAR_STREAM);</div><div class='add'>+	if (!streams || streams == -1)</div><div class='add'>+		return 0;</div><div class='add'>+	return streams;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_query_supported_pcm - query the supported PCM rates and formats</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to query</div><div class='add'>+ * @ratesp: the pointer to store the detected rate bitflags</div><div class='add'>+ * @formatsp: the pointer to store the detected formats</div><div class='add'>+ * @subformatsp: the pointer to store the detected subformats for S32_LE format</div><div class='add'>+ * @bpsp: the pointer to store the detected format widths</div><div class='add'>+ *</div><div class='add'>+ * Queries the supported PCM rates and formats.  The NULL @ratesp, @formatsp,</div><div class='add'>+ * @subformatsp or @bpsp argument is ignored.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, otherwise a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				 u32 *ratesp, u64 *formatsp, u32 *subformatsp,</div><div class='add'>+				 unsigned int *bpsp)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, val, wcaps;</div><div class='add'>+</div><div class='add'>+	wcaps = snd_hdac_get_wcaps(codec, nid);</div><div class='add'>+	val = query_pcm_param(codec, nid);</div><div class='add'>+</div><div class='add'>+	if (ratesp) {</div><div class='add'>+		u32 rates = 0;</div><div class='add'>+		for (i = 0; i &lt; AC_PAR_PCM_RATE_BITS; i++) {</div><div class='add'>+			if (val &amp; (1 &lt;&lt; i))</div><div class='add'>+				rates |= rate_bits[i].alsa_bits;</div><div class='add'>+		}</div><div class='add'>+		if (rates == 0) {</div><div class='add'>+			dev_err(&amp;codec-&gt;dev,</div><div class='add'>+				"rates == 0 (nid=0x%x, val=0x%x, ovrd=%i)\n",</div><div class='add'>+				nid, val,</div><div class='add'>+				(wcaps &amp; AC_WCAP_FORMAT_OVRD) ? 1 : 0);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		*ratesp = rates;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (formatsp || subformatsp || bpsp) {</div><div class='add'>+		unsigned int streams, bps;</div><div class='add'>+		u32 subformats = 0;</div><div class='add'>+		u64 formats = 0;</div><div class='add'>+</div><div class='add'>+		streams = query_stream_param(codec, nid);</div><div class='add'>+		if (!streams)</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		bps = 0;</div><div class='add'>+		if (streams &amp; AC_SUPFMT_PCM) {</div><div class='add'>+			if (val &amp; AC_SUPPCM_BITS_8) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_U8;</div><div class='add'>+				bps = 8;</div><div class='add'>+			}</div><div class='add'>+			if (val &amp; AC_SUPPCM_BITS_16) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_S16_LE;</div><div class='add'>+				bps = 16;</div><div class='add'>+			}</div><div class='add'>+			if (val &amp; AC_SUPPCM_BITS_20) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='add'>+				subformats |= SNDRV_PCM_SUBFMTBIT_MSBITS_20;</div><div class='add'>+				bps = 20;</div><div class='add'>+			}</div><div class='add'>+			if (val &amp; AC_SUPPCM_BITS_24) {</div><div class='add'>+				formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='add'>+				subformats |= SNDRV_PCM_SUBFMTBIT_MSBITS_24;</div><div class='add'>+				bps = 24;</div><div class='add'>+			}</div><div class='add'>+			if (val &amp; AC_SUPPCM_BITS_32) {</div><div class='add'>+				if (wcaps &amp; AC_WCAP_DIGITAL) {</div><div class='add'>+					formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;</div><div class='add'>+				} else {</div><div class='add'>+					formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='add'>+					subformats |= SNDRV_PCM_SUBFMTBIT_MSBITS_MAX;</div><div class='add'>+					bps = 32;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#if 0 /* FIXME: CS4206 doesn't work, which is the only codec supporting float */</div><div class='add'>+		if (streams &amp; AC_SUPFMT_FLOAT32) {</div><div class='add'>+			formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;</div><div class='add'>+			if (!bps)</div><div class='add'>+				bps = 32;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		if (streams == AC_SUPFMT_AC3) {</div><div class='add'>+			/* should be exclusive */</div><div class='add'>+			/* temporary hack: we have still no proper support</div><div class='add'>+			 * for the direct AC3 stream...</div><div class='add'>+			 */</div><div class='add'>+			formats |= SNDRV_PCM_FMTBIT_U8;</div><div class='add'>+			bps = 8;</div><div class='add'>+		}</div><div class='add'>+		if (formats == 0) {</div><div class='add'>+			dev_err(&amp;codec-&gt;dev,</div><div class='add'>+				"formats == 0 (nid=0x%x, val=0x%x, ovrd=%i, streams=0x%x)\n",</div><div class='add'>+				nid, val,</div><div class='add'>+				(wcaps &amp; AC_WCAP_FORMAT_OVRD) ? 1 : 0,</div><div class='add'>+				streams);</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+		if (formatsp)</div><div class='add'>+			*formatsp = formats;</div><div class='add'>+		if (subformatsp)</div><div class='add'>+			*subformatsp = subformats;</div><div class='add'>+		if (bpsp)</div><div class='add'>+			*bpsp = bps;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_query_supported_pcm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_is_supported_format - Check the validity of the format</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @nid: NID to check</div><div class='add'>+ * @format: the HD-audio format value to check</div><div class='add'>+ *</div><div class='add'>+ * Check whether the given node supports the format value.</div><div class='add'>+ *</div><div class='add'>+ * Returns true if supported, false if not.</div><div class='add'>+ */</div><div class='add'>+bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				  unsigned int format)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int val = 0, rate, stream;</div><div class='add'>+</div><div class='add'>+	val = query_pcm_param(codec, nid);</div><div class='add'>+	if (!val)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rate = format &amp; 0xff00;</div><div class='add'>+	for (i = 0; i &lt; AC_PAR_PCM_RATE_BITS; i++)</div><div class='add'>+		if (rate_bits[i].hda_fmt == rate) {</div><div class='add'>+			if (val &amp; (1 &lt;&lt; i))</div><div class='add'>+				break;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	if (i &gt;= AC_PAR_PCM_RATE_BITS)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	stream = query_stream_param(codec, nid);</div><div class='add'>+	if (!stream)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (stream &amp; AC_SUPFMT_PCM) {</div><div class='add'>+		switch (format &amp; 0xf0) {</div><div class='add'>+		case 0x00:</div><div class='add'>+			if (!(val &amp; AC_SUPPCM_BITS_8))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		case 0x10:</div><div class='add'>+			if (!(val &amp; AC_SUPPCM_BITS_16))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		case 0x20:</div><div class='add'>+			if (!(val &amp; AC_SUPPCM_BITS_20))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		case 0x30:</div><div class='add'>+			if (!(val &amp; AC_SUPPCM_BITS_24))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		case 0x40:</div><div class='add'>+			if (!(val &amp; AC_SUPPCM_BITS_32))</div><div class='add'>+				return false;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* FIXME: check for float32 and AC3? */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_is_supported_format);</div><div class='add'>+</div><div class='add'>+static unsigned int codec_read(struct hdac_device *hdac, hda_nid_t nid,</div><div class='add'>+			int flags, unsigned int verb, unsigned int parm)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = snd_hdac_make_cmd(hdac, nid, verb, parm);</div><div class='add'>+	unsigned int res;</div><div class='add'>+</div><div class='add'>+	if (snd_hdac_exec_verb(hdac, cmd, flags, &amp;res))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int codec_write(struct hdac_device *hdac, hda_nid_t nid,</div><div class='add'>+			int flags, unsigned int verb, unsigned int parm)</div><div class='add'>+{</div><div class='add'>+	unsigned int cmd = snd_hdac_make_cmd(hdac, nid, verb, parm);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_exec_verb(hdac, cmd, flags, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_codec_read - send a command and get the response</div><div class='add'>+ * @hdac: the HDAC device</div><div class='add'>+ * @nid: NID to send the command</div><div class='add'>+ * @flags: optional bit flags</div><div class='add'>+ * @verb: the verb to send</div><div class='add'>+ * @parm: the parameter for the verb</div><div class='add'>+ *</div><div class='add'>+ * Send a single command and read the corresponding response.</div><div class='add'>+ *</div><div class='add'>+ * Returns the obtained response value, or -1 for an error.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_codec_read(struct hdac_device *hdac, hda_nid_t nid,</div><div class='add'>+			int flags, unsigned int verb, unsigned int parm)</div><div class='add'>+{</div><div class='add'>+	return codec_read(hdac, nid, flags, verb, parm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_codec_read);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_codec_write - send a single command without waiting for response</div><div class='add'>+ * @hdac: the HDAC device</div><div class='add'>+ * @nid: NID to send the command</div><div class='add'>+ * @flags: optional bit flags</div><div class='add'>+ * @verb: the verb to send</div><div class='add'>+ * @parm: the parameter for the verb</div><div class='add'>+ *</div><div class='add'>+ * Send a single command without waiting for response.</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_codec_write(struct hdac_device *hdac, hda_nid_t nid,</div><div class='add'>+			int flags, unsigned int verb, unsigned int parm)</div><div class='add'>+{</div><div class='add'>+	return codec_write(hdac, nid, flags, verb, parm);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_codec_write);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_check_power_state - check whether the actual power state matches</div><div class='add'>+ * with the target state</div><div class='add'>+ *</div><div class='add'>+ * @hdac: the HDAC device</div><div class='add'>+ * @nid: NID to send the command</div><div class='add'>+ * @target_state: target state to check for</div><div class='add'>+ *</div><div class='add'>+ * Return true if state matches, false if not</div><div class='add'>+ */</div><div class='add'>+bool snd_hdac_check_power_state(struct hdac_device *hdac,</div><div class='add'>+		hda_nid_t nid, unsigned int target_state)</div><div class='add'>+{</div><div class='add'>+	unsigned int state = codec_read(hdac, nid, 0,</div><div class='add'>+				AC_VERB_GET_POWER_STATE, 0);</div><div class='add'>+</div><div class='add'>+	if (state &amp; AC_PWRST_ERROR)</div><div class='add'>+		return true;</div><div class='add'>+	state = (state &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+	return (state == target_state);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_check_power_state);</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_sync_power_state - wait until actual power state matches</div><div class='add'>+ * with the target state</div><div class='add'>+ *</div><div class='add'>+ * @codec: the HDAC device</div><div class='add'>+ * @nid: NID to send the command</div><div class='add'>+ * @power_state: target power state to wait for</div><div class='add'>+ *</div><div class='add'>+ * Return power state or PS_ERROR if codec rejects GET verb.</div><div class='add'>+ */</div><div class='add'>+unsigned int snd_hdac_sync_power_state(struct hdac_device *codec,</div><div class='add'>+			hda_nid_t nid, unsigned int power_state)</div><div class='add'>+{</div><div class='add'>+	unsigned long end_time = jiffies + msecs_to_jiffies(500);</div><div class='add'>+	unsigned int state, actual_state, count;</div><div class='add'>+</div><div class='add'>+	for (count = 0; count &lt; 500; count++) {</div><div class='add'>+		state = snd_hdac_codec_read(codec, nid, 0,</div><div class='add'>+				AC_VERB_GET_POWER_STATE, 0);</div><div class='add'>+		if (state &amp; AC_PWRST_ERROR) {</div><div class='add'>+			msleep(20);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		actual_state = (state &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+		if (actual_state == power_state)</div><div class='add'>+			break;</div><div class='add'>+		if (time_after_eq(jiffies, end_time))</div><div class='add'>+			break;</div><div class='add'>+		/* wait until the codec reachs to the target state */</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	return state;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_sync_power_state);</div><div class='head'>diff --git a/sound/hda/core/ext/Makefile b/sound/hda/core/ext/Makefile<br/>new file mode 100644<br/>index 000000000000..85190a7eb5de<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/ext/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/ext/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-hda-ext-core-y := bus.o controller.o stream.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_HDA_EXT_CORE) += snd-hda-ext-core.o</div><div class='head'>diff --git a/sound/hda/core/ext/bus.c b/sound/hda/core/ext/bus.c<br/>new file mode 100644<br/>index 000000000000..6004ea1c373e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/ext/bus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/ext/bus.c</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  hdac-ext-bus.c - HD-audio extended core bus functions.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2014-2015 Intel Corp</div><div class='add'>+ *  Author: Jeeja KP &lt;jeeja.kp@intel.com&gt;</div><div class='add'>+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio_ext.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HDA extended core");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_init - initialize a HD-audio extended bus</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ * @dev: device pointer</div><div class='add'>+ * @ops: bus verb operators</div><div class='add'>+ * @ext_ops: operators used for ASoC HDA codec drivers</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 if successful, or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,</div><div class='add'>+			const struct hdac_bus_ops *ops,</div><div class='add'>+			const struct hdac_ext_bus_ops *ext_ops)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = snd_hdac_bus_init(bus, dev, ops);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bus-&gt;ext_ops = ext_ops;</div><div class='add'>+	/* FIXME:</div><div class='add'>+	 * Currently only one bus is supported, if there is device with more</div><div class='add'>+	 * buses, bus-&gt;idx should be greater than 0, but there needs to be a</div><div class='add'>+	 * reliable way to always assign same number.</div><div class='add'>+	 */</div><div class='add'>+	bus-&gt;idx = 0;</div><div class='add'>+	bus-&gt;cmd_dma_state = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_exit - clean up a HD-audio extended bus</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_exit(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_bus_exit(bus);</div><div class='add'>+	WARN_ON(!list_empty(&amp;bus-&gt;hlink_list));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_device_remove - remove HD-audio extended codec base devices</div><div class='add'>+ *</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec, *__codec;</div><div class='add'>+	/*</div><div class='add'>+	 * we need to remove all the codec devices objects created in the</div><div class='add'>+	 * snd_hdac_ext_bus_device_init</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry_safe(codec, __codec, &amp;bus-&gt;codec_list, list) {</div><div class='add'>+		snd_hdac_device_unregister(codec);</div><div class='add'>+		put_device(&amp;codec-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_remove);</div><div class='add'>+#define dev_to_hdac(dev) (container_of((dev), \</div><div class='add'>+			struct hdac_device, dev))</div><div class='add'>+</div><div class='add'>+static inline struct hdac_driver *get_hdrv(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hdac_driver *hdrv = drv_to_hdac_driver(dev-&gt;driver);</div><div class='add'>+	return hdrv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct hdac_device *get_hdev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *hdev = dev_to_hdac_dev(dev);</div><div class='add'>+	return hdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_ext_drv_probe(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return (get_hdrv(dev))-&gt;probe(get_hdev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdac_ext_drv_remove(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return (get_hdrv(dev))-&gt;remove(get_hdev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdac_ext_drv_shutdown(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return (get_hdrv(dev))-&gt;shutdown(get_hdev(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_ext_driver_register - register a driver for ext hda devices</div><div class='add'>+ *</div><div class='add'>+ * @drv: ext hda driver structure</div><div class='add'>+ */</div><div class='add'>+int snd_hda_ext_driver_register(struct hdac_driver *drv)</div><div class='add'>+{</div><div class='add'>+	drv-&gt;type = HDA_DEV_ASOC;</div><div class='add'>+	drv-&gt;driver.bus = &amp;snd_hda_bus_type;</div><div class='add'>+	/* we use default match */</div><div class='add'>+</div><div class='add'>+	if (drv-&gt;probe)</div><div class='add'>+		drv-&gt;driver.probe = hda_ext_drv_probe;</div><div class='add'>+	if (drv-&gt;remove)</div><div class='add'>+		drv-&gt;driver.remove = hdac_ext_drv_remove;</div><div class='add'>+	if (drv-&gt;shutdown)</div><div class='add'>+		drv-&gt;driver.shutdown = hdac_ext_drv_shutdown;</div><div class='add'>+</div><div class='add'>+	return driver_register(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_ext_driver_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hda_ext_driver_unregister - unregister a driver for ext hda devices</div><div class='add'>+ *</div><div class='add'>+ * @drv: ext hda driver structure</div><div class='add'>+ */</div><div class='add'>+void snd_hda_ext_driver_unregister(struct hdac_driver *drv)</div><div class='add'>+{</div><div class='add'>+	driver_unregister(&amp;drv-&gt;driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_ext_driver_unregister);</div><div class='head'>diff --git a/sound/hda/core/ext/controller.c b/sound/hda/core/ext/controller.c<br/>new file mode 100644<br/>index 000000000000..9eea3ea2dae0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/ext/controller.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/ext/controller.c</a></div><div class='hunk'>@@ -0,0 +1,410 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  hdac-ext-controller.c - HD-audio extended controller functions.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2014-2015 Intel Corp</div><div class='add'>+ *  Author: Jeeja KP &lt;jeeja.kp@intel.com&gt;</div><div class='add'>+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio_ext.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * processing pipe helpers - these helpers are useful for dealing with HDA</div><div class='add'>+ * new capability of processing pipelines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_ppcap_enable - enable/disable processing pipe capability</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ * @enable: flag to turn on/off the capability</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_ppcap_enable(struct hdac_bus *bus, bool enable)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;ppcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of PP capability is NULL");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL,</div><div class='add'>+				 AZX_PPCTL_GPROCEN, AZX_PPCTL_GPROCEN);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL,</div><div class='add'>+				 AZX_PPCTL_GPROCEN, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_ppcap_enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_ppcap_int_enable - ppcap interrupt enable/disable</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ * @enable: flag to enable/disable interrupt</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_bus *bus, bool enable)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;ppcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of PP capability is NULL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL,</div><div class='add'>+				 AZX_PPCTL_PIE, AZX_PPCTL_PIE);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL,</div><div class='add'>+				 AZX_PPCTL_PIE, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_ppcap_int_enable);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Multilink helpers - these helpers are useful for dealing with HDA</div><div class='add'>+ * new multilink capability</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_get_ml_capabilities - get multilink capability</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ *</div><div class='add'>+ * This will parse all links and read the mlink capabilities and add them</div><div class='add'>+ * in hlink_list of extended hdac bus</div><div class='add'>+ * Note: this will be freed on bus exit by driver</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+	u32 link_count;</div><div class='add'>+	struct hdac_ext_link *hlink;</div><div class='add'>+	u32 leptr;</div><div class='add'>+</div><div class='add'>+	link_count = readl(bus-&gt;mlcap + AZX_REG_ML_MLCD) + 1;</div><div class='add'>+</div><div class='add'>+	dev_dbg(bus-&gt;dev, "In %s Link count: %d\n", __func__, link_count);</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; link_count; idx++) {</div><div class='add'>+		hlink  = kzalloc(sizeof(*hlink), GFP_KERNEL);</div><div class='add'>+		if (!hlink)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		hlink-&gt;index = idx;</div><div class='add'>+		hlink-&gt;bus = bus;</div><div class='add'>+		hlink-&gt;ml_addr = bus-&gt;mlcap + AZX_ML_BASE +</div><div class='add'>+					(AZX_ML_INTERVAL * idx);</div><div class='add'>+		hlink-&gt;lcaps  = readl(hlink-&gt;ml_addr + AZX_REG_ML_LCAP);</div><div class='add'>+		hlink-&gt;lsdiid = readw(hlink-&gt;ml_addr + AZX_REG_ML_LSDIID);</div><div class='add'>+		hlink-&gt;slcount = FIELD_GET(AZX_ML_HDA_LCAP_SLCOUNT, hlink-&gt;lcaps) + 1;</div><div class='add'>+</div><div class='add'>+		if (hdac_ext_link_alt(hlink)) {</div><div class='add'>+			leptr = readl(hlink-&gt;ml_addr + AZX_REG_ML_LEPTR);</div><div class='add'>+			hlink-&gt;id = FIELD_GET(AZX_REG_ML_LEPTR_ID, leptr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* since link in On, update the ref */</div><div class='add'>+		hlink-&gt;ref_count = 1;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;hlink-&gt;list, &amp;bus-&gt;hlink_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_ml_capabilities);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_link_free_all- free hdac extended link objects</div><div class='add'>+ *</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void snd_hdac_ext_link_free_all(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_link *hlink;</div><div class='add'>+</div><div class='add'>+	while (!list_empty(&amp;bus-&gt;hlink_list)) {</div><div class='add'>+		hlink = list_first_entry(&amp;bus-&gt;hlink_list, struct hdac_ext_link, list);</div><div class='add'>+		list_del(&amp;hlink-&gt;list);</div><div class='add'>+		kfree(hlink);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_link_free_all);</div><div class='add'>+</div><div class='add'>+struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_id(struct hdac_bus *bus, u32 id)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_link *hlink;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(hlink, &amp;bus-&gt;hlink_list, list)</div><div class='add'>+		if (hdac_ext_link_alt(hlink) &amp;&amp; hlink-&gt;id == id)</div><div class='add'>+			return hlink;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_hlink_by_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_get_hlink_by_addr - get hlink at specified address</div><div class='add'>+ * @bus: hlink's parent bus device</div><div class='add'>+ * @addr: codec device address</div><div class='add'>+ *</div><div class='add'>+ * Returns hlink object or NULL if matching hlink is not found.</div><div class='add'>+ */</div><div class='add'>+struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_addr(struct hdac_bus *bus, int addr)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_link *hlink;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(hlink, &amp;bus-&gt;hlink_list, list)</div><div class='add'>+		if (hlink-&gt;lsdiid &amp; (0x1 &lt;&lt; addr))</div><div class='add'>+			return hlink;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_hlink_by_addr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_get_hlink_by_name - get hlink based on codec name</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ * @codec_name: codec name</div><div class='add'>+ */</div><div class='add'>+struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_name(struct hdac_bus *bus,</div><div class='add'>+							 const char *codec_name)</div><div class='add'>+{</div><div class='add'>+	int bus_idx, addr;</div><div class='add'>+</div><div class='add'>+	if (sscanf(codec_name, "ehdaudio%dD%d", &amp;bus_idx, &amp;addr) != 2)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (bus-&gt;idx != bus_idx)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (addr &lt; 0 || addr &gt; 31)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return snd_hdac_ext_bus_get_hlink_by_addr(bus, addr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_hlink_by_name);</div><div class='add'>+</div><div class='add'>+static int check_hdac_link_power_active(struct hdac_ext_link *hlink, bool enable)</div><div class='add'>+{</div><div class='add'>+	int timeout;</div><div class='add'>+	u32 val;</div><div class='add'>+	int mask = (1 &lt;&lt; AZX_ML_LCTL_CPA_SHIFT);</div><div class='add'>+</div><div class='add'>+	udelay(3);</div><div class='add'>+	timeout = 150;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		val = readl(hlink-&gt;ml_addr + AZX_REG_ML_LCTL);</div><div class='add'>+		if (enable) {</div><div class='add'>+			if (((val &amp; mask) &gt;&gt; AZX_ML_LCTL_CPA_SHIFT))</div><div class='add'>+				return 0;</div><div class='add'>+		} else {</div><div class='add'>+			if (!((val &amp; mask) &gt;&gt; AZX_ML_LCTL_CPA_SHIFT))</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+		udelay(3);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_power_up -power up hda link</div><div class='add'>+ * @hlink: HD-audio extended link</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_link_power_up(struct hdac_ext_link *hlink)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatel(hlink-&gt;ml_addr, AZX_REG_ML_LCTL,</div><div class='add'>+			 AZX_ML_LCTL_SPA, AZX_ML_LCTL_SPA);</div><div class='add'>+</div><div class='add'>+	return check_hdac_link_power_active(hlink, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_up);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_power_down -power down hda link</div><div class='add'>+ * @hlink: HD-audio extended link</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_link_power_down(struct hdac_ext_link *hlink)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatel(hlink-&gt;ml_addr, AZX_REG_ML_LCTL, AZX_ML_LCTL_SPA, 0);</div><div class='add'>+</div><div class='add'>+	return check_hdac_link_power_active(hlink, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_power_up_all -power up all hda link</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_link_power_up_all(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_link *hlink = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(hlink, &amp;bus-&gt;hlink_list, list) {</div><div class='add'>+		ret = snd_hdac_ext_bus_link_power_up(hlink);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_up_all);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_power_down_all -power down all hda link</div><div class='add'>+ * @bus: the pointer to HDAC bus object</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_bus_link_power_down_all(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_link *hlink = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(hlink, &amp;bus-&gt;hlink_list, list) {</div><div class='add'>+		ret = snd_hdac_ext_bus_link_power_down(hlink);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_set_stream_id - maps stream id to link output</div><div class='add'>+ * @link: HD-audio ext link to set up</div><div class='add'>+ * @stream: stream id</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_link_set_stream_id(struct hdac_ext_link *link,</div><div class='add'>+					 int stream)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatew(link-&gt;ml_addr, AZX_REG_ML_LOSIDV, (1 &lt;&lt; stream), 1 &lt;&lt; stream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_set_stream_id);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_bus_link_clear_stream_id - maps stream id to link output</div><div class='add'>+ * @link: HD-audio ext link to set up</div><div class='add'>+ * @stream: stream id</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_bus_link_clear_stream_id(struct hdac_ext_link *link,</div><div class='add'>+					   int stream)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatew(link-&gt;ml_addr, AZX_REG_ML_LOSIDV, (1 &lt;&lt; stream), 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_clear_stream_id);</div><div class='add'>+</div><div class='add'>+int snd_hdac_ext_bus_link_get(struct hdac_bus *bus,</div><div class='add'>+				struct hdac_ext_link *hlink)</div><div class='add'>+{</div><div class='add'>+	unsigned long codec_mask;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bus-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if we move from 0 to 1, count will be 1 so power up this link</div><div class='add'>+	 * as well, also check the dma status and trigger that</div><div class='add'>+	 */</div><div class='add'>+	if (++hlink-&gt;ref_count == 1) {</div><div class='add'>+		if (!bus-&gt;cmd_dma_state) {</div><div class='add'>+			snd_hdac_bus_init_cmd_io(bus);</div><div class='add'>+			bus-&gt;cmd_dma_state = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = snd_hdac_ext_bus_link_power_up(hlink);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * clear the register to invalidate all the output streams</div><div class='add'>+		 */</div><div class='add'>+		snd_hdac_updatew(hlink-&gt;ml_addr, AZX_REG_ML_LOSIDV,</div><div class='add'>+				 AZX_ML_LOSIDV_STREAM_MASK, 0);</div><div class='add'>+		/*</div><div class='add'>+		 *  wait for 521usec for codec to report status</div><div class='add'>+		 *  HDA spec section 4.3 - Codec Discovery</div><div class='add'>+		 */</div><div class='add'>+		udelay(521);</div><div class='add'>+		codec_mask = snd_hdac_chip_readw(bus, STATESTS);</div><div class='add'>+		dev_dbg(bus-&gt;dev, "codec_mask = 0x%lx\n", codec_mask);</div><div class='add'>+		snd_hdac_chip_writew(bus, STATESTS, codec_mask);</div><div class='add'>+		if (!bus-&gt;codec_mask)</div><div class='add'>+			bus-&gt;codec_mask = codec_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_get);</div><div class='add'>+</div><div class='add'>+int snd_hdac_ext_bus_link_put(struct hdac_bus *bus,</div><div class='add'>+			      struct hdac_ext_link *hlink)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	struct hdac_ext_link *hlink_tmp;</div><div class='add'>+	bool link_up = false;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;bus-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if we move from 1 to 0, count will be 0</div><div class='add'>+	 * so power down this link as well</div><div class='add'>+	 */</div><div class='add'>+	if (--hlink-&gt;ref_count == 0) {</div><div class='add'>+		ret = snd_hdac_ext_bus_link_power_down(hlink);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * now check if all links are off, if so turn off</div><div class='add'>+		 * cmd dma as well</div><div class='add'>+		 */</div><div class='add'>+		list_for_each_entry(hlink_tmp, &amp;bus-&gt;hlink_list, list) {</div><div class='add'>+			if (hlink_tmp-&gt;ref_count) {</div><div class='add'>+				link_up = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!link_up) {</div><div class='add'>+			snd_hdac_bus_stop_cmd_io(bus);</div><div class='add'>+			bus-&gt;cmd_dma_state = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_put);</div><div class='add'>+</div><div class='add'>+static void hdac_ext_codec_link_up(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	const char *devname = dev_name(&amp;codec-&gt;dev);</div><div class='add'>+	struct hdac_ext_link *hlink =</div><div class='add'>+		snd_hdac_ext_bus_get_hlink_by_name(codec-&gt;bus, devname);</div><div class='add'>+</div><div class='add'>+	if (hlink)</div><div class='add'>+		snd_hdac_ext_bus_link_get(codec-&gt;bus, hlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdac_ext_codec_link_down(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	const char *devname = dev_name(&amp;codec-&gt;dev);</div><div class='add'>+	struct hdac_ext_link *hlink =</div><div class='add'>+		snd_hdac_ext_bus_get_hlink_by_name(codec-&gt;bus, devname);</div><div class='add'>+</div><div class='add'>+	if (hlink)</div><div class='add'>+		snd_hdac_ext_bus_link_put(codec-&gt;bus, hlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hdac_ext_bus_link_power(struct hdac_device *codec, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = codec-&gt;bus;</div><div class='add'>+	bool oldstate = test_bit(codec-&gt;addr, &amp;bus-&gt;codec_powered);</div><div class='add'>+</div><div class='add'>+	if (enable == oldstate)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	snd_hdac_bus_link_power(codec, enable);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		hdac_ext_codec_link_up(codec);</div><div class='add'>+	else</div><div class='add'>+		hdac_ext_codec_link_down(codec);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power);</div><div class='head'>diff --git a/sound/hda/core/ext/stream.c b/sound/hda/core/ext/stream.c<br/>new file mode 100644<br/>index 000000000000..b4759198e51d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/ext/stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/ext/stream.c</a></div><div class='hunk'>@@ -0,0 +1,449 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ *  hdac-ext-stream.c - HD-audio extended stream operations.</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2015 Intel Corp</div><div class='add'>+ *  Author: Jeeja KP &lt;jeeja.kp@intel.com&gt;</div><div class='add'>+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ *</div><div class='add'>+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio_ext.h&gt;</div><div class='add'>+#include &lt;sound/compress_driver.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_host_stream_setup - Setup a HOST stream.</div><div class='add'>+ * @hext_stream: HDAudio stream to set up.</div><div class='add'>+ * @code_loading: Whether the stream is for PCM or code-loading.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success or negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_host_stream_setup(struct hdac_ext_stream *hext_stream, bool code_loading)</div><div class='add'>+{</div><div class='add'>+	return hext_stream-&gt;host_setup(hdac_stream(hext_stream), code_loading);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_host_stream_setup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_apl_host_stream_setup - Setup a HOST stream following procedure</div><div class='add'>+ *                                  recommended for ApolloLake devices.</div><div class='add'>+ * @hstream: HDAudio stream to set up.</div><div class='add'>+ * @code_loading: Whether the stream is for PCM or code-loading.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero on success or negative error code.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_apl_host_stream_setup(struct hdac_stream *hstream, bool code_loading)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	snd_hdac_ext_stream_decouple(hstream-&gt;bus, hext_stream, false);</div><div class='add'>+	ret = snd_hdac_stream_setup(hstream, code_loading);</div><div class='add'>+	snd_hdac_ext_stream_decouple(hstream-&gt;bus, hext_stream, true);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_init - initialize each stream (aka device)</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @hext_stream: HD-audio ext core stream object to initialize</div><div class='add'>+ * @idx: stream index number</div><div class='add'>+ * @direction: stream direction (SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+ * @tag: the tag id to assign</div><div class='add'>+ *</div><div class='add'>+ * initialize the stream, if ppcap is enabled then init those and then</div><div class='add'>+ * invoke hdac stream initialization routine</div><div class='add'>+ */</div><div class='add'>+static void snd_hdac_ext_stream_init(struct hdac_bus *bus,</div><div class='add'>+				     struct hdac_ext_stream *hext_stream,</div><div class='add'>+				     int idx, int direction, int tag)</div><div class='add'>+{</div><div class='add'>+	if (bus-&gt;ppcap) {</div><div class='add'>+		hext_stream-&gt;pphc_addr = bus-&gt;ppcap + AZX_PPHC_BASE +</div><div class='add'>+				AZX_PPHC_INTERVAL * idx;</div><div class='add'>+</div><div class='add'>+		hext_stream-&gt;pplc_addr = bus-&gt;ppcap + AZX_PPLC_BASE +</div><div class='add'>+				AZX_PPLC_MULTI * bus-&gt;num_streams +</div><div class='add'>+				AZX_PPLC_INTERVAL * idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hext_stream-&gt;decoupled = false;</div><div class='add'>+	snd_hdac_stream_init(bus, &amp;hext_stream-&gt;hstream, idx, direction, tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_init_all - create and initialize the stream objects</div><div class='add'>+ *   for an extended hda bus</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @start_idx: start index for streams</div><div class='add'>+ * @num_stream: number of streams to initialize</div><div class='add'>+ * @dir: direction of streams</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_stream_init_all(struct hdac_bus *bus, int start_idx,</div><div class='add'>+				 int num_stream, int dir)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(bus-&gt;dev);</div><div class='add'>+	int (*setup_op)(struct hdac_stream *, bool);</div><div class='add'>+	int stream_tag = 0;</div><div class='add'>+	int i, tag, idx = start_idx;</div><div class='add'>+</div><div class='add'>+	if (pci-&gt;device == PCI_DEVICE_ID_INTEL_HDA_APL)</div><div class='add'>+		setup_op = snd_hdac_apl_host_stream_setup;</div><div class='add'>+	else</div><div class='add'>+		setup_op = snd_hdac_stream_setup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_stream; i++) {</div><div class='add'>+		struct hdac_ext_stream *hext_stream =</div><div class='add'>+				kzalloc(sizeof(*hext_stream), GFP_KERNEL);</div><div class='add'>+		if (!hext_stream)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		tag = ++stream_tag;</div><div class='add'>+		snd_hdac_ext_stream_init(bus, hext_stream, idx, dir, tag);</div><div class='add'>+		idx++;</div><div class='add'>+		hext_stream-&gt;host_setup = setup_op;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_free_all - free hdac extended stream objects</div><div class='add'>+ *</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_free_all(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *s, *_s;</div><div class='add'>+	struct hdac_ext_stream *hext_stream;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(s, _s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		hext_stream = stream_to_hdac_ext_stream(s);</div><div class='add'>+		snd_hdac_ext_stream_decouple(bus, hext_stream, false);</div><div class='add'>+		list_del(&amp;s-&gt;list);</div><div class='add'>+		kfree(hext_stream);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_free_all);</div><div class='add'>+</div><div class='add'>+void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus,</div><div class='add'>+					 struct hdac_ext_stream *hext_stream,</div><div class='add'>+					 bool decouple)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *hstream = &amp;hext_stream-&gt;hstream;</div><div class='add'>+	u32 val;</div><div class='add'>+	int mask = AZX_PPCTL_PROCEN(hstream-&gt;index);</div><div class='add'>+</div><div class='add'>+	val = readw(bus-&gt;ppcap + AZX_REG_PP_PPCTL) &amp; mask;</div><div class='add'>+</div><div class='add'>+	if (decouple &amp;&amp; !val)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL, mask, mask);</div><div class='add'>+	else if (!decouple &amp;&amp; val)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;ppcap, AZX_REG_PP_PPCTL, mask, 0);</div><div class='add'>+</div><div class='add'>+	hext_stream-&gt;decoupled = decouple;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple_locked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_decouple - decouple the hdac stream</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @hext_stream: HD-audio ext core stream object to initialize</div><div class='add'>+ * @decouple: flag to decouple</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,</div><div class='add'>+				  struct hdac_ext_stream *hext_stream, bool decouple)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	snd_hdac_ext_stream_decouple_locked(bus, hext_stream, decouple);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_decouple);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_start - start a stream</div><div class='add'>+ * @hext_stream: HD-audio ext core stream to start</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_start(struct hdac_ext_stream *hext_stream)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatel(hext_stream-&gt;pplc_addr, AZX_REG_PPLCCTL,</div><div class='add'>+			 AZX_PPLCCTL_RUN, AZX_PPLCCTL_RUN);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_start);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_clear - stop a stream DMA</div><div class='add'>+ * @hext_stream: HD-audio ext core stream to stop</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_clear(struct hdac_ext_stream *hext_stream)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_updatel(hext_stream-&gt;pplc_addr, AZX_REG_PPLCCTL, AZX_PPLCCTL_RUN, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_clear);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_reset - reset a stream</div><div class='add'>+ * @hext_stream: HD-audio ext core stream to reset</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_reset(struct hdac_ext_stream *hext_stream)</div><div class='add'>+{</div><div class='add'>+	unsigned char val;</div><div class='add'>+	int timeout;</div><div class='add'>+</div><div class='add'>+	snd_hdac_ext_stream_clear(hext_stream);</div><div class='add'>+</div><div class='add'>+	snd_hdac_updatel(hext_stream-&gt;pplc_addr, AZX_REG_PPLCCTL,</div><div class='add'>+			 AZX_PPLCCTL_STRST, AZX_PPLCCTL_STRST);</div><div class='add'>+	udelay(3);</div><div class='add'>+	timeout = 50;</div><div class='add'>+	do {</div><div class='add'>+		val = readl(hext_stream-&gt;pplc_addr + AZX_REG_PPLCCTL) &amp;</div><div class='add'>+				AZX_PPLCCTL_STRST;</div><div class='add'>+		if (val)</div><div class='add'>+			break;</div><div class='add'>+		udelay(3);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+	val &amp;= ~AZX_PPLCCTL_STRST;</div><div class='add'>+	writel(val, hext_stream-&gt;pplc_addr + AZX_REG_PPLCCTL);</div><div class='add'>+	udelay(3);</div><div class='add'>+</div><div class='add'>+	timeout = 50;</div><div class='add'>+	/* waiting for hardware to report that the stream is out of reset */</div><div class='add'>+	do {</div><div class='add'>+		val = readl(hext_stream-&gt;pplc_addr + AZX_REG_PPLCCTL) &amp; AZX_PPLCCTL_STRST;</div><div class='add'>+		if (!val)</div><div class='add'>+			break;</div><div class='add'>+		udelay(3);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_reset);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_setup -  set up the SD for streaming</div><div class='add'>+ * @hext_stream: HD-audio ext core stream to set up</div><div class='add'>+ * @fmt: stream format</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_ext_stream_setup(struct hdac_ext_stream *hext_stream, int fmt)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *hstream = &amp;hext_stream-&gt;hstream;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	/* make sure the run bit is zero for SD */</div><div class='add'>+	snd_hdac_ext_stream_clear(hext_stream);</div><div class='add'>+	/* program the stream_tag */</div><div class='add'>+	val = readl(hext_stream-&gt;pplc_addr + AZX_REG_PPLCCTL);</div><div class='add'>+	val = (val &amp; ~AZX_PPLCCTL_STRM_MASK) |</div><div class='add'>+		(hstream-&gt;stream_tag &lt;&lt; AZX_PPLCCTL_STRM_SHIFT);</div><div class='add'>+	writel(val, hext_stream-&gt;pplc_addr + AZX_REG_PPLCCTL);</div><div class='add'>+</div><div class='add'>+	/* program the stream format */</div><div class='add'>+	writew(fmt, hext_stream-&gt;pplc_addr + AZX_REG_PPLCFMT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_setup);</div><div class='add'>+</div><div class='add'>+static struct hdac_ext_stream *</div><div class='add'>+hdac_ext_link_dma_stream_assign(struct hdac_bus *bus,</div><div class='add'>+				struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_stream *res = NULL;</div><div class='add'>+	struct hdac_stream *hstream = NULL;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;ppcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "stream type not supported\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	list_for_each_entry(hstream, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		struct hdac_ext_stream *hext_stream = container_of(hstream,</div><div class='add'>+								 struct hdac_ext_stream,</div><div class='add'>+								 hstream);</div><div class='add'>+		if (hstream-&gt;direction != substream-&gt;stream)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* check if link stream is available */</div><div class='add'>+		if (!hext_stream-&gt;link_locked) {</div><div class='add'>+			res = hext_stream;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+	if (res) {</div><div class='add'>+		snd_hdac_ext_stream_decouple_locked(bus, res, true);</div><div class='add'>+		res-&gt;link_locked = 1;</div><div class='add'>+		res-&gt;link_substream = substream;</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hdac_ext_stream *</div><div class='add'>+hdac_ext_host_dma_stream_assign(struct hdac_bus *bus,</div><div class='add'>+				struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_stream *res = NULL;</div><div class='add'>+	struct hdac_stream *hstream = NULL;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;ppcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "stream type not supported\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	list_for_each_entry(hstream, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		struct hdac_ext_stream *hext_stream = container_of(hstream,</div><div class='add'>+								 struct hdac_ext_stream,</div><div class='add'>+								 hstream);</div><div class='add'>+		if (hstream-&gt;direction != substream-&gt;stream)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!hstream-&gt;opened) {</div><div class='add'>+			res = hext_stream;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (res) {</div><div class='add'>+		snd_hdac_ext_stream_decouple_locked(bus, res, true);</div><div class='add'>+		res-&gt;hstream.opened = 1;</div><div class='add'>+		res-&gt;hstream.running = 0;</div><div class='add'>+		res-&gt;hstream.substream = substream;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_assign - assign a stream for the PCM</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ * @type: type of stream (coupled, host or link stream)</div><div class='add'>+ *</div><div class='add'>+ * This assigns the stream based on the type (coupled/host/link), for the</div><div class='add'>+ * given PCM substream, assigns it and returns the stream object</div><div class='add'>+ *</div><div class='add'>+ * coupled: Looks for an unused stream</div><div class='add'>+ * host: Looks for an unused decoupled host stream</div><div class='add'>+ * link: Looks for an unused decoupled link stream</div><div class='add'>+ *</div><div class='add'>+ * If no stream is free, returns NULL. The function tries to keep using</div><div class='add'>+ * the same stream object when it's used beforehand.  when a stream is</div><div class='add'>+ * decoupled, it becomes a host stream and link stream.</div><div class='add'>+ */</div><div class='add'>+struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_bus *bus,</div><div class='add'>+					   struct snd_pcm_substream *substream,</div><div class='add'>+					   int type)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_stream *hext_stream = NULL;</div><div class='add'>+	struct hdac_stream *hstream = NULL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_COUPLED:</div><div class='add'>+		hstream = snd_hdac_stream_assign(bus, substream);</div><div class='add'>+		if (hstream)</div><div class='add'>+			hext_stream = container_of(hstream,</div><div class='add'>+						   struct hdac_ext_stream,</div><div class='add'>+						   hstream);</div><div class='add'>+		return hext_stream;</div><div class='add'>+</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_HOST:</div><div class='add'>+		return hdac_ext_host_dma_stream_assign(bus, substream);</div><div class='add'>+</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_LINK:</div><div class='add'>+		return hdac_ext_link_dma_stream_assign(bus, substream);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_assign);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_stream_release - release the assigned stream</div><div class='add'>+ * @hext_stream: HD-audio ext core stream to release</div><div class='add'>+ * @type: type of stream (coupled, host or link stream)</div><div class='add'>+ *</div><div class='add'>+ * Release the stream that has been assigned by snd_hdac_ext_stream_assign().</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_ext_stream_release(struct hdac_ext_stream *hext_stream, int type)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = hext_stream-&gt;hstream.bus;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_COUPLED:</div><div class='add'>+		snd_hdac_stream_release(&amp;hext_stream-&gt;hstream);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_HOST:</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+			/* couple link only if not in use */</div><div class='add'>+			if (!hext_stream-&gt;link_locked)</div><div class='add'>+				snd_hdac_ext_stream_decouple_locked(bus, hext_stream, false);</div><div class='add'>+			snd_hdac_stream_release_locked(&amp;hext_stream-&gt;hstream);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HDAC_EXT_STREAM_TYPE_LINK:</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+			/* couple host only if not in use */</div><div class='add'>+			if (!hext_stream-&gt;hstream.opened)</div><div class='add'>+				snd_hdac_ext_stream_decouple_locked(bus, hext_stream, false);</div><div class='add'>+			hext_stream-&gt;link_locked = 0;</div><div class='add'>+			hext_stream-&gt;link_substream = NULL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(bus-&gt;dev, "Invalid type %d\n", type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_release);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_ext_cstream_assign - assign a host stream for compress</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @cstream: Compress stream to assign</div><div class='add'>+ *</div><div class='add'>+ * Assign an unused host stream for the given compress stream.</div><div class='add'>+ * If no stream is free, NULL is returned. Stream is decoupled</div><div class='add'>+ * before assignment.</div><div class='add'>+ */</div><div class='add'>+struct hdac_ext_stream *snd_hdac_ext_cstream_assign(struct hdac_bus *bus,</div><div class='add'>+						    struct snd_compr_stream *cstream)</div><div class='add'>+{</div><div class='add'>+	struct hdac_ext_stream *res = NULL;</div><div class='add'>+	struct hdac_stream *hstream;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	list_for_each_entry(hstream, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		struct hdac_ext_stream *hext_stream = stream_to_hdac_ext_stream(hstream);</div><div class='add'>+</div><div class='add'>+		if (hstream-&gt;direction != cstream-&gt;direction)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!hstream-&gt;opened) {</div><div class='add'>+			res = hext_stream;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (res) {</div><div class='add'>+		snd_hdac_ext_stream_decouple_locked(bus, res, true);</div><div class='add'>+		res-&gt;hstream.opened = 1;</div><div class='add'>+		res-&gt;hstream.running = 0;</div><div class='add'>+		res-&gt;hstream.cstream = cstream;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_ext_cstream_assign);</div><div class='head'>diff --git a/sound/hda/core/hda_bus_type.c b/sound/hda/core/hda_bus_type.c<br/>new file mode 100644<br/>index 000000000000..eb72a7af2e56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/hda_bus_type.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/hda_bus_type.c</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio bus</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("HD-audio bus");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hdac_get_device_id - gets the hdac device id entry</div><div class='add'>+ * @hdev: HD-audio core device</div><div class='add'>+ * @drv: HD-audio codec driver</div><div class='add'>+ *</div><div class='add'>+ * Compares the hdac device vendor_id and revision_id to the hdac_device</div><div class='add'>+ * driver id_table and returns the matching device id entry.</div><div class='add'>+ */</div><div class='add'>+const struct hda_device_id *</div><div class='add'>+hdac_get_device_id(struct hdac_device *hdev, const struct hdac_driver *drv)</div><div class='add'>+{</div><div class='add'>+	if (drv-&gt;id_table) {</div><div class='add'>+		const struct hda_device_id *id  = drv-&gt;id_table;</div><div class='add'>+</div><div class='add'>+		while (id-&gt;vendor_id) {</div><div class='add'>+			if (hdev-&gt;vendor_id == id-&gt;vendor_id &amp;&amp;</div><div class='add'>+				(!id-&gt;rev_id || id-&gt;rev_id == hdev-&gt;revision_id))</div><div class='add'>+				return id;</div><div class='add'>+			id++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(hdac_get_device_id);</div><div class='add'>+</div><div class='add'>+static int hdac_codec_match(struct hdac_device *dev, const struct hdac_driver *drv)</div><div class='add'>+{</div><div class='add'>+	if (hdac_get_device_id(dev, drv))</div><div class='add'>+		return 1;</div><div class='add'>+	else</div><div class='add'>+		return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_bus_match(struct device *dev, const struct device_driver *drv)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *hdev = dev_to_hdac_dev(dev);</div><div class='add'>+	const struct hdac_driver *hdrv = drv_to_hdac_driver(drv);</div><div class='add'>+</div><div class='add'>+	if (hdev-&gt;type != hdrv-&gt;type)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * if driver provided a match function use that otherwise we will</div><div class='add'>+	 * use hdac_codec_match function</div><div class='add'>+	 */</div><div class='add'>+	if (hdrv-&gt;match)</div><div class='add'>+		return hdrv-&gt;match(hdev, hdrv);</div><div class='add'>+	else</div><div class='add'>+		return hdac_codec_match(hdev, hdrv);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_uevent(const struct device *dev, struct kobj_uevent_env *env)</div><div class='add'>+{</div><div class='add'>+	char modalias[32];</div><div class='add'>+</div><div class='add'>+	snd_hdac_codec_modalias(dev_to_hdac_dev(dev), modalias,</div><div class='add'>+				sizeof(modalias));</div><div class='add'>+	if (add_uevent_var(env, "MODALIAS=%s", modalias))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct bus_type snd_hda_bus_type = {</div><div class='add'>+	.name = "hdaudio",</div><div class='add'>+	.match = hda_bus_match,</div><div class='add'>+	.uevent = hda_uevent,</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hda_bus_type);</div><div class='add'>+</div><div class='add'>+static int __init hda_bus_init(void)</div><div class='add'>+{</div><div class='add'>+	return bus_register(&amp;snd_hda_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit hda_bus_exit(void)</div><div class='add'>+{</div><div class='add'>+	bus_unregister(&amp;snd_hda_bus_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+subsys_initcall(hda_bus_init);</div><div class='add'>+module_exit(hda_bus_exit);</div><div class='head'>diff --git a/sound/hda/core/hdmi_chmap.c b/sound/hda/core/hdmi_chmap.c<br/>new file mode 100644<br/>index 000000000000..7b276047f85a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/hdmi_chmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/hdmi_chmap.c</a></div><div class='hunk'>@@ -0,0 +1,868 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HDMI Channel map support helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;sound/hda_chmap.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CEA speaker placement:</div><div class='add'>+ *</div><div class='add'>+ *        FLH       FCH        FRH</div><div class='add'>+ *  FLW    FL  FLC   FC   FRC   FR   FRW</div><div class='add'>+ *</div><div class='add'>+ *                                  LFE</div><div class='add'>+ *                     TC</div><div class='add'>+ *</div><div class='add'>+ *          RL  RLC   RC   RRC   RR</div><div class='add'>+ *</div><div class='add'>+ * The Left/Right Surround channel _notions_ LS/RS in SMPTE 320M corresponds to</div><div class='add'>+ * CEA RL/RR; The SMPTE channel _assignment_ C/LFE is swapped to CEA LFE/FC.</div><div class='add'>+ */</div><div class='add'>+enum cea_speaker_placement {</div><div class='add'>+	FL  = (1 &lt;&lt;  0),	/* Front Left           */</div><div class='add'>+	FC  = (1 &lt;&lt;  1),	/* Front Center         */</div><div class='add'>+	FR  = (1 &lt;&lt;  2),	/* Front Right          */</div><div class='add'>+	FLC = (1 &lt;&lt;  3),	/* Front Left Center    */</div><div class='add'>+	FRC = (1 &lt;&lt;  4),	/* Front Right Center   */</div><div class='add'>+	RL  = (1 &lt;&lt;  5),	/* Rear Left            */</div><div class='add'>+	RC  = (1 &lt;&lt;  6),	/* Rear Center          */</div><div class='add'>+	RR  = (1 &lt;&lt;  7),	/* Rear Right           */</div><div class='add'>+	RLC = (1 &lt;&lt;  8),	/* Rear Left Center     */</div><div class='add'>+	RRC = (1 &lt;&lt;  9),	/* Rear Right Center    */</div><div class='add'>+	LFE = (1 &lt;&lt; 10),	/* Low Frequency Effect */</div><div class='add'>+	FLW = (1 &lt;&lt; 11),	/* Front Left Wide      */</div><div class='add'>+	FRW = (1 &lt;&lt; 12),	/* Front Right Wide     */</div><div class='add'>+	FLH = (1 &lt;&lt; 13),	/* Front Left High      */</div><div class='add'>+	FCH = (1 &lt;&lt; 14),	/* Front Center High    */</div><div class='add'>+	FRH = (1 &lt;&lt; 15),	/* Front Right High     */</div><div class='add'>+	TC  = (1 &lt;&lt; 16),	/* Top Center           */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const cea_speaker_allocation_names[] = {</div><div class='add'>+	/*  0 */ "FL/FR",</div><div class='add'>+	/*  1 */ "LFE",</div><div class='add'>+	/*  2 */ "FC",</div><div class='add'>+	/*  3 */ "RL/RR",</div><div class='add'>+	/*  4 */ "RC",</div><div class='add'>+	/*  5 */ "FLC/FRC",</div><div class='add'>+	/*  6 */ "RLC/RRC",</div><div class='add'>+	/*  7 */ "FLW/FRW",</div><div class='add'>+	/*  8 */ "FLH/FRH",</div><div class='add'>+	/*  9 */ "TC",</div><div class='add'>+	/* 10 */ "FCH",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ELD SA bits in the CEA Speaker Allocation data block</div><div class='add'>+ */</div><div class='add'>+static const int eld_speaker_allocation_bits[] = {</div><div class='add'>+	[0] = FL | FR,</div><div class='add'>+	[1] = LFE,</div><div class='add'>+	[2] = FC,</div><div class='add'>+	[3] = RL | RR,</div><div class='add'>+	[4] = RC,</div><div class='add'>+	[5] = FLC | FRC,</div><div class='add'>+	[6] = RLC | RRC,</div><div class='add'>+	/* the following are not defined in ELD yet */</div><div class='add'>+	[7] = FLW | FRW,</div><div class='add'>+	[8] = FLH | FRH,</div><div class='add'>+	[9] = TC,</div><div class='add'>+	[10] = FCH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ALSA sequence is:</div><div class='add'>+ *</div><div class='add'>+ *       surround40   surround41   surround50   surround51   surround71</div><div class='add'>+ * ch0   front left   =            =            =            =</div><div class='add'>+ * ch1   front right  =            =            =            =</div><div class='add'>+ * ch2   rear left    =            =            =            =</div><div class='add'>+ * ch3   rear right   =            =            =            =</div><div class='add'>+ * ch4                LFE          center       center       center</div><div class='add'>+ * ch5                                          LFE          LFE</div><div class='add'>+ * ch6                                                       side left</div><div class='add'>+ * ch7                                                       side right</div><div class='add'>+ *</div><div class='add'>+ * surround71 = {FL, FR, RLC, RRC, FC, LFE, RL, RR}</div><div class='add'>+ */</div><div class='add'>+static int hdmi_channel_mapping[0x32][8] = {</div><div class='add'>+	/* stereo */</div><div class='add'>+	[0x00] = { 0x00, 0x11, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='add'>+	/* 2.1 */</div><div class='add'>+	[0x01] = { 0x00, 0x11, 0x22, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='add'>+	/* Dolby Surround */</div><div class='add'>+	[0x02] = { 0x00, 0x11, 0x23, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='add'>+	/* surround40 */</div><div class='add'>+	[0x08] = { 0x00, 0x11, 0x24, 0x35, 0xf3, 0xf2, 0xf6, 0xf7 },</div><div class='add'>+	/* 4ch */</div><div class='add'>+	[0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 },</div><div class='add'>+	/* surround41 */</div><div class='add'>+	[0x09] = { 0x00, 0x11, 0x24, 0x35, 0x42, 0xf3, 0xf6, 0xf7 },</div><div class='add'>+	/* surround50 */</div><div class='add'>+	[0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 },</div><div class='add'>+	/* surround51 */</div><div class='add'>+	[0x0b] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0x52, 0xf6, 0xf7 },</div><div class='add'>+	/* 7.1 */</div><div class='add'>+	[0x13] = { 0x00, 0x11, 0x26, 0x37, 0x43, 0x52, 0x64, 0x75 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is an ordered list!</div><div class='add'>+ *</div><div class='add'>+ * The preceding ones have better chances to be selected by</div><div class='add'>+ * hdmi_channel_allocation().</div><div class='add'>+ */</div><div class='add'>+static struct hdac_cea_channel_speaker_allocation channel_allocations[] = {</div><div class='add'>+/*			  channel:   7     6    5    4    3     2    1    0  */</div><div class='add'>+{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },</div><div class='add'>+				 /* 2.1 */</div><div class='add'>+{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },</div><div class='add'>+				 /* Dolby Surround */</div><div class='add'>+{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },</div><div class='add'>+				 /* surround40 */</div><div class='add'>+{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+				 /* surround41 */</div><div class='add'>+{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+				 /* surround50 */</div><div class='add'>+{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+				 /* surround51 */</div><div class='add'>+{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+				 /* 6.1 */</div><div class='add'>+{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+				 /* surround71 */</div><div class='add'>+{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+</div><div class='add'>+{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x20,  .speakers = {   0,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x21,  .speakers = {   0,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x22,  .speakers = {  TC,    0,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x23,  .speakers = {  TC,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x24,  .speakers = { FRH,  FLH,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x25,  .speakers = { FRH,  FLH,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x26,  .speakers = { FRW,  FLW,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x27,  .speakers = { FRW,  FLW,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x28,  .speakers = {  TC,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x29,  .speakers = {  TC,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2a,  .speakers = { FCH,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2b,  .speakers = { FCH,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2c,  .speakers = {  TC,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2d,  .speakers = {  TC,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2e,  .speakers = { FRH,  FLH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x2f,  .speakers = { FRH,  FLH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x30,  .speakers = { FRW,  FLW,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='add'>+{ .ca_index = 0x31,  .speakers = { FRW,  FLW,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hdmi_pin_set_slot_channel(struct hdac_device *codec,</div><div class='add'>+		hda_nid_t pin_nid, int asp_slot, int channel)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_codec_write(codec, pin_nid, 0,</div><div class='add'>+				AC_VERB_SET_HDMI_CHAN_SLOT,</div><div class='add'>+				(channel &lt;&lt; 4) | asp_slot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_pin_get_slot_channel(struct hdac_device *codec,</div><div class='add'>+			hda_nid_t pin_nid, int asp_slot)</div><div class='add'>+{</div><div class='add'>+	return (snd_hdac_codec_read(codec, pin_nid, 0,</div><div class='add'>+				   AC_VERB_GET_HDMI_CHAN_SLOT,</div><div class='add'>+				   asp_slot) &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_get_channel_count(struct hdac_device *codec, hda_nid_t cvt_nid)</div><div class='add'>+{</div><div class='add'>+	return 1 + snd_hdac_codec_read(codec, cvt_nid, 0,</div><div class='add'>+					AC_VERB_GET_CVT_CHAN_COUNT, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_set_channel_count(struct hdac_device *codec,</div><div class='add'>+				   hda_nid_t cvt_nid, int chs)</div><div class='add'>+{</div><div class='add'>+	if (chs != hdmi_get_channel_count(codec, cvt_nid))</div><div class='add'>+		snd_hdac_codec_write(codec, cvt_nid, 0,</div><div class='add'>+				    AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Channel mapping routines</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compute derived values in channel_allocations[].</div><div class='add'>+ */</div><div class='add'>+static void init_channel_allocations(void)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+	struct hdac_cea_channel_speaker_allocation *p;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='add'>+		p = channel_allocations + i;</div><div class='add'>+		p-&gt;channels = 0;</div><div class='add'>+		p-&gt;spk_mask = 0;</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(p-&gt;speakers); j++)</div><div class='add'>+			if (p-&gt;speakers[j]) {</div><div class='add'>+				p-&gt;channels++;</div><div class='add'>+				p-&gt;spk_mask |= p-&gt;speakers[j];</div><div class='add'>+			}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_channel_allocation_order(int ca)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='add'>+		if (channel_allocations[i].ca_index == ca)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hdac_print_channel_allocation(int spk_alloc, char *buf, int buflen)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(cea_speaker_allocation_names); i++) {</div><div class='add'>+		if (spk_alloc &amp; (1 &lt;&lt; i))</div><div class='add'>+			j += scnprintf(buf + j, buflen - j,  " %s",</div><div class='add'>+					cea_speaker_allocation_names[i]);</div><div class='add'>+	}</div><div class='add'>+	buf[j] = '\0';	/* necessary when j == 0 */</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_print_channel_allocation);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The transformation takes two steps:</div><div class='add'>+ *</div><div class='add'>+ *	eld-&gt;spk_alloc =&gt; (eld_speaker_allocation_bits[]) =&gt; spk_mask</div><div class='add'>+ *	      spk_mask =&gt; (channel_allocations[])         =&gt; ai-&gt;CA</div><div class='add'>+ *</div><div class='add'>+ * TODO: it could select the wrong CA from multiple candidates.</div><div class='add'>+*/</div><div class='add'>+static int hdmi_channel_allocation_spk_alloc_blk(struct hdac_device *codec,</div><div class='add'>+				   int spk_alloc, int channels)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ca = 0;</div><div class='add'>+	int spk_mask = 0;</div><div class='add'>+	char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * CA defaults to 0 for basic stereo audio</div><div class='add'>+	 */</div><div class='add'>+	if (channels &lt;= 2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * expand ELD's speaker allocation mask</div><div class='add'>+	 *</div><div class='add'>+	 * ELD tells the speaker mask in a compact(paired) form,</div><div class='add'>+	 * expand ELD's notions to match the ones used by Audio InfoFrame.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eld_speaker_allocation_bits); i++) {</div><div class='add'>+		if (spk_alloc &amp; (1 &lt;&lt; i))</div><div class='add'>+			spk_mask |= eld_speaker_allocation_bits[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* search for the first working match in the CA table */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='add'>+		if (channels == channel_allocations[i].channels &amp;&amp;</div><div class='add'>+		    (spk_mask &amp; channel_allocations[i].spk_mask) ==</div><div class='add'>+				channel_allocations[i].spk_mask) {</div><div class='add'>+			ca = channel_allocations[i].ca_index;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ca) {</div><div class='add'>+		/*</div><div class='add'>+		 * if there was no match, select the regular ALSA channel</div><div class='add'>+		 * allocation with the matching number of channels</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='add'>+			if (channels == channel_allocations[i].channels) {</div><div class='add'>+				ca = channel_allocations[i].ca_index;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hdac_print_channel_allocation(spk_alloc, buf, sizeof(buf));</div><div class='add'>+	dev_dbg(&amp;codec-&gt;dev, "HDMI: select CA 0x%x for %d-channel allocation: %s\n",</div><div class='add'>+		    ca, channels, buf);</div><div class='add'>+</div><div class='add'>+	return ca;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_debug_channel_mapping(struct hdac_chmap *chmap,</div><div class='add'>+				       hda_nid_t pin_nid)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+	int i;</div><div class='add'>+	int channel;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		channel = chmap-&gt;ops.pin_get_slot_channel(</div><div class='add'>+				chmap-&gt;hdac, pin_nid, i);</div><div class='add'>+		dev_dbg(&amp;chmap-&gt;hdac-&gt;dev, "HDMI: ASP channel %d =&gt; slot %d\n",</div><div class='add'>+						channel, i);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_std_setup_channel_mapping(struct hdac_chmap *chmap,</div><div class='add'>+				       hda_nid_t pin_nid,</div><div class='add'>+				       bool non_pcm,</div><div class='add'>+				       int ca)</div><div class='add'>+{</div><div class='add'>+	struct hdac_cea_channel_speaker_allocation *ch_alloc;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	int order;</div><div class='add'>+	int non_pcm_mapping[8];</div><div class='add'>+</div><div class='add'>+	order = get_channel_allocation_order(ca);</div><div class='add'>+	ch_alloc = &amp;channel_allocations[order];</div><div class='add'>+</div><div class='add'>+	if (hdmi_channel_mapping[ca][1] == 0) {</div><div class='add'>+		int hdmi_slot = 0;</div><div class='add'>+		/* fill actual channel mappings in ALSA channel (i) order */</div><div class='add'>+		for (i = 0; i &lt; ch_alloc-&gt;channels; i++) {</div><div class='add'>+			while (!WARN_ON(hdmi_slot &gt;= 8) &amp;&amp;</div><div class='add'>+			       !ch_alloc-&gt;speakers[7 - hdmi_slot])</div><div class='add'>+				hdmi_slot++; /* skip zero slots */</div><div class='add'>+</div><div class='add'>+			hdmi_channel_mapping[ca][i] = (i &lt;&lt; 4) | hdmi_slot++;</div><div class='add'>+		}</div><div class='add'>+		/* fill the rest of the slots with ALSA channel 0xf */</div><div class='add'>+		for (hdmi_slot = 0; hdmi_slot &lt; 8; hdmi_slot++)</div><div class='add'>+			if (!ch_alloc-&gt;speakers[7 - hdmi_slot])</div><div class='add'>+				hdmi_channel_mapping[ca][i++] = (0xf &lt;&lt; 4) | hdmi_slot;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (non_pcm) {</div><div class='add'>+		for (i = 0; i &lt; ch_alloc-&gt;channels; i++)</div><div class='add'>+			non_pcm_mapping[i] = (i &lt;&lt; 4) | i;</div><div class='add'>+		for (; i &lt; 8; i++)</div><div class='add'>+			non_pcm_mapping[i] = (0xf &lt;&lt; 4) | i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		int slotsetup = non_pcm ? non_pcm_mapping[i] : hdmi_channel_mapping[ca][i];</div><div class='add'>+		int hdmi_slot = slotsetup &amp; 0x0f;</div><div class='add'>+		int channel = (slotsetup &amp; 0xf0) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+		err = chmap-&gt;ops.pin_set_slot_channel(chmap-&gt;hdac,</div><div class='add'>+				pin_nid, hdmi_slot, channel);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_dbg(&amp;chmap-&gt;hdac-&gt;dev, "HDMI: channel mapping failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct channel_map_table {</div><div class='add'>+	unsigned char map;		/* ALSA API channel map position */</div><div class='add'>+	int spk_mask;			/* speaker position bit mask */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct channel_map_table map_tables[] = {</div><div class='add'>+	{ SNDRV_CHMAP_FL,	FL },</div><div class='add'>+	{ SNDRV_CHMAP_FR,	FR },</div><div class='add'>+	{ SNDRV_CHMAP_RL,	RL },</div><div class='add'>+	{ SNDRV_CHMAP_RR,	RR },</div><div class='add'>+	{ SNDRV_CHMAP_LFE,	LFE },</div><div class='add'>+	{ SNDRV_CHMAP_FC,	FC },</div><div class='add'>+	{ SNDRV_CHMAP_RLC,	RLC },</div><div class='add'>+	{ SNDRV_CHMAP_RRC,	RRC },</div><div class='add'>+	{ SNDRV_CHMAP_RC,	RC },</div><div class='add'>+	{ SNDRV_CHMAP_FLC,	FLC },</div><div class='add'>+	{ SNDRV_CHMAP_FRC,	FRC },</div><div class='add'>+	{ SNDRV_CHMAP_TFL,	FLH },</div><div class='add'>+	{ SNDRV_CHMAP_TFR,	FRH },</div><div class='add'>+	{ SNDRV_CHMAP_FLW,	FLW },</div><div class='add'>+	{ SNDRV_CHMAP_FRW,	FRW },</div><div class='add'>+	{ SNDRV_CHMAP_TC,	TC },</div><div class='add'>+	{ SNDRV_CHMAP_TFC,	FCH },</div><div class='add'>+	{} /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* from ALSA API channel position to speaker bit mask */</div><div class='add'>+int snd_hdac_chmap_to_spk_mask(unsigned char c)</div><div class='add'>+{</div><div class='add'>+	struct channel_map_table *t = map_tables;</div><div class='add'>+</div><div class='add'>+	for (; t-&gt;map; t++) {</div><div class='add'>+		if (t-&gt;map == c)</div><div class='add'>+			return t-&gt;spk_mask;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_chmap_to_spk_mask);</div><div class='add'>+</div><div class='add'>+/* from ALSA API channel position to CEA slot */</div><div class='add'>+static int to_cea_slot(int ordered_ca, unsigned char pos)</div><div class='add'>+{</div><div class='add'>+	int mask = snd_hdac_chmap_to_spk_mask(pos);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Add sanity check to pass klockwork check.</div><div class='add'>+	 * This should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (ordered_ca &gt;= ARRAY_SIZE(channel_allocations))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		for (i = 0; i &lt; 8; i++) {</div><div class='add'>+			if (channel_allocations[ordered_ca].speakers[7 - i] == mask)</div><div class='add'>+				return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* from speaker bit mask to ALSA API channel position */</div><div class='add'>+int snd_hdac_spk_to_chmap(int spk)</div><div class='add'>+{</div><div class='add'>+	struct channel_map_table *t = map_tables;</div><div class='add'>+</div><div class='add'>+	for (; t-&gt;map; t++) {</div><div class='add'>+		if (t-&gt;spk_mask == spk)</div><div class='add'>+			return t-&gt;map;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_spk_to_chmap);</div><div class='add'>+</div><div class='add'>+/* from CEA slot to ALSA API channel position */</div><div class='add'>+static int from_cea_slot(int ordered_ca, unsigned char slot)</div><div class='add'>+{</div><div class='add'>+	int mask;</div><div class='add'>+</div><div class='add'>+	/* Add sanity check to pass klockwork check.</div><div class='add'>+	 * This should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (slot &gt;= 8)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mask = channel_allocations[ordered_ca].speakers[7 - slot];</div><div class='add'>+</div><div class='add'>+	return snd_hdac_spk_to_chmap(mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* get the CA index corresponding to the given ALSA API channel map */</div><div class='add'>+static int hdmi_manual_channel_allocation(int chs, unsigned char *map)</div><div class='add'>+{</div><div class='add'>+	int i, spks = 0, spk_mask = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chs; i++) {</div><div class='add'>+		int mask = snd_hdac_chmap_to_spk_mask(map[i]);</div><div class='add'>+</div><div class='add'>+		if (mask) {</div><div class='add'>+			spk_mask |= mask;</div><div class='add'>+			spks++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='add'>+		if ((chs == channel_allocations[i].channels ||</div><div class='add'>+		     spks == channel_allocations[i].channels) &amp;&amp;</div><div class='add'>+		    (spk_mask &amp; channel_allocations[i].spk_mask) ==</div><div class='add'>+				channel_allocations[i].spk_mask)</div><div class='add'>+			return channel_allocations[i].ca_index;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set up the channel slots for the given ALSA API channel map */</div><div class='add'>+static int hdmi_manual_setup_channel_mapping(struct hdac_chmap *chmap,</div><div class='add'>+					     hda_nid_t pin_nid,</div><div class='add'>+					     int chs, unsigned char *map,</div><div class='add'>+					     int ca)</div><div class='add'>+{</div><div class='add'>+	int ordered_ca = get_channel_allocation_order(ca);</div><div class='add'>+	int alsa_pos, hdmi_slot;</div><div class='add'>+	int assignments[8] = {[0 ... 7] = 0xf};</div><div class='add'>+</div><div class='add'>+	for (alsa_pos = 0; alsa_pos &lt; chs; alsa_pos++) {</div><div class='add'>+</div><div class='add'>+		hdmi_slot = to_cea_slot(ordered_ca, map[alsa_pos]);</div><div class='add'>+</div><div class='add'>+		if (hdmi_slot &lt; 0)</div><div class='add'>+			continue; /* unassigned channel */</div><div class='add'>+</div><div class='add'>+		assignments[hdmi_slot] = alsa_pos;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (hdmi_slot = 0; hdmi_slot &lt; 8; hdmi_slot++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = chmap-&gt;ops.pin_set_slot_channel(chmap-&gt;hdac,</div><div class='add'>+				pin_nid, hdmi_slot, assignments[hdmi_slot]);</div><div class='add'>+		if (err)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* store ALSA API channel map from the current default map */</div><div class='add'>+static void hdmi_setup_fake_chmap(unsigned char *map, int ca)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int ordered_ca = get_channel_allocation_order(ca);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (ordered_ca &lt; ARRAY_SIZE(channel_allocations) &amp;&amp;</div><div class='add'>+		    i &lt; channel_allocations[ordered_ca].channels)</div><div class='add'>+			map[i] = from_cea_slot(ordered_ca, hdmi_channel_mapping[ca][i] &amp; 0x0f);</div><div class='add'>+		else</div><div class='add'>+			map[i] = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_hdac_setup_channel_mapping(struct hdac_chmap *chmap,</div><div class='add'>+				       hda_nid_t pin_nid, bool non_pcm, int ca,</div><div class='add'>+				       int channels, unsigned char *map,</div><div class='add'>+				       bool chmap_set)</div><div class='add'>+{</div><div class='add'>+	if (!non_pcm &amp;&amp; chmap_set) {</div><div class='add'>+		hdmi_manual_setup_channel_mapping(chmap, pin_nid,</div><div class='add'>+						  channels, map, ca);</div><div class='add'>+	} else {</div><div class='add'>+		hdmi_std_setup_channel_mapping(chmap, pin_nid, non_pcm, ca);</div><div class='add'>+		hdmi_setup_fake_chmap(map, ca);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hdmi_debug_channel_mapping(chmap, pin_nid);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_setup_channel_mapping);</div><div class='add'>+</div><div class='add'>+int snd_hdac_get_active_channels(int ca)</div><div class='add'>+{</div><div class='add'>+	int ordered_ca = get_channel_allocation_order(ca);</div><div class='add'>+</div><div class='add'>+	/* Add sanity check to pass klockwork check.</div><div class='add'>+	 * This should never happen.</div><div class='add'>+	 */</div><div class='add'>+	if (ordered_ca &gt;= ARRAY_SIZE(channel_allocations))</div><div class='add'>+		ordered_ca = 0;</div><div class='add'>+</div><div class='add'>+	return channel_allocations[ordered_ca].channels;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_active_channels);</div><div class='add'>+</div><div class='add'>+struct hdac_cea_channel_speaker_allocation *snd_hdac_get_ch_alloc_from_ca(int ca)</div><div class='add'>+{</div><div class='add'>+	return &amp;channel_allocations[get_channel_allocation_order(ca)];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_ch_alloc_from_ca);</div><div class='add'>+</div><div class='add'>+int snd_hdac_channel_allocation(struct hdac_device *hdac, int spk_alloc,</div><div class='add'>+		int channels, bool chmap_set, bool non_pcm, unsigned char *map)</div><div class='add'>+{</div><div class='add'>+	int ca;</div><div class='add'>+</div><div class='add'>+	if (!non_pcm &amp;&amp; chmap_set)</div><div class='add'>+		ca = hdmi_manual_channel_allocation(channels, map);</div><div class='add'>+	else</div><div class='add'>+		ca = hdmi_channel_allocation_spk_alloc_blk(hdac,</div><div class='add'>+					spk_alloc, channels);</div><div class='add'>+</div><div class='add'>+	if (ca &lt; 0)</div><div class='add'>+		ca = 0;</div><div class='add'>+</div><div class='add'>+	return ca;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_channel_allocation);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ALSA API channel-map control callbacks</div><div class='add'>+ */</div><div class='add'>+static int hdmi_chmap_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdac_chmap *chmap = info-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chmap-&gt;channels_max;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = SNDRV_CHMAP_LAST;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_chmap_cea_alloc_validate_get_type(struct hdac_chmap *chmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap, int channels)</div><div class='add'>+{</div><div class='add'>+	/* If the speaker allocation matches the channel count, it is OK.*/</div><div class='add'>+	if (cap-&gt;channels != channels)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* all channels are remappable freely */</div><div class='add'>+	return SNDRV_CTL_TLVT_CHMAP_VAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hdmi_cea_alloc_to_tlv_chmap(struct hdac_chmap *hchmap,</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap,</div><div class='add'>+		unsigned int *chmap, int channels)</div><div class='add'>+{</div><div class='add'>+	int count = 0;</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	for (c = 7; c &gt;= 0; c--) {</div><div class='add'>+		int spk = cap-&gt;speakers[c];</div><div class='add'>+</div><div class='add'>+		if (!spk)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		chmap[count++] = snd_hdac_spk_to_chmap(spk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ON(count != channels);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int spk_mask_from_spk_alloc(int spk_alloc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int spk_mask = eld_speaker_allocation_bits[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eld_speaker_allocation_bits); i++) {</div><div class='add'>+		if (spk_alloc &amp; (1 &lt;&lt; i))</div><div class='add'>+			spk_mask |= eld_speaker_allocation_bits[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return spk_mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='add'>+			      unsigned int size, unsigned int __user *tlv)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdac_chmap *chmap = info-&gt;private_data;</div><div class='add'>+	int pcm_idx = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int __user *dst;</div><div class='add'>+	int chs, count = 0;</div><div class='add'>+	unsigned long max_chs;</div><div class='add'>+	int type;</div><div class='add'>+	int spk_alloc, spk_mask;</div><div class='add'>+</div><div class='add'>+	if (size &lt; 8)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	if (put_user(SNDRV_CTL_TLVT_CONTAINER, tlv))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	size -= 8;</div><div class='add'>+	dst = tlv + 2;</div><div class='add'>+</div><div class='add'>+	spk_alloc = chmap-&gt;ops.get_spk_alloc(chmap-&gt;hdac, pcm_idx);</div><div class='add'>+	spk_mask = spk_mask_from_spk_alloc(spk_alloc);</div><div class='add'>+</div><div class='add'>+	max_chs = hweight_long(spk_mask);</div><div class='add'>+</div><div class='add'>+	for (chs = 2; chs &lt;= max_chs; chs++) {</div><div class='add'>+		int i;</div><div class='add'>+		struct hdac_cea_channel_speaker_allocation *cap;</div><div class='add'>+</div><div class='add'>+		cap = channel_allocations;</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++, cap++) {</div><div class='add'>+			int chs_bytes = chs * 4;</div><div class='add'>+			unsigned int tlv_chmap[8];</div><div class='add'>+</div><div class='add'>+			if (cap-&gt;channels != chs)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (!(cap-&gt;spk_mask == (spk_mask &amp; cap-&gt;spk_mask)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			type = chmap-&gt;ops.chmap_cea_alloc_validate_get_type(</div><div class='add'>+							chmap, cap, chs);</div><div class='add'>+			if (type &lt; 0)</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			if (size &lt; 8)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			if (put_user(type, dst) ||</div><div class='add'>+			    put_user(chs_bytes, dst + 1))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+</div><div class='add'>+			dst += 2;</div><div class='add'>+			size -= 8;</div><div class='add'>+			count += 8;</div><div class='add'>+</div><div class='add'>+			if (size &lt; chs_bytes)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			size -= chs_bytes;</div><div class='add'>+			count += chs_bytes;</div><div class='add'>+			chmap-&gt;ops.cea_alloc_to_tlv_chmap(chmap, cap,</div><div class='add'>+						tlv_chmap, chs);</div><div class='add'>+</div><div class='add'>+			if (copy_to_user(dst, tlv_chmap, chs_bytes))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			dst += chs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (put_user(count, tlv + 1))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdac_chmap *chmap = info-&gt;private_data;</div><div class='add'>+	int pcm_idx = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned char pcm_chmap[8];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(pcm_chmap, 0, sizeof(pcm_chmap));</div><div class='add'>+	chmap-&gt;ops.get_chmap(chmap-&gt;hdac, pcm_idx, pcm_chmap);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(pcm_chmap); i++)</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] = pcm_chmap[i];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* a simple sanity check for input values to chmap kcontrol */</div><div class='add'>+static int chmap_value_check(struct hdac_chmap *hchmap,</div><div class='add'>+			     const struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hchmap-&gt;channels_max; i++) {</div><div class='add'>+		if (ucontrol-&gt;value.integer.value[i] &lt; 0 ||</div><div class='add'>+		    ucontrol-&gt;value.integer.value[i] &gt; SNDRV_CHMAP_LAST)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct hdac_chmap *hchmap = info-&gt;private_data;</div><div class='add'>+	int pcm_idx = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int ctl_idx;</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	unsigned char chmap[8], per_pin_chmap[8];</div><div class='add'>+	int i, err, ca, prepared = 0;</div><div class='add'>+</div><div class='add'>+	err = chmap_value_check(hchmap, ucontrol);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* No monitor is connected in dyn_pcm_assign.</div><div class='add'>+	 * It's invalid to setup the chmap</div><div class='add'>+	 */</div><div class='add'>+	if (!hchmap-&gt;ops.is_pcm_attached(hchmap-&gt;hdac, pcm_idx))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctl_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='add'>+	substream = snd_pcm_chmap_substream(info, ctl_idx);</div><div class='add'>+	if (!substream || !substream-&gt;runtime)</div><div class='add'>+		return 0; /* just for avoiding error from alsactl restore */</div><div class='add'>+	switch (substream-&gt;runtime-&gt;state) {</div><div class='add'>+	case SNDRV_PCM_STATE_OPEN:</div><div class='add'>+	case SNDRV_PCM_STATE_SETUP:</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_STATE_PREPARED:</div><div class='add'>+		prepared = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	memset(chmap, 0, sizeof(chmap));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(chmap); i++)</div><div class='add'>+		chmap[i] = ucontrol-&gt;value.integer.value[i];</div><div class='add'>+</div><div class='add'>+	hchmap-&gt;ops.get_chmap(hchmap-&gt;hdac, pcm_idx, per_pin_chmap);</div><div class='add'>+	if (!memcmp(chmap, per_pin_chmap, sizeof(chmap)))</div><div class='add'>+		return 0;</div><div class='add'>+	ca = hdmi_manual_channel_allocation(ARRAY_SIZE(chmap), chmap);</div><div class='add'>+	if (ca &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (hchmap-&gt;ops.chmap_validate) {</div><div class='add'>+		err = hchmap-&gt;ops.chmap_validate(hchmap, ca,</div><div class='add'>+				ARRAY_SIZE(chmap), chmap);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hchmap-&gt;ops.set_chmap(hchmap-&gt;hdac, pcm_idx, chmap, prepared);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hdac_chmap_ops chmap_ops = {</div><div class='add'>+	.chmap_cea_alloc_validate_get_type	= hdmi_chmap_cea_alloc_validate_get_type,</div><div class='add'>+	.cea_alloc_to_tlv_chmap			= hdmi_cea_alloc_to_tlv_chmap,</div><div class='add'>+	.pin_get_slot_channel			= hdmi_pin_get_slot_channel,</div><div class='add'>+	.pin_set_slot_channel			= hdmi_pin_set_slot_channel,</div><div class='add'>+	.set_channel_count			= hdmi_set_channel_count,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void snd_hdac_register_chmap_ops(struct hdac_device *hdac,</div><div class='add'>+				struct hdac_chmap *chmap)</div><div class='add'>+{</div><div class='add'>+	chmap-&gt;ops = chmap_ops;</div><div class='add'>+	chmap-&gt;hdac = hdac;</div><div class='add'>+	init_channel_allocations();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_register_chmap_ops);</div><div class='add'>+</div><div class='add'>+int snd_hdac_add_chmap_ctls(struct snd_pcm *pcm, int pcm_idx,</div><div class='add'>+				struct hdac_chmap *hchmap)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_chmap *chmap;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm,</div><div class='add'>+				     SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     NULL, 0, pcm_idx, &amp;chmap);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	/* override handlers */</div><div class='add'>+	chmap-&gt;private_data = hchmap;</div><div class='add'>+	kctl = chmap-&gt;kctl;</div><div class='add'>+	for (i = 0; i &lt; kctl-&gt;count; i++)</div><div class='add'>+		kctl-&gt;vd[i].access |= SNDRV_CTL_ELEM_ACCESS_WRITE;</div><div class='add'>+	kctl-&gt;info = hdmi_chmap_ctl_info;</div><div class='add'>+	kctl-&gt;get = hdmi_chmap_ctl_get;</div><div class='add'>+	kctl-&gt;put = hdmi_chmap_ctl_put;</div><div class='add'>+	kctl-&gt;tlv.c = hdmi_chmap_ctl_tlv;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_add_chmap_ctls);</div><div class='head'>diff --git a/sound/hda/core/i915.c b/sound/hda/core/i915.c<br/>new file mode 100644<br/>index 000000000000..44438c799f95<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/i915.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/i915.c</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  hdac_i915.c - routines for sync between HD-A core and i915 display driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_i915.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+#include &lt;video/nomodeset.h&gt;</div><div class='add'>+</div><div class='add'>+static int gpu_bind = -1;</div><div class='add'>+module_param(gpu_bind, int, 0644);</div><div class='add'>+MODULE_PARM_DESC(gpu_bind, "Whether to bind sound component to GPU "</div><div class='add'>+			   "(1=always, 0=never, -1=on nomodeset(default))");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ *</div><div class='add'>+ * Intel HSW/BDW display HDA controller is in GPU. Both its power and link BCLK</div><div class='add'>+ * depends on GPU. Two Extended Mode registers EM4 (M value) and EM5 (N Value)</div><div class='add'>+ * are used to convert CDClk (Core Display Clock) to 24MHz BCLK:</div><div class='add'>+ * BCLK = CDCLK * M / N</div><div class='add'>+ * The values will be lost when the display power well is disabled and need to</div><div class='add'>+ * be restored to avoid abnormal playback speed.</div><div class='add'>+ *</div><div class='add'>+ * Call this function at initializing and changing power well, as well as</div><div class='add'>+ * at ELD notifier for the hotplug.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_i915_set_bclk(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp = bus-&gt;audio_component;</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(bus-&gt;dev);</div><div class='add'>+	int cdclk_freq;</div><div class='add'>+	unsigned int bclk_m, bclk_n;</div><div class='add'>+</div><div class='add'>+	if (!acomp || !acomp-&gt;ops || !acomp-&gt;ops-&gt;get_cdclk_freq)</div><div class='add'>+		return; /* only for i915 binding */</div><div class='add'>+	if (!HDA_CONTROLLER_IS_HSW(pci))</div><div class='add'>+		return; /* only HSW/BDW */</div><div class='add'>+</div><div class='add'>+	cdclk_freq = acomp-&gt;ops-&gt;get_cdclk_freq(acomp-&gt;dev);</div><div class='add'>+	switch (cdclk_freq) {</div><div class='add'>+	case 337500:</div><div class='add'>+		bclk_m = 16;</div><div class='add'>+		bclk_n = 225;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 450000:</div><div class='add'>+	default: /* default CDCLK 450MHz */</div><div class='add'>+		bclk_m = 4;</div><div class='add'>+		bclk_n = 75;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 540000:</div><div class='add'>+		bclk_m = 4;</div><div class='add'>+		bclk_n = 90;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 675000:</div><div class='add'>+		bclk_m = 8;</div><div class='add'>+		bclk_n = 225;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_hdac_chip_writew(bus, HSW_EM4, bclk_m);</div><div class='add'>+	snd_hdac_chip_writew(bus, HSW_EM5, bclk_n);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_i915_set_bclk);</div><div class='add'>+</div><div class='add'>+/* returns true if the devices can be connected for audio */</div><div class='add'>+static bool connectivity_check(struct pci_dev *i915, struct pci_dev *hdac)</div><div class='add'>+{</div><div class='add'>+	struct pci_bus *bus_a = i915-&gt;bus, *bus_b = hdac-&gt;bus;</div><div class='add'>+</div><div class='add'>+	/* directly connected on the same bus */</div><div class='add'>+	if (bus_a == bus_b)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	bus_a = bus_a-&gt;parent;</div><div class='add'>+	bus_b = bus_b-&gt;parent;</div><div class='add'>+</div><div class='add'>+	/* connected via parent bus (may be NULL!) */</div><div class='add'>+	if (bus_a == bus_b)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!bus_a || !bus_b)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * on i915 discrete GPUs with embedded HDA audio, the two</div><div class='add'>+	 * devices are connected via 2nd level PCI bridge</div><div class='add'>+	 */</div><div class='add'>+	bus_a = bus_a-&gt;parent;</div><div class='add'>+	bus_b = bus_b-&gt;parent;</div><div class='add'>+	if (bus_a &amp;&amp; bus_a == bus_b)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int i915_component_master_match(struct device *dev, int subcomponent,</div><div class='add'>+				       void *data)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *hdac_pci, *i915_pci;</div><div class='add'>+	struct hdac_bus *bus = data;</div><div class='add'>+</div><div class='add'>+	if (!dev_is_pci(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	hdac_pci = to_pci_dev(bus-&gt;dev);</div><div class='add'>+	i915_pci = to_pci_dev(dev);</div><div class='add'>+</div><div class='add'>+	if ((!strcmp(dev-&gt;driver-&gt;name, "i915") ||</div><div class='add'>+		 !strcmp(dev-&gt;driver-&gt;name, "xe")) &amp;&amp;</div><div class='add'>+	    subcomponent == I915_COMPONENT_AUDIO &amp;&amp;</div><div class='add'>+	    connectivity_check(i915_pci, hdac_pci))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* check whether Intel graphics is present and reachable */</div><div class='add'>+static int i915_gfx_present(struct pci_dev *hdac_pci)</div><div class='add'>+{</div><div class='add'>+	/* List of known platforms with no i915 support. */</div><div class='add'>+	static const struct pci_device_id denylist[] = {</div><div class='add'>+		/* CNL */</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), 0x030000, 0xff0000 },</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), 0x030000, 0xff0000 },</div><div class='add'>+		/* LKF */</div><div class='add'>+		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), 0x030000, 0xff0000 },</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	struct pci_dev *display_dev = NULL;</div><div class='add'>+</div><div class='add'>+	if (!gpu_bind || (gpu_bind &lt; 0 &amp;&amp; video_firmware_drivers_only()))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	for_each_pci_dev(display_dev) {</div><div class='add'>+		if (display_dev-&gt;vendor != PCI_VENDOR_ID_INTEL ||</div><div class='add'>+		    !pci_is_display(display_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (pci_match_id(denylist, display_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (connectivity_check(display_dev, hdac_pci)) {</div><div class='add'>+			pci_dev_put(display_dev);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_i915_init - Initialize i915 audio component</div><div class='add'>+ * @bus: HDA core bus</div><div class='add'>+ *</div><div class='add'>+ * This function is supposed to be used only by a HD-audio controller</div><div class='add'>+ * driver that needs the interaction with i915 graphics.</div><div class='add'>+ *</div><div class='add'>+ * This function initializes and sets up the audio component to communicate</div><div class='add'>+ * with i915 graphics driver.</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_i915_init(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct drm_audio_component *acomp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!i915_gfx_present(to_pci_dev(bus-&gt;dev)))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_acomp_init(bus, NULL,</div><div class='add'>+				  i915_component_master_match,</div><div class='add'>+				  sizeof(struct i915_audio_component) - sizeof(*acomp));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	acomp = bus-&gt;audio_component;</div><div class='add'>+	if (!acomp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!acomp-&gt;ops) {</div><div class='add'>+		snd_hdac_acomp_exit(bus);</div><div class='add'>+		return dev_err_probe(bus-&gt;dev, -EPROBE_DEFER,</div><div class='add'>+				     "couldn't bind with audio component\n");</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_i915_init);</div><div class='head'>diff --git a/sound/hda/core/intel-dsp-config.c b/sound/hda/core/intel-dsp-config.c<br/>new file mode 100644<br/>index 000000000000..c401c0658421<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/intel-dsp-config.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/intel-dsp-config.c</a></div><div class='hunk'>@@ -0,0 +1,851 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2019 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/soundwire/sdw.h&gt;</div><div class='add'>+#include &lt;linux/soundwire/sdw_intel.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/intel-dsp-config.h&gt;</div><div class='add'>+#include &lt;sound/intel-nhlt.h&gt;</div><div class='add'>+#include &lt;sound/soc-acpi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;acpi/nhlt.h&gt;</div><div class='add'>+</div><div class='add'>+static int dsp_driver;</div><div class='add'>+</div><div class='add'>+module_param(dsp_driver, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF, 4=AVS)");</div><div class='add'>+</div><div class='add'>+#define FLAG_SST			BIT(0)</div><div class='add'>+#define FLAG_SOF			BIT(1)</div><div class='add'>+#define FLAG_SST_ONLY_IF_DMIC		BIT(15)</div><div class='add'>+#define FLAG_SOF_ONLY_IF_DMIC		BIT(16)</div><div class='add'>+#define FLAG_SOF_ONLY_IF_SOUNDWIRE	BIT(17)</div><div class='add'>+</div><div class='add'>+#define FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE (FLAG_SOF_ONLY_IF_DMIC | \</div><div class='add'>+					    FLAG_SOF_ONLY_IF_SOUNDWIRE)</div><div class='add'>+</div><div class='add'>+struct config_entry {</div><div class='add'>+	u32 flags;</div><div class='add'>+	u16 device;</div><div class='add'>+	u8 acpi_hid[ACPI_ID_LEN];</div><div class='add'>+	const struct dmi_system_id *dmi_table;</div><div class='add'>+	const struct snd_soc_acpi_codecs *codec_hid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_soc_acpi_codecs __maybe_unused essx_83x6 = {</div><div class='add'>+	.num_codecs = 3,</div><div class='add'>+	.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * configuration table</div><div class='add'>+ * - the order of similar PCI ID entries is important!</div><div class='add'>+ * - the first successful match will win</div><div class='add'>+ */</div><div class='add'>+static const struct config_entry config_table[] = {</div><div class='add'>+/* Merrifield */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_MERRIFIELD)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_SST_TNG,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+/*</div><div class='add'>+ * Skylake, Kabylake, Apollolake</div><div class='add'>+ * the legacy HDAudio driver is used except on Up Squared (SOF) and</div><div class='add'>+ * Chromebooks (SST), as well as devices based on the ES8336 codec</div><div class='add'>+ */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_APL,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_M,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_FCL,</div><div class='add'>+	},</div><div class='add'>+#else /* AVS disabled; force to legacy as SOF doesn't work for SKL or KBL */</div><div class='add'>+	{</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_APL,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Up Squared",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),</div><div class='add'>+					DMI_MATCH(DMI_BOARD_NAME, "UP-APL01"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_APL,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Geminilake uses legacy HDAudio driver except for Google</div><div class='add'>+ * Chromebooks and devices based on the ES8336 codec</div><div class='add'>+ */</div><div class='add'>+/* Geminilake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_GML,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_GML,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CoffeeLake, CannonLake, CometLake, IceLake, TigerLake, AlderLake,</div><div class='add'>+ * RaptorLake, MeteorLake use legacy HDAudio driver except for Google</div><div class='add'>+ * Chromebooks and when DMICs are present. Two cases are required since</div><div class='add'>+ * Coreboot does not expose NHLT tables.</div><div class='add'>+ *</div><div class='add'>+ * When the Chromebook quirk is not present, it's based on information</div><div class='add'>+ * that no such device exists. When the quirk is present, it could be</div><div class='add'>+ * either based on product information or a placeholder.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Cannonlake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_CANNONLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.ident = "UP-WHL",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Coffelake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CNL_H,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CNL_H,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE)</div><div class='add'>+/* Cometlake-LP */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),</div><div class='add'>+					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				/* early version of SKU 09C6 */</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),</div><div class='add'>+					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,</div><div class='add'>+	},</div><div class='add'>+/* Cometlake-H */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_H,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),</div><div class='add'>+					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),</div><div class='add'>+					DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),</div><div class='add'>+				},</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_H,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_CML_H,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Icelake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Jasper Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google firmware",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_BIOS_VERSION, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Tigerlake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{</div><div class='add'>+				.ident = "UPX-TGL",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_TGL_H,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Elkhart Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_EHL_0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_EHL_3,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Alder Lake / Raptor Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_S,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_S,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS,</div><div class='add'>+		.codec_hid =  &amp;essx_83x6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_M,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_N,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ADL_N,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_M,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Meteor Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_METEORLAKE)</div><div class='add'>+	/* Meteorlake-P */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_MTL,</div><div class='add'>+		.dmi_table = (const struct dmi_system_id []) {</div><div class='add'>+			{</div><div class='add'>+				.ident = "Google Chromebooks",</div><div class='add'>+				.matches = {</div><div class='add'>+					DMI_MATCH(DMI_SYS_VENDOR, "Google"),</div><div class='add'>+				}</div><div class='add'>+			},</div><div class='add'>+			{}</div><div class='add'>+		}</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_MTL,</div><div class='add'>+	},</div><div class='add'>+	/* ArrowLake-S */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ARL_S,</div><div class='add'>+	},</div><div class='add'>+	/* ArrowLake */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_ARL,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Lunar Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_LUNARLAKE)</div><div class='add'>+	/* Lunarlake-P */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_LNL_P,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Panther Lake, Wildcat Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_PANTHERLAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_PTL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_PTL_H,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_WCL,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* Nova Lake */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOVALAKE)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,</div><div class='add'>+		.device = PCI_DEVICE_ID_INTEL_HDA_NVL_S,</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_entry *snd_intel_dsp_find_config</div><div class='add'>+		(struct pci_dev *pci, const struct config_entry *table, u32 len)</div><div class='add'>+{</div><div class='add'>+	u16 device;</div><div class='add'>+</div><div class='add'>+	device = pci-&gt;device;</div><div class='add'>+	for (; len &gt; 0; len--, table++) {</div><div class='add'>+		if (table-&gt;device != device)</div><div class='add'>+			continue;</div><div class='add'>+		if (table-&gt;dmi_table &amp;&amp; !dmi_check_system(table-&gt;dmi_table))</div><div class='add'>+			continue;</div><div class='add'>+		if (table-&gt;codec_hid) {</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; table-&gt;codec_hid-&gt;num_codecs; i++) {</div><div class='add'>+				struct nhlt_acpi_table *nhlt;</div><div class='add'>+				bool ssp_found = false;</div><div class='add'>+</div><div class='add'>+				if (!acpi_dev_present(table-&gt;codec_hid-&gt;codecs[i], NULL, -1))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				nhlt = intel_nhlt_init(&amp;pci-&gt;dev);</div><div class='add'>+				if (!nhlt) {</div><div class='add'>+					dev_warn(&amp;pci-&gt;dev, "%s: NHLT table not found, skipped HID %s\n",</div><div class='add'>+						 __func__, table-&gt;codec_hid-&gt;codecs[i]);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (intel_nhlt_has_endpoint_type(nhlt, NHLT_LINK_SSP) &amp;&amp;</div><div class='add'>+				    intel_nhlt_ssp_endpoint_mask(nhlt, NHLT_DEVICE_I2S))</div><div class='add'>+					ssp_found = true;</div><div class='add'>+</div><div class='add'>+				intel_nhlt_free(nhlt);</div><div class='add'>+</div><div class='add'>+				if (ssp_found)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				dev_warn(&amp;pci-&gt;dev, "%s: no valid SSP found for HID %s, skipped\n",</div><div class='add'>+					 __func__, table-&gt;codec_hid-&gt;codecs[i]);</div><div class='add'>+			}</div><div class='add'>+			if (i == table-&gt;codec_hid-&gt;num_codecs)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		return table;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_intel_dsp_check_dmic(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	acpi_nhlt_get_gbl_table();</div><div class='add'>+</div><div class='add'>+	if (acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1))</div><div class='add'>+		ret = 1;</div><div class='add'>+</div><div class='add'>+	acpi_nhlt_put_gbl_table();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)</div><div class='add'>+static int snd_intel_dsp_check_soundwire(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct sdw_intel_acpi_info info;</div><div class='add'>+	acpi_handle handle;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	handle = ACPI_HANDLE(&amp;pci-&gt;dev);</div><div class='add'>+	if (!handle)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = sdw_intel_acpi_scan(handle, &amp;info);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return info.link_mask;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int snd_intel_dsp_check_soundwire(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int snd_intel_dsp_driver_probe(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	const struct config_entry *cfg;</div><div class='add'>+</div><div class='add'>+	/* Intel vendor only */</div><div class='add'>+	if (pci-&gt;vendor != PCI_VENDOR_ID_INTEL)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_ANY;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Legacy devices don't have a PCI-based DSP and use HDaudio</div><div class='add'>+	 * for HDMI/DP support, ignore kernel parameter</div><div class='add'>+	 */</div><div class='add'>+	switch (pci-&gt;device) {</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_BDW:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_HSW_0:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_HSW_2:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_HSW_3:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_BYT:</div><div class='add'>+	case PCI_DEVICE_ID_INTEL_HDA_BSW:</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_ANY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsp_driver &gt; 0 &amp;&amp; dsp_driver &lt;= SND_INTEL_DSP_DRIVER_LAST)</div><div class='add'>+		return dsp_driver;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * detect DSP by checking class/subclass/prog-id information</div><div class='add'>+	 * class=04 subclass 03 prog-if 00: no DSP, use legacy driver</div><div class='add'>+	 * class=04 subclass 01 prog-if 00: DSP is present</div><div class='add'>+	 *  (and may be required e.g. for DMIC or SSP support)</div><div class='add'>+	 * class=04 subclass 03 prog-if 80: use DSP or legacy mode</div><div class='add'>+	 */</div><div class='add'>+	if (pci-&gt;class == 0x040300)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_LEGACY;</div><div class='add'>+	if (pci-&gt;class != 0x040100 &amp;&amp; pci-&gt;class != 0x040380) {</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, selecting HDAudio legacy driver\n", pci-&gt;class);</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_LEGACY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci-&gt;class);</div><div class='add'>+</div><div class='add'>+	/* find the configuration for the specific device */</div><div class='add'>+	cfg = snd_intel_dsp_find_config(pci, config_table, ARRAY_SIZE(config_table));</div><div class='add'>+	if (!cfg)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_ANY;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;flags &amp; FLAG_SOF) {</div><div class='add'>+		if (cfg-&gt;flags &amp; FLAG_SOF_ONLY_IF_SOUNDWIRE &amp;&amp;</div><div class='add'>+		    snd_intel_dsp_check_soundwire(pci) &gt; 0) {</div><div class='add'>+			dev_info_once(&amp;pci-&gt;dev, "SoundWire enabled on CannonLake+ platform, using SOF driver\n");</div><div class='add'>+			return SND_INTEL_DSP_DRIVER_SOF;</div><div class='add'>+		}</div><div class='add'>+		if (cfg-&gt;flags &amp; FLAG_SOF_ONLY_IF_DMIC &amp;&amp;</div><div class='add'>+		    snd_intel_dsp_check_dmic(pci)) {</div><div class='add'>+			dev_info_once(&amp;pci-&gt;dev, "Digital mics found on Skylake+ platform, using SOF driver\n");</div><div class='add'>+			return SND_INTEL_DSP_DRIVER_SOF;</div><div class='add'>+		}</div><div class='add'>+		if (!(cfg-&gt;flags &amp; FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE))</div><div class='add'>+			return SND_INTEL_DSP_DRIVER_SOF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;flags &amp; FLAG_SST) {</div><div class='add'>+		if (cfg-&gt;flags &amp; FLAG_SST_ONLY_IF_DMIC) {</div><div class='add'>+			if (snd_intel_dsp_check_dmic(pci)) {</div><div class='add'>+				dev_info_once(&amp;pci-&gt;dev, "Digital mics found on Skylake+ platform, using SST driver\n");</div><div class='add'>+				return SND_INTEL_DSP_DRIVER_SST;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			return SND_INTEL_DSP_DRIVER_SST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return SND_INTEL_DSP_DRIVER_LEGACY;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_intel_dsp_driver_probe);</div><div class='add'>+</div><div class='add'>+/* Should we default to SOF or SST for BYT/CHT ? */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_INTEL_BYT_PREFER_SOF) || \</div><div class='add'>+    !IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)</div><div class='add'>+#define FLAG_SST_OR_SOF_BYT	FLAG_SOF</div><div class='add'>+#else</div><div class='add'>+#define FLAG_SST_OR_SOF_BYT	FLAG_SST</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * configuration table</div><div class='add'>+ * - the order of similar ACPI ID entries is important!</div><div class='add'>+ * - the first successful match will win</div><div class='add'>+ */</div><div class='add'>+static const struct config_entry acpi_config_table[] = {</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) || \</div><div class='add'>+    IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)</div><div class='add'>+/* BayTrail */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST_OR_SOF_BYT,</div><div class='add'>+		.acpi_hid = "LPE0F28",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST_OR_SOF_BYT,</div><div class='add'>+		.acpi_hid = "80860F28",</div><div class='add'>+	},</div><div class='add'>+/* CherryTrail */</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST_OR_SOF_BYT,</div><div class='add'>+		.acpi_hid = "808622A8",</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+/* Broadwell */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CATPT)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.acpi_hid = "INT3438"</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SOF,</div><div class='add'>+		.acpi_hid = "INT3438"</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+/* Haswell - not supported by SOF but added for consistency */</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CATPT)</div><div class='add'>+	{</div><div class='add'>+		.flags = FLAG_SST,</div><div class='add'>+		.acpi_hid = "INT33C8"</div><div class='add'>+	},</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct config_entry *snd_intel_acpi_dsp_find_config(const u8 acpi_hid[ACPI_ID_LEN],</div><div class='add'>+								 const struct config_entry *table,</div><div class='add'>+								 u32 len)</div><div class='add'>+{</div><div class='add'>+	for (; len &gt; 0; len--, table++) {</div><div class='add'>+		if (memcmp(table-&gt;acpi_hid, acpi_hid, ACPI_ID_LEN))</div><div class='add'>+			continue;</div><div class='add'>+		if (table-&gt;dmi_table &amp;&amp; !dmi_check_system(table-&gt;dmi_table))</div><div class='add'>+			continue;</div><div class='add'>+		return table;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN])</div><div class='add'>+{</div><div class='add'>+	const struct config_entry *cfg;</div><div class='add'>+</div><div class='add'>+	if (dsp_driver &gt; SND_INTEL_DSP_DRIVER_LEGACY &amp;&amp; dsp_driver &lt;= SND_INTEL_DSP_DRIVER_LAST)</div><div class='add'>+		return dsp_driver;</div><div class='add'>+</div><div class='add'>+	if (dsp_driver == SND_INTEL_DSP_DRIVER_LEGACY) {</div><div class='add'>+		dev_warn(dev, "dsp_driver parameter %d not supported, using automatic detection\n",</div><div class='add'>+			 SND_INTEL_DSP_DRIVER_LEGACY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* find the configuration for the specific device */</div><div class='add'>+	cfg = snd_intel_acpi_dsp_find_config(acpi_hid,  acpi_config_table,</div><div class='add'>+					     ARRAY_SIZE(acpi_config_table));</div><div class='add'>+	if (!cfg)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_ANY;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;flags &amp; FLAG_SST)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_SST;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;flags &amp; FLAG_SOF)</div><div class='add'>+		return SND_INTEL_DSP_DRIVER_SOF;</div><div class='add'>+</div><div class='add'>+	return SND_INTEL_DSP_DRIVER_SST;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_intel_acpi_dsp_driver_probe);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("Intel DSP config driver");</div><div class='add'>+MODULE_IMPORT_NS("SND_INTEL_SOUNDWIRE_ACPI");</div><div class='head'>diff --git a/sound/hda/core/intel-nhlt.c b/sound/hda/core/intel-nhlt.c<br/>new file mode 100644<br/>index 000000000000..6d72a871bda0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/intel-nhlt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/intel-nhlt.c</a></div><div class='hunk'>@@ -0,0 +1,388 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (c) 2015-2019 Intel Corporation</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;sound/intel-nhlt.h&gt;</div><div class='add'>+</div><div class='add'>+struct nhlt_acpi_table *intel_nhlt_init(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_acpi_table *nhlt;</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	status = acpi_get_table(ACPI_SIG_NHLT, 0,</div><div class='add'>+				(struct acpi_table_header **)&amp;nhlt);</div><div class='add'>+	if (ACPI_FAILURE(status)) {</div><div class='add'>+		dev_warn(dev, "NHLT table not found\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nhlt;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_nhlt_init);</div><div class='add'>+</div><div class='add'>+void intel_nhlt_free(struct nhlt_acpi_table *nhlt)</div><div class='add'>+{</div><div class='add'>+	acpi_put_table((struct acpi_table_header *)nhlt);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_nhlt_free);</div><div class='add'>+</div><div class='add'>+int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	struct nhlt_dmic_array_config *cfg;</div><div class='add'>+	struct nhlt_vendor_dmic_array_config *cfg_vendor;</div><div class='add'>+	struct nhlt_fmt *fmt_configs;</div><div class='add'>+	unsigned int dmic_geo = 0;</div><div class='add'>+	u16 max_ch = 0;</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (!nhlt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (nhlt-&gt;header.length &lt;= sizeof(struct acpi_table_header)) {</div><div class='add'>+		dev_warn(dev, "Invalid DMIC description table\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (j = 0, epnt = nhlt-&gt;desc; j &lt; nhlt-&gt;endpoint_count; j++,</div><div class='add'>+	     epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length)) {</div><div class='add'>+</div><div class='add'>+		if (epnt-&gt;linktype != NHLT_LINK_DMIC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cfg = (struct nhlt_dmic_array_config  *)(epnt-&gt;config.caps);</div><div class='add'>+		fmt_configs = (struct nhlt_fmt *)(epnt-&gt;config.caps + epnt-&gt;config.size);</div><div class='add'>+</div><div class='add'>+		/* find max number of channels based on format_configuration */</div><div class='add'>+		if (fmt_configs-&gt;fmt_count) {</div><div class='add'>+			struct nhlt_fmt_cfg *fmt_cfg = fmt_configs-&gt;fmt_config;</div><div class='add'>+</div><div class='add'>+			dev_dbg(dev, "found %d format definitions\n",</div><div class='add'>+				fmt_configs-&gt;fmt_count);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; fmt_configs-&gt;fmt_count; i++) {</div><div class='add'>+				struct wav_fmt_ext *fmt_ext;</div><div class='add'>+</div><div class='add'>+				fmt_ext = &amp;fmt_cfg-&gt;fmt_ext;</div><div class='add'>+</div><div class='add'>+				if (fmt_ext-&gt;fmt.channels &gt; max_ch)</div><div class='add'>+					max_ch = fmt_ext-&gt;fmt.channels;</div><div class='add'>+</div><div class='add'>+				/* Move to the next nhlt_fmt_cfg */</div><div class='add'>+				fmt_cfg = (struct nhlt_fmt_cfg *)(fmt_cfg-&gt;config.caps +</div><div class='add'>+								  fmt_cfg-&gt;config.size);</div><div class='add'>+			}</div><div class='add'>+			dev_dbg(dev, "max channels found %d\n", max_ch);</div><div class='add'>+		} else {</div><div class='add'>+			dev_dbg(dev, "No format information found\n");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;device_config.config_type != NHLT_CONFIG_TYPE_MIC_ARRAY) {</div><div class='add'>+			dmic_geo = max_ch;</div><div class='add'>+		} else {</div><div class='add'>+			switch (cfg-&gt;array_type) {</div><div class='add'>+			case NHLT_MIC_ARRAY_2CH_SMALL:</div><div class='add'>+			case NHLT_MIC_ARRAY_2CH_BIG:</div><div class='add'>+				dmic_geo = MIC_ARRAY_2CH;</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			case NHLT_MIC_ARRAY_4CH_1ST_GEOM:</div><div class='add'>+			case NHLT_MIC_ARRAY_4CH_L_SHAPED:</div><div class='add'>+			case NHLT_MIC_ARRAY_4CH_2ND_GEOM:</div><div class='add'>+				dmic_geo = MIC_ARRAY_4CH;</div><div class='add'>+				break;</div><div class='add'>+			case NHLT_MIC_ARRAY_VENDOR_DEFINED:</div><div class='add'>+				cfg_vendor = (struct nhlt_vendor_dmic_array_config *)cfg;</div><div class='add'>+				dmic_geo = cfg_vendor-&gt;nb_mics;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				dev_warn(dev, "%s: undefined DMIC array_type 0x%0x\n",</div><div class='add'>+					 __func__, cfg-&gt;array_type);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (dmic_geo &gt; 0) {</div><div class='add'>+				dev_dbg(dev, "Array with %d dmics\n", dmic_geo);</div><div class='add'>+			}</div><div class='add'>+			if (max_ch &gt; dmic_geo) {</div><div class='add'>+				dev_dbg(dev, "max channels %d exceed dmic number %d\n",</div><div class='add'>+					max_ch, dmic_geo);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "dmic number %d max_ch %d\n", dmic_geo, max_ch);</div><div class='add'>+</div><div class='add'>+	return dmic_geo;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(intel_nhlt_get_dmic_geo);</div><div class='add'>+</div><div class='add'>+bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nhlt)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+		if (epnt-&gt;linktype == link_type)</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intel_nhlt_has_endpoint_type);</div><div class='add'>+</div><div class='add'>+int intel_nhlt_ssp_endpoint_mask(struct nhlt_acpi_table *nhlt, u8 device_type)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	int ssp_mask = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nhlt || (device_type != NHLT_DEVICE_BT &amp;&amp; device_type != NHLT_DEVICE_I2S))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+		if (epnt-&gt;linktype == NHLT_LINK_SSP &amp;&amp; epnt-&gt;device_type == device_type) {</div><div class='add'>+			/* for SSP the virtual bus id is the SSP port */</div><div class='add'>+			ssp_mask |= BIT(epnt-&gt;virtual_bus_id);</div><div class='add'>+		}</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ssp_mask;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intel_nhlt_ssp_endpoint_mask);</div><div class='add'>+</div><div class='add'>+#define SSP_BLOB_V1_0_SIZE		84</div><div class='add'>+#define SSP_BLOB_V1_0_MDIVC_OFFSET	19 /* offset in u32 */</div><div class='add'>+</div><div class='add'>+#define SSP_BLOB_V1_5_SIZE		96</div><div class='add'>+#define SSP_BLOB_V1_5_MDIVC_OFFSET	21 /* offset in u32 */</div><div class='add'>+#define SSP_BLOB_VER_1_5		0xEE000105</div><div class='add'>+</div><div class='add'>+#define SSP_BLOB_V2_0_SIZE		88</div><div class='add'>+#define SSP_BLOB_V2_0_MDIVC_OFFSET	20 /* offset in u32 */</div><div class='add'>+#define SSP_BLOB_VER_2_0		0xEE000200</div><div class='add'>+</div><div class='add'>+int intel_nhlt_ssp_mclk_mask(struct nhlt_acpi_table *nhlt, int ssp_num)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	struct nhlt_fmt *fmt;</div><div class='add'>+	struct nhlt_fmt_cfg *cfg;</div><div class='add'>+	int mclk_mask = 0;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!nhlt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+</div><div class='add'>+		/* we only care about endpoints connected to an audio codec over SSP */</div><div class='add'>+		if (epnt-&gt;linktype == NHLT_LINK_SSP &amp;&amp;</div><div class='add'>+		    epnt-&gt;device_type == NHLT_DEVICE_I2S &amp;&amp;</div><div class='add'>+		    epnt-&gt;virtual_bus_id == ssp_num) {</div><div class='add'>+</div><div class='add'>+			fmt = (struct nhlt_fmt *)(epnt-&gt;config.caps + epnt-&gt;config.size);</div><div class='add'>+			cfg = fmt-&gt;fmt_config;</div><div class='add'>+</div><div class='add'>+			/*</div><div class='add'>+			 * In theory all formats should use the same MCLK but it doesn't hurt to</div><div class='add'>+			 * double-check that the configuration is consistent</div><div class='add'>+			 */</div><div class='add'>+			for (j = 0; j &lt; fmt-&gt;fmt_count; j++) {</div><div class='add'>+				u32 *blob;</div><div class='add'>+				int mdivc_offset;</div><div class='add'>+				int size;</div><div class='add'>+</div><div class='add'>+				/* first check we have enough data to read the blob type */</div><div class='add'>+				if (cfg-&gt;config.size &lt; 8)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+</div><div class='add'>+				blob = (u32 *)cfg-&gt;config.caps;</div><div class='add'>+</div><div class='add'>+				if (blob[1] == SSP_BLOB_VER_2_0) {</div><div class='add'>+					mdivc_offset = SSP_BLOB_V2_0_MDIVC_OFFSET;</div><div class='add'>+					size = SSP_BLOB_V2_0_SIZE;</div><div class='add'>+				} else if (blob[1] == SSP_BLOB_VER_1_5) {</div><div class='add'>+					mdivc_offset = SSP_BLOB_V1_5_MDIVC_OFFSET;</div><div class='add'>+					size = SSP_BLOB_V1_5_SIZE;</div><div class='add'>+				} else {</div><div class='add'>+					mdivc_offset = SSP_BLOB_V1_0_MDIVC_OFFSET;</div><div class='add'>+					size = SSP_BLOB_V1_0_SIZE;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				/* make sure we have enough data for the fixed part of the blob */</div><div class='add'>+				if (cfg-&gt;config.size &lt; size)</div><div class='add'>+					return -EINVAL;</div><div class='add'>+</div><div class='add'>+				mclk_mask |=  blob[mdivc_offset] &amp; GENMASK(1, 0);</div><div class='add'>+</div><div class='add'>+				cfg = (struct nhlt_fmt_cfg *)(cfg-&gt;config.caps + cfg-&gt;config.size);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* make sure only one MCLK is used */</div><div class='add'>+	if (hweight_long(mclk_mask) != 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return mclk_mask;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intel_nhlt_ssp_mclk_mask);</div><div class='add'>+</div><div class='add'>+static struct nhlt_specific_cfg *</div><div class='add'>+nhlt_get_specific_cfg(struct device *dev, struct nhlt_fmt *fmt, u8 num_ch,</div><div class='add'>+		      u32 rate, u8 vbps, u8 bps, bool ignore_vbps)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_fmt_cfg *cfg = fmt-&gt;fmt_config;</div><div class='add'>+	struct wav_fmt *wfmt;</div><div class='add'>+	u16 _bps, _vbps;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Endpoint format count=%d\n", fmt-&gt;fmt_count);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fmt-&gt;fmt_count; i++) {</div><div class='add'>+		wfmt = &amp;cfg-&gt;fmt_ext.fmt;</div><div class='add'>+		_bps = wfmt-&gt;bits_per_sample;</div><div class='add'>+		_vbps = cfg-&gt;fmt_ext.sample.valid_bits_per_sample;</div><div class='add'>+</div><div class='add'>+		dev_dbg(dev, "Endpoint format: ch=%d fmt=%d/%d rate=%d\n",</div><div class='add'>+			wfmt-&gt;channels, _vbps, _bps, wfmt-&gt;samples_per_sec);</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * When looking for exact match of configuration ignore the vbps</div><div class='add'>+		 * from NHLT table when ignore_vbps is true</div><div class='add'>+		 */</div><div class='add'>+		if (wfmt-&gt;channels == num_ch &amp;&amp; wfmt-&gt;samples_per_sec == rate &amp;&amp;</div><div class='add'>+		    (ignore_vbps || vbps == _vbps) &amp;&amp; bps == _bps)</div><div class='add'>+			return &amp;cfg-&gt;config;</div><div class='add'>+</div><div class='add'>+		cfg = (struct nhlt_fmt_cfg *)(cfg-&gt;config.caps + cfg-&gt;config.size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool nhlt_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt,</div><div class='add'>+				u32 bus_id, u8 link_type, u8 dir, u8 dev_type)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(dev, "Endpoint: vbus_id=%d link_type=%d dir=%d dev_type = %d\n",</div><div class='add'>+		epnt-&gt;virtual_bus_id, epnt-&gt;linktype,</div><div class='add'>+		epnt-&gt;direction, epnt-&gt;device_type);</div><div class='add'>+</div><div class='add'>+	if ((epnt-&gt;virtual_bus_id != bus_id) ||</div><div class='add'>+	    (epnt-&gt;linktype != link_type) ||</div><div class='add'>+	    (epnt-&gt;direction != dir))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* link of type DMIC bypasses device_type check */</div><div class='add'>+	return epnt-&gt;linktype == NHLT_LINK_DMIC ||</div><div class='add'>+	       epnt-&gt;device_type == dev_type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct nhlt_specific_cfg *</div><div class='add'>+intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt,</div><div class='add'>+			     u32 bus_id, u8 link_type, u8 vbps, u8 bps,</div><div class='add'>+			     u8 num_ch, u32 rate, u8 dir, u8 dev_type)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_specific_cfg *cfg;</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	bool ignore_vbps = false;</div><div class='add'>+	struct nhlt_fmt *fmt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nhlt)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Looking for configuration:\n");</div><div class='add'>+	dev_dbg(dev, "  vbus_id=%d link_type=%d dir=%d, dev_type=%d\n",</div><div class='add'>+		bus_id, link_type, dir, dev_type);</div><div class='add'>+	if (link_type == NHLT_LINK_DMIC &amp;&amp; bps == 32 &amp;&amp; (vbps == 24 || vbps == 32)) {</div><div class='add'>+		/*</div><div class='add'>+		 * The DMIC hardware supports only one type of 32 bits sample</div><div class='add'>+		 * size, which is 24 bit sampling on the MSB side and bits[1:0]</div><div class='add'>+		 * are used for indicating the channel number.</div><div class='add'>+		 * It has been observed that some NHLT tables have the vbps</div><div class='add'>+		 * specified as 32 while some uses 24.</div><div class='add'>+		 * The format these variations describe are identical, the</div><div class='add'>+		 * hardware is configured and behaves the same way.</div><div class='add'>+		 * Note: when the samples assumed to be vbps=32 then the 'noise'</div><div class='add'>+		 * introduced by the lower two bits (channel number) have no</div><div class='add'>+		 * real life implication on audio quality.</div><div class='add'>+		 */</div><div class='add'>+		dev_dbg(dev,</div><div class='add'>+			"  ch=%d fmt=%d rate=%d (vbps is ignored for DMIC 32bit format)\n",</div><div class='add'>+			num_ch, bps, rate);</div><div class='add'>+		ignore_vbps = true;</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(dev, "  ch=%d fmt=%d/%d rate=%d\n", num_ch, vbps, bps, rate);</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(dev, "Endpoint count=%d\n", nhlt-&gt;endpoint_count);</div><div class='add'>+</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+		if (nhlt_check_ep_match(dev, epnt, bus_id, link_type, dir, dev_type)) {</div><div class='add'>+			fmt = (struct nhlt_fmt *)(epnt-&gt;config.caps + epnt-&gt;config.size);</div><div class='add'>+</div><div class='add'>+			cfg = nhlt_get_specific_cfg(dev, fmt, num_ch, rate,</div><div class='add'>+						    vbps, bps, ignore_vbps);</div><div class='add'>+			if (cfg)</div><div class='add'>+				return cfg;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intel_nhlt_get_endpoint_blob);</div><div class='add'>+</div><div class='add'>+int intel_nhlt_ssp_device_type(struct device *dev, struct nhlt_acpi_table *nhlt,</div><div class='add'>+			       u8 virtual_bus_id)</div><div class='add'>+{</div><div class='add'>+	struct nhlt_endpoint *epnt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!nhlt) {</div><div class='add'>+		dev_err(dev, "%s: NHLT table is missing (query for SSP%d)\n",</div><div class='add'>+			__func__, virtual_bus_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+		/* for SSP link the virtual bus id is the SSP port number */</div><div class='add'>+		if (epnt-&gt;linktype == NHLT_LINK_SSP &amp;&amp;</div><div class='add'>+		    epnt-&gt;virtual_bus_id == virtual_bus_id) {</div><div class='add'>+			dev_dbg(dev, "SSP%d: dev_type=%d\n", virtual_bus_id,</div><div class='add'>+				epnt-&gt;device_type);</div><div class='add'>+			return epnt-&gt;device_type;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev, "%s: No match for SSP%d in NHLT table\n", __func__,</div><div class='add'>+		virtual_bus_id);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev, "Available endpoints:\n");</div><div class='add'>+	epnt = (struct nhlt_endpoint *)nhlt-&gt;desc;</div><div class='add'>+	for (i = 0; i &lt; nhlt-&gt;endpoint_count; i++) {</div><div class='add'>+		dev_dbg(dev,</div><div class='add'>+			"%d: link_type: %d, vbus_id: %d, dir: %d, dev_type: %d\n",</div><div class='add'>+			i, epnt-&gt;linktype, epnt-&gt;virtual_bus_id,</div><div class='add'>+			epnt-&gt;direction, epnt-&gt;device_type);</div><div class='add'>+</div><div class='add'>+		epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt-&gt;length);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(intel_nhlt_ssp_device_type);</div><div class='head'>diff --git a/sound/hda/core/intel-sdw-acpi.c b/sound/hda/core/intel-sdw-acpi.c<br/>new file mode 100644<br/>index 000000000000..d3511135f7d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/intel-sdw-acpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/intel-sdw-acpi.c</a></div><div class='hunk'>@@ -0,0 +1,204 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)</div><div class='add'>+// Copyright(c) 2015-2021 Intel Corporation.</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * SDW Intel ACPI scan helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/soundwire/sdw_intel.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#define SDW_LINK_TYPE		4 /* from Intel ACPI documentation */</div><div class='add'>+</div><div class='add'>+static int ctrl_link_mask;</div><div class='add'>+module_param_named(sdw_link_mask, ctrl_link_mask, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(sdw_link_mask, "Intel link mask (one bit per link)");</div><div class='add'>+</div><div class='add'>+static ulong ctrl_addr = 0x40000000;</div><div class='add'>+module_param_named(sdw_ctrl_addr, ctrl_addr, ulong, 0444);</div><div class='add'>+MODULE_PARM_DESC(sdw_ctrl_addr, "Intel SoundWire Controller _ADR");</div><div class='add'>+</div><div class='add'>+static bool is_link_enabled(struct fwnode_handle *fw_node, u8 idx)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *link;</div><div class='add'>+	char name[32];</div><div class='add'>+	u32 quirk_mask = 0;</div><div class='add'>+</div><div class='add'>+	/* Find master handle */</div><div class='add'>+	snprintf(name, sizeof(name),</div><div class='add'>+		 "mipi-sdw-link-%hhu-subproperties", idx);</div><div class='add'>+</div><div class='add'>+	link = fwnode_get_named_child_node(fw_node, name);</div><div class='add'>+	if (!link)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	fwnode_property_read_u32(link,</div><div class='add'>+				 "intel-quirk-mask",</div><div class='add'>+				 &amp;quirk_mask);</div><div class='add'>+</div><div class='add'>+	fwnode_handle_put(link);</div><div class='add'>+</div><div class='add'>+	if (quirk_mask &amp; SDW_INTEL_QUIRK_MASK_BUS_DISABLE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)</div><div class='add'>+{</div><div class='add'>+	struct acpi_device *adev = acpi_fetch_acpi_dev(info-&gt;handle);</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+	unsigned long list;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 count;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!adev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	fwnode = acpi_fwnode_handle(adev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Found controller, find links supported</div><div class='add'>+	 *</div><div class='add'>+	 * In theory we could check the number of links supported in</div><div class='add'>+	 * hardware, but in that step we cannot assume SoundWire IP is</div><div class='add'>+	 * powered.</div><div class='add'>+	 *</div><div class='add'>+	 * In addition, if the BIOS doesn't even provide this</div><div class='add'>+	 * 'master-count' property then all the inits based on link</div><div class='add'>+	 * masks will fail as well.</div><div class='add'>+	 *</div><div class='add'>+	 * We will check the hardware capabilities in the startup() step</div><div class='add'>+	 */</div><div class='add'>+	ret = fwnode_property_read_u32(fwnode, "mipi-sdw-manager-list", &amp;tmp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		ret = fwnode_property_read_u32(fwnode, "mipi-sdw-master-count", &amp;count);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;adev-&gt;dev,</div><div class='add'>+				"Failed to read mipi-sdw-master-count: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		list = GENMASK(count - 1, 0);</div><div class='add'>+	} else {</div><div class='add'>+		list = tmp;</div><div class='add'>+		count = hweight32(list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check count is within bounds */</div><div class='add'>+	if (count &gt; SDW_INTEL_MAX_LINKS) {</div><div class='add'>+		dev_err(&amp;adev-&gt;dev, "Link count %d exceeds max %d\n",</div><div class='add'>+			count, SDW_INTEL_MAX_LINKS);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!count) {</div><div class='add'>+		dev_warn(&amp;adev-&gt;dev, "No SoundWire links detected\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(&amp;adev-&gt;dev, "ACPI reports %d SDW Link devices\n", count);</div><div class='add'>+</div><div class='add'>+	info-&gt;count = count;</div><div class='add'>+	info-&gt;link_mask = 0;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(i, &amp;list, SDW_INTEL_MAX_LINKS) {</div><div class='add'>+		if (ctrl_link_mask &amp;&amp; !(ctrl_link_mask &amp; BIT(i))) {</div><div class='add'>+			dev_dbg(&amp;adev-&gt;dev,</div><div class='add'>+				"Link %d masked, will not be enabled\n", i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_link_enabled(fwnode, i)) {</div><div class='add'>+			dev_dbg(&amp;adev-&gt;dev,</div><div class='add'>+				"Link %d not selected in firmware\n", i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		info-&gt;link_mask |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level,</div><div class='add'>+				     void *cdata, void **return_value)</div><div class='add'>+{</div><div class='add'>+	struct sdw_intel_acpi_info *info = cdata;</div><div class='add'>+	u64 adr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = acpi_get_local_u64_address(handle, &amp;adr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return AE_OK; /* keep going */</div><div class='add'>+</div><div class='add'>+	if (!acpi_fetch_acpi_dev(handle)) {</div><div class='add'>+		pr_err("%s: Couldn't find ACPI handle\n", __func__);</div><div class='add'>+		return AE_NOT_FOUND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * On some Intel platforms, multiple children of the HDAS</div><div class='add'>+	 * device can be found, but only one of them is the SoundWire</div><div class='add'>+	 * controller. The SNDW device is always exposed with</div><div class='add'>+	 * Name(_ADR, 0x40000000), with bits 31..28 representing the</div><div class='add'>+	 * SoundWire link so filter accordingly</div><div class='add'>+	 */</div><div class='add'>+	if (FIELD_GET(GENMASK(31, 28), adr) != SDW_LINK_TYPE)</div><div class='add'>+		return AE_OK; /* keep going */</div><div class='add'>+</div><div class='add'>+	if (adr != ctrl_addr)</div><div class='add'>+		return AE_OK; /* keep going */</div><div class='add'>+</div><div class='add'>+	/* found the correct SoundWire controller */</div><div class='add'>+	info-&gt;handle = handle;</div><div class='add'>+</div><div class='add'>+	/* device found, stop namespace walk */</div><div class='add'>+	return AE_CTRL_TERMINATE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * sdw_intel_acpi_scan() - SoundWire Intel init routine</div><div class='add'>+ * @parent_handle: ACPI parent handle</div><div class='add'>+ * @info: description of what firmware/DSDT tables expose</div><div class='add'>+ *</div><div class='add'>+ * This scans the namespace and queries firmware to figure out which</div><div class='add'>+ * links to enable. A follow-up use of sdw_intel_probe() and</div><div class='add'>+ * sdw_intel_startup() is required for creation of devices and bus</div><div class='add'>+ * startup</div><div class='add'>+ */</div><div class='add'>+int sdw_intel_acpi_scan(acpi_handle parent_handle,</div><div class='add'>+			struct sdw_intel_acpi_info *info)</div><div class='add'>+{</div><div class='add'>+	acpi_status status;</div><div class='add'>+</div><div class='add'>+	info-&gt;handle = NULL;</div><div class='add'>+	/*</div><div class='add'>+	 * In the HDAS ACPI scope, 'SNDW' may be either the child of</div><div class='add'>+	 * 'HDAS' or the grandchild of 'HDAS'. So let's go through</div><div class='add'>+	 * the ACPI from 'HDAS' at max depth of 2 to find the 'SNDW'</div><div class='add'>+	 * device.</div><div class='add'>+	 */</div><div class='add'>+	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,</div><div class='add'>+				     parent_handle, 2,</div><div class='add'>+				     sdw_intel_acpi_cb,</div><div class='add'>+				     NULL, info, NULL);</div><div class='add'>+	if (ACPI_FAILURE(status) || info-&gt;handle == NULL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return sdw_intel_scan_controller(info);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS(sdw_intel_acpi_scan, "SND_INTEL_SOUNDWIRE_ACPI");</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_DESCRIPTION("Intel Soundwire ACPI helpers");</div><div class='head'>diff --git a/sound/hda/core/local.h b/sound/hda/core/local.h<br/>new file mode 100644<br/>index 000000000000..5f03b203c416<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/local.h</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Local helper macros and functions for HD-audio core drivers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __HDAC_LOCAL_H</div><div class='add'>+#define __HDAC_LOCAL_H</div><div class='add'>+</div><div class='add'>+extern const struct attribute_group *hdac_dev_attr_groups[];</div><div class='add'>+int hda_widget_sysfs_init(struct hdac_device *codec);</div><div class='add'>+int hda_widget_sysfs_reinit(struct hdac_device *codec, hda_nid_t start_nid,</div><div class='add'>+			    int num_nodes);</div><div class='add'>+void hda_widget_sysfs_exit(struct hdac_device *codec);</div><div class='add'>+</div><div class='add'>+int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec);</div><div class='add'>+void snd_hdac_bus_remove_device(struct hdac_bus *bus,</div><div class='add'>+				struct hdac_device *codec);</div><div class='add'>+void snd_hdac_bus_queue_event(struct hdac_bus *bus, u32 res, u32 res_ex);</div><div class='add'>+int snd_hdac_bus_exec_verb(struct hdac_bus *bus, unsigned int addr,</div><div class='add'>+			   unsigned int cmd, unsigned int *res);</div><div class='add'>+</div><div class='add'>+int snd_hdac_exec_verb(struct hdac_device *codec, unsigned int cmd,</div><div class='add'>+		       unsigned int flags, unsigned int *res);</div><div class='add'>+</div><div class='add'>+#endif /* __HDAC_LOCAL_H */</div><div class='head'>diff --git a/sound/hda/core/regmap.c b/sound/hda/core/regmap.c<br/>new file mode 100644<br/>index 000000000000..e7b866fc52c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/regmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/regmap.c</a></div><div class='hunk'>@@ -0,0 +1,588 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Regmap support for HD-audio verbs</div><div class='add'>+ *</div><div class='add'>+ * A virtual register is translated to one or more hda verbs for write,</div><div class='add'>+ * vice versa for read.</div><div class='add'>+ *</div><div class='add'>+ * A few limitations:</div><div class='add'>+ * - Provided for not all verbs but only subset standard non-volatile verbs.</div><div class='add'>+ * - For reading, only AC_VERB_GET_* variants can be used.</div><div class='add'>+ * - For writing, mapped to the *corresponding* AC_VERB_SET_* variants,</div><div class='add'>+ *   so can't handle asymmetric verbs for read and write</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_regmap.h&gt;</div><div class='add'>+#include "local.h"</div><div class='add'>+</div><div class='add'>+static int codec_pm_lock(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_keep_power_up(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void codec_pm_unlock(struct hdac_device *codec, int lock)</div><div class='add'>+{</div><div class='add'>+	if (lock == 1)</div><div class='add'>+		snd_hdac_power_down_pm(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define get_verb(reg)	(((reg) &gt;&gt; 8) &amp; 0xfff)</div><div class='add'>+</div><div class='add'>+static bool hda_volatile_reg(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec = dev_to_hdac_dev(dev);</div><div class='add'>+	unsigned int verb = get_verb(reg);</div><div class='add'>+</div><div class='add'>+	switch (verb) {</div><div class='add'>+	case AC_VERB_GET_PROC_COEF:</div><div class='add'>+		return !codec-&gt;cache_coef;</div><div class='add'>+	case AC_VERB_GET_COEF_INDEX:</div><div class='add'>+	case AC_VERB_GET_PROC_STATE:</div><div class='add'>+	case AC_VERB_GET_POWER_STATE:</div><div class='add'>+	case AC_VERB_GET_PIN_SENSE:</div><div class='add'>+	case AC_VERB_GET_HDMI_DIP_SIZE:</div><div class='add'>+	case AC_VERB_GET_HDMI_ELDD:</div><div class='add'>+	case AC_VERB_GET_HDMI_DIP_INDEX:</div><div class='add'>+	case AC_VERB_GET_HDMI_DIP_DATA:</div><div class='add'>+	case AC_VERB_GET_HDMI_DIP_XMIT:</div><div class='add'>+	case AC_VERB_GET_HDMI_CP_CTRL:</div><div class='add'>+	case AC_VERB_GET_HDMI_CHAN_SLOT:</div><div class='add'>+	case AC_VERB_GET_DEVICE_SEL:</div><div class='add'>+	case AC_VERB_GET_DEVICE_LIST:	/* read-only volatile */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hda_writeable_reg(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec = dev_to_hdac_dev(dev);</div><div class='add'>+	unsigned int verb = get_verb(reg);</div><div class='add'>+	const unsigned int *v;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_array_for_each(&amp;codec-&gt;vendor_verbs, i, v) {</div><div class='add'>+		if (verb == *v)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;caps_overwriting)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	switch (verb &amp; 0xf00) {</div><div class='add'>+	case AC_VERB_GET_STREAM_FORMAT:</div><div class='add'>+	case AC_VERB_GET_AMP_GAIN_MUTE:</div><div class='add'>+		return true;</div><div class='add'>+	case AC_VERB_GET_PROC_COEF:</div><div class='add'>+		return codec-&gt;cache_coef;</div><div class='add'>+	case 0xf00:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (verb) {</div><div class='add'>+	case AC_VERB_GET_CONNECT_SEL:</div><div class='add'>+	case AC_VERB_GET_SDI_SELECT:</div><div class='add'>+	case AC_VERB_GET_PIN_WIDGET_CONTROL:</div><div class='add'>+	case AC_VERB_GET_UNSOLICITED_RESPONSE: /* only as SET_UNSOLICITED_ENABLE */</div><div class='add'>+	case AC_VERB_GET_BEEP_CONTROL:</div><div class='add'>+	case AC_VERB_GET_EAPD_BTLENABLE:</div><div class='add'>+	case AC_VERB_GET_DIGI_CONVERT_1:</div><div class='add'>+	case AC_VERB_GET_DIGI_CONVERT_2: /* only for beep control */</div><div class='add'>+	case AC_VERB_GET_VOLUME_KNOB_CONTROL:</div><div class='add'>+	case AC_VERB_GET_GPIO_MASK:</div><div class='add'>+	case AC_VERB_GET_GPIO_DIRECTION:</div><div class='add'>+	case AC_VERB_GET_GPIO_DATA: /* not for volatile read */</div><div class='add'>+	case AC_VERB_GET_GPIO_WAKE_MASK:</div><div class='add'>+	case AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK:</div><div class='add'>+	case AC_VERB_GET_GPIO_STICKY_MASK:</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hda_readable_reg(struct device *dev, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec = dev_to_hdac_dev(dev);</div><div class='add'>+	unsigned int verb = get_verb(reg);</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;caps_overwriting)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	switch (verb) {</div><div class='add'>+	case AC_VERB_PARAMETERS:</div><div class='add'>+	case AC_VERB_GET_CONNECT_LIST:</div><div class='add'>+	case AC_VERB_GET_SUBSYSTEM_ID:</div><div class='add'>+		return true;</div><div class='add'>+	/* below are basically writable, but disabled for reducing unnecessary</div><div class='add'>+	 * writes at sync</div><div class='add'>+	 */</div><div class='add'>+	case AC_VERB_GET_CONFIG_DEFAULT: /* usually just read */</div><div class='add'>+	case AC_VERB_GET_CONV: /* managed in PCM code */</div><div class='add'>+	case AC_VERB_GET_CVT_CHAN_COUNT: /* managed in HDMI CA code */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return hda_writeable_reg(dev, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Stereo amp pseudo register:</div><div class='add'>+ * for making easier to handle the stereo volume control, we provide a</div><div class='add'>+ * fake register to deal both left and right channels by a single</div><div class='add'>+ * (pseudo) register access.  A verb consisting of SET_AMP_GAIN with</div><div class='add'>+ * *both* SET_LEFT and SET_RIGHT bits takes a 16bit value, the lower 8bit</div><div class='add'>+ * for the left and the upper 8bit for the right channel.</div><div class='add'>+ */</div><div class='add'>+static bool is_stereo_amp_verb(unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	if (((reg &gt;&gt; 8) &amp; 0x700) != AC_VERB_SET_AMP_GAIN_MUTE)</div><div class='add'>+		return false;</div><div class='add'>+	return (reg &amp; (AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT)) ==</div><div class='add'>+		(AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read a pseudo stereo amp register (16bit left+right) */</div><div class='add'>+static int hda_reg_read_stereo_amp(struct hdac_device *codec,</div><div class='add'>+				   unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	unsigned int left, right;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~(AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT);</div><div class='add'>+	err = snd_hdac_exec_verb(codec, reg | AC_AMP_GET_LEFT, 0, &amp;left);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_hdac_exec_verb(codec, reg | AC_AMP_GET_RIGHT, 0, &amp;right);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	*val = left | (right &lt;&lt; 8);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write a pseudo stereo amp register (16bit left+right) */</div><div class='add'>+static int hda_reg_write_stereo_amp(struct hdac_device *codec,</div><div class='add'>+				    unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int verb, left, right;</div><div class='add'>+</div><div class='add'>+	verb = AC_VERB_SET_AMP_GAIN_MUTE &lt;&lt; 8;</div><div class='add'>+	if (reg &amp; AC_AMP_GET_OUTPUT)</div><div class='add'>+		verb |= AC_AMP_SET_OUTPUT;</div><div class='add'>+	else</div><div class='add'>+		verb |= AC_AMP_SET_INPUT | ((reg &amp; 0xf) &lt;&lt; 8);</div><div class='add'>+	reg = (reg &amp; ~0xfffff) | verb;</div><div class='add'>+</div><div class='add'>+	left = val &amp; 0xff;</div><div class='add'>+	right = (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	if (left == right) {</div><div class='add'>+		reg |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;</div><div class='add'>+		return snd_hdac_exec_verb(codec, reg | left, 0, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_exec_verb(codec, reg | AC_AMP_SET_LEFT | left, 0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_hdac_exec_verb(codec, reg | AC_AMP_SET_RIGHT | right, 0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read a pseudo coef register (16bit) */</div><div class='add'>+static int hda_reg_read_coef(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			     unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	unsigned int verb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;cache_coef)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* LSB 8bit = coef index */</div><div class='add'>+	verb = (reg &amp; ~0xfff00) | (AC_VERB_SET_COEF_INDEX &lt;&lt; 8);</div><div class='add'>+	err = snd_hdac_exec_verb(codec, verb, 0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	verb = (reg &amp; ~0xfffff) | (AC_VERB_GET_COEF_INDEX &lt;&lt; 8);</div><div class='add'>+	return snd_hdac_exec_verb(codec, verb, 0, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write a pseudo coef register (16bit) */</div><div class='add'>+static int hda_reg_write_coef(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			      unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int verb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;cache_coef)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* LSB 8bit = coef index */</div><div class='add'>+	verb = (reg &amp; ~0xfff00) | (AC_VERB_SET_COEF_INDEX &lt;&lt; 8);</div><div class='add'>+	err = snd_hdac_exec_verb(codec, verb, 0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	verb = (reg &amp; ~0xfffff) | (AC_VERB_GET_COEF_INDEX &lt;&lt; 8) |</div><div class='add'>+		(val &amp; 0xffff);</div><div class='add'>+	return snd_hdac_exec_verb(codec, verb, 0, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_reg_read(void *context, unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec = context;</div><div class='add'>+	int verb = get_verb(reg);</div><div class='add'>+	int err;</div><div class='add'>+	int pm_lock = 0;</div><div class='add'>+</div><div class='add'>+	if (verb != AC_VERB_GET_POWER_STATE) {</div><div class='add'>+		pm_lock = codec_pm_lock(codec);</div><div class='add'>+		if (pm_lock &lt; 0)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	reg |= (codec-&gt;addr &lt;&lt; 28);</div><div class='add'>+	if (is_stereo_amp_verb(reg)) {</div><div class='add'>+		err = hda_reg_read_stereo_amp(codec, reg, val);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (verb == AC_VERB_GET_PROC_COEF) {</div><div class='add'>+		err = hda_reg_read_coef(codec, reg, val);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if ((verb &amp; 0x700) == AC_VERB_SET_AMP_GAIN_MUTE)</div><div class='add'>+		reg &amp;= ~AC_AMP_FAKE_MUTE;</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_exec_verb(codec, reg, 0, val);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* special handling for asymmetric reads */</div><div class='add'>+	if (verb == AC_VERB_GET_POWER_STATE) {</div><div class='add'>+		if (*val &amp; AC_PWRST_ERROR)</div><div class='add'>+			*val = -1;</div><div class='add'>+		else /* take only the actual state */</div><div class='add'>+			*val = (*val &gt;&gt; 4) &amp; 0x0f;</div><div class='add'>+	}</div><div class='add'>+ out:</div><div class='add'>+	codec_pm_unlock(codec, pm_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hda_reg_write(void *context, unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct hdac_device *codec = context;</div><div class='add'>+	unsigned int verb;</div><div class='add'>+	int i, bytes, err;</div><div class='add'>+	int pm_lock = 0;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;caps_overwriting)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~0x00080000U; /* drop GET bit */</div><div class='add'>+	reg |= (codec-&gt;addr &lt;&lt; 28);</div><div class='add'>+	verb = get_verb(reg);</div><div class='add'>+</div><div class='add'>+	if (verb != AC_VERB_SET_POWER_STATE) {</div><div class='add'>+		pm_lock = codec_pm_lock(codec);</div><div class='add'>+		if (pm_lock &lt; 0)</div><div class='add'>+			return codec-&gt;lazy_cache ? 0 : -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_stereo_amp_verb(reg)) {</div><div class='add'>+		err = hda_reg_write_stereo_amp(codec, reg, val);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (verb == AC_VERB_SET_PROC_COEF) {</div><div class='add'>+		err = hda_reg_write_coef(codec, reg, val);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (verb &amp; 0xf00) {</div><div class='add'>+	case AC_VERB_SET_AMP_GAIN_MUTE:</div><div class='add'>+		if ((reg &amp; AC_AMP_FAKE_MUTE) &amp;&amp; (val &amp; AC_AMP_MUTE))</div><div class='add'>+			val = 0;</div><div class='add'>+		verb = AC_VERB_SET_AMP_GAIN_MUTE;</div><div class='add'>+		if (reg &amp; AC_AMP_GET_LEFT)</div><div class='add'>+			verb |= AC_AMP_SET_LEFT &gt;&gt; 8;</div><div class='add'>+		else</div><div class='add'>+			verb |= AC_AMP_SET_RIGHT &gt;&gt; 8;</div><div class='add'>+		if (reg &amp; AC_AMP_GET_OUTPUT) {</div><div class='add'>+			verb |= AC_AMP_SET_OUTPUT &gt;&gt; 8;</div><div class='add'>+		} else {</div><div class='add'>+			verb |= AC_AMP_SET_INPUT &gt;&gt; 8;</div><div class='add'>+			verb |= reg &amp; 0xf;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (verb) {</div><div class='add'>+	case AC_VERB_SET_DIGI_CONVERT_1:</div><div class='add'>+		bytes = 2;</div><div class='add'>+		break;</div><div class='add'>+	case AC_VERB_SET_CONFIG_DEFAULT_BYTES_0:</div><div class='add'>+		bytes = 4;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bytes = 1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bytes; i++) {</div><div class='add'>+		reg &amp;= ~0xfffff;</div><div class='add'>+		reg |= (verb + i) &lt;&lt; 8 | ((val &gt;&gt; (8 * i)) &amp; 0xff);</div><div class='add'>+		err = snd_hdac_exec_verb(codec, reg, 0, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	codec_pm_unlock(codec, pm_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config hda_regmap_cfg = {</div><div class='add'>+	.name = "hdaudio",</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.max_register = 0xfffffff,</div><div class='add'>+	.writeable_reg = hda_writeable_reg,</div><div class='add'>+	.readable_reg = hda_readable_reg,</div><div class='add'>+	.volatile_reg = hda_volatile_reg,</div><div class='add'>+	.cache_type = REGCACHE_MAPLE,</div><div class='add'>+	.reg_read = hda_reg_read,</div><div class='add'>+	.reg_write = hda_reg_write,</div><div class='add'>+	.use_single_read = true,</div><div class='add'>+	.use_single_write = true,</div><div class='add'>+	.disable_locking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_init - Initialize regmap for HDA register accesses</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_init(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+</div><div class='add'>+	regmap = regmap_init(&amp;codec-&gt;dev, NULL, codec, &amp;hda_regmap_cfg);</div><div class='add'>+	if (IS_ERR(regmap))</div><div class='add'>+		return PTR_ERR(regmap);</div><div class='add'>+	codec-&gt;regmap = regmap;</div><div class='add'>+	snd_array_init(&amp;codec-&gt;vendor_verbs, sizeof(unsigned int), 8);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_exit - Release the regmap from HDA codec</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_regmap_exit(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	if (codec-&gt;regmap) {</div><div class='add'>+		regmap_exit(codec-&gt;regmap);</div><div class='add'>+		codec-&gt;regmap = NULL;</div><div class='add'>+		snd_array_free(&amp;codec-&gt;vendor_verbs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_exit);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_add_vendor_verb - add a vendor-specific verb to regmap</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @verb: verb to allow accessing via regmap</div><div class='add'>+ *</div><div class='add'>+ * Returns zero for success or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec,</div><div class='add'>+				    unsigned int verb)</div><div class='add'>+{</div><div class='add'>+	unsigned int *p = snd_array_new(&amp;codec-&gt;vendor_verbs);</div><div class='add'>+</div><div class='add'>+	if (!p)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	*p = verb | 0x800; /* set GET bit */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_add_vendor_verb);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * helper functions</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* write a pseudo-register value (w/o power sequence) */</div><div class='add'>+static int reg_raw_write(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			 unsigned int val)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	if (!codec-&gt;regmap)</div><div class='add'>+		return hda_reg_write(codec, reg, val);</div><div class='add'>+	else</div><div class='add'>+		return regmap_write(codec-&gt;regmap, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* a helper macro to call @func_call; retry with power-up if failed */</div><div class='add'>+#define CALL_RAW_FUNC(codec, func_call)				\</div><div class='add'>+	({							\</div><div class='add'>+		int _err = func_call;				\</div><div class='add'>+		if (_err == -EAGAIN) {				\</div><div class='add'>+			_err = snd_hdac_power_up_pm(codec);	\</div><div class='add'>+			if (_err &gt;= 0)				\</div><div class='add'>+				_err = func_call;		\</div><div class='add'>+			snd_hdac_power_down_pm(codec);		\</div><div class='add'>+		}						\</div><div class='add'>+		_err;})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_write_raw - write a pseudo register with power mgmt</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @reg: pseudo register</div><div class='add'>+ * @val: value to write</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			      unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return CALL_RAW_FUNC(codec, reg_raw_write(codec, reg, val));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_write_raw);</div><div class='add'>+</div><div class='add'>+static int reg_raw_read(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			unsigned int *val, bool uncached)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	if (uncached || !codec-&gt;regmap)</div><div class='add'>+		return hda_reg_read(codec, reg, val);</div><div class='add'>+	else</div><div class='add'>+		return regmap_read(codec-&gt;regmap, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __snd_hdac_regmap_read_raw(struct hdac_device *codec,</div><div class='add'>+				      unsigned int reg, unsigned int *val,</div><div class='add'>+				      bool uncached)</div><div class='add'>+{</div><div class='add'>+	return CALL_RAW_FUNC(codec, reg_raw_read(codec, reg, val, uncached));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_read_raw - read a pseudo register with power mgmt</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @reg: pseudo register</div><div class='add'>+ * @val: pointer to store the read value</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			     unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	return __snd_hdac_regmap_read_raw(codec, reg, val, false);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_read_raw);</div><div class='add'>+</div><div class='add'>+/* Works like snd_hdac_regmap_read_raw(), but this doesn't read from the</div><div class='add'>+ * cache but always via hda verbs.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_read_raw_uncached(struct hdac_device *codec,</div><div class='add'>+				      unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	return __snd_hdac_regmap_read_raw(codec, reg, val, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int reg_raw_update(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			  unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int orig;</div><div class='add'>+	bool change;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	if (codec-&gt;regmap) {</div><div class='add'>+		err = regmap_update_bits_check(codec-&gt;regmap, reg, mask, val,</div><div class='add'>+					       &amp;change);</div><div class='add'>+		if (!err)</div><div class='add'>+			err = change ? 1 : 0;</div><div class='add'>+	} else {</div><div class='add'>+		err = hda_reg_read(codec, reg, &amp;orig);</div><div class='add'>+		if (!err) {</div><div class='add'>+			val &amp;= mask;</div><div class='add'>+			val |= orig &amp; ~mask;</div><div class='add'>+			if (val != orig) {</div><div class='add'>+				err = hda_reg_write(codec, reg, val);</div><div class='add'>+				if (!err)</div><div class='add'>+					err = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_update_raw - update a pseudo register with power mgmt</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @reg: pseudo register</div><div class='add'>+ * @mask: bit mask to update</div><div class='add'>+ * @val: value to update</div><div class='add'>+ *</div><div class='add'>+ * Returns zero if successful or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_update_raw(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			       unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return CALL_RAW_FUNC(codec, reg_raw_update(codec, reg, mask, val));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw);</div><div class='add'>+</div><div class='add'>+static int reg_raw_update_once(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+			       unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	if (!codec-&gt;regmap)</div><div class='add'>+		return reg_raw_update(codec, reg, mask, val);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	/* Discard any updates to already initialised registers. */</div><div class='add'>+	if (!regcache_reg_cached(codec-&gt;regmap, reg))</div><div class='add'>+		return regmap_update_bits(codec-&gt;regmap, reg, mask, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_update_raw_once - initialize the register value only once</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ * @reg: pseudo register</div><div class='add'>+ * @mask: bit mask to update</div><div class='add'>+ * @val: value to update</div><div class='add'>+ *</div><div class='add'>+ * Performs the update of the register bits only once when the register</div><div class='add'>+ * hasn't been initialized yet.  Used in HD-audio legacy driver.</div><div class='add'>+ * Returns zero if successful or a negative error code</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_regmap_update_raw_once(struct hdac_device *codec, unsigned int reg,</div><div class='add'>+				    unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	return CALL_RAW_FUNC(codec, reg_raw_update_once(codec, reg, mask, val));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw_once);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_regmap_sync - sync out the cached values for PM resume</div><div class='add'>+ * @codec: the codec object</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_regmap_sync(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	guard(mutex)(&amp;codec-&gt;regmap_lock);</div><div class='add'>+	if (codec-&gt;regmap)</div><div class='add'>+		regcache_sync(codec-&gt;regmap);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_regmap_sync);</div><div class='head'>diff --git a/sound/hda/core/stream.c b/sound/hda/core/stream.c<br/>new file mode 100644<br/>index 000000000000..579ec544ef4a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/stream.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/stream.c</a></div><div class='hunk'>@@ -0,0 +1,1004 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * HD-audio stream operations</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;sound/compress_driver.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include &lt;sound/hda_register.h&gt;</div><div class='add'>+#include "trace.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * the hdac_stream library is intended to be used with the following</div><div class='add'>+ * transitions. The states are not formally defined in the code but loosely</div><div class='add'>+ * inspired by boolean variables. Note that the 'prepared' field is not used</div><div class='add'>+ * in this library but by the callers during the hw_params/prepare transitions</div><div class='add'>+ *</div><div class='add'>+ *			   |</div><div class='add'>+ *	stream_init()	   |</div><div class='add'>+ *			   v</div><div class='add'>+ *			+--+-------+</div><div class='add'>+ *			|  unused  |</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			   |    ^</div><div class='add'>+ *	stream_assign()	   | 	|    stream_release()</div><div class='add'>+ *			   v	|</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			|  opened  |</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			   |    ^</div><div class='add'>+ *	stream_reset()	   |    |</div><div class='add'>+ *	stream_setup()	   |	|    stream_cleanup()</div><div class='add'>+ *			   v	|</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			| prepared |</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			   |    ^</div><div class='add'>+ *	stream_start()	   | 	|    stream_stop()</div><div class='add'>+ *			   v	|</div><div class='add'>+ *			+--+----+--+</div><div class='add'>+ *			|  running |</div><div class='add'>+ *			+----------+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_get_stream_stripe_ctl - get stripe control value</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @substream: PCM substream</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus,</div><div class='add'>+				   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int channels = runtime-&gt;channels,</div><div class='add'>+		     rate = runtime-&gt;rate,</div><div class='add'>+		     bits_per_sample = runtime-&gt;sample_bits,</div><div class='add'>+		     max_sdo_lines, value, sdo_line;</div><div class='add'>+</div><div class='add'>+	/* T_AZA_GCAP_NSDO is 1:2 bitfields in GCAP */</div><div class='add'>+	max_sdo_lines = snd_hdac_chip_readl(bus, GCAP) &amp; AZX_GCAP_NSDO;</div><div class='add'>+</div><div class='add'>+	/* following is from HD audio spec */</div><div class='add'>+	for (sdo_line = max_sdo_lines; sdo_line &gt; 0; sdo_line &gt;&gt;= 1) {</div><div class='add'>+		if (rate &gt; 48000)</div><div class='add'>+			value = (channels * bits_per_sample *</div><div class='add'>+					(rate / 48000)) / sdo_line;</div><div class='add'>+		else</div><div class='add'>+			value = (channels * bits_per_sample) / sdo_line;</div><div class='add'>+</div><div class='add'>+		if (value &gt;= bus-&gt;sdo_limit)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* stripe value: 0 for 1SDO, 1 for 2SDO, 2 for 4SDO lines */</div><div class='add'>+	return sdo_line &gt;&gt; 1;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_stream_stripe_ctl);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_init - initialize each stream (aka device)</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @azx_dev: HD-audio core stream object to initialize</div><div class='add'>+ * @idx: stream index number</div><div class='add'>+ * @direction: stream direction (SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE)</div><div class='add'>+ * @tag: the tag id to assign</div><div class='add'>+ *</div><div class='add'>+ * Assign the starting bdl address to each stream (device) and initialize.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_init(struct hdac_bus *bus, struct hdac_stream *azx_dev,</div><div class='add'>+			  int idx, int direction, int tag)</div><div class='add'>+{</div><div class='add'>+	azx_dev-&gt;bus = bus;</div><div class='add'>+	/* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */</div><div class='add'>+	azx_dev-&gt;sd_addr = bus-&gt;remap_addr + (0x20 * idx + 0x80);</div><div class='add'>+	/* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */</div><div class='add'>+	azx_dev-&gt;sd_int_sta_mask = 1 &lt;&lt; idx;</div><div class='add'>+	azx_dev-&gt;index = idx;</div><div class='add'>+	azx_dev-&gt;direction = direction;</div><div class='add'>+	azx_dev-&gt;stream_tag = tag;</div><div class='add'>+	snd_hdac_dsp_lock_init(azx_dev);</div><div class='add'>+	list_add_tail(&amp;azx_dev-&gt;list, &amp;bus-&gt;stream_list);</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;spbcap) {</div><div class='add'>+		azx_dev-&gt;spib_addr = bus-&gt;spbcap + AZX_SPB_BASE +</div><div class='add'>+					AZX_SPB_INTERVAL * idx +</div><div class='add'>+					AZX_SPB_SPIB;</div><div class='add'>+</div><div class='add'>+		azx_dev-&gt;fifo_addr = bus-&gt;spbcap + AZX_SPB_BASE +</div><div class='add'>+					AZX_SPB_INTERVAL * idx +</div><div class='add'>+					AZX_SPB_MAXFIFO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;drsmcap)</div><div class='add'>+		azx_dev-&gt;dpibr_addr = bus-&gt;drsmcap + AZX_DRSM_BASE +</div><div class='add'>+					AZX_DRSM_INTERVAL * idx;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_start - start a stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to start</div><div class='add'>+ *</div><div class='add'>+ * Start a stream, set start_wallclk and set the running flag.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_start(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	int stripe_ctl;</div><div class='add'>+</div><div class='add'>+	trace_snd_hdac_stream_start(bus, azx_dev);</div><div class='add'>+</div><div class='add'>+	azx_dev-&gt;start_wallclk = snd_hdac_chip_readl(bus, WALLCLK);</div><div class='add'>+</div><div class='add'>+	/* enable SIE */</div><div class='add'>+	snd_hdac_chip_updatel(bus, INTCTL,</div><div class='add'>+			      1 &lt;&lt; azx_dev-&gt;index,</div><div class='add'>+			      1 &lt;&lt; azx_dev-&gt;index);</div><div class='add'>+	/* set stripe control */</div><div class='add'>+	if (azx_dev-&gt;stripe) {</div><div class='add'>+		if (azx_dev-&gt;substream)</div><div class='add'>+			stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev-&gt;substream);</div><div class='add'>+		else</div><div class='add'>+			stripe_ctl = 0;</div><div class='add'>+		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,</div><div class='add'>+					stripe_ctl);</div><div class='add'>+	}</div><div class='add'>+	/* set DMA start and interrupt mask */</div><div class='add'>+	if (bus-&gt;access_sdnctl_in_dword)</div><div class='add'>+		snd_hdac_stream_updatel(azx_dev, SD_CTL,</div><div class='add'>+				0, SD_CTL_DMA_START | SD_INT_MASK);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_stream_updateb(azx_dev, SD_CTL,</div><div class='add'>+				0, SD_CTL_DMA_START | SD_INT_MASK);</div><div class='add'>+	azx_dev-&gt;running = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_start);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_clear - helper to clear stream registers and stop DMA transfers</div><div class='add'>+ * @azx_dev: HD-audio core stream to stop</div><div class='add'>+ */</div><div class='add'>+static void snd_hdac_stream_clear(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_stream_updateb(azx_dev, SD_CTL,</div><div class='add'>+				SD_CTL_DMA_START | SD_INT_MASK, 0);</div><div class='add'>+	snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */</div><div class='add'>+	if (azx_dev-&gt;stripe)</div><div class='add'>+		snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);</div><div class='add'>+	azx_dev-&gt;running = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_stop - stop a stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to stop</div><div class='add'>+ *</div><div class='add'>+ * Stop a stream DMA and disable stream interrupt</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_stop(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	trace_snd_hdac_stream_stop(azx_dev-&gt;bus, azx_dev);</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_clear(azx_dev);</div><div class='add'>+	/* disable SIE */</div><div class='add'>+	snd_hdac_chip_updatel(azx_dev-&gt;bus, INTCTL, 1 &lt;&lt; azx_dev-&gt;index, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_stop);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stop_streams - stop all streams</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stop_streams(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *stream;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(stream, &amp;bus-&gt;stream_list, list)</div><div class='add'>+		snd_hdac_stream_stop(stream);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stop_streams);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stop_streams_and_chip - stop all streams and chip if running</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (bus-&gt;chip_init) {</div><div class='add'>+		snd_hdac_stop_streams(bus);</div><div class='add'>+		snd_hdac_bus_stop_chip(bus);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_reset - reset a stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to reset</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_reset(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	unsigned char val;</div><div class='add'>+	int dma_run_state;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_clear(azx_dev);</div><div class='add'>+</div><div class='add'>+	dma_run_state = snd_hdac_stream_readb(azx_dev, SD_CTL) &amp; SD_CTL_DMA_START;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_updateb(azx_dev, SD_CTL, 0, SD_CTL_STREAM_RESET);</div><div class='add'>+</div><div class='add'>+	/* wait for hardware to report that the stream entered reset */</div><div class='add'>+	snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, (val &amp; SD_CTL_STREAM_RESET), 3, 300);</div><div class='add'>+</div><div class='add'>+	if (azx_dev-&gt;bus-&gt;dma_stop_delay &amp;&amp; dma_run_state)</div><div class='add'>+		udelay(azx_dev-&gt;bus-&gt;dma_stop_delay);</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_CTL_STREAM_RESET, 0);</div><div class='add'>+</div><div class='add'>+	/* wait for hardware to report that the stream is out of reset */</div><div class='add'>+	snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, !(val &amp; SD_CTL_STREAM_RESET), 3, 300);</div><div class='add'>+</div><div class='add'>+	/* reset first position - may not be synced with hw at this time */</div><div class='add'>+	if (azx_dev-&gt;posbuf)</div><div class='add'>+		*azx_dev-&gt;posbuf = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_reset);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_setup -  set up the SD for streaming</div><div class='add'>+ * @azx_dev: HD-audio core stream to set up</div><div class='add'>+ * @code_loading: Whether the stream is for PCM or code-loading.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_setup(struct hdac_stream *azx_dev, bool code_loading)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	struct snd_pcm_runtime *runtime;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	u16 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (azx_dev-&gt;substream)</div><div class='add'>+		runtime = azx_dev-&gt;substream-&gt;runtime;</div><div class='add'>+	else</div><div class='add'>+		runtime = NULL;</div><div class='add'>+	/* make sure the run bit is zero for SD */</div><div class='add'>+	snd_hdac_stream_clear(azx_dev);</div><div class='add'>+	/* program the stream_tag */</div><div class='add'>+	val = snd_hdac_stream_readl(azx_dev, SD_CTL);</div><div class='add'>+	val = (val &amp; ~SD_CTL_STREAM_TAG_MASK) |</div><div class='add'>+		(azx_dev-&gt;stream_tag &lt;&lt; SD_CTL_STREAM_TAG_SHIFT);</div><div class='add'>+	if (!bus-&gt;snoop)</div><div class='add'>+		val |= SD_CTL_TRAFFIC_PRIO;</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_CTL, val);</div><div class='add'>+</div><div class='add'>+	/* program the length of samples in cyclic buffer */</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_CBL, azx_dev-&gt;bufsize);</div><div class='add'>+</div><div class='add'>+	/* program the stream format */</div><div class='add'>+	/* this value needs to be the same as the one programmed */</div><div class='add'>+	snd_hdac_stream_writew(azx_dev, SD_FORMAT, azx_dev-&gt;format_val);</div><div class='add'>+</div><div class='add'>+	/* program the stream LVI (last valid index) of the BDL */</div><div class='add'>+	snd_hdac_stream_writew(azx_dev, SD_LVI, azx_dev-&gt;frags - 1);</div><div class='add'>+</div><div class='add'>+	/* program the BDL address */</div><div class='add'>+	/* lower BDL address */</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPL, (u32)azx_dev-&gt;bdl.addr);</div><div class='add'>+	/* upper BDL address */</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPU,</div><div class='add'>+			       upper_32_bits(azx_dev-&gt;bdl.addr));</div><div class='add'>+</div><div class='add'>+	/* enable the position buffer */</div><div class='add'>+	if (bus-&gt;use_posbuf &amp;&amp; bus-&gt;posbuf.addr) {</div><div class='add'>+		if (!(snd_hdac_chip_readl(bus, DPLBASE) &amp; AZX_DPLBASE_ENABLE))</div><div class='add'>+			snd_hdac_chip_writel(bus, DPLBASE,</div><div class='add'>+				(u32)bus-&gt;posbuf.addr | AZX_DPLBASE_ENABLE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set the interrupt enable bits in the descriptor control register */</div><div class='add'>+	snd_hdac_stream_updatel(azx_dev, SD_CTL, 0, SD_INT_MASK);</div><div class='add'>+</div><div class='add'>+	if (!code_loading) {</div><div class='add'>+		/* Once SDxFMT is set, the controller programs SDxFIFOS to non-zero value. */</div><div class='add'>+		ret = snd_hdac_stream_readw_poll(azx_dev, SD_FIFOSIZE, reg,</div><div class='add'>+						 reg &amp; AZX_SD_FIFOSIZE_MASK, 3, 300);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_dbg(bus-&gt;dev, "polling SD_FIFOSIZE 0x%04x failed: %d\n",</div><div class='add'>+				AZX_REG_SD_FIFOSIZE, ret);</div><div class='add'>+		azx_dev-&gt;fifo_size = reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* when LPIB delay correction gives a small negative value,</div><div class='add'>+	 * we ignore it; currently set the threshold statically to</div><div class='add'>+	 * 64 frames</div><div class='add'>+	 */</div><div class='add'>+	if (runtime &amp;&amp; runtime-&gt;period_size &gt; 64)</div><div class='add'>+		azx_dev-&gt;delay_negative_threshold =</div><div class='add'>+			-frames_to_bytes(runtime, 64);</div><div class='add'>+	else</div><div class='add'>+		azx_dev-&gt;delay_negative_threshold = 0;</div><div class='add'>+</div><div class='add'>+	/* wallclk has 24Mhz clock source */</div><div class='add'>+	if (runtime)</div><div class='add'>+		azx_dev-&gt;period_wallclk = (((runtime-&gt;period_size * 24000) /</div><div class='add'>+				    runtime-&gt;rate) * 1000);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_setup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_cleanup - cleanup a stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to clean up</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_cleanup(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_CTL, 0);</div><div class='add'>+	azx_dev-&gt;bufsize = 0;</div><div class='add'>+	azx_dev-&gt;period_bytes = 0;</div><div class='add'>+	azx_dev-&gt;format_val = 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_cleanup);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_assign - assign a stream for the PCM</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @substream: PCM substream to assign</div><div class='add'>+ *</div><div class='add'>+ * Look for an unused stream for the given PCM substream, assign it</div><div class='add'>+ * and return the stream object.  If no stream is free, returns NULL.</div><div class='add'>+ * The function tries to keep using the same stream object when it's used</div><div class='add'>+ * beforehand.  Also, when bus-&gt;reverse_assign flag is set, the last free</div><div class='add'>+ * or matching entry is returned.  This is needed for some strange codecs.</div><div class='add'>+ */</div><div class='add'>+struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,</div><div class='add'>+					   struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *azx_dev;</div><div class='add'>+	struct hdac_stream *res = NULL;</div><div class='add'>+</div><div class='add'>+	/* make a non-zero unique key for the substream */</div><div class='add'>+	int key = (substream-&gt;number &lt;&lt; 2) | (substream-&gt;stream + 1);</div><div class='add'>+</div><div class='add'>+	if (substream-&gt;pcm)</div><div class='add'>+		key |= (substream-&gt;pcm-&gt;device &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	list_for_each_entry(azx_dev, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		if (azx_dev-&gt;direction != substream-&gt;stream)</div><div class='add'>+			continue;</div><div class='add'>+		if (azx_dev-&gt;opened)</div><div class='add'>+			continue;</div><div class='add'>+		if (azx_dev-&gt;assigned_key == key) {</div><div class='add'>+			res = azx_dev;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!res || bus-&gt;reverse_assign)</div><div class='add'>+			res = azx_dev;</div><div class='add'>+	}</div><div class='add'>+	if (res) {</div><div class='add'>+		res-&gt;opened = 1;</div><div class='add'>+		res-&gt;running = 0;</div><div class='add'>+		res-&gt;assigned_key = key;</div><div class='add'>+		res-&gt;substream = substream;</div><div class='add'>+	}</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_assign);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_release_locked - release the assigned stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to release</div><div class='add'>+ *</div><div class='add'>+ * Release the stream that has been assigned by snd_hdac_stream_assign().</div><div class='add'>+ * The bus-&gt;reg_lock needs to be taken at a higher level</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_release_locked(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	azx_dev-&gt;opened = 0;</div><div class='add'>+	azx_dev-&gt;running = 0;</div><div class='add'>+	azx_dev-&gt;substream = NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_release_locked);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_release - release the assigned stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to release</div><div class='add'>+ *</div><div class='add'>+ * Release the stream that has been assigned by snd_hdac_stream_assign().</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_release(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	snd_hdac_stream_release_locked(azx_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_release);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_get_stream - return hdac_stream based on stream_tag and</div><div class='add'>+ * direction</div><div class='add'>+ *</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @dir: direction for the stream to be found</div><div class='add'>+ * @stream_tag: stream tag for stream to be found</div><div class='add'>+ */</div><div class='add'>+struct hdac_stream *snd_hdac_get_stream(struct hdac_bus *bus,</div><div class='add'>+					int dir, int stream_tag)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		if (s-&gt;direction == dir &amp;&amp; s-&gt;stream_tag == stream_tag)</div><div class='add'>+			return s;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_get_stream);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set up a BDL entry</div><div class='add'>+ */</div><div class='add'>+static int setup_bdle(struct hdac_bus *bus,</div><div class='add'>+		      struct snd_dma_buffer *dmab,</div><div class='add'>+		      struct hdac_stream *azx_dev, __le32 **bdlp,</div><div class='add'>+		      int ofs, int size, int with_ioc)</div><div class='add'>+{</div><div class='add'>+	__le32 *bdl = *bdlp;</div><div class='add'>+</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		dma_addr_t addr;</div><div class='add'>+		int chunk;</div><div class='add'>+</div><div class='add'>+		if (azx_dev-&gt;frags &gt;= AZX_MAX_BDL_ENTRIES)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		addr = snd_sgbuf_get_addr(dmab, ofs);</div><div class='add'>+		/* program the address field of the BDL entry */</div><div class='add'>+		bdl[0] = cpu_to_le32((u32)addr);</div><div class='add'>+		bdl[1] = cpu_to_le32(upper_32_bits(addr));</div><div class='add'>+		/* program the size field of the BDL entry */</div><div class='add'>+		chunk = snd_sgbuf_get_chunk_size(dmab, ofs, size);</div><div class='add'>+		/* one BDLE cannot cross 4K boundary on CTHDA chips */</div><div class='add'>+		if (bus-&gt;align_bdle_4k) {</div><div class='add'>+			u32 remain = 0x1000 - (ofs &amp; 0xfff);</div><div class='add'>+</div><div class='add'>+			if (chunk &gt; remain)</div><div class='add'>+				chunk = remain;</div><div class='add'>+		}</div><div class='add'>+		bdl[2] = cpu_to_le32(chunk);</div><div class='add'>+		/* program the IOC to enable interrupt</div><div class='add'>+		 * only when the whole fragment is processed</div><div class='add'>+		 */</div><div class='add'>+		size -= chunk;</div><div class='add'>+		bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);</div><div class='add'>+		bdl += 4;</div><div class='add'>+		azx_dev-&gt;frags++;</div><div class='add'>+		ofs += chunk;</div><div class='add'>+	}</div><div class='add'>+	*bdlp = bdl;</div><div class='add'>+	return ofs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_setup_bdle - set up BDL entries</div><div class='add'>+ * @azx_dev: HD-audio core stream to set up</div><div class='add'>+ * @dmab: allocated DMA buffer</div><div class='add'>+ * @runtime: substream runtime, optional</div><div class='add'>+ *</div><div class='add'>+ * Set up the buffer descriptor table of the given stream based on the</div><div class='add'>+ * period and buffer sizes of the assigned PCM substream.</div><div class='add'>+ */</div><div class='add'>+static int snd_hdac_stream_setup_bdle(struct hdac_stream *azx_dev, struct snd_dma_buffer *dmab,</div><div class='add'>+				      struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	int i, ofs, periods, period_bytes;</div><div class='add'>+	int pos_adj, pos_align;</div><div class='add'>+	__le32 *bdl;</div><div class='add'>+</div><div class='add'>+	/* reset BDL address */</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);</div><div class='add'>+</div><div class='add'>+	period_bytes = azx_dev-&gt;period_bytes;</div><div class='add'>+	periods = azx_dev-&gt;bufsize / period_bytes;</div><div class='add'>+</div><div class='add'>+	/* program the initial BDL entries */</div><div class='add'>+	bdl = (__le32 *)azx_dev-&gt;bdl.area;</div><div class='add'>+	ofs = 0;</div><div class='add'>+	azx_dev-&gt;frags = 0;</div><div class='add'>+</div><div class='add'>+	pos_adj = bus-&gt;bdl_pos_adj;</div><div class='add'>+	if (runtime &amp;&amp; !azx_dev-&gt;no_period_wakeup &amp;&amp; pos_adj &gt; 0) {</div><div class='add'>+		pos_align = pos_adj;</div><div class='add'>+		pos_adj = DIV_ROUND_UP(pos_adj * runtime-&gt;rate, 48000);</div><div class='add'>+		if (!pos_adj)</div><div class='add'>+			pos_adj = pos_align;</div><div class='add'>+		else</div><div class='add'>+			pos_adj = roundup(pos_adj, pos_align);</div><div class='add'>+		pos_adj = frames_to_bytes(runtime, pos_adj);</div><div class='add'>+		if (pos_adj &gt;= period_bytes) {</div><div class='add'>+			dev_warn(bus-&gt;dev, "Too big adjustment %d\n",</div><div class='add'>+				 pos_adj);</div><div class='add'>+			pos_adj = 0;</div><div class='add'>+		} else {</div><div class='add'>+			ofs = setup_bdle(bus, dmab, azx_dev,</div><div class='add'>+					 &amp;bdl, ofs, pos_adj, true);</div><div class='add'>+			if (ofs &lt; 0)</div><div class='add'>+				goto error;</div><div class='add'>+		}</div><div class='add'>+	} else</div><div class='add'>+		pos_adj = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; periods; i++) {</div><div class='add'>+		if (i == periods - 1 &amp;&amp; pos_adj)</div><div class='add'>+			ofs = setup_bdle(bus, dmab, azx_dev,</div><div class='add'>+					 &amp;bdl, ofs, period_bytes - pos_adj, 0);</div><div class='add'>+		else</div><div class='add'>+			ofs = setup_bdle(bus, dmab, azx_dev,</div><div class='add'>+					 &amp;bdl, ofs, period_bytes,</div><div class='add'>+					 !azx_dev-&gt;no_period_wakeup);</div><div class='add'>+		if (ofs &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	dev_dbg(bus-&gt;dev, "Too many BDL entries: buffer=%d, period=%d\n",</div><div class='add'>+		azx_dev-&gt;bufsize, period_bytes);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_setup_periods - set up BDL entries</div><div class='add'>+ * @azx_dev: HD-audio core stream to set up</div><div class='add'>+ *</div><div class='add'>+ * Set up the buffer descriptor table of the given stream based on the</div><div class='add'>+ * period and buffer sizes of the assigned PCM substream.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;substream;</div><div class='add'>+	struct snd_compr_stream *cstream = azx_dev-&gt;cstream;</div><div class='add'>+	struct snd_pcm_runtime *runtime = NULL;</div><div class='add'>+	struct snd_dma_buffer *dmab;</div><div class='add'>+</div><div class='add'>+	if (substream) {</div><div class='add'>+		runtime = substream-&gt;runtime;</div><div class='add'>+		dmab = snd_pcm_get_dma_buf(substream);</div><div class='add'>+	} else if (cstream) {</div><div class='add'>+		dmab = snd_pcm_get_dma_buf(cstream);</div><div class='add'>+	} else {</div><div class='add'>+		WARN(1, "No substream or cstream assigned\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_hdac_stream_setup_bdle(azx_dev, dmab, runtime);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_setup_periods);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_set_params - set stream parameters</div><div class='add'>+ * @azx_dev: HD-audio core stream for which parameters are to be set</div><div class='add'>+ * @format_val: format value parameter</div><div class='add'>+ *</div><div class='add'>+ * Setup the HD-audio core stream parameters from substream of the stream</div><div class='add'>+ * and passed format value</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,</div><div class='add'>+				 unsigned int format_val)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = azx_dev-&gt;substream;</div><div class='add'>+	struct snd_compr_stream *cstream = azx_dev-&gt;cstream;</div><div class='add'>+	unsigned int bufsize, period_bytes;</div><div class='add'>+	unsigned int no_period_wakeup;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (substream) {</div><div class='add'>+		bufsize = snd_pcm_lib_buffer_bytes(substream);</div><div class='add'>+		period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='add'>+		no_period_wakeup = substream-&gt;runtime-&gt;no_period_wakeup;</div><div class='add'>+	} else if (cstream) {</div><div class='add'>+		bufsize = cstream-&gt;runtime-&gt;buffer_size;</div><div class='add'>+		period_bytes = cstream-&gt;runtime-&gt;fragment_size;</div><div class='add'>+		no_period_wakeup = 0;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bufsize != azx_dev-&gt;bufsize ||</div><div class='add'>+	    period_bytes != azx_dev-&gt;period_bytes ||</div><div class='add'>+	    format_val != azx_dev-&gt;format_val ||</div><div class='add'>+	    no_period_wakeup != azx_dev-&gt;no_period_wakeup) {</div><div class='add'>+		azx_dev-&gt;bufsize = bufsize;</div><div class='add'>+		azx_dev-&gt;period_bytes = period_bytes;</div><div class='add'>+		azx_dev-&gt;format_val = format_val;</div><div class='add'>+		azx_dev-&gt;no_period_wakeup = no_period_wakeup;</div><div class='add'>+		err = snd_hdac_stream_setup_periods(azx_dev);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_set_params);</div><div class='add'>+</div><div class='add'>+static u64 azx_cc_read(struct cyclecounter *cc)</div><div class='add'>+{</div><div class='add'>+	struct hdac_stream *azx_dev = container_of(cc, struct hdac_stream, cc);</div><div class='add'>+</div><div class='add'>+	return snd_hdac_chip_readl(azx_dev-&gt;bus, WALLCLK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void azx_timecounter_init(struct hdac_stream *azx_dev,</div><div class='add'>+				 bool force, u64 last)</div><div class='add'>+{</div><div class='add'>+	struct timecounter *tc = &amp;azx_dev-&gt;tc;</div><div class='add'>+	struct cyclecounter *cc = &amp;azx_dev-&gt;cc;</div><div class='add'>+	u64 nsec;</div><div class='add'>+</div><div class='add'>+	cc-&gt;read = azx_cc_read;</div><div class='add'>+	cc-&gt;mask = CLOCKSOURCE_MASK(32);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Calculate the optimal mult/shift values. The counter wraps</div><div class='add'>+	 * around after ~178.9 seconds.</div><div class='add'>+	 */</div><div class='add'>+	clocks_calc_mult_shift(&amp;cc-&gt;mult, &amp;cc-&gt;shift, 24000000,</div><div class='add'>+			       NSEC_PER_SEC, 178);</div><div class='add'>+</div><div class='add'>+	nsec = 0; /* audio time is elapsed time since trigger */</div><div class='add'>+	timecounter_init(tc, cc, nsec);</div><div class='add'>+	if (force) {</div><div class='add'>+		/*</div><div class='add'>+		 * force timecounter to use predefined value,</div><div class='add'>+		 * used for synchronized starts</div><div class='add'>+		 */</div><div class='add'>+		tc-&gt;cycle_last = last;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_timecounter_init - initialize time counter</div><div class='add'>+ * @azx_dev: HD-audio core stream (master stream)</div><div class='add'>+ * @streams: bit flags of streams to set up</div><div class='add'>+ * @start: true for PCM trigger start, false for other cases</div><div class='add'>+ *</div><div class='add'>+ * Initializes the time counter of streams marked by the bit flags (each</div><div class='add'>+ * bit corresponds to the stream index).</div><div class='add'>+ * The trigger timestamp of PCM substream assigned to the given stream is</div><div class='add'>+ * updated accordingly, too.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,</div><div class='add'>+				      unsigned int streams, bool start)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	struct snd_pcm_runtime *runtime = azx_dev-&gt;substream-&gt;runtime;</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+	bool inited = false;</div><div class='add'>+	u64 cycle_last = 0;</div><div class='add'>+</div><div class='add'>+	if (!start)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+		if ((streams &amp; (1 &lt;&lt; s-&gt;index))) {</div><div class='add'>+			azx_timecounter_init(s, inited, cycle_last);</div><div class='add'>+			if (!inited) {</div><div class='add'>+				inited = true;</div><div class='add'>+				cycle_last = s-&gt;tc.cycle_last;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+	snd_pcm_gettime(runtime, &amp;runtime-&gt;trigger_tstamp);</div><div class='add'>+	runtime-&gt;trigger_tstamp_latched = true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_timecounter_init);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_sync_trigger - turn on/off stream sync register</div><div class='add'>+ * @azx_dev: HD-audio core stream (master stream)</div><div class='add'>+ * @set: true = set, false = clear</div><div class='add'>+ * @streams: bit flags of streams to sync</div><div class='add'>+ * @reg: the stream sync register address</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,</div><div class='add'>+				  unsigned int streams, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (!reg)</div><div class='add'>+		reg = AZX_REG_SSYNC;</div><div class='add'>+	val = _snd_hdac_chip_readl(bus, reg);</div><div class='add'>+	if (set)</div><div class='add'>+		val |= streams;</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~streams;</div><div class='add'>+	_snd_hdac_chip_writel(bus, reg, val);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_sync_trigger);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_sync - sync with start/stop trigger operation</div><div class='add'>+ * @azx_dev: HD-audio core stream (master stream)</div><div class='add'>+ * @start: true = start, false = stop</div><div class='add'>+ * @streams: bit flags of streams to sync</div><div class='add'>+ *</div><div class='add'>+ * For @start = true, wait until all FIFOs get ready.</div><div class='add'>+ * For @start = false, wait until all RUN bits are cleared.</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start,</div><div class='add'>+			  unsigned int streams)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	int nwait, timeout;</div><div class='add'>+	struct hdac_stream *s;</div><div class='add'>+</div><div class='add'>+	for (timeout = 5000; timeout; timeout--) {</div><div class='add'>+		nwait = 0;</div><div class='add'>+		list_for_each_entry(s, &amp;bus-&gt;stream_list, list) {</div><div class='add'>+			if (!(streams &amp; (1 &lt;&lt; s-&gt;index)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (start) {</div><div class='add'>+				/* check FIFO gets ready */</div><div class='add'>+				if (!(snd_hdac_stream_readb(s, SD_STS) &amp;</div><div class='add'>+				      SD_STS_FIFO_READY))</div><div class='add'>+					nwait++;</div><div class='add'>+			} else {</div><div class='add'>+				/* check RUN bit is cleared */</div><div class='add'>+				if (snd_hdac_stream_readb(s, SD_CTL) &amp;</div><div class='add'>+				    SD_CTL_DMA_START) {</div><div class='add'>+					nwait++;</div><div class='add'>+					/*</div><div class='add'>+					 * Perform stream reset if DMA RUN</div><div class='add'>+					 * bit not cleared within given timeout</div><div class='add'>+					 */</div><div class='add'>+					if (timeout == 1)</div><div class='add'>+						snd_hdac_stream_reset(s);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!nwait)</div><div class='add'>+			break;</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_sync);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_spbcap_enable - enable SPIB for a stream</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @enable: flag to enable/disable SPIB</div><div class='add'>+ * @index: stream index for which SPIB need to be enabled</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_spbcap_enable(struct hdac_bus *bus,</div><div class='add'>+				   bool enable, int index)</div><div class='add'>+{</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;spbcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of SPB capability is NULL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask |= (1 &lt;&lt; index);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;spbcap, AZX_REG_SPB_SPBFCCTL, mask, mask);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_updatel(bus-&gt;spbcap, AZX_REG_SPB_SPBFCCTL, mask, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_spbcap_enable);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_set_spib - sets the spib value of a stream</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @azx_dev: hdac_stream</div><div class='add'>+ * @value: spib value to set</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_set_spib(struct hdac_bus *bus,</div><div class='add'>+			     struct hdac_stream *azx_dev, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;spbcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of SPB capability is NULL\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(value, azx_dev-&gt;spib_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_set_spib);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_drsm_enable - enable DMA resume for a stream</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @enable: flag to enable/disable DRSM</div><div class='add'>+ * @index: stream index for which DRSM need to be enabled</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_stream_drsm_enable(struct hdac_bus *bus,</div><div class='add'>+				 bool enable, int index)</div><div class='add'>+{</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+</div><div class='add'>+	if (!bus-&gt;drsmcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of DRSM capability is NULL\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask |= (1 &lt;&lt; index);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		snd_hdac_updatel(bus-&gt;drsmcap, AZX_REG_DRSM_CTL, mask, mask);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_updatel(bus-&gt;drsmcap, AZX_REG_DRSM_CTL, mask, 0);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_drsm_enable);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * snd_hdac_stream_wait_drsm - wait for HW to clear RSM for a stream</div><div class='add'>+ * @azx_dev: HD-audio core stream to await RSM for</div><div class='add'>+ *</div><div class='add'>+ * Returns 0 on success and -ETIMEDOUT upon a timeout.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_wait_drsm(struct hdac_stream *azx_dev)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	u32 mask, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mask = 1 &lt;&lt; azx_dev-&gt;index;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(snd_hdac_reg_readl, reg, !(reg &amp; mask), 250, 2000, false, bus,</div><div class='add'>+				bus-&gt;drsmcap + AZX_REG_DRSM_CTL);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_dbg(bus-&gt;dev, "polling RSM 0x%08x failed: %d\n", mask, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_wait_drsm);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_set_dpibr - sets the dpibr value of a stream</div><div class='add'>+ * @bus: HD-audio core bus</div><div class='add'>+ * @azx_dev: hdac_stream</div><div class='add'>+ * @value: dpib value to set</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_set_dpibr(struct hdac_bus *bus,</div><div class='add'>+			      struct hdac_stream *azx_dev, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (!bus-&gt;drsmcap) {</div><div class='add'>+		dev_err(bus-&gt;dev, "Address of DRSM capability is NULL\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(value, azx_dev-&gt;dpibr_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_set_dpibr);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_stream_set_lpib - sets the lpib value of a stream</div><div class='add'>+ * @azx_dev: hdac_stream</div><div class='add'>+ * @value: lpib value to set</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_stream_set_lpib(struct hdac_stream *azx_dev, u32 value)</div><div class='add'>+{</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_LPIB, value);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_stream_set_lpib);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_HDA_DSP_LOADER</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_dsp_prepare - prepare for DSP loading</div><div class='add'>+ * @azx_dev: HD-audio core stream used for DSP loading</div><div class='add'>+ * @format: HD-audio stream format</div><div class='add'>+ * @byte_size: data chunk byte size</div><div class='add'>+ * @bufp: allocated buffer</div><div class='add'>+ *</div><div class='add'>+ * Allocate the buffer for the given size and set up the given stream for</div><div class='add'>+ * DSP loading.  Returns the stream tag (&gt;= 0), or a negative error code.</div><div class='add'>+ */</div><div class='add'>+int snd_hdac_dsp_prepare(struct hdac_stream *azx_dev, unsigned int format,</div><div class='add'>+			 unsigned int byte_size, struct snd_dma_buffer *bufp)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(snd_hdac_dsp_lock)(azx_dev);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+		if (azx_dev-&gt;running || azx_dev-&gt;locked)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		azx_dev-&gt;locked = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_SG, bus-&gt;dev,</div><div class='add'>+				  byte_size, bufp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_alloc;</div><div class='add'>+</div><div class='add'>+	azx_dev-&gt;substream = NULL;</div><div class='add'>+	azx_dev-&gt;bufsize = byte_size;</div><div class='add'>+	/* It is recommended to transfer the firmware in two or more chunks. */</div><div class='add'>+	azx_dev-&gt;period_bytes = byte_size / 2;</div><div class='add'>+	azx_dev-&gt;format_val = format;</div><div class='add'>+	azx_dev-&gt;no_period_wakeup = 1;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_reset(azx_dev);</div><div class='add'>+</div><div class='add'>+	err = snd_hdac_stream_setup_bdle(azx_dev, bufp, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	snd_hdac_stream_setup(azx_dev, true);</div><div class='add'>+	return azx_dev-&gt;stream_tag;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_dma_free_pages(bufp);</div><div class='add'>+ err_alloc:</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;bus-&gt;reg_lock) {</div><div class='add'>+		azx_dev-&gt;locked = false;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_dsp_prepare);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_dsp_trigger - start / stop DSP loading</div><div class='add'>+ * @azx_dev: HD-audio core stream used for DSP loading</div><div class='add'>+ * @start: trigger start or stop</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_dsp_trigger(struct hdac_stream *azx_dev, bool start)</div><div class='add'>+{</div><div class='add'>+	if (start)</div><div class='add'>+		snd_hdac_stream_start(azx_dev);</div><div class='add'>+	else</div><div class='add'>+		snd_hdac_stream_stop(azx_dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_dsp_trigger);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * snd_hdac_dsp_cleanup - clean up the stream from DSP loading to normal</div><div class='add'>+ * @azx_dev: HD-audio core stream used for DSP loading</div><div class='add'>+ * @dmab: buffer used by DSP loading</div><div class='add'>+ */</div><div class='add'>+void snd_hdac_dsp_cleanup(struct hdac_stream *azx_dev,</div><div class='add'>+			  struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	struct hdac_bus *bus = azx_dev-&gt;bus;</div><div class='add'>+</div><div class='add'>+	if (!dmab-&gt;area || !azx_dev-&gt;locked)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	guard(snd_hdac_dsp_lock)(azx_dev);</div><div class='add'>+	/* reset BDL address */</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_BDLPU, 0);</div><div class='add'>+	snd_hdac_stream_writel(azx_dev, SD_CTL, 0);</div><div class='add'>+	azx_dev-&gt;bufsize = 0;</div><div class='add'>+	azx_dev-&gt;period_bytes = 0;</div><div class='add'>+	azx_dev-&gt;format_val = 0;</div><div class='add'>+</div><div class='add'>+	snd_dma_free_pages(dmab);</div><div class='add'>+	dmab-&gt;area = NULL;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;bus-&gt;reg_lock);</div><div class='add'>+	azx_dev-&gt;locked = false;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(snd_hdac_dsp_cleanup);</div><div class='add'>+#endif /* CONFIG_SND_HDA_DSP_LOADER */</div><div class='head'>diff --git a/sound/hda/core/sysfs.c b/sound/hda/core/sysfs.c<br/>new file mode 100644<br/>index 000000000000..bffe52859dba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/sysfs.c</a></div><div class='hunk'>@@ -0,0 +1,469 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * sysfs support for HD-audio core device</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+#include "local.h"</div><div class='add'>+</div><div class='add'>+struct hdac_widget_tree {</div><div class='add'>+	struct kobject *root;</div><div class='add'>+	struct kobject *afg;</div><div class='add'>+	struct kobject **nodes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CODEC_ATTR(type)					\</div><div class='add'>+static ssize_t type##_show(struct device *dev,			\</div><div class='add'>+			   struct device_attribute *attr,	\</div><div class='add'>+			   char *buf)				\</div><div class='add'>+{								\</div><div class='add'>+	struct hdac_device *codec = dev_to_hdac_dev(dev);	\</div><div class='add'>+	return sysfs_emit(buf, "0x%x\n", codec-&gt;type);		\</div><div class='add'>+} \</div><div class='add'>+static DEVICE_ATTR_RO(type)</div><div class='add'>+</div><div class='add'>+#define CODEC_ATTR_STR(type)					\</div><div class='add'>+static ssize_t type##_show(struct device *dev,			\</div><div class='add'>+			     struct device_attribute *attr,	\</div><div class='add'>+					char *buf)		\</div><div class='add'>+{								\</div><div class='add'>+	struct hdac_device *codec = dev_to_hdac_dev(dev);	\</div><div class='add'>+	return sysfs_emit(buf, "%s\n",				\</div><div class='add'>+			  codec-&gt;type ? codec-&gt;type : "");	\</div><div class='add'>+} \</div><div class='add'>+static DEVICE_ATTR_RO(type)</div><div class='add'>+</div><div class='add'>+CODEC_ATTR(type);</div><div class='add'>+CODEC_ATTR(vendor_id);</div><div class='add'>+CODEC_ATTR(subsystem_id);</div><div class='add'>+CODEC_ATTR(revision_id);</div><div class='add'>+CODEC_ATTR(afg);</div><div class='add'>+CODEC_ATTR(mfg);</div><div class='add'>+CODEC_ATTR_STR(vendor_name);</div><div class='add'>+CODEC_ATTR_STR(chip_name);</div><div class='add'>+</div><div class='add'>+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,</div><div class='add'>+			     char *buf)</div><div class='add'>+{</div><div class='add'>+	return snd_hdac_codec_modalias(dev_to_hdac_dev(dev), buf, 256);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(modalias);</div><div class='add'>+</div><div class='add'>+static struct attribute *hdac_dev_attrs[] = {</div><div class='add'>+	&amp;dev_attr_type.attr,</div><div class='add'>+	&amp;dev_attr_vendor_id.attr,</div><div class='add'>+	&amp;dev_attr_subsystem_id.attr,</div><div class='add'>+	&amp;dev_attr_revision_id.attr,</div><div class='add'>+	&amp;dev_attr_afg.attr,</div><div class='add'>+	&amp;dev_attr_mfg.attr,</div><div class='add'>+	&amp;dev_attr_vendor_name.attr,</div><div class='add'>+	&amp;dev_attr_chip_name.attr,</div><div class='add'>+	&amp;dev_attr_modalias.attr,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group hdac_dev_attr_group = {</div><div class='add'>+	.attrs	= hdac_dev_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct attribute_group *hdac_dev_attr_groups[] = {</div><div class='add'>+	&amp;hdac_dev_attr_group,</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Widget tree sysfs</div><div class='add'>+ *</div><div class='add'>+ * This is a tree showing the attributes of each widget.  It appears like</div><div class='add'>+ * /sys/bus/hdaudioC0D0/widgets/04/caps</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct widget_attribute;</div><div class='add'>+</div><div class='add'>+struct widget_attribute {</div><div class='add'>+	struct attribute	attr;</div><div class='add'>+	ssize_t (*show)(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			struct widget_attribute *attr, char *buf);</div><div class='add'>+	ssize_t (*store)(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			 struct widget_attribute *attr,</div><div class='add'>+			 const char *buf, size_t count);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int get_codec_nid(struct kobject *kobj, struct hdac_device **codecp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = kobj_to_dev(kobj-&gt;parent-&gt;parent);</div><div class='add'>+	int nid;</div><div class='add'>+	ssize_t ret;</div><div class='add'>+</div><div class='add'>+	ret = kstrtoint(kobj-&gt;name, 16, &amp;nid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	*codecp = dev_to_hdac_dev(dev);</div><div class='add'>+	return nid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t widget_attr_show(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				char *buf)</div><div class='add'>+{</div><div class='add'>+	struct widget_attribute *wid_attr =</div><div class='add'>+		container_of(attr, struct widget_attribute, attr);</div><div class='add'>+	struct hdac_device *codec;</div><div class='add'>+	int nid;</div><div class='add'>+</div><div class='add'>+	if (!wid_attr-&gt;show)</div><div class='add'>+		return -EIO;</div><div class='add'>+	nid = get_codec_nid(kobj, &amp;codec);</div><div class='add'>+	if (nid &lt; 0)</div><div class='add'>+		return nid;</div><div class='add'>+	return wid_attr-&gt;show(codec, nid, wid_attr, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t widget_attr_store(struct kobject *kobj, struct attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct widget_attribute *wid_attr =</div><div class='add'>+		container_of(attr, struct widget_attribute, attr);</div><div class='add'>+	struct hdac_device *codec;</div><div class='add'>+	int nid;</div><div class='add'>+</div><div class='add'>+	if (!wid_attr-&gt;store)</div><div class='add'>+		return -EIO;</div><div class='add'>+	nid = get_codec_nid(kobj, &amp;codec);</div><div class='add'>+	if (nid &lt; 0)</div><div class='add'>+		return nid;</div><div class='add'>+	return wid_attr-&gt;store(codec, nid, wid_attr, buf, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct sysfs_ops widget_sysfs_ops = {</div><div class='add'>+	.show	= widget_attr_show,</div><div class='add'>+	.store	= widget_attr_store,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void widget_release(struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	kfree(kobj);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct kobj_type widget_ktype = {</div><div class='add'>+	.release	= widget_release,</div><div class='add'>+	.sysfs_ops	= &amp;widget_sysfs_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WIDGET_ATTR_RO(_name) \</div><div class='add'>+	struct widget_attribute wid_attr_##_name = __ATTR_RO(_name)</div><div class='add'>+#define WIDGET_ATTR_RW(_name) \</div><div class='add'>+	struct widget_attribute wid_attr_##_name = __ATTR_RW(_name)</div><div class='add'>+</div><div class='add'>+static ssize_t caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n", snd_hdac_get_wcaps(codec, nid));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pin_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			     struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (snd_hdac_get_wcaps_type(snd_hdac_get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_PIN_CAP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pin_cfg_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			    struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (snd_hdac_get_wcaps_type(snd_hdac_get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='add'>+		return 0;</div><div class='add'>+	if (snd_hdac_read(codec, nid, AC_VERB_GET_CONFIG_DEFAULT, 0, &amp;val))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool has_pcm_cap(struct hdac_device *codec, hda_nid_t nid)</div><div class='add'>+{</div><div class='add'>+	if (nid == codec-&gt;afg || nid == codec-&gt;mfg)</div><div class='add'>+		return true;</div><div class='add'>+	switch (snd_hdac_get_wcaps_type(snd_hdac_get_wcaps(codec, nid))) {</div><div class='add'>+	case AC_WID_AUD_OUT:</div><div class='add'>+	case AC_WID_AUD_IN:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pcm_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			     struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!has_pcm_cap(codec, nid))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_PCM));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t pcm_formats_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!has_pcm_cap(codec, nid))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_STREAM));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t amp_in_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (nid != codec-&gt;afg &amp;&amp; !(snd_hdac_get_wcaps(codec, nid) &amp; AC_WCAP_IN_AMP))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_AMP_IN_CAP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t amp_out_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				 struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (nid != codec-&gt;afg &amp;&amp; !(snd_hdac_get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_AMP_OUT_CAP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t power_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			       struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	if (nid != codec-&gt;afg &amp;&amp; !(snd_hdac_get_wcaps(codec, nid) &amp; AC_WCAP_POWER))</div><div class='add'>+		return 0;</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_POWER_STATE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t gpio_caps_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+			      struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	return sysfs_emit(buf, "0x%08x\n",</div><div class='add'>+			  snd_hdac_read_parm(codec, nid, AC_PAR_GPIO_CAP));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t connections_show(struct hdac_device *codec, hda_nid_t nid,</div><div class='add'>+				struct widget_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	hda_nid_t list[32];</div><div class='add'>+	int i, nconns;</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+</div><div class='add'>+	nconns = snd_hdac_get_connections(codec, nid, list, ARRAY_SIZE(list));</div><div class='add'>+	if (nconns &lt;= 0)</div><div class='add'>+		return nconns;</div><div class='add'>+	for (i = 0; i &lt; nconns; i++)</div><div class='add'>+		ret += sysfs_emit_at(buf,  ret, "%s0x%02x", i ? " " : "", list[i]);</div><div class='add'>+	ret += sysfs_emit_at(buf, ret, "\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static WIDGET_ATTR_RO(caps);</div><div class='add'>+static WIDGET_ATTR_RO(pin_caps);</div><div class='add'>+static WIDGET_ATTR_RO(pin_cfg);</div><div class='add'>+static WIDGET_ATTR_RO(pcm_caps);</div><div class='add'>+static WIDGET_ATTR_RO(pcm_formats);</div><div class='add'>+static WIDGET_ATTR_RO(amp_in_caps);</div><div class='add'>+static WIDGET_ATTR_RO(amp_out_caps);</div><div class='add'>+static WIDGET_ATTR_RO(power_caps);</div><div class='add'>+static WIDGET_ATTR_RO(gpio_caps);</div><div class='add'>+static WIDGET_ATTR_RO(connections);</div><div class='add'>+</div><div class='add'>+static struct attribute *widget_node_attrs[] = {</div><div class='add'>+	&amp;wid_attr_caps.attr,</div><div class='add'>+	&amp;wid_attr_pin_caps.attr,</div><div class='add'>+	&amp;wid_attr_pin_cfg.attr,</div><div class='add'>+	&amp;wid_attr_pcm_caps.attr,</div><div class='add'>+	&amp;wid_attr_pcm_formats.attr,</div><div class='add'>+	&amp;wid_attr_amp_in_caps.attr,</div><div class='add'>+	&amp;wid_attr_amp_out_caps.attr,</div><div class='add'>+	&amp;wid_attr_power_caps.attr,</div><div class='add'>+	&amp;wid_attr_connections.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct attribute *widget_afg_attrs[] = {</div><div class='add'>+	&amp;wid_attr_pcm_caps.attr,</div><div class='add'>+	&amp;wid_attr_pcm_formats.attr,</div><div class='add'>+	&amp;wid_attr_amp_in_caps.attr,</div><div class='add'>+	&amp;wid_attr_amp_out_caps.attr,</div><div class='add'>+	&amp;wid_attr_power_caps.attr,</div><div class='add'>+	&amp;wid_attr_gpio_caps.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group widget_node_group = {</div><div class='add'>+	.attrs = widget_node_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group widget_afg_group = {</div><div class='add'>+	.attrs = widget_afg_attrs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void free_widget_node(struct kobject *kobj,</div><div class='add'>+			     const struct attribute_group *group)</div><div class='add'>+{</div><div class='add'>+	if (kobj) {</div><div class='add'>+		sysfs_remove_group(kobj, group);</div><div class='add'>+		kobject_put(kobj);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void widget_tree_free(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdac_widget_tree *tree = codec-&gt;widgets;</div><div class='add'>+	struct kobject **p;</div><div class='add'>+</div><div class='add'>+	if (!tree)</div><div class='add'>+		return;</div><div class='add'>+	free_widget_node(tree-&gt;afg, &amp;widget_afg_group);</div><div class='add'>+	if (tree-&gt;nodes) {</div><div class='add'>+		for (p = tree-&gt;nodes; *p; p++)</div><div class='add'>+			free_widget_node(*p, &amp;widget_node_group);</div><div class='add'>+		kfree(tree-&gt;nodes);</div><div class='add'>+	}</div><div class='add'>+	kobject_put(tree-&gt;root);</div><div class='add'>+	kfree(tree);</div><div class='add'>+	codec-&gt;widgets = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int add_widget_node(struct kobject *parent, hda_nid_t nid,</div><div class='add'>+			   const struct attribute_group *group,</div><div class='add'>+			   struct kobject **res)</div><div class='add'>+{</div><div class='add'>+	struct kobject *kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!kobj)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	kobject_init(kobj, &amp;widget_ktype);</div><div class='add'>+	err = kobject_add(kobj, parent, "%02x", nid);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kobject_put(kobj);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	err = sysfs_create_group(kobj, group);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kobject_put(kobj);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*res = kobj;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int widget_tree_create(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	struct hdac_widget_tree *tree;</div><div class='add'>+	int i, err;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+</div><div class='add'>+	tree = codec-&gt;widgets = kzalloc(sizeof(*tree), GFP_KERNEL);</div><div class='add'>+	if (!tree)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tree-&gt;root = kobject_create_and_add("widgets", &amp;codec-&gt;dev.kobj);</div><div class='add'>+	if (!tree-&gt;root)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tree-&gt;nodes = kcalloc(codec-&gt;num_nodes + 1, sizeof(*tree-&gt;nodes),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!tree-&gt;nodes)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0, nid = codec-&gt;start_nid; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='add'>+		err = add_widget_node(tree-&gt;root, nid, &amp;widget_node_group,</div><div class='add'>+				      &amp;tree-&gt;nodes[i]);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;afg) {</div><div class='add'>+		err = add_widget_node(tree-&gt;root, codec-&gt;afg,</div><div class='add'>+				      &amp;widget_afg_group, &amp;tree-&gt;afg);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kobject_uevent(tree-&gt;root, KOBJ_CHANGE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call with codec-&gt;widget_lock held */</div><div class='add'>+int hda_widget_sysfs_init(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (codec-&gt;widgets)</div><div class='add'>+		return 0; /* already created */</div><div class='add'>+</div><div class='add'>+	err = widget_tree_create(codec);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		widget_tree_free(codec);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call with codec-&gt;widget_lock held */</div><div class='add'>+void hda_widget_sysfs_exit(struct hdac_device *codec)</div><div class='add'>+{</div><div class='add'>+	widget_tree_free(codec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* call with codec-&gt;widget_lock held */</div><div class='add'>+int hda_widget_sysfs_reinit(struct hdac_device *codec,</div><div class='add'>+			    hda_nid_t start_nid, int num_nodes)</div><div class='add'>+{</div><div class='add'>+	struct hdac_widget_tree *tree;</div><div class='add'>+	hda_nid_t end_nid = start_nid + num_nodes;</div><div class='add'>+	hda_nid_t nid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!codec-&gt;widgets)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tree = kmemdup(codec-&gt;widgets, sizeof(*tree), GFP_KERNEL);</div><div class='add'>+	if (!tree)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tree-&gt;nodes = kcalloc(num_nodes + 1, sizeof(*tree-&gt;nodes), GFP_KERNEL);</div><div class='add'>+	if (!tree-&gt;nodes) {</div><div class='add'>+		kfree(tree);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* prune non-existing nodes */</div><div class='add'>+	for (i = 0, nid = codec-&gt;start_nid; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='add'>+		if (nid &lt; start_nid || nid &gt;= end_nid)</div><div class='add'>+			free_widget_node(codec-&gt;widgets-&gt;nodes[i],</div><div class='add'>+					 &amp;widget_node_group);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* add new nodes */</div><div class='add'>+	for (i = 0, nid = start_nid; i &lt; num_nodes; i++, nid++) {</div><div class='add'>+		if (nid &lt; codec-&gt;start_nid || nid &gt;= codec-&gt;end_nid)</div><div class='add'>+			add_widget_node(tree-&gt;root, nid, &amp;widget_node_group,</div><div class='add'>+					&amp;tree-&gt;nodes[i]);</div><div class='add'>+		else</div><div class='add'>+			tree-&gt;nodes[i] =</div><div class='add'>+				codec-&gt;widgets-&gt;nodes[nid - codec-&gt;start_nid];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* replace with the new tree */</div><div class='add'>+	kfree(codec-&gt;widgets-&gt;nodes);</div><div class='add'>+	kfree(codec-&gt;widgets);</div><div class='add'>+	codec-&gt;widgets = tree;</div><div class='add'>+</div><div class='add'>+	kobject_uevent(tree-&gt;root, KOBJ_CHANGE);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/hda/core/trace.c b/sound/hda/core/trace.c<br/>new file mode 100644<br/>index 000000000000..ca2d6bd94518<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/trace.c</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+/*</div><div class='add'>+ * tracepoint definitions for HD-audio core drivers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='head'>diff --git a/sound/hda/core/trace.h b/sound/hda/core/trace.h<br/>new file mode 100644<br/>index 000000000000..280c42f3eb75<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/hda/core/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/hda/core/trace.h</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM hda</div><div class='add'>+</div><div class='add'>+#if !defined(__HDAC_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define __HDAC_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;sound/hdaudio.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef HDAC_MSG_MAX</div><div class='add'>+#define HDAC_MSG_MAX	500</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct hdac_bus;</div><div class='add'>+struct hdac_codec;</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hda_send_cmd,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, unsigned int cmd),</div><div class='add'>+	TP_ARGS(bus, cmd),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(name, dev_name((bus)-&gt;dev))</div><div class='add'>+		__field(u32, cmd)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__entry-&gt;cmd = cmd;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry-&gt;cmd &gt;&gt; 28, __entry-&gt;cmd)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hda_get_response,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, unsigned int addr, unsigned int res),</div><div class='add'>+	TP_ARGS(bus, addr, res),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(name, dev_name((bus)-&gt;dev))</div><div class='add'>+		__field(u32, addr)</div><div class='add'>+		__field(u32, res)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__entry-&gt;addr = addr;</div><div class='add'>+		__entry-&gt;res = res;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("[%s:%d] val=0x%08x", __get_str(name), __entry-&gt;addr, __entry-&gt;res)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+TRACE_EVENT(hda_unsol_event,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, u32 res, u32 res_ex),</div><div class='add'>+	TP_ARGS(bus, res, res_ex),</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(name, dev_name((bus)-&gt;dev))</div><div class='add'>+		__field(u32, res)</div><div class='add'>+		__field(u32, res_ex)</div><div class='add'>+	),</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__entry-&gt;res = res;</div><div class='add'>+		__entry-&gt;res_ex = res_ex;</div><div class='add'>+	),</div><div class='add'>+	TP_printk("[%s:%d] res=0x%08x, res_ex=0x%08x", __get_str(name),</div><div class='add'>+		  __entry-&gt;res_ex &amp; 0x0f, __entry-&gt;res, __entry-&gt;res_ex)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(hdac_stream,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(bus, azx_dev),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__field(unsigned char, stream_tag)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__entry-&gt;stream_tag = (azx_dev)-&gt;stream_tag;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("stream_tag: %d", __entry-&gt;stream_tag)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hdac_stream, snd_hdac_stream_start,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),</div><div class='add'>+	TP_ARGS(bus, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(hdac_stream, snd_hdac_stream_stop,</div><div class='add'>+	TP_PROTO(struct hdac_bus *bus, struct hdac_stream *azx_dev),</div><div class='add'>+	TP_ARGS(bus, azx_dev)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#endif /* __HDAC_TRACE_H */</div><div class='add'>+</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE trace</div><div class='add'>+</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile<br/>index 36879bf88700..c827f9f70a33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/Makefile</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-i2c-objs := i2c.o</div><div class='del'>-snd-cs8427-objs := cs8427.o</div><div class='del'>-snd-tea6330t-objs := tea6330t.o</div><div class='add'>+snd-i2c-y := i2c.o</div><div class='add'>+snd-cs8427-y := cs8427.o</div><div class='add'>+snd-tea6330t-y := tea6330t.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND) += other/</div><div class='ctx'> </div><div class='head'>diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c<br/>index 04ae8704cdcd..46f081268348 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/cs8427.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/cs8427.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/cs8427.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/cs8427.c</a></div><div class='hunk'>@@ -1,30 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for control of the CS8427 via i2c bus</div><div class='ctx'>  *  IEC958 (S/PDIF) receiver &amp; transmitter by Cirrus Logic</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -64,9 +50,11 @@ int snd_cs8427_reg_write(struct snd_i2c_device *device, unsigned char reg,</div><div class='ctx'> </div><div class='ctx'> 	buf[0] = reg &amp; 0x7f;</div><div class='ctx'> 	buf[1] = val;</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to send bytes 0x%02x:0x%02x "</div><div class='del'>-			   "to CS8427 (%i)\n", buf[0], buf[1], err);</div><div class='add'>+	err = snd_i2c_sendbytes(device, buf, 2);</div><div class='add'>+	if (err != 2) {</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n",</div><div class='add'>+			buf[0], buf[1], err);</div><div class='ctx'> 		return err &lt; 0 ? err : -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -79,14 +67,16 @@ static int snd_cs8427_reg_read(struct snd_i2c_device *device, unsigned char reg)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned char buf;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, &amp;reg, 1)) != 1) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to send register 0x%x byte "</div><div class='del'>-			   "to CS8427\n", reg);</div><div class='add'>+	err = snd_i2c_sendbytes(device, &amp;reg, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to send register 0x%x byte to CS8427\n", reg);</div><div class='ctx'> 		return err &lt; 0 ? err : -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_i2c_readbytes(device, &amp;buf, 1)) != 1) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to read register 0x%x byte "</div><div class='del'>-			   "from CS8427\n", reg);</div><div class='add'>+	err = snd_i2c_readbytes(device, &amp;buf, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to read register 0x%x byte from CS8427\n", reg);</div><div class='ctx'> 		return err &lt; 0 ? err : -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return buf;</div><div class='hunk'>@@ -117,12 +107,13 @@ static int snd_cs8427_send_corudata(struct snd_i2c_device *device,</div><div class='ctx'> 	struct cs8427 *chip = device-&gt;private_data;</div><div class='ctx'> 	char *hw_data = udata ?</div><div class='ctx'> 		chip-&gt;playback.hw_udata : chip-&gt;playback.hw_status;</div><div class='del'>-	char data[32];</div><div class='add'>+	unsigned char data[32];</div><div class='ctx'> 	int err, idx;</div><div class='ctx'> </div><div class='ctx'> 	if (!memcmp(hw_data, ndata, count))</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((err = snd_cs8427_select_corudata(device, udata)) &lt; 0)</div><div class='add'>+	err = snd_cs8427_select_corudata(device, udata);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	memcpy(hw_data, ndata, count);</div><div class='ctx'> 	if (udata) {</div><div class='hunk'>@@ -149,10 +140,8 @@ static void snd_cs8427_free(struct snd_i2c_device *device)</div><div class='ctx'> 	kfree(device-&gt;private_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='del'>-		      unsigned char addr,</div><div class='del'>-		      unsigned int reset_timeout,</div><div class='del'>-		      struct snd_i2c_device **r_cs8427)</div><div class='add'>+int snd_cs8427_init(struct snd_i2c_bus *bus,</div><div class='add'>+		    struct snd_i2c_device *device)</div><div class='ctx'> {</div><div class='ctx'> 	static unsigned char initvals1[] = {</div><div class='ctx'> 	  CS8427_REG_CONTROL1 | CS8427_REG_AUTOINC,</div><div class='hunk'>@@ -199,36 +188,26 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 	     Inhibit E-&gt;F transfers. */</div><div class='ctx'> 	  CS8427_UD | CS8427_EFTUI | CS8427_DETUI,</div><div class='ctx'> 	};</div><div class='add'>+	struct cs8427 *chip = device-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct cs8427 *chip;</div><div class='del'>-	struct snd_i2c_device *device;</div><div class='ctx'> 	unsigned char buf[24];</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_i2c_device_create(bus, "CS8427",</div><div class='del'>-					 CS8427_ADDR | (addr &amp; 7),</div><div class='del'>-					 &amp;device)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	chip = device-&gt;private_data = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-	      	snd_i2c_device_free(device);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	device-&gt;private_free = snd_cs8427_free;</div><div class='del'>-	</div><div class='ctx'> 	snd_i2c_lock(bus);</div><div class='ctx'> 	err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);</div><div class='ctx'> 	if (err != CS8427_VER8427A) {</div><div class='ctx'> 		/* give second chance */</div><div class='del'>-		snd_printk(KERN_WARNING "invalid CS8427 signature 0x%x: "</div><div class='del'>-			   "let me try again...\n", err);</div><div class='add'>+		dev_warn(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			 "invalid CS8427 signature 0x%x: let me try again...\n",</div><div class='add'>+			 err);</div><div class='ctx'> 		err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err != CS8427_VER8427A) {</div><div class='ctx'> 		snd_i2c_unlock(bus);</div><div class='del'>-		snd_printk(KERN_ERR "unable to find CS8427 signature "</div><div class='del'>-			   "(expected 0x%x, read 0x%x),\n",</div><div class='del'>-			   CS8427_VER8427A, err);</div><div class='del'>-		snd_printk(KERN_ERR "   initialization is not completed\n");</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to find CS8427 signature (expected 0x%x, read 0x%x),\n",</div><div class='add'>+			CS8427_VER8427A, err);</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"   initialization is not completed\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* turn off run bit while making changes to configuration */</div><div class='hunk'>@@ -237,7 +216,8 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> 	/* send initial values */</div><div class='ctx'> 	memcpy(chip-&gt;regmap + (initvals1[0] &amp; 0x7f), initvals1 + 1, 6);</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, initvals1, 7)) != 7) {</div><div class='add'>+	err = snd_i2c_sendbytes(device, initvals1, 7);</div><div class='add'>+	if (err != 7) {</div><div class='ctx'> 		err = err &lt; 0 ? err : -EIO;</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -245,11 +225,13 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 	memset(buf, 0, 7);</div><div class='ctx'> 	/* from address 9 to 15 */</div><div class='ctx'> 	buf[0] = 9;	/* register */</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, buf, 7)) != 7)</div><div class='add'>+	err = snd_i2c_sendbytes(device, buf, 7);</div><div class='add'>+	if (err != 7)</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> 	/* send transfer initialization sequence */</div><div class='ctx'> 	memcpy(chip-&gt;regmap + (initvals2[0] &amp; 0x7f), initvals2 + 1, 3);</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, initvals2, 4)) != 4) {</div><div class='add'>+	err = snd_i2c_sendbytes(device, initvals2, 4);</div><div class='add'>+	if (err != 4) {</div><div class='ctx'> 		err = err &lt; 0 ? err : -EIO;</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -263,10 +245,44 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 	snd_i2c_unlock(bus);</div><div class='ctx'> </div><div class='ctx'> 	/* turn on run bit and rock'n'roll */</div><div class='add'>+	snd_cs8427_reset(device);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+__fail:</div><div class='add'>+	snd_i2c_unlock(bus);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_cs8427_init);</div><div class='add'>+</div><div class='add'>+int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='add'>+		      unsigned char addr,</div><div class='add'>+		      unsigned int reset_timeout,</div><div class='add'>+		      struct snd_i2c_device **r_cs8427)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct cs8427 *chip;</div><div class='add'>+	struct snd_i2c_device *device;</div><div class='add'>+</div><div class='add'>+	err = snd_i2c_device_create(bus, "CS8427", CS8427_ADDR | (addr &amp; 7),</div><div class='add'>+				    &amp;device);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	chip = device-&gt;private_data = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+	if (chip == NULL) {</div><div class='add'>+		snd_i2c_device_free(device);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	device-&gt;private_free = snd_cs8427_free;</div><div class='add'>+</div><div class='ctx'> 	if (reset_timeout &lt; 1)</div><div class='ctx'> 		reset_timeout = 1;</div><div class='ctx'> 	chip-&gt;reset_timeout = reset_timeout;</div><div class='del'>-	snd_cs8427_reset(device);</div><div class='add'>+</div><div class='add'>+	err = snd_cs8427_init(bus, device);</div><div class='add'>+	if (err)</div><div class='add'>+		goto __fail;</div><div class='ctx'> </div><div class='ctx'> #if 0	// it's nice for read tests</div><div class='ctx'> 	{</div><div class='hunk'>@@ -276,7 +292,7 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 	snd_i2c_sendbytes(device, buf, 1);</div><div class='ctx'> 	snd_i2c_readbytes(device, buf, 127);</div><div class='ctx'> 	for (xx = 0; xx &lt; 127; xx++)</div><div class='del'>-		printk(KERN_DEBUG "reg[0x%x] = 0x%x\n", xx+1, buf[xx]);</div><div class='add'>+		dev_dbg(device-&gt;bus-&gt;card-&gt;dev, "reg[0x%x] = 0x%x\n", xx+1, buf[xx]);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	</div><div class='hunk'>@@ -285,7 +301,6 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>       __fail:</div><div class='del'>-      	snd_i2c_unlock(bus);</div><div class='ctx'>       	snd_i2c_device_free(device);</div><div class='ctx'>       	return err &lt; 0 ? err : -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -378,16 +393,17 @@ static int snd_cs8427_qsubcode_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	snd_i2c_lock(device-&gt;bus);</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, &amp;reg, 1)) != 1) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to send register 0x%x byte "</div><div class='del'>-			   "to CS8427\n", reg);</div><div class='add'>+	err = snd_i2c_sendbytes(device, &amp;reg, 1);</div><div class='add'>+	if (err != 1) {</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to send register 0x%x byte to CS8427\n", reg);</div><div class='ctx'> 		snd_i2c_unlock(device-&gt;bus);</div><div class='ctx'> 		return err &lt; 0 ? err : -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_i2c_readbytes(device, ucontrol-&gt;value.bytes.data, 10);</div><div class='ctx'> 	if (err != 10) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to read Q-subcode bytes "</div><div class='del'>-			   "from CS8427\n");</div><div class='add'>+		dev_err(device-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"unable to read Q-subcode bytes from CS8427\n");</div><div class='ctx'> 		snd_i2c_unlock(device-&gt;bus);</div><div class='ctx'> 		return err &lt; 0 ? err : -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -454,7 +470,7 @@ static int snd_cs8427_spdif_mask_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs8427_iec958_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs8427_iec958_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.info =		snd_cs8427_in_status_info,</div><div class='hunk'>@@ -548,10 +564,13 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active)</div><div class='ctx'> 	if (snd_BUG_ON(!cs8427))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	chip = cs8427-&gt;private_data;</div><div class='del'>-	if (active)</div><div class='add'>+	if (active) {</div><div class='ctx'> 		memcpy(chip-&gt;playback.pcm_status,</div><div class='ctx'> 		       chip-&gt;playback.def_status, 24);</div><div class='del'>-	chip-&gt;playback.pcm_ctl-&gt;vd[0].access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+		chip-&gt;playback.pcm_ctl-&gt;vd[0].access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	} else {</div><div class='add'>+		chip-&gt;playback.pcm_ctl-&gt;vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	}</div><div class='ctx'> 	snd_ctl_notify(cs8427-&gt;bus-&gt;card,</div><div class='ctx'> 		       SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,</div><div class='ctx'> 		       &amp;chip-&gt;playback.pcm_ctl-&gt;id);</div><div class='hunk'>@@ -601,15 +620,3 @@ int snd_cs8427_iec958_pcm(struct snd_i2c_device *cs8427, unsigned int rate)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_cs8427_iec958_pcm);</div><div class='del'>-</div><div class='del'>-static int __init alsa_cs8427_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_cs8427_module_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_cs8427_module_init)</div><div class='del'>-module_exit(alsa_cs8427_module_exit)</div><div class='head'>diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c<br/>index eb7c7d05a7c1..847e3b6ca601 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/i2c.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/i2c.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/i2c.c</a></div><div class='hunk'>@@ -1,27 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Generic i2c interface for ALSA</div><div class='ctx'>  *</div><div class='ctx'>  *   (c) 1998 Gerd Knorr &lt;kraxel@cs.tu-berlin.de&gt;</div><div class='ctx'>  *   Modified for the ALSA driver by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -38,7 +25,7 @@ static int snd_i2c_bit_readbytes(struct snd_i2c_device *device,</div><div class='ctx'> static int snd_i2c_bit_probeaddr(struct snd_i2c_bus *bus,</div><div class='ctx'> 				 unsigned short addr);</div><div class='ctx'> </div><div class='del'>-static struct snd_i2c_ops snd_i2c_bit_ops = {</div><div class='add'>+static const struct snd_i2c_ops snd_i2c_bit_ops = {</div><div class='ctx'> 	.sendbytes = snd_i2c_bit_sendbytes,</div><div class='ctx'> 	.readbytes = snd_i2c_bit_readbytes,</div><div class='ctx'> 	.probeaddr = snd_i2c_bit_probeaddr,</div><div class='hunk'>@@ -80,7 +67,7 @@ int snd_i2c_bus_create(struct snd_card *card, const char *name,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_i2c_bus *bus;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =	snd_i2c_bus_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +84,7 @@ int snd_i2c_bus_create(struct snd_card *card, const char *name,</div><div class='ctx'> 		list_add_tail(&amp;bus-&gt;buses, &amp;master-&gt;buses);</div><div class='ctx'> 		bus-&gt;master = master;</div><div class='ctx'> 	}</div><div class='del'>-	strlcpy(bus-&gt;name, name, sizeof(bus-&gt;name));</div><div class='add'>+	strscpy(bus-&gt;name, name, sizeof(bus-&gt;name));</div><div class='ctx'> 	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &amp;ops);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		snd_i2c_bus_free(bus);</div><div class='hunk'>@@ -121,7 +108,7 @@ int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,</div><div class='ctx'> 	if (device == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	device-&gt;addr = addr;</div><div class='del'>-	strlcpy(device-&gt;name, name, sizeof(device-&gt;name));</div><div class='add'>+	strscpy(device-&gt;name, name, sizeof(device-&gt;name));</div><div class='ctx'> 	list_add_tail(&amp;device-&gt;list, &amp;bus-&gt;devices);</div><div class='ctx'> 	device-&gt;bus = bus;</div><div class='ctx'> 	*rdevice = device;</div><div class='hunk'>@@ -337,16 +324,3 @@ static int snd_i2c_bit_probeaddr(struct snd_i2c_bus *bus, unsigned short addr)</div><div class='ctx'> 	snd_i2c_bit_stop(bus);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init alsa_i2c_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_i2c_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_i2c_init)</div><div class='del'>-module_exit(alsa_i2c_exit)</div><div class='head'>diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile<br/>index 2dad40f3f622..0a2c0d147ab8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/Makefile</a></div><div class='hunk'>@@ -1,17 +1,16 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2003 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ak4114-objs := ak4114.o</div><div class='del'>-snd-ak4117-objs := ak4117.o</div><div class='del'>-snd-ak4113-objs := ak4113.o</div><div class='del'>-snd-ak4xxx-adda-objs := ak4xxx-adda.o</div><div class='del'>-snd-pt2258-objs := pt2258.o</div><div class='del'>-snd-tea575x-tuner-objs := tea575x-tuner.o</div><div class='add'>+snd-ak4114-y := ak4114.o</div><div class='add'>+snd-ak4117-y := ak4117.o</div><div class='add'>+snd-ak4113-y := ak4113.o</div><div class='add'>+snd-ak4xxx-adda-y := ak4xxx-adda.o</div><div class='add'>+snd-pt2258-y := pt2258.o</div><div class='ctx'> </div><div class='ctx'> # Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_PDAUDIOCF) += snd-ak4117.o</div><div class='ctx'> obj-$(CONFIG_SND_ICE1712) += snd-ak4xxx-adda.o</div><div class='ctx'> obj-$(CONFIG_SND_ICE1724) += snd-ak4114.o snd-ak4113.o snd-ak4xxx-adda.o snd-pt2258.o</div><div class='del'>-obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o</div><div class='head'>diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c<br/>index 971a84a4fa77..70b3f7e17f9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4113.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4113.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4113.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/ak4113.c</a></div><div class='hunk'>@@ -1,28 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for control of the AK4113 via I2C/4-wire serial interface</div><div class='ctx'>  *  IEC958 (S/PDIF) receiver by Asahi Kasei</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Copyright (c) by Pavel Hofman &lt;pavel.hofman@ivitera.com&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -55,10 +41,8 @@ static inline unsigned char reg_read(struct ak4113 *ak4113, unsigned char reg)</div><div class='ctx'> </div><div class='ctx'> static void snd_ak4113_free(struct ak4113 *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;init = 1;	/* don't schedule new work */</div><div class='del'>-	mb();</div><div class='del'>-	cancel_delayed_work(&amp;chip-&gt;work);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	atomic_inc(&amp;chip-&gt;wq_processing);	/* don't schedule new work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -74,9 +58,9 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,</div><div class='ctx'> 		void *private_data, struct ak4113 **r_ak4113)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4113 *chip;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> 	unsigned char reg;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =     snd_ak4113_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -89,6 +73,8 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,</div><div class='ctx'> 	chip-&gt;write = write;</div><div class='ctx'> 	chip-&gt;private_data = private_data;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;chip-&gt;work, ak4113_stats);</div><div class='add'>+	atomic_set(&amp;chip-&gt;wq_processing, 0);</div><div class='add'>+	mutex_init(&amp;chip-&gt;reinit_mutex);</div><div class='ctx'> </div><div class='ctx'> 	for (reg = 0; reg &lt; AK4113_WRITABLE_REGS ; reg++)</div><div class='ctx'> 		chip-&gt;regmap[reg] = pgm[reg];</div><div class='hunk'>@@ -98,7 +84,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,</div><div class='ctx'> 			AK4113_CINT | AK4113_STC);</div><div class='ctx'> 	chip-&gt;rcs1 = reg_read(chip, AK4113_REG_RCS1);</div><div class='ctx'> 	chip-&gt;rcs2 = reg_read(chip, AK4113_REG_RCS2);</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, chip, &amp;ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> </div><div class='hunk'>@@ -108,7 +94,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,</div><div class='ctx'> </div><div class='ctx'> __fail:</div><div class='ctx'> 	snd_ak4113_free(chip);</div><div class='del'>-	return err &lt; 0 ? err : -EIO;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(snd_ak4113_create);</div><div class='ctx'> </div><div class='hunk'>@@ -139,13 +125,13 @@ static void ak4113_init_regs(struct ak4113 *chip)</div><div class='ctx'> </div><div class='ctx'> void snd_ak4113_reinit(struct ak4113 *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;init = 1;</div><div class='del'>-	mb();</div><div class='del'>-	flush_scheduled_work();</div><div class='del'>-	ak4113_init_regs(chip);</div><div class='add'>+	if (atomic_inc_return(&amp;chip-&gt;wq_processing) == 1)</div><div class='add'>+		cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;reinit_mutex) {</div><div class='add'>+		ak4113_init_regs(chip);</div><div class='add'>+	}</div><div class='ctx'> 	/* bring up statistics / event queing */</div><div class='del'>-	chip-&gt;init = 0;</div><div class='del'>-	if (chip-&gt;kctls[0])</div><div class='add'>+	if (atomic_dec_and_test(&amp;chip-&gt;wq_processing))</div><div class='ctx'> 		schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(snd_ak4113_reinit);</div><div class='hunk'>@@ -198,13 +184,11 @@ static int snd_ak4113_in_error_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				   struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4113 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	ptr = (long *)(((char *)chip) + kcontrol-&gt;private_value);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = *ptr;</div><div class='del'>-	*ptr = 0;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] =</div><div class='add'>+		chip-&gt;errors[kcontrol-&gt;private_value];</div><div class='add'>+	chip-&gt;errors[kcontrol-&gt;private_value] = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -250,14 +234,13 @@ static int snd_ak4113_rx_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change;</div><div class='ctx'> 	u8 old_val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	old_val = chip-&gt;regmap[AK4113_REG_IO1];</div><div class='ctx'> 	change = ucontrol-&gt;value.integer.value[0] != AK4113_IPS(old_val);</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		reg_write(chip, AK4113_REG_IO1,</div><div class='ctx'> 				(old_val &amp; (~AK4113_IPS(0xff))) |</div><div class='ctx'> 				(AK4113_IPS(ucontrol-&gt;value.integer.value[0])));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -364,7 +347,7 @@ static int snd_ak4113_spdif_qget(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Don't forget to change AK4113_CONTROLS define!!! */</div><div class='del'>-static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		"IEC958 Parity Errors",</div><div class='hunk'>@@ -372,7 +355,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> 		SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4113_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4113_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4113, parity_errors),</div><div class='add'>+	.private_value = AK4113_PARITY_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -381,7 +364,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> 		SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4113_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4113_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4113, v_bit_errors),</div><div class='add'>+	.private_value = AK4113_V_BIT_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -390,7 +373,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> 		SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4113_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4113_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4113, ccrc_errors),</div><div class='add'>+	.private_value = AK4113_CCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -399,7 +382,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> 		SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4113_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4113_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4113, qcrc_errors),</div><div class='add'>+	.private_value = AK4113_QCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -426,7 +409,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = {</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='del'>-	.name =		"IEC958 Preample Capture Default",</div><div class='add'>+	.name =		"IEC958 Preamble Capture Default",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ |</div><div class='ctx'> 		SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4113_spdif_pinfo,</div><div class='hunk'>@@ -492,9 +475,8 @@ static void snd_ak4113_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static void snd_ak4113_proc_init(struct ak4113 *ak4113)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(ak4113-&gt;card, "ak4113", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ak4113, snd_ak4113_proc_regs_read);</div><div class='add'>+	snd_card_ro_proc_new(ak4113-&gt;card, "ak4113", ak4113,</div><div class='add'>+			     snd_ak4113_proc_regs_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_ak4113_build(struct ak4113 *ak4113,</div><div class='hunk'>@@ -548,27 +530,27 @@ int snd_ak4113_check_rate_and_errors(struct ak4113 *ak4113, unsigned int flags)</div><div class='ctx'> 		goto __rate;</div><div class='ctx'> 	rcs0 = reg_read(ak4113, AK4113_REG_RCS0);</div><div class='ctx'> 	rcs2 = reg_read(ak4113, AK4113_REG_RCS2);</div><div class='del'>-	spin_lock_irqsave(&amp;ak4113-&gt;lock, _flags);</div><div class='del'>-	if (rcs0 &amp; AK4113_PAR)</div><div class='del'>-		ak4113-&gt;parity_errors++;</div><div class='del'>-	if (rcs0 &amp; AK4113_V)</div><div class='del'>-		ak4113-&gt;v_bit_errors++;</div><div class='del'>-	if (rcs2 &amp; AK4113_CCRC)</div><div class='del'>-		ak4113-&gt;ccrc_errors++;</div><div class='del'>-	if (rcs2 &amp; AK4113_QCRC)</div><div class='del'>-		ak4113-&gt;qcrc_errors++;</div><div class='del'>-	c0 = (ak4113-&gt;rcs0 &amp; (AK4113_QINT | AK4113_CINT | AK4113_STC |</div><div class='del'>-				AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK)) ^</div><div class='del'>-		(rcs0 &amp; (AK4113_QINT | AK4113_CINT | AK4113_STC |</div><div class='del'>-			 AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK));</div><div class='del'>-	c1 = (ak4113-&gt;rcs1 &amp; (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |</div><div class='del'>-				AK4113_DAT | 0xf0)) ^</div><div class='del'>-		(rcs1 &amp; (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |</div><div class='del'>-			 AK4113_DAT | 0xf0));</div><div class='del'>-	ak4113-&gt;rcs0 = rcs0 &amp; ~(AK4113_QINT | AK4113_CINT | AK4113_STC);</div><div class='del'>-	ak4113-&gt;rcs1 = rcs1;</div><div class='del'>-	ak4113-&gt;rcs2 = rcs2;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ak4113-&gt;lock, _flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ak4113-&gt;lock) {</div><div class='add'>+		if (rcs0 &amp; AK4113_PAR)</div><div class='add'>+			ak4113-&gt;errors[AK4113_PARITY_ERRORS]++;</div><div class='add'>+		if (rcs0 &amp; AK4113_V)</div><div class='add'>+			ak4113-&gt;errors[AK4113_V_BIT_ERRORS]++;</div><div class='add'>+		if (rcs2 &amp; AK4113_CCRC)</div><div class='add'>+			ak4113-&gt;errors[AK4113_CCRC_ERRORS]++;</div><div class='add'>+		if (rcs2 &amp; AK4113_QCRC)</div><div class='add'>+			ak4113-&gt;errors[AK4113_QCRC_ERRORS]++;</div><div class='add'>+		c0 = (ak4113-&gt;rcs0 &amp; (AK4113_QINT | AK4113_CINT | AK4113_STC |</div><div class='add'>+				      AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK)) ^</div><div class='add'>+			(rcs0 &amp; (AK4113_QINT | AK4113_CINT | AK4113_STC |</div><div class='add'>+				 AK4113_AUDION | AK4113_AUTO | AK4113_UNLCK));</div><div class='add'>+		c1 = (ak4113-&gt;rcs1 &amp; (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |</div><div class='add'>+				      AK4113_DAT | 0xf0)) ^</div><div class='add'>+			(rcs1 &amp; (AK4113_DTSCD | AK4113_NPCM | AK4113_PEM |</div><div class='add'>+				 AK4113_DAT | 0xf0));</div><div class='add'>+		ak4113-&gt;rcs0 = rcs0 &amp; ~(AK4113_QINT | AK4113_CINT | AK4113_STC);</div><div class='add'>+		ak4113-&gt;rcs1 = rcs1;</div><div class='add'>+		ak4113-&gt;rcs2 = rcs2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rcs0 &amp; AK4113_PAR)</div><div class='ctx'> 		snd_ctl_notify(ak4113-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='hunk'>@@ -615,8 +597,6 @@ __rate:</div><div class='ctx'> 			(runtime-&gt;rate != res)) {</div><div class='ctx'> 		snd_pcm_stream_lock_irqsave(ak4113-&gt;substream, _flags);</div><div class='ctx'> 		if (snd_pcm_running(ak4113-&gt;substream)) {</div><div class='del'>-			/*printk(KERN_DEBUG "rate changed (%i &lt;- %i)\n",</div><div class='del'>-			 * runtime-&gt;rate, res); */</div><div class='ctx'> 			snd_pcm_stop(ak4113-&gt;substream,</div><div class='ctx'> 					SNDRV_PCM_STATE_DRAINING);</div><div class='ctx'> 			wake_up(&amp;runtime-&gt;sleep);</div><div class='hunk'>@@ -632,8 +612,25 @@ static void ak4113_stats(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4113 *chip = container_of(work, struct ak4113, work.work);</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;init)</div><div class='add'>+	if (atomic_inc_return(&amp;chip-&gt;wq_processing) == 1)</div><div class='ctx'> 		snd_ak4113_check_rate_and_errors(chip, chip-&gt;check_flags);</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='add'>+	if (atomic_dec_and_test(&amp;chip-&gt;wq_processing))</div><div class='add'>+		schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+void snd_ak4113_suspend(struct ak4113 *chip)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;chip-&gt;wq_processing); /* don't schedule new work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ak4113_suspend);</div><div class='add'>+</div><div class='add'>+void snd_ak4113_resume(struct ak4113 *chip)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;chip-&gt;wq_processing);</div><div class='add'>+	snd_ak4113_reinit(chip);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4113_resume);</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c<br/>index 0341451f814c..0e3a272c1490 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4114.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4114.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4114.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/ak4114.c</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for control of the AK4114 via I2C and 4-wire serial interface</div><div class='ctx'>  *  IEC958 (S/PDIF) receiver by Asahi Kasei</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -52,23 +38,10 @@ static inline unsigned char reg_read(struct ak4114 *ak4114, unsigned char reg)</div><div class='ctx'> 	return ak4114-&gt;read(ak4114-&gt;private_data, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-static void reg_dump(struct ak4114 *ak4114)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "AK4114 REG DUMP:\n");</div><div class='del'>-	for (i = 0; i &lt; 0x20; i++)</div><div class='del'>-		printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4114, i), i &lt; sizeof(ak4114-&gt;regmap) ? ak4114-&gt;regmap[i] : 0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void snd_ak4114_free(struct ak4114 *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;init = 1;	/* don't schedule new work */</div><div class='del'>-	mb();</div><div class='del'>-	cancel_delayed_work(&amp;chip-&gt;work);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	atomic_inc(&amp;chip-&gt;wq_processing);	/* don't schedule new work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -81,13 +54,13 @@ static int snd_ak4114_dev_free(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> int snd_ak4114_create(struct snd_card *card,</div><div class='ctx'> 		      ak4114_read_t *read, ak4114_write_t *write,</div><div class='del'>-		      const unsigned char pgm[7], const unsigned char txcsb[5],</div><div class='add'>+		      const unsigned char pgm[6], const unsigned char txcsb[5],</div><div class='ctx'> 		      void *private_data, struct ak4114 **r_ak4114)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4114 *chip;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned char reg;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =     snd_ak4114_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -100,8 +73,10 @@ int snd_ak4114_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;write = write;</div><div class='ctx'> 	chip-&gt;private_data = private_data;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;chip-&gt;work, ak4114_stats);</div><div class='add'>+	atomic_set(&amp;chip-&gt;wq_processing, 0);</div><div class='add'>+	mutex_init(&amp;chip-&gt;reinit_mutex);</div><div class='ctx'> </div><div class='del'>-	for (reg = 0; reg &lt; 7; reg++)</div><div class='add'>+	for (reg = 0; reg &lt; 6; reg++)</div><div class='ctx'> 		chip-&gt;regmap[reg] = pgm[reg];</div><div class='ctx'> 	for (reg = 0; reg &lt; 5; reg++)</div><div class='ctx'> 		chip-&gt;txcsb[reg] = txcsb[reg];</div><div class='hunk'>@@ -111,7 +86,8 @@ int snd_ak4114_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;rcs0 = reg_read(chip, AK4114_REG_RCS0) &amp; ~(AK4114_QINT | AK4114_CINT);</div><div class='ctx'> 	chip-&gt;rcs1 = reg_read(chip, AK4114_REG_RCS1);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0)</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, chip, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> </div><div class='ctx'> 	if (r_ak4114)</div><div class='hunk'>@@ -120,8 +96,9 @@ int snd_ak4114_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'>       __fail:</div><div class='ctx'> 	snd_ak4114_free(chip);</div><div class='del'>-	return err &lt; 0 ? err : -EIO;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_create);</div><div class='ctx'> </div><div class='ctx'> void snd_ak4114_reg_write(struct ak4114 *chip, unsigned char reg, unsigned char mask, unsigned char val)</div><div class='ctx'> {</div><div class='hunk'>@@ -131,6 +108,7 @@ void snd_ak4114_reg_write(struct ak4114 *chip, unsigned char reg, unsigned char</div><div class='ctx'> 		reg_write(chip, reg,</div><div class='ctx'> 			  (chip-&gt;txcsb[reg-AK4114_REG_TXCSB0] &amp; ~mask) | val);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_reg_write);</div><div class='ctx'> </div><div class='ctx'> static void ak4114_init_regs(struct ak4114 *chip)</div><div class='ctx'> {</div><div class='hunk'>@@ -142,7 +120,7 @@ static void ak4114_init_regs(struct ak4114 *chip)</div><div class='ctx'> 	/* release reset, but leave powerdown */</div><div class='ctx'> 	reg_write(chip, AK4114_REG_PWRDN, (old | AK4114_RST) &amp; ~AK4114_PWN);</div><div class='ctx'> 	udelay(200);</div><div class='del'>-	for (reg = 1; reg &lt; 7; reg++)</div><div class='add'>+	for (reg = 1; reg &lt; 6; reg++)</div><div class='ctx'> 		reg_write(chip, reg, chip-&gt;regmap[reg]);</div><div class='ctx'> 	for (reg = 0; reg &lt; 5; reg++)</div><div class='ctx'> 		reg_write(chip, reg + AK4114_REG_TXCSB0, chip-&gt;txcsb[reg]);</div><div class='hunk'>@@ -152,15 +130,16 @@ static void ak4114_init_regs(struct ak4114 *chip)</div><div class='ctx'> </div><div class='ctx'> void snd_ak4114_reinit(struct ak4114 *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;init = 1;</div><div class='del'>-	mb();</div><div class='del'>-	flush_scheduled_work();</div><div class='del'>-	ak4114_init_regs(chip);</div><div class='add'>+	if (atomic_inc_return(&amp;chip-&gt;wq_processing) == 1)</div><div class='add'>+		cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;reinit_mutex) {</div><div class='add'>+		ak4114_init_regs(chip);</div><div class='add'>+	}</div><div class='ctx'> 	/* bring up statistics / event queing */</div><div class='del'>-	chip-&gt;init = 0;</div><div class='del'>-	if (chip-&gt;kctls[0])</div><div class='add'>+	if (atomic_dec_and_test(&amp;chip-&gt;wq_processing))</div><div class='ctx'> 		schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_reinit);</div><div class='ctx'> </div><div class='ctx'> static unsigned int external_rate(unsigned char rcs1)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,13 +169,11 @@ static int snd_ak4114_in_error_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				   struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4114 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	ptr = (long *)(((char *)chip) + kcontrol-&gt;private_value);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = *ptr;</div><div class='del'>-	*ptr = 0;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] =</div><div class='add'>+		chip-&gt;errors[kcontrol-&gt;private_value];</div><div class='add'>+	chip-&gt;errors[kcontrol-&gt;private_value] = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,14 +307,14 @@ static int snd_ak4114_spdif_qget(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Don't forget to change AK4114_CONTROLS define!!! */</div><div class='del'>-static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		"IEC958 Parity Errors",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4114_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4114_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4114, parity_errors),</div><div class='add'>+	.private_value = AK4114_PARITY_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -345,7 +322,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4114_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4114_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4114, v_bit_errors),</div><div class='add'>+	.private_value = AK4114_V_BIT_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -353,7 +330,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4114_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4114_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4114, ccrc_errors),</div><div class='add'>+	.private_value = AK4114_CCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -361,7 +338,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4114_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4114_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4114, qcrc_errors),</div><div class='add'>+	.private_value = AK4114_QCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -401,7 +378,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='del'>-	.name =		"IEC958 Preample Capture Default",</div><div class='add'>+	.name =		"IEC958 Preamble Capture Default",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4114_spdif_pinfo,</div><div class='ctx'> 	.get =		snd_ak4114_spdif_pget,</div><div class='hunk'>@@ -462,9 +439,8 @@ static void snd_ak4114_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static void snd_ak4114_proc_init(struct ak4114 *ak4114)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(ak4114-&gt;card, "ak4114", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ak4114, snd_ak4114_proc_regs_read);</div><div class='add'>+	snd_card_ro_proc_new(ak4114-&gt;card, "ak4114", ak4114,</div><div class='add'>+			     snd_ak4114_proc_regs_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_ak4114_build(struct ak4114 *ak4114,</div><div class='hunk'>@@ -505,6 +481,7 @@ int snd_ak4114_build(struct ak4114 *ak4114,</div><div class='ctx'> 	schedule_delayed_work(&amp;ak4114-&gt;work, HZ / 10);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_build);</div><div class='ctx'> </div><div class='ctx'> /* notify kcontrols if any parameters are changed */</div><div class='ctx'> static void ak4114_notify(struct ak4114 *ak4114,</div><div class='hunk'>@@ -560,6 +537,7 @@ int snd_ak4114_external_rate(struct ak4114 *ak4114)</div><div class='ctx'> 	rcs1 = reg_read(ak4114, AK4114_REG_RCS1);</div><div class='ctx'> 	return external_rate(rcs1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_external_rate);</div><div class='ctx'> </div><div class='ctx'> int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -573,21 +551,21 @@ int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)</div><div class='ctx'> 	if (flags &amp; AK4114_CHECK_NO_STAT)</div><div class='ctx'> 		goto __rate;</div><div class='ctx'> 	rcs0 = reg_read(ak4114, AK4114_REG_RCS0);</div><div class='del'>-	spin_lock_irqsave(&amp;ak4114-&gt;lock, _flags);</div><div class='del'>-	if (rcs0 &amp; AK4114_PAR)</div><div class='del'>-		ak4114-&gt;parity_errors++;</div><div class='del'>-	if (rcs1 &amp; AK4114_V)</div><div class='del'>-		ak4114-&gt;v_bit_errors++;</div><div class='del'>-	if (rcs1 &amp; AK4114_CCRC)</div><div class='del'>-		ak4114-&gt;ccrc_errors++;</div><div class='del'>-	if (rcs1 &amp; AK4114_QCRC)</div><div class='del'>-		ak4114-&gt;qcrc_errors++;</div><div class='del'>-	c0 = (ak4114-&gt;rcs0 &amp; (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK)) ^</div><div class='del'>-                     (rcs0 &amp; (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK));</div><div class='del'>-	c1 = (ak4114-&gt;rcs1 &amp; 0xf0) ^ (rcs1 &amp; 0xf0);</div><div class='del'>-	ak4114-&gt;rcs0 = rcs0 &amp; ~(AK4114_QINT | AK4114_CINT);</div><div class='del'>-	ak4114-&gt;rcs1 = rcs1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ak4114-&gt;lock, _flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ak4114-&gt;lock) {</div><div class='add'>+		if (rcs0 &amp; AK4114_PAR)</div><div class='add'>+			ak4114-&gt;errors[AK4114_PARITY_ERRORS]++;</div><div class='add'>+		if (rcs1 &amp; AK4114_V)</div><div class='add'>+			ak4114-&gt;errors[AK4114_V_BIT_ERRORS]++;</div><div class='add'>+		if (rcs1 &amp; AK4114_CCRC)</div><div class='add'>+			ak4114-&gt;errors[AK4114_CCRC_ERRORS]++;</div><div class='add'>+		if (rcs1 &amp; AK4114_QCRC)</div><div class='add'>+			ak4114-&gt;errors[AK4114_QCRC_ERRORS]++;</div><div class='add'>+		c0 = (ak4114-&gt;rcs0 &amp; (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK)) ^</div><div class='add'>+			(rcs0 &amp; (AK4114_QINT | AK4114_CINT | AK4114_PEM | AK4114_AUDION | AK4114_AUTO | AK4114_UNLCK));</div><div class='add'>+		c1 = (ak4114-&gt;rcs1 &amp; 0xf0) ^ (rcs1 &amp; 0xf0);</div><div class='add'>+		ak4114-&gt;rcs0 = rcs0 &amp; ~(AK4114_QINT | AK4114_CINT);</div><div class='add'>+		ak4114-&gt;rcs1 = rcs1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ak4114_notify(ak4114, rcs0, rcs1, c0, c1);</div><div class='ctx'> 	if (ak4114-&gt;change_callback &amp;&amp; (c0 | c1) != 0)</div><div class='hunk'>@@ -599,7 +577,6 @@ int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)</div><div class='ctx'> 	if (!(flags &amp; AK4114_CHECK_NO_RATE) &amp;&amp; runtime &amp;&amp; runtime-&gt;rate != res) {</div><div class='ctx'> 		snd_pcm_stream_lock_irqsave(ak4114-&gt;capture_substream, _flags);</div><div class='ctx'> 		if (snd_pcm_running(ak4114-&gt;capture_substream)) {</div><div class='del'>-			// printk(KERN_DEBUG "rate changed (%i &lt;- %i)\n", runtime-&gt;rate, res);</div><div class='ctx'> 			snd_pcm_stop(ak4114-&gt;capture_substream, SNDRV_PCM_STATE_DRAINING);</div><div class='ctx'> 			res = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -607,20 +584,30 @@ int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags)</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_check_rate_and_errors);</div><div class='ctx'> </div><div class='ctx'> static void ak4114_stats(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4114 *chip = container_of(work, struct ak4114, work.work);</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;init)</div><div class='add'>+	if (atomic_inc_return(&amp;chip-&gt;wq_processing) == 1)</div><div class='ctx'> 		snd_ak4114_check_rate_and_errors(chip, chip-&gt;check_flags);</div><div class='add'>+	if (atomic_dec_and_test(&amp;chip-&gt;wq_processing))</div><div class='add'>+		schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	schedule_delayed_work(&amp;chip-&gt;work, HZ / 10);</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+void snd_ak4114_suspend(struct ak4114 *chip)</div><div class='add'>+{</div><div class='add'>+	atomic_inc(&amp;chip-&gt;wq_processing); /* don't schedule new work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;chip-&gt;work);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_suspend);</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_create);</div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_reg_write);</div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_reinit);</div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_build);</div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_external_rate);</div><div class='del'>-EXPORT_SYMBOL(snd_ak4114_check_rate_and_errors);</div><div class='add'>+void snd_ak4114_resume(struct ak4114 *chip)</div><div class='add'>+{</div><div class='add'>+	atomic_dec(&amp;chip-&gt;wq_processing);</div><div class='add'>+	snd_ak4114_reinit(chip);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(snd_ak4114_resume);</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c<br/>index 2cad2d612518..d2ec20f885f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4117.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4117.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4117.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/ak4117.c</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for control of the AK4117 via 4-wire serial interface</div><div class='ctx'>  *  IEC958 (S/PDIF) receiver by Asahi Kasei</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -34,7 +20,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define AK4117_ADDR			0x00 /* fixed address */</div><div class='ctx'> </div><div class='del'>-static void snd_ak4117_timer(unsigned long data);</div><div class='add'>+static void snd_ak4117_timer(struct timer_list *t);</div><div class='ctx'> </div><div class='ctx'> static void reg_write(struct ak4117 *ak4117, unsigned char reg, unsigned char val)</div><div class='ctx'> {</div><div class='hunk'>@@ -48,20 +34,9 @@ static inline unsigned char reg_read(struct ak4117 *ak4117, unsigned char reg)</div><div class='ctx'> 	return ak4117-&gt;read(ak4117-&gt;private_data, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-static void reg_dump(struct ak4117 *ak4117)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG "AK4117 REG DUMP:\n");</div><div class='del'>-	for (i = 0; i &lt; 0x1b; i++)</div><div class='del'>-		printk(KERN_DEBUG "reg[%02x] = %02x (%02x)\n", i, reg_read(ak4117, i), i &lt; sizeof(ak4117-&gt;regmap) ? ak4117-&gt;regmap[i] : 0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void snd_ak4117_free(struct ak4117 *chip)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;chip-&gt;timer);</div><div class='add'>+	timer_shutdown_sync(&amp;chip-&gt;timer);</div><div class='ctx'> 	kfree(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -78,7 +53,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t</div><div class='ctx'> 	struct ak4117 *chip;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	unsigned char reg;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =     snd_ak4117_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -90,9 +65,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t</div><div class='ctx'> 	chip-&gt;read = read;</div><div class='ctx'> 	chip-&gt;write = write;</div><div class='ctx'> 	chip-&gt;private_data = private_data;</div><div class='del'>-	init_timer(&amp;chip-&gt;timer);</div><div class='del'>-	chip-&gt;timer.data = (unsigned long)chip;</div><div class='del'>-	chip-&gt;timer.function = snd_ak4117_timer;</div><div class='add'>+	timer_setup(&amp;chip-&gt;timer, snd_ak4117_timer, 0);</div><div class='ctx'> </div><div class='ctx'> 	for (reg = 0; reg &lt; 5; reg++)</div><div class='ctx'> 		chip-&gt;regmap[reg] = pgm[reg];</div><div class='hunk'>@@ -102,7 +75,8 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t</div><div class='ctx'> 	chip-&gt;rcs1 = reg_read(chip, AK4117_REG_RCS1);</div><div class='ctx'> 	chip-&gt;rcs2 = reg_read(chip, AK4117_REG_RCS2);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, chip, &amp;ops)) &lt; 0)</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, chip, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __fail;</div><div class='ctx'> </div><div class='ctx'> 	if (r_ak4117)</div><div class='hunk'>@@ -111,7 +85,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t</div><div class='ctx'> </div><div class='ctx'>       __fail:</div><div class='ctx'> 	snd_ak4117_free(chip);</div><div class='del'>-	return err &lt; 0 ? err : -EIO;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_ak4117_reg_write(struct ak4117 *chip, unsigned char reg, unsigned char mask, unsigned char val)</div><div class='hunk'>@@ -125,7 +99,7 @@ void snd_ak4117_reinit(struct ak4117 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char old = chip-&gt;regmap[AK4117_REG_PWRDN], reg;</div><div class='ctx'> </div><div class='del'>-	del_timer(&amp;chip-&gt;timer);</div><div class='add'>+	timer_delete(&amp;chip-&gt;timer);</div><div class='ctx'> 	chip-&gt;init = 1;</div><div class='ctx'> 	/* bring the chip to reset state and powerdown state */</div><div class='ctx'> 	reg_write(chip, AK4117_REG_PWRDN, 0);</div><div class='hunk'>@@ -138,8 +112,7 @@ void snd_ak4117_reinit(struct ak4117 *chip)</div><div class='ctx'> 	/* release powerdown, everything is initialized now */</div><div class='ctx'> 	reg_write(chip, AK4117_REG_PWRDN, old | AK4117_RST | AK4117_PWN);</div><div class='ctx'> 	chip-&gt;init = 0;</div><div class='del'>-	chip-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;chip-&gt;timer);</div><div class='add'>+	mod_timer(&amp;chip-&gt;timer, 1 + jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int external_rate(unsigned char rcs1)</div><div class='hunk'>@@ -170,13 +143,11 @@ static int snd_ak4117_in_error_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				   struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ak4117 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	ptr = (long *)(((char *)chip) + kcontrol-&gt;private_value);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = *ptr;</div><div class='del'>-	*ptr = 0;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] =</div><div class='add'>+		       chip-&gt;errors[kcontrol-&gt;private_value];</div><div class='add'>+	chip-&gt;errors[kcontrol-&gt;private_value] = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,12 +191,11 @@ static int snd_ak4117_rx_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change;</div><div class='ctx'> 	u8 old_val;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	old_val = chip-&gt;regmap[AK4117_REG_IO];</div><div class='ctx'> 	change = !!ucontrol-&gt;value.integer.value[0] != ((old_val &amp; AK4117_IPS) ? 1 : 0);</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		reg_write(chip, AK4117_REG_IO, (old_val &amp; ~AK4117_IPS) | (ucontrol-&gt;value.integer.value[0] ? AK4117_IPS : 0));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -323,14 +293,14 @@ static int snd_ak4117_spdif_qget(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Don't forget to change AK4117_CONTROLS define!!! */</div><div class='del'>-static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		"IEC958 Parity Errors",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4117_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4117_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4117, parity_errors),</div><div class='add'>+	.private_value = AK4117_PARITY_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -338,7 +308,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4117_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4117_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4117, v_bit_errors),</div><div class='add'>+	.private_value = AK4117_V_BIT_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -346,7 +316,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4117_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4117_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4117, ccrc_errors),</div><div class='add'>+	.private_value = AK4117_CCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -354,7 +324,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4117_in_error_info,</div><div class='ctx'> 	.get =		snd_ak4117_in_error_get,</div><div class='del'>-	.private_value = offsetof(struct ak4117, qcrc_errors),</div><div class='add'>+	.private_value = AK4117_QCRC_ERRORS,</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -379,7 +349,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = {</div><div class='ctx'> },</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='del'>-	.name =		"IEC958 Preample Capture Default",</div><div class='add'>+	.name =		"IEC958 Preamble Capture Default",</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='ctx'> 	.info =		snd_ak4117_spdif_pinfo,</div><div class='ctx'> 	.get =		snd_ak4117_spdif_pget,</div><div class='hunk'>@@ -469,24 +439,23 @@ int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags)</div><div class='ctx'> 		goto __rate;</div><div class='ctx'> 	rcs0 = reg_read(ak4117, AK4117_REG_RCS0);</div><div class='ctx'> 	rcs2 = reg_read(ak4117, AK4117_REG_RCS2);</div><div class='del'>-	// printk(KERN_DEBUG "AK IRQ: rcs0 = 0x%x, rcs1 = 0x%x, rcs2 = 0x%x\n", rcs0, rcs1, rcs2);</div><div class='del'>-	spin_lock_irqsave(&amp;ak4117-&gt;lock, _flags);</div><div class='del'>-	if (rcs0 &amp; AK4117_PAR)</div><div class='del'>-		ak4117-&gt;parity_errors++;</div><div class='del'>-	if (rcs0 &amp; AK4117_V)</div><div class='del'>-		ak4117-&gt;v_bit_errors++;</div><div class='del'>-	if (rcs2 &amp; AK4117_CCRC)</div><div class='del'>-		ak4117-&gt;ccrc_errors++;</div><div class='del'>-	if (rcs2 &amp; AK4117_QCRC)</div><div class='del'>-		ak4117-&gt;qcrc_errors++;</div><div class='del'>-	c0 = (ak4117-&gt;rcs0 &amp; (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK)) ^</div><div class='del'>-                     (rcs0 &amp; (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK));</div><div class='del'>-	c1 = (ak4117-&gt;rcs1 &amp; (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f)) ^</div><div class='del'>-	             (rcs1 &amp; (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f));</div><div class='del'>-	ak4117-&gt;rcs0 = rcs0 &amp; ~(AK4117_QINT | AK4117_CINT | AK4117_STC);</div><div class='del'>-	ak4117-&gt;rcs1 = rcs1;</div><div class='del'>-	ak4117-&gt;rcs2 = rcs2;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ak4117-&gt;lock, _flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ak4117-&gt;lock) {</div><div class='add'>+		if (rcs0 &amp; AK4117_PAR)</div><div class='add'>+			ak4117-&gt;errors[AK4117_PARITY_ERRORS]++;</div><div class='add'>+		if (rcs0 &amp; AK4117_V)</div><div class='add'>+			ak4117-&gt;errors[AK4117_V_BIT_ERRORS]++;</div><div class='add'>+		if (rcs2 &amp; AK4117_CCRC)</div><div class='add'>+			ak4117-&gt;errors[AK4117_CCRC_ERRORS]++;</div><div class='add'>+		if (rcs2 &amp; AK4117_QCRC)</div><div class='add'>+			ak4117-&gt;errors[AK4117_QCRC_ERRORS]++;</div><div class='add'>+		c0 = (ak4117-&gt;rcs0 &amp; (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK)) ^</div><div class='add'>+			(rcs0 &amp; (AK4117_QINT | AK4117_CINT | AK4117_STC | AK4117_AUDION | AK4117_AUTO | AK4117_UNLCK));</div><div class='add'>+		c1 = (ak4117-&gt;rcs1 &amp; (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f)) ^</div><div class='add'>+			(rcs1 &amp; (AK4117_DTSCD | AK4117_NPCM | AK4117_PEM | 0x0f));</div><div class='add'>+		ak4117-&gt;rcs0 = rcs0 &amp; ~(AK4117_QINT | AK4117_CINT | AK4117_STC);</div><div class='add'>+		ak4117-&gt;rcs1 = rcs1;</div><div class='add'>+		ak4117-&gt;rcs2 = rcs2;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (rcs0 &amp; AK4117_PAR)</div><div class='ctx'> 		snd_ctl_notify(ak4117-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;ak4117-&gt;kctls[0]-&gt;id);</div><div class='hunk'>@@ -522,7 +491,6 @@ int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags)</div><div class='ctx'> 	if (!(flags &amp; AK4117_CHECK_NO_RATE) &amp;&amp; runtime &amp;&amp; runtime-&gt;rate != res) {</div><div class='ctx'> 		snd_pcm_stream_lock_irqsave(ak4117-&gt;substream, _flags);</div><div class='ctx'> 		if (snd_pcm_running(ak4117-&gt;substream)) {</div><div class='del'>-			// printk(KERN_DEBUG "rate changed (%i &lt;- %i)\n", runtime-&gt;rate, res);</div><div class='ctx'> 			snd_pcm_stop(ak4117-&gt;substream, SNDRV_PCM_STATE_DRAINING);</div><div class='ctx'> 			wake_up(&amp;runtime-&gt;sleep);</div><div class='ctx'> 			res = 1;</div><div class='hunk'>@@ -532,15 +500,14 @@ int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags)</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_ak4117_timer(unsigned long data)</div><div class='add'>+static void snd_ak4117_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ak4117 *chip = (struct ak4117 *)data;</div><div class='add'>+	struct ak4117 *chip = timer_container_of(chip, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;init)</div><div class='ctx'> 		return;</div><div class='ctx'> 	snd_ak4117_check_rate_and_errors(chip, 0);</div><div class='del'>-	chip-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;chip-&gt;timer);</div><div class='add'>+	mod_timer(&amp;chip-&gt;timer, 1 + jiffies);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_ak4117_create);</div><div class='head'>diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c<br/>index 57ccba88700d..b24c80410d45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4xxx-adda.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/ak4xxx-adda.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/ak4xxx-adda.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/ak4xxx-adda.c</a></div><div class='hunk'>@@ -1,30 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4358 / AK4381</div><div class='ctx'>  *   AD and DA converters</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000-2004 Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='ctx'>  *				Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -404,8 +391,6 @@ static int put_ak_reg(struct snd_kcontrol *kcontrol, int addr,</div><div class='ctx'> 		nval = mask - nval;</div><div class='ctx'> 	if (AK_GET_NEEDSMSB(kcontrol-&gt;private_value))</div><div class='ctx'> 		nval |= 0x80;</div><div class='del'>-	/* printk(KERN_DEBUG "DEBUG - AK writing reg: chip %x addr %x,</div><div class='del'>-	   nval %x\n", chip, addr, nval); */</div><div class='ctx'> 	snd_akm4xxx_write(ak, chip, addr, nval);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -464,17 +449,10 @@ static int snd_akm4xxx_stereo_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_akm4xxx_deemphasis_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = {</div><div class='add'>+	static const char * const texts[4] = {</div><div class='ctx'> 		"44.1kHz", "Off", "48kHz", "32kHz",</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_akm4xxx_deemphasis_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -569,22 +547,13 @@ static int ak4xxx_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_akm4xxx *ak = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int mixer_ch = AK_GET_SHIFT(kcontrol-&gt;private_value);</div><div class='del'>-	const char **input_names;</div><div class='del'>-	int  num_names, idx;</div><div class='add'>+	unsigned int num_names;</div><div class='ctx'> </div><div class='ctx'> 	num_names = ak4xxx_capture_num_inputs(ak, mixer_ch);</div><div class='ctx'> 	if (!num_names)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = num_names;</div><div class='del'>-	idx = uinfo-&gt;value.enumerated.item;</div><div class='del'>-	if (idx &gt;= num_names)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	input_names = ak-&gt;adc_info[mixer_ch].input_names;</div><div class='del'>-	strncpy(uinfo-&gt;value.enumerated.name, input_names[idx],</div><div class='del'>-		sizeof(uinfo-&gt;value.enumerated.name));</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, num_names,</div><div class='add'>+				 ak-&gt;adc_info[mixer_ch].input_names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ak4xxx_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -804,11 +773,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak)</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			memset(&amp;knew, 0, sizeof(knew));</div><div class='del'>-			knew.name = ak-&gt;adc_info[mixer_ch].selector_name;</div><div class='del'>-			if (!knew.name) {</div><div class='add'>+			if (!ak-&gt;adc_info ||</div><div class='add'>+				!ak-&gt;adc_info[mixer_ch].selector_name) {</div><div class='ctx'> 				knew.name = "Capture Channel";</div><div class='ctx'> 				knew.index = mixer_ch + ak-&gt;idx_offset * 2;</div><div class='del'>-			}</div><div class='add'>+			} else</div><div class='add'>+				knew.name = ak-&gt;adc_info[mixer_ch].selector_name;</div><div class='ctx'> </div><div class='ctx'> 			knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 			knew.info = ak4xxx_capture_source_info;</div><div class='hunk'>@@ -874,7 +844,6 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static void proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> 		struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -891,17 +860,8 @@ static void proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static int proc_init(struct snd_akm4xxx *ak)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err;</div><div class='del'>-	err = snd_card_proc_new(ak-&gt;card, ak-&gt;name, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	snd_info_set_text_ops(entry, ak, proc_regs_read);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_card_ro_proc_new(ak-&gt;card, ak-&gt;name, ak, proc_regs_read);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-static int proc_init(struct snd_akm4xxx *ak) { return 0; }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)</div><div class='ctx'> {</div><div class='hunk'>@@ -930,15 +890,3 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_akm4xxx_build_controls);</div><div class='del'>-</div><div class='del'>-static int __init alsa_akm4xxx_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-        </div><div class='del'>-static void __exit alsa_akm4xxx_module_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-        </div><div class='del'>-module_init(alsa_akm4xxx_module_init)</div><div class='del'>-module_exit(alsa_akm4xxx_module_exit)</div><div class='head'>diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c<br/>index 797d3a6687eb..0fbac827124b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/pt2258.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/pt2258.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/pt2258.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/other/pt2258.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA Driver for the PT2258 volume controller.</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2006  Jochen Voss &lt;voss@seehuhn.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -24,6 +10,7 @@</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> #include &lt;sound/i2c.h&gt;</div><div class='ctx'> #include &lt;sound/pt2258.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jochen Voss &lt;voss@seehuhn.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("PT2258 volume controller (Princeton Technology Corp.)");</div><div class='hunk'>@@ -76,7 +63,7 @@ int snd_pt2258_reset(struct snd_pt2258 *pt)</div><div class='ctx'> </div><div class='ctx'>       __error:</div><div class='ctx'> 	snd_i2c_unlock(pt-&gt;i2c_bus);</div><div class='del'>-	snd_printk(KERN_ERR "PT2258 reset failed\n");</div><div class='add'>+	dev_err(pt-&gt;card-&gt;dev, "PT2258 reset failed\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -93,7 +80,7 @@ static int pt2258_stereo_volume_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				    struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pt2258 *pt = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int base = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='ctx'> 	/* chip does not support register reads */</div><div class='hunk'>@@ -105,7 +92,7 @@ static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				    struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pt2258 *pt = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int base = kcontrol-&gt;private_value;</div><div class='ctx'> 	unsigned char bytes[2];</div><div class='ctx'> 	int val0, val1;</div><div class='hunk'>@@ -137,7 +124,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'>       __error:</div><div class='ctx'> 	snd_i2c_unlock(pt-&gt;i2c_bus);</div><div class='del'>-	snd_printk(KERN_ERR "PT2258 access failed\n");</div><div class='add'>+	dev_err(pt-&gt;card-&gt;dev, "PT2258 access failed\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +133,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int pt2258_switch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			     struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pt2258 *pt = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = !pt-&gt;mute;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -155,7 +142,7 @@ static int pt2258_switch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int pt2258_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			     struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pt2258 *pt = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned char bytes[2];</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='hunk'>@@ -174,7 +161,7 @@ static int pt2258_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'>       __error:</div><div class='ctx'> 	snd_i2c_unlock(pt-&gt;i2c_bus);</div><div class='del'>-	snd_printk(KERN_ERR "PT2258 access failed 2\n");</div><div class='add'>+	dev_err(pt-&gt;card-&gt;dev, "PT2258 access failed 2\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c<br/>deleted file mode 100644<br/>index ee538f1ae846..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/other/tea575x-tuner.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/other/tea575x-tuner.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,365 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *   ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips</div><div class='del'>- *</div><div class='del'>- *	Copyright (c) 2004 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/tea575x-tuner.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int radio_nr = -1;</div><div class='del'>-module_param(radio_nr, int, 0);</div><div class='del'>-</div><div class='del'>-#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)</div><div class='del'>-#define FREQ_LO		 (87 * 16000)</div><div class='del'>-#define FREQ_HI		(108 * 16000)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TEA575X_BIT_SEARCH	(1&lt;&lt;24)		/* 1 = search action, 0 = tuned */</div><div class='del'>-#define TEA575X_BIT_UPDOWN	(1&lt;&lt;23)		/* 0 = search down, 1 = search up */</div><div class='del'>-#define TEA575X_BIT_MONO	(1&lt;&lt;22)		/* 0 = stereo, 1 = mono */</div><div class='del'>-#define TEA575X_BIT_BAND_MASK	(3&lt;&lt;20)</div><div class='del'>-#define TEA575X_BIT_BAND_FM	(0&lt;&lt;20)</div><div class='del'>-#define TEA575X_BIT_BAND_MW	(1&lt;&lt;20)</div><div class='del'>-#define TEA575X_BIT_BAND_LW	(1&lt;&lt;21)</div><div class='del'>-#define TEA575X_BIT_BAND_SW	(1&lt;&lt;22)</div><div class='del'>-#define TEA575X_BIT_PORT_0	(1&lt;&lt;19)		/* user bit */</div><div class='del'>-#define TEA575X_BIT_PORT_1	(1&lt;&lt;18)		/* user bit */</div><div class='del'>-#define TEA575X_BIT_SEARCH_MASK	(3&lt;&lt;16)		/* search level */</div><div class='del'>-#define TEA575X_BIT_SEARCH_5_28	     (0&lt;&lt;16)	/* FM &gt;5uV, AM &gt;28uV */</div><div class='del'>-#define TEA575X_BIT_SEARCH_10_40     (1&lt;&lt;16)	/* FM &gt;10uV, AM &gt; 40uV */</div><div class='del'>-#define TEA575X_BIT_SEARCH_30_63     (2&lt;&lt;16)	/* FM &gt;30uV, AM &gt; 63uV */</div><div class='del'>-#define TEA575X_BIT_SEARCH_150_1000  (3&lt;&lt;16)	/* FM &gt; 150uV, AM &gt; 1000uV */</div><div class='del'>-#define TEA575X_BIT_DUMMY	(1&lt;&lt;15)		/* buffer */</div><div class='del'>-#define TEA575X_BIT_FREQ_MASK	0x7fff</div><div class='del'>-</div><div class='del'>-static struct v4l2_queryctrl radio_qctrl[] = {</div><div class='del'>-	{</div><div class='del'>-		.id            = V4L2_CID_AUDIO_MUTE,</div><div class='del'>-		.name          = "Mute",</div><div class='del'>-		.minimum       = 0,</div><div class='del'>-		.maximum       = 1,</div><div class='del'>-		.default_value = 1,</div><div class='del'>-		.type          = V4L2_CTRL_TYPE_BOOLEAN,</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * lowlevel part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void snd_tea575x_set_freq(struct snd_tea575x *tea)</div><div class='del'>-{</div><div class='del'>-	unsigned long freq;</div><div class='del'>-</div><div class='del'>-	freq = tea-&gt;freq / 16;		/* to kHz */</div><div class='del'>-	if (freq &gt; 108000)</div><div class='del'>-		freq = 108000;</div><div class='del'>-	if (freq &lt; 87000)</div><div class='del'>-		freq = 87000;</div><div class='del'>-	/* crystal fixup */</div><div class='del'>-	if (tea-&gt;tea5759)</div><div class='del'>-		freq -= tea-&gt;freq_fixup;</div><div class='del'>-	else</div><div class='del'>-		freq += tea-&gt;freq_fixup;</div><div class='del'>-	/* freq /= 12.5 */</div><div class='del'>-	freq *= 10;</div><div class='del'>-	freq /= 125;</div><div class='del'>-</div><div class='del'>-	tea-&gt;val &amp;= ~TEA575X_BIT_FREQ_MASK;</div><div class='del'>-	tea-&gt;val |= freq &amp; TEA575X_BIT_FREQ_MASK;</div><div class='del'>-	tea-&gt;ops-&gt;write(tea, tea-&gt;val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Linux Video interface</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int vidioc_querycap(struct file *file, void  *priv,</div><div class='del'>-					struct v4l2_capability *v)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	strcpy(v-&gt;card, tea-&gt;tea5759 ? "TEA5759" : "TEA5757");</div><div class='del'>-	strlcpy(v-&gt;driver, "tea575x-tuner", sizeof(v-&gt;driver));</div><div class='del'>-	strlcpy(v-&gt;card, "Maestro Radio", sizeof(v-&gt;card));</div><div class='del'>-	sprintf(v-&gt;bus_info, "PCI");</div><div class='del'>-	v-&gt;version = RADIO_VERSION;</div><div class='del'>-	v-&gt;capabilities = V4L2_CAP_TUNER;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_g_tuner(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_tuner *v)</div><div class='del'>-{</div><div class='del'>-	if (v-&gt;index &gt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	strcpy(v-&gt;name, "FM");</div><div class='del'>-	v-&gt;type = V4L2_TUNER_RADIO;</div><div class='del'>-	v-&gt;rangelow = FREQ_LO;</div><div class='del'>-	v-&gt;rangehigh = FREQ_HI;</div><div class='del'>-	v-&gt;rxsubchans = V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;</div><div class='del'>-	v-&gt;capability = V4L2_TUNER_CAP_LOW;</div><div class='del'>-	v-&gt;audmode = V4L2_TUNER_MODE_MONO;</div><div class='del'>-	v-&gt;signal = 0xffff;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_s_tuner(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_tuner *v)</div><div class='del'>-{</div><div class='del'>-	if (v-&gt;index &gt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_g_frequency(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_frequency *f)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	f-&gt;type = V4L2_TUNER_RADIO;</div><div class='del'>-	f-&gt;frequency = tea-&gt;freq;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_s_frequency(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_frequency *f)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;frequency &lt; FREQ_LO || f-&gt;frequency &gt; FREQ_HI)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	tea-&gt;freq = f-&gt;frequency;</div><div class='del'>-</div><div class='del'>-	snd_tea575x_set_freq(tea);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_g_audio(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_audio *a)</div><div class='del'>-{</div><div class='del'>-	if (a-&gt;index &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	strcpy(a-&gt;name, "Radio");</div><div class='del'>-	a-&gt;capability = V4L2_AUDCAP_STEREO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_s_audio(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_audio *a)</div><div class='del'>-{</div><div class='del'>-	if (a-&gt;index != 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_queryctrl(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_queryctrl *qc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(radio_qctrl); i++) {</div><div class='del'>-		if (qc-&gt;id &amp;&amp; qc-&gt;id == radio_qctrl[i].id) {</div><div class='del'>-			memcpy(qc, &amp;(radio_qctrl[i]),</div><div class='del'>-						sizeof(*qc));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_g_ctrl(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_control *ctrl)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	switch (ctrl-&gt;id) {</div><div class='del'>-	case V4L2_CID_AUDIO_MUTE:</div><div class='del'>-		if (tea-&gt;ops-&gt;mute) {</div><div class='del'>-			ctrl-&gt;value = tea-&gt;mute;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_s_ctrl(struct file *file, void *priv,</div><div class='del'>-					struct v4l2_control *ctrl)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	switch (ctrl-&gt;id) {</div><div class='del'>-	case V4L2_CID_AUDIO_MUTE:</div><div class='del'>-		if (tea-&gt;ops-&gt;mute) {</div><div class='del'>-			tea-&gt;ops-&gt;mute(tea, ctrl-&gt;value);</div><div class='del'>-			tea-&gt;mute = ctrl-&gt;value;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)</div><div class='del'>-{</div><div class='del'>-	*i = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)</div><div class='del'>-{</div><div class='del'>-	if (i != 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_tea575x_exclusive_open(struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	return test_and_set_bit(0, &amp;tea-&gt;in_use) ? -EBUSY : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_tea575x_exclusive_release(struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct snd_tea575x *tea = video_drvdata(file);</div><div class='del'>-</div><div class='del'>-	clear_bit(0, &amp;tea-&gt;in_use);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct v4l2_file_operations tea575x_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.open           = snd_tea575x_exclusive_open,</div><div class='del'>-	.release        = snd_tea575x_exclusive_release,</div><div class='del'>-	.ioctl		= video_ioctl2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {</div><div class='del'>-	.vidioc_querycap    = vidioc_querycap,</div><div class='del'>-	.vidioc_g_tuner     = vidioc_g_tuner,</div><div class='del'>-	.vidioc_s_tuner     = vidioc_s_tuner,</div><div class='del'>-	.vidioc_g_audio     = vidioc_g_audio,</div><div class='del'>-	.vidioc_s_audio     = vidioc_s_audio,</div><div class='del'>-	.vidioc_g_input     = vidioc_g_input,</div><div class='del'>-	.vidioc_s_input     = vidioc_s_input,</div><div class='del'>-	.vidioc_g_frequency = vidioc_g_frequency,</div><div class='del'>-	.vidioc_s_frequency = vidioc_s_frequency,</div><div class='del'>-	.vidioc_queryctrl   = vidioc_queryctrl,</div><div class='del'>-	.vidioc_g_ctrl      = vidioc_g_ctrl,</div><div class='del'>-	.vidioc_s_ctrl      = vidioc_s_ctrl,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct video_device tea575x_radio = {</div><div class='del'>-	.name           = "tea575x-tuner",</div><div class='del'>-	.fops           = &amp;tea575x_fops,</div><div class='del'>-	.ioctl_ops 	= &amp;tea575x_ioctl_ops,</div><div class='del'>-	.release	= video_device_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize all the tea575x chips</div><div class='del'>- */</div><div class='del'>-void snd_tea575x_init(struct snd_tea575x *tea)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	unsigned int val;</div><div class='del'>-	struct video_device *tea575x_radio_inst;</div><div class='del'>-</div><div class='del'>-	val = tea-&gt;ops-&gt;read(tea);</div><div class='del'>-	if (val == 0x1ffffff || val == 0) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "tea575x-tuner: Cannot find TEA575x chip\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tea-&gt;in_use = 0;</div><div class='del'>-	tea-&gt;val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40;</div><div class='del'>-	tea-&gt;freq = 90500 * 16;		/* 90.5Mhz default */</div><div class='del'>-</div><div class='del'>-	tea575x_radio_inst = video_device_alloc();</div><div class='del'>-	if (tea575x_radio_inst == NULL) {</div><div class='del'>-		printk(KERN_ERR "tea575x-tuner: not enough memory\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(tea575x_radio_inst, &amp;tea575x_radio, sizeof(tea575x_radio));</div><div class='del'>-</div><div class='del'>-	strcpy(tea575x_radio.name, tea-&gt;tea5759 ?</div><div class='del'>-				   "TEA5759 radio" : "TEA5757 radio");</div><div class='del'>-</div><div class='del'>-	video_set_drvdata(tea575x_radio_inst, tea);</div><div class='del'>-</div><div class='del'>-	retval = video_register_device(tea575x_radio_inst,</div><div class='del'>-				       VFL_TYPE_RADIO, radio_nr);</div><div class='del'>-	if (retval) {</div><div class='del'>-		printk(KERN_ERR "tea575x-tuner: can't register video device!\n");</div><div class='del'>-		kfree(tea575x_radio_inst);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_tea575x_set_freq(tea);</div><div class='del'>-</div><div class='del'>-	/* mute on init */</div><div class='del'>-	if (tea-&gt;ops-&gt;mute) {</div><div class='del'>-		tea-&gt;ops-&gt;mute(tea, 1);</div><div class='del'>-		tea-&gt;mute = 1;</div><div class='del'>-	}</div><div class='del'>-	tea-&gt;vd = tea575x_radio_inst;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_tea575x_exit(struct snd_tea575x *tea)</div><div class='del'>-{</div><div class='del'>-	if (tea-&gt;vd) {</div><div class='del'>-		video_unregister_device(tea-&gt;vd);</div><div class='del'>-		tea-&gt;vd = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init alsa_tea575x_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_tea575x_module_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_tea575x_module_init)</div><div class='del'>-module_exit(alsa_tea575x_module_exit)</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(snd_tea575x_init);</div><div class='del'>-EXPORT_SYMBOL(snd_tea575x_exit);</div><div class='head'>diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c<br/>index 0e3a9f2c5297..676d58054944 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/i2c/tea6330t.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/i2c/tea6330t.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/i2c/tea6330t.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/i2c/tea6330t.c</a></div><div class='hunk'>@@ -1,27 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for control of the TEA6330T circuit via i2c bus</div><div class='ctx'>  *  Sound fader control circuit for car radios by Philips Semiconductors</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/tea6330t.h&gt;</div><div class='hunk'>@@ -70,9 +56,6 @@ int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer)</div><div class='ctx'> static void snd_tea6330t_set(struct tea6330t *tea,</div><div class='ctx'> 			     unsigned char addr, unsigned char value)</div><div class='ctx'> {</div><div class='del'>-#if 0</div><div class='del'>-	printk(KERN_DEBUG "set - 0x%x/0x%x\n", addr, value);</div><div class='del'>-#endif</div><div class='ctx'> 	snd_i2c_write(tea-&gt;bus, TEA6330T_ADDR, addr, value, 1);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -129,7 +112,8 @@ static int snd_tea6330t_put_master_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		bytes[count++] = tea-&gt;regs[TEA6330T_SADDR_VOLUME_RIGHT] = tea-&gt;mright;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (count &gt; 0) {</div><div class='del'>-		if ((err = snd_i2c_sendbytes(tea-&gt;device, bytes, count)) &lt; 0)</div><div class='add'>+		err = snd_i2c_sendbytes(tea-&gt;device, bytes, count);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			change = err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_i2c_unlock(tea-&gt;bus);</div><div class='hunk'>@@ -174,7 +158,8 @@ static int snd_tea6330t_put_master_switch(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	bytes[0] = TEA6330T_SADDR_VOLUME_LEFT;</div><div class='ctx'> 	bytes[1] = tea-&gt;regs[TEA6330T_SADDR_VOLUME_LEFT];</div><div class='ctx'> 	bytes[2] = tea-&gt;regs[TEA6330T_SADDR_VOLUME_RIGHT];</div><div class='del'>-	if ((err = snd_i2c_sendbytes(tea-&gt;device, bytes, 3)) &lt; 0)</div><div class='add'>+	err = snd_i2c_sendbytes(tea-&gt;device, bytes, 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		change = err;</div><div class='ctx'> 	snd_i2c_unlock(tea-&gt;bus);</div><div class='ctx'> 	return change;</div><div class='hunk'>@@ -221,7 +206,8 @@ static int snd_tea6330t_put_bass(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = tea-&gt;regs[TEA6330T_SADDR_BASS] != val1;</div><div class='ctx'> 	bytes[0] = TEA6330T_SADDR_BASS;</div><div class='ctx'> 	bytes[1] = tea-&gt;regs[TEA6330T_SADDR_BASS] = val1;</div><div class='del'>-	if ((err = snd_i2c_sendbytes(tea-&gt;device, bytes, 2)) &lt; 0)</div><div class='add'>+	err = snd_i2c_sendbytes(tea-&gt;device, bytes, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		change = err;</div><div class='ctx'> 	snd_i2c_unlock(tea-&gt;bus);</div><div class='ctx'> 	return change;</div><div class='hunk'>@@ -268,13 +254,14 @@ static int snd_tea6330t_put_treble(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = tea-&gt;regs[TEA6330T_SADDR_TREBLE] != val1;</div><div class='ctx'> 	bytes[0] = TEA6330T_SADDR_TREBLE;</div><div class='ctx'> 	bytes[1] = tea-&gt;regs[TEA6330T_SADDR_TREBLE] = val1;</div><div class='del'>-	if ((err = snd_i2c_sendbytes(tea-&gt;device, bytes, 2)) &lt; 0)</div><div class='add'>+	err = snd_i2c_sendbytes(tea-&gt;device, bytes, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		change = err;</div><div class='ctx'> 	snd_i2c_unlock(tea-&gt;bus);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_tea6330t_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_tea6330t_controls[] = {</div><div class='ctx'> TEA6330T_MASTER_SWITCH("Master Playback Switch", 0),</div><div class='ctx'> TEA6330T_MASTER_VOLUME("Master Playback Volume", 0),</div><div class='ctx'> TEA6330T_BASS("Tone Control - Bass", 0),</div><div class='hunk'>@@ -292,16 +279,17 @@ int snd_tea6330t_update_mixer(struct snd_card *card,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_i2c_device *device;</div><div class='ctx'> 	struct tea6330t *tea;</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='add'>+	const struct snd_kcontrol_new *knew;</div><div class='ctx'> 	unsigned int idx;</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> 	u8 default_treble, default_bass;</div><div class='ctx'> 	unsigned char bytes[7];</div><div class='ctx'> </div><div class='ctx'> 	tea = kzalloc(sizeof(*tea), GFP_KERNEL);</div><div class='ctx'> 	if (tea == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &amp;device)) &lt; 0) {</div><div class='add'>+	err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &amp;device);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		kfree(tea);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,18 +329,21 @@ int snd_tea6330t_update_mixer(struct snd_card *card,</div><div class='ctx'> 	bytes[0] = TEA6330T_SADDR_VOLUME_LEFT;</div><div class='ctx'> 	for (idx = 0; idx &lt; 6; idx++)</div><div class='ctx'> 		bytes[idx+1] = tea-&gt;regs[idx];</div><div class='del'>-	if ((err = snd_i2c_sendbytes(device, bytes, 7)) &lt; 0)</div><div class='add'>+	err = snd_i2c_sendbytes(device, bytes, 7);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __error;</div><div class='ctx'> </div><div class='ctx'> 	strcat(card-&gt;mixername, ",TEA6330T");</div><div class='del'>-	if ((err = snd_component_add(card, "TEA6330T")) &lt; 0)</div><div class='add'>+	err = snd_component_add(card, "TEA6330T");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __error;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_tea6330t_controls); idx++) {</div><div class='ctx'> 		knew = &amp;snd_tea6330t_controls[idx];</div><div class='ctx'> 		if (tea-&gt;treble == 0 &amp;&amp; !strcmp(knew-&gt;name, "Tone Control - Treble"))</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(knew, tea))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(knew, tea));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -367,19 +358,3 @@ int snd_tea6330t_update_mixer(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_tea6330t_detect);</div><div class='ctx'> EXPORT_SYMBOL(snd_tea6330t_update_mixer);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_tea6330t_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_tea6330t_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_tea6330t_init)</div><div class='del'>-module_exit(alsa_tea6330t_exit)</div><div class='head'>diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig<br/>index 52064cfa91f3..f8159179e38d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/Kconfig</a></div><div class='hunk'>@@ -1,25 +1,29 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA ISA drivers</div><div class='ctx'> </div><div class='ctx'> config SND_WSS_LIB</div><div class='del'>-        tristate</div><div class='del'>-        select SND_PCM</div><div class='add'>+	tristate</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_TIMER</div><div class='ctx'> </div><div class='ctx'> config SND_SB_COMMON</div><div class='del'>-        tristate</div><div class='add'>+	tristate</div><div class='ctx'> </div><div class='ctx'> config SND_SB8_DSP</div><div class='del'>-        tristate</div><div class='del'>-        select SND_PCM</div><div class='del'>-        select SND_SB_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_SB_COMMON</div><div class='ctx'> </div><div class='ctx'> config SND_SB16_DSP</div><div class='del'>-        tristate</div><div class='del'>-        select SND_PCM</div><div class='del'>-        select SND_SB_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_SB_COMMON</div><div class='ctx'> </div><div class='ctx'> menuconfig SND_ISA</div><div class='ctx'> 	bool "ISA sound devices"</div><div class='del'>-	depends on ISA &amp;&amp; ISA_DMA_API</div><div class='add'>+	depends on ISA || COMPILE_TEST</div><div class='add'>+	depends on ISA_DMA_API</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  Support for sound devices connected via the ISA bus.</div><div class='hunk'>@@ -42,6 +46,7 @@ config SND_AD1816A</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='add'>+	select SND_TIMER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Analog Devices SoundPort</div><div class='ctx'> 	  AD1816A or compatible sound chips.</div><div class='hunk'>@@ -117,6 +122,18 @@ config SND_AZT2320</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-azt2320.</div><div class='ctx'> </div><div class='add'>+config SND_CMI8328</div><div class='add'>+	tristate "C-Media CMI8328"</div><div class='add'>+	select SND_WSS_LIB</div><div class='add'>+	select SND_OPL3_LIB</div><div class='add'>+	select SND_MPU401_UART</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for soundcards based on the</div><div class='add'>+	  C-Media CMI8328 chip.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-cmi8328.</div><div class='add'>+</div><div class='ctx'> config SND_CMI8330</div><div class='ctx'> 	tristate "C-Media CMI8330"</div><div class='ctx'> 	select SND_WSS_LIB</div><div class='hunk'>@@ -179,7 +196,7 @@ config SND_ES18XX</div><div class='ctx'> </div><div class='ctx'> config SND_SC6000</div><div class='ctx'> 	tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16"</div><div class='del'>-	depends on HAS_IOPORT</div><div class='add'>+	depends on HAS_IOPORT_MAP</div><div class='ctx'> 	select SND_WSS_LIB</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='hunk'>@@ -197,6 +214,7 @@ config SND_GUSCLASSIC</div><div class='ctx'> 	tristate "Gravis UltraSound Classic"</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_PCM</div><div class='add'>+	select SND_TIMER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Gravis UltraSound Classic</div><div class='ctx'> 	  soundcards.</div><div class='hunk'>@@ -209,6 +227,7 @@ config SND_GUSEXTREME</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='add'>+	select SND_TIMER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Gravis UltraSound Extreme</div><div class='ctx'> 	  soundcards.</div><div class='hunk'>@@ -361,6 +380,7 @@ config SND_SBAWE</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_SB16_DSP</div><div class='add'>+	select SND_SEQ_DEVICE if SND_SEQUENCER != n</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Sound Blaster AWE soundcards</div><div class='ctx'> 	  (including the Plug and Play version).</div><div class='hunk'>@@ -368,6 +388,13 @@ config SND_SBAWE</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-sbawe.</div><div class='ctx'> </div><div class='add'>+# select SEQ stuff to min(SND_SEQUENCER,SND_XXX)</div><div class='add'>+config SND_SBAWE_SEQ</div><div class='add'>+	def_tristate SND_SEQUENCER &amp;&amp; SND_SBAWE</div><div class='add'>+	select SND_SEQ_MIDI_EMUL</div><div class='add'>+	select SND_SEQ_VIRMIDI</div><div class='add'>+	select SND_SYNTH_EMUX</div><div class='add'>+</div><div class='ctx'> config SND_SB16_CSP</div><div class='ctx'> 	bool "Sound Blaster 16/AWE CSP support"</div><div class='ctx'> 	depends on (SND_SB16 || SND_SBAWE) &amp;&amp; (BROKEN || !PPC)</div><div class='hunk'>@@ -413,7 +440,7 @@ config SND_WAVEFRONT</div><div class='ctx'> </div><div class='ctx'> config SND_MSND_PINNACLE</div><div class='ctx'> 	tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"</div><div class='del'>-	depends on X86 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on X86</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='hunk'>@@ -426,7 +453,7 @@ config SND_MSND_PINNACLE</div><div class='ctx'> </div><div class='ctx'> config SND_MSND_CLASSIC</div><div class='ctx'> 	tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"</div><div class='del'>-	depends on X86 &amp;&amp; EXPERIMENTAL</div><div class='add'>+	depends on X86</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='hunk'>@@ -434,7 +461,7 @@ config SND_MSND_CLASSIC</div><div class='ctx'> 	  Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or</div><div class='ctx'> 	  Monterey (not for the Pinnacle or Fiji).</div><div class='ctx'> </div><div class='del'>-	  See &lt;file:Documentation/sound/oss/MultiSound&gt; for important information</div><div class='add'>+	  See &lt;file:Documentation/sound/cards/multisound.sh&gt; for important information</div><div class='ctx'> 	  about this driver.  Note that it has been discontinued, but the</div><div class='ctx'> 	  Voyetra Turtle Beach knowledge base entry for it is still available</div><div class='ctx'> 	  at &lt;http://www.turtlebeach.com/site/kb_ftp/790.asp&gt;.</div><div class='head'>diff --git a/sound/isa/Makefile b/sound/isa/Makefile<br/>index 8d781e419e2e..2135d68a15ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/Makefile</a></div><div class='hunk'>@@ -1,21 +1,24 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-adlib-objs := adlib.o</div><div class='del'>-snd-als100-objs := als100.o</div><div class='del'>-snd-azt2320-objs := azt2320.o</div><div class='del'>-snd-cmi8330-objs := cmi8330.o</div><div class='del'>-snd-es18xx-objs := es18xx.o</div><div class='del'>-snd-opl3sa2-objs := opl3sa2.o</div><div class='del'>-snd-sc6000-objs := sc6000.o</div><div class='del'>-snd-sscape-objs := sscape.o</div><div class='add'>+snd-adlib-y := adlib.o</div><div class='add'>+snd-als100-y := als100.o</div><div class='add'>+snd-azt2320-y := azt2320.o</div><div class='add'>+snd-cmi8328-y := cmi8328.o</div><div class='add'>+snd-cmi8330-y := cmi8330.o</div><div class='add'>+snd-es18xx-y := es18xx.o</div><div class='add'>+snd-opl3sa2-y := opl3sa2.o</div><div class='add'>+snd-sc6000-y := sc6000.o</div><div class='add'>+snd-sscape-y := sscape.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_ADLIB) += snd-adlib.o</div><div class='ctx'> obj-$(CONFIG_SND_ALS100) += snd-als100.o</div><div class='ctx'> obj-$(CONFIG_SND_AZT2320) += snd-azt2320.o</div><div class='add'>+obj-$(CONFIG_SND_CMI8328) += snd-cmi8328.o</div><div class='ctx'> obj-$(CONFIG_SND_CMI8330) += snd-cmi8330.o</div><div class='ctx'> obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o</div><div class='ctx'> obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o</div><div class='head'>diff --git a/sound/isa/ad1816a/Makefile b/sound/isa/ad1816a/Makefile<br/>index 487ab23860e3..573325228534 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/ad1816a/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ad1816a-objs := ad1816a.o ad1816a_lib.o</div><div class='add'>+snd-ad1816a-y := ad1816a.o ad1816a_lib.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_AD1816A) += snd-ad1816a.o</div><div class='head'>diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c<br/>index 3cb75bc97699..8e84d4091f1e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/ad1816a.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/ad1816a.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/ad1816a.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/ad1816a/ad1816a.c</a></div><div class='hunk'>@@ -1,50 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>     card-ad1816a.c - driver for ADI SoundPort AD1816A based soundcards.</div><div class='ctx'>     Copyright (C) 2000 by Massimo Piccioni &lt;dafastidio@libero.it&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/ad1816a.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "ad1816a: "</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Massimo Piccioni &lt;dafastidio@libero.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("AD1816A, AD1815");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Highscreen,Sound-Boostar 16 3D},"</div><div class='del'>-		"{Analog Devices,AD1815},"</div><div class='del'>-		"{Analog Devices,AD1816A},"</div><div class='del'>-		"{TerraTec,Base 64},"</div><div class='del'>-		"{TerraTec,AudioSystem EWS64S},"</div><div class='del'>-		"{Aztech/Newcom SC-16 3D},"</div><div class='del'>-		"{Shark Predator ISA}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 1-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='hunk'>@@ -63,15 +42,10 @@ MODULE_PARM_DESC(enable, "Enable ad1816a based soundcard.");</div><div class='ctx'> module_param_array(clockfreq, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0).");</div><div class='ctx'> </div><div class='del'>-struct snd_card_ad1816a {</div><div class='del'>-	struct pnp_dev *dev;</div><div class='del'>-	struct pnp_dev *devmpu;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pnp_card_device_id snd_ad1816a_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_ad1816a_pnpids[] = {</div><div class='ctx'> 	/* Analog Devices AD1815 */</div><div class='ctx'> 	{ .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } },</div><div class='del'>-	/* Analog Device AD1816? */</div><div class='add'>+	/* Analog Devices AD1816? */</div><div class='ctx'> 	{ .id = "ADS7180", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },</div><div class='ctx'> 	/* Analog Devices AD1816A - added by Kenneth Platz &lt;kxp@atl.hp.com&gt; */</div><div class='ctx'> 	{ .id = "ADS7181", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },</div><div class='hunk'>@@ -99,28 +73,19 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids);</div><div class='ctx'> #define	DRIVER_NAME	"snd-card-ad1816a"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acard,</div><div class='del'>-					  struct pnp_card_link *card,</div><div class='del'>-					  const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,</div><div class='add'>+				const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	acard-&gt;dev = pnp_request_card_device(card, id-&gt;devs[0].id, NULL);</div><div class='del'>-	if (acard-&gt;dev == NULL)</div><div class='add'>+	pdev = pnp_request_card_device(card, id-&gt;devs[0].id, NULL);</div><div class='add'>+	if (pdev == NULL)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	acard-&gt;devmpu = pnp_request_card_device(card, id-&gt;devs[1].id, NULL);</div><div class='del'>-	if (acard-&gt;devmpu == NULL) {</div><div class='del'>-		mpu_port[dev] = -1;</div><div class='del'>-		snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdev = acard-&gt;dev;</div><div class='del'>-</div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "AUDIO PnP configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "AUDIO PnP configure failure\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -130,16 +95,17 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar</div><div class='ctx'> 	dma2[dev] = pnp_dma(pdev, 1);</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='ctx'> </div><div class='del'>-	if (acard-&gt;devmpu == NULL)</div><div class='add'>+	pdev = pnp_request_card_device(card, id-&gt;devs[1].id, NULL);</div><div class='add'>+	if (pdev == NULL) {</div><div class='add'>+		mpu_port[dev] = -1;</div><div class='add'>+		pr_warn("MPU401 device busy, skipping.\n");</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	pdev = acard-&gt;devmpu;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "MPU401 PnP configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "MPU401 PnP configure failure\n");</div><div class='ctx'> 		mpu_port[dev] = -1;</div><div class='del'>-		acard-&gt;devmpu = NULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mpu_port[dev] = pnp_port_start(pdev, 0);</div><div class='ctx'> 		mpu_irq[dev] = pnp_irq(pdev, 0);</div><div class='hunk'>@@ -148,93 +114,84 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,</div><div class='del'>-					    const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,</div><div class='add'>+				  const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct snd_card_ad1816a *acard;</div><div class='ctx'> 	struct snd_ad1816a *chip;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='del'>-	struct snd_timer *timer;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_card_ad1816a), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				  index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_ad1816a), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	acard = card-&gt;private_data;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_ad1816a_pnp(dev, pcard, pid);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if ((error = snd_ad1816a_create(card, port[dev],</div><div class='del'>-					irq[dev],</div><div class='del'>-					dma1[dev],</div><div class='del'>-					dma2[dev],</div><div class='del'>-					&amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+</div><div class='add'>+	error = snd_ad1816a_create(card, port[dev],</div><div class='add'>+				   irq[dev],</div><div class='add'>+				   dma1[dev],</div><div class='add'>+				   dma2[dev],</div><div class='add'>+				   chip);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	if (clockfreq[dev] &gt;= 5000 &amp;&amp; clockfreq[dev] &lt;= 100000)</div><div class='ctx'> 		chip-&gt;clock_freq = clockfreq[dev];</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "AD1816A");</div><div class='del'>-	strcpy(card-&gt;shortname, "ADI SoundPort AD1816A");</div><div class='add'>+	strscpy(card-&gt;driver, "AD1816A");</div><div class='add'>+	strscpy(card-&gt;shortname, "ADI SoundPort AD1816A");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s, SS at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;port, irq[dev], dma1[dev], dma2[dev]);</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_ad1816a_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_ad1816a_pcm(chip, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_ad1816a_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_ad1816a_mixer(chip);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	error = snd_ad1816a_timer(chip, 0, &amp;timer);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_ad1816a_timer(chip, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[dev] &gt; 0) {</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-					mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,</div><div class='add'>+					mpu_port[dev], 0, mpu_irq[dev],</div><div class='ctx'> 					NULL) &lt; 0)</div><div class='del'>-			printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);</div><div class='add'>+			dev_err(card-&gt;dev, "no MPU-401 device at 0x%lx.\n",</div><div class='add'>+				mpu_port[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port[dev] &gt; 0) {</div><div class='ctx'> 		if (snd_opl3_create(card,</div><div class='ctx'> 				    fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", fm_port[dev], fm_port[dev] + 2);</div><div class='add'>+			dev_err(card-&gt;dev, "no OPL device at 0x%lx-0x%lx.\n",</div><div class='add'>+				fm_port[dev], fm_port[dev] + 2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='del'>-			if (error &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			if (error &lt; 0)</div><div class='ctx'> 				return error;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_register(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinitdata ad1816a_devices;</div><div class='add'>+static unsigned int ad1816a_devices;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,</div><div class='del'>-					    const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,</div><div class='add'>+				  const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -252,19 +209,36 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,</div><div class='ctx'>         return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_ad1816a_pnp_remove(struct pnp_card_link * pcard)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int snd_ad1816a_pnp_suspend(struct pnp_card_link *pcard,</div><div class='add'>+				   pm_message_t state)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='add'>+	struct snd_card *card = pnp_get_card_drvdata(pcard);</div><div class='add'>+</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+	snd_ad1816a_suspend(card-&gt;private_data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ad1816a_pnp_resume(struct pnp_card_link *pcard)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = pnp_get_card_drvdata(pcard);</div><div class='add'>+</div><div class='add'>+	snd_ad1816a_resume(card-&gt;private_data);</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct pnp_card_driver ad1816a_pnpc_driver = {</div><div class='ctx'> 	.flags		= PNP_DRIVER_RES_DISABLE,</div><div class='ctx'> 	.name		= "ad1816a",</div><div class='ctx'> 	.id_table	= snd_ad1816a_pnpids,</div><div class='ctx'> 	.probe		= snd_ad1816a_pnp_detect,</div><div class='del'>-	.remove		= __devexit_p(snd_ad1816a_pnp_remove),</div><div class='del'>-	/* FIXME: suspend/resume */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= snd_ad1816a_pnp_suspend,</div><div class='add'>+	.resume		= snd_ad1816a_pnp_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_card_ad1816a_init(void)</div><div class='hunk'>@@ -278,7 +252,7 @@ static int __init alsa_card_ad1816a_init(void)</div><div class='ctx'> 	if (!ad1816a_devices) {</div><div class='ctx'> 		pnp_unregister_card_driver(&amp;ad1816a_pnpc_driver);</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		printk(KERN_ERR "no AD1816A based soundcards found.\n");</div><div class='add'>+		pr_err("no AD1816A based soundcards found.\n");</div><div class='ctx'> #endif	/* MODULE */</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c<br/>index 05aef8b97e96..50f62304de61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/ad1816a_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1816a/ad1816a_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1816a/ad1816a_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/ad1816a/ad1816a_lib.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>     ad1816a.c - lowlevel code for Analog Devices AD1816A chip.</div><div class='ctx'>     Copyright (C) 1999-2000 by Massimo Piccioni &lt;dafastidio@libero.it&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -22,11 +10,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> #include &lt;sound/ad1816a.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)</div><div class='hunk'>@@ -37,7 +25,7 @@ static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)</div><div class='ctx'> 		if (inb(AD1816A_REG(AD1816A_CHIP_STATUS)) &amp; AD1816A_READY)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_WARNING "chip busy.\n");</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "chip busy.\n");</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +73,8 @@ static void snd_ad1816a_write_mask(struct snd_ad1816a *chip, unsigned char reg,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static unsigned char snd_ad1816a_get_format(struct snd_ad1816a *chip,</div><div class='del'>-					    unsigned int format, int channels)</div><div class='add'>+					    snd_pcm_format_t format,</div><div class='add'>+					    int channels)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char retval = AD1816A_FMT_LINEAR_8;</div><div class='ctx'> </div><div class='hunk'>@@ -107,14 +96,10 @@ static unsigned char snd_ad1816a_get_format(struct snd_ad1816a *chip,</div><div class='ctx'> </div><div class='ctx'> static int snd_ad1816a_open(struct snd_ad1816a *chip, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;mode &amp; mode) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	if (chip-&gt;mode &amp; mode)</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	switch ((mode &amp;= AD1816A_MODE_OPEN)) {</div><div class='ctx'> 	case AD1816A_MODE_PLAYBACK:</div><div class='hunk'>@@ -137,15 +122,12 @@ static int snd_ad1816a_open(struct snd_ad1816a *chip, unsigned int mode)</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;mode |= mode;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ad1816a_close(struct snd_ad1816a *chip, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch ((mode &amp;= AD1816A_MODE_OPEN)) {</div><div class='ctx'> 	case AD1816A_MODE_PLAYBACK:</div><div class='hunk'>@@ -166,10 +148,9 @@ static void snd_ad1816a_close(struct snd_ad1816a *chip, unsigned int mode)</div><div class='ctx'> 		snd_ad1816a_write_mask(chip, AD1816A_INTERRUPT_ENABLE,</div><div class='ctx'> 			AD1816A_TIMER_IRQ_ENABLE, 0x0000);</div><div class='ctx'> 	}</div><div class='del'>-	if (!((chip-&gt;mode &amp;= ~mode) &amp; AD1816A_MODE_OPEN))</div><div class='add'>+	chip-&gt;mode &amp;= ~mode;</div><div class='add'>+	if (!(chip-&gt;mode &amp; AD1816A_MODE_OPEN))</div><div class='ctx'> 		chip-&gt;mode = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -181,22 +162,22 @@ static int snd_ad1816a_trigger(struct snd_ad1816a *chip, unsigned char what,</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-		cmd = (cmd == SNDRV_PCM_TRIGGER_START) ? 0xff: 0x00;</div><div class='del'>-		/* if (what &amp; AD1816A_PLAYBACK_ENABLE) */</div><div class='del'>-		/* That is not valid, because playback and capture enable</div><div class='del'>-		 * are the same bit pattern, just to different addresses</div><div class='del'>-		 */</div><div class='del'>-		if (! iscapture)</div><div class='del'>-			snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,</div><div class='del'>-				AD1816A_PLAYBACK_ENABLE, cmd);</div><div class='del'>-		else</div><div class='del'>-			snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG,</div><div class='del'>-				AD1816A_CAPTURE_ENABLE, cmd);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;lock) {</div><div class='add'>+			cmd = (cmd == SNDRV_PCM_TRIGGER_START) ? 0xff: 0x00;</div><div class='add'>+			/* if (what &amp; AD1816A_PLAYBACK_ENABLE) */</div><div class='add'>+			/* That is not valid, because playback and capture enable</div><div class='add'>+			 * are the same bit pattern, just to different addresses</div><div class='add'>+			 */</div><div class='add'>+			if (!iscapture)</div><div class='add'>+				snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,</div><div class='add'>+						     AD1816A_PLAYBACK_ENABLE, cmd);</div><div class='add'>+			else</div><div class='add'>+				snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG,</div><div class='add'>+						     AD1816A_CAPTURE_ENABLE, cmd);</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "invalid trigger mode 0x%x.\n", what);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "invalid trigger mode 0x%x.\n", what);</div><div class='ctx'> 		error = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -217,25 +198,13 @@ static int snd_ad1816a_capture_trigger(struct snd_pcm_substream *substream, int</div><div class='ctx'> 				   SNDRV_PCM_STREAM_CAPTURE, cmd, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ad1816a_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ad1816a_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int size, rate;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;p_dma_size = size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,</div><div class='hunk'>@@ -255,19 +224,16 @@ static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	snd_ad1816a_write(chip, AD1816A_PLAYBACK_BASE_COUNT,</div><div class='ctx'> 		snd_pcm_lib_period_bytes(substream) / 4 - 1);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ad1816a_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int size, rate;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;c_dma_size = size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	snd_ad1816a_out_mask(chip, AD1816A_CAPTURE_CONFIG,</div><div class='hunk'>@@ -287,8 +253,6 @@ static int snd_ad1816a_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	snd_ad1816a_write(chip, AD1816A_CAPTURE_BASE_COUNT,</div><div class='ctx'> 		snd_pcm_lib_period_bytes(substream) / 4 - 1);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,9 +283,9 @@ static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct snd_ad1816a *chip = dev_id;</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-	status = snd_ad1816a_in(chip, AD1816A_INTERRUPT_STATUS);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;lock) {</div><div class='add'>+		status = snd_ad1816a_in(chip, AD1816A_INTERRUPT_STATUS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((status &amp; AD1816A_PLAYBACK_IRQ_PENDING) &amp;&amp; chip-&gt;playback_substream)</div><div class='ctx'> 		snd_pcm_period_elapsed(chip-&gt;playback_substream);</div><div class='hunk'>@@ -332,14 +296,14 @@ static irqreturn_t snd_ad1816a_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if ((status &amp; AD1816A_TIMER_IRQ_PENDING) &amp;&amp; chip-&gt;timer)</div><div class='ctx'> 		snd_timer_interrupt(chip-&gt;timer, chip-&gt;timer-&gt;sticks);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-	snd_ad1816a_out(chip, AD1816A_INTERRUPT_STATUS, 0x00);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;lock) {</div><div class='add'>+		snd_ad1816a_out(chip, AD1816A_INTERRUPT_STATUS, 0x00);</div><div class='add'>+	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ad1816a_playback = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ad1816a_playback = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='ctx'> 	.formats =		(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |</div><div class='hunk'>@@ -358,7 +322,7 @@ static struct snd_pcm_hardware snd_ad1816a_playback = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ad1816a_capture = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ad1816a_capture = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='ctx'> 	.formats =		(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |</div><div class='hunk'>@@ -402,9 +366,9 @@ static unsigned long snd_ad1816a_timer_resolution(struct snd_timer *timer)</div><div class='ctx'> static int snd_ad1816a_timer_start(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short bits;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	bits = snd_ad1816a_read(chip, AD1816A_INTERRUPT_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	if (!(bits &amp; AD1816A_TIMER_ENABLE)) {</div><div class='hunk'>@@ -414,24 +378,20 @@ static int snd_ad1816a_timer_start(struct snd_timer *timer)</div><div class='ctx'> 		snd_ad1816a_write_mask(chip, AD1816A_INTERRUPT_ENABLE,</div><div class='ctx'> 			AD1816A_TIMER_ENABLE, 0xffff);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ad1816a_timer_stop(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	snd_ad1816a_write_mask(chip, AD1816A_INTERRUPT_ENABLE,</div><div class='ctx'> 		AD1816A_TIMER_ENABLE, 0x0000);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_ad1816a_timer_table = {</div><div class='add'>+static const struct snd_timer_hardware snd_ad1816a_timer_table = {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_AUTO,</div><div class='ctx'> 	.resolution =	10000,</div><div class='ctx'> 	.ticks =	65535,</div><div class='hunk'>@@ -448,7 +408,8 @@ static int snd_ad1816a_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_ad1816a_open(chip, AD1816A_MODE_PLAYBACK)) &lt; 0)</div><div class='add'>+	error = snd_ad1816a_open(chip, AD1816A_MODE_PLAYBACK);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	runtime-&gt;hw = snd_ad1816a_playback;</div><div class='ctx'> 	snd_pcm_limit_isa_dma_size(chip-&gt;dma1, &amp;runtime-&gt;hw.buffer_bytes_max);</div><div class='hunk'>@@ -463,7 +424,8 @@ static int snd_ad1816a_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_ad1816a_open(chip, AD1816A_MODE_CAPTURE)) &lt; 0)</div><div class='add'>+	error = snd_ad1816a_open(chip, AD1816A_MODE_CAPTURE);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	runtime-&gt;hw = snd_ad1816a_capture;</div><div class='ctx'> 	snd_pcm_limit_isa_dma_size(chip-&gt;dma2, &amp;runtime-&gt;hw.buffer_bytes_max);</div><div class='hunk'>@@ -491,11 +453,9 @@ static int snd_ad1816a_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip)</div><div class='add'>+static void snd_ad1816a_init(struct snd_ad1816a *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	snd_ad1816a_out(chip, AD1816A_INTERRUPT_STATUS, 0x00);</div><div class='ctx'> 	snd_ad1816a_out_mask(chip, AD1816A_PLAYBACK_CONFIG,</div><div class='hunk'>@@ -507,15 +467,32 @@ static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip)</div><div class='ctx'> 		AD1816A_CAPTURE_NOT_EQUAL | AD1816A_WSS_ENABLE, 0xffff);</div><div class='ctx'> 	snd_ad1816a_write(chip, AD1816A_DSP_CONFIG, 0x0000);</div><div class='ctx'> 	snd_ad1816a_write(chip, AD1816A_POWERDOWN_CTRL, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+void snd_ad1816a_suspend(struct snd_ad1816a *chip)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='add'>+	for (reg = 0; reg &lt; 48; reg++)</div><div class='add'>+		chip-&gt;image[reg] = snd_ad1816a_read(chip, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip)</div><div class='add'>+void snd_ad1816a_resume(struct snd_ad1816a *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	int reg;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	snd_ad1816a_init(chip);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='add'>+	for (reg = 0; reg &lt; 48; reg++)</div><div class='add'>+		snd_ad1816a_write(chip, reg, chip-&gt;image[reg]);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int snd_ad1816a_probe(struct snd_ad1816a *chip)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;version = snd_ad1816a_read(chip, AD1816A_VERSION_ID)) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -530,86 +507,51 @@ static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip)</div><div class='ctx'> 	default:</div><div class='ctx'> 		chip-&gt;hardware = AD1816A_HW_AUTO;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ad1816a_free(struct snd_ad1816a *chip)</div><div class='del'>-{</div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, (void *) chip);</div><div class='del'>-	if (chip-&gt;dma1 &gt;= 0) {</div><div class='del'>-		snd_dma_disable(chip-&gt;dma1);</div><div class='del'>-		free_dma(chip-&gt;dma1);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;dma2 &gt;= 0) {</div><div class='del'>-		snd_dma_disable(chip-&gt;dma2);</div><div class='del'>-		free_dma(chip-&gt;dma2);</div><div class='del'>-	}</div><div class='del'>-	kfree(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ad1816a_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_ad1816a *chip = device-&gt;device_data;</div><div class='del'>-	return snd_ad1816a_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)</div><div class='add'>+static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)</div><div class='ctx'> {</div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='ctx'> 	case AD1816A_HW_AD1816A: return "AD1816A";</div><div class='ctx'> 	case AD1816A_HW_AD1815:	return "AD1815";</div><div class='ctx'> 	case AD1816A_HW_AD18MAX10: return "AD18max10";</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "Unknown chip version %d:%d.\n",</div><div class='del'>-			chip-&gt;version, chip-&gt;hardware);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "Unknown chip version %d:%d.\n",</div><div class='add'>+			 chip-&gt;version, chip-&gt;hardware);</div><div class='ctx'> 		return "AD1816A - unknown";</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ad1816a_create(struct snd_card *card,</div><div class='del'>-				 unsigned long port, int irq, int dma1, int dma2,</div><div class='del'>-				 struct snd_ad1816a **rchip)</div><div class='add'>+int snd_ad1816a_create(struct snd_card *card,</div><div class='add'>+		       unsigned long port, int irq, int dma1, int dma2,</div><div class='add'>+		       struct snd_ad1816a *chip)</div><div class='ctx'> {</div><div class='del'>-        static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_ad1816a_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	int error;</div><div class='del'>-	struct snd_ad1816a *chip;</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	chip-&gt;dma1 = -1;</div><div class='ctx'> 	chip-&gt;dma2 = -1;</div><div class='ctx'> </div><div class='del'>-	if ((chip-&gt;res_port = request_region(port, 16, "AD1816A")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "ad1816a: can't grab port 0x%lx\n", port);</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='add'>+	chip-&gt;res_port = devm_request_region(card-&gt;dev, port, 16, "AD1816A");</div><div class='add'>+	if (!chip-&gt;res_port) {</div><div class='add'>+		dev_err(card-&gt;dev, "ad1816a: can't grab port 0x%lx\n", port);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, irq, snd_ad1816a_interrupt, 0,</div><div class='add'>+			     "AD1816A", (void *) chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "ad1816a: can't grab IRQ %d\n", irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='del'>-	if (request_dma(dma1, "AD1816A - 1")) {</div><div class='del'>-		snd_printk(KERN_ERR "ad1816a: can't grab DMA1 %d\n", dma1);</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	if (snd_devm_request_dma(card-&gt;dev, dma1, "AD1816A - 1")) {</div><div class='add'>+		dev_err(card-&gt;dev, "ad1816a: can't grab DMA1 %d\n", dma1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma1 = dma1;</div><div class='del'>-	if (request_dma(dma2, "AD1816A - 2")) {</div><div class='del'>-		snd_printk(KERN_ERR "ad1816a: can't grab DMA2 %d\n", dma2);</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='add'>+	if (snd_devm_request_dma(card-&gt;dev, dma2, "AD1816A - 2")) {</div><div class='add'>+		dev_err(card-&gt;dev, "ad1816a: can't grab DMA2 %d\n", dma2);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma2 = dma2;</div><div class='hunk'>@@ -618,51 +560,38 @@ int __devinit snd_ad1816a_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;port = port;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_ad1816a_probe(chip))) {</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='add'>+	error = snd_ad1816a_probe(chip);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_ad1816a_init(chip);</div><div class='ctx'> </div><div class='del'>-	/* Register device */</div><div class='del'>-	if ((error = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_ad1816a_free(chip);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ad1816a_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ad1816a_playback_ops = {</div><div class='ctx'> 	.open =		snd_ad1816a_playback_open,</div><div class='ctx'> 	.close =	snd_ad1816a_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ad1816a_hw_params,</div><div class='del'>-	.hw_free =	snd_ad1816a_hw_free,</div><div class='ctx'> 	.prepare =	snd_ad1816a_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_ad1816a_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_ad1816a_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ad1816a_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ad1816a_capture_ops = {</div><div class='ctx'> 	.open =		snd_ad1816a_capture_open,</div><div class='ctx'> 	.close =	snd_ad1816a_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ad1816a_hw_params,</div><div class='del'>-	.hw_free =	snd_ad1816a_hw_free,</div><div class='ctx'> 	.prepare =	snd_ad1816a_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_ad1816a_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_ad1816a_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)</div><div class='add'>+int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_pcm_new(chip-&gt;card, "AD1816A", device, 1, 1, &amp;pcm)))</div><div class='add'>+	error = snd_pcm_new(chip-&gt;card, "AD1816A", device, 1, 1, &amp;pcm);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_ad1816a_playback_ops);</div><div class='hunk'>@@ -671,20 +600,17 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = (chip-&gt;dma1 == chip-&gt;dma2 ) ? SNDRV_PCM_INFO_JOINT_DUPLEX : 0;</div><div class='ctx'> </div><div class='del'>-	strcpy(pcm-&gt;name, snd_ad1816a_chip_id(chip));</div><div class='add'>+	strscpy(pcm-&gt;name, snd_ad1816a_chip_id(chip));</div><div class='ctx'> 	snd_ad1816a_init(chip);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, chip-&gt;card-&gt;dev,</div><div class='add'>+				       64*1024, chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer)</div><div class='add'>+int snd_ad1816a_timer(struct snd_ad1816a *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='hunk'>@@ -695,14 +621,13 @@ int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd</div><div class='ctx'> 	tid.card = chip-&gt;card-&gt;number;</div><div class='ctx'> 	tid.device = device;</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='del'>-	if ((error = snd_timer_new(chip-&gt;card, "AD1816A", &amp;tid, &amp;timer)) &lt; 0)</div><div class='add'>+	error = snd_timer_new(chip-&gt;card, "AD1816A", &amp;tid, &amp;timer);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	strcpy(timer-&gt;name, snd_ad1816a_chip_id(chip));</div><div class='add'>+	strscpy(timer-&gt;name, snd_ad1816a_chip_id(chip));</div><div class='ctx'> 	timer-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;timer = timer;</div><div class='ctx'> 	timer-&gt;hw = snd_ad1816a_timer_table;</div><div class='del'>-	if (rtimer)</div><div class='del'>-		*rtimer = timer;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,29 +637,21 @@ int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd</div><div class='ctx'> </div><div class='ctx'> static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[8] = {</div><div class='add'>+	static const char * const texts[8] = {</div><div class='ctx'> 		"Line", "Mix", "CD", "Synth", "Video",</div><div class='ctx'> 		"Mic", "Phone",</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 2;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 7;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 6)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 6;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 2, 7, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	val = snd_ad1816a_read(chip, AD1816A_ADC_SOURCE_SEL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = (val &gt;&gt; 12) &amp; 7;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[1] = (val &gt;&gt; 4) &amp; 7;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -743,7 +660,6 @@ static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> static int snd_ad1816a_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	</div><div class='hunk'>@@ -752,10 +668,9 @@ static int snd_ad1816a_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	val = (ucontrol-&gt;value.enumerated.item[0] &lt;&lt; 12) |</div><div class='ctx'> 	      (ucontrol-&gt;value.enumerated.item[1] &lt;&lt; 4);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	change = snd_ad1816a_read(chip, AD1816A_ADC_SOURCE_SEL) != val;</div><div class='ctx'> 	snd_ad1816a_write(chip, AD1816A_ADC_SOURCE_SEL, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -785,15 +700,13 @@ static int snd_ad1816a_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_ad1816a_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (snd_ad1816a_read(chip, reg) &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -802,7 +715,6 @@ static int snd_ad1816a_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_ad1816a_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -814,12 +726,11 @@ static int snd_ad1816a_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	old_val = snd_ad1816a_read(chip, reg);</div><div class='ctx'> 	val = (old_val &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != old_val;</div><div class='ctx'> 	snd_ad1816a_write(chip, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -850,7 +761,6 @@ static int snd_ad1816a_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_ad1816a_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0x0f;</div><div class='ctx'> 	int shift_right = (kcontrol-&gt;private_value &gt;&gt; 12) &amp; 0x0f;</div><div class='hunk'>@@ -858,11 +768,10 @@ static int snd_ad1816a_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	val = snd_ad1816a_read(chip, reg);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (val &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (val &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='hunk'>@@ -873,7 +782,6 @@ static int snd_ad1816a_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_ad1816a_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ad1816a *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0x0f;</div><div class='ctx'> 	int shift_right = (kcontrol-&gt;private_value &gt;&gt; 12) &amp; 0x0f;</div><div class='hunk'>@@ -890,12 +798,11 @@ static int snd_ad1816a_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	old_val = snd_ad1816a_read(chip, reg);</div><div class='ctx'> 	val1 = (old_val &amp; ~((mask &lt;&lt; shift_left) | (mask &lt;&lt; shift_right))) | val1 | val2;</div><div class='ctx'> 	change = val1 != old_val;</div><div class='ctx'> 	snd_ad1816a_write(chip, reg, val1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -905,7 +812,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ad1816a_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ad1816a_controls[] = {</div><div class='ctx'> AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),</div><div class='ctx'> AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,</div><div class='ctx'> 		   db_scale_5bit),</div><div class='hunk'>@@ -951,7 +858,7 @@ AD1816A_SINGLE("3D Control - Switch", AD1816A_3D_PHAT_CTRL, 15, 1, 1),</div><div class='ctx'> AD1816A_SINGLE("3D Control - Level", AD1816A_3D_PHAT_CTRL, 0, 15, 0),</div><div class='ctx'> };</div><div class='ctx'>                                         </div><div class='del'>-int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)</div><div class='add'>+int snd_ad1816a_mixer(struct snd_ad1816a *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	unsigned int idx;</div><div class='hunk'>@@ -962,10 +869,11 @@ int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)</div><div class='ctx'> </div><div class='ctx'> 	card = chip-&gt;card;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, snd_ad1816a_chip_id(chip));</div><div class='add'>+	strscpy(card-&gt;mixername, snd_ad1816a_chip_id(chip));</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ad1816a_controls); idx++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ad1816a_controls[idx], chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ad1816a_controls[idx], chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/isa/ad1848/Makefile b/sound/isa/ad1848/Makefile<br/>index 3d6dea3ff927..5fdfc1c9f059 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1848/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1848/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1848/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/ad1848/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ad1848-objs := ad1848.o</div><div class='add'>+snd-ad1848-y := ad1848.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_AD1848) += snd-ad1848.o</div><div class='head'>diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c<br/>index 4beeb6f98e0e..401d8df28d87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1848/ad1848.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/ad1848/ad1848.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/ad1848/ad1848.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/ad1848/ad1848.c</a></div><div class='hunk'>@@ -1,24 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Generic driver for AD1848/AD1847/CS4248 chips (0.1 Alpha)</div><div class='ctx'>  *  Copyright (c) by Tugrul Galatali &lt;galatalt@stuy.edu&gt;,</div><div class='ctx'>  *                   Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Based on card-4232.c by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -37,17 +22,14 @@</div><div class='ctx'> MODULE_DESCRIPTION(CRD_NAME);</div><div class='ctx'> MODULE_AUTHOR("Tugrul Galatali &lt;galatalt@stuy.edu&gt;, Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1848},"</div><div class='del'>-	        "{Analog Devices,AD1847},"</div><div class='del'>-		"{Crystal Semiconductors,CS4248}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 5,7,9,11,12,15 */</div><div class='ctx'> static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	/* 0,1,3,5,6,7 */</div><div class='del'>-static int thinkpad[SNDRV_CARDS];			/* Thinkpad special case */</div><div class='add'>+static bool thinkpad[SNDRV_CARDS];			/* Thinkpad special case */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");</div><div class='hunk'>@@ -55,16 +37,16 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");</div><div class='ctx'> module_param_array(thinkpad, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_ad1848_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[n])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -84,14 +66,13 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_ad1848_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -99,44 +80,36 @@ static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 			thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,</div><div class='ctx'> 			0, &amp;chip);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_pcm(chip, 0, &amp;pcm);</div><div class='add'>+	error = snd_wss_pcm(chip, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_wss_mixer(chip);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	strcpy(card-&gt;driver, "AD1848");</div><div class='del'>-	strcpy(card-&gt;shortname, pcm-&gt;name);</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d",</div><div class='del'>-		pcm-&gt;name, chip-&gt;port, irq[n], dma1[n]);</div><div class='del'>-	if (thinkpad[n])</div><div class='del'>-		strcat(card-&gt;longname, " [Thinkpad]");</div><div class='add'>+	strscpy(card-&gt;driver, "AD1848", sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;pcm-&gt;name, sizeof(card-&gt;shortname));</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='add'>+	if (!thinkpad[n])</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %d, dma %d",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[n], dma1[n]);</div><div class='add'>+	else</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %d, dma %d [Thinkpad]",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[n], dma1[n]);</div><div class='ctx'> </div><div class='ctx'> 	error = snd_card_register(card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -164,7 +137,6 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_ad1848_driver = {</div><div class='ctx'> 	.match		= snd_ad1848_match,</div><div class='ctx'> 	.probe		= snd_ad1848_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_ad1848_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_ad1848_suspend,</div><div class='ctx'> 	.resume		= snd_ad1848_resume,</div><div class='hunk'>@@ -174,15 +146,4 @@ static struct isa_driver snd_ad1848_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_ad1848_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_ad1848_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_ad1848_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_ad1848_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ad1848_init);</div><div class='del'>-module_exit(alsa_card_ad1848_exit);</div><div class='add'>+module_isa_driver(snd_ad1848_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c<br/>index 7465ae036e0b..03fb2bce9255 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/adlib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/adlib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/adlib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/adlib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * AdLib FM card driver.</div><div class='ctx'>  */</div><div class='hunk'>@@ -18,7 +19,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -27,10 +28,10 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_adlib_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_adlib_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[n])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -42,88 +43,57 @@ static int __devinit snd_adlib_match(struct device *dev, unsigned int n)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_adlib_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	release_and_free_resource(card-&gt;private_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_adlib_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "could not create card\n");</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	card-&gt;private_data = request_region(port[n], 4, CRD_NAME);</div><div class='add'>+	card-&gt;private_data = devm_request_region(dev, port[n], 4, CRD_NAME);</div><div class='ctx'> 	if (!card-&gt;private_data) {</div><div class='ctx'> 		dev_err(dev, "could not grab ports\n");</div><div class='del'>-		error = -EBUSY;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	card-&gt;private_free = snd_adlib_free;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, DEV_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, CRD_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DEV_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, CRD_NAME);</div><div class='ctx'> 	sprintf(card-&gt;longname, CRD_NAME " at %#lx", port[n]);</div><div class='ctx'> </div><div class='ctx'> 	error = snd_opl3_create(card, port[n], port[n] + 2, OPL3_HW_AUTO, 1, &amp;opl3);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "could not create OPL\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_opl3_hwdep_new(opl3, 0, 0, NULL);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "could not create FM\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='del'>-</div><div class='ctx'> 	error = snd_card_register(card);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "could not register card\n");</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_adlib_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_adlib_driver = {</div><div class='ctx'> 	.match		= snd_adlib_match,</div><div class='ctx'> 	.probe		= snd_adlib_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_adlib_remove),</div><div class='ctx'> </div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_adlib_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_adlib_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_adlib_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_adlib_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_adlib_init);</div><div class='del'>-module_exit(alsa_card_adlib_exit);</div><div class='add'>+module_isa_driver(snd_adlib_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/als100.c b/sound/isa/als100.c<br/>index 20becc89f6f6..cfc241bd252e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/als100.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/als100.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/als100.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/als100.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>     card-als100.c - driver for Avance Logic ALS100 based soundcards.</div><div class='hunk'>@@ -7,54 +8,28 @@</div><div class='ctx'>     Thanks to Pierfrancesco 'qM2' Passerini.</div><div class='ctx'> </div><div class='ctx'>     Generalised for soundcards based on DT-0196 and ALS-007 chips</div><div class='del'>-    by Jonathan Woithe &lt;jwoithe@physics.adelaide.edu.au&gt;: June 2002.</div><div class='add'>+    by Jonathan Woithe &lt;jwoithe@just42.net&gt;: June 2002.</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "als100: "</div><div class='del'>-</div><div class='ctx'> MODULE_DESCRIPTION("Avance Logic ALS007/ALS1X0");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Diamond Technologies DT-019X},"</div><div class='del'>-		"{Avance Logic ALS-007}}"</div><div class='del'>-		"{{Avance Logic,ALS100 - PRO16PNP},"</div><div class='del'>-	        "{Avance Logic,ALS110},"</div><div class='del'>-	        "{Avance Logic,ALS120},"</div><div class='del'>-	        "{Avance Logic,ALS200},"</div><div class='del'>-	        "{3D Melody,MF1000},"</div><div class='del'>-	        "{Digimate,3D Sound},"</div><div class='del'>-	        "{Avance Logic,ALS120},"</div><div class='del'>-	        "{RTL,RTL3000}}");</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Massimo Piccioni &lt;dafastidio@libero.it&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='hunk'>@@ -79,7 +54,7 @@ struct snd_card_als100 {</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_als100_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_als100_pnpids[] = {</div><div class='ctx'> 	/* DT197A30 */</div><div class='ctx'> 	{ .id = "RWB1688",</div><div class='ctx'> 	  .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } },</div><div class='hunk'>@@ -117,9 +92,9 @@ static struct pnp_card_device_id snd_als100_pnpids[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pnp_card, snd_als100_pnpids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='del'>-					 struct pnp_card_link *card,</div><div class='del'>-					 const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='add'>+			       struct pnp_card_link *card,</div><div class='add'>+			       const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -135,7 +110,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "AUDIO pnp configure failure\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -158,7 +133,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='ctx'> 	     __mpu_error:</div><div class='ctx'> 	     	if (pdev) {</div><div class='ctx'> 		     	pnp_release_card_device(pdev);</div><div class='del'>-	     		snd_printk(KERN_ERR PFX "MPU401 pnp configure failure, skipping\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "MPU401 pnp configure failure, skipping\n");</div><div class='ctx'> 	     	}</div><div class='ctx'> 	     	acard-&gt;devmpu = NULL;</div><div class='ctx'> 	     	mpu_port[dev] = -1;</div><div class='hunk'>@@ -174,7 +149,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='ctx'> 	      __fm_error:</div><div class='ctx'> 	     	if (pdev) {</div><div class='ctx'> 		     	pnp_release_card_device(pdev);</div><div class='del'>-	     		snd_printk(KERN_ERR PFX "OPL3 pnp configure failure, skipping\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "OPL3 pnp configure failure, skipping\n");</div><div class='ctx'> 	     	}</div><div class='ctx'> 	     	acard-&gt;devopl = NULL;</div><div class='ctx'> 	     	fm_port[dev] = -1;</div><div class='hunk'>@@ -183,9 +158,9 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_als100_probe(int dev,</div><div class='del'>-					struct pnp_card_link *pcard,</div><div class='del'>-					const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_als100_probe(int dev,</div><div class='add'>+				 struct pnp_card_link *pcard,</div><div class='add'>+				 const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='hunk'>@@ -193,17 +168,16 @@ static int __devinit snd_card_als100_probe(int dev,</div><div class='ctx'> 	struct snd_card_als100 *acard;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_card_als100), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				  index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_card_als100), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_als100_pnp(dev, acard, pcard, pid))) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_als100_pnp(dev, acard, pcard, pid);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (pid-&gt;driver_data == SB_HW_DT019X)</div><div class='ctx'> 		dma16[dev] = -1;</div><div class='hunk'>@@ -213,35 +187,32 @@ static int __devinit snd_card_als100_probe(int dev,</div><div class='ctx'> 				  dma8[dev], dma16[dev],</div><div class='ctx'> 				  pid-&gt;driver_data,</div><div class='ctx'> 				  &amp;chip);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	acard-&gt;chip = chip;</div><div class='ctx'> </div><div class='ctx'> 	if (pid-&gt;driver_data == SB_HW_DT019X) {</div><div class='del'>-		strcpy(card-&gt;driver, "DT-019X");</div><div class='del'>-		strcpy(card-&gt;shortname, "Diamond Tech. DT-019X");</div><div class='del'>-		sprintf(card-&gt;longname, "%s, %s at 0x%lx, irq %d, dma %d",</div><div class='del'>-			card-&gt;shortname, chip-&gt;name, chip-&gt;port,</div><div class='del'>-			irq[dev], dma8[dev]);</div><div class='add'>+		strscpy(card-&gt;driver, "DT-019X");</div><div class='add'>+		strscpy(card-&gt;shortname, "Diamond Tech. DT-019X");</div><div class='add'>+		snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			 "Diamond Tech. DT-019X, %s at 0x%lx, irq %d, dma %d",</div><div class='add'>+			 chip-&gt;name, chip-&gt;port, irq[dev], dma8[dev]);</div><div class='ctx'> 	} else {</div><div class='del'>-		strcpy(card-&gt;driver, "ALS100");</div><div class='del'>-		strcpy(card-&gt;shortname, "Avance Logic ALS100");</div><div class='del'>-		sprintf(card-&gt;longname, "%s, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='del'>-			card-&gt;shortname, chip-&gt;name, chip-&gt;port,</div><div class='del'>-			irq[dev], dma8[dev], dma16[dev]);</div><div class='add'>+		strscpy(card-&gt;driver, "ALS100");</div><div class='add'>+		strscpy(card-&gt;shortname, "Avance Logic ALS100");</div><div class='add'>+		snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			 "Avance Logic ALS100, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='add'>+			 chip-&gt;name, chip-&gt;port, irq[dev], dma8[dev],</div><div class='add'>+			 dma16[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_sb16dsp_pcm(chip, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_sbmixer_new(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_sbmixer_new(chip);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[dev] &gt; 0 &amp;&amp; mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		int mpu_type = MPU401_HW_ALS100;</div><div class='hunk'>@@ -256,41 +227,37 @@ static int __devinit snd_card_als100_probe(int dev,</div><div class='ctx'> 					mpu_type,</div><div class='ctx'> 					mpu_port[dev], 0, </div><div class='ctx'> 					mpu_irq[dev],</div><div class='del'>-					mpu_irq[dev] &gt;= 0 ? IRQF_DISABLED : 0,</div><div class='ctx'> 					NULL) &lt; 0)</div><div class='del'>-			snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);</div><div class='add'>+			dev_err(card-&gt;dev, "no MPU-401 device at 0x%lx\n", mpu_port[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port[dev] &gt; 0 &amp;&amp; fm_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_opl3_create(card,</div><div class='ctx'> 				    fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",</div><div class='del'>-				   fm_port[dev], fm_port[dev] + 2);</div><div class='add'>+			dev_err(card-&gt;dev, "no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+				fm_port[dev], fm_port[dev] + 2);</div><div class='ctx'> 		} else {</div><div class='del'>-			if ((error = snd_opl3_timer_new(opl3, 0, 1)) &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			error = snd_opl3_timer_new(opl3, 0, 1);</div><div class='add'>+			if (error &lt; 0)</div><div class='ctx'> 				return error;</div><div class='del'>-			}</div><div class='del'>-			if ((error = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+			if (error &lt; 0)</div><div class='ctx'> 				return error;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_register(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinitdata als100_devices;</div><div class='add'>+static unsigned int als100_devices;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,</div><div class='del'>-					   const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_als100_pnp_detect(struct pnp_card_link *card,</div><div class='add'>+				 const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -308,12 +275,6 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_als100_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -322,7 +283,6 @@ static int snd_als100_pnp_suspend(struct pnp_card_link *pcard, pm_message_t stat</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_sbmixer_suspend(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -345,7 +305,6 @@ static struct pnp_card_driver als100_pnpc_driver = {</div><div class='ctx'> 	.name		= "als100",</div><div class='ctx'>         .id_table       = snd_als100_pnpids,</div><div class='ctx'>         .probe          = snd_als100_pnp_detect,</div><div class='del'>-        .remove         = __devexit_p(snd_als100_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_als100_pnp_suspend,</div><div class='ctx'> 	.resume		= snd_als100_pnp_resume,</div><div class='hunk'>@@ -363,7 +322,7 @@ static int __init alsa_card_als100_init(void)</div><div class='ctx'> 	if (!als100_devices) {</div><div class='ctx'> 		pnp_unregister_card_driver(&amp;als100_pnpc_driver);</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		snd_printk(KERN_ERR "no Avance Logic based soundcards found\n");</div><div class='add'>+		pr_err("no Avance Logic based soundcards found\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c<br/>index aac8dc15c2fe..588b9f0831d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/azt2320.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/azt2320.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/azt2320.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/azt2320.c</a></div><div class='hunk'>@@ -1,20 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>     card-azt2320.c - driver for Aztech Systems AZT2320 based soundcards.</div><div class='ctx'>     Copyright (C) 1999-2000 by Massimo Piccioni &lt;dafastidio@libero.it&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -29,33 +17,26 @@</div><div class='ctx'>     activation method (full-duplex audio!).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "azt2320: "</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Massimo Piccioni &lt;dafastidio@libero.it&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Aztech Systems AZT2320");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Aztech Systems,PRO16V},"</div><div class='del'>-		"{Aztech Systems,AZT2320},"</div><div class='del'>-		"{Aztech Systems,AZT3300},"</div><div class='del'>-		"{Aztech Systems,AZT2320},"</div><div class='del'>-		"{Aztech Systems,AZT3000}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='hunk'>@@ -79,7 +60,7 @@ struct snd_card_azt2320 {</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_azt2320_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_azt2320_pnpids[] = {</div><div class='ctx'> 	/* PRO16V */</div><div class='ctx'> 	{ .id = "AZT1008", .devs = { { "AZT1008" }, { "AZT2001" }, } },</div><div class='ctx'> 	/* Aztech Sound Galaxy 16 */</div><div class='hunk'>@@ -99,9 +80,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_azt2320_pnpids);</div><div class='ctx'> </div><div class='ctx'> #define	DRIVER_NAME	"snd-card-azt2320"</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,</div><div class='del'>-					  struct pnp_card_link *card,</div><div class='del'>-					  const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,</div><div class='add'>+				struct pnp_card_link *card,</div><div class='add'>+				const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -116,7 +97,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "AUDIO pnp configure failure\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -137,7 +118,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar</div><div class='ctx'> 	     __mpu_error:</div><div class='ctx'> 	     	if (pdev) {</div><div class='ctx'> 		     	pnp_release_card_device(pdev);</div><div class='del'>-	     		snd_printk(KERN_ERR PFX "MPU401 pnp configure failure, skipping\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "MPU401 pnp configure failure, skipping\n");</div><div class='ctx'> 	     	}</div><div class='ctx'> 	     	acard-&gt;devmpu = NULL;</div><div class='ctx'> 	     	mpu_port[dev] = -1;</div><div class='hunk'>@@ -147,7 +128,7 @@ static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acar</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* same of snd_sbdsp_command by Jaroslav Kysela */</div><div class='del'>-static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char val)</div><div class='add'>+static int snd_card_azt2320_command(unsigned long port, unsigned char val)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned long limit;</div><div class='hunk'>@@ -161,22 +142,24 @@ static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_azt2320_enable_wss(unsigned long port)</div><div class='add'>+static int snd_card_azt2320_enable_wss(unsigned long port)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_azt2320_command(port, 0x09)))</div><div class='add'>+	error = snd_card_azt2320_command(port, 0x09);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	if ((error = snd_card_azt2320_command(port, 0x00)))</div><div class='add'>+	error = snd_card_azt2320_command(port, 0x00);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	mdelay(5);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_azt2320_probe(int dev,</div><div class='del'>-					    struct pnp_card_link *pcard,</div><div class='del'>-					    const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_azt2320_probe(int dev,</div><div class='add'>+				  struct pnp_card_link *pcard,</div><div class='add'>+				  const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -184,91 +167,77 @@ static int __devinit snd_card_azt2320_probe(int dev,</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_card_azt2320), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				  index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_card_azt2320), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_azt2320_pnp(dev, acard, pcard, pid))) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_azt2320_pnp(dev, acard, pcard, pid);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_azt2320_enable_wss(port[dev]))) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_azt2320_enable_wss(port[dev]);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_wss_create(card, wss_port[dev], -1,</div><div class='ctx'> 			       irq[dev],</div><div class='ctx'> 			       dma1[dev], dma2[dev],</div><div class='ctx'> 			       WSS_HW_DETECT, 0, &amp;chip);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "AZT2320");</div><div class='del'>-	strcpy(card-&gt;shortname, "Aztech AZT2320");</div><div class='add'>+	strscpy(card-&gt;driver, "AZT2320");</div><div class='add'>+	strscpy(card-&gt;shortname, "Aztech AZT2320");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s, WSS at 0x%lx, irq %i, dma %i&amp;%i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;port, irq[dev], dma1[dev], dma2[dev]);</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_pcm(chip, 0, NULL);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_wss_pcm(chip, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	error = snd_wss_mixer(chip);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	error = snd_wss_timer(chip, 0, NULL);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_wss_timer(chip, 0);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[dev] &gt; 0 &amp;&amp; mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,</div><div class='ctx'> 				mpu_port[dev], 0,</div><div class='del'>-				mpu_irq[dev], IRQF_DISABLED,</div><div class='del'>-				NULL) &lt; 0)</div><div class='del'>-			snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);</div><div class='add'>+				mpu_irq[dev], NULL) &lt; 0)</div><div class='add'>+			dev_err(card-&gt;dev, "no MPU-401 device at 0x%lx\n", mpu_port[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port[dev] &gt; 0 &amp;&amp; fm_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_opl3_create(card,</div><div class='ctx'> 				    fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",</div><div class='del'>-				   fm_port[dev], fm_port[dev] + 2);</div><div class='add'>+			dev_err(card-&gt;dev, "no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+				fm_port[dev], fm_port[dev] + 2);</div><div class='ctx'> 		} else {</div><div class='del'>-			if ((error = snd_opl3_timer_new(opl3, 1, 2)) &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			error = snd_opl3_timer_new(opl3, 1, 2);</div><div class='add'>+			if (error &lt; 0)</div><div class='ctx'> 				return error;</div><div class='del'>-			}</div><div class='del'>-			if ((error = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+			if (error &lt; 0)</div><div class='ctx'> 				return error;</div><div class='del'>-			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_register(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int __devinitdata azt2320_devices;</div><div class='add'>+static unsigned int azt2320_devices;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,</div><div class='del'>-					    const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_azt2320_pnp_detect(struct pnp_card_link *card,</div><div class='add'>+				  const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int res;</div><div class='hunk'>@@ -286,12 +255,6 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,</div><div class='ctx'>         return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_azt2320_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -321,7 +284,6 @@ static struct pnp_card_driver azt2320_pnpc_driver = {</div><div class='ctx'> 	.name           = "azt2320",</div><div class='ctx'> 	.id_table       = snd_azt2320_pnpids,</div><div class='ctx'> 	.probe          = snd_azt2320_pnp_detect,</div><div class='del'>-	.remove         = __devexit_p(snd_azt2320_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_azt2320_pnp_suspend,</div><div class='ctx'> 	.resume		= snd_azt2320_pnp_resume,</div><div class='hunk'>@@ -339,7 +301,7 @@ static int __init alsa_card_azt2320_init(void)</div><div class='ctx'> 	if (!azt2320_devices) {</div><div class='ctx'> 		pnp_unregister_card_driver(&amp;azt2320_pnpc_driver);</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-		snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");</div><div class='add'>+		pr_err("no AZT2320 based soundcards found\n");</div><div class='ctx'> #endif</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c<br/>new file mode 100644<br/>index 000000000000..4e6d823af103<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cmi8328.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cmi8328.c</a></div><div class='hunk'>@@ -0,0 +1,460 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Driver for C-Media CMI8328-based soundcards, such as AudioExcel AV500</div><div class='add'>+ * Copyright (c) 2012 Ondrej Zary</div><div class='add'>+ *</div><div class='add'>+ * AudioExcel AV500 card consists of:</div><div class='add'>+ *  - CMI8328 - main chip (SB Pro emulation, gameport, OPL3, MPU401, CD-ROM)</div><div class='add'>+ *  - CS4231A - WSS codec</div><div class='add'>+ *  - Dream SAM9233+GMS950400+RAM+ROM: Wavetable MIDI, connected to MPU401</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/isa.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/gameport.h&gt;</div><div class='add'>+#include &lt;asm/dma.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/wss.h&gt;</div><div class='add'>+#include &lt;sound/opl3.h&gt;</div><div class='add'>+#include &lt;sound/mpu401.h&gt;</div><div class='add'>+#define SNDRV_LEGACY_FIND_FREE_IOPORT</div><div class='add'>+#define SNDRV_LEGACY_FIND_FREE_IRQ</div><div class='add'>+#define SNDRV_LEGACY_FIND_FREE_DMA</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ondrej Zary &lt;linux@rainbow-software.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("C-Media CMI8328");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_GAMEPORT)</div><div class='add'>+#define SUPPORT_JOYSTICK 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* I/O port is configured by jumpers on the card to one of these */</div><div class='add'>+static const int cmi8328_ports[] = { 0x530, 0xe80, 0xf40, 0x604 };</div><div class='add'>+#define CMI8328_MAX	ARRAY_SIZE(cmi8328_ports)</div><div class='add'>+</div><div class='add'>+static int index[CMI8328_MAX] =     {[0 ... (CMI8328_MAX-1)] = -1};</div><div class='add'>+static char *id[CMI8328_MAX] =      {[0 ... (CMI8328_MAX-1)] = NULL};</div><div class='add'>+static long port[CMI8328_MAX] =     {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_PORT};</div><div class='add'>+static int irq[CMI8328_MAX] =       {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_IRQ};</div><div class='add'>+static int dma1[CMI8328_MAX] =      {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_DMA};</div><div class='add'>+static int dma2[CMI8328_MAX] =      {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_DMA};</div><div class='add'>+static long mpuport[CMI8328_MAX] =  {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_PORT};</div><div class='add'>+static int mpuirq[CMI8328_MAX] =    {[0 ... (CMI8328_MAX-1)] = SNDRV_AUTO_IRQ};</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+static bool gameport[CMI8328_MAX] = {[0 ... (CMI8328_MAX-1)] = true};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for CMI8328 soundcard.");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for CMI8328 soundcard.");</div><div class='add'>+</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(port, "Port # for CMI8328 driver.");</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(irq, "IRQ # for CMI8328 driver.");</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(dma1, "DMA1 for CMI8328 driver.");</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(dma2, "DMA2 for CMI8328 driver.");</div><div class='add'>+</div><div class='add'>+module_param_hw_array(mpuport, long, ioport, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8328 driver.");</div><div class='add'>+module_param_hw_array(mpuirq, int, irq, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8328 MPU-401 port.");</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+module_param_array(gameport, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(gameport, "Enable gameport.");</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct snd_cmi8328 {</div><div class='add'>+	u16 port;</div><div class='add'>+	u8 cfg[3];</div><div class='add'>+	u8 wss_cfg;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_wss *wss;</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+	struct gameport *gameport;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CMI8328 configuration registers */</div><div class='add'>+#define CFG1 0x61</div><div class='add'>+#define CFG1_SB_DISABLE	(1 &lt;&lt; 0)</div><div class='add'>+#define CFG1_GAMEPORT	(1 &lt;&lt; 1)</div><div class='add'>+/*</div><div class='add'>+ * bit 0:    SB: 0=enabled, 1=disabled</div><div class='add'>+ * bit 1:    gameport: 0=disabled, 1=enabled</div><div class='add'>+ * bits 2-4: SB IRQ: 001=3, 010=5, 011=7, 100=9, 101=10, 110=11</div><div class='add'>+ * bits 5-6: SB DMA: 00=disabled (when SB disabled), 01=DMA0, 10=DMA1, 11=DMA3</div><div class='add'>+ * bit 7:    SB port: 0=0x220, 1=0x240</div><div class='add'>+ */</div><div class='add'>+#define CFG2 0x62</div><div class='add'>+#define CFG2_MPU_ENABLE (1 &lt;&lt; 2)</div><div class='add'>+/*</div><div class='add'>+ * bits 0-1: CD-ROM mode: 00=disabled, 01=Panasonic, 10=Sony/Mitsumi/Wearnes,</div><div class='add'>+			  11=IDE</div><div class='add'>+ * bit 2:    MPU401: 0=disabled, 1=enabled</div><div class='add'>+ * bits 3-4: MPU401 IRQ: 00=3, 01=5, 10=7, 11=9,</div><div class='add'>+ * bits 5-7: MPU401 port: 000=0x300, 001=0x310, 010=0x320, 011=0x330, 100=0x332,</div><div class='add'>+			  101=0x334, 110=0x336</div><div class='add'>+ */</div><div class='add'>+#define CFG3 0x63</div><div class='add'>+/*</div><div class='add'>+ * bits 0-2: CD-ROM IRQ: 000=disabled, 001=3, 010=5, 011=7, 100=9, 101=10,</div><div class='add'>+			 110=11</div><div class='add'>+ * bits 3-4: CD-ROM DMA: 00=disabled, 01=DMA0, 10=DMA1, 11=DMA3</div><div class='add'>+ * bits 5-7: CD-ROM port: 000=0x300, 001=0x310, 010=0x320, 011=0x330, 100=0x340,</div><div class='add'>+			  101=0x350, 110=0x360, 111=0x370</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u8 snd_cmi8328_cfg_read(u16 port, u8 reg)</div><div class='add'>+{</div><div class='add'>+	outb(0x43, port + 3);</div><div class='add'>+	outb(0x21, port + 3);</div><div class='add'>+	outb(reg, port + 3);</div><div class='add'>+	return inb(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_cmi8328_cfg_write(u16 port, u8 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	outb(0x43, port + 3);</div><div class='add'>+	outb(0x21, port + 3);</div><div class='add'>+	outb(reg, port + 3);</div><div class='add'>+	outb(val, port + 3);	/* yes, value goes to the same port as index */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static void snd_cmi8328_cfg_save(u16 port, u8 cfg[])</div><div class='add'>+{</div><div class='add'>+	cfg[0] = snd_cmi8328_cfg_read(port, CFG1);</div><div class='add'>+	cfg[1] = snd_cmi8328_cfg_read(port, CFG2);</div><div class='add'>+	cfg[2] = snd_cmi8328_cfg_read(port, CFG3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_cmi8328_cfg_restore(u16 port, u8 cfg[])</div><div class='add'>+{</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG1, cfg[0]);</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG2, cfg[1]);</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG3, cfg[2]);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static int snd_cmi8328_mixer(struct snd_wss *chip)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_ctl_elem_id id1, id2;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	card = chip-&gt;card;</div><div class='add'>+</div><div class='add'>+	memset(&amp;id1, 0, sizeof(id1));</div><div class='add'>+	memset(&amp;id2, 0, sizeof(id2));</div><div class='add'>+	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	/* rename AUX0 switch to CD */</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	strscpy(id2.name, "CD Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "error renaming control\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	/* rename AUX0 volume to CD */</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "CD Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "error renaming control\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	/* rename AUX1 switch to Synth */</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "Synth Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "error renaming control\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	/* rename AUX1 volume to Synth */</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "Synth Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "error renaming control\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* find index of an item in "-1"-ended array */</div><div class='add'>+static int array_find(const int array[], int item)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; array[i] != -1; i++)</div><div class='add'>+		if (array[i] == item)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+/* the same for long */</div><div class='add'>+static int array_find_l(const long array[], long item)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; array[i] != -1; i++)</div><div class='add'>+		if (array[i] == item)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_opl3 *opl3;</div><div class='add'>+	struct snd_cmi8328 *cmi;</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+	struct resource *res;</div><div class='add'>+#endif</div><div class='add'>+	int err, pos;</div><div class='add'>+	static const long mpu_ports[] = { 0x330, 0x300, 0x310, 0x320, 0x332, 0x334,</div><div class='add'>+				   0x336, -1 };</div><div class='add'>+	static const u8 mpu_port_bits[] = { 3, 0, 1, 2, 4, 5, 6 };</div><div class='add'>+	static const int mpu_irqs[] = { 9, 7, 5, 3, -1 };</div><div class='add'>+	static const u8 mpu_irq_bits[] = { 3, 2, 1, 0 };</div><div class='add'>+	static const int irqs[] = { 9, 10, 11, 7, -1 };</div><div class='add'>+	static const u8 irq_bits[] = { 2, 3, 4, 1 };</div><div class='add'>+	static const int dma1s[] = { 3, 1, 0, -1 };</div><div class='add'>+	static const u8 dma_bits[] = { 3, 2, 1 };</div><div class='add'>+	static const int dma2s[][2] = { {1, -1}, {0, -1}, {-1, -1}, {0, -1} };</div><div class='add'>+	u16 port = cmi8328_ports[ndev];</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* 0xff is invalid configuration (but settable - hope it isn't set) */</div><div class='add'>+	if (snd_cmi8328_cfg_read(port, CFG1) == 0xff)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	/* the SB disable bit must NEVER EVER be cleared or the WSS dies */</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG1, CFG1_SB_DISABLE);</div><div class='add'>+	if (snd_cmi8328_cfg_read(port, CFG1) != CFG1_SB_DISABLE)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	/* disable everything first */</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG2, 0);	/* disable CDROM and MPU401 */</div><div class='add'>+	snd_cmi8328_cfg_write(port, CFG3, 0);	/* disable CDROM IRQ and DMA */</div><div class='add'>+</div><div class='add'>+	if (irq[ndev] == SNDRV_AUTO_IRQ) {</div><div class='add'>+		irq[ndev] = snd_legacy_find_free_irq(irqs);</div><div class='add'>+		if (irq[ndev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free IRQ\n");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dma1[ndev] == SNDRV_AUTO_DMA) {</div><div class='add'>+		dma1[ndev] = snd_legacy_find_free_dma(dma1s);</div><div class='add'>+		if (dma1[ndev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA1\n");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (dma2[ndev] == SNDRV_AUTO_DMA) {</div><div class='add'>+		dma2[ndev] = snd_legacy_find_free_dma(dma2s[dma1[ndev] % 4]);</div><div class='add'>+		if (dma2[ndev] &lt; 0) {</div><div class='add'>+			dev_warn(pdev, "unable to find a free DMA2, full-duplex will not work\n");</div><div class='add'>+			dma2[ndev] = -1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* configure WSS IRQ... */</div><div class='add'>+	pos = array_find(irqs, irq[ndev]);</div><div class='add'>+	if (pos &lt; 0) {</div><div class='add'>+		dev_err(pdev, "invalid IRQ %d\n", irq[ndev]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	val = irq_bits[pos] &lt;&lt; 3;</div><div class='add'>+	/* ...and DMA... */</div><div class='add'>+	pos = array_find(dma1s, dma1[ndev]);</div><div class='add'>+	if (pos &lt; 0) {</div><div class='add'>+		dev_err(pdev, "invalid DMA1 %d\n", dma1[ndev]);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	val |= dma_bits[pos];</div><div class='add'>+	/* ...and DMA2 */</div><div class='add'>+	if (dma2[ndev] &gt;= 0 &amp;&amp; dma1[ndev] != dma2[ndev]) {</div><div class='add'>+		pos = array_find(dma2s[dma1[ndev]], dma2[ndev]);</div><div class='add'>+		if (pos &lt; 0) {</div><div class='add'>+			dev_err(pdev, "invalid DMA2 %d\n", dma2[ndev]);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		val |= 0x04; /* enable separate capture DMA */</div><div class='add'>+	}</div><div class='add'>+	outb(val, port);</div><div class='add'>+</div><div class='add'>+	err = snd_devm_card_new(pdev, index[ndev], id[ndev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_cmi8328), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	cmi = card-&gt;private_data;</div><div class='add'>+	cmi-&gt;card = card;</div><div class='add'>+	cmi-&gt;port = port;</div><div class='add'>+	cmi-&gt;wss_cfg = val;</div><div class='add'>+</div><div class='add'>+	err = snd_wss_create(card, port + 4, -1, irq[ndev], dma1[ndev],</div><div class='add'>+			dma2[ndev], WSS_HW_DETECT, 0, &amp;cmi-&gt;wss);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_wss_pcm(cmi-&gt;wss, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_wss_mixer(cmi-&gt;wss);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_cmi8328_mixer(cmi-&gt;wss);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (snd_wss_timer(cmi-&gt;wss, 0) &lt; 0)</div><div class='add'>+		dev_warn(pdev, "error initializing WSS timer\n");</div><div class='add'>+</div><div class='add'>+	if (mpuport[ndev] == SNDRV_AUTO_PORT) {</div><div class='add'>+		mpuport[ndev] = snd_legacy_find_free_ioport(mpu_ports, 2);</div><div class='add'>+		if (mpuport[ndev] &lt; 0)</div><div class='add'>+			dev_err(pdev, "unable to find a free MPU401 port\n");</div><div class='add'>+	}</div><div class='add'>+	if (mpuirq[ndev] == SNDRV_AUTO_IRQ) {</div><div class='add'>+		mpuirq[ndev] = snd_legacy_find_free_irq(mpu_irqs);</div><div class='add'>+		if (mpuirq[ndev] &lt; 0)</div><div class='add'>+			dev_err(pdev, "unable to find a free MPU401 IRQ\n");</div><div class='add'>+	}</div><div class='add'>+	/* enable and configure MPU401 */</div><div class='add'>+	if (mpuport[ndev] &gt; 0 &amp;&amp; mpuirq[ndev] &gt; 0) {</div><div class='add'>+		val = CFG2_MPU_ENABLE;</div><div class='add'>+		pos = array_find_l(mpu_ports, mpuport[ndev]);</div><div class='add'>+		if (pos &lt; 0)</div><div class='add'>+			dev_warn(pdev, "invalid MPU401 port 0x%lx\n",</div><div class='add'>+				 mpuport[ndev]);</div><div class='add'>+		else {</div><div class='add'>+			val |= mpu_port_bits[pos] &lt;&lt; 5;</div><div class='add'>+			pos = array_find(mpu_irqs, mpuirq[ndev]);</div><div class='add'>+			if (pos &lt; 0)</div><div class='add'>+				dev_warn(pdev, "invalid MPU401 IRQ %d\n",</div><div class='add'>+					 mpuirq[ndev]);</div><div class='add'>+			else {</div><div class='add'>+				val |= mpu_irq_bits[pos] &lt;&lt; 3;</div><div class='add'>+				snd_cmi8328_cfg_write(port, CFG2, val);</div><div class='add'>+				if (snd_mpu401_uart_new(card, 0,</div><div class='add'>+						MPU401_HW_MPU401, mpuport[ndev],</div><div class='add'>+						0, mpuirq[ndev], NULL) &lt; 0)</div><div class='add'>+					dev_err(pdev, "error initializing MPU401\n");</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* OPL3 is hardwired to 0x388 and cannot be disabled */</div><div class='add'>+	if (snd_opl3_create(card, 0x388, 0x38a, OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0)</div><div class='add'>+		dev_err(pdev, "error initializing OPL3\n");</div><div class='add'>+	else</div><div class='add'>+		if (snd_opl3_hwdep_new(opl3, 0, 1, NULL) &lt; 0)</div><div class='add'>+			dev_warn(pdev, "error initializing OPL3 hwdep\n");</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "CMI8328");</div><div class='add'>+	strscpy(card-&gt;shortname, "C-Media CMI8328");</div><div class='add'>+	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d,%d",</div><div class='add'>+		card-&gt;shortname, cmi-&gt;wss-&gt;port, irq[ndev], dma1[ndev],</div><div class='add'>+		(dma2[ndev] &gt;= 0) ? dma2[ndev] : dma1[ndev]);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(pdev, card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+	if (!gameport[ndev])</div><div class='add'>+		return 0;</div><div class='add'>+	/* gameport is hardwired to 0x200 */</div><div class='add'>+	res = devm_request_region(pdev, 0x200, 8, "CMI8328 gameport");</div><div class='add'>+	if (!res)</div><div class='add'>+		dev_warn(pdev, "unable to allocate gameport I/O port\n");</div><div class='add'>+	else {</div><div class='add'>+		struct gameport *gp = cmi-&gt;gameport = gameport_allocate_port();</div><div class='add'>+		if (cmi-&gt;gameport) {</div><div class='add'>+			gameport_set_name(gp, "CMI8328 Gameport");</div><div class='add'>+			gameport_set_phys(gp, "%s/gameport0", dev_name(pdev));</div><div class='add'>+			gameport_set_dev_parent(gp, pdev);</div><div class='add'>+			gp-&gt;io = 0x200;</div><div class='add'>+			/* Enable gameport */</div><div class='add'>+			snd_cmi8328_cfg_write(port, CFG1,</div><div class='add'>+					CFG1_SB_DISABLE | CFG1_GAMEPORT);</div><div class='add'>+			gameport_register_port(gp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_cmi8328_remove(struct device *pdev, unsigned int dev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='add'>+	struct snd_cmi8328 *cmi = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+#ifdef SUPPORT_JOYSTICK</div><div class='add'>+	if (cmi-&gt;gameport)</div><div class='add'>+		gameport_unregister_port(cmi-&gt;gameport);</div><div class='add'>+#endif</div><div class='add'>+	/* disable everything */</div><div class='add'>+	snd_cmi8328_cfg_write(cmi-&gt;port, CFG1, CFG1_SB_DISABLE);</div><div class='add'>+	snd_cmi8328_cfg_write(cmi-&gt;port, CFG2, 0);</div><div class='add'>+	snd_cmi8328_cfg_write(cmi-&gt;port, CFG3, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int snd_cmi8328_suspend(struct device *pdev, unsigned int n,</div><div class='add'>+				pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='add'>+	struct snd_cmi8328 *cmi;</div><div class='add'>+</div><div class='add'>+	if (!card)	/* ignore absent devices */</div><div class='add'>+		return 0;</div><div class='add'>+	cmi = card-&gt;private_data;</div><div class='add'>+	snd_cmi8328_cfg_save(cmi-&gt;port, cmi-&gt;cfg);</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+	cmi-&gt;wss-&gt;suspend(cmi-&gt;wss);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_cmi8328_resume(struct device *pdev, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(pdev);</div><div class='add'>+	struct snd_cmi8328 *cmi;</div><div class='add'>+</div><div class='add'>+	if (!card)	/* ignore absent devices */</div><div class='add'>+		return 0;</div><div class='add'>+	cmi = card-&gt;private_data;</div><div class='add'>+	snd_cmi8328_cfg_restore(cmi-&gt;port, cmi-&gt;cfg);</div><div class='add'>+	outb(cmi-&gt;wss_cfg, cmi-&gt;port);</div><div class='add'>+	cmi-&gt;wss-&gt;resume(cmi-&gt;wss);</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct isa_driver snd_cmi8328_driver = {</div><div class='add'>+	.probe		= snd_cmi8328_probe,</div><div class='add'>+	.remove		= snd_cmi8328_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= snd_cmi8328_suspend,</div><div class='add'>+	.resume		= snd_cmi8328_resume,</div><div class='add'>+#endif</div><div class='add'>+	.driver		= {</div><div class='add'>+		.name	= "cmi8328"</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_isa_driver(snd_cmi8328_driver, CMI8328_MAX);</div><div class='head'>diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c<br/>index fe79a169acb5..3d1f19321b9e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/cmi8330.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cmi8330.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cmi8330.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cmi8330.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for C-Media's CMI8330 and CMI8329 soundcards.</div><div class='ctx'>  *  Copyright (c) by George Talusan &lt;gstalusan@uwaterloo.ca&gt;</div><div class='ctx'>  *    http://www.undergrad.math.uwaterloo.ca/~gstalusa</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -47,7 +33,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='hunk'>@@ -65,13 +51,12 @@</div><div class='ctx'> MODULE_AUTHOR("George Talusan &lt;gstalusan@uwaterloo.ca&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("C-Media CMI8330/CMI8329");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='ctx'> static int sbirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;</div><div class='hunk'>@@ -95,27 +80,27 @@ module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-module_param_array(sbport, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(sbport, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver.");</div><div class='del'>-module_param_array(sbirq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(sbirq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver.");</div><div class='del'>-module_param_array(sbdma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(sbdma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver.");</div><div class='del'>-module_param_array(sbdma16, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(sbdma16, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(wssport, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(wssport, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver.");</div><div class='del'>-module_param_array(wssirq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(wssirq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver.");</div><div class='del'>-module_param_array(wssdma, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(wssdma, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(fmport, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fmport, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver.");</div><div class='del'>-module_param_array(mpuport, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpuport, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");</div><div class='del'>-module_param_array(mpuirq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpuirq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port.");</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> static int isa_registered;</div><div class='hunk'>@@ -134,7 +119,7 @@ static int pnp_registered;</div><div class='ctx'> #define CMI8330_LINGAIN   25</div><div class='ctx'> #define CMI8330_CDINGAIN  26</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =</div><div class='add'>+static const unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =</div><div class='ctx'> {</div><div class='ctx'> 	0x40,			/* 16 - recording mux (SB-mixer-enabled) */</div><div class='ctx'> #ifdef ENABLE_SB_MIXER</div><div class='hunk'>@@ -182,7 +167,7 @@ struct snd_cmi8330 {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_cmi8330_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_cmi8330_pnpids[] = {</div><div class='ctx'> 	{ .id = "CMI0001", .devs = { { "@X@0001" }, { "@@@0001" }, { "@H@0001" }, { "A@@0001" } } },</div><div class='ctx'> 	{ .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } } },</div><div class='ctx'> 	{ .id = "" }</div><div class='hunk'>@@ -193,7 +178,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cmi8330_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmi8330_controls[] = {</div><div class='ctx'> WSS_DOUBLE("Master Playback Volume", 0,</div><div class='ctx'> 		CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),</div><div class='ctx'> WSS_SINGLE("Loud Playback Switch", 0,</div><div class='hunk'>@@ -249,7 +234,7 @@ WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", PLAYBACK, SWITCH), 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef ENABLE_SB_MIXER</div><div class='del'>-static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = {</div><div class='add'>+static const struct sbmix_elem cmi8330_sb_mixers[] = {</div><div class='ctx'> SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),</div><div class='ctx'> SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),</div><div class='ctx'> SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),</div><div class='hunk'>@@ -267,7 +252,7 @@ SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6</div><div class='ctx'> SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {</div><div class='add'>+static const unsigned char cmi8330_sb_init_values[][2] = {</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 0, 0 },</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 1, 0 },</div><div class='ctx'> 	{ SB_DSP4_PCM_DEV + 0, 0 },</div><div class='hunk'>@@ -281,37 +266,37 @@ static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)</div><div class='add'>+static int cmi8330_add_sb_mixers(struct snd_sb *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, err;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-	snd_sbmixer_write(chip, 0x00, 0x00);		/* mixer reset */</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_sbmixer_write(chip, 0x00, 0x00);	/* mixer reset */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* mute and zero volume channels */</div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(cmi8330_sb_init_values); idx++) {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-		snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0],</div><div class='del'>-				  cmi8330_sb_init_values[idx][1]);</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+			snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0],</div><div class='add'>+					  cmi8330_sb_init_values[idx][1]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(cmi8330_sb_mixers); idx++) {</div><div class='del'>-		if ((err = snd_sbmixer_add_ctl_elem(chip, &amp;cmi8330_sb_mixers[idx])) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_add_ctl_elem(chip, &amp;cmi8330_sb_mixers[idx]);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)</div><div class='add'>+static int snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, (acard-&gt;type == CMI8329) ? "CMI8329" : "CMI8330/C3D");</div><div class='add'>+	strscpy(card-&gt;mixername, (acard-&gt;type == CMI8329) ? "CMI8329" : "CMI8330/C3D");</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_cmi8330_controls); idx++) {</div><div class='ctx'> 		err = snd_ctl_add(card,</div><div class='hunk'>@@ -322,16 +307,17 @@ static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef ENABLE_SB_MIXER</div><div class='del'>-	if ((err = cmi8330_add_sb_mixers(acard-&gt;sb)) &lt; 0)</div><div class='add'>+	err = cmi8330_add_sb_mixers(acard-&gt;sb);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,</div><div class='del'>-				     struct pnp_card_link *card,</div><div class='del'>-				     const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,</div><div class='add'>+			   struct pnp_card_link *card,</div><div class='add'>+			   const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -355,7 +341,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "AD1848 PnP configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "AD1848 PnP configure failure\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	wssport[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -369,7 +355,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "SB16 PnP configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "SB16 PnP configure failure\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	sbport[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -389,7 +375,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "MPU-401 PnP configure failure: will be disabled\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "MPU-401 PnP configure failure: will be disabled\n");</div><div class='ctx'> 	else {</div><div class='ctx'> 		mpuport[dev] = pnp_port_start(pdev, 0);</div><div class='ctx'> 		mpuirq[dev] = pnp_irq(pdev, 0);</div><div class='hunk'>@@ -437,19 +423,20 @@ static int snd_cmi8330_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return chip-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)</div><div class='add'>+static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	const struct snd_pcm_ops *ops;</div><div class='ctx'> 	int err;</div><div class='del'>-	static snd_pcm_open_callback_t cmi_open_callbacks[2] = {</div><div class='add'>+	static const snd_pcm_open_callback_t cmi_open_callbacks[2] = {</div><div class='ctx'> 		snd_cmi8330_playback_open,</div><div class='ctx'> 		snd_cmi8330_capture_open</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_new(card, (chip-&gt;type == CMI8329) ? "CMI8329" : "CMI8330", 0, 1, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(card, (chip-&gt;type == CMI8329) ? "CMI8329" : "CMI8330", 0, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(pcm-&gt;name, (chip-&gt;type == CMI8329) ? "CMI8329" : "CMI8330");</div><div class='add'>+	strscpy(pcm-&gt;name, (chip-&gt;type == CMI8329) ? "CMI8329" : "CMI8330");</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	</div><div class='ctx'> 	/* SB16 */</div><div class='hunk'>@@ -469,9 +456,8 @@ static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;chip-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;chip-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].ops);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       card-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -484,7 +470,6 @@ static int snd_cmi8330_suspend(struct snd_card *card)</div><div class='ctx'> 	struct snd_cmi8330 *acard = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(acard-&gt;pcm);</div><div class='ctx'> 	acard-&gt;wss-&gt;suspend(acard-&gt;wss);</div><div class='ctx'> 	snd_sbmixer_suspend(acard-&gt;sb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -512,18 +497,17 @@ static int snd_cmi8330_resume(struct snd_card *card)</div><div class='ctx'> #define is_isapnp_selected(dev)		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PFX	"cmi8330: "</div><div class='del'>-</div><div class='del'>-static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_cmi8330_card_new(struct device *pdev, int dev,</div><div class='add'>+				struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_cmi8330 *acard;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_cmi8330), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_cmi8330), &amp;card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "could not get a new card\n");</div><div class='add'>+		dev_err(pdev, "could not get a new card\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='hunk'>@@ -532,7 +516,7 @@ static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cmi8330 *acard;</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -544,26 +528,27 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='ctx'> 			     wssdma[dev], -1,</div><div class='ctx'> 			     WSS_HW_DETECT, 0, &amp;acard-&gt;wss);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "AD1848 device busy??\n");</div><div class='add'>+		dev_err(card-&gt;dev, "AD1848 device busy??\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (acard-&gt;wss-&gt;hardware != WSS_HW_CMI8330) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "AD1848 not found during probe\n");</div><div class='add'>+		dev_err(card-&gt;dev, "AD1848 not found during probe\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sbdsp_create(card, sbport[dev],</div><div class='del'>-				    sbirq[dev],</div><div class='del'>-				    snd_sb16dsp_interrupt,</div><div class='del'>-				    sbdma8[dev],</div><div class='del'>-				    sbdma16[dev],</div><div class='del'>-				    SB_HW_AUTO, &amp;acard-&gt;sb)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "SB16 device busy??\n");</div><div class='add'>+	err = snd_sbdsp_create(card, sbport[dev],</div><div class='add'>+			       sbirq[dev],</div><div class='add'>+			       snd_sb16dsp_interrupt,</div><div class='add'>+			       sbdma8[dev],</div><div class='add'>+			       sbdma16[dev],</div><div class='add'>+			       SB_HW_AUTO, &amp;acard-&gt;sb);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "SB16 device busy??\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (acard-&gt;sb-&gt;hardware != SB_HW_16) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "SB16 not found during probe\n");</div><div class='del'>-		return err;</div><div class='add'>+		dev_err(card-&gt;dev, "SB16 not found during probe\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_wss_out(acard-&gt;wss, CS4231_MISC_INFO, 0x40); /* switch on MODE2 */</div><div class='hunk'>@@ -571,22 +556,24 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		snd_wss_out(acard-&gt;wss, i,</div><div class='ctx'> 			    snd_cmi8330_image[i - CMI8330_RMUX3D]);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cmi8330_mixer(card, acard)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "failed to create mixers\n");</div><div class='add'>+	err = snd_cmi8330_mixer(card, acard);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "failed to create mixers\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cmi8330_pcm(card, acard)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "failed to create pcms\n");</div><div class='add'>+	err = snd_cmi8330_pcm(card, acard);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "failed to create pcms\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fmport[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_opl3_create(card,</div><div class='ctx'> 				    fmport[dev], fmport[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX</div><div class='del'>-				   "no OPL device at 0x%lx-0x%lx ?\n",</div><div class='del'>-				   fmport[dev], fmport[dev] + 2);</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"no OPL device at 0x%lx-0x%lx ?\n",</div><div class='add'>+				fmport[dev], fmport[dev] + 2);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -597,13 +584,13 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	if (mpuport[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='ctx'> 					mpuport[dev], 0, mpuirq[dev],</div><div class='del'>-					IRQF_DISABLED, NULL) &lt; 0)</div><div class='del'>-			printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n",</div><div class='add'>+					NULL) &lt; 0)</div><div class='add'>+			dev_err(card-&gt;dev, "no MPU-401 device at 0x%lx.\n",</div><div class='ctx'> 				mpuport[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, (acard-&gt;type == CMI8329) ? "CMI8329" : "CMI8330/C3D");</div><div class='del'>-	strcpy(card-&gt;shortname, (acard-&gt;type == CMI8329) ? "C-Media CMI8329" : "C-Media CMI8330/C3D");</div><div class='add'>+	strscpy(card-&gt;driver, (acard-&gt;type == CMI8329) ? "CMI8329" : "CMI8330/C3D");</div><div class='add'>+	strscpy(card-&gt;shortname, (acard-&gt;type == CMI8329) ? "C-Media CMI8329" : "C-Media CMI8330/C3D");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		acard-&gt;wss-&gt;port,</div><div class='hunk'>@@ -613,48 +600,38 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmi8330_isa_match(struct device *pdev,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_cmi8330_isa_match(struct device *pdev,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev] || is_isapnp_selected(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (wssport[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify wssport\n");</div><div class='add'>+		dev_err(pdev, "specify wssport\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sbport[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify sbport\n");</div><div class='add'>+		dev_err(pdev, "specify sbport\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmi8330_isa_probe(struct device *pdev,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_cmi8330_isa_probe(struct device *pdev,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_cmi8330_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_cmi8330_card_new(pdev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-	if ((err = snd_cmi8330_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cmi8330_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_cmi8330_isa_remove(struct device *devptr,</div><div class='del'>-					    unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_cmi8330_isa_suspend(struct device *dev, unsigned int n,</div><div class='ctx'> 				   pm_message_t state)</div><div class='hunk'>@@ -673,7 +650,6 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_cmi8330_driver = {</div><div class='ctx'> 	.match		= snd_cmi8330_isa_match,</div><div class='ctx'> 	.probe		= snd_cmi8330_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_cmi8330_isa_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cmi8330_isa_suspend,</div><div class='ctx'> 	.resume		= snd_cmi8330_isa_resume,</div><div class='hunk'>@@ -685,8 +661,8 @@ static struct isa_driver snd_cmi8330_driver = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					    const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+				  const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -699,30 +675,22 @@ static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 			       </div><div class='del'>-	res = snd_cmi8330_card_new(dev, &amp;card);</div><div class='add'>+	res = snd_cmi8330_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	if ((res = snd_cmi8330_pnp(dev, card-&gt;private_data, pcard, pid)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "PnP detection failed\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_cmi8330_pnp(dev, card-&gt;private_data, pcard, pid);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "PnP detection failed\n");</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-	if ((res = snd_cmi8330_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_cmi8330_probe(card, dev);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_cmi8330_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -740,7 +708,6 @@ static struct pnp_card_driver cmi8330_pnpc_driver = {</div><div class='ctx'> 	.name = "cmi8330",</div><div class='ctx'> 	.id_table = snd_cmi8330_pnpids,</div><div class='ctx'> 	.probe = snd_cmi8330_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_cmi8330_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cmi8330_pnp_suspend,</div><div class='ctx'> 	.resume		= snd_cmi8330_pnp_resume,</div><div class='head'>diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile<br/>index 6d397e8d54ac..013a777d23fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cs423x/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-cs4231-objs := cs4231.o</div><div class='del'>-snd-cs4236-objs := cs4236.o cs4236_lib.o</div><div class='add'>+snd-cs4231-y := cs4231.o</div><div class='add'>+snd-cs4236-y := cs4236.o cs4236_lib.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_CS4231) += snd-cs4231.o</div><div class='head'>diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c<br/>index cb9153e75b82..c87be4be6df1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4231.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4231.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4231.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cs423x/cs4231.c</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Generic driver for CS4231 chips</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Originally the CS4232/CS4232A driver, modified for use on CS4231 by</div><div class='ctx'>  *  Tugrul Galatali &lt;galatalt@stuy.edu&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -25,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='hunk'>@@ -37,11 +23,10 @@</div><div class='ctx'> MODULE_DESCRIPTION(CRD_NAME);</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4231}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 5,7,9,11,12,15 */</div><div class='hunk'>@@ -55,20 +40,20 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_cs4231_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[n])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -88,72 +73,62 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_cs4231_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], dma2[n],</div><div class='ctx'> 			WSS_HW_DETECT, 0, &amp;chip);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_pcm(chip, 0, &amp;pcm);</div><div class='add'>+	error = snd_wss_pcm(chip, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "CS4231");</div><div class='del'>-	strcpy(card-&gt;shortname, pcm-&gt;name);</div><div class='add'>+	strscpy(card-&gt;driver, "CS4231", sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;pcm-&gt;name, sizeof(card-&gt;shortname));</div><div class='ctx'> </div><div class='del'>-	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d",</div><div class='del'>-		pcm-&gt;name, chip-&gt;port, irq[n], dma1[n]);</div><div class='del'>-	if (dma2[n] &gt;= 0)</div><div class='del'>-		sprintf(card-&gt;longname + strlen(card-&gt;longname), "&amp;%d", dma2[n]);</div><div class='add'>+	if (dma2[n] &lt; 0)</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %d, dma %d",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[n], dma1[n]);</div><div class='add'>+	else</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[n], dma1[n], dma2[n]);</div><div class='ctx'> </div><div class='ctx'> 	error = snd_wss_mixer(chip);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_timer(chip, 0, NULL);</div><div class='add'>+	error = snd_wss_timer(chip, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[n] &gt; 0 &amp;&amp; mpu_port[n] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (mpu_irq[n] == SNDRV_AUTO_IRQ)</div><div class='ctx'> 			mpu_irq[n] = -1;</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,</div><div class='ctx'> 					mpu_port[n], 0, mpu_irq[n],</div><div class='del'>-					mpu_irq[n] &gt;= 0 ? IRQF_DISABLED : 0,</div><div class='ctx'> 					NULL) &lt; 0)</div><div class='ctx'> 			dev_warn(dev, "MPU401 not detected\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='del'>-</div><div class='ctx'> 	error = snd_card_register(card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -181,7 +156,6 @@ static int snd_cs4231_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_cs4231_driver = {</div><div class='ctx'> 	.match		= snd_cs4231_match,</div><div class='ctx'> 	.probe		= snd_cs4231_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_cs4231_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cs4231_suspend,</div><div class='ctx'> 	.resume		= snd_cs4231_resume,</div><div class='hunk'>@@ -191,15 +165,4 @@ static struct isa_driver snd_cs4231_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_cs4231_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_cs4231_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cs4231_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_cs4231_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cs4231_init);</div><div class='del'>-module_exit(alsa_card_cs4231_exit);</div><div class='add'>+module_isa_driver(snd_cs4231_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c<br/>index 999dc1e0fdbd..e36cc147651a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4236.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4236.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4236.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cs423x/cs4236.c</a></div><div class='hunk'>@@ -1,29 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for generic CS4232/CS4235/CS4236/CS4236B/CS4237B/CS4238B/CS4239 chips</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='hunk'>@@ -33,40 +18,6 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Cirrus Logic CS4232-9");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Turtle Beach,TBS-2000},"</div><div class='del'>-		"{Turtle Beach,Tropez Plus},"</div><div class='del'>-		"{SIC CrystalWave 32},"</div><div class='del'>-		"{Hewlett Packard,Omnibook 5500},"</div><div class='del'>-		"{TerraTec,Maestro 32/96},"</div><div class='del'>-		"{Philips,PCA70PS}},"</div><div class='del'>-		"{{Crystal Semiconductors,CS4235},"</div><div class='del'>-		"{Crystal Semiconductors,CS4236},"</div><div class='del'>-		"{Crystal Semiconductors,CS4237},"</div><div class='del'>-		"{Crystal Semiconductors,CS4238},"</div><div class='del'>-		"{Crystal Semiconductors,CS4239},"</div><div class='del'>-		"{Acer,AW37},"</div><div class='del'>-		"{Acer,AW35/Pro},"</div><div class='del'>-		"{Crystal,3D},"</div><div class='del'>-		"{Crystal Computer,TidalWave128},"</div><div class='del'>-		"{Dell,Optiplex GX1},"</div><div class='del'>-		"{Dell,Workstation 400 sound},"</div><div class='del'>-		"{EliteGroup,P5TX-LA sound},"</div><div class='del'>-		"{Gallant,SC-70P},"</div><div class='del'>-		"{Gateway,E1000 Onboard CS4236B},"</div><div class='del'>-		"{Genius,Sound Maker 3DJ},"</div><div class='del'>-		"{Hewlett Packard,HP6330 sound},"</div><div class='del'>-		"{IBM,PC 300PL sound},"</div><div class='del'>-		"{IBM,Aptiva 2137 E24},"</div><div class='del'>-		"{IBM,IntelliStation M Pro},"</div><div class='del'>-		"{Intel,Marlin Spike Mobo CS4235},"</div><div class='del'>-		"{Intel PR440FX Onboard},"</div><div class='del'>-		"{Guillemot,MaxiSound 16 PnP},"</div><div class='del'>-		"{NewClear,3D},"</div><div class='del'>-		"{TerraTec,AudioSystem EWS64L/XL},"</div><div class='del'>-		"{Typhoon Soundsystem,CS4236B},"</div><div class='del'>-		"{Turtle Beach,Malibu},"</div><div class='del'>-		"{Unknown,Digital PC 5000 Onboard}}");</div><div class='del'>-</div><div class='ctx'> MODULE_ALIAS("snd_cs4232");</div><div class='ctx'> </div><div class='ctx'> #define IDENT "CS4232+"</div><div class='hunk'>@@ -74,9 +25,9 @@ MODULE_ALIAS("snd_cs4232");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static long cport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='hunk'>@@ -98,23 +49,23 @@ MODULE_PARM_DESC(enable, "Enable " IDENT " soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " IDENT " driver.");</div><div class='del'>-module_param_array(cport, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(cport, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(cport, "Control port # for " IDENT " driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " IDENT " driver.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for " IDENT " driver.");</div><div class='del'>-module_param_array(sb_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(sb_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sb_port, "SB port # for " IDENT " driver (optional).");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " IDENT " driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " IDENT " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for " IDENT " driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='hunk'>@@ -125,7 +76,6 @@ static int pnp_registered;</div><div class='ctx'> </div><div class='ctx'> struct snd_card_cs4236 {</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='del'>-	struct resource *res_sb_port;</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> 	struct pnp_dev *wss;</div><div class='ctx'> 	struct pnp_dev *ctrl;</div><div class='hunk'>@@ -149,7 +99,7 @@ static const struct pnp_device_id snd_cs423x_pnpbiosids[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pnp, snd_cs423x_pnpbiosids);</div><div class='ctx'> </div><div class='ctx'> #define CS423X_ISAPNP_DRIVER	"cs4232_isapnp"</div><div class='del'>-static struct pnp_card_device_id snd_cs423x_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_cs423x_pnpids[] = {</div><div class='ctx'> 	/* Philips PCA70PS */</div><div class='ctx'> 	{ .id = "CSC0d32", .devs = { { "CSC0000" }, { "CSC0010" }, { "PNPb006" } } },</div><div class='ctx'> 	/* TerraTec Maestro 32/96 (CS4232) */</div><div class='hunk'>@@ -251,10 +201,10 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pnp_card, snd_cs423x_pnpids);</div><div class='ctx'> </div><div class='ctx'> /* WSS initialization */</div><div class='del'>-static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)</div><div class='add'>+static int snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pnp_activate_dev(pdev) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR IDENT " WSS PnP configure failed for WSS (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, IDENT " WSS PnP configure failed for WSS (out of resources?)\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -264,48 +214,51 @@ static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='ctx'> 	dma1[dev] = pnp_dma(pdev, 0);</div><div class='ctx'> 	dma2[dev] = pnp_dma(pdev, 1) == 4 ? -1 : (int)pnp_dma(pdev, 1);</div><div class='del'>-	snd_printdd("isapnp WSS: wss port=0x%lx, fm port=0x%lx, sb port=0x%lx\n",</div><div class='del'>-			port[dev], fm_port[dev], sb_port[dev]);</div><div class='del'>-	snd_printdd("isapnp WSS: irq=%i, dma1=%i, dma2=%i\n",</div><div class='del'>-			irq[dev], dma1[dev], dma2[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"isapnp WSS: wss port=0x%lx, fm port=0x%lx, sb port=0x%lx\n",</div><div class='add'>+		port[dev], fm_port[dev], sb_port[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"isapnp WSS: irq=%i, dma1=%i, dma2=%i\n",</div><div class='add'>+		irq[dev], dma1[dev], dma2[dev]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* CTRL initialization */</div><div class='del'>-static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)</div><div class='add'>+static int snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pnp_activate_dev(pdev) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, IDENT " CTRL PnP configure failed for WSS (out of resources?)\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	cport[dev] = pnp_port_start(pdev, 0);</div><div class='del'>-	snd_printdd("isapnp CTRL: control port=0x%lx\n", cport[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "isapnp CTRL: control port=0x%lx\n", cport[dev]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* MPU initialization */</div><div class='del'>-static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)</div><div class='add'>+static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pnp_activate_dev(pdev) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");</div><div class='ctx'> 		mpu_port[dev] = SNDRV_AUTO_PORT;</div><div class='ctx'> 		mpu_irq[dev] = SNDRV_AUTO_IRQ;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mpu_port[dev] = pnp_port_start(pdev, 0);</div><div class='ctx'> 		if (mpu_irq[dev] &gt;= 0 &amp;&amp;</div><div class='del'>-		    pnp_irq_valid(pdev, 0) &amp;&amp; pnp_irq(pdev, 0) &gt;= 0) {</div><div class='add'>+		    pnp_irq_valid(pdev, 0) &amp;&amp;</div><div class='add'>+		    pnp_irq(pdev, 0) != (resource_size_t)-1) {</div><div class='ctx'> 			mpu_irq[dev] = pnp_irq(pdev, 0);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mpu_irq[dev] = -1;	/* disable interrupt */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printdd("isapnp MPU: port=0x%lx, irq=%i\n", mpu_port[dev], mpu_irq[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "isapnp MPU: port=0x%lx, irq=%i\n", mpu_port[dev], mpu_irq[dev]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,</div><div class='del'>-					 struct pnp_dev *pdev,</div><div class='del'>-					 struct pnp_dev *cdev)</div><div class='add'>+static int snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,</div><div class='add'>+			       struct pnp_dev *pdev,</div><div class='add'>+			       struct pnp_dev *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	acard-&gt;wss = pdev;</div><div class='ctx'> 	if (snd_cs423x_pnp_init_wss(dev, acard-&gt;wss) &lt; 0)</div><div class='hunk'>@@ -317,9 +270,9 @@ static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,</div><div class='del'>-					  struct pnp_card_link *card,</div><div class='del'>-					  const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,</div><div class='add'>+				struct pnp_card_link *card,</div><div class='add'>+				const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	acard-&gt;wss = pnp_request_card_device(card, id-&gt;devs[0].id, NULL);</div><div class='ctx'> 	if (acard-&gt;wss == NULL)</div><div class='hunk'>@@ -357,41 +310,36 @@ static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard</div><div class='ctx'> #define is_isapnp_selected(dev)		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void snd_card_cs4236_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_card_cs4236 *acard = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	release_and_free_resource(acard-&gt;res_sb_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs423x_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_cs423x_card_new(struct device *pdev, int dev,</div><div class='add'>+			       struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_card_cs4236), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_card_cs4236), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	card-&gt;private_free = snd_card_cs4236_free;</div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card_cs4236 *acard;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='del'>-	if (sb_port[dev] &gt; 0 &amp;&amp; sb_port[dev] != SNDRV_AUTO_PORT)</div><div class='del'>-		if ((acard-&gt;res_sb_port = request_region(sb_port[dev], 16, IDENT " SB")) == NULL) {</div><div class='del'>-			printk(KERN_ERR IDENT ": unable to register SB port at 0x%lx\n", sb_port[dev]);</div><div class='add'>+	if (sb_port[dev] &gt; 0 &amp;&amp; sb_port[dev] != SNDRV_AUTO_PORT) {</div><div class='add'>+		if (!devm_request_region(card-&gt;dev, sb_port[dev], 16,</div><div class='add'>+					 IDENT " SB")) {</div><div class='add'>+			dev_err(card-&gt;dev, IDENT ": unable to register SB port at 0x%lx\n",</div><div class='add'>+				sb_port[dev]);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_cs4236_create(card, port[dev], cport[dev],</div><div class='ctx'> 			     irq[dev],</div><div class='hunk'>@@ -403,7 +351,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	acard-&gt;chip = chip;</div><div class='ctx'> 	if (chip-&gt;hardware &amp; WSS_HW_CS4236B_MASK) {</div><div class='ctx'> </div><div class='del'>-		err = snd_cs4236_pcm(chip, 0, &amp;pcm);</div><div class='add'>+		err = snd_cs4236_pcm(chip, 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +359,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	} else {</div><div class='del'>-		err = snd_wss_pcm(chip, 0, &amp;pcm);</div><div class='add'>+		err = snd_wss_pcm(chip, 0);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -419,17 +367,19 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;driver, pcm-&gt;name);</div><div class='del'>-	strcpy(card-&gt;shortname, pcm-&gt;name);</div><div class='del'>-	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i, dma %i",</div><div class='del'>-		pcm-&gt;name,</div><div class='del'>-		chip-&gt;port,</div><div class='del'>-		irq[dev],</div><div class='del'>-		dma1[dev]);</div><div class='del'>-	if (dma2[dev] &gt;= 0)</div><div class='del'>-		sprintf(card-&gt;longname + strlen(card-&gt;longname), "&amp;%d", dma2[dev]);</div><div class='del'>-</div><div class='del'>-	err = snd_wss_timer(chip, 0, NULL);</div><div class='add'>+	strscpy(card-&gt;driver, chip-&gt;pcm-&gt;name, sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;pcm-&gt;name, sizeof(card-&gt;shortname));</div><div class='add'>+	if (dma2[dev] &lt; 0)</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %i, dma %i",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[dev], dma1[dev]);</div><div class='add'>+	else</div><div class='add'>+		scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+			  "%s at 0x%lx, irq %i, dma %i&amp;%d",</div><div class='add'>+			  chip-&gt;pcm-&gt;name, chip-&gt;port, irq[dev], dma1[dev],</div><div class='add'>+			  dma2[dev]);</div><div class='add'>+</div><div class='add'>+	err = snd_wss_timer(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -437,9 +387,10 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		if (snd_opl3_create(card,</div><div class='ctx'> 				    fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_OPL3_CS, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING IDENT ": OPL3 not detected\n");</div><div class='add'>+			dev_warn(card-&gt;dev, IDENT ": OPL3 not detected\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0)</div><div class='add'>+			err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -449,16 +400,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)</div><div class='ctx'> 			mpu_irq[dev] = -1;</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,</div><div class='ctx'> 					mpu_port[dev], 0,</div><div class='del'>-					mpu_irq[dev],</div><div class='del'>-					mpu_irq[dev] &gt;= 0 ? IRQF_DISABLED : 0, NULL) &lt; 0)</div><div class='del'>-			printk(KERN_WARNING IDENT ": MPU401 not detected\n");</div><div class='add'>+					mpu_irq[dev], NULL) &lt; 0)</div><div class='add'>+			dev_warn(card-&gt;dev, IDENT ": MPU401 not detected\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs423x_isa_match(struct device *pdev,</div><div class='del'>-					  unsigned int dev)</div><div class='add'>+static int snd_cs423x_isa_match(struct device *pdev,</div><div class='add'>+				unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev] || is_isapnp_selected(dev))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -482,33 +432,22 @@ static int __devinit snd_cs423x_isa_match(struct device *pdev,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs423x_isa_probe(struct device *pdev,</div><div class='del'>-					  unsigned int dev)</div><div class='add'>+static int snd_cs423x_isa_probe(struct device *pdev,</div><div class='add'>+				unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_cs423x_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_cs423x_card_new(pdev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-	if ((err = snd_cs423x_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs423x_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_cs423x_isa_remove(struct device *pdev,</div><div class='del'>-					   unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(pdev));</div><div class='del'>-	dev_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_cs423x_suspend(struct snd_card *card)</div><div class='ctx'> {</div><div class='hunk'>@@ -541,7 +480,6 @@ static int snd_cs423x_isa_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver cs423x_isa_driver = {</div><div class='ctx'> 	.match		= snd_cs423x_isa_match,</div><div class='ctx'> 	.probe		= snd_cs423x_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_cs423x_isa_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cs423x_isa_suspend,</div><div class='ctx'> 	.resume		= snd_cs423x_isa_resume,</div><div class='hunk'>@@ -553,13 +491,13 @@ static struct isa_driver cs423x_isa_driver = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,</div><div class='del'>-					       const struct pnp_device_id *id)</div><div class='add'>+static int snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,</div><div class='add'>+				     const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct pnp_dev *cdev;</div><div class='add'>+	struct pnp_dev *cdev, *iter;</div><div class='ctx'> 	char cid[PNP_ID_LEN];</div><div class='ctx'> </div><div class='ctx'> 	if (pnp_device_is_isapnp(pdev))</div><div class='hunk'>@@ -572,38 +510,31 @@ static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare second id */</div><div class='del'>-	strcpy(cid, pdev-&gt;id[0].id);</div><div class='add'>+	strscpy(cid, pdev-&gt;id[0].id);</div><div class='ctx'> 	cid[5] = '1';</div><div class='ctx'> 	cdev = NULL;</div><div class='del'>-	list_for_each_entry(cdev, &amp;(pdev-&gt;protocol-&gt;devices), protocol_list) {</div><div class='del'>-		if (!strcmp(cdev-&gt;id[0].id, cid))</div><div class='add'>+	list_for_each_entry(iter, &amp;(pdev-&gt;protocol-&gt;devices), protocol_list) {</div><div class='add'>+		if (!strcmp(iter-&gt;id[0].id, cid)) {</div><div class='add'>+			cdev = iter;</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_cs423x_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_cs423x_card_new(&amp;pdev-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	err = snd_card_cs423x_pnp(dev, card-&gt;private_data, pdev, cdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "PnP BIOS detection failed for " IDENT "\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		dev_err(card-&gt;dev, "PnP BIOS detection failed for " IDENT "\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-	if ((err = snd_cs423x_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs423x_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_drvdata(pdev, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cs423x_pnp_remove(struct pnp_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_drvdata(pdev));</div><div class='del'>-	pnp_set_drvdata(pdev, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_cs423x_pnp_suspend(struct pnp_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -620,15 +551,14 @@ static struct pnp_driver cs423x_pnp_driver = {</div><div class='ctx'> 	.name = "cs423x-pnpbios",</div><div class='ctx'> 	.id_table = snd_cs423x_pnpbiosids,</div><div class='ctx'> 	.probe = snd_cs423x_pnpbios_detect,</div><div class='del'>-	.remove = __devexit_p(snd_cs423x_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cs423x_pnp_suspend,</div><div class='ctx'> 	.resume		= snd_cs423x_pnp_resume,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,</div><div class='del'>-					    const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,</div><div class='add'>+				  const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -641,31 +571,23 @@ static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	res = snd_cs423x_card_new(dev, &amp;card);</div><div class='add'>+	res = snd_cs423x_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	if ((res = snd_card_cs423x_pnpc(dev, card-&gt;private_data, pcard, pid)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "isapnp detection failed and probing for " IDENT</div><div class='add'>+	res = snd_card_cs423x_pnpc(dev, card-&gt;private_data, pcard, pid);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "isapnp detection failed and probing for " IDENT</div><div class='ctx'> 		       " is not supported\n");</div><div class='del'>-		snd_card_free(card);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-	if ((res = snd_cs423x_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_cs423x_probe(card, dev);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_cs423x_pnpc_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -683,7 +605,6 @@ static struct pnp_card_driver cs423x_pnpc_driver = {</div><div class='ctx'> 	.name = CS423X_ISAPNP_DRIVER,</div><div class='ctx'> 	.id_table = snd_cs423x_pnpids,</div><div class='ctx'> 	.probe = snd_cs423x_pnpc_detect,</div><div class='del'>-	.remove = __devexit_p(snd_cs423x_pnpc_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_cs423x_pnpc_suspend,</div><div class='ctx'> 	.resume		= snd_cs423x_pnpc_resume,</div><div class='head'>diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c<br/>index c5adca300632..e2c29e831020 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4236_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/cs423x/cs4236_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/cs423x/cs4236_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/cs423x/cs4236_lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of CS4235/4236B/4237B/4238B/4239 chips</div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Bugs:</div><div class='ctx'>  *     -----</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -53,7 +39,7 @@</div><div class='ctx'>  *     D7: consumer serial port enable (CS4237B,CS4238B)</div><div class='ctx'>  *     D6: channels status block reset (CS4237B,CS4238B)</div><div class='ctx'>  *     D5: user bit in sub-frame of digital audio data (CS4237B,CS4238B)</div><div class='del'>- *     D4: validity bit bit in sub-frame of digital audio data (CS4237B,CS4238B)</div><div class='add'>+ *     D4: validity bit in sub-frame of digital audio data (CS4237B,CS4238B)</div><div class='ctx'>  * </div><div class='ctx'>  *  C5  lower channel status (digital serial data description) (CS4237B,CS4238B)</div><div class='ctx'>  *     D7-D6: first two bits of category code</div><div class='hunk'>@@ -79,7 +65,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -94,7 +80,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_cs4236_ext_map[18] = {</div><div class='add'>+static const unsigned char snd_cs4236_ext_map[18] = {</div><div class='ctx'> 	/* CS4236_LEFT_LINE */		0xff,</div><div class='ctx'> 	/* CS4236_RIGHT_LINE */		0xff,</div><div class='ctx'> 	/* CS4236_LEFT_MIC */		0xdf,</div><div class='hunk'>@@ -138,7 +124,7 @@ static unsigned char snd_cs4236_ctrl_in(struct snd_wss *chip, unsigned char reg)</div><div class='ctx'> </div><div class='ctx'> #define CLOCKS 8</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum clocks[CLOCKS] = {</div><div class='add'>+static const struct snd_ratnum clocks[CLOCKS] = {</div><div class='ctx'> 	{ .num = 16934400, .den_min = 353, .den_max = 353, .den_step = 1 },</div><div class='ctx'> 	{ .num = 16934400, .den_min = 529, .den_max = 529, .den_step = 1 },</div><div class='ctx'> 	{ .num = 16934400, .den_min = 617, .den_max = 617, .den_step = 1 },</div><div class='hunk'>@@ -149,7 +135,7 @@ static struct snd_ratnum clocks[CLOCKS] = {</div><div class='ctx'> 	{ .num = 16934400/16, .den_min = 21, .den_max = 192, .den_step = 1 }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {</div><div class='ctx'> 	.nrats = CLOCKS,</div><div class='ctx'> 	.rats = clocks,</div><div class='ctx'> };</div><div class='hunk'>@@ -183,10 +169,9 @@ static void snd_cs4236_playback_format(struct snd_wss *chip,</div><div class='ctx'> 				       struct snd_pcm_hw_params *params,</div><div class='ctx'> 				       unsigned char pdfr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char rate = divisor_to_rate_register(params-&gt;rate_den);</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* set fast playback format change and clean playback FIFO */</div><div class='ctx'> 	snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 		    chip-&gt;image[CS4231_ALT_FEATURE_1] | 0x10);</div><div class='hunk'>@@ -194,17 +179,15 @@ static void snd_cs4236_playback_format(struct snd_wss *chip,</div><div class='ctx'> 	snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 		    chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; ~0x10);</div><div class='ctx'> 	snd_cs4236_ext_out(chip, CS4236_DAC_RATE, rate);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs4236_capture_format(struct snd_wss *chip,</div><div class='ctx'> 				      struct snd_pcm_hw_params *params,</div><div class='ctx'> 				      unsigned char cdfr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char rate = divisor_to_rate_register(params-&gt;rate_den);</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* set fast capture format change and clean capture FIFO */</div><div class='ctx'> 	snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 		    chip-&gt;image[CS4231_ALT_FEATURE_1] | 0x20);</div><div class='hunk'>@@ -212,7 +195,6 @@ static void snd_cs4236_capture_format(struct snd_wss *chip,</div><div class='ctx'> 	snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 		    chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; ~0x20);</div><div class='ctx'> 	snd_cs4236_ext_out(chip, CS4236_ADC_RATE, rate);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -220,48 +202,45 @@ static void snd_cs4236_capture_format(struct snd_wss *chip,</div><div class='ctx'> static void snd_cs4236_suspend(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	for (reg = 0; reg &lt; 32; reg++)</div><div class='ctx'> 		chip-&gt;image[reg] = snd_wss_in(chip, reg);</div><div class='ctx'> 	for (reg = 0; reg &lt; 18; reg++)</div><div class='ctx'> 		chip-&gt;eimage[reg] = snd_cs4236_ext_in(chip, CS4236_I23VAL(reg));</div><div class='ctx'> 	for (reg = 2; reg &lt; 9; reg++)</div><div class='ctx'> 		chip-&gt;cimage[reg] = snd_cs4236_ctrl_in(chip, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs4236_resume(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	for (reg = 0; reg &lt; 32; reg++) {</div><div class='del'>-		switch (reg) {</div><div class='del'>-		case CS4236_EXT_REG:</div><div class='del'>-		case CS4231_VERSION:</div><div class='del'>-		case 27:	/* why? CS4235 - master left */</div><div class='del'>-		case 29:	/* why? CS4235 - master right */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			snd_wss_out(chip, reg, chip-&gt;image[reg]);</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		for (reg = 0; reg &lt; 32; reg++) {</div><div class='add'>+			switch (reg) {</div><div class='add'>+			case CS4236_EXT_REG:</div><div class='add'>+			case CS4231_VERSION:</div><div class='add'>+			case 27:	/* why? CS4235 - master left */</div><div class='add'>+			case 29:	/* why? CS4235 - master right */</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				snd_wss_out(chip, reg, chip-&gt;image[reg]);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	for (reg = 0; reg &lt; 18; reg++)</div><div class='del'>-		snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), chip-&gt;eimage[reg]);</div><div class='del'>-	for (reg = 2; reg &lt; 9; reg++) {</div><div class='del'>-		switch (reg) {</div><div class='del'>-		case 7:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			snd_cs4236_ctrl_out(chip, reg, chip-&gt;cimage[reg]);</div><div class='add'>+		for (reg = 0; reg &lt; 18; reg++)</div><div class='add'>+			snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), chip-&gt;eimage[reg]);</div><div class='add'>+		for (reg = 2; reg &lt; 9; reg++) {</div><div class='add'>+			switch (reg) {</div><div class='add'>+			case 7:</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				snd_cs4236_ctrl_out(chip, reg, chip-&gt;cimage[reg]);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -293,8 +272,8 @@ int snd_cs4236_create(struct snd_card *card,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if ((chip-&gt;hardware &amp; WSS_HW_CS4236B_MASK) == 0) {</div><div class='del'>-		snd_printd("chip is not CS4236+, hardware=0x%x\n",</div><div class='del'>-			   chip-&gt;hardware);</div><div class='add'>+		dev_dbg(card-&gt;dev, "chip is not CS4236+, hardware=0x%x\n",</div><div class='add'>+			chip-&gt;hardware);</div><div class='ctx'> 		*rchip = chip;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -302,27 +281,25 @@ int snd_cs4236_create(struct snd_card *card,</div><div class='ctx'> 	{</div><div class='ctx'> 		int idx;</div><div class='ctx'> 		for (idx = 0; idx &lt; 8; idx++)</div><div class='del'>-			snd_printk(KERN_DEBUG "CD%i = 0x%x\n",</div><div class='del'>-				   idx, inb(chip-&gt;cport + idx));</div><div class='add'>+			dev_dbg(card-&gt;dev, "CD%i = 0x%x\n",</div><div class='add'>+				idx, inb(chip-&gt;cport + idx));</div><div class='ctx'> 		for (idx = 0; idx &lt; 9; idx++)</div><div class='del'>-			snd_printk(KERN_DEBUG "C%i = 0x%x\n",</div><div class='del'>-				   idx, snd_cs4236_ctrl_in(chip, idx));</div><div class='add'>+			dev_dbg(card-&gt;dev, "C%i = 0x%x\n",</div><div class='add'>+				idx, snd_cs4236_ctrl_in(chip, idx));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (cport &lt; 0x100 || cport == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR "please, specify control port "</div><div class='del'>-			   "for CS4236+ chips\n");</div><div class='del'>-		snd_device_free(card, chip);</div><div class='add'>+		dev_err(card-&gt;dev, "please, specify control port for CS4236+ chips\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	ver1 = snd_cs4236_ctrl_in(chip, 1);</div><div class='ctx'> 	ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION);</div><div class='del'>-	snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n",</div><div class='del'>-			cport, ver1, ver2);</div><div class='add'>+	dev_dbg(card-&gt;dev, "CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n",</div><div class='add'>+		cport, ver1, ver2);</div><div class='ctx'> 	if (ver1 != ver2) {</div><div class='del'>-		snd_printk(KERN_ERR "CS4236+ chip detected, but "</div><div class='del'>-			   "control port 0x%lx is not valid\n", cport);</div><div class='del'>-		snd_device_free(card, chip);</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"CS4236+ chip detected, but control port 0x%lx is not valid\n",</div><div class='add'>+			cport);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_cs4236_ctrl_out(chip, 0, 0x00);</div><div class='hunk'>@@ -376,17 +353,14 @@ int snd_cs4236_create(struct snd_card *card,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm)</div><div class='add'>+int snd_cs4236_pcm(struct snd_wss *chip, int device)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	err = snd_wss_pcm(chip, device, &amp;pcm);</div><div class='add'>+	err = snd_wss_pcm(chip, device);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	pcm-&gt;info_flags &amp;= ~SNDRV_PCM_INFO_JOINT_DUPLEX;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+	chip-&gt;pcm-&gt;info_flags &amp;= ~SNDRV_PCM_INFO_JOINT_DUPLEX;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -422,15 +396,13 @@ static int snd_cs4236_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_cs4236_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;eimage[CS4236_REG(reg)] &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -439,7 +411,6 @@ static int snd_cs4236_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_cs4236_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -451,11 +422,10 @@ static int snd_cs4236_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val = (chip-&gt;eimage[CS4236_REG(reg)] &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != chip-&gt;eimage[CS4236_REG(reg)];</div><div class='ctx'> 	snd_cs4236_ext_out(chip, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -468,15 +438,13 @@ static int snd_cs4236_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_cs4236_get_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;cimage[reg] &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -485,7 +453,6 @@ static int snd_cs4236_get_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_cs4236_put_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -497,11 +464,10 @@ static int snd_cs4236_put_singlec(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val = (chip-&gt;cimage[reg] &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != chip-&gt;cimage[reg];</div><div class='ctx'> 	snd_cs4236_ctrl_out(chip, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -535,7 +501,6 @@ static int snd_cs4236_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_cs4236_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -543,10 +508,9 @@ static int snd_cs4236_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;eimage[CS4236_REG(left_reg)] &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (chip-&gt;eimage[CS4236_REG(right_reg)] &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='hunk'>@@ -557,7 +521,6 @@ static int snd_cs4236_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_cs4236_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -575,7 +538,7 @@ static int snd_cs4236_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (left_reg != right_reg) {</div><div class='ctx'> 		val1 = (chip-&gt;eimage[CS4236_REG(left_reg)] &amp; ~(mask &lt;&lt; shift_left)) | val1;</div><div class='ctx'> 		val2 = (chip-&gt;eimage[CS4236_REG(right_reg)] &amp; ~(mask &lt;&lt; shift_right)) | val2;</div><div class='hunk'>@@ -587,7 +550,6 @@ static int snd_cs4236_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 		change = val1 != chip-&gt;eimage[CS4236_REG(left_reg)];</div><div class='ctx'> 		snd_cs4236_ext_out(chip, left_reg, val1);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -611,7 +573,6 @@ static int snd_cs4236_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_cs4236_get_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -619,10 +580,9 @@ static int snd_cs4236_get_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;image[left_reg] &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (chip-&gt;eimage[CS4236_REG(right_reg)] &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='hunk'>@@ -633,7 +593,6 @@ static int snd_cs4236_get_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_cs4236_put_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -651,13 +610,12 @@ static int snd_cs4236_put_double1(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val1 = (chip-&gt;image[left_reg] &amp; ~(mask &lt;&lt; shift_left)) | val1;</div><div class='ctx'> 	val2 = (chip-&gt;eimage[CS4236_REG(right_reg)] &amp; ~(mask &lt;&lt; shift_right)) | val2;</div><div class='ctx'> 	change = val1 != chip-&gt;image[left_reg] || val2 != chip-&gt;eimage[CS4236_REG(right_reg)];</div><div class='ctx'> 	snd_wss_out(chip, left_reg, val1);</div><div class='ctx'> 	snd_cs4236_ext_out(chip, right_reg, val2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -677,31 +635,27 @@ static inline int snd_cs4236_mixer_master_digital_invert_volume(int vol)</div><div class='ctx'> static int snd_cs4236_get_master_digital(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = snd_cs4236_mixer_master_digital_invert_volume(chip-&gt;eimage[CS4236_REG(CS4236_LEFT_MASTER)] &amp; 0x7f);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = snd_cs4236_mixer_master_digital_invert_volume(chip-&gt;eimage[CS4236_REG(CS4236_RIGHT_MASTER)] &amp; 0x7f);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs4236_put_master_digital(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short val1, val2;</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = snd_cs4236_mixer_master_digital_invert_volume(ucontrol-&gt;value.integer.value[0] &amp; 0x7f);</div><div class='ctx'> 	val2 = snd_cs4236_mixer_master_digital_invert_volume(ucontrol-&gt;value.integer.value[1] &amp; 0x7f);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val1 = (chip-&gt;eimage[CS4236_REG(CS4236_LEFT_MASTER)] &amp; ~0x7f) | val1;</div><div class='ctx'> 	val2 = (chip-&gt;eimage[CS4236_REG(CS4236_RIGHT_MASTER)] &amp; ~0x7f) | val2;</div><div class='ctx'> 	change = val1 != chip-&gt;eimage[CS4236_REG(CS4236_LEFT_MASTER)] || val2 != chip-&gt;eimage[CS4236_REG(CS4236_RIGHT_MASTER)];</div><div class='ctx'> 	snd_cs4236_ext_out(chip, CS4236_LEFT_MASTER, val1);</div><div class='ctx'> 	snd_cs4236_ext_out(chip, CS4236_RIGHT_MASTER, val2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -738,31 +692,27 @@ static inline int snd_cs4235_mixer_output_accu_set_volume(int vol)</div><div class='ctx'> static int snd_cs4235_get_output_accu(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = snd_cs4235_mixer_output_accu_get_volume(chip-&gt;image[CS4235_LEFT_MASTER]);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = snd_cs4235_mixer_output_accu_get_volume(chip-&gt;image[CS4235_RIGHT_MASTER]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs4235_put_output_accu(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short val1, val2;</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = snd_cs4235_mixer_output_accu_set_volume(ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> 	val2 = snd_cs4235_mixer_output_accu_set_volume(ucontrol-&gt;value.integer.value[1]);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val1 = (chip-&gt;image[CS4235_LEFT_MASTER] &amp; ~(3 &lt;&lt; 5)) | val1;</div><div class='ctx'> 	val2 = (chip-&gt;image[CS4235_RIGHT_MASTER] &amp; ~(3 &lt;&lt; 5)) | val2;</div><div class='ctx'> 	change = val1 != chip-&gt;image[CS4235_LEFT_MASTER] || val2 != chip-&gt;image[CS4235_RIGHT_MASTER];</div><div class='ctx'> 	snd_wss_out(chip, CS4235_LEFT_MASTER, val1);</div><div class='ctx'> 	snd_wss_out(chip, CS4235_RIGHT_MASTER, val2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -775,7 +725,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_2bit, -1800, 600, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4236_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4236_controls[] = {</div><div class='ctx'> </div><div class='ctx'> CS4236_DOUBLE("Master Digital Playback Switch", 0,</div><div class='ctx'> 		CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1),</div><div class='hunk'>@@ -870,7 +820,7 @@ CS4236_DOUBLE1_TLV("Loopback Digital Playback Volume", 0,</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_5bit_6db_max, -5600, 200, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_2bit_16db_max, -2400, 800, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4235_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4235_controls[] = {</div><div class='ctx'> </div><div class='ctx'> WSS_DOUBLE("Master Playback Switch", 0,</div><div class='ctx'> 		CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1),</div><div class='hunk'>@@ -948,62 +898,58 @@ WSS_DOUBLE("Analog Loopback Switch", 0,</div><div class='ctx'> static int snd_cs4236_get_iec958_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; 0x02 ? 1 : 0;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "</div><div class='del'>-	       "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",</div><div class='del'>-			snd_wss_in(chip, CS4231_ALT_FEATURE_1),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 3),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 4),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 5),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 6),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 8));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"get valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",</div><div class='add'>+		snd_wss_in(chip, CS4231_ALT_FEATURE_1),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 3),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 4),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 5),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 6),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 8));</div><div class='ctx'> #endif</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short enable, val;</div><div class='ctx'> 	</div><div class='ctx'> 	enable = ucontrol-&gt;value.integer.value[0] &amp; 1;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mce_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	val = (chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; ~0x0e) | (0&lt;&lt;2) | (enable &lt;&lt; 1);</div><div class='del'>-	change = val != chip-&gt;image[CS4231_ALT_FEATURE_1];</div><div class='del'>-	snd_wss_out(chip, CS4231_ALT_FEATURE_1, val);</div><div class='del'>-	val = snd_cs4236_ctrl_in(chip, 4) | 0xc0;</div><div class='del'>-	snd_cs4236_ctrl_out(chip, 4, val);</div><div class='del'>-	udelay(100);</div><div class='del'>-	val &amp;= ~0x40;</div><div class='del'>-	snd_cs4236_ctrl_out(chip, 4, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		val = (chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; ~0x0e) | (0&lt;&lt;2) | (enable &lt;&lt; 1);</div><div class='add'>+		change = val != chip-&gt;image[CS4231_ALT_FEATURE_1];</div><div class='add'>+		snd_wss_out(chip, CS4231_ALT_FEATURE_1, val);</div><div class='add'>+		val = snd_cs4236_ctrl_in(chip, 4) | 0xc0;</div><div class='add'>+		snd_cs4236_ctrl_out(chip, 4, val);</div><div class='add'>+		udelay(100);</div><div class='add'>+		val &amp;= ~0x40;</div><div class='add'>+		snd_cs4236_ctrl_out(chip, 4, val);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, "</div><div class='del'>-	       "C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",</div><div class='del'>-			snd_wss_in(chip, CS4231_ALT_FEATURE_1),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 3),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 4),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 5),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 6),</div><div class='del'>-			snd_cs4236_ctrl_in(chip, 8));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",</div><div class='add'>+		snd_wss_in(chip, CS4231_ALT_FEATURE_1),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 3),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 4),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 5),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 6),</div><div class='add'>+		snd_cs4236_ctrl_in(chip, 8));</div><div class='ctx'> #endif</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {</div><div class='ctx'> CS4236_IEC958_ENABLE("IEC958 Output Enable", 0),</div><div class='ctx'> CS4236_SINGLEC("IEC958 Output Validity", 0, 4, 4, 1, 0),</div><div class='ctx'> CS4236_SINGLEC("IEC958 Output User", 0, 4, 5, 1, 0),</div><div class='hunk'>@@ -1012,12 +958,12 @@ CS4236_SINGLEC("IEC958 Output Channel Status Low", 0, 5, 1, 127, 0),</div><div class='ctx'> CS4236_SINGLEC("IEC958 Output Channel Status High", 0, 6, 0, 255, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {</div><div class='ctx'> CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),</div><div class='ctx'> CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {</div><div class='ctx'> CS4236_SINGLEC("3D Control - Switch", 0, 3, 7, 1, 0),</div><div class='ctx'> CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),</div><div class='ctx'> CS4236_SINGLEC("3D Control - Center", 0, 2, 0, 15, 1),</div><div class='hunk'>@@ -1025,7 +971,7 @@ CS4236_SINGLEC("3D Control - Mono", 0, 3, 6, 1, 0),</div><div class='ctx'> CS4236_SINGLEC("3D Control - IEC958", 0, 3, 5, 1, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {</div><div class='ctx'> CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),</div><div class='ctx'> CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),</div><div class='ctx'> CS4236_SINGLEC("3D Control - Volume", 0, 2, 0, 15, 1),</div><div class='hunk'>@@ -1037,22 +983,24 @@ int snd_cs4236_mixer(struct snd_wss *chip)</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	unsigned int idx, count;</div><div class='ctx'> 	int err;</div><div class='del'>-	struct snd_kcontrol_new *kcontrol;</div><div class='add'>+	const struct snd_kcontrol_new *kcontrol;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!chip || !chip-&gt;card))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	card = chip-&gt;card;</div><div class='del'>-	strcpy(card-&gt;mixername, snd_wss_chip_id(chip));</div><div class='add'>+	strscpy(card-&gt;mixername, snd_wss_chip_id(chip));</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;hardware == WSS_HW_CS4235 ||</div><div class='ctx'> 	    chip-&gt;hardware == WSS_HW_CS4239) {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_cs4235_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4235_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4235_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_cs4236_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4236_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4236_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1075,13 +1023,15 @@ int snd_cs4236_mixer(struct snd_wss *chip)</div><div class='ctx'> 		kcontrol = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 0; idx &lt; count; idx++, kcontrol++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(kcontrol, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(kcontrol, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;hardware == WSS_HW_CS4237B ||</div><div class='ctx'> 	    chip-&gt;hardware == WSS_HW_CS4238B) {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_cs4236_iec958_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4236_iec958_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4236_iec958_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/isa/es1688/Makefile b/sound/isa/es1688/Makefile<br/>index aee1e4ddb22a..7d6c44a8eaad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/es1688/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-es1688-lib-objs := es1688_lib.o</div><div class='del'>-snd-es1688-objs := es1688.o</div><div class='add'>+snd-es1688-lib-y := es1688_lib.o</div><div class='add'>+snd-es1688-y := es1688.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o</div><div class='head'>diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c<br/>index 0cde8131a575..6a95dfb7600a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/es1688.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/es1688.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/es1688.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/es1688/es1688.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for generic ESS AudioDrive ESx688 soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -25,7 +10,7 @@</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/es1688.h&gt;</div><div class='hunk'>@@ -41,19 +26,14 @@</div><div class='ctx'> MODULE_DESCRIPTION(CRD_NAME);</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"</div><div class='del'>-	        "{ESS,ES1688 PnP AudioDrive,pnp:ESS0102},"</div><div class='del'>-	        "{ESS,ES688 AudioDrive,pnp:ESS6881},"</div><div class='del'>-	        "{ESS,ES1688 AudioDrive,pnp:ESS1681}}");</div><div class='del'>-</div><div class='ctx'> MODULE_ALIAS("snd_es968");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='ctx'> #endif</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260 */</div><div class='ctx'> static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* Usually 0x388 */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};</div><div class='hunk'>@@ -71,17 +51,17 @@ module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for ES1688 driver.");</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='hunk'>@@ -90,18 +70,18 @@ MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");</div><div class='ctx'> #define is_isapnp_selected(dev)		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1688_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_es1688_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[n] &amp;&amp; !is_isapnp_selected(n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1688_legacy_create(struct snd_card *card,</div><div class='del'>-					struct device *dev, unsigned int n)</div><div class='add'>+static int snd_es1688_legacy_create(struct snd_card *card,</div><div class='add'>+				    struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = card-&gt;private_data;</div><div class='del'>-	static long possible_ports[] = {0x220, 0x240, 0x260};</div><div class='del'>-	static int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='del'>-	static int possible_dmas[] = {1, 3, 0, -1};</div><div class='add'>+	static const long possible_ports[] = {0x220, 0x240, 0x260};</div><div class='add'>+	static const int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='add'>+	static const int possible_dmas[] = {1, 3, 0, -1};</div><div class='ctx'> </div><div class='ctx'> 	int i, error;</div><div class='ctx'> </div><div class='hunk'>@@ -134,14 +114,13 @@ static int __devinit snd_es1688_legacy_create(struct snd_card *card,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)</div><div class='add'>+static int snd_es1688_probe(struct snd_card *card, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = card-&gt;private_data;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_es1688_pcm(card, chip, 0, &amp;pcm);</div><div class='add'>+	error = snd_es1688_pcm(card, chip, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -149,11 +128,11 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	strlcpy(card-&gt;driver, "ES1688", sizeof(card-&gt;driver));</div><div class='del'>-	strlcpy(card-&gt;shortname, pcm-&gt;name, sizeof(card-&gt;shortname));</div><div class='del'>-	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='del'>-		"%s at 0x%lx, irq %i, dma %i", pcm-&gt;name, chip-&gt;port,</div><div class='del'>-		 chip-&gt;irq, chip-&gt;dma8);</div><div class='add'>+	strscpy(card-&gt;driver, "ES1688", sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;pcm-&gt;name, sizeof(card-&gt;shortname));</div><div class='add'>+	scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		  "%s at 0x%lx, irq %i, dma %i", chip-&gt;pcm-&gt;name, chip-&gt;port,</div><div class='add'>+		  chip-&gt;irq, chip-&gt;dma8);</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port[n] == SNDRV_AUTO_PORT)</div><div class='ctx'> 		fm_port[n] = port[n];	/* share the same port */</div><div class='hunk'>@@ -174,7 +153,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)</div><div class='ctx'> 			chip-&gt;mpu_port &gt; 0) {</div><div class='ctx'> 		error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,</div><div class='ctx'> 				chip-&gt;mpu_port, 0,</div><div class='del'>-				mpu_irq[n], IRQF_DISABLED, NULL);</div><div class='add'>+				mpu_irq[n], NULL);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='ctx'> 			return error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -182,45 +161,32 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_es1688_isa_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_es1688), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_es1688), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_es1688_legacy_create(card, dev, n);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_es1688_probe(card, n);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_es1688_driver = {</div><div class='ctx'> 	.match		= snd_es1688_match,</div><div class='ctx'> 	.probe		= snd_es1688_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_es1688_isa_remove),</div><div class='ctx'> #if 0	/* FIXME */</div><div class='ctx'> 	.suspend	= snd_es1688_suspend,</div><div class='ctx'> 	.resume		= snd_es1688_resume,</div><div class='hunk'>@@ -233,9 +199,9 @@ static struct isa_driver snd_es1688_driver = {</div><div class='ctx'> static int snd_es968_pnp_is_probed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,</div><div class='del'>-					struct pnp_card_link *pcard,</div><div class='del'>-					const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,</div><div class='add'>+			      struct pnp_card_link *pcard,</div><div class='add'>+			      const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = card-&gt;private_data;</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='hunk'>@@ -247,7 +213,7 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,</div><div class='ctx'> </div><div class='ctx'> 	error = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "ES968 pnp configure failure\n");</div><div class='add'>+		dev_err(card-&gt;dev, "ES968 pnp configure failure\n");</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> 	port[n] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -258,13 +224,12 @@ static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,</div><div class='ctx'> 				 mpu_irq[n], dma8[n], ES1688_HW_AUTO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					  const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_es968_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+				const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	static unsigned int dev;</div><div class='ctx'> 	int error;</div><div class='del'>-	struct snd_es1688 *chip;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_es968_pnp_is_probed)</div><div class='ctx'> 		return -EBUSY;</div><div class='hunk'>@@ -275,18 +240,15 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev == SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_es1688), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				  index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_es1688), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_card_es968_pnp(card, dev, pcard, pid);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> 	error = snd_es1688_probe(card, dev);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -295,10 +257,8 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)</div><div class='add'>+static void snd_es968_pnp_remove(struct pnp_card_link *pcard)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='ctx'> 	snd_es968_pnp_is_probed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -307,10 +267,8 @@ static int snd_es968_pnp_suspend(struct pnp_card_link *pcard,</div><div class='ctx'> 				 pm_message_t state)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = pnp_get_card_drvdata(pcard);</div><div class='del'>-	struct snd_es1688 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -325,7 +283,7 @@ static int snd_es968_pnp_resume(struct pnp_card_link *pcard)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_es968_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_es968_pnpids[] = {</div><div class='ctx'> 	{ .id = "ESS0968", .devs = { { "@@@0968" }, } },</div><div class='ctx'> 	{ .id = "ESS0968", .devs = { { "ESS0968" }, } },</div><div class='ctx'> 	{ .id = "", } /* end */</div><div class='hunk'>@@ -338,7 +296,7 @@ static struct pnp_card_driver es968_pnpc_driver = {</div><div class='ctx'> 	.name		= DEV_NAME " PnP",</div><div class='ctx'> 	.id_table	= snd_es968_pnpids,</div><div class='ctx'> 	.probe		= snd_es968_pnp_detect,</div><div class='del'>-	.remove		= __devexit_p(snd_es968_pnp_remove),</div><div class='add'>+	.remove		= snd_es968_pnp_remove,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_es968_pnp_suspend,</div><div class='ctx'> 	.resume		= snd_es968_pnp_resume,</div><div class='head'>diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c<br/>index 07676200496a..59987dbc9ae9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/es1688_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es1688/es1688_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/es1688/es1688_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/es1688/es1688_lib.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of ESS ES1688/688/488 chip</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,11 +9,12 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/es1688.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='hunk'>@@ -44,9 +30,7 @@ static int snd_es1688_dsp_command(struct snd_es1688 *chip, unsigned char val)</div><div class='ctx'> 			outb(val, ES1688P(chip, COMMAND));</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	printk(KERN_DEBUG "snd_es1688_dsp_command: timeout (0x%x)\n", val);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%s: timeout (0x%x)\n", __func__, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +41,8 @@ static int snd_es1688_dsp_get_byte(struct snd_es1688 *chip)</div><div class='ctx'> 	for (i = 1000; i; i--)</div><div class='ctx'> 		if (inb(ES1688P(chip, DATA_AVAIL)) &amp; 0x80)</div><div class='ctx'> 			return inb(ES1688P(chip, READ));</div><div class='del'>-	snd_printd("es1688 get byte failed: 0x%lx = 0x%x!!!\n", ES1688P(chip, DATA_AVAIL), inb(ES1688P(chip, DATA_AVAIL)));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "es1688 get byte failed: 0x%lx = 0x%x!!!\n",</div><div class='add'>+		ES1688P(chip, DATA_AVAIL), inb(ES1688P(chip, DATA_AVAIL)));</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +94,8 @@ int snd_es1688_reset(struct snd_es1688 *chip)</div><div class='ctx'> 	udelay(30);</div><div class='ctx'> 	for (i = 0; i &lt; 1000 &amp;&amp; !(inb(ES1688P(chip, DATA_AVAIL)) &amp; 0x80); i++);</div><div class='ctx'> 	if (inb(ES1688P(chip, READ)) != 0xaa) {</div><div class='del'>-		snd_printd("ess_reset at 0x%lx: failed!!!\n", chip-&gt;port);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "ess_reset at 0x%lx: failed!!!\n",</div><div class='add'>+			chip-&gt;port);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_es1688_dsp_command(chip, 0xc6);	/* enable extended mode */</div><div class='hunk'>@@ -119,85 +105,82 @@ EXPORT_SYMBOL(snd_es1688_reset);</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_probe(struct snd_es1688 *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short major, minor, hw;</div><div class='add'>+	unsigned short major, minor;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  initialization sequence</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);	/* Some ESS1688 cards need this */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='del'>-	inb(ES1688P(chip, ENABLE0));	/* ENABLE0 */</div><div class='del'>-</div><div class='del'>-	if (snd_es1688_reset(chip) &lt; 0) {</div><div class='del'>-		snd_printdd("ESS: [0x%lx] reset failed... 0x%x\n", chip-&gt;port, inb(ES1688P(chip, READ)));</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	snd_es1688_dsp_command(chip, 0xe7);	/* return identification */</div><div class='del'>-</div><div class='del'>-	for (i = 1000, major = minor = 0; i; i--) {</div><div class='del'>-		if (inb(ES1688P(chip, DATA_AVAIL)) &amp; 0x80) {</div><div class='del'>-			if (major == 0) {</div><div class='del'>-				major = inb(ES1688P(chip, READ));</div><div class='del'>-			} else {</div><div class='del'>-				minor = inb(ES1688P(chip, READ));</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {	/* Some ESS1688 cards need this */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE2));	/* ENABLE2 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE1));	/* ENABLE1 */</div><div class='add'>+		inb(ES1688P(chip, ENABLE0));	/* ENABLE0 */</div><div class='add'>+</div><div class='add'>+		if (snd_es1688_reset(chip) &lt; 0) {</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "ESS: [0x%lx] reset failed... 0x%x\n",</div><div class='add'>+				chip-&gt;port, inb(ES1688P(chip, READ)));</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		snd_es1688_dsp_command(chip, 0xe7);	/* return identification */</div><div class='add'>+</div><div class='add'>+		for (i = 1000, major = minor = 0; i; i--) {</div><div class='add'>+			if (inb(ES1688P(chip, DATA_AVAIL)) &amp; 0x80) {</div><div class='add'>+				if (major == 0)</div><div class='add'>+					major = inb(ES1688P(chip, READ));</div><div class='add'>+				else</div><div class='add'>+					minor = inb(ES1688P(chip, READ));</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-	snd_printdd("ESS: [0x%lx] found.. major = 0x%x, minor = 0x%x\n", chip-&gt;port, major, minor);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"ESS: [0x%lx] found.. major = 0x%x, minor = 0x%x\n",</div><div class='add'>+		chip-&gt;port, major, minor);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;version = (major &lt;&lt; 8) | minor;</div><div class='ctx'> 	if (!chip-&gt;version)</div><div class='ctx'> 		return -ENODEV;	/* probably SB */</div><div class='ctx'> </div><div class='del'>-	hw = ES1688_HW_AUTO;</div><div class='ctx'> 	switch (chip-&gt;version &amp; 0xfff0) {</div><div class='ctx'> 	case 0x4880:</div><div class='del'>-		snd_printk(KERN_ERR "[0x%lx] ESS: AudioDrive ES488 detected, "</div><div class='del'>-			   "but driver is in another place\n", chip-&gt;port);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"[0x%lx] ESS: AudioDrive ES488 detected, but driver is in another place\n",</div><div class='add'>+			chip-&gt;port);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	case 0x6880:</div><div class='del'>-		hw = (chip-&gt;version &amp; 0x0f) &gt;= 8 ? ES1688_HW_1688 : ES1688_HW_688;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "[0x%lx] ESS: unknown AudioDrive chip "</div><div class='del'>-			   "with version 0x%x (Jazz16 soundcard?)\n",</div><div class='del'>-			   chip-&gt;port, chip-&gt;version);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"[0x%lx] ESS: unknown AudioDrive chip with version 0x%x (Jazz16 soundcard?)\n",</div><div class='add'>+			chip-&gt;port, chip-&gt;version);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_write(chip, 0xb1, 0x10);	/* disable IRQ */</div><div class='del'>-	snd_es1688_write(chip, 0xb2, 0x00);	/* disable DMA */</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_write(chip, 0xb1, 0x10);	/* disable IRQ */</div><div class='add'>+		snd_es1688_write(chip, 0xb2, 0x00);	/* disable DMA */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable joystick, but disable OPL3 */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-	snd_es1688_mixer_write(chip, 0x40, 0x01);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_es1688_mixer_write(chip, 0x40, 0x01);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_init(struct snd_es1688 * chip, int enable)</div><div class='ctx'> {</div><div class='del'>-	static int irqs[16] = {-1, -1, 0, -1, -1, 1, -1, 2, -1, 0, 3, -1, -1, -1, -1, -1};</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	static const int irqs[16] = {-1, -1, 0, -1, -1, 1, -1, 2, -1, 0, 3, -1, -1, -1, -1, -1};</div><div class='ctx'> 	int cfg, irq_bits, dma, dma_bits, tmp, tmp1;</div><div class='ctx'> </div><div class='ctx'> 	/* ok.. setup MPU-401 port and joystick and OPL3 */</div><div class='hunk'>@@ -226,38 +209,36 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-#if 0</div><div class='del'>-	snd_printk(KERN_DEBUG "mpu cfg = 0x%x\n", cfg);</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_mixer_write(chip, 0x40, cfg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_mixer_write(chip, 0x40, cfg);</div><div class='add'>+	}</div><div class='ctx'> 	/* --- */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_read(chip, 0xb1);</div><div class='del'>-	snd_es1688_read(chip, 0xb2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_read(chip, 0xb1);</div><div class='add'>+		snd_es1688_read(chip, 0xb2);</div><div class='add'>+	}</div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		cfg = 0xf0;	/* enable only DMA counter interrupt */</div><div class='ctx'> 		irq_bits = irqs[chip-&gt;irq &amp; 0x0f];</div><div class='ctx'> 		if (irq_bits &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "[0x%lx] ESS: bad IRQ %d "</div><div class='del'>-				   "for ES1688 chip!!\n",</div><div class='del'>-				   chip-&gt;port, chip-&gt;irq);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"[0x%lx] ESS: bad IRQ %d for ES1688 chip!!\n",</div><div class='add'>+				chip-&gt;port, chip-&gt;irq);</div><div class='ctx'> #if 0</div><div class='ctx'> 			irq_bits = 0;</div><div class='ctx'> 			cfg = 0x10;</div><div class='ctx'> #endif</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		snd_es1688_write(chip, 0xb1, cfg | (irq_bits &lt;&lt; 2));</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			snd_es1688_write(chip, 0xb1, cfg | (irq_bits &lt;&lt; 2));</div><div class='add'>+		}</div><div class='ctx'> 		cfg = 0xf0;	/* extended mode DMA enable */</div><div class='ctx'> 		dma = chip-&gt;dma8;</div><div class='ctx'> 		if (dma &gt; 3 || dma == 2) {</div><div class='del'>-			snd_printk(KERN_ERR "[0x%lx] ESS: bad DMA channel %d "</div><div class='del'>-				   "for ES1688 chip!!\n", chip-&gt;port, dma);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"[0x%lx] ESS: bad DMA channel %d for ES1688 chip!!\n",</div><div class='add'>+				chip-&gt;port, dma);</div><div class='ctx'> #if 0</div><div class='ctx'> 			dma_bits = 0;</div><div class='ctx'> 			cfg = 0x00;	/* disable all DMA */</div><div class='hunk'>@@ -268,20 +249,20 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)</div><div class='ctx'> 			if (dma != 3)</div><div class='ctx'> 				dma_bits++;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		snd_es1688_write(chip, 0xb2, cfg | (dma_bits &lt;&lt; 2));</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			snd_es1688_write(chip, 0xb2, cfg | (dma_bits &lt;&lt; 2));</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		snd_es1688_write(chip, 0xb1, 0x10);	/* disable IRQ */</div><div class='del'>-		snd_es1688_write(chip, 0xb2, 0x00);	/* disable DMA */</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			snd_es1688_write(chip, 0xb1, 0x10);	/* disable IRQ */</div><div class='add'>+			snd_es1688_write(chip, 0xb2, 0x00);	/* disable DMA */</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_read(chip, 0xb1);</div><div class='add'>+		snd_es1688_read(chip, 0xb2);</div><div class='add'>+		snd_es1688_reset(chip);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_read(chip, 0xb1);</div><div class='del'>-	snd_es1688_read(chip, 0xb2);</div><div class='del'>-	snd_es1688_reset(chip);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -289,7 +270,7 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum clocks[2] = {</div><div class='add'>+static const struct snd_ratnum clocks[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 795444,</div><div class='ctx'> 		.den_min = 1,</div><div class='hunk'>@@ -304,7 +285,7 @@ static struct snd_ratnum clocks[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {</div><div class='ctx'> 	.nrats = 2,</div><div class='ctx'> 	.rats = clocks,</div><div class='ctx'> };</div><div class='hunk'>@@ -325,12 +306,6 @@ static void snd_es1688_set_rate(struct snd_es1688 *chip, struct snd_pcm_substrea</div><div class='ctx'> 	snd_es1688_write(chip, 0xa2, divider);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_es1688_ioctl(struct snd_pcm_substream *substream,</div><div class='del'>-			    unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char value)</div><div class='ctx'> {</div><div class='ctx'> 	int val;</div><div class='hunk'>@@ -340,85 +315,70 @@ static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char va</div><div class='ctx'> 	} else if (cmd != SNDRV_PCM_TRIGGER_START) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;trigger_value = value;</div><div class='ctx'> 	val = snd_es1688_read(chip, 0xb8);</div><div class='del'>-	if ((val &lt; 0) || (val &amp; 0x0f) == value) {</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if ((val &lt; 0) || (val &amp; 0x0f) == value)</div><div class='ctx'> 		return -EINVAL;	/* something is wrong */</div><div class='del'>-	}</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "trigger: val = 0x%x, value = 0x%x\n", val, value);</div><div class='del'>-	printk(KERN_DEBUG "trigger: pointer = 0x%x\n",</div><div class='del'>-	       snd_dma_pointer(chip-&gt;dma8, chip-&gt;dma_size));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "trigger: val = 0x%x, value = 0x%x\n", val, value);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "trigger: pointer = 0x%x\n",</div><div class='add'>+		snd_dma_pointer(chip-&gt;dma8, chip-&gt;dma_size));</div><div class='ctx'> #endif</div><div class='ctx'> 	snd_es1688_write(chip, 0xb8, (val &amp; 0xf0) | value);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_es1688_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_es1688_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_es1688_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_es1688 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	unsigned int count = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;dma_size = size;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_reset(chip);</div><div class='del'>-	snd_es1688_set_rate(chip, substream);</div><div class='del'>-	snd_es1688_write(chip, 0xb8, 4);	/* auto init DMA mode */</div><div class='del'>-	snd_es1688_write(chip, 0xa8, (snd_es1688_read(chip, 0xa8) &amp; ~0x03) | (3 - runtime-&gt;channels));</div><div class='del'>-	snd_es1688_write(chip, 0xb9, 2);	/* demand mode (4 bytes/request) */</div><div class='del'>-	if (runtime-&gt;channels == 1) {</div><div class='del'>-		if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='del'>-			/* 8. bit mono */</div><div class='del'>-			snd_es1688_write(chip, 0xb6, 0x80);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x51);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xd0);</div><div class='del'>-		} else {</div><div class='del'>-			/* 16. bit mono */</div><div class='del'>-			snd_es1688_write(chip, 0xb6, 0x00);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x71);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xf4);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='del'>-			/* 8. bit stereo */</div><div class='del'>-			snd_es1688_write(chip, 0xb6, 0x80);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x51);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x98);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_reset(chip);</div><div class='add'>+		snd_es1688_set_rate(chip, substream);</div><div class='add'>+		snd_es1688_write(chip, 0xb8, 4);	/* auto init DMA mode */</div><div class='add'>+		snd_es1688_write(chip, 0xa8, (snd_es1688_read(chip, 0xa8) &amp; ~0x03) | (3 - runtime-&gt;channels));</div><div class='add'>+		snd_es1688_write(chip, 0xb9, 2);	/* demand mode (4 bytes/request) */</div><div class='add'>+		if (runtime-&gt;channels == 1) {</div><div class='add'>+			if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='add'>+				/* 8. bit mono */</div><div class='add'>+				snd_es1688_write(chip, 0xb6, 0x80);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x51);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xd0);</div><div class='add'>+			} else {</div><div class='add'>+				/* 16. bit mono */</div><div class='add'>+				snd_es1688_write(chip, 0xb6, 0x00);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x71);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xf4);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			/* 16. bit stereo */</div><div class='del'>-			snd_es1688_write(chip, 0xb6, 0x00);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x71);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xbc);</div><div class='add'>+			if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='add'>+				/* 8. bit stereo */</div><div class='add'>+				snd_es1688_write(chip, 0xb6, 0x80);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x51);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x98);</div><div class='add'>+			} else {</div><div class='add'>+				/* 16. bit stereo */</div><div class='add'>+				snd_es1688_write(chip, 0xb6, 0x00);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x71);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xbc);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		snd_es1688_write(chip, 0xb1, (snd_es1688_read(chip, 0xb1) &amp; 0x0f) | 0x50);</div><div class='add'>+		snd_es1688_write(chip, 0xb2, (snd_es1688_read(chip, 0xb2) &amp; 0x0f) | 0x50);</div><div class='add'>+		snd_es1688_dsp_command(chip, ES1688_DSP_CMD_SPKON);</div><div class='ctx'> 	}</div><div class='del'>-	snd_es1688_write(chip, 0xb1, (snd_es1688_read(chip, 0xb1) &amp; 0x0f) | 0x50);</div><div class='del'>-	snd_es1688_write(chip, 0xb2, (snd_es1688_read(chip, 0xb2) &amp; 0x0f) | 0x50);</div><div class='del'>-	snd_es1688_dsp_command(chip, ES1688_DSP_CMD_SPKON);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	/* --- */</div><div class='ctx'> 	count = -count;</div><div class='ctx'> 	snd_dma_program(chip-&gt;dma8, runtime-&gt;dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_write(chip, 0xa4, (unsigned char) count);</div><div class='del'>-	snd_es1688_write(chip, 0xa5, (unsigned char) (count &gt;&gt; 8));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_write(chip, 0xa4, (unsigned char) count);</div><div class='add'>+		snd_es1688_write(chip, 0xa5, (unsigned char) (count &gt;&gt; 8));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -431,51 +391,50 @@ static int snd_es1688_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_es1688 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	unsigned int count = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;dma_size = size;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_reset(chip);</div><div class='del'>-	snd_es1688_set_rate(chip, substream);</div><div class='del'>-	snd_es1688_dsp_command(chip, ES1688_DSP_CMD_SPKOFF);</div><div class='del'>-	snd_es1688_write(chip, 0xb8, 0x0e);	/* auto init DMA mode */</div><div class='del'>-	snd_es1688_write(chip, 0xa8, (snd_es1688_read(chip, 0xa8) &amp; ~0x03) | (3 - runtime-&gt;channels));</div><div class='del'>-	snd_es1688_write(chip, 0xb9, 2);	/* demand mode (4 bytes/request) */</div><div class='del'>-	if (runtime-&gt;channels == 1) {</div><div class='del'>-		if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='del'>-			/* 8. bit mono */</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x51);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xd0);</div><div class='del'>-		} else {</div><div class='del'>-			/* 16. bit mono */</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x71);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xf4);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='del'>-			/* 8. bit stereo */</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x51);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x98);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_reset(chip);</div><div class='add'>+		snd_es1688_set_rate(chip, substream);</div><div class='add'>+		snd_es1688_dsp_command(chip, ES1688_DSP_CMD_SPKOFF);</div><div class='add'>+		snd_es1688_write(chip, 0xb8, 0x0e);	/* auto init DMA mode */</div><div class='add'>+		snd_es1688_write(chip, 0xa8, (snd_es1688_read(chip, 0xa8) &amp; ~0x03) | (3 - runtime-&gt;channels));</div><div class='add'>+		snd_es1688_write(chip, 0xb9, 2);	/* demand mode (4 bytes/request) */</div><div class='add'>+		if (runtime-&gt;channels == 1) {</div><div class='add'>+			if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='add'>+				/* 8. bit mono */</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x51);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xd0);</div><div class='add'>+			} else {</div><div class='add'>+				/* 16. bit mono */</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x71);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xf4);</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			/* 16. bit stereo */</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0x71);</div><div class='del'>-			snd_es1688_write(chip, 0xb7, 0xbc);</div><div class='add'>+			if (snd_pcm_format_width(runtime-&gt;format) == 8) {</div><div class='add'>+				/* 8. bit stereo */</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x51);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x98);</div><div class='add'>+			} else {</div><div class='add'>+				/* 16. bit stereo */</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0x71);</div><div class='add'>+				snd_es1688_write(chip, 0xb7, 0xbc);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		snd_es1688_write(chip, 0xb1, (snd_es1688_read(chip, 0xb1) &amp; 0x0f) | 0x50);</div><div class='add'>+		snd_es1688_write(chip, 0xb2, (snd_es1688_read(chip, 0xb2) &amp; 0x0f) | 0x50);</div><div class='ctx'> 	}</div><div class='del'>-	snd_es1688_write(chip, 0xb1, (snd_es1688_read(chip, 0xb1) &amp; 0x0f) | 0x50);</div><div class='del'>-	snd_es1688_write(chip, 0xb2, (snd_es1688_read(chip, 0xb2) &amp; 0x0f) | 0x50);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	/* --- */</div><div class='ctx'> 	count = -count;</div><div class='ctx'> 	snd_dma_program(chip-&gt;dma8, runtime-&gt;dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_es1688_write(chip, 0xa4, (unsigned char) count);</div><div class='del'>-	snd_es1688_write(chip, 0xa5, (unsigned char) (count &gt;&gt; 8));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1688_write(chip, 0xa4, (unsigned char) count);</div><div class='add'>+		snd_es1688_write(chip, 0xa5, (unsigned char) (count &gt;&gt; 8));</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -525,7 +484,7 @@ static snd_pcm_uframes_t snd_es1688_capture_pointer(struct snd_pcm_substream *su</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es1688_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_es1688_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -543,7 +502,7 @@ static struct snd_pcm_hardware snd_es1688_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es1688_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_es1688_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -611,10 +570,9 @@ static int snd_es1688_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_free(struct snd_es1688 *chip)</div><div class='ctx'> {</div><div class='del'>-	if (chip-&gt;res_port) {</div><div class='add'>+	if (chip-&gt;hardware != ES1688_HW_UNDEF)</div><div class='ctx'> 		snd_es1688_init(chip, 0);</div><div class='del'>-		release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-	}</div><div class='add'>+	release_and_free_resource(chip-&gt;res_port);</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(chip-&gt;irq, (void *) chip);</div><div class='ctx'> 	if (chip-&gt;dma8 &gt;= 0) {</div><div class='hunk'>@@ -646,7 +604,7 @@ int snd_es1688_create(struct snd_card *card,</div><div class='ctx'> 		      int dma8,</div><div class='ctx'> 		      unsigned short hardware)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =	snd_es1688_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'>                                 </div><div class='hunk'>@@ -654,21 +612,31 @@ int snd_es1688_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	if (chip == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	chip-&gt;dma8 = -1;</div><div class='add'>+	chip-&gt;hardware = ES1688_HW_UNDEF;</div><div class='ctx'> 	</div><div class='del'>-	if ((chip-&gt;res_port = request_region(port + 4, 12, "ES1688")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	chip-&gt;res_port = request_region(port + 4, 12, "ES1688");</div><div class='add'>+	if (chip-&gt;res_port == NULL) {</div><div class='add'>+		dev_err(card-&gt;dev, "es1688: can't grab port 0x%lx\n", port + 4);</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "es1688: can't grab IRQ %d\n", irq);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='del'>-	if (request_dma(dma8, "ES1688")) {</div><div class='del'>-		snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	err = request_dma(dma8, "ES1688");</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "es1688: can't grab DMA8 %d\n", dma8);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma8 = dma8;</div><div class='ctx'> </div><div class='hunk'>@@ -684,40 +652,37 @@ int snd_es1688_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	err = snd_es1688_probe(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_es1688_init(chip, 1);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	/* Register device */</div><div class='del'>-	return snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='add'>+exit:</div><div class='add'>+	if (err)</div><div class='add'>+		snd_es1688_free(chip);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1688_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1688_playback_ops = {</div><div class='ctx'> 	.open =			snd_es1688_playback_open,</div><div class='ctx'> 	.close =		snd_es1688_playback_close,</div><div class='del'>-	.ioctl =		snd_es1688_ioctl,</div><div class='del'>-	.hw_params =		snd_es1688_hw_params,</div><div class='del'>-	.hw_free =		snd_es1688_hw_free,</div><div class='ctx'> 	.prepare =		snd_es1688_playback_prepare,</div><div class='ctx'> 	.trigger =		snd_es1688_playback_trigger,</div><div class='ctx'> 	.pointer =		snd_es1688_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1688_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1688_capture_ops = {</div><div class='ctx'> 	.open =			snd_es1688_capture_open,</div><div class='ctx'> 	.close =		snd_es1688_capture_close,</div><div class='del'>-	.ioctl =		snd_es1688_ioctl,</div><div class='del'>-	.hw_params =		snd_es1688_hw_params,</div><div class='del'>-	.hw_free =		snd_es1688_hw_free,</div><div class='ctx'> 	.prepare =		snd_es1688_capture_prepare,</div><div class='ctx'> 	.trigger =		snd_es1688_capture_trigger,</div><div class='ctx'> 	.pointer =		snd_es1688_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,</div><div class='del'>-		   int device, struct snd_pcm **rpcm)</div><div class='add'>+int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -731,15 +696,11 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='del'>-	sprintf(pcm-&gt;name, snd_es1688_chip_id(chip));</div><div class='add'>+	strscpy(pcm-&gt;name, snd_es1688_chip_id(chip));</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, 64*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, card-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -749,18 +710,12 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[9] = {</div><div class='add'>+	static const char * const texts[8] = {</div><div class='ctx'> 		"Mic", "Mic Master", "CD", "AOUT",</div><div class='ctx'> 		"Mic1", "Mix", "Line", "Master"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 7)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 7;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 8, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -773,19 +728,17 @@ static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> static int snd_es1688_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char oval, nval;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] &gt; 8)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	oval = snd_es1688_mixer_read(chip, ES1688_REC_DEV);</div><div class='ctx'> 	nval = (ucontrol-&gt;value.enumerated.item[0] &amp; 7) | (oval &amp; ~15);</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_es1688_mixer_write(chip, ES1688_REC_DEV, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -809,15 +762,13 @@ static int snd_es1688_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_es1688_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (snd_es1688_mixer_read(chip, reg) &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -826,7 +777,6 @@ static int snd_es1688_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_es1688_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -838,13 +788,12 @@ static int snd_es1688_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		nval = mask - nval;</div><div class='ctx'> 	nval &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	oval = snd_es1688_mixer_read(chip, reg);</div><div class='ctx'> 	nval = (oval &amp; ~(mask &lt;&lt; shift)) | nval;</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_es1688_mixer_write(chip, reg, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -868,7 +817,6 @@ static int snd_es1688_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_es1688_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -877,7 +825,7 @@ static int snd_es1688_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	unsigned char left, right;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (left_reg &lt; 0xa0)</div><div class='ctx'> 		left = snd_es1688_mixer_read(chip, left_reg);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -889,7 +837,6 @@ static int snd_es1688_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 			right = snd_es1688_read(chip, right_reg);</div><div class='ctx'> 	} else</div><div class='ctx'> 		right = left;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (left &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (right &gt;&gt; shift_right) &amp; mask;</div><div class='ctx'> 	if (invert) {</div><div class='hunk'>@@ -902,7 +849,6 @@ static int snd_es1688_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int snd_es1688_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es1688 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -920,7 +866,7 @@ static int snd_es1688_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (left_reg != right_reg) {</div><div class='ctx'> 		if (left_reg &lt; 0xa0)</div><div class='ctx'> 			oval1 = snd_es1688_mixer_read(chip, left_reg);</div><div class='hunk'>@@ -958,11 +904,10 @@ static int snd_es1688_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 		}</div><div class='ctx'> 			</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es1688_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es1688_controls[] = {</div><div class='ctx'> ES1688_DOUBLE("Master Playback Volume", 0, ES1688_MASTER_DEV, ES1688_MASTER_DEV, 4, 0, 15, 0),</div><div class='ctx'> ES1688_DOUBLE("PCM Playback Volume", 0, ES1688_PCM_DEV, ES1688_PCM_DEV, 4, 0, 15, 0),</div><div class='ctx'> ES1688_DOUBLE("Line Playback Volume", 0, ES1688_LINE_DEV, ES1688_LINE_DEV, 4, 0, 15, 0),</div><div class='hunk'>@@ -984,7 +929,7 @@ ES1688_SINGLE("Capture Switch", 0, ES1688_REC_DEV, 4, 1, 1),</div><div class='ctx'> </div><div class='ctx'> #define ES1688_INIT_TABLE_SIZE (sizeof(snd_es1688_init_table)/2)</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_es1688_init_table[][2] = {</div><div class='add'>+static const unsigned char snd_es1688_init_table[][2] = {</div><div class='ctx'> 	{ ES1688_MASTER_DEV, 0 },</div><div class='ctx'> 	{ ES1688_PCM_DEV, 0 },</div><div class='ctx'> 	{ ES1688_LINE_DEV, 0 },</div><div class='hunk'>@@ -1006,10 +951,11 @@ int snd_es1688_mixer(struct snd_card *card, struct snd_es1688 *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!chip || !card))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, snd_es1688_chip_id(chip));</div><div class='add'>+	strscpy(card-&gt;mixername, snd_es1688_chip_id(chip));</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_es1688_controls); idx++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es1688_controls[idx], chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es1688_controls[idx], chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 0; idx &lt; ES1688_INIT_TABLE_SIZE; idx++) {</div><div class='hunk'>@@ -1027,19 +973,3 @@ EXPORT_SYMBOL(snd_es1688_mixer_write);</div><div class='ctx'> EXPORT_SYMBOL(snd_es1688_create);</div><div class='ctx'> EXPORT_SYMBOL(snd_es1688_pcm);</div><div class='ctx'> EXPORT_SYMBOL(snd_es1688_mixer);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_es1688_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_es1688_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_es1688_init)</div><div class='del'>-module_exit(alsa_es1688_exit)</div><div class='head'>diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c<br/>index fb4d6b34bbca..1da7b400a17b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/es18xx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/es18xx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/es18xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/es18xx.c</a></div><div class='hunk'>@@ -1,23 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for generic ESS AudioDrive ES18xx soundcards</div><div class='ctx'>  *  Copyright (c) by Christian Fischbach &lt;fishbach@pool.informatik.rwth-aachen.de&gt;</div><div class='ctx'>  *  Copyright (c) by Abramo Bagnara &lt;abramo@alsa-project.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> /* GENERAL NOTES:</div><div class='ctx'>  *</div><div class='hunk'>@@ -82,10 +67,10 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -97,14 +82,10 @@</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_DMA</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#define PFX "es18xx: "</div><div class='del'>-</div><div class='ctx'> struct snd_es18xx {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	unsigned long port;		/* port of ESS chip */</div><div class='ctx'> 	unsigned long ctrl_port;	/* Control port of ESS chip */</div><div class='del'>-	struct resource *res_port;</div><div class='del'>-	struct resource *res_mpu_port;</div><div class='del'>-	struct resource *res_ctrl_port;</div><div class='ctx'> 	int irq;			/* IRQ number of ESS chip */</div><div class='ctx'> 	int dma1;			/* DMA1 */</div><div class='ctx'> 	int dma2;			/* DMA2 */</div><div class='hunk'>@@ -156,6 +137,7 @@ struct snd_es18xx {</div><div class='ctx'> #define ES18XX_I2S	0x0200	/* I2S mixer control */</div><div class='ctx'> #define ES18XX_MUTEREC	0x0400	/* Record source can be muted */</div><div class='ctx'> #define ES18XX_CONTROL	0x0800	/* Has control ports */</div><div class='add'>+#define ES18XX_GPO_2BIT	0x1000	/* GPO0,1 controlled by PM port */</div><div class='ctx'> </div><div class='ctx'> /* Power Management */</div><div class='ctx'> #define ES18XX_PM	0x07</div><div class='hunk'>@@ -182,7 +164,7 @@ static int snd_es18xx_dsp_command(struct snd_es18xx *chip, unsigned char val)</div><div class='ctx'>                         outb(val, chip-&gt;port + 0x0C);</div><div class='ctx'>                         return 0;</div><div class='ctx'>                 }</div><div class='del'>-	snd_printk(KERN_ERR "dsp_command: timeout (0x%x)\n", val);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "dsp_command: timeout (0x%x)\n", val);</div><div class='ctx'>         return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -193,8 +175,8 @@ static int snd_es18xx_dsp_get_byte(struct snd_es18xx *chip)</div><div class='ctx'>         for(i = MILLISECOND/10; i; i--)</div><div class='ctx'>                 if (inb(chip-&gt;port + 0x0C) &amp; 0x40)</div><div class='ctx'>                         return inb(chip-&gt;port + 0x0A);</div><div class='del'>-	snd_printk(KERN_ERR "dsp_get_byte failed: 0x%lx = 0x%x!!!\n",</div><div class='del'>-		   chip-&gt;port + 0x0A, inb(chip-&gt;port + 0x0A));</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "dsp_get_byte failed: 0x%lx = 0x%x!!!\n",</div><div class='add'>+		chip-&gt;port + 0x0A, inb(chip-&gt;port + 0x0A));</div><div class='ctx'>         return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -203,40 +185,35 @@ static int snd_es18xx_dsp_get_byte(struct snd_es18xx *chip)</div><div class='ctx'> static int snd_es18xx_write(struct snd_es18xx *chip,</div><div class='ctx'> 			    unsigned char reg, unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ret = snd_es18xx_dsp_command(chip, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto end;</div><div class='add'>+		return ret;</div><div class='ctx'>         ret = snd_es18xx_dsp_command(chip, data);</div><div class='del'>- end:</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, data);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x set to %02x\n", reg, data);</div><div class='ctx'> #endif</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es18xx_read(struct snd_es18xx *chip, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int ret, data;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ret = snd_es18xx_dsp_command(chip, 0xC0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto end;</div><div class='add'>+		return ret;</div><div class='ctx'>         ret = snd_es18xx_dsp_command(chip, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto end;</div><div class='add'>+		return ret;</div><div class='ctx'> 	data = snd_es18xx_dsp_get_byte(chip);</div><div class='ctx'> 	ret = data;</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Reg %02x now is %02x (%d)\n", reg, data, ret);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x now is %02x (%d)\n", reg, data, ret);</div><div class='ctx'> #endif</div><div class='del'>- end:</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -246,62 +223,55 @@ static int snd_es18xx_bits(struct snd_es18xx *chip, unsigned char reg,</div><div class='ctx'> {</div><div class='ctx'>         int ret;</div><div class='ctx'> 	unsigned char old, new, oval;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'>         ret = snd_es18xx_dsp_command(chip, 0xC0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto end;</div><div class='add'>+		return ret;</div><div class='ctx'>         ret = snd_es18xx_dsp_command(chip, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto end;</div><div class='add'>+		return ret;</div><div class='ctx'> 	ret = snd_es18xx_dsp_get_byte(chip);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		goto end;</div><div class='del'>-	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> 	old = ret;</div><div class='ctx'> 	oval = old &amp; mask;</div><div class='ctx'> 	if (val != oval) {</div><div class='ctx'> 		ret = snd_es18xx_dsp_command(chip, reg);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto end;</div><div class='add'>+			return ret;</div><div class='ctx'> 		new = (old &amp; ~mask) | (val &amp; mask);</div><div class='ctx'> 		ret = snd_es18xx_dsp_command(chip, new);</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='del'>-			goto end;</div><div class='add'>+			return ret;</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-		snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x (%d)\n",</div><div class='del'>-			   reg, old, new, ret);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x was %02x, set to %02x (%d)\n",</div><div class='add'>+			reg, old, new, ret);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	ret = oval;</div><div class='del'>- end:</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return ret;</div><div class='add'>+	return oval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void snd_es18xx_mixer_write(struct snd_es18xx *chip,</div><div class='ctx'> 			    unsigned char reg, unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'>         outb(reg, chip-&gt;port + 0x04);</div><div class='ctx'>         outb(data, chip-&gt;port + 0x05);</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, data);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x set to %02x\n", reg, data);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int snd_es18xx_mixer_read(struct snd_es18xx *chip, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int data;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'>         outb(reg, chip-&gt;port + 0x04);</div><div class='ctx'> 	data = inb(chip-&gt;port + 0x05);</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x now is %02x\n", reg, data);</div><div class='ctx'> #endif</div><div class='ctx'>         return data;</div><div class='ctx'> }</div><div class='hunk'>@@ -311,8 +281,8 @@ static inline int snd_es18xx_mixer_bits(struct snd_es18xx *chip, unsigned char r</div><div class='ctx'> 					unsigned char mask, unsigned char val)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char old, new, oval;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'>         outb(reg, chip-&gt;port + 0x04);</div><div class='ctx'> 	old = inb(chip-&gt;port + 0x05);</div><div class='ctx'> 	oval = old &amp; mask;</div><div class='hunk'>@@ -320,11 +290,10 @@ static inline int snd_es18xx_mixer_bits(struct snd_es18xx *chip, unsigned char r</div><div class='ctx'> 		new = (old &amp; ~mask) | (val &amp; mask);</div><div class='ctx'> 		outb(new, chip-&gt;port + 0x05);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-		snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n",</div><div class='del'>-			   reg, old, new);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x was %02x, set to %02x\n",</div><div class='add'>+			reg, old, new);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> 	return oval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -332,23 +301,22 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch</div><div class='ctx'> 					    unsigned char mask)</div><div class='ctx'> {</div><div class='ctx'> 	int old, expected, new;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-        spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'>         outb(reg, chip-&gt;port + 0x04);</div><div class='ctx'> 	old = inb(chip-&gt;port + 0x05);</div><div class='ctx'> 	expected = old ^ mask;</div><div class='ctx'> 	outb(expected, chip-&gt;port + 0x05);</div><div class='ctx'> 	new = inb(chip-&gt;port + 0x05);</div><div class='del'>-        spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x, now is %02x\n",</div><div class='del'>-		   reg, old, expected, new);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x was %02x, set to %02x, now is %02x\n",</div><div class='add'>+		reg, old, expected, new);</div><div class='ctx'> #endif</div><div class='ctx'> 	return expected == new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_reset(struct snd_es18xx *chip)</div><div class='add'>+static int snd_es18xx_reset(struct snd_es18xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'>         outb(0x03, chip-&gt;port + 0x06);</div><div class='hunk'>@@ -368,7 +336,7 @@ static int snd_es18xx_reset_fifo(struct snd_es18xx *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum new_clocks[2] = {</div><div class='add'>+static const struct snd_ratnum new_clocks[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 793800,</div><div class='ctx'> 		.den_min = 1,</div><div class='hunk'>@@ -383,12 +351,12 @@ static struct snd_ratnum new_clocks[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {</div><div class='ctx'> 	.nrats = 2,</div><div class='ctx'> 	.rats = new_clocks,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum old_clocks[2] = {</div><div class='add'>+static const struct snd_ratnum old_clocks[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 795444,</div><div class='ctx'> 		.den_min = 1,</div><div class='hunk'>@@ -403,7 +371,7 @@ static struct snd_ratnum old_clocks[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {</div><div class='ctx'> 	.nrats = 2,</div><div class='ctx'> 	.rats = old_clocks,</div><div class='ctx'> };</div><div class='hunk'>@@ -448,7 +416,7 @@ static int snd_es18xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 					 struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int shift, err;</div><div class='add'>+	int shift;</div><div class='ctx'> </div><div class='ctx'> 	shift = 0;</div><div class='ctx'> 	if (params_channels(hw_params) == 2)</div><div class='hunk'>@@ -467,16 +435,9 @@ static int snd_es18xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		chip-&gt;dma1_shift = shift;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_es18xx_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_es18xx_playback1_prepare(struct snd_es18xx *chip,</div><div class='ctx'> 					struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -520,7 +481,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,</div><div class='ctx'> 			snd_es18xx_mixer_write(chip, 0x78, 0x93);</div><div class='ctx'> #ifdef AVOID_POPS</div><div class='ctx'> 		/* Avoid pops */</div><div class='del'>-                udelay(100000);</div><div class='add'>+		mdelay(100);</div><div class='ctx'> 		if (chip-&gt;caps &amp; ES18XX_PCM2)</div><div class='ctx'> 			/* Restore Audio 2 volume */</div><div class='ctx'> 			snd_es18xx_mixer_write(chip, 0x7C, chip-&gt;audio2_vol);</div><div class='hunk'>@@ -537,7 +498,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,</div><div class='ctx'>                 /* Stop DMA */</div><div class='ctx'>                 snd_es18xx_mixer_write(chip, 0x78, 0x00);</div><div class='ctx'> #ifdef AVOID_POPS</div><div class='del'>-                udelay(25000);</div><div class='add'>+		mdelay(25);</div><div class='ctx'> 		if (chip-&gt;caps &amp; ES18XX_PCM2)</div><div class='ctx'> 			/* Set Audio 2 volume to 0 */</div><div class='ctx'> 			snd_es18xx_mixer_write(chip, 0x7C, 0);</div><div class='hunk'>@@ -557,7 +518,7 @@ static int snd_es18xx_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 					struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int shift, err;</div><div class='add'>+	int shift;</div><div class='ctx'> </div><div class='ctx'> 	shift = 0;</div><div class='ctx'> 	if ((chip-&gt;caps &amp; ES18XX_DUPLEX_MONO) &amp;&amp;</div><div class='hunk'>@@ -571,8 +532,6 @@ static int snd_es18xx_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (snd_pcm_format_width(params_format(hw_params)) == 16)</div><div class='ctx'> 		shift++;</div><div class='ctx'> 	chip-&gt;dma1_shift = shift;</div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,7 +555,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_es18xx_write(chip, 0xA5, count &gt;&gt; 8);</div><div class='ctx'> </div><div class='ctx'> #ifdef AVOID_POPS</div><div class='del'>-	udelay(100000);</div><div class='add'>+	mdelay(100);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>         /* Set format */</div><div class='hunk'>@@ -691,7 +650,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,</div><div class='ctx'>                 snd_es18xx_write(chip, 0xB8, 0x05);</div><div class='ctx'> #ifdef AVOID_POPS</div><div class='ctx'> 		/* Avoid pops */</div><div class='del'>-                udelay(100000);</div><div class='add'>+		mdelay(100);</div><div class='ctx'>                 /* Enable Audio 1 */</div><div class='ctx'>                 snd_es18xx_dsp_command(chip, 0xD1);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -705,7 +664,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,</div><div class='ctx'>                 snd_es18xx_write(chip, 0xB8, 0x00);</div><div class='ctx'> #ifdef AVOID_POPS</div><div class='ctx'> 		/* Avoid pops */</div><div class='del'>-                udelay(25000);</div><div class='add'>+		mdelay(25);</div><div class='ctx'>                 /* Disable Audio 1 */</div><div class='ctx'>                 snd_es18xx_dsp_command(chip, 0xD3);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -837,7 +796,7 @@ static snd_pcm_uframes_t snd_es18xx_capture_pointer(struct snd_pcm_substream *su</div><div class='ctx'> 	return pos &gt;&gt; chip-&gt;dma1_shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es18xx_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_es18xx_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='hunk'>@@ -857,7 +816,7 @@ static struct snd_pcm_hardware snd_es18xx_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es18xx_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_es18xx_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='hunk'>@@ -929,7 +888,6 @@ static int snd_es18xx_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;playback_b_substream = NULL;</div><div class='ctx'> 	</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -938,7 +896,6 @@ static int snd_es18xx_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'>         struct snd_es18xx *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'>         chip-&gt;capture_a_substream = NULL;</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -964,49 +921,33 @@ static int snd_es18xx_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts5Source[5] = {</div><div class='add'>+	static const char * const texts5Source[5] = {</div><div class='ctx'> 		"Mic", "CD", "Line", "Master", "Mix"</div><div class='ctx'> 	};</div><div class='del'>-	static char *texts8Source[8] = {</div><div class='add'>+	static const char * const texts8Source[8] = {</div><div class='ctx'> 		"Mic", "Mic Master", "CD", "AOUT",</div><div class='ctx'> 		"Mic1", "Mix", "Line", "Master"</div><div class='ctx'> 	};</div><div class='ctx'> 	struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='ctx'> 	switch (chip-&gt;version) {</div><div class='ctx'> 	case 0x1868:</div><div class='ctx'> 	case 0x1878:</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-			texts5Source[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-		break;</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 4, texts5Source);</div><div class='ctx'> 	case 0x1887:</div><div class='ctx'> 	case 0x1888:</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt; 4)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = 4;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, texts5Source[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-		break;</div><div class='del'>-	case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 5, texts5Source);</div><div class='add'>+	case 0x1869: /* DS somewhat contradictory for 1869: could be 5 or 8 */</div><div class='ctx'> 	case 0x1879:</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt; 7)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = 7;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, texts8Source[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-		break;</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 8, texts8Source);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3};</div><div class='add'>+	static const unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3};</div><div class='ctx'> 	struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int muxSource = snd_es18xx_mixer_read(chip, 0x1c) &amp; 0x07;</div><div class='ctx'> 	if (!(chip-&gt;version == 0x1869 || chip-&gt;version == 0x1879)) {</div><div class='hunk'>@@ -1023,7 +964,7 @@ static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> </div><div class='ctx'> static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char map4Source[4] = {0, 2, 6, 7};</div><div class='add'>+	static const unsigned char map4Source[4] = {0, 2, 6, 7};</div><div class='ctx'> 	struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned char val = ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 	unsigned char retVal = 0;</div><div class='hunk'>@@ -1039,6 +980,7 @@ static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 			val = 3;</div><div class='ctx'> 		} else</div><div class='ctx'> 			retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x00) != 0x00;</div><div class='add'>+		fallthrough;</div><div class='ctx'>  /* 4 source chips */</div><div class='ctx'> 	case 0x1868:</div><div class='ctx'> 	case 0x1878:</div><div class='hunk'>@@ -1136,11 +1078,14 @@ static int snd_es18xx_reg_read(struct snd_es18xx *chip, unsigned char reg)</div><div class='ctx'> 		return snd_es18xx_read(chip, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define ES18XX_SINGLE(xname, xindex, reg, shift, mask, invert) \</div><div class='add'>+#define ES18XX_SINGLE(xname, xindex, reg, shift, mask, flags) \</div><div class='ctx'> { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \</div><div class='ctx'>   .info = snd_es18xx_info_single, \</div><div class='ctx'>   .get = snd_es18xx_get_single, .put = snd_es18xx_put_single, \</div><div class='del'>-  .private_value = reg | (shift &lt;&lt; 8) | (mask &lt;&lt; 16) | (invert &lt;&lt; 24) }</div><div class='add'>+  .private_value = reg | (shift &lt;&lt; 8) | (mask &lt;&lt; 16) | (flags &lt;&lt; 24) }</div><div class='add'>+</div><div class='add'>+#define ES18XX_FL_INVERT	(1 &lt;&lt; 0)</div><div class='add'>+#define ES18XX_FL_PMPORT	(1 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> static int snd_es18xx_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='hunk'>@@ -1159,10 +1104,14 @@ static int snd_es18xx_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; ES18XX_FL_INVERT;</div><div class='add'>+	int pm_port = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; ES18XX_FL_PMPORT;</div><div class='ctx'> 	int val;</div><div class='del'>-	</div><div class='del'>-	val = snd_es18xx_reg_read(chip, reg);</div><div class='add'>+</div><div class='add'>+	if (pm_port)</div><div class='add'>+		val = inb(chip-&gt;port + ES18XX_PM);</div><div class='add'>+	else</div><div class='add'>+		val = snd_es18xx_reg_read(chip, reg);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (val &gt;&gt; shift) &amp; mask;</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='hunk'>@@ -1175,7 +1124,8 @@ static int snd_es18xx_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; ES18XX_FL_INVERT;</div><div class='add'>+	int pm_port = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; ES18XX_FL_PMPORT;</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	</div><div class='ctx'> 	val = (ucontrol-&gt;value.integer.value[0] &amp; mask);</div><div class='hunk'>@@ -1183,6 +1133,15 @@ static int snd_es18xx_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	mask &lt;&lt;= shift;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='add'>+	if (pm_port) {</div><div class='add'>+		unsigned char cur = inb(chip-&gt;port + ES18XX_PM);</div><div class='add'>+</div><div class='add'>+		if ((cur &amp; mask) == val)</div><div class='add'>+			return 0;</div><div class='add'>+		outb((cur &amp; ~mask) | val, chip-&gt;port + ES18XX_PM);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return snd_es18xx_reg_bits(chip, reg, mask, val) != val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1269,7 +1228,7 @@ static int snd_es18xx_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'>  * The controls that are universal to all chipsets are fully initialized</div><div class='ctx'>  * here.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_base_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_base_controls[] = {</div><div class='ctx'> ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),</div><div class='ctx'> ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),</div><div class='ctx'> ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0),</div><div class='hunk'>@@ -1288,7 +1247,7 @@ ES18XX_DOUBLE("Capture Volume", 0, 0xb4, 0xb4, 4, 0, 15, 0),</div><div class='ctx'> }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {</div><div class='ctx'> ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),</div><div class='ctx'> ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0),</div><div class='ctx'> ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0),</div><div class='hunk'>@@ -1300,35 +1259,35 @@ ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0)</div><div class='ctx'> /*</div><div class='ctx'>  * The chipset specific mixer controls</div><div class='ctx'>  */</div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_opt_speaker =</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_opt_speaker =</div><div class='ctx'> 	ES18XX_SINGLE("Beep Playback Volume", 0, 0x3c, 0, 7, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_opt_1869[] = {</div><div class='del'>-ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_opt_1869[] = {</div><div class='add'>+ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, ES18XX_FL_INVERT),</div><div class='ctx'> ES18XX_SINGLE("Video Playback Switch", 0, 0x7f, 0, 1, 0),</div><div class='ctx'> ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),</div><div class='ctx'> ES18XX_DOUBLE("Mono Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_opt_1878 =</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_opt_1878 =</div><div class='ctx'> 	ES18XX_DOUBLE("Video Playback Volume", 0, 0x68, 0x68, 4, 0, 15, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_opt_1879[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_opt_1879[] = {</div><div class='ctx'> ES18XX_SINGLE("Video Playback Switch", 0, 0x71, 6, 1, 0),</div><div class='ctx'> ES18XX_DOUBLE("Video Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),</div><div class='ctx'> ES18XX_DOUBLE("Video Capture Volume", 0, 0x6f, 0x6f, 4, 0, 15, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {</div><div class='ctx'> ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {</div><div class='ctx'> ES18XX_DOUBLE("PCM Playback Volume", 0, 0x7c, 0x7c, 4, 0, 15, 0),</div><div class='ctx'> ES18XX_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {</div><div class='ctx'> ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -1339,13 +1298,13 @@ ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),</div><div class='ctx'> }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_micpre1_control = </div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_micpre1_control =</div><div class='ctx'> ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0xa9, 2, 1, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_micpre2_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_micpre2_control =</div><div class='ctx'> ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Hardware Master Playback Volume",</div><div class='hunk'>@@ -1363,30 +1322,32 @@ static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {</div><div class='ctx'> ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)</div><div class='del'>-{</div><div class='del'>-	int data;</div><div class='add'>+static const struct snd_kcontrol_new snd_es18xx_opt_gpo_2bit[] = {</div><div class='add'>+ES18XX_SINGLE("GPO0 Switch", 0, ES18XX_PM, 0, 1, ES18XX_FL_PMPORT),</div><div class='add'>+ES18XX_SINGLE("GPO1 Switch", 0, ES18XX_PM, 1, 1, ES18XX_FL_PMPORT),</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+static int snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)</div><div class='add'>+{</div><div class='ctx'> 	outb(reg, chip-&gt;ctrl_port);</div><div class='del'>-	data = inb(chip-&gt;ctrl_port + 1);</div><div class='del'>-	return data;</div><div class='add'>+	return inb(chip-&gt;ctrl_port + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, </div><div class='del'>-					      unsigned char reg, unsigned char data)</div><div class='add'>+static void snd_es18xx_config_write(struct snd_es18xx *chip,</div><div class='add'>+				    unsigned char reg, unsigned char data)</div><div class='ctx'> {</div><div class='ctx'> 	/* No need for spinlocks, this function is used only in</div><div class='ctx'> 	   otherwise protected init code */</div><div class='ctx'> 	outb(reg, chip-&gt;ctrl_port);</div><div class='ctx'> 	outb(data, chip-&gt;ctrl_port + 1);</div><div class='ctx'> #ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Config reg %02x set to %02x\n", reg, data);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Config reg %02x set to %02x\n", reg, data);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='del'>-					   unsigned long mpu_port,</div><div class='del'>-					   unsigned long fm_port)</div><div class='add'>+static int snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='add'>+				 unsigned long mpu_port,</div><div class='add'>+				 unsigned long fm_port)</div><div class='ctx'> {</div><div class='ctx'> 	int mask = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1449,7 +1410,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='ctx'> 			irqmask = 3;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_ERR "invalid irq %d\n", chip-&gt;irq);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "invalid irq %d\n", chip-&gt;irq);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		switch (chip-&gt;dma1) {</div><div class='hunk'>@@ -1463,7 +1424,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='ctx'> 			dma1mask = 3;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_ERR "invalid dma1 %d\n", chip-&gt;dma1);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "invalid dma1 %d\n", chip-&gt;dma1);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		switch (chip-&gt;dma2) {</div><div class='hunk'>@@ -1480,7 +1441,7 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='ctx'> 			dma2mask = 3;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_ERR "invalid dma2 %d\n", chip-&gt;dma2);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "invalid dma2 %d\n", chip-&gt;dma2);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1549,13 +1510,13 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)</div><div class='add'>+static int snd_es18xx_identify(struct snd_card *card, struct snd_es18xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int hi,lo;</div><div class='ctx'> </div><div class='ctx'> 	/* reset */</div><div class='ctx'> 	if (snd_es18xx_reset(chip) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "reset at 0x%lx failed!!!\n", chip-&gt;port);</div><div class='add'>+		dev_err(card-&gt;dev, "reset at 0x%lx failed!!!\n", chip-&gt;port);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1591,8 +1552,9 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 		chip-&gt;ctrl_port += inb(chip-&gt;port + 0x05);</div><div class='ctx'> </div><div class='del'>-		if ((chip-&gt;res_ctrl_port = request_region(chip-&gt;ctrl_port, 8, "ES18xx - CTRL")) == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable go grab port 0x%lx\n", chip-&gt;ctrl_port);</div><div class='add'>+		if (!devm_request_region(card-&gt;dev, chip-&gt;ctrl_port, 8,</div><div class='add'>+					 "ES18xx - CTRL")) {</div><div class='add'>+			dev_err(card-&gt;dev, "unable go grab port 0x%lx\n", chip-&gt;ctrl_port);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1618,21 +1580,22 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,</div><div class='del'>-					unsigned long mpu_port,</div><div class='del'>-					unsigned long fm_port)</div><div class='add'>+static int snd_es18xx_probe(struct snd_card *card,</div><div class='add'>+			    struct snd_es18xx *chip,</div><div class='add'>+			    unsigned long mpu_port,</div><div class='add'>+			    unsigned long fm_port)</div><div class='ctx'> {</div><div class='del'>-	if (snd_es18xx_identify(chip) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip-&gt;port);</div><div class='add'>+	if (snd_es18xx_identify(card, chip) &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "[0x%lx] ESS chip not found\n", chip-&gt;port);</div><div class='ctx'>                 return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;version) {</div><div class='ctx'> 	case 0x1868:</div><div class='del'>-		chip-&gt;caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL;</div><div class='add'>+		chip-&gt;caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL | ES18XX_GPO_2BIT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1869:</div><div class='del'>-		chip-&gt;caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV;</div><div class='add'>+		chip-&gt;caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV | ES18XX_GPO_2BIT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1878:</div><div class='ctx'> 		chip-&gt;caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_I2S | ES18XX_CONTROL;</div><div class='hunk'>@@ -1642,15 +1605,15 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1887:</div><div class='ctx'> 	case 0x1888:</div><div class='del'>-		chip-&gt;caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;</div><div class='add'>+		chip-&gt;caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_GPO_2BIT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "[0x%lx] unsupported chip ES%x\n",</div><div class='del'>-                           chip-&gt;port, chip-&gt;version);</div><div class='add'>+		dev_err(card-&gt;dev, "[0x%lx] unsupported chip ES%x\n",</div><div class='add'>+			chip-&gt;port, chip-&gt;version);</div><div class='ctx'>                 return -ENODEV;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        snd_printd("[0x%lx] ESS%x chip found\n", chip-&gt;port, chip-&gt;version);</div><div class='add'>+	dev_dbg(card-&gt;dev, "[0x%lx] ESS%x chip found\n", chip-&gt;port, chip-&gt;version);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dma1 == chip-&gt;dma2)</div><div class='ctx'> 		chip-&gt;caps &amp;= ~(ES18XX_PCM2 | ES18XX_DUPLEX_SAME);</div><div class='hunk'>@@ -1658,38 +1621,31 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,</div><div class='ctx'> 	return snd_es18xx_initialize(chip, mpu_port, fm_port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es18xx_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es18xx_playback_ops = {</div><div class='ctx'> 	.open =		snd_es18xx_playback_open,</div><div class='ctx'> 	.close =	snd_es18xx_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_es18xx_playback_hw_params,</div><div class='del'>-	.hw_free =	snd_es18xx_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_es18xx_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_es18xx_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_es18xx_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es18xx_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es18xx_capture_ops = {</div><div class='ctx'> 	.open =		snd_es18xx_capture_open,</div><div class='ctx'> 	.close =	snd_es18xx_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_es18xx_capture_hw_params,</div><div class='del'>-	.hw_free =	snd_es18xx_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_es18xx_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_es18xx_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_es18xx_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_pcm(struct snd_card *card, int device,</div><div class='del'>-				    struct snd_pcm **rpcm)</div><div class='add'>+static int snd_es18xx_pcm(struct snd_card *card, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = card-&gt;private_data;</div><div class='ctx'>         struct snd_pcm *pcm;</div><div class='ctx'> 	char str[16];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	sprintf(str, "ES%x", chip-&gt;version);</div><div class='ctx'> 	if (chip-&gt;caps &amp; ES18XX_PCM2)</div><div class='ctx'> 		err = snd_pcm_new(card, str, device, 2, 1, &amp;pcm);</div><div class='hunk'>@@ -1711,13 +1667,9 @@ static int __devinit snd_es18xx_pcm(struct snd_card *card, int device,</div><div class='ctx'> 	sprintf(pcm-&gt;name, "ESS AudioDrive ES%x", chip-&gt;version);</div><div class='ctx'>         chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024,</div><div class='del'>-					      chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='del'>-</div><div class='del'>-        if (rpcm)</div><div class='del'>-        	*rpcm = pcm;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, card-&gt;dev,</div><div class='add'>+				       64*1024,</div><div class='add'>+				       chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1729,8 +1681,6 @@ static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='del'>-</div><div class='ctx'> 	/* power down */</div><div class='ctx'> 	chip-&gt;pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);</div><div class='ctx'> 	chip-&gt;pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);</div><div class='hunk'>@@ -1752,43 +1702,15 @@ static int snd_es18xx_resume(struct snd_card *card)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static int snd_es18xx_free(struct snd_card *card)</div><div class='add'>+static int snd_es18xx_new_device(struct snd_card *card,</div><div class='add'>+				 unsigned long port,</div><div class='add'>+				 unsigned long mpu_port,</div><div class='add'>+				 unsigned long fm_port,</div><div class='add'>+				 int irq, int dma1, int dma2)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-	release_and_free_resource(chip-&gt;res_ctrl_port);</div><div class='del'>-	release_and_free_resource(chip-&gt;res_mpu_port);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, (void *) card);</div><div class='del'>-	if (chip-&gt;dma1 &gt;= 0) {</div><div class='del'>-		disable_dma(chip-&gt;dma1);</div><div class='del'>-		free_dma(chip-&gt;dma1);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;dma2 &gt;= 0 &amp;&amp; chip-&gt;dma1 != chip-&gt;dma2) {</div><div class='del'>-		disable_dma(chip-&gt;dma2);</div><div class='del'>-		free_dma(chip-&gt;dma2);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_es18xx_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	return snd_es18xx_free(device-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_es18xx_new_device(struct snd_card *card,</div><div class='del'>-					   unsigned long port,</div><div class='del'>-					   unsigned long mpu_port,</div><div class='del'>-					   unsigned long fm_port,</div><div class='del'>-					   int irq, int dma1, int dma2)</div><div class='del'>-{</div><div class='del'>-	struct snd_es18xx *chip = card-&gt;private_data;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_es18xx_dev_free,</div><div class='del'>-        };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='add'>+	chip-&gt;card = card;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'>  	spin_lock_init(&amp;chip-&gt;mixer_lock);</div><div class='ctx'>         chip-&gt;port = port;</div><div class='hunk'>@@ -1798,54 +1720,44 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,</div><div class='ctx'>         chip-&gt;audio2_vol = 0x00;</div><div class='ctx'> 	chip-&gt;active = 0;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;res_port = request_region(port, 16, "ES18xx");</div><div class='del'>-	if (chip-&gt;res_port == NULL) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grap ports 0x%lx-0x%lx\n", port, port + 16 - 1);</div><div class='add'>+	if (!devm_request_region(card-&gt;dev, port, 16, "ES18xx")) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab ports 0x%lx-0x%lx\n", port, port + 16 - 1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx",</div><div class='del'>-			(void *) card)) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, irq, snd_es18xx_interrupt, 0, "ES18xx",</div><div class='add'>+			     (void *) card)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if (request_dma(dma1, "ES18xx DMA 1")) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grap DMA1 %d\n", dma1);</div><div class='add'>+	if (snd_devm_request_dma(card-&gt;dev, dma1, "ES18xx DMA 1")) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab DMA1 %d\n", dma1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma1 = dma1;</div><div class='ctx'> </div><div class='del'>-	if (dma2 != dma1 &amp;&amp; request_dma(dma2, "ES18xx DMA 2")) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grap DMA2 %d\n", dma2);</div><div class='add'>+	if (dma2 != dma1 &amp;&amp;</div><div class='add'>+	    snd_devm_request_dma(card-&gt;dev, dma2, "ES18xx DMA 2")) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab DMA2 %d\n", dma2);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma2 = dma2;</div><div class='ctx'> </div><div class='del'>-	if (snd_es18xx_probe(chip, mpu_port, fm_port) &lt; 0) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='add'>+	if (snd_es18xx_probe(card, chip, mpu_port, fm_port) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_es18xx_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_mixer(struct snd_card *card)</div><div class='add'>+static int snd_es18xx_mixer(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='add'>+	strscpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_base_controls); idx++) {</div><div class='ctx'> 		struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -1862,41 +1774,48 @@ static int __devinit snd_es18xx_mixer(struct snd_card *card)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;caps &amp; ES18XX_PCM2) {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_pcm2_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_pcm2_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_pcm2_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		} </div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_pcm1_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_pcm1_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_pcm1_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;caps &amp; ES18XX_RECMIX) {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_recmix_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_recmix_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_recmix_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (chip-&gt;version) {</div><div class='ctx'> 	default:</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_micpre1_control, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_micpre1_control, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1869:</div><div class='ctx'> 	case 0x1879:</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_micpre2_control, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_micpre2_control, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;caps &amp; ES18XX_SPATIALIZER) {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_spatializer_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_spatializer_controls[idx], chip))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es18xx_spatializer_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1909,7 +1828,8 @@ static int __devinit snd_es18xx_mixer(struct snd_card *card)</div><div class='ctx'> 			else</div><div class='ctx'> 				chip-&gt;hw_switch = kctl;</div><div class='ctx'> 			kctl-&gt;private_free = snd_es18xx_hwv_free;</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1944,29 +1864,30 @@ static int __devinit snd_es18xx_mixer(struct snd_card *card)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (chip-&gt;caps &amp; ES18XX_GPO_2BIT) {</div><div class='add'>+		for (idx = 0; idx &lt; ARRAY_SIZE(snd_es18xx_opt_gpo_2bit); idx++) {</div><div class='add'>+			err = snd_ctl_add(card,</div><div class='add'>+					  snd_ctl_new1(&amp;snd_es18xx_opt_gpo_2bit[idx],</div><div class='add'>+						       chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'>        </div><div class='ctx'> </div><div class='ctx'> /* Card level */</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Christian Fischbach &lt;fishbach@pool.informatik.rwth-aachen.de&gt;, Abramo Bagnara &lt;abramo@alsa-project.org&gt;");  </div><div class='add'>+MODULE_AUTHOR("Christian Fischbach &lt;fishbach@pool.informatik.rwth-aachen.de&gt;, Abramo Bagnara &lt;abramo@alsa-project.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ESS ES18xx AudioDrive");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ESS,ES1868 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1869 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1878 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1879 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1887 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1888 PnP AudioDrive},"</div><div class='del'>-		"{ESS,ES1887 AudioDrive},"</div><div class='del'>-		"{ESS,ES1888 AudioDrive}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260,0x280 */</div><div class='ctx'> #ifndef CONFIG_PNP</div><div class='hunk'>@@ -1989,17 +1910,17 @@ MODULE_PARM_DESC(enable, "Enable ES18xx soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for ES18xx driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ES18xx driver.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for ES18xx driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for ES18xx driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA 1 # for ES18xx driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='hunk'>@@ -2007,7 +1928,7 @@ static int isa_registered;</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> static int pnpc_registered;</div><div class='ctx'> </div><div class='del'>-static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {</div><div class='add'>+static const struct pnp_device_id snd_audiodrive_pnpbiosids[] = {</div><div class='ctx'> 	{ .id = "ESS1869" },</div><div class='ctx'> 	{ .id = "ESS1879" },</div><div class='ctx'> 	{ .id = "" }		/* end */</div><div class='hunk'>@@ -2016,10 +1937,10 @@ static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pnp, snd_audiodrive_pnpbiosids);</div><div class='ctx'> </div><div class='ctx'> /* PnP main device initialization */</div><div class='del'>-static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)</div><div class='add'>+static int snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pnp_activate_dev(pdev) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "PnP configure failure (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PnP configure failure (out of resources?)\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* ok. hack using Vendor-Defined Card-Level registers */</div><div class='hunk'>@@ -2038,13 +1959,17 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)</div><div class='ctx'> 	dma1[dev] = pnp_dma(pdev, 0);</div><div class='ctx'> 	dma2[dev] = pnp_dma(pdev, 1);</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='del'>-	snd_printdd("PnP ES18xx: port=0x%lx, fm port=0x%lx, mpu port=0x%lx\n", port[dev], fm_port[dev], mpu_port[dev]);</div><div class='del'>-	snd_printdd("PnP ES18xx: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"PnP ES18xx: port=0x%lx, fm port=0x%lx, mpu port=0x%lx\n",</div><div class='add'>+		port[dev], fm_port[dev], mpu_port[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"PnP ES18xx: dma1=%i, dma2=%i, irq=%i\n",</div><div class='add'>+		dma1[dev], dma2[dev], irq[dev]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,</div><div class='del'>-					struct pnp_dev *pdev)</div><div class='add'>+static int snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,</div><div class='add'>+			      struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;dev = pdev;</div><div class='ctx'> 	if (snd_audiodrive_pnp_init_main(dev, chip-&gt;dev) &lt; 0)</div><div class='hunk'>@@ -2052,7 +1977,7 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_audiodrive_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_audiodrive_pnpids[] = {</div><div class='ctx'> 	/* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D) */</div><div class='ctx'> 	{ .id = "ESS1868", .devs = { { "ESS1868" }, { "ESS0000" } } },</div><div class='ctx'> 	/* ESS 1868 (integrated on Maxisound Cards) */</div><div class='hunk'>@@ -2073,9 +1998,9 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,</div><div class='del'>-					struct pnp_card_link *card,</div><div class='del'>-					const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,</div><div class='add'>+			       struct pnp_card_link *card,</div><div class='add'>+			       const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;dev = pnp_request_card_device(card, id-&gt;devs[0].id, NULL);</div><div class='ctx'> 	if (chip-&gt;dev == NULL)</div><div class='hunk'>@@ -2087,11 +2012,12 @@ static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	/* Control port initialization */</div><div class='ctx'> 	if (pnp_activate_dev(chip-&gt;devc) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"PnP control configure failure (out of resources?)\n");</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printdd("pnp: port=0x%llx\n",</div><div class='del'>-			(unsigned long long)pnp_port_start(chip-&gt;devc, 0));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "pnp: port=0x%llx\n",</div><div class='add'>+		(unsigned long long)pnp_port_start(chip-&gt;devc, 0));</div><div class='ctx'> 	if (snd_audiodrive_pnp_init_main(dev, chip-&gt;dev) &lt; 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='hunk'>@@ -2105,13 +2031,14 @@ static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,</div><div class='ctx'> #define is_isapnp_selected(dev)		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int snd_es18xx_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_es18xx_card_new(struct device *pdev, int dev,</div><div class='add'>+			       struct snd_card **cardp)</div><div class='ctx'> {</div><div class='del'>-	return snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			       sizeof(struct snd_es18xx), cardp);</div><div class='add'>+	return snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				 sizeof(struct snd_es18xx), cardp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_es18xx *chip = card-&gt;private_data;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='hunk'>@@ -2137,7 +2064,7 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='ctx'> 			chip-&gt;port,</div><div class='ctx'> 			irq[dev], dma1[dev]);</div><div class='ctx'> </div><div class='del'>-	err = snd_es18xx_pcm(card, 0, NULL);</div><div class='add'>+	err = snd_es18xx_pcm(card, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2148,9 +2075,9 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	if (fm_port[dev] &gt; 0 &amp;&amp; fm_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				    OPL3_HW_OPL3, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_WARNING PFX</div><div class='del'>-				   "opl3 not detected at 0x%lx\n",</div><div class='del'>-				   fm_port[dev]);</div><div class='add'>+			dev_warn(card-&gt;dev,</div><div class='add'>+				 "opl3 not detected at 0x%lx\n",</div><div class='add'>+				 fm_port[dev]);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='hunk'>@@ -2160,8 +2087,8 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[dev] &gt; 0 &amp;&amp; mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,</div><div class='del'>-					  mpu_port[dev], 0,</div><div class='del'>-					  irq[dev], 0, &amp;chip-&gt;rmidi);</div><div class='add'>+					  mpu_port[dev], MPU401_INFO_IRQ_HOOK,</div><div class='add'>+					  -1, &amp;chip-&gt;rmidi);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2169,49 +2096,50 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_isa_match(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_es18xx_isa_match(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[dev] &amp;&amp; !is_isapnp_selected(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)</div><div class='add'>+static int snd_es18xx_isa_probe1(int dev, struct device *devptr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_es18xx_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_es18xx_card_new(devptr, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-	if ((err = snd_audiodrive_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_audiodrive_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	dev_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};</div><div class='del'>-	static int possible_dmas[] = {1, 0, 3, 5, -1};</div><div class='add'>+	static const int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};</div><div class='add'>+	static const int possible_dmas[] = {1, 0, 3, 5, -1};</div><div class='ctx'> </div><div class='ctx'> 	if (irq[dev] == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((irq[dev] = snd_legacy_find_free_irq(possible_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");</div><div class='add'>+		irq[dev] = snd_legacy_find_free_irq(possible_irqs);</div><div class='add'>+		if (irq[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma1[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma1[dev] = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");</div><div class='add'>+		dma1[dev] = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (dma1[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA1\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma2[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma2[dev] = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");</div><div class='add'>+		dma2[dev] = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (dma2[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA2\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2219,7 +2147,7 @@ static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	if (port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		return snd_es18xx_isa_probe1(dev, pdev);</div><div class='ctx'> 	} else {</div><div class='del'>-		static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280};</div><div class='add'>+		static const unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280};</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(possible_ports); i++) {</div><div class='ctx'> 			port[dev] = possible_ports[i];</div><div class='hunk'>@@ -2231,14 +2159,6 @@ static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_es18xx_isa_remove(struct device *devptr,</div><div class='del'>-					   unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_es18xx_isa_suspend(struct device *dev, unsigned int n,</div><div class='ctx'> 				  pm_message_t state)</div><div class='hunk'>@@ -2257,7 +2177,6 @@ static int snd_es18xx_isa_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_es18xx_isa_driver = {</div><div class='ctx'> 	.match		= snd_es18xx_isa_match,</div><div class='ctx'> 	.probe		= snd_es18xx_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_es18xx_isa_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_es18xx_isa_suspend,</div><div class='ctx'> 	.resume		= snd_es18xx_isa_resume,</div><div class='hunk'>@@ -2269,8 +2188,8 @@ static struct isa_driver snd_es18xx_isa_driver = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,</div><div class='del'>-					    const struct pnp_device_id *id)</div><div class='add'>+static int snd_audiodrive_pnp_detect(struct pnp_dev *pdev,</div><div class='add'>+				     const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2285,29 +2204,20 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	err = snd_es18xx_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_es18xx_card_new(&amp;pdev-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_audiodrive_pnp(dev, card-&gt;private_data, pdev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_audiodrive_pnp(dev, card-&gt;private_data, pdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-	if ((err = snd_audiodrive_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_audiodrive_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_drvdata(pdev, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_audiodrive_pnp_remove(struct pnp_dev * pdev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_drvdata(pdev));</div><div class='del'>-	pnp_set_drvdata(pdev, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_audiodrive_pnp_suspend(struct pnp_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -2323,15 +2233,14 @@ static struct pnp_driver es18xx_pnp_driver = {</div><div class='ctx'> 	.name = "es18xx-pnpbios",</div><div class='ctx'> 	.id_table = snd_audiodrive_pnpbiosids,</div><div class='ctx'> 	.probe = snd_audiodrive_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_audiodrive_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = snd_audiodrive_pnp_suspend,</div><div class='ctx'> 	.resume = snd_audiodrive_pnp_resume,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,</div><div class='del'>-					       const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,</div><div class='add'>+				      const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -2344,31 +2253,22 @@ static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	res = snd_es18xx_card_new(dev, &amp;card);</div><div class='add'>+	res = snd_es18xx_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='del'>-	if ((res = snd_audiodrive_pnpc(dev, card-&gt;private_data, pcard, pid)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_audiodrive_pnpc(dev, card-&gt;private_data, pcard, pid);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-	if ((res = snd_audiodrive_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_audiodrive_probe(card, dev);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_audiodrive_pnpc_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_audiodrive_pnpc_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -2387,7 +2287,6 @@ static struct pnp_card_driver es18xx_pnpc_driver = {</div><div class='ctx'> 	.name = "es18xx",</div><div class='ctx'> 	.id_table = snd_audiodrive_pnpids,</div><div class='ctx'> 	.probe = snd_audiodrive_pnpc_detect,</div><div class='del'>-	.remove = __devexit_p(snd_audiodrive_pnpc_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_audiodrive_pnpc_suspend,</div><div class='ctx'> 	.resume		= snd_audiodrive_pnpc_resume,</div><div class='head'>diff --git a/sound/isa/galaxy/Makefile b/sound/isa/galaxy/Makefile<br/>index e307066d4315..2dbd519860a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/galaxy/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@suse.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-azt1605-objs := azt1605.o</div><div class='del'>-snd-azt2316-objs := azt2316.o</div><div class='add'>+snd-azt1605-y := azt1605.o</div><div class='add'>+snd-azt2316-y := azt2316.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_AZT1605) += snd-azt1605.o</div><div class='ctx'> obj-$(CONFIG_SND_AZT2316) += snd-azt2316.o</div><div class='head'>diff --git a/sound/isa/galaxy/azt1605.c b/sound/isa/galaxy/azt1605.c<br/>index 9a97643cb713..545fb13fbea6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/azt1605.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/azt1605.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/azt1605.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/galaxy/azt1605.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Aztech AZT1605 Driver</div><div class='ctx'>  * Copyright (C) 2007,2010  Rene Herman</div><div class='del'>- *</div><div class='del'>- * This program is free software: you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AZT1605</div><div class='head'>diff --git a/sound/isa/galaxy/azt2316.c b/sound/isa/galaxy/azt2316.c<br/>index 189441141df6..76251e845f85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/azt2316.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/azt2316.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/azt2316.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/galaxy/azt2316.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Aztech AZT2316 Driver</div><div class='ctx'>  * Copyright (C) 2007,2010  Rene Herman</div><div class='del'>- *</div><div class='del'>- * This program is free software: you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AZT2316</div><div class='head'>diff --git a/sound/isa/galaxy/galaxy.c b/sound/isa/galaxy/galaxy.c<br/>index ee54df082b9c..b0f1562d0fc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/galaxy.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/galaxy/galaxy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/galaxy/galaxy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/galaxy/galaxy.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Aztech AZT1605/AZT2316 Driver</div><div class='ctx'>  * Copyright (C) 2007,2010  Rene Herman</div><div class='del'>- *</div><div class='del'>- * This program is free software: you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -35,7 +22,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " CRD_NAME " soundcard.");</div><div class='hunk'>@@ -53,21 +40,21 @@ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;</div><div class='ctx'> static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;</div><div class='ctx'> static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;</div><div class='ctx'> </div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(wss_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(wss_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wss_port, "WSS port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "Playback DMA # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -84,7 +71,7 @@ MODULE_PARM_DESC(dma2, "Capture DMA # for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='ctx'> #define DSP_COMMAND_GET_VERSION	0xe1</div><div class='ctx'> </div><div class='del'>-static int __devinit dsp_get_byte(void __iomem *port, u8 *val)</div><div class='add'>+static int dsp_get_byte(void __iomem *port, u8 *val)</div><div class='ctx'> {</div><div class='ctx'> 	int loops = 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -97,7 +84,7 @@ static int __devinit dsp_get_byte(void __iomem *port, u8 *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit dsp_reset(void __iomem *port)</div><div class='add'>+static int dsp_reset(void __iomem *port)</div><div class='ctx'> {</div><div class='ctx'> 	u8 val;</div><div class='ctx'> </div><div class='hunk'>@@ -111,7 +98,7 @@ static int __devinit dsp_reset(void __iomem *port)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit dsp_command(void __iomem *port, u8 cmd)</div><div class='add'>+static int dsp_command(void __iomem *port, u8 cmd)</div><div class='ctx'> {</div><div class='ctx'> 	int loops = 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +111,7 @@ static int __devinit dsp_command(void __iomem *port, u8 cmd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)</div><div class='add'>+static int dsp_get_version(void __iomem *port, u8 *major, u8 *minor)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -161,7 +148,7 @@ static int __devinit dsp_get_version(void __iomem *port, u8 *major, u8 *minor)</div><div class='ctx'> </div><div class='ctx'> #define WSS_SIGNATURE		4</div><div class='ctx'> </div><div class='del'>-static int __devinit wss_detect(void __iomem *wss_port)</div><div class='add'>+static int wss_detect(void __iomem *wss_port)</div><div class='ctx'> {</div><div class='ctx'> 	if ((ioread8(wss_port + WSS_PORT_SIGNATURE) &amp; 0x3f) != WSS_SIGNATURE)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -204,7 +191,7 @@ struct snd_galaxy {</div><div class='ctx'> static u32 config[SNDRV_CARDS];</div><div class='ctx'> static u8 wss_config[SNDRV_CARDS];</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_galaxy_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_galaxy_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[n])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -260,6 +247,7 @@ static int __devinit snd_galaxy_match(struct device *dev, unsigned int n)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		irq[n] = 9;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 9:</div><div class='ctx'> 		wss_config[n] |= WSS_CONFIG_IRQ_9;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -304,6 +292,7 @@ static int __devinit snd_galaxy_match(struct device *dev, unsigned int n)</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		if (dma1[n] == 0)</div><div class='ctx'> 			break;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(dev, "invalid capture DMA %d\n", dma2[n]);</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -333,6 +322,7 @@ mpu:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		mpu_irq[n] = 9;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 9:</div><div class='ctx'> 		config[n] |= GALAXY_CONFIG_MPUIRQ_2;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -379,7 +369,7 @@ fm:</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)</div><div class='add'>+static int galaxy_init(struct snd_galaxy *galaxy, u8 *type)</div><div class='ctx'> {</div><div class='ctx'> 	u8 major;</div><div class='ctx'> 	u8 minor;</div><div class='hunk'>@@ -411,7 +401,7 @@ static int __devinit galaxy_init(struct snd_galaxy *galaxy, u8 *type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode)</div><div class='add'>+static int galaxy_set_mode(struct snd_galaxy *galaxy, u8 mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -449,7 +439,7 @@ static void galaxy_set_config(struct snd_galaxy *galaxy, u32 config)</div><div class='ctx'> 	msleep(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)</div><div class='add'>+static void galaxy_config(struct snd_galaxy *galaxy, u32 config)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -461,7 +451,7 @@ static void __devinit galaxy_config(struct snd_galaxy *galaxy, u32 config)</div><div class='ctx'> 	galaxy_set_config(galaxy, config);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config)</div><div class='add'>+static int galaxy_wss_config(struct snd_galaxy *galaxy, u8 wss_config)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -482,23 +472,13 @@ static void snd_galaxy_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_galaxy *galaxy = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if (galaxy-&gt;wss_port) {</div><div class='add'>+	if (galaxy-&gt;wss_port)</div><div class='ctx'> 		wss_set_config(galaxy-&gt;wss_port, 0);</div><div class='del'>-		ioport_unmap(galaxy-&gt;wss_port);</div><div class='del'>-		release_and_free_resource(galaxy-&gt;res_wss_port);</div><div class='del'>-	}</div><div class='del'>-	if (galaxy-&gt;config_port) {</div><div class='add'>+	if (galaxy-&gt;config_port)</div><div class='ctx'> 		galaxy_set_config(galaxy, galaxy-&gt;config);</div><div class='del'>-		ioport_unmap(galaxy-&gt;config_port);</div><div class='del'>-		release_and_free_resource(galaxy-&gt;res_config_port);</div><div class='del'>-	}</div><div class='del'>-	if (galaxy-&gt;port) {</div><div class='del'>-		ioport_unmap(galaxy-&gt;port);</div><div class='del'>-		release_and_free_resource(galaxy-&gt;res_port);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int __snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_galaxy *galaxy;</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='hunk'>@@ -506,62 +486,64 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 	u8 type;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[n], id[n], THIS_MODULE, sizeof *galaxy,</div><div class='del'>-			      &amp;card);</div><div class='add'>+	err = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE,</div><div class='add'>+				sizeof(*galaxy), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='del'>-</div><div class='ctx'> 	card-&gt;private_free = snd_galaxy_free;</div><div class='ctx'> 	galaxy = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	galaxy-&gt;res_port = request_region(port[n], 16, DRV_NAME);</div><div class='add'>+	galaxy-&gt;res_port = devm_request_region(dev, port[n], 16, DRV_NAME);</div><div class='ctx'> 	if (!galaxy-&gt;res_port) {</div><div class='ctx'> 		dev_err(dev, "could not grab ports %#lx-%#lx\n", port[n],</div><div class='ctx'> 			port[n] + 15);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto error;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	galaxy-&gt;port = ioport_map(port[n], 16);</div><div class='add'>+	galaxy-&gt;port = devm_ioport_map(dev, port[n], 16);</div><div class='add'>+	if (!galaxy-&gt;port)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	err = galaxy_init(galaxy, &amp;type);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "did not find a Sound Galaxy at %#lx\n", port[n]);</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_info(dev, "Sound Galaxy (type %d) found at %#lx\n", type, port[n]);</div><div class='ctx'> </div><div class='del'>-	galaxy-&gt;res_config_port = request_region(port[n] + GALAXY_PORT_CONFIG,</div><div class='del'>-						 16, DRV_NAME);</div><div class='add'>+	galaxy-&gt;res_config_port =</div><div class='add'>+		devm_request_region(dev, port[n] + GALAXY_PORT_CONFIG, 16,</div><div class='add'>+				    DRV_NAME);</div><div class='ctx'> 	if (!galaxy-&gt;res_config_port) {</div><div class='ctx'> 		dev_err(dev, "could not grab ports %#lx-%#lx\n",</div><div class='ctx'> 			port[n] + GALAXY_PORT_CONFIG,</div><div class='ctx'> 			port[n] + GALAXY_PORT_CONFIG + 15);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto error;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	galaxy-&gt;config_port = ioport_map(port[n] + GALAXY_PORT_CONFIG, 16);</div><div class='del'>-</div><div class='add'>+	galaxy-&gt;config_port =</div><div class='add'>+		devm_ioport_map(dev, port[n] + GALAXY_PORT_CONFIG, 16);</div><div class='add'>+	if (!galaxy-&gt;config_port)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	galaxy_config(galaxy, config[n]);</div><div class='ctx'> </div><div class='del'>-	galaxy-&gt;res_wss_port = request_region(wss_port[n], 4, DRV_NAME);</div><div class='add'>+	galaxy-&gt;res_wss_port = devm_request_region(dev, wss_port[n], 4, DRV_NAME);</div><div class='ctx'> 	if (!galaxy-&gt;res_wss_port)  {</div><div class='ctx'> 		dev_err(dev, "could not grab ports %#lx-%#lx\n", wss_port[n],</div><div class='ctx'> 			wss_port[n] + 3);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto error;</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	galaxy-&gt;wss_port = ioport_map(wss_port[n], 4);</div><div class='add'>+	galaxy-&gt;wss_port = devm_ioport_map(dev, wss_port[n], 4);</div><div class='add'>+	if (!galaxy-&gt;wss_port)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	err = galaxy_wss_config(galaxy, wss_config[n]);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "could not configure WSS\n");</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, DRV_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DRV_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, DRV_NAME);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at %#lx/%#lx, irq %d, dma %d/%d",</div><div class='ctx'> 		card-&gt;shortname, port[n], wss_port[n], irq[n], dma1[n],</div><div class='ctx'> 		dma2[n]);</div><div class='hunk'>@@ -569,26 +551,25 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 	err = snd_wss_create(card, wss_port[n] + 4, -1, irq[n], dma1[n],</div><div class='ctx'> 			     dma2[n], WSS_HW_DETECT, 0, &amp;chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_pcm(chip, 0, NULL);</div><div class='add'>+	err = snd_wss_pcm(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_wss_mixer(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_timer(chip, 0, NULL);</div><div class='add'>+	err = snd_wss_timer(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[n] &gt;= 0) {</div><div class='ctx'> 		err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-					  mpu_port[n], 0, mpu_irq[n],</div><div class='del'>-					  IRQF_DISABLED, NULL);</div><div class='add'>+					  mpu_port[n], 0, mpu_irq[n], NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port[n] &gt;= 0) {</div><div class='hunk'>@@ -598,55 +579,37 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 				      OPL3_HW_AUTO, 0, &amp;opl3);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			dev_err(dev, "no OPL device at %#lx\n", fm_port[n]);</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = snd_opl3_timer_new(opl3, 1, 2);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='ctx'> 		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_galaxy_remove(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_galaxy_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_card_free_on_error(dev, __snd_galaxy_probe(dev, n));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_galaxy_driver = {</div><div class='ctx'> 	.match		= snd_galaxy_match,</div><div class='ctx'> 	.probe		= snd_galaxy_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_galaxy_remove),</div><div class='ctx'> </div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_galaxy_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_galaxy_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_galaxy_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_galaxy_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_galaxy_init);</div><div class='del'>-module_exit(alsa_card_galaxy_exit);</div><div class='add'>+module_isa_driver(snd_galaxy_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/gus/Makefile b/sound/isa/gus/Makefile<br/>index 6cd4ee03754a..4924c1904fa4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/Makefile</a></div><div class='hunk'>@@ -1,20 +1,21 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-gus-lib-objs := gus_main.o \</div><div class='add'>+snd-gus-lib-y := gus_main.o \</div><div class='ctx'> 		    gus_io.o gus_irq.o gus_timer.o \</div><div class='ctx'> 		    gus_mem.o gus_mem_proc.o gus_dram.o gus_dma.o gus_volume.o \</div><div class='ctx'> 		    gus_pcm.o gus_mixer.o \</div><div class='ctx'> 		    gus_uart.o \</div><div class='ctx'> 		    gus_reset.o</div><div class='ctx'> </div><div class='del'>-snd-gusclassic-objs := gusclassic.o</div><div class='del'>-snd-gusextreme-objs := gusextreme.o</div><div class='del'>-snd-gusmax-objs := gusmax.o</div><div class='del'>-snd-interwave-objs := interwave.o</div><div class='del'>-snd-interwave-stb-objs := interwave-stb.o</div><div class='add'>+snd-gusclassic-y := gusclassic.o</div><div class='add'>+snd-gusextreme-y := gusextreme.o</div><div class='add'>+snd-gusmax-y := gusmax.o</div><div class='add'>+snd-interwave-y := interwave.o</div><div class='add'>+snd-interwave-stb-y := interwave-stb.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o</div><div class='head'>diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c<br/>index 36c27c832360..ffc69e26227e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_dma.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_dma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_dma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_dma.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for GF1 DMA control</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -26,12 +11,9 @@</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_dma_ack(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL, 0x00);</div><div class='ctx'> 	snd_gf1_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_dma_program(struct snd_gus_card * gus,</div><div class='hunk'>@@ -40,20 +22,22 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,</div><div class='ctx'> 				unsigned int count,</div><div class='ctx'> 				unsigned int cmd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int address;</div><div class='ctx'> 	unsigned char dma_cmd;</div><div class='ctx'> 	unsigned int address_high;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n",</div><div class='del'>-		    addr, buf_addr, count);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n",</div><div class='add'>+		addr, buf_addr, count);</div><div class='ctx'> </div><div class='ctx'> 	if (gus-&gt;gf1.dma1 &gt; 3) {</div><div class='ctx'> 		if (gus-&gt;gf1.enh_mode) {</div><div class='ctx'> 			address = addr &gt;&gt; 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (addr &amp; 0x1f) {</div><div class='del'>-				snd_printd("snd_gf1_dma_transfer: unaligned address (0x%x)?\n", addr);</div><div class='add'>+				dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+					"%s: unaligned address (0x%x)?\n",</div><div class='add'>+					__func__, addr);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			address = (addr &amp; 0x000c0000) | ((addr &amp; 0x0003ffff) &gt;&gt; 1);</div><div class='hunk'>@@ -78,10 +62,11 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,</div><div class='ctx'> 	snd_gf1_dma_ack(gus);</div><div class='ctx'> 	snd_dma_program(gus-&gt;gf1.dma1, buf_addr, count, dma_cmd &amp; SNDRV_GF1_DMA_READ ? DMA_MODE_READ : DMA_MODE_WRITE);</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printk(KERN_DEBUG "address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n",</div><div class='del'>-		   address &lt;&lt; 1, count, dma_cmd);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n",</div><div class='add'>+		address &lt;&lt; 1, count, dma_cmd);</div><div class='ctx'> #endif</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	if (gus-&gt;gf1.enh_mode) {</div><div class='ctx'> 		address_high = ((address &gt;&gt; 16) &amp; 0x000000f0) | (address &amp; 0x0000000f);</div><div class='ctx'> 		snd_gf1_write16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW, (unsigned short) (address &gt;&gt; 4));</div><div class='hunk'>@@ -89,7 +74,6 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,</div><div class='ctx'> 	} else</div><div class='ctx'> 		snd_gf1_write16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW, (unsigned short) (address &gt;&gt; 4));</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL, dma_cmd);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_gf1_dma_block *snd_gf1_dma_next_block(struct snd_gus_card * gus)</div><div class='hunk'>@@ -131,39 +115,37 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)</div><div class='ctx'> 	snd_gf1_dma_ack(gus);</div><div class='ctx'> 	if (gus-&gt;gf1.dma_ack)</div><div class='ctx'> 		gus-&gt;gf1.dma_ack(gus, gus-&gt;gf1.dma_private_data);</div><div class='del'>-	spin_lock(&amp;gus-&gt;dma_lock);</div><div class='del'>-	if (gus-&gt;gf1.dma_data_pcm == NULL &amp;&amp;</div><div class='del'>-	    gus-&gt;gf1.dma_data_synth == NULL) {</div><div class='del'>-	    	gus-&gt;gf1.dma_ack = NULL;</div><div class='del'>-		gus-&gt;gf1.dma_flags &amp;= ~SNDRV_GF1_DMA_TRIGGER;</div><div class='del'>-		spin_unlock(&amp;gus-&gt;dma_lock);</div><div class='del'>-		return;</div><div class='add'>+	scoped_guard(spinlock, &amp;gus-&gt;dma_lock) {</div><div class='add'>+		if (gus-&gt;gf1.dma_data_pcm == NULL &amp;&amp;</div><div class='add'>+		    gus-&gt;gf1.dma_data_synth == NULL) {</div><div class='add'>+			gus-&gt;gf1.dma_ack = NULL;</div><div class='add'>+			gus-&gt;gf1.dma_flags &amp;= ~SNDRV_GF1_DMA_TRIGGER;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		block = snd_gf1_dma_next_block(gus);</div><div class='ctx'> 	}</div><div class='del'>-	block = snd_gf1_dma_next_block(gus);</div><div class='del'>-	spin_unlock(&amp;gus-&gt;dma_lock);</div><div class='add'>+	if (!block)</div><div class='add'>+		return;</div><div class='ctx'> 	snd_gf1_dma_program(gus, block-&gt;addr, block-&gt;buf_addr, block-&gt;count, (unsigned short) block-&gt;cmd);</div><div class='ctx'> 	kfree(block);</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printd(KERN_DEBUG "program dma (IRQ) - "</div><div class='del'>-		   "addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",</div><div class='del'>-		   block-&gt;addr, block-&gt;buf_addr, block-&gt;count, block-&gt;cmd);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"program dma (IRQ) - addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",</div><div class='add'>+		block-&gt;addr, block-&gt;buf_addr, block-&gt;count, block-&gt;cmd);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_gf1_dma_init(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;gus-&gt;dma_mutex);</div><div class='add'>+	guard(mutex)(&amp;gus-&gt;dma_mutex);</div><div class='ctx'> 	gus-&gt;gf1.dma_shared++;</div><div class='del'>-	if (gus-&gt;gf1.dma_shared &gt; 1) {</div><div class='del'>-		mutex_unlock(&amp;gus-&gt;dma_mutex);</div><div class='add'>+	if (gus-&gt;gf1.dma_shared &gt; 1)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	gus-&gt;gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt;</div><div class='ctx'> 	gus-&gt;gf1.dma_data_pcm = </div><div class='ctx'> 	gus-&gt;gf1.dma_data_pcm_last =</div><div class='ctx'> 	gus-&gt;gf1.dma_data_synth = </div><div class='ctx'> 	gus-&gt;gf1.dma_data_synth_last = NULL;</div><div class='del'>-	mutex_unlock(&amp;gus-&gt;dma_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -171,7 +153,7 @@ int snd_gf1_dma_done(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gf1_dma_block *block;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;gus-&gt;dma_mutex);</div><div class='add'>+	guard(mutex)(&amp;gus-&gt;dma_mutex);</div><div class='ctx'> 	gus-&gt;gf1.dma_shared--;</div><div class='ctx'> 	if (!gus-&gt;gf1.dma_shared) {</div><div class='ctx'> 		snd_dma_disable(gus-&gt;gf1.dma1);</div><div class='hunk'>@@ -188,7 +170,6 @@ int snd_gf1_dma_done(struct snd_gus_card * gus)</div><div class='ctx'> 		gus-&gt;gf1.dma_data_pcm_last =</div><div class='ctx'> 		gus-&gt;gf1.dma_data_synth_last = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;gus-&gt;dma_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -197,54 +178,58 @@ int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,</div><div class='ctx'> 			       int atomic,</div><div class='ctx'> 			       int synth)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_gf1_dma_block *block;</div><div class='add'>+	struct snd_gf1_dma_block *free_block = NULL;</div><div class='ctx'> </div><div class='ctx'> 	block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);</div><div class='del'>-	if (block == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");</div><div class='add'>+	if (!block)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	*block = *__block;</div><div class='ctx'> 	block-&gt;next = NULL;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",</div><div class='del'>-		    block-&gt;addr, (long) block-&gt;buffer, block-&gt;count,</div><div class='del'>-		    block-&gt;cmd);</div><div class='del'>-</div><div class='del'>-	snd_printdd("gus-&gt;gf1.dma_data_pcm_last = 0x%lx\n",</div><div class='del'>-		    (long)gus-&gt;gf1.dma_data_pcm_last);</div><div class='del'>-	snd_printdd("gus-&gt;gf1.dma_data_pcm = 0x%lx\n",</div><div class='del'>-		    (long)gus-&gt;gf1.dma_data_pcm);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;dma_lock, flags);</div><div class='del'>-	if (synth) {</div><div class='del'>-		if (gus-&gt;gf1.dma_data_synth_last) {</div><div class='del'>-			gus-&gt;gf1.dma_data_synth_last-&gt;next = block;</div><div class='del'>-			gus-&gt;gf1.dma_data_synth_last = block;</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",</div><div class='add'>+		block-&gt;addr, (long) block-&gt;buffer, block-&gt;count,</div><div class='add'>+		block-&gt;cmd);</div><div class='add'>+</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"gus-&gt;gf1.dma_data_pcm_last = 0x%lx\n",</div><div class='add'>+		(long)gus-&gt;gf1.dma_data_pcm_last);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"gus-&gt;gf1.dma_data_pcm = 0x%lx\n",</div><div class='add'>+		(long)gus-&gt;gf1.dma_data_pcm);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;dma_lock) {</div><div class='add'>+		if (synth) {</div><div class='add'>+			if (gus-&gt;gf1.dma_data_synth_last) {</div><div class='add'>+				gus-&gt;gf1.dma_data_synth_last-&gt;next = block;</div><div class='add'>+				gus-&gt;gf1.dma_data_synth_last = block;</div><div class='add'>+			} else {</div><div class='add'>+				gus-&gt;gf1.dma_data_synth =</div><div class='add'>+					gus-&gt;gf1.dma_data_synth_last = block;</div><div class='add'>+			}</div><div class='ctx'> 		} else {</div><div class='del'>-			gus-&gt;gf1.dma_data_synth = </div><div class='del'>-			gus-&gt;gf1.dma_data_synth_last = block;</div><div class='add'>+			if (gus-&gt;gf1.dma_data_pcm_last) {</div><div class='add'>+				gus-&gt;gf1.dma_data_pcm_last-&gt;next = block;</div><div class='add'>+				gus-&gt;gf1.dma_data_pcm_last = block;</div><div class='add'>+			} else {</div><div class='add'>+				gus-&gt;gf1.dma_data_pcm =</div><div class='add'>+					gus-&gt;gf1.dma_data_pcm_last = block;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		if (gus-&gt;gf1.dma_data_pcm_last) {</div><div class='del'>-			gus-&gt;gf1.dma_data_pcm_last-&gt;next = block;</div><div class='del'>-			gus-&gt;gf1.dma_data_pcm_last = block;</div><div class='del'>-		} else {</div><div class='del'>-			gus-&gt;gf1.dma_data_pcm = </div><div class='del'>-			gus-&gt;gf1.dma_data_pcm_last = block;</div><div class='add'>+		if (!(gus-&gt;gf1.dma_flags &amp; SNDRV_GF1_DMA_TRIGGER)) {</div><div class='add'>+			gus-&gt;gf1.dma_flags |= SNDRV_GF1_DMA_TRIGGER;</div><div class='add'>+			free_block = snd_gf1_dma_next_block(gus);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!(gus-&gt;gf1.dma_flags &amp; SNDRV_GF1_DMA_TRIGGER)) {</div><div class='del'>-		gus-&gt;gf1.dma_flags |= SNDRV_GF1_DMA_TRIGGER;</div><div class='del'>-		block = snd_gf1_dma_next_block(gus);</div><div class='del'>-		spin_unlock_irqrestore(&amp;gus-&gt;dma_lock, flags);</div><div class='del'>-		if (block == NULL)</div><div class='del'>-			return 0;</div><div class='del'>-		snd_gf1_dma_program(gus, block-&gt;addr, block-&gt;buf_addr, block-&gt;count, (unsigned short) block-&gt;cmd);</div><div class='del'>-		kfree(block);</div><div class='del'>-		return 0;</div><div class='add'>+</div><div class='add'>+	if (free_block) {</div><div class='add'>+		snd_gf1_dma_program(gus, free_block-&gt;addr, free_block-&gt;buf_addr,</div><div class='add'>+				    free_block-&gt;count,</div><div class='add'>+				    (unsigned short)free_block-&gt;cmd);</div><div class='add'>+		kfree(free_block);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;dma_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/gus/gus_dram.c b/sound/isa/gus/gus_dram.c<br/>index fd2e2e2ed4e7..50fe738ee3ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_dram.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_dram.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_dram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_dram.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  DRAM access routines</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -28,7 +13,6 @@</div><div class='ctx'> static int snd_gus_dram_poke(struct snd_gus_card *gus, char __user *_buffer,</div><div class='ctx'> 			     unsigned int address, unsigned int size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int size1, size2;</div><div class='ctx'> 	char buffer[256], *pbuffer;</div><div class='ctx'> </div><div class='hunk'>@@ -37,11 +21,10 @@ static int snd_gus_dram_poke(struct snd_gus_card *gus, char __user *_buffer,</div><div class='ctx'> 		if (copy_from_user(buffer, _buffer, size1))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		if (gus-&gt;interwave) {</div><div class='del'>-			spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, 0x01);</div><div class='ctx'> 			snd_gf1_dram_addr(gus, address);</div><div class='ctx'> 			outsb(GUSP(gus, DRAM), buffer, size1);</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 			address += size1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pbuffer = buffer;</div><div class='hunk'>@@ -66,19 +49,17 @@ static int snd_gus_dram_peek(struct snd_gus_card *gus, char __user *_buffer,</div><div class='ctx'> 			     unsigned int address, unsigned int size,</div><div class='ctx'> 			     int rom)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int size1, size2;</div><div class='ctx'> 	char buffer[256], *pbuffer;</div><div class='ctx'> </div><div class='ctx'> 	while (size &gt; 0) {</div><div class='ctx'> 		size1 = size &gt; sizeof(buffer) ? sizeof(buffer) : size;</div><div class='ctx'> 		if (gus-&gt;interwave) {</div><div class='del'>-			spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, rom ? 0x03 : 0x01);</div><div class='ctx'> 			snd_gf1_dram_addr(gus, address);</div><div class='ctx'> 			insb(GUSP(gus, DRAM), buffer, size1);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, 0x01);</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 			address += size1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			pbuffer = buffer;</div><div class='head'>diff --git a/sound/isa/gus/gus_instr.c b/sound/isa/gus/gus_instr.c<br/>deleted file mode 100644<br/>index 4dc9caf8ddcf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_instr.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_instr.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Routines for Gravis UltraSound soundcards - Synthesizer</div><div class='del'>- *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/gus.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int snd_gus_iwffff_put_sample(void *private_data, struct iwffff_wave *wave,</div><div class='del'>-			      char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-	struct snd_gf1_mem_block *block;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (wave-&gt;format &amp; IWFFFF_WAVE_ROM)</div><div class='del'>-		return 0;	/* it's probably ok - verify the address? */</div><div class='del'>-	if (wave-&gt;format &amp; IWFFFF_WAVE_STEREO)</div><div class='del'>-		return -EINVAL;	/* not supported */</div><div class='del'>-	block = snd_gf1_mem_alloc(&amp;gus-&gt;gf1.mem_alloc,</div><div class='del'>-				  SNDRV_GF1_MEM_OWNER_WAVE_IWFFFF,</div><div class='del'>-				  NULL, wave-&gt;size,</div><div class='del'>-				  wave-&gt;format &amp; IWFFFF_WAVE_16BIT, 1,</div><div class='del'>-				  wave-&gt;share_id);</div><div class='del'>-	if (block == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	err = snd_gus_dram_write(gus, data,</div><div class='del'>-				 block-&gt;ptr, wave-&gt;size);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 0);</div><div class='del'>-		snd_gf1_mem_xfree(&amp;gus-&gt;gf1.mem_alloc, block);</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 1);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	wave-&gt;address.memory = block-&gt;ptr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_iwffff_get_sample(void *private_data, struct iwffff_wave *wave,</div><div class='del'>-			      char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	return snd_gus_dram_read(gus, data, wave-&gt;address.memory, wave-&gt;size,</div><div class='del'>-				 wave-&gt;format &amp; IWFFFF_WAVE_ROM ? 1 : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_iwffff_remove_sample(void *private_data, struct iwffff_wave *wave,</div><div class='del'>-				 int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	if (wave-&gt;format &amp; IWFFFF_WAVE_ROM)</div><div class='del'>-		return 0;	/* it's probably ok - verify the address? */	</div><div class='del'>-	return snd_gf1_mem_free(&amp;gus-&gt;gf1.mem_alloc, wave-&gt;address.memory);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int snd_gus_gf1_put_sample(void *private_data, struct gf1_wave *wave,</div><div class='del'>-			   char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-	struct snd_gf1_mem_block *block;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (wave-&gt;format &amp; GF1_WAVE_STEREO)</div><div class='del'>-		return -EINVAL;	/* not supported */</div><div class='del'>-	block = snd_gf1_mem_alloc(&amp;gus-&gt;gf1.mem_alloc,</div><div class='del'>-				  SNDRV_GF1_MEM_OWNER_WAVE_GF1,</div><div class='del'>-				  NULL, wave-&gt;size,</div><div class='del'>-				  wave-&gt;format &amp; GF1_WAVE_16BIT, 1,</div><div class='del'>-				  wave-&gt;share_id);</div><div class='del'>-	if (block == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	err = snd_gus_dram_write(gus, data,</div><div class='del'>-				 block-&gt;ptr, wave-&gt;size);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 0);</div><div class='del'>-		snd_gf1_mem_xfree(&amp;gus-&gt;gf1.mem_alloc, block);</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 1);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	wave-&gt;address.memory = block-&gt;ptr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_gf1_get_sample(void *private_data, struct gf1_wave *wave,</div><div class='del'>-			   char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	return snd_gus_dram_read(gus, data, wave-&gt;address.memory, wave-&gt;size, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_gf1_remove_sample(void *private_data, struct gf1_wave *wave,</div><div class='del'>-			      int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	return snd_gf1_mem_free(&amp;gus-&gt;gf1.mem_alloc, wave-&gt;address.memory);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int snd_gus_simple_put_sample(void *private_data, struct simple_instrument *instr,</div><div class='del'>-			      char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-	struct snd_gf1_mem_block *block;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (instr-&gt;format &amp; SIMPLE_WAVE_STEREO)</div><div class='del'>-		return -EINVAL;	/* not supported */</div><div class='del'>-	block = snd_gf1_mem_alloc(&amp;gus-&gt;gf1.mem_alloc,</div><div class='del'>-				  SNDRV_GF1_MEM_OWNER_WAVE_SIMPLE,</div><div class='del'>-				  NULL, instr-&gt;size,</div><div class='del'>-				  instr-&gt;format &amp; SIMPLE_WAVE_16BIT, 1,</div><div class='del'>-				  instr-&gt;share_id);</div><div class='del'>-	if (block == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	err = snd_gus_dram_write(gus, data, block-&gt;ptr, instr-&gt;size);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 0);</div><div class='del'>-		snd_gf1_mem_xfree(&amp;gus-&gt;gf1.mem_alloc, block);</div><div class='del'>-		snd_gf1_mem_lock(&amp;gus-&gt;gf1.mem_alloc, 1);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	instr-&gt;address.memory = block-&gt;ptr;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_simple_get_sample(void *private_data, struct simple_instrument *instr,</div><div class='del'>-			      char __user *data, long len, int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	return snd_gus_dram_read(gus, data, instr-&gt;address.memory, instr-&gt;size, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_gus_simple_remove_sample(void *private_data, struct simple_instrument *instr,</div><div class='del'>-			         int atomic)</div><div class='del'>-{</div><div class='del'>-	struct snd_gus_card *gus = private_data;</div><div class='del'>-</div><div class='del'>-	return snd_gf1_mem_free(&amp;gus-&gt;gf1.mem_alloc, instr-&gt;address.memory);</div><div class='del'>-}</div><div class='head'>diff --git a/sound/isa/gus/gus_io.c b/sound/isa/gus/gus_io.c<br/>index ca79878d8d8c..3e6f35084f26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_io.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_io.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  I/O routines for GF1/InterWave synthesizer chips</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -192,99 +177,37 @@ unsigned int snd_gf1_read_addr(struct snd_gus_card * gus,</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_i_ctrl_stop(struct snd_gus_card * gus, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	__snd_gf1_ctrl_stop(gus, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_i_write8(struct snd_gus_card * gus,</div><div class='ctx'> 		      unsigned char reg,</div><div class='ctx'>                       unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	__snd_gf1_write8(gus, reg, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned char snd_gf1_i_look8(struct snd_gus_card * gus, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char res;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	res = __snd_gf1_look8(gus, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='add'>+	return __snd_gf1_look8(gus, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_i_write16(struct snd_gus_card * gus,</div><div class='ctx'> 		       unsigned char reg,</div><div class='ctx'> 		       unsigned int data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	__snd_gf1_write16(gus, reg, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned short snd_gf1_i_look16(struct snd_gus_card * gus, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short res;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	res = __snd_gf1_look16(gus, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-void snd_gf1_i_adlib_write(struct snd_gus_card * gus,</div><div class='del'>-		           unsigned char reg,</div><div class='del'>-		           unsigned char data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	__snd_gf1_adlib_write(gus, reg, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_gf1_i_write_addr(struct snd_gus_card * gus, unsigned char reg,</div><div class='del'>-			  unsigned int addr, short w_16bit)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	__snd_gf1_write_addr(gus, reg, addr, w_16bit);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-static unsigned int snd_gf1_i_read_addr(struct snd_gus_card * gus,</div><div class='del'>-					unsigned char reg, short w_16bit)</div><div class='del'>-{</div><div class='del'>-	unsigned int res;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	res = __snd_gf1_read_addr(gus, reg, w_16bit);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='add'>+	return __snd_gf1_look16(gus, reg);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>- */</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_dram_addr(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -300,9 +223,7 @@ void snd_gf1_dram_addr(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_poke(struct snd_gus_card * gus, unsigned int addr, unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw((unsigned short) addr, gus-&gt;gf1.reg_data16);</div><div class='hunk'>@@ -312,15 +233,11 @@ void snd_gf1_poke(struct snd_gus_card * gus, unsigned int addr, unsigned char da</div><div class='ctx'> 	outb((unsigned char) (addr &gt;&gt; 16), gus-&gt;gf1.reg_data8);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outb(data, gus-&gt;gf1.reg_dram);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned char snd_gf1_peek(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char res;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw((unsigned short) addr, gus-&gt;gf1.reg_data16);</div><div class='hunk'>@@ -329,22 +246,16 @@ unsigned char snd_gf1_peek(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outb((unsigned char) (addr &gt;&gt; 16), gus-&gt;gf1.reg_data8);</div><div class='ctx'> 	mb();</div><div class='del'>-	res = inb(gus-&gt;gf1.reg_dram);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	return inb(gus-&gt;gf1.reg_dram);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_pokew(struct snd_gus_card * gus, unsigned int addr, unsigned short data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (!gus-&gt;interwave)</div><div class='del'>-		snd_printk(KERN_DEBUG "snd_gf1_pokew - GF1!!!\n");</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "%s - GF1!!!\n", __func__);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw((unsigned short) addr, gus-&gt;gf1.reg_data16);</div><div class='hunk'>@@ -356,19 +267,13 @@ void snd_gf1_pokew(struct snd_gus_card * gus, unsigned int addr, unsigned short</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO16, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw(data, gus-&gt;gf1.reg_data16);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned short snd_gf1_peekw(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short res;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (!gus-&gt;interwave)</div><div class='del'>-		snd_printk(KERN_DEBUG "snd_gf1_peekw - GF1!!!\n");</div><div class='del'>-#endif</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "%s - GF1!!!\n", __func__);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw((unsigned short) addr, gus-&gt;gf1.reg_data16);</div><div class='hunk'>@@ -379,25 +284,20 @@ unsigned short snd_gf1_peekw(struct snd_gus_card * gus, unsigned int addr)</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO16, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='del'>-	res = inw(gus-&gt;gf1.reg_data16);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	return inw(gus-&gt;gf1.reg_data16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_dram_setmem(struct snd_gus_card * gus, unsigned int addr,</div><div class='ctx'> 			 unsigned short value, unsigned int count)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long port;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (!gus-&gt;interwave)</div><div class='del'>-		snd_printk(KERN_DEBUG "snd_gf1_dram_setmem - GF1!!!\n");</div><div class='del'>-#endif</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "%s - GF1!!!\n", __func__);</div><div class='ctx'> 	addr &amp;= ~1;</div><div class='ctx'> 	count &gt;&gt;= 1;</div><div class='ctx'> 	port = GUSP(gus, GF1DATALOW);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO_LOW, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	mb();</div><div class='ctx'> 	outw((unsigned short) addr, gus-&gt;gf1.reg_data16);</div><div class='hunk'>@@ -409,7 +309,6 @@ void snd_gf1_dram_setmem(struct snd_gus_card * gus, unsigned int addr,</div><div class='ctx'> 	outb(SNDRV_GF1_GW_DRAM_IO16, gus-&gt;gf1.reg_regsel);</div><div class='ctx'> 	while (count--)</div><div class='ctx'> 		outw(value, port);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif  /*  0  */</div><div class='hunk'>@@ -418,7 +317,7 @@ void snd_gf1_select_active_voices(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short voices;</div><div class='ctx'> </div><div class='del'>-	static unsigned short voices_tbl[32 - 14 + 1] =</div><div class='add'>+	static const unsigned short voices_tbl[32 - 14 + 1] =</div><div class='ctx'> 	{</div><div class='ctx'> 	    44100, 41160, 38587, 36317, 34300, 32494, 30870, 29400, 28063, 26843,</div><div class='ctx'> 	    25725, 24696, 23746, 22866, 22050, 21289, 20580, 19916, 19293</div><div class='hunk'>@@ -439,102 +338,3 @@ void snd_gf1_select_active_voices(struct snd_gus_card * gus)</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-</div><div class='del'>-void snd_gf1_print_voice_registers(struct snd_gus_card * gus)</div><div class='del'>-{</div><div class='del'>-	unsigned char mode;</div><div class='del'>-	int voice, ctrl;</div><div class='del'>-</div><div class='del'>-	voice = gus-&gt;gf1.active_voice;</div><div class='del'>-	printk(KERN_INFO " -%i- GF1  voice ctrl, ramp ctrl  = 0x%x, 0x%x\n", voice, ctrl = snd_gf1_i_read8(gus, 0), snd_gf1_i_read8(gus, 0x0d));</div><div class='del'>-	printk(KERN_INFO " -%i- GF1  frequency              = 0x%x\n", voice, snd_gf1_i_read16(gus, 1));</div><div class='del'>-	printk(KERN_INFO " -%i- GF1  loop start, end        = 0x%x (0x%x), 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 2, ctrl &amp; 4), snd_gf1_i_read_addr(gus, 2, (ctrl &amp; 4) ^ 4), snd_gf1_i_read_addr(gus, 4, ctrl &amp; 4), snd_gf1_i_read_addr(gus, 4, (ctrl &amp; 4) ^ 4));</div><div class='del'>-	printk(KERN_INFO " -%i- GF1  ramp start, end, rate  = 0x%x, 0x%x, 0x%x\n", voice, snd_gf1_i_read8(gus, 7), snd_gf1_i_read8(gus, 8), snd_gf1_i_read8(gus, 6));</div><div class='del'>-	printk(KERN_INFO" -%i- GF1  volume                 = 0x%x\n", voice, snd_gf1_i_read16(gus, 9));</div><div class='del'>-	printk(KERN_INFO " -%i- GF1  position               = 0x%x (0x%x)\n", voice, snd_gf1_i_read_addr(gus, 0x0a, ctrl &amp; 4), snd_gf1_i_read_addr(gus, 0x0a, (ctrl &amp; 4) ^ 4));</div><div class='del'>-	if (gus-&gt;interwave &amp;&amp; snd_gf1_i_read8(gus, 0x19) &amp; 0x01) {	/* enhanced mode */</div><div class='del'>-		mode = snd_gf1_i_read8(gus, 0x15);</div><div class='del'>-		printk(KERN_INFO " -%i- GFA1 mode                   = 0x%x\n", voice, mode);</div><div class='del'>-		if (mode &amp; 0x01) {	/* Effect processor */</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 effect address         = 0x%x\n", voice, snd_gf1_i_read_addr(gus, 0x11, ctrl &amp; 4));</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 effect volume          = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16));</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 effect volume final    = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d));</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 effect acumulator      = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14));</div><div class='del'>-		}</div><div class='del'>-		if (mode &amp; 0x20) {</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 left offset            = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x13), snd_gf1_i_read16(gus, 0x13) &gt;&gt; 4);</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 left offset final      = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1c), snd_gf1_i_read16(gus, 0x1c) &gt;&gt; 4);</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 right offset           = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x0c), snd_gf1_i_read16(gus, 0x0c) &gt;&gt; 4);</div><div class='del'>-			printk(KERN_INFO " -%i- GFA1 right offset final     = 0x%x (%i)\n", voice, snd_gf1_i_read16(gus, 0x1b), snd_gf1_i_read16(gus, 0x1b) &gt;&gt; 4);</div><div class='del'>-		} else</div><div class='del'>-			printk(KERN_INFO " -%i- GF1  pan                    = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));</div><div class='del'>-	} else</div><div class='del'>-		printk(KERN_INFO " -%i- GF1  pan                    = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-void snd_gf1_print_global_registers(struct snd_gus_card * gus)</div><div class='del'>-{</div><div class='del'>-	unsigned char global_mode = 0x00;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO " -G- GF1 active voices            = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ACTIVE_VOICES));</div><div class='del'>-	if (gus-&gt;interwave) {</div><div class='del'>-		global_mode = snd_gf1_i_read8(gus, SNDRV_GF1_GB_GLOBAL_MODE);</div><div class='del'>-		printk(KERN_INFO " -G- GF1 global mode              = 0x%x\n", global_mode);</div><div class='del'>-	}</div><div class='del'>-	if (global_mode &amp; 0x02)	/* LFO enabled? */</div><div class='del'>-		printk(KERN_INFO " -G- GF1 LFO base                 = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_LFO_BASE));</div><div class='del'>-	printk(KERN_INFO " -G- GF1 voices IRQ read          = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VOICES_IRQ_READ));</div><div class='del'>-	printk(KERN_INFO " -G- GF1 DRAM DMA control         = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL));</div><div class='del'>-	printk(KERN_INFO " -G- GF1 DRAM DMA high/low        = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_DMA_LOW));</div><div class='del'>-	printk(KERN_INFO " -G- GF1 DRAM IO high/low         = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_IO_HIGH), snd_gf1_i_read16(gus, SNDRV_GF1_GW_DRAM_IO_LOW));</div><div class='del'>-	if (!gus-&gt;interwave)</div><div class='del'>-		printk(KERN_INFO " -G- GF1 record DMA control       = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL));</div><div class='del'>-	printk(KERN_INFO " -G- GF1 DRAM IO 16               = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_DRAM_IO16));</div><div class='del'>-	if (gus-&gt;gf1.enh_mode) {</div><div class='del'>-		printk(KERN_INFO " -G- GFA1 memory config           = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG));</div><div class='del'>-		printk(KERN_INFO " -G- GFA1 memory control          = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MEMORY_CONTROL));</div><div class='del'>-		printk(KERN_INFO " -G- GFA1 FIFO record base        = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_RECORD_BASE_ADDR));</div><div class='del'>-		printk(KERN_INFO " -G- GFA1 FIFO playback base      = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_FIFO_PLAY_BASE_ADDR));</div><div class='del'>-		printk(KERN_INFO " -G- GFA1 interleave control      = 0x%x\n", snd_gf1_i_look16(gus, SNDRV_GF1_GW_INTERLEAVE));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_gf1_print_setup_registers(struct snd_gus_card * gus)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO " -S- mix control                  = 0x%x\n", inb(GUSP(gus, MIXCNTRLREG)));</div><div class='del'>-	printk(KERN_INFO " -S- IRQ status                   = 0x%x\n", inb(GUSP(gus, IRQSTAT)));</div><div class='del'>-	printk(KERN_INFO " -S- timer control                = 0x%x\n", inb(GUSP(gus, TIMERCNTRL)));</div><div class='del'>-	printk(KERN_INFO " -S- timer data                   = 0x%x\n", inb(GUSP(gus, TIMERDATA)));</div><div class='del'>-	printk(KERN_INFO " -S- status read                  = 0x%x\n", inb(GUSP(gus, REGCNTRLS)));</div><div class='del'>-	printk(KERN_INFO " -S- Sound Blaster control        = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL));</div><div class='del'>-	printk(KERN_INFO " -S- AdLib timer 1/2              = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1), snd_gf1_i_look8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2));</div><div class='del'>-	printk(KERN_INFO " -S- reset                        = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET));</div><div class='del'>-	if (gus-&gt;interwave) {</div><div class='del'>-		printk(KERN_INFO " -S- compatibility                = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_COMPATIBILITY));</div><div class='del'>-		printk(KERN_INFO " -S- decode control               = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_DECODE_CONTROL));</div><div class='del'>-		printk(KERN_INFO " -S- version number               = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER));</div><div class='del'>-		printk(KERN_INFO " -S- MPU-401 emul. control A/B    = 0x%x/0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A), snd_gf1_i_look8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B));</div><div class='del'>-		printk(KERN_INFO " -S- emulation IRQ                = 0x%x\n", snd_gf1_i_look8(gus, SNDRV_GF1_GB_EMULATION_IRQ));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_gf1_peek_print_block(struct snd_gus_card * gus, unsigned int addr, int count, int w_16bit)</div><div class='del'>-{</div><div class='del'>-	if (!w_16bit) {</div><div class='del'>-		while (count-- &gt; 0)</div><div class='del'>-			printk(count &gt; 0 ? "%02x:" : "%02x", snd_gf1_peek(gus, addr++));</div><div class='del'>-	} else {</div><div class='del'>-		while (count-- &gt; 0) {</div><div class='del'>-			printk(count &gt; 0 ? "%04x:" : "%04x", snd_gf1_peek(gus, addr) | (snd_gf1_peek(gus, addr + 1) &lt;&lt; 8));</div><div class='del'>-			addr += 2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif  /*  0  */</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c<br/>index 2055aff71b50..0e1054402c91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_irq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_irq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_irq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_irq.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routine for IRQ handling from GF1/InterWave chip</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -41,7 +26,6 @@ __again:</div><div class='ctx'> 	if (status == 0)</div><div class='ctx'> 		return IRQ_RETVAL(handled);</div><div class='ctx'> 	handled = 1;</div><div class='del'>-	/* snd_printk(KERN_DEBUG "IRQ: status = 0x%x\n", status); */</div><div class='ctx'> 	if (status &amp; 0x02) {</div><div class='ctx'> 		STAT_ADD(gus-&gt;gf1.interrupt_stat_midi_in);</div><div class='ctx'> 		if (gus-&gt;gf1.interrupt_handler_midi_in)</div><div class='hunk'>@@ -65,9 +49,9 @@ __again:</div><div class='ctx'> 				continue;	/* multi request */</div><div class='ctx'> 			already |= _current_;	/* mark request */</div><div class='ctx'> #if 0</div><div class='del'>-			printk(KERN_DEBUG "voice = %i, voice_status = 0x%x, "</div><div class='del'>-			       "voice_verify = %i\n",</div><div class='del'>-			       voice, voice_status, inb(GUSP(gus, GF1PAGE)));</div><div class='add'>+			dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+				"voice = %i, voice_status = 0x%x, voice_verify = %i\n",</div><div class='add'>+				voice, voice_status, inb(GUSP(gus, GF1PAGE)));</div><div class='ctx'> #endif</div><div class='ctx'> 			pvoice = &amp;gus-&gt;gf1.voices[voice]; </div><div class='ctx'> 			if (pvoice-&gt;use) {</div><div class='hunk'>@@ -140,10 +124,7 @@ static void snd_gus_irq_info_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> void snd_gus_irq_profile_init(struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(gus-&gt;card, "gusirq", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);</div><div class='add'>+	snd_card_ro_proc_new(gus-&gt;card, "gusirq", gus, snd_gus_irq_info_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c<br/>index 12eb98f2f931..5f50a39c6f16 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_main.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_main.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for Gravis UltraSound soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -36,18 +22,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches);</div><div class='ctx'> </div><div class='del'>-int snd_gus_use_inc(struct snd_gus_card * gus)</div><div class='del'>-{</div><div class='del'>-	if (!try_module_get(gus-&gt;card-&gt;module))</div><div class='del'>-		return 0;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_gus_use_dec(struct snd_gus_card * gus)</div><div class='del'>-{</div><div class='del'>-	module_put(gus-&gt;card-&gt;module);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_gus_joystick_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='hunk'>@@ -68,20 +42,18 @@ static int snd_gus_joystick_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> static int snd_gus_joystick_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval;</div><div class='ctx'> 	</div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] &amp; 31;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	change = gus-&gt;joystick_dac != nval;</div><div class='ctx'> 	gus-&gt;joystick_dac = nval;</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_JOYSTICK_DAC_LEVEL, gus-&gt;joystick_dac);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_gus_joystick_control = {</div><div class='add'>+static const struct snd_kcontrol_new snd_gus_joystick_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.name = "Joystick Speed",</div><div class='ctx'> 	.info = snd_gus_joystick_info,</div><div class='hunk'>@@ -139,7 +111,7 @@ int snd_gus_create(struct snd_card *card,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =	snd_gus_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -170,31 +142,34 @@ int snd_gus_create(struct snd_card *card,</div><div class='ctx'> 	gus-&gt;gf1.reg_timerctrl = GUSP(gus, TIMERCNTRL);</div><div class='ctx'> 	gus-&gt;gf1.reg_timerdata = GUSP(gus, TIMERDATA);</div><div class='ctx'> 	/* allocate resources */</div><div class='del'>-	if ((gus-&gt;gf1.res_port1 = request_region(port, 16, "GUS GF1 (Adlib/SB)")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "gus: can't grab SB port 0x%lx\n", port);</div><div class='add'>+	gus-&gt;gf1.res_port1 = request_region(port, 16, "GUS GF1 (Adlib/SB)");</div><div class='add'>+	if (!gus-&gt;gf1.res_port1) {</div><div class='add'>+		dev_err(card-&gt;dev, "gus: can't grab SB port 0x%lx\n", port);</div><div class='ctx'> 		snd_gus_free(gus);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if ((gus-&gt;gf1.res_port2 = request_region(port + 0x100, 12, "GUS GF1 (Synth)")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "gus: can't grab synth port 0x%lx\n", port + 0x100);</div><div class='add'>+	gus-&gt;gf1.res_port2 = request_region(port + 0x100, 12, "GUS GF1 (Synth)");</div><div class='add'>+	if (!gus-&gt;gf1.res_port2) {</div><div class='add'>+		dev_err(card-&gt;dev, "gus: can't grab synth port 0x%lx\n", port + 0x100);</div><div class='ctx'> 		snd_gus_free(gus);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (irq &gt;= 0 &amp;&amp; request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) {</div><div class='del'>-		snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);</div><div class='add'>+	if (irq &gt;= 0 &amp;&amp; request_irq(irq, snd_gus_interrupt, 0, "GUS GF1", (void *) gus)) {</div><div class='add'>+		dev_err(card-&gt;dev, "gus: can't grab irq %d\n", irq);</div><div class='ctx'> 		snd_gus_free(gus);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	gus-&gt;gf1.irq = irq;</div><div class='add'>+	card-&gt;sync_irq = irq;</div><div class='ctx'> 	if (request_dma(dma1, "GUS - 1")) {</div><div class='del'>-		snd_printk(KERN_ERR "gus: can't grab DMA1 %d\n", dma1);</div><div class='add'>+		dev_err(card-&gt;dev, "gus: can't grab DMA1 %d\n", dma1);</div><div class='ctx'> 		snd_gus_free(gus);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	gus-&gt;gf1.dma1 = dma1;</div><div class='ctx'> 	if (dma2 &gt;= 0 &amp;&amp; dma1 != dma2) {</div><div class='ctx'> 		if (request_dma(dma2, "GUS - 2")) {</div><div class='del'>-			snd_printk(KERN_ERR "gus: can't grab DMA2 %d\n", dma2);</div><div class='add'>+			dev_err(card-&gt;dev, "gus: can't grab DMA2 %d\n", dma2);</div><div class='ctx'> 			snd_gus_free(gus);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -219,7 +194,8 @@ int snd_gus_create(struct snd_card *card,</div><div class='ctx'> 	gus-&gt;gf1.pcm_channels = pcm_channels;</div><div class='ctx'> 	gus-&gt;gf1.volume_ramp = 25;</div><div class='ctx'> 	gus-&gt;gf1.smooth_pan = 1;</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &amp;ops)) &lt; 0) {</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_gus_free(gus);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -239,7 +215,9 @@ static int snd_gus_detect_memory(struct snd_gus_card * gus)</div><div class='ctx'> 	snd_gf1_poke(gus, 0L, 0xaa);</div><div class='ctx'> 	snd_gf1_poke(gus, 1L, 0x55);</div><div class='ctx'> 	if (snd_gf1_peek(gus, 0L) != 0xaa || snd_gf1_peek(gus, 1L) != 0x55) {</div><div class='del'>-		snd_printk(KERN_ERR "plain GF1 card at 0x%lx without onboard DRAM?\n", gus-&gt;gf1.port);</div><div class='add'>+		dev_err(gus-&gt;card-&gt;dev,</div><div class='add'>+			"plain GF1 card at 0x%lx without onboard DRAM?\n",</div><div class='add'>+			gus-&gt;gf1.port);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 1, d = 0xab; idx &lt; 4; idx++, d++) {</div><div class='hunk'>@@ -269,11 +247,10 @@ static int snd_gus_detect_memory(struct snd_gus_card * gus)</div><div class='ctx'> static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int irq, dma1, dma2;</div><div class='del'>-	static unsigned char irqs[16] =</div><div class='add'>+	static const unsigned char irqs[16] =</div><div class='ctx'> 		{0, 0, 1, 3, 0, 2, 0, 4, 0, 1, 0, 5, 6, 0, 0, 7};</div><div class='del'>-	static unsigned char dmas[8] =</div><div class='add'>+	static const unsigned char dmas[8] =</div><div class='ctx'> 		{6, 1, 0, 2, 0, 3, 4, 5};</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!gus))</div><div class='hunk'>@@ -297,14 +274,14 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches)</div><div class='ctx'> 	dma1 |= gus-&gt;equal_dma ? 0x40 : (dma2 &lt;&lt; 3);</div><div class='ctx'> </div><div class='ctx'> 	if ((dma1 &amp; 7) == 0 || (dma2 &amp; 7) == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Error! DMA isn't defined.\n");</div><div class='add'>+		dev_err(gus-&gt;card-&gt;dev, "Error! DMA isn't defined.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	irq = gus-&gt;gf1.irq;</div><div class='ctx'> 	irq = abs(irq);</div><div class='ctx'> 	irq = irqs[irq &amp; 0x0f];</div><div class='ctx'> 	if (irq == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Error! IRQ isn't defined.\n");</div><div class='add'>+		dev_err(gus-&gt;card-&gt;dev, "Error! IRQ isn't defined.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	irq |= 0x40;</div><div class='hunk'>@@ -312,34 +289,34 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches)</div><div class='ctx'> 	card-&gt;mixer.mix_ctrl_reg |= 0x10;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(5, GUSP(gus, REGCNTRLS));</div><div class='del'>-	outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-	outb(0x00, GUSP(gus, IRQDMACNTRLREG));</div><div class='del'>-	outb(0, GUSP(gus, REGCNTRLS));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(5, GUSP(gus, REGCNTRLS));</div><div class='add'>+		outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+		outb(0x00, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+		outb(0, GUSP(gus, REGCNTRLS));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(0x00 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-	outb(dma1, GUSP(gus, IRQDMACNTRLREG));</div><div class='del'>-	if (latches) {</div><div class='del'>-		outb(0x40 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-		outb(irq, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(0x00 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+		outb(dma1, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+		if (latches) {</div><div class='add'>+			outb(0x40 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+			outb(irq, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(0x00 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-	outb(dma1, GUSP(gus, IRQDMACNTRLREG));</div><div class='del'>-	if (latches) {</div><div class='del'>-		outb(0x40 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-		outb(irq, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(0x00 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+		outb(dma1, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+		if (latches) {</div><div class='add'>+			outb(0x40 | gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+			outb(irq, GUSP(gus, IRQDMACNTRLREG));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_delay(gus);</div><div class='ctx'> </div><div class='hunk'>@@ -347,29 +324,28 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches)</div><div class='ctx'> 		gus-&gt;mix_cntrl_reg |= 0x08;	/* enable latches */</div><div class='ctx'> 	else</div><div class='ctx'> 		gus-&gt;mix_cntrl_reg &amp;= ~0x08;	/* disable latches */</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-	outb(0, GUSP(gus, GF1PAGE));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+		outb(0, GUSP(gus, GF1PAGE));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gus_check_version(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char val, rev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='ctx'> 	card = gus-&gt;card;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(0x20, GUSP(gus, REGCNTRLS));</div><div class='del'>-	val = inb(GUSP(gus, REGCNTRLS));</div><div class='del'>-	rev = inb(GUSP(gus, BOARDVERSION));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	snd_printdd("GF1 [0x%lx] init - val = 0x%x, rev = 0x%x\n", gus-&gt;gf1.port, val, rev);</div><div class='del'>-	strcpy(card-&gt;driver, "GUS");</div><div class='del'>-	strcpy(card-&gt;longname, "Gravis UltraSound Classic (2.4)");</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(0x20, GUSP(gus, REGCNTRLS));</div><div class='add'>+		val = inb(GUSP(gus, REGCNTRLS));</div><div class='add'>+		rev = inb(GUSP(gus, BOARDVERSION));</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(card-&gt;dev, "GF1 [0x%lx] init - val = 0x%x, rev = 0x%x\n", gus-&gt;gf1.port, val, rev);</div><div class='add'>+	strscpy(card-&gt;driver, "GUS");</div><div class='add'>+	strscpy(card-&gt;longname, "Gravis UltraSound Classic (2.4)");</div><div class='ctx'> 	if ((val != 255 &amp;&amp; (val &amp; 0x06)) || (rev &gt;= 5 &amp;&amp; rev != 255)) {</div><div class='ctx'> 		if (rev &gt;= 5 &amp;&amp; rev &lt;= 9) {</div><div class='ctx'> 			gus-&gt;ics_flag = 1;</div><div class='hunk'>@@ -380,24 +356,27 @@ static int snd_gus_check_version(struct snd_gus_card * gus)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (rev &gt;= 10 &amp;&amp; rev != 255) {</div><div class='ctx'> 			if (rev &gt;= 10 &amp;&amp; rev &lt;= 11) {</div><div class='del'>-				strcpy(card-&gt;driver, "GUS MAX");</div><div class='del'>-				strcpy(card-&gt;longname, "Gravis UltraSound MAX");</div><div class='add'>+				strscpy(card-&gt;driver, "GUS MAX");</div><div class='add'>+				strscpy(card-&gt;longname, "Gravis UltraSound MAX");</div><div class='ctx'> 				gus-&gt;max_flag = 1;</div><div class='ctx'> 			} else if (rev == 0x30) {</div><div class='del'>-				strcpy(card-&gt;driver, "GUS ACE");</div><div class='del'>-				strcpy(card-&gt;longname, "Gravis UltraSound Ace");</div><div class='add'>+				strscpy(card-&gt;driver, "GUS ACE");</div><div class='add'>+				strscpy(card-&gt;longname, "Gravis UltraSound Ace");</div><div class='ctx'> 				gus-&gt;ace_flag = 1;</div><div class='ctx'> 			} else if (rev == 0x50) {</div><div class='del'>-				strcpy(card-&gt;driver, "GUS Extreme");</div><div class='del'>-				strcpy(card-&gt;longname, "Gravis UltraSound Extreme");</div><div class='add'>+				strscpy(card-&gt;driver, "GUS Extreme");</div><div class='add'>+				strscpy(card-&gt;longname, "Gravis UltraSound Extreme");</div><div class='ctx'> 				gus-&gt;ess_flag = 1;</div><div class='ctx'> 			} else {</div><div class='del'>-				snd_printk(KERN_ERR "unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus-&gt;gf1.port, rev, val);</div><div class='del'>-				snd_printk(KERN_ERR "  please - report to &lt;perex@perex.cz&gt;\n");</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n",</div><div class='add'>+					gus-&gt;gf1.port, rev, val);</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"  please - report to &lt;perex@perex.cz&gt;\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;shortname, card-&gt;longname);</div><div class='add'>+	strscpy(card-&gt;shortname, card-&gt;longname, sizeof(card-&gt;shortname));</div><div class='ctx'> 	gus-&gt;uart_enable = 1;	/* standard GUSes doesn't have midi uart trouble */</div><div class='ctx'> 	snd_gus_init_control(gus);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -408,14 +387,17 @@ int snd_gus_initialize(struct snd_gus_card *gus)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!gus-&gt;interwave) {</div><div class='del'>-		if ((err = snd_gus_check_version(gus)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "version check failed\n");</div><div class='add'>+		err = snd_gus_check_version(gus);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(gus-&gt;card-&gt;dev, "version check failed\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		if ((err = snd_gus_detect_memory(gus)) &lt; 0)</div><div class='add'>+		err = snd_gus_detect_memory(gus);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_gus_init_dma_irq(gus, 1)) &lt; 0)</div><div class='add'>+	err = snd_gus_init_dma_irq(gus, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	snd_gf1_start(gus);</div><div class='ctx'> 	gus-&gt;initialized = 1;</div><div class='hunk'>@@ -445,8 +427,6 @@ EXPORT_SYMBOL(snd_gf1_new_mixer);</div><div class='ctx'>   /* gus_pcm.c */</div><div class='ctx'> EXPORT_SYMBOL(snd_gf1_pcm_new);</div><div class='ctx'>   /* gus.c */</div><div class='del'>-EXPORT_SYMBOL(snd_gus_use_inc);</div><div class='del'>-EXPORT_SYMBOL(snd_gus_use_dec);</div><div class='ctx'> EXPORT_SYMBOL(snd_gus_create);</div><div class='ctx'> EXPORT_SYMBOL(snd_gus_initialize);</div><div class='ctx'>   /* gus_irq.c */</div><div class='hunk'>@@ -463,20 +443,3 @@ EXPORT_SYMBOL(snd_gf1_translate_freq);</div><div class='ctx'> EXPORT_SYMBOL(snd_gf1_mem_alloc);</div><div class='ctx'> EXPORT_SYMBOL(snd_gf1_mem_xfree);</div><div class='ctx'> EXPORT_SYMBOL(snd_gf1_mem_free);</div><div class='del'>-EXPORT_SYMBOL(snd_gf1_mem_lock);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_gus_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_gus_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_gus_init)</div><div class='del'>-module_exit(alsa_gus_exit)</div><div class='head'>diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c<br/>index af888a022fc0..8d95d8d5abdf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mem.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_mem.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  GUS's memory allocation routines / bottom layer</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -30,17 +15,9 @@ static void snd_gf1_mem_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 				  struct snd_info_buffer *buffer);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup)</div><div class='del'>-{</div><div class='del'>-	if (!xup) {</div><div class='del'>-		mutex_lock(&amp;alloc-&gt;memory_mutex);</div><div class='del'>-	} else {</div><div class='del'>-		mutex_unlock(&amp;alloc-&gt;memory_mutex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc,</div><div class='del'>-					       struct snd_gf1_mem_block * block)</div><div class='add'>+static struct snd_gf1_mem_block *</div><div class='add'>+snd_gf1_mem_xalloc(struct snd_gf1_mem *alloc, struct snd_gf1_mem_block *block,</div><div class='add'>+		   const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gf1_mem_block *pblock, *nblock;</div><div class='ctx'> </div><div class='hunk'>@@ -48,6 +25,12 @@ static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc,</div><div class='ctx'> 	if (nblock == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	*nblock = *block;</div><div class='add'>+	nblock-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='add'>+	if (!nblock-&gt;name) {</div><div class='add'>+		kfree(nblock);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pblock = alloc-&gt;first;</div><div class='ctx'> 	while (pblock) {</div><div class='ctx'> 		if (pblock-&gt;ptr &gt; nblock-&gt;ptr) {</div><div class='hunk'>@@ -58,8 +41,7 @@ static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc,</div><div class='ctx'> 				alloc-&gt;first = nblock;</div><div class='ctx'> 			else</div><div class='ctx'> 				nblock-&gt;prev-&gt;next = nblock;</div><div class='del'>-			mutex_unlock(&amp;alloc-&gt;memory_mutex);</div><div class='del'>-			return NULL;</div><div class='add'>+			return nblock;</div><div class='ctx'> 		}</div><div class='ctx'> 		pblock = pblock-&gt;next;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -79,7 +61,6 @@ int snd_gf1_mem_xfree(struct snd_gf1_mem * alloc, struct snd_gf1_mem_block * blo</div><div class='ctx'> {</div><div class='ctx'> 	if (block-&gt;share) {	/* ok.. shared block */</div><div class='ctx'> 		block-&gt;share--;</div><div class='del'>-		mutex_unlock(&amp;alloc-&gt;memory_mutex);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (alloc-&gt;first == block) {</div><div class='hunk'>@@ -191,46 +172,37 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gf1_mem_block block, *nblock;</div><div class='ctx'> </div><div class='del'>-	snd_gf1_mem_lock(alloc, 0);</div><div class='add'>+	guard(mutex)(&amp;alloc-&gt;memory_mutex);</div><div class='ctx'> 	if (share_id != NULL) {</div><div class='ctx'> 		nblock = snd_gf1_mem_share(alloc, share_id);</div><div class='ctx'> 		if (nblock != NULL) {</div><div class='ctx'> 			if (size != (int)nblock-&gt;size) {</div><div class='ctx'> 				/* TODO: remove in the future */</div><div class='del'>-				snd_printk(KERN_ERR "snd_gf1_mem_alloc - share: sizes differ\n");</div><div class='add'>+				pr_err("%s - share: sizes differ\n", __func__);</div><div class='ctx'> 				goto __std;</div><div class='ctx'> 			}</div><div class='ctx'> 			nblock-&gt;share++;</div><div class='del'>-			snd_gf1_mem_lock(alloc, 1);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'>       __std:</div><div class='del'>-	if (snd_gf1_mem_find(alloc, &amp;block, size, w_16, align) &lt; 0) {</div><div class='del'>-		snd_gf1_mem_lock(alloc, 1);</div><div class='add'>+	if (snd_gf1_mem_find(alloc, &amp;block, size, w_16, align) &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	if (share_id != NULL)</div><div class='ctx'> 		memcpy(&amp;block.share_id, share_id, sizeof(block.share_id));</div><div class='ctx'> 	block.owner = owner;</div><div class='del'>-	block.name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	nblock = snd_gf1_mem_xalloc(alloc, &amp;block);</div><div class='del'>-	snd_gf1_mem_lock(alloc, 1);</div><div class='add'>+	nblock = snd_gf1_mem_xalloc(alloc, &amp;block, name);</div><div class='ctx'> 	return nblock;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_gf1_mem_free(struct snd_gf1_mem * alloc, unsigned int address)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='ctx'> 	struct snd_gf1_mem_block *block;</div><div class='ctx'> </div><div class='del'>-	snd_gf1_mem_lock(alloc, 0);</div><div class='del'>-	if ((block = snd_gf1_mem_look(alloc, address)) != NULL) {</div><div class='del'>-		result = snd_gf1_mem_xfree(alloc, block);</div><div class='del'>-		snd_gf1_mem_lock(alloc, 1);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-	snd_gf1_mem_lock(alloc, 1);</div><div class='add'>+	guard(mutex)(&amp;alloc-&gt;memory_mutex);</div><div class='add'>+	block = snd_gf1_mem_look(alloc, address);</div><div class='add'>+	if (block)</div><div class='add'>+		return snd_gf1_mem_xfree(alloc, block);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -238,9 +210,6 @@ int snd_gf1_mem_init(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gf1_mem *alloc;</div><div class='ctx'> 	struct snd_gf1_mem_block block;</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	alloc = &amp;gus-&gt;gf1.mem_alloc;</div><div class='ctx'> 	mutex_init(&amp;alloc-&gt;memory_mutex);</div><div class='hunk'>@@ -253,18 +222,15 @@ int snd_gf1_mem_init(struct snd_gus_card * gus)</div><div class='ctx'> 	if (gus-&gt;gf1.enh_mode) {</div><div class='ctx'> 		block.ptr = 0;</div><div class='ctx'> 		block.size = 1024;</div><div class='del'>-		block.name = kstrdup("InterWave LFOs", GFP_KERNEL);</div><div class='del'>-		if (snd_gf1_mem_xalloc(alloc, &amp;block) == NULL)</div><div class='add'>+		if (!snd_gf1_mem_xalloc(alloc, &amp;block, "InterWave LFOs"))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	block.ptr = gus-&gt;gf1.default_voice_address;</div><div class='ctx'> 	block.size = 4;</div><div class='del'>-	block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL);</div><div class='del'>-	if (snd_gf1_mem_xalloc(alloc, &amp;block) == NULL)</div><div class='add'>+	if (!snd_gf1_mem_xalloc(alloc, &amp;block, "Voice default (NULL's)"))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='del'>-	if (! snd_card_proc_new(gus-&gt;card, "gusmem", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);</div><div class='add'>+	snd_card_ro_proc_new(gus-&gt;card, "gusmem", gus, snd_gf1_mem_info_read);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -296,7 +262,7 @@ static void snd_gf1_mem_info_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> 	gus = entry-&gt;private_data;</div><div class='ctx'> 	alloc = &amp;gus-&gt;gf1.mem_alloc;</div><div class='del'>-	mutex_lock(&amp;alloc-&gt;memory_mutex);</div><div class='add'>+	guard(mutex)(&amp;alloc-&gt;memory_mutex);</div><div class='ctx'> 	snd_iprintf(buffer, "8-bit banks       : \n    ");</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		snd_iprintf(buffer, "0x%06x (%04ik)%s", alloc-&gt;banks_8[i].address, alloc-&gt;banks_8[i].size &gt;&gt; 10, i + 1 &lt; 4 ? "," : "");</div><div class='hunk'>@@ -310,7 +276,7 @@ static void snd_gf1_mem_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 	used = 0;</div><div class='ctx'> 	for (block = alloc-&gt;first, i = 0; block; block = block-&gt;next, i++) {</div><div class='ctx'> 		used += block-&gt;size;</div><div class='del'>-		snd_iprintf(buffer, "Block %i at 0x%lx onboard 0x%x size %i (0x%x):\n", i, (long) block, block-&gt;ptr, block-&gt;size, block-&gt;size);</div><div class='add'>+		snd_iprintf(buffer, "Block %i onboard 0x%x size %i (0x%x):\n", i, block-&gt;ptr, block-&gt;size, block-&gt;size);</div><div class='ctx'> 		if (block-&gt;share ||</div><div class='ctx'> 		    block-&gt;share_id[0] || block-&gt;share_id[1] ||</div><div class='ctx'> 		    block-&gt;share_id[2] || block-&gt;share_id[3])</div><div class='hunk'>@@ -340,7 +306,6 @@ static void snd_gf1_mem_info_read(struct snd_info_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "  Total: memory = %i, used = %i, free = %i\n",</div><div class='ctx'> 		    total, used, total - used);</div><div class='del'>-	mutex_unlock(&amp;alloc-&gt;memory_mutex);</div><div class='ctx'> #if 0</div><div class='ctx'> 	ultra_iprintf(buffer, "  Verify: free = %i, max 8-bit block = %i, max 16-bit block = %i\n",</div><div class='ctx'> 		      ultra_memory_free_size(card, &amp;card-&gt;gf1.mem_alloc),</div><div class='head'>diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c<br/>index 2ccb3fadd7be..b5e1d1649500 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mem_proc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mem_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mem_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_mem_proc.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  GUS's memory access via proc filesystem</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -52,7 +37,7 @@ static void snd_gf1_mem_proc_free(struct snd_info_entry *entry)</div><div class='ctx'> 	kfree(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_gf1_mem_proc_ops = {</div><div class='add'>+static const struct snd_info_entry_ops snd_gf1_mem_proc_ops = {</div><div class='ctx'> 	.read = snd_gf1_mem_proc_dump,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c<br/>index 0dd43414016e..9bfdb4e45a5d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_mixer.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of ICS 2101 chip and "mixer" in GF1 chip</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -52,7 +37,6 @@ static int snd_gf1_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> static int snd_gf1_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int shift = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='ctx'> 	int change;</div><div class='hunk'>@@ -62,13 +46,12 @@ static int snd_gf1_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		nval ^= 1;</div><div class='ctx'> 	nval &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	oval = gus-&gt;mix_cntrl_reg;</div><div class='ctx'> 	nval = (oval &amp; ~(1 &lt;&lt; shift)) | nval;</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	outb(gus-&gt;mix_cntrl_reg = nval, GUSP(gus, MIXCNTRLREG));</div><div class='ctx'> 	outb(gus-&gt;gf1.active_voice = 0, GUSP(gus, GF1PAGE));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -90,14 +73,12 @@ static int snd_ics_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> static int snd_ics_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int addr = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	unsigned char left, right;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	left = gus-&gt;gf1.ics_regs[addr][0];</div><div class='ctx'> 	right = gus-&gt;gf1.ics_regs[addr][1];</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = left &amp; 127;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = right &amp; 127;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -106,25 +87,21 @@ static int snd_ics_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> static int snd_ics_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int addr = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int change;</div><div class='del'>-	unsigned char val1, val2, oval1, oval2, tmp;</div><div class='add'>+	unsigned char val1, val2, oval1, oval2;</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = ucontrol-&gt;value.integer.value[0] &amp; 127;</div><div class='ctx'> 	val2 = ucontrol-&gt;value.integer.value[1] &amp; 127;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	oval1 = gus-&gt;gf1.ics_regs[addr][0];</div><div class='ctx'> 	oval2 = gus-&gt;gf1.ics_regs[addr][1];</div><div class='ctx'> 	change = val1 != oval1 || val2 != oval2;</div><div class='ctx'> 	gus-&gt;gf1.ics_regs[addr][0] = val1;</div><div class='ctx'> 	gus-&gt;gf1.ics_regs[addr][1] = val2;</div><div class='ctx'> 	if (gus-&gt;ics_flag &amp;&amp; gus-&gt;ics_flipped &amp;&amp;</div><div class='del'>-	    (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV)) {</div><div class='del'>-		tmp = val1;</div><div class='del'>-		val1 = val2;</div><div class='del'>-		val2 = tmp;</div><div class='del'>-	}</div><div class='add'>+	    (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV))</div><div class='add'>+		swap(val1, val2);</div><div class='ctx'> 	addr &lt;&lt;= 3;</div><div class='ctx'> 	outb(addr | 0, GUSP(gus, MIXCNTRLPORT));</div><div class='ctx'> 	outb(1, GUSP(gus, MIXDATAPORT));</div><div class='hunk'>@@ -134,17 +111,16 @@ static int snd_ics_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 	outb(2, GUSP(gus, MIXDATAPORT));</div><div class='ctx'> 	outb(addr | 3, GUSP(gus, MIXCNTRLPORT));</div><div class='ctx'> 	outb((unsigned char) val2, GUSP(gus, MIXDATAPORT));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_gf1_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_gf1_controls[] = {</div><div class='ctx'> GF1_SINGLE("Master Playback Switch", 0, 1, 1),</div><div class='ctx'> GF1_SINGLE("Line Switch", 0, 0, 1),</div><div class='ctx'> GF1_SINGLE("Mic Switch", 0, 2, 0)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ics_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ics_controls[] = {</div><div class='ctx'> GF1_SINGLE("Master Playback Switch", 0, 1, 1),</div><div class='ctx'> ICS_DOUBLE("Master Playback Volume", 0, SNDRV_ICS_MASTER_DEV),</div><div class='ctx'> ICS_DOUBLE("Synth Playback Volume", 0, SNDRV_ICS_GF1_DEV),</div><div class='hunk'>@@ -170,7 +146,7 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus)</div><div class='ctx'> 	if (gus-&gt;ics_flag)</div><div class='ctx'> 		snd_component_add(card, "ICS2101");</div><div class='ctx'> 	if (card-&gt;mixername[0] == '\0') {</div><div class='del'>-		strcpy(card-&gt;mixername, gus-&gt;ics_flag ? "GF1,ICS2101" : "GF1");</div><div class='add'>+		strscpy(card-&gt;mixername, gus-&gt;ics_flag ? "GF1,ICS2101" : "GF1");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (gus-&gt;ics_flag)</div><div class='ctx'> 			strcat(card-&gt;mixername, ",ICS2101");</div><div class='hunk'>@@ -180,12 +156,14 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus)</div><div class='ctx'> 	if (!gus-&gt;ics_flag) {</div><div class='ctx'> 		max = gus-&gt;ess_flag ? 1 : ARRAY_SIZE(snd_gf1_controls);</div><div class='ctx'> 		for (idx = 0; idx &lt; max; idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_gf1_controls[idx], gus))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_gf1_controls[idx], gus));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_ics_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ics_controls[idx], gus))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ics_controls[idx], gus));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c<br/>index 2dcf45bf7293..9249cbff30f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_pcm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of GF1 chip (PCM things)</div><div class='hunk'>@@ -7,26 +8,12 @@</div><div class='ctx'>  *  </div><div class='ctx'>  *  This code emulates autoinit DMA transfer for playback, recording by GF1</div><div class='ctx'>  *  chip doesn't support autoinit DMA.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='hunk'>@@ -59,8 +46,6 @@ struct gus_pcm_private {</div><div class='ctx'> 	int final_volume;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_gf1_pcm_use_dma = 1;</div><div class='del'>-</div><div class='ctx'> static void snd_gf1_pcm_block_change_ack(struct snd_gus_card * gus, void *private_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct gus_pcm_private *pcmp = private_data;</div><div class='hunk'>@@ -82,10 +67,6 @@ static int snd_gf1_pcm_block_change(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	count += offset &amp; 31;</div><div class='ctx'> 	offset &amp;= ~31;</div><div class='del'>-	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "block change - offset = 0x%x, count = 0x%x\n",</div><div class='del'>-		   offset, count);</div><div class='del'>-	*/</div><div class='ctx'> 	memset(&amp;block, 0, sizeof(block));</div><div class='ctx'> 	block.cmd = SNDRV_GF1_DMA_IRQ;</div><div class='ctx'> 	if (snd_pcm_format_unsigned(runtime-&gt;format))</div><div class='hunk'>@@ -108,7 +89,6 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='ctx'> 	struct snd_gus_card * gus = pcmp-&gt;gus;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char voice_ctrl, ramp_ctrl;</div><div class='ctx'> 	unsigned short rate;</div><div class='ctx'> 	unsigned int curr, begin, end;</div><div class='hunk'>@@ -116,14 +96,12 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned char pan;</div><div class='ctx'> 	unsigned int voice;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;pcmp-&gt;lock, flags);</div><div class='del'>-	if (pcmp-&gt;flags &amp; SNDRV_GF1_PCM_PFLG_ACTIVE) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;pcmp-&gt;lock, flags);</div><div class='del'>-		return;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;pcmp-&gt;lock) {</div><div class='add'>+		if (pcmp-&gt;flags &amp; SNDRV_GF1_PCM_PFLG_ACTIVE)</div><div class='add'>+			return;</div><div class='add'>+		pcmp-&gt;flags |= SNDRV_GF1_PCM_PFLG_ACTIVE;</div><div class='add'>+		pcmp-&gt;final_volume = 0;</div><div class='ctx'> 	}</div><div class='del'>-	pcmp-&gt;flags |= SNDRV_GF1_PCM_PFLG_ACTIVE;</div><div class='del'>-	pcmp-&gt;final_volume = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pcmp-&gt;lock, flags);</div><div class='ctx'> 	rate = snd_gf1_translate_freq(gus, runtime-&gt;rate &lt;&lt; 4);</div><div class='ctx'> 	/* enable WAVE IRQ */</div><div class='ctx'> 	voice_ctrl = snd_pcm_format_width(runtime-&gt;format) == 16 ? 0x24 : 0x20;</div><div class='hunk'>@@ -138,14 +116,9 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)</div><div class='ctx'> 		curr = begin + (pcmp-&gt;bpos * pcmp-&gt;block_size) / runtime-&gt;channels;</div><div class='ctx'> 		end = curr + (pcmp-&gt;block_size / runtime-&gt;channels);</div><div class='ctx'> 		end -= snd_pcm_format_width(runtime-&gt;format) == 16 ? 2 : 1;</div><div class='del'>-		/*</div><div class='del'>-		snd_printk(KERN_DEBUG "init: curr=0x%x, begin=0x%x, end=0x%x, "</div><div class='del'>-			   "ctrl=0x%x, ramp=0x%x, rate=0x%x\n",</div><div class='del'>-			   curr, begin, end, voice_ctrl, ramp_ctrl, rate);</div><div class='del'>-		*/</div><div class='ctx'> 		pan = runtime-&gt;channels == 2 ? (!voice ? 1 : 14) : 8;</div><div class='ctx'> 		vol = !voice ? gus-&gt;gf1.pcm_volume_level_left : gus-&gt;gf1.pcm_volume_level_right;</div><div class='del'>-		spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 		snd_gf1_select_voice(gus, pcmp-&gt;pvoices[voice]-&gt;number);</div><div class='ctx'> 		snd_gf1_write8(gus, SNDRV_GF1_VB_PAN, pan);</div><div class='ctx'> 		snd_gf1_write16(gus, SNDRV_GF1_VW_FREQUENCY, rate);</div><div class='hunk'>@@ -161,9 +134,9 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)</div><div class='ctx'> 			snd_gf1_delay(gus);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_VB_VOLUME_CONTROL, ramp_ctrl);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	for (voice = 0; voice &lt; pcmp-&gt;voices; voice++) {</div><div class='ctx'> 		snd_gf1_select_voice(gus, pcmp-&gt;pvoices[voice]-&gt;number);</div><div class='ctx'> 		if (gus-&gt;gf1.enh_mode)</div><div class='hunk'>@@ -180,7 +153,6 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)</div><div class='ctx'> 			voice_ctrl &amp;= ~0x20;	/* disable IRQ for next voice */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_pcm_interrupt_wave(struct snd_gus_card * gus,</div><div class='hunk'>@@ -193,65 +165,65 @@ static void snd_gf1_pcm_interrupt_wave(struct snd_gus_card * gus,</div><div class='ctx'> 	unsigned int end, step;</div><div class='ctx'> </div><div class='ctx'> 	if (!pvoice-&gt;private_data) {</div><div class='del'>-		snd_printd("snd_gf1_pcm: unknown wave irq?\n");</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "%s: unknown wave irq?\n", __func__);</div><div class='ctx'> 		snd_gf1_smart_stop_voice(gus, pvoice-&gt;number);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	pcmp = pvoice-&gt;private_data;</div><div class='ctx'> 	if (pcmp == NULL) {</div><div class='del'>-		snd_printd("snd_gf1_pcm: unknown wave irq?\n");</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "%s: unknown wave irq?\n", __func__);</div><div class='ctx'> 		snd_gf1_smart_stop_voice(gus, pvoice-&gt;number);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}		</div><div class='ctx'> 	gus = pcmp-&gt;gus;</div><div class='ctx'> 	runtime = pcmp-&gt;substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;gus-&gt;reg_lock);</div><div class='del'>-	snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='del'>-	voice_ctrl = snd_gf1_read8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL) &amp; ~0x8b;</div><div class='del'>-	ramp_ctrl = (snd_gf1_read8(gus, SNDRV_GF1_VB_VOLUME_CONTROL) &amp; ~0xa4) | 0x03;</div><div class='add'>+	scoped_guard(spinlock, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='add'>+		voice_ctrl = snd_gf1_read8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL) &amp; ~0x8b;</div><div class='add'>+		ramp_ctrl = (snd_gf1_read8(gus, SNDRV_GF1_VB_VOLUME_CONTROL) &amp; ~0xa4) | 0x03;</div><div class='ctx'> #if 0</div><div class='del'>-	snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='del'>-	printk(KERN_DEBUG "position = 0x%x\n",</div><div class='del'>-	       (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl &amp; 4) &gt;&gt; 4));</div><div class='del'>-	snd_gf1_select_voice(gus, pcmp-&gt;pvoices[1]-&gt;number);</div><div class='del'>-	printk(KERN_DEBUG "position = 0x%x\n",</div><div class='del'>-	       (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl &amp; 4) &gt;&gt; 4));</div><div class='del'>-	snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='add'>+		snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "position = 0x%x\n",</div><div class='add'>+			(snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl &amp; 4) &gt;&gt; 4));</div><div class='add'>+		snd_gf1_select_voice(gus, pcmp-&gt;pvoices[1]-&gt;number);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "position = 0x%x\n",</div><div class='add'>+			(snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl &amp; 4) &gt;&gt; 4));</div><div class='add'>+		snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='ctx'> #endif</div><div class='del'>-	pcmp-&gt;bpos++;</div><div class='del'>-	pcmp-&gt;bpos %= pcmp-&gt;blocks;</div><div class='del'>-	if (pcmp-&gt;bpos + 1 &gt;= pcmp-&gt;blocks) {	/* last block? */</div><div class='del'>-		voice_ctrl |= 0x08;	/* enable loop */</div><div class='del'>-	} else {</div><div class='del'>-		ramp_ctrl |= 0x04;	/* enable rollover */</div><div class='del'>-	}</div><div class='del'>-	end = pcmp-&gt;memory + (((pcmp-&gt;bpos + 1) * pcmp-&gt;block_size) / runtime-&gt;channels);</div><div class='del'>-	end -= voice_ctrl &amp; 4 ? 2 : 1;</div><div class='del'>-	step = pcmp-&gt;dma_size / runtime-&gt;channels;</div><div class='del'>-	voice_ctrl |= 0x20;</div><div class='del'>-	if (!pcmp-&gt;final_volume) {</div><div class='del'>-		ramp_ctrl |= 0x20;</div><div class='del'>-		ramp_ctrl &amp;= ~0x03;</div><div class='del'>-	}</div><div class='del'>-	for (idx = 0; idx &lt; pcmp-&gt;voices; idx++, end += step) {</div><div class='del'>-		snd_gf1_select_voice(gus, pcmp-&gt;pvoices[idx]-&gt;number);</div><div class='del'>-		snd_gf1_write_addr(gus, SNDRV_GF1_VA_END, end &lt;&lt; 4, voice_ctrl &amp; 4);</div><div class='del'>-		snd_gf1_write8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL, voice_ctrl);</div><div class='del'>-		snd_gf1_write8(gus, SNDRV_GF1_VB_VOLUME_CONTROL, ramp_ctrl);</div><div class='del'>-		voice_ctrl &amp;= ~0x20;</div><div class='del'>-	}</div><div class='del'>-	if (!gus-&gt;gf1.enh_mode) {</div><div class='del'>-		snd_gf1_delay(gus);</div><div class='add'>+		pcmp-&gt;bpos++;</div><div class='add'>+		pcmp-&gt;bpos %= pcmp-&gt;blocks;</div><div class='add'>+		if (pcmp-&gt;bpos + 1 &gt;= pcmp-&gt;blocks) {	/* last block? */</div><div class='add'>+			voice_ctrl |= 0x08;	/* enable loop */</div><div class='add'>+		} else {</div><div class='add'>+			ramp_ctrl |= 0x04;	/* enable rollover */</div><div class='add'>+		}</div><div class='add'>+		end = pcmp-&gt;memory + (((pcmp-&gt;bpos + 1) * pcmp-&gt;block_size) / runtime-&gt;channels);</div><div class='add'>+		end -= voice_ctrl &amp; 4 ? 2 : 1;</div><div class='add'>+		step = pcmp-&gt;dma_size / runtime-&gt;channels;</div><div class='ctx'> 		voice_ctrl |= 0x20;</div><div class='del'>-		for (idx = 0; idx &lt; pcmp-&gt;voices; idx++) {</div><div class='add'>+		if (!pcmp-&gt;final_volume) {</div><div class='add'>+			ramp_ctrl |= 0x20;</div><div class='add'>+			ramp_ctrl &amp;= ~0x03;</div><div class='add'>+		}</div><div class='add'>+		for (idx = 0; idx &lt; pcmp-&gt;voices; idx++, end += step) {</div><div class='ctx'> 			snd_gf1_select_voice(gus, pcmp-&gt;pvoices[idx]-&gt;number);</div><div class='add'>+			snd_gf1_write_addr(gus, SNDRV_GF1_VA_END, end &lt;&lt; 4, voice_ctrl &amp; 4);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL, voice_ctrl);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_VB_VOLUME_CONTROL, ramp_ctrl);</div><div class='ctx'> 			voice_ctrl &amp;= ~0x20;</div><div class='ctx'> 		}</div><div class='add'>+		if (!gus-&gt;gf1.enh_mode) {</div><div class='add'>+			snd_gf1_delay(gus);</div><div class='add'>+			voice_ctrl |= 0x20;</div><div class='add'>+			for (idx = 0; idx &lt; pcmp-&gt;voices; idx++) {</div><div class='add'>+				snd_gf1_select_voice(gus, pcmp-&gt;pvoices[idx]-&gt;number);</div><div class='add'>+				snd_gf1_write8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL, voice_ctrl);</div><div class='add'>+				snd_gf1_write8(gus, SNDRV_GF1_VB_VOLUME_CONTROL, ramp_ctrl);</div><div class='add'>+				voice_ctrl &amp;= ~0x20;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_period_elapsed(pcmp-&gt;substream);</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -276,10 +248,10 @@ static void snd_gf1_pcm_interrupt_volume(struct snd_gus_card * gus,</div><div class='ctx'> 	struct gus_pcm_private *pcmp = pvoice-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* stop ramp, but leave rollover bit untouched */</div><div class='del'>-	spin_lock(&amp;gus-&gt;reg_lock);</div><div class='del'>-	snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='del'>-	snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='del'>-	spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='add'>+		snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='add'>+	}</div><div class='ctx'> 	if (pcmp == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* are we active? */</div><div class='hunk'>@@ -290,11 +262,10 @@ static void snd_gf1_pcm_interrupt_volume(struct snd_gus_card * gus,</div><div class='ctx'> 	if (pcmp-&gt;substream == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	vol = !cvoice ? gus-&gt;gf1.pcm_volume_level_left : gus-&gt;gf1.pcm_volume_level_right;</div><div class='del'>-	spin_lock(&amp;gus-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='ctx'> 	snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol);</div><div class='ctx'> 	pcmp-&gt;final_volume = 1;</div><div class='del'>-	spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_pcm_volume_change(struct snd_gus_card * gus)</div><div class='hunk'>@@ -306,20 +277,14 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,</div><div class='ctx'> 				  int w16, int invert)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	printk(KERN_DEBUG</div><div class='del'>-	       "poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n",</div><div class='del'>-	       (int)buf, pos, count, gus-&gt;gf1.port);</div><div class='del'>-	*/</div><div class='ctx'> 	while (count &gt; 0) {</div><div class='ctx'> 		len = count;</div><div class='ctx'> 		if (len &gt; 512)		/* limit, to allow IRQ */</div><div class='ctx'> 			len = 512;</div><div class='ctx'> 		count -= len;</div><div class='ctx'> 		if (gus-&gt;interwave) {</div><div class='del'>-			spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 			snd_gf1_write8(gus, SNDRV_GF1_GB_MEMORY_CONTROL, 0x01 | (invert ? 0x08 : 0x00));</div><div class='ctx'> 			snd_gf1_dram_addr(gus, pos);</div><div class='ctx'> 			if (w16) {</div><div class='hunk'>@@ -328,7 +293,6 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,</div><div class='ctx'> 			} else {</div><div class='ctx'> 				outsb(GUSP(gus, DRAM), buf, len);</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 			buf += 512;</div><div class='ctx'> 			pos += 512;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -353,66 +317,67 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,</div><div class='del'>-				     int voice,</div><div class='del'>-				     snd_pcm_uframes_t pos,</div><div class='del'>-				     void __user *src,</div><div class='del'>-				     snd_pcm_uframes_t count)</div><div class='add'>+static int get_bpos(struct gus_pcm_private *pcmp, int voice, unsigned int pos,</div><div class='add'>+		    unsigned int len)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='del'>-	unsigned int bpos, len;</div><div class='del'>-	</div><div class='del'>-	bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp-&gt;dma_size / 2));</div><div class='del'>-	len = samples_to_bytes(runtime, count);</div><div class='add'>+	unsigned int bpos = pos + (voice * (pcmp-&gt;dma_size / 2));</div><div class='ctx'> 	if (snd_BUG_ON(bpos &gt; pcmp-&gt;dma_size))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	if (snd_BUG_ON(bpos + len &gt; pcmp-&gt;dma_size))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (copy_from_user(runtime-&gt;dma_area + bpos, src, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (snd_gf1_pcm_use_dma &amp;&amp; len &gt; 32) {</div><div class='del'>-		return snd_gf1_pcm_block_change(substream, bpos, pcmp-&gt;memory + bpos, len);</div><div class='del'>-	} else {</div><div class='del'>-		struct snd_gus_card *gus = pcmp-&gt;gus;</div><div class='del'>-		int err, w16, invert;</div><div class='add'>+	return bpos;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		w16 = (snd_pcm_format_width(runtime-&gt;format) == 16);</div><div class='del'>-		invert = snd_pcm_format_unsigned(runtime-&gt;format);</div><div class='del'>-		if ((err = snd_gf1_pcm_poke_block(gus, runtime-&gt;dma_area + bpos, pcmp-&gt;memory + bpos, len, w16, invert)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+static int playback_copy_ack(struct snd_pcm_substream *substream,</div><div class='add'>+			     unsigned int bpos, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='add'>+	struct snd_gus_card *gus = pcmp-&gt;gus;</div><div class='add'>+	int w16, invert;</div><div class='add'>+</div><div class='add'>+	if (len &gt; 32)</div><div class='add'>+		return snd_gf1_pcm_block_change(substream, bpos,</div><div class='add'>+						pcmp-&gt;memory + bpos, len);</div><div class='add'>+</div><div class='add'>+	w16 = (snd_pcm_format_width(runtime-&gt;format) == 16);</div><div class='add'>+	invert = snd_pcm_format_unsigned(runtime-&gt;format);</div><div class='add'>+	return snd_gf1_pcm_poke_block(gus, runtime-&gt;dma_area + bpos,</div><div class='add'>+				      pcmp-&gt;memory + bpos, len, w16, invert);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,</div><div class='add'>+				     int voice, unsigned long pos,</div><div class='add'>+				     struct iov_iter *src, unsigned long count)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='add'>+	unsigned int len = count;</div><div class='add'>+	int bpos;</div><div class='add'>+</div><div class='add'>+	bpos = get_bpos(pcmp, voice, pos, len);</div><div class='add'>+	if (bpos &lt; 0)</div><div class='add'>+		return bpos;</div><div class='add'>+	if (copy_from_iter(runtime-&gt;dma_area + bpos, len, src) != len)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return playback_copy_ack(substream, bpos, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,</div><div class='del'>-					int voice,</div><div class='del'>-					snd_pcm_uframes_t pos,</div><div class='del'>-					snd_pcm_uframes_t count)</div><div class='add'>+					int voice, unsigned long pos,</div><div class='add'>+					unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='del'>-	unsigned int bpos, len;</div><div class='add'>+	unsigned int len = count;</div><div class='add'>+	int bpos;</div><div class='ctx'> 	</div><div class='del'>-	bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp-&gt;dma_size / 2));</div><div class='del'>-	len = samples_to_bytes(runtime, count);</div><div class='del'>-	if (snd_BUG_ON(bpos &gt; pcmp-&gt;dma_size))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (snd_BUG_ON(bpos + len &gt; pcmp-&gt;dma_size))</div><div class='del'>-		return -EIO;</div><div class='del'>-	snd_pcm_format_set_silence(runtime-&gt;format, runtime-&gt;dma_area + bpos, count);</div><div class='del'>-	if (snd_gf1_pcm_use_dma &amp;&amp; len &gt; 32) {</div><div class='del'>-		return snd_gf1_pcm_block_change(substream, bpos, pcmp-&gt;memory + bpos, len);</div><div class='del'>-	} else {</div><div class='del'>-		struct snd_gus_card *gus = pcmp-&gt;gus;</div><div class='del'>-		int err, w16, invert;</div><div class='del'>-</div><div class='del'>-		w16 = (snd_pcm_format_width(runtime-&gt;format) == 16);</div><div class='del'>-		invert = snd_pcm_format_unsigned(runtime-&gt;format);</div><div class='del'>-		if ((err = snd_gf1_pcm_poke_block(gus, runtime-&gt;dma_area + bpos, pcmp-&gt;memory + bpos, len, w16, invert)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	bpos = get_bpos(pcmp, voice, pos, len);</div><div class='add'>+	if (bpos &lt; 0)</div><div class='add'>+		return bpos;</div><div class='add'>+	snd_pcm_format_set_silence(runtime-&gt;format, runtime-&gt;dma_area + bpos,</div><div class='add'>+				   bytes_to_samples(runtime, count));</div><div class='add'>+	return playback_copy_ack(substream, bpos, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -421,27 +386,26 @@ static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_gus_card *gus = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='del'>-	int err;</div><div class='del'>-	</div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (err &gt; 0) {	/* change */</div><div class='add'>+</div><div class='add'>+	if (runtime-&gt;buffer_changed) {</div><div class='ctx'> 		struct snd_gf1_mem_block *block;</div><div class='ctx'> 		if (pcmp-&gt;memory &gt; 0) {</div><div class='ctx'> 			snd_gf1_mem_free(&amp;gus-&gt;gf1.mem_alloc, pcmp-&gt;memory);</div><div class='ctx'> 			pcmp-&gt;memory = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if ((block = snd_gf1_mem_alloc(&amp;gus-&gt;gf1.mem_alloc,</div><div class='del'>-		                               SNDRV_GF1_MEM_OWNER_DRIVER,</div><div class='del'>-					       "GF1 PCM",</div><div class='del'>-		                               runtime-&gt;dma_bytes, 1, 32,</div><div class='del'>-		                               NULL)) == NULL)</div><div class='add'>+		block = snd_gf1_mem_alloc(&amp;gus-&gt;gf1.mem_alloc,</div><div class='add'>+					  SNDRV_GF1_MEM_OWNER_DRIVER,</div><div class='add'>+					  "GF1 PCM",</div><div class='add'>+					  runtime-&gt;dma_bytes, 1, 32,</div><div class='add'>+					  NULL);</div><div class='add'>+		if (!block)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		pcmp-&gt;memory = block-&gt;ptr;</div><div class='ctx'> 	}</div><div class='ctx'> 	pcmp-&gt;voices = params_channels(hw_params);</div><div class='ctx'> 	if (pcmp-&gt;pvoices[0] == NULL) {</div><div class='del'>-		if ((pcmp-&gt;pvoices[0] = snd_gf1_alloc_voice(pcmp-&gt;gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0)) == NULL)</div><div class='add'>+		pcmp-&gt;pvoices[0] = snd_gf1_alloc_voice(pcmp-&gt;gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0);</div><div class='add'>+		if (!pcmp-&gt;pvoices[0])</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		pcmp-&gt;pvoices[0]-&gt;handler_wave = snd_gf1_pcm_interrupt_wave;</div><div class='ctx'> 		pcmp-&gt;pvoices[0]-&gt;handler_volume = snd_gf1_pcm_interrupt_volume;</div><div class='hunk'>@@ -449,7 +413,8 @@ static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		pcmp-&gt;pvoices[0]-&gt;private_data = pcmp;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pcmp-&gt;voices &gt; 1 &amp;&amp; pcmp-&gt;pvoices[1] == NULL) {</div><div class='del'>-		if ((pcmp-&gt;pvoices[1] = snd_gf1_alloc_voice(pcmp-&gt;gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0)) == NULL)</div><div class='add'>+		pcmp-&gt;pvoices[1] = snd_gf1_alloc_voice(pcmp-&gt;gus, SNDRV_GF1_VOICE_TYPE_PCM, 0, 0);</div><div class='add'>+		if (!pcmp-&gt;pvoices[1])</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		pcmp-&gt;pvoices[1]-&gt;handler_wave = snd_gf1_pcm_interrupt_wave;</div><div class='ctx'> 		pcmp-&gt;pvoices[1]-&gt;handler_volume = snd_gf1_pcm_interrupt_volume;</div><div class='hunk'>@@ -469,7 +434,6 @@ static int snd_gf1_pcm_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	if (pcmp-&gt;pvoices[0]) {</div><div class='ctx'> 		snd_gf1_free_voice(pcmp-&gt;gus, pcmp-&gt;pvoices[0]);</div><div class='ctx'> 		pcmp-&gt;pvoices[0] = NULL;</div><div class='hunk'>@@ -508,9 +472,9 @@ static int snd_gf1_pcm_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (cmd == SNDRV_PCM_TRIGGER_START) {</div><div class='ctx'> 		snd_gf1_pcm_trigger_up(substream);</div><div class='ctx'> 	} else if (cmd == SNDRV_PCM_TRIGGER_STOP) {</div><div class='del'>-		spin_lock(&amp;pcmp-&gt;lock);</div><div class='del'>-		pcmp-&gt;flags &amp;= ~SNDRV_GF1_PCM_PFLG_ACTIVE;</div><div class='del'>-		spin_unlock(&amp;pcmp-&gt;lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;pcmp-&gt;lock) {</div><div class='add'>+			pcmp-&gt;flags &amp;= ~SNDRV_GF1_PCM_PFLG_ACTIVE;</div><div class='add'>+		}</div><div class='ctx'> 		voice = pcmp-&gt;pvoices[0]-&gt;number;</div><div class='ctx'> 		snd_gf1_stop_voices(gus, voice, voice);</div><div class='ctx'> 		if (pcmp-&gt;pvoices[1]) {</div><div class='hunk'>@@ -532,7 +496,7 @@ static snd_pcm_uframes_t snd_gf1_pcm_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 	unsigned char voice_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	pos = 0;</div><div class='del'>-	spin_lock(&amp;gus-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	if (pcmp-&gt;flags &amp; SNDRV_GF1_PCM_PFLG_ACTIVE) {</div><div class='ctx'> 		snd_gf1_select_voice(gus, pcmp-&gt;pvoices[0]-&gt;number);</div><div class='ctx'> 		voice_ctrl = snd_gf1_read8(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);</div><div class='hunk'>@@ -541,18 +505,17 @@ static snd_pcm_uframes_t snd_gf1_pcm_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 			pos &lt;&lt;= 1;</div><div class='ctx'> 		pos = bytes_to_frames(runtime, pos);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	return pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum clock = {</div><div class='add'>+static const struct snd_ratnum clock = {</div><div class='ctx'> 	.num = 9878400/16,</div><div class='ctx'> 	.den_min = 2,</div><div class='ctx'> 	.den_max = 257,</div><div class='ctx'> 	.den_step = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {</div><div class='ctx'> 	.nrats = 1,</div><div class='ctx'> 	.rats = &amp;clock,</div><div class='ctx'> };</div><div class='hunk'>@@ -572,12 +535,7 @@ static int snd_gf1_pcm_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		gus-&gt;gf1.pcm_rcntrl_reg |= 4;</div><div class='ctx'> 	if (snd_pcm_format_unsigned(params_format(hw_params)))</div><div class='ctx'> 		gus-&gt;gf1.pcm_rcntrl_reg |= 0x80;</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_gf1_pcm_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -606,10 +564,9 @@ static int snd_gf1_pcm_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;gus-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL, val);</div><div class='ctx'> 	snd_gf1_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL);</div><div class='del'>-	spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -633,7 +590,7 @@ static void snd_gf1_pcm_interrupt_dma_read(struct snd_gus_card * gus)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_gf1_pcm_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_gf1_pcm_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_NONINTERLEAVED,</div><div class='ctx'> 	.formats		= (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |</div><div class='hunk'>@@ -651,7 +608,7 @@ static struct snd_pcm_hardware snd_gf1_pcm_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_gf1_pcm_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_gf1_pcm_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -693,10 +650,12 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;private_free = snd_gf1_pcm_playback_free;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",</div><div class='del'>-	       (long) pcm-&gt;playback.buffer, (long) gus-&gt;gf1.pcm_buffer);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",</div><div class='add'>+		(long) pcm-&gt;playback.buffer, (long) gus-&gt;gf1.pcm_buffer);</div><div class='ctx'> #endif</div><div class='del'>-	if ((err = snd_gf1_dma_init(gus)) &lt; 0)</div><div class='add'>+	err = snd_gf1_dma_init(gus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcmp-&gt;flags = SNDRV_GF1_PCM_PFLG_NONE;</div><div class='ctx'> 	pcmp-&gt;substream = substream;</div><div class='hunk'>@@ -714,7 +673,7 @@ static int snd_gf1_pcm_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct gus_pcm_private *pcmp = runtime-&gt;private_data;</div><div class='ctx'> 	</div><div class='ctx'> 	if (!wait_event_timeout(pcmp-&gt;sleep, (atomic_read(&amp;pcmp-&gt;dma_count) &lt;= 0), 2*HZ))</div><div class='del'>-		snd_printk(KERN_ERR "gf1 pcm - serious DMA problem\n");</div><div class='add'>+		dev_err(gus-&gt;card-&gt;dev, "gf1 pcm - serious DMA problem\n");</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_dma_done(gus);	</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -756,19 +715,16 @@ static int snd_gf1_pcm_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_gf1_pcm_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;pcm_volume_level_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;pcm_volume_level_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = gus-&gt;gf1.pcm_volume_level_left1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = gus-&gt;gf1.pcm_volume_level_right1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;pcm_volume_level_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	unsigned short val1, val2, vol;</div><div class='hunk'>@@ -777,37 +733,36 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = ucontrol-&gt;value.integer.value[0] &amp; 127;</div><div class='ctx'> 	val2 = ucontrol-&gt;value.integer.value[1] &amp; 127;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;pcm_volume_level_lock, flags);</div><div class='del'>-	change = val1 != gus-&gt;gf1.pcm_volume_level_left1 ||</div><div class='del'>-	         val2 != gus-&gt;gf1.pcm_volume_level_right1;</div><div class='del'>-	gus-&gt;gf1.pcm_volume_level_left1 = val1;</div><div class='del'>-	gus-&gt;gf1.pcm_volume_level_right1 = val2;</div><div class='del'>-	gus-&gt;gf1.pcm_volume_level_left = snd_gf1_lvol_to_gvol_raw(val1 &lt;&lt; 9) &lt;&lt; 4;</div><div class='del'>-	gus-&gt;gf1.pcm_volume_level_right = snd_gf1_lvol_to_gvol_raw(val2 &lt;&lt; 9) &lt;&lt; 4;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;pcm_volume_level_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;pcm_volume_level_lock) {</div><div class='add'>+		change = val1 != gus-&gt;gf1.pcm_volume_level_left1 ||</div><div class='add'>+			val2 != gus-&gt;gf1.pcm_volume_level_right1;</div><div class='add'>+		gus-&gt;gf1.pcm_volume_level_left1 = val1;</div><div class='add'>+		gus-&gt;gf1.pcm_volume_level_right1 = val2;</div><div class='add'>+		gus-&gt;gf1.pcm_volume_level_left = snd_gf1_lvol_to_gvol_raw(val1 &lt;&lt; 9) &lt;&lt; 4;</div><div class='add'>+		gus-&gt;gf1.pcm_volume_level_right = snd_gf1_lvol_to_gvol_raw(val2 &lt;&lt; 9) &lt;&lt; 4;</div><div class='add'>+	}</div><div class='ctx'> 	/* are we active? */</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;voice_alloc, flags);</div><div class='del'>-	for (idx = 0; idx &lt; 32; idx++) {</div><div class='del'>-		pvoice = &amp;gus-&gt;gf1.voices[idx];</div><div class='del'>-		if (!pvoice-&gt;pcm)</div><div class='del'>-			continue;</div><div class='del'>-		pcmp = pvoice-&gt;private_data;</div><div class='del'>-		if (!(pcmp-&gt;flags &amp; SNDRV_GF1_PCM_PFLG_ACTIVE))</div><div class='del'>-			continue;</div><div class='del'>-		/* load real volume - better precision */</div><div class='del'>-		spin_lock(&amp;gus-&gt;reg_lock);</div><div class='del'>-		snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='del'>-		snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='del'>-		vol = pvoice == pcmp-&gt;pvoices[0] ? gus-&gt;gf1.pcm_volume_level_left : gus-&gt;gf1.pcm_volume_level_right;</div><div class='del'>-		snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol);</div><div class='del'>-		pcmp-&gt;final_volume = 1;</div><div class='del'>-		spin_unlock(&amp;gus-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;voice_alloc) {</div><div class='add'>+		for (idx = 0; idx &lt; 32; idx++) {</div><div class='add'>+			pvoice = &amp;gus-&gt;gf1.voices[idx];</div><div class='add'>+			if (!pvoice-&gt;pcm)</div><div class='add'>+				continue;</div><div class='add'>+			pcmp = pvoice-&gt;private_data;</div><div class='add'>+			if (!(pcmp-&gt;flags &amp; SNDRV_GF1_PCM_PFLG_ACTIVE))</div><div class='add'>+				continue;</div><div class='add'>+			/* load real volume - better precision */</div><div class='add'>+			guard(spinlock)(&amp;gus-&gt;reg_lock);</div><div class='add'>+			snd_gf1_select_voice(gus, pvoice-&gt;number);</div><div class='add'>+			snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='add'>+			vol = pvoice == pcmp-&gt;pvoices[0] ? gus-&gt;gf1.pcm_volume_level_left : gus-&gt;gf1.pcm_volume_level_right;</div><div class='add'>+			snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol);</div><div class='add'>+			pcmp-&gt;final_volume = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_gf1_pcm_volume_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "PCM Playback Volume",</div><div class='hunk'>@@ -816,7 +771,7 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control =</div><div class='ctx'> 	.put = snd_gf1_pcm_volume_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =</div><div class='add'>+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "GPCM Playback Volume",</div><div class='hunk'>@@ -825,31 +780,28 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =</div><div class='ctx'> 	.put = snd_gf1_pcm_volume_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_gf1_pcm_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {</div><div class='ctx'> 	.open =		snd_gf1_pcm_playback_open,</div><div class='ctx'> 	.close =	snd_gf1_pcm_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_gf1_pcm_playback_hw_params,</div><div class='ctx'> 	.hw_free =	snd_gf1_pcm_playback_hw_free,</div><div class='ctx'> 	.prepare =	snd_gf1_pcm_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_gf1_pcm_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_gf1_pcm_playback_pointer,</div><div class='ctx'> 	.copy =		snd_gf1_pcm_playback_copy,</div><div class='del'>-	.silence =	snd_gf1_pcm_playback_silence,</div><div class='add'>+	.fill_silence =	snd_gf1_pcm_playback_silence,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_gf1_pcm_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = {</div><div class='ctx'> 	.open =		snd_gf1_pcm_capture_open,</div><div class='ctx'> 	.close =	snd_gf1_pcm_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_gf1_pcm_capture_hw_params,</div><div class='del'>-	.hw_free =	snd_gf1_pcm_capture_hw_free,</div><div class='ctx'> 	.prepare =	snd_gf1_pcm_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_gf1_pcm_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_gf1_pcm_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -857,8 +809,6 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int capture, err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	card = gus-&gt;card;</div><div class='ctx'> 	capture = !gus-&gt;interwave &amp;&amp; !gus-&gt;ess_flag &amp;&amp; !gus-&gt;ace_flag ? 1 : 0;</div><div class='ctx'> 	err = snd_pcm_new(card,</div><div class='hunk'>@@ -874,9 +824,9 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_gf1_pcm_playback_ops);</div><div class='ctx'> </div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream-&gt;next)</div><div class='del'>-		snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, gus-&gt;gf1.dma1 &gt; 3 ? 128*1024 : 64*1024);</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   card-&gt;dev,</div><div class='add'>+					   64*1024, gus-&gt;gf1.dma1 &gt; 3 ? 128*1024 : 64*1024);</div><div class='ctx'> 	</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='hunk'>@@ -884,11 +834,11 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s</div><div class='ctx'> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_gf1_pcm_capture_ops);</div><div class='ctx'> 		if (gus-&gt;gf1.dma2 == gus-&gt;gf1.dma1)</div><div class='ctx'> 			pcm-&gt;info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='del'>-		snd_pcm_lib_preallocate_pages(pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream,</div><div class='del'>-					      SNDRV_DMA_TYPE_DEV, snd_dma_isa_data(),</div><div class='del'>-					      64*1024, gus-&gt;gf1.dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='add'>+		snd_pcm_set_managed_buffer(pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream,</div><div class='add'>+					   SNDRV_DMA_TYPE_DEV, card-&gt;dev,</div><div class='add'>+					   64*1024, gus-&gt;gf1.dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(pcm-&gt;name, pcm-&gt;id);</div><div class='add'>+	strscpy(pcm-&gt;name, pcm-&gt;id);</div><div class='ctx'> 	if (gus-&gt;interwave) {</div><div class='ctx'> 		sprintf(pcm-&gt;name + strlen(pcm-&gt;name), " rev %c", gus-&gt;revision + 'A');</div><div class='ctx'> 	}</div><div class='hunk'>@@ -899,12 +849,11 @@ int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, s</div><div class='ctx'> 		kctl = snd_ctl_new1(&amp;snd_gf1_pcm_volume_control1, gus);</div><div class='ctx'> 	else</div><div class='ctx'> 		kctl = snd_ctl_new1(&amp;snd_gf1_pcm_volume_control, gus);</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	kctl-&gt;id.index = control_index;</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/gus/gus_reset.c b/sound/isa/gus/gus_reset.c<br/>index 3d1fed0c2620..a7a3e764bb77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_reset.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_reset.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_reset.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_reset.c</a></div><div class='hunk'>@@ -1,21 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -24,11 +9,6 @@</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='ctx'> </div><div class='del'>-extern void snd_gf1_timers_init(struct snd_gus_card * gus);</div><div class='del'>-extern void snd_gf1_timers_done(struct snd_gus_card * gus);</div><div class='del'>-extern int snd_gf1_synth_init(struct snd_gus_card * gus);</div><div class='del'>-extern void snd_gf1_synth_done(struct snd_gus_card * gus);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  ok.. default interrupt handlers...</div><div class='ctx'>  */</div><div class='hunk'>@@ -100,26 +80,20 @@ void snd_gf1_set_default_handlers(struct snd_gus_card * gus, unsigned int what)</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_clear_regs(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	inb(GUSP(gus, IRQSTAT));</div><div class='ctx'> 	snd_gf1_write8(gus, 0x41, 0);	/* DRAM DMA Control Register */</div><div class='ctx'> 	snd_gf1_write8(gus, 0x45, 0);	/* Timer Control */</div><div class='ctx'> 	snd_gf1_write8(gus, 0x49, 0);	/* Sampling Control Register */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_look_regs(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_look8(gus, 0x41);	/* DRAM DMA Control Register */</div><div class='ctx'> 	snd_gf1_look8(gus, 0x49);	/* Sampling Control Register */</div><div class='ctx'> 	inb(GUSP(gus, IRQSTAT));</div><div class='ctx'> 	snd_gf1_read8(gus, 0x0f);	/* IRQ Source Register */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -128,42 +102,35 @@ static void snd_gf1_look_regs(struct snd_gus_card * gus)</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_smart_stop_voice(struct snd_gus_card * gus, unsigned short voice)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_select_voice(gus, voice);</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG " -%i- smart stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		" -%i- smart stop voice - volume = 0x%x\n",</div><div class='add'>+		voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));</div><div class='ctx'> #endif</div><div class='ctx'> 	snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);</div><div class='ctx'> 	snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_stop_voice(struct snd_gus_card * gus, unsigned short voice)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	snd_gf1_select_voice(gus, voice);</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG " -%i- stop voice - volume = 0x%x\n", voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		" -%i- stop voice - volume = 0x%x\n",</div><div class='add'>+		voice, snd_gf1_i_read16(gus, SNDRV_GF1_VW_VOLUME));</div><div class='ctx'> #endif</div><div class='ctx'> 	snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);</div><div class='ctx'> 	snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);</div><div class='ctx'> 	if (gus-&gt;gf1.enh_mode)</div><div class='ctx'> 		snd_gf1_write8(gus, SNDRV_GF1_VB_ACCUMULATOR, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-#if 0</div><div class='del'>-	snd_gf1_lfo_shutdown(gus, voice, ULTRA_LFO_VIBRATO);</div><div class='del'>-	snd_gf1_lfo_shutdown(gus, voice, ULTRA_LFO_TREMOLO);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_clear_voices(struct snd_gus_card * gus, unsigned short v_min,</div><div class='ctx'> 				 unsigned short v_max)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int daddr;</div><div class='ctx'> 	unsigned short i, w_16;</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +140,7 @@ static void snd_gf1_clear_voices(struct snd_gus_card * gus, unsigned short v_min</div><div class='ctx'> 		if (gus-&gt;gf1.syn_voices)</div><div class='ctx'> 			gus-&gt;gf1.syn_voices[i].flags = ~VFLG_DYNAMIC;</div><div class='ctx'> #endif</div><div class='del'>-		spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 		snd_gf1_select_voice(gus, i);</div><div class='ctx'> 		snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_ADDRESS_CONTROL);	/* Voice Control Register = voice stop */</div><div class='ctx'> 		snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);	/* Volume Ramp Control Register = ramp off */</div><div class='hunk'>@@ -194,23 +161,17 @@ static void snd_gf1_clear_voices(struct snd_gus_card * gus, unsigned short v_min</div><div class='ctx'> 			snd_gf1_write16(gus, SNDRV_GF1_VW_EFFECT_VOLUME, 0);</div><div class='ctx'> 			snd_gf1_write16(gus, SNDRV_GF1_VW_EFFECT_VOLUME_FINAL, 0);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-#if 0</div><div class='del'>-		snd_gf1_lfo_shutdown(gus, i, ULTRA_LFO_VIBRATO);</div><div class='del'>-		snd_gf1_lfo_shutdown(gus, i, ULTRA_LFO_TREMOLO);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_stop_voices(struct snd_gus_card * gus, unsigned short v_min, unsigned short v_max)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	short i, ramp_ok;</div><div class='ctx'> 	unsigned short ramp_end;</div><div class='ctx'> </div><div class='ctx'> 	if (!in_interrupt()) {	/* this can't be done in interrupt */</div><div class='ctx'> 		for (i = v_min, ramp_ok = 0; i &lt;= v_max; i++) {</div><div class='del'>-			spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 			snd_gf1_select_voice(gus, i);</div><div class='ctx'> 			ramp_end = snd_gf1_read16(gus, 9) &gt;&gt; 8;</div><div class='ctx'> 			if (ramp_end &gt; SNDRV_GF1_MIN_OFFSET) {</div><div class='hunk'>@@ -224,7 +185,6 @@ void snd_gf1_stop_voices(struct snd_gus_card * gus, unsigned short v_min, unsign</div><div class='ctx'> 					snd_gf1_write8(gus, SNDRV_GF1_VB_VOLUME_CONTROL, 0x40);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep_interruptible(50);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -257,21 +217,17 @@ static void snd_gf1_alloc_voice_use(struct snd_gus_card * gus,</div><div class='ctx'> struct snd_gus_voice *snd_gf1_alloc_voice(struct snd_gus_card * gus, int type, int client, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_voice *pvoice;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;voice_alloc, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;voice_alloc);</div><div class='ctx'> 	if (type == SNDRV_GF1_VOICE_TYPE_PCM) {</div><div class='del'>-		if (gus-&gt;gf1.pcm_alloc_voices &gt;= gus-&gt;gf1.pcm_channels) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='add'>+		if (gus-&gt;gf1.pcm_alloc_voices &gt;= gus-&gt;gf1.pcm_channels)</div><div class='ctx'> 			return NULL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 0; idx &lt; 32; idx++) {</div><div class='ctx'> 		pvoice = &amp;gus-&gt;gf1.voices[idx];</div><div class='ctx'> 		if (!pvoice-&gt;use) {</div><div class='ctx'> 			snd_gf1_alloc_voice_use(gus, pvoice, type, client, port);</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='ctx'> 			return pvoice;</div><div class='ctx'> 		}</div><div class='ctx'> 	} </div><div class='hunk'>@@ -280,34 +236,29 @@ struct snd_gus_voice *snd_gf1_alloc_voice(struct snd_gus_card * gus, int type, i</div><div class='ctx'> 		if (pvoice-&gt;midi &amp;&amp; !pvoice-&gt;client) {</div><div class='ctx'> 			snd_gf1_clear_voices(gus, pvoice-&gt;number, pvoice-&gt;number);</div><div class='ctx'> 			snd_gf1_alloc_voice_use(gus, pvoice, type, client, port);</div><div class='del'>-			spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='ctx'> 			return pvoice;</div><div class='ctx'> 		}</div><div class='ctx'> 	} </div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_gf1_free_voice(struct snd_gus_card * gus, struct snd_gus_voice *voice)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	void (*private_free)(struct snd_gus_voice *voice);</div><div class='del'>-	void *private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (voice == NULL || !voice-&gt;use)</div><div class='ctx'> 		return;</div><div class='ctx'> 	snd_gf1_set_default_handlers(gus, SNDRV_GF1_HANDLER_VOICE | voice-&gt;number);</div><div class='ctx'> 	snd_gf1_clear_voices(gus, voice-&gt;number, voice-&gt;number);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;voice_alloc, flags);</div><div class='del'>-	private_free = voice-&gt;private_free;</div><div class='del'>-	private_data = voice-&gt;private_data;</div><div class='del'>-	voice-&gt;private_free = NULL;</div><div class='del'>-	voice-&gt;private_data = NULL;</div><div class='del'>-	if (voice-&gt;pcm)</div><div class='del'>-		gus-&gt;gf1.pcm_alloc_voices--;</div><div class='del'>-	voice-&gt;use = voice-&gt;pcm = 0;</div><div class='del'>-	voice-&gt;sample_ops = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;voice_alloc, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;voice_alloc) {</div><div class='add'>+		private_free = voice-&gt;private_free;</div><div class='add'>+		voice-&gt;private_free = NULL;</div><div class='add'>+		voice-&gt;private_data = NULL;</div><div class='add'>+		if (voice-&gt;pcm)</div><div class='add'>+			gus-&gt;gf1.pcm_alloc_voices--;</div><div class='add'>+		voice-&gt;use = voice-&gt;pcm = 0;</div><div class='add'>+		voice-&gt;sample_ops = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	if (private_free)</div><div class='ctx'> 		private_free(voice);</div><div class='ctx'> }</div><div class='hunk'>@@ -318,7 +269,6 @@ void snd_gf1_free_voice(struct snd_gus_card * gus, struct snd_gus_voice *voice)</div><div class='ctx'> </div><div class='ctx'> int snd_gf1_start(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 0);	/* reset GF1 */</div><div class='hunk'>@@ -350,9 +300,7 @@ int snd_gf1_start(struct snd_gus_card * gus)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		gus-&gt;gf1.sw_lfo = 1;</div><div class='ctx'> 	}</div><div class='del'>-#if 0</div><div class='del'>-	snd_gf1_lfo_init(gus);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	if (gus-&gt;gf1.memory &gt; 0)</div><div class='ctx'> 		for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 			snd_gf1_poke(gus, gus-&gt;gf1.default_voice_address + i, 0);</div><div class='hunk'>@@ -369,10 +317,10 @@ int snd_gf1_start(struct snd_gus_card * gus)</div><div class='ctx'> 	}</div><div class='ctx'> 	while ((snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ) &amp; 0xc0) != 0xc0);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	outb(gus-&gt;gf1.active_voice = 0, GUSP(gus, GF1PAGE));</div><div class='del'>-	outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		outb(gus-&gt;gf1.active_voice = 0, GUSP(gus, GF1PAGE));</div><div class='add'>+		outb(gus-&gt;mix_cntrl_reg, GUSP(gus, MIXCNTRLREG));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_timers_init(gus);</div><div class='ctx'> 	snd_gf1_look_regs(gus);</div><div class='hunk'>@@ -406,8 +354,6 @@ int snd_gf1_stop(struct snd_gus_card * gus)</div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 1);	/* disable IRQ &amp; DAC */</div><div class='ctx'> 	snd_gf1_timers_done(gus);</div><div class='ctx'> 	snd_gf1_mem_done(gus);</div><div class='del'>-#if 0</div><div class='del'>-	snd_gf1_lfo_done(gus);</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/gus/gus_tables.h b/sound/isa/gus/gus_tables.h<br/>index 42a4ca0d622b..ea0f007fa200 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_tables.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_tables.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_tables.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_tables.h</a></div><div class='hunk'>@@ -1,21 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define SNDRV_GF1_SCALE_TABLE_SIZE	128</div><div class='head'>diff --git a/sound/isa/gus/gus_timer.c b/sound/isa/gus/gus_timer.c<br/>index c53727147a1a..e3a8847e02cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_timer.c</a></div><div class='hunk'>@@ -1,24 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Routines for Gravis UltraSound soundcards - Timers</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  GUS have similar timers as AdLib (OPL2/OPL3 chips).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -31,33 +16,29 @@</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_timer1_start(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	unsigned int ticks;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	ticks = timer-&gt;sticks;</div><div class='ctx'> 	tmp = (gus-&gt;gf1.timer_enabled |= 4);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_ADLIB_TIMER_1, 256 - ticks);	/* timer 1 count */</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, tmp);	/* enable timer 1 IRQ */</div><div class='ctx'> 	snd_gf1_adlib_write(gus, 0x04, tmp &gt;&gt; 2);	/* timer 2 start */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_timer1_stop(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	tmp = (gus-&gt;gf1.timer_enabled &amp;= ~4);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, tmp);	/* disable timer #1 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -67,33 +48,29 @@ static int snd_gf1_timer1_stop(struct snd_timer * timer)</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_timer2_start(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	unsigned int ticks;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	ticks = timer-&gt;sticks;</div><div class='ctx'> 	tmp = (gus-&gt;gf1.timer_enabled |= 8);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_ADLIB_TIMER_2, 256 - ticks);	/* timer 2 count */</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, tmp);	/* enable timer 2 IRQ */</div><div class='ctx'> 	snd_gf1_adlib_write(gus, 0x04, tmp &gt;&gt; 2);	/* timer 2 start */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_timer2_stop(struct snd_timer * timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;reg_lock);</div><div class='ctx'> 	tmp = (gus-&gt;gf1.timer_enabled &amp;= ~8);</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, tmp);	/* disable timer #1 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +100,7 @@ static void snd_gf1_interrupt_timer2(struct snd_gus_card * gus)</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_gf1_timer1 =</div><div class='add'>+static const struct snd_timer_hardware snd_gf1_timer1 =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_STOP,</div><div class='ctx'> 	.resolution =	80000,</div><div class='hunk'>@@ -132,7 +109,7 @@ static struct snd_timer_hardware snd_gf1_timer1 =</div><div class='ctx'> 	.stop =		snd_gf1_timer1_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_gf1_timer2 =</div><div class='add'>+static const struct snd_timer_hardware snd_gf1_timer2 =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_STOP,</div><div class='ctx'> 	.resolution =	320000,</div><div class='hunk'>@@ -171,7 +148,7 @@ void snd_gf1_timers_init(struct snd_gus_card * gus)</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_timer_new(gus-&gt;card, "GF1 timer", &amp;tid, &amp;timer) &gt;= 0) {</div><div class='del'>-		strcpy(timer-&gt;name, "GF1 timer #1");</div><div class='add'>+		strscpy(timer-&gt;name, "GF1 timer #1");</div><div class='ctx'> 		timer-&gt;private_data = gus;</div><div class='ctx'> 		timer-&gt;private_free = snd_gf1_timer1_free;</div><div class='ctx'> 		timer-&gt;hw = snd_gf1_timer1;</div><div class='hunk'>@@ -181,7 +158,7 @@ void snd_gf1_timers_init(struct snd_gus_card * gus)</div><div class='ctx'> 	tid.device++;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_timer_new(gus-&gt;card, "GF1 timer", &amp;tid, &amp;timer) &gt;= 0) {</div><div class='del'>-		strcpy(timer-&gt;name, "GF1 timer #2");</div><div class='add'>+		strscpy(timer-&gt;name, "GF1 timer #2");</div><div class='ctx'> 		timer-&gt;private_data = gus;</div><div class='ctx'> 		timer-&gt;private_free = snd_gf1_timer2_free;</div><div class='ctx'> 		timer-&gt;hw = snd_gf1_timer2;</div><div class='head'>diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c<br/>index 21cc42e4c4be..770d8f3e4cff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_uart.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_uart.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_uart.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_uart.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for the GF1 MIDI interface - like UART 6850</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -28,7 +13,8 @@</div><div class='ctx'> static void snd_gf1_interrupt_midi_in(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='ctx'> 	int count;</div><div class='del'>-	unsigned char stat, data, byte;</div><div class='add'>+	unsigned char stat, byte;</div><div class='add'>+	__always_unused unsigned char data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	count = 10;</div><div class='hunk'>@@ -63,13 +49,12 @@ static void snd_gf1_interrupt_midi_in(struct snd_gus_card * gus)</div><div class='ctx'> static void snd_gf1_interrupt_midi_out(struct snd_gus_card * gus)</div><div class='ctx'> {</div><div class='ctx'> 	char byte;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* try unlock output */</div><div class='ctx'> 	if (snd_gf1_uart_stat(gus) &amp; 0x01)</div><div class='ctx'> 		snd_gf1_interrupt_midi_in(gus);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (snd_gf1_uart_stat(gus) &amp; 0x02) {	/* Tx FIFO free? */</div><div class='ctx'> 		if (snd_rawmidi_transmit(gus-&gt;midi_substream_output, &amp;byte, 1) != 1) {	/* no other bytes or error */</div><div class='ctx'> 			snd_gf1_uart_cmd(gus, gus-&gt;gf1.uart_cmd &amp; ~0x20); /* disable Tx interrupt */</div><div class='hunk'>@@ -77,7 +62,6 @@ static void snd_gf1_interrupt_midi_out(struct snd_gus_card * gus)</div><div class='ctx'> 			snd_gf1_uart_put(gus, byte);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_uart_reset(struct snd_gus_card * gus, int close)</div><div class='hunk'>@@ -91,31 +75,30 @@ static void snd_gf1_uart_reset(struct snd_gus_card * gus, int close)</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_uart_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (!(gus-&gt;gf1.uart_cmd &amp; 0x80)) {	/* input active? */</div><div class='ctx'> 		snd_gf1_uart_reset(gus, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	gus-&gt;gf1.interrupt_handler_midi_out = snd_gf1_interrupt_midi_out;</div><div class='ctx'> 	gus-&gt;midi_substream_output = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printk(KERN_DEBUG "write init - cmd = 0x%x, stat = 0x%x\n", gus-&gt;gf1.uart_cmd, snd_gf1_uart_stat(gus));</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"write init - cmd = 0x%x, stat = 0x%x\n",</div><div class='add'>+		gus-&gt;gf1.uart_cmd, snd_gf1_uart_stat(gus));</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_uart_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	gus = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (gus-&gt;gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out) {</div><div class='ctx'> 		snd_gf1_uart_reset(gus, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -125,60 +108,53 @@ static int snd_gf1_uart_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		for (i = 0; i &lt; 1000 &amp;&amp; (snd_gf1_uart_stat(gus) &amp; 0x01); i++)</div><div class='ctx'> 			snd_gf1_uart_get(gus);	/* clean Rx */</div><div class='ctx'> 		if (i &gt;= 1000)</div><div class='del'>-			snd_printk(KERN_ERR "gus midi uart init read - cleanup error\n");</div><div class='add'>+			dev_err(gus-&gt;card-&gt;dev, "gus midi uart init read - cleanup error\n");</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='del'>-		   "read init - enable = %i, cmd = 0x%x, stat = 0x%x\n",</div><div class='del'>-		   gus-&gt;uart_enable, gus-&gt;gf1.uart_cmd, snd_gf1_uart_stat(gus));</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='del'>-		   "[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x "</div><div class='del'>-		   "(page = 0x%x)\n",</div><div class='del'>-		   gus-&gt;gf1.port + 0x100, inb(gus-&gt;gf1.port + 0x100),</div><div class='del'>-		   inb(gus-&gt;gf1.port + 0x101), inb(gus-&gt;gf1.port + 0x102));</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"read init - enable = %i, cmd = 0x%x, stat = 0x%x\n",</div><div class='add'>+		gus-&gt;uart_enable, gus-&gt;gf1.uart_cmd, snd_gf1_uart_stat(gus));</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x (page = 0x%x)\n",</div><div class='add'>+		gus-&gt;gf1.port + 0x100, inb(gus-&gt;gf1.port + 0x100),</div><div class='add'>+		inb(gus-&gt;gf1.port + 0x101), inb(gus-&gt;gf1.port + 0x102));</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_uart_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (gus-&gt;gf1.interrupt_handler_midi_in != snd_gf1_interrupt_midi_in)</div><div class='ctx'> 		snd_gf1_uart_reset(gus, 1);</div><div class='ctx'> 	snd_gf1_set_default_handlers(gus, SNDRV_GF1_HANDLER_MIDI_OUT);</div><div class='ctx'> 	gus-&gt;midi_substream_output = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_gf1_uart_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> </div><div class='ctx'> 	gus = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (gus-&gt;gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out)</div><div class='ctx'> 		snd_gf1_uart_reset(gus, 1);</div><div class='ctx'> 	snd_gf1_set_default_handlers(gus, SNDRV_GF1_HANDLER_MIDI_IN);</div><div class='ctx'> 	gus-&gt;midi_substream_input = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_uart_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	gus = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;gus-&gt;uart_cmd_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((gus-&gt;gf1.uart_cmd &amp; 0x80) == 0)</div><div class='ctx'> 			snd_gf1_uart_cmd(gus, gus-&gt;gf1.uart_cmd | 0x80); /* enable Rx interrupts */</div><div class='hunk'>@@ -186,7 +162,6 @@ static void snd_gf1_uart_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 		if (gus-&gt;gf1.uart_cmd &amp; 0x80)</div><div class='ctx'> 			snd_gf1_uart_cmd(gus, gus-&gt;gf1.uart_cmd &amp; ~0x80); /* disable Rx interrupts */</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_gf1_uart_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='hunk'>@@ -227,36 +202,33 @@ static void snd_gf1_uart_output_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;gus-&gt;uart_cmd_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_gf1_uart_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_gf1_uart_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_gf1_uart_output_open,</div><div class='ctx'> 	.close =	snd_gf1_uart_output_close,</div><div class='ctx'> 	.trigger =	snd_gf1_uart_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_gf1_uart_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_gf1_uart_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_gf1_uart_input_open,</div><div class='ctx'> 	.close =	snd_gf1_uart_input_close,</div><div class='ctx'> 	.trigger =	snd_gf1_uart_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmidi ** rrawmidi)</div><div class='add'>+int snd_gf1_rawmidi_new(struct snd_gus_card *gus, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(gus-&gt;card, "GF1", device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(gus-&gt;card, "GF1", device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(rmidi-&gt;name, gus-&gt;interwave ? "AMD InterWave" : "GF1");</div><div class='add'>+	strscpy(rmidi-&gt;name, gus-&gt;interwave ? "AMD InterWave" : "GF1");</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_gf1_uart_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_gf1_uart_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	rmidi-&gt;private_data = gus;</div><div class='ctx'> 	gus-&gt;midi_uart = rmidi;</div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = rmidi;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c<br/>index c3c028a4a46b..e729621756cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_volume.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gus_volume.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gus_volume.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gus_volume.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='ctx'> #define __GUS_TABLES_ALLOC__</div><div class='hunk'>@@ -76,7 +62,7 @@ unsigned int snd_gf1_calc_ramp_rate(struct snd_gus_card * gus,</div><div class='ctx'> 				    unsigned short end,</div><div class='ctx'> 				    unsigned int us)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char vol_rates[19] =</div><div class='add'>+	static const unsigned char vol_rates[19] =</div><div class='ctx'> 	{</div><div class='ctx'> 		23, 24, 26, 28, 29, 31, 32, 34,</div><div class='ctx'> 		36, 37, 39, 40, 42, 44, 45, 47,</div><div class='hunk'>@@ -118,7 +104,8 @@ unsigned short snd_gf1_translate_freq(struct snd_gus_card * gus, unsigned int fr</div><div class='ctx'> 		freq16 = 50;</div><div class='ctx'> 	if (freq16 &amp; 0xf8000000) {</div><div class='ctx'> 		freq16 = ~0xf8000000;</div><div class='del'>-		snd_printk(KERN_ERR "snd_gf1_translate_freq: overflow - freq = 0x%x\n", freq16);</div><div class='add'>+		dev_err(gus-&gt;card-&gt;dev, "%s: overflow - freq = 0x%x\n",</div><div class='add'>+			__func__, freq16);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ((freq16 &lt;&lt; 9) + (gus-&gt;gf1.playback_freq &gt;&gt; 1)) / gus-&gt;gf1.playback_freq;</div><div class='ctx'> }</div><div class='hunk'>@@ -127,7 +114,7 @@ unsigned short snd_gf1_translate_freq(struct snd_gus_card * gus, unsigned int fr</div><div class='ctx'> </div><div class='ctx'> short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)</div><div class='ctx'> {</div><div class='del'>-	static short vibrato_table[] =</div><div class='add'>+	static const short vibrato_table[] =</div><div class='ctx'> 	{</div><div class='ctx'> 		0, 0, 32, 592, 61, 1175, 93, 1808,</div><div class='ctx'> 		124, 2433, 152, 3007, 182, 3632, 213, 4290,</div><div class='hunk'>@@ -135,7 +122,8 @@ short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	long depth;</div><div class='del'>-	short *vi1, *vi2, pcents, v1;</div><div class='add'>+	const short *vi1, *vi2;</div><div class='add'>+	short pcents, v1;</div><div class='ctx'> </div><div class='ctx'> 	pcents = cents &lt; 0 ? -cents : cents;</div><div class='ctx'> 	for (vi1 = vibrato_table, vi2 = vi1 + 2; pcents &gt; *vi2; vi1 = vi2, vi2 += 2);</div><div class='hunk'>@@ -159,7 +147,7 @@ short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)</div><div class='ctx'> </div><div class='ctx'> unsigned short snd_gf1_compute_pitchbend(unsigned short pitchbend, unsigned short sens)</div><div class='ctx'> {</div><div class='del'>-	static long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};</div><div class='add'>+	static const long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};</div><div class='ctx'> 	int wheel, sensitivity;</div><div class='ctx'> 	unsigned int mantissa, f1, f2;</div><div class='ctx'> 	unsigned short semitones, f1_index, f2_index, f1_power, f2_power;</div><div class='hunk'>@@ -202,14 +190,14 @@ unsigned short snd_gf1_compute_freq(unsigned int freq,</div><div class='ctx'> 	fc = (freq &lt;&lt; 10) / rate;</div><div class='ctx'> 	if (fc &gt; 97391L) {</div><div class='ctx'> 		fc = 97391;</div><div class='del'>-		snd_printk(KERN_ERR "patch: (1) fc frequency overflow - %u\n", fc);</div><div class='add'>+		pr_err("patch: (1) fc frequency overflow - %u\n", fc);</div><div class='ctx'> 	}</div><div class='ctx'> 	fc = (fc * 44100UL) / mix_rate;</div><div class='ctx'> 	while (scale--)</div><div class='ctx'> 		fc &lt;&lt;= 1;</div><div class='ctx'> 	if (fc &gt; 65535L) {</div><div class='ctx'> 		fc = 65535;</div><div class='del'>-		snd_printk(KERN_ERR "patch: (2) fc frequency overflow - %u\n", fc);</div><div class='add'>+		pr_err("patch: (2) fc frequency overflow - %u\n", fc);</div><div class='ctx'> 	}</div><div class='ctx'> 	return (unsigned short) fc;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c<br/>index 086b8f0e0f94..101202acefb3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusclassic.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusclassic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusclassic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gusclassic.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Gravis UltraSound Classic soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='hunk'>@@ -38,11 +23,10 @@</div><div class='ctx'> MODULE_DESCRIPTION(CRD_NAME);</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Classic}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x230,0x240,0x250,0x260 */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 3,5,9,11,12,15 */</div><div class='ctx'> static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	/* 1,3,5,6,7 */</div><div class='hunk'>@@ -58,13 +42,13 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");</div><div class='ctx'> module_param_array(joystick_dac, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for " CRD_NAME " driver.");</div><div class='hunk'>@@ -73,17 +57,18 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");</div><div class='ctx'> module_param_array(pcm_channels, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusclassic_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_gusclassic_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[n];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusclassic_create(struct snd_card *card,</div><div class='del'>-		struct device *dev, unsigned int n, struct snd_gus_card **rgus)</div><div class='add'>+static int snd_gusclassic_create(struct snd_card *card,</div><div class='add'>+				 struct device *dev, unsigned int n,</div><div class='add'>+				 struct snd_gus_card **rgus)</div><div class='ctx'> {</div><div class='del'>-	static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};</div><div class='del'>-	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};</div><div class='del'>-	static int possible_dmas[] = {5, 6, 7, 1, 3, -1};</div><div class='add'>+	static const long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};</div><div class='add'>+	static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};</div><div class='add'>+	static const int possible_dmas[] = {5, 6, 7, 1, 3, -1};</div><div class='ctx'> </div><div class='ctx'> 	int i, error;</div><div class='ctx'> </div><div class='hunk'>@@ -123,32 +108,34 @@ static int __devinit snd_gusclassic_create(struct snd_card *card,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus)</div><div class='add'>+static int snd_gusclassic_detect(struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char d;</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 0);	/* reset GF1 */</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 0) {</div><div class='del'>-		snd_printdd("[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 0) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	udelay(160);</div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 1);	/* release reset */</div><div class='ctx'> 	udelay(160);</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 1) {</div><div class='del'>-		snd_printdd("[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 1) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_gusclassic_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -157,37 +144,37 @@ static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusclassic_create(card, dev, n, &amp;gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusclassic_detect(gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	gus-&gt;joystick_dac = joystick_dac[n];</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gus_initialize(gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = -ENODEV;</div><div class='ctx'> 	if (gus-&gt;max_flag || gus-&gt;ess_flag) {</div><div class='ctx'> 		dev_err(dev, "GUS Classic or ACE soundcard was "</div><div class='ctx'> 			"not detected at 0x%lx\n", gus-&gt;gf1.port);</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gf1_new_mixer(gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='del'>-	error = snd_gf1_pcm_new(gus, 0, 0, NULL);</div><div class='add'>+	error = snd_gf1_pcm_new(gus, 0, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (!gus-&gt;ace_flag) {</div><div class='del'>-		error = snd_gf1_rawmidi_new(gus, 0, NULL);</div><div class='add'>+		error = snd_gf1_rawmidi_new(gus, 0);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname + strlen(card-&gt;longname),</div><div class='hunk'>@@ -198,48 +185,23 @@ static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 		sprintf(card-&gt;longname + strlen(card-&gt;longname),</div><div class='ctx'> 			"&amp;%d", gus-&gt;gf1.dma2);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='del'>-</div><div class='ctx'> 	error = snd_card_register(card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_gusclassic_driver = {</div><div class='ctx'> 	.match		= snd_gusclassic_match,</div><div class='ctx'> 	.probe		= snd_gusclassic_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_gusclassic_remove),</div><div class='ctx'> #if 0	/* FIXME */</div><div class='ctx'> 	.suspend	= snd_gusclassic_suspend,</div><div class='del'>-	.remove		= snd_gusclassic_remove,</div><div class='ctx'> #endif</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_gusclassic_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_gusclassic_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_gusclassic_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_gusclassic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_gusclassic_init);</div><div class='del'>-module_exit(alsa_card_gusclassic_exit);</div><div class='add'>+module_isa_driver(snd_gusclassic_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c<br/>index 008e8e5bfa37..ed921b89b00a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusextreme.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusextreme.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusextreme.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gusextreme.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Gravis UltraSound Extreme soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='hunk'>@@ -42,11 +27,10 @@</div><div class='ctx'> MODULE_DESCRIPTION(CRD_NAME);</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Extreme}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260 */</div><div class='ctx'> static long gf1_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /* 0x210,0x220,0x230,0x240,0x250,0x260,0x270 */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /* 0x300,0x310,0x320 */</div><div class='hunk'>@@ -66,21 +50,21 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(gf1_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(gf1_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(gf1_port, "GF1 port # for " CRD_NAME " driver (optional).");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(gf1_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(gf1_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(gf1_irq, "GF1 IRQ # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "GF1 DMA # for " CRD_NAME " driver.");</div><div class='ctx'> module_param_array(joystick_dac, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for " CRD_NAME " driver.");</div><div class='hunk'>@@ -89,17 +73,18 @@ MODULE_PARM_DESC(channels, "GF1 channels for " CRD_NAME " driver.");</div><div class='ctx'> module_param_array(pcm_channels, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_gusextreme_match(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[n];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,</div><div class='del'>-		struct snd_es1688 *chip, struct device *dev, unsigned int n)</div><div class='add'>+static int snd_gusextreme_es1688_create(struct snd_card *card,</div><div class='add'>+					struct snd_es1688 *chip,</div><div class='add'>+					struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	static long possible_ports[] = {0x220, 0x240, 0x260};</div><div class='del'>-	static int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='del'>-	static int possible_dmas[] = {1, 3, 0, -1};</div><div class='add'>+	static const long possible_ports[] = {0x220, 0x240, 0x260};</div><div class='add'>+	static const int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='add'>+	static const int possible_dmas[] = {1, 3, 0, -1};</div><div class='ctx'> </div><div class='ctx'> 	int i, error;</div><div class='ctx'> </div><div class='hunk'>@@ -132,11 +117,12 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,</div><div class='del'>-		struct device *dev, unsigned int n, struct snd_gus_card **rgus)</div><div class='add'>+static int snd_gusextreme_gus_card_create(struct snd_card *card,</div><div class='add'>+					  struct device *dev, unsigned int n,</div><div class='add'>+					  struct snd_gus_card **rgus)</div><div class='ctx'> {</div><div class='del'>-	static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};</div><div class='del'>-	static int possible_dmas[] = {5, 6, 7, 3, 1, -1};</div><div class='add'>+	static const int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};</div><div class='add'>+	static const int possible_dmas[] = {5, 6, 7, 3, 1, -1};</div><div class='ctx'> </div><div class='ctx'> 	if (gf1_irq[n] == SNDRV_AUTO_IRQ) {</div><div class='ctx'> 		gf1_irq[n] = snd_legacy_find_free_irq(possible_irqs);</div><div class='hunk'>@@ -156,10 +142,9 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,</div><div class='ctx'> 			0, channels[n], pcm_channels[n], 0, rgus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,</div><div class='del'>-	struct snd_es1688 *es1688)</div><div class='add'>+static int snd_gusextreme_detect(struct snd_gus_card *gus,</div><div class='add'>+				 struct snd_es1688 *es1688)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char d;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -176,37 +161,39 @@ static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,</div><div class='ctx'> 	 * 0x260 = 2,2,1</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;es1688-&gt;mixer_lock, flags);</div><div class='del'>-	snd_es1688_mixer_write(es1688, 0x40, 0x0b);	/* don't change!!! */</div><div class='del'>-	spin_unlock_irqrestore(&amp;es1688-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;es1688-&gt;mixer_lock) {</div><div class='add'>+		snd_es1688_mixer_write(es1688, 0x40, 0x0b); /* don't change!!! */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;es1688-&gt;reg_lock, flags);</div><div class='del'>-	outb(gus-&gt;gf1.port &amp; 0x040 ? 2 : 0, ES1688P(es1688, INIT1));</div><div class='del'>-	outb(0, 0x201);</div><div class='del'>-	outb(gus-&gt;gf1.port &amp; 0x020 ? 2 : 0, ES1688P(es1688, INIT1));</div><div class='del'>-	outb(0, 0x201);</div><div class='del'>-	outb(gus-&gt;gf1.port &amp; 0x010 ? 3 : 1, ES1688P(es1688, INIT1));</div><div class='del'>-	spin_unlock_irqrestore(&amp;es1688-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;es1688-&gt;reg_lock) {</div><div class='add'>+		outb(gus-&gt;gf1.port &amp; 0x040 ? 2 : 0, ES1688P(es1688, INIT1));</div><div class='add'>+		outb(0, 0x201);</div><div class='add'>+		outb(gus-&gt;gf1.port &amp; 0x020 ? 2 : 0, ES1688P(es1688, INIT1));</div><div class='add'>+		outb(0, 0x201);</div><div class='add'>+		outb(gus-&gt;gf1.port &amp; 0x010 ? 3 : 1, ES1688P(es1688, INIT1));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	udelay(100);</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 0);	/* reset GF1 */</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 0) {</div><div class='del'>-		snd_printdd("[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 0) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	udelay(160);</div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 1);	/* release reset */</div><div class='ctx'> 	udelay(160);</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 1) {</div><div class='del'>-		snd_printdd("[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 1) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_mixer(struct snd_card *card)</div><div class='add'>+static int snd_gusextreme_mixer(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_id id1, id2;</div><div class='ctx'> 	int error;</div><div class='hunk'>@@ -216,15 +203,15 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)</div><div class='ctx'> 	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> </div><div class='ctx'> 	/* reassign AUX to SYNTHESIZER */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Volume");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Volume");</div><div class='ctx'> 	error = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='ctx'> 	/* reassign Master Playback Switch to Synth Playback Switch */</div><div class='del'>-	strcpy(id1.name, "Master Playback Switch");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Switch");</div><div class='add'>+	strscpy(id1.name, "Master Playback Switch");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Switch");</div><div class='ctx'> 	error = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='hunk'>@@ -232,7 +219,7 @@ static int __devinit snd_gusextreme_mixer(struct snd_card *card)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)</div><div class='add'>+static int snd_gusextreme_probe(struct device *dev, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_gus_card *gus;</div><div class='hunk'>@@ -240,8 +227,8 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index[n], id[n], THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_es1688), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_es1688), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -255,56 +242,56 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusextreme_es1688_create(card, es1688, dev, n);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (gf1_port[n] &lt; 0)</div><div class='ctx'> 		gf1_port[n] = es1688-&gt;port + 0x20;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusextreme_gus_card_create(card, dev, n, &amp;gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusextreme_detect(gus, es1688);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	gus-&gt;joystick_dac = joystick_dac[n];</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gus_initialize(gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = -ENODEV;</div><div class='ctx'> 	if (!gus-&gt;ess_flag) {</div><div class='ctx'> 		dev_err(dev, "GUS Extreme soundcard was not "</div><div class='ctx'> 			"detected at 0x%lx\n", gus-&gt;gf1.port);</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> 	}</div><div class='ctx'> 	gus-&gt;codec_flag = 1;</div><div class='ctx'> </div><div class='del'>-	error = snd_es1688_pcm(card, es1688, 0, NULL);</div><div class='add'>+	error = snd_es1688_pcm(card, es1688, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_es1688_mixer(card, es1688);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	snd_component_add(card, "ES1688");</div><div class='ctx'> </div><div class='ctx'> 	if (pcm_channels[n] &gt; 0) {</div><div class='del'>-		error = snd_gf1_pcm_new(gus, 1, 1, NULL);</div><div class='add'>+		error = snd_gf1_pcm_new(gus, 1, 1);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gf1_new_mixer(gus);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_gusextreme_mixer(card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_opl3_create(card, es1688-&gt;port, es1688-&gt;port + 2,</div><div class='ctx'> 			OPL3_HW_OPL3, 0, &amp;opl3) &lt; 0)</div><div class='hunk'>@@ -312,45 +299,31 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)</div><div class='ctx'> 	else {</div><div class='ctx'> 		error = snd_opl3_hwdep_new(opl3, 0, 2, NULL);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (es1688-&gt;mpu_port &gt;= 0x300) {</div><div class='ctx'> 		error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,</div><div class='del'>-				es1688-&gt;mpu_port, 0,</div><div class='del'>-				mpu_irq[n], IRQF_DISABLED, NULL);</div><div class='add'>+				es1688-&gt;mpu_port, 0, mpu_irq[n], NULL);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='del'>-			goto out;</div><div class='add'>+			return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname, "Gravis UltraSound Extreme at 0x%lx, "</div><div class='ctx'> 		"irq %i&amp;%i, dma %i&amp;%i", es1688-&gt;port,</div><div class='ctx'> 		gus-&gt;gf1.irq, es1688-&gt;irq, gus-&gt;gf1.dma1, es1688-&gt;dma8);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, dev);</div><div class='del'>-</div><div class='ctx'> 	error = snd_card_register(card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return error;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-out:	snd_card_free(card);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(dev));</div><div class='del'>-	dev_set_drvdata(dev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_gusextreme_driver = {</div><div class='ctx'> 	.match		= snd_gusextreme_match,</div><div class='ctx'> 	.probe		= snd_gusextreme_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_gusextreme_remove),</div><div class='ctx'> #if 0	/* FIXME */</div><div class='ctx'> 	.suspend	= snd_gusextreme_suspend,</div><div class='ctx'> 	.resume		= snd_gusextreme_resume,</div><div class='hunk'>@@ -360,15 +333,4 @@ static struct isa_driver snd_gusextreme_driver = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_gusextreme_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_gusextreme_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_gusextreme_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_gusextreme_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_gusextreme_init);</div><div class='del'>-module_exit(alsa_card_gusextreme_exit);</div><div class='add'>+module_isa_driver(snd_gusextreme_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c<br/>index 3e4a58b72913..b572411c4422 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusmax.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/gusmax.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/gusmax.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/gusmax.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Gravis UltraSound MAX soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,7 +9,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='hunk'>@@ -36,11 +21,10 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Gravis UltraSound MAX");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound MAX}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x230,0x240,0x250,0x260 */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 2,3,5,9,11,12,15 */</div><div class='ctx'> static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	/* 1,3,5,6,7 */</div><div class='hunk'>@@ -56,13 +40,13 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for GUS MAX soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable GUS MAX soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for GUS MAX driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for GUS MAX driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for GUS MAX driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for GUS MAX driver.");</div><div class='ctx'> module_param_array(joystick_dac, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for GUS MAX driver.");</div><div class='hunk'>@@ -80,22 +64,22 @@ struct snd_gusmax {</div><div class='ctx'> 	unsigned short pcm_status_reg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define PFX	"gusmax: "</div><div class='del'>-</div><div class='del'>-static int __devinit snd_gusmax_detect(struct snd_gus_card * gus)</div><div class='add'>+static int snd_gusmax_detect(struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char d;</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 0);	/* reset GF1 */</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 0) {</div><div class='del'>-		snd_printdd("[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 0) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	udelay(160);</div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 1);	/* release reset */</div><div class='ctx'> 	udelay(160);</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 1) {</div><div class='del'>-		snd_printdd("[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 1) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -124,8 +108,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_gusmax_init(int dev, struct snd_card *card,</div><div class='del'>-				      struct snd_gus_card * gus)</div><div class='add'>+static void snd_gusmax_init(int dev, struct snd_card *card,</div><div class='add'>+			    struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='ctx'> 	gus-&gt;equal_irq = 1;</div><div class='ctx'> 	gus-&gt;codec_flag = 1;</div><div class='hunk'>@@ -140,7 +124,7 @@ static void __devinit snd_gusmax_init(int dev, struct snd_card *card,</div><div class='ctx'> 	outb(gus-&gt;max_cntrl_val, GUSP(gus, MAXCNTRLPORT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusmax_mixer(struct snd_wss *chip)</div><div class='add'>+static int snd_gusmax_mixer(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_ctl_elem_id id1, id2;</div><div class='hunk'>@@ -150,22 +134,26 @@ static int __devinit snd_gusmax_mixer(struct snd_wss *chip)</div><div class='ctx'> 	memset(&amp;id2, 0, sizeof(id2));</div><div class='ctx'> 	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	/* reassign AUXA to SYNTHESIZER */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Switch");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Volume");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* reassign AUXB to CD */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='del'>-	strcpy(id2.name, "CD Playback Switch");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "CD Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "CD Playback Volume");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "CD Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* reassign Mono Input to MIC */</div><div class='hunk'>@@ -189,62 +177,51 @@ static int __devinit snd_gusmax_mixer(struct snd_wss *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_gusmax_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_gusmax *maxcard = card-&gt;private_data;</div><div class='del'>-	</div><div class='del'>-	if (maxcard == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (maxcard-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(maxcard-&gt;irq, (void *)maxcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_gusmax_match(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_gusmax_match(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[dev];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_gusmax_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='del'>-	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};</div><div class='del'>-	static int possible_dmas[] = {5, 6, 7, 1, 3, -1};</div><div class='add'>+	static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};</div><div class='add'>+	static const int possible_dmas[] = {5, 6, 7, 1, 3, -1};</div><div class='ctx'> 	int xirq, xdma1, xdma2, err;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_gus_card *gus = NULL;</div><div class='ctx'> 	struct snd_wss *wss;</div><div class='ctx'> 	struct snd_gusmax *maxcard;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_gusmax), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_gusmax), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	card-&gt;private_free = snd_gusmax_free;</div><div class='ctx'> 	maxcard = card-&gt;private_data;</div><div class='ctx'> 	maxcard-&gt;card = card;</div><div class='ctx'> 	maxcard-&gt;irq = -1;</div><div class='ctx'> 	</div><div class='ctx'> 	xirq = irq[dev];</div><div class='ctx'> 	if (xirq == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((xirq = snd_legacy_find_free_irq(possible_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto _err;</div><div class='add'>+		xirq = snd_legacy_find_free_irq(possible_irqs);</div><div class='add'>+		if (xirq &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free IRQ\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	xdma1 = dma1[dev];</div><div class='ctx'> 	if (xdma1 == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((xdma1 = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto _err;</div><div class='add'>+		xdma1 = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (xdma1 &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA1\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	xdma2 = dma2[dev];</div><div class='ctx'> 	if (xdma2 == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((xdma2 = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto _err;</div><div class='add'>+		xdma2 = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (xdma2 &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA2\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -256,7 +233,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 				     pcm_channels[dev],</div><div class='ctx'> 				     0, &amp;gus);</div><div class='ctx'> 	} else {</div><div class='del'>-		static unsigned long possible_ports[] = {</div><div class='add'>+		static const unsigned long possible_ports[] = {</div><div class='ctx'> 			0x220, 0x230, 0x240, 0x250, 0x260</div><div class='ctx'> 		};</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -274,30 +251,32 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_gusmax_detect(gus)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_gusmax_detect(gus);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	maxcard-&gt;gus_status_reg = gus-&gt;gf1.reg_irqstat;</div><div class='ctx'> 	maxcard-&gt;pcm_status_reg = gus-&gt;gf1.port + 0x10c + 2;</div><div class='ctx'> 	snd_gusmax_init(dev, card, gus);</div><div class='del'>-	if ((err = snd_gus_initialize(gus)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_gus_initialize(gus);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (!gus-&gt;max_flag) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "GUS MAX soundcard was not detected at 0x%lx\n", gus-&gt;gf1.port);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto _err;</div><div class='add'>+		dev_err(pdev, "GUS MAX soundcard was not detected at 0x%lx\n", gus-&gt;gf1.port);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto _err;</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, xirq, snd_gusmax_interrupt, 0,</div><div class='add'>+			     "GUS MAX", (void *)maxcard)) {</div><div class='add'>+		dev_err(pdev, "unable to grab IRQ %d\n", xirq);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	maxcard-&gt;irq = xirq;</div><div class='del'>-	</div><div class='add'>+	card-&gt;sync_irq = maxcard-&gt;irq;</div><div class='add'>+</div><div class='ctx'> 	err = snd_wss_create(card,</div><div class='ctx'> 			     gus-&gt;gf1.port + 0x10c, -1, xirq,</div><div class='ctx'> 			     xdma2 &lt; 0 ? xdma1 : xdma2, xdma1,</div><div class='hunk'>@@ -307,58 +286,46 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 			     WSS_HWSHARE_DMA2,</div><div class='ctx'> 			     &amp;wss);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_pcm(wss, 0, NULL);</div><div class='add'>+	err = snd_wss_pcm(wss, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_wss_mixer(wss);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_timer(wss, 2, NULL);</div><div class='add'>+	err = snd_wss_timer(wss, 2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (pcm_channels[dev] &gt; 0) {</div><div class='del'>-		if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) &lt; 0)</div><div class='del'>-			goto _err;</div><div class='add'>+		err = snd_gf1_pcm_new(gus, 1, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_gusmax_mixer(wss);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_gf1_rawmidi_new(gus, 0, NULL);</div><div class='add'>+	err = snd_gf1_rawmidi_new(gus, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname + strlen(card-&gt;longname), " at 0x%lx, irq %i, dma %i", gus-&gt;gf1.port, xirq, xdma1);</div><div class='ctx'> 	if (xdma2 &gt;= 0)</div><div class='ctx'> 		sprintf(card-&gt;longname + strlen(card-&gt;longname), "&amp;%i", xdma2);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+		return err;</div><div class='ctx'> 		</div><div class='ctx'> 	maxcard-&gt;gus = gus;</div><div class='ctx'> 	maxcard-&gt;wss = wss;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- _err:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEV_NAME "gusmax"</div><div class='hunk'>@@ -366,22 +333,10 @@ static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)</div><div class='ctx'> static struct isa_driver snd_gusmax_driver = {</div><div class='ctx'> 	.match		= snd_gusmax_match,</div><div class='ctx'> 	.probe		= snd_gusmax_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_gusmax_remove),</div><div class='ctx'> 	/* FIXME: suspend/resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_gusmax_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_gusmax_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_gusmax_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_gusmax_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_gusmax_init)</div><div class='del'>-module_exit(alsa_card_gusmax_exit)</div><div class='add'>+module_isa_driver(snd_gusmax_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c<br/>index c7b80e4730fc..18adcd35e117 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/interwave.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/gus/interwave.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/gus/interwave.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/gus/interwave.c</a></div><div class='hunk'>@@ -1,25 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for AMD InterWave soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  *   1999/07/22		Erik Inge Bolso &lt;knan@mo.himolde.no&gt;</div><div class='ctx'>  *			* mixer group handlers</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -27,7 +12,7 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/gus.h&gt;</div><div class='hunk'>@@ -43,21 +28,15 @@ MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> #ifndef SNDRV_STB</div><div class='ctx'> MODULE_DESCRIPTION("AMD InterWave");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Plug &amp; Play},"</div><div class='del'>-		"{STB,SoundRage32},"</div><div class='del'>-		"{MED,MED3210},"</div><div class='del'>-		"{Dynasonix,Dynasonix Pro},"</div><div class='del'>-		"{Panasonic,PCA761AW}}");</div><div class='ctx'> #else</div><div class='ctx'> MODULE_DESCRIPTION("AMD InterWave STB with TEA6330T");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{AMD,InterWave STB with TEA6330T}}");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x210,0x220,0x230,0x240,0x250,0x260 */</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='hunk'>@@ -73,11 +52,9 @@ static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};</div><div class='ctx'> static int effect[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_STB</div><div class='del'>-#define PFX "interwave-stb: "</div><div class='ctx'> #define INTERWAVE_DRIVER	"snd_interwave_stb"</div><div class='ctx'> #define INTERWAVE_PNP_DRIVER	"interwave-stb"</div><div class='ctx'> #else</div><div class='del'>-#define PFX "interwave: "</div><div class='ctx'> #define INTERWAVE_DRIVER	"snd_interwave"</div><div class='ctx'> #define INTERWAVE_PNP_DRIVER	"interwave"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -92,17 +69,17 @@ MODULE_PARM_DESC(enable, "Enable InterWave soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for InterWave driver.");</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='del'>-module_param_array(port_tc, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port_tc, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port_tc, "Tone control (TEA6330T - i2c bus) port # for InterWave driver.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for InterWave driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for InterWave driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for InterWave driver.");</div><div class='ctx'> module_param_array(joystick_dac, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for InterWave driver.");</div><div class='hunk'>@@ -136,7 +113,7 @@ struct snd_interwave {</div><div class='ctx'> static int isa_registered;</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_interwave_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_interwave_pnpids[] = {</div><div class='ctx'> #ifndef SNDRV_STB</div><div class='ctx'> 	/* Gravis UltraSound Plug &amp; Play */</div><div class='ctx'> 	{ .id = "GRV0001", .devs = { { .id = "GRV0000" } } },</div><div class='hunk'>@@ -169,7 +146,7 @@ static void snd_interwave_i2c_setlines(struct snd_i2c_bus *bus, int ctrl, int da</div><div class='ctx'> 	unsigned long port = bus-&gt;private_value;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "i2c_setlines - 0x%lx &lt;- %i,%i\n", port, ctrl, data);</div><div class='add'>+	dev_dbg(bus-&gt;card-&gt;dev, "i2c_setlines - 0x%lx &lt;- %i,%i\n", port, ctrl, data);</div><div class='ctx'> #endif</div><div class='ctx'> 	outb((data &lt;&lt; 1) | ctrl, port);</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -182,7 +159,7 @@ static int snd_interwave_i2c_getclockline(struct snd_i2c_bus *bus)</div><div class='ctx'> </div><div class='ctx'> 	res = inb(port) &amp; 1;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "i2c_getclockline - 0x%lx -&gt; %i\n", port, res);</div><div class='add'>+	dev_dbg(bus-&gt;card-&gt;dev, "i2c_getclockline - 0x%lx -&gt; %i\n", port, res);</div><div class='ctx'> #endif</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -196,7 +173,7 @@ static int snd_interwave_i2c_getdataline(struct snd_i2c_bus *bus, int ack)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	res = (inb(port) &amp; 2) &gt;&gt; 1;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "i2c_getdataline - 0x%lx -&gt; %i\n", port, res);</div><div class='add'>+	dev_dbg(bus-&gt;card-&gt;dev, "i2c_getdataline - 0x%lx -&gt; %i\n", port, res);</div><div class='ctx'> #endif</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -207,9 +184,9 @@ static struct snd_i2c_bit_ops snd_interwave_i2c_bit_ops = {</div><div class='ctx'> 	.getdata  = snd_interwave_i2c_getdataline,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard,</div><div class='del'>-					      struct snd_gus_card * gus, int dev,</div><div class='del'>-					      struct snd_i2c_bus **rbus)</div><div class='add'>+static int snd_interwave_detect_stb(struct snd_interwave *iwcard,</div><div class='add'>+				    struct snd_gus_card *gus, int dev,</div><div class='add'>+				    struct snd_i2c_bus **rbus)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long port;</div><div class='ctx'> 	struct snd_i2c_bus *bus;</div><div class='hunk'>@@ -225,66 +202,75 @@ static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard,</div><div class='ctx'> 			port = 0x360;</div><div class='ctx'> 		}</div><div class='ctx'> 		while (port &lt;= 0x380) {</div><div class='del'>-			if ((iwcard-&gt;i2c_res = request_region(port, 1, "InterWave (I2C bus)")) != NULL)</div><div class='add'>+			iwcard-&gt;i2c_res = devm_request_region(card-&gt;dev, port, 1,</div><div class='add'>+							      "InterWave (I2C bus)");</div><div class='add'>+			if (iwcard-&gt;i2c_res)</div><div class='ctx'> 				break;</div><div class='ctx'> 			port += 0x10;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		iwcard-&gt;i2c_res = request_region(port, 1, "InterWave (I2C bus)");</div><div class='add'>+		iwcard-&gt;i2c_res = devm_request_region(card-&gt;dev, port, 1,</div><div class='add'>+						      "InterWave (I2C bus)");</div><div class='ctx'> 	}</div><div class='ctx'> 	if (iwcard-&gt;i2c_res == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "interwave: can't grab i2c bus port\n");</div><div class='add'>+		dev_err(card-&gt;dev, "interwave: can't grab i2c bus port\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "InterWave-%i", card-&gt;number);</div><div class='del'>-	if ((err = snd_i2c_bus_create(card, name, NULL, &amp;bus)) &lt; 0)</div><div class='add'>+	err = snd_i2c_bus_create(card, name, NULL, &amp;bus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	bus-&gt;private_value = port;</div><div class='ctx'> 	bus-&gt;hw_ops.bit = &amp;snd_interwave_i2c_bit_ops;</div><div class='del'>-	if ((err = snd_tea6330t_detect(bus, 0)) &lt; 0)</div><div class='add'>+	err = snd_tea6330t_detect(bus, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	*rbus = bus;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,</div><div class='del'>-				          struct snd_gus_card * gus,</div><div class='del'>-				          int dev</div><div class='add'>+static int snd_interwave_detect(struct snd_interwave *iwcard,</div><div class='add'>+				struct snd_gus_card *gus,</div><div class='add'>+				int dev</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='del'>-				          , struct snd_i2c_bus **rbus</div><div class='add'>+				, struct snd_i2c_bus **rbus</div><div class='ctx'> #endif</div><div class='ctx'> 				          )</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char rev1, rev2;</div><div class='ctx'> 	int d;</div><div class='ctx'> </div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 0);	/* reset GF1 */</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 0) {</div><div class='del'>-		snd_printdd("[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 0) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 1 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	udelay(160);</div><div class='ctx'> 	snd_gf1_i_write8(gus, SNDRV_GF1_GB_RESET, 1);	/* release reset */</div><div class='ctx'> 	udelay(160);</div><div class='del'>-	if (((d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET)) &amp; 0x07) != 1) {</div><div class='del'>-		snd_printdd("[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='add'>+	d = snd_gf1_i_look8(gus, SNDRV_GF1_GB_RESET);</div><div class='add'>+	if ((d &amp; 0x07) != 1) {</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] check 2 failed - 0x%x\n", gus-&gt;gf1.port, d);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	rev1 = snd_gf1_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, ~rev1);</div><div class='del'>-	rev2 = snd_gf1_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, rev1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	snd_printdd("[0x%lx] InterWave check - rev1=0x%x, rev2=0x%x\n", gus-&gt;gf1.port, rev1, rev2);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		rev1 = snd_gf1_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, ~rev1);</div><div class='add'>+		rev2 = snd_gf1_look8(gus, SNDRV_GF1_GB_VERSION_NUMBER);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, rev1);</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+		"[0x%lx] InterWave check - rev1=0x%x, rev2=0x%x\n",</div><div class='add'>+		gus-&gt;gf1.port, rev1, rev2);</div><div class='ctx'> 	if ((rev1 &amp; 0xf0) == (rev2 &amp; 0xf0) &amp;&amp;</div><div class='ctx'> 	    (rev1 &amp; 0x0f) != (rev2 &amp; 0x0f)) {</div><div class='del'>-		snd_printdd("[0x%lx] InterWave check - passed\n", gus-&gt;gf1.port);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev,</div><div class='add'>+			"[0x%lx] InterWave check - passed\n", gus-&gt;gf1.port);</div><div class='ctx'> 		gus-&gt;interwave = 1;</div><div class='del'>-		strcpy(gus-&gt;card-&gt;shortname, "AMD InterWave");</div><div class='add'>+		strscpy(gus-&gt;card-&gt;shortname, "AMD InterWave");</div><div class='ctx'> 		gus-&gt;revision = rev1 &gt;&gt; 4;</div><div class='ctx'> #ifndef SNDRV_STB</div><div class='ctx'> 		return 0;	/* ok.. We have an InterWave board */</div><div class='hunk'>@@ -292,7 +278,7 @@ static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,</div><div class='ctx'> 		return snd_interwave_detect_stb(iwcard, gus, dev, rbus);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='del'>-	snd_printdd("[0x%lx] InterWave check - failed\n", gus-&gt;gf1.port);</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev, "[0x%lx] InterWave check - failed\n", gus-&gt;gf1.port);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -318,7 +304,7 @@ static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_interwave_reset(struct snd_gus_card * gus)</div><div class='add'>+static void snd_interwave_reset(struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='ctx'> 	snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00);</div><div class='ctx'> 	udelay(160);</div><div class='hunk'>@@ -326,7 +312,7 @@ static void __devinit snd_interwave_reset(struct snd_gus_card * gus)</div><div class='ctx'> 	udelay(160);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *sizes)</div><div class='add'>+static void snd_interwave_bank_sizes(struct snd_gus_card *gus, int *sizes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	unsigned int local;</div><div class='hunk'>@@ -341,7 +327,7 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s</div><div class='ctx'> 			snd_gf1_poke(gus, local, d);</div><div class='ctx'> 			snd_gf1_poke(gus, local + 1, d + 1);</div><div class='ctx'> #if 0</div><div class='del'>-			printk(KERN_DEBUG "d = 0x%x, local = 0x%x, "</div><div class='add'>+			dev_dbg(gus-&gt;card-&gt;dev, "d = 0x%x, local = 0x%x, "</div><div class='ctx'> 			       "local + 1 = 0x%x, idx &lt;&lt; 22 = 0x%x\n",</div><div class='ctx'> 			       d,</div><div class='ctx'> 			       snd_gf1_peek(gus, local),</div><div class='hunk'>@@ -356,7 +342,7 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "sizes: %i %i %i %i\n",</div><div class='add'>+	dev_dbg(gus-&gt;card-&gt;dev, "sizes: %i %i %i %i\n",</div><div class='ctx'> 	       sizes[0], sizes[1], sizes[2], sizes[3]);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -377,9 +363,9 @@ struct rom_hdr {</div><div class='ctx'> 	/* 511 */ unsigned char csum;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)</div><div class='add'>+static void snd_interwave_detect_memory(struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int lmc[13] =</div><div class='add'>+	static const unsigned int lmc[13] =</div><div class='ctx'> 	{</div><div class='ctx'> 		0x00000001, 0x00000101, 0x01010101, 0x00000401,</div><div class='ctx'> 		0x04040401, 0x00040101, 0x04040101, 0x00000004,</div><div class='hunk'>@@ -411,12 +397,12 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)</div><div class='ctx'> 		lmct = (psizes[3] &lt;&lt; 24) | (psizes[2] &lt;&lt; 16) |</div><div class='ctx'> 		    (psizes[1] &lt;&lt; 8) | psizes[0];</div><div class='ctx'> #if 0</div><div class='del'>-		printk(KERN_DEBUG "lmct = 0x%08x\n", lmct);</div><div class='add'>+		dev_dbg(gus-&gt;card-&gt;dev, "lmct = 0x%08x\n", lmct);</div><div class='ctx'> #endif</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(lmc); i++)</div><div class='ctx'> 			if (lmct == lmc[i]) {</div><div class='ctx'> #if 0</div><div class='del'>-				printk(KERN_DEBUG "found !!! %i\n", i);</div><div class='add'>+				dev_dbg(gus-&gt;card-&gt;dev, "found !!! %i\n", i);</div><div class='ctx'> #endif</div><div class='ctx'> 				snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, (snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG) &amp; 0xfff0) | i);</div><div class='ctx'> 				snd_interwave_bank_sizes(gus, psizes);</div><div class='hunk'>@@ -442,19 +428,11 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)</div><div class='ctx'> 	for (bank_pos = 0; bank_pos &lt; 16L * 1024L * 1024L; bank_pos += 4L * 1024L * 1024L) {</div><div class='ctx'> 		for (i = 0; i &lt; 8; ++i)</div><div class='ctx'> 			iwave[i] = snd_gf1_peek(gus, bank_pos + i);</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_ROM</div><div class='del'>-		printk(KERN_DEBUG "ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos,</div><div class='del'>-		       iwave[0], iwave[1], iwave[2], iwave[3],</div><div class='del'>-		       iwave[4], iwave[5], iwave[6], iwave[7]);</div><div class='del'>-#endif</div><div class='ctx'> 		if (strncmp(iwave, "INTRWAVE", 8))</div><div class='ctx'> 			continue;	/* first check */</div><div class='ctx'> 		csum = 0;</div><div class='ctx'> 		for (i = 0; i &lt; sizeof(struct rom_hdr); i++)</div><div class='ctx'> 			csum += snd_gf1_peek(gus, bank_pos + i);</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_ROM</div><div class='del'>-		printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum);</div><div class='del'>-#endif</div><div class='ctx'> 		if (csum != 0)</div><div class='ctx'> 			continue;	/* not valid rom */</div><div class='ctx'> 		gus-&gt;gf1.rom_banks++;</div><div class='hunk'>@@ -476,20 +454,18 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)</div><div class='ctx'> 		snd_interwave_reset(gus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_interwave_init(int dev, struct snd_gus_card * gus)</div><div class='add'>+static void snd_interwave_init(int dev, struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	/* ok.. some InterWave specific initialization */</div><div class='del'>-	spin_lock_irqsave(&amp;gus-&gt;reg_lock, flags);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, 0x00);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_COMPATIBILITY, 0x1f);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_DECODE_CONTROL, 0x49);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, 0x11);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A, 0x00);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B, 0x30);</div><div class='del'>-	snd_gf1_write8(gus, SNDRV_GF1_GB_EMULATION_IRQ, 0x00);</div><div class='del'>-	spin_unlock_irqrestore(&amp;gus-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;gus-&gt;reg_lock) {</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_SOUND_BLASTER_CONTROL, 0x00);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_COMPATIBILITY, 0x1f);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_DECODE_CONTROL, 0x49);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_VERSION_NUMBER, 0x11);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_A, 0x00);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_MPU401_CONTROL_B, 0x30);</div><div class='add'>+		snd_gf1_write8(gus, SNDRV_GF1_GB_EMULATION_IRQ, 0x00);</div><div class='add'>+	}</div><div class='ctx'> 	gus-&gt;equal_irq = 1;</div><div class='ctx'> 	gus-&gt;codec_flag = 1;</div><div class='ctx'> 	gus-&gt;interwave = 1;</div><div class='hunk'>@@ -498,7 +474,7 @@ static void __devinit snd_interwave_init(int dev, struct snd_gus_card * gus)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_interwave_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_interwave_controls[] = {</div><div class='ctx'> WSS_DOUBLE("Master Playback Switch", 0,</div><div class='ctx'> 		CS4231_LINE_LEFT_OUTPUT, CS4231_LINE_RIGHT_OUTPUT, 7, 7, 1, 1),</div><div class='ctx'> WSS_DOUBLE("Master Playback Volume", 0,</div><div class='hunk'>@@ -509,7 +485,7 @@ WSS_DOUBLE("Mic Playback Volume", 0,</div><div class='ctx'> 		CS4231_LEFT_MIC_INPUT, CS4231_RIGHT_MIC_INPUT, 0, 0, 31, 1)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_mixer(struct snd_wss *chip)</div><div class='add'>+static int snd_interwave_mixer(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_ctl_elem_id id1, id2;</div><div class='hunk'>@@ -521,47 +497,55 @@ static int __devinit snd_interwave_mixer(struct snd_wss *chip)</div><div class='ctx'> 	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> #if 0</div><div class='ctx'> 	/* remove mono microphone controls */</div><div class='del'>-	strcpy(id1.name, "Mic Playback Switch");</div><div class='del'>-	if ((err = snd_ctl_remove_id(card, &amp;id1)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Mic Playback Switch");</div><div class='add'>+	err = snd_ctl_remove_id(card, &amp;id1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Mic Playback Volume");</div><div class='del'>-	if ((err = snd_ctl_remove_id(card, &amp;id1)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Mic Playback Volume");</div><div class='add'>+	err = snd_ctl_remove_id(card, &amp;id1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> #endif</div><div class='ctx'> 	/* add new master and mic controls */</div><div class='del'>-	for (idx = 0; idx &lt; ARRAY_SIZE(snd_interwave_controls); idx++)</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_interwave_controls[idx], chip))) &lt; 0)</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(snd_interwave_controls); idx++) {</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_interwave_controls[idx], chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_out(chip, CS4231_LINE_LEFT_OUTPUT, 0x9f);</div><div class='ctx'> 	snd_wss_out(chip, CS4231_LINE_RIGHT_OUTPUT, 0x9f);</div><div class='ctx'> 	snd_wss_out(chip, CS4231_LEFT_MIC_INPUT, 0x9f);</div><div class='ctx'> 	snd_wss_out(chip, CS4231_RIGHT_MIC_INPUT, 0x9f);</div><div class='ctx'> 	/* reassign AUXA to SYNTHESIZER */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Switch");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "Synth Playback Volume");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "Synth Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* reassign AUXB to CD */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='del'>-	strcpy(id2.name, "CD Playback Switch");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "CD Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "CD Playback Volume");</div><div class='del'>-	if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "CD Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,</div><div class='del'>-				       struct pnp_card_link *card,</div><div class='del'>-				       const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_interwave_pnp(int dev, struct snd_interwave *iwcard,</div><div class='add'>+			     struct pnp_card_link *card,</div><div class='add'>+			     const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -580,12 +564,12 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "InterWave PnP configure failure (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "InterWave PnP configure failure (out of resources?)\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pnp_port_start(pdev, 0) + 0x100 != pnp_port_start(pdev, 1) ||</div><div class='ctx'> 	    pnp_port_start(pdev, 0) + 0x10c != pnp_port_start(pdev, 2)) {</div><div class='del'>-		snd_printk(KERN_ERR "PnP configure failure (wrong ports)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PnP configure failure (wrong ports)\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -593,68 +577,65 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,</div><div class='ctx'> 	if (dma2[dev] &gt;= 0)</div><div class='ctx'> 		dma2[dev] = pnp_dma(pdev, 1);</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='del'>-	snd_printdd("isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n",</div><div class='del'>-			(unsigned long long)pnp_port_start(pdev, 0),</div><div class='del'>-			(unsigned long long)pnp_port_start(pdev, 1),</div><div class='del'>-			(unsigned long long)pnp_port_start(pdev, 2));</div><div class='del'>-	snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev], irq[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"isapnp IW: sb port=0x%llx, gf1 port=0x%llx, codec port=0x%llx\n",</div><div class='add'>+		(unsigned long long)pnp_port_start(pdev, 0),</div><div class='add'>+		(unsigned long long)pnp_port_start(pdev, 1),</div><div class='add'>+		(unsigned long long)pnp_port_start(pdev, 2));</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"isapnp IW: dma1=%i, dma2=%i, irq=%i\n",</div><div class='add'>+		dma1[dev], dma2[dev], irq[dev]);</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='ctx'> 	/* Tone Control initialization */</div><div class='ctx'> 	pdev = iwcard-&gt;devtc;</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "InterWave ToneControl PnP configure failure (out of resources?)\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"InterWave ToneControl PnP configure failure (out of resources?)\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	port_tc[dev] = pnp_port_start(pdev, 0);</div><div class='del'>-	snd_printdd("isapnp IW: tone control port=0x%lx\n", port_tc[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "isapnp IW: tone control port=0x%lx\n", port_tc[dev]);</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-static void snd_interwave_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_interwave *iwcard = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (iwcard == NULL)</div><div class='del'>-		return;</div><div class='del'>-#ifdef SNDRV_STB</div><div class='del'>-	release_and_free_resource(iwcard-&gt;i2c_res);</div><div class='del'>-#endif</div><div class='del'>-	if (iwcard-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(iwcard-&gt;irq, (void *)iwcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_interwave_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_interwave_card_new(struct device *pdev, int dev,</div><div class='add'>+				  struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_interwave *iwcard;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_interwave), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_interwave), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	iwcard = card-&gt;private_data;</div><div class='ctx'> 	iwcard-&gt;card = card;</div><div class='ctx'> 	iwcard-&gt;irq = -1;</div><div class='del'>-	card-&gt;private_free = snd_interwave_free;</div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_interwave_probe_gus(struct snd_card *card, int dev,</div><div class='add'>+				   struct snd_gus_card **gusp)</div><div class='add'>+{</div><div class='add'>+	return snd_gus_create(card, port[dev], -irq[dev], dma1[dev], dma2[dev],</div><div class='add'>+			      0, 32, pcm_channels[dev], effect[dev], gusp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_interwave_probe(struct snd_card *card, int dev,</div><div class='add'>+			       struct snd_gus_card *gus)</div><div class='ctx'> {</div><div class='ctx'> 	int xirq, xdma1, xdma2;</div><div class='ctx'> 	struct snd_interwave *iwcard = card-&gt;private_data;</div><div class='ctx'> 	struct snd_wss *wss;</div><div class='del'>-	struct snd_gus_card *gus;</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='ctx'> 	struct snd_i2c_bus *i2c_bus;</div><div class='ctx'> #endif</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	char *str;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -662,18 +643,12 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	xdma1 = dma1[dev];</div><div class='ctx'> 	xdma2 = dma2[dev];</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_gus_create(card,</div><div class='del'>-				  port[dev],</div><div class='del'>-				  -xirq, xdma1, xdma2,</div><div class='del'>-				  0, 32,</div><div class='del'>-				  pcm_channels[dev], effect[dev], &amp;gus)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_interwave_detect(iwcard, gus, dev</div><div class='add'>+	err = snd_interwave_detect(iwcard, gus, dev</div><div class='ctx'> #ifdef SNDRV_STB</div><div class='del'>-            , &amp;i2c_bus</div><div class='add'>+				   , &amp;i2c_bus</div><div class='ctx'> #endif</div><div class='del'>-	    )) &lt; 0)</div><div class='add'>+				   );</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	iwcard-&gt;gus_status_reg = gus-&gt;gf1.reg_irqstat;</div><div class='hunk'>@@ -681,15 +656,17 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> </div><div class='ctx'> 	snd_interwave_init(dev, gus);</div><div class='ctx'> 	snd_interwave_detect_memory(gus);</div><div class='del'>-	if ((err = snd_gus_initialize(gus)) &lt; 0)</div><div class='add'>+	err = snd_gus_initialize(gus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED,</div><div class='del'>-			"InterWave", iwcard)) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, xirq, snd_interwave_interrupt, 0,</div><div class='add'>+			     "InterWave", iwcard)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", xirq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	iwcard-&gt;irq = xirq;</div><div class='add'>+	card-&gt;sync_irq = iwcard-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_wss_create(card,</div><div class='ctx'> 			     gus-&gt;gf1.port + 0x10c, -1, xirq,</div><div class='hunk'>@@ -702,14 +679,15 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_pcm(wss, 0, &amp;pcm);</div><div class='add'>+	err = snd_wss_pcm(wss, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	sprintf(pcm-&gt;name + strlen(pcm-&gt;name), " rev %c", gus-&gt;revision + 'A');</div><div class='del'>-	strcat(pcm-&gt;name, " (codec)");</div><div class='add'>+	sprintf(wss-&gt;pcm-&gt;name + strlen(wss-&gt;pcm-&gt;name), " rev %c",</div><div class='add'>+		gus-&gt;revision + 'A');</div><div class='add'>+	strcat(wss-&gt;pcm-&gt;name, " (codec)");</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_timer(wss, 2, NULL);</div><div class='add'>+	err = snd_wss_timer(wss, 2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -718,7 +696,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (pcm_channels[dev] &gt; 0) {</div><div class='del'>-		err = snd_gf1_pcm_new(gus, 1, 1, NULL);</div><div class='add'>+		err = snd_gf1_pcm_new(gus, 1, 1);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -732,22 +710,26 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> 		memset(&amp;id1, 0, sizeof(id1));</div><div class='ctx'> 		memset(&amp;id2, 0, sizeof(id2));</div><div class='ctx'> 		id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-		strcpy(id1.name, "Master Playback Switch");</div><div class='del'>-		strcpy(id2.name, id1.name);</div><div class='add'>+		strscpy(id1.name, "Master Playback Switch");</div><div class='add'>+		strscpy(id2.name, id1.name);</div><div class='ctx'> 		id2.index = 1;</div><div class='del'>-		if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+		err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		strcpy(id1.name, "Master Playback Volume");</div><div class='del'>-		strcpy(id2.name, id1.name);</div><div class='del'>-		if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0)</div><div class='add'>+		strscpy(id1.name, "Master Playback Volume");</div><div class='add'>+		strscpy(id2.name, id1.name);</div><div class='add'>+		err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_tea6330t_update_mixer(card, i2c_bus, 0, 1)) &lt; 0)</div><div class='add'>+		err = snd_tea6330t_update_mixer(card, i2c_bus, 0, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	gus-&gt;uart_enable = midi[dev];</div><div class='del'>-	if ((err = snd_gf1_rawmidi_new(gus, 0, NULL)) &lt; 0)</div><div class='add'>+	err = snd_gf1_rawmidi_new(gus, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> #ifndef SNDRV_STB</div><div class='hunk'>@@ -757,8 +739,8 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> #else</div><div class='ctx'> 	str = "InterWave STB";</div><div class='ctx'> #endif</div><div class='del'>-	strcpy(card-&gt;driver, str);</div><div class='del'>-	strcpy(card-&gt;shortname, str);</div><div class='add'>+	strscpy(card-&gt;driver, str);</div><div class='add'>+	strscpy(card-&gt;shortname, str);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i, dma %d",</div><div class='ctx'> 		str,</div><div class='ctx'> 		gus-&gt;gf1.port,</div><div class='hunk'>@@ -776,26 +758,8 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_interwave_card_new(dev, &amp;card);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-	if ((err = snd_interwave_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	dev_set_drvdata(devptr, card);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_interwave_isa_match(struct device *pdev,</div><div class='del'>-					     unsigned int dev)</div><div class='add'>+static int snd_interwave_isa_match(struct device *pdev,</div><div class='add'>+				   unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -806,58 +770,67 @@ static int __devinit snd_interwave_isa_match(struct device *pdev,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_interwave_isa_probe(struct device *pdev,</div><div class='del'>-					     unsigned int dev)</div><div class='add'>+static int snd_interwave_isa_probe(struct device *pdev,</div><div class='add'>+				   unsigned int dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_gus_card *gus;</div><div class='ctx'> 	int err;</div><div class='del'>-	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};</div><div class='del'>-	static int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};</div><div class='add'>+	static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};</div><div class='add'>+	static const int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};</div><div class='ctx'> </div><div class='ctx'> 	if (irq[dev] == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((irq[dev] = snd_legacy_find_free_irq(possible_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");</div><div class='add'>+		irq[dev] = snd_legacy_find_free_irq(possible_irqs);</div><div class='add'>+		if (irq[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma1[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma1[dev] = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA1\n");</div><div class='add'>+		dma1[dev] = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (dma1[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA1\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma2[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma2[dev] = snd_legacy_find_free_dma(possible_dmas)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA2\n");</div><div class='add'>+		dma2[dev] = snd_legacy_find_free_dma(possible_dmas);</div><div class='add'>+		if (dma2[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free DMA2\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = snd_interwave_card_new(pdev, dev, &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	if (port[dev] != SNDRV_AUTO_PORT)</div><div class='del'>-		return snd_interwave_isa_probe1(dev, pdev);</div><div class='add'>+		err = snd_interwave_probe_gus(card, dev, &amp;gus);</div><div class='ctx'> 	else {</div><div class='del'>-		static long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260};</div><div class='add'>+		static const long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260};</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(possible_ports); i++) {</div><div class='ctx'> 			port[dev] = possible_ports[i];</div><div class='del'>-			err = snd_interwave_isa_probe1(dev, pdev);</div><div class='add'>+			err = snd_interwave_probe_gus(card, dev, &amp;gus);</div><div class='ctx'> 			if (! err)</div><div class='ctx'> 				return 0;</div><div class='ctx'> 		}</div><div class='del'>-		return err;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='add'>+	err = snd_interwave_probe(card, dev, gus);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_interwave_driver = {</div><div class='ctx'> 	.match		= snd_interwave_isa_match,</div><div class='ctx'> 	.probe		= snd_interwave_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_interwave_isa_remove),</div><div class='ctx'> 	/* FIXME: suspend,resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= INTERWAVE_DRIVER</div><div class='hunk'>@@ -865,11 +838,12 @@ static struct isa_driver snd_interwave_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					      const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_interwave_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+				    const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='add'>+	struct snd_gus_card *gus;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	for ( ; dev &lt; SNDRV_CARDS; dev++) {</div><div class='hunk'>@@ -879,36 +853,29 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 				</div><div class='del'>-	res = snd_interwave_card_new(dev, &amp;card);</div><div class='add'>+	res = snd_interwave_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='del'>-	if ((res = snd_interwave_pnp(dev, card-&gt;private_data, pcard, pid)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_interwave_pnp(dev, card-&gt;private_data, pcard, pid);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-	if ((res = snd_interwave_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	res = snd_interwave_probe_gus(card, dev, &amp;gus);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		return res;</div><div class='add'>+	res = snd_interwave_probe(card, dev, gus);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_interwave_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pnp_card_driver interwave_pnpc_driver = {</div><div class='ctx'> 	.flags = PNP_DRIVER_RES_DISABLE,</div><div class='ctx'> 	.name = INTERWAVE_PNP_DRIVER,</div><div class='ctx'> 	.id_table = snd_interwave_pnpids,</div><div class='ctx'> 	.probe = snd_interwave_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_interwave_pnp_remove),</div><div class='ctx'> 	/* FIXME: suspend,resume */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/msnd/Makefile b/sound/isa/msnd/Makefile<br/>index 2171c0aa2f62..d56412aae857 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/Makefile</a></div><div class='hunk'>@@ -1,7 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='del'>-snd-msnd-lib-objs := msnd.o msnd_midi.o msnd_pinnacle_mixer.o</div><div class='del'>-snd-msnd-pinnacle-objs := msnd_pinnacle.o</div><div class='del'>-snd-msnd-classic-objs := msnd_classic.o</div><div class='add'>+snd-msnd-lib-y := msnd.o msnd_pinnacle_mixer.o</div><div class='add'>+snd-msnd-pinnacle-y := msnd_pinnacle.o</div><div class='add'>+snd-msnd-classic-y := msnd_classic.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_MSND_PINNACLE) += snd-msnd-pinnacle.o snd-msnd-lib.o</div><div class='head'>diff --git a/sound/isa/msnd/msnd.c b/sound/isa/msnd/msnd.c<br/>index 3a1526ae1729..5e350234d572 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * 2002/06/30 Karsten Wiese:</div><div class='hunk'>@@ -19,28 +20,16 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998 Andrew Veliath</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -52,7 +41,7 @@</div><div class='ctx'> #define LOGNAME			"msnd"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-void snd_msnd_init_queue(void *base, int start, int size)</div><div class='add'>+void snd_msnd_init_queue(void __iomem *base, int start, int size)</div><div class='ctx'> {</div><div class='ctx'> 	writew(PCTODSP_BASED(start), base + JQS_wStart);</div><div class='ctx'> 	writew(PCTODSP_OFFSET(size) - 1, base + JQS_wSize);</div><div class='hunk'>@@ -87,17 +76,13 @@ static int snd_msnd_wait_HC0(struct snd_msnd *dev)</div><div class='ctx'> </div><div class='ctx'> int snd_msnd_send_dsp_cmd(struct snd_msnd *dev, u8 cmd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	if (snd_msnd_wait_HC0(dev) == 0) {</div><div class='ctx'> 		outb(cmd, dev-&gt;io + HP_CVR);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_ERR LOGNAME ": Send DSP command timeout\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Send DSP command timeout\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -115,7 +100,7 @@ int snd_msnd_send_word(struct snd_msnd *dev, unsigned char high,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_ERR LOGNAME ": Send host word timeout\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Send host word timeout\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -126,7 +111,7 @@ int snd_msnd_upload_host(struct snd_msnd *dev, const u8 *bin, int len)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (len % 3 != 0) {</div><div class='del'>-		snd_printk(KERN_ERR LOGNAME</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, LOGNAME</div><div class='ctx'> 			   ": Upload host data not multiple of 3!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -144,14 +129,12 @@ EXPORT_SYMBOL(snd_msnd_upload_host);</div><div class='ctx'> </div><div class='ctx'> int snd_msnd_enable_irq(struct snd_msnd *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (dev-&gt;irq_ref++)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	snd_printdd(LOGNAME ": Enabling IRQ\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Enabling IRQ\n");</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	if (snd_msnd_wait_TXDE(dev) == 0) {</div><div class='ctx'> 		outb(inb(dev-&gt;io + HP_ICR) | HPICR_TREQ, dev-&gt;io + HP_ICR);</div><div class='ctx'> 		if (dev-&gt;type == msndClassic)</div><div class='hunk'>@@ -162,12 +145,10 @@ int snd_msnd_enable_irq(struct snd_msnd *dev)</div><div class='ctx'> 		enable_irq(dev-&gt;irq);</div><div class='ctx'> 		snd_msnd_init_queue(dev-&gt;DSPQ, dev-&gt;dspq_data_buff,</div><div class='ctx'> 				    dev-&gt;dspq_buff_size);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_ERR LOGNAME ": Enable IRQ failed\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Enable IRQ failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -175,29 +156,25 @@ EXPORT_SYMBOL(snd_msnd_enable_irq);</div><div class='ctx'> </div><div class='ctx'> int snd_msnd_disable_irq(struct snd_msnd *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (--dev-&gt;irq_ref &gt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;irq_ref &lt; 0)</div><div class='del'>-		snd_printd(KERN_WARNING LOGNAME ": IRQ ref count is %d\n",</div><div class='del'>-			   dev-&gt;irq_ref);</div><div class='add'>+		dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": IRQ ref count is %d\n",</div><div class='add'>+			dev-&gt;irq_ref);</div><div class='ctx'> </div><div class='del'>-	snd_printdd(LOGNAME ": Disabling IRQ\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Disabling IRQ\n");</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;dev-&gt;lock);</div><div class='ctx'> 	if (snd_msnd_wait_TXDE(dev) == 0) {</div><div class='ctx'> 		outb(inb(dev-&gt;io + HP_ICR) &amp; ~HPICR_RREQ, dev-&gt;io + HP_ICR);</div><div class='ctx'> 		if (dev-&gt;type == msndClassic)</div><div class='ctx'> 			outb(HPIRQ_NONE, dev-&gt;io + HP_IRQM);</div><div class='ctx'> 		disable_irq(dev-&gt;irq);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_ERR LOGNAME ": Disable IRQ failed\n");</div><div class='add'>+	dev_dbg(dev-&gt;card-&gt;dev, LOGNAME ": Disable IRQ failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -231,8 +208,8 @@ void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file)</div><div class='ctx'> 		snd_msnd_send_dsp_cmd(chip, HDEX_RECORD_STOP);</div><div class='ctx'> 		snd_msnd_disable_irq(chip);</div><div class='ctx'> 		if (file) {</div><div class='del'>-			snd_printd(KERN_INFO LOGNAME</div><div class='del'>-				   ": Stopping read for %p\n", file);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, LOGNAME</div><div class='add'>+				": Stopping read for %p\n", file);</div><div class='ctx'> 			chip-&gt;mode &amp;= ~FMODE_READ;</div><div class='ctx'> 		}</div><div class='ctx'> 		clear_bit(F_AUDIO_READ_INUSE, &amp;chip-&gt;flags);</div><div class='hunk'>@@ -244,8 +221,8 @@ void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file)</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_msnd_disable_irq(chip);</div><div class='ctx'> 		if (file) {</div><div class='del'>-			snd_printd(KERN_INFO</div><div class='del'>-				   LOGNAME ": Stopping write for %p\n", file);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				LOGNAME ": Stopping write for %p\n", file);</div><div class='ctx'> 			chip-&gt;mode &amp;= ~FMODE_WRITE;</div><div class='ctx'> 		}</div><div class='ctx'> 		clear_bit(F_AUDIO_WRITE_INUSE, &amp;chip-&gt;flags);</div><div class='hunk'>@@ -268,7 +245,7 @@ int snd_msnd_DARQ(struct snd_msnd *chip, int bank)</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;capturePeriods == 2) {</div><div class='del'>-		void *pDAQ = chip-&gt;mappedbase + DARQ_DATA_BUFF +</div><div class='add'>+		void __iomem *pDAQ = chip-&gt;mappedbase + DARQ_DATA_BUFF +</div><div class='ctx'> 			     bank * DAQDS__size + DAQDS_wStart;</div><div class='ctx'> 		unsigned short offset = 0x3000 + chip-&gt;capturePeriodBytes;</div><div class='ctx'> </div><div class='hunk'>@@ -307,7 +284,7 @@ int snd_msnd_DAPQ(struct snd_msnd *chip, int start)</div><div class='ctx'> {</div><div class='ctx'> 	u16	DAPQ_tail;</div><div class='ctx'> 	int	protect = start, nbanks = 0;</div><div class='del'>-	void	*DAQD;</div><div class='add'>+	void	__iomem *DAQD;</div><div class='ctx'> 	static int play_banks_submitted;</div><div class='ctx'> 	/* unsigned long flags;</div><div class='ctx'> 	spin_lock_irqsave(&amp;chip-&gt;lock, flags); not necessary */</div><div class='hunk'>@@ -340,12 +317,6 @@ int snd_msnd_DAPQ(struct snd_msnd *chip, int start)</div><div class='ctx'> 		++nbanks;</div><div class='ctx'> </div><div class='ctx'> 		/* Then advance the tail */</div><div class='del'>-		/*</div><div class='del'>-		if (protect)</div><div class='del'>-			snd_printd(KERN_INFO "B %X %lX\n",</div><div class='del'>-				   bank_num, xtime.tv_usec);</div><div class='del'>-		*/</div><div class='del'>-</div><div class='ctx'> 		DAPQ_tail = (++bank_num % 3) * PCTODSP_OFFSET(DAQDS__size);</div><div class='ctx'> 		writew(DAPQ_tail, chip-&gt;DAPQ + JQS_wTail);</div><div class='ctx'> 		/* Tell the DSP to play the bank */</div><div class='hunk'>@@ -354,10 +325,6 @@ int snd_msnd_DAPQ(struct snd_msnd *chip, int start)</div><div class='ctx'> 			if (2 == bank_num)</div><div class='ctx'> 				break;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	if (protect)</div><div class='del'>-		snd_printd(KERN_INFO "%lX\n", xtime.tv_usec);</div><div class='del'>-	*/</div><div class='ctx'> 	/* spin_unlock_irqrestore(&amp;chip-&gt;lock, flags); not necessary */</div><div class='ctx'> 	return nbanks;</div><div class='ctx'> }</div><div class='hunk'>@@ -368,7 +335,7 @@ static void snd_msnd_play_reset_queue(struct snd_msnd *chip,</div><div class='ctx'> 				      unsigned int pcm_count)</div><div class='ctx'> {</div><div class='ctx'> 	int	n;</div><div class='del'>-	void	*pDAQ = chip-&gt;mappedbase + DAPQ_DATA_BUFF;</div><div class='add'>+	void	__iomem *pDAQ = chip-&gt;mappedbase + DAPQ_DATA_BUFF;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;last_playbank = -1;</div><div class='ctx'> 	chip-&gt;playLimit = pcm_count * (pcm_periods - 1);</div><div class='hunk'>@@ -396,8 +363,7 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip,</div><div class='ctx'> 					 unsigned int pcm_count)</div><div class='ctx'> {</div><div class='ctx'> 	int		n;</div><div class='del'>-	void		*pDAQ;</div><div class='del'>-	/* unsigned long	flags; */</div><div class='add'>+	void		__iomem *pDAQ;</div><div class='ctx'> </div><div class='ctx'> 	/* snd_msnd_init_queue(chip-&gt;DARQ, DARQ_DATA_BUFF, DARQ_BUFF_SIZE); */</div><div class='ctx'> </div><div class='hunk'>@@ -409,15 +375,15 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip,</div><div class='ctx'> 		chip-&gt;DARQ + JQS_wTail);</div><div class='ctx'> </div><div class='ctx'> #if 0 /* Critical section: bank 1 access. this is how the OSS driver does it:*/</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	outb(HPBLKSEL_1, chip-&gt;io + HP_BLKS);</div><div class='del'>-	memset_io(chip-&gt;mappedbase, 0, DAR_BUFF_SIZE * 3);</div><div class='del'>-	outb(HPBLKSEL_0, chip-&gt;io + HP_BLKS);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;lock) {</div><div class='add'>+		outb(HPBLKSEL_1, chip-&gt;io + HP_BLKS);</div><div class='add'>+		memset_io(chip-&gt;mappedbase, 0, DAR_BUFF_SIZE * 3);</div><div class='add'>+		outb(HPBLKSEL_0, chip-&gt;io + HP_BLKS);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;capturePeriodBytes = pcm_count;</div><div class='del'>-	snd_printdd("snd_msnd_capture_reset_queue() %i\n", pcm_count);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%s() %i\n", __func__, pcm_count);</div><div class='ctx'> </div><div class='ctx'> 	pDAQ = chip-&gt;mappedbase + DARQ_DATA_BUFF;</div><div class='ctx'> </div><div class='hunk'>@@ -435,8 +401,8 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_msnd_playback = {</div><div class='del'>-	.info =			SNDRV_PCM_INFO_MMAP |</div><div class='add'>+static const struct snd_pcm_hardware snd_msnd_playback = {</div><div class='add'>+	.info =			SNDRV_PCM_INFO_MMAP_IOMEM |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 				SNDRV_PCM_INFO_BATCH,</div><div class='hunk'>@@ -454,8 +420,8 @@ static struct snd_pcm_hardware snd_msnd_playback = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_msnd_capture = {</div><div class='del'>-	.info =			SNDRV_PCM_INFO_MMAP |</div><div class='add'>+static const struct snd_pcm_hardware snd_msnd_capture = {</div><div class='add'>+	.info =			SNDRV_PCM_INFO_MMAP_IOMEM |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 				SNDRV_PCM_INFO_BATCH,</div><div class='hunk'>@@ -483,7 +449,8 @@ static int snd_msnd_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	clear_bit(F_WRITING, &amp;chip-&gt;flags);</div><div class='ctx'> 	snd_msnd_enable_irq(chip);</div><div class='ctx'> </div><div class='del'>-	runtime-&gt;dma_area = chip-&gt;mappedbase;</div><div class='add'>+	runtime-&gt;dma_area = (__force void *)chip-&gt;mappedbase;</div><div class='add'>+	runtime-&gt;dma_addr = chip-&gt;base;</div><div class='ctx'> 	runtime-&gt;dma_bytes = 0x3000;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;playback_substream = substream;</div><div class='hunk'>@@ -506,7 +473,7 @@ static int snd_msnd_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	int	i;</div><div class='ctx'> 	struct snd_msnd *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	void	*pDAQ =	chip-&gt;mappedbase + DAPQ_DATA_BUFF;</div><div class='add'>+	void	__iomem *pDAQ =	chip-&gt;mappedbase + DAPQ_DATA_BUFF;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;play_sample_size = snd_pcm_format_width(params_format(params));</div><div class='ctx'> 	chip-&gt;play_channels = params_channels(params);</div><div class='hunk'>@@ -543,21 +510,21 @@ static int snd_msnd_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int	result = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd == SNDRV_PCM_TRIGGER_START) {</div><div class='del'>-		snd_printdd("snd_msnd_playback_trigger(START)\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "%s(START)\n", __func__);</div><div class='ctx'> 		chip-&gt;banksPlayed = 0;</div><div class='ctx'> 		set_bit(F_WRITING, &amp;chip-&gt;flags);</div><div class='ctx'> 		snd_msnd_DAPQ(chip, 1);</div><div class='ctx'> 	} else if (cmd == SNDRV_PCM_TRIGGER_STOP) {</div><div class='del'>-		snd_printdd("snd_msnd_playback_trigger(STop)\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "%s(STOP)\n", __func__);</div><div class='ctx'> 		/* interrupt diagnostic, comment this out later */</div><div class='ctx'> 		clear_bit(F_WRITING, &amp;chip-&gt;flags);</div><div class='ctx'> 		snd_msnd_send_dsp_cmd(chip, HDEX_PLAY_STOP);</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printd(KERN_ERR "snd_msnd_playback_trigger(?????)\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "%s(?????)\n", __func__);</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd("snd_msnd_playback_trigger() ENDE\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%s() ENDE\n", __func__);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -570,14 +537,14 @@ snd_msnd_playback_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_msnd_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_msnd_playback_ops = {</div><div class='ctx'> 	.open =		snd_msnd_playback_open,</div><div class='ctx'> 	.close =	snd_msnd_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_msnd_playback_hw_params,</div><div class='ctx'> 	.prepare =	snd_msnd_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_msnd_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_msnd_playback_pointer,</div><div class='add'>+	.mmap =		snd_pcm_lib_mmap_iomem,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int snd_msnd_capture_open(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -587,7 +554,8 @@ static int snd_msnd_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	set_bit(F_AUDIO_READ_INUSE, &amp;chip-&gt;flags);</div><div class='ctx'> 	snd_msnd_enable_irq(chip);</div><div class='del'>-	runtime-&gt;dma_area = chip-&gt;mappedbase + 0x3000;</div><div class='add'>+	runtime-&gt;dma_area = (__force void *)chip-&gt;mappedbase + 0x3000;</div><div class='add'>+	runtime-&gt;dma_addr = chip-&gt;base + 0x3000;</div><div class='ctx'> 	runtime-&gt;dma_bytes = 0x3000;</div><div class='ctx'> 	memset(runtime-&gt;dma_area, 0, runtime-&gt;dma_bytes);</div><div class='ctx'> 	chip-&gt;capture_substream = substream;</div><div class='hunk'>@@ -652,7 +620,7 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	int		i;</div><div class='ctx'> 	struct snd_msnd *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	void		*pDAQ = chip-&gt;mappedbase + DARQ_DATA_BUFF;</div><div class='add'>+	void		__iomem *pDAQ = chip-&gt;mappedbase + DARQ_DATA_BUFF;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;capture_sample_size = snd_pcm_format_width(params_format(params));</div><div class='ctx'> 	chip-&gt;capture_channels = params_channels(params);</div><div class='hunk'>@@ -667,19 +635,18 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_msnd_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_msnd_capture_ops = {</div><div class='ctx'> 	.open =		snd_msnd_capture_open,</div><div class='ctx'> 	.close =	snd_msnd_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_msnd_capture_hw_params,</div><div class='ctx'> 	.prepare =	snd_msnd_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_msnd_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_msnd_capture_pointer,</div><div class='add'>+	.mmap =		snd_pcm_lib_mmap_iomem,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int snd_msnd_pcm(struct snd_card *card, int device,</div><div class='del'>-			struct snd_pcm **rpcm)</div><div class='add'>+int snd_msnd_pcm(struct snd_card *card, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *chip = card-&gt;private_data;</div><div class='ctx'> 	struct snd_pcm	*pcm;</div><div class='hunk'>@@ -693,11 +660,8 @@ int snd_msnd_pcm(struct snd_card *card, int device,</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_msnd_capture_ops);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "Hurricane");</div><div class='del'>-</div><div class='add'>+	strscpy(pcm-&gt;name, "Hurricane");</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_msnd_pcm);</div><div class='head'>diff --git a/sound/isa/msnd/msnd.h b/sound/isa/msnd/msnd.h<br/>index 3773e242b58e..3d7810ed9186 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * msnd.h</div><div class='hunk'>@@ -10,20 +11,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Andrew Veliath</div><div class='ctx'>  * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> #ifndef __MSND_H</div><div class='ctx'> #define __MSND_H</div><div class='hunk'>@@ -229,7 +216,6 @@ struct snd_msnd {</div><div class='ctx'> 	int			captureLimit;</div><div class='ctx'> 	int			capturePeriods;</div><div class='ctx'> 	struct snd_card		*card;</div><div class='del'>-	void			*msndmidi_mpu;</div><div class='ctx'> 	struct snd_rawmidi	*rmidi;</div><div class='ctx'> </div><div class='ctx'> 	/* Hardware resources */</div><div class='hunk'>@@ -249,7 +235,7 @@ struct snd_msnd {</div><div class='ctx'> </div><div class='ctx'> 	/* State variables */</div><div class='ctx'> 	enum { msndClassic, msndPinnacle } type;</div><div class='del'>-	mode_t mode;</div><div class='add'>+	fmode_t mode;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> #define F_RESETTING			0</div><div class='ctx'> #define F_HAVEDIGITAL			1</div><div class='hunk'>@@ -283,7 +269,7 @@ struct snd_msnd {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void snd_msnd_init_queue(void *base, int start, int size);</div><div class='add'>+void snd_msnd_init_queue(void __iomem *base, int start, int size);</div><div class='ctx'> </div><div class='ctx'> int snd_msnd_send_dsp_cmd(struct snd_msnd *chip, u8 cmd);</div><div class='ctx'> int snd_msnd_send_word(struct snd_msnd *chip,</div><div class='hunk'>@@ -297,12 +283,9 @@ int snd_msnd_disable_irq(struct snd_msnd *chip);</div><div class='ctx'> void snd_msnd_dsp_halt(struct snd_msnd *chip, struct file *file);</div><div class='ctx'> int snd_msnd_DAPQ(struct snd_msnd *chip, int start);</div><div class='ctx'> int snd_msnd_DARQ(struct snd_msnd *chip, int start);</div><div class='del'>-int snd_msnd_pcm(struct snd_card *card, int device, struct snd_pcm **rpcm);</div><div class='del'>-</div><div class='del'>-int snd_msndmidi_new(struct snd_card *card, int device);</div><div class='del'>-void snd_msndmidi_input_read(void *mpu);</div><div class='add'>+int snd_msnd_pcm(struct snd_card *card, int device);</div><div class='ctx'> </div><div class='ctx'> void snd_msndmix_setup(struct snd_msnd *chip);</div><div class='del'>-int __devinit snd_msndmix_new(struct snd_card *card);</div><div class='add'>+int snd_msndmix_new(struct snd_card *card);</div><div class='ctx'> int snd_msndmix_force_recsrc(struct snd_msnd *chip, int recsrc);</div><div class='ctx'> #endif /* __MSND_H */</div><div class='head'>diff --git a/sound/isa/msnd/msnd_classic.h b/sound/isa/msnd/msnd_classic.h<br/>index f18d5fa5baf4..74d2b9af4683 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_classic.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_classic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_classic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd_classic.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * msnd_classic.h</div><div class='hunk'>@@ -10,20 +11,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Andrew Veliath</div><div class='ctx'>  * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> #ifndef __MSND_CLASSIC_H</div><div class='ctx'> #define __MSND_CLASSIC_H</div><div class='head'>diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c<br/>deleted file mode 100644<br/>index 787495674235..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_midi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,181 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *  Copyright (c) 2009 by Krzysztof Helt</div><div class='del'>- *  Routines for control of MPU-401 in UART mode</div><div class='del'>- *</div><div class='del'>- *  MPU-401 supports UART mode which is not capable generate transmit</div><div class='del'>- *  interrupts thus output is done via polling. Also, if irq &lt; 0, then</div><div class='del'>- *  input is done also via polling. Do not expect good performance.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/rawmidi.h&gt;</div><div class='del'>-</div><div class='del'>-#include "msnd.h"</div><div class='del'>-</div><div class='del'>-#define MSNDMIDI_MODE_BIT_INPUT		0</div><div class='del'>-#define MSNDMIDI_MODE_BIT_OUTPUT		1</div><div class='del'>-#define MSNDMIDI_MODE_BIT_INPUT_TRIGGER	2</div><div class='del'>-#define MSNDMIDI_MODE_BIT_OUTPUT_TRIGGER	3</div><div class='del'>-</div><div class='del'>-struct snd_msndmidi {</div><div class='del'>-	struct snd_msnd *dev;</div><div class='del'>-</div><div class='del'>-	unsigned long mode;		/* MSNDMIDI_MODE_XXXX */</div><div class='del'>-</div><div class='del'>-	struct snd_rawmidi_substream *substream_input;</div><div class='del'>-</div><div class='del'>-	spinlock_t input_lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input/output open/close - protected by open_mutex in rawmidi.c</div><div class='del'>- */</div><div class='del'>-static int snd_msndmidi_input_open(struct snd_rawmidi_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_msndmidi *mpu;</div><div class='del'>-</div><div class='del'>-	snd_printdd("snd_msndmidi_input_open()\n");</div><div class='del'>-</div><div class='del'>-	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	mpu-&gt;substream_input = substream;</div><div class='del'>-</div><div class='del'>-	snd_msnd_enable_irq(mpu-&gt;dev);</div><div class='del'>-</div><div class='del'>-	snd_msnd_send_dsp_cmd(mpu-&gt;dev, HDEX_MIDI_IN_START);</div><div class='del'>-	set_bit(MSNDMIDI_MODE_BIT_INPUT, &amp;mpu-&gt;mode);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_msndmidi_input_close(struct snd_rawmidi_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_msndmidi *mpu;</div><div class='del'>-</div><div class='del'>-	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	snd_msnd_send_dsp_cmd(mpu-&gt;dev, HDEX_MIDI_IN_STOP);</div><div class='del'>-	clear_bit(MSNDMIDI_MODE_BIT_INPUT, &amp;mpu-&gt;mode);</div><div class='del'>-	mpu-&gt;substream_input = NULL;</div><div class='del'>-	snd_msnd_disable_irq(mpu-&gt;dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_msndmidi_input_drop(struct snd_msndmidi *mpu)</div><div class='del'>-{</div><div class='del'>-	u16 tail;</div><div class='del'>-</div><div class='del'>-	tail = readw(mpu-&gt;dev-&gt;MIDQ + JQS_wTail);</div><div class='del'>-	writew(tail, mpu-&gt;dev-&gt;MIDQ + JQS_wHead);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * trigger input</div><div class='del'>- */</div><div class='del'>-static void snd_msndmidi_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='del'>-					int up)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct snd_msndmidi *mpu;</div><div class='del'>-</div><div class='del'>-	snd_printdd("snd_msndmidi_input_trigger(, %i)\n", up);</div><div class='del'>-</div><div class='del'>-	mpu = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;mpu-&gt;input_lock, flags);</div><div class='del'>-	if (up) {</div><div class='del'>-		if (!test_and_set_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER,</div><div class='del'>-				      &amp;mpu-&gt;mode))</div><div class='del'>-			snd_msndmidi_input_drop(mpu);</div><div class='del'>-	} else {</div><div class='del'>-		clear_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER, &amp;mpu-&gt;mode);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpu-&gt;input_lock, flags);</div><div class='del'>-	if (up)</div><div class='del'>-		snd_msndmidi_input_read(mpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_msndmidi_input_read(void *mpuv)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct snd_msndmidi *mpu = mpuv;</div><div class='del'>-	void *pwMIDQData = mpu-&gt;dev-&gt;mappedbase + MIDQ_DATA_BUFF;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mpu-&gt;input_lock, flags);</div><div class='del'>-	while (readw(mpu-&gt;dev-&gt;MIDQ + JQS_wTail) !=</div><div class='del'>-	       readw(mpu-&gt;dev-&gt;MIDQ + JQS_wHead)) {</div><div class='del'>-		u16 wTmp, val;</div><div class='del'>-		val = readw(pwMIDQData + 2 * readw(mpu-&gt;dev-&gt;MIDQ + JQS_wHead));</div><div class='del'>-</div><div class='del'>-			if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER,</div><div class='del'>-				     &amp;mpu-&gt;mode))</div><div class='del'>-				snd_rawmidi_receive(mpu-&gt;substream_input,</div><div class='del'>-						    (unsigned char *)&amp;val, 1);</div><div class='del'>-</div><div class='del'>-		wTmp = readw(mpu-&gt;dev-&gt;MIDQ + JQS_wHead) + 1;</div><div class='del'>-		if (wTmp &gt; readw(mpu-&gt;dev-&gt;MIDQ + JQS_wSize))</div><div class='del'>-			writew(0,  mpu-&gt;dev-&gt;MIDQ + JQS_wHead);</div><div class='del'>-		else</div><div class='del'>-			writew(wTmp,  mpu-&gt;dev-&gt;MIDQ + JQS_wHead);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mpu-&gt;input_lock, flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_msndmidi_input_read);</div><div class='del'>-</div><div class='del'>-static struct snd_rawmidi_ops snd_msndmidi_input = {</div><div class='del'>-	.open =		snd_msndmidi_input_open,</div><div class='del'>-	.close =	snd_msndmidi_input_close,</div><div class='del'>-	.trigger =	snd_msndmidi_input_trigger,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void snd_msndmidi_free(struct snd_rawmidi *rmidi)</div><div class='del'>-{</div><div class='del'>-	struct snd_msndmidi *mpu = rmidi-&gt;private_data;</div><div class='del'>-	kfree(mpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_msndmidi_new(struct snd_card *card, int device)</div><div class='del'>-{</div><div class='del'>-	struct snd_msnd *chip = card-&gt;private_data;</div><div class='del'>-	struct snd_msndmidi *mpu;</div><div class='del'>-	struct snd_rawmidi *rmidi;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_rawmidi_new(card, "MSND-MIDI", device, 1, 1, &amp;rmidi);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);</div><div class='del'>-	if (mpu == NULL) {</div><div class='del'>-		snd_device_free(card, rmidi);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	mpu-&gt;dev = chip;</div><div class='del'>-	chip-&gt;msndmidi_mpu = mpu;</div><div class='del'>-	rmidi-&gt;private_data = mpu;</div><div class='del'>-	rmidi-&gt;private_free = snd_msndmidi_free;</div><div class='del'>-	spin_lock_init(&amp;mpu-&gt;input_lock);</div><div class='del'>-	strcpy(rmidi-&gt;name, "MSND MIDI");</div><div class='del'>-	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='del'>-			    &amp;snd_msndmidi_input);</div><div class='del'>-	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_INPUT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c<br/>index 91d6023a63e5..c4eec391cd29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd_pinnacle.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Linux multisound pinnacle/fiji driver for ALSA.</div><div class='hunk'>@@ -10,7 +11,6 @@</div><div class='ctx'>  *	support in alsa, i left all the MSND_CLASSIC tokens in this file.</div><div class='ctx'>  *	but for now this untested &amp; undone.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  * ripped from linux kernel 2.4.18 by Karsten Wiese.</div><div class='ctx'>  *</div><div class='ctx'>  * the following is a copy of the 2.4.18 OSS FREE file-heading comment:</div><div class='hunk'>@@ -30,20 +30,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1998 Andrew Veliath</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -73,17 +59,19 @@</div><div class='ctx'> #ifdef MSND_CLASSIC</div><div class='ctx'> #  include "msnd_classic.h"</div><div class='ctx'> #  define LOGNAME			"msnd_classic"</div><div class='add'>+#  define DEV_NAME			"msnd-classic"</div><div class='ctx'> #else</div><div class='ctx'> #  include "msnd_pinnacle.h"</div><div class='ctx'> #  define LOGNAME			"snd_msnd_pinnacle"</div><div class='add'>+#  define DEV_NAME			"msnd-pinnacle"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void __devinit set_default_audio_parameters(struct snd_msnd *chip)</div><div class='add'>+static void set_default_audio_parameters(struct snd_msnd *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;play_sample_size = DEFSAMPLESIZE;</div><div class='add'>+	chip-&gt;play_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);</div><div class='ctx'> 	chip-&gt;play_sample_rate = DEFSAMPLERATE;</div><div class='ctx'> 	chip-&gt;play_channels = DEFCHANNELS;</div><div class='del'>-	chip-&gt;capture_sample_size = DEFSAMPLESIZE;</div><div class='add'>+	chip-&gt;capture_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);</div><div class='ctx'> 	chip-&gt;capture_sample_rate = DEFSAMPLERATE;</div><div class='ctx'> 	chip-&gt;capture_channels = DEFCHANNELS;</div><div class='ctx'> }</div><div class='hunk'>@@ -93,11 +81,12 @@ static void snd_msnd_eval_dsp_msg(struct snd_msnd *chip, u16 wMessage)</div><div class='ctx'> 	switch (HIBYTE(wMessage)) {</div><div class='ctx'> 	case HIMT_PLAY_DONE: {</div><div class='ctx'> 		if (chip-&gt;banksPlayed &lt; 3)</div><div class='del'>-			snd_printdd("%08X: HIMT_PLAY_DONE: %i\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "%08X: HIMT_PLAY_DONE: %i\n",</div><div class='ctx'> 				(unsigned)jiffies, LOBYTE(wMessage));</div><div class='ctx'> </div><div class='ctx'> 		if (chip-&gt;last_playbank == LOBYTE(wMessage)) {</div><div class='del'>-			snd_printdd("chip.last_playbank == LOBYTE(wMessage)\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"chip.last_playbank == LOBYTE(wMessage)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		chip-&gt;banksPlayed++;</div><div class='hunk'>@@ -133,33 +122,29 @@ static void snd_msnd_eval_dsp_msg(struct snd_msnd *chip, u16 wMessage)</div><div class='ctx'> 		case HIDSP_PLAY_UNDER:</div><div class='ctx'> #endif</div><div class='ctx'> 		case HIDSP_INT_PLAY_UNDER:</div><div class='del'>-			snd_printd(KERN_WARNING LOGNAME ": Play underflow %i\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				LOGNAME ": Play underflow %i\n",</div><div class='ctx'> 				chip-&gt;banksPlayed);</div><div class='ctx'> 			if (chip-&gt;banksPlayed &gt; 2)</div><div class='ctx'> 				clear_bit(F_WRITING, &amp;chip-&gt;flags);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case HIDSP_INT_RECORD_OVER:</div><div class='del'>-			snd_printd(KERN_WARNING LOGNAME ": Record overflow\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, LOGNAME ": Record overflow\n");</div><div class='ctx'> 			clear_bit(F_READING, &amp;chip-&gt;flags);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			snd_printd(KERN_WARNING LOGNAME</div><div class='del'>-				   ": DSP message %d 0x%02x\n",</div><div class='del'>-				   LOBYTE(wMessage), LOBYTE(wMessage));</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, LOGNAME</div><div class='add'>+				": DSP message %d 0x%02x\n",</div><div class='add'>+				LOBYTE(wMessage), LOBYTE(wMessage));</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case HIMT_MIDI_IN_UCHAR:</div><div class='del'>-		if (chip-&gt;msndmidi_mpu)</div><div class='del'>-			snd_msndmidi_input_read(chip-&gt;msndmidi_mpu);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printd(KERN_WARNING LOGNAME ": HIMT message %d 0x%02x\n",</div><div class='del'>-			   HIBYTE(wMessage), HIBYTE(wMessage));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, LOGNAME ": HIMT message %d 0x%02x\n",</div><div class='add'>+			HIBYTE(wMessage), HIBYTE(wMessage));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -167,32 +152,34 @@ static void snd_msnd_eval_dsp_msg(struct snd_msnd *chip, u16 wMessage)</div><div class='ctx'> static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *chip = dev_id;</div><div class='del'>-	void *pwDSPQData = chip-&gt;mappedbase + DSPQ_DATA_BUFF;</div><div class='add'>+	void __iomem *pwDSPQData = chip-&gt;mappedbase + DSPQ_DATA_BUFF;</div><div class='add'>+	u16 head, tail, size;</div><div class='ctx'> </div><div class='ctx'> 	/* Send ack to DSP */</div><div class='ctx'> 	/* inb(chip-&gt;io + HP_RXL); */</div><div class='ctx'> </div><div class='ctx'> 	/* Evaluate queued DSP messages */</div><div class='del'>-	while (readw(chip-&gt;DSPQ + JQS_wTail) != readw(chip-&gt;DSPQ + JQS_wHead)) {</div><div class='del'>-		u16 wTmp;</div><div class='del'>-</div><div class='del'>-		snd_msnd_eval_dsp_msg(chip,</div><div class='del'>-			readw(pwDSPQData + 2 * readw(chip-&gt;DSPQ + JQS_wHead)));</div><div class='del'>-</div><div class='del'>-		wTmp = readw(chip-&gt;DSPQ + JQS_wHead) + 1;</div><div class='del'>-		if (wTmp &gt; readw(chip-&gt;DSPQ + JQS_wSize))</div><div class='del'>-			writew(0, chip-&gt;DSPQ + JQS_wHead);</div><div class='del'>-		else</div><div class='del'>-			writew(wTmp, chip-&gt;DSPQ + JQS_wHead);</div><div class='add'>+	head = readw(chip-&gt;DSPQ + JQS_wHead);</div><div class='add'>+	tail = readw(chip-&gt;DSPQ + JQS_wTail);</div><div class='add'>+	size = readw(chip-&gt;DSPQ + JQS_wSize);</div><div class='add'>+	if (head &gt; size || tail &gt; size)</div><div class='add'>+		goto out;</div><div class='add'>+	while (head != tail) {</div><div class='add'>+		snd_msnd_eval_dsp_msg(chip, readw(pwDSPQData + 2 * head));</div><div class='add'>+		if (++head &gt; size)</div><div class='add'>+			head = 0;</div><div class='add'>+		writew(head, chip-&gt;DSPQ + JQS_wHead);</div><div class='ctx'> 	}</div><div class='add'>+ out:</div><div class='ctx'> 	/* Send ack to DSP */</div><div class='ctx'> 	inb(chip-&gt;io + HP_RXL);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int snd_msnd_reset_dsp(long io, unsigned char *info)</div><div class='add'>+static int snd_msnd_reset_dsp(struct snd_msnd *chip, unsigned char *info)</div><div class='ctx'> {</div><div class='add'>+	long io = chip-&gt;io;</div><div class='ctx'> 	int timeout = 100;</div><div class='ctx'> </div><div class='ctx'> 	outb(HPDSPRESET_ON, io + HP_DSPR);</div><div class='hunk'>@@ -208,12 +195,12 @@ static int snd_msnd_reset_dsp(long io, unsigned char *info)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR LOGNAME ": Cannot reset DSP\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, LOGNAME ": Cannot reset DSP\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_probe(struct snd_card *card)</div><div class='add'>+static int snd_msnd_probe(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned char info;</div><div class='hunk'>@@ -224,19 +211,19 @@ static int __devinit snd_msnd_probe(struct snd_card *card)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(chip-&gt;io, DSP_NUMIO, "probing")) {</div><div class='del'>-		snd_printk(KERN_ERR LOGNAME ": I/O port conflict\n");</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": I/O port conflict\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (snd_msnd_reset_dsp(chip-&gt;io, &amp;info) &lt; 0) {</div><div class='add'>+	if (snd_msnd_reset_dsp(chip, &amp;info) &lt; 0) {</div><div class='ctx'> 		release_region(chip-&gt;io, DSP_NUMIO);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef MSND_CLASSIC</div><div class='del'>-	strcpy(card-&gt;shortname, "Classic/Tahiti/Monterey");</div><div class='del'>-	strcpy(card-&gt;longname, "Turtle Beach Multisound");</div><div class='del'>-	printk(KERN_INFO LOGNAME ": %s, "</div><div class='add'>+	strscpy(card-&gt;shortname, "Classic/Tahiti/Monterey");</div><div class='add'>+	strscpy(card-&gt;longname, "Turtle Beach Multisound");</div><div class='add'>+	dev_info(card-&gt;dev, LOGNAME ": %s, "</div><div class='ctx'> 	       "I/O 0x%lx-0x%lx, IRQ %d, memory mapped to 0x%lX-0x%lX\n",</div><div class='ctx'> 	       card-&gt;shortname,</div><div class='ctx'> 	       chip-&gt;io, chip-&gt;io + DSP_NUMIO - 1,</div><div class='hunk'>@@ -264,39 +251,39 @@ static int __devinit snd_msnd_probe(struct snd_card *card)</div><div class='ctx'> 	switch (info &amp; 0x7) {</div><div class='ctx'> 	case 0x0:</div><div class='ctx'> 		rev = "I";</div><div class='del'>-		strcpy(card-&gt;shortname, pin);</div><div class='add'>+		strscpy(card-&gt;shortname, pin);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x1:</div><div class='ctx'> 		rev = "F";</div><div class='del'>-		strcpy(card-&gt;shortname, pin);</div><div class='add'>+		strscpy(card-&gt;shortname, pin);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x2:</div><div class='ctx'> 		rev = "G";</div><div class='del'>-		strcpy(card-&gt;shortname, pin);</div><div class='add'>+		strscpy(card-&gt;shortname, pin);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x3:</div><div class='ctx'> 		rev = "H";</div><div class='del'>-		strcpy(card-&gt;shortname, pin);</div><div class='add'>+		strscpy(card-&gt;shortname, pin);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x4:</div><div class='ctx'> 		rev = "E";</div><div class='del'>-		strcpy(card-&gt;shortname, fiji);</div><div class='add'>+		strscpy(card-&gt;shortname, fiji);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x5:</div><div class='ctx'> 		rev = "C";</div><div class='del'>-		strcpy(card-&gt;shortname, fiji);</div><div class='add'>+		strscpy(card-&gt;shortname, fiji);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x6:</div><div class='ctx'> 		rev = "D";</div><div class='del'>-		strcpy(card-&gt;shortname, fiji);</div><div class='add'>+		strscpy(card-&gt;shortname, fiji);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x7:</div><div class='ctx'> 		rev = "A-B (Fiji) or A-E (Pinnacle)";</div><div class='del'>-		strcpy(card-&gt;shortname, pinfiji);</div><div class='add'>+		strscpy(card-&gt;shortname, pinfiji);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;longname, "Turtle Beach Multisound Pinnacle");</div><div class='del'>-	printk(KERN_INFO LOGNAME ": %s revision %s, Xilinx version %s, "</div><div class='add'>+	strscpy(card-&gt;longname, "Turtle Beach Multisound Pinnacle");</div><div class='add'>+	dev_info(card-&gt;dev, LOGNAME ": %s revision %s, Xilinx version %s, "</div><div class='ctx'> 	       "I/O 0x%lx-0x%lx, IRQ %d, memory mapped to 0x%lX-0x%lX\n",</div><div class='ctx'> 	       card-&gt;shortname,</div><div class='ctx'> 	       rev, xv,</div><div class='hunk'>@@ -313,7 +300,6 @@ static int snd_msnd_init_sma(struct snd_msnd *chip)</div><div class='ctx'> {</div><div class='ctx'> 	static int initted;</div><div class='ctx'> 	u16 mastVolLeft, mastVolRight;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> #ifdef MSND_CLASSIC</div><div class='ctx'> 	outb(chip-&gt;memid, chip-&gt;io + HP_MEMM);</div><div class='hunk'>@@ -330,11 +316,11 @@ static int snd_msnd_init_sma(struct snd_msnd *chip)</div><div class='ctx'> 	memset_io(chip-&gt;mappedbase, 0, 0x8000);</div><div class='ctx'> </div><div class='ctx'> 	/* Critical section: bank 1 access */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	outb(HPBLKSEL_1, chip-&gt;io + HP_BLKS);</div><div class='del'>-	memset_io(chip-&gt;mappedbase, 0, 0x8000);</div><div class='del'>-	outb(HPBLKSEL_0, chip-&gt;io + HP_BLKS);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;lock) {</div><div class='add'>+		outb(HPBLKSEL_1, chip-&gt;io + HP_BLKS);</div><div class='add'>+		memset_io(chip-&gt;mappedbase, 0, 0x8000);</div><div class='add'>+		outb(HPBLKSEL_0, chip-&gt;io + HP_BLKS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Digital audio play queue */</div><div class='ctx'> 	chip-&gt;DAPQ = chip-&gt;mappedbase + DAPQ_OFFSET;</div><div class='hunk'>@@ -388,22 +374,22 @@ static int upload_dsp_code(struct snd_card *card)</div><div class='ctx'> </div><div class='ctx'> 	err = request_firmware(&amp;init_fw, INITCODEFILE, card-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Error loading " INITCODEFILE);</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": Error loading " INITCODEFILE);</div><div class='ctx'> 		goto cleanup1;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = request_firmware(&amp;perm_fw, PERMCODEFILE, card-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Error loading " PERMCODEFILE);</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": Error loading " PERMCODEFILE);</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy_toio(chip-&gt;mappedbase, perm_fw-&gt;data, perm_fw-&gt;size);</div><div class='ctx'> 	if (snd_msnd_upload_host(chip, init_fw-&gt;data, init_fw-&gt;size) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n");</div><div class='add'>+		dev_warn(card-&gt;dev, LOGNAME ": Error uploading to DSP\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto cleanup;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n");</div><div class='add'>+	dev_info(card-&gt;dev, LOGNAME ": DSP firmware uploaded\n");</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> cleanup:</div><div class='hunk'>@@ -436,17 +422,17 @@ static int snd_msnd_initialize(struct snd_card *card)</div><div class='ctx'> #endif</div><div class='ctx'> 	err = snd_msnd_init_sma(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Cannot initialize SMA\n");</div><div class='add'>+		dev_warn(card-&gt;dev, LOGNAME ": Cannot initialize SMA\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_msnd_reset_dsp(chip-&gt;io, NULL);</div><div class='add'>+	err = snd_msnd_reset_dsp(chip, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = upload_dsp_code(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Cannot upload DSP code\n");</div><div class='add'>+		dev_warn(card-&gt;dev, LOGNAME ": Cannot upload DSP code\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -455,7 +441,7 @@ static int snd_msnd_initialize(struct snd_card *card)</div><div class='ctx'> 	while (readw(chip-&gt;mappedbase)) {</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 		if (!timeout--) {</div><div class='del'>-			snd_printd(KERN_ERR LOGNAME ": DSP reset timeout\n");</div><div class='add'>+			dev_err(card-&gt;dev, LOGNAME ": DSP reset timeout\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -477,17 +463,12 @@ static int snd_msnd_dsp_full_reset(struct snd_card *card)</div><div class='ctx'> </div><div class='ctx'> 	rv = snd_msnd_initialize(card);</div><div class='ctx'> 	if (rv)</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": DSP reset failed\n");</div><div class='add'>+		dev_warn(card-&gt;dev, LOGNAME ": DSP reset failed\n");</div><div class='ctx'> 	snd_msndmix_force_recsrc(chip, 0);</div><div class='ctx'> 	clear_bit(F_RESETTING, &amp;chip-&gt;flags);</div><div class='ctx'> 	return rv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_msnd_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("snd_msnd_chip_free()\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -497,9 +478,9 @@ static int snd_msnd_send_dsp_cmd_chk(struct snd_msnd *chip, u8 cmd)</div><div class='ctx'> 	return snd_msnd_send_dsp_cmd(chip, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate)</div><div class='add'>+static int snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd("snd_msnd_calibrate_adc(%i)\n", srate);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "snd_msnd_calibrate_adc(%i)\n", srate);</div><div class='ctx'> 	writew(srate, chip-&gt;SMA + SMA_wCalFreqAtoD);</div><div class='ctx'> 	if (chip-&gt;calibrate_signal == 0)</div><div class='ctx'> 		writew(readw(chip-&gt;SMA + SMA_wCurrHostStatusFlags)</div><div class='hunk'>@@ -512,7 +493,7 @@ static int __devinit snd_msnd_calibrate_adc(struct snd_msnd *chip, u16 srate)</div><div class='ctx'> 		schedule_timeout_interruptible(msecs_to_jiffies(333));</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_WARNING LOGNAME ": ADC calibration failed\n");</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, LOGNAME ": ADC calibration failed\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -535,61 +516,51 @@ static void snd_msnd_mpu401_close(struct snd_mpu401 *mpu)</div><div class='ctx'> static long mpu_io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='ctx'> static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_attach(struct snd_card *card)</div><div class='add'>+static int snd_msnd_attach(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =      snd_msnd_dev_free,</div><div class='del'>-		};</div><div class='ctx'> </div><div class='del'>-	err = request_irq(chip-&gt;irq, snd_msnd_interrupt, 0, card-&gt;shortname,</div><div class='del'>-			  chip);</div><div class='add'>+	err = devm_request_irq(card-&gt;dev, chip-&gt;irq, snd_msnd_interrupt, 0,</div><div class='add'>+			       card-&gt;shortname, chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", chip-&gt;irq);</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": Couldn't grab IRQ %d\n", chip-&gt;irq);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_region(chip-&gt;io, DSP_NUMIO, card-&gt;shortname) == NULL) {</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	if (!devm_request_region(card-&gt;dev, chip-&gt;io, DSP_NUMIO,</div><div class='add'>+				 card-&gt;shortname))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!request_mem_region(chip-&gt;base, BUFFSIZE, card-&gt;shortname)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME</div><div class='add'>+	if (!devm_request_mem_region(card-&gt;dev, chip-&gt;base, BUFFSIZE,</div><div class='add'>+				     card-&gt;shortname)) {</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME</div><div class='ctx'> 			": unable to grab memory region 0x%lx-0x%lx\n",</div><div class='ctx'> 			chip-&gt;base, chip-&gt;base + BUFFSIZE - 1);</div><div class='del'>-		release_region(chip-&gt;io, DSP_NUMIO);</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;mappedbase = ioremap_nocache(chip-&gt;base, 0x8000);</div><div class='add'>+	chip-&gt;mappedbase = devm_ioremap(card-&gt;dev, chip-&gt;base, 0x8000);</div><div class='ctx'> 	if (!chip-&gt;mappedbase) {</div><div class='del'>-		printk(KERN_ERR LOGNAME</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME</div><div class='ctx'> 			": unable to map memory region 0x%lx-0x%lx\n",</div><div class='ctx'> 			chip-&gt;base, chip-&gt;base + BUFFSIZE - 1);</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_release_region;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_msnd_dsp_full_reset(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_release_region;</div><div class='del'>-</div><div class='del'>-	/* Register device */</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err_release_region;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_msnd_pcm(card, 0, NULL);</div><div class='add'>+	err = snd_msnd_pcm(card, 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": error creating new PCM device\n");</div><div class='del'>-		goto err_release_region;</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": error creating new PCM device\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_msndmix_new(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": error creating new Mixer device\n");</div><div class='del'>-		goto err_release_region;</div><div class='add'>+		dev_err(card-&gt;dev, LOGNAME ": error creating new Mixer device\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -600,12 +571,12 @@ static int __devinit snd_msnd_attach(struct snd_card *card)</div><div class='ctx'> 					  mpu_io[0],</div><div class='ctx'> 					  MPU401_MODE_INPUT |</div><div class='ctx'> 					  MPU401_MODE_OUTPUT,</div><div class='del'>-					  mpu_irq[0], IRQF_DISABLED,</div><div class='add'>+					  mpu_irq[0],</div><div class='ctx'> 					  &amp;chip-&gt;rmidi);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR LOGNAME</div><div class='add'>+			dev_err(card-&gt;dev, LOGNAME</div><div class='ctx'> 				": error creating new Midi device\n");</div><div class='del'>-			goto err_release_region;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		mpu = chip-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='hunk'>@@ -620,132 +591,114 @@ static int __devinit snd_msnd_attach(struct snd_card *card)</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_release_region;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_release_region:</div><div class='del'>-	if (chip-&gt;mappedbase)</div><div class='del'>-		iounmap(chip-&gt;mappedbase);</div><div class='del'>-	release_mem_region(chip-&gt;base, BUFFSIZE);</div><div class='del'>-	release_region(chip-&gt;io, DSP_NUMIO);</div><div class='del'>-	free_irq(chip-&gt;irq, chip);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void __devexit snd_msnd_unload(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_msnd *chip = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	iounmap(chip-&gt;mappedbase);</div><div class='del'>-	release_mem_region(chip-&gt;base, BUFFSIZE);</div><div class='del'>-	release_region(chip-&gt;io, DSP_NUMIO);</div><div class='del'>-	free_irq(chip-&gt;irq, chip);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifndef MSND_CLASSIC</div><div class='ctx'> </div><div class='ctx'> /* Pinnacle/Fiji Logical Device Configuration */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg(int cfg, int reg, int value)</div><div class='add'>+static int snd_msnd_write_cfg(struct snd_msnd *chip, int cfg, int reg, int value)</div><div class='ctx'> {</div><div class='ctx'> 	outb(reg, cfg);</div><div class='ctx'> 	outb(value, cfg + 1);</div><div class='ctx'> 	if (value != inb(cfg + 1)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": snd_msnd_write_cfg: I/O error\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, LOGNAME ": %s: I/O error\n", __func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg_io0(int cfg, int num, u16 io)</div><div class='add'>+static int snd_msnd_write_cfg_io0(struct snd_msnd *chip, int cfg, int num, u16 io)</div><div class='ctx'> {</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IO0_BASEHI, HIBYTE(io)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IO0_BASEHI, HIBYTE(io)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IO0_BASELO, LOBYTE(io)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IO0_BASELO, LOBYTE(io)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg_io1(int cfg, int num, u16 io)</div><div class='add'>+static int snd_msnd_write_cfg_io1(struct snd_msnd *chip, int cfg, int num, u16 io)</div><div class='ctx'> {</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IO1_BASEHI, HIBYTE(io)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IO1_BASEHI, HIBYTE(io)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IO1_BASELO, LOBYTE(io)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IO1_BASELO, LOBYTE(io)))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg_irq(int cfg, int num, u16 irq)</div><div class='add'>+static int snd_msnd_write_cfg_irq(struct snd_msnd *chip, int cfg, int num, u16 irq)</div><div class='ctx'> {</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IRQ_NUMBER, LOBYTE(irq)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IRQ_NUMBER, LOBYTE(irq)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_IRQ_TYPE, IRQTYPE_EDGE))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_IRQ_TYPE, IRQTYPE_EDGE))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg_mem(int cfg, int num, int mem)</div><div class='add'>+static int snd_msnd_write_cfg_mem(struct snd_msnd *chip, int cfg, int num, int mem)</div><div class='ctx'> {</div><div class='ctx'> 	u16 wmem;</div><div class='ctx'> </div><div class='ctx'> 	mem &gt;&gt;= 8;</div><div class='ctx'> 	wmem = (u16)(mem &amp; 0xfff);</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_MEMBASEHI, HIBYTE(wmem)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_MEMBASEHI, HIBYTE(wmem)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_MEMBASELO, LOBYTE(wmem)))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_MEMBASELO, LOBYTE(wmem)))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (wmem &amp;&amp; snd_msnd_write_cfg(cfg, IREG_MEMCONTROL,</div><div class='add'>+	if (wmem &amp;&amp; snd_msnd_write_cfg(chip, cfg, IREG_MEMCONTROL,</div><div class='ctx'> 				       MEMTYPE_HIADDR | MEMTYPE_16BIT))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_activate_logical(int cfg, int num)</div><div class='add'>+static int snd_msnd_activate_logical(struct snd_msnd *chip, int cfg, int num)</div><div class='ctx'> {</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_ACTIVATE, LD_ACTIVATE))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_ACTIVATE, LD_ACTIVATE))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_write_cfg_logical(int cfg, int num, u16 io0,</div><div class='del'>-						u16 io1, u16 irq, int mem)</div><div class='add'>+static int snd_msnd_write_cfg_logical(struct snd_msnd *chip,</div><div class='add'>+				      int cfg, int num, u16 io0,</div><div class='add'>+				      u16 io1, u16 irq, int mem)</div><div class='ctx'> {</div><div class='del'>-	if (snd_msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='add'>+	if (snd_msnd_write_cfg(chip, cfg, IREG_LOGDEVICE, num))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg_io0(cfg, num, io0))</div><div class='add'>+	if (snd_msnd_write_cfg_io0(chip, cfg, num, io0))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg_io1(cfg, num, io1))</div><div class='add'>+	if (snd_msnd_write_cfg_io1(chip, cfg, num, io1))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg_irq(cfg, num, irq))</div><div class='add'>+	if (snd_msnd_write_cfg_irq(chip, cfg, num, irq))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_write_cfg_mem(cfg, num, mem))</div><div class='add'>+	if (snd_msnd_write_cfg_mem(chip, cfg, num, mem))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	if (snd_msnd_activate_logical(cfg, num))</div><div class='add'>+	if (snd_msnd_activate_logical(chip, cfg, num))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_pinnacle_cfg_reset(int cfg)</div><div class='add'>+static int snd_msnd_pinnacle_cfg_reset(struct snd_msnd *chip, int cfg)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset devices if told to */</div><div class='del'>-	printk(KERN_INFO LOGNAME ": Resetting all devices\n");</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev, LOGNAME ": Resetting all devices\n");</div><div class='ctx'> 	for (i = 0; i &lt; 4; ++i)</div><div class='del'>-		if (snd_msnd_write_cfg_logical(cfg, i, 0, 0, 0, 0))</div><div class='add'>+		if (snd_msnd_write_cfg_logical(chip, cfg, i, 0, 0, 0, 0))</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -755,9 +708,9 @@ static int __devinit snd_msnd_pinnacle_cfg_reset(int cfg)</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='ctx'> </div><div class='del'>-module_param_array(index, int, NULL, S_IRUGO);</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for msnd_pinnacle soundcard.");</div><div class='del'>-module_param_array(id, charp, NULL, S_IRUGO);</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for msnd_pinnacle soundcard.");</div><div class='ctx'> </div><div class='ctx'> static long io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='hunk'>@@ -785,7 +738,7 @@ static int write_ndelay[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 1 };</div><div class='ctx'> static int calibrate_signal;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");</div><div class='ctx'> #define has_isapnp(x) isapnp[x]</div><div class='hunk'>@@ -799,32 +752,32 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_FIRMWARE(INITCODEFILE);</div><div class='ctx'> MODULE_FIRMWARE(PERMCODEFILE);</div><div class='ctx'> </div><div class='del'>-module_param_array(io, long, NULL, S_IRUGO);</div><div class='add'>+module_param_hw_array(io, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(io, "IO port #");</div><div class='del'>-module_param_array(irq, int, NULL, S_IRUGO);</div><div class='del'>-module_param_array(mem, long, NULL, S_IRUGO);</div><div class='del'>-module_param_array(write_ndelay, int, NULL, S_IRUGO);</div><div class='del'>-module_param(calibrate_signal, int, S_IRUGO);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='add'>+module_param_hw_array(mem, long, iomem, NULL, 0444);</div><div class='add'>+module_param_array(write_ndelay, int, NULL, 0444);</div><div class='add'>+module_param(calibrate_signal, int, 0444);</div><div class='ctx'> #ifndef MSND_CLASSIC</div><div class='del'>-module_param_array(digital, int, NULL, S_IRUGO);</div><div class='del'>-module_param_array(cfg, long, NULL, S_IRUGO);</div><div class='del'>-module_param_array(reset, int, 0, S_IRUGO);</div><div class='del'>-module_param_array(mpu_io, long, NULL, S_IRUGO);</div><div class='del'>-module_param_array(mpu_irq, int, NULL, S_IRUGO);</div><div class='del'>-module_param_array(ide_io0, long, NULL, S_IRUGO);</div><div class='del'>-module_param_array(ide_io1, long, NULL, S_IRUGO);</div><div class='del'>-module_param_array(ide_irq, int, NULL, S_IRUGO);</div><div class='del'>-module_param_array(joystick_io, long, NULL, S_IRUGO);</div><div class='add'>+module_param_array(digital, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(cfg, long, ioport, NULL, 0444);</div><div class='add'>+module_param_array(reset, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_io, long, ioport, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='add'>+module_param_hw_array(ide_io0, long, ioport, NULL, 0444);</div><div class='add'>+module_param_hw_array(ide_io1, long, ioport, NULL, 0444);</div><div class='add'>+module_param_hw_array(ide_irq, int, irq, NULL, 0444);</div><div class='add'>+module_param_hw_array(joystick_io, long, ioport, NULL, 0444);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='add'>+static int snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> {</div><div class='ctx'> 	if (io[i] == SNDRV_AUTO_PORT)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (irq[i] == SNDRV_AUTO_PORT || mem[i] == SNDRV_AUTO_PORT) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": io, irq and mem must be set\n");</div><div class='add'>+		dev_warn(pdev, LOGNAME ": io, irq and mem must be set\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -837,14 +790,14 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> 	      io[i] == 0x220 ||</div><div class='ctx'> 	      io[i] == 0x210 ||</div><div class='ctx'> 	      io[i] == 0x3e0)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": \"io\" - DSP I/O base must be set "</div><div class='add'>+		dev_err(pdev, LOGNAME ": \"io\" - DSP I/O base must be set "</div><div class='ctx'> 			" to 0x210, 0x220, 0x230, 0x240, 0x250, 0x260, 0x290, "</div><div class='ctx'> 			"or 0x3E0\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	if (io[i] &lt; 0x100 || io[i] &gt; 0x3e0 || (io[i] % 0x10) != 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME</div><div class='add'>+		dev_err(pdev, LOGNAME</div><div class='ctx'> 			": \"io\" - DSP I/O base must within the range 0x100 "</div><div class='ctx'> 			"to 0x3E0 and must be evenly divisible by 0x10\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -857,7 +810,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> 	      irq[i] == 10 ||</div><div class='ctx'> 	      irq[i] == 11 ||</div><div class='ctx'> 	      irq[i] == 12)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME</div><div class='add'>+		dev_err(pdev, LOGNAME</div><div class='ctx'> 			": \"irq\" - must be set to 5, 7, 9, 10, 11 or 12\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -868,7 +821,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> 	      mem[i] == 0xd8000 ||</div><div class='ctx'> 	      mem[i] == 0xe0000 ||</div><div class='ctx'> 	      mem[i] == 0xe8000)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": \"mem\" - must be set to "</div><div class='add'>+		dev_err(pdev, LOGNAME ": \"mem\" - must be set to "</div><div class='ctx'> 		       "0xb0000, 0xc8000, 0xd0000, 0xd8000, 0xe0000 or "</div><div class='ctx'> 		       "0xe8000\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -876,9 +829,9 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> </div><div class='ctx'> #ifndef MSND_CLASSIC</div><div class='ctx'> 	if (cfg[i] == SNDRV_AUTO_PORT) {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");</div><div class='add'>+		dev_info(pdev, LOGNAME ": Assuming PnP mode\n");</div><div class='ctx'> 	} else if (cfg[i] != 0x250 &amp;&amp; cfg[i] != 0x260 &amp;&amp; cfg[i] != 0x270) {</div><div class='del'>-		printk(KERN_INFO LOGNAME</div><div class='add'>+		dev_info(pdev, LOGNAME</div><div class='ctx'> 			": Config port must be 0x250, 0x260 or 0x270 "</div><div class='ctx'> 			"(or unspecified for PnP mode)\n");</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -888,7 +841,7 @@ static int __devinit snd_msnd_isa_match(struct device *pdev, unsigned int i)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)</div><div class='add'>+static int snd_msnd_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -899,16 +852,15 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> 	    || cfg[idx] == SNDRV_AUTO_PORT</div><div class='ctx'> #endif</div><div class='ctx'> 	    ) {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");</div><div class='add'>+		dev_info(pdev, LOGNAME ": Assuming PnP mode\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[idx], id[idx], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_msnd), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[idx], id[idx], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_msnd), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='ctx'> 	chip = card-&gt;private_data;</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> </div><div class='hunk'>@@ -943,73 +895,70 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> 		chip-&gt;memid = HPMEM_E800; break;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='del'>-	printk(KERN_INFO LOGNAME ": Non-PnP mode: configuring at port 0x%lx\n",</div><div class='del'>-			cfg[idx]);</div><div class='add'>+	dev_info(pdev, LOGNAME ": Non-PnP mode: configuring at port 0x%lx\n",</div><div class='add'>+		 cfg[idx]);</div><div class='ctx'> </div><div class='del'>-	if (!request_region(cfg[idx], 2, "Pinnacle/Fiji Config")) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Config port 0x%lx conflict\n",</div><div class='del'>-			   cfg[idx]);</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (!devm_request_region(card-&gt;dev, cfg[idx], 2,</div><div class='add'>+				 "Pinnacle/Fiji Config")) {</div><div class='add'>+		dev_err(pdev, LOGNAME ": Config port 0x%lx conflict\n",</div><div class='add'>+			cfg[idx]);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (reset[idx])</div><div class='del'>-		if (snd_msnd_pinnacle_cfg_reset(cfg[idx])) {</div><div class='del'>-			err = -EIO;</div><div class='del'>-			goto cfg_error;</div><div class='del'>-		}</div><div class='add'>+		if (snd_msnd_pinnacle_cfg_reset(chip, cfg[idx]))</div><div class='add'>+			return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	/* DSP */</div><div class='del'>-	err = snd_msnd_write_cfg_logical(cfg[idx], 0,</div><div class='add'>+	err = snd_msnd_write_cfg_logical(chip, cfg[idx], 0,</div><div class='ctx'> 					 io[idx], 0,</div><div class='ctx'> 					 irq[idx], mem[idx]);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		goto cfg_error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* The following are Pinnacle specific */</div><div class='ctx'> </div><div class='ctx'> 	/* MPU */</div><div class='ctx'> 	if (mpu_io[idx] != SNDRV_AUTO_PORT</div><div class='ctx'> 	    &amp;&amp; mpu_irq[idx] != SNDRV_AUTO_IRQ) {</div><div class='del'>-		printk(KERN_INFO LOGNAME</div><div class='add'>+		dev_info(pdev, LOGNAME</div><div class='ctx'> 		       ": Configuring MPU to I/O 0x%lx IRQ %d\n",</div><div class='ctx'> 		       mpu_io[idx], mpu_irq[idx]);</div><div class='del'>-		err = snd_msnd_write_cfg_logical(cfg[idx], 1,</div><div class='add'>+		err = snd_msnd_write_cfg_logical(chip, cfg[idx], 1,</div><div class='ctx'> 						 mpu_io[idx], 0,</div><div class='ctx'> 						 mpu_irq[idx], 0);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='del'>-			goto cfg_error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* IDE */</div><div class='ctx'> 	if (ide_io0[idx] != SNDRV_AUTO_PORT</div><div class='ctx'> 	    &amp;&amp; ide_io1[idx] != SNDRV_AUTO_PORT</div><div class='ctx'> 	    &amp;&amp; ide_irq[idx] != SNDRV_AUTO_IRQ) {</div><div class='del'>-		printk(KERN_INFO LOGNAME</div><div class='add'>+		dev_info(pdev, LOGNAME</div><div class='ctx'> 		       ": Configuring IDE to I/O 0x%lx, 0x%lx IRQ %d\n",</div><div class='ctx'> 		       ide_io0[idx], ide_io1[idx], ide_irq[idx]);</div><div class='del'>-		err = snd_msnd_write_cfg_logical(cfg[idx], 2,</div><div class='add'>+		err = snd_msnd_write_cfg_logical(chip, cfg[idx], 2,</div><div class='ctx'> 						 ide_io0[idx], ide_io1[idx],</div><div class='ctx'> 						 ide_irq[idx], 0);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='del'>-			goto cfg_error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Joystick */</div><div class='ctx'> 	if (joystick_io[idx] != SNDRV_AUTO_PORT) {</div><div class='del'>-		printk(KERN_INFO LOGNAME</div><div class='add'>+		dev_info(pdev, LOGNAME</div><div class='ctx'> 		       ": Configuring joystick to I/O 0x%lx\n",</div><div class='ctx'> 		       joystick_io[idx]);</div><div class='del'>-		err = snd_msnd_write_cfg_logical(cfg[idx], 3,</div><div class='add'>+		err = snd_msnd_write_cfg_logical(chip, cfg[idx], 3,</div><div class='ctx'> 						 joystick_io[idx], 0,</div><div class='ctx'> 						 0, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='del'>-			goto cfg_error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	release_region(cfg[idx], 2);</div><div class='ctx'> </div><div class='ctx'> #endif /* MSND_CLASSIC */</div><div class='ctx'> </div><div class='hunk'>@@ -1038,42 +987,23 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='ctx'> 	err = snd_msnd_probe(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Probe failed\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		dev_err(pdev, LOGNAME ": Probe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_msnd_attach(card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Attach failed\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		dev_err(pdev, LOGNAME ": Attach failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-cfg_error:</div><div class='del'>-	release_region(cfg[idx], 2);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_msnd_isa_remove(struct device *pdev, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_msnd_unload(dev_get_drvdata(pdev));</div><div class='del'>-	dev_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DEV_NAME "msnd-pinnacle"</div><div class='del'>-</div><div class='ctx'> static struct isa_driver snd_msnd_driver = {</div><div class='ctx'> 	.match		= snd_msnd_isa_match,</div><div class='ctx'> 	.probe		= snd_msnd_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_msnd_isa_remove),</div><div class='ctx'> 	/* FIXME: suspend, resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='hunk'>@@ -1081,8 +1011,8 @@ static struct isa_driver snd_msnd_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					 const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_msnd_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+			       const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int idx;</div><div class='ctx'> 	struct pnp_dev *pnp_dev;</div><div class='hunk'>@@ -1110,12 +1040,12 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	if (!pnp_is_active(pnp_dev) &amp;&amp; pnp_activate_dev(pnp_dev) &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "msnd_pinnacle: device is inactive\n");</div><div class='add'>+		dev_info(&amp;pcard-&gt;card-&gt;dev, "msnd_pinnacle: device is inactive\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pnp_is_active(mpu_dev) &amp;&amp; pnp_activate_dev(mpu_dev) &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "msnd_pinnacle: MPU device is inactive\n");</div><div class='add'>+		dev_info(&amp;pcard-&gt;card-&gt;dev, "msnd_pinnacle: MPU device is inactive\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1123,14 +1053,14 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	 * Create a new ALSA sound card entry, in anticipation</div><div class='ctx'> 	 * of detecting our hardware ...</div><div class='ctx'> 	 */</div><div class='del'>-	ret = snd_card_create(index[idx], id[idx], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_msnd), &amp;card);</div><div class='add'>+	ret = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				index[idx], id[idx], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_msnd), &amp;card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	chip = card-&gt;private_data;</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Read the correct parameters off the ISA PnP bus ...</div><div class='hunk'>@@ -1166,35 +1096,25 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='ctx'> 	ret = snd_msnd_probe(card);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Probe failed\n");</div><div class='del'>-		goto _release_card;</div><div class='add'>+		dev_err(&amp;pcard-&gt;card-&gt;dev, LOGNAME ": Probe failed\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_msnd_attach(card);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Attach failed\n");</div><div class='del'>-		goto _release_card;</div><div class='add'>+		dev_err(&amp;pcard-&gt;card-&gt;dev, LOGNAME ": Attach failed\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	++idx;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-_release_card:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit snd_msnd_pnp_remove(struct pnp_card_link *pcard)</div><div class='del'>-{</div><div class='del'>-	snd_msnd_unload(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int isa_registered;</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id msnd_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id msnd_pnpids[] = {</div><div class='ctx'> 	/* Pinnacle PnP */</div><div class='ctx'> 	{ .id = "BVJ0440", .devs = { { "TBS0000" }, { "TBS0001" } } },</div><div class='ctx'> 	{ .id = "" }	/* end */</div><div class='hunk'>@@ -1207,7 +1127,6 @@ static struct pnp_card_driver msnd_pnpc_driver = {</div><div class='ctx'> 	.name = "msnd_pinnacle",</div><div class='ctx'> 	.id_table = msnd_pnpids,</div><div class='ctx'> 	.probe = snd_msnd_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_msnd_pnp_remove),</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/msnd/msnd_pinnacle.h b/sound/isa/msnd/msnd_pinnacle.h<br/>index 48318d1ee340..c928d8492ef2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd_pinnacle.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*********************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * msnd_pinnacle.h</div><div class='hunk'>@@ -10,20 +11,6 @@</div><div class='ctx'>  * Copyright (C) 1998 Andrew Veliath</div><div class='ctx'>  * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  ********************************************************************/</div><div class='ctx'> #ifndef __MSND_PINNACLE_H</div><div class='ctx'> #define __MSND_PINNACLE_H</div><div class='head'>diff --git a/sound/isa/msnd/msnd_pinnacle_mixer.c b/sound/isa/msnd/msnd_pinnacle_mixer.c<br/>index 494058a1a502..ec354483b9f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/msnd/msnd_pinnacle_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/msnd/msnd_pinnacle_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/msnd/msnd_pinnacle_mixer.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /***************************************************************************</div><div class='ctx'> 			  msnd_pinnacle_mixer.c  -  description</div><div class='ctx'> 			     -------------------</div><div class='hunk'>@@ -8,14 +9,11 @@</div><div class='ctx'> </div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *							      		   *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify  *</div><div class='del'>- *   it under the terms of the GNU General Public License as published by  *</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or     *</div><div class='del'>- *   (at your option) any later version.				   *</div><div class='ctx'>  *									   *</div><div class='ctx'>  ***************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -54,20 +52,13 @@</div><div class='ctx'> static int snd_msndmix_info_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Analog", "MASS", "SPDIF",</div><div class='ctx'> 	};</div><div class='ctx'> 	struct snd_msnd *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned items = test_bit(F_HAVEDIGITAL, &amp;chip-&gt;flags) ? 3 : 2;</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = items;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, items, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_msndmix_get_mux(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -145,14 +136,12 @@ static int snd_msndmix_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *msnd = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int addr = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;msnd-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;msnd-&gt;mixer_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = msnd-&gt;left_levels[addr] * 100;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] /= 0xFFFF;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = msnd-&gt;right_levels[addr] * 100;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] /= 0xFFFF;</div><div class='del'>-	spin_unlock_irqrestore(&amp;msnd-&gt;mixer_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,11 +217,9 @@ static int snd_msndmix_set(struct snd_msnd *dev, int d, int left, int right)</div><div class='ctx'> 	case MSND_MIXER_VOLUME:		/* master volume */</div><div class='ctx'> 		writew(wLeft, dev-&gt;SMA + SMA_wCurrMastVolLeft);</div><div class='ctx'> 		writew(wRight, dev-&gt;SMA + SMA_wCurrMastVolRight);</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case MSND_MIXER_AUX:			/* aux pot control */</div><div class='ctx'> 		/* scaled by master volume */</div><div class='del'>-		/* fall through */</div><div class='ctx'> </div><div class='ctx'> 		/* digital controls */</div><div class='ctx'> 	case MSND_MIXER_SYNTH:			/* synth vol (dsp mix) */</div><div class='hunk'>@@ -264,15 +251,13 @@ static int snd_msndmix_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_msnd *msnd = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int change, addr = kcontrol-&gt;private_value;</div><div class='ctx'> 	int left, right;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	left = ucontrol-&gt;value.integer.value[0] % 101;</div><div class='ctx'> 	right = ucontrol-&gt;value.integer.value[1] % 101;</div><div class='del'>-	spin_lock_irqsave(&amp;msnd-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;msnd-&gt;mixer_lock);</div><div class='ctx'> 	change = msnd-&gt;left_levels[addr] != left</div><div class='ctx'> 		|| msnd-&gt;right_levels[addr] != right;</div><div class='ctx'> 	snd_msndmix_set(msnd, addr, left, right);</div><div class='del'>-	spin_unlock_irqrestore(&amp;msnd-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +269,7 @@ static int snd_msndmix_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>   .private_value = addr }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_msnd_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_msnd_controls[] = {</div><div class='ctx'> DUMMY_VOLUME("Master Volume", 0, MSND_MIXER_VOLUME),</div><div class='ctx'> DUMMY_VOLUME("PCM Volume", 0, MSND_MIXER_PCM),</div><div class='ctx'> DUMMY_VOLUME("Aux Volume", 0, MSND_MIXER_AUX),</div><div class='hunk'>@@ -301,7 +286,7 @@ DUMMY_VOLUME("Monitor",	0, MSND_MIXER_IMIX),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __devinit snd_msndmix_new(struct snd_card *card)</div><div class='add'>+int snd_msndmix_new(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_msnd *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned int idx;</div><div class='hunk'>@@ -310,13 +295,14 @@ int __devinit snd_msndmix_new(struct snd_card *card)</div><div class='ctx'> 	if (snd_BUG_ON(!chip))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;mixer_lock);</div><div class='del'>-	strcpy(card-&gt;mixername, "MSND Pinnacle Mixer");</div><div class='add'>+	strscpy(card-&gt;mixername, "MSND Pinnacle Mixer");</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; ARRAY_SIZE(snd_msnd_controls); idx++)</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(snd_msnd_controls); idx++) {</div><div class='ctx'> 		err = snd_ctl_add(card,</div><div class='ctx'> 				  snd_ctl_new1(snd_msnd_controls + idx, chip));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c<br/>index 265abcce9dba..8c1767697b62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/opl3sa2.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opl3sa2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/opl3sa2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/opl3sa2.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Yamaha OPL3-SA[2,3] soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -25,7 +10,8 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='hunk'>@@ -33,22 +19,15 @@</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Yamaha OPL3SA2+");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF719E-S},"</div><div class='del'>-		"{Genius,Sound Maker 3DX},"</div><div class='del'>-		"{Yamaha,OPL3SA3},"</div><div class='del'>-		"{Intel,AL440LX sound},"</div><div class='del'>-	        "{NeoMagic,MagicWave 3DX}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0xf86,0x370,0x100 */</div><div class='ctx'> static long sb_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260 */</div><div class='hunk'>@@ -70,21 +49,21 @@ MODULE_PARM_DESC(enable, "Enable OPL3-SA soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for OPL3-SA driver.");</div><div class='del'>-module_param_array(sb_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(sb_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(sb_port, "SB port # for OPL3-SA driver.");</div><div class='del'>-module_param_array(wss_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(wss_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wss_port, "WSS port # for OPL3-SA driver.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for OPL3-SA driver.");</div><div class='del'>-module_param_array(midi_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(midi_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(midi_port, "MIDI port # for OPL3-SA driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for OPL3-SA driver.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for OPL3-SA driver.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for OPL3-SA driver.");</div><div class='ctx'> module_param_array(opl3sa3_ymode, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(opl3sa3_ymode, "Speaker size selection for 3D Enhancement mode: Desktop/Large Notebook/Small Notebook/HiFi.");</div><div class='hunk'>@@ -129,6 +108,7 @@ struct snd_opl3sa2 {</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int single_dma;</div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	struct snd_hwdep *synth;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct snd_wss *wss;</div><div class='hunk'>@@ -142,7 +122,7 @@ struct snd_opl3sa2 {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static struct pnp_device_id snd_opl3sa2_pnpbiosids[] = {</div><div class='add'>+static const struct pnp_device_id snd_opl3sa2_pnpbiosids[] = {</div><div class='ctx'> 	{ .id = "YMH0021" },</div><div class='ctx'> 	{ .id = "NMX2210" },	/* Gateway Solo 2500 */</div><div class='ctx'> 	{ .id = "" }		/* end */</div><div class='hunk'>@@ -150,7 +130,7 @@ static struct pnp_device_id snd_opl3sa2_pnpbiosids[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pnp, snd_opl3sa2_pnpbiosids);</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_opl3sa2_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_opl3sa2_pnpids[] = {</div><div class='ctx'> 	/* Yamaha YMF719E-S (Genius Sound Maker 3DX) */</div><div class='ctx'> 	{ .id = "YMH0020", .devs = { { "YMH0021" } } },</div><div class='ctx'> 	/* Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard) */</div><div class='hunk'>@@ -178,12 +158,12 @@ static unsigned char __snd_opl3sa2_read(struct snd_opl3sa2 *chip, unsigned char</div><div class='ctx'> 	unsigned char result;</div><div class='ctx'> #if 0</div><div class='ctx'> 	outb(0x1d, port);	/* password */</div><div class='del'>-	printk(KERN_DEBUG "read [0x%lx] = 0x%x\n", port, inb(port));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "read [0x%lx] = 0x%x\n", port, inb(port));</div><div class='ctx'> #endif</div><div class='ctx'> 	outb(reg, chip-&gt;port);	/* register */</div><div class='ctx'> 	result = inb(chip-&gt;port + 1);</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "read [0x%lx] = 0x%x [0x%x]\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "read [0x%lx] = 0x%x [0x%x]\n",</div><div class='ctx'> 	       port, result, inb(port));</div><div class='ctx'> #endif</div><div class='ctx'> 	return result;</div><div class='hunk'>@@ -192,13 +172,8 @@ static unsigned char __snd_opl3sa2_read(struct snd_opl3sa2 *chip, unsigned char</div><div class='ctx'> /* read control port (with spinlock) */</div><div class='ctx'> static unsigned char snd_opl3sa2_read(struct snd_opl3sa2 *chip, unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char result;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	result = __snd_opl3sa2_read(chip, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return result;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	return __snd_opl3sa2_read(chip, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* write control port (w/o spinlock) */</div><div class='hunk'>@@ -215,13 +190,11 @@ static void __snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, uns</div><div class='ctx'> /* write control port (with spinlock) */</div><div class='ctx'> static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsigned char value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	__snd_opl3sa2_write(chip, reg, value);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_detect(struct snd_card *card)</div><div class='add'>+static int snd_opl3sa2_detect(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned long port;</div><div class='hunk'>@@ -229,18 +202,16 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)</div><div class='ctx'> 	char str[2];</div><div class='ctx'> </div><div class='ctx'> 	port = chip-&gt;port;</div><div class='del'>-	if ((chip-&gt;res_port = request_region(port, 2, "OPL3-SA control")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "can't grab port 0x%lx\n", port);</div><div class='add'>+	chip-&gt;res_port = devm_request_region(card-&gt;dev, port, 2,</div><div class='add'>+					     "OPL3-SA control");</div><div class='add'>+	if (!chip-&gt;res_port) {</div><div class='add'>+		dev_err(card-&gt;dev, "can't grab port 0x%lx\n", port);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "REG 0A = 0x%x\n",</div><div class='del'>-		   snd_opl3sa2_read(chip, 0x0a));</div><div class='del'>-	*/</div><div class='ctx'> 	chip-&gt;version = 0;</div><div class='ctx'> 	tmp = snd_opl3sa2_read(chip, OPL3SA2_MISC);</div><div class='ctx'> 	if (tmp == 0xff) {</div><div class='del'>-		snd_printd("OPL3-SA [0x%lx] detect = 0x%x\n", port, tmp);</div><div class='add'>+		dev_dbg(card-&gt;dev, "OPL3-SA [0x%lx] detect = 0x%x\n", port, tmp);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	switch (tmp &amp; 0x07) {</div><div class='hunk'>@@ -260,15 +231,17 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card)</div><div class='ctx'> 	str[1] = 0;</div><div class='ctx'> 	strcat(card-&gt;shortname, str);</div><div class='ctx'> 	snd_opl3sa2_write(chip, OPL3SA2_MISC, tmp ^ 7);</div><div class='del'>-	if ((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MISC)) != tmp) {</div><div class='del'>-		snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1);</div><div class='add'>+	tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MISC);</div><div class='add'>+	if (tmp1 != tmp) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	/* try if the MIC register is accesible */</div><div class='add'>+	/* try if the MIC register is accessible */</div><div class='ctx'> 	tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC);</div><div class='ctx'> 	snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a);</div><div class='del'>-	if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) &amp; 0x9f) != 0x8a) {</div><div class='del'>-		snd_printd("OPL3-SA [0x%lx] detect (2) = 0x%x (0x%x)\n", port, tmp, tmp1);</div><div class='add'>+	tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC);</div><div class='add'>+	if ((tmp1 &amp; 0x9f) != 0x8a) {</div><div class='add'>+		dev_dbg(card-&gt;dev, "OPL3-SA [0x%lx] detect (2) = 0x%x (0x%x)\n", port, tmp, tmp1);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x9f);</div><div class='hunk'>@@ -356,15 +329,13 @@ static irqreturn_t snd_opl3sa2_interrupt(int irq, void *dev_id)</div><div class='ctx'> static int snd_opl3sa2_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;ctlregs[reg] &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -373,7 +344,6 @@ static int snd_opl3sa2_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_opl3sa2_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -385,12 +355,11 @@ static int snd_opl3sa2_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	oval = chip-&gt;ctlregs[reg];</div><div class='ctx'> 	val = (oval &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != oval;</div><div class='ctx'> 	__snd_opl3sa2_write(chip, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,7 +380,6 @@ static int snd_opl3sa2_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_opl3sa2_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -419,10 +387,9 @@ static int snd_opl3sa2_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;ctlregs[left_reg] &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (chip-&gt;ctlregs[right_reg] &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='hunk'>@@ -433,7 +400,6 @@ static int snd_opl3sa2_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_opl3sa2_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -451,7 +417,7 @@ static int snd_opl3sa2_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (left_reg != right_reg) {</div><div class='ctx'> 		oval1 = chip-&gt;ctlregs[left_reg];</div><div class='ctx'> 		oval2 = chip-&gt;ctlregs[right_reg];</div><div class='hunk'>@@ -466,14 +432,13 @@ static int snd_opl3sa2_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 		change = val1 != oval1;</div><div class='ctx'> 		__snd_opl3sa2_write(chip, left_reg, val1);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_master, -3000, 200, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_opl3sa2_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_opl3sa2_controls[] = {</div><div class='ctx'> OPL3SA2_DOUBLE("Master Playback Switch", 0, 0x07, 0x08, 7, 7, 1, 1),</div><div class='ctx'> OPL3SA2_DOUBLE_TLV("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1,</div><div class='ctx'> 		   db_scale_master),</div><div class='hunk'>@@ -483,7 +448,7 @@ OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1,</div><div class='ctx'> OPL3SA2_SINGLE("ZV Port Switch", 0, 0x02, 0, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {</div><div class='ctx'> OPL3SA2_DOUBLE("3D Control - Wide", 0, 0x14, 0x14, 4, 0, 7, 0),</div><div class='ctx'> OPL3SA2_DOUBLE("Tone Control - Bass", 0, 0x15, 0x15, 4, 0, 7, 0),</div><div class='ctx'> OPL3SA2_DOUBLE("Tone Control - Treble", 0, 0x16, 0x16, 4, 0, 7, 0)</div><div class='hunk'>@@ -496,7 +461,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol)</div><div class='ctx'> 	chip-&gt;master_volume = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_mixer(struct snd_card *card)</div><div class='add'>+static int snd_opl3sa2_mixer(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_opl3sa2 *chip = card-&gt;private_data;</div><div class='ctx'> 	struct snd_ctl_elem_id id1, id2;</div><div class='hunk'>@@ -508,34 +473,40 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)</div><div class='ctx'> 	memset(&amp;id2, 0, sizeof(id2));</div><div class='ctx'> 	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	/* reassign AUX0 to CD */</div><div class='del'>-        strcpy(id1.name, "Aux Playback Switch");</div><div class='del'>-        strcpy(id2.name, "CD Playback Switch");</div><div class='del'>-        if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opl3sa2 control\n");</div><div class='add'>+        strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+        strscpy(id2.name, "CD Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opl3sa2 control\n");</div><div class='ctx'>                 return err;</div><div class='ctx'> 	}</div><div class='del'>-        strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-        strcpy(id2.name, "CD Playback Volume");</div><div class='del'>-        if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opl3sa2 control\n");</div><div class='add'>+        strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+        strscpy(id2.name, "CD Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opl3sa2 control\n");</div><div class='ctx'>                 return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* reassign AUX1 to FM */</div><div class='del'>-        strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='del'>-        strcpy(id2.name, "FM Playback Switch");</div><div class='del'>-        if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opl3sa2 control\n");</div><div class='add'>+        strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='add'>+        strscpy(id2.name, "FM Playback Switch");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opl3sa2 control\n");</div><div class='ctx'>                 return err;</div><div class='ctx'> 	}</div><div class='del'>-        strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-        strcpy(id2.name, "FM Playback Volume");</div><div class='del'>-        if ((err = snd_ctl_rename_id(card, &amp;id1, &amp;id2)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opl3sa2 control\n");</div><div class='add'>+        strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+        strscpy(id2.name, "FM Playback Volume");</div><div class='add'>+	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opl3sa2 control\n");</div><div class='ctx'>                 return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* add OPL3SA2 controls */</div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_opl3sa2_controls); idx++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&amp;snd_opl3sa2_controls[idx], chip))) &lt; 0)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_opl3sa2_controls[idx], chip);</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		switch (idx) {</div><div class='ctx'> 		case 0: chip-&gt;master_switch = kctl; kctl-&gt;private_free = snd_opl3sa2_master_free; break;</div><div class='hunk'>@@ -543,9 +514,11 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;version &gt; 2) {</div><div class='del'>-		for (idx = 0; idx &lt; ARRAY_SIZE(snd_opl3sa2_tone_controls); idx++)</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_opl3sa2_tone_controls[idx], chip))) &lt; 0)</div><div class='add'>+		for (idx = 0; idx &lt; ARRAY_SIZE(snd_opl3sa2_tone_controls); idx++) {</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_opl3sa2_tone_controls[idx], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -596,11 +569,11 @@ static int snd_opl3sa2_resume(struct snd_card *card)</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,</div><div class='del'>-				     struct pnp_dev *pdev)</div><div class='add'>+static int snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,</div><div class='add'>+			   struct pnp_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (pnp_activate_dev(pdev) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "PnP configure failure (out of resources?)\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "PnP configure failure (out of resources?)\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	sb_port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -611,43 +584,35 @@ static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,</div><div class='ctx'> 	dma1[dev] = pnp_dma(pdev, 0);</div><div class='ctx'> 	dma2[dev] = pnp_dma(pdev, 1);</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='del'>-	snd_printdd("%sPnP OPL3-SA: sb port=0x%lx, wss port=0x%lx, fm port=0x%lx, midi port=0x%lx\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%sPnP OPL3-SA: sb port=0x%lx, wss port=0x%lx, fm port=0x%lx, midi port=0x%lx\n",</div><div class='ctx'> 		pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", sb_port[dev], wss_port[dev], fm_port[dev], midi_port[dev]);</div><div class='del'>-	snd_printdd("%sPnP OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%sPnP OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n",</div><div class='ctx'> 		pnp_device_is_pnpbios(pdev) ? "BIOS" : "ISA", port[dev], dma1[dev], dma2[dev], irq[dev]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-static void snd_opl3sa2_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_opl3sa2 *chip = card-&gt;private_data;</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, card);</div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_opl3sa2_card_new(struct device *pdev, int dev,</div><div class='add'>+				struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_opl3sa2 *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_opl3sa2), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_opl3sa2), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(card-&gt;driver, "OPL3SA2");</div><div class='del'>-	strcpy(card-&gt;shortname, "Yamaha OPL3-SA");</div><div class='add'>+	strscpy(card-&gt;driver, "OPL3SA2");</div><div class='add'>+	strscpy(card-&gt;shortname, "Yamaha OPL3-SA");</div><div class='ctx'> 	chip = card-&gt;private_data;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='del'>-	card-&gt;private_free = snd_opl3sa2_free;</div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int xirq, xdma1, xdma2;</div><div class='ctx'> 	struct snd_opl3sa2 *chip;</div><div class='hunk'>@@ -657,6 +622,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='ctx'> </div><div class='ctx'> 	/* initialise this card from supplied (or default) parameter*/ </div><div class='ctx'> 	chip = card-&gt;private_data;</div><div class='add'>+	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;ymode = opl3sa3_ymode[dev] &amp; 0x03 ;</div><div class='ctx'> 	chip-&gt;port = port[dev];</div><div class='ctx'> 	xirq = irq[dev];</div><div class='hunk'>@@ -667,23 +633,24 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	err = snd_opl3sa2_detect(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED,</div><div class='del'>-			  "OPL3-SA2", card);</div><div class='add'>+	err = devm_request_irq(card-&gt;dev, xirq, snd_opl3sa2_interrupt, 0,</div><div class='add'>+			       "OPL3-SA2", card);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);</div><div class='add'>+		dev_err(card-&gt;dev, "can't grab IRQ %d\n", xirq);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = xirq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> 	err = snd_wss_create(card,</div><div class='ctx'> 			     wss_port[dev] + 4, -1,</div><div class='ctx'> 			     xirq, xdma1, xdma2,</div><div class='ctx'> 			     WSS_HW_OPL3SA2, WSS_HWSHARE_IRQ, &amp;wss);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printd("Oops, WSS not detected at 0x%lx\n", wss_port[dev] + 4);</div><div class='add'>+		dev_dbg(card-&gt;dev, "Oops, WSS not detected at 0x%lx\n", wss_port[dev] + 4);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;wss = wss;</div><div class='del'>-	err = snd_wss_pcm(wss, 0, NULL);</div><div class='add'>+	err = snd_wss_pcm(wss, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	err = snd_wss_mixer(wss);</div><div class='hunk'>@@ -692,23 +659,28 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='ctx'> 	err = snd_opl3sa2_mixer(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = snd_wss_timer(wss, 0, NULL);</div><div class='add'>+	err = snd_wss_timer(wss, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (fm_port[dev] &gt;= 0x340 &amp;&amp; fm_port[dev] &lt; 0x400) {</div><div class='del'>-		if ((err = snd_opl3_create(card, fm_port[dev],</div><div class='del'>-					   fm_port[dev] + 2,</div><div class='del'>-					   OPL3_HW_OPL3, 0, &amp;opl3)) &lt; 0)</div><div class='add'>+		err = snd_opl3_create(card, fm_port[dev],</div><div class='add'>+				      fm_port[dev] + 2,</div><div class='add'>+				      OPL3_HW_OPL3, 0, &amp;opl3);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_opl3_timer_new(opl3, 1, 2)) &lt; 0)</div><div class='add'>+		err = snd_opl3_timer_new(opl3, 1, 2);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_opl3_hwdep_new(opl3, 0, 1, &amp;chip-&gt;synth)) &lt; 0)</div><div class='add'>+		err = snd_opl3_hwdep_new(opl3, 0, 1, &amp;chip-&gt;synth);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (midi_port[dev] &gt;= 0x300 &amp;&amp; midi_port[dev] &lt; 0x340) {</div><div class='del'>-		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,</div><div class='del'>-					       midi_port[dev], 0,</div><div class='del'>-					       xirq, 0, &amp;chip-&gt;rmidi)) &lt; 0)</div><div class='add'>+		err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,</div><div class='add'>+					  midi_port[dev],</div><div class='add'>+					  MPU401_INFO_IRQ_HOOK, -1,</div><div class='add'>+					  &amp;chip-&gt;rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d",</div><div class='hunk'>@@ -720,8 +692,8 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,</div><div class='del'>-					    const struct pnp_device_id *id)</div><div class='add'>+static int snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,</div><div class='add'>+				  const struct pnp_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -736,29 +708,20 @@ static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	err = snd_opl3sa2_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_opl3sa2_card_new(&amp;pdev-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_opl3sa2_pnp(dev, card-&gt;private_data, pdev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3sa2_pnp(dev, card-&gt;private_data, pdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-	if ((err = snd_opl3sa2_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3sa2_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_drvdata(pdev, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_opl3sa2_pnp_remove(struct pnp_dev * pdev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_drvdata(pdev));</div><div class='del'>-	pnp_set_drvdata(pdev, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_opl3sa2_pnp_suspend(struct pnp_dev *pdev, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -774,15 +737,14 @@ static struct pnp_driver opl3sa2_pnp_driver = {</div><div class='ctx'> 	.name = "snd-opl3sa2-pnpbios",</div><div class='ctx'> 	.id_table = snd_opl3sa2_pnpbiosids,</div><div class='ctx'> 	.probe = snd_opl3sa2_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_opl3sa2_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = snd_opl3sa2_pnp_suspend,</div><div class='ctx'> 	.resume = snd_opl3sa2_pnp_resume,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,</div><div class='del'>-					     const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,</div><div class='add'>+				   const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='hunk'>@@ -791,7 +753,7 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,</div><div class='ctx'> </div><div class='ctx'> 	pdev = pnp_request_card_device(pcard, id-&gt;devs[0].id, NULL);</div><div class='ctx'> 	if (pdev == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "can't get pnp device from id '%s'\n",</div><div class='add'>+		dev_err(&amp;pcard-&gt;card-&gt;dev, "can't get pnp device from id '%s'\n",</div><div class='ctx'> 			   id-&gt;devs[0].id);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -802,29 +764,20 @@ static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	err = snd_opl3sa2_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_opl3sa2_card_new(&amp;pdev-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_opl3sa2_pnp(dev, card-&gt;private_data, pdev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3sa2_pnp(dev, card-&gt;private_data, pdev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='del'>-	if ((err = snd_opl3sa2_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3sa2_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_opl3sa2_pnp_cremove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_opl3sa2_pnp_csuspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -841,7 +794,6 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {</div><div class='ctx'> 	.name = "snd-opl3sa2-cpnp",</div><div class='ctx'> 	.id_table = snd_opl3sa2_pnpids,</div><div class='ctx'> 	.probe = snd_opl3sa2_pnp_cdetect,</div><div class='del'>-	.remove = __devexit_p(snd_opl3sa2_pnp_cremove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = snd_opl3sa2_pnp_csuspend,</div><div class='ctx'> 	.resume = snd_opl3sa2_pnp_cresume,</div><div class='hunk'>@@ -849,8 +801,8 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {</div><div class='ctx'> };</div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_isa_match(struct device *pdev,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_opl3sa2_isa_match(struct device *pdev,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -859,50 +811,40 @@ static int __devinit snd_opl3sa2_isa_match(struct device *pdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify port\n");</div><div class='add'>+		dev_err(pdev, "specify port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (wss_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify wss_port\n");</div><div class='add'>+		dev_err(pdev, "specify wss_port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (fm_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify fm_port\n");</div><div class='add'>+		dev_err(pdev, "specify fm_port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (midi_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "specify midi_port\n");</div><div class='add'>+		dev_err(pdev, "specify midi_port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opl3sa2_isa_probe(struct device *pdev,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_opl3sa2_isa_probe(struct device *pdev,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_opl3sa2_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_opl3sa2_card_new(pdev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-	if ((err = snd_opl3sa2_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3sa2_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_opl3sa2_isa_remove(struct device *devptr,</div><div class='del'>-					    unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_opl3sa2_isa_suspend(struct device *dev, unsigned int n,</div><div class='ctx'> 				   pm_message_t state)</div><div class='hunk'>@@ -921,7 +863,6 @@ static int snd_opl3sa2_isa_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_opl3sa2_isa_driver = {</div><div class='ctx'> 	.match		= snd_opl3sa2_isa_match,</div><div class='ctx'> 	.probe		= snd_opl3sa2_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_opl3sa2_isa_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_opl3sa2_isa_suspend,</div><div class='ctx'> 	.resume		= snd_opl3sa2_isa_resume,</div><div class='head'>diff --git a/sound/isa/opti9xx/Makefile b/sound/isa/opti9xx/Makefile<br/>index b4d894db257a..44a2fb220456 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/opti9xx/Makefile</a></div><div class='hunk'>@@ -1,12 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-opti92x-ad1848-objs := opti92x-ad1848.o</div><div class='del'>-snd-opti92x-cs4231-objs := opti92x-cs4231.o</div><div class='del'>-snd-opti93x-objs := opti93x.o</div><div class='del'>-snd-miro-objs := miro.o</div><div class='add'>+snd-opti92x-ad1848-y := opti92x-ad1848.o</div><div class='add'>+snd-opti92x-cs4231-y := opti92x-cs4231.o</div><div class='add'>+snd-opti93x-y := opti93x.o</div><div class='add'>+snd-miro-y := miro.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-opti92x-ad1848.o</div><div class='head'>diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c<br/>index 8c24102d0d93..c320af3e9a05 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/miro.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/miro.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/miro.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/opti9xx/miro.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA soundcard driver for Miro miroSOUND PCM1 pro</div><div class='ctx'>  *                                  miroSOUND PCM12</div><div class='hunk'>@@ -6,20 +7,6 @@</div><div class='ctx'>  *   Copyright (C) 2004-2005 Martin Langer &lt;martin-langer@gmx.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *   Based on OSS ACI and ALSA OPTi9xx drivers</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -28,8 +15,8 @@</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='hunk'>@@ -37,6 +24,7 @@</div><div class='ctx'> #include &lt;sound/opl4.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='add'>+#define SNDRV_LEGACY_FIND_FREE_IOPORT</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_IRQ</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_DMA</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -45,9 +33,6 @@</div><div class='ctx'> MODULE_AUTHOR("Martin Langer &lt;martin-langer@gmx.de&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Miro miroSOUND PCM1 pro, PCM12, PCM20 Radio");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Miro,miroSOUND PCM1 pro}, "</div><div class='del'>-			"{Miro,miroSOUND PCM12}, "</div><div class='del'>-			"{Miro,miroSOUND PCM20 Radio}}");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;		/* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;		/* ID for this card */</div><div class='hunk'>@@ -61,26 +46,26 @@ static int dma2 = SNDRV_DEFAULT_DMA1;		/* 0,1,3 */</div><div class='ctx'> static int wss;</div><div class='ctx'> static int ide;</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp = 1;				/* Enable ISA PnP detection */</div><div class='add'>+static bool isapnp = 1;				/* Enable ISA PnP detection */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> module_param(index, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for miro soundcard.");</div><div class='ctx'> module_param(id, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for miro soundcard.");</div><div class='del'>-module_param(port, long, 0444);</div><div class='add'>+module_param_hw(port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "WSS port # for miro driver.");</div><div class='del'>-module_param(mpu_port, long, 0444);</div><div class='add'>+module_param_hw(mpu_port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for miro driver.");</div><div class='del'>-module_param(fm_port, long, 0444);</div><div class='add'>+module_param_hw(fm_port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM Port # for miro driver.");</div><div class='del'>-module_param(irq, int, 0444);</div><div class='add'>+module_param_hw(irq, int, irq, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "WSS irq # for miro driver.");</div><div class='del'>-module_param(mpu_irq, int, 0444);</div><div class='add'>+module_param_hw(mpu_irq, int, irq, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 irq # for miro driver.");</div><div class='del'>-module_param(dma1, int, 0444);</div><div class='add'>+module_param_hw(dma1, int, dma, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "1st dma # for miro driver.");</div><div class='del'>-module_param(dma2, int, 0444);</div><div class='add'>+module_param_hw(dma2, int, dma, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "2nd dma # for miro driver.");</div><div class='ctx'> module_param(wss, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wss, "wss mode");</div><div class='hunk'>@@ -126,12 +111,13 @@ struct snd_miro {</div><div class='ctx'> 	long mpu_port;</div><div class='ctx'> 	int mpu_irq;</div><div class='ctx'> </div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	struct snd_miro_aci *aci;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct snd_miro_aci aci_device;</div><div class='ctx'> </div><div class='del'>-static char * snd_opti9xx_names[] = {</div><div class='add'>+static const char * const snd_opti9xx_names[] = {</div><div class='ctx'> 	"unknown",</div><div class='ctx'> 	"82C928", "82C929",</div><div class='ctx'> 	"82C924", "82C925",</div><div class='hunk'>@@ -142,7 +128,7 @@ static int snd_miro_pnp_is_probed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_miro_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_miro_pnpids[] = {</div><div class='ctx'> 	/* PCM20 and PCM12 in PnP mode */</div><div class='ctx'> 	{ .id = "MIR0924",</div><div class='ctx'> 	  .devs = { { "MIR0000" }, { "MIR0002" }, { "MIR0005" } }, },</div><div class='hunk'>@@ -166,8 +152,9 @@ static int aci_busy_wait(struct snd_miro_aci *aci)</div><div class='ctx'> 		byte = inb(aci-&gt;aci_port + ACI_REG_BUSY);</div><div class='ctx'> 		if ((byte &amp; 1) == 0) {</div><div class='ctx'> 			if (timeout &gt;= ACI_MINTIME)</div><div class='del'>-				snd_printd("aci ready in round %ld.\n",</div><div class='del'>-					   timeout-ACI_MINTIME);</div><div class='add'>+				dev_dbg(aci-&gt;card-&gt;dev,</div><div class='add'>+					"aci ready in round %ld.\n",</div><div class='add'>+					timeout-ACI_MINTIME);</div><div class='ctx'> 			return byte;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (timeout &gt;= ACI_MINTIME) {</div><div class='hunk'>@@ -175,10 +162,13 @@ static int aci_busy_wait(struct snd_miro_aci *aci)</div><div class='ctx'> 			switch (timeout-ACI_MINTIME) {</div><div class='ctx'> 			case 0 ... 9:</div><div class='ctx'> 				out /= 10;</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case 10 ... 19:</div><div class='ctx'> 				out /= 10;</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case 20 ... 30:</div><div class='ctx'> 				out /= 10;</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			default:</div><div class='ctx'> 				set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='ctx'> 				schedule_timeout(out);</div><div class='hunk'>@@ -186,7 +176,7 @@ static int aci_busy_wait(struct snd_miro_aci *aci)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "aci_busy_wait() time out\n");</div><div class='add'>+	dev_err(aci-&gt;card-&gt;dev, "%s() time out\n", __func__);</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +186,7 @@ static inline int aci_write(struct snd_miro_aci *aci, unsigned char byte)</div><div class='ctx'> 		outb(byte, aci-&gt;aci_port + ACI_REG_COMMAND);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR "aci busy, aci_write(0x%x) stopped.\n", byte);</div><div class='add'>+		dev_err(aci-&gt;card-&gt;dev, "aci busy, %s(0x%x) stopped.\n", __func__, byte);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -209,7 +199,7 @@ static inline int aci_read(struct snd_miro_aci *aci)</div><div class='ctx'> 		byte = inb(aci-&gt;aci_port + ACI_REG_STATUS);</div><div class='ctx'> 		return byte;</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR "aci busy, aci_read() stopped.\n");</div><div class='add'>+		dev_err(aci-&gt;card-&gt;dev, "aci busy, %s() stopped.\n", __func__);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -272,8 +262,8 @@ static int snd_miro_get_capture(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	value = aci_getvalue(miro-&gt;aci, ACI_S_GENERAL);</div><div class='ctx'> 	if (value &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_miro_get_capture() failed: %d\n",</div><div class='del'>-			   value);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "%s() failed: %d\n", __func__,</div><div class='add'>+			value);</div><div class='ctx'> 		return value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -292,8 +282,8 @@ static int snd_miro_put_capture(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	error = aci_setvalue(miro-&gt;aci, ACI_SET_SOLOMODE, value);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_miro_put_capture() failed: %d\n",</div><div class='del'>-			   error);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "%s() failed: %d\n", __func__,</div><div class='add'>+			error);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -334,8 +324,8 @@ static int snd_miro_get_preamp(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	value = aci_getvalue(miro-&gt;aci, ACI_GET_PREAMP);</div><div class='ctx'> 	if (value &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_miro_get_preamp() failed: %d\n",</div><div class='del'>-			   value);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "%s() failed: %d\n", __func__,</div><div class='add'>+			value);</div><div class='ctx'> 		return value;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -354,8 +344,8 @@ static int snd_miro_put_preamp(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	error = aci_setvalue(miro-&gt;aci, ACI_SET_PREAMP, value);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_miro_put_preamp() failed: %d\n",</div><div class='del'>-			   error);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "%s() failed: %d\n", __func__,</div><div class='add'>+			error);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +376,8 @@ static int snd_miro_put_amp(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	error = aci_setvalue(miro-&gt;aci, ACI_SET_POWERAMP, value);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_miro_put_amp() to %d failed: %d\n", value, error);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "%s() to %d failed: %d\n", __func__,</div><div class='add'>+			value, error);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -442,13 +433,15 @@ static int snd_miro_get_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	right_val = aci_getvalue(miro-&gt;aci, right_reg);</div><div class='ctx'> 	if (right_val &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "aci_getvalue(%d) failed: %d\n", right_reg, right_val);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "aci_getvalue(%d) failed: %d\n",</div><div class='add'>+			right_reg, right_val);</div><div class='ctx'> 		return right_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	left_val = aci_getvalue(miro-&gt;aci, left_reg);</div><div class='ctx'> 	if (left_val &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "aci_getvalue(%d) failed: %d\n", left_reg, left_val);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "aci_getvalue(%d) failed: %d\n",</div><div class='add'>+			left_reg, left_val);</div><div class='ctx'> 		return left_val;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -501,13 +494,15 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	left_old = aci_getvalue(aci, getreg_left);</div><div class='ctx'> 	if (left_old &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "aci_getvalue(%d) failed: %d\n", getreg_left, left_old);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "aci_getvalue(%d) failed: %d\n",</div><div class='add'>+			getreg_left, left_old);</div><div class='ctx'> 		return left_old;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	right_old = aci_getvalue(aci, getreg_right);</div><div class='ctx'> 	if (right_old &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "aci_getvalue(%d) failed: %d\n", getreg_right, right_old);</div><div class='add'>+		dev_err(miro-&gt;card-&gt;dev, "aci_getvalue(%d) failed: %d\n",</div><div class='add'>+			getreg_right, right_old);</div><div class='ctx'> 		return right_old;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -527,15 +522,15 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		if (left &gt;= 0) {</div><div class='ctx'> 			error = aci_setvalue(aci, setreg_left, left);</div><div class='ctx'> 			if (error &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-					   left, error);</div><div class='add'>+				dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+					left, error);</div><div class='ctx'> 				return error;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			error = aci_setvalue(aci, setreg_left, 0x80 - left);</div><div class='ctx'> 			if (error &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-					   0x80 - left, error);</div><div class='add'>+				dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+					0x80 - left, error);</div><div class='ctx'> 				return error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -543,15 +538,15 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		if (right &gt;= 0) {</div><div class='ctx'> 			error = aci_setvalue(aci, setreg_right, right);</div><div class='ctx'> 			if (error &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-					   right, error);</div><div class='add'>+				dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+					right, error);</div><div class='ctx'> 				return error;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			error = aci_setvalue(aci, setreg_right, 0x80 - right);</div><div class='ctx'> 			if (error &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-					   0x80 - right, error);</div><div class='add'>+				dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+					0x80 - right, error);</div><div class='ctx'> 				return error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -569,14 +564,14 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 		error = aci_setvalue(aci, setreg_left, 0x20 - left);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-				   0x20 - left, error);</div><div class='add'>+			dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+				0x20 - left, error);</div><div class='ctx'> 			return error;</div><div class='ctx'> 		}</div><div class='ctx'> 		error = aci_setvalue(aci, setreg_right, 0x20 - right);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n",</div><div class='del'>-				   0x20 - right, error);</div><div class='add'>+			dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+				0x20 - right, error);</div><div class='ctx'> 			return error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -586,7 +581,7 @@ static int snd_miro_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_controls[] = {</div><div class='ctx'> MIRO_DOUBLE("Master Playback Volume", 0, ACI_GET_MASTER, ACI_SET_MASTER),</div><div class='ctx'> MIRO_DOUBLE("Mic Playback Volume", 1, ACI_GET_MIC, ACI_SET_MIC),</div><div class='ctx'> MIRO_DOUBLE("Line Playback Volume", 1, ACI_GET_LINE, ACI_SET_LINE),</div><div class='hunk'>@@ -598,7 +593,7 @@ MIRO_DOUBLE("Aux Playback Volume", 2, ACI_GET_LINE2, ACI_SET_LINE2),</div><div class='ctx'> </div><div class='ctx'> /* Equalizer with seven bands (only PCM20) </div><div class='ctx'>    from -12dB up to +12dB on each band */</div><div class='del'>-static struct snd_kcontrol_new snd_miro_eq_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_eq_controls[] = {</div><div class='ctx'> MIRO_DOUBLE("Tone Control - 28 Hz", 0, ACI_GET_EQ1, ACI_SET_EQ1),</div><div class='ctx'> MIRO_DOUBLE("Tone Control - 160 Hz", 0, ACI_GET_EQ2, ACI_SET_EQ2),</div><div class='ctx'> MIRO_DOUBLE("Tone Control - 400 Hz", 0, ACI_GET_EQ3, ACI_SET_EQ3),</div><div class='hunk'>@@ -608,15 +603,15 @@ MIRO_DOUBLE("Tone Control - 6.3 kHz", 0, ACI_GET_EQ6, ACI_SET_EQ6),</div><div class='ctx'> MIRO_DOUBLE("Tone Control - 16 kHz", 0, ACI_GET_EQ7, ACI_SET_EQ7),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_radio_control[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_radio_control[] = {</div><div class='ctx'> MIRO_DOUBLE("Radio Playback Volume", 0, ACI_GET_LINE1, ACI_SET_LINE1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_line_control[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_line_control[] = {</div><div class='ctx'> MIRO_DOUBLE("Line Playback Volume", 2, ACI_GET_LINE1, ACI_SET_LINE1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_preamp_control[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Mic Boost",</div><div class='hunk'>@@ -626,7 +621,7 @@ static struct snd_kcontrol_new snd_miro_preamp_control[] __devinitdata = {</div><div class='ctx'> 	.put = snd_miro_put_preamp,</div><div class='ctx'> }};</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_amp_control[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Line Boost",</div><div class='hunk'>@@ -636,7 +631,7 @@ static struct snd_kcontrol_new snd_miro_amp_control[] __devinitdata = {</div><div class='ctx'> 	.put = snd_miro_put_amp,</div><div class='ctx'> }};</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_miro_capture_control[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "PCM Capture Switch",</div><div class='hunk'>@@ -646,7 +641,7 @@ static struct snd_kcontrol_new snd_miro_capture_control[] __devinitdata = {</div><div class='ctx'> 	.put = snd_miro_put_capture,</div><div class='ctx'> }};</div><div class='ctx'> </div><div class='del'>-static unsigned char aci_init_values[][2] __devinitdata = {</div><div class='add'>+static const unsigned char aci_init_values[][2] = {</div><div class='ctx'> 	{ ACI_SET_MUTE, 0x00 },</div><div class='ctx'> 	{ ACI_SET_POWERAMP, 0x00 },</div><div class='ctx'> 	{ ACI_SET_PREAMP, 0x00 },</div><div class='hunk'>@@ -669,7 +664,7 @@ static unsigned char aci_init_values[][2] __devinitdata = {</div><div class='ctx'> 	{ ACI_SET_MASTER + 1, 0x20 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_set_aci_init_values(struct snd_miro *miro)</div><div class='add'>+static int snd_set_aci_init_values(struct snd_miro *miro)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, error;</div><div class='ctx'> 	struct snd_miro_aci *aci = miro-&gt;aci;</div><div class='hunk'>@@ -679,7 +674,7 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)</div><div class='ctx'> 	if ((aci-&gt;aci_product == 'A') &amp;&amp; wss) {</div><div class='ctx'> 		error = aci_setvalue(aci, ACI_SET_WSS, wss);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "enabling WSS mode failed\n");</div><div class='add'>+			dev_err(miro-&gt;card-&gt;dev, "enabling WSS mode failed\n");</div><div class='ctx'> 			return error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -689,7 +684,7 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)</div><div class='ctx'> 	if (ide) {</div><div class='ctx'> 		error = aci_setvalue(aci, ACI_SET_IDE, ide);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "enabling IDE port failed\n");</div><div class='add'>+			dev_err(miro-&gt;card-&gt;dev, "enabling IDE port failed\n");</div><div class='ctx'> 			return error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -700,8 +695,8 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)</div><div class='ctx'> 		error = aci_setvalue(aci, aci_init_values[idx][0],</div><div class='ctx'> 				     aci_init_values[idx][1]);</div><div class='ctx'> 		if (error &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "aci_setvalue(%d) failed: %d\n", </div><div class='del'>-				   aci_init_values[idx][0], error);</div><div class='add'>+			dev_err(miro-&gt;card-&gt;dev, "aci_setvalue(%d) failed: %d\n",</div><div class='add'>+				aci_init_values[idx][0], error);</div><div class='ctx'>                         return error;</div><div class='ctx'>                 }</div><div class='ctx'> 	}</div><div class='hunk'>@@ -712,8 +707,8 @@ static int __devinit snd_set_aci_init_values(struct snd_miro *miro)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_mixer(struct snd_card *card,</div><div class='del'>-				    struct snd_miro *miro)</div><div class='add'>+static int snd_miro_mixer(struct snd_card *card,</div><div class='add'>+			  struct snd_miro *miro)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -723,10 +718,10 @@ static int __devinit snd_miro_mixer(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	switch (miro-&gt;hardware) {</div><div class='ctx'> 	case OPTi9XX_HW_82C924:</div><div class='del'>-		strcpy(card-&gt;mixername, "ACI &amp; OPTi924");</div><div class='add'>+		strscpy(card-&gt;mixername, "ACI &amp; OPTi924");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case OPTi9XX_HW_82C929:</div><div class='del'>-		strcpy(card-&gt;mixername, "ACI &amp; OPTi929");</div><div class='add'>+		strscpy(card-&gt;mixername, "ACI &amp; OPTi929");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		snd_BUG();</div><div class='hunk'>@@ -734,35 +729,43 @@ static int __devinit snd_miro_mixer(struct snd_card *card,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_miro_controls); idx++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_controls[idx], miro))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_controls[idx], miro));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((miro-&gt;aci-&gt;aci_product == 'A') ||</div><div class='ctx'> 	    (miro-&gt;aci-&gt;aci_product == 'B')) {</div><div class='ctx'> 		/* PCM1/PCM12 with power-amp and Line 2 */</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_line_control[0], miro))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_line_control[0], miro));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_amp_control[0], miro))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_amp_control[0], miro));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((miro-&gt;aci-&gt;aci_product == 'B') ||</div><div class='ctx'> 	    (miro-&gt;aci-&gt;aci_product == 'C')) {</div><div class='ctx'> 		/* PCM12/PCM20 with mic-preamp */</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_preamp_control[0], miro))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_preamp_control[0], miro));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if (miro-&gt;aci-&gt;aci_version &gt;= 176)</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_capture_control[0], miro))) &lt; 0)</div><div class='add'>+		if (miro-&gt;aci-&gt;aci_version &gt;= 176) {</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_capture_control[0], miro));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (miro-&gt;aci-&gt;aci_product == 'C') {</div><div class='ctx'> 		/* PCM20 with radio and 7 band equalizer */</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_radio_control[0], miro))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_radio_control[0], miro));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		for (idx = 0; idx &lt; ARRAY_SIZE(snd_miro_eq_controls); idx++) {</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_eq_controls[idx], miro))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_miro_eq_controls[idx], miro));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -770,27 +773,13 @@ static int __devinit snd_miro_mixer(struct snd_card *card,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static long snd_legacy_find_free_ioport(long *port_table, long size)</div><div class='del'>-{</div><div class='del'>-	while (*port_table != -1) {</div><div class='del'>-		struct resource *res;</div><div class='del'>-		if ((res = request_region(*port_table, size, </div><div class='del'>-					  "ALSA test")) != NULL) {</div><div class='del'>-			release_and_free_resource(res);</div><div class='del'>-			return *port_table;</div><div class='del'>-		}</div><div class='del'>-		port_table++;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_miro_init(struct snd_miro *chip,</div><div class='del'>-				   unsigned short hardware)</div><div class='add'>+static int snd_miro_init(struct snd_miro *chip,</div><div class='add'>+			 unsigned short hardware)</div><div class='ctx'> {</div><div class='del'>-	static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};</div><div class='add'>+	static const int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;hardware = hardware;</div><div class='del'>-	strcpy(chip-&gt;name, snd_opti9xx_names[hardware]);</div><div class='add'>+	strscpy(chip-&gt;name, snd_opti9xx_names[hardware]);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;mc_base_size = opti9xx_mc_size[hardware];  </div><div class='ctx'> </div><div class='hunk'>@@ -823,7 +812,7 @@ static int __devinit snd_miro_init(struct snd_miro *chip,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "sorry, no support for %d\n", hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "sorry, no support for %d\n", hardware);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -833,10 +822,9 @@ static int __devinit snd_miro_init(struct snd_miro *chip,</div><div class='ctx'> static unsigned char snd_miro_read(struct snd_miro *chip,</div><div class='ctx'> 				   unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char retval = 0xff;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -847,25 +835,23 @@ static unsigned char snd_miro_read(struct snd_miro *chip,</div><div class='ctx'> 			retval = inb(chip-&gt;mc_base + 9);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case OPTi9XX_HW_82C929:</div><div class='ctx'> 		retval = inb(chip-&gt;mc_base + reg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "sorry, no support for %d\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "sorry, no support for %d\n", chip-&gt;hardware);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_miro_write(struct snd_miro *chip, unsigned char reg,</div><div class='ctx'> 			   unsigned char value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -876,22 +862,24 @@ static void snd_miro_write(struct snd_miro *chip, unsigned char reg,</div><div class='ctx'> 			outb(value, chip-&gt;mc_base + 9);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case OPTi9XX_HW_82C929:</div><div class='ctx'> 		outb(value, chip-&gt;mc_base + reg);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "sorry, no support for %d\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "sorry, no support for %d\n", chip-&gt;hardware);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void snd_miro_write_mask(struct snd_miro *chip,</div><div class='add'>+		unsigned char reg, unsigned char value, unsigned char mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char oldval = snd_miro_read(chip, reg);</div><div class='ctx'> </div><div class='del'>-#define snd_miro_write_mask(chip, reg, value, mask)	\</div><div class='del'>-	snd_miro_write(chip, reg,			\</div><div class='del'>-		(snd_miro_read(chip, reg) &amp; ~(mask)) | ((value) &amp; (mask)))</div><div class='add'>+	snd_miro_write(chip, reg, (oldval &amp; ~mask) | (value &amp; mask));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Proc Interface</div><div class='hunk'>@@ -1002,27 +990,23 @@ static void snd_miro_proc_read(struct snd_info_entry * entry,</div><div class='ctx'> 	snd_iprintf(buffer, "  preamp  : 0x%x\n", aci-&gt;aci_preamp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_miro_proc_init(struct snd_card *card,</div><div class='del'>-					 struct snd_miro *miro)</div><div class='add'>+static void snd_miro_proc_init(struct snd_card *card,</div><div class='add'>+			       struct snd_miro *miro)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(card, "miro", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, miro, snd_miro_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(card, "miro", miro, snd_miro_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Init</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_configure(struct snd_miro *chip)</div><div class='add'>+static int snd_miro_configure(struct snd_miro *chip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char wss_base_bits;</div><div class='ctx'> 	unsigned char irq_bits;</div><div class='ctx'> 	unsigned char dma_bits;</div><div class='ctx'> 	unsigned char mpu_port_bits = 0;</div><div class='ctx'> 	unsigned char mpu_irq_bits;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80);</div><div class='ctx'> 	snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */</div><div class='hunk'>@@ -1038,7 +1022,7 @@ static int __devinit snd_miro_configure(struct snd_miro *chip)</div><div class='ctx'> 		snd_miro_write_mask(chip, OPTi9XX_MC_REG(4), 0x00, 0x0c);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "chip %d not supported\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "chip %d not supported\n", chip-&gt;hardware);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1061,7 +1045,7 @@ static int __devinit snd_miro_configure(struct snd_miro *chip)</div><div class='ctx'> 		wss_base_bits = 0x02;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "WSS port 0x%lx not valid\n", chip-&gt;wss_base);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "WSS port 0x%lx not valid\n", chip-&gt;wss_base);</div><div class='ctx'> 		goto __skip_base;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), wss_base_bits &lt;&lt; 4, 0x30);</div><div class='hunk'>@@ -1084,7 +1068,7 @@ __skip_base:</div><div class='ctx'> 		irq_bits = 0x04;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "WSS irq # %d not valid\n", chip-&gt;irq);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "WSS irq # %d not valid\n", chip-&gt;irq);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1099,12 +1083,12 @@ __skip_base:</div><div class='ctx'> 		dma_bits = 0x03;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "WSS dma1 # %d not valid\n", chip-&gt;dma1);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "WSS dma1 # %d not valid\n", chip-&gt;dma1);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dma1 == chip-&gt;dma2) {</div><div class='del'>-		snd_printk(KERN_ERR "don't want to share dmas\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "don't want to share dmas\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1113,14 +1097,14 @@ __skip_base:</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "WSS dma2 # %d not valid\n", chip-&gt;dma2);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "WSS dma2 # %d not valid\n", chip-&gt;dma2);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> 	dma_bits |= 0x04;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	outb(irq_bits &lt;&lt; 3 | dma_bits, chip-&gt;wss_base);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;lock) {</div><div class='add'>+		outb(irq_bits &lt;&lt; 3 | dma_bits, chip-&gt;wss_base);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> __skip_resources:</div><div class='ctx'> 	if (chip-&gt;hardware &gt; OPTi9XX_HW_82C928) {</div><div class='hunk'>@@ -1141,8 +1125,8 @@ __skip_resources:</div><div class='ctx'> 			mpu_port_bits = 0x00;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_ERR "MPU-401 port 0x%lx not valid\n",</div><div class='del'>-				   chip-&gt;mpu_port);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "MPU-401 port 0x%lx not valid\n",</div><div class='add'>+				chip-&gt;mpu_port);</div><div class='ctx'> 			goto __skip_mpu;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1160,8 +1144,8 @@ __skip_resources:</div><div class='ctx'> 			mpu_irq_bits = 0x01;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_ERR "MPU-401 irq # %d not valid\n",</div><div class='del'>-				   chip-&gt;mpu_irq);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "MPU-401 irq # %d not valid\n",</div><div class='add'>+				chip-&gt;mpu_irq);</div><div class='ctx'> 			goto __skip_mpu;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1175,12 +1159,13 @@ __skip_mpu:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_opti_check(struct snd_miro *chip)</div><div class='add'>+static int snd_miro_opti_check(struct snd_card *card, struct snd_miro *chip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char value;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;res_mc_base = request_region(chip-&gt;mc_base, chip-&gt;mc_base_size,</div><div class='del'>-					   "OPTi9xx MC");</div><div class='add'>+	chip-&gt;res_mc_base =</div><div class='add'>+		devm_request_region(card-&gt;dev, chip-&gt;mc_base,</div><div class='add'>+				    chip-&gt;mc_base_size, "OPTi9xx MC");</div><div class='ctx'> 	if (chip-&gt;res_mc_base == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1189,23 +1174,24 @@ static int __devinit snd_miro_opti_check(struct snd_miro *chip)</div><div class='ctx'> 		if (value == snd_miro_read(chip, OPTi9XX_MC_REG(1)))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	release_and_free_resource(chip-&gt;res_mc_base);</div><div class='add'>+	devm_release_resource(card-&gt;dev, chip-&gt;res_mc_base);</div><div class='ctx'> 	chip-&gt;res_mc_base = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_miro_detect(struct snd_card *card,</div><div class='del'>-					  struct snd_miro *chip)</div><div class='add'>+static int snd_card_miro_detect(struct snd_card *card,</div><div class='add'>+				struct snd_miro *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	for (i = OPTi9XX_HW_82C929; i &lt;= OPTi9XX_HW_82C924; i++) {</div><div class='ctx'> </div><div class='del'>-		if ((err = snd_miro_init(chip, i)) &lt; 0)</div><div class='add'>+		err = snd_miro_init(chip, i);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = snd_miro_opti_check(chip);</div><div class='add'>+		err = snd_miro_opti_check(card, chip);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1213,8 +1199,8 @@ static int __devinit snd_card_miro_detect(struct snd_card *card,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_miro_aci_detect(struct snd_card *card,</div><div class='del'>-					      struct snd_miro *miro)</div><div class='add'>+static int snd_card_miro_aci_detect(struct snd_card *card,</div><div class='add'>+				    struct snd_miro *miro)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char regval;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1222,6 +1208,7 @@ static int __devinit snd_card_miro_aci_detect(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	miro-&gt;aci = aci;</div><div class='ctx'> </div><div class='add'>+	aci-&gt;card = card;</div><div class='ctx'> 	mutex_init(&amp;aci-&gt;aci_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* get ACI port from OPTi9xx MC 4 */</div><div class='hunk'>@@ -1229,78 +1216,67 @@ static int __devinit snd_card_miro_aci_detect(struct snd_card *card,</div><div class='ctx'> 	regval=inb(miro-&gt;mc_base + 4);</div><div class='ctx'> 	aci-&gt;aci_port = (regval &amp; 0x10) ? 0x344 : 0x354;</div><div class='ctx'> </div><div class='del'>-	miro-&gt;res_aci_port = request_region(aci-&gt;aci_port, 3, "miro aci");</div><div class='add'>+	miro-&gt;res_aci_port =</div><div class='add'>+		devm_request_region(card-&gt;dev, aci-&gt;aci_port, 3, "miro aci");</div><div class='ctx'> 	if (miro-&gt;res_aci_port == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "aci i/o area 0x%lx-0x%lx already used.\n", </div><div class='del'>-			   aci-&gt;aci_port, aci-&gt;aci_port+2);</div><div class='add'>+		dev_err(card-&gt;dev, "aci i/o area 0x%lx-0x%lx already used.\n",</div><div class='add'>+			aci-&gt;aci_port, aci-&gt;aci_port+2);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>         /* force ACI into a known state */</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		if (snd_aci_cmd(aci, ACI_ERROR_OP, -1, -1) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "can't force aci into known state.\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't force aci into known state.\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	aci-&gt;aci_vendor = snd_aci_cmd(aci, ACI_READ_IDCODE, -1, -1);</div><div class='ctx'> 	aci-&gt;aci_product = snd_aci_cmd(aci, ACI_READ_IDCODE, -1, -1);</div><div class='ctx'> 	if (aci-&gt;aci_vendor &lt; 0 || aci-&gt;aci_product &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't read aci id on 0x%lx.\n",</div><div class='del'>-			   aci-&gt;aci_port);</div><div class='add'>+		dev_err(card-&gt;dev, "can't read aci id on 0x%lx.\n",</div><div class='add'>+			aci-&gt;aci_port);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aci-&gt;aci_version = snd_aci_cmd(aci, ACI_READ_VERSION, -1, -1);</div><div class='ctx'> 	if (aci-&gt;aci_version &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't read aci version on 0x%lx.\n", </div><div class='del'>-			   aci-&gt;aci_port);</div><div class='add'>+		dev_err(card-&gt;dev, "can't read aci version on 0x%lx.\n",</div><div class='add'>+			aci-&gt;aci_port);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_aci_cmd(aci, ACI_INIT, -1, -1) &lt; 0 ||</div><div class='ctx'> 	    snd_aci_cmd(aci, ACI_ERROR_OP, ACI_ERROR_OP, ACI_ERROR_OP) &lt; 0 ||</div><div class='ctx'> 	    snd_aci_cmd(aci, ACI_ERROR_OP, ACI_ERROR_OP, ACI_ERROR_OP) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't initialize aci.\n"); </div><div class='add'>+		dev_err(card-&gt;dev, "can't initialize aci.\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_card_miro_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_miro *miro = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	release_and_free_resource(miro-&gt;res_aci_port);</div><div class='del'>-	if (miro-&gt;aci)</div><div class='del'>-		miro-&gt;aci-&gt;aci_port = 0;</div><div class='del'>-	release_and_free_resource(miro-&gt;res_mc_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='add'>+static int snd_miro_probe(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_miro *miro = card-&gt;private_data;</div><div class='ctx'> 	struct snd_wss *codec;</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> </div><div class='ctx'> 	if (!miro-&gt;res_mc_base) {</div><div class='del'>-		miro-&gt;res_mc_base = request_region(miro-&gt;mc_base,</div><div class='del'>-						miro-&gt;mc_base_size,</div><div class='del'>-						"miro (OPTi9xx MC)");</div><div class='add'>+		miro-&gt;res_mc_base = devm_request_region(card-&gt;dev,</div><div class='add'>+							miro-&gt;mc_base,</div><div class='add'>+							miro-&gt;mc_base_size,</div><div class='add'>+							"miro (OPTi9xx MC)");</div><div class='ctx'> 		if (miro-&gt;res_mc_base == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "request for OPTI9xx MC failed\n");</div><div class='add'>+			dev_err(card-&gt;dev, "request for OPTI9xx MC failed\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_card_miro_aci_detect(card, miro);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		snd_printk(KERN_ERR "unable to detect aci chip\n");</div><div class='add'>+		dev_err(card-&gt;dev, "unable to detect aci chip\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1324,7 +1300,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_pcm(codec, 0, &amp;pcm);</div><div class='add'>+	error = snd_wss_pcm(codec, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='hunk'>@@ -1332,11 +1308,11 @@ static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	error = snd_wss_timer(codec, 0, &amp;timer);</div><div class='add'>+	error = snd_wss_timer(codec, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	miro-&gt;pcm = pcm;</div><div class='add'>+	miro-&gt;pcm = codec-&gt;pcm;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_miro_mixer(card, miro);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='hunk'>@@ -1360,28 +1336,28 @@ static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='ctx'> 		default:</div><div class='ctx'> 			sprintf(card-&gt;shortname, </div><div class='ctx'> 				"unknown miro");</div><div class='del'>-			snd_printk(KERN_INFO "unknown miro aci id\n");</div><div class='add'>+			dev_info(card-&gt;dev, "unknown miro aci id\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_INFO "found unsupported aci card\n");</div><div class='add'>+		dev_info(card-&gt;dev, "found unsupported aci card\n");</div><div class='ctx'> 		sprintf(card-&gt;shortname, "unknown Cardinal Technologies");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "miro");</div><div class='del'>-	sprintf(card-&gt;longname, "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='del'>-		card-&gt;shortname, miro-&gt;name, pcm-&gt;name, miro-&gt;wss_base + 4,</div><div class='del'>-		miro-&gt;irq, miro-&gt;dma1, miro-&gt;dma2);</div><div class='add'>+	strscpy(card-&gt;driver, "miro");</div><div class='add'>+	scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		  "%s: OPTi%s, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='add'>+		  card-&gt;shortname, miro-&gt;name, codec-&gt;pcm-&gt;name,</div><div class='add'>+		  miro-&gt;wss_base + 4, miro-&gt;irq, miro-&gt;dma1, miro-&gt;dma2);</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port &lt;= 0 || mpu_port == SNDRV_AUTO_PORT)</div><div class='ctx'> 		rmidi = NULL;</div><div class='ctx'> 	else {</div><div class='ctx'> 		error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-				mpu_port, 0, miro-&gt;mpu_irq, IRQF_DISABLED,</div><div class='del'>-				&amp;rmidi);</div><div class='add'>+				mpu_port, 0, miro-&gt;mpu_irq, &amp;rmidi);</div><div class='ctx'> 		if (error &lt; 0)</div><div class='del'>-			snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",</div><div class='del'>-				   mpu_port);</div><div class='add'>+			dev_warn(card-&gt;dev, "no MPU-401 device at 0x%lx?\n",</div><div class='add'>+				 mpu_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port &gt; 0 &amp;&amp; fm_port != SNDRV_AUTO_PORT) {</div><div class='hunk'>@@ -1390,8 +1366,8 @@ static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='ctx'> </div><div class='ctx'> 		if (snd_opl4_create(card, fm_port, fm_port - 8,</div><div class='ctx'> 				    2, &amp;opl3, &amp;opl4) &lt; 0)</div><div class='del'>-			snd_printk(KERN_WARNING "no OPL4 device at 0x%lx\n",</div><div class='del'>-				   fm_port);</div><div class='add'>+			dev_warn(card-&gt;dev, "no OPL4 device at 0x%lx\n",</div><div class='add'>+				 fm_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	error = snd_set_aci_init_values(miro);</div><div class='hunk'>@@ -1401,7 +1377,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n)</div><div class='add'>+static int snd_miro_isa_match(struct device *devptr, unsigned int n)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> 	if (snd_miro_pnp_is_probed)</div><div class='hunk'>@@ -1412,40 +1388,37 @@ static int __devinit snd_miro_isa_match(struct device *devptr, unsigned int n)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n)</div><div class='add'>+static int snd_miro_isa_probe(struct device *devptr, unsigned int n)</div><div class='ctx'> {</div><div class='del'>-	static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};</div><div class='del'>-	static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};</div><div class='del'>-	static int possible_irqs[] = {11, 9, 10, 7, -1};</div><div class='del'>-	static int possible_mpu_irqs[] = {10, 5, 9, 7, -1};</div><div class='del'>-	static int possible_dma1s[] = {3, 1, 0, -1};</div><div class='del'>-	static int possible_dma2s[][2] = { {1, -1}, {0, -1}, {-1, -1},</div><div class='add'>+	static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};</div><div class='add'>+	static const long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};</div><div class='add'>+	static const int possible_irqs[] = {11, 9, 10, 7, -1};</div><div class='add'>+	static const int possible_mpu_irqs[] = {10, 5, 9, 7, -1};</div><div class='add'>+	static const int possible_dma1s[] = {3, 1, 0, -1};</div><div class='add'>+	static const int possible_dma2s[][2] = { {1, -1}, {0, -1}, {-1, -1},</div><div class='ctx'> 					   {0, -1} };</div><div class='ctx'> </div><div class='ctx'> 	int error;</div><div class='ctx'> 	struct snd_miro *miro;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> </div><div class='del'>-	error = snd_card_create(index, id, THIS_MODULE,</div><div class='del'>-				sizeof(struct snd_miro), &amp;card);</div><div class='add'>+	error = snd_devm_card_new(devptr, index, id, THIS_MODULE,</div><div class='add'>+				  sizeof(struct snd_miro), &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	card-&gt;private_free = snd_card_miro_free;</div><div class='ctx'> 	miro = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	error = snd_card_miro_detect(card, miro);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		snd_printk(KERN_ERR "unable to detect OPTi9xx chip\n");</div><div class='add'>+		dev_err(card-&gt;dev, "unable to detect OPTi9xx chip\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (port == SNDRV_AUTO_PORT) {</div><div class='ctx'> 		port = snd_legacy_find_free_ioport(possible_ports, 4);</div><div class='ctx'> 		if (port &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free WSS port\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to find a free WSS port\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1453,9 +1426,8 @@ static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n)</div><div class='ctx'> 	if (mpu_port == SNDRV_AUTO_PORT) {</div><div class='ctx'> 		mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2);</div><div class='ctx'> 		if (mpu_port &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "unable to find a free MPU401 port\n");</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"unable to find a free MPU401 port\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1463,63 +1435,46 @@ static int __devinit snd_miro_isa_probe(struct device *devptr, unsigned int n)</div><div class='ctx'> 	if (irq == SNDRV_AUTO_IRQ) {</div><div class='ctx'> 		irq = snd_legacy_find_free_irq(possible_irqs);</div><div class='ctx'> 		if (irq &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free IRQ\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to find a free IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_irq == SNDRV_AUTO_IRQ) {</div><div class='ctx'> 		mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs);</div><div class='ctx'> 		if (mpu_irq &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "unable to find a free MPU401 IRQ\n");</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"unable to find a free MPU401 IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma1 == SNDRV_AUTO_DMA) {</div><div class='ctx'> 		dma1 = snd_legacy_find_free_dma(possible_dma1s);</div><div class='ctx'> 		if (dma1 &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA1\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to find a free DMA1\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma2 == SNDRV_AUTO_DMA) {</div><div class='ctx'> 		dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4]);</div><div class='ctx'> 		if (dma2 &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA2\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to find a free DMA2\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-</div><div class='ctx'> 	error = snd_miro_probe(card);</div><div class='del'>-	if (error &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_miro_isa_remove(struct device *devptr,</div><div class='del'>-					 unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define DEV_NAME "miro"</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_miro_driver = {</div><div class='ctx'> 	.match		= snd_miro_isa_match,</div><div class='ctx'> 	.probe		= snd_miro_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_miro_isa_remove),</div><div class='ctx'> 	/* FIXME: suspend/resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='hunk'>@@ -1528,9 +1483,9 @@ static struct isa_driver snd_miro_driver = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_miro_pnp(struct snd_miro *chip,</div><div class='del'>-					struct pnp_card_link *card,</div><div class='del'>-					const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_miro_pnp(struct snd_miro *chip,</div><div class='add'>+			     struct pnp_card_link *card,</div><div class='add'>+			     const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1551,14 +1506,14 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AUDIO pnp configure failure: %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(devmc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "MC pnp configure failure: %d\n",</div><div class='del'>-				    err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "MC pnp configure failure: %d\n",</div><div class='add'>+			err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1579,7 +1534,7 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,</div><div class='ctx'> 	if (mpu_port &gt; 0) {</div><div class='ctx'> 		err = pnp_activate_dev(devmpu);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "MPU401 pnp configure failure\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "MPU401 pnp configure failure\n");</div><div class='ctx'> 			mpu_port = -1;</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1589,8 +1544,8 @@ static int __devinit snd_card_miro_pnp(struct snd_miro *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard,</div><div class='del'>-					const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_miro_pnp_probe(struct pnp_card_link *pcard,</div><div class='add'>+			      const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1600,49 +1555,39 @@ static int __devinit snd_miro_pnp_probe(struct pnp_card_link *pcard,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	if (!isapnp)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE,</div><div class='add'>+	err = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev, index, id, THIS_MODULE,</div><div class='ctx'> 				sizeof(struct snd_miro), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	card-&gt;private_free = snd_card_miro_free;</div><div class='ctx'> 	miro = card-&gt;private_data;</div><div class='add'>+	miro-&gt;card = card;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_miro_pnp(miro, pcard, pid);</div><div class='del'>-	if (err) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* only miroSOUND PCM20 and PCM12 == OPTi924 */</div><div class='ctx'> 	err = snd_miro_init(miro, OPTi9XX_HW_82C924);</div><div class='del'>-	if (err) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = snd_miro_opti_check(miro);</div><div class='add'>+	err = snd_miro_opti_check(card, miro);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		snd_printk(KERN_ERR "OPTI chip not found\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		dev_err(card-&gt;dev, "OPTI chip not found\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> 	err = snd_miro_probe(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	snd_miro_pnp_is_probed = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_miro_pnp_remove(struct pnp_card_link * pcard)</div><div class='add'>+static void snd_miro_pnp_remove(struct pnp_card_link *pcard)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='ctx'> 	snd_miro_pnp_is_probed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1651,7 +1596,7 @@ static struct pnp_card_driver miro_pnpc_driver = {</div><div class='ctx'> 	.name		= "miro",</div><div class='ctx'> 	.id_table	= snd_miro_pnpids,</div><div class='ctx'> 	.probe		= snd_miro_pnp_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_miro_pnp_remove),</div><div class='add'>+	.remove		= snd_miro_pnp_remove,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c<br/>index c35dc68930dc..abaa3ed3ab5c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/opti92x-ad1848.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/opti9xx/opti92x-ad1848.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/opti9xx/opti92x-ad1848.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/opti9xx/opti92x-ad1848.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>     card-opti92x-ad1848.c - driver for OPTi 82c92x based soundcards.</div><div class='ctx'>     Copyright (C) 1998-2000 by Massimo Piccioni &lt;dafastidio@libero.it&gt;</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'> </div><div class='ctx'>     Thanks to Maria Grazia Pollarini, Salvatore Vassallo.</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -28,8 +16,8 @@</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -39,6 +27,7 @@</div><div class='ctx'> #ifndef OPTi93X</div><div class='ctx'> #include &lt;sound/opl4.h&gt;</div><div class='ctx'> #endif</div><div class='add'>+#define SNDRV_LEGACY_FIND_FREE_IOPORT</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_IRQ</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_DMA</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -47,25 +36,19 @@ MODULE_AUTHOR("Massimo Piccioni &lt;dafastidio@libero.it&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> #ifdef OPTi93X</div><div class='ctx'> MODULE_DESCRIPTION("OPTi93X");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{OPTi,82C931/3}}");</div><div class='ctx'> #else	/* OPTi93X */</div><div class='ctx'> #ifdef CS4231</div><div class='ctx'> MODULE_DESCRIPTION("OPTi92X - CS4231");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (CS4231)},"</div><div class='del'>-		"{OPTi,82C925 (CS4231)}}");</div><div class='ctx'> #else	/* CS4231 */</div><div class='ctx'> MODULE_DESCRIPTION("OPTi92X - AD1848");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)},"</div><div class='del'>-		"{OPTi,82C925 (AD1848)},"</div><div class='del'>-	        "{OAK,Mozart}}");</div><div class='ctx'> #endif	/* CS4231 */</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;		/* ID for this card */</div><div class='del'>-//static int enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */</div><div class='add'>+//static bool enable = SNDRV_DEFAULT_ENABLE1;	/* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp = 1;			/* Enable ISA PnP detection */</div><div class='add'>+static bool isapnp = true;			/* Enable ISA PnP detection */</div><div class='ctx'> #endif</div><div class='ctx'> static long port = SNDRV_DEFAULT_PORT1; 	/* 0x530,0xe80,0xf40,0x604 */</div><div class='ctx'> static long mpu_port = SNDRV_DEFAULT_PORT1;	/* 0x300,0x310,0x320,0x330 */</div><div class='hunk'>@@ -87,20 +70,20 @@ MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard.");</div><div class='ctx'> module_param(isapnp, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param(port, long, 0444);</div><div class='add'>+module_param_hw(port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");</div><div class='del'>-module_param(mpu_port, long, 0444);</div><div class='add'>+module_param_hw(mpu_port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for opti9xx driver.");</div><div class='del'>-module_param(fm_port, long, 0444);</div><div class='add'>+module_param_hw(fm_port, long, ioport, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for opti9xx driver.");</div><div class='del'>-module_param(irq, int, 0444);</div><div class='add'>+module_param_hw(irq, int, irq, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "WSS irq # for opti9xx driver.");</div><div class='del'>-module_param(mpu_irq, int, 0444);</div><div class='add'>+module_param_hw(mpu_irq, int, irq, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 irq # for opti9xx driver.");</div><div class='del'>-module_param(dma1, int, 0444);</div><div class='add'>+module_param_hw(dma1, int, dma, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "1st dma # for opti9xx driver.");</div><div class='ctx'> #if defined(CS4231) || defined(OPTi93X)</div><div class='del'>-module_param(dma2, int, 0444);</div><div class='add'>+module_param_hw(dma2, int, dma, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "2nd dma # for opti9xx driver.");</div><div class='ctx'> #endif	/* CS4231 || OPTi93X */</div><div class='ctx'> </div><div class='hunk'>@@ -126,6 +109,7 @@ MODULE_PARM_DESC(dma2, "2nd dma # for opti9xx driver.");</div><div class='ctx'> #endif /* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> struct snd_opti9xx {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	unsigned short hardware;</div><div class='ctx'> 	unsigned char password;</div><div class='ctx'> 	char name[7];</div><div class='hunk'>@@ -135,10 +119,9 @@ struct snd_opti9xx {</div><div class='ctx'> 	unsigned long mc_base_size;</div><div class='ctx'> #ifdef OPTi93X</div><div class='ctx'> 	unsigned long mc_indir_index;</div><div class='del'>-	unsigned long mc_indir_size;</div><div class='ctx'> 	struct resource *res_mc_indir;</div><div class='del'>-	struct snd_wss *codec;</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='add'>+	struct snd_wss *codec;</div><div class='ctx'> 	unsigned long pwd_reg;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;</div><div class='hunk'>@@ -151,7 +134,7 @@ static int snd_opti9xx_pnp_is_probed;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_opti9xx_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_opti9xx_pnpids[] = {</div><div class='ctx'> #ifndef OPTi93X</div><div class='ctx'> 	/* OPTi 82C924 */</div><div class='ctx'> 	{ .id = "OPT0924",</div><div class='hunk'>@@ -173,39 +156,22 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);</div><div class='ctx'> </div><div class='ctx'> #endif	/* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-#ifdef OPTi93X</div><div class='del'>-#define DEV_NAME "opti93x"</div><div class='del'>-#else</div><div class='del'>-#define DEV_NAME "opti92x"</div><div class='del'>-#endif</div><div class='add'>+#define DEV_NAME KBUILD_MODNAME</div><div class='ctx'> </div><div class='del'>-static char * snd_opti9xx_names[] = {</div><div class='add'>+static const char * const snd_opti9xx_names[] = {</div><div class='ctx'> 	"unknown",</div><div class='ctx'> 	"82C928",	"82C929",</div><div class='ctx'> 	"82C924",	"82C925",</div><div class='ctx'> 	"82C930",	"82C931",	"82C933"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static long __devinit snd_legacy_find_free_ioport(long *port_table, long size)</div><div class='add'>+static int snd_opti9xx_init(struct snd_opti9xx *chip,</div><div class='add'>+			    unsigned short hardware)</div><div class='ctx'> {</div><div class='del'>-	while (*port_table != -1) {</div><div class='del'>-		if (request_region(*port_table, size, "ALSA test")) {</div><div class='del'>-			release_region(*port_table, size);</div><div class='del'>-			return *port_table;</div><div class='del'>-		}</div><div class='del'>-		port_table++;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,</div><div class='del'>-				      unsigned short hardware)</div><div class='del'>-{</div><div class='del'>-	static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};</div><div class='add'>+	static const int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;hardware = hardware;</div><div class='del'>-	strcpy(chip-&gt;name, snd_opti9xx_names[hardware]);</div><div class='add'>+	strscpy(chip-&gt;name, snd_opti9xx_names[hardware]);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -245,17 +211,15 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,</div><div class='ctx'> 	case OPTi9XX_HW_82C931:</div><div class='ctx'> 	case OPTi9XX_HW_82C933:</div><div class='ctx'> 		chip-&gt;mc_base = (hardware == OPTi9XX_HW_82C930) ? 0xf8f : 0xf8d;</div><div class='del'>-		if (!chip-&gt;mc_indir_index) {</div><div class='add'>+		if (!chip-&gt;mc_indir_index)</div><div class='ctx'> 			chip-&gt;mc_indir_index = 0xe0e;</div><div class='del'>-			chip-&gt;mc_indir_size = 2;</div><div class='del'>-		}</div><div class='ctx'> 		chip-&gt;password = 0xe4;</div><div class='ctx'> 		chip-&gt;pwd_reg = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "chip %d not supported\n", hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "chip %d not supported\n", hardware);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -264,10 +228,9 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,</div><div class='ctx'> static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,</div><div class='ctx'> 				      unsigned char reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char retval = 0xff;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -280,6 +243,7 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,</div><div class='ctx'> 			retval = inb(chip-&gt;mc_base + 9);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case OPTi9XX_HW_82C928:</div><div class='ctx'> 	case OPTi9XX_HW_82C929:</div><div class='hunk'>@@ -297,19 +261,16 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "chip %d not supported\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "chip %d not supported\n", chip-&gt;hardware);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,</div><div class='ctx'> 			      unsigned char value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -322,6 +283,7 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,</div><div class='ctx'> 			outb(value, chip-&gt;mc_base + 9);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case OPTi9XX_HW_82C928:</div><div class='ctx'> 	case OPTi9XX_HW_82C929:</div><div class='hunk'>@@ -339,19 +301,20 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "chip %d not supported\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "chip %d not supported\n", chip-&gt;hardware);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define snd_opti9xx_write_mask(chip, reg, value, mask)	\</div><div class='del'>-	snd_opti9xx_write(chip, reg,			\</div><div class='del'>-		(snd_opti9xx_read(chip, reg) &amp; ~(mask)) | ((value) &amp; (mask)))</div><div class='add'>+static inline void snd_opti9xx_write_mask(struct snd_opti9xx *chip,</div><div class='add'>+		unsigned char reg, unsigned char value, unsigned char mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char oldval = snd_opti9xx_read(chip, reg);</div><div class='ctx'> </div><div class='add'>+	snd_opti9xx_write(chip, reg, (oldval &amp; ~mask) | (value &amp; mask));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='add'>+static int snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> 					   long port,</div><div class='ctx'> 					   int irq, int dma1, int dma2,</div><div class='ctx'> 					   long mpu_port, int mpu_irq)</div><div class='hunk'>@@ -369,6 +332,7 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0xf0, 0xfc);</div><div class='ctx'> 		/* enable wave audio */</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x02);</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case OPTi9XX_HW_82C925:</div><div class='ctx'> 		/* enable WSS mode */</div><div class='hunk'>@@ -403,6 +367,10 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> </div><div class='ctx'> #else	/* OPTi93X */</div><div class='ctx'> 	case OPTi9XX_HW_82C931:</div><div class='add'>+		/* disable 3D sound (set GPIO1 as output, low) */</div><div class='add'>+		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(20), 0x04, 0x0c);</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='ctx'> 	case OPTi9XX_HW_82C933:</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * The BTC 1817DW has QS1000 wavetable which is connected</div><div class='hunk'>@@ -414,7 +382,9 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> 		 * or digital input signal.</div><div class='ctx'> 		 */</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01);</div><div class='del'>-	case OPTi9XX_HW_82C930: /* FALL THROUGH */</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	case OPTi9XX_HW_82C930:</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03);</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff);</div><div class='ctx'> 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0x10 |</div><div class='hunk'>@@ -425,7 +395,7 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "chip %d not supported\n", chip-&gt;hardware);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "chip %d not supported\n", chip-&gt;hardware);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -448,7 +418,7 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,</div><div class='ctx'> 		wss_base_bits = 0x02;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "WSS port 0x%lx not valid\n", port);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "WSS port 0x%lx not valid\n", port);</div><div class='ctx'> 		goto __skip_base;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(1), wss_base_bits &lt;&lt; 4, 0x30);</div><div class='hunk'>@@ -473,7 +443,7 @@ __skip_base:</div><div class='ctx'> 		irq_bits = 0x04;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "WSS irq # %d not valid\n", irq);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "WSS irq # %d not valid\n", irq);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -488,13 +458,13 @@ __skip_base:</div><div class='ctx'> 		dma_bits = 0x03;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "WSS dma1 # %d not valid\n", dma1);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "WSS dma1 # %d not valid\n", dma1);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if defined(CS4231) || defined(OPTi93X)</div><div class='ctx'> 	if (dma1 == dma2) {</div><div class='del'>-		snd_printk(KERN_ERR "don't want to share dmas\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "don't want to share dmas\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -503,14 +473,14 @@ __skip_base:</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "WSS dma2 # %d not valid\n", dma2);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "WSS dma2 # %d not valid\n", dma2);</div><div class='ctx'> 		goto __skip_resources;</div><div class='ctx'> 	}</div><div class='ctx'> 	dma_bits |= 0x04;</div><div class='ctx'> #endif	/* CS4231 || OPTi93X */</div><div class='ctx'> </div><div class='ctx'> #ifndef OPTi93X</div><div class='del'>-	 outb(irq_bits &lt;&lt; 3 | dma_bits, chip-&gt;wss_base);</div><div class='add'>+	outb(irq_bits &lt;&lt; 3 | dma_bits, chip-&gt;wss_base);</div><div class='ctx'> #else /* OPTi93X */</div><div class='ctx'> 	snd_opti9xx_write(chip, OPTi9XX_MC_REG(3), (irq_bits &lt;&lt; 3 | dma_bits));</div><div class='ctx'> #endif /* OPTi93X */</div><div class='hunk'>@@ -534,8 +504,8 @@ __skip_resources:</div><div class='ctx'> 			mpu_port_bits = 0x00;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_WARNING</div><div class='del'>-				   "MPU-401 port 0x%lx not valid\n", mpu_port);</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "MPU-401 port 0x%lx not valid\n", mpu_port);</div><div class='ctx'> 			goto __skip_mpu;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -553,8 +523,8 @@ __skip_resources:</div><div class='ctx'> 			mpu_irq_bits = 0x01;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_WARNING "MPU-401 irq # %d not valid\n",</div><div class='del'>-				mpu_irq);</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev, "MPU-401 irq # %d not valid\n",</div><div class='add'>+				 mpu_irq);</div><div class='ctx'> 			goto __skip_mpu;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -574,7 +544,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_5bit_3db_step, -9300, 300, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_5bit, -4650, 150, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_4bit_12db_max, -3300, 300, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_opti93x_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_opti93x_controls[] = {</div><div class='ctx'> WSS_DOUBLE("Master Playback Switch", 0,</div><div class='ctx'> 		OPTi93X_OUT_LEFT, OPTi93X_OUT_RIGHT, 7, 7, 1, 1),</div><div class='ctx'> WSS_DOUBLE_TLV("Master Playback Volume", 0,</div><div class='hunk'>@@ -606,7 +576,7 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 0,</div><div class='ctx'> 		db_scale_4bit_12db_max),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opti93x_mixer(struct snd_wss *chip)</div><div class='add'>+static int snd_opti93x_mixer(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	unsigned int idx;</div><div class='hunk'>@@ -618,35 +588,35 @@ static int __devinit snd_opti93x_mixer(struct snd_wss *chip)</div><div class='ctx'> </div><div class='ctx'> 	card = chip-&gt;card;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='add'>+	strscpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;id1, 0, sizeof(id1));</div><div class='ctx'> 	memset(&amp;id2, 0, sizeof(id2));</div><div class='ctx'> 	id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	/* reassign AUX0 switch to CD */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch");</div><div class='del'>-	strcpy(id2.name, "CD Playback Switch");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	strscpy(id2.name, "CD Playback Switch");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opti93x control\n");</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opti93x control\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* reassign AUX1 switch to FM */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='del'>-	strcpy(id2.name, "FM Playback Switch");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "FM Playback Switch");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot rename opti93x control\n");</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot rename opti93x control\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* remove AUX1 volume */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume"); id1.index = 1;</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume"); id1.index = 1;</div><div class='ctx'> 	snd_ctl_remove_id(card, &amp;id1);</div><div class='ctx'> </div><div class='ctx'> 	/* Replace WSS volume controls with OPTi93x volume controls */</div><div class='ctx'> 	id1.index = 0;</div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_opti93x_controls); idx++) {</div><div class='del'>-		strcpy(id1.name, snd_opti93x_controls[idx].name);</div><div class='add'>+		strscpy(id1.name, snd_opti93x_controls[idx].name);</div><div class='ctx'> 		snd_ctl_remove_id(card, &amp;id1);</div><div class='ctx'> </div><div class='ctx'> 		err = snd_ctl_add(card,</div><div class='hunk'>@@ -679,16 +649,15 @@ static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> #endif /* OPTi93X */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)</div><div class='add'>+static int snd_opti9xx_read_check(struct snd_card *card,</div><div class='add'>+				  struct snd_opti9xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char value;</div><div class='del'>-#ifdef OPTi93X</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	chip-&gt;res_mc_base = request_region(chip-&gt;mc_base, chip-&gt;mc_base_size,</div><div class='del'>-					   "OPTi9xx MC");</div><div class='del'>-	if (chip-&gt;res_mc_base == NULL)</div><div class='add'>+	chip-&gt;res_mc_base =</div><div class='add'>+		devm_request_region(card-&gt;dev, chip-&gt;mc_base,</div><div class='add'>+				    chip-&gt;mc_base_size, "OPTi9xx MC");</div><div class='add'>+	if (!chip-&gt;res_mc_base)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> #ifndef OPTi93X</div><div class='ctx'> 	value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(1));</div><div class='hunk'>@@ -696,33 +665,33 @@ static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)</div><div class='ctx'> 		if (value == snd_opti9xx_read(chip, OPTi9XX_MC_REG(1)))</div><div class='ctx'> 			return 0;</div><div class='ctx'> #else	/* OPTi93X */</div><div class='del'>-	chip-&gt;res_mc_indir = request_region(chip-&gt;mc_indir_index,</div><div class='del'>-					    chip-&gt;mc_indir_size,</div><div class='del'>-					    "OPTi93x MC");</div><div class='del'>-	if (chip-&gt;res_mc_indir == NULL)</div><div class='add'>+	chip-&gt;res_mc_indir =</div><div class='add'>+		devm_request_region(card-&gt;dev, chip-&gt;mc_indir_index, 2,</div><div class='add'>+				    "OPTi93x MC");</div><div class='add'>+	if (!chip-&gt;res_mc_indir)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='del'>-	outb(((chip-&gt;mc_indir_index &amp; 0x1f0) &gt;&gt; 4), chip-&gt;mc_base);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;lock) {</div><div class='add'>+		outb(chip-&gt;password, chip-&gt;mc_base + chip-&gt;pwd_reg);</div><div class='add'>+		outb(((chip-&gt;mc_indir_index &amp; 0x1f0) &gt;&gt; 4), chip-&gt;mc_base);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(7));</div><div class='ctx'> 	snd_opti9xx_write(chip, OPTi9XX_MC_REG(7), 0xff - value);</div><div class='ctx'> 	if (snd_opti9xx_read(chip, OPTi9XX_MC_REG(7)) == 0xff - value)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	release_and_free_resource(chip-&gt;res_mc_indir);</div><div class='add'>+	devm_release_resource(card-&gt;dev, chip-&gt;res_mc_indir);</div><div class='ctx'> 	chip-&gt;res_mc_indir = NULL;</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='del'>-	release_and_free_resource(chip-&gt;res_mc_base);</div><div class='add'>+	devm_release_resource(card-&gt;dev, chip-&gt;res_mc_base);</div><div class='ctx'> 	chip-&gt;res_mc_base = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_opti9xx_detect(struct snd_card *card,</div><div class='del'>-					     struct snd_opti9xx *chip)</div><div class='add'>+static int snd_card_opti9xx_detect(struct snd_card *card,</div><div class='add'>+				   struct snd_opti9xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='hunk'>@@ -735,7 +704,7 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card,</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = snd_opti9xx_read_check(chip);</div><div class='add'>+		err = snd_opti9xx_read_check(card, chip);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			return 1;</div><div class='ctx'> #ifdef OPTi93X</div><div class='hunk'>@@ -746,9 +715,9 @@ static int __devinit snd_card_opti9xx_detect(struct snd_card *card,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='del'>-					  struct pnp_card_link *card,</div><div class='del'>-					  const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='add'>+				struct pnp_card_link *card,</div><div class='add'>+				const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -763,15 +732,16 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AUDIO pnp configure failure: %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef OPTi93X</div><div class='ctx'> 	port = pnp_port_start(pdev, 0) - 4;</div><div class='ctx'> 	fm_port = pnp_port_start(pdev, 1) + 8;</div><div class='del'>-	chip-&gt;mc_indir_index = pnp_port_start(pdev, 3) + 2;</div><div class='del'>-	chip-&gt;mc_indir_size = pnp_port_len(pdev, 3) - 2;</div><div class='add'>+	/* adjust mc_indir_index - some cards report it at 0xe?d,</div><div class='add'>+	   other at 0xe?c but it really is always at 0xe?e */</div><div class='add'>+	chip-&gt;mc_indir_index = (pnp_port_start(pdev, 3) &amp; ~0xf) | 0xe;</div><div class='ctx'> #else</div><div class='ctx'> 	devmc = pnp_request_card_device(card, pid-&gt;devs[2].id, NULL);</div><div class='ctx'> 	if (devmc == NULL)</div><div class='hunk'>@@ -779,7 +749,7 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(devmc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "MC pnp configure failure: %d\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "MC pnp configure failure: %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -803,7 +773,7 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='ctx'> 	if (devmpu &amp;&amp; mpu_port &gt; 0) {</div><div class='ctx'> 		err = pnp_activate_dev(devmpu);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "MPU401 pnp configure failure\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "MPU401 pnp configure failure\n");</div><div class='ctx'> 			mpu_port = -1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			mpu_port = pnp_port_start(devmpu, 0);</div><div class='hunk'>@@ -814,33 +784,13 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,</div><div class='ctx'> }</div><div class='ctx'> #endif	/* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-static void snd_card_opti9xx_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_opti9xx *chip = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (chip) {</div><div class='del'>-#ifdef OPTi93X</div><div class='del'>-		if (chip-&gt;irq &gt; 0) {</div><div class='del'>-			disable_irq(chip-&gt;irq);</div><div class='del'>-			free_irq(chip-&gt;irq, chip);</div><div class='del'>-		}</div><div class='del'>-		release_and_free_resource(chip-&gt;res_mc_indir);</div><div class='del'>-#endif</div><div class='del'>-		release_and_free_resource(chip-&gt;res_mc_base);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='add'>+static int snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};</div><div class='add'>+	static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};</div><div class='ctx'> 	int error;</div><div class='ctx'> 	int xdma2;</div><div class='ctx'> 	struct snd_opti9xx *chip = card-&gt;private_data;</div><div class='ctx'> 	struct snd_wss *codec;</div><div class='del'>-#ifdef CS4231</div><div class='del'>-	struct snd_timer *timer;</div><div class='del'>-#endif</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	struct snd_hwdep *synth;</div><div class='ctx'> </div><div class='hunk'>@@ -853,7 +803,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> 	if (port == SNDRV_AUTO_PORT) {</div><div class='ctx'> 		port = snd_legacy_find_free_ioport(possible_ports, 4);</div><div class='ctx'> 		if (port &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free WSS port\n");</div><div class='add'>+			dev_err(card-&gt;dev, "unable to find a free WSS port\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -871,10 +821,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> 			       &amp;codec);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-#ifdef OPTi93X</div><div class='ctx'> 	chip-&gt;codec = codec;</div><div class='del'>-#endif</div><div class='del'>-	error = snd_wss_pcm(codec, 0, &amp;pcm);</div><div class='add'>+	error = snd_wss_pcm(codec, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	error = snd_wss_mixer(codec);</div><div class='hunk'>@@ -886,38 +834,42 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> 		return error;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CS4231</div><div class='del'>-	error = snd_wss_timer(codec, 0, &amp;timer);</div><div class='add'>+	error = snd_wss_timer(codec, 0);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef OPTi93X</div><div class='del'>-	error = request_irq(irq, snd_opti93x_interrupt,</div><div class='del'>-			    IRQF_DISABLED, DEV_NAME" - WSS", chip);</div><div class='add'>+	error = devm_request_irq(card-&gt;dev, irq, snd_opti93x_interrupt,</div><div class='add'>+				 0, DEV_NAME" - WSS", chip);</div><div class='ctx'> 	if (error &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq);</div><div class='add'>+		dev_err(card-&gt;dev, "opti9xx: can't grab IRQ %d\n", irq);</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='del'>-	strcpy(card-&gt;driver, chip-&gt;name);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	strscpy(card-&gt;driver, chip-&gt;name);</div><div class='ctx'> 	sprintf(card-&gt;shortname, "OPTi %s", card-&gt;driver);</div><div class='ctx'> #if defined(CS4231) || defined(OPTi93X)</div><div class='del'>-	sprintf(card-&gt;longname, "%s, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='del'>-		card-&gt;shortname, pcm-&gt;name,</div><div class='del'>-		chip-&gt;wss_base + 4, irq, dma1, xdma2);</div><div class='add'>+	scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		  "%s, %s at 0x%lx, irq %d, dma %d&amp;%d",</div><div class='add'>+		  card-&gt;shortname, codec-&gt;pcm-&gt;name,</div><div class='add'>+		  chip-&gt;wss_base + 4, irq, dma1, xdma2);</div><div class='ctx'> #else</div><div class='del'>-	sprintf(card-&gt;longname, "%s, %s at 0x%lx, irq %d, dma %d",</div><div class='del'>-		card-&gt;shortname, pcm-&gt;name, chip-&gt;wss_base + 4, irq, dma1);</div><div class='add'>+	scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		  "%s, %s at 0x%lx, irq %d, dma %d",</div><div class='add'>+		  card-&gt;shortname, codec-&gt;pcm-&gt;name, chip-&gt;wss_base + 4, irq,</div><div class='add'>+		  dma1);</div><div class='ctx'> #endif	/* CS4231 || OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port &lt;= 0 || mpu_port == SNDRV_AUTO_PORT)</div><div class='ctx'> 		rmidi = NULL;</div><div class='ctx'> 	else {</div><div class='ctx'> 		error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-				mpu_port, 0, mpu_irq, IRQF_DISABLED, &amp;rmidi);</div><div class='add'>+				mpu_port, 0, mpu_irq, &amp;rmidi);</div><div class='ctx'> 		if (error)</div><div class='del'>-			snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",</div><div class='del'>-				   mpu_port);</div><div class='add'>+			dev_warn(card-&gt;dev, "no MPU-401 device at 0x%lx?\n",</div><div class='add'>+				 mpu_port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fm_port &gt; 0 &amp;&amp; fm_port != SNDRV_AUTO_PORT) {</div><div class='hunk'>@@ -940,8 +892,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> #endif	/* !OPTi93X */</div><div class='ctx'> 		if (!opl3 &amp;&amp; snd_opl3_create(card, fm_port, fm_port + 2,</div><div class='ctx'> 					     OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "no OPL device at 0x%lx-0x%lx\n",</div><div class='del'>-				   fm_port, fm_port + 4 - 1);</div><div class='add'>+			dev_warn(card-&gt;dev, "no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+				 fm_port, fm_port + 4 - 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (opl3) {</div><div class='ctx'> 			error = snd_opl3_hwdep_new(opl3, 0, 1, &amp;synth);</div><div class='hunk'>@@ -953,22 +905,21 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_opti9xx_card_new(struct snd_card **cardp)</div><div class='add'>+static int snd_opti9xx_card_new(struct device *pdev, struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_opti9xx), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_opti9xx), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	card-&gt;private_free = snd_card_opti9xx_free;</div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opti9xx_isa_match(struct device *devptr,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_opti9xx_isa_match(struct device *devptr,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> 	if (snd_opti9xx_pnp_is_probed)</div><div class='hunk'>@@ -979,94 +930,131 @@ static int __devinit snd_opti9xx_isa_match(struct device *devptr,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_opti9xx_isa_probe(struct device *devptr,</div><div class='del'>-					   unsigned int dev)</div><div class='add'>+static int snd_opti9xx_isa_probe(struct device *devptr,</div><div class='add'>+				 unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int error;</div><div class='del'>-	static long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};</div><div class='add'>+	static const long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};</div><div class='ctx'> #ifdef OPTi93X</div><div class='del'>-	static int possible_irqs[] = {5, 9, 10, 11, 7, -1};</div><div class='add'>+	static const int possible_irqs[] = {5, 9, 10, 11, 7, -1};</div><div class='ctx'> #else</div><div class='del'>-	static int possible_irqs[] = {9, 10, 11, 7, -1};</div><div class='add'>+	static const int possible_irqs[] = {9, 10, 11, 7, -1};</div><div class='ctx'> #endif	/* OPTi93X */</div><div class='del'>-	static int possible_mpu_irqs[] = {5, 9, 10, 7, -1};</div><div class='del'>-	static int possible_dma1s[] = {3, 1, 0, -1};</div><div class='add'>+	static const int possible_mpu_irqs[] = {5, 9, 10, 7, -1};</div><div class='add'>+	static const int possible_dma1s[] = {3, 1, 0, -1};</div><div class='ctx'> #if defined(CS4231) || defined(OPTi93X)</div><div class='del'>-	static int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};</div><div class='add'>+	static const int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};</div><div class='ctx'> #endif	/* CS4231 || OPTi93X */</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port == SNDRV_AUTO_PORT) {</div><div class='del'>-		if ((mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free MPU401 port\n");</div><div class='add'>+		mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2);</div><div class='add'>+		if (mpu_port &lt; 0) {</div><div class='add'>+			dev_err(devptr, "unable to find a free MPU401 port\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (irq == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((irq = snd_legacy_find_free_irq(possible_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free IRQ\n");</div><div class='add'>+		irq = snd_legacy_find_free_irq(possible_irqs);</div><div class='add'>+		if (irq &lt; 0) {</div><div class='add'>+			dev_err(devptr, "unable to find a free IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_irq == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free MPU401 IRQ\n");</div><div class='add'>+		mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs);</div><div class='add'>+		if (mpu_irq &lt; 0) {</div><div class='add'>+			dev_err(devptr, "unable to find a free MPU401 IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma1 == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma1 = snd_legacy_find_free_dma(possible_dma1s)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA1\n");</div><div class='add'>+		dma1 = snd_legacy_find_free_dma(possible_dma1s);</div><div class='add'>+		if (dma1 &lt; 0) {</div><div class='add'>+			dev_err(devptr, "unable to find a free DMA1\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #if defined(CS4231) || defined(OPTi93X)</div><div class='ctx'> 	if (dma2 == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4])) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA2\n");</div><div class='add'>+		dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4]);</div><div class='add'>+		if (dma2 &lt; 0) {</div><div class='add'>+			dev_err(devptr, "unable to find a free DMA2\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	error = snd_opti9xx_card_new(&amp;card);</div><div class='add'>+	error = snd_opti9xx_card_new(devptr, &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_card_opti9xx_detect(card, card-&gt;private_data)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_card_opti9xx_detect(card, card-&gt;private_data);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-	if ((error = snd_opti9xx_probe(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_opti9xx_probe(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	dev_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_opti9xx_isa_remove(struct device *devptr,</div><div class='del'>-					    unsigned int dev)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int snd_opti9xx_suspend(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct snd_opti9xx *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+	chip-&gt;codec-&gt;suspend(chip-&gt;codec);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_opti9xx_resume(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='add'>+	struct snd_opti9xx *chip = card-&gt;private_data;</div><div class='add'>+	int error, xdma2;</div><div class='add'>+#if defined(CS4231) || defined(OPTi93X)</div><div class='add'>+	xdma2 = dma2;</div><div class='add'>+#else</div><div class='add'>+	xdma2 = -1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	error = snd_opti9xx_configure(chip, port, irq, dma1, xdma2,</div><div class='add'>+				      mpu_port, mpu_irq);</div><div class='add'>+	if (error)</div><div class='add'>+		return error;</div><div class='add'>+	chip-&gt;codec-&gt;resume(chip-&gt;codec);</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_opti9xx_isa_suspend(struct device *dev, unsigned int n,</div><div class='add'>+				   pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	return snd_opti9xx_suspend(dev_get_drvdata(dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return snd_opti9xx_resume(dev_get_drvdata(dev));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct isa_driver snd_opti9xx_driver = {</div><div class='ctx'> 	.match		= snd_opti9xx_isa_match,</div><div class='ctx'> 	.probe		= snd_opti9xx_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_opti9xx_isa_remove),</div><div class='del'>-	/* FIXME: suspend/resume */</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= snd_opti9xx_isa_suspend,</div><div class='add'>+	.resume		= snd_opti9xx_isa_resume,</div><div class='add'>+#endif</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,</div><div class='del'>-					   const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,</div><div class='add'>+				 const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int error, hw;</div><div class='hunk'>@@ -1076,10 +1064,11 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	if (! isapnp)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	error = snd_opti9xx_card_new(&amp;card);</div><div class='add'>+	error = snd_opti9xx_card_new(&amp;pcard-&gt;card-&gt;dev, &amp;card);</div><div class='ctx'> 	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='ctx'> 	chip = card-&gt;private_data;</div><div class='add'>+	chip-&gt;card = card;</div><div class='ctx'> </div><div class='ctx'> 	hw = snd_card_opti9xx_pnp(chip, pcard, pid);</div><div class='ctx'> 	switch (hw) {</div><div class='hunk'>@@ -1093,43 +1082,53 @@ static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,</div><div class='ctx'> 		hw = OPTi9XX_HW_82C931;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_card_free(card);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((error = snd_opti9xx_init(chip, hw))) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_opti9xx_init(chip, hw);</div><div class='add'>+	if (error)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='del'>-	error = snd_opti9xx_read_check(chip);</div><div class='add'>+	error = snd_opti9xx_read_check(card, chip);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		snd_printk(KERN_ERR "OPTI chip not found\n");</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		dev_err(card-&gt;dev, "OPTI chip not found\n");</div><div class='ctx'> 		return error;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-	if ((error = snd_opti9xx_probe(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	error = snd_opti9xx_probe(card);</div><div class='add'>+	if (error &lt; 0)</div><div class='ctx'> 		return error;</div><div class='del'>-	}</div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	snd_opti9xx_pnp_is_probed = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_opti9xx_pnp_remove(struct pnp_card_link * pcard)</div><div class='add'>+static void snd_opti9xx_pnp_remove(struct pnp_card_link *pcard)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='ctx'> 	snd_opti9xx_pnp_is_probed = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int snd_opti9xx_pnp_suspend(struct pnp_card_link *pcard,</div><div class='add'>+				   pm_message_t state)</div><div class='add'>+{</div><div class='add'>+	return snd_opti9xx_suspend(pnp_get_card_drvdata(pcard));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_opti9xx_pnp_resume(struct pnp_card_link *pcard)</div><div class='add'>+{</div><div class='add'>+	return snd_opti9xx_resume(pnp_get_card_drvdata(pcard));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static struct pnp_card_driver opti9xx_pnpc_driver = {</div><div class='ctx'> 	.flags		= PNP_DRIVER_RES_DISABLE,</div><div class='del'>-	.name		= "opti9xx",</div><div class='add'>+	.name		= DEV_NAME,</div><div class='ctx'> 	.id_table	= snd_opti9xx_pnpids,</div><div class='ctx'> 	.probe		= snd_opti9xx_pnp_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_opti9xx_pnp_remove),</div><div class='add'>+	.remove		= snd_opti9xx_pnp_remove,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.suspend	= snd_opti9xx_pnp_suspend,</div><div class='add'>+	.resume		= snd_opti9xx_pnp_resume,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile<br/>index 08b9fb974658..96a926feb17a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/Makefile</a></div><div class='hunk'>@@ -1,17 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-sb-common-objs := sb_common.o sb_mixer.o</div><div class='del'>-snd-sb8-dsp-objs := sb8_main.o sb8_midi.o</div><div class='del'>-snd-sb16-dsp-objs := sb16_main.o</div><div class='del'>-snd-sb16-csp-objs := sb16_csp.o</div><div class='del'>-snd-sb8-objs := sb8.o</div><div class='del'>-snd-sb16-objs := sb16.o</div><div class='del'>-snd-sbawe-objs := sbawe.o emu8000.o</div><div class='del'>-snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o</div><div class='del'>-snd-jazz16-objs := jazz16.o</div><div class='add'>+snd-sb-common-y := sb_common.o sb_mixer.o</div><div class='add'>+snd-sb8-dsp-y := sb8_main.o sb8_midi.o</div><div class='add'>+snd-sb16-dsp-y := sb16_main.o</div><div class='add'>+snd-sb16-csp-y := sb16_csp.o</div><div class='add'>+snd-sb8-y := sb8.o</div><div class='add'>+snd-sb16-y := sb16.o</div><div class='add'>+snd-sbawe-y := sbawe.o emu8000.o</div><div class='add'>+snd-emu8000-synth-y := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o</div><div class='add'>+snd-jazz16-y := jazz16.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o</div><div class='head'>diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c<br/>index 0c40951b6523..12c296ee34ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000.c</a></div><div class='hunk'>@@ -1,35 +1,24 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *     and (c) 1999 Steve Ratcliffe &lt;steve@parabola.demon.co.uk&gt;</div><div class='ctx'>  *  Copyright (C) 1999-2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Routines for control of EMU8000 chip</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu8000.h&gt;</div><div class='ctx'> #include &lt;sound/emu8000_reg.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -46,60 +35,49 @@</div><div class='ctx'> /* Write a word */</div><div class='ctx'> void snd_emu8000_poke(struct snd_emu8000 *emu, unsigned int port, unsigned int reg, unsigned int val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	if (reg != emu-&gt;last_reg) {</div><div class='ctx'> 		outw((unsigned short)reg, EMU8000_PTR(emu)); /* Set register */</div><div class='ctx'> 		emu-&gt;last_reg = reg;</div><div class='ctx'> 	}</div><div class='ctx'> 	outw((unsigned short)val, port); /* Send data */</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read a word */</div><div class='ctx'> unsigned short snd_emu8000_peek(struct snd_emu8000 *emu, unsigned int port, unsigned int reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned short res;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	if (reg != emu-&gt;last_reg) {</div><div class='ctx'> 		outw((unsigned short)reg, EMU8000_PTR(emu)); /* Set register */</div><div class='ctx'> 		emu-&gt;last_reg = reg;</div><div class='ctx'> 	}</div><div class='del'>-	res = inw(port);	/* Read data */</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	return inw(port);	/* Read data */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Write a double word */</div><div class='ctx'> void snd_emu8000_poke_dw(struct snd_emu8000 *emu, unsigned int port, unsigned int reg, unsigned int val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	if (reg != emu-&gt;last_reg) {</div><div class='ctx'> 		outw((unsigned short)reg, EMU8000_PTR(emu)); /* Set register */</div><div class='ctx'> 		emu-&gt;last_reg = reg;</div><div class='ctx'> 	}</div><div class='ctx'> 	outw((unsigned short)val, port); /* Send low word of data */</div><div class='ctx'> 	outw((unsigned short)(val&gt;&gt;16), port+2); /* Send high word of data */</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read a double word */</div><div class='ctx'> unsigned int snd_emu8000_peek_dw(struct snd_emu8000 *emu, unsigned int port, unsigned int reg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short low;</div><div class='del'>-	unsigned int res;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	if (reg != emu-&gt;last_reg) {</div><div class='ctx'> 		outw((unsigned short)reg, EMU8000_PTR(emu)); /* Set register */</div><div class='ctx'> 		emu-&gt;last_reg = reg;</div><div class='ctx'> 	}</div><div class='ctx'> 	low = inw(port);	/* Read low word of data */</div><div class='del'>-	res = low + (inw(port+2) &lt;&lt; 16);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-	return res;</div><div class='add'>+	return low + (inw(port+2) &lt;&lt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -130,7 +108,7 @@ snd_emu8000_dma_chan(struct snd_emu8000 *emu, int ch, int mode)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_emu8000_read_wait(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	while ((EMU8000_SMALR_READ(emu) &amp; 0x80000000) != 0) {</div><div class='hunk'>@@ -142,7 +120,7 @@ snd_emu8000_read_wait(struct snd_emu8000 *emu)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_emu8000_write_wait(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	while ((EMU8000_SMALW_READ(emu) &amp; 0x80000000) != 0) {</div><div class='hunk'>@@ -155,7 +133,7 @@ snd_emu8000_write_wait(struct snd_emu8000 *emu)</div><div class='ctx'> /*</div><div class='ctx'>  * detect a card at the given port</div><div class='ctx'>  */</div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_emu8000_detect(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	/* Initialise */</div><div class='hunk'>@@ -172,8 +150,8 @@ snd_emu8000_detect(struct snd_emu8000 *emu)</div><div class='ctx'> 	if ((EMU8000_HWCF2_READ(emu) &amp; 0x0003) != 0x0003)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("EMU8000 [0x%lx]: Synth chip found\n",</div><div class='del'>-                    emu-&gt;port1);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "EMU8000 [0x%lx]: Synth chip found\n",</div><div class='add'>+		emu-&gt;port1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -181,7 +159,7 @@ snd_emu8000_detect(struct snd_emu8000 *emu)</div><div class='ctx'> /*</div><div class='ctx'>  * intiailize audio channels</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> init_audio(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int ch;</div><div class='hunk'>@@ -222,7 +200,7 @@ init_audio(struct snd_emu8000 *emu)</div><div class='ctx'> /*</div><div class='ctx'>  * initialize DMA address</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> init_dma(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	EMU8000_SMALR_WRITE(emu, 0);</div><div class='hunk'>@@ -234,7 +212,7 @@ init_dma(struct snd_emu8000 *emu)</div><div class='ctx'> /*</div><div class='ctx'>  * initialization arrays; from ADIP</div><div class='ctx'>  */</div><div class='del'>-static unsigned short init1[128] /*__devinitdata*/ = {</div><div class='add'>+static const unsigned short init1[128] = {</div><div class='ctx'> 	0x03ff, 0x0030,  0x07ff, 0x0130, 0x0bff, 0x0230,  0x0fff, 0x0330,</div><div class='ctx'> 	0x13ff, 0x0430,  0x17ff, 0x0530, 0x1bff, 0x0630,  0x1fff, 0x0730,</div><div class='ctx'> 	0x23ff, 0x0830,  0x27ff, 0x0930, 0x2bff, 0x0a30,  0x2fff, 0x0b30,</div><div class='hunk'>@@ -256,7 +234,7 @@ static unsigned short init1[128] /*__devinitdata*/ = {</div><div class='ctx'> 	0xf3ff, 0x0c30,  0xf7ff, 0x0d30, 0xfbff, 0x0e30,  0xffff, 0x0f30,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short init2[128] /*__devinitdata*/ = {</div><div class='add'>+static const unsigned short init2[128] = {</div><div class='ctx'> 	0x03ff, 0x8030, 0x07ff, 0x8130, 0x0bff, 0x8230, 0x0fff, 0x8330,</div><div class='ctx'> 	0x13ff, 0x8430, 0x17ff, 0x8530, 0x1bff, 0x8630, 0x1fff, 0x8730,</div><div class='ctx'> 	0x23ff, 0x8830, 0x27ff, 0x8930, 0x2bff, 0x8a30, 0x2fff, 0x8b30,</div><div class='hunk'>@@ -278,7 +256,7 @@ static unsigned short init2[128] /*__devinitdata*/ = {</div><div class='ctx'> 	0xf3ff, 0x8c30, 0xf7ff, 0x8d30, 0xfbff, 0x8e30, 0xffff, 0x8f30,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short init3[128] /*__devinitdata*/ = {</div><div class='add'>+static const unsigned short init3[128] = {</div><div class='ctx'> 	0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,</div><div class='ctx'> 	0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x8F7C, 0x167E, 0xF254,</div><div class='ctx'> 	0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x8BAA, 0x1B6D, 0xF234,</div><div class='hunk'>@@ -300,7 +278,7 @@ static unsigned short init3[128] /*__devinitdata*/ = {</div><div class='ctx'> 	0x1342, 0xD36E, 0x3EC7, 0xB3FF, 0x0000, 0x8365, 0x1420, 0x9570,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short init4[128] /*__devinitdata*/ = {</div><div class='add'>+static const unsigned short init4[128] = {</div><div class='ctx'> 	0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,</div><div class='ctx'> 	0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x0F7C, 0x167E, 0x7254,</div><div class='ctx'> 	0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x0BAA, 0x1B6D, 0x7234,</div><div class='hunk'>@@ -326,11 +304,11 @@ static unsigned short init4[128] /*__devinitdata*/ = {</div><div class='ctx'>  * Taken from the oss driver, not obvious from the doc how this</div><div class='ctx'>  * is meant to work</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='del'>-send_array(struct snd_emu8000 *emu, unsigned short *data, int size)</div><div class='add'>+static void</div><div class='add'>+send_array(struct snd_emu8000 *emu, const unsigned short *data, int size)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned short *p;</div><div class='add'>+	const unsigned short *p;</div><div class='ctx'> </div><div class='ctx'> 	p = data;</div><div class='ctx'> 	for (i = 0; i &lt; size; i++, p++)</div><div class='hunk'>@@ -348,7 +326,7 @@ send_array(struct snd_emu8000 *emu, unsigned short *data, int size)</div><div class='ctx'>  * Send initialization arrays to start up, this just follows the</div><div class='ctx'>  * initialisation sequence in the adip.</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> init_arrays(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	send_array(emu, init1, ARRAY_SIZE(init1)/4);</div><div class='hunk'>@@ -370,20 +348,19 @@ init_arrays(struct snd_emu8000 *emu)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Size the onboard memory.</div><div class='del'>- * This is written so as not to need arbitary delays after the write. It</div><div class='add'>+ * This is written so as not to need arbitrary delays after the write. It</div><div class='ctx'>  * seems that the only way to do this is to use the one channel and keep</div><div class='ctx'>  * reallocating between read and write.</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='del'>-	int i, size, detected_size;</div><div class='add'>+	int i, size;</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;dram_checked)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	size = 0;</div><div class='del'>-	detected_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* write out a magic number */</div><div class='ctx'> 	snd_emu8000_dma_chan(emu, 0, EMU8000_RAM_WRITE);</div><div class='hunk'>@@ -391,10 +368,19 @@ size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> 	EMU8000_SMALW_WRITE(emu, EMU8000_DRAM_OFFSET);</div><div class='ctx'> 	EMU8000_SMLD_WRITE(emu, UNIQUE_ID1);</div><div class='ctx'> 	snd_emu8000_init_fm(emu); /* This must really be here and not 2 lines back even */</div><div class='add'>+	snd_emu8000_write_wait(emu);</div><div class='ctx'> </div><div class='del'>-	while (size &lt; EMU8000_MAX_DRAM) {</div><div class='add'>+	/*</div><div class='add'>+	 * Detect first 512 KiB.  If a write succeeds at the beginning of a</div><div class='add'>+	 * 512 KiB page we assume that the whole page is there.</div><div class='add'>+	 */</div><div class='add'>+	EMU8000_SMALR_WRITE(emu, EMU8000_DRAM_OFFSET);</div><div class='add'>+	EMU8000_SMLD_READ(emu); /* discard stale data  */</div><div class='add'>+	if (EMU8000_SMLD_READ(emu) != UNIQUE_ID1)</div><div class='add'>+		goto skip_detect;   /* No RAM */</div><div class='add'>+	snd_emu8000_read_wait(emu);</div><div class='ctx'> </div><div class='del'>-		size += 512 * 1024;  /* increment 512kbytes */</div><div class='add'>+	for (size = 512 * 1024; size &lt; EMU8000_MAX_DRAM; size += 512 * 1024) {</div><div class='ctx'> </div><div class='ctx'> 		/* Write a unique data on the test address.</div><div class='ctx'> 		 * if the address is out of range, the data is written on</div><div class='hunk'>@@ -416,9 +402,6 @@ size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> 		EMU8000_SMLD_READ(emu); /* discard stale data  */</div><div class='ctx'> 		if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2)</div><div class='ctx'> 			break; /* no memory at this address */</div><div class='del'>-</div><div class='del'>-		detected_size = size;</div><div class='del'>-</div><div class='ctx'> 		snd_emu8000_read_wait(emu);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -431,8 +414,11 @@ size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> 		if (EMU8000_SMLD_READ(emu) != UNIQUE_ID1)</div><div class='ctx'> 			break; /* we must have wrapped around */</div><div class='ctx'> 		snd_emu8000_read_wait(emu);</div><div class='add'>+</div><div class='add'>+		/* Otherwise, it's valid memory. */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+skip_detect:</div><div class='ctx'> 	/* wait until FULL bit in SMAxW register is false */</div><div class='ctx'> 	for (i = 0; i &lt; 10000; i++) {</div><div class='ctx'> 		if ((EMU8000_SMALW_READ(emu) &amp; 0x80000000) == 0)</div><div class='hunk'>@@ -444,10 +430,10 @@ size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> 	snd_emu8000_dma_chan(emu, 0, EMU8000_RAM_CLOSE);</div><div class='ctx'> 	snd_emu8000_dma_chan(emu, 1, EMU8000_RAM_CLOSE);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("EMU8000 [0x%lx]: %d Kb on-board memory detected\n",</div><div class='del'>-		    emu-&gt;port1, detected_size/1024);</div><div class='add'>+	pr_info("EMU8000 [0x%lx]: %d KiB on-board DRAM detected\n",</div><div class='add'>+		    emu-&gt;port1, size/1024);</div><div class='ctx'> </div><div class='del'>-	emu-&gt;mem_size = detected_size;</div><div class='add'>+	emu-&gt;mem_size = size;</div><div class='ctx'> 	emu-&gt;dram_checked = 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -459,8 +445,6 @@ size_dram(struct snd_emu8000 *emu)</div><div class='ctx'> /*exported*/ void</div><div class='ctx'> snd_emu8000_init_fm(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	/* Initialize the last two channels for DRAM refresh and producing</div><div class='ctx'> 	   the reverb and chorus effects for Yamaha OPL-3 synthesizer */</div><div class='ctx'> </div><div class='hunk'>@@ -482,12 +466,12 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu)</div><div class='ctx'> </div><div class='ctx'> 	snd_emu8000_poke((emu), EMU8000_DATA0(emu), EMU8000_CMD(1, (30)), 0);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-	while (!(inw(EMU8000_PTR(emu)) &amp; 0x1000))</div><div class='del'>-		;</div><div class='del'>-	while ((inw(EMU8000_PTR(emu)) &amp; 0x1000))</div><div class='del'>-		;</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;reg_lock) {</div><div class='add'>+		while (!(inw(EMU8000_PTR(emu)) &amp; 0x1000))</div><div class='add'>+			;</div><div class='add'>+		while ((inw(EMU8000_PTR(emu)) &amp; 0x1000))</div><div class='add'>+			;</div><div class='add'>+	}</div><div class='ctx'> 	snd_emu8000_poke((emu), EMU8000_DATA0(emu), EMU8000_CMD(1, (30)), 0x4828);</div><div class='ctx'> 	/* this is really odd part.. */</div><div class='ctx'> 	outb(0x3C, EMU8000_PTR(emu));</div><div class='hunk'>@@ -502,7 +486,7 @@ snd_emu8000_init_fm(struct snd_emu8000 *emu)</div><div class='ctx'> /*</div><div class='ctx'>  * The main initialization routine.</div><div class='ctx'>  */</div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_emu8000_init_hw(struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -552,7 +536,7 @@ snd_emu8000_init_hw(struct snd_emu8000 *emu)</div><div class='ctx'>  * Bass/Treble Equalizer</div><div class='ctx'>  *----------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static unsigned short bass_parm[12][3] = {</div><div class='add'>+static const unsigned short bass_parm[12][3] = {</div><div class='ctx'> 	{0xD26A, 0xD36A, 0x0000}, /* -12 dB */</div><div class='ctx'> 	{0xD25B, 0xD35B, 0x0000}, /*  -8 */</div><div class='ctx'> 	{0xD24C, 0xD34C, 0x0000}, /*  -6 */</div><div class='hunk'>@@ -567,7 +551,7 @@ static unsigned short bass_parm[12][3] = {</div><div class='ctx'> 	{0xC26A, 0xC36A, 0x0002}, /* +12 dB */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned short treble_parm[12][9] = {</div><div class='add'>+static const unsigned short treble_parm[12][9] = {</div><div class='ctx'> 	{0x821E, 0xC26A, 0x031E, 0xC36A, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001}, /* -12 dB */</div><div class='ctx'> 	{0x821E, 0xC25B, 0x031E, 0xC35B, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001},</div><div class='ctx'> 	{0x821E, 0xC24C, 0x031E, 0xC34C, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001},</div><div class='hunk'>@@ -656,7 +640,7 @@ snd_emu8000_load_chorus_fx(struct snd_emu8000 *emu, int mode, const void __user</div><div class='ctx'> {</div><div class='ctx'> 	struct soundfont_chorus_fx rec;</div><div class='ctx'> 	if (mode &lt; SNDRV_EMU8000_CHORUS_PREDEFINED || mode &gt;= SNDRV_EMU8000_CHORUS_NUMBERS) {</div><div class='del'>-		snd_printk(KERN_WARNING "invalid chorus mode %d for uploading\n", mode);</div><div class='add'>+		dev_warn(emu-&gt;card-&gt;dev, "invalid chorus mode %d for uploading\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (len &lt; (long)sizeof(rec) || copy_from_user(&amp;rec, buf, sizeof(rec)))</div><div class='hunk'>@@ -784,7 +768,7 @@ snd_emu8000_load_reverb_fx(struct snd_emu8000 *emu, int mode, const void __user</div><div class='ctx'> 	struct soundfont_reverb_fx rec;</div><div class='ctx'> </div><div class='ctx'> 	if (mode &lt; SNDRV_EMU8000_REVERB_PREDEFINED || mode &gt;= SNDRV_EMU8000_REVERB_NUMBERS) {</div><div class='del'>-		snd_printk(KERN_WARNING "invalid reverb mode %d for uploading\n", mode);</div><div class='add'>+		dev_warn(emu-&gt;card-&gt;dev, "invalid reverb mode %d for uploading\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (len &lt; (long)sizeof(rec) || copy_from_user(&amp;rec, buf, sizeof(rec)))</div><div class='hunk'>@@ -841,25 +825,24 @@ static int mixer_bass_treble_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int mixer_bass_treble_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8000 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short val1;</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = ucontrol-&gt;value.integer.value[0] % 12;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;control_lock, flags);</div><div class='del'>-	if (kcontrol-&gt;private_value) {</div><div class='del'>-		change = val1 != emu-&gt;treble_level;</div><div class='del'>-		emu-&gt;treble_level = val1;</div><div class='del'>-	} else {</div><div class='del'>-		change = val1 != emu-&gt;bass_level;</div><div class='del'>-		emu-&gt;bass_level = val1;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;control_lock) {</div><div class='add'>+		if (kcontrol-&gt;private_value) {</div><div class='add'>+			change = val1 != emu-&gt;treble_level;</div><div class='add'>+			emu-&gt;treble_level = val1;</div><div class='add'>+		} else {</div><div class='add'>+			change = val1 != emu-&gt;bass_level;</div><div class='add'>+			emu-&gt;bass_level = val1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;control_lock, flags);</div><div class='ctx'> 	snd_emu8000_update_equalizer(emu);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_bass_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_bass_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Synth Tone Control - Bass",</div><div class='hunk'>@@ -869,7 +852,7 @@ static struct snd_kcontrol_new mixer_bass_control =</div><div class='ctx'> 	.private_value = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_treble_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_treble_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Synth Tone Control - Treble",</div><div class='hunk'>@@ -902,21 +885,20 @@ static int mixer_chorus_reverb_get(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int mixer_chorus_reverb_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8000 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short val1;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;control_lock, flags);</div><div class='del'>-	if (kcontrol-&gt;private_value) {</div><div class='del'>-		val1 = ucontrol-&gt;value.integer.value[0] % SNDRV_EMU8000_CHORUS_NUMBERS;</div><div class='del'>-		change = val1 != emu-&gt;chorus_mode;</div><div class='del'>-		emu-&gt;chorus_mode = val1;</div><div class='del'>-	} else {</div><div class='del'>-		val1 = ucontrol-&gt;value.integer.value[0] % SNDRV_EMU8000_REVERB_NUMBERS;</div><div class='del'>-		change = val1 != emu-&gt;reverb_mode;</div><div class='del'>-		emu-&gt;reverb_mode = val1;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;control_lock) {</div><div class='add'>+		if (kcontrol-&gt;private_value) {</div><div class='add'>+			val1 = ucontrol-&gt;value.integer.value[0] % SNDRV_EMU8000_CHORUS_NUMBERS;</div><div class='add'>+			change = val1 != emu-&gt;chorus_mode;</div><div class='add'>+			emu-&gt;chorus_mode = val1;</div><div class='add'>+		} else {</div><div class='add'>+			val1 = ucontrol-&gt;value.integer.value[0] % SNDRV_EMU8000_REVERB_NUMBERS;</div><div class='add'>+			change = val1 != emu-&gt;reverb_mode;</div><div class='add'>+			emu-&gt;reverb_mode = val1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;control_lock, flags);</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		if (kcontrol-&gt;private_value)</div><div class='ctx'> 			snd_emu8000_update_chorus_mode(emu);</div><div class='hunk'>@@ -926,7 +908,7 @@ static int mixer_chorus_reverb_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_chorus_mode_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_chorus_mode_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Chorus Mode",</div><div class='hunk'>@@ -936,7 +918,7 @@ static struct snd_kcontrol_new mixer_chorus_mode_control =</div><div class='ctx'> 	.private_value = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_reverb_mode_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_reverb_mode_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Reverb Mode",</div><div class='hunk'>@@ -969,26 +951,25 @@ static int mixer_fm_depth_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> static int mixer_fm_depth_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8000 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short val1;</div><div class='ctx'> 	</div><div class='ctx'> 	val1 = ucontrol-&gt;value.integer.value[0] % 256;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;control_lock, flags);</div><div class='del'>-	if (kcontrol-&gt;private_value) {</div><div class='del'>-		change = val1 != emu-&gt;fm_chorus_depth;</div><div class='del'>-		emu-&gt;fm_chorus_depth = val1;</div><div class='del'>-	} else {</div><div class='del'>-		change = val1 != emu-&gt;fm_reverb_depth;</div><div class='del'>-		emu-&gt;fm_reverb_depth = val1;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;control_lock) {</div><div class='add'>+		if (kcontrol-&gt;private_value) {</div><div class='add'>+			change = val1 != emu-&gt;fm_chorus_depth;</div><div class='add'>+			emu-&gt;fm_chorus_depth = val1;</div><div class='add'>+		} else {</div><div class='add'>+			change = val1 != emu-&gt;fm_reverb_depth;</div><div class='add'>+			emu-&gt;fm_reverb_depth = val1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;control_lock, flags);</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_emu8000_init_fm(emu);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_fm_chorus_depth_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_fm_chorus_depth_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "FM Chorus Depth",</div><div class='hunk'>@@ -998,7 +979,7 @@ static struct snd_kcontrol_new mixer_fm_chorus_depth_control =</div><div class='ctx'> 	.private_value = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new mixer_fm_reverb_depth_control =</div><div class='add'>+static const struct snd_kcontrol_new mixer_fm_reverb_depth_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "FM Reverb Depth",</div><div class='hunk'>@@ -1009,7 +990,7 @@ static struct snd_kcontrol_new mixer_fm_reverb_depth_control =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {</div><div class='add'>+static const struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {</div><div class='ctx'> 	&amp;mixer_bass_control,</div><div class='ctx'> 	&amp;mixer_treble_control,</div><div class='ctx'> 	&amp;mixer_chorus_mode_control,</div><div class='hunk'>@@ -1021,9 +1002,10 @@ static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {</div><div class='ctx'> /*</div><div class='ctx'>  * create and attach mixer elements for WaveTable treble/bass controls</div><div class='ctx'>  */</div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)</div><div class='ctx'> {</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!emu || !card))</div><div class='hunk'>@@ -1033,55 +1015,30 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)</div><div class='ctx'> </div><div class='ctx'> 	memset(emu-&gt;controls, 0, sizeof(emu-&gt;controls));</div><div class='ctx'> 	for (i = 0; i &lt; EMU8000_NUM_CONTROLS; i++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, emu-&gt;controls[i] = snd_ctl_new1(mixer_defs[i], emu))) &lt; 0)</div><div class='add'>+		kctl = snd_ctl_new1(mixer_defs[i], emu);</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto __error;</div><div class='add'>+		emu-&gt;controls[i] = kctl;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> __error:</div><div class='del'>-	for (i = 0; i &lt; EMU8000_NUM_CONTROLS; i++) {</div><div class='del'>-		down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-		if (emu-&gt;controls[i])</div><div class='del'>-			snd_ctl_remove(card, emu-&gt;controls[i]);</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; EMU8000_NUM_CONTROLS; i++)</div><div class='add'>+		snd_ctl_remove(card, emu-&gt;controls[i]);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * free resources</div><div class='del'>- */</div><div class='del'>-static int snd_emu8000_free(struct snd_emu8000 *hw)</div><div class='del'>-{</div><div class='del'>-	release_and_free_resource(hw-&gt;res_port1);</div><div class='del'>-	release_and_free_resource(hw-&gt;res_port2);</div><div class='del'>-	release_and_free_resource(hw-&gt;res_port3);</div><div class='del'>-	kfree(hw);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int snd_emu8000_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_emu8000 *hw = device-&gt;device_data;</div><div class='del'>-	return snd_emu8000_free(hw);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * initialize and register emu8000 synth device.</div><div class='ctx'>  */</div><div class='del'>-int __devinit</div><div class='add'>+int</div><div class='ctx'> snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,</div><div class='ctx'> 		struct snd_seq_device **awe_ret)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_seq_device *awe;</div><div class='ctx'> 	struct snd_emu8000 *hw;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_emu8000_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	if (awe_ret)</div><div class='ctx'> 		*awe_ret = NULL;</div><div class='hunk'>@@ -1089,7 +1046,7 @@ snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,</div><div class='ctx'> 	if (seq_ports &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	hw = kzalloc(sizeof(*hw), GFP_KERNEL);</div><div class='add'>+	hw = devm_kzalloc(card-&gt;dev, sizeof(*hw), GFP_KERNEL);</div><div class='ctx'> 	if (hw == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	spin_lock_init(&amp;hw-&gt;reg_lock);</div><div class='hunk'>@@ -1097,11 +1054,11 @@ snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,</div><div class='ctx'> 	hw-&gt;port1 = port;</div><div class='ctx'> 	hw-&gt;port2 = port + 0x400;</div><div class='ctx'> 	hw-&gt;port3 = port + 0x800;</div><div class='del'>-	if (!(hw-&gt;res_port1 = request_region(hw-&gt;port1, 4, "Emu8000-1")) ||</div><div class='del'>-	    !(hw-&gt;res_port2 = request_region(hw-&gt;port2, 4, "Emu8000-2")) ||</div><div class='del'>-	    !(hw-&gt;res_port3 = request_region(hw-&gt;port3, 4, "Emu8000-3"))) {</div><div class='del'>-		snd_printk(KERN_ERR "sbawe: can't grab ports 0x%lx, 0x%lx, 0x%lx\n", hw-&gt;port1, hw-&gt;port2, hw-&gt;port3);</div><div class='del'>-		snd_emu8000_free(hw);</div><div class='add'>+	if (!devm_request_region(card-&gt;dev, hw-&gt;port1, 4, "Emu8000-1") ||</div><div class='add'>+	    !devm_request_region(card-&gt;dev, hw-&gt;port2, 4, "Emu8000-2") ||</div><div class='add'>+	    !devm_request_region(card-&gt;dev, hw-&gt;port3, 4, "Emu8000-3")) {</div><div class='add'>+		dev_err(card-&gt;dev, "sbawe: can't grab ports 0x%lx, 0x%lx, 0x%lx\n",</div><div class='add'>+			hw-&gt;port1, hw-&gt;port2, hw-&gt;port3);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	hw-&gt;mem_size = 0;</div><div class='hunk'>@@ -1114,25 +1071,17 @@ snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,</div><div class='ctx'> 	hw-&gt;fm_chorus_depth = 0;</div><div class='ctx'> 	hw-&gt;fm_reverb_depth = 0;</div><div class='ctx'> </div><div class='del'>-	if (snd_emu8000_detect(hw) &lt; 0) {</div><div class='del'>-		snd_emu8000_free(hw);</div><div class='add'>+	if (snd_emu8000_detect(hw) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_emu8000_init_hw(hw);</div><div class='del'>-	if ((err = snd_emu8000_create_mixer(card, hw)) &lt; 0) {</div><div class='del'>-		snd_emu8000_free(hw);</div><div class='add'>+	err = snd_emu8000_create_mixer(card, hw);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, hw, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_emu8000_free(hw);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> 	if (snd_seq_device_new(card, index, SNDRV_SEQ_DEV_ID_EMU8000,</div><div class='ctx'> 			       sizeof(struct snd_emu8000*), &amp;awe) &gt;= 0) {</div><div class='del'>-		strcpy(awe-&gt;name, "EMU-8000");</div><div class='add'>+		strscpy(awe-&gt;name, "EMU-8000");</div><div class='ctx'> 		*(struct snd_emu8000 **)SNDRV_SEQ_DEVICE_ARGPTR(awe) = hw;</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='head'>diff --git a/sound/isa/sb/emu8000_callback.c b/sound/isa/sb/emu8000_callback.c<br/>index 9a3c71cc2e07..7609a5b640cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_callback.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_callback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_callback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000_callback.c</a></div><div class='hunk'>@@ -1,25 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  synth callback routines for the emu8000 (AWE32/64)</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Steve Ratcliffe</div><div class='ctx'>  *  Copyright (C) 1999-2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "emu8000_local.h"</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -35,7 +23,7 @@ static void reset_voice(struct snd_emux *emu, int ch);</div><div class='ctx'> static void terminate_voice(struct snd_emux_voice *vp);</div><div class='ctx'> static void sysex(struct snd_emux *emu, char *buf, int len, int parsed,</div><div class='ctx'> 		  struct snd_midi_channel_set *chset);</div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> static int oss_ioctl(struct snd_emux *emu, int cmd, int p1, int p2);</div><div class='ctx'> #endif</div><div class='ctx'> static int load_fx(struct snd_emux *emu, int type, int mode,</div><div class='hunk'>@@ -61,7 +49,7 @@ static void snd_emu8000_tweak_voice(struct snd_emu8000 *emu, int ch);</div><div class='ctx'> /*</div><div class='ctx'>  * set up operators</div><div class='ctx'>  */</div><div class='del'>-static struct snd_emux_operators emu8000_ops = {</div><div class='add'>+static const struct snd_emux_operators emu8000_ops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.get_voice =	get_voice,</div><div class='ctx'> 	.prepare =	start_voice,</div><div class='hunk'>@@ -75,7 +63,7 @@ static struct snd_emux_operators emu8000_ops = {</div><div class='ctx'> 	.sample_reset = snd_emu8000_sample_reset,</div><div class='ctx'> 	.load_fx =	load_fx,</div><div class='ctx'> 	.sysex =	sysex,</div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> 	.oss_ioctl =	oss_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='hunk'>@@ -174,7 +162,7 @@ get_voice(struct snd_emux *emu, struct snd_emux_port *port)</div><div class='ctx'> 	hw = emu-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; END; i++) {</div><div class='del'>-		best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */;</div><div class='add'>+		best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */</div><div class='ctx'> 		best[i].voice = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -476,7 +464,7 @@ sysex(struct snd_emux *emu, char *buf, int len, int parsed, struct snd_midi_chan</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_SEQUENCER_OSS</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)</div><div class='ctx'> /*</div><div class='ctx'>  * OSS ioctl callback</div><div class='ctx'>  */</div><div class='head'>diff --git a/sound/isa/sb/emu8000_local.h b/sound/isa/sb/emu8000_local.h<br/>index 7e87c349272f..f90526ab1a3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_local.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_local.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000_local.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __EMU8000_LOCAL_H</div><div class='ctx'> #define __EMU8000_LOCAL_H</div><div class='ctx'> /*</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Steve Ratcliffe</div><div class='ctx'>  *  Copyright (C) 1999-2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='head'>diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c<br/>index c99c6078be33..d60174ec8b39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_patch.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_patch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_patch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000_patch.c</a></div><div class='hunk'>@@ -1,26 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Patch routines for the emu8000 (AWE32/64)</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 1999 Steve Ratcliffe</div><div class='ctx'>  *  Copyright (C) 1999-2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "emu8000_local.h"</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int emu8000_reset_addr;</div><div class='hunk'>@@ -159,16 +148,6 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,</div><div class='ctx'> 	if (snd_BUG_ON(!sp))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;v.size == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* be sure loop points start &lt; end */</div><div class='del'>-	if (sp-&gt;v.loopstart &gt; sp-&gt;v.loopend) {</div><div class='del'>-		int tmp = sp-&gt;v.loopstart;</div><div class='del'>-		sp-&gt;v.loopstart = sp-&gt;v.loopend;</div><div class='del'>-		sp-&gt;v.loopend = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* compute true data size to be loaded */</div><div class='ctx'> 	truesize = sp-&gt;v.size;</div><div class='ctx'> 	if (sp-&gt;v.mode_flags &amp; (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP))</div><div class='hunk'>@@ -178,25 +157,18 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,</div><div class='ctx'> </div><div class='ctx'> 	sp-&gt;block = snd_util_mem_alloc(hdr, truesize * 2);</div><div class='ctx'> 	if (sp-&gt;block == NULL) {</div><div class='del'>-		/*snd_printd("EMU8000: out of memory\n");*/</div><div class='ctx'> 		/* not ENOMEM (for compatibility) */</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS) {</div><div class='del'>-		if (!access_ok(VERIFY_READ, data, sp-&gt;v.size))</div><div class='add'>+		if (!access_ok(data, sp-&gt;v.size))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (!access_ok(VERIFY_READ, data, sp-&gt;v.size * 2))</div><div class='add'>+		if (!access_ok(data, sp-&gt;v.size * 2))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* recalculate address offset */</div><div class='del'>-	sp-&gt;v.end -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.loopstart -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.loopend -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.start = 0;</div><div class='del'>-</div><div class='ctx'> 	/* dram position (in word) -- mem_offset is byte */</div><div class='ctx'> 	dram_offset = EMU8000_DRAM_OFFSET + (sp-&gt;block-&gt;offset &gt;&gt; 1);</div><div class='ctx'> 	dram_start = dram_offset;</div><div class='hunk'>@@ -205,7 +177,8 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,</div><div class='ctx'> 	sp-&gt;v.truesize = truesize * 2; /* in bytes */</div><div class='ctx'> </div><div class='ctx'> 	snd_emux_terminate_all(emu-&gt;emu);</div><div class='del'>-	if ((rc = snd_emu8000_open_dma(emu, EMU8000_RAM_WRITE)) != 0)</div><div class='add'>+	rc = snd_emu8000_open_dma(emu, EMU8000_RAM_WRITE);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Set the address to start writing at */</div><div class='head'>diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c<br/>index 2f85c66f8e38..656a655d618d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000_pcm.c</a></div><div class='hunk'>@@ -1,24 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * pcm emulation on emu8000 wavetable</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2002 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "emu8000_local.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -155,7 +144,7 @@ static int calc_rate_offset(int hz)</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware emu8k_pcm_hw = {</div><div class='add'>+static const struct snd_pcm_hardware emu8k_pcm_hw = {</div><div class='ctx'> #ifdef USE_NONINTERLEAVE</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_NONINTERLEAVED,</div><div class='ctx'> #else</div><div class='hunk'>@@ -191,33 +180,34 @@ static inline int emu8k_get_curpos(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'>  * timer interrupt handler</div><div class='ctx'>  * check the current position and update the period if necessary.</div><div class='ctx'>  */</div><div class='del'>-static void emu8k_pcm_timer_func(unsigned long data)</div><div class='add'>+static void emu8k_pcm_timer_func(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu8k_pcm *rec = (struct snd_emu8k_pcm *)data;</div><div class='add'>+	struct snd_emu8k_pcm *rec = timer_container_of(rec, t, timer);</div><div class='ctx'> 	int ptr, delta;</div><div class='add'>+	bool period_elapsed = false;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;rec-&gt;timer_lock) {</div><div class='add'>+		/* update the current pointer */</div><div class='add'>+		ptr = emu8k_get_curpos(rec, 0);</div><div class='add'>+		if (ptr &lt; rec-&gt;last_ptr)</div><div class='add'>+			delta = ptr + rec-&gt;buf_size - rec-&gt;last_ptr;</div><div class='add'>+		else</div><div class='add'>+			delta = ptr - rec-&gt;last_ptr;</div><div class='add'>+		rec-&gt;period_pos += delta;</div><div class='add'>+		rec-&gt;last_ptr = ptr;</div><div class='add'>+</div><div class='add'>+		/* reprogram timer */</div><div class='add'>+		mod_timer(&amp;rec-&gt;timer, jiffies + 1);</div><div class='add'>+</div><div class='add'>+		/* update period */</div><div class='add'>+		if (rec-&gt;period_pos &gt;= (int)rec-&gt;period_size) {</div><div class='add'>+			rec-&gt;period_pos %= rec-&gt;period_size;</div><div class='add'>+			period_elapsed = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;rec-&gt;timer_lock);</div><div class='del'>-	/* update the current pointer */</div><div class='del'>-	ptr = emu8k_get_curpos(rec, 0);</div><div class='del'>-	if (ptr &lt; rec-&gt;last_ptr)</div><div class='del'>-		delta = ptr + rec-&gt;buf_size - rec-&gt;last_ptr;</div><div class='del'>-	else</div><div class='del'>-		delta = ptr - rec-&gt;last_ptr;</div><div class='del'>-	rec-&gt;period_pos += delta;</div><div class='del'>-	rec-&gt;last_ptr = ptr;</div><div class='del'>-</div><div class='del'>-	/* reprogram timer */</div><div class='del'>-	rec-&gt;timer.expires = jiffies + 1;</div><div class='del'>-	add_timer(&amp;rec-&gt;timer);</div><div class='del'>-</div><div class='del'>-	/* update period */</div><div class='del'>-	if (rec-&gt;period_pos &gt;= (int)rec-&gt;period_size) {</div><div class='del'>-		rec-&gt;period_pos %= rec-&gt;period_size;</div><div class='del'>-		spin_unlock(&amp;rec-&gt;timer_lock);</div><div class='add'>+	if (period_elapsed)</div><div class='ctx'> 		snd_pcm_period_elapsed(rec-&gt;substream);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;rec-&gt;timer_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -240,9 +230,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs)</div><div class='ctx'> 	runtime-&gt;private_data = rec;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;rec-&gt;timer_lock);</div><div class='del'>-	init_timer(&amp;rec-&gt;timer);</div><div class='del'>-	rec-&gt;timer.function = emu8k_pcm_timer_func;</div><div class='del'>-	rec-&gt;timer.data = (unsigned long)rec;</div><div class='add'>+	timer_setup(&amp;rec-&gt;timer, emu8k_pcm_timer_func, 0);</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = emu8k_pcm_hw;</div><div class='ctx'> 	runtime-&gt;hw.buffer_bytes_max = emu-&gt;mem_size - LOOP_BLANK_SIZE * 3;</div><div class='hunk'>@@ -250,7 +238,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs)</div><div class='ctx'> </div><div class='ctx'> 	/* use timer to update periods.. (specified in msec) */</div><div class='ctx'> 	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME,</div><div class='del'>-				     (1000000 + HZ - 1) / HZ, UINT_MAX);</div><div class='add'>+				     DIV_ROUND_UP(1000000, HZ), UINT_MAX);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -335,7 +323,6 @@ static void setup_voice(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'>  */</div><div class='ctx'> static void start_voice(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu8000 *hw = rec-&gt;emu;</div><div class='ctx'> 	unsigned int temp, aux;</div><div class='ctx'> 	int pt = calc_pitch_target(rec-&gt;pitch);</div><div class='hunk'>@@ -357,13 +344,11 @@ static void start_voice(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'> 	EMU8000_CPF_WRITE(hw, ch, pt &lt;&lt; 16);</div><div class='ctx'> </div><div class='ctx'> 	/* start timer */</div><div class='del'>-	spin_lock_irqsave(&amp;rec-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;rec-&gt;timer_lock);</div><div class='ctx'> 	if (! rec-&gt;timer_running) {</div><div class='del'>-		rec-&gt;timer.expires = jiffies + 1;</div><div class='del'>-		add_timer(&amp;rec-&gt;timer);</div><div class='add'>+		mod_timer(&amp;rec-&gt;timer, jiffies + 1);</div><div class='ctx'> 		rec-&gt;timer_running = 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rec-&gt;timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -371,18 +356,16 @@ static void start_voice(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'>  */</div><div class='ctx'> static void stop_voice(struct snd_emu8k_pcm *rec, int ch)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu8000 *hw = rec-&gt;emu;</div><div class='ctx'> </div><div class='ctx'> 	EMU8000_DCYSUSV_WRITE(hw, ch, 0x807F);</div><div class='ctx'> </div><div class='ctx'> 	/* stop timer */</div><div class='del'>-	spin_lock_irqsave(&amp;rec-&gt;timer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;rec-&gt;timer_lock);</div><div class='ctx'> 	if (rec-&gt;timer_running) {</div><div class='del'>-		del_timer(&amp;rec-&gt;timer);</div><div class='add'>+		timer_delete(&amp;rec-&gt;timer);</div><div class='ctx'> 		rec-&gt;timer_running = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;rec-&gt;timer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int emu8k_pcm_trigger(struct snd_pcm_substream *subs, int cmd)</div><div class='hunk'>@@ -424,143 +407,107 @@ do { \</div><div class='ctx'> 		return -EAGAIN;\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+#define GET_VAL(sval, iter)						\</div><div class='add'>+	do {								\</div><div class='add'>+		if (!iter)						\</div><div class='add'>+			sval = 0;					\</div><div class='add'>+		else if (copy_from_iter(&amp;sval, 2, iter) != 2)		\</div><div class='add'>+			return -EFAULT;					\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_NONINTERLEAVE</div><div class='del'>-/* copy one channel block */</div><div class='del'>-static int emu8k_transfer_block(struct snd_emu8000 *emu, int offset, unsigned short *buf, int count)</div><div class='del'>-{</div><div class='del'>-	EMU8000_SMALW_WRITE(emu, offset);</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		unsigned short sval;</div><div class='del'>-		CHECK_SCHEDULER();</div><div class='del'>-		if (get_user(sval, buf))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		EMU8000_SMLD_WRITE(emu, sval);</div><div class='del'>-		buf++;</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+#define LOOP_WRITE(rec, offset, iter, count)			\</div><div class='add'>+	do {							\</div><div class='add'>+		struct snd_emu8000 *emu = (rec)-&gt;emu;		\</div><div class='add'>+		snd_emu8000_write_wait(emu, 1);			\</div><div class='add'>+		EMU8000_SMALW_WRITE(emu, offset);		\</div><div class='add'>+		while (count &gt; 0) {				\</div><div class='add'>+			unsigned short sval;			\</div><div class='add'>+			CHECK_SCHEDULER();			\</div><div class='add'>+			GET_VAL(sval, iter);			\</div><div class='add'>+			EMU8000_SMLD_WRITE(emu, sval);		\</div><div class='add'>+			count--;				\</div><div class='add'>+		}						\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+/* copy one channel block */</div><div class='ctx'> static int emu8k_pcm_copy(struct snd_pcm_substream *subs,</div><div class='del'>-			  int voice,</div><div class='del'>-			  snd_pcm_uframes_t pos,</div><div class='del'>-			  void *src,</div><div class='del'>-			  snd_pcm_uframes_t count)</div><div class='add'>+			  int voice, unsigned long pos,</div><div class='add'>+			  struct iov_iter *src, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8k_pcm *rec = subs-&gt;runtime-&gt;private_data;</div><div class='del'>-	struct snd_emu8000 *emu = rec-&gt;emu;</div><div class='del'>-</div><div class='del'>-	snd_emu8000_write_wait(emu, 1);</div><div class='del'>-	if (voice == -1) {</div><div class='del'>-		unsigned short *buf = src;</div><div class='del'>-		int i, err;</div><div class='del'>-		count /= rec-&gt;voices;</div><div class='del'>-		for (i = 0; i &lt; rec-&gt;voices; i++) {</div><div class='del'>-			err = emu8k_transfer_block(emu, pos + rec-&gt;loop_start[i], buf, count);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			buf += count;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		return emu8k_transfer_block(emu, pos + rec-&gt;loop_start[voice], src, count);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* make a channel block silence */</div><div class='del'>-static int emu8k_silence_block(struct snd_emu8000 *emu, int offset, int count)</div><div class='del'>-{</div><div class='del'>-	EMU8000_SMALW_WRITE(emu, offset);</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		CHECK_SCHEDULER();</div><div class='del'>-		EMU8000_SMLD_WRITE(emu, 0);</div><div class='del'>-		count--;</div><div class='del'>-	}</div><div class='add'>+	/* convert to word unit */</div><div class='add'>+	pos = (pos &lt;&lt; 1) + rec-&gt;loop_start[voice];</div><div class='add'>+	count &lt;&lt;= 1;</div><div class='add'>+	LOOP_WRITE(rec, pos, src, count);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* make a channel block silence */</div><div class='ctx'> static int emu8k_pcm_silence(struct snd_pcm_substream *subs,</div><div class='del'>-			     int voice,</div><div class='del'>-			     snd_pcm_uframes_t pos,</div><div class='del'>-			     snd_pcm_uframes_t count)</div><div class='add'>+			     int voice, unsigned long pos, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8k_pcm *rec = subs-&gt;runtime-&gt;private_data;</div><div class='del'>-	struct snd_emu8000 *emu = rec-&gt;emu;</div><div class='del'>-</div><div class='del'>-	snd_emu8000_write_wait(emu, 1);</div><div class='del'>-	if (voice == -1 &amp;&amp; rec-&gt;voices == 1)</div><div class='del'>-		voice = 0;</div><div class='del'>-	if (voice == -1) {</div><div class='del'>-		int err;</div><div class='del'>-		err = emu8k_silence_block(emu, pos + rec-&gt;loop_start[0], count / 2);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		return emu8k_silence_block(emu, pos + rec-&gt;loop_start[1], count / 2);</div><div class='del'>-	} else {</div><div class='del'>-		return emu8k_silence_block(emu, pos + rec-&gt;loop_start[voice], count);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/* convert to word unit */</div><div class='add'>+	pos = (pos &lt;&lt; 1) + rec-&gt;loop_start[voice];</div><div class='add'>+	count &lt;&lt;= 1;</div><div class='add'>+	LOOP_WRITE(rec, pos, NULL, count);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* interleave */</div><div class='ctx'> </div><div class='add'>+#define LOOP_WRITE(rec, pos, iter, count)				\</div><div class='add'>+	do {								\</div><div class='add'>+		struct snd_emu8000 *emu = rec-&gt;emu;			\</div><div class='add'>+		snd_emu8000_write_wait(emu, 1);				\</div><div class='add'>+		EMU8000_SMALW_WRITE(emu, pos + rec-&gt;loop_start[0]);	\</div><div class='add'>+		if (rec-&gt;voices &gt; 1)					\</div><div class='add'>+			EMU8000_SMARW_WRITE(emu, pos + rec-&gt;loop_start[1]); \</div><div class='add'>+		while (count &gt; 0) {					\</div><div class='add'>+			unsigned short sval;				\</div><div class='add'>+			CHECK_SCHEDULER();				\</div><div class='add'>+			GET_VAL(sval, iter);				\</div><div class='add'>+			EMU8000_SMLD_WRITE(emu, sval);			\</div><div class='add'>+			if (rec-&gt;voices &gt; 1) {				\</div><div class='add'>+				CHECK_SCHEDULER();			\</div><div class='add'>+				GET_VAL(sval, iter);			\</div><div class='add'>+				EMU8000_SMRD_WRITE(emu, sval);		\</div><div class='add'>+			}						\</div><div class='add'>+			count--;					\</div><div class='add'>+		}							\</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * copy the interleaved data can be done easily by using</div><div class='ctx'>  * DMA "left" and "right" channels on emu8k engine.</div><div class='ctx'>  */</div><div class='ctx'> static int emu8k_pcm_copy(struct snd_pcm_substream *subs,</div><div class='del'>-			  int voice,</div><div class='del'>-			  snd_pcm_uframes_t pos,</div><div class='del'>-			  void __user *src,</div><div class='del'>-			  snd_pcm_uframes_t count)</div><div class='add'>+			  int voice, unsigned long pos,</div><div class='add'>+			  struct iov_iter *src, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8k_pcm *rec = subs-&gt;runtime-&gt;private_data;</div><div class='del'>-	struct snd_emu8000 *emu = rec-&gt;emu;</div><div class='del'>-	unsigned short __user *buf = src;</div><div class='ctx'> </div><div class='del'>-	snd_emu8000_write_wait(emu, 1);</div><div class='del'>-	EMU8000_SMALW_WRITE(emu, pos + rec-&gt;loop_start[0]);</div><div class='del'>-	if (rec-&gt;voices &gt; 1)</div><div class='del'>-		EMU8000_SMARW_WRITE(emu, pos + rec-&gt;loop_start[1]);</div><div class='del'>-</div><div class='del'>-	while (count-- &gt; 0) {</div><div class='del'>-		unsigned short sval;</div><div class='del'>-		CHECK_SCHEDULER();</div><div class='del'>-		if (get_user(sval, buf))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		EMU8000_SMLD_WRITE(emu, sval);</div><div class='del'>-		buf++;</div><div class='del'>-		if (rec-&gt;voices &gt; 1) {</div><div class='del'>-			CHECK_SCHEDULER();</div><div class='del'>-			if (get_user(sval, buf))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			EMU8000_SMRD_WRITE(emu, sval);</div><div class='del'>-			buf++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* convert to frames */</div><div class='add'>+	pos = bytes_to_frames(subs-&gt;runtime, pos);</div><div class='add'>+	count = bytes_to_frames(subs-&gt;runtime, count);</div><div class='add'>+	LOOP_WRITE(rec, pos, src, count);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int emu8k_pcm_silence(struct snd_pcm_substream *subs,</div><div class='del'>-			     int voice,</div><div class='del'>-			     snd_pcm_uframes_t pos,</div><div class='del'>-			     snd_pcm_uframes_t count)</div><div class='add'>+			     int voice, unsigned long pos, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu8k_pcm *rec = subs-&gt;runtime-&gt;private_data;</div><div class='del'>-	struct snd_emu8000 *emu = rec-&gt;emu;</div><div class='ctx'> </div><div class='del'>-	snd_emu8000_write_wait(emu, 1);</div><div class='del'>-	EMU8000_SMALW_WRITE(emu, rec-&gt;loop_start[0] + pos);</div><div class='del'>-	if (rec-&gt;voices &gt; 1)</div><div class='del'>-		EMU8000_SMARW_WRITE(emu, rec-&gt;loop_start[1] + pos);</div><div class='del'>-	while (count-- &gt; 0) {</div><div class='del'>-		CHECK_SCHEDULER();</div><div class='del'>-		EMU8000_SMLD_WRITE(emu, 0);</div><div class='del'>-		if (rec-&gt;voices &gt; 1) {</div><div class='del'>-			CHECK_SCHEDULER();</div><div class='del'>-			EMU8000_SMRD_WRITE(emu, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* convert to frames */</div><div class='add'>+	pos = bytes_to_frames(subs-&gt;runtime, pos);</div><div class='add'>+	count = bytes_to_frames(subs-&gt;runtime, count);</div><div class='add'>+	LOOP_WRITE(rec, pos, NULL, count);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -636,7 +583,8 @@ static int emu8k_pcm_prepare(struct snd_pcm_substream *subs)</div><div class='ctx'> 		int err, i, ch;</div><div class='ctx'> </div><div class='ctx'> 		snd_emux_terminate_all(rec-&gt;emu-&gt;emu);</div><div class='del'>-		if ((err = emu8k_open_dram_for_pcm(rec-&gt;emu, rec-&gt;voices)) != 0)</div><div class='add'>+		err = emu8k_open_dram_for_pcm(rec-&gt;emu, rec-&gt;voices);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		rec-&gt;dram_opened = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -667,17 +615,16 @@ static snd_pcm_uframes_t emu8k_pcm_pointer(struct snd_pcm_substream *subs)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops emu8k_pcm_ops = {</div><div class='add'>+static const struct snd_pcm_ops emu8k_pcm_ops = {</div><div class='ctx'> 	.open =		emu8k_pcm_open,</div><div class='ctx'> 	.close =	emu8k_pcm_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	emu8k_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	emu8k_pcm_hw_free,</div><div class='ctx'> 	.prepare =	emu8k_pcm_prepare,</div><div class='ctx'> 	.trigger =	emu8k_pcm_trigger,</div><div class='ctx'> 	.pointer =	emu8k_pcm_pointer,</div><div class='ctx'> 	.copy =		emu8k_pcm_copy,</div><div class='del'>-	.silence =	emu8k_pcm_silence,</div><div class='add'>+	.fill_silence =	emu8k_pcm_silence,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -692,7 +639,8 @@ int snd_emu8000_pcm_new(struct snd_card *card, struct snd_emu8000 *emu, int inde</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_new(card, "Emu8000 PCM", index, 1, 0, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(card, "Emu8000 PCM", index, 1, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='ctx'> 	pcm-&gt;private_free = snd_emu8000_pcm_free;</div><div class='head'>diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c<br/>index 0c7905c85b76..9bec85ec55b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/emu8000_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/emu8000_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/emu8000_synth.c</a></div><div class='hunk'>@@ -1,27 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *     and (c) 1999 Steve Ratcliffe &lt;steve@parabola.demon.co.uk&gt;</div><div class='ctx'>  *  Copyright (C) 1999-2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Emu8000 synth plug-in routine</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "emu8000_local.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai, Steve Ratcliffe");</div><div class='hunk'>@@ -33,8 +21,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /*</div><div class='ctx'>  * create a new hardware dependent device for Emu8000</div><div class='ctx'>  */</div><div class='del'>-static int snd_emu8000_new_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_emu8000_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_emu8000 *hw;</div><div class='ctx'> 	struct snd_emux *emu;</div><div class='ctx'> </div><div class='hunk'>@@ -56,7 +45,7 @@ static int snd_emu8000_new_device(struct snd_seq_device *dev)</div><div class='ctx'> 	emu-&gt;num_ports = hw-&gt;seq_ports;</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;memhdr) {</div><div class='del'>-		snd_printk(KERN_ERR "memhdr is already initialized!?\n");</div><div class='add'>+		dev_err(hw-&gt;card-&gt;dev, "memhdr is already initialized!?\n");</div><div class='ctx'> 		snd_util_memhdr_free(hw-&gt;memhdr);</div><div class='ctx'> 	}</div><div class='ctx'> 	hw-&gt;memhdr = snd_util_memhdr_new(hw-&gt;mem_size);</div><div class='hunk'>@@ -92,8 +81,9 @@ static int snd_emu8000_new_device(struct snd_seq_device *dev)</div><div class='ctx'> /*</div><div class='ctx'>  * free all resources</div><div class='ctx'>  */</div><div class='del'>-static int snd_emu8000_delete_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_emu8000_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_emu8000 *hw;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver_data == NULL)</div><div class='hunk'>@@ -102,10 +92,8 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev)</div><div class='ctx'> 	hw = dev-&gt;driver_data;</div><div class='ctx'> 	if (hw-&gt;pcm)</div><div class='ctx'> 		snd_device_free(dev-&gt;card, hw-&gt;pcm);</div><div class='del'>-	if (hw-&gt;emu)</div><div class='del'>-		snd_emux_free(hw-&gt;emu);</div><div class='del'>-	if (hw-&gt;memhdr)</div><div class='del'>-		snd_util_memhdr_free(hw-&gt;memhdr);</div><div class='add'>+	snd_emux_free(hw-&gt;emu);</div><div class='add'>+	snd_util_memhdr_free(hw-&gt;memhdr);</div><div class='ctx'> 	hw-&gt;emu = NULL;</div><div class='ctx'> 	hw-&gt;memhdr = NULL;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -115,21 +103,14 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev)</div><div class='ctx'>  *  INIT part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __init alsa_emu8000_init(void)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	static struct snd_seq_dev_ops ops = {</div><div class='del'>-		snd_emu8000_new_device,</div><div class='del'>-		snd_emu8000_delete_device,</div><div class='del'>-	};</div><div class='del'>-	return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &amp;ops,</div><div class='del'>-					      sizeof(struct snd_emu8000*));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_emu8000_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_EMU8000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_emu8000_init)</div><div class='del'>-module_exit(alsa_emu8000_exit)</div><div class='add'>+static struct snd_seq_driver emu8000_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_emu8000_probe,</div><div class='add'>+		.remove = snd_emu8000_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_EMU8000,</div><div class='add'>+	.argsize = sizeof(struct snd_emu8000 *),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_snd_seq_driver(emu8000_driver);</div><div class='head'>diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c<br/>index 8ccbcddf08e1..69d9bfb6c14c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/jazz16.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/jazz16.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/jazz16.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/jazz16.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -28,15 +29,12 @@</div><div class='ctx'> #define PFX "jazz16: "</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Media Vision Jazz16");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Media Vision ??? },"</div><div class='del'>-		"{RTL,RTL3000}}");</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Krzysztof Helt &lt;krzysztof.h1@wp.pl&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static unsigned long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='ctx'> static unsigned long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;</div><div class='hunk'>@@ -50,17 +48,17 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for Media Vision Jazz16 based soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable Media Vision Jazz16 based soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for jazz16 driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for jazz16 driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for jazz16 driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for jazz16 driver.");</div><div class='del'>-module_param_array(dma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma8, "DMA8 # for jazz16 driver.");</div><div class='del'>-module_param_array(dma16, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma16, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma16, "DMA16 # for jazz16 driver.");</div><div class='ctx'> </div><div class='ctx'> #define SB_JAZZ16_WAKEUP	0xaf</div><div class='hunk'>@@ -78,13 +76,14 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)</div><div class='ctx'> 	return snd_sb8dsp_interrupt(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit jazz16_configure_ports(unsigned long port,</div><div class='del'>-					    unsigned long mpu_port, int idx)</div><div class='add'>+static int jazz16_configure_ports(struct snd_card *card,</div><div class='add'>+				  unsigned long port,</div><div class='add'>+				  unsigned long mpu_port, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(0x201, 1, "jazz16 config")) {</div><div class='del'>-		snd_printk(KERN_ERR "config port region is already in use.\n");</div><div class='add'>+		dev_err(card-&gt;dev, "config port region is already in use.\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	outb(SB_JAZZ16_WAKEUP - idx, 0x201);</div><div class='hunk'>@@ -99,15 +98,15 @@ static int __devinit jazz16_configure_ports(unsigned long port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit jazz16_detect_board(unsigned long port,</div><div class='del'>-					 unsigned long mpu_port)</div><div class='add'>+static int jazz16_detect_board(struct snd_card *card, unsigned long port,</div><div class='add'>+			       unsigned long mpu_port)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int val;</div><div class='del'>-	struct snd_sb chip;</div><div class='add'>+	struct snd_sb chip = {};</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(port, 0x10, "jazz16")) {</div><div class='del'>-		snd_printk(KERN_ERR "I/O port region is already in use.\n");</div><div class='add'>+		dev_err(card-&gt;dev, "I/O port region is already in use.\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* just to call snd_sbdsp_command/reset/get_byte() */</div><div class='hunk'>@@ -116,7 +115,7 @@ static int __devinit jazz16_detect_board(unsigned long port,</div><div class='ctx'> 	err = snd_sbdsp_reset(&amp;chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		for (val = 0; val &lt; 4; val++) {</div><div class='del'>-			err = jazz16_configure_ports(port, mpu_port, val);</div><div class='add'>+			err = jazz16_configure_ports(card, port, mpu_port, val);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='hunk'>@@ -146,8 +145,8 @@ static int __devinit jazz16_detect_board(unsigned long port,</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_sbdsp_get_byte(&amp;chip);</div><div class='ctx'> 	err = snd_sbdsp_get_byte(&amp;chip);</div><div class='del'>-	snd_printd("Media Vision Jazz16 board detected: rev 0x%x, model 0x%x\n",</div><div class='del'>-		   val, err);</div><div class='add'>+	dev_dbg(card-&gt;dev, "Media Vision Jazz16 board detected: rev 0x%x, model 0x%x\n",</div><div class='add'>+		val, err);</div><div class='ctx'> </div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -156,11 +155,11 @@ err_unmap:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)</div><div class='add'>+static int jazz16_configure_board(struct snd_sb *chip, int mpu_irq)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4,</div><div class='add'>+	static const unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4,</div><div class='ctx'> 						 0, 2, 5, 0, 0, 0, 0, 6 };</div><div class='del'>-	static unsigned char jazz_dma_bits[] = { 0, 1, 0, 2, 0, 3, 0, 4 };</div><div class='add'>+	static const unsigned char jazz_dma_bits[] = { 0, 1, 0, 2, 0, 3, 0, 4 };</div><div class='ctx'> </div><div class='ctx'> 	if (jazz_dma_bits[chip-&gt;dma8] == 0 ||</div><div class='ctx'> 	    jazz_dma_bits[chip-&gt;dma16] == 0 ||</div><div class='hunk'>@@ -183,54 +182,54 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)</div><div class='add'>+static int snd_jazz16_match(struct device *devptr, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR "please specify port\n");</div><div class='add'>+		dev_err(devptr, "please specify port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else if (port[dev] == 0x200 || (port[dev] &amp; ~0x270)) {</div><div class='del'>-		snd_printk(KERN_ERR "incorrect port specified\n");</div><div class='add'>+		dev_err(devptr, "incorrect port specified\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma8[dev] != SNDRV_AUTO_DMA &amp;&amp;</div><div class='ctx'> 	    dma8[dev] != 1 &amp;&amp; dma8[dev] != 3) {</div><div class='del'>-		snd_printk(KERN_ERR "dma8 must be 1 or 3\n");</div><div class='add'>+		dev_err(devptr, "dma8 must be 1 or 3\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma16[dev] != SNDRV_AUTO_DMA &amp;&amp;</div><div class='ctx'> 	    dma16[dev] != 5 &amp;&amp; dma16[dev] != 7) {</div><div class='del'>-		snd_printk(KERN_ERR "dma16 must be 5 or 7\n");</div><div class='add'>+		dev_err(devptr, "dma16 must be 5 or 7\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_port[dev] != SNDRV_AUTO_PORT &amp;&amp;</div><div class='ctx'> 	    (mpu_port[dev] &amp; ~0x030) != 0x300) {</div><div class='del'>-		snd_printk(KERN_ERR "incorrect mpu_port specified\n");</div><div class='add'>+		dev_err(devptr, "incorrect mpu_port specified\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_irq[dev] != SNDRV_AUTO_DMA &amp;&amp;</div><div class='ctx'> 	    mpu_irq[dev] != 2 &amp;&amp; mpu_irq[dev] != 3 &amp;&amp;</div><div class='ctx'> 	    mpu_irq[dev] != 5 &amp;&amp; mpu_irq[dev] != 7) {</div><div class='del'>-		snd_printk(KERN_ERR "mpu_irq must be 2, 3, 5 or 7\n");</div><div class='add'>+		dev_err(devptr, "mpu_irq must be 2, 3, 5 or 7\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)</div><div class='add'>+static int snd_jazz16_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_card_jazz16 *jazz16;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='del'>-	static int possible_irqs[] = {2, 3, 5, 7, 9, 10, 15, -1};</div><div class='del'>-	static int possible_dmas8[] = {1, 3, -1};</div><div class='del'>-	static int possible_dmas16[] = {5, 7, -1};</div><div class='add'>+	static const int possible_irqs[] = {2, 3, 5, 7, 9, 10, 15, -1};</div><div class='add'>+	static const int possible_dmas8[] = {1, 3, -1};</div><div class='add'>+	static const int possible_dmas16[] = {5, 7, -1};</div><div class='ctx'> 	int err, xirq, xdma8, xdma16, xmpu_port, xmpu_irq;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_card_jazz16), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_card_jazz16), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -240,37 +239,34 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> 	if (xirq == SNDRV_AUTO_IRQ) {</div><div class='ctx'> 		xirq = snd_legacy_find_free_irq(possible_irqs);</div><div class='ctx'> 		if (xirq &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free IRQ\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto err_free;</div><div class='add'>+			dev_err(devptr, "unable to find a free IRQ\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	xdma8 = dma8[dev];</div><div class='ctx'> 	if (xdma8 == SNDRV_AUTO_DMA) {</div><div class='ctx'> 		xdma8 = snd_legacy_find_free_dma(possible_dmas8);</div><div class='ctx'> 		if (xdma8 &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA8\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto err_free;</div><div class='add'>+			dev_err(devptr, "unable to find a free DMA8\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	xdma16 = dma16[dev];</div><div class='ctx'> 	if (xdma16 == SNDRV_AUTO_DMA) {</div><div class='ctx'> 		xdma16 = snd_legacy_find_free_dma(possible_dmas16);</div><div class='ctx'> 		if (xdma16 &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to find a free DMA16\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto err_free;</div><div class='add'>+			dev_err(devptr, "unable to find a free DMA16\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	xmpu_port = mpu_port[dev];</div><div class='ctx'> 	if (xmpu_port == SNDRV_AUTO_PORT)</div><div class='ctx'> 		xmpu_port = 0;</div><div class='del'>-	err = jazz16_detect_board(port[dev], xmpu_port);</div><div class='add'>+	err = jazz16_detect_board(card, port[dev], xmpu_port);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Media Vision Jazz16 board not detected\n");</div><div class='del'>-		goto err_free;</div><div class='add'>+		dev_err(devptr, "Media Vision Jazz16 board not detected\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_sbdsp_create(card, port[dev], irq[dev],</div><div class='ctx'> 			       jazz16_interrupt,</div><div class='hunk'>@@ -278,41 +274,41 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> 			       SB_HW_JAZZ16,</div><div class='ctx'> 			       &amp;chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_free;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	xmpu_irq = mpu_irq[dev];</div><div class='ctx'> 	if (xmpu_irq == SNDRV_AUTO_IRQ || mpu_port[dev] == SNDRV_AUTO_PORT)</div><div class='ctx'> 		xmpu_irq = 0;</div><div class='ctx'> 	err = jazz16_configure_board(chip, xmpu_irq);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Media Vision Jazz16 configuration failed\n");</div><div class='del'>-		goto err_free;</div><div class='add'>+		dev_err(devptr, "Media Vision Jazz16 configuration failed\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	jazz16-&gt;chip = chip;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "jazz16");</div><div class='del'>-	strcpy(card-&gt;shortname, "Media Vision Jazz16");</div><div class='add'>+	strscpy(card-&gt;driver, "jazz16");</div><div class='add'>+	strscpy(card-&gt;shortname, "Media Vision Jazz16");</div><div class='ctx'> 	sprintf(card-&gt;longname,</div><div class='ctx'> 		"Media Vision Jazz16 at 0x%lx, irq %d, dma8 %d, dma16 %d",</div><div class='ctx'> 		port[dev], xirq, xdma8, xdma16);</div><div class='ctx'> </div><div class='del'>-	err = snd_sb8dsp_pcm(chip, 0, NULL);</div><div class='add'>+	err = snd_sb8dsp_pcm(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_free;</div><div class='add'>+		return err;</div><div class='ctx'> 	err = snd_sbmixer_new(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_free;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_opl3_create(card, chip-&gt;port, chip-&gt;port + 2,</div><div class='ctx'> 			      OPL3_HW_AUTO, 1, &amp;opl3);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_WARNING "no OPL device at 0x%lx-0x%lx\n",</div><div class='del'>-			   chip-&gt;port, chip-&gt;port + 2);</div><div class='add'>+		dev_warn(devptr, "no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+			 chip-&gt;port, chip-&gt;port + 2);</div><div class='ctx'> 	else {</div><div class='ctx'> 		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto err_free;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_port[dev] &gt; 0 &amp;&amp; mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		if (mpu_irq[dev] == SNDRV_AUTO_IRQ)</div><div class='hunk'>@@ -322,33 +318,17 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> 					MPU401_HW_MPU401,</div><div class='ctx'> 					mpu_port[dev], 0,</div><div class='ctx'> 					mpu_irq[dev],</div><div class='del'>-					mpu_irq[dev] &gt;= 0 ? IRQF_DISABLED : 0,</div><div class='ctx'> 					NULL) &lt; 0)</div><div class='del'>-			snd_printk(KERN_ERR "no MPU-401 device at 0x%lx\n",</div><div class='del'>-					mpu_port[dev]);</div><div class='add'>+			dev_err(devptr, "no MPU-401 device at 0x%lx\n",</div><div class='add'>+				mpu_port[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_free;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_free:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_jazz16_remove(struct device *devptr, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = dev_get_drvdata(devptr);</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -360,7 +340,6 @@ static int snd_jazz16_suspend(struct device *pdev, unsigned int n,</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_sbmixer_suspend(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -381,7 +360,6 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_jazz16_driver = {</div><div class='ctx'> 	.match		= snd_jazz16_match,</div><div class='ctx'> 	.probe		= snd_jazz16_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_jazz16_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_jazz16_suspend,</div><div class='ctx'> 	.resume		= snd_jazz16_resume,</div><div class='hunk'>@@ -391,15 +369,4 @@ static struct isa_driver snd_jazz16_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_jazz16_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_jazz16_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_jazz16_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_jazz16_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_jazz16_init)</div><div class='del'>-module_exit(alsa_card_jazz16_exit)</div><div class='add'>+module_isa_driver(snd_jazz16_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c<br/>index 4d1c5a300ff8..208d1942a015 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb16.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for SoundBlaster 16/AWE32/AWE64 soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -24,7 +9,8 @@</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> #include &lt;sound/sb16_csp.h&gt;</div><div class='hunk'>@@ -36,41 +22,27 @@</div><div class='ctx'> #define SNDRV_LEGACY_FIND_FREE_DMA</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef SNDRV_SBAWE</div><div class='del'>-#define PFX "sbawe: "</div><div class='del'>-#else</div><div class='del'>-#define PFX "sb16: "</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> #ifndef SNDRV_SBAWE</div><div class='ctx'> MODULE_DESCRIPTION("Sound Blaster 16");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 16},"</div><div class='del'>-		"{Creative Labs,SB Vibra16S},"</div><div class='del'>-		"{Creative Labs,SB Vibra16C},"</div><div class='del'>-		"{Creative Labs,SB Vibra16CL},"</div><div class='del'>-		"{Creative Labs,SB Vibra16X}}");</div><div class='ctx'> #else</div><div class='ctx'> MODULE_DESCRIPTION("Sound Blaster AWE");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB AWE 32},"</div><div class='del'>-		"{Creative Labs,SB AWE 64},"</div><div class='del'>-		"{Creative Labs,SB AWE 64 Gold}}");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> #define SNDRV_DEBUG_IRQ</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(SNDRV_SBAWE) &amp;&amp; (defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE)))</div><div class='add'>+#if defined(SNDRV_SBAWE) &amp;&amp; IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> #define SNDRV_SBAWE_EMU8000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260,0x280 */</div><div class='ctx'> static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x330,0x300 */</div><div class='hunk'>@@ -99,21 +71,21 @@ MODULE_PARM_DESC(enable, "Enable SoundBlaster 16 soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for SB16 driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for SB16 driver.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port # for SB16 PnP driver.");</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='del'>-module_param_array(awe_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(awe_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(awe_port, "AWE port # for SB16 PnP driver.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for SB16 driver.");</div><div class='del'>-module_param_array(dma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma8, "8-bit DMA # for SB16 driver.");</div><div class='del'>-module_param_array(dma16, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma16, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma16, "16-bit DMA # for SB16 driver.");</div><div class='ctx'> module_param_array(mic_agc, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mic_agc, "Mic Auto-Gain-Control switch.");</div><div class='hunk'>@@ -145,7 +117,7 @@ struct snd_card_sb16 {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_sb16_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_sb16_pnpids[] = {</div><div class='ctx'> #ifndef SNDRV_SBAWE</div><div class='ctx'> 	/* Sound Blaster 16 PnP */</div><div class='ctx'> 	{ .id = "CTL0024", .devs = { { "CTL0031" } } },</div><div class='hunk'>@@ -250,9 +222,9 @@ MODULE_DEVICE_TABLE(pnp_card, snd_sb16_pnpids);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,</div><div class='del'>-				       struct pnp_card_link *card,</div><div class='del'>-				       const struct pnp_card_device_id *id)</div><div class='add'>+static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,</div><div class='add'>+			     struct pnp_card_link *card,</div><div class='add'>+			     const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pnp_dev *pdev;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -269,7 +241,7 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev); </div><div class='ctx'> 	if (err &lt; 0) { </div><div class='del'>-		snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n"); </div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "AUDIO pnp configure failure\n");</div><div class='ctx'> 		return err; </div><div class='ctx'> 	} </div><div class='ctx'> 	port[dev] = pnp_port_start(pdev, 0);</div><div class='hunk'>@@ -278,10 +250,10 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,</div><div class='ctx'> 	dma8[dev] = pnp_dma(pdev, 0);</div><div class='ctx'> 	dma16[dev] = pnp_dma(pdev, 1);</div><div class='ctx'> 	irq[dev] = pnp_irq(pdev, 0);</div><div class='del'>-	snd_printdd("pnp SB16: port=0x%lx, mpu port=0x%lx, fm port=0x%lx\n",</div><div class='del'>-			port[dev], mpu_port[dev], fm_port[dev]);</div><div class='del'>-	snd_printdd("pnp SB16: dma1=%i, dma2=%i, irq=%i\n",</div><div class='del'>-			dma8[dev], dma16[dev], irq[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "pnp SB16: port=0x%lx, mpu port=0x%lx, fm port=0x%lx\n",</div><div class='add'>+		port[dev], mpu_port[dev], fm_port[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "pnp SB16: dma1=%i, dma2=%i, irq=%i\n",</div><div class='add'>+		dma8[dev], dma16[dev], irq[dev]);</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='ctx'> 	/* WaveTable initialization */</div><div class='ctx'> 	pdev = acard-&gt;devwt;</div><div class='hunk'>@@ -291,13 +263,13 @@ static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,</div><div class='ctx'> 			goto __wt_error; </div><div class='ctx'> 		} </div><div class='ctx'> 		awe_port[dev] = pnp_port_start(pdev, 0);</div><div class='del'>-		snd_printdd("pnp SB16: wavetable port=0x%llx\n",</div><div class='del'>-				(unsigned long long)pnp_port_start(pdev, 0));</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "pnp SB16: wavetable port=0x%llx\n",</div><div class='add'>+			(unsigned long long)pnp_port_start(pdev, 0));</div><div class='ctx'> 	} else {</div><div class='ctx'> __wt_error:</div><div class='ctx'> 		if (pdev) {</div><div class='ctx'> 			pnp_release_card_device(pdev);</div><div class='del'>-			snd_printk(KERN_ERR PFX "WaveTable pnp configure failure\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "WaveTable pnp configure failure\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		acard-&gt;devwt = NULL;</div><div class='ctx'> 		awe_port[dev] = -1;</div><div class='hunk'>@@ -308,36 +280,27 @@ __wt_error:</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='ctx'> </div><div class='del'>-static void snd_sb16_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_card_sb16 *acard = card-&gt;private_data;</div><div class='del'>-        </div><div class='del'>-	if (acard == NULL)</div><div class='del'>-		return;</div><div class='del'>-	release_and_free_resource(acard-&gt;fm_res);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='ctx'> #define is_isapnp_selected(dev)		isapnp[dev]</div><div class='ctx'> #else</div><div class='ctx'> #define is_isapnp_selected(dev)		0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int snd_sb16_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_sb16_card_new(struct device *devptr, int dev,</div><div class='add'>+			     struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_card_sb16), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_card_sb16), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	card-&gt;private_free = snd_sb16_free;</div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='add'>+static int snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int xirq, xdma8, xdma16;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='hunk'>@@ -347,41 +310,39 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> #ifdef CONFIG_SND_SB16_CSP</div><div class='ctx'> 	struct snd_hwdep *xcsp = NULL;</div><div class='ctx'> #endif</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	xirq = irq[dev];</div><div class='ctx'> 	xdma8 = dma8[dev];</div><div class='ctx'> 	xdma16 = dma16[dev];</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sbdsp_create(card,</div><div class='del'>-				    port[dev],</div><div class='del'>-				    xirq,</div><div class='del'>-				    snd_sb16dsp_interrupt,</div><div class='del'>-				    xdma8,</div><div class='del'>-				    xdma16,</div><div class='del'>-				    SB_HW_AUTO,</div><div class='del'>-				    &amp;chip)) &lt; 0)</div><div class='add'>+	err = snd_sbdsp_create(card, port[dev], xirq, snd_sb16dsp_interrupt,</div><div class='add'>+			       xdma8, xdma16, SB_HW_AUTO, &amp;chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	acard-&gt;chip = chip;</div><div class='ctx'> 	if (chip-&gt;hardware != SB_HW_16) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "SB 16 chip was not detected at 0x%lx\n", port[dev]);</div><div class='add'>+		dev_err(card-&gt;dev, "SB 16 chip was not detected at 0x%lx\n", port[dev]);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;mpu_port = mpu_port[dev];</div><div class='del'>-	if (! is_isapnp_selected(dev) &amp;&amp; (err = snd_sb16dsp_configure(chip)) &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	if (!is_isapnp_selected(dev)) {</div><div class='add'>+		err = snd_sb16dsp_configure(chip);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sb16dsp_pcm(chip, 0, &amp;chip-&gt;pcm)) &lt; 0)</div><div class='add'>+	err = snd_sb16dsp_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver,</div><div class='add'>+	strscpy(card-&gt;driver,</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='ctx'> 			awe_port[dev] &gt; 0 ? "SB AWE" :</div><div class='ctx'> #endif</div><div class='ctx'> 			"SB16");</div><div class='del'>-	strcpy(card-&gt;shortname, chip-&gt;name);</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;name);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i, dma ",</div><div class='ctx'> 		chip-&gt;name,</div><div class='ctx'> 		chip-&gt;port,</div><div class='hunk'>@@ -393,9 +354,11 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> 			xdma8 &gt;= 0 ? "&amp;" : "", xdma16);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;mpu_port &gt; 0 &amp;&amp; chip-&gt;mpu_port != SNDRV_AUTO_PORT) {</div><div class='del'>-		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,</div><div class='del'>-					       chip-&gt;mpu_port, 0,</div><div class='del'>-					       xirq, 0, &amp;chip-&gt;rmidi)) &lt; 0)</div><div class='add'>+		err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,</div><div class='add'>+					  chip-&gt;mpu_port,</div><div class='add'>+					  MPU401_INFO_IRQ_HOOK, -1,</div><div class='add'>+					  &amp;chip-&gt;rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		chip-&gt;rmidi_callback = snd_mpu401_uart_interrupt;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -410,20 +373,22 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> 				    OPL3_HW_OPL3,</div><div class='ctx'> 				    acard-&gt;fm_res != NULL || fm_port[dev] == port[dev],</div><div class='ctx'> 				    &amp;opl3) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",</div><div class='del'>-				   fm_port[dev], fm_port[dev] + 2);</div><div class='add'>+			dev_err(card-&gt;dev, "no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+				fm_port[dev], fm_port[dev] + 2);</div><div class='ctx'> 		} else {</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='ctx'> 			int seqdev = awe_port[dev] &gt; 0 ? 2 : 1;</div><div class='ctx'> #else</div><div class='ctx'> 			int seqdev = 1;</div><div class='ctx'> #endif</div><div class='del'>-			if ((err = snd_opl3_hwdep_new(opl3, 0, seqdev, &amp;synth)) &lt; 0)</div><div class='add'>+			err = snd_opl3_hwdep_new(opl3, 0, seqdev, &amp;synth);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sbmixer_new(chip)) &lt; 0)</div><div class='add'>+	err = snd_sbmixer_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_SB16_CSP</div><div class='hunk'>@@ -434,15 +399,20 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> 			chip-&gt;csp = xcsp-&gt;private_data;</div><div class='ctx'> 			chip-&gt;hardware = SB_HW_16CSP;</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk(KERN_INFO PFX "warning - CSP chip not detected on soundcard #%i\n", dev + 1);</div><div class='add'>+			dev_info(card-&gt;dev,</div><div class='add'>+				 "warning - CSP chip not detected on soundcard #%i\n",</div><div class='add'>+				 dev + 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='ctx'> 	if (awe_port[dev] &gt; 0) {</div><div class='del'>-		if ((err = snd_emu8000_new(card, 1, awe_port[dev],</div><div class='del'>-					   seq_ports[dev], NULL)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", awe_port[dev]);</div><div class='add'>+		err = snd_emu8000_new(card, 1, awe_port[dev],</div><div class='add'>+				      seq_ports[dev], NULL);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"fatal error - EMU-8000 synthesizer not detected at 0x%lx\n",</div><div class='add'>+				awe_port[dev]);</div><div class='ctx'> </div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -450,13 +420,14 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* setup Mic AGC */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-	snd_sbmixer_write(chip, SB_DSP4_MIC_AGC,</div><div class='del'>-		(snd_sbmixer_read(chip, SB_DSP4_MIC_AGC) &amp; 0x01) |</div><div class='del'>-		(mic_agc[dev] ? 0x00 : 0x01));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_sbmixer_write(chip, SB_DSP4_MIC_AGC,</div><div class='add'>+			(snd_sbmixer_read(chip, SB_DSP4_MIC_AGC) &amp; 0x01) |</div><div class='add'>+			(mic_agc[dev] ? 0x00 : 0x01));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -469,7 +440,6 @@ static int snd_sb16_suspend(struct snd_card *card, pm_message_t state)</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_sbmixer_suspend(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -486,13 +456,13 @@ static int snd_sb16_resume(struct snd_card *card)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)</div><div class='add'>+static int snd_sb16_isa_probe1(int dev, struct device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card_sb16 *acard;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_sb16_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_sb16_card_new(pdev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -500,49 +470,51 @@ static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)</div><div class='ctx'> 	/* non-PnP FM port address is hardwired with base port address */</div><div class='ctx'> 	fm_port[dev] = port[dev];</div><div class='ctx'> 	/* block the 0x388 port to avoid PnP conflicts */</div><div class='del'>-	acard-&gt;fm_res = request_region(0x388, 4, "SoundBlaster FM");</div><div class='add'>+	acard-&gt;fm_res = devm_request_region(card-&gt;dev, 0x388, 4,</div><div class='add'>+					    "SoundBlaster FM");</div><div class='ctx'> #ifdef SNDRV_SBAWE_EMU8000</div><div class='ctx'> 	/* non-PnP AWE port address is hardwired with base port address */</div><div class='ctx'> 	awe_port[dev] = port[dev] + 0x400;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-	if ((err = snd_sb16_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_sb16_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sb16_isa_match(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_sb16_isa_match(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	return enable[dev] &amp;&amp; !is_isapnp_selected(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	static int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='del'>-	static int possible_dmas8[] = {1, 3, 0, -1};</div><div class='del'>-	static int possible_dmas16[] = {5, 6, 7, -1};</div><div class='add'>+	static const int possible_irqs[] = {5, 9, 10, 7, -1};</div><div class='add'>+	static const int possible_dmas8[] = {1, 3, 0, -1};</div><div class='add'>+	static const int possible_dmas16[] = {5, 6, 7, -1};</div><div class='ctx'> </div><div class='ctx'> 	if (irq[dev] == SNDRV_AUTO_IRQ) {</div><div class='del'>-		if ((irq[dev] = snd_legacy_find_free_irq(possible_irqs)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");</div><div class='add'>+		irq[dev] = snd_legacy_find_free_irq(possible_irqs);</div><div class='add'>+		if (irq[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free IRQ\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma8[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma8[dev] = snd_legacy_find_free_dma(possible_dmas8)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");</div><div class='add'>+		dma8[dev] = snd_legacy_find_free_dma(possible_dmas8);</div><div class='add'>+		if (dma8[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free 8-bit DMA\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma16[dev] == SNDRV_AUTO_DMA) {</div><div class='del'>-		if ((dma16[dev] = snd_legacy_find_free_dma(possible_dmas16)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");</div><div class='add'>+		dma16[dev] = snd_legacy_find_free_dma(possible_dmas16);</div><div class='add'>+		if (dma16[dev] &lt; 0) {</div><div class='add'>+			dev_err(pdev, "unable to find a free 16-bit DMA\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -550,7 +522,7 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	if (port[dev] != SNDRV_AUTO_PORT)</div><div class='ctx'> 		return snd_sb16_isa_probe1(dev, pdev);</div><div class='ctx'> 	else {</div><div class='del'>-		static int possible_ports[] = {0x220, 0x240, 0x260, 0x280};</div><div class='add'>+		static const int possible_ports[] = {0x220, 0x240, 0x260, 0x280};</div><div class='ctx'> 		int i;</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(possible_ports); i++) {</div><div class='ctx'> 			port[dev] = possible_ports[i];</div><div class='hunk'>@@ -562,13 +534,6 @@ static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_sb16_isa_remove(struct device *pdev, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(pdev));</div><div class='del'>-	dev_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_sb16_isa_suspend(struct device *dev, unsigned int n,</div><div class='ctx'> 				pm_message_t state)</div><div class='hunk'>@@ -591,7 +556,6 @@ static int snd_sb16_isa_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_sb16_isa_driver = {</div><div class='ctx'> 	.match		= snd_sb16_isa_match,</div><div class='ctx'> 	.probe		= snd_sb16_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_sb16_isa_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_sb16_isa_suspend,</div><div class='ctx'> 	.resume		= snd_sb16_isa_resume,</div><div class='hunk'>@@ -603,8 +567,8 @@ static struct isa_driver snd_sb16_isa_driver = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					 const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_sb16_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+			       const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -613,15 +577,15 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	for ( ; dev &lt; SNDRV_CARDS; dev++) {</div><div class='ctx'> 		if (!enable[dev] || !isapnp[dev])</div><div class='ctx'> 			continue;</div><div class='del'>-		res = snd_sb16_card_new(dev, &amp;card);</div><div class='add'>+		res = snd_sb16_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='del'>-		snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='del'>-		if ((res = snd_card_sb16_pnp(dev, card-&gt;private_data, pcard, pid)) &lt; 0 ||</div><div class='del'>-		    (res = snd_sb16_probe(card, dev)) &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		res = snd_card_sb16_pnp(dev, card-&gt;private_data, pcard, pid);</div><div class='add'>+		if (res &lt; 0)</div><div class='add'>+			return res;</div><div class='add'>+		res = snd_sb16_probe(card, dev);</div><div class='add'>+		if (res &lt; 0)</div><div class='ctx'> 			return res;</div><div class='del'>-		}</div><div class='ctx'> 		pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 		dev++;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -630,12 +594,6 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static int snd_sb16_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)</div><div class='ctx'> {</div><div class='hunk'>@@ -656,7 +614,6 @@ static struct pnp_card_driver sb16_pnpc_driver = {</div><div class='ctx'> #endif</div><div class='ctx'> 	.id_table = snd_sb16_pnpids,</div><div class='ctx'> 	.probe = snd_sb16_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(snd_sb16_pnp_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend = snd_sb16_pnp_suspend,</div><div class='ctx'> 	.resume = snd_sb16_pnp_resume,</div><div class='head'>diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c<br/>index bdc8dde4e4a2..9ad71a9fc18d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16_csp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16_csp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16_csp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb16_csp.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 1999 by Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *                        Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='hunk'>@@ -6,26 +7,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  CSP microcode loader:</div><div class='ctx'>  *   alsa-tools/sb16_csp/ </div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify </div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -59,18 +47,18 @@ MODULE_FIRMWARE("sb16/ima_adpcm_capture.csp");</div><div class='ctx'>  * RIFF data format</div><div class='ctx'>  */</div><div class='ctx'> struct riff_header {</div><div class='del'>-	__u32 name;</div><div class='del'>-	__u32 len;</div><div class='add'>+	__le32 name;</div><div class='add'>+	__le32 len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct desc_header {</div><div class='ctx'> 	struct riff_header info;</div><div class='del'>-	__u16 func_nr;</div><div class='del'>-	__u16 VOC_type;</div><div class='del'>-	__u16 flags_play_rec;</div><div class='del'>-	__u16 flags_16bit_8bit;</div><div class='del'>-	__u16 flags_stereo_mono;</div><div class='del'>-	__u16 flags_rates;</div><div class='add'>+	__le16 func_nr;</div><div class='add'>+	__le16 VOC_type;</div><div class='add'>+	__le16 flags_play_rec;</div><div class='add'>+	__le16 flags_16bit_8bit;</div><div class='add'>+	__le16 flags_stereo_mono;</div><div class='add'>+	__le16 flags_rates;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -92,7 +80,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 				struct snd_sb_csp_microcode __user * code);</div><div class='ctx'> static int snd_sb_csp_unload(struct snd_sb_csp * p);</div><div class='ctx'> static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags);</div><div class='del'>-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode);</div><div class='add'>+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode);</div><div class='ctx'> static int snd_sb_csp_check_version(struct snd_sb_csp * p);</div><div class='ctx'> </div><div class='ctx'> static int snd_sb_csp_use(struct snd_sb_csp * p);</div><div class='hunk'>@@ -115,7 +103,7 @@ static void info_read(struct snd_info_entry *entry, struct snd_info_buffer *buff</div><div class='ctx'> int snd_sb_csp_new(struct snd_sb *chip, int device, struct snd_hwdep ** rhwdep)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb_csp *p;</div><div class='del'>-	int uninitialized_var(version);</div><div class='add'>+	int version;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_hwdep *hw;</div><div class='ctx'> </div><div class='hunk'>@@ -125,10 +113,12 @@ int snd_sb_csp_new(struct snd_sb *chip, int device, struct snd_hwdep ** rhwdep)</div><div class='ctx'> 	if (csp_detect(chip, &amp;version))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_hwdep_new(chip-&gt;card, "SB16-CSP", device, &amp;hw)) &lt; 0)</div><div class='add'>+	err = snd_hwdep_new(chip-&gt;card, "SB16-CSP", device, &amp;hw);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) {</div><div class='add'>+	p = kzalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+	if (!p) {</div><div class='ctx'> 		snd_device_free(chip-&gt;card, hw);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -207,6 +197,7 @@ static int snd_sb_csp_ioctl(struct snd_hwdep * hw, struct file *file, unsigned i</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 		/* get information */</div><div class='ctx'> 	case SNDRV_SB_CSP_IOCTL_INFO:</div><div class='add'>+		memset(&amp;info, 0, sizeof(info));</div><div class='ctx'> 		*info.codec_name = *p-&gt;codec_name;</div><div class='ctx'> 		info.func_nr = p-&gt;func_nr;</div><div class='ctx'> 		info.acc_format = p-&gt;acc_format;</div><div class='hunk'>@@ -274,14 +265,10 @@ static int snd_sb_csp_release(struct snd_hwdep * hw, struct file *file)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_sb_csp_use(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;p-&gt;access_mutex);</div><div class='del'>-	if (p-&gt;used) {</div><div class='del'>-		mutex_unlock(&amp;p-&gt;access_mutex);</div><div class='add'>+	guard(mutex)(&amp;p-&gt;access_mutex);</div><div class='add'>+	if (p-&gt;used)</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	}</div><div class='ctx'> 	p-&gt;used++;</div><div class='del'>-	mutex_unlock(&amp;p-&gt;access_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -291,10 +278,8 @@ static int snd_sb_csp_use(struct snd_sb_csp * p)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_sb_csp_unuse(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;p-&gt;access_mutex);</div><div class='add'>+	guard(mutex)(&amp;p-&gt;access_mutex);</div><div class='ctx'> 	p-&gt;used--;</div><div class='del'>-	mutex_unlock(&amp;p-&gt;access_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -306,16 +291,16 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 				struct snd_sb_csp_microcode __user * mcode)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb_csp_mc_header info;</div><div class='add'>+	struct device *dev = p-&gt;chip-&gt;card-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char __user *data_ptr;</div><div class='ctx'> 	unsigned char __user *data_end;</div><div class='ctx'> 	unsigned short func_nr = 0;</div><div class='ctx'> </div><div class='ctx'> 	struct riff_header file_h, item_h, code_h;</div><div class='del'>-	__u32 item_type;</div><div class='add'>+	__le32 item_type;</div><div class='ctx'> 	struct desc_header funcdesc_h;</div><div class='ctx'> </div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;info, mcode, sizeof(info)))</div><div class='hunk'>@@ -324,9 +309,9 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;file_h, data_ptr, sizeof(file_h)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if ((file_h.name != RIFF_HEADER) ||</div><div class='add'>+	if ((le32_to_cpu(file_h.name) != RIFF_HEADER) ||</div><div class='ctx'> 	    (le32_to_cpu(file_h.len) &gt;= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) {</div><div class='del'>-		snd_printd("%s: Invalid RIFF header\n", __func__);</div><div class='add'>+		dev_dbg(dev, "%s: Invalid RIFF header\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	data_ptr += sizeof(file_h);</div><div class='hunk'>@@ -334,8 +319,8 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user(&amp;item_type, data_ptr, sizeof(item_type)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	if (item_type != CSP__HEADER) {</div><div class='del'>-		snd_printd("%s: Invalid RIFF file type\n", __func__);</div><div class='add'>+	if (le32_to_cpu(item_type) != CSP__HEADER) {</div><div class='add'>+		dev_dbg(dev, "%s: Invalid RIFF file type\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	data_ptr += sizeof (item_type);</div><div class='hunk'>@@ -344,12 +329,12 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 		if (copy_from_user(&amp;item_h, data_ptr, sizeof(item_h)))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		data_ptr += sizeof(item_h);</div><div class='del'>-		if (item_h.name != LIST_HEADER)</div><div class='add'>+		if (le32_to_cpu(item_h.name) != LIST_HEADER)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (copy_from_user(&amp;item_type, data_ptr, sizeof(item_type)))</div><div class='ctx'> 			 return -EFAULT;</div><div class='del'>-		switch (item_type) {</div><div class='add'>+		switch (le32_to_cpu(item_type)) {</div><div class='ctx'> 		case FUNC_HEADER:</div><div class='ctx'> 			if (copy_from_user(&amp;funcdesc_h, data_ptr + sizeof(item_type), sizeof(funcdesc_h)))</div><div class='ctx'> 				return -EFAULT;</div><div class='hunk'>@@ -376,7 +361,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 					return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 				/* init microcode blocks */</div><div class='del'>-				if (code_h.name != INIT_HEADER)</div><div class='add'>+				if (le32_to_cpu(code_h.name) != INIT_HEADER)</div><div class='ctx'> 					break;</div><div class='ctx'> 				data_ptr += sizeof(code_h);</div><div class='ctx'> 				err = snd_sb_csp_load_user(p, data_ptr, le32_to_cpu(code_h.len),</div><div class='hunk'>@@ -389,8 +374,8 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 			if (copy_from_user(&amp;code_h, data_ptr, sizeof(code_h)))</div><div class='ctx'> 				return -EFAULT;</div><div class='ctx'> </div><div class='del'>-			if (code_h.name != MAIN_HEADER) {</div><div class='del'>-				snd_printd("%s: Missing 'main' microcode\n", __func__);</div><div class='add'>+			if (le32_to_cpu(code_h.name) != MAIN_HEADER) {</div><div class='add'>+				dev_dbg(dev, "%s: Missing 'main' microcode\n", __func__);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			data_ptr += sizeof(code_h);</div><div class='hunk'>@@ -400,7 +385,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 				return err;</div><div class='ctx'> </div><div class='ctx'> 			/* fill in codec header */</div><div class='del'>-			strlcpy(p-&gt;codec_name, info.codec_name, sizeof(p-&gt;codec_name));</div><div class='add'>+			strscpy(p-&gt;codec_name, info.codec_name, sizeof(p-&gt;codec_name));</div><div class='ctx'> 			p-&gt;func_nr = func_nr;</div><div class='ctx'> 			p-&gt;mode = le16_to_cpu(funcdesc_h.flags_play_rec);</div><div class='ctx'> 			switch (le16_to_cpu(funcdesc_h.VOC_type)) {</div><div class='hunk'>@@ -433,9 +418,9 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 			default:	/* other codecs are unsupported */</div><div class='ctx'> 				p-&gt;acc_format = p-&gt;acc_width = p-&gt;acc_rates = 0;</div><div class='ctx'> 				p-&gt;mode = 0;</div><div class='del'>-				snd_printd("%s: Unsupported CSP codec type: 0x%04x\n",</div><div class='del'>-					   __func__,</div><div class='del'>-					   le16_to_cpu(funcdesc_h.VOC_type));</div><div class='add'>+				dev_dbg(dev, "%s: Unsupported CSP codec type: 0x%04x\n",</div><div class='add'>+					__func__,</div><div class='add'>+					le16_to_cpu(funcdesc_h.VOC_type));</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			p-&gt;acc_channels = le16_to_cpu(funcdesc_h.flags_stereo_mono);</div><div class='hunk'>@@ -443,17 +428,16 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,</div><div class='ctx'> 			p-&gt;acc_rates = le16_to_cpu(funcdesc_h.flags_rates);</div><div class='ctx'> </div><div class='ctx'> 			/* Decouple CSP from IRQ and DMAREQ lines */</div><div class='del'>-			spin_lock_irqsave(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='ctx'> 			set_mode_register(p-&gt;chip, 0xfc);</div><div class='ctx'> 			set_mode_register(p-&gt;chip, 0x00);</div><div class='del'>-			spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 			/* finished loading successfully */</div><div class='ctx'> 			p-&gt;running = SNDRV_SB_CSP_ST_LOADED;	/* set LOADED flag */</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("%s: Function #%d not found\n", __func__, info.func_req);</div><div class='add'>+	dev_dbg(dev, "%s: Function #%d not found\n", __func__, info.func_req);</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -556,10 +540,8 @@ static int set_mode_register(struct snd_sb *chip, unsigned char mode)</div><div class='ctx'> static int csp_detect(struct snd_sb *chip, int *version)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char csp_test1, csp_test2;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int result = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	set_codec_parameter(chip, 0x00, 0x00);</div><div class='ctx'> 	set_mode_register(chip, 0xfc);		/* 0xfc = ?? */</div><div class='hunk'>@@ -568,23 +550,21 @@ static int csp_detect(struct snd_sb *chip, int *version)</div><div class='ctx'> 	set_register(chip, 0x83, ~csp_test1);</div><div class='ctx'> 	csp_test2 = read_register(chip, 0x83);</div><div class='ctx'> 	if (csp_test2 != (csp_test1 ^ 0xff))</div><div class='del'>-		goto __fail;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	set_register(chip, 0x83, csp_test1);</div><div class='ctx'> 	csp_test2 = read_register(chip, 0x83);</div><div class='ctx'> 	if (csp_test2 != csp_test1)</div><div class='del'>-		goto __fail;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	set_mode_register(chip, 0x00);		/* 0x00 = ? */</div><div class='ctx'> </div><div class='ctx'> 	*version = get_version(chip);</div><div class='ctx'> 	snd_sbdsp_reset(chip);	/* reset DSP after getversion! */</div><div class='ctx'> 	if (*version &gt;= 0x10 &amp;&amp; *version &lt;= 0x1f)</div><div class='del'>-		result = 0;		/* valid version id */</div><div class='add'>+		return 0;		/* valid version id */</div><div class='ctx'> </div><div class='del'>-      __fail:</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return result;</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -607,7 +587,9 @@ static int get_version(struct snd_sb *chip)</div><div class='ctx'> static int snd_sb_csp_check_version(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	if (p-&gt;version &lt; 0x10 || p-&gt;version &gt; 0x1f) {</div><div class='del'>-		snd_printd("%s: Invalid CSP version: 0x%x\n", __func__, p-&gt;version);</div><div class='add'>+		dev_dbg(p-&gt;chip-&gt;card-&gt;dev,</div><div class='add'>+			"%s: Invalid CSP version: 0x%x\n",</div><div class='add'>+			__func__, p-&gt;version);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -620,14 +602,12 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int</div><div class='ctx'> {</div><div class='ctx'> 	int status, i;</div><div class='ctx'> 	int err;</div><div class='del'>-	int result = -EIO;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_sbdsp_command(p-&gt;chip, 0x01);	/* CSP download command */</div><div class='ctx'> 	if (snd_sbdsp_get_byte(p-&gt;chip)) {</div><div class='del'>-		snd_printd("%s: Download command failed\n", __func__);</div><div class='del'>-		goto __fail;</div><div class='add'>+		dev_dbg(p-&gt;chip-&gt;card-&gt;dev, "%s: Download command failed\n", __func__);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Send CSP low byte (size - 1) */</div><div class='ctx'> 	snd_sbdsp_command(p-&gt;chip, (unsigned char)(size - 1));</div><div class='hunk'>@@ -637,10 +617,10 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int</div><div class='ctx'> 	/* load from kernel space */</div><div class='ctx'> 	while (size--) {</div><div class='ctx'> 		if (!snd_sbdsp_command(p-&gt;chip, *buf++))</div><div class='del'>-			goto __fail;</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_sbdsp_get_byte(p-&gt;chip))</div><div class='del'>-		goto __fail;</div><div class='add'>+		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	if (load_flags &amp; SNDRV_SB_CSP_LOAD_INITBLOCK) {</div><div class='ctx'> 		i = 0;</div><div class='hunk'>@@ -653,8 +633,10 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int</div><div class='ctx'> 			udelay (10);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (status != 0x55) {</div><div class='del'>-			snd_printd("%s: Microcode initialization failed\n", __func__);</div><div class='del'>-			goto __fail;</div><div class='add'>+			dev_dbg(p-&gt;chip-&gt;card-&gt;dev,</div><div class='add'>+				"%s: Microcode initialization failed\n",</div><div class='add'>+				__func__);</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -662,24 +644,21 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int</div><div class='ctx'> 		 * Start CSP chip if no 16bit DMA channel is set - some kind</div><div class='ctx'> 		 * of autorun or perhaps a bugfix?</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock(&amp;p-&gt;chip-&gt;mixer_lock);</div><div class='del'>-		status = snd_sbmixer_read(p-&gt;chip, SB_DSP4_DMASETUP);</div><div class='del'>-		spin_unlock(&amp;p-&gt;chip-&gt;mixer_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;p-&gt;chip-&gt;mixer_lock) {</div><div class='add'>+			status = snd_sbmixer_read(p-&gt;chip, SB_DSP4_DMASETUP);</div><div class='add'>+		}</div><div class='ctx'> 		if (!(status &amp; (SB_DMASETUP_DMA7 | SB_DMASETUP_DMA6 | SB_DMASETUP_DMA5))) {</div><div class='ctx'> 			err = (set_codec_parameter(p-&gt;chip, 0xaa, 0x00) ||</div><div class='ctx'> 			       set_codec_parameter(p-&gt;chip, 0xff, 0x00));</div><div class='ctx'> 			snd_sbdsp_reset(p-&gt;chip);		/* really! */</div><div class='ctx'> 			if (err)</div><div class='del'>-				goto __fail;</div><div class='add'>+				return -EIO;</div><div class='ctx'> 			set_mode_register(p-&gt;chip, 0xc0);	/* c0 = STOP */</div><div class='ctx'> 			set_mode_register(p-&gt;chip, 0x70);	/* 70 = RUN */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	result = 0;</div><div class='ctx'> </div><div class='del'>-      __fail:</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='ctx'> static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags)</div><div class='hunk'>@@ -724,9 +703,8 @@ static int snd_sb_csp_firmware_load(struct snd_sb_csp *p, int index, int flags)</div><div class='ctx'>  * autoload hardware codec if necessary</div><div class='ctx'>  * return 0 if CSP is loaded and ready to run (p-&gt;running != 0)</div><div class='ctx'>  */</div><div class='del'>-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode)</div><div class='add'>+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* if CSP is running or manually loaded then exit */</div><div class='hunk'>@@ -734,7 +712,7 @@ static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	/* autoload microcode only if requested hardware codec is not already loaded */</div><div class='del'>-	if (((1 &lt;&lt; pcm_sfmt) &amp; p-&gt;acc_format) &amp;&amp; (play_rec_mode &amp; p-&gt;mode)) {</div><div class='add'>+	if (((1U &lt;&lt; (__force int)pcm_sfmt) &amp; p-&gt;acc_format) &amp;&amp; (play_rec_mode &amp; p-&gt;mode)) {</div><div class='ctx'> 		p-&gt;running = SNDRV_SB_CSP_ST_AUTO;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		switch (pcm_sfmt) {</div><div class='hunk'>@@ -767,10 +745,9 @@ static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* Decouple CSP from IRQ and DMAREQ lines */</div><div class='ctx'> 			if (p-&gt;running &amp; SNDRV_SB_CSP_ST_AUTO) {</div><div class='del'>-				spin_lock_irqsave(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='add'>+				guard(spinlock_irqsave)(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='ctx'> 				set_mode_register(p-&gt;chip, 0xfc);</div><div class='ctx'> 				set_mode_register(p-&gt;chip, 0x00);</div><div class='del'>-				spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='ctx'> 				p-&gt;running = 0;			/* clear autoloaded flag */</div><div class='ctx'> 			}</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -798,76 +775,77 @@ static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec</div><div class='ctx'>  */</div><div class='ctx'> static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channels)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = p-&gt;chip-&gt;card-&gt;dev;</div><div class='ctx'> 	unsigned char s_type;	/* sample type */</div><div class='ctx'> 	unsigned char mixL, mixR;</div><div class='ctx'> 	int result = -EIO;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(p-&gt;running &amp; (SNDRV_SB_CSP_ST_LOADED | SNDRV_SB_CSP_ST_AUTO))) {</div><div class='del'>-		snd_printd("%s: Microcode not loaded\n", __func__);</div><div class='add'>+		dev_dbg(dev, "%s: Microcode not loaded\n", __func__);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (p-&gt;running &amp; SNDRV_SB_CSP_ST_RUNNING) {</div><div class='del'>-		snd_printd("%s: CSP already running\n", __func__);</div><div class='add'>+		dev_dbg(dev, "%s: CSP already running\n", __func__);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(sample_width &amp; p-&gt;acc_width)) {</div><div class='del'>-		snd_printd("%s: Unsupported PCM sample width\n", __func__);</div><div class='add'>+		dev_dbg(dev, "%s: Unsupported PCM sample width\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(channels &amp; p-&gt;acc_channels)) {</div><div class='del'>-		snd_printd("%s: Invalid number of channels\n", __func__);</div><div class='add'>+		dev_dbg(dev, "%s: Invalid number of channels\n", __func__);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mute PCM volume */</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;chip-&gt;mixer_lock, flags);</div><div class='del'>-	mixL = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV);</div><div class='del'>-	mixR = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV + 1);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL &amp; 0x7);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR &amp; 0x7);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='del'>-	set_mode_register(p-&gt;chip, 0xc0);	/* c0 = STOP */</div><div class='del'>-	set_mode_register(p-&gt;chip, 0x70);	/* 70 = RUN */</div><div class='del'>-</div><div class='del'>-	s_type = 0x00;</div><div class='del'>-	if (channels == SNDRV_SB_CSP_MONO)</div><div class='del'>-		s_type = 0x11;	/* 000n 000n    (n = 1 if mono) */</div><div class='del'>-	if (sample_width == SNDRV_SB_CSP_SAMPLE_8BIT)</div><div class='del'>-		s_type |= 0x22;	/* 00dX 00dX    (d = 1 if 8 bit samples) */</div><div class='del'>-</div><div class='del'>-	if (set_codec_parameter(p-&gt;chip, 0x81, s_type)) {</div><div class='del'>-		snd_printd("%s: Set sample type command failed\n", __func__);</div><div class='del'>-		goto __fail;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;p-&gt;chip-&gt;mixer_lock) {</div><div class='add'>+		mixL = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV);</div><div class='add'>+		mixR = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV + 1);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL &amp; 0x7);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR &amp; 0x7);</div><div class='ctx'> 	}</div><div class='del'>-	if (set_codec_parameter(p-&gt;chip, 0x80, 0x00)) {</div><div class='del'>-		snd_printd("%s: Codec start command failed\n", __func__);</div><div class='del'>-		goto __fail;</div><div class='del'>-	}</div><div class='del'>-	p-&gt;run_width = sample_width;</div><div class='del'>-	p-&gt;run_channels = channels;</div><div class='ctx'> </div><div class='del'>-	p-&gt;running |= SNDRV_SB_CSP_ST_RUNNING;</div><div class='add'>+	scoped_guard(spinlock, &amp;p-&gt;chip-&gt;reg_lock) {</div><div class='add'>+		set_mode_register(p-&gt;chip, 0xc0);	/* c0 = STOP */</div><div class='add'>+		set_mode_register(p-&gt;chip, 0x70);	/* 70 = RUN */</div><div class='ctx'> </div><div class='del'>-	if (p-&gt;mode &amp; SNDRV_SB_CSP_MODE_QSOUND) {</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0xe0, 0x01);</div><div class='del'>-		/* enable QSound decoder */</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0x00, 0xff);</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0x01, 0xff);</div><div class='del'>-		p-&gt;running |= SNDRV_SB_CSP_ST_QSOUND;</div><div class='del'>-		/* set QSound startup value */</div><div class='del'>-		snd_sb_csp_qsound_transfer(p);</div><div class='del'>-	}</div><div class='del'>-	result = 0;</div><div class='add'>+		s_type = 0x00;</div><div class='add'>+		if (channels == SNDRV_SB_CSP_MONO)</div><div class='add'>+			s_type = 0x11;	/* 000n 000n    (n = 1 if mono) */</div><div class='add'>+		if (sample_width == SNDRV_SB_CSP_SAMPLE_8BIT)</div><div class='add'>+			s_type |= 0x22;	/* 00dX 00dX    (d = 1 if 8 bit samples) */</div><div class='ctx'> </div><div class='del'>-      __fail:</div><div class='del'>-	spin_unlock(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='add'>+		if (set_codec_parameter(p-&gt;chip, 0x81, s_type)) {</div><div class='add'>+			dev_dbg(dev, "%s: Set sample type command failed\n", __func__);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (set_codec_parameter(p-&gt;chip, 0x80, 0x00)) {</div><div class='add'>+			dev_dbg(dev, "%s: Codec start command failed\n", __func__);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		p-&gt;run_width = sample_width;</div><div class='add'>+		p-&gt;run_channels = channels;</div><div class='add'>+</div><div class='add'>+		p-&gt;running |= SNDRV_SB_CSP_ST_RUNNING;</div><div class='add'>+</div><div class='add'>+		if (p-&gt;mode &amp; SNDRV_SB_CSP_MODE_QSOUND) {</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0xe0, 0x01);</div><div class='add'>+			/* enable QSound decoder */</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0x00, 0xff);</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0x01, 0xff);</div><div class='add'>+			p-&gt;running |= SNDRV_SB_CSP_ST_QSOUND;</div><div class='add'>+			/* set QSound startup value */</div><div class='add'>+			snd_sb_csp_qsound_transfer(p);</div><div class='add'>+		}</div><div class='add'>+		result = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* restore PCM volume */</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;mixer_lock, flags);</div><div class='add'>+	if (result &lt; 0) {</div><div class='add'>+		guard(spinlock_irqsave)(&amp;p-&gt;chip-&gt;mixer_lock);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -879,34 +857,35 @@ static int snd_sb_csp_stop(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> 	unsigned char mixL, mixR;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(p-&gt;running &amp; SNDRV_SB_CSP_ST_RUNNING))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Mute PCM volume */</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;chip-&gt;mixer_lock, flags);</div><div class='del'>-	mixL = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV);</div><div class='del'>-	mixR = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV + 1);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL &amp; 0x7);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR &amp; 0x7);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;p-&gt;chip-&gt;mixer_lock) {</div><div class='add'>+		mixL = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV);</div><div class='add'>+		mixR = snd_sbmixer_read(p-&gt;chip, SB_DSP4_PCM_DEV + 1);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL &amp; 0x7);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR &amp; 0x7);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='del'>-	if (p-&gt;running &amp; SNDRV_SB_CSP_ST_QSOUND) {</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0xe0, 0x01);</div><div class='del'>-		/* disable QSound decoder */</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0x00, 0x00);</div><div class='del'>-		set_codec_parameter(p-&gt;chip, 0x01, 0x00);</div><div class='add'>+	scoped_guard(spinlock, &amp;p-&gt;chip-&gt;reg_lock) {</div><div class='add'>+		if (p-&gt;running &amp; SNDRV_SB_CSP_ST_QSOUND) {</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0xe0, 0x01);</div><div class='add'>+			/* disable QSound decoder */</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0x00, 0x00);</div><div class='add'>+			set_codec_parameter(p-&gt;chip, 0x01, 0x00);</div><div class='ctx'> </div><div class='del'>-		p-&gt;running &amp;= ~SNDRV_SB_CSP_ST_QSOUND;</div><div class='add'>+			p-&gt;running &amp;= ~SNDRV_SB_CSP_ST_QSOUND;</div><div class='add'>+		}</div><div class='add'>+		result = set_mode_register(p-&gt;chip, 0xc0);	/* c0 = STOP */</div><div class='ctx'> 	}</div><div class='del'>-	result = set_mode_register(p-&gt;chip, 0xc0);	/* c0 = STOP */</div><div class='del'>-	spin_unlock(&amp;p-&gt;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* restore PCM volume */</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL);</div><div class='del'>-	snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;p-&gt;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV, mixL);</div><div class='add'>+		snd_sbmixer_write(p-&gt;chip, SB_DSP4_PCM_DEV + 1, mixR);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(result))</div><div class='ctx'> 		p-&gt;running &amp;= ~(SNDRV_SB_CSP_ST_PAUSED | SNDRV_SB_CSP_ST_RUNNING);</div><div class='hunk'>@@ -919,14 +898,13 @@ static int snd_sb_csp_stop(struct snd_sb_csp * p)</div><div class='ctx'> static int snd_sb_csp_pause(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(p-&gt;running &amp; SNDRV_SB_CSP_ST_RUNNING))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='del'>-	result = set_codec_parameter(p-&gt;chip, 0x80, 0xff);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;p-&gt;chip-&gt;reg_lock) {</div><div class='add'>+		result = set_codec_parameter(p-&gt;chip, 0x80, 0xff);</div><div class='add'>+	}</div><div class='ctx'> 	if (!(result))</div><div class='ctx'> 		p-&gt;running |= SNDRV_SB_CSP_ST_PAUSED;</div><div class='ctx'> </div><div class='hunk'>@@ -939,14 +917,13 @@ static int snd_sb_csp_pause(struct snd_sb_csp * p)</div><div class='ctx'> static int snd_sb_csp_restart(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!(p-&gt;running &amp; SNDRV_SB_CSP_ST_PAUSED))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='del'>-	result = set_codec_parameter(p-&gt;chip, 0x80, 0x00);</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;p-&gt;chip-&gt;reg_lock) {</div><div class='add'>+		result = set_codec_parameter(p-&gt;chip, 0x80, 0x00);</div><div class='add'>+	}</div><div class='ctx'> 	if (!(result))</div><div class='ctx'> 		p-&gt;running &amp;= ~SNDRV_SB_CSP_ST_PAUSED;</div><div class='ctx'> </div><div class='hunk'>@@ -972,15 +949,13 @@ static int snd_sb_qsound_switch_get(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> static int snd_sb_qsound_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb_csp *p = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval;</div><div class='ctx'> 	</div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] &amp; 0x01;</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;q_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;p-&gt;q_lock);</div><div class='ctx'> 	change = p-&gt;q_enabled != nval;</div><div class='ctx'> 	p-&gt;q_enabled = nval;</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;q_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -996,19 +971,16 @@ static int snd_sb_qsound_space_info(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> static int snd_sb_qsound_space_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb_csp *p = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;q_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;p-&gt;q_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = p-&gt;qpos_left;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = p-&gt;qpos_right;</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;q_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb_qsound_space_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb_csp *p = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval1, nval2;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1018,16 +990,15 @@ static int snd_sb_qsound_space_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	nval2 = ucontrol-&gt;value.integer.value[1];</div><div class='ctx'> 	if (nval2 &gt; SNDRV_SB_CSP_QSOUND_MAX_RIGHT)</div><div class='ctx'> 		nval2 = SNDRV_SB_CSP_QSOUND_MAX_RIGHT;</div><div class='del'>-	spin_lock_irqsave(&amp;p-&gt;q_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;p-&gt;q_lock);</div><div class='ctx'> 	change = p-&gt;qpos_left != nval1 || p-&gt;qpos_right != nval2;</div><div class='ctx'> 	p-&gt;qpos_left = nval1;</div><div class='ctx'> 	p-&gt;qpos_right = nval2;</div><div class='ctx'> 	p-&gt;qpos_changed = change;</div><div class='del'>-	spin_unlock_irqrestore(&amp;p-&gt;q_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_sb_qsound_switch = {</div><div class='add'>+static const struct snd_kcontrol_new snd_sb_qsound_switch = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "3D Control - Switch",</div><div class='ctx'> 	.info = snd_sb_qsound_switch_info,</div><div class='hunk'>@@ -1035,7 +1006,7 @@ static struct snd_kcontrol_new snd_sb_qsound_switch = {</div><div class='ctx'> 	.put = snd_sb_qsound_switch_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_sb_qsound_space = {</div><div class='add'>+static const struct snd_kcontrol_new snd_sb_qsound_space = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "3D Control - Space",</div><div class='ctx'> 	.info = snd_sb_qsound_space_info,</div><div class='hunk'>@@ -1046,6 +1017,7 @@ static struct snd_kcontrol_new snd_sb_qsound_space = {</div><div class='ctx'> static int snd_sb_qsound_build(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!p))</div><div class='hunk'>@@ -1057,10 +1029,16 @@ static int snd_sb_qsound_build(struct snd_sb_csp * p)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;p-&gt;q_lock);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(card, p-&gt;qsound_switch = snd_ctl_new1(&amp;snd_sb_qsound_switch, p))) &lt; 0)</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_sb_qsound_switch, p);</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __error;</div><div class='del'>-	if ((err = snd_ctl_add(card, p-&gt;qsound_space = snd_ctl_new1(&amp;snd_sb_qsound_space, p))) &lt; 0)</div><div class='add'>+	p-&gt;qsound_switch = kctl;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_sb_qsound_space, p);</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __error;</div><div class='add'>+	p-&gt;qsound_space = kctl;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1072,24 +1050,20 @@ static int snd_sb_qsound_build(struct snd_sb_csp * p)</div><div class='ctx'> static void snd_sb_qsound_destroy(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!p))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	card = p-&gt;chip-&gt;card;	</div><div class='ctx'> 	</div><div class='del'>-	down_write(&amp;card-&gt;controls_rwsem);</div><div class='del'>-	if (p-&gt;qsound_switch)</div><div class='del'>-		snd_ctl_remove(card, p-&gt;qsound_switch);</div><div class='del'>-	if (p-&gt;qsound_space)</div><div class='del'>-		snd_ctl_remove(card, p-&gt;qsound_space);</div><div class='del'>-	up_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	snd_ctl_remove(card, p-&gt;qsound_switch);</div><div class='add'>+	p-&gt;qsound_switch = NULL;</div><div class='add'>+	snd_ctl_remove(card, p-&gt;qsound_space);</div><div class='add'>+	p-&gt;qsound_space = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* cancel pending transfer of QSound parameters */</div><div class='del'>-	spin_lock_irqsave (&amp;p-&gt;q_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;p-&gt;q_lock);</div><div class='ctx'> 	p-&gt;qpos_changed = 0;</div><div class='del'>-	spin_unlock_irqrestore (&amp;p-&gt;q_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1100,7 +1074,7 @@ static int snd_sb_csp_qsound_transfer(struct snd_sb_csp * p)</div><div class='ctx'> {</div><div class='ctx'> 	int err = -ENXIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;p-&gt;q_lock);</div><div class='add'>+	guard(spinlock)(&amp;p-&gt;q_lock);</div><div class='ctx'> 	if (p-&gt;running &amp; SNDRV_SB_CSP_ST_QSOUND) {</div><div class='ctx'> 		set_codec_parameter(p-&gt;chip, 0xe0, 0x01);</div><div class='ctx'> 		/* left channel */</div><div class='hunk'>@@ -1112,7 +1086,6 @@ static int snd_sb_csp_qsound_transfer(struct snd_sb_csp * p)</div><div class='ctx'> 		err = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	p-&gt;qpos_changed = 0;</div><div class='del'>-	spin_unlock(&amp;p-&gt;q_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1124,10 +1097,9 @@ static int snd_sb_csp_qsound_transfer(struct snd_sb_csp * p)</div><div class='ctx'> static int init_proc_entry(struct snd_sb_csp * p, int device)</div><div class='ctx'> {</div><div class='ctx'> 	char name[16];</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='add'>+</div><div class='ctx'> 	sprintf(name, "cspD%d", device);</div><div class='del'>-	if (! snd_card_proc_new(p-&gt;chip-&gt;card, name, &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, p, info_read);</div><div class='add'>+	snd_card_ro_proc_new(p-&gt;chip-&gt;card, name, p, info_read);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1153,8 +1125,8 @@ static void info_read(struct snd_info_entry *entry, struct snd_info_buffer *buff</div><div class='ctx'> 				    ((p-&gt;acc_rates &amp; SNDRV_SB_CSP_RATE_44100) ? "44100Hz" : ""));</div><div class='ctx'> 		}</div><div class='ctx'> 		if (p-&gt;mode == SNDRV_SB_CSP_MODE_QSOUND) {</div><div class='del'>-			snd_iprintf(buffer, "QSound decoder %sabled\n",</div><div class='del'>-				    p-&gt;q_enabled ? "en" : "dis");</div><div class='add'>+			snd_iprintf(buffer, "QSound decoder %s\n",</div><div class='add'>+				    str_enabled_disabled(p-&gt;q_enabled));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			snd_iprintf(buffer, "PCM format ID: 0x%x (%s/%s) [%s/%s] [%s/%s]\n",</div><div class='ctx'> 				    p-&gt;acc_format,</div><div class='hunk'>@@ -1183,19 +1155,3 @@ static void info_read(struct snd_info_entry *entry, struct snd_info_buffer *buff</div><div class='ctx'> /* */</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_sb_csp_new);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_sb_csp_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_sb_csp_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_sb_csp_init)</div><div class='del'>-module_exit(alsa_sb_csp_exit)</div><div class='head'>diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c<br/>index 2a6cc1cfe945..4d64db4f5852 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16_main.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb16_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb16_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb16_main.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of 16-bit SoundBlaster cards and clones</div><div class='hunk'>@@ -15,28 +16,13 @@</div><div class='ctx'>  *        16bit DMA transfers from DSP chip (capture) until 8bit transfer</div><div class='ctx'>  *        to DSP chip (playback) starts. This bug can be avoided with</div><div class='ctx'>  *        "16bit DMA Allocation" setting set to Playback or Capture.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> #include &lt;sound/sb16_csp.h&gt;</div><div class='hunk'>@@ -48,6 +34,9 @@ MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Routines for control of 16-bit SoundBlaster cards and clones");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='add'>+#define runtime_format_bits(runtime) \</div><div class='add'>+	((unsigned int)pcm_format_to_bits((runtime)-&gt;format))</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_SB16_CSP</div><div class='ctx'> static void snd_sb16_csp_playback_prepare(struct snd_sb *chip, struct snd_pcm_runtime *runtime)</div><div class='ctx'> {</div><div class='hunk'>@@ -57,7 +46,7 @@ static void snd_sb16_csp_playback_prepare(struct snd_sb *chip, struct snd_pcm_ru</div><div class='ctx'> 		if (csp-&gt;running &amp; SNDRV_SB_CSP_ST_LOADED) {</div><div class='ctx'> 			/* manually loaded codec */</div><div class='ctx'> 			if ((csp-&gt;mode &amp; SNDRV_SB_CSP_MODE_DSP_WRITE) &amp;&amp;</div><div class='del'>-			    ((1U &lt;&lt; runtime-&gt;format) == csp-&gt;acc_format)) {</div><div class='add'>+			    (runtime_format_bits(runtime) == csp-&gt;acc_format)) {</div><div class='ctx'> 				/* Supported runtime PCM format for playback */</div><div class='ctx'> 				if (csp-&gt;ops.csp_use(csp) == 0) {</div><div class='ctx'> 					/* If CSP was successfully acquired */</div><div class='hunk'>@@ -65,7 +54,7 @@ static void snd_sb16_csp_playback_prepare(struct snd_sb *chip, struct snd_pcm_ru</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if ((csp-&gt;mode &amp; SNDRV_SB_CSP_MODE_QSOUND) &amp;&amp; (csp-&gt;q_enabled)) {</div><div class='ctx'> 				/* QSound decoder is loaded and enabled */</div><div class='del'>-				if ((1 &lt;&lt; runtime-&gt;format) &amp; (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |</div><div class='add'>+				if (runtime_format_bits(runtime) &amp; (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |</div><div class='ctx'> 							      SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE)) {</div><div class='ctx'> 					/* Only for simple PCM formats */</div><div class='ctx'> 					if (csp-&gt;ops.csp_use(csp) == 0) {</div><div class='hunk'>@@ -105,7 +94,7 @@ static void snd_sb16_csp_capture_prepare(struct snd_sb *chip, struct snd_pcm_run</div><div class='ctx'> 		if (csp-&gt;running &amp; SNDRV_SB_CSP_ST_LOADED) {</div><div class='ctx'> 			/* manually loaded codec */</div><div class='ctx'> 			if ((csp-&gt;mode &amp; SNDRV_SB_CSP_MODE_DSP_READ) &amp;&amp;</div><div class='del'>-			    ((1U &lt;&lt; runtime-&gt;format) == csp-&gt;acc_format)) {</div><div class='add'>+			    (runtime_format_bits(runtime) == csp-&gt;acc_format)) {</div><div class='ctx'> 				/* Supported runtime PCM format for capture */</div><div class='ctx'> 				if (csp-&gt;ops.csp_use(csp) == 0) {</div><div class='ctx'> 					/* If CSP was successfully acquired */</div><div class='hunk'>@@ -141,9 +130,8 @@ static void snd_sb16_csp_update(struct snd_sb *chip)</div><div class='ctx'> 		struct snd_sb_csp *csp = chip-&gt;csp;</div><div class='ctx'> </div><div class='ctx'> 		if (csp-&gt;qpos_changed) {</div><div class='del'>-			spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+			guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 			csp-&gt;ops.csp_qsound_transfer (csp);</div><div class='del'>-			spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -224,9 +212,7 @@ static void snd_sb16_setup_rate(struct snd_sb *chip,</div><div class='ctx'> 				unsigned short rate,</div><div class='ctx'> 				int channel)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (chip-&gt;mode &amp; (channel == SNDRV_PCM_STREAM_PLAYBACK ? SB_MODE_PLAYBACK_16 : SB_MODE_CAPTURE_16))</div><div class='ctx'> 		snd_sb_ack_16bit(chip);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -240,24 +226,10 @@ static void snd_sb16_setup_rate(struct snd_sb *chip,</div><div class='ctx'> 		snd_sbdsp_command(chip, rate &gt;&gt; 8);</div><div class='ctx'> 		snd_sbdsp_command(chip, rate &amp; 0xff);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_sb16_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			      struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_sb16_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned char format;</div><div class='hunk'>@@ -276,7 +248,7 @@ static int snd_sb16_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_dma_program(dma, runtime-&gt;dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);</div><div class='ctx'> </div><div class='ctx'> 	count = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (chip-&gt;mode &amp; SB_MODE_PLAYBACK_16) {</div><div class='ctx'> 		count &gt;&gt;= 1;</div><div class='ctx'> 		count--;</div><div class='hunk'>@@ -293,7 +265,6 @@ static int snd_sb16_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='ctx'> 		snd_sbdsp_command(chip, SB_DSP_DMA8_OFF);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -301,9 +272,8 @@ static int snd_sb16_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				     int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -319,15 +289,13 @@ static int snd_sb16_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		chip-&gt;mode &amp;= ~SB_RATE_LOCK_PLAYBACK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned char format;</div><div class='hunk'>@@ -345,7 +313,7 @@ static int snd_sb16_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_dma_program(dma, runtime-&gt;dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);</div><div class='ctx'> </div><div class='ctx'> 	count = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (chip-&gt;mode &amp; SB_MODE_CAPTURE_16) {</div><div class='ctx'> 		count &gt;&gt;= 1;</div><div class='ctx'> 		count--;</div><div class='hunk'>@@ -362,7 +330,6 @@ static int snd_sb16_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='ctx'> 		snd_sbdsp_command(chip, SB_DSP_DMA8_OFF);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -370,9 +337,8 @@ static int snd_sb16_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				    int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -388,10 +354,9 @@ static int snd_sb16_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		chip-&gt;mode &amp;= ~SB_RATE_LOCK_CAPTURE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -400,9 +365,9 @@ irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned char status;</div><div class='ctx'> 	int ok;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-	status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		status = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);</div><div class='add'>+	}</div><div class='ctx'> 	if ((status &amp; SB_IRQTYPE_MPUIN) &amp;&amp; chip-&gt;rmidi_callback)</div><div class='ctx'> 		chip-&gt;rmidi_callback(irq, chip-&gt;rmidi-&gt;private_data);</div><div class='ctx'> 	if (status &amp; SB_IRQTYPE_8BIT) {</div><div class='hunk'>@@ -416,11 +381,11 @@ irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='ctx'> 			ok++;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (!ok)</div><div class='del'>-			snd_sbdsp_command(chip, SB_DSP_DMA8_OFF);</div><div class='del'>-		snd_sb_ack_8bit(chip);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			if (!ok)</div><div class='add'>+				snd_sbdsp_command(chip, SB_DSP_DMA8_OFF);</div><div class='add'>+			snd_sb_ack_8bit(chip);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (status &amp; SB_IRQTYPE_16BIT) {</div><div class='ctx'> 		ok = 0;</div><div class='hunk'>@@ -433,11 +398,11 @@ irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='ctx'> 			ok++;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (!ok)</div><div class='del'>-			snd_sbdsp_command(chip, SB_DSP_DMA16_OFF);</div><div class='del'>-		snd_sb_ack_16bit(chip);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			if (!ok)</div><div class='add'>+				snd_sbdsp_command(chip, SB_DSP_DMA16_OFF);</div><div class='add'>+			snd_sb_ack_16bit(chip);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -472,7 +437,7 @@ static snd_pcm_uframes_t snd_sb16_capture_pointer(struct snd_pcm_substream *subs</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_sb16_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_sb16_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -490,7 +455,7 @@ static struct snd_pcm_hardware snd_sb16_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_sb16_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_sb16_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -514,15 +479,12 @@ static struct snd_pcm_hardware snd_sb16_capture =</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (chip-&gt;mode &amp; SB_MODE_PLAYBACK) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='add'>+	if (chip-&gt;mode &amp; SB_MODE_PLAYBACK)</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	}</div><div class='ctx'> 	runtime-&gt;hw = snd_sb16_playback;</div><div class='ctx'> </div><div class='ctx'> 	/* skip if 16 bit DMA was reserved for capture */</div><div class='hunk'>@@ -556,7 +518,6 @@ static int snd_sb16_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		runtime-&gt;hw.period_bytes_max = 64 * 1024;</div><div class='ctx'> 		goto __open_ok;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'>       __open_ok:</div><div class='hunk'>@@ -570,34 +531,28 @@ static int snd_sb16_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (chip-&gt;mode &amp; SB_RATE_LOCK)</div><div class='ctx'> 		runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = chip-&gt;locked_rate;</div><div class='ctx'> 	chip-&gt;playback_substream = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	snd_sb16_csp_playback_close(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='ctx'> 	chip-&gt;mode &amp;= ~SB_MODE_PLAYBACK;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (chip-&gt;mode &amp; SB_MODE_CAPTURE) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='add'>+	if (chip-&gt;mode &amp; SB_MODE_CAPTURE)</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	}</div><div class='ctx'> 	runtime-&gt;hw = snd_sb16_capture;</div><div class='ctx'> </div><div class='ctx'> 	/* skip if 16 bit DMA was reserved for playback */</div><div class='hunk'>@@ -631,7 +586,6 @@ static int snd_sb16_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		runtime-&gt;hw.period_bytes_max = 64 * 1024;</div><div class='ctx'> 		goto __open_ok;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'>       __open_ok:</div><div class='hunk'>@@ -645,20 +599,17 @@ static int snd_sb16_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (chip-&gt;mode &amp; SB_RATE_LOCK)</div><div class='ctx'> 		runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = chip-&gt;locked_rate;</div><div class='ctx'> 	chip-&gt;capture_substream = substream;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	snd_sb16_csp_capture_close(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='ctx'> 	chip-&gt;capture_substream = NULL;</div><div class='ctx'> 	chip-&gt;mode &amp;= ~SB_MODE_CAPTURE;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -701,48 +652,47 @@ static int snd_sb16_get_dma_mode(struct snd_sb *chip)</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_dma_control_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Auto", "Playback", "Capture"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_dma_control_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = snd_sb16_get_dma_mode(chip);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char nval, oval;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	</div><div class='del'>-	if ((nval = ucontrol-&gt;value.enumerated.item[0]) &gt; 2)</div><div class='add'>+	if (chip-&gt;mode &amp; (SB_MODE_PLAYBACK | SB_MODE_CAPTURE))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	nval = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (nval &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	oval = snd_sb16_get_dma_mode(chip);</div><div class='del'>-	change = nval != oval;</div><div class='del'>-	snd_sb16_set_dma_mode(chip, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		oval = snd_sb16_get_dma_mode(chip);</div><div class='add'>+		change = nval != oval;</div><div class='add'>+		snd_sb16_set_dma_mode(chip, nval);</div><div class='add'>+	}</div><div class='add'>+	if (change) {</div><div class='add'>+		snd_dma_disable(chip-&gt;dma8);</div><div class='add'>+		snd_dma_disable(chip-&gt;dma16);</div><div class='add'>+	}</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_sb16_dma_control = {</div><div class='add'>+static const struct snd_kcontrol_new snd_sb16_dma_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.name = "16-bit DMA Allocation",</div><div class='ctx'> 	.info = snd_sb16_dma_control_info,</div><div class='hunk'>@@ -756,15 +706,13 @@ static struct snd_kcontrol_new snd_sb16_dma_control = {</div><div class='ctx'>  </div><div class='ctx'> int snd_sb16dsp_configure(struct snd_sb * chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char irqreg = 0, dmareg = 0, mpureg;</div><div class='ctx'> 	unsigned char realirq, realdma, realmpureg;</div><div class='ctx'> 	/* note: mpu register should be present only on SB16 Vibra soundcards */</div><div class='ctx'> </div><div class='del'>-	// printk(KERN_DEBUG "codec-&gt;irq=%i, codec-&gt;dma8=%i, codec-&gt;dma16=%i\n", chip-&gt;irq, chip-&gt;dma8, chip-&gt;dma16);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-	mpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP) &amp; ~0x06;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		mpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP) &amp; ~0x06;</div><div class='add'>+	}</div><div class='ctx'> 	switch (chip-&gt;irq) {</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	case 9:</div><div class='hunk'>@@ -822,62 +770,61 @@ int snd_sb16dsp_configure(struct snd_sb * chip)</div><div class='ctx'> 	default:</div><div class='ctx'> 		mpureg |= 0x02;	/* disable MPU */</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-</div><div class='del'>-	snd_sbmixer_write(chip, SB_DSP4_IRQSETUP, irqreg);</div><div class='del'>-	realirq = snd_sbmixer_read(chip, SB_DSP4_IRQSETUP);</div><div class='ctx'> </div><div class='del'>-	snd_sbmixer_write(chip, SB_DSP4_DMASETUP, dmareg);</div><div class='del'>-	realdma = snd_sbmixer_read(chip, SB_DSP4_DMASETUP);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_sbmixer_write(chip, SB_DSP4_IRQSETUP, irqreg);</div><div class='add'>+		realirq = snd_sbmixer_read(chip, SB_DSP4_IRQSETUP);</div><div class='ctx'> </div><div class='del'>-	snd_sbmixer_write(chip, SB_DSP4_MPUSETUP, mpureg);</div><div class='del'>-	realmpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP);</div><div class='add'>+		snd_sbmixer_write(chip, SB_DSP4_DMASETUP, dmareg);</div><div class='add'>+		realdma = snd_sbmixer_read(chip, SB_DSP4_DMASETUP);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+		snd_sbmixer_write(chip, SB_DSP4_MPUSETUP, mpureg);</div><div class='add'>+		realmpureg = snd_sbmixer_read(chip, SB_DSP4_MPUSETUP);</div><div class='add'>+	}</div><div class='ctx'> 	if ((~realirq) &amp; irqreg || (~realdma) &amp; dmareg) {</div><div class='del'>-		snd_printk(KERN_ERR "SB16 [0x%lx]: unable to set DMA &amp; IRQ (PnP device?)\n", chip-&gt;port);</div><div class='del'>-		snd_printk(KERN_ERR "SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip-&gt;port, realirq, realdma, realmpureg);</div><div class='del'>-		snd_printk(KERN_ERR "SB16 [0x%lx]:    got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n", chip-&gt;port, irqreg, dmareg, mpureg);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"SB16 [0x%lx]: unable to set DMA &amp; IRQ (PnP device?)\n",</div><div class='add'>+			chip-&gt;port);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"SB16 [0x%lx]: wanted: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n",</div><div class='add'>+			chip-&gt;port, realirq, realdma, realmpureg);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"SB16 [0x%lx]:    got: irqreg=0x%x, dmareg=0x%x, mpureg = 0x%x\n",</div><div class='add'>+			chip-&gt;port, irqreg, dmareg, mpureg);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_sb16_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sb16_playback_ops = {</div><div class='ctx'> 	.open =		snd_sb16_playback_open,</div><div class='ctx'> 	.close =	snd_sb16_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_sb16_hw_params,</div><div class='del'>-	.hw_free =	snd_sb16_hw_free,</div><div class='ctx'> 	.prepare =	snd_sb16_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_sb16_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_sb16_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_sb16_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sb16_capture_ops = {</div><div class='ctx'> 	.open =		snd_sb16_capture_open,</div><div class='ctx'> 	.close =	snd_sb16_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_sb16_hw_params,</div><div class='del'>-	.hw_free =	snd_sb16_hw_free,</div><div class='ctx'> 	.prepare =	snd_sb16_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_sb16_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_sb16_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_sb16dsp_pcm(struct snd_sb * chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_sb16dsp_pcm(struct snd_sb *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-	if ((err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	sprintf(pcm-&gt;name, "DSP v%i.%i", chip-&gt;version &gt;&gt; 8, chip-&gt;version &amp; 0xff);</div><div class='ctx'> 	pcm-&gt;info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='add'>+	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_sb16_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_sb16_capture_ops);</div><div class='hunk'>@@ -887,12 +834,8 @@ int snd_sb16dsp_pcm(struct snd_sb * chip, int device, struct snd_pcm ** rpcm)</div><div class='ctx'> 	else</div><div class='ctx'> 		pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       card-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -906,19 +849,3 @@ EXPORT_SYMBOL(snd_sb16dsp_pcm);</div><div class='ctx'> EXPORT_SYMBOL(snd_sb16dsp_get_pcm_ops);</div><div class='ctx'> EXPORT_SYMBOL(snd_sb16dsp_configure);</div><div class='ctx'> EXPORT_SYMBOL(snd_sb16dsp_interrupt);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_sb16_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_sb16_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_sb16_init)</div><div class='del'>-module_exit(alsa_sb16_exit)</div><div class='head'>diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c<br/>index 2259e3f726a7..6d5131265913 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb8.c</a></div><div class='hunk'>@@ -1,29 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for SoundBlaster 1.0/2.0/Pro soundcards and compatible</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='hunk'>@@ -32,11 +18,10 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Sound Blaster 1.0/2.0/Pro");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260 */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 5,7,9,10 */</div><div class='ctx'> static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	/* 1,3 */</div><div class='hunk'>@@ -47,11 +32,11 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for Sound Blaster soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable Sound Blaster soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for SB8 driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for SB8 driver.");</div><div class='del'>-module_param_array(dma8, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma8, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma8, "8-bit DMA # for SB8 driver.");</div><div class='ctx'> </div><div class='ctx'> struct snd_sb8 {</div><div class='hunk'>@@ -70,16 +55,7 @@ static irqreturn_t snd_sb8_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_sb8_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_sb8 *acard = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (acard == NULL)</div><div class='del'>-		return;</div><div class='del'>-	release_and_free_resource(acard-&gt;fm_res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_sb8_match(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -94,7 +70,7 @@ static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_sb8_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -102,27 +78,29 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_sb8), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct snd_sb8), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='del'>-	card-&gt;private_free = snd_sb8_free;</div><div class='ctx'> </div><div class='del'>-	/* block the 0x388 port to avoid PnP conflicts */</div><div class='del'>-	acard-&gt;fm_res = request_region(0x388, 4, "SoundBlaster FM");</div><div class='add'>+	/*</div><div class='add'>+	 * Block the 0x388 port to avoid PnP conflicts.</div><div class='add'>+	 * No need to check this value after request_region,</div><div class='add'>+	 * as we never do anything with it.</div><div class='add'>+	 */</div><div class='add'>+	acard-&gt;fm_res = devm_request_region(card-&gt;dev, 0x388, 4,</div><div class='add'>+					    "SoundBlaster FM");</div><div class='ctx'> </div><div class='ctx'> 	if (port[dev] != SNDRV_AUTO_PORT) {</div><div class='del'>-		if ((err = snd_sbdsp_create(card, port[dev], irq[dev],</div><div class='del'>-					    snd_sb8_interrupt,</div><div class='del'>-					    dma8[dev],</div><div class='del'>-					    -1,</div><div class='del'>-					    SB_HW_AUTO,</div><div class='del'>-					    &amp;chip)) &lt; 0)</div><div class='del'>-			goto _err;</div><div class='add'>+		err = snd_sbdsp_create(card, port[dev], irq[dev],</div><div class='add'>+				       snd_sb8_interrupt, dma8[dev],</div><div class='add'>+				       -1, SB_HW_AUTO, &amp;chip);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* auto-probe legacy ports */</div><div class='del'>-		static unsigned long possible_ports[] = {</div><div class='add'>+		static const unsigned long possible_ports[] = {</div><div class='ctx'> 			0x220, 0x240, 0x260,</div><div class='ctx'> 		};</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -139,77 +117,65 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (i &gt;= ARRAY_SIZE(possible_ports)) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto _err;</div><div class='del'>-		}</div><div class='add'>+		if (i &gt;= ARRAY_SIZE(possible_ports))</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	acard-&gt;chip = chip;</div><div class='ctx'> 			</div><div class='ctx'> 	if (chip-&gt;hardware &gt;= SB_HW_16) {</div><div class='ctx'> 		if (chip-&gt;hardware == SB_HW_ALS100)</div><div class='del'>-			snd_printk(KERN_WARNING "ALS100 chip detected at 0x%lx, try snd-als100 module\n",</div><div class='del'>-				    port[dev]);</div><div class='add'>+			dev_warn(pdev, "ALS100 chip detected at 0x%lx, try snd-als100 module\n",</div><div class='add'>+				 port[dev]);</div><div class='ctx'> 		else</div><div class='del'>-			snd_printk(KERN_WARNING "SB 16 chip detected at 0x%lx, try snd-sb16 module\n",</div><div class='del'>-				   port[dev]);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto _err;</div><div class='add'>+			dev_warn(pdev, "SB 16 chip detected at 0x%lx, try snd-sb16 module\n",</div><div class='add'>+				 port[dev]);</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sb8dsp_pcm(chip, 0, NULL)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_sb8dsp_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sbmixer_new(chip)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_sbmixer_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;hardware == SB_HW_10 || chip-&gt;hardware == SB_HW_20) {</div><div class='del'>-		if ((err = snd_opl3_create(card, chip-&gt;port + 8, 0,</div><div class='del'>-					   OPL3_HW_AUTO, 1,</div><div class='del'>-					   &amp;opl3)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "sb8: no OPL device at 0x%lx\n", chip-&gt;port + 8);</div><div class='del'>-		}</div><div class='add'>+		err = snd_opl3_create(card, chip-&gt;port + 8, 0,</div><div class='add'>+				      OPL3_HW_AUTO, 1, &amp;opl3);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			dev_warn(pdev, "sb8: no OPL device at 0x%lx\n", chip-&gt;port + 8);</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((err = snd_opl3_create(card, chip-&gt;port, chip-&gt;port + 2,</div><div class='del'>-					   OPL3_HW_AUTO, 1,</div><div class='del'>-					   &amp;opl3)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "sb8: no OPL device at 0x%lx-0x%lx\n",</div><div class='add'>+		err = snd_opl3_create(card, chip-&gt;port, chip-&gt;port + 2,</div><div class='add'>+				      OPL3_HW_AUTO, 1, &amp;opl3);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_warn(pdev, "sb8: no OPL device at 0x%lx-0x%lx\n",</div><div class='ctx'> 				   chip-&gt;port, chip-&gt;port + 2);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err &gt;= 0) {</div><div class='del'>-		if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0)</div><div class='del'>-			goto _err;</div><div class='add'>+		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sb8dsp_midi(chip, 0, NULL)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_sb8dsp_midi(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, chip-&gt;hardware == SB_HW_PRO ? "SB Pro" : "SB8");</div><div class='del'>-	strcpy(card-&gt;shortname, chip-&gt;name);</div><div class='add'>+	strscpy(card-&gt;driver, chip-&gt;hardware == SB_HW_PRO ? "SB Pro" : "SB8");</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;name);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d, dma %d",</div><div class='ctx'> 		chip-&gt;name,</div><div class='ctx'> 		chip-&gt;port,</div><div class='ctx'> 		irq[dev], dma8[dev]);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto _err;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- _err:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(pdev));</div><div class='del'>-	dev_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -221,7 +187,6 @@ static int snd_sb8_suspend(struct device *dev, unsigned int n,</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_sbmixer_suspend(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -244,7 +209,6 @@ static int snd_sb8_resume(struct device *dev, unsigned int n)</div><div class='ctx'> static struct isa_driver snd_sb8_driver = {</div><div class='ctx'> 	.match		= snd_sb8_match,</div><div class='ctx'> 	.probe		= snd_sb8_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_sb8_remove),</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.suspend	= snd_sb8_suspend,</div><div class='ctx'> 	.resume		= snd_sb8_resume,</div><div class='hunk'>@@ -254,15 +218,4 @@ static struct isa_driver snd_sb8_driver = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_sb8_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_sb8_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_sb8_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_sb8_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_sb8_init)</div><div class='del'>-module_exit(alsa_card_sb8_exit)</div><div class='add'>+module_isa_driver(snd_sb8_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c<br/>index 7d84c9f34dc9..a4b5725255cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8_main.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb8_main.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *  Routines for control of 8-bit SoundBlaster cards and clones</div><div class='ctx'>  *  Please note: I don't have access to old SB8 soundcards.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * --</div><div class='ctx'>  *</div><div class='ctx'>  * Thu Apr 29 20:36:17 BST 1999 George David Morrison &lt;gdm@gedamo.demon.co.uk&gt;</div><div class='hunk'>@@ -30,10 +16,11 @@</div><div class='ctx'>  *   Cleaned up and rewrote lowlevel routines.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,19 +32,19 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> #define SB8_DEN(v)	((SB8_CLOCK + (v) / 2) / (v))</div><div class='ctx'> #define SB8_RATE(v)	(SB8_CLOCK / SB8_DEN(v))</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum clock = {</div><div class='add'>+static const struct snd_ratnum clock = {</div><div class='ctx'> 	.num = SB8_CLOCK,</div><div class='ctx'> 	.den_min = 1,</div><div class='ctx'> 	.den_max = 256,</div><div class='ctx'> 	.den_step = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {</div><div class='ctx'> 	.nrats = 1,</div><div class='ctx'> 	.rats = &amp;clock,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum stereo_clocks[] = {</div><div class='add'>+static const struct snd_ratnum stereo_clocks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = SB8_CLOCK,</div><div class='ctx'> 		.den_min = SB8_DEN(22050),</div><div class='hunk'>@@ -102,7 +89,6 @@ static int snd_sb8_hw_constraint_channels_rate(struct snd_pcm_hw_params *params,</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int mixreg, rate, size, count;</div><div class='hunk'>@@ -129,13 +115,13 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 			chip-&gt;playback_format = SB_DSP_HI_OUTPUT_AUTO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SB_HW_201:</div><div class='ctx'> 		if (rate &gt; 23000) {</div><div class='ctx'> 			chip-&gt;playback_format = SB_DSP_HI_OUTPUT_AUTO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SB_HW_20:</div><div class='ctx'> 		chip-&gt;playback_format = SB_DSP_LO_OUTPUT_AUTO;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -155,48 +141,48 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	}</div><div class='ctx'> 	size = chip-&gt;p_dma_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	count = chip-&gt;p_period_size = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_sbdsp_command(chip, SB_DSP_SPEAKER_ON);</div><div class='del'>-	if (chip-&gt;hardware == SB_HW_JAZZ16)</div><div class='del'>-		snd_sbdsp_command(chip, format);</div><div class='del'>-	else if (stereo) {</div><div class='del'>-		/* set playback stereo mode */</div><div class='del'>-		spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-		mixreg = snd_sbmixer_read(chip, SB_DSP_STEREO_SW);</div><div class='del'>-		snd_sbmixer_write(chip, SB_DSP_STEREO_SW, mixreg | 0x02);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-</div><div class='del'>-		/* Soundblaster hardware programming reference guide, 3-23 */</div><div class='del'>-		snd_sbdsp_command(chip, SB_DSP_DMA8_EXIT);</div><div class='del'>-		runtime-&gt;dma_area[0] = 0x80;</div><div class='del'>-		snd_dma_program(dma, runtime-&gt;dma_addr, 1, DMA_MODE_WRITE);</div><div class='del'>-		/* force interrupt */</div><div class='del'>-		snd_sbdsp_command(chip, SB_DSP_OUTPUT);</div><div class='del'>-		snd_sbdsp_command(chip, 0);</div><div class='del'>-		snd_sbdsp_command(chip, 0);</div><div class='del'>-	}</div><div class='del'>-	snd_sbdsp_command(chip, SB_DSP_SAMPLE_RATE);</div><div class='del'>-	if (stereo) {</div><div class='del'>-		snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den / 2);</div><div class='del'>-		spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-		/* save output filter status and turn it off */</div><div class='del'>-		mixreg = snd_sbmixer_read(chip, SB_DSP_PLAYBACK_FILT);</div><div class='del'>-		snd_sbmixer_write(chip, SB_DSP_PLAYBACK_FILT, mixreg | 0x20);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-		/* just use force_mode16 for temporary storate... */</div><div class='del'>-		chip-&gt;force_mode16 = mixreg;</div><div class='del'>-	} else {</div><div class='del'>-		snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;playback_format != SB_DSP_OUTPUT) {</div><div class='del'>-		if (chip-&gt;mode &amp; SB_MODE_PLAYBACK_16)</div><div class='del'>-			count /= 2;</div><div class='del'>-		count--;</div><div class='del'>-		snd_sbdsp_command(chip, SB_DSP_BLOCK_SIZE);</div><div class='del'>-		snd_sbdsp_command(chip, count &amp; 0xff);</div><div class='del'>-		snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_SPEAKER_ON);</div><div class='add'>+		if (chip-&gt;hardware == SB_HW_JAZZ16)</div><div class='add'>+			snd_sbdsp_command(chip, format);</div><div class='add'>+		else if (stereo) {</div><div class='add'>+			/* set playback stereo mode */</div><div class='add'>+			scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+				mixreg = snd_sbmixer_read(chip, SB_DSP_STEREO_SW);</div><div class='add'>+				snd_sbmixer_write(chip, SB_DSP_STEREO_SW, mixreg | 0x02);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Soundblaster hardware programming reference guide, 3-23 */</div><div class='add'>+			snd_sbdsp_command(chip, SB_DSP_DMA8_EXIT);</div><div class='add'>+			runtime-&gt;dma_area[0] = 0x80;</div><div class='add'>+			snd_dma_program(dma, runtime-&gt;dma_addr, 1, DMA_MODE_WRITE);</div><div class='add'>+			/* force interrupt */</div><div class='add'>+			snd_sbdsp_command(chip, SB_DSP_OUTPUT);</div><div class='add'>+			snd_sbdsp_command(chip, 0);</div><div class='add'>+			snd_sbdsp_command(chip, 0);</div><div class='add'>+		}</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_SAMPLE_RATE);</div><div class='add'>+		if (stereo) {</div><div class='add'>+			snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den / 2);</div><div class='add'>+			scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+				/* save output filter status and turn it off */</div><div class='add'>+				mixreg = snd_sbmixer_read(chip, SB_DSP_PLAYBACK_FILT);</div><div class='add'>+				snd_sbmixer_write(chip, SB_DSP_PLAYBACK_FILT, mixreg | 0x20);</div><div class='add'>+			}</div><div class='add'>+			/* just use force_mode16 for temporary storate... */</div><div class='add'>+			chip-&gt;force_mode16 = mixreg;</div><div class='add'>+		} else {</div><div class='add'>+			snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den);</div><div class='add'>+		}</div><div class='add'>+		if (chip-&gt;playback_format != SB_DSP_OUTPUT) {</div><div class='add'>+			if (chip-&gt;mode &amp; SB_MODE_PLAYBACK_16)</div><div class='add'>+				count /= 2;</div><div class='add'>+			count--;</div><div class='add'>+			snd_sbdsp_command(chip, SB_DSP_BLOCK_SIZE);</div><div class='add'>+			snd_sbdsp_command(chip, count &amp; 0xff);</div><div class='add'>+			snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	snd_dma_program(dma, runtime-&gt;dma_addr,</div><div class='ctx'> 			size, DMA_MODE_WRITE | DMA_AUTOINIT);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -205,11 +191,10 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> static int snd_sb8_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				    int cmd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		snd_sbdsp_command(chip, chip-&gt;playback_format);</div><div class='hunk'>@@ -224,35 +209,20 @@ static int snd_sb8_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 			snd_sbdsp_reset(chip);</div><div class='ctx'> 			if (runtime-&gt;channels &gt; 1) {</div><div class='del'>-				spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='add'>+				guard(spinlock)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 				/* restore output filter and set hardware to mono mode */ </div><div class='ctx'> 				snd_sbmixer_write(chip, SB_DSP_STEREO_SW, chip-&gt;force_mode16 &amp; ~0x02);</div><div class='del'>-				spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			snd_sbdsp_command(chip, SB_DSP_DMA8_OFF);</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_sbdsp_command(chip, SB_DSP_SPEAKER_OFF);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_sb8_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			     struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_sb8_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned int mixreg, rate, size, count;</div><div class='hunk'>@@ -286,7 +256,7 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 			chip-&gt;capture_format = SB_DSP_HI_INPUT_AUTO;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SB_HW_20:</div><div class='ctx'> 		chip-&gt;capture_format = SB_DSP_LO_INPUT_AUTO;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -306,34 +276,34 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	}</div><div class='ctx'> 	size = chip-&gt;c_dma_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	count = chip-&gt;c_period_size = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_sbdsp_command(chip, SB_DSP_SPEAKER_OFF);</div><div class='del'>-	if (chip-&gt;hardware == SB_HW_JAZZ16)</div><div class='del'>-		snd_sbdsp_command(chip, format);</div><div class='del'>-	else if (stereo)</div><div class='del'>-		snd_sbdsp_command(chip, SB_DSP_STEREO_8BIT);</div><div class='del'>-	snd_sbdsp_command(chip, SB_DSP_SAMPLE_RATE);</div><div class='del'>-	if (stereo) {</div><div class='del'>-		snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den / 2);</div><div class='del'>-		spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-		/* save input filter status and turn it off */</div><div class='del'>-		mixreg = snd_sbmixer_read(chip, SB_DSP_CAPTURE_FILT);</div><div class='del'>-		snd_sbmixer_write(chip, SB_DSP_CAPTURE_FILT, mixreg | 0x20);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-		/* just use force_mode16 for temporary storate... */</div><div class='del'>-		chip-&gt;force_mode16 = mixreg;</div><div class='del'>-	} else {</div><div class='del'>-		snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;capture_format != SB_DSP_INPUT) {</div><div class='del'>-		if (chip-&gt;mode &amp; SB_MODE_PLAYBACK_16)</div><div class='del'>-			count /= 2;</div><div class='del'>-		count--;</div><div class='del'>-		snd_sbdsp_command(chip, SB_DSP_BLOCK_SIZE);</div><div class='del'>-		snd_sbdsp_command(chip, count &amp; 0xff);</div><div class='del'>-		snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_SPEAKER_OFF);</div><div class='add'>+		if (chip-&gt;hardware == SB_HW_JAZZ16)</div><div class='add'>+			snd_sbdsp_command(chip, format);</div><div class='add'>+		else if (stereo)</div><div class='add'>+			snd_sbdsp_command(chip, SB_DSP_STEREO_8BIT);</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_SAMPLE_RATE);</div><div class='add'>+		if (stereo) {</div><div class='add'>+			snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den / 2);</div><div class='add'>+			scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+				/* save input filter status and turn it off */</div><div class='add'>+				mixreg = snd_sbmixer_read(chip, SB_DSP_CAPTURE_FILT);</div><div class='add'>+				snd_sbmixer_write(chip, SB_DSP_CAPTURE_FILT, mixreg | 0x20);</div><div class='add'>+			}</div><div class='add'>+			/* just use force_mode16 for temporary storate... */</div><div class='add'>+			chip-&gt;force_mode16 = mixreg;</div><div class='add'>+		} else {</div><div class='add'>+			snd_sbdsp_command(chip, 256 - runtime-&gt;rate_den);</div><div class='add'>+		}</div><div class='add'>+		if (chip-&gt;capture_format != SB_DSP_INPUT) {</div><div class='add'>+			if (chip-&gt;mode &amp; SB_MODE_PLAYBACK_16)</div><div class='add'>+				count /= 2;</div><div class='add'>+			count--;</div><div class='add'>+			snd_sbdsp_command(chip, SB_DSP_BLOCK_SIZE);</div><div class='add'>+			snd_sbdsp_command(chip, count &amp; 0xff);</div><div class='add'>+			snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	snd_dma_program(dma, runtime-&gt;dma_addr,</div><div class='ctx'> 			size, DMA_MODE_READ | DMA_AUTOINIT);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -342,11 +312,10 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> static int snd_sb8_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				   int cmd)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int count;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		snd_sbdsp_command(chip, chip-&gt;capture_format);</div><div class='hunk'>@@ -362,9 +331,9 @@ static int snd_sb8_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			snd_sbdsp_reset(chip);</div><div class='ctx'> 			if (runtime-&gt;channels &gt; 1) {</div><div class='ctx'> 				/* restore input filter status */</div><div class='del'>-				spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-				snd_sbmixer_write(chip, SB_DSP_CAPTURE_FILT, chip-&gt;force_mode16);</div><div class='del'>-				spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='add'>+				scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+					snd_sbmixer_write(chip, SB_DSP_CAPTURE_FILT, chip-&gt;force_mode16);</div><div class='add'>+				}</div><div class='ctx'> 				/* set hardware to mono mode */</div><div class='ctx'> 				snd_sbdsp_command(chip, SB_DSP_MONO_8BIT);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -373,24 +342,21 @@ static int snd_sb8_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_sbdsp_command(chip, SB_DSP_SPEAKER_OFF);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='ctx'> </div><div class='ctx'> 	snd_sb_ack_8bit(chip);</div><div class='ctx'> 	switch (chip-&gt;mode) {</div><div class='ctx'> 	case SB_MODE_PLAYBACK_16:	/* ok.. playback is active */</div><div class='ctx'> 		if (chip-&gt;hardware != SB_HW_JAZZ16)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SB_MODE_PLAYBACK_8:</div><div class='ctx'> 		substream = chip-&gt;playback_substream;</div><div class='del'>-		runtime = substream-&gt;runtime;</div><div class='ctx'> 		if (chip-&gt;playback_format == SB_DSP_OUTPUT)</div><div class='ctx'> 		    	snd_sb8_playback_trigger(substream, SNDRV_PCM_TRIGGER_START);</div><div class='ctx'> 		snd_pcm_period_elapsed(substream);</div><div class='hunk'>@@ -398,10 +364,9 @@ irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip)</div><div class='ctx'> 	case SB_MODE_CAPTURE_16:</div><div class='ctx'> 		if (chip-&gt;hardware != SB_HW_JAZZ16)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SB_MODE_CAPTURE_8:</div><div class='ctx'> 		substream = chip-&gt;capture_substream;</div><div class='del'>-		runtime = substream-&gt;runtime;</div><div class='ctx'> 		if (chip-&gt;capture_format == SB_DSP_INPUT)</div><div class='ctx'> 		    	snd_sb8_capture_trigger(substream, SNDRV_PCM_TRIGGER_START);</div><div class='ctx'> 		snd_pcm_period_elapsed(substream);</div><div class='hunk'>@@ -446,7 +411,7 @@ static snd_pcm_uframes_t snd_sb8_capture_pointer(struct snd_pcm_substream *subst</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_sb8_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_sb8_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -465,7 +430,7 @@ static struct snd_pcm_hardware snd_sb8_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_sb8_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_sb8_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -492,15 +457,12 @@ static int snd_sb8_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (chip-&gt;open) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		if (chip-&gt;open)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		chip-&gt;open |= SB_OPEN_PCM;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;open |= SB_OPEN_PCM;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='ctx'> 		chip-&gt;playback_substream = substream;</div><div class='ctx'> 		runtime-&gt;hw = snd_sb8_playback;</div><div class='hunk'>@@ -534,6 +496,7 @@ static int snd_sb8_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			runtime-&gt;hw.rate_max = 15000;</div><div class='ctx'> 		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -552,18 +515,16 @@ static int snd_sb8_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='ctx'> 	chip-&gt;capture_substream = NULL;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='ctx'> 	chip-&gt;open &amp;= ~SB_OPEN_PCM;</div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 		chip-&gt;mode &amp;= ~SB_MODE_PLAYBACK;</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;mode &amp;= ~SB_MODE_CAPTURE;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -571,38 +532,31 @@ static int snd_sb8_close(struct snd_pcm_substream *substream)</div><div class='ctx'>  *  Initialization part</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='del'>-static struct snd_pcm_ops snd_sb8_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sb8_playback_ops = {</div><div class='ctx'> 	.open =			snd_sb8_open,</div><div class='ctx'> 	.close =		snd_sb8_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_sb8_hw_params,</div><div class='del'>-	.hw_free =		snd_sb8_hw_free,</div><div class='ctx'> 	.prepare =		snd_sb8_playback_prepare,</div><div class='ctx'> 	.trigger =		snd_sb8_playback_trigger,</div><div class='ctx'> 	.pointer =		snd_sb8_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_sb8_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sb8_capture_ops = {</div><div class='ctx'> 	.open =			snd_sb8_open,</div><div class='ctx'> 	.close =		snd_sb8_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_sb8_hw_params,</div><div class='del'>-	.hw_free =		snd_sb8_hw_free,</div><div class='ctx'> 	.prepare =		snd_sb8_capture_prepare,</div><div class='ctx'> 	.trigger =		snd_sb8_capture_trigger,</div><div class='ctx'> 	.pointer =		snd_sb8_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_sb8dsp_pcm(struct snd_sb *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_sb8dsp_pcm(struct snd_sb *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	size_t max_prealloc = 64 * 1024;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-	if ((err = snd_pcm_new(card, "SB8 DSP", device, 1, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(card, "SB8 DSP", device, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	sprintf(pcm-&gt;name, "DSP v%i.%i", chip-&gt;version &gt;&gt; 8, chip-&gt;version &amp; 0xff);</div><div class='ctx'> 	pcm-&gt;info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='hunk'>@@ -613,12 +567,9 @@ int snd_sb8dsp_pcm(struct snd_sb *chip, int device, struct snd_pcm ** rpcm)</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dma8 &gt; 3 || chip-&gt;dma16 &gt;= 0)</div><div class='ctx'> 		max_prealloc = 128 * 1024;</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, max_prealloc);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       card-&gt;dev, 64*1024, max_prealloc);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -627,19 +578,3 @@ EXPORT_SYMBOL(snd_sb8dsp_interrupt);</div><div class='ctx'>   /* sb8_midi.c */</div><div class='ctx'> EXPORT_SYMBOL(snd_sb8dsp_midi_interrupt);</div><div class='ctx'> EXPORT_SYMBOL(snd_sb8dsp_midi);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_sb8_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_sb8_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_sb8_init)</div><div class='del'>-module_exit(alsa_sb8_exit)</div><div class='head'>diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c<br/>index 988a8b73475f..1d41f2470697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb8_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb8_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb8_midi.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of SoundBlaster cards - MIDI interface</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * --</div><div class='ctx'>  *</div><div class='ctx'>  * Sun May  9 22:54:38 BST 1999 George David Morrison &lt;gdm@gedamo.demon.co.uk&gt;</div><div class='hunk'>@@ -26,7 +13,8 @@</div><div class='ctx'>  *   Added full duplex UART mode for DSP version 2.0 and later.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='hunk'>@@ -47,7 +35,7 @@ irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb *chip)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;midi_input_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;midi_input_lock);</div><div class='ctx'> 	while (max-- &gt; 0) {</div><div class='ctx'> 		if (inb(SBP(chip, DATA_AVAIL)) &amp; 0x80) {</div><div class='ctx'> 			byte = inb(SBP(chip, READ));</div><div class='hunk'>@@ -56,107 +44,90 @@ irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb *chip)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;midi_input_lock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8dsp_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	unsigned int valid_open_flags;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	valid_open_flags = chip-&gt;hardware &gt;= SB_HW_20</div><div class='ctx'> 		? SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER : 0;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (chip-&gt;open &amp; ~valid_open_flags) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;open |= SB_OPEN_MIDI_INPUT;</div><div class='del'>-	chip-&gt;midi_substream_input = substream;</div><div class='del'>-	if (!(chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='del'>-		if (chip-&gt;hardware &gt;= SB_HW_20)</div><div class='del'>-			snd_sbdsp_command(chip, SB_DSP_MIDI_UART_IRQ);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		if (chip-&gt;open &amp; ~valid_open_flags)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		chip-&gt;open |= SB_OPEN_MIDI_INPUT;</div><div class='add'>+		chip-&gt;midi_substream_input = substream;</div><div class='add'>+		if (chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='add'>+	if (chip-&gt;hardware &gt;= SB_HW_20)</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_MIDI_UART_IRQ);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8dsp_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	unsigned int valid_open_flags;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	valid_open_flags = chip-&gt;hardware &gt;= SB_HW_20</div><div class='ctx'> 		? SB_OPEN_MIDI_INPUT | SB_OPEN_MIDI_INPUT_TRIGGER : 0;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (chip-&gt;open &amp; ~valid_open_flags) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;open |= SB_OPEN_MIDI_OUTPUT;</div><div class='del'>-	chip-&gt;midi_substream_output = substream;</div><div class='del'>-	if (!(chip-&gt;open &amp; SB_OPEN_MIDI_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='del'>-		if (chip-&gt;hardware &gt;= SB_HW_20)</div><div class='del'>-			snd_sbdsp_command(chip, SB_DSP_MIDI_UART_IRQ);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		if (chip-&gt;open &amp; ~valid_open_flags)</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+		chip-&gt;open |= SB_OPEN_MIDI_OUTPUT;</div><div class='add'>+		chip-&gt;midi_substream_output = substream;</div><div class='add'>+		if (chip-&gt;open &amp; SB_OPEN_MIDI_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='add'>+	if (chip-&gt;hardware &gt;= SB_HW_20)</div><div class='add'>+		snd_sbdsp_command(chip, SB_DSP_MIDI_UART_IRQ);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8dsp_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	chip-&gt;open &amp;= ~(SB_OPEN_MIDI_INPUT | SB_OPEN_MIDI_INPUT_TRIGGER);</div><div class='del'>-	chip-&gt;midi_substream_input = NULL;</div><div class='del'>-	if (!(chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		chip-&gt;open &amp;= ~(SB_OPEN_MIDI_INPUT | SB_OPEN_MIDI_INPUT_TRIGGER);</div><div class='add'>+		chip-&gt;midi_substream_input = NULL;</div><div class='add'>+		if (chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8dsp_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	chip-&gt;open &amp;= ~(SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER);</div><div class='del'>-	chip-&gt;midi_substream_output = NULL;</div><div class='del'>-	if (!(chip-&gt;open &amp; SB_OPEN_MIDI_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-		snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	timer_delete_sync(&amp;chip-&gt;midi_timer);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		chip-&gt;open &amp;= ~(SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER);</div><div class='add'>+		chip-&gt;midi_substream_output = NULL;</div><div class='add'>+		if (chip-&gt;open &amp; SB_OPEN_MIDI_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	snd_sbdsp_reset(chip);		/* reset DSP */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_sb8dsp_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if (!(chip-&gt;open &amp; SB_OPEN_MIDI_INPUT_TRIGGER)) {</div><div class='ctx'> 			if (chip-&gt;hardware &lt; SB_HW_20)</div><div class='hunk'>@@ -170,12 +141,10 @@ static void snd_sb8dsp_midi_input_trigger(struct snd_rawmidi_substream *substrea</div><div class='ctx'> 			chip-&gt;open &amp;= ~SB_OPEN_MIDI_INPUT_TRIGGER;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	char byte;</div><div class='ctx'> 	int max = 32;</div><div class='hunk'>@@ -183,11 +152,10 @@ static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream</div><div class='ctx'> 	/* how big is Tx FIFO? */</div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	while (max-- &gt; 0) {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;open_lock);</div><div class='ctx'> 		if (snd_rawmidi_transmit_peek(substream, &amp;byte, 1) != 1) {</div><div class='ctx'> 			chip-&gt;open &amp;= ~SB_OPEN_MIDI_OUTPUT_TRIGGER;</div><div class='del'>-			del_timer(&amp;chip-&gt;midi_timer);</div><div class='del'>-			spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='add'>+			timer_delete(&amp;chip-&gt;midi_timer);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (chip-&gt;hardware &gt;= SB_HW_20) {</div><div class='hunk'>@@ -196,7 +164,6 @@ static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream</div><div class='ctx'> 				;</div><div class='ctx'> 			if (timeout == 0) {</div><div class='ctx'> 				/* Tx FIFO full - try again later */</div><div class='del'>-				spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			outb(byte, SBP(chip, WRITE));</div><div class='hunk'>@@ -205,82 +172,72 @@ static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream</div><div class='ctx'> 			snd_sbdsp_command(chip, byte);</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_rawmidi_transmit_ack(substream, 1);</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_sb8dsp_midi_output_timer(unsigned long data)</div><div class='add'>+static void snd_sb8dsp_midi_output_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *) data;</div><div class='del'>-	struct snd_sb * chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct snd_sb *chip = timer_container_of(chip, t, midi_timer);</div><div class='add'>+	struct snd_rawmidi_substream *substream = chip-&gt;midi_substream_output;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	chip-&gt;midi_timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;chip-&gt;midi_timer);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);	</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		mod_timer(&amp;chip-&gt;midi_timer, 1 + jiffies);</div><div class='add'>+	}</div><div class='ctx'> 	snd_sb8dsp_midi_output_write(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;open_lock, flags);</div><div class='del'>-	if (up) {</div><div class='del'>-		if (!(chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT_TRIGGER)) {</div><div class='del'>-			init_timer(&amp;chip-&gt;midi_timer);</div><div class='del'>-			chip-&gt;midi_timer.function = snd_sb8dsp_midi_output_timer;</div><div class='del'>-			chip-&gt;midi_timer.data = (unsigned long) substream;</div><div class='del'>-			chip-&gt;midi_timer.expires = 1 + jiffies;</div><div class='del'>-			add_timer(&amp;chip-&gt;midi_timer);</div><div class='del'>-			chip-&gt;open |= SB_OPEN_MIDI_OUTPUT_TRIGGER;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT_TRIGGER) {</div><div class='del'>-			chip-&gt;open &amp;= ~SB_OPEN_MIDI_OUTPUT_TRIGGER;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;open_lock) {</div><div class='add'>+		if (up) {</div><div class='add'>+			if (!(chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT_TRIGGER)) {</div><div class='add'>+				mod_timer(&amp;chip-&gt;midi_timer, 1 + jiffies);</div><div class='add'>+				chip-&gt;open |= SB_OPEN_MIDI_OUTPUT_TRIGGER;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (chip-&gt;open &amp; SB_OPEN_MIDI_OUTPUT_TRIGGER) {</div><div class='add'>+				chip-&gt;open &amp;= ~SB_OPEN_MIDI_OUTPUT_TRIGGER;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;open_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (up)</div><div class='ctx'> 		snd_sb8dsp_midi_output_write(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_sb8dsp_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_sb8dsp_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_sb8dsp_midi_output_open,</div><div class='ctx'> 	.close =	snd_sb8dsp_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_sb8dsp_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_sb8dsp_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_sb8dsp_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_sb8dsp_midi_input_open,</div><div class='ctx'> 	.close =	snd_sb8dsp_midi_input_close,</div><div class='ctx'> 	.trigger =	snd_sb8dsp_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_sb8dsp_midi(struct snd_sb *chip, int device, struct snd_rawmidi ** rrawmidi)</div><div class='add'>+int snd_sb8dsp_midi(struct snd_sb *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(chip-&gt;card, "SB8 MIDI", device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(chip-&gt;card, "SB8 MIDI", device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(rmidi-&gt;name, "SB8 MIDI");</div><div class='add'>+	strscpy(rmidi-&gt;name, "SB8 MIDI");</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_sb8dsp_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_sb8dsp_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT;</div><div class='ctx'> 	if (chip-&gt;hardware &gt;= SB_HW_20)</div><div class='ctx'> 		rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	rmidi-&gt;private_data = chip;</div><div class='add'>+	timer_setup(&amp;chip-&gt;midi_timer, snd_sb8dsp_midi_output_timer, 0);</div><div class='ctx'> 	chip-&gt;rmidi = rmidi;</div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c<br/>index eae6c1c0eff9..f2848559e6da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb_common.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb_common.c</a></div><div class='hunk'>@@ -1,23 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Uros Bizjak &lt;uros@kss-loka.si&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Lowlevel routines for control of Sound Blaster cards</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -25,11 +11,12 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='hunk'>@@ -44,14 +31,14 @@ int snd_sbdsp_command(struct snd_sb *chip, unsigned char val)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> #ifdef IO_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "command 0x%x\n", val);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "command 0x%x\n", val);</div><div class='ctx'> #endif</div><div class='ctx'> 	for (i = BUSY_LOOPS; i; i--)</div><div class='ctx'> 		if ((inb(SBP(chip, STATUS)) &amp; 0x80) == 0) {</div><div class='ctx'> 			outb(val, SBP(chip, COMMAND));</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='del'>-	snd_printd("%s [0x%lx]: timeout (0x%x)\n", __func__, chip-&gt;port, val);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%s [0x%lx]: timeout (0x%x)\n", __func__, chip-&gt;port, val);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -63,12 +50,12 @@ int snd_sbdsp_get_byte(struct snd_sb *chip)</div><div class='ctx'> 		if (inb(SBP(chip, DATA_AVAIL)) &amp; 0x80) {</div><div class='ctx'> 			val = inb(SBP(chip, READ));</div><div class='ctx'> #ifdef IO_DEBUG</div><div class='del'>-			snd_printk(KERN_DEBUG "get_byte 0x%x\n", val);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "get_byte 0x%x\n", val);</div><div class='ctx'> #endif</div><div class='ctx'> 			return val;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("%s [0x%lx]: timeout\n", __func__, chip-&gt;port);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "%s [0x%lx]: timeout\n", __func__, chip-&gt;port);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -87,13 +74,14 @@ int snd_sbdsp_reset(struct snd_sb *chip)</div><div class='ctx'> 			else</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-	snd_printdd("%s [0x%lx] failed...\n", __func__, chip-&gt;port);</div><div class='add'>+	if (chip-&gt;card)</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "%s [0x%lx] failed...\n", __func__, chip-&gt;port);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_sbdsp_version(struct snd_sb * chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned int result = -ENODEV;</div><div class='add'>+	unsigned int result;</div><div class='ctx'> </div><div class='ctx'> 	snd_sbdsp_command(chip, SB_DSP_GET_VERSION);</div><div class='ctx'> 	result = (short) snd_sbdsp_get_byte(chip) &lt;&lt; 8;</div><div class='hunk'>@@ -106,27 +94,22 @@ static int snd_sbdsp_probe(struct snd_sb * chip)</div><div class='ctx'> 	int version;</div><div class='ctx'> 	int major, minor;</div><div class='ctx'> 	char *str;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  initialization sequence</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	if (snd_sbdsp_reset(chip) &lt; 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	version = snd_sbdsp_version(chip);</div><div class='del'>-	if (version &lt; 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		if (snd_sbdsp_reset(chip) &lt; 0)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		version = snd_sbdsp_version(chip);</div><div class='add'>+		if (version &lt; 0)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	major = version &gt;&gt; 8;</div><div class='ctx'> 	minor = version &amp; 0xff;</div><div class='del'>-	snd_printdd("SB [0x%lx]: DSP chip found, version = %i.%i\n",</div><div class='del'>-		    chip-&gt;port, major, minor);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "SB [0x%lx]: DSP chip found, version = %i.%i\n",</div><div class='add'>+		chip-&gt;port, major, minor);</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='ctx'> 	case SB_HW_AUTO:</div><div class='hunk'>@@ -153,8 +136,8 @@ static int snd_sbdsp_probe(struct snd_sb * chip)</div><div class='ctx'> 			str = "16";</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk(KERN_INFO "SB [0x%lx]: unknown DSP chip version %i.%i\n",</div><div class='del'>-				   chip-&gt;port, major, minor);</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev, "SB [0x%lx]: unknown DSP chip version %i.%i\n",</div><div class='add'>+				 chip-&gt;port, major, minor);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -181,32 +164,6 @@ static int snd_sbdsp_probe(struct snd_sb * chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_sbdsp_free(struct snd_sb *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;res_port)</div><div class='del'>-		release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, (void *) chip);</div><div class='del'>-#ifdef CONFIG_ISA</div><div class='del'>-	if (chip-&gt;dma8 &gt;= 0) {</div><div class='del'>-		disable_dma(chip-&gt;dma8);</div><div class='del'>-		free_dma(chip-&gt;dma8);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;dma16 &gt;= 0 &amp;&amp; chip-&gt;dma16 != chip-&gt;dma8) {</div><div class='del'>-		disable_dma(chip-&gt;dma16);</div><div class='del'>-		free_dma(chip-&gt;dma16);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_sbdsp_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_sb *chip = device-&gt;device_data;</div><div class='del'>-	return snd_sbdsp_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int snd_sbdsp_create(struct snd_card *card,</div><div class='ctx'> 		     unsigned long port,</div><div class='ctx'> 		     int irq,</div><div class='hunk'>@@ -218,15 +175,12 @@ int snd_sbdsp_create(struct snd_card *card,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_sbdsp_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!r_chip))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	*r_chip = NULL;</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL)</div><div class='add'>+	chip = devm_kzalloc(card-&gt;dev, sizeof(*chip), GFP_KERNEL);</div><div class='add'>+	if (!chip)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;open_lock);</div><div class='hunk'>@@ -237,30 +191,31 @@ int snd_sbdsp_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;dma16 = -1;</div><div class='ctx'> 	chip-&gt;port = port;</div><div class='ctx'> 	</div><div class='del'>-	if (request_irq(irq, irq_handler,</div><div class='del'>-			(hardware == SB_HW_ALS4000 ||</div><div class='del'>-			 hardware == SB_HW_CS5530) ?</div><div class='del'>-			IRQF_SHARED : IRQF_DISABLED,</div><div class='del'>-			"SoundBlaster", (void *) chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);</div><div class='del'>-		snd_sbdsp_free(chip);</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, irq, irq_handler,</div><div class='add'>+			     (hardware == SB_HW_ALS4000 ||</div><div class='add'>+			      hardware == SB_HW_CS5530) ?</div><div class='add'>+			     IRQF_SHARED : 0,</div><div class='add'>+			     "SoundBlaster", (void *) chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "sb: can't grab irq %d\n", irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	if (hardware == SB_HW_ALS4000)</div><div class='ctx'> 		goto __skip_allocation;</div><div class='ctx'> 	</div><div class='del'>-	if ((chip-&gt;res_port = request_region(port, 16, "SoundBlaster")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "sb: can't grab port 0x%lx\n", port);</div><div class='del'>-		snd_sbdsp_free(chip);</div><div class='add'>+	chip-&gt;res_port = devm_request_region(card-&gt;dev, port, 16,</div><div class='add'>+					     "SoundBlaster");</div><div class='add'>+	if (!chip-&gt;res_port) {</div><div class='add'>+		dev_err(card-&gt;dev, "sb: can't grab port 0x%lx\n", port);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ISA</div><div class='del'>-	if (dma8 &gt;= 0 &amp;&amp; request_dma(dma8, "SoundBlaster - 8bit")) {</div><div class='del'>-		snd_printk(KERN_ERR "sb: can't grab DMA8 %d\n", dma8);</div><div class='del'>-		snd_sbdsp_free(chip);</div><div class='add'>+	if (dma8 &gt;= 0 &amp;&amp; snd_devm_request_dma(card-&gt;dev, dma8,</div><div class='add'>+					      "SoundBlaster - 8bit")) {</div><div class='add'>+		dev_err(card-&gt;dev, "sb: can't grab DMA8 %d\n", dma8);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma8 = dma8;</div><div class='hunk'>@@ -268,9 +223,9 @@ int snd_sbdsp_create(struct snd_card *card,</div><div class='ctx'> 		if (hardware != SB_HW_ALS100 &amp;&amp; (dma16 &lt; 5 || dma16 &gt; 7)) {</div><div class='ctx'> 			/* no duplex */</div><div class='ctx'> 			dma16 = -1;</div><div class='del'>-		} else if (request_dma(dma16, "SoundBlaster - 16bit")) {</div><div class='del'>-			snd_printk(KERN_ERR "sb: can't grab DMA16 %d\n", dma16);</div><div class='del'>-			snd_sbdsp_free(chip);</div><div class='add'>+		} else if (snd_devm_request_dma(card-&gt;dev, dma16,</div><div class='add'>+						"SoundBlaster - 16bit")) {</div><div class='add'>+			dev_err(card-&gt;dev, "sb: can't grab DMA16 %d\n", dma16);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -280,14 +235,9 @@ int snd_sbdsp_create(struct snd_card *card,</div><div class='ctx'>       __skip_allocation:</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;hardware = hardware;</div><div class='del'>-	if ((err = snd_sbdsp_probe(chip)) &lt; 0) {</div><div class='del'>-		snd_sbdsp_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_sbdsp_free(chip);</div><div class='add'>+	err = snd_sbdsp_probe(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	*r_chip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -305,19 +255,3 @@ EXPORT_SYMBOL(snd_sbmixer_add_ctl);</div><div class='ctx'> EXPORT_SYMBOL(snd_sbmixer_suspend);</div><div class='ctx'> EXPORT_SYMBOL(snd_sbmixer_resume);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_sb_common_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_sb_common_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_sb_common_init)</div><div class='del'>-module_exit(alsa_sb_common_exit)</div><div class='head'>diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c<br/>index 6496822c1808..95173b18cee3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sb/sb_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sb/sb_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sb/sb_mixer.c</a></div><div class='hunk'>@@ -1,26 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for Sound Blaster mixer control</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/sb.h&gt;</div><div class='hunk'>@@ -35,7 +21,7 @@ void snd_sbmixer_write(struct snd_sb *chip, unsigned char reg, unsigned char dat</div><div class='ctx'> 	outb(data, SBP(chip, MIXER_DATA));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> #ifdef IO_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "mixer_write 0x%x 0x%x\n", reg, data);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "mixer_write 0x%x 0x%x\n", reg, data);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -48,7 +34,7 @@ unsigned char snd_sbmixer_read(struct snd_sb *chip, unsigned char reg)</div><div class='ctx'> 	result = inb(SBP(chip, MIXER_DATA));</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> #ifdef IO_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "mixer_read 0x%x 0x%x\n", reg, result);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "mixer_read 0x%x 0x%x\n", reg, result);</div><div class='ctx'> #endif</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -71,15 +57,13 @@ static int snd_sbmixer_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	val = (snd_sbmixer_read(sb, reg) &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -87,7 +71,6 @@ static int snd_sbmixer_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_sbmixer_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='hunk'>@@ -95,13 +78,12 @@ static int snd_sbmixer_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	unsigned char val, oval;</div><div class='ctx'> </div><div class='ctx'> 	val = (ucontrol-&gt;value.integer.value[0] &amp; mask) &lt;&lt; shift;</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, reg);</div><div class='ctx'> 	val = (oval &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_sbmixer_write(sb, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -123,7 +105,6 @@ static int snd_sbmixer_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_sbmixer_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int left_shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -131,10 +112,9 @@ static int snd_sbmixer_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	unsigned char left, right;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	left = (snd_sbmixer_read(sb, left_reg) &gt;&gt; left_shift) &amp; mask;</div><div class='ctx'> 	right = (snd_sbmixer_read(sb, right_reg) &gt;&gt; right_shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = left;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = right;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -143,7 +123,6 @@ static int snd_sbmixer_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> static int snd_sbmixer_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int left_shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -154,7 +133,7 @@ static int snd_sbmixer_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> </div><div class='ctx'> 	left = (ucontrol-&gt;value.integer.value[0] &amp; mask) &lt;&lt; left_shift;</div><div class='ctx'> 	right = (ucontrol-&gt;value.integer.value[1] &amp; mask) &lt;&lt; right_shift;</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	if (left_reg == right_reg) {</div><div class='ctx'> 		oleft = snd_sbmixer_read(sb, left_reg);</div><div class='ctx'> 		left = (oleft &amp; ~((mask &lt;&lt; left_shift) | (mask &lt;&lt; right_shift))) | left | right;</div><div class='hunk'>@@ -172,7 +151,6 @@ static int snd_sbmixer_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 			snd_sbmixer_write(sb, right_reg, right);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,28 +160,21 @@ static int snd_sbmixer_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> </div><div class='ctx'> static int snd_dt019x_input_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[5] = {</div><div class='add'>+	static const char * const texts[5] = {</div><div class='ctx'> 		"CD", "Mic", "Line", "Synth", "Master"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 4;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_dt019x_input_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char oval;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='del'>-	oval = snd_sbmixer_read(sb, SB_DT019X_CAPTURE_SW);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;sb-&gt;mixer_lock) {</div><div class='add'>+		oval = snd_sbmixer_read(sb, SB_DT019X_CAPTURE_SW);</div><div class='add'>+	}</div><div class='ctx'> 	switch (oval &amp; 0x07) {</div><div class='ctx'> 	case SB_DT019X_CAP_CD:</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='hunk'>@@ -234,7 +205,6 @@ static int snd_dt019x_input_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_dt019x_input_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval, oval;</div><div class='ctx'> 	</div><div class='hunk'>@@ -259,12 +229,11 @@ static int snd_dt019x_input_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	default:</div><div class='ctx'> 		nval = SB_DT019X_CAP_MAIN;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, SB_DT019X_CAPTURE_SW);</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_sbmixer_write(sb, SB_DT019X_CAPTURE_SW, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -275,30 +244,21 @@ static int snd_dt019x_input_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> static int snd_als4k_mono_capture_route_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					     struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"L chan only", "R chan only", "L ch/2 + R ch/2"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_als4k_mono_capture_route_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char oval;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, SB_ALS4000_MONO_IO_CTRL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	oval &gt;&gt;= 6;</div><div class='ctx'> 	if (oval &gt; 2)</div><div class='ctx'> 		oval = 2;</div><div class='hunk'>@@ -311,13 +271,12 @@ static int snd_als4k_mono_capture_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval, oval;</div><div class='ctx'> </div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] &gt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, SB_ALS4000_MONO_IO_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	nval = (oval &amp; ~(3 &lt;&lt; 6))</div><div class='hunk'>@@ -325,7 +284,6 @@ static int snd_als4k_mono_capture_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_sbmixer_write(sb, SB_ALS4000_MONO_IO_CTRL, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -335,29 +293,21 @@ static int snd_als4k_mono_capture_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> static int snd_sb8mixer_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Mic", "CD", "Line"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int snd_sb8mixer_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char oval;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, SB_DSP_CAPTURE_SOURCE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	switch ((oval &gt;&gt; 0x01) &amp; 0x03) {</div><div class='ctx'> 	case SB_DSP_MIXS_CD:</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = 1;</div><div class='hunk'>@@ -375,7 +325,6 @@ static int snd_sb8mixer_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> static int snd_sb8mixer_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char nval, oval;</div><div class='ctx'> 	</div><div class='hunk'>@@ -392,13 +341,12 @@ static int snd_sb8mixer_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 		nval = SB_DSP_MIXS_MIC;</div><div class='ctx'> 	}</div><div class='ctx'> 	nval &lt;&lt;= 1;</div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval = snd_sbmixer_read(sb, SB_DSP_CAPTURE_SOURCE);</div><div class='ctx'> 	nval |= oval &amp; ~0x06;</div><div class='ctx'> 	change = nval != oval;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_sbmixer_write(sb, SB_DSP_CAPTURE_SOURCE, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -418,17 +366,15 @@ static int snd_sb16mixer_info_input_sw(struct snd_kcontrol *kcontrol, struct snd</div><div class='ctx'> static int snd_sb16mixer_get_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg1 = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int reg2 = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int left_shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x0f;</div><div class='ctx'> 	int right_shift = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0x0f;</div><div class='ctx'> 	unsigned char val1, val2;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	val1 = snd_sbmixer_read(sb, reg1);</div><div class='ctx'> 	val2 = snd_sbmixer_read(sb, reg2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (val1 &gt;&gt; left_shift) &amp; 0x01;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (val2 &gt;&gt; left_shift) &amp; 0x01;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[2] = (val1 &gt;&gt; right_shift) &amp; 0x01;</div><div class='hunk'>@@ -439,7 +385,6 @@ static int snd_sb16mixer_get_input_sw(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> static int snd_sb16mixer_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *sb = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg1 = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int reg2 = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int left_shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x0f;</div><div class='hunk'>@@ -447,7 +392,7 @@ static int snd_sb16mixer_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char val1, val2, oval1, oval2;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sb-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sb-&gt;mixer_lock);</div><div class='ctx'> 	oval1 = snd_sbmixer_read(sb, reg1);</div><div class='ctx'> 	oval2 = snd_sbmixer_read(sb, reg2);</div><div class='ctx'> 	val1 = oval1 &amp; ~((1 &lt;&lt; left_shift) | (1 &lt;&lt; right_shift));</div><div class='hunk'>@@ -461,7 +406,6 @@ static int snd_sb16mixer_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> 		snd_sbmixer_write(sb, reg1, val1);</div><div class='ctx'> 		snd_sbmixer_write(sb, reg2, val2);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;sb-&gt;mixer_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -472,7 +416,7 @@ static int snd_sb16mixer_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'>  */</div><div class='ctx'> int snd_sbmixer_add_ctl(struct snd_sb *chip, const char *name, int index, int type, unsigned long value)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_kcontrol_new newctls[] = {</div><div class='add'>+	static const struct snd_kcontrol_new newctls[] = {</div><div class='ctx'> 		[SB_MIX_SINGLE] = {</div><div class='ctx'> 			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 			.info = snd_sbmixer_info_single,</div><div class='hunk'>@@ -516,10 +460,11 @@ int snd_sbmixer_add_ctl(struct snd_sb *chip, const char *name, int index, int ty</div><div class='ctx'> 	ctl = snd_ctl_new1(&amp;newctls[type], chip);</div><div class='ctx'> 	if (! ctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	strlcpy(ctl-&gt;id.name, name, sizeof(ctl-&gt;id.name));</div><div class='add'>+	strscpy(ctl-&gt;id.name, name, sizeof(ctl-&gt;id.name));</div><div class='ctx'> 	ctl-&gt;id.index = index;</div><div class='ctx'> 	ctl-&gt;private_value = value;</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, ctl)) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, ctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -528,14 +473,14 @@ int snd_sbmixer_add_ctl(struct snd_sb *chip, const char *name, int index, int ty</div><div class='ctx'>  * SB 2.0 specific mixer elements</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct sbmix_elem snd_sb20_controls[] = {</div><div class='add'>+static const struct sbmix_elem snd_sb20_controls[] = {</div><div class='ctx'> 	SB_SINGLE("Master Playback Volume", SB_DSP20_MASTER_DEV, 1, 7),</div><div class='ctx'> 	SB_SINGLE("PCM Playback Volume", SB_DSP20_PCM_DEV, 1, 3),</div><div class='ctx'> 	SB_SINGLE("Synth Playback Volume", SB_DSP20_FM_DEV, 1, 7),</div><div class='ctx'> 	SB_SINGLE("CD Playback Volume", SB_DSP20_CD_DEV, 1, 7)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_sb20_init_values[][2] = {</div><div class='add'>+static const unsigned char snd_sb20_init_values[][2] = {</div><div class='ctx'> 	{ SB_DSP20_MASTER_DEV, 0 },</div><div class='ctx'> 	{ SB_DSP20_FM_DEV, 0 },</div><div class='ctx'> };</div><div class='hunk'>@@ -543,7 +488,7 @@ static unsigned char snd_sb20_init_values[][2] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SB Pro specific mixer elements</div><div class='ctx'>  */</div><div class='del'>-static struct sbmix_elem snd_sbpro_controls[] = {</div><div class='add'>+static const struct sbmix_elem snd_sbpro_controls[] = {</div><div class='ctx'> 	SB_DOUBLE("Master Playback Volume",</div><div class='ctx'> 		  SB_DSP_MASTER_DEV, SB_DSP_MASTER_DEV, 5, 1, 7),</div><div class='ctx'> 	SB_DOUBLE("PCM Playback Volume",</div><div class='hunk'>@@ -563,7 +508,7 @@ static struct sbmix_elem snd_sbpro_controls[] = {</div><div class='ctx'> 	SB_SINGLE("Capture Low-Pass Filter", SB_DSP_CAPTURE_FILT, 3, 1)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_sbpro_init_values[][2] = {</div><div class='add'>+static const unsigned char snd_sbpro_init_values[][2] = {</div><div class='ctx'> 	{ SB_DSP_MASTER_DEV, 0 },</div><div class='ctx'> 	{ SB_DSP_PCM_DEV, 0 },</div><div class='ctx'> 	{ SB_DSP_FM_DEV, 0 },</div><div class='hunk'>@@ -572,7 +517,7 @@ static unsigned char snd_sbpro_init_values[][2] = {</div><div class='ctx'> /*</div><div class='ctx'>  * SB16 specific mixer elements</div><div class='ctx'>  */</div><div class='del'>-static struct sbmix_elem snd_sb16_controls[] = {</div><div class='add'>+static const struct sbmix_elem snd_sb16_controls[] = {</div><div class='ctx'> 	SB_DOUBLE("Master Playback Volume",</div><div class='ctx'> 		  SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),</div><div class='ctx'> 	SB_DOUBLE("PCM Playback Volume",</div><div class='hunk'>@@ -610,7 +555,7 @@ static struct sbmix_elem snd_sb16_controls[] = {</div><div class='ctx'> 		  SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_sb16_init_values[][2] = {</div><div class='add'>+static const unsigned char snd_sb16_init_values[][2] = {</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 0, 0 },</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 1, 0 },</div><div class='ctx'> 	{ SB_DSP4_PCM_DEV + 0, 0 },</div><div class='hunk'>@@ -626,7 +571,7 @@ static unsigned char snd_sb16_init_values[][2] = {</div><div class='ctx'> /*</div><div class='ctx'>  * DT019x specific mixer elements</div><div class='ctx'>  */</div><div class='del'>-static struct sbmix_elem snd_dt019x_controls[] = {</div><div class='add'>+static const struct sbmix_elem snd_dt019x_controls[] = {</div><div class='ctx'> 	/* ALS4000 below has some parts which we might be lacking,</div><div class='ctx'> 	 * e.g. snd_als4000_ctl_mono_playback_switch - check it! */</div><div class='ctx'> 	SB_DOUBLE("Master Playback Volume",</div><div class='hunk'>@@ -656,7 +601,7 @@ static struct sbmix_elem snd_dt019x_controls[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_dt019x_init_values[][2] = {</div><div class='add'>+static const unsigned char snd_dt019x_init_values[][2] = {</div><div class='ctx'>         { SB_DT019X_MASTER_DEV, 0 },</div><div class='ctx'>         { SB_DT019X_PCM_DEV, 0 },</div><div class='ctx'>         { SB_DT019X_SYNTH_DEV, 0 },</div><div class='hunk'>@@ -671,7 +616,7 @@ static unsigned char snd_dt019x_init_values[][2] = {</div><div class='ctx'> /*</div><div class='ctx'>  * ALS4000 specific mixer elements</div><div class='ctx'>  */</div><div class='del'>-static struct sbmix_elem snd_als4000_controls[] = {</div><div class='add'>+static const struct sbmix_elem snd_als4000_controls[] = {</div><div class='ctx'> 	SB_DOUBLE("PCM Playback Switch",</div><div class='ctx'> 		  SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 2, 1, 1),</div><div class='ctx'> 	SB_DOUBLE("Synth Playback Switch",</div><div class='hunk'>@@ -705,7 +650,7 @@ static struct sbmix_elem snd_als4000_controls[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_als4000_init_values[][2] = {</div><div class='add'>+static const unsigned char snd_als4000_init_values[][2] = {</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 0, 0 },</div><div class='ctx'> 	{ SB_DSP4_MASTER_DEV + 1, 0 },</div><div class='ctx'> 	{ SB_DSP4_PCM_DEV + 0, 0 },</div><div class='hunk'>@@ -723,26 +668,24 @@ static unsigned char snd_als4000_init_values[][2] = {</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> static int snd_sbmixer_init(struct snd_sb *chip,</div><div class='del'>-			    struct sbmix_elem *controls,</div><div class='add'>+			    const struct sbmix_elem *controls,</div><div class='ctx'> 			    int controls_count,</div><div class='del'>-			    unsigned char map[][2],</div><div class='add'>+			    const unsigned char map[][2],</div><div class='ctx'> 			    int map_count,</div><div class='ctx'> 			    char *name)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> </div><div class='ctx'> 	/* mixer reset */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-	snd_sbmixer_write(chip, 0x00, 0x00);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_sbmixer_write(chip, 0x00, 0x00);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* mute and zero volume channels */</div><div class='ctx'> 	for (idx = 0; idx &lt; map_count; idx++) {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 		snd_sbmixer_write(chip, map[idx][0], map[idx][1]);</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; controls_count; idx++) {</div><div class='hunk'>@@ -751,7 +694,7 @@ static int snd_sbmixer_init(struct snd_sb *chip,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_component_add(card, name);</div><div class='del'>-	strcpy(card-&gt;mixername, name);</div><div class='add'>+	strscpy(card-&gt;mixername, name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -770,33 +713,36 @@ int snd_sbmixer_new(struct snd_sb *chip)</div><div class='ctx'> 		return 0; /* no mixer chip on SB1.x */</div><div class='ctx'> 	case SB_HW_20:</div><div class='ctx'> 	case SB_HW_201:</div><div class='del'>-		if ((err = snd_sbmixer_init(chip,</div><div class='del'>-					    snd_sb20_controls,</div><div class='del'>-					    ARRAY_SIZE(snd_sb20_controls),</div><div class='del'>-					    snd_sb20_init_values,</div><div class='del'>-					    ARRAY_SIZE(snd_sb20_init_values),</div><div class='del'>-					    "CTL1335")) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_init(chip,</div><div class='add'>+				       snd_sb20_controls,</div><div class='add'>+				       ARRAY_SIZE(snd_sb20_controls),</div><div class='add'>+				       snd_sb20_init_values,</div><div class='add'>+				       ARRAY_SIZE(snd_sb20_init_values),</div><div class='add'>+				       "CTL1335");</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SB_HW_PRO:</div><div class='ctx'> 	case SB_HW_JAZZ16:</div><div class='del'>-		if ((err = snd_sbmixer_init(chip,</div><div class='del'>-					    snd_sbpro_controls,</div><div class='del'>-					    ARRAY_SIZE(snd_sbpro_controls),</div><div class='del'>-					    snd_sbpro_init_values,</div><div class='del'>-					    ARRAY_SIZE(snd_sbpro_init_values),</div><div class='del'>-					    "CTL1345")) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_init(chip,</div><div class='add'>+				       snd_sbpro_controls,</div><div class='add'>+				       ARRAY_SIZE(snd_sbpro_controls),</div><div class='add'>+				       snd_sbpro_init_values,</div><div class='add'>+				       ARRAY_SIZE(snd_sbpro_init_values),</div><div class='add'>+				       "CTL1345");</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SB_HW_16:</div><div class='ctx'> 	case SB_HW_ALS100:</div><div class='ctx'> 	case SB_HW_CS5530:</div><div class='del'>-		if ((err = snd_sbmixer_init(chip,</div><div class='del'>-					    snd_sb16_controls,</div><div class='del'>-					    ARRAY_SIZE(snd_sb16_controls),</div><div class='del'>-					    snd_sb16_init_values,</div><div class='del'>-					    ARRAY_SIZE(snd_sb16_init_values),</div><div class='del'>-					    "CTL1745")) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_init(chip,</div><div class='add'>+				       snd_sb16_controls,</div><div class='add'>+				       ARRAY_SIZE(snd_sb16_controls),</div><div class='add'>+				       snd_sb16_init_values,</div><div class='add'>+				       ARRAY_SIZE(snd_sb16_init_values),</div><div class='add'>+				       "CTL1745");</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SB_HW_ALS4000:</div><div class='hunk'>@@ -809,37 +755,40 @@ int snd_sbmixer_new(struct snd_sb *chip)</div><div class='ctx'> 					"ALS4000");</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_sbmixer_init(chip,</div><div class='del'>-					    snd_als4000_controls,</div><div class='del'>-					    ARRAY_SIZE(snd_als4000_controls),</div><div class='del'>-					    snd_als4000_init_values,</div><div class='del'>-					    ARRAY_SIZE(snd_als4000_init_values),</div><div class='del'>-					    "ALS4000")) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_init(chip,</div><div class='add'>+				       snd_als4000_controls,</div><div class='add'>+				       ARRAY_SIZE(snd_als4000_controls),</div><div class='add'>+				       snd_als4000_init_values,</div><div class='add'>+				       ARRAY_SIZE(snd_als4000_init_values),</div><div class='add'>+				       "ALS4000");</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SB_HW_DT019X:</div><div class='del'>-		if ((err = snd_sbmixer_init(chip,</div><div class='del'>-					    snd_dt019x_controls,</div><div class='del'>-					    ARRAY_SIZE(snd_dt019x_controls),</div><div class='del'>-					    snd_dt019x_init_values,</div><div class='del'>-					    ARRAY_SIZE(snd_dt019x_init_values),</div><div class='del'>-					    "DT019X")) &lt; 0)</div><div class='add'>+		err = snd_sbmixer_init(chip,</div><div class='add'>+				       snd_dt019x_controls,</div><div class='add'>+				       ARRAY_SIZE(snd_dt019x_controls),</div><div class='add'>+				       snd_dt019x_init_values,</div><div class='add'>+				       ARRAY_SIZE(snd_dt019x_init_values),</div><div class='add'>+				       "DT019X");</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		strcpy(card-&gt;mixername, "???");</div><div class='add'>+		strscpy(card-&gt;mixername, "???");</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='del'>-static unsigned char sb20_saved_regs[] = {</div><div class='add'>+static const unsigned char sb20_saved_regs[] = {</div><div class='ctx'> 	SB_DSP20_MASTER_DEV,</div><div class='ctx'> 	SB_DSP20_PCM_DEV,</div><div class='ctx'> 	SB_DSP20_FM_DEV,</div><div class='ctx'> 	SB_DSP20_CD_DEV,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char sbpro_saved_regs[] = {</div><div class='add'>+static const unsigned char sbpro_saved_regs[] = {</div><div class='ctx'> 	SB_DSP_MASTER_DEV,</div><div class='ctx'> 	SB_DSP_PCM_DEV,</div><div class='ctx'> 	SB_DSP_PLAYBACK_FILT,</div><div class='hunk'>@@ -851,7 +800,7 @@ static unsigned char sbpro_saved_regs[] = {</div><div class='ctx'> 	SB_DSP_CAPTURE_FILT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char sb16_saved_regs[] = {</div><div class='add'>+static const unsigned char sb16_saved_regs[] = {</div><div class='ctx'> 	SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,</div><div class='ctx'> 	SB_DSP4_3DSE,</div><div class='ctx'> 	SB_DSP4_BASS_DEV, SB_DSP4_BASS_DEV + 1,</div><div class='hunk'>@@ -869,7 +818,7 @@ static unsigned char sb16_saved_regs[] = {</div><div class='ctx'> 	SB_DSP4_MIC_AGC</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char dt019x_saved_regs[] = {</div><div class='add'>+static const unsigned char dt019x_saved_regs[] = {</div><div class='ctx'> 	SB_DT019X_MASTER_DEV,</div><div class='ctx'> 	SB_DT019X_PCM_DEV,</div><div class='ctx'> 	SB_DT019X_SYNTH_DEV,</div><div class='hunk'>@@ -882,7 +831,7 @@ static unsigned char dt019x_saved_regs[] = {</div><div class='ctx'> 	SB_DT019X_CAPTURE_SW,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char als4000_saved_regs[] = {</div><div class='add'>+static const unsigned char als4000_saved_regs[] = {</div><div class='ctx'> 	/* please verify in dsheet whether regs to be added</div><div class='ctx'> 	   are actually real H/W or just dummy */</div><div class='ctx'> 	SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,</div><div class='hunk'>@@ -904,7 +853,7 @@ static unsigned char als4000_saved_regs[] = {</div><div class='ctx'> 	SB_ALS4000_CR3_CONFIGURATION,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)</div><div class='add'>+static void save_mixer(struct snd_sb *chip, const unsigned char *regs, int num_regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *val = chip-&gt;saved_regs;</div><div class='ctx'> 	if (snd_BUG_ON(num_regs &gt; ARRAY_SIZE(chip-&gt;saved_regs)))</div><div class='hunk'>@@ -913,7 +862,7 @@ static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)</div><div class='ctx'> 		*val++ = snd_sbmixer_read(chip, *regs++);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)</div><div class='add'>+static void restore_mixer(struct snd_sb *chip, const unsigned char *regs, int num_regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char *val = chip-&gt;saved_regs;</div><div class='ctx'> 	if (snd_BUG_ON(num_regs &gt; ARRAY_SIZE(chip-&gt;saved_regs)))</div><div class='head'>diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c<br/>index 9a8bbf6dd62a..6d618cc2ba45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sc6000.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sc6000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sc6000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sc6000.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Gallant SC-6000 soundcard. This card is also known as</div><div class='ctx'>  *  Audio Excel DSP 16 or Zoltrix AV302.</div><div class='hunk'>@@ -9,20 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  I don't have documentation for this card. I used the driver</div><div class='ctx'>  *  for OSS/Free included in the kernel source as reference.</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -42,13 +29,10 @@</div><div class='ctx'> MODULE_AUTHOR("Krzysztof Helt");</div><div class='ctx'> MODULE_DESCRIPTION("Gallant SC-6000");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Gallant, SC-6000},"</div><div class='del'>-			"{AudioExcel, Audio Excel DSP 16},"</div><div class='del'>-			"{Zoltrix, AV302}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	/* Enable this card */</div><div class='ctx'> static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220, 0x240 */</div><div class='ctx'> static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;	/* 5, 7, 9, 10, 11 */</div><div class='ctx'> static long mss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x530, 0xe80 */</div><div class='hunk'>@@ -64,17 +48,17 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for sc-6000 based soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable sc-6000 based soundcard.");</div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for sc-6000 driver.");</div><div class='del'>-module_param_array(mss_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mss_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mss_port, "MSS Port # for sc-6000 driver.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port # for sc-6000 driver.");</div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for sc-6000 driver.");</div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver.");</div><div class='del'>-module_param_array(dma, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver.");</div><div class='ctx'> module_param_array(joystick, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick, "Enable gameport.");</div><div class='hunk'>@@ -121,7 +105,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport.");</div><div class='ctx'> /*</div><div class='ctx'>  * sc6000_irq_to_softcfg - Decode irq number into cfg code.</div><div class='ctx'>  */</div><div class='del'>-static __devinit unsigned char sc6000_irq_to_softcfg(int irq)</div><div class='add'>+static unsigned char sc6000_irq_to_softcfg(int irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -150,7 +134,7 @@ static __devinit unsigned char sc6000_irq_to_softcfg(int irq)</div><div class='ctx'> /*</div><div class='ctx'>  * sc6000_dma_to_softcfg - Decode dma number into cfg code.</div><div class='ctx'>  */</div><div class='del'>-static __devinit unsigned char sc6000_dma_to_softcfg(int dma)</div><div class='add'>+static unsigned char sc6000_dma_to_softcfg(int dma)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +157,7 @@ static __devinit unsigned char sc6000_dma_to_softcfg(int dma)</div><div class='ctx'> /*</div><div class='ctx'>  * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code.</div><div class='ctx'>  */</div><div class='del'>-static __devinit unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq)</div><div class='add'>+static unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +204,7 @@ static int sc6000_read(char __iomem *vport)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sc6000_write(char __iomem *vport, int cmd)</div><div class='add'>+static int sc6000_write(struct device *devptr, char __iomem *vport, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	int loop = 500000;</div><div class='hunk'>@@ -237,18 +221,19 @@ static int sc6000_write(char __iomem *vport, int cmd)</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> 	} while (loop--);</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "DSP Command (0x%x) timeout.\n", cmd);</div><div class='add'>+	dev_err(devptr, "DSP Command (0x%x) timeout.\n", cmd);</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,</div><div class='del'>-					   char *data, int data_len)</div><div class='add'>+static int sc6000_dsp_get_answer(struct device *devptr,</div><div class='add'>+				 char __iomem *vport, int command,</div><div class='add'>+				 char *data, int data_len)</div><div class='ctx'> {</div><div class='ctx'> 	int len = 0;</div><div class='ctx'> </div><div class='del'>-	if (sc6000_write(vport, command)) {</div><div class='del'>-		snd_printk(KERN_ERR "CMD 0x%x: failed!\n", command);</div><div class='add'>+	if (sc6000_write(devptr, vport, command)) {</div><div class='add'>+		dev_err(devptr, "CMD 0x%x: failed!\n", command);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +254,7 @@ static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,</div><div class='ctx'> 	return len ? len : -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit sc6000_dsp_reset(char __iomem *vport)</div><div class='add'>+static int sc6000_dsp_reset(char __iomem *vport)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite8(1, vport + DSP_RESET);</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -281,82 +266,86 @@ static int __devinit sc6000_dsp_reset(char __iomem *vport)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* detection and initialization */</div><div class='del'>-static int __devinit sc6000_hw_cfg_write(char __iomem *vport, const int *cfg)</div><div class='add'>+static int sc6000_hw_cfg_write(struct device *devptr,</div><div class='add'>+			       char __iomem *vport, const int *cfg)</div><div class='ctx'> {</div><div class='del'>-	if (sc6000_write(vport, COMMAND_6C) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "CMD 0x%x: failed!\n", COMMAND_6C);</div><div class='add'>+	if (sc6000_write(devptr, vport, COMMAND_6C) &lt; 0) {</div><div class='add'>+		dev_warn(devptr, "CMD 0x%x: failed!\n", COMMAND_6C);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (sc6000_write(vport, COMMAND_5C) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "CMD 0x%x: failed!\n", COMMAND_5C);</div><div class='add'>+	if (sc6000_write(devptr, vport, COMMAND_5C) &lt; 0) {</div><div class='add'>+		dev_err(devptr, "CMD 0x%x: failed!\n", COMMAND_5C);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (sc6000_write(vport, cfg[0]) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "DATA 0x%x: failed!\n", cfg[0]);</div><div class='add'>+	if (sc6000_write(devptr, vport, cfg[0]) &lt; 0) {</div><div class='add'>+		dev_err(devptr, "DATA 0x%x: failed!\n", cfg[0]);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (sc6000_write(vport, cfg[1]) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "DATA 0x%x: failed!\n", cfg[1]);</div><div class='add'>+	if (sc6000_write(devptr, vport, cfg[1]) &lt; 0) {</div><div class='add'>+		dev_err(devptr, "DATA 0x%x: failed!\n", cfg[1]);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (sc6000_write(vport, COMMAND_C5) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "CMD 0x%x: failed!\n", COMMAND_C5);</div><div class='add'>+	if (sc6000_write(devptr, vport, COMMAND_C5) &lt; 0) {</div><div class='add'>+		dev_err(devptr, "CMD 0x%x: failed!\n", COMMAND_C5);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sc6000_cfg_write(char __iomem *vport, unsigned char softcfg)</div><div class='add'>+static int sc6000_cfg_write(struct device *devptr,</div><div class='add'>+			    char __iomem *vport, unsigned char softcfg)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	if (sc6000_write(vport, WRITE_MDIRQ_CFG)) {</div><div class='del'>-		snd_printk(KERN_ERR "CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);</div><div class='add'>+	if (sc6000_write(devptr, vport, WRITE_MDIRQ_CFG)) {</div><div class='add'>+		dev_err(devptr, "CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if (sc6000_write(vport, softcfg)) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_cfg_write: failed!\n");</div><div class='add'>+	if (sc6000_write(devptr, vport, softcfg)) {</div><div class='add'>+		dev_err(devptr, "%s: failed!\n", __func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sc6000_setup_board(char __iomem *vport, int config)</div><div class='add'>+static int sc6000_setup_board(struct device *devptr,</div><div class='add'>+			      char __iomem *vport, int config)</div><div class='ctx'> {</div><div class='ctx'> 	int loop = 10;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		if (sc6000_write(vport, COMMAND_88)) {</div><div class='del'>-			snd_printk(KERN_ERR "CMD 0x%x: failed!\n",</div><div class='del'>-				   COMMAND_88);</div><div class='add'>+		if (sc6000_write(devptr, vport, COMMAND_88)) {</div><div class='add'>+			dev_err(devptr, "CMD 0x%x: failed!\n",</div><div class='add'>+				COMMAND_88);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((sc6000_wait_data(vport) &lt; 0) &amp;&amp; loop--);</div><div class='ctx'> </div><div class='ctx'> 	if (sc6000_read(vport) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_read after CMD 0x%x: failed\n",</div><div class='del'>-			   COMMAND_88);</div><div class='add'>+		dev_err(devptr, "sc6000_read after CMD 0x%x: failed\n",</div><div class='add'>+			COMMAND_88);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (sc6000_cfg_write(vport, config))</div><div class='add'>+	if (sc6000_cfg_write(devptr, vport, config))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit sc6000_init_mss(char __iomem *vport, int config,</div><div class='del'>-				     char __iomem *vmss_port, int mss_config)</div><div class='add'>+static int sc6000_init_mss(struct device *devptr,</div><div class='add'>+			   char __iomem *vport, int config,</div><div class='add'>+			   char __iomem *vmss_port, int mss_config)</div><div class='ctx'> {</div><div class='del'>-	if (sc6000_write(vport, DSP_INIT_MSS)) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_init_mss [0x%x]: failed!\n",</div><div class='del'>-			   DSP_INIT_MSS);</div><div class='add'>+	if (sc6000_write(devptr, vport, DSP_INIT_MSS)) {</div><div class='add'>+		dev_err(devptr, "%s [0x%x]: failed!\n", __func__,</div><div class='add'>+			DSP_INIT_MSS);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	msleep(10);</div><div class='ctx'> </div><div class='del'>-	if (sc6000_cfg_write(vport, config))</div><div class='add'>+	if (sc6000_cfg_write(devptr, vport, config))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	iowrite8(mss_config, vmss_port);</div><div class='hunk'>@@ -364,9 +353,10 @@ static int __devinit sc6000_init_mss(char __iomem *vport, int config,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,</div><div class='del'>-					   long xport, long xmpu,</div><div class='del'>-					   long xmss_port, int joystick)</div><div class='add'>+static void sc6000_hw_cfg_encode(struct device *devptr,</div><div class='add'>+				 char __iomem *vport, int *cfg,</div><div class='add'>+				 long xport, long xmpu,</div><div class='add'>+				 long xmss_port, int joystick)</div><div class='ctx'> {</div><div class='ctx'> 	cfg[0] = 0;</div><div class='ctx'> 	cfg[1] = 0;</div><div class='hunk'>@@ -383,11 +373,12 @@ static void __devinit sc6000_hw_cfg_encode(char __iomem *vport, int *cfg,</div><div class='ctx'> 		cfg[0] |= 0x02;</div><div class='ctx'> 	cfg[1] |= 0x80;		/* enable WSS system */</div><div class='ctx'> 	cfg[1] &amp;= ~0x40;	/* disable IDE */</div><div class='del'>-	snd_printd("hw cfg %x, %x\n", cfg[0], cfg[1]);</div><div class='add'>+	dev_dbg(devptr, "hw cfg %x, %x\n", cfg[0], cfg[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit sc6000_init_board(char __iomem *vport,</div><div class='del'>-					char __iomem *vmss_port, int dev)</div><div class='add'>+static int sc6000_init_board(struct device *devptr,</div><div class='add'>+			     char __iomem *vport,</div><div class='add'>+			     char __iomem *vmss_port, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	char answer[15];</div><div class='ctx'> 	char version[2];</div><div class='hunk'>@@ -400,14 +391,14 @@ static int __devinit sc6000_init_board(char __iomem *vport,</div><div class='ctx'> </div><div class='ctx'> 	err = sc6000_dsp_reset(vport);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_dsp_reset: failed!\n");</div><div class='add'>+		dev_err(devptr, "sc6000_dsp_reset: failed!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(answer, 0, sizeof(answer));</div><div class='del'>-	err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);</div><div class='add'>+	err = sc6000_dsp_get_answer(devptr, vport, GET_DSP_COPYRIGHT, answer, 15);</div><div class='ctx'> 	if (err &lt;= 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n");</div><div class='add'>+		dev_err(devptr, "sc6000_dsp_copyright: failed!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -415,59 +406,59 @@ static int __devinit sc6000_init_board(char __iomem *vport,</div><div class='ctx'> 	 * if we have something different, we have to be warned.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (strncmp("SC-6000", answer, 7))</div><div class='del'>-		snd_printk(KERN_WARNING "Warning: non SC-6000 audio card!\n");</div><div class='add'>+		dev_warn(devptr, "Warning: non SC-6000 audio card!\n");</div><div class='ctx'> </div><div class='del'>-	if (sc6000_dsp_get_answer(vport, GET_DSP_VERSION, version, 2) &lt; 2) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_dsp_version: failed!\n");</div><div class='add'>+	if (sc6000_dsp_get_answer(devptr, vport, GET_DSP_VERSION, version, 2) &lt; 2) {</div><div class='add'>+		dev_err(devptr, "sc6000_dsp_version: failed!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_INFO PFX "Detected model: %s, DSP version %d.%d\n",</div><div class='add'>+	dev_info(devptr, "Detected model: %s, DSP version %d.%d\n",</div><div class='ctx'> 		answer, version[0], version[1]);</div><div class='ctx'> </div><div class='ctx'> 	/* set configuration */</div><div class='del'>-	sc6000_write(vport, COMMAND_5C);</div><div class='add'>+	sc6000_write(devptr, vport, COMMAND_5C);</div><div class='ctx'> 	if (sc6000_read(vport) &lt; 0)</div><div class='ctx'> 		old = 1;</div><div class='ctx'> </div><div class='ctx'> 	if (!old) {</div><div class='ctx'> 		int cfg[2];</div><div class='del'>-		sc6000_hw_cfg_encode(vport, &amp;cfg[0], port[dev], mpu_port[dev],</div><div class='add'>+		sc6000_hw_cfg_encode(devptr,</div><div class='add'>+				     vport, &amp;cfg[0], port[dev], mpu_port[dev],</div><div class='ctx'> 				     mss_port[dev], joystick[dev]);</div><div class='del'>-		if (sc6000_hw_cfg_write(vport, cfg) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "sc6000_hw_cfg_write: failed!\n");</div><div class='add'>+		if (sc6000_hw_cfg_write(devptr, vport, cfg) &lt; 0) {</div><div class='add'>+			dev_err(devptr, "sc6000_hw_cfg_write: failed!\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	err = sc6000_setup_board(vport, config);</div><div class='add'>+	err = sc6000_setup_board(devptr, vport, config);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_setup_board: failed!\n");</div><div class='add'>+		dev_err(devptr, "sc6000_setup_board: failed!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sc6000_dsp_reset(vport);</div><div class='ctx'> </div><div class='ctx'> 	if (!old) {</div><div class='del'>-		sc6000_write(vport, COMMAND_60);</div><div class='del'>-		sc6000_write(vport, 0x02);</div><div class='add'>+		sc6000_write(devptr, vport, COMMAND_60);</div><div class='add'>+		sc6000_write(devptr, vport, 0x02);</div><div class='ctx'> 		sc6000_dsp_reset(vport);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = sc6000_setup_board(vport, config);</div><div class='add'>+	err = sc6000_setup_board(devptr, vport, config);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sc6000_setup_board: failed!\n");</div><div class='add'>+		dev_err(devptr, "sc6000_setup_board: failed!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-	err = sc6000_init_mss(vport, config, vmss_port, mss_config);</div><div class='add'>+	err = sc6000_init_mss(devptr, vport, config, vmss_port, mss_config);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Cannot initialize "</div><div class='del'>-			   "Microsoft Sound System mode.\n");</div><div class='add'>+		dev_err(devptr, "Cannot initialize Microsoft Sound System mode.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sc6000_mixer(struct snd_wss *chip)</div><div class='add'>+static int snd_sc6000_mixer(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_ctl_elem_id id1, id2;</div><div class='hunk'>@@ -478,178 +469,176 @@ static int __devinit snd_sc6000_mixer(struct snd_wss *chip)</div><div class='ctx'> 	id1.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	/* reassign AUX0 to FM */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch");</div><div class='del'>-	strcpy(id2.name, "FM Playback Switch");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch");</div><div class='add'>+	strscpy(id2.name, "FM Playback Switch");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "FM Playback Volume");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "FM Playback Volume");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* reassign AUX1 to CD */</div><div class='del'>-	strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='del'>-	strcpy(id2.name, "CD Playback Switch");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;</div><div class='add'>+	strscpy(id2.name, "CD Playback Switch");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(id1.name, "Aux Playback Volume");</div><div class='del'>-	strcpy(id2.name, "CD Playback Volume");</div><div class='add'>+	strscpy(id1.name, "Aux Playback Volume");</div><div class='add'>+	strscpy(id2.name, "CD Playback Volume");</div><div class='ctx'> 	err = snd_ctl_rename_id(card, &amp;id1, &amp;id2);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev)</div><div class='add'>+static int snd_sc6000_match(struct device *devptr, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	if (port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		printk(KERN_ERR PFX "specify IO port\n");</div><div class='add'>+		dev_err(devptr, "specify IO port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mss_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		printk(KERN_ERR PFX "specify MSS port\n");</div><div class='add'>+		dev_err(devptr, "specify MSS port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (port[dev] != 0x220 &amp;&amp; port[dev] != 0x240) {</div><div class='del'>-		printk(KERN_ERR PFX "Port must be 0x220 or 0x240\n");</div><div class='add'>+		dev_err(devptr, "Port must be 0x220 or 0x240\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mss_port[dev] != 0x530 &amp;&amp; mss_port[dev] != 0xe80) {</div><div class='del'>-		printk(KERN_ERR PFX "MSS port must be 0x530 or 0xe80\n");</div><div class='add'>+		dev_err(devptr, "MSS port must be 0x530 or 0xe80\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (irq[dev] != SNDRV_AUTO_IRQ &amp;&amp; !sc6000_irq_to_softcfg(irq[dev])) {</div><div class='del'>-		printk(KERN_ERR PFX "invalid IRQ %d\n", irq[dev]);</div><div class='add'>+		dev_err(devptr, "invalid IRQ %d\n", irq[dev]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma[dev] != SNDRV_AUTO_DMA &amp;&amp; !sc6000_dma_to_softcfg(dma[dev])) {</div><div class='del'>-		printk(KERN_ERR PFX "invalid DMA %d\n", dma[dev]);</div><div class='add'>+		dev_err(devptr, "invalid DMA %d\n", dma[dev]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_port[dev] != SNDRV_AUTO_PORT &amp;&amp;</div><div class='ctx'> 	    (mpu_port[dev] &amp; ~0x30L) != 0x300) {</div><div class='del'>-		printk(KERN_ERR PFX "invalid MPU-401 port %lx\n",</div><div class='add'>+		dev_err(devptr, "invalid MPU-401 port %lx\n",</div><div class='ctx'> 			mpu_port[dev]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (mpu_port[dev] != SNDRV_AUTO_PORT &amp;&amp;</div><div class='ctx'> 	    mpu_irq[dev] != SNDRV_AUTO_IRQ &amp;&amp; mpu_irq[dev] != 0 &amp;&amp;</div><div class='ctx'> 	    !sc6000_mpu_irq_to_softcfg(mpu_irq[dev])) {</div><div class='del'>-		printk(KERN_ERR PFX "invalid MPU-401 IRQ %d\n", mpu_irq[dev]);</div><div class='add'>+		dev_err(devptr, "invalid MPU-401 IRQ %d\n", mpu_irq[dev]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)</div><div class='add'>+static void snd_sc6000_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	char __iomem *vport = (char __force __iomem *)card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (vport)</div><div class='add'>+		sc6000_setup_board(card-&gt;dev, vport, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __snd_sc6000_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> {</div><div class='del'>-	static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };</div><div class='del'>-	static int possible_dmas[] = { 1, 3, 0, -1 };</div><div class='add'>+	static const int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };</div><div class='add'>+	static const int possible_dmas[] = { 1, 3, 0, -1 };</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int xirq = irq[dev];</div><div class='ctx'> 	int xdma = dma[dev];</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='del'>-	char __iomem **vport;</div><div class='add'>+	char __iomem *vport;</div><div class='ctx'> 	char __iomem *vmss_port;</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, sizeof(vport),</div><div class='del'>-				&amp;card);</div><div class='add'>+	err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	vport = card-&gt;private_data;</div><div class='ctx'> 	if (xirq == SNDRV_AUTO_IRQ) {</div><div class='ctx'> 		xirq = snd_legacy_find_free_irq(possible_irqs);</div><div class='ctx'> 		if (xirq &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto err_exit;</div><div class='add'>+			dev_err(devptr, "unable to find a free IRQ\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (xdma == SNDRV_AUTO_DMA) {</div><div class='ctx'> 		xdma = snd_legacy_find_free_dma(possible_dmas);</div><div class='ctx'> 		if (xdma &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR PFX "unable to find a free DMA\n");</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto err_exit;</div><div class='add'>+			dev_err(devptr, "unable to find a free DMA\n");</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!request_region(port[dev], 0x10, DRV_NAME)) {</div><div class='del'>-		snd_printk(KERN_ERR PFX</div><div class='del'>-			   "I/O port region is already in use.\n");</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto err_exit;</div><div class='add'>+	if (!devm_request_region(devptr, port[dev], 0x10, DRV_NAME)) {</div><div class='add'>+		dev_err(devptr, "I/O port region is already in use.\n");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	*vport = devm_ioport_map(devptr, port[dev], 0x10);</div><div class='del'>-	if (*vport == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR PFX</div><div class='del'>-			   "I/O port cannot be iomaped.\n");</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto err_unmap1;</div><div class='add'>+	vport = devm_ioport_map(devptr, port[dev], 0x10);</div><div class='add'>+	if (!vport) {</div><div class='add'>+		dev_err(devptr, "I/O port cannot be iomapped.\n");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+	card-&gt;private_data = (void __force *)vport;</div><div class='ctx'> </div><div class='ctx'> 	/* to make it marked as used */</div><div class='del'>-	if (!request_region(mss_port[dev], 4, DRV_NAME)) {</div><div class='del'>-		snd_printk(KERN_ERR PFX</div><div class='del'>-			   "SC-6000 port I/O port region is already in use.\n");</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto err_unmap1;</div><div class='add'>+	if (!devm_request_region(devptr, mss_port[dev], 4, DRV_NAME)) {</div><div class='add'>+		dev_err(devptr,</div><div class='add'>+			"SC-6000 port I/O port region is already in use.\n");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);</div><div class='ctx'> 	if (!vmss_port) {</div><div class='del'>-		snd_printk(KERN_ERR PFX</div><div class='del'>-			   "MSS port I/O cannot be iomaped.\n");</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		dev_err(devptr, "MSS port I/O cannot be iomapped.\n");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd("Initializing BASE[0x%lx] IRQ[%d] DMA[%d] MIRQ[%d]\n",</div><div class='del'>-		   port[dev], xirq, xdma,</div><div class='del'>-		   mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]);</div><div class='add'>+	dev_dbg(devptr, "Initializing BASE[0x%lx] IRQ[%d] DMA[%d] MIRQ[%d]\n",</div><div class='add'>+		port[dev], xirq, xdma,</div><div class='add'>+		mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]);</div><div class='ctx'> </div><div class='del'>-	err = sc6000_init_board(*vport, vmss_port, dev);</div><div class='add'>+	err = sc6000_init_board(devptr, vport, vmss_port, dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = snd_sc6000_free;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_wss_create(card, mss_port[dev] + 4,  -1, xirq, xdma, -1,</div><div class='ctx'> 			     WSS_HW_DETECT, 0, &amp;chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_pcm(chip, 0, NULL);</div><div class='add'>+	err = snd_wss_pcm(chip, 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX</div><div class='del'>-			   "error creating new WSS PCM device\n");</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		dev_err(devptr, "error creating new WSS PCM device\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_wss_mixer(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "error creating new WSS mixer\n");</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		dev_err(devptr, "error creating new WSS mixer\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_sc6000_mixer(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "the mixer rewrite failed\n");</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		dev_err(devptr, "the mixer rewrite failed\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_opl3_create(card,</div><div class='ctx'> 			    0x388, 0x388 + 2,</div><div class='ctx'> 			    OPL3_HW_AUTO, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "no OPL device at 0x%x-0x%x ?\n",</div><div class='del'>-			   0x388, 0x388 + 2);</div><div class='add'>+		dev_err(devptr, "no OPL device at 0x%x-0x%x ?\n",</div><div class='add'>+			0x388, 0x388 + 2);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto err_unmap2;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='hunk'>@@ -658,56 +647,32 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> 		if (snd_mpu401_uart_new(card, 0,</div><div class='ctx'> 					MPU401_HW_MPU401,</div><div class='ctx'> 					mpu_port[dev], 0,</div><div class='del'>-					mpu_irq[dev], IRQF_DISABLED,</div><div class='del'>-					NULL) &lt; 0)</div><div class='del'>-			snd_printk(KERN_ERR "no MPU-401 device at 0x%lx ?\n",</div><div class='del'>-					mpu_port[dev]);</div><div class='add'>+					mpu_irq[dev], NULL) &lt; 0)</div><div class='add'>+			dev_err(devptr, "no MPU-401 device at 0x%lx ?\n",</div><div class='add'>+				mpu_port[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, DRV_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, "SC-6000");</div><div class='add'>+	strscpy(card-&gt;driver, DRV_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, "SC-6000");</div><div class='ctx'> 	sprintf(card-&gt;longname, "Gallant SC-6000 at 0x%lx, irq %d, dma %d",</div><div class='ctx'> 		mss_port[dev], xirq, xdma);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, devptr);</div><div class='del'>-</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_unmap2;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(devptr, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_unmap2:</div><div class='del'>-	sc6000_setup_board(*vport, 0);</div><div class='del'>-	release_region(mss_port[dev], 4);</div><div class='del'>-err_unmap1:</div><div class='del'>-	release_region(port[dev], 0x10);</div><div class='del'>-err_exit:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev)</div><div class='add'>+static int snd_sc6000_probe(struct device *devptr, unsigned int dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = dev_get_drvdata(devptr);</div><div class='del'>-	char __iomem **vport = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (sc6000_setup_board(*vport, 0) &lt; 0)</div><div class='del'>-		snd_printk(KERN_WARNING "sc6000_setup_board failed on exit!\n");</div><div class='del'>-</div><div class='del'>-	release_region(port[dev], 0x10);</div><div class='del'>-	release_region(mss_port[dev], 4);</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_card_free_on_error(devptr, __snd_sc6000_probe(devptr, dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_sc6000_driver = {</div><div class='ctx'> 	.match		= snd_sc6000_match,</div><div class='ctx'> 	.probe		= snd_sc6000_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_sc6000_remove),</div><div class='ctx'> 	/* FIXME: suspend/resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DRV_NAME,</div><div class='hunk'>@@ -715,15 +680,4 @@ static struct isa_driver snd_sc6000_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_sc6000_init(void)</div><div class='del'>-{</div><div class='del'>-	return isa_register_driver(&amp;snd_sc6000_driver, SNDRV_CARDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_sc6000_exit(void)</div><div class='del'>-{</div><div class='del'>-	isa_unregister_driver(&amp;snd_sc6000_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_sc6000_init)</div><div class='del'>-module_exit(alsa_card_sc6000_exit)</div><div class='add'>+module_isa_driver(snd_sc6000_driver, SNDRV_CARDS);</div><div class='head'>diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c<br/>index e2d5d2d3ed96..a31ca75774a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/sscape.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/sscape.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/sscape.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/sscape.c</a></div><div class='hunk'>@@ -1,34 +1,21 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Low-level ALSA driver for the ENSONIQ SoundScape</div><div class='ctx'>  *   Copyright (c) by Chris Rankin</div><div class='ctx'>  *</div><div class='ctx'>  *   This driver was written in part using information obtained from</div><div class='ctx'>  *   the OSS/Free SoundScape driver, written by Hannu Savolainen.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='hunk'>@@ -62,22 +49,22 @@ MODULE_PARM_DESC(index, "Index number for SoundScape soundcard");</div><div class='ctx'> module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "Description for SoundScape card");</div><div class='ctx'> </div><div class='del'>-module_param_array(port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(port, "Port # for SoundScape driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(wss_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(wss_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(wss_port, "WSS Port # for SoundScape driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(irq, "IRQ # for SoundScape driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_irq, "MPU401 IRQ # for SoundScape driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(dma, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma, "DMA # for SoundScape driver.");</div><div class='ctx'> </div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for SoundScape driver.");</div><div class='ctx'> </div><div class='ctx'> module_param_array(joystick, bool, NULL, 0444);</div><div class='hunk'>@@ -87,7 +74,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport.");</div><div class='ctx'> static int isa_registered;</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id sscape_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id sscape_pnpids[] = {</div><div class='ctx'> 	{ .id = "ENS3081", .devs = { { "ENS0000" } } }, /* Soundscape PnP */</div><div class='ctx'> 	{ .id = "ENS4081", .devs = { { "ENS1011" } } },	/* VIVO90 */</div><div class='ctx'> 	{ .id = "" }	/* end */</div><div class='hunk'>@@ -151,6 +138,7 @@ struct soundscape {</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char midi_vol;</div><div class='add'>+	struct device *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define INVALID_IRQ  ((unsigned)-1)</div><div class='hunk'>@@ -166,16 +154,17 @@ static inline struct soundscape *get_card_soundscape(struct snd_card *c)</div><div class='ctx'>  * I think this means that the memory has to map to</div><div class='ctx'>  * contiguous pages of physical memory.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_dma_buffer *get_dmabuf(struct snd_dma_buffer *buf,</div><div class='add'>+static struct snd_dma_buffer *get_dmabuf(struct soundscape *s,</div><div class='add'>+					 struct snd_dma_buffer *buf,</div><div class='ctx'> 					 unsigned long size)</div><div class='ctx'> {</div><div class='ctx'> 	if (buf) {</div><div class='ctx'> 		if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						 snd_dma_isa_data(),</div><div class='add'>+						 s-&gt;chip-&gt;card-&gt;dev,</div><div class='ctx'> 						 size, buf) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "sscape: Failed to allocate "</div><div class='del'>-					    "%lu bytes for DMA\n",</div><div class='del'>-					    size);</div><div class='add'>+			dev_err(s-&gt;dev,</div><div class='add'>+				"sscape: Failed to allocate %lu bytes for DMA\n",</div><div class='add'>+				size);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -211,11 +200,8 @@ static inline void sscape_write_unsafe(unsigned io_base, enum GA_REG reg,</div><div class='ctx'> static void sscape_write(struct soundscape *s, enum GA_REG reg,</div><div class='ctx'> 			 unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;s-&gt;lock);</div><div class='ctx'> 	sscape_write_unsafe(s-&gt;io_base, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -320,7 +306,7 @@ static inline int verify_mpu401(const struct snd_mpu401 *mpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * This is apparently the standard way to initailise an MPU-401</div><div class='add'>+ * This is apparently the standard way to initialise an MPU-401</div><div class='ctx'>  */</div><div class='ctx'> static inline void initialise_mpu401(const struct snd_mpu401 *mpu)</div><div class='ctx'> {</div><div class='hunk'>@@ -340,18 +326,7 @@ static void activate_ad1845_unsafe(unsigned io_base)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Do the necessary ALSA-level cleanup to deallocate our driver ...</div><div class='del'>- */</div><div class='del'>-static void soundscape_free(struct snd_card *c)</div><div class='del'>-{</div><div class='del'>-	struct soundscape *sscape = get_card_soundscape(c);</div><div class='del'>-	release_and_free_resource(sscape-&gt;io_res);</div><div class='del'>-	release_and_free_resource(sscape-&gt;wss_res);</div><div class='del'>-	free_dma(sscape-&gt;chip-&gt;dma1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Tell the SoundScape to begin a DMA tranfer using the given channel.</div><div class='add'>+ * Tell the SoundScape to begin a DMA transfer using the given channel.</div><div class='ctx'>  * All locking issues are left to the caller.</div><div class='ctx'>  */</div><div class='ctx'> static void sscape_start_dma_unsafe(unsigned io_base, enum GA_REG reg)</div><div class='hunk'>@@ -389,12 +364,11 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)</div><div class='ctx'> 	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		unsigned long flags;</div><div class='ctx'> 		int x;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		x = host_read_unsafe(s-&gt;io_base);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;s-&gt;lock) {</div><div class='add'>+			x = host_read_unsafe(s-&gt;io_base);</div><div class='add'>+		}</div><div class='ctx'> 		if (x == 0xfe || x == 0xff)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -416,12 +390,11 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)</div><div class='ctx'> 	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		unsigned long flags;</div><div class='ctx'> 		int x;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		x = host_read_unsafe(s-&gt;io_base);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;s-&gt;lock) {</div><div class='add'>+			x = host_read_unsafe(s-&gt;io_base);</div><div class='add'>+		}</div><div class='ctx'> 		if (x == 0xfe)</div><div class='ctx'> 			return 1;</div><div class='ctx'> </div><div class='hunk'>@@ -437,71 +410,64 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)</div><div class='ctx'> static int upload_dma_data(struct soundscape *s, const unsigned char *data,</div><div class='ctx'> 			   size_t size)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_dma_buffer dma;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	if (!get_dmabuf(&amp;dma, PAGE_ALIGN(32 * 1024)))</div><div class='add'>+	if (!get_dmabuf(s, &amp;dma, PAGE_ALIGN(32 * 1024)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset the board ...</div><div class='del'>-	 */</div><div class='del'>-	val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='del'>-	sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val &amp; 0x3f);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;s-&gt;lock) {</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Enable the DMA channels and configure them ...</div><div class='del'>-	 */</div><div class='del'>-	val = (s-&gt;chip-&gt;dma1 &lt;&lt; 4) | DMA_8BIT;</div><div class='del'>-	sscape_write_unsafe(s-&gt;io_base, GA_DMAA_REG, val);</div><div class='del'>-	sscape_write_unsafe(s-&gt;io_base, GA_DMAB_REG, 0x20);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Take the board out of reset ...</div><div class='del'>-	 */</div><div class='del'>-	val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='del'>-	sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val | 0x80);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Upload the firmware to the SoundScape</div><div class='del'>-	 * board through the DMA channel ...</div><div class='del'>-	 */</div><div class='del'>-	while (size != 0) {</div><div class='del'>-		unsigned long len;</div><div class='add'>+		/*</div><div class='add'>+		 * Reset the board ...</div><div class='add'>+		 */</div><div class='add'>+		val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='add'>+		sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val &amp; 0x3f);</div><div class='ctx'> </div><div class='del'>-		len = min(size, dma.bytes);</div><div class='del'>-		memcpy(dma.area, data, len);</div><div class='del'>-		data += len;</div><div class='del'>-		size -= len;</div><div class='add'>+		/*</div><div class='add'>+		 * Enable the DMA channels and configure them ...</div><div class='add'>+		 */</div><div class='add'>+		val = (s-&gt;chip-&gt;dma1 &lt;&lt; 4) | DMA_8BIT;</div><div class='add'>+		sscape_write_unsafe(s-&gt;io_base, GA_DMAA_REG, val);</div><div class='add'>+		sscape_write_unsafe(s-&gt;io_base, GA_DMAB_REG, 0x20);</div><div class='ctx'> </div><div class='del'>-		snd_dma_program(s-&gt;chip-&gt;dma1, dma.addr, len, DMA_MODE_WRITE);</div><div class='del'>-		sscape_start_dma_unsafe(s-&gt;io_base, GA_DMAA_REG);</div><div class='del'>-		if (!sscape_wait_dma_unsafe(s-&gt;io_base, GA_DMAA_REG, 5000)) {</div><div class='del'>-			/*</div><div class='del'>-			 * Don't forget to release this spinlock we're holding</div><div class='del'>-			 */</div><div class='del'>-			spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='add'>+		/*</div><div class='add'>+		 * Take the board out of reset ...</div><div class='add'>+		 */</div><div class='add'>+		val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='add'>+		sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val | 0x80);</div><div class='ctx'> </div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-					"sscape: DMA upload has timed out\n");</div><div class='del'>-			ret = -EAGAIN;</div><div class='del'>-			goto _release_dma;</div><div class='del'>-		}</div><div class='del'>-	} /* while */</div><div class='add'>+		/*</div><div class='add'>+		 * Upload the firmware to the SoundScape</div><div class='add'>+		 * board through the DMA channel ...</div><div class='add'>+		 */</div><div class='add'>+		while (size != 0) {</div><div class='add'>+			unsigned long len;</div><div class='add'>+</div><div class='add'>+			len = min(size, dma.bytes);</div><div class='add'>+			memcpy(dma.area, data, len);</div><div class='add'>+			data += len;</div><div class='add'>+			size -= len;</div><div class='add'>+</div><div class='add'>+			snd_dma_program(s-&gt;chip-&gt;dma1, dma.addr, len, DMA_MODE_WRITE);</div><div class='add'>+			sscape_start_dma_unsafe(s-&gt;io_base, GA_DMAA_REG);</div><div class='add'>+			if (!sscape_wait_dma_unsafe(s-&gt;io_base, GA_DMAA_REG, 5000)) {</div><div class='add'>+				dev_err(s-&gt;dev, "sscape: DMA upload has timed out\n");</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+				goto _release_dma;</div><div class='add'>+			}</div><div class='add'>+		} /* while */</div><div class='ctx'> </div><div class='del'>-	set_host_mode_unsafe(s-&gt;io_base);</div><div class='del'>-	outb(0x0, s-&gt;io_base);</div><div class='add'>+		set_host_mode_unsafe(s-&gt;io_base);</div><div class='add'>+		outb(0x0, s-&gt;io_base);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Boot the board ... (I think)</div><div class='del'>-	 */</div><div class='del'>-	val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='del'>-	sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val | 0x40);</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='add'>+		/*</div><div class='add'>+		 * Boot the board ... (I think)</div><div class='add'>+		 */</div><div class='add'>+		val = sscape_read_unsafe(s-&gt;io_base, GA_HMCTL_REG);</div><div class='add'>+		sscape_write_unsafe(s-&gt;io_base, GA_HMCTL_REG, val | 0x40);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * If all has gone well, then the board should acknowledge</div><div class='hunk'>@@ -510,12 +476,11 @@ static int upload_dma_data(struct soundscape *s, const unsigned char *data,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = 0;</div><div class='ctx'> 	if (!obp_startup_ack(s, 5000)) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: No response "</div><div class='del'>-				    "from on-board processor after upload\n");</div><div class='add'>+		dev_err(s-&gt;dev,</div><div class='add'>+			"sscape: No response from on-board processor after upload\n");</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='ctx'> 	} else if (!host_startup_ack(s, 5000)) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-				"sscape: SoundScape failed to initialise\n");</div><div class='add'>+		dev_err(s-&gt;dev, "sscape: SoundScape failed to initialise\n");</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -537,33 +502,30 @@ _release_dma:</div><div class='ctx'> static int sscape_upload_bootblock(struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct soundscape *sscape = get_card_soundscape(card);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	const struct firmware *init_fw = NULL;</div><div class='ctx'> 	int data = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_firmware(&amp;init_fw, "scope.cod", card-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Error loading scope.cod");</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: Error loading scope.cod");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = upload_dma_data(sscape, init_fw-&gt;data, init_fw-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	release_firmware(init_fw);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;sscape-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;sscape-&gt;lock);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		data = host_read_ctrl_unsafe(sscape-&gt;io_base, 100);</div><div class='ctx'> </div><div class='ctx'> 	if (data &amp; 0x10)</div><div class='ctx'> 		sscape_write_unsafe(sscape-&gt;io_base, GA_SMCFGA_REG, 0x2f);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;sscape-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	data &amp;= 0xf;</div><div class='ctx'> 	if (ret == 0 &amp;&amp; data &gt; 7) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-				"sscape: timeout reading firmware version\n");</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"sscape: timeout reading firmware version\n");</div><div class='ctx'> 		ret = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -580,18 +542,18 @@ static int sscape_upload_microcode(struct snd_card *card, int version)</div><div class='ctx'> 	char name[14];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snprintf(name, sizeof(name), "sndscape.co%d", version);</div><div class='add'>+	scnprintf(name, sizeof(name), "sndscape.co%d", version);</div><div class='ctx'> </div><div class='ctx'> 	err = request_firmware(&amp;init_fw, name, card-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Error loading sndscape.co%d",</div><div class='del'>-				version);</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: Error loading sndscape.co%d",</div><div class='add'>+			version);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = upload_dma_data(sscape, init_fw-&gt;data, init_fw-&gt;size);</div><div class='ctx'> 	if (err == 0)</div><div class='del'>-		snd_printk(KERN_INFO "sscape: MIDI firmware loaded %d KBs\n",</div><div class='del'>-				init_fw-&gt;size &gt;&gt; 10);</div><div class='add'>+		dev_info(card-&gt;dev, "sscape: MIDI firmware loaded %zu KBs\n",</div><div class='add'>+			 init_fw-&gt;size &gt;&gt; 10);</div><div class='ctx'> </div><div class='ctx'> 	release_firmware(init_fw);</div><div class='ctx'> </div><div class='hunk'>@@ -617,11 +579,9 @@ static int sscape_midi_get(struct snd_kcontrol *kctl,</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kctl);</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	register struct soundscape *s = get_card_soundscape(card);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;s-&gt;lock);</div><div class='ctx'> 	uctl-&gt;value.integer.value[0] = s-&gt;midi_vol;</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -631,11 +591,10 @@ static int sscape_midi_put(struct snd_kcontrol *kctl,</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kctl);</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct soundscape *s = get_card_soundscape(card);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned char new_val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;s-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	new_val = uctl-&gt;value.integer.value[0] &amp; 127;</div><div class='ctx'> 	/*</div><div class='hunk'>@@ -666,11 +625,10 @@ __skip_change:</div><div class='ctx'> 	 */</div><div class='ctx'> 	set_midi_mode_unsafe(s-&gt;io_base);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new midi_mixer_ctl = {</div><div class='add'>+static const struct snd_kcontrol_new midi_mixer_ctl = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "MIDI",</div><div class='ctx'> 	.info = sscape_midi_info,</div><div class='hunk'>@@ -683,7 +641,7 @@ static struct snd_kcontrol_new midi_mixer_ctl = {</div><div class='ctx'>  * These IRQs are encoded as bit patterns so that they can be</div><div class='ctx'>  * written to the control registers.</div><div class='ctx'>  */</div><div class='del'>-static unsigned __devinit get_irq_config(int sscape_type, int irq)</div><div class='add'>+static unsigned get_irq_config(int sscape_type, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	static const int valid_irq[] = { 9, 5, 7, 10 };</div><div class='ctx'> 	static const int old_irq[] = { 9, 7, 5, 15 };</div><div class='hunk'>@@ -706,7 +664,7 @@ static unsigned __devinit get_irq_config(int sscape_type, int irq)</div><div class='ctx'>  * Perform certain arcane port-checks to see whether there</div><div class='ctx'>  * is a SoundScape board lurking behind the given ports.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit detect_sscape(struct soundscape *s, long wss_io)</div><div class='add'>+static int detect_sscape(struct soundscape *s, long wss_io)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned d;</div><div class='hunk'>@@ -806,8 +764,8 @@ _done:</div><div class='ctx'> static int mpu401_open(struct snd_mpu401 *mpu)</div><div class='ctx'> {</div><div class='ctx'> 	if (!verify_mpu401(mpu)) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: MIDI disabled, "</div><div class='del'>-				    "please load firmware\n");</div><div class='add'>+		dev_err(mpu-&gt;rmidi-&gt;card-&gt;dev,</div><div class='add'>+			"sscape: MIDI disabled, please load firmware\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -815,18 +773,17 @@ static int mpu401_open(struct snd_mpu401 *mpu)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Initialse an MPU-401 subdevice for MIDI support on the SoundScape.</div><div class='add'>+ * Initialise an MPU-401 subdevice for MIDI support on the SoundScape.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit create_mpu401(struct snd_card *card, int devnum,</div><div class='del'>-				   unsigned long port, int irq)</div><div class='add'>+static int create_mpu401(struct snd_card *card, int devnum,</div><div class='add'>+			 unsigned long port, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct soundscape *sscape = get_card_soundscape(card);</div><div class='ctx'> 	struct snd_rawmidi *rawmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_mpu401_uart_new(card, devnum, MPU401_HW_MPU401, port,</div><div class='del'>-				  MPU401_INFO_INTEGRATED, irq, IRQF_DISABLED,</div><div class='del'>-				  &amp;rawmidi);</div><div class='add'>+				  MPU401_INFO_INTEGRATED, irq, &amp;rawmidi);</div><div class='ctx'> 	if (err == 0) {</div><div class='ctx'> 		struct snd_mpu401 *mpu = rawmidi-&gt;private_data;</div><div class='ctx'> 		mpu-&gt;open_input = mpu401_open;</div><div class='hunk'>@@ -846,8 +803,8 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum,</div><div class='ctx'>  * try to support at least some of the extra bits by overriding</div><div class='ctx'>  * some of the CS4231 callback.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit create_ad1845(struct snd_card *card, unsigned port,</div><div class='del'>-				   int irq, int dma1, int dma2)</div><div class='add'>+static int create_ad1845(struct snd_card *card, unsigned port,</div><div class='add'>+			 int irq, int dma1, int dma2)</div><div class='ctx'> {</div><div class='ctx'> 	register struct soundscape *sscape = get_card_soundscape(card);</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='hunk'>@@ -877,9 +834,6 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port,</div><div class='ctx'> 	err = snd_wss_create(card, port, -1, irq, dma1, dma2,</div><div class='ctx'> 			     codec_type, WSS_HWSHARE_DMA1, &amp;chip);</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		struct snd_pcm *pcm;</div><div class='del'>-</div><div class='ctx'> 		if (sscape-&gt;type != SSCAPE_VIVO) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * The input clock frequency on the SoundScape must</div><div class='hunk'>@@ -887,31 +841,31 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port,</div><div class='ctx'> 			 * to get the playback to sound correct ...</div><div class='ctx'> 			 */</div><div class='ctx'> 			snd_wss_mce_up(chip);</div><div class='del'>-			spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-			snd_wss_out(chip, AD1845_CLOCK, 0x20);</div><div class='del'>-			spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+			scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+				snd_wss_out(chip, AD1845_CLOCK, 0x20);</div><div class='add'>+			}</div><div class='ctx'> 			snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = snd_wss_pcm(chip, 0, &amp;pcm);</div><div class='add'>+		err = snd_wss_pcm(chip, 0);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "sscape: No PCM device "</div><div class='del'>-					    "for AD1845 chip\n");</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"sscape: No PCM device for AD1845 chip\n");</div><div class='ctx'> 			goto _error;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = snd_wss_mixer(chip);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "sscape: No mixer device "</div><div class='del'>-					    "for AD1845 chip\n");</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"sscape: No mixer device for AD1845 chip\n");</div><div class='ctx'> 			goto _error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (chip-&gt;hardware != WSS_HW_AD1848) {</div><div class='del'>-			err = snd_wss_timer(chip, 0, NULL);</div><div class='add'>+			err = snd_wss_timer(chip, 0);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "sscape: No timer device "</div><div class='del'>-						    "for AD1845 chip\n");</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"sscape: No timer device for AD1845 chip\n");</div><div class='ctx'> 				goto _error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -920,8 +874,8 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port,</div><div class='ctx'> 			err = snd_ctl_add(card,</div><div class='ctx'> 					  snd_ctl_new1(&amp;midi_mixer_ctl, chip));</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "sscape: Could not create "</div><div class='del'>-						    "MIDI mixer control\n");</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"sscape: Could not create MIDI mixer control\n");</div><div class='ctx'> 				goto _error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -938,7 +892,7 @@ _error:</div><div class='ctx'>  * Create an ALSA soundcard entry for the SoundScape, using</div><div class='ctx'>  * the given list of port, IRQ and DMA resources.</div><div class='ctx'>  */</div><div class='del'>-static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='add'>+static int create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	struct soundscape *sscape = get_card_soundscape(card);</div><div class='ctx'> 	unsigned dma_cfg;</div><div class='hunk'>@@ -946,7 +900,6 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 	unsigned mpu_irq_cfg;</div><div class='ctx'> 	struct resource *io_res;</div><div class='ctx'> 	struct resource *wss_res;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int val;</div><div class='ctx'> 	const char *name;</div><div class='hunk'>@@ -955,30 +908,30 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 	 * Grab IO ports that we will need to probe so that we</div><div class='ctx'> 	 * can detect and control this hardware ...</div><div class='ctx'> 	 */</div><div class='del'>-	io_res = request_region(port[dev], 8, "SoundScape");</div><div class='add'>+	io_res = devm_request_region(card-&gt;dev, port[dev], 8, "SoundScape");</div><div class='ctx'> 	if (!io_res) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "sscape: can't grab port 0x%lx\n", port[dev]);</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"sscape: can't grab port 0x%lx\n", port[dev]);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	wss_res = NULL;</div><div class='ctx'> 	if (sscape-&gt;type == SSCAPE_VIVO) {</div><div class='del'>-		wss_res = request_region(wss_port[dev], 4, "SoundScape");</div><div class='add'>+		wss_res = devm_request_region(card-&gt;dev, wss_port[dev], 4,</div><div class='add'>+					      "SoundScape");</div><div class='ctx'> 		if (!wss_res) {</div><div class='del'>-			snd_printk(KERN_ERR "sscape: can't grab port 0x%lx\n",</div><div class='del'>-					    wss_port[dev]);</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto _release_region;</div><div class='add'>+			dev_err(card-&gt;dev, "sscape: can't grab port 0x%lx\n",</div><div class='add'>+				wss_port[dev]);</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Grab one DMA channel ...</div><div class='ctx'> 	 */</div><div class='del'>-	err = request_dma(dma[dev], "SoundScape");</div><div class='add'>+	err = snd_devm_request_dma(card-&gt;dev, dma[dev], "SoundScape");</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: can't grab DMA %d\n", dma[dev]);</div><div class='del'>-		goto _release_region;</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: can't grab DMA %d\n", dma[dev]);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;sscape-&gt;lock);</div><div class='hunk'>@@ -987,10 +940,9 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 	sscape-&gt;io_base = port[dev];</div><div class='ctx'> </div><div class='ctx'> 	if (!detect_sscape(sscape, wss_port[dev])) {</div><div class='del'>-		printk(KERN_ERR "sscape: hardware not detected at 0x%x\n",</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: hardware not detected at 0x%x\n",</div><div class='ctx'> 			sscape-&gt;io_base);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto _release_dma;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (sscape-&gt;type) {</div><div class='hunk'>@@ -1011,21 +963,21 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "sscape: %s card detected at 0x%x, using IRQ %d, DMA %d\n",</div><div class='del'>-			 name, sscape-&gt;io_base, irq[dev], dma[dev]);</div><div class='add'>+	dev_info(card-&gt;dev, "sscape: %s card detected at 0x%x, using IRQ %d, DMA %d\n",</div><div class='add'>+		 name, sscape-&gt;io_base, irq[dev], dma[dev]);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Check that the user didn't pass us garbage data ...</div><div class='ctx'> 	 */</div><div class='ctx'> 	irq_cfg = get_irq_config(sscape-&gt;type, irq[dev]);</div><div class='ctx'> 	if (irq_cfg == INVALID_IRQ) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", irq[dev]);</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: Invalid IRQ %d\n", irq[dev]);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mpu_irq_cfg = get_irq_config(sscape-&gt;type, mpu_irq[dev]);</div><div class='ctx'> 	if (mpu_irq_cfg == INVALID_IRQ) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]);</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: Invalid IRQ %d\n", mpu_irq[dev]);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1033,34 +985,34 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 	 * Tell the on-board devices where their resources are (I think -</div><div class='ctx'> 	 * I can't be sure without a datasheet ... So many magic values!)</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;sscape-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;sscape-&gt;lock) {</div><div class='ctx'> </div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_SMCFGA_REG, 0x2e);</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_SMCFGB_REG, 0x00);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_SMCFGA_REG, 0x2e);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_SMCFGB_REG, 0x00);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Enable and configure the DMA channels ...</div><div class='del'>-	 */</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_DMACFG_REG, 0x50);</div><div class='del'>-	dma_cfg = (sscape-&gt;ic_type == IC_OPUS ? 0x40 : 0x70);</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_DMAA_REG, dma_cfg);</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_DMAB_REG, 0x20);</div><div class='del'>-</div><div class='del'>-	mpu_irq_cfg |= mpu_irq_cfg &lt;&lt; 2;</div><div class='del'>-	val = sscape_read_unsafe(sscape-&gt;io_base, GA_HMCTL_REG) &amp; 0xF7;</div><div class='del'>-	if (joystick[dev])</div><div class='del'>-		val |= 8;</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_HMCTL_REG, val | 0x10);</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_INTCFG_REG, 0xf0 | mpu_irq_cfg);</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base,</div><div class='del'>-			    GA_CDCFG_REG, 0x09 | DMA_8BIT</div><div class='del'>-			    | (dma[dev] &lt;&lt; 4) | (irq_cfg &lt;&lt; 1));</div><div class='del'>-	/*</div><div class='del'>-	 * Enable the master IRQ ...</div><div class='del'>-	 */</div><div class='del'>-	sscape_write_unsafe(sscape-&gt;io_base, GA_INTENA_REG, 0x80);</div><div class='add'>+		/*</div><div class='add'>+		 * Enable and configure the DMA channels ...</div><div class='add'>+		 */</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_DMACFG_REG, 0x50);</div><div class='add'>+		dma_cfg = (sscape-&gt;ic_type == IC_OPUS ? 0x40 : 0x70);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_DMAA_REG, dma_cfg);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_DMAB_REG, 0x20);</div><div class='add'>+</div><div class='add'>+		mpu_irq_cfg |= mpu_irq_cfg &lt;&lt; 2;</div><div class='add'>+		val = sscape_read_unsafe(sscape-&gt;io_base, GA_HMCTL_REG) &amp; 0xF7;</div><div class='add'>+		if (joystick[dev])</div><div class='add'>+			val |= 8;</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_HMCTL_REG, val | 0x10);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_INTCFG_REG, 0xf0 | mpu_irq_cfg);</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base,</div><div class='add'>+				    GA_CDCFG_REG, 0x09 | DMA_8BIT</div><div class='add'>+				    | (dma[dev] &lt;&lt; 4) | (irq_cfg &lt;&lt; 1));</div><div class='add'>+		/*</div><div class='add'>+		 * Enable the master IRQ ...</div><div class='add'>+		 */</div><div class='add'>+		sscape_write_unsafe(sscape-&gt;io_base, GA_INTENA_REG, 0x80);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;sscape-&gt;lock, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have now enabled the codec chip, and so we should</div><div class='hunk'>@@ -1069,13 +1021,13 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 	err = create_ad1845(card, wss_port[dev], irq[dev],</div><div class='ctx'> 			    dma[dev], dma2[dev]);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-				"sscape: No AD1845 device at 0x%lx, IRQ %d\n",</div><div class='del'>-				wss_port[dev], irq[dev]);</div><div class='del'>-		goto _release_dma;</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"sscape: No AD1845 device at 0x%lx, IRQ %d\n",</div><div class='add'>+			wss_port[dev], irq[dev]);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;driver, "SoundScape");</div><div class='del'>-	strcpy(card-&gt;shortname, name);</div><div class='add'>+	strscpy(card-&gt;driver, "SoundScape");</div><div class='add'>+	strscpy(card-&gt;shortname, name);</div><div class='ctx'> 	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='ctx'> 		 "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %d\n",</div><div class='ctx'> 		 name, sscape-&gt;chip-&gt;port, sscape-&gt;chip-&gt;irq,</div><div class='hunk'>@@ -1091,16 +1043,16 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 			err = create_mpu401(card, MIDI_DEVNUM, port[dev],</div><div class='ctx'> 					    mpu_irq[dev]);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='del'>-				snd_printk(KERN_ERR "sscape: Failed to create "</div><div class='del'>-						"MPU-401 device at 0x%lx\n",</div><div class='del'>-						port[dev]);</div><div class='del'>-				goto _release_dma;</div><div class='add'>+				dev_err(card-&gt;dev,</div><div class='add'>+					"sscape: Failed to create MPU-401 device at 0x%lx\n",</div><div class='add'>+					port[dev]);</div><div class='add'>+				return err;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Initialize mixer</div><div class='ctx'> 			 */</div><div class='del'>-			spin_lock_irqsave(&amp;sscape-&gt;lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;sscape-&gt;lock);</div><div class='ctx'> 			sscape-&gt;midi_vol = 0;</div><div class='ctx'> 			host_write_ctrl_unsafe(sscape-&gt;io_base,</div><div class='ctx'> 						CMD_SET_MIDI_VOL, 100);</div><div class='hunk'>@@ -1117,32 +1069,14 @@ static int __devinit create_sscape(int dev, struct snd_card *card)</div><div class='ctx'> 			host_write_ctrl_unsafe(sscape-&gt;io_base, CMD_ACK, 100);</div><div class='ctx'> </div><div class='ctx'> 			set_midi_mode_unsafe(sscape-&gt;io_base);</div><div class='del'>-			spin_unlock_irqrestore(&amp;sscape-&gt;lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Now that we have successfully created this sound card,</div><div class='del'>-	 * it is safe to store the pointer.</div><div class='del'>-	 * NOTE: we only register the sound card's "destructor"</div><div class='del'>-	 *       function now that our "constructor" has completed.</div><div class='del'>-	 */</div><div class='del'>-	card-&gt;private_free = soundscape_free;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-_release_dma:</div><div class='del'>-	free_dma(dma[dev]);</div><div class='del'>-</div><div class='del'>-_release_region:</div><div class='del'>-	release_and_free_resource(wss_res);</div><div class='del'>-	release_and_free_resource(io_res);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)</div><div class='add'>+static int snd_sscape_match(struct device *pdev, unsigned int i)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure we were given ALL of the other parameters.</div><div class='hunk'>@@ -1153,54 +1087,42 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)</div><div class='ctx'> 	if (irq[i] == SNDRV_AUTO_IRQ ||</div><div class='ctx'> 	    mpu_irq[i] == SNDRV_AUTO_IRQ ||</div><div class='ctx'> 	    dma[i] == SNDRV_AUTO_DMA) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "sscape: insufficient parameters, "</div><div class='del'>-		       "need IO, IRQ, MPU-IRQ and DMA\n");</div><div class='add'>+		dev_info(pdev,</div><div class='add'>+			 "sscape: insufficient parameters, need IO, IRQ, MPU-IRQ and DMA\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev)</div><div class='add'>+static int snd_sscape_probe(struct device *pdev, unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct soundscape *sscape;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(struct soundscape), &amp;card);</div><div class='add'>+	ret = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct soundscape), &amp;card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	sscape = get_card_soundscape(card);</div><div class='add'>+	sscape-&gt;dev = pdev;</div><div class='ctx'> 	sscape-&gt;type = SSCAPE;</div><div class='ctx'> </div><div class='ctx'> 	dma[dev] &amp;= 0x03;</div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='ctx'> </div><div class='ctx'> 	ret = create_sscape(dev, card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto _release_card;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_card_register(card);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Failed to register sound card\n");</div><div class='del'>-		goto _release_card;</div><div class='add'>+		dev_err(pdev, "sscape: Failed to register sound card\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-_release_card:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DEV_NAME "sscape"</div><div class='hunk'>@@ -1208,7 +1130,6 @@ static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)</div><div class='ctx'> static struct isa_driver snd_sscape_driver = {</div><div class='ctx'> 	.match		= snd_sscape_match,</div><div class='ctx'> 	.probe		= snd_sscape_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_sscape_remove),</div><div class='ctx'> 	/* FIXME: suspend/resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='hunk'>@@ -1216,7 +1137,7 @@ static struct isa_driver snd_sscape_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static inline int __devinit get_next_autoindex(int i)</div><div class='add'>+static inline int get_next_autoindex(int i)</div><div class='ctx'> {</div><div class='ctx'> 	while (i &lt; SNDRV_CARDS &amp;&amp; port[i] != SNDRV_AUTO_PORT)</div><div class='ctx'> 		++i;</div><div class='hunk'>@@ -1224,8 +1145,8 @@ static inline int __devinit get_next_autoindex(int i)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-				       const struct pnp_card_device_id *pid)</div><div class='add'>+static int sscape_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+			     const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int idx = 0;</div><div class='ctx'> 	struct pnp_dev *dev;</div><div class='hunk'>@@ -1250,7 +1171,7 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> </div><div class='ctx'> 	if (!pnp_is_active(dev)) {</div><div class='ctx'> 		if (pnp_activate_dev(dev) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_INFO "sscape: device is inactive\n");</div><div class='add'>+			dev_info(&amp;dev-&gt;dev, "sscape: device is inactive\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1259,12 +1180,14 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	 * Create a new ALSA sound card entry, in anticipation</div><div class='ctx'> 	 * of detecting our hardware ...</div><div class='ctx'> 	 */</div><div class='del'>-	ret = snd_card_create(index[idx], id[idx], THIS_MODULE,</div><div class='del'>-			      sizeof(struct soundscape), &amp;card);</div><div class='add'>+	ret = snd_devm_card_new(&amp;pcard-&gt;card-&gt;dev,</div><div class='add'>+				index[idx], id[idx], THIS_MODULE,</div><div class='add'>+				sizeof(struct soundscape), &amp;card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	sscape = get_card_soundscape(card);</div><div class='add'>+	sscape-&gt;dev = card-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Identify card model ...</div><div class='hunk'>@@ -1288,31 +1211,20 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 		wss_port[idx] = pnp_port_start(dev, 1);</div><div class='ctx'> 		dma2[idx] = pnp_dma(dev, 1);</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = create_sscape(idx, card);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto _release_card;</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = snd_card_register(card);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "sscape: Failed to register sound card\n");</div><div class='del'>-		goto _release_card;</div><div class='add'>+		dev_err(card-&gt;dev, "sscape: Failed to register sound card\n");</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='ctx'> 	++idx;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-_release_card:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit sscape_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pnp_card_driver sscape_pnpc_driver = {</div><div class='hunk'>@@ -1320,7 +1232,6 @@ static struct pnp_card_driver sscape_pnpc_driver = {</div><div class='ctx'> 	.name = "sscape",</div><div class='ctx'> 	.id_table = sscape_pnpids,</div><div class='ctx'> 	.probe = sscape_pnp_detect,</div><div class='del'>-	.remove = __devexit_p(sscape_pnp_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_PNP */</div><div class='head'>diff --git a/sound/isa/wavefront/Makefile b/sound/isa/wavefront/Makefile<br/>index 601bdddd44d0..3ba85fb2e6cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wavefront/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o</div><div class='add'>+snd-wavefront-y := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_WAVEFRONT) += snd-wavefront.o</div><div class='head'>diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c<br/>index 711670e4a425..07c68568091d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wavefront/wavefront.c</a></div><div class='hunk'>@@ -1,22 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA card-level driver for Turtle Beach Wavefront cards </div><div class='ctx'>  *						(Maui,Tropez,Tropez+)</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (c) 1997-1999 by Paul Barton-Davis &lt;pbd@op.net&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -24,7 +11,7 @@</div><div class='ctx'> #include &lt;linux/err.h&gt;</div><div class='ctx'> #include &lt;linux/isa.h&gt;</div><div class='ctx'> #include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='hunk'>@@ -34,13 +21,12 @@</div><div class='ctx'> MODULE_AUTHOR("Paul Barton-Davis &lt;pbd@op.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Turtle Beach Wavefront");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Turtle Beach,Maui/Tropez/Tropez+}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	    /* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	    /* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	    /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;	    /* Enable this card */</div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> #endif</div><div class='ctx'> static long cs4232_pcm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* PnP setup */</div><div class='ctx'> static int cs4232_pcm_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15 */</div><div class='hunk'>@@ -51,7 +37,7 @@ static int ics2115_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;    /* 2,9,11,12,15 */</div><div class='ctx'> static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	    /* PnP setup */</div><div class='ctx'> static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	    /* 0,1,3,5,6,7 */</div><div class='ctx'> static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;	    /* 0,1,3,5,6,7 */</div><div class='del'>-static int use_cs4232_midi[SNDRV_CARDS];</div><div class='add'>+static bool use_cs4232_midi[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for WaveFront soundcard.");</div><div class='hunk'>@@ -63,23 +49,23 @@ MODULE_PARM_DESC(enable, "Enable WaveFront soundcard.");</div><div class='ctx'> module_param_array(isapnp, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(isapnp, "ISA PnP detection for WaveFront soundcards.");</div><div class='ctx'> #endif</div><div class='del'>-module_param_array(cs4232_pcm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(cs4232_pcm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(cs4232_pcm_port, "Port # for CS4232 PCM interface.");</div><div class='del'>-module_param_array(cs4232_pcm_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(cs4232_pcm_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(cs4232_pcm_irq, "IRQ # for CS4232 PCM interface.");</div><div class='del'>-module_param_array(dma1, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma1, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma1, "DMA1 # for CS4232 PCM interface.");</div><div class='del'>-module_param_array(dma2, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(dma2, int, dma, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dma2, "DMA2 # for CS4232 PCM interface.");</div><div class='del'>-module_param_array(cs4232_mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(cs4232_mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(cs4232_mpu_port, "port # for CS4232 MPU-401 interface.");</div><div class='del'>-module_param_array(cs4232_mpu_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(cs4232_mpu_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(cs4232_mpu_irq, "IRQ # for CS4232 MPU-401 interface.");</div><div class='del'>-module_param_array(ics2115_irq, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(ics2115_irq, int, irq, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ics2115_irq, "IRQ # for ICS2115.");</div><div class='del'>-module_param_array(ics2115_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(ics2115_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ics2115_port, "Port # for ICS2115.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port #.");</div><div class='ctx'> module_param_array(use_cs4232_midi, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");</div><div class='hunk'>@@ -88,7 +74,7 @@ MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly lo</div><div class='ctx'> static int isa_registered;</div><div class='ctx'> static int pnp_registered;</div><div class='ctx'> </div><div class='del'>-static struct pnp_card_device_id snd_wavefront_pnpids[] = {</div><div class='add'>+static const struct pnp_card_device_id snd_wavefront_pnpids[] = {</div><div class='ctx'> 	/* Tropez */</div><div class='ctx'> 	{ .id = "CSC7532", .devs = { { "CSC0000" }, { "CSC0010" }, { "PnPb006" }, { "CSC0004" } } },</div><div class='ctx'> 	/* Tropez+ */</div><div class='hunk'>@@ -98,7 +84,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids);</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card,</div><div class='ctx'> 		   const struct pnp_card_device_id *id)</div><div class='ctx'> {</div><div class='hunk'>@@ -154,7 +140,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c</div><div class='ctx'> </div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "PnP WSS pnp configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PnP WSS pnp configure failure\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -170,7 +156,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c</div><div class='ctx'> 	</div><div class='ctx'> 	err = pnp_activate_dev(pdev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "PnP ICS2115 pnp configure failure\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "PnP ICS2115 pnp configure failure\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -188,26 +174,27 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c</div><div class='ctx'> </div><div class='ctx'> 		err = pnp_activate_dev(pdev);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "PnP MPU401 pnp configure failure\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "PnP MPU401 pnp configure failure\n");</div><div class='ctx'> 			cs4232_mpu_port[dev] = SNDRV_AUTO_PORT;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			cs4232_mpu_port[dev] = pnp_port_start(pdev, 0);</div><div class='ctx'> 			cs4232_mpu_irq[dev] = pnp_irq(pdev, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		snd_printk (KERN_INFO "CS4232 MPU: port=0x%lx, irq=%i\n", </div><div class='del'>-			    cs4232_mpu_port[dev], </div><div class='del'>-			    cs4232_mpu_irq[dev]);</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "CS4232 MPU: port=0x%lx, irq=%i\n",</div><div class='add'>+			 cs4232_mpu_port[dev],</div><div class='add'>+			 cs4232_mpu_irq[dev]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd ("CS4232: pcm port=0x%lx, fm port=0x%lx, dma1=%i, dma2=%i, irq=%i\nICS2115: port=0x%lx, irq=%i\n", </div><div class='del'>-		    cs4232_pcm_port[dev], </div><div class='del'>-		    fm_port[dev],</div><div class='del'>-		    dma1[dev], </div><div class='del'>-		    dma2[dev], </div><div class='del'>-		    cs4232_pcm_irq[dev],</div><div class='del'>-		    ics2115_port[dev], </div><div class='del'>-		    ics2115_irq[dev]);</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev,</div><div class='add'>+		"CS4232: pcm port=0x%lx, fm port=0x%lx, dma1=%i, dma2=%i, irq=%i\nICS2115: port=0x%lx, irq=%i\n",</div><div class='add'>+		cs4232_pcm_port[dev],</div><div class='add'>+		fm_port[dev],</div><div class='add'>+		dma1[dev],</div><div class='add'>+		dma2[dev],</div><div class='add'>+		cs4232_pcm_irq[dev],</div><div class='add'>+		ics2115_port[dev],</div><div class='add'>+		ics2115_irq[dev]);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -231,10 +218,9 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_hwdep * __devinit</div><div class='del'>-snd_wavefront_new_synth (struct snd_card *card,</div><div class='del'>-			 int hw_dev,</div><div class='del'>-			 snd_wavefront_card_t *acard)</div><div class='add'>+static struct snd_hwdep *snd_wavefront_new_synth(struct snd_card *card,</div><div class='add'>+						 int hw_dev,</div><div class='add'>+						 snd_wavefront_card_t *acard)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *wavefront_synth;</div><div class='ctx'> </div><div class='hunk'>@@ -248,7 +234,7 @@ snd_wavefront_new_synth (struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_hwdep_new(card, "WaveFront", hw_dev, &amp;wavefront_synth) &lt; 0)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	strcpy (wavefront_synth-&gt;name, </div><div class='add'>+	strscpy (wavefront_synth-&gt;name, </div><div class='ctx'> 		"WaveFront (ICS2115) wavetable synthesizer");</div><div class='ctx'> 	wavefront_synth-&gt;ops.open = snd_wavefront_synth_open;</div><div class='ctx'> 	wavefront_synth-&gt;ops.release = snd_wavefront_synth_release;</div><div class='hunk'>@@ -257,17 +243,16 @@ snd_wavefront_new_synth (struct snd_card *card,</div><div class='ctx'> 	return wavefront_synth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_hwdep * __devinit</div><div class='del'>-snd_wavefront_new_fx (struct snd_card *card,</div><div class='del'>-		      int hw_dev,</div><div class='del'>-		      snd_wavefront_card_t *acard,</div><div class='del'>-		      unsigned long port)</div><div class='add'>+static struct snd_hwdep *snd_wavefront_new_fx(struct snd_card *card,</div><div class='add'>+					      int hw_dev,</div><div class='add'>+					      snd_wavefront_card_t *acard,</div><div class='add'>+					      unsigned long port)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *fx_processor;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_fx_start (&amp;acard-&gt;wavefront)) {</div><div class='del'>-		snd_printk (KERN_ERR "cannot initialize YSS225 FX processor");</div><div class='add'>+		dev_err(card-&gt;dev, "cannot initialize YSS225 FX processor");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -284,12 +269,11 @@ snd_wavefront_new_fx (struct snd_card *card,</div><div class='ctx'> static snd_wavefront_mpu_id internal_id = internal_mpu;</div><div class='ctx'> static snd_wavefront_mpu_id external_id = external_mpu;</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi *__devinit</div><div class='del'>-snd_wavefront_new_midi (struct snd_card *card,</div><div class='del'>-			int midi_dev,</div><div class='del'>-			snd_wavefront_card_t *acard,</div><div class='del'>-			unsigned long port,</div><div class='del'>-			snd_wavefront_mpu_id mpu)</div><div class='add'>+static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,</div><div class='add'>+						  int midi_dev,</div><div class='add'>+						  snd_wavefront_card_t *acard,</div><div class='add'>+						  unsigned long port,</div><div class='add'>+						  snd_wavefront_mpu_id mpu)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='hunk'>@@ -299,7 +283,7 @@ snd_wavefront_new_midi (struct snd_card *card,</div><div class='ctx'> 		first = 0;</div><div class='ctx'> 		acard-&gt;wavefront.midi.base = port;</div><div class='ctx'> 		if (snd_wavefront_midi_start (acard)) {</div><div class='del'>-			snd_printk (KERN_ERR "cannot initialize MIDI interface\n");</div><div class='add'>+			dev_err(card-&gt;dev, "cannot initialize MIDI interface\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -308,10 +292,10 @@ snd_wavefront_new_midi (struct snd_card *card,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (mpu == internal_mpu) {</div><div class='del'>-		strcpy(rmidi-&gt;name, "WaveFront MIDI (Internal)");</div><div class='add'>+		strscpy(rmidi-&gt;name, "WaveFront MIDI (Internal)");</div><div class='ctx'> 		rmidi-&gt;private_data = &amp;internal_id;</div><div class='ctx'> 	} else {</div><div class='del'>-		strcpy(rmidi-&gt;name, "WaveFront MIDI (External)");</div><div class='add'>+		strscpy(rmidi-&gt;name, "WaveFront MIDI (External)");</div><div class='ctx'> 		rmidi-&gt;private_data = &amp;external_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -325,26 +309,15 @@ snd_wavefront_new_midi (struct snd_card *card,</div><div class='ctx'> 	return rmidi;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-snd_wavefront_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card-&gt;private_data;</div><div class='del'>-	</div><div class='del'>-	if (acard) {</div><div class='del'>-		release_and_free_resource(acard-&gt;wavefront.res_base);</div><div class='del'>-		if (acard-&gt;wavefront.irq &gt; 0)</div><div class='del'>-			free_irq(acard-&gt;wavefront.irq, (void *)acard);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_wavefront_card_new(int dev, struct snd_card **cardp)</div><div class='add'>+static int snd_wavefront_card_new(struct device *pdev, int dev,</div><div class='add'>+				  struct snd_card **cardp)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	snd_wavefront_card_t *acard;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE,</div><div class='del'>-			      sizeof(snd_wavefront_card_t), &amp;card);</div><div class='add'>+	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(snd_wavefront_card_t), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -355,13 +328,12 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp)</div><div class='ctx'> 	spin_lock_init(&amp;acard-&gt;wavefront.midi.open);</div><div class='ctx'> 	spin_lock_init(&amp;acard-&gt;wavefront.midi.virtual);</div><div class='ctx'> 	acard-&gt;wavefront.card = card;</div><div class='del'>-	card-&gt;private_free = snd_wavefront_free;</div><div class='ctx'> </div><div class='ctx'> 	*cardp = card;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	snd_wavefront_card_t *acard = card-&gt;private_data;</div><div class='hunk'>@@ -378,15 +350,15 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 			     cs4232_pcm_irq[dev], dma1[dev], dma2[dev],</div><div class='ctx'> 			     WSS_HW_DETECT, 0, &amp;chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "can't allocate WSS device\n");</div><div class='add'>+		dev_err(card-&gt;dev, "can't allocate WSS device\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_pcm(chip, 0, NULL);</div><div class='add'>+	err = snd_wss_pcm(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wss_timer(chip, 0, NULL);</div><div class='add'>+	err = snd_wss_timer(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -398,7 +370,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 		err = snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,</div><div class='ctx'> 				      OPL3_HW_OPL3_CS, 0, &amp;opl3);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk (KERN_ERR "can't allocate or detect OPL3 synth\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't allocate or detect OPL3 synth\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -410,29 +382,32 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> </div><div class='ctx'> 	/* ------- ICS2115 Wavetable synth ------- */</div><div class='ctx'> </div><div class='del'>-	acard-&gt;wavefront.res_base = request_region(ics2115_port[dev], 16,</div><div class='del'>-						   "ICS2115");</div><div class='add'>+	acard-&gt;wavefront.res_base =</div><div class='add'>+		devm_request_region(card-&gt;dev, ics2115_port[dev], 16,</div><div class='add'>+				    "ICS2115");</div><div class='ctx'> 	if (acard-&gt;wavefront.res_base == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab ICS2115 i/o region 0x%lx-0x%lx\n",</div><div class='del'>-			   ics2115_port[dev], ics2115_port[dev] + 16 - 1);</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab ICS2115 i/o region 0x%lx-0x%lx\n",</div><div class='add'>+			ics2115_port[dev], ics2115_port[dev] + 16 - 1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,</div><div class='del'>-			IRQF_DISABLED, "ICS2115", acard)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);</div><div class='add'>+	if (devm_request_irq(card-&gt;dev, ics2115_irq[dev],</div><div class='add'>+			     snd_wavefront_ics2115_interrupt,</div><div class='add'>+			     0, "ICS2115", acard)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	acard-&gt;wavefront.irq = ics2115_irq[dev];</div><div class='add'>+	card-&gt;sync_irq = acard-&gt;wavefront.irq;</div><div class='ctx'> 	acard-&gt;wavefront.base = ics2115_port[dev];</div><div class='ctx'> </div><div class='ctx'> 	wavefront_synth = snd_wavefront_new_synth(card, hw_dev, acard);</div><div class='ctx'> 	if (wavefront_synth == NULL) {</div><div class='del'>-		snd_printk (KERN_ERR "can't create WaveFront synth device\n");</div><div class='add'>+		dev_err(card-&gt;dev, "can't create WaveFront synth device\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy (wavefront_synth-&gt;name, "ICS2115 Wavetable MIDI Synthesizer");</div><div class='add'>+	strscpy (wavefront_synth-&gt;name, "ICS2115 Wavetable MIDI Synthesizer");</div><div class='ctx'> 	wavefront_synth-&gt;iface = SNDRV_HWDEP_IFACE_ICS2115;</div><div class='ctx'> 	hw_dev++;</div><div class='ctx'> </div><div class='hunk'>@@ -440,7 +415,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> </div><div class='ctx'> 	err = snd_wss_mixer(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk (KERN_ERR "can't allocate mixer device\n");</div><div class='add'>+		dev_err(card-&gt;dev, "can't allocate mixer device\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -449,10 +424,9 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 	if (cs4232_mpu_port[dev] &gt; 0 &amp;&amp; cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {</div><div class='ctx'> 		err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,</div><div class='ctx'> 					  cs4232_mpu_port[dev], 0,</div><div class='del'>-					  cs4232_mpu_irq[dev], IRQF_DISABLED,</div><div class='del'>-					  NULL);</div><div class='add'>+					  cs4232_mpu_irq[dev], NULL);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't allocate CS4232 MPU-401 device\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		midi_dev++;</div><div class='hunk'>@@ -468,7 +442,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 						ics2115_port[dev],</div><div class='ctx'> 						internal_mpu);</div><div class='ctx'> 		if (ics2115_internal_rmidi == NULL) {</div><div class='del'>-			snd_printk (KERN_ERR "can't setup ICS2115 internal MIDI device\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't setup ICS2115 internal MIDI device\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		midi_dev++;</div><div class='hunk'>@@ -484,7 +458,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 						ics2115_port[dev],</div><div class='ctx'> 						external_mpu);</div><div class='ctx'> 		if (ics2115_external_rmidi == NULL) {</div><div class='del'>-			snd_printk (KERN_ERR "can't setup ICS2115 external MIDI device\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't setup ICS2115 external MIDI device\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		midi_dev++;</div><div class='hunk'>@@ -498,18 +472,18 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 						     acard,</div><div class='ctx'> 						     ics2115_port[dev]);</div><div class='ctx'> 		if (fx_processor == NULL) {</div><div class='del'>-			snd_printk (KERN_ERR "can't setup FX device\n");</div><div class='add'>+			dev_err(card-&gt;dev, "can't setup FX device\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		hw_dev++;</div><div class='ctx'> </div><div class='del'>-		strcpy(card-&gt;driver, "Tropez+");</div><div class='del'>-		strcpy(card-&gt;shortname, "Turtle Beach Tropez+");</div><div class='add'>+		strscpy(card-&gt;driver, "Tropez+");</div><div class='add'>+		strscpy(card-&gt;shortname, "Turtle Beach Tropez+");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Need a way to distinguish between Maui and Tropez */</div><div class='del'>-		strcpy(card-&gt;driver, "WaveFront");</div><div class='del'>-		strcpy(card-&gt;shortname, "Turtle Beach WaveFront");</div><div class='add'>+		strscpy(card-&gt;driver, "WaveFront");</div><div class='add'>+		strscpy(card-&gt;shortname, "Turtle Beach WaveFront");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ----- Register the card --------- */</div><div class='hunk'>@@ -542,8 +516,8 @@ snd_wavefront_probe (struct snd_card *card, int dev)</div><div class='ctx'> 	return snd_card_register(card);</div><div class='ctx'> }	</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_wavefront_isa_match(struct device *pdev,</div><div class='del'>-					     unsigned int dev)</div><div class='add'>+static int snd_wavefront_isa_match(struct device *pdev,</div><div class='add'>+				   unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (!enable[dev])</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -552,49 +526,38 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,</div><div class='ctx'> 		return 0;</div><div class='ctx'> #endif</div><div class='ctx'> 	if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR "specify CS4232 port\n");</div><div class='add'>+		dev_err(pdev, "specify CS4232 port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ics2115_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-		snd_printk(KERN_ERR "specify ICS2115 port\n");</div><div class='add'>+		dev_err(pdev, "specify ICS2115 port\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_wavefront_isa_probe(struct device *pdev,</div><div class='del'>-					     unsigned int dev)</div><div class='add'>+static int snd_wavefront_isa_probe(struct device *pdev,</div><div class='add'>+				   unsigned int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_wavefront_card_new(dev, &amp;card);</div><div class='add'>+	err = snd_wavefront_card_new(pdev, dev, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_card_set_dev(card, pdev);</div><div class='del'>-	if ((err = snd_wavefront_probe(card, dev)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_wavefront_probe(card, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	dev_set_drvdata(pdev, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_wavefront_isa_remove(struct device *devptr,</div><div class='del'>-					      unsigned int dev)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(dev_get_drvdata(devptr));</div><div class='del'>-	dev_set_drvdata(devptr, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define DEV_NAME "wavefront"</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver snd_wavefront_driver = {</div><div class='ctx'> 	.match		= snd_wavefront_isa_match,</div><div class='ctx'> 	.probe		= snd_wavefront_isa_probe,</div><div class='del'>-	.remove		= __devexit_p(snd_wavefront_isa_remove),</div><div class='ctx'> 	/* FIXME: suspend, resume */</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= DEV_NAME</div><div class='hunk'>@@ -603,8 +566,8 @@ static struct isa_driver snd_wavefront_driver = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PNP</div><div class='del'>-static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,</div><div class='del'>-					const struct pnp_card_device_id *pid)</div><div class='add'>+static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,</div><div class='add'>+				    const struct pnp_card_device_id *pid)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -617,20 +580,19 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	res = snd_wavefront_card_new(dev, &amp;card);</div><div class='add'>+	res = snd_wavefront_card_new(&amp;pcard-&gt;card-&gt;dev, dev, &amp;card);</div><div class='ctx'> 	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_pnp (dev, card-&gt;private_data, pcard, pid) &lt; 0) {</div><div class='ctx'> 		if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {</div><div class='del'>-			snd_printk (KERN_ERR "isapnp detection failed\n");</div><div class='del'>-			snd_card_free (card);</div><div class='add'>+			dev_err(card-&gt;dev, "isapnp detection failed\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pcard-&gt;card-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if ((res = snd_wavefront_probe(card, dev)) &lt; 0)</div><div class='add'>+	res = snd_wavefront_probe(card, dev);</div><div class='add'>+	if (res &lt; 0)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	pnp_set_card_drvdata(pcard, card);</div><div class='hunk'>@@ -638,18 +600,11 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pnp_get_card_drvdata(pcard));</div><div class='del'>-	pnp_set_card_drvdata(pcard, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static struct pnp_card_driver wavefront_pnpc_driver = {</div><div class='ctx'> 	.flags		= PNP_DRIVER_RES_DISABLE,</div><div class='ctx'> 	.name		= "wavefront",</div><div class='ctx'> 	.id_table	= snd_wavefront_pnpids,</div><div class='ctx'> 	.probe		= snd_wavefront_pnp_detect,</div><div class='del'>-	.remove		= __devexit_p(snd_wavefront_pnp_remove),</div><div class='ctx'> 	/* FIXME: suspend,resume */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c<br/>index 657e2d6c01ac..beca35ce04f3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_fx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_fx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_fx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wavefront/wavefront_fx.c</a></div><div class='hunk'>@@ -1,26 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 1998-2002 by Paul Davis &lt;pbd@op.net&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/snd_wavefront.h&gt;</div><div class='hunk'>@@ -50,7 +38,7 @@ wavefront_fx_idle (snd_wavefront_t *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (x &amp; 0x80) {</div><div class='del'>-		snd_printk ("FX device never idle.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "FX device never idle.\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -76,15 +64,15 @@ wavefront_fx_memset (snd_wavefront_t *dev,</div><div class='ctx'> 		     unsigned short *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (page &lt; 0 || page &gt; 7) {</div><div class='del'>-		snd_printk ("FX memset: "</div><div class='del'>-			"page must be &gt;= 0 and &lt;= 7\n");</div><div class='del'>-		return -(EINVAL);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+			"FX memset: page must be &gt;= 0 and &lt;= 7\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (addr &lt; 0 || addr &gt; 0x7f) {</div><div class='del'>-		snd_printk ("FX memset: "</div><div class='del'>-			"addr must be &gt;= 0 and &lt;= 7f\n");</div><div class='del'>-		return -(EINVAL);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+			"FX memset: addr must be &gt;= 0 and &lt;= 7f\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cnt == 1) {</div><div class='hunk'>@@ -95,7 +83,7 @@ wavefront_fx_memset (snd_wavefront_t *dev,</div><div class='ctx'> 		outb ((data[0] &gt;&gt; 8), dev-&gt;fx_dsp_msb);</div><div class='ctx'> 		outb ((data[0] &amp; 0xff), dev-&gt;fx_dsp_lsb);</div><div class='ctx'> </div><div class='del'>-		snd_printk ("FX: addr %d:%x set to 0x%x\n",</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "FX: addr %d:%x set to 0x%x\n",</div><div class='ctx'> 			page, addr, data[0]);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -114,10 +102,10 @@ wavefront_fx_memset (snd_wavefront_t *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (i != cnt) {</div><div class='del'>-			snd_printk ("FX memset "</div><div class='del'>-				    "(0x%x, 0x%x, 0x%lx, %d) incomplete\n",</div><div class='del'>-				    page, addr, (unsigned long) data, cnt);</div><div class='del'>-			return -(EIO);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"FX memset (0x%x, 0x%x, 0x%lx, %d) incomplete\n",</div><div class='add'>+				page, addr, (unsigned long) data, cnt);</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +123,7 @@ snd_wavefront_fx_detect (snd_wavefront_t *dev)</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> 	if (inb (dev-&gt;fx_status) &amp; 0x80) {</div><div class='del'>-		snd_printk ("Hmm, probably a Maui or Tropez.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "Hmm, probably a Maui or Tropez.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -192,20 +180,20 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,</div><div class='ctx'> </div><div class='ctx'> 	case WFFX_MEMSET:</div><div class='ctx'> 		if (r.data[2] &lt;= 0) {</div><div class='del'>-			snd_printk ("cannot write "</div><div class='del'>-				"&lt;= 0 bytes to FX\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"cannot write &lt;= 0 bytes to FX\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		} else if (r.data[2] == 1) {</div><div class='ctx'> 			pd = (unsigned short *) &amp;r.data[3];</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (r.data[2] &gt; 256) {</div><div class='del'>-				snd_printk ("cannot write "</div><div class='del'>-					    "&gt; 512 bytes to FX\n");</div><div class='add'>+				dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+					"cannot write &gt; 512 bytes to FX\n");</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='del'>-			page_data = memdup_user((unsigned char __user *)</div><div class='del'>-						r.data[3],</div><div class='del'>-						r.data[2] * sizeof(short));</div><div class='add'>+			page_data = memdup_array_user((unsigned char __user *)</div><div class='add'>+						      r.data[3],</div><div class='add'>+						      r.data[2], sizeof(short));</div><div class='ctx'> 			if (IS_ERR(page_data))</div><div class='ctx'> 				return PTR_ERR(page_data);</div><div class='ctx'> 			pd = page_data;</div><div class='hunk'>@@ -220,8 +208,8 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk ("FX: ioctl %d not yet supported\n",</div><div class='del'>-			    r.request);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "FX: ioctl %d not yet supported\n",</div><div class='add'>+			r.request);</div><div class='ctx'> 		return -ENOTTY;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -239,7 +227,7 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,</div><div class='ctx'>    that outputs it.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-int __devinit</div><div class='add'>+int</div><div class='ctx'> snd_wavefront_fx_start (snd_wavefront_t *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -266,8 +254,8 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)</div><div class='ctx'> 				goto out;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk(KERN_ERR "invalid address"</div><div class='del'>-				   " in register data\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"invalid address in register data\n");</div><div class='ctx'> 			err = -1;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c<br/>index f14a7c0b6998..69d87c4cafae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wavefront/wavefront_midi.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) by Paul Barton-Davis 1998-1999</div><div class='del'>- *</div><div class='del'>- * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this</div><div class='del'>- * software for more info.  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* The low level driver for the WaveFront ICS2115 MIDI interface(s)</div><div class='hunk'>@@ -47,7 +44,7 @@</div><div class='ctx'>  *  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='hunk'>@@ -116,7 +113,6 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)</div><div class='ctx'> {</div><div class='ctx'> 	snd_wavefront_midi_t *midi = &amp;card-&gt;wavefront.midi;</div><div class='ctx'> 	snd_wavefront_mpu_id  mpu;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char midi_byte;</div><div class='ctx'> 	int max = 256, mask = 1;</div><div class='ctx'> 	int timeout;</div><div class='hunk'>@@ -145,11 +141,9 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='del'>-		spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='del'>-		if ((midi-&gt;mode[midi-&gt;output_mpu] &amp; MPU401_MODE_OUTPUT) == 0) {</div><div class='del'>-			spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;midi-&gt;virtual);</div><div class='add'>+		if ((midi-&gt;mode[midi-&gt;output_mpu] &amp; MPU401_MODE_OUTPUT) == 0)</div><div class='ctx'> 			goto __second;</div><div class='del'>-		}</div><div class='ctx'> 		if (output_ready (midi)) {</div><div class='ctx'> 			if (snd_rawmidi_transmit(midi-&gt;substream_output[midi-&gt;output_mpu], &amp;midi_byte, 1) == 1) {</div><div class='ctx'> 				if (!midi-&gt;isvirtual ||</div><div class='hunk'>@@ -160,17 +154,14 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)</div><div class='ctx'> 			} else {</div><div class='ctx'> 				if (midi-&gt;istimer) {</div><div class='ctx'> 					if (--midi-&gt;istimer &lt;= 0)</div><div class='del'>-						del_timer(&amp;midi-&gt;timer);</div><div class='add'>+						timer_delete(&amp;midi-&gt;timer);</div><div class='ctx'> 				}</div><div class='ctx'> 				midi-&gt;mode[midi-&gt;output_mpu] &amp;= ~MPU401_MODE_OUTPUT_TRIGGER;</div><div class='del'>-				spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 				goto __second;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       __second:</div><div class='hunk'>@@ -188,15 +179,13 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='del'>-		spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;midi-&gt;virtual);</div><div class='ctx'> 		if (!midi-&gt;isvirtual)</div><div class='ctx'> 			mask = 0;</div><div class='ctx'> 		mpu = midi-&gt;output_mpu ^ mask;</div><div class='ctx'> 		mask = 0;	/* don't invert the value from now */</div><div class='del'>-		if ((midi-&gt;mode[mpu] &amp; MPU401_MODE_OUTPUT) == 0) {</div><div class='del'>-			spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='add'>+		if ((midi-&gt;mode[mpu] &amp; MPU401_MODE_OUTPUT) == 0)</div><div class='ctx'> 			return;</div><div class='del'>-		}</div><div class='ctx'> 		if (snd_rawmidi_transmit_empty(midi-&gt;substream_output[mpu]))</div><div class='ctx'> 			goto __timer;</div><div class='ctx'> 		if (output_ready (midi)) {</div><div class='hunk'>@@ -215,23 +204,19 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)</div><div class='ctx'> 			      __timer:</div><div class='ctx'> 				if (midi-&gt;istimer) {</div><div class='ctx'> 					if (--midi-&gt;istimer &lt;= 0)</div><div class='del'>-						del_timer(&amp;midi-&gt;timer);</div><div class='add'>+						timer_delete(&amp;midi-&gt;timer);</div><div class='ctx'> 				}</div><div class='ctx'> 				midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_OUTPUT_TRIGGER;</div><div class='del'>-				spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -242,20 +227,19 @@ static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL)</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 	        return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;open, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;midi-&gt;open);</div><div class='ctx'> 	midi-&gt;mode[mpu] |= MPU401_MODE_INPUT;</div><div class='ctx'> 	midi-&gt;substream_input[mpu] = substream;</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;open, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -266,20 +250,19 @@ static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substrea</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL)</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 	        return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;open, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;midi-&gt;open);</div><div class='ctx'> 	midi-&gt;mode[mpu] |= MPU401_MODE_OUTPUT;</div><div class='ctx'> 	midi-&gt;substream_output[mpu] = substream;</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;open, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -290,19 +273,19 @@ static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substrea</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL)</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 	        return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;open, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;midi-&gt;open);</div><div class='add'>+	midi-&gt;substream_input[mpu] = NULL;</div><div class='ctx'> 	midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_INPUT;</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;open, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -313,18 +296,18 @@ static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substre</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL)</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 	        return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;open, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;midi-&gt;open);</div><div class='add'>+	midi-&gt;substream_output[mpu] = NULL;</div><div class='ctx'> 	midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_OUTPUT;</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;open, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wavefront_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -336,35 +319,31 @@ static void snd_wavefront_midi_input_trigger(struct snd_rawmidi_substream *subst</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL) {</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;midi-&gt;virtual);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		midi-&gt;mode[mpu] |= MPU401_MODE_INPUT_TRIGGER;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_INPUT_TRIGGER;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_wavefront_midi_output_timer(unsigned long data)</div><div class='add'>+static void snd_wavefront_midi_output_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	snd_wavefront_card_t *card = (snd_wavefront_card_t *)data;</div><div class='del'>-	snd_wavefront_midi_t *midi = &amp;card-&gt;wavefront.midi;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	snd_wavefront_midi_t *midi = timer_container_of(midi, t, timer);</div><div class='add'>+	snd_wavefront_card_t *card = midi-&gt;timer_card;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='del'>-	midi-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;midi-&gt;timer);</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;virtual) {</div><div class='add'>+		mod_timer(&amp;midi-&gt;timer, 1 + jiffies);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wavefront_midi_output_write(card);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	snd_wavefront_mpu_id mpu;</div><div class='ctx'> </div><div class='hunk'>@@ -376,27 +355,26 @@ static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *subs</div><div class='ctx'> </div><div class='ctx'> 	mpu = *((snd_wavefront_mpu_id *) substream-&gt;rmidi-&gt;private_data);</div><div class='ctx'> </div><div class='del'>-	if ((midi = get_wavefront_midi (substream)) == NULL) {</div><div class='add'>+	midi = get_wavefront_midi(substream);</div><div class='add'>+	if (!midi)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='del'>-	if (up) {</div><div class='del'>-		if ((midi-&gt;mode[mpu] &amp; MPU401_MODE_OUTPUT_TRIGGER) == 0) {</div><div class='del'>-			if (!midi-&gt;istimer) {</div><div class='del'>-				init_timer(&amp;midi-&gt;timer);</div><div class='del'>-				midi-&gt;timer.function = snd_wavefront_midi_output_timer;</div><div class='del'>-				midi-&gt;timer.data = (unsigned long) substream-&gt;rmidi-&gt;card-&gt;private_data;</div><div class='del'>-				midi-&gt;timer.expires = 1 + jiffies;</div><div class='del'>-				add_timer(&amp;midi-&gt;timer);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;virtual) {</div><div class='add'>+		if (up) {</div><div class='add'>+			if ((midi-&gt;mode[mpu] &amp; MPU401_MODE_OUTPUT_TRIGGER) == 0) {</div><div class='add'>+				if (!midi-&gt;istimer) {</div><div class='add'>+					timer_setup(&amp;midi-&gt;timer,</div><div class='add'>+						    snd_wavefront_midi_output_timer,</div><div class='add'>+						    0);</div><div class='add'>+					mod_timer(&amp;midi-&gt;timer, 1 + jiffies);</div><div class='add'>+				}</div><div class='add'>+				midi-&gt;istimer++;</div><div class='add'>+				midi-&gt;mode[mpu] |= MPU401_MODE_OUTPUT_TRIGGER;</div><div class='ctx'> 			}</div><div class='del'>-			midi-&gt;istimer++;</div><div class='del'>-			midi-&gt;mode[mpu] |= MPU401_MODE_OUTPUT_TRIGGER;</div><div class='add'>+		} else {</div><div class='add'>+			midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_OUTPUT_TRIGGER;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		midi-&gt;mode[mpu] &amp;= ~MPU401_MODE_OUTPUT_TRIGGER;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='ctx'> </div><div class='ctx'> 	if (up)</div><div class='ctx'> 		snd_wavefront_midi_output_write((snd_wavefront_card_t *)substream-&gt;rmidi-&gt;card-&gt;private_data);</div><div class='hunk'>@@ -406,7 +384,6 @@ void</div><div class='ctx'> snd_wavefront_midi_interrupt (snd_wavefront_card_t *card)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	snd_wavefront_midi_t *midi;</div><div class='ctx'> 	static struct snd_rawmidi_substream *substream = NULL;</div><div class='ctx'> 	static int mpu = external_mpu; </div><div class='hunk'>@@ -420,37 +397,37 @@ snd_wavefront_midi_interrupt (snd_wavefront_card_t *card)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave (&amp;midi-&gt;virtual, flags);</div><div class='del'>-	while (--max) {</div><div class='del'>-</div><div class='del'>-		if (input_avail (midi)) {</div><div class='del'>-			byte = read_data (midi);</div><div class='del'>-</div><div class='del'>-			if (midi-&gt;isvirtual) {				</div><div class='del'>-				if (byte == WF_EXTERNAL_SWITCH) {</div><div class='del'>-					substream = midi-&gt;substream_input[external_mpu];</div><div class='del'>-					mpu = external_mpu;</div><div class='del'>-				} else if (byte == WF_INTERNAL_SWITCH) { </div><div class='del'>-					substream = midi-&gt;substream_output[internal_mpu];</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;virtual) {</div><div class='add'>+		while (--max) {</div><div class='add'>+</div><div class='add'>+			if (input_avail(midi)) {</div><div class='add'>+				byte = read_data(midi);</div><div class='add'>+</div><div class='add'>+				if (midi-&gt;isvirtual) {</div><div class='add'>+					if (byte == WF_EXTERNAL_SWITCH) {</div><div class='add'>+						substream = midi-&gt;substream_input[external_mpu];</div><div class='add'>+						mpu = external_mpu;</div><div class='add'>+					} else if (byte == WF_INTERNAL_SWITCH) {</div><div class='add'>+						substream = midi-&gt;substream_output[internal_mpu];</div><div class='add'>+						mpu = internal_mpu;</div><div class='add'>+					} /* else just leave it as it is */</div><div class='add'>+				} else {</div><div class='add'>+					substream = midi-&gt;substream_input[internal_mpu];</div><div class='ctx'> 					mpu = internal_mpu;</div><div class='del'>-				} /* else just leave it as it is */</div><div class='del'>-			} else {</div><div class='del'>-				substream = midi-&gt;substream_input[internal_mpu];</div><div class='del'>-				mpu = internal_mpu;</div><div class='del'>-			}</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			if (substream == NULL) {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+				if (substream == NULL) {</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='del'>-			if (midi-&gt;mode[mpu] &amp; MPU401_MODE_INPUT_TRIGGER) {</div><div class='del'>-				snd_rawmidi_receive(substream, &amp;byte, 1);</div><div class='add'>+				if (midi-&gt;mode[mpu] &amp; MPU401_MODE_INPUT_TRIGGER) {</div><div class='add'>+					snd_rawmidi_receive(substream, &amp;byte, 1);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				break;</div><div class='ctx'> 			}</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='ctx'> 		}</div><div class='del'>-	} </div><div class='del'>-	spin_unlock_irqrestore (&amp;midi-&gt;virtual, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_wavefront_midi_output_write(card);</div><div class='ctx'> }</div><div class='hunk'>@@ -472,16 +449,13 @@ void</div><div class='ctx'> snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *card)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave (&amp;card-&gt;wavefront.midi.virtual, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;card-&gt;wavefront.midi.virtual);</div><div class='ctx'> 	// snd_wavefront_midi_input_close (card-&gt;ics2115_external_rmidi);</div><div class='ctx'> 	// snd_wavefront_midi_output_close (card-&gt;ics2115_external_rmidi);</div><div class='ctx'> 	card-&gt;wavefront.midi.isvirtual = 0;</div><div class='del'>-	spin_unlock_irqrestore (&amp;card-&gt;wavefront.midi.virtual, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit</div><div class='add'>+int</div><div class='ctx'> snd_wavefront_midi_start (snd_wavefront_card_t *card)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -502,7 +476,8 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)</div><div class='ctx'> 	for (i = 0; i &lt; 30000 &amp;&amp; !output_ready (midi); i++);</div><div class='ctx'> </div><div class='ctx'> 	if (!output_ready (midi)) {</div><div class='del'>-		snd_printk ("MIDI interface not ready for command\n");</div><div class='add'>+		dev_err(card-&gt;wavefront.card-&gt;dev,</div><div class='add'>+			"MIDI interface not ready for command\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +499,8 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!ok) {</div><div class='del'>-		snd_printk ("cannot set UART mode for MIDI interface");</div><div class='add'>+		dev_err(card-&gt;wavefront.card-&gt;dev,</div><div class='add'>+			"cannot set UART mode for MIDI interface");</div><div class='ctx'> 		dev-&gt;interrupts_are_midi = 0;</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -532,12 +508,13 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)</div><div class='ctx'> 	/* Route external MIDI to WaveFront synth (by default) */</div><div class='ctx'>     </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_MISYNTH_ON, rbuf, wbuf)) {</div><div class='del'>-		snd_printk ("can't enable MIDI-IN-2-synth routing.\n");</div><div class='add'>+		dev_warn(card-&gt;wavefront.card-&gt;dev,</div><div class='add'>+			 "can't enable MIDI-IN-2-synth routing.\n");</div><div class='ctx'> 		/* XXX error ? */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Turn on Virtual MIDI, but first *always* turn it off,</div><div class='del'>-	   since otherwise consectutive reloads of the driver will</div><div class='add'>+	   since otherwise consecutive reloads of the driver will</div><div class='ctx'> 	   never cause the hardware to generate the initial "internal" or </div><div class='ctx'> 	   "external" source bytes in the MIDI data stream. This</div><div class='ctx'> 	   is pretty important, since the internal hardware generally will</div><div class='hunk'>@@ -548,27 +525,29 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_VMIDI_OFF, rbuf, wbuf)) { </div><div class='del'>-		snd_printk ("virtual MIDI mode not disabled\n");</div><div class='add'>+		dev_warn(card-&gt;wavefront.card-&gt;dev,</div><div class='add'>+			 "virtual MIDI mode not disabled\n");</div><div class='ctx'> 		return 0; /* We're OK, but missing the external MIDI dev */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_wavefront_midi_enable_virtual (card);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_VMIDI_ON, rbuf, wbuf)) {</div><div class='del'>-		snd_printk ("cannot enable virtual MIDI mode.\n");</div><div class='add'>+		dev_warn(card-&gt;wavefront.card-&gt;dev,</div><div class='add'>+			 "cannot enable virtual MIDI mode.\n");</div><div class='ctx'> 		snd_wavefront_midi_disable_virtual (card);</div><div class='ctx'> 	} </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_rawmidi_ops snd_wavefront_midi_output =</div><div class='add'>+const struct snd_rawmidi_ops snd_wavefront_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_wavefront_midi_output_open,</div><div class='ctx'> 	.close =	snd_wavefront_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_wavefront_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct snd_rawmidi_ops snd_wavefront_midi_input =</div><div class='add'>+const struct snd_rawmidi_ops snd_wavefront_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_wavefront_midi_input_open,</div><div class='ctx'> 	.close =	snd_wavefront_midi_input_close,</div><div class='head'>diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c<br/>index 4fb7b19ff393..0d78533e1cfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wavefront/wavefront_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wavefront/wavefront_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wavefront/wavefront_synth.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Copyright (C) by Paul Barton-Davis 1998-1999</div><div class='ctx'>  *</div><div class='ctx'>  * Some portions of this file are taken from work that is</div><div class='ctx'>  * copyright (C) by Hannu Savolainen 1993-1996</div><div class='del'>- *</div><div class='del'>- * This program is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.  </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*  </div><div class='hunk'>@@ -20,15 +17,17 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/snd_wavefront.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -117,7 +116,7 @@ MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");</div><div class='ctx'> </div><div class='ctx'> #define DPRINT(cond, ...) \</div><div class='ctx'>        if ((dev-&gt;debug &amp; (cond)) == (cond)) { \</div><div class='del'>-	     snd_printk (__VA_ARGS__); \</div><div class='add'>+	     pr_debug(__VA_ARGS__); \</div><div class='ctx'>        }</div><div class='ctx'> #else</div><div class='ctx'> #define DPRINT(cond, args...)</div><div class='hunk'>@@ -340,8 +339,9 @@ snd_wavefront_cmd (snd_wavefront_t *dev,</div><div class='ctx'> 	int c;</div><div class='ctx'> 	struct wavefront_command *wfcmd;</div><div class='ctx'> </div><div class='del'>-	if ((wfcmd = wavefront_get_command (cmd)) == NULL) {</div><div class='del'>-		snd_printk ("command 0x%x not supported.\n",</div><div class='add'>+	wfcmd = wavefront_get_command(cmd);</div><div class='add'>+	if (!wfcmd) {</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "command 0x%x not supported.\n",</div><div class='ctx'> 			cmd);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -392,7 +392,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev,</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; wfcmd-&gt;read_cnt; i++) {</div><div class='ctx'> </div><div class='del'>-			if ((c = wavefront_read (dev)) == -1) {</div><div class='add'>+			c = wavefront_read(dev);</div><div class='add'>+			if (c == -1) {</div><div class='ctx'> 				DPRINT (WF_DEBUG_IO, "bad read for byte "</div><div class='ctx'> 						      "%d of 0x%x [%s].\n",</div><div class='ctx'> 						      i, cmd, wfcmd-&gt;action);</div><div class='hunk'>@@ -402,7 +403,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev,</div><div class='ctx'> 			/* Now handle errors. Lots of special cases here */</div><div class='ctx'> 	    </div><div class='ctx'> 			if (c == 0xff) { </div><div class='del'>-				if ((c = wavefront_read (dev)) == -1) {</div><div class='add'>+				c = wavefront_read(dev);</div><div class='add'>+				if (c == -1) {</div><div class='ctx'> 					DPRINT (WF_DEBUG_IO, "bad read for "</div><div class='ctx'> 							      "error byte at "</div><div class='ctx'> 							      "read byte %d "</div><div class='hunk'>@@ -460,9 +462,9 @@ snd_wavefront_cmd (snd_wavefront_t *dev,</div><div class='ctx'> 		   of the standard value.</div><div class='ctx'> 		*/</div><div class='ctx'> 	    </div><div class='del'>-		if ((ack = wavefront_read (dev)) == 0) {</div><div class='add'>+		ack = wavefront_read(dev);</div><div class='add'>+		if (ack == 0)</div><div class='ctx'> 			ack = WF_ACK;</div><div class='del'>-		}</div><div class='ctx'> 	</div><div class='ctx'> 		if (ack != WF_ACK) {</div><div class='ctx'> 			if (ack == -1) {</div><div class='hunk'>@@ -476,7 +478,8 @@ snd_wavefront_cmd (snd_wavefront_t *dev,</div><div class='ctx'> </div><div class='ctx'> 				if (ack == 0xff) { /* explicit error */</div><div class='ctx'> 		    </div><div class='del'>-					if ((err = wavefront_read (dev)) == -1) {</div><div class='add'>+					err = wavefront_read(dev);</div><div class='add'>+					if (err == -1) {</div><div class='ctx'> 						DPRINT (WF_DEBUG_DATA,</div><div class='ctx'> 							"cannot read err "</div><div class='ctx'> 							"for 0x%x [%s].\n",</div><div class='hunk'>@@ -537,7 +540,7 @@ munge_int32 (unsigned int src,</div><div class='ctx'> 	                            /* Note: we leave the upper bits in place */ </div><div class='ctx'> </div><div class='ctx'> 		dst++;</div><div class='del'>- 	};</div><div class='add'>+	}</div><div class='ctx'> 	return dst;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -578,8 +581,6 @@ demunge_buf (unsigned char *src, unsigned char *dst, unsigned int src_bytes)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned char *end = src + src_bytes;</div><div class='ctx'>     </div><div class='del'>-	end = src + src_bytes;</div><div class='del'>-</div><div class='ctx'> 	/* NOTE: src and dst *CAN* point to the same address */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; src != end; i++) {</div><div class='hunk'>@@ -604,9 +605,9 @@ wavefront_delete_sample (snd_wavefront_t *dev, int sample_num)</div><div class='ctx'> 	wbuf[0] = sample_num &amp; 0x7f;</div><div class='ctx'> 	wbuf[1] = sample_num &gt;&gt; 7;</div><div class='ctx'> </div><div class='del'>-	if ((x = snd_wavefront_cmd (dev, WFC_DELETE_SAMPLE, NULL, wbuf)) == 0) {</div><div class='add'>+	x = snd_wavefront_cmd(dev, WFC_DELETE_SAMPLE, NULL, wbuf);</div><div class='add'>+	if (!x)</div><div class='ctx'> 		dev-&gt;sample_status[sample_num] = WF_ST_EMPTY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return x;</div><div class='ctx'> }</div><div class='hunk'>@@ -622,7 +623,7 @@ wavefront_get_sample_status (snd_wavefront_t *dev, int assume_rom)</div><div class='ctx'> 	/* check sample status */</div><div class='ctx'>     </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_GET_NSAMPLES, rbuf, wbuf)) {</div><div class='del'>-		snd_printk ("cannot request sample count.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "cannot request sample count.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	} </div><div class='ctx'>     </div><div class='hunk'>@@ -634,8 +635,8 @@ wavefront_get_sample_status (snd_wavefront_t *dev, int assume_rom)</div><div class='ctx'> 		wbuf[1] = i &gt;&gt; 7;</div><div class='ctx'> </div><div class='ctx'> 		if (snd_wavefront_cmd (dev, WFC_IDENTIFY_SAMPLE_TYPE, rbuf, wbuf)) {</div><div class='del'>-			snd_printk(KERN_WARNING "cannot identify sample "</div><div class='del'>-				   "type of slot %d\n", i);</div><div class='add'>+			dev_warn(dev-&gt;card-&gt;dev,</div><div class='add'>+				 "cannot identify sample type of slot %d\n", i);</div><div class='ctx'> 			dev-&gt;sample_status[i] = WF_ST_EMPTY;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -660,9 +661,9 @@ wavefront_get_sample_status (snd_wavefront_t *dev, int assume_rom)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			snd_printk ("unknown sample type for "</div><div class='del'>-				    "slot %d (0x%x)\n", </div><div class='del'>-				    i, rbuf[0]);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"unknown sample type for slot %d (0x%x)\n",</div><div class='add'>+				i, rbuf[0]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rbuf[0] != WF_ST_EMPTY) {</div><div class='hunk'>@@ -670,9 +671,10 @@ wavefront_get_sample_status (snd_wavefront_t *dev, int assume_rom)</div><div class='ctx'> 		} </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk ("%d samples used (%d real, %d aliases, %d multi), "</div><div class='del'>-		    "%d empty\n", dev-&gt;samples_used, sc_real, sc_alias, sc_multi,</div><div class='del'>-		    WF_MAX_SAMPLE - dev-&gt;samples_used);</div><div class='add'>+	dev_info(dev-&gt;card-&gt;dev,</div><div class='add'>+		 "%d samples used (%d real, %d aliases, %d multi), %d empty\n",</div><div class='add'>+		 dev-&gt;samples_used, sc_real, sc_alias, sc_multi,</div><div class='add'>+		 WF_MAX_SAMPLE - dev-&gt;samples_used);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='hunk'>@@ -692,8 +694,9 @@ wavefront_get_patch_status (snd_wavefront_t *dev)</div><div class='ctx'> 		patchnum[0] = i &amp; 0x7f;</div><div class='ctx'> 		patchnum[1] = i &gt;&gt; 7;</div><div class='ctx'> </div><div class='del'>-		if ((x = snd_wavefront_cmd (dev, WFC_UPLOAD_PATCH, patchbuf,</div><div class='del'>-					patchnum)) == 0) {</div><div class='add'>+		x = snd_wavefront_cmd(dev, WFC_UPLOAD_PATCH, patchbuf,</div><div class='add'>+				      patchnum);</div><div class='add'>+		if (x == 0) {</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;patch_status[i] |= WF_SLOT_FILLED;</div><div class='ctx'> 			p = (wavefront_patch *) patchbuf;</div><div class='hunk'>@@ -704,8 +707,8 @@ wavefront_get_patch_status (snd_wavefront_t *dev)</div><div class='ctx'> 		} else if (x == 3) { /* Bad patch number */</div><div class='ctx'> 			dev-&gt;patch_status[i] = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk ("upload patch "</div><div class='del'>-				    "error 0x%x\n", x);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"upload patch error 0x%x\n", x);</div><div class='ctx'> 			dev-&gt;patch_status[i] = 0;</div><div class='ctx'> 			return 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -722,7 +725,8 @@ wavefront_get_patch_status (snd_wavefront_t *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk ("%d patch slots filled, %d in use\n", cnt, cnt2);</div><div class='add'>+	dev_info(dev-&gt;card-&gt;dev, "%d patch slots filled, %d in use\n",</div><div class='add'>+		 cnt, cnt2);</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='hunk'>@@ -739,8 +743,9 @@ wavefront_get_program_status (snd_wavefront_t *dev)</div><div class='ctx'> 	for (i = 0; i &lt; WF_MAX_PROGRAM; i++) {</div><div class='ctx'> 		prognum = i;</div><div class='ctx'> </div><div class='del'>-		if ((x = snd_wavefront_cmd (dev, WFC_UPLOAD_PROGRAM, progbuf,</div><div class='del'>-					&amp;prognum)) == 0) {</div><div class='add'>+		x = snd_wavefront_cmd(dev, WFC_UPLOAD_PROGRAM, progbuf,</div><div class='add'>+				      &amp;prognum);</div><div class='add'>+		if (x == 0) {</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;prog_status[i] |= WF_SLOT_USED;</div><div class='ctx'> </div><div class='hunk'>@@ -757,8 +762,8 @@ wavefront_get_program_status (snd_wavefront_t *dev)</div><div class='ctx'> 		} else if (x == 1) { /* Bad program number */</div><div class='ctx'> 			dev-&gt;prog_status[i] = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk ("upload program "</div><div class='del'>-				    "error 0x%x\n", x);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"upload program error 0x%x\n", x);</div><div class='ctx'> 			dev-&gt;prog_status[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -769,7 +774,7 @@ wavefront_get_program_status (snd_wavefront_t *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk ("%d programs slots in use\n", cnt);</div><div class='add'>+	dev_info(dev-&gt;card-&gt;dev, "%d programs slots in use\n", cnt);</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='hunk'>@@ -784,15 +789,17 @@ wavefront_send_patch (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	DPRINT (WF_DEBUG_LOAD_PATCH, "downloading patch %d\n",</div><div class='ctx'> 				      header-&gt;number);</div><div class='ctx'> </div><div class='add'>+	if (header-&gt;number &gt;= ARRAY_SIZE(dev-&gt;patch_status))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;patch_status[header-&gt;number] |= WF_SLOT_FILLED;</div><div class='ctx'> </div><div class='del'>-	bptr = buf;</div><div class='ctx'> 	bptr = munge_int32 (header-&gt;number, buf, 2);</div><div class='ctx'> 	munge_buf ((unsigned char *)&amp;header-&gt;hdr.p, bptr, WF_PATCH_BYTES);</div><div class='ctx'>     </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PATCH, NULL, buf)) {</div><div class='del'>-		snd_printk ("download patch failed\n");</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "download patch failed\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='hunk'>@@ -808,6 +815,9 @@ wavefront_send_program (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	DPRINT (WF_DEBUG_LOAD_PATCH, "downloading program %d\n",</div><div class='ctx'> 		header-&gt;number);</div><div class='ctx'> </div><div class='add'>+	if (header-&gt;number &gt;= ARRAY_SIZE(dev-&gt;prog_status))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;prog_status[header-&gt;number] = WF_SLOT_USED;</div><div class='ctx'> </div><div class='ctx'> 	/* XXX need to zero existing SLOT_USED bit for program_status[i]</div><div class='hunk'>@@ -829,8 +839,8 @@ wavefront_send_program (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	munge_buf ((unsigned char *)&amp;header-&gt;hdr.pr, &amp;buf[1], WF_PROGRAM_BYTES);</div><div class='ctx'>     </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PROGRAM, NULL, buf)) {</div><div class='del'>-		snd_printk ("download patch failed\n");	</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "download patch failed\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='hunk'>@@ -843,7 +853,7 @@ wavefront_freemem (snd_wavefront_t *dev)</div><div class='ctx'> 	char rbuf[8];</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_REPORT_FREE_MEMORY, rbuf, NULL)) {</div><div class='del'>-		snd_printk ("can't get memory stats.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "can't get memory stats.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return demunge_int32 (rbuf, 4);</div><div class='hunk'>@@ -890,13 +900,16 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 	if (header-&gt;number == WAVEFRONT_FIND_FREE_SAMPLE_SLOT) {</div><div class='ctx'> 		int x;</div><div class='ctx'> </div><div class='del'>-		if ((x = wavefront_find_free_sample (dev)) &lt; 0) {</div><div class='add'>+		x = wavefront_find_free_sample(dev);</div><div class='add'>+		if (x &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		snd_printk ("unspecified sample =&gt; %d\n", x);</div><div class='add'>+		dev_info(dev-&gt;card-&gt;dev, "unspecified sample =&gt; %d\n", x);</div><div class='ctx'> 		header-&gt;number = x;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (header-&gt;number &gt;= WF_MAX_SAMPLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (header-&gt;size) {</div><div class='ctx'> </div><div class='ctx'> 		/* XXX it's a debatable point whether or not RDONLY semantics</div><div class='hunk'>@@ -924,9 +937,9 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> </div><div class='ctx'> 		if (dev-&gt;rom_samples_rdonly) {</div><div class='ctx'> 			if (dev-&gt;sample_status[header-&gt;number] &amp; WF_SLOT_ROM) {</div><div class='del'>-				snd_printk ("sample slot %d "</div><div class='del'>-					    "write protected\n",</div><div class='del'>-					    header-&gt;number);</div><div class='add'>+				dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+					"sample slot %d write protected\n",</div><div class='add'>+					header-&gt;number);</div><div class='ctx'> 				return -EACCES;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -937,10 +950,10 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 	if (header-&gt;size) {</div><div class='ctx'> 		dev-&gt;freemem = wavefront_freemem (dev);</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;freemem &lt; (int)header-&gt;size) {</div><div class='del'>-			snd_printk ("insufficient memory to "</div><div class='del'>-				    "load %d byte sample.\n",</div><div class='del'>-				    header-&gt;size);</div><div class='add'>+		if (dev-&gt;freemem &lt; 0 || dev-&gt;freemem &lt; header-&gt;size) {</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"insufficient memory to load %u byte sample.\n",</div><div class='add'>+				header-&gt;size);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	</div><div class='hunk'>@@ -949,9 +962,9 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 	skip = WF_GET_CHANNEL(&amp;header-&gt;hdr.s);</div><div class='ctx'> </div><div class='ctx'> 	if (skip &gt; 0 &amp;&amp; header-&gt;hdr.s.SampleResolution != LINEAR_16BIT) {</div><div class='del'>-		snd_printk ("channel selection only "</div><div class='del'>-			    "possible on 16-bit samples");</div><div class='del'>-		return -(EINVAL);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+			"channel selection only possible on 16-bit samples");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (skip) {</div><div class='hunk'>@@ -1046,9 +1059,9 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 			   header-&gt;size ?</div><div class='ctx'> 			   WFC_DOWNLOAD_SAMPLE : WFC_DOWNLOAD_SAMPLE_HEADER,</div><div class='ctx'> 			   NULL, sample_hdr)) {</div><div class='del'>-		snd_printk ("sample %sdownload refused.\n",</div><div class='del'>-			    header-&gt;size ? "" : "header ");</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "sample %sdownload refused.\n",</div><div class='add'>+			header-&gt;size ? "" : "header ");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (header-&gt;size == 0) {</div><div class='hunk'>@@ -1072,16 +1085,17 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) {</div><div class='del'>-			snd_printk ("download block "</div><div class='del'>-				    "request refused.\n");</div><div class='del'>-			return -(EIO);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"download block request refused.\n");</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; blocksize; i++) {</div><div class='ctx'> </div><div class='ctx'> 			if (dataptr &lt; data_end) {</div><div class='ctx'> 		</div><div class='del'>-				__get_user (sample_short, dataptr);</div><div class='add'>+				if (get_user(sample_short, dataptr))</div><div class='add'>+					return -EFAULT;</div><div class='ctx'> 				dataptr += skip;</div><div class='ctx'> 		</div><div class='ctx'> 				if (data_is_unsigned) { /* GUS ? */</div><div class='hunk'>@@ -1130,16 +1144,17 @@ wavefront_send_sample (snd_wavefront_t *dev,</div><div class='ctx'> 		   nothing to do with DMA at all.</div><div class='ctx'> 		*/</div><div class='ctx'> 	</div><div class='del'>-		if ((dma_ack = wavefront_read (dev)) != WF_DMA_ACK) {</div><div class='add'>+		dma_ack = wavefront_read(dev);</div><div class='add'>+		if (dma_ack != WF_DMA_ACK) {</div><div class='ctx'> 			if (dma_ack == -1) {</div><div class='del'>-				snd_printk ("upload sample "</div><div class='del'>-					    "DMA ack timeout\n");</div><div class='del'>-				return -(EIO);</div><div class='add'>+				dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+					"upload sample DMA ack timeout\n");</div><div class='add'>+				return -EIO;</div><div class='ctx'> 			} else {</div><div class='del'>-				snd_printk ("upload sample "</div><div class='del'>-					    "DMA ack error 0x%x\n",</div><div class='del'>-					    dma_ack);</div><div class='del'>-				return -(EIO);</div><div class='add'>+				dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+					"upload sample DMA ack error 0x%x\n",</div><div class='add'>+					dma_ack);</div><div class='add'>+				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1164,7 +1179,10 @@ wavefront_send_alias (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 				      "alias for %d\n",</div><div class='ctx'> 				      header-&gt;number,</div><div class='ctx'> 				      header-&gt;hdr.a.OriginalSample);</div><div class='del'>-    </div><div class='add'>+</div><div class='add'>+	if (header-&gt;number &gt;= WF_MAX_SAMPLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	munge_int32 (header-&gt;number, &amp;alias_hdr[0], 2);</div><div class='ctx'> 	munge_int32 (header-&gt;hdr.a.OriginalSample, &amp;alias_hdr[2], 2);</div><div class='ctx'> 	munge_int32 (*((unsigned int *)&amp;header-&gt;hdr.a.sampleStartOffset),</div><div class='hunk'>@@ -1179,8 +1197,8 @@ wavefront_send_alias (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	munge_int32 (*(&amp;header-&gt;hdr.a.FrequencyBias+1), &amp;alias_hdr[23], 2);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_SAMPLE_ALIAS, NULL, alias_hdr)) {</div><div class='del'>-		snd_printk ("download alias failed.\n");</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "download alias failed.\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;sample_status[header-&gt;number] = (WF_SLOT_FILLED|WF_ST_ALIAS);</div><div class='hunk'>@@ -1195,7 +1213,10 @@ wavefront_send_multisample (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	int num_samples;</div><div class='ctx'> 	unsigned char *msample_hdr;</div><div class='ctx'> </div><div class='del'>-	msample_hdr = kmalloc(sizeof(WF_MSAMPLE_BYTES), GFP_KERNEL);</div><div class='add'>+	if (header-&gt;number &gt;= WF_MAX_SAMPLE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	msample_hdr = kmalloc(WF_MSAMPLE_BYTES, GFP_KERNEL);</div><div class='ctx'> 	if (! msample_hdr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1229,9 +1250,9 @@ wavefront_send_multisample (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_MULTISAMPLE, </div><div class='ctx'> 			   (unsigned char *) (long) ((num_samples*2)+3),</div><div class='ctx'> 			   msample_hdr)) {</div><div class='del'>-		snd_printk ("download of multisample failed.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "download of multisample failed.\n");</div><div class='ctx'> 		kfree(msample_hdr);</div><div class='del'>-		return -(EIO);</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;sample_status[header-&gt;number] = (WF_SLOT_FILLED|WF_ST_MULTISAMPLE);</div><div class='hunk'>@@ -1252,8 +1273,8 @@ wavefront_fetch_multisample (snd_wavefront_t *dev,</div><div class='ctx'> 	munge_int32 (header-&gt;number, number, 2);</div><div class='ctx'>     </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_UPLOAD_MULTISAMPLE, log_ns, number)) {</div><div class='del'>-		snd_printk ("upload multisample failed.\n");</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "upload multisample failed.\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'>     </div><div class='ctx'> 	DPRINT (WF_DEBUG_DATA, "msample %d has %d samples\n",</div><div class='hunk'>@@ -1269,17 +1290,19 @@ wavefront_fetch_multisample (snd_wavefront_t *dev,</div><div class='ctx'> 		char d[2];</div><div class='ctx'> 		int val;</div><div class='ctx'> 	</div><div class='del'>-		if ((val = wavefront_read (dev)) == -1) {</div><div class='del'>-			snd_printk ("upload multisample failed "</div><div class='del'>-				    "during sample loop.\n");</div><div class='del'>-			return -(EIO);</div><div class='add'>+		val = wavefront_read(dev);</div><div class='add'>+		if (val == -1) {</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"upload multisample failed during sample loop.\n");</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		d[0] = val;</div><div class='ctx'> </div><div class='del'>-		if ((val = wavefront_read (dev)) == -1) {</div><div class='del'>-			snd_printk ("upload multisample failed "</div><div class='del'>-				    "during sample loop.\n");</div><div class='del'>-			return -(EIO);</div><div class='add'>+		val = wavefront_read(dev);</div><div class='add'>+		if (val == -1) {</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"upload multisample failed during sample loop.\n");</div><div class='add'>+			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		d[1] = val;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1313,8 +1336,8 @@ wavefront_send_drum (snd_wavefront_t *dev, wavefront_patch_info *header)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_EDRUM_PROGRAM, NULL, drumbuf)) {</div><div class='del'>-		snd_printk ("download drum failed.\n");</div><div class='del'>-		return -(EIO);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "download drum failed.\n");</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return (0);</div><div class='hunk'>@@ -1331,7 +1354,7 @@ wavefront_find_free_sample (snd_wavefront_t *dev)</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk ("no free sample slots!\n");</div><div class='add'>+	dev_err(dev-&gt;card-&gt;dev, "no free sample slots!\n");</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1347,7 +1370,7 @@ wavefront_find_free_patch (snd_wavefront_t *dev)</div><div class='ctx'> 			return i;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk ("no free patch slots!\n");</div><div class='add'>+	dev_err(dev-&gt;card-&gt;dev, "no free patch slots!\n");</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1364,7 +1387,7 @@ wavefront_load_patch (snd_wavefront_t *dev, const char __user *addr)</div><div class='ctx'> </div><div class='ctx'> 	if (copy_from_user (header, addr, sizeof(wavefront_patch_info) -</div><div class='ctx'> 			    sizeof(wavefront_any))) {</div><div class='del'>-		snd_printk ("bad address for load patch.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "bad address for load patch.\n");</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto __error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1442,8 +1465,8 @@ wavefront_load_patch (snd_wavefront_t *dev, const char __user *addr)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk ("unknown patch type %d.\n",</div><div class='del'>-			    header-&gt;subkey);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "unknown patch type %d.\n",</div><div class='add'>+			header-&gt;subkey);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1506,13 +1529,13 @@ wavefront_synth_control (snd_wavefront_card_t *acard,</div><div class='ctx'> 	switch (wc-&gt;cmd) {</div><div class='ctx'> 		</div><div class='ctx'> 	case WFC_DISABLE_INTERRUPTS:</div><div class='del'>-		snd_printk ("interrupts disabled.\n");</div><div class='add'>+		dev_dbg(dev-&gt;card-&gt;dev, "interrupts disabled.\n");</div><div class='ctx'> 		outb (0x80|0x20, dev-&gt;control_port);</div><div class='ctx'> 		dev-&gt;interrupts_are_midi = 1;</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case WFC_ENABLE_INTERRUPTS:</div><div class='del'>-		snd_printk ("interrupts enabled.\n");</div><div class='add'>+		dev_dbg(dev-&gt;card-&gt;dev, "interrupts enabled.\n");</div><div class='ctx'> 		outb (0x80|0x40|0x20, dev-&gt;control_port);</div><div class='ctx'> 		dev-&gt;interrupts_are_midi = 1;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1529,7 +1552,7 @@ wavefront_synth_control (snd_wavefront_card_t *acard,</div><div class='ctx'> 	case WFC_IDENTIFY_SLOT_TYPE:</div><div class='ctx'> 		i = wc-&gt;wbuf[0] | (wc-&gt;wbuf[1] &lt;&lt; 7);</div><div class='ctx'> 		if (i &lt;0 || i &gt;= WF_MAX_SAMPLE) {</div><div class='del'>-			snd_printk ("invalid slot ID %d\n",</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "invalid slot ID %d\n",</div><div class='ctx'> 				i);</div><div class='ctx'> 			wc-&gt;status = EINVAL;</div><div class='ctx'> 			return -EINVAL;</div><div class='hunk'>@@ -1540,7 +1563,7 @@ wavefront_synth_control (snd_wavefront_card_t *acard,</div><div class='ctx'> </div><div class='ctx'> 	case WFC_DEBUG_DRIVER:</div><div class='ctx'> 		dev-&gt;debug = wc-&gt;wbuf[0];</div><div class='del'>-		snd_printk ("debug = 0x%x\n", dev-&gt;debug);</div><div class='add'>+		dev_dbg(dev-&gt;card-&gt;dev, "debug = 0x%x\n", dev-&gt;debug);</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case WFC_UPLOAD_PATCH:</div><div class='hunk'>@@ -1557,8 +1580,8 @@ wavefront_synth_control (snd_wavefront_card_t *acard,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	case WFC_UPLOAD_SAMPLE_ALIAS:</div><div class='del'>-		snd_printk ("support for sample alias upload "</div><div class='del'>-			"being considered.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+			"support for sample alias upload being considered.\n");</div><div class='ctx'> 		wc-&gt;status = EINVAL;</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1599,9 +1622,8 @@ wavefront_synth_control (snd_wavefront_card_t *acard,</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case WFC_UPLOAD_SAMPLE_ALIAS:</div><div class='del'>-			snd_printk ("support for "</div><div class='del'>-				    "sample aliases still "</div><div class='del'>-				    "being considered.\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"support for sample aliases still being considered.\n");</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case WFC_VMIDI_OFF:</div><div class='hunk'>@@ -1719,10 +1741,10 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;dev-&gt;irq_lock);</div><div class='del'>-	dev-&gt;irq_ok = 1;</div><div class='del'>-	dev-&gt;irq_cnt++;</div><div class='del'>-	spin_unlock(&amp;dev-&gt;irq_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;dev-&gt;irq_lock) {</div><div class='add'>+		dev-&gt;irq_ok = 1;</div><div class='add'>+		dev-&gt;irq_cnt++;</div><div class='add'>+	}</div><div class='ctx'> 	wake_up(&amp;dev-&gt;interrupt_sleeper);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1738,8 +1760,8 @@ snd_wavefront_internal_interrupt (snd_wavefront_card_t *card)</div><div class='ctx'> 7 Unused</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='del'>-snd_wavefront_interrupt_bits (int irq)</div><div class='add'>+static int</div><div class='add'>+snd_wavefront_interrupt_bits(snd_wavefront_t *dev, int irq)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	int bits;</div><div class='hunk'>@@ -1759,33 +1781,33 @@ snd_wavefront_interrupt_bits (int irq)</div><div class='ctx'> 		break;</div><div class='ctx'> 	</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk ("invalid IRQ %d\n", irq);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "invalid IRQ %d\n", irq);</div><div class='ctx'> 		bits = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return bits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> wavefront_should_cause_interrupt (snd_wavefront_t *dev, </div><div class='ctx'> 				  int val, int port, unsigned long timeout)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	wait_queue_t wait;</div><div class='add'>+	wait_queue_entry_t wait;</div><div class='ctx'> </div><div class='ctx'> 	init_waitqueue_entry(&amp;wait, current);</div><div class='del'>-	spin_lock_irq(&amp;dev-&gt;irq_lock);</div><div class='del'>-	add_wait_queue(&amp;dev-&gt;interrupt_sleeper, &amp;wait);</div><div class='del'>-	dev-&gt;irq_ok = 0;</div><div class='del'>-	outb (val,port);</div><div class='del'>-	spin_unlock_irq(&amp;dev-&gt;irq_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;dev-&gt;irq_lock) {</div><div class='add'>+		add_wait_queue(&amp;dev-&gt;interrupt_sleeper, &amp;wait);</div><div class='add'>+		dev-&gt;irq_ok = 0;</div><div class='add'>+		outb(val, port);</div><div class='add'>+	}</div><div class='ctx'> 	while (!dev-&gt;irq_ok &amp;&amp; time_before(jiffies, timeout)) {</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		barrier();</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -1794,7 +1816,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* IRQ already checked */</div><div class='ctx'> </div><div class='del'>-	bits = snd_wavefront_interrupt_bits (dev-&gt;irq);</div><div class='add'>+	bits = snd_wavefront_interrupt_bits(dev, dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* try reset of port */</div><div class='ctx'> </div><div class='hunk'>@@ -1864,7 +1886,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;irq_ok) {</div><div class='del'>-		snd_printk ("intr not received after h/w un-reset.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "intr not received after h/w un-reset.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='hunk'>@@ -1888,17 +1910,18 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> 					 dev-&gt;data_port, ramcheck_time*HZ);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;irq_ok) {</div><div class='del'>-		snd_printk ("post-RAM-check interrupt not received.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "post-RAM-check interrupt not received.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	} </div><div class='ctx'> </div><div class='ctx'> 	if (!wavefront_wait (dev, STAT_CAN_READ)) {</div><div class='del'>-		snd_printk ("no response to HW version cmd.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "no response to HW version cmd.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	if ((hwv[0] = wavefront_read (dev)) == -1) {</div><div class='del'>-		snd_printk ("board not responding correctly.\n");</div><div class='add'>+	hwv[0] = wavefront_read(dev);</div><div class='add'>+	if (hwv[0] == -1) {</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "board not responding correctly.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1908,12 +1931,13 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> 		   and tell us about it either way.</div><div class='ctx'> 		*/</div><div class='ctx'> 		</div><div class='del'>-		if ((hwv[0] = wavefront_read (dev)) == -1) {</div><div class='del'>-			snd_printk ("on-board RAM test failed "</div><div class='del'>-				    "(bad error code).\n");</div><div class='add'>+		hwv[0] = wavefront_read(dev);</div><div class='add'>+		if (hwv[0] == -1) {</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"on-board RAM test failed (bad error code).\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk ("on-board RAM test failed "</div><div class='del'>-				    "(error code: 0x%x).\n",</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"on-board RAM test failed (error code: 0x%x).\n",</div><div class='ctx'> 				hwv[0]);</div><div class='ctx'> 		}</div><div class='ctx'> 		goto gone_bad;</div><div class='hunk'>@@ -1921,13 +1945,14 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* We're OK, just get the next byte of the HW version response */</div><div class='ctx'> </div><div class='del'>-	if ((hwv[1] = wavefront_read (dev)) == -1) {</div><div class='del'>-		snd_printk ("incorrect h/w response.\n");</div><div class='add'>+	hwv[1] = wavefront_read(dev);</div><div class='add'>+	if (hwv[1] == -1) {</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "incorrect h/w response.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk ("hardware version %d.%d\n",</div><div class='del'>-		    hwv[0], hwv[1]);</div><div class='add'>+	dev_info(dev-&gt;card-&gt;dev, "hardware version %d.%d\n",</div><div class='add'>+		 hwv[0], hwv[1]);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1936,7 +1961,7 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)</div><div class='ctx'> 	return (1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> wavefront_download_firmware (snd_wavefront_t *dev, char *path)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -1947,7 +1972,7 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)</div><div class='ctx'> </div><div class='ctx'> 	err = request_firmware(&amp;firmware, path, dev-&gt;card-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "firmware (%s) download failed!!!\n", path);</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "firmware (%s) download failed!!!\n", path);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1958,16 +1983,16 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)</div><div class='ctx'> 		if (section_length == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (section_length &lt; 0 || section_length &gt; WF_SECTION_MAX) {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "invalid firmware section length %d\n",</div><div class='del'>-				   section_length);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"invalid firmware section length %d\n",</div><div class='add'>+				section_length);</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 		}</div><div class='ctx'> 		buf++;</div><div class='ctx'> 		len++;</div><div class='ctx'> </div><div class='ctx'> 		if (firmware-&gt;size &lt; len + section_length) {</div><div class='del'>-			snd_printk(KERN_ERR "firmware section read error.\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "firmware section read error.\n");</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1984,15 +2009,14 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)</div><div class='ctx'> 	</div><div class='ctx'> 		/* get ACK */</div><div class='ctx'> 		if (!wavefront_wait(dev, STAT_CAN_READ)) {</div><div class='del'>-			snd_printk(KERN_ERR "time out for firmware ACK.\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "time out for firmware ACK.\n");</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 		}</div><div class='ctx'> 		err = inb(dev-&gt;data_port);</div><div class='ctx'> 		if (err != WF_ACK) {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "download of section #%d not "</div><div class='del'>-				   "acknowledged, ack = 0x%x\n",</div><div class='del'>-				   section_cnt_downloaded + 1, err);</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"download of section #%d not acknowledged, ack = 0x%x\n",</div><div class='add'>+				section_cnt_downloaded + 1, err);</div><div class='ctx'> 			goto failure;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2004,19 +2028,19 @@ wavefront_download_firmware (snd_wavefront_t *dev, char *path)</div><div class='ctx'> </div><div class='ctx'>  failure:</div><div class='ctx'> 	release_firmware(firmware);</div><div class='del'>-	snd_printk(KERN_ERR "firmware download failed!!!\n");</div><div class='add'>+	dev_err(dev-&gt;card-&gt;dev, "firmware download failed!!!\n");</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> wavefront_do_reset (snd_wavefront_t *dev)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'> 	char voices[1];</div><div class='ctx'> </div><div class='ctx'> 	if (wavefront_reset_to_cleanliness (dev)) {</div><div class='del'>-		snd_printk ("hw reset failed.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "hw reset failed.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2040,7 +2064,7 @@ wavefront_do_reset (snd_wavefront_t *dev)</div><div class='ctx'> 						  (osrun_time*HZ));</div><div class='ctx'> </div><div class='ctx'> 		if (!dev-&gt;irq_ok) {</div><div class='del'>-			snd_printk ("no post-OS interrupt.\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "no post-OS interrupt.\n");</div><div class='ctx'> 			goto gone_bad;</div><div class='ctx'> 		}</div><div class='ctx'> 		</div><div class='hunk'>@@ -2050,7 +2074,7 @@ wavefront_do_reset (snd_wavefront_t *dev)</div><div class='ctx'> 						  dev-&gt;data_port, (10*HZ));</div><div class='ctx'> 		</div><div class='ctx'> 		if (!dev-&gt;irq_ok) {</div><div class='del'>-			snd_printk ("no post-OS interrupt(2).\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev, "no post-OS interrupt(2).\n");</div><div class='ctx'> 			goto gone_bad;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2066,24 +2090,24 @@ wavefront_do_reset (snd_wavefront_t *dev)</div><div class='ctx'> 	   about it.</div><div class='ctx'> 	*/</div><div class='ctx'> 	</div><div class='del'>-	if ((dev-&gt;freemem = wavefront_freemem (dev)) &lt; 0) {</div><div class='add'>+	dev-&gt;freemem = wavefront_freemem(dev);</div><div class='add'>+	if (dev-&gt;freemem &lt; 0)</div><div class='ctx'> 		goto gone_bad;</div><div class='del'>-	}</div><div class='ctx'> 		</div><div class='del'>-	snd_printk ("available DRAM %dk\n", dev-&gt;freemem / 1024);</div><div class='add'>+	dev_info(dev-&gt;card-&gt;dev, "available DRAM %dk\n", dev-&gt;freemem / 1024);</div><div class='ctx'> </div><div class='ctx'> 	if (wavefront_write (dev, 0xf0) ||</div><div class='ctx'> 	    wavefront_write (dev, 1) ||</div><div class='ctx'> 	    (wavefront_read (dev) &lt; 0)) {</div><div class='ctx'> 		dev-&gt;debug = 0;</div><div class='del'>-		snd_printk ("MPU emulation mode not set.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "MPU emulation mode not set.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	voices[0] = 32;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_wavefront_cmd (dev, WFC_SET_NVOICES, NULL, voices)) {</div><div class='del'>-		snd_printk ("cannot set number of voices to 32.\n");</div><div class='add'>+		dev_err(dev-&gt;card-&gt;dev, "cannot set number of voices to 32.\n");</div><div class='ctx'> 		goto gone_bad;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2098,7 +2122,7 @@ wavefront_do_reset (snd_wavefront_t *dev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit</div><div class='add'>+int</div><div class='ctx'> snd_wavefront_start (snd_wavefront_t *dev)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -2140,7 +2164,7 @@ snd_wavefront_start (snd_wavefront_t *dev)</div><div class='ctx'> 	return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit</div><div class='add'>+int</div><div class='ctx'> snd_wavefront_detect (snd_wavefront_card_t *card)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='hunk'>@@ -2163,8 +2187,8 @@ snd_wavefront_detect (snd_wavefront_card_t *card)</div><div class='ctx'> 		dev-&gt;fw_version[0] = rbuf[0];</div><div class='ctx'> 		dev-&gt;fw_version[1] = rbuf[1];</div><div class='ctx'> </div><div class='del'>-		snd_printk ("firmware %d.%d already loaded.\n",</div><div class='del'>-			    rbuf[0], rbuf[1]);</div><div class='add'>+		dev_info(dev-&gt;card-&gt;dev, "firmware %d.%d already loaded.\n",</div><div class='add'>+			 rbuf[0], rbuf[1]);</div><div class='ctx'> </div><div class='ctx'> 		/* check that a command actually works */</div><div class='ctx'>       </div><div class='hunk'>@@ -2173,22 +2197,24 @@ snd_wavefront_detect (snd_wavefront_card_t *card)</div><div class='ctx'> 			dev-&gt;hw_version[0] = rbuf[0];</div><div class='ctx'> 			dev-&gt;hw_version[1] = rbuf[1];</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk ("not raw, but no "</div><div class='del'>-				    "hardware version!\n");</div><div class='add'>+			dev_err(dev-&gt;card-&gt;dev,</div><div class='add'>+				"not raw, but no hardware version!\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!wf_raw) {</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk ("reloading firmware as you requested.\n");</div><div class='add'>+			dev_info(dev-&gt;card-&gt;dev,</div><div class='add'>+				 "reloading firmware as you requested.\n");</div><div class='ctx'> 			dev-&gt;israw = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;israw = 1;</div><div class='del'>-		snd_printk ("no response to firmware probe, assume raw.\n");</div><div class='add'>+		dev_info(dev-&gt;card-&gt;dev,</div><div class='add'>+			 "no response to firmware probe, assume raw.\n");</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/sound/isa/wss/Makefile b/sound/isa/wss/Makefile<br/>index 454fee769a31..f23e71d0d5d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wss/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wss/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wss/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wss/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2008 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-wss-lib-objs := wss_lib.o</div><div class='add'>+snd-wss-lib-y := wss_lib.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_WSS_LIB) += snd-wss-lib.o</div><div class='head'>diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c<br/>index 9191b32d9130..6cf88625bbc3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/isa/wss/wss_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/isa/wss/wss_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/isa/wss/wss_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/isa/wss/wss_lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of CS4231(A)/CS4232/InterWave &amp; compatible chips</div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *       Yamaha OPL3-SA3 chip</div><div class='ctx'>  *     - CS4231 (GUS MAX) - still trouble with occasional noises</div><div class='ctx'>  *			  - broken initialization?</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -30,12 +16,13 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/wss.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +38,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  *  Some variables</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char freq_bits[14] = {</div><div class='add'>+static const unsigned char freq_bits[14] = {</div><div class='ctx'> 	/* 5510 */	0x00 | CS4231_XTAL2,</div><div class='ctx'> 	/* 6620 */	0x0E | CS4231_XTAL2,</div><div class='ctx'> 	/* 8000 */	0x00 | CS4231_XTAL1,</div><div class='hunk'>@@ -68,12 +55,12 @@ static unsigned char freq_bits[14] = {</div><div class='ctx'> 	/* 48000 */	0x0C | CS4231_XTAL1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[14] = {</div><div class='add'>+static const unsigned int rates[14] = {</div><div class='ctx'> 	5510, 6620, 8000, 9600, 11025, 16000, 18900, 22050,</div><div class='ctx'> 	27042, 32000, 33075, 37800, 44100, 48000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -85,7 +72,7 @@ static int snd_wss_xrate(struct snd_pcm_runtime *runtime)</div><div class='ctx'> 					  &amp;hw_constraints_rates);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_wss_original_image[32] =</div><div class='add'>+static const unsigned char snd_wss_original_image[32] =</div><div class='ctx'> {</div><div class='ctx'> 	0x00,			/* 00/00 - lic */</div><div class='ctx'> 	0x00,			/* 01/01 - ric */</div><div class='hunk'>@@ -121,7 +108,7 @@ static unsigned char snd_wss_original_image[32] =</div><div class='ctx'> 	0x00,			/* 1f/31 - cbrl */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char snd_opti93x_original_image[32] =</div><div class='add'>+static const unsigned char snd_opti93x_original_image[32] =</div><div class='ctx'> {</div><div class='ctx'> 	0x00,		/* 00/00 - l_mixout_outctrl */</div><div class='ctx'> 	0x00,		/* 01/01 - r_mixout_outctrl */</div><div class='hunk'>@@ -200,15 +187,16 @@ void snd_wss_out(struct snd_wss *chip, unsigned char reg, unsigned char value)</div><div class='ctx'> 	snd_wss_wait(chip);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT)</div><div class='del'>-		snd_printk(KERN_DEBUG "out: auto calibration time out "</div><div class='del'>-			   "- reg = 0x%x, value = 0x%x\n", reg, value);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"out: auto calibration time out - reg = 0x%x, value = 0x%x\n",</div><div class='add'>+			reg, value);</div><div class='ctx'> #endif</div><div class='ctx'> 	wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | reg);</div><div class='ctx'> 	wss_outb(chip, CS4231P(REG), value);</div><div class='ctx'> 	chip-&gt;image[reg] = value;</div><div class='ctx'> 	mb();</div><div class='del'>-	snd_printdd("codec out - reg 0x%x = 0x%x\n",</div><div class='del'>-			chip-&gt;mce_bit | reg, value);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "codec out - reg 0x%x = 0x%x\n",</div><div class='add'>+		chip-&gt;mce_bit | reg, value);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_out);</div><div class='ctx'> </div><div class='hunk'>@@ -217,8 +205,8 @@ unsigned char snd_wss_in(struct snd_wss *chip, unsigned char reg)</div><div class='ctx'> 	snd_wss_wait(chip);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT)</div><div class='del'>-		snd_printk(KERN_DEBUG "in: auto calibration time out "</div><div class='del'>-			   "- reg = 0x%x\n", reg);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"in: auto calibration time out - reg = 0x%x\n", reg);</div><div class='ctx'> #endif</div><div class='ctx'> 	wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | reg);</div><div class='ctx'> 	mb();</div><div class='hunk'>@@ -235,7 +223,7 @@ void snd_cs4236_ext_out(struct snd_wss *chip, unsigned char reg,</div><div class='ctx'> 	wss_outb(chip, CS4231P(REG), val);</div><div class='ctx'> 	chip-&gt;eimage[CS4236_REG(reg)] = val;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "ext out : reg = 0x%x, val = 0x%x\n", reg, val);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "ext out : reg = 0x%x, val = 0x%x\n", reg, val);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_cs4236_ext_out);</div><div class='hunk'>@@ -251,8 +239,8 @@ unsigned char snd_cs4236_ext_in(struct snd_wss *chip, unsigned char reg)</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned char res;</div><div class='ctx'> 		res = wss_inb(chip, CS4231P(REG));</div><div class='del'>-		printk(KERN_DEBUG "ext in : reg = 0x%x, val = 0x%x\n",</div><div class='del'>-		       reg, res);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "ext in : reg = 0x%x, val = 0x%x\n",</div><div class='add'>+			reg, res);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -263,87 +251,87 @@ EXPORT_SYMBOL(snd_cs4236_ext_in);</div><div class='ctx'> </div><div class='ctx'> static void snd_wss_debug(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"CS4231 REGS:      INDEX = 0x%02x  "</div><div class='ctx'> 		"                 STATUS = 0x%02x\n",</div><div class='ctx'> 					wss_inb(chip, CS4231P(REGSEL)),</div><div class='ctx'> 					wss_inb(chip, CS4231P(STATUS)));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x00: left input      = 0x%02x  "</div><div class='ctx'> 		"  0x10: alt 1 (CFIG 2)  = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x00),</div><div class='ctx'> 					snd_wss_in(chip, 0x10));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x01: right input     = 0x%02x  "</div><div class='ctx'> 		"  0x11: alt 2 (CFIG 3)  = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x01),</div><div class='ctx'> 					snd_wss_in(chip, 0x11));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x02: GF1 left input  = 0x%02x  "</div><div class='ctx'> 		"  0x12: left line in    = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x02),</div><div class='ctx'> 					snd_wss_in(chip, 0x12));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x03: GF1 right input = 0x%02x  "</div><div class='ctx'> 		"  0x13: right line in   = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x03),</div><div class='ctx'> 					snd_wss_in(chip, 0x13));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x04: CD left input   = 0x%02x  "</div><div class='ctx'> 		"  0x14: timer low       = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x04),</div><div class='ctx'> 					snd_wss_in(chip, 0x14));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x05: CD right input  = 0x%02x  "</div><div class='ctx'> 		"  0x15: timer high      = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x05),</div><div class='ctx'> 					snd_wss_in(chip, 0x15));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x06: left output     = 0x%02x  "</div><div class='ctx'> 		"  0x16: left MIC (PnP)  = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x06),</div><div class='ctx'> 					snd_wss_in(chip, 0x16));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x07: right output    = 0x%02x  "</div><div class='ctx'> 		"  0x17: right MIC (PnP) = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x07),</div><div class='ctx'> 					snd_wss_in(chip, 0x17));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x08: playback format = 0x%02x  "</div><div class='ctx'> 		"  0x18: IRQ status      = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x08),</div><div class='ctx'> 					snd_wss_in(chip, 0x18));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x09: iface (CFIG 1)  = 0x%02x  "</div><div class='ctx'> 		"  0x19: left line out   = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x09),</div><div class='ctx'> 					snd_wss_in(chip, 0x19));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0a: pin control     = 0x%02x  "</div><div class='ctx'> 		"  0x1a: mono control    = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0a),</div><div class='ctx'> 					snd_wss_in(chip, 0x1a));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0b: init &amp; status   = 0x%02x  "</div><div class='ctx'> 		"  0x1b: right line out  = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0b),</div><div class='ctx'> 					snd_wss_in(chip, 0x1b));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0c: revision &amp; mode = 0x%02x  "</div><div class='ctx'> 		"  0x1c: record format   = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0c),</div><div class='ctx'> 					snd_wss_in(chip, 0x1c));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0d: loopback        = 0x%02x  "</div><div class='ctx'> 		"  0x1d: var freq (PnP)  = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0d),</div><div class='ctx'> 					snd_wss_in(chip, 0x1d));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0e: ply upr count   = 0x%02x  "</div><div class='ctx'> 		"  0x1e: ply lwr count   = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0e),</div><div class='ctx'> 					snd_wss_in(chip, 0x1e));</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"  0x0f: rec upr count   = 0x%02x  "</div><div class='ctx'> 		"  0x1f: rec lwr count   = 0x%02x\n",</div><div class='ctx'> 					snd_wss_in(chip, 0x0f),</div><div class='hunk'>@@ -372,32 +360,29 @@ static void snd_wss_busy_wait(struct snd_wss *chip)</div><div class='ctx'> </div><div class='ctx'> void snd_wss_mce_up(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int timeout;</div><div class='ctx'> </div><div class='ctx'> 	snd_wss_wait(chip);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT)</div><div class='del'>-		snd_printk(KERN_DEBUG</div><div class='del'>-			   "mce_up - auto calibration time out (0)\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mce_up - auto calibration time out (0)\n");</div><div class='ctx'> #endif</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;mce_bit |= CS4231_MCE;</div><div class='ctx'> 	timeout = wss_inb(chip, CS4231P(REGSEL));</div><div class='ctx'> 	if (timeout == 0x80)</div><div class='del'>-		snd_printk(KERN_DEBUG "mce_up [0x%lx]: "</div><div class='del'>-			   "serious init problem - codec still busy\n",</div><div class='del'>-			   chip-&gt;port);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mce_up [0x%lx]: serious init problem - codec still busy\n",</div><div class='add'>+			chip-&gt;port);</div><div class='ctx'> 	if (!(timeout &amp; CS4231_MCE))</div><div class='ctx'> 		wss_outb(chip, CS4231P(REGSEL),</div><div class='ctx'> 			 chip-&gt;mce_bit | (timeout &amp; 0x1f));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_mce_up);</div><div class='ctx'> </div><div class='ctx'> void snd_wss_mce_down(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned long end_time;</div><div class='ctx'> 	int timeout;</div><div class='ctx'> 	int hw_mask = WSS_HW_CS4231_MASK | WSS_HW_CS4232_MASK | WSS_HW_AD1848;</div><div class='hunk'>@@ -406,30 +391,30 @@ void snd_wss_mce_down(struct snd_wss *chip)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT)</div><div class='del'>-		snd_printk(KERN_DEBUG "mce_down [0x%lx] - "</div><div class='del'>-			   "auto calibration time out (0)\n",</div><div class='del'>-			   (long)CS4231P(REGSEL));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mce_down [0x%lx] - auto calibration time out (0)\n",</div><div class='add'>+			(long)CS4231P(REGSEL));</div><div class='ctx'> #endif</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	chip-&gt;mce_bit &amp;= ~CS4231_MCE;</div><div class='del'>-	timeout = wss_inb(chip, CS4231P(REGSEL));</div><div class='del'>-	wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | (timeout &amp; 0x1f));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;mce_bit &amp;= ~CS4231_MCE;</div><div class='add'>+		timeout = wss_inb(chip, CS4231P(REGSEL));</div><div class='add'>+		wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | (timeout &amp; 0x1f));</div><div class='add'>+	}</div><div class='ctx'> 	if (timeout == 0x80)</div><div class='del'>-		snd_printk(KERN_DEBUG "mce_down [0x%lx]: "</div><div class='del'>-			   "serious init problem - codec still busy\n",</div><div class='del'>-			   chip-&gt;port);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mce_down [0x%lx]: serious init problem - codec still busy\n",</div><div class='add'>+			chip-&gt;port);</div><div class='ctx'> 	if ((timeout &amp; CS4231_MCE) == 0 || !(chip-&gt;hardware &amp; hw_mask))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Wait for (possible -- during init auto-calibration may not be set)</div><div class='del'>-	 * calibration process to start. Needs upto 5 sample periods on AD1848</div><div class='add'>+	 * calibration process to start. Needs up to 5 sample periods on AD1848</div><div class='ctx'> 	 * which at the slowest possible rate of 5.5125 kHz means 907 us.</div><div class='ctx'> 	 */</div><div class='ctx'> 	msleep(1);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("(1) jiffies = %lu\n", jiffies);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "(1) jiffies = %lu\n", jiffies);</div><div class='ctx'> </div><div class='ctx'> 	/* check condition up to 250 ms */</div><div class='ctx'> 	end_time = jiffies + msecs_to_jiffies(250);</div><div class='hunk'>@@ -437,27 +422,29 @@ void snd_wss_mce_down(struct snd_wss *chip)</div><div class='ctx'> 		CS4231_CALIB_IN_PROGRESS) {</div><div class='ctx'> </div><div class='ctx'> 		if (time_after(jiffies, end_time)) {</div><div class='del'>-			snd_printk(KERN_ERR "mce_down - "</div><div class='del'>-					"auto calibration time out (2)\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"mce_down - auto calibration time out (2)\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd("(2) jiffies = %lu\n", jiffies);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "(2) jiffies = %lu\n", jiffies);</div><div class='ctx'> </div><div class='ctx'> 	/* check condition up to 100 ms */</div><div class='ctx'> 	end_time = jiffies + msecs_to_jiffies(100);</div><div class='ctx'> 	while (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT) {</div><div class='ctx'> 		if (time_after(jiffies, end_time)) {</div><div class='del'>-			snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"mce_down - auto calibration time out (3)\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd("(3) jiffies = %lu\n", jiffies);</div><div class='del'>-	snd_printd("mce_down - exit = 0x%x\n", wss_inb(chip, CS4231P(REGSEL)));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "(3) jiffies = %lu\n", jiffies);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "mce_down - exit = 0x%x\n",</div><div class='add'>+		wss_inb(chip, CS4231P(REGSEL)));</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_mce_down);</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +493,7 @@ static int snd_wss_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			snd_pcm_trigger_done(s, substream);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (do_start) {</div><div class='ctx'> 		chip-&gt;image[CS4231_IFACE_CTRL] |= what;</div><div class='ctx'> 		if (chip-&gt;trigger)</div><div class='hunk'>@@ -517,7 +504,6 @@ static int snd_wss_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			chip-&gt;trigger(chip, what, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_wss_out(chip, CS4231_IFACE_CTRL, chip-&gt;image[CS4231_IFACE_CTRL]);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> #if 0</div><div class='ctx'> 	snd_wss_debug(chip);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -540,7 +526,7 @@ static unsigned char snd_wss_get_rate(unsigned int rate)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned char snd_wss_get_format(struct snd_wss *chip,</div><div class='del'>-					int format,</div><div class='add'>+					snd_pcm_format_t format,</div><div class='ctx'> 					int channels)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char rformat;</div><div class='hunk'>@@ -556,21 +542,18 @@ static unsigned char snd_wss_get_format(struct snd_wss *chip,</div><div class='ctx'> 	if (channels &gt; 1)</div><div class='ctx'> 		rformat |= CS4231_STEREO;</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printk(KERN_DEBUG "get_format: 0x%x (mode=0x%x)\n", format, mode);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "get_format: 0x%x (mode=0x%x)\n", format, mode);</div><div class='ctx'> #endif</div><div class='ctx'> 	return rformat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wss_calibrate_mute(struct snd_wss *chip, int mute)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	mute = mute ? 0x80 : 0;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	if (chip-&gt;calibrate_mute == mute) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (chip-&gt;calibrate_mute == mute)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	if (!mute) {</div><div class='ctx'> 		snd_wss_dout(chip, CS4231_LEFT_INPUT,</div><div class='ctx'> 			     chip-&gt;image[CS4231_LEFT_INPUT]);</div><div class='hunk'>@@ -618,20 +601,18 @@ static void snd_wss_calibrate_mute(struct snd_wss *chip, int mute)</div><div class='ctx'> 			     mute | chip-&gt;image[CS4231_LINE_RIGHT_OUTPUT]);</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;calibrate_mute = mute;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wss_playback_format(struct snd_wss *chip,</div><div class='ctx'> 				       struct snd_pcm_hw_params *params,</div><div class='ctx'> 				       unsigned char pdfr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int full_calib = 1;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mce_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> 	if (chip-&gt;hardware == WSS_HW_CS4231A ||</div><div class='ctx'> 	    (chip-&gt;hardware &amp; WSS_HW_CS4232_MASK)) {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		if ((chip-&gt;image[CS4231_PLAYBK_FORMAT] &amp; 0x0f) == (pdfr &amp; 0x0f)) {	/* rate is same? */</div><div class='ctx'> 			snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 				    chip-&gt;image[CS4231_ALT_FEATURE_1] | 0x10);</div><div class='hunk'>@@ -643,7 +624,6 @@ static void snd_wss_playback_format(struct snd_wss *chip,</div><div class='ctx'> 			udelay(100); /* Fixes audible clicks at least on GUS MAX */</div><div class='ctx'> 			full_calib = 0;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	} else if (chip-&gt;hardware == WSS_HW_AD1845) {</div><div class='ctx'> 		unsigned rate = params_rate(params);</div><div class='ctx'> </div><div class='hunk'>@@ -656,30 +636,28 @@ static void snd_wss_playback_format(struct snd_wss *chip,</div><div class='ctx'> 		 * NOTE: We seem to need to write to the MSB before the LSB</div><div class='ctx'> 		 *       to get the correct sample frequency.</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		snd_wss_out(chip, CS4231_PLAYBK_FORMAT, (pdfr &amp; 0xf0));</div><div class='ctx'> 		snd_wss_out(chip, AD1845_UPR_FREQ_SEL, (rate &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 		snd_wss_out(chip, AD1845_LWR_FREQ_SEL, rate &amp; 0xff);</div><div class='ctx'> 		full_calib = 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (full_calib) {</div><div class='ctx'> 		snd_wss_mce_up(chip);</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		if (chip-&gt;hardware != WSS_HW_INTERWAVE &amp;&amp; !chip-&gt;single_dma) {</div><div class='del'>-			if (chip-&gt;image[CS4231_IFACE_CTRL] &amp; CS4231_RECORD_ENABLE)</div><div class='del'>-				pdfr = (pdfr &amp; 0xf0) |</div><div class='del'>-				       (chip-&gt;image[CS4231_REC_FORMAT] &amp; 0x0f);</div><div class='del'>-		} else {</div><div class='del'>-			chip-&gt;image[CS4231_PLAYBK_FORMAT] = pdfr;</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			if (chip-&gt;hardware != WSS_HW_INTERWAVE &amp;&amp; !chip-&gt;single_dma) {</div><div class='add'>+				if (chip-&gt;image[CS4231_IFACE_CTRL] &amp; CS4231_RECORD_ENABLE)</div><div class='add'>+					pdfr = (pdfr &amp; 0xf0) |</div><div class='add'>+						(chip-&gt;image[CS4231_REC_FORMAT] &amp; 0x0f);</div><div class='add'>+			} else {</div><div class='add'>+				chip-&gt;image[CS4231_PLAYBK_FORMAT] = pdfr;</div><div class='add'>+			}</div><div class='add'>+			snd_wss_out(chip, CS4231_PLAYBK_FORMAT, pdfr);</div><div class='ctx'> 		}</div><div class='del'>-		snd_wss_out(chip, CS4231_PLAYBK_FORMAT, pdfr);</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 		if (chip-&gt;hardware == WSS_HW_OPL3SA2)</div><div class='ctx'> 			udelay(100);	/* this seems to help */</div><div class='ctx'> 		snd_wss_mce_down(chip);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wss_capture_format(struct snd_wss *chip,</div><div class='hunk'>@@ -689,10 +667,10 @@ static void snd_wss_capture_format(struct snd_wss *chip,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int full_calib = 1;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mce_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> 	if (chip-&gt;hardware == WSS_HW_CS4231A ||</div><div class='ctx'> 	    (chip-&gt;hardware &amp; WSS_HW_CS4232_MASK)) {</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		if ((chip-&gt;image[CS4231_PLAYBK_FORMAT] &amp; 0x0f) == (cdfr &amp; 0x0f) ||	/* rate is same? */</div><div class='ctx'> 		    (chip-&gt;image[CS4231_IFACE_CTRL] &amp; CS4231_PLAYBACK_ENABLE)) {</div><div class='ctx'> 			snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='hunk'>@@ -703,7 +681,6 @@ static void snd_wss_capture_format(struct snd_wss *chip,</div><div class='ctx'> 				chip-&gt;image[CS4231_ALT_FEATURE_1] &amp;= ~0x20);</div><div class='ctx'> 			full_calib = 0;</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	} else if (chip-&gt;hardware == WSS_HW_AD1845) {</div><div class='ctx'> 		unsigned rate = params_rate(params);</div><div class='ctx'> </div><div class='hunk'>@@ -716,12 +693,11 @@ static void snd_wss_capture_format(struct snd_wss *chip,</div><div class='ctx'> 		 * NOTE: We seem to need to write to the MSB before the LSB</div><div class='ctx'> 		 *       to get the correct sample frequency.</div><div class='ctx'> 		 */</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		snd_wss_out(chip, CS4231_REC_FORMAT, (cdfr &amp; 0xf0));</div><div class='ctx'> 		snd_wss_out(chip, AD1845_UPR_FREQ_SEL, (rate &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'> 		snd_wss_out(chip, AD1845_LWR_FREQ_SEL, rate &amp; 0xff);</div><div class='ctx'> 		full_calib = 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (full_calib) {</div><div class='ctx'> 		snd_wss_mce_up(chip);</div><div class='hunk'>@@ -746,7 +722,6 @@ static void snd_wss_capture_format(struct snd_wss *chip,</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 		snd_wss_mce_down(chip);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mce_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -764,10 +739,10 @@ static unsigned long snd_wss_timer_resolution(struct snd_timer *timer)</div><div class='ctx'> </div><div class='ctx'> static int snd_wss_timer_start(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int ticks;</div><div class='ctx'> 	struct snd_wss *chip = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ticks = timer-&gt;sticks;</div><div class='ctx'> 	if ((chip-&gt;image[CS4231_ALT_FEATURE_1] &amp; CS4231_TIMER_ENABLE) == 0 ||</div><div class='ctx'> 	    (unsigned char)(ticks &gt;&gt; 8) != chip-&gt;image[CS4231_TIMER_HIGH] ||</div><div class='hunk'>@@ -782,109 +757,100 @@ static int snd_wss_timer_start(struct snd_timer *timer)</div><div class='ctx'> 			    chip-&gt;image[CS4231_ALT_FEATURE_1] |</div><div class='ctx'> 			    CS4231_TIMER_ENABLE);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wss_timer_stop(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_wss *chip = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;image[CS4231_ALT_FEATURE_1] &amp;= ~CS4231_TIMER_ENABLE;</div><div class='ctx'> 	snd_wss_out(chip, CS4231_ALT_FEATURE_1,</div><div class='ctx'> 		    chip-&gt;image[CS4231_ALT_FEATURE_1]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_wss_init(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	snd_wss_calibrate_mute(chip, 1);</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_DEBUG_MCE</div><div class='del'>-	snd_printk(KERN_DEBUG "init: (1)\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "init: (1)\n");</div><div class='ctx'> #endif</div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~(CS4231_PLAYBACK_ENABLE |</div><div class='del'>-					    CS4231_PLAYBACK_PIO |</div><div class='del'>-					    CS4231_RECORD_ENABLE |</div><div class='del'>-					    CS4231_RECORD_PIO |</div><div class='del'>-					    CS4231_CALIB_MODE);</div><div class='del'>-	chip-&gt;image[CS4231_IFACE_CTRL] |= CS4231_AUTOCALIB;</div><div class='del'>-	snd_wss_out(chip, CS4231_IFACE_CTRL, chip-&gt;image[CS4231_IFACE_CTRL]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~(CS4231_PLAYBACK_ENABLE |</div><div class='add'>+						    CS4231_PLAYBACK_PIO |</div><div class='add'>+						    CS4231_RECORD_ENABLE |</div><div class='add'>+						    CS4231_RECORD_PIO |</div><div class='add'>+						    CS4231_CALIB_MODE);</div><div class='add'>+		chip-&gt;image[CS4231_IFACE_CTRL] |= CS4231_AUTOCALIB;</div><div class='add'>+		snd_wss_out(chip, CS4231_IFACE_CTRL, chip-&gt;image[CS4231_IFACE_CTRL]);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_DEBUG_MCE</div><div class='del'>-	snd_printk(KERN_DEBUG "init: (2)\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "init: (2)\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~CS4231_AUTOCALIB;</div><div class='del'>-	snd_wss_out(chip, CS4231_IFACE_CTRL, chip-&gt;image[CS4231_IFACE_CTRL]);</div><div class='del'>-	snd_wss_out(chip,</div><div class='del'>-		    CS4231_ALT_FEATURE_1, chip-&gt;image[CS4231_ALT_FEATURE_1]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~CS4231_AUTOCALIB;</div><div class='add'>+		snd_wss_out(chip, CS4231_IFACE_CTRL, chip-&gt;image[CS4231_IFACE_CTRL]);</div><div class='add'>+		snd_wss_out(chip,</div><div class='add'>+			    CS4231_ALT_FEATURE_1, chip-&gt;image[CS4231_ALT_FEATURE_1]);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_DEBUG_MCE</div><div class='del'>-	snd_printk(KERN_DEBUG "init: (3) - afei = 0x%x\n",</div><div class='del'>-		   chip-&gt;image[CS4231_ALT_FEATURE_1]);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "init: (3) - afei = 0x%x\n",</div><div class='add'>+		chip-&gt;image[CS4231_ALT_FEATURE_1]);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_wss_out(chip, CS4231_ALT_FEATURE_2,</div><div class='del'>-		    chip-&gt;image[CS4231_ALT_FEATURE_2]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_wss_out(chip, CS4231_ALT_FEATURE_2,</div><div class='add'>+			    chip-&gt;image[CS4231_ALT_FEATURE_2]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_wss_out(chip, CS4231_PLAYBK_FORMAT,</div><div class='del'>-		    chip-&gt;image[CS4231_PLAYBK_FORMAT]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_wss_out(chip, CS4231_PLAYBK_FORMAT,</div><div class='add'>+			    chip-&gt;image[CS4231_PLAYBK_FORMAT]);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_DEBUG_MCE</div><div class='del'>-	snd_printk(KERN_DEBUG "init: (4)\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "init: (4)\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	if (!(chip-&gt;hardware &amp; WSS_HW_AD1848_MASK))</div><div class='del'>-		snd_wss_out(chip, CS4231_REC_FORMAT,</div><div class='del'>-			    chip-&gt;image[CS4231_REC_FORMAT]);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		if (!(chip-&gt;hardware &amp; WSS_HW_AD1848_MASK))</div><div class='add'>+			snd_wss_out(chip, CS4231_REC_FORMAT,</div><div class='add'>+				    chip-&gt;image[CS4231_REC_FORMAT]);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> 	snd_wss_calibrate_mute(chip, 0);</div><div class='ctx'> </div><div class='ctx'> #ifdef SNDRV_DEBUG_MCE</div><div class='del'>-	snd_printk(KERN_DEBUG "init: (5)\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "init: (5)\n");</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wss_open(struct snd_wss *chip, unsigned int mode)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	if ((chip-&gt;mode &amp; mode) ||</div><div class='del'>-	    ((chip-&gt;mode &amp; WSS_MODE_OPEN) &amp;&amp; chip-&gt;single_dma)) {</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	    ((chip-&gt;mode &amp; WSS_MODE_OPEN) &amp;&amp; chip-&gt;single_dma))</div><div class='ctx'> 		return -EAGAIN;</div><div class='del'>-	}</div><div class='ctx'> 	if (chip-&gt;mode &amp; WSS_MODE_OPEN) {</div><div class='ctx'> 		chip-&gt;mode |= mode;</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* ok. now enable and ack CODEC IRQ */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (!(chip-&gt;hardware &amp; WSS_HW_AD1848_MASK)) {</div><div class='ctx'> 		snd_wss_out(chip, CS4231_IRQ_STATUS,</div><div class='ctx'> 			    CS4231_PLAYBACK_IRQ |</div><div class='hunk'>@@ -903,10 +869,8 @@ static int snd_wss_open(struct snd_wss *chip, unsigned int mode)</div><div class='ctx'> 			    CS4231_TIMER_IRQ);</div><div class='ctx'> 		snd_wss_out(chip, CS4231_IRQ_STATUS, 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;mode = mode;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -914,12 +878,10 @@ static void snd_wss_close(struct snd_wss *chip, unsigned int mode)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	chip-&gt;mode &amp;= ~mode;</div><div class='del'>-	if (chip-&gt;mode &amp; WSS_MODE_OPEN) {</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	if (chip-&gt;mode &amp; WSS_MODE_OPEN)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> 	/* disable IRQ */</div><div class='ctx'> 	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (!(chip-&gt;hardware &amp; WSS_HW_AD1848_MASK))</div><div class='hunk'>@@ -953,7 +915,6 @@ static void snd_wss_close(struct snd_wss *chip, unsigned int mode)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;mode = 0;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -974,7 +935,7 @@ static int snd_wss_timer_close(struct snd_timer *timer)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_wss_timer_table =</div><div class='add'>+static const struct snd_timer_hardware snd_wss_timer_table =</div><div class='ctx'> {</div><div class='ctx'> 	.flags =	SNDRV_TIMER_HW_AUTO,</div><div class='ctx'> 	.resolution =	9945,</div><div class='hunk'>@@ -995,10 +956,7 @@ static int snd_wss_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned char new_pdfr;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	new_pdfr = snd_wss_get_format(chip, params_format(hw_params),</div><div class='ctx'> 				params_channels(hw_params)) |</div><div class='ctx'> 				snd_wss_get_rate(params_rate(hw_params));</div><div class='hunk'>@@ -1006,27 +964,20 @@ static int snd_wss_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_wss_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_wss_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	unsigned int count = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;p_dma_size = size;</div><div class='ctx'> 	chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~(CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO);</div><div class='ctx'> 	snd_dma_program(chip-&gt;dma1, runtime-&gt;dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);</div><div class='ctx'> 	count = snd_wss_get_count(chip-&gt;image[CS4231_PLAYBK_FORMAT], count) - 1;</div><div class='ctx'> 	snd_wss_out(chip, CS4231_PLY_LWR_CNT, (unsigned char) count);</div><div class='ctx'> 	snd_wss_out(chip, CS4231_PLY_UPR_CNT, (unsigned char) (count &gt;&gt; 8));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> #if 0</div><div class='ctx'> 	snd_wss_debug(chip);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1038,10 +989,7 @@ static int snd_wss_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned char new_cdfr;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	new_cdfr = snd_wss_get_format(chip, params_format(hw_params),</div><div class='ctx'> 			   params_channels(hw_params)) |</div><div class='ctx'> 			   snd_wss_get_rate(params_rate(hw_params));</div><div class='hunk'>@@ -1049,20 +997,14 @@ static int snd_wss_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_wss_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_wss_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	unsigned int count = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;c_dma_size = size;</div><div class='ctx'> 	chip-&gt;image[CS4231_IFACE_CTRL] &amp;= ~(CS4231_RECORD_ENABLE | CS4231_RECORD_PIO);</div><div class='ctx'> 	snd_dma_program(chip-&gt;dma2, runtime-&gt;dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);</div><div class='hunk'>@@ -1082,18 +1024,16 @@ static int snd_wss_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_wss_out(chip, CS4231_REC_UPR_CNT,</div><div class='ctx'> 			    (unsigned char) (count &gt;&gt; 8));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_wss_overrange(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char res;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	res = snd_wss_in(chip, CS4231_TEST_INIT);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		res = snd_wss_in(chip, CS4231_TEST_INIT);</div><div class='add'>+	}</div><div class='ctx'> 	if (res &amp; (0x08 | 0x02))	/* detect overrange only above 0dB; may be user selectable? */</div><div class='ctx'> 		chip-&gt;capture_substream-&gt;runtime-&gt;overrange++;</div><div class='ctx'> }</div><div class='hunk'>@@ -1139,13 +1079,12 @@ irqreturn_t snd_wss_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	status = ~CS4231_ALL_IRQS | ~status;</div><div class='ctx'> 	if (chip-&gt;hardware &amp; WSS_HW_AD1848_MASK)</div><div class='ctx'> 		wss_outb(chip, CS4231P(STATUS), 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_wss_out(chip, CS4231_IRQ_STATUS, status);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_interrupt);</div><div class='hunk'>@@ -1179,10 +1118,8 @@ static snd_pcm_uframes_t snd_wss_capture_pointer(struct snd_pcm_substream *subst</div><div class='ctx'> static int snd_ad1848_probe(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char r;</div><div class='ctx'> 	unsigned short hardware = 0;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	while (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT) {</div><div class='hunk'>@@ -1190,7 +1127,7 @@ static int snd_ad1848_probe(struct snd_wss *chip)</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* set CS423x MODE 1 */</div><div class='ctx'> 	snd_wss_dout(chip, CS4231_MISC_INFO, 0);</div><div class='hunk'>@@ -1199,19 +1136,15 @@ static int snd_ad1848_probe(struct snd_wss *chip)</div><div class='ctx'> 	r = snd_wss_in(chip, CS4231_RIGHT_INPUT);</div><div class='ctx'> 	if (r != 0x45) {</div><div class='ctx'> 		/* RMGE always high on AD1847 */</div><div class='del'>-		if ((r &amp; ~CS4231_ENABLE_MIC_GAIN) != 0x45) {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if ((r &amp; ~CS4231_ENABLE_MIC_GAIN) != 0x45)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		hardware = WSS_HW_AD1847;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_wss_dout(chip, CS4231_LEFT_INPUT,  0xaa);</div><div class='ctx'> 		r = snd_wss_in(chip, CS4231_LEFT_INPUT);</div><div class='ctx'> 		/* L/RMGE always low on AT2320 */</div><div class='del'>-		if ((r | CS4231_ENABLE_MIC_GAIN) != 0xaa) {</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if ((r | CS4231_ENABLE_MIC_GAIN) != 0xaa)</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear pending IRQ */</div><div class='hunk'>@@ -1220,11 +1153,11 @@ static int snd_ad1848_probe(struct snd_wss *chip)</div><div class='ctx'> 	mb();</div><div class='ctx'> </div><div class='ctx'> 	if ((chip-&gt;hardware &amp; WSS_HW_TYPE_MASK) != WSS_HW_DETECT)</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (hardware) {</div><div class='ctx'> 		chip-&gt;hardware = hardware;</div><div class='del'>-		goto out;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r = snd_wss_in(chip, CS4231_MISC_INFO);</div><div class='hunk'>@@ -1253,14 +1186,11 @@ static int snd_ad1848_probe(struct snd_wss *chip)</div><div class='ctx'> 		chip-&gt;hardware = WSS_HW_AD1848;</div><div class='ctx'> out_mode:</div><div class='ctx'> 	snd_wss_dout(chip, CS4231_MISC_INFO, 0);</div><div class='del'>-out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i, id, rev, regnum;</div><div class='ctx'> 	unsigned char *ptr;</div><div class='ctx'> 	unsigned int hw;</div><div class='hunk'>@@ -1276,21 +1206,21 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 			if (wss_inb(chip, CS4231P(REGSEL)) &amp; CS4231_INIT)</div><div class='ctx'> 				msleep(2);</div><div class='ctx'> 			else {</div><div class='del'>-				spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+				guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 				snd_wss_out(chip, CS4231_MISC_INFO,</div><div class='ctx'> 					    CS4231_MODE2);</div><div class='ctx'> 				id = snd_wss_in(chip, CS4231_MISC_INFO) &amp; 0x0f;</div><div class='del'>-				spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 				if (id == 0x0a)</div><div class='ctx'> 					break;	/* this is valid value */</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		snd_printdd("wss: port = 0x%lx, id = 0x%x\n", chip-&gt;port, id);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "wss: port = 0x%lx, id = 0x%x\n",</div><div class='add'>+			chip-&gt;port, id);</div><div class='ctx'> 		if (id != 0x0a)</div><div class='ctx'> 			return -ENODEV;	/* no valid device found */</div><div class='ctx'> </div><div class='ctx'> 		rev = snd_wss_in(chip, CS4231_VERSION) &amp; 0xe7;</div><div class='del'>-		snd_printdd("CS4231: VERSION (I25) = 0x%x\n", rev);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "CS4231: VERSION (I25) = 0x%x\n", rev);</div><div class='ctx'> 		if (rev == 0x80) {</div><div class='ctx'> 			unsigned char tmp = snd_wss_in(chip, 23);</div><div class='ctx'> 			snd_wss_out(chip, 23, ~tmp);</div><div class='hunk'>@@ -1309,16 +1239,16 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 		} else if (rev == 0x03) {</div><div class='ctx'> 			chip-&gt;hardware = WSS_HW_CS4236B;</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "unknown CS chip with version 0x%x\n", rev);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"unknown CS chip with version 0x%x\n", rev);</div><div class='ctx'> 			return -ENODEV;		/* unknown CS4231 chip? */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	wss_inb(chip, CS4231P(STATUS));	/* clear any pendings IRQ */</div><div class='del'>-	wss_outb(chip, CS4231P(STATUS), 0);</div><div class='del'>-	mb();</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		wss_inb(chip, CS4231P(STATUS));	/* clear any pendings IRQ */</div><div class='add'>+		wss_outb(chip, CS4231P(STATUS), 0);</div><div class='add'>+		mb();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(chip-&gt;hardware &amp; WSS_HW_AD1848_MASK))</div><div class='ctx'> 		chip-&gt;image[CS4231_MISC_INFO] = CS4231_MODE2;</div><div class='hunk'>@@ -1353,10 +1283,10 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 	ptr = (unsigned char *) &amp;chip-&gt;image;</div><div class='ctx'> 	regnum = (chip-&gt;hardware &amp; WSS_HW_AD1848_MASK) ? 16 : 32;</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; regnum; i++)	/* ok.. fill all registers */</div><div class='del'>-		snd_wss_out(chip, i, *ptr++);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		for (i = 0; i &lt; regnum; i++)	/* ok.. fill all registers */</div><div class='add'>+			snd_wss_out(chip, i, *ptr++);</div><div class='add'>+	}</div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1369,7 +1299,9 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 			snd_cs4236_ext_out(chip, CS4236_VERSION, 0xff);</div><div class='ctx'> 			id = snd_cs4236_ext_in(chip, CS4236_VERSION);</div><div class='ctx'> 			snd_cs4236_ext_out(chip, CS4236_VERSION, rev);</div><div class='del'>-			snd_printdd("CS4231: ext version; rev = 0x%x, id = 0x%x\n", rev, id);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"CS4231: ext version; rev = 0x%x, id = 0x%x\n",</div><div class='add'>+				rev, id);</div><div class='ctx'> 			if ((id &amp; 0x1f) == 0x1d) {	/* CS4235 */</div><div class='ctx'> 				chip-&gt;hardware = WSS_HW_CS4235;</div><div class='ctx'> 				switch (id &gt;&gt; 5) {</div><div class='hunk'>@@ -1378,10 +1310,9 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 				case 6:</div><div class='ctx'> 					break;</div><div class='ctx'> 				default:</div><div class='del'>-					snd_printk(KERN_WARNING</div><div class='del'>-						"unknown CS4235 chip "</div><div class='del'>-						"(enhanced version = 0x%x)\n",</div><div class='del'>-						id);</div><div class='add'>+					dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+						 "unknown CS4235 chip (enhanced version = 0x%x)\n",</div><div class='add'>+						 id);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if ((id &amp; 0x1f) == 0x0b) {	/* CS4236/B */</div><div class='ctx'> 				switch (id &gt;&gt; 5) {</div><div class='hunk'>@@ -1392,10 +1323,9 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 					chip-&gt;hardware = WSS_HW_CS4236B;</div><div class='ctx'> 					break;</div><div class='ctx'> 				default:</div><div class='del'>-					snd_printk(KERN_WARNING</div><div class='del'>-						"unknown CS4236 chip "</div><div class='del'>-						"(enhanced version = 0x%x)\n",</div><div class='del'>-						id);</div><div class='add'>+					dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+						 "unknown CS4236 chip (enhanced version = 0x%x)\n",</div><div class='add'>+						 id);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if ((id &amp; 0x1f) == 0x08) {	/* CS4237B */</div><div class='ctx'> 				chip-&gt;hardware = WSS_HW_CS4237B;</div><div class='hunk'>@@ -1406,10 +1336,9 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 				case 7:</div><div class='ctx'> 					break;</div><div class='ctx'> 				default:</div><div class='del'>-					snd_printk(KERN_WARNING</div><div class='del'>-						"unknown CS4237B chip "</div><div class='del'>-						"(enhanced version = 0x%x)\n",</div><div class='del'>-						id);</div><div class='add'>+					dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+						 "unknown CS4237B chip (enhanced version = 0x%x)\n",</div><div class='add'>+						 id);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if ((id &amp; 0x1f) == 0x09) {	/* CS4238B */</div><div class='ctx'> 				chip-&gt;hardware = WSS_HW_CS4238B;</div><div class='hunk'>@@ -1419,10 +1348,9 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 				case 7:</div><div class='ctx'> 					break;</div><div class='ctx'> 				default:</div><div class='del'>-					snd_printk(KERN_WARNING</div><div class='del'>-						"unknown CS4238B chip "</div><div class='del'>-						"(enhanced version = 0x%x)\n",</div><div class='del'>-						id);</div><div class='add'>+					dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+						 "unknown CS4238B chip (enhanced version = 0x%x)\n",</div><div class='add'>+						 id);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else if ((id &amp; 0x1f) == 0x1e) {	/* CS4239 */</div><div class='ctx'> 				chip-&gt;hardware = WSS_HW_CS4239;</div><div class='hunk'>@@ -1432,15 +1360,14 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> 				case 6:</div><div class='ctx'> 					break;</div><div class='ctx'> 				default:</div><div class='del'>-					snd_printk(KERN_WARNING</div><div class='del'>-						"unknown CS4239 chip "</div><div class='del'>-						"(enhanced version = 0x%x)\n",</div><div class='del'>-						id);</div><div class='add'>+					dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+						 "unknown CS4239 chip (enhanced version = 0x%x)\n",</div><div class='add'>+						 id);</div><div class='ctx'> 				}</div><div class='ctx'> 			} else {</div><div class='del'>-				snd_printk(KERN_WARNING</div><div class='del'>-					   "unknown CS4236/CS423xB chip "</div><div class='del'>-					   "(enhanced version = 0x%x)\n", id);</div><div class='add'>+				dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+					 "unknown CS4236/CS423xB chip (enhanced version = 0x%x)\n",</div><div class='add'>+					 id);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1451,11 +1378,10 @@ static int snd_wss_probe(struct snd_wss *chip)</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_wss_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_wss_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='del'>-				 SNDRV_PCM_INFO_RESUME |</div><div class='ctx'> 				 SNDRV_PCM_INFO_SYNC_START),</div><div class='ctx'> 	.formats =		(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW | SNDRV_PCM_FMTBIT_IMA_ADPCM |</div><div class='ctx'> 				 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE),</div><div class='hunk'>@@ -1472,7 +1398,7 @@ static struct snd_pcm_hardware snd_wss_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_wss_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_wss_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -1523,7 +1449,8 @@ static int snd_wss_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_limit_isa_dma_size(chip-&gt;dma1, &amp;runtime-&gt;hw.period_bytes_max);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;claim_dma) {</div><div class='del'>-		if ((err = chip-&gt;claim_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma1)) &lt; 0)</div><div class='add'>+		err = chip-&gt;claim_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1531,7 +1458,6 @@ static int snd_wss_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		if (chip-&gt;release_dma)</div><div class='ctx'> 			chip-&gt;release_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma1);</div><div class='del'>-		snd_free_pages(runtime-&gt;dma_area, runtime-&gt;dma_bytes);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;playback_substream = substream;</div><div class='hunk'>@@ -1564,7 +1490,8 @@ static int snd_wss_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_limit_isa_dma_size(chip-&gt;dma2, &amp;runtime-&gt;hw.period_bytes_max);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;claim_dma) {</div><div class='del'>-		if ((err = chip-&gt;claim_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma2)) &lt; 0)</div><div class='add'>+		err = chip-&gt;claim_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma2);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1572,7 +1499,6 @@ static int snd_wss_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		if (chip-&gt;release_dma)</div><div class='ctx'> 			chip-&gt;release_dma(chip, chip-&gt;dma_private_data, chip-&gt;dma2);</div><div class='del'>-		snd_free_pages(runtime-&gt;dma_area, runtime-&gt;dma_bytes);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;capture_substream = substream;</div><div class='hunk'>@@ -1625,13 +1551,11 @@ static void snd_wss_thinkpad_twiddle(struct snd_wss *chip, int on)</div><div class='ctx'> static void snd_wss_suspend(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	for (reg = 0; reg &lt; 32; reg++)</div><div class='del'>-		chip-&gt;image[reg] = snd_wss_in(chip, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		for (reg = 0; reg &lt; 32; reg++)</div><div class='add'>+			chip-&gt;image[reg] = snd_wss_in(chip, reg);</div><div class='add'>+	}</div><div class='ctx'> 	if (chip-&gt;thinkpad_flag)</div><div class='ctx'> 		snd_wss_thinkpad_twiddle(chip, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -1640,23 +1564,26 @@ static void snd_wss_suspend(struct snd_wss *chip)</div><div class='ctx'> static void snd_wss_resume(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int reg;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	/* int timeout; */</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;thinkpad_flag)</div><div class='ctx'> 		snd_wss_thinkpad_twiddle(chip, 1);</div><div class='ctx'> 	snd_wss_mce_up(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	for (reg = 0; reg &lt; 32; reg++) {</div><div class='del'>-		switch (reg) {</div><div class='del'>-		case CS4231_VERSION:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			snd_wss_out(chip, reg, chip-&gt;image[reg]);</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		for (reg = 0; reg &lt; 32; reg++) {</div><div class='add'>+			switch (reg) {</div><div class='add'>+			case CS4231_VERSION:</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				snd_wss_out(chip, reg, chip-&gt;image[reg]);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		/* Yamaha needs this to resume properly */</div><div class='add'>+		if (chip-&gt;hardware == WSS_HW_OPL3SA2)</div><div class='add'>+			snd_wss_out(chip, CS4231_PLAYBK_FORMAT,</div><div class='add'>+				    chip-&gt;image[CS4231_PLAYBK_FORMAT]);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> #if 1</div><div class='ctx'> 	snd_wss_mce_down(chip);</div><div class='ctx'> #else</div><div class='hunk'>@@ -1665,14 +1592,15 @@ static void snd_wss_resume(struct snd_wss *chip)</div><div class='ctx'> 	   include rescheduling.  -- iwai</div><div class='ctx'> 	   */</div><div class='ctx'> 	snd_wss_busy_wait(chip);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	chip-&gt;mce_bit &amp;= ~CS4231_MCE;</div><div class='del'>-	timeout = wss_inb(chip, CS4231P(REGSEL));</div><div class='del'>-	wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | (timeout &amp; 0x1f));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;mce_bit &amp;= ~CS4231_MCE;</div><div class='add'>+		timeout = wss_inb(chip, CS4231P(REGSEL));</div><div class='add'>+		wss_outb(chip, CS4231P(REGSEL), chip-&gt;mce_bit | (timeout &amp; 0x1f));</div><div class='add'>+	}</div><div class='ctx'> 	if (timeout == 0x80)</div><div class='del'>-		snd_printk(KERN_ERR "down [0x%lx]: serious init problem "</div><div class='del'>-			   "- codec still busy\n", chip-&gt;port);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev</div><div class='add'>+			"down [0x%lx]: serious init problem - codec still busy\n",</div><div class='add'>+			chip-&gt;port);</div><div class='ctx'> 	if ((timeout &amp; CS4231_MCE) == 0 ||</div><div class='ctx'> 	    !(chip-&gt;hardware &amp; (WSS_HW_CS4231_MASK | WSS_HW_CS4232_MASK))) {</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1682,36 +1610,6 @@ static void snd_wss_resume(struct snd_wss *chip)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static int snd_wss_free(struct snd_wss *chip)</div><div class='del'>-{</div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-	release_and_free_resource(chip-&gt;res_cport);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0) {</div><div class='del'>-		disable_irq(chip-&gt;irq);</div><div class='del'>-		if (!(chip-&gt;hwshare &amp; WSS_HWSHARE_IRQ))</div><div class='del'>-			free_irq(chip-&gt;irq, (void *) chip);</div><div class='del'>-	}</div><div class='del'>-	if (!(chip-&gt;hwshare &amp; WSS_HWSHARE_DMA1) &amp;&amp; chip-&gt;dma1 &gt;= 0) {</div><div class='del'>-		snd_dma_disable(chip-&gt;dma1);</div><div class='del'>-		free_dma(chip-&gt;dma1);</div><div class='del'>-	}</div><div class='del'>-	if (!(chip-&gt;hwshare &amp; WSS_HWSHARE_DMA2) &amp;&amp;</div><div class='del'>-	    chip-&gt;dma2 &gt;= 0 &amp;&amp; chip-&gt;dma2 != chip-&gt;dma1) {</div><div class='del'>-		snd_dma_disable(chip-&gt;dma2);</div><div class='del'>-		free_dma(chip-&gt;dma2);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;timer)</div><div class='del'>-		snd_device_free(chip-&gt;card, chip-&gt;timer);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_wss_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_wss *chip = device-&gt;device_data;</div><div class='del'>-	return snd_wss_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> const char *snd_wss_chip_id(struct snd_wss *chip)</div><div class='ctx'> {</div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -1765,7 +1663,7 @@ static int snd_wss_new(struct snd_card *card,</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> </div><div class='ctx'> 	*rchip = NULL;</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='add'>+	chip = devm_kzalloc(card-&gt;dev, sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> 	if (chip == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	chip-&gt;hardware = hardware;</div><div class='hunk'>@@ -1801,9 +1699,6 @@ int snd_wss_create(struct snd_card *card,</div><div class='ctx'> 		      unsigned short hwshare,</div><div class='ctx'> 		      struct snd_wss **rchip)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_wss_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	struct snd_wss *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1815,41 +1710,39 @@ int snd_wss_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;dma1 = -1;</div><div class='ctx'> 	chip-&gt;dma2 = -1;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;res_port = request_region(port, 4, "WSS");</div><div class='add'>+	chip-&gt;res_port = devm_request_region(card-&gt;dev, port, 4, "WSS");</div><div class='ctx'> 	if (!chip-&gt;res_port) {</div><div class='del'>-		snd_printk(KERN_ERR "wss: can't grab port 0x%lx\n", port);</div><div class='del'>-		snd_wss_free(chip);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "wss: can't grab port 0x%lx\n", port);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;port = port;</div><div class='ctx'> 	if ((long)cport &gt;= 0) {</div><div class='del'>-		chip-&gt;res_cport = request_region(cport, 8, "CS4232 Control");</div><div class='add'>+		chip-&gt;res_cport = devm_request_region(card-&gt;dev, cport, 8,</div><div class='add'>+						      "CS4232 Control");</div><div class='ctx'> 		if (!chip-&gt;res_cport) {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='ctx'> 				"wss: can't grab control port 0x%lx\n", cport);</div><div class='del'>-			snd_wss_free(chip);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;cport = cport;</div><div class='ctx'> 	if (!(hwshare &amp; WSS_HWSHARE_IRQ))</div><div class='del'>-		if (request_irq(irq, snd_wss_interrupt, IRQF_DISABLED,</div><div class='del'>-				"WSS", (void *) chip)) {</div><div class='del'>-			snd_printk(KERN_ERR "wss: can't grab IRQ %d\n", irq);</div><div class='del'>-			snd_wss_free(chip);</div><div class='add'>+		if (devm_request_irq(card-&gt;dev, irq, snd_wss_interrupt, 0,</div><div class='add'>+				     "WSS", (void *) chip)) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "wss: can't grab IRQ %d\n", irq);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	chip-&gt;irq = irq;</div><div class='del'>-	if (!(hwshare &amp; WSS_HWSHARE_DMA1) &amp;&amp; request_dma(dma1, "WSS - 1")) {</div><div class='del'>-		snd_printk(KERN_ERR "wss: can't grab DMA1 %d\n", dma1);</div><div class='del'>-		snd_wss_free(chip);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	if (!(hwshare &amp; WSS_HWSHARE_DMA1) &amp;&amp;</div><div class='add'>+	    snd_devm_request_dma(card-&gt;dev, dma1, "WSS - 1")) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "wss: can't grab DMA1 %d\n", dma1);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dma1 = dma1;</div><div class='del'>-	if (!(hwshare &amp; WSS_HWSHARE_DMA2) &amp;&amp; dma1 != dma2 &amp;&amp;</div><div class='del'>-	      dma2 &gt;= 0 &amp;&amp; request_dma(dma2, "WSS - 2")) {</div><div class='del'>-		snd_printk(KERN_ERR "wss: can't grab DMA2 %d\n", dma2);</div><div class='del'>-		snd_wss_free(chip);</div><div class='add'>+	if (!(hwshare &amp; WSS_HWSHARE_DMA2) &amp;&amp; dma1 != dma2 &amp;&amp; dma2 &gt;= 0 &amp;&amp;</div><div class='add'>+	    snd_devm_request_dma(card-&gt;dev, dma2, "WSS - 2")) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "wss: can't grab DMA2 %d\n", dma2);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (dma1 == dma2 || dma2 &lt; 0) {</div><div class='hunk'>@@ -1865,27 +1758,18 @@ int snd_wss_create(struct snd_card *card,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* global setup */</div><div class='del'>-	if (snd_wss_probe(chip) &lt; 0) {</div><div class='del'>-		snd_wss_free(chip);</div><div class='add'>+	if (snd_wss_probe(chip) &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> 	snd_wss_init(chip);</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> 	if (chip-&gt;hardware &amp; WSS_HW_CS4232_MASK) {</div><div class='ctx'> 		if (chip-&gt;res_cport == NULL)</div><div class='del'>-			snd_printk(KERN_ERR "CS4232 control port features are "</div><div class='del'>-				   "not accessible\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"CS4232 control port features are not accessible\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	/* Register device */</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_wss_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	/* Power Management */</div><div class='ctx'> 	chip-&gt;suspend = snd_wss_suspend;</div><div class='hunk'>@@ -1897,29 +1781,25 @@ int snd_wss_create(struct snd_card *card,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_create);</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_wss_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_wss_playback_ops = {</div><div class='ctx'> 	.open =		snd_wss_playback_open,</div><div class='ctx'> 	.close =	snd_wss_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_wss_playback_hw_params,</div><div class='del'>-	.hw_free =	snd_wss_playback_hw_free,</div><div class='ctx'> 	.prepare =	snd_wss_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_wss_trigger,</div><div class='ctx'> 	.pointer =	snd_wss_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_wss_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_wss_capture_ops = {</div><div class='ctx'> 	.open =		snd_wss_capture_open,</div><div class='ctx'> 	.close =	snd_wss_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_wss_capture_hw_params,</div><div class='del'>-	.hw_free =	snd_wss_capture_hw_free,</div><div class='ctx'> 	.prepare =	snd_wss_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_wss_trigger,</div><div class='ctx'> 	.pointer =	snd_wss_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm)</div><div class='add'>+int snd_wss_pcm(struct snd_wss *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1938,15 +1818,12 @@ int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm)</div><div class='ctx'> 		pcm-&gt;info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;</div><div class='ctx'> 	if (chip-&gt;hardware != WSS_HW_INTERWAVE)</div><div class='ctx'> 		pcm-&gt;info_flags |= SNDRV_PCM_INFO_JOINT_DUPLEX;</div><div class='del'>-	strcpy(pcm-&gt;name, snd_wss_chip_id(chip));</div><div class='add'>+	strscpy(pcm-&gt;name, snd_wss_chip_id(chip));</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_isa_data(),</div><div class='del'>-					      64*1024, chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, chip-&gt;card-&gt;dev,</div><div class='add'>+				       64*1024, chip-&gt;dma1 &gt; 3 || chip-&gt;dma2 &gt; 3 ? 128*1024 : 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_pcm);</div><div class='hunk'>@@ -1957,7 +1834,7 @@ static void snd_wss_timer_free(struct snd_timer *timer)</div><div class='ctx'> 	chip-&gt;timer = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer)</div><div class='add'>+int snd_wss_timer(struct snd_wss *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='hunk'>@@ -1969,15 +1846,14 @@ int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer)</div><div class='ctx'> 	tid.card = chip-&gt;card-&gt;number;</div><div class='ctx'> 	tid.device = device;</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='del'>-	if ((err = snd_timer_new(chip-&gt;card, "CS4231", &amp;tid, &amp;timer)) &lt; 0)</div><div class='add'>+	err = snd_timer_new(chip-&gt;card, "CS4231", &amp;tid, &amp;timer);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(timer-&gt;name, snd_wss_chip_id(chip));</div><div class='add'>+	strscpy(timer-&gt;name, snd_wss_chip_id(chip));</div><div class='ctx'> 	timer-&gt;private_data = chip;</div><div class='ctx'> 	timer-&gt;private_free = snd_wss_timer_free;</div><div class='ctx'> 	timer-&gt;hw = snd_wss_timer_table;</div><div class='ctx'> 	chip-&gt;timer = timer;</div><div class='del'>-	if (rtimer)</div><div class='del'>-		*rtimer = timer;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_timer);</div><div class='hunk'>@@ -1989,25 +1865,20 @@ EXPORT_SYMBOL(snd_wss_timer);</div><div class='ctx'> static int snd_wss_info_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			    struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = {</div><div class='add'>+	static const char * const texts[4] = {</div><div class='ctx'> 		"Line", "Aux", "Mic", "Mix"</div><div class='ctx'> 	};</div><div class='del'>-	static char *opl3sa_texts[4] = {</div><div class='add'>+	static const char * const opl3sa_texts[4] = {</div><div class='ctx'> 		"Line", "CD", "Mic", "Mix"</div><div class='ctx'> 	};</div><div class='del'>-	static char *gusmax_texts[4] = {</div><div class='add'>+	static const char * const gusmax_texts[4] = {</div><div class='ctx'> 		"Line", "Synth", "Mic", "Mix"</div><div class='ctx'> 	};</div><div class='del'>-	char **ptexts = texts;</div><div class='add'>+	const char * const *ptexts = texts;</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!chip-&gt;card))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 2;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 3;</div><div class='ctx'> 	if (!strcmp(chip-&gt;card-&gt;driver, "GUS MAX"))</div><div class='ctx'> 		ptexts = gusmax_texts;</div><div class='ctx'> 	switch (chip-&gt;hardware) {</div><div class='hunk'>@@ -2019,20 +1890,17 @@ static int snd_wss_info_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		ptexts = opl3sa_texts;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, ptexts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 2, 4, ptexts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_wss_get_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			   struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = (chip-&gt;image[CS4231_LEFT_INPUT] &amp; CS4231_MIXS_ALL) &gt;&gt; 6;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[1] = (chip-&gt;image[CS4231_RIGHT_INPUT] &amp; CS4231_MIXS_ALL) &gt;&gt; 6;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2040,7 +1908,6 @@ static int snd_wss_put_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			   struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned short left, right;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='hunk'>@@ -2049,14 +1916,13 @@ static int snd_wss_put_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	left = ucontrol-&gt;value.enumerated.item[0] &lt;&lt; 6;</div><div class='ctx'> 	right = ucontrol-&gt;value.enumerated.item[1] &lt;&lt; 6;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	left = (chip-&gt;image[CS4231_LEFT_INPUT] &amp; ~CS4231_MIXS_ALL) | left;</div><div class='ctx'> 	right = (chip-&gt;image[CS4231_RIGHT_INPUT] &amp; ~CS4231_MIXS_ALL) | right;</div><div class='ctx'> 	change = left != chip-&gt;image[CS4231_LEFT_INPUT] ||</div><div class='ctx'> 		 right != chip-&gt;image[CS4231_RIGHT_INPUT];</div><div class='ctx'> 	snd_wss_out(chip, CS4231_LEFT_INPUT, left);</div><div class='ctx'> 	snd_wss_out(chip, CS4231_RIGHT_INPUT, right);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2077,15 +1943,13 @@ int snd_wss_get_single(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;image[reg] &gt;&gt; shift) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2096,7 +1960,6 @@ int snd_wss_put_single(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -2108,11 +1971,10 @@ int snd_wss_put_single(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (invert)</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val = (chip-&gt;image[reg] &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != chip-&gt;image[reg];</div><div class='ctx'> 	snd_wss_out(chip, reg, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_put_single);</div><div class='hunk'>@@ -2134,7 +1996,6 @@ int snd_wss_get_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -2142,10 +2003,9 @@ int snd_wss_get_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (chip-&gt;image[left_reg] &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (chip-&gt;image[right_reg] &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='hunk'>@@ -2158,7 +2018,6 @@ int snd_wss_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_wss *chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int left_reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='ctx'> 	int right_reg = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int shift_left = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x07;</div><div class='hunk'>@@ -2176,7 +2035,7 @@ int snd_wss_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	}</div><div class='ctx'> 	val1 &lt;&lt;= shift_left;</div><div class='ctx'> 	val2 &lt;&lt;= shift_right;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (left_reg != right_reg) {</div><div class='ctx'> 		val1 = (chip-&gt;image[left_reg] &amp; ~(mask &lt;&lt; shift_left)) | val1;</div><div class='ctx'> 		val2 = (chip-&gt;image[right_reg] &amp; ~(mask &lt;&lt; shift_right)) | val2;</div><div class='hunk'>@@ -2190,7 +2049,6 @@ int snd_wss_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		change = val1 != chip-&gt;image[left_reg];</div><div class='ctx'> 		snd_wss_out(chip, left_reg, val1);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_put_double);</div><div class='hunk'>@@ -2200,7 +2058,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_wss_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_wss_controls[] = {</div><div class='ctx'> WSS_DOUBLE("PCM Playback Switch", 0,</div><div class='ctx'> 		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),</div><div class='ctx'> WSS_DOUBLE_TLV("PCM Playback Volume", 0,</div><div class='hunk'>@@ -2259,7 +2117,7 @@ int snd_wss_mixer(struct snd_wss *chip)</div><div class='ctx'> </div><div class='ctx'> 	card = chip-&gt;card;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='add'>+	strscpy(card-&gt;mixername, chip-&gt;pcm-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	/* Use only the first 11 entries on AD1848 */</div><div class='ctx'> 	if (chip-&gt;hardware &amp; WSS_HW_AD1848_MASK)</div><div class='hunk'>@@ -2285,19 +2143,3 @@ const struct snd_pcm_ops *snd_wss_get_pcm_ops(int direction)</div><div class='ctx'> 		&amp;snd_wss_playback_ops : &amp;snd_wss_capture_ops;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(snd_wss_get_pcm_ops);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_wss_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_wss_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_wss_init);</div><div class='del'>-module_exit(alsa_wss_exit);</div><div class='head'>diff --git a/sound/last.c b/sound/last.c<br/>index bdd0857b8871..f0bb98780e70 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/last.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/last.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/last.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/last.c</a></div><div class='hunk'>@@ -1,41 +1,29 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Advanced Linux Sound Architecture</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define SNDRV_MAIN_OBJECT_FILE</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_sound_last_init(void)</div><div class='ctx'> {</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	int idx, ok = 0;</div><div class='ctx'> 	</div><div class='ctx'> 	printk(KERN_INFO "ALSA device list:\n");</div><div class='del'>-	for (idx = 0; idx &lt; SNDRV_CARDS; idx++)</div><div class='del'>-		if (snd_cards[idx] != NULL) {</div><div class='del'>-			printk(KERN_INFO "  #%i: %s\n", idx, snd_cards[idx]-&gt;longname);</div><div class='add'>+	for (idx = 0; idx &lt; SNDRV_CARDS; idx++) {</div><div class='add'>+		card = snd_card_ref(idx);</div><div class='add'>+		if (card) {</div><div class='add'>+			printk(KERN_INFO "  #%i: %s\n", idx, card-&gt;longname);</div><div class='add'>+			snd_card_unref(card);</div><div class='ctx'> 			ok++;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> 	if (ok == 0)</div><div class='ctx'> 		printk(KERN_INFO "  No soundcards found.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-__initcall(alsa_sound_last_init);</div><div class='add'>+late_initcall_sync(alsa_sound_last_init);</div><div class='head'>diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig<br/>index a9823fad85c2..c484b1e42395 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA MIPS drivers</div><div class='ctx'> </div><div class='ctx'> menuconfig SND_MIPS</div><div class='hunk'>@@ -12,23 +13,23 @@ if SND_MIPS</div><div class='ctx'> config SND_SGI_O2</div><div class='ctx'> 	tristate "SGI O2 Audio"</div><div class='ctx'> 	depends on SGI_IP32</div><div class='del'>-        help</div><div class='del'>-                Sound support for the SGI O2 Workstation. </div><div class='add'>+	select SND_PCM</div><div class='add'>+	help</div><div class='add'>+	  Sound support for the SGI O2 Workstation.</div><div class='ctx'> </div><div class='ctx'> config SND_SGI_HAL2</div><div class='del'>-        tristate "SGI HAL2 Audio"</div><div class='del'>-        depends on SGI_HAS_HAL2</div><div class='del'>-        help</div><div class='del'>-                Sound support for the SGI Indy and Indigo2 Workstation.</div><div class='del'>-</div><div class='add'>+	tristate "SGI HAL2 Audio"</div><div class='add'>+	depends on SGI_HAS_HAL2</div><div class='add'>+	select SND_PCM</div><div class='add'>+	help</div><div class='add'>+	  Sound support for the SGI Indy and Indigo2 Workstation.</div><div class='ctx'> </div><div class='del'>-config SND_AU1X00</div><div class='del'>-	tristate "Au1x00 AC97 Port Driver"</div><div class='del'>-	depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500</div><div class='add'>+config SND_N64</div><div class='add'>+	bool "N64 Audio"</div><div class='add'>+	depends on MACH_NINTENDO64 &amp;&amp; SND=y</div><div class='ctx'> 	select SND_PCM</div><div class='del'>-	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='del'>-	  ALSA Sound driver for the Au1x00's AC97 port.</div><div class='add'>+	  Sound support for the N64.</div><div class='ctx'> </div><div class='ctx'> endif	# SND_MIPS</div><div class='ctx'> </div><div class='head'>diff --git a/sound/mips/Makefile b/sound/mips/Makefile<br/>index 861ec0a574b4..bfbf3bda487b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/Makefile</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-au1x00-objs := au1x00.o</div><div class='del'>-snd-sgi-o2-objs := sgio2audio.o ad1843.o</div><div class='del'>-snd-sgi-hal2-objs := hal2.o</div><div class='add'>+snd-sgi-o2-y := sgio2audio.o ad1843.o</div><div class='add'>+snd-sgi-hal2-y := hal2.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='del'>-obj-$(CONFIG_SND_AU1X00) += snd-au1x00.o</div><div class='ctx'> obj-$(CONFIG_SND_SGI_O2) += snd-sgi-o2.o</div><div class='ctx'> obj-$(CONFIG_SND_SGI_HAL2) += snd-sgi-hal2.o</div><div class='add'>+obj-$(CONFIG_SND_N64) += snd-n64.o</div><div class='head'>diff --git a/sound/mips/ad1843.c b/sound/mips/ad1843.c<br/>index c624510ec374..19c28938f00f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/ad1843.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/ad1843.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/ad1843.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/ad1843.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   AD1843 low level driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,21 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   inspired from vwsnd.c (SGI VW audio driver)</div><div class='ctx'>  *     Copyright 1999 Silicon Graphics, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -276,7 +262,7 @@ static void ad1843_write_multi(struct snd_ad1843 *ad1843, int argcount, ...)</div><div class='ctx'> 		if (reg == -1)</div><div class='ctx'> 			reg = fp-&gt;reg;</div><div class='ctx'> 		else</div><div class='del'>-			BUG_ON(reg != fp-&gt;reg);</div><div class='add'>+			WARN_ON(reg != fp-&gt;reg);</div><div class='ctx'> 		m = ((1 &lt;&lt; fp-&gt;nbits) - 1) &lt;&lt; fp-&gt;lo_bit;</div><div class='ctx'> 		mask |= m;</div><div class='ctx'> 		bits |= (value &lt;&lt; fp-&gt;lo_bit) &amp; m;</div><div class='head'>diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c<br/>deleted file mode 100644<br/>index 446cf9748664..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/au1x00.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/au1x00.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,695 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * BRIEF MODULE DESCRIPTION</div><div class='del'>- *  Driver for AMD Au1000 MIPS Processor, AC'97 Sound Port</div><div class='del'>- *</div><div class='del'>- * Copyright 2004 Cooper Street Innovations Inc.</div><div class='del'>- * Author: Charles Eidsness	&lt;charles@cooper-street.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- * History:</div><div class='del'>- *</div><div class='del'>- * 2004-09-09 Charles Eidsness	-- Original verion -- based on</div><div class='del'>- * 				  sa11xx-uda1341.c ALSA driver and the</div><div class='del'>- *				  au1000.c OSS driver.</div><div class='del'>- * 2004-09-09 Matt Porter	-- Added support for ALSA 1.0.6</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;sound/pcm_params.h&gt;</div><div class='del'>-#include &lt;sound/ac97_codec.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1000_dma.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Charles Eidsness &lt;charles@cooper-street.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Au1000 AC'97 ALSA Driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{AMD,Au1000 AC'97}}");</div><div class='del'>-</div><div class='del'>-#define PLAYBACK 0</div><div class='del'>-#define CAPTURE 1</div><div class='del'>-#define AC97_SLOT_3 0x01</div><div class='del'>-#define AC97_SLOT_4 0x02</div><div class='del'>-#define AC97_SLOT_6 0x08</div><div class='del'>-#define AC97_CMD_IRQ 31</div><div class='del'>-#define READ 0</div><div class='del'>-#define WRITE 1</div><div class='del'>-#define READ_WAIT 2</div><div class='del'>-#define RW_DONE 3</div><div class='del'>-</div><div class='del'>-struct au1000_period</div><div class='del'>-{</div><div class='del'>-	u32 start;</div><div class='del'>-	u32 relative_end;	/*realtive to start of buffer*/</div><div class='del'>-	struct au1000_period * next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*Au1000 AC97 Port Control Reisters*/</div><div class='del'>-struct au1000_ac97_reg {</div><div class='del'>-	u32 volatile config;</div><div class='del'>-	u32 volatile status;</div><div class='del'>-	u32 volatile data;</div><div class='del'>-	u32 volatile cmd;</div><div class='del'>-	u32 volatile cntrl;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct audio_stream {</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	int dma;</div><div class='del'>-	spinlock_t dma_lock;</div><div class='del'>-	struct au1000_period * buffer;</div><div class='del'>-	unsigned int period_size;</div><div class='del'>-	unsigned int periods;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct snd_au1000 {</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct au1000_ac97_reg volatile *ac97_ioport;</div><div class='del'>-</div><div class='del'>-	struct resource *ac97_res_port;</div><div class='del'>-	spinlock_t ac97_lock;</div><div class='del'>-	struct snd_ac97 *ac97;</div><div class='del'>-</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	struct audio_stream *stream[2];	/* playback &amp; capture */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*--------------------------- Local Functions --------------------------------*/</div><div class='del'>-static void</div><div class='del'>-au1000_set_ac97_xmit_slots(struct snd_au1000 *au1000, long xmit_slots)</div><div class='del'>-{</div><div class='del'>-	u32 volatile ac97_config;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-	ac97_config = au1000-&gt;ac97_ioport-&gt;config;</div><div class='del'>-	ac97_config = ac97_config &amp; ~AC97C_XMIT_SLOTS_MASK;</div><div class='del'>-	ac97_config |= (xmit_slots &lt;&lt; AC97C_XMIT_SLOTS_BIT);</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;config = ac97_config;</div><div class='del'>-	spin_unlock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1000_set_ac97_recv_slots(struct snd_au1000 *au1000, long recv_slots)</div><div class='del'>-{</div><div class='del'>-	u32 volatile ac97_config;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-	ac97_config = au1000-&gt;ac97_ioport-&gt;config;</div><div class='del'>-	ac97_config = ac97_config &amp; ~AC97C_RECV_SLOTS_MASK;</div><div class='del'>-	ac97_config |= (recv_slots &lt;&lt; AC97C_RECV_SLOTS_BIT);</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;config = ac97_config;</div><div class='del'>-	spin_unlock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1000_release_dma_link(struct audio_stream *stream)</div><div class='del'>-{</div><div class='del'>-	struct au1000_period * pointer;</div><div class='del'>-	struct au1000_period * pointer_next;</div><div class='del'>-</div><div class='del'>-	stream-&gt;period_size = 0;</div><div class='del'>-	stream-&gt;periods = 0;</div><div class='del'>-	pointer = stream-&gt;buffer;</div><div class='del'>-	if (! pointer)</div><div class='del'>-		return;</div><div class='del'>-	do {</div><div class='del'>-		pointer_next = pointer-&gt;next;</div><div class='del'>-		kfree(pointer);</div><div class='del'>-		pointer = pointer_next;</div><div class='del'>-	} while (pointer != stream-&gt;buffer);</div><div class='del'>-	stream-&gt;buffer = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1000_setup_dma_link(struct audio_stream *stream, unsigned int period_bytes,</div><div class='del'>-		      unsigned int periods)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_substream *substream = stream-&gt;substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct au1000_period *pointer;</div><div class='del'>-	unsigned long dma_start;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dma_start = virt_to_phys(runtime-&gt;dma_area);</div><div class='del'>-</div><div class='del'>-	if (stream-&gt;period_size == period_bytes &amp;&amp;</div><div class='del'>-	    stream-&gt;periods == periods)</div><div class='del'>-		return 0; /* not changed */</div><div class='del'>-</div><div class='del'>-	au1000_release_dma_link(stream);</div><div class='del'>-</div><div class='del'>-	stream-&gt;period_size = period_bytes;</div><div class='del'>-	stream-&gt;periods = periods;</div><div class='del'>-</div><div class='del'>-	stream-&gt;buffer = kmalloc(sizeof(struct au1000_period), GFP_KERNEL);</div><div class='del'>-	if (! stream-&gt;buffer)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	pointer = stream-&gt;buffer;</div><div class='del'>-	for (i = 0; i &lt; periods; i++) {</div><div class='del'>-		pointer-&gt;start = (u32)(dma_start + (i * period_bytes));</div><div class='del'>-		pointer-&gt;relative_end = (u32) (((i+1) * period_bytes) - 0x1);</div><div class='del'>-		if (i &lt; periods - 1) {</div><div class='del'>-			pointer-&gt;next = kmalloc(sizeof(struct au1000_period), GFP_KERNEL);</div><div class='del'>-			if (! pointer-&gt;next) {</div><div class='del'>-				au1000_release_dma_link(stream);</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-			pointer = pointer-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	pointer-&gt;next = stream-&gt;buffer;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1000_dma_stop(struct audio_stream *stream)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(!stream-&gt;buffer))</div><div class='del'>-		return;</div><div class='del'>-	disable_dma(stream-&gt;dma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1000_dma_start(struct audio_stream *stream)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(!stream-&gt;buffer))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	init_dma(stream-&gt;dma);</div><div class='del'>-	if (get_dma_active_buffer(stream-&gt;dma) == 0) {</div><div class='del'>-		clear_dma_done0(stream-&gt;dma);</div><div class='del'>-		set_dma_addr0(stream-&gt;dma, stream-&gt;buffer-&gt;start);</div><div class='del'>-		set_dma_count0(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-		set_dma_addr1(stream-&gt;dma, stream-&gt;buffer-&gt;next-&gt;start);</div><div class='del'>-		set_dma_count1(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-	} else {</div><div class='del'>-		clear_dma_done1(stream-&gt;dma);</div><div class='del'>-		set_dma_addr1(stream-&gt;dma, stream-&gt;buffer-&gt;start);</div><div class='del'>-		set_dma_count1(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-		set_dma_addr0(stream-&gt;dma, stream-&gt;buffer-&gt;next-&gt;start);</div><div class='del'>-		set_dma_count0(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-	}</div><div class='del'>-	enable_dma_buffers(stream-&gt;dma);</div><div class='del'>-	start_dma(stream-&gt;dma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t</div><div class='del'>-au1000_dma_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct audio_stream *stream = (struct audio_stream *) dev_id;</div><div class='del'>-	struct snd_pcm_substream *substream = stream-&gt;substream;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	switch (get_dma_buffer_done(stream-&gt;dma)) {</div><div class='del'>-	case DMA_D0:</div><div class='del'>-		stream-&gt;buffer = stream-&gt;buffer-&gt;next;</div><div class='del'>-		clear_dma_done0(stream-&gt;dma);</div><div class='del'>-		set_dma_addr0(stream-&gt;dma, stream-&gt;buffer-&gt;next-&gt;start);</div><div class='del'>-		set_dma_count0(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-		enable_dma_buffer0(stream-&gt;dma);</div><div class='del'>-		break;</div><div class='del'>-	case DMA_D1:</div><div class='del'>-		stream-&gt;buffer = stream-&gt;buffer-&gt;next;</div><div class='del'>-		clear_dma_done1(stream-&gt;dma);</div><div class='del'>-		set_dma_addr1(stream-&gt;dma, stream-&gt;buffer-&gt;next-&gt;start);</div><div class='del'>-		set_dma_count1(stream-&gt;dma, stream-&gt;period_size &gt;&gt; 1);</div><div class='del'>-		enable_dma_buffer1(stream-&gt;dma);</div><div class='del'>-		break;</div><div class='del'>-	case (DMA_D0 | DMA_D1):</div><div class='del'>-		printk(KERN_ERR "DMA %d missed interrupt.\n",stream-&gt;dma);</div><div class='del'>-		au1000_dma_stop(stream);</div><div class='del'>-		au1000_dma_start(stream);</div><div class='del'>-		break;</div><div class='del'>-	case (~DMA_D0 &amp; ~DMA_D1):</div><div class='del'>-		printk(KERN_ERR "DMA %d empty irq.\n",stream-&gt;dma);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	snd_pcm_period_elapsed(substream);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*-------------------------- PCM Audio Streams -------------------------------*/</div><div class='del'>-</div><div class='del'>-static unsigned int rates[] = {8000, 11025, 16000, 22050};</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='del'>-	.count	= ARRAY_SIZE(rates),</div><div class='del'>-	.list	= rates,</div><div class='del'>-	.mask	= 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware snd_au1000_hw =</div><div class='del'>-{</div><div class='del'>-	.info			= (SNDRV_PCM_INFO_INTERLEAVED | \</div><div class='del'>-				SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),</div><div class='del'>-	.formats		= SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-	.rates			= (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |</div><div class='del'>-				SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050),</div><div class='del'>-	.rate_min		= 8000,</div><div class='del'>-	.rate_max		= 22050,</div><div class='del'>-	.channels_min		= 1,</div><div class='del'>-	.channels_max		= 2,</div><div class='del'>-	.buffer_bytes_max	= 128*1024,</div><div class='del'>-	.period_bytes_min	= 32,</div><div class='del'>-	.period_bytes_max	= 16*1024,</div><div class='del'>-	.periods_min		= 8,</div><div class='del'>-	.periods_max		= 255,</div><div class='del'>-	.fifo_size		= 16,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_playback_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	au1000-&gt;stream[PLAYBACK]-&gt;substream = substream;</div><div class='del'>-	au1000-&gt;stream[PLAYBACK]-&gt;buffer = NULL;</div><div class='del'>-	substream-&gt;private_data = au1000-&gt;stream[PLAYBACK];</div><div class='del'>-	substream-&gt;runtime-&gt;hw = snd_au1000_hw;</div><div class='del'>-	return (snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_rates) &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_capture_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	au1000-&gt;stream[CAPTURE]-&gt;substream = substream;</div><div class='del'>-	au1000-&gt;stream[CAPTURE]-&gt;buffer = NULL;</div><div class='del'>-	substream-&gt;private_data = au1000-&gt;stream[CAPTURE];</div><div class='del'>-	substream-&gt;runtime-&gt;hw = snd_au1000_hw;</div><div class='del'>-	return (snd_pcm_hw_constraint_list(substream-&gt;runtime, 0,</div><div class='del'>-		SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_rates) &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_playback_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	au1000-&gt;stream[PLAYBACK]-&gt;substream = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_capture_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	au1000-&gt;stream[CAPTURE]-&gt;substream = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-					struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	struct audio_stream *stream = substream-&gt;private_data;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return au1000_setup_dma_link(stream,</div><div class='del'>-				     params_period_bytes(hw_params),</div><div class='del'>-				     params_periods(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct audio_stream *stream = substream-&gt;private_data;</div><div class='del'>-	au1000_release_dma_link(stream);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_playback_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	if (runtime-&gt;channels == 1)</div><div class='del'>-		au1000_set_ac97_xmit_slots(au1000, AC97_SLOT_4);</div><div class='del'>-	else</div><div class='del'>-		au1000_set_ac97_xmit_slots(au1000, AC97_SLOT_3 | AC97_SLOT_4);</div><div class='del'>-	snd_ac97_set_rate(au1000-&gt;ac97, AC97_PCM_FRONT_DAC_RATE, runtime-&gt;rate);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_capture_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = substream-&gt;pcm-&gt;private_data;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-</div><div class='del'>-	if (runtime-&gt;channels == 1)</div><div class='del'>-		au1000_set_ac97_recv_slots(au1000, AC97_SLOT_4);</div><div class='del'>-	else</div><div class='del'>-		au1000_set_ac97_recv_slots(au1000, AC97_SLOT_3 | AC97_SLOT_4);</div><div class='del'>-	snd_ac97_set_rate(au1000-&gt;ac97, AC97_PCM_LR_ADC_RATE, runtime-&gt;rate);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_au1000_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct audio_stream *stream = substream-&gt;private_data;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		au1000_dma_start(stream);</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		au1000_dma_stop(stream);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-snd_au1000_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct audio_stream *stream = substream-&gt;private_data;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	long location;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	location = get_dma_residue(stream-&gt;dma);</div><div class='del'>-	spin_unlock(&amp;stream-&gt;dma_lock);</div><div class='del'>-	location = stream-&gt;buffer-&gt;relative_end - location;</div><div class='del'>-	if (location == -1)</div><div class='del'>-		location = 0;</div><div class='del'>-	return bytes_to_frames(runtime,location);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_card_au1000_playback_ops = {</div><div class='del'>-	.open			= snd_au1000_playback_open,</div><div class='del'>-	.close			= snd_au1000_playback_close,</div><div class='del'>-	.ioctl			= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	        = snd_au1000_hw_params,</div><div class='del'>-	.hw_free	        = snd_au1000_hw_free,</div><div class='del'>-	.prepare		= snd_au1000_playback_prepare,</div><div class='del'>-	.trigger		= snd_au1000_trigger,</div><div class='del'>-	.pointer		= snd_au1000_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_card_au1000_capture_ops = {</div><div class='del'>-	.open			= snd_au1000_capture_open,</div><div class='del'>-	.close			= snd_au1000_capture_close,</div><div class='del'>-	.ioctl			= snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params	        = snd_au1000_hw_params,</div><div class='del'>-	.hw_free	        = snd_au1000_hw_free,</div><div class='del'>-	.prepare		= snd_au1000_capture_prepare,</div><div class='del'>-	.trigger		= snd_au1000_trigger,</div><div class='del'>-	.pointer		= snd_au1000_pointer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_au1000_pcm_new(struct snd_au1000 *au1000)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(au1000-&gt;card, "AU1000 AC97 PCM", 0, 1, 1, &amp;pcm)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-		snd_dma_continuous_data(GFP_KERNEL), 128*1024, 128*1024);</div><div class='del'>-</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-		&amp;snd_card_au1000_playback_ops);</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-		&amp;snd_card_au1000_capture_ops);</div><div class='del'>-</div><div class='del'>-	pcm-&gt;private_data = au1000;</div><div class='del'>-	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "Au1000 AC97 PCM");</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;au1000-&gt;stream[PLAYBACK]-&gt;dma_lock);</div><div class='del'>-	spin_lock_init(&amp;au1000-&gt;stream[CAPTURE]-&gt;dma_lock);</div><div class='del'>-</div><div class='del'>-	flags = claim_dma_lock();</div><div class='del'>-	if ((au1000-&gt;stream[PLAYBACK]-&gt;dma = request_au1000_dma(DMA_ID_AC97C_TX,</div><div class='del'>-			"AC97 TX", au1000_dma_interrupt, IRQF_DISABLED,</div><div class='del'>-			au1000-&gt;stream[PLAYBACK])) &lt; 0) {</div><div class='del'>-		release_dma_lock(flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if ((au1000-&gt;stream[CAPTURE]-&gt;dma = request_au1000_dma(DMA_ID_AC97C_RX,</div><div class='del'>-			"AC97 RX", au1000_dma_interrupt, IRQF_DISABLED,</div><div class='del'>-			au1000-&gt;stream[CAPTURE])) &lt; 0){</div><div class='del'>-		release_dma_lock(flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	/* enable DMA coherency in read/write DMA channels */</div><div class='del'>-	set_dma_mode(au1000-&gt;stream[PLAYBACK]-&gt;dma,</div><div class='del'>-		     get_dma_mode(au1000-&gt;stream[PLAYBACK]-&gt;dma) &amp; ~DMA_NC);</div><div class='del'>-	set_dma_mode(au1000-&gt;stream[CAPTURE]-&gt;dma,</div><div class='del'>-		     get_dma_mode(au1000-&gt;stream[CAPTURE]-&gt;dma) &amp; ~DMA_NC);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-	au1000-&gt;pcm = pcm;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*-------------------------- AC97 CODEC Control ------------------------------*/</div><div class='del'>-</div><div class='del'>-static unsigned short</div><div class='del'>-snd_au1000_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = ac97-&gt;private_data;</div><div class='del'>-	u32 volatile cmd;</div><div class='del'>-	u16 volatile data;</div><div class='del'>-	int             i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-/* would rather use the interrupt than this polling but it works and I can't</div><div class='del'>-get the interrupt driven case to work efficiently */</div><div class='del'>-	for (i = 0; i &lt; 0x5000; i++)</div><div class='del'>-		if (!(au1000-&gt;ac97_ioport-&gt;status &amp; AC97C_CP))</div><div class='del'>-			break;</div><div class='del'>-	if (i == 0x5000)</div><div class='del'>-		printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n");</div><div class='del'>-</div><div class='del'>-	cmd = (u32) reg &amp; AC97C_INDEX_MASK;</div><div class='del'>-	cmd |= AC97C_READ;</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;cmd = cmd;</div><div class='del'>-</div><div class='del'>-	/* now wait for the data */</div><div class='del'>-	for (i = 0; i &lt; 0x5000; i++)</div><div class='del'>-		if (!(au1000-&gt;ac97_ioport-&gt;status &amp; AC97C_CP))</div><div class='del'>-			break;</div><div class='del'>-	if (i == 0x5000) {</div><div class='del'>-		printk(KERN_ERR "au1000 AC97: AC97 command read timeout\n");</div><div class='del'>-		spin_unlock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = au1000-&gt;ac97_ioport-&gt;cmd &amp; 0xffff;</div><div class='del'>-	spin_unlock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-snd_au1000_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = ac97-&gt;private_data;</div><div class='del'>-	u32 cmd;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-/* would rather use the interrupt than this polling but it works and I can't</div><div class='del'>-get the interrupt driven case to work efficiently */</div><div class='del'>-	for (i = 0; i &lt; 0x5000; i++)</div><div class='del'>-		if (!(au1000-&gt;ac97_ioport-&gt;status &amp; AC97C_CP))</div><div class='del'>-			break;</div><div class='del'>-	if (i == 0x5000)</div><div class='del'>-		printk(KERN_ERR "au1000 AC97: AC97 command write timeout\n");</div><div class='del'>-</div><div class='del'>-	cmd = (u32) reg &amp; AC97C_INDEX_MASK;</div><div class='del'>-	cmd &amp;= ~AC97C_READ;</div><div class='del'>-	cmd |= ((u32) val &lt;&lt; AC97C_WD_BIT);</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;cmd = cmd;</div><div class='del'>-	spin_unlock(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_au1000_ac97_new(struct snd_au1000 *au1000)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_ac97_bus *pbus;</div><div class='del'>-	struct snd_ac97_template ac97;</div><div class='del'>- 	static struct snd_ac97_bus_ops ops = {</div><div class='del'>-		.write = snd_au1000_ac97_write,</div><div class='del'>-		.read = snd_au1000_ac97_read,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if ((au1000-&gt;ac97_res_port = request_mem_region(CPHYSADDR(AC97C_CONFIG),</div><div class='del'>-	       		0x100000, "Au1x00 AC97")) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "ALSA AC97: can't grap AC97 port\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	au1000-&gt;ac97_ioport = (struct au1000_ac97_reg *)</div><div class='del'>-		KSEG1ADDR(au1000-&gt;ac97_res_port-&gt;start);</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;au1000-&gt;ac97_lock);</div><div class='del'>-</div><div class='del'>-	/* configure pins for AC'97</div><div class='del'>-	TODO: move to board_setup.c */</div><div class='del'>-	au_writel(au_readl(SYS_PINFUNC) &amp; ~0x02, SYS_PINFUNC);</div><div class='del'>-</div><div class='del'>-	/* Initialise Au1000's AC'97 Control Block */</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;cntrl = AC97C_RS | AC97C_CE;</div><div class='del'>-	udelay(10);</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;cntrl = AC97C_CE;</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	/* Initialise External CODEC -- cold reset */</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;config = AC97C_RESET;</div><div class='del'>-	udelay(10);</div><div class='del'>-	au1000-&gt;ac97_ioport-&gt;config = 0x0;</div><div class='del'>-	mdelay(5);</div><div class='del'>-</div><div class='del'>-	/* Initialise AC97 middle-layer */</div><div class='del'>-	if ((err = snd_ac97_bus(au1000-&gt;card, 0, &amp;ops, au1000, &amp;pbus)) &lt; 0)</div><div class='del'>- 		return err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='del'>-	ac97.private_data = au1000;</div><div class='del'>-	if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;au1000-&gt;ac97)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*------------------------------ Setup / Destroy ----------------------------*/</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-snd_au1000_free(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	struct snd_au1000 *au1000 = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	if (au1000-&gt;ac97_res_port) {</div><div class='del'>-		/* put internal AC97 block into reset */</div><div class='del'>-		au1000-&gt;ac97_ioport-&gt;cntrl = AC97C_RS;</div><div class='del'>-		au1000-&gt;ac97_ioport = NULL;</div><div class='del'>-		release_and_free_resource(au1000-&gt;ac97_res_port);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (au1000-&gt;stream[PLAYBACK]) {</div><div class='del'>-	  	if (au1000-&gt;stream[PLAYBACK]-&gt;dma &gt;= 0)</div><div class='del'>-			free_au1000_dma(au1000-&gt;stream[PLAYBACK]-&gt;dma);</div><div class='del'>-		kfree(au1000-&gt;stream[PLAYBACK]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (au1000-&gt;stream[CAPTURE]) {</div><div class='del'>-		if (au1000-&gt;stream[CAPTURE]-&gt;dma &gt;= 0)</div><div class='del'>-			free_au1000_dma(au1000-&gt;stream[CAPTURE]-&gt;dma);</div><div class='del'>-		kfree(au1000-&gt;stream[CAPTURE]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_card *au1000_card;</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-au1000_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct snd_au1000 *au1000;</div><div class='del'>-</div><div class='del'>-	err = snd_card_create(-1, "AC97", THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_au1000), &amp;card);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	card-&gt;private_free = snd_au1000_free;</div><div class='del'>-	au1000 = card-&gt;private_data;</div><div class='del'>-	au1000-&gt;card = card;</div><div class='del'>-</div><div class='del'>-	au1000-&gt;stream[PLAYBACK] = kmalloc(sizeof(struct audio_stream), GFP_KERNEL);</div><div class='del'>-	au1000-&gt;stream[CAPTURE ] = kmalloc(sizeof(struct audio_stream), GFP_KERNEL);</div><div class='del'>-	/* so that snd_au1000_free will work as intended */</div><div class='del'>- 	au1000-&gt;ac97_res_port = NULL;</div><div class='del'>-	if (au1000-&gt;stream[PLAYBACK])</div><div class='del'>-		au1000-&gt;stream[PLAYBACK]-&gt;dma = -1;</div><div class='del'>-	if (au1000-&gt;stream[CAPTURE ])</div><div class='del'>-		au1000-&gt;stream[CAPTURE ]-&gt;dma = -1;</div><div class='del'>-</div><div class='del'>-	if (au1000-&gt;stream[PLAYBACK] == NULL ||</div><div class='del'>-	    au1000-&gt;stream[CAPTURE ] == NULL) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_au1000_ac97_new(au1000)) &lt; 0 ) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_au1000_pcm_new(au1000)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(card-&gt;driver, "Au1000-AC97");</div><div class='del'>-	strcpy(card-&gt;shortname, "AMD Au1000-AC97");</div><div class='del'>-	sprintf(card-&gt;longname, "AMD Au1000--AC97 ALSA Driver");</div><div class='del'>-</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "ALSA AC97: Driver Initialized\n");</div><div class='del'>-	au1000_card = card;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit au1000_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(au1000_card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(au1000_init);</div><div class='del'>-module_exit(au1000_exit);</div><div class='del'>-</div><div class='head'>diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c<br/>index 453d343550a8..f88e6a6733a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/hal2.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/hal2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/hal2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/hal2.c</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for A2 audio system used in SGI machines</div><div class='ctx'>  *  Copyright (c) 2008 Thomas Bogendoerfer &lt;tsbogend@alpha.fanken.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Based on OSS code from Ladislav Michl &lt;ladis@linux-mips.org&gt;, which</div><div class='ctx'>  *  was based on code from Ulf Carlsson</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2 as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -26,6 +13,7 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sgi/hpc3.h&gt;</div><div class='ctx'> #include &lt;asm/sgi/ip22.h&gt;</div><div class='hunk'>@@ -218,6 +206,8 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		l = (tmp &gt;&gt; H2I_C2_L_GAIN_SHIFT) &amp; 15;</div><div class='ctx'> 		r = (tmp &gt;&gt; H2I_C2_R_GAIN_SHIFT) &amp; 15;</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = l;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = r;</div><div class='hunk'>@@ -255,11 +245,13 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		new |= (r &lt;&lt; H2I_C2_R_GAIN_SHIFT);</div><div class='ctx'> 		hal2_i_write32(hal2, H2I_ADC_C2, new);</div><div class='ctx'> 		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return old != new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new hal2_ctrl_headphone = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Headphone Playback Volume",</div><div class='ctx'> 	.access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -269,7 +261,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone __devinitdata = {</div><div class='ctx'> 	.put            = hal2_gain_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new hal2_ctrl_mic = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Mic Capture Volume",</div><div class='ctx'> 	.access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -279,7 +271,7 @@ static struct snd_kcontrol_new hal2_ctrl_mic __devinitdata = {</div><div class='ctx'> 	.put            = hal2_gain_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit hal2_mixer_create(struct snd_hal2 *hal2)</div><div class='add'>+static int hal2_mixer_create(struct snd_hal2 *hal2)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -449,22 +441,24 @@ static inline void hal2_stop_adc(struct snd_hal2 *hal2)</div><div class='ctx'> 	hal2-&gt;adc.pbus.pbus-&gt;pbdma_ctrl = HPC3_PDMACTRL_LD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hal2_alloc_dmabuf(struct hal2_codec *codec)</div><div class='add'>+static int hal2_alloc_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec,</div><div class='add'>+		enum dma_data_direction buffer_dir)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = hal2-&gt;card-&gt;dev;</div><div class='ctx'> 	struct hal2_desc *desc;</div><div class='ctx'> 	dma_addr_t desc_dma, buffer_dma;</div><div class='ctx'> 	int count = H2_BUF_SIZE / H2_BLOCK_SIZE;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	codec-&gt;buffer = dma_alloc_noncoherent(NULL, H2_BUF_SIZE,</div><div class='del'>-					      &amp;buffer_dma, GFP_KERNEL);</div><div class='add'>+	codec-&gt;buffer = dma_alloc_noncoherent(dev, H2_BUF_SIZE, &amp;buffer_dma,</div><div class='add'>+					buffer_dir, GFP_KERNEL);</div><div class='ctx'> 	if (!codec-&gt;buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	desc = dma_alloc_noncoherent(NULL, count * sizeof(struct hal2_desc),</div><div class='del'>-				     &amp;desc_dma, GFP_KERNEL);</div><div class='add'>+	desc = dma_alloc_noncoherent(dev, count * sizeof(struct hal2_desc),</div><div class='add'>+			&amp;desc_dma, DMA_BIDIRECTIONAL, GFP_KERNEL);</div><div class='ctx'> 	if (!desc) {</div><div class='del'>-		dma_free_noncoherent(NULL, H2_BUF_SIZE,</div><div class='del'>-				     codec-&gt;buffer, buffer_dma);</div><div class='add'>+		dma_free_noncoherent(dev, H2_BUF_SIZE, codec-&gt;buffer, buffer_dma,</div><div class='add'>+				buffer_dir);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	codec-&gt;buffer_dma = buffer_dma;</div><div class='hunk'>@@ -477,25 +471,30 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec)</div><div class='ctx'> 		      desc_dma : desc_dma + (i + 1) * sizeof(struct hal2_desc);</div><div class='ctx'> 		desc++;</div><div class='ctx'> 	}</div><div class='del'>-	dma_cache_sync(NULL, codec-&gt;desc, count * sizeof(struct hal2_desc),</div><div class='del'>-		       DMA_TO_DEVICE);</div><div class='add'>+	dma_sync_single_for_device(dev, codec-&gt;desc_dma,</div><div class='add'>+				   count * sizeof(struct hal2_desc),</div><div class='add'>+				   DMA_BIDIRECTIONAL);</div><div class='ctx'> 	codec-&gt;desc_count = count;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void hal2_free_dmabuf(struct hal2_codec *codec)</div><div class='add'>+static void hal2_free_dmabuf(struct snd_hal2 *hal2, struct hal2_codec *codec,</div><div class='add'>+		enum dma_data_direction buffer_dir)</div><div class='ctx'> {</div><div class='del'>-	dma_free_noncoherent(NULL, codec-&gt;desc_count * sizeof(struct hal2_desc),</div><div class='del'>-			     codec-&gt;desc, codec-&gt;desc_dma);</div><div class='del'>-	dma_free_noncoherent(NULL, H2_BUF_SIZE, codec-&gt;buffer,</div><div class='del'>-			     codec-&gt;buffer_dma);</div><div class='add'>+	struct device *dev = hal2-&gt;card-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dma_free_noncoherent(dev, codec-&gt;desc_count * sizeof(struct hal2_desc),</div><div class='add'>+		       codec-&gt;desc, codec-&gt;desc_dma, DMA_BIDIRECTIONAL);</div><div class='add'>+	dma_free_noncoherent(dev, H2_BUF_SIZE, codec-&gt;buffer, codec-&gt;buffer_dma,</div><div class='add'>+			buffer_dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware hal2_pcm_hw = {</div><div class='add'>+static const struct snd_pcm_hardware hal2_pcm_hw = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-		 SNDRV_PCM_INFO_BLOCK_TRANSFER),</div><div class='add'>+		 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+		 SNDRV_PCM_INFO_SYNC_APPLPTR),</div><div class='ctx'> 	.formats =          SNDRV_PCM_FMTBIT_S16_BE,</div><div class='ctx'> 	.rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='ctx'> 	.rate_min =         8000,</div><div class='hunk'>@@ -509,42 +508,20 @@ static struct snd_pcm_hardware hal2_pcm_hw = {</div><div class='ctx'> 	.periods_max =      1024,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int hal2_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			      struct snd_pcm_hw_params *params)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hal2_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int hal2_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = hal2_pcm_hw;</div><div class='del'>-</div><div class='del'>-	err = hal2_alloc_dmabuf(&amp;hal2-&gt;dac);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return hal2_alloc_dmabuf(hal2, &amp;hal2-&gt;dac, DMA_TO_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hal2_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	hal2_free_dmabuf(&amp;hal2-&gt;dac);</div><div class='add'>+	hal2_free_dmabuf(hal2, &amp;hal2-&gt;dac, DMA_TO_DEVICE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -558,6 +535,8 @@ static int hal2_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	dac-&gt;sample_rate = hal2_compute_rate(dac, runtime-&gt;rate);</div><div class='ctx'> 	memset(&amp;dac-&gt;pcm_indirect, 0, sizeof(dac-&gt;pcm_indirect));</div><div class='ctx'> 	dac-&gt;pcm_indirect.hw_buffer_size = H2_BUF_SIZE;</div><div class='add'>+	dac-&gt;pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2;</div><div class='add'>+	dac-&gt;pcm_indirect.hw_io = dac-&gt;buffer_dma;</div><div class='ctx'> 	dac-&gt;pcm_indirect.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	dac-&gt;substream = substream;</div><div class='ctx'> 	hal2_setup_dac(hal2);</div><div class='hunk'>@@ -570,9 +549,6 @@ static int hal2_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		hal2-&gt;dac.pcm_indirect.hw_io = hal2-&gt;dac.buffer_dma;</div><div class='del'>-		hal2-&gt;dac.pcm_indirect.hw_data = 0;</div><div class='del'>-		substream-&gt;ops-&gt;ack(substream);</div><div class='ctx'> 		hal2_start_dac(hal2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='hunk'>@@ -601,7 +577,9 @@ static void hal2_playback_transfer(struct snd_pcm_substream *substream,</div><div class='ctx'> 	unsigned char *buf = hal2-&gt;dac.buffer + rec-&gt;hw_data;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(buf, substream-&gt;runtime-&gt;dma_area + rec-&gt;sw_data, bytes);</div><div class='del'>-	dma_cache_sync(NULL, buf, bytes, DMA_TO_DEVICE);</div><div class='add'>+	dma_sync_single_for_device(hal2-&gt;card-&gt;dev,</div><div class='add'>+			hal2-&gt;dac.buffer_dma + rec-&gt;hw_data, bytes,</div><div class='add'>+			DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -610,33 +588,25 @@ static int hal2_playback_ack(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct hal2_codec *dac = &amp;hal2-&gt;dac;</div><div class='ctx'> </div><div class='del'>-	dac-&gt;pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2;</div><div class='del'>-	snd_pcm_indirect_playback_transfer(substream,</div><div class='del'>-					   &amp;dac-&gt;pcm_indirect,</div><div class='del'>-					   hal2_playback_transfer);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_indirect_playback_transfer(substream,</div><div class='add'>+						  &amp;dac-&gt;pcm_indirect,</div><div class='add'>+						  hal2_playback_transfer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hal2_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct hal2_codec *adc = &amp;hal2-&gt;adc;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = hal2_pcm_hw;</div><div class='del'>-</div><div class='del'>-	err = hal2_alloc_dmabuf(adc);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return hal2_alloc_dmabuf(hal2, &amp;hal2-&gt;adc, DMA_FROM_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hal2_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	hal2_free_dmabuf(&amp;hal2-&gt;adc);</div><div class='add'>+	hal2_free_dmabuf(hal2, &amp;hal2-&gt;adc, DMA_FROM_DEVICE);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -651,6 +621,7 @@ static int hal2_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	memset(&amp;adc-&gt;pcm_indirect, 0, sizeof(adc-&gt;pcm_indirect));</div><div class='ctx'> 	adc-&gt;pcm_indirect.hw_buffer_size = H2_BUF_SIZE;</div><div class='ctx'> 	adc-&gt;pcm_indirect.hw_queue_size = H2_BUF_SIZE / 2;</div><div class='add'>+	adc-&gt;pcm_indirect.hw_io = adc-&gt;buffer_dma;</div><div class='ctx'> 	adc-&gt;pcm_indirect.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	adc-&gt;substream = substream;</div><div class='ctx'> 	hal2_setup_adc(hal2);</div><div class='hunk'>@@ -663,9 +634,6 @@ static int hal2_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		hal2-&gt;adc.pcm_indirect.hw_io = hal2-&gt;adc.buffer_dma;</div><div class='del'>-		hal2-&gt;adc.pcm_indirect.hw_data = 0;</div><div class='del'>-		printk(KERN_DEBUG "buffer_dma %x\n", hal2-&gt;adc.buffer_dma);</div><div class='ctx'> 		hal2_start_adc(hal2);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='hunk'>@@ -693,7 +661,9 @@ static void hal2_capture_transfer(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned char *buf = hal2-&gt;adc.buffer + rec-&gt;hw_data;</div><div class='ctx'> </div><div class='del'>-	dma_cache_sync(NULL, buf, bytes, DMA_FROM_DEVICE);</div><div class='add'>+	dma_sync_single_for_cpu(hal2-&gt;card-&gt;dev,</div><div class='add'>+			hal2-&gt;adc.buffer_dma + rec-&gt;hw_data, bytes,</div><div class='add'>+			DMA_FROM_DEVICE);</div><div class='ctx'> 	memcpy(substream-&gt;runtime-&gt;dma_area + rec-&gt;sw_data, buf, bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -702,37 +672,30 @@ static int hal2_capture_ack(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_hal2 *hal2 = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct hal2_codec *adc = &amp;hal2-&gt;adc;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_indirect_capture_transfer(substream,</div><div class='del'>-					  &amp;adc-&gt;pcm_indirect,</div><div class='del'>-					  hal2_capture_transfer);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_indirect_capture_transfer(substream,</div><div class='add'>+						 &amp;adc-&gt;pcm_indirect,</div><div class='add'>+						 hal2_capture_transfer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops hal2_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops hal2_playback_ops = {</div><div class='ctx'> 	.open =        hal2_playback_open,</div><div class='ctx'> 	.close =       hal2_playback_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   hal2_pcm_hw_params,</div><div class='del'>-	.hw_free =     hal2_pcm_hw_free,</div><div class='ctx'> 	.prepare =     hal2_playback_prepare,</div><div class='ctx'> 	.trigger =     hal2_playback_trigger,</div><div class='ctx'> 	.pointer =     hal2_playback_pointer,</div><div class='ctx'> 	.ack =         hal2_playback_ack,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops hal2_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops hal2_capture_ops = {</div><div class='ctx'> 	.open =        hal2_capture_open,</div><div class='ctx'> 	.close =       hal2_capture_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   hal2_pcm_hw_params,</div><div class='del'>-	.hw_free =     hal2_pcm_hw_free,</div><div class='ctx'> 	.prepare =     hal2_capture_prepare,</div><div class='ctx'> 	.trigger =     hal2_capture_trigger,</div><div class='ctx'> 	.pointer =     hal2_capture_pointer,</div><div class='ctx'> 	.ack =         hal2_capture_ack,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit hal2_pcm_create(struct snd_hal2 *hal2)</div><div class='add'>+static int hal2_pcm_create(struct snd_hal2 *hal2)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -743,16 +706,15 @@ static int __devinit hal2_pcm_create(struct snd_hal2 *hal2)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = hal2;</div><div class='del'>-	strcpy(pcm-&gt;name, "SGI HAL2");</div><div class='add'>+	strscpy(pcm-&gt;name, "SGI HAL2");</div><div class='ctx'> </div><div class='ctx'> 	/* set operators */</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='ctx'> 			&amp;hal2_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='ctx'> 			&amp;hal2_capture_ops);</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='del'>-					   snd_dma_continuous_data(GFP_KERNEL),</div><div class='del'>-					   0, 1024 * 1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,</div><div class='add'>+				       NULL, 0, 1024 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -766,7 +728,7 @@ static int hal2_dev_free(struct snd_device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_device_ops hal2_ops = {</div><div class='add'>+static const struct snd_device_ops hal2_ops = {</div><div class='ctx'> 	.dev_free = hal2_dev_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -811,7 +773,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)</div><div class='ctx'> 	struct hpc3_regs *hpc3 = hpc3c0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	hal2 = kzalloc(sizeof(struct snd_hal2), GFP_KERNEL);</div><div class='add'>+	hal2 = kzalloc(sizeof(*hal2), GFP_KERNEL);</div><div class='ctx'> 	if (!hal2)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -873,13 +835,13 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit hal2_probe(struct platform_device *pdev)</div><div class='add'>+static int hal2_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_hal2 *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, index, id, THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -888,7 +850,6 @@ static int __devinit hal2_probe(struct platform_device *pdev)</div><div class='ctx'> 		snd_card_free(card);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	err = hal2_pcm_create(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -901,8 +862,8 @@ static int __devinit hal2_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "SGI HAL2 Audio");</div><div class='del'>-	strcpy(card-&gt;shortname, "SGI HAL2 Audio");</div><div class='add'>+	strscpy(card-&gt;driver, "SGI HAL2 Audio");</div><div class='add'>+	strscpy(card-&gt;shortname, "SGI HAL2 Audio");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s irq %i",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		SGI_HPCDMA_IRQ);</div><div class='hunk'>@@ -916,33 +877,19 @@ static int __devinit hal2_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit hal2_remove(struct platform_device *pdev)</div><div class='add'>+static void hal2_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_card_free(card);</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver hal2_driver = {</div><div class='ctx'> 	.probe	= hal2_probe,</div><div class='del'>-	.remove	= __devexit_p(hal2_remove),</div><div class='add'>+	.remove = hal2_remove,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "sgihal2",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_hal2_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;hal2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_hal2_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;hal2_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_hal2_init);</div><div class='del'>-module_exit(alsa_card_hal2_exit);</div><div class='add'>+module_platform_driver(hal2_driver);</div><div class='head'>diff --git a/sound/mips/hal2.h b/sound/mips/hal2.h<br/>index f19828bc64e0..f70cce9a1406 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/hal2.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/hal2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/hal2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/hal2.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> #ifndef __HAL2_H</div><div class='ctx'> #define __HAL2_H</div><div class='ctx'> </div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *  Driver for HAL2 sound processors</div><div class='ctx'>  *  Copyright (c) 1999 Ulf Carlsson &lt;ulfc@bun.falkenberg.se&gt;</div><div class='ctx'>  *  Copyright (c) 2001, 2002, 2003 Ladislav Michl &lt;ladis@linux-mips.org&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License version 2 as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='head'>diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c<br/>index 717604c00f0a..077fdf2181c1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/mips/sgio2audio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/mips/sgio2audio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/sgio2audio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/sgio2audio.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Sound driver for Silicon Graphics O2 Workstations A/V board audio.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *   Copyright 2008 Thomas Bogendoerfer &lt;tsbogend@alpha.franken.de&gt;</div><div class='ctx'>  *   Mxier part taken from mace_audio.c:</div><div class='ctx'>  *   Copyright 2007 Thorben Jändling &lt;tj.trevelyan@gmail.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -30,6 +16,8 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/ip32/ip32_ints.h&gt;</div><div class='ctx'> #include &lt;asm/ip32/mace.h&gt;</div><div class='hunk'>@@ -45,7 +33,6 @@</div><div class='ctx'> MODULE_AUTHOR("Vivien Chappelier &lt;vivien.chappelier@linux-mips.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("SGI O2 Audio");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Silicon Graphics, O2 Audio}}");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;  /* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */</div><div class='hunk'>@@ -116,9 +103,8 @@ static int read_ad1843_reg(void *priv, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sgio2audio *chip = priv;</div><div class='ctx'> 	int val;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;ad1843_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;ad1843_lock);</div><div class='ctx'> </div><div class='ctx'> 	writeq((reg &lt;&lt; CODEC_CONTROL_ADDRESS_SHIFT) |</div><div class='ctx'> 	       CODEC_CONTROL_READ, &amp;mace-&gt;perif.audio.codec_control);</div><div class='hunk'>@@ -128,7 +114,6 @@ static int read_ad1843_reg(void *priv, int reg)</div><div class='ctx'> </div><div class='ctx'> 	val = readq(&amp;mace-&gt;perif.audio.codec_read);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;ad1843_lock, flags);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -139,9 +124,8 @@ static int write_ad1843_reg(void *priv, int reg, int word)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sgio2audio *chip = priv;</div><div class='ctx'> 	int val;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;ad1843_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;ad1843_lock);</div><div class='ctx'> </div><div class='ctx'> 	writeq((reg &lt;&lt; CODEC_CONTROL_ADDRESS_SHIFT) |</div><div class='ctx'> 	       (word &lt;&lt; CODEC_CONTROL_WORD_SHIFT),</div><div class='hunk'>@@ -150,7 +134,6 @@ static int write_ad1843_reg(void *priv, int reg, int word)</div><div class='ctx'> 	val = readq(&amp;mace-&gt;perif.audio.codec_control); /* flush bus */</div><div class='ctx'> 	udelay(200);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;ad1843_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -200,17 +183,10 @@ static int sgio2audio_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int sgio2audio_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Cam Mic", "Mic", "Line"</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 3)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sgio2audio_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -236,7 +212,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* dac1/pcm0 mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "PCM Playback Volume",</div><div class='ctx'> 	.index          = 0,</div><div class='hunk'>@@ -248,7 +224,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* dac2/pcm1 mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "PCM Playback Volume",</div><div class='ctx'> 	.index          = 1,</div><div class='hunk'>@@ -260,7 +236,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* record level mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Capture Volume",</div><div class='ctx'> 	.access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -271,7 +247,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* record level source control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_recsource = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Capture Source",</div><div class='ctx'> 	.access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -281,7 +257,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* line mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_line = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Line Playback Volume",</div><div class='ctx'> 	.index          = 0,</div><div class='hunk'>@@ -293,7 +269,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* cd mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_cd = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Line Playback Volume",</div><div class='ctx'> 	.index          = 1,</div><div class='hunk'>@@ -305,7 +281,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* mic mixer control */</div><div class='del'>-static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new sgio2audio_ctrl_mic = {</div><div class='ctx'> 	.iface          = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name           = "Mic Playback Volume",</div><div class='ctx'> 	.access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -316,7 +292,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip)</div><div class='add'>+static int snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -371,10 +347,9 @@ static int snd_sgio2audio_dma_pull_frag(struct snd_sgio2audio *chip,</div><div class='ctx'> 	u64 *src;</div><div class='ctx'> 	s16 *dst;</div><div class='ctx'> 	u64 x;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = chip-&gt;channel[ch].substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;channel[ch].lock);</div><div class='ctx'> </div><div class='ctx'> 	src_base = (unsigned long) chip-&gt;ring_base | (ch &lt;&lt; CHANNEL_RING_SHIFT);</div><div class='ctx'> 	src_pos = readq(&amp;mace-&gt;perif.audio.chan[ch].read_ptr);</div><div class='hunk'>@@ -403,7 +378,6 @@ static int snd_sgio2audio_dma_pull_frag(struct snd_sgio2audio *chip,</div><div class='ctx'> 	writeq(src_pos, &amp;mace-&gt;perif.audio.chan[ch].read_ptr); /* in bytes */</div><div class='ctx'> 	chip-&gt;channel[ch].pos = dst_pos;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -419,10 +393,9 @@ static int snd_sgio2audio_dma_push_frag(struct snd_sgio2audio *chip,</div><div class='ctx'> 	int src_pos;</div><div class='ctx'> 	u64 *dst;</div><div class='ctx'> 	s16 *src;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = chip-&gt;channel[ch].substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;channel[ch].lock);</div><div class='ctx'> </div><div class='ctx'> 	dst_base = (unsigned long)chip-&gt;ring_base | (ch &lt;&lt; CHANNEL_RING_SHIFT);</div><div class='ctx'> 	dst_pos = readq(&amp;mace-&gt;perif.audio.chan[ch].write_ptr);</div><div class='hunk'>@@ -453,7 +426,6 @@ static int snd_sgio2audio_dma_push_frag(struct snd_sgio2audio *chip,</div><div class='ctx'> 	writeq(dst_pos, &amp;mace-&gt;perif.audio.chan[ch].write_ptr); /* in bytes */</div><div class='ctx'> 	chip-&gt;channel[ch].pos = src_pos;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -538,7 +510,7 @@ static irqreturn_t snd_sgio2audio_error_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> /* PCM part */</div><div class='ctx'> /* PCM hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_sgio2audio_pcm_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_sgio2audio_pcm_hw = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -597,21 +569,6 @@ static int snd_sgio2audio_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* hw_params callback */</div><div class='del'>-static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-					struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_alloc_vmalloc_buffer(substream,</div><div class='del'>-						params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_vmalloc_buffer(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* prepare callback */</div><div class='ctx'> static int snd_sgio2audio_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -619,9 +576,8 @@ static int snd_sgio2audio_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_sgio2audio_chan *chan = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	int ch = chan-&gt;idx;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;channel[ch].lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the pseudo-dma transfer pointers.  */</div><div class='ctx'> 	chip-&gt;channel[ch].pos = 0;</div><div class='hunk'>@@ -645,7 +601,6 @@ static int snd_sgio2audio_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 				 runtime-&gt;channels);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;channel[ch].lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -681,43 +636,28 @@ snd_sgio2audio_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operators */</div><div class='del'>-static struct snd_pcm_ops snd_sgio2audio_playback1_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = {</div><div class='ctx'> 	.open =        snd_sgio2audio_playback1_open,</div><div class='ctx'> 	.close =       snd_sgio2audio_pcm_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_sgio2audio_pcm_hw_params,</div><div class='del'>-	.hw_free =     snd_sgio2audio_pcm_hw_free,</div><div class='ctx'> 	.prepare =     snd_sgio2audio_pcm_prepare,</div><div class='ctx'> 	.trigger =     snd_sgio2audio_pcm_trigger,</div><div class='ctx'> 	.pointer =     snd_sgio2audio_pcm_pointer,</div><div class='del'>-	.page =        snd_pcm_lib_get_vmalloc_page,</div><div class='del'>-	.mmap =        snd_pcm_lib_mmap_vmalloc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_sgio2audio_playback2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {</div><div class='ctx'> 	.open =        snd_sgio2audio_playback2_open,</div><div class='ctx'> 	.close =       snd_sgio2audio_pcm_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_sgio2audio_pcm_hw_params,</div><div class='del'>-	.hw_free =     snd_sgio2audio_pcm_hw_free,</div><div class='ctx'> 	.prepare =     snd_sgio2audio_pcm_prepare,</div><div class='ctx'> 	.trigger =     snd_sgio2audio_pcm_trigger,</div><div class='ctx'> 	.pointer =     snd_sgio2audio_pcm_pointer,</div><div class='del'>-	.page =        snd_pcm_lib_get_vmalloc_page,</div><div class='del'>-	.mmap =        snd_pcm_lib_mmap_vmalloc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_sgio2audio_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_sgio2audio_capture_ops = {</div><div class='ctx'> 	.open =        snd_sgio2audio_capture_open,</div><div class='ctx'> 	.close =       snd_sgio2audio_pcm_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_sgio2audio_pcm_hw_params,</div><div class='del'>-	.hw_free =     snd_sgio2audio_pcm_hw_free,</div><div class='ctx'> 	.prepare =     snd_sgio2audio_pcm_prepare,</div><div class='ctx'> 	.trigger =     snd_sgio2audio_pcm_trigger,</div><div class='ctx'> 	.pointer =     snd_sgio2audio_pcm_pointer,</div><div class='del'>-	.page =        snd_pcm_lib_get_vmalloc_page,</div><div class='del'>-	.mmap =        snd_pcm_lib_mmap_vmalloc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -725,7 +665,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* create a pcm device */</div><div class='del'>-static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)</div><div class='add'>+static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -736,13 +676,14 @@ static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "SGI O2 DAC1");</div><div class='add'>+	strscpy(pcm-&gt;name, "SGI O2 DAC1");</div><div class='ctx'> </div><div class='ctx'> 	/* set operators */</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='ctx'> 			&amp;snd_sgio2audio_playback1_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='ctx'> 			&amp;snd_sgio2audio_capture_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* create second  pcm device with one outputs and no input */</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "SGI O2 Audio", 1, 1, 0, &amp;pcm);</div><div class='hunk'>@@ -750,11 +691,12 @@ static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "SGI O2 DAC2");</div><div class='add'>+	strscpy(pcm-&gt;name, "SGI O2 DAC2");</div><div class='ctx'> </div><div class='ctx'> 	/* set operators */</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='ctx'> 			&amp;snd_sgio2audio_playback2_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -814,7 +756,7 @@ static int snd_sgio2audio_free(struct snd_sgio2audio *chip)</div><div class='ctx'> 		free_irq(snd_sgio2_isr_table[i].irq,</div><div class='ctx'> 			 &amp;chip-&gt;channel[snd_sgio2_isr_table[i].idx]);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(NULL, MACEISA_RINGBUFFERS_SIZE,</div><div class='add'>+	dma_free_coherent(chip-&gt;card-&gt;dev, MACEISA_RINGBUFFERS_SIZE,</div><div class='ctx'> 			  chip-&gt;ring_base, chip-&gt;ring_base_dma);</div><div class='ctx'> </div><div class='ctx'> 	/* release card data */</div><div class='hunk'>@@ -829,12 +771,12 @@ static int snd_sgio2audio_dev_free(struct snd_device *device)</div><div class='ctx'> 	return snd_sgio2audio_free(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_device_ops ops = {</div><div class='add'>+static const struct snd_device_ops ops = {</div><div class='ctx'> 	.dev_free = snd_sgio2audio_dev_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sgio2audio_create(struct snd_card *card,</div><div class='del'>-					   struct snd_sgio2audio **rchip)</div><div class='add'>+static int snd_sgio2audio_create(struct snd_card *card,</div><div class='add'>+				 struct snd_sgio2audio **rchip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sgio2audio *chip;</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -846,14 +788,15 @@ static int __devinit snd_sgio2audio_create(struct snd_card *card,</div><div class='ctx'> 	if (!(readq(&amp;mace-&gt;perif.audio.control) &amp; AUDIO_CONTROL_CODEC_PRESENT))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(struct snd_sgio2audio), GFP_KERNEL);</div><div class='add'>+	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='ctx'> 	if (chip == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ring_base = dma_alloc_coherent(NULL, MACEISA_RINGBUFFERS_SIZE,</div><div class='del'>-					     &amp;chip-&gt;ring_base_dma, GFP_USER);</div><div class='add'>+	chip-&gt;ring_base = dma_alloc_coherent(card-&gt;dev,</div><div class='add'>+					     MACEISA_RINGBUFFERS_SIZE,</div><div class='add'>+					     &amp;chip-&gt;ring_base_dma, GFP_KERNEL);</div><div class='ctx'> 	if (chip-&gt;ring_base == NULL) {</div><div class='ctx'> 		printk(KERN_ERR</div><div class='ctx'> 		       "sgio2audio: could not allocate ring buffers\n");</div><div class='hunk'>@@ -913,13 +856,13 @@ static int __devinit snd_sgio2audio_create(struct snd_card *card,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)</div><div class='add'>+static int snd_sgio2audio_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_sgio2audio *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, index, id, THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -928,7 +871,6 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)</div><div class='ctx'> 		snd_card_free(card);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_card_set_dev(card, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_sgio2audio_new_pcm(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='hunk'>@@ -941,8 +883,8 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "SGI O2 Audio");</div><div class='del'>-	strcpy(card-&gt;shortname, "SGI O2 Audio");</div><div class='add'>+	strscpy(card-&gt;driver, "SGI O2 Audio");</div><div class='add'>+	strscpy(card-&gt;shortname, "SGI O2 Audio");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s irq %i-%i",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		MACEISA_AUDIO1_DMAT_IRQ,</div><div class='hunk'>@@ -957,33 +899,19 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit snd_sgio2audio_remove(struct platform_device *pdev)</div><div class='add'>+static void snd_sgio2audio_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	snd_card_free(card);</div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver sgio2audio_driver = {</div><div class='ctx'> 	.probe	= snd_sgio2audio_probe,</div><div class='del'>-	.remove	= __devexit_p(snd_sgio2audio_remove),</div><div class='del'>-	.driver = {</div><div class='add'>+	.remove	= snd_sgio2audio_remove,</div><div class='add'>+	.driver	= {</div><div class='ctx'> 		.name	= "sgio2audio",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_sgio2audio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;sgio2audio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_sgio2audio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;sgio2audio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_sgio2audio_init)</div><div class='del'>-module_exit(alsa_card_sgio2audio_exit)</div><div class='add'>+module_platform_driver(sgio2audio_driver);</div><div class='head'>diff --git a/sound/mips/snd-n64.c b/sound/mips/snd-n64.c<br/>new file mode 100644<br/>index 000000000000..f17e63f2ff5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/mips/snd-n64.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/mips/snd-n64.c</a></div><div class='hunk'>@@ -0,0 +1,369 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ *   Sound driver for Nintendo 64.</div><div class='add'>+ *</div><div class='add'>+ *   Copyright 2021 Lauri Kasanen</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/log2.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm_params.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Lauri Kasanen &lt;cand@gmx.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("N64 Audio");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+#define AI_NTSC_DACRATE 48681812</div><div class='add'>+#define AI_STATUS_BUSY  (1 &lt;&lt; 30)</div><div class='add'>+#define AI_STATUS_FULL  (1 &lt;&lt; 31)</div><div class='add'>+</div><div class='add'>+#define AI_ADDR_REG 0</div><div class='add'>+#define AI_LEN_REG 1</div><div class='add'>+#define AI_CONTROL_REG 2</div><div class='add'>+#define AI_STATUS_REG 3</div><div class='add'>+#define AI_RATE_REG 4</div><div class='add'>+#define AI_BITCLOCK_REG 5</div><div class='add'>+</div><div class='add'>+#define MI_INTR_REG 2</div><div class='add'>+#define MI_MASK_REG 3</div><div class='add'>+</div><div class='add'>+#define MI_INTR_AI 0x04</div><div class='add'>+</div><div class='add'>+#define MI_MASK_CLR_AI 0x0010</div><div class='add'>+#define MI_MASK_SET_AI 0x0020</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct n64audio {</div><div class='add'>+	u32 __iomem *ai_reg_base;</div><div class='add'>+	u32 __iomem *mi_reg_base;</div><div class='add'>+</div><div class='add'>+	void *ring_base;</div><div class='add'>+	dma_addr_t ring_base_dma;</div><div class='add'>+</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct snd_pcm_substream *substream;</div><div class='add'>+		int pos, nextpos;</div><div class='add'>+		u32 writesize;</div><div class='add'>+		u32 bufsize;</div><div class='add'>+		spinlock_t lock;</div><div class='add'>+	} chan;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void n64audio_write_reg(struct n64audio *priv, const u8 reg, const u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, priv-&gt;ai_reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void n64mi_write_reg(struct n64audio *priv, const u8 reg, const u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, priv-&gt;mi_reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 n64mi_read_reg(struct n64audio *priv, const u8 reg)</div><div class='add'>+{</div><div class='add'>+	return readl(priv-&gt;mi_reg_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void n64audio_push(struct n64audio *priv)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = priv-&gt;chan.substream-&gt;runtime;</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;priv-&gt;chan.lock);</div><div class='add'>+</div><div class='add'>+	count = priv-&gt;chan.writesize;</div><div class='add'>+</div><div class='add'>+	memcpy(priv-&gt;ring_base + priv-&gt;chan.nextpos,</div><div class='add'>+	       runtime-&gt;dma_area + priv-&gt;chan.nextpos, count);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The hw registers are double-buffered, and the IRQ fires essentially</div><div class='add'>+	 * one period behind. The core only allows one period's distance, so we</div><div class='add'>+	 * keep a private DMA buffer to afford two.</div><div class='add'>+	 */</div><div class='add'>+	n64audio_write_reg(priv, AI_ADDR_REG, priv-&gt;ring_base_dma + priv-&gt;chan.nextpos);</div><div class='add'>+	barrier();</div><div class='add'>+	n64audio_write_reg(priv, AI_LEN_REG, count);</div><div class='add'>+</div><div class='add'>+	priv-&gt;chan.nextpos += count;</div><div class='add'>+	priv-&gt;chan.nextpos %= priv-&gt;chan.bufsize;</div><div class='add'>+</div><div class='add'>+	runtime-&gt;delay = runtime-&gt;period_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t n64audio_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct n64audio *priv = dev_id;</div><div class='add'>+	const u32 intrs = n64mi_read_reg(priv, MI_INTR_REG);</div><div class='add'>+</div><div class='add'>+	// Check it's ours</div><div class='add'>+	if (!(intrs &amp; MI_INTR_AI))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	n64audio_write_reg(priv, AI_STATUS_REG, 1);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;chan.substream &amp;&amp; snd_pcm_running(priv-&gt;chan.substream)) {</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;priv-&gt;chan.lock) {</div><div class='add'>+			priv-&gt;chan.pos = priv-&gt;chan.nextpos;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		snd_pcm_period_elapsed(priv-&gt;chan.substream);</div><div class='add'>+		if (priv-&gt;chan.substream &amp;&amp; snd_pcm_running(priv-&gt;chan.substream))</div><div class='add'>+			n64audio_push(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hardware n64audio_pcm_hw = {</div><div class='add'>+	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='add'>+		 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+		 SNDRV_PCM_INFO_BLOCK_TRANSFER),</div><div class='add'>+	.formats =          SNDRV_PCM_FMTBIT_S16_BE,</div><div class='add'>+	.rates =            SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+	.rate_min =         8000,</div><div class='add'>+	.rate_max =         48000,</div><div class='add'>+	.channels_min =     2,</div><div class='add'>+	.channels_max =     2,</div><div class='add'>+	.buffer_bytes_max = 32768,</div><div class='add'>+	.period_bytes_min = 1024,</div><div class='add'>+	.period_bytes_max = 32768,</div><div class='add'>+	.periods_min =      3,</div><div class='add'>+	// 3 periods lets the double-buffering hw read one buffer behind safely</div><div class='add'>+	.periods_max =      128,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hw_rule_period_size(struct snd_pcm_hw_params *params,</div><div class='add'>+			       struct snd_pcm_hw_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct snd_interval *c = hw_param_interval(params,</div><div class='add'>+						   SNDRV_PCM_HW_PARAM_PERIOD_SIZE);</div><div class='add'>+	int changed = 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The DMA unit has errata on (start + len) &amp; 0x3fff == 0x2000.</div><div class='add'>+	 * This constraint makes sure that the period size is not a power of two,</div><div class='add'>+	 * which combined with dma_alloc_coherent aligning the buffer to the largest</div><div class='add'>+	 * PoT &lt;= size guarantees it won't be hit.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (is_power_of_2(c-&gt;min)) {</div><div class='add'>+		c-&gt;min += 2;</div><div class='add'>+		changed = 1;</div><div class='add'>+	}</div><div class='add'>+	if (is_power_of_2(c-&gt;max)) {</div><div class='add'>+		c-&gt;max -= 2;</div><div class='add'>+		changed = 1;</div><div class='add'>+	}</div><div class='add'>+	if (snd_interval_checkempty(c)) {</div><div class='add'>+		c-&gt;empty = 1;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int n64audio_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	runtime-&gt;hw = n64audio_pcm_hw;</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+			    hw_rule_period_size, NULL, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int n64audio_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct n64audio *priv = substream-&gt;pcm-&gt;private_data;</div><div class='add'>+	u32 rate;</div><div class='add'>+</div><div class='add'>+	rate = ((2 * AI_NTSC_DACRATE / runtime-&gt;rate) + 1) / 2 - 1;</div><div class='add'>+</div><div class='add'>+	n64audio_write_reg(priv, AI_RATE_REG, rate);</div><div class='add'>+</div><div class='add'>+	rate /= 66;</div><div class='add'>+	if (rate &gt; 16)</div><div class='add'>+		rate = 16;</div><div class='add'>+	n64audio_write_reg(priv, AI_BITCLOCK_REG, rate - 1);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;priv-&gt;chan.lock);</div><div class='add'>+</div><div class='add'>+	/* Setup the pseudo-dma transfer pointers.  */</div><div class='add'>+	priv-&gt;chan.pos = 0;</div><div class='add'>+	priv-&gt;chan.nextpos = 0;</div><div class='add'>+	priv-&gt;chan.substream = substream;</div><div class='add'>+	priv-&gt;chan.writesize = snd_pcm_lib_period_bytes(substream);</div><div class='add'>+	priv-&gt;chan.bufsize = snd_pcm_lib_buffer_bytes(substream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int n64audio_pcm_trigger(struct snd_pcm_substream *substream,</div><div class='add'>+				int cmd)</div><div class='add'>+{</div><div class='add'>+	struct n64audio *priv = substream-&gt;pcm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		n64audio_push(substream-&gt;pcm-&gt;private_data);</div><div class='add'>+		n64audio_write_reg(priv, AI_CONTROL_REG, 1);</div><div class='add'>+		n64mi_write_reg(priv, MI_MASK_REG, MI_MASK_SET_AI);</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		n64audio_write_reg(priv, AI_CONTROL_REG, 0);</div><div class='add'>+		n64mi_write_reg(priv, MI_MASK_REG, MI_MASK_CLR_AI);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t n64audio_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct n64audio *priv = substream-&gt;pcm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime,</div><div class='add'>+			       priv-&gt;chan.pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int n64audio_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct n64audio *priv = substream-&gt;pcm-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	priv-&gt;chan.substream = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops n64audio_pcm_ops = {</div><div class='add'>+	.open =		n64audio_pcm_open,</div><div class='add'>+	.prepare =	n64audio_pcm_prepare,</div><div class='add'>+	.trigger =	n64audio_pcm_trigger,</div><div class='add'>+	.pointer =	n64audio_pcm_pointer,</div><div class='add'>+	.close =	n64audio_pcm_close,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The target device is embedded and RAM-constrained. We save RAM</div><div class='add'>+ * by initializing in __init code that gets dropped late in boot.</div><div class='add'>+ * For the same reason there is no module or unloading support.</div><div class='add'>+ */</div><div class='add'>+static int __init n64audio_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	struct n64audio *priv;</div><div class='add'>+	int err, irq;</div><div class='add'>+</div><div class='add'>+	err = snd_card_new(&amp;pdev-&gt;dev, SNDRV_DEFAULT_IDX1,</div><div class='add'>+			   SNDRV_DEFAULT_STR1,</div><div class='add'>+			   THIS_MODULE, sizeof(*priv), &amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;chan.lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;card = card;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ring_base = dma_alloc_coherent(card-&gt;dev, 32 * 1024, &amp;priv-&gt;ring_base_dma,</div><div class='add'>+					     GFP_DMA|GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;ring_base) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto fail_card;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mi_reg_base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;mi_reg_base)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;mi_reg_base);</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;ai_reg_base = devm_platform_ioremap_resource(pdev, 1);</div><div class='add'>+	if (IS_ERR(priv-&gt;ai_reg_base)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;ai_reg_base);</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(card, "N64 Audio", 0, 1, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+</div><div class='add'>+	pcm-&gt;private_data = priv;</div><div class='add'>+	strscpy(pcm-&gt;name, "N64 Audio");</div><div class='add'>+</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;n64audio_pcm_ops);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, card-&gt;dev, 0, 0);</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "N64 Audio");</div><div class='add'>+	strscpy(card-&gt;shortname, "N64 Audio");</div><div class='add'>+	strscpy(card-&gt;longname, "N64 Audio");</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+	}</div><div class='add'>+	if (devm_request_irq(&amp;pdev-&gt;dev, irq, n64audio_isr,</div><div class='add'>+				IRQF_SHARED, "N64 Audio", priv)) {</div><div class='add'>+		err = -EBUSY;</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto fail_dma_alloc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_dma_alloc:</div><div class='add'>+	dma_free_coherent(card-&gt;dev, 32 * 1024, priv-&gt;ring_base, priv-&gt;ring_base_dma);</div><div class='add'>+</div><div class='add'>+fail_card:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver n64audio_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "n64audio",</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init n64audio_init(void)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_probe(&amp;n64audio_driver, n64audio_probe);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(n64audio_init);</div><div class='head'>diff --git a/sound/oss/.gitignore b/sound/oss/.gitignore<br/>index 7efb12b45502..ac678430408b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/.gitignore?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/.gitignore</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/.gitignore?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/.gitignore</a></div><div class='hunk'>@@ -1,4 +1,3 @@</div><div class='del'>-#Ignore generated files</div><div class='del'>-maui_boot.h</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> pss_boot.h</div><div class='ctx'> trix_boot.h</div><div class='head'>diff --git a/sound/oss/CHANGELOG b/sound/oss/CHANGELOG<br/>deleted file mode 100644<br/>index 8706cd66ca1f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/CHANGELOG?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/CHANGELOG</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,369 +0,0 @@</div><div class='del'>-Note these changes relate to Hannu's code and don't include the changes</div><div class='del'>-made outside of this for modularising the sound</div><div class='del'>-</div><div class='del'>-Changelog for version 3.8o</div><div class='del'>---------------------------</div><div class='del'>-</div><div class='del'>-Since 3.8h</div><div class='del'>-- Included support for OPL3-SA1 and SoftOSS</div><div class='del'>-</div><div class='del'>-Since 3.8</div><div class='del'>-- Fixed SNDCTL_DSP_GETOSPACE</div><div class='del'>-- Compatibility fixes for Linux 2.1.47</div><div class='del'>-</div><div class='del'>-Since 3.8-beta21</div><div class='del'>-- Fixed all known bugs (I think).</div><div class='del'>-</div><div class='del'>-Since 3.8-beta8</div><div class='del'>-- Lot of fixes to audio playback code in dmabuf.c</div><div class='del'>-</div><div class='del'>-Since 3.8-beta6</div><div class='del'>-- Fixed the famous Quake delay bug.</div><div class='del'>-</div><div class='del'>-Since 3.8-beta5</div><div class='del'>-- Fixed many bugs in audio playback.</div><div class='del'>-</div><div class='del'>-Since 3.8-beta4</div><div class='del'>-- Just minor changes.</div><div class='del'>-</div><div class='del'>-Since 3.8-beta1</div><div class='del'>-- Major rewrite of audio playback handling.</div><div class='del'>-- Added AWE32 support by Takashi Iwai (in ./lowlevel/).</div><div class='del'>-</div><div class='del'>-Since 3.7-beta#</div><div class='del'>-- Passing of ioctl() parameters between soundcard.c and other modules has been</div><div class='del'>-changed so that arg always points to kernel space.</div><div class='del'>-- Some bugfixes.</div><div class='del'>-</div><div class='del'>-Since 3.7-beta5</div><div class='del'>-- Disabled MIDI input with GUS PnP (Interwave). There seems to be constant</div><div class='del'>-stream of received 0x00 bytes when the MIDI receiver is enabled.</div><div class='del'>-</div><div class='del'>-Since 3.5</div><div class='del'>-- Changes almost everywhere.</div><div class='del'>-- Support for OPTi 82C924-based sound cards.</div><div class='del'>-</div><div class='del'>-Since 3.5.4-beta8</div><div class='del'>-- Fixed a bug in handling of non-fragment sized writes in 16 bit/stereo mode</div><div class='del'>-  with GUS.</div><div class='del'>-- Limited minimum fragment size with some audio devices (GUS=512 and</div><div class='del'>-  SB=32). These devices require more time to "recover" from processing</div><div class='del'>-  of each fragment. </div><div class='del'>-</div><div class='del'>-Since 3.5.4-beta6/7</div><div class='del'>-- There seems to be problems in the OPTi 82C930 so cards based on this</div><div class='del'>-  chip don't necessarily work yet. There are problems in detecting the </div><div class='del'>-  MIDI interface. Also mixer volumes may be seriously wrong on some systems.</div><div class='del'>-  You can safely use this driver version with C930 if it looks to work.</div><div class='del'>-  However please don't complain if you have problems with it. C930 support</div><div class='del'>-  should be fixed in future releases.</div><div class='del'>-- Got initialization of GUS PnP to work. With this version GUS PnP should</div><div class='del'>-  work in GUS compatible mode after initialization using isapnptools.</div><div class='del'>-- Fixed a bug in handling of full duplex cards in write only mode. This has</div><div class='del'>-  been causing "audio device opening" errors with RealAudio player.</div><div class='del'>-</div><div class='del'>-Since 3.5.4.beta5</div><div class='del'>-- Changes to OPTi 82C930 driver.</div><div class='del'>-- Major changes to the Soundscape driver. The driver requires now just one</div><div class='del'>-  DMA channel. The extra audio/dsp device (the "Not functional" one) used</div><div class='del'>-  for code download in the earlier versions has been eliminated. There is now</div><div class='del'>-  just one /dev/dsp# device which is used both for code download and audio.</div><div class='del'>-</div><div class='del'>-Since 3.5.4.beta4</div><div class='del'>-- Minor changes.</div><div class='del'>-</div><div class='del'>-Since 3.5.4-beta2</div><div class='del'>-- Fixed silent playback with ESS 688/1688.</div><div class='del'>-- Got SB16 to work without the 16 bit DMA channel (only the 8 bit one</div><div class='del'>-  is required for 8 and 16 bit modes).</div><div class='del'>-- Added the "lowlevel" subdirectory for additional low level drivers that</div><div class='del'>-  are not part of USS core. See lowlevel/README for more info.</div><div class='del'>-- Included support for ACI mixer (by Markus Kuhn). ACI is a mixer used in</div><div class='del'>-  miroPCM sound cards. See lowlevel/aci.readme for more info.</div><div class='del'>-- Support for Aztech Washington chipset (AZT2316 ASIC).</div><div class='del'>-</div><div class='del'>-Since 3.5.4-beta1</div><div class='del'>-- Reduced clicking with AD1848.</div><div class='del'>-- Support for OPTi 82C930. Only half duplex at this time. 16 bit playback</div><div class='del'>-  is sometimes just white noise (occurs randomly).</div><div class='del'>-</div><div class='del'>-Since 3.5.2</div><div class='del'>-- Major changes to the SB/Jazz16/ESS driver (most parts rewritten).</div><div class='del'>-  The most noticeable new feature is support for multiple SB cards at the same</div><div class='del'>-  time.</div><div class='del'>-- Renamed sb16_midi.c to uart401.c. Also modified it to work also with</div><div class='del'>-  other MPU401 UART compatible cards than SB16/ESS/Jazz.</div><div class='del'>-- Some changes which reduce clicking in audio playback.</div><div class='del'>-- Copying policy is now GPL.</div><div class='del'>-</div><div class='del'>-Since 3.5.1</div><div class='del'>-- TB Maui initialization support</div><div class='del'>-Since 3.5</div><div class='del'>-- Improved handling of playback underrun situations.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta10</div><div class='del'>-- Bug fixing</div><div class='del'>-</div><div class='del'>-Since 3.5-beta9</div><div class='del'>-- Fixed for compatibility with Linux 1.3.70 and later.</div><div class='del'>-- Changed boot time passing of 16 bit DMA channel number to SB driver.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta8</div><div class='del'>-- Minor changes</div><div class='del'>-</div><div class='del'>-Since 3.5-beta7</div><div class='del'>-- enhancements to configure program (by Jeff Tranter):</div><div class='del'>-  - prompts are in same format as 1.3.x Linux kernel config program</div><div class='del'>-  - on-line help for each question</div><div class='del'>-  - fixed some compile warnings detected by gcc/g++ -Wall</div><div class='del'>-  - minor grammatical changes to prompts</div><div class='del'>-</div><div class='del'>-Since 3.5-beta6</div><div class='del'>-- Fixed bugs in mmap() support.</div><div class='del'>-- Minor changes to Maui driver.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta5</div><div class='del'>-- Fixed crash after recording with ESS688. It's generally a good</div><div class='del'>-  idea to stop inbound DMA transfers before freeing the memory</div><div class='del'>-  buffer. </div><div class='del'>-- Fixed handling of AD1845 codec (for example Shuttle Sound System).</div><div class='del'>-- Few other fixes.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta4</div><div class='del'>-- Fixed bug in handling of uninitialized instruments with GUS.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta3</div><div class='del'>-- Few changes which decrease popping at end/beginning of audio playback.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta2</div><div class='del'>-- Removed MAD16+CS4231 hack made in previous version since it didn't</div><div class='del'>-  help.</div><div class='del'>-- Fixed the above bug in proper way and in proper place. Many thanks</div><div class='del'>-  to James Hightower.</div><div class='del'>-</div><div class='del'>-Since 3.5-beta1</div><div class='del'>-- Bug fixes.</div><div class='del'>-- Full duplex audio with MAD16+CS4231 may work now. The driver configures</div><div class='del'>-  SB DMA of MAD16 so that it doesn't conflict with codec's DMA channels.</div><div class='del'>-  The side effect is that all 8 bit DMA channels (0,1,3) are populated in </div><div class='del'>-  duplex mode.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha9</div><div class='del'>-- Bug fixes (mostly in Jazz16 and ESS1688/688 supports).</div><div class='del'>-- Temporarily disabled recording with ESS1688/688 since it causes crash.</div><div class='del'>-- Changed audio buffer partitioning algorithm so that it selects</div><div class='del'>-  smaller fragment size than earlier. This improves real time capabilities</div><div class='del'>-  of the driver and makes recording to disk to work better. Unfortunately</div><div class='del'>-  this change breaks some programs which assume that fragments cannot be</div><div class='del'>-  shorter than 4096 bytes.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha8</div><div class='del'>-- Bug fixes</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha7</div><div class='del'>-- Linux kernel compatible configuration (_EXPERIMENTAL_). Enable</div><div class='del'>-  using command "cd /linux/drivers/sound;make script" and then</div><div class='del'>-  just run kernel's make config normally.</div><div class='del'>-- Minor fixes to the SB support. Hopefully the driver works with</div><div class='del'>-  all SB models now.</div><div class='del'>-- Added support for ESS ES1688 "AudioDrive" based cards.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha6</div><div class='del'>-- SB Pro and SB16 supports are no longer separately selectable options.</div><div class='del'>-  Enabling SB enables them too.</div><div class='del'>-- Changed all #ifndef EXCLUDE_xx stuff to #ifdef CONFIG_xx. Modified</div><div class='del'>-configure to handle this. </div><div class='del'>-- Removed initialization messages from the</div><div class='del'>-modularized version. They can be enabled by using init_trace=1 in</div><div class='del'>-the insmod command line (insmod sound init_trace=1).</div><div class='del'>-- More AIX stuff.</div><div class='del'>-- Added support for synchronizing dsp/audio devices with /dev/sequencer.</div><div class='del'>-- mmap() support for dsp/audio devices.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha5</div><div class='del'>-- AIX port.</div><div class='del'>-- Changed some xxx_PATCH macros in soundcard.h to work with</div><div class='del'>-  big endian machines.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha4</div><div class='del'>-- Removed the 'setfx' stuff from the version distributed with kernel</div><div class='del'>-  sources. Running 'setfx' is required again.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha3</div><div class='del'>-- Moved stuff from the 'setfx' program to the AudioTrix Pro driver.</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha2</div><div class='del'>-- Modifications to makefile and configure.c. Unnecessary sources</div><div class='del'>-  are no longer compiled. Newly created local.h is also copied to</div><div class='del'>-  /etc/soundconf. "make oldconfig" reads /etc/soundconf and produces</div><div class='del'>-  new local.h which is compatible with current version of the driver.</div><div class='del'>-- Some fixes to the SB16 support.</div><div class='del'>-- Fixed random protection fault in gus_wave.c</div><div class='del'>-</div><div class='del'>-Since 3.5-alpha1</div><div class='del'>-- Modified to work with Linux-1.3.33 and later</div><div class='del'>-- Some minor changes</div><div class='del'>-</div><div class='del'>-Since 3.0.2</div><div class='del'>-- Support for CS4232 based PnP cards (AcerMagic S23 etc).</div><div class='del'>-- Full duplex support for some CS4231, CS4232 and AD1845 based cards</div><div class='del'>-(GUS MAX, AudioTrix Pro, AcerMagic S23 and many MAD16/Mozart cards</div><div class='del'>-having a codec mentioned above).</div><div class='del'>-- Almost fully rewritten loadable modules support.</div><div class='del'>-- Fixed some bugs.</div><div class='del'>-- Huge amount of testing (more testing is still required).</div><div class='del'>-- mmap() support (works with some cards). Requires much more testing.</div><div class='del'>-- Sample/patch/program loading for TB Maui/Tropez. No initialization</div><div class='del'>-since TB doesn't allow me to release that code.</div><div class='del'>-- Using CS4231 compatible codecs as timer for /dev/music.</div><div class='del'>-</div><div class='del'>-Since 3.0.1</div><div class='del'>-- Added allocation of I/O ports, DMA channels and interrupts</div><div class='del'>-to the initialization code. This may break modules support since</div><div class='del'>-the driver may not free some resources on unload. Should be fixed soon.</div><div class='del'>-</div><div class='del'>-Since 3.0</div><div class='del'>-- Some important bug fixes. </div><div class='del'>-- select() for /dev/dsp and /dev/audio (Linux only).</div><div class='del'>-(To use select() with read, you have to call read() to start</div><div class='del'>-the recording. Calling write() kills recording immediately so</div><div class='del'>-use select() carefully when you are writing a half duplex app.</div><div class='del'>-Full duplex mode is not implemented yet.) Select works also with</div><div class='del'>-/dev/sequencer and /dev/music. Maybe with /dev/midi## too.</div><div class='del'>-</div><div class='del'>-Since 3.0-beta2</div><div class='del'>-- Minor fixes.</div><div class='del'>-- Added Readme.cards</div><div class='del'>-</div><div class='del'>-Since 3.0-beta1</div><div class='del'>-- Minor fixes to the modules support.</div><div class='del'>-- Eliminated call to sb_free_irq() in ad1848.c</div><div class='del'>-- Rewritten MAD16&amp;Mozart support (not tested with MAD16 Pro).</div><div class='del'>-- Fix to DMA initialization of PSS cards.</div><div class='del'>-- Some fixes to ad1848/cs42xx mixer support (GUS MAX, MSS, etc.)</div><div class='del'>-- Fixed some bugs in the PSS driver which caused I/O errors with</div><div class='del'>-  the MSS mode (/dev/dsp).</div><div class='del'>-</div><div class='del'>-Since 3.0-950506</div><div class='del'>-- Recording with GUS MAX fixed. It works when the driver is configured</div><div class='del'>-  to use two DMA channels with GUS MAX (16 bit ones recommended).</div><div class='del'>-</div><div class='del'>-Since 3.0-94xxxx</div><div class='del'>-- Too many changes</div><div class='del'>-</div><div class='del'>-Since 3.0-940818</div><div class='del'>-- Fixes for Linux 1.1.4x.</div><div class='del'>-- Disables Disney Sound System with SG NX Pro 16 (less noise).</div><div class='del'>-</div><div class='del'>-Since 2.90-2</div><div class='del'>-- Fixes to soundcard.h</div><div class='del'>-- Non blocking mode to /dev/sequencer</div><div class='del'>-- Experimental detection code for Ensoniq Soundscape.</div><div class='del'>-</div><div class='del'>-Since 2.90</div><div class='del'>-- Minor and major bug fixes</div><div class='del'>-</div><div class='del'>-Since pre-3.0-940712</div><div class='del'>-- GUS MAX support</div><div class='del'>-- Partially working MSS/WSS support (could work with some cards).</div><div class='del'>-- Hardware u-Law and A-Law support with AD1848/CS4248 and CS4231 codecs</div><div class='del'>-  (GUS MAX, GUS16, WSS etc). Hardware ADPCM is possible with GUS16 and</div><div class='del'>-  GUS MAX, but it doesn't work yet.</div><div class='del'>-Since pre-3.0-940426</div><div class='del'>-- AD1848/CS4248/CS4231 codec support (MSS, GUS MAX, Aztec, Orchid etc).</div><div class='del'>-This codec chip is used in various sound cards. This version is developed</div><div class='del'>-for the 16 bit daughtercard of GUS. It should work with other cards also</div><div class='del'>-if the following requirements are met:</div><div class='del'>-	- The I/O, IRQ and DMA settings are jumper selectable or</div><div class='del'>-	the card is initialized by booting DOS before booting Linux (etc.).</div><div class='del'>-	- You add the IO, IRQ and DMA settings manually to the local.h.</div><div class='del'>-	  (Just define GUS16_BASE, GUS16_IRQ and GUS16_DMA). Note that</div><div class='del'>-	the base address bust be the base address of the codec chip not the</div><div class='del'>-	card itself. For the GUS16 these are the same but most MSS compatible</div><div class='del'>-	cards have the codec located at card_base+4.</div><div class='del'>-- Some minor changes</div><div class='del'>-</div><div class='del'>-Since 2.5 (******* MAJOR REWRITE ***********)</div><div class='del'>-</div><div class='del'>-This version is based on v2.3. I have tried to maintain two versions</div><div class='del'>-together so that this one should have the same features than v2.5.</div><div class='del'>-Something may still be missing. If you notice such things, please let me</div><div class='del'>-know.</div><div class='del'>-</div><div class='del'>-The Readme.v30 contains more details.</div><div class='del'>-</div><div class='del'>-- /dev/midi## devices.</div><div class='del'>-- /dev/sequencer2</div><div class='del'>-</div><div class='del'>-Since 2.5-beta2</div><div class='del'>-- Some fine tuning to the GUS v3.7 mixer code.</div><div class='del'>-- Fixed speed limits for the plain SB (1.0 to 2.0).</div><div class='del'>-</div><div class='del'>-Since 2.5-beta</div><div class='del'>-- Fixed OPL-3 detection with SB. Caused problems with PAS16.</div><div class='del'>-- GUS v3.7 mixer support.</div><div class='del'>-</div><div class='del'>-Since 2.4</div><div class='del'>-- Mixer support for Sound Galaxy NX Pro (define __SGNXPRO__ on your local.h).</div><div class='del'>-- Fixed truncated sound on /dev/dsp when the device is closed.</div><div class='del'>-- Linear volume mode for GUS</div><div class='del'>-- Pitch bends larger than +/- 2 octaves.</div><div class='del'>-- MIDI recording for SB and SB Pro. (Untested).</div><div class='del'>-- Some other fixes.</div><div class='del'>-- SB16 MIDI and DSP drivers only initialized if SB16 actually installed.</div><div class='del'>-- Implemented better detection for OPL-3. This should be useful if you</div><div class='del'>-  have an old SB Pro (the non-OPL-3 one) or a SB 2.0 clone which has a OPL-3.</div><div class='del'>-- SVR4.2 support by Ian Hartas. Initial ALPHA TEST version (untested).</div><div class='del'>-</div><div class='del'>-Since 2.3b</div><div class='del'>-- Fixed bug which made it impossible to make long recordings to disk.</div><div class='del'>-  Recording was not restarted after a buffer overflow situation.</div><div class='del'>-- Limited mixer support for GUS.</div><div class='del'>-- Numerous improvements to the GUS driver by Andrew Robinson. Including</div><div class='del'>-  some click removal etc.</div><div class='del'>-</div><div class='del'>-Since 2.3</div><div class='del'>-- Fixed some minor bugs in the SB16 driver.</div><div class='del'>-</div><div class='del'>-Since 2.2b</div><div class='del'>-- Full SB16 DSP support. 8/16 bit, mono/stereo</div><div class='del'>-- The SCO and FreeBSD versions should be in sync now. There are some</div><div class='del'>-  problems with SB16 and GUS in the FreeBSD versions.</div><div class='del'>-  The DMA buffer allocation of the SCO version has been polished but</div><div class='del'>-  there could still be some problems. At least it hogs memory.</div><div class='del'>-  The DMA channel</div><div class='del'>-  configuration method used in the SCO/System is a hack.</div><div class='del'>-- Support for the MPU emulation of the SB16.</div><div class='del'>-- Some big arrays are now allocated boot time. This makes the BSS segment</div><div class='del'>-  smaller which makes it possible to use the full driver with</div><div class='del'>-  NetBSD. These arrays are not allocated if no suitable sound card is available.</div><div class='del'>-- Fixed a bug in the compute_and_set_volume in gus_wave.c</div><div class='del'>-- Fixed the too fast mono playback problem of SB Pro and PAS16.</div><div class='del'>-</div><div class='del'>-Since 2.2</div><div class='del'>-- Stereo recording for SB Pro. Somehow it was missing and nobody</div><div class='del'>-  had noticed it earlier.</div><div class='del'>-- Minor polishing.</div><div class='del'>-- Interpreting of boot time arguments (sound=) for Linux.</div><div class='del'>-- Breakup of sb_dsp.c. Parts of the code has been moved to</div><div class='del'>-  sb_mixer.c and sb_midi.c</div><div class='del'>-</div><div class='del'>-Since 2.1</div><div class='del'>-- Preliminary support for SB16. </div><div class='del'>-  - The SB16 mixer is supported in its native mode.</div><div class='del'>-  - Digitized voice capability up to 44.1 kHz/8 bit/mono</div><div class='del'>-    (16 bit and stereo support coming in the next release).</div><div class='del'>-- Fixed some bugs in the digitized voice driver for PAS16.</div><div class='del'>-- Proper initialization of the SB emulation of latest PAS16 models.</div><div class='del'>-</div><div class='del'>-- Significantly improved /dev/dsp and /dev/audio support.</div><div class='del'>-  - Now supports half duplex mode. It's now possible to record and</div><div class='del'>-    playback without closing and reopening the device.</div><div class='del'>-  - It's possible to use smaller buffers than earlier. There is a new</div><div class='del'>-    ioctl(fd, SNDCTL_DSP_SUBDIVIDE, &amp;n) where n should be 1, 2 or 4.</div><div class='del'>-    This call instructs the driver to use smaller buffers. The default</div><div class='del'>-    buffer size (0.5 to 1.0 seconds) is divided by n. Should be called</div><div class='del'>-    immediately after opening the device.</div><div class='del'>-</div><div class='del'>-Since 2.0</div><div class='del'>-Just cosmetic changes. </div><div class='head'>diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig<br/>deleted file mode 100644<br/>index 76c090218073..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,547 +0,0 @@</div><div class='del'>-# 18 Apr 1998, Michael Elizabeth Chastain, &lt;mailto:mec@shout.net&gt;</div><div class='del'>-# More hacking for modularisation.</div><div class='del'>-#</div><div class='del'>-# Prompt user for primary drivers.</div><div class='del'>-</div><div class='del'>-config SOUND_BCM_CS4297A</div><div class='del'>-	tristate "Crystal Sound CS4297a (for Swarm)"</div><div class='del'>-	depends on SIBYTE_SWARM</div><div class='del'>-	help</div><div class='del'>-	  The BCM91250A has a Crystal CS4297a on synchronous serial</div><div class='del'>-	  port B (in addition to the DB-9 serial port).  Say Y or M</div><div class='del'>-	  here to enable the sound chip instead of the UART.  Also</div><div class='del'>-	  note that CONFIG_KGDB should not be enabled at the same</div><div class='del'>-	  time, since it also attempts to use this UART port.</div><div class='del'>-</div><div class='del'>-config SOUND_VWSND</div><div class='del'>-	tristate "SGI Visual Workstation Sound"</div><div class='del'>-	depends on X86_VISWS</div><div class='del'>-	help</div><div class='del'>-	  Say Y or M if you have an SGI Visual Workstation and you want to be</div><div class='del'>-	  able to use its on-board audio.  Read</div><div class='del'>-	  &lt;file:Documentation/sound/oss/vwsnd&gt; for more info on this driver's</div><div class='del'>-	  capabilities.</div><div class='del'>-</div><div class='del'>-config SOUND_AU1550_AC97</div><div class='del'>-	tristate "Au1550/Au1200 AC97 Sound"</div><div class='del'>-	depends on SOC_AU1550 || SOC_AU1200</div><div class='del'>-</div><div class='del'>-config SOUND_MSNDCLAS</div><div class='del'>-	tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"</div><div class='del'>-	depends on (m || !STANDALONE) &amp;&amp; ISA</div><div class='del'>-	help</div><div class='del'>-	  Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or</div><div class='del'>-	  Monterey (not for the Pinnacle or Fiji).</div><div class='del'>-</div><div class='del'>-	  See &lt;file:Documentation/sound/oss/MultiSound&gt; for important information</div><div class='del'>-	  about this driver.  Note that it has been discontinued, but the</div><div class='del'>-	  Voyetra Turtle Beach knowledge base entry for it is still available</div><div class='del'>-	  at &lt;http://www.turtlebeach.com/site/kb_ftp/790.asp&gt;.</div><div class='del'>-</div><div class='del'>-comment "Compiled-in MSND Classic support requires firmware during compilation."</div><div class='del'>-	depends on SOUND_PRIME &amp;&amp; SOUND_MSNDCLAS=y</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_HAVE_BOOT</div><div class='del'>-	bool</div><div class='del'>-	depends on SOUND_MSNDCLAS=y &amp;&amp; !STANDALONE</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_INIT_FILE</div><div class='del'>-	string "Full pathname of MSNDINIT.BIN firmware file"</div><div class='del'>-	depends on SOUND_MSNDCLAS</div><div class='del'>-	default "/etc/sound/msndinit.bin"</div><div class='del'>-	help</div><div class='del'>-	  The MultiSound cards have two firmware files which are required for</div><div class='del'>-	  operation, and are not currently included. These files can be</div><div class='del'>-	  obtained from Turtle Beach. See</div><div class='del'>-	  &lt;file:Documentation/sound/oss/MultiSound&gt; for information on how to</div><div class='del'>-	  obtain this.</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_PERM_FILE</div><div class='del'>-	string "Full pathname of MSNDPERM.BIN firmware file"</div><div class='del'>-	depends on SOUND_MSNDCLAS</div><div class='del'>-	default "/etc/sound/msndperm.bin"</div><div class='del'>-	help</div><div class='del'>-	  The MultiSound cards have two firmware files which are required for</div><div class='del'>-	  operation, and are not currently included. These files can be</div><div class='del'>-	  obtained from Turtle Beach. See</div><div class='del'>-	  &lt;file:Documentation/sound/oss/MultiSound&gt; for information on how to</div><div class='del'>-	  obtain this.</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_IRQ</div><div class='del'>-	int "MSND Classic IRQ 5, 7, 9, 10, 11, 12"</div><div class='del'>-	depends on SOUND_MSNDCLAS=y</div><div class='del'>-	default "5"</div><div class='del'>-	help</div><div class='del'>-	  Interrupt Request line for the MultiSound Classic and related cards.</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_MEM</div><div class='del'>-	hex "MSND Classic memory B0000, C8000, D0000, D8000, E0000, E8000"</div><div class='del'>-	depends on SOUND_MSNDCLAS=y</div><div class='del'>-	default "D0000"</div><div class='del'>-	help</div><div class='del'>-	  Memory-mapped I/O base address for the MultiSound Classic and</div><div class='del'>-	  related cards.</div><div class='del'>-</div><div class='del'>-config MSNDCLAS_IO</div><div class='del'>-	hex "MSND Classic I/O 210, 220, 230, 240, 250, 260, 290, 3E0"</div><div class='del'>-	depends on SOUND_MSNDCLAS=y</div><div class='del'>-	default "290"</div><div class='del'>-	help</div><div class='del'>-	  I/O port address for the MultiSound Classic and related cards.</div><div class='del'>-</div><div class='del'>-config SOUND_MSNDPIN</div><div class='del'>-	tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji"</div><div class='del'>-	depends on (m || !STANDALONE) &amp;&amp; ISA</div><div class='del'>-	help</div><div class='del'>-	  Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.</div><div class='del'>-	  See &lt;file:Documentation/sound/oss/MultiSound&gt; for important information</div><div class='del'>-	  about this driver. Note that it has been discontinued, but the</div><div class='del'>-	  Voyetra Turtle Beach knowledge base entry for it is still available</div><div class='del'>-	  at &lt;http://www.turtlebeach.com/site/kb_ftp/600.asp&gt;.</div><div class='del'>-</div><div class='del'>-comment "Compiled-in MSND Pinnacle support requires firmware during compilation."</div><div class='del'>-	depends on SOUND_PRIME &amp;&amp; SOUND_MSNDPIN=y</div><div class='del'>-</div><div class='del'>-config MSNDPIN_HAVE_BOOT</div><div class='del'>-	bool</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	default y</div><div class='del'>-</div><div class='del'>-config MSNDPIN_INIT_FILE</div><div class='del'>-	string "Full pathname of PNDSPINI.BIN firmware file"</div><div class='del'>-	depends on SOUND_MSNDPIN</div><div class='del'>-	default "/etc/sound/pndspini.bin"</div><div class='del'>-	help</div><div class='del'>-	  The MultiSound cards have two firmware files which are required</div><div class='del'>-	  for operation, and are not currently included. These files can be</div><div class='del'>-	  obtained from Turtle Beach. See</div><div class='del'>-	  &lt;file:Documentation/sound/oss/MultiSound&gt; for information on how to</div><div class='del'>-	  obtain this.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_PERM_FILE</div><div class='del'>-	string "Full pathname of PNDSPERM.BIN firmware file"</div><div class='del'>-	depends on SOUND_MSNDPIN</div><div class='del'>-	default "/etc/sound/pndsperm.bin"</div><div class='del'>-	help</div><div class='del'>-	  The MultiSound cards have two firmware files which are required for</div><div class='del'>-	  operation, and are not currently included. These files can be</div><div class='del'>-	  obtained from Turtle Beach. See</div><div class='del'>-	  &lt;file:Documentation/sound/oss/MultiSound&gt; for information on how to</div><div class='del'>-	  obtain this.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_IRQ</div><div class='del'>-	int "MSND Pinnacle IRQ 5, 7, 9, 10, 11, 12"</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	default "5"</div><div class='del'>-	help</div><div class='del'>-	  Interrupt request line for the primary synthesizer on MultiSound</div><div class='del'>-	  Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_MEM</div><div class='del'>-	hex "MSND Pinnacle memory B0000, C8000, D0000, D8000, E0000, E8000"</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	default "D0000"</div><div class='del'>-	help</div><div class='del'>-	  Memory-mapped I/O base address for the primary synthesizer on</div><div class='del'>-	  MultiSound Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_IO</div><div class='del'>-	hex "MSND Pinnacle I/O 210, 220, 230, 240, 250, 260, 290, 3E0"</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	default "290"</div><div class='del'>-	help</div><div class='del'>-	  Memory-mapped I/O base address for the primary synthesizer on</div><div class='del'>-	  MultiSound Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_DIGITAL</div><div class='del'>-	bool "MSND Pinnacle has S/PDIF I/O"</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	help</div><div class='del'>-	  If you have the S/PDIF daughter board for the Pinnacle or Fiji,</div><div class='del'>-	  answer Y here; otherwise, say N. If you have this, you will be able</div><div class='del'>-	  to play and record from the S/PDIF port (digital signal). See</div><div class='del'>-	  &lt;file:Documentation/sound/oss/MultiSound&gt; for information on how to make</div><div class='del'>-	  use of this capability.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_NONPNP</div><div class='del'>-	bool "MSND Pinnacle non-PnP Mode"</div><div class='del'>-	depends on SOUND_MSNDPIN=y</div><div class='del'>-	help</div><div class='del'>-	  The Pinnacle and Fiji card resources can be configured either with</div><div class='del'>-	  PnP, or through a configuration port. Say Y here if your card is NOT</div><div class='del'>-	  in PnP mode. For the Pinnacle, configuration in non-PnP mode allows</div><div class='del'>-	  use of the IDE and joystick peripherals on the card as well; these</div><div class='del'>-	  do not show up when the card is in PnP mode. Specifying zero for any</div><div class='del'>-	  resource of a device will disable the device. If you are running the</div><div class='del'>-	  card in PnP mode, you must say N here and use isapnptools to</div><div class='del'>-	  configure the card's resources.</div><div class='del'>-</div><div class='del'>-comment "MSND Pinnacle DSP section will be configured to above parameters."</div><div class='del'>-	depends on SOUND_MSNDPIN=y &amp;&amp; MSNDPIN_NONPNP</div><div class='del'>-</div><div class='del'>-config MSNDPIN_CFG</div><div class='del'>-	hex "MSND Pinnacle config port 250,260,270"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "250"</div><div class='del'>-	help</div><div class='del'>-	  This is the port which the Pinnacle and Fiji uses to configure the</div><div class='del'>-	  card's resources when not in PnP mode. If your card is in PnP mode,</div><div class='del'>-	  then be sure to say N to the previous option, "MSND Pinnacle Non-PnP</div><div class='del'>-	  Mode".</div><div class='del'>-</div><div class='del'>-comment "Pinnacle-specific Device Configuration (0 disables)"</div><div class='del'>-	depends on SOUND_MSNDPIN=y &amp;&amp; MSNDPIN_NONPNP</div><div class='del'>-</div><div class='del'>-config MSNDPIN_MPU_IO</div><div class='del'>-	hex "MSND Pinnacle MPU I/O (e.g. 330)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  Memory-mapped I/O base address for the Kurzweil daughterboard</div><div class='del'>-	  synthesizer on MultiSound Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_MPU_IRQ</div><div class='del'>-	int "MSND Pinnacle MPU IRQ (e.g. 9)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  Interrupt request number for the Kurzweil daughterboard</div><div class='del'>-	  synthesizer on MultiSound Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_IDE_IO0</div><div class='del'>-	hex "MSND Pinnacle IDE I/O 0 (e.g. 170)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  CD-ROM drive 0 memory-mapped I/O base address for the MultiSound</div><div class='del'>-	  Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_IDE_IO1</div><div class='del'>-	hex "MSND Pinnacle IDE I/O 1 (e.g. 376)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  CD-ROM drive 1 memory-mapped I/O base address for the MultiSound</div><div class='del'>-	  Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_IDE_IRQ</div><div class='del'>-	int "MSND Pinnacle IDE IRQ (e.g. 15)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  Interrupt request number for the IDE CD-ROM interface on the</div><div class='del'>-	  MultiSound Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSNDPIN_JOYSTICK_IO</div><div class='del'>-	hex "MSND Pinnacle joystick I/O (e.g. 200)"</div><div class='del'>-	depends on MSNDPIN_NONPNP</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  Memory-mapped I/O base address for the joystick port on MultiSound</div><div class='del'>-	  Pinnacle and Fiji sound cards.</div><div class='del'>-</div><div class='del'>-config MSND_FIFOSIZE</div><div class='del'>-	int "MSND buffer size (kB)"</div><div class='del'>-	depends on SOUND_MSNDPIN=y || SOUND_MSNDCLAS=y</div><div class='del'>-	default "128"</div><div class='del'>-	help</div><div class='del'>-	  Configures the size of each audio buffer, in kilobytes, for</div><div class='del'>-	  recording and playing in the MultiSound drivers (both the Classic</div><div class='del'>-	  and Pinnacle). Larger values reduce the chance of data overruns at</div><div class='del'>-	  the expense of overall latency. If unsure, use the default.</div><div class='del'>-</div><div class='del'>-menuconfig SOUND_OSS</div><div class='del'>-	tristate "OSS sound modules"</div><div class='del'>-	depends on ISA_DMA_API &amp;&amp; VIRT_TO_BUS</div><div class='del'>-	help</div><div class='del'>-	  OSS is the Open Sound System suite of sound card drivers.  They make</div><div class='del'>-	  sound programming easier since they provide a common API.  Say Y or</div><div class='del'>-	  M here (the module will be called sound) if you haven't found a</div><div class='del'>-	  driver for your sound card above, then pick your driver from the</div><div class='del'>-	  list below.</div><div class='del'>-</div><div class='del'>-if SOUND_OSS</div><div class='del'>-</div><div class='del'>-config SOUND_TRACEINIT</div><div class='del'>-	bool "Verbose initialisation"</div><div class='del'>-	help</div><div class='del'>-	  Verbose soundcard initialization -- affects the format of autoprobe</div><div class='del'>-	  and initialization messages at boot time.</div><div class='del'>-</div><div class='del'>-config SOUND_DMAP</div><div class='del'>-	bool "Persistent DMA buffers"</div><div class='del'>-	---help---</div><div class='del'>-	  Linux can often have problems allocating DMA buffers for ISA sound</div><div class='del'>-	  cards on machines with more than 16MB of RAM. This is because ISA</div><div class='del'>-	  DMA buffers must exist below the 16MB boundary and it is quite</div><div class='del'>-	  possible that a large enough free block in this region cannot be</div><div class='del'>-	  found after the machine has been running for a while. If you say Y</div><div class='del'>-	  here the DMA buffers (64Kb) will be allocated at boot time and kept</div><div class='del'>-	  until the shutdown. This option is only useful if you said Y to</div><div class='del'>-	  "OSS sound modules", above. If you said M to "OSS sound modules"</div><div class='del'>-	  then you can get the persistent DMA buffer functionality by passing</div><div class='del'>-	  the command-line argument "dmabuf=1" to the sound module.</div><div class='del'>-</div><div class='del'>-	  Say Y unless you have 16MB or more RAM or a PCI sound card.</div><div class='del'>-</div><div class='del'>-config SOUND_VMIDI</div><div class='del'>-	tristate "Loopback MIDI device support"</div><div class='del'>-	help</div><div class='del'>-	  Support for MIDI loopback on port 1 or 2.</div><div class='del'>-</div><div class='del'>-config SOUND_TRIX</div><div class='del'>-	tristate "MediaTrix AudioTrix Pro support"</div><div class='del'>-	help</div><div class='del'>-	  Answer Y if you have the AudioTriX Pro sound card manufactured</div><div class='del'>-	  by MediaTrix.</div><div class='del'>-</div><div class='del'>-config TRIX_HAVE_BOOT</div><div class='del'>-	bool "Have TRXPRO.HEX firmware file"</div><div class='del'>-	depends on SOUND_TRIX=y &amp;&amp; !STANDALONE</div><div class='del'>-	help</div><div class='del'>-	  The MediaTrix AudioTrix Pro has an on-board microcontroller which</div><div class='del'>-	  needs to be initialized by downloading the code from the file</div><div class='del'>-	  TRXPRO.HEX in the DOS driver directory. If you don't have the</div><div class='del'>-	  TRXPRO.HEX file handy you may skip this step. However, the SB and</div><div class='del'>-	  MPU-401 modes of AudioTrix Pro will not work without this file!</div><div class='del'>-</div><div class='del'>-config TRIX_BOOT_FILE</div><div class='del'>-	string "Full pathname of TRXPRO.HEX firmware file"</div><div class='del'>-	depends on TRIX_HAVE_BOOT</div><div class='del'>-	default "/etc/sound/trxpro.hex"</div><div class='del'>-	help</div><div class='del'>-	  Enter the full pathname of your TRXPRO.HEX file, starting from /.</div><div class='del'>-</div><div class='del'>-config SOUND_MSS</div><div class='del'>-	tristate "Microsoft Sound System support"</div><div class='del'>-	---help---</div><div class='del'>-	  Again think carefully before answering Y to this question.  It's</div><div class='del'>-	  safe to answer Y if you have the original Windows Sound System card</div><div class='del'>-	  made by Microsoft or Aztech SG 16 Pro (or NX16 Pro).  Also you may</div><div class='del'>-	  say Y in case your card is NOT among these:</div><div class='del'>-</div><div class='del'>-	  ATI Stereo F/X, AdLib, Audio Excell DSP16, Cardinal DSP16,</div><div class='del'>-	  Ensoniq SoundScape (and compatibles made by Reveal and Spea),</div><div class='del'>-	  Gravis Ultrasound, Gravis Ultrasound ACE, Gravis Ultrasound Max,</div><div class='del'>-	  Gravis Ultrasound with 16 bit option, Logitech Sound Man 16,</div><div class='del'>-	  Logitech SoundMan Games, Logitech SoundMan Wave, MAD16 Pro (OPTi</div><div class='del'>-	  82C929), Media Vision Jazz16, MediaTriX AudioTriX Pro, Microsoft</div><div class='del'>-	  Windows Sound System (MSS/WSS), Mozart (OAK OTI-601), Orchid</div><div class='del'>-	  SW32, Personal Sound System (PSS), Pro Audio Spectrum 16, Pro</div><div class='del'>-	  Audio Studio 16, Pro Sonic 16, Roland MPU-401 MIDI interface,</div><div class='del'>-	  Sound Blaster 1.0, Sound Blaster 16, Sound Blaster 16ASP, Sound</div><div class='del'>-	  Blaster 2.0, Sound Blaster AWE32, Sound Blaster Pro, TI TM4000M</div><div class='del'>-	  notebook, ThunderBoard, Turtle Beach Tropez, Yamaha FM</div><div class='del'>-	  synthesizers (OPL2, OPL3 and OPL4), 6850 UART MIDI Interface.</div><div class='del'>-</div><div class='del'>-	  For cards having native support in VoxWare, consult the card</div><div class='del'>-	  specific instructions in &lt;file:Documentation/sound/oss/README.OSS&gt;.</div><div class='del'>-	  Some drivers have their own MSS support and saying Y to this option</div><div class='del'>-	  will cause a conflict.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "ad1848=&lt;io&gt;,&lt;irq&gt;,&lt;dma&gt;,&lt;dma2&gt;[,&lt;type&gt;]" to the kernel command</div><div class='del'>-	  line.</div><div class='del'>-</div><div class='del'>-config SOUND_MPU401</div><div class='del'>-	tristate "MPU-401 support (NOT for SB16)"</div><div class='del'>-	---help---</div><div class='del'>-	  Be careful with this question.  The MPU401 interface is supported by</div><div class='del'>-	  all sound cards.  However, some natively supported cards have their</div><div class='del'>-	  own driver for MPU401.  Enabling this MPU401 option with these cards</div><div class='del'>-	  will cause a conflict.  Also, enabling MPU401 on a system that</div><div class='del'>-	  doesn't really have a MPU401 could cause some trouble.  If your card</div><div class='del'>-	  was in the list of supported cards, look at the card specific</div><div class='del'>-	  instructions in the &lt;file:Documentation/sound/oss/README.OSS&gt; file.  It</div><div class='del'>-	  is safe to answer Y if you have a true MPU401 MIDI interface card.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "mpu401=&lt;io&gt;,&lt;irq&gt;" to the kernel command line.</div><div class='del'>-</div><div class='del'>-config SOUND_PAS</div><div class='del'>-	tristate "ProAudioSpectrum 16 support"</div><div class='del'>-	---help---</div><div class='del'>-	  Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio</div><div class='del'>-	  16 or Logitech SoundMan 16 sound card. Answer N if you have some</div><div class='del'>-	  other card made by Media Vision or Logitech since those are not</div><div class='del'>-	  PAS16 compatible. Please read &lt;file:Documentation/sound/oss/PAS16&gt;.</div><div class='del'>-	  It is not necessary to add Sound Blaster support separately; it</div><div class='del'>-	  is included in PAS support.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "pas2=&lt;io&gt;,&lt;irq&gt;,&lt;dma&gt;,&lt;dma2&gt;,&lt;sbio&gt;,&lt;sbirq&gt;,&lt;sbdma&gt;,&lt;sbdma2&gt;</div><div class='del'>-	  to the kernel command line.</div><div class='del'>-</div><div class='del'>-config PAS_JOYSTICK</div><div class='del'>-	bool "Enable PAS16 joystick port"</div><div class='del'>-	depends on SOUND_PAS=y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable the Pro Audio Spectrum 16's auxiliary joystick</div><div class='del'>-	  port.</div><div class='del'>-</div><div class='del'>-config SOUND_PSS</div><div class='del'>-	tristate "PSS (AD1848, ADSP-2115, ESC614) support"</div><div class='del'>-	help</div><div class='del'>-	  Answer Y or M if you have an Orchid SW32, Cardinal DSP16, Beethoven</div><div class='del'>-	  ADSP-16 or some other card based on the PSS chipset (AD1848 codec +</div><div class='del'>-	  ADSP-2115 DSP chip + Echo ESC614 ASIC CHIP). For more information on</div><div class='del'>-	  how to compile it into the kernel or as a module see the file</div><div class='del'>-	  &lt;file:Documentation/sound/oss/PSS&gt;.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "pss=&lt;io&gt;,&lt;mssio&gt;,&lt;mssirq&gt;,&lt;mssdma&gt;,&lt;mpuio&gt;,&lt;mpuirq&gt;" to the kernel</div><div class='del'>-	  command line.</div><div class='del'>-</div><div class='del'>-config PSS_MIXER</div><div class='del'>-	bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)"</div><div class='del'>-	depends on SOUND_PSS</div><div class='del'>-	help</div><div class='del'>-	  Answer Y for Beethoven ADSP-16. You may try to say Y also for other</div><div class='del'>-	  cards if they have master volume, bass, treble, and you can't</div><div class='del'>-	  control it under Linux. If you answer N for Beethoven ADSP-16, you</div><div class='del'>-	  can't control master volume, bass, treble and synth volume.</div><div class='del'>-</div><div class='del'>-	  If you said M to "PSS support" above, you may enable or disable this</div><div class='del'>-	  PSS mixer with the module parameter pss_mixer. For more information</div><div class='del'>-	  see the file &lt;file:Documentation/sound/oss/PSS&gt;.</div><div class='del'>-</div><div class='del'>-config PSS_HAVE_BOOT</div><div class='del'>-	bool "Have DSPxxx.LD firmware file"</div><div class='del'>-	depends on SOUND_PSS &amp;&amp; !STANDALONE</div><div class='del'>-	help</div><div class='del'>-	  If you have the DSPxxx.LD file or SYNTH.LD file for you card, say Y</div><div class='del'>-	  to include this file. Without this file the synth device (OPL) may</div><div class='del'>-	  not work.</div><div class='del'>-</div><div class='del'>-config PSS_BOOT_FILE</div><div class='del'>-	string "Full pathname of DSPxxx.LD firmware file"</div><div class='del'>-	depends on PSS_HAVE_BOOT</div><div class='del'>-	default "/etc/sound/dsp001.ld"</div><div class='del'>-	help</div><div class='del'>-	  Enter the full pathname of your DSPxxx.LD file or SYNTH.LD file,</div><div class='del'>-	  starting from /.</div><div class='del'>-</div><div class='del'>-config SOUND_SB</div><div class='del'>-	tristate "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support"</div><div class='del'>-	---help---</div><div class='del'>-	  Answer Y if you have an original Sound Blaster card made by Creative</div><div class='del'>-	  Labs or a 100% hardware compatible clone (like the Thunderboard or</div><div class='del'>-	  SM Games). For an unknown card you may answer Y if the card claims</div><div class='del'>-	  to be Sound Blaster-compatible.</div><div class='del'>-</div><div class='del'>-	  Please read the file &lt;file:Documentation/sound/oss/Soundblaster&gt;.</div><div class='del'>-</div><div class='del'>-	  You should also say Y here for cards based on the Avance Logic</div><div class='del'>-	  ALS-007 and ALS-1X0 chips (read &lt;file:Documentation/sound/oss/ALS&gt;) and</div><div class='del'>-	  for cards based on ESS chips (read</div><div class='del'>-	  &lt;file:Documentation/sound/oss/ESS1868&gt; and</div><div class='del'>-	  &lt;file:Documentation/sound/oss/ESS&gt;). If you have an SB AWE 32 or SB AWE</div><div class='del'>-	  64, say Y here and also to "AWE32 synth" below and read</div><div class='del'>-	  &lt;file:Documentation/sound/oss/INSTALL.awe&gt;. If you have an IBM Mwave</div><div class='del'>-	  card, say Y here and read &lt;file:Documentation/sound/oss/mwave&gt;.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel and don't want to use</div><div class='del'>-	  isapnp, you have to add "sb=&lt;io&gt;,&lt;irq&gt;,&lt;dma&gt;,&lt;dma2&gt;" to the kernel</div><div class='del'>-	  command line.</div><div class='del'>-</div><div class='del'>-	  You can say M here to compile this driver as a module; the module is</div><div class='del'>-	  called sb.</div><div class='del'>-</div><div class='del'>-config SOUND_YM3812</div><div class='del'>-	tristate "Yamaha FM synthesizer (YM3812/OPL-3) support"</div><div class='del'>-	---help---</div><div class='del'>-	  Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).</div><div class='del'>-	  Answering Y is usually a safe and recommended choice, however some</div><div class='del'>-	  cards may have software (TSR) FM emulation. Enabling FM support with</div><div class='del'>-	  these cards may cause trouble (I don't currently know of any such</div><div class='del'>-	  cards, however). Please read the file</div><div class='del'>-	  &lt;file:Documentation/sound/oss/OPL3&gt; if your card has an OPL3 chip.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "opl3=&lt;io&gt;" to the kernel command line.</div><div class='del'>-</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-config SOUND_UART6850</div><div class='del'>-	tristate "6850 UART support"</div><div class='del'>-	help</div><div class='del'>-	  This option enables support for MIDI interfaces based on the 6850</div><div class='del'>-	  UART chip. This interface is rarely found on sound cards. It's safe</div><div class='del'>-	  to answer N to this question.</div><div class='del'>-</div><div class='del'>-	  If you compile the driver into the kernel, you have to add</div><div class='del'>-	  "uart6850=&lt;io&gt;,&lt;irq&gt;" to the kernel command line.</div><div class='del'>-</div><div class='del'>-config SOUND_AEDSP16</div><div class='del'>-	tristate "Gallant Audio Cards (SC-6000 and SC-6600 based)"</div><div class='del'>-	---help---</div><div class='del'>-	  Answer Y if you have a Gallant's Audio Excel DSP 16 card. This</div><div class='del'>-	  driver supports Audio Excel DSP 16 but not the III nor PnP versions</div><div class='del'>-	  of this card.</div><div class='del'>-</div><div class='del'>-	  The Gallant's Audio Excel DSP 16 card can emulate either an SBPro or</div><div class='del'>-	  a Microsoft Sound System card, so you should have said Y to either</div><div class='del'>-	  "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support"</div><div class='del'>-	  or "Microsoft Sound System support", above, and you need to answer</div><div class='del'>-	  the "MSS emulation" and "SBPro emulation" questions below</div><div class='del'>-	  accordingly. You should say Y to one and only one of these two</div><div class='del'>-	  questions.</div><div class='del'>-</div><div class='del'>-	  Read the &lt;file:Documentation/sound/oss/README.OSS&gt; file and the head of</div><div class='del'>-	  &lt;file:sound/oss/aedsp16.c&gt; as well as</div><div class='del'>-	  &lt;file:Documentation/sound/oss/AudioExcelDSP16&gt; to get more information</div><div class='del'>-	  about this driver and its configuration.</div><div class='del'>-</div><div class='del'>-config SC6600</div><div class='del'>-	bool "SC-6600 based audio cards (new Audio Excel DSP 16)"</div><div class='del'>-	depends on SOUND_AEDSP16</div><div class='del'>-	help</div><div class='del'>-	  The SC6600 is the new version of DSP mounted on the Audio Excel DSP</div><div class='del'>-	  16 cards. Find in the manual the FCC ID of your audio card and</div><div class='del'>-	  answer Y if you have an SC6600 DSP.</div><div class='del'>-</div><div class='del'>-config SC6600_JOY</div><div class='del'>-	bool "Activate SC-6600 Joystick Interface"</div><div class='del'>-	depends on SC6600</div><div class='del'>-	help</div><div class='del'>-	  Say Y here in order to use the joystick interface of the Audio Excel</div><div class='del'>-	  DSP 16 card.</div><div class='del'>-</div><div class='del'>-config SC6600_CDROM</div><div class='del'>-	int "SC-6600 CDROM Interface (4=None, 3=IDE, 1=Panasonic, 0=?Sony?)"</div><div class='del'>-	depends on SC6600</div><div class='del'>-	default "4"</div><div class='del'>-	help</div><div class='del'>-	  This is used to activate the CD-ROM interface of the Audio Excel</div><div class='del'>-	  DSP 16 card. Enter: 0 for Sony, 1 for Panasonic, 2 for IDE, 4 for no</div><div class='del'>-	  CD-ROM present.</div><div class='del'>-</div><div class='del'>-config SC6600_CDROMBASE</div><div class='del'>-	hex "SC-6600 CDROM Interface I/O Address"</div><div class='del'>-	depends on SC6600</div><div class='del'>-	default "0"</div><div class='del'>-	help</div><div class='del'>-	  Base I/O port address for the CD-ROM interface of the Audio Excel</div><div class='del'>-	  DSP 16 card.</div><div class='del'>-</div><div class='del'>-config SOUND_VIDC</div><div class='del'>-	tristate "VIDC 16-bit sound"</div><div class='del'>-	depends on ARM &amp;&amp; (ARCH_ACORN || ARCH_CLPS7500)</div><div class='del'>-	help</div><div class='del'>-	  16-bit support for the VIDC onboard sound hardware found on Acorn</div><div class='del'>-	  machines.</div><div class='del'>-</div><div class='del'>-config SOUND_WAVEARTIST</div><div class='del'>-	tristate "Netwinder WaveArtist"</div><div class='del'>-	depends on ARM &amp;&amp; ARCH_NETWINDER</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include support for the Rockwell WaveArtist sound</div><div class='del'>-	  system.  This driver is mainly for the NetWinder.</div><div class='del'>-</div><div class='del'>-config SOUND_KAHLUA</div><div class='del'>-	tristate "XpressAudio Sound Blaster emulation"</div><div class='del'>-	depends on SOUND_SB</div><div class='del'>-</div><div class='del'>-endif	# SOUND_OSS</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/Makefile b/sound/oss/Makefile<br/>deleted file mode 100644<br/>index 96f14dcd0cd1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-# Makefile for the Linux sound card driver</div><div class='del'>-#</div><div class='del'>-# 18 Apr 1998, Michael Elizabeth Chastain, &lt;mailto:mec@shout.net&gt;</div><div class='del'>-# Rewritten to use lists instead of if-statements.</div><div class='del'>-</div><div class='del'>-# Each configuration option enables a list of files.</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_SOUND_OSS)		+= sound.o</div><div class='del'>-</div><div class='del'>-# Please leave it as is, cause the link order is significant !</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_SOUND_AEDSP16)	+= aedsp16.o</div><div class='del'>-obj-$(CONFIG_SOUND_PSS)		+= pss.o ad1848.o mpu401.o</div><div class='del'>-obj-$(CONFIG_SOUND_TRIX)	+= trix.o ad1848.o sb_lib.o uart401.o</div><div class='del'>-obj-$(CONFIG_SOUND_MSS)		+= ad1848.o</div><div class='del'>-obj-$(CONFIG_SOUND_PAS)		+= pas2.o sb.o sb_lib.o uart401.o</div><div class='del'>-obj-$(CONFIG_SOUND_SB)		+= sb.o sb_lib.o uart401.o</div><div class='del'>-obj-$(CONFIG_SOUND_KAHLUA)	+= kahlua.o</div><div class='del'>-obj-$(CONFIG_SOUND_MPU401)	+= mpu401.o</div><div class='del'>-obj-$(CONFIG_SOUND_UART6850)	+= uart6850.o</div><div class='del'>-obj-$(CONFIG_SOUND_YM3812)	+= opl3.o</div><div class='del'>-obj-$(CONFIG_SOUND_VMIDI)	+= v_midi.o</div><div class='del'>-obj-$(CONFIG_SOUND_VIDC)	+= vidc_mod.o</div><div class='del'>-obj-$(CONFIG_SOUND_WAVEARTIST)	+= waveartist.o</div><div class='del'>-obj-$(CONFIG_SOUND_MSNDCLAS)	+= msnd.o msnd_classic.o</div><div class='del'>-obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o</div><div class='del'>-obj-$(CONFIG_SOUND_VWSND)	+= vwsnd.o</div><div class='del'>-obj-$(CONFIG_SOUND_AU1550_AC97)	+= au1550_ac97.o ac97_codec.o</div><div class='del'>-obj-$(CONFIG_SOUND_BCM_CS4297A)	+= swarm_cs4297a.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_DMASOUND)		+= dmasound/</div><div class='del'>-</div><div class='del'>-# Declare multi-part drivers.</div><div class='del'>-</div><div class='del'>-sound-objs	:= 							\</div><div class='del'>-    dev_table.o soundcard.o 		\</div><div class='del'>-    audio.o dmabuf.o					\</div><div class='del'>-    midi_synth.o midibuf.o					\</div><div class='del'>-    sequencer.o sound_timer.o sys_timer.o</div><div class='del'>-</div><div class='del'>-pas2-objs	:= pas2_card.o pas2_midi.o pas2_mixer.o pas2_pcm.o</div><div class='del'>-sb-objs		:= sb_card.o</div><div class='del'>-sb_lib-objs	:= sb_common.o sb_audio.o sb_midi.o sb_mixer.o sb_ess.o</div><div class='del'>-vidc_mod-objs	:= vidc.o vidc_fill.o</div><div class='del'>-</div><div class='del'>-hostprogs-y	:= bin2hex hex2hex</div><div class='del'>-</div><div class='del'>-# Files generated that shall be removed upon make clean</div><div class='del'>-clean-files := msndperm.c msndinit.c pndsperm.c pndspini.c \</div><div class='del'>-               pss_boot.h trix_boot.h</div><div class='del'>-</div><div class='del'>-# Firmware files that need translation</div><div class='del'>-#</div><div class='del'>-# The translated files are protected by a file that keeps track</div><div class='del'>-# of what name was used to build them.  If the name changes, they</div><div class='del'>-# will be forced to be remade.</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-# Turtle Beach MultiSound</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_MSNDCLAS_HAVE_BOOT),y)</div><div class='del'>-    $(obj)/msnd_classic.o: $(obj)/msndperm.c $(obj)/msndinit.c</div><div class='del'>-</div><div class='del'>-    $(obj)/msndperm.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_PERM_FILE)) $(obj)/bin2hex</div><div class='del'>-	$(obj)/bin2hex msndperm &lt; $&lt; &gt; $@</div><div class='del'>-</div><div class='del'>-    $(obj)/msndinit.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_INIT_FILE)) $(obj)/bin2hex</div><div class='del'>-	$(obj)/bin2hex msndinit &lt; $&lt; &gt; $@</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_MSNDPIN_HAVE_BOOT),y)</div><div class='del'>-    $(obj)/msnd_pinnacle.o: $(obj)/pndsperm.c $(obj)/pndspini.c</div><div class='del'>-</div><div class='del'>-    $(obj)/pndsperm.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_PERM_FILE)) $(obj)/bin2hex</div><div class='del'>-	$(obj)/bin2hex pndsperm &lt; $&lt; &gt; $@</div><div class='del'>-</div><div class='del'>-    $(obj)/pndspini.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_INIT_FILE)) $(obj)/bin2hex</div><div class='del'>-	$(obj)/bin2hex pndspini &lt; $&lt; &gt; $@</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# PSS (ECHO-ADI2111)</div><div class='del'>-</div><div class='del'>-$(obj)/pss.o: $(obj)/pss_boot.h</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_PSS_HAVE_BOOT),y)</div><div class='del'>-    $(obj)/pss_boot.h: $(patsubst "%", %, $(CONFIG_PSS_BOOT_FILE)) $(obj)/bin2hex</div><div class='del'>-	$(obj)/bin2hex pss_synth &lt; $&lt; &gt; $@</div><div class='del'>-else</div><div class='del'>-    $(obj)/pss_boot.h:</div><div class='del'>-	(							\</div><div class='del'>-	    echo 'static unsigned char * pss_synth = NULL;';	\</div><div class='del'>-	    echo 'static int pss_synthLen = 0;';		\</div><div class='del'>-	) &gt; $@</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# MediaTrix AudioTrix Pro</div><div class='del'>-</div><div class='del'>-$(obj)/trix.o: $(obj)/trix_boot.h</div><div class='del'>-</div><div class='del'>-ifeq ($(CONFIG_TRIX_HAVE_BOOT),y)</div><div class='del'>-    $(obj)/trix_boot.h: $(patsubst "%", %, $(CONFIG_TRIX_BOOT_FILE)) $(obj)/hex2hex</div><div class='del'>-	$(obj)/hex2hex -i trix_boot &lt; $&lt; &gt; $@</div><div class='del'>-else</div><div class='del'>-    $(obj)/trix_boot.h:</div><div class='del'>-	(							\</div><div class='del'>-	    echo 'static unsigned char * trix_boot = NULL;';	\</div><div class='del'>-	    echo 'static int trix_boot_len = 0;';		\</div><div class='del'>-	) &gt; $@</div><div class='del'>-endif</div><div class='head'>diff --git a/sound/oss/README.FIRST b/sound/oss/README.FIRST<br/>deleted file mode 100644<br/>index 90fdcf063d2d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/README.FIRST?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/README.FIRST</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-The modular sound driver patches were funded by Red Hat Software </div><div class='del'>-(www.redhat.com). The sound driver here is thus a modified version of </div><div class='del'>-Hannu's code. Please bear that in mind when considering the appropriate</div><div class='del'>-forums for bug reporting. </div><div class='del'>-</div><div class='del'>-Alan Cox</div><div class='head'>diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c<br/>deleted file mode 100644<br/>index 854c303264dc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/ac97_codec.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ac97_codec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1203 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ac97_codec.c: Generic AC97 mixer/modem module</div><div class='del'>- *</div><div class='del'>- * Derived from ac97 mixer in maestro and trident driver.</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Silicon Integrated System Corporation</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify</div><div class='del'>- *	it under the terms of the GNU General Public License as published by</div><div class='del'>- *	the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *	(at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *	This program is distributed in the hope that it will be useful,</div><div class='del'>- *	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *	GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *	You should have received a copy of the GNU General Public License</div><div class='del'>- *	along with this program; if not, write to the Free Software</div><div class='del'>- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- **************************************************************************</div><div class='del'>- *</div><div class='del'>- * The Intel Audio Codec '97 specification is available at:</div><div class='del'>- * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf</div><div class='del'>- *</div><div class='del'>- **************************************************************************</div><div class='del'>- *</div><div class='del'>- * History</div><div class='del'>- * May 02, 2003 Liam Girdwood &lt;lrg@slimlogic.co.uk&gt;</div><div class='del'>- *	Removed non existant WM9700</div><div class='del'>- *	Added support for WM9705, WM9708, WM9709, WM9710, WM9711</div><div class='del'>- *	WM9712 and WM9717</div><div class='del'>- * Mar 28, 2002 Randolph Bentson &lt;bentson@holmsjoen.com&gt;</div><div class='del'>- *	corrections to support WM9707 in ViewPad 1000</div><div class='del'>- * v0.4 Mar 15 2000 Ollie Lho</div><div class='del'>- *	dual codecs support verified with 4 channels output</div><div class='del'>- * v0.3 Feb 22 2000 Ollie Lho</div><div class='del'>- *	bug fix for record mask setting</div><div class='del'>- * v0.2 Feb 10 2000 Ollie Lho</div><div class='del'>- *	add ac97_read_proc for /proc/driver/{vendor}/ac97</div><div class='del'>- * v0.1 Jan 14 2000 Ollie Lho &lt;ollie@sis.com.tw&gt; </div><div class='del'>- *	Isolated from trident.c to support multiple ac97 codec</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/ac97_codec.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CODEC_ID_BUFSZ 14</div><div class='del'>-</div><div class='del'>-static int ac97_read_mixer(struct ac97_codec *codec, int oss_channel);</div><div class='del'>-static void ac97_write_mixer(struct ac97_codec *codec, int oss_channel, </div><div class='del'>-			     unsigned int left, unsigned int right);</div><div class='del'>-static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, unsigned int val );</div><div class='del'>-static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask);</div><div class='del'>-static int ac97_mixer_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned long arg);</div><div class='del'>-</div><div class='del'>-static int ac97_init_mixer(struct ac97_codec *codec);</div><div class='del'>-</div><div class='del'>-static int wolfson_init03(struct ac97_codec * codec);</div><div class='del'>-static int wolfson_init04(struct ac97_codec * codec);</div><div class='del'>-static int wolfson_init05(struct ac97_codec * codec);</div><div class='del'>-static int wolfson_init11(struct ac97_codec * codec);</div><div class='del'>-static int wolfson_init13(struct ac97_codec * codec);</div><div class='del'>-static int tritech_init(struct ac97_codec * codec);</div><div class='del'>-static int tritech_maestro_init(struct ac97_codec * codec);</div><div class='del'>-static int sigmatel_9708_init(struct ac97_codec *codec);</div><div class='del'>-static int sigmatel_9721_init(struct ac97_codec *codec);</div><div class='del'>-static int sigmatel_9744_init(struct ac97_codec *codec);</div><div class='del'>-static int ad1886_init(struct ac97_codec *codec);</div><div class='del'>-static int eapd_control(struct ac97_codec *codec, int);</div><div class='del'>-static int crystal_digital_control(struct ac97_codec *codec, int slots, int rate, int mode);</div><div class='del'>-static int cmedia_init(struct ac97_codec * codec);</div><div class='del'>-static int cmedia_digital_control(struct ac97_codec *codec, int slots, int rate, int mode);</div><div class='del'>-static int generic_digital_control(struct ac97_codec *codec, int slots, int rate, int mode);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	AC97 operations.</div><div class='del'>- *</div><div class='del'>- *	If you are adding a codec then you should be able to use</div><div class='del'>- *		eapd_ops - any codec that supports EAPD amp control (most)</div><div class='del'>- *		null_ops - any ancient codec that supports nothing</div><div class='del'>- *</div><div class='del'>- *	The three functions are</div><div class='del'>- *		init - used for non AC97 standard initialisation</div><div class='del'>- *		amplifier - used to do amplifier control (1=on 0=off)</div><div class='del'>- *		digital - switch to digital modes (0 = analog)</div><div class='del'>- *</div><div class='del'>- *	Not all codecs support all features, not all drivers use all the</div><div class='del'>- *	operations yet</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static struct ac97_ops null_ops = { NULL, NULL, NULL };</div><div class='del'>-static struct ac97_ops default_ops = { NULL, eapd_control, NULL };</div><div class='del'>-static struct ac97_ops default_digital_ops = { NULL, eapd_control, generic_digital_control};</div><div class='del'>-static struct ac97_ops wolfson_ops03 = { wolfson_init03, NULL, NULL };</div><div class='del'>-static struct ac97_ops wolfson_ops04 = { wolfson_init04, NULL, NULL };</div><div class='del'>-static struct ac97_ops wolfson_ops05 = { wolfson_init05, NULL, NULL };</div><div class='del'>-static struct ac97_ops wolfson_ops11 = { wolfson_init11, NULL, NULL };</div><div class='del'>-static struct ac97_ops wolfson_ops13 = { wolfson_init13, NULL, NULL };</div><div class='del'>-static struct ac97_ops tritech_ops = { tritech_init, NULL, NULL };</div><div class='del'>-static struct ac97_ops tritech_m_ops = { tritech_maestro_init, NULL, NULL };</div><div class='del'>-static struct ac97_ops sigmatel_9708_ops = { sigmatel_9708_init, NULL, NULL };</div><div class='del'>-static struct ac97_ops sigmatel_9721_ops = { sigmatel_9721_init, NULL, NULL };</div><div class='del'>-static struct ac97_ops sigmatel_9744_ops = { sigmatel_9744_init, NULL, NULL };</div><div class='del'>-static struct ac97_ops crystal_digital_ops = { NULL, eapd_control, crystal_digital_control };</div><div class='del'>-static struct ac97_ops ad1886_ops = { ad1886_init, eapd_control, NULL };</div><div class='del'>-static struct ac97_ops cmedia_ops = { NULL, eapd_control, NULL};</div><div class='del'>-static struct ac97_ops cmedia_digital_ops = { cmedia_init, eapd_control, cmedia_digital_control};</div><div class='del'>-</div><div class='del'>-/* sorted by vendor/device id */</div><div class='del'>-static const struct {</div><div class='del'>-	u32 id;</div><div class='del'>-	char *name;</div><div class='del'>-	struct ac97_ops *ops;</div><div class='del'>-	int flags;</div><div class='del'>-} ac97_codec_ids[] = {</div><div class='del'>-	{0x41445303, "Analog Devices AD1819",	&amp;null_ops},</div><div class='del'>-	{0x41445340, "Analog Devices AD1881",	&amp;null_ops},</div><div class='del'>-	{0x41445348, "Analog Devices AD1881A",	&amp;null_ops},</div><div class='del'>-	{0x41445360, "Analog Devices AD1885",	&amp;default_ops},</div><div class='del'>-	{0x41445361, "Analog Devices AD1886",	&amp;ad1886_ops},</div><div class='del'>-	{0x41445370, "Analog Devices AD1981",	&amp;null_ops},</div><div class='del'>-	{0x41445372, "Analog Devices AD1981A",	&amp;null_ops},</div><div class='del'>-	{0x41445374, "Analog Devices AD1981B",	&amp;null_ops},</div><div class='del'>-	{0x41445460, "Analog Devices AD1885",	&amp;default_ops},</div><div class='del'>-	{0x41445461, "Analog Devices AD1886",	&amp;ad1886_ops},</div><div class='del'>-	{0x414B4D00, "Asahi Kasei AK4540",	&amp;null_ops},</div><div class='del'>-	{0x414B4D01, "Asahi Kasei AK4542",	&amp;null_ops},</div><div class='del'>-	{0x414B4D02, "Asahi Kasei AK4543",	&amp;null_ops},</div><div class='del'>-	{0x414C4326, "ALC100P",			&amp;null_ops},</div><div class='del'>-	{0x414C4710, "ALC200/200P",		&amp;null_ops},</div><div class='del'>-	{0x414C4720, "ALC650",			&amp;default_digital_ops},</div><div class='del'>-	{0x434D4941, "CMedia",			&amp;cmedia_ops,		AC97_NO_PCM_VOLUME },</div><div class='del'>-	{0x434D4942, "CMedia",			&amp;cmedia_ops,		AC97_NO_PCM_VOLUME },</div><div class='del'>-	{0x434D4961, "CMedia",			&amp;cmedia_digital_ops,	AC97_NO_PCM_VOLUME },</div><div class='del'>-	{0x43525900, "Cirrus Logic CS4297",	&amp;default_ops},</div><div class='del'>-	{0x43525903, "Cirrus Logic CS4297",	&amp;default_ops},</div><div class='del'>-	{0x43525913, "Cirrus Logic CS4297A rev A", &amp;default_ops},</div><div class='del'>-	{0x43525914, "Cirrus Logic CS4297A rev B", &amp;default_ops},</div><div class='del'>-	{0x43525923, "Cirrus Logic CS4298",	&amp;null_ops},</div><div class='del'>-	{0x4352592B, "Cirrus Logic CS4294",	&amp;null_ops},</div><div class='del'>-	{0x4352592D, "Cirrus Logic CS4294",	&amp;null_ops},</div><div class='del'>-	{0x43525931, "Cirrus Logic CS4299 rev A", &amp;crystal_digital_ops},</div><div class='del'>-	{0x43525933, "Cirrus Logic CS4299 rev C", &amp;crystal_digital_ops},</div><div class='del'>-	{0x43525934, "Cirrus Logic CS4299 rev D", &amp;crystal_digital_ops},</div><div class='del'>-	{0x43585430, "CXT48",			&amp;default_ops,		AC97_DELUDED_MODEM },</div><div class='del'>-	{0x43585442, "CXT66",			&amp;default_ops,		AC97_DELUDED_MODEM },</div><div class='del'>-	{0x44543031, "Diamond Technology DT0893", &amp;default_ops},</div><div class='del'>-	{0x45838308, "ESS Allegro ES1988",	&amp;null_ops},</div><div class='del'>-	{0x49434511, "ICE1232",			&amp;null_ops}, /* I hope --jk */</div><div class='del'>-	{0x4e534331, "National Semiconductor LM4549", &amp;null_ops},</div><div class='del'>-	{0x53494c22, "Silicon Laboratory Si3036", &amp;null_ops},</div><div class='del'>-	{0x53494c23, "Silicon Laboratory Si3038", &amp;null_ops},</div><div class='del'>-	{0x545200FF, "TriTech TR?????",		&amp;tritech_m_ops},</div><div class='del'>-	{0x54524102, "TriTech TR28022",		&amp;null_ops},</div><div class='del'>-	{0x54524103, "TriTech TR28023",		&amp;null_ops},</div><div class='del'>-	{0x54524106, "TriTech TR28026",		&amp;null_ops},</div><div class='del'>-	{0x54524108, "TriTech TR28028",		&amp;tritech_ops},</div><div class='del'>-	{0x54524123, "TriTech TR A5",		&amp;null_ops},</div><div class='del'>-	{0x574D4C03, "Wolfson WM9703/07/08/17",	&amp;wolfson_ops03},</div><div class='del'>-	{0x574D4C04, "Wolfson WM9704M/WM9704Q",	&amp;wolfson_ops04},</div><div class='del'>-	{0x574D4C05, "Wolfson WM9705/WM9710",   &amp;wolfson_ops05},</div><div class='del'>-	{0x574D4C09, "Wolfson WM9709",		&amp;null_ops},</div><div class='del'>-	{0x574D4C12, "Wolfson WM9711/9712",	&amp;wolfson_ops11},</div><div class='del'>-	{0x574D4C13, "Wolfson WM9713",	&amp;wolfson_ops13, AC97_DEFAULT_POWER_OFF},</div><div class='del'>-	{0x83847600, "SigmaTel STAC????",	&amp;null_ops},</div><div class='del'>-	{0x83847604, "SigmaTel STAC9701/3/4/5", &amp;null_ops},</div><div class='del'>-	{0x83847605, "SigmaTel STAC9704",	&amp;null_ops},</div><div class='del'>-	{0x83847608, "SigmaTel STAC9708",	&amp;sigmatel_9708_ops},</div><div class='del'>-	{0x83847609, "SigmaTel STAC9721/23",	&amp;sigmatel_9721_ops},</div><div class='del'>-	{0x83847644, "SigmaTel STAC9744/45",	&amp;sigmatel_9744_ops},</div><div class='del'>-	{0x83847652, "SigmaTel STAC9752/53",	&amp;default_ops},</div><div class='del'>-	{0x83847656, "SigmaTel STAC9756/57",	&amp;sigmatel_9744_ops},</div><div class='del'>-	{0x83847666, "SigmaTel STAC9750T",	&amp;sigmatel_9744_ops},</div><div class='del'>-	{0x83847684, "SigmaTel STAC9783/84?",	&amp;null_ops},</div><div class='del'>-	{0x57454301, "Winbond 83971D",		&amp;null_ops},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* this table has default mixer values for all OSS mixers. */</div><div class='del'>-static struct mixer_defaults {</div><div class='del'>-	int mixer;</div><div class='del'>-	unsigned int value;</div><div class='del'>-} mixer_defaults[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-	/* all values 0 -&gt; 100 in bytes */</div><div class='del'>-	{SOUND_MIXER_VOLUME,	0x4343},</div><div class='del'>-	{SOUND_MIXER_BASS,	0x4343},</div><div class='del'>-	{SOUND_MIXER_TREBLE,	0x4343},</div><div class='del'>-	{SOUND_MIXER_PCM,	0x4343},</div><div class='del'>-	{SOUND_MIXER_SPEAKER,	0x4343},</div><div class='del'>-	{SOUND_MIXER_LINE,	0x4343},</div><div class='del'>-	{SOUND_MIXER_MIC,	0x0000},</div><div class='del'>-	{SOUND_MIXER_CD,	0x4343},</div><div class='del'>-	{SOUND_MIXER_ALTPCM,	0x4343},</div><div class='del'>-	{SOUND_MIXER_IGAIN,	0x4343},</div><div class='del'>-	{SOUND_MIXER_LINE1,	0x4343},</div><div class='del'>-	{SOUND_MIXER_PHONEIN,	0x4343},</div><div class='del'>-	{SOUND_MIXER_PHONEOUT,	0x4343},</div><div class='del'>-	{SOUND_MIXER_VIDEO,	0x4343},</div><div class='del'>-	{-1,0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* table to scale scale from OSS mixer value to AC97 mixer register value */	</div><div class='del'>-static struct ac97_mixer_hw {</div><div class='del'>-	unsigned char offset;</div><div class='del'>-	int scale;</div><div class='del'>-} ac97_hw[SOUND_MIXER_NRDEVICES]= {</div><div class='del'>-	[SOUND_MIXER_VOLUME]	=	{AC97_MASTER_VOL_STEREO,64},</div><div class='del'>-	[SOUND_MIXER_BASS]	=	{AC97_MASTER_TONE,	16},</div><div class='del'>-	[SOUND_MIXER_TREBLE]	=	{AC97_MASTER_TONE,	16},</div><div class='del'>-	[SOUND_MIXER_PCM]	=	{AC97_PCMOUT_VOL,	32},</div><div class='del'>-	[SOUND_MIXER_SPEAKER]	=	{AC97_PCBEEP_VOL,	16},</div><div class='del'>-	[SOUND_MIXER_LINE]	=	{AC97_LINEIN_VOL,	32},</div><div class='del'>-	[SOUND_MIXER_MIC]	=	{AC97_MIC_VOL,		32},</div><div class='del'>-	[SOUND_MIXER_CD]	=	{AC97_CD_VOL,		32},</div><div class='del'>-	[SOUND_MIXER_ALTPCM]	=	{AC97_HEADPHONE_VOL,	64},</div><div class='del'>-	[SOUND_MIXER_IGAIN]	=	{AC97_RECORD_GAIN,	16},</div><div class='del'>-	[SOUND_MIXER_LINE1]	=	{AC97_AUX_VOL,		32},</div><div class='del'>-	[SOUND_MIXER_PHONEIN]	= 	{AC97_PHONE_VOL,	32},</div><div class='del'>-	[SOUND_MIXER_PHONEOUT]	= 	{AC97_MASTER_VOL_MONO,	64},</div><div class='del'>-	[SOUND_MIXER_VIDEO]	=	{AC97_VIDEO_VOL,	32},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* the following tables allow us to go from OSS &lt;-&gt; ac97 quickly. */</div><div class='del'>-enum ac97_recsettings {</div><div class='del'>-	AC97_REC_MIC=0,</div><div class='del'>-	AC97_REC_CD,</div><div class='del'>-	AC97_REC_VIDEO,</div><div class='del'>-	AC97_REC_AUX,</div><div class='del'>-	AC97_REC_LINE,</div><div class='del'>-	AC97_REC_STEREO, /* combination of all enabled outputs..  */</div><div class='del'>-	AC97_REC_MONO,	      /*.. or the mono equivalent */</div><div class='del'>-	AC97_REC_PHONE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const unsigned int ac97_rm2oss[] = {</div><div class='del'>-	[AC97_REC_MIC] 	 = SOUND_MIXER_MIC,</div><div class='del'>-	[AC97_REC_CD] 	 = SOUND_MIXER_CD,</div><div class='del'>-	[AC97_REC_VIDEO] = SOUND_MIXER_VIDEO,</div><div class='del'>-	[AC97_REC_AUX] 	 = SOUND_MIXER_LINE1,</div><div class='del'>-	[AC97_REC_LINE]  = SOUND_MIXER_LINE,</div><div class='del'>-	[AC97_REC_STEREO]= SOUND_MIXER_IGAIN,</div><div class='del'>-	[AC97_REC_PHONE] = SOUND_MIXER_PHONEIN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* indexed by bit position */</div><div class='del'>-static const unsigned int ac97_oss_rm[] = {</div><div class='del'>-	[SOUND_MIXER_MIC] 	= AC97_REC_MIC,</div><div class='del'>-	[SOUND_MIXER_CD] 	= AC97_REC_CD,</div><div class='del'>-	[SOUND_MIXER_VIDEO] 	= AC97_REC_VIDEO,</div><div class='del'>-	[SOUND_MIXER_LINE1] 	= AC97_REC_AUX,</div><div class='del'>-	[SOUND_MIXER_LINE] 	= AC97_REC_LINE,</div><div class='del'>-	[SOUND_MIXER_IGAIN]	= AC97_REC_STEREO,</div><div class='del'>-	[SOUND_MIXER_PHONEIN] 	= AC97_REC_PHONE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(codecs);</div><div class='del'>-static LIST_HEAD(codec_drivers);</div><div class='del'>-static DEFINE_MUTEX(codec_mutex);</div><div class='del'>-</div><div class='del'>-/* reads the given OSS mixer from the ac97 the caller must have insured that the ac97 knows</div><div class='del'>-   about that given mixer, and should be holding a spinlock for the card */</div><div class='del'>-static int ac97_read_mixer(struct ac97_codec *codec, int oss_channel) </div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	int scale;</div><div class='del'>-	struct ac97_mixer_hw *mh = &amp;ac97_hw[oss_channel];</div><div class='del'>-</div><div class='del'>-	val = codec-&gt;codec_read(codec , mh-&gt;offset);</div><div class='del'>-</div><div class='del'>-	if (val &amp; AC97_MUTE) {</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else if (AC97_STEREO_MASK &amp; (1 &lt;&lt; oss_channel)) {</div><div class='del'>-		/* nice stereo mixers .. */</div><div class='del'>-		int left,right;</div><div class='del'>-</div><div class='del'>-		left = (val &gt;&gt; 8)  &amp; 0x7f;</div><div class='del'>-		right = val  &amp; 0x7f;</div><div class='del'>-</div><div class='del'>-		if (oss_channel == SOUND_MIXER_IGAIN) {</div><div class='del'>-			right = (right * 100) / mh-&gt;scale;</div><div class='del'>-			left = (left * 100) / mh-&gt;scale;</div><div class='del'>-		} else {</div><div class='del'>-			/* these may have 5 or 6 bit resolution */</div><div class='del'>-			if(oss_channel == SOUND_MIXER_VOLUME || oss_channel == SOUND_MIXER_ALTPCM)</div><div class='del'>-				scale = (1 &lt;&lt; codec-&gt;bit_resolution);</div><div class='del'>-			else</div><div class='del'>-				scale = mh-&gt;scale;</div><div class='del'>-</div><div class='del'>-			right = 100 - ((right * 100) / scale);</div><div class='del'>-			left = 100 - ((left * 100) / scale);</div><div class='del'>-		}</div><div class='del'>-		ret = left | (right &lt;&lt; 8);</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_SPEAKER) {</div><div class='del'>-		ret = 100 - ((((val &amp; 0x1e)&gt;&gt;1) * 100) / mh-&gt;scale);</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_PHONEIN) {</div><div class='del'>-		ret = 100 - (((val &amp; 0x1f) * 100) / mh-&gt;scale);</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_PHONEOUT) {</div><div class='del'>-		scale = (1 &lt;&lt; codec-&gt;bit_resolution);</div><div class='del'>-		ret = 100 - (((val &amp; 0x1f) * 100) / scale);</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_MIC) {</div><div class='del'>-		ret = 100 - (((val &amp; 0x1f) * 100) / mh-&gt;scale);</div><div class='del'>-		/*  the low bit is optional in the tone sliders and masking</div><div class='del'>-		    it lets us avoid the 0xf 'bypass'.. */</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_BASS) {</div><div class='del'>-		ret = 100 - ((((val &gt;&gt; 8) &amp; 0xe) * 100) / mh-&gt;scale);</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_TREBLE) {</div><div class='del'>-		ret = 100 - (((val &amp; 0xe) * 100) / mh-&gt;scale);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("ac97_codec: read OSS mixer %2d (%s ac97 register 0x%02x), "</div><div class='del'>-	       "0x%04x -&gt; 0x%04x\n",</div><div class='del'>-	       oss_channel, codec-&gt;id ? "Secondary" : "Primary",</div><div class='del'>-	       mh-&gt;offset, val, ret);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write the OSS encoded volume to the given OSS encoded mixer, again caller's job to</div><div class='del'>-   make sure all is well in arg land, call with spinlock held */</div><div class='del'>-static void ac97_write_mixer(struct ac97_codec *codec, int oss_channel,</div><div class='del'>-		      unsigned int left, unsigned int right)</div><div class='del'>-{</div><div class='del'>-	u16 val = 0;</div><div class='del'>-	int scale;</div><div class='del'>-	struct ac97_mixer_hw *mh = &amp;ac97_hw[oss_channel];</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("ac97_codec: wrote OSS mixer %2d (%s ac97 register 0x%02x), "</div><div class='del'>-	       "left vol:%2d, right vol:%2d:",</div><div class='del'>-	       oss_channel, codec-&gt;id ? "Secondary" : "Primary",</div><div class='del'>-	       mh-&gt;offset, left, right);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (AC97_STEREO_MASK &amp; (1 &lt;&lt; oss_channel)) {</div><div class='del'>-		/* stereo mixers */</div><div class='del'>-		if (left == 0 &amp;&amp; right == 0) {</div><div class='del'>-			val = AC97_MUTE;</div><div class='del'>-		} else {</div><div class='del'>-			if (oss_channel == SOUND_MIXER_IGAIN) {</div><div class='del'>-				right = (right * mh-&gt;scale) / 100;</div><div class='del'>-				left = (left * mh-&gt;scale) / 100;</div><div class='del'>-				if (right &gt;= mh-&gt;scale)</div><div class='del'>-					right = mh-&gt;scale-1;</div><div class='del'>-				if (left &gt;= mh-&gt;scale)</div><div class='del'>-					left = mh-&gt;scale-1;</div><div class='del'>-			} else {</div><div class='del'>-				/* these may have 5 or 6 bit resolution */</div><div class='del'>-				if (oss_channel == SOUND_MIXER_VOLUME ||</div><div class='del'>-				    oss_channel == SOUND_MIXER_ALTPCM)</div><div class='del'>-					scale = (1 &lt;&lt; codec-&gt;bit_resolution);</div><div class='del'>-				else</div><div class='del'>-					scale = mh-&gt;scale;</div><div class='del'>-</div><div class='del'>-				right = ((100 - right) * scale) / 100;</div><div class='del'>-				left = ((100 - left) * scale) / 100;</div><div class='del'>-				if (right &gt;= scale)</div><div class='del'>-					right = scale-1;</div><div class='del'>-				if (left &gt;= scale)</div><div class='del'>-					left = scale-1;</div><div class='del'>-			}</div><div class='del'>-			val = (left &lt;&lt; 8) | right;</div><div class='del'>-		}</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_BASS) {</div><div class='del'>-		val = codec-&gt;codec_read(codec , mh-&gt;offset) &amp; ~0x0f00;</div><div class='del'>-		left = ((100 - left) * mh-&gt;scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val |= (left &lt;&lt; 8) &amp; 0x0e00;</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_TREBLE) {</div><div class='del'>-		val = codec-&gt;codec_read(codec , mh-&gt;offset) &amp; ~0x000f;</div><div class='del'>-		left = ((100 - left) * mh-&gt;scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val |= left &amp; 0x000e;</div><div class='del'>-	} else if(left == 0) {</div><div class='del'>-		val = AC97_MUTE;</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_SPEAKER) {</div><div class='del'>-		left = ((100 - left) * mh-&gt;scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val = left &lt;&lt; 1;</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_PHONEIN) {</div><div class='del'>-		left = ((100 - left) * mh-&gt;scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val = left;</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_PHONEOUT) {</div><div class='del'>-		scale = (1 &lt;&lt; codec-&gt;bit_resolution);</div><div class='del'>-		left = ((100 - left) * scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val = left;</div><div class='del'>-	} else if (oss_channel == SOUND_MIXER_MIC) {</div><div class='del'>-		val = codec-&gt;codec_read(codec , mh-&gt;offset) &amp; ~0x801f;</div><div class='del'>-		left = ((100 - left) * mh-&gt;scale) / 100;</div><div class='del'>-		if (left &gt;= mh-&gt;scale)</div><div class='del'>-			left = mh-&gt;scale-1;</div><div class='del'>-		val |= left;</div><div class='del'>-		/*  the low bit is optional in the tone sliders and masking</div><div class='del'>-		    it lets us avoid the 0xf 'bypass'.. */</div><div class='del'>-	}</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk(" 0x%04x", val);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	codec-&gt;codec_write(codec, mh-&gt;offset, val);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	val = codec-&gt;codec_read(codec, mh-&gt;offset);</div><div class='del'>-	printk(" -&gt; 0x%04x\n", val);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* a thin wrapper for write_mixer */</div><div class='del'>-static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, unsigned int val ) </div><div class='del'>-{</div><div class='del'>-	unsigned int left,right;</div><div class='del'>-</div><div class='del'>-	/* cleanse input a little */</div><div class='del'>-	right = ((val &gt;&gt; 8)  &amp; 0xff) ;</div><div class='del'>-	left = (val  &amp; 0xff) ;</div><div class='del'>-</div><div class='del'>-	if (right &gt; 100) right = 100;</div><div class='del'>-	if (left &gt; 100) left = 100;</div><div class='del'>-</div><div class='del'>-	codec-&gt;mixer_state[oss_mixer] = (right &lt;&lt; 8) | left;</div><div class='del'>-	codec-&gt;write_mixer(codec, oss_mixer, left, right);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read or write the recmask, the ac97 can really have left and right recording</div><div class='del'>-   inputs independantly set, but OSS doesn't seem to want us to express that to</div><div class='del'>-   the user. the caller guarantees that we have a supported bit set, and they</div><div class='del'>-   must be holding the card's spinlock */</div><div class='del'>-static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) </div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	if (rw) {</div><div class='del'>-		/* read it from the card */</div><div class='del'>-		val = codec-&gt;codec_read(codec, AC97_RECORD_SELECT);</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-		printk("ac97_codec: ac97 recmask to set to 0x%04x\n", val);</div><div class='del'>-#endif</div><div class='del'>-		return (1 &lt;&lt; ac97_rm2oss[val &amp; 0x07]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* else, write the first set in the mask as the</div><div class='del'>-	   output */	</div><div class='del'>-	/* clear out current set value first (AC97 supports only 1 input!) */</div><div class='del'>-	val = (1 &lt;&lt; ac97_rm2oss[codec-&gt;codec_read(codec, AC97_RECORD_SELECT) &amp; 0x07]);</div><div class='del'>-	if (mask != val)</div><div class='del'>-	    mask &amp;= ~val;</div><div class='del'>-       </div><div class='del'>-	val = ffs(mask); </div><div class='del'>-	val = ac97_oss_rm[val-1];</div><div class='del'>-	val |= val &lt;&lt; 8;  /* set both channels */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	printk("ac97_codec: setting ac97 recmask to 0x%04x\n", val);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_RECORD_SELECT, val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ac97_mixer_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int i, val = 0;</div><div class='del'>-</div><div class='del'>-	if (cmd == SOUND_MIXER_INFO) {</div><div class='del'>-		mixer_info info;</div><div class='del'>-		memset(&amp;info, 0, sizeof(info));</div><div class='del'>-		strlcpy(info.id, codec-&gt;name, sizeof(info.id));</div><div class='del'>-		strlcpy(info.name, codec-&gt;name, sizeof(info.name));</div><div class='del'>-		info.modify_counter = codec-&gt;modcnt;</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_OLD_MIXER_INFO) {</div><div class='del'>-		_old_mixer_info info;</div><div class='del'>-		memset(&amp;info, 0, sizeof(info));</div><div class='del'>-		strlcpy(info.id, codec-&gt;name, sizeof(info.id));</div><div class='del'>-		strlcpy(info.name, codec-&gt;name, sizeof(info.name));</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (_IOC_TYPE(cmd) != 'M' || _SIOC_SIZE(cmd) != sizeof(int))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (cmd == OSS_GETVERSION)</div><div class='del'>-		return put_user(SOUND_VERSION, (int __user *)arg);</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) == _SIOC_READ) {</div><div class='del'>-		switch (_IOC_NR(cmd)) {</div><div class='del'>-		case SOUND_MIXER_RECSRC: /* give them the current record source */</div><div class='del'>-			if (!codec-&gt;recmask_io) {</div><div class='del'>-				val = 0;</div><div class='del'>-			} else {</div><div class='del'>-				val = codec-&gt;recmask_io(codec, 1, 0);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_DEVMASK: /* give them the supported mixers */</div><div class='del'>-			val = codec-&gt;supported_mixers;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_RECMASK: /* Arg contains a bit for each supported recording source */</div><div class='del'>-			val = codec-&gt;record_sources;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_STEREODEVS: /* Mixer channels supporting stereo */</div><div class='del'>-			val = codec-&gt;stereo_mixers;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CAPS:</div><div class='del'>-			val = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default: /* read a specific mixer */</div><div class='del'>-			i = _IOC_NR(cmd);</div><div class='del'>-</div><div class='del'>-			if (!supported_mixer(codec, i)) </div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			/* do we ever want to touch the hardware? */</div><div class='del'>-		        /* val = codec-&gt;read_mixer(codec, i); */</div><div class='del'>-			val = codec-&gt;mixer_state[i];</div><div class='del'>- 			break;</div><div class='del'>-		}</div><div class='del'>-		return put_user(val, (int __user *)arg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) == (_SIOC_WRITE|_SIOC_READ)) {</div><div class='del'>-		codec-&gt;modcnt++;</div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		switch (_IOC_NR(cmd)) {</div><div class='del'>-		case SOUND_MIXER_RECSRC: /* Arg contains a bit for each recording source */</div><div class='del'>-			if (!codec-&gt;recmask_io) return -EINVAL;</div><div class='del'>-			if (!val) return 0;</div><div class='del'>-			if (!(val &amp;= codec-&gt;record_sources)) return -EINVAL;</div><div class='del'>-</div><div class='del'>-			codec-&gt;recmask_io(codec, 0, val);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		default: /* write a specific mixer */</div><div class='del'>-			i = _IOC_NR(cmd);</div><div class='del'>-</div><div class='del'>-			if (!supported_mixer(codec, i)) </div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			ac97_set_mixer(codec, i, val);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	codec_id	-  Turn id1/id2 into a PnP string</div><div class='del'>- *	@id1: Vendor ID1</div><div class='del'>- *	@id2: Vendor ID2</div><div class='del'>- *	@buf: CODEC_ID_BUFSZ byte buffer</div><div class='del'>- *</div><div class='del'>- *	Fills buf with a zero terminated PnP ident string for the id1/id2</div><div class='del'>- *	pair. For convenience the return is the passed in buffer pointer.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static char *codec_id(u16 id1, u16 id2, char *buf)</div><div class='del'>-{</div><div class='del'>-	if(id1&amp;0x8080) {</div><div class='del'>-		snprintf(buf, CODEC_ID_BUFSZ, "0x%04x:0x%04x", id1, id2);</div><div class='del'>-	} else {</div><div class='del'>-		buf[0] = (id1 &gt;&gt; 8);</div><div class='del'>-		buf[1] = (id1 &amp; 0xFF);</div><div class='del'>-		buf[2] = (id2 &gt;&gt; 8);</div><div class='del'>-		snprintf(buf+3, CODEC_ID_BUFSZ - 3, "%d", id2&amp;0xFF);</div><div class='del'>-	}</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-/**</div><div class='del'>- *	ac97_check_modem - Check if the Codec is a modem</div><div class='del'>- *	@codec: codec to check</div><div class='del'>- *</div><div class='del'>- *	Return true if the device is an AC97 1.0 or AC97 2.0 modem</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int ac97_check_modem(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* Check for an AC97 1.0 soft modem (ID1) */</div><div class='del'>-	if(codec-&gt;codec_read(codec, AC97_RESET) &amp; 2)</div><div class='del'>-		return 1;</div><div class='del'>-	/* Check for an AC97 2.x soft modem */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_EXTENDED_MODEM_ID, 0L);</div><div class='del'>-	if(codec-&gt;codec_read(codec, AC97_EXTENDED_MODEM_ID) &amp; 1)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ac97_alloc_codec - Allocate an AC97 codec</div><div class='del'>- *</div><div class='del'>- *	Returns a new AC97 codec structure. AC97 codecs may become</div><div class='del'>- *	refcounted soon so this interface is needed. Returns with</div><div class='del'>- *	one reference taken.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-struct ac97_codec *ac97_alloc_codec(void)</div><div class='del'>-{</div><div class='del'>-	struct ac97_codec *codec = kzalloc(sizeof(struct ac97_codec), GFP_KERNEL);</div><div class='del'>-	if(!codec)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;codec-&gt;lock);</div><div class='del'>-	INIT_LIST_HEAD(&amp;codec-&gt;list);</div><div class='del'>-	return codec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ac97_alloc_codec);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ac97_release_codec -	Release an AC97 codec</div><div class='del'>- *	@codec: codec to release</div><div class='del'>- *</div><div class='del'>- *	Release an allocated AC97 codec. This will be refcounted in</div><div class='del'>- *	time but for the moment is trivial. Calls the unregister</div><div class='del'>- *	handler if the codec is now defunct.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-void ac97_release_codec(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* Remove from the list first, we don't want to be</div><div class='del'>-	   "rediscovered" */</div><div class='del'>-	mutex_lock(&amp;codec_mutex);</div><div class='del'>-	list_del(&amp;codec-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;codec_mutex);</div><div class='del'>-	/*</div><div class='del'>-	 *	The driver needs to deal with internal</div><div class='del'>-	 *	locking to avoid accidents here. </div><div class='del'>-	 */</div><div class='del'>-	if(codec-&gt;driver)</div><div class='del'>-		codec-&gt;driver-&gt;remove(codec, codec-&gt;driver);</div><div class='del'>-	kfree(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ac97_release_codec);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	ac97_probe_codec - Initialize and setup AC97-compatible codec</div><div class='del'>- *	@codec: (in/out) Kernel info for a single AC97 codec</div><div class='del'>- *</div><div class='del'>- *	Reset the AC97 codec, then initialize the mixer and</div><div class='del'>- *	the rest of the @codec structure.</div><div class='del'>- *</div><div class='del'>- *	The codec_read and codec_write fields of @codec are</div><div class='del'>- *	required to be setup and working when this function</div><div class='del'>- *	is called.  All other fields are set by this function.</div><div class='del'>- *</div><div class='del'>- *	codec_wait field of @codec can optionally be provided</div><div class='del'>- *	when calling this function.  If codec_wait is not %NULL,</div><div class='del'>- *	this function will call codec_wait any time it is</div><div class='del'>- *	necessary to wait for the audio chip to reach the</div><div class='del'>- *	codec-ready state.  If codec_wait is %NULL, then</div><div class='del'>- *	the default behavior is to call schedule_timeout.</div><div class='del'>- *	Currently codec_wait is used to wait for AC97 codec</div><div class='del'>- *	reset to complete. </div><div class='del'>- *</div><div class='del'>- *     Some codecs will power down when a register reset is</div><div class='del'>- *     performed. We now check for such codecs.</div><div class='del'>- *</div><div class='del'>- *	Returns 1 (true) on success, or 0 (false) on failure.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-int ac97_probe_codec(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	u16 id1, id2;</div><div class='del'>-	u16 audio;</div><div class='del'>-	int i;</div><div class='del'>-	char cidbuf[CODEC_ID_BUFSZ];</div><div class='del'>-	u16 f;</div><div class='del'>-	struct list_head *l;</div><div class='del'>-	struct ac97_driver *d;</div><div class='del'>-	</div><div class='del'>-	/* wait for codec-ready state */</div><div class='del'>-	if (codec-&gt;codec_wait)</div><div class='del'>-		codec-&gt;codec_wait(codec);</div><div class='del'>-	else</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-	/* will the codec power down if register reset ? */</div><div class='del'>-	id1 = codec-&gt;codec_read(codec, AC97_VENDOR_ID1);</div><div class='del'>-	id2 = codec-&gt;codec_read(codec, AC97_VENDOR_ID2);</div><div class='del'>-	codec-&gt;name = NULL;</div><div class='del'>-	codec-&gt;codec_ops = &amp;null_ops;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ac97_codec_ids); i++) {</div><div class='del'>-		if (ac97_codec_ids[i].id == ((id1 &lt;&lt; 16) | id2)) {</div><div class='del'>-			codec-&gt;type = ac97_codec_ids[i].id;</div><div class='del'>-			codec-&gt;name = ac97_codec_ids[i].name;</div><div class='del'>-			codec-&gt;codec_ops = ac97_codec_ids[i].ops;</div><div class='del'>-			codec-&gt;flags = ac97_codec_ids[i].flags;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;model = (id1 &lt;&lt; 16) | id2;</div><div class='del'>-	if ((codec-&gt;flags &amp; AC97_DEFAULT_POWER_OFF) == 0) {</div><div class='del'>-		/* reset codec and wait for the ready bit before we continue */</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_RESET, 0L);</div><div class='del'>-		if (codec-&gt;codec_wait)</div><div class='del'>-			codec-&gt;codec_wait(codec);</div><div class='del'>-		else</div><div class='del'>-			udelay(10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* probing AC97 codec, AC97 2.0 says that bit 15 of register 0x00 (reset) should</div><div class='del'>-	 * be read zero.</div><div class='del'>-	 *</div><div class='del'>-	 * FIXME: is the following comment outdated?  -jgarzik</div><div class='del'>-	 * Probing of AC97 in this way is not reliable, it is not even SAFE !!</div><div class='del'>-	 */</div><div class='del'>-	if ((audio = codec-&gt;codec_read(codec, AC97_RESET)) &amp; 0x8000) {</div><div class='del'>-		printk(KERN_ERR "ac97_codec: %s ac97 codec not present\n",</div><div class='del'>-		       (codec-&gt;id &amp; 0x2) ? (codec-&gt;id&amp;1 ? "4th" : "Tertiary")</div><div class='del'>-		       : (codec-&gt;id&amp;1 ? "Secondary":  "Primary"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* probe for Modem Codec */</div><div class='del'>-	codec-&gt;modem = ac97_check_modem(codec);</div><div class='del'>-</div><div class='del'>-	/* enable SPDIF */</div><div class='del'>-	f = codec-&gt;codec_read(codec, AC97_EXTENDED_STATUS);</div><div class='del'>-	if((codec-&gt;codec_ops == &amp;null_ops) &amp;&amp; (f &amp; 4))</div><div class='del'>-		codec-&gt;codec_ops = &amp;default_digital_ops;</div><div class='del'>-	</div><div class='del'>-	/* A device which thinks its a modem but isnt */</div><div class='del'>-	if(codec-&gt;flags &amp; AC97_DELUDED_MODEM)</div><div class='del'>-		codec-&gt;modem = 0;</div><div class='del'>-		</div><div class='del'>-	if (codec-&gt;name == NULL)</div><div class='del'>-		codec-&gt;name = "Unknown";</div><div class='del'>-	printk(KERN_INFO "ac97_codec: AC97 %s codec, id: %s (%s)\n", </div><div class='del'>-		codec-&gt;modem ? "Modem" : (audio ? "Audio" : ""),</div><div class='del'>-	       codec_id(id1, id2, cidbuf), codec-&gt;name);</div><div class='del'>-</div><div class='del'>-	if(!ac97_init_mixer(codec))</div><div class='del'>-		return 0;</div><div class='del'>-		</div><div class='del'>-	/* </div><div class='del'>-	 *	Attach last so the caller can override the mixer</div><div class='del'>-	 *	callbacks.</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	mutex_lock(&amp;codec_mutex);</div><div class='del'>-	list_add(&amp;codec-&gt;list, &amp;codecs);</div><div class='del'>-</div><div class='del'>-	list_for_each(l, &amp;codec_drivers) {</div><div class='del'>-		d = list_entry(l, struct ac97_driver, list);</div><div class='del'>-		if ((codec-&gt;model ^ d-&gt;codec_id) &amp; d-&gt;codec_mask)</div><div class='del'>-			continue;</div><div class='del'>-		if(d-&gt;probe(codec, d) == 0)</div><div class='del'>-		{</div><div class='del'>-			codec-&gt;driver = d;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;codec_mutex);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ac97_init_mixer(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	u16 cap;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cap = codec-&gt;codec_read(codec, AC97_RESET);</div><div class='del'>-</div><div class='del'>-	/* mixer masks */</div><div class='del'>-	codec-&gt;supported_mixers = AC97_SUPPORTED_MASK;</div><div class='del'>-	codec-&gt;stereo_mixers = AC97_STEREO_MASK;</div><div class='del'>-	codec-&gt;record_sources = AC97_RECORD_MASK;</div><div class='del'>-	if (!(cap &amp; 0x04))</div><div class='del'>-		codec-&gt;supported_mixers &amp;= ~(SOUND_MASK_BASS|SOUND_MASK_TREBLE);</div><div class='del'>-	if (!(cap &amp; 0x10))</div><div class='del'>-		codec-&gt;supported_mixers &amp;= ~SOUND_MASK_ALTPCM;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* detect bit resolution */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_MASTER_VOL_STEREO, 0x2020);</div><div class='del'>-	if(codec-&gt;codec_read(codec, AC97_MASTER_VOL_STEREO) == 0x2020)</div><div class='del'>-		codec-&gt;bit_resolution = 6;</div><div class='del'>-	else</div><div class='del'>-		codec-&gt;bit_resolution = 5;</div><div class='del'>-</div><div class='del'>-	/* generic OSS to AC97 wrapper */</div><div class='del'>-	codec-&gt;read_mixer = ac97_read_mixer;</div><div class='del'>-	codec-&gt;write_mixer = ac97_write_mixer;</div><div class='del'>-	codec-&gt;recmask_io = ac97_recmask_io;</div><div class='del'>-	codec-&gt;mixer_ioctl = ac97_mixer_ioctl;</div><div class='del'>-</div><div class='del'>-	/* initialize mixer channel volumes */</div><div class='del'>-	for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++) {</div><div class='del'>-		struct mixer_defaults *md = &amp;mixer_defaults[i];</div><div class='del'>-		if (md-&gt;mixer == -1) </div><div class='del'>-			break;</div><div class='del'>-		if (!supported_mixer(codec, md-&gt;mixer)) </div><div class='del'>-			continue;</div><div class='del'>-		ac97_set_mixer(codec, md-&gt;mixer, md-&gt;value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* codec specific initialization for 4-6 channel output or secondary codec stuff */</div><div class='del'>-	if (codec-&gt;codec_ops-&gt;init != NULL) {</div><div class='del'>-		codec-&gt;codec_ops-&gt;init(codec);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Volume is MUTE only on this device. We have to initialise</div><div class='del'>-	 *	it but its useless beyond that.</div><div class='del'>-	 */</div><div class='del'>-	if(codec-&gt;flags &amp; AC97_NO_PCM_VOLUME)</div><div class='del'>-	{</div><div class='del'>-		codec-&gt;supported_mixers &amp;= ~SOUND_MASK_PCM;</div><div class='del'>-		printk(KERN_WARNING "AC97 codec does not have proper volume support.\n");</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AC97_SIGMATEL_ANALOG    0x6c	/* Analog Special */</div><div class='del'>-#define AC97_SIGMATEL_DAC2INVERT 0x6e</div><div class='del'>-#define AC97_SIGMATEL_BIAS1     0x70</div><div class='del'>-#define AC97_SIGMATEL_BIAS2     0x72</div><div class='del'>-#define AC97_SIGMATEL_MULTICHN  0x74	/* Multi-Channel programming */</div><div class='del'>-#define AC97_SIGMATEL_CIC1      0x76</div><div class='del'>-#define AC97_SIGMATEL_CIC2      0x78</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sigmatel_9708_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	u16 codec72, codec6c;</div><div class='del'>-</div><div class='del'>-	codec72 = codec-&gt;codec_read(codec, AC97_SIGMATEL_BIAS2) &amp; 0x8000;</div><div class='del'>-	codec6c = codec-&gt;codec_read(codec, AC97_SIGMATEL_ANALOG);</div><div class='del'>-</div><div class='del'>-	if ((codec72==0) &amp;&amp; (codec6c==0)) {</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC1, 0xabba);</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC2, 0x1000);</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_BIAS1, 0xabba);</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_BIAS2, 0x0007);</div><div class='del'>-	} else if ((codec72==0x8000) &amp;&amp; (codec6c==0)) {</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC1, 0xabba);</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC2, 0x1001);</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_SIGMATEL_DAC2INVERT, 0x0008);</div><div class='del'>-	} else if ((codec72==0x8000) &amp;&amp; (codec6c==0x0080)) {</div><div class='del'>-		/* nothing */</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_MULTICHN, 0x0000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sigmatel_9721_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* Only set up secondary codec */</div><div class='del'>-	if (codec-&gt;id == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SURROUND_MASTER, 0L);</div><div class='del'>-</div><div class='del'>-	/* initialize SigmaTel STAC9721/23 as secondary codec, decoding AC link</div><div class='del'>-	   sloc 3,4 = 0x01, slot 7,8 = 0x00, */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_MULTICHN, 0x00);</div><div class='del'>-</div><div class='del'>-	/* we don't have the crystal when we are on an AMR card, so use</div><div class='del'>-	   BIT_CLK as our clock source. Write the magic word ABBA and read</div><div class='del'>-	   back to enable register 0x78 */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC1, 0xabba);</div><div class='del'>-	codec-&gt;codec_read(codec, AC97_SIGMATEL_CIC1);</div><div class='del'>-</div><div class='del'>-	/* sync all the clocks*/</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC2, 0x3802);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sigmatel_9744_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	// patch for SigmaTel</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC1, 0xabba);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_CIC2, 0x0000); // is this correct? --jk</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_BIAS1, 0xabba);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_BIAS2, 0x0002);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SIGMATEL_MULTICHN, 0x0000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmedia_init(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* Initialise the CMedia 9739 */</div><div class='del'>-	/*</div><div class='del'>-		We could set various options here</div><div class='del'>-		Register 0x20 bit 0x100 sets mic as center bass</div><div class='del'>-		Also do multi_channel_ctrl &amp;=~0x3000 |=0x1000</div><div class='del'>-		</div><div class='del'>-		For now we set up the GPIO and PC beep </div><div class='del'>-	*/</div><div class='del'>-	</div><div class='del'>-	u16 v;</div><div class='del'>-	</div><div class='del'>-	/* MIC */</div><div class='del'>-	codec-&gt;codec_write(codec, 0x64, 0x3000);</div><div class='del'>-	v = codec-&gt;codec_read(codec, 0x64);</div><div class='del'>-	v &amp;= ~0x8000;</div><div class='del'>-	codec-&gt;codec_write(codec, 0x64, v);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x70, 0x0100);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x72, 0x0020);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-#define AC97_WM97XX_FMIXER_VOL 0x72</div><div class='del'>-#define AC97_WM97XX_RMIXER_VOL 0x74</div><div class='del'>-#define AC97_WM97XX_TEST 0x5a</div><div class='del'>-#define AC97_WM9704_RPCM_VOL 0x70</div><div class='del'>-#define AC97_WM9711_OUT3VOL 0x16</div><div class='del'>-</div><div class='del'>-static int wolfson_init03(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* this is known to work for the ViewSonic ViewPad 1000 */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_FMIXER_VOL, 0x0808);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_GENERAL_PURPOSE, 0x8000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int wolfson_init04(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_FMIXER_VOL, 0x0808);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_RMIXER_VOL, 0x0808);</div><div class='del'>-</div><div class='del'>-	// patch for DVD noise</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_TEST, 0x0200);</div><div class='del'>-</div><div class='del'>-	// init vol as PCM vol</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM9704_RPCM_VOL,</div><div class='del'>-		codec-&gt;codec_read(codec, AC97_PCMOUT_VOL));</div><div class='del'>-</div><div class='del'>-	/* set rear surround volume */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SURROUND_MASTER, 0x0000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* WM9705, WM9710 */</div><div class='del'>-static int wolfson_init05(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* set front mixer volume */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_FMIXER_VOL, 0x0808);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* WM9711, WM9712 */</div><div class='del'>-static int wolfson_init11(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* stop pop's during suspend/resume */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM97XX_TEST,</div><div class='del'>-		codec-&gt;codec_read(codec, AC97_WM97XX_TEST) &amp; 0xffbf);</div><div class='del'>-</div><div class='del'>-	/* set out3 volume */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_WM9711_OUT3VOL, 0x0808);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* WM9713 */</div><div class='del'>-static int wolfson_init13(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_RECORD_GAIN, 0x00a0);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_POWER_CONTROL, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_EXTENDED_MODEM_ID, 0xDA00);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_EXTEND_MODEM_STAT, 0x3810);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_PHONE_VOL, 0x0808);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_PCBEEP_VOL, 0x0808);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tritech_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	codec-&gt;codec_write(codec, 0x26, 0x0300);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x26, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SURROUND_MASTER, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_RESERVED_3A, 0x0000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* copied from drivers/sound/maestro.c */</div><div class='del'>-static int tritech_maestro_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* no idea what this does */</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2A, 0x0001);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2C, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2C, 0XFFFF);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *	Presario700 workaround </div><div class='del'>- * 	for Jack Sense/SPDIF Register mis-setting causing</div><div class='del'>- *	no audible output</div><div class='del'>- *	by Santiago Nullo 04/05/2002</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AC97_AD1886_JACK_SENSE 0x72</div><div class='del'>-</div><div class='del'>-static int ad1886_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	/* from AD1886 Specs */</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_AD1886_JACK_SENSE, 0x0010);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	This is basically standard AC97. It should work as a default for</div><div class='del'>- *	almost all modern codecs. Note that some cards wire EAPD *backwards*</div><div class='del'>- *	That side of it is up to the card driver not us to cope with.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int eapd_control(struct ac97_codec * codec, int on)</div><div class='del'>-{</div><div class='del'>-	if(on)</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_POWER_CONTROL,</div><div class='del'>-			codec-&gt;codec_read(codec, AC97_POWER_CONTROL)|0x8000);</div><div class='del'>-	else</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_POWER_CONTROL,</div><div class='del'>-			codec-&gt;codec_read(codec, AC97_POWER_CONTROL)&amp;~0x8000);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int generic_digital_control(struct ac97_codec *codec, int slots, int rate, int mode)</div><div class='del'>-{</div><div class='del'>-	u16 reg;</div><div class='del'>-	</div><div class='del'>-	reg = codec-&gt;codec_read(codec, AC97_SPDIF_CONTROL);</div><div class='del'>-	</div><div class='del'>-	switch(rate)</div><div class='del'>-	{</div><div class='del'>-		/* Off by default */</div><div class='del'>-		default:</div><div class='del'>-		case 0:</div><div class='del'>-			reg = codec-&gt;codec_read(codec, AC97_EXTENDED_STATUS);</div><div class='del'>-			codec-&gt;codec_write(codec, AC97_EXTENDED_STATUS, (reg &amp; ~AC97_EA_SPDIF));</div><div class='del'>-			if(rate == 0)</div><div class='del'>-				return 0;</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		case 1:</div><div class='del'>-			reg = (reg &amp; AC97_SC_SPSR_MASK) | AC97_SC_SPSR_48K;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			reg = (reg &amp; AC97_SC_SPSR_MASK) | AC97_SC_SPSR_44K;</div><div class='del'>-			break;</div><div class='del'>-		case 3:</div><div class='del'>-			reg = (reg &amp; AC97_SC_SPSR_MASK) | AC97_SC_SPSR_32K;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	reg &amp;= ~AC97_SC_CC_MASK;</div><div class='del'>-	reg |= (mode &amp; AUDIO_CCMASK) &lt;&lt; 6;</div><div class='del'>-	</div><div class='del'>-	if(mode &amp; AUDIO_DIGITAL)</div><div class='del'>-		reg |= 2;</div><div class='del'>-	if(mode &amp; AUDIO_PRO)</div><div class='del'>-		reg |= 1;</div><div class='del'>-	if(mode &amp; AUDIO_DRS)</div><div class='del'>-		reg |= 0x4000;</div><div class='del'>-</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_SPDIF_CONTROL, reg);</div><div class='del'>-</div><div class='del'>-	reg = codec-&gt;codec_read(codec, AC97_EXTENDED_STATUS);</div><div class='del'>-	reg &amp;= (AC97_EA_SLOT_MASK);</div><div class='del'>-	reg |= AC97_EA_VRA | AC97_EA_SPDIF | slots;</div><div class='del'>-	codec-&gt;codec_write(codec, AC97_EXTENDED_STATUS, reg);</div><div class='del'>-	</div><div class='del'>-	reg = codec-&gt;codec_read(codec, AC97_EXTENDED_STATUS);</div><div class='del'>-	if(!(reg &amp; 0x0400))</div><div class='del'>-	{</div><div class='del'>-		codec-&gt;codec_write(codec, AC97_EXTENDED_STATUS, reg &amp; ~ AC97_EA_SPDIF);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Crystal digital audio control (CS4299)</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int crystal_digital_control(struct ac97_codec *codec, int slots, int rate, int mode)</div><div class='del'>-{</div><div class='del'>-	u16 cv;</div><div class='del'>-</div><div class='del'>-	if(mode &amp; AUDIO_DIGITAL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-		</div><div class='del'>-	switch(rate)</div><div class='del'>-	{</div><div class='del'>-		case 0: cv = 0x0; break;	/* SPEN off */</div><div class='del'>-		case 48000: cv = 0x8004; break;	/* 48KHz digital */</div><div class='del'>-		case 44100: cv = 0x8104; break;	/* 44.1KHz digital */</div><div class='del'>-		case 32768: 			/* 32Khz */</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;codec_write(codec, 0x68, cv);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	CMedia digital audio control</div><div class='del'>- *	Needs more work.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int cmedia_digital_control(struct ac97_codec *codec, int slots, int rate, int mode)</div><div class='del'>-{</div><div class='del'>-	u16 cv;</div><div class='del'>-</div><div class='del'>-	if(mode &amp; AUDIO_DIGITAL)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-		</div><div class='del'>-	switch(rate)</div><div class='del'>-	{</div><div class='del'>-		case 0:		cv = 0x0001; break;	/* SPEN off */</div><div class='del'>-		case 48000:	cv = 0x0009; break;	/* 48KHz digital */</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2A, 0x05c4);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x6C, cv);</div><div class='del'>-	</div><div class='del'>-	/* Switch on mix to surround */</div><div class='del'>-	cv = codec-&gt;codec_read(codec, 0x64);</div><div class='del'>-	cv &amp;= ~0x0200;</div><div class='del'>-	if(mode)</div><div class='del'>-		cv |= 0x0200;</div><div class='del'>-	codec-&gt;codec_write(codec, 0x64, cv);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* copied from drivers/sound/maestro.c */</div><div class='del'>-#if 0  /* there has been 1 person on the planet with a pt101 that we</div><div class='del'>-        know of.  If they care, they can put this back in :) */</div><div class='del'>-static int pt101_init(struct ac97_codec * codec)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "ac97_codec: PT101 Codec detected, initializing but _not_ installing mixer device.\n");</div><div class='del'>-	/* who knows.. */</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2A, 0x0001);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2C, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x2C, 0xFFFF);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x10, 0x9F1F);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x12, 0x0808);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x14, 0x9F1F);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x16, 0x9F1F);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x18, 0x0404);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x1A, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x1C, 0x0000);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x02, 0x0404);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x04, 0x0808);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x0C, 0x801F);</div><div class='del'>-	codec-&gt;codec_write(codec, 0x0E, 0x801F);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ac97_probe_codec);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c<br/>deleted file mode 100644<br/>index 4d2a6ae978f7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/ad1848.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3069 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/ad1848.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the AD1848/CS4248 codec chip which</div><div class='del'>- * is used for example in the MS Sound System.</div><div class='del'>- *</div><div class='del'>- * The CS4231 which is used in the GUS MAX and some other cards is</div><div class='del'>- * upwards compatible with AD1848 and this driver is able to drive it.</div><div class='del'>- *</div><div class='del'>- * CS4231A and AD1845 are upward compatible with CS4231. However</div><div class='del'>- * the new features of these chips are different.</div><div class='del'>- *</div><div class='del'>- * CS4232 is a PnP audio chip which contains a CS4231A (and SB, MPU).</div><div class='del'>- * CS4232A is an improved version of CS4232.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer	: ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- *			  general sleep/wakeup clean up.</div><div class='del'>- * Alan Cox		: reformatted. Fixed SMP bugs. Moved to kernel alloc/free</div><div class='del'>- *		          of irqs. Use dev_id.</div><div class='del'>- * Christoph Hellwig	: adapted to module_init/module_exit</div><div class='del'>- * Aki Laukkanen	: added power management support</div><div class='del'>- * Arnaldo C. de Melo	: added missing restore_flags in ad1848_resume</div><div class='del'>- * Miguel Freitas       : added ISA PnP support</div><div class='del'>- * Alan Cox		: Added CS4236-&gt;4239 identification</div><div class='del'>- * Daniel T. Cobra	: Alernate config/mixer for later chips</div><div class='del'>- * Alan Cox		: Merged chip idents and config code</div><div class='del'>- *</div><div class='del'>- * TODO</div><div class='del'>- *		APM save restore assist code on IBM thinkpad</div><div class='del'>- *</div><div class='del'>- * Status:</div><div class='del'>- *		Tested. Believed fully functional.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/isapnp.h&gt;</div><div class='del'>-#include &lt;linux/pnp.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#define DEB(x)</div><div class='del'>-#define DEB1(x)</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "ad1848.h"</div><div class='del'>-#include "ad1848_mixer.h"</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-	int             base;</div><div class='del'>-	int             irq;</div><div class='del'>-	int             dma1, dma2;</div><div class='del'>-	int             dual_dma;	/* 1, when two DMA channels allocated */</div><div class='del'>-	int 		subtype;</div><div class='del'>-	unsigned char   MCE_bit;</div><div class='del'>-	unsigned char   saved_regs[64];	/* Includes extended register space */</div><div class='del'>-	int             debug_flag;</div><div class='del'>-</div><div class='del'>-	int             audio_flags;</div><div class='del'>-	int             record_dev, playback_dev;</div><div class='del'>-</div><div class='del'>-	int             xfer_count;</div><div class='del'>-	int             audio_mode;</div><div class='del'>-	int             open_mode;</div><div class='del'>-	int             intr_active;</div><div class='del'>-	char           *chip_name, *name;</div><div class='del'>-	int             model;</div><div class='del'>-#define MD_1848		1</div><div class='del'>-#define MD_4231		2</div><div class='del'>-#define MD_4231A	3</div><div class='del'>-#define MD_1845		4</div><div class='del'>-#define MD_4232		5</div><div class='del'>-#define MD_C930		6</div><div class='del'>-#define MD_IWAVE	7</div><div class='del'>-#define MD_4235         8 /* Crystal Audio CS4235  */</div><div class='del'>-#define MD_1845_SSCAPE  9 /* Ensoniq Soundscape PNP*/</div><div class='del'>-#define MD_4236		10 /* 4236 and higher */</div><div class='del'>-#define MD_42xB		11 /* CS 42xB */</div><div class='del'>-#define MD_4239		12 /* CS4239 */</div><div class='del'>-</div><div class='del'>-	/* Mixer parameters */</div><div class='del'>-	int             recmask;</div><div class='del'>-	int             supported_devices, orig_devices;</div><div class='del'>-	int             supported_rec_devices, orig_rec_devices;</div><div class='del'>-	int            *levels;</div><div class='del'>-	short           mixer_reroute[32];</div><div class='del'>-	int             dev_no;</div><div class='del'>-	volatile unsigned long timer_ticks;</div><div class='del'>-	int             timer_running;</div><div class='del'>-	int             irq_ok;</div><div class='del'>-	mixer_ents     *mix_devices;</div><div class='del'>-	int             mixer_output_port;</div><div class='del'>-} ad1848_info;</div><div class='del'>-</div><div class='del'>-typedef struct ad1848_port_info</div><div class='del'>-{</div><div class='del'>-	int             open_mode;</div><div class='del'>-	int             speed;</div><div class='del'>-	unsigned char   speed_bits;</div><div class='del'>-	int             channels;</div><div class='del'>-	int             audio_format;</div><div class='del'>-	unsigned char   format_bits;</div><div class='del'>-}</div><div class='del'>-ad1848_port_info;</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-static int nr_ad1848_devs;</div><div class='del'>-</div><div class='del'>-static int deskpro_xl;</div><div class='del'>-static int deskpro_m;</div><div class='del'>-static int soundpro;</div><div class='del'>-</div><div class='del'>-static volatile signed char irq2dev[17] = {</div><div class='del'>-	-1, -1, -1, -1, -1, -1, -1, -1,</div><div class='del'>-	-1, -1, -1, -1, -1, -1, -1, -1, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-static int timer_installed = -1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int loaded;</div><div class='del'>-</div><div class='del'>-static int ad_format_mask[13 /*devc-&gt;model */ ] =</div><div class='del'>-{</div><div class='del'>-	0,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW,	/* AD1845 */</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE /* CS4235 */,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW	/* Ensoniq Soundscape*/,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM,</div><div class='del'>-	AFMT_U8 | AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW | AFMT_S16_BE | AFMT_IMA_ADPCM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ad1848_info adev_info[MAX_AUDIO_DEV];</div><div class='del'>-</div><div class='del'>-#define io_Index_Addr(d)	((d)-&gt;base)</div><div class='del'>-#define io_Indexed_Data(d)	((d)-&gt;base+1)</div><div class='del'>-#define io_Status(d)		((d)-&gt;base+2)</div><div class='del'>-#define io_Polled_IO(d)		((d)-&gt;base+3)</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-     unsigned char flags;</div><div class='del'>-#define CAP_F_TIMER 0x01     </div><div class='del'>-} capabilities [10 /*devc-&gt;model */ ] = {</div><div class='del'>-     {0}</div><div class='del'>-    ,{0}           /* MD_1848  */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_4231  */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_4231A */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_1845  */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_4232  */</div><div class='del'>-    ,{0}           /* MD_C930  */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_IWAVE */</div><div class='del'>-    ,{0}           /* MD_4235  */</div><div class='del'>-    ,{CAP_F_TIMER} /* MD_1845_SSCAPE */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-static int isapnp	= 1;</div><div class='del'>-static int isapnpjump;</div><div class='del'>-static int reverse;</div><div class='del'>-</div><div class='del'>-static int audio_activated;</div><div class='del'>-#else</div><div class='del'>-static int isapnp;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int      ad1848_open(int dev, int mode);</div><div class='del'>-static void     ad1848_close(int dev);</div><div class='del'>-static void     ad1848_output_block(int dev, unsigned long buf, int count, int intrflag);</div><div class='del'>-static void     ad1848_start_input(int dev, unsigned long buf, int count, int intrflag);</div><div class='del'>-static int      ad1848_prepare_for_output(int dev, int bsize, int bcount);</div><div class='del'>-static int      ad1848_prepare_for_input(int dev, int bsize, int bcount);</div><div class='del'>-static void     ad1848_halt(int dev);</div><div class='del'>-static void     ad1848_halt_input(int dev);</div><div class='del'>-static void     ad1848_halt_output(int dev);</div><div class='del'>-static void     ad1848_trigger(int dev, int bits);</div><div class='del'>-static irqreturn_t adintr(int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-static int ad1848_tmr_install(int dev);</div><div class='del'>-static void ad1848_tmr_reprogram(int dev);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int ad_read(ad1848_info * devc, int reg)</div><div class='del'>-{</div><div class='del'>-	int x;</div><div class='del'>-	int timeout = 900000;</div><div class='del'>-</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; inb(devc-&gt;base) == 0x80)	/*Are we initializing */</div><div class='del'>-		timeout--;</div><div class='del'>-</div><div class='del'>-	if(reg &lt; 32)</div><div class='del'>-	{</div><div class='del'>-		outb(((unsigned char) (reg &amp; 0xff) | devc-&gt;MCE_bit), io_Index_Addr(devc));</div><div class='del'>-		x = inb(io_Indexed_Data(devc));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		int xreg, xra;</div><div class='del'>-</div><div class='del'>-		xreg = (reg &amp; 0xff) - 32;</div><div class='del'>-		xra = (((xreg &amp; 0x0f) &lt;&lt; 4) &amp; 0xf0) | 0x08 | ((xreg &amp; 0x10) &gt;&gt; 2);</div><div class='del'>-		outb(((unsigned char) (23 &amp; 0xff) | devc-&gt;MCE_bit), io_Index_Addr(devc));</div><div class='del'>-		outb(((unsigned char) (xra &amp; 0xff)), io_Indexed_Data(devc));</div><div class='del'>-		x = inb(io_Indexed_Data(devc));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad_write(ad1848_info * devc, int reg, int data)</div><div class='del'>-{</div><div class='del'>-	int timeout = 900000;</div><div class='del'>-</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; inb(devc-&gt;base) == 0x80)	/* Are we initializing */</div><div class='del'>-		timeout--;</div><div class='del'>-</div><div class='del'>-	if(reg &lt; 32)</div><div class='del'>-	{</div><div class='del'>-		outb(((unsigned char) (reg &amp; 0xff) | devc-&gt;MCE_bit), io_Index_Addr(devc));</div><div class='del'>-		outb(((unsigned char) (data &amp; 0xff)), io_Indexed_Data(devc));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		int xreg, xra;</div><div class='del'>-		</div><div class='del'>-		xreg = (reg &amp; 0xff) - 32;</div><div class='del'>-		xra = (((xreg &amp; 0x0f) &lt;&lt; 4) &amp; 0xf0) | 0x08 | ((xreg &amp; 0x10) &gt;&gt; 2);</div><div class='del'>-		outb(((unsigned char) (23 &amp; 0xff) | devc-&gt;MCE_bit), io_Index_Addr(devc));</div><div class='del'>-		outb(((unsigned char) (xra &amp; 0xff)), io_Indexed_Data(devc));</div><div class='del'>-		outb((unsigned char) (data &amp; 0xff), io_Indexed_Data(devc));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void wait_for_calibration(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	int timeout = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait until the auto calibration process has finished.</div><div class='del'>-	 *</div><div class='del'>-	 * 1)       Wait until the chip becomes ready (reads don't return 0x80).</div><div class='del'>-	 * 2)       Wait until the ACI bit of I11 gets on and then off.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	timeout = 100000;</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; inb(devc-&gt;base) == 0x80)</div><div class='del'>-		timeout--;</div><div class='del'>-	if (inb(devc-&gt;base) &amp; 0x80)</div><div class='del'>-		printk(KERN_WARNING "ad1848: Auto calibration timed out(1).\n");</div><div class='del'>-</div><div class='del'>-	timeout = 100;</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; !(ad_read(devc, 11) &amp; 0x20))</div><div class='del'>-		timeout--;</div><div class='del'>-	if (!(ad_read(devc, 11) &amp; 0x20))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	timeout = 80000;</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; (ad_read(devc, 11) &amp; 0x20))</div><div class='del'>-		timeout--;</div><div class='del'>-	if (ad_read(devc, 11) &amp; 0x20)</div><div class='del'>-		if ((devc-&gt;model != MD_1845) &amp;&amp; (devc-&gt;model != MD_1845_SSCAPE))</div><div class='del'>-			printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad_mute(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char prev;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Save old register settings and mute output channels</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	for (i = 6; i &lt; 8; i++)</div><div class='del'>-	{</div><div class='del'>-		prev = devc-&gt;saved_regs[i] = ad_read(devc, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad_unmute(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad_enter_MCE(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	int timeout = 1000;</div><div class='del'>-	unsigned short prev;</div><div class='del'>-</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; inb(devc-&gt;base) == 0x80)	/*Are we initializing */</div><div class='del'>-		timeout--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;MCE_bit = 0x40;</div><div class='del'>-	prev = inb(io_Index_Addr(devc));</div><div class='del'>-	if (prev &amp; 0x40)</div><div class='del'>-	{</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	outb((devc-&gt;MCE_bit), io_Index_Addr(devc));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad_leave_MCE(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned char prev, acal;</div><div class='del'>-	int timeout = 1000;</div><div class='del'>-</div><div class='del'>-	while (timeout &gt; 0 &amp;&amp; inb(devc-&gt;base) == 0x80)	/*Are we initializing */</div><div class='del'>-		timeout--;</div><div class='del'>-</div><div class='del'>-	acal = ad_read(devc, 9);</div><div class='del'>-</div><div class='del'>-	devc-&gt;MCE_bit = 0x00;</div><div class='del'>-	prev = inb(io_Index_Addr(devc));</div><div class='del'>-	outb((0x00), io_Index_Addr(devc));	/* Clear the MCE bit */</div><div class='del'>-</div><div class='del'>-	if ((prev &amp; 0x40) == 0)	/* Not in MCE mode */</div><div class='del'>-	{</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	outb((0x00), io_Index_Addr(devc));	/* Clear the MCE bit */</div><div class='del'>-	if (acal &amp; 0x08)	/* Auto calibration is enabled */</div><div class='del'>-		wait_for_calibration(devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_set_recmask(ad1848_info * devc, int mask)</div><div class='del'>-{</div><div class='del'>-	unsigned char   recdev;</div><div class='del'>-	int             i, n;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	mask &amp;= devc-&gt;supported_rec_devices;</div><div class='del'>-</div><div class='del'>-	/* Rename the mixer bits if necessary */</div><div class='del'>-	for (i = 0; i &lt; 32; i++)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;mixer_reroute[i] != i)</div><div class='del'>-		{</div><div class='del'>-			if (mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			{</div><div class='del'>-				mask &amp;= ~(1 &lt;&lt; i);</div><div class='del'>-				mask |= (1 &lt;&lt; devc-&gt;mixer_reroute[i]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	n = 0;</div><div class='del'>-	for (i = 0; i &lt; 32; i++)	/* Count selected device bits */</div><div class='del'>-		if (mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			n++;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	if (!soundpro) {</div><div class='del'>-		if (n == 0)</div><div class='del'>-			mask = SOUND_MASK_MIC;</div><div class='del'>-		else if (n != 1) {	/* Too many devices selected */</div><div class='del'>-			mask &amp;= ~devc-&gt;recmask;	/* Filter out active settings */</div><div class='del'>-</div><div class='del'>-			n = 0;</div><div class='del'>-			for (i = 0; i &lt; 32; i++)	/* Count selected device bits */</div><div class='del'>-				if (mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					n++;</div><div class='del'>-</div><div class='del'>-			if (n != 1)</div><div class='del'>-				mask = SOUND_MASK_MIC;</div><div class='del'>-		}</div><div class='del'>-		switch (mask) {</div><div class='del'>-		case SOUND_MASK_MIC:</div><div class='del'>-			recdev = 2;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MASK_LINE:</div><div class='del'>-		case SOUND_MASK_LINE3:</div><div class='del'>-			recdev = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MASK_CD:</div><div class='del'>-		case SOUND_MASK_LINE1:</div><div class='del'>-			recdev = 1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MASK_IMIX:</div><div class='del'>-			recdev = 3;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			mask = SOUND_MASK_MIC;</div><div class='del'>-			recdev = 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		recdev &lt;&lt;= 6;</div><div class='del'>-		ad_write(devc, 0, (ad_read(devc, 0) &amp; 0x3f) | recdev);</div><div class='del'>-		ad_write(devc, 1, (ad_read(devc, 1) &amp; 0x3f) | recdev);</div><div class='del'>-	} else { /* soundpro */</div><div class='del'>-		unsigned char val;</div><div class='del'>-		int set_rec_bit;</div><div class='del'>-		int j;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 32; i++) {	/* For each bit */</div><div class='del'>-			if ((devc-&gt;supported_rec_devices &amp; (1 &lt;&lt; i)) == 0)</div><div class='del'>-				continue;	/* Device not supported */</div><div class='del'>-</div><div class='del'>-			for (j = LEFT_CHN; j &lt;= RIGHT_CHN; j++) {</div><div class='del'>-				if (devc-&gt;mix_devices[i][j].nbits == 0) /* Inexistent channel */</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 * This is tricky:</div><div class='del'>-				 * set_rec_bit becomes 1 if the corresponding bit in mask is set</div><div class='del'>-				 * then it gets flipped if the polarity is inverse</div><div class='del'>-				 */</div><div class='del'>-				set_rec_bit = ((mask &amp; (1 &lt;&lt; i)) != 0) ^ devc-&gt;mix_devices[i][j].recpol;</div><div class='del'>-</div><div class='del'>-				val = ad_read(devc, devc-&gt;mix_devices[i][j].recreg);</div><div class='del'>-				val &amp;= ~(1 &lt;&lt; devc-&gt;mix_devices[i][j].recpos);</div><div class='del'>-				val |= (set_rec_bit &lt;&lt; devc-&gt;mix_devices[i][j].recpos);</div><div class='del'>-				ad_write(devc, devc-&gt;mix_devices[i][j].recreg, val);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	/* Rename the mixer bits back if necessary */</div><div class='del'>-	for (i = 0; i &lt; 32; i++)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;mixer_reroute[i] != i)</div><div class='del'>-		{</div><div class='del'>-			if (mask &amp; (1 &lt;&lt; devc-&gt;mixer_reroute[i]))</div><div class='del'>-			{</div><div class='del'>-				mask &amp;= ~(1 &lt;&lt; devc-&gt;mixer_reroute[i]);</div><div class='del'>-				mask |= (1 &lt;&lt; i);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;recmask = mask;</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void change_bits(ad1848_info * devc, unsigned char *regval,</div><div class='del'>-			unsigned char *muteval, int dev, int chn, int newval)</div><div class='del'>-{</div><div class='del'>-	unsigned char mask;</div><div class='del'>-	int shift;</div><div class='del'>-	int mute;</div><div class='del'>-	int mutemask;</div><div class='del'>-	int set_mute_bit;</div><div class='del'>-</div><div class='del'>-	set_mute_bit = (newval == 0) ^ devc-&gt;mix_devices[dev][chn].mutepol;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;mix_devices[dev][chn].polarity == 1)	/* Reverse */</div><div class='del'>-		newval = 100 - newval;</div><div class='del'>-</div><div class='del'>-	mask = (1 &lt;&lt; devc-&gt;mix_devices[dev][chn].nbits) - 1;</div><div class='del'>-	shift = devc-&gt;mix_devices[dev][chn].bitpos;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;mix_devices[dev][chn].mutepos == 8)</div><div class='del'>-	{			/* if there is no mute bit */</div><div class='del'>-		mute = 0;	/* No mute bit; do nothing special */</div><div class='del'>-		mutemask = ~0;	/* No mute bit; do nothing special */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		mute = (set_mute_bit &lt;&lt; devc-&gt;mix_devices[dev][chn].mutepos);</div><div class='del'>-		mutemask = ~(1 &lt;&lt; devc-&gt;mix_devices[dev][chn].mutepos);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	newval = (int) ((newval * mask) + 50) / 100;	/* Scale it */</div><div class='del'>-	*regval &amp;= ~(mask &lt;&lt; shift);			/* Clear bits */</div><div class='del'>-	*regval |= (newval &amp; mask) &lt;&lt; shift;		/* Set new value */</div><div class='del'>-</div><div class='del'>-	*muteval &amp;= mutemask;</div><div class='del'>-	*muteval |= mute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_mixer_get(ad1848_info * devc, int dev)</div><div class='del'>-{</div><div class='del'>-	if (!((1 &lt;&lt; dev) &amp; devc-&gt;supported_devices))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev = devc-&gt;mixer_reroute[dev];</div><div class='del'>-</div><div class='del'>-	return devc-&gt;levels[dev];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_mixer_set_channel(ad1848_info *devc, int dev, int value, int channel)</div><div class='del'>-{</div><div class='del'>-	int regoffs, muteregoffs;</div><div class='del'>-	unsigned char val, muteval;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	regoffs = devc-&gt;mix_devices[dev][channel].regno;</div><div class='del'>-	muteregoffs = devc-&gt;mix_devices[dev][channel].mutereg;</div><div class='del'>-	val = ad_read(devc, regoffs);</div><div class='del'>-</div><div class='del'>-	if (muteregoffs != regoffs) {</div><div class='del'>-		muteval = ad_read(devc, muteregoffs);</div><div class='del'>-		change_bits(devc, &amp;val, &amp;muteval, dev, channel, value);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		change_bits(devc, &amp;val, &amp;val, dev, channel, value);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	ad_write(devc, regoffs, val);</div><div class='del'>-	devc-&gt;saved_regs[regoffs] = val;</div><div class='del'>-	if (muteregoffs != regoffs) {</div><div class='del'>-		ad_write(devc, muteregoffs, muteval);</div><div class='del'>-		devc-&gt;saved_regs[muteregoffs] = muteval;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_mixer_set(ad1848_info * devc, int dev, int value)</div><div class='del'>-{</div><div class='del'>-	int left = value &amp; 0x000000ff;</div><div class='del'>-	int right = (value &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-	int retvol;</div><div class='del'>-</div><div class='del'>-	if (dev &gt; 31)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(devc-&gt;supported_devices &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev = devc-&gt;mixer_reroute[dev];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;mix_devices[dev][LEFT_CHN].nbits == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (left &gt; 100)</div><div class='del'>-		left = 100;</div><div class='del'>-	if (right &gt; 100)</div><div class='del'>-		right = 100;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;mix_devices[dev][RIGHT_CHN].nbits == 0)	/* Mono control */</div><div class='del'>-		right = left;</div><div class='del'>-</div><div class='del'>-	retvol = left | (right &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-	/* Scale volumes */</div><div class='del'>-	left = mix_cvt[left];</div><div class='del'>-	right = mix_cvt[right];</div><div class='del'>-</div><div class='del'>-	devc-&gt;levels[dev] = retvol;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the left channel</div><div class='del'>-	 */</div><div class='del'>-	ad1848_mixer_set_channel(devc, dev, left, LEFT_CHN);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the right channel</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;mix_devices[dev][RIGHT_CHN].nbits == 0)</div><div class='del'>-		goto out;</div><div class='del'>-	ad1848_mixer_set_channel(devc, dev, right, RIGHT_CHN);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	return retvol;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_mixer_reset(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char name[32];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	devc-&gt;mix_devices = &amp;(ad1848_mix_devices[0]);</div><div class='del'>-</div><div class='del'>-	sprintf(name, "%s_%d", devc-&gt;chip_name, nr_ad1848_devs);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 32; i++)</div><div class='del'>-		devc-&gt;mixer_reroute[i] = i;</div><div class='del'>-</div><div class='del'>-	devc-&gt;supported_rec_devices = MODE1_REC_DEVICES;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MD_4231:</div><div class='del'>-		case MD_4231A:</div><div class='del'>-		case MD_1845:</div><div class='del'>-		case MD_1845_SSCAPE:</div><div class='del'>-			devc-&gt;supported_devices = MODE2_MIXER_DEVICES;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MD_C930:</div><div class='del'>-			devc-&gt;supported_devices = C930_MIXER_DEVICES;</div><div class='del'>-			devc-&gt;mix_devices = &amp;(c930_mix_devices[0]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MD_IWAVE:</div><div class='del'>-			devc-&gt;supported_devices = MODE3_MIXER_DEVICES;</div><div class='del'>-			devc-&gt;mix_devices = &amp;(iwave_mix_devices[0]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MD_42xB:</div><div class='del'>-		case MD_4239:</div><div class='del'>-			devc-&gt;mix_devices = &amp;(cs42xb_mix_devices[0]);</div><div class='del'>-			devc-&gt;supported_devices = MODE3_MIXER_DEVICES;</div><div class='del'>-			break;</div><div class='del'>-		case MD_4232:</div><div class='del'>-		case MD_4235:</div><div class='del'>-		case MD_4236:</div><div class='del'>-			devc-&gt;supported_devices = MODE3_MIXER_DEVICES;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MD_1848:</div><div class='del'>-			if (soundpro) {</div><div class='del'>-				devc-&gt;supported_devices = SPRO_MIXER_DEVICES;</div><div class='del'>-				devc-&gt;supported_rec_devices = SPRO_REC_DEVICES;</div><div class='del'>-				devc-&gt;mix_devices = &amp;(spro_mix_devices[0]);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			devc-&gt;supported_devices = MODE1_MIXER_DEVICES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;orig_devices = devc-&gt;supported_devices;</div><div class='del'>-	devc-&gt;orig_rec_devices = devc-&gt;supported_rec_devices;</div><div class='del'>-</div><div class='del'>-	devc-&gt;levels = load_mixer_volumes(name, default_mixer_levels, 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;supported_devices &amp; (1 &lt;&lt; i))</div><div class='del'>-			ad1848_mixer_set(devc, i, devc-&gt;levels[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ad1848_set_recmask(devc, SOUND_MASK_MIC);</div><div class='del'>-	</div><div class='del'>-	devc-&gt;mixer_output_port = devc-&gt;levels[31] | AUDIO_HEADPHONE | AUDIO_LINE_OUT;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	if (!soundpro) {</div><div class='del'>-		if (devc-&gt;mixer_output_port &amp; AUDIO_SPEAKER)</div><div class='del'>-			ad_write(devc, 26, ad_read(devc, 26) &amp; ~0x40);	/* Unmute mono out */</div><div class='del'>-		else</div><div class='del'>-			ad_write(devc, 26, ad_read(devc, 26) | 0x40);	/* Mute mono out */</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * From the "wouldn't it be nice if the mixer API had (better)</div><div class='del'>-		 * support for custom stuff" category</div><div class='del'>-		 */</div><div class='del'>-		/* Enable surround mode and SB16 mixer */</div><div class='del'>-		ad_write(devc, 16, 0x60);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	ad1848_info *devc = mixer_devs[dev]-&gt;devc;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE1) </div><div class='del'>-	{</div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (val != 0xffff) </div><div class='del'>-		{</div><div class='del'>-			unsigned long flags;</div><div class='del'>-			val &amp;= (AUDIO_SPEAKER | AUDIO_HEADPHONE | AUDIO_LINE_OUT);</div><div class='del'>-			devc-&gt;mixer_output_port = val;</div><div class='del'>-			val |= AUDIO_HEADPHONE | AUDIO_LINE_OUT;	/* Always on */</div><div class='del'>-			devc-&gt;mixer_output_port = val;</div><div class='del'>-			spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-			if (val &amp; AUDIO_SPEAKER)</div><div class='del'>-				ad_write(devc, 26, ad_read(devc, 26) &amp; ~0x40);	/* Unmute mono out */</div><div class='del'>-			else</div><div class='del'>-				ad_write(devc, 26, ad_read(devc, 26) | 0x40);		/* Mute mono out */</div><div class='del'>-			spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		}</div><div class='del'>-		val = devc-&gt;mixer_output_port;</div><div class='del'>-		return put_user(val, (int __user *)arg);</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE2)</div><div class='del'>-	{</div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return(ad1848_control(AD1848_MIXER_REROUTE, val));</div><div class='del'>-	}</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) == 'M') </div><div class='del'>-	{</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE)</div><div class='del'>-		{</div><div class='del'>-			switch (cmd &amp; 0xff) </div><div class='del'>-			{</div><div class='del'>-				case SOUND_MIXER_RECSRC:</div><div class='del'>-					if (get_user(val, (int __user *)arg))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					val = ad1848_set_recmask(devc, val);</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				default:</div><div class='del'>-					if (get_user(val, (int __user *)arg))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					val = ad1848_mixer_set(devc, cmd &amp; 0xff, val);</div><div class='del'>-					break;</div><div class='del'>-			} </div><div class='del'>-			return put_user(val, (int __user *)arg);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			switch (cmd &amp; 0xff) </div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * Return parameters</div><div class='del'>-				 */</div><div class='del'>-			    </div><div class='del'>-				case SOUND_MIXER_RECSRC:</div><div class='del'>-					val = devc-&gt;recmask;</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				case SOUND_MIXER_DEVMASK:</div><div class='del'>-					val = devc-&gt;supported_devices;</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				case SOUND_MIXER_STEREODEVS:</div><div class='del'>-					val = devc-&gt;supported_devices;</div><div class='del'>-					if (devc-&gt;model != MD_C930)</div><div class='del'>-						val &amp;= ~(SOUND_MASK_SPEAKER | SOUND_MASK_IMIX);</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				case SOUND_MIXER_RECMASK:</div><div class='del'>-					val = devc-&gt;supported_rec_devices;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case SOUND_MIXER_CAPS:</div><div class='del'>-					val=SOUND_CAP_EXCL_INPUT;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					val = ad1848_mixer_get(devc, cmd &amp; 0xff);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			return put_user(val, (int __user *)arg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_set_speed(int dev, int arg)</div><div class='del'>-{</div><div class='del'>-	ad1848_info *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The sampling speed is encoded in the least significant nibble of I8. The</div><div class='del'>-	 * LSB selects the clock source (0=24.576 MHz, 1=16.9344 MHz) and other</div><div class='del'>-	 * three bits select the divisor (indirectly):</div><div class='del'>-	 *</div><div class='del'>-	 * The available speeds are in the following table. Keep the speeds in</div><div class='del'>-	 * the increasing order.</div><div class='del'>-	 */</div><div class='del'>-	typedef struct</div><div class='del'>-	{</div><div class='del'>-		int             speed;</div><div class='del'>-		unsigned char   bits;</div><div class='del'>-	}</div><div class='del'>-	speed_struct;</div><div class='del'>-</div><div class='del'>-	static speed_struct speed_table[] =</div><div class='del'>-	{</div><div class='del'>-		{5510, (0 &lt;&lt; 1) | 1},</div><div class='del'>-		{5510, (0 &lt;&lt; 1) | 1},</div><div class='del'>-		{6620, (7 &lt;&lt; 1) | 1},</div><div class='del'>-		{8000, (0 &lt;&lt; 1) | 0},</div><div class='del'>-		{9600, (7 &lt;&lt; 1) | 0},</div><div class='del'>-		{11025, (1 &lt;&lt; 1) | 1},</div><div class='del'>-		{16000, (1 &lt;&lt; 1) | 0},</div><div class='del'>-		{18900, (2 &lt;&lt; 1) | 1},</div><div class='del'>-		{22050, (3 &lt;&lt; 1) | 1},</div><div class='del'>-		{27420, (2 &lt;&lt; 1) | 0},</div><div class='del'>-		{32000, (3 &lt;&lt; 1) | 0},</div><div class='del'>-		{33075, (6 &lt;&lt; 1) | 1},</div><div class='del'>-		{37800, (4 &lt;&lt; 1) | 1},</div><div class='del'>-		{44100, (5 &lt;&lt; 1) | 1},</div><div class='del'>-		{48000, (6 &lt;&lt; 1) | 0}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	int i, n, selected = -1;</div><div class='del'>-</div><div class='del'>-	n = sizeof(speed_table) / sizeof(speed_struct);</div><div class='del'>-</div><div class='del'>-	if (arg &lt;= 0)</div><div class='del'>-		return portc-&gt;speed;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1845 || devc-&gt;model == MD_1845_SSCAPE)	/* AD1845 has different timer than others */</div><div class='del'>-	{</div><div class='del'>-		if (arg &lt; 4000)</div><div class='del'>-			arg = 4000;</div><div class='del'>-		if (arg &gt; 50000)</div><div class='del'>-			arg = 50000;</div><div class='del'>-</div><div class='del'>-		portc-&gt;speed = arg;</div><div class='del'>-		portc-&gt;speed_bits = speed_table[3].bits;</div><div class='del'>-		return portc-&gt;speed;</div><div class='del'>-	}</div><div class='del'>-	if (arg &lt; speed_table[0].speed)</div><div class='del'>-		selected = 0;</div><div class='del'>-	if (arg &gt; speed_table[n - 1].speed)</div><div class='del'>-		selected = n - 1;</div><div class='del'>-</div><div class='del'>-	for (i = 1 /*really */ ; selected == -1 &amp;&amp; i &lt; n; i++)</div><div class='del'>-	{</div><div class='del'>-		if (speed_table[i].speed == arg)</div><div class='del'>-			selected = i;</div><div class='del'>-		else if (speed_table[i].speed &gt; arg)</div><div class='del'>-		{</div><div class='del'>-			int diff1, diff2;</div><div class='del'>-</div><div class='del'>-			diff1 = arg - speed_table[i - 1].speed;</div><div class='del'>-			diff2 = speed_table[i].speed - arg;</div><div class='del'>-</div><div class='del'>-			if (diff1 &lt; diff2)</div><div class='del'>-				selected = i - 1;</div><div class='del'>-			else</div><div class='del'>-				selected = i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (selected == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "ad1848: Can't find speed???\n");</div><div class='del'>-		selected = 3;</div><div class='del'>-	}</div><div class='del'>-	portc-&gt;speed = speed_table[selected].speed;</div><div class='del'>-	portc-&gt;speed_bits = speed_table[selected].bits;</div><div class='del'>-	return portc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short ad1848_set_channels(int dev, short arg)</div><div class='del'>-{</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	if (arg != 1 &amp;&amp; arg != 2)</div><div class='del'>-		return portc-&gt;channels;</div><div class='del'>-</div><div class='del'>-	portc-&gt;channels = arg;</div><div class='del'>-	return arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int ad1848_set_bits(int dev, unsigned int arg)</div><div class='del'>-{</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	static struct format_tbl</div><div class='del'>-	{</div><div class='del'>-		  int             format;</div><div class='del'>-		  unsigned char   bits;</div><div class='del'>-	}</div><div class='del'>-	format2bits[] =</div><div class='del'>-	{</div><div class='del'>-		{</div><div class='del'>-			0, 0</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_MU_LAW, 1</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_A_LAW, 3</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_IMA_ADPCM, 5</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_U8, 0</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_S16_LE, 2</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_S16_BE, 6</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_S8, 0</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_U16_LE, 0</div><div class='del'>-		}</div><div class='del'>-		,</div><div class='del'>-		{</div><div class='del'>-			AFMT_U16_BE, 0</div><div class='del'>-		}</div><div class='del'>-	};</div><div class='del'>-	int i, n = sizeof(format2bits) / sizeof(struct format_tbl);</div><div class='del'>-</div><div class='del'>-	if (arg == 0)</div><div class='del'>-		return portc-&gt;audio_format;</div><div class='del'>-</div><div class='del'>-	if (!(arg &amp; ad_format_mask[devc-&gt;model]))</div><div class='del'>-		arg = AFMT_U8;</div><div class='del'>-</div><div class='del'>-	portc-&gt;audio_format = arg;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++)</div><div class='del'>-		if (format2bits[i].format == arg)</div><div class='del'>-		{</div><div class='del'>-			if ((portc-&gt;format_bits = format2bits[i].bits) == 0)</div><div class='del'>-				return portc-&gt;audio_format = AFMT_U8;		/* Was not supported */</div><div class='del'>-</div><div class='del'>-			return arg;</div><div class='del'>-		}</div><div class='del'>-	/* Still hanging here. Something must be terribly wrong */</div><div class='del'>-	portc-&gt;format_bits = 0;</div><div class='del'>-	return portc-&gt;audio_format = AFMT_U8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver ad1848_audio_driver =</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= ad1848_open,</div><div class='del'>-	.close			= ad1848_close,</div><div class='del'>-	.output_block		= ad1848_output_block,</div><div class='del'>-	.start_input		= ad1848_start_input,</div><div class='del'>-	.prepare_for_input	= ad1848_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= ad1848_prepare_for_output,</div><div class='del'>-	.halt_io		= ad1848_halt,</div><div class='del'>-	.halt_input		= ad1848_halt_input,</div><div class='del'>-	.halt_output		= ad1848_halt_output,</div><div class='del'>-	.trigger		= ad1848_trigger,</div><div class='del'>-	.set_speed		= ad1848_set_speed,</div><div class='del'>-	.set_bits		= ad1848_set_bits,</div><div class='del'>-	.set_channels		= ad1848_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mixer_operations ad1848_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "SOUNDPORT",</div><div class='del'>-	.name	= "AD1848/CS4248/CS4231",</div><div class='del'>-	.ioctl	= ad1848_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad1848_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	ad1848_info    *devc;</div><div class='del'>-	ad1848_port_info *portc;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_audiodevs)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	/* here we don't have to protect against intr */</div><div class='del'>-	spin_lock(&amp;devc-&gt;lock);</div><div class='del'>-	if (portc-&gt;open_mode || (devc-&gt;open_mode &amp; mode))</div><div class='del'>-	{</div><div class='del'>-		spin_unlock(&amp;devc-&gt;lock);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;dual_dma = 0;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;dual_dma = 1;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	devc-&gt;audio_mode = 0;</div><div class='del'>-	devc-&gt;open_mode |= mode;</div><div class='del'>-	portc-&gt;open_mode = mode;</div><div class='del'>-	spin_unlock(&amp;devc-&gt;lock);</div><div class='del'>-	ad1848_trigger(dev, 0);</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_READ)</div><div class='del'>-		devc-&gt;record_dev = dev;</div><div class='del'>-	if (mode &amp; OPEN_WRITE)</div><div class='del'>-		devc-&gt;playback_dev = dev;</div><div class='del'>-/*</div><div class='del'>- * Mute output until the playback really starts. This decreases clicking (hope so).</div><div class='del'>- */</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	ad_mute(devc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_close(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	DEB(printk("ad1848_close(void)\n"));</div><div class='del'>-</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	ad1848_halt(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode = 0;</div><div class='del'>-	devc-&gt;open_mode &amp;= ~portc-&gt;open_mode;</div><div class='del'>-	portc-&gt;open_mode = 0;</div><div class='del'>-</div><div class='del'>-	ad_unmute(devc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_output_block(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags, cnt;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;audio_format == AFMT_IMA_ADPCM)</div><div class='del'>-	{</div><div class='del'>-		cnt /= 4;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (portc-&gt;audio_format &amp; (AFMT_S16_LE | AFMT_S16_BE))	/* 16 bit data */</div><div class='del'>-			cnt &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-	cnt--;</div><div class='del'>-</div><div class='del'>-	if ((devc-&gt;audio_mode &amp; PCM_ENABLE_OUTPUT) &amp;&amp; (audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE) &amp;&amp;</div><div class='del'>-	    intrflag &amp;&amp;</div><div class='del'>-	    cnt == devc-&gt;xfer_count)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;audio_mode |= PCM_ENABLE_OUTPUT;</div><div class='del'>-		devc-&gt;intr_active = 1;</div><div class='del'>-		return;	/*</div><div class='del'>-			 * Auto DMA mode on. No need to react</div><div class='del'>-			 */</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	ad_write(devc, 15, (unsigned char) (cnt &amp; 0xff));</div><div class='del'>-	ad_write(devc, 14, (unsigned char) ((cnt &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = cnt;</div><div class='del'>-	devc-&gt;audio_mode |= PCM_ENABLE_OUTPUT;</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_start_input(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags, cnt;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-	if (portc-&gt;audio_format == AFMT_IMA_ADPCM)</div><div class='del'>-	{</div><div class='del'>-		cnt /= 4;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (portc-&gt;audio_format &amp; (AFMT_S16_LE | AFMT_S16_BE))	/* 16 bit data */</div><div class='del'>-			cnt &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-	cnt--;</div><div class='del'>-</div><div class='del'>-	if ((devc-&gt;audio_mode &amp; PCM_ENABLE_INPUT) &amp;&amp; (audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE) &amp;&amp;</div><div class='del'>-		intrflag &amp;&amp;</div><div class='del'>-		cnt == devc-&gt;xfer_count)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;audio_mode |= PCM_ENABLE_INPUT;</div><div class='del'>-		devc-&gt;intr_active = 1;</div><div class='del'>-		return;	/*</div><div class='del'>-			 * Auto DMA mode on. No need to react</div><div class='del'>-			 */</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1848)</div><div class='del'>-	{</div><div class='del'>-		  ad_write(devc, 15, (unsigned char) (cnt &amp; 0xff));</div><div class='del'>-		  ad_write(devc, 14, (unsigned char) ((cnt &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		  ad_write(devc, 31, (unsigned char) (cnt &amp; 0xff));</div><div class='del'>-		  ad_write(devc, 30, (unsigned char) ((cnt &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ad_unmute(devc);</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = cnt;</div><div class='del'>-	devc-&gt;audio_mode |= PCM_ENABLE_INPUT;</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	int             timeout;</div><div class='del'>-	unsigned char   fs, old_fs, tmp = 0;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	ad_mute(devc);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	fs = portc-&gt;speed_bits | (portc-&gt;format_bits &lt;&lt; 5);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		fs |= 0x10;</div><div class='del'>-</div><div class='del'>-	ad_enter_MCE(devc);	/* Enables changes to the format select reg */</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1845 || devc-&gt;model == MD_1845_SSCAPE) /* Use alternate speed select registers */</div><div class='del'>-	{</div><div class='del'>-		fs &amp;= 0xf0;	/* Mask off the rate select bits */</div><div class='del'>-</div><div class='del'>-		ad_write(devc, 22, (portc-&gt;speed &gt;&gt; 8) &amp; 0xff);	/* Speed MSB */</div><div class='del'>-		ad_write(devc, 23, portc-&gt;speed &amp; 0xff);	/* Speed LSB */</div><div class='del'>-	}</div><div class='del'>-	old_fs = ad_read(devc, 8);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_4232 || devc-&gt;model &gt;= MD_4236)</div><div class='del'>-	{</div><div class='del'>-		tmp = ad_read(devc, 16);</div><div class='del'>-		ad_write(devc, 16, tmp | 0x30);</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;model == MD_IWAVE)</div><div class='del'>-		ad_write(devc, 17, 0xc2);	/* Disable variable frequency select */</div><div class='del'>-</div><div class='del'>-	ad_write(devc, 8, fs);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write to I8 starts resynchronization. Wait until it completes.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	timeout = 0;</div><div class='del'>-	while (timeout &lt; 100 &amp;&amp; inb(devc-&gt;base) != 0x80)</div><div class='del'>-		timeout++;</div><div class='del'>-	timeout = 0;</div><div class='del'>-	while (timeout &lt; 10000 &amp;&amp; inb(devc-&gt;base) == 0x80)</div><div class='del'>-		timeout++;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model &gt;= MD_4232)</div><div class='del'>-		ad_write(devc, 16, tmp &amp; ~0x30);</div><div class='del'>-</div><div class='del'>-	ad_leave_MCE(devc);	/*</div><div class='del'>-				 * Starts the calibration process.</div><div class='del'>-				 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-	devc-&gt;xfer_count = 0;</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-	if (dev == timer_installed &amp;&amp; devc-&gt;timer_running)</div><div class='del'>-		if ((fs &amp; 0x01) != (old_fs &amp; 0x01))</div><div class='del'>-		{</div><div class='del'>-			ad1848_tmr_reprogram(dev);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	ad1848_halt_output(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1848_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	int timeout;</div><div class='del'>-	unsigned char fs, old_fs, tmp = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	ad1848_info *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;audio_mode)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	fs = portc-&gt;speed_bits | (portc-&gt;format_bits &lt;&lt; 5);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		fs |= 0x10;</div><div class='del'>-</div><div class='del'>-	ad_enter_MCE(devc);	/* Enables changes to the format select reg */</div><div class='del'>-</div><div class='del'>-	if ((devc-&gt;model == MD_1845) || (devc-&gt;model == MD_1845_SSCAPE))	/* Use alternate speed select registers */</div><div class='del'>-	{</div><div class='del'>-		fs &amp;= 0xf0;	/* Mask off the rate select bits */</div><div class='del'>-</div><div class='del'>-		ad_write(devc, 22, (portc-&gt;speed &gt;&gt; 8) &amp; 0xff);	/* Speed MSB */</div><div class='del'>-		ad_write(devc, 23, portc-&gt;speed &amp; 0xff);	/* Speed LSB */</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;model == MD_4232)</div><div class='del'>-	{</div><div class='del'>-		tmp = ad_read(devc, 16);</div><div class='del'>-		ad_write(devc, 16, tmp | 0x30);</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;model == MD_IWAVE)</div><div class='del'>-		ad_write(devc, 17, 0xc2);	/* Disable variable frequency select */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If mode &gt;= 2 (CS4231), set I28. It's the capture format register.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	if (devc-&gt;model != MD_1848)</div><div class='del'>-	{</div><div class='del'>-		old_fs = ad_read(devc, 28);</div><div class='del'>-		ad_write(devc, 28, fs);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Write to I28 starts resynchronization. Wait until it completes.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		timeout = 0;</div><div class='del'>-		while (timeout &lt; 100 &amp;&amp; inb(devc-&gt;base) != 0x80)</div><div class='del'>-			timeout++;</div><div class='del'>-</div><div class='del'>-		timeout = 0;</div><div class='del'>-		while (timeout &lt; 10000 &amp;&amp; inb(devc-&gt;base) == 0x80)</div><div class='del'>-			timeout++;</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model != MD_1848 &amp;&amp; devc-&gt;model != MD_1845 &amp;&amp; devc-&gt;model != MD_1845_SSCAPE)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 * CS4231 compatible devices don't have separate sampling rate selection</div><div class='del'>-			 * register for recording an playback. The I8 register is shared so we have to</div><div class='del'>-			 * set the speed encoding bits of it too.</div><div class='del'>-			 */</div><div class='del'>-			unsigned char   tmp = portc-&gt;speed_bits | (ad_read(devc, 8) &amp; 0xf0);</div><div class='del'>-</div><div class='del'>-			ad_write(devc, 8, tmp);</div><div class='del'>-			/*</div><div class='del'>-			 * Write to I8 starts resynchronization. Wait until it completes.</div><div class='del'>-			 */</div><div class='del'>-			timeout = 0;</div><div class='del'>-			while (timeout &lt; 100 &amp;&amp; inb(devc-&gt;base) != 0x80)</div><div class='del'>-				timeout++;</div><div class='del'>-</div><div class='del'>-			timeout = 0;</div><div class='del'>-			while (timeout &lt; 10000 &amp;&amp; inb(devc-&gt;base) == 0x80)</div><div class='del'>-				timeout++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{			/* For AD1848 set I8. */</div><div class='del'>-</div><div class='del'>-		old_fs = ad_read(devc, 8);</div><div class='del'>-		ad_write(devc, 8, fs);</div><div class='del'>-		/*</div><div class='del'>-		 * Write to I8 starts resynchronization. Wait until it completes.</div><div class='del'>-		 */</div><div class='del'>-		timeout = 0;</div><div class='del'>-		while (timeout &lt; 100 &amp;&amp; inb(devc-&gt;base) != 0x80)</div><div class='del'>-			timeout++;</div><div class='del'>-		timeout = 0;</div><div class='del'>-		while (timeout &lt; 10000 &amp;&amp; inb(devc-&gt;base) == 0x80)</div><div class='del'>-			timeout++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_4232)</div><div class='del'>-		ad_write(devc, 16, tmp &amp; ~0x30);</div><div class='del'>-</div><div class='del'>-	ad_leave_MCE(devc);	/*</div><div class='del'>-				 * Starts the calibration process.</div><div class='del'>-				 */</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-	devc-&gt;xfer_count = 0;</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-	if (dev == timer_installed &amp;&amp; devc-&gt;timer_running)</div><div class='del'>-	{</div><div class='del'>-		if ((fs &amp; 0x01) != (old_fs &amp; 0x01))</div><div class='del'>-		{</div><div class='del'>-			ad1848_tmr_reprogram(dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	ad1848_halt_input(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_halt(int dev)</div><div class='del'>-{</div><div class='del'>-	ad1848_info *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	unsigned char   bits = ad_read(devc, 9);</div><div class='del'>-</div><div class='del'>-	if (bits &amp; 0x01 &amp;&amp; (portc-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-		ad1848_halt_output(dev);</div><div class='del'>-</div><div class='del'>-	if (bits &amp; 0x02 &amp;&amp; (portc-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-		ad1848_halt_input(dev);</div><div class='del'>-	devc-&gt;audio_mode = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_halt_input(int dev)</div><div class='del'>-{</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	if (!(ad_read(devc, 9) &amp; 0x02))</div><div class='del'>-		return;		/* Capture not enabled */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	ad_mute(devc);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		int             tmout;</div><div class='del'>-		</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-		        disable_dma(audio_devs[dev]-&gt;dmap_in-&gt;dma);</div><div class='del'>-</div><div class='del'>-		for (tmout = 0; tmout &lt; 100000; tmout++)</div><div class='del'>-			if (ad_read(devc, 11) &amp; 0x10)</div><div class='del'>-				break;</div><div class='del'>-		ad_write(devc, 9, ad_read(devc, 9) &amp; ~0x02);	/* Stop capture */</div><div class='del'>-</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-		        enable_dma(audio_devs[dev]-&gt;dmap_in-&gt;dma);</div><div class='del'>-		devc-&gt;audio_mode &amp;= ~PCM_ENABLE_INPUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outb(0, io_Status(devc));	/* Clear interrupt status */</div><div class='del'>-	outb(0, io_Status(devc));	/* Clear interrupt status */</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_INPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_halt_output(int dev)</div><div class='del'>-{</div><div class='del'>-	ad1848_info *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!(ad_read(devc, 9) &amp; 0x01))</div><div class='del'>-		return;		/* Playback not enabled */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	ad_mute(devc);</div><div class='del'>-	{</div><div class='del'>-		int             tmout;</div><div class='del'>-</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-		        disable_dma(audio_devs[dev]-&gt;dmap_out-&gt;dma);</div><div class='del'>-</div><div class='del'>-		for (tmout = 0; tmout &lt; 100000; tmout++)</div><div class='del'>-			if (ad_read(devc, 11) &amp; 0x10)</div><div class='del'>-				break;</div><div class='del'>-		ad_write(devc, 9, ad_read(devc, 9) &amp; ~0x01);	/* Stop playback */</div><div class='del'>-</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-		       enable_dma(audio_devs[dev]-&gt;dmap_out-&gt;dma);</div><div class='del'>-</div><div class='del'>-		devc-&gt;audio_mode &amp;= ~PCM_ENABLE_OUTPUT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outb((0), io_Status(devc));	/* Clear interrupt status */</div><div class='del'>-	outb((0), io_Status(devc));	/* Clear interrupt status */</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_trigger(int dev, int state)</div><div class='del'>-{</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	unsigned char   tmp, old;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	state &amp;= devc-&gt;audio_mode;</div><div class='del'>-</div><div class='del'>-	tmp = old = ad_read(devc, 9);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		  if (state &amp; PCM_ENABLE_INPUT)</div><div class='del'>-			  tmp |= 0x02;</div><div class='del'>-		  else</div><div class='del'>-			  tmp &amp;= ~0x02;</div><div class='del'>-	}</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-	{</div><div class='del'>-		if (state &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-			tmp |= 0x01;</div><div class='del'>-		else</div><div class='del'>-			tmp &amp;= ~0x01;</div><div class='del'>-	}</div><div class='del'>-	/* ad_mute(devc); */</div><div class='del'>-	if (tmp != old)</div><div class='del'>-	{</div><div class='del'>-		  ad_write(devc, 9, tmp);</div><div class='del'>-		  ad_unmute(devc);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_init_hw(ad1848_info * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int *init_values;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initial values for the indirect registers of CS4248/AD1848.</div><div class='del'>-	 */</div><div class='del'>-	static int      init_values_a[] =</div><div class='del'>-	{</div><div class='del'>-		0xa8, 0xa8, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00,</div><div class='del'>-		0x00, 0x0c, 0x02, 0x00, 0x8a, 0x01, 0x00, 0x00,</div><div class='del'>-</div><div class='del'>-	/* Positions 16 to 31 just for CS4231/2 and ad1845 */</div><div class='del'>-		0x80, 0x00, 0x10, 0x10, 0x00, 0x00, 0x1f, 0x40,</div><div class='del'>-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static int      init_values_b[] =</div><div class='del'>-	{</div><div class='del'>-		/* </div><div class='del'>-		   Values for the newer chips</div><div class='del'>-		   Some of the register initialization values were changed. In</div><div class='del'>-		   order to get rid of the click that preceded PCM playback,</div><div class='del'>-		   calibration was disabled on the 10th byte. On that same byte,</div><div class='del'>-		   dual DMA was enabled; on the 11th byte, ADC dithering was</div><div class='del'>-		   enabled, since that is theoretically desirable; on the 13th</div><div class='del'>-		   byte, Mode 3 was selected, to enable access to extended</div><div class='del'>-		   registers.</div><div class='del'>-		 */</div><div class='del'>-		0xa8, 0xa8, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00,</div><div class='del'>-		0x00, 0x00, 0x06, 0x00, 0xe0, 0x01, 0x00, 0x00,</div><div class='del'>- 		0x80, 0x00, 0x10, 0x10, 0x00, 0x00, 0x1f, 0x40,</div><div class='del'>- 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Select initialisation data</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	init_values = init_values_a;</div><div class='del'>-	if(devc-&gt;model &gt;= MD_4236)</div><div class='del'>-		init_values = init_values_b;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-		ad_write(devc, i, init_values[i]);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	ad_mute(devc);		/* Initialize some variables */</div><div class='del'>-	ad_unmute(devc);	/* Leave it unmuted now */</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model &gt; MD_1848)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;model == MD_1845_SSCAPE)</div><div class='del'>-			ad_write(devc, 12, ad_read(devc, 12) | 0x50);</div><div class='del'>-		else </div><div class='del'>-			ad_write(devc, 12, ad_read(devc, 12) | 0x40);		/* Mode2 = enabled */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model == MD_IWAVE)</div><div class='del'>-			ad_write(devc, 12, 0x6c);	/* Select codec mode 3 */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model != MD_1845_SSCAPE)</div><div class='del'>-			for (i = 16; i &lt; 32; i++)</div><div class='del'>-				ad_write(devc, i, init_values[i]);</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model == MD_IWAVE)</div><div class='del'>-			ad_write(devc, 16, 0x30);	/* Playback and capture counters enabled */</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;model &gt; MD_1848)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;audio_flags &amp; DMA_DUPLEX)</div><div class='del'>-			ad_write(devc, 9, ad_read(devc, 9) &amp; ~0x04);	/* Dual DMA mode */</div><div class='del'>-		else</div><div class='del'>-			ad_write(devc, 9, ad_read(devc, 9) | 0x04);	/* Single DMA mode */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model == MD_1845 || devc-&gt;model == MD_1845_SSCAPE)</div><div class='del'>-			ad_write(devc, 27, ad_read(devc, 27) | 0x08);		/* Alternate freq select enabled */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;model == MD_IWAVE)</div><div class='del'>-		{		/* Some magic Interwave specific initialization */</div><div class='del'>-			ad_write(devc, 12, 0x6c);	/* Select codec mode 3 */</div><div class='del'>-			ad_write(devc, 16, 0x30);	/* Playback and capture counters enabled */</div><div class='del'>-			ad_write(devc, 17, 0xc2);	/* Alternate feature enable */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		  devc-&gt;audio_flags &amp;= ~DMA_DUPLEX;</div><div class='del'>-		  ad_write(devc, 9, ad_read(devc, 9) | 0x04);	/* Single DMA mode */</div><div class='del'>-		  if (soundpro)</div><div class='del'>-			  ad_write(devc, 12, ad_read(devc, 12) | 0x40);	/* Mode2 = enabled */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outb((0), io_Status(devc));	/* Clear pending interrupts */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Toggle the MCE bit. It completes the initialization phase.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ad_enter_MCE(devc);	/* In case the bit was off */</div><div class='del'>-	ad_leave_MCE(devc);</div><div class='del'>-</div><div class='del'>-	ad1848_mixer_reset(devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ad1848_detect(struct resource *ports, int *ad_flags, int *osp)</div><div class='del'>-{</div><div class='del'>-	unsigned char tmp;</div><div class='del'>-	ad1848_info *devc = &amp;adev_info[nr_ad1848_devs];</div><div class='del'>-	unsigned char tmp1 = 0xff, tmp2 = 0xff;</div><div class='del'>-	int optiC930 = 0;	/* OPTi 82C930 flag */</div><div class='del'>-	int interwave = 0;</div><div class='del'>-	int ad1847_flag = 0;</div><div class='del'>-	int cs4248_flag = 0;</div><div class='del'>-	int sscape_flag = 0;</div><div class='del'>-	int io_base = ports-&gt;start;</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect(%x)\n", io_base));</div><div class='del'>-</div><div class='del'>-	if (ad_flags)</div><div class='del'>-	{</div><div class='del'>-		if (*ad_flags == 0x12345678)</div><div class='del'>-		{</div><div class='del'>-			interwave = 1;</div><div class='del'>-			*ad_flags = 0;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*ad_flags == 0x87654321)</div><div class='del'>-		{</div><div class='del'>-			sscape_flag = 1;</div><div class='del'>-			*ad_flags = 0;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*ad_flags == 0x12345677)</div><div class='del'>-		{</div><div class='del'>-		    cs4248_flag = 1;</div><div class='del'>-		    *ad_flags = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nr_ad1848_devs &gt;= MAX_AUDIO_DEV)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "ad1848 - Too many audio devices\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;lock);</div><div class='del'>-	devc-&gt;base = io_base;</div><div class='del'>-	devc-&gt;irq_ok = 0;</div><div class='del'>-	devc-&gt;timer_running = 0;</div><div class='del'>-	devc-&gt;MCE_bit = 0x40;</div><div class='del'>-	devc-&gt;irq = 0;</div><div class='del'>-	devc-&gt;open_mode = 0;</div><div class='del'>-	devc-&gt;chip_name = devc-&gt;name = "AD1848";</div><div class='del'>-	devc-&gt;model = MD_1848;	/* AD1848 or CS4248 */</div><div class='del'>-	devc-&gt;levels = NULL;</div><div class='del'>-	devc-&gt;debug_flag = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check that the I/O address is in use.</div><div class='del'>-	 *</div><div class='del'>-	 * The bit 0x80 of the base I/O port is known to be 0 after the</div><div class='del'>-	 * chip has performed its power on initialization. Just assume</div><div class='del'>-	 * this has happened before the OS is starting.</div><div class='del'>-	 *</div><div class='del'>-	 * If the I/O address is unused, it typically returns 0xff.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (inb(devc-&gt;base) == 0xff)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("ad1848_detect: The base I/O address appears to be dead\n"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for the device to stop initialization</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	DDB(printk("ad1848_detect() - step 0\n"));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 10000000; i++)</div><div class='del'>-	{</div><div class='del'>-		unsigned char   x = inb(devc-&gt;base);</div><div class='del'>-</div><div class='del'>-		if (x == 0xff || !(x &amp; 0x80))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step A\n"));</div><div class='del'>-</div><div class='del'>-	if (inb(devc-&gt;base) == 0x80)	/* Not ready. Let's wait */</div><div class='del'>-		ad_leave_MCE(devc);</div><div class='del'>-</div><div class='del'>-	if ((inb(devc-&gt;base) &amp; 0x80) != 0x00)	/* Not a AD1848 */</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("ad1848 detect error - step A (%02x)\n", (int) inb(devc-&gt;base)));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Test if it's possible to change contents of the indirect registers.</div><div class='del'>-	 * Registers 0 and 1 are ADC volume registers. The bit 0x10 is read only</div><div class='del'>-	 * so try to avoid using it.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step B\n"));</div><div class='del'>-	ad_write(devc, 0, 0xaa);</div><div class='del'>-	ad_write(devc, 1, 0x45);	/* 0x55 with bit 0x10 clear */</div><div class='del'>-</div><div class='del'>-	if ((tmp1 = ad_read(devc, 0)) != 0xaa || (tmp2 = ad_read(devc, 1)) != 0x45)</div><div class='del'>-	{</div><div class='del'>-		if (tmp2 == 0x65)	/* AD1847 has couple of bits hardcoded to 1 */</div><div class='del'>-			ad1847_flag = 1;</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			DDB(printk("ad1848 detect error - step B (%x/%x)\n", tmp1, tmp2));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	DDB(printk("ad1848_detect() - step C\n"));</div><div class='del'>-	ad_write(devc, 0, 0x45);</div><div class='del'>-	ad_write(devc, 1, 0xaa);</div><div class='del'>-</div><div class='del'>-	if ((tmp1 = ad_read(devc, 0)) != 0x45 || (tmp2 = ad_read(devc, 1)) != 0xaa)</div><div class='del'>-	{</div><div class='del'>-		if (tmp2 == 0x8a)	/* AD1847 has few bits hardcoded to 1 */</div><div class='del'>-			ad1847_flag = 1;</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			DDB(printk("ad1848 detect error - step C (%x/%x)\n", tmp1, tmp2));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The indirect register I12 has some read only bits. Let's</div><div class='del'>-	 * try to change them.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step D\n"));</div><div class='del'>-	tmp = ad_read(devc, 12);</div><div class='del'>-	ad_write(devc, 12, (~tmp) &amp; 0x0f);</div><div class='del'>-</div><div class='del'>-	if ((tmp &amp; 0x0f) != ((tmp1 = ad_read(devc, 12)) &amp; 0x0f))</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("ad1848 detect error - step D (%x)\n", tmp1));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! Last 4 bits of the reg I12 tell the chip revision.</div><div class='del'>-	 *   0x01=RevB and 0x0A=RevC.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The original AD1848/CS4248 has just 15 indirect registers. This means</div><div class='del'>-	 * that I0 and I16 should return the same value (etc.).</div><div class='del'>-	 * However this doesn't work with CS4248. Actually it seems to be impossible</div><div class='del'>-	 * to detect if the chip is a CS4231 or CS4248.</div><div class='del'>-	 * Ensure that the Mode2 enable bit of I12 is 0. Otherwise this test fails</div><div class='del'>-	 * with CS4231.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * OPTi 82C930 has mode2 control bit in another place. This test will fail</div><div class='del'>-	 * with it. Accept this situation as a possible indication of this chip.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step F\n"));</div><div class='del'>-	ad_write(devc, 12, 0);	/* Mode2=disabled */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++)</div><div class='del'>-	{</div><div class='del'>-		if ((tmp1 = ad_read(devc, i)) != (tmp2 = ad_read(devc, i + 16)))</div><div class='del'>-		{</div><div class='del'>-			DDB(printk("ad1848 detect step F(%d/%x/%x) - OPTi chip???\n", i, tmp1, tmp2));</div><div class='del'>-			if (!ad1847_flag)</div><div class='del'>-				optiC930 = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Try to switch the chip to mode2 (CS4231) by setting the MODE2 bit (0x40).</div><div class='del'>-	 * The bit 0x80 is always 1 in CS4248 and CS4231.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step G\n"));</div><div class='del'>-</div><div class='del'>-	if (ad_flags &amp;&amp; *ad_flags == 400)</div><div class='del'>-		*ad_flags = 0;</div><div class='del'>-	else</div><div class='del'>-		ad_write(devc, 12, 0x40);	/* Set mode2, clear 0x80 */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (ad_flags)</div><div class='del'>-		*ad_flags = 0;</div><div class='del'>-</div><div class='del'>-	tmp1 = ad_read(devc, 12);</div><div class='del'>-	if (tmp1 &amp; 0x80)</div><div class='del'>-	{</div><div class='del'>-		if (ad_flags)</div><div class='del'>-			*ad_flags |= AD_F_CS4248;</div><div class='del'>-</div><div class='del'>-		devc-&gt;chip_name = "CS4248";	/* Our best knowledge just now */</div><div class='del'>-	}</div><div class='del'>-	if (optiC930 || (tmp1 &amp; 0xc0) == (0x80 | 0x40))</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 *      CS4231 detected - is it?</div><div class='del'>-		 *</div><div class='del'>-		 *      Verify that setting I0 doesn't change I16.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		DDB(printk("ad1848_detect() - step H\n"));</div><div class='del'>-		ad_write(devc, 16, 0);	/* Set I16 to known value */</div><div class='del'>-</div><div class='del'>-		ad_write(devc, 0, 0x45);</div><div class='del'>-		if ((tmp1 = ad_read(devc, 16)) != 0x45)	/* No change -&gt; CS4231? */</div><div class='del'>-		{</div><div class='del'>-			ad_write(devc, 0, 0xaa);</div><div class='del'>-			if ((tmp1 = ad_read(devc, 16)) == 0xaa)	/* Rotten bits? */</div><div class='del'>-			{</div><div class='del'>-				DDB(printk("ad1848 detect error - step H(%x)\n", tmp1));</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/*</div><div class='del'>-			 * Verify that some bits of I25 are read only.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			DDB(printk("ad1848_detect() - step I\n"));</div><div class='del'>-			tmp1 = ad_read(devc, 25);	/* Original bits */</div><div class='del'>-			ad_write(devc, 25, ~tmp1);	/* Invert all bits */</div><div class='del'>-			if ((ad_read(devc, 25) &amp; 0xe7) == (tmp1 &amp; 0xe7))</div><div class='del'>-			{</div><div class='del'>-				int id;</div><div class='del'>-</div><div class='del'>-				/*</div><div class='del'>-				 *      It's at least CS4231</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				devc-&gt;chip_name = "CS4231";</div><div class='del'>-				devc-&gt;model = MD_4231;</div><div class='del'>-				</div><div class='del'>-				/*</div><div class='del'>-				 * It could be an AD1845 or CS4231A as well.</div><div class='del'>-				 * CS4231 and AD1845 report the same revision info in I25</div><div class='del'>-				 * while the CS4231A reports different.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				id = ad_read(devc, 25);</div><div class='del'>-				if ((id &amp; 0xe7) == 0x80)	/* Device busy??? */</div><div class='del'>-					id = ad_read(devc, 25);</div><div class='del'>-				if ((id &amp; 0xe7) == 0x80)	/* Device still busy??? */</div><div class='del'>-					id = ad_read(devc, 25);</div><div class='del'>-				DDB(printk("ad1848_detect() - step J (%02x/%02x)\n", id, ad_read(devc, 25)));</div><div class='del'>-</div><div class='del'>-                                if ((id &amp; 0xe7) == 0x80) {</div><div class='del'>-					/* </div><div class='del'>-					 * It must be a CS4231 or AD1845. The register I23 of</div><div class='del'>-					 * CS4231 is undefined and it appears to be read only.</div><div class='del'>-					 * AD1845 uses I23 for setting sample rate. Assume</div><div class='del'>-					 * the chip is AD1845 if I23 is changeable.</div><div class='del'>-					 */</div><div class='del'>-</div><div class='del'>-					unsigned char   tmp = ad_read(devc, 23);</div><div class='del'>-					ad_write(devc, 23, ~tmp);</div><div class='del'>-</div><div class='del'>-					if (interwave)</div><div class='del'>-					{</div><div class='del'>-						devc-&gt;model = MD_IWAVE;</div><div class='del'>-						devc-&gt;chip_name = "IWave";</div><div class='del'>-					}</div><div class='del'>-					else if (ad_read(devc, 23) != tmp)	/* AD1845 ? */</div><div class='del'>-					{</div><div class='del'>-						devc-&gt;chip_name = "AD1845";</div><div class='del'>-						devc-&gt;model = MD_1845;</div><div class='del'>-					}</div><div class='del'>-					else if (cs4248_flag)</div><div class='del'>-					{</div><div class='del'>-						if (ad_flags)</div><div class='del'>-							  *ad_flags |= AD_F_CS4248;</div><div class='del'>-						devc-&gt;chip_name = "CS4248";</div><div class='del'>-						devc-&gt;model = MD_1848;</div><div class='del'>-						ad_write(devc, 12, ad_read(devc, 12) &amp; ~0x40);	/* Mode2 off */</div><div class='del'>-					}</div><div class='del'>-					ad_write(devc, 23, tmp);	/* Restore */</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					switch (id &amp; 0x1f) {</div><div class='del'>-					case 3: /* CS4236/CS4235/CS42xB/CS4239 */</div><div class='del'>-						{</div><div class='del'>-							int xid;</div><div class='del'>-							ad_write(devc, 12, ad_read(devc, 12) | 0x60); /* switch to mode 3 */</div><div class='del'>-							ad_write(devc, 23, 0x9c); /* select extended register 25 */</div><div class='del'>-							xid = inb(io_Indexed_Data(devc));</div><div class='del'>-							ad_write(devc, 12, ad_read(devc, 12) &amp; ~0x60); /* back to mode 0 */</div><div class='del'>-							switch (xid &amp; 0x1f)</div><div class='del'>-							{</div><div class='del'>-								case 0x00:</div><div class='del'>-									devc-&gt;chip_name = "CS4237B(B)";</div><div class='del'>-									devc-&gt;model = MD_42xB;</div><div class='del'>-									break;</div><div class='del'>-								case 0x08:</div><div class='del'>-									/* Seems to be a 4238 ?? */</div><div class='del'>-									devc-&gt;chip_name = "CS4238";</div><div class='del'>-									devc-&gt;model = MD_42xB;</div><div class='del'>-									break;</div><div class='del'>-								case 0x09:</div><div class='del'>-									devc-&gt;chip_name = "CS4238B";</div><div class='del'>-									devc-&gt;model = MD_42xB;</div><div class='del'>-									break;</div><div class='del'>-								case 0x0b:</div><div class='del'>-									devc-&gt;chip_name = "CS4236B";</div><div class='del'>-									devc-&gt;model = MD_4236;</div><div class='del'>-									break;</div><div class='del'>-								case 0x10:</div><div class='del'>-									devc-&gt;chip_name = "CS4237B";</div><div class='del'>-									devc-&gt;model = MD_42xB;</div><div class='del'>-									break;</div><div class='del'>-								case 0x1d:</div><div class='del'>-									devc-&gt;chip_name = "CS4235";</div><div class='del'>-									devc-&gt;model = MD_4235;</div><div class='del'>-									break;</div><div class='del'>-								case 0x1e:</div><div class='del'>-									devc-&gt;chip_name = "CS4239";</div><div class='del'>-									devc-&gt;model = MD_4239;</div><div class='del'>-									break;</div><div class='del'>-								default:</div><div class='del'>-									printk("Chip ident is %X.\n", xid&amp;0x1F);</div><div class='del'>-									devc-&gt;chip_name = "CS42xx";</div><div class='del'>-									devc-&gt;model = MD_4232;</div><div class='del'>-									break;</div><div class='del'>-							}</div><div class='del'>-						}</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					case 2: /* CS4232/CS4232A */</div><div class='del'>-						devc-&gt;chip_name = "CS4232";</div><div class='del'>-						devc-&gt;model = MD_4232;</div><div class='del'>-						break;</div><div class='del'>-				</div><div class='del'>-					case 0:</div><div class='del'>-						if ((id &amp; 0xe0) == 0xa0)</div><div class='del'>-						{</div><div class='del'>-							devc-&gt;chip_name = "CS4231A";</div><div class='del'>-							devc-&gt;model = MD_4231A;</div><div class='del'>-						}</div><div class='del'>-						else</div><div class='del'>-						{</div><div class='del'>-							devc-&gt;chip_name = "CS4321";</div><div class='del'>-							devc-&gt;model = MD_4231;</div><div class='del'>-						}</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					default: /* maybe */</div><div class='del'>-						DDB(printk("ad1848: I25 = %02x/%02x\n", ad_read(devc, 25), ad_read(devc, 25) &amp; 0xe7));</div><div class='del'>-                                                if (optiC930)</div><div class='del'>-                                                {</div><div class='del'>-                                                        devc-&gt;chip_name = "82C930";</div><div class='del'>-                                                        devc-&gt;model = MD_C930;</div><div class='del'>-                                                }</div><div class='del'>-						else</div><div class='del'>-						{</div><div class='del'>-							devc-&gt;chip_name = "CS4231";</div><div class='del'>-							devc-&gt;model = MD_4231;</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			ad_write(devc, 25, tmp1);	/* Restore bits */</div><div class='del'>-</div><div class='del'>-			DDB(printk("ad1848_detect() - step K\n"));</div><div class='del'>-		}</div><div class='del'>-	} else if (tmp1 == 0x0a) {</div><div class='del'>-		/*</div><div class='del'>-		 * Is it perhaps a SoundPro CMI8330?</div><div class='del'>-		 * If so, then we should be able to change indirect registers</div><div class='del'>-		 * greater than I15 after activating MODE2, even though reading</div><div class='del'>-		 * back I12 does not show it.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Let's try comparing register values</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; 16; i++) {</div><div class='del'>-			if ((tmp1 = ad_read(devc, i)) != (tmp2 = ad_read(devc, i + 16))) {</div><div class='del'>-				DDB(printk("ad1848 detect step H(%d/%x/%x) - SoundPro chip?\n", i, tmp1, tmp2));</div><div class='del'>-				soundpro = 1;</div><div class='del'>-				devc-&gt;chip_name = "SoundPro CMI 8330";</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DDB(printk("ad1848_detect() - step L\n"));</div><div class='del'>-	if (ad_flags)</div><div class='del'>-	{</div><div class='del'>-		  if (devc-&gt;model != MD_1848)</div><div class='del'>-			  *ad_flags |= AD_F_CS4231;</div><div class='del'>-	}</div><div class='del'>-	DDB(printk("ad1848_detect() - Detected OK\n"));</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1848 &amp;&amp; ad1847_flag)</div><div class='del'>-		devc-&gt;chip_name = "AD1847";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (sscape_flag == 1)</div><div class='del'>-		devc-&gt;model = MD_1845_SSCAPE;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback,</div><div class='del'>-		int dma_capture, int share_dma, int *osp, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! If irq &lt; 0, there is another driver which has allocated the IRQ</div><div class='del'>-	 *   so that this driver doesn't need to allocate/deallocate it.</div><div class='del'>-	 *   The actually used IRQ is ABS(irq).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	int my_dev;</div><div class='del'>-	char dev_name[100];</div><div class='del'>-	int e;</div><div class='del'>-</div><div class='del'>-	ad1848_info  *devc = &amp;adev_info[nr_ad1848_devs];</div><div class='del'>-</div><div class='del'>-	ad1848_port_info *portc = NULL;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq = (irq &gt; 0) ? irq : 0;</div><div class='del'>-	devc-&gt;open_mode = 0;</div><div class='del'>-	devc-&gt;timer_ticks = 0;</div><div class='del'>-	devc-&gt;dma1 = dma_playback;</div><div class='del'>-	devc-&gt;dma2 = dma_capture;</div><div class='del'>-	devc-&gt;subtype = cfg.card_subtype;</div><div class='del'>-	devc-&gt;audio_flags = DMA_AUTOMODE;</div><div class='del'>-	devc-&gt;playback_dev = devc-&gt;record_dev = 0;</div><div class='del'>-	if (name != NULL)</div><div class='del'>-		devc-&gt;name = name;</div><div class='del'>-</div><div class='del'>-	if (name != NULL &amp;&amp; name[0] != 0)</div><div class='del'>-		sprintf(dev_name,</div><div class='del'>-			"%s (%s)", name, devc-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		sprintf(dev_name,</div><div class='del'>-			"Generic audio codec (%s)", devc-&gt;chip_name);</div><div class='del'>-</div><div class='del'>-	rename_region(ports, devc-&gt;name);</div><div class='del'>-</div><div class='del'>-	conf_printf2(dev_name, devc-&gt;base, devc-&gt;irq, dma_playback, dma_capture);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1848 || devc-&gt;model == MD_C930)</div><div class='del'>-		devc-&gt;audio_flags |= DMA_HARDSTOP;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model &gt; MD_1848)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;dma1 == devc-&gt;dma2 || devc-&gt;dma2 == -1 || devc-&gt;dma1 == -1)</div><div class='del'>-			devc-&gt;audio_flags &amp;= ~DMA_DUPLEX;</div><div class='del'>-		else</div><div class='del'>-			devc-&gt;audio_flags |= DMA_DUPLEX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	portc = kmalloc(sizeof(ad1848_port_info), GFP_KERNEL);</div><div class='del'>-	if(portc==NULL) {</div><div class='del'>-		release_region(devc-&gt;base, 4);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((my_dev = sound_install_audiodrv(AUDIO_DRIVER_VERSION,</div><div class='del'>-					     dev_name,</div><div class='del'>-					     &amp;ad1848_audio_driver,</div><div class='del'>-					     sizeof(struct audio_driver),</div><div class='del'>-					     devc-&gt;audio_flags,</div><div class='del'>-					     ad_format_mask[devc-&gt;model],</div><div class='del'>-					     devc,</div><div class='del'>-					     dma_playback,</div><div class='del'>-					     dma_capture)) &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		release_region(devc-&gt;base, 4);</div><div class='del'>-		kfree(portc);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	audio_devs[my_dev]-&gt;portc = portc;</div><div class='del'>-	audio_devs[my_dev]-&gt;mixer_dev = -1;</div><div class='del'>-	if (owner)</div><div class='del'>-		audio_devs[my_dev]-&gt;d-&gt;owner = owner;</div><div class='del'>-	memset((char *) portc, 0, sizeof(*portc));</div><div class='del'>-</div><div class='del'>-	nr_ad1848_devs++;</div><div class='del'>-</div><div class='del'>-	ad1848_init_hw(devc);</div><div class='del'>-</div><div class='del'>-	if (irq &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;dev_no = my_dev;</div><div class='del'>-		if (request_irq(devc-&gt;irq, adintr, 0, devc-&gt;name,</div><div class='del'>-				(void *)(long)my_dev) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "ad1848: Unable to allocate IRQ\n");</div><div class='del'>-			/* Don't free it either then.. */</div><div class='del'>-			devc-&gt;irq = 0;</div><div class='del'>-		}</div><div class='del'>-		if (capabilities[devc-&gt;model].flags &amp; CAP_F_TIMER)</div><div class='del'>-		{</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-			int x;</div><div class='del'>-			unsigned char tmp = ad_read(devc, 16);</div><div class='del'>-#endif			</div><div class='del'>-</div><div class='del'>-			devc-&gt;timer_ticks = 0;</div><div class='del'>-</div><div class='del'>-			ad_write(devc, 21, 0x00);	/* Timer MSB */</div><div class='del'>-			ad_write(devc, 20, 0x10);	/* Timer LSB */</div><div class='del'>-#ifndef CONFIG_SMP</div><div class='del'>-			ad_write(devc, 16, tmp | 0x40);	/* Enable timer */</div><div class='del'>-			for (x = 0; x &lt; 100000 &amp;&amp; devc-&gt;timer_ticks == 0; x++);</div><div class='del'>-			ad_write(devc, 16, tmp &amp; ~0x40);	/* Disable timer */</div><div class='del'>-</div><div class='del'>-			if (devc-&gt;timer_ticks == 0)</div><div class='del'>-				printk(KERN_WARNING "ad1848: Interrupt test failed (IRQ%d)\n", irq);</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				DDB(printk("Interrupt test OK\n"));</div><div class='del'>-				devc-&gt;irq_ok = 1;</div><div class='del'>-			}</div><div class='del'>-#else</div><div class='del'>-			devc-&gt;irq_ok = 1;</div><div class='del'>-#endif			</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			devc-&gt;irq_ok = 1;	/* Couldn't test. assume it's OK */</div><div class='del'>-	} else if (irq &lt; 0)</div><div class='del'>-		irq2dev[-irq] = devc-&gt;dev_no = my_dev;</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-	if ((capabilities[devc-&gt;model].flags &amp; CAP_F_TIMER) &amp;&amp;</div><div class='del'>-	    devc-&gt;irq_ok)</div><div class='del'>-		ad1848_tmr_install(my_dev);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!share_dma)</div><div class='del'>-	{</div><div class='del'>-		if (sound_alloc_dma(dma_playback, devc-&gt;name))</div><div class='del'>-			printk(KERN_WARNING "ad1848.c: Can't allocate DMA%d\n", dma_playback);</div><div class='del'>-</div><div class='del'>-		if (dma_capture != dma_playback)</div><div class='del'>-			if (sound_alloc_dma(dma_capture, devc-&gt;name))</div><div class='del'>-				printk(KERN_WARNING "ad1848.c: Can't allocate DMA%d\n", dma_capture);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((e = sound_install_mixer(MIXER_DRIVER_VERSION,</div><div class='del'>-				     dev_name,</div><div class='del'>-				     &amp;ad1848_mixer_operations,</div><div class='del'>-				     sizeof(struct mixer_operations),</div><div class='del'>-				     devc)) &gt;= 0)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[my_dev]-&gt;mixer_dev = e;</div><div class='del'>-		if (owner)</div><div class='del'>-			mixer_devs[e]-&gt;owner = owner;</div><div class='del'>-	}</div><div class='del'>-	return my_dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ad1848_control(int cmd, int arg)</div><div class='del'>-{</div><div class='del'>-	ad1848_info *devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (nr_ad1848_devs &lt; 1)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	devc = &amp;adev_info[nr_ad1848_devs - 1];</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case AD1848_SET_XTAL:	/* Change clock frequency of AD1845 (only ) */</div><div class='del'>-			if (devc-&gt;model != MD_1845 &amp;&amp; devc-&gt;model != MD_1845_SSCAPE)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-			ad_enter_MCE(devc);</div><div class='del'>-			ad_write(devc, 29, (ad_read(devc, 29) &amp; 0x1f) | (arg &lt;&lt; 5));</div><div class='del'>-			ad_leave_MCE(devc);</div><div class='del'>-			spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case AD1848_MIXER_REROUTE:</div><div class='del'>-		{</div><div class='del'>-			int o = (arg &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			int n = arg &amp; 0xff;</div><div class='del'>-</div><div class='del'>-			if (o &lt; 0 || o &gt;= SOUND_MIXER_NRDEVICES)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			if (!(devc-&gt;supported_devices &amp; (1 &lt;&lt; o)) &amp;&amp;</div><div class='del'>-			    !(devc-&gt;supported_rec_devices &amp; (1 &lt;&lt; o)))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			if (n == SOUND_MIXER_NONE)</div><div class='del'>-			{	/* Just hide this control */</div><div class='del'>-				ad1848_mixer_set(devc, o, 0);	/* Shut up it */</div><div class='del'>-				devc-&gt;supported_devices &amp;= ~(1 &lt;&lt; o);</div><div class='del'>-				devc-&gt;supported_rec_devices &amp;= ~(1 &lt;&lt; o);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Make the mixer control identified by o to appear as n */</div><div class='del'>-			if (n &lt; 0 || n &gt;= SOUND_MIXER_NRDEVICES)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			devc-&gt;mixer_reroute[n] = o;	/* Rename the control */</div><div class='del'>-			if (devc-&gt;supported_devices &amp; (1 &lt;&lt; o))</div><div class='del'>-				devc-&gt;supported_devices |= (1 &lt;&lt; n);</div><div class='del'>-			if (devc-&gt;supported_rec_devices &amp; (1 &lt;&lt; o))</div><div class='del'>-				devc-&gt;supported_rec_devices |= (1 &lt;&lt; n);</div><div class='del'>-</div><div class='del'>-			devc-&gt;supported_devices &amp;= ~(1 &lt;&lt; o);</div><div class='del'>-			devc-&gt;supported_rec_devices &amp;= ~(1 &lt;&lt; o);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ad1848_unload(int io_base, int irq, int dma_playback, int dma_capture, int share_dma)</div><div class='del'>-{</div><div class='del'>-	int i, mixer, dev = 0;</div><div class='del'>-	ad1848_info *devc = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; devc == NULL &amp;&amp; i &lt; nr_ad1848_devs; i++)</div><div class='del'>-	{</div><div class='del'>-		if (adev_info[i].base == io_base)</div><div class='del'>-		{</div><div class='del'>-			devc = &amp;adev_info[i];</div><div class='del'>-			dev = devc-&gt;dev_no;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	if (devc != NULL)</div><div class='del'>-	{</div><div class='del'>-		kfree(audio_devs[dev]-&gt;portc);</div><div class='del'>-		release_region(devc-&gt;base, 4);</div><div class='del'>-</div><div class='del'>-		if (!share_dma)</div><div class='del'>-		{</div><div class='del'>-			if (devc-&gt;irq &gt; 0) /* There is no point in freeing irq, if it wasn't allocated */</div><div class='del'>-				free_irq(devc-&gt;irq, (void *)(long)devc-&gt;dev_no);</div><div class='del'>-</div><div class='del'>-			sound_free_dma(dma_playback);</div><div class='del'>-</div><div class='del'>-			if (dma_playback != dma_capture)</div><div class='del'>-				sound_free_dma(dma_capture);</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		mixer = audio_devs[devc-&gt;dev_no]-&gt;mixer_dev;</div><div class='del'>-		if(mixer&gt;=0)</div><div class='del'>-			sound_unload_mixerdev(mixer);</div><div class='del'>-</div><div class='del'>-		nr_ad1848_devs--;</div><div class='del'>-		for ( ; i &lt; nr_ad1848_devs ; i++)</div><div class='del'>-			adev_info[i] = adev_info[i+1];</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "ad1848: Can't find device to be unloaded. Base=%x\n", io_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t adintr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	unsigned char status;</div><div class='del'>-	ad1848_info *devc;</div><div class='del'>-	int dev;</div><div class='del'>-	int alt_stat = 0xff;</div><div class='del'>-	unsigned char c930_stat = 0;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-</div><div class='del'>-	dev = (long)dev_id;</div><div class='del'>-	devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-interrupt_again:		/* Jump back here if int status doesn't reset */</div><div class='del'>-</div><div class='del'>-	status = inb(io_Status(devc));</div><div class='del'>-</div><div class='del'>-	if (status == 0x80)</div><div class='del'>-		printk(KERN_DEBUG "adintr: Why?\n");</div><div class='del'>-	if (devc-&gt;model == MD_1848)</div><div class='del'>-		outb((0), io_Status(devc));	/* Clear interrupt status */</div><div class='del'>-</div><div class='del'>-	if (status &amp; 0x01)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;model == MD_C930)</div><div class='del'>-		{		/* 82C930 has interrupt status register in MAD16 register MC11 */</div><div class='del'>-</div><div class='del'>-			spin_lock(&amp;devc-&gt;lock);</div><div class='del'>-</div><div class='del'>-			/* 0xe0e is C930 address port</div><div class='del'>-			 * 0xe0f is C930 data port</div><div class='del'>-			 */</div><div class='del'>-			outb(11, 0xe0e);</div><div class='del'>-			c930_stat = inb(0xe0f);</div><div class='del'>-			outb((~c930_stat), 0xe0f);</div><div class='del'>-</div><div class='del'>-			spin_unlock(&amp;devc-&gt;lock);</div><div class='del'>-</div><div class='del'>-			alt_stat = (c930_stat &lt;&lt; 2) &amp; 0x30;</div><div class='del'>-		}</div><div class='del'>-		else if (devc-&gt;model != MD_1848)</div><div class='del'>-		{</div><div class='del'>-			spin_lock(&amp;devc-&gt;lock);</div><div class='del'>-			alt_stat = ad_read(devc, 24);</div><div class='del'>-			ad_write(devc, 24, ad_read(devc, 24) &amp; ~alt_stat);	/* Selective ack */</div><div class='del'>-			spin_unlock(&amp;devc-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((devc-&gt;open_mode &amp; OPEN_READ) &amp;&amp; (devc-&gt;audio_mode &amp; PCM_ENABLE_INPUT) &amp;&amp; (alt_stat &amp; 0x20))</div><div class='del'>-		{</div><div class='del'>-			DMAbuf_inputintr(devc-&gt;record_dev);</div><div class='del'>-		}</div><div class='del'>-		if ((devc-&gt;open_mode &amp; OPEN_WRITE) &amp;&amp; (devc-&gt;audio_mode &amp; PCM_ENABLE_OUTPUT) &amp;&amp;</div><div class='del'>-		      (alt_stat &amp; 0x10))</div><div class='del'>-		{</div><div class='del'>-			DMAbuf_outputintr(devc-&gt;playback_dev, 1);</div><div class='del'>-		}</div><div class='del'>-		if (devc-&gt;model != MD_1848 &amp;&amp; (alt_stat &amp; 0x40))	/* Timer interrupt */</div><div class='del'>-		{</div><div class='del'>-			devc-&gt;timer_ticks++;</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-			if (timer_installed == dev &amp;&amp; devc-&gt;timer_running)</div><div class='del'>-				sound_timer_interrupt();</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-/*</div><div class='del'>- * Sometimes playback or capture interrupts occur while a timer interrupt</div><div class='del'>- * is being handled. The interrupt will not be retriggered if we don't</div><div class='del'>- * handle it now. Check if an interrupt is still pending and restart</div><div class='del'>- * the handler in this case.</div><div class='del'>- */</div><div class='del'>-	if (inb(io_Status(devc)) &amp; 0x01 &amp;&amp; cnt++ &lt; 4)</div><div class='del'>-	{</div><div class='del'>-		  goto interrupt_again;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Experimental initialization sequence for the integrated sound system</div><div class='del'>- *	of the Compaq Deskpro M.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int init_deskpro_m(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char   tmp;</div><div class='del'>-</div><div class='del'>-	if ((tmp = inb(0xc44)) == 0xff)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("init_deskpro_m: Dead port 0xc44\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outb(0x10, 0xc44);</div><div class='del'>-	outb(0x40, 0xc45);</div><div class='del'>-	outb(0x00, 0xc46);</div><div class='del'>-	outb(0xe8, 0xc47);</div><div class='del'>-	outb(0x14, 0xc44);</div><div class='del'>-	outb(0x40, 0xc45);</div><div class='del'>-	outb(0x00, 0xc46);</div><div class='del'>-	outb(0xe8, 0xc47);</div><div class='del'>-	outb(0x10, 0xc44);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Experimental initialization sequence for the integrated sound system</div><div class='del'>- *	of Compaq Deskpro XL.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int init_deskpro(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char   tmp;</div><div class='del'>-</div><div class='del'>-	if ((tmp = inb(0xc44)) == 0xff)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("init_deskpro: Dead port 0xc44\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank 1 */</div><div class='del'>-	if (inb(0xc44) != 0x04)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("init_deskpro: Invalid bank1 signature in port 0xc44\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * OK. It looks like a Deskpro so let's proceed.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I/O port 0xc44 Audio configuration register.</div><div class='del'>-	 *</div><div class='del'>-	 * bits 0xc0:   Audio revision bits</div><div class='del'>-	 *              0x00 = Compaq Business Audio</div><div class='del'>-	 *              0x40 = MS Sound System Compatible (reset default)</div><div class='del'>-	 *              0x80 = Reserved</div><div class='del'>-	 *              0xc0 = Reserved</div><div class='del'>-	 * bit 0x20:    No Wait State Enable</div><div class='del'>-	 *              0x00 = Disabled (reset default, DMA mode)</div><div class='del'>-	 *              0x20 = Enabled (programmed I/O mode)</div><div class='del'>-	 * bit 0x10:    MS Sound System Decode Enable</div><div class='del'>-	 *              0x00 = Decoding disabled (reset default)</div><div class='del'>-	 *              0x10 = Decoding enabled</div><div class='del'>-	 * bit 0x08:    FM Synthesis Decode Enable</div><div class='del'>-	 *              0x00 = Decoding Disabled (reset default)</div><div class='del'>-	 *              0x08 = Decoding enabled</div><div class='del'>-	 * bit 0x04     Bank select</div><div class='del'>-	 *              0x00 = Bank 0</div><div class='del'>-	 *              0x04 = Bank 1</div><div class='del'>-	 * bits 0x03    MSS Base address</div><div class='del'>-	 *              0x00 = 0x530 (reset default)</div><div class='del'>-	 *              0x01 = 0x604</div><div class='del'>-	 *              0x02 = 0xf40</div><div class='del'>-	 *              0x03 = 0xe80</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc44 (before): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);</div><div class='del'>-	printk("%02x ", inb(0xc44));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);</div><div class='del'>-	printk("%02x\n", inb(0xc44));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Set bank 1 of the register */</div><div class='del'>-	tmp = 0x58;		/* MSS Mode, MSS&amp;FM decode enabled */</div><div class='del'>-</div><div class='del'>-	switch (hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x530:</div><div class='del'>-			tmp |= 0x00;</div><div class='del'>-			break;</div><div class='del'>-		case 0x604:</div><div class='del'>-			tmp |= 0x01;</div><div class='del'>-			break;</div><div class='del'>-		case 0xf40:</div><div class='del'>-			tmp |= 0x02;</div><div class='del'>-			break;</div><div class='del'>-		case 0xe80:</div><div class='del'>-			tmp |= 0x03;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			DDB(printk("init_deskpro: Invalid MSS port %x\n", hw_config-&gt;io_base));</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Write to bank=0 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc44 (after): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc44));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc44));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I/O port 0xc45 FM Address Decode/MSS ID Register.</div><div class='del'>-	 *</div><div class='del'>-	 * bank=0, bits 0xfe:   FM synthesis Decode Compare bits 7:1 (default=0x88)</div><div class='del'>-	 * bank=0, bit 0x01:    SBIC Power Control Bit</div><div class='del'>-	 *                      0x00 = Powered up</div><div class='del'>-	 *                      0x01 = Powered down</div><div class='del'>-	 * bank=1, bits 0xfc:   MSS ID (default=0x40)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc45 (before): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc45));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc45));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	outb((0x88), 0xc45);	/* FM base 7:0 = 0x88 */</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	outb((0x10), 0xc45);	/* MSS ID = 0x10 (MSS port returns 0x04) */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc45 (after): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc45));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc45));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I/O port 0xc46 FM Address Decode/Address ASIC Revision Register.</div><div class='del'>-	 *</div><div class='del'>-	 * bank=0, bits 0xff:   FM synthesis Decode Compare bits 15:8 (default=0x03)</div><div class='del'>-	 * bank=1, bits 0xff:   Audio addressing ASIC id</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc46 (before): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc46));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc46));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	outb((0x03), 0xc46);	/* FM base 15:8 = 0x03 */</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	outb((0x11), 0xc46);	/* ASIC ID = 0x11 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc46 (after): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc46));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc46));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I/O port 0xc47 FM Address Decode Register.</div><div class='del'>-	 *</div><div class='del'>-	 * bank=0, bits 0xff:   Decode enable selection for various FM address bits</div><div class='del'>-	 * bank=1, bits 0xff:   Reserved</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc47 (before): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc47));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc47));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	outb((0x7c), 0xc47);	/* FM decode enable bits = 0x7c */</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	outb((0x00), 0xc47);	/* Reserved bank1 = 0x00 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	/* Debug printing */</div><div class='del'>-	printk("Port 0xc47 (after): ");</div><div class='del'>-	outb((tmp &amp; ~0x04), 0xc44);	/* Select bank=0 */</div><div class='del'>-	printk("%02x ", inb(0xc47));</div><div class='del'>-	outb((tmp | 0x04), 0xc44);	/* Select bank=1 */</div><div class='del'>-	printk("%02x\n", inb(0xc47));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * I/O port 0xc6f = Audio Disable Function Register</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	printk("Port 0xc6f (before) = %02x\n", inb(0xc6f));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	outb((0x80), 0xc6f);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUGXL</div><div class='del'>-	printk("Port 0xc6f (after) = %02x\n", inb(0xc6f));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int probe_ms_sound(struct address_info *hw_config, struct resource *ports)</div><div class='del'>-{</div><div class='del'>-	unsigned char   tmp;</div><div class='del'>-</div><div class='del'>-	DDB(printk("Entered probe_ms_sound(%x, %d)\n", hw_config-&gt;io_base, hw_config-&gt;card_subtype));</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;card_subtype == 1)	/* Has no IRQ/DMA registers */</div><div class='del'>-	{</div><div class='del'>-		/* check_opl3(0x388, hw_config); */</div><div class='del'>-		return ad1848_detect(ports, NULL, hw_config-&gt;osp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (deskpro_xl &amp;&amp; hw_config-&gt;card_subtype == 2)	/* Compaq Deskpro XL */</div><div class='del'>-	{</div><div class='del'>-		if (!init_deskpro(hw_config))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (deskpro_m)	/* Compaq Deskpro M */</div><div class='del'>-	{</div><div class='del'>-		if (!init_deskpro_m(hw_config))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	   * Check if the IO port returns valid signature. The original MS Sound</div><div class='del'>-	   * system returns 0x04 while some cards (AudioTrix Pro for example)</div><div class='del'>-	   * return 0x00 or 0x0f.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if ((tmp = inb(hw_config-&gt;io_base + 3)) == 0xff)	/* Bus float */</div><div class='del'>-	{</div><div class='del'>-		  int             ret;</div><div class='del'>-</div><div class='del'>-		  DDB(printk("I/O address is inactive (%x)\n", tmp));</div><div class='del'>-		  if (!(ret = ad1848_detect(ports, NULL, hw_config-&gt;osp)))</div><div class='del'>-			  return 0;</div><div class='del'>-		  return 1;</div><div class='del'>-	}</div><div class='del'>-	DDB(printk("MSS signature = %x\n", tmp &amp; 0x3f));</div><div class='del'>-	if ((tmp &amp; 0x3f) != 0x04 &amp;&amp;</div><div class='del'>-	    (tmp &amp; 0x3f) != 0x0f &amp;&amp;</div><div class='del'>-	    (tmp &amp; 0x3f) != 0x00)</div><div class='del'>-	{</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		MDB(printk(KERN_ERR "No MSS signature detected on port 0x%x (0x%x)\n", hw_config-&gt;io_base, (int) inb(hw_config-&gt;io_base + 3)));</div><div class='del'>-		DDB(printk("Trying to detect codec anyway but IRQ/DMA may not work\n"));</div><div class='del'>-		if (!(ret = ad1848_detect(ports, NULL, hw_config-&gt;osp)))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		hw_config-&gt;card_subtype = 1;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	if ((hw_config-&gt;irq != 5)  &amp;&amp;</div><div class='del'>-	    (hw_config-&gt;irq != 7)  &amp;&amp;</div><div class='del'>-	    (hw_config-&gt;irq != 9)  &amp;&amp;</div><div class='del'>-	    (hw_config-&gt;irq != 10) &amp;&amp;</div><div class='del'>-	    (hw_config-&gt;irq != 11) &amp;&amp;</div><div class='del'>-	    (hw_config-&gt;irq != 12))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "MSS: Bad IRQ %d\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;dma != 0 &amp;&amp; hw_config-&gt;dma != 1 &amp;&amp; hw_config-&gt;dma != 3)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_ERR "MSS: Bad DMA %d\n", hw_config-&gt;dma);</div><div class='del'>-		  return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Check that DMA0 is not in use with a 8 bit board.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;dma == 0 &amp;&amp; inb(hw_config-&gt;io_base + 3) &amp; 0x80)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "MSS: Can't use DMA0 with a 8 bit card/slot\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;irq &gt; 7 &amp;&amp; hw_config-&gt;irq != 9 &amp;&amp; inb(hw_config-&gt;io_base + 3) &amp; 0x80)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "MSS: Can't use IRQ%d with a 8 bit card/slot\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return ad1848_detect(ports, NULL, hw_config-&gt;osp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void attach_ms_sound(struct address_info *hw_config, struct resource *ports, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	static signed char interrupt_bits[12] =</div><div class='del'>-	{</div><div class='del'>-		-1, -1, -1, -1, -1, 0x00, -1, 0x08, -1, 0x10, 0x18, 0x20</div><div class='del'>-	};</div><div class='del'>-	signed char     bits;</div><div class='del'>-	char            dma2_bit = 0;</div><div class='del'>-</div><div class='del'>-	static char     dma_bits[4] =</div><div class='del'>-	{</div><div class='del'>-		1, 2, 0, 3</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	int config_port = hw_config-&gt;io_base + 0;</div><div class='del'>-	int version_port = hw_config-&gt;io_base + 3;</div><div class='del'>-	int dma = hw_config-&gt;dma;</div><div class='del'>-	int dma2 = hw_config-&gt;dma2;</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;card_subtype == 1)	/* Has no IRQ/DMA registers */</div><div class='del'>-	{</div><div class='del'>-		hw_config-&gt;slots[0] = ad1848_init("MS Sound System", ports,</div><div class='del'>-						    hw_config-&gt;irq,</div><div class='del'>-						    hw_config-&gt;dma,</div><div class='del'>-						    hw_config-&gt;dma2, 0, </div><div class='del'>-						    hw_config-&gt;osp,</div><div class='del'>-						    owner);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Set the IRQ and DMA addresses.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	bits = interrupt_bits[hw_config-&gt;irq];</div><div class='del'>-	if (bits == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "MSS: Bad IRQ %d\n", hw_config-&gt;irq);</div><div class='del'>-		release_region(ports-&gt;start, 4);</div><div class='del'>-		release_region(ports-&gt;start - 4, 4);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	outb((bits | 0x40), config_port);</div><div class='del'>-	if ((inb(version_port) &amp; 0x40) == 0)</div><div class='del'>-		printk(KERN_ERR "[MSS: IRQ Conflict?]\n");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle the capture DMA channel</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-	if (dma2 != -1 &amp;&amp; dma2 != dma)</div><div class='del'>-	{</div><div class='del'>-		if (!((dma == 0 &amp;&amp; dma2 == 1) ||</div><div class='del'>-			(dma == 1 &amp;&amp; dma2 == 0) ||</div><div class='del'>-			(dma == 3 &amp;&amp; dma2 == 0)))</div><div class='del'>-		{	/* Unsupported combination. Try to swap channels */</div><div class='del'>-			int tmp = dma;</div><div class='del'>-</div><div class='del'>-			dma = dma2;</div><div class='del'>-			dma2 = tmp;</div><div class='del'>-		}</div><div class='del'>-		if ((dma == 0 &amp;&amp; dma2 == 1) ||</div><div class='del'>-			(dma == 1 &amp;&amp; dma2 == 0) ||</div><div class='del'>-			(dma == 3 &amp;&amp; dma2 == 0))</div><div class='del'>-		{</div><div class='del'>-			dma2_bit = 0x04;	/* Enable capture DMA */</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "MSS: Invalid capture DMA\n");</div><div class='del'>-			dma2 = dma;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		dma2 = dma;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;dma = dma;</div><div class='del'>-	hw_config-&gt;dma2 = dma2;</div><div class='del'>-</div><div class='del'>-	outb((bits | dma_bits[dma] | dma2_bit), config_port);	/* Write IRQ+DMA setup */</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[0] = ad1848_init("MS Sound System", ports,</div><div class='del'>-					  hw_config-&gt;irq,</div><div class='del'>-					  dma, dma2, 0,</div><div class='del'>-					  hw_config-&gt;osp,</div><div class='del'>-					  THIS_MODULE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unload_ms_sound(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	ad1848_unload(hw_config-&gt;io_base + 4,</div><div class='del'>-		      hw_config-&gt;irq,</div><div class='del'>-		      hw_config-&gt;dma,</div><div class='del'>-		      hw_config-&gt;dma2, 0);</div><div class='del'>-	sound_unload_audiodev(hw_config-&gt;slots[0]);</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef EXCLUDE_TIMERS</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Timer stuff (for /dev/music).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned int current_interval;</div><div class='del'>-</div><div class='del'>-static unsigned int ad1848_tmr_start(int dev, unsigned int usecs)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long   xtal_nsecs;	/* nanoseconds per xtal oscillator tick */</div><div class='del'>-	unsigned long   divider;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Length of the timer interval (in nanoseconds) depends on the</div><div class='del'>-	 * selected crystal oscillator. Check this from bit 0x01 of I8.</div><div class='del'>-	 *</div><div class='del'>-	 * AD1845 has just one oscillator which has cycle time of 10.050 us</div><div class='del'>-	 * (when a 24.576 MHz xtal oscillator is used).</div><div class='del'>-	 *</div><div class='del'>-	 * Convert requested interval to nanoseconds before computing</div><div class='del'>-	 * the timer divider.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MD_1845 || devc-&gt;model == MD_1845_SSCAPE)</div><div class='del'>-		xtal_nsecs = 10050;</div><div class='del'>-	else if (ad_read(devc, 8) &amp; 0x01)</div><div class='del'>-		xtal_nsecs = 9920;</div><div class='del'>-	else</div><div class='del'>-		xtal_nsecs = 9969;</div><div class='del'>-</div><div class='del'>-	divider = (usecs * 1000 + xtal_nsecs / 2) / xtal_nsecs;</div><div class='del'>-</div><div class='del'>-	if (divider &lt; 100)	/* Don't allow shorter intervals than about 1ms */</div><div class='del'>-		divider = 100;</div><div class='del'>-</div><div class='del'>-	if (divider &gt; 65535)	/* Overflow check */</div><div class='del'>-		divider = 65535;</div><div class='del'>-</div><div class='del'>-	ad_write(devc, 21, (divider &gt;&gt; 8) &amp; 0xff);	/* Set upper bits */</div><div class='del'>-	ad_write(devc, 20, divider &amp; 0xff);	/* Set lower bits */</div><div class='del'>-	ad_write(devc, 16, ad_read(devc, 16) | 0x40);	/* Start the timer */</div><div class='del'>-	devc-&gt;timer_running = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	return current_interval = (divider * xtal_nsecs + 500) / 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_tmr_reprogram(int dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *    Audio driver has changed sampling rate so that a different xtal</div><div class='del'>-	 *      oscillator was selected. We have to reprogram the timer rate.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ad1848_tmr_start(dev, current_interval);</div><div class='del'>-	sound_timer_syncinterval(current_interval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_tmr_disable(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	ad_write(devc, 16, ad_read(devc, 16) &amp; ~0x40);</div><div class='del'>-	devc-&gt;timer_running = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1848_tmr_restart(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (current_interval == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	ad_write(devc, 16, ad_read(devc, 16) | 0x40);</div><div class='del'>-	devc-&gt;timer_running = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sound_lowlev_timer ad1848_tmr =</div><div class='del'>-{</div><div class='del'>-	0,</div><div class='del'>-	2,</div><div class='del'>-	ad1848_tmr_start,</div><div class='del'>-	ad1848_tmr_disable,</div><div class='del'>-	ad1848_tmr_restart</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad1848_tmr_install(int dev)</div><div class='del'>-{</div><div class='del'>-	if (timer_installed != -1)</div><div class='del'>-		return 0;	/* Don't install another timer */</div><div class='del'>-</div><div class='del'>-	timer_installed = ad1848_tmr.dev = dev;</div><div class='del'>-	sound_timer_init(&amp;ad1848_tmr, audio_devs[dev]-&gt;name);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-#endif /* EXCLUDE_TIMERS */</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(ad1848_detect);</div><div class='del'>-EXPORT_SYMBOL(ad1848_init);</div><div class='del'>-EXPORT_SYMBOL(ad1848_unload);</div><div class='del'>-EXPORT_SYMBOL(ad1848_control);</div><div class='del'>-EXPORT_SYMBOL(probe_ms_sound);</div><div class='del'>-EXPORT_SYMBOL(attach_ms_sound);</div><div class='del'>-EXPORT_SYMBOL(unload_ms_sound);</div><div class='del'>-</div><div class='del'>-static int __initdata io = -1;</div><div class='del'>-static int __initdata irq = -1;</div><div class='del'>-static int __initdata dma = -1;</div><div class='del'>-static int __initdata dma2 = -1;</div><div class='del'>-static int __initdata type = 0;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);		/* I/O for a raw AD1848 card */</div><div class='del'>-module_param(irq, int, 0);		/* IRQ to use */</div><div class='del'>-module_param(dma, int, 0);		/* First DMA channel */</div><div class='del'>-module_param(dma2, int, 0);		/* Second DMA channel */</div><div class='del'>-module_param(type, int, 0);		/* Card type */</div><div class='del'>-module_param(deskpro_xl, bool, 0);	/* Special magic for Deskpro XL boxen */</div><div class='del'>-module_param(deskpro_m, bool, 0);	/* Special magic for Deskpro M box */</div><div class='del'>-module_param(soundpro, bool, 0);	/* More special magic for SoundPro chips */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-module_param(isapnp, int, 0);</div><div class='del'>-module_param(isapnpjump, int, 0);</div><div class='del'>-module_param(reverse, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(isapnp,	"When set to 0, Plug &amp; Play support will be disabled");</div><div class='del'>-MODULE_PARM_DESC(isapnpjump,	"Jumps to a specific slot in the driver's PnP table. Use the source, Luke.");</div><div class='del'>-MODULE_PARM_DESC(reverse,	"When set to 1, will reverse ISAPnP search order");</div><div class='del'>-</div><div class='del'>-static struct pnp_dev	*ad1848_dev  = NULL;</div><div class='del'>-</div><div class='del'>-/* Please add new entries at the end of the table */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned short	card_vendor, card_device,</div><div class='del'>-			vendor, function;</div><div class='del'>-	short mss_io, irq, dma, dma2;   /* index into isapnp table */</div><div class='del'>-        int type;</div><div class='del'>-} ad1848_isapnp_list[] __initdata = {</div><div class='del'>-	{"CMI 8330 SoundPRO",</div><div class='del'>-		ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),</div><div class='del'>-		ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001),</div><div class='del'>-		0, 0, 0,-1, 0},</div><div class='del'>-        {"CS4232 based card",</div><div class='del'>-                ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('C','S','C'), ISAPNP_FUNCTION(0x0000),</div><div class='del'>-		0, 0, 0, 1, 0},</div><div class='del'>-        {"CS4232 based card",</div><div class='del'>-                ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('C','S','C'), ISAPNP_FUNCTION(0x0100),</div><div class='del'>-		0, 0, 0, 1, 0},</div><div class='del'>-        {"OPL3-SA2 WSS mode",</div><div class='del'>-        	ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('Y','M','H'), ISAPNP_FUNCTION(0x0021),</div><div class='del'>-                1, 0, 0, 1, 1},</div><div class='del'>-	{"Advanced Gravis InterWave Audio",</div><div class='del'>-		ISAPNP_VENDOR('G','R','V'), ISAPNP_DEVICE(0x0001),</div><div class='del'>-		ISAPNP_VENDOR('G','R','V'), ISAPNP_FUNCTION(0x0000),</div><div class='del'>-		0, 0, 0, 1, 0},</div><div class='del'>-	{NULL}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct isapnp_device_id id_table[] __devinitdata = {</div><div class='del'>-	{	ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001),</div><div class='del'>-		ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 },</div><div class='del'>-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('C','S','C'), ISAPNP_FUNCTION(0x0000), 0 },</div><div class='del'>-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('C','S','C'), ISAPNP_FUNCTION(0x0100), 0 },</div><div class='del'>-	/* The main driver for this card is opl3sa2</div><div class='del'>-        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,</div><div class='del'>-		ISAPNP_VENDOR('Y','M','H'), ISAPNP_FUNCTION(0x0021), 0 },</div><div class='del'>-	*/</div><div class='del'>-	{	ISAPNP_VENDOR('G','R','V'), ISAPNP_DEVICE(0x0001),</div><div class='del'>-		ISAPNP_VENDOR('G','R','V'), ISAPNP_FUNCTION(0x0000), 0 },</div><div class='del'>-	{0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(isapnp, id_table);</div><div class='del'>-</div><div class='del'>-static struct pnp_dev *activate_dev(char *devname, char *resname, struct pnp_dev *dev)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pnp_device_attach(dev);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return(NULL);</div><div class='del'>-</div><div class='del'>-	if((err = pnp_activate_dev(dev)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ad1848: %s %s config failed (out of resources?)[%d]\n", devname, resname, err);</div><div class='del'>-</div><div class='del'>-		pnp_device_detach(dev);</div><div class='del'>-</div><div class='del'>-		return(NULL);</div><div class='del'>-	}</div><div class='del'>-	audio_activated = 1;</div><div class='del'>-	return(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pnp_dev __init *ad1848_init_generic(struct pnp_card *bus,</div><div class='del'>-				struct address_info *hw_config, int slot)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/* Configure Audio device */</div><div class='del'>-	if((ad1848_dev = pnp_find_dev(bus, ad1848_isapnp_list[slot].vendor, ad1848_isapnp_list[slot].function, NULL)))</div><div class='del'>-	{</div><div class='del'>-		if((ad1848_dev = activate_dev(ad1848_isapnp_list[slot].name, "ad1848", ad1848_dev)))</div><div class='del'>-		{</div><div class='del'>-			hw_config-&gt;io_base 	= pnp_port_start(ad1848_dev, ad1848_isapnp_list[slot].mss_io);</div><div class='del'>-			hw_config-&gt;irq 		= pnp_irq(ad1848_dev, ad1848_isapnp_list[slot].irq);</div><div class='del'>-			hw_config-&gt;dma 		= pnp_dma(ad1848_dev, ad1848_isapnp_list[slot].dma);</div><div class='del'>-			if(ad1848_isapnp_list[slot].dma2 != -1)</div><div class='del'>-				hw_config-&gt;dma2 = pnp_dma(ad1848_dev, ad1848_isapnp_list[slot].dma2);</div><div class='del'>-			else</div><div class='del'>-				hw_config-&gt;dma2 = -1;</div><div class='del'>-                        hw_config-&gt;card_subtype = ad1848_isapnp_list[slot].type;</div><div class='del'>-		} else</div><div class='del'>-			return(NULL);</div><div class='del'>-	} else</div><div class='del'>-		return(NULL);</div><div class='del'>-</div><div class='del'>-	return(ad1848_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init ad1848_isapnp_init(struct address_info *hw_config, struct pnp_card *bus, int slot)</div><div class='del'>-{</div><div class='del'>-	char *busname = bus-&gt;name[0] ? bus-&gt;name : ad1848_isapnp_list[slot].name;</div><div class='del'>-</div><div class='del'>-	/* Initialize this baby. */</div><div class='del'>-</div><div class='del'>-	if(ad1848_init_generic(bus, hw_config, slot)) {</div><div class='del'>-		/* We got it. */</div><div class='del'>-</div><div class='del'>-		printk(KERN_NOTICE "ad1848: PnP reports '%s' at i/o %#x, irq %d, dma %d, %d\n",</div><div class='del'>-		       busname,</div><div class='del'>-		       hw_config-&gt;io_base, hw_config-&gt;irq, hw_config-&gt;dma,</div><div class='del'>-		       hw_config-&gt;dma2);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init ad1848_isapnp_probe(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	static int first = 1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Count entries in sb_isapnp_list */</div><div class='del'>-	for (i = 0; ad1848_isapnp_list[i].card_vendor != 0; i++);</div><div class='del'>-	i--;</div><div class='del'>-</div><div class='del'>-	/* Check and adjust isapnpjump */</div><div class='del'>-	if( isapnpjump &lt; 0 || isapnpjump &gt; i) {</div><div class='del'>-		isapnpjump = reverse ? i : 0;</div><div class='del'>-		printk(KERN_ERR "ad1848: Valid range for isapnpjump is 0-%d. Adjusted to %d.\n", i, isapnpjump);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(!first || !reverse)</div><div class='del'>-		i = isapnpjump;</div><div class='del'>-	first = 0;</div><div class='del'>-	while(ad1848_isapnp_list[i].card_vendor != 0) {</div><div class='del'>-		static struct pnp_card *bus = NULL;</div><div class='del'>-</div><div class='del'>-		while ((bus = pnp_find_card(</div><div class='del'>-				ad1848_isapnp_list[i].card_vendor,</div><div class='del'>-				ad1848_isapnp_list[i].card_device,</div><div class='del'>-				bus))) {</div><div class='del'>-</div><div class='del'>-			if(ad1848_isapnp_init(hw_config, bus, i)) {</div><div class='del'>-				isapnpjump = i; /* start next search from here */</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		i += reverse ? -1 : 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init init_ad1848(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "ad1848/cs4248 codec driver Copyright (C) by Hannu Savolainen 1993-1996\n");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-	if(isapnp &amp;&amp; (ad1848_isapnp_probe(&amp;cfg) &lt; 0) ) {</div><div class='del'>-		printk(KERN_NOTICE "ad1848: No ISAPnP cards found, trying standard ones...\n");</div><div class='del'>-		isapnp = 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if(io != -1) {</div><div class='del'>-		struct resource *ports;</div><div class='del'>-	        if( isapnp == 0 )</div><div class='del'>-	        {</div><div class='del'>-			if(irq == -1 || dma == -1) {</div><div class='del'>-				printk(KERN_WARNING "ad1848: must give I/O , IRQ and DMA.\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			cfg.irq = irq;</div><div class='del'>-			cfg.io_base = io;</div><div class='del'>-			cfg.dma = dma;</div><div class='del'>-			cfg.dma2 = dma2;</div><div class='del'>-			cfg.card_subtype = type;</div><div class='del'>-	        }</div><div class='del'>-</div><div class='del'>-		ports = request_region(io + 4, 4, "ad1848");</div><div class='del'>-</div><div class='del'>-		if (!ports)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		if (!request_region(io, 4, "WSS config")) {</div><div class='del'>-			release_region(io + 4, 4);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!probe_ms_sound(&amp;cfg, ports)) {</div><div class='del'>-			release_region(io + 4, 4);</div><div class='del'>-			release_region(io, 4);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		attach_ms_sound(&amp;cfg, ports, THIS_MODULE);</div><div class='del'>-		loaded = 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_ad1848(void)</div><div class='del'>-{</div><div class='del'>-	if(loaded)</div><div class='del'>-		unload_ms_sound(&amp;cfg);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-	if(ad1848_dev){</div><div class='del'>-		if(audio_activated)</div><div class='del'>-			pnp_device_detach(ad1848_dev);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_ad1848);</div><div class='del'>-module_exit(cleanup_ad1848);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_ad1848(char *str)</div><div class='del'>-{</div><div class='del'>-        /* io, irq, dma, dma2, type */</div><div class='del'>-	int ints[6];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	io	= ints[1];</div><div class='del'>-	irq	= ints[2];</div><div class='del'>-	dma	= ints[3];</div><div class='del'>-	dma2	= ints[4];</div><div class='del'>-	type	= ints[5];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("ad1848=", setup_ad1848);	</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/ad1848.h b/sound/oss/ad1848.h<br/>deleted file mode 100644<br/>index b95ebe28d426..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/ad1848.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#define AD_F_CS4231     0x0001  /* Returned if a CS4232 (or compatible) detected */</div><div class='del'>-#define AD_F_CS4248     0x0001  /* Returned if a CS4248 (or compatible) detected */</div><div class='del'>-</div><div class='del'>-#define         AD1848_SET_XTAL         1</div><div class='del'>-#define         AD1848_MIXER_REROUTE    2</div><div class='del'>-</div><div class='del'>-#define AD1848_REROUTE(oldctl, newctl) \</div><div class='del'>-                ad1848_control(AD1848_MIXER_REROUTE, ((oldctl)&lt;&lt;8)|(newctl))</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-int ad1848_init(char *name, struct resource *ports, int irq, int dma_playback,</div><div class='del'>-	int dma_capture, int share_dma, int *osp, struct module *owner);</div><div class='del'>-void ad1848_unload (int io_base, int irq, int dma_playback, int dma_capture, int share_dma);</div><div class='del'>-</div><div class='del'>-int ad1848_detect (struct resource *ports, int *flags, int *osp);</div><div class='del'>-int ad1848_control(int cmd, int arg);</div><div class='del'>-</div><div class='del'>-void attach_ms_sound(struct address_info * hw_config, struct resource *ports, struct module * owner);</div><div class='del'>-</div><div class='del'>-int probe_ms_sound(struct address_info *hw_config, struct resource *ports);</div><div class='del'>-void unload_ms_sound(struct address_info *hw_info);</div><div class='head'>diff --git a/sound/oss/ad1848_mixer.h b/sound/oss/ad1848_mixer.h<br/>deleted file mode 100644<br/>index 2cf719b5fbbc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/ad1848_mixer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ad1848_mixer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,253 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/ad1848_mixer.h</div><div class='del'>- *</div><div class='del'>- * Definitions for the mixer of AD1848 and compatible codecs.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The AD1848 codec has generic input lines called Line, Aux1 and Aux2.</div><div class='del'>- * Sound card manufacturers have connected actual inputs (CD, synth, line,</div><div class='del'>- * etc) to these inputs in different order. Therefore it's difficult</div><div class='del'>- * to assign mixer channels to these inputs correctly. The following</div><div class='del'>- * contains two alternative mappings. The first one is for GUS MAX and</div><div class='del'>- * the second is just a generic one (line1, line2 and line3).</div><div class='del'>- * (Actually this is not a mapping but rather some kind of interleaving</div><div class='del'>- * solution).</div><div class='del'>- */</div><div class='del'>-#define MODE1_REC_DEVICES		(SOUND_MASK_LINE3 | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_LINE1 | SOUND_MASK_IMIX)</div><div class='del'>-</div><div class='del'>-#define SPRO_REC_DEVICES		(SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD | SOUND_MASK_LINE1)</div><div class='del'>-</div><div class='del'>-#define MODE1_MIXER_DEVICES		(SOUND_MASK_LINE1 | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_LINE2 | \</div><div class='del'>-					 SOUND_MASK_IGAIN | \</div><div class='del'>-					 SOUND_MASK_PCM | SOUND_MASK_IMIX)</div><div class='del'>-</div><div class='del'>-#define MODE2_MIXER_DEVICES		(SOUND_MASK_LINE1 | SOUND_MASK_LINE2 | \</div><div class='del'>-					 SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_LINE3 | SOUND_MASK_SPEAKER | \</div><div class='del'>-					 SOUND_MASK_IGAIN | \</div><div class='del'>-					 SOUND_MASK_PCM | SOUND_MASK_IMIX)</div><div class='del'>-</div><div class='del'>-#define MODE3_MIXER_DEVICES		(MODE2_MIXER_DEVICES | SOUND_MASK_VOLUME)</div><div class='del'>-</div><div class='del'>-/* OPTi 82C930 has no IMIX level control, but it can still be selected as an</div><div class='del'>- * input</div><div class='del'>- */</div><div class='del'>-#define C930_MIXER_DEVICES	(SOUND_MASK_LINE1 | SOUND_MASK_LINE2 | \</div><div class='del'>-				 SOUND_MASK_MIC | SOUND_MASK_VOLUME | \</div><div class='del'>-				 SOUND_MASK_LINE3 | \</div><div class='del'>-				 SOUND_MASK_IGAIN | SOUND_MASK_PCM)</div><div class='del'>-</div><div class='del'>-#define SPRO_MIXER_DEVICES	(SOUND_MASK_VOLUME | SOUND_MASK_PCM | \</div><div class='del'>-				 SOUND_MASK_LINE | SOUND_MASK_SYNTH | \</div><div class='del'>-				 SOUND_MASK_CD | SOUND_MASK_MIC | \</div><div class='del'>-				 SOUND_MASK_SPEAKER | SOUND_MASK_LINE1 | \</div><div class='del'>-				 SOUND_MASK_OGAIN)</div><div class='del'>-</div><div class='del'>-struct mixer_def {</div><div class='del'>-	unsigned int regno:6;		/* register number for volume */</div><div class='del'>-	unsigned int polarity:1;	/* volume polarity: 0=normal, 1=reversed */</div><div class='del'>-	unsigned int bitpos:3;		/* position of bits in register for volume */</div><div class='del'>-	unsigned int nbits:3;		/* number of bits in register for volume */</div><div class='del'>-	unsigned int mutereg:6;		/* register number for mute bit */</div><div class='del'>-	unsigned int mutepol:1;		/* mute polarity: 0=normal, 1=reversed */</div><div class='del'>-	unsigned int mutepos:4;		/* position of mute bit in register */</div><div class='del'>-	unsigned int recreg:6;		/* register number for recording bit */</div><div class='del'>-	unsigned int recpol:1;		/* recording polarity: 0=normal, 1=reversed */</div><div class='del'>-	unsigned int recpos:4;		/* position of recording bit in register */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char mix_cvt[101] = {</div><div class='del'>-	 0, 0, 3, 7,10,13,16,19,21,23,26,28,30,32,34,35,37,39,40,42,</div><div class='del'>-	43,45,46,47,49,50,51,52,53,55,56,57,58,59,60,61,62,63,64,65,</div><div class='del'>-	65,66,67,68,69,70,70,71,72,73,73,74,75,75,76,77,77,78,79,79,</div><div class='del'>-	80,81,81,82,82,83,84,84,85,85,86,86,87,87,88,88,89,89,90,90,</div><div class='del'>-	91,91,92,92,93,93,94,94,95,95,96,96,96,97,97,98,98,98,99,99,</div><div class='del'>-	100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct mixer_def mixer_ent;</div><div class='del'>-typedef mixer_ent mixer_ents[2];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Most of the mixer entries work in backwards. Setting the polarity field</div><div class='del'>- * makes them to work correctly.</div><div class='del'>- *</div><div class='del'>- * The channel numbering used by individual sound cards is not fixed. Some</div><div class='del'>- * cards have assigned different meanings for the AUX1, AUX2 and LINE inputs.</div><div class='del'>- * The current version doesn't try to compensate this.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define MIX_ENT(name, reg_l, pola_l, pos_l, len_l, reg_r, pola_r, pos_r, len_r, mute_bit)	\</div><div class='del'>-	[name] = {{reg_l, pola_l, pos_l, len_l, reg_l, 0, mute_bit, 0, 0, 8},			\</div><div class='del'>-		  {reg_r, pola_r, pos_r, len_r, reg_r, 0, mute_bit, 0, 0, 8}}</div><div class='del'>-</div><div class='del'>-#define MIX_ENT2(name, reg_l, pola_l, pos_l, len_l, mute_reg_l, mute_pola_l, mute_pos_l, \</div><div class='del'>-		    rec_reg_l, rec_pola_l, rec_pos_l,					 \</div><div class='del'>-		 reg_r, pola_r, pos_r, len_r, mute_reg_r, mute_pola_r, mute_pos_r,	 \</div><div class='del'>-		    rec_reg_r, rec_pola_r, rec_pos_r)					 \</div><div class='del'>-	[name] = {{reg_l, pola_l, pos_l, len_l, mute_reg_l, mute_pola_l, mute_pos_l,	 \</div><div class='del'>-		    rec_reg_l, rec_pola_l, rec_pos_l},					 \</div><div class='del'>-		  {reg_r, pola_r, pos_r, len_r, mute_reg_r, mute_pola_r, mute_pos_r,	 \</div><div class='del'>-		    rec_reg_r, rec_pola_r, rec_pos_r}}</div><div class='del'>-</div><div class='del'>-static mixer_ents ad1848_mix_devices[32] = {</div><div class='del'>-	MIX_ENT(SOUND_MIXER_VOLUME,	27, 1, 0, 4,	29, 1, 0, 4,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_BASS,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_TREBLE,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SYNTH,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_PCM,	 6, 1, 0, 6,	 7, 1, 0, 6,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SPEAKER,	26, 1, 0, 4,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE,	18, 1, 0, 5,	19, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_MIC,	 0, 0, 5, 1,	 1, 0, 5, 1,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_CD,		 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IMIX,	13, 1, 2, 6,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_ALTPCM,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_RECLEV,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IGAIN,	 0, 0, 0, 4,	 1, 0, 0, 4,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_OGAIN,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE1,	 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE2,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE3,	18, 1, 0, 5,	19, 1, 0, 5,  7)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_ents iwave_mix_devices[32] = {</div><div class='del'>-	MIX_ENT(SOUND_MIXER_VOLUME,	25, 1, 0, 5,	27, 1, 0, 5,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_BASS,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_TREBLE,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SYNTH,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_PCM,	 6, 1, 0, 6,	 7, 1, 0, 6,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SPEAKER,	26, 1, 0, 4,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE,	18, 1, 0, 5,	19, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_MIC,	 0, 0, 5, 1,	 1, 0, 5, 1,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_CD,		 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IMIX,	16, 1, 0, 5,	17, 1, 0, 5,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_ALTPCM,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_RECLEV,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IGAIN,	 0, 0, 0, 4,	 1, 0, 0, 4,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_OGAIN,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE1,	 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE2,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE3,	18, 1, 0, 5,	19, 1, 0, 5,  7)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_ents cs42xb_mix_devices[32] = {</div><div class='del'>-	/* Digital master volume actually has seven bits, but we only use</div><div class='del'>-	   six to avoid the discontinuity when the analog gain kicks in. */</div><div class='del'>-	MIX_ENT(SOUND_MIXER_VOLUME,	46, 1, 0, 6,	47, 1, 0, 6,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_BASS,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_TREBLE,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SYNTH,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_PCM,	 6, 1, 0, 6,	 7, 1, 0, 6,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SPEAKER,	26, 1, 0, 4,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE,	18, 1, 0, 5,	19, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_MIC,	34, 1, 0, 5,	35, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_CD,		 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	/* For the IMIX entry, it was not possible to use the MIX_ENT macro</div><div class='del'>-	   because the mute bit is in different positions for the two</div><div class='del'>-	   channels and requires reverse polarity. */</div><div class='del'>-	[SOUND_MIXER_IMIX] = {{13, 1, 2, 6, 13, 1, 0, 0, 0, 8},</div><div class='del'>-		      {42, 1, 0, 6, 42, 1, 7, 0, 0, 8}},</div><div class='del'>-	MIX_ENT(SOUND_MIXER_ALTPCM,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_RECLEV,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IGAIN,	 0, 0, 0, 4,	 1, 0, 0, 4,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_OGAIN,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE1,	 2, 1, 0, 5,	 3, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE2,	 4, 1, 0, 5,	 5, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE3,	38, 1, 0, 6,	39, 1, 0, 6,  7)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* OPTi 82C930 has somewhat different port addresses.</div><div class='del'>- * Note: VOLUME == SPEAKER, SYNTH == LINE2, LINE == LINE3, CD == LINE1</div><div class='del'>- * VOLUME, SYNTH, LINE, CD are not enabled above.</div><div class='del'>- * MIC is level of mic monitoring direct to output. Same for CD, LINE, etc.</div><div class='del'>- */</div><div class='del'>-static mixer_ents c930_mix_devices[32] = {</div><div class='del'>-	MIX_ENT(SOUND_MIXER_VOLUME,	22, 1, 1, 5,	23, 1, 1, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_BASS,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_TREBLE,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SYNTH,	 4, 1, 1, 4,	 5, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_PCM,	 6, 1, 0, 5,	 7, 1, 0, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_SPEAKER,	22, 1, 1, 5,	23, 1, 1, 5,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE,	18, 1, 1, 4,	19, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_MIC,	20, 1, 1, 4,	21, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_CD,		 2, 1, 1, 4,	 3, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IMIX,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_ALTPCM,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_RECLEV,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_IGAIN,	 0, 0, 0, 4,	 1, 0, 0, 4,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_OGAIN,	 0, 0, 0, 0,	 0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE1,	 2, 1, 1, 4,	 3, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE2,	 4, 1, 1, 4,	 5, 1, 1, 4,  7),</div><div class='del'>-	MIX_ENT(SOUND_MIXER_LINE3,	18, 1, 1, 4,	19, 1, 1, 4,  7)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_ents spro_mix_devices[32] = {</div><div class='del'>-	MIX_ENT (SOUND_MIXER_VOLUME,	19, 0, 4, 4,			 19, 0, 0, 4,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_BASS,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_TREBLE,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT2(SOUND_MIXER_SYNTH,	 4, 1, 1, 4, 23, 0, 3,  0, 0, 8,</div><div class='del'>-		 			 5, 1, 1, 4, 23, 0, 3, 0, 0, 8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_PCM,	 6, 1, 1, 4,			  7, 1, 1, 4,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_SPEAKER,	18, 0, 3, 2,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT2(SOUND_MIXER_LINE,	20, 0, 4, 4, 17, 1, 4, 16, 0, 2,</div><div class='del'>-		 			20, 0, 0, 4, 17, 1, 3, 16, 0, 1),</div><div class='del'>-	MIX_ENT2(SOUND_MIXER_MIC,	18, 0, 0, 3, 17, 1, 0, 16, 0, 0,</div><div class='del'>-		 			 0, 0, 0, 0,  0, 0, 0,  0, 0, 0),</div><div class='del'>-	MIX_ENT2(SOUND_MIXER_CD,	21, 0, 4, 4, 17, 1, 2, 16, 0, 4,</div><div class='del'>-					21, 0, 0, 4, 17, 1, 1, 16, 0, 3),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_IMIX,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_ALTPCM,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_RECLEV,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_IGAIN,	 0, 0, 0, 0,			  0, 0, 0, 0,  8),</div><div class='del'>-	MIX_ENT (SOUND_MIXER_OGAIN,	17, 1, 6, 1,			  0, 0, 0, 0,  8),</div><div class='del'>-	/* This is external wavetable */</div><div class='del'>-	MIX_ENT2(SOUND_MIXER_LINE1,	22, 0, 4, 4, 23, 1, 1, 23, 0, 4,</div><div class='del'>-		 			22, 0, 0, 4, 23, 1, 0, 23, 0, 5),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int default_mixer_levels[32] =</div><div class='del'>-{</div><div class='del'>-	0x3232,			/* Master Volume */</div><div class='del'>-	0x3232,			/* Bass */</div><div class='del'>-	0x3232,			/* Treble */</div><div class='del'>-	0x4b4b,			/* FM */</div><div class='del'>-	0x3232,			/* PCM */</div><div class='del'>-	0x1515,			/* PC Speaker */</div><div class='del'>-	0x2020,			/* Ext Line */</div><div class='del'>-	0x1010,			/* Mic */</div><div class='del'>-	0x4b4b,			/* CD */</div><div class='del'>-	0x0000,			/* Recording monitor */</div><div class='del'>-	0x4b4b,			/* Second PCM */</div><div class='del'>-	0x4b4b,			/* Recording level */</div><div class='del'>-	0x4b4b,			/* Input gain */</div><div class='del'>-	0x4b4b,			/* Output gain */</div><div class='del'>-	0x2020,			/* Line1 */</div><div class='del'>-	0x2020,			/* Line2 */</div><div class='del'>-	0x1515			/* Line3 (usually line in)*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define LEFT_CHN	0</div><div class='del'>-#define RIGHT_CHN	1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Channel enable bits for ioctl(SOUND_MIXER_PRIVATE1)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef AUDIO_SPEAKER</div><div class='del'>-#define	AUDIO_SPEAKER		0x01	/* Enable mono output */</div><div class='del'>-#define	AUDIO_HEADPHONE		0x02	/* Sparc only */</div><div class='del'>-#define	AUDIO_LINE_OUT		0x04	/* Sparc only */</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c<br/>deleted file mode 100644<br/>index 35b5912cf3f8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/aedsp16.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/aedsp16.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1373 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-   sound/oss/aedsp16.c</div><div class='del'>-</div><div class='del'>-   Audio Excel DSP 16 software configuration routines</div><div class='del'>-   Copyright (C) 1995,1996,1997,1998  Riccardo Facchetti (fizban@tin.it)</div><div class='del'>-</div><div class='del'>-   This program is free software; you can redistribute it and/or modify</div><div class='del'>-   it under the terms of the GNU General Public License as published by</div><div class='del'>-   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-   (at your option) any later version.</div><div class='del'>-</div><div class='del'>-   This program is distributed in the hope that it will be useful,</div><div class='del'>-   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-   GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-   You should have received a copy of the GNU General Public License</div><div class='del'>-   along with this program; if not, write to the Free Software</div><div class='del'>-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Include the main OSS Lite header file. It include all the os, OSS Lite, etc</div><div class='del'>- * headers needed by this source.</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>-   READ THIS</div><div class='del'>-</div><div class='del'>-   This module started to configure the Audio Excel DSP 16 Sound Card.</div><div class='del'>-   Now works with the SC-6000 (old aedsp16) and new SC-6600 based cards.</div><div class='del'>-</div><div class='del'>-   NOTE: I have NO idea about Audio Excel DSP 16 III. If someone owns this</div><div class='del'>-   audio card and want to see the kernel support for it, please contact me.</div><div class='del'>-</div><div class='del'>-   Audio Excel DSP 16 is an SB pro II, Microsoft Sound System and MPU-401</div><div class='del'>-   compatible card.</div><div class='del'>-   It is software-only configurable (no jumpers to hard-set irq/dma/mpu-irq),</div><div class='del'>-   so before this module, the only way to configure the DSP under linux was</div><div class='del'>-   boot the MS-DOS loading the sound.sys device driver (this driver soft-</div><div class='del'>-   configure the sound board hardware by massaging someone of its registers),</div><div class='del'>-   and then ctrl-alt-del to boot linux with the DSP configured by the DOS</div><div class='del'>-   driver.</div><div class='del'>-</div><div class='del'>-   This module works configuring your Audio Excel DSP 16's irq, dma and</div><div class='del'>-   mpu-401-irq. The OSS Lite routines rely on the fact that if the</div><div class='del'>-   hardware is there, they can detect it. The problem with AEDSP16 is</div><div class='del'>-   that no hardware can be found by the probe routines if the sound card</div><div class='del'>-   is not configured properly. Sometimes the kernel probe routines can find</div><div class='del'>-   an SBPRO even when the card is not configured (this is the standard setup</div><div class='del'>-   of the card), but the SBPRO emulation don't work well if the card is not</div><div class='del'>-   properly initialized. For this reason</div><div class='del'>-</div><div class='del'>-   aedsp16_init_board()</div><div class='del'>-</div><div class='del'>-   routine is called before the OSS Lite probe routines try to detect the</div><div class='del'>-   hardware.</div><div class='del'>-</div><div class='del'>-   NOTE (READ THE NOTE TOO, IT CONTAIN USEFUL INFORMATIONS)</div><div class='del'>-</div><div class='del'>-   NOTE: Now it works with SC-6000 and SC-6600 based audio cards. The new cards</div><div class='del'>-   have no jumper switch at all. No more WSS or MPU-401 I/O port switches. They</div><div class='del'>-   have to be configured by software.</div><div class='del'>-</div><div class='del'>-   NOTE: The driver is merged with the new OSS Lite sound driver. It works</div><div class='del'>-   as a lowlevel driver.</div><div class='del'>-</div><div class='del'>-   The Audio Excel DSP 16 Sound Card emulates both SBPRO and MSS;</div><div class='del'>-   the OSS Lite sound driver can be configured for SBPRO and MSS cards</div><div class='del'>-   at the same time, but the aedsp16 can't be two cards!!</div><div class='del'>-   When we configure it, we have to choose the SBPRO or the MSS emulation</div><div class='del'>-   for AEDSP16. We also can install a *REAL* card of the other type (see [1]).</div><div class='del'>-</div><div class='del'>-   NOTE: If someone can test the combination AEDSP16+MSS or AEDSP16+SBPRO</div><div class='del'>-   please let me know if it works.</div><div class='del'>-</div><div class='del'>-   The MPU-401 support can be compiled in together with one of the other</div><div class='del'>-   two operating modes.</div><div class='del'>-</div><div class='del'>-   NOTE: This is something like plug-and-play: we have only to plug</div><div class='del'>-   the AEDSP16 board in the socket, and then configure and compile</div><div class='del'>-   a kernel that uses the AEDSP16 software configuration capability.</div><div class='del'>-   No jumper setting is needed!</div><div class='del'>-</div><div class='del'>-   For example, if you want AEDSP16 to be an SBPro, on irq 10, dma 3</div><div class='del'>-   you have just to make config the OSS Lite package, configuring</div><div class='del'>-   the AEDSP16 sound card, then activating the SBPro emulation mode</div><div class='del'>-   and at last configuring IRQ and DMA.</div><div class='del'>-   Compile the kernel and run it.</div><div class='del'>-</div><div class='del'>-   NOTE: This means for SC-6000 cards that you can choose irq and dma,</div><div class='del'>-   but not the I/O addresses. To change I/O addresses you have to set</div><div class='del'>-   them with jumpers. For SC-6600 cards you have no jumpers so you have</div><div class='del'>-   to set up your full card configuration in the make config.</div><div class='del'>-</div><div class='del'>-   You can change the irq/dma/mirq settings WITHOUT THE NEED to open</div><div class='del'>-   your computer and massage the jumpers (there are no irq/dma/mirq</div><div class='del'>-   jumpers to be configured anyway, only I/O BASE values have to be</div><div class='del'>-   configured with jumpers)</div><div class='del'>-</div><div class='del'>-   For some ununderstandable reason, the card default of irq 7, dma 1,</div><div class='del'>-   don't work for me. Seems to be an IRQ or DMA conflict. Under heavy</div><div class='del'>-   HDD work, the kernel start to erupt out a lot of messages like:</div><div class='del'>-</div><div class='del'>-   'Sound: DMA timed out - IRQ/DRQ config error?'</div><div class='del'>-</div><div class='del'>-   For what I can say, I have NOT any conflict at irq 7 (under linux I'm</div><div class='del'>-   using the lp polling driver), and dma line 1 is unused as stated by</div><div class='del'>-   /proc/dma. I can suppose this is a bug of AEDSP16. I know my hardware so</div><div class='del'>-   I'm pretty sure I have not any conflict, but may be I'm wrong. Who knows!</div><div class='del'>-   Anyway a setting of irq 10, dma 3 works really fine.</div><div class='del'>-</div><div class='del'>-   NOTE: if someone can use AEDSP16 with irq 7, dma 1, please let me know</div><div class='del'>-   the emulation mode, all the installed hardware and the hardware</div><div class='del'>-   configuration (irq and dma settings of all the hardware).</div><div class='del'>-</div><div class='del'>-   This init module should work with SBPRO+MSS, when one of the two is</div><div class='del'>-   the AEDSP16 emulation and the other the real card. (see [1])</div><div class='del'>-   For example:</div><div class='del'>-</div><div class='del'>-   AEDSP16 (0x220) in SBPRO emu (0x220) + real MSS + other</div><div class='del'>-   AEDSP16 (0x220) in MSS emu + real SBPRO (0x240) + other</div><div class='del'>-</div><div class='del'>-   MPU401 should work. (see [2])</div><div class='del'>-</div><div class='del'>-   [1]</div><div class='del'>-       ---</div><div class='del'>-       Date: Mon, 29 Jul 1997 08:35:40 +0100</div><div class='del'>-       From: Mr S J Greenaway &lt;sjg95@unixfe.rl.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-       [...]</div><div class='del'>-       Just to let you know got my Audio Excel (emulating a MSS) working</div><div class='del'>-       with my original SB16, thanks for the driver!</div><div class='del'>-       [...]</div><div class='del'>-       ---</div><div class='del'>-</div><div class='del'>-   [2] Not tested by me for lack of hardware.</div><div class='del'>-</div><div class='del'>-   TODO, WISHES AND TECH</div><div class='del'>-</div><div class='del'>-   - About I/O ports allocation -</div><div class='del'>-</div><div class='del'>-   Request the 2x0h region (port base) in any case if we are using this card.</div><div class='del'>-</div><div class='del'>-   NOTE: the "aedsp16 (base)" string with which we are requesting the aedsp16</div><div class='del'>-   port base region (see code) does not mean necessarily that we are emulating</div><div class='del'>-   sbpro.  Even if this region is the sbpro I/O ports region, we use this</div><div class='del'>-   region to access the control registers of the card, and if emulating</div><div class='del'>-   sbpro, I/O sbpro registers too. If we are emulating MSS, the sbpro</div><div class='del'>-   registers are not used, in no way, to emulate an sbpro: they are</div><div class='del'>-   used only for configuration purposes.</div><div class='del'>-</div><div class='del'>-   Started Fri Mar 17 16:13:18 MET 1995</div><div class='del'>-</div><div class='del'>-   v0.1 (ALPHA, was a user-level program called AudioExcelDSP16.c)</div><div class='del'>-   - Initial code.</div><div class='del'>-   v0.2 (ALPHA)</div><div class='del'>-   - Cleanups.</div><div class='del'>-   - Integrated with Linux voxware v 2.90-2 kernel sound driver.</div><div class='del'>-   - SoundBlaster Pro mode configuration.</div><div class='del'>-   - Microsoft Sound System mode configuration.</div><div class='del'>-   - MPU-401 mode configuration.</div><div class='del'>-   v0.3 (ALPHA)</div><div class='del'>-   - Cleanups.</div><div class='del'>-   - Rearranged the code to let aedsp16_init_board be more general.</div><div class='del'>-   - Erased the REALLY_SLOW_IO. We don't need it. Erased the linux/io.h</div><div class='del'>-   inclusion too. We rely on os.h</div><div class='del'>-   - Used the  to get a variable</div><div class='del'>-   len string (we are not sure about the len of Copyright string).</div><div class='del'>-   This works with any SB and compatible.</div><div class='del'>-   - Added the code to request_region at device init (should go in</div><div class='del'>-   the main body of voxware).</div><div class='del'>-   v0.4 (BETA)</div><div class='del'>-   - Better configure.c patch for aedsp16 configuration (better</div><div class='del'>-   logic of inclusion of AEDSP16 support)</div><div class='del'>-   - Modified the conditional compilation to better support more than</div><div class='del'>-   one sound card of the emulated type (read the NOTES above)</div><div class='del'>-   - Moved the sb init routine from the attach to the very first</div><div class='del'>-   probe in sb_card.c</div><div class='del'>-   - Rearrangements and cleanups</div><div class='del'>-   - Wiped out some unnecessary code and variables: this is kernel</div><div class='del'>-   code so it is better save some TEXT and DATA</div><div class='del'>-   - Fixed the request_region code. We must allocate the aedsp16 (sbpro)</div><div class='del'>-   I/O ports in any case because they are used to access the DSP</div><div class='del'>-   configuration registers and we can not allow anyone to get them.</div><div class='del'>-   v0.5</div><div class='del'>-   - cleanups on comments</div><div class='del'>-   - prep for diffs against v3.0-proto-950402</div><div class='del'>-   v0.6</div><div class='del'>-   - removed the request_region()s when compiling the MODULE sound.o</div><div class='del'>-   because we are not allowed (by the actual voxware structure) to</div><div class='del'>-   release_region()</div><div class='del'>-   v0.7 (pre ALPHA, not distributed)</div><div class='del'>-   - started porting this module to kernel 1.3.84. Dummy probe/attach</div><div class='del'>-   routines.</div><div class='del'>-   v0.8 (ALPHA)</div><div class='del'>-   - attached all the init routines.</div><div class='del'>-   v0.9 (BETA)</div><div class='del'>-   - Integrated with linux-pre2.0.7</div><div class='del'>-   - Integrated with configuration scripts.</div><div class='del'>-   - Cleaned up and beautyfied the code.</div><div class='del'>-   v0.9.9 (BETA)</div><div class='del'>-   - Thanks to Piercarlo Grandi: corrected the conditonal compilation code.</div><div class='del'>-     Now only the code configured is compiled in, with some memory saving.</div><div class='del'>-   v0.9.10</div><div class='del'>-   - Integration into the sound/lowlevel/ section of the sound driver.</div><div class='del'>-   - Re-organized the code.</div><div class='del'>-   v0.9.11 (not distributed)</div><div class='del'>-   - Rewritten the init interface-routines to initialize the AEDSP16 in</div><div class='del'>-     one shot.</div><div class='del'>-   - More cosmetics.</div><div class='del'>-   - SC-6600 support.</div><div class='del'>-   - More soft/hard configuration.</div><div class='del'>-   v0.9.12</div><div class='del'>-   - Refined the v0.9.11 code with conditional compilation to distinguish</div><div class='del'>-     between SC-6000 and SC-6600 code.</div><div class='del'>-   v1.0.0</div><div class='del'>-   - Prep for merging with OSS Lite and Linux kernel 2.1.13</div><div class='del'>-   - Corrected a bug in request/check/release region calls (thanks to the</div><div class='del'>-     new kernel exception handling).</div><div class='del'>-   v1.1</div><div class='del'>-   - Revamped for integration with new modularized sound drivers: to enhance</div><div class='del'>-     the flexibility of modular version, I have removed all the conditional</div><div class='del'>-     compilation for SBPRO, MPU and MSS code. Now it is all managed with</div><div class='del'>-     the ae_config structure.</div><div class='del'>-   v1.2</div><div class='del'>-   - Module informations added.</div><div class='del'>-   - Removed aedsp16_delay_10msec(), now using mdelay(10)</div><div class='del'>-   - All data and funcs moved to .*.init section.</div><div class='del'>-   v1.3</div><div class='del'>-   Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt; - 2000/09/27</div><div class='del'>-   - got rid of check_region</div><div class='del'>-</div><div class='del'>-   Known Problems:</div><div class='del'>-   - Audio Excel DSP 16 III don't work with this driver.</div><div class='del'>-</div><div class='del'>-   Credits:</div><div class='del'>-   Many thanks to Gerald Britton &lt;gbritton@CapAccess.org&gt;. He helped me a</div><div class='del'>-   lot in testing the 0.9.11 and 0.9.12 versions of this driver.</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define VERSION "1.3"		/* Version of Audio Excel DSP 16 driver */</div><div class='del'>-</div><div class='del'>-#undef	AEDSP16_DEBUG 		/* Define this to 1 to enable debug code     */</div><div class='del'>-#undef	AEDSP16_DEBUG_MORE 	/* Define this to 1 to enable more debug     */</div><div class='del'>-#undef	AEDSP16_INFO 		/* Define this to 1 to enable info code      */</div><div class='del'>-</div><div class='del'>-#if defined(AEDSP16_DEBUG)</div><div class='del'>-# define DBG(x)  printk x</div><div class='del'>-# if defined(AEDSP16_DEBUG_MORE)</div><div class='del'>-#  define DBG1(x) printk x</div><div class='del'>-# else</div><div class='del'>-#  define DBG1(x)</div><div class='del'>-# endif</div><div class='del'>-#else</div><div class='del'>-# define DBG(x)</div><div class='del'>-# define DBG1(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Misc definitions</div><div class='del'>- */</div><div class='del'>-#define TRUE	1</div><div class='del'>-#define FALSE	0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Region Size for request/check/release region.</div><div class='del'>- */</div><div class='del'>-#define IOBASE_REGION_SIZE	0x10</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Hardware related defaults</div><div class='del'>- */</div><div class='del'>-#define DEF_AEDSP16_IOB 0x220   /* 0x220(default) 0x240                 */</div><div class='del'>-#define DEF_AEDSP16_IRQ 7	/* 5 7(default) 9 10 11                 */</div><div class='del'>-#define DEF_AEDSP16_MRQ 0	/* 5 7 9 10 0(default), 0 means disable */</div><div class='del'>-#define DEF_AEDSP16_DMA 1	/* 0 1(default) 3                       */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Commands of AEDSP16's DSP (SBPRO+special).</div><div class='del'>- * Some of them are COMMAND_xx, in the future they may change.</div><div class='del'>- */</div><div class='del'>-#define WRITE_MDIRQ_CFG   0x50	/* Set M&amp;I&amp;DRQ mask (the real config)   */</div><div class='del'>-#define COMMAND_52        0x52	/*                                      */</div><div class='del'>-#define READ_HARD_CFG     0x58	/* Read Hardware Config (I/O base etc)  */</div><div class='del'>-#define COMMAND_5C        0x5c	/*                                      */</div><div class='del'>-#define COMMAND_60        0x60	/*                                      */</div><div class='del'>-#define COMMAND_66        0x66	/*                                      */</div><div class='del'>-#define COMMAND_6C        0x6c	/*                                      */</div><div class='del'>-#define COMMAND_6E        0x6e	/*                                      */</div><div class='del'>-#define COMMAND_88        0x88	/*                                      */</div><div class='del'>-#define DSP_INIT_MSS      0x8c	/* Enable Microsoft Sound System mode   */</div><div class='del'>-#define COMMAND_C5        0xc5	/*                                      */</div><div class='del'>-#define GET_DSP_VERSION   0xe1	/* Get DSP Version                      */</div><div class='del'>-#define GET_DSP_COPYRIGHT 0xe3	/* Get DSP Copyright                    */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Offsets of AEDSP16 DSP I/O ports. The offset is added to base I/O port</div><div class='del'>- * to have the actual I/O port.</div><div class='del'>- * Register permissions are:</div><div class='del'>- * (wo) == Write Only</div><div class='del'>- * (ro) == Read  Only</div><div class='del'>- * (w-) == Write</div><div class='del'>- * (r-) == Read</div><div class='del'>- */</div><div class='del'>-#define DSP_RESET    0x06	/* offset of DSP RESET             (wo) */</div><div class='del'>-#define DSP_READ     0x0a	/* offset of DSP READ              (ro) */</div><div class='del'>-#define DSP_WRITE    0x0c	/* offset of DSP WRITE             (w-) */</div><div class='del'>-#define DSP_COMMAND  0x0c	/* offset of DSP COMMAND           (w-) */</div><div class='del'>-#define DSP_STATUS   0x0c	/* offset of DSP STATUS            (r-) */</div><div class='del'>-#define DSP_DATAVAIL 0x0e	/* offset of DSP DATA AVAILABLE    (ro) */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define RETRY           10	/* Various retry values on I/O opera-   */</div><div class='del'>-#define STATUSRETRY   1000	/* tions. Sometimes we have to          */</div><div class='del'>-#define HARDRETRY   500000	/* wait for previous cmd to complete    */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Size of character arrays that store name and version of sound card</div><div class='del'>- */</div><div class='del'>-#define CARDNAMELEN	15	/* Size of the card's name in chars     */</div><div class='del'>-#define CARDVERLEN	10	/* Size of the card's version in chars	*/</div><div class='del'>-#define CARDVERDIGITS	2	/* Number of digits in the version	*/</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-/*</div><div class='del'>- * Bitmapped flags of hard configuration</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Decode macros (xl == low byte, xh = high byte)</div><div class='del'>- */</div><div class='del'>-#define IOBASE(xl)		((xl &amp; 0x01)?0x240:0x220)</div><div class='del'>-#define JOY(xl)  		(xl &amp; 0x02)</div><div class='del'>-#define MPUADDR(xl)		( 			\</div><div class='del'>-				(xl &amp; 0x0C)?0x330:	\</div><div class='del'>-				(xl &amp; 0x08)?0x320:	\</div><div class='del'>-				(xl &amp; 0x04)?0x310:	\</div><div class='del'>-						0x300)</div><div class='del'>-#define WSSADDR(xl)		((xl &amp; 0x10)?0xE80:0x530)</div><div class='del'>-#define CDROM(xh)		(xh &amp; 0x20)</div><div class='del'>-#define CDROMADDR(xh)		(((xh &amp; 0x1F) &lt;&lt; 4) + 0x200)</div><div class='del'>-/*</div><div class='del'>- * Encode macros</div><div class='del'>- */</div><div class='del'>-#define BLDIOBASE(xl, val) {		\</div><div class='del'>-	xl &amp;= ~0x01; 			\</div><div class='del'>-	if (val == 0x240)		\</div><div class='del'>-		xl |= 0x01;		\</div><div class='del'>-	}</div><div class='del'>-#define BLDJOY(xl, val) {		\</div><div class='del'>-	xl &amp;= ~0x02; 			\</div><div class='del'>-	if (val == 1)			\</div><div class='del'>-		xl |= 0x02;		\</div><div class='del'>-	}</div><div class='del'>-#define BLDMPUADDR(xl, val) {		\</div><div class='del'>-	xl &amp;= ~0x0C;			\</div><div class='del'>-	switch (val) {			\</div><div class='del'>-		case 0x330:		\</div><div class='del'>-			xl |= 0x0C;	\</div><div class='del'>-			break;		\</div><div class='del'>-		case 0x320:		\</div><div class='del'>-			xl |= 0x08;	\</div><div class='del'>-			break;		\</div><div class='del'>-		case 0x310:		\</div><div class='del'>-			xl |= 0x04;	\</div><div class='del'>-			break;		\</div><div class='del'>-		case 0x300:		\</div><div class='del'>-			xl |= 0x00;	\</div><div class='del'>-			break;		\</div><div class='del'>-		default:		\</div><div class='del'>-			xl |= 0x00;	\</div><div class='del'>-			break;		\</div><div class='del'>-		}			\</div><div class='del'>-	}</div><div class='del'>-#define BLDWSSADDR(xl, val) {		\</div><div class='del'>-	xl &amp;= ~0x10; 			\</div><div class='del'>-	if (val == 0xE80)		\</div><div class='del'>-		xl |= 0x10;		\</div><div class='del'>-	}</div><div class='del'>-#define BLDCDROM(xh, val) {		\</div><div class='del'>-	xh &amp;= ~0x20; 			\</div><div class='del'>-	if (val == 1)			\</div><div class='del'>-		xh |= 0x20;		\</div><div class='del'>-	}</div><div class='del'>-#define BLDCDROMADDR(xh, val) {		\</div><div class='del'>-	int tmp = val;			\</div><div class='del'>-	tmp -= 0x200;			\</div><div class='del'>-	tmp &gt;&gt;= 4;			\</div><div class='del'>-	tmp &amp;= 0x1F;			\</div><div class='del'>-	xh |= tmp;			\</div><div class='del'>-	xh &amp;= 0x7F;			\</div><div class='del'>-	xh |= 0x40;			\</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_SC6600 */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bit mapped flags for calling aedsp16_init_board(), and saving the current</div><div class='del'>- * emulation mode.</div><div class='del'>- */</div><div class='del'>-#define INIT_NONE   (0   )</div><div class='del'>-#define INIT_SBPRO  (1&lt;&lt;0)</div><div class='del'>-#define INIT_MSS    (1&lt;&lt;1)</div><div class='del'>-#define INIT_MPU401 (1&lt;&lt;2)</div><div class='del'>-</div><div class='del'>-static int      soft_cfg __initdata = 0;	/* bitmapped config */</div><div class='del'>-static int      soft_cfg_mss __initdata = 0;	/* bitmapped mss config */</div><div class='del'>-static int      ver[CARDVERDIGITS] __initdata = {0, 0};	/* DSP Ver:</div><div class='del'>-						   hi-&gt;ver[0] lo-&gt;ver[1] */</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-static int	hard_cfg[2]     /* lo&lt;-hard_cfg[0] hi&lt;-hard_cfg[1]      */</div><div class='del'>-                     __initdata = { 0, 0};</div><div class='del'>-#endif /* CONFIG_SC6600 */</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-/* Decoded hard configuration */</div><div class='del'>-struct	d_hcfg {</div><div class='del'>-	int iobase;</div><div class='del'>-	int joystick;</div><div class='del'>-	int mpubase;</div><div class='del'>-	int wssbase;</div><div class='del'>-	int cdrom;</div><div class='del'>-	int cdrombase;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct d_hcfg decoded_hcfg __initdata = {0, };</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SC6600 */</div><div class='del'>-</div><div class='del'>-/* orVals contain the values to be or'ed       				*/</div><div class='del'>-struct orVals {</div><div class='del'>-	int	val;		/* irq|mirq|dma                         */</div><div class='del'>-	int	or;		/* soft_cfg |= TheStruct.or             */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* aedsp16_info contain the audio card configuration                  */</div><div class='del'>-struct aedsp16_info {</div><div class='del'>-	int base_io;            /* base I/O address for accessing card  */</div><div class='del'>-	int irq;                /* irq value for DSP I/O                */</div><div class='del'>-	int mpu_irq;            /* irq for mpu401 interface I/O         */</div><div class='del'>-	int dma;                /* dma value for DSP I/O                */</div><div class='del'>-	int mss_base;           /* base I/O for Microsoft Sound System  */</div><div class='del'>-	int mpu_base;           /* base I/O for MPU-401 emulation       */</div><div class='del'>-	int init;               /* Initialization status of the card    */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Magic values that the DSP will eat when configuring irq/mirq/dma</div><div class='del'>- */</div><div class='del'>-/* DSP IRQ conversion array             */</div><div class='del'>-static struct orVals orIRQ[] __initdata = {</div><div class='del'>-	{0x05, 0x28},</div><div class='del'>-	{0x07, 0x08},</div><div class='del'>-	{0x09, 0x10},</div><div class='del'>-	{0x0a, 0x18},</div><div class='del'>-	{0x0b, 0x20},</div><div class='del'>-	{0x00, 0x00}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* MPU-401 IRQ conversion array         */</div><div class='del'>-static struct orVals orMIRQ[] __initdata = {</div><div class='del'>-	{0x05, 0x04},</div><div class='del'>-	{0x07, 0x44},</div><div class='del'>-	{0x09, 0x84},</div><div class='del'>-	{0x0a, 0xc4},</div><div class='del'>-	{0x00, 0x00}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DMA Channels conversion array        */</div><div class='del'>-static struct orVals orDMA[] __initdata = {</div><div class='del'>-	{0x00, 0x01},</div><div class='del'>-	{0x01, 0x02},</div><div class='del'>-	{0x03, 0x03},</div><div class='del'>-	{0x00, 0x00}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct aedsp16_info ae_config = {</div><div class='del'>-	DEF_AEDSP16_IOB,</div><div class='del'>-	DEF_AEDSP16_IRQ,</div><div class='del'>-	DEF_AEDSP16_MRQ,</div><div class='del'>-	DEF_AEDSP16_DMA,</div><div class='del'>-	-1,</div><div class='del'>-	-1,</div><div class='del'>-	INIT_NONE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Buffers to store audio card informations</div><div class='del'>- */</div><div class='del'>-static char     DSPCopyright[CARDNAMELEN + 1] __initdata = {0, };</div><div class='del'>-static char     DSPVersion[CARDVERLEN + 1] __initdata = {0, };</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_wait_data(int port)</div><div class='del'>-{</div><div class='del'>-	int             loop = STATUSRETRY;</div><div class='del'>-	unsigned char   ret = 0;</div><div class='del'>-</div><div class='del'>-	DBG1(("aedsp16_wait_data (0x%x): ", port));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		  ret = inb(port + DSP_DATAVAIL);</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for data available (bit 7 of ret == 1)</div><div class='del'>-	 */</div><div class='del'>-	  } while (!(ret &amp; 0x80) &amp;&amp; loop--);</div><div class='del'>-</div><div class='del'>-	if (ret &amp; 0x80) {</div><div class='del'>-		DBG1(("success.\n"));</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBG1(("failure.\n"));</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_read(int port)</div><div class='del'>-{</div><div class='del'>-	int inbyte;</div><div class='del'>-</div><div class='del'>-	DBG(("    Read DSP Byte (0x%x): ", port));</div><div class='del'>-</div><div class='del'>-	if (aedsp16_wait_data(port) == FALSE) {</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inbyte = inb(port + DSP_READ);</div><div class='del'>-</div><div class='del'>-	DBG(("read [0x%x]/{%c}.\n", inbyte, inbyte));</div><div class='del'>-</div><div class='del'>-	return inbyte;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_test_dsp(int port)</div><div class='del'>-{</div><div class='del'>-	return ((aedsp16_read(port) == 0xaa) ? TRUE : FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_dsp_reset(int port)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Reset DSP</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	DBG(("Reset DSP:\n"));</div><div class='del'>-</div><div class='del'>-	outb(1, (port + DSP_RESET));</div><div class='del'>-	udelay(10);</div><div class='del'>-	outb(0, (port + DSP_RESET));</div><div class='del'>-	udelay(10);</div><div class='del'>-	udelay(10);</div><div class='del'>-	if (aedsp16_test_dsp(port) == TRUE) {</div><div class='del'>-		DBG(("success.\n"));</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_write(int port, int cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned char   ret;</div><div class='del'>-	int             loop = HARDRETRY;</div><div class='del'>-</div><div class='del'>-	DBG(("    Write DSP Byte (0x%x) [0x%x]: ", port, cmd));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = inb(port + DSP_STATUS);</div><div class='del'>-		/*</div><div class='del'>-		 * DSP ready to receive data if bit 7 of ret == 0</div><div class='del'>-		 */</div><div class='del'>-		if (!(ret &amp; 0x80)) {</div><div class='del'>-			outb(cmd, port + DSP_COMMAND);</div><div class='del'>-			DBG(("success.\n"));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} while (loop--);</div><div class='del'>-</div><div class='del'>-	DBG(("timeout.\n"));</div><div class='del'>-	printk("[AEDSP16] DSP Command (0x%x) timeout.\n", cmd);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-</div><div class='del'>-#if defined(AEDSP16_INFO) || defined(AEDSP16_DEBUG)</div><div class='del'>-void __init aedsp16_pinfo(void) {</div><div class='del'>-	DBG(("\n Base address:  %x\n", decoded_hcfg.iobase));</div><div class='del'>-	DBG((" Joystick    : %s present\n", decoded_hcfg.joystick?"":" not"));</div><div class='del'>-	DBG((" WSS addr    :  %x\n", decoded_hcfg.wssbase));</div><div class='del'>-	DBG((" MPU-401 addr:  %x\n", decoded_hcfg.mpubase));</div><div class='del'>-	DBG((" CDROM       : %s present\n", (decoded_hcfg.cdrom!=4)?"":" not"));</div><div class='del'>-	DBG((" CDROMADDR   :  %x\n\n", decoded_hcfg.cdrombase));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __init aedsp16_hard_decode(void) {</div><div class='del'>-</div><div class='del'>-	DBG((" aedsp16_hard_decode: 0x%x, 0x%x\n", hard_cfg[0], hard_cfg[1]));</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Decode Cfg Bytes.</div><div class='del'>- */</div><div class='del'>-	decoded_hcfg.iobase	= IOBASE(hard_cfg[0]);</div><div class='del'>-	decoded_hcfg.joystick	= JOY(hard_cfg[0]);</div><div class='del'>-	decoded_hcfg.wssbase	= WSSADDR(hard_cfg[0]);</div><div class='del'>-	decoded_hcfg.mpubase	= MPUADDR(hard_cfg[0]);</div><div class='del'>-	decoded_hcfg.cdrom	= CDROM(hard_cfg[1]);</div><div class='del'>-	decoded_hcfg.cdrombase	= CDROMADDR(hard_cfg[1]);</div><div class='del'>-</div><div class='del'>-#if defined(AEDSP16_INFO) || defined(AEDSP16_DEBUG)</div><div class='del'>-	printk(" Original sound card configuration:\n");</div><div class='del'>-	aedsp16_pinfo();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Now set up the real kernel configuration.</div><div class='del'>- */</div><div class='del'>-	decoded_hcfg.iobase	= ae_config.base_io;</div><div class='del'>-	decoded_hcfg.wssbase	= ae_config.mss_base;</div><div class='del'>-	decoded_hcfg.mpubase	= ae_config.mpu_base;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600_JOY)</div><div class='del'>- 	decoded_hcfg.joystick	= CONFIG_SC6600_JOY; /* Enable */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_SC6600_CDROM)</div><div class='del'>-	decoded_hcfg.cdrom	= CONFIG_SC6600_CDROM; /* 4:N-3:I-2:G-1:P-0:S */</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_SC6600_CDROMBASE)</div><div class='del'>-	decoded_hcfg.cdrombase	= CONFIG_SC6600_CDROMBASE; /* 0 Disable */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(AEDSP16_DEBUG)</div><div class='del'>-	DBG((" New Values:\n"));</div><div class='del'>-	aedsp16_pinfo();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init aedsp16_hard_encode(void) {</div><div class='del'>-</div><div class='del'>-	DBG((" aedsp16_hard_encode: 0x%x, 0x%x\n", hard_cfg[0], hard_cfg[1]));</div><div class='del'>-</div><div class='del'>-	hard_cfg[0] = 0;</div><div class='del'>-	hard_cfg[1] = 0;</div><div class='del'>-</div><div class='del'>-	hard_cfg[0] |= 0x20;</div><div class='del'>-</div><div class='del'>-	BLDIOBASE (hard_cfg[0], decoded_hcfg.iobase);</div><div class='del'>-	BLDWSSADDR(hard_cfg[0], decoded_hcfg.wssbase);</div><div class='del'>-	BLDMPUADDR(hard_cfg[0], decoded_hcfg.mpubase);</div><div class='del'>-	BLDJOY(hard_cfg[0], decoded_hcfg.joystick);</div><div class='del'>-	BLDCDROM(hard_cfg[1], decoded_hcfg.cdrom);</div><div class='del'>-	BLDCDROMADDR(hard_cfg[1], decoded_hcfg.cdrombase);</div><div class='del'>-</div><div class='del'>-#if defined(AEDSP16_DEBUG)</div><div class='del'>-	aedsp16_pinfo();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	DBG((" aedsp16_hard_encode: 0x%x, 0x%x\n", hard_cfg[0], hard_cfg[1]));</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_hard_write(int port) {</div><div class='del'>-</div><div class='del'>-	DBG(("aedsp16_hard_write:\n"));</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, COMMAND_6C)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6C);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, COMMAND_5C)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, hard_cfg[0])) {</div><div class='del'>-		printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[0]);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, hard_cfg[1])) {</div><div class='del'>-		printk("[AEDSP16] DATA 0x%x: failed!\n", hard_cfg[1]);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, COMMAND_C5)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_C5);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_hard_read(int port) {</div><div class='del'>-</div><div class='del'>-	DBG(("aedsp16_hard_read:\n"));</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, READ_HARD_CFG)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", READ_HARD_CFG);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((hard_cfg[0] = aedsp16_read(port)) == -1) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",</div><div class='del'>-			READ_HARD_CFG);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if ((hard_cfg[1] = aedsp16_read(port)) == -1) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",</div><div class='del'>-			READ_HARD_CFG);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_read(port) == -1) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",</div><div class='del'>-			READ_HARD_CFG);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_ext_cfg_write(int port) {</div><div class='del'>-</div><div class='del'>-	int extcfg, val;</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, COMMAND_66)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_66);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	extcfg = 7;</div><div class='del'>-	if (decoded_hcfg.cdrom != 2)</div><div class='del'>-		extcfg = 0x0F;</div><div class='del'>-	if ((decoded_hcfg.cdrom == 4) ||</div><div class='del'>-	    (decoded_hcfg.cdrom == 3))</div><div class='del'>-		extcfg &amp;= ~2;</div><div class='del'>-	if (decoded_hcfg.cdrombase == 0)</div><div class='del'>-		extcfg &amp;= ~2;</div><div class='del'>-	if (decoded_hcfg.mpubase == 0)</div><div class='del'>-		extcfg &amp;= ~1;</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, extcfg)) {</div><div class='del'>-		printk("[AEDSP16] Write extcfg: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, 0)) {</div><div class='del'>-		printk("[AEDSP16] Write extcfg: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (decoded_hcfg.cdrom == 3) {</div><div class='del'>-		if (aedsp16_write(port, COMMAND_52)) {</div><div class='del'>-			printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if ((val = aedsp16_read(port)) == -1) {</div><div class='del'>-			printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n"</div><div class='del'>-					, COMMAND_52);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		val &amp;= 0x7F;</div><div class='del'>-		if (aedsp16_write(port, COMMAND_60)) {</div><div class='del'>-			printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (aedsp16_write(port, val)) {</div><div class='del'>-			printk("[AEDSP16] Write val: failed!\n");</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SC6600 */</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_cfg_write(int port) {</div><div class='del'>-	if (aedsp16_write(port, WRITE_MDIRQ_CFG)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, soft_cfg)) {</div><div class='del'>-		printk("[AEDSP16] Initialization of (M)IRQ and DMA: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_init_mss(int port)</div><div class='del'>-{</div><div class='del'>-	DBG(("aedsp16_init_mss:\n"));</div><div class='del'>-</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, DSP_INIT_MSS)) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_init_mss [0x%x]: failed!\n",</div><div class='del'>-				DSP_INIT_MSS);</div><div class='del'>-		DBG(("failure.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	if (aedsp16_cfg_write(port) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	outb(soft_cfg_mss, ae_config.mss_base);</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_setup_board(int port) {</div><div class='del'>-	int	loop = RETRY;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-	int	val = 0;</div><div class='del'>-</div><div class='del'>-	if (aedsp16_hard_read(port) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_hard_read: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, COMMAND_52)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_52);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((val = aedsp16_read(port)) == -1) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",</div><div class='del'>-				COMMAND_52);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if (aedsp16_write(port, COMMAND_88)) {</div><div class='del'>-			printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_88);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		mdelay(10);</div><div class='del'>-	} while ((aedsp16_wait_data(port) == FALSE) &amp;&amp; loop--);</div><div class='del'>-</div><div class='del'>-	if (aedsp16_read(port) == -1) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_read after CMD 0x%x: failed\n",</div><div class='del'>-				COMMAND_88);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if !defined(CONFIG_SC6600)</div><div class='del'>-	if (aedsp16_write(port, COMMAND_5C)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (aedsp16_cfg_write(port) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-	if (aedsp16_write(port, COMMAND_60)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_60);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, val)) {</div><div class='del'>-		printk("[AEDSP16] DATA 0x%x: failed!\n", val);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, COMMAND_6E)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_6E);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, ver[0])) {</div><div class='del'>-		printk("[AEDSP16] DATA 0x%x: failed!\n", ver[0]);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_write(port, ver[1])) {</div><div class='del'>-		printk("[AEDSP16] DATA 0x%x: failed!\n", ver[1]);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aedsp16_hard_write(port) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_hard_write: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(port, COMMAND_5C)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", COMMAND_5C);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if defined(THIS_IS_A_THING_I_HAVE_NOT_TESTED_YET)</div><div class='del'>-	if (aedsp16_cfg_write(port) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_stdcfg(int port) {</div><div class='del'>-	if (aedsp16_write(port, WRITE_MDIRQ_CFG)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * 0x0A == (IRQ 7, DMA 1, MIRQ 0)</div><div class='del'>-	 */</div><div class='del'>-	if (aedsp16_write(port, 0x0A)) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_stdcfg: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_dsp_version(int port)</div><div class='del'>-{</div><div class='del'>-	int             len = 0;</div><div class='del'>-	int             ret;</div><div class='del'>-</div><div class='del'>-	DBG(("Get DSP Version:\n"));</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(ae_config.base_io, GET_DSP_VERSION)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_VERSION);</div><div class='del'>-		DBG(("failed.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if ((ret = aedsp16_read(port)) == -1) {</div><div class='del'>-			DBG(("failed.\n"));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	/*</div><div class='del'>-	 * We already know how many int are stored (2), so we know when the</div><div class='del'>-	 * string is finished.</div><div class='del'>-	 */</div><div class='del'>-		ver[len++] = ret;</div><div class='del'>-	  } while (len &lt; CARDVERDIGITS);</div><div class='del'>-	sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_dsp_copyright(int port)</div><div class='del'>-{</div><div class='del'>-	int             len = 0;</div><div class='del'>-	int             ret;</div><div class='del'>-</div><div class='del'>-	DBG(("Get DSP Copyright:\n"));</div><div class='del'>-</div><div class='del'>-	if (aedsp16_write(ae_config.base_io, GET_DSP_COPYRIGHT)) {</div><div class='del'>-		printk("[AEDSP16] CMD 0x%x: failed!\n", GET_DSP_COPYRIGHT);</div><div class='del'>-		DBG(("failed.\n"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		if ((ret = aedsp16_read(port)) == -1) {</div><div class='del'>-	/*</div><div class='del'>-	 * If no more data available, return to the caller, no error if len&gt;0.</div><div class='del'>-	 * We have no other way to know when the string is finished.</div><div class='del'>-	 */</div><div class='del'>-			if (len)</div><div class='del'>-				break;</div><div class='del'>-			else {</div><div class='del'>-				DBG(("failed.\n"));</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		DSPCopyright[len++] = ret;</div><div class='del'>-</div><div class='del'>-	  } while (len &lt; CARDNAMELEN);</div><div class='del'>-</div><div class='del'>-	DBG(("success.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init aedsp16_init_tables(void)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	memset(DSPCopyright, 0, CARDNAMELEN + 1);</div><div class='del'>-	memset(DSPVersion, 0, CARDVERLEN + 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; orIRQ[i].or; i++)</div><div class='del'>-		if (orIRQ[i].val == ae_config.irq) {</div><div class='del'>-			soft_cfg |= orIRQ[i].or;</div><div class='del'>-			soft_cfg_mss |= orIRQ[i].or;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for (i = 0; orMIRQ[i].or; i++)</div><div class='del'>-		if (orMIRQ[i].or == ae_config.mpu_irq)</div><div class='del'>-			soft_cfg |= orMIRQ[i].or;</div><div class='del'>-</div><div class='del'>-	for (i = 0; orDMA[i].or; i++)</div><div class='del'>-		if (orDMA[i].val == ae_config.dma) {</div><div class='del'>-			soft_cfg |= orDMA[i].or;</div><div class='del'>-			soft_cfg_mss |= orDMA[i].or;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init aedsp16_init_board(void)</div><div class='del'>-{</div><div class='del'>-	aedsp16_init_tables();</div><div class='del'>-</div><div class='del'>-	if (aedsp16_dsp_reset(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_dsp_reset: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if (aedsp16_dsp_copyright(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_dsp_copyright: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * My AEDSP16 card return SC-6000 in DSPCopyright, so</div><div class='del'>-	 * if we have something different, we have to be warned.</div><div class='del'>-	 */</div><div class='del'>-	if (strcmp("SC-6000", DSPCopyright))</div><div class='del'>-		printk("[AEDSP16] Warning: non SC-6000 audio card!\n");</div><div class='del'>-</div><div class='del'>-	if (aedsp16_dsp_version(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_dsp_version: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aedsp16_stdcfg(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_stdcfg: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SC6600)</div><div class='del'>-	if (aedsp16_hard_read(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_hard_read: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aedsp16_hard_decode();</div><div class='del'>-</div><div class='del'>-	aedsp16_hard_encode();</div><div class='del'>-</div><div class='del'>-	if (aedsp16_hard_write(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_hard_write: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (aedsp16_ext_cfg_write(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_ext_cfg_write: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_SC6600 */</div><div class='del'>-</div><div class='del'>-	if (aedsp16_setup_board(ae_config.base_io) == FALSE) {</div><div class='del'>-		printk("[AEDSP16] aedsp16_setup_board: failed!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ae_config.mss_base != -1) {</div><div class='del'>-		if (ae_config.init &amp; INIT_MSS) {</div><div class='del'>-			if (aedsp16_init_mss(ae_config.base_io) == FALSE) {</div><div class='del'>-				printk("[AEDSP16] Can not initialize"</div><div class='del'>-				       "Microsoft Sound System mode.\n");</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if !defined(MODULE) || defined(AEDSP16_INFO) || defined(AEDSP16_DEBUG)</div><div class='del'>-</div><div class='del'>-	printk("Audio Excel DSP 16 init v%s (%s %s) [",</div><div class='del'>-		VERSION, DSPCopyright,</div><div class='del'>-		DSPVersion);</div><div class='del'>-</div><div class='del'>-	if (ae_config.mpu_base != -1) {</div><div class='del'>-		if (ae_config.init &amp; INIT_MPU401) {</div><div class='del'>-			printk("MPU401");</div><div class='del'>-			if ((ae_config.init &amp; INIT_MSS) ||</div><div class='del'>-			    (ae_config.init &amp; INIT_SBPRO))</div><div class='del'>-				printk(" ");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ae_config.mss_base == -1) {</div><div class='del'>-		if (ae_config.init &amp; INIT_SBPRO) {</div><div class='del'>-			printk("SBPro");</div><div class='del'>-			if (ae_config.init &amp; INIT_MSS)</div><div class='del'>-				printk(" ");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ae_config.mss_base != -1)</div><div class='del'>-		if (ae_config.init &amp; INIT_MSS)</div><div class='del'>-			printk("MSS");</div><div class='del'>-</div><div class='del'>-	printk("]\n");</div><div class='del'>-#endif /* MODULE || AEDSP16_INFO || AEDSP16_DEBUG */</div><div class='del'>-</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_aedsp16_sb(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("init_aedsp16_sb: "));</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the card is already init'ed MSS, we can not init it to SBPRO too</div><div class='del'>- * because the board can not emulate simultaneously MSS and SBPRO.</div><div class='del'>- */</div><div class='del'>-	if (ae_config.init &amp; INIT_MSS)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (ae_config.init &amp; INIT_SBPRO)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	ae_config.init |= INIT_SBPRO;</div><div class='del'>-</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uninit_aedsp16_sb(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("uninit_aedsp16_sb: "));</div><div class='del'>-</div><div class='del'>-	ae_config.init &amp;= ~INIT_SBPRO;</div><div class='del'>-</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_aedsp16_mss(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("init_aedsp16_mss: "));</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If the card is already init'ed SBPRO, we can not init it to MSS too</div><div class='del'>- * because the board can not emulate simultaneously MSS and SBPRO.</div><div class='del'>- */</div><div class='del'>-	if (ae_config.init &amp; INIT_SBPRO)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (ae_config.init &amp; INIT_MSS)</div><div class='del'>-		return FALSE;</div><div class='del'>-/*</div><div class='del'>- * We must allocate the CONFIG_AEDSP16_BASE region too because these are the </div><div class='del'>- * I/O ports to access card's control registers.</div><div class='del'>- */</div><div class='del'>-	if (!(ae_config.init &amp; INIT_MPU401)) {</div><div class='del'>-		if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE,</div><div class='del'>-				"aedsp16 (base)")) {</div><div class='del'>-			printk(</div><div class='del'>-			"AEDSP16 BASE I/O port region is already in use.\n");</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ae_config.init |= INIT_MSS;</div><div class='del'>-</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uninit_aedsp16_mss(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("uninit_aedsp16_mss: "));</div><div class='del'>-</div><div class='del'>-	if ((!(ae_config.init &amp; INIT_MPU401)) &amp;&amp;</div><div class='del'>-	   (ae_config.init &amp; INIT_MSS)) {</div><div class='del'>-		release_region(ae_config.base_io, IOBASE_REGION_SIZE);</div><div class='del'>-		DBG(("AEDSP16 base region released.\n"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ae_config.init &amp;= ~INIT_MSS;</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_aedsp16_mpu(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("init_aedsp16_mpu: "));</div><div class='del'>-</div><div class='del'>-	if (ae_config.init &amp; INIT_MPU401)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We must request the CONFIG_AEDSP16_BASE region too because these are the I/O </div><div class='del'>- * ports to access card's control registers.</div><div class='del'>- */</div><div class='del'>-	if (!(ae_config.init &amp; (INIT_MSS | INIT_SBPRO))) {</div><div class='del'>-		if (!request_region(ae_config.base_io, IOBASE_REGION_SIZE,</div><div class='del'>-					"aedsp16 (base)")) {</div><div class='del'>-			printk(</div><div class='del'>-			"AEDSP16 BASE I/O port region is already in use.\n");</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ae_config.init |= INIT_MPU401;</div><div class='del'>-</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uninit_aedsp16_mpu(void)</div><div class='del'>-{</div><div class='del'>-	DBG(("uninit_aedsp16_mpu: "));</div><div class='del'>-</div><div class='del'>-	if ((!(ae_config.init &amp; (INIT_MSS | INIT_SBPRO))) &amp;&amp;</div><div class='del'>-	   (ae_config.init &amp; INIT_MPU401)) {</div><div class='del'>-		release_region(ae_config.base_io, IOBASE_REGION_SIZE);</div><div class='del'>-		DBG(("AEDSP16 base region released.\n"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ae_config.init &amp;= ~INIT_MPU401;</div><div class='del'>-</div><div class='del'>-	DBG(("done.\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init init_aedsp16(void)</div><div class='del'>-{</div><div class='del'>-	int initialized = FALSE;</div><div class='del'>-</div><div class='del'>-	DBG(("Initializing BASE[0x%x] IRQ[%d] DMA[%d] MIRQ[%d]\n",</div><div class='del'>-	     ae_config.base_io,ae_config.irq,ae_config.dma,ae_config.mpu_irq));</div><div class='del'>-</div><div class='del'>-	if (ae_config.mss_base == -1) {</div><div class='del'>-		if (init_aedsp16_sb() == FALSE) {</div><div class='del'>-			uninit_aedsp16_sb();</div><div class='del'>-		} else {</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ae_config.mpu_base != -1) {</div><div class='del'>-		if (init_aedsp16_mpu() == FALSE) {</div><div class='del'>-			uninit_aedsp16_mpu();</div><div class='del'>-		} else {</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * In the sequence of init routines, the MSS init MUST be the last!</div><div class='del'>- * This because of the special register programming the MSS mode needs.</div><div class='del'>- * A board reset would disable the MSS mode restoring the default SBPRO</div><div class='del'>- * mode.</div><div class='del'>- */</div><div class='del'>-	if (ae_config.mss_base != -1) {</div><div class='del'>-		if (init_aedsp16_mss() == FALSE) {</div><div class='del'>-			uninit_aedsp16_mss();</div><div class='del'>-		} else {</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (initialized)</div><div class='del'>-		initialized = aedsp16_init_board();</div><div class='del'>-	return initialized;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit uninit_aedsp16(void)</div><div class='del'>-{</div><div class='del'>-	if (ae_config.mss_base != -1)</div><div class='del'>-		uninit_aedsp16_mss();</div><div class='del'>-	else</div><div class='del'>-		uninit_aedsp16_sb();</div><div class='del'>-	if (ae_config.mpu_base != -1)</div><div class='del'>-		uninit_aedsp16_mpu();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __initdata io = -1;</div><div class='del'>-static int __initdata irq = -1;</div><div class='del'>-static int __initdata dma = -1;</div><div class='del'>-static int __initdata mpu_irq = -1;</div><div class='del'>-static int __initdata mss_base = -1;</div><div class='del'>-static int __initdata mpu_base = -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-MODULE_PARM_DESC(io, "I/O base address (0x220 0x240)");</div><div class='del'>-module_param(irq, int, 0);</div><div class='del'>-MODULE_PARM_DESC(irq, "IRQ line (5 7 9 10 11)");</div><div class='del'>-module_param(dma, int, 0);</div><div class='del'>-MODULE_PARM_DESC(dma, "dma line (0 1 3)");</div><div class='del'>-module_param(mpu_irq, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ line (5 7 9 10 0)");</div><div class='del'>-module_param(mss_base, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mss_base, "MSS emulation I/O base address (0x530 0xE80)");</div><div class='del'>-module_param(mpu_base, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mpu_base,"MPU-401 I/O base address (0x300 0x310 0x320 0x330)");</div><div class='del'>-MODULE_AUTHOR("Riccardo Facchetti &lt;fizban@tin.it&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Audio Excel DSP 16 Driver Version " VERSION);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int __init do_init_aedsp16(void) {</div><div class='del'>-	printk("Audio Excel DSP 16 init driver Copyright (C) Riccardo Facchetti 1995-98\n");</div><div class='del'>-	if (io == -1 || dma == -1 || irq == -1) {</div><div class='del'>-		printk(KERN_INFO "aedsp16: I/O, IRQ and DMA are mandatory\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ae_config.base_io = io;</div><div class='del'>-	ae_config.irq = irq;</div><div class='del'>-	ae_config.dma = dma;</div><div class='del'>-</div><div class='del'>-	ae_config.mss_base = mss_base;</div><div class='del'>-	ae_config.mpu_base = mpu_base;</div><div class='del'>-	ae_config.mpu_irq = mpu_irq;</div><div class='del'>-</div><div class='del'>-	if (init_aedsp16() == FALSE) {</div><div class='del'>-		printk(KERN_ERR "aedsp16: initialization failed\n");</div><div class='del'>-		/*</div><div class='del'>-		 * XXX</div><div class='del'>-		 * What error should we return here ?</div><div class='del'>-		 */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_aedsp16(void) {</div><div class='del'>-	uninit_aedsp16();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(do_init_aedsp16);</div><div class='del'>-module_exit(cleanup_aedsp16);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_aedsp16(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq, dma, mss_io, mpu_io, mpu_irq */</div><div class='del'>-	int ints[7];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	io	 = ints[1];</div><div class='del'>-	irq	 = ints[2];</div><div class='del'>-	dma	 = ints[3];</div><div class='del'>-	mss_base = ints[4];</div><div class='del'>-	mpu_base = ints[5];</div><div class='del'>-	mpu_irq	 = ints[6];</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("aedsp16=", setup_aedsp16);</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c<br/>deleted file mode 100644<br/>index a8f626d99c5b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/au1550_ac97.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/au1550_ac97.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2147 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * au1550_ac97.c  --  Sound driver for Alchemy Au1550 MIPS Internet Edge</div><div class='del'>- *                    Processor.</div><div class='del'>- *</div><div class='del'>- * Copyright 2004 Embedded Edge, LLC</div><div class='del'>- *	dan@embeddededge.com</div><div class='del'>- *</div><div class='del'>- * Mostly copied from the au1000.c driver and some from the</div><div class='del'>- * PowerMac dbdma driver.</div><div class='del'>- * We assume the processor can do memory coherent DMA.</div><div class='del'>- *</div><div class='del'>- * Ported to 2.6 by Matt Porter &lt;mporter@kernel.crashing.org&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute  it and/or modify it</div><div class='del'>- *  under  the terms of  the GNU General  Public License as published by the</div><div class='del'>- *  Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>- *  option) any later version.</div><div class='del'>- *</div><div class='del'>- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED</div><div class='del'>- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,</div><div class='del'>- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the  GNU General Public License along</div><div class='del'>- *  with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>- *  675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#undef DEBUG</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sound.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/soundcard.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/ac97_codec.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/hardirq.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_psc.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx_dbdma.h&gt;</div><div class='del'>-#include &lt;asm/mach-au1x00/au1xxx.h&gt;</div><div class='del'>-</div><div class='del'>-#undef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-</div><div class='del'>-/* misc stuff */</div><div class='del'>-#define POLL_COUNT   0x50000</div><div class='del'>-#define AC97_EXT_DACS (AC97_EXTID_SDAC | AC97_EXTID_CDAC | AC97_EXTID_LDAC)</div><div class='del'>-</div><div class='del'>-/* The number of DBDMA ring descriptors to allocate.  No sense making</div><div class='del'>- * this too large....if you can't keep up with a few you aren't likely</div><div class='del'>- * to be able to with lots of them, either.</div><div class='del'>- */</div><div class='del'>-#define NUM_DBDMA_DESCRIPTORS 4</div><div class='del'>-</div><div class='del'>-#define err(format, arg...) printk(KERN_ERR format "\n" , ## arg)</div><div class='del'>-</div><div class='del'>-/* Boot options</div><div class='del'>- * 0 = no VRA, 1 = use VRA if codec supports it</div><div class='del'>- */</div><div class='del'>-static DEFINE_MUTEX(au1550_ac97_mutex);</div><div class='del'>-static int      vra = 1;</div><div class='del'>-module_param(vra, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it");</div><div class='del'>-</div><div class='del'>-static struct au1550_state {</div><div class='del'>-	/* soundcore stuff */</div><div class='del'>-	int             dev_audio;</div><div class='del'>-</div><div class='del'>-	struct ac97_codec *codec;</div><div class='del'>-	unsigned        codec_base_caps; /* AC'97 reg 00h, "Reset Register" */</div><div class='del'>-	unsigned        codec_ext_caps;  /* AC'97 reg 28h, "Extended Audio ID" */</div><div class='del'>-	int             no_vra;		/* do not use VRA */</div><div class='del'>-</div><div class='del'>-	spinlock_t      lock;</div><div class='del'>-	struct mutex open_mutex;</div><div class='del'>-	struct mutex sem;</div><div class='del'>-	fmode_t          open_mode;</div><div class='del'>-	wait_queue_head_t open_wait;</div><div class='del'>-</div><div class='del'>-	struct dmabuf {</div><div class='del'>-		u32		dmanr;</div><div class='del'>-		unsigned        sample_rate;</div><div class='del'>-		unsigned	src_factor;</div><div class='del'>-		unsigned        sample_size;</div><div class='del'>-		int             num_channels;</div><div class='del'>-		int		dma_bytes_per_sample;</div><div class='del'>-		int		user_bytes_per_sample;</div><div class='del'>-		int		cnt_factor;</div><div class='del'>-</div><div class='del'>-		void		*rawbuf;</div><div class='del'>-		unsigned        buforder;</div><div class='del'>-		unsigned	numfrag;</div><div class='del'>-		unsigned        fragshift;</div><div class='del'>-		void		*nextIn;</div><div class='del'>-		void		*nextOut;</div><div class='del'>-		int		count;</div><div class='del'>-		unsigned        total_bytes;</div><div class='del'>-		unsigned        error;</div><div class='del'>-		wait_queue_head_t wait;</div><div class='del'>-</div><div class='del'>-		/* redundant, but makes calculations easier */</div><div class='del'>-		unsigned	fragsize;</div><div class='del'>-		unsigned	dma_fragsize;</div><div class='del'>-		unsigned	dmasize;</div><div class='del'>-		unsigned	dma_qcount;</div><div class='del'>-</div><div class='del'>-		/* OSS stuff */</div><div class='del'>-		unsigned        mapped:1;</div><div class='del'>-		unsigned        ready:1;</div><div class='del'>-		unsigned        stopped:1;</div><div class='del'>-		unsigned        ossfragshift;</div><div class='del'>-		int             ossmaxfrags;</div><div class='del'>-		unsigned        subdivision;</div><div class='del'>-	} dma_dac, dma_adc;</div><div class='del'>-} au1550_state;</div><div class='del'>-</div><div class='del'>-static unsigned</div><div class='del'>-ld2(unsigned int x)</div><div class='del'>-{</div><div class='del'>-	unsigned        r = 0;</div><div class='del'>-</div><div class='del'>-	if (x &gt;= 0x10000) {</div><div class='del'>-		x &gt;&gt;= 16;</div><div class='del'>-		r += 16;</div><div class='del'>-	}</div><div class='del'>-	if (x &gt;= 0x100) {</div><div class='del'>-		x &gt;&gt;= 8;</div><div class='del'>-		r += 8;</div><div class='del'>-	}</div><div class='del'>-	if (x &gt;= 0x10) {</div><div class='del'>-		x &gt;&gt;= 4;</div><div class='del'>-		r += 4;</div><div class='del'>-	}</div><div class='del'>-	if (x &gt;= 4) {</div><div class='del'>-		x &gt;&gt;= 2;</div><div class='del'>-		r += 2;</div><div class='del'>-	}</div><div class='del'>-	if (x &gt;= 2)</div><div class='del'>-		r++;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-au1550_delay(int msec)</div><div class='del'>-{</div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	schedule_timeout_uninterruptible(msecs_to_jiffies(msec));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16</div><div class='del'>-rdcodec(struct ac97_codec *codec, u8 addr)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = codec-&gt;private_data;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	u32             cmd, val;</div><div class='del'>-	u16             data;</div><div class='del'>-	int             i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (!(val &amp; PSC_AC97STAT_CP))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT)</div><div class='del'>-		err("rdcodec: codec cmd pending expired!");</div><div class='del'>-</div><div class='del'>-	cmd = (u32)PSC_AC97CDC_INDX(addr);</div><div class='del'>-	cmd |= PSC_AC97CDC_RD;	/* read command */</div><div class='del'>-	au_writel(cmd, PSC_AC97CDC);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* now wait for the data</div><div class='del'>-	*/</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (!(val &amp; PSC_AC97STAT_CP))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT) {</div><div class='del'>-		err("rdcodec: read poll expired!");</div><div class='del'>-		data = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* wait for command done?</div><div class='del'>-	*/</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97EVNT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (val &amp; PSC_AC97EVNT_CD)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT) {</div><div class='del'>-		err("rdcodec: read cmdwait expired!");</div><div class='del'>-		data = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data = au_readl(PSC_AC97CDC) &amp; 0xffff;</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Clear command done event.</div><div class='del'>-	*/</div><div class='del'>-	au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-wrcodec(struct ac97_codec *codec, u8 addr, u16 data)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = codec-&gt;private_data;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	u32             cmd, val;</div><div class='del'>-	int             i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (!(val &amp; PSC_AC97STAT_CP))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT)</div><div class='del'>-		err("wrcodec: codec cmd pending expired!");</div><div class='del'>-</div><div class='del'>-	cmd = (u32)PSC_AC97CDC_INDX(addr);</div><div class='del'>-	cmd |= (u32)data;</div><div class='del'>-	au_writel(cmd, PSC_AC97CDC);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (!(val &amp; PSC_AC97STAT_CP))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT)</div><div class='del'>-		err("wrcodec: codec cmd pending expired!");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97EVNT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (val &amp; PSC_AC97EVNT_CD)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT)</div><div class='del'>-		err("wrcodec: read cmdwait expired!");</div><div class='del'>-</div><div class='del'>-	/* Clear command done event.</div><div class='del'>-	*/</div><div class='del'>-	au_writel(PSC_AC97EVNT_CD, PSC_AC97EVNT);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waitcodec(struct ac97_codec *codec)</div><div class='del'>-{</div><div class='del'>-	u16	temp;</div><div class='del'>-	u32	val;</div><div class='del'>-	int	i;</div><div class='del'>-</div><div class='del'>-	/* codec_wait is used to wait for a ready state after</div><div class='del'>-	 * an AC97C_RESET.</div><div class='del'>-	 */</div><div class='del'>-	au1550_delay(10);</div><div class='del'>-</div><div class='del'>-	/* first poll the CODEC_READY tag bit</div><div class='del'>-	*/</div><div class='del'>-	for (i = 0; i &lt; POLL_COUNT; i++) {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-		if (val &amp; PSC_AC97STAT_CR)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == POLL_COUNT) {</div><div class='del'>-		err("waitcodec: CODEC_READY poll expired!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get AC'97 powerdown control/status register</div><div class='del'>-	*/</div><div class='del'>-	temp = rdcodec(codec, AC97_POWER_CONTROL);</div><div class='del'>-</div><div class='del'>-	/* If anything is powered down, power'em up</div><div class='del'>-	*/</div><div class='del'>-	if (temp &amp; 0x7f00) {</div><div class='del'>-		/* Power on</div><div class='del'>-		*/</div><div class='del'>-		wrcodec(codec, AC97_POWER_CONTROL, 0);</div><div class='del'>-		au1550_delay(100);</div><div class='del'>-</div><div class='del'>-		/* Reread</div><div class='del'>-		*/</div><div class='del'>-		temp = rdcodec(codec, AC97_POWER_CONTROL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if Codec REF,ANL,DAC,ADC ready</div><div class='del'>-	*/</div><div class='del'>-	if ((temp &amp; 0x7f0f) != 0x000f)</div><div class='del'>-		err("codec reg 26 status (0x%x) not ready!!", temp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stop the ADC before calling */</div><div class='del'>-static void</div><div class='del'>-set_adc_rate(struct au1550_state *s, unsigned rate)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *adc = &amp;s-&gt;dma_adc;</div><div class='del'>-	struct dmabuf  *dac = &amp;s-&gt;dma_dac;</div><div class='del'>-	unsigned        adc_rate, dac_rate;</div><div class='del'>-	u16             ac97_extstat;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;no_vra) {</div><div class='del'>-		/* calc SRC factor</div><div class='del'>-		*/</div><div class='del'>-		adc-&gt;src_factor = ((96000 / rate) + 1) &gt;&gt; 1;</div><div class='del'>-		adc-&gt;sample_rate = 48000 / adc-&gt;src_factor;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adc-&gt;src_factor = 1;</div><div class='del'>-</div><div class='del'>-	ac97_extstat = rdcodec(s-&gt;codec, AC97_EXTENDED_STATUS);</div><div class='del'>-</div><div class='del'>-	rate = rate &gt; 48000 ? 48000 : rate;</div><div class='del'>-</div><div class='del'>-	/* enable VRA</div><div class='del'>-	*/</div><div class='del'>-	wrcodec(s-&gt;codec, AC97_EXTENDED_STATUS,</div><div class='del'>-		ac97_extstat | AC97_EXTSTAT_VRA);</div><div class='del'>-</div><div class='del'>-	/* now write the sample rate</div><div class='del'>-	*/</div><div class='del'>-	wrcodec(s-&gt;codec, AC97_PCM_LR_ADC_RATE, (u16) rate);</div><div class='del'>-</div><div class='del'>-	/* read it back for actual supported rate</div><div class='del'>-	*/</div><div class='del'>-	adc_rate = rdcodec(s-&gt;codec, AC97_PCM_LR_ADC_RATE);</div><div class='del'>-</div><div class='del'>-	pr_debug("set_adc_rate: set to %d Hz\n", adc_rate);</div><div class='del'>-</div><div class='del'>-	/* some codec's don't allow unequal DAC and ADC rates, in which case</div><div class='del'>-	 * writing one rate reg actually changes both.</div><div class='del'>-	 */</div><div class='del'>-	dac_rate = rdcodec(s-&gt;codec, AC97_PCM_FRONT_DAC_RATE);</div><div class='del'>-	if (dac-&gt;num_channels &gt; 2)</div><div class='del'>-		wrcodec(s-&gt;codec, AC97_PCM_SURR_DAC_RATE, dac_rate);</div><div class='del'>-	if (dac-&gt;num_channels &gt; 4)</div><div class='del'>-		wrcodec(s-&gt;codec, AC97_PCM_LFE_DAC_RATE, dac_rate);</div><div class='del'>-</div><div class='del'>-	adc-&gt;sample_rate = adc_rate;</div><div class='del'>-	dac-&gt;sample_rate = dac_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stop the DAC before calling */</div><div class='del'>-static void</div><div class='del'>-set_dac_rate(struct au1550_state *s, unsigned rate)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *dac = &amp;s-&gt;dma_dac;</div><div class='del'>-	struct dmabuf  *adc = &amp;s-&gt;dma_adc;</div><div class='del'>-	unsigned        adc_rate, dac_rate;</div><div class='del'>-	u16             ac97_extstat;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;no_vra) {</div><div class='del'>-		/* calc SRC factor</div><div class='del'>-		*/</div><div class='del'>-		dac-&gt;src_factor = ((96000 / rate) + 1) &gt;&gt; 1;</div><div class='del'>-		dac-&gt;sample_rate = 48000 / dac-&gt;src_factor;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dac-&gt;src_factor = 1;</div><div class='del'>-</div><div class='del'>-	ac97_extstat = rdcodec(s-&gt;codec, AC97_EXTENDED_STATUS);</div><div class='del'>-</div><div class='del'>-	rate = rate &gt; 48000 ? 48000 : rate;</div><div class='del'>-</div><div class='del'>-	/* enable VRA</div><div class='del'>-	*/</div><div class='del'>-	wrcodec(s-&gt;codec, AC97_EXTENDED_STATUS,</div><div class='del'>-		ac97_extstat | AC97_EXTSTAT_VRA);</div><div class='del'>-</div><div class='del'>-	/* now write the sample rate</div><div class='del'>-	*/</div><div class='del'>-	wrcodec(s-&gt;codec, AC97_PCM_FRONT_DAC_RATE, (u16) rate);</div><div class='del'>-</div><div class='del'>-	/* I don't support different sample rates for multichannel,</div><div class='del'>-	 * so make these channels the same.</div><div class='del'>-	 */</div><div class='del'>-	if (dac-&gt;num_channels &gt; 2)</div><div class='del'>-		wrcodec(s-&gt;codec, AC97_PCM_SURR_DAC_RATE, (u16) rate);</div><div class='del'>-	if (dac-&gt;num_channels &gt; 4)</div><div class='del'>-		wrcodec(s-&gt;codec, AC97_PCM_LFE_DAC_RATE, (u16) rate);</div><div class='del'>-	/* read it back for actual supported rate</div><div class='del'>-	*/</div><div class='del'>-	dac_rate = rdcodec(s-&gt;codec, AC97_PCM_FRONT_DAC_RATE);</div><div class='del'>-</div><div class='del'>-	pr_debug("set_dac_rate: set to %d Hz\n", dac_rate);</div><div class='del'>-</div><div class='del'>-	/* some codec's don't allow unequal DAC and ADC rates, in which case</div><div class='del'>-	 * writing one rate reg actually changes both.</div><div class='del'>-	 */</div><div class='del'>-	adc_rate = rdcodec(s-&gt;codec, AC97_PCM_LR_ADC_RATE);</div><div class='del'>-</div><div class='del'>-	dac-&gt;sample_rate = dac_rate;</div><div class='del'>-	adc-&gt;sample_rate = adc_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stop_dac(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_dac;</div><div class='del'>-	u32		stat;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	if (db-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	au_writel(PSC_AC97PCR_TP, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for Transmit Busy to show disabled.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		stat = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((stat &amp; PSC_AC97STAT_TB) != 0);</div><div class='del'>-</div><div class='del'>-	au1xxx_dbdma_reset(db-&gt;dmanr);</div><div class='del'>-</div><div class='del'>-	db-&gt;stopped = 1;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stop_adc(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_adc;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	u32		stat;</div><div class='del'>-</div><div class='del'>-	if (db-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	au_writel(PSC_AC97PCR_RP, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for Receive Busy to show disabled.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		stat = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((stat &amp; PSC_AC97STAT_RB) != 0);</div><div class='del'>-</div><div class='del'>-	au1xxx_dbdma_reset(db-&gt;dmanr);</div><div class='del'>-</div><div class='del'>-	db-&gt;stopped = 1;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_xmit_slots(int num_channels)</div><div class='del'>-{</div><div class='del'>-	u32	ac97_config, stat;</div><div class='del'>-</div><div class='del'>-	ac97_config = au_readl(PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-	ac97_config &amp;= ~(PSC_AC97CFG_TXSLOT_MASK | PSC_AC97CFG_DE_ENABLE);</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	switch (num_channels) {</div><div class='del'>-	case 6:		/* stereo with surround and center/LFE,</div><div class='del'>-			 * slots 3,4,6,7,8,9</div><div class='del'>-			 */</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(6);</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(9);</div><div class='del'>-</div><div class='del'>-	case 4:		/* stereo with surround, slots 3,4,7,8 */</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(7);</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(8);</div><div class='del'>-</div><div class='del'>-	case 2:		/* stereo, slots 3,4 */</div><div class='del'>-	case 1:		/* mono */</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(3);</div><div class='del'>-		ac97_config |= PSC_AC97CFG_TXSLOT_ENA(4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	ac97_config |= PSC_AC97CFG_DE_ENABLE;</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for Device ready.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		stat = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((stat &amp; PSC_AC97STAT_DR) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_recv_slots(int num_channels)</div><div class='del'>-{</div><div class='del'>-	u32	ac97_config, stat;</div><div class='del'>-</div><div class='del'>-	ac97_config = au_readl(PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-	ac97_config &amp;= ~(PSC_AC97CFG_RXSLOT_MASK | PSC_AC97CFG_DE_ENABLE);</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Always enable slots 3 and 4 (stereo). Slot 6 is</div><div class='del'>-	 * optional Mic ADC, which we don't support yet.</div><div class='del'>-	 */</div><div class='del'>-	ac97_config |= PSC_AC97CFG_RXSLOT_ENA(3);</div><div class='del'>-	ac97_config |= PSC_AC97CFG_RXSLOT_ENA(4);</div><div class='del'>-</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	ac97_config |= PSC_AC97CFG_DE_ENABLE;</div><div class='del'>-	au_writel(ac97_config, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for Device ready.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		stat = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((stat &amp; PSC_AC97STAT_DR) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hold spinlock for both start_dac() and start_adc() calls */</div><div class='del'>-static void</div><div class='del'>-start_dac(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_dac;</div><div class='del'>-</div><div class='del'>-	if (!db-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	set_xmit_slots(db-&gt;num_channels);</div><div class='del'>-	au_writel(PSC_AC97PCR_TC, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-	au_writel(PSC_AC97PCR_TS, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	au1xxx_dbdma_start(db-&gt;dmanr);</div><div class='del'>-</div><div class='del'>-	db-&gt;stopped = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-start_adc(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_adc;</div><div class='del'>-	int	i;</div><div class='del'>-</div><div class='del'>-	if (!db-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Put two buffers on the ring to get things started.</div><div class='del'>-	*/</div><div class='del'>-	for (i=0; i&lt;2; i++) {</div><div class='del'>-		au1xxx_dbdma_put_dest(db-&gt;dmanr, virt_to_phys(db-&gt;nextIn),</div><div class='del'>-				db-&gt;dma_fragsize, DDMA_FLAGS_IE);</div><div class='del'>-</div><div class='del'>-		db-&gt;nextIn += db-&gt;dma_fragsize;</div><div class='del'>-		if (db-&gt;nextIn &gt;= db-&gt;rawbuf + db-&gt;dmasize)</div><div class='del'>-			db-&gt;nextIn -= db-&gt;dmasize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_recv_slots(db-&gt;num_channels);</div><div class='del'>-	au1xxx_dbdma_start(db-&gt;dmanr);</div><div class='del'>-	au_writel(PSC_AC97PCR_RC, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-	au_writel(PSC_AC97PCR_RS, PSC_AC97PCR);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	db-&gt;stopped = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prog_dmabuf(struct au1550_state *s, struct dmabuf *db)</div><div class='del'>-{</div><div class='del'>-	unsigned user_bytes_per_sec;</div><div class='del'>-	unsigned        bufs;</div><div class='del'>-	unsigned        rate = db-&gt;sample_rate;</div><div class='del'>-</div><div class='del'>-	if (!db-&gt;rawbuf) {</div><div class='del'>-		db-&gt;ready = db-&gt;mapped = 0;</div><div class='del'>-		db-&gt;buforder = 5;	/* 32 * PAGE_SIZE */</div><div class='del'>-		db-&gt;rawbuf = kmalloc((PAGE_SIZE &lt;&lt; db-&gt;buforder), GFP_KERNEL);</div><div class='del'>-		if (!db-&gt;rawbuf)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	db-&gt;cnt_factor = 1;</div><div class='del'>-	if (db-&gt;sample_size == 8)</div><div class='del'>-		db-&gt;cnt_factor *= 2;</div><div class='del'>-	if (db-&gt;num_channels == 1)</div><div class='del'>-		db-&gt;cnt_factor *= 2;</div><div class='del'>-	db-&gt;cnt_factor *= db-&gt;src_factor;</div><div class='del'>-</div><div class='del'>-	db-&gt;count = 0;</div><div class='del'>-	db-&gt;dma_qcount = 0;</div><div class='del'>-	db-&gt;nextIn = db-&gt;nextOut = db-&gt;rawbuf;</div><div class='del'>-</div><div class='del'>-	db-&gt;user_bytes_per_sample = (db-&gt;sample_size&gt;&gt;3) * db-&gt;num_channels;</div><div class='del'>-	db-&gt;dma_bytes_per_sample = 2 * ((db-&gt;num_channels == 1) ?</div><div class='del'>-					2 : db-&gt;num_channels);</div><div class='del'>-</div><div class='del'>-	user_bytes_per_sec = rate * db-&gt;user_bytes_per_sample;</div><div class='del'>-	bufs = PAGE_SIZE &lt;&lt; db-&gt;buforder;</div><div class='del'>-	if (db-&gt;ossfragshift) {</div><div class='del'>-		if ((1000 &lt;&lt; db-&gt;ossfragshift) &lt; user_bytes_per_sec)</div><div class='del'>-			db-&gt;fragshift = ld2(user_bytes_per_sec/1000);</div><div class='del'>-		else</div><div class='del'>-			db-&gt;fragshift = db-&gt;ossfragshift;</div><div class='del'>-	} else {</div><div class='del'>-		db-&gt;fragshift = ld2(user_bytes_per_sec / 100 /</div><div class='del'>-				    (db-&gt;subdivision ? db-&gt;subdivision : 1));</div><div class='del'>-		if (db-&gt;fragshift &lt; 3)</div><div class='del'>-			db-&gt;fragshift = 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	db-&gt;fragsize = 1 &lt;&lt; db-&gt;fragshift;</div><div class='del'>-	db-&gt;dma_fragsize = db-&gt;fragsize * db-&gt;cnt_factor;</div><div class='del'>-	db-&gt;numfrag = bufs / db-&gt;dma_fragsize;</div><div class='del'>-</div><div class='del'>-	while (db-&gt;numfrag &lt; 4 &amp;&amp; db-&gt;fragshift &gt; 3) {</div><div class='del'>-		db-&gt;fragshift--;</div><div class='del'>-		db-&gt;fragsize = 1 &lt;&lt; db-&gt;fragshift;</div><div class='del'>-		db-&gt;dma_fragsize = db-&gt;fragsize * db-&gt;cnt_factor;</div><div class='del'>-		db-&gt;numfrag = bufs / db-&gt;dma_fragsize;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (db-&gt;ossmaxfrags &gt;= 4 &amp;&amp; db-&gt;ossmaxfrags &lt; db-&gt;numfrag)</div><div class='del'>-		db-&gt;numfrag = db-&gt;ossmaxfrags;</div><div class='del'>-</div><div class='del'>-	db-&gt;dmasize = db-&gt;dma_fragsize * db-&gt;numfrag;</div><div class='del'>-	memset(db-&gt;rawbuf, 0, bufs);</div><div class='del'>-</div><div class='del'>-	pr_debug("prog_dmabuf: rate=%d, samplesize=%d, channels=%d\n",</div><div class='del'>-	    rate, db-&gt;sample_size, db-&gt;num_channels);</div><div class='del'>-	pr_debug("prog_dmabuf: fragsize=%d, cnt_factor=%d, dma_fragsize=%d\n",</div><div class='del'>-	    db-&gt;fragsize, db-&gt;cnt_factor, db-&gt;dma_fragsize);</div><div class='del'>-	pr_debug("prog_dmabuf: numfrag=%d, dmasize=%d\n", db-&gt;numfrag, db-&gt;dmasize);</div><div class='del'>-</div><div class='del'>-	db-&gt;ready = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prog_dmabuf_adc(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	stop_adc(s);</div><div class='del'>-	return prog_dmabuf(s, &amp;s-&gt;dma_adc);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prog_dmabuf_dac(struct au1550_state *s)</div><div class='del'>-{</div><div class='del'>-	stop_dac(s);</div><div class='del'>-	return prog_dmabuf(s, &amp;s-&gt;dma_dac);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void dac_dma_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = (struct au1550_state *) dev_id;</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_dac;</div><div class='del'>-	u32	ac97c_stat;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	ac97c_stat = au_readl(PSC_AC97STAT);</div><div class='del'>-	if (ac97c_stat &amp; (AC97C_XU | AC97C_XO | AC97C_TE))</div><div class='del'>-		pr_debug("AC97C status = 0x%08x\n", ac97c_stat);</div><div class='del'>-	db-&gt;dma_qcount--;</div><div class='del'>-</div><div class='del'>-	if (db-&gt;count &gt;= db-&gt;fragsize) {</div><div class='del'>-		if (au1xxx_dbdma_put_source(db-&gt;dmanr,</div><div class='del'>-				virt_to_phys(db-&gt;nextOut), db-&gt;fragsize,</div><div class='del'>-				DDMA_FLAGS_IE) == 0) {</div><div class='del'>-			err("qcount &lt; 2 and no ring room!");</div><div class='del'>-		}</div><div class='del'>-		db-&gt;nextOut += db-&gt;fragsize;</div><div class='del'>-		if (db-&gt;nextOut &gt;= db-&gt;rawbuf + db-&gt;dmasize)</div><div class='del'>-			db-&gt;nextOut -= db-&gt;dmasize;</div><div class='del'>-		db-&gt;count -= db-&gt;fragsize;</div><div class='del'>-		db-&gt;total_bytes += db-&gt;dma_fragsize;</div><div class='del'>-		db-&gt;dma_qcount++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* wake up anybody listening */</div><div class='del'>-	if (waitqueue_active(&amp;db-&gt;wait))</div><div class='del'>-		wake_up(&amp;db-&gt;wait);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void adc_dma_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct	au1550_state *s = (struct au1550_state *)dev_id;</div><div class='del'>-	struct	dmabuf  *dp = &amp;s-&gt;dma_adc;</div><div class='del'>-	u32	obytes;</div><div class='del'>-	char	*obuf;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Pull the buffer from the dma queue.</div><div class='del'>-	*/</div><div class='del'>-	au1xxx_dbdma_get_dest(dp-&gt;dmanr, (void *)(&amp;obuf), &amp;obytes);</div><div class='del'>-</div><div class='del'>-	if ((dp-&gt;count + obytes) &gt; dp-&gt;dmasize) {</div><div class='del'>-		/* Overrun. Stop ADC and log the error</div><div class='del'>-		*/</div><div class='del'>-		spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-		stop_adc(s);</div><div class='del'>-		dp-&gt;error++;</div><div class='del'>-		err("adc overrun");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Put a new empty buffer on the destination DMA.</div><div class='del'>-	*/</div><div class='del'>-	au1xxx_dbdma_put_dest(dp-&gt;dmanr, virt_to_phys(dp-&gt;nextIn),</div><div class='del'>-			      dp-&gt;dma_fragsize, DDMA_FLAGS_IE);</div><div class='del'>-</div><div class='del'>-	dp-&gt;nextIn += dp-&gt;dma_fragsize;</div><div class='del'>-	if (dp-&gt;nextIn &gt;= dp-&gt;rawbuf + dp-&gt;dmasize)</div><div class='del'>-		dp-&gt;nextIn -= dp-&gt;dmasize;</div><div class='del'>-</div><div class='del'>-	dp-&gt;count += obytes;</div><div class='del'>-	dp-&gt;total_bytes += obytes;</div><div class='del'>-</div><div class='del'>-	/* wake up anybody listening</div><div class='del'>-	*/</div><div class='del'>-	if (waitqueue_active(&amp;dp-&gt;wait))</div><div class='del'>-		wake_up(&amp;dp-&gt;wait);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static loff_t</div><div class='del'>-au1550_llseek(struct file *file, loff_t offset, int origin)</div><div class='del'>-{</div><div class='del'>-	return -ESPIPE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_open_mixdev(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	file-&gt;private_data = &amp;au1550_state;</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_release_mixdev(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd,</div><div class='del'>-                        unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	return codec-&gt;mixer_ioctl(codec, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-au1550_ioctl_mixdev(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	struct ac97_codec *codec = s-&gt;codec;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	ret = mixdev_ioctl(codec, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static /*const */ struct file_operations au1550_mixer_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= au1550_llseek,</div><div class='del'>-	.unlocked_ioctl	= au1550_ioctl_mixdev,</div><div class='del'>-	.open		= au1550_open_mixdev,</div><div class='del'>-	.release	= au1550_release_mixdev,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-drain_dac(struct au1550_state *s, int nonblock)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	int             count, tmo;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;dma_dac.mapped || !s-&gt;dma_dac.ready || s-&gt;dma_dac.stopped)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		count = s-&gt;dma_dac.count;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt;= s-&gt;dma_dac.fragsize)</div><div class='del'>-			break;</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			break;</div><div class='del'>-		if (nonblock)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		tmo = 1000 * count / (s-&gt;no_vra ?</div><div class='del'>-				      48000 : s-&gt;dma_dac.sample_rate);</div><div class='del'>-		tmo /= s-&gt;dma_dac.dma_bytes_per_sample;</div><div class='del'>-		au1550_delay(tmo);</div><div class='del'>-	}</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -ERESTARTSYS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u8 S16_TO_U8(s16 ch)</div><div class='del'>-{</div><div class='del'>-	return (u8) (ch &gt;&gt; 8) + 0x80;</div><div class='del'>-}</div><div class='del'>-static inline s16 U8_TO_S16(u8 ch)</div><div class='del'>-{</div><div class='del'>-	return (s16) (ch - 0x80) &lt;&lt; 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Translates user samples to dma buffer suitable for AC'97 DAC data:</div><div class='del'>- *     If mono, copy left channel to right channel in dma buffer.</div><div class='del'>- *     If 8 bit samples, cvt to 16-bit before writing to dma buffer.</div><div class='del'>- *     If interpolating (no VRA), duplicate every audio frame src_factor times.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-translate_from_user(struct dmabuf *db, char* dmabuf, char* userbuf,</div><div class='del'>-							       int dmacount)</div><div class='del'>-{</div><div class='del'>-	int             sample, i;</div><div class='del'>-	int             interp_bytes_per_sample;</div><div class='del'>-	int             num_samples;</div><div class='del'>-	int             mono = (db-&gt;num_channels == 1);</div><div class='del'>-	char            usersample[12];</div><div class='del'>-	s16             ch, dmasample[6];</div><div class='del'>-</div><div class='del'>-	if (db-&gt;sample_size == 16 &amp;&amp; !mono &amp;&amp; db-&gt;src_factor == 1) {</div><div class='del'>-		/* no translation necessary, just copy</div><div class='del'>-		*/</div><div class='del'>-		if (copy_from_user(dmabuf, userbuf, dmacount))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return dmacount;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	interp_bytes_per_sample = db-&gt;dma_bytes_per_sample * db-&gt;src_factor;</div><div class='del'>-	num_samples = dmacount / interp_bytes_per_sample;</div><div class='del'>-</div><div class='del'>-	for (sample = 0; sample &lt; num_samples; sample++) {</div><div class='del'>-		if (copy_from_user(usersample, userbuf,</div><div class='del'>-				   db-&gt;user_bytes_per_sample)) {</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; db-&gt;num_channels; i++) {</div><div class='del'>-			if (db-&gt;sample_size == 8)</div><div class='del'>-				ch = U8_TO_S16(usersample[i]);</div><div class='del'>-			else</div><div class='del'>-				ch = *((s16 *) (&amp;usersample[i * 2]));</div><div class='del'>-			dmasample[i] = ch;</div><div class='del'>-			if (mono)</div><div class='del'>-				dmasample[i + 1] = ch;	/* right channel */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* duplicate every audio frame src_factor times</div><div class='del'>-		*/</div><div class='del'>-		for (i = 0; i &lt; db-&gt;src_factor; i++)</div><div class='del'>-			memcpy(dmabuf, dmasample, db-&gt;dma_bytes_per_sample);</div><div class='del'>-</div><div class='del'>-		userbuf += db-&gt;user_bytes_per_sample;</div><div class='del'>-		dmabuf += interp_bytes_per_sample;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return num_samples * interp_bytes_per_sample;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Translates AC'97 ADC samples to user buffer:</div><div class='del'>- *     If mono, send only left channel to user buffer.</div><div class='del'>- *     If 8 bit samples, cvt from 16 to 8 bit before writing to user buffer.</div><div class='del'>- *     If decimating (no VRA), skip over src_factor audio frames.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-translate_to_user(struct dmabuf *db, char* userbuf, char* dmabuf,</div><div class='del'>-							     int dmacount)</div><div class='del'>-{</div><div class='del'>-	int             sample, i;</div><div class='del'>-	int             interp_bytes_per_sample;</div><div class='del'>-	int             num_samples;</div><div class='del'>-	int             mono = (db-&gt;num_channels == 1);</div><div class='del'>-	char            usersample[12];</div><div class='del'>-</div><div class='del'>-	if (db-&gt;sample_size == 16 &amp;&amp; !mono &amp;&amp; db-&gt;src_factor == 1) {</div><div class='del'>-		/* no translation necessary, just copy</div><div class='del'>-		*/</div><div class='del'>-		if (copy_to_user(userbuf, dmabuf, dmacount))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return dmacount;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	interp_bytes_per_sample = db-&gt;dma_bytes_per_sample * db-&gt;src_factor;</div><div class='del'>-	num_samples = dmacount / interp_bytes_per_sample;</div><div class='del'>-</div><div class='del'>-	for (sample = 0; sample &lt; num_samples; sample++) {</div><div class='del'>-		for (i = 0; i &lt; db-&gt;num_channels; i++) {</div><div class='del'>-			if (db-&gt;sample_size == 8)</div><div class='del'>-				usersample[i] =</div><div class='del'>-					S16_TO_U8(*((s16 *) (&amp;dmabuf[i * 2])));</div><div class='del'>-			else</div><div class='del'>-				*((s16 *) (&amp;usersample[i * 2])) =</div><div class='del'>-					*((s16 *) (&amp;dmabuf[i * 2]));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (copy_to_user(userbuf, usersample,</div><div class='del'>-				 db-&gt;user_bytes_per_sample)) {</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		userbuf += db-&gt;user_bytes_per_sample;</div><div class='del'>-		dmabuf += interp_bytes_per_sample;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return num_samples * interp_bytes_per_sample;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copy audio data to/from user buffer from/to dma buffer, taking care</div><div class='del'>- * that we wrap when reading/writing the dma buffer. Returns actual byte</div><div class='del'>- * count written to or read from the dma buffer.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-copy_dmabuf_user(struct dmabuf *db, char* userbuf, int count, int to_user)</div><div class='del'>-{</div><div class='del'>-	char           *bufptr = to_user ? db-&gt;nextOut : db-&gt;nextIn;</div><div class='del'>-	char           *bufend = db-&gt;rawbuf + db-&gt;dmasize;</div><div class='del'>-	int             cnt, ret;</div><div class='del'>-</div><div class='del'>-	if (bufptr + count &gt; bufend) {</div><div class='del'>-		int             partial = (int) (bufend - bufptr);</div><div class='del'>-		if (to_user) {</div><div class='del'>-			if ((cnt = translate_to_user(db, userbuf,</div><div class='del'>-						     bufptr, partial)) &lt; 0)</div><div class='del'>-				return cnt;</div><div class='del'>-			ret = cnt;</div><div class='del'>-			if ((cnt = translate_to_user(db, userbuf + partial,</div><div class='del'>-						     db-&gt;rawbuf,</div><div class='del'>-						     count - partial)) &lt; 0)</div><div class='del'>-				return cnt;</div><div class='del'>-			ret += cnt;</div><div class='del'>-		} else {</div><div class='del'>-			if ((cnt = translate_from_user(db, bufptr, userbuf,</div><div class='del'>-						       partial)) &lt; 0)</div><div class='del'>-				return cnt;</div><div class='del'>-			ret = cnt;</div><div class='del'>-			if ((cnt = translate_from_user(db, db-&gt;rawbuf,</div><div class='del'>-						       userbuf + partial,</div><div class='del'>-						       count - partial)) &lt; 0)</div><div class='del'>-				return cnt;</div><div class='del'>-			ret += cnt;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (to_user)</div><div class='del'>-			ret = translate_to_user(db, userbuf, bufptr, count);</div><div class='del'>-		else</div><div class='del'>-			ret = translate_from_user(db, bufptr, userbuf, count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_adc;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	ssize_t         ret;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	int             cnt, usercnt, avail;</div><div class='del'>-</div><div class='del'>-	if (db-&gt;mapped)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>-	count *= db-&gt;cnt_factor;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;s-&gt;sem);</div><div class='del'>-	add_wait_queue(&amp;db-&gt;wait, &amp;wait);</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		/* wait for samples in ADC dma buffer</div><div class='del'>-		*/</div><div class='del'>-		do {</div><div class='del'>-			spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-			if (db-&gt;stopped)</div><div class='del'>-				start_adc(s);</div><div class='del'>-			avail = db-&gt;count;</div><div class='del'>-			if (avail &lt;= 0)</div><div class='del'>-				__set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-			if (avail &lt;= 0) {</div><div class='del'>-				if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-					if (!ret)</div><div class='del'>-						ret = -EAGAIN;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				mutex_unlock(&amp;s-&gt;sem);</div><div class='del'>-				schedule();</div><div class='del'>-				if (signal_pending(current)) {</div><div class='del'>-					if (!ret)</div><div class='del'>-						ret = -ERESTARTSYS;</div><div class='del'>-					goto out2;</div><div class='del'>-				}</div><div class='del'>-				mutex_lock(&amp;s-&gt;sem);</div><div class='del'>-			}</div><div class='del'>-		} while (avail &lt;= 0);</div><div class='del'>-</div><div class='del'>-		/* copy from nextOut to user</div><div class='del'>-		*/</div><div class='del'>-		if ((cnt = copy_dmabuf_user(db, buffer,</div><div class='del'>-					    count &gt; avail ?</div><div class='del'>-					    avail : count, 1)) &lt; 0) {</div><div class='del'>-			if (!ret)</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		db-&gt;count -= cnt;</div><div class='del'>-		db-&gt;nextOut += cnt;</div><div class='del'>-		if (db-&gt;nextOut &gt;= db-&gt;rawbuf + db-&gt;dmasize)</div><div class='del'>-			db-&gt;nextOut -= db-&gt;dmasize;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		count -= cnt;</div><div class='del'>-		usercnt = cnt / db-&gt;cnt_factor;</div><div class='del'>-		buffer += usercnt;</div><div class='del'>-		ret += usercnt;</div><div class='del'>-	}			/* while (count &gt; 0) */</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;s-&gt;sem);</div><div class='del'>-out2:</div><div class='del'>-	remove_wait_queue(&amp;db-&gt;wait, &amp;wait);</div><div class='del'>-	set_current_state(TASK_RUNNING);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	struct dmabuf  *db = &amp;s-&gt;dma_dac;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	ssize_t         ret = 0;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	int             cnt, usercnt, avail;</div><div class='del'>-</div><div class='del'>-	pr_debug("write: count=%d\n", count);</div><div class='del'>-</div><div class='del'>-	if (db-&gt;mapped)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (!access_ok(VERIFY_READ, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	count *= db-&gt;cnt_factor;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;s-&gt;sem);</div><div class='del'>-	add_wait_queue(&amp;db-&gt;wait, &amp;wait);</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		/* wait for space in playback buffer</div><div class='del'>-		*/</div><div class='del'>-		do {</div><div class='del'>-			spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-			avail = (int) db-&gt;dmasize - db-&gt;count;</div><div class='del'>-			if (avail &lt;= 0)</div><div class='del'>-				__set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-			if (avail &lt;= 0) {</div><div class='del'>-				if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-					if (!ret)</div><div class='del'>-						ret = -EAGAIN;</div><div class='del'>-					goto out;</div><div class='del'>-				}</div><div class='del'>-				mutex_unlock(&amp;s-&gt;sem);</div><div class='del'>-				schedule();</div><div class='del'>-				if (signal_pending(current)) {</div><div class='del'>-					if (!ret)</div><div class='del'>-						ret = -ERESTARTSYS;</div><div class='del'>-					goto out2;</div><div class='del'>-				}</div><div class='del'>-				mutex_lock(&amp;s-&gt;sem);</div><div class='del'>-			}</div><div class='del'>-		} while (avail &lt;= 0);</div><div class='del'>-</div><div class='del'>-		/* copy from user to nextIn</div><div class='del'>-		*/</div><div class='del'>-		if ((cnt = copy_dmabuf_user(db, (char *) buffer,</div><div class='del'>-					    count &gt; avail ?</div><div class='del'>-					    avail : count, 0)) &lt; 0) {</div><div class='del'>-			if (!ret)</div><div class='del'>-				ret = -EFAULT;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		db-&gt;count += cnt;</div><div class='del'>-		db-&gt;nextIn += cnt;</div><div class='del'>-		if (db-&gt;nextIn &gt;= db-&gt;rawbuf + db-&gt;dmasize)</div><div class='del'>-			db-&gt;nextIn -= db-&gt;dmasize;</div><div class='del'>-</div><div class='del'>-		/* If the data is available, we want to keep two buffers</div><div class='del'>-		 * on the dma queue.  If the queue count reaches zero,</div><div class='del'>-		 * we know the dma has stopped.</div><div class='del'>-		 */</div><div class='del'>-		while ((db-&gt;dma_qcount &lt; 2) &amp;&amp; (db-&gt;count &gt;= db-&gt;fragsize)) {</div><div class='del'>-			if (au1xxx_dbdma_put_source(db-&gt;dmanr,</div><div class='del'>-				virt_to_phys(db-&gt;nextOut), db-&gt;fragsize,</div><div class='del'>-				DDMA_FLAGS_IE) == 0) {</div><div class='del'>-				err("qcount &lt; 2 and no ring room!");</div><div class='del'>-			}</div><div class='del'>-			db-&gt;nextOut += db-&gt;fragsize;</div><div class='del'>-			if (db-&gt;nextOut &gt;= db-&gt;rawbuf + db-&gt;dmasize)</div><div class='del'>-				db-&gt;nextOut -= db-&gt;dmasize;</div><div class='del'>-			db-&gt;total_bytes += db-&gt;dma_fragsize;</div><div class='del'>-			if (db-&gt;dma_qcount == 0)</div><div class='del'>-				start_dac(s);</div><div class='del'>-			db-&gt;dma_qcount++;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		count -= cnt;</div><div class='del'>-		usercnt = cnt / db-&gt;cnt_factor;</div><div class='del'>-		buffer += usercnt;</div><div class='del'>-		ret += usercnt;</div><div class='del'>-	}			/* while (count &gt; 0) */</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;s-&gt;sem);</div><div class='del'>-out2:</div><div class='del'>-	remove_wait_queue(&amp;db-&gt;wait, &amp;wait);</div><div class='del'>-	set_current_state(TASK_RUNNING);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* No kernel lock - we have our own spinlock */</div><div class='del'>-static unsigned int</div><div class='del'>-au1550_poll(struct file *file, struct poll_table_struct *wait)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	unsigned int    mask = 0;</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if (!s-&gt;dma_dac.ready)</div><div class='del'>-			return 0;</div><div class='del'>-		poll_wait(file, &amp;s-&gt;dma_dac.wait, wait);</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		if (!s-&gt;dma_adc.ready)</div><div class='del'>-			return 0;</div><div class='del'>-		poll_wait(file, &amp;s-&gt;dma_adc.wait, wait);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		if (s-&gt;dma_adc.count &gt;= (signed)s-&gt;dma_adc.dma_fragsize)</div><div class='del'>-			mask |= POLLIN | POLLRDNORM;</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if (s-&gt;dma_dac.mapped) {</div><div class='del'>-			if (s-&gt;dma_dac.count &gt;=</div><div class='del'>-			    (signed)s-&gt;dma_dac.dma_fragsize)</div><div class='del'>-				mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-		} else {</div><div class='del'>-			if ((signed) s-&gt;dma_dac.dmasize &gt;=</div><div class='del'>-			    s-&gt;dma_dac.count + (signed)s-&gt;dma_dac.dma_fragsize)</div><div class='del'>-				mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	struct dmabuf  *db;</div><div class='del'>-	unsigned long   size;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	mutex_lock(&amp;s-&gt;sem);</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_WRITE)</div><div class='del'>-		db = &amp;s-&gt;dma_dac;</div><div class='del'>-	else if (vma-&gt;vm_flags &amp; VM_READ)</div><div class='del'>-		db = &amp;s-&gt;dma_adc;</div><div class='del'>-	else {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (vma-&gt;vm_pgoff != 0) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='del'>-	if (size &gt; (PAGE_SIZE &lt;&lt; db-&gt;buforder)) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (remap_pfn_range(vma, vma-&gt;vm_start, page_to_pfn(virt_to_page(db-&gt;rawbuf)),</div><div class='del'>-			     size, vma-&gt;vm_page_prot)) {</div><div class='del'>-		ret = -EAGAIN;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	vma-&gt;vm_flags &amp;= ~VM_IO;</div><div class='del'>-	db-&gt;mapped = 1;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;s-&gt;sem);</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-static struct ioctl_str_t {</div><div class='del'>-	unsigned int    cmd;</div><div class='del'>-	const char     *str;</div><div class='del'>-} ioctl_str[] = {</div><div class='del'>-	{SNDCTL_DSP_RESET, "SNDCTL_DSP_RESET"},</div><div class='del'>-	{SNDCTL_DSP_SYNC, "SNDCTL_DSP_SYNC"},</div><div class='del'>-	{SNDCTL_DSP_SPEED, "SNDCTL_DSP_SPEED"},</div><div class='del'>-	{SNDCTL_DSP_STEREO, "SNDCTL_DSP_STEREO"},</div><div class='del'>-	{SNDCTL_DSP_GETBLKSIZE, "SNDCTL_DSP_GETBLKSIZE"},</div><div class='del'>-	{SNDCTL_DSP_SAMPLESIZE, "SNDCTL_DSP_SAMPLESIZE"},</div><div class='del'>-	{SNDCTL_DSP_CHANNELS, "SNDCTL_DSP_CHANNELS"},</div><div class='del'>-	{SOUND_PCM_WRITE_CHANNELS, "SOUND_PCM_WRITE_CHANNELS"},</div><div class='del'>-	{SOUND_PCM_WRITE_FILTER, "SOUND_PCM_WRITE_FILTER"},</div><div class='del'>-	{SNDCTL_DSP_POST, "SNDCTL_DSP_POST"},</div><div class='del'>-	{SNDCTL_DSP_SUBDIVIDE, "SNDCTL_DSP_SUBDIVIDE"},</div><div class='del'>-	{SNDCTL_DSP_SETFRAGMENT, "SNDCTL_DSP_SETFRAGMENT"},</div><div class='del'>-	{SNDCTL_DSP_GETFMTS, "SNDCTL_DSP_GETFMTS"},</div><div class='del'>-	{SNDCTL_DSP_SETFMT, "SNDCTL_DSP_SETFMT"},</div><div class='del'>-	{SNDCTL_DSP_GETOSPACE, "SNDCTL_DSP_GETOSPACE"},</div><div class='del'>-	{SNDCTL_DSP_GETISPACE, "SNDCTL_DSP_GETISPACE"},</div><div class='del'>-	{SNDCTL_DSP_NONBLOCK, "SNDCTL_DSP_NONBLOCK"},</div><div class='del'>-	{SNDCTL_DSP_GETCAPS, "SNDCTL_DSP_GETCAPS"},</div><div class='del'>-	{SNDCTL_DSP_GETTRIGGER, "SNDCTL_DSP_GETTRIGGER"},</div><div class='del'>-	{SNDCTL_DSP_SETTRIGGER, "SNDCTL_DSP_SETTRIGGER"},</div><div class='del'>-	{SNDCTL_DSP_GETIPTR, "SNDCTL_DSP_GETIPTR"},</div><div class='del'>-	{SNDCTL_DSP_GETOPTR, "SNDCTL_DSP_GETOPTR"},</div><div class='del'>-	{SNDCTL_DSP_MAPINBUF, "SNDCTL_DSP_MAPINBUF"},</div><div class='del'>-	{SNDCTL_DSP_MAPOUTBUF, "SNDCTL_DSP_MAPOUTBUF"},</div><div class='del'>-	{SNDCTL_DSP_SETSYNCRO, "SNDCTL_DSP_SETSYNCRO"},</div><div class='del'>-	{SNDCTL_DSP_SETDUPLEX, "SNDCTL_DSP_SETDUPLEX"},</div><div class='del'>-	{SNDCTL_DSP_GETODELAY, "SNDCTL_DSP_GETODELAY"},</div><div class='del'>-	{SNDCTL_DSP_GETCHANNELMASK, "SNDCTL_DSP_GETCHANNELMASK"},</div><div class='del'>-	{SNDCTL_DSP_BIND_CHANNEL, "SNDCTL_DSP_BIND_CHANNEL"},</div><div class='del'>-	{OSS_GETVERSION, "OSS_GETVERSION"},</div><div class='del'>-	{SOUND_PCM_READ_RATE, "SOUND_PCM_READ_RATE"},</div><div class='del'>-	{SOUND_PCM_READ_CHANNELS, "SOUND_PCM_READ_CHANNELS"},</div><div class='del'>-	{SOUND_PCM_READ_BITS, "SOUND_PCM_READ_BITS"},</div><div class='del'>-	{SOUND_PCM_READ_FILTER, "SOUND_PCM_READ_FILTER"}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dma_count_done(struct dmabuf *db)</div><div class='del'>-{</div><div class='del'>-	if (db-&gt;stopped)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return db-&gt;dma_fragsize - au1xxx_get_dma_residue(db-&gt;dmanr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	audio_buf_info  abinfo;</div><div class='del'>-	count_info      cinfo;</div><div class='del'>-	int             count;</div><div class='del'>-	int             val, mapped, ret, diff;</div><div class='del'>-</div><div class='del'>-	mapped = ((file-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; s-&gt;dma_dac.mapped) ||</div><div class='del'>-		((file-&gt;f_mode &amp; FMODE_READ) &amp;&amp; s-&gt;dma_adc.mapped);</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	for (count = 0; count &lt; ARRAY_SIZE(ioctl_str); count++) {</div><div class='del'>-		if (ioctl_str[count].cmd == cmd)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (count &lt; ARRAY_SIZE(ioctl_str))</div><div class='del'>-		pr_debug("ioctl %s, arg=0x%lxn", ioctl_str[count].str, arg);</div><div class='del'>-	else</div><div class='del'>-		pr_debug("ioctl 0x%x unknown, arg=0x%lx\n", cmd, arg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case OSS_GETVERSION:</div><div class='del'>-		return put_user(SOUND_VERSION, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SYNC:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return drain_dac(s, file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETDUPLEX:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETCAPS:</div><div class='del'>-		return put_user(DSP_CAP_DUPLEX | DSP_CAP_REALTIME |</div><div class='del'>-				DSP_CAP_TRIGGER | DSP_CAP_MMAP, (int *)arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_RESET:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			synchronize_irq();</div><div class='del'>-			s-&gt;dma_dac.count = s-&gt;dma_dac.total_bytes = 0;</div><div class='del'>-			s-&gt;dma_dac.nextIn = s-&gt;dma_dac.nextOut =</div><div class='del'>-				s-&gt;dma_dac.rawbuf;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			synchronize_irq();</div><div class='del'>-			s-&gt;dma_adc.count = s-&gt;dma_adc.total_bytes = 0;</div><div class='del'>-			s-&gt;dma_adc.nextIn = s-&gt;dma_adc.nextOut =</div><div class='del'>-				s-&gt;dma_adc.rawbuf;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SPEED:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val &gt;= 0) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				stop_adc(s);</div><div class='del'>-				set_adc_rate(s, val);</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				stop_dac(s);</div><div class='del'>-				set_dac_rate(s, val);</div><div class='del'>-			}</div><div class='del'>-			if (s-&gt;open_mode &amp; FMODE_READ)</div><div class='del'>-				if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-					return ret;</div><div class='del'>-			if (s-&gt;open_mode &amp; FMODE_WRITE)</div><div class='del'>-				if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-					return ret;</div><div class='del'>-		}</div><div class='del'>-		return put_user((file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-				s-&gt;dma_adc.sample_rate :</div><div class='del'>-				s-&gt;dma_dac.sample_rate,</div><div class='del'>-				(int *)arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_STEREO:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			s-&gt;dma_adc.num_channels = val ? 2 : 1;</div><div class='del'>-			if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			s-&gt;dma_dac.num_channels = val ? 2 : 1;</div><div class='del'>-			if (s-&gt;codec_ext_caps &amp; AC97_EXT_DACS) {</div><div class='del'>-				/* disable surround and center/lfe in AC'97</div><div class='del'>-				*/</div><div class='del'>-				u16 ext_stat = rdcodec(s-&gt;codec,</div><div class='del'>-						       AC97_EXTENDED_STATUS);</div><div class='del'>-				wrcodec(s-&gt;codec, AC97_EXTENDED_STATUS,</div><div class='del'>-					ext_stat | (AC97_EXTSTAT_PRI |</div><div class='del'>-						    AC97_EXTSTAT_PRJ |</div><div class='del'>-						    AC97_EXTSTAT_PRK));</div><div class='del'>-			}</div><div class='del'>-			if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_CHANNELS:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != 0) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				if (val &lt; 0 || val &gt; 2)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				stop_adc(s);</div><div class='del'>-				s-&gt;dma_adc.num_channels = val;</div><div class='del'>-				if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				switch (val) {</div><div class='del'>-				case 1:</div><div class='del'>-				case 2:</div><div class='del'>-					break;</div><div class='del'>-				case 3:</div><div class='del'>-				case 5:</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				case 4:</div><div class='del'>-					if (!(s-&gt;codec_ext_caps &amp;</div><div class='del'>-					      AC97_EXTID_SDAC))</div><div class='del'>-						return -EINVAL;</div><div class='del'>-					break;</div><div class='del'>-				case 6:</div><div class='del'>-					if ((s-&gt;codec_ext_caps &amp;</div><div class='del'>-					     AC97_EXT_DACS) != AC97_EXT_DACS)</div><div class='del'>-						return -EINVAL;</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				stop_dac(s);</div><div class='del'>-				if (val &lt;= 2 &amp;&amp;</div><div class='del'>-				    (s-&gt;codec_ext_caps &amp; AC97_EXT_DACS)) {</div><div class='del'>-					/* disable surround and center/lfe</div><div class='del'>-					 * channels in AC'97</div><div class='del'>-					 */</div><div class='del'>-					u16             ext_stat =</div><div class='del'>-						rdcodec(s-&gt;codec,</div><div class='del'>-							AC97_EXTENDED_STATUS);</div><div class='del'>-					wrcodec(s-&gt;codec,</div><div class='del'>-						AC97_EXTENDED_STATUS,</div><div class='del'>-						ext_stat | (AC97_EXTSTAT_PRI |</div><div class='del'>-							    AC97_EXTSTAT_PRJ |</div><div class='del'>-							    AC97_EXTSTAT_PRK));</div><div class='del'>-				} else if (val &gt;= 4) {</div><div class='del'>-					/* enable surround, center/lfe</div><div class='del'>-					 * channels in AC'97</div><div class='del'>-					 */</div><div class='del'>-					u16             ext_stat =</div><div class='del'>-						rdcodec(s-&gt;codec,</div><div class='del'>-							AC97_EXTENDED_STATUS);</div><div class='del'>-					ext_stat &amp;= ~AC97_EXTSTAT_PRJ;</div><div class='del'>-					if (val == 6)</div><div class='del'>-						ext_stat &amp;=</div><div class='del'>-							~(AC97_EXTSTAT_PRI |</div><div class='del'>-							  AC97_EXTSTAT_PRK);</div><div class='del'>-					wrcodec(s-&gt;codec,</div><div class='del'>-						AC97_EXTENDED_STATUS,</div><div class='del'>-						ext_stat);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				s-&gt;dma_dac.num_channels = val;</div><div class='del'>-				if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETFMTS:	/* Returns a mask */</div><div class='del'>-		return put_user(AFMT_S16_LE | AFMT_U8, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFMT:	/* Selects ONE fmt */</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != AFMT_QUERY) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				stop_adc(s);</div><div class='del'>-				if (val == AFMT_S16_LE)</div><div class='del'>-					s-&gt;dma_adc.sample_size = 16;</div><div class='del'>-				else {</div><div class='del'>-					val = AFMT_U8;</div><div class='del'>-					s-&gt;dma_adc.sample_size = 8;</div><div class='del'>-				}</div><div class='del'>-				if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				stop_dac(s);</div><div class='del'>-				if (val == AFMT_S16_LE)</div><div class='del'>-					s-&gt;dma_dac.sample_size = 16;</div><div class='del'>-				else {</div><div class='del'>-					val = AFMT_U8;</div><div class='del'>-					s-&gt;dma_dac.sample_size = 8;</div><div class='del'>-				}</div><div class='del'>-				if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-				val = (s-&gt;dma_adc.sample_size == 16) ?</div><div class='del'>-					AFMT_S16_LE : AFMT_U8;</div><div class='del'>-			else</div><div class='del'>-				val = (s-&gt;dma_dac.sample_size == 16) ?</div><div class='del'>-					AFMT_S16_LE : AFMT_U8;</div><div class='del'>-		}</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_POST:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETTRIGGER:</div><div class='del'>-		val = 0;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ &amp;&amp; !s-&gt;dma_adc.stopped)</div><div class='del'>-			val |= PCM_ENABLE_INPUT;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE &amp;&amp; !s-&gt;dma_dac.stopped)</div><div class='del'>-			val |= PCM_ENABLE_OUTPUT;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETTRIGGER:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			if (val &amp; PCM_ENABLE_INPUT) {</div><div class='del'>-				spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-				start_adc(s);</div><div class='del'>-				spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-			} else</div><div class='del'>-				stop_adc(s);</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			if (val &amp; PCM_ENABLE_OUTPUT) {</div><div class='del'>-				spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-				start_dac(s);</div><div class='del'>-				spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-			} else</div><div class='del'>-				stop_dac(s);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		abinfo.fragsize = s-&gt;dma_dac.fragsize;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		count = s-&gt;dma_dac.count;</div><div class='del'>-		count -= dma_count_done(&amp;s-&gt;dma_dac);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			count = 0;</div><div class='del'>-		abinfo.bytes = (s-&gt;dma_dac.dmasize - count) /</div><div class='del'>-			s-&gt;dma_dac.cnt_factor;</div><div class='del'>-		abinfo.fragstotal = s-&gt;dma_dac.numfrag;</div><div class='del'>-		abinfo.fragments = abinfo.bytes &gt;&gt; s-&gt;dma_dac.fragshift;</div><div class='del'>-		pr_debug("ioctl SNDCTL_DSP_GETOSPACE: bytes=%d, fragments=%d\n", abinfo.bytes, abinfo.fragments);</div><div class='del'>-		return copy_to_user((void *) arg, &amp;abinfo,</div><div class='del'>-				    sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETISPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		abinfo.fragsize = s-&gt;dma_adc.fragsize;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		count = s-&gt;dma_adc.count;</div><div class='del'>-		count += dma_count_done(&amp;s-&gt;dma_adc);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			count = 0;</div><div class='del'>-		abinfo.bytes = count / s-&gt;dma_adc.cnt_factor;</div><div class='del'>-		abinfo.fragstotal = s-&gt;dma_adc.numfrag;</div><div class='del'>-		abinfo.fragments = abinfo.bytes &gt;&gt; s-&gt;dma_adc.fragshift;</div><div class='del'>-		return copy_to_user((void *) arg, &amp;abinfo,</div><div class='del'>-				    sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_NONBLOCK:</div><div class='del'>-		spin_lock(&amp;file-&gt;f_lock);</div><div class='del'>-		file-&gt;f_flags |= O_NONBLOCK;</div><div class='del'>-		spin_unlock(&amp;file-&gt;f_lock);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETODELAY:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		count = s-&gt;dma_dac.count;</div><div class='del'>-		count -= dma_count_done(&amp;s-&gt;dma_dac);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			count = 0;</div><div class='del'>-		count /= s-&gt;dma_dac.cnt_factor;</div><div class='del'>-		return put_user(count, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETIPTR:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cinfo.bytes = s-&gt;dma_adc.total_bytes;</div><div class='del'>-		count = s-&gt;dma_adc.count;</div><div class='del'>-		if (!s-&gt;dma_adc.stopped) {</div><div class='del'>-			diff = dma_count_done(&amp;s-&gt;dma_adc);</div><div class='del'>-			count += diff;</div><div class='del'>-			cinfo.bytes += diff;</div><div class='del'>-			cinfo.ptr =  virt_to_phys(s-&gt;dma_adc.nextIn) + diff -</div><div class='del'>-				virt_to_phys(s-&gt;dma_adc.rawbuf);</div><div class='del'>-		} else</div><div class='del'>-			cinfo.ptr = virt_to_phys(s-&gt;dma_adc.nextIn) -</div><div class='del'>-				virt_to_phys(s-&gt;dma_adc.rawbuf);</div><div class='del'>-		if (s-&gt;dma_adc.mapped)</div><div class='del'>-			s-&gt;dma_adc.count &amp;= (s-&gt;dma_adc.dma_fragsize-1);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			count = 0;</div><div class='del'>-		cinfo.blocks = count &gt;&gt; s-&gt;dma_adc.fragshift;</div><div class='del'>-		return copy_to_user((void *) arg, &amp;cinfo, sizeof(cinfo));</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOPTR:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cinfo.bytes = s-&gt;dma_dac.total_bytes;</div><div class='del'>-		count = s-&gt;dma_dac.count;</div><div class='del'>-		if (!s-&gt;dma_dac.stopped) {</div><div class='del'>-			diff = dma_count_done(&amp;s-&gt;dma_dac);</div><div class='del'>-			count -= diff;</div><div class='del'>-			cinfo.bytes += diff;</div><div class='del'>-			cinfo.ptr = virt_to_phys(s-&gt;dma_dac.nextOut) + diff -</div><div class='del'>-				virt_to_phys(s-&gt;dma_dac.rawbuf);</div><div class='del'>-		} else</div><div class='del'>-			cinfo.ptr = virt_to_phys(s-&gt;dma_dac.nextOut) -</div><div class='del'>-				virt_to_phys(s-&gt;dma_dac.rawbuf);</div><div class='del'>-		if (s-&gt;dma_dac.mapped)</div><div class='del'>-			s-&gt;dma_dac.count &amp;= (s-&gt;dma_dac.dma_fragsize-1);</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (count &lt; 0)</div><div class='del'>-			count = 0;</div><div class='del'>-		cinfo.blocks = count &gt;&gt; s-&gt;dma_dac.fragshift;</div><div class='del'>-		return copy_to_user((void *) arg, &amp;cinfo, sizeof(cinfo));</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETBLKSIZE:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return put_user(s-&gt;dma_dac.fragsize, (int *) arg);</div><div class='del'>-		else</div><div class='del'>-			return put_user(s-&gt;dma_adc.fragsize, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFRAGMENT:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			s-&gt;dma_adc.ossfragshift = val &amp; 0xffff;</div><div class='del'>-			s-&gt;dma_adc.ossmaxfrags = (val &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-			if (s-&gt;dma_adc.ossfragshift &lt; 4)</div><div class='del'>-				s-&gt;dma_adc.ossfragshift = 4;</div><div class='del'>-			if (s-&gt;dma_adc.ossfragshift &gt; 15)</div><div class='del'>-				s-&gt;dma_adc.ossfragshift = 15;</div><div class='del'>-			if (s-&gt;dma_adc.ossmaxfrags &lt; 4)</div><div class='del'>-				s-&gt;dma_adc.ossmaxfrags = 4;</div><div class='del'>-			if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			s-&gt;dma_dac.ossfragshift = val &amp; 0xffff;</div><div class='del'>-			s-&gt;dma_dac.ossmaxfrags = (val &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-			if (s-&gt;dma_dac.ossfragshift &lt; 4)</div><div class='del'>-				s-&gt;dma_dac.ossfragshift = 4;</div><div class='del'>-			if (s-&gt;dma_dac.ossfragshift &gt; 15)</div><div class='del'>-				s-&gt;dma_dac.ossfragshift = 15;</div><div class='del'>-			if (s-&gt;dma_dac.ossmaxfrags &lt; 4)</div><div class='del'>-				s-&gt;dma_dac.ossmaxfrags = 4;</div><div class='del'>-			if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SUBDIVIDE:</div><div class='del'>-		if ((file-&gt;f_mode &amp; FMODE_READ &amp;&amp; s-&gt;dma_adc.subdivision) ||</div><div class='del'>-		    (file-&gt;f_mode &amp; FMODE_WRITE &amp;&amp; s-&gt;dma_dac.subdivision))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != 1 &amp;&amp; val != 2 &amp;&amp; val != 4)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			s-&gt;dma_adc.subdivision = val;</div><div class='del'>-			if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			s-&gt;dma_dac.subdivision = val;</div><div class='del'>-			if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-				return ret;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_RATE:</div><div class='del'>-		return put_user((file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-				s-&gt;dma_adc.sample_rate :</div><div class='del'>-				s-&gt;dma_dac.sample_rate,</div><div class='del'>-				(int *)arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_CHANNELS:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			return put_user(s-&gt;dma_adc.num_channels, (int *)arg);</div><div class='del'>-		else</div><div class='del'>-			return put_user(s-&gt;dma_dac.num_channels, (int *)arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_BITS:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			return put_user(s-&gt;dma_adc.sample_size, (int *)arg);</div><div class='del'>-		else</div><div class='del'>-			return put_user(s-&gt;dma_dac.sample_size, (int *)arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_WRITE_FILTER:</div><div class='del'>-	case SNDCTL_DSP_SETSYNCRO:</div><div class='del'>-	case SOUND_PCM_READ_FILTER:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mixdev_ioctl(s-&gt;codec, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-au1550_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	ret = au1550_ioctl(file, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int             minor = MINOR(inode-&gt;i_rdev);</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	struct au1550_state *s = &amp;au1550_state;</div><div class='del'>-	int             ret;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-		pr_debug("open: non-blocking\n");</div><div class='del'>-	else</div><div class='del'>-		pr_debug("open: blocking\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	file-&gt;private_data = s;</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	/* wait for device to become free */</div><div class='del'>-	mutex_lock(&amp;s-&gt;open_mutex);</div><div class='del'>-	while (s-&gt;open_mode &amp; file-&gt;f_mode) {</div><div class='del'>-		ret = -EBUSY;</div><div class='del'>-		if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-			goto out;</div><div class='del'>-		add_wait_queue(&amp;s-&gt;open_wait, &amp;wait);</div><div class='del'>-		__set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		mutex_unlock(&amp;s-&gt;open_mutex);</div><div class='del'>-		schedule();</div><div class='del'>-		remove_wait_queue(&amp;s-&gt;open_wait, &amp;wait);</div><div class='del'>-		set_current_state(TASK_RUNNING);</div><div class='del'>-		ret = -ERESTARTSYS;</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			goto out2;</div><div class='del'>-		mutex_lock(&amp;s-&gt;open_mutex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stop_dac(s);</div><div class='del'>-	stop_adc(s);</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		s-&gt;dma_adc.ossfragshift = s-&gt;dma_adc.ossmaxfrags =</div><div class='del'>-			s-&gt;dma_adc.subdivision = s-&gt;dma_adc.total_bytes = 0;</div><div class='del'>-		s-&gt;dma_adc.num_channels = 1;</div><div class='del'>-		s-&gt;dma_adc.sample_size = 8;</div><div class='del'>-		set_adc_rate(s, 8000);</div><div class='del'>-		if ((minor &amp; 0xf) == SND_DEV_DSP16)</div><div class='del'>-			s-&gt;dma_adc.sample_size = 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		s-&gt;dma_dac.ossfragshift = s-&gt;dma_dac.ossmaxfrags =</div><div class='del'>-			s-&gt;dma_dac.subdivision = s-&gt;dma_dac.total_bytes = 0;</div><div class='del'>-		s-&gt;dma_dac.num_channels = 1;</div><div class='del'>-		s-&gt;dma_dac.sample_size = 8;</div><div class='del'>-		set_dac_rate(s, 8000);</div><div class='del'>-		if ((minor &amp; 0xf) == SND_DEV_DSP16)</div><div class='del'>-			s-&gt;dma_dac.sample_size = 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		if ((ret = prog_dmabuf_adc(s)))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if ((ret = prog_dmabuf_dac(s)))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;open_mode |= file-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE);</div><div class='del'>-	mutex_init(&amp;s-&gt;sem);</div><div class='del'>-	ret = 0;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;s-&gt;open_mutex);</div><div class='del'>-out2:</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-au1550_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-		drain_dac(s, file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-		mutex_lock(&amp;au1550_ac97_mutex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;s-&gt;open_mutex);</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		stop_dac(s);</div><div class='del'>-		kfree(s-&gt;dma_dac.rawbuf);</div><div class='del'>-		s-&gt;dma_dac.rawbuf = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		stop_adc(s);</div><div class='del'>-		kfree(s-&gt;dma_adc.rawbuf);</div><div class='del'>-		s-&gt;dma_adc.rawbuf = NULL;</div><div class='del'>-	}</div><div class='del'>-	s-&gt;open_mode &amp;= ((~file-&gt;f_mode) &amp; (FMODE_READ|FMODE_WRITE));</div><div class='del'>-	mutex_unlock(&amp;s-&gt;open_mutex);</div><div class='del'>-	wake_up(&amp;s-&gt;open_wait);</div><div class='del'>-	mutex_unlock(&amp;au1550_ac97_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static /*const */ struct file_operations au1550_audio_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= au1550_llseek,</div><div class='del'>-	.read		= au1550_read,</div><div class='del'>-	.write		= au1550_write,</div><div class='del'>-	.poll		= au1550_poll,</div><div class='del'>-	.unlocked_ioctl	= au1550_unlocked_ioctl,</div><div class='del'>-	.mmap		= au1550_mmap,</div><div class='del'>-	.open		= au1550_open,</div><div class='del'>-	.release	= au1550_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");</div><div class='del'>-MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-au1550_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = &amp;au1550_state;</div><div class='del'>-	int             val;</div><div class='del'>-</div><div class='del'>-	memset(s, 0, sizeof(struct au1550_state));</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_adc.wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_dac.wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;open_wait);</div><div class='del'>-	mutex_init(&amp;s-&gt;open_mutex);</div><div class='del'>-	spin_lock_init(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	s-&gt;codec = ac97_alloc_codec();</div><div class='del'>-	if(s-&gt;codec == NULL) {</div><div class='del'>-		err("Out of memory");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	s-&gt;codec-&gt;private_data = s;</div><div class='del'>-	s-&gt;codec-&gt;id = 0;</div><div class='del'>-	s-&gt;codec-&gt;codec_read = rdcodec;</div><div class='del'>-	s-&gt;codec-&gt;codec_write = wrcodec;</div><div class='del'>-	s-&gt;codec-&gt;codec_wait = waitcodec;</div><div class='del'>-</div><div class='del'>-	if (!request_mem_region(CPHYSADDR(AC97_PSC_SEL),</div><div class='del'>-			    0x30, "Au1550 AC97")) {</div><div class='del'>-		err("AC'97 ports in use");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate the DMA Channels</div><div class='del'>-	*/</div><div class='del'>-	if ((s-&gt;dma_dac.dmanr = au1xxx_dbdma_chan_alloc(DBDMA_MEM_CHAN,</div><div class='del'>-	    DBDMA_AC97_TX_CHAN, dac_dma_interrupt, (void *)s)) == 0) {</div><div class='del'>-		err("Can't get DAC DMA");</div><div class='del'>-		goto err_dma1;</div><div class='del'>-	}</div><div class='del'>-	au1xxx_dbdma_set_devwidth(s-&gt;dma_dac.dmanr, 16);</div><div class='del'>-	if (au1xxx_dbdma_ring_alloc(s-&gt;dma_dac.dmanr,</div><div class='del'>-					NUM_DBDMA_DESCRIPTORS) == 0) {</div><div class='del'>-		err("Can't get DAC DMA descriptors");</div><div class='del'>-		goto err_dma1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;dma_adc.dmanr = au1xxx_dbdma_chan_alloc(DBDMA_AC97_RX_CHAN,</div><div class='del'>-	    DBDMA_MEM_CHAN, adc_dma_interrupt, (void *)s)) == 0) {</div><div class='del'>-		err("Can't get ADC DMA");</div><div class='del'>-		goto err_dma2;</div><div class='del'>-	}</div><div class='del'>-	au1xxx_dbdma_set_devwidth(s-&gt;dma_adc.dmanr, 16);</div><div class='del'>-	if (au1xxx_dbdma_ring_alloc(s-&gt;dma_adc.dmanr,</div><div class='del'>-					NUM_DBDMA_DESCRIPTORS) == 0) {</div><div class='del'>-		err("Can't get ADC DMA descriptors");</div><div class='del'>-		goto err_dma2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pr_info("DAC: DMA%d, ADC: DMA%d", DBDMA_AC97_TX_CHAN, DBDMA_AC97_RX_CHAN);</div><div class='del'>-</div><div class='del'>-	/* register devices */</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;dev_audio = register_sound_dsp(&amp;au1550_audio_fops, -1)) &lt; 0)</div><div class='del'>-		goto err_dev1;</div><div class='del'>-	if ((s-&gt;codec-&gt;dev_mixer =</div><div class='del'>-	     register_sound_mixer(&amp;au1550_mixer_fops, -1)) &lt; 0)</div><div class='del'>-		goto err_dev2;</div><div class='del'>-</div><div class='del'>-	/* The GPIO for the appropriate PSC was configured by the</div><div class='del'>-	 * board specific start up.</div><div class='del'>-	 *</div><div class='del'>-	 * configure PSC for AC'97</div><div class='del'>-	 */</div><div class='del'>-	au_writel(0, AC97_PSC_CTRL);	/* Disable PSC */</div><div class='del'>-	au_sync();</div><div class='del'>-	au_writel((PSC_SEL_CLK_SERCLK | PSC_SEL_PS_AC97MODE), AC97_PSC_SEL);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* cold reset the AC'97</div><div class='del'>-	*/</div><div class='del'>-	au_writel(PSC_AC97RST_RST, PSC_AC97RST);</div><div class='del'>-	au_sync();</div><div class='del'>-	au1550_delay(10);</div><div class='del'>-	au_writel(0, PSC_AC97RST);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* need to delay around 500msec(bleech) to give</div><div class='del'>-	   some CODECs enough time to wakeup */</div><div class='del'>-	au1550_delay(500);</div><div class='del'>-</div><div class='del'>-	/* warm reset the AC'97 to start the bitclk</div><div class='del'>-	*/</div><div class='del'>-	au_writel(PSC_AC97RST_SNC, PSC_AC97RST);</div><div class='del'>-	au_sync();</div><div class='del'>-	udelay(100);</div><div class='del'>-	au_writel(0, PSC_AC97RST);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Enable PSC</div><div class='del'>-	*/</div><div class='del'>-	au_writel(PSC_CTRL_ENABLE, AC97_PSC_CTRL);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for PSC ready.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((val &amp; PSC_AC97STAT_SR) == 0);</div><div class='del'>-</div><div class='del'>-	/* Configure AC97 controller.</div><div class='del'>-	 * Deep FIFO, 16-bit sample, DMA, make sure DMA matches fifo size.</div><div class='del'>-	 */</div><div class='del'>-	val = PSC_AC97CFG_SET_LEN(16);</div><div class='del'>-	val |= PSC_AC97CFG_RT_FIFO8 | PSC_AC97CFG_TT_FIFO8;</div><div class='del'>-</div><div class='del'>-	/* Enable device so we can at least</div><div class='del'>-	 * talk over the AC-link.</div><div class='del'>-	 */</div><div class='del'>-	au_writel(val, PSC_AC97CFG);</div><div class='del'>-	au_writel(PSC_AC97MSK_ALLMASK, PSC_AC97MSK);</div><div class='del'>-	au_sync();</div><div class='del'>-	val |= PSC_AC97CFG_DE_ENABLE;</div><div class='del'>-	au_writel(val, PSC_AC97CFG);</div><div class='del'>-	au_sync();</div><div class='del'>-</div><div class='del'>-	/* Wait for Device ready.</div><div class='del'>-	*/</div><div class='del'>-	do {</div><div class='del'>-		val = au_readl(PSC_AC97STAT);</div><div class='del'>-		au_sync();</div><div class='del'>-	} while ((val &amp; PSC_AC97STAT_DR) == 0);</div><div class='del'>-</div><div class='del'>-	/* codec init */</div><div class='del'>-	if (!ac97_probe_codec(s-&gt;codec))</div><div class='del'>-		goto err_dev3;</div><div class='del'>-</div><div class='del'>-	s-&gt;codec_base_caps = rdcodec(s-&gt;codec, AC97_RESET);</div><div class='del'>-	s-&gt;codec_ext_caps = rdcodec(s-&gt;codec, AC97_EXTENDED_ID);</div><div class='del'>-	pr_info("AC'97 Base/Extended ID = %04x/%04x",</div><div class='del'>-	     s-&gt;codec_base_caps, s-&gt;codec_ext_caps);</div><div class='del'>-</div><div class='del'>-	if (!(s-&gt;codec_ext_caps &amp; AC97_EXTID_VRA)) {</div><div class='del'>-		/* codec does not support VRA</div><div class='del'>-		*/</div><div class='del'>-		s-&gt;no_vra = 1;</div><div class='del'>-	} else if (!vra) {</div><div class='del'>-		/* Boot option says disable VRA</div><div class='del'>-		*/</div><div class='del'>-		u16 ac97_extstat = rdcodec(s-&gt;codec, AC97_EXTENDED_STATUS);</div><div class='del'>-		wrcodec(s-&gt;codec, AC97_EXTENDED_STATUS,</div><div class='del'>-			ac97_extstat &amp; ~AC97_EXTSTAT_VRA);</div><div class='del'>-		s-&gt;no_vra = 1;</div><div class='del'>-	}</div><div class='del'>-	if (s-&gt;no_vra)</div><div class='del'>-		pr_info("no VRA, interpolating and decimating");</div><div class='del'>-</div><div class='del'>-	/* set mic to be the recording source */</div><div class='del'>-	val = SOUND_MASK_MIC;</div><div class='del'>-	mixdev_ioctl(s-&gt;codec, SOUND_MIXER_WRITE_RECSRC,</div><div class='del'>-		     (unsigned long) &amp;val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- err_dev3:</div><div class='del'>-	unregister_sound_mixer(s-&gt;codec-&gt;dev_mixer);</div><div class='del'>- err_dev2:</div><div class='del'>-	unregister_sound_dsp(s-&gt;dev_audio);</div><div class='del'>- err_dev1:</div><div class='del'>-	au1xxx_dbdma_chan_free(s-&gt;dma_adc.dmanr);</div><div class='del'>- err_dma2:</div><div class='del'>-	au1xxx_dbdma_chan_free(s-&gt;dma_dac.dmanr);</div><div class='del'>- err_dma1:</div><div class='del'>-	release_mem_region(CPHYSADDR(AC97_PSC_SEL), 0x30);</div><div class='del'>-</div><div class='del'>-	ac97_release_codec(s-&gt;codec);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit</div><div class='del'>-au1550_remove(void)</div><div class='del'>-{</div><div class='del'>-	struct au1550_state *s = &amp;au1550_state;</div><div class='del'>-</div><div class='del'>-	if (!s)</div><div class='del'>-		return;</div><div class='del'>-	synchronize_irq();</div><div class='del'>-	au1xxx_dbdma_chan_free(s-&gt;dma_adc.dmanr);</div><div class='del'>-	au1xxx_dbdma_chan_free(s-&gt;dma_dac.dmanr);</div><div class='del'>-	release_mem_region(CPHYSADDR(AC97_PSC_SEL), 0x30);</div><div class='del'>-	unregister_sound_dsp(s-&gt;dev_audio);</div><div class='del'>-	unregister_sound_mixer(s-&gt;codec-&gt;dev_mixer);</div><div class='del'>-	ac97_release_codec(s-&gt;codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-init_au1550(void)</div><div class='del'>-{</div><div class='del'>-	return au1550_probe();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-cleanup_au1550(void)</div><div class='del'>-{</div><div class='del'>-	au1550_remove();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_au1550);</div><div class='del'>-module_exit(cleanup_au1550);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-</div><div class='del'>-static int __init</div><div class='del'>-au1550_setup(char *options)</div><div class='del'>-{</div><div class='del'>-	char           *this_opt;</div><div class='del'>-</div><div class='del'>-	if (!options || !*options)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ((this_opt = strsep(&amp;options, ","))) {</div><div class='del'>-		if (!*this_opt)</div><div class='del'>-			continue;</div><div class='del'>-		if (!strncmp(this_opt, "vra", 3)) {</div><div class='del'>-			vra = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("au1550_audio=", au1550_setup);</div><div class='del'>-</div><div class='del'>-#endif /* MODULE */</div><div class='head'>diff --git a/sound/oss/audio.c b/sound/oss/audio.c<br/>deleted file mode 100644<br/>index 7df48a25c4ee..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/audio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/audio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,985 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/audio.c</div><div class='del'>- *</div><div class='del'>- * Device file manager for /dev/audio</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Thomas Sailer   : moved several static variables into struct audio_operations</div><div class='del'>- *                   (which is grossly misnamed btw.) because they have the same</div><div class='del'>- *                   lifetime as the rest in there and dynamic allocation saves</div><div class='del'>- *                   12k or so</div><div class='del'>- * Thomas Sailer   : use more logical O_NONBLOCK semantics</div><div class='del'>- * Daniel Rodriksson: reworked the use of the device specific copy_user</div><div class='del'>- *                    still generic</div><div class='del'>- * Horst von Brand:  Add missing #include &lt;linux/string.h&gt;</div><div class='del'>- * Chris Rankin    : Update the module-usage counter for the coprocessor,</div><div class='del'>- *                   and decrement the counters again if we cannot open</div><div class='del'>- *                   the audio device.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "ulaw.h"</div><div class='del'>-#include "coproc.h"</div><div class='del'>-</div><div class='del'>-#define NEUTRAL8	0x80</div><div class='del'>-#define NEUTRAL16	0x00</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int             dma_ioctl(int dev, unsigned int cmd, void __user *arg);</div><div class='del'>-</div><div class='del'>-static int set_format(int dev, int fmt)</div><div class='del'>-{</div><div class='del'>-	if (fmt != AFMT_QUERY)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;local_conversion = 0;</div><div class='del'>-</div><div class='del'>-		if (!(audio_devs[dev]-&gt;format_mask &amp; fmt))	/* Not supported */</div><div class='del'>-		{</div><div class='del'>-			if (fmt == AFMT_MU_LAW)</div><div class='del'>-			{</div><div class='del'>-				fmt = AFMT_U8;</div><div class='del'>-				audio_devs[dev]-&gt;local_conversion = CNV_MU_LAW;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				fmt = AFMT_U8;	/* This is always supported */</div><div class='del'>-		}</div><div class='del'>-		audio_devs[dev]-&gt;audio_format = audio_devs[dev]-&gt;d-&gt;set_bits(dev, fmt);</div><div class='del'>-		audio_devs[dev]-&gt;local_format = fmt;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return audio_devs[dev]-&gt;local_format;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;local_conversion)</div><div class='del'>-		return audio_devs[dev]-&gt;local_conversion;</div><div class='del'>-	else </div><div class='del'>-		return audio_devs[dev]-&gt;local_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int audio_open(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int bits;</div><div class='del'>-	int dev_type = dev &amp; 0x0f;</div><div class='del'>-	int mode = translate_mode(file);</div><div class='del'>-	const struct audio_driver *driver;</div><div class='del'>-	const struct coproc_operations *coprocessor;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (dev_type == SND_DEV_DSP16)</div><div class='del'>-		bits = 16;</div><div class='del'>-	else</div><div class='del'>-		bits = 8;</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_audiodevs)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	driver = audio_devs[dev]-&gt;d;</div><div class='del'>-</div><div class='del'>-	if (!try_module_get(driver-&gt;owner))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if ((ret = DMAbuf_open(dev, mode)) &lt; 0)</div><div class='del'>-		goto error_1;</div><div class='del'>-</div><div class='del'>-	if ( (coprocessor = audio_devs[dev]-&gt;coproc) != NULL ) {</div><div class='del'>-		if (!try_module_get(coprocessor-&gt;owner))</div><div class='del'>-			goto error_2;</div><div class='del'>-</div><div class='del'>-		if ((ret = coprocessor-&gt;open(coprocessor-&gt;devc, COPR_PCM)) &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "Sound: Can't access coprocessor device\n");</div><div class='del'>-			goto error_3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	audio_devs[dev]-&gt;local_conversion = 0;</div><div class='del'>-</div><div class='del'>-	if (dev_type == SND_DEV_AUDIO)</div><div class='del'>-		set_format(dev, AFMT_MU_LAW);</div><div class='del'>-	else </div><div class='del'>-		set_format(dev, bits);</div><div class='del'>-</div><div class='del'>-	audio_devs[dev]-&gt;audio_mode = AM_NONE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clean-up stack: this is what needs (un)doing if</div><div class='del'>-	 * we can't open the audio device ...</div><div class='del'>-	 */</div><div class='del'>-	error_3:</div><div class='del'>-	module_put(coprocessor-&gt;owner);</div><div class='del'>-</div><div class='del'>-	error_2:</div><div class='del'>-	DMAbuf_release(dev, mode);</div><div class='del'>-</div><div class='del'>-	error_1:</div><div class='del'>-	module_put(driver-&gt;owner);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sync_output(int dev)</div><div class='del'>-{</div><div class='del'>-	int             p, i;</div><div class='del'>-	int             l;</div><div class='del'>-	struct dma_buffparms *dmap = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;fragment_size &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-	dmap-&gt;flags |= DMA_POST;</div><div class='del'>-</div><div class='del'>-	/* Align the write pointer with fragment boundaries */</div><div class='del'>-	</div><div class='del'>-	if ((l = dmap-&gt;user_counter % dmap-&gt;fragment_size) &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		int len;</div><div class='del'>-		unsigned long offs = dmap-&gt;user_counter % dmap-&gt;bytes_in_use;</div><div class='del'>-</div><div class='del'>-		len = dmap-&gt;fragment_size - l;</div><div class='del'>-		memset(dmap-&gt;raw_buf + offs, dmap-&gt;neutral_byte, len);</div><div class='del'>-		DMAbuf_move_wrpointer(dev, len);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Clean all unused buffer fragments.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	p = dmap-&gt;qtail;</div><div class='del'>-	dmap-&gt;flags |= DMA_POST;</div><div class='del'>-</div><div class='del'>-	for (i = dmap-&gt;qlen + 1; i &lt; dmap-&gt;nbufs; i++)</div><div class='del'>-	{</div><div class='del'>-		p = (p + 1) % dmap-&gt;nbufs;</div><div class='del'>-		if (((dmap-&gt;raw_buf + p * dmap-&gt;fragment_size) + dmap-&gt;fragment_size) &gt;</div><div class='del'>-			(dmap-&gt;raw_buf + dmap-&gt;buffsize))</div><div class='del'>-				printk(KERN_ERR "audio: Buffer error 2\n");</div><div class='del'>-</div><div class='del'>-		memset(dmap-&gt;raw_buf + p * dmap-&gt;fragment_size,</div><div class='del'>-			dmap-&gt;neutral_byte,</div><div class='del'>-			dmap-&gt;fragment_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmap-&gt;flags |= DMA_DIRTY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void audio_release(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	const struct coproc_operations *coprocessor;</div><div class='del'>-	int mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We do this in DMAbuf_release(). Why are we doing it</div><div class='del'>-	 * here? Why don't we test the file mode before setting</div><div class='del'>-	 * both flags? DMAbuf_release() does.</div><div class='del'>-	 * ...pester...pester...pester...</div><div class='del'>-	 */</div><div class='del'>-	audio_devs[dev]-&gt;dmap_out-&gt;closing = 1;</div><div class='del'>-	audio_devs[dev]-&gt;dmap_in-&gt;closing = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We need to make sure we allocated the dmap_out buffer</div><div class='del'>-	 * before we go mucking around with it in sync_output().</div><div class='del'>-	 */</div><div class='del'>-	if (mode &amp; OPEN_WRITE)</div><div class='del'>-		sync_output(dev);</div><div class='del'>-</div><div class='del'>-	if ( (coprocessor = audio_devs[dev]-&gt;coproc) != NULL ) {</div><div class='del'>-		coprocessor-&gt;close(coprocessor-&gt;devc, COPR_PCM);</div><div class='del'>-		module_put(coprocessor-&gt;owner);</div><div class='del'>-	}</div><div class='del'>-	DMAbuf_release(dev, mode);</div><div class='del'>-</div><div class='del'>-	module_put(audio_devs[dev]-&gt;d-&gt;owner);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void translate_bytes(const unsigned char *table, unsigned char *buff, int n)</div><div class='del'>-{</div><div class='del'>-	unsigned long   i;</div><div class='del'>-</div><div class='del'>-	if (n &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; ++i)</div><div class='del'>-		buff[i] = table[buff[i]];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int audio_write(int dev, struct file *file, const char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int c, p, l, buf_size, used, returned;</div><div class='del'>-	int err;</div><div class='del'>-	char *dma_buf;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	p = 0;</div><div class='del'>-	c = count;</div><div class='del'>-	</div><div class='del'>-	if(count &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX)</div><div class='del'>-		audio_devs[dev]-&gt;audio_mode |= AM_WRITE;</div><div class='del'>-	else</div><div class='del'>-		audio_devs[dev]-&gt;audio_mode = AM_WRITE;</div><div class='del'>-</div><div class='del'>-	if (!count)		/* Flush output */</div><div class='del'>-	{</div><div class='del'>-		  sync_output(dev);</div><div class='del'>-		  return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while (c)</div><div class='del'>-	{</div><div class='del'>-		if ((err = DMAbuf_getwrbuffer(dev, &amp;dma_buf, &amp;buf_size, !!(file-&gt;f_flags &amp; O_NONBLOCK))) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			    /* Handle nonblocking mode */</div><div class='del'>-			if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp; err == -EAGAIN)</div><div class='del'>-				return p? p : -EAGAIN;	/* No more space. Return # of accepted bytes */</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		l = c;</div><div class='del'>-</div><div class='del'>-		if (l &gt; buf_size)</div><div class='del'>-			l = buf_size;</div><div class='del'>-</div><div class='del'>-		returned = l;</div><div class='del'>-		used = l;</div><div class='del'>-		if (!audio_devs[dev]-&gt;d-&gt;copy_user)</div><div class='del'>-		{</div><div class='del'>-			if ((dma_buf + l) &gt;</div><div class='del'>-				(audio_devs[dev]-&gt;dmap_out-&gt;raw_buf + audio_devs[dev]-&gt;dmap_out-&gt;buffsize))</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "audio: Buffer error 3 (%lx,%d), (%lx, %d)\n", (long) dma_buf, l, (long) audio_devs[dev]-&gt;dmap_out-&gt;raw_buf, (int) audio_devs[dev]-&gt;dmap_out-&gt;buffsize);</div><div class='del'>-				return -EDOM;</div><div class='del'>-			}</div><div class='del'>-			if (dma_buf &lt; audio_devs[dev]-&gt;dmap_out-&gt;raw_buf)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "audio: Buffer error 13 (%lx&lt;%lx)\n", (long) dma_buf, (long) audio_devs[dev]-&gt;dmap_out-&gt;raw_buf);</div><div class='del'>-				return -EDOM;</div><div class='del'>-			}</div><div class='del'>-			if(copy_from_user(dma_buf, &amp;(buf)[p], l))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		} </div><div class='del'>-		else audio_devs[dev]-&gt;d-&gt;copy_user (dev,</div><div class='del'>-						dma_buf, 0,</div><div class='del'>-						buf, p,</div><div class='del'>-						c, buf_size,</div><div class='del'>-						&amp;used, &amp;returned,</div><div class='del'>-						l);</div><div class='del'>-		l = returned;</div><div class='del'>-</div><div class='del'>-		if (audio_devs[dev]-&gt;local_conversion &amp; CNV_MU_LAW)</div><div class='del'>-		{</div><div class='del'>-			translate_bytes(ulaw_dsp, (unsigned char *) dma_buf, l);</div><div class='del'>-		}</div><div class='del'>-		c -= used;</div><div class='del'>-		p += used;</div><div class='del'>-		DMAbuf_move_wrpointer(dev, l);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int audio_read(int dev, struct file *file, char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int             c, p, l;</div><div class='del'>-	char           *dmabuf;</div><div class='del'>-	int             buf_no;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-	p = 0;</div><div class='del'>-	c = count;</div><div class='del'>-</div><div class='del'>-	if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if ((audio_devs[dev]-&gt;audio_mode &amp; AM_WRITE) &amp;&amp; !(audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX))</div><div class='del'>-		sync_output(dev);</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX)</div><div class='del'>-		audio_devs[dev]-&gt;audio_mode |= AM_READ;</div><div class='del'>-	else</div><div class='del'>-		audio_devs[dev]-&gt;audio_mode = AM_READ;</div><div class='del'>-</div><div class='del'>-	while(c)</div><div class='del'>-	{</div><div class='del'>-		if ((buf_no = DMAbuf_getrdbuffer(dev, &amp;dmabuf, &amp;l, !!(file-&gt;f_flags &amp; O_NONBLOCK))) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			/*</div><div class='del'>-			 *	Nonblocking mode handling. Return current # of bytes</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (p &gt; 0) 		/* Avoid throwing away data */</div><div class='del'>-				return p;	/* Return it instead */</div><div class='del'>-</div><div class='del'>-			if ((file-&gt;f_flags &amp; O_NONBLOCK) &amp;&amp; buf_no == -EAGAIN)</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-</div><div class='del'>-			return buf_no;</div><div class='del'>-		}</div><div class='del'>-		if (l &gt; c)</div><div class='del'>-			l = c;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Insert any local processing here.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (audio_devs[dev]-&gt;local_conversion &amp; CNV_MU_LAW)</div><div class='del'>-		{</div><div class='del'>-			translate_bytes(dsp_ulaw, (unsigned char *) dmabuf, l);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		{</div><div class='del'>-			char           *fixit = dmabuf;</div><div class='del'>-</div><div class='del'>-			if(copy_to_user(&amp;(buf)[p], fixit, l))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		DMAbuf_rmchars(dev, buf_no, l);</div><div class='del'>-</div><div class='del'>-		p += l;</div><div class='del'>-		c -= l;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count - c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int val, count;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct dma_buffparms *dmap;</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (_IOC_TYPE(cmd) == 'C')	{</div><div class='del'>-		if (audio_devs[dev]-&gt;coproc)	/* Coprocessor ioctl */</div><div class='del'>-			return audio_devs[dev]-&gt;coproc-&gt;ioctl(audio_devs[dev]-&gt;coproc-&gt;devc, cmd, arg, 0);</div><div class='del'>-		/* else</div><div class='del'>-		        printk(KERN_DEBUG"/dev/dsp%d: No coprocessor for this device\n", dev); */</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	else switch (cmd) </div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_DSP_SYNC:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return 0;</div><div class='del'>-			if (audio_devs[dev]-&gt;dmap_out-&gt;fragment_size == 0)</div><div class='del'>-				return 0;</div><div class='del'>-			sync_output(dev);</div><div class='del'>-			DMAbuf_sync(dev);</div><div class='del'>-			DMAbuf_reset(dev);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_POST:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return 0;</div><div class='del'>-			if (audio_devs[dev]-&gt;dmap_out-&gt;fragment_size == 0)</div><div class='del'>-				return 0;</div><div class='del'>-			audio_devs[dev]-&gt;dmap_out-&gt;flags |= DMA_POST | DMA_DIRTY;</div><div class='del'>-			sync_output(dev);</div><div class='del'>-			dma_ioctl(dev, SNDCTL_DSP_POST, NULL);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_RESET:</div><div class='del'>-			audio_devs[dev]-&gt;audio_mode = AM_NONE;</div><div class='del'>-			DMAbuf_reset(dev);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETFMTS:</div><div class='del'>-			val = audio_devs[dev]-&gt;format_mask | AFMT_MU_LAW;</div><div class='del'>-			break;</div><div class='del'>-	</div><div class='del'>-		case SNDCTL_DSP_SETFMT:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			val = set_format(dev, val);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETISPACE:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				return 0;</div><div class='del'>-  			if ((audio_devs[dev]-&gt;audio_mode &amp; AM_WRITE) &amp;&amp; !(audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX))</div><div class='del'>-  				return -EBUSY;</div><div class='del'>-			return dma_ioctl(dev, cmd, arg);</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return -EPERM;</div><div class='del'>-  			if ((audio_devs[dev]-&gt;audio_mode &amp; AM_READ) &amp;&amp; !(audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX))</div><div class='del'>-  				return -EBUSY;</div><div class='del'>-			return dma_ioctl(dev, cmd, arg);</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_DSP_NONBLOCK:</div><div class='del'>-			spin_lock(&amp;file-&gt;f_lock);</div><div class='del'>-			file-&gt;f_flags |= O_NONBLOCK;</div><div class='del'>-			spin_unlock(&amp;file-&gt;f_lock);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETCAPS:</div><div class='del'>-				val = 1 | DSP_CAP_MMAP;	/* Revision level of this ioctl() */</div><div class='del'>-				if (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX &amp;&amp;</div><div class='del'>-					audio_devs[dev]-&gt;open_mode == OPEN_READWRITE)</div><div class='del'>-					val |= DSP_CAP_DUPLEX;</div><div class='del'>-				if (audio_devs[dev]-&gt;coproc)</div><div class='del'>-					val |= DSP_CAP_COPROC;</div><div class='del'>-				if (audio_devs[dev]-&gt;d-&gt;local_qlen)	/* Device has hidden buffers */</div><div class='del'>-					val |= DSP_CAP_BATCH;</div><div class='del'>-				if (audio_devs[dev]-&gt;d-&gt;trigger)	/* Supports SETTRIGGER */</div><div class='del'>-					val |= DSP_CAP_TRIGGER;</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-		case SOUND_PCM_WRITE_RATE:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_speed(dev, val);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_PCM_READ_RATE:</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_speed(dev, 0);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case SNDCTL_DSP_STEREO:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val &gt; 1 || val &lt; 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_channels(dev, val + 1) - 1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_PCM_WRITE_CHANNELS:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_channels(dev, val);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_PCM_READ_CHANNELS:</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_channels(dev, 0);</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		case SOUND_PCM_READ_BITS:</div><div class='del'>-			val = audio_devs[dev]-&gt;d-&gt;set_bits(dev, 0);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_SETDUPLEX:</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode != OPEN_READWRITE)</div><div class='del'>-				return -EPERM;</div><div class='del'>-			return (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX) ? 0 : -EIO;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_PROFILE:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-				audio_devs[dev]-&gt;dmap_out-&gt;applic_profile = val;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode &amp; OPEN_READ)</div><div class='del'>-				audio_devs[dev]-&gt;dmap_in-&gt;applic_profile = val;</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_DSP_GETODELAY:</div><div class='del'>-			dmap = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (!(dmap-&gt;flags &amp; DMA_ALLOC_DONE))</div><div class='del'>-			{</div><div class='del'>-				val=0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		</div><div class='del'>-			spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			/* Compute number of bytes that have been played */</div><div class='del'>-			count = DMAbuf_get_buffer_pointer (dev, dmap, DMODE_OUTPUT);</div><div class='del'>-			if (count &lt; dmap-&gt;fragment_size &amp;&amp; dmap-&gt;qhead != 0)</div><div class='del'>-				count += dmap-&gt;bytes_in_use;	/* Pointer wrap not handled yet */</div><div class='del'>-			count += dmap-&gt;byte_counter;</div><div class='del'>-		</div><div class='del'>-			/* Substract current count from the number of bytes written by app */</div><div class='del'>-			count = dmap-&gt;user_counter - count;</div><div class='del'>-			if (count &lt; 0)</div><div class='del'>-				count = 0;</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			val = count;</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		default:</div><div class='del'>-			return dma_ioctl(dev, cmd, arg);</div><div class='del'>-	}</div><div class='del'>-	return put_user(val, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void audio_init_devices(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! This routine could be called several times during boot.</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reorganize_buffers(int dev, struct dma_buffparms *dmap, int recording)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This routine breaks the physical device buffers to logical ones.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	struct audio_operations *dsp_dev = audio_devs[dev];</div><div class='del'>-</div><div class='del'>-	unsigned i, n;</div><div class='del'>-	unsigned sr, nc, sz, bsz;</div><div class='del'>-</div><div class='del'>-	sr = dsp_dev-&gt;d-&gt;set_speed(dev, 0);</div><div class='del'>-	nc = dsp_dev-&gt;d-&gt;set_channels(dev, 0);</div><div class='del'>-	sz = dsp_dev-&gt;d-&gt;set_bits(dev, 0);</div><div class='del'>-</div><div class='del'>-	if (sz == 8)</div><div class='del'>-		dmap-&gt;neutral_byte = NEUTRAL8;</div><div class='del'>-	else</div><div class='del'>-		dmap-&gt;neutral_byte = NEUTRAL16;</div><div class='del'>-</div><div class='del'>-	if (sr &lt; 1 || nc &lt; 1 || sz &lt; 1)</div><div class='del'>-	{</div><div class='del'>-/*		printk(KERN_DEBUG "Warning: Invalid PCM parameters[%d] sr=%d, nc=%d, sz=%d\n", dev, sr, nc, sz);*/</div><div class='del'>-		sr = DSP_DEFAULT_SPEED;</div><div class='del'>-		nc = 1;</div><div class='del'>-		sz = 8;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	sz = sr * nc * sz;</div><div class='del'>-</div><div class='del'>-	sz /= 8;		/* #bits -&gt; #bytes */</div><div class='del'>-	dmap-&gt;data_rate = sz;</div><div class='del'>-</div><div class='del'>-	if (!dmap-&gt;needs_reorg)</div><div class='del'>-		return;</div><div class='del'>-	dmap-&gt;needs_reorg = 0;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;fragment_size == 0)</div><div class='del'>-	{	</div><div class='del'>-		/* Compute the fragment size using the default algorithm */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute a buffer size for time not exceeding 1 second.</div><div class='del'>-		 * Usually this algorithm gives a buffer size for 0.5 to 1.0 seconds</div><div class='del'>-		 * of sound (using the current speed, sample size and #channels).</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		bsz = dmap-&gt;buffsize;</div><div class='del'>-		while (bsz &gt; sz)</div><div class='del'>-			bsz /= 2;</div><div class='del'>-</div><div class='del'>-		if (bsz == dmap-&gt;buffsize)</div><div class='del'>-			bsz /= 2;	/* Needs at least 2 buffers */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *    Split the computed fragment to smaller parts. After 3.5a9</div><div class='del'>-		 *      the default subdivision is 4 which should give better</div><div class='del'>-		 *      results when recording.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (dmap-&gt;subdivision == 0)	/* Not already set */</div><div class='del'>-		{</div><div class='del'>-			dmap-&gt;subdivision = 4;	/* Init to the default value */</div><div class='del'>-</div><div class='del'>-			if ((bsz / dmap-&gt;subdivision) &gt; 4096)</div><div class='del'>-				dmap-&gt;subdivision *= 2;</div><div class='del'>-			if ((bsz / dmap-&gt;subdivision) &lt; 4096)</div><div class='del'>-				dmap-&gt;subdivision = 1;</div><div class='del'>-		}</div><div class='del'>-		bsz /= dmap-&gt;subdivision;</div><div class='del'>-</div><div class='del'>-		if (bsz &lt; 16)</div><div class='del'>-			bsz = 16;	/* Just a sanity check */</div><div class='del'>-</div><div class='del'>-		dmap-&gt;fragment_size = bsz;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * The process has specified the buffer size with SNDCTL_DSP_SETFRAGMENT or</div><div class='del'>-		 * the buffer size computation has already been done.</div><div class='del'>-		 */</div><div class='del'>-		if (dmap-&gt;fragment_size &gt; (dmap-&gt;buffsize / 2))</div><div class='del'>-			dmap-&gt;fragment_size = (dmap-&gt;buffsize / 2);</div><div class='del'>-		bsz = dmap-&gt;fragment_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;min_fragment)</div><div class='del'>-		if (bsz &lt; (1 &lt;&lt; audio_devs[dev]-&gt;min_fragment))</div><div class='del'>-			bsz = 1 &lt;&lt; audio_devs[dev]-&gt;min_fragment;</div><div class='del'>-	if (audio_devs[dev]-&gt;max_fragment)</div><div class='del'>-		if (bsz &gt; (1 &lt;&lt; audio_devs[dev]-&gt;max_fragment))</div><div class='del'>-			bsz = 1 &lt;&lt; audio_devs[dev]-&gt;max_fragment;</div><div class='del'>-	bsz &amp;= ~0x07;		/* Force size which is multiple of 8 bytes */</div><div class='del'>-#ifdef OS_DMA_ALIGN_CHECK</div><div class='del'>-	OS_DMA_ALIGN_CHECK(bsz);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	n = dmap-&gt;buffsize / bsz;</div><div class='del'>-	if (n &gt; MAX_SUB_BUFFERS)</div><div class='del'>-		n = MAX_SUB_BUFFERS;</div><div class='del'>-	if (n &gt; dmap-&gt;max_fragments)</div><div class='del'>-		n = dmap-&gt;max_fragments;</div><div class='del'>-</div><div class='del'>-	if (n &lt; 2)</div><div class='del'>-	{</div><div class='del'>-		n = 2;</div><div class='del'>-		bsz /= 2;</div><div class='del'>-	}</div><div class='del'>-	dmap-&gt;nbufs = n;</div><div class='del'>-	dmap-&gt;bytes_in_use = n * bsz;</div><div class='del'>-	dmap-&gt;fragment_size = bsz;</div><div class='del'>-	dmap-&gt;max_byte_counter = (dmap-&gt;data_rate * 60 * 60) +</div><div class='del'>-			dmap-&gt;bytes_in_use;	/* Approximately one hour */</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf)</div><div class='del'>-	{</div><div class='del'>-		memset(dmap-&gt;raw_buf, dmap-&gt;neutral_byte, dmap-&gt;bytes_in_use);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; dmap-&gt;nbufs; i++)</div><div class='del'>-	{</div><div class='del'>-		dmap-&gt;counts[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmap-&gt;flags |= DMA_ALLOC_DONE | DMA_EMPTY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_subdivide(int dev, struct dma_buffparms *dmap, int fact)</div><div class='del'>-{</div><div class='del'>-	if (fact == 0) </div><div class='del'>-	{</div><div class='del'>-		fact = dmap-&gt;subdivision;</div><div class='del'>-		if (fact == 0)</div><div class='del'>-			fact = 1;</div><div class='del'>-		return fact;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;subdivision != 0 || dmap-&gt;fragment_size)	/* Too late to change */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (fact &gt; MAX_REALTIME_FACTOR)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (fact != 1 &amp;&amp; fact != 2 &amp;&amp; fact != 4 &amp;&amp; fact != 8 &amp;&amp; fact != 16)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dmap-&gt;subdivision = fact;</div><div class='del'>-	return fact;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_set_fragment(int dev, struct dma_buffparms *dmap, int fact)</div><div class='del'>-{</div><div class='del'>-	int bytes, count;</div><div class='del'>-</div><div class='del'>-	if (fact == 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;subdivision != 0 ||</div><div class='del'>-	    dmap-&gt;fragment_size)	/* Too late to change */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bytes = fact &amp; 0xffff;</div><div class='del'>-	count = (fact &gt;&gt; 16) &amp; 0x7fff;</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		count = MAX_SUB_BUFFERS;</div><div class='del'>-	else if (count &lt; MAX_SUB_BUFFERS)</div><div class='del'>-		count++;</div><div class='del'>-</div><div class='del'>-	if (bytes &lt; 4 || bytes &gt; 17)	/* &lt;16 || &gt; 512k */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;min_fragment &gt; 0)</div><div class='del'>-		if (bytes &lt; audio_devs[dev]-&gt;min_fragment)</div><div class='del'>-			bytes = audio_devs[dev]-&gt;min_fragment;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;max_fragment &gt; 0)</div><div class='del'>-		if (bytes &gt; audio_devs[dev]-&gt;max_fragment)</div><div class='del'>-			bytes = audio_devs[dev]-&gt;max_fragment;</div><div class='del'>-</div><div class='del'>-#ifdef OS_DMA_MINBITS</div><div class='del'>-	if (bytes &lt; OS_DMA_MINBITS)</div><div class='del'>-		bytes = OS_DMA_MINBITS;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	dmap-&gt;fragment_size = (1 &lt;&lt; bytes);</div><div class='del'>-	dmap-&gt;max_fragments = count;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;fragment_size &gt; dmap-&gt;buffsize)</div><div class='del'>-		dmap-&gt;fragment_size = dmap-&gt;buffsize;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;fragment_size == dmap-&gt;buffsize &amp;&amp;</div><div class='del'>-	    audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE)</div><div class='del'>-		dmap-&gt;fragment_size /= 2;	/* Needs at least 2 buffers */</div><div class='del'>-</div><div class='del'>-	dmap-&gt;subdivision = 1;	/* Disable SNDCTL_DSP_SUBDIVIDE */</div><div class='del'>-	return bytes | ((count - 1) &lt;&lt; 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct dma_buffparms *dmap_out = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-	struct dma_buffparms *dmap_in = audio_devs[dev]-&gt;dmap_in;</div><div class='del'>-	struct dma_buffparms *dmap;</div><div class='del'>-	audio_buf_info info;</div><div class='del'>-	count_info cinfo;</div><div class='del'>-	int fact, ret, changed, bits, count, err;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	switch (cmd) </div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_DSP_SUBDIVIDE:</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (get_user(fact, (int __user *)arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-				ret = dma_subdivide(dev, dmap_out, fact);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode != OPEN_WRITE ||</div><div class='del'>-				(audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX &amp;&amp;</div><div class='del'>-					audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				ret = dma_subdivide(dev, dmap_in, fact);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETISPACE:</div><div class='del'>-		case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-			dmap = dmap_out;</div><div class='del'>-			if (cmd == SNDCTL_DSP_GETISPACE &amp;&amp; !(audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (cmd == SNDCTL_DSP_GETOSPACE &amp;&amp; !(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (cmd == SNDCTL_DSP_GETISPACE &amp;&amp; audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX)</div><div class='del'>-				dmap = dmap_in;</div><div class='del'>-			if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (!(dmap-&gt;flags &amp; DMA_ALLOC_DONE))</div><div class='del'>-				reorganize_buffers(dev, dmap, (cmd == SNDCTL_DSP_GETISPACE));</div><div class='del'>-			info.fragstotal = dmap-&gt;nbufs;</div><div class='del'>-			if (cmd == SNDCTL_DSP_GETISPACE)</div><div class='del'>-				info.fragments = dmap-&gt;qlen;</div><div class='del'>-			else </div><div class='del'>-			{</div><div class='del'>-				if (!DMAbuf_space_in_queue(dev))</div><div class='del'>-					info.fragments = 0;</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					info.fragments = DMAbuf_space_in_queue(dev);</div><div class='del'>-					if (audio_devs[dev]-&gt;d-&gt;local_qlen) </div><div class='del'>-					{</div><div class='del'>-						int tmp = audio_devs[dev]-&gt;d-&gt;local_qlen(dev);</div><div class='del'>-						if (tmp &amp;&amp; info.fragments)</div><div class='del'>-							tmp--;	/*</div><div class='del'>-								 * This buffer has been counted twice</div><div class='del'>-								 */</div><div class='del'>-						info.fragments -= tmp;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (info.fragments &lt; 0)</div><div class='del'>-				info.fragments = 0;</div><div class='del'>-			else if (info.fragments &gt; dmap-&gt;nbufs)</div><div class='del'>-				info.fragments = dmap-&gt;nbufs;</div><div class='del'>-</div><div class='del'>-			info.fragsize = dmap-&gt;fragment_size;</div><div class='del'>-			info.bytes = info.fragments * dmap-&gt;fragment_size;</div><div class='del'>-</div><div class='del'>-			if (cmd == SNDCTL_DSP_GETISPACE &amp;&amp; dmap-&gt;qlen)</div><div class='del'>-				info.bytes -= dmap-&gt;counts[dmap-&gt;qhead];</div><div class='del'>-			else </div><div class='del'>-			{</div><div class='del'>-				info.fragments = info.bytes / dmap-&gt;fragment_size;</div><div class='del'>-				info.bytes -= dmap-&gt;user_counter % dmap-&gt;fragment_size;</div><div class='del'>-			}</div><div class='del'>-			if (copy_to_user(arg, &amp;info, sizeof(info)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_SETTRIGGER:</div><div class='del'>-			if (get_user(bits, (int __user *)arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			bits &amp;= audio_devs[dev]-&gt;open_mode;</div><div class='del'>-			if (audio_devs[dev]-&gt;d-&gt;trigger == NULL)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (!(audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX) &amp;&amp; (bits &amp; PCM_ENABLE_INPUT) &amp;&amp;</div><div class='del'>-				(bits &amp; PCM_ENABLE_OUTPUT))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			if (bits &amp; PCM_ENABLE_INPUT)</div><div class='del'>-			{</div><div class='del'>-				spin_lock_irqsave(&amp;dmap_in-&gt;lock,flags);</div><div class='del'>-				changed = (audio_devs[dev]-&gt;enable_bits ^ bits) &amp; PCM_ENABLE_INPUT;</div><div class='del'>-				if (changed &amp;&amp; audio_devs[dev]-&gt;go) </div><div class='del'>-				{</div><div class='del'>-					reorganize_buffers(dev, dmap_in, 1);</div><div class='del'>-					if ((err = audio_devs[dev]-&gt;d-&gt;prepare_for_input(dev,</div><div class='del'>-						     dmap_in-&gt;fragment_size, dmap_in-&gt;nbufs)) &lt; 0) {</div><div class='del'>-						spin_unlock_irqrestore(&amp;dmap_in-&gt;lock,flags);</div><div class='del'>-						return err;</div><div class='del'>-					}</div><div class='del'>-					dmap_in-&gt;dma_mode = DMODE_INPUT;</div><div class='del'>-					audio_devs[dev]-&gt;enable_bits |= PCM_ENABLE_INPUT;</div><div class='del'>-					DMAbuf_activate_recording(dev, dmap_in);</div><div class='del'>-				} else</div><div class='del'>-					audio_devs[dev]-&gt;enable_bits &amp;= ~PCM_ENABLE_INPUT;</div><div class='del'>-				spin_unlock_irqrestore(&amp;dmap_in-&gt;lock,flags);</div><div class='del'>-			}</div><div class='del'>-			if (bits &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-			{</div><div class='del'>-				spin_lock_irqsave(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-				changed = (audio_devs[dev]-&gt;enable_bits ^ bits) &amp; PCM_ENABLE_OUTPUT;</div><div class='del'>-				if (changed &amp;&amp;</div><div class='del'>-				    (dmap_out-&gt;mapping_flags &amp; DMA_MAP_MAPPED || dmap_out-&gt;qlen &gt; 0) &amp;&amp;</div><div class='del'>-				    audio_devs[dev]-&gt;go) </div><div class='del'>-				{</div><div class='del'>-					if (!(dmap_out-&gt;flags &amp; DMA_ALLOC_DONE))</div><div class='del'>-						reorganize_buffers(dev, dmap_out, 0);</div><div class='del'>-					dmap_out-&gt;dma_mode = DMODE_OUTPUT;</div><div class='del'>-					audio_devs[dev]-&gt;enable_bits |= PCM_ENABLE_OUTPUT;</div><div class='del'>-					dmap_out-&gt;counts[dmap_out-&gt;qhead] = dmap_out-&gt;fragment_size;</div><div class='del'>-					DMAbuf_launch_output(dev, dmap_out);</div><div class='del'>-				} else</div><div class='del'>-					audio_devs[dev]-&gt;enable_bits &amp;= ~PCM_ENABLE_OUTPUT;</div><div class='del'>-				spin_unlock_irqrestore(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-			}</div><div class='del'>-#if 0</div><div class='del'>-			if (changed &amp;&amp; audio_devs[dev]-&gt;d-&gt;trigger)</div><div class='del'>-				audio_devs[dev]-&gt;d-&gt;trigger(dev, bits * audio_devs[dev]-&gt;go);</div><div class='del'>-#endif				</div><div class='del'>-			/* Falls through... */</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETTRIGGER:</div><div class='del'>-			ret = audio_devs[dev]-&gt;enable_bits;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_SETSYNCRO:</div><div class='del'>-			if (!audio_devs[dev]-&gt;d-&gt;trigger)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			audio_devs[dev]-&gt;d-&gt;trigger(dev, 0);</div><div class='del'>-			audio_devs[dev]-&gt;go = 0;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETIPTR:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			spin_lock_irqsave(&amp;dmap_in-&gt;lock,flags);</div><div class='del'>-			cinfo.bytes = dmap_in-&gt;byte_counter;</div><div class='del'>-			cinfo.ptr = DMAbuf_get_buffer_pointer(dev, dmap_in, DMODE_INPUT) &amp; ~3;</div><div class='del'>-			if (cinfo.ptr &lt; dmap_in-&gt;fragment_size &amp;&amp; dmap_in-&gt;qtail != 0)</div><div class='del'>-				cinfo.bytes += dmap_in-&gt;bytes_in_use;	/* Pointer wrap not handled yet */</div><div class='del'>-			cinfo.blocks = dmap_in-&gt;qlen;</div><div class='del'>-			cinfo.bytes += cinfo.ptr;</div><div class='del'>-			if (dmap_in-&gt;mapping_flags &amp; DMA_MAP_MAPPED)</div><div class='del'>-				dmap_in-&gt;qlen = 0;	/* Reset interrupt counter */</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap_in-&gt;lock,flags);</div><div class='del'>-			if (copy_to_user(arg, &amp;cinfo, sizeof(cinfo)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETOPTR:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-</div><div class='del'>-			spin_lock_irqsave(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-			cinfo.bytes = dmap_out-&gt;byte_counter;</div><div class='del'>-			cinfo.ptr = DMAbuf_get_buffer_pointer(dev, dmap_out, DMODE_OUTPUT) &amp; ~3;</div><div class='del'>-			if (cinfo.ptr &lt; dmap_out-&gt;fragment_size &amp;&amp; dmap_out-&gt;qhead != 0)</div><div class='del'>-				cinfo.bytes += dmap_out-&gt;bytes_in_use;	/* Pointer wrap not handled yet */</div><div class='del'>-			cinfo.blocks = dmap_out-&gt;qlen;</div><div class='del'>-			cinfo.bytes += cinfo.ptr;</div><div class='del'>-			if (dmap_out-&gt;mapping_flags &amp; DMA_MAP_MAPPED)</div><div class='del'>-				dmap_out-&gt;qlen = 0;	/* Reset interrupt counter */</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-			if (copy_to_user(arg, &amp;cinfo, sizeof(cinfo)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETODELAY:</div><div class='del'>-			if (!(audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (!(dmap_out-&gt;flags &amp; DMA_ALLOC_DONE))</div><div class='del'>-			{</div><div class='del'>-				ret=0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			spin_lock_irqsave(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-			/* Compute number of bytes that have been played */</div><div class='del'>-			count = DMAbuf_get_buffer_pointer (dev, dmap_out, DMODE_OUTPUT);</div><div class='del'>-			if (count &lt; dmap_out-&gt;fragment_size &amp;&amp; dmap_out-&gt;qhead != 0)</div><div class='del'>-				count += dmap_out-&gt;bytes_in_use;	/* Pointer wrap not handled yet */</div><div class='del'>-			count += dmap_out-&gt;byte_counter;</div><div class='del'>-			/* Substract current count from the number of bytes written by app */</div><div class='del'>-			count = dmap_out-&gt;user_counter - count;</div><div class='del'>-			if (count &lt; 0)</div><div class='del'>-				count = 0;</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap_out-&gt;lock,flags);</div><div class='del'>-			ret = count;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_POST:</div><div class='del'>-			if (audio_devs[dev]-&gt;dmap_out-&gt;qlen &gt; 0)</div><div class='del'>-				if (!(audio_devs[dev]-&gt;dmap_out-&gt;flags &amp; DMA_ACTIVE))</div><div class='del'>-					DMAbuf_launch_output(dev, audio_devs[dev]-&gt;dmap_out);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_GETBLKSIZE:</div><div class='del'>-			dmap = dmap_out;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-				reorganize_buffers(dev, dmap_out, (audio_devs[dev]-&gt;open_mode == OPEN_READ));</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode == OPEN_READ ||</div><div class='del'>-			    (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX &amp;&amp;</div><div class='del'>-			     audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				reorganize_buffers(dev, dmap_in, (audio_devs[dev]-&gt;open_mode == OPEN_READ));</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode == OPEN_READ)</div><div class='del'>-				dmap = dmap_in;</div><div class='del'>-			ret = dmap-&gt;fragment_size;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_DSP_SETFRAGMENT:</div><div class='del'>-			ret = 0;</div><div class='del'>-			if (get_user(fact, (int __user *)arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-				ret = dma_set_fragment(dev, dmap_out, fact);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			if (audio_devs[dev]-&gt;open_mode == OPEN_READ ||</div><div class='del'>-			    (audio_devs[dev]-&gt;flags &amp; DMA_DUPLEX &amp;&amp;</div><div class='del'>-			     audio_devs[dev]-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-				ret = dma_set_fragment(dev, dmap_in, fact);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			if (!arg) /* don't know what this is good for, but preserve old semantics */</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			if (!audio_devs[dev]-&gt;d-&gt;ioctl)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return audio_devs[dev]-&gt;d-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-	}</div><div class='del'>-	return put_user(ret, (int __user *)arg);</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/bin2hex.c b/sound/oss/bin2hex.c<br/>deleted file mode 100644<br/>index b59109eb0db4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/bin2hex.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/bin2hex.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-int main( int argc, const char * argv [] )</div><div class='del'>-{</div><div class='del'>-    const char * varname;</div><div class='del'>-    int i = 0;</div><div class='del'>-    int c;</div><div class='del'>-    int id = 0;</div><div class='del'>-</div><div class='del'>-    if(argv[1] &amp;&amp; strcmp(argv[1],"-i")==0)</div><div class='del'>-    {</div><div class='del'>-    	argv++;</div><div class='del'>-    	argc--;</div><div class='del'>-    	id=1;</div><div class='del'>-    }</div><div class='del'>-    	</div><div class='del'>-    if(argc==1)</div><div class='del'>-    {</div><div class='del'>-    	fprintf(stderr, "bin2hex: [-i] firmware\n");</div><div class='del'>-    	exit(1);</div><div class='del'>-    }</div><div class='del'>-    </div><div class='del'>-    varname = argv[1];</div><div class='del'>-    printf( "/* automatically generated by bin2hex */\n" );</div><div class='del'>-    printf( "static unsigned char %s [] %s =\n{\n", varname , id?"__initdata":"");</div><div class='del'>-</div><div class='del'>-    while ( ( c = getchar( ) ) != EOF )</div><div class='del'>-    {</div><div class='del'>-	if ( i != 0 &amp;&amp; i % 10 == 0 )</div><div class='del'>-	    printf( "\n" );</div><div class='del'>-	printf( "0x%02lx,", c &amp; 0xFFl );</div><div class='del'>-	i++;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    printf( "};\nstatic int %sLen =  %d;\n", varname, i );</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/coproc.h b/sound/oss/coproc.h<br/>deleted file mode 100644<br/>index 7bec21bbdd88..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/coproc.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/coproc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Definitions for various on board processors on the sound cards. For</div><div class='del'>- * example DSP processors.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Coprocessor access types</div><div class='del'>- */</div><div class='del'>-#define COPR_CUSTOM		0x0001	/* Custom applications */</div><div class='del'>-#define COPR_MIDI		0x0002	/* MIDI (MPU-401) emulation */</div><div class='del'>-#define COPR_PCM		0x0004	/* Digitized voice applications */</div><div class='del'>-#define COPR_SYNTH		0x0008	/* Music synthesis */</div><div class='head'>diff --git a/sound/oss/dev_table.c b/sound/oss/dev_table.c<br/>deleted file mode 100644<br/>index 727bdb9ba2dc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dev_table.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dev_table.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,258 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/dev_table.c</div><div class='del'>- *</div><div class='del'>- * Device call tables.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-struct audio_operations *audio_devs[MAX_AUDIO_DEV];</div><div class='del'>-EXPORT_SYMBOL(audio_devs);</div><div class='del'>-</div><div class='del'>-int num_audiodevs;</div><div class='del'>-EXPORT_SYMBOL(num_audiodevs);</div><div class='del'>-</div><div class='del'>-struct mixer_operations *mixer_devs[MAX_MIXER_DEV];</div><div class='del'>-EXPORT_SYMBOL(mixer_devs);</div><div class='del'>-</div><div class='del'>-int num_mixers;</div><div class='del'>-EXPORT_SYMBOL(num_mixers);</div><div class='del'>-</div><div class='del'>-struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV];</div><div class='del'>-EXPORT_SYMBOL(synth_devs);</div><div class='del'>-</div><div class='del'>-int num_synths;</div><div class='del'>-</div><div class='del'>-struct midi_operations *midi_devs[MAX_MIDI_DEV];</div><div class='del'>-EXPORT_SYMBOL(midi_devs);</div><div class='del'>-</div><div class='del'>-int num_midis;</div><div class='del'>-EXPORT_SYMBOL(num_midis);</div><div class='del'>-</div><div class='del'>-struct sound_timer_operations *sound_timer_devs[MAX_TIMER_DEV] = {</div><div class='del'>-	&amp;default_sound_timer, NULL</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL(sound_timer_devs);</div><div class='del'>-</div><div class='del'>-int num_sound_timers = 1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sound_alloc_audiodev(void);</div><div class='del'>-</div><div class='del'>-int sound_install_audiodrv(int vers, char *name, struct audio_driver *driver,</div><div class='del'>-			int driver_size, int flags, unsigned int format_mask,</div><div class='del'>-			void *devc, int dma1, int dma2)</div><div class='del'>-{</div><div class='del'>-	struct audio_driver *d;</div><div class='del'>-	struct audio_operations *op;</div><div class='del'>-	int num;</div><div class='del'>-</div><div class='del'>-	if (vers != AUDIO_DRIVER_VERSION || driver_size &gt; sizeof(struct audio_driver)) {</div><div class='del'>-		printk(KERN_ERR "Sound: Incompatible audio driver for %s\n", name);</div><div class='del'>-		return -(EINVAL);</div><div class='del'>-	}</div><div class='del'>-	num = sound_alloc_audiodev();</div><div class='del'>-</div><div class='del'>-	if (num == -1) {</div><div class='del'>-		printk(KERN_ERR "sound: Too many audio drivers\n");</div><div class='del'>-		return -(EBUSY);</div><div class='del'>-	}</div><div class='del'>-	d = (struct audio_driver *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct audio_driver)));</div><div class='del'>-	sound_nblocks++;</div><div class='del'>-	if (sound_nblocks &gt;= MAX_MEM_BLOCKS)</div><div class='del'>-		sound_nblocks = MAX_MEM_BLOCKS - 1;</div><div class='del'>-</div><div class='del'>-	op = (struct audio_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct audio_operations)));</div><div class='del'>-	sound_nblocks++;</div><div class='del'>-	if (sound_nblocks &gt;= MAX_MEM_BLOCKS)</div><div class='del'>-		sound_nblocks = MAX_MEM_BLOCKS - 1;</div><div class='del'>-</div><div class='del'>-	if (d == NULL || op == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: Can't allocate driver for (%s)\n", name);</div><div class='del'>-		sound_unload_audiodev(num);</div><div class='del'>-		return -(ENOMEM);</div><div class='del'>-	}</div><div class='del'>-	memset((char *) op, 0, sizeof(struct audio_operations));</div><div class='del'>-	init_waitqueue_head(&amp;op-&gt;in_sleeper);</div><div class='del'>-	init_waitqueue_head(&amp;op-&gt;out_sleeper);	</div><div class='del'>-	init_waitqueue_head(&amp;op-&gt;poll_sleeper);</div><div class='del'>-	if (driver_size &lt; sizeof(struct audio_driver))</div><div class='del'>-		memset((char *) d, 0, sizeof(struct audio_driver));</div><div class='del'>-</div><div class='del'>-	memcpy((char *) d, (char *) driver, driver_size);</div><div class='del'>-</div><div class='del'>-	op-&gt;d = d;</div><div class='del'>-	strlcpy(op-&gt;name, name, sizeof(op-&gt;name));</div><div class='del'>-	op-&gt;flags = flags;</div><div class='del'>-	op-&gt;format_mask = format_mask;</div><div class='del'>-	op-&gt;devc = devc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *    Hardcoded defaults</div><div class='del'>-	 */</div><div class='del'>-	audio_devs[num] = op;</div><div class='del'>-</div><div class='del'>-	DMAbuf_init(num, dma1, dma2);</div><div class='del'>-</div><div class='del'>-	audio_init_devices();</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_install_audiodrv);</div><div class='del'>-</div><div class='del'>-int sound_install_mixer(int vers, char *name, struct mixer_operations *driver,</div><div class='del'>-	int driver_size, void *devc)</div><div class='del'>-{</div><div class='del'>-	struct mixer_operations *op;</div><div class='del'>-</div><div class='del'>-	int n = sound_alloc_mixerdev();</div><div class='del'>-</div><div class='del'>-	if (n == -1) {</div><div class='del'>-		printk(KERN_ERR "Sound: Too many mixer drivers\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (vers != MIXER_DRIVER_VERSION ||</div><div class='del'>-		driver_size &gt; sizeof(struct mixer_operations)) {</div><div class='del'>-		printk(KERN_ERR "Sound: Incompatible mixer driver for %s\n", name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* FIXME: This leaks a mixer_operations struct every time its called</div><div class='del'>-	   until you unload sound! */</div><div class='del'>-	   </div><div class='del'>-	op = (struct mixer_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct mixer_operations)));</div><div class='del'>-	sound_nblocks++;</div><div class='del'>-	if (sound_nblocks &gt;= MAX_MEM_BLOCKS)</div><div class='del'>-		sound_nblocks = MAX_MEM_BLOCKS - 1;</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: Can't allocate mixer driver for (%s)\n", name);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	memset((char *) op, 0, sizeof(struct mixer_operations));</div><div class='del'>-	memcpy((char *) op, (char *) driver, driver_size);</div><div class='del'>-</div><div class='del'>-	strlcpy(op-&gt;name, name, sizeof(op-&gt;name));</div><div class='del'>-	op-&gt;devc = devc;</div><div class='del'>-</div><div class='del'>-	mixer_devs[n] = op;</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_install_mixer);</div><div class='del'>-</div><div class='del'>-void sound_unload_audiodev(int dev)</div><div class='del'>-{</div><div class='del'>-	if (dev != -1) {</div><div class='del'>-		DMAbuf_deinit(dev);</div><div class='del'>-		audio_devs[dev] = NULL;</div><div class='del'>-		unregister_sound_dsp((dev&lt;&lt;4)+3);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_unload_audiodev);</div><div class='del'>-</div><div class='del'>-static int sound_alloc_audiodev(void)</div><div class='del'>-{ </div><div class='del'>-	int i = register_sound_dsp(&amp;oss_sound_fops, -1);</div><div class='del'>-	if(i==-1)</div><div class='del'>-		return i;</div><div class='del'>-	i&gt;&gt;=4;</div><div class='del'>-	if(i&gt;=num_audiodevs)</div><div class='del'>-		num_audiodevs = i + 1;</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sound_alloc_mididev(void)</div><div class='del'>-{</div><div class='del'>-	int i = register_sound_midi(&amp;oss_sound_fops, -1);</div><div class='del'>-	if(i==-1)</div><div class='del'>-		return i;</div><div class='del'>-	i&gt;&gt;=4;</div><div class='del'>-	if(i&gt;=num_midis)</div><div class='del'>-		num_midis = i + 1;</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_alloc_mididev);</div><div class='del'>-</div><div class='del'>-int sound_alloc_synthdev(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_SYNTH_DEV; i++) {</div><div class='del'>-		if (synth_devs[i] == NULL) {</div><div class='del'>-			if (i &gt;= num_synths)</div><div class='del'>-				num_synths++;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_alloc_synthdev);</div><div class='del'>-</div><div class='del'>-int sound_alloc_mixerdev(void)</div><div class='del'>-{</div><div class='del'>-	int i = register_sound_mixer(&amp;oss_sound_fops, -1);</div><div class='del'>-	if(i==-1)</div><div class='del'>-		return -1;</div><div class='del'>-	i&gt;&gt;=4;</div><div class='del'>-	if(i&gt;=num_mixers)</div><div class='del'>-		num_mixers = i + 1;</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_alloc_mixerdev);</div><div class='del'>-</div><div class='del'>-int sound_alloc_timerdev(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_TIMER_DEV; i++) {</div><div class='del'>-		if (sound_timer_devs[i] == NULL) {</div><div class='del'>-			if (i &gt;= num_sound_timers)</div><div class='del'>-				num_sound_timers++;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_alloc_timerdev);</div><div class='del'>-</div><div class='del'>-void sound_unload_mixerdev(int dev)</div><div class='del'>-{</div><div class='del'>-	if (dev != -1) {</div><div class='del'>-		mixer_devs[dev] = NULL;</div><div class='del'>-		unregister_sound_mixer(dev&lt;&lt;4);</div><div class='del'>-		num_mixers--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_unload_mixerdev);</div><div class='del'>-</div><div class='del'>-void sound_unload_mididev(int dev)</div><div class='del'>-{</div><div class='del'>-	if (dev != -1) {</div><div class='del'>-		midi_devs[dev] = NULL;</div><div class='del'>-		unregister_sound_midi((dev&lt;&lt;4)+2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_unload_mididev);</div><div class='del'>-</div><div class='del'>-void sound_unload_synthdev(int dev)</div><div class='del'>-{</div><div class='del'>-	if (dev != -1)</div><div class='del'>-		synth_devs[dev] = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_unload_synthdev);</div><div class='del'>-</div><div class='del'>-void sound_unload_timerdev(int dev)</div><div class='del'>-{</div><div class='del'>-	if (dev != -1)</div><div class='del'>-		sound_timer_devs[dev] = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_unload_timerdev);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h<br/>deleted file mode 100644<br/>index b7617bee6388..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dev_table.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dev_table.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,390 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	dev_table.h</div><div class='del'>- *</div><div class='del'>- *	Global definitions for device call tables</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _DEV_TABLE_H_</div><div class='del'>-#define _DEV_TABLE_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-/*</div><div class='del'>- * Sound card numbers 27 to 999. (1 to 26 are defined in soundcard.h)</div><div class='del'>- * Numbers 1000 to N are reserved for driver's internal use.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SNDCARD_DESKPROXL		27	/* Compaq Deskpro XL */</div><div class='del'>-#define SNDCARD_VIDC			28	/* ARMs VIDC */</div><div class='del'>-#define SNDCARD_SBPNP			29</div><div class='del'>-#define SNDCARD_SOFTOSS			36</div><div class='del'>-#define SNDCARD_VMIDI			37</div><div class='del'>-#define SNDCARD_OPL3SA1			38	/* Note: clash in msnd.h */</div><div class='del'>-#define SNDCARD_OPL3SA1_SB		39</div><div class='del'>-#define SNDCARD_OPL3SA1_MPU		40</div><div class='del'>-#define SNDCARD_WAVEFRONT               41</div><div class='del'>-#define SNDCARD_OPL3SA2                 42</div><div class='del'>-#define SNDCARD_OPL3SA2_MPU             43</div><div class='del'>-#define SNDCARD_WAVEARTIST              44	/* Waveartist */</div><div class='del'>-#define SNDCARD_OPL3SA2_MSS             45	/* Originally missed */</div><div class='del'>-#define SNDCARD_AD1816                  88</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	NOTE! 	NOTE!	NOTE!	NOTE!</div><div class='del'>- *</div><div class='del'>- *	If you modify this file, please check the dev_table.c also.</div><div class='del'>- *</div><div class='del'>- *	NOTE! 	NOTE!	NOTE!	NOTE!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct driver_info </div><div class='del'>-{</div><div class='del'>-	char *driver_id;</div><div class='del'>-	int card_subtype;	/* Driver specific. Usually 0 */</div><div class='del'>-	int card_type;		/*	From soundcard.h	*/</div><div class='del'>-	char *name;</div><div class='del'>-	void (*attach) (struct address_info *hw_config);</div><div class='del'>-	int (*probe) (struct address_info *hw_config);</div><div class='del'>-	void (*unload) (struct address_info *hw_config);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct card_info </div><div class='del'>-{</div><div class='del'>-	int card_type;	/* Link (search key) to the driver list */</div><div class='del'>-	struct address_info config;</div><div class='del'>-	int enabled;</div><div class='del'>-	void *for_driver_use;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Device specific parameters (used only by dmabuf.c)</div><div class='del'>- */</div><div class='del'>-#define MAX_SUB_BUFFERS		(32*MAX_REALTIME_FACTOR)</div><div class='del'>-</div><div class='del'>-#define DMODE_NONE		0</div><div class='del'>-#define DMODE_OUTPUT		PCM_ENABLE_OUTPUT</div><div class='del'>-#define DMODE_INPUT		PCM_ENABLE_INPUT</div><div class='del'>-</div><div class='del'>-struct dma_buffparms </div><div class='del'>-{</div><div class='del'>-	int      dma_mode;	/* DMODE_INPUT, DMODE_OUTPUT or DMODE_NONE */</div><div class='del'>-	int	 closing;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>- 	 * Pointers to raw buffers</div><div class='del'>- 	 */</div><div class='del'>-</div><div class='del'>-  	char     *raw_buf;</div><div class='del'>-    	unsigned long   raw_buf_phys;</div><div class='del'>-	int buffsize;</div><div class='del'>-</div><div class='del'>-     	/*</div><div class='del'>-         * Device state tables</div><div class='del'>-         */</div><div class='del'>-</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#define DMA_BUSY	0x00000001</div><div class='del'>-#define DMA_RESTART	0x00000002</div><div class='del'>-#define DMA_ACTIVE	0x00000004</div><div class='del'>-#define DMA_STARTED	0x00000008</div><div class='del'>-#define DMA_EMPTY	0x00000010	</div><div class='del'>-#define DMA_ALLOC_DONE	0x00000020</div><div class='del'>-#define DMA_SYNCING	0x00000040</div><div class='del'>-#define DMA_DIRTY	0x00000080</div><div class='del'>-#define DMA_POST	0x00000100</div><div class='del'>-#define DMA_NODMA	0x00000200</div><div class='del'>-#define DMA_NOTIMEOUT	0x00000400</div><div class='del'>-</div><div class='del'>-	int      open_mode;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Queue parameters.</div><div class='del'>-	 */</div><div class='del'>-	int      qlen;</div><div class='del'>-	int      qhead;</div><div class='del'>-	int      qtail;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-		</div><div class='del'>-	int	 cfrag;	/* Current incomplete fragment (write) */</div><div class='del'>-</div><div class='del'>-	int      nbufs;</div><div class='del'>-	int      counts[MAX_SUB_BUFFERS];</div><div class='del'>-	int      subdivision;</div><div class='del'>-</div><div class='del'>-	int      fragment_size;</div><div class='del'>-        int	 needs_reorg;</div><div class='del'>-	int	 max_fragments;</div><div class='del'>-</div><div class='del'>-	int	 bytes_in_use;</div><div class='del'>-</div><div class='del'>-	int	 underrun_count;</div><div class='del'>-	unsigned long	 byte_counter;</div><div class='del'>-	unsigned long	 user_counter;</div><div class='del'>-	unsigned long	 max_byte_counter;</div><div class='del'>-	int	 data_rate; /* Bytes/second */</div><div class='del'>-</div><div class='del'>-	int	 mapping_flags;</div><div class='del'>-#define			DMA_MAP_MAPPED		0x00000001</div><div class='del'>-	char	neutral_byte;</div><div class='del'>-	int	dma;		/* DMA channel */</div><div class='del'>-</div><div class='del'>-	int     applic_profile;	/* Application profile (APF_*) */</div><div class='del'>-	/* Interrupt callback stuff */</div><div class='del'>-	void (*audio_callback) (int dev, int parm);</div><div class='del'>-	int callback_parm;</div><div class='del'>-</div><div class='del'>-	int	 buf_flags[MAX_SUB_BUFFERS];</div><div class='del'>-#define		 BUFF_EOF		0x00000001 /* Increment eof count */</div><div class='del'>-#define		 BUFF_DIRTY		0x00000002 /* Buffer written */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Structure for use with various microcontrollers and DSP processors </div><div class='del'>- * in the recent sound cards.</div><div class='del'>- */</div><div class='del'>-typedef struct coproc_operations </div><div class='del'>-{</div><div class='del'>-	char name[64];</div><div class='del'>-	struct module *owner;</div><div class='del'>-	int (*open) (void *devc, int sub_device);</div><div class='del'>-	void (*close) (void *devc, int sub_device);</div><div class='del'>-	int (*ioctl) (void *devc, unsigned int cmd, void __user * arg, int local);</div><div class='del'>-	void (*reset) (void *devc);</div><div class='del'>-</div><div class='del'>-	void *devc;		/* Driver specific info */</div><div class='del'>-} coproc_operations;</div><div class='del'>-</div><div class='del'>-struct audio_driver </div><div class='del'>-{</div><div class='del'>-	struct module *owner;</div><div class='del'>-	int (*open) (int dev, int mode);</div><div class='del'>-	void (*close) (int dev);</div><div class='del'>-	void (*output_block) (int dev, unsigned long buf, </div><div class='del'>-			      int count, int intrflag);</div><div class='del'>-	void (*start_input) (int dev, unsigned long buf, </div><div class='del'>-			     int count, int intrflag);</div><div class='del'>-	int (*ioctl) (int dev, unsigned int cmd, void __user * arg);</div><div class='del'>-	int (*prepare_for_input) (int dev, int bufsize, int nbufs);</div><div class='del'>-	int (*prepare_for_output) (int dev, int bufsize, int nbufs);</div><div class='del'>-	void (*halt_io) (int dev);</div><div class='del'>-	int (*local_qlen)(int dev);</div><div class='del'>-	void (*copy_user) (int dev,</div><div class='del'>-			char *localbuf, int localoffs,</div><div class='del'>-                        const char __user *userbuf, int useroffs,</div><div class='del'>-                        int max_in, int max_out,</div><div class='del'>-                        int *used, int *returned,</div><div class='del'>-                        int len);</div><div class='del'>-	void (*halt_input) (int dev);</div><div class='del'>-	void (*halt_output) (int dev);</div><div class='del'>-	void (*trigger) (int dev, int bits);</div><div class='del'>-	int (*set_speed)(int dev, int speed);</div><div class='del'>-	unsigned int (*set_bits)(int dev, unsigned int bits);</div><div class='del'>-	short (*set_channels)(int dev, short channels);</div><div class='del'>-	void (*postprocess_write)(int dev); 	/* Device spesific postprocessing for written data */</div><div class='del'>-	void (*preprocess_read)(int dev); 	/* Device spesific preprocessing for read data */</div><div class='del'>-	void (*mmap)(int dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct audio_operations </div><div class='del'>-{</div><div class='del'>-        char name[128];</div><div class='del'>-	int flags;</div><div class='del'>-#define NOTHING_SPECIAL 	0x00</div><div class='del'>-#define NEEDS_RESTART		0x01</div><div class='del'>-#define DMA_AUTOMODE		0x02</div><div class='del'>-#define DMA_DUPLEX		0x04</div><div class='del'>-#define DMA_PSEUDO_AUTOMODE	0x08</div><div class='del'>-#define DMA_HARDSTOP		0x10</div><div class='del'>-#define DMA_EXACT		0x40</div><div class='del'>-#define DMA_NORESET		0x80</div><div class='del'>-	int  format_mask;	/* Bitmask for supported audio formats */</div><div class='del'>-	void *devc;		/* Driver specific info */</div><div class='del'>-	struct audio_driver *d;</div><div class='del'>-	void *portc;		/* Driver specific info */</div><div class='del'>-	struct dma_buffparms *dmap_in, *dmap_out;</div><div class='del'>-	struct coproc_operations *coproc;</div><div class='del'>-	int mixer_dev;</div><div class='del'>-	int enable_bits;</div><div class='del'>- 	int open_mode;</div><div class='del'>-	int go;</div><div class='del'>-	int min_fragment;	/* 0 == unlimited */</div><div class='del'>-	int max_fragment;	/* 0 == unlimited */</div><div class='del'>-	int parent_dev;		/* 0 -&gt; no parent, 1 to n -&gt; parent=parent_dev+1 */</div><div class='del'>-</div><div class='del'>-	/* fields formerly in dmabuf.c */</div><div class='del'>-	wait_queue_head_t in_sleeper;</div><div class='del'>-	wait_queue_head_t out_sleeper;</div><div class='del'>-	wait_queue_head_t poll_sleeper;</div><div class='del'>-</div><div class='del'>-	/* fields formerly in audio.c */</div><div class='del'>-	int audio_mode;</div><div class='del'>-</div><div class='del'>-#define		AM_NONE		0</div><div class='del'>-#define		AM_WRITE	OPEN_WRITE</div><div class='del'>-#define 	AM_READ		OPEN_READ</div><div class='del'>-</div><div class='del'>-	int local_format;</div><div class='del'>-	int audio_format;</div><div class='del'>-	int local_conversion;</div><div class='del'>-#define CNV_MU_LAW	0x00000001</div><div class='del'>-</div><div class='del'>-	/* large structures at the end to keep offsets small */</div><div class='del'>-	struct dma_buffparms dmaps[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int *load_mixer_volumes(char *name, int *levels, int present);</div><div class='del'>-</div><div class='del'>-struct mixer_operations </div><div class='del'>-{</div><div class='del'>-	struct module *owner;</div><div class='del'>-	char id[16];</div><div class='del'>-	char name[64];</div><div class='del'>-	int (*ioctl) (int dev, unsigned int cmd, void __user * arg);</div><div class='del'>-	</div><div class='del'>-	void *devc;</div><div class='del'>-	int modify_counter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct synth_operations </div><div class='del'>-{</div><div class='del'>-	struct module *owner;</div><div class='del'>-	char *id;	/* Unique identifier (ASCII) max 29 char */</div><div class='del'>-	struct synth_info *info;</div><div class='del'>-	int midi_dev;</div><div class='del'>-	int synth_type;</div><div class='del'>-	int synth_subtype;</div><div class='del'>-</div><div class='del'>-	int (*open) (int dev, int mode);</div><div class='del'>-	void (*close) (int dev);</div><div class='del'>-	int (*ioctl) (int dev, unsigned int cmd, void __user * arg);</div><div class='del'>-	int (*kill_note) (int dev, int voice, int note, int velocity);</div><div class='del'>-	int (*start_note) (int dev, int voice, int note, int velocity);</div><div class='del'>-	int (*set_instr) (int dev, int voice, int instr);</div><div class='del'>-	void (*reset) (int dev);</div><div class='del'>-	void (*hw_control) (int dev, unsigned char *event);</div><div class='del'>-	int (*load_patch) (int dev, int format, const char __user *addr,</div><div class='del'>-	     int offs, int count, int pmgr_flag);</div><div class='del'>-	void (*aftertouch) (int dev, int voice, int pressure);</div><div class='del'>-	void (*controller) (int dev, int voice, int ctrl_num, int value);</div><div class='del'>-	void (*panning) (int dev, int voice, int value);</div><div class='del'>-	void (*volume_method) (int dev, int mode);</div><div class='del'>-	void (*bender) (int dev, int chn, int value);</div><div class='del'>-	int (*alloc_voice) (int dev, int chn, int note, struct voice_alloc_info *alloc);</div><div class='del'>-	void (*setup_voice) (int dev, int voice, int chn);</div><div class='del'>-	int (*send_sysex)(int dev, unsigned char *bytes, int len);</div><div class='del'>-</div><div class='del'>- 	struct voice_alloc_info alloc;</div><div class='del'>- 	struct channel_info chn_info[16];</div><div class='del'>-	int emulation;</div><div class='del'>-#define	EMU_GM			1	/* General MIDI */</div><div class='del'>-#define	EMU_XG			2	/* Yamaha XG */</div><div class='del'>-#define MAX_SYSEX_BUF	64</div><div class='del'>-	unsigned char sysex_buf[MAX_SYSEX_BUF];</div><div class='del'>-	int sysex_ptr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct midi_input_info </div><div class='del'>-{</div><div class='del'>-	/* MIDI input scanner variables */</div><div class='del'>-#define MI_MAX	10</div><div class='del'>-	volatile int             m_busy;</div><div class='del'>-    	unsigned char   m_buf[MI_MAX];</div><div class='del'>-	unsigned char	m_prev_status;	/* For running status */</div><div class='del'>-    	int             m_ptr;</div><div class='del'>-#define MST_INIT			0</div><div class='del'>-#define MST_DATA			1</div><div class='del'>-#define MST_SYSEX			2</div><div class='del'>-    	int             m_state;</div><div class='del'>-    	int             m_left;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct midi_operations </div><div class='del'>-{</div><div class='del'>-	struct module *owner;</div><div class='del'>-	struct midi_info info;</div><div class='del'>-	struct synth_operations *converter;</div><div class='del'>-	struct midi_input_info in_info;</div><div class='del'>-	int (*open) (int dev, int mode,</div><div class='del'>-		void (*inputintr)(int dev, unsigned char data),</div><div class='del'>-		void (*outputintr)(int dev)</div><div class='del'>-		);</div><div class='del'>-	void (*close) (int dev);</div><div class='del'>-	int (*ioctl) (int dev, unsigned int cmd, void __user * arg);</div><div class='del'>-	int (*outputc) (int dev, unsigned char data);</div><div class='del'>-	int (*start_read) (int dev);</div><div class='del'>-	int (*end_read) (int dev);</div><div class='del'>-	void (*kick)(int dev);</div><div class='del'>-	int (*command) (int dev, unsigned char *data);</div><div class='del'>-	int (*buffer_status) (int dev);</div><div class='del'>-	int (*prefix_cmd) (int dev, unsigned char status);</div><div class='del'>-	struct coproc_operations *coproc;</div><div class='del'>-	void *devc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sound_lowlev_timer </div><div class='del'>-{</div><div class='del'>-	int dev;</div><div class='del'>-	int priority;</div><div class='del'>-	unsigned int (*tmr_start)(int dev, unsigned int usecs);</div><div class='del'>-	void (*tmr_disable)(int dev);</div><div class='del'>-	void (*tmr_restart)(int dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sound_timer_operations </div><div class='del'>-{</div><div class='del'>-	struct module *owner;</div><div class='del'>-	struct sound_timer_info info;</div><div class='del'>-	int priority;</div><div class='del'>-	int devlink;</div><div class='del'>-	int (*open)(int dev, int mode);</div><div class='del'>-	void (*close)(int dev);</div><div class='del'>-	int (*event)(int dev, unsigned char *ev);</div><div class='del'>-	unsigned long (*get_time)(int dev);</div><div class='del'>-	int (*ioctl) (int dev, unsigned int cmd, void __user * arg);</div><div class='del'>-	void (*arm_timer)(int dev, long time);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-extern struct sound_timer_operations default_sound_timer;</div><div class='del'>-</div><div class='del'>-extern struct audio_operations *audio_devs[MAX_AUDIO_DEV];</div><div class='del'>-extern int num_audiodevs;</div><div class='del'>-extern struct mixer_operations *mixer_devs[MAX_MIXER_DEV];</div><div class='del'>-extern int num_mixers;</div><div class='del'>-extern struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV];</div><div class='del'>-extern int num_synths;</div><div class='del'>-extern struct midi_operations *midi_devs[MAX_MIDI_DEV];</div><div class='del'>-extern int num_midis;</div><div class='del'>-extern struct sound_timer_operations * sound_timer_devs[MAX_TIMER_DEV];</div><div class='del'>-extern int num_sound_timers;</div><div class='del'>-</div><div class='del'>-extern int sound_map_buffer (int dev, struct dma_buffparms *dmap, buffmem_desc *info);</div><div class='del'>-void sound_timer_init (struct sound_lowlev_timer *t, char *name);</div><div class='del'>-void sound_dma_intr (int dev, struct dma_buffparms *dmap, int chan);</div><div class='del'>-</div><div class='del'>-#define AUDIO_DRIVER_VERSION	2</div><div class='del'>-#define MIXER_DRIVER_VERSION	2</div><div class='del'>-int sound_install_audiodrv(int vers, char *name, struct audio_driver *driver,</div><div class='del'>-			int driver_size, int flags, unsigned int format_mask,</div><div class='del'>-			void *devc, int dma1, int dma2);</div><div class='del'>-int sound_install_mixer(int vers, char *name, struct mixer_operations *driver,</div><div class='del'>-			int driver_size, void *devc);</div><div class='del'>-</div><div class='del'>-void sound_unload_audiodev(int dev);</div><div class='del'>-void sound_unload_mixerdev(int dev);</div><div class='del'>-void sound_unload_mididev(int dev);</div><div class='del'>-void sound_unload_synthdev(int dev);</div><div class='del'>-void sound_unload_timerdev(int dev);</div><div class='del'>-int sound_alloc_mixerdev(void);</div><div class='del'>-int sound_alloc_timerdev(void);</div><div class='del'>-int sound_alloc_synthdev(void);</div><div class='del'>-int sound_alloc_mididev(void);</div><div class='del'>-#endif	/* _DEV_TABLE_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c<br/>deleted file mode 100644<br/>index bcc3e8e07122..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmabuf.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmabuf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1268 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/dmabuf.c</div><div class='del'>- *</div><div class='del'>- * The DMA buffer manager for digitized voice applications</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer   : moved several static variables into struct audio_operations</div><div class='del'>- *                   (which is grossly misnamed btw.) because they have the same</div><div class='del'>- *                   lifetime as the rest in there and dynamic allocation saves</div><div class='del'>- *                   12k or so</div><div class='del'>- * Thomas Sailer   : remove {in,out}_sleep_flag. It was used for the sleeper to</div><div class='del'>- *                   determine if it was woken up by the expiring timeout or by</div><div class='del'>- *                   an explicit wake_up. The return value from schedule_timeout</div><div class='del'>- *		     can be used instead; if 0, the wakeup was due to the timeout.</div><div class='del'>- *</div><div class='del'>- * Rob Riggs		Added persistent DMA buffers (1998/10/17)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define BE_CONSERVATIVE</div><div class='del'>-#define SAMPLE_ROUNDUP 0</div><div class='del'>-</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#define DMAP_FREE_ON_CLOSE      0</div><div class='del'>-#define DMAP_KEEP_ON_CLOSE      1</div><div class='del'>-extern int sound_dmap_flag;</div><div class='del'>-</div><div class='del'>-static void dma_reset_output(int dev);</div><div class='del'>-static void dma_reset_input(int dev);</div><div class='del'>-static int local_start_dma(struct audio_operations *adev, unsigned long physaddr, int count, int dma_mode);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int debugmem;    	/* switched off by default */</div><div class='del'>-static int dma_buffsize = DSP_BUFFSIZE;</div><div class='del'>-</div><div class='del'>-static long dmabuf_timeout(struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	long tmout;</div><div class='del'>-</div><div class='del'>-	tmout = (dmap-&gt;fragment_size * HZ) / dmap-&gt;data_rate;</div><div class='del'>-	tmout += HZ / 5;	/* Some safety distance */</div><div class='del'>-	if (tmout &lt; (HZ / 2))</div><div class='del'>-		tmout = HZ / 2;</div><div class='del'>-	if (tmout &gt; 20 * HZ)</div><div class='del'>-		tmout = 20 * HZ;</div><div class='del'>-	return tmout;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sound_alloc_dmap(struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	char *start_addr, *end_addr;</div><div class='del'>-	int dma_pagesize;</div><div class='del'>-	int sz, size;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	dmap-&gt;mapping_flags &amp;= ~DMA_MAP_MAPPED;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf != NULL)</div><div class='del'>-		return 0;	/* Already done */</div><div class='del'>-	if (dma_buffsize &lt; 4096)</div><div class='del'>-		dma_buffsize = 4096;</div><div class='del'>-	dma_pagesize = (dmap-&gt;dma &lt; 4) ? (64 * 1024) : (128 * 1024);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 *	Now check for the Cyrix problem.</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	if(isa_dma_bridge_buggy==2)</div><div class='del'>-		dma_pagesize=32768;</div><div class='del'>-	 </div><div class='del'>-	dmap-&gt;raw_buf = NULL;</div><div class='del'>-	dmap-&gt;buffsize = dma_buffsize;</div><div class='del'>-	if (dmap-&gt;buffsize &gt; dma_pagesize)</div><div class='del'>-		dmap-&gt;buffsize = dma_pagesize;</div><div class='del'>-	start_addr = NULL;</div><div class='del'>-	/*</div><div class='del'>-	 * Now loop until we get a free buffer. Try to get smaller buffer if</div><div class='del'>-	 * it fails. Don't accept smaller than 8k buffer for performance</div><div class='del'>-	 * reasons.</div><div class='del'>-	 */</div><div class='del'>-	while (start_addr == NULL &amp;&amp; dmap-&gt;buffsize &gt; PAGE_SIZE) {</div><div class='del'>-		for (sz = 0, size = PAGE_SIZE; size &lt; dmap-&gt;buffsize; sz++, size &lt;&lt;= 1);</div><div class='del'>-		dmap-&gt;buffsize = PAGE_SIZE * (1 &lt;&lt; sz);</div><div class='del'>-		start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA|__GFP_NOWARN, sz);</div><div class='del'>-		if (start_addr == NULL)</div><div class='del'>-			dmap-&gt;buffsize /= 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_addr == NULL) {</div><div class='del'>-		printk(KERN_WARNING "Sound error: Couldn't allocate DMA buffer\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	} else {</div><div class='del'>-		/* make some checks */</div><div class='del'>-		end_addr = start_addr + dmap-&gt;buffsize - 1;</div><div class='del'>-</div><div class='del'>-		if (debugmem)</div><div class='del'>-			printk(KERN_DEBUG "sound: start 0x%lx, end 0x%lx\n", (long) start_addr, (long) end_addr);</div><div class='del'>-		</div><div class='del'>-		/* now check if it fits into the same dma-pagesize */</div><div class='del'>-</div><div class='del'>-		if (((long) start_addr &amp; ~(dma_pagesize - 1)) != ((long) end_addr &amp; ~(dma_pagesize - 1))</div><div class='del'>-		    || end_addr &gt;= (char *) (MAX_DMA_ADDRESS)) {</div><div class='del'>-			printk(KERN_ERR "sound: Got invalid address 0x%lx for %db DMA-buffer\n", (long) start_addr, dmap-&gt;buffsize);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	dmap-&gt;raw_buf = start_addr;</div><div class='del'>-	dmap-&gt;raw_buf_phys = virt_to_bus(start_addr);</div><div class='del'>-</div><div class='del'>-	for (page = virt_to_page(start_addr); page &lt;= virt_to_page(end_addr); page++)</div><div class='del'>-		SetPageReserved(page);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sound_free_dmap(struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	int sz, size;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long start_addr, end_addr;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED)</div><div class='del'>-		return;		/* Don't free mmapped buffer. Will use it next time */</div><div class='del'>-	for (sz = 0, size = PAGE_SIZE; size &lt; dmap-&gt;buffsize; sz++, size &lt;&lt;= 1);</div><div class='del'>-</div><div class='del'>-	start_addr = (unsigned long) dmap-&gt;raw_buf;</div><div class='del'>-	end_addr = start_addr + dmap-&gt;buffsize;</div><div class='del'>-</div><div class='del'>-	for (page = virt_to_page(start_addr); page &lt;= virt_to_page(end_addr); page++)</div><div class='del'>-		ClearPageReserved(page);</div><div class='del'>-</div><div class='del'>-	free_pages((unsigned long) dmap-&gt;raw_buf, sz);</div><div class='del'>-	dmap-&gt;raw_buf = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Intel version !!!!!!!!! */</div><div class='del'>-</div><div class='del'>-static int sound_start_dma(struct dma_buffparms *dmap, unsigned long physaddr, int count, int dma_mode)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int chan = dmap-&gt;dma;</div><div class='del'>-</div><div class='del'>-	/* printk( "Start DMA%d %d, %d\n",  chan,  (int)(physaddr-dmap-&gt;raw_buf_phys),  count); */</div><div class='del'>-</div><div class='del'>-	flags = claim_dma_lock();</div><div class='del'>-	disable_dma(chan);</div><div class='del'>-	clear_dma_ff(chan);</div><div class='del'>-	set_dma_mode(chan, dma_mode);</div><div class='del'>-	set_dma_addr(chan, physaddr);</div><div class='del'>-	set_dma_count(chan, count);</div><div class='del'>-	enable_dma(chan);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_init_buffers(struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	dmap-&gt;qlen = dmap-&gt;qhead = dmap-&gt;qtail = dmap-&gt;user_counter = 0;</div><div class='del'>-	dmap-&gt;byte_counter = 0;</div><div class='del'>-	dmap-&gt;max_byte_counter = 8000 * 60 * 60;</div><div class='del'>-	dmap-&gt;bytes_in_use = dmap-&gt;buffsize;</div><div class='del'>-</div><div class='del'>-	dmap-&gt;dma_mode = DMODE_NONE;</div><div class='del'>-	dmap-&gt;mapping_flags = 0;</div><div class='del'>-	dmap-&gt;neutral_byte = 0x80;</div><div class='del'>-	dmap-&gt;data_rate = 8000;</div><div class='del'>-	dmap-&gt;cfrag = -1;</div><div class='del'>-	dmap-&gt;closing = 0;</div><div class='del'>-	dmap-&gt;nbufs = 1;</div><div class='del'>-	dmap-&gt;flags = DMA_BUSY;	/* Other flags off */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int open_dmap(struct audio_operations *adev, int mode, struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	</div><div class='del'>-	if (dmap-&gt;flags &amp; DMA_BUSY)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	if ((err = sound_alloc_dmap(dmap)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_WARNING "Sound: DMA buffers not available\n");</div><div class='del'>-		return -ENOSPC;	/* Memory allocation failed during boot */</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;dma &gt;= 0 &amp;&amp; sound_open_dma(dmap-&gt;dma, adev-&gt;name)) {</div><div class='del'>-		printk(KERN_WARNING "Unable to grab(2) DMA%d for the audio driver\n", dmap-&gt;dma);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	dma_init_buffers(dmap);</div><div class='del'>-	spin_lock_init(&amp;dmap-&gt;lock);</div><div class='del'>-	dmap-&gt;open_mode = mode;</div><div class='del'>-	dmap-&gt;subdivision = dmap-&gt;underrun_count = 0;</div><div class='del'>-	dmap-&gt;fragment_size = 0;</div><div class='del'>-	dmap-&gt;max_fragments = 65536;	/* Just a large value */</div><div class='del'>-	dmap-&gt;byte_counter = 0;</div><div class='del'>-	dmap-&gt;max_byte_counter = 8000 * 60 * 60;</div><div class='del'>-	dmap-&gt;applic_profile = APF_NORMAL;</div><div class='del'>-	dmap-&gt;needs_reorg = 1;</div><div class='del'>-	dmap-&gt;audio_callback = NULL;</div><div class='del'>-	dmap-&gt;callback_parm = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void close_dmap(struct audio_operations *adev, struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	if (dmap-&gt;dma &gt;= 0) {</div><div class='del'>-		sound_close_dma(dmap-&gt;dma);</div><div class='del'>-		flags=claim_dma_lock();</div><div class='del'>-		disable_dma(dmap-&gt;dma);</div><div class='del'>-		release_dma_lock(flags);</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;flags &amp; DMA_BUSY)</div><div class='del'>-		dmap-&gt;dma_mode = DMODE_NONE;</div><div class='del'>-	dmap-&gt;flags &amp;= ~DMA_BUSY;</div><div class='del'>-	</div><div class='del'>-	if (sound_dmap_flag == DMAP_FREE_ON_CLOSE)</div><div class='del'>-		sound_free_dmap(dmap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static unsigned int default_set_bits(int dev, unsigned int bits)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	audio_devs[dev]-&gt;d-&gt;ioctl(dev, SNDCTL_DSP_SETFMT, (void __user *)&amp;bits);</div><div class='del'>-	set_fs(fs);</div><div class='del'>-	return bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int default_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	audio_devs[dev]-&gt;d-&gt;ioctl(dev, SNDCTL_DSP_SPEED, (void __user *)&amp;speed);</div><div class='del'>-	set_fs(fs);</div><div class='del'>-	return speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short default_set_channels(int dev, short channels)</div><div class='del'>-{</div><div class='del'>-	int c = channels;</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	audio_devs[dev]-&gt;d-&gt;ioctl(dev, SNDCTL_DSP_CHANNELS, (void __user *)&amp;c);</div><div class='del'>-	set_fs(fs);</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void check_driver(struct audio_driver *d)</div><div class='del'>-{</div><div class='del'>-	if (d-&gt;set_speed == NULL)</div><div class='del'>-		d-&gt;set_speed = default_set_speed;</div><div class='del'>-	if (d-&gt;set_bits == NULL)</div><div class='del'>-		d-&gt;set_bits = default_set_bits;</div><div class='del'>-	if (d-&gt;set_channels == NULL)</div><div class='del'>-		d-&gt;set_channels = default_set_channels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int DMAbuf_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	int retval;</div><div class='del'>-	struct dma_buffparms *dmap_in = NULL;</div><div class='del'>-	struct dma_buffparms *dmap_out = NULL;</div><div class='del'>-</div><div class='del'>-	if (!adev)</div><div class='del'>-		  return -ENXIO;</div><div class='del'>-	if (!(adev-&gt;flags &amp; DMA_DUPLEX))</div><div class='del'>-		adev-&gt;dmap_in = adev-&gt;dmap_out;</div><div class='del'>-	check_driver(adev-&gt;d);</div><div class='del'>-</div><div class='del'>-	if ((retval = adev-&gt;d-&gt;open(dev, mode)) &lt; 0)</div><div class='del'>-		return retval;</div><div class='del'>-	dmap_out = adev-&gt;dmap_out;</div><div class='del'>-	dmap_in = adev-&gt;dmap_in;</div><div class='del'>-	if (dmap_in == dmap_out)</div><div class='del'>-		adev-&gt;flags &amp;= ~DMA_DUPLEX;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_WRITE) {</div><div class='del'>-		if ((retval = open_dmap(adev, mode, dmap_out)) &lt; 0) {</div><div class='del'>-			adev-&gt;d-&gt;close(dev);</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	adev-&gt;enable_bits = mode;</div><div class='del'>-</div><div class='del'>-	if (mode == OPEN_READ || (mode != OPEN_WRITE &amp;&amp; (adev-&gt;flags &amp; DMA_DUPLEX))) {</div><div class='del'>-		if ((retval = open_dmap(adev, mode, dmap_in)) &lt; 0) {</div><div class='del'>-			adev-&gt;d-&gt;close(dev);</div><div class='del'>-			if (mode &amp; OPEN_WRITE)</div><div class='del'>-				close_dmap(adev, dmap_out);</div><div class='del'>-			return retval;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	adev-&gt;open_mode = mode;</div><div class='del'>-	adev-&gt;go = 1;</div><div class='del'>-</div><div class='del'>-	adev-&gt;d-&gt;set_bits(dev, 8);</div><div class='del'>-	adev-&gt;d-&gt;set_channels(dev, 1);</div><div class='del'>-	adev-&gt;d-&gt;set_speed(dev, DSP_DEFAULT_SPEED);</div><div class='del'>-	if (adev-&gt;dmap_out-&gt;dma_mode == DMODE_OUTPUT) </div><div class='del'>-		memset(adev-&gt;dmap_out-&gt;raw_buf, adev-&gt;dmap_out-&gt;neutral_byte,</div><div class='del'>-		       adev-&gt;dmap_out-&gt;bytes_in_use);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* MUST not hold the spinlock */</div><div class='del'>-void DMAbuf_reset(int dev)</div><div class='del'>-{</div><div class='del'>-	if (audio_devs[dev]-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-		dma_reset_output(dev);</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;open_mode &amp; OPEN_READ)</div><div class='del'>-		dma_reset_input(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_reset_output(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags,f ;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_STARTED))	/* DMA is not active */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	First wait until the current fragment has been played completely</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	adev-&gt;dmap_out-&gt;flags |= DMA_SYNCING;</div><div class='del'>-</div><div class='del'>-	adev-&gt;dmap_out-&gt;underrun_count = 0;</div><div class='del'>-	if (!signal_pending(current) &amp;&amp; adev-&gt;dmap_out-&gt;qlen &amp;&amp; </div><div class='del'>-	    adev-&gt;dmap_out-&gt;underrun_count == 0){</div><div class='del'>-		spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		interruptible_sleep_on_timeout(&amp;adev-&gt;out_sleeper,</div><div class='del'>-					       dmabuf_timeout(dmap));</div><div class='del'>-		spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	}</div><div class='del'>-	adev-&gt;dmap_out-&gt;flags &amp;= ~(DMA_SYNCING | DMA_ACTIVE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Finally shut the device off</div><div class='del'>-	 */</div><div class='del'>-	if (!(adev-&gt;flags &amp; DMA_DUPLEX) || !adev-&gt;d-&gt;halt_output)</div><div class='del'>-		adev-&gt;d-&gt;halt_io(dev);</div><div class='del'>-	else</div><div class='del'>-		adev-&gt;d-&gt;halt_output(dev);</div><div class='del'>-	adev-&gt;dmap_out-&gt;flags &amp;= ~DMA_STARTED;</div><div class='del'>-	</div><div class='del'>-	f=claim_dma_lock();</div><div class='del'>-	clear_dma_ff(dmap-&gt;dma);</div><div class='del'>-	disable_dma(dmap-&gt;dma);</div><div class='del'>-	release_dma_lock(f);</div><div class='del'>-	</div><div class='del'>-	dmap-&gt;byte_counter = 0;</div><div class='del'>-	reorganize_buffers(dev, adev-&gt;dmap_out, 0);</div><div class='del'>-	dmap-&gt;qlen = dmap-&gt;qhead = dmap-&gt;qtail = dmap-&gt;user_counter = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dma_reset_input(int dev)</div><div class='del'>-{</div><div class='del'>-        struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	if (!(adev-&gt;flags &amp; DMA_DUPLEX) || !adev-&gt;d-&gt;halt_input)</div><div class='del'>-		adev-&gt;d-&gt;halt_io(dev);</div><div class='del'>-	else</div><div class='del'>-		adev-&gt;d-&gt;halt_input(dev);</div><div class='del'>-	adev-&gt;dmap_in-&gt;flags &amp;= ~DMA_STARTED;</div><div class='del'>-</div><div class='del'>-	dmap-&gt;qlen = dmap-&gt;qhead = dmap-&gt;qtail = dmap-&gt;user_counter = 0;</div><div class='del'>-	dmap-&gt;byte_counter = 0;</div><div class='del'>-	reorganize_buffers(dev, adev-&gt;dmap_in, 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-/* MUST be called with holding the dmap-&gt;lock */</div><div class='del'>-void DMAbuf_launch_output(int dev, struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-</div><div class='del'>-	if (!((adev-&gt;enable_bits * adev-&gt;go) &amp; PCM_ENABLE_OUTPUT))</div><div class='del'>-		return;		/* Don't start DMA yet */</div><div class='del'>-	dmap-&gt;dma_mode = DMODE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_ACTIVE) || !(adev-&gt;flags &amp; DMA_AUTOMODE) || (dmap-&gt;flags &amp; DMA_NODMA)) {</div><div class='del'>-		if (!(dmap-&gt;flags &amp; DMA_STARTED)) {</div><div class='del'>-			reorganize_buffers(dev, dmap, 0);</div><div class='del'>-			if (adev-&gt;d-&gt;prepare_for_output(dev, dmap-&gt;fragment_size, dmap-&gt;nbufs))</div><div class='del'>-				return;</div><div class='del'>-			if (!(dmap-&gt;flags &amp; DMA_NODMA))</div><div class='del'>-				local_start_dma(adev, dmap-&gt;raw_buf_phys, dmap-&gt;bytes_in_use,DMA_MODE_WRITE);</div><div class='del'>-			dmap-&gt;flags |= DMA_STARTED;</div><div class='del'>-		}</div><div class='del'>-		if (dmap-&gt;counts[dmap-&gt;qhead] == 0)</div><div class='del'>-			dmap-&gt;counts[dmap-&gt;qhead] = dmap-&gt;fragment_size;</div><div class='del'>-		dmap-&gt;dma_mode = DMODE_OUTPUT;</div><div class='del'>-		adev-&gt;d-&gt;output_block(dev, dmap-&gt;raw_buf_phys + dmap-&gt;qhead * dmap-&gt;fragment_size,</div><div class='del'>-				      dmap-&gt;counts[dmap-&gt;qhead], 1);</div><div class='del'>-		if (adev-&gt;d-&gt;trigger)</div><div class='del'>-			adev-&gt;d-&gt;trigger(dev,adev-&gt;enable_bits * adev-&gt;go);</div><div class='del'>-	}</div><div class='del'>-	dmap-&gt;flags |= DMA_ACTIVE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int DMAbuf_sync(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int n = 0;</div><div class='del'>-	struct dma_buffparms *dmap;</div><div class='del'>-</div><div class='del'>-	if (!adev-&gt;go &amp;&amp; !(adev-&gt;enable_bits &amp; PCM_ENABLE_OUTPUT))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (adev-&gt;dmap_out-&gt;dma_mode == DMODE_OUTPUT) {</div><div class='del'>-		dmap = adev-&gt;dmap_out;</div><div class='del'>-		spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		if (dmap-&gt;qlen &gt; 0 &amp;&amp; !(dmap-&gt;flags &amp; DMA_ACTIVE))</div><div class='del'>-			DMAbuf_launch_output(dev, dmap);</div><div class='del'>-		adev-&gt;dmap_out-&gt;flags |= DMA_SYNCING;</div><div class='del'>-		adev-&gt;dmap_out-&gt;underrun_count = 0;</div><div class='del'>-		while (!signal_pending(current) &amp;&amp; n++ &lt; adev-&gt;dmap_out-&gt;nbufs &amp;&amp;</div><div class='del'>-		       adev-&gt;dmap_out-&gt;qlen &amp;&amp; adev-&gt;dmap_out-&gt;underrun_count == 0) {</div><div class='del'>-			long t = dmabuf_timeout(dmap);</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			/* FIXME: not safe may miss events */</div><div class='del'>-			t = interruptible_sleep_on_timeout(&amp;adev-&gt;out_sleeper, t);</div><div class='del'>-			spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			if (!t) {</div><div class='del'>-				adev-&gt;dmap_out-&gt;flags &amp;= ~DMA_SYNCING;</div><div class='del'>-				spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-				return adev-&gt;dmap_out-&gt;qlen;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		adev-&gt;dmap_out-&gt;flags &amp;= ~(DMA_SYNCING | DMA_ACTIVE);</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 * Some devices such as GUS have huge amount of on board RAM for the</div><div class='del'>-		 * audio data. We have to wait until the device has finished playing.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* still holding the lock */</div><div class='del'>-		if (adev-&gt;d-&gt;local_qlen) {   /* Device has hidden buffers */</div><div class='del'>-			while (!signal_pending(current) &amp;&amp;</div><div class='del'>-			       adev-&gt;d-&gt;local_qlen(dev)){</div><div class='del'>-				spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-				interruptible_sleep_on_timeout(&amp;adev-&gt;out_sleeper,</div><div class='del'>-							       dmabuf_timeout(dmap));</div><div class='del'>-				spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	}</div><div class='del'>-	adev-&gt;dmap_out-&gt;dma_mode = DMODE_NONE;</div><div class='del'>-	return adev-&gt;dmap_out-&gt;qlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int DMAbuf_release(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	dmap = adev-&gt;dmap_out;</div><div class='del'>-	if (adev-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-		adev-&gt;dmap_out-&gt;closing = 1;</div><div class='del'>-</div><div class='del'>-	if (adev-&gt;open_mode &amp; OPEN_READ){</div><div class='del'>-		adev-&gt;dmap_in-&gt;closing = 1;</div><div class='del'>-		dmap = adev-&gt;dmap_in;</div><div class='del'>-	}</div><div class='del'>-	if (adev-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-		if (!(adev-&gt;dmap_out-&gt;mapping_flags &amp; DMA_MAP_MAPPED))</div><div class='del'>-			if (!signal_pending(current) &amp;&amp; (adev-&gt;dmap_out-&gt;dma_mode == DMODE_OUTPUT))</div><div class='del'>-				DMAbuf_sync(dev);</div><div class='del'>-	if (adev-&gt;dmap_out-&gt;dma_mode == DMODE_OUTPUT)</div><div class='del'>-		memset(adev-&gt;dmap_out-&gt;raw_buf, adev-&gt;dmap_out-&gt;neutral_byte, adev-&gt;dmap_out-&gt;bytes_in_use);</div><div class='del'>-</div><div class='del'>-	DMAbuf_reset(dev);</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	adev-&gt;d-&gt;close(dev);</div><div class='del'>-</div><div class='del'>-	if (adev-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-		close_dmap(adev, adev-&gt;dmap_out);</div><div class='del'>-</div><div class='del'>-	if (adev-&gt;open_mode == OPEN_READ ||</div><div class='del'>-	    (adev-&gt;open_mode != OPEN_WRITE &amp;&amp;</div><div class='del'>-	     (adev-&gt;flags &amp; DMA_DUPLEX)))</div><div class='del'>-		close_dmap(adev, adev-&gt;dmap_in);</div><div class='del'>-	adev-&gt;open_mode = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* called with dmap-&gt;lock dold */</div><div class='del'>-int DMAbuf_activate_recording(int dev, struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	int  err;</div><div class='del'>-</div><div class='del'>-	if (!(adev-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-		return 0;</div><div class='del'>-	if (!(adev-&gt;enable_bits &amp; PCM_ENABLE_INPUT))</div><div class='del'>-		return 0;</div><div class='del'>-	if (dmap-&gt;dma_mode == DMODE_OUTPUT) {	/* Direction change */</div><div class='del'>-		/* release lock - it's not recursive */</div><div class='del'>-		spin_unlock_irq(&amp;dmap-&gt;lock);</div><div class='del'>-		DMAbuf_sync(dev);</div><div class='del'>-		DMAbuf_reset(dev);</div><div class='del'>-		spin_lock_irq(&amp;dmap-&gt;lock);</div><div class='del'>-		dmap-&gt;dma_mode = DMODE_NONE;</div><div class='del'>-	}</div><div class='del'>-	if (!dmap-&gt;dma_mode) {</div><div class='del'>-		reorganize_buffers(dev, dmap, 1);</div><div class='del'>-		if ((err = adev-&gt;d-&gt;prepare_for_input(dev,</div><div class='del'>-				dmap-&gt;fragment_size, dmap-&gt;nbufs)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		dmap-&gt;dma_mode = DMODE_INPUT;</div><div class='del'>-	}</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_ACTIVE)) {</div><div class='del'>-		if (dmap-&gt;needs_reorg)</div><div class='del'>-			reorganize_buffers(dev, dmap, 0);</div><div class='del'>-		local_start_dma(adev, dmap-&gt;raw_buf_phys, dmap-&gt;bytes_in_use, DMA_MODE_READ);</div><div class='del'>-		adev-&gt;d-&gt;start_input(dev, dmap-&gt;raw_buf_phys + dmap-&gt;qtail * dmap-&gt;fragment_size,</div><div class='del'>-				     dmap-&gt;fragment_size, 0);</div><div class='del'>-		dmap-&gt;flags |= DMA_ACTIVE;</div><div class='del'>-		if (adev-&gt;d-&gt;trigger)</div><div class='del'>-			adev-&gt;d-&gt;trigger(dev, adev-&gt;enable_bits * adev-&gt;go);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* acquires lock */</div><div class='del'>-int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0, n = 0;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-	int go;</div><div class='del'>-</div><div class='del'>-	if (!(adev-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-		return -EIO;</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	if (dmap-&gt;needs_reorg)</div><div class='del'>-		reorganize_buffers(dev, dmap, 0);</div><div class='del'>-	if (adev-&gt;dmap_in-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {</div><div class='del'>-/*		  printk(KERN_WARNING "Sound: Can't read from mmapped device (1)\n");*/</div><div class='del'>-		  spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		  return -EINVAL;</div><div class='del'>-	} else while (dmap-&gt;qlen &lt;= 0 &amp;&amp; n++ &lt; 10) {</div><div class='del'>-		long timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-		if (!(adev-&gt;enable_bits &amp; PCM_ENABLE_INPUT) || !adev-&gt;go) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-		if ((err = DMAbuf_activate_recording(dev, dmap)) &lt; 0) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		/* Wait for the next block */</div><div class='del'>-</div><div class='del'>-		if (dontblock) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-		if ((go = adev-&gt;go))</div><div class='del'>-			timeout = dmabuf_timeout(dmap);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		timeout = interruptible_sleep_on_timeout(&amp;adev-&gt;in_sleeper,</div><div class='del'>-							 timeout);</div><div class='del'>-		if (!timeout) {</div><div class='del'>-			/* FIXME: include device name */</div><div class='del'>-			err = -EIO;</div><div class='del'>-			printk(KERN_WARNING "Sound: DMA (input) timed out - IRQ/DRQ config error?\n");</div><div class='del'>-			dma_reset_input(dev);</div><div class='del'>-		} else</div><div class='del'>-			err = -EINTR;</div><div class='del'>-		spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;qlen &lt;= 0)</div><div class='del'>-		return err ? err : -EINTR;</div><div class='del'>-	*buf = &amp;dmap-&gt;raw_buf[dmap-&gt;qhead * dmap-&gt;fragment_size + dmap-&gt;counts[dmap-&gt;qhead]];</div><div class='del'>-	*len = dmap-&gt;fragment_size - dmap-&gt;counts[dmap-&gt;qhead];</div><div class='del'>-</div><div class='del'>-	return dmap-&gt;qhead;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int DMAbuf_rmchars(int dev, int buff_no, int c)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-	int p = dmap-&gt;counts[dmap-&gt;qhead] + c;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED)</div><div class='del'>-	{</div><div class='del'>-/*		  printk("Sound: Can't read from mmapped device (2)\n");*/</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	else if (dmap-&gt;qlen &lt;= 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-	else if (p &gt;= dmap-&gt;fragment_size) {  /* This buffer is completely empty */</div><div class='del'>-		dmap-&gt;counts[dmap-&gt;qhead] = 0;</div><div class='del'>-		dmap-&gt;qlen--;</div><div class='del'>-		dmap-&gt;qhead = (dmap-&gt;qhead + 1) % dmap-&gt;nbufs;</div><div class='del'>-	}</div><div class='del'>-	else dmap-&gt;counts[dmap-&gt;qhead] = p;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* MUST be called with dmap-&gt;lock hold */</div><div class='del'>-int DMAbuf_get_buffer_pointer(int dev, struct dma_buffparms *dmap, int direction)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *	Try to approximate the active byte position of the DMA pointer within the</div><div class='del'>-	 *	buffer area as well as possible.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	int pos;</div><div class='del'>-	unsigned long f;</div><div class='del'>-</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_ACTIVE))</div><div class='del'>-		pos = 0;</div><div class='del'>-	else {</div><div class='del'>-		int chan = dmap-&gt;dma;</div><div class='del'>-		</div><div class='del'>-		f=claim_dma_lock();</div><div class='del'>-		clear_dma_ff(chan);</div><div class='del'>-		</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			disable_dma(dmap-&gt;dma);</div><div class='del'>-		</div><div class='del'>-		pos = get_dma_residue(chan);</div><div class='del'>-		</div><div class='del'>-		pos = dmap-&gt;bytes_in_use - pos;</div><div class='del'>-</div><div class='del'>-		if (!(dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED)) {</div><div class='del'>-			if (direction == DMODE_OUTPUT) {</div><div class='del'>-				if (dmap-&gt;qhead == 0)</div><div class='del'>-					if (pos &gt; dmap-&gt;fragment_size)</div><div class='del'>-						pos = 0;</div><div class='del'>-			} else {</div><div class='del'>-				if (dmap-&gt;qtail == 0)</div><div class='del'>-					if (pos &gt; dmap-&gt;fragment_size)</div><div class='del'>-						pos = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (pos &lt; 0)</div><div class='del'>-			pos = 0;</div><div class='del'>-		if (pos &gt;= dmap-&gt;bytes_in_use)</div><div class='del'>-			pos = 0;</div><div class='del'>-		</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			enable_dma(dmap-&gt;dma);</div><div class='del'>-			</div><div class='del'>-		release_dma_lock(f);</div><div class='del'>-	}</div><div class='del'>-	/* printk( "%04x ",  pos); */</div><div class='del'>-</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	DMAbuf_start_devices() is called by the /dev/music driver to start</div><div class='del'>- *	one or more audio devices at desired moment.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void DMAbuf_start_devices(unsigned int devmask)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev;</div><div class='del'>-	int dev;</div><div class='del'>-</div><div class='del'>-	for (dev = 0; dev &lt; num_audiodevs; dev++) {</div><div class='del'>-		if (!(devmask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-			continue;</div><div class='del'>-		if (!(adev = audio_devs[dev]))</div><div class='del'>-			continue;</div><div class='del'>-		if (adev-&gt;open_mode == 0)</div><div class='del'>-			continue;</div><div class='del'>-		if (adev-&gt;go)</div><div class='del'>-			continue;</div><div class='del'>-		/* OK to start the device */</div><div class='del'>-		adev-&gt;go = 1;</div><div class='del'>-		if (adev-&gt;d-&gt;trigger)</div><div class='del'>-			adev-&gt;d-&gt;trigger(dev,adev-&gt;enable_bits * adev-&gt;go);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-/* via poll called without a lock ?*/</div><div class='del'>-int DMAbuf_space_in_queue(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	int len, max, tmp;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	int lim = dmap-&gt;nbufs;</div><div class='del'>-</div><div class='del'>-	if (lim &lt; 2)</div><div class='del'>-		lim = 2;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;qlen &gt;= lim)	/* No space at all */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Verify that there are no more pending buffers than the limit</div><div class='del'>-	 *	defined by the process.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	max = dmap-&gt;max_fragments;</div><div class='del'>-	if (max &gt; lim)</div><div class='del'>-		max = lim;</div><div class='del'>-	len = dmap-&gt;qlen;</div><div class='del'>-</div><div class='del'>-	if (adev-&gt;d-&gt;local_qlen) {</div><div class='del'>-		tmp = adev-&gt;d-&gt;local_qlen(dev);</div><div class='del'>-		if (tmp &amp;&amp; len)</div><div class='del'>-			tmp--;	/* This buffer has been counted twice */</div><div class='del'>-		len += tmp;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;byte_counter % dmap-&gt;fragment_size)	/* There is a partial fragment */</div><div class='del'>-		len = len + 1;</div><div class='del'>-</div><div class='del'>-	if (len &gt;= max)</div><div class='del'>-		return 0;</div><div class='del'>-	return max - len;</div><div class='del'>-}</div><div class='del'>-/* MUST not hold the spinlock  - this function may sleep */</div><div class='del'>-static int output_sleep(int dev, int dontblock)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	int err = 0;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	long timeout;</div><div class='del'>-	long timeout_value;</div><div class='del'>-</div><div class='del'>-	if (dontblock)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	if (!(adev-&gt;enable_bits &amp; PCM_ENABLE_OUTPUT))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait for free space</div><div class='del'>-	 */</div><div class='del'>-	if (signal_pending(current))</div><div class='del'>-		return -EINTR;</div><div class='del'>-	timeout = (adev-&gt;go &amp;&amp; !(dmap-&gt;flags &amp; DMA_NOTIMEOUT));</div><div class='del'>-	if (timeout) </div><div class='del'>-		timeout_value = dmabuf_timeout(dmap);</div><div class='del'>-	else</div><div class='del'>-		timeout_value = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-	timeout_value = interruptible_sleep_on_timeout(&amp;adev-&gt;out_sleeper,</div><div class='del'>-						       timeout_value);</div><div class='del'>-	if (timeout != MAX_SCHEDULE_TIMEOUT &amp;&amp; !timeout_value) {</div><div class='del'>-		printk(KERN_WARNING "Sound: DMA (output) timed out - IRQ/DRQ config error?\n");</div><div class='del'>-		dma_reset_output(dev);</div><div class='del'>-	} else {</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			err = -EINTR;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-/* called with the lock held */</div><div class='del'>-static int find_output_space(int dev, char **buf, int *size)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	unsigned long active_offs;</div><div class='del'>-	long len, offs;</div><div class='del'>-	int maxfrags;</div><div class='del'>-	int occupied_bytes = (dmap-&gt;user_counter % dmap-&gt;fragment_size);</div><div class='del'>-</div><div class='del'>-	*buf = dmap-&gt;raw_buf;</div><div class='del'>-	if (!(maxfrags = DMAbuf_space_in_queue(dev)) &amp;&amp; !occupied_bytes)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-#ifdef BE_CONSERVATIVE</div><div class='del'>-	active_offs = dmap-&gt;byte_counter + dmap-&gt;qhead * dmap-&gt;fragment_size;</div><div class='del'>-#else</div><div class='del'>-	active_offs = max(DMAbuf_get_buffer_pointer(dev, dmap, DMODE_OUTPUT), 0);</div><div class='del'>-	/* Check for pointer wrapping situation */</div><div class='del'>-	if (active_offs &gt;= dmap-&gt;bytes_in_use)</div><div class='del'>-		active_offs = 0;</div><div class='del'>-	active_offs += dmap-&gt;byte_counter;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	offs = (dmap-&gt;user_counter % dmap-&gt;bytes_in_use) &amp; ~SAMPLE_ROUNDUP;</div><div class='del'>-	if (offs &lt; 0 || offs &gt;= dmap-&gt;bytes_in_use) {</div><div class='del'>-		printk(KERN_ERR "Sound: Got unexpected offs %ld. Giving up.\n", offs);</div><div class='del'>-		printk("Counter = %ld, bytes=%d\n", dmap-&gt;user_counter, dmap-&gt;bytes_in_use);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	*buf = dmap-&gt;raw_buf + offs;</div><div class='del'>-</div><div class='del'>-	len = active_offs + dmap-&gt;bytes_in_use - dmap-&gt;user_counter;	/* Number of unused bytes in buffer */</div><div class='del'>-</div><div class='del'>-	if ((offs + len) &gt; dmap-&gt;bytes_in_use)</div><div class='del'>-		len = dmap-&gt;bytes_in_use - offs;</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (len &gt; ((maxfrags * dmap-&gt;fragment_size) - occupied_bytes))</div><div class='del'>-		len = (maxfrags * dmap-&gt;fragment_size) - occupied_bytes;</div><div class='del'>-	*size = len &amp; ~SAMPLE_ROUNDUP;</div><div class='del'>-	return (*size &gt; 0);</div><div class='del'>-}</div><div class='del'>-/* acquires lock  */</div><div class='del'>-int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = -EIO;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {</div><div class='del'>-/*		printk(KERN_DEBUG "Sound: Can't write to mmapped device (3)\n");*/</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	if (dmap-&gt;needs_reorg)</div><div class='del'>-		reorganize_buffers(dev, dmap, 0);</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;dma_mode == DMODE_INPUT) {	/* Direction change */</div><div class='del'>-		spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		DMAbuf_reset(dev);</div><div class='del'>-		spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	}</div><div class='del'>-	dmap-&gt;dma_mode = DMODE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	while (find_output_space(dev, buf, size) &lt;= 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		if ((err = output_sleep(dev, dontblock)) &lt; 0) {</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/* has to acquire dmap-&gt;lock */</div><div class='del'>-int DMAbuf_move_wrpointer(int dev, int l)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	unsigned long ptr;</div><div class='del'>-	unsigned long end_ptr, p;</div><div class='del'>-	int post;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	post= (dmap-&gt;flags &amp; DMA_POST);</div><div class='del'>-	ptr = (dmap-&gt;user_counter / dmap-&gt;fragment_size) * dmap-&gt;fragment_size;</div><div class='del'>-</div><div class='del'>-	dmap-&gt;flags &amp;= ~DMA_POST;</div><div class='del'>-	dmap-&gt;cfrag = -1;</div><div class='del'>-	dmap-&gt;user_counter += l;</div><div class='del'>-	dmap-&gt;flags |= DMA_DIRTY;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;byte_counter &gt;= dmap-&gt;max_byte_counter) {</div><div class='del'>-		/* Wrap the byte counters */</div><div class='del'>-		long decr = dmap-&gt;byte_counter;</div><div class='del'>-		dmap-&gt;byte_counter = (dmap-&gt;byte_counter % dmap-&gt;bytes_in_use);</div><div class='del'>-		decr -= dmap-&gt;byte_counter;</div><div class='del'>-		dmap-&gt;user_counter -= decr;</div><div class='del'>-	}</div><div class='del'>-	end_ptr = (dmap-&gt;user_counter / dmap-&gt;fragment_size) * dmap-&gt;fragment_size;</div><div class='del'>-</div><div class='del'>-	p = (dmap-&gt;user_counter - 1) % dmap-&gt;bytes_in_use;</div><div class='del'>-	dmap-&gt;neutral_byte = dmap-&gt;raw_buf[p];</div><div class='del'>-</div><div class='del'>-	/* Update the fragment based bookkeeping too */</div><div class='del'>-	while (ptr &lt; end_ptr) {</div><div class='del'>-		dmap-&gt;counts[dmap-&gt;qtail] = dmap-&gt;fragment_size;</div><div class='del'>-		dmap-&gt;qtail = (dmap-&gt;qtail + 1) % dmap-&gt;nbufs;</div><div class='del'>-		dmap-&gt;qlen++;</div><div class='del'>-		ptr += dmap-&gt;fragment_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmap-&gt;counts[dmap-&gt;qtail] = dmap-&gt;user_counter - ptr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Let the low level driver perform some postprocessing to</div><div class='del'>-	 *	the written data.</div><div class='del'>-	 */</div><div class='del'>-	if (adev-&gt;d-&gt;postprocess_write)</div><div class='del'>-		adev-&gt;d-&gt;postprocess_write(dev);</div><div class='del'>-</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_ACTIVE))</div><div class='del'>-		if (dmap-&gt;qlen &gt; 1 || (dmap-&gt;qlen &gt; 0 &amp;&amp; (post || dmap-&gt;qlen &gt;= dmap-&gt;nbufs - 1)))</div><div class='del'>-			DMAbuf_launch_output(dev, dmap);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int DMAbuf_start_dma(int dev, unsigned long physaddr, int count, int dma_mode)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = (dma_mode == DMA_MODE_WRITE) ? adev-&gt;dmap_out : adev-&gt;dmap_in;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_ERR "sound: DMA buffer(1) == NULL\n");</div><div class='del'>-		printk("Device %d, chn=%s\n", dev, (dmap == adev-&gt;dmap_out) ? "out" : "in");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;dma &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	sound_start_dma(dmap, physaddr, count, dma_mode);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(DMAbuf_start_dma);</div><div class='del'>-</div><div class='del'>-static int local_start_dma(struct audio_operations *adev, unsigned long physaddr, int count, int dma_mode)</div><div class='del'>-{</div><div class='del'>-	struct dma_buffparms *dmap = (dma_mode == DMA_MODE_WRITE) ? adev-&gt;dmap_out : adev-&gt;dmap_in;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_ERR "sound: DMA buffer(2) == NULL\n");</div><div class='del'>-		printk(KERN_ERR "Device %s, chn=%s\n", adev-&gt;name, (dmap == adev-&gt;dmap_out) ? "out" : "in");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;flags &amp; DMA_NODMA)</div><div class='del'>-		return 1;</div><div class='del'>-	if (dmap-&gt;dma &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	sound_start_dma(dmap, dmap-&gt;raw_buf_phys, dmap-&gt;bytes_in_use, dma_mode | DMA_AUTOINIT);</div><div class='del'>-	dmap-&gt;flags |= DMA_STARTED;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void finish_output_interrupt(int dev, struct dma_buffparms *dmap)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;audio_callback != NULL)</div><div class='del'>-		dmap-&gt;audio_callback(dev, dmap-&gt;callback_parm);</div><div class='del'>-	wake_up(&amp;adev-&gt;out_sleeper);</div><div class='del'>-	wake_up(&amp;adev-&gt;poll_sleeper);</div><div class='del'>-}</div><div class='del'>-/* called with dmap-&gt;lock held in irq context*/</div><div class='del'>-static void do_outputintr(int dev, int dummy)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	int this_fragment;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: Error. Audio interrupt (%d) after freeing buffers.\n", dev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {	/* Virtual memory mapped access */</div><div class='del'>-		/* mmapped access */</div><div class='del'>-		dmap-&gt;qhead = (dmap-&gt;qhead + 1) % dmap-&gt;nbufs;</div><div class='del'>-		if (dmap-&gt;qhead == 0) {	    /* Wrapped */</div><div class='del'>-			dmap-&gt;byte_counter += dmap-&gt;bytes_in_use;</div><div class='del'>-			if (dmap-&gt;byte_counter &gt;= dmap-&gt;max_byte_counter) {	/* Overflow */</div><div class='del'>-				long decr = dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;byte_counter = (dmap-&gt;byte_counter % dmap-&gt;bytes_in_use);</div><div class='del'>-				decr -= dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;user_counter -= decr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dmap-&gt;qlen++;	/* Yes increment it (don't decrement) */</div><div class='del'>-		if (!(adev-&gt;flags &amp; DMA_AUTOMODE))</div><div class='del'>-			dmap-&gt;flags &amp;= ~DMA_ACTIVE;</div><div class='del'>-		dmap-&gt;counts[dmap-&gt;qhead] = dmap-&gt;fragment_size;</div><div class='del'>-		DMAbuf_launch_output(dev, dmap);</div><div class='del'>-		finish_output_interrupt(dev, dmap);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmap-&gt;qlen--;</div><div class='del'>-	this_fragment = dmap-&gt;qhead;</div><div class='del'>-	dmap-&gt;qhead = (dmap-&gt;qhead + 1) % dmap-&gt;nbufs;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;qhead == 0) {	/* Wrapped */</div><div class='del'>-		dmap-&gt;byte_counter += dmap-&gt;bytes_in_use;</div><div class='del'>-		if (dmap-&gt;byte_counter &gt;= dmap-&gt;max_byte_counter) {	/* Overflow */</div><div class='del'>-			long decr = dmap-&gt;byte_counter;</div><div class='del'>-			dmap-&gt;byte_counter = (dmap-&gt;byte_counter % dmap-&gt;bytes_in_use);</div><div class='del'>-			decr -= dmap-&gt;byte_counter;</div><div class='del'>-			dmap-&gt;user_counter -= decr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!(adev-&gt;flags &amp; DMA_AUTOMODE))</div><div class='del'>-		dmap-&gt;flags &amp;= ~DMA_ACTIVE;</div><div class='del'>-		</div><div class='del'>-	/*</div><div class='del'>-	 *	This is  dmap-&gt;qlen &lt;= 0 except when closing when</div><div class='del'>-	 *	dmap-&gt;qlen &lt; 0</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	while (dmap-&gt;qlen &lt;= -dmap-&gt;closing) {</div><div class='del'>-		dmap-&gt;underrun_count++;</div><div class='del'>-		dmap-&gt;qlen++;</div><div class='del'>-		if ((dmap-&gt;flags &amp; DMA_DIRTY) &amp;&amp; dmap-&gt;applic_profile != APF_CPUINTENS) {</div><div class='del'>-			dmap-&gt;flags &amp;= ~DMA_DIRTY;</div><div class='del'>-			memset(adev-&gt;dmap_out-&gt;raw_buf, adev-&gt;dmap_out-&gt;neutral_byte,</div><div class='del'>-			       adev-&gt;dmap_out-&gt;buffsize);</div><div class='del'>-		}</div><div class='del'>-		dmap-&gt;user_counter += dmap-&gt;fragment_size;</div><div class='del'>-		dmap-&gt;qtail = (dmap-&gt;qtail + 1) % dmap-&gt;nbufs;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;qlen &gt; 0)</div><div class='del'>-		DMAbuf_launch_output(dev, dmap);</div><div class='del'>-	finish_output_interrupt(dev, dmap);</div><div class='del'>-}</div><div class='del'>-/* called in irq context */</div><div class='del'>-void DMAbuf_outputintr(int dev, int notify_only)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_NODMA)) {</div><div class='del'>-		int chan = dmap-&gt;dma, pos, n;</div><div class='del'>-		unsigned long f;</div><div class='del'>-		</div><div class='del'>-		f=claim_dma_lock();</div><div class='del'>-		</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			disable_dma(dmap-&gt;dma);</div><div class='del'>-		clear_dma_ff(chan);</div><div class='del'>-		pos = dmap-&gt;bytes_in_use - get_dma_residue(chan);</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			enable_dma(dmap-&gt;dma);</div><div class='del'>-		release_dma_lock(f);</div><div class='del'>-		</div><div class='del'>-		pos = pos / dmap-&gt;fragment_size;	/* Actual qhead */</div><div class='del'>-		if (pos &lt; 0 || pos &gt;= dmap-&gt;nbufs)</div><div class='del'>-			pos = 0;</div><div class='del'>-		n = 0;</div><div class='del'>-		while (dmap-&gt;qhead != pos &amp;&amp; n++ &lt; dmap-&gt;nbufs)</div><div class='del'>-			do_outputintr(dev, notify_only);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		do_outputintr(dev, notify_only);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(DMAbuf_outputintr);</div><div class='del'>-</div><div class='del'>-/* called with dmap-&gt;lock held in irq context */</div><div class='del'>-static void do_inputintr(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: Fatal error. Audio interrupt after freeing buffers.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {</div><div class='del'>-		dmap-&gt;qtail = (dmap-&gt;qtail + 1) % dmap-&gt;nbufs;</div><div class='del'>-		if (dmap-&gt;qtail == 0) {		/* Wrapped */</div><div class='del'>-			dmap-&gt;byte_counter += dmap-&gt;bytes_in_use;</div><div class='del'>-			if (dmap-&gt;byte_counter &gt;= dmap-&gt;max_byte_counter) {	/* Overflow */</div><div class='del'>-				long decr = dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;byte_counter = (dmap-&gt;byte_counter % dmap-&gt;bytes_in_use) + dmap-&gt;bytes_in_use;</div><div class='del'>-				decr -= dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;user_counter -= decr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dmap-&gt;qlen++;</div><div class='del'>-</div><div class='del'>-		if (!(adev-&gt;flags &amp; DMA_AUTOMODE)) {</div><div class='del'>-			if (dmap-&gt;needs_reorg)</div><div class='del'>-				reorganize_buffers(dev, dmap, 0);</div><div class='del'>-			local_start_dma(adev, dmap-&gt;raw_buf_phys, dmap-&gt;bytes_in_use,DMA_MODE_READ);</div><div class='del'>-			adev-&gt;d-&gt;start_input(dev, dmap-&gt;raw_buf_phys + dmap-&gt;qtail * dmap-&gt;fragment_size,</div><div class='del'>-					     dmap-&gt;fragment_size, 1);</div><div class='del'>-			if (adev-&gt;d-&gt;trigger)</div><div class='del'>-				adev-&gt;d-&gt;trigger(dev, adev-&gt;enable_bits * adev-&gt;go);</div><div class='del'>-		}</div><div class='del'>-		dmap-&gt;flags |= DMA_ACTIVE;</div><div class='del'>-	} else if (dmap-&gt;qlen &gt;= (dmap-&gt;nbufs - 1)) {</div><div class='del'>-		printk(KERN_WARNING "Sound: Recording overrun\n");</div><div class='del'>-		dmap-&gt;underrun_count++;</div><div class='del'>-</div><div class='del'>-		/* Just throw away the oldest fragment but keep the engine running */</div><div class='del'>-		dmap-&gt;qhead = (dmap-&gt;qhead + 1) % dmap-&gt;nbufs;</div><div class='del'>-		dmap-&gt;qtail = (dmap-&gt;qtail + 1) % dmap-&gt;nbufs;</div><div class='del'>-	} else if (dmap-&gt;qlen &gt;= 0 &amp;&amp; dmap-&gt;qlen &lt; dmap-&gt;nbufs) {</div><div class='del'>-		dmap-&gt;qlen++;</div><div class='del'>-		dmap-&gt;qtail = (dmap-&gt;qtail + 1) % dmap-&gt;nbufs;</div><div class='del'>-		if (dmap-&gt;qtail == 0) {		/* Wrapped */</div><div class='del'>-			dmap-&gt;byte_counter += dmap-&gt;bytes_in_use;</div><div class='del'>-			if (dmap-&gt;byte_counter &gt;= dmap-&gt;max_byte_counter) {	/* Overflow */</div><div class='del'>-				long decr = dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;byte_counter = (dmap-&gt;byte_counter % dmap-&gt;bytes_in_use) + dmap-&gt;bytes_in_use;</div><div class='del'>-				decr -= dmap-&gt;byte_counter;</div><div class='del'>-				dmap-&gt;user_counter -= decr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!(adev-&gt;flags &amp; DMA_AUTOMODE) || (dmap-&gt;flags &amp; DMA_NODMA)) {</div><div class='del'>-		local_start_dma(adev, dmap-&gt;raw_buf_phys, dmap-&gt;bytes_in_use, DMA_MODE_READ);</div><div class='del'>-		adev-&gt;d-&gt;start_input(dev, dmap-&gt;raw_buf_phys + dmap-&gt;qtail * dmap-&gt;fragment_size, dmap-&gt;fragment_size, 1);</div><div class='del'>-		if (adev-&gt;d-&gt;trigger)</div><div class='del'>-			adev-&gt;d-&gt;trigger(dev,adev-&gt;enable_bits * adev-&gt;go);</div><div class='del'>-	}</div><div class='del'>-	dmap-&gt;flags |= DMA_ACTIVE;</div><div class='del'>-	if (dmap-&gt;qlen &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		wake_up(&amp;adev-&gt;in_sleeper);</div><div class='del'>-		wake_up(&amp;adev-&gt;poll_sleeper);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-/* called in irq context */</div><div class='del'>-void DMAbuf_inputintr(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (!(dmap-&gt;flags &amp; DMA_NODMA)) {</div><div class='del'>-		int chan = dmap-&gt;dma, pos, n;</div><div class='del'>-		unsigned long f;</div><div class='del'>-		</div><div class='del'>-		f=claim_dma_lock();</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			disable_dma(dmap-&gt;dma);</div><div class='del'>-		clear_dma_ff(chan);</div><div class='del'>-		pos = dmap-&gt;bytes_in_use - get_dma_residue(chan);</div><div class='del'>-		if(!isa_dma_bridge_buggy)</div><div class='del'>-			enable_dma(dmap-&gt;dma);</div><div class='del'>-		release_dma_lock(f);</div><div class='del'>-</div><div class='del'>-		pos = pos / dmap-&gt;fragment_size;	/* Actual qhead */</div><div class='del'>-		if (pos &lt; 0 || pos &gt;= dmap-&gt;nbufs)</div><div class='del'>-			pos = 0;</div><div class='del'>-</div><div class='del'>-		n = 0;</div><div class='del'>-		while (dmap-&gt;qtail != pos &amp;&amp; ++n &lt; dmap-&gt;nbufs)</div><div class='del'>-			do_inputintr(dev);</div><div class='del'>-	} else</div><div class='del'>-		do_inputintr(dev);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(DMAbuf_inputintr);</div><div class='del'>-</div><div class='del'>-void DMAbuf_init(int dev, int dma1, int dma2)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! This routine could be called several times.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (adev &amp;&amp; adev-&gt;dmap_out == NULL) {</div><div class='del'>-		if (adev-&gt;d == NULL)</div><div class='del'>-			panic("OSS: audio_devs[%d]-&gt;d == NULL\n", dev);</div><div class='del'>-</div><div class='del'>-		if (adev-&gt;parent_dev) {	 /* Use DMA map of the parent dev */</div><div class='del'>-			int parent = adev-&gt;parent_dev - 1;</div><div class='del'>-			adev-&gt;dmap_out = audio_devs[parent]-&gt;dmap_out;</div><div class='del'>-			adev-&gt;dmap_in = audio_devs[parent]-&gt;dmap_in;</div><div class='del'>-		} else {</div><div class='del'>-			adev-&gt;dmap_out = adev-&gt;dmap_in = &amp;adev-&gt;dmaps[0];</div><div class='del'>-			adev-&gt;dmap_out-&gt;dma = dma1;</div><div class='del'>-			if (adev-&gt;flags &amp; DMA_DUPLEX) {</div><div class='del'>-				adev-&gt;dmap_in = &amp;adev-&gt;dmaps[1];</div><div class='del'>-				adev-&gt;dmap_in-&gt;dma = dma2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Persistent DMA buffers allocated here */</div><div class='del'>-		if (sound_dmap_flag == DMAP_KEEP_ON_CLOSE) {</div><div class='del'>-			if (adev-&gt;dmap_in-&gt;raw_buf == NULL)</div><div class='del'>-				sound_alloc_dmap(adev-&gt;dmap_in);</div><div class='del'>-			if (adev-&gt;dmap_out-&gt;raw_buf == NULL)</div><div class='del'>-				sound_alloc_dmap(adev-&gt;dmap_out);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No kernel lock - DMAbuf_activate_recording protected by global cli/sti */</div><div class='del'>-static unsigned int poll_input(struct file * file, int dev, poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_in;</div><div class='del'>-</div><div class='del'>-	if (!(adev-&gt;open_mode &amp; OPEN_READ))</div><div class='del'>-		return 0;</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {</div><div class='del'>-		if (dmap-&gt;qlen)</div><div class='del'>-			return POLLIN | POLLRDNORM;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;dma_mode != DMODE_INPUT) {</div><div class='del'>-		if (dmap-&gt;dma_mode == DMODE_NONE &amp;&amp;</div><div class='del'>-		    adev-&gt;enable_bits &amp; PCM_ENABLE_INPUT &amp;&amp;</div><div class='del'>-		    !dmap-&gt;qlen &amp;&amp; adev-&gt;go) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-			</div><div class='del'>-			spin_lock_irqsave(&amp;dmap-&gt;lock,flags);</div><div class='del'>-			DMAbuf_activate_recording(dev, dmap);</div><div class='del'>-			spin_unlock_irqrestore(&amp;dmap-&gt;lock,flags);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (!dmap-&gt;qlen)</div><div class='del'>-		return 0;</div><div class='del'>-	return POLLIN | POLLRDNORM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int poll_output(struct file * file, int dev, poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	struct dma_buffparms *dmap = adev-&gt;dmap_out;</div><div class='del'>-	</div><div class='del'>-	if (!(adev-&gt;open_mode &amp; OPEN_WRITE))</div><div class='del'>-		return 0;</div><div class='del'>-	if (dmap-&gt;mapping_flags &amp; DMA_MAP_MAPPED) {</div><div class='del'>-		if (dmap-&gt;qlen)</div><div class='del'>-			return POLLOUT | POLLWRNORM;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;dma_mode == DMODE_INPUT)</div><div class='del'>-		return 0;</div><div class='del'>-	if (dmap-&gt;dma_mode == DMODE_NONE)</div><div class='del'>-		return POLLOUT | POLLWRNORM;</div><div class='del'>-	if (!DMAbuf_space_in_queue(dev))</div><div class='del'>-		return 0;</div><div class='del'>-	return POLLOUT | POLLWRNORM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int DMAbuf_poll(struct file * file, int dev, poll_table *wait)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	poll_wait(file, &amp;adev-&gt;poll_sleeper, wait);</div><div class='del'>-	return poll_input(file, dev, wait) | poll_output(file, dev, wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void DMAbuf_deinit(int dev)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-	/* This routine is called when driver is being unloaded */</div><div class='del'>-	if (!adev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Persistent DMA buffers deallocated here */</div><div class='del'>-	if (sound_dmap_flag == DMAP_KEEP_ON_CLOSE) {</div><div class='del'>-		sound_free_dmap(adev-&gt;dmap_out);</div><div class='del'>-		if (adev-&gt;flags &amp; DMA_DUPLEX)</div><div class='del'>-			sound_free_dmap(adev-&gt;dmap_in);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig<br/>index f456574a964d..1a3339859840 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> config DMASOUND_ATARI</div><div class='ctx'> 	tristate "Atari DMA sound support"</div><div class='ctx'> 	depends on ATARI &amp;&amp; SOUND</div><div class='hunk'>@@ -10,7 +11,7 @@ config DMASOUND_ATARI</div><div class='ctx'> 	  This driver is also available as a module ( = code which can be</div><div class='ctx'> 	  inserted in and removed from the running kernel whenever you</div><div class='ctx'> 	  want). If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> config DMASOUND_PAULA</div><div class='ctx'> 	tristate "Amiga DMA sound support"</div><div class='hunk'>@@ -24,7 +25,7 @@ config DMASOUND_PAULA</div><div class='ctx'> 	  This driver is also available as a module ( = code which can be</div><div class='ctx'> 	  inserted in and removed from the running kernel whenever you</div><div class='ctx'> 	  want). If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> config DMASOUND_Q40</div><div class='ctx'> 	tristate "Q40 sound support"</div><div class='hunk'>@@ -38,7 +39,7 @@ config DMASOUND_Q40</div><div class='ctx'> 	  This driver is also available as a module ( = code which can be</div><div class='ctx'> 	  inserted in and removed from the running kernel whenever you</div><div class='ctx'> 	  want). If you want to compile it as a module, say M here and read</div><div class='del'>-	  &lt;file:Documentation/kbuild/modules.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/kbuild/modules.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> config DMASOUND</div><div class='ctx'> 	tristate</div><div class='head'>diff --git a/sound/oss/dmasound/Makefile b/sound/oss/dmasound/Makefile<br/>index 3c1531652d11..de8ae8346a09 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for the DMA sound driver</div><div class='ctx'> #</div><div class='head'>diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h<br/>index 1308d8d34186..f065840c0efb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/dmasound.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef _dmasound_h_</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/oss/dmasound/dmasound.h</div><div class='hunk'>@@ -87,11 +88,7 @@ static inline int ioctl_return(int __user *addr, int value)</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='ctx'> extern int dmasound_init(void);</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> extern void dmasound_deinit(void);</div><div class='del'>-#else</div><div class='del'>-#define dmasound_deinit()	do { } while (0)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* description of the set-up applies to either hard or soft settings */</div><div class='ctx'> </div><div class='hunk'>@@ -113,9 +110,7 @@ typedef struct {</div><div class='ctx'>     void *(*dma_alloc)(unsigned int, gfp_t);</div><div class='ctx'>     void (*dma_free)(void *, unsigned int);</div><div class='ctx'>     int (*irqinit)(void);</div><div class='del'>-#ifdef MODULE</div><div class='ctx'>     void (*irqcleanup)(void);</div><div class='del'>-#endif</div><div class='ctx'>     void (*init)(void);</div><div class='ctx'>     void (*silence)(void);</div><div class='ctx'>     int (*setFormat)(int);</div><div class='hunk'>@@ -239,7 +234,6 @@ struct sound_queue {</div><div class='ctx'>     int busy, syncing, xruns, died;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SLEEP(queue)		interruptible_sleep_on_timeout(&amp;queue, HZ)</div><div class='ctx'> #define WAKE_UP(queue)		(wake_up_interruptible(&amp;queue))</div><div class='ctx'> </div><div class='ctx'> extern struct sound_queue dmasound_write_sq;</div><div class='hunk'>@@ -256,7 +250,4 @@ extern int dmasound_catchRadius;</div><div class='ctx'> #define SW_INPUT_VOLUME_SCALE	4</div><div class='ctx'> #define SW_INPUT_VOLUME_DEFAULT	(128 / SW_INPUT_VOLUME_SCALE)</div><div class='ctx'> </div><div class='del'>-extern int expand_read_bal;	/* Balance factor for reading */</div><div class='del'>-extern uint software_input_volume; /* software implemented recording volume! */</div><div class='del'>-</div><div class='ctx'> #endif /* _dmasound_h_ */</div><div class='head'>diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c<br/>index 13c214466d3b..6188469de8af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_atari.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_atari.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_atari.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/dmasound_atari.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/oss/dmasound/dmasound_atari.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/atariints.h&gt;</div><div class='ctx'> #include &lt;asm/atari_stram.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -851,7 +852,7 @@ static int __init AtaIrqInit(void)</div><div class='ctx'> 	st_mfp.tim_dt_a = 1;	/* Cause interrupt after first event. */</div><div class='ctx'> 	st_mfp.tim_ct_a = 8;	/* Turn on event counting. */</div><div class='ctx'> 	/* Register interrupt handler. */</div><div class='del'>-	if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound",</div><div class='add'>+	if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, 0, "DMA sound",</div><div class='ctx'> 			AtaInterrupt))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	st_mfp.int_en_a |= 0x20;	/* Turn interrupt on. */</div><div class='hunk'>@@ -1431,25 +1432,25 @@ static int FalconMixerIoctl(u_int cmd, u_long arg)</div><div class='ctx'> {</div><div class='ctx'> 	int data;</div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	    case SOUND_MIXER_READ_RECMASK:</div><div class='add'>+	case SOUND_MIXER_READ_RECMASK:</div><div class='ctx'> 		return IOCTL_OUT(arg, SOUND_MASK_MIC);</div><div class='del'>-	    case SOUND_MIXER_READ_DEVMASK:</div><div class='add'>+	case SOUND_MIXER_READ_DEVMASK:</div><div class='ctx'> 		return IOCTL_OUT(arg, SOUND_MASK_VOLUME | SOUND_MASK_MIC | SOUND_MASK_SPEAKER);</div><div class='del'>-	    case SOUND_MIXER_READ_STEREODEVS:</div><div class='add'>+	case SOUND_MIXER_READ_STEREODEVS:</div><div class='ctx'> 		return IOCTL_OUT(arg, SOUND_MASK_VOLUME | SOUND_MASK_MIC);</div><div class='del'>-	    case SOUND_MIXER_READ_VOLUME:</div><div class='add'>+	case SOUND_MIXER_READ_VOLUME:</div><div class='ctx'> 		return IOCTL_OUT(arg,</div><div class='ctx'> 			VOLUME_ATT_TO_VOXWARE(dmasound.volume_left) |</div><div class='ctx'> 			VOLUME_ATT_TO_VOXWARE(dmasound.volume_right) &lt;&lt; 8);</div><div class='del'>-	    case SOUND_MIXER_READ_CAPS:</div><div class='add'>+	case SOUND_MIXER_READ_CAPS:</div><div class='ctx'> 		return IOCTL_OUT(arg, SOUND_CAP_EXCL_INPUT);</div><div class='del'>-	    case SOUND_MIXER_WRITE_MIC:</div><div class='add'>+	case SOUND_MIXER_WRITE_MIC:</div><div class='ctx'> 		IOCTL_IN(arg, data);</div><div class='ctx'> 		tt_dmasnd.input_gain =</div><div class='ctx'> 			RECLEVEL_VOXWARE_TO_GAIN(data &amp; 0xff) &lt;&lt; 4 |</div><div class='ctx'> 			RECLEVEL_VOXWARE_TO_GAIN(data &gt;&gt; 8 &amp; 0xff);</div><div class='del'>-		/* fall thru, return set value */</div><div class='del'>-	    case SOUND_MIXER_READ_MIC:</div><div class='add'>+		fallthrough;	/* return set value */</div><div class='add'>+	case SOUND_MIXER_READ_MIC:</div><div class='ctx'> 		return IOCTL_OUT(arg,</div><div class='ctx'> 			RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain &gt;&gt; 4 &amp; 0xf) |</div><div class='ctx'> 			RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain &amp; 0xf) &lt;&lt; 8);</div><div class='hunk'>@@ -1617,4 +1618,6 @@ static void __exit dmasound_atari_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(dmasound_atari_init);</div><div class='ctx'> module_exit(dmasound_atari_cleanup);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Atari TT and Falcon DMA Sound Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c<br/>index 87e2c72651f5..dea2d9b18fc9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/dmasound_core.c</a></div><div class='hunk'>@@ -182,8 +182,9 @@</div><div class='ctx'> #include &lt;linux/soundcard.h&gt;</div><div class='ctx'> #include &lt;linux/poll.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dmasound.h"</div><div class='ctx'> </div><div class='hunk'>@@ -203,14 +204,13 @@ module_param(numWriteBufs, int, 0);</div><div class='ctx'> static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ;	/* in bytes */</div><div class='ctx'> module_param(writeBufSize, int, 0);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Atari/Amiga/Q40 core DMA sound driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='ctx'> static int sq_unit = -1;</div><div class='ctx'> static int mixer_unit = -1;</div><div class='ctx'> static int state_unit = -1;</div><div class='ctx'> static int irq_installed;</div><div class='del'>-#endif /* MODULE */</div><div class='ctx'> </div><div class='ctx'> /* control over who can modify resources shared between play/record */</div><div class='ctx'> static fmode_t shared_resource_owner;</div><div class='hunk'>@@ -354,8 +354,8 @@ static int mixer_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		{</div><div class='ctx'> 		    mixer_info info;</div><div class='ctx'> 		    memset(&amp;info, 0, sizeof(info));</div><div class='del'>-		    strlcpy(info.id, dmasound.mach.name2, sizeof(info.id));</div><div class='del'>-		    strlcpy(info.name, dmasound.mach.name2, sizeof(info.name));</div><div class='add'>+		    strscpy(info.id, dmasound.mach.name2, sizeof(info.id));</div><div class='add'>+		    strscpy(info.name, dmasound.mach.name2, sizeof(info.name));</div><div class='ctx'> 		    info.modify_counter = mixer.modify_counter;</div><div class='ctx'> 		    if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='ctx'> 			    return -EFAULT;</div><div class='hunk'>@@ -381,17 +381,14 @@ static long mixer_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> static const struct file_operations mixer_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> 	.unlocked_ioctl	= mixer_unlocked_ioctl,</div><div class='add'>+	.compat_ioctl	= compat_ptr_ioctl,</div><div class='ctx'> 	.open		= mixer_open,</div><div class='ctx'> 	.release	= mixer_release,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void mixer_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	int mixer_unit;</div><div class='del'>-#endif</div><div class='ctx'> 	mixer_unit = register_sound_mixer(&amp;mixer_fops, -1);</div><div class='ctx'> 	if (mixer_unit &lt; 0)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -419,7 +416,7 @@ static int sq_allocate_buffers(struct sound_queue *sq, int num, int size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	sq-&gt;numBufs = num;</div><div class='ctx'> 	sq-&gt;bufSize = size;</div><div class='del'>-	sq-&gt;buffers = kmalloc (num * sizeof(char *), GFP_KERNEL);</div><div class='add'>+	sq-&gt;buffers = kmalloc_array (num, sizeof(char *), GFP_KERNEL);</div><div class='ctx'> 	if (!sq-&gt;buffers)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='hunk'>@@ -619,15 +616,27 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	while (uLeft) {</div><div class='add'>+		DEFINE_WAIT(wait);</div><div class='add'>+</div><div class='ctx'> 		while (write_sq.count &gt;= write_sq.max_active) {</div><div class='add'>+			prepare_to_wait(&amp;write_sq.action_queue, &amp;wait, TASK_INTERRUPTIBLE);</div><div class='ctx'> 			sq_play();</div><div class='del'>-			if (write_sq.non_blocking)</div><div class='add'>+			if (write_sq.non_blocking) {</div><div class='add'>+				finish_wait(&amp;write_sq.action_queue, &amp;wait);</div><div class='ctx'> 				return uWritten &gt; 0 ? uWritten : -EAGAIN;</div><div class='del'>-			SLEEP(write_sq.action_queue);</div><div class='del'>-			if (signal_pending(current))</div><div class='add'>+			}</div><div class='add'>+			if (write_sq.count &lt; write_sq.max_active)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			schedule_timeout(HZ);</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				finish_wait(&amp;write_sq.action_queue, &amp;wait);</div><div class='ctx'> 				return uWritten &gt; 0 ? uWritten : -EINTR;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		finish_wait(&amp;write_sq.action_queue, &amp;wait);</div><div class='add'>+</div><div class='ctx'> 		/* Here, we can avoid disabling the interrupt by first</div><div class='ctx'> 		 * copying and translating the data, and then updating</div><div class='ctx'> 		 * the write_sq variables. Until this is done, the interrupt</div><div class='hunk'>@@ -657,9 +666,9 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft,</div><div class='ctx'> 	return uUsed &lt; 0? uUsed: uWritten;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int sq_poll(struct file *file, struct poll_table_struct *wait)</div><div class='add'>+static __poll_t sq_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mask = 0;</div><div class='add'>+	__poll_t mask = 0;</div><div class='ctx'> 	int retVal;</div><div class='ctx'> 	</div><div class='ctx'> 	if (write_sq.locked == 0) {</div><div class='hunk'>@@ -671,7 +680,7 @@ static unsigned int sq_poll(struct file *file, struct poll_table_struct *wait)</div><div class='ctx'> 		poll_wait(file, &amp;write_sq.action_queue, wait);</div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='ctx'> 		if (write_sq.count &lt; write_sq.max_active || write_sq.block_size - write_sq.rear_size &gt; 0)</div><div class='del'>-			mask |= POLLOUT | POLLWRNORM;</div><div class='add'>+			mask |= EPOLLOUT | EPOLLWRNORM;</div><div class='ctx'> 	return mask;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -707,11 +716,8 @@ static int sq_open2(struct sound_queue *sq, struct file *file, fmode_t mode,</div><div class='ctx'> 			if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='ctx'> 				return rc;</div><div class='ctx'> 			rc = -EINTR;</div><div class='del'>-			while (sq-&gt;busy) {</div><div class='del'>-				SLEEP(sq-&gt;open_queue);</div><div class='del'>-				if (signal_pending(current))</div><div class='del'>-					return rc;</div><div class='del'>-			}</div><div class='add'>+			if (wait_event_interruptible(sq-&gt;open_queue, !sq-&gt;busy))</div><div class='add'>+				return rc;</div><div class='ctx'> 			rc = 0;</div><div class='ctx'> #else</div><div class='ctx'> 			/* OSS manual says we will return EBUSY regardless</div><div class='hunk'>@@ -835,7 +841,7 @@ static void sq_reset(void)</div><div class='ctx'> 	shared_resources_initialised = 0 ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sq_fsync(struct file *filp, struct dentry *dentry)</div><div class='add'>+static int sq_fsync(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	int timeout = 5;</div><div class='hunk'>@@ -844,7 +850,8 @@ static int sq_fsync(struct file *filp, struct dentry *dentry)</div><div class='ctx'> 	sq_play();	/* there may be an incomplete frame waiting */</div><div class='ctx'> </div><div class='ctx'> 	while (write_sq.active) {</div><div class='del'>-		SLEEP(write_sq.sync_queue);</div><div class='add'>+		wait_event_interruptible_timeout(write_sq.sync_queue,</div><div class='add'>+						 !write_sq.active, HZ);</div><div class='ctx'> 		if (signal_pending(current)) {</div><div class='ctx'> 			/* While waiting for audio output to drain, an</div><div class='ctx'> 			 * interrupt occurred.  Stop audio output immediately</div><div class='hunk'>@@ -874,7 +881,7 @@ static int sq_release(struct inode *inode, struct file *file)</div><div class='ctx'> </div><div class='ctx'> 	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='ctx'> 		if (write_sq.busy)</div><div class='del'>-			rc = sq_fsync(file, file-&gt;f_path.dentry);</div><div class='add'>+			rc = sq_fsync();</div><div class='ctx'> </div><div class='ctx'> 		sq_reset_output() ; /* make sure dma is stopped and all is quiet */</div><div class='ctx'> 		write_sq_release_buffers();</div><div class='hunk'>@@ -987,11 +994,9 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 	case SNDCTL_DSP_RESET:</div><div class='ctx'> 		sq_reset();</div><div class='ctx'> 		return 0;</div><div class='del'>-		break ;</div><div class='ctx'> 	case SNDCTL_DSP_GETFMTS:</div><div class='ctx'> 		fmt = dmasound.mach.hardware_afmts ; /* this is what OSS says.. */</div><div class='ctx'> 		return IOCTL_OUT(arg, fmt);</div><div class='del'>-		break ;</div><div class='ctx'> 	case SNDCTL_DSP_GETBLKSIZE:</div><div class='ctx'> 		/* this should tell the caller about bytes that the app can</div><div class='ctx'> 		   read/write - the app doesn't care about our internal buffers.</div><div class='hunk'>@@ -1008,7 +1013,6 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 			size = write_sq.user_frag_size ;</div><div class='ctx'> 		}</div><div class='ctx'> 		return IOCTL_OUT(arg, size);</div><div class='del'>-		break ;</div><div class='ctx'> 	case SNDCTL_DSP_POST:</div><div class='ctx'> 		/* all we are going to do is to tell the LL that any</div><div class='ctx'> 		   partial frags can be queued for output.</div><div class='hunk'>@@ -1021,18 +1025,17 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 	case SNDCTL_DSP_SYNC:</div><div class='ctx'> 		/* This call, effectively, has the same behaviour as SNDCTL_DSP_RESET</div><div class='ctx'> 		   except that it waits for output to finish before resetting</div><div class='del'>-		   everything - read, however, is killed imediately.</div><div class='add'>+		   everything - read, however, is killed immediately.</div><div class='ctx'> 		*/</div><div class='ctx'> 		result = 0 ;</div><div class='ctx'> 		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			result = sq_fsync(file, file-&gt;f_path.dentry);</div><div class='add'>+			result = sq_fsync();</div><div class='ctx'> 			sq_reset_output() ;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* if we are the shared resource owner then release them */</div><div class='ctx'> 		if (file-&gt;f_mode &amp; shared_resource_owner)</div><div class='ctx'> 			shared_resources_initialised = 0 ;</div><div class='ctx'> 		return result ;</div><div class='del'>-		break ;</div><div class='ctx'> 	case SOUND_PCM_READ_RATE:</div><div class='ctx'> 		return IOCTL_OUT(arg, dmasound.soft.speed);</div><div class='ctx'> 	case SNDCTL_DSP_SPEED:</div><div class='hunk'>@@ -1111,7 +1114,6 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> 		   the value is 'random' and that the user _must_ check the actual</div><div class='ctx'> 		   frags values using SNDCTL_DSP_GETBLKSIZE or similar */</div><div class='ctx'> 		return IOCTL_OUT(arg, data);</div><div class='del'>-		break ;</div><div class='ctx'> 	case SNDCTL_DSP_GETOSPACE:</div><div class='ctx'> 		/*</div><div class='ctx'> 		*/</div><div class='hunk'>@@ -1152,10 +1154,10 @@ static long sq_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='ctx'> static const struct file_operations sq_fops =</div><div class='ctx'> {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> 	.write		= sq_write,</div><div class='ctx'> 	.poll		= sq_poll,</div><div class='ctx'> 	.unlocked_ioctl	= sq_unlocked_ioctl,</div><div class='add'>+	.compat_ioctl	= compat_ptr_ioctl,</div><div class='ctx'> 	.open		= sq_open,</div><div class='ctx'> 	.release	= sq_release,</div><div class='ctx'> };</div><div class='hunk'>@@ -1163,9 +1165,6 @@ static const struct file_operations sq_fops =</div><div class='ctx'> static int sq_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	const struct file_operations *fops = &amp;sq_fops;</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	int sq_unit;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	sq_unit = register_sound_dsp(fops, -1);</div><div class='ctx'> 	if (sq_unit &lt; 0) {</div><div class='hunk'>@@ -1221,31 +1220,22 @@ static char *get_afmt_string(int afmt)</div><div class='ctx'>         switch(afmt) {</div><div class='ctx'>             case AFMT_MU_LAW:</div><div class='ctx'>                 return "mu-law";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_A_LAW:</div><div class='ctx'>                 return "A-law";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_U8:</div><div class='ctx'>                 return "unsigned 8 bit";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_S8:</div><div class='ctx'>                 return "signed 8 bit";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_S16_BE:</div><div class='ctx'>                 return "signed 16 bit BE";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_U16_BE:</div><div class='ctx'>                 return "unsigned 16 bit BE";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_S16_LE:</div><div class='ctx'>                 return "signed 16 bit LE";</div><div class='del'>-                break;</div><div class='ctx'>             case AFMT_U16_LE:</div><div class='ctx'>                 return "unsigned 16 bit LE";</div><div class='del'>-                break;</div><div class='ctx'> 	    case 0:</div><div class='ctx'> 		return "format not set" ;</div><div class='del'>-		break ;</div><div class='ctx'>             default:</div><div class='ctx'>                 break ;</div><div class='ctx'>         }</div><div class='hunk'>@@ -1359,7 +1349,6 @@ static ssize_t state_read(struct file *file, char __user *buf, size_t count,</div><div class='ctx'> </div><div class='ctx'> static const struct file_operations state_fops = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='ctx'> 	.read		= state_read,</div><div class='ctx'> 	.open		= state_open,</div><div class='ctx'> 	.release	= state_release,</div><div class='hunk'>@@ -1367,9 +1356,6 @@ static const struct file_operations state_fops = {</div><div class='ctx'> </div><div class='ctx'> static int state_init(void)</div><div class='ctx'> {</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	int state_unit;</div><div class='del'>-#endif</div><div class='ctx'> 	state_unit = register_sound_special(&amp;state_fops, SND_DEV_STATUS);</div><div class='ctx'> 	if (state_unit &lt; 0)</div><div class='ctx'> 		return state_unit ;</div><div class='hunk'>@@ -1387,10 +1373,9 @@ static int state_init(void)</div><div class='ctx'> int dmasound_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int res ;</div><div class='del'>-#ifdef MODULE</div><div class='add'>+</div><div class='ctx'> 	if (irq_installed)</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Set up sound queue, /dev/audio and /dev/dsp. */</div><div class='ctx'> </div><div class='hunk'>@@ -1409,9 +1394,7 @@ int dmasound_init(void)</div><div class='ctx'> 		printk(KERN_ERR "DMA sound driver: Interrupt initialization failed\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> 	irq_installed = 1;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	printk(KERN_INFO "%s DMA sound driver rev %03d installed\n",</div><div class='ctx'> 		dmasound.mach.name, (DMASOUND_CORE_REVISION&lt;&lt;4) +</div><div class='hunk'>@@ -1425,8 +1408,6 @@ int dmasound_init(void)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='ctx'> void dmasound_deinit(void)</div><div class='ctx'> {</div><div class='ctx'> 	if (irq_installed) {</div><div class='hunk'>@@ -1445,9 +1426,7 @@ void dmasound_deinit(void)</div><div class='ctx'> 		unregister_sound_dsp(sq_unit);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !MODULE */</div><div class='del'>-</div><div class='del'>-static int dmasound_setup(char *str)</div><div class='add'>+static int __maybe_unused dmasound_setup(char *str)</div><div class='ctx'> {</div><div class='ctx'> 	int ints[6], size;</div><div class='ctx'> </div><div class='hunk'>@@ -1465,13 +1444,13 @@ static int dmasound_setup(char *str)</div><div class='ctx'> 			printk("dmasound_setup: invalid catch radius, using default = %d\n", catchRadius);</div><div class='ctx'> 		else</div><div class='ctx'> 			catchRadius = ints[3];</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		if (ints[1] &lt; MIN_BUFFERS)</div><div class='ctx'> 			printk("dmasound_setup: invalid number of buffers, using default = %d\n", numWriteBufs);</div><div class='ctx'> 		else</div><div class='ctx'> 			numWriteBufs = ints[1];</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		if ((size = ints[2]) &lt; 256) /* check for small buffer specs */</div><div class='ctx'> 			size &lt;&lt;= 10 ;</div><div class='hunk'>@@ -1490,8 +1469,6 @@ static int dmasound_setup(char *str)</div><div class='ctx'> </div><div class='ctx'> __setup("dmasound=", dmasound_setup);</div><div class='ctx'> </div><div class='del'>-#endif /* !MODULE */</div><div class='del'>-</div><div class='ctx'>     /*</div><div class='ctx'>      *  Conversion tables</div><div class='ctx'>      */</div><div class='hunk'>@@ -1578,9 +1555,7 @@ char dmasound_alaw2dma8[] = {</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(dmasound);</div><div class='ctx'> EXPORT_SYMBOL(dmasound_init);</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> EXPORT_SYMBOL(dmasound_deinit);</div><div class='del'>-#endif</div><div class='ctx'> EXPORT_SYMBOL(dmasound_write_sq);</div><div class='ctx'> EXPORT_SYMBOL(dmasound_catchRadius);</div><div class='ctx'> #ifdef HAS_8BIT_TABLES</div><div class='head'>diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c<br/>index 87910e992133..8d443a3663d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_paula.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_paula.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_paula.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/dmasound_paula.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/oss/dmasound/dmasound_paula.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,7 +24,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/amigahw.h&gt;</div><div class='ctx'> #include &lt;asm/amigaints.h&gt;</div><div class='hunk'>@@ -719,33 +720,26 @@ static int __init amiga_audio_probe(struct platform_device *pdev)</div><div class='ctx'> 	return dmasound_init();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __exit amiga_audio_remove(struct platform_device *pdev)</div><div class='add'>+static void __exit amiga_audio_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	dmasound_deinit();</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct platform_driver amiga_audio_driver = {</div><div class='add'>+/*</div><div class='add'>+ * amiga_audio_remove() lives in .exit.text. For drivers registered via</div><div class='add'>+ * module_platform_driver_probe() this is ok because they cannot get unbound at</div><div class='add'>+ * runtime. So mark the driver struct with __refdata to prevent modpost</div><div class='add'>+ * triggering a section mismatch warning.</div><div class='add'>+ */</div><div class='add'>+static struct platform_driver amiga_audio_driver __refdata = {</div><div class='ctx'> 	.remove = __exit_p(amiga_audio_remove),</div><div class='del'>-	.driver   = {</div><div class='add'>+	.driver = {</div><div class='ctx'> 		.name	= "amiga-audio",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init amiga_audio_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_probe(&amp;amiga_audio_driver, amiga_audio_probe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(amiga_audio_init);</div><div class='del'>-</div><div class='del'>-static void __exit amiga_audio_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;amiga_audio_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(amiga_audio_exit);</div><div class='add'>+module_platform_driver_probe(amiga_audio_driver, amiga_audio_probe);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Amiga Paula DMA Sound Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:amiga-audio");</div><div class='head'>diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c<br/>index 99bcb21c2281..e25a78dd1bf2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_q40.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/dmasound/dmasound_q40.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/oss/dmasound/dmasound_q40.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/oss/dmasound/dmasound_q40.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/sound/oss/dmasound/dmasound_q40.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,7 +21,7 @@</div><div class='ctx'> #include &lt;linux/soundcard.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/q40ints.h&gt;</div><div class='ctx'> #include &lt;asm/q40_master.h&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/oss/hex2hex.c b/sound/oss/hex2hex.c<br/>deleted file mode 100644<br/>index 041ef5c52bc2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/hex2hex.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/hex2hex.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * hex2hex reads stdin in Intel HEX format and produces an</div><div class='del'>- * (unsigned char) array which contains the bytes and writes it</div><div class='del'>- * to stdout using C syntax</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#define ABANDON(why) { fprintf(stderr, "%s\n", why); exit(1); }</div><div class='del'>-#define MAX_SIZE (256*1024)</div><div class='del'>-unsigned char buf[MAX_SIZE];</div><div class='del'>-</div><div class='del'>-static int loadhex(FILE *inf, unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	int l=0, c, i;</div><div class='del'>-</div><div class='del'>-	while ((c=getc(inf))!=EOF)</div><div class='del'>-	{</div><div class='del'>-		if (c == ':')	/* Sync with beginning of line */</div><div class='del'>-		{</div><div class='del'>-			int n, check;</div><div class='del'>-			unsigned char sum;</div><div class='del'>-			int addr;</div><div class='del'>-			int linetype;</div><div class='del'>-</div><div class='del'>-			if (fscanf(inf, "%02x", &amp;n) != 1)</div><div class='del'>-			   ABANDON("File format error");</div><div class='del'>-			sum = n;</div><div class='del'>-</div><div class='del'>-			if (fscanf(inf, "%04x", &amp;addr) != 1)</div><div class='del'>-			   ABANDON("File format error");</div><div class='del'>-			sum += addr/256;</div><div class='del'>-			sum += addr%256;</div><div class='del'>-</div><div class='del'>-			if (fscanf(inf, "%02x", &amp;linetype) != 1)</div><div class='del'>-			   ABANDON("File format error");</div><div class='del'>-			sum += linetype;</div><div class='del'>-</div><div class='del'>-			if (linetype != 0)</div><div class='del'>-			   continue;</div><div class='del'>-</div><div class='del'>-			for (i=0;i&lt;n;i++)</div><div class='del'>-			{</div><div class='del'>-				if (fscanf(inf, "%02x", &amp;c) != 1)</div><div class='del'>-			   	   ABANDON("File format error");</div><div class='del'>-				if (addr &gt;= MAX_SIZE)</div><div class='del'>-				   ABANDON("File too large");</div><div class='del'>-				buf[addr++] = c;</div><div class='del'>-				if (addr &gt; l)</div><div class='del'>-				   l = addr;</div><div class='del'>-				sum += c;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (fscanf(inf, "%02x", &amp;check) != 1)</div><div class='del'>-			   ABANDON("File format error");</div><div class='del'>-</div><div class='del'>-			sum = ~sum + 1;</div><div class='del'>-			if (check != sum)</div><div class='del'>-			   ABANDON("Line checksum error");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main( int argc, const char * argv [] )</div><div class='del'>-{</div><div class='del'>-	const char * varline;</div><div class='del'>-	int i,l;</div><div class='del'>-	int id=0;</div><div class='del'>-</div><div class='del'>-	if(argv[1] &amp;&amp; strcmp(argv[1], "-i")==0)</div><div class='del'>-	{</div><div class='del'>-		argv++;</div><div class='del'>-		argc--;</div><div class='del'>-		id=1;</div><div class='del'>-	}</div><div class='del'>-	if(argv[1]==NULL)</div><div class='del'>-	{</div><div class='del'>-		fprintf(stderr,"hex2hex: [-i] filename\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-	varline = argv[1];</div><div class='del'>-	l = loadhex(stdin, buf);</div><div class='del'>-</div><div class='del'>-	printf("/*\n *\t Computer generated file. Do not edit.\n */\n");</div><div class='del'>-        printf("static int %s_len = %d;\n", varline, l);</div><div class='del'>-	printf("static unsigned char %s[] %s = {\n", varline, id?"__initdata":"");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;l;i++)</div><div class='del'>-	{</div><div class='del'>-		if (i) printf(",");</div><div class='del'>-		if (i &amp;&amp; !(i % 16)) printf("\n");</div><div class='del'>-		printf("0x%02x", buf[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("\n};\n\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c<br/>deleted file mode 100644<br/>index 52d06a334e8f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/kahlua.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/kahlua.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,231 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	Initialisation code for Cyrix/NatSemi VSA1 softaudio</div><div class='del'>- *</div><div class='del'>- *	(C) Copyright 2003 Red Hat Inc &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='del'>- *</div><div class='del'>- * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.</div><div class='del'>- * The older version (VSA1) provides fairly good soundblaster emulation</div><div class='del'>- * although there are a couple of bugs: large DMA buffers break record,</div><div class='del'>- * and the MPU event handling seems suspect. VSA2 allows the native driver</div><div class='del'>- * to control the AC97 audio engine directly and requires a different driver.</div><div class='del'>- *</div><div class='del'>- * Thanks to National Semiconductor for providing the needed information</div><div class='del'>- * on the XpressAudio(tm) internals.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the</div><div class='del'>- * Free Software Foundation; either version 2, or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * TO DO:</div><div class='del'>- *	Investigate whether we can portably support Cognac (5520) in the</div><div class='del'>- *	same manner.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "sb.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Read a soundblaster compatible mixer register.</div><div class='del'>- *	In this case we are actually reading an SMI trap</div><div class='del'>- *	not real hardware.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static u8 __devinit mixer_read(unsigned long io, u8 reg)</div><div class='del'>-{</div><div class='del'>-	outb(reg, io + 4);</div><div class='del'>-	udelay(20);</div><div class='del'>-	reg = inb(io + 5);</div><div class='del'>-	udelay(20);</div><div class='del'>-	return reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	struct address_info *hw_config;</div><div class='del'>-	unsigned long base;</div><div class='del'>-	void __iomem *mem;</div><div class='del'>-	unsigned long io;</div><div class='del'>-	u16 map;</div><div class='del'>-	u8 irq, dma8, dma16;</div><div class='del'>-	int oldquiet;</div><div class='del'>-	extern int sb_be_quiet;</div><div class='del'>-		</div><div class='del'>-	base = pci_resource_start(pdev, 0);</div><div class='del'>-	if(base == 0UL)</div><div class='del'>-		return 1;</div><div class='del'>-	</div><div class='del'>-	mem = ioremap(base, 128);</div><div class='del'>-	if (!mem)</div><div class='del'>-		return 1;</div><div class='del'>-	map = readw(mem + 0x18);	/* Read the SMI enables */</div><div class='del'>-	iounmap(mem);</div><div class='del'>-	</div><div class='del'>-	/* Map bits</div><div class='del'>-		0:1	* 0x20 + 0x200 = sb base</div><div class='del'>-		2	sb enable</div><div class='del'>-		3	adlib enable</div><div class='del'>-		5	MPU enable 0x330</div><div class='del'>-		6	MPU enable 0x300</div><div class='del'>-		</div><div class='del'>-	   The other bits may be used internally so must be masked */</div><div class='del'>-</div><div class='del'>-	io = 0x220 + 0x20 * (map &amp; 3);	   </div><div class='del'>-	</div><div class='del'>-	if(map &amp; (1&lt;&lt;2))</div><div class='del'>-		printk(KERN_INFO "kahlua: XpressAudio at 0x%lx\n", io);</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-		</div><div class='del'>-	if(map &amp; (1&lt;&lt;5))</div><div class='del'>-		printk(KERN_INFO "kahlua: MPU at 0x300\n");</div><div class='del'>-	else if(map &amp; (1&lt;&lt;6))</div><div class='del'>-		printk(KERN_INFO "kahlua: MPU at 0x330\n");</div><div class='del'>-	</div><div class='del'>-	irq = mixer_read(io, 0x80) &amp; 0x0F;</div><div class='del'>-	dma8 = mixer_read(io, 0x81);</div><div class='del'>-</div><div class='del'>-	// printk("IRQ=%x MAP=%x DMA=%x\n", irq, map, dma8);</div><div class='del'>-	</div><div class='del'>-	if(dma8 &amp; 0x20)</div><div class='del'>-		dma16 = 5;</div><div class='del'>-	else if(dma8 &amp; 0x40)</div><div class='del'>-		dma16 = 6;</div><div class='del'>-	else if(dma8 &amp; 0x80)</div><div class='del'>-		dma16 = 7;</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "kahlua: No 16bit DMA enabled.\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	if(dma8 &amp; 0x01)</div><div class='del'>-		dma8 = 0;</div><div class='del'>-	else if(dma8 &amp; 0x02)</div><div class='del'>-		dma8 = 1;</div><div class='del'>-	else if(dma8 &amp; 0x08)</div><div class='del'>-		dma8 = 3;</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "kahlua: No 8bit DMA enabled.\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if(irq &amp; 1)</div><div class='del'>-		irq = 9;</div><div class='del'>-	else if(irq &amp; 2)</div><div class='del'>-		irq = 5;</div><div class='del'>-	else if(irq &amp; 4)</div><div class='del'>-		irq = 7;</div><div class='del'>-	else if(irq &amp; 8)</div><div class='del'>-		irq = 10;</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "kahlua: SB IRQ not set.\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	printk(KERN_INFO "kahlua: XpressAudio on IRQ %d, DMA %d, %d\n",</div><div class='del'>-		irq, dma8, dma16);</div><div class='del'>-	</div><div class='del'>-	hw_config = kzalloc(sizeof(struct address_info), GFP_KERNEL);</div><div class='del'>-	if(hw_config == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "kahlua: out of memory.\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	pci_set_drvdata(pdev, hw_config);</div><div class='del'>-	</div><div class='del'>-	hw_config-&gt;io_base = io;</div><div class='del'>-	hw_config-&gt;irq = irq;</div><div class='del'>-	hw_config-&gt;dma = dma8;</div><div class='del'>-	hw_config-&gt;dma2 = dma16;</div><div class='del'>-	hw_config-&gt;name = "Cyrix XpressAudio";</div><div class='del'>-	hw_config-&gt;driver_use_1 = SB_NO_MIDI | SB_PCI_IRQ;</div><div class='del'>-</div><div class='del'>-	if (!request_region(io, 16, "soundblaster"))</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	</div><div class='del'>-	if(sb_dsp_detect(hw_config, 0, 0, NULL)==0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "kahlua: audio not responding.\n");</div><div class='del'>-		release_region(io, 16);</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	oldquiet = sb_be_quiet;	</div><div class='del'>-	sb_be_quiet = 1;</div><div class='del'>-	if(sb_dsp_init(hw_config, THIS_MODULE))</div><div class='del'>-	{</div><div class='del'>-		sb_be_quiet = oldquiet;</div><div class='del'>-		goto err_out_free;</div><div class='del'>-	}</div><div class='del'>-	sb_be_quiet = oldquiet;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out_free:</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-	kfree(hw_config);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit remove_one(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct address_info *hw_config = pci_get_drvdata(pdev);</div><div class='del'>-	sb_dsp_unload(hw_config, 0);</div><div class='del'>-	pci_set_drvdata(pdev, NULL);</div><div class='del'>-	kfree(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Alan Cox");</div><div class='del'>-MODULE_DESCRIPTION("Kahlua VSA1 PCI Audio");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	5530 only. The 5510/5520 decode is different.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(id_tbl) = {</div><div class='del'>-	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DEVICE_TABLE(pci, id_tbl);</div><div class='del'>-</div><div class='del'>-static struct pci_driver kahlua_driver = {</div><div class='del'>-	.name		= "kahlua",</div><div class='del'>-	.id_table	= id_tbl,</div><div class='del'>-	.probe		= probe_one,</div><div class='del'>-	.remove		= __devexit_p(remove_one),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init kahlua_init_module(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");</div><div class='del'>-	return pci_register_driver(&amp;kahlua_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit kahlua_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;kahlua_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(kahlua_init_module);</div><div class='del'>-module_exit(kahlua_cleanup_module);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/midi_ctrl.h b/sound/oss/midi_ctrl.h<br/>deleted file mode 100644<br/>index 3353e5a67c24..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/midi_ctrl.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_ctrl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-static unsigned char ctrl_def_values[128] =</div><div class='del'>-{</div><div class='del'>-	0x40,0x00,0x40,0x40,  0x40,0x40,0x40,0x7f,	/*   0 to   7 */</div><div class='del'>-	0x40,0x40,0x40,0x7f,  0x40,0x40,0x40,0x40,	/*   8 to  15 */</div><div class='del'>-	0x40,0x40,0x40,0x40,  0x40,0x40,0x40,0x40,	/*  16 to  23 */</div><div class='del'>-	0x40,0x40,0x40,0x40,  0x40,0x40,0x40,0x40,	/*  24 to  31 */</div><div class='del'>-</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  32 to  39 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  40 to  47 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  48 to  55 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  56 to  63 */</div><div class='del'>-	</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  64 to  71 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  72 to  79 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  80 to  87 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/*  88 to  95 */</div><div class='del'>-</div><div class='del'>-	0x00,0x00,0x7f,0x7f,  0x7f,0x7f,0x00,0x00,	/*  96 to 103 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/* 104 to 111 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/* 112 to 119 */</div><div class='del'>-	0x00,0x00,0x00,0x00,  0x00,0x00,0x00,0x00,	/* 120 to 127 */</div><div class='del'>-};</div><div class='head'>diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c<br/>deleted file mode 100644<br/>index 3c09374ea5bf..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/midi_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_synth.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,716 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/midi_synth.c</div><div class='del'>- *</div><div class='del'>- * High level midi sequencer manager for dumb MIDI interfaces.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Andrew Veliath  : fixed running status in MIDI input state machine</div><div class='del'>- */</div><div class='del'>-#define USE_SEQ_MACROS</div><div class='del'>-#define USE_SIMPLE_MACROS</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#define _MIDI_SYNTH_C_</div><div class='del'>-</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static int      midi2synth[MAX_MIDI_DEV];</div><div class='del'>-static int      sysex_state[MAX_MIDI_DEV] =</div><div class='del'>-{0};</div><div class='del'>-static unsigned char prev_out_status[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-#define STORE(cmd) \</div><div class='del'>-{ \</div><div class='del'>-  int len; \</div><div class='del'>-  unsigned char obuf[8]; \</div><div class='del'>-  cmd; \</div><div class='del'>-  seq_input_event(obuf, len); \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define _seqbuf obuf</div><div class='del'>-#define _seqbufptr 0</div><div class='del'>-#define _SEQ_ADVBUF(x) len=x</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-do_midi_msg(int synthno, unsigned char *msg, int mlen)</div><div class='del'>-{</div><div class='del'>-	switch (msg[0] &amp; 0xf0)</div><div class='del'>-	  {</div><div class='del'>-	  case 0x90:</div><div class='del'>-		  if (msg[2] != 0)</div><div class='del'>-		    {</div><div class='del'>-			    STORE(SEQ_START_NOTE(synthno, msg[0] &amp; 0x0f, msg[1], msg[2]));</div><div class='del'>-			    break;</div><div class='del'>-		    }</div><div class='del'>-		  msg[2] = 64;</div><div class='del'>-</div><div class='del'>-	  case 0x80:</div><div class='del'>-		  STORE(SEQ_STOP_NOTE(synthno, msg[0] &amp; 0x0f, msg[1], msg[2]));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case 0xA0:</div><div class='del'>-		  STORE(SEQ_KEY_PRESSURE(synthno, msg[0] &amp; 0x0f, msg[1], msg[2]));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case 0xB0:</div><div class='del'>-		  STORE(SEQ_CONTROL(synthno, msg[0] &amp; 0x0f,</div><div class='del'>-				    msg[1], msg[2]));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case 0xC0:</div><div class='del'>-		  STORE(SEQ_SET_PATCH(synthno, msg[0] &amp; 0x0f, msg[1]));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case 0xD0:</div><div class='del'>-		  STORE(SEQ_CHN_PRESSURE(synthno, msg[0] &amp; 0x0f, msg[1]));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case 0xE0:</div><div class='del'>-		  STORE(SEQ_BENDER(synthno, msg[0] &amp; 0x0f,</div><div class='del'>-			      (msg[1] &amp; 0x7f) | ((msg[2] &amp; 0x7f) &lt;&lt; 7)));</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  default:</div><div class='del'>-		  /* printk( "MPU: Unknown midi channel message %02x\n",  msg[0]); */</div><div class='del'>-		  ;</div><div class='del'>-	  }</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(do_midi_msg);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-midi_outc(int midi_dev, int data)</div><div class='del'>-{</div><div class='del'>-	int             timeout;</div><div class='del'>-</div><div class='del'>-	for (timeout = 0; timeout &lt; 3200; timeout++)</div><div class='del'>-		if (midi_devs[midi_dev]-&gt;outputc(midi_dev, (unsigned char) (data &amp; 0xff)))</div><div class='del'>-		  {</div><div class='del'>-			  if (data &amp; 0x80)	/*</div><div class='del'>-						 * Status byte</div><div class='del'>-						 */</div><div class='del'>-				  prev_out_status[midi_dev] =</div><div class='del'>-				      (unsigned char) (data &amp; 0xff);	/*</div><div class='del'>-									 * Store for running status</div><div class='del'>-									 */</div><div class='del'>-			  return;	/*</div><div class='del'>-					 * Mission complete</div><div class='del'>-					 */</div><div class='del'>-		  }</div><div class='del'>-	/*</div><div class='del'>-	 * Sorry! No space on buffers.</div><div class='del'>-	 */</div><div class='del'>-	printk("Midi send timed out\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-prefix_cmd(int midi_dev, unsigned char status)</div><div class='del'>-{</div><div class='del'>-	if ((char *) midi_devs[midi_dev]-&gt;prefix_cmd == NULL)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return midi_devs[midi_dev]-&gt;prefix_cmd(midi_dev, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-midi_synth_input(int orig_dev, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	int             dev;</div><div class='del'>-	struct midi_input_info *inc;</div><div class='del'>-</div><div class='del'>-	static unsigned char len_tab[] =	/* # of data bytes following a status</div><div class='del'>-						 */</div><div class='del'>-	{</div><div class='del'>-		2,		/* 8x */</div><div class='del'>-		2,		/* 9x */</div><div class='del'>-		2,		/* Ax */</div><div class='del'>-		2,		/* Bx */</div><div class='del'>-		1,		/* Cx */</div><div class='del'>-		1,		/* Dx */</div><div class='del'>-		2,		/* Ex */</div><div class='del'>-		0		/* Fx */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (orig_dev &lt; 0 || orig_dev &gt; num_midis || midi_devs[orig_dev] == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (data == 0xfe)	/* Ignore active sensing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dev = midi2synth[orig_dev];</div><div class='del'>-	inc = &amp;midi_devs[orig_dev]-&gt;in_info;</div><div class='del'>-</div><div class='del'>-	switch (inc-&gt;m_state)</div><div class='del'>-	  {</div><div class='del'>-	  case MST_INIT:</div><div class='del'>-		  if (data &amp; 0x80)	/* MIDI status byte */</div><div class='del'>-		    {</div><div class='del'>-			    if ((data &amp; 0xf0) == 0xf0)	/* Common message */</div><div class='del'>-			      {</div><div class='del'>-				      switch (data)</div><div class='del'>-					{</div><div class='del'>-					case 0xf0:	/* Sysex */</div><div class='del'>-						inc-&gt;m_state = MST_SYSEX;</div><div class='del'>-						break;	/* Sysex */</div><div class='del'>-</div><div class='del'>-					case 0xf1:	/* MTC quarter frame */</div><div class='del'>-					case 0xf3:	/* Song select */</div><div class='del'>-						inc-&gt;m_state = MST_DATA;</div><div class='del'>-						inc-&gt;m_ptr = 1;</div><div class='del'>-						inc-&gt;m_left = 1;</div><div class='del'>-						inc-&gt;m_buf[0] = data;</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					case 0xf2:	/* Song position pointer */</div><div class='del'>-						inc-&gt;m_state = MST_DATA;</div><div class='del'>-						inc-&gt;m_ptr = 1;</div><div class='del'>-						inc-&gt;m_left = 2;</div><div class='del'>-						inc-&gt;m_buf[0] = data;</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					default:</div><div class='del'>-						inc-&gt;m_buf[0] = data;</div><div class='del'>-						inc-&gt;m_ptr = 1;</div><div class='del'>-						do_midi_msg(dev, inc-&gt;m_buf, inc-&gt;m_ptr);</div><div class='del'>-						inc-&gt;m_ptr = 0;</div><div class='del'>-						inc-&gt;m_left = 0;</div><div class='del'>-					}</div><div class='del'>-			    } else</div><div class='del'>-			      {</div><div class='del'>-				      inc-&gt;m_state = MST_DATA;</div><div class='del'>-				      inc-&gt;m_ptr = 1;</div><div class='del'>-				      inc-&gt;m_left = len_tab[(data &gt;&gt; 4) - 8];</div><div class='del'>-				      inc-&gt;m_buf[0] = inc-&gt;m_prev_status = data;</div><div class='del'>-			      }</div><div class='del'>-		    } else if (inc-&gt;m_prev_status &amp; 0x80) {</div><div class='del'>-			    /* Data byte (use running status) */</div><div class='del'>-			    inc-&gt;m_ptr = 2;</div><div class='del'>-			    inc-&gt;m_buf[1] = data;</div><div class='del'>-			    inc-&gt;m_buf[0] = inc-&gt;m_prev_status;</div><div class='del'>-			    inc-&gt;m_left = len_tab[(inc-&gt;m_buf[0] &gt;&gt; 4) - 8] - 1;</div><div class='del'>-			    if (inc-&gt;m_left &gt; 0)</div><div class='del'>-				    inc-&gt;m_state = MST_DATA; /* Not done yet */</div><div class='del'>-			    else {</div><div class='del'>-				    inc-&gt;m_state = MST_INIT;</div><div class='del'>-				    do_midi_msg(dev, inc-&gt;m_buf, inc-&gt;m_ptr);</div><div class='del'>-				    inc-&gt;m_ptr = 0;</div><div class='del'>-			    }</div><div class='del'>-		    }</div><div class='del'>-		  break;	/* MST_INIT */</div><div class='del'>-</div><div class='del'>-	  case MST_DATA:</div><div class='del'>-		  inc-&gt;m_buf[inc-&gt;m_ptr++] = data;</div><div class='del'>-		  if (--inc-&gt;m_left &lt;= 0)</div><div class='del'>-		    {</div><div class='del'>-			    inc-&gt;m_state = MST_INIT;</div><div class='del'>-			    do_midi_msg(dev, inc-&gt;m_buf, inc-&gt;m_ptr);</div><div class='del'>-			    inc-&gt;m_ptr = 0;</div><div class='del'>-		    }</div><div class='del'>-		  break;	/* MST_DATA */</div><div class='del'>-</div><div class='del'>-	  case MST_SYSEX:</div><div class='del'>-		  if (data == 0xf7)	/* Sysex end */</div><div class='del'>-		    {</div><div class='del'>-			    inc-&gt;m_state = MST_INIT;</div><div class='del'>-			    inc-&gt;m_left = 0;</div><div class='del'>-			    inc-&gt;m_ptr = 0;</div><div class='del'>-		    }</div><div class='del'>-		  break;	/* MST_SYSEX */</div><div class='del'>-</div><div class='del'>-	  default:</div><div class='del'>-		  printk("MIDI%d: Unexpected state %d (%02x)\n", orig_dev, inc-&gt;m_state, (int) data);</div><div class='del'>-		  inc-&gt;m_state = MST_INIT;</div><div class='del'>-	  }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-leave_sysex(int dev)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             timeout = 0;</div><div class='del'>-</div><div class='del'>-	if (!sysex_state[dev])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sysex_state[dev] = 0;</div><div class='del'>-</div><div class='del'>-	while (!midi_devs[orig_dev]-&gt;outputc(orig_dev, 0xf7) &amp;&amp;</div><div class='del'>-	       timeout &lt; 1000)</div><div class='del'>-		timeout++;</div><div class='del'>-</div><div class='del'>-	sysex_state[dev] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-midi_synth_output(int dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Currently NOP</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int midi_synth_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * int orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-</div><div class='del'>-	case SNDCTL_SYNTH_INFO:</div><div class='del'>-		if (__copy_to_user(arg, synth_devs[dev]-&gt;info, sizeof(struct synth_info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-		</div><div class='del'>-	case SNDCTL_SYNTH_MEMAVL:</div><div class='del'>-		return 0x7fffffff;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_ioctl);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_kill_note(int dev, int channel, int note, int velocity)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             msg, chn;</div><div class='del'>-</div><div class='del'>-	if (note &lt; 0 || note &gt; 127)</div><div class='del'>-		return 0;</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return 0;</div><div class='del'>-	if (velocity &lt; 0)</div><div class='del'>-		velocity = 0;</div><div class='del'>-	if (velocity &gt; 127)</div><div class='del'>-		velocity = 127;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	msg = prev_out_status[orig_dev] &amp; 0xf0;</div><div class='del'>-	chn = prev_out_status[orig_dev] &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (chn == channel &amp;&amp; ((msg == 0x90 &amp;&amp; velocity == 64) || msg == 0x80))</div><div class='del'>-	  {			/*</div><div class='del'>-				 * Use running status</div><div class='del'>-				 */</div><div class='del'>-		  if (!prefix_cmd(orig_dev, note))</div><div class='del'>-			  return 0;</div><div class='del'>-</div><div class='del'>-		  midi_outc(orig_dev, note);</div><div class='del'>-</div><div class='del'>-		  if (msg == 0x90)	/*</div><div class='del'>-					 * Running status = Note on</div><div class='del'>-					 */</div><div class='del'>-			  midi_outc(orig_dev, 0);	/*</div><div class='del'>-							   * Note on with velocity 0 == note</div><div class='del'>-							   * off</div><div class='del'>-							 */</div><div class='del'>-		  else</div><div class='del'>-			  midi_outc(orig_dev, velocity);</div><div class='del'>-	} else</div><div class='del'>-	  {</div><div class='del'>-		  if (velocity == 64)</div><div class='del'>-		    {</div><div class='del'>-			    if (!prefix_cmd(orig_dev, 0x90 | (channel &amp; 0x0f)))</div><div class='del'>-				    return 0;</div><div class='del'>-			    midi_outc(orig_dev, 0x90 | (channel &amp; 0x0f));	/*</div><div class='del'>-										 * Note on</div><div class='del'>-										 */</div><div class='del'>-			    midi_outc(orig_dev, note);</div><div class='del'>-			    midi_outc(orig_dev, 0);	/*</div><div class='del'>-							 * Zero G</div><div class='del'>-							 */</div><div class='del'>-		  } else</div><div class='del'>-		    {</div><div class='del'>-			    if (!prefix_cmd(orig_dev, 0x80 | (channel &amp; 0x0f)))</div><div class='del'>-				    return 0;</div><div class='del'>-			    midi_outc(orig_dev, 0x80 | (channel &amp; 0x0f));	/*</div><div class='del'>-										 * Note off</div><div class='del'>-										 */</div><div class='del'>-			    midi_outc(orig_dev, note);</div><div class='del'>-			    midi_outc(orig_dev, velocity);</div><div class='del'>-		    }</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_kill_note);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_set_instr(int dev, int channel, int instr_no)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	if (instr_no &lt; 0 || instr_no &gt; 127)</div><div class='del'>-		instr_no = 0;</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	if (!prefix_cmd(orig_dev, 0xc0 | (channel &amp; 0x0f)))</div><div class='del'>-		return 0;</div><div class='del'>-	midi_outc(orig_dev, 0xc0 | (channel &amp; 0x0f));	/*</div><div class='del'>-							 * Program change</div><div class='del'>-							 */</div><div class='del'>-	midi_outc(orig_dev, instr_no);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_set_instr);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_start_note(int dev, int channel, int note, int velocity)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             msg, chn;</div><div class='del'>-</div><div class='del'>-	if (note &lt; 0 || note &gt; 127)</div><div class='del'>-		return 0;</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return 0;</div><div class='del'>-	if (velocity &lt; 0)</div><div class='del'>-		velocity = 0;</div><div class='del'>-	if (velocity &gt; 127)</div><div class='del'>-		velocity = 127;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	msg = prev_out_status[orig_dev] &amp; 0xf0;</div><div class='del'>-	chn = prev_out_status[orig_dev] &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (chn == channel &amp;&amp; msg == 0x90)</div><div class='del'>-	  {			/*</div><div class='del'>-				 * Use running status</div><div class='del'>-				 */</div><div class='del'>-		  if (!prefix_cmd(orig_dev, note))</div><div class='del'>-			  return 0;</div><div class='del'>-		  midi_outc(orig_dev, note);</div><div class='del'>-		  midi_outc(orig_dev, velocity);</div><div class='del'>-	} else</div><div class='del'>-	  {</div><div class='del'>-		  if (!prefix_cmd(orig_dev, 0x90 | (channel &amp; 0x0f)))</div><div class='del'>-			  return 0;</div><div class='del'>-		  midi_outc(orig_dev, 0x90 | (channel &amp; 0x0f));		/*</div><div class='del'>-									 * Note on</div><div class='del'>-									 */</div><div class='del'>-		  midi_outc(orig_dev, note);</div><div class='del'>-		  midi_outc(orig_dev, velocity);</div><div class='del'>-	  }</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_start_note);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_reset(int dev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_reset);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             err;</div><div class='del'>-	struct midi_input_info *inc;</div><div class='del'>-</div><div class='del'>-	if (orig_dev &lt; 0 || orig_dev &gt;= num_midis || midi_devs[orig_dev] == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	midi2synth[orig_dev] = dev;</div><div class='del'>-	sysex_state[dev] = 0;</div><div class='del'>-	prev_out_status[orig_dev] = 0;</div><div class='del'>-</div><div class='del'>-	if ((err = midi_devs[orig_dev]-&gt;open(orig_dev, mode,</div><div class='del'>-			       midi_synth_input, midi_synth_output)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	inc = &amp;midi_devs[orig_dev]-&gt;in_info;</div><div class='del'>-</div><div class='del'>-	/* save_flags(flags);</div><div class='del'>-	cli(); </div><div class='del'>-	don't know against what irqhandler to protect*/</div><div class='del'>-	inc-&gt;m_busy = 0;</div><div class='del'>-	inc-&gt;m_state = MST_INIT;</div><div class='del'>-	inc-&gt;m_ptr = 0;</div><div class='del'>-	inc-&gt;m_left = 0;</div><div class='del'>-	inc-&gt;m_prev_status = 0x00;</div><div class='del'>-	/* restore_flags(flags); */</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_open);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_close(int dev)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Shut up the synths by sending just single active sensing message.</div><div class='del'>-	 */</div><div class='del'>-	midi_devs[orig_dev]-&gt;outputc(orig_dev, 0xfe);</div><div class='del'>-</div><div class='del'>-	midi_devs[orig_dev]-&gt;close(orig_dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_close);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_hw_control(int dev, unsigned char *event)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_hw_control);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_load_patch(int dev, int format, const char __user *addr,</div><div class='del'>-		      int offs, int count, int pmgr_flag)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	struct sysex_info sysex;</div><div class='del'>-	int             i;</div><div class='del'>-	unsigned long   left, src_offs, eox_seen = 0;</div><div class='del'>-	int             first_byte = 1;</div><div class='del'>-	int             hdr_size = (unsigned long) &amp;sysex.data[0] - (unsigned long) &amp;sysex;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	if (!prefix_cmd(orig_dev, 0xf0))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (format != SYSEX_PATCH)</div><div class='del'>-	{</div><div class='del'>-/*		  printk("MIDI Error: Invalid patch format (key) 0x%x\n", format);*/</div><div class='del'>-		  return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (count &lt; hdr_size)</div><div class='del'>-	{</div><div class='del'>-/*		printk("MIDI Error: Patch header too short\n");*/</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	count -= hdr_size;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Copy the header from user space but ignore the first bytes which have</div><div class='del'>-	 * been transferred already.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if(copy_from_user(&amp;((char *) &amp;sysex)[offs], &amp;(addr)[offs], hdr_size - offs))</div><div class='del'>-		return -EFAULT;</div><div class='del'>- </div><div class='del'>- 	if (count &lt; sysex.len)</div><div class='del'>-	{</div><div class='del'>-/*		printk(KERN_WARNING "MIDI Warning: Sysex record too short (%d&lt;%d)\n", count, (int) sysex.len);*/</div><div class='del'>-		sysex.len = count;</div><div class='del'>-	}</div><div class='del'>-  	left = sysex.len;</div><div class='del'>-  	src_offs = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; left &amp;&amp; !signal_pending(current); i++)</div><div class='del'>-	{</div><div class='del'>-		unsigned char   data;</div><div class='del'>-</div><div class='del'>-		if (get_user(data,</div><div class='del'>-		    (unsigned char __user *)(addr + hdr_size + i)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		eox_seen = (i &gt; 0 &amp;&amp; data &amp; 0x80);	/* End of sysex */</div><div class='del'>-</div><div class='del'>-		if (eox_seen &amp;&amp; data != 0xf7)</div><div class='del'>-			data = 0xf7;</div><div class='del'>-</div><div class='del'>-		if (i == 0)</div><div class='del'>-		{</div><div class='del'>-			if (data != 0xf0)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING "midi_synth: Sysex start missing\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		while (!midi_devs[orig_dev]-&gt;outputc(orig_dev, (unsigned char) (data &amp; 0xff)) &amp;&amp;</div><div class='del'>-			!signal_pending(current))</div><div class='del'>-			schedule();</div><div class='del'>-</div><div class='del'>-		if (!first_byte &amp;&amp; data &amp; 0x80)</div><div class='del'>-			return 0;</div><div class='del'>-		first_byte = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!eox_seen)</div><div class='del'>-		midi_outc(orig_dev, 0xf7);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_load_patch);</div><div class='del'>-</div><div class='del'>-void midi_synth_panning(int dev, int channel, int pressure)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_panning);</div><div class='del'>-</div><div class='del'>-void midi_synth_aftertouch(int dev, int channel, int pressure)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             msg, chn;</div><div class='del'>-</div><div class='del'>-	if (pressure &lt; 0 || pressure &gt; 127)</div><div class='del'>-		return;</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	msg = prev_out_status[orig_dev] &amp; 0xf0;</div><div class='del'>-	chn = prev_out_status[orig_dev] &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (msg != 0xd0 || chn != channel)	/*</div><div class='del'>-						 * Test for running status</div><div class='del'>-						 */</div><div class='del'>-	  {</div><div class='del'>-		  if (!prefix_cmd(orig_dev, 0xd0 | (channel &amp; 0x0f)))</div><div class='del'>-			  return;</div><div class='del'>-		  midi_outc(orig_dev, 0xd0 | (channel &amp; 0x0f));		/*</div><div class='del'>-									 * Channel pressure</div><div class='del'>-									 */</div><div class='del'>-	} else if (!prefix_cmd(orig_dev, pressure))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	midi_outc(orig_dev, pressure);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_aftertouch);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_controller(int dev, int channel, int ctrl_num, int value)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             chn, msg;</div><div class='del'>-</div><div class='del'>-	if (ctrl_num &lt; 0 || ctrl_num &gt; 127)</div><div class='del'>-		return;</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	msg = prev_out_status[orig_dev] &amp; 0xf0;</div><div class='del'>-	chn = prev_out_status[orig_dev] &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (msg != 0xb0 || chn != channel)</div><div class='del'>-	  {</div><div class='del'>-		  if (!prefix_cmd(orig_dev, 0xb0 | (channel &amp; 0x0f)))</div><div class='del'>-			  return;</div><div class='del'>-		  midi_outc(orig_dev, 0xb0 | (channel &amp; 0x0f));</div><div class='del'>-	} else if (!prefix_cmd(orig_dev, ctrl_num))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	midi_outc(orig_dev, ctrl_num);</div><div class='del'>-	midi_outc(orig_dev, value &amp; 0x7f);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_controller);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_bender(int dev, int channel, int value)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             msg, prev_chn;</div><div class='del'>-</div><div class='del'>-	if (channel &lt; 0 || channel &gt; 15)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (value &lt; 0 || value &gt; 16383)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	leave_sysex(dev);</div><div class='del'>-</div><div class='del'>-	msg = prev_out_status[orig_dev] &amp; 0xf0;</div><div class='del'>-	prev_chn = prev_out_status[orig_dev] &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (msg != 0xd0 || prev_chn != channel)		/*</div><div class='del'>-							 * Test for running status</div><div class='del'>-							 */</div><div class='del'>-	  {</div><div class='del'>-		  if (!prefix_cmd(orig_dev, 0xe0 | (channel &amp; 0x0f)))</div><div class='del'>-			  return;</div><div class='del'>-		  midi_outc(orig_dev, 0xe0 | (channel &amp; 0x0f));</div><div class='del'>-	} else if (!prefix_cmd(orig_dev, value &amp; 0x7f))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	midi_outc(orig_dev, value &amp; 0x7f);</div><div class='del'>-	midi_outc(orig_dev, (value &gt;&gt; 7) &amp; 0x7f);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_bender);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-midi_synth_setup_voice(int dev, int voice, int channel)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_setup_voice);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-midi_synth_send_sysex(int dev, unsigned char *bytes, int len)</div><div class='del'>-{</div><div class='del'>-	int             orig_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-	int             i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-	  {</div><div class='del'>-		  switch (bytes[i])</div><div class='del'>-		    {</div><div class='del'>-		    case 0xf0:	/* Start sysex */</div><div class='del'>-			    if (!prefix_cmd(orig_dev, 0xf0))</div><div class='del'>-				    return 0;</div><div class='del'>-			    sysex_state[dev] = 1;</div><div class='del'>-			    break;</div><div class='del'>-</div><div class='del'>-		    case 0xf7:	/* End sysex */</div><div class='del'>-			    if (!sysex_state[dev])	/* Orphan sysex end */</div><div class='del'>-				    return 0;</div><div class='del'>-			    sysex_state[dev] = 0;</div><div class='del'>-			    break;</div><div class='del'>-</div><div class='del'>-		    default:</div><div class='del'>-			    if (!sysex_state[dev])</div><div class='del'>-				    return 0;</div><div class='del'>-</div><div class='del'>-			    if (bytes[i] &amp; 0x80)	/* Error. Another message before sysex end */</div><div class='del'>-			      {</div><div class='del'>-				      bytes[i] = 0xf7;	/* Sysex end */</div><div class='del'>-				      sysex_state[dev] = 0;</div><div class='del'>-			      }</div><div class='del'>-		    }</div><div class='del'>-</div><div class='del'>-		  if (!midi_devs[orig_dev]-&gt;outputc(orig_dev, bytes[i]))</div><div class='del'>-		    {</div><div class='del'>-/*</div><div class='del'>- * Hardware level buffer is full. Abort the sysex message.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-			    int             timeout = 0;</div><div class='del'>-</div><div class='del'>-			    bytes[i] = 0xf7;</div><div class='del'>-			    sysex_state[dev] = 0;</div><div class='del'>-</div><div class='del'>-			    while (!midi_devs[orig_dev]-&gt;outputc(orig_dev, bytes[i]) &amp;&amp;</div><div class='del'>-				   timeout &lt; 1000)</div><div class='del'>-				    timeout++;</div><div class='del'>-		    }</div><div class='del'>-		  if (!sysex_state[dev])</div><div class='del'>-			  return 0;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(midi_synth_send_sysex);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/midi_synth.h b/sound/oss/midi_synth.h<br/>deleted file mode 100644<br/>index 6bc9d00bc77c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/midi_synth.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midi_synth.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-int midi_synth_ioctl (int dev,</div><div class='del'>-	    unsigned int cmd, void __user * arg);</div><div class='del'>-int midi_synth_kill_note (int dev, int channel, int note, int velocity);</div><div class='del'>-int midi_synth_set_instr (int dev, int channel, int instr_no);</div><div class='del'>-int midi_synth_start_note (int dev, int channel, int note, int volume);</div><div class='del'>-void midi_synth_reset (int dev);</div><div class='del'>-int midi_synth_open (int dev, int mode);</div><div class='del'>-void midi_synth_close (int dev);</div><div class='del'>-void midi_synth_hw_control (int dev, unsigned char *event);</div><div class='del'>-int midi_synth_load_patch (int dev, int format, const char __user * addr,</div><div class='del'>-		 int offs, int count, int pmgr_flag);</div><div class='del'>-void midi_synth_panning (int dev, int channel, int pressure);</div><div class='del'>-void midi_synth_aftertouch (int dev, int channel, int pressure);</div><div class='del'>-void midi_synth_controller (int dev, int channel, int ctrl_num, int value);</div><div class='del'>-void midi_synth_bender (int dev, int chn, int value);</div><div class='del'>-void midi_synth_setup_voice (int dev, int voice, int chn);</div><div class='del'>-int midi_synth_send_sysex(int dev, unsigned char *bytes,int len);</div><div class='del'>-</div><div class='del'>-#ifndef _MIDI_SYNTH_C_</div><div class='del'>-static struct synth_info std_synth_info =</div><div class='del'>-{MIDI_SYNTH_NAME, 0, SYNTH_TYPE_MIDI, 0, 0, 128, 0, 128, MIDI_SYNTH_CAPS};</div><div class='del'>-</div><div class='del'>-static struct synth_operations std_midi_synth =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.id		= "MIDI",</div><div class='del'>-	.info		= &amp;std_synth_info,</div><div class='del'>-	.midi_dev	= 0,</div><div class='del'>-	.synth_type	= SYNTH_TYPE_MIDI,</div><div class='del'>-	.synth_subtype	= 0,</div><div class='del'>-	.open		= midi_synth_open,</div><div class='del'>-	.close		= midi_synth_close,</div><div class='del'>-	.ioctl		= midi_synth_ioctl,</div><div class='del'>-	.kill_note	= midi_synth_kill_note,</div><div class='del'>-	.start_note	= midi_synth_start_note,</div><div class='del'>-	.set_instr	= midi_synth_set_instr,</div><div class='del'>-	.reset		= midi_synth_reset,</div><div class='del'>-	.hw_control	= midi_synth_hw_control,</div><div class='del'>-	.load_patch	= midi_synth_load_patch,</div><div class='del'>-	.aftertouch	= midi_synth_aftertouch,</div><div class='del'>-	.controller	= midi_synth_controller,</div><div class='del'>-	.panning		= midi_synth_panning,</div><div class='del'>-	.bender		= midi_synth_bender,</div><div class='del'>-	.setup_voice	= midi_synth_setup_voice,</div><div class='del'>-	.send_sysex	= midi_synth_send_sysex</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c<br/>deleted file mode 100644<br/>index 782b3b84dac6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/midibuf.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/midibuf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,425 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/midibuf.c</div><div class='del'>- *</div><div class='del'>- * Device file manager for /dev/midi#</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#define MIDIBUF_C</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Don't make MAX_QUEUE_SIZE larger than 4000</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define MAX_QUEUE_SIZE	4000</div><div class='del'>-</div><div class='del'>-static wait_queue_head_t midi_sleeper[MAX_MIDI_DEV];</div><div class='del'>-static wait_queue_head_t input_sleeper[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-struct midi_buf</div><div class='del'>-{</div><div class='del'>-	int len, head, tail;</div><div class='del'>-	unsigned char queue[MAX_QUEUE_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct midi_parms</div><div class='del'>-{</div><div class='del'>-	long prech_timeout;	/*</div><div class='del'>-				 * Timeout before the first ch</div><div class='del'>-				 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct midi_buf *midi_out_buf[MAX_MIDI_DEV] = {NULL};</div><div class='del'>-static struct midi_buf *midi_in_buf[MAX_MIDI_DEV] = {NULL};</div><div class='del'>-static struct midi_parms parms[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static void midi_poll(unsigned long dummy);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static DEFINE_TIMER(poll_timer, midi_poll, 0, 0);</div><div class='del'>-</div><div class='del'>-static volatile int open_devs;</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-#define DATA_AVAIL(q) (q-&gt;len)</div><div class='del'>-#define SPACE_AVAIL(q) (MAX_QUEUE_SIZE - q-&gt;len)</div><div class='del'>-</div><div class='del'>-#define QUEUE_BYTE(q, data) \</div><div class='del'>-	if (SPACE_AVAIL(q)) \</div><div class='del'>-	{ \</div><div class='del'>-	  unsigned long flags; \</div><div class='del'>-	  spin_lock_irqsave(&amp;lock, flags); \</div><div class='del'>-	  q-&gt;queue[q-&gt;tail] = (data); \</div><div class='del'>-	  q-&gt;len++; q-&gt;tail = (q-&gt;tail+1) % MAX_QUEUE_SIZE; \</div><div class='del'>-	  spin_unlock_irqrestore(&amp;lock, flags); \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define REMOVE_BYTE(q, data) \</div><div class='del'>-	if (DATA_AVAIL(q)) \</div><div class='del'>-	{ \</div><div class='del'>-	  unsigned long flags; \</div><div class='del'>-	  spin_lock_irqsave(&amp;lock, flags); \</div><div class='del'>-	  data = q-&gt;queue[q-&gt;head]; \</div><div class='del'>-	  q-&gt;len--; q-&gt;head = (q-&gt;head+1) % MAX_QUEUE_SIZE; \</div><div class='del'>-	  spin_unlock_irqrestore(&amp;lock, flags); \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static void drain_midi_queue(int dev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Give the Midi driver time to drain its output queues</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (midi_devs[dev]-&gt;buffer_status != NULL)</div><div class='del'>-		while (!signal_pending(current) &amp;&amp; midi_devs[dev]-&gt;buffer_status(dev)) </div><div class='del'>-			interruptible_sleep_on_timeout(&amp;midi_sleeper[dev],</div><div class='del'>-						       HZ/10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void midi_input_intr(int dev, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	if (midi_in_buf[dev] == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (data == 0xfe)	/*</div><div class='del'>-				 * Active sensing</div><div class='del'>-				 */</div><div class='del'>-		return;		/*</div><div class='del'>-				 * Ignore</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-	if (SPACE_AVAIL(midi_in_buf[dev])) {</div><div class='del'>-		QUEUE_BYTE(midi_in_buf[dev], data);</div><div class='del'>-		wake_up(&amp;input_sleeper[dev]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void midi_output_intr(int dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Currently NOP</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void midi_poll(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	int             dev;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-	if (open_devs)</div><div class='del'>-	{</div><div class='del'>-		for (dev = 0; dev &lt; num_midis; dev++)</div><div class='del'>-			if (midi_devs[dev] != NULL &amp;&amp; midi_out_buf[dev] != NULL)</div><div class='del'>-			{</div><div class='del'>-				while (DATA_AVAIL(midi_out_buf[dev]))</div><div class='del'>-				{</div><div class='del'>-					int ok;</div><div class='del'>-					int c = midi_out_buf[dev]-&gt;queue[midi_out_buf[dev]-&gt;head];</div><div class='del'>-</div><div class='del'>-					spin_unlock_irqrestore(&amp;lock,flags);/* Give some time to others */</div><div class='del'>-					ok = midi_devs[dev]-&gt;outputc(dev, c);</div><div class='del'>-					spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-					if (!ok)</div><div class='del'>-						break;</div><div class='del'>-					midi_out_buf[dev]-&gt;head = (midi_out_buf[dev]-&gt;head + 1) % MAX_QUEUE_SIZE;</div><div class='del'>-					midi_out_buf[dev]-&gt;len--;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (DATA_AVAIL(midi_out_buf[dev]) &lt; 100)</div><div class='del'>-					wake_up(&amp;midi_sleeper[dev]);</div><div class='del'>-			}</div><div class='del'>-		poll_timer.expires = (1) + jiffies;</div><div class='del'>-		add_timer(&amp;poll_timer);</div><div class='del'>-		/*</div><div class='del'>-		 * Come back later</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int MIDIbuf_open(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int mode, err;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-	mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	if (num_midis &gt; MAX_MIDI_DEV)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "midi: Too many midi interfaces\n");</div><div class='del'>-		num_midis = MAX_MIDI_DEV;</div><div class='del'>-	}</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_midis || midi_devs[dev] == NULL)</div><div class='del'>-		  return -ENXIO;</div><div class='del'>-	/*</div><div class='del'>-	 *    Interrupts disabled. Be careful</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	module_put(midi_devs[dev]-&gt;owner);</div><div class='del'>-</div><div class='del'>-	if ((err = midi_devs[dev]-&gt;open(dev, mode,</div><div class='del'>-				 midi_input_intr, midi_output_intr)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	parms[dev].prech_timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-	midi_in_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));</div><div class='del'>-</div><div class='del'>-	if (midi_in_buf[dev] == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "midi: Can't allocate buffer\n");</div><div class='del'>-		midi_devs[dev]-&gt;close(dev);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	midi_in_buf[dev]-&gt;len = midi_in_buf[dev]-&gt;head = midi_in_buf[dev]-&gt;tail = 0;</div><div class='del'>-</div><div class='del'>-	midi_out_buf[dev] = (struct midi_buf *) vmalloc(sizeof(struct midi_buf));</div><div class='del'>-</div><div class='del'>-	if (midi_out_buf[dev] == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "midi: Can't allocate buffer\n");</div><div class='del'>-		midi_devs[dev]-&gt;close(dev);</div><div class='del'>-		vfree(midi_in_buf[dev]);</div><div class='del'>-		midi_in_buf[dev] = NULL;</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	midi_out_buf[dev]-&gt;len = midi_out_buf[dev]-&gt;head = midi_out_buf[dev]-&gt;tail = 0;</div><div class='del'>-	open_devs++;</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;midi_sleeper[dev]);</div><div class='del'>-	init_waitqueue_head(&amp;input_sleeper[dev]);</div><div class='del'>-</div><div class='del'>-	if (open_devs &lt; 2)	/* This was first open */</div><div class='del'>-	{</div><div class='del'>-		poll_timer.expires = 1 + jiffies;</div><div class='del'>-		add_timer(&amp;poll_timer);	/* Start polling */</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void MIDIbuf_release(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int mode;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-	mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_midis || midi_devs[dev] == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait until the queue is empty</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (mode != OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		midi_devs[dev]-&gt;outputc(dev, 0xfe);	/*</div><div class='del'>-							   * Active sensing to shut the</div><div class='del'>-							   * devices</div><div class='del'>-							 */</div><div class='del'>-</div><div class='del'>-		while (!signal_pending(current) &amp;&amp; DATA_AVAIL(midi_out_buf[dev]))</div><div class='del'>-			  interruptible_sleep_on(&amp;midi_sleeper[dev]);</div><div class='del'>-		/*</div><div class='del'>-		 *	Sync</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		drain_midi_queue(dev);	/*</div><div class='del'>-					 * Ensure the output queues are empty</div><div class='del'>-					 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	midi_devs[dev]-&gt;close(dev);</div><div class='del'>-</div><div class='del'>-	open_devs--;</div><div class='del'>-	if (open_devs == 0)</div><div class='del'>-		del_timer_sync(&amp;poll_timer);</div><div class='del'>-	vfree(midi_in_buf[dev]);</div><div class='del'>-	vfree(midi_out_buf[dev]);</div><div class='del'>-	midi_in_buf[dev] = NULL;</div><div class='del'>-	midi_out_buf[dev] = NULL;</div><div class='del'>-</div><div class='del'>-	module_put(midi_devs[dev]-&gt;owner);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int MIDIbuf_write(int dev, struct file *file, const char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int c, n, i;</div><div class='del'>-	unsigned char tmp_data;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	c = 0;</div><div class='del'>-</div><div class='del'>-	while (c &lt; count)</div><div class='del'>-	{</div><div class='del'>-		n = SPACE_AVAIL(midi_out_buf[dev]);</div><div class='del'>-</div><div class='del'>-		if (n == 0) {	/*</div><div class='del'>-				 * No space just now.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				c = -EAGAIN;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			interruptible_sleep_on(&amp;midi_sleeper[dev]);</div><div class='del'>-			if (signal_pending(current)) </div><div class='del'>-			{</div><div class='del'>-				c = -EINTR;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			n = SPACE_AVAIL(midi_out_buf[dev]);</div><div class='del'>-		}</div><div class='del'>-		if (n &gt; (count - c))</div><div class='del'>-			n = count - c;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; n; i++)</div><div class='del'>-		{</div><div class='del'>-			/* BROKE BROKE BROKE - CANT DO THIS WITH CLI !! */</div><div class='del'>-			/* yes, think the same, so I removed the cli() brackets </div><div class='del'>-				QUEUE_BYTE is protected against interrupts */</div><div class='del'>-			if (copy_from_user((char *) &amp;tmp_data, &amp;(buf)[c], 1)) {</div><div class='del'>-				c = -EFAULT;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			QUEUE_BYTE(midi_out_buf[dev], tmp_data);</div><div class='del'>-			c++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int MIDIbuf_read(int dev, struct file *file, char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int n, c = 0;</div><div class='del'>-	unsigned char tmp_data;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (!DATA_AVAIL(midi_in_buf[dev])) {	/*</div><div class='del'>-						 * No data yet, wait</div><div class='del'>-						 */</div><div class='del'>- 		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>- 			c = -EAGAIN;</div><div class='del'>-			goto out;</div><div class='del'>- 		}</div><div class='del'>-		interruptible_sleep_on_timeout(&amp;input_sleeper[dev],</div><div class='del'>-					       parms[dev].prech_timeout);</div><div class='del'>-</div><div class='del'>-		if (signal_pending(current))</div><div class='del'>-			c = -EINTR;	/* The user is getting restless */</div><div class='del'>-	}</div><div class='del'>-	if (c == 0 &amp;&amp; DATA_AVAIL(midi_in_buf[dev]))	/*</div><div class='del'>-							 * Got some bytes</div><div class='del'>-							 */</div><div class='del'>-	{</div><div class='del'>-		n = DATA_AVAIL(midi_in_buf[dev]);</div><div class='del'>-		if (n &gt; count)</div><div class='del'>-			n = count;</div><div class='del'>-		c = 0;</div><div class='del'>-</div><div class='del'>-		while (c &lt; n)</div><div class='del'>-		{</div><div class='del'>-			char *fixit;</div><div class='del'>-			REMOVE_BYTE(midi_in_buf[dev], tmp_data);</div><div class='del'>-			fixit = (char *) &amp;tmp_data;</div><div class='del'>-			/* BROKE BROKE BROKE */</div><div class='del'>-			/* yes removed the cli() brackets again</div><div class='del'>-			 should q-&gt;len,tail&amp;head be atomic_t? */</div><div class='del'>-			if (copy_to_user(&amp;(buf)[c], fixit, 1)) {</div><div class='del'>-				c = -EFAULT;</div><div class='del'>-				goto out;</div><div class='del'>-			}</div><div class='del'>-			c++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int MIDIbuf_ioctl(int dev, struct file *file,</div><div class='del'>-		  unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-	</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) == 'C') </div><div class='del'>-	{</div><div class='del'>-		if (midi_devs[dev]-&gt;coproc)	/* Coprocessor ioctl */</div><div class='del'>-			return midi_devs[dev]-&gt;coproc-&gt;ioctl(midi_devs[dev]-&gt;coproc-&gt;devc, cmd, arg, 0);</div><div class='del'>-/*		printk("/dev/midi%d: No coprocessor for this device\n", dev);*/</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		switch (cmd) </div><div class='del'>-		{</div><div class='del'>-			case SNDCTL_MIDI_PRETIME:</div><div class='del'>-				if (get_user(val, (int __user *)arg))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				if (val &lt; 0)</div><div class='del'>-					val = 0;</div><div class='del'>-				val = (HZ * val) / 10;</div><div class='del'>-				parms[dev].prech_timeout = val;</div><div class='del'>-				return put_user(val, (int __user *)arg);</div><div class='del'>-			</div><div class='del'>-			default:</div><div class='del'>-				if (!midi_devs[dev]-&gt;ioctl)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				return midi_devs[dev]-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No kernel lock - fine */</div><div class='del'>-unsigned int MIDIbuf_poll(int dev, struct file *file, poll_table * wait)</div><div class='del'>-{</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	/* input */</div><div class='del'>-	poll_wait(file, &amp;input_sleeper[dev], wait);</div><div class='del'>-	if (DATA_AVAIL(midi_in_buf[dev]))</div><div class='del'>-		mask |= POLLIN | POLLRDNORM;</div><div class='del'>-</div><div class='del'>-	/* output */</div><div class='del'>-	poll_wait(file, &amp;midi_sleeper[dev], wait);</div><div class='del'>-	if (!SPACE_AVAIL(midi_out_buf[dev]))</div><div class='del'>-		mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-	</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int MIDIbuf_avail(int dev)</div><div class='del'>-{</div><div class='del'>-	if (midi_in_buf[dev])</div><div class='del'>-		return DATA_AVAIL (midi_in_buf[dev]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(MIDIbuf_avail);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c<br/>deleted file mode 100644<br/>index 25e4609f8339..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/mpu401.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/mpu401.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1806 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/mpu401.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for Roland MPU-401 compatible Midi cards.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer	ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Alan Cox		modularisation, use normal request_irq, use dev_id</div><div class='del'>- * Bartlomiej Zolnierkiewicz	removed some __init to allow using many drivers</div><div class='del'>- * Chris Rankin		Update the module-usage counter for the coprocessor</div><div class='del'>- * Zwane Mwaikambo	Changed attach/unload resource freeing</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#define USE_SEQ_MACROS</div><div class='del'>-#define USE_SIMPLE_MACROS</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "coproc.h"</div><div class='del'>-#include "mpu401.h"</div><div class='del'>-</div><div class='del'>-static int      timer_mode = TMR_INTERNAL, timer_caps = TMR_INTERNAL;</div><div class='del'>-</div><div class='del'>-struct mpu_config</div><div class='del'>-{</div><div class='del'>-	int             base;	/*</div><div class='del'>-				 * I/O base</div><div class='del'>-				 */</div><div class='del'>-	int             irq;</div><div class='del'>-	int             opened;	/*</div><div class='del'>-				 * Open mode</div><div class='del'>-				 */</div><div class='del'>-	int             devno;</div><div class='del'>-	int             synthno;</div><div class='del'>-	int             uart_mode;</div><div class='del'>-	int             initialized;</div><div class='del'>-	int             mode;</div><div class='del'>-#define MODE_MIDI	1</div><div class='del'>-#define MODE_SYNTH	2</div><div class='del'>-	unsigned char   version, revision;</div><div class='del'>-	unsigned int    capabilities;</div><div class='del'>-#define MPU_CAP_INTLG	0x10000000</div><div class='del'>-#define MPU_CAP_SYNC	0x00000010</div><div class='del'>-#define MPU_CAP_FSK	0x00000020</div><div class='del'>-#define MPU_CAP_CLS	0x00000040</div><div class='del'>-#define MPU_CAP_SMPTE 	0x00000080</div><div class='del'>-#define MPU_CAP_2PORT	0x00000001</div><div class='del'>-	int             timer_flag;</div><div class='del'>-</div><div class='del'>-#define MBUF_MAX	10</div><div class='del'>-#define BUFTEST(dc) if (dc-&gt;m_ptr &gt;= MBUF_MAX || dc-&gt;m_ptr &lt; 0) \</div><div class='del'>-	{printk( "MPU: Invalid buffer pointer %d/%d, s=%d\n",  dc-&gt;m_ptr,  dc-&gt;m_left,  dc-&gt;m_state);dc-&gt;m_ptr--;}</div><div class='del'>-	  int             m_busy;</div><div class='del'>-	  unsigned char   m_buf[MBUF_MAX];</div><div class='del'>-	  int             m_ptr;</div><div class='del'>-	  int             m_state;</div><div class='del'>-	  int             m_left;</div><div class='del'>-	  unsigned char   last_status;</div><div class='del'>-	  void            (*inputintr) (int dev, unsigned char data);</div><div class='del'>-	  int             shared_irq;</div><div class='del'>-	  int            *osp;</div><div class='del'>-	  spinlock_t	lock;</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-#define	DATAPORT(base)   (base)</div><div class='del'>-#define	COMDPORT(base)   (base+1)</div><div class='del'>-#define	STATPORT(base)   (base+1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void mpu401_close(int dev);</div><div class='del'>-</div><div class='del'>-static inline int mpu401_status(struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	return inb(STATPORT(devc-&gt;base));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define input_avail(devc)		(!(mpu401_status(devc)&amp;INPUT_AVAIL))</div><div class='del'>-#define output_ready(devc)		(!(mpu401_status(devc)&amp;OUTPUT_READY))</div><div class='del'>-</div><div class='del'>-static inline void write_command(struct mpu_config *devc, unsigned char cmd)</div><div class='del'>-{</div><div class='del'>-	outb(cmd, COMDPORT(devc-&gt;base));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int read_data(struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	return inb(DATAPORT(devc-&gt;base));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void write_data(struct mpu_config *devc, unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	outb(byte, DATAPORT(devc-&gt;base));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define	OUTPUT_READY	0x40</div><div class='del'>-#define	INPUT_AVAIL	0x80</div><div class='del'>-#define	MPU_ACK		0xFE</div><div class='del'>-#define	MPU_RESET	0xFF</div><div class='del'>-#define	UART_MODE_ON	0x3F</div><div class='del'>-</div><div class='del'>-static struct mpu_config dev_conf[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static int n_mpu_devs;</div><div class='del'>-</div><div class='del'>-static int reset_mpu401(struct mpu_config *devc);</div><div class='del'>-static void set_uart_mode(int dev, struct mpu_config *devc, int arg);</div><div class='del'>-</div><div class='del'>-static int mpu_timer_init(int midi_dev);</div><div class='del'>-static void mpu_timer_interrupt(void);</div><div class='del'>-static void timer_ext_event(struct mpu_config *devc, int event, int parm);</div><div class='del'>-</div><div class='del'>-static struct synth_info mpu_synth_info_proto = {</div><div class='del'>-	"MPU-401 MIDI interface", </div><div class='del'>-	0, </div><div class='del'>-	SYNTH_TYPE_MIDI, </div><div class='del'>-	MIDI_TYPE_MPU401, </div><div class='del'>-	0, 128, </div><div class='del'>-	0, 128, </div><div class='del'>-	SYNTH_CAP_INPUT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct synth_info mpu_synth_info[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * States for the input scanner</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ST_INIT			0	/* Ready for timing byte or msg */</div><div class='del'>-#define ST_TIMED		1	/* Leading timing byte rcvd */</div><div class='del'>-#define ST_DATABYTE		2	/* Waiting for (nr_left) data bytes */</div><div class='del'>-</div><div class='del'>-#define ST_SYSMSG		100	/* System message (sysx etc). */</div><div class='del'>-#define ST_SYSEX		101	/* System exclusive msg */</div><div class='del'>-#define ST_MTC			102	/* Midi Time Code (MTC) qframe msg */</div><div class='del'>-#define ST_SONGSEL		103	/* Song select */</div><div class='del'>-#define ST_SONGPOS		104	/* Song position pointer */</div><div class='del'>-</div><div class='del'>-static unsigned char len_tab[] =	/* # of data bytes following a status</div><div class='del'>-					 */</div><div class='del'>-{</div><div class='del'>-	2,			/* 8x */</div><div class='del'>-	2,			/* 9x */</div><div class='del'>-	2,			/* Ax */</div><div class='del'>-	2,			/* Bx */</div><div class='del'>-	1,			/* Cx */</div><div class='del'>-	1,			/* Dx */</div><div class='del'>-	2,			/* Ex */</div><div class='del'>-	0			/* Fx */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STORE(cmd) \</div><div class='del'>-{ \</div><div class='del'>-	int len; \</div><div class='del'>-	unsigned char obuf[8]; \</div><div class='del'>-	cmd; \</div><div class='del'>-	seq_input_event(obuf, len); \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define _seqbuf obuf</div><div class='del'>-#define _seqbufptr 0</div><div class='del'>-#define _SEQ_ADVBUF(x) len=x</div><div class='del'>-</div><div class='del'>-static int mpu_input_scanner(struct mpu_config *devc, unsigned char midic)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;m_state)</div><div class='del'>-	{</div><div class='del'>-		case ST_INIT:</div><div class='del'>-			switch (midic)</div><div class='del'>-			{</div><div class='del'>-				case 0xf8:</div><div class='del'>-				/* Timer overflow */</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xfc:</div><div class='del'>-					printk("&lt;all end&gt;");</div><div class='del'>-			 		break;</div><div class='del'>-</div><div class='del'>-				case 0xfd:</div><div class='del'>-					if (devc-&gt;timer_flag)</div><div class='del'>-						mpu_timer_interrupt();</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xfe:</div><div class='del'>-					return MPU_ACK;</div><div class='del'>-</div><div class='del'>-				case 0xf0:</div><div class='del'>-				case 0xf1:</div><div class='del'>-				case 0xf2:</div><div class='del'>-				case 0xf3:</div><div class='del'>-				case 0xf4:</div><div class='del'>-				case 0xf5:</div><div class='del'>-				case 0xf6:</div><div class='del'>-				case 0xf7:</div><div class='del'>-					printk("&lt;Trk data rq #%d&gt;", midic &amp; 0x0f);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xf9:</div><div class='del'>-					printk("&lt;conductor rq&gt;");</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xff:</div><div class='del'>-					devc-&gt;m_state = ST_SYSMSG;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					if (midic &lt;= 0xef)</div><div class='del'>-					{</div><div class='del'>-						/* printk( "mpu time: %d ",  midic); */</div><div class='del'>-						devc-&gt;m_state = ST_TIMED;</div><div class='del'>-					}</div><div class='del'>-					else</div><div class='del'>-						printk("&lt;MPU: Unknown event %02x&gt; ", midic);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_TIMED:</div><div class='del'>-			{</div><div class='del'>-				int msg = ((int) (midic &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-				devc-&gt;m_state = ST_DATABYTE;</div><div class='del'>-</div><div class='del'>-				if (msg &lt; 8)	/* Data byte */</div><div class='del'>-				{</div><div class='del'>-					/* printk( "midi msg (running status) "); */</div><div class='del'>-					msg = ((int) (devc-&gt;last_status &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-					msg -= 8;</div><div class='del'>-					devc-&gt;m_left = len_tab[msg] - 1;</div><div class='del'>-</div><div class='del'>-					devc-&gt;m_ptr = 2;</div><div class='del'>-					devc-&gt;m_buf[0] = devc-&gt;last_status;</div><div class='del'>-					devc-&gt;m_buf[1] = midic;</div><div class='del'>-</div><div class='del'>-					if (devc-&gt;m_left &lt;= 0)</div><div class='del'>-					{</div><div class='del'>-						devc-&gt;m_state = ST_INIT;</div><div class='del'>-						do_midi_msg(devc-&gt;synthno, devc-&gt;m_buf, devc-&gt;m_ptr);</div><div class='del'>-						devc-&gt;m_ptr = 0;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				else if (msg == 0xf)	/* MPU MARK */</div><div class='del'>-				{</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-</div><div class='del'>-					switch (midic)</div><div class='del'>-					{</div><div class='del'>-						case 0xf8:</div><div class='del'>-							/* printk( "NOP "); */</div><div class='del'>-							break;</div><div class='del'>-</div><div class='del'>-						case 0xf9:</div><div class='del'>-							/* printk( "meas end "); */</div><div class='del'>-							break;</div><div class='del'>-</div><div class='del'>-						case 0xfc:</div><div class='del'>-							/* printk( "data end "); */</div><div class='del'>-							break;</div><div class='del'>-</div><div class='del'>-						default:</div><div class='del'>-							printk("Unknown MPU mark %02x\n", midic);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					devc-&gt;last_status = midic;</div><div class='del'>-					/* printk( "midi msg "); */</div><div class='del'>-					msg -= 8;</div><div class='del'>-					devc-&gt;m_left = len_tab[msg];</div><div class='del'>-</div><div class='del'>-					devc-&gt;m_ptr = 1;</div><div class='del'>-					devc-&gt;m_buf[0] = midic;</div><div class='del'>-</div><div class='del'>-					if (devc-&gt;m_left &lt;= 0)</div><div class='del'>-					{</div><div class='del'>-						devc-&gt;m_state = ST_INIT;</div><div class='del'>-						do_midi_msg(devc-&gt;synthno, devc-&gt;m_buf, devc-&gt;m_ptr);</div><div class='del'>-						devc-&gt;m_ptr = 0;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_SYSMSG:</div><div class='del'>-			switch (midic)</div><div class='del'>-			{</div><div class='del'>-				case 0xf0:</div><div class='del'>-					printk("&lt;SYX&gt;");</div><div class='del'>-					devc-&gt;m_state = ST_SYSEX;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xf1:</div><div class='del'>-					devc-&gt;m_state = ST_MTC;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xf2:</div><div class='del'>-					devc-&gt;m_state = ST_SONGPOS;</div><div class='del'>-					devc-&gt;m_ptr = 0;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xf3:</div><div class='del'>-					devc-&gt;m_state = ST_SONGSEL;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xf6:</div><div class='del'>-					/* printk( "tune_request\n"); */</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-</div><div class='del'>-					/*</div><div class='del'>-					 *    Real time messages</div><div class='del'>-					 */</div><div class='del'>-				case 0xf8:</div><div class='del'>-					/* midi clock */</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					timer_ext_event(devc, TMR_CLOCK, 0);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xfA:</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					timer_ext_event(devc, TMR_START, 0);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xFB:</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					timer_ext_event(devc, TMR_CONTINUE, 0);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xFC:</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					timer_ext_event(devc, TMR_STOP, 0);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xFE:</div><div class='del'>-					/* active sensing */</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case 0xff:</div><div class='del'>-					/* printk( "midi hard reset"); */</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					printk("unknown MIDI sysmsg %0x\n", midic);</div><div class='del'>-					devc-&gt;m_state = ST_INIT;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_MTC:</div><div class='del'>-			devc-&gt;m_state = ST_INIT;</div><div class='del'>-			printk("MTC frame %x02\n", midic);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_SYSEX:</div><div class='del'>-			if (midic == 0xf7)</div><div class='del'>-			{</div><div class='del'>-				printk("&lt;EOX&gt;");</div><div class='del'>-				devc-&gt;m_state = ST_INIT;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				printk("%02x ", midic);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_SONGPOS:</div><div class='del'>-			BUFTEST(devc);</div><div class='del'>-			devc-&gt;m_buf[devc-&gt;m_ptr++] = midic;</div><div class='del'>-			if (devc-&gt;m_ptr == 2)</div><div class='del'>-			{</div><div class='del'>-				devc-&gt;m_state = ST_INIT;</div><div class='del'>-				devc-&gt;m_ptr = 0;</div><div class='del'>-				timer_ext_event(devc, TMR_SPP,</div><div class='del'>-					((devc-&gt;m_buf[1] &amp; 0x7f) &lt;&lt; 7) |</div><div class='del'>-					(devc-&gt;m_buf[0] &amp; 0x7f));</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ST_DATABYTE:</div><div class='del'>-			BUFTEST(devc);</div><div class='del'>-			devc-&gt;m_buf[devc-&gt;m_ptr++] = midic;</div><div class='del'>-			if ((--devc-&gt;m_left) &lt;= 0)</div><div class='del'>-			{</div><div class='del'>-				devc-&gt;m_state = ST_INIT;</div><div class='del'>-				do_midi_msg(devc-&gt;synthno, devc-&gt;m_buf, devc-&gt;m_ptr);</div><div class='del'>-				devc-&gt;m_ptr = 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			printk("Bad state %d ", devc-&gt;m_state);</div><div class='del'>-			devc-&gt;m_state = ST_INIT;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu401_input_loop(struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int busy;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	busy = devc-&gt;m_busy;</div><div class='del'>-	devc-&gt;m_busy = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (busy)		/* Already inside the scanner */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	n = 50;</div><div class='del'>-</div><div class='del'>-	while (input_avail(devc) &amp;&amp; n-- &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		unsigned char c = read_data(devc);</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;mode == MODE_SYNTH)</div><div class='del'>-		{</div><div class='del'>-			mpu_input_scanner(devc, c);</div><div class='del'>-		}</div><div class='del'>-		else if (devc-&gt;opened &amp; OPEN_READ &amp;&amp; devc-&gt;inputintr != NULL)</div><div class='del'>-			devc-&gt;inputintr(devc-&gt;devno, c);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;m_busy = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t mpuintr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	int dev = (int)(unsigned long) dev_id;</div><div class='del'>-	int handled = 0;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-</div><div class='del'>-	if (input_avail(devc))</div><div class='del'>-	{</div><div class='del'>-		handled = 1;</div><div class='del'>-		if (devc-&gt;base != 0 &amp;&amp; (devc-&gt;opened &amp; OPEN_READ || devc-&gt;mode == MODE_SYNTH))</div><div class='del'>-			mpu401_input_loop(devc);</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/* Dummy read (just to acknowledge the interrupt) */</div><div class='del'>-			read_data(devc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return IRQ_RETVAL(handled);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_open(int dev, int mode,</div><div class='del'>-	    void            (*input) (int dev, unsigned char data),</div><div class='del'>-	    void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	struct coproc_operations *coprocessor;</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_midis || midi_devs[dev] == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-		  return -EBUSY;</div><div class='del'>-	/*</div><div class='del'>-	 *  Verify that the device is really running.</div><div class='del'>-	 *  Some devices (such as Ensoniq SoundScape don't</div><div class='del'>-	 *  work before the on board processor (OBP) is initialized</div><div class='del'>-	 *  by downloading its microcode.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;initialized)</div><div class='del'>-	{</div><div class='del'>-		if (mpu401_status(devc) == 0xff)	/* Bus float */</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "mpu401: Device not initialized properly\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		reset_mpu401(devc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( (coprocessor = midi_devs[dev]-&gt;coproc) != NULL )</div><div class='del'>-	{</div><div class='del'>-		if (!try_module_get(coprocessor-&gt;owner)) {</div><div class='del'>-			mpu401_close(dev);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((err = coprocessor-&gt;open(coprocessor-&gt;devc, COPR_MIDI)) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "MPU-401: Can't access coprocessor device\n");</div><div class='del'>-			mpu401_close(dev);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	set_uart_mode(dev, devc, 1);</div><div class='del'>-	devc-&gt;mode = MODE_MIDI;</div><div class='del'>-	devc-&gt;synthno = 0;</div><div class='del'>-</div><div class='del'>-	mpu401_input_loop(devc);</div><div class='del'>-</div><div class='del'>-	devc-&gt;inputintr = input;</div><div class='del'>-	devc-&gt;opened = mode;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu401_close(int dev)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	struct coproc_operations *coprocessor;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-	if (devc-&gt;uart_mode)</div><div class='del'>-		reset_mpu401(devc);	/*</div><div class='del'>-					 * This disables the UART mode</div><div class='del'>-					 */</div><div class='del'>-	devc-&gt;mode = 0;</div><div class='del'>-	devc-&gt;inputintr = NULL;</div><div class='del'>-</div><div class='del'>-	coprocessor = midi_devs[dev]-&gt;coproc;</div><div class='del'>-	if (coprocessor) {</div><div class='del'>-		coprocessor-&gt;close(coprocessor-&gt;devc, COPR_MIDI);</div><div class='del'>-		module_put(coprocessor-&gt;owner);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_out(int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	int timeout;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sometimes it takes about 30000 loops before the output becomes ready</div><div class='del'>-	 * (After reset). Normally it takes just about 10 loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(devc); timeout--);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	if (!output_ready(devc))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "mpu401: Send data timeout\n");</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	write_data(devc, midi_byte);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_command(int dev, mpu_command_rec * cmd)</div><div class='del'>-{</div><div class='del'>-	int i, timeout, ok;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;uart_mode)	/*</div><div class='del'>-				 * Not possible in UART mode</div><div class='del'>-				 */</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "mpu401: commands not possible in the UART mode\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Test for input since pending input seems to block the output.</div><div class='del'>-	 */</div><div class='del'>-	if (input_avail(devc))</div><div class='del'>-		mpu401_input_loop(devc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sometimes it takes about 50000 loops before the output becomes ready</div><div class='del'>-	 * (After reset). Normally it takes just about 10 loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	timeout = 50000;</div><div class='del'>-retry:</div><div class='del'>-	if (timeout-- &lt;= 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "mpu401: Command (0x%x) timeout\n", (int) cmd-&gt;cmd);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (!output_ready(devc))</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		goto retry;</div><div class='del'>-	}</div><div class='del'>-	write_command(devc, cmd-&gt;cmd);</div><div class='del'>-</div><div class='del'>-	ok = 0;</div><div class='del'>-	for (timeout = 50000; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-	{</div><div class='del'>-		if (input_avail(devc))</div><div class='del'>-		{</div><div class='del'>-			if (devc-&gt;opened &amp;&amp; devc-&gt;mode == MODE_SYNTH)</div><div class='del'>-			{</div><div class='del'>-				if (mpu_input_scanner(devc, read_data(devc)) == MPU_ACK)</div><div class='del'>-					ok = 1;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				/* Device is not currently open. Use simpler method */</div><div class='del'>-				if (read_data(devc) == MPU_ACK)</div><div class='del'>-					ok = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!ok)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (cmd-&gt;nr_args)</div><div class='del'>-	{</div><div class='del'>-		for (i = 0; i &lt; cmd-&gt;nr_args; i++)</div><div class='del'>-		{</div><div class='del'>-			for (timeout = 3000; timeout &gt; 0 &amp;&amp; !output_ready(devc); timeout--);</div><div class='del'>-</div><div class='del'>-			if (!mpu401_out(dev, cmd-&gt;data[i]))</div><div class='del'>-			{</div><div class='del'>-				spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-				printk(KERN_WARNING "mpu401: Command (0x%x), parm send failed.\n", (int) cmd-&gt;cmd);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ret = 0;</div><div class='del'>-	cmd-&gt;data[0] = 0;</div><div class='del'>-</div><div class='del'>-	if (cmd-&gt;nr_returns)</div><div class='del'>-	{</div><div class='del'>-		for (i = 0; i &lt; cmd-&gt;nr_returns; i++)</div><div class='del'>-		{</div><div class='del'>-			ok = 0;</div><div class='del'>-			for (timeout = 5000; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-				if (input_avail(devc))</div><div class='del'>-				{</div><div class='del'>-					cmd-&gt;data[i] = read_data(devc);</div><div class='del'>-					ok = 1;</div><div class='del'>-				}</div><div class='del'>-			if (!ok)</div><div class='del'>-			{</div><div class='del'>-				spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_cmd(int dev, int cmd, int data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	static mpu_command_rec rec;</div><div class='del'>-</div><div class='del'>-	rec.cmd = cmd &amp; 0xff;</div><div class='del'>-	rec.nr_args = ((cmd &amp; 0xf0) == 0xE0);</div><div class='del'>-	rec.nr_returns = ((cmd &amp; 0xf0) == 0xA0);</div><div class='del'>-	rec.data[0] = data &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if ((ret = mpu401_command(dev, &amp;rec)) &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-	return (unsigned char) rec.data[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_prefix_cmd(int dev, unsigned char status)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc = &amp;dev_conf[dev];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;uart_mode)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (status &lt; 0xf0)</div><div class='del'>-	{</div><div class='del'>-		if (mpu_cmd(dev, 0xD0, 0) &lt; 0)</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	switch (status)</div><div class='del'>-	{</div><div class='del'>-		case 0xF0:</div><div class='del'>-			if (mpu_cmd(dev, 0xDF, 0) &lt; 0)</div><div class='del'>-				return 0;</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_start_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_end_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_ioctl(int dev, unsigned cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	mpu_command_rec rec;</div><div class='del'>-	int val, ret;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[dev];</div><div class='del'>-	switch (cmd) </div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_MIDI_MPUMODE:</div><div class='del'>-			if (!(devc-&gt;capabilities &amp; MPU_CAP_INTLG)) { /* No intelligent mode */</div><div class='del'>-				printk(KERN_WARNING "mpu401: Intelligent mode not supported by the HW\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			if (get_user(val, (int __user *)arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			set_uart_mode(dev, devc, !val);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_MIDI_MPUCMD:</div><div class='del'>-			if (copy_from_user(&amp;rec, arg, sizeof(rec)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if ((ret = mpu401_command(dev, &amp;rec)) &lt; 0)</div><div class='del'>-				return ret;</div><div class='del'>-			if (copy_to_user(arg, &amp;rec, sizeof(rec)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu401_kick(int dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu401_buffer_status(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;		/*</div><div class='del'>-				 * No data in buffers</div><div class='del'>-				 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_synth_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int midi_dev;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-</div><div class='del'>-	midi_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	if (midi_dev &lt; 0 || midi_dev &gt;= num_midis || midi_devs[midi_dev] == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[midi_dev];</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_INFO:</div><div class='del'>-			if (copy_to_user(arg, &amp;mpu_synth_info[midi_dev],</div><div class='del'>-					sizeof(struct synth_info)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_MEMAVL:</div><div class='del'>-			return 0x7fffffff;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_synth_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	int midi_dev, err;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	struct coproc_operations *coprocessor;</div><div class='del'>-</div><div class='del'>-	midi_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	if (midi_dev &lt; 0 || midi_dev &gt; num_midis || midi_devs[midi_dev] == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[midi_dev];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Verify that the device is really running.</div><div class='del'>-	 *  Some devices (such as Ensoniq SoundScape don't</div><div class='del'>-	 *  work before the on board processor (OBP) is initialized</div><div class='del'>-	 *  by downloading its microcode.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;initialized)</div><div class='del'>-	{</div><div class='del'>-		if (mpu401_status(devc) == 0xff)	/* Bus float */</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "mpu401: Device not initialized properly\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		reset_mpu401(devc);</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	devc-&gt;mode = MODE_SYNTH;</div><div class='del'>-	devc-&gt;synthno = dev;</div><div class='del'>-</div><div class='del'>-	devc-&gt;inputintr = NULL;</div><div class='del'>-</div><div class='del'>-	coprocessor = midi_devs[midi_dev]-&gt;coproc;</div><div class='del'>-	if (coprocessor) {</div><div class='del'>-		if (!try_module_get(coprocessor-&gt;owner))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-</div><div class='del'>-		if ((err = coprocessor-&gt;open(coprocessor-&gt;devc, COPR_MIDI)) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "mpu401: Can't access coprocessor device\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = mode;</div><div class='del'>-	reset_mpu401(devc);</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		mpu_cmd(midi_dev, 0x8B, 0);	/* Enable data in stop mode */</div><div class='del'>-		mpu_cmd(midi_dev, 0x34, 0);	/* Return timing bytes in stop mode */</div><div class='del'>-		mpu_cmd(midi_dev, 0x87, 0);	/* Enable pitch &amp; controller */</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu_synth_close(int dev)</div><div class='del'>-{ </div><div class='del'>-	int midi_dev;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	struct coproc_operations *coprocessor;</div><div class='del'>-</div><div class='del'>-	midi_dev = synth_devs[dev]-&gt;midi_dev;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[midi_dev];</div><div class='del'>-	mpu_cmd(midi_dev, 0x15, 0);	/* Stop recording, playback and MIDI */</div><div class='del'>-	mpu_cmd(midi_dev, 0x8a, 0);	/* Disable data in stopped mode */</div><div class='del'>-</div><div class='del'>-	devc-&gt;inputintr = NULL;</div><div class='del'>-</div><div class='del'>-	coprocessor = midi_devs[midi_dev]-&gt;coproc;</div><div class='del'>-	if (coprocessor) {</div><div class='del'>-		coprocessor-&gt;close(coprocessor-&gt;devc, COPR_MIDI);</div><div class='del'>-		module_put(coprocessor-&gt;owner);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	devc-&gt;mode = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"MPU-401 UART Midi"</div><div class='del'>-#define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static struct synth_operations mpu401_synth_proto =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.id		= "MPU401",</div><div class='del'>-	.info		= NULL,</div><div class='del'>-	.midi_dev	= 0,</div><div class='del'>-	.synth_type	= SYNTH_TYPE_MIDI,</div><div class='del'>-	.synth_subtype	= 0,</div><div class='del'>-	.open		= mpu_synth_open,</div><div class='del'>-	.close		= mpu_synth_close,</div><div class='del'>-	.ioctl		= mpu_synth_ioctl,</div><div class='del'>-	.kill_note	= midi_synth_kill_note,</div><div class='del'>-	.start_note	= midi_synth_start_note,</div><div class='del'>-	.set_instr	= midi_synth_set_instr,</div><div class='del'>-	.reset		= midi_synth_reset,</div><div class='del'>-	.hw_control	= midi_synth_hw_control,</div><div class='del'>-	.load_patch	= midi_synth_load_patch,</div><div class='del'>-	.aftertouch	= midi_synth_aftertouch,</div><div class='del'>-	.controller	= midi_synth_controller,</div><div class='del'>-	.panning	= midi_synth_panning,</div><div class='del'>-	.bender		= midi_synth_bender,</div><div class='del'>-	.setup_voice	= midi_synth_setup_voice,</div><div class='del'>-	.send_sysex	= midi_synth_send_sysex</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct synth_operations *mpu401_synth_operations[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static struct midi_operations mpu401_midi_proto =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"MPU-401 Midi", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= mpu401_open,</div><div class='del'>-	.close		= mpu401_close,</div><div class='del'>-	.ioctl		= mpu401_ioctl,</div><div class='del'>-	.outputc	= mpu401_out,</div><div class='del'>-	.start_read	= mpu401_start_read,</div><div class='del'>-	.end_read	= mpu401_end_read,</div><div class='del'>-	.kick		= mpu401_kick,</div><div class='del'>-	.buffer_status	= mpu401_buffer_status,</div><div class='del'>-	.prefix_cmd	= mpu401_prefix_cmd</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static void mpu401_chk_version(int n, struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	int tmp;</div><div class='del'>-</div><div class='del'>-	devc-&gt;version = devc-&gt;revision = 0;</div><div class='del'>-</div><div class='del'>-	tmp = mpu_cmd(n, 0xAC, 0);</div><div class='del'>-	if (tmp &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-	if ((tmp &amp; 0xf0) &gt; 0x20)	/* Why it's larger than 2.x ??? */</div><div class='del'>-		return;</div><div class='del'>-	devc-&gt;version = tmp;</div><div class='del'>-</div><div class='del'>-	if ((tmp = mpu_cmd(n, 0xAD, 0)) &lt; 0) {</div><div class='del'>-		devc-&gt;version = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;revision = tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int attach_mpu401(struct address_info *hw_config, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	char revision_char;</div><div class='del'>-</div><div class='del'>-	int m, ret;</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[1] = -1;</div><div class='del'>-	m = sound_alloc_mididev();</div><div class='del'>-	if (m == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "MPU-401: Too many midi devices detected\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	devc = &amp;dev_conf[m];</div><div class='del'>-	devc-&gt;base = hw_config-&gt;io_base;</div><div class='del'>-	devc-&gt;osp = hw_config-&gt;osp;</div><div class='del'>-	devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	devc-&gt;uart_mode = 0;</div><div class='del'>-	devc-&gt;initialized = 0;</div><div class='del'>-	devc-&gt;version = 0;</div><div class='del'>-	devc-&gt;revision = 0;</div><div class='del'>-	devc-&gt;capabilities = 0;</div><div class='del'>-	devc-&gt;timer_flag = 0;</div><div class='del'>-	devc-&gt;m_busy = 0;</div><div class='del'>-	devc-&gt;m_state = ST_INIT;</div><div class='del'>-	devc-&gt;shared_irq = hw_config-&gt;always_detect;</div><div class='del'>-	devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;irq &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;irq *= -1;</div><div class='del'>-		devc-&gt;shared_irq = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!hw_config-&gt;always_detect)</div><div class='del'>-	{</div><div class='del'>-		/* Verify the hardware again */</div><div class='del'>-		if (!reset_mpu401(devc))</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "mpu401: Device didn't respond\n");</div><div class='del'>-			ret = -ENODEV;</div><div class='del'>-			goto out_mididev;</div><div class='del'>-		}</div><div class='del'>-		if (!devc-&gt;shared_irq)</div><div class='del'>-		{</div><div class='del'>-			if (request_irq(devc-&gt;irq, mpuintr, 0, "mpu401",</div><div class='del'>-					hw_config) &lt; 0)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING "mpu401: Failed to allocate IRQ%d\n", devc-&gt;irq);</div><div class='del'>-				ret = -ENOMEM;</div><div class='del'>-				goto out_mididev;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-		mpu401_chk_version(m, devc);</div><div class='del'>-		if (devc-&gt;version == 0)</div><div class='del'>-			mpu401_chk_version(m, devc);</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;version != 0)</div><div class='del'>-		if (mpu_cmd(m, 0xC5, 0) &gt;= 0)	/* Set timebase OK */</div><div class='del'>-			if (mpu_cmd(m, 0xE0, 120) &gt;= 0)		/* Set tempo OK */</div><div class='del'>-				devc-&gt;capabilities |= MPU_CAP_INTLG;	/* Supports intelligent mode */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	mpu401_synth_operations[m] = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (mpu401_synth_operations[m] == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "mpu401: Can't allocate memory\n");</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_irq;</div><div class='del'>-	}</div><div class='del'>-	if (!(devc-&gt;capabilities &amp; MPU_CAP_INTLG))	/* No intelligent mode */</div><div class='del'>-	{</div><div class='del'>-		memcpy((char *) mpu401_synth_operations[m],</div><div class='del'>-			(char *) &amp;std_midi_synth,</div><div class='del'>-			 sizeof(struct synth_operations));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		memcpy((char *) mpu401_synth_operations[m],</div><div class='del'>-			(char *) &amp;mpu401_synth_proto,</div><div class='del'>-			 sizeof(struct synth_operations));</div><div class='del'>-	}</div><div class='del'>-	if (owner)</div><div class='del'>-		mpu401_synth_operations[m]-&gt;owner = owner;</div><div class='del'>-</div><div class='del'>-	memcpy((char *) &amp;mpu401_midi_operations[m],</div><div class='del'>-	       (char *) &amp;mpu401_midi_proto,</div><div class='del'>-	       sizeof(struct midi_operations));</div><div class='del'>-</div><div class='del'>-	mpu401_midi_operations[m].converter = mpu401_synth_operations[m];</div><div class='del'>-</div><div class='del'>-	memcpy((char *) &amp;mpu_synth_info[m],</div><div class='del'>-	       (char *) &amp;mpu_synth_info_proto,</div><div class='del'>-	       sizeof(struct synth_info));</div><div class='del'>-</div><div class='del'>-	n_mpu_devs++;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;version == 0x20 &amp;&amp; devc-&gt;revision &gt;= 0x07)	/* MusicQuest interface */</div><div class='del'>-	{</div><div class='del'>-		int ports = (devc-&gt;revision &amp; 0x08) ? 32 : 16;</div><div class='del'>-</div><div class='del'>-		devc-&gt;capabilities |= MPU_CAP_SYNC | MPU_CAP_SMPTE |</div><div class='del'>-				MPU_CAP_CLS | MPU_CAP_2PORT;</div><div class='del'>-</div><div class='del'>-		revision_char = (devc-&gt;revision == 0x7f) ? 'M' : ' ';</div><div class='del'>-		sprintf(mpu_synth_info[m].name, "MQX-%d%c MIDI Interface #%d",</div><div class='del'>-				ports,</div><div class='del'>-				revision_char,</div><div class='del'>-				n_mpu_devs);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		revision_char = devc-&gt;revision ? devc-&gt;revision + '@' : ' ';</div><div class='del'>-		if ((int) devc-&gt;revision &gt; ('Z' - '@'))</div><div class='del'>-			revision_char = '+';</div><div class='del'>-</div><div class='del'>-		devc-&gt;capabilities |= MPU_CAP_SYNC | MPU_CAP_FSK;</div><div class='del'>-</div><div class='del'>-		if (hw_config-&gt;name)</div><div class='del'>-			sprintf(mpu_synth_info[m].name, "%s (MPU401)", hw_config-&gt;name);</div><div class='del'>-		else</div><div class='del'>-			sprintf(mpu_synth_info[m].name,</div><div class='del'>-				"MPU-401 %d.%d%c MIDI #%d",</div><div class='del'>-				(int) (devc-&gt;version &amp; 0xf0) &gt;&gt; 4,</div><div class='del'>-				devc-&gt;version &amp; 0x0f,</div><div class='del'>-				revision_char,</div><div class='del'>-				n_mpu_devs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(mpu401_midi_operations[m].info.name,</div><div class='del'>-	       mpu_synth_info[m].name);</div><div class='del'>-</div><div class='del'>-	conf_printf(mpu_synth_info[m].name, hw_config);</div><div class='del'>-</div><div class='del'>-	mpu401_synth_operations[m]-&gt;midi_dev = devc-&gt;devno = m;</div><div class='del'>-	mpu401_synth_operations[devc-&gt;devno]-&gt;info = &amp;mpu_synth_info[devc-&gt;devno];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;capabilities &amp; MPU_CAP_INTLG)		/* Intelligent mode */</div><div class='del'>-		hw_config-&gt;slots[2] = mpu_timer_init(m);</div><div class='del'>-</div><div class='del'>-	midi_devs[m] = &amp;mpu401_midi_operations[devc-&gt;devno];</div><div class='del'>-	</div><div class='del'>-	if (owner)</div><div class='del'>-		midi_devs[m]-&gt;owner = owner;</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[1] = m;</div><div class='del'>-	sequencer_init();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_irq:</div><div class='del'>-	free_irq(devc-&gt;irq, hw_config);</div><div class='del'>-out_mididev:</div><div class='del'>-	sound_unload_mididev(m);</div><div class='del'>-out_err:</div><div class='del'>-	release_region(hw_config-&gt;io_base, 2);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reset_mpu401(struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ok, timeout, n;</div><div class='del'>-	int timeout_limit;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send the RESET command. Try again if no success at the first time.</div><div class='del'>-	 * (If the device is in the UART mode, it will not ack the reset cmd).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ok = 0;</div><div class='del'>-</div><div class='del'>-	timeout_limit = devc-&gt;initialized ? 30000 : 100000;</div><div class='del'>-	devc-&gt;initialized = 1;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; 2 &amp;&amp; !ok; n++)</div><div class='del'>-	{</div><div class='del'>-		for (timeout = timeout_limit; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-			  ok = output_ready(devc);</div><div class='del'>-</div><div class='del'>-		write_command(devc, MPU_RESET);	/*</div><div class='del'>-							   * Send MPU-401 RESET Command</div><div class='del'>-							 */</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Wait at least 25 msec. This method is not accurate so let's make the</div><div class='del'>-		 * loop bit longer. Cannot sleep since this is called during boot.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		for (timeout = timeout_limit * 2; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-		{</div><div class='del'>-			spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-			if (input_avail(devc))</div><div class='del'>-				if (read_data(devc) == MPU_ACK)</div><div class='del'>-					ok = 1;</div><div class='del'>-			spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;m_state = ST_INIT;</div><div class='del'>-	devc-&gt;m_ptr = 0;</div><div class='del'>-	devc-&gt;m_left = 0;</div><div class='del'>-	devc-&gt;last_status = 0;</div><div class='del'>-	devc-&gt;uart_mode = 0;</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_uart_mode(int dev, struct mpu_config *devc, int arg)</div><div class='del'>-{</div><div class='del'>-	if (!arg &amp;&amp; (devc-&gt;capabilities &amp; MPU_CAP_INTLG))</div><div class='del'>-		return;</div><div class='del'>-	if ((devc-&gt;uart_mode == 0) == (arg == 0))</div><div class='del'>-		return;		/* Already set */</div><div class='del'>-	reset_mpu401(devc);	/* This exits the uart mode */</div><div class='del'>-</div><div class='del'>-	if (arg)</div><div class='del'>-	{</div><div class='del'>-		if (mpu_cmd(dev, UART_MODE_ON, 0) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "mpu401: Can't enter UART mode\n");</div><div class='del'>-			devc-&gt;uart_mode = 0;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;uart_mode = arg;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int probe_mpu401(struct address_info *hw_config, struct resource *ports)</div><div class='del'>-{</div><div class='del'>-	int ok = 0;</div><div class='del'>-	struct mpu_config tmp_devc;</div><div class='del'>-</div><div class='del'>-	tmp_devc.base = hw_config-&gt;io_base;</div><div class='del'>-	tmp_devc.irq = hw_config-&gt;irq;</div><div class='del'>-	tmp_devc.initialized = 0;</div><div class='del'>-	tmp_devc.opened = 0;</div><div class='del'>-	tmp_devc.osp = hw_config-&gt;osp;</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;always_detect)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (inb(hw_config-&gt;io_base + 1) == 0xff)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("MPU401: Port %x looks dead.\n", hw_config-&gt;io_base));</div><div class='del'>-		return 0;	/* Just bus float? */</div><div class='del'>-	}</div><div class='del'>-	ok = reset_mpu401(&amp;tmp_devc);</div><div class='del'>-</div><div class='del'>-	if (!ok)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("MPU401: Reset failed on port %x\n", hw_config-&gt;io_base));</div><div class='del'>-	}</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unload_mpu401(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	void *p;</div><div class='del'>-	int n=hw_config-&gt;slots[1];</div><div class='del'>-		</div><div class='del'>-	if (n != -1) {</div><div class='del'>-		release_region(hw_config-&gt;io_base, 2);</div><div class='del'>-		if (hw_config-&gt;always_detect == 0 &amp;&amp; hw_config-&gt;irq &gt; 0)</div><div class='del'>-			free_irq(hw_config-&gt;irq, hw_config);</div><div class='del'>-		p=mpu401_synth_operations[n];</div><div class='del'>-		sound_unload_mididev(n);</div><div class='del'>-		sound_unload_timerdev(hw_config-&gt;slots[2]);</div><div class='del'>-		kfree(p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************</div><div class='del'>- *      Timer stuff</div><div class='del'>- ****************************************************/</div><div class='del'>-</div><div class='del'>-static volatile int timer_initialized = 0, timer_open = 0, tmr_running = 0;</div><div class='del'>-static volatile int curr_tempo, curr_timebase, hw_timebase;</div><div class='del'>-static int      max_timebase = 8;	/* 8*24=192 ppqn */</div><div class='del'>-static volatile unsigned long next_event_time;</div><div class='del'>-static volatile unsigned long curr_ticks, curr_clocks;</div><div class='del'>-static unsigned long prev_event_time;</div><div class='del'>-static int      metronome_mode;</div><div class='del'>-</div><div class='del'>-static unsigned long clocks2ticks(unsigned long clocks)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * The MPU-401 supports just a limited set of possible timebase values.</div><div class='del'>-	 * Since the applications require more choices, the driver has to</div><div class='del'>-	 * program the HW to do its best and to convert between the HW and</div><div class='del'>-	 * actual timebases.</div><div class='del'>-	 */</div><div class='del'>-	return ((clocks * curr_timebase) + (hw_timebase / 2)) / hw_timebase;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_timebase(int midi_dev, int val)</div><div class='del'>-{</div><div class='del'>-	int hw_val;</div><div class='del'>-</div><div class='del'>-	if (val &lt; 48)</div><div class='del'>-		val = 48;</div><div class='del'>-	if (val &gt; 1000)</div><div class='del'>-		val = 1000;</div><div class='del'>-</div><div class='del'>-	hw_val = val;</div><div class='del'>-	hw_val = (hw_val + 12) / 24;</div><div class='del'>-	if (hw_val &gt; max_timebase)</div><div class='del'>-		hw_val = max_timebase;</div><div class='del'>-</div><div class='del'>-	if (mpu_cmd(midi_dev, 0xC0 | (hw_val &amp; 0x0f), 0) &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "mpu401: Can't set HW timebase to %d\n", hw_val * 24);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	hw_timebase = hw_val * 24;</div><div class='del'>-	curr_timebase = val;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tmr_reset(struct mpu_config *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	next_event_time = (unsigned long) -1;</div><div class='del'>-	prev_event_time = 0;</div><div class='del'>-	curr_ticks = curr_clocks = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_timer_mode(int midi_dev)</div><div class='del'>-{</div><div class='del'>-	if (timer_mode &amp; TMR_MODE_CLS)</div><div class='del'>-		mpu_cmd(midi_dev, 0x3c, 0);	/* Use CLS sync */</div><div class='del'>-	else if (timer_mode &amp; TMR_MODE_SMPTE)</div><div class='del'>-		mpu_cmd(midi_dev, 0x3d, 0);	/* Use SMPTE sync */</div><div class='del'>-</div><div class='del'>-	if (timer_mode &amp; TMR_INTERNAL)</div><div class='del'>-	{</div><div class='del'>-		  mpu_cmd(midi_dev, 0x80, 0);	/* Use MIDI sync */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (timer_mode &amp; (TMR_MODE_MIDI | TMR_MODE_CLS))</div><div class='del'>-		{</div><div class='del'>-			mpu_cmd(midi_dev, 0x82, 0);		/* Use MIDI sync */</div><div class='del'>-			mpu_cmd(midi_dev, 0x91, 0);		/* Enable ext MIDI ctrl */</div><div class='del'>-		}</div><div class='del'>-		else if (timer_mode &amp; TMR_MODE_FSK)</div><div class='del'>-			mpu_cmd(midi_dev, 0x81, 0);	/* Use FSK sync */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stop_metronome(int midi_dev)</div><div class='del'>-{</div><div class='del'>-	mpu_cmd(midi_dev, 0x84, 0);	/* Disable metronome */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setup_metronome(int midi_dev)</div><div class='del'>-{</div><div class='del'>-	int numerator, denominator;</div><div class='del'>-	int clks_per_click, num_32nds_per_beat;</div><div class='del'>-	int beats_per_measure;</div><div class='del'>-</div><div class='del'>-	numerator = ((unsigned) metronome_mode &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	denominator = ((unsigned) metronome_mode &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	clks_per_click = ((unsigned) metronome_mode &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	num_32nds_per_beat = (unsigned) metronome_mode &amp; 0xff;</div><div class='del'>-	beats_per_measure = (numerator * 4) &gt;&gt; denominator;</div><div class='del'>-</div><div class='del'>-	if (!metronome_mode)</div><div class='del'>-		mpu_cmd(midi_dev, 0x84, 0);	/* Disable metronome */</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		mpu_cmd(midi_dev, 0xE4, clks_per_click);</div><div class='del'>-		mpu_cmd(midi_dev, 0xE6, beats_per_measure);</div><div class='del'>-		mpu_cmd(midi_dev, 0x83, 0);	/* Enable metronome without accents */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_start_timer(int midi_dev)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc= &amp;dev_conf[midi_dev];</div><div class='del'>-</div><div class='del'>-	tmr_reset(devc);</div><div class='del'>-	set_timer_mode(midi_dev);</div><div class='del'>-</div><div class='del'>-	if (tmr_running)</div><div class='del'>-		return TIMER_NOT_ARMED;		/* Already running */</div><div class='del'>-</div><div class='del'>-	if (timer_mode &amp; TMR_INTERNAL)</div><div class='del'>-	{</div><div class='del'>-		mpu_cmd(midi_dev, 0x02, 0);	/* Send MIDI start */</div><div class='del'>-		tmr_running = 1;</div><div class='del'>-		return TIMER_NOT_ARMED;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		mpu_cmd(midi_dev, 0x35, 0);	/* Enable mode messages to PC */</div><div class='del'>-		mpu_cmd(midi_dev, 0x38, 0);	/* Enable sys common messages to PC */</div><div class='del'>-		mpu_cmd(midi_dev, 0x39, 0);	/* Enable real time messages to PC */</div><div class='del'>-		mpu_cmd(midi_dev, 0x97, 0);	/* Enable system exclusive messages to PC */</div><div class='del'>-	}</div><div class='del'>-	return TIMER_ARMED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_timer_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	int midi_dev = sound_timer_devs[dev]-&gt;devlink;</div><div class='del'>-	struct mpu_config *devc= &amp;dev_conf[midi_dev];</div><div class='del'>-</div><div class='del'>-	if (timer_open)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	tmr_reset(devc);</div><div class='del'>-	curr_tempo = 50;</div><div class='del'>-	mpu_cmd(midi_dev, 0xE0, 50);</div><div class='del'>-	curr_timebase = hw_timebase = 120;</div><div class='del'>-	set_timebase(midi_dev, 120);</div><div class='del'>-	timer_open = 1;</div><div class='del'>-	metronome_mode = 0;</div><div class='del'>-	set_timer_mode(midi_dev);</div><div class='del'>-</div><div class='del'>-	mpu_cmd(midi_dev, 0xe7, 0x04);	/* Send all clocks to host */</div><div class='del'>-	mpu_cmd(midi_dev, 0x95, 0);	/* Enable clock to host */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu_timer_close(int dev)</div><div class='del'>-{</div><div class='del'>-	int midi_dev = sound_timer_devs[dev]-&gt;devlink;</div><div class='del'>-</div><div class='del'>-	timer_open = tmr_running = 0;</div><div class='del'>-	mpu_cmd(midi_dev, 0x15, 0);	/* Stop all */</div><div class='del'>-	mpu_cmd(midi_dev, 0x94, 0);	/* Disable clock to host */</div><div class='del'>-	mpu_cmd(midi_dev, 0x8c, 0);	/* Disable measure end messages to host */</div><div class='del'>-	stop_metronome(midi_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_timer_event(int dev, unsigned char *event)</div><div class='del'>-{</div><div class='del'>-	unsigned char command = event[1];</div><div class='del'>-	unsigned long parm = *(unsigned int *) &amp;event[4];</div><div class='del'>-	int midi_dev = sound_timer_devs[dev]-&gt;devlink;</div><div class='del'>-</div><div class='del'>-	switch (command)</div><div class='del'>-	{</div><div class='del'>-		case TMR_WAIT_REL:</div><div class='del'>-			parm += prev_event_time;</div><div class='del'>-		case TMR_WAIT_ABS:</div><div class='del'>-			if (parm &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				long time;</div><div class='del'>-</div><div class='del'>-				if (parm &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-					return TIMER_NOT_ARMED;</div><div class='del'>-				time = parm;</div><div class='del'>-				next_event_time = prev_event_time = time;</div><div class='del'>-</div><div class='del'>-				return TIMER_ARMED;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_START:</div><div class='del'>-			if (tmr_running)</div><div class='del'>-				break;</div><div class='del'>-			return mpu_start_timer(midi_dev);</div><div class='del'>-</div><div class='del'>-		case TMR_STOP:</div><div class='del'>-			mpu_cmd(midi_dev, 0x01, 0);	/* Send MIDI stop */</div><div class='del'>-			stop_metronome(midi_dev);</div><div class='del'>-			tmr_running = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_CONTINUE:</div><div class='del'>-			if (tmr_running)</div><div class='del'>-				break;</div><div class='del'>-			mpu_cmd(midi_dev, 0x03, 0);	/* Send MIDI continue */</div><div class='del'>-			setup_metronome(midi_dev);</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_TEMPO:</div><div class='del'>-			if (parm)</div><div class='del'>-			{</div><div class='del'>-				if (parm &lt; 8)</div><div class='del'>-					parm = 8;</div><div class='del'>-			 	if (parm &gt; 250)</div><div class='del'>-					parm = 250;</div><div class='del'>-				if (mpu_cmd(midi_dev, 0xE0, parm) &lt; 0)</div><div class='del'>-					printk(KERN_WARNING "mpu401: Can't set tempo to %d\n", (int) parm);</div><div class='del'>-				curr_tempo = parm;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_ECHO:</div><div class='del'>-			seq_copy_to_input(event, 8);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_TIMESIG:</div><div class='del'>-			if (metronome_mode)	/* Metronome enabled */</div><div class='del'>-			{</div><div class='del'>-				metronome_mode = parm;</div><div class='del'>-				setup_metronome(midi_dev);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-	return TIMER_NOT_ARMED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long mpu_timer_get_time(int dev)</div><div class='del'>-{</div><div class='del'>-	if (!timer_open)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return curr_ticks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_timer_ioctl(int dev, unsigned int command, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int midi_dev = sound_timer_devs[dev]-&gt;devlink;</div><div class='del'>-	int __user *p = (int __user *)arg;</div><div class='del'>-</div><div class='del'>-	switch (command)</div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_TMR_SOURCE:</div><div class='del'>-			{</div><div class='del'>-				int parm;</div><div class='del'>-</div><div class='del'>-				if (get_user(parm, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				parm &amp;= timer_caps;</div><div class='del'>-</div><div class='del'>-				if (parm != 0)</div><div class='del'>-				{</div><div class='del'>-					timer_mode = parm;</div><div class='del'>-	</div><div class='del'>-					if (timer_mode &amp; TMR_MODE_CLS)</div><div class='del'>-						mpu_cmd(midi_dev, 0x3c, 0);		/* Use CLS sync */</div><div class='del'>-					else if (timer_mode &amp; TMR_MODE_SMPTE)</div><div class='del'>-						mpu_cmd(midi_dev, 0x3d, 0);		/* Use SMPTE sync */</div><div class='del'>-				}</div><div class='del'>-				if (put_user(timer_mode, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return timer_mode;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_START:</div><div class='del'>-			mpu_start_timer(midi_dev);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_STOP:</div><div class='del'>-			tmr_running = 0;</div><div class='del'>-			mpu_cmd(midi_dev, 0x01, 0);	/* Send MIDI stop */</div><div class='del'>-			stop_metronome(midi_dev);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_CONTINUE:</div><div class='del'>-			if (tmr_running)</div><div class='del'>-				return 0;</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			mpu_cmd(midi_dev, 0x03, 0);	/* Send MIDI continue */</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_TIMEBASE:</div><div class='del'>-			{</div><div class='del'>-				int val;</div><div class='del'>-				if (get_user(val, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				if (val)</div><div class='del'>-					set_timebase(midi_dev, val);</div><div class='del'>-				if (put_user(curr_timebase, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return curr_timebase;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_TEMPO:</div><div class='del'>-			{</div><div class='del'>-				int val;</div><div class='del'>-				int ret;</div><div class='del'>-</div><div class='del'>-				if (get_user(val, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-</div><div class='del'>-				if (val)</div><div class='del'>-				{</div><div class='del'>-					if (val &lt; 8)</div><div class='del'>-						val = 8;</div><div class='del'>-					if (val &gt; 250)</div><div class='del'>-						val = 250;</div><div class='del'>-					if ((ret = mpu_cmd(midi_dev, 0xE0, val)) &lt; 0)</div><div class='del'>-					{</div><div class='del'>-						printk(KERN_WARNING "mpu401: Can't set tempo to %d\n", (int) val);</div><div class='del'>-						return ret;</div><div class='del'>-					}</div><div class='del'>-					curr_tempo = val;</div><div class='del'>-				}</div><div class='del'>-				if (put_user(curr_tempo, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return curr_tempo;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_CTRLRATE:</div><div class='del'>-			{</div><div class='del'>-				int val;</div><div class='del'>-				if (get_user(val, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-</div><div class='del'>-				if (val != 0)		/* Can't change */</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				val = ((curr_tempo * curr_timebase) + 30)/60;</div><div class='del'>-				if (put_user(val, p))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return val;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_GETTIME:</div><div class='del'>-			if (put_user(curr_ticks, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return curr_ticks;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_METRONOME:</div><div class='del'>-			if (get_user(metronome_mode, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			setup_metronome(midi_dev);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mpu_timer_arm(int dev, long time)</div><div class='del'>-{</div><div class='del'>-	if (time &lt; 0)</div><div class='del'>-		time = curr_ticks + 1;</div><div class='del'>-	else if (time &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-		return;</div><div class='del'>-	next_event_time = prev_event_time = time;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sound_timer_operations mpu_timer =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"MPU-401 Timer", 0},</div><div class='del'>-	.priority	= 10,	/* Priority */</div><div class='del'>-	.devlink	= 0,	/* Local device link */</div><div class='del'>-	.open		= mpu_timer_open,</div><div class='del'>-	.close		= mpu_timer_close,</div><div class='del'>-	.event		= mpu_timer_event,</div><div class='del'>-	.get_time	= mpu_timer_get_time,</div><div class='del'>-	.ioctl		= mpu_timer_ioctl,</div><div class='del'>-	.arm_timer	= mpu_timer_arm</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void mpu_timer_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	if (!timer_open)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!tmr_running)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	curr_clocks++;</div><div class='del'>-	curr_ticks = clocks2ticks(curr_clocks);</div><div class='del'>-</div><div class='del'>-	if (curr_ticks &gt;= next_event_time)</div><div class='del'>-	{</div><div class='del'>-		next_event_time = (unsigned long) -1;</div><div class='del'>-		sequencer_timer(0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void timer_ext_event(struct mpu_config *devc, int event, int parm)</div><div class='del'>-{</div><div class='del'>-	int midi_dev = devc-&gt;devno;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;timer_flag)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (event)</div><div class='del'>-	{</div><div class='del'>-		case TMR_CLOCK:</div><div class='del'>-			printk("&lt;MIDI clk&gt;");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_START:</div><div class='del'>-			printk("Ext MIDI start\n");</div><div class='del'>-			if (!tmr_running)</div><div class='del'>-			{</div><div class='del'>-				if (timer_mode &amp; TMR_EXTERNAL)</div><div class='del'>-				{</div><div class='del'>-					tmr_running = 1;</div><div class='del'>-					setup_metronome(midi_dev);</div><div class='del'>-					next_event_time = 0;</div><div class='del'>-					STORE(SEQ_START_TIMER());</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_STOP:</div><div class='del'>-			printk("Ext MIDI stop\n");</div><div class='del'>-			if (timer_mode &amp; TMR_EXTERNAL)</div><div class='del'>-			{</div><div class='del'>-				tmr_running = 0;</div><div class='del'>-				stop_metronome(midi_dev);</div><div class='del'>-				STORE(SEQ_STOP_TIMER());</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_CONTINUE:</div><div class='del'>-			printk("Ext MIDI continue\n");</div><div class='del'>-			if (timer_mode &amp; TMR_EXTERNAL)</div><div class='del'>-			{</div><div class='del'>-				tmr_running = 1;</div><div class='del'>-				setup_metronome(midi_dev);</div><div class='del'>-				STORE(SEQ_CONTINUE_TIMER());</div><div class='del'>-		  	}</div><div class='del'>-		  	break;</div><div class='del'>-</div><div class='del'>-		case TMR_SPP:</div><div class='del'>-			printk("Songpos: %d\n", parm);</div><div class='del'>-			if (timer_mode &amp; TMR_EXTERNAL)</div><div class='del'>-			{</div><div class='del'>-				STORE(SEQ_SONGPOS(parm));</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mpu_timer_init(int midi_dev)</div><div class='del'>-{</div><div class='del'>-	struct mpu_config *devc;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	devc = &amp;dev_conf[midi_dev];</div><div class='del'>-</div><div class='del'>-	if (timer_initialized)</div><div class='del'>-		return -1;	/* There is already a similar timer */</div><div class='del'>-</div><div class='del'>-	timer_initialized = 1;</div><div class='del'>-</div><div class='del'>-	mpu_timer.devlink = midi_dev;</div><div class='del'>-	dev_conf[midi_dev].timer_flag = 1;</div><div class='del'>-</div><div class='del'>-	n = sound_alloc_timerdev();</div><div class='del'>-	if (n == -1)</div><div class='del'>-		n = 0;</div><div class='del'>-	sound_timer_devs[n] = &amp;mpu_timer;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;version &lt; 0x20)	/* Original MPU-401 */</div><div class='del'>-		timer_caps = TMR_INTERNAL | TMR_EXTERNAL | TMR_MODE_FSK | TMR_MODE_MIDI;</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * The version number 2.0 is used (at least) by the</div><div class='del'>-		 * MusicQuest cards and the Roland Super-MPU.</div><div class='del'>-		 *</div><div class='del'>-		 * MusicQuest has given a special meaning to the bits of the</div><div class='del'>-		 * revision number. The Super-MPU returns 0.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;revision)</div><div class='del'>-			timer_caps |= TMR_EXTERNAL | TMR_MODE_MIDI;</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;revision &amp; 0x02)</div><div class='del'>-			timer_caps |= TMR_MODE_CLS;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;revision &amp; 0x40)</div><div class='del'>-			max_timebase = 10;	/* Has the 216 and 240 ppqn modes */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timer_mode = (TMR_INTERNAL | TMR_MODE_MIDI) &amp; timer_caps;</div><div class='del'>-	return n;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(probe_mpu401);</div><div class='del'>-EXPORT_SYMBOL(attach_mpu401);</div><div class='del'>-EXPORT_SYMBOL(unload_mpu401);</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-</div><div class='del'>-static int io = -1;</div><div class='del'>-static int irq = -1;</div><div class='del'>-</div><div class='del'>-module_param(irq, int, 0);</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-</div><div class='del'>-static int __init init_mpu401(void)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	/* Can be loaded either for module use or to provide functions</div><div class='del'>-	   to others */</div><div class='del'>-	if (io != -1 &amp;&amp; irq != -1) {</div><div class='del'>-		struct resource *ports;</div><div class='del'>-	        cfg.irq = irq;</div><div class='del'>-		cfg.io_base = io;</div><div class='del'>-		ports = request_region(io, 2, "mpu401");</div><div class='del'>-		if (!ports)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		if (probe_mpu401(&amp;cfg, ports) == 0) {</div><div class='del'>-			release_region(io, 2);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		if ((ret = attach_mpu401(&amp;cfg, THIS_MODULE)))</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_mpu401(void)</div><div class='del'>-{</div><div class='del'>-	if (io != -1 &amp;&amp; irq != -1) {</div><div class='del'>-		/* Check for use by, for example, sscape driver */</div><div class='del'>-		unload_mpu401(&amp;cfg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_mpu401);</div><div class='del'>-module_exit(cleanup_mpu401);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_mpu401(char *str)</div><div class='del'>-{</div><div class='del'>-        /* io, irq */</div><div class='del'>-	int ints[3];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	</div><div class='del'>-	io = ints[1];</div><div class='del'>-	irq = ints[2];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("mpu401=", setup_mpu401);</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/mpu401.h b/sound/oss/mpu401.h<br/>deleted file mode 100644<br/>index 0ad1e9ee74f7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/mpu401.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/mpu401.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*	From uart401.c */</div><div class='del'>-int probe_uart401 (struct address_info *hw_config, struct module *owner);</div><div class='del'>-void unload_uart401 (struct address_info *hw_config);</div><div class='del'>-</div><div class='del'>-irqreturn_t uart401intr (int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-/*	From mpu401.c */</div><div class='del'>-int probe_mpu401(struct address_info *hw_config, struct resource *ports);</div><div class='del'>-int attach_mpu401(struct address_info * hw_config, struct module *owner);</div><div class='del'>-void unload_mpu401(struct address_info *hw_info);</div><div class='head'>diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c<br/>deleted file mode 100644<br/>index c0cc951ba97d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,413 +0,0 @@</div><div class='del'>-/*********************************************************************</div><div class='del'>- *</div><div class='del'>- * msnd.c - Driver Base</div><div class='del'>- *</div><div class='del'>- * Turtle Beach MultiSound Sound Card Driver for Linux</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Andrew Veliath</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- ********************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include "msnd.h"</div><div class='del'>-</div><div class='del'>-#define LOGNAME			"msnd"</div><div class='del'>-</div><div class='del'>-#define MSND_MAX_DEVS		4</div><div class='del'>-</div><div class='del'>-static multisound_dev_t		*devs[MSND_MAX_DEVS];</div><div class='del'>-static int			num_devs;</div><div class='del'>-</div><div class='del'>-int msnd_register(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MSND_MAX_DEVS; ++i)</div><div class='del'>-		if (devs[i] == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (i == MSND_MAX_DEVS)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	devs[i] = dev;</div><div class='del'>-	++num_devs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void msnd_unregister(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MSND_MAX_DEVS; ++i)</div><div class='del'>-		if (devs[i] == dev)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (i == MSND_MAX_DEVS) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Unregistering unknown device\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devs[i] = NULL;</div><div class='del'>-	--num_devs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void msnd_init_queue(void __iomem *base, int start, int size)</div><div class='del'>-{</div><div class='del'>-	writew(PCTODSP_BASED(start), base + JQS_wStart);</div><div class='del'>-	writew(PCTODSP_OFFSET(size) - 1, base + JQS_wSize);</div><div class='del'>-	writew(0, base + JQS_wHead);</div><div class='del'>-	writew(0, base + JQS_wTail);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void msnd_fifo_init(msnd_fifo *f)</div><div class='del'>-{</div><div class='del'>-	f-&gt;data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void msnd_fifo_free(msnd_fifo *f)</div><div class='del'>-{</div><div class='del'>-	vfree(f-&gt;data);</div><div class='del'>-	f-&gt;data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_fifo_alloc(msnd_fifo *f, size_t n)</div><div class='del'>-{</div><div class='del'>-	msnd_fifo_free(f);</div><div class='del'>-	f-&gt;data = vmalloc(n);</div><div class='del'>-	f-&gt;n = n;</div><div class='del'>-	f-&gt;tail = 0;</div><div class='del'>-	f-&gt;head = 0;</div><div class='del'>-	f-&gt;len = 0;</div><div class='del'>-</div><div class='del'>-	if (!f-&gt;data)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void msnd_fifo_make_empty(msnd_fifo *f)</div><div class='del'>-{</div><div class='del'>-	f-&gt;len = f-&gt;tail = f-&gt;head = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_fifo_write_io(msnd_fifo *f, char __iomem *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	while ((count &lt; len) &amp;&amp; (f-&gt;len != f-&gt;n)) {</div><div class='del'>-</div><div class='del'>-		int nwritten;</div><div class='del'>-</div><div class='del'>-		if (f-&gt;head &lt;= f-&gt;tail) {</div><div class='del'>-			nwritten = len - count;</div><div class='del'>-			if (nwritten &gt; f-&gt;n - f-&gt;tail)</div><div class='del'>-				nwritten = f-&gt;n - f-&gt;tail;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			nwritten = f-&gt;head - f-&gt;tail;</div><div class='del'>-			if (nwritten &gt; len - count)</div><div class='del'>-				nwritten = len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy_fromio(f-&gt;data + f-&gt;tail, buf, nwritten);</div><div class='del'>-</div><div class='del'>-		count += nwritten;</div><div class='del'>-		buf += nwritten;</div><div class='del'>-		f-&gt;len += nwritten;</div><div class='del'>-		f-&gt;tail += nwritten;</div><div class='del'>-		f-&gt;tail %= f-&gt;n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	while ((count &lt; len) &amp;&amp; (f-&gt;len != f-&gt;n)) {</div><div class='del'>-</div><div class='del'>-		int nwritten;</div><div class='del'>-</div><div class='del'>-		if (f-&gt;head &lt;= f-&gt;tail) {</div><div class='del'>-			nwritten = len - count;</div><div class='del'>-			if (nwritten &gt; f-&gt;n - f-&gt;tail)</div><div class='del'>-				nwritten = f-&gt;n - f-&gt;tail;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			nwritten = f-&gt;head - f-&gt;tail;</div><div class='del'>-			if (nwritten &gt; len - count)</div><div class='del'>-				nwritten = len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(f-&gt;data + f-&gt;tail, buf, nwritten);</div><div class='del'>-</div><div class='del'>-		count += nwritten;</div><div class='del'>-		buf += nwritten;</div><div class='del'>-		f-&gt;len += nwritten;</div><div class='del'>-		f-&gt;tail += nwritten;</div><div class='del'>-		f-&gt;tail %= f-&gt;n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_fifo_read_io(msnd_fifo *f, char __iomem *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	while ((count &lt; len) &amp;&amp; (f-&gt;len &gt; 0)) {</div><div class='del'>-</div><div class='del'>-		int nread;</div><div class='del'>-</div><div class='del'>-		if (f-&gt;tail &lt;= f-&gt;head) {</div><div class='del'>-			nread = len - count;</div><div class='del'>-			if (nread &gt; f-&gt;n - f-&gt;head)</div><div class='del'>-				nread = f-&gt;n - f-&gt;head;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			nread = f-&gt;tail - f-&gt;head;</div><div class='del'>-			if (nread &gt; len - count)</div><div class='del'>-				nread = len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy_toio(buf, f-&gt;data + f-&gt;head, nread);</div><div class='del'>-</div><div class='del'>-		count += nread;</div><div class='del'>-		buf += nread;</div><div class='del'>-		f-&gt;len -= nread;</div><div class='del'>-		f-&gt;head += nread;</div><div class='del'>-		f-&gt;head %= f-&gt;n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	while ((count &lt; len) &amp;&amp; (f-&gt;len &gt; 0)) {</div><div class='del'>-</div><div class='del'>-		int nread;</div><div class='del'>-</div><div class='del'>-		if (f-&gt;tail &lt;= f-&gt;head) {</div><div class='del'>-			nread = len - count;</div><div class='del'>-			if (nread &gt; f-&gt;n - f-&gt;head)</div><div class='del'>-				nread = f-&gt;n - f-&gt;head;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			nread = f-&gt;tail - f-&gt;head;</div><div class='del'>-			if (nread &gt; len - count)</div><div class='del'>-				nread = len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(buf, f-&gt;data + f-&gt;head, nread);</div><div class='del'>-</div><div class='del'>-		count += nread;</div><div class='del'>-		buf += nread;</div><div class='del'>-		f-&gt;len -= nread;</div><div class='del'>-		f-&gt;head += nread;</div><div class='del'>-		f-&gt;head %= f-&gt;n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msnd_wait_TXDE(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	register unsigned int io = dev-&gt;io;</div><div class='del'>-	register int timeout = 1000;</div><div class='del'>-    </div><div class='del'>-	while(timeout-- &gt; 0)</div><div class='del'>-		if (msnd_inb(io + HP_ISR) &amp; HPISR_TXDE)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int msnd_wait_HC0(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	register unsigned int io = dev-&gt;io;</div><div class='del'>-	register int timeout = 1000;</div><div class='del'>-</div><div class='del'>-	while(timeout-- &gt; 0)</div><div class='del'>-		if (!(msnd_inb(io + HP_CVR) &amp; HPCVR_HC))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_send_dsp_cmd(multisound_dev_t *dev, BYTE cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='del'>-	if (msnd_wait_HC0(dev) == 0) {</div><div class='del'>-		msnd_outb(cmd, dev-&gt;io + HP_CVR);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Send DSP command timeout\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_send_word(multisound_dev_t *dev, unsigned char high,</div><div class='del'>-		   unsigned char mid, unsigned char low)</div><div class='del'>-{</div><div class='del'>-	register unsigned int io = dev-&gt;io;</div><div class='del'>-</div><div class='del'>-	if (msnd_wait_TXDE(dev) == 0) {</div><div class='del'>-		msnd_outb(high, io + HP_TXH);</div><div class='del'>-		msnd_outb(mid, io + HP_TXM);</div><div class='del'>-		msnd_outb(low, io + HP_TXL);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Send host word timeout\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_upload_host(multisound_dev_t *dev, char *bin, int len)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (len % 3 != 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Upload host data not multiple of 3!\n");		</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i += 3)</div><div class='del'>-		if (msnd_send_word(dev, bin[i], bin[i + 1], bin[i + 2]) != 0)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-	msnd_inb(dev-&gt;io + HP_RXL);</div><div class='del'>-	msnd_inb(dev-&gt;io + HP_CVR);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_enable_irq(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;irq_ref++)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Enabling IRQ\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='del'>-	if (msnd_wait_TXDE(dev) == 0) {</div><div class='del'>-		msnd_outb(msnd_inb(dev-&gt;io + HP_ICR) | HPICR_TREQ, dev-&gt;io + HP_ICR);</div><div class='del'>-		if (dev-&gt;type == msndClassic)</div><div class='del'>-			msnd_outb(dev-&gt;irqid, dev-&gt;io + HP_IRQM);</div><div class='del'>-		msnd_outb(msnd_inb(dev-&gt;io + HP_ICR) &amp; ~HPICR_TREQ, dev-&gt;io + HP_ICR);</div><div class='del'>-		msnd_outb(msnd_inb(dev-&gt;io + HP_ICR) | HPICR_RREQ, dev-&gt;io + HP_ICR);</div><div class='del'>-		enable_irq(dev-&gt;irq);</div><div class='del'>-		msnd_init_queue(dev-&gt;DSPQ, dev-&gt;dspq_data_buff, dev-&gt;dspq_buff_size);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Enable IRQ failed\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int msnd_disable_irq(multisound_dev_t *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (--dev-&gt;irq_ref &gt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;irq_ref &lt; 0)</div><div class='del'>-		printk(KERN_DEBUG LOGNAME ": IRQ ref count is %d\n", dev-&gt;irq_ref);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Disabling IRQ\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;dev-&gt;lock, flags);</div><div class='del'>-	if (msnd_wait_TXDE(dev) == 0) {</div><div class='del'>-		msnd_outb(msnd_inb(dev-&gt;io + HP_ICR) &amp; ~HPICR_RREQ, dev-&gt;io + HP_ICR);</div><div class='del'>-		if (dev-&gt;type == msndClassic)</div><div class='del'>-			msnd_outb(HPIRQ_NONE, dev-&gt;io + HP_IRQM);</div><div class='del'>-		disable_irq(dev-&gt;irq);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	printk(KERN_DEBUG LOGNAME ": Disable IRQ failed\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef LINUX20</div><div class='del'>-EXPORT_SYMBOL(msnd_register);</div><div class='del'>-EXPORT_SYMBOL(msnd_unregister);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(msnd_init_queue);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_init);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_free);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_alloc);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_make_empty);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_write_io);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_read_io);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_write);</div><div class='del'>-EXPORT_SYMBOL(msnd_fifo_read);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(msnd_send_dsp_cmd);</div><div class='del'>-EXPORT_SYMBOL(msnd_send_word);</div><div class='del'>-EXPORT_SYMBOL(msnd_upload_host);</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(msnd_enable_irq);</div><div class='del'>-EXPORT_SYMBOL(msnd_disable_irq);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-MODULE_AUTHOR				("Andrew Veliath &lt;andrewtv@usa.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION			("Turtle Beach MultiSound Driver Base");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int init_module(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h<br/>deleted file mode 100644<br/>index c8be47ec2b7e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,278 +0,0 @@</div><div class='del'>-/*********************************************************************</div><div class='del'>- *</div><div class='del'>- * msnd.h</div><div class='del'>- *</div><div class='del'>- * Turtle Beach MultiSound Sound Card Driver for Linux</div><div class='del'>- *</div><div class='del'>- * Some parts of this header file were derived from the Turtle Beach</div><div class='del'>- * MultiSound Driver Development Kit.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Andrew Veliath</div><div class='del'>- * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- ********************************************************************/</div><div class='del'>-#ifndef __MSND_H</div><div class='del'>-#define __MSND_H</div><div class='del'>-</div><div class='del'>-#define VERSION			"0.8.3.1"</div><div class='del'>-</div><div class='del'>-#define DEFSAMPLERATE		DSP_DEFAULT_SPEED</div><div class='del'>-#define DEFSAMPLESIZE		AFMT_U8</div><div class='del'>-#define DEFCHANNELS		1</div><div class='del'>-</div><div class='del'>-#define DEFFIFOSIZE		128</div><div class='del'>-</div><div class='del'>-#define SNDCARD_MSND		38</div><div class='del'>-</div><div class='del'>-#define SRAM_BANK_SIZE		0x8000</div><div class='del'>-#define SRAM_CNTL_START		0x7F00</div><div class='del'>-</div><div class='del'>-#define DSP_BASE_ADDR		0x4000</div><div class='del'>-#define DSP_BANK_BASE		0x4000</div><div class='del'>-</div><div class='del'>-#define	HP_ICR			0x00</div><div class='del'>-#define	HP_CVR			0x01</div><div class='del'>-#define	HP_ISR			0x02</div><div class='del'>-#define	HP_IVR			0x03</div><div class='del'>-#define HP_NU			0x04</div><div class='del'>-#define HP_INFO			0x04</div><div class='del'>-#define	HP_TXH			0x05</div><div class='del'>-#define	HP_RXH			0x05</div><div class='del'>-#define	HP_TXM			0x06</div><div class='del'>-#define	HP_RXM			0x06</div><div class='del'>-#define	HP_TXL			0x07</div><div class='del'>-#define	HP_RXL			0x07</div><div class='del'>-</div><div class='del'>-#define HP_ICR_DEF		0x00</div><div class='del'>-#define HP_CVR_DEF		0x12</div><div class='del'>-#define HP_ISR_DEF		0x06</div><div class='del'>-#define HP_IVR_DEF		0x0f</div><div class='del'>-#define HP_NU_DEF		0x00</div><div class='del'>-</div><div class='del'>-#define	HP_IRQM			0x09</div><div class='del'>-</div><div class='del'>-#define	HPR_BLRC		0x08</div><div class='del'>-#define	HPR_SPR1		0x09</div><div class='del'>-#define	HPR_SPR2		0x0A</div><div class='del'>-#define	HPR_TCL0		0x0B</div><div class='del'>-#define	HPR_TCL1		0x0C</div><div class='del'>-#define	HPR_TCL2		0x0D</div><div class='del'>-#define	HPR_TCL3		0x0E</div><div class='del'>-#define	HPR_TCL4		0x0F</div><div class='del'>-</div><div class='del'>-#define	HPICR_INIT		0x80</div><div class='del'>-#define HPICR_HM1		0x40</div><div class='del'>-#define HPICR_HM0		0x20</div><div class='del'>-#define HPICR_HF1		0x10</div><div class='del'>-#define HPICR_HF0		0x08</div><div class='del'>-#define	HPICR_TREQ		0x02</div><div class='del'>-#define	HPICR_RREQ		0x01</div><div class='del'>-</div><div class='del'>-#define HPCVR_HC		0x80</div><div class='del'>-</div><div class='del'>-#define	HPISR_HREQ		0x80</div><div class='del'>-#define HPISR_DMA		0x40</div><div class='del'>-#define HPISR_HF3		0x10</div><div class='del'>-#define HPISR_HF2		0x08</div><div class='del'>-#define	HPISR_TRDY		0x04</div><div class='del'>-#define	HPISR_TXDE		0x02</div><div class='del'>-#define	HPISR_RXDF		0x01</div><div class='del'>-</div><div class='del'>-#define	HPIO_290		0</div><div class='del'>-#define	HPIO_260		1</div><div class='del'>-#define	HPIO_250		2</div><div class='del'>-#define	HPIO_240		3</div><div class='del'>-#define	HPIO_230		4</div><div class='del'>-#define	HPIO_220		5</div><div class='del'>-#define	HPIO_210		6</div><div class='del'>-#define	HPIO_3E0		7</div><div class='del'>-</div><div class='del'>-#define	HPMEM_NONE		0</div><div class='del'>-#define	HPMEM_B000		1</div><div class='del'>-#define	HPMEM_C800		2</div><div class='del'>-#define	HPMEM_D000		3</div><div class='del'>-#define	HPMEM_D400		4</div><div class='del'>-#define	HPMEM_D800		5</div><div class='del'>-#define	HPMEM_E000		6</div><div class='del'>-#define	HPMEM_E800		7</div><div class='del'>-</div><div class='del'>-#define	HPIRQ_NONE		0</div><div class='del'>-#define HPIRQ_5			1</div><div class='del'>-#define HPIRQ_7			2</div><div class='del'>-#define HPIRQ_9			3</div><div class='del'>-#define HPIRQ_10		4</div><div class='del'>-#define HPIRQ_11		5</div><div class='del'>-#define HPIRQ_12		6</div><div class='del'>-#define HPIRQ_15		7</div><div class='del'>-</div><div class='del'>-#define	HIMT_PLAY_DONE		0x00</div><div class='del'>-#define	HIMT_RECORD_DONE	0x01</div><div class='del'>-#define	HIMT_MIDI_EOS		0x02</div><div class='del'>-#define	HIMT_MIDI_OUT		0x03</div><div class='del'>-</div><div class='del'>-#define	HIMT_MIDI_IN_UCHAR	0x0E</div><div class='del'>-#define	HIMT_DSP		0x0F</div><div class='del'>-</div><div class='del'>-#define	HDEX_BASE	       	0x92</div><div class='del'>-#define	HDEX_PLAY_START		(0 + HDEX_BASE)</div><div class='del'>-#define	HDEX_PLAY_STOP		(1 + HDEX_BASE)</div><div class='del'>-#define	HDEX_PLAY_PAUSE		(2 + HDEX_BASE)</div><div class='del'>-#define	HDEX_PLAY_RESUME	(3 + HDEX_BASE)</div><div class='del'>-#define	HDEX_RECORD_START	(4 + HDEX_BASE)</div><div class='del'>-#define	HDEX_RECORD_STOP	(5 + HDEX_BASE)</div><div class='del'>-#define	HDEX_MIDI_IN_START 	(6 + HDEX_BASE)</div><div class='del'>-#define	HDEX_MIDI_IN_STOP	(7 + HDEX_BASE)</div><div class='del'>-#define	HDEX_MIDI_OUT_START	(8 + HDEX_BASE)</div><div class='del'>-#define	HDEX_MIDI_OUT_STOP	(9 + HDEX_BASE)</div><div class='del'>-#define	HDEX_AUX_REQ		(10 + HDEX_BASE)</div><div class='del'>-</div><div class='del'>-#define HIWORD(l)		((WORD)((((DWORD)(l)) &gt;&gt; 16) &amp; 0xFFFF))</div><div class='del'>-#define LOWORD(l)		((WORD)(DWORD)(l))</div><div class='del'>-#define HIBYTE(w)		((BYTE)(((WORD)(w) &gt;&gt; 8) &amp; 0xFF))</div><div class='del'>-#define LOBYTE(w)		((BYTE)(w))</div><div class='del'>-#define MAKELONG(low,hi)	((long)(((WORD)(low))|(((DWORD)((WORD)(hi)))&lt;&lt;16)))</div><div class='del'>-#define MAKEWORD(low,hi)	((WORD)(((BYTE)(low))|(((WORD)((BYTE)(hi)))&lt;&lt;8)))</div><div class='del'>-</div><div class='del'>-#define PCTODSP_OFFSET(w)	(USHORT)((w)/2)</div><div class='del'>-#define PCTODSP_BASED(w)	(USHORT)(((w)/2) + DSP_BASE_ADDR)</div><div class='del'>-#define DSPTOPC_BASED(w)	(((w) - DSP_BASE_ADDR) * 2)</div><div class='del'>-</div><div class='del'>-#ifdef SLOWIO</div><div class='del'>-#define msnd_outb			outb_p</div><div class='del'>-#define msnd_inb			inb_p</div><div class='del'>-#else</div><div class='del'>-#define msnd_outb			outb</div><div class='del'>-#define msnd_inb			inb</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* JobQueueStruct */</div><div class='del'>-#define JQS_wStart		0x00</div><div class='del'>-#define JQS_wSize		0x02</div><div class='del'>-#define JQS_wHead		0x04</div><div class='del'>-#define JQS_wTail		0x06</div><div class='del'>-#define JQS__size		0x08</div><div class='del'>-</div><div class='del'>-/* DAQueueDataStruct */</div><div class='del'>-#define DAQDS_wStart		0x00</div><div class='del'>-#define DAQDS_wSize		0x02</div><div class='del'>-#define DAQDS_wFormat		0x04</div><div class='del'>-#define DAQDS_wSampleSize	0x06</div><div class='del'>-#define DAQDS_wChannels		0x08</div><div class='del'>-#define DAQDS_wSampleRate	0x0A</div><div class='del'>-#define DAQDS_wIntMsg		0x0C</div><div class='del'>-#define DAQDS_wFlags		0x0E</div><div class='del'>-#define DAQDS__size		0x10</div><div class='del'>-</div><div class='del'>-typedef u8			BYTE;</div><div class='del'>-typedef u16			USHORT;</div><div class='del'>-typedef u16			WORD;</div><div class='del'>-typedef u32			DWORD;</div><div class='del'>-typedef void __iomem *		LPDAQD;</div><div class='del'>-</div><div class='del'>-/* Generic FIFO */</div><div class='del'>-typedef struct {</div><div class='del'>-	size_t n, len;</div><div class='del'>-	char *data;</div><div class='del'>-	int head, tail;</div><div class='del'>-} msnd_fifo;</div><div class='del'>-</div><div class='del'>-typedef struct multisound_dev {</div><div class='del'>-	/* Linux device info */</div><div class='del'>-	char *name;</div><div class='del'>-	int dsp_minor, mixer_minor;</div><div class='del'>-	int ext_midi_dev, hdr_midi_dev;</div><div class='del'>-</div><div class='del'>-	/* Hardware resources */</div><div class='del'>-	int io, numio;</div><div class='del'>-	int memid, irqid;</div><div class='del'>-	int irq, irq_ref;</div><div class='del'>-	unsigned char info;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-</div><div class='del'>-	/* Motorola 56k DSP SMA */</div><div class='del'>-	void __iomem *SMA;</div><div class='del'>-	void __iomem *DAPQ, *DARQ, *MODQ, *MIDQ, *DSPQ;</div><div class='del'>-	void __iomem *pwDSPQData, *pwMIDQData, *pwMODQData;</div><div class='del'>-	int dspq_data_buff, dspq_buff_size;</div><div class='del'>-</div><div class='del'>-	/* State variables */</div><div class='del'>-	enum { msndClassic, msndPinnacle } type;</div><div class='del'>-	fmode_t mode;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#define F_RESETTING			0</div><div class='del'>-#define F_HAVEDIGITAL			1</div><div class='del'>-#define F_AUDIO_WRITE_INUSE		2</div><div class='del'>-#define F_WRITING			3</div><div class='del'>-#define F_WRITEBLOCK			4</div><div class='del'>-#define F_WRITEFLUSH			5</div><div class='del'>-#define F_AUDIO_READ_INUSE		6</div><div class='del'>-#define F_READING			7</div><div class='del'>-#define F_READBLOCK			8</div><div class='del'>-#define F_EXT_MIDI_INUSE		9</div><div class='del'>-#define F_HDR_MIDI_INUSE		10</div><div class='del'>-#define F_DISABLE_WRITE_NDELAY		11</div><div class='del'>-	wait_queue_head_t writeblock;</div><div class='del'>-	wait_queue_head_t readblock;</div><div class='del'>-	wait_queue_head_t writeflush;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	int nresets;</div><div class='del'>-	unsigned long recsrc;</div><div class='del'>-	int left_levels[32];</div><div class='del'>-	int right_levels[32];</div><div class='del'>-	int mixer_mod_count;</div><div class='del'>-	int calibrate_signal;</div><div class='del'>-	int play_sample_size, play_sample_rate, play_channels;</div><div class='del'>-	int play_ndelay;</div><div class='del'>-	int rec_sample_size, rec_sample_rate, rec_channels;</div><div class='del'>-	int rec_ndelay;</div><div class='del'>-	BYTE bCurrentMidiPatch;</div><div class='del'>-</div><div class='del'>-	/* Digital audio FIFOs */</div><div class='del'>-	msnd_fifo DAPF, DARF;</div><div class='del'>-	int fifosize;</div><div class='del'>-	int last_playbank, last_recbank;</div><div class='del'>-</div><div class='del'>-	/* MIDI in callback */</div><div class='del'>-	void (*midi_in_interrupt)(struct multisound_dev *);</div><div class='del'>-} multisound_dev_t;</div><div class='del'>-</div><div class='del'>-#ifndef mdelay</div><div class='del'>-#  define mdelay(a)		udelay((a) * 1000)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int				msnd_register(multisound_dev_t *dev);</div><div class='del'>-void				msnd_unregister(multisound_dev_t *dev);</div><div class='del'>-</div><div class='del'>-void				msnd_init_queue(void __iomem *, int start, int size);</div><div class='del'>-</div><div class='del'>-void				msnd_fifo_init(msnd_fifo *f);</div><div class='del'>-void				msnd_fifo_free(msnd_fifo *f);</div><div class='del'>-int				msnd_fifo_alloc(msnd_fifo *f, size_t n);</div><div class='del'>-void				msnd_fifo_make_empty(msnd_fifo *f);</div><div class='del'>-int				msnd_fifo_write_io(msnd_fifo *f, char __iomem *buf, size_t len);</div><div class='del'>-int				msnd_fifo_read_io(msnd_fifo *f, char __iomem *buf, size_t len);</div><div class='del'>-int				msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len);</div><div class='del'>-int				msnd_fifo_read(msnd_fifo *f, char *buf, size_t len);</div><div class='del'>-</div><div class='del'>-int				msnd_send_dsp_cmd(multisound_dev_t *dev, BYTE cmd);</div><div class='del'>-int				msnd_send_word(multisound_dev_t *dev, unsigned char high,</div><div class='del'>-					       unsigned char mid, unsigned char low);</div><div class='del'>-int				msnd_upload_host(multisound_dev_t *dev, char *bin, int len);</div><div class='del'>-int				msnd_enable_irq(multisound_dev_t *dev);</div><div class='del'>-int				msnd_disable_irq(multisound_dev_t *dev);</div><div class='del'>-</div><div class='del'>-#endif /* __MSND_H */</div><div class='head'>diff --git a/sound/oss/msnd_classic.c b/sound/oss/msnd_classic.c<br/>deleted file mode 100644<br/>index 3b23a096fa4e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd_classic.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_classic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-/* The work is in msnd_pinnacle.c, just define MSND_CLASSIC before it. */</div><div class='del'>-#define MSND_CLASSIC</div><div class='del'>-#include "msnd_pinnacle.c"</div><div class='head'>diff --git a/sound/oss/msnd_classic.h b/sound/oss/msnd_classic.h<br/>deleted file mode 100644<br/>index 1a17dde2f650..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd_classic.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_classic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/*********************************************************************</div><div class='del'>- *</div><div class='del'>- * msnd_classic.h</div><div class='del'>- *</div><div class='del'>- * Turtle Beach MultiSound Sound Card Driver for Linux</div><div class='del'>- *</div><div class='del'>- * Some parts of this header file were derived from the Turtle Beach</div><div class='del'>- * MultiSound Driver Development Kit.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Andrew Veliath</div><div class='del'>- * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- * </div><div class='del'>- ********************************************************************/</div><div class='del'>-#ifndef __MSND_CLASSIC_H</div><div class='del'>-#define __MSND_CLASSIC_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DSP_NUMIO				0x10</div><div class='del'>-</div><div class='del'>-#define	HP_MEMM					0x08</div><div class='del'>-</div><div class='del'>-#define	HP_BITM					0x0E</div><div class='del'>-#define	HP_WAIT					0x0D</div><div class='del'>-#define	HP_DSPR					0x0A</div><div class='del'>-#define	HP_PROR					0x0B</div><div class='del'>-#define	HP_BLKS					0x0C</div><div class='del'>-</div><div class='del'>-#define	HPPRORESET_OFF				0</div><div class='del'>-#define HPPRORESET_ON				1</div><div class='del'>-</div><div class='del'>-#define HPDSPRESET_OFF				0</div><div class='del'>-#define HPDSPRESET_ON				1</div><div class='del'>-</div><div class='del'>-#define HPBLKSEL_0				0</div><div class='del'>-#define HPBLKSEL_1				1</div><div class='del'>-</div><div class='del'>-#define HPWAITSTATE_0				0</div><div class='del'>-#define HPWAITSTATE_1				1</div><div class='del'>-</div><div class='del'>-#define HPBITMODE_16				0</div><div class='del'>-#define HPBITMODE_8				1</div><div class='del'>-</div><div class='del'>-#define	HIDSP_INT_PLAY_UNDER			0x00</div><div class='del'>-#define	HIDSP_INT_RECORD_OVER			0x01</div><div class='del'>-#define	HIDSP_INPUT_CLIPPING			0x02</div><div class='del'>-#define	HIDSP_MIDI_IN_OVER			0x10</div><div class='del'>-#define	HIDSP_MIDI_OVERRUN_ERR  0x13</div><div class='del'>-</div><div class='del'>-#define	HDEXAR_CLEAR_PEAKS			1</div><div class='del'>-#define	HDEXAR_IN_SET_POTS			2</div><div class='del'>-#define	HDEXAR_AUX_SET_POTS			3</div><div class='del'>-#define	HDEXAR_CAL_A_TO_D			4</div><div class='del'>-#define	HDEXAR_RD_EXT_DSP_BITS			5</div><div class='del'>-</div><div class='del'>-#define TIME_PRO_RESET_DONE			0x028A</div><div class='del'>-#define TIME_PRO_SYSEX				0x0040</div><div class='del'>-#define TIME_PRO_RESET				0x0032</div><div class='del'>-</div><div class='del'>-#define AGND					0x01</div><div class='del'>-#define SIGNAL					0x02</div><div class='del'>-</div><div class='del'>-#define EXT_DSP_BIT_DCAL			0x0001</div><div class='del'>-#define EXT_DSP_BIT_MIDI_CON			0x0002</div><div class='del'>-</div><div class='del'>-#define BUFFSIZE				0x8000</div><div class='del'>-#define HOSTQ_SIZE				0x40</div><div class='del'>-</div><div class='del'>-#define SRAM_CNTL_START				0x7F00</div><div class='del'>-#define SMA_STRUCT_START			0x7F40</div><div class='del'>-</div><div class='del'>-#define DAP_BUFF_SIZE				0x2400</div><div class='del'>-#define DAR_BUFF_SIZE				0x2000</div><div class='del'>-</div><div class='del'>-#define DAPQ_STRUCT_SIZE			0x10</div><div class='del'>-#define DARQ_STRUCT_SIZE			0x10</div><div class='del'>-#define DAPQ_BUFF_SIZE				(3 * 0x10)</div><div class='del'>-#define DARQ_BUFF_SIZE				(3 * 0x10)</div><div class='del'>-#define MODQ_BUFF_SIZE				0x400</div><div class='del'>-#define MIDQ_BUFF_SIZE				0x200</div><div class='del'>-#define DSPQ_BUFF_SIZE				0x40</div><div class='del'>-</div><div class='del'>-#define DAPQ_DATA_BUFF				0x6C00</div><div class='del'>-#define DARQ_DATA_BUFF				0x6C30</div><div class='del'>-#define MODQ_DATA_BUFF				0x6C60</div><div class='del'>-#define MIDQ_DATA_BUFF				0x7060</div><div class='del'>-#define DSPQ_DATA_BUFF				0x7260</div><div class='del'>-</div><div class='del'>-#define DAPQ_OFFSET				SRAM_CNTL_START</div><div class='del'>-#define DARQ_OFFSET				(SRAM_CNTL_START + 0x08)</div><div class='del'>-#define MODQ_OFFSET				(SRAM_CNTL_START + 0x10)</div><div class='del'>-#define MIDQ_OFFSET				(SRAM_CNTL_START + 0x18)</div><div class='del'>-#define DSPQ_OFFSET				(SRAM_CNTL_START + 0x20)</div><div class='del'>-</div><div class='del'>-#define MOP_SYNTH				0x10</div><div class='del'>-#define MOP_EXTOUT				0x32</div><div class='del'>-#define MOP_EXTTHRU				0x02</div><div class='del'>-#define MOP_OUTMASK				0x01</div><div class='del'>-</div><div class='del'>-#define MIP_EXTIN				0x01</div><div class='del'>-#define MIP_SYNTH				0x00</div><div class='del'>-#define MIP_INMASK				0x32</div><div class='del'>-</div><div class='del'>-/* Classic SMA Common Data */</div><div class='del'>-#define SMA_wCurrPlayBytes			0x0000</div><div class='del'>-#define SMA_wCurrRecordBytes			0x0002</div><div class='del'>-#define SMA_wCurrPlayVolLeft			0x0004</div><div class='del'>-#define SMA_wCurrPlayVolRight			0x0006</div><div class='del'>-#define SMA_wCurrInVolLeft			0x0008</div><div class='del'>-#define SMA_wCurrInVolRight			0x000a</div><div class='del'>-#define SMA_wUser_3				0x000c</div><div class='del'>-#define SMA_wUser_4				0x000e</div><div class='del'>-#define SMA_dwUser_5				0x0010</div><div class='del'>-#define SMA_dwUser_6				0x0014</div><div class='del'>-#define SMA_wUser_7				0x0018</div><div class='del'>-#define SMA_wReserved_A				0x001a</div><div class='del'>-#define SMA_wReserved_B				0x001c</div><div class='del'>-#define SMA_wReserved_C				0x001e</div><div class='del'>-#define SMA_wReserved_D				0x0020</div><div class='del'>-#define SMA_wReserved_E				0x0022</div><div class='del'>-#define SMA_wReserved_F				0x0024</div><div class='del'>-#define SMA_wReserved_G				0x0026</div><div class='del'>-#define SMA_wReserved_H				0x0028</div><div class='del'>-#define SMA_wCurrDSPStatusFlags			0x002a</div><div class='del'>-#define SMA_wCurrHostStatusFlags		0x002c</div><div class='del'>-#define SMA_wCurrInputTagBits			0x002e</div><div class='del'>-#define SMA_wCurrLeftPeak			0x0030</div><div class='del'>-#define SMA_wCurrRightPeak			0x0032</div><div class='del'>-#define SMA_wExtDSPbits				0x0034</div><div class='del'>-#define SMA_bExtHostbits			0x0036</div><div class='del'>-#define SMA_bBoardLevel				0x0037</div><div class='del'>-#define SMA_bInPotPosRight			0x0038</div><div class='del'>-#define SMA_bInPotPosLeft			0x0039</div><div class='del'>-#define SMA_bAuxPotPosRight			0x003a</div><div class='del'>-#define SMA_bAuxPotPosLeft			0x003b</div><div class='del'>-#define SMA_wCurrMastVolLeft			0x003c</div><div class='del'>-#define SMA_wCurrMastVolRight			0x003e</div><div class='del'>-#define SMA_bUser_12				0x0040</div><div class='del'>-#define SMA_bUser_13				0x0041</div><div class='del'>-#define SMA_wUser_14				0x0042</div><div class='del'>-#define SMA_wUser_15				0x0044</div><div class='del'>-#define SMA_wCalFreqAtoD			0x0046</div><div class='del'>-#define SMA_wUser_16				0x0048</div><div class='del'>-#define SMA_wUser_17				0x004a</div><div class='del'>-#define SMA__size				0x004c</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_DSPCODEH</div><div class='del'>-#  include "msndperm.c"</div><div class='del'>-#  include "msndinit.c"</div><div class='del'>-#  define PERMCODE		msndperm</div><div class='del'>-#  define INITCODE		msndinit</div><div class='del'>-#  define PERMCODESIZE		sizeof(msndperm)</div><div class='del'>-#  define INITCODESIZE		sizeof(msndinit)</div><div class='del'>-#else</div><div class='del'>-#  ifndef CONFIG_MSNDCLAS_INIT_FILE</div><div class='del'>-#    define CONFIG_MSNDCLAS_INIT_FILE				\</div><div class='del'>-				"/etc/sound/msndinit.bin"</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef CONFIG_MSNDCLAS_PERM_FILE</div><div class='del'>-#    define CONFIG_MSNDCLAS_PERM_FILE				\</div><div class='del'>-				"/etc/sound/msndperm.bin"</div><div class='del'>-#  endif</div><div class='del'>-#  define PERMCODEFILE		CONFIG_MSNDCLAS_PERM_FILE</div><div class='del'>-#  define INITCODEFILE		CONFIG_MSNDCLAS_INIT_FILE</div><div class='del'>-#  define PERMCODE		dspini</div><div class='del'>-#  define INITCODE		permini</div><div class='del'>-#  define PERMCODESIZE		sizeof_dspini</div><div class='del'>-#  define INITCODESIZE		sizeof_permini</div><div class='del'>-#endif</div><div class='del'>-#define LONGNAME		"MultiSound (Classic/Monterey/Tahiti)"</div><div class='del'>-</div><div class='del'>-#endif /* __MSND_CLASSIC_H */</div><div class='head'>diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c<br/>deleted file mode 100644<br/>index 7b5c77b32a90..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd_pinnacle.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_pinnacle.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1931 +0,0 @@</div><div class='del'>-/*********************************************************************</div><div class='del'>- *</div><div class='del'>- * Turtle Beach MultiSound Sound Card Driver for Linux</div><div class='del'>- * Linux 2.0/2.2 Version</div><div class='del'>- *</div><div class='del'>- * msnd_pinnacle.c / msnd_classic.c</div><div class='del'>- *</div><div class='del'>- * -- If MSND_CLASSIC is defined:</div><div class='del'>- *</div><div class='del'>- *     -&gt; driver for Turtle Beach Classic/Monterey/Tahiti</div><div class='del'>- *</div><div class='del'>- * -- Else</div><div class='del'>- *</div><div class='del'>- *     -&gt; driver for Turtle Beach Pinnacle/Fiji</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Andrew Veliath</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- * 12-3-2000  Modified IO port validation  Steve Sycamore</div><div class='del'>- *</div><div class='del'>- ********************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sound_firmware.h"</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-# ifndef __alpha__</div><div class='del'>-#  define SLOWIO</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-#include "msnd.h"</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-#  ifdef CONFIG_MSNDCLAS_HAVE_BOOT</div><div class='del'>-#    define HAVE_DSPCODEH</div><div class='del'>-#  endif</div><div class='del'>-#  include "msnd_classic.h"</div><div class='del'>-#  define LOGNAME			"msnd_classic"</div><div class='del'>-#else</div><div class='del'>-#  ifdef CONFIG_MSNDPIN_HAVE_BOOT</div><div class='del'>-#    define HAVE_DSPCODEH</div><div class='del'>-#  endif</div><div class='del'>-#  include "msnd_pinnacle.h"</div><div class='del'>-#  define LOGNAME			"msnd_pinnacle"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSND_WRITE_NDELAY</div><div class='del'>-#  define CONFIG_MSND_WRITE_NDELAY	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define get_play_delay_jiffies(size)	((size) * HZ *			\</div><div class='del'>-					 dev.play_sample_size / 8 /	\</div><div class='del'>-					 dev.play_sample_rate /		\</div><div class='del'>-					 dev.play_channels)</div><div class='del'>-</div><div class='del'>-#define get_rec_delay_jiffies(size)	((size) * HZ *			\</div><div class='del'>-					 dev.rec_sample_size / 8 /	\</div><div class='del'>-					 dev.rec_sample_rate /		\</div><div class='del'>-					 dev.rec_channels)</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(msnd_pinnacle_mutex);</div><div class='del'>-static multisound_dev_t			dev;</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_DSPCODEH</div><div class='del'>-static char				*dspini, *permini;</div><div class='del'>-static int				sizeof_dspini, sizeof_permini;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int				dsp_full_reset(void);</div><div class='del'>-static void				dsp_write_flush(void);</div><div class='del'>-</div><div class='del'>-static __inline__ int chk_send_dsp_cmd(multisound_dev_t *dev, register BYTE cmd)</div><div class='del'>-{</div><div class='del'>-	if (msnd_send_dsp_cmd(dev, cmd) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	dsp_full_reset();</div><div class='del'>-	return msnd_send_dsp_cmd(dev, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reset_play_queue(void)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-	LPDAQD lpDAQ;</div><div class='del'>-</div><div class='del'>-	dev.last_playbank = -1;</div><div class='del'>-	writew(PCTODSP_OFFSET(0 * DAQDS__size), dev.DAPQ + JQS_wHead);</div><div class='del'>-	writew(PCTODSP_OFFSET(0 * DAQDS__size), dev.DAPQ + JQS_wTail);</div><div class='del'>-</div><div class='del'>-	for (n = 0, lpDAQ = dev.base + DAPQ_DATA_BUFF; n &lt; 3; ++n, lpDAQ += DAQDS__size) {</div><div class='del'>-		writew(PCTODSP_BASED((DWORD)(DAP_BUFF_SIZE * n)), lpDAQ + DAQDS_wStart);</div><div class='del'>-		writew(0, lpDAQ + DAQDS_wSize);</div><div class='del'>-		writew(1, lpDAQ + DAQDS_wFormat);</div><div class='del'>-		writew(dev.play_sample_size, lpDAQ + DAQDS_wSampleSize);</div><div class='del'>-		writew(dev.play_channels, lpDAQ + DAQDS_wChannels);</div><div class='del'>-		writew(dev.play_sample_rate, lpDAQ + DAQDS_wSampleRate);</div><div class='del'>-		writew(HIMT_PLAY_DONE * 0x100 + n, lpDAQ + DAQDS_wIntMsg);</div><div class='del'>-		writew(n, lpDAQ + DAQDS_wFlags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reset_record_queue(void)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-	LPDAQD lpDAQ;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	dev.last_recbank = 2;</div><div class='del'>-	writew(PCTODSP_OFFSET(0 * DAQDS__size), dev.DARQ + JQS_wHead);</div><div class='del'>-	writew(PCTODSP_OFFSET(dev.last_recbank * DAQDS__size), dev.DARQ + JQS_wTail);</div><div class='del'>-</div><div class='del'>-	/* Critical section: bank 1 access */</div><div class='del'>-	spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-	msnd_outb(HPBLKSEL_1, dev.io + HP_BLKS);</div><div class='del'>-	memset_io(dev.base, 0, DAR_BUFF_SIZE * 3);</div><div class='del'>-	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-</div><div class='del'>-	for (n = 0, lpDAQ = dev.base + DARQ_DATA_BUFF; n &lt; 3; ++n, lpDAQ += DAQDS__size) {</div><div class='del'>-		writew(PCTODSP_BASED((DWORD)(DAR_BUFF_SIZE * n)) + 0x4000, lpDAQ + DAQDS_wStart);</div><div class='del'>-		writew(DAR_BUFF_SIZE, lpDAQ + DAQDS_wSize);</div><div class='del'>-		writew(1, lpDAQ + DAQDS_wFormat);</div><div class='del'>-		writew(dev.rec_sample_size, lpDAQ + DAQDS_wSampleSize);</div><div class='del'>-		writew(dev.rec_channels, lpDAQ + DAQDS_wChannels);</div><div class='del'>-		writew(dev.rec_sample_rate, lpDAQ + DAQDS_wSampleRate);</div><div class='del'>-		writew(HIMT_RECORD_DONE * 0x100 + n, lpDAQ + DAQDS_wIntMsg);</div><div class='del'>-		writew(n, lpDAQ + DAQDS_wFlags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reset_queues(void)</div><div class='del'>-{</div><div class='del'>-	if (dev.mode &amp; FMODE_WRITE) {</div><div class='del'>-		msnd_fifo_make_empty(&amp;dev.DAPF);</div><div class='del'>-		reset_play_queue();</div><div class='del'>-	}</div><div class='del'>-	if (dev.mode &amp; FMODE_READ) {</div><div class='del'>-		msnd_fifo_make_empty(&amp;dev.DARF);</div><div class='del'>-		reset_record_queue();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_set_format(struct file *file, int val)</div><div class='del'>-{</div><div class='del'>-	int data, i;</div><div class='del'>-	LPDAQD lpDAQ, lpDARQ;</div><div class='del'>-</div><div class='del'>-	lpDAQ = dev.base + DAPQ_DATA_BUFF;</div><div class='del'>-	lpDARQ = dev.base + DARQ_DATA_BUFF;</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case AFMT_U8:</div><div class='del'>-	case AFMT_S16_LE:</div><div class='del'>-		data = val;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		data = DEFSAMPLESIZE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; ++i, lpDAQ += DAQDS__size, lpDARQ += DAQDS__size) {</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			writew(data, lpDAQ + DAQDS_wSampleSize);</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			writew(data, lpDARQ + DAQDS_wSampleSize);</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-		dev.play_sample_size = data;</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-		dev.rec_sample_size = data;</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_get_frag_size(void)</div><div class='del'>-{</div><div class='del'>-	int size;</div><div class='del'>-	size = dev.fifosize / 4;</div><div class='del'>-	if (size &gt; 32 * 1024)</div><div class='del'>-		size = 32 * 1024;</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int val, i, data, tmp;</div><div class='del'>-	LPDAQD lpDAQ, lpDARQ;</div><div class='del'>-        audio_buf_info abinfo;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int __user *p = (int __user *)arg;</div><div class='del'>-</div><div class='del'>-	lpDAQ = dev.base + DAPQ_DATA_BUFF;</div><div class='del'>-	lpDARQ = dev.base + DARQ_DATA_BUFF;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDCTL_DSP_SUBDIVIDE:</div><div class='del'>-	case SNDCTL_DSP_SETFRAGMENT:</div><div class='del'>-	case SNDCTL_DSP_SETDUPLEX:</div><div class='del'>-	case SNDCTL_DSP_POST:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETIPTR:</div><div class='del'>-	case SNDCTL_DSP_GETOPTR:</div><div class='del'>-	case SNDCTL_DSP_MAPINBUF:</div><div class='del'>-	case SNDCTL_DSP_MAPOUTBUF:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-		abinfo.fragsize = dsp_get_frag_size();</div><div class='del'>-                abinfo.bytes = dev.DAPF.n - dev.DAPF.len;</div><div class='del'>-                abinfo.fragstotal = dev.DAPF.n / abinfo.fragsize;</div><div class='del'>-                abinfo.fragments = abinfo.bytes / abinfo.fragsize;</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-		return copy_to_user((void __user *)arg, &amp;abinfo, sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETISPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-		abinfo.fragsize = dsp_get_frag_size();</div><div class='del'>-                abinfo.bytes = dev.DARF.n - dev.DARF.len;</div><div class='del'>-                abinfo.fragstotal = dev.DARF.n / abinfo.fragsize;</div><div class='del'>-                abinfo.fragments = abinfo.bytes / abinfo.fragsize;</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-		return copy_to_user((void __user *)arg, &amp;abinfo, sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_RESET:</div><div class='del'>-		dev.nresets = 0;</div><div class='del'>-		reset_queues();</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SYNC:</div><div class='del'>-		dsp_write_flush();</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETBLKSIZE:</div><div class='del'>-		tmp = dsp_get_frag_size();</div><div class='del'>-		if (put_user(tmp, p))</div><div class='del'>-                        return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETFMTS:</div><div class='del'>-		val = AFMT_S16_LE | AFMT_U8;</div><div class='del'>-		if (put_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFMT:</div><div class='del'>-		if (get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			data = val == AFMT_QUERY</div><div class='del'>-				? dev.play_sample_size</div><div class='del'>-				: dsp_set_format(file, val);</div><div class='del'>-		else</div><div class='del'>-			data = val == AFMT_QUERY</div><div class='del'>-				? dev.rec_sample_size</div><div class='del'>-				: dsp_set_format(file, val);</div><div class='del'>-</div><div class='del'>-		if (put_user(data, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_NONBLOCK:</div><div class='del'>-		if (!test_bit(F_DISABLE_WRITE_NDELAY, &amp;dev.flags) &amp;&amp;</div><div class='del'>-		    file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			dev.play_ndelay = 1;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			dev.rec_ndelay = 1;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETCAPS:</div><div class='del'>-		val = DSP_CAP_DUPLEX | DSP_CAP_BATCH;</div><div class='del'>-		if (put_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SPEED:</div><div class='del'>-		if (get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (val &lt; 8000)</div><div class='del'>-			val = 8000;</div><div class='del'>-</div><div class='del'>-		if (val &gt; 48000)</div><div class='del'>-			val = 48000;</div><div class='del'>-</div><div class='del'>-		data = val;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 3; ++i, lpDAQ += DAQDS__size, lpDARQ += DAQDS__size) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-				writew(data, lpDAQ + DAQDS_wSampleRate);</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-				writew(data, lpDARQ + DAQDS_wSampleRate);</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			dev.play_sample_rate = data;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			dev.rec_sample_rate = data;</div><div class='del'>-</div><div class='del'>-		if (put_user(data, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_CHANNELS:</div><div class='del'>-	case SNDCTL_DSP_STEREO:</div><div class='del'>-		if (get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (cmd == SNDCTL_DSP_CHANNELS) {</div><div class='del'>-			switch (val) {</div><div class='del'>-			case 1:</div><div class='del'>-			case 2:</div><div class='del'>-				data = val;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				val = data = 2;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			switch (val) {</div><div class='del'>-			case 0:</div><div class='del'>-				data = 1;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				val = 1;</div><div class='del'>-			case 1:</div><div class='del'>-				data = 2;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 3; ++i, lpDAQ += DAQDS__size, lpDARQ += DAQDS__size) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-				writew(data, lpDAQ + DAQDS_wChannels);</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-				writew(data, lpDARQ + DAQDS_wChannels);</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			dev.play_channels = data;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			dev.rec_channels = data;</div><div class='del'>-</div><div class='del'>-		if (put_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mixer_get(int d)</div><div class='del'>-{</div><div class='del'>-	if (d &gt; 31)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (d) {</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-	case SOUND_MIXER_IMIX:</div><div class='del'>-	case SOUND_MIXER_LINE1:</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	case SOUND_MIXER_MIC:</div><div class='del'>-	case SOUND_MIXER_SYNTH:</div><div class='del'>-#endif</div><div class='del'>-		return (dev.left_levels[d] &gt;&gt; 8) * 100 / 0xff | </div><div class='del'>-			(((dev.right_levels[d] &gt;&gt; 8) * 100 / 0xff) &lt;&lt; 8);</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define update_volm(a,b)						\</div><div class='del'>-	writew((dev.left_levels[a] &gt;&gt; 1) *				\</div><div class='del'>-	       readw(dev.SMA + SMA_wCurrMastVolLeft) / 0xffff,	\</div><div class='del'>-	       dev.SMA + SMA_##b##Left);				\</div><div class='del'>-	writew((dev.right_levels[a] &gt;&gt; 1)  *			\</div><div class='del'>-	       readw(dev.SMA + SMA_wCurrMastVolRight) / 0xffff,	\</div><div class='del'>-	       dev.SMA + SMA_##b##Right);</div><div class='del'>-</div><div class='del'>-#define update_potm(d,s,ar)						\</div><div class='del'>-	writeb((dev.left_levels[d] &gt;&gt; 8) *				\</div><div class='del'>-	       readw(dev.SMA + SMA_wCurrMastVolLeft) / 0xffff,	\</div><div class='del'>-	       dev.SMA + SMA_##s##Left);				\</div><div class='del'>-	writeb((dev.right_levels[d] &gt;&gt; 8) *				\</div><div class='del'>-	       readw(dev.SMA + SMA_wCurrMastVolRight) / 0xffff,	\</div><div class='del'>-	       dev.SMA + SMA_##s##Right);				\</div><div class='del'>-	if (msnd_send_word(&amp;dev, 0, 0, ar) == 0)			\</div><div class='del'>-		chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-</div><div class='del'>-#define update_pot(d,s,ar)				\</div><div class='del'>-	writeb(dev.left_levels[d] &gt;&gt; 8,		\</div><div class='del'>-	       dev.SMA + SMA_##s##Left);		\</div><div class='del'>-	writeb(dev.right_levels[d] &gt;&gt; 8,		\</div><div class='del'>-	       dev.SMA + SMA_##s##Right);		\</div><div class='del'>-	if (msnd_send_word(&amp;dev, 0, 0, ar) == 0)	\</div><div class='del'>-		chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-</div><div class='del'>-static int mixer_set(int d, int value)</div><div class='del'>-{</div><div class='del'>-	int left = value &amp; 0x000000ff;</div><div class='del'>-	int right = (value &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-	int bLeft, bRight;</div><div class='del'>-	int wLeft, wRight;</div><div class='del'>-	int updatemaster = 0;</div><div class='del'>-</div><div class='del'>-	if (d &gt; 31)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bLeft = left * 0xff / 100;</div><div class='del'>-	wLeft = left * 0xffff / 100;</div><div class='del'>-</div><div class='del'>-	bRight = right * 0xff / 100;</div><div class='del'>-	wRight = right * 0xffff / 100;</div><div class='del'>-</div><div class='del'>-	dev.left_levels[d] = wLeft;</div><div class='del'>-	dev.right_levels[d] = wRight;</div><div class='del'>-</div><div class='del'>-	switch (d) {</div><div class='del'>-		/* master volume unscaled controls */</div><div class='del'>-	case SOUND_MIXER_LINE:			/* line pot control */</div><div class='del'>-		/* scaled by IMIX in digital mix */</div><div class='del'>-		writeb(bLeft, dev.SMA + SMA_bInPotPosLeft);</div><div class='del'>-		writeb(bRight, dev.SMA + SMA_bInPotPosRight);</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_IN_SET_POTS) == 0)</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-		break;</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	case SOUND_MIXER_MIC:			/* mic pot control */</div><div class='del'>-		/* scaled by IMIX in digital mix */</div><div class='del'>-		writeb(bLeft, dev.SMA + SMA_bMicPotPosLeft);</div><div class='del'>-		writeb(bRight, dev.SMA + SMA_bMicPotPosRight);</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_MIC_SET_POTS) == 0)</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	case SOUND_MIXER_VOLUME:		/* master volume */</div><div class='del'>-		writew(wLeft, dev.SMA + SMA_wCurrMastVolLeft);</div><div class='del'>-		writew(wRight, dev.SMA + SMA_wCurrMastVolRight);</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_LINE1:			/* aux pot control */</div><div class='del'>-		/* scaled by master volume */</div><div class='del'>-		/* fall through */</div><div class='del'>-</div><div class='del'>-		/* digital controls */</div><div class='del'>-	case SOUND_MIXER_SYNTH:			/* synth vol (dsp mix) */</div><div class='del'>-	case SOUND_MIXER_PCM:			/* pcm vol (dsp mix) */</div><div class='del'>-	case SOUND_MIXER_IMIX:			/* input monitor (dsp mix) */</div><div class='del'>-		/* scaled by master volume */</div><div class='del'>-		updatemaster = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (updatemaster) {</div><div class='del'>-		/* update master volume scaled controls */</div><div class='del'>-		update_volm(SOUND_MIXER_PCM, wCurrPlayVol);</div><div class='del'>-		update_volm(SOUND_MIXER_IMIX, wCurrInVol);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-		update_volm(SOUND_MIXER_SYNTH, wCurrMHdrVol);</div><div class='del'>-#endif</div><div class='del'>-		update_potm(SOUND_MIXER_LINE1, bAuxPotPos, HDEXAR_AUX_SET_POTS);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mixer_get(d);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mixer_setup(void)</div><div class='del'>-{</div><div class='del'>-	update_pot(SOUND_MIXER_LINE, bInPotPos, HDEXAR_IN_SET_POTS);</div><div class='del'>-	update_potm(SOUND_MIXER_LINE1, bAuxPotPos, HDEXAR_AUX_SET_POTS);</div><div class='del'>-	update_volm(SOUND_MIXER_PCM, wCurrPlayVol);</div><div class='del'>-	update_volm(SOUND_MIXER_IMIX, wCurrInVol);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	update_pot(SOUND_MIXER_MIC, bMicPotPos, HDEXAR_MIC_SET_POTS);</div><div class='del'>-	update_volm(SOUND_MIXER_SYNTH, wCurrMHdrVol);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long set_recsrc(unsigned long recsrc)</div><div class='del'>-{</div><div class='del'>-	if (dev.recsrc == recsrc)</div><div class='del'>-		return dev.recsrc;</div><div class='del'>-#ifdef HAVE_NORECSRC</div><div class='del'>-	else if (recsrc == 0)</div><div class='del'>-		dev.recsrc = 0;</div><div class='del'>-#endif</div><div class='del'>-	else</div><div class='del'>-		dev.recsrc ^= recsrc;</div><div class='del'>-</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	if (dev.recsrc &amp; SOUND_MASK_IMIX) {</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_SET_ANA_IN) == 0)</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-	}</div><div class='del'>-	else if (dev.recsrc &amp; SOUND_MASK_SYNTH) {</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_SET_SYNTH_IN) == 0)</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-	}</div><div class='del'>-	else if ((dev.recsrc &amp; SOUND_MASK_DIGITAL1) &amp;&amp; test_bit(F_HAVEDIGITAL, &amp;dev.flags)) {</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_SET_DAT_IN) == 0)</div><div class='del'>-      			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-#ifdef HAVE_NORECSRC</div><div class='del'>-		/* Select no input (?) */</div><div class='del'>-		dev.recsrc = 0;</div><div class='del'>-#else</div><div class='del'>-		dev.recsrc = SOUND_MASK_IMIX;</div><div class='del'>-		if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_SET_ANA_IN) == 0)</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-</div><div class='del'>-	return dev.recsrc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long force_recsrc(unsigned long recsrc)</div><div class='del'>-{</div><div class='del'>-	dev.recsrc = 0;</div><div class='del'>-	return set_recsrc(recsrc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define set_mixer_info()							\</div><div class='del'>-		memset(&amp;info, 0, sizeof(info));					\</div><div class='del'>-		strlcpy(info.id, "MSNDMIXER", sizeof(info.id));			\</div><div class='del'>-		strlcpy(info.name, "MultiSound Mixer", sizeof(info.name));</div><div class='del'>-</div><div class='del'>-static int mixer_ioctl(unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	if (cmd == SOUND_MIXER_INFO) {</div><div class='del'>-		mixer_info info;</div><div class='del'>-		set_mixer_info();</div><div class='del'>-		info.modify_counter = dev.mixer_mod_count;</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (cmd == SOUND_OLD_MIXER_INFO) {</div><div class='del'>-		_old_mixer_info info;</div><div class='del'>-		set_mixer_info();</div><div class='del'>-		if (copy_to_user((void __user *)arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (cmd == SOUND_MIXER_PRIVATE1) {</div><div class='del'>-		dev.nresets = 0;</div><div class='del'>-		dsp_full_reset();</div><div class='del'>-		return 0;</div><div class='del'>-	} else if (((cmd &gt;&gt; 8) &amp; 0xff) == 'M') {</div><div class='del'>-		int val = 0;</div><div class='del'>-</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) {</div><div class='del'>-			switch (cmd &amp; 0xff) {</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				if (get_user(val, (int __user *)arg))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				val = set_recsrc(val);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				if (get_user(val, (int __user *)arg))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				val = mixer_set(cmd &amp; 0xff, val);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			++dev.mixer_mod_count;</div><div class='del'>-			return put_user(val, (int __user *)arg);</div><div class='del'>-		} else {</div><div class='del'>-			switch (cmd &amp; 0xff) {</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				val = dev.recsrc;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SOUND_MIXER_DEVMASK:</div><div class='del'>-			case SOUND_MIXER_STEREODEVS:</div><div class='del'>-				val =   SOUND_MASK_PCM |</div><div class='del'>-					SOUND_MASK_LINE |</div><div class='del'>-					SOUND_MASK_IMIX |</div><div class='del'>-					SOUND_MASK_LINE1 |</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-					SOUND_MASK_MIC |</div><div class='del'>-					SOUND_MASK_SYNTH |</div><div class='del'>-#endif</div><div class='del'>-					SOUND_MASK_VOLUME;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_RECMASK:</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-				val =   0;</div><div class='del'>-#else</div><div class='del'>-				val =   SOUND_MASK_IMIX |</div><div class='del'>-					SOUND_MASK_SYNTH;</div><div class='del'>-				if (test_bit(F_HAVEDIGITAL, &amp;dev.flags))</div><div class='del'>-					val |= SOUND_MASK_DIGITAL1;</div><div class='del'>-#endif</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_CAPS:</div><div class='del'>-				val =   SOUND_CAP_EXCL_INPUT;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				if ((val = mixer_get(cmd &amp; 0xff)) &lt; 0)</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return put_user(val, (int __user *)arg); </div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (cmd == OSS_GETVERSION) {</div><div class='del'>-		int sound_version = SOUND_VERSION;</div><div class='del'>-		return put_user(sound_version, (int __user *)arg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-	if (minor == dev.dsp_minor)</div><div class='del'>-		ret = dsp_ioctl(file, cmd, arg);</div><div class='del'>-	else if (minor == dev.mixer_minor)</div><div class='del'>-		ret = mixer_ioctl(cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsp_write_flush(void)</div><div class='del'>-{</div><div class='del'>-	if (!(dev.mode &amp; FMODE_WRITE) || !test_bit(F_WRITING, &amp;dev.flags))</div><div class='del'>-		return;</div><div class='del'>-	set_bit(F_WRITEFLUSH, &amp;dev.flags);</div><div class='del'>-	interruptible_sleep_on_timeout(</div><div class='del'>-		&amp;dev.writeflush,</div><div class='del'>-		get_play_delay_jiffies(dev.DAPF.len));</div><div class='del'>-	clear_bit(F_WRITEFLUSH, &amp;dev.flags);</div><div class='del'>-	if (!signal_pending(current)) {</div><div class='del'>-		current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-		schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE));</div><div class='del'>-	}</div><div class='del'>-	clear_bit(F_WRITING, &amp;dev.flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsp_halt(struct file *file)</div><div class='del'>-{</div><div class='del'>-	if ((file ? file-&gt;f_mode : dev.mode) &amp; FMODE_READ) {</div><div class='del'>-		clear_bit(F_READING, &amp;dev.flags);</div><div class='del'>-		chk_send_dsp_cmd(&amp;dev, HDEX_RECORD_STOP);</div><div class='del'>-		msnd_disable_irq(&amp;dev);</div><div class='del'>-		if (file) {</div><div class='del'>-			printk(KERN_DEBUG LOGNAME ": Stopping read for %p\n", file);</div><div class='del'>-			dev.mode &amp;= ~FMODE_READ;</div><div class='del'>-		}</div><div class='del'>-		clear_bit(F_AUDIO_READ_INUSE, &amp;dev.flags);</div><div class='del'>-	}</div><div class='del'>-	if ((file ? file-&gt;f_mode : dev.mode) &amp; FMODE_WRITE) {</div><div class='del'>-		if (test_bit(F_WRITING, &amp;dev.flags)) {</div><div class='del'>-			dsp_write_flush();</div><div class='del'>-			chk_send_dsp_cmd(&amp;dev, HDEX_PLAY_STOP);</div><div class='del'>-		}</div><div class='del'>-		msnd_disable_irq(&amp;dev);</div><div class='del'>-		if (file) {</div><div class='del'>-			printk(KERN_DEBUG LOGNAME ": Stopping write for %p\n", file);</div><div class='del'>-			dev.mode &amp;= ~FMODE_WRITE;</div><div class='del'>-		}</div><div class='del'>-		clear_bit(F_AUDIO_WRITE_INUSE, &amp;dev.flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_release(struct file *file)</div><div class='del'>-{</div><div class='del'>-	dsp_halt(file);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_open(struct file *file)</div><div class='del'>-{</div><div class='del'>-	if ((file ? file-&gt;f_mode : dev.mode) &amp; FMODE_WRITE) {</div><div class='del'>-		set_bit(F_AUDIO_WRITE_INUSE, &amp;dev.flags);</div><div class='del'>-		clear_bit(F_WRITING, &amp;dev.flags);</div><div class='del'>-		msnd_fifo_make_empty(&amp;dev.DAPF);</div><div class='del'>-		reset_play_queue();</div><div class='del'>-		if (file) {</div><div class='del'>-			printk(KERN_DEBUG LOGNAME ": Starting write for %p\n", file);</div><div class='del'>-			dev.mode |= FMODE_WRITE;</div><div class='del'>-		}</div><div class='del'>-		msnd_enable_irq(&amp;dev);</div><div class='del'>-	}</div><div class='del'>-	if ((file ? file-&gt;f_mode : dev.mode) &amp; FMODE_READ) {</div><div class='del'>-		set_bit(F_AUDIO_READ_INUSE, &amp;dev.flags);</div><div class='del'>-		clear_bit(F_READING, &amp;dev.flags);</div><div class='del'>-		msnd_fifo_make_empty(&amp;dev.DARF);</div><div class='del'>-		reset_record_queue();</div><div class='del'>-		if (file) {</div><div class='del'>-			printk(KERN_DEBUG LOGNAME ": Starting read for %p\n", file);</div><div class='del'>-			dev.mode |= FMODE_READ;</div><div class='del'>-		}</div><div class='del'>-		msnd_enable_irq(&amp;dev);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_default_play_audio_parameters(void)</div><div class='del'>-{</div><div class='del'>-	dev.play_sample_size = DEFSAMPLESIZE;</div><div class='del'>-	dev.play_sample_rate = DEFSAMPLERATE;</div><div class='del'>-	dev.play_channels = DEFCHANNELS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_default_rec_audio_parameters(void)</div><div class='del'>-{</div><div class='del'>-	dev.rec_sample_size = DEFSAMPLESIZE;</div><div class='del'>-	dev.rec_sample_rate = DEFSAMPLERATE;</div><div class='del'>-	dev.rec_channels = DEFCHANNELS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_default_audio_parameters(void)</div><div class='del'>-{</div><div class='del'>-	set_default_play_audio_parameters();</div><div class='del'>-	set_default_rec_audio_parameters();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dev_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(inode);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-	if (minor == dev.dsp_minor) {</div><div class='del'>-		if ((file-&gt;f_mode &amp; FMODE_WRITE &amp;&amp;</div><div class='del'>-		     test_bit(F_AUDIO_WRITE_INUSE, &amp;dev.flags)) ||</div><div class='del'>-		    (file-&gt;f_mode &amp; FMODE_READ &amp;&amp;</div><div class='del'>-		     test_bit(F_AUDIO_READ_INUSE, &amp;dev.flags))) {</div><div class='del'>-			err = -EBUSY;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((err = dsp_open(file)) &gt;= 0) {</div><div class='del'>-			dev.nresets = 0;</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				set_default_play_audio_parameters();</div><div class='del'>-				if (!test_bit(F_DISABLE_WRITE_NDELAY, &amp;dev.flags))</div><div class='del'>-					dev.play_ndelay = (file-&gt;f_flags &amp; O_NDELAY) ? 1 : 0;</div><div class='del'>-				else</div><div class='del'>-					dev.play_ndelay = 0;</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				set_default_rec_audio_parameters();</div><div class='del'>-				dev.rec_ndelay = (file-&gt;f_flags &amp; O_NDELAY) ? 1 : 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (minor == dev.mixer_minor) {</div><div class='del'>-		/* nothing */</div><div class='del'>-	} else</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dev_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(inode);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-	if (minor == dev.dsp_minor)</div><div class='del'>-		err = dsp_release(file);</div><div class='del'>-	else if (minor == dev.mixer_minor) {</div><div class='del'>-		/* nothing */</div><div class='del'>-	} else</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	mutex_unlock(&amp;msnd_pinnacle_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ int pack_DARQ_to_DARF(register int bank)</div><div class='del'>-{</div><div class='del'>-	register int size, timeout = 3;</div><div class='del'>-	register WORD wTmp;</div><div class='del'>-	LPDAQD DAQD;</div><div class='del'>-</div><div class='del'>-	/* Increment the tail and check for queue wrap */</div><div class='del'>-	wTmp = readw(dev.DARQ + JQS_wTail) + PCTODSP_OFFSET(DAQDS__size);</div><div class='del'>-	if (wTmp &gt; readw(dev.DARQ + JQS_wSize))</div><div class='del'>-		wTmp = 0;</div><div class='del'>-	while (wTmp == readw(dev.DARQ + JQS_wHead) &amp;&amp; timeout--)</div><div class='del'>-		udelay(1);</div><div class='del'>-	writew(wTmp, dev.DARQ + JQS_wTail);</div><div class='del'>-</div><div class='del'>-	/* Get our digital audio queue struct */</div><div class='del'>-	DAQD = bank * DAQDS__size + dev.base + DARQ_DATA_BUFF;</div><div class='del'>-</div><div class='del'>-	/* Get length of data */</div><div class='del'>-	size = readw(DAQD + DAQDS_wSize);</div><div class='del'>-</div><div class='del'>-	/* Read data from the head (unprotected bank 1 access okay</div><div class='del'>-           since this is only called inside an interrupt) */</div><div class='del'>-	msnd_outb(HPBLKSEL_1, dev.io + HP_BLKS);</div><div class='del'>-	msnd_fifo_write_io(</div><div class='del'>-		&amp;dev.DARF,</div><div class='del'>-		dev.base + bank * DAR_BUFF_SIZE,</div><div class='del'>-		size);</div><div class='del'>-	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ int pack_DAPF_to_DAPQ(register int start)</div><div class='del'>-{</div><div class='del'>-	register WORD DAPQ_tail;</div><div class='del'>-	register int protect = start, nbanks = 0;</div><div class='del'>-	LPDAQD DAQD;</div><div class='del'>-</div><div class='del'>-	DAPQ_tail = readw(dev.DAPQ + JQS_wTail);</div><div class='del'>-	while (DAPQ_tail != readw(dev.DAPQ + JQS_wHead) || start) {</div><div class='del'>-		register int bank_num = DAPQ_tail / PCTODSP_OFFSET(DAQDS__size);</div><div class='del'>-		register int n;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		/* Write the data to the new tail */</div><div class='del'>-		if (protect) {</div><div class='del'>-			/* Critical section: protect fifo in non-interrupt */</div><div class='del'>-			spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-			n = msnd_fifo_read_io(</div><div class='del'>-				&amp;dev.DAPF,</div><div class='del'>-				dev.base + bank_num * DAP_BUFF_SIZE,</div><div class='del'>-				DAP_BUFF_SIZE);</div><div class='del'>-			spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-		} else {</div><div class='del'>-			n = msnd_fifo_read_io(</div><div class='del'>-				&amp;dev.DAPF,</div><div class='del'>-				dev.base + bank_num * DAP_BUFF_SIZE,</div><div class='del'>-				DAP_BUFF_SIZE);</div><div class='del'>-		}</div><div class='del'>-		if (!n)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (start)</div><div class='del'>-			start = 0;</div><div class='del'>-</div><div class='del'>-		/* Get our digital audio queue struct */</div><div class='del'>-		DAQD = bank_num * DAQDS__size + dev.base + DAPQ_DATA_BUFF;</div><div class='del'>-</div><div class='del'>-		/* Write size of this bank */</div><div class='del'>-		writew(n, DAQD + DAQDS_wSize);</div><div class='del'>-		++nbanks;</div><div class='del'>-</div><div class='del'>-		/* Then advance the tail */</div><div class='del'>-		DAPQ_tail = (++bank_num % 3) * PCTODSP_OFFSET(DAQDS__size);</div><div class='del'>-		writew(DAPQ_tail, dev.DAPQ + JQS_wTail);</div><div class='del'>-		/* Tell the DSP to play the bank */</div><div class='del'>-		msnd_send_dsp_cmd(&amp;dev, HDEX_PLAY_START);</div><div class='del'>-	}</div><div class='del'>-	return nbanks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_read(char __user *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = len;</div><div class='del'>-	char *page = (char *)__get_free_page(GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		int n, k;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		k = PAGE_SIZE;</div><div class='del'>-		if (k &gt; count)</div><div class='del'>-			k = count;</div><div class='del'>-</div><div class='del'>-		/* Critical section: protect fifo in non-interrupt */</div><div class='del'>-		spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-		n = msnd_fifo_read(&amp;dev.DARF, page, k);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-		if (copy_to_user(buf, page, n)) {</div><div class='del'>-			free_page((unsigned long)page);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-		buf += n;</div><div class='del'>-		count -= n;</div><div class='del'>-</div><div class='del'>-		if (n == k &amp;&amp; count)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!test_bit(F_READING, &amp;dev.flags) &amp;&amp; dev.mode &amp; FMODE_READ) {</div><div class='del'>-			dev.last_recbank = -1;</div><div class='del'>-			if (chk_send_dsp_cmd(&amp;dev, HDEX_RECORD_START) == 0)</div><div class='del'>-				set_bit(F_READING, &amp;dev.flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev.rec_ndelay) {</div><div class='del'>-			free_page((unsigned long)page);</div><div class='del'>-			return count == len ? -EAGAIN : len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (count &gt; 0) {</div><div class='del'>-			set_bit(F_READBLOCK, &amp;dev.flags);</div><div class='del'>-			if (!interruptible_sleep_on_timeout(</div><div class='del'>-				&amp;dev.readblock,</div><div class='del'>-				get_rec_delay_jiffies(DAR_BUFF_SIZE)))</div><div class='del'>-				clear_bit(F_READING, &amp;dev.flags);</div><div class='del'>-			clear_bit(F_READBLOCK, &amp;dev.flags);</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-				free_page((unsigned long)page);</div><div class='del'>-				return -EINTR;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	free_page((unsigned long)page);</div><div class='del'>-	return len - count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_write(const char __user *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	int count = len;</div><div class='del'>-	char *page = (char *)__get_free_page(GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!page)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		int n, k;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		k = PAGE_SIZE;</div><div class='del'>-		if (k &gt; count)</div><div class='del'>-			k = count;</div><div class='del'>-</div><div class='del'>-		if (copy_from_user(page, buf, k)) {</div><div class='del'>-			free_page((unsigned long)page);</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Critical section: protect fifo in non-interrupt */</div><div class='del'>-		spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-		n = msnd_fifo_write(&amp;dev.DAPF, page, k);</div><div class='del'>-		spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-		buf += n;</div><div class='del'>-		count -= n;</div><div class='del'>-</div><div class='del'>-		if (count &amp;&amp; n == k)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!test_bit(F_WRITING, &amp;dev.flags) &amp;&amp; (dev.mode &amp; FMODE_WRITE)) {</div><div class='del'>-			dev.last_playbank = -1;</div><div class='del'>-			if (pack_DAPF_to_DAPQ(1) &gt; 0)</div><div class='del'>-				set_bit(F_WRITING, &amp;dev.flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (dev.play_ndelay) {</div><div class='del'>-			free_page((unsigned long)page);</div><div class='del'>-			return count == len ? -EAGAIN : len - count;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (count &gt; 0) {</div><div class='del'>-			set_bit(F_WRITEBLOCK, &amp;dev.flags);</div><div class='del'>-			interruptible_sleep_on_timeout(</div><div class='del'>-				&amp;dev.writeblock,</div><div class='del'>-				get_play_delay_jiffies(DAP_BUFF_SIZE));</div><div class='del'>-			clear_bit(F_WRITEBLOCK, &amp;dev.flags);</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-				free_page((unsigned long)page);</div><div class='del'>-				return -EINTR;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_page((unsigned long)page);</div><div class='del'>-	return len - count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	if (minor == dev.dsp_minor)</div><div class='del'>-		return dsp_read(buf, count);</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	if (minor == dev.dsp_minor)</div><div class='del'>-		return dsp_write(buf, count);</div><div class='del'>-	else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ void eval_dsp_msg(register WORD wMessage)</div><div class='del'>-{</div><div class='del'>-	switch (HIBYTE(wMessage)) {</div><div class='del'>-	case HIMT_PLAY_DONE:</div><div class='del'>-		if (dev.last_playbank == LOBYTE(wMessage) || !test_bit(F_WRITING, &amp;dev.flags))</div><div class='del'>-			break;</div><div class='del'>-		dev.last_playbank = LOBYTE(wMessage);</div><div class='del'>-</div><div class='del'>-		if (pack_DAPF_to_DAPQ(0) &lt;= 0) {</div><div class='del'>-			if (!test_bit(F_WRITEBLOCK, &amp;dev.flags)) {</div><div class='del'>-				if (test_and_clear_bit(F_WRITEFLUSH, &amp;dev.flags))</div><div class='del'>-					wake_up_interruptible(&amp;dev.writeflush);</div><div class='del'>-			}</div><div class='del'>-			clear_bit(F_WRITING, &amp;dev.flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (test_bit(F_WRITEBLOCK, &amp;dev.flags))</div><div class='del'>-			wake_up_interruptible(&amp;dev.writeblock);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HIMT_RECORD_DONE:</div><div class='del'>-		if (dev.last_recbank == LOBYTE(wMessage))</div><div class='del'>-			break;</div><div class='del'>-		dev.last_recbank = LOBYTE(wMessage);</div><div class='del'>-</div><div class='del'>-		pack_DARQ_to_DARF(dev.last_recbank);</div><div class='del'>-</div><div class='del'>-		if (test_bit(F_READBLOCK, &amp;dev.flags))</div><div class='del'>-			wake_up_interruptible(&amp;dev.readblock);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HIMT_DSP:</div><div class='del'>-		switch (LOBYTE(wMessage)) {</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-		case HIDSP_PLAY_UNDER:</div><div class='del'>-#endif</div><div class='del'>-		case HIDSP_INT_PLAY_UNDER:</div><div class='del'>-/*			printk(KERN_DEBUG LOGNAME ": Play underflow\n"); */</div><div class='del'>-			clear_bit(F_WRITING, &amp;dev.flags);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case HIDSP_INT_RECORD_OVER:</div><div class='del'>-/*			printk(KERN_DEBUG LOGNAME ": Record overflow\n"); */</div><div class='del'>-			clear_bit(F_READING, &amp;dev.flags);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-/*			printk(KERN_DEBUG LOGNAME ": DSP message %d 0x%02x\n",</div><div class='del'>-			LOBYTE(wMessage), LOBYTE(wMessage)); */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-        case HIMT_MIDI_IN_UCHAR:</div><div class='del'>-		if (dev.midi_in_interrupt)</div><div class='del'>-			(*dev.midi_in_interrupt)(&amp;dev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-/*		printk(KERN_DEBUG LOGNAME ": HIMT message %d 0x%02x\n", HIBYTE(wMessage), HIBYTE(wMessage)); */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	/* Send ack to DSP */</div><div class='del'>-	msnd_inb(dev.io + HP_RXL);</div><div class='del'>-</div><div class='del'>-	/* Evaluate queued DSP messages */</div><div class='del'>-	while (readw(dev.DSPQ + JQS_wTail) != readw(dev.DSPQ + JQS_wHead)) {</div><div class='del'>-		register WORD wTmp;</div><div class='del'>-</div><div class='del'>-		eval_dsp_msg(readw(dev.pwDSPQData + 2*readw(dev.DSPQ + JQS_wHead)));</div><div class='del'>-</div><div class='del'>-		if ((wTmp = readw(dev.DSPQ + JQS_wHead) + 1) &gt; readw(dev.DSPQ + JQS_wSize))</div><div class='del'>-			writew(0, dev.DSPQ + JQS_wHead);</div><div class='del'>-		else</div><div class='del'>-			writew(wTmp, dev.DSPQ + JQS_wHead);</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dev_fileops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.read		= dev_read,</div><div class='del'>-	.write		= dev_write,</div><div class='del'>-	.unlocked_ioctl	= dev_ioctl,</div><div class='del'>-	.open		= dev_open,</div><div class='del'>-	.release	= dev_release,</div><div class='del'>-	.llseek		= noop_llseek,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int reset_dsp(void)</div><div class='del'>-{</div><div class='del'>-	int timeout = 100;</div><div class='del'>-</div><div class='del'>-	msnd_outb(HPDSPRESET_ON, dev.io + HP_DSPR);</div><div class='del'>-	mdelay(1);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	dev.info = msnd_inb(dev.io + HP_INFO);</div><div class='del'>-#endif</div><div class='del'>-	msnd_outb(HPDSPRESET_OFF, dev.io + HP_DSPR);</div><div class='del'>-	mdelay(1);</div><div class='del'>-	while (timeout-- &gt; 0) {</div><div class='del'>-		if (msnd_inb(dev.io + HP_CVR) == HP_CVR_DEF)</div><div class='del'>-			return 0;</div><div class='del'>-		mdelay(1);</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_ERR LOGNAME ": Cannot reset DSP\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_multisound(void)</div><div class='del'>-{</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	char *xv, *rev = NULL;</div><div class='del'>-	char *pin = "Pinnacle", *fiji = "Fiji";</div><div class='del'>-	char *pinfiji = "Pinnacle/Fiji";</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!request_region(dev.io, dev.numio, "probing")) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": I/O port conflict\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (reset_dsp() &lt; 0) {</div><div class='del'>-		release_region(dev.io, dev.numio);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	dev.name = "Classic/Tahiti/Monterey";</div><div class='del'>-	printk(KERN_INFO LOGNAME ": %s, "</div><div class='del'>-#else</div><div class='del'>-	switch (dev.info &gt;&gt; 4) {</div><div class='del'>-	case 0xf: xv = "&lt;= 1.15"; break;</div><div class='del'>-	case 0x1: xv = "1.18/1.2"; break;</div><div class='del'>-	case 0x2: xv = "1.3"; break;</div><div class='del'>-	case 0x3: xv = "1.4"; break;</div><div class='del'>-	default: xv = "unknown"; break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dev.info &amp; 0x7) {</div><div class='del'>-	case 0x0: rev = "I"; dev.name = pin; break;</div><div class='del'>-	case 0x1: rev = "F"; dev.name = pin; break;</div><div class='del'>-	case 0x2: rev = "G"; dev.name = pin; break;</div><div class='del'>-	case 0x3: rev = "H"; dev.name = pin; break;</div><div class='del'>-	case 0x4: rev = "E"; dev.name = fiji; break;</div><div class='del'>-	case 0x5: rev = "C"; dev.name = fiji; break;</div><div class='del'>-	case 0x6: rev = "D"; dev.name = fiji; break;</div><div class='del'>-	case 0x7:</div><div class='del'>-		rev = "A-B (Fiji) or A-E (Pinnacle)";</div><div class='del'>-		dev.name = pinfiji;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_INFO LOGNAME ": %s revision %s, Xilinx version %s, "</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-	       "I/O 0x%x-0x%x, IRQ %d, memory mapped to %p-%p\n",</div><div class='del'>-	       dev.name,</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	       rev, xv,</div><div class='del'>-#endif</div><div class='del'>-	       dev.io, dev.io + dev.numio - 1,</div><div class='del'>-	       dev.irq,</div><div class='del'>-	       dev.base, dev.base + 0x7fff);</div><div class='del'>-</div><div class='del'>-	release_region(dev.io, dev.numio);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_sma(void)</div><div class='del'>-{</div><div class='del'>-	static int initted;</div><div class='del'>-	WORD mastVolLeft, mastVolRight;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	msnd_outb(dev.memid, dev.io + HP_MEMM);</div><div class='del'>-#endif</div><div class='del'>-	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);</div><div class='del'>-	if (initted) {</div><div class='del'>-		mastVolLeft = readw(dev.SMA + SMA_wCurrMastVolLeft);</div><div class='del'>-		mastVolRight = readw(dev.SMA + SMA_wCurrMastVolRight);</div><div class='del'>-	} else</div><div class='del'>-		mastVolLeft = mastVolRight = 0;</div><div class='del'>-	memset_io(dev.base, 0, 0x8000);</div><div class='del'>-</div><div class='del'>-	/* Critical section: bank 1 access */</div><div class='del'>-	spin_lock_irqsave(&amp;dev.lock, flags);</div><div class='del'>-	msnd_outb(HPBLKSEL_1, dev.io + HP_BLKS);</div><div class='del'>-	memset_io(dev.base, 0, 0x8000);</div><div class='del'>-	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);</div><div class='del'>-	spin_unlock_irqrestore(&amp;dev.lock, flags);</div><div class='del'>-</div><div class='del'>-	dev.pwDSPQData = (dev.base + DSPQ_DATA_BUFF);</div><div class='del'>-	dev.pwMODQData = (dev.base + MODQ_DATA_BUFF);</div><div class='del'>-	dev.pwMIDQData = (dev.base + MIDQ_DATA_BUFF);</div><div class='del'>-</div><div class='del'>-	/* Motorola 56k shared memory base */</div><div class='del'>-	dev.SMA = dev.base + SMA_STRUCT_START;</div><div class='del'>-</div><div class='del'>-	/* Digital audio play queue */</div><div class='del'>-	dev.DAPQ = dev.base + DAPQ_OFFSET;</div><div class='del'>-	msnd_init_queue(dev.DAPQ, DAPQ_DATA_BUFF, DAPQ_BUFF_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Digital audio record queue */</div><div class='del'>-	dev.DARQ = dev.base + DARQ_OFFSET;</div><div class='del'>-	msnd_init_queue(dev.DARQ, DARQ_DATA_BUFF, DARQ_BUFF_SIZE);</div><div class='del'>-</div><div class='del'>-	/* MIDI out queue */</div><div class='del'>-	dev.MODQ = dev.base + MODQ_OFFSET;</div><div class='del'>-	msnd_init_queue(dev.MODQ, MODQ_DATA_BUFF, MODQ_BUFF_SIZE);</div><div class='del'>-</div><div class='del'>-	/* MIDI in queue */</div><div class='del'>-	dev.MIDQ = dev.base + MIDQ_OFFSET;</div><div class='del'>-	msnd_init_queue(dev.MIDQ, MIDQ_DATA_BUFF, MIDQ_BUFF_SIZE);</div><div class='del'>-</div><div class='del'>-	/* DSP -&gt; host message queue */</div><div class='del'>-	dev.DSPQ = dev.base + DSPQ_OFFSET;</div><div class='del'>-	msnd_init_queue(dev.DSPQ, DSPQ_DATA_BUFF, DSPQ_BUFF_SIZE);</div><div class='del'>-</div><div class='del'>-	/* Setup some DSP values */</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	writew(1, dev.SMA + SMA_wCurrPlayFormat);</div><div class='del'>-	writew(dev.play_sample_size, dev.SMA + SMA_wCurrPlaySampleSize);</div><div class='del'>-	writew(dev.play_channels, dev.SMA + SMA_wCurrPlayChannels);</div><div class='del'>-	writew(dev.play_sample_rate, dev.SMA + SMA_wCurrPlaySampleRate);</div><div class='del'>-#endif</div><div class='del'>-	writew(dev.play_sample_rate, dev.SMA + SMA_wCalFreqAtoD);</div><div class='del'>-	writew(mastVolLeft, dev.SMA + SMA_wCurrMastVolLeft);</div><div class='del'>-	writew(mastVolRight, dev.SMA + SMA_wCurrMastVolRight);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	writel(0x00010000, dev.SMA + SMA_dwCurrPlayPitch);</div><div class='del'>-	writel(0x00000001, dev.SMA + SMA_dwCurrPlayRate);</div><div class='del'>-#endif</div><div class='del'>-	writew(0x303, dev.SMA + SMA_wCurrInputTagBits);</div><div class='del'>-</div><div class='del'>-	initted = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init calibrate_adc(WORD srate)</div><div class='del'>-{</div><div class='del'>-	writew(srate, dev.SMA + SMA_wCalFreqAtoD);</div><div class='del'>-	if (dev.calibrate_signal == 0)</div><div class='del'>-		writew(readw(dev.SMA + SMA_wCurrHostStatusFlags)</div><div class='del'>-		       | 0x0001, dev.SMA + SMA_wCurrHostStatusFlags);</div><div class='del'>-	else</div><div class='del'>-		writew(readw(dev.SMA + SMA_wCurrHostStatusFlags)</div><div class='del'>-		       &amp; ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);</div><div class='del'>-	if (msnd_send_word(&amp;dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &amp;&amp;</div><div class='del'>-	    chk_send_dsp_cmd(&amp;dev, HDEX_AUX_REQ) == 0) {</div><div class='del'>-		current-&gt;state = TASK_INTERRUPTIBLE;</div><div class='del'>-		schedule_timeout(HZ / 3);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING LOGNAME ": ADC calibration failed\n");</div><div class='del'>-</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int upload_dsp_code(void)</div><div class='del'>-{</div><div class='del'>-	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);</div><div class='del'>-#ifndef HAVE_DSPCODEH</div><div class='del'>-	INITCODESIZE = mod_firmware_load(INITCODEFILE, &amp;INITCODE);</div><div class='del'>-	if (!INITCODE) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Error loading " INITCODEFILE);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	PERMCODESIZE = mod_firmware_load(PERMCODEFILE, &amp;PERMCODE);</div><div class='del'>-	if (!PERMCODE) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Error loading " PERMCODEFILE);</div><div class='del'>-		vfree(INITCODE);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	memcpy_toio(dev.base, PERMCODE, PERMCODESIZE);</div><div class='del'>-	if (msnd_upload_host(&amp;dev, INITCODE, INITCODESIZE) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-#ifdef HAVE_DSPCODEH</div><div class='del'>-	printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n");</div><div class='del'>-#else</div><div class='del'>-	printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_DSPCODEH</div><div class='del'>-	vfree(INITCODE);</div><div class='del'>-	vfree(PERMCODE);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-static void reset_proteus(void)</div><div class='del'>-{</div><div class='del'>-	msnd_outb(HPPRORESET_ON, dev.io + HP_PROR);</div><div class='del'>-	mdelay(TIME_PRO_RESET);</div><div class='del'>-	msnd_outb(HPPRORESET_OFF, dev.io + HP_PROR);</div><div class='del'>-	mdelay(TIME_PRO_RESET_DONE);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int initialize(void)</div><div class='del'>-{</div><div class='del'>-	int err, timeout;</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	msnd_outb(HPWAITSTATE_0, dev.io + HP_WAIT);</div><div class='del'>-	msnd_outb(HPBITMODE_16, dev.io + HP_BITM);</div><div class='del'>-</div><div class='del'>-	reset_proteus();</div><div class='del'>-#endif</div><div class='del'>-	if ((err = init_sma()) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Cannot initialize SMA\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = reset_dsp()) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if ((err = upload_dsp_code()) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": Cannot upload DSP code\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	timeout = 200;</div><div class='del'>-	while (readw(dev.base)) {</div><div class='del'>-		mdelay(1);</div><div class='del'>-		if (!timeout--) {</div><div class='del'>-			printk(KERN_DEBUG LOGNAME ": DSP reset timeout\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mixer_setup();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dsp_full_reset(void)</div><div class='del'>-{</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	if (test_bit(F_RESETTING, &amp;dev.flags) || ++dev.nresets &gt; 10)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	set_bit(F_RESETTING, &amp;dev.flags);</div><div class='del'>-	printk(KERN_INFO LOGNAME ": DSP reset\n");</div><div class='del'>-	dsp_halt(NULL);			/* Unconditionally halt */</div><div class='del'>-	if ((rv = initialize()))</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": DSP reset failed\n");</div><div class='del'>-	force_recsrc(dev.recsrc);</div><div class='del'>-	dsp_open(NULL);</div><div class='del'>-	clear_bit(F_RESETTING, &amp;dev.flags);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init attach_multisound(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = request_irq(dev.irq, intr, 0, dev.name, &amp;dev)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", dev.irq);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (request_region(dev.io, dev.numio, dev.name) == NULL) {</div><div class='del'>-		free_irq(dev.irq, &amp;dev);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = dsp_full_reset();</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		release_region(dev.io, dev.numio);</div><div class='del'>-		free_irq(dev.irq, &amp;dev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = msnd_register(&amp;dev)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Unable to register MultiSound\n");</div><div class='del'>-		release_region(dev.io, dev.numio);</div><div class='del'>-		free_irq(dev.irq, &amp;dev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dev.dsp_minor = register_sound_dsp(&amp;dev_fileops, -1)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Unable to register DSP operations\n");</div><div class='del'>-		msnd_unregister(&amp;dev);</div><div class='del'>-		release_region(dev.io, dev.numio);</div><div class='del'>-		free_irq(dev.irq, &amp;dev);</div><div class='del'>-		return dev.dsp_minor;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((dev.mixer_minor = register_sound_mixer(&amp;dev_fileops, -1)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Unable to register mixer operations\n");</div><div class='del'>-		unregister_sound_mixer(dev.mixer_minor);</div><div class='del'>-		msnd_unregister(&amp;dev);</div><div class='del'>-		release_region(dev.io, dev.numio);</div><div class='del'>-		free_irq(dev.irq, &amp;dev);</div><div class='del'>-		return dev.mixer_minor;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev.ext_midi_dev = dev.hdr_midi_dev = -1;</div><div class='del'>-</div><div class='del'>-	disable_irq(dev.irq);</div><div class='del'>-	calibrate_adc(dev.play_sample_rate);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	force_recsrc(SOUND_MASK_IMIX);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_multisound(void)</div><div class='del'>-{</div><div class='del'>-	release_region(dev.io, dev.numio);</div><div class='del'>-	free_irq(dev.irq, &amp;dev);</div><div class='del'>-	unregister_sound_mixer(dev.mixer_minor);</div><div class='del'>-	unregister_sound_dsp(dev.dsp_minor);</div><div class='del'>-	msnd_unregister(&amp;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-</div><div class='del'>-/* Pinnacle/Fiji Logical Device Configuration */</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg(int cfg, int reg, int value)</div><div class='del'>-{</div><div class='del'>-	msnd_outb(reg, cfg);</div><div class='del'>-	msnd_outb(value, cfg + 1);</div><div class='del'>-	if (value != msnd_inb(cfg + 1)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": msnd_write_cfg: I/O error\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg_io0(int cfg, int num, WORD io)</div><div class='del'>-{</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IO0_BASEHI, HIBYTE(io)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IO0_BASELO, LOBYTE(io)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg_io1(int cfg, int num, WORD io)</div><div class='del'>-{</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IO1_BASEHI, HIBYTE(io)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IO1_BASELO, LOBYTE(io)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg_irq(int cfg, int num, WORD irq)</div><div class='del'>-{</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IRQ_NUMBER, LOBYTE(irq)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_IRQ_TYPE, IRQTYPE_EDGE))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg_mem(int cfg, int num, int mem)</div><div class='del'>-{</div><div class='del'>-	WORD wmem;</div><div class='del'>-</div><div class='del'>-	mem &gt;&gt;= 8;</div><div class='del'>-	mem &amp;= 0xfff;</div><div class='del'>-	wmem = (WORD)mem;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_MEMBASEHI, HIBYTE(wmem)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_MEMBASELO, LOBYTE(wmem)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (wmem &amp;&amp; msnd_write_cfg(cfg, IREG_MEMCONTROL, (MEMTYPE_HIADDR | MEMTYPE_16BIT)))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_activate_logical(int cfg, int num)</div><div class='del'>-{</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_ACTIVATE, LD_ACTIVATE))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init msnd_write_cfg_logical(int cfg, int num, WORD io0, WORD io1, WORD irq, int mem)</div><div class='del'>-{</div><div class='del'>-	if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg_io0(cfg, num, io0))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg_io1(cfg, num, io1))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg_irq(cfg, num, irq))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_write_cfg_mem(cfg, num, mem))</div><div class='del'>-		return -EIO;</div><div class='del'>-	if (msnd_activate_logical(cfg, num))</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct msnd_pinnacle_cfg_device {</div><div class='del'>-	WORD io0, io1, irq;</div><div class='del'>-	int mem;</div><div class='del'>-} msnd_pinnacle_cfg_t[4];</div><div class='del'>-</div><div class='del'>-static int __init msnd_pinnacle_cfg_devices(int cfg, int reset, msnd_pinnacle_cfg_t device)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Reset devices if told to */</div><div class='del'>-	if (reset) {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Resetting all devices\n");</div><div class='del'>-		for (i = 0; i &lt; 4; ++i)</div><div class='del'>-			if (msnd_write_cfg_logical(cfg, i, 0, 0, 0, 0))</div><div class='del'>-				return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure specified devices */</div><div class='del'>-	for (i = 0; i &lt; 4; ++i) {</div><div class='del'>-</div><div class='del'>-		switch (i) {</div><div class='del'>-		case 0:		/* DSP */</div><div class='del'>-			if (!(device[i].io0 &amp;&amp; device[i].irq &amp;&amp; device[i].mem))</div><div class='del'>-				continue;</div><div class='del'>-			break;</div><div class='del'>-		case 1:		/* MPU */</div><div class='del'>-			if (!(device[i].io0 &amp;&amp; device[i].irq))</div><div class='del'>-				continue;</div><div class='del'>-			printk(KERN_INFO LOGNAME</div><div class='del'>-			       ": Configuring MPU to I/O 0x%x IRQ %d\n",</div><div class='del'>-			       device[i].io0, device[i].irq);</div><div class='del'>-			break;</div><div class='del'>-		case 2:		/* IDE */</div><div class='del'>-			if (!(device[i].io0 &amp;&amp; device[i].io1 &amp;&amp; device[i].irq))</div><div class='del'>-				continue;</div><div class='del'>-			printk(KERN_INFO LOGNAME</div><div class='del'>-			       ": Configuring IDE to I/O 0x%x, 0x%x IRQ %d\n",</div><div class='del'>-			       device[i].io0, device[i].io1, device[i].irq);</div><div class='del'>-			break;</div><div class='del'>-		case 3:		/* Joystick */</div><div class='del'>-			if (!(device[i].io0))</div><div class='del'>-				continue;</div><div class='del'>-			printk(KERN_INFO LOGNAME</div><div class='del'>-			       ": Configuring joystick to I/O 0x%x\n",</div><div class='del'>-			       device[i].io0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Configure the device */</div><div class='del'>-		if (msnd_write_cfg_logical(cfg, i, device[i].io0, device[i].io1, device[i].irq, device[i].mem))</div><div class='del'>-			return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-MODULE_AUTHOR				("Andrew Veliath &lt;andrewtv@usa.net&gt;");</div><div class='del'>-MODULE_DESCRIPTION			("Turtle Beach " LONGNAME " Linux Driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int io __initdata =		-1;</div><div class='del'>-static int irq __initdata =		-1;</div><div class='del'>-static int mem __initdata =		-1;</div><div class='del'>-static int write_ndelay __initdata =	-1;</div><div class='del'>-</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-/* Pinnacle/Fiji non-PnP Config Port */</div><div class='del'>-static int cfg __initdata =		-1;</div><div class='del'>-</div><div class='del'>-/* Extra Peripheral Configuration */</div><div class='del'>-static int reset __initdata = 0;</div><div class='del'>-static int mpu_io __initdata = 0;</div><div class='del'>-static int mpu_irq __initdata = 0;</div><div class='del'>-static int ide_io0 __initdata = 0;</div><div class='del'>-static int ide_io1 __initdata = 0;</div><div class='del'>-static int ide_irq __initdata = 0;</div><div class='del'>-static int joystick_io __initdata = 0;</div><div class='del'>-</div><div class='del'>-/* If we have the digital daugherboard... */</div><div class='del'>-static int digital __initdata = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int fifosize __initdata =	DEFFIFOSIZE;</div><div class='del'>-static int calibrate_signal __initdata = 0;</div><div class='del'>-</div><div class='del'>-#else /* not a module */</div><div class='del'>-</div><div class='del'>-static int write_ndelay __initdata =	-1;</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-static int io __initdata =		CONFIG_MSNDCLAS_IO;</div><div class='del'>-static int irq __initdata =		CONFIG_MSNDCLAS_IRQ;</div><div class='del'>-static int mem __initdata =		CONFIG_MSNDCLAS_MEM;</div><div class='del'>-#else /* Pinnacle/Fiji */</div><div class='del'>-</div><div class='del'>-static int io __initdata =		CONFIG_MSNDPIN_IO;</div><div class='del'>-static int irq __initdata =		CONFIG_MSNDPIN_IRQ;</div><div class='del'>-static int mem __initdata =		CONFIG_MSNDPIN_MEM;</div><div class='del'>-</div><div class='del'>-/* Pinnacle/Fiji non-PnP Config Port */</div><div class='del'>-#ifdef CONFIG_MSNDPIN_NONPNP</div><div class='del'>-#  ifndef CONFIG_MSNDPIN_CFG</div><div class='del'>-#    define CONFIG_MSNDPIN_CFG		0x250</div><div class='del'>-#  endif</div><div class='del'>-#else</div><div class='del'>-#  ifdef CONFIG_MSNDPIN_CFG</div><div class='del'>-#    undef CONFIG_MSNDPIN_CFG</div><div class='del'>-#  endif</div><div class='del'>-#  define CONFIG_MSNDPIN_CFG		-1</div><div class='del'>-#endif</div><div class='del'>-static int cfg __initdata =		CONFIG_MSNDPIN_CFG;</div><div class='del'>-/* If not a module, we don't need to bother with reset=1 */</div><div class='del'>-static int reset;</div><div class='del'>-</div><div class='del'>-/* Extra Peripheral Configuration (Default: Disable) */</div><div class='del'>-#ifndef CONFIG_MSNDPIN_MPU_IO</div><div class='del'>-#  define CONFIG_MSNDPIN_MPU_IO		0</div><div class='del'>-#endif</div><div class='del'>-static int mpu_io __initdata =		CONFIG_MSNDPIN_MPU_IO;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSNDPIN_MPU_IRQ</div><div class='del'>-#  define CONFIG_MSNDPIN_MPU_IRQ	0</div><div class='del'>-#endif</div><div class='del'>-static int mpu_irq __initdata =		CONFIG_MSNDPIN_MPU_IRQ;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSNDPIN_IDE_IO0</div><div class='del'>-#  define CONFIG_MSNDPIN_IDE_IO0	0</div><div class='del'>-#endif</div><div class='del'>-static int ide_io0 __initdata =		CONFIG_MSNDPIN_IDE_IO0;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSNDPIN_IDE_IO1</div><div class='del'>-#  define CONFIG_MSNDPIN_IDE_IO1	0</div><div class='del'>-#endif</div><div class='del'>-static int ide_io1 __initdata =		CONFIG_MSNDPIN_IDE_IO1;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSNDPIN_IDE_IRQ</div><div class='del'>-#  define CONFIG_MSNDPIN_IDE_IRQ	0</div><div class='del'>-#endif</div><div class='del'>-static int ide_irq __initdata =		CONFIG_MSNDPIN_IDE_IRQ;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSNDPIN_JOYSTICK_IO</div><div class='del'>-#  define CONFIG_MSNDPIN_JOYSTICK_IO	0</div><div class='del'>-#endif</div><div class='del'>-static int joystick_io __initdata =	CONFIG_MSNDPIN_JOYSTICK_IO;</div><div class='del'>-</div><div class='del'>-/* Have SPDIF (Digital) Daughterboard */</div><div class='del'>-#ifndef CONFIG_MSNDPIN_DIGITAL</div><div class='del'>-#  define CONFIG_MSNDPIN_DIGITAL	0</div><div class='del'>-#endif</div><div class='del'>-static int digital __initdata =		CONFIG_MSNDPIN_DIGITAL;</div><div class='del'>-</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSND_FIFOSIZE</div><div class='del'>-#  define CONFIG_MSND_FIFOSIZE		DEFFIFOSIZE</div><div class='del'>-#endif</div><div class='del'>-static int fifosize __initdata =	CONFIG_MSND_FIFOSIZE;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_MSND_CALSIGNAL</div><div class='del'>-#  define CONFIG_MSND_CALSIGNAL		0</div><div class='del'>-#endif</div><div class='del'>-static int</div><div class='del'>-calibrate_signal __initdata =		CONFIG_MSND_CALSIGNAL;</div><div class='del'>-#endif /* MODULE */</div><div class='del'>-</div><div class='del'>-module_param				(io, int, 0);</div><div class='del'>-module_param				(irq, int, 0);</div><div class='del'>-module_param				(mem, int, 0);</div><div class='del'>-module_param				(write_ndelay, int, 0);</div><div class='del'>-module_param				(fifosize, int, 0);</div><div class='del'>-module_param				(calibrate_signal, int, 0);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-module_param				(digital, bool, 0);</div><div class='del'>-module_param				(cfg, int, 0);</div><div class='del'>-module_param				(reset, int, 0);</div><div class='del'>-module_param				(mpu_io, int, 0);</div><div class='del'>-module_param				(mpu_irq, int, 0);</div><div class='del'>-module_param				(ide_io0, int, 0);</div><div class='del'>-module_param				(ide_io1, int, 0);</div><div class='del'>-module_param				(ide_irq, int, 0);</div><div class='del'>-module_param				(joystick_io, int, 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init msnd_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	static msnd_pinnacle_cfg_t pinnacle_devs;</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO LOGNAME ": Turtle Beach " LONGNAME " Linux Driver Version "</div><div class='del'>-	       VERSION ", Copyright (C) 1998 Andrew Veliath\n");</div><div class='del'>-</div><div class='del'>-	if (io == -1 || irq == -1 || mem == -1)</div><div class='del'>-		printk(KERN_WARNING LOGNAME ": io, irq and mem must be set\n");</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	if (io == -1 ||</div><div class='del'>-	    !(io == 0x290 ||</div><div class='del'>-	      io == 0x260 ||</div><div class='del'>-	      io == 0x250 ||</div><div class='del'>-	      io == 0x240 ||</div><div class='del'>-	      io == 0x230 ||</div><div class='del'>-	      io == 0x220 ||</div><div class='del'>-	      io == 0x210 ||</div><div class='del'>-	      io == 0x3e0)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": \"io\" - DSP I/O base must be set to 0x210, 0x220, 0x230, 0x240, 0x250, 0x260, 0x290, or 0x3E0\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	if (io == -1 ||</div><div class='del'>-		io &lt; 0x100 ||</div><div class='del'>-		io &gt; 0x3e0 ||</div><div class='del'>-		(io % 0x10) != 0) {</div><div class='del'>-			printk(KERN_ERR LOGNAME ": \"io\" - DSP I/O base must within the range 0x100 to 0x3E0 and must be evenly divisible by 0x10\n");</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-</div><div class='del'>-	if (irq == -1 ||</div><div class='del'>-	    !(irq == 5 ||</div><div class='del'>-	      irq == 7 ||</div><div class='del'>-	      irq == 9 ||</div><div class='del'>-	      irq == 10 ||</div><div class='del'>-	      irq == 11 ||</div><div class='del'>-	      irq == 12)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": \"irq\" - must be set to 5, 7, 9, 10, 11 or 12\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mem == -1 ||</div><div class='del'>-	    !(mem == 0xb0000 ||</div><div class='del'>-	      mem == 0xc8000 ||</div><div class='del'>-	      mem == 0xd0000 ||</div><div class='del'>-	      mem == 0xd8000 ||</div><div class='del'>-	      mem == 0xe0000 ||</div><div class='del'>-	      mem == 0xe8000)) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": \"mem\" - must be set to "</div><div class='del'>-		       "0xb0000, 0xc8000, 0xd0000, 0xd8000, 0xe0000 or 0xe8000\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	switch (irq) {</div><div class='del'>-	case 5: dev.irqid = HPIRQ_5; break;</div><div class='del'>-	case 7: dev.irqid = HPIRQ_7; break;</div><div class='del'>-	case 9: dev.irqid = HPIRQ_9; break;</div><div class='del'>-	case 10: dev.irqid = HPIRQ_10; break;</div><div class='del'>-	case 11: dev.irqid = HPIRQ_11; break;</div><div class='del'>-	case 12: dev.irqid = HPIRQ_12; break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (mem) {</div><div class='del'>-	case 0xb0000: dev.memid = HPMEM_B000; break;</div><div class='del'>-	case 0xc8000: dev.memid = HPMEM_C800; break;</div><div class='del'>-	case 0xd0000: dev.memid = HPMEM_D000; break;</div><div class='del'>-	case 0xd8000: dev.memid = HPMEM_D800; break;</div><div class='del'>-	case 0xe0000: dev.memid = HPMEM_E000; break;</div><div class='del'>-	case 0xe8000: dev.memid = HPMEM_E800; break;</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	if (cfg == -1) {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");</div><div class='del'>-	} else if (cfg != 0x250 &amp;&amp; cfg != 0x260 &amp;&amp; cfg != 0x270) {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Config port must be 0x250, 0x260 or 0x270 (or unspecified for PnP mode)\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	} else {</div><div class='del'>-		printk(KERN_INFO LOGNAME ": Non-PnP mode: configuring at port 0x%x\n", cfg);</div><div class='del'>-</div><div class='del'>-		/* DSP */</div><div class='del'>-		pinnacle_devs[0].io0 = io;</div><div class='del'>-		pinnacle_devs[0].irq = irq;</div><div class='del'>-		pinnacle_devs[0].mem = mem;</div><div class='del'>-</div><div class='del'>-		/* The following are Pinnacle specific */</div><div class='del'>-</div><div class='del'>-		/* MPU */</div><div class='del'>-		pinnacle_devs[1].io0 = mpu_io;</div><div class='del'>-		pinnacle_devs[1].irq = mpu_irq;</div><div class='del'>-</div><div class='del'>-		/* IDE */</div><div class='del'>-		pinnacle_devs[2].io0 = ide_io0;</div><div class='del'>-		pinnacle_devs[2].io1 = ide_io1;</div><div class='del'>-		pinnacle_devs[2].irq = ide_irq;</div><div class='del'>-</div><div class='del'>-		/* Joystick */</div><div class='del'>-		pinnacle_devs[3].io0 = joystick_io;</div><div class='del'>-</div><div class='del'>-		if (!request_region(cfg, 2, "Pinnacle/Fiji Config")) {</div><div class='del'>-			printk(KERN_ERR LOGNAME ": Config port 0x%x conflict\n", cfg);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (msnd_pinnacle_cfg_devices(cfg, reset, pinnacle_devs)) {</div><div class='del'>-			printk(KERN_ERR LOGNAME ": Device configuration error\n");</div><div class='del'>-			release_region(cfg, 2);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		release_region(cfg, 2);</div><div class='del'>-	}</div><div class='del'>-#endif /* MSND_CLASSIC */</div><div class='del'>-</div><div class='del'>-	if (fifosize &lt; 16)</div><div class='del'>-		fifosize = 16;</div><div class='del'>-</div><div class='del'>-	if (fifosize &gt; 1024)</div><div class='del'>-		fifosize = 1024;</div><div class='del'>-</div><div class='del'>-	set_default_audio_parameters();</div><div class='del'>-#ifdef MSND_CLASSIC</div><div class='del'>-	dev.type = msndClassic;</div><div class='del'>-#else</div><div class='del'>-	dev.type = msndPinnacle;</div><div class='del'>-#endif</div><div class='del'>-	dev.io = io;</div><div class='del'>-	dev.numio = DSP_NUMIO;</div><div class='del'>-	dev.irq = irq;</div><div class='del'>-	dev.base = ioremap(mem, 0x8000);</div><div class='del'>-	dev.fifosize = fifosize * 1024;</div><div class='del'>-	dev.calibrate_signal = calibrate_signal ? 1 : 0;</div><div class='del'>-	dev.recsrc = 0;</div><div class='del'>-	dev.dspq_data_buff = DSPQ_DATA_BUFF;</div><div class='del'>-	dev.dspq_buff_size = DSPQ_BUFF_SIZE;</div><div class='del'>-	if (write_ndelay == -1)</div><div class='del'>-		write_ndelay = CONFIG_MSND_WRITE_NDELAY;</div><div class='del'>-	if (write_ndelay)</div><div class='del'>-		clear_bit(F_DISABLE_WRITE_NDELAY, &amp;dev.flags);</div><div class='del'>-	else</div><div class='del'>-		set_bit(F_DISABLE_WRITE_NDELAY, &amp;dev.flags);</div><div class='del'>-#ifndef MSND_CLASSIC</div><div class='del'>-	if (digital)</div><div class='del'>-		set_bit(F_HAVEDIGITAL, &amp;dev.flags);</div><div class='del'>-#endif</div><div class='del'>-	init_waitqueue_head(&amp;dev.writeblock);</div><div class='del'>-	init_waitqueue_head(&amp;dev.readblock);</div><div class='del'>-	init_waitqueue_head(&amp;dev.writeflush);</div><div class='del'>-	msnd_fifo_init(&amp;dev.DAPF);</div><div class='del'>-	msnd_fifo_init(&amp;dev.DARF);</div><div class='del'>-	spin_lock_init(&amp;dev.lock);</div><div class='del'>-	printk(KERN_INFO LOGNAME ": %u byte audio FIFOs (x2)\n", dev.fifosize);</div><div class='del'>-	if ((err = msnd_fifo_alloc(&amp;dev.DAPF, dev.fifosize)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Couldn't allocate write FIFO\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = msnd_fifo_alloc(&amp;dev.DARF, dev.fifosize)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Couldn't allocate read FIFO\n");</div><div class='del'>-		msnd_fifo_free(&amp;dev.DAPF);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = probe_multisound()) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Probe failed\n");</div><div class='del'>-		msnd_fifo_free(&amp;dev.DAPF);</div><div class='del'>-		msnd_fifo_free(&amp;dev.DARF);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = attach_multisound()) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR LOGNAME ": Attach failed\n");</div><div class='del'>-		msnd_fifo_free(&amp;dev.DAPF);</div><div class='del'>-		msnd_fifo_free(&amp;dev.DARF);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit msdn_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	unload_multisound();</div><div class='del'>-	msnd_fifo_free(&amp;dev.DAPF);</div><div class='del'>-	msnd_fifo_free(&amp;dev.DARF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(msnd_init);</div><div class='del'>-module_exit(msdn_cleanup);</div><div class='head'>diff --git a/sound/oss/msnd_pinnacle.h b/sound/oss/msnd_pinnacle.h<br/>deleted file mode 100644<br/>index c18d66cbbe3f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/msnd_pinnacle.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/msnd_pinnacle.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,246 +0,0 @@</div><div class='del'>-/*********************************************************************</div><div class='del'>- *</div><div class='del'>- * msnd_pinnacle.h</div><div class='del'>- *</div><div class='del'>- * Turtle Beach MultiSound Sound Card Driver for Linux</div><div class='del'>- *</div><div class='del'>- * Some parts of this header file were derived from the Turtle Beach</div><div class='del'>- * MultiSound Driver Development Kit.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Andrew Veliath</div><div class='del'>- * Copyright (C) 1993 Turtle Beach Systems, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='del'>- ********************************************************************/</div><div class='del'>-#ifndef __MSND_PINNACLE_H</div><div class='del'>-#define __MSND_PINNACLE_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DSP_NUMIO				0x08</div><div class='del'>-</div><div class='del'>-#define IREG_LOGDEVICE				0x07</div><div class='del'>-#define IREG_ACTIVATE				0x30</div><div class='del'>-#define LD_ACTIVATE				0x01</div><div class='del'>-#define LD_DISACTIVATE				0x00</div><div class='del'>-#define IREG_EECONTROL				0x3F</div><div class='del'>-#define IREG_MEMBASEHI				0x40</div><div class='del'>-#define IREG_MEMBASELO				0x41</div><div class='del'>-#define IREG_MEMCONTROL				0x42</div><div class='del'>-#define IREG_MEMRANGEHI				0x43</div><div class='del'>-#define IREG_MEMRANGELO				0x44</div><div class='del'>-#define MEMTYPE_8BIT				0x00</div><div class='del'>-#define MEMTYPE_16BIT				0x02</div><div class='del'>-#define MEMTYPE_RANGE				0x00</div><div class='del'>-#define MEMTYPE_HIADDR				0x01</div><div class='del'>-#define IREG_IO0_BASEHI				0x60</div><div class='del'>-#define IREG_IO0_BASELO				0x61</div><div class='del'>-#define IREG_IO1_BASEHI				0x62</div><div class='del'>-#define IREG_IO1_BASELO				0x63</div><div class='del'>-#define IREG_IRQ_NUMBER				0x70</div><div class='del'>-#define IREG_IRQ_TYPE				0x71</div><div class='del'>-#define IRQTYPE_HIGH				0x02</div><div class='del'>-#define IRQTYPE_LOW				0x00</div><div class='del'>-#define IRQTYPE_LEVEL				0x01</div><div class='del'>-#define IRQTYPE_EDGE				0x00</div><div class='del'>-</div><div class='del'>-#define	HP_DSPR					0x04</div><div class='del'>-#define	HP_BLKS					0x04</div><div class='del'>-</div><div class='del'>-#define HPDSPRESET_OFF				2</div><div class='del'>-#define HPDSPRESET_ON				0</div><div class='del'>-</div><div class='del'>-#define HPBLKSEL_0				2</div><div class='del'>-#define HPBLKSEL_1				3</div><div class='del'>-</div><div class='del'>-#define	HIMT_DAT_OFF				0x03</div><div class='del'>-</div><div class='del'>-#define	HIDSP_PLAY_UNDER			0x00</div><div class='del'>-#define	HIDSP_INT_PLAY_UNDER			0x01</div><div class='del'>-#define	HIDSP_SSI_TX_UNDER  			0x02</div><div class='del'>-#define HIDSP_RECQ_OVERFLOW			0x08</div><div class='del'>-#define HIDSP_INT_RECORD_OVER			0x09</div><div class='del'>-#define HIDSP_SSI_RX_OVERFLOW			0x0a</div><div class='del'>-</div><div class='del'>-#define	HIDSP_MIDI_IN_OVER			0x10</div><div class='del'>-</div><div class='del'>-#define	HIDSP_MIDI_FRAME_ERR			0x11</div><div class='del'>-#define	HIDSP_MIDI_PARITY_ERR			0x12</div><div class='del'>-#define	HIDSP_MIDI_OVERRUN_ERR			0x13</div><div class='del'>-</div><div class='del'>-#define HIDSP_INPUT_CLIPPING			0x20</div><div class='del'>-#define	HIDSP_MIX_CLIPPING			0x30</div><div class='del'>-#define HIDSP_DAT_IN_OFF			0x21</div><div class='del'>-</div><div class='del'>-#define	HDEXAR_SET_ANA_IN			0</div><div class='del'>-#define	HDEXAR_CLEAR_PEAKS			1</div><div class='del'>-#define	HDEXAR_IN_SET_POTS			2</div><div class='del'>-#define	HDEXAR_AUX_SET_POTS			3</div><div class='del'>-#define	HDEXAR_CAL_A_TO_D			4</div><div class='del'>-#define	HDEXAR_RD_EXT_DSP_BITS			5</div><div class='del'>-</div><div class='del'>-#define	HDEXAR_SET_SYNTH_IN			4</div><div class='del'>-#define	HDEXAR_READ_DAT_IN			5</div><div class='del'>-#define	HDEXAR_MIC_SET_POTS			6</div><div class='del'>-#define	HDEXAR_SET_DAT_IN			7</div><div class='del'>-</div><div class='del'>-#define HDEXAR_SET_SYNTH_48			8</div><div class='del'>-#define HDEXAR_SET_SYNTH_44			9</div><div class='del'>-</div><div class='del'>-#define TIME_PRO_RESET_DONE			0x028A</div><div class='del'>-#define TIME_PRO_SYSEX				0x001E</div><div class='del'>-#define TIME_PRO_RESET				0x0032</div><div class='del'>-</div><div class='del'>-#define AGND					0x01</div><div class='del'>-#define SIGNAL					0x02</div><div class='del'>-</div><div class='del'>-#define EXT_DSP_BIT_DCAL			0x0001</div><div class='del'>-#define EXT_DSP_BIT_MIDI_CON			0x0002</div><div class='del'>-</div><div class='del'>-#define BUFFSIZE				0x8000</div><div class='del'>-#define HOSTQ_SIZE				0x40</div><div class='del'>-</div><div class='del'>-#define SRAM_CNTL_START				0x7F00</div><div class='del'>-#define SMA_STRUCT_START			0x7F40</div><div class='del'>-</div><div class='del'>-#define DAP_BUFF_SIZE				0x2400</div><div class='del'>-#define DAR_BUFF_SIZE				0x2000</div><div class='del'>-</div><div class='del'>-#define DAPQ_STRUCT_SIZE			0x10</div><div class='del'>-#define DARQ_STRUCT_SIZE			0x10</div><div class='del'>-#define DAPQ_BUFF_SIZE				(3 * 0x10)</div><div class='del'>-#define DARQ_BUFF_SIZE				(3 * 0x10)</div><div class='del'>-#define MODQ_BUFF_SIZE				0x400</div><div class='del'>-#define MIDQ_BUFF_SIZE				0x800</div><div class='del'>-#define DSPQ_BUFF_SIZE				0x5A0</div><div class='del'>-</div><div class='del'>-#define DAPQ_DATA_BUFF				0x6C00</div><div class='del'>-#define DARQ_DATA_BUFF				0x6C30</div><div class='del'>-#define MODQ_DATA_BUFF				0x6C60</div><div class='del'>-#define MIDQ_DATA_BUFF				0x7060</div><div class='del'>-#define DSPQ_DATA_BUFF				0x7860</div><div class='del'>-</div><div class='del'>-#define DAPQ_OFFSET				SRAM_CNTL_START</div><div class='del'>-#define DARQ_OFFSET				(SRAM_CNTL_START + 0x08)</div><div class='del'>-#define MODQ_OFFSET				(SRAM_CNTL_START + 0x10)</div><div class='del'>-#define MIDQ_OFFSET				(SRAM_CNTL_START + 0x18)</div><div class='del'>-#define DSPQ_OFFSET				(SRAM_CNTL_START + 0x20)</div><div class='del'>-</div><div class='del'>-#define MOP_WAVEHDR				0</div><div class='del'>-#define MOP_EXTOUT				1</div><div class='del'>-#define MOP_HWINIT				0xfe</div><div class='del'>-#define MOP_NONE				0xff</div><div class='del'>-#define MOP_MAX					1</div><div class='del'>-</div><div class='del'>-#define MIP_EXTIN				0</div><div class='del'>-#define MIP_WAVEHDR				1</div><div class='del'>-#define MIP_HWINIT				0xfe</div><div class='del'>-#define MIP_MAX					1</div><div class='del'>-</div><div class='del'>-/* Pinnacle/Fiji SMA Common Data */</div><div class='del'>-#define SMA_wCurrPlayBytes			0x0000</div><div class='del'>-#define SMA_wCurrRecordBytes			0x0002</div><div class='del'>-#define SMA_wCurrPlayVolLeft			0x0004</div><div class='del'>-#define SMA_wCurrPlayVolRight			0x0006</div><div class='del'>-#define SMA_wCurrInVolLeft			0x0008</div><div class='del'>-#define SMA_wCurrInVolRight			0x000a</div><div class='del'>-#define SMA_wCurrMHdrVolLeft			0x000c</div><div class='del'>-#define SMA_wCurrMHdrVolRight			0x000e</div><div class='del'>-#define SMA_dwCurrPlayPitch			0x0010</div><div class='del'>-#define SMA_dwCurrPlayRate			0x0014</div><div class='del'>-#define SMA_wCurrMIDIIOPatch			0x0018</div><div class='del'>-#define SMA_wCurrPlayFormat			0x001a</div><div class='del'>-#define SMA_wCurrPlaySampleSize			0x001c</div><div class='del'>-#define SMA_wCurrPlayChannels			0x001e</div><div class='del'>-#define SMA_wCurrPlaySampleRate			0x0020</div><div class='del'>-#define SMA_wCurrRecordFormat			0x0022</div><div class='del'>-#define SMA_wCurrRecordSampleSize		0x0024</div><div class='del'>-#define SMA_wCurrRecordChannels			0x0026</div><div class='del'>-#define SMA_wCurrRecordSampleRate		0x0028</div><div class='del'>-#define SMA_wCurrDSPStatusFlags			0x002a</div><div class='del'>-#define SMA_wCurrHostStatusFlags		0x002c</div><div class='del'>-#define SMA_wCurrInputTagBits			0x002e</div><div class='del'>-#define SMA_wCurrLeftPeak			0x0030</div><div class='del'>-#define SMA_wCurrRightPeak			0x0032</div><div class='del'>-#define SMA_bMicPotPosLeft			0x0034</div><div class='del'>-#define SMA_bMicPotPosRight			0x0035</div><div class='del'>-#define SMA_bMicPotMaxLeft			0x0036</div><div class='del'>-#define SMA_bMicPotMaxRight			0x0037</div><div class='del'>-#define SMA_bInPotPosLeft			0x0038</div><div class='del'>-#define SMA_bInPotPosRight			0x0039</div><div class='del'>-#define SMA_bAuxPotPosLeft			0x003a</div><div class='del'>-#define SMA_bAuxPotPosRight			0x003b</div><div class='del'>-#define SMA_bInPotMaxLeft			0x003c</div><div class='del'>-#define SMA_bInPotMaxRight			0x003d</div><div class='del'>-#define SMA_bAuxPotMaxLeft			0x003e</div><div class='del'>-#define SMA_bAuxPotMaxRight			0x003f</div><div class='del'>-#define SMA_bInPotMaxMethod			0x0040</div><div class='del'>-#define SMA_bAuxPotMaxMethod			0x0041</div><div class='del'>-#define SMA_wCurrMastVolLeft			0x0042</div><div class='del'>-#define SMA_wCurrMastVolRight			0x0044</div><div class='del'>-#define SMA_wCalFreqAtoD			0x0046</div><div class='del'>-#define SMA_wCurrAuxVolLeft			0x0048</div><div class='del'>-#define SMA_wCurrAuxVolRight			0x004a</div><div class='del'>-#define SMA_wCurrPlay1VolLeft			0x004c</div><div class='del'>-#define SMA_wCurrPlay1VolRight			0x004e</div><div class='del'>-#define SMA_wCurrPlay2VolLeft			0x0050</div><div class='del'>-#define SMA_wCurrPlay2VolRight			0x0052</div><div class='del'>-#define SMA_wCurrPlay3VolLeft			0x0054</div><div class='del'>-#define SMA_wCurrPlay3VolRight			0x0056</div><div class='del'>-#define SMA_wCurrPlay4VolLeft			0x0058</div><div class='del'>-#define SMA_wCurrPlay4VolRight			0x005a</div><div class='del'>-#define SMA_wCurrPlay1PeakLeft			0x005c</div><div class='del'>-#define SMA_wCurrPlay1PeakRight			0x005e</div><div class='del'>-#define SMA_wCurrPlay2PeakLeft			0x0060</div><div class='del'>-#define SMA_wCurrPlay2PeakRight			0x0062</div><div class='del'>-#define SMA_wCurrPlay3PeakLeft			0x0064</div><div class='del'>-#define SMA_wCurrPlay3PeakRight			0x0066</div><div class='del'>-#define SMA_wCurrPlay4PeakLeft			0x0068</div><div class='del'>-#define SMA_wCurrPlay4PeakRight			0x006a</div><div class='del'>-#define SMA_wCurrPlayPeakLeft			0x006c</div><div class='del'>-#define SMA_wCurrPlayPeakRight			0x006e</div><div class='del'>-#define SMA_wCurrDATSR				0x0070</div><div class='del'>-#define SMA_wCurrDATRXCHNL			0x0072</div><div class='del'>-#define SMA_wCurrDATTXCHNL			0x0074</div><div class='del'>-#define SMA_wCurrDATRXRate			0x0076</div><div class='del'>-#define SMA_dwDSPPlayCount			0x0078</div><div class='del'>-#define SMA__size				0x007c</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_DSPCODEH</div><div class='del'>-#  include "pndsperm.c"</div><div class='del'>-#  include "pndspini.c"</div><div class='del'>-#  define PERMCODE		pndsperm</div><div class='del'>-#  define INITCODE		pndspini</div><div class='del'>-#  define PERMCODESIZE		sizeof(pndsperm)</div><div class='del'>-#  define INITCODESIZE		sizeof(pndspini)</div><div class='del'>-#else</div><div class='del'>-#  ifndef CONFIG_MSNDPIN_INIT_FILE</div><div class='del'>-#    define CONFIG_MSNDPIN_INIT_FILE				\</div><div class='del'>-				"/etc/sound/pndspini.bin"</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef CONFIG_MSNDPIN_PERM_FILE</div><div class='del'>-#    define CONFIG_MSNDPIN_PERM_FILE				\</div><div class='del'>-				"/etc/sound/pndsperm.bin"</div><div class='del'>-#  endif</div><div class='del'>-#  define PERMCODEFILE		CONFIG_MSNDPIN_PERM_FILE</div><div class='del'>-#  define INITCODEFILE		CONFIG_MSNDPIN_INIT_FILE</div><div class='del'>-#  define PERMCODE		dspini</div><div class='del'>-#  define INITCODE		permini</div><div class='del'>-#  define PERMCODESIZE		sizeof_dspini</div><div class='del'>-#  define INITCODESIZE		sizeof_permini</div><div class='del'>-#endif</div><div class='del'>-#define LONGNAME		"MultiSound (Pinnacle/Fiji)"</div><div class='del'>-</div><div class='del'>-#endif /* __MSND_PINNACLE_H */</div><div class='head'>diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c<br/>deleted file mode 100644<br/>index 938c48c43585..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/opl3.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/opl3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1251 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/opl3.c</div><div class='del'>- *</div><div class='del'>- * A low level driver for Yamaha YM3812 and OPL-3 -chips</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Changes</div><div class='del'>- *	Thomas Sailer   	ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- *	Alan Cox		modularisation, fixed sound_mem allocs.</div><div class='del'>- *	Christoph Hellwig	Adapted to module_init/module_exit</div><div class='del'>- *	Arnaldo C. de Melo	get rid of check_region, use request_region for</div><div class='del'>- *				OPL4, release it on exit, some cleanups.</div><div class='del'>- *</div><div class='del'>- * Status</div><div class='del'>- *	Believed to work. Badly needs rewriting a bit to support multiple</div><div class='del'>- *	OPL3 devices.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Major improvements to the FM handling 30AUG92 by Rob Hooft,</div><div class='del'>- * hooft@chem.ruu.nl</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "opl3_hw.h"</div><div class='del'>-</div><div class='del'>-#define MAX_VOICE	18</div><div class='del'>-#define OFFS_4OP	11</div><div class='del'>-</div><div class='del'>-struct voice_info</div><div class='del'>-{</div><div class='del'>-	unsigned char   keyon_byte;</div><div class='del'>-	long            bender;</div><div class='del'>-	long            bender_range;</div><div class='del'>-	unsigned long   orig_freq;</div><div class='del'>-	unsigned long   current_freq;</div><div class='del'>-	int             volume;</div><div class='del'>-	int             mode;</div><div class='del'>-	int             panning;	/* 0xffff means not set */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct opl_devinfo</div><div class='del'>-{</div><div class='del'>-	int             base;</div><div class='del'>-	int             left_io, right_io;</div><div class='del'>-	int             nr_voice;</div><div class='del'>-	int             lv_map[MAX_VOICE];</div><div class='del'>-</div><div class='del'>-	struct voice_info voc[MAX_VOICE];</div><div class='del'>-	struct voice_alloc_info *v_alloc;</div><div class='del'>-	struct channel_info *chn_info;</div><div class='del'>-</div><div class='del'>-	struct sbi_instrument i_map[SBFM_MAXINSTR];</div><div class='del'>-	struct sbi_instrument *act_i[MAX_VOICE];</div><div class='del'>-</div><div class='del'>-	struct synth_info fm_info;</div><div class='del'>-</div><div class='del'>-	int             busy;</div><div class='del'>-	int             model;</div><div class='del'>-	unsigned char   cmask;</div><div class='del'>-</div><div class='del'>-	int             is_opl4;</div><div class='del'>-} opl_devinfo;</div><div class='del'>-</div><div class='del'>-static struct opl_devinfo *devc = NULL;</div><div class='del'>-</div><div class='del'>-static int      detected_model;</div><div class='del'>-</div><div class='del'>-static int      store_instr(int instr_no, struct sbi_instrument *instr);</div><div class='del'>-static void     freq_to_fnum(int freq, int *block, int *fnum);</div><div class='del'>-static void     opl3_command(int io_addr, unsigned int addr, unsigned int val);</div><div class='del'>-static int      opl3_kill_note(int dev, int voice, int note, int velocity);</div><div class='del'>-</div><div class='del'>-static void enter_4op_mode(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	static int v4op[MAX_VOICE] = {</div><div class='del'>-		0, 1, 2, 9, 10, 11, 6, 7, 8, 15, 16, 17</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	devc-&gt;cmask = 0x3f;	/* Connect all possible 4 OP voice operators */</div><div class='del'>-	opl3_command(devc-&gt;right_io, CONNECTION_SELECT_REGISTER, 0x3f);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		pv_map[i].voice_mode = 4;</div><div class='del'>-	for (i = 3; i &lt; 6; i++)</div><div class='del'>-		pv_map[i].voice_mode = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 9; i &lt; 12; i++)</div><div class='del'>-		pv_map[i].voice_mode = 4;</div><div class='del'>-	for (i = 12; i &lt; 15; i++)</div><div class='del'>-		pv_map[i].voice_mode = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 12; i++)</div><div class='del'>-		devc-&gt;lv_map[i] = v4op[i];</div><div class='del'>-	devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = 12;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_ioctl(int dev, unsigned int cmd, void __user * arg)</div><div class='del'>-{</div><div class='del'>-	struct sbi_instrument ins;</div><div class='del'>-	</div><div class='del'>-	switch (cmd) {</div><div class='del'>-		case SNDCTL_FM_LOAD_INSTR:</div><div class='del'>-			printk(KERN_WARNING "Warning: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");</div><div class='del'>-			if (copy_from_user(&amp;ins, arg, sizeof(ins)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (ins.channel &lt; 0 || ins.channel &gt;= SBFM_MAXINSTR) {</div><div class='del'>-				printk(KERN_WARNING "FM Error: Invalid instrument number %d\n", ins.channel);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			return store_instr(ins.channel, &amp;ins);</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_INFO:</div><div class='del'>-			devc-&gt;fm_info.nr_voices = (devc-&gt;nr_voice == 12) ? 6 : devc-&gt;nr_voice;</div><div class='del'>-			if (copy_to_user(arg, &amp;devc-&gt;fm_info, sizeof(devc-&gt;fm_info)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_MEMAVL:</div><div class='del'>-			return 0x7fffffff;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_FM_4OP_ENABLE:</div><div class='del'>-			if (devc-&gt;model == 2)</div><div class='del'>-				enter_4op_mode();</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_detect(int ioaddr)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This function returns 1 if the FM chip is present at the given I/O port</div><div class='del'>-	 * The detection algorithm plays with the timer built in the FM chip and</div><div class='del'>-	 * looks for a change in the status register.</div><div class='del'>-	 *</div><div class='del'>-	 * Note! The timers of the FM chip are not connected to AdLib (and compatible)</div><div class='del'>-	 * boards.</div><div class='del'>-	 *</div><div class='del'>-	 * Note2! The chip is initialized if detected.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	unsigned char stat1, signature;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (devc != NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "opl3: Only one OPL3 supported.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc = kzalloc(sizeof(*devc), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "opl3: Can't allocate memory for the device control "</div><div class='del'>-			"structure \n ");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(devc-&gt;fm_info.name, "OPL2");</div><div class='del'>-</div><div class='del'>-	if (!request_region(ioaddr, 4, devc-&gt;fm_info.name)) {</div><div class='del'>-		printk(KERN_WARNING "opl3: I/O port 0x%x already in use\n", ioaddr);</div><div class='del'>-		goto cleanup_devc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;base = ioaddr;</div><div class='del'>-</div><div class='del'>-	/* Reset timers 1 and 2 */</div><div class='del'>-	opl3_command(ioaddr, TIMER_CONTROL_REGISTER, TIMER1_MASK | TIMER2_MASK);</div><div class='del'>-</div><div class='del'>-	/* Reset the IRQ of the FM chip */</div><div class='del'>-	opl3_command(ioaddr, TIMER_CONTROL_REGISTER, IRQ_RESET);</div><div class='del'>-</div><div class='del'>-	signature = stat1 = inb(ioaddr);	/* Status register */</div><div class='del'>-</div><div class='del'>-	if (signature != 0x00 &amp;&amp; signature != 0x06 &amp;&amp; signature != 0x02 &amp;&amp;</div><div class='del'>-		signature != 0x0f)</div><div class='del'>-	{</div><div class='del'>-		MDB(printk(KERN_INFO "OPL3 not detected %x\n", signature));</div><div class='del'>-		goto cleanup_region;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (signature == 0x06)		/* OPL2 */</div><div class='del'>-	{</div><div class='del'>-		detected_model = 2;</div><div class='del'>-	}</div><div class='del'>-	else if (signature == 0x00 || signature == 0x0f)	/* OPL3 or OPL4 */</div><div class='del'>-	{</div><div class='del'>-		unsigned char tmp;</div><div class='del'>-</div><div class='del'>-		detected_model = 3;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Detect availability of OPL4 (_experimental_). Works probably</div><div class='del'>-		 * only after a cold boot. In addition the OPL4 port</div><div class='del'>-		 * of the chip may not be connected to the PC bus at all.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		opl3_command(ioaddr + 2, OPL3_MODE_REGISTER, 0x00);</div><div class='del'>-		opl3_command(ioaddr + 2, OPL3_MODE_REGISTER, OPL3_ENABLE | OPL4_ENABLE);</div><div class='del'>-</div><div class='del'>-		if ((tmp = inb(ioaddr)) == 0x02)	/* Have a OPL4 */</div><div class='del'>-		{</div><div class='del'>-			detected_model = 4;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (request_region(ioaddr - 8, 2, "OPL4"))	/* OPL4 port was free */</div><div class='del'>-		{</div><div class='del'>-			int tmp;</div><div class='del'>-</div><div class='del'>-			outb((0x02), ioaddr - 8);	/* Select OPL4 ID register */</div><div class='del'>-			udelay(10);</div><div class='del'>-			tmp = inb(ioaddr - 7);		/* Read it */</div><div class='del'>-			udelay(10);</div><div class='del'>-</div><div class='del'>-			if (tmp == 0x20)	/* OPL4 should return 0x20 here */</div><div class='del'>-			{</div><div class='del'>-				detected_model = 4;</div><div class='del'>-				outb((0xF8), ioaddr - 8);	/* Select OPL4 FM mixer control */</div><div class='del'>-				udelay(10);</div><div class='del'>-				outb((0x1B), ioaddr - 7);	/* Write value */</div><div class='del'>-				udelay(10);</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{ /* release OPL4 port */</div><div class='del'>-				release_region(ioaddr - 8, 2);</div><div class='del'>-				detected_model = 3;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		opl3_command(ioaddr + 2, OPL3_MODE_REGISTER, 0);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 9; i++)</div><div class='del'>-		opl3_command(ioaddr, KEYON_BLOCK + i, 0);	/*</div><div class='del'>-								 * Note off</div><div class='del'>-								 */</div><div class='del'>-</div><div class='del'>-	opl3_command(ioaddr, TEST_REGISTER, ENABLE_WAVE_SELECT);</div><div class='del'>-	opl3_command(ioaddr, PERCOSSION_REGISTER, 0x00);	/*</div><div class='del'>-								 * Melodic mode.</div><div class='del'>-								 */</div><div class='del'>-	return 1;</div><div class='del'>-cleanup_region:</div><div class='del'>-	release_region(ioaddr, 4);</div><div class='del'>-cleanup_devc:</div><div class='del'>-	kfree(devc);</div><div class='del'>-	devc = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_kill_note  (int devno, int voice, int note, int velocity)</div><div class='del'>-{</div><div class='del'>-	 struct physical_voice_info *map;</div><div class='del'>-</div><div class='del'>-	 if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		 return 0;</div><div class='del'>-</div><div class='del'>-	 devc-&gt;v_alloc-&gt;map[voice] = 0;</div><div class='del'>-</div><div class='del'>-	 map = &amp;pv_map[devc-&gt;lv_map[voice]];</div><div class='del'>-	 DEB(printk("Kill note %d\n", voice));</div><div class='del'>-</div><div class='del'>-	 if (map-&gt;voice_mode == 0)</div><div class='del'>-		 return 0;</div><div class='del'>-</div><div class='del'>-	 opl3_command(map-&gt;ioaddr, KEYON_BLOCK + map-&gt;voice_num, devc-&gt;voc[voice].keyon_byte &amp; ~0x20);</div><div class='del'>-	 devc-&gt;voc[voice].keyon_byte = 0;</div><div class='del'>-	 devc-&gt;voc[voice].bender = 0;</div><div class='del'>-	 devc-&gt;voc[voice].volume = 64;</div><div class='del'>-	 devc-&gt;voc[voice].panning = 0xffff;	/* Not set */</div><div class='del'>-	 devc-&gt;voc[voice].bender_range = 200;</div><div class='del'>-	 devc-&gt;voc[voice].orig_freq = 0;</div><div class='del'>-	 devc-&gt;voc[voice].current_freq = 0;</div><div class='del'>-	 devc-&gt;voc[voice].mode = 0;</div><div class='del'>-	 return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HIHAT			0</div><div class='del'>-#define CYMBAL			1</div><div class='del'>-#define TOMTOM			2</div><div class='del'>-#define SNARE			3</div><div class='del'>-#define BDRUM			4</div><div class='del'>-#define UNDEFINED		TOMTOM</div><div class='del'>-#define DEFAULT			TOMTOM</div><div class='del'>-</div><div class='del'>-static int store_instr(int instr_no, struct sbi_instrument *instr)</div><div class='del'>-{</div><div class='del'>-	if (instr-&gt;key != FM_PATCH &amp;&amp; (instr-&gt;key != OPL3_PATCH || devc-&gt;model != 2))</div><div class='del'>-		printk(KERN_WARNING "FM warning: Invalid patch format field (key) 0x%x\n", instr-&gt;key);</div><div class='del'>-	memcpy((char *) &amp;(devc-&gt;i_map[instr_no]), (char *) instr, sizeof(*instr));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_set_instr  (int dev, int voice, int instr_no)</div><div class='del'>-{</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return 0;</div><div class='del'>-	if (instr_no &lt; 0 || instr_no &gt;= SBFM_MAXINSTR)</div><div class='del'>-		instr_no = 0;	/* Acoustic piano (usually) */</div><div class='del'>-</div><div class='del'>-	devc-&gt;act_i[voice] = &amp;devc-&gt;i_map[instr_no];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The next table looks magical, but it certainly is not. Its values have</div><div class='del'>- * been calculated as table[i]=8*log(i/64)/log(2) with an obvious exception</div><div class='del'>- * for i=0. This log-table converts a linear volume-scaling (0..127) to a</div><div class='del'>- * logarithmic scaling as present in the FM-synthesizer chips. so :    Volume</div><div class='del'>- * 64 =  0 db = relative volume  0 and:    Volume 32 = -6 db = relative</div><div class='del'>- * volume -8 it was implemented as a table because it is only 128 bytes and</div><div class='del'>- * it saves a lot of log() calculations. (RH)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char fm_volume_table[128] =</div><div class='del'>-{</div><div class='del'>-	-64, -48, -40, -35, -32, -29, -27, -26,</div><div class='del'>-	-24, -23, -21, -20, -19, -18, -18, -17,</div><div class='del'>-	-16, -15, -15, -14, -13, -13, -12, -12,</div><div class='del'>-	-11, -11, -10, -10, -10, -9, -9, -8,</div><div class='del'>-	-8, -8, -7, -7, -7, -6, -6, -6,</div><div class='del'>-	-5, -5, -5, -5, -4, -4, -4, -4,</div><div class='del'>-	-3, -3, -3, -3, -2, -2, -2, -2,</div><div class='del'>-	-2, -1, -1, -1, -1, 0, 0, 0,</div><div class='del'>-	0, 0, 0, 1, 1, 1, 1, 1,</div><div class='del'>-	1, 2, 2, 2, 2, 2, 2, 2,</div><div class='del'>-	3, 3, 3, 3, 3, 3, 3, 4,</div><div class='del'>-	4, 4, 4, 4, 4, 4, 4, 5,</div><div class='del'>-	5, 5, 5, 5, 5, 5, 5, 5,</div><div class='del'>-	6, 6, 6, 6, 6, 6, 6, 6,</div><div class='del'>-	6, 7, 7, 7, 7, 7, 7, 7,</div><div class='del'>-	7, 7, 7, 8, 8, 8, 8, 8</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void calc_vol(unsigned char *regbyte, int volume, int main_vol)</div><div class='del'>-{</div><div class='del'>-	int level = (~*regbyte &amp; 0x3f);</div><div class='del'>-</div><div class='del'>-	if (main_vol &gt; 127)</div><div class='del'>-		main_vol = 127;</div><div class='del'>-	volume = (volume * main_vol) / 127;</div><div class='del'>-</div><div class='del'>-	if (level)</div><div class='del'>-		level += fm_volume_table[volume];</div><div class='del'>-</div><div class='del'>-	if (level &gt; 0x3f)</div><div class='del'>-		level = 0x3f;</div><div class='del'>-	if (level &lt; 0)</div><div class='del'>-		level = 0;</div><div class='del'>-</div><div class='del'>-	*regbyte = (*regbyte &amp; 0xc0) | (~level &amp; 0x3f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_voice_volume(int voice, int volume, int main_vol)</div><div class='del'>-{</div><div class='del'>-	unsigned char vol1, vol2, vol3, vol4;</div><div class='del'>-	struct sbi_instrument *instr;</div><div class='del'>-	struct physical_voice_info *map;</div><div class='del'>-</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	map = &amp;pv_map[devc-&gt;lv_map[voice]];</div><div class='del'>-	instr = devc-&gt;act_i[voice];</div><div class='del'>-</div><div class='del'>-	if (!instr)</div><div class='del'>-		instr = &amp;devc-&gt;i_map[0];</div><div class='del'>-</div><div class='del'>-	if (instr-&gt;channel &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;voc[voice].mode == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;voc[voice].mode == 2)</div><div class='del'>-	{</div><div class='del'>-		vol1 = instr-&gt;operators[2];</div><div class='del'>-		vol2 = instr-&gt;operators[3];</div><div class='del'>-		if ((instr-&gt;operators[10] &amp; 0x01))</div><div class='del'>-		{</div><div class='del'>-			calc_vol(&amp;vol1, volume, main_vol);</div><div class='del'>-			calc_vol(&amp;vol2, volume, main_vol);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			calc_vol(&amp;vol2, volume, main_vol);</div><div class='del'>-		}</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[0], vol1);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[1], vol2);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{	/*</div><div class='del'>-		 * 4 OP voice</div><div class='del'>-		 */</div><div class='del'>-		int connection;</div><div class='del'>-</div><div class='del'>-		vol1 = instr-&gt;operators[2];</div><div class='del'>-		vol2 = instr-&gt;operators[3];</div><div class='del'>-		vol3 = instr-&gt;operators[OFFS_4OP + 2];</div><div class='del'>-		vol4 = instr-&gt;operators[OFFS_4OP + 3];</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * The connection method for 4 OP devc-&gt;voc is defined by the rightmost</div><div class='del'>-		 * bits at the offsets 10 and 10+OFFS_4OP</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		connection = ((instr-&gt;operators[10] &amp; 0x01) &lt;&lt; 1) | (instr-&gt;operators[10 + OFFS_4OP] &amp; 0x01);</div><div class='del'>-</div><div class='del'>-		switch (connection)</div><div class='del'>-		{</div><div class='del'>-			case 0:</div><div class='del'>-				calc_vol(&amp;vol4, volume, main_vol);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 1:</div><div class='del'>-				calc_vol(&amp;vol2, volume, main_vol);</div><div class='del'>-				calc_vol(&amp;vol4, volume, main_vol);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 2:</div><div class='del'>-				calc_vol(&amp;vol1, volume, main_vol);</div><div class='del'>-				calc_vol(&amp;vol4, volume, main_vol);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 3:</div><div class='del'>-				calc_vol(&amp;vol1, volume, main_vol);</div><div class='del'>-				calc_vol(&amp;vol3, volume, main_vol);</div><div class='del'>-				calc_vol(&amp;vol4, volume, main_vol);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				;</div><div class='del'>-		}</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[0], vol1);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[1], vol2);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[2], vol3);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[3], vol4);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_start_note (int dev, int voice, int note, int volume)</div><div class='del'>-{</div><div class='del'>-	unsigned char data, fpc;</div><div class='del'>-	int block, fnum, freq, voice_mode, pan;</div><div class='del'>-	struct sbi_instrument *instr;</div><div class='del'>-	struct physical_voice_info *map;</div><div class='del'>-</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	map = &amp;pv_map[devc-&gt;lv_map[voice]];</div><div class='del'>-	pan = devc-&gt;voc[voice].panning;</div><div class='del'>-</div><div class='del'>-	if (map-&gt;voice_mode == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (note == 255)	/*</div><div class='del'>-				 * Just change the volume</div><div class='del'>-				 */</div><div class='del'>-	{</div><div class='del'>-		set_voice_volume(voice, volume, devc-&gt;voc[voice].volume);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Kill previous note before playing</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[1], 0xff);	/*</div><div class='del'>-									 * Carrier</div><div class='del'>-									 * volume to</div><div class='del'>-									 * min</div><div class='del'>-									 */</div><div class='del'>-	opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[0], 0xff);	/*</div><div class='del'>-									 * Modulator</div><div class='del'>-									 * volume to</div><div class='del'>-									 */</div><div class='del'>-</div><div class='del'>-	if (map-&gt;voice_mode == 4)</div><div class='del'>-	{</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[2], 0xff);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KSL_LEVEL + map-&gt;op[3], 0xff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	opl3_command(map-&gt;ioaddr, KEYON_BLOCK + map-&gt;voice_num, 0x00);	/*</div><div class='del'>-									 * Note</div><div class='del'>-									 * off</div><div class='del'>-									 */</div><div class='del'>-</div><div class='del'>-	instr = devc-&gt;act_i[voice];</div><div class='del'>-	</div><div class='del'>-	if (!instr)</div><div class='del'>-		instr = &amp;devc-&gt;i_map[0];</div><div class='del'>-</div><div class='del'>-	if (instr-&gt;channel &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "opl3: Initializing voice %d with undefined instrument\n", voice);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (map-&gt;voice_mode == 2 &amp;&amp; instr-&gt;key == OPL3_PATCH)</div><div class='del'>-		return 0;	/*</div><div class='del'>-				 * Cannot play</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-	voice_mode = map-&gt;voice_mode;</div><div class='del'>-</div><div class='del'>-	if (voice_mode == 4)</div><div class='del'>-	{</div><div class='del'>-		int voice_shift;</div><div class='del'>-</div><div class='del'>-		voice_shift = (map-&gt;ioaddr == devc-&gt;left_io) ? 0 : 3;</div><div class='del'>-		voice_shift += map-&gt;voice_num;</div><div class='del'>-</div><div class='del'>-		if (instr-&gt;key != OPL3_PATCH)	/*</div><div class='del'>-						 * Just 2 OP patch</div><div class='del'>-						 */</div><div class='del'>-		{</div><div class='del'>-			voice_mode = 2;</div><div class='del'>-			devc-&gt;cmask &amp;= ~(1 &lt;&lt; voice_shift);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			devc-&gt;cmask |= (1 &lt;&lt; voice_shift);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		opl3_command(devc-&gt;right_io, CONNECTION_SELECT_REGISTER, devc-&gt;cmask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Sound Characteristics</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	opl3_command(map-&gt;ioaddr, AM_VIB + map-&gt;op[0], instr-&gt;operators[0]);</div><div class='del'>-	opl3_command(map-&gt;ioaddr, AM_VIB + map-&gt;op[1], instr-&gt;operators[1]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Attack/Decay</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	opl3_command(map-&gt;ioaddr, ATTACK_DECAY + map-&gt;op[0], instr-&gt;operators[4]);</div><div class='del'>-	opl3_command(map-&gt;ioaddr, ATTACK_DECAY + map-&gt;op[1], instr-&gt;operators[5]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Sustain/Release</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	opl3_command(map-&gt;ioaddr, SUSTAIN_RELEASE + map-&gt;op[0], instr-&gt;operators[6]);</div><div class='del'>-	opl3_command(map-&gt;ioaddr, SUSTAIN_RELEASE + map-&gt;op[1], instr-&gt;operators[7]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Wave Select</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	opl3_command(map-&gt;ioaddr, WAVE_SELECT + map-&gt;op[0], instr-&gt;operators[8]);</div><div class='del'>-	opl3_command(map-&gt;ioaddr, WAVE_SELECT + map-&gt;op[1], instr-&gt;operators[9]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set Feedback/Connection</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	fpc = instr-&gt;operators[10];</div><div class='del'>-</div><div class='del'>-	if (pan != 0xffff)</div><div class='del'>-	{</div><div class='del'>-		fpc &amp;= ~STEREO_BITS;</div><div class='del'>-		if (pan &lt; -64)</div><div class='del'>-			fpc |= VOICE_TO_LEFT;</div><div class='del'>-		else</div><div class='del'>-			if (pan &gt; 64)</div><div class='del'>-				fpc |= VOICE_TO_RIGHT;</div><div class='del'>-			else</div><div class='del'>-				fpc |= (VOICE_TO_LEFT | VOICE_TO_RIGHT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(fpc &amp; 0x30))</div><div class='del'>-		fpc |= 0x30;	/*</div><div class='del'>-				 * Ensure that at least one chn is enabled</div><div class='del'>-				 */</div><div class='del'>-	opl3_command(map-&gt;ioaddr, FEEDBACK_CONNECTION + map-&gt;voice_num, fpc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the voice is a 4 OP one, initialize the operators 3 and 4 also</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (voice_mode == 4)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Set Sound Characteristics</div><div class='del'>-		 */</div><div class='del'>-	</div><div class='del'>-		opl3_command(map-&gt;ioaddr, AM_VIB + map-&gt;op[2], instr-&gt;operators[OFFS_4OP + 0]);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, AM_VIB + map-&gt;op[3], instr-&gt;operators[OFFS_4OP + 1]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set Attack/Decay</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		opl3_command(map-&gt;ioaddr, ATTACK_DECAY + map-&gt;op[2], instr-&gt;operators[OFFS_4OP + 4]);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, ATTACK_DECAY + map-&gt;op[3], instr-&gt;operators[OFFS_4OP + 5]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set Sustain/Release</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		opl3_command(map-&gt;ioaddr, SUSTAIN_RELEASE + map-&gt;op[2], instr-&gt;operators[OFFS_4OP + 6]);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, SUSTAIN_RELEASE + map-&gt;op[3], instr-&gt;operators[OFFS_4OP + 7]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set Wave Select</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		opl3_command(map-&gt;ioaddr, WAVE_SELECT + map-&gt;op[2], instr-&gt;operators[OFFS_4OP + 8]);</div><div class='del'>-		opl3_command(map-&gt;ioaddr, WAVE_SELECT + map-&gt;op[3], instr-&gt;operators[OFFS_4OP + 9]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Set Feedback/Connection</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		fpc = instr-&gt;operators[OFFS_4OP + 10];</div><div class='del'>-		if (!(fpc &amp; 0x30))</div><div class='del'>-			 fpc |= 0x30;	/*</div><div class='del'>-					 * Ensure that at least one chn is enabled</div><div class='del'>-					 */</div><div class='del'>-		opl3_command(map-&gt;ioaddr, FEEDBACK_CONNECTION + map-&gt;voice_num + 3, fpc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;voc[voice].mode = voice_mode;</div><div class='del'>-	set_voice_volume(voice, volume, devc-&gt;voc[voice].volume);</div><div class='del'>-</div><div class='del'>-	freq = devc-&gt;voc[voice].orig_freq = note_to_freq(note) / 1000;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since the pitch bender may have been set before playing the note, we</div><div class='del'>-	 * have to calculate the bending now.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	freq = compute_finetune(devc-&gt;voc[voice].orig_freq, devc-&gt;voc[voice].bender, devc-&gt;voc[voice].bender_range, 0);</div><div class='del'>-	devc-&gt;voc[voice].current_freq = freq;</div><div class='del'>-</div><div class='del'>-	freq_to_fnum(freq, &amp;block, &amp;fnum);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Play note</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	data = fnum &amp; 0xff;	/*</div><div class='del'>-				 * Least significant bits of fnumber</div><div class='del'>-				 */</div><div class='del'>-	opl3_command(map-&gt;ioaddr, FNUM_LOW + map-&gt;voice_num, data);</div><div class='del'>-</div><div class='del'>-	data = 0x20 | ((block &amp; 0x7) &lt;&lt; 2) | ((fnum &gt;&gt; 8) &amp; 0x3);</div><div class='del'>-		 devc-&gt;voc[voice].keyon_byte = data;</div><div class='del'>-	opl3_command(map-&gt;ioaddr, KEYON_BLOCK + map-&gt;voice_num, data);</div><div class='del'>-	if (voice_mode == 4)</div><div class='del'>-		opl3_command(map-&gt;ioaddr, KEYON_BLOCK + map-&gt;voice_num + 3, data);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void freq_to_fnum    (int freq, int *block, int *fnum)</div><div class='del'>-{</div><div class='del'>-	int f, octave;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Converts the note frequency to block and fnum values for the FM chip</div><div class='del'>-	 */</div><div class='del'>-	/*</div><div class='del'>-	 * First try to compute the block -value (octave) where the note belongs</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	f = freq;</div><div class='del'>-</div><div class='del'>-	octave = 5;</div><div class='del'>-</div><div class='del'>-	if (f == 0)</div><div class='del'>-		octave = 0;</div><div class='del'>-	else if (f &lt; 261)</div><div class='del'>-	{</div><div class='del'>-		while (f &lt; 261)</div><div class='del'>-		{</div><div class='del'>-			octave--;</div><div class='del'>-			f &lt;&lt;= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (f &gt; 493)</div><div class='del'>-	{</div><div class='del'>-		while (f &gt; 493)</div><div class='del'>-		{</div><div class='del'>-			 octave++;</div><div class='del'>-			 f &gt;&gt;= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (octave &gt; 7)</div><div class='del'>-		octave = 7;</div><div class='del'>-</div><div class='del'>-	*fnum = freq * (1 &lt;&lt; (20 - octave)) / 49716;</div><div class='del'>-	*block = octave;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_command    (int io_addr, unsigned int addr, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	 int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The original 2-OP synth requires a quite long delay after writing to a</div><div class='del'>-	 * register. The OPL-3 survives with just two INBs</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	outb(((unsigned char) (addr &amp; 0xff)), io_addr);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model != 2)</div><div class='del'>-		udelay(10);</div><div class='del'>-	else</div><div class='del'>-		for (i = 0; i &lt; 2; i++)</div><div class='del'>-			inb(io_addr);</div><div class='del'>-</div><div class='del'>-	outb(((unsigned char) (val &amp; 0xff)), io_addr + 1);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model != 2)</div><div class='del'>-		udelay(30);</div><div class='del'>-	else</div><div class='del'>-		for (i = 0; i &lt; 2; i++)</div><div class='del'>-			inb(io_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_reset(int devno)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 18; i++)</div><div class='del'>-		devc-&gt;lv_map[i] = i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; devc-&gt;nr_voice; i++)</div><div class='del'>-	{</div><div class='del'>-		opl3_command(pv_map[devc-&gt;lv_map[i]].ioaddr,</div><div class='del'>-			KSL_LEVEL + pv_map[devc-&gt;lv_map[i]].op[0], 0xff);</div><div class='del'>-</div><div class='del'>-		opl3_command(pv_map[devc-&gt;lv_map[i]].ioaddr,</div><div class='del'>-			KSL_LEVEL + pv_map[devc-&gt;lv_map[i]].op[1], 0xff);</div><div class='del'>-</div><div class='del'>-		if (pv_map[devc-&gt;lv_map[i]].voice_mode == 4)</div><div class='del'>-		{</div><div class='del'>-			opl3_command(pv_map[devc-&gt;lv_map[i]].ioaddr,</div><div class='del'>-				KSL_LEVEL + pv_map[devc-&gt;lv_map[i]].op[2], 0xff);</div><div class='del'>-</div><div class='del'>-			opl3_command(pv_map[devc-&gt;lv_map[i]].ioaddr,</div><div class='del'>-				KSL_LEVEL + pv_map[devc-&gt;lv_map[i]].op[3], 0xff);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		opl3_kill_note(devno, i, 0, 64);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == 2)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = 18;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 18; i++)</div><div class='del'>-			pv_map[i].voice_mode = 2;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;busy)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	devc-&gt;busy = 1;</div><div class='del'>-</div><div class='del'>-	devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = (devc-&gt;model == 2) ? 18 : 9;</div><div class='del'>-	devc-&gt;v_alloc-&gt;timestamp = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 18; i++)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;v_alloc-&gt;map[i] = 0;</div><div class='del'>-		devc-&gt;v_alloc-&gt;alloc_times[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;cmask = 0x00;	/*</div><div class='del'>-				 * Just 2 OP mode</div><div class='del'>-				 */</div><div class='del'>-	if (devc-&gt;model == 2)</div><div class='del'>-		opl3_command(devc-&gt;right_io, CONNECTION_SELECT_REGISTER, devc-&gt;cmask);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_close(int dev)</div><div class='del'>-{</div><div class='del'>-	devc-&gt;busy = 0;</div><div class='del'>-	devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = (devc-&gt;model == 2) ? 18 : 9;</div><div class='del'>-</div><div class='del'>-	devc-&gt;fm_info.nr_drums = 0;</div><div class='del'>-	devc-&gt;fm_info.perc_mode = 0;</div><div class='del'>-</div><div class='del'>-	opl3_reset(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_hw_control(int dev, unsigned char *event)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_load_patch(int dev, int format, const char __user *addr,</div><div class='del'>-		int offs, int count, int pmgr_flag)</div><div class='del'>-{</div><div class='del'>-	struct sbi_instrument ins;</div><div class='del'>-</div><div class='del'>-	if (count &lt;sizeof(ins))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "FM Error: Patch record too short\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * What the fuck is going on here?  We leave junk in the beginning</div><div class='del'>-	 * of ins and then check the field pretty close to that beginning?</div><div class='del'>-	 */</div><div class='del'>-	if(copy_from_user(&amp;((char *) &amp;ins)[offs], addr + offs, sizeof(ins) - offs))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (ins.channel &lt; 0 || ins.channel &gt;= SBFM_MAXINSTR)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "FM Error: Invalid instrument number %d\n", ins.channel);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	ins.key = format;</div><div class='del'>-</div><div class='del'>-	return store_instr(ins.channel, &amp;ins);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_panning(int dev, int voice, int value)</div><div class='del'>-{</div><div class='del'>-	devc-&gt;voc[voice].panning = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_volume_method(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SET_VIBRATO(cell) { \</div><div class='del'>-	tmp = instr-&gt;operators[(cell-1)+(((cell-1)/2)*OFFS_4OP)]; \</div><div class='del'>-	if (pressure &gt; 110) \</div><div class='del'>-		tmp |= 0x40;		/* Vibrato on */ \</div><div class='del'>-	opl3_command (map-&gt;ioaddr, AM_VIB + map-&gt;op[cell-1], tmp);}</div><div class='del'>-</div><div class='del'>-static void opl3_aftertouch(int dev, int voice, int pressure)</div><div class='del'>-{</div><div class='del'>-	int tmp;</div><div class='del'>-	struct sbi_instrument *instr;</div><div class='del'>-	struct physical_voice_info *map;</div><div class='del'>-</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	map = &amp;pv_map[devc-&gt;lv_map[voice]];</div><div class='del'>-</div><div class='del'>-	DEB(printk("Aftertouch %d\n", voice));</div><div class='del'>-</div><div class='del'>-	if (map-&gt;voice_mode == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Adjust the amount of vibrato depending the pressure</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	instr = devc-&gt;act_i[voice];</div><div class='del'>-</div><div class='del'>-	if (!instr)</div><div class='del'>-		instr = &amp;devc-&gt;i_map[0];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;voc[voice].mode == 4)</div><div class='del'>-	{</div><div class='del'>-		int connection = ((instr-&gt;operators[10] &amp; 0x01) &lt;&lt; 1) | (instr-&gt;operators[10 + OFFS_4OP] &amp; 0x01);</div><div class='del'>-</div><div class='del'>-		switch (connection)</div><div class='del'>-		{</div><div class='del'>-			case 0:</div><div class='del'>-				SET_VIBRATO(4);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 1:</div><div class='del'>-				SET_VIBRATO(2);</div><div class='del'>-				SET_VIBRATO(4);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 2:</div><div class='del'>-				SET_VIBRATO(1);</div><div class='del'>-				SET_VIBRATO(4);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case 3:</div><div class='del'>-				SET_VIBRATO(1);</div><div class='del'>-				SET_VIBRATO(3);</div><div class='del'>-				SET_VIBRATO(4);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * Not implemented yet</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		SET_VIBRATO(1);</div><div class='del'>-</div><div class='del'>-		if ((instr-&gt;operators[10] &amp; 0x01))	/*</div><div class='del'>-							 * Additive synthesis</div><div class='del'>-							 */</div><div class='del'>-			SET_VIBRATO(2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#undef SET_VIBRATO</div><div class='del'>-</div><div class='del'>-static void bend_pitch(int dev, int voice, int value)</div><div class='del'>-{</div><div class='del'>-	unsigned char data;</div><div class='del'>-	int block, fnum, freq;</div><div class='del'>-	struct physical_voice_info *map;</div><div class='del'>-</div><div class='del'>-	map = &amp;pv_map[devc-&gt;lv_map[voice]];</div><div class='del'>-</div><div class='del'>-	if (map-&gt;voice_mode == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	devc-&gt;voc[voice].bender = value;</div><div class='del'>-	if (!value)</div><div class='del'>-		return;</div><div class='del'>-	if (!(devc-&gt;voc[voice].keyon_byte &amp; 0x20))</div><div class='del'>-		return;	/*</div><div class='del'>-			 * Not keyed on</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-	freq = compute_finetune(devc-&gt;voc[voice].orig_freq, devc-&gt;voc[voice].bender, devc-&gt;voc[voice].bender_range, 0);</div><div class='del'>-	devc-&gt;voc[voice].current_freq = freq;</div><div class='del'>-</div><div class='del'>-	freq_to_fnum(freq, &amp;block, &amp;fnum);</div><div class='del'>-</div><div class='del'>-	data = fnum &amp; 0xff;	/*</div><div class='del'>-				 * Least significant bits of fnumber</div><div class='del'>-				 */</div><div class='del'>-	opl3_command(map-&gt;ioaddr, FNUM_LOW + map-&gt;voice_num, data);</div><div class='del'>-</div><div class='del'>-	data = 0x20 | ((block &amp; 0x7) &lt;&lt; 2) | ((fnum &gt;&gt; 8) &amp; 0x3);</div><div class='del'>-	devc-&gt;voc[voice].keyon_byte = data;</div><div class='del'>-	opl3_command(map-&gt;ioaddr, KEYON_BLOCK + map-&gt;voice_num, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_controller (int dev, int voice, int ctrl_num, int value)</div><div class='del'>-{</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (ctrl_num)</div><div class='del'>-	{</div><div class='del'>-		case CTRL_PITCH_BENDER:</div><div class='del'>-			bend_pitch(dev, voice, value);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CTRL_PITCH_BENDER_RANGE:</div><div class='del'>-			devc-&gt;voc[voice].bender_range = value;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CTL_MAIN_VOLUME:</div><div class='del'>-			devc-&gt;voc[voice].volume = value / 128;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CTL_PAN:</div><div class='del'>-			devc-&gt;voc[voice].panning = (value * 2) - 128;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_bender(int dev, int voice, int value)</div><div class='del'>-{</div><div class='del'>-	if (voice &lt; 0 || voice &gt;= devc-&gt;nr_voice)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bend_pitch(dev, voice, value - 8192);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int opl3_alloc_voice(int dev, int chn, int note, struct voice_alloc_info *alloc)</div><div class='del'>-{</div><div class='del'>-	int i, p, best, first, avail, best_time = 0x7fffffff;</div><div class='del'>-	struct sbi_instrument *instr;</div><div class='del'>-	int is4op;</div><div class='del'>-	int instr_no;</div><div class='del'>-</div><div class='del'>-	if (chn &lt; 0 || chn &gt; 15)</div><div class='del'>-		instr_no = 0;</div><div class='del'>-	else</div><div class='del'>-		instr_no = devc-&gt;chn_info[chn].pgm_num;</div><div class='del'>-</div><div class='del'>-	instr = &amp;devc-&gt;i_map[instr_no];</div><div class='del'>-	if (instr-&gt;channel &lt; 0 ||	/* Instrument not loaded */</div><div class='del'>-		devc-&gt;nr_voice != 12)	/* Not in 4 OP mode */</div><div class='del'>-		is4op = 0;</div><div class='del'>-	else if (devc-&gt;nr_voice == 12)	/* 4 OP mode */</div><div class='del'>-		is4op = (instr-&gt;key == OPL3_PATCH);</div><div class='del'>-	else</div><div class='del'>-		is4op = 0;</div><div class='del'>-</div><div class='del'>-	if (is4op)</div><div class='del'>-	{</div><div class='del'>-		first = p = 0;</div><div class='del'>-		avail = 6;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;nr_voice == 12)	/* 4 OP mode. Use the '2 OP only' operators first */</div><div class='del'>-			first = p = 6;</div><div class='del'>-		else</div><div class='del'>-			first = p = 0;</div><div class='del'>-		avail = devc-&gt;nr_voice;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *    Now try to find a free voice</div><div class='del'>-	 */</div><div class='del'>-	best = first;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; avail; i++)</div><div class='del'>-	{</div><div class='del'>-		if (alloc-&gt;map[p] == 0)</div><div class='del'>-		{</div><div class='del'>-			return p;</div><div class='del'>-		}</div><div class='del'>-		if (alloc-&gt;alloc_times[p] &lt; best_time)		/* Find oldest playing note */</div><div class='del'>-		{</div><div class='del'>-			best_time = alloc-&gt;alloc_times[p];</div><div class='del'>-			best = p;</div><div class='del'>-		}</div><div class='del'>-		p = (p + 1) % avail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *    Insert some kind of priority mechanism here.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (best &lt; 0)</div><div class='del'>-		best = 0;</div><div class='del'>-	if (best &gt; devc-&gt;nr_voice)</div><div class='del'>-		best -= devc-&gt;nr_voice;</div><div class='del'>-</div><div class='del'>-	return best;	/* All devc-&gt;voc in use. Select the first one. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void opl3_setup_voice(int dev, int voice, int chn)</div><div class='del'>-{</div><div class='del'>-	struct channel_info *info =</div><div class='del'>-	&amp;synth_devs[dev]-&gt;chn_info[chn];</div><div class='del'>-</div><div class='del'>-	opl3_set_instr(dev, voice, info-&gt;pgm_num);</div><div class='del'>-</div><div class='del'>-	devc-&gt;voc[voice].bender = 0;</div><div class='del'>-	devc-&gt;voc[voice].bender_range = info-&gt;bender_range;</div><div class='del'>-	devc-&gt;voc[voice].volume = info-&gt;controllers[CTL_MAIN_VOLUME];</div><div class='del'>-	devc-&gt;voc[voice].panning = (info-&gt;controllers[CTL_PAN] * 2) - 128;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct synth_operations opl3_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.id		= "OPL",</div><div class='del'>-	.info		= NULL,</div><div class='del'>-	.midi_dev	= 0,</div><div class='del'>-	.synth_type	= SYNTH_TYPE_FM,</div><div class='del'>-	.synth_subtype	= FM_TYPE_ADLIB,</div><div class='del'>-	.open		= opl3_open,</div><div class='del'>-	.close		= opl3_close,</div><div class='del'>-	.ioctl		= opl3_ioctl,</div><div class='del'>-	.kill_note	= opl3_kill_note,</div><div class='del'>-	.start_note	= opl3_start_note,</div><div class='del'>-	.set_instr	= opl3_set_instr,</div><div class='del'>-	.reset		= opl3_reset,</div><div class='del'>-	.hw_control	= opl3_hw_control,</div><div class='del'>-	.load_patch	= opl3_load_patch,</div><div class='del'>-	.aftertouch	= opl3_aftertouch,</div><div class='del'>-	.controller	= opl3_controller,</div><div class='del'>-	.panning	= opl3_panning,</div><div class='del'>-	.volume_method	= opl3_volume_method,</div><div class='del'>-	.bender		= opl3_bender,</div><div class='del'>-	.alloc_voice	= opl3_alloc_voice,</div><div class='del'>-	.setup_voice	= opl3_setup_voice</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int opl3_init(int ioaddr, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int me;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "opl3: Device control structure not initialized.\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((me = sound_alloc_synthdev()) == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "opl3: Too many synthesizers\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;nr_voice = 9;</div><div class='del'>-</div><div class='del'>-	devc-&gt;fm_info.device = 0;</div><div class='del'>-	devc-&gt;fm_info.synth_type = SYNTH_TYPE_FM;</div><div class='del'>-	devc-&gt;fm_info.synth_subtype = FM_TYPE_ADLIB;</div><div class='del'>-	devc-&gt;fm_info.perc_mode = 0;</div><div class='del'>-	devc-&gt;fm_info.nr_voices = 9;</div><div class='del'>-	devc-&gt;fm_info.nr_drums = 0;</div><div class='del'>-	devc-&gt;fm_info.instr_bank_size = SBFM_MAXINSTR;</div><div class='del'>-	devc-&gt;fm_info.capabilities = 0;</div><div class='del'>-	devc-&gt;left_io = ioaddr;</div><div class='del'>-	devc-&gt;right_io = ioaddr + 2;</div><div class='del'>-</div><div class='del'>-	if (detected_model &lt;= 2)</div><div class='del'>-		devc-&gt;model = 1;</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;model = 2;</div><div class='del'>-		if (detected_model == 4)</div><div class='del'>-			devc-&gt;is_opl4 = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	opl3_operations.info = &amp;devc-&gt;fm_info;</div><div class='del'>-</div><div class='del'>-	synth_devs[me] = &amp;opl3_operations;</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-		synth_devs[me]-&gt;owner = owner;</div><div class='del'>-	</div><div class='del'>-	sequencer_init();</div><div class='del'>-	devc-&gt;v_alloc = &amp;opl3_operations.alloc;</div><div class='del'>-	devc-&gt;chn_info = &amp;opl3_operations.chn_info[0];</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == 2)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;is_opl4) </div><div class='del'>-			strcpy(devc-&gt;fm_info.name, "Yamaha OPL4/OPL3 FM");</div><div class='del'>-		else </div><div class='del'>-			strcpy(devc-&gt;fm_info.name, "Yamaha OPL3");</div><div class='del'>-</div><div class='del'>-		devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = 18;</div><div class='del'>-		devc-&gt;fm_info.nr_drums = 0;</div><div class='del'>-		devc-&gt;fm_info.synth_subtype = FM_TYPE_OPL3;</div><div class='del'>-		devc-&gt;fm_info.capabilities |= SYNTH_CAP_OPL3;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 18; i++)</div><div class='del'>-		{</div><div class='del'>-			if (pv_map[i].ioaddr == USE_LEFT)</div><div class='del'>-				pv_map[i].ioaddr = devc-&gt;left_io;</div><div class='del'>-			else</div><div class='del'>-				pv_map[i].ioaddr = devc-&gt;right_io;</div><div class='del'>-		}</div><div class='del'>-		opl3_command(devc-&gt;right_io, OPL3_MODE_REGISTER, OPL3_ENABLE);</div><div class='del'>-		opl3_command(devc-&gt;right_io, CONNECTION_SELECT_REGISTER, 0x00);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		strcpy(devc-&gt;fm_info.name, "Yamaha OPL2");</div><div class='del'>-		devc-&gt;v_alloc-&gt;max_voice = devc-&gt;nr_voice = 9;</div><div class='del'>-		devc-&gt;fm_info.nr_drums = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 18; i++)</div><div class='del'>-			pv_map[i].ioaddr = devc-&gt;left_io;</div><div class='del'>-	};</div><div class='del'>-	conf_printf2(devc-&gt;fm_info.name, ioaddr, 0, -1, -1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SBFM_MAXINSTR; i++)</div><div class='del'>-		devc-&gt;i_map[i].channel = -1;</div><div class='del'>-</div><div class='del'>-	return me;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int me;</div><div class='del'>-</div><div class='del'>-static int io = -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-</div><div class='del'>-static int __init init_opl3 (void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "YM3812 and OPL-3 driver Copyright (C) by Hannu Savolainen, Rob Hooft 1993-1996\n");</div><div class='del'>-</div><div class='del'>-	if (io != -1)	/* User loading pure OPL3 module */</div><div class='del'>-	{</div><div class='del'>-		if (!opl3_detect(io))</div><div class='del'>-		{</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		me = opl3_init(io, THIS_MODULE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_opl3(void)</div><div class='del'>-{</div><div class='del'>-	if (devc &amp;&amp; io != -1)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;base) {</div><div class='del'>-			release_region(devc-&gt;base,4);</div><div class='del'>-			if (devc-&gt;is_opl4)</div><div class='del'>-				release_region(devc-&gt;base - 8, 2);</div><div class='del'>-		}</div><div class='del'>-		kfree(devc);</div><div class='del'>-		devc = NULL;</div><div class='del'>-		sound_unload_synthdev(me);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_opl3);</div><div class='del'>-module_exit(cleanup_opl3);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_opl3(char *str)</div><div class='del'>-{</div><div class='del'>-        /* io  */</div><div class='del'>-	int ints[2];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	</div><div class='del'>-	io = ints[1];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("opl3=", setup_opl3);</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/opl3_hw.h b/sound/oss/opl3_hw.h<br/>deleted file mode 100644<br/>index 8b11c893e869..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/opl3_hw.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/opl3_hw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,246 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	opl3_hw.h	- Definitions of the OPL-3 registers</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *	The OPL-3 mode is switched on by writing 0x01, to the offset 5</div><div class='del'>- *	of the right side.</div><div class='del'>- *</div><div class='del'>- *	Another special register at the right side is at offset 4. It contains</div><div class='del'>- *	a bit mask defining which voices are used as 4 OP voices.</div><div class='del'>- *</div><div class='del'>- *	The percussive mode is implemented in the left side only.</div><div class='del'>- *</div><div class='del'>- *	With the above exceptions the both sides can be operated independently.</div><div class='del'>- *	</div><div class='del'>- *	A 4 OP voice can be created by setting the corresponding</div><div class='del'>- *	bit at offset 4 of the right side.</div><div class='del'>- *</div><div class='del'>- *	For example setting the rightmost bit (0x01) changes the</div><div class='del'>- *	first voice on the right side to the 4 OP mode. The fourth</div><div class='del'>- *	voice is made inaccessible.</div><div class='del'>- *</div><div class='del'>- *	If a voice is set to the 2 OP mode, it works like 2 OP modes</div><div class='del'>- *	of the original YM3812 (AdLib). In addition the voice can </div><div class='del'>- *	be connected the left, right or both stereo channels. It can</div><div class='del'>- *	even be left unconnected. This works with 4 OP voices also.</div><div class='del'>- *</div><div class='del'>- *	The stereo connection bits are located in the FEEDBACK_CONNECTION</div><div class='del'>- *	register of the voice (0xC0-0xC8). In 4 OP voices these bits are</div><div class='del'>- *	in the second half of the voice.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Register numbers for the global registers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TEST_REGISTER				0x01</div><div class='del'>-#define   ENABLE_WAVE_SELECT		0x20</div><div class='del'>-</div><div class='del'>-#define TIMER1_REGISTER				0x02</div><div class='del'>-#define TIMER2_REGISTER				0x03</div><div class='del'>-#define TIMER_CONTROL_REGISTER			0x04	/* Left side */</div><div class='del'>-#define   IRQ_RESET			0x80</div><div class='del'>-#define   TIMER1_MASK			0x40</div><div class='del'>-#define   TIMER2_MASK			0x20</div><div class='del'>-#define   TIMER1_START			0x01</div><div class='del'>-#define   TIMER2_START			0x02</div><div class='del'>-</div><div class='del'>-#define CONNECTION_SELECT_REGISTER		0x04	/* Right side */</div><div class='del'>-#define   RIGHT_4OP_0			0x01</div><div class='del'>-#define   RIGHT_4OP_1			0x02</div><div class='del'>-#define   RIGHT_4OP_2			0x04</div><div class='del'>-#define   LEFT_4OP_0			0x08</div><div class='del'>-#define   LEFT_4OP_1			0x10</div><div class='del'>-#define   LEFT_4OP_2			0x20</div><div class='del'>-</div><div class='del'>-#define OPL3_MODE_REGISTER			0x05	/* Right side */</div><div class='del'>-#define   OPL3_ENABLE			0x01</div><div class='del'>-#define   OPL4_ENABLE			0x02</div><div class='del'>-</div><div class='del'>-#define KBD_SPLIT_REGISTER			0x08	/* Left side */</div><div class='del'>-#define   COMPOSITE_SINE_WAVE_MODE	0x80		/* Don't use with OPL-3? */</div><div class='del'>-#define   KEYBOARD_SPLIT		0x40</div><div class='del'>-</div><div class='del'>-#define PERCOSSION_REGISTER			0xbd	/* Left side only */</div><div class='del'>-#define   TREMOLO_DEPTH			0x80</div><div class='del'>-#define   VIBRATO_DEPTH			0x40</div><div class='del'>-#define	  PERCOSSION_ENABLE		0x20</div><div class='del'>-#define   BASSDRUM_ON			0x10</div><div class='del'>-#define   SNAREDRUM_ON			0x08</div><div class='del'>-#define   TOMTOM_ON			0x04</div><div class='del'>-#define   CYMBAL_ON			0x02</div><div class='del'>-#define   HIHAT_ON			0x01</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Offsets to the register banks for operators. To get the</div><div class='del'>- *	register number just add the operator offset to the bank offset</div><div class='del'>- *</div><div class='del'>- *	AM/VIB/EG/KSR/Multiple (0x20 to 0x35)</div><div class='del'>- */</div><div class='del'>-#define AM_VIB					0x20</div><div class='del'>-#define   TREMOLO_ON			0x80</div><div class='del'>-#define   VIBRATO_ON			0x40</div><div class='del'>-#define   SUSTAIN_ON			0x20</div><div class='del'>-#define   KSR				0x10 	/* Key scaling rate */</div><div class='del'>-#define   MULTIPLE_MASK		0x0f	/* Frequency multiplier */</div><div class='del'>-</div><div class='del'>- /*</div><div class='del'>-  *	KSL/Total level (0x40 to 0x55)</div><div class='del'>-  */</div><div class='del'>-#define KSL_LEVEL				0x40</div><div class='del'>-#define   KSL_MASK			0xc0	/* Envelope scaling bits */</div><div class='del'>-#define   TOTAL_LEVEL_MASK		0x3f	/* Strength (volume) of OP */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Attack / Decay rate (0x60 to 0x75)</div><div class='del'>- */</div><div class='del'>-#define ATTACK_DECAY				0x60</div><div class='del'>-#define   ATTACK_MASK			0xf0</div><div class='del'>-#define   DECAY_MASK			0x0f</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sustain level / Release rate (0x80 to 0x95)</div><div class='del'>- */</div><div class='del'>-#define SUSTAIN_RELEASE				0x80</div><div class='del'>-#define   SUSTAIN_MASK			0xf0</div><div class='del'>-#define   RELEASE_MASK			0x0f</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wave select (0xE0 to 0xF5)</div><div class='del'>- */</div><div class='del'>-#define WAVE_SELECT			0xe0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Offsets to the register banks for voices. Just add to the</div><div class='del'>- *	voice number to get the register number.</div><div class='del'>- *</div><div class='del'>- *	F-Number low bits (0xA0 to 0xA8).</div><div class='del'>- */</div><div class='del'>-#define FNUM_LOW				0xa0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	F-number high bits / Key on / Block (octave) (0xB0 to 0xB8)</div><div class='del'>- */</div><div class='del'>-#define KEYON_BLOCK					0xb0</div><div class='del'>-#define	  KEYON_BIT				0x20</div><div class='del'>-#define	  BLOCKNUM_MASK				0x1c</div><div class='del'>-#define   FNUM_HIGH_MASK			0x03</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Feedback / Connection (0xc0 to 0xc8)</div><div class='del'>- *</div><div class='del'>- *	These registers have two new bits when the OPL-3 mode</div><div class='del'>- *	is selected. These bits controls connecting the voice</div><div class='del'>- *	to the stereo channels. For 4 OP voices this bit is</div><div class='del'>- *	defined in the second half of the voice (add 3 to the</div><div class='del'>- *	register offset).</div><div class='del'>- *</div><div class='del'>- *	For 4 OP voices the connection bit is used in the</div><div class='del'>- *	both halves (gives 4 ways to connect the operators).</div><div class='del'>- */</div><div class='del'>-#define FEEDBACK_CONNECTION				0xc0</div><div class='del'>-#define   FEEDBACK_MASK				0x0e	/* Valid just for 1st OP of a voice */</div><div class='del'>-#define   CONNECTION_BIT			0x01</div><div class='del'>-/*</div><div class='del'>- *	In the 4 OP mode there is four possible configurations how the</div><div class='del'>- *	operators can be connected together (in 2 OP modes there is just</div><div class='del'>- *	AM or FM). The 4 OP connection mode is defined by the rightmost</div><div class='del'>- *	bit of the FEEDBACK_CONNECTION (0xC0-0xC8) on the both halves.</div><div class='del'>- *</div><div class='del'>- *	First half	Second half	Mode</div><div class='del'>- *</div><div class='del'>- *					 +---+</div><div class='del'>- *					 v   |</div><div class='del'>- *	0		0		&gt;+-1-+--2--3--4--&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *					</div><div class='del'>- *					 +---+</div><div class='del'>- *					 |   |</div><div class='del'>- *	0		1		&gt;+-1-+--2-+</div><div class='del'>- *						  |-&gt;</div><div class='del'>- *					&gt;--3----4-+</div><div class='del'>- *					</div><div class='del'>- *					 +---+</div><div class='del'>- *					 |   |</div><div class='del'>- *	1		0		&gt;+-1-+-----+</div><div class='del'>- *						   |-&gt;</div><div class='del'>- *					&gt;--2--3--4-+</div><div class='del'>- *</div><div class='del'>- *					 +---+</div><div class='del'>- *					 |   |</div><div class='del'>- *	1		1		&gt;+-1-+--+</div><div class='del'>- *						|</div><div class='del'>- *					&gt;--2--3-+-&gt;</div><div class='del'>- *						|</div><div class='del'>- *					&gt;--4----+</div><div class='del'>- */</div><div class='del'>-#define   STEREO_BITS				0x30	/* OPL-3 only */</div><div class='del'>-#define     VOICE_TO_LEFT		0x10</div><div class='del'>-#define     VOICE_TO_RIGHT		0x20</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	Definition table for the physical voices</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct physical_voice_info {</div><div class='del'>-		unsigned char voice_num;</div><div class='del'>-		unsigned char voice_mode; /* 0=unavailable, 2=2 OP, 4=4 OP */</div><div class='del'>-		unsigned short ioaddr; /* I/O port (left or right side) */</div><div class='del'>-		unsigned char op[4]; /* Operator offsets */</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	There is 18 possible 2 OP voices</div><div class='del'>- *	(9 in the left and 9 in the right).</div><div class='del'>- *	The first OP is the modulator and 2nd is the carrier.</div><div class='del'>- *</div><div class='del'>- *	The first three voices in the both sides may be connected</div><div class='del'>- *	with another voice to a 4 OP voice. For example voice 0</div><div class='del'>- *	can be connected with voice 3. The operators of voice 3 are</div><div class='del'>- *	used as operators 3 and 4 of the new 4 OP voice.</div><div class='del'>- *	In this case the 2 OP voice number 0 is the 'first half' and</div><div class='del'>- *	voice 3 is the second.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define USE_LEFT	0</div><div class='del'>-#define USE_RIGHT	1</div><div class='del'>-</div><div class='del'>-static struct physical_voice_info pv_map[18] =</div><div class='del'>-{</div><div class='del'>-/*       No Mode Side		OP1	OP2	OP3   OP4	*/</div><div class='del'>-/*	---------------------------------------------------	*/</div><div class='del'>-	{ 0,  2, USE_LEFT,	{0x00,	0x03,	0x08, 0x0b}},</div><div class='del'>-	{ 1,  2, USE_LEFT,	{0x01,	0x04,	0x09, 0x0c}},</div><div class='del'>-	{ 2,  2, USE_LEFT,	{0x02,	0x05,	0x0a, 0x0d}},</div><div class='del'>-</div><div class='del'>-	{ 3,  2, USE_LEFT,	{0x08,	0x0b,	0x00, 0x00}},</div><div class='del'>-	{ 4,  2, USE_LEFT,	{0x09,	0x0c,	0x00, 0x00}},</div><div class='del'>-	{ 5,  2, USE_LEFT,	{0x0a,	0x0d,	0x00, 0x00}},</div><div class='del'>-</div><div class='del'>-	{ 6,  2, USE_LEFT,	{0x10,	0x13,	0x00, 0x00}}, /* Used by percussive voices */</div><div class='del'>-	{ 7,  2, USE_LEFT,	{0x11,	0x14,	0x00, 0x00}}, /* if the percussive mode */</div><div class='del'>-	{ 8,  2, USE_LEFT,	{0x12,	0x15,	0x00, 0x00}}, /* is selected */</div><div class='del'>-</div><div class='del'>-	{ 0,  2, USE_RIGHT,	{0x00,	0x03,	0x08, 0x0b}},</div><div class='del'>-	{ 1,  2, USE_RIGHT,	{0x01,	0x04,	0x09, 0x0c}},</div><div class='del'>-	{ 2,  2, USE_RIGHT,	{0x02,	0x05,	0x0a, 0x0d}},</div><div class='del'>-</div><div class='del'>-	{ 3,  2, USE_RIGHT,	{0x08,	0x0b,	0x00, 0x00}},</div><div class='del'>-	{ 4,  2, USE_RIGHT,	{0x09,	0x0c,	0x00, 0x00}},</div><div class='del'>-	{ 5,  2, USE_RIGHT,	{0x0a,	0x0d,	0x00, 0x00}},</div><div class='del'>-</div><div class='del'>-	{ 6,  2, USE_RIGHT,	{0x10,	0x13,	0x00, 0x00}},</div><div class='del'>-	{ 7,  2, USE_RIGHT,	{0x11,	0x14,	0x00, 0x00}},</div><div class='del'>-	{ 8,  2, USE_RIGHT,	{0x12,	0x15,	0x00, 0x00}}</div><div class='del'>-};</div><div class='del'>-/*</div><div class='del'>- *	DMA buffer calls</div><div class='del'>- */</div><div class='head'>diff --git a/sound/oss/os.h b/sound/oss/os.h<br/>deleted file mode 100644<br/>index a1a962d7f67d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/os.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/os.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-#define ALLOW_SELECT</div><div class='del'>-#undef NO_INLINE_ASM</div><div class='del'>-#define SHORT_BANNERS</div><div class='del'>-#define MANUAL_PNP</div><div class='del'>-#undef  DO_TIMINGS</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/param.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;linux/vmalloc.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;linux/soundcard.h&gt;</div><div class='del'>-</div><div class='del'>-#define FALSE	0</div><div class='del'>-#define TRUE	1</div><div class='del'>-</div><div class='del'>-extern int sound_alloc_dma(int chn, char *deviceID);</div><div class='del'>-extern int sound_open_dma(int chn, char *deviceID);</div><div class='del'>-extern void sound_free_dma(int chn);</div><div class='del'>-extern void sound_close_dma(int chn);</div><div class='del'>-</div><div class='del'>-extern void reprogram_timer(void);</div><div class='del'>-</div><div class='del'>-#define USE_AUTOINIT_DMA</div><div class='del'>-</div><div class='del'>-extern void *sound_mem_blocks[1024];</div><div class='del'>-extern int sound_nblocks;</div><div class='del'>-</div><div class='del'>-#undef PSEUDO_DMA_AUTOINIT</div><div class='del'>-#define ALLOW_BUFFER_MAPPING</div><div class='del'>-</div><div class='del'>-extern const struct file_operations oss_sound_fops;</div><div class='head'>diff --git a/sound/oss/pas2.h b/sound/oss/pas2.h<br/>deleted file mode 100644<br/>index fa12c55f560e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pas2.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*	From pas_card.c	*/</div><div class='del'>-int pas_set_intr(int mask);</div><div class='del'>-int pas_remove_intr(int mask);</div><div class='del'>-unsigned char pas_read(int ioaddr);</div><div class='del'>-void pas_write(unsigned char data, int ioaddr);</div><div class='del'>-</div><div class='del'>-/*	From pas_audio.c */</div><div class='del'>-void pas_pcm_interrupt(unsigned char status, int cause);</div><div class='del'>-void pas_pcm_init(struct address_info *hw_config);</div><div class='del'>-</div><div class='del'>-/*	From pas_mixer.c */</div><div class='del'>-int pas_init_mixer(void);</div><div class='del'>-</div><div class='del'>-/*	From pas_midi.c */</div><div class='del'>-void pas_midi_init(void);</div><div class='del'>-void pas_midi_interrupt(void);</div><div class='head'>diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c<br/>deleted file mode 100644<br/>index 7f377ec3486d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pas2_card.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,455 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/pas2_card.c</div><div class='del'>- *</div><div class='del'>- * Detection routine for the Pro Audio Spectrum cards.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "pas2.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-</div><div class='del'>-static unsigned char dma_bits[] = {</div><div class='del'>-	4, 1, 2, 3, 0, 5, 6, 7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char irq_bits[] = {</div><div class='del'>-	0, 0, 1, 2, 3, 4, 5, 6, 0, 1, 7, 8, 9, 0, 10, 11</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char sb_irq_bits[] = {</div><div class='del'>-	0x00, 0x00, 0x08, 0x10, 0x00, 0x18, 0x00, 0x20, </div><div class='del'>-	0x00, 0x08, 0x28, 0x30, 0x38, 0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char sb_dma_bits[] = {</div><div class='del'>-	0x00, 0x40, 0x80, 0xC0, 0, 0, 0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The Address Translation code is used to convert I/O register addresses to</div><div class='del'>- * be relative to the given base -register</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int      	pas_translate_code = 0;</div><div class='del'>-static int      pas_intr_mask;</div><div class='del'>-static int      pas_irq;</div><div class='del'>-static int      pas_sb_base;</div><div class='del'>-DEFINE_SPINLOCK(pas_lock);</div><div class='del'>-#ifndef CONFIG_PAS_JOYSTICK</div><div class='del'>-static int	joystick;</div><div class='del'>-#else</div><div class='del'>-static int 	joystick = 1;</div><div class='del'>-#endif</div><div class='del'>-#ifdef SYMPHONY_PAS</div><div class='del'>-static int 	symphony = 1;</div><div class='del'>-#else</div><div class='del'>-static int 	symphony;</div><div class='del'>-#endif</div><div class='del'>-#ifdef BROKEN_BUS_CLOCK</div><div class='del'>-static int	broken_bus_clock = 1;</div><div class='del'>-#else</div><div class='del'>-static int	broken_bus_clock;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-static struct address_info cfg2;</div><div class='del'>-</div><div class='del'>-char            pas_model = 0;</div><div class='del'>-static char    *pas_model_names[] = {</div><div class='del'>-	"", </div><div class='del'>-	"Pro AudioSpectrum+", </div><div class='del'>-	"CDPC", </div><div class='del'>-	"Pro AudioSpectrum 16", </div><div class='del'>-	"Pro AudioSpectrum 16D"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pas_read() and pas_write() are equivalents of inb and outb </div><div class='del'>- * These routines perform the I/O address translation required</div><div class='del'>- * to support other than the default base address</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void     mix_write(unsigned char data, int ioaddr);</div><div class='del'>-</div><div class='del'>-unsigned char pas_read(int ioaddr)</div><div class='del'>-{</div><div class='del'>-	return inb(ioaddr + pas_translate_code);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void pas_write(unsigned char data, int ioaddr)</div><div class='del'>-{</div><div class='del'>-	outb((data), ioaddr + pas_translate_code);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************* Begin of the Interrupt Handler ********************/</div><div class='del'>-</div><div class='del'>-static irqreturn_t pasintr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	int             status;</div><div class='del'>-</div><div class='del'>-	status = pas_read(0x0B89);</div><div class='del'>-	pas_write(status, 0x0B89);	/* Clear interrupt */</div><div class='del'>-</div><div class='del'>-	if (status &amp; 0x08)</div><div class='del'>-	{</div><div class='del'>-		  pas_pcm_interrupt(status, 1);</div><div class='del'>-		  status &amp;= ~0x08;</div><div class='del'>-	}</div><div class='del'>-	if (status &amp; 0x10)</div><div class='del'>-	{</div><div class='del'>-		  pas_midi_interrupt();</div><div class='del'>-		  status &amp;= ~0x10;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pas_set_intr(int mask)</div><div class='del'>-{</div><div class='del'>-	if (!mask)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pas_intr_mask |= mask;</div><div class='del'>-</div><div class='del'>-	pas_write(pas_intr_mask, 0x0B8B);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int pas_remove_intr(int mask)</div><div class='del'>-{</div><div class='del'>-	if (!mask)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pas_intr_mask &amp;= ~mask;</div><div class='del'>-	pas_write(pas_intr_mask, 0x0B8B);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************* End of the Interrupt handler **********************/</div><div class='del'>-</div><div class='del'>-/******************* Begin of the Initialization Code ******************/</div><div class='del'>-</div><div class='del'>-static int __init config_pas_hw(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	char            ok = 1;</div><div class='del'>-	unsigned        int_ptrs;	/* scsi/sound interrupt pointers */</div><div class='del'>-</div><div class='del'>-	pas_irq = hw_config-&gt;irq;</div><div class='del'>-</div><div class='del'>-	pas_write(0x00, 0x0B8B);</div><div class='del'>-	pas_write(0x36, 0x138B);</div><div class='del'>-	pas_write(0x36, 0x1388);</div><div class='del'>-	pas_write(0, 0x1388);</div><div class='del'>-	pas_write(0x74, 0x138B);</div><div class='del'>-	pas_write(0x74, 0x1389);</div><div class='del'>-	pas_write(0, 0x1389);</div><div class='del'>-</div><div class='del'>-	pas_write(0x80 | 0x40 | 0x20 | 1, 0x0B8A);</div><div class='del'>-	pas_write(0x80 | 0x20 | 0x10 | 0x08 | 0x01, 0xF8A);</div><div class='del'>-	pas_write(0x01 | 0x02 | 0x04 | 0x10	/*</div><div class='del'>-						 * |</div><div class='del'>-						 * 0x80</div><div class='del'>-						 */ , 0xB88);</div><div class='del'>-</div><div class='del'>-	pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388);</div><div class='del'>-</div><div class='del'>-	if (pas_irq &lt; 0 || pas_irq &gt; 15)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "PAS16: Invalid IRQ %d", pas_irq);</div><div class='del'>-		hw_config-&gt;irq=-1;</div><div class='del'>-		ok = 0;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		int_ptrs = pas_read(0xF38A);</div><div class='del'>-		int_ptrs = (int_ptrs &amp; 0xf0) | irq_bits[pas_irq];</div><div class='del'>-		pas_write(int_ptrs, 0xF38A);</div><div class='del'>-		if (!irq_bits[pas_irq])</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "PAS16: Invalid IRQ %d", pas_irq);</div><div class='del'>-			hw_config-&gt;irq=-1;</div><div class='del'>-			ok = 0;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			if (request_irq(pas_irq, pasintr, 0, "PAS16",hw_config) &lt; 0) {</div><div class='del'>-				printk(KERN_ERR "PAS16: Cannot allocate IRQ %d\n",pas_irq);</div><div class='del'>-				hw_config-&gt;irq=-1;</div><div class='del'>-				ok = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;dma &lt; 0 || hw_config-&gt;dma &gt; 7)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "PAS16: Invalid DMA selection %d", hw_config-&gt;dma);</div><div class='del'>-		hw_config-&gt;dma=-1;</div><div class='del'>-		ok = 0;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		pas_write(dma_bits[hw_config-&gt;dma], 0xF389);</div><div class='del'>-		if (!dma_bits[hw_config-&gt;dma])</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "PAS16: Invalid DMA selection %d", hw_config-&gt;dma);</div><div class='del'>-			hw_config-&gt;dma=-1;</div><div class='del'>-			ok = 0;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			if (sound_alloc_dma(hw_config-&gt;dma, "PAS16"))</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "pas2_card.c: Can't allocate DMA channel\n");</div><div class='del'>-				hw_config-&gt;dma=-1;</div><div class='del'>-				ok = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This fixes the timing problems of the PAS due to the Symphony chipset</div><div class='del'>-	 * as per Media Vision.  Only define this if your PAS doesn't work correctly.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if(symphony)</div><div class='del'>-	{</div><div class='del'>-		outb((0x05), 0xa8);</div><div class='del'>-		outb((0x60), 0xa9);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(broken_bus_clock)</div><div class='del'>-		pas_write(0x01 | 0x10 | 0x20 | 0x04, 0x8388);</div><div class='del'>-	else</div><div class='del'>-		/*</div><div class='del'>-		 * pas_write(0x01, 0x8388);</div><div class='del'>-		 */</div><div class='del'>-		pas_write(0x01 | 0x10 | 0x20, 0x8388);</div><div class='del'>-</div><div class='del'>-	pas_write(0x18, 0x838A);	/* ??? */</div><div class='del'>-	pas_write(0x20 | 0x01, 0x0B8A);		/* Mute off, filter = 17.897 kHz */</div><div class='del'>-	pas_write(8, 0xBF8A);</div><div class='del'>-</div><div class='del'>-	mix_write(0x80 | 5, 0x078B);</div><div class='del'>-	mix_write(5, 0x078B);</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		struct address_info *sb_config;</div><div class='del'>-</div><div class='del'>-		sb_config = &amp;cfg2;</div><div class='del'>-		if (sb_config-&gt;io_base)</div><div class='del'>-		{</div><div class='del'>-			unsigned char   irq_dma;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Turn on Sound Blaster compatibility</div><div class='del'>-			 * bit 1 = SB emulation</div><div class='del'>-			 * bit 0 = MPU401 emulation (CDPC only :-( )</div><div class='del'>-			 */</div><div class='del'>-			</div><div class='del'>-			pas_write(0x02, 0xF788);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * "Emulation address"</div><div class='del'>-			 */</div><div class='del'>-			</div><div class='del'>-			pas_write((sb_config-&gt;io_base &gt;&gt; 4) &amp; 0x0f, 0xF789);</div><div class='del'>-			pas_sb_base = sb_config-&gt;io_base;</div><div class='del'>-</div><div class='del'>-			if (!sb_dma_bits[sb_config-&gt;dma])</div><div class='del'>-				printk(KERN_ERR "PAS16 Warning: Invalid SB DMA %d\n\n", sb_config-&gt;dma);</div><div class='del'>-</div><div class='del'>-			if (!sb_irq_bits[sb_config-&gt;irq])</div><div class='del'>-				printk(KERN_ERR "PAS16 Warning: Invalid SB IRQ %d\n\n", sb_config-&gt;irq);</div><div class='del'>-</div><div class='del'>-			irq_dma = sb_dma_bits[sb_config-&gt;dma] |</div><div class='del'>-				sb_irq_bits[sb_config-&gt;irq];</div><div class='del'>-</div><div class='del'>-			pas_write(irq_dma, 0xFB8A);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			pas_write(0x00, 0xF788);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ok)</div><div class='del'>-		printk(KERN_WARNING "PAS16: Driver not enabled\n");</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init detect_pas_hw(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char   board_id, foo;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * WARNING: Setting an option like W:1 or so that disables warm boot reset</div><div class='del'>-	 * of the card will screw up this detect code something fierce. Adding code</div><div class='del'>-	 * to handle this means possibly interfering with other cards on the bus if</div><div class='del'>-	 * you have something on base port 0x388. SO be forewarned.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	outb((0xBC), 0x9A01);	/* Activate first board */</div><div class='del'>-	outb((hw_config-&gt;io_base &gt;&gt; 2), 0x9A01);	/* Set base address */</div><div class='del'>-	pas_translate_code = hw_config-&gt;io_base - 0x388;</div><div class='del'>-	pas_write(1, 0xBF88);	/* Select one wait states */</div><div class='del'>-</div><div class='del'>-	board_id = pas_read(0x0B8B);</div><div class='del'>-</div><div class='del'>-	if (board_id == 0xff)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We probably have a PAS-series board, now check for a PAS16-series board</div><div class='del'>-	 * by trying to change the board revision bits. PAS16-series hardware won't</div><div class='del'>-	 * let you do this - the bits are read-only.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	foo = board_id ^ 0xe0;</div><div class='del'>-</div><div class='del'>-	pas_write(foo, 0x0B8B);</div><div class='del'>-	foo = pas_read(0x0B8B);</div><div class='del'>-	pas_write(board_id, 0x0B8B);</div><div class='del'>-</div><div class='del'>-	if (board_id != foo)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pas_model = pas_read(0xFF88);</div><div class='del'>-</div><div class='del'>-	return pas_model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init attach_pas_card(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	pas_irq = hw_config-&gt;irq;</div><div class='del'>-</div><div class='del'>-	if (detect_pas_hw(hw_config))</div><div class='del'>-	{</div><div class='del'>-</div><div class='del'>-		if ((pas_model = pas_read(0xFF88)))</div><div class='del'>-		{</div><div class='del'>-			char            temp[100];</div><div class='del'>-</div><div class='del'>-			sprintf(temp,</div><div class='del'>-			    "%s rev %d", pas_model_names[(int) pas_model],</div><div class='del'>-				    pas_read(0x2789));</div><div class='del'>-			conf_printf(temp, hw_config);</div><div class='del'>-		}</div><div class='del'>-		if (config_pas_hw(hw_config))</div><div class='del'>-		{</div><div class='del'>-			pas_pcm_init(hw_config);</div><div class='del'>-			pas_midi_init();</div><div class='del'>-			pas_init_mixer();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __init probe_pas(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	return detect_pas_hw(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_pas(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	extern int pas_audiodev;</div><div class='del'>-	extern int pas2_mididev;</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;dma&gt;0)</div><div class='del'>-		sound_free_dma(hw_config-&gt;dma);</div><div class='del'>-	if (hw_config-&gt;irq&gt;0)</div><div class='del'>-		free_irq(hw_config-&gt;irq, hw_config);</div><div class='del'>-</div><div class='del'>-	if(pas_audiodev!=-1)</div><div class='del'>-		sound_unload_mixerdev(audio_devs[pas_audiodev]-&gt;mixer_dev);</div><div class='del'>-	if(pas2_mididev!=-1)</div><div class='del'>-	        sound_unload_mididev(pas2_mididev);</div><div class='del'>-	if(pas_audiodev!=-1)</div><div class='del'>-		sound_unload_audiodev(pas_audiodev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __initdata io	= -1;</div><div class='del'>-static int __initdata irq	= -1;</div><div class='del'>-static int __initdata dma	= -1;</div><div class='del'>-static int __initdata dma16	= -1;	/* Set this for modules that need it */</div><div class='del'>-</div><div class='del'>-static int __initdata sb_io	= 0;</div><div class='del'>-static int __initdata sb_irq	= -1;</div><div class='del'>-static int __initdata sb_dma	= -1;</div><div class='del'>-static int __initdata sb_dma16	= -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-module_param(irq, int, 0);</div><div class='del'>-module_param(dma, int, 0);</div><div class='del'>-module_param(dma16, int, 0);</div><div class='del'>-</div><div class='del'>-module_param(sb_io, int, 0);</div><div class='del'>-module_param(sb_irq, int, 0);</div><div class='del'>-module_param(sb_dma, int, 0);</div><div class='del'>-module_param(sb_dma16, int, 0);</div><div class='del'>-</div><div class='del'>-module_param(joystick, bool, 0);</div><div class='del'>-module_param(symphony, bool, 0);</div><div class='del'>-module_param(broken_bus_clock, bool, 0);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int __init init_pas2(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "Pro Audio Spectrum driver Copyright (C) by Hannu Savolainen 1993-1996\n");</div><div class='del'>-</div><div class='del'>-	cfg.io_base = io;</div><div class='del'>-	cfg.irq = irq;</div><div class='del'>-	cfg.dma = dma;</div><div class='del'>-	cfg.dma2 = dma16;</div><div class='del'>-</div><div class='del'>-	cfg2.io_base = sb_io;</div><div class='del'>-	cfg2.irq = sb_irq;</div><div class='del'>-	cfg2.dma = sb_dma;</div><div class='del'>-	cfg2.dma2 = sb_dma16;</div><div class='del'>-</div><div class='del'>-	if (cfg.io_base == -1 || cfg.dma == -1 || cfg.irq == -1) {</div><div class='del'>-		printk(KERN_INFO "I/O, IRQ, DMA and type are mandatory\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!probe_pas(&amp;cfg))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	attach_pas_card(&amp;cfg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_pas2(void)</div><div class='del'>-{</div><div class='del'>-	unload_pas(&amp;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_pas2);</div><div class='del'>-module_exit(cleanup_pas2);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_pas2(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq, dma, dma2, sb_io, sb_irq, sb_dma, sb_dma2 */</div><div class='del'>-	int ints[9];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	io	= ints[1];</div><div class='del'>-	irq	= ints[2];</div><div class='del'>-	dma	= ints[3];</div><div class='del'>-	dma16	= ints[4];</div><div class='del'>-</div><div class='del'>-	sb_io	= ints[5];</div><div class='del'>-	sb_irq	= ints[6];</div><div class='del'>-	sb_dma	= ints[7];</div><div class='del'>-	sb_dma16 = ints[8];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("pas2=", setup_pas2);</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/pas2_midi.c b/sound/oss/pas2_midi.c<br/>deleted file mode 100644<br/>index 1122d10a20c3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pas2_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_midi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,262 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/pas2_midi.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the PAS Midi Interface.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Bartlomiej Zolnierkiewicz	: Added __init to pas_init_mixer()</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "pas2.h"</div><div class='del'>-</div><div class='del'>-extern spinlock_t pas_lock;</div><div class='del'>-</div><div class='del'>-static int      midi_busy, input_opened;</div><div class='del'>-static int      my_dev;</div><div class='del'>-</div><div class='del'>-int pas2_mididev=-1;</div><div class='del'>-</div><div class='del'>-static unsigned char tmp_queue[256];</div><div class='del'>-static volatile int qlen;</div><div class='del'>-static volatile unsigned char qhead, qtail;</div><div class='del'>-</div><div class='del'>-static void     (*midi_input_intr) (int dev, unsigned char data);</div><div class='del'>-</div><div class='del'>-static int pas_midi_open(int dev, int mode,</div><div class='del'>-	      void            (*input) (int dev, unsigned char data),</div><div class='del'>-	      void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	int             err;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	unsigned char   ctrl;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (midi_busy)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset input and output FIFO pointers</div><div class='del'>-	 */</div><div class='del'>-	pas_write(0x20 | 0x40,</div><div class='del'>-		  0x178b);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	if ((err = pas_set_intr(0x10)) &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Enable input available and output FIFO empty interrupts</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ctrl = 0;</div><div class='del'>-	input_opened = 0;</div><div class='del'>-	midi_input_intr = input;</div><div class='del'>-</div><div class='del'>-	if (mode == OPEN_READ || mode == OPEN_READWRITE)</div><div class='del'>-	{</div><div class='del'>-		ctrl |= 0x04;	/* Enable input */</div><div class='del'>-		input_opened = 1;</div><div class='del'>-	}</div><div class='del'>-	if (mode == OPEN_WRITE || mode == OPEN_READWRITE)</div><div class='del'>-	{</div><div class='del'>-		ctrl |= 0x08 | 0x10;	/* Enable output */</div><div class='del'>-	}</div><div class='del'>-	pas_write(ctrl, 0x178b);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Acknowledge any pending interrupts</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	pas_write(0xff, 0x1B88);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	midi_busy = 1;</div><div class='del'>-	qlen = qhead = qtail = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_midi_close(int dev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset FIFO pointers, disable intrs</div><div class='del'>-	 */</div><div class='del'>-	pas_write(0x20 | 0x40, 0x178b);</div><div class='del'>-</div><div class='del'>-	pas_remove_intr(0x10);</div><div class='del'>-	midi_busy = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dump_to_midi(unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	int fifo_space, x;</div><div class='del'>-</div><div class='del'>-	fifo_space = ((x = pas_read(0x1B89)) &gt;&gt; 4) &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The MIDI FIFO space register and it's documentation is nonunderstandable.</div><div class='del'>-	 * There seem to be no way to differentiate between buffer full and buffer</div><div class='del'>-	 * empty situations. For this reason we don't never write the buffer</div><div class='del'>-	 * completely full. In this way we can assume that 0 (or is it 15)</div><div class='del'>-	 * means that the buffer is empty.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (fifo_space &lt; 2 &amp;&amp; fifo_space != 0)	/* Full (almost) */</div><div class='del'>-		return 0;	/* Ask upper layers to retry after some time */</div><div class='del'>-</div><div class='del'>-	pas_write(midi_byte, 0x178A);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_midi_out(int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Drain the local queue first</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	while (qlen &amp;&amp; dump_to_midi(tmp_queue[qhead]))</div><div class='del'>-	{</div><div class='del'>-		qlen--;</div><div class='del'>-		qhead++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Output the byte if the local queue is empty.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!qlen)</div><div class='del'>-		if (dump_to_midi(midi_byte))</div><div class='del'>-			return 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Put to the local queue</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (qlen &gt;= 256)</div><div class='del'>-		return 0;	/* Local queue full */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	tmp_queue[qtail] = midi_byte;</div><div class='del'>-	qlen++;</div><div class='del'>-	qtail++;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_midi_start_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_midi_end_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_midi_kick(int dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_buffer_status(int dev)</div><div class='del'>-{</div><div class='del'>-	return qlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"Pro Audio Spectrum Midi"</div><div class='del'>-#define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static struct midi_operations pas_midi_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"Pro Audio Spectrum", 0, 0, SNDCARD_PAS},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= pas_midi_open,</div><div class='del'>-	.close		= pas_midi_close,</div><div class='del'>-	.outputc	= pas_midi_out,</div><div class='del'>-	.start_read	= pas_midi_start_read,</div><div class='del'>-	.end_read	= pas_midi_end_read,</div><div class='del'>-	.kick		= pas_midi_kick,</div><div class='del'>-	.buffer_status	= pas_buffer_status,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init pas_midi_init(void)</div><div class='del'>-{</div><div class='del'>-	int dev = sound_alloc_mididev();</div><div class='del'>-</div><div class='del'>-	if (dev == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "pas_midi_init: Too many midi devices detected\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	std_midi_synth.midi_dev = my_dev = dev;</div><div class='del'>-	midi_devs[dev] = &amp;pas_midi_operations;</div><div class='del'>-	pas2_mididev = dev;</div><div class='del'>-	sequencer_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void pas_midi_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	unsigned char   stat;</div><div class='del'>-	int             i, incount;</div><div class='del'>-</div><div class='del'>-	stat = pas_read(0x1B88);</div><div class='del'>-</div><div class='del'>-	if (stat &amp; 0x04)	/* Input data available */</div><div class='del'>-	{</div><div class='del'>-		incount = pas_read(0x1B89) &amp; 0x0f;	/* Input FIFO size */</div><div class='del'>-		if (!incount)</div><div class='del'>-			incount = 16;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; incount; i++)</div><div class='del'>-			if (input_opened)</div><div class='del'>-			{</div><div class='del'>-				midi_input_intr(my_dev, pas_read(0x178A));</div><div class='del'>-			} else</div><div class='del'>-				pas_read(0x178A);	/* Flush */</div><div class='del'>-	}</div><div class='del'>-	if (stat &amp; (0x08 | 0x10))</div><div class='del'>-	{</div><div class='del'>-		spin_lock(&amp;pas_lock);/* called in irq context */</div><div class='del'>-</div><div class='del'>-		while (qlen &amp;&amp; dump_to_midi(tmp_queue[qhead]))</div><div class='del'>-		{</div><div class='del'>-			qlen--;</div><div class='del'>-			qhead++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;pas_lock);</div><div class='del'>-	}</div><div class='del'>-	if (stat &amp; 0x40)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "MIDI output overrun %x,%x\n", pas_read(0x1B89), stat);</div><div class='del'>-	}</div><div class='del'>-	pas_write(stat, 0x1B88);	/* Acknowledge interrupts */</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/pas2_mixer.c b/sound/oss/pas2_mixer.c<br/>deleted file mode 100644<br/>index a0bcb85c3904..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pas2_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_mixer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,336 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * sound/oss/pas2_mixer.c</div><div class='del'>- *</div><div class='del'>- * Mixer routines for the Pro Audio Spectrum cards.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Bartlomiej Zolnierkiewicz : added __init to pas_init_mixer()</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "pas2.h"</div><div class='del'>-</div><div class='del'>-#ifndef DEB</div><div class='del'>-#define DEB(what)		/* (what) */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern int      pas_translate_code;</div><div class='del'>-extern char     pas_model;</div><div class='del'>-extern int     *pas_osp;</div><div class='del'>-extern int      pas_audiodev;</div><div class='del'>-</div><div class='del'>-static int      rec_devices = (SOUND_MASK_MIC);		/* Default recording source */</div><div class='del'>-static int      mode_control;</div><div class='del'>-</div><div class='del'>-#define POSSIBLE_RECORDING_DEVICES	(SOUND_MASK_SYNTH | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD | SOUND_MASK_ALTPCM)</div><div class='del'>-</div><div class='del'>-#define SUPPORTED_MIXER_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD | SOUND_MASK_ALTPCM | SOUND_MASK_IMIX | \</div><div class='del'>-					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_RECLEV)</div><div class='del'>-</div><div class='del'>-static int     *levels;</div><div class='del'>-</div><div class='del'>-static int      default_levels[32] =</div><div class='del'>-{</div><div class='del'>-	0x3232,			/* Master Volume */</div><div class='del'>-	0x3232,			/* Bass */</div><div class='del'>-	0x3232,			/* Treble */</div><div class='del'>-	0x5050,			/* FM */</div><div class='del'>-	0x4b4b,			/* PCM */</div><div class='del'>-	0x3232,			/* PC Speaker */</div><div class='del'>-	0x4b4b,			/* Ext Line */</div><div class='del'>-	0x4b4b,			/* Mic */</div><div class='del'>-	0x4b4b,			/* CD */</div><div class='del'>-	0x6464,			/* Recording monitor */</div><div class='del'>-	0x4b4b,			/* SB PCM */</div><div class='del'>-	0x6464			/* Recording level */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-mix_write(unsigned char data, int ioaddr)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * The Revision D cards have a problem with their MVA508 interface. The</div><div class='del'>-	 * kludge-o-rama fix is to make a 16-bit quantity with identical LSB and</div><div class='del'>-	 * MSBs out of the output byte and to do a 16-bit out to the mixer port -</div><div class='del'>-	 * 1. We need to do this because it isn't timing problem but chip access</div><div class='del'>-	 * sequence problem.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (pas_model == 4)</div><div class='del'>-	  {</div><div class='del'>-		  outw(data | (data &lt;&lt; 8), (ioaddr + pas_translate_code) - 1);</div><div class='del'>-		  outb((0x80), 0);</div><div class='del'>-	} else</div><div class='del'>-		pas_write(data, ioaddr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mixer_output(int right_vol, int left_vol, int div, int bits,</div><div class='del'>-	     int mixer)		/* Input or output mixer */</div><div class='del'>-{</div><div class='del'>-	int             left = left_vol * div / 100;</div><div class='del'>-	int             right = right_vol * div / 100;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (bits &amp; 0x10)</div><div class='del'>-	  {</div><div class='del'>-		  left |= mixer;</div><div class='del'>-		  right |= mixer;</div><div class='del'>-	  }</div><div class='del'>-	if (bits == 0x03 || bits == 0x04)</div><div class='del'>-	  {</div><div class='del'>-		  mix_write(0x80 | bits, 0x078B);</div><div class='del'>-		  mix_write(left, 0x078B);</div><div class='del'>-		  right_vol = left_vol;</div><div class='del'>-	} else</div><div class='del'>-	  {</div><div class='del'>-		  mix_write(0x80 | 0x20 | bits, 0x078B);</div><div class='del'>-		  mix_write(left, 0x078B);</div><div class='del'>-		  mix_write(0x80 | 0x40 | bits, 0x078B);</div><div class='del'>-		  mix_write(right, 0x078B);</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return (left_vol | (right_vol &lt;&lt; 8));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_mode(int new_mode)</div><div class='del'>-{</div><div class='del'>-	mix_write(0x80 | 0x05, 0x078B);</div><div class='del'>-	mix_write(new_mode, 0x078B);</div><div class='del'>-</div><div class='del'>-	mode_control = new_mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pas_mixer_set(int whichDev, unsigned int level)</div><div class='del'>-{</div><div class='del'>-	int             left, right, devmask, changed, i, mixer = 0;</div><div class='del'>-</div><div class='del'>-	DEB(printk("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));</div><div class='del'>-</div><div class='del'>-	left = level &amp; 0x7f;</div><div class='del'>-	right = (level &amp; 0x7f00) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	if (whichDev &lt; SOUND_MIXER_NRDEVICES) {</div><div class='del'>-		if ((1 &lt;&lt; whichDev) &amp; rec_devices)</div><div class='del'>-			mixer = 0x20;</div><div class='del'>-		else</div><div class='del'>-			mixer = 0x00;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (whichDev)</div><div class='del'>-	  {</div><div class='del'>-	  case SOUND_MIXER_VOLUME:	/* Master volume (0-63) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 63, 0x01, 0);</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-		  /*</div><div class='del'>-		   * Note! Bass and Treble are mono devices. Will use just the left</div><div class='del'>-		   * channel.</div><div class='del'>-		   */</div><div class='del'>-	  case SOUND_MIXER_BASS:	/* Bass (0-12) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 12, 0x03, 0);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_TREBLE:	/* Treble (0-12) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 12, 0x04, 0);</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case SOUND_MIXER_SYNTH:	/* Internal synthesizer (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x00, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_PCM:	/* PAS PCM (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x05, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_ALTPCM:	/* SB PCM (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x07, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_SPEAKER:	/* PC speaker (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x06, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_LINE:	/* External line (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x02, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_CD:	/* CD (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x03, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_MIC:	/* External microphone (0-31) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x04, mixer);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_IMIX:	/* Recording monitor (0-31) (Output mixer only) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 31, 0x10 | 0x01,</div><div class='del'>-						  0x00);</div><div class='del'>-		  break;</div><div class='del'>-	  case SOUND_MIXER_RECLEV:	/* Recording level (0-15) */</div><div class='del'>-		  levels[whichDev] = mixer_output(right, left, 15, 0x02, 0);</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  case SOUND_MIXER_RECSRC:</div><div class='del'>-		  devmask = level &amp; POSSIBLE_RECORDING_DEVICES;</div><div class='del'>-</div><div class='del'>-		  changed = devmask ^ rec_devices;</div><div class='del'>-		  rec_devices = devmask;</div><div class='del'>-</div><div class='del'>-		  for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-			  if (changed &amp; (1 &lt;&lt; i))</div><div class='del'>-			    {</div><div class='del'>-				    pas_mixer_set(i, levels[i]);</div><div class='del'>-			    }</div><div class='del'>-		  return rec_devices;</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  default:</div><div class='del'>-		  return -EINVAL;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return (levels[whichDev]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_mixer_reset(void)</div><div class='del'>-{</div><div class='del'>-	int             foo;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_mixer.c: void pas_mixer_reset(void)\n"));</div><div class='del'>-</div><div class='del'>-	for (foo = 0; foo &lt; SOUND_MIXER_NRDEVICES; foo++)</div><div class='del'>-		pas_mixer_set(foo, levels[foo]);</div><div class='del'>-</div><div class='del'>-	set_mode(0x04 | 0x01);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int level,v ;</div><div class='del'>-	int __user *p = (int __user *)arg;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */</div><div class='del'>-		if (get_user(level, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (level == -1)  /* Return current settings */</div><div class='del'>-			level = (mode_control &amp; 0x04);</div><div class='del'>-		else {</div><div class='del'>-			mode_control &amp;= ~0x04;</div><div class='del'>-			if (level)</div><div class='del'>-				mode_control |= 0x04;</div><div class='del'>-			set_mode(mode_control);</div><div class='del'>-		}</div><div class='del'>-		level = !!level;</div><div class='del'>-		return put_user(level, p);</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE2) { /* Set enhance bit */</div><div class='del'>-		if (get_user(level, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (level == -1) { /* Return current settings */</div><div class='del'>-			if (!(mode_control &amp; 0x03))</div><div class='del'>-				level = 0;</div><div class='del'>-			else</div><div class='del'>-				level = ((mode_control &amp; 0x03) + 1) * 20;</div><div class='del'>-		} else {</div><div class='del'>-			int i = 0;</div><div class='del'>-			</div><div class='del'>-			level &amp;= 0x7f;</div><div class='del'>-			if (level)</div><div class='del'>-				i = (level / 20) - 1;</div><div class='del'>-			mode_control &amp;= ~0x03;</div><div class='del'>-			mode_control |= i &amp; 0x03;</div><div class='del'>-			set_mode(mode_control);</div><div class='del'>-			if (i)</div><div class='del'>-				i = (i + 1) * 20;</div><div class='del'>-			level = i;</div><div class='del'>-		}</div><div class='del'>-		return put_user(level, p);</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE3) { /* Set mute bit */</div><div class='del'>-		if (get_user(level, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (level == -1)	/* Return current settings */</div><div class='del'>-			level = !(pas_read(0x0B8A) &amp; 0x20);</div><div class='del'>-		else {</div><div class='del'>-			if (level)</div><div class='del'>-				pas_write(pas_read(0x0B8A) &amp; (~0x20), 0x0B8A);</div><div class='del'>-			else</div><div class='del'>-				pas_write(pas_read(0x0B8A) | 0x20, 0x0B8A);</div><div class='del'>-</div><div class='del'>-			level = !(pas_read(0x0B8A) &amp; 0x20);</div><div class='del'>-		}</div><div class='del'>-		return put_user(level, p);</div><div class='del'>-	}</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) == 'M') {</div><div class='del'>-		if (get_user(v, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) {</div><div class='del'>-			v = pas_mixer_set(cmd &amp; 0xff, v);</div><div class='del'>-		} else {</div><div class='del'>-			switch (cmd &amp; 0xff) {</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				v = rec_devices;</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case SOUND_MIXER_STEREODEVS:</div><div class='del'>-				v = SUPPORTED_MIXER_DEVICES &amp; ~(SOUND_MASK_BASS | SOUND_MASK_TREBLE);</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case SOUND_MIXER_DEVMASK:</div><div class='del'>-				v = SUPPORTED_MIXER_DEVICES;</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case SOUND_MIXER_RECMASK:</div><div class='del'>-				v = POSSIBLE_RECORDING_DEVICES &amp; SUPPORTED_MIXER_DEVICES;</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case SOUND_MIXER_CAPS:</div><div class='del'>-				v = 0;	/* No special capabilities */</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			default:</div><div class='del'>-				v = levels[cmd &amp; 0xff];</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return put_user(v, p);</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mixer_operations pas_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "PAS16",</div><div class='del'>-	.name	= "Pro Audio Spectrum 16",</div><div class='del'>-	.ioctl	= pas_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init</div><div class='del'>-pas_init_mixer(void)</div><div class='del'>-{</div><div class='del'>-	int             d;</div><div class='del'>-</div><div class='del'>-	levels = load_mixer_volumes("PAS16_1", default_levels, 1);</div><div class='del'>-</div><div class='del'>-	pas_mixer_reset();</div><div class='del'>-</div><div class='del'>-	if ((d = sound_alloc_mixerdev()) != -1)</div><div class='del'>-	  {</div><div class='del'>-		  audio_devs[pas_audiodev]-&gt;mixer_dev = d;</div><div class='del'>-		  mixer_devs[d] = &amp;pas_mixer_operations;</div><div class='del'>-	  }</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c<br/>deleted file mode 100644<br/>index 8f7d175767a2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pas2_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pas2_pcm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,437 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * pas2_pcm.c Audio routines for PAS16</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Alan Cox	   : Swatted a double allocation of device bug. Made a few</div><div class='del'>- *		     more things module options.</div><div class='del'>- * Bartlomiej Zolnierkiewicz : Added __init to pas_pcm_init()</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/timex.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "pas2.h"</div><div class='del'>-</div><div class='del'>-#ifndef DEB</div><div class='del'>-#define DEB(WHAT)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PAS_PCM_INTRBITS (0x08)</div><div class='del'>-/*</div><div class='del'>- * Sample buffer timer interrupt enable</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define PCM_NON	0</div><div class='del'>-#define PCM_DAC	1</div><div class='del'>-#define PCM_ADC	2</div><div class='del'>-</div><div class='del'>-static unsigned long pcm_speed; 	/* sampling rate */</div><div class='del'>-static unsigned char pcm_channels = 1;	/* channels (1 or 2) */</div><div class='del'>-static unsigned char pcm_bits = 8;	/* bits/sample (8 or 16) */</div><div class='del'>-static unsigned char pcm_filter;	/* filter FLAG */</div><div class='del'>-static unsigned char pcm_mode = PCM_NON;</div><div class='del'>-static unsigned long pcm_count;</div><div class='del'>-static unsigned short pcm_bitsok = 8;	/* mask of OK bits */</div><div class='del'>-static int      pcm_busy;</div><div class='del'>-int             pas_audiodev = -1;</div><div class='del'>-static int      open_mode;</div><div class='del'>-</div><div class='del'>-extern spinlock_t pas_lock;</div><div class='del'>-</div><div class='del'>-static int pcm_set_speed(int arg)</div><div class='del'>-{</div><div class='del'>-	int foo, tmp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (arg == 0)</div><div class='del'>-		return pcm_speed;</div><div class='del'>-</div><div class='del'>-	if (arg &gt; 44100)</div><div class='del'>-		arg = 44100;</div><div class='del'>-	if (arg &lt; 5000)</div><div class='del'>-		arg = 5000;</div><div class='del'>-</div><div class='del'>-	if (pcm_channels &amp; 2)</div><div class='del'>-	{</div><div class='del'>-		foo = ((CLOCK_TICK_RATE / 2) + (arg / 2)) / arg;</div><div class='del'>-		arg = ((CLOCK_TICK_RATE / 2) + (foo / 2)) / foo;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		foo = (CLOCK_TICK_RATE + (arg / 2)) / arg;</div><div class='del'>-		arg = (CLOCK_TICK_RATE + (foo / 2)) / foo;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pcm_speed = arg;</div><div class='del'>-</div><div class='del'>-	tmp = pas_read(0x0B8A);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set anti-aliasing filters according to sample rate. You really *NEED*</div><div class='del'>-	 * to enable this feature for all normal recording unless you want to</div><div class='del'>-	 * experiment with aliasing effects.</div><div class='del'>-	 * These filters apply to the selected "recording" source.</div><div class='del'>-	 * I (pfw) don't know the encoding of these 5 bits. The values shown</div><div class='del'>-	 * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/.</div><div class='del'>-	 *</div><div class='del'>-	 * I cleared bit 5 of these values, since that bit controls the master</div><div class='del'>-	 * mute flag. (Olav Wölfelschneider)</div><div class='del'>-	 *</div><div class='del'>-	 */</div><div class='del'>-#if !defined NO_AUTO_FILTER_SET</div><div class='del'>-	tmp &amp;= 0xe0;</div><div class='del'>-	if (pcm_speed &gt;= 2 * 17897)</div><div class='del'>-		tmp |= 0x01;</div><div class='del'>-	else if (pcm_speed &gt;= 2 * 15909)</div><div class='del'>-		tmp |= 0x02;</div><div class='del'>-	else if (pcm_speed &gt;= 2 * 11931)</div><div class='del'>-		tmp |= 0x09;</div><div class='del'>-	else if (pcm_speed &gt;= 2 * 8948)</div><div class='del'>-		tmp |= 0x11;</div><div class='del'>-	else if (pcm_speed &gt;= 2 * 5965)</div><div class='del'>-		tmp |= 0x19;</div><div class='del'>-	else if (pcm_speed &gt;= 2 * 2982)</div><div class='del'>-		tmp |= 0x04;</div><div class='del'>-	pcm_filter = tmp;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	pas_write(tmp &amp; ~(0x40 | 0x80), 0x0B8A);</div><div class='del'>-	pas_write(0x00 | 0x30 | 0x04, 0x138B);</div><div class='del'>-	pas_write(foo &amp; 0xff, 0x1388);</div><div class='del'>-	pas_write((foo &gt;&gt; 8) &amp; 0xff, 0x1388);</div><div class='del'>-	pas_write(tmp, 0x0B8A);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	return pcm_speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm_set_channels(int arg)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if ((arg != 1) &amp;&amp; (arg != 2))</div><div class='del'>-		return pcm_channels;</div><div class='del'>-</div><div class='del'>-	if (arg != pcm_channels)</div><div class='del'>-	{</div><div class='del'>-		pas_write(pas_read(0xF8A) ^ 0x20, 0xF8A);</div><div class='del'>-</div><div class='del'>-		pcm_channels = arg;</div><div class='del'>-		pcm_set_speed(pcm_speed);	/* The speed must be reinitialized */</div><div class='del'>-	}</div><div class='del'>-	return pcm_channels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pcm_set_bits(int arg)</div><div class='del'>-{</div><div class='del'>-	if (arg == 0)</div><div class='del'>-		return pcm_bits;</div><div class='del'>-</div><div class='del'>-	if ((arg &amp; pcm_bitsok) != arg)</div><div class='del'>-		return pcm_bits;</div><div class='del'>-</div><div class='del'>-	if (arg != pcm_bits)</div><div class='del'>-	{</div><div class='del'>-		pas_write(pas_read(0x8389) ^ 0x04, 0x8389);</div><div class='del'>-</div><div class='del'>-		pcm_bits = arg;</div><div class='del'>-	}</div><div class='del'>-	return pcm_bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_audio_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int val, ret;</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_pcm.c: static int pas_audio_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));</div><div class='del'>-</div><div class='del'>-	switch (cmd) </div><div class='del'>-	{</div><div class='del'>-	case SOUND_PCM_WRITE_RATE:</div><div class='del'>-		if (get_user(val, p)) </div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ret = pcm_set_speed(val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_RATE:</div><div class='del'>-		ret = pcm_speed;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case SNDCTL_DSP_STEREO:</div><div class='del'>-		if (get_user(val, p)) </div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ret = pcm_set_channels(val + 1) - 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_WRITE_CHANNELS:</div><div class='del'>-		if (get_user(val, p)) </div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ret = pcm_set_channels(val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_CHANNELS:</div><div class='del'>-		ret = pcm_channels;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFMT:</div><div class='del'>-		if (get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		ret = pcm_set_bits(val);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case SOUND_PCM_READ_BITS:</div><div class='del'>-		ret = pcm_bits;</div><div class='del'>-		break;</div><div class='del'>-  </div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return put_user(ret, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_audio_reset(int dev)</div><div class='del'>-{</div><div class='del'>-	DEB(printk("pas2_pcm.c: static void pas_audio_reset(void)\n"));</div><div class='del'>-</div><div class='del'>-	pas_write(pas_read(0xF8A) &amp; ~0x40, 0xF8A);	/* Disable PCM */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_audio_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	int             err;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_pcm.c: static int pas_audio_open(int mode = %X)\n", mode));</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-	if (pcm_busy)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	pcm_busy = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	if ((err = pas_set_intr(PAS_PCM_INTRBITS)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	pcm_count = 0;</div><div class='del'>-	open_mode = mode;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_audio_close(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_pcm.c: static void pas_audio_close(void)\n"));</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	pas_audio_reset(dev);</div><div class='del'>-	pas_remove_intr(PAS_PCM_INTRBITS);</div><div class='del'>-	pcm_mode = PCM_NON;</div><div class='del'>-</div><div class='del'>-	pcm_busy = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_audio_output_block(int dev, unsigned long buf, int count,</div><div class='del'>-		       int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags, cnt;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_pcm.c: static void pas_audio_output_block(char *buf = %P, int count = %X)\n", buf, count));</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE &amp;&amp;</div><div class='del'>-	    intrflag &amp;&amp;</div><div class='del'>-	    cnt == pcm_count)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	pas_write(pas_read(0xF8A) &amp; ~0x40,</div><div class='del'>-		  0xF8A);</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_WRITE); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (count != pcm_count)</div><div class='del'>-	{</div><div class='del'>-		pas_write(pas_read(0x0B8A) &amp; ~0x80, 0x0B8A);</div><div class='del'>-		pas_write(0x40 | 0x30 | 0x04, 0x138B);</div><div class='del'>-		pas_write(count &amp; 0xff, 0x1389);</div><div class='del'>-		pas_write((count &gt;&gt; 8) &amp; 0xff, 0x1389);</div><div class='del'>-		pas_write(pas_read(0x0B8A) | 0x80, 0x0B8A);</div><div class='del'>-</div><div class='del'>-		pcm_count = count;</div><div class='del'>-	}</div><div class='del'>-	pas_write(pas_read(0x0B8A) | 0x80 | 0x40, 0x0B8A);</div><div class='del'>-#ifdef NO_TRIGGER</div><div class='del'>-	pas_write(pas_read(0xF8A) | 0x40 | 0x10, 0xF8A);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	pcm_mode = PCM_DAC;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pas_audio_start_input(int dev, unsigned long buf, int count,</div><div class='del'>-		      int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	int             cnt;</div><div class='del'>-</div><div class='del'>-	DEB(printk("pas2_pcm.c: static void pas_audio_start_input(char *buf = %P, int count = %X)\n", buf, count));</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[pas_audiodev]-&gt;flags &amp; DMA_AUTOMODE &amp;&amp;</div><div class='del'>-	    intrflag &amp;&amp;</div><div class='del'>-	    cnt == pcm_count)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_READ); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (count != pcm_count)</div><div class='del'>-	{</div><div class='del'>-		pas_write(pas_read(0x0B8A) &amp; ~0x80, 0x0B8A);</div><div class='del'>-		pas_write(0x40 | 0x30 | 0x04, 0x138B);</div><div class='del'>-		pas_write(count &amp; 0xff, 0x1389);</div><div class='del'>-		pas_write((count &gt;&gt; 8) &amp; 0xff, 0x1389);</div><div class='del'>-		pas_write(pas_read(0x0B8A) | 0x80, 0x0B8A);</div><div class='del'>-</div><div class='del'>-		pcm_count = count;</div><div class='del'>-	}</div><div class='del'>-	pas_write(pas_read(0x0B8A) | 0x80 | 0x40, 0x0B8A);</div><div class='del'>-#ifdef NO_TRIGGER</div><div class='del'>-	pas_write((pas_read(0xF8A) | 0x40) &amp; ~0x10, 0xF8A);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	pcm_mode = PCM_ADC;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef NO_TRIGGER</div><div class='del'>-static void pas_audio_trigger(int dev, int state)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pas_lock, flags);</div><div class='del'>-	state &amp;= open_mode;</div><div class='del'>-</div><div class='del'>-	if (state &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-		pas_write(pas_read(0xF8A) | 0x40 | 0x10, 0xF8A);</div><div class='del'>-	else if (state &amp; PCM_ENABLE_INPUT)</div><div class='del'>-		pas_write((pas_read(0xF8A) | 0x40) &amp; ~0x10, 0xF8A);</div><div class='del'>-	else</div><div class='del'>-		pas_write(pas_read(0xF8A) &amp; ~0x40, 0xF8A);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;pas_lock, flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int pas_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	pas_audio_reset(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pas_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	pas_audio_reset(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver pas_audio_driver =</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= pas_audio_open,</div><div class='del'>-	.close			= pas_audio_close,</div><div class='del'>-	.output_block		= pas_audio_output_block,</div><div class='del'>-	.start_input		= pas_audio_start_input,</div><div class='del'>-	.ioctl			= pas_audio_ioctl,</div><div class='del'>-	.prepare_for_input	= pas_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= pas_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= pas_audio_reset,</div><div class='del'>-	.trigger		= pas_audio_trigger</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void __init pas_pcm_init(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	DEB(printk("pas2_pcm.c: long pas_pcm_init()\n"));</div><div class='del'>-</div><div class='del'>-	pcm_bitsok = 8;</div><div class='del'>-	if (pas_read(0xEF8B) &amp; 0x08)</div><div class='del'>-		pcm_bitsok |= 16;</div><div class='del'>-</div><div class='del'>-	pcm_set_speed(DSP_DEFAULT_SPEED);</div><div class='del'>-</div><div class='del'>-	if ((pas_audiodev = sound_install_audiodrv(AUDIO_DRIVER_VERSION,</div><div class='del'>-					"Pro Audio Spectrum",</div><div class='del'>-					&amp;pas_audio_driver,</div><div class='del'>-					sizeof(struct audio_driver),</div><div class='del'>-					DMA_AUTOMODE,</div><div class='del'>-					AFMT_U8 | AFMT_S16_LE,</div><div class='del'>-					NULL,</div><div class='del'>-					hw_config-&gt;dma,</div><div class='del'>-					hw_config-&gt;dma)) &lt; 0)</div><div class='del'>-		printk(KERN_WARNING "PAS16: Too many PCM devices available\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void pas_pcm_interrupt(unsigned char status, int cause)</div><div class='del'>-{</div><div class='del'>-	if (cause == 1)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Halt the PCM first. Otherwise we don't have time to start a new</div><div class='del'>-		 * block before the PCM chip proceeds to the next sample</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!(audio_devs[pas_audiodev]-&gt;flags &amp; DMA_AUTOMODE))</div><div class='del'>-			pas_write(pas_read(0xF8A) &amp; ~0x40, 0xF8A);</div><div class='del'>-</div><div class='del'>-		switch (pcm_mode)</div><div class='del'>-		{</div><div class='del'>-			case PCM_DAC:</div><div class='del'>-				DMAbuf_outputintr(pas_audiodev, 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case PCM_ADC:</div><div class='del'>-				DMAbuf_inputintr(pas_audiodev);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_WARNING "PAS: Unexpected PCM interrupt\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/pss.c b/sound/oss/pss.c<br/>deleted file mode 100644<br/>index e19dd5dcc2de..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/pss.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/pss.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1266 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/pss.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the Personal Sound System (ECHO ESC614).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer	ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Alan Cox		modularisation, clean up.</div><div class='del'>- *</div><div class='del'>- * 98-02-21: Vladimir Michl &lt;vladimir.michl@upol.cz&gt;</div><div class='del'>- *          Added mixer device for Beethoven ADSP-16 (master volume,</div><div class='del'>- *	    bass, treble, synth), only for speakers.</div><div class='del'>- *          Fixed bug in pss_write (exchange parameters)</div><div class='del'>- *          Fixed config port of SB</div><div class='del'>- *          Requested two regions for PSS (PSS mixer, PSS config)</div><div class='del'>- *          Modified pss_download_boot</div><div class='del'>- *          To probe_pss_mss added test for initialize AD1848</div><div class='del'>- * 98-05-28: Vladimir Michl &lt;vladimir.michl@upol.cz&gt;</div><div class='del'>- *          Fixed computation of mixer volumes</div><div class='del'>- * 04-05-1999: Anthony Barbachan &lt;barbcode@xmen.cis.fordham.edu&gt;</div><div class='del'>- *          Added code that allows the user to enable his cdrom and/or </div><div class='del'>- *          joystick through the module parameters pss_cdrom_port and </div><div class='del'>- *          pss_enable_joystick.  pss_cdrom_port takes a port address as its</div><div class='del'>- *          argument.  pss_enable_joystick takes either a 0 or a non-0 as its</div><div class='del'>- *          argument.</div><div class='del'>- * 04-06-1999: Anthony Barbachan &lt;barbcode@xmen.cis.fordham.edu&gt;</div><div class='del'>- *          Separated some code into new functions for easier reuse.  </div><div class='del'>- *          Cleaned up and streamlined new code.  Added code to allow a user </div><div class='del'>- *          to only use this driver for enabling non-sound components </div><div class='del'>- *          through the new module parameter pss_no_sound (flag).  Added </div><div class='del'>- *          code that would allow a user to decide whether the driver should </div><div class='del'>- *          reset the configured hardware settings for the PSS board through </div><div class='del'>- *          the module parameter pss_keep_settings (flag).   This flag will </div><div class='del'>- *          allow a user to free up resources in use by this card if needbe, </div><div class='del'>- *          furthermore it allows him to use this driver to just enable the </div><div class='del'>- *          emulations and then be unloaded as it is no longer needed.  Both </div><div class='del'>- *          new settings are only available to this driver if compiled as a </div><div class='del'>- *          module.  The default settings of all new parameters are set to </div><div class='del'>- *          load the driver as it did in previous versions.</div><div class='del'>- * 04-07-1999: Anthony Barbachan &lt;barbcode@xmen.cis.fordham.edu&gt;</div><div class='del'>- *          Added module parameter pss_firmware to allow the user to tell </div><div class='del'>- *          the driver where the firmware file is located.  The default </div><div class='del'>- *          setting is the previous hardcoded setting "/etc/sound/pss_synth".</div><div class='del'>- * 00-03-03: Christoph Hellwig &lt;chhellwig@infradead.org&gt;</div><div class='del'>- *	    Adapted to module_init/module_exit</div><div class='del'>- * 11-10-2000: Bartlomiej Zolnierkiewicz &lt;bkz@linux-ide.org&gt;</div><div class='del'>- *	    Added __init to probe_pss(), attach_pss() and probe_pss_mpu()</div><div class='del'>- * 02-Jan-2001: Chris Rankin</div><div class='del'>- *          Specify that this module owns the coprocessor</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sound_firmware.h"</div><div class='del'>-</div><div class='del'>-#include "ad1848.h"</div><div class='del'>-#include "mpu401.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PSS registers.</div><div class='del'>- */</div><div class='del'>-#define REG(x)	(devc-&gt;base+x)</div><div class='del'>-#define	PSS_DATA	0</div><div class='del'>-#define	PSS_STATUS	2</div><div class='del'>-#define PSS_CONTROL	2</div><div class='del'>-#define	PSS_ID		4</div><div class='del'>-#define	PSS_IRQACK	4</div><div class='del'>-#define	PSS_PIO		0x1a</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Config registers</div><div class='del'>- */</div><div class='del'>-#define CONF_PSS	0x10</div><div class='del'>-#define CONF_WSS	0x12</div><div class='del'>-#define CONF_SB		0x14</div><div class='del'>-#define CONF_CDROM	0x16</div><div class='del'>-#define CONF_MIDI	0x18</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Status bits.</div><div class='del'>- */</div><div class='del'>-#define PSS_FLAG3     0x0800</div><div class='del'>-#define PSS_FLAG2     0x0400</div><div class='del'>-#define PSS_FLAG1     0x1000</div><div class='del'>-#define PSS_FLAG0     0x0800</div><div class='del'>-#define PSS_WRITE_EMPTY  0x8000</div><div class='del'>-#define PSS_READ_FULL    0x4000</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * WSS registers</div><div class='del'>- */</div><div class='del'>-#define WSS_INDEX 4</div><div class='del'>-#define WSS_DATA 5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * WSS status bits</div><div class='del'>- */</div><div class='del'>-#define WSS_INITIALIZING 0x80</div><div class='del'>-#define WSS_AUTOCALIBRATION 0x20</div><div class='del'>-</div><div class='del'>-#define NO_WSS_MIXER	-1</div><div class='del'>-</div><div class='del'>-#include "coproc.h"</div><div class='del'>-</div><div class='del'>-#include "pss_boot.h"</div><div class='del'>-</div><div class='del'>-/* If compiled into kernel, it enable or disable pss mixer */</div><div class='del'>-#ifdef CONFIG_PSS_MIXER</div><div class='del'>-static int pss_mixer = 1;</div><div class='del'>-#else</div><div class='del'>-static int pss_mixer;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct pss_mixerdata {</div><div class='del'>-	unsigned int volume_l;</div><div class='del'>-	unsigned int volume_r;</div><div class='del'>-	unsigned int bass;</div><div class='del'>-	unsigned int treble;</div><div class='del'>-	unsigned int synth;</div><div class='del'>-} pss_mixerdata;</div><div class='del'>-</div><div class='del'>-typedef struct pss_confdata {</div><div class='del'>-	int             base;</div><div class='del'>-	int             irq;</div><div class='del'>-	int             dma;</div><div class='del'>-	int            *osp;</div><div class='del'>-	pss_mixerdata   mixer;</div><div class='del'>-	int             ad_mixer_dev;</div><div class='del'>-} pss_confdata;</div><div class='del'>-  </div><div class='del'>-static pss_confdata pss_data;</div><div class='del'>-static pss_confdata *devc = &amp;pss_data;</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-static int      pss_initialized;</div><div class='del'>-static int      nonstandard_microcode;</div><div class='del'>-static int	pss_cdrom_port = -1;	/* Parameter for the PSS cdrom port */</div><div class='del'>-static int	pss_enable_joystick;    /* Parameter for enabling the joystick */</div><div class='del'>-static coproc_operations pss_coproc_operations;</div><div class='del'>-</div><div class='del'>-static void pss_write(pss_confdata *devc, int data)</div><div class='del'>-{</div><div class='del'>-	unsigned long i, limit;</div><div class='del'>-</div><div class='del'>-	limit = jiffies + HZ/10;	/* The timeout is 0.1 seconds */</div><div class='del'>-	/*</div><div class='del'>-	 * Note! the i&lt;5000000 is an emergency exit. The dsp_command() is sometimes</div><div class='del'>-	 * called while interrupts are disabled. This means that the timer is</div><div class='del'>-	 * disabled also. However the timeout situation is a abnormal condition.</div><div class='del'>-	 * Normally the DSP should be ready to accept commands after just couple of</div><div class='del'>-	 * loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5000000 &amp;&amp; time_before(jiffies, limit); i++)</div><div class='del'>- 	{</div><div class='del'>- 		if (inw(REG(PSS_STATUS)) &amp; PSS_WRITE_EMPTY)</div><div class='del'>- 		{</div><div class='del'>- 			outw(data, REG(PSS_DATA));</div><div class='del'>- 			return;</div><div class='del'>- 		}</div><div class='del'>- 	}</div><div class='del'>- 	printk(KERN_WARNING "PSS: DSP Command (%04x) Timeout.\n", data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_pss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned short id;</div><div class='del'>-	int irq, dma;</div><div class='del'>-</div><div class='del'>-	devc-&gt;base = hw_config-&gt;io_base;</div><div class='del'>-	irq = devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	dma = devc-&gt;dma = hw_config-&gt;dma;</div><div class='del'>-	devc-&gt;osp = hw_config-&gt;osp;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;base != 0x220 &amp;&amp; devc-&gt;base != 0x240)</div><div class='del'>-		if (devc-&gt;base != 0x230 &amp;&amp; devc-&gt;base != 0x250)		/* Some cards use these */</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-	if (!request_region(devc-&gt;base, 0x10, "PSS mixer, SB emulation")) {</div><div class='del'>-		printk(KERN_ERR "PSS: I/O port conflict\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	id = inw(REG(PSS_ID));</div><div class='del'>-	if ((id &gt;&gt; 8) != 'E') {</div><div class='del'>-		printk(KERN_ERR "No PSS signature detected at 0x%x (0x%x)\n",  devc-&gt;base,  id); </div><div class='del'>-		release_region(devc-&gt;base, 0x10);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (!request_region(devc-&gt;base + 0x10, 0x9, "PSS config")) {</div><div class='del'>-		printk(KERN_ERR "PSS: I/O port conflict\n");</div><div class='del'>-		release_region(devc-&gt;base, 0x10);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_irq(pss_confdata * devc, int dev, int irq)</div><div class='del'>-{</div><div class='del'>-	static unsigned short irq_bits[16] =</div><div class='del'>-	{</div><div class='del'>-		0x0000, 0x0000, 0x0000, 0x0008,</div><div class='del'>-		0x0000, 0x0010, 0x0000, 0x0018,</div><div class='del'>-		0x0000, 0x0020, 0x0028, 0x0030,</div><div class='del'>-		0x0038, 0x0000, 0x0000, 0x0000</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	unsigned short  tmp, bits;</div><div class='del'>-</div><div class='del'>-	if (irq &lt; 0 || irq &gt; 15)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp = inw(REG(dev)) &amp; ~0x38;	/* Load confreg, mask IRQ bits out */</div><div class='del'>-</div><div class='del'>-	if ((bits = irq_bits[irq]) == 0 &amp;&amp; irq != 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "PSS: Invalid IRQ %d\n", irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	outw(tmp | bits, REG(dev));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_io_base(pss_confdata * devc, int dev, int base)</div><div class='del'>-{</div><div class='del'>-	unsigned short  tmp = inw(REG(dev)) &amp; 0x003f;</div><div class='del'>-	unsigned short  bits = (base &amp; 0x0ffc) &lt;&lt; 4;</div><div class='del'>-</div><div class='del'>-	outw(bits | tmp, REG(dev));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_dma(pss_confdata * devc, int dev, int dma)</div><div class='del'>-{</div><div class='del'>-	static unsigned short dma_bits[8] =</div><div class='del'>-	{</div><div class='del'>-		0x0001, 0x0002, 0x0000, 0x0003,</div><div class='del'>-		0x0000, 0x0005, 0x0006, 0x0007</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	unsigned short  tmp, bits;</div><div class='del'>-</div><div class='del'>-	if (dma &lt; 0 || dma &gt; 7)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp = inw(REG(dev)) &amp; ~0x07;	/* Load confreg, mask DMA bits out */</div><div class='del'>-</div><div class='del'>-	if ((bits = dma_bits[dma]) == 0 &amp;&amp; dma != 4)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_ERR "PSS: Invalid DMA %d\n", dma);</div><div class='del'>-		  return 0;</div><div class='del'>-	}</div><div class='del'>-	outw(tmp | bits, REG(dev));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_reset_dsp(pss_confdata * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long   i, limit = jiffies + HZ/10;</div><div class='del'>-</div><div class='del'>-	outw(0x2000, REG(PSS_CONTROL));</div><div class='del'>-	for (i = 0; i &lt; 32768 &amp;&amp; time_after_eq(limit, jiffies); i++)</div><div class='del'>-		inw(REG(PSS_CONTROL));</div><div class='del'>-	outw(0x0000, REG(PSS_CONTROL));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_put_dspword(pss_confdata * devc, unsigned short word)</div><div class='del'>-{</div><div class='del'>-	int i, val;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 327680; i++)</div><div class='del'>-	{</div><div class='del'>-		val = inw(REG(PSS_STATUS));</div><div class='del'>-		if (val &amp; PSS_WRITE_EMPTY)</div><div class='del'>-		{</div><div class='del'>-			outw(word, REG(PSS_DATA));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_get_dspword(pss_confdata * devc, unsigned short *word)</div><div class='del'>-{</div><div class='del'>-	int i, val;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 327680; i++)</div><div class='del'>-	{</div><div class='del'>-		val = inw(REG(PSS_STATUS));</div><div class='del'>-		if (val &amp; PSS_READ_FULL)</div><div class='del'>-		{</div><div class='del'>-			*word = inw(REG(PSS_DATA));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size, int flags)</div><div class='del'>-{</div><div class='del'>-	int i, val, count;</div><div class='del'>-	unsigned long limit;</div><div class='del'>-</div><div class='del'>-	if (flags &amp; CPF_FIRST)</div><div class='del'>-	{</div><div class='del'>-/*_____ Warn DSP software that a boot is coming */</div><div class='del'>-		outw(0x00fe, REG(PSS_DATA));</div><div class='del'>-</div><div class='del'>-		limit = jiffies + HZ/10;</div><div class='del'>-		for (i = 0; i &lt; 32768 &amp;&amp; time_before(jiffies, limit); i++)</div><div class='del'>-			if (inw(REG(PSS_DATA)) == 0x5500)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		outw(*block++, REG(PSS_DATA));</div><div class='del'>-		pss_reset_dsp(devc);</div><div class='del'>-	}</div><div class='del'>-	count = 1;</div><div class='del'>-	while ((flags&amp;CPF_LAST) || count&lt;size )</div><div class='del'>-	{</div><div class='del'>-		int j;</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; 327670; j++)</div><div class='del'>-		{</div><div class='del'>-/*_____ Wait for BG to appear */</div><div class='del'>-			if (inw(REG(PSS_STATUS)) &amp; PSS_FLAG3)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (j == 327670)</div><div class='del'>-		{</div><div class='del'>-			/* It's ok we timed out when the file was empty */</div><div class='del'>-			if (count &gt;= size &amp;&amp; flags &amp; CPF_LAST)</div><div class='del'>-				break;</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				printk("\n");</div><div class='del'>-				printk(KERN_ERR "PSS: Download timeout problems, byte %d=%d\n", count, size);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-/*_____ Send the next byte */</div><div class='del'>-		if (count &gt;= size) </div><div class='del'>-		{</div><div class='del'>-			/* If not data in block send 0xffff */</div><div class='del'>-			outw (0xffff, REG (PSS_DATA));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			/*_____ Send the next byte */</div><div class='del'>-			outw (*block++, REG (PSS_DATA));</div><div class='del'>-		};</div><div class='del'>-		count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flags &amp; CPF_LAST)</div><div class='del'>-	{</div><div class='del'>-/*_____ Why */</div><div class='del'>-		outw(0, REG(PSS_DATA));</div><div class='del'>-</div><div class='del'>-		limit = jiffies + HZ/10;</div><div class='del'>-		for (i = 0; i &lt; 32768 &amp;&amp; time_after_eq(limit, jiffies); i++)</div><div class='del'>-			val = inw(REG(PSS_STATUS));</div><div class='del'>-</div><div class='del'>-		limit = jiffies + HZ/10;</div><div class='del'>-		for (i = 0; i &lt; 32768 &amp;&amp; time_after_eq(limit, jiffies); i++)</div><div class='del'>-		{</div><div class='del'>-			val = inw(REG(PSS_STATUS));</div><div class='del'>-			if (val &amp; 0x4000)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* now read the version */</div><div class='del'>-		for (i = 0; i &lt; 32000; i++)</div><div class='del'>-		{</div><div class='del'>-			val = inw(REG(PSS_STATUS));</div><div class='del'>-			if (val &amp; PSS_READ_FULL)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (i == 32000)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		val = inw(REG(PSS_DATA));</div><div class='del'>-		/* printk( "&lt;PSS: microcode version %d.%d loaded&gt;",  val/16,  val % 16); */</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Mixer */</div><div class='del'>-static void set_master_volume(pss_confdata *devc, int left, int right)</div><div class='del'>-{</div><div class='del'>-	static unsigned char log_scale[101] =  {</div><div class='del'>-		0xdb, 0xe0, 0xe3, 0xe5, 0xe7, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xed, 0xee,</div><div class='del'>-		0xef, 0xef, 0xf0, 0xf0, 0xf1, 0xf1, 0xf2, 0xf2, 0xf2, 0xf3, 0xf3, 0xf3,</div><div class='del'>-		0xf4, 0xf4, 0xf4, 0xf5, 0xf5, 0xf5, 0xf5, 0xf6, 0xf6, 0xf6, 0xf6, 0xf7,</div><div class='del'>-		0xf7, 0xf7, 0xf7, 0xf7, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf9, 0xf9, 0xf9,</div><div class='del'>-		0xf9, 0xf9, 0xf9, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb,</div><div class='del'>-		0xfb, 0xfb, 0xfb, 0xfb, 0xfb, 0xfb, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,</div><div class='del'>-		0xfc, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd,</div><div class='del'>-		0xfd, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,</div><div class='del'>-		0xfe, 0xfe, 0xff, 0xff, 0xff</div><div class='del'>-	};</div><div class='del'>-	pss_write(devc, 0x0010);</div><div class='del'>-	pss_write(devc, log_scale[left] | 0x0000);</div><div class='del'>-	pss_write(devc, 0x0010);</div><div class='del'>-	pss_write(devc, log_scale[right] | 0x0100);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_synth_volume(pss_confdata *devc, int volume)</div><div class='del'>-{</div><div class='del'>-	int vol = ((0x8000*volume)/100L);</div><div class='del'>-	pss_write(devc, 0x0080);</div><div class='del'>-	pss_write(devc, vol);</div><div class='del'>-	pss_write(devc, 0x0081);</div><div class='del'>-	pss_write(devc, vol);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_bass(pss_confdata *devc, int level)</div><div class='del'>-{</div><div class='del'>-	int vol = (int)(((0xfd - 0xf0) * level)/100L) + 0xf0;</div><div class='del'>-	pss_write(devc, 0x0010);</div><div class='del'>-	pss_write(devc, vol | 0x0200);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void set_treble(pss_confdata *devc, int level)</div><div class='del'>-{	</div><div class='del'>-	int vol = (((0xfd - 0xf0) * level)/100L) + 0xf0;</div><div class='del'>-	pss_write(devc, 0x0010);</div><div class='del'>-	pss_write(devc, vol | 0x0300);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void pss_mixer_reset(pss_confdata *devc)</div><div class='del'>-{</div><div class='del'>-	set_master_volume(devc, 33, 33);</div><div class='del'>-	set_bass(devc, 50);</div><div class='del'>-	set_treble(devc, 50);</div><div class='del'>-	set_synth_volume(devc, 30);</div><div class='del'>-	pss_write (devc, 0x0010);</div><div class='del'>-	pss_write (devc, 0x0800 | 0xce);	/* Stereo */</div><div class='del'>-	</div><div class='del'>-	if(pss_mixer)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;mixer.volume_l = devc-&gt;mixer.volume_r = 33;</div><div class='del'>-		devc-&gt;mixer.bass = 50;</div><div class='del'>-		devc-&gt;mixer.treble = 50;</div><div class='del'>-		devc-&gt;mixer.synth = 30;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_volume_mono(unsigned __user *p, unsigned int *aleft)</div><div class='del'>-{</div><div class='del'>-	unsigned int left, volume;</div><div class='del'>-	if (get_user(volume, p))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	</div><div class='del'>-	left = volume &amp; 0xff;</div><div class='del'>-	if (left &gt; 100)</div><div class='del'>-		left = 100;</div><div class='del'>-	*aleft = left;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_volume_stereo(unsigned __user *p,</div><div class='del'>-			     unsigned int *aleft,</div><div class='del'>-			     unsigned int *aright)</div><div class='del'>-{</div><div class='del'>-	unsigned int left, right, volume;</div><div class='del'>-	if (get_user(volume, p))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	left = volume &amp; 0xff;</div><div class='del'>-	if (left &gt; 100)</div><div class='del'>-		left = 100;</div><div class='del'>-	right = (volume &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	if (right &gt; 100)</div><div class='del'>-		right = 100;</div><div class='del'>-	*aleft = left;</div><div class='del'>-	*aright = right;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ret_vol_mono(int left)</div><div class='del'>-{</div><div class='del'>-	return ((left &lt;&lt; 8) | left);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ret_vol_stereo(int left, int right)</div><div class='del'>-{</div><div class='del'>-	return ((right &lt;&lt; 8) | left);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int call_ad_mixer(pss_confdata *devc,unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	if (devc-&gt;ad_mixer_dev != NO_WSS_MIXER) </div><div class='del'>-		return mixer_devs[devc-&gt;ad_mixer_dev]-&gt;ioctl(devc-&gt;ad_mixer_dev, cmd, arg);</div><div class='del'>-	else </div><div class='del'>-		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_mixer_ioctl (int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	pss_confdata *devc = mixer_devs[dev]-&gt;devc;</div><div class='del'>-	int cmdf = cmd &amp; 0xff;</div><div class='del'>-	</div><div class='del'>-	if ((cmdf != SOUND_MIXER_VOLUME) &amp;&amp; (cmdf != SOUND_MIXER_BASS) &amp;&amp;</div><div class='del'>-		(cmdf != SOUND_MIXER_TREBLE) &amp;&amp; (cmdf != SOUND_MIXER_SYNTH) &amp;&amp;</div><div class='del'>-		(cmdf != SOUND_MIXER_DEVMASK) &amp;&amp; (cmdf != SOUND_MIXER_STEREODEVS) &amp;&amp;</div><div class='del'>-		(cmdf != SOUND_MIXER_RECMASK) &amp;&amp; (cmdf != SOUND_MIXER_CAPS) &amp;&amp;</div><div class='del'>-		(cmdf != SOUND_MIXER_RECSRC)) </div><div class='del'>-	{</div><div class='del'>-		return call_ad_mixer(devc, cmd, arg);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) != 'M')	</div><div class='del'>-		return -EINVAL;</div><div class='del'>-		</div><div class='del'>-	if (_SIOC_DIR (cmd) &amp; _SIOC_WRITE)</div><div class='del'>-	{</div><div class='del'>-		switch (cmdf)	</div><div class='del'>-		{</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				if (devc-&gt;ad_mixer_dev != NO_WSS_MIXER)</div><div class='del'>-					return call_ad_mixer(devc, cmd, arg);</div><div class='del'>-				else</div><div class='del'>-				{</div><div class='del'>-					int v;</div><div class='del'>-					if (get_user(v, (int __user *)arg))</div><div class='del'>-						return -EFAULT;</div><div class='del'>-					if (v != 0)</div><div class='del'>-						return -EINVAL;</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-			case SOUND_MIXER_VOLUME:</div><div class='del'>-				if (set_volume_stereo(arg,</div><div class='del'>-					&amp;devc-&gt;mixer.volume_l,</div><div class='del'>-					&amp;devc-&gt;mixer.volume_r))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				set_master_volume(devc, devc-&gt;mixer.volume_l,</div><div class='del'>-					devc-&gt;mixer.volume_r);</div><div class='del'>-				return ret_vol_stereo(devc-&gt;mixer.volume_l,</div><div class='del'>-					devc-&gt;mixer.volume_r);</div><div class='del'>-		  </div><div class='del'>-			case SOUND_MIXER_BASS:</div><div class='del'>-				if (set_volume_mono(arg, &amp;devc-&gt;mixer.bass))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				set_bass(devc, devc-&gt;mixer.bass);</div><div class='del'>-				return ret_vol_mono(devc-&gt;mixer.bass);</div><div class='del'>-		  </div><div class='del'>-			case SOUND_MIXER_TREBLE:</div><div class='del'>-				if (set_volume_mono(arg, &amp;devc-&gt;mixer.treble))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				set_treble(devc, devc-&gt;mixer.treble);</div><div class='del'>-				return ret_vol_mono(devc-&gt;mixer.treble);</div><div class='del'>-		  </div><div class='del'>-			case SOUND_MIXER_SYNTH:</div><div class='del'>-				if (set_volume_mono(arg, &amp;devc-&gt;mixer.synth))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				set_synth_volume(devc, devc-&gt;mixer.synth);</div><div class='del'>-				return ret_vol_mono(devc-&gt;mixer.synth);</div><div class='del'>-		  </div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else			</div><div class='del'>-	{</div><div class='del'>-		int val, and_mask = 0, or_mask = 0;</div><div class='del'>-		/*</div><div class='del'>-		 * Return parameters</div><div class='del'>-		 */</div><div class='del'>-		switch (cmdf)</div><div class='del'>-		{</div><div class='del'>-			case SOUND_MIXER_DEVMASK:</div><div class='del'>-				if (call_ad_mixer(devc, cmd, arg) == -EINVAL)</div><div class='del'>-					break;</div><div class='del'>-				and_mask = ~0;</div><div class='del'>-				or_mask = SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH;</div><div class='del'>-				break;</div><div class='del'>-		  </div><div class='del'>-			case SOUND_MIXER_STEREODEVS:</div><div class='del'>-				if (call_ad_mixer(devc, cmd, arg) == -EINVAL)</div><div class='del'>-					break;</div><div class='del'>-				and_mask = ~0;</div><div class='del'>-				or_mask = SOUND_MASK_VOLUME;</div><div class='del'>-				break;</div><div class='del'>-		  </div><div class='del'>-			case SOUND_MIXER_RECMASK:</div><div class='del'>-				if (devc-&gt;ad_mixer_dev != NO_WSS_MIXER)</div><div class='del'>-					return call_ad_mixer(devc, cmd, arg);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SOUND_MIXER_CAPS:</div><div class='del'>-				if (devc-&gt;ad_mixer_dev != NO_WSS_MIXER)</div><div class='del'>-					return call_ad_mixer(devc, cmd, arg);</div><div class='del'>-				or_mask = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				if (devc-&gt;ad_mixer_dev != NO_WSS_MIXER)</div><div class='del'>-					return call_ad_mixer(devc, cmd, arg);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SOUND_MIXER_VOLUME:</div><div class='del'>-				or_mask =  ret_vol_stereo(devc-&gt;mixer.volume_l, devc-&gt;mixer.volume_r);</div><div class='del'>-				break;</div><div class='del'>-			  </div><div class='del'>-			case SOUND_MIXER_BASS:</div><div class='del'>-				or_mask =  ret_vol_mono(devc-&gt;mixer.bass);</div><div class='del'>-				break;</div><div class='del'>-			  </div><div class='del'>-			case SOUND_MIXER_TREBLE:</div><div class='del'>-				or_mask = ret_vol_mono(devc-&gt;mixer.treble);</div><div class='del'>-				break;</div><div class='del'>-			  </div><div class='del'>-			case SOUND_MIXER_SYNTH:</div><div class='del'>-				or_mask = ret_vol_mono(devc-&gt;mixer.synth);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		val &amp;= and_mask;</div><div class='del'>-		val |= or_mask;</div><div class='del'>-		if (put_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return val;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mixer_operations pss_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "SOUNDPORT",</div><div class='del'>-	.name	= "PSS-AD1848",</div><div class='del'>-	.ioctl	= pss_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void disable_all_emulations(void)</div><div class='del'>-{</div><div class='del'>-	outw(0x0000, REG(CONF_PSS));	/* 0x0400 enables joystick */</div><div class='del'>-	outw(0x0000, REG(CONF_WSS));</div><div class='del'>-	outw(0x0000, REG(CONF_SB));</div><div class='del'>-	outw(0x0000, REG(CONF_MIDI));</div><div class='del'>-	outw(0x0000, REG(CONF_CDROM));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void configure_nonsound_components(void)</div><div class='del'>-{</div><div class='del'>-	/* Configure Joystick port */</div><div class='del'>-</div><div class='del'>-	if(pss_enable_joystick)</div><div class='del'>-	{</div><div class='del'>-		outw(0x0400, REG(CONF_PSS));	/* 0x0400 enables joystick */</div><div class='del'>-		printk(KERN_INFO "PSS: joystick enabled.\n");</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_INFO "PSS: joystick port not enabled.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure CDROM port */</div><div class='del'>-</div><div class='del'>-	if (pss_cdrom_port == -1) {	/* If cdrom port enablation wasn't requested */</div><div class='del'>-		printk(KERN_INFO "PSS: CDROM port not enabled.\n");</div><div class='del'>-	} else if (check_region(pss_cdrom_port, 2)) {</div><div class='del'>-		printk(KERN_ERR "PSS: CDROM I/O port conflict.\n");</div><div class='del'>-	} else {</div><div class='del'>-		set_io_base(devc, CONF_CDROM, pss_cdrom_port);</div><div class='del'>-		printk(KERN_INFO "PSS: CDROM I/O port set to 0x%x.\n", pss_cdrom_port);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init attach_pss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned short  id;</div><div class='del'>-	char tmp[100];</div><div class='del'>-</div><div class='del'>-	devc-&gt;base = hw_config-&gt;io_base;</div><div class='del'>-	devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	devc-&gt;dma = hw_config-&gt;dma;</div><div class='del'>-	devc-&gt;osp = hw_config-&gt;osp;</div><div class='del'>-	devc-&gt;ad_mixer_dev = NO_WSS_MIXER;</div><div class='del'>-</div><div class='del'>-	if (!probe_pss(hw_config))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	id = inw(REG(PSS_ID)) &amp; 0x00ff;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Disable all emulations. Will be enabled later (if required).</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	disable_all_emulations();</div><div class='del'>-</div><div class='del'>-#ifdef YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES</div><div class='del'>-	if (sound_alloc_dma(hw_config-&gt;dma, "PSS"))</div><div class='del'>-	{</div><div class='del'>-		printk("pss.c: Can't allocate DMA channel.\n");</div><div class='del'>-		release_region(hw_config-&gt;io_base, 0x10);</div><div class='del'>-		release_region(hw_config-&gt;io_base+0x10, 0x9);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (!set_irq(devc, CONF_PSS, devc-&gt;irq))</div><div class='del'>-	{</div><div class='del'>-		printk("PSS: IRQ allocation error.\n");</div><div class='del'>-		release_region(hw_config-&gt;io_base, 0x10);</div><div class='del'>-		release_region(hw_config-&gt;io_base+0x10, 0x9);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (!set_dma(devc, CONF_PSS, devc-&gt;dma))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "PSS: DMA allocation error\n");</div><div class='del'>-		release_region(hw_config-&gt;io_base, 0x10);</div><div class='del'>-		release_region(hw_config-&gt;io_base+0x10, 0x9);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	configure_nonsound_components();</div><div class='del'>-	pss_initialized = 1;</div><div class='del'>-	sprintf(tmp, "ECHO-PSS  Rev. %d", id);</div><div class='del'>-	conf_printf(tmp, hw_config);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_pss_mpu(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	struct resource *ports;</div><div class='del'>-	int timeout;</div><div class='del'>-</div><div class='del'>-	if (!pss_initialized)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ports = request_region(hw_config-&gt;io_base, 2, "mpu401");</div><div class='del'>-</div><div class='del'>-	if (!ports) {</div><div class='del'>-		printk(KERN_ERR "PSS: MPU I/O port conflict\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	set_io_base(devc, CONF_MIDI, hw_config-&gt;io_base);</div><div class='del'>-	if (!set_irq(devc, CONF_MIDI, hw_config-&gt;irq)) {</div><div class='del'>-		printk(KERN_ERR "PSS: MIDI IRQ allocation error.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (!pss_synthLen) {</div><div class='del'>-		printk(KERN_ERR "PSS: Can't enable MPU. MIDI synth microcode not available.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (!pss_download_boot(devc, pss_synth, pss_synthLen, CPF_FIRST | CPF_LAST)) {</div><div class='del'>-		printk(KERN_ERR "PSS: Unable to load MIDI synth microcode to DSP.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Finally wait until the DSP algorithm has initialized itself and</div><div class='del'>-	 * deactivates receive interrupt.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (timeout = 900000; timeout &gt; 0; timeout--)</div><div class='del'>-	{</div><div class='del'>-		if ((inb(hw_config-&gt;io_base + 1) &amp; 0x80) == 0)	/* Input data avail */</div><div class='del'>-			inb(hw_config-&gt;io_base);	/* Discard it */</div><div class='del'>-		else</div><div class='del'>-			break;	/* No more input */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!probe_mpu401(hw_config, ports))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	attach_mpu401(hw_config, THIS_MODULE);	/* Slot 1 */</div><div class='del'>-	if (hw_config-&gt;slots[1] != -1)	/* The MPU driver installed itself */</div><div class='del'>-		midi_devs[hw_config-&gt;slots[1]]-&gt;coproc = &amp;pss_coproc_operations;</div><div class='del'>-	return 1;</div><div class='del'>-fail:</div><div class='del'>-	release_region(hw_config-&gt;io_base, 2);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_coproc_open(void *dev_info, int sub_device)</div><div class='del'>-{</div><div class='del'>-	switch (sub_device)</div><div class='del'>-	{</div><div class='del'>-		case COPR_MIDI:</div><div class='del'>-			if (pss_synthLen == 0)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "PSS: MIDI synth microcode not available.\n");</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (nonstandard_microcode)</div><div class='del'>-				if (!pss_download_boot(devc, pss_synth, pss_synthLen, CPF_FIRST | CPF_LAST))</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "PSS: Unable to load MIDI synth microcode to DSP.\n");</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			nonstandard_microcode = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pss_coproc_close(void *dev_info, int sub_device)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pss_coproc_reset(void *dev_info)</div><div class='del'>-{</div><div class='del'>-	if (pss_synthLen)</div><div class='del'>-		if (!pss_download_boot(devc, pss_synth, pss_synthLen, CPF_FIRST | CPF_LAST))</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "PSS: Unable to load MIDI synth microcode to DSP.\n");</div><div class='del'>-		}</div><div class='del'>-	nonstandard_microcode = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int download_boot_block(void *dev_info, copr_buffer * buf)</div><div class='del'>-{</div><div class='del'>-	if (buf-&gt;len &lt;= 0 || buf-&gt;len &gt; sizeof(buf-&gt;data))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!pss_download_boot(devc, buf-&gt;data, buf-&gt;len, buf-&gt;flags))</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "PSS: Unable to load microcode block to DSP.\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	nonstandard_microcode = 1;	/* The MIDI microcode has been overwritten */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pss_coproc_ioctl(void *dev_info, unsigned int cmd, void __user *arg, int local)</div><div class='del'>-{</div><div class='del'>-	copr_buffer *buf;</div><div class='del'>-	copr_msg *mbuf;</div><div class='del'>-	copr_debug_buf dbuf;</div><div class='del'>-	unsigned short tmp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short *data;</div><div class='del'>-	int i, err;</div><div class='del'>-	/* printk( "PSS coproc ioctl %x %x %d\n",  cmd,  arg,  local); */</div><div class='del'>-	</div><div class='del'>-	switch (cmd) </div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_COPR_RESET:</div><div class='del'>-			pss_coproc_reset(dev_info);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_COPR_LOAD:</div><div class='del'>-			buf = (copr_buffer *) vmalloc(sizeof(copr_buffer));</div><div class='del'>-			if (buf == NULL)</div><div class='del'>-				return -ENOSPC;</div><div class='del'>-			if (copy_from_user(buf, arg, sizeof(copr_buffer))) {</div><div class='del'>-				vfree(buf);</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			err = download_boot_block(dev_info, buf);</div><div class='del'>-			vfree(buf);</div><div class='del'>-			return err;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_COPR_SENDMSG:</div><div class='del'>-			mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));</div><div class='del'>-			if (mbuf == NULL)</div><div class='del'>-				return -ENOSPC;</div><div class='del'>-			if (copy_from_user(mbuf, arg, sizeof(copr_msg))) {</div><div class='del'>-				vfree(mbuf);</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			}</div><div class='del'>-			data = (unsigned short *)(mbuf-&gt;data);</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			for (i = 0; i &lt; mbuf-&gt;len; i++) {</div><div class='del'>-				if (!pss_put_dspword(devc, *data++)) {</div><div class='del'>-					spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-					mbuf-&gt;len = i;	/* feed back number of WORDs sent */</div><div class='del'>-					err = copy_to_user(arg, mbuf, sizeof(copr_msg));</div><div class='del'>-					vfree(mbuf);</div><div class='del'>-					return err ? -EFAULT : -EIO;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			vfree(mbuf);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_COPR_RCVMSG:</div><div class='del'>-			err = 0;</div><div class='del'>-			mbuf = (copr_msg *)vmalloc(sizeof(copr_msg));</div><div class='del'>-			if (mbuf == NULL)</div><div class='del'>-				return -ENOSPC;</div><div class='del'>-			data = (unsigned short *)mbuf-&gt;data;</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			for (i = 0; i &lt; sizeof(mbuf-&gt;data)/sizeof(unsigned short); i++) {</div><div class='del'>-				mbuf-&gt;len = i;	/* feed back number of WORDs read */</div><div class='del'>-				if (!pss_get_dspword(devc, data++)) {</div><div class='del'>-					if (i == 0)</div><div class='del'>-						err = -EIO;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			if (copy_to_user(arg, mbuf, sizeof(copr_msg)))</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-			vfree(mbuf);</div><div class='del'>-			return err;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_COPR_RDATA:</div><div class='del'>-			if (copy_from_user(&amp;dbuf, arg, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			if (!pss_put_dspword(devc, 0x00d0)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 &amp; 0xffff))) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_get_dspword(devc, &amp;tmp)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			dbuf.parm1 = tmp;</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			if (copy_to_user(arg, &amp;dbuf, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_COPR_WDATA:</div><div class='del'>-			if (copy_from_user(&amp;dbuf, arg, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			if (!pss_put_dspword(devc, 0x00d1)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_put_dspword(devc, (unsigned short) (dbuf.parm1 &amp; 0xffff))) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			tmp = (unsigned int)dbuf.parm2 &amp; 0xffff;</div><div class='del'>-			if (!pss_put_dspword(devc, tmp)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_COPR_WCODE:</div><div class='del'>-			if (copy_from_user(&amp;dbuf, arg, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			if (!pss_put_dspword(devc, 0x00d3)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 &amp; 0xffff))) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			tmp = (unsigned int)dbuf.parm2 &amp; 0x00ff;</div><div class='del'>-			if (!pss_put_dspword(devc, tmp)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			tmp = ((unsigned int)dbuf.parm2 &gt;&gt; 8) &amp; 0xffff;</div><div class='del'>-			if (!pss_put_dspword(devc, tmp)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_COPR_RCODE:</div><div class='del'>-			if (copy_from_user(&amp;dbuf, arg, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			spin_lock_irqsave(&amp;lock, flags);</div><div class='del'>-			if (!pss_put_dspword(devc, 0x00d2)) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_put_dspword(devc, (unsigned short)(dbuf.parm1 &amp; 0xffff))) {</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			if (!pss_get_dspword(devc, &amp;tmp)) { /* Read MSB */</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			dbuf.parm1 = tmp &lt;&lt; 8;</div><div class='del'>-			if (!pss_get_dspword(devc, &amp;tmp)) { /* Read LSB */</div><div class='del'>-				spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-				return -EIO;</div><div class='del'>-			}</div><div class='del'>-			dbuf.parm1 |= tmp &amp; 0x00ff;</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			if (copy_to_user(arg, &amp;dbuf, sizeof(dbuf)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static coproc_operations pss_coproc_operations =</div><div class='del'>-{</div><div class='del'>-	"ADSP-2115",</div><div class='del'>-	THIS_MODULE,</div><div class='del'>-	pss_coproc_open,</div><div class='del'>-	pss_coproc_close,</div><div class='del'>-	pss_coproc_ioctl,</div><div class='del'>-	pss_coproc_reset,</div><div class='del'>-	&amp;pss_data</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init probe_pss_mss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	volatile int timeout;</div><div class='del'>-	struct resource *ports;</div><div class='del'>-	int        my_mix = -999;	/* gcc shut up */</div><div class='del'>-</div><div class='del'>-	if (!pss_initialized)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!request_region(hw_config-&gt;io_base, 4, "WSS config")) {</div><div class='del'>-		printk(KERN_ERR "PSS: WSS I/O port conflicts.\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ports = request_region(hw_config-&gt;io_base + 4, 4, "ad1848");</div><div class='del'>-	if (!ports) {</div><div class='del'>-		printk(KERN_ERR "PSS: WSS I/O port conflicts.\n");</div><div class='del'>-		release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	set_io_base(devc, CONF_WSS, hw_config-&gt;io_base);</div><div class='del'>-	if (!set_irq(devc, CONF_WSS, hw_config-&gt;irq)) {</div><div class='del'>-		printk("PSS: WSS IRQ allocation error.\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (!set_dma(devc, CONF_WSS, hw_config-&gt;dma)) {</div><div class='del'>-		printk(KERN_ERR "PSS: WSS DMA allocation error\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * For some reason the card returns 0xff in the WSS status register</div><div class='del'>-	 * immediately after boot. Probably MIDI+SB emulation algorithm</div><div class='del'>-	 * downloaded to the ADSP2115 spends some time initializing the card.</div><div class='del'>-	 * Let's try to wait until it finishes this task.</div><div class='del'>-	 */</div><div class='del'>-	for (timeout = 0; timeout &lt; 100000 &amp;&amp; (inb(hw_config-&gt;io_base + WSS_INDEX) &amp;</div><div class='del'>-	  WSS_INITIALIZING); timeout++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	outb((0x0b), hw_config-&gt;io_base + WSS_INDEX);	/* Required by some cards */</div><div class='del'>-</div><div class='del'>-	for (timeout = 0; (inb(hw_config-&gt;io_base + WSS_DATA) &amp; WSS_AUTOCALIBRATION) &amp;&amp;</div><div class='del'>-	  (timeout &lt; 100000); timeout++)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (!probe_ms_sound(hw_config, ports))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	devc-&gt;ad_mixer_dev = NO_WSS_MIXER;</div><div class='del'>-	if (pss_mixer) </div><div class='del'>-	{</div><div class='del'>-		if ((my_mix = sound_install_mixer (MIXER_DRIVER_VERSION,</div><div class='del'>-			"PSS-SPEAKERS and AD1848 (through MSS audio codec)",</div><div class='del'>-			&amp;pss_mixer_operations,</div><div class='del'>-			sizeof (struct mixer_operations),</div><div class='del'>-			devc)) &lt; 0) </div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "Could not install PSS mixer\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	pss_mixer_reset(devc);</div><div class='del'>-	attach_ms_sound(hw_config, ports, THIS_MODULE);	/* Slot 0 */</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;slots[0] != -1)</div><div class='del'>-	{</div><div class='del'>-		/* The MSS driver installed itself */</div><div class='del'>-		audio_devs[hw_config-&gt;slots[0]]-&gt;coproc = &amp;pss_coproc_operations;</div><div class='del'>-		if (pss_mixer &amp;&amp; (num_mixers == (my_mix + 2)))</div><div class='del'>-		{</div><div class='del'>-			/* The MSS mixer installed */</div><div class='del'>-			devc-&gt;ad_mixer_dev = audio_devs[hw_config-&gt;slots[0]]-&gt;mixer_dev;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-fail:</div><div class='del'>-	release_region(hw_config-&gt;io_base + 4, 4);</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __exit unload_pss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	release_region(hw_config-&gt;io_base, 0x10);</div><div class='del'>-	release_region(hw_config-&gt;io_base+0x10, 0x9);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __exit unload_pss_mpu(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unload_mpu401(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __exit unload_pss_mss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unload_ms_sound(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-static struct address_info cfg2;</div><div class='del'>-static struct address_info cfg_mpu;</div><div class='del'>-</div><div class='del'>-static int pss_io __initdata	= -1;</div><div class='del'>-static int mss_io __initdata	= -1;</div><div class='del'>-static int mss_irq __initdata	= -1;</div><div class='del'>-static int mss_dma __initdata	= -1;</div><div class='del'>-static int mpu_io __initdata	= -1;</div><div class='del'>-static int mpu_irq __initdata	= -1;</div><div class='del'>-static int pss_no_sound = 0;	/* Just configure non-sound components */</div><div class='del'>-static int pss_keep_settings  = 1;	/* Keep hardware settings at module exit */</div><div class='del'>-static char *pss_firmware = "/etc/sound/pss_synth";</div><div class='del'>-</div><div class='del'>-module_param(pss_io, int, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_io, "Set i/o base of PSS card (probably 0x220 or 0x240)");</div><div class='del'>-module_param(mss_io, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mss_io, "Set WSS (audio) i/o base (0x530, 0x604, 0xE80, 0xF40, or other. Address must end in 0 or 4 and must be from 0x100 to 0xFF4)");</div><div class='del'>-module_param(mss_irq, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mss_irq, "Set WSS (audio) IRQ (3, 5, 7, 9, 10, 11, 12)");</div><div class='del'>-module_param(mss_dma, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mss_dma, "Set WSS (audio) DMA (0, 1, 3)");</div><div class='del'>-module_param(mpu_io, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mpu_io, "Set MIDI i/o base (0x330 or other. Address must be on 4 location boundaries and must be from 0x100 to 0xFFC)");</div><div class='del'>-module_param(mpu_irq, int, 0);</div><div class='del'>-MODULE_PARM_DESC(mpu_irq, "Set MIDI IRQ (3, 5, 7, 9, 10, 11, 12)");</div><div class='del'>-module_param(pss_cdrom_port, int, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_cdrom_port, "Set the PSS CDROM port i/o base (0x340 or other)");</div><div class='del'>-module_param(pss_enable_joystick, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_enable_joystick, "Enables the PSS joystick port (1 to enable, 0 to disable)");</div><div class='del'>-module_param(pss_no_sound, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_no_sound, "Configure sound compoents (0 - no, 1 - yes)");</div><div class='del'>-module_param(pss_keep_settings, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_keep_settings, "Keep hardware setting at driver unloading (0 - no, 1 - yes)");</div><div class='del'>-module_param(pss_firmware, charp, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_firmware, "Location of the firmware file (default - /etc/sound/pss_synth)");</div><div class='del'>-module_param(pss_mixer, bool, 0);</div><div class='del'>-MODULE_PARM_DESC(pss_mixer, "Enable (1) or disable (0) PSS mixer (controlling of output volume, bass, treble, synth volume). The mixer is not available on all PSS cards.");</div><div class='del'>-MODULE_AUTHOR("Hannu Savolainen, Vladimir Michl");</div><div class='del'>-MODULE_DESCRIPTION("Module for PSS sound cards (based on AD1848, ADSP-2115 and ESC614). This module includes control of output amplifier and synth volume of the Beethoven ADSP-16 card (this may work with other PSS cards).");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int fw_load = 0;</div><div class='del'>-static int pssmpu = 0, pssmss = 0;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *    Load a PSS sound card module</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init init_pss(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if(pss_no_sound)		/* If configuring only nonsound components */</div><div class='del'>-	{</div><div class='del'>-		cfg.io_base = pss_io;</div><div class='del'>-		if(!probe_pss(&amp;cfg))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		printk(KERN_INFO "ECHO-PSS  Rev. %d\n", inw(REG(PSS_ID)) &amp; 0x00ff);</div><div class='del'>-		printk(KERN_INFO "PSS: loading in no sound mode.\n");</div><div class='del'>-		disable_all_emulations();</div><div class='del'>-		configure_nonsound_components();</div><div class='del'>-		release_region(pss_io, 0x10);</div><div class='del'>-		release_region(pss_io + 0x10, 0x9);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfg.io_base = pss_io;</div><div class='del'>-</div><div class='del'>-	cfg2.io_base = mss_io;</div><div class='del'>-	cfg2.irq = mss_irq;</div><div class='del'>-	cfg2.dma = mss_dma;</div><div class='del'>-</div><div class='del'>-	cfg_mpu.io_base = mpu_io;</div><div class='del'>-	cfg_mpu.irq = mpu_irq;</div><div class='del'>-</div><div class='del'>-	if (cfg.io_base == -1 || cfg2.io_base == -1 || cfg2.irq == -1 || cfg.dma == -1) {</div><div class='del'>-		printk(KERN_INFO "pss: mss_io, mss_dma, mss_irq and pss_io must be set.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!pss_synth) {</div><div class='del'>-		fw_load = 1;</div><div class='del'>-		pss_synthLen = mod_firmware_load(pss_firmware, (void *) &amp;pss_synth);</div><div class='del'>-	}</div><div class='del'>-	if (!attach_pss(&amp;cfg))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	/*</div><div class='del'>-	 *    Attach stuff</div><div class='del'>-	 */</div><div class='del'>-	if (probe_pss_mpu(&amp;cfg_mpu))</div><div class='del'>-		pssmpu = 1;</div><div class='del'>-</div><div class='del'>-	if (probe_pss_mss(&amp;cfg2))</div><div class='del'>-		pssmss = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_pss(void)</div><div class='del'>-{</div><div class='del'>-	if(!pss_no_sound)</div><div class='del'>-	{</div><div class='del'>-		if(fw_load &amp;&amp; pss_synth)</div><div class='del'>-			vfree(pss_synth);</div><div class='del'>-		if(pssmss)</div><div class='del'>-			unload_pss_mss(&amp;cfg2);</div><div class='del'>-		if(pssmpu)</div><div class='del'>-			unload_pss_mpu(&amp;cfg_mpu);</div><div class='del'>-		unload_pss(&amp;cfg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(!pss_keep_settings)	/* Keep hardware settings if asked */</div><div class='del'>-	{</div><div class='del'>-		disable_all_emulations();</div><div class='del'>-		printk(KERN_INFO "Resetting PSS sound card configurations.\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_pss);</div><div class='del'>-module_exit(cleanup_pss);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_pss(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, mss_io, mss_irq, mss_dma, mpu_io, mpu_irq */</div><div class='del'>-	int ints[7];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	pss_io	= ints[1];</div><div class='del'>-	mss_io	= ints[2];</div><div class='del'>-	mss_irq	= ints[3];</div><div class='del'>-	mss_dma	= ints[4];</div><div class='del'>-	mpu_io	= ints[5];</div><div class='del'>-	mpu_irq	= ints[6];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("pss=", setup_pss);</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/sb.h b/sound/oss/sb.h<br/>deleted file mode 100644<br/>index 77e8891ce333..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-#define DSP_RESET	(devc-&gt;base + 0x6)</div><div class='del'>-#define DSP_READ	(devc-&gt;base + 0xA)</div><div class='del'>-#define DSP_WRITE	(devc-&gt;base + 0xC)</div><div class='del'>-#define DSP_COMMAND	(devc-&gt;base + 0xC)</div><div class='del'>-#define DSP_STATUS	(devc-&gt;base + 0xC)</div><div class='del'>-#define DSP_DATA_AVAIL	(devc-&gt;base + 0xE)</div><div class='del'>-#define DSP_DATA_AVL16	(devc-&gt;base + 0xF)</div><div class='del'>-#define MIXER_ADDR	(devc-&gt;base + 0x4)</div><div class='del'>-#define MIXER_DATA	(devc-&gt;base + 0x5)</div><div class='del'>-#define OPL3_LEFT	(devc-&gt;base + 0x0)</div><div class='del'>-#define OPL3_RIGHT	(devc-&gt;base + 0x2)</div><div class='del'>-#define OPL3_BOTH	(devc-&gt;base + 0x8)</div><div class='del'>-/* DSP Commands */</div><div class='del'>-</div><div class='del'>-#define DSP_CMD_SPKON		0xD1</div><div class='del'>-#define DSP_CMD_SPKOFF		0xD3</div><div class='del'>-#define DSP_CMD_DMAON		0xD0</div><div class='del'>-#define DSP_CMD_DMAOFF		0xD4</div><div class='del'>-</div><div class='del'>-#define IMODE_NONE		0</div><div class='del'>-#define IMODE_OUTPUT		PCM_ENABLE_OUTPUT</div><div class='del'>-#define IMODE_INPUT		PCM_ENABLE_INPUT</div><div class='del'>-#define IMODE_INIT		3</div><div class='del'>-#define IMODE_MIDI		4</div><div class='del'>-</div><div class='del'>-#define NORMAL_MIDI	0</div><div class='del'>-#define UART_MIDI	1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Device models</div><div class='del'>- */</div><div class='del'>-#define MDL_NONE	0</div><div class='del'>-#define MDL_SB1		1	/* SB1.0 or 1.5 */</div><div class='del'>-#define MDL_SB2		2	/* SB2.0 */</div><div class='del'>-#define MDL_SB201	3	/* SB2.01 */</div><div class='del'>-#define MDL_SBPRO	4	/* SB Pro */</div><div class='del'>-#define MDL_SB16	5	/* SB16/32/AWE */</div><div class='del'>-#define MDL_SBPNP 	6	/* SB16/32/AWE PnP */</div><div class='del'>-#define MDL_JAZZ	10	/* Media Vision Jazz16 */</div><div class='del'>-#define MDL_SMW		11	/* Logitech SoundMan Wave (Jazz16) */</div><div class='del'>-#define MDL_ESS		12	/* ESS ES688 and ES1688 */</div><div class='del'>-#define MDL_AZTECH	13	/* Aztech Sound Galaxy family */</div><div class='del'>-#define MDL_ES1868MIDI	14	/* MIDI port of ESS1868 */</div><div class='del'>-#define MDL_AEDSP	15	/* Audio Excel DSP 16 */</div><div class='del'>-#define MDL_ESSPCI	16	/* ESS PCI card */</div><div class='del'>-#define MDL_YMPCI	17	/* Yamaha PCI sb in emulation */</div><div class='del'>-</div><div class='del'>-#define SUBMDL_ALS007	42	/* ALS-007 differs from SB16 only in mixer */</div><div class='del'>-				/* register assignment */</div><div class='del'>-#define SUBMDL_ALS100	43	/* ALS-100 allows sampling rates of up */</div><div class='del'>-				/* to 48kHz */</div><div class='del'>-				</div><div class='del'>-/*</div><div class='del'>- * Config flags</div><div class='del'>- */</div><div class='del'>-#define SB_NO_MIDI	0x00000001</div><div class='del'>-#define SB_NO_MIXER	0x00000002</div><div class='del'>-#define SB_NO_AUDIO	0x00000004</div><div class='del'>-#define SB_NO_RECORDING	0x00000008 /* No audio recording */</div><div class='del'>-#define SB_MIDI_ONLY	(SB_NO_AUDIO|SB_NO_MIXER)</div><div class='del'>-#define SB_PCI_IRQ	0x00000010 /* PCI shared IRQ */</div><div class='del'>-</div><div class='del'>-struct mixer_def {</div><div class='del'>-	unsigned int regno: 8;</div><div class='del'>-	unsigned int bitoffs:4;</div><div class='del'>-	unsigned int nbits:4;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct mixer_def mixer_tab[32][2];</div><div class='del'>-typedef struct mixer_def mixer_ent;</div><div class='del'>-</div><div class='del'>-struct sb_module_options</div><div class='del'>-{</div><div class='del'>-	int  esstype;	/* ESS chip type */</div><div class='del'>-	int  acer;	/* Do acer notebook init? */</div><div class='del'>-	int  sm_games;	/* Logitech soundman games? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct sb_devc {</div><div class='del'>-	   int dev;</div><div class='del'>-</div><div class='del'>-	/* Hardware parameters */</div><div class='del'>-	   int *osp;</div><div class='del'>-	   int minor, major;</div><div class='del'>-	   int type;</div><div class='del'>-	   int model, submodel;</div><div class='del'>-	   int caps;</div><div class='del'>-#	define SBCAP_STEREO	0x00000001</div><div class='del'>-#	define SBCAP_16BITS	0x00000002</div><div class='del'>-</div><div class='del'>-	/* Hardware resources */</div><div class='del'>-	   int base;</div><div class='del'>-	   int irq;</div><div class='del'>-	   int dma8, dma16;</div><div class='del'>-	   </div><div class='del'>-	   int pcibase;		/* For ESS Maestro etc */</div><div class='del'>-</div><div class='del'>-	/* State variables */</div><div class='del'>- 	   int opened;</div><div class='del'>-	/* new audio fields for full duplex support */</div><div class='del'>-	   int fullduplex;</div><div class='del'>-	   int duplex;</div><div class='del'>-	   int speed, bits, channels;</div><div class='del'>-	   volatile int irq_ok;</div><div class='del'>-	   volatile int intr_active, irq_mode;</div><div class='del'>-	/* duplicate audio fields for full duplex support */</div><div class='del'>-	   volatile int intr_active_16, irq_mode_16;</div><div class='del'>-</div><div class='del'>-	/* Mixer fields */</div><div class='del'>-	   int *levels;</div><div class='del'>-	   mixer_tab *iomap;</div><div class='del'>-	   size_t iomap_sz; /* number or records in the iomap table */</div><div class='del'>-	   int mixer_caps, recmask, outmask, supported_devices;</div><div class='del'>-	   int supported_rec_devices, supported_out_devices;</div><div class='del'>-	   int my_mixerdev;</div><div class='del'>-	   int sbmixnum;</div><div class='del'>-</div><div class='del'>-	/* Audio fields */</div><div class='del'>-	   unsigned long trg_buf;</div><div class='del'>-	   int      trigger_bits;</div><div class='del'>-	   int      trg_bytes;</div><div class='del'>-	   int      trg_intrflag;</div><div class='del'>-	   int      trg_restart;</div><div class='del'>-	/* duplicate audio fields for full duplex support */</div><div class='del'>-	   unsigned long trg_buf_16;</div><div class='del'>-	   int      trigger_bits_16;</div><div class='del'>-	   int      trg_bytes_16;</div><div class='del'>-	   int      trg_intrflag_16;</div><div class='del'>-	   int      trg_restart_16;</div><div class='del'>-</div><div class='del'>-	   unsigned char tconst;</div><div class='del'>-	</div><div class='del'>-	/* MIDI fields */</div><div class='del'>-	   int my_mididev;</div><div class='del'>-	   int input_opened;</div><div class='del'>-	   int midi_broken;</div><div class='del'>-	   void (*midi_input_intr) (int dev, unsigned char data);</div><div class='del'>-	   void *midi_irq_cookie;		/* IRQ cookie for the midi */</div><div class='del'>-</div><div class='del'>-	   spinlock_t lock;</div><div class='del'>-</div><div class='del'>-	   struct sb_module_options sbmo;	/* Module options */</div><div class='del'>-</div><div class='del'>-	} sb_devc;</div><div class='del'>-	</div><div class='del'>-/*</div><div class='del'>- *	PCI card types</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define	SB_PCI_ESSMAESTRO	1	/* ESS Maestro Legacy */</div><div class='del'>-#define	SB_PCI_YAMAHA		2	/* Yamaha Legacy */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *	Functions</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-int sb_dsp_command (sb_devc *devc, unsigned char val);</div><div class='del'>-int sb_dsp_get_byte(sb_devc * devc);</div><div class='del'>-int sb_dsp_reset (sb_devc *devc);</div><div class='del'>-void sb_setmixer (sb_devc *devc, unsigned int port, unsigned int value);</div><div class='del'>-unsigned int sb_getmixer (sb_devc *devc, unsigned int port);</div><div class='del'>-int sb_dsp_detect (struct address_info *hw_config, int pci, int pciio, struct sb_module_options *sbmo);</div><div class='del'>-int sb_dsp_init (struct address_info *hw_config, struct module *owner);</div><div class='del'>-void sb_dsp_unload(struct address_info *hw_config, int sbmpu);</div><div class='del'>-int sb_mixer_init(sb_devc *devc, struct module *owner);</div><div class='del'>-void sb_mixer_unload(sb_devc *devc);</div><div class='del'>-void sb_mixer_set_stereo (sb_devc *devc, int mode);</div><div class='del'>-void smw_mixer_init(sb_devc *devc);</div><div class='del'>-void sb_dsp_midi_init (sb_devc *devc, struct module *owner);</div><div class='del'>-void sb_audio_init (sb_devc *devc, char *name, struct module *owner);</div><div class='del'>-void sb_midi_interrupt (sb_devc *devc);</div><div class='del'>-void sb_chgmixer (sb_devc * devc, unsigned int reg, unsigned int mask, unsigned int val);</div><div class='del'>-int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right);</div><div class='del'>-</div><div class='del'>-int sb_audio_open(int dev, int mode);</div><div class='del'>-void sb_audio_close(int dev);</div><div class='del'>-</div><div class='del'>-/*	From sb_common.c */</div><div class='del'>-void sb_dsp_disable_midi(int port);</div><div class='del'>-int probe_sbmpu (struct address_info *hw_config, struct module *owner);</div><div class='del'>-void unload_sbmpu (struct address_info *hw_config);</div><div class='del'>-</div><div class='del'>-void unload_sb16(struct address_info *hw_info);</div><div class='del'>-void unload_sb16midi(struct address_info *hw_info);</div><div class='head'>diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c<br/>deleted file mode 100644<br/>index 733b014ec7d1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_audio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_audio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1098 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_audio.c</div><div class='del'>- *</div><div class='del'>- * Audio routines for Sound Blaster compatible cards.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Changes</div><div class='del'>- *	Alan Cox	:	Formatting and clean ups</div><div class='del'>- *</div><div class='del'>- * Status</div><div class='del'>- *	Mostly working. Weird uart bug causing irq storms</div><div class='del'>- *</div><div class='del'>- * Daniel J. Rodriksson: Changes to make sb16 work full duplex.</div><div class='del'>- *                       Maybe other 16 bit cards in this code could behave</div><div class='del'>- *                       the same.</div><div class='del'>- * Chris Rankin:         Use spinlocks instead of CLI/STI</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "sb_mixer.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-</div><div class='del'>-#include "sb_ess.h"</div><div class='del'>-</div><div class='del'>-int sb_audio_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_ERR "Sound Blaster: incomplete initialization.\n");</div><div class='del'>-		  return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;caps &amp; SB_NO_RECORDING &amp;&amp; mode &amp; OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		if (mode == OPEN_READ)</div><div class='del'>-			return -EPERM;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-	{</div><div class='del'>-		  spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-		  return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;dma16 != -1 &amp;&amp; devc-&gt;dma16 != devc-&gt;dma8 &amp;&amp; !devc-&gt;duplex)</div><div class='del'>-	{</div><div class='del'>-		if (sound_open_dma(devc-&gt;dma16, "Sound Blaster 16 bit"))</div><div class='del'>-		{</div><div class='del'>-		  	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = mode;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_NONE;</div><div class='del'>-	devc-&gt;irq_mode_16 = IMODE_NONE;</div><div class='del'>-	devc-&gt;fullduplex = devc-&gt;duplex &amp;&amp;</div><div class='del'>-		((mode &amp; OPEN_READ) &amp;&amp; (mode &amp; OPEN_WRITE));</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-</div><div class='del'>-	/* At first glance this check isn't enough, some ESS chips might not </div><div class='del'>-	 * have a RECLEV. However if they don't common_mixer_set will refuse </div><div class='del'>-	 * cause devc-&gt;iomap has no register mapping for RECLEV</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;model == MDL_ESS) ess_mixer_reload (devc, SOUND_MIXER_RECLEV);</div><div class='del'>-</div><div class='del'>-	/* The ALS007 seems to require that the DSP be removed from the output */</div><div class='del'>-	/* in order for recording to be activated properly.  This is done by   */</div><div class='del'>-	/* setting the appropriate bits of the output control register 4ch to  */</div><div class='del'>-	/* zero.  This code assumes that the output control registers are not  */</div><div class='del'>-	/* used anywhere else and therefore the DSP bits are *always* ON for   */</div><div class='del'>-	/* output and OFF for sampling.                                        */</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;submodel == SUBMDL_ALS007) </div><div class='del'>-	{</div><div class='del'>-		if (mode &amp; OPEN_READ) </div><div class='del'>-			sb_setmixer(devc,ALS007_OUTPUT_CTRL2,</div><div class='del'>-				sb_getmixer(devc,ALS007_OUTPUT_CTRL2) &amp; 0xf9);</div><div class='del'>-		else</div><div class='del'>-			sb_setmixer(devc,ALS007_OUTPUT_CTRL2,</div><div class='del'>-				sb_getmixer(devc,ALS007_OUTPUT_CTRL2) | 0x06);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sb_audio_close(int dev)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	/* fix things if mmap turned off fullduplex */</div><div class='del'>-	if(devc-&gt;duplex</div><div class='del'>-	   &amp;&amp; !devc-&gt;fullduplex</div><div class='del'>-	   &amp;&amp; (devc-&gt;opened &amp; OPEN_READ) &amp;&amp; (devc-&gt;opened &amp; OPEN_WRITE))</div><div class='del'>-	{</div><div class='del'>-		struct dma_buffparms *dmap_temp;</div><div class='del'>-		dmap_temp = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out = audio_devs[dev]-&gt;dmap_in;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_in = dmap_temp;</div><div class='del'>-	}</div><div class='del'>-	audio_devs[dev]-&gt;dmap_out-&gt;dma = devc-&gt;dma8;</div><div class='del'>-	audio_devs[dev]-&gt;dmap_in-&gt;dma = ( devc-&gt;duplex ) ?</div><div class='del'>-		devc-&gt;dma16 : devc-&gt;dma8;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dma16 != -1 &amp;&amp; devc-&gt;dma16 != devc-&gt;dma8 &amp;&amp; !devc-&gt;duplex)</div><div class='del'>-		sound_close_dma(devc-&gt;dma16);</div><div class='del'>-</div><div class='del'>-	/* For ALS007, turn DSP output back on if closing the device for read */</div><div class='del'>-	</div><div class='del'>-	if ((devc-&gt;submodel == SUBMDL_ALS007) &amp;&amp; (devc-&gt;opened &amp; OPEN_READ)) </div><div class='del'>-	{</div><div class='del'>-		sb_setmixer(devc,ALS007_OUTPUT_CTRL2,</div><div class='del'>-			sb_getmixer(devc,ALS007_OUTPUT_CTRL2) | 0x06);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_set_output_parms(int dev, unsigned long buf, int nr_bytes,</div><div class='del'>-		    int intrflag)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex || devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;trg_buf = buf;</div><div class='del'>-		devc-&gt;trg_bytes = nr_bytes;</div><div class='del'>-		devc-&gt;trg_intrflag = intrflag;</div><div class='del'>-		devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;trg_buf_16 = buf;</div><div class='del'>-		devc-&gt;trg_bytes_16 = nr_bytes;</div><div class='del'>-		devc-&gt;trg_intrflag_16 = intrflag;</div><div class='del'>-		devc-&gt;irq_mode_16 = IMODE_OUTPUT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_set_input_parms(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex || devc-&gt;bits != AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;trg_buf = buf;</div><div class='del'>-		devc-&gt;trg_bytes = count;</div><div class='del'>-		devc-&gt;trg_intrflag = intrflag;</div><div class='del'>-		devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;trg_buf_16 = buf;</div><div class='del'>-		devc-&gt;trg_bytes_16 = count;</div><div class='del'>-		devc-&gt;trg_intrflag_16 = intrflag;</div><div class='del'>-		devc-&gt;irq_mode_16 = IMODE_INPUT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SB1.x compatible routines </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void sb1_audio_output_block(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_WRITE); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x14))		/* 8 bit DAC using DMA */</div><div class='del'>-	{</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) (count &amp; 0xff));</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) ((count &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_WARNING "Sound Blaster:  unable to start DAC.\n");</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb1_audio_start_input(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start a DMA input to the buffer pointed by dmaqtail</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_READ); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x24))		/* 8 bit ADC using DMA */</div><div class='del'>-	{</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) (count &amp; 0xff));</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) ((count &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "Sound Blaster:  unable to start ADC.\n");</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb1_audio_trigger(int dev, int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	bits &amp;= devc-&gt;irq_mode;</div><div class='del'>-</div><div class='del'>-	if (!bits)</div><div class='del'>-		sb_dsp_command(devc, 0xd0);	/* Halt DMA */</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		switch (devc-&gt;irq_mode)</div><div class='del'>-		{</div><div class='del'>-			case IMODE_INPUT:</div><div class='del'>-				sb1_audio_start_input(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-						devc-&gt;trg_intrflag);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_OUTPUT:</div><div class='del'>-				sb1_audio_output_block(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-						devc-&gt;trg_intrflag);</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;trigger_bits = bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb1_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x40))</div><div class='del'>-		sb_dsp_command(devc, devc-&gt;tconst);</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKOFF);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb1_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x40))</div><div class='del'>-		sb_dsp_command(devc, devc-&gt;tconst);</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKON);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb1_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	int max_speed = 23000;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	int tmp;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;opened &amp; OPEN_READ)</div><div class='del'>-		max_speed = 13000;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		if (speed &lt; 4000)</div><div class='del'>-			speed = 4000;</div><div class='del'>-</div><div class='del'>-		if (speed &gt; max_speed)</div><div class='del'>-			speed = max_speed;</div><div class='del'>-</div><div class='del'>-		devc-&gt;tconst = (256 - ((1000000 + speed / 2) / speed)) &amp; 0xff;</div><div class='del'>-		tmp = 256 - devc-&gt;tconst;</div><div class='del'>-		speed = (1000000 + tmp / 2) / tmp;</div><div class='del'>-</div><div class='del'>-		devc-&gt;speed = speed;</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short sb1_audio_set_channels(int dev, short channels)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	return devc-&gt;channels = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sb1_audio_set_bits(int dev, unsigned int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc        *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	return devc-&gt;bits = 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb1_audio_halt_xfer(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SB 2.0 and SB 2.01 compatible routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void sb20_audio_output_block(int dev, unsigned long buf, int nr_bytes,</div><div class='del'>-			int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned char cmd;</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_WRITE); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x48))		/* DSP Block size */</div><div class='del'>-	{</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) (count &amp; 0xff));</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) ((count &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;speed * devc-&gt;channels &lt;= 23000)</div><div class='del'>-			cmd = 0x1c;	/* 8 bit PCM output */</div><div class='del'>-		else</div><div class='del'>-			cmd = 0x90;	/* 8 bit high speed PCM output (SB2.01/Pro) */</div><div class='del'>-</div><div class='del'>-		if (!sb_dsp_command(devc, cmd))</div><div class='del'>-			printk(KERN_ERR "Sound Blaster:  unable to start DAC.\n");</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "Sound Blaster: unable to start DAC.\n");</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb20_audio_start_input(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned char cmd;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start a DMA input to the buffer pointed by dmaqtail</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_READ); */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x48))		/* DSP Block size */</div><div class='del'>-	{</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) (count &amp; 0xff));</div><div class='del'>-		sb_dsp_command(devc, (unsigned char) ((count &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;speed * devc-&gt;channels &lt;= (devc-&gt;major == 3 ? 23000 : 13000))</div><div class='del'>-			cmd = 0x2c;	/* 8 bit PCM input */</div><div class='del'>-		else</div><div class='del'>-			cmd = 0x98;	/* 8 bit high speed PCM input (SB2.01/Pro) */</div><div class='del'>-</div><div class='del'>-		if (!sb_dsp_command(devc, cmd))</div><div class='del'>-			printk(KERN_ERR "Sound Blaster:  unable to start ADC.\n");</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_ERR "Sound Blaster:  unable to start ADC.\n");</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb20_audio_trigger(int dev, int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	bits &amp;= devc-&gt;irq_mode;</div><div class='del'>-</div><div class='del'>-	if (!bits)</div><div class='del'>-		sb_dsp_command(devc, 0xd0);	/* Halt DMA */</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		switch (devc-&gt;irq_mode)</div><div class='del'>-		{</div><div class='del'>-			case IMODE_INPUT:</div><div class='del'>-				sb20_audio_start_input(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-						devc-&gt;trg_intrflag);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_OUTPUT:</div><div class='del'>-				sb20_audio_output_block(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-						devc-&gt;trg_intrflag);</div><div class='del'>-			    break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;trigger_bits = bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SB2.01 specific speed setup</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int sb201_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	int tmp;</div><div class='del'>-	int s = speed * devc-&gt;channels;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		if (speed &lt; 4000)</div><div class='del'>-			speed = 4000;</div><div class='del'>-		if (speed &gt; 44100)</div><div class='del'>-			speed = 44100;</div><div class='del'>-		if (devc-&gt;opened &amp; OPEN_READ &amp;&amp; speed &gt; 15000)</div><div class='del'>-			speed = 15000;</div><div class='del'>-		devc-&gt;tconst = (256 - ((1000000 + s / 2) / s)) &amp; 0xff;</div><div class='del'>-		tmp = 256 - devc-&gt;tconst;</div><div class='del'>-		speed = ((1000000 + tmp / 2) / tmp) / devc-&gt;channels;</div><div class='del'>-</div><div class='del'>-		devc-&gt;speed = speed;</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SB Pro specific routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int sbpro_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{				/* For SB Pro and Jazz16 */</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char bits = 0;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dma16 &gt;= 0 &amp;&amp; devc-&gt;dma16 != devc-&gt;dma8)</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = audio_devs[dev]-&gt;dmap_in-&gt;dma =</div><div class='del'>-			devc-&gt;bits == 16 ? devc-&gt;dma16 : devc-&gt;dma8;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_JAZZ || devc-&gt;model == MDL_SMW)</div><div class='del'>-		if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-			bits = 0x04;	/* 16 bit mode */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x40))</div><div class='del'>-		sb_dsp_command(devc, devc-&gt;tconst);</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKOFF);</div><div class='del'>-	if (devc-&gt;channels == 1)</div><div class='del'>-		sb_dsp_command(devc, 0xa0 | bits);	/* Mono input */</div><div class='del'>-	else</div><div class='del'>-		sb_dsp_command(devc, 0xa8 | bits);	/* Stereo input */</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sbpro_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{				/* For SB Pro and Jazz16 */</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char tmp;</div><div class='del'>-	unsigned char bits = 0;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dma16 &gt;= 0 &amp;&amp; devc-&gt;dma16 != devc-&gt;dma8)</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = audio_devs[dev]-&gt;dmap_in-&gt;dma = devc-&gt;bits == 16 ? devc-&gt;dma16 : devc-&gt;dma8;</div><div class='del'>-	if (devc-&gt;model == MDL_SBPRO)</div><div class='del'>-		sb_mixer_set_stereo(devc, devc-&gt;channels == 2);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (sb_dsp_command(devc, 0x40))</div><div class='del'>-		sb_dsp_command(devc, devc-&gt;tconst);</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKON);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_JAZZ || devc-&gt;model == MDL_SMW)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-			bits = 0x04;	/* 16 bit mode */</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;channels == 1)</div><div class='del'>-			sb_dsp_command(devc, 0xa0 | bits);	/* Mono output */</div><div class='del'>-		else</div><div class='del'>-			sb_dsp_command(devc, 0xa8 | bits);	/* Stereo output */</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-		tmp = sb_getmixer(devc, 0x0e);</div><div class='del'>-		if (devc-&gt;channels == 1)</div><div class='del'>-			tmp &amp;= ~0x02;</div><div class='del'>-		else</div><div class='del'>-			tmp |= 0x02;</div><div class='del'>-		sb_setmixer(devc, 0x0e, tmp);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sbpro_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		if (speed &lt; 4000)</div><div class='del'>-			speed = 4000;</div><div class='del'>-		if (speed &gt; 44100)</div><div class='del'>-			speed = 44100;</div><div class='del'>-		if (devc-&gt;channels &gt; 1 &amp;&amp; speed &gt; 22050)</div><div class='del'>-			speed = 22050;</div><div class='del'>-		sb201_audio_set_speed(dev, speed);</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short sbpro_audio_set_channels(int dev, short channels)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (channels == 1 || channels == 2)</div><div class='del'>-	{</div><div class='del'>-		if (channels != devc-&gt;channels)</div><div class='del'>-		{</div><div class='del'>-			devc-&gt;channels = channels;</div><div class='del'>-			if (devc-&gt;model == MDL_SBPRO &amp;&amp; devc-&gt;channels == 2)</div><div class='del'>-				sbpro_audio_set_speed(dev, devc-&gt;speed);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;channels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int jazz16_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		int tmp;</div><div class='del'>-		int s = speed * devc-&gt;channels;</div><div class='del'>-</div><div class='del'>-		if (speed &lt; 5000)</div><div class='del'>-			speed = 5000;</div><div class='del'>-		if (speed &gt; 44100)</div><div class='del'>-			speed = 44100;</div><div class='del'>-</div><div class='del'>-		devc-&gt;tconst = (256 - ((1000000 + s / 2) / s)) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-		tmp = 256 - devc-&gt;tconst;</div><div class='del'>-		speed = ((1000000 + tmp / 2) / tmp) / devc-&gt;channels;</div><div class='del'>-</div><div class='del'>-		devc-&gt;speed = speed;</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SB16 specific routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int sb16_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	int	max_speed = devc-&gt;submodel == SUBMDL_ALS100 ? 48000 : 44100;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		if (speed &lt; 5000)</div><div class='del'>-			speed = 5000;</div><div class='del'>-</div><div class='del'>-		if (speed &gt; max_speed)</div><div class='del'>-			speed = max_speed;</div><div class='del'>-</div><div class='del'>-		devc-&gt;speed = speed;</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sb16_audio_set_bits(int dev, unsigned int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (bits != 0)</div><div class='del'>-	{</div><div class='del'>-		if (bits == AFMT_U8 || bits == AFMT_S16_LE)</div><div class='del'>-			devc-&gt;bits = bits;</div><div class='del'>-		else</div><div class='del'>-			devc-&gt;bits = AFMT_U8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return devc-&gt;bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb16_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma =</div><div class='del'>-			audio_devs[dev]-&gt;dmap_in-&gt;dma =</div><div class='del'>-				devc-&gt;bits == AFMT_S16_LE ?</div><div class='del'>-					devc-&gt;dma16 : devc-&gt;dma8;</div><div class='del'>-	}</div><div class='del'>-	else if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = devc-&gt;dma8;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_in-&gt;dma = devc-&gt;dma16;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = devc-&gt;dma16;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_in-&gt;dma = devc-&gt;dma8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb16_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma =</div><div class='del'>-			audio_devs[dev]-&gt;dmap_in-&gt;dma =</div><div class='del'>-				devc-&gt;bits == AFMT_S16_LE ?</div><div class='del'>-					devc-&gt;dma16 : devc-&gt;dma8;</div><div class='del'>-	}</div><div class='del'>-	else if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = devc-&gt;dma8;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_in-&gt;dma = devc-&gt;dma16;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		audio_devs[dev]-&gt;dmap_out-&gt;dma = devc-&gt;dma16;</div><div class='del'>-		audio_devs[dev]-&gt;dmap_in-&gt;dma = devc-&gt;dma8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb16_audio_output_block(int dev, unsigned long buf, int count,</div><div class='del'>-			int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags, cnt;</div><div class='del'>-	sb_devc        *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long   bits;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex || devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-		devc-&gt;intr_active = 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;irq_mode_16 = IMODE_OUTPUT;</div><div class='del'>-		devc-&gt;intr_active_16 = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* save value */</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	bits = devc-&gt;bits;</div><div class='del'>-	if (devc-&gt;fullduplex)</div><div class='del'>-		devc-&gt;bits = (devc-&gt;bits == AFMT_S16_LE) ?</div><div class='del'>-			AFMT_U8 : AFMT_S16_LE;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-	if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-	cnt--;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_WRITE); */</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, 0x41);</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) ((devc-&gt;speed &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (devc-&gt;speed &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, (devc-&gt;bits == AFMT_S16_LE ? 0xb6 : 0xc6));</div><div class='del'>-	sb_dsp_command(devc, ((devc-&gt;channels == 2 ? 0x20 : 0) +</div><div class='del'>-			      (devc-&gt;bits == AFMT_S16_LE ? 0x10 : 0)));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (cnt &amp; 0xff));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (cnt &gt;&gt; 8));</div><div class='del'>-</div><div class='del'>-	/* restore real value after all programming */</div><div class='del'>-	devc-&gt;bits = bits;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	This fails on the Cyrix MediaGX. If you don't have the DMA enabled</div><div class='del'>- *	before the first sample arrives it locks up. However even if you</div><div class='del'>- *	do enable the DMA in time you just get DMA timeouts and missing</div><div class='del'>- *	interrupts and stuff, so for now I've not bothered fixing this either.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static void sb16_audio_start_input(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags, cnt;</div><div class='del'>-	sb_devc        *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;fullduplex || devc-&gt;bits != AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-		devc-&gt;intr_active = 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;irq_mode_16 = IMODE_INPUT;</div><div class='del'>-		devc-&gt;intr_active_16 = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cnt = count;</div><div class='del'>-	if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-		cnt &gt;&gt;= 1;</div><div class='del'>-	cnt--;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* DMAbuf_start_dma (dev, buf, count, DMA_MODE_READ); */</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, 0x42);</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) ((devc-&gt;speed &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (devc-&gt;speed &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, (devc-&gt;bits == AFMT_S16_LE ? 0xbe : 0xce));</div><div class='del'>-	sb_dsp_command(devc, ((devc-&gt;channels == 2 ? 0x20 : 0) +</div><div class='del'>-			      (devc-&gt;bits == AFMT_S16_LE ? 0x10 : 0)));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (cnt &amp; 0xff));</div><div class='del'>-	sb_dsp_command(devc, (unsigned char) (cnt &gt;&gt; 8));</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb16_audio_trigger(int dev, int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	int bits_16 = bits &amp; devc-&gt;irq_mode_16;</div><div class='del'>-	bits &amp;= devc-&gt;irq_mode;</div><div class='del'>-</div><div class='del'>-	if (!bits &amp;&amp; !bits_16)</div><div class='del'>-		sb_dsp_command(devc, 0xd0);	/* Halt DMA */</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		if (bits)</div><div class='del'>-		{</div><div class='del'>-			switch (devc-&gt;irq_mode)</div><div class='del'>-			{</div><div class='del'>-				case IMODE_INPUT:</div><div class='del'>-					sb16_audio_start_input(dev,</div><div class='del'>-							devc-&gt;trg_buf,</div><div class='del'>-							devc-&gt;trg_bytes,</div><div class='del'>-							devc-&gt;trg_intrflag);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case IMODE_OUTPUT:</div><div class='del'>-					sb16_audio_output_block(dev,</div><div class='del'>-							devc-&gt;trg_buf,</div><div class='del'>-							devc-&gt;trg_bytes,</div><div class='del'>-							devc-&gt;trg_intrflag);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (bits_16)</div><div class='del'>-		{</div><div class='del'>-			switch (devc-&gt;irq_mode_16)</div><div class='del'>-			{</div><div class='del'>-				case IMODE_INPUT:</div><div class='del'>-					sb16_audio_start_input(dev,</div><div class='del'>-							devc-&gt;trg_buf_16,</div><div class='del'>-							devc-&gt;trg_bytes_16,</div><div class='del'>-							devc-&gt;trg_intrflag_16);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case IMODE_OUTPUT:</div><div class='del'>-					sb16_audio_output_block(dev,</div><div class='del'>-							devc-&gt;trg_buf_16,</div><div class='del'>-							devc-&gt;trg_bytes_16,</div><div class='del'>-							devc-&gt;trg_intrflag_16);</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = bits | bits_16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char lbuf8[2048];</div><div class='del'>-static signed short *lbuf16 = (signed short *)lbuf8;</div><div class='del'>-#define LBUFCOPYSIZE 1024</div><div class='del'>-static void</div><div class='del'>-sb16_copy_from_user(int dev,</div><div class='del'>-		char *localbuf, int localoffs,</div><div class='del'>-		const char __user *userbuf, int useroffs,</div><div class='del'>-		int max_in, int max_out,</div><div class='del'>-		int *used, int *returned,</div><div class='del'>-		int len)</div><div class='del'>-{</div><div class='del'>-	sb_devc       *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	int           i, c, p, locallen;</div><div class='del'>-	unsigned char *buf8;</div><div class='del'>-	signed short  *buf16;</div><div class='del'>-</div><div class='del'>-	/* if not duplex no conversion */</div><div class='del'>-	if (!devc-&gt;fullduplex)</div><div class='del'>-	{</div><div class='del'>-		if (copy_from_user(localbuf + localoffs,</div><div class='del'>-				   userbuf + useroffs, len))</div><div class='del'>-			return;</div><div class='del'>-		*used = len;</div><div class='del'>-		*returned = len;</div><div class='del'>-	}</div><div class='del'>-	else if (devc-&gt;bits == AFMT_S16_LE)</div><div class='del'>-	{</div><div class='del'>-		/* 16 -&gt; 8 */</div><div class='del'>-		/* max_in &gt;&gt; 1, max number of samples in ( 16 bits ) */</div><div class='del'>-		/* max_out, max number of samples out ( 8 bits ) */</div><div class='del'>-		/* len, number of samples that will be taken ( 16 bits )*/</div><div class='del'>-		/* c, count of samples remaining in buffer ( 16 bits )*/</div><div class='del'>-		/* p, count of samples already processed ( 16 bits )*/</div><div class='del'>-		len = ( (max_in &gt;&gt; 1) &gt; max_out) ? max_out : (max_in &gt;&gt; 1);</div><div class='del'>-		c = len;</div><div class='del'>-		p = 0;</div><div class='del'>-		buf8 = (unsigned char *)(localbuf + localoffs);</div><div class='del'>-		while (c)</div><div class='del'>-		{</div><div class='del'>-			locallen = (c &gt;= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);</div><div class='del'>-			/* &lt;&lt; 1 in order to get 16 bit samples */</div><div class='del'>-			if (copy_from_user(lbuf16,</div><div class='del'>-					   userbuf + useroffs + (p &lt;&lt; 1),</div><div class='del'>-					   locallen &lt;&lt; 1))</div><div class='del'>-				return;</div><div class='del'>-			for (i = 0; i &lt; locallen; i++)</div><div class='del'>-			{</div><div class='del'>-				buf8[p+i] = ~((lbuf16[i] &gt;&gt; 8) &amp; 0xff) ^ 0x80;</div><div class='del'>-			}</div><div class='del'>-			c -= locallen; p += locallen;</div><div class='del'>-		}</div><div class='del'>-		/* used = ( samples * 16 bits size ) */</div><div class='del'>-		*used =  max_in  &gt; ( max_out &lt;&lt; 1) ? (max_out &lt;&lt; 1) : max_in;</div><div class='del'>-		/* returned = ( samples * 8 bits size ) */</div><div class='del'>-		*returned = len;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		/* 8 -&gt; 16 */</div><div class='del'>-		/* max_in, max number of samples in ( 8 bits ) */</div><div class='del'>-		/* max_out &gt;&gt; 1, max number of samples out ( 16 bits ) */</div><div class='del'>-		/* len, number of samples that will be taken ( 8 bits )*/</div><div class='del'>-		/* c, count of samples remaining in buffer ( 8 bits )*/</div><div class='del'>-		/* p, count of samples already processed ( 8 bits )*/</div><div class='del'>-		len = max_in &gt; (max_out &gt;&gt; 1) ? (max_out &gt;&gt; 1) : max_in;</div><div class='del'>-		c = len;</div><div class='del'>-		p = 0;</div><div class='del'>-		buf16 = (signed short *)(localbuf + localoffs);</div><div class='del'>-		while (c)</div><div class='del'>-		{</div><div class='del'>-			locallen = (c &gt;= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);</div><div class='del'>-			if (copy_from_user(lbuf8,</div><div class='del'>-					   userbuf+useroffs + p,</div><div class='del'>-					   locallen))</div><div class='del'>-				return;</div><div class='del'>-			for (i = 0; i &lt; locallen; i++)</div><div class='del'>-			{</div><div class='del'>-				buf16[p+i] = (~lbuf8[i] ^ 0x80) &lt;&lt; 8;</div><div class='del'>-			}</div><div class='del'>-	      		c -= locallen; p += locallen;</div><div class='del'>-		}</div><div class='del'>-		/* used = ( samples * 8 bits size ) */</div><div class='del'>-		*used = len;</div><div class='del'>-		/* returned = ( samples * 16 bits size ) */</div><div class='del'>-		*returned = len &lt;&lt; 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sb16_audio_mmap(int dev)</div><div class='del'>-{</div><div class='del'>-	sb_devc       *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	devc-&gt;fullduplex = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver sb1_audio_driver =	/* SB1.x */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sb1_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sb1_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.trigger		= sb1_audio_trigger,</div><div class='del'>-	.set_speed		= sb1_audio_set_speed,</div><div class='del'>-	.set_bits		= sb1_audio_set_bits,</div><div class='del'>-	.set_channels		= sb1_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct audio_driver sb20_audio_driver =	/* SB2.0 */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sb1_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sb1_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.trigger		= sb20_audio_trigger,</div><div class='del'>-	.set_speed		= sb1_audio_set_speed,</div><div class='del'>-	.set_bits		= sb1_audio_set_bits,</div><div class='del'>-	.set_channels		= sb1_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct audio_driver sb201_audio_driver =		/* SB2.01 */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sb1_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sb1_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.trigger		= sb20_audio_trigger,</div><div class='del'>-	.set_speed		= sb201_audio_set_speed,</div><div class='del'>-	.set_bits		= sb1_audio_set_bits,</div><div class='del'>-	.set_channels		= sb1_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct audio_driver sbpro_audio_driver =		/* SB Pro */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sbpro_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sbpro_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.trigger		= sb20_audio_trigger,</div><div class='del'>-	.set_speed		= sbpro_audio_set_speed,</div><div class='del'>-	.set_bits		= sb1_audio_set_bits,</div><div class='del'>-	.set_channels		= sbpro_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct audio_driver jazz16_audio_driver =	/* Jazz16 and SM Wave */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sbpro_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sbpro_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.trigger		= sb20_audio_trigger,</div><div class='del'>-	.set_speed		= jazz16_audio_set_speed,</div><div class='del'>-	.set_bits		= sb16_audio_set_bits,</div><div class='del'>-	.set_channels		= sbpro_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct audio_driver sb16_audio_driver =	/* SB16 */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= sb_set_output_parms,</div><div class='del'>-	.start_input		= sb_set_input_parms,</div><div class='del'>-	.prepare_for_input	= sb16_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= sb16_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= sb1_audio_halt_xfer,</div><div class='del'>-	.copy_user		= sb16_copy_from_user,</div><div class='del'>-	.trigger		= sb16_audio_trigger,</div><div class='del'>-	.set_speed		= sb16_audio_set_speed,</div><div class='del'>-	.set_bits		= sb16_audio_set_bits,</div><div class='del'>-	.set_channels		= sbpro_audio_set_channels,</div><div class='del'>-	.mmap			= sb16_audio_mmap</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void sb_audio_init(sb_devc * devc, char *name, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	int audio_flags = 0;</div><div class='del'>-	int format_mask = AFMT_U8;</div><div class='del'>-</div><div class='del'>-	struct audio_driver *driver = &amp;sb1_audio_driver;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MDL_SB1:	/* SB1.0 or SB 1.5 */</div><div class='del'>-			DDB(printk("Will use standard SB1.x driver\n"));</div><div class='del'>-			audio_flags = DMA_HARDSTOP;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SB2:</div><div class='del'>-			DDB(printk("Will use SB2.0 driver\n"));</div><div class='del'>-			audio_flags = DMA_AUTOMODE;</div><div class='del'>-			driver = &amp;sb20_audio_driver;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SB201:</div><div class='del'>-			DDB(printk("Will use SB2.01 (high speed) driver\n"));</div><div class='del'>-			audio_flags = DMA_AUTOMODE;</div><div class='del'>-			driver = &amp;sb201_audio_driver;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_JAZZ:</div><div class='del'>-		case MDL_SMW:</div><div class='del'>-			DDB(printk("Will use Jazz16 driver\n"));</div><div class='del'>-			audio_flags = DMA_AUTOMODE;</div><div class='del'>-			format_mask |= AFMT_S16_LE;</div><div class='del'>-			driver = &amp;jazz16_audio_driver;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_ESS:</div><div class='del'>-			DDB(printk("Will use ESS ES688/1688 driver\n"));</div><div class='del'>-			driver = ess_audio_init (devc, &amp;audio_flags, &amp;format_mask);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SB16:</div><div class='del'>-			DDB(printk("Will use SB16 driver\n"));</div><div class='del'>-			audio_flags = DMA_AUTOMODE;</div><div class='del'>-			format_mask |= AFMT_S16_LE;</div><div class='del'>-			if (devc-&gt;dma8 != devc-&gt;dma16 &amp;&amp; devc-&gt;dma16 != -1)</div><div class='del'>-			{</div><div class='del'>-				audio_flags |= DMA_DUPLEX;</div><div class='del'>-				devc-&gt;duplex = 1;</div><div class='del'>-			}</div><div class='del'>-			driver = &amp;sb16_audio_driver;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			DDB(printk("Will use SB Pro driver\n"));</div><div class='del'>-			audio_flags = DMA_AUTOMODE;</div><div class='del'>-			driver = &amp;sbpro_audio_driver;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-			driver-&gt;owner = owner;</div><div class='del'>-	</div><div class='del'>-	if ((devc-&gt;dev = sound_install_audiodrv(AUDIO_DRIVER_VERSION,</div><div class='del'>-				name,driver, sizeof(struct audio_driver),</div><div class='del'>-				audio_flags, format_mask, devc,</div><div class='del'>-				devc-&gt;dma8,</div><div class='del'>-				devc-&gt;duplex ? devc-&gt;dma16 : devc-&gt;dma8)) &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_ERR "Sound Blaster:  unable to install audio.\n");</div><div class='del'>-		  return;</div><div class='del'>-	}</div><div class='del'>-	audio_devs[devc-&gt;dev]-&gt;mixer_dev = devc-&gt;my_mixerdev;</div><div class='del'>-	audio_devs[devc-&gt;dev]-&gt;min_fragment = 5;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c<br/>deleted file mode 100644<br/>index 84ef4d06c1c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_card.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,354 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_card.c</div><div class='del'>- *</div><div class='del'>- * Detection routine for the ISA Sound Blaster and compatable sound</div><div class='del'>- * cards.</div><div class='del'>- *</div><div class='del'>- * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this</div><div class='del'>- * software for more info.</div><div class='del'>- *</div><div class='del'>- * This is a complete rewrite of the detection routines. This was</div><div class='del'>- * prompted by the PnP API change during v2.5 and the ugly state the</div><div class='del'>- * code was in.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Paul Laufer 2002. Based on code originally by</div><div class='del'>- * Hannu Savolainen which was modified by many others over the</div><div class='del'>- * years. Authors specifically mentioned in the previous version were:</div><div class='del'>- * Daniel Stone, Alessandro Zummo, Jeff Garzik, Arnaldo Carvalho de</div><div class='del'>- * Melo, Daniel Church, and myself.</div><div class='del'>- *</div><div class='del'>- * 02-05-2003 Original Release, Paul Laufer &lt;paul@laufernet.com&gt;</div><div class='del'>- * 02-07-2003 Bug made it into first release. Take two.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sb_mixer.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-#include &lt;linux/pnp.h&gt;</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='del'>-#include "sb_card.h"</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("OSS Soundblaster ISA PnP and legacy sound driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-extern void *smw_free;</div><div class='del'>-</div><div class='del'>-static int __initdata mpu_io	= 0;</div><div class='del'>-static int __initdata io	= -1;</div><div class='del'>-static int __initdata irq	= -1;</div><div class='del'>-static int __initdata dma	= -1;</div><div class='del'>-static int __initdata dma16	= -1;</div><div class='del'>-static int __initdata type	= 0; /* Can set this to a specific card type */</div><div class='del'>-static int __initdata esstype   = 0; /* ESS chip type */</div><div class='del'>-static int __initdata acer 	= 0; /* Do acer notebook init? */</div><div class='del'>-static int __initdata sm_games 	= 0; /* Logitech soundman games? */</div><div class='del'>-</div><div class='del'>-static struct sb_card_config *legacy = NULL;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-static int pnp_registered;</div><div class='del'>-static int __initdata pnp       = 1;</div><div class='del'>-/*</div><div class='del'>-static int __initdata uart401	= 0;</div><div class='del'>-*/</div><div class='del'>-#else</div><div class='del'>-static int __initdata pnp       = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-module_param(io, int, 000);</div><div class='del'>-MODULE_PARM_DESC(io,       "Soundblaster i/o base address (0x220,0x240,0x260,0x280)");</div><div class='del'>-module_param(irq, int, 000);</div><div class='del'>-MODULE_PARM_DESC(irq,	   "IRQ (5,7,9,10)");</div><div class='del'>-module_param(dma, int, 000);</div><div class='del'>-MODULE_PARM_DESC(dma,	   "8-bit DMA channel (0,1,3)");</div><div class='del'>-module_param(dma16, int, 000);</div><div class='del'>-MODULE_PARM_DESC(dma16,	   "16-bit DMA channel (5,6,7)");</div><div class='del'>-module_param(mpu_io, int, 000);</div><div class='del'>-MODULE_PARM_DESC(mpu_io,   "MPU base address");</div><div class='del'>-module_param(type, int, 000);</div><div class='del'>-MODULE_PARM_DESC(type,	   "You can set this to specific card type (doesn't " \</div><div class='del'>-		 "work with pnp)");</div><div class='del'>-module_param(sm_games, int, 000);</div><div class='del'>-MODULE_PARM_DESC(sm_games, "Enable support for Logitech soundman games " \</div><div class='del'>-		 "(doesn't work with pnp)");</div><div class='del'>-module_param(esstype, int, 000);</div><div class='del'>-MODULE_PARM_DESC(esstype,  "ESS chip type (doesn't work with pnp)");</div><div class='del'>-module_param(acer, int, 000);</div><div class='del'>-MODULE_PARM_DESC(acer,	   "Set this to detect cards in some ACER notebooks "\</div><div class='del'>-		 "(doesn't work with pnp)");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-module_param(pnp, int, 000);</div><div class='del'>-MODULE_PARM_DESC(pnp,     "Went set to 0 will disable detection using PnP. "\</div><div class='del'>-		  "Default is 1.\n");</div><div class='del'>-/* Not done yet.... */</div><div class='del'>-/*</div><div class='del'>-module_param(uart401, int, 000);</div><div class='del'>-MODULE_PARM_DESC(uart401,  "When set to 1, will attempt to detect and enable"\</div><div class='del'>-		 "the mpu on some clones");</div><div class='del'>-*/</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='del'>-</div><div class='del'>-/* OSS subsystem card registration shared by PnP and legacy routines */</div><div class='del'>-static int sb_register_oss(struct sb_card_config *scc, struct sb_module_options *sbmo)</div><div class='del'>-{</div><div class='del'>-	if (!request_region(scc-&gt;conf.io_base, 16, "soundblaster")) {</div><div class='del'>-		printk(KERN_ERR "sb: ports busy.\n");</div><div class='del'>-		kfree(scc);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_detect(&amp;scc-&gt;conf, 0, 0, sbmo)) {</div><div class='del'>-		release_region(scc-&gt;conf.io_base, 16);</div><div class='del'>-		printk(KERN_ERR "sb: Failed DSP Detect.\n");</div><div class='del'>-		kfree(scc);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if(!sb_dsp_init(&amp;scc-&gt;conf, THIS_MODULE)) {</div><div class='del'>-		printk(KERN_ERR "sb: Failed DSP init.\n");</div><div class='del'>-		kfree(scc);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if(scc-&gt;mpucnf.io_base &gt; 0) {</div><div class='del'>-		scc-&gt;mpu = 1;</div><div class='del'>-		printk(KERN_INFO "sb: Turning on MPU\n");</div><div class='del'>-		if(!probe_sbmpu(&amp;scc-&gt;mpucnf, THIS_MODULE))</div><div class='del'>-			scc-&gt;mpu = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_unload(struct sb_card_config *scc)</div><div class='del'>-{</div><div class='del'>-	sb_dsp_unload(&amp;scc-&gt;conf, 0);</div><div class='del'>-	if(scc-&gt;mpu)</div><div class='del'>-		unload_sbmpu(&amp;scc-&gt;mpucnf);</div><div class='del'>-	kfree(scc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Register legacy card with OSS subsystem */</div><div class='del'>-static int __init sb_init_legacy(void)</div><div class='del'>-{</div><div class='del'>-	struct sb_module_options sbmo = {0};</div><div class='del'>-</div><div class='del'>-	if((legacy = kzalloc(sizeof(struct sb_card_config), GFP_KERNEL)) == NULL) {</div><div class='del'>-		printk(KERN_ERR "sb: Error: Could not allocate memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	legacy-&gt;conf.io_base      = io;</div><div class='del'>-	legacy-&gt;conf.irq          = irq;</div><div class='del'>-	legacy-&gt;conf.dma          = dma;</div><div class='del'>-	legacy-&gt;conf.dma2         = dma16;</div><div class='del'>-	legacy-&gt;conf.card_subtype = type;</div><div class='del'>-</div><div class='del'>-	legacy-&gt;mpucnf.io_base = mpu_io;</div><div class='del'>-	legacy-&gt;mpucnf.irq     = -1;</div><div class='del'>-	legacy-&gt;mpucnf.dma     = -1;</div><div class='del'>-	legacy-&gt;mpucnf.dma2    = -1;</div><div class='del'>-</div><div class='del'>-	sbmo.esstype  = esstype;</div><div class='del'>-	sbmo.sm_games = sm_games;</div><div class='del'>-	sbmo.acer     = acer;</div><div class='del'>-</div><div class='del'>-	return sb_register_oss(legacy, &amp;sbmo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-</div><div class='del'>-/* Populate the OSS subsystem structures with information from PnP */</div><div class='del'>-static void sb_dev2cfg(struct pnp_dev *dev, struct sb_card_config *scc)</div><div class='del'>-{</div><div class='del'>-	scc-&gt;conf.io_base   = -1;</div><div class='del'>-	scc-&gt;conf.irq       = -1;</div><div class='del'>-	scc-&gt;conf.dma       = -1;</div><div class='del'>-	scc-&gt;conf.dma2      = -1;</div><div class='del'>-	scc-&gt;mpucnf.io_base = -1;</div><div class='del'>-	scc-&gt;mpucnf.irq     = -1;</div><div class='del'>-	scc-&gt;mpucnf.dma     = -1;</div><div class='del'>-	scc-&gt;mpucnf.dma2    = -1;</div><div class='del'>-</div><div class='del'>-	/* All clones layout their PnP tables differently and some use</div><div class='del'>-	   different logical devices for the MPU */</div><div class='del'>-	if(!strncmp("CTL",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base   = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq       = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma       = pnp_dma(dev,0);</div><div class='del'>-		scc-&gt;conf.dma2      = pnp_dma(dev,1);</div><div class='del'>-		scc-&gt;mpucnf.io_base = pnp_port_start(dev,1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("tBA",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base   = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq       = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma       = pnp_dma(dev,0);</div><div class='del'>-		scc-&gt;conf.dma2      = pnp_dma(dev,1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("ESS",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base   = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq       = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma       = pnp_dma(dev,0);</div><div class='del'>-		scc-&gt;conf.dma2      = pnp_dma(dev,1);</div><div class='del'>-	       	scc-&gt;mpucnf.io_base = pnp_port_start(dev,2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("CMI",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq     = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma     = pnp_dma(dev,0);</div><div class='del'>-		scc-&gt;conf.dma2    = pnp_dma(dev,1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("RWB",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq     = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma     = pnp_dma(dev,0);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("ALS",scc-&gt;card_id,3)) {</div><div class='del'>-		if(!strncmp("ALS0007",scc-&gt;card_id,7)) {</div><div class='del'>-			scc-&gt;conf.io_base = pnp_port_start(dev,0);</div><div class='del'>-			scc-&gt;conf.irq     = pnp_irq(dev,0);</div><div class='del'>-			scc-&gt;conf.dma     = pnp_dma(dev,0);</div><div class='del'>-		} else {</div><div class='del'>-			scc-&gt;conf.io_base = pnp_port_start(dev,0);</div><div class='del'>-			scc-&gt;conf.irq     = pnp_irq(dev,0);</div><div class='del'>-			scc-&gt;conf.dma     = pnp_dma(dev,1);</div><div class='del'>-			scc-&gt;conf.dma2    = pnp_dma(dev,0);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if(!strncmp("RTL",scc-&gt;card_id,3)) {</div><div class='del'>-		scc-&gt;conf.io_base = pnp_port_start(dev,0);</div><div class='del'>-		scc-&gt;conf.irq     = pnp_irq(dev,0);</div><div class='del'>-		scc-&gt;conf.dma     = pnp_dma(dev,1);</div><div class='del'>-		scc-&gt;conf.dma2    = pnp_dma(dev,0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sb_pnp_devices;</div><div class='del'>-</div><div class='del'>-/* Probe callback function for the PnP API */</div><div class='del'>-static int sb_pnp_probe(struct pnp_card_link *card, const struct pnp_card_device_id *card_id)</div><div class='del'>-{</div><div class='del'>-	struct sb_card_config *scc;</div><div class='del'>-	struct sb_module_options sbmo = {0}; /* Default to 0 for PnP */</div><div class='del'>-	struct pnp_dev *dev = pnp_request_card_device(card, card_id-&gt;devs[0].id, NULL);</div><div class='del'>-	</div><div class='del'>-	if(!dev){</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if((scc = kzalloc(sizeof(struct sb_card_config), GFP_KERNEL)) == NULL) {</div><div class='del'>-		printk(KERN_ERR "sb: Error: Could not allocate memory\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "sb: PnP: Found Card Named = \"%s\", Card PnP id = " \</div><div class='del'>-	       "%s, Device PnP id = %s\n", card-&gt;card-&gt;name, card_id-&gt;id,</div><div class='del'>-	       dev-&gt;id-&gt;id);</div><div class='del'>-</div><div class='del'>-	scc-&gt;card_id = card_id-&gt;id;</div><div class='del'>-	scc-&gt;dev_id = dev-&gt;id-&gt;id;</div><div class='del'>-	sb_dev2cfg(dev, scc);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "sb: PnP:      Detected at: io=0x%x, irq=%d, " \</div><div class='del'>-	       "dma=%d, dma16=%d\n", scc-&gt;conf.io_base, scc-&gt;conf.irq,</div><div class='del'>-	       scc-&gt;conf.dma, scc-&gt;conf.dma2);</div><div class='del'>-</div><div class='del'>-	pnp_set_card_drvdata(card, scc);</div><div class='del'>-	sb_pnp_devices++;</div><div class='del'>-</div><div class='del'>-	return sb_register_oss(scc, &amp;sbmo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_pnp_remove(struct pnp_card_link *card)</div><div class='del'>-{</div><div class='del'>-	struct sb_card_config *scc = pnp_get_card_drvdata(card);</div><div class='del'>-</div><div class='del'>-	if(!scc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "sb: PnP: Removing %s\n", scc-&gt;card_id);</div><div class='del'>-</div><div class='del'>-	sb_unload(scc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pnp_card_driver sb_pnp_driver = {</div><div class='del'>-	.name          = "OSS SndBlstr", /* 16 character limit */</div><div class='del'>-	.id_table      = sb_pnp_card_table,</div><div class='del'>-	.probe         = sb_pnp_probe,</div><div class='del'>-	.remove        = sb_pnp_remove,</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pnp_card, sb_pnp_card_table);</div><div class='del'>-#endif /* CONFIG_PNP */</div><div class='del'>-</div><div class='del'>-static void sb_unregister_all(void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-	if (pnp_registered)</div><div class='del'>-		pnp_unregister_card_driver(&amp;sb_pnp_driver);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init sb_init(void)</div><div class='del'>-{</div><div class='del'>-	int lres = 0;</div><div class='del'>-	int pres = 0;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "sb: Init: Starting Probe...\n");</div><div class='del'>-</div><div class='del'>-	if(io != -1 &amp;&amp; irq != -1 &amp;&amp; dma != -1) {</div><div class='del'>-		printk(KERN_INFO "sb: Probing legacy card with io=%x, "\</div><div class='del'>-		       "irq=%d, dma=%d, dma16=%d\n",io, irq, dma, dma16);</div><div class='del'>-		lres = sb_init_legacy();</div><div class='del'>-	} else if((io != -1 || irq != -1 || dma != -1) ||</div><div class='del'>-		  (!pnp &amp;&amp; (io == -1 &amp;&amp; irq == -1 &amp;&amp; dma == -1)))</div><div class='del'>-		printk(KERN_ERR "sb: Error: At least io, irq, and dma "\</div><div class='del'>-		       "must be set for legacy cards.\n");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-	if(pnp) {</div><div class='del'>-		int err = pnp_register_card_driver(&amp;sb_pnp_driver);</div><div class='del'>-		if (!err)</div><div class='del'>-			pnp_registered = 1;</div><div class='del'>-		pres = sb_pnp_devices;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	printk(KERN_INFO "sb: Init: Done\n");</div><div class='del'>-</div><div class='del'>-	/* If either PnP or Legacy registered a card then return</div><div class='del'>-	 * success */</div><div class='del'>-	if (pres == 0 &amp;&amp; lres &lt;= 0) {</div><div class='del'>-		sb_unregister_all();</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sb_exit(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "sb: Unloading...\n");</div><div class='del'>-</div><div class='del'>-	/* Unload legacy card */</div><div class='del'>-	if (legacy) {</div><div class='del'>-		printk (KERN_INFO "sb: Unloading legacy card\n");</div><div class='del'>-		sb_unload(legacy);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sb_unregister_all();</div><div class='del'>-</div><div class='del'>-	vfree(smw_free);</div><div class='del'>-	smw_free = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sb_init);</div><div class='del'>-module_exit(sb_exit);</div><div class='head'>diff --git a/sound/oss/sb_card.h b/sound/oss/sb_card.h<br/>deleted file mode 100644<br/>index 5535cff800df..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_card.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_card.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_card.h</div><div class='del'>- *</div><div class='del'>- * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this</div><div class='del'>- * software for more info.</div><div class='del'>- *</div><div class='del'>- * 02-05-2002 Original Release, Paul Laufer &lt;paul@laufernet.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct sb_card_config {</div><div class='del'>-	struct address_info conf;</div><div class='del'>-	struct address_info mpucnf;</div><div class='del'>-	const  char         *card_id;</div><div class='del'>-	const  char         *dev_id;</div><div class='del'>-	int                 mpu;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PNP</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SoundBlaster PnP tables and structures.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Card PnP ID Table */</div><div class='del'>-static struct pnp_card_device_id sb_pnp_card_table[] = {</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0024", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0025", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0026", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0027", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0028", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0029", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL002a", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL002b", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL002c", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL00ed", .driver_data = 0, .devs = { {.id="CTL0041"}, } },</div><div class='del'>-	/* Sound Blaster 16 */</div><div class='del'>-	{.id = "CTL0086", .driver_data = 0, .devs = { {.id="CTL0041"}, } },</div><div class='del'>-	/* Sound Blaster Vibra16S */</div><div class='del'>-	{.id = "CTL0051", .driver_data = 0, .devs = { {.id="CTL0001"}, } },</div><div class='del'>-	/* Sound Blaster Vibra16C */</div><div class='del'>-	{.id = "CTL0070", .driver_data = 0, .devs = { {.id="CTL0001"}, } },</div><div class='del'>-	/* Sound Blaster Vibra16CL */</div><div class='del'>-	{.id = "CTL0080", .driver_data = 0, .devs = { {.id="CTL0041"}, } },</div><div class='del'>-	/* Sound Blaster Vibra16CL */</div><div class='del'>-	{.id = "CTL00F0", .driver_data = 0, .devs = { {.id="CTL0043"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0039", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0042", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0043", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0044", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0045", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0046", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0047", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0048", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL0054", .driver_data = 0, .devs = { {.id="CTL0031"}, } },</div><div class='del'>-	/* Sound Blaster AWE 32 */</div><div class='del'>-	{.id = "CTL009C", .driver_data = 0, .devs = { {.id="CTL0041"}, } },</div><div class='del'>-	/* Createive SB32 PnP */</div><div class='del'>-	{.id = "CTL009F", .driver_data = 0, .devs = { {.id="CTL0041"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL009D", .driver_data = 0, .devs = { {.id="CTL0042"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 Gold */</div><div class='del'>-	{.id = "CTL009E", .driver_data = 0, .devs = { {.id="CTL0044"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 Gold */</div><div class='del'>-	{.id = "CTL00B2", .driver_data = 0, .devs = { {.id="CTL0044"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00C1", .driver_data = 0, .devs = { {.id="CTL0042"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00C3", .driver_data = 0, .devs = { {.id="CTL0045"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00C5", .driver_data = 0, .devs = { {.id="CTL0045"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00C7", .driver_data = 0, .devs = { {.id="CTL0045"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00E4", .driver_data = 0, .devs = { {.id="CTL0045"}, } },</div><div class='del'>-	/* Sound Blaster AWE 64 */</div><div class='del'>-	{.id = "CTL00E9", .driver_data = 0, .devs = { {.id="CTL0045"}, } },</div><div class='del'>-	/* ESS 1868 */</div><div class='del'>-	{.id = "ESS0968", .driver_data = 0, .devs = { {.id="ESS0968"}, } },</div><div class='del'>-	/* ESS 1868 */</div><div class='del'>-	{.id = "ESS1868", .driver_data = 0, .devs = { {.id="ESS1868"}, } },</div><div class='del'>-	/* ESS 1868 */</div><div class='del'>-	{.id = "ESS1868", .driver_data = 0, .devs = { {.id="ESS8611"}, } },</div><div class='del'>-	/* ESS 1869 PnP AudioDrive */</div><div class='del'>-	{.id = "ESS0003", .driver_data = 0, .devs = { {.id="ESS1869"}, } },</div><div class='del'>-	/* ESS 1869 */</div><div class='del'>-	{.id = "ESS1869", .driver_data = 0, .devs = { {.id="ESS1869"}, } },</div><div class='del'>-	/* ESS 1878 */</div><div class='del'>-	{.id = "ESS1878", .driver_data = 0, .devs = { {.id="ESS1878"}, } },</div><div class='del'>-	/* ESS 1879 */</div><div class='del'>-	{.id = "ESS1879", .driver_data = 0, .devs = { {.id="ESS1879"}, } },</div><div class='del'>-	/* CMI 8330 SoundPRO */</div><div class='del'>-	{.id = "CMI0001", .driver_data = 0, .devs = { {.id="@X@0001"},</div><div class='del'>-						     {.id="@H@0001"},</div><div class='del'>-						     {.id="@@@0001"}, } },</div><div class='del'>-	/* Diamond DT0197H */</div><div class='del'>-	{.id = "RWR1688", .driver_data = 0, .devs = { {.id="@@@0001"},</div><div class='del'>-						     {.id="@X@0001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS007 */</div><div class='del'>-	{.id = "ALS0007", .driver_data = 0, .devs = { {.id="@@@0001"},</div><div class='del'>-						     {.id="@X@0001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS100 */</div><div class='del'>-	{.id = "ALS0001", .driver_data = 0, .devs = { {.id="@@@0001"},</div><div class='del'>-						     {.id="@X@0001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS110 */</div><div class='del'>-	{.id = "ALS0110", .driver_data = 0, .devs = { {.id="@@@1001"},</div><div class='del'>-						     {.id="@X@1001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS120 */</div><div class='del'>-	{.id = "ALS0120", .driver_data = 0, .devs = { {.id="@@@2001"},</div><div class='del'>-						     {.id="@X@2001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS200 */</div><div class='del'>-	{.id = "ALS0200", .driver_data = 0, .devs = { {.id="@@@0020"},</div><div class='del'>-						     {.id="@X@0030"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* ALS200 */</div><div class='del'>-	{.id = "RTL3000", .driver_data = 0, .devs = { {.id="@@@2001"},</div><div class='del'>-						     {.id="@X@2001"},</div><div class='del'>-						     {.id="@H@0001"}, } },</div><div class='del'>-	/* Sound Blaster 16 (Virtual PC 2004) */</div><div class='del'>-	{.id = "tBA03b0", .driver_data = 0, .devs = { {.id="PNPb003"}, } },</div><div class='del'>-	/* -end- */</div><div class='del'>-	{.id = "", }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c<br/>deleted file mode 100644<br/>index 7d42c5418d1b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_common.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_common.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1292 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_common.c</div><div class='del'>- *</div><div class='del'>- * Common routines for Sound Blaster compatible cards.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Daniel J. Rodriksson: Modified sbintr to handle 8 and 16 bit interrupts</div><div class='del'>- *                       for full duplex support ( only sb16 by now )</div><div class='del'>- * Rolf Fokkens:	 Added (BETA?) support for ES1887 chips.</div><div class='del'>- * (fokkensr@vertis.nl)	 Which means: You can adjust the recording levels.</div><div class='del'>- *</div><div class='del'>- * 2000/01/18 - separated sb_card and sb_common -</div><div class='del'>- * Jeff Garzik &lt;jgarzik@pobox.com&gt;</div><div class='del'>- *</div><div class='del'>- * 2000/09/18 - got rid of attach_uart401</div><div class='del'>- * Arnaldo Carvalho de Melo &lt;acme@conectiva.com.br&gt;</div><div class='del'>- *</div><div class='del'>- * 2001/01/26 - replaced CLI/STI with spinlocks</div><div class='del'>- * Chris Rankin &lt;rankinc@zipworld.com.au&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sound_firmware.h"</div><div class='del'>-</div><div class='del'>-#include "mpu401.h"</div><div class='del'>-</div><div class='del'>-#include "sb_mixer.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-#include "sb_ess.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * global module flag</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int sb_be_quiet;</div><div class='del'>-</div><div class='del'>-static sb_devc *detected_devc;	/* For communication from probe to init */</div><div class='del'>-static sb_devc *last_devc;	/* For MPU401 initialization */</div><div class='del'>-</div><div class='del'>-static unsigned char jazz_irq_bits[] = {</div><div class='del'>-	0, 0, 2, 3, 0, 1, 0, 4, 0, 2, 5, 0, 0, 0, 0, 6</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char jazz_dma_bits[] = {</div><div class='del'>-	0, 1, 0, 2, 0, 3, 0, 4</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void *smw_free;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Jazz16 chipset specific control variables</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int jazz16_base;			/* Not detected */</div><div class='del'>-static unsigned char jazz16_bits;	/* I/O relocation bits */</div><div class='del'>-static DEFINE_SPINLOCK(jazz16_lock);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Logitech Soundman Wave specific initialization code</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef SMW_MIDI0001_INCLUDED</div><div class='del'>-#include "smw-midi0001.h"</div><div class='del'>-#else</div><div class='del'>-static unsigned char *smw_ucode;</div><div class='del'>-static int      smw_ucodeLen;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static sb_devc *last_sb;		/* Last sb loaded */</div><div class='del'>-</div><div class='del'>-int sb_dsp_command(sb_devc * devc, unsigned char val)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned long limit;</div><div class='del'>-</div><div class='del'>-	limit = jiffies + HZ / 10;	/* Timeout */</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Note! the i&lt;500000 is an emergency exit. The sb_dsp_command() is sometimes</div><div class='del'>-	 * called while interrupts are disabled. This means that the timer is</div><div class='del'>-	 * disabled also. However the timeout situation is a abnormal condition.</div><div class='del'>-	 * Normally the DSP should be ready to accept commands after just couple of</div><div class='del'>-	 * loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 500000 &amp;&amp; (limit-jiffies)&gt;0; i++)</div><div class='del'>-	{</div><div class='del'>-		if ((inb(DSP_STATUS) &amp; 0x80) == 0)</div><div class='del'>-		{</div><div class='del'>-			outb((val), DSP_COMMAND);</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "Sound Blaster:  DSP command(%x) timeout.\n", val);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_dsp_get_byte(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 1000; i; i--)</div><div class='del'>-	{</div><div class='del'>-		if (inb(DSP_DATA_AVAIL) &amp; 0x80)</div><div class='del'>-			return inb(DSP_READ);</div><div class='del'>-	}</div><div class='del'>-	return 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_intr (sb_devc *devc)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	unsigned char   src = 0xff;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_SB16)</div><div class='del'>-	{</div><div class='del'>-		src = sb_getmixer(devc, IRQ_STAT);	/* Interrupt source register */</div><div class='del'>-</div><div class='del'>-		if (src &amp; 4)						/* MPU401 interrupt */</div><div class='del'>-			if(devc-&gt;midi_irq_cookie)</div><div class='del'>-				uart401intr(devc-&gt;irq, devc-&gt;midi_irq_cookie);</div><div class='del'>-</div><div class='del'>-		if (!(src &amp; 3))</div><div class='del'>-			return;	/* Not a DSP interrupt */</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;intr_active &amp;&amp; (!devc-&gt;fullduplex || (src &amp; 0x01)))</div><div class='del'>-	{</div><div class='del'>-		switch (devc-&gt;irq_mode)</div><div class='del'>-		{</div><div class='del'>-			case IMODE_OUTPUT:</div><div class='del'>-				DMAbuf_outputintr(devc-&gt;dev, 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_INPUT:</div><div class='del'>-				DMAbuf_inputintr(devc-&gt;dev);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_INIT:</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_MIDI:</div><div class='del'>-				sb_midi_interrupt(devc);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */</div><div class='del'>-				;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (devc-&gt;intr_active_16 &amp;&amp; (src &amp; 0x02))</div><div class='del'>-	{</div><div class='del'>-		switch (devc-&gt;irq_mode_16)</div><div class='del'>-		{</div><div class='del'>-			case IMODE_OUTPUT:</div><div class='del'>-				DMAbuf_outputintr(devc-&gt;dev, 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_INPUT:</div><div class='del'>-				DMAbuf_inputintr(devc-&gt;dev);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_INIT:</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */</div><div class='del'>-				;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Acknowledge interrupts </div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (src &amp; 0x01)</div><div class='del'>-		status = inb(DSP_DATA_AVAIL);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_SB16 &amp;&amp; src &amp; 0x02)</div><div class='del'>-		status = inb(DSP_DATA_AVL16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pci_intr(sb_devc *devc)</div><div class='del'>-{</div><div class='del'>-	int src = inb(devc-&gt;pcibase+0x1A);</div><div class='del'>-	src&amp;=3;</div><div class='del'>-	if(src)</div><div class='del'>-		sb_intr(devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t sbintr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = dev_id;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_ok = 1;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model) {</div><div class='del'>-	case MDL_ESSPCI:</div><div class='del'>-		pci_intr (devc);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case MDL_ESS:</div><div class='del'>-		ess_intr (devc);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		sb_intr (devc);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_dsp_reset(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int loopc;</div><div class='del'>-</div><div class='del'>-	DEB(printk("Entered sb_dsp_reset()\n"));</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_ESS) return ess_dsp_reset (devc);</div><div class='del'>-</div><div class='del'>-	/* This is only for non-ESS chips */</div><div class='del'>-</div><div class='del'>-	outb(1, DSP_RESET);</div><div class='del'>-</div><div class='del'>-	udelay(10);</div><div class='del'>-	outb(0, DSP_RESET);</div><div class='del'>-	udelay(30);</div><div class='del'>-</div><div class='del'>-	for (loopc = 0; loopc &lt; 1000 &amp;&amp; !(inb(DSP_DATA_AVAIL) &amp; 0x80); loopc++);</div><div class='del'>-</div><div class='del'>-	if (inb(DSP_READ) != 0xAA)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("sb: No response to RESET\n"));</div><div class='del'>-		return 0;	/* Sorry */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DEB(printk("sb_dsp_reset() OK\n"));</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsp_get_vers(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	DDB(printk("Entered dsp_get_vers()\n"));</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	devc-&gt;major = devc-&gt;minor = 0;</div><div class='del'>-	sb_dsp_command(devc, 0xe1);	/* Get version */</div><div class='del'>-</div><div class='del'>-	for (i = 100000; i; i--)</div><div class='del'>-	{</div><div class='del'>-		if (inb(DSP_DATA_AVAIL) &amp; 0x80)</div><div class='del'>-		{</div><div class='del'>-			if (devc-&gt;major == 0)</div><div class='del'>-				devc-&gt;major = inb(DSP_READ);</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				devc-&gt;minor = inb(DSP_READ);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	DDB(printk("DSP version %d.%02d\n", devc-&gt;major, devc-&gt;minor));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb16_set_dma_hw(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int bits;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dma8 != 0 &amp;&amp; devc-&gt;dma8 != 1 &amp;&amp; devc-&gt;dma8 != 3)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "SB16: Invalid 8 bit DMA (%d)\n", devc-&gt;dma8);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	bits = (1 &lt;&lt; devc-&gt;dma8);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dma16 &gt;= 5 &amp;&amp; devc-&gt;dma16 &lt;= 7)</div><div class='del'>-		bits |= (1 &lt;&lt; devc-&gt;dma16);</div><div class='del'>-</div><div class='del'>-	sb_setmixer(devc, DMA_NR, bits);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb16_set_mpu_port(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This routine initializes new MIDI port setup register of SB Vibra (CT2502).</div><div class='del'>-	 */</div><div class='del'>-	unsigned char   bits = sb_getmixer(devc, 0x84) &amp; ~0x06;</div><div class='del'>-</div><div class='del'>-	switch (hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x300:</div><div class='del'>-			sb_setmixer(devc, 0x84, bits | 0x04);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 0x330:</div><div class='del'>-			sb_setmixer(devc, 0x84, bits | 0x00);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			sb_setmixer(devc, 0x84, bits | 0x02);		/* Disable MPU */</div><div class='del'>-			printk(KERN_ERR "SB16: Invalid MIDI I/O port %x\n", hw_config-&gt;io_base);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb16_set_irq_hw(sb_devc * devc, int level)</div><div class='del'>-{</div><div class='del'>-	int ival;</div><div class='del'>-</div><div class='del'>-	switch (level)</div><div class='del'>-	{</div><div class='del'>-		case 5:</div><div class='del'>-			ival = 2;</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			ival = 4;</div><div class='del'>-			break;</div><div class='del'>-		case 9:</div><div class='del'>-			ival = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 10:</div><div class='del'>-			ival = 8;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "SB16: Invalid IRQ%d\n", level);</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	sb_setmixer(devc, IRQ_NR, ival);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void relocate_Jazz16(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char bits = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (jazz16_base != 0 &amp;&amp; jazz16_base != hw_config-&gt;io_base)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x220:</div><div class='del'>-			bits = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 0x240:</div><div class='del'>-			bits = 2;</div><div class='del'>-			break;</div><div class='del'>-		case 0x260:</div><div class='del'>-			bits = 3;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	bits = jazz16_bits = bits &lt;&lt; 5;</div><div class='del'>-	jazz16_base = hw_config-&gt;io_base;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	Magic wake up sequence by writing to 0x201 (aka Joystick port)</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;jazz16_lock, flags);</div><div class='del'>-	outb((0xAF), 0x201);</div><div class='del'>-	outb((0x50), 0x201);</div><div class='del'>-	outb((bits), 0x201);</div><div class='del'>-	spin_unlock_irqrestore(&amp;jazz16_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_Jazz16(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	char name[100];</div><div class='del'>-	/*</div><div class='del'>-	 * First try to check that the card has Jazz16 chip. It identifies itself</div><div class='del'>-	 * by returning 0x12 as response to DSP command 0xfa.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, 0xfa))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (sb_dsp_get_byte(devc) != 0x12)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * OK so far. Now configure the IRQ and DMA channel used by the card.</div><div class='del'>-	 */</div><div class='del'>-	if (hw_config-&gt;irq &lt; 1 || hw_config-&gt;irq &gt; 15 || jazz_irq_bits[hw_config-&gt;irq] == 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "Jazz16: Invalid interrupt (IRQ%d)\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;dma &lt; 0 || hw_config-&gt;dma &gt; 3 || jazz_dma_bits[hw_config-&gt;dma] == 0)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_ERR "Jazz16: Invalid 8 bit DMA (DMA%d)\n", hw_config-&gt;dma);</div><div class='del'>-		  return 0;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;dma2 &lt; 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "Jazz16: No 16 bit DMA channel defined\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;dma2 &lt; 5 || hw_config-&gt;dma2 &gt; 7 || jazz_dma_bits[hw_config-&gt;dma2] == 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "Jazz16: Invalid 16 bit DMA (DMA%d)\n", hw_config-&gt;dma2);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;dma16 = hw_config-&gt;dma2;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, 0xfb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, jazz_dma_bits[hw_config-&gt;dma] |</div><div class='del'>-			(jazz_dma_bits[hw_config-&gt;dma2] &lt;&lt; 4)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, jazz_irq_bits[hw_config-&gt;irq]))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now we have configured a standard Jazz16 device. </div><div class='del'>-	 */</div><div class='del'>-	devc-&gt;model = MDL_JAZZ;</div><div class='del'>-	strcpy(name, "Jazz16");</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;name = "Jazz16";</div><div class='del'>-	devc-&gt;caps |= SB_NO_MIDI;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void relocate_ess1688(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;base)</div><div class='del'>-	{</div><div class='del'>-		case 0x220:</div><div class='del'>-			bits = 0x04;</div><div class='del'>-			break;</div><div class='del'>-		case 0x230:</div><div class='del'>-			bits = 0x05;</div><div class='del'>-			break;</div><div class='del'>-		case 0x240:</div><div class='del'>-			bits = 0x06;</div><div class='del'>-			break;</div><div class='del'>-		case 0x250:</div><div class='del'>-			bits = 0x07;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return;	/* Wrong port */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DDB(printk("Doing ESS1688 address selection\n"));</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * ES1688 supports two alternative ways for software address config.</div><div class='del'>-	 * First try the so called Read-Sequence-Key method.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Reset the sequence logic */</div><div class='del'>-	inb(0x229);</div><div class='del'>-	inb(0x229);</div><div class='del'>-	inb(0x229);</div><div class='del'>-</div><div class='del'>-	/* Perform the read sequence */</div><div class='del'>-	inb(0x22b);</div><div class='del'>-	inb(0x229);</div><div class='del'>-	inb(0x22b);</div><div class='del'>-	inb(0x229);</div><div class='del'>-	inb(0x229);</div><div class='del'>-	inb(0x22b);</div><div class='del'>-	inb(0x229);</div><div class='del'>-</div><div class='del'>-	/* Select the base address by reading from it. Then probe using the port. */</div><div class='del'>-	inb(devc-&gt;base);</div><div class='del'>-	if (sb_dsp_reset(devc))	/* Bingo */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if 0				/* This causes system lockups (Nokia 386/25 at least) */</div><div class='del'>-	/*</div><div class='del'>-	 * The last resort is the system control register method.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	outb((0x00), 0xfb);	/* 0xFB is the unlock register */</div><div class='del'>-	outb((0x00), 0xe0);	/* Select index 0 */</div><div class='del'>-	outb((bits), 0xe1);	/* Write the config bits */</div><div class='del'>-	outb((0x00), 0xf9);	/* 0xFB is the lock register */</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_module_options *sbmo)</div><div class='del'>-{</div><div class='del'>-	sb_devc sb_info;</div><div class='del'>-	sb_devc *devc = &amp;sb_info;</div><div class='del'>-</div><div class='del'>-	memset((char *) &amp;sb_info, 0, sizeof(sb_info));	/* Zero everything */</div><div class='del'>-</div><div class='del'>-	/* Copy module options in place */</div><div class='del'>-	if(sbmo) memcpy(&amp;devc-&gt;sbmo, sbmo, sizeof(struct sb_module_options));</div><div class='del'>-</div><div class='del'>-	sb_info.my_mididev = -1;</div><div class='del'>-	sb_info.my_mixerdev = -1;</div><div class='del'>-	sb_info.dev = -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize variables </div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	DDB(printk("sb_dsp_detect(%x) entered\n", hw_config-&gt;io_base));</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;lock);</div><div class='del'>-	devc-&gt;type = hw_config-&gt;card_subtype;</div><div class='del'>-</div><div class='del'>-	devc-&gt;base = hw_config-&gt;io_base;</div><div class='del'>-	devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	devc-&gt;dma8 = hw_config-&gt;dma;</div><div class='del'>-</div><div class='del'>-	devc-&gt;dma16 = -1;</div><div class='del'>-	devc-&gt;pcibase = pciio;</div><div class='del'>-	</div><div class='del'>-	if(pci == SB_PCI_ESSMAESTRO)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;model = MDL_ESSPCI;</div><div class='del'>-		devc-&gt;caps |= SB_PCI_IRQ;</div><div class='del'>-		hw_config-&gt;driver_use_1 |= SB_PCI_IRQ;</div><div class='del'>-		hw_config-&gt;card_subtype	= MDL_ESSPCI;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if(pci == SB_PCI_YAMAHA)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;model = MDL_YMPCI;</div><div class='del'>-		devc-&gt;caps |= SB_PCI_IRQ;</div><div class='del'>-		hw_config-&gt;driver_use_1 |= SB_PCI_IRQ;</div><div class='del'>-		hw_config-&gt;card_subtype	= MDL_YMPCI;</div><div class='del'>-		</div><div class='del'>-		printk("Yamaha PCI mode.\n");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (devc-&gt;sbmo.acer)</div><div class='del'>-	{</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x0b);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x0b);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x0b);</div><div class='del'>-		inb(devc-&gt;base + 0x09);</div><div class='del'>-		inb(devc-&gt;base + 0x00);</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Detect the device</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (sb_dsp_reset(devc))</div><div class='del'>-		dsp_get_vers(devc);</div><div class='del'>-	else</div><div class='del'>-		devc-&gt;major = 0;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;type == 0 || devc-&gt;type == MDL_JAZZ || devc-&gt;type == MDL_SMW)</div><div class='del'>-		if (devc-&gt;major == 0 || (devc-&gt;major == 3 &amp;&amp; devc-&gt;minor == 1))</div><div class='del'>-			relocate_Jazz16(devc, hw_config);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;major == 0 &amp;&amp; (devc-&gt;type == MDL_ESS || devc-&gt;type == 0))</div><div class='del'>-		relocate_ess1688(devc);</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_reset(devc))</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("SB reset failed\n"));</div><div class='del'>-#ifdef MODULE</div><div class='del'>-		printk(KERN_INFO "sb: dsp reset failed.\n");</div><div class='del'>-#endif</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (devc-&gt;major == 0)</div><div class='del'>-		dsp_get_vers(devc);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;major == 3 &amp;&amp; devc-&gt;minor == 1)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;type == MDL_AZTECH)		/* SG Washington? */</div><div class='del'>-		{</div><div class='del'>-			if (sb_dsp_command(devc, 0x09))</div><div class='del'>-				if (sb_dsp_command(devc, 0x00))	/* Enter WSS mode */</div><div class='del'>-				{</div><div class='del'>-					int i;</div><div class='del'>-</div><div class='del'>-					/* Have some delay */</div><div class='del'>-					for (i = 0; i &lt; 10000; i++)</div><div class='del'>-						inb(DSP_DATA_AVAIL);</div><div class='del'>-					devc-&gt;caps = SB_NO_AUDIO | SB_NO_MIDI;	/* Mixer only */</div><div class='del'>-					devc-&gt;model = MDL_AZTECH;</div><div class='del'>-				}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if(devc-&gt;type == MDL_ESSPCI)</div><div class='del'>-		devc-&gt;model = MDL_ESSPCI;</div><div class='del'>-		</div><div class='del'>-	if(devc-&gt;type == MDL_YMPCI)</div><div class='del'>-	{</div><div class='del'>-		printk("YMPCI selected\n");</div><div class='del'>-		devc-&gt;model = MDL_YMPCI;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	/*</div><div class='del'>-	 * Save device information for sb_dsp_init()</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	detected_devc = kmalloc(sizeof(sb_devc), GFP_KERNEL);</div><div class='del'>-	if (detected_devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "sb: Can't allocate memory for device information\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	memcpy(detected_devc, devc, sizeof(sb_devc));</div><div class='del'>-	MDB(printk(KERN_INFO "SB %d.%02d detected OK (%x)\n", devc-&gt;major, devc-&gt;minor, hw_config-&gt;io_base));</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_dsp_init(struct address_info *hw_config, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc;</div><div class='del'>-	char name[100];</div><div class='del'>-	extern int sb_be_quiet;</div><div class='del'>-	int	mixer22, mixer30;</div><div class='del'>-	</div><div class='del'>-/*</div><div class='del'>- * Check if we had detected a SB device earlier</div><div class='del'>- */</div><div class='del'>-	DDB(printk("sb_dsp_init(%x) entered\n", hw_config-&gt;io_base));</div><div class='del'>-	name[0] = 0;</div><div class='del'>-</div><div class='del'>-	if (detected_devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		MDB(printk("No detected device\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	devc = detected_devc;</div><div class='del'>-	detected_devc = NULL;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;base != hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("I/O port mismatch\n"));</div><div class='del'>-		release_region(devc-&gt;base, 16);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * Now continue initialization of the device</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	devc-&gt;caps = hw_config-&gt;driver_use_1;</div><div class='del'>-</div><div class='del'>-	if (!((devc-&gt;caps &amp; SB_NO_AUDIO) &amp;&amp; (devc-&gt;caps &amp; SB_NO_MIDI)) &amp;&amp; hw_config-&gt;irq &gt; 0)</div><div class='del'>-	{			/* IRQ setup */</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 *	ESS PCI cards do shared PCI IRQ stuff. Since they</div><div class='del'>-		 *	will get shared PCI irq lines we must cope.</div><div class='del'>-		 */</div><div class='del'>-		 </div><div class='del'>-		int i=(devc-&gt;caps&amp;SB_PCI_IRQ)?IRQF_SHARED:0;</div><div class='del'>-		</div><div class='del'>-		if (request_irq(hw_config-&gt;irq, sbintr, i, "soundblaster", devc) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "SB: Can't allocate IRQ%d\n", hw_config-&gt;irq);</div><div class='del'>-			release_region(devc-&gt;base, 16);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		devc-&gt;irq_ok = 0;</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;major == 4)</div><div class='del'>-			if (!sb16_set_irq_hw(devc, devc-&gt;irq))	/* Unsupported IRQ */</div><div class='del'>-			{</div><div class='del'>-				free_irq(devc-&gt;irq, devc);</div><div class='del'>-				release_region(devc-&gt;base, 16);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		if ((devc-&gt;type == 0 || devc-&gt;type == MDL_ESS) &amp;&amp;</div><div class='del'>-			devc-&gt;major == 3 &amp;&amp; devc-&gt;minor == 1)</div><div class='del'>-		{		/* Handle various chipsets which claim they are SB Pro compatible */</div><div class='del'>-			if ((devc-&gt;type != 0 &amp;&amp; devc-&gt;type != MDL_ESS) ||</div><div class='del'>-				!ess_init(devc, hw_config))</div><div class='del'>-			{</div><div class='del'>-				if ((devc-&gt;type != 0 &amp;&amp; devc-&gt;type != MDL_JAZZ &amp;&amp;</div><div class='del'>-					 devc-&gt;type != MDL_SMW) || !init_Jazz16(devc, hw_config))</div><div class='del'>-				{</div><div class='del'>-					DDB(printk("This is a genuine SB Pro\n"));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (devc-&gt;major == 4 &amp;&amp; devc-&gt;minor &lt;= 11 )	/* Won't work */</div><div class='del'>-			devc-&gt;irq_ok = 1;</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			int n;</div><div class='del'>-</div><div class='del'>-			for (n = 0; n &lt; 3 &amp;&amp; devc-&gt;irq_ok == 0; n++)</div><div class='del'>-			{</div><div class='del'>-				if (sb_dsp_command(devc, 0xf2))	/* Cause interrupt immediately */</div><div class='del'>-				{</div><div class='del'>-					int i;</div><div class='del'>-</div><div class='del'>-					for (i = 0; !devc-&gt;irq_ok &amp;&amp; i &lt; 10000; i++);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (!devc-&gt;irq_ok)</div><div class='del'>-				printk(KERN_WARNING "sb: Interrupt test on IRQ%d failed - Probable IRQ conflict\n", devc-&gt;irq);</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				DDB(printk("IRQ test OK (IRQ%d)\n", devc-&gt;irq));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}			/* IRQ setup */</div><div class='del'>-</div><div class='del'>-	last_sb = devc;</div><div class='del'>-	</div><div class='del'>-	switch (devc-&gt;major)</div><div class='del'>-	{</div><div class='del'>-		case 1:		/* SB 1.0 or 1.5 */</div><div class='del'>-			devc-&gt;model = hw_config-&gt;card_subtype = MDL_SB1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 2:		/* SB 2.x */</div><div class='del'>-			if (devc-&gt;minor == 0)</div><div class='del'>-				devc-&gt;model = hw_config-&gt;card_subtype = MDL_SB2;</div><div class='del'>-			else</div><div class='del'>-				devc-&gt;model = hw_config-&gt;card_subtype = MDL_SB201;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 3:		/* SB Pro and most clones */</div><div class='del'>-			switch (devc-&gt;model) {</div><div class='del'>-			case 0:</div><div class='del'>-				devc-&gt;model = hw_config-&gt;card_subtype = MDL_SBPRO;</div><div class='del'>-				if (hw_config-&gt;name == NULL)</div><div class='del'>-					hw_config-&gt;name = "Sound Blaster Pro (8 BIT ONLY)";</div><div class='del'>-				break;</div><div class='del'>-			case MDL_ESS:</div><div class='del'>-				ess_dsp_init(devc, hw_config);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case 4:</div><div class='del'>-			devc-&gt;model = hw_config-&gt;card_subtype = MDL_SB16;</div><div class='del'>-			/* </div><div class='del'>-			 * ALS007 and ALS100 return DSP version 4.2 and have 2 post-reset !=0</div><div class='del'>-			 * registers at 0x3c and 0x4c (output ctrl registers on ALS007) whereas</div><div class='del'>-			 * a "standard" SB16 doesn't have a register at 0x4c.  ALS100 actively</div><div class='del'>-			 * updates register 0x22 whenever 0x30 changes, as per the SB16 spec.</div><div class='del'>-			 * Since ALS007 doesn't, this can be used to differentiate the 2 cards.</div><div class='del'>-			 */</div><div class='del'>-			if ((devc-&gt;minor == 2) &amp;&amp; sb_getmixer(devc,0x3c) &amp;&amp; sb_getmixer(devc,0x4c)) </div><div class='del'>-			{</div><div class='del'>-				mixer30 = sb_getmixer(devc,0x30);</div><div class='del'>-				sb_setmixer(devc,0x22,(mixer22=sb_getmixer(devc,0x22)) &amp; 0x0f);</div><div class='del'>-				sb_setmixer(devc,0x30,0xff);</div><div class='del'>-				/* ALS100 will force 0x30 to 0xf8 like SB16; ALS007 will allow 0xff. */</div><div class='del'>-				/* Register 0x22 &amp; 0xf0 on ALS100 == 0xf0; on ALS007 it == 0x10.     */</div><div class='del'>-				if ((sb_getmixer(devc,0x30) != 0xff) || ((sb_getmixer(devc,0x22) &amp; 0xf0) != 0x10)) </div><div class='del'>-				{</div><div class='del'>-					devc-&gt;submodel = SUBMDL_ALS100;</div><div class='del'>-					if (hw_config-&gt;name == NULL)</div><div class='del'>-						hw_config-&gt;name = "Sound Blaster 16 (ALS-100)";</div><div class='del'>-        			}</div><div class='del'>-        			else</div><div class='del'>-        			{</div><div class='del'>-        				sb_setmixer(devc,0x3c,0x1f);    /* Enable all inputs */</div><div class='del'>-					sb_setmixer(devc,0x4c,0x1f);</div><div class='del'>-					sb_setmixer(devc,0x22,mixer22); /* Restore 0x22 to original value */</div><div class='del'>-					devc-&gt;submodel = SUBMDL_ALS007;</div><div class='del'>-					if (hw_config-&gt;name == NULL)</div><div class='del'>-						hw_config-&gt;name = "Sound Blaster 16 (ALS-007)";</div><div class='del'>-				}</div><div class='del'>-				sb_setmixer(devc,0x30,mixer30);</div><div class='del'>-			}</div><div class='del'>-			else if (hw_config-&gt;name == NULL)</div><div class='del'>-				hw_config-&gt;name = "Sound Blaster 16";</div><div class='del'>-</div><div class='del'>-			if (hw_config-&gt;dma2 == -1)</div><div class='del'>-				devc-&gt;dma16 = devc-&gt;dma8;</div><div class='del'>-			else if (hw_config-&gt;dma2 &lt; 5 || hw_config-&gt;dma2 &gt; 7)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING  "SB16: Bad or missing 16 bit DMA channel\n");</div><div class='del'>-				devc-&gt;dma16 = devc-&gt;dma8;</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				devc-&gt;dma16 = hw_config-&gt;dma2;</div><div class='del'>-</div><div class='del'>-			if(!sb16_set_dma_hw(devc)) {</div><div class='del'>-				free_irq(devc-&gt;irq, devc);</div><div class='del'>-			        release_region(hw_config-&gt;io_base, 16);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			devc-&gt;caps |= SB_NO_MIDI;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(devc-&gt;caps &amp; SB_NO_MIXER))</div><div class='del'>-		if (devc-&gt;major == 3 || devc-&gt;major == 4)</div><div class='del'>-			sb_mixer_init(devc, owner);</div><div class='del'>-</div><div class='del'>-	if (!(devc-&gt;caps &amp; SB_NO_MIDI))</div><div class='del'>-		sb_dsp_midi_init(devc, owner);</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;name == NULL)</div><div class='del'>-		hw_config-&gt;name = "Sound Blaster (8 BIT/MONO ONLY)";</div><div class='del'>-</div><div class='del'>-	sprintf(name, "%s (%d.%02d)", hw_config-&gt;name, devc-&gt;major, devc-&gt;minor);</div><div class='del'>-	conf_printf(name, hw_config);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Assuming that a sound card is Sound Blaster (compatible) is the most common</div><div class='del'>-	 * configuration error and the mother of all problems. Usually sound cards</div><div class='del'>-	 * emulate SB Pro but in addition they have a 16 bit native mode which should be</div><div class='del'>-	 * used in Unix. See Readme.cards for more information about configuring OSS/Free</div><div class='del'>-	 * properly.</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;model &lt;= MDL_SBPRO)</div><div class='del'>-	{</div><div class='del'>-		if (devc-&gt;major == 3 &amp;&amp; devc-&gt;minor != 1)	/* "True" SB Pro should have v3.1 (rare ones may have 3.2). */</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_INFO "This sound card may not be fully Sound Blaster Pro compatible.\n");</div><div class='del'>-			printk(KERN_INFO "In many cases there is another way to configure OSS so that\n");</div><div class='del'>-			printk(KERN_INFO "it works properly with OSS (for example in 16 bit mode).\n");</div><div class='del'>-			printk(KERN_INFO "Please ignore this message if you _really_ have a SB Pro.\n");</div><div class='del'>-		}</div><div class='del'>-		else if (!sb_be_quiet &amp;&amp; devc-&gt;model == MDL_SBPRO)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_INFO "SB DSP version is just %d.%02d which means that your card is\n", devc-&gt;major, devc-&gt;minor);</div><div class='del'>-			printk(KERN_INFO "several years old (8 bit only device) or alternatively the sound driver\n");</div><div class='del'>-			printk(KERN_INFO "is incorrectly configured.\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	hw_config-&gt;card_subtype = devc-&gt;model;</div><div class='del'>-	hw_config-&gt;slots[0]=devc-&gt;dev;</div><div class='del'>-	last_devc = devc;	/* For SB MPU detection */</div><div class='del'>-</div><div class='del'>-	if (!(devc-&gt;caps &amp; SB_NO_AUDIO) &amp;&amp; devc-&gt;dma8 &gt;= 0)</div><div class='del'>-	{</div><div class='del'>-		if (sound_alloc_dma(devc-&gt;dma8, "SoundBlaster8"))</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "Sound Blaster: Can't allocate 8 bit DMA channel %d\n", devc-&gt;dma8);</div><div class='del'>-		}</div><div class='del'>-		if (devc-&gt;dma16 &gt;= 0 &amp;&amp; devc-&gt;dma16 != devc-&gt;dma8)</div><div class='del'>-		{</div><div class='del'>-			if (sound_alloc_dma(devc-&gt;dma16, "SoundBlaster16"))</div><div class='del'>-				printk(KERN_WARNING "Sound Blaster:  can't allocate 16 bit DMA channel %d.\n", devc-&gt;dma16);</div><div class='del'>-		}</div><div class='del'>-		sb_audio_init(devc, name, owner);</div><div class='del'>-		hw_config-&gt;slots[0]=devc-&gt;dev;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		MDB(printk("Sound Blaster:  no audio devices found.\n"));</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* if (sbmpu) below we allow mpu401 to manage the midi devs</div><div class='del'>-   otherwise we have to unload them. (Andrzej Krzysztofowicz) */</div><div class='del'>-   </div><div class='del'>-void sb_dsp_unload(struct address_info *hw_config, int sbmpu)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc;</div><div class='del'>-</div><div class='del'>-	devc = audio_devs[hw_config-&gt;slots[0]]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc &amp;&amp; devc-&gt;base == hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		if ((devc-&gt;model &amp; MDL_ESS) &amp;&amp; devc-&gt;pcibase)</div><div class='del'>-			release_region(devc-&gt;pcibase, 8);</div><div class='del'>-</div><div class='del'>-		release_region(devc-&gt;base, 16);</div><div class='del'>-</div><div class='del'>-		if (!(devc-&gt;caps &amp; SB_NO_AUDIO))</div><div class='del'>-		{</div><div class='del'>-			sound_free_dma(devc-&gt;dma8);</div><div class='del'>-			if (devc-&gt;dma16 &gt;= 0)</div><div class='del'>-				sound_free_dma(devc-&gt;dma16);</div><div class='del'>-		}</div><div class='del'>-		if (!(devc-&gt;caps &amp; SB_NO_AUDIO &amp;&amp; devc-&gt;caps &amp; SB_NO_MIDI))</div><div class='del'>-		{</div><div class='del'>-			if (devc-&gt;irq &gt; 0)</div><div class='del'>-				free_irq(devc-&gt;irq, devc);</div><div class='del'>-</div><div class='del'>-			sb_mixer_unload(devc);</div><div class='del'>-			/* We don't have to do this bit any more the UART401 is its own</div><div class='del'>-				master  -- Krzysztof Halasa */</div><div class='del'>-			/* But we have to do it, if UART401 is not detected */</div><div class='del'>-			if (!sbmpu)</div><div class='del'>-				sound_unload_mididev(devc-&gt;my_mididev);</div><div class='del'>-			sound_unload_audiodev(devc-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-		kfree(devc);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		release_region(hw_config-&gt;io_base, 16);</div><div class='del'>-</div><div class='del'>-	kfree(detected_devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Mixer access routines</div><div class='del'>- *</div><div class='del'>- *	ES1887 modifications: some mixer registers reside in the</div><div class='del'>- *	range above 0xa0. These must be accessed in another way.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void sb_setmixer(sb_devc * devc, unsigned int port, unsigned int value)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_ESS) {</div><div class='del'>-		ess_setmixer (devc, port, value);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	outb(((unsigned char) (port &amp; 0xff)), MIXER_ADDR);</div><div class='del'>-	udelay(20);</div><div class='del'>-	outb(((unsigned char) (value &amp; 0xff)), MIXER_DATA);</div><div class='del'>-	udelay(20);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int sb_getmixer(sb_devc * devc, unsigned int port)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model == MDL_ESS) return ess_getmixer (devc, port);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	outb(((unsigned char) (port &amp; 0xff)), MIXER_ADDR);</div><div class='del'>-	udelay(20);</div><div class='del'>-	val = inb(MIXER_DATA);</div><div class='del'>-	udelay(20);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sb_chgmixer</div><div class='del'>-	(sb_devc * devc, unsigned int reg, unsigned int mask, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	value = sb_getmixer(devc, reg);</div><div class='del'>-	value = (value &amp; ~mask) | (val &amp; mask);</div><div class='del'>-	sb_setmixer(devc, reg, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	MPU401 MIDI initialization.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void smw_putmem(sb_devc * devc, int base, int addr, unsigned char val)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;jazz16_lock, flags);  /* NOT the SB card? */</div><div class='del'>-</div><div class='del'>-	outb((addr &amp; 0xff), base + 1);	/* Low address bits */</div><div class='del'>-	outb((addr &gt;&gt; 8), base + 2);	/* High address bits */</div><div class='del'>-	outb((val), base);	/* Data */</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;jazz16_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char smw_getmem(sb_devc * devc, int base, int addr)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;jazz16_lock, flags);  /* NOT the SB card? */</div><div class='del'>-</div><div class='del'>-	outb((addr &amp; 0xff), base + 1);	/* Low address bits */</div><div class='del'>-	outb((addr &gt;&gt; 8), base + 2);	/* High address bits */</div><div class='del'>-	val = inb(base);	/* Data */</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;jazz16_lock, flags);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int smw_midi_init(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int mpu_base = hw_config-&gt;io_base;</div><div class='del'>-	int mp_base = mpu_base + 4;		/* Microcontroller base */</div><div class='del'>-	int i;</div><div class='del'>-	unsigned char control;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Reset the microcontroller so that the RAM can be accessed</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	control = inb(mpu_base + 7);</div><div class='del'>-	outb((control | 3), mpu_base + 7);	/* Set last two bits to 1 (?) */</div><div class='del'>-	outb(((control &amp; 0xfe) | 2), mpu_base + 7);	/* xxxxxxx0 resets the mc */</div><div class='del'>-</div><div class='del'>-	mdelay(3);	/* Wait at least 1ms */</div><div class='del'>-</div><div class='del'>-	outb((control &amp; 0xfc), mpu_base + 7);	/* xxxxxx00 enables RAM */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Detect microcontroller by probing the 8k RAM area</div><div class='del'>-	 */</div><div class='del'>-	smw_putmem(devc, mp_base, 0, 0x00);</div><div class='del'>-	smw_putmem(devc, mp_base, 1, 0xff);</div><div class='del'>-	udelay(10);</div><div class='del'>-</div><div class='del'>-	if (smw_getmem(devc, mp_base, 0) != 0x00 || smw_getmem(devc, mp_base, 1) != 0xff)</div><div class='del'>-	{</div><div class='del'>-		DDB(printk("SM Wave: No microcontroller RAM detected (%02x, %02x)\n", smw_getmem(devc, mp_base, 0), smw_getmem(devc, mp_base, 1)));</div><div class='del'>-		return 0;	/* No RAM */</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 *  There is RAM so assume it's really a SM Wave</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	devc-&gt;model = MDL_SMW;</div><div class='del'>-	smw_mixer_init(devc);</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	if (!smw_ucode)</div><div class='del'>-	{</div><div class='del'>-		smw_ucodeLen = mod_firmware_load("/etc/sound/midi0001.bin", (void *) &amp;smw_ucode);</div><div class='del'>-		smw_free = smw_ucode;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if (smw_ucodeLen &gt; 0)</div><div class='del'>-	{</div><div class='del'>-		if (smw_ucodeLen != 8192)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_ERR "SM Wave: Invalid microcode (MIDI0001.BIN) length\n");</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 *  Download microcode</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8192; i++)</div><div class='del'>-			smw_putmem(devc, mp_base, i, smw_ucode[i]);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 *  Verify microcode</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8192; i++)</div><div class='del'>-			if (smw_getmem(devc, mp_base, i) != smw_ucode[i])</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "SM Wave: Microcode verification failed\n");</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-	control = 0;</div><div class='del'>-#ifdef SMW_SCSI_IRQ</div><div class='del'>-	/*</div><div class='del'>-	 * Set the SCSI interrupt (IRQ2/9, IRQ3 or IRQ10). The SCSI interrupt</div><div class='del'>-	 * is disabled by default.</div><div class='del'>-	 *</div><div class='del'>-	 * FIXME - make this a module option</div><div class='del'>-	 *</div><div class='del'>-	 * BTW the Zilog 5380 SCSI controller is located at MPU base + 0x10.</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-		static unsigned char scsi_irq_bits[] = {</div><div class='del'>-			0, 0, 3, 1, 0, 0, 0, 0, 0, 3, 2, 0, 0, 0, 0, 0</div><div class='del'>-		};</div><div class='del'>-		control |= scsi_irq_bits[SMW_SCSI_IRQ] &lt;&lt; 6;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SMW_OPL4_ENABLE</div><div class='del'>-	/*</div><div class='del'>-	 *  Make the OPL4 chip visible on the PC bus at 0x380.</div><div class='del'>-	 *</div><div class='del'>-	 *  There is no need to enable this feature since this driver</div><div class='del'>-	 *  doesn't support OPL4 yet. Also there is no RAM in SM Wave so</div><div class='del'>-	 *  enabling OPL4 is pretty useless.</div><div class='del'>-	 */</div><div class='del'>-	control |= 0x10;	/* Uses IRQ12 if bit 0x20 == 0 */</div><div class='del'>-	/* control |= 0x20;      Uncomment this if you want to use IRQ7 */</div><div class='del'>-#endif</div><div class='del'>-	outb((control | 0x03), mpu_base + 7);	/* xxxxxx11 restarts */</div><div class='del'>-	hw_config-&gt;name = "SoundMan Wave";</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_Jazz16_midi(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int mpu_base = hw_config-&gt;io_base;</div><div class='del'>-	int sb_base = devc-&gt;base;</div><div class='del'>-	int irq = hw_config-&gt;irq;</div><div class='del'>-</div><div class='del'>-	unsigned char bits = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (irq &lt; 0)</div><div class='del'>-		irq *= -1;</div><div class='del'>-</div><div class='del'>-	if (irq &lt; 1 || irq &gt; 15 ||</div><div class='del'>-	    jazz_irq_bits[irq] == 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "Jazz16: Invalid MIDI interrupt (IRQ%d)\n", irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	switch (sb_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x220:</div><div class='del'>-			bits = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 0x240:</div><div class='del'>-			bits = 2;</div><div class='del'>-			break;</div><div class='del'>-		case 0x260:</div><div class='del'>-			bits = 3;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	bits = jazz16_bits = bits &lt;&lt; 5;</div><div class='del'>-	switch (mpu_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x310:</div><div class='del'>-			bits |= 1;</div><div class='del'>-			break;</div><div class='del'>-		case 0x320:</div><div class='del'>-			bits |= 2;</div><div class='del'>-			break;</div><div class='del'>-		case 0x330:</div><div class='del'>-			bits |= 3;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_ERR "Jazz16: Invalid MIDI I/O port %x\n", mpu_base);</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 *	Magic wake up sequence by writing to 0x201 (aka Joystick port)</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;jazz16_lock, flags);</div><div class='del'>-	outb(0xAF, 0x201);</div><div class='del'>-	outb(0x50, 0x201);</div><div class='del'>-	outb(bits, 0x201);</div><div class='del'>-	spin_unlock_irqrestore(&amp;jazz16_lock, flags);</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;name = "Jazz16";</div><div class='del'>-	smw_midi_init(devc, hw_config);</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, 0xfb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, jazz_dma_bits[devc-&gt;dma8] |</div><div class='del'>-			    (jazz_dma_bits[devc-&gt;dma16] &lt;&lt; 4)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, jazz_irq_bits[devc-&gt;irq] |</div><div class='del'>-			    (jazz_irq_bits[irq] &lt;&lt; 4)))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int probe_sbmpu(struct address_info *hw_config, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = last_devc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (last_devc == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	last_devc = NULL;</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;io_base &lt;= 0)</div><div class='del'>-	{</div><div class='del'>-		/* The real vibra16 is fine about this, but we have to go</div><div class='del'>-		   wipe up after Cyrix again */</div><div class='del'>-		   	   </div><div class='del'>-		if(devc-&gt;model == MDL_SB16 &amp;&amp; devc-&gt;minor &gt;= 12)</div><div class='del'>-		{</div><div class='del'>-			unsigned char   bits = sb_getmixer(devc, 0x84) &amp; ~0x06;</div><div class='del'>-			sb_setmixer(devc, 0x84, bits | 0x02);		/* Disable MPU */</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_SOUND_MPU401)</div><div class='del'>-	if (devc-&gt;model == MDL_ESS)</div><div class='del'>-	{</div><div class='del'>-		struct resource *ports;</div><div class='del'>-		ports = request_region(hw_config-&gt;io_base, 2, "mpu401");</div><div class='del'>-		if (!ports) {</div><div class='del'>-			printk(KERN_ERR "sbmpu: I/O port conflict (%x)\n", hw_config-&gt;io_base);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (!ess_midi_init(devc, hw_config)) {</div><div class='del'>-			release_region(hw_config-&gt;io_base, 2);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		hw_config-&gt;name = "ESS1xxx MPU";</div><div class='del'>-		devc-&gt;midi_irq_cookie = NULL;</div><div class='del'>-		if (!probe_mpu401(hw_config, ports)) {</div><div class='del'>-			release_region(hw_config-&gt;io_base, 2);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		attach_mpu401(hw_config, owner);</div><div class='del'>-		if (last_sb-&gt;irq == -hw_config-&gt;irq)</div><div class='del'>-			last_sb-&gt;midi_irq_cookie =</div><div class='del'>-				(void *)(long) hw_config-&gt;slots[1];</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MDL_SB16:</div><div class='del'>-			if (hw_config-&gt;io_base != 0x300 &amp;&amp; hw_config-&gt;io_base != 0x330)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "SB16: Invalid MIDI port %x\n", hw_config-&gt;io_base);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			hw_config-&gt;name = "Sound Blaster 16";</div><div class='del'>-			if (hw_config-&gt;irq &lt; 3 || hw_config-&gt;irq == devc-&gt;irq)</div><div class='del'>-				hw_config-&gt;irq = -devc-&gt;irq;</div><div class='del'>-			if (devc-&gt;minor &gt; 12)		/* What is Vibra's version??? */</div><div class='del'>-				sb16_set_mpu_port(devc, hw_config);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_JAZZ:</div><div class='del'>-			if (hw_config-&gt;irq &lt; 3 || hw_config-&gt;irq == devc-&gt;irq)</div><div class='del'>-				hw_config-&gt;irq = -devc-&gt;irq;</div><div class='del'>-			if (!init_Jazz16_midi(devc, hw_config))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_YMPCI:</div><div class='del'>-			hw_config-&gt;name = "Yamaha PCI Legacy";</div><div class='del'>-			printk("Yamaha PCI legacy UART401 check.\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = probe_uart401(hw_config, owner);</div><div class='del'>-	if (ret)</div><div class='del'>-		last_sb-&gt;midi_irq_cookie=midi_devs[hw_config-&gt;slots[4]]-&gt;devc;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unload_sbmpu(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-#if defined(CONFIG_SOUND_MPU401)</div><div class='del'>-	if (!strcmp (hw_config-&gt;name, "ESS1xxx MPU")) {</div><div class='del'>-		unload_mpu401(hw_config);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	unload_uart401(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(sb_dsp_init);</div><div class='del'>-EXPORT_SYMBOL(sb_dsp_detect);</div><div class='del'>-EXPORT_SYMBOL(sb_dsp_unload);</div><div class='del'>-EXPORT_SYMBOL(sb_be_quiet);</div><div class='del'>-EXPORT_SYMBOL(probe_sbmpu);</div><div class='del'>-EXPORT_SYMBOL(unload_sbmpu);</div><div class='del'>-EXPORT_SYMBOL(smw_free);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c<br/>deleted file mode 100644<br/>index 9890cf2066ff..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_ess.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_ess.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1831 +0,0 @@</div><div class='del'>-#undef FKS_LOGGING</div><div class='del'>-#undef FKS_TEST</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * tabs should be 4 spaces, in vi(m): set tabstop=4</div><div class='del'>- *</div><div class='del'>- * TODO: 	consistency speed calculations!!</div><div class='del'>- *			cleanup!</div><div class='del'>- * ????:	Did I break MIDI support?</div><div class='del'>- *</div><div class='del'>- * History:</div><div class='del'>- *</div><div class='del'>- * Rolf Fokkens	 (Dec 20 1998):	ES188x recording level support on a per</div><div class='del'>- * fokkensr@vertis.nl			input basis.</div><div class='del'>- *				 (Dec 24 1998):	Recognition of ES1788, ES1887, ES1888,</div><div class='del'>- *								ES1868, ES1869 and ES1878. Could be used for</div><div class='del'>- *								specific handling in the future. All except</div><div class='del'>- *								ES1887 and ES1888 and ES688 are handled like</div><div class='del'>- *								ES1688.</div><div class='del'>- *				 (Dec 27 1998):	RECLEV for all (?) ES1688+ chips. ES188x now</div><div class='del'>- *								have the "Dec 20" support + RECLEV</div><div class='del'>- *				 (Jan  2 1999):	Preparation for Full Duplex. This means</div><div class='del'>- *								Audio 2 is now used for playback when dma16</div><div class='del'>- *								is specified. The next step would be to use</div><div class='del'>- *								Audio 1 and Audio 2 at the same time.</div><div class='del'>- *				 (Jan  9 1999):	Put all ESS stuff into sb_ess.[ch], this</div><div class='del'>- *								includes both the ESS stuff that has been in</div><div class='del'>- *								sb_*[ch] before I touched it and the ESS support</div><div class='del'>- *								I added later</div><div class='del'>- *				 (Jan 23 1999):	Full Duplex seems to work. I wrote a small</div><div class='del'>- *								test proggy which works OK. Haven't found</div><div class='del'>- *								any applications to test it though. So why did</div><div class='del'>- *								I bother to create it anyway?? :) Just for</div><div class='del'>- *								fun.</div><div class='del'>- *				 (May  2 1999):	I tried to be too smart by "introducing"</div><div class='del'>- *								ess_calc_best_speed (). The idea was that two</div><div class='del'>- *								dividers could be used to setup a samplerate,</div><div class='del'>- *								ess_calc_best_speed () would choose the best.</div><div class='del'>- *								This works for playback, but results in</div><div class='del'>- *								recording problems for high samplerates. I</div><div class='del'>- *								fixed this by removing ess_calc_best_speed ()</div><div class='del'>- *								and just doing what the documentation says. </div><div class='del'>- * Andy Sloane   (Jun  4 1999): Stole some code from ALSA to fix the playback</div><div class='del'>- * andy@guildsoftware.com		speed on ES1869, ES1879, ES1887, and ES1888.</div><div class='del'>- * 								1879's were previously ignored by this driver;</div><div class='del'>- * 								added (untested) support for those.</div><div class='del'>- * Cvetan Ivanov (Oct 27 1999): Fixed ess_dsp_init to call ess_set_dma_hw for</div><div class='del'>- * zezo@inet.bg					_ALL_ ESS models, not only ES1887</div><div class='del'>- *</div><div class='del'>- * This files contains ESS chip specifics. It's based on the existing ESS</div><div class='del'>- * handling as it resided in sb_common.c, sb_mixer.c and sb_audio.c. This</div><div class='del'>- * file adds features like:</div><div class='del'>- * - Chip Identification (as shown in /proc/sound)</div><div class='del'>- * - RECLEV support for ES1688 and later</div><div class='del'>- * - 6 bits playback level support chips later than ES1688</div><div class='del'>- * - Recording level support on a per-device basis for ES1887</div><div class='del'>- * - Full-Duplex for ES1887</div><div class='del'>- *</div><div class='del'>- * Full duplex is enabled by specifying dma16. While the normal dma must</div><div class='del'>- * be one of 0, 1 or 3, dma16 can be one of 0, 1, 3 or 5. DMA 5 is a 16 bit</div><div class='del'>- * DMA channel, while the others are 8 bit..</div><div class='del'>- *</div><div class='del'>- * ESS detection isn't full proof (yet). If it fails an additional module</div><div class='del'>- * parameter esstype can be specified to be one of the following:</div><div class='del'>- * -1, 0, 688, 1688, 1868, 1869, 1788, 1887, 1888</div><div class='del'>- * -1 means: mimic 2.0 behaviour, </div><div class='del'>- *  0 means: auto detect.</div><div class='del'>- *   others: explicitly specify chip</div><div class='del'>- * -1 is default, cause auto detect still doesn't work.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * About the documentation</div><div class='del'>- *</div><div class='del'>- * I don't know if the chips all are OK, but the documentation is buggy. 'cause</div><div class='del'>- * I don't have all the cips myself, there's a lot I cannot verify. I'll try to</div><div class='del'>- * keep track of my latest insights about his here. If you have additional info,</div><div class='del'>- * please enlighten me (fokkensr@vertis.nl)!</div><div class='del'>- *</div><div class='del'>- * I had the impression that ES1688 also has 6 bit master volume control. The</div><div class='del'>- * documentation about ES1888 (rev C, october '95) claims that ES1888 has</div><div class='del'>- * the following features ES1688 doesn't have:</div><div class='del'>- * - 6 bit master volume</div><div class='del'>- * - Full Duplex</div><div class='del'>- * So ES1688 apparently doesn't have 6 bit master volume control, but the</div><div class='del'>- * ES1688 does have RECLEV control. Makes me wonder: does ES688 have it too?</div><div class='del'>- * Without RECLEV ES688 won't be much fun I guess.</div><div class='del'>- *</div><div class='del'>- * From the ES1888 (rev C, october '95) documentation I got the impression</div><div class='del'>- * that registers 0x68 to 0x6e don't exist which means: no recording volume</div><div class='del'>- * controls. To my surprise the ES888 documentation (1/14/96) claims that</div><div class='del'>- * ES888 does have these record mixer registers, but that ES1888 doesn't have</div><div class='del'>- * 0x69 and 0x6b. So the rest should be there.</div><div class='del'>- *</div><div class='del'>- * I'm trying to get ES1887 Full Duplex. Audio 2 is playback only, while Audio 2</div><div class='del'>- * is both record and playback. I think I should use Audio 2 for all playback.</div><div class='del'>- *</div><div class='del'>- * The documentation is an adventure: it's close but not fully accurate. I</div><div class='del'>- * found out that after a reset some registers are *NOT* reset, though the</div><div class='del'>- * docs say the would be. Interesting ones are 0x7f, 0x7d and 0x7a. They are</div><div class='del'>- * related to the Audio 2 channel. I also was surprised about the consequences</div><div class='del'>- * of writing 0x00 to 0x7f (which should be done by reset): The ES1887 moves</div><div class='del'>- * into ES1888 mode. This means that it claims IRQ 11, which happens to be my</div><div class='del'>- * ISDN adapter. Needless to say it no longer worked. I now understand why</div><div class='del'>- * after rebooting 0x7f already was 0x05, the value of my choice: the BIOS</div><div class='del'>- * did it.</div><div class='del'>- *</div><div class='del'>- * Oh, and this is another trap: in ES1887 docs mixer register 0x70 is</div><div class='del'>- * described as if it's exactly the same as register 0xa1. This is *NOT* true.</div><div class='del'>- * The description of 0x70 in ES1869 docs is accurate however.</div><div class='del'>- * Well, the assumption about ES1869 was wrong: register 0x70 is very much</div><div class='del'>- * like register 0xa1, except that bit 7 is always 1, whatever you want</div><div class='del'>- * it to be.</div><div class='del'>- *</div><div class='del'>- * When using audio 2 mixer register 0x72 seems te be meaningless. Only 0xa2</div><div class='del'>- * has effect.</div><div class='del'>- *</div><div class='del'>- * Software reset not being able to reset all registers is great! Especially</div><div class='del'>- * the fact that register 0x78 isn't reset is great when you wanna change back</div><div class='del'>- * to single dma operation (simplex): audio 2 is still operational, and uses</div><div class='del'>- * the same dma as audio 1: your ess changes into a funny echo machine.</div><div class='del'>- *</div><div class='del'>- * Received the news that ES1688 is detected as a ES1788. Did some thinking:</div><div class='del'>- * the ES1887 detection scheme suggests in step 2 to try if bit 3 of register</div><div class='del'>- * 0x64 can be changed. This is inaccurate, first I inverted the * check: "If</div><div class='del'>- * can be modified, it's a 1688", which lead to a correct detection</div><div class='del'>- * of my ES1887. It resulted however in bad detection of 1688 (reported by mail)</div><div class='del'>- * and 1868 (if no PnP detection first): they result in a 1788 being detected.</div><div class='del'>- * I don't have docs on 1688, but I do have docs on 1868: The documentation is</div><div class='del'>- * probably inaccurate in the fact that I should check bit 2, not bit 3. This</div><div class='del'>- * is what I do now.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * About recognition of ESS chips</div><div class='del'>- *</div><div class='del'>- * The distinction of ES688, ES1688, ES1788, ES1887 and ES1888 is described in</div><div class='del'>- * a (preliminary ??) datasheet on ES1887. Its aim is to identify ES1887, but</div><div class='del'>- * during detection the text claims that "this chip may be ..." when a step</div><div class='del'>- * fails. This scheme is used to distinct between the above chips.</div><div class='del'>- * It appears however that some PnP chips like ES1868 are recognized as ES1788</div><div class='del'>- * by the ES1887 detection scheme. These PnP chips can be detected in another</div><div class='del'>- * way however: ES1868, ES1869 and ES1878 can be recognized (full proof I think)</div><div class='del'>- * by repeatedly reading mixer register 0x40. This is done by ess_identify in</div><div class='del'>- * sb_common.c.</div><div class='del'>- * This results in the following detection steps:</div><div class='del'>- * - distinct between ES688 and ES1688+ (as always done in this driver)</div><div class='del'>- *   if ES688 we're ready</div><div class='del'>- * - try to detect ES1868, ES1869 or ES1878</div><div class='del'>- *   if successful we're ready</div><div class='del'>- * - try to detect ES1888, ES1887 or ES1788</div><div class='del'>- *   if successful we're ready</div><div class='del'>- * - Dunno. Must be 1688. Will do in general</div><div class='del'>- *</div><div class='del'>- * About RECLEV support:</div><div class='del'>- *</div><div class='del'>- * The existing ES1688 support didn't take care of the ES1688+ recording</div><div class='del'>- * levels very well. Whenever a device was selected (recmask) for recording</div><div class='del'>- * its recording level was loud, and it couldn't be changed. The fact that</div><div class='del'>- * internal register 0xb4 could take care of RECLEV, didn't work meaning until</div><div class='del'>- * its value was restored every time the chip was reset; this reset the</div><div class='del'>- * value of 0xb4 too. I guess that's what 4front also had (have?) trouble with.</div><div class='del'>- *</div><div class='del'>- * About ES1887 support:</div><div class='del'>- *</div><div class='del'>- * The ES1887 has separate registers to control the recording levels, for all</div><div class='del'>- * inputs. The ES1887 specific software makes these levels the same as their</div><div class='del'>- * corresponding playback levels, unless recmask says they aren't recorded. In</div><div class='del'>- * the latter case the recording volumes are 0.</div><div class='del'>- * Now recording levels of inputs can be controlled, by changing the playback</div><div class='del'>- * levels. Futhermore several devices can be recorded together (which is not</div><div class='del'>- * possible with the ES1688).</div><div class='del'>- * Besides the separate recording level control for each input, the common</div><div class='del'>- * recording level can also be controlled by RECLEV as described above.</div><div class='del'>- *</div><div class='del'>- * Not only ES1887 have this recording mixer. I know the following from the</div><div class='del'>- * documentation:</div><div class='del'>- * ES688	no</div><div class='del'>- * ES1688	no</div><div class='del'>- * ES1868	no</div><div class='del'>- * ES1869	yes</div><div class='del'>- * ES1878	no</div><div class='del'>- * ES1879	yes</div><div class='del'>- * ES1888	no/yes	Contradicting documentation; most recent: yes</div><div class='del'>- * ES1946	yes		This is a PCI chip; not handled by this driver</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sb_mixer.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-</div><div class='del'>-#include "sb_ess.h"</div><div class='del'>-</div><div class='del'>-#define ESSTYPE_LIKE20	-1		/* Mimic 2.0 behaviour					*/</div><div class='del'>-#define ESSTYPE_DETECT	0		/* Mimic 2.0 behaviour					*/</div><div class='del'>-</div><div class='del'>-#define SUBMDL_ES1788	0x10	/* Subtype ES1788 for specific handling */</div><div class='del'>-#define SUBMDL_ES1868	0x11	/* Subtype ES1868 for specific handling */</div><div class='del'>-#define SUBMDL_ES1869	0x12	/* Subtype ES1869 for specific handling */</div><div class='del'>-#define SUBMDL_ES1878	0x13	/* Subtype ES1878 for specific handling */</div><div class='del'>-#define SUBMDL_ES1879	0x16    /* ES1879 was initially forgotten */</div><div class='del'>-#define SUBMDL_ES1887	0x14	/* Subtype ES1887 for specific handling */</div><div class='del'>-#define SUBMDL_ES1888	0x15	/* Subtype ES1888 for specific handling */</div><div class='del'>-</div><div class='del'>-#define SB_CAP_ES18XX_RATE 0x100</div><div class='del'>-</div><div class='del'>-#define ES1688_CLOCK1 795444 /* 128 - div */</div><div class='del'>-#define ES1688_CLOCK2 397722 /* 256 - div */</div><div class='del'>-#define ES18XX_CLOCK1 793800 /* 128 - div */</div><div class='del'>-#define ES18XX_CLOCK2 768000 /* 256 - div */</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-static void ess_show_mixerregs (sb_devc *devc);</div><div class='del'>-#endif</div><div class='del'>-static int ess_read (sb_devc * devc, unsigned char reg);</div><div class='del'>-static int ess_write (sb_devc * devc, unsigned char reg, unsigned char data);</div><div class='del'>-static void ess_chgmixer</div><div class='del'>-	(sb_devc * devc, unsigned int reg, unsigned int mask, unsigned int val);</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- *																			*</div><div class='del'>- *									ESS audio								*</div><div class='del'>- *																			*</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-struct ess_command {short cmd; short data;};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Commands for initializing Audio 1 for input (record)</div><div class='del'>- */</div><div class='del'>-static struct ess_command ess_i08m[] =		/* input 8 bit mono */</div><div class='del'>-	{ {0xb7, 0x51}, {0xb7, 0xd0}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_i16m[] =		/* input 16 bit mono */</div><div class='del'>-	{ {0xb7, 0x71}, {0xb7, 0xf4}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_i08s[] =		/* input 8 bit stereo */</div><div class='del'>-	{ {0xb7, 0x51}, {0xb7, 0x98}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_i16s[] =		/* input 16 bit stereo */</div><div class='del'>-	{ {0xb7, 0x71}, {0xb7, 0xbc}, {-1, 0} };</div><div class='del'>-</div><div class='del'>-static struct ess_command *ess_inp_cmds[] =</div><div class='del'>-	{ ess_i08m, ess_i16m, ess_i08s, ess_i16s };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Commands for initializing Audio 1 for output (playback)</div><div class='del'>- */</div><div class='del'>-static struct ess_command ess_o08m[] =		/* output 8 bit mono */</div><div class='del'>-	{ {0xb6, 0x80}, {0xb7, 0x51}, {0xb7, 0xd0}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_o16m[] =		/* output 16 bit mono */</div><div class='del'>-	{ {0xb6, 0x00}, {0xb7, 0x71}, {0xb7, 0xf4}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_o08s[] =		/* output 8 bit stereo */</div><div class='del'>-	{ {0xb6, 0x80}, {0xb7, 0x51}, {0xb7, 0x98}, {-1, 0} };</div><div class='del'>-static struct ess_command ess_o16s[] =		/* output 16 bit stereo */</div><div class='del'>-	{ {0xb6, 0x00}, {0xb7, 0x71}, {0xb7, 0xbc}, {-1, 0} };</div><div class='del'>-</div><div class='del'>-static struct ess_command *ess_out_cmds[] =</div><div class='del'>-	{ ess_o08m, ess_o16m, ess_o08s, ess_o16s };</div><div class='del'>-</div><div class='del'>-static void ess_exec_commands</div><div class='del'>-	(sb_devc *devc, struct ess_command *cmdtab[])</div><div class='del'>-{</div><div class='del'>-	struct ess_command *cmd;</div><div class='del'>-</div><div class='del'>-	cmd = cmdtab [ ((devc-&gt;channels != 1) &lt;&lt; 1) + (devc-&gt;bits != AFMT_U8) ];</div><div class='del'>-</div><div class='del'>-	while (cmd-&gt;cmd != -1) {</div><div class='del'>-		ess_write (devc, cmd-&gt;cmd, cmd-&gt;data);</div><div class='del'>-		cmd++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_change</div><div class='del'>-	(sb_devc *devc, unsigned int reg, unsigned int mask, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	value = ess_read (devc, reg);</div><div class='del'>-	value = (value &amp; ~mask) | (val &amp; mask);</div><div class='del'>-	ess_write (devc, reg, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_set_output_parms</div><div class='del'>-	(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		devc-&gt;trg_buf_16 = buf;</div><div class='del'>-		devc-&gt;trg_bytes_16 = nr_bytes;</div><div class='del'>-		devc-&gt;trg_intrflag_16 = intrflag;</div><div class='del'>-		devc-&gt;irq_mode_16 = IMODE_OUTPUT;</div><div class='del'>-	} else {</div><div class='del'>-		devc-&gt;trg_buf = buf;</div><div class='del'>-		devc-&gt;trg_bytes = nr_bytes;</div><div class='del'>-		devc-&gt;trg_intrflag = intrflag;</div><div class='del'>-		devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_set_input_parms</div><div class='del'>-	(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	devc-&gt;trg_buf = buf;</div><div class='del'>-	devc-&gt;trg_bytes = count;</div><div class='del'>-	devc-&gt;trg_intrflag = intrflag;</div><div class='del'>-	devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_calc_div (int clock, int revert, int *speedp, int *diffp)</div><div class='del'>-{</div><div class='del'>-	int divider;</div><div class='del'>-	int speed, diff;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	speed   = *speedp;</div><div class='del'>-	divider = (clock + speed / 2) / speed;</div><div class='del'>-	retval  = revert - divider;</div><div class='del'>-	if (retval &gt; revert - 1) {</div><div class='del'>-		retval  = revert - 1;</div><div class='del'>-		divider = revert - retval;</div><div class='del'>-	}</div><div class='del'>-	/* This line is suggested. Must be wrong I think</div><div class='del'>-	*speedp = (clock + divider / 2) / divider;</div><div class='del'>-	So I chose the next one */</div><div class='del'>-</div><div class='del'>-	*speedp	= clock / divider;</div><div class='del'>-	diff	= speed - *speedp;</div><div class='del'>-	if (diff &lt; 0) diff =-diff;</div><div class='del'>-	*diffp  = diff;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_calc_best_speed</div><div class='del'>-	(int clock1, int rev1, int clock2, int rev2, int *divp, int *speedp)</div><div class='del'>-{</div><div class='del'>-	int speed1 = *speedp, speed2 = *speedp;</div><div class='del'>-	int div1, div2;</div><div class='del'>-	int diff1, diff2;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	div1 = ess_calc_div (clock1, rev1, &amp;speed1, &amp;diff1);</div><div class='del'>-	div2 = ess_calc_div (clock2, rev2, &amp;speed2, &amp;diff2);</div><div class='del'>-</div><div class='del'>-	if (diff1 &lt; diff2) {</div><div class='del'>-		*divp   = div1;</div><div class='del'>-		*speedp = speed1;</div><div class='del'>-		retval  = 1;</div><div class='del'>-	} else {</div><div class='del'>-	/*	*divp   = div2; */</div><div class='del'>-		*divp   = 0x80 | div2;</div><div class='del'>-		*speedp = speed2;</div><div class='del'>-		retval  = 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Depending on the audiochannel ESS devices can</div><div class='del'>- * have different clock settings. These are made consistent for duplex</div><div class='del'>- * however.</div><div class='del'>- * callers of ess_speed only do an audionum suggestion, which means</div><div class='del'>- * input suggests 1, output suggests 2. This suggestion is only true</div><div class='del'>- * however when doing duplex.</div><div class='del'>- */</div><div class='del'>-static void ess_common_speed (sb_devc *devc, int *speedp, int *divp)</div><div class='del'>-{</div><div class='del'>-	int diff = 0, div;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		/*</div><div class='del'>-		 * The 0x80 is important for the first audio channel</div><div class='del'>-		 */</div><div class='del'>-		if (devc-&gt;submodel == SUBMDL_ES1888) {</div><div class='del'>-			div = 0x80 | ess_calc_div (795500, 256, speedp, &amp;diff);</div><div class='del'>-		} else {</div><div class='del'>-			div = 0x80 | ess_calc_div (795500, 128, speedp, &amp;diff);</div><div class='del'>-		}</div><div class='del'>-	} else if(devc-&gt;caps &amp; SB_CAP_ES18XX_RATE) {</div><div class='del'>-		if (devc-&gt;submodel == SUBMDL_ES1888) {</div><div class='del'>-			ess_calc_best_speed(397700, 128, 795500, 256, </div><div class='del'>-						&amp;div, speedp);</div><div class='del'>-		} else {</div><div class='del'>-			ess_calc_best_speed(ES18XX_CLOCK1, 128, ES18XX_CLOCK2, 256, </div><div class='del'>-						&amp;div, speedp);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (*speedp &gt; 22000) {</div><div class='del'>-			div = 0x80 | ess_calc_div (ES1688_CLOCK1, 256, speedp, &amp;diff);</div><div class='del'>-		} else {</div><div class='del'>-			div = 0x00 | ess_calc_div (ES1688_CLOCK2, 128, speedp, &amp;diff);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*divp = div;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_speed (sb_devc *devc, int audionum)</div><div class='del'>-{</div><div class='del'>-	int speed;</div><div class='del'>-	int div, div2;</div><div class='del'>-</div><div class='del'>-	ess_common_speed (devc, &amp;(devc-&gt;speed), &amp;div);</div><div class='del'>-</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk (KERN_INFO "FKS: ess_speed (%d) b speed = %d, div=%x\n", audionum, devc-&gt;speed, div);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Set filter roll-off to 90% of speed/2 */</div><div class='del'>-	speed = (devc-&gt;speed * 9) / 20;</div><div class='del'>-</div><div class='del'>-	div2 = 256 - 7160000 / (speed * 82);</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;duplex) audionum = 1;</div><div class='del'>-</div><div class='del'>-	if (audionum == 1) {</div><div class='del'>-		/* Change behaviour of register A1 *</div><div class='del'>-		sb_chg_mixer(devc, 0x71, 0x20, 0x20)</div><div class='del'>-		* For ES1869 only??? */</div><div class='del'>-		ess_write (devc, 0xa1, div);</div><div class='del'>-		ess_write (devc, 0xa2, div2);</div><div class='del'>-	} else {</div><div class='del'>-		ess_setmixer (devc, 0x70, div);</div><div class='del'>-		/*</div><div class='del'>-		 * FKS: fascinating: 0x72 doesn't seem to work.</div><div class='del'>-		 */</div><div class='del'>-		ess_write (devc, 0xa2, div2);</div><div class='del'>-		ess_setmixer (devc, 0x72, div2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	ess_speed(devc, 1);</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKOFF);</div><div class='del'>-</div><div class='del'>-	ess_write (devc, 0xb8, 0x0e);	/* Auto init DMA mode */</div><div class='del'>-	ess_change (devc, 0xa8, 0x03, 3 - devc-&gt;channels);	/* Mono/stereo */</div><div class='del'>-	ess_write (devc, 0xb9, 2);	/* Demand mode (4 bytes/DMA request) */</div><div class='del'>-</div><div class='del'>-	ess_exec_commands (devc, ess_inp_cmds);</div><div class='del'>-</div><div class='del'>-	ess_change (devc, 0xb1, 0xf0, 0x50);</div><div class='del'>-	ess_change (devc, 0xb2, 0xf0, 0x50);</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_audio_prepare_for_output_audio1 (int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-	ess_speed(devc, 1);</div><div class='del'>-	ess_write (devc, 0xb8, 4);	/* Auto init DMA mode */</div><div class='del'>-	ess_change (devc, 0xa8, 0x03, 3 - devc-&gt;channels);	/* Mono/stereo */</div><div class='del'>-	ess_write (devc, 0xb9, 2);	/* Demand mode (4 bytes/request) */</div><div class='del'>-</div><div class='del'>-	ess_exec_commands (devc, ess_out_cmds);</div><div class='del'>-</div><div class='del'>-	ess_change (devc, 0xb1, 0xf0, 0x50);	/* Enable DMA */</div><div class='del'>-	ess_change (devc, 0xb2, 0xf0, 0x50);	/* Enable IRQ */</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, DSP_CMD_SPKON);	/* There be sound! */</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_audio_prepare_for_output_audio2 (int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-/* FKS: qqq</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Auto-Initialize:</div><div class='del'>-	 * DMA mode + demand mode (8 bytes/request, yes I want it all!)</div><div class='del'>-	 * But leave 16-bit DMA bit untouched!</div><div class='del'>-	 */</div><div class='del'>-	ess_chgmixer (devc, 0x78, 0xd0, 0xd0);</div><div class='del'>-</div><div class='del'>-	ess_speed(devc, 2);</div><div class='del'>-</div><div class='del'>-	/* bits 4:3 on ES1887 represent recording source. Keep them! */</div><div class='del'>-	bits = ess_getmixer (devc, 0x7a) &amp; 0x18;</div><div class='del'>-</div><div class='del'>-	/* Set stereo/mono */</div><div class='del'>-	if (devc-&gt;channels != 1) bits |= 0x02;</div><div class='del'>-</div><div class='del'>-	/* Init DACs; UNSIGNED mode for 8 bit; SIGNED mode for 16 bit */</div><div class='del'>-	if (devc-&gt;bits != AFMT_U8) bits |= 0x05;	/* 16 bit */</div><div class='del'>-</div><div class='del'>-	/* Enable DMA, IRQ will be shared (hopefully)*/</div><div class='del'>-	bits |= 0x60;</div><div class='del'>-</div><div class='del'>-	ess_setmixer (devc, 0x7a, bits);</div><div class='del'>-</div><div class='del'>-	ess_mixer_reload (devc, SOUND_MIXER_PCM);	/* There be sound! */</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk(KERN_INFO "ess_audio_prepare_for_output: dma_out=%d,dma_in=%d\n"</div><div class='del'>-, audio_devs[dev]-&gt;dmap_out-&gt;dma, audio_devs[dev]-&gt;dmap_in-&gt;dma);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		return ess_audio_prepare_for_output_audio2 (dev, bsize, bcount);</div><div class='del'>-	} else {</div><div class='del'>-		return ess_audio_prepare_for_output_audio1 (dev, bsize, bcount);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_audio_halt_xfer(int dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Audio 2 may still be operational! Creates awful sounds!</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;duplex) ess_chgmixer(devc, 0x78, 0x03, 0x00);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_audio_start_input</div><div class='del'>-	(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	short c = -nr_bytes;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Start a DMA input to the buffer pointed by dmaqtail</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_in-&gt;dma &gt; 3) count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_INPUT;</div><div class='del'>-</div><div class='del'>-	ess_write (devc, 0xa4, (unsigned char) ((unsigned short) c &amp; 0xff));</div><div class='del'>-	ess_write (devc, 0xa5, (unsigned char) (((unsigned short) c &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	ess_change (devc, 0xb8, 0x0f, 0x0f);	/* Go */</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_audio_output_block_audio1</div><div class='del'>-	(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	short c = -nr_bytes;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	ess_write (devc, 0xa4, (unsigned char) ((unsigned short) c &amp; 0xff));</div><div class='del'>-	ess_write (devc, 0xa5, (unsigned char) (((unsigned short) c &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-</div><div class='del'>-	ess_change (devc, 0xb8, 0x05, 0x05);	/* Go */</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_audio_output_block_audio2</div><div class='del'>-	(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	int count = nr_bytes;</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	short c = -nr_bytes;</div><div class='del'>-</div><div class='del'>-	if (audio_devs[dev]-&gt;dmap_out-&gt;dma &gt; 3) count &gt;&gt;= 1;</div><div class='del'>-	count--;</div><div class='del'>-</div><div class='del'>-	ess_setmixer (devc, 0x74, (unsigned char) ((unsigned short) c &amp; 0xff));</div><div class='del'>-	ess_setmixer (devc, 0x76, (unsigned char) (((unsigned short) c &gt;&gt; 8) &amp; 0xff));</div><div class='del'>-	ess_chgmixer (devc, 0x78, 0x03, 0x03);   /* Go */</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode_16 = IMODE_OUTPUT;</div><div class='del'>-		devc-&gt;intr_active_16 = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_audio_output_block</div><div class='del'>-	(int dev, unsigned long buf, int nr_bytes, int intrflag)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		ess_audio_output_block_audio2 (dev, buf, nr_bytes, intrflag);</div><div class='del'>-	} else {</div><div class='del'>-		ess_audio_output_block_audio1 (dev, buf, nr_bytes, intrflag);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS: the if-statements for both bits and bits_16 are quite alike.</div><div class='del'>- * Combine this...</div><div class='del'>- */</div><div class='del'>-static void ess_audio_trigger(int dev, int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	int bits_16 = bits &amp; devc-&gt;irq_mode_16;</div><div class='del'>-	bits &amp;= devc-&gt;irq_mode;</div><div class='del'>-</div><div class='del'>-	if (!bits &amp;&amp; !bits_16) {</div><div class='del'>-		/* FKS oh oh.... wrong?? for dma 16? */</div><div class='del'>-		sb_dsp_command(devc, 0xd0);	/* Halt DMA */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bits) {</div><div class='del'>-		switch (devc-&gt;irq_mode)</div><div class='del'>-		{</div><div class='del'>-			case IMODE_INPUT:</div><div class='del'>-				ess_audio_start_input(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-					devc-&gt;trg_intrflag);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case IMODE_OUTPUT:</div><div class='del'>-				ess_audio_output_block(dev, devc-&gt;trg_buf, devc-&gt;trg_bytes,</div><div class='del'>-					devc-&gt;trg_intrflag);</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bits_16) {</div><div class='del'>-		switch (devc-&gt;irq_mode_16) {</div><div class='del'>-		case IMODE_INPUT:</div><div class='del'>-			ess_audio_start_input(dev, devc-&gt;trg_buf_16, devc-&gt;trg_bytes_16,</div><div class='del'>-					devc-&gt;trg_intrflag_16);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IMODE_OUTPUT:</div><div class='del'>-			ess_audio_output_block(dev, devc-&gt;trg_buf_16, devc-&gt;trg_bytes_16,</div><div class='del'>-					devc-&gt;trg_intrflag_16);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;trigger_bits = bits | bits_16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_audio_set_speed(int dev, int speed)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-	int minspeed, maxspeed, dummydiv;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 0) {</div><div class='del'>-		minspeed = (devc-&gt;duplex ? 6215  : 5000 );</div><div class='del'>-		maxspeed = (devc-&gt;duplex ? 44100 : 48000);</div><div class='del'>-		if (speed &lt; minspeed) speed = minspeed;</div><div class='del'>-		if (speed &gt; maxspeed) speed = maxspeed;</div><div class='del'>-</div><div class='del'>-		ess_common_speed (devc, &amp;speed, &amp;dummydiv);</div><div class='del'>-</div><div class='del'>-		devc-&gt;speed = speed;</div><div class='del'>-	}</div><div class='del'>-	return devc-&gt;speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS: This is a one-on-one copy of sb1_audio_set_bits</div><div class='del'>- */</div><div class='del'>-static unsigned int ess_audio_set_bits(int dev, unsigned int bits)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (bits != 0) {</div><div class='del'>-		if (bits == AFMT_U8 || bits == AFMT_S16_LE) {</div><div class='del'>-			devc-&gt;bits = bits;</div><div class='del'>-		} else {</div><div class='del'>-			devc-&gt;bits = AFMT_U8;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return devc-&gt;bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS: This is a one-on-one copy of sbpro_audio_set_channels</div><div class='del'>- * (*) Modified it!!</div><div class='del'>- */</div><div class='del'>-static short ess_audio_set_channels(int dev, short channels)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = audio_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (channels == 1 || channels == 2) devc-&gt;channels = channels;</div><div class='del'>-</div><div class='del'>-	return devc-&gt;channels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver ess_audio_driver =   /* ESS ES688/1688 */</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= sb_audio_open,</div><div class='del'>-	.close			= sb_audio_close,</div><div class='del'>-	.output_block		= ess_set_output_parms,</div><div class='del'>-	.start_input		= ess_set_input_parms,</div><div class='del'>-	.prepare_for_input	= ess_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= ess_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= ess_audio_halt_xfer,</div><div class='del'>-	.trigger		= ess_audio_trigger,</div><div class='del'>-	.set_speed		= ess_audio_set_speed,</div><div class='del'>-	.set_bits		= ess_audio_set_bits,</div><div class='del'>-	.set_channels		= ess_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ess_audio_init must be called from sb_audio_init</div><div class='del'>- */</div><div class='del'>-struct audio_driver *ess_audio_init</div><div class='del'>-		(sb_devc *devc, int *audio_flags, int *format_mask)</div><div class='del'>-{</div><div class='del'>-	*audio_flags = DMA_AUTOMODE;</div><div class='del'>-	*format_mask |= AFMT_S16_LE;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		int tmp_dma;</div><div class='del'>-		/*</div><div class='del'>-		 * sb_audio_init thinks dma8 is for playback and</div><div class='del'>-		 * dma16 is for record. Not now! So swap them.</div><div class='del'>-		 */</div><div class='del'>-		tmp_dma		= devc-&gt;dma16;</div><div class='del'>-		devc-&gt;dma16	= devc-&gt;dma8;</div><div class='del'>-		devc-&gt;dma8	= tmp_dma;</div><div class='del'>-</div><div class='del'>-		*audio_flags |= DMA_DUPLEX;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return &amp;ess_audio_driver;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- *																			*</div><div class='del'>- *								ESS common									*</div><div class='del'>- *																			*</div><div class='del'>- ****************************************************************************/</div><div class='del'>-static void ess_handle_channel</div><div class='del'>-	(char *channel, int dev, int intr_active, unsigned char flag, int irq_mode)</div><div class='del'>-{</div><div class='del'>-	if (!intr_active || !flag) return;</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);</div><div class='del'>-#endif</div><div class='del'>-	switch (irq_mode) {</div><div class='del'>-		case IMODE_OUTPUT:</div><div class='del'>-			DMAbuf_outputintr (dev, 1);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IMODE_INPUT:</div><div class='del'>-			DMAbuf_inputintr (dev);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case IMODE_INIT:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-			/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS: TODO!!! Finish this!</div><div class='del'>- *</div><div class='del'>- * I think midi stuff uses uart401, without interrupts.</div><div class='del'>- * So IMODE_MIDI isn't a value for devc-&gt;irq_mode.</div><div class='del'>- */</div><div class='del'>-void ess_intr (sb_devc *devc)</div><div class='del'>-{</div><div class='del'>-	int				status;</div><div class='del'>-	unsigned char	src;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;submodel == SUBMDL_ES1887) {</div><div class='del'>-		src = ess_getmixer (devc, 0x7f) &gt;&gt; 4;</div><div class='del'>-	} else {</div><div class='del'>-		src = 0xff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: sbintr src=%x\n",(int)src);</div><div class='del'>-#endif</div><div class='del'>-	ess_handle_channel</div><div class='del'>-		( "Audio 1"</div><div class='del'>-		, devc-&gt;dev, devc-&gt;intr_active   , src &amp; 0x01, devc-&gt;irq_mode   );</div><div class='del'>-	ess_handle_channel</div><div class='del'>-		( "Audio 2"</div><div class='del'>-		, devc-&gt;dev, devc-&gt;intr_active_16, src &amp; 0x02, devc-&gt;irq_mode_16);</div><div class='del'>-	/*</div><div class='del'>-	 * Acknowledge interrupts</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;submodel == SUBMDL_ES1887 &amp;&amp; (src &amp; 0x02)) {</div><div class='del'>-		ess_chgmixer (devc, 0x7a, 0x80, 0x00);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (src &amp; 0x01) {</div><div class='del'>-		status = inb(DSP_DATA_AVAIL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_extended (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	/* Enable extended mode */</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, 0xc6);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_write (sb_devc * devc, unsigned char reg, unsigned char data)</div><div class='del'>-{</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: write reg %x: %x\n", reg, data);</div><div class='del'>-#endif</div><div class='del'>-	/* Write a byte to an extended mode register of ES1688 */</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, reg))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return sb_dsp_command(devc, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_read (sb_devc * devc, unsigned char reg)</div><div class='del'>-{</div><div class='del'>-	/* Read a byte from an extended mode register of ES1688 */</div><div class='del'>-</div><div class='del'>-	/* Read register command */</div><div class='del'>-	if (!sb_dsp_command(devc, 0xc0)) return -1;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, reg )) return -1;</div><div class='del'>-</div><div class='del'>-	return sb_dsp_get_byte(devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ess_dsp_reset(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int loopc;</div><div class='del'>-</div><div class='del'>-#ifdef FKS_REG_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: ess_dsp_reset 1\n");</div><div class='del'>-ess_show_mixerregs (devc);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	DEB(printk("Entered ess_dsp_reset()\n"));</div><div class='del'>-</div><div class='del'>-	outb(3, DSP_RESET); /* Reset FIFO too */</div><div class='del'>-</div><div class='del'>-	udelay(10);</div><div class='del'>-	outb(0, DSP_RESET);</div><div class='del'>-	udelay(30);</div><div class='del'>-</div><div class='del'>-	for (loopc = 0; loopc &lt; 1000 &amp;&amp; !(inb(DSP_DATA_AVAIL) &amp; 0x80); loopc++);</div><div class='del'>-</div><div class='del'>-	if (inb(DSP_READ) != 0xAA) {</div><div class='del'>-		DDB(printk("sb: No response to RESET\n"));</div><div class='del'>-		return 0;   /* Sorry */</div><div class='del'>-	}</div><div class='del'>-	ess_extended (devc);</div><div class='del'>-</div><div class='del'>-	DEB(printk("sb_dsp_reset() OK\n"));</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: dsp_reset 2\n");</div><div class='del'>-ess_show_mixerregs (devc);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_irq_bits (int irq)</div><div class='del'>-{</div><div class='del'>-	switch (irq) {</div><div class='del'>-	case 2:</div><div class='del'>-	case 9:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case 5:</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	case 7:</div><div class='del'>-		return 2;</div><div class='del'>-</div><div class='del'>-	case 10:</div><div class='del'>-		return 3;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "ESS1688: Invalid IRQ %d\n", irq);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Set IRQ configuration register for all ESS models</div><div class='del'>- */</div><div class='del'>-static int ess_common_set_irq_hw (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int irq_bits;</div><div class='del'>-</div><div class='del'>-	if ((irq_bits = ess_irq_bits (devc-&gt;irq)) == -1) return 0;</div><div class='del'>-</div><div class='del'>-	if (!ess_write (devc, 0xb1, 0x50 | (irq_bits &lt;&lt; 2))) {</div><div class='del'>-		printk(KERN_ERR "ES1688: Failed to write to IRQ config register\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * I wanna use modern ES1887 mixer irq handling. Funny is the</div><div class='del'>- * fact that my BIOS wants the same. But suppose someone's BIOS</div><div class='del'>- * doesn't do this!</div><div class='del'>- * This is independent of duplex. If there's a 1887 this will</div><div class='del'>- * prevent it from going into 1888 mode.</div><div class='del'>- */</div><div class='del'>-static void ess_es1887_set_irq_hw (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int irq_bits;</div><div class='del'>-</div><div class='del'>-	if ((irq_bits = ess_irq_bits (devc-&gt;irq)) == -1) return;</div><div class='del'>-</div><div class='del'>-	ess_chgmixer (devc, 0x7f, 0x0f, 0x01 | ((irq_bits + 1) &lt;&lt; 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_set_irq_hw (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	if (devc-&gt;submodel == SUBMDL_ES1887) ess_es1887_set_irq_hw (devc);</div><div class='del'>-</div><div class='del'>-	return ess_common_set_irq_hw (devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef FKS_TEST</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS_test:</div><div class='del'>- *	for ES1887: 00, 18, non wr bits: 0001 1000</div><div class='del'>- *	for ES1868: 00, b8, non wr bits: 1011 1000</div><div class='del'>- *	for ES1888: 00, f8, non wr bits: 1111 1000</div><div class='del'>- *	for ES1688: 00, f8, non wr bits: 1111 1000</div><div class='del'>- *	+   ES968</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void FKS_test (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int val1, val2;</div><div class='del'>-	val1 = ess_getmixer (devc, 0x64);</div><div class='del'>-	ess_setmixer (devc, 0x64, ~val1);</div><div class='del'>-	val2 = ess_getmixer (devc, 0x64) ^ ~val1;</div><div class='del'>-	ess_setmixer (devc, 0x64, val1);</div><div class='del'>-	val1 ^= ess_getmixer (devc, 0x64);</div><div class='del'>-printk (KERN_INFO "FKS: FKS_test %02x, %02x\n", (val1 &amp; 0x0ff), (val2 &amp; 0x0ff));</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static unsigned int ess_identify (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	outb(((unsigned char) (0x40 &amp; 0xff)), MIXER_ADDR);</div><div class='del'>-</div><div class='del'>-	udelay(20);</div><div class='del'>-	val  = inb(MIXER_DATA) &lt;&lt; 8;</div><div class='del'>-	udelay(20);</div><div class='del'>-	val |= inb(MIXER_DATA);</div><div class='del'>-	udelay(20);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESS technology describes a detection scheme in their docs. It involves</div><div class='del'>- * fiddling with the bits in certain mixer registers. ess_probe is supposed</div><div class='del'>- * to help.</div><div class='del'>- *</div><div class='del'>- * FKS: tracing shows ess_probe writes wrong value to 0x64. Bit 3 reads 1, but</div><div class='del'>- * should be written 0 only. Check this.</div><div class='del'>- */</div><div class='del'>-static int ess_probe (sb_devc * devc, int reg, int xorval)</div><div class='del'>-{</div><div class='del'>-	int  val1, val2, val3;</div><div class='del'>-</div><div class='del'>-	val1 = ess_getmixer (devc, reg);</div><div class='del'>-	val2 = val1 ^ xorval;</div><div class='del'>-	ess_setmixer (devc, reg, val2);</div><div class='del'>-	val3 = ess_getmixer (devc, reg);</div><div class='del'>-	ess_setmixer (devc, reg, val1);</div><div class='del'>-</div><div class='del'>-	return (val2 == val3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ess_init(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char cfg;</div><div class='del'>-	int ess_major = 0, ess_minor = 0;</div><div class='del'>-	int i;</div><div class='del'>-	static char name[100], modelname[10];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Try to detect ESS chips.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	sb_dsp_command(devc, 0xe7); /* Return identification */</div><div class='del'>-</div><div class='del'>-	for (i = 1000; i; i--) {</div><div class='del'>-		if (inb(DSP_DATA_AVAIL) &amp; 0x80) {</div><div class='del'>-			if (ess_major == 0) {</div><div class='del'>-				ess_major = inb(DSP_READ);</div><div class='del'>-			} else {</div><div class='del'>-				ess_minor = inb(DSP_READ);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ess_major == 0) return 0;</div><div class='del'>-</div><div class='del'>-	if (ess_major == 0x48 &amp;&amp; (ess_minor &amp; 0xf0) == 0x80) {</div><div class='del'>-		sprintf(name, "ESS ES488 AudioDrive (rev %d)",</div><div class='del'>-			ess_minor &amp; 0x0f);</div><div class='del'>-		hw_config-&gt;name = name;</div><div class='del'>-		devc-&gt;model = MDL_SBPRO;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This the detection heuristic of ESS technology, though somewhat</div><div class='del'>-	 * changed to actually make it work.</div><div class='del'>-	 * This results in the following detection steps:</div><div class='del'>-	 * - distinct between ES688 and ES1688+ (as always done in this driver)</div><div class='del'>-	 *   if ES688 we're ready</div><div class='del'>-	 * - try to detect ES1868, ES1869 or ES1878 (ess_identify)</div><div class='del'>-	 *   if successful we're ready</div><div class='del'>-	 * - try to detect ES1888, ES1887 or ES1788 (aim: detect ES1887)</div><div class='del'>-	 *   if successful we're ready</div><div class='del'>-	 * - Dunno. Must be 1688. Will do in general</div><div class='del'>-	 *</div><div class='del'>-	 * This is the most BETA part of the software: Will the detection</div><div class='del'>-	 * always work?</div><div class='del'>-	 */</div><div class='del'>-	devc-&gt;model = MDL_ESS;</div><div class='del'>-	devc-&gt;submodel = ess_minor &amp; 0x0f;</div><div class='del'>-</div><div class='del'>-	if (ess_major == 0x68 &amp;&amp; (ess_minor &amp; 0xf0) == 0x80) {</div><div class='del'>-		char *chip = NULL;</div><div class='del'>-		int submodel = -1;</div><div class='del'>-</div><div class='del'>-		switch (devc-&gt;sbmo.esstype) {</div><div class='del'>-		case ESSTYPE_DETECT:</div><div class='del'>-		case ESSTYPE_LIKE20:</div><div class='del'>-			break;</div><div class='del'>-		case 688:</div><div class='del'>-			submodel = 0x00;</div><div class='del'>-			break;</div><div class='del'>-		case 1688:</div><div class='del'>-			submodel = 0x08;</div><div class='del'>-			break;</div><div class='del'>-		case 1868:</div><div class='del'>-			submodel = SUBMDL_ES1868;</div><div class='del'>-			break;</div><div class='del'>-		case 1869:</div><div class='del'>-			submodel = SUBMDL_ES1869;</div><div class='del'>-			break;</div><div class='del'>-		case 1788:</div><div class='del'>-			submodel = SUBMDL_ES1788;</div><div class='del'>-			break;</div><div class='del'>-		case 1878:</div><div class='del'>-			submodel = SUBMDL_ES1878;</div><div class='del'>-			break;</div><div class='del'>-		case 1879:</div><div class='del'>-			submodel = SUBMDL_ES1879;</div><div class='del'>-			break;</div><div class='del'>-		case 1887:</div><div class='del'>-			submodel = SUBMDL_ES1887;</div><div class='del'>-			break;</div><div class='del'>-		case 1888:</div><div class='del'>-			submodel = SUBMDL_ES1888;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printk (KERN_ERR "Invalid esstype=%d specified\n", devc-&gt;sbmo.esstype);</div><div class='del'>-			return 0;</div><div class='del'>-		};</div><div class='del'>-		if (submodel != -1) {</div><div class='del'>-			devc-&gt;submodel = submodel;</div><div class='del'>-			sprintf (modelname, "ES%d", devc-&gt;sbmo.esstype);</div><div class='del'>-			chip = modelname;</div><div class='del'>-		};</div><div class='del'>-		if (chip == NULL &amp;&amp; (ess_minor &amp; 0x0f) &lt; 8) {</div><div class='del'>-			chip = "ES688";</div><div class='del'>-		};</div><div class='del'>-#ifdef FKS_TEST</div><div class='del'>-FKS_test (devc);</div><div class='del'>-#endif</div><div class='del'>-		/*</div><div class='del'>-		 * If Nothing detected yet, and we want 2.0 behaviour...</div><div class='del'>-		 * Then let's assume it's ES1688.</div><div class='del'>-		 */</div><div class='del'>-		if (chip == NULL &amp;&amp; devc-&gt;sbmo.esstype == ESSTYPE_LIKE20) {</div><div class='del'>-			chip = "ES1688";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		if (chip == NULL) {</div><div class='del'>-			int type;</div><div class='del'>-</div><div class='del'>-			type = ess_identify (devc);</div><div class='del'>-</div><div class='del'>-			switch (type) {</div><div class='del'>-			case 0x1868:</div><div class='del'>-				chip = "ES1868";</div><div class='del'>-				devc-&gt;submodel = SUBMDL_ES1868;</div><div class='del'>-				break;</div><div class='del'>-			case 0x1869:</div><div class='del'>-				chip = "ES1869";</div><div class='del'>-				devc-&gt;submodel = SUBMDL_ES1869;</div><div class='del'>-				break;</div><div class='del'>-			case 0x1878:</div><div class='del'>-				chip = "ES1878";</div><div class='del'>-				devc-&gt;submodel = SUBMDL_ES1878;</div><div class='del'>-				break;</div><div class='del'>-			case 0x1879:</div><div class='del'>-				chip = "ES1879";</div><div class='del'>-				devc-&gt;submodel = SUBMDL_ES1879;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				if ((type &amp; 0x00ff) != ((type &gt;&gt; 8) &amp; 0x00ff)) {</div><div class='del'>-					printk ("ess_init: Unrecognized %04x\n", type);</div><div class='del'>-				}</div><div class='del'>-			};</div><div class='del'>-		};</div><div class='del'>-#if 0</div><div class='del'>-		/*</div><div class='del'>-		 * this one failed:</div><div class='del'>-		 * the probing of bit 4 is another thought: from ES1788 and up, all</div><div class='del'>-		 * chips seem to have hardware volume control. Bit 4 is readonly to</div><div class='del'>-		 * check if a hardware volume interrupt has fired.</div><div class='del'>-		 * Cause ES688/ES1688 don't have this feature, bit 4 might be writeable</div><div class='del'>-		 * for these chips.</div><div class='del'>-		 */</div><div class='del'>-		if (chip == NULL &amp;&amp; !ess_probe(devc, 0x64, (1 &lt;&lt; 4))) {</div><div class='del'>-#endif</div><div class='del'>-		/*</div><div class='del'>-		 * the probing of bit 2 is my idea. The ES1887 docs want me to probe</div><div class='del'>-		 * bit 3. This results in ES1688 being detected as ES1788.</div><div class='del'>-		 * Bit 2 is for "Enable HWV IRQE", but as ES(1)688 chips don't have</div><div class='del'>-		 * HardWare Volume, I think they don't have this IRQE.</div><div class='del'>-		 */</div><div class='del'>-		if (chip == NULL &amp;&amp; ess_probe(devc, 0x64, (1 &lt;&lt; 2))) {</div><div class='del'>-			if (ess_probe (devc, 0x70, 0x7f)) {</div><div class='del'>-				if (ess_probe (devc, 0x64, (1 &lt;&lt; 5))) {</div><div class='del'>-					chip = "ES1887";</div><div class='del'>-					devc-&gt;submodel = SUBMDL_ES1887;</div><div class='del'>-				} else {</div><div class='del'>-					chip = "ES1888";</div><div class='del'>-					devc-&gt;submodel = SUBMDL_ES1888;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				chip = "ES1788";</div><div class='del'>-				devc-&gt;submodel = SUBMDL_ES1788;</div><div class='del'>-			}</div><div class='del'>-		};</div><div class='del'>-		if (chip == NULL) {</div><div class='del'>-			chip = "ES1688";</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-	    printk ( KERN_INFO "ESS chip %s %s%s\n"</div><div class='del'>-               , chip</div><div class='del'>-               , ( devc-&gt;sbmo.esstype == ESSTYPE_DETECT || devc-&gt;sbmo.esstype == ESSTYPE_LIKE20</div><div class='del'>-                 ? "detected"</div><div class='del'>-                 : "specified"</div><div class='del'>-                 )</div><div class='del'>-               , ( devc-&gt;sbmo.esstype == ESSTYPE_LIKE20</div><div class='del'>-                 ? " (kernel 2.0 compatible)"</div><div class='del'>-                 : ""</div><div class='del'>-                 )</div><div class='del'>-               );</div><div class='del'>-</div><div class='del'>-		sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor &amp; 0x0f);</div><div class='del'>-	} else {</div><div class='del'>-		strcpy(name, "Jazz16");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* AAS: info stolen from ALSA: these boards have different clocks */</div><div class='del'>-	switch(devc-&gt;submodel) {</div><div class='del'>-/* APPARENTLY NOT 1869 AND 1887</div><div class='del'>-		case SUBMDL_ES1869:</div><div class='del'>-		case SUBMDL_ES1887:</div><div class='del'>-*/		</div><div class='del'>-		case SUBMDL_ES1888:</div><div class='del'>-			devc-&gt;caps |= SB_CAP_ES18XX_RATE;</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;name = name;</div><div class='del'>-	/* FKS: sb_dsp_reset to enable extended mode???? */</div><div class='del'>-	sb_dsp_reset(devc); /* Turn on extended mode */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Enable joystick and OPL3</div><div class='del'>-	 */</div><div class='del'>-	cfg = ess_getmixer (devc, 0x40);</div><div class='del'>-	ess_setmixer (devc, 0x40, cfg | 0x03);</div><div class='del'>-	if (devc-&gt;submodel &gt;= 8) {		/* ES1688 */</div><div class='del'>-		devc-&gt;caps |= SB_NO_MIDI;   /* ES1688 uses MPU401 MIDI mode */</div><div class='del'>-	}</div><div class='del'>-	sb_dsp_reset (devc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is important! If it's not done, the IRQ probe in sb_dsp_init</div><div class='del'>-	 * may fail.</div><div class='del'>-	 */</div><div class='del'>-	return ess_set_irq_hw (devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ess_set_dma_hw(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned char cfg, dma_bits = 0, dma16_bits;</div><div class='del'>-	int dma;</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-printk(KERN_INFO "ess_set_dma_hw: dma8=%d,dma16=%d,dup=%d\n"</div><div class='del'>-, devc-&gt;dma8, devc-&gt;dma16, devc-&gt;duplex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FKS: It seems as if this duplex flag isn't set yet. Check it.</div><div class='del'>-	 */</div><div class='del'>-	dma = devc-&gt;dma8;</div><div class='del'>-</div><div class='del'>-	if (dma &gt; 3 || dma &lt; 0 || dma == 2) {</div><div class='del'>-		dma_bits = 0;</div><div class='del'>-		printk(KERN_ERR "ESS1688: Invalid DMA8 %d\n", dma);</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* Extended mode DMA enable */</div><div class='del'>-		cfg = 0x50;</div><div class='del'>-</div><div class='del'>-		if (dma == 3) {</div><div class='del'>-			dma_bits = 3;</div><div class='del'>-		} else {</div><div class='del'>-			dma_bits = dma + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ess_write (devc, 0xb2, cfg | (dma_bits &lt;&lt; 2))) {</div><div class='del'>-		printk(KERN_ERR "ESS1688: Failed to write to DMA config register\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;duplex) {</div><div class='del'>-		dma = devc-&gt;dma16;</div><div class='del'>-		dma16_bits = 0;</div><div class='del'>-</div><div class='del'>-		if (dma &gt;= 0) {</div><div class='del'>-			switch (dma) {</div><div class='del'>-			case 0:</div><div class='del'>-				dma_bits = 0x04;</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				dma_bits = 0x05;</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-				dma_bits = 0x06;</div><div class='del'>-				break;</div><div class='del'>-			case 5:</div><div class='del'>-				dma_bits   = 0x07;</div><div class='del'>-				dma16_bits = 0x20;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				printk(KERN_ERR "ESS1887: Invalid DMA16 %d\n", dma);</div><div class='del'>-				return 0;</div><div class='del'>-			};</div><div class='del'>-			ess_chgmixer (devc, 0x78, 0x20, dma16_bits);</div><div class='del'>-			ess_chgmixer (devc, 0x7d, 0x07, dma_bits);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This one is called from sb_dsp_init.</div><div class='del'>- *</div><div class='del'>- * Return values:</div><div class='del'>- *  0: Failed</div><div class='del'>- *  1: Succeeded or doesn't apply (not SUBMDL_ES1887)</div><div class='del'>- */</div><div class='del'>-int ess_dsp_init (sb_devc *devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Caller also checks this, but anyway</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;model != MDL_ESS) {</div><div class='del'>-		printk (KERN_INFO "ess_dsp_init for non ESS chip\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	/*</div><div class='del'>-	 * This for ES1887 to run Full Duplex. Actually ES1888</div><div class='del'>-	 * is allowed to do so too. I have no idea yet if this</div><div class='del'>-	 * will work for ES1888 however.</div><div class='del'>-	 *</div><div class='del'>-	 * For SB16 having both dma8 and dma16 means enable</div><div class='del'>-	 * Full Duplex. Let's try this for ES1887 too</div><div class='del'>-	 *</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;submodel == SUBMDL_ES1887) {</div><div class='del'>-		if (hw_config-&gt;dma2 != -1) {</div><div class='del'>-			devc-&gt;dma16 = hw_config-&gt;dma2;</div><div class='del'>-		}</div><div class='del'>-		/*</div><div class='del'>-		 * devc-&gt;duplex initialization is put here, cause</div><div class='del'>-		 * ess_set_dma_hw needs it.</div><div class='del'>-		 */</div><div class='del'>-		if (devc-&gt;dma8 != devc-&gt;dma16 &amp;&amp; devc-&gt;dma16 != -1) {</div><div class='del'>-			devc-&gt;duplex = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!ess_set_dma_hw (devc)) {</div><div class='del'>-		free_irq(devc-&gt;irq, devc);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- *																			*</div><div class='del'>- *									ESS mixer								*</div><div class='del'>- *																			*</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-#define ES688_RECORDING_DEVICES	\</div><div class='del'>-			( SOUND_MASK_LINE	| SOUND_MASK_MIC	| SOUND_MASK_CD		)</div><div class='del'>-#define ES688_MIXER_DEVICES		\</div><div class='del'>-			( SOUND_MASK_SYNTH	| SOUND_MASK_PCM	| SOUND_MASK_LINE	\</div><div class='del'>-			| SOUND_MASK_MIC	| SOUND_MASK_CD		| SOUND_MASK_VOLUME	\</div><div class='del'>-			| SOUND_MASK_LINE2	| SOUND_MASK_SPEAKER					)</div><div class='del'>-</div><div class='del'>-#define ES1688_RECORDING_DEVICES	\</div><div class='del'>-			( ES688_RECORDING_DEVICES					)</div><div class='del'>-#define ES1688_MIXER_DEVICES		\</div><div class='del'>-			( ES688_MIXER_DEVICES | SOUND_MASK_RECLEV	)</div><div class='del'>-</div><div class='del'>-#define ES1887_RECORDING_DEVICES	\</div><div class='del'>-			( ES1688_RECORDING_DEVICES | SOUND_MASK_LINE2 | SOUND_MASK_SYNTH)</div><div class='del'>-#define ES1887_MIXER_DEVICES		\</div><div class='del'>-			( ES1688_MIXER_DEVICES											)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mixer registers of ES1887</div><div class='del'>- *</div><div class='del'>- * These registers specifically take care of recording levels. To make the</div><div class='del'>- * mapping from playback devices to recording devices every recording</div><div class='del'>- * devices = playback device + ES_REC_MIXER_RECDIFF</div><div class='del'>- */</div><div class='del'>-#define ES_REC_MIXER_RECBASE	(SOUND_MIXER_LINE3 + 1)</div><div class='del'>-#define ES_REC_MIXER_RECDIFF	(ES_REC_MIXER_RECBASE - SOUND_MIXER_SYNTH)</div><div class='del'>-</div><div class='del'>-#define ES_REC_MIXER_RECSYNTH	(SOUND_MIXER_SYNTH	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECPCM		(SOUND_MIXER_PCM	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECSPEAKER	(SOUND_MIXER_SPEAKER + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECLINE	(SOUND_MIXER_LINE	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECMIC		(SOUND_MIXER_MIC	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECCD		(SOUND_MIXER_CD		 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECIMIX	(SOUND_MIXER_IMIX	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECALTPCM	(SOUND_MIXER_ALTPCM	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECRECLEV	(SOUND_MIXER_RECLEV	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECIGAIN	(SOUND_MIXER_IGAIN	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECOGAIN	(SOUND_MIXER_OGAIN	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECLINE1	(SOUND_MIXER_LINE1	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECLINE2	(SOUND_MIXER_LINE2	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-#define ES_REC_MIXER_RECLINE3	(SOUND_MIXER_LINE3	 + ES_REC_MIXER_RECDIFF)</div><div class='del'>-</div><div class='del'>-static mixer_tab es688_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,			0x32, 7, 4, 0x32, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,			0x36, 7, 4, 0x36, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,			0x14, 7, 4, 0x14, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,		0x3c, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,			0x3e, 7, 4, 0x3e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,			0x1a, 7, 4, 0x1a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,				0x38, 7, 4, 0x38, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE1,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE2,			0x3a, 7, 4, 0x3a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE3,			0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The ES1688 specifics... hopefully correct...</div><div class='del'>- * - 6 bit master volume</div><div class='del'>- *   I was wrong, ES1888 docs say ES1688 didn't have it.</div><div class='del'>- * - RECLEV control</div><div class='del'>- * These may apply to ES688 too. I have no idea.</div><div class='del'>- */</div><div class='del'>-static mixer_tab es1688_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,			0x32, 7, 4, 0x32, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,			0x36, 7, 4, 0x36, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,			0x14, 7, 4, 0x14, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,		0x3c, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,			0x3e, 7, 4, 0x3e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,			0x1a, 7, 4, 0x1a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,				0x38, 7, 4, 0x38, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,			0xb4, 7, 4, 0xb4, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE1,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE2,			0x3a, 7, 4, 0x3a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE3,			0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_tab es1688later_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,			0x60, 5, 6, 0x62, 5, 6),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,			0x36, 7, 4, 0x36, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,			0x14, 7, 4, 0x14, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,		0x3c, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,			0x3e, 7, 4, 0x3e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,			0x1a, 7, 4, 0x1a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,				0x38, 7, 4, 0x38, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,			0xb4, 7, 4, 0xb4, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE1,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE2,			0x3a, 7, 4, 0x3a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE3,			0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This one is for all ESS chips with a record mixer.</div><div class='del'>- * It's not used (yet) however</div><div class='del'>- */</div><div class='del'>-static mixer_tab es_rec_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,			0x60, 5, 6, 0x62, 5, 6),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,			0x36, 7, 4, 0x36, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,			0x14, 7, 4, 0x14, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,		0x3c, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,			0x3e, 7, 4, 0x3e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,			0x1a, 7, 4, 0x1a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,				0x38, 7, 4, 0x38, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,			0xb4, 7, 4, 0xb4, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE1,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE2,			0x3a, 7, 4, 0x3a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE3,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECSYNTH,		0x6b, 7, 4, 0x6b, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECPCM,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECSPEAKER,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE,		0x6e, 7, 4, 0x6e, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECMIC,		0x68, 7, 4, 0x68, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECCD,			0x6a, 7, 4, 0x6a, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECIMIX,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECALTPCM,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECRECLEV,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECIGAIN,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECOGAIN,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE1,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE2,		0x6c, 7, 4, 0x6c, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE3,		0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This one is for ES1887. It's little different from es_rec_mix: it</div><div class='del'>- * has 0x7c for PCM playback level. This is because ES1887 uses</div><div class='del'>- * Audio 2 for playback.</div><div class='del'>- */</div><div class='del'>-static mixer_tab es1887_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,			0x60, 5, 6, 0x62, 5, 6),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,			0x36, 7, 4, 0x36, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,			0x7c, 7, 4, 0x7c, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,		0x3c, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,			0x3e, 7, 4, 0x3e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,			0x1a, 7, 4, 0x1a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,				0x38, 7, 4, 0x38, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,			0xb4, 7, 4, 0xb4, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE1,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE2,			0x3a, 7, 4, 0x3a, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE3,			0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECSYNTH,		0x6b, 7, 4, 0x6b, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECPCM,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECSPEAKER,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE,		0x6e, 7, 4, 0x6e, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECMIC,		0x68, 7, 4, 0x68, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECCD,			0x6a, 7, 4, 0x6a, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECIMIX,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECALTPCM,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECRECLEV,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECIGAIN,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECOGAIN,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE1,		0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE2,		0x6c, 7, 4, 0x6c, 3, 4),</div><div class='del'>-MIX_ENT(ES_REC_MIXER_RECLINE3,		0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ess_has_rec_mixer (int submodel)</div><div class='del'>-{</div><div class='del'>-	switch (submodel) {</div><div class='del'>-	case SUBMDL_ES1887:</div><div class='del'>-		return 1;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-static int ess_mixer_mon_regs[]</div><div class='del'>-	= { 0x70, 0x71, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7d, 0x7f</div><div class='del'>-	  , 0xa1, 0xa2, 0xa4, 0xa5, 0xa8, 0xa9</div><div class='del'>-	  , 0xb1, 0xb2, 0xb4, 0xb5, 0xb6, 0xb7, 0xb9</div><div class='del'>-	  , 0x00};</div><div class='del'>-</div><div class='del'>-static void ess_show_mixerregs (sb_devc *devc)</div><div class='del'>-{</div><div class='del'>-	int *mp = ess_mixer_mon_regs;</div><div class='del'>-</div><div class='del'>-return;</div><div class='del'>-</div><div class='del'>-	while (*mp != 0) {</div><div class='del'>-		printk (KERN_INFO "res (%x)=%x\n", *mp, (int)(ess_getmixer (devc, *mp)));</div><div class='del'>-		mp++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void ess_setmixer (sb_devc * devc, unsigned int port, unsigned int value)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-printk(KERN_INFO "FKS: write mixer %x: %x\n", port, value);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (port &gt;= 0xa0) {</div><div class='del'>-		ess_write (devc, port, value);</div><div class='del'>-	} else {</div><div class='del'>-		outb(((unsigned char) (port &amp; 0xff)), MIXER_ADDR);</div><div class='del'>-</div><div class='del'>-		udelay(20);</div><div class='del'>-		outb(((unsigned char) (value &amp; 0xff)), MIXER_DATA);</div><div class='del'>-		udelay(20);</div><div class='del'>-	};</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-unsigned int ess_getmixer (sb_devc * devc, unsigned int port)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	if (port &gt;= 0xa0) {</div><div class='del'>-		val = ess_read (devc, port);</div><div class='del'>-	} else {</div><div class='del'>-		outb(((unsigned char) (port &amp; 0xff)), MIXER_ADDR);</div><div class='del'>-</div><div class='del'>-		udelay(20);</div><div class='del'>-		val = inb(MIXER_DATA);</div><div class='del'>-		udelay(20);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ess_chgmixer</div><div class='del'>-	(sb_devc * devc, unsigned int reg, unsigned int mask, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	value = ess_getmixer (devc, reg);</div><div class='del'>-	value = (value &amp; ~mask) | (val &amp; mask);</div><div class='del'>-	ess_setmixer (devc, reg, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ess_mixer_init must be called from sb_mixer_init</div><div class='del'>- */</div><div class='del'>-void ess_mixer_init (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	devc-&gt;mixer_caps = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	* Take care of ES1887 specifics...</div><div class='del'>-	*/</div><div class='del'>-	switch (devc-&gt;submodel) {</div><div class='del'>-	case SUBMDL_ES1887:</div><div class='del'>-		devc-&gt;supported_devices		= ES1887_MIXER_DEVICES;</div><div class='del'>-		devc-&gt;supported_rec_devices	= ES1887_RECORDING_DEVICES;</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-printk (KERN_INFO "FKS: ess_mixer_init dup = %d\n", devc-&gt;duplex);</div><div class='del'>-#endif</div><div class='del'>-		if (devc-&gt;duplex) {</div><div class='del'>-			devc-&gt;iomap				= &amp;es1887_mix;</div><div class='del'>-			devc-&gt;iomap_sz                          = ARRAY_SIZE(es1887_mix);</div><div class='del'>-		} else {</div><div class='del'>-			devc-&gt;iomap				= &amp;es_rec_mix;</div><div class='del'>-			devc-&gt;iomap_sz                          = ARRAY_SIZE(es_rec_mix);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (devc-&gt;submodel &lt; 8) {</div><div class='del'>-			devc-&gt;supported_devices		= ES688_MIXER_DEVICES;</div><div class='del'>-			devc-&gt;supported_rec_devices	= ES688_RECORDING_DEVICES;</div><div class='del'>-			devc-&gt;iomap					= &amp;es688_mix;</div><div class='del'>-			devc-&gt;iomap_sz                                  = ARRAY_SIZE(es688_mix);</div><div class='del'>-		} else {</div><div class='del'>-			/*</div><div class='del'>-			 * es1688 has 4 bits master vol.</div><div class='del'>-			 * later chips have 6 bits (?)</div><div class='del'>-			 */</div><div class='del'>-			devc-&gt;supported_devices		= ES1688_MIXER_DEVICES;</div><div class='del'>-			devc-&gt;supported_rec_devices	= ES1688_RECORDING_DEVICES;</div><div class='del'>-			if (devc-&gt;submodel &lt; 0x10) {</div><div class='del'>-				devc-&gt;iomap				= &amp;es1688_mix;</div><div class='del'>-				devc-&gt;iomap_sz                          = ARRAY_SIZE(es688_mix);</div><div class='del'>-			} else {</div><div class='del'>-				devc-&gt;iomap				= &amp;es1688later_mix;</div><div class='del'>-				devc-&gt;iomap_sz                          = ARRAY_SIZE(es1688later_mix);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Changing playback levels at an ESS chip with record mixer means having to</div><div class='del'>- * take care of recording levels of recorded inputs (devc-&gt;recmask) too!</div><div class='del'>- */</div><div class='del'>-int ess_mixer_set(sb_devc *devc, int dev, int left, int right)</div><div class='del'>-{</div><div class='del'>-	if (ess_has_rec_mixer (devc-&gt;submodel) &amp;&amp; (devc-&gt;recmask &amp; (1 &lt;&lt; dev))) {</div><div class='del'>-		sb_common_mixer_set (devc, dev + ES_REC_MIXER_RECDIFF, left, right);</div><div class='del'>-	}</div><div class='del'>-	return sb_common_mixer_set (devc, dev, left, right);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * After a sb_dsp_reset extended register 0xb4 (RECLEV) is reset too. After</div><div class='del'>- * sb_dsp_reset RECLEV has to be restored. This is where ess_mixer_reload</div><div class='del'>- * helps.</div><div class='del'>- */</div><div class='del'>-void ess_mixer_reload (sb_devc *devc, int dev)</div><div class='del'>-{</div><div class='del'>-	int left, right, value;</div><div class='del'>-</div><div class='del'>-	value = devc-&gt;levels[dev];</div><div class='del'>-	left  = value &amp; 0x000000ff;</div><div class='del'>-	right = (value &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	sb_common_mixer_set(devc, dev, left, right);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int es_rec_set_recmask(sb_devc * devc, int mask)</div><div class='del'>-{</div><div class='del'>-	int i, i_mask, cur_mask, diff_mask;</div><div class='del'>-	int value, left, right;</div><div class='del'>-</div><div class='del'>-#ifdef FKS_LOGGING</div><div class='del'>-printk (KERN_INFO "FKS: es_rec_set_recmask mask = %x\n", mask);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	 * Changing the recmask on an ESS chip with recording mixer means:</div><div class='del'>-	 * (1) Find the differences</div><div class='del'>-	 * (2) For "turned-on"  inputs: make the recording level the playback level</div><div class='del'>-	 * (3) For "turned-off" inputs: make the recording level zero</div><div class='del'>-	 */</div><div class='del'>-	cur_mask  = devc-&gt;recmask;</div><div class='del'>-	diff_mask = (cur_mask ^ mask);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 32; i++) {</div><div class='del'>-		i_mask = (1 &lt;&lt; i);</div><div class='del'>-		if (diff_mask &amp; i_mask) {	/* Difference? (1)  */</div><div class='del'>-			if (mask &amp; i_mask) {	/* Turn it on  (2)  */</div><div class='del'>-				value = devc-&gt;levels[i];</div><div class='del'>-				left  = value &amp; 0x000000ff;</div><div class='del'>-				right = (value &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-			} else {				/* Turn it off (3)  */</div><div class='del'>-				left  = 0;</div><div class='del'>-				right = 0;</div><div class='del'>-			}</div><div class='del'>-			sb_common_mixer_set(devc, i + ES_REC_MIXER_RECDIFF, left, right);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ess_set_recmask(sb_devc * devc, int *mask)</div><div class='del'>-{</div><div class='del'>-	/* This applies to ESS chips with record mixers only! */</div><div class='del'>-</div><div class='del'>-	if (ess_has_rec_mixer (devc-&gt;submodel)) {</div><div class='del'>-		*mask	= es_rec_set_recmask (devc, *mask);</div><div class='del'>-		return 1;									/* Applied		*/</div><div class='del'>-	} else {</div><div class='del'>-		return 0;									/* Not applied	*/</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ess_mixer_reset must be called from sb_mixer_reset</div><div class='del'>- */</div><div class='del'>-int ess_mixer_reset (sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Separate actions for ESS chips with a record mixer:</div><div class='del'>-	 */</div><div class='del'>-	if (ess_has_rec_mixer (devc-&gt;submodel)) {</div><div class='del'>-		switch (devc-&gt;submodel) {</div><div class='del'>-		case SUBMDL_ES1887:</div><div class='del'>-			/*</div><div class='del'>-			 * Separate actions for ES1887:</div><div class='del'>-			 * Change registers 7a and 1c to make the record mixer the</div><div class='del'>-			 * actual recording source.</div><div class='del'>-			 */</div><div class='del'>-			ess_chgmixer(devc, 0x7a, 0x18, 0x08);</div><div class='del'>-			ess_chgmixer(devc, 0x1c, 0x07, 0x07);</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-		/*</div><div class='del'>-		 * Call set_recmask for proper initialization</div><div class='del'>-		 */</div><div class='del'>-		devc-&gt;recmask = devc-&gt;supported_rec_devices;</div><div class='del'>-		es_rec_set_recmask(devc, 0);</div><div class='del'>-		devc-&gt;recmask = 0;</div><div class='del'>-</div><div class='del'>-		return 1;	/* We took care of recmask.				*/</div><div class='del'>-	} else {</div><div class='del'>-		return 0;	/* We didn't take care; caller do it	*/</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/****************************************************************************</div><div class='del'>- *																			*</div><div class='del'>- *								ESS midi									*</div><div class='del'>- *																			*</div><div class='del'>- ****************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FKS: IRQ may be shared. Hm. And if so? Then What?</div><div class='del'>- */</div><div class='del'>-int ess_midi_init(sb_devc * devc, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char   cfg, tmp;</div><div class='del'>-</div><div class='del'>-	cfg = ess_getmixer (devc, 0x40) &amp; 0x03;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;submodel &lt; 8) {</div><div class='del'>-		ess_setmixer (devc, 0x40, cfg | 0x03);	/* Enable OPL3 &amp; joystick */</div><div class='del'>-		return 0;  					 /* ES688 doesn't support MPU401 mode */</div><div class='del'>-	}</div><div class='del'>-	tmp = (hw_config-&gt;io_base &amp; 0x0f0) &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	if (tmp &gt; 3) {</div><div class='del'>-		ess_setmixer (devc, 0x40, cfg);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	cfg |= tmp &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-	tmp = 1;		/* MPU enabled without interrupts */</div><div class='del'>-</div><div class='del'>-	/* May be shared: if so the value is -ve */</div><div class='del'>-</div><div class='del'>-	switch (abs(hw_config-&gt;irq)) {</div><div class='del'>-		case 9:</div><div class='del'>-			tmp = 0x4;</div><div class='del'>-			break;</div><div class='del'>-		case 5:</div><div class='del'>-			tmp = 0x5;</div><div class='del'>-			break;</div><div class='del'>-		case 7:</div><div class='del'>-			tmp = 0x6;</div><div class='del'>-			break;</div><div class='del'>-		case 10:</div><div class='del'>-			tmp = 0x7;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfg |= tmp &lt;&lt; 5;</div><div class='del'>-	ess_setmixer (devc, 0x40, cfg | 0x03);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/sb_ess.h b/sound/oss/sb_ess.h<br/>deleted file mode 100644<br/>index 38aa072e01f2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_ess.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_ess.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Created: 9-Jan-1999 Rolf Fokkens</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern void ess_intr</div><div class='del'>-		(sb_devc *devc);</div><div class='del'>-extern int ess_dsp_init</div><div class='del'>-		(sb_devc *devc, struct address_info *hw_config);</div><div class='del'>-</div><div class='del'>-extern struct audio_driver *ess_audio_init</div><div class='del'>-		(sb_devc *devc, int *audio_flags, int *format_mask);</div><div class='del'>-extern int ess_midi_init</div><div class='del'>-		(sb_devc *devc, struct address_info *hw_config);</div><div class='del'>-extern void ess_mixer_init</div><div class='del'>-		(sb_devc *devc);</div><div class='del'>-</div><div class='del'>-extern int ess_init</div><div class='del'>-		(sb_devc *devc, struct address_info *hw_config);</div><div class='del'>-extern int ess_dsp_reset</div><div class='del'>-		(sb_devc *devc);</div><div class='del'>-</div><div class='del'>-extern void ess_setmixer</div><div class='del'>-		(sb_devc *devc, unsigned int port, unsigned int value);</div><div class='del'>-extern unsigned int ess_getmixer</div><div class='del'>-		(sb_devc *devc, unsigned int port);</div><div class='del'>-extern int ess_mixer_set</div><div class='del'>-		(sb_devc *devc, int dev, int left, int right);</div><div class='del'>-extern int ess_mixer_reset</div><div class='del'>-		(sb_devc *devc);</div><div class='del'>-extern void ess_mixer_reload</div><div class='del'>-		(sb_devc * devc, int dev);</div><div class='del'>-extern int ess_set_recmask</div><div class='del'>-		(sb_devc *devc, int *mask);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c<br/>deleted file mode 100644<br/>index f139028e85c0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_midi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_midi.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the Sound Blaster DS chips.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "sb.h"</div><div class='del'>-#undef SB_TEST_IRQ</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The DSP channel can be used either for input or output. Variable</div><div class='del'>- * 'sb_irq_mode' will be set when the program calls read or write first time</div><div class='del'>- * after open. Current version doesn't support mode changes without closing</div><div class='del'>- * and reopening the device. Support for this feature may be implemented in a</div><div class='del'>- * future version of this driver.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int sb_midi_open(int dev, int mode,</div><div class='del'>-	     void            (*input) (int dev, unsigned char data),</div><div class='del'>-	     void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;irq_mode = IMODE_MIDI;</div><div class='del'>-	devc-&gt;midi_broken = 0;</div><div class='del'>-</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, 0x35))	/* Start MIDI UART mode */</div><div class='del'>-	{</div><div class='del'>-		  devc-&gt;opened = 0;</div><div class='del'>-		  return -EIO;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;input_opened = 1;</div><div class='del'>-		devc-&gt;midi_input_intr = input;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sb_midi_close(int dev)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	devc-&gt;input_opened = 0;</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_midi_out(int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;midi_broken)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (!sb_dsp_command(devc, midi_byte))</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;midi_broken = 1;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_midi_start_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_midi_end_read(int dev)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	sb_dsp_reset(devc);</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_midi_ioctl(int dev, unsigned cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-        return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sb_midi_interrupt(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-	unsigned char   data;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	data = inb(DSP_READ);</div><div class='del'>-	if (devc-&gt;input_opened)</div><div class='del'>-		devc-&gt;midi_input_intr(devc-&gt;my_mididev, data);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"Sound Blaster Midi"</div><div class='del'>-#define MIDI_SYNTH_CAPS	0</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static struct midi_operations sb_midi_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"Sound Blaster", 0, 0, SNDCARD_SB},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= sb_midi_open,</div><div class='del'>-	.close		= sb_midi_close,</div><div class='del'>-	.ioctl		= sb_midi_ioctl,</div><div class='del'>-	.outputc	= sb_midi_out,</div><div class='del'>-	.start_read	= sb_midi_start_read,</div><div class='del'>-	.end_read	= sb_midi_end_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void sb_dsp_midi_init(sb_devc * devc, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	int dev;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model &lt; 2)	/* No MIDI support for SB 1.x */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dev = sound_alloc_mididev();</div><div class='del'>-</div><div class='del'>-	if (dev == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "sb_midi: too many MIDI devices detected\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	std_midi_synth.midi_dev = devc-&gt;my_mididev = dev;</div><div class='del'>-	midi_devs[dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);</div><div class='del'>-	if (midi_devs[dev] == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");</div><div class='del'>-		sound_unload_mididev(dev);</div><div class='del'>-		  return;</div><div class='del'>-	}</div><div class='del'>-	memcpy((char *) midi_devs[dev], (char *) &amp;sb_midi_operations,</div><div class='del'>-	       sizeof(struct midi_operations));</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-			midi_devs[dev]-&gt;owner = owner;</div><div class='del'>-	</div><div class='del'>-	midi_devs[dev]-&gt;devc = devc;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	midi_devs[dev]-&gt;converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);</div><div class='del'>-	if (midi_devs[dev]-&gt;converter == NULL)</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");</div><div class='del'>-		  kfree(midi_devs[dev]);</div><div class='del'>-		  sound_unload_mididev(dev);</div><div class='del'>-		  return;</div><div class='del'>-	}</div><div class='del'>-	memcpy((char *) midi_devs[dev]-&gt;converter, (char *) &amp;std_midi_synth,</div><div class='del'>-	       sizeof(struct synth_operations));</div><div class='del'>-</div><div class='del'>-	midi_devs[dev]-&gt;converter-&gt;id = "SBMIDI";</div><div class='del'>-	sequencer_init();</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c<br/>deleted file mode 100644<br/>index 2039d31b7e22..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_mixer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,770 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_mixer.c</div><div class='del'>- *</div><div class='del'>- * The low level mixer driver for the Sound Blaster compatible cards.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer				: ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Rolf Fokkens (Dec 20 1998)	: Moved ESS stuff into sb_ess.[ch]</div><div class='del'>- * Stanislav Voronyi &lt;stas@esc.kharkov.com&gt;	: Support for AWE 3DSE device (Jun 7 1999)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#define __SB_MIXER_C__</div><div class='del'>-</div><div class='del'>-#include "sb.h"</div><div class='del'>-#include "sb_mixer.h"</div><div class='del'>-</div><div class='del'>-#include "sb_ess.h"</div><div class='del'>-</div><div class='del'>-#define SBPRO_RECORDING_DEVICES	(SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD)</div><div class='del'>-</div><div class='del'>-/* Same as SB Pro, unless I find otherwise */</div><div class='del'>-#define SGNXPRO_RECORDING_DEVICES SBPRO_RECORDING_DEVICES</div><div class='del'>-</div><div class='del'>-#define SBPRO_MIXER_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD | SOUND_MASK_VOLUME)</div><div class='del'>-</div><div class='del'>-/* SG NX Pro has treble and bass settings on the mixer. The 'speaker'</div><div class='del'>- * channel is the COVOX/DisneySoundSource emulation volume control</div><div class='del'>- * on the mixer. It does NOT control speaker volume. Should have own</div><div class='del'>- * mask eventually?</div><div class='del'>- */</div><div class='del'>-#define SGNXPRO_MIXER_DEVICES	(SBPRO_MIXER_DEVICES|SOUND_MASK_BASS| \</div><div class='del'>-				 SOUND_MASK_TREBLE|SOUND_MASK_SPEAKER )</div><div class='del'>-</div><div class='del'>-#define SB16_RECORDING_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD)</div><div class='del'>-</div><div class='del'>-#define SB16_OUTFILTER_DEVICES		(SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD)</div><div class='del'>-</div><div class='del'>-#define SB16_MIXER_DEVICES		(SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_SPEAKER | SOUND_MASK_LINE | SOUND_MASK_MIC | \</div><div class='del'>-					 SOUND_MASK_CD | \</div><div class='del'>-					 SOUND_MASK_IGAIN | SOUND_MASK_OGAIN | \</div><div class='del'>-					 SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | \</div><div class='del'>-					SOUND_MASK_IMIX)</div><div class='del'>-</div><div class='del'>-/* These are the only devices that are working at the moment.  Others could</div><div class='del'>- * be added once they are identified and a method is found to control them.</div><div class='del'>- */</div><div class='del'>-#define ALS007_MIXER_DEVICES	(SOUND_MASK_SYNTH | SOUND_MASK_LINE | \</div><div class='del'>-				 SOUND_MASK_PCM | SOUND_MASK_MIC | \</div><div class='del'>-				 SOUND_MASK_CD | \</div><div class='del'>-				 SOUND_MASK_VOLUME)</div><div class='del'>-</div><div class='del'>-static mixer_tab sbpro_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,	0x22, 7, 4, 0x22, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,	0x26, 7, 4, 0x26, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,	0x04, 7, 4, 0x04, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,	0x2e, 7, 4, 0x2e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,	0x0a, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,		0x28, 7, 4, 0x28, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,	0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_tab sb16_mix = {</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,	0x30, 7, 5, 0x31, 7, 5),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,	0x46, 7, 4, 0x47, 7, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,	0x44, 7, 4, 0x45, 7, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,	0x34, 7, 5, 0x35, 7, 5),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,	0x32, 7, 5, 0x33, 7, 5),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,	0x3b, 7, 2, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,	0x38, 7, 5, 0x39, 7, 5),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,	0x3a, 7, 5, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,		0x36, 7, 5, 0x37, 7, 5),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,	0x3c, 0, 1, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,	0x3f, 7, 2, 0x40, 7, 2), /* Obsolete. Use IGAIN */</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,	0x3f, 7, 2, 0x40, 7, 2),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,	0x41, 7, 2, 0x42, 7, 2)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static mixer_tab als007_mix = </div><div class='del'>-{</div><div class='del'>-MIX_ENT(SOUND_MIXER_VOLUME,	0x62, 7, 4, 0x62, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_BASS,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_TREBLE,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SYNTH,	0x66, 7, 4, 0x66, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_PCM,	0x64, 7, 4, 0x64, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_SPEAKER,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_LINE,	0x6e, 7, 4, 0x6e, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_MIC,	0x6a, 2, 3, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_CD,		0x68, 7, 4, 0x68, 3, 4),</div><div class='del'>-MIX_ENT(SOUND_MIXER_IMIX,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_ALTPCM,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_RECLEV,	0x00, 0, 0, 0x00, 0, 0), /* Obsolete. Use IGAIN */</div><div class='del'>-MIX_ENT(SOUND_MIXER_IGAIN,	0x00, 0, 0, 0x00, 0, 0),</div><div class='del'>-MIX_ENT(SOUND_MIXER_OGAIN,	0x00, 0, 0, 0x00, 0, 0)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* SM_GAMES          Master volume is lower and PCM &amp; FM volumes</div><div class='del'>-			     higher than with SB Pro. This improves the</div><div class='del'>-			     sound quality */</div><div class='del'>-</div><div class='del'>-static int smg_default_levels[32] =</div><div class='del'>-{</div><div class='del'>-  0x2020,			/* Master Volume */</div><div class='del'>-  0x4b4b,			/* Bass */</div><div class='del'>-  0x4b4b,			/* Treble */</div><div class='del'>-  0x6464,			/* FM */</div><div class='del'>-  0x6464,			/* PCM */</div><div class='del'>-  0x4b4b,			/* PC Speaker */</div><div class='del'>-  0x4b4b,			/* Ext Line */</div><div class='del'>-  0x0000,			/* Mic */</div><div class='del'>-  0x4b4b,			/* CD */</div><div class='del'>-  0x4b4b,			/* Recording monitor */</div><div class='del'>-  0x4b4b,			/* SB PCM */</div><div class='del'>-  0x4b4b,			/* Recording level */</div><div class='del'>-  0x4b4b,			/* Input gain */</div><div class='del'>-  0x4b4b,			/* Output gain */</div><div class='del'>-  0x4040,			/* Line1 */</div><div class='del'>-  0x4040,			/* Line2 */</div><div class='del'>-  0x1515			/* Line3 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int sb_default_levels[32] =</div><div class='del'>-{</div><div class='del'>-  0x5a5a,			/* Master Volume */</div><div class='del'>-  0x4b4b,			/* Bass */</div><div class='del'>-  0x4b4b,			/* Treble */</div><div class='del'>-  0x4b4b,			/* FM */</div><div class='del'>-  0x4b4b,			/* PCM */</div><div class='del'>-  0x4b4b,			/* PC Speaker */</div><div class='del'>-  0x4b4b,			/* Ext Line */</div><div class='del'>-  0x1010,			/* Mic */</div><div class='del'>-  0x4b4b,			/* CD */</div><div class='del'>-  0x0000,			/* Recording monitor */</div><div class='del'>-  0x4b4b,			/* SB PCM */</div><div class='del'>-  0x4b4b,			/* Recording level */</div><div class='del'>-  0x4b4b,			/* Input gain */</div><div class='del'>-  0x4b4b,			/* Output gain */</div><div class='del'>-  0x4040,			/* Line1 */</div><div class='del'>-  0x4040,			/* Line2 */</div><div class='del'>-  0x1515			/* Line3 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char sb16_recmasks_L[SOUND_MIXER_NRDEVICES] =</div><div class='del'>-{</div><div class='del'>-	0x00,	/* SOUND_MIXER_VOLUME	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_BASS	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_TREBLE	*/</div><div class='del'>-	0x40,	/* SOUND_MIXER_SYNTH	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_PCM	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_SPEAKER	*/</div><div class='del'>-	0x10,	/* SOUND_MIXER_LINE	*/</div><div class='del'>-	0x01,	/* SOUND_MIXER_MIC	*/</div><div class='del'>-	0x04,	/* SOUND_MIXER_CD	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_IMIX	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_ALTPCM	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_RECLEV	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_IGAIN	*/</div><div class='del'>-	0x00	/* SOUND_MIXER_OGAIN	*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char sb16_recmasks_R[SOUND_MIXER_NRDEVICES] =</div><div class='del'>-{</div><div class='del'>-	0x00,	/* SOUND_MIXER_VOLUME	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_BASS	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_TREBLE	*/</div><div class='del'>-	0x20,	/* SOUND_MIXER_SYNTH	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_PCM	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_SPEAKER	*/</div><div class='del'>-	0x08,	/* SOUND_MIXER_LINE	*/</div><div class='del'>-	0x01,	/* SOUND_MIXER_MIC	*/</div><div class='del'>-	0x02,	/* SOUND_MIXER_CD	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_IMIX	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_ALTPCM	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_RECLEV	*/</div><div class='del'>-	0x00,	/* SOUND_MIXER_IGAIN	*/</div><div class='del'>-	0x00	/* SOUND_MIXER_OGAIN	*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char     smw_mix_regs[] =	/* Left mixer registers */</div><div class='del'>-{</div><div class='del'>-  0x0b,				/* SOUND_MIXER_VOLUME */</div><div class='del'>-  0x0d,				/* SOUND_MIXER_BASS */</div><div class='del'>-  0x0d,				/* SOUND_MIXER_TREBLE */</div><div class='del'>-  0x05,				/* SOUND_MIXER_SYNTH */</div><div class='del'>-  0x09,				/* SOUND_MIXER_PCM */</div><div class='del'>-  0x00,				/* SOUND_MIXER_SPEAKER */</div><div class='del'>-  0x03,				/* SOUND_MIXER_LINE */</div><div class='del'>-  0x01,				/* SOUND_MIXER_MIC */</div><div class='del'>-  0x07,				/* SOUND_MIXER_CD */</div><div class='del'>-  0x00,				/* SOUND_MIXER_IMIX */</div><div class='del'>-  0x00,				/* SOUND_MIXER_ALTPCM */</div><div class='del'>-  0x00,				/* SOUND_MIXER_RECLEV */</div><div class='del'>-  0x00,				/* SOUND_MIXER_IGAIN */</div><div class='del'>-  0x00,				/* SOUND_MIXER_OGAIN */</div><div class='del'>-  0x00,				/* SOUND_MIXER_LINE1 */</div><div class='del'>-  0x00,				/* SOUND_MIXER_LINE2 */</div><div class='del'>-  0x00				/* SOUND_MIXER_LINE3 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int      sbmixnum = 1;</div><div class='del'>-</div><div class='del'>-static void     sb_mixer_reset(sb_devc * devc);</div><div class='del'>-</div><div class='del'>-void sb_mixer_set_stereo(sb_devc * devc, int mode)</div><div class='del'>-{</div><div class='del'>-	sb_chgmixer(devc, OUT_FILTER, STEREO_DAC, (mode ? STEREO_DAC : MONO_DAC));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int detect_mixer(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	/* Just trust the mixer is there */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void change_bits(sb_devc * devc, unsigned char *regval, int dev, int chn, int newval)</div><div class='del'>-{</div><div class='del'>-	unsigned char mask;</div><div class='del'>-	int shift;</div><div class='del'>-</div><div class='del'>-	mask = (1 &lt;&lt; (*devc-&gt;iomap)[dev][chn].nbits) - 1;</div><div class='del'>-	newval = (int) ((newval * mask) + 50) / 100;	/* Scale */</div><div class='del'>-</div><div class='del'>-	shift = (*devc-&gt;iomap)[dev][chn].bitoffs - (*devc-&gt;iomap)[dev][LEFT_CHN].nbits + 1;</div><div class='del'>-</div><div class='del'>-	*regval &amp;= ~(mask &lt;&lt; shift);	/* Mask out previous value */</div><div class='del'>-	*regval |= (newval &amp; mask) &lt;&lt; shift;	/* Set the new value */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_mixer_get(sb_devc * devc, int dev)</div><div class='del'>-{</div><div class='del'>-	if (!((1 &lt;&lt; dev) &amp; devc-&gt;supported_devices))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return devc-&gt;levels[dev];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void smw_mixer_init(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sb_setmixer(devc, 0x00, 0x18);	/* Mute unused (Telephone) line */</div><div class='del'>-	sb_setmixer(devc, 0x10, 0x38);	/* Config register 2 */</div><div class='del'>-</div><div class='del'>-	devc-&gt;supported_devices = 0;</div><div class='del'>-	for (i = 0; i &lt; sizeof(smw_mix_regs); i++)</div><div class='del'>-		if (smw_mix_regs[i] != 0)</div><div class='del'>-			devc-&gt;supported_devices |= (1 &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	devc-&gt;supported_rec_devices = devc-&gt;supported_devices &amp;</div><div class='del'>-		~(SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_PCM | SOUND_MASK_VOLUME);</div><div class='del'>-	sb_mixer_reset(devc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)</div><div class='del'>-{</div><div class='del'>-	int regoffs;</div><div class='del'>-	unsigned char val;</div><div class='del'>-</div><div class='del'>-	if ((dev &lt; 0) || (dev &gt;= devc-&gt;iomap_sz))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	regoffs = (*devc-&gt;iomap)[dev][LEFT_CHN].regno;</div><div class='del'>-</div><div class='del'>-	if (regoffs == 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	val = sb_getmixer(devc, regoffs);</div><div class='del'>-	change_bits(devc, &amp;val, dev, LEFT_CHN, left);</div><div class='del'>-</div><div class='del'>-	if ((*devc-&gt;iomap)[dev][RIGHT_CHN].regno != regoffs)	/*</div><div class='del'>-								 * Change register</div><div class='del'>-								 */</div><div class='del'>-	{</div><div class='del'>-		sb_setmixer(devc, regoffs, val);	/*</div><div class='del'>-							 * Save the old one</div><div class='del'>-							 */</div><div class='del'>-		regoffs = (*devc-&gt;iomap)[dev][RIGHT_CHN].regno;</div><div class='del'>-</div><div class='del'>-		if (regoffs == 0)</div><div class='del'>-			return left | (left &lt;&lt; 8);	/*</div><div class='del'>-							 * Just left channel present</div><div class='del'>-							 */</div><div class='del'>-</div><div class='del'>-		val = sb_getmixer(devc, regoffs);	/*</div><div class='del'>-							 * Read the new one</div><div class='del'>-							 */</div><div class='del'>-	}</div><div class='del'>-	change_bits(devc, &amp;val, dev, RIGHT_CHN, right);</div><div class='del'>-</div><div class='del'>-	sb_setmixer(devc, regoffs, val);</div><div class='del'>-</div><div class='del'>-	return left | (right &lt;&lt; 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int smw_mixer_set(sb_devc * devc, int dev, int left, int right)</div><div class='del'>-{</div><div class='del'>-	int reg, val;</div><div class='del'>-</div><div class='del'>-	switch (dev)</div><div class='del'>-	{</div><div class='del'>-		case SOUND_MIXER_VOLUME:</div><div class='del'>-			sb_setmixer(devc, 0x0b, 96 - (96 * left / 100));	/* 96=mute, 0=max */</div><div class='del'>-			sb_setmixer(devc, 0x0c, 96 - (96 * right / 100));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_BASS:</div><div class='del'>-		case SOUND_MIXER_TREBLE:</div><div class='del'>-			devc-&gt;levels[dev] = left | (right &lt;&lt; 8);</div><div class='del'>-			/* Set left bass and treble values */</div><div class='del'>-			val = ((devc-&gt;levels[SOUND_MIXER_TREBLE] &amp; 0xff) * 16 / (unsigned) 100) &lt;&lt; 4;</div><div class='del'>-			val |= ((devc-&gt;levels[SOUND_MIXER_BASS] &amp; 0xff) * 16 / (unsigned) 100) &amp; 0x0f;</div><div class='del'>-			sb_setmixer(devc, 0x0d, val);</div><div class='del'>-</div><div class='del'>-			/* Set right bass and treble values */</div><div class='del'>-			val = (((devc-&gt;levels[SOUND_MIXER_TREBLE] &gt;&gt; 8) &amp; 0xff) * 16 / (unsigned) 100) &lt;&lt; 4;</div><div class='del'>-			val |= (((devc-&gt;levels[SOUND_MIXER_BASS] &gt;&gt; 8) &amp; 0xff) * 16 / (unsigned) 100) &amp; 0x0f;</div><div class='del'>-			sb_setmixer(devc, 0x0e, val);</div><div class='del'>-		</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			/* bounds check */</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= ARRAY_SIZE(smw_mix_regs))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			reg = smw_mix_regs[dev];</div><div class='del'>-			if (reg == 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			sb_setmixer(devc, reg, (24 - (24 * left / 100)) | 0x20);	/* 24=mute, 0=max */</div><div class='del'>-			sb_setmixer(devc, reg + 1, (24 - (24 * right / 100)) | 0x40);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;levels[dev] = left | (right &lt;&lt; 8);</div><div class='del'>-	return left | (right &lt;&lt; 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_mixer_set(sb_devc * devc, int dev, int value)</div><div class='del'>-{</div><div class='del'>-	int left = value &amp; 0x000000ff;</div><div class='del'>-	int right = (value &amp; 0x0000ff00) &gt;&gt; 8;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (left &gt; 100)</div><div class='del'>-		left = 100;</div><div class='del'>-	if (right &gt; 100)</div><div class='del'>-		right = 100;</div><div class='del'>-</div><div class='del'>-	if ((dev &lt; 0) || (dev &gt; 31))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(devc-&gt;supported_devices &amp; (1 &lt;&lt; dev)))	/*</div><div class='del'>-							 * Not supported</div><div class='del'>-							 */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Differentiate depending on the chipsets */</div><div class='del'>-	switch (devc-&gt;model) {</div><div class='del'>-	case MDL_SMW:</div><div class='del'>-		retval = smw_mixer_set(devc, dev, left, right);</div><div class='del'>-		break;</div><div class='del'>-	case MDL_ESS:</div><div class='del'>-		retval = ess_mixer_set(devc, dev, left, right);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		retval = sb_common_mixer_set(devc, dev, left, right);</div><div class='del'>-	}</div><div class='del'>-	if (retval &gt;= 0) devc-&gt;levels[dev] = retval;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set_recsrc doesn't apply to ES188x</div><div class='del'>- */</div><div class='del'>-static void set_recsrc(sb_devc * devc, int src)</div><div class='del'>-{</div><div class='del'>-	sb_setmixer(devc, RECORD_SRC, (sb_getmixer(devc, RECORD_SRC) &amp; ~7) | (src &amp; 0x7));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_recmask(sb_devc * devc, int mask)</div><div class='del'>-{</div><div class='del'>-	int devmask, i;</div><div class='del'>-	unsigned char  regimageL, regimageR;</div><div class='del'>-</div><div class='del'>-	devmask = mask &amp; devc-&gt;supported_rec_devices;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MDL_SBPRO:</div><div class='del'>-		case MDL_ESS:</div><div class='del'>-		case MDL_JAZZ:</div><div class='del'>-		case MDL_SMW:</div><div class='del'>-			if (devc-&gt;model == MDL_ESS &amp;&amp; ess_set_recmask (devc, &amp;devmask)) {</div><div class='del'>-				break;</div><div class='del'>-			};</div><div class='del'>-			if (devmask != SOUND_MASK_MIC &amp;&amp;</div><div class='del'>-				devmask != SOUND_MASK_LINE &amp;&amp;</div><div class='del'>-				devmask != SOUND_MASK_CD)</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * More than one device selected. Drop the</div><div class='del'>-				 * previous selection</div><div class='del'>-				 */</div><div class='del'>-				devmask &amp;= ~devc-&gt;recmask;</div><div class='del'>-			}</div><div class='del'>-			if (devmask != SOUND_MASK_MIC &amp;&amp;</div><div class='del'>-				devmask != SOUND_MASK_LINE &amp;&amp;</div><div class='del'>-				devmask != SOUND_MASK_CD)</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * More than one device selected. Default to</div><div class='del'>-				 * mic</div><div class='del'>-				 */</div><div class='del'>-				devmask = SOUND_MASK_MIC;</div><div class='del'>-			}</div><div class='del'>-			if (devmask ^ devc-&gt;recmask)	/*</div><div class='del'>-							 *	Input source changed</div><div class='del'>-							 */</div><div class='del'>-			{</div><div class='del'>-				switch (devmask)</div><div class='del'>-				{</div><div class='del'>-					case SOUND_MASK_MIC:</div><div class='del'>-						set_recsrc(devc, SRC__MIC);</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					case SOUND_MASK_LINE:</div><div class='del'>-						set_recsrc(devc, SRC__LINE);</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					case SOUND_MASK_CD:</div><div class='del'>-						set_recsrc(devc, SRC__CD);</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					default:</div><div class='del'>-						set_recsrc(devc, SRC__MIC);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SB16:</div><div class='del'>-			if (!devmask)</div><div class='del'>-				devmask = SOUND_MASK_MIC;</div><div class='del'>-</div><div class='del'>-			if (devc-&gt;submodel == SUBMDL_ALS007) </div><div class='del'>-			{</div><div class='del'>-				switch (devmask) </div><div class='del'>-				{</div><div class='del'>-					case SOUND_MASK_LINE:</div><div class='del'>-						sb_setmixer(devc, ALS007_RECORD_SRC, ALS007_LINE);</div><div class='del'>-						break;</div><div class='del'>-					case SOUND_MASK_CD:</div><div class='del'>-						sb_setmixer(devc, ALS007_RECORD_SRC, ALS007_CD);</div><div class='del'>-						break;</div><div class='del'>-					case SOUND_MASK_SYNTH:</div><div class='del'>-						sb_setmixer(devc, ALS007_RECORD_SRC, ALS007_SYNTH);</div><div class='del'>-						break;</div><div class='del'>-					default:           /* Also takes care of SOUND_MASK_MIC case */</div><div class='del'>-						sb_setmixer(devc, ALS007_RECORD_SRC, ALS007_MIC);</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				regimageL = regimageR = 0;</div><div class='del'>-				for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-				{</div><div class='del'>-					if ((1 &lt;&lt; i) &amp; devmask)</div><div class='del'>-					{</div><div class='del'>-						regimageL |= sb16_recmasks_L[i];</div><div class='del'>-						regimageR |= sb16_recmasks_R[i];</div><div class='del'>-					}</div><div class='del'>-					sb_setmixer (devc, SB16_IMASK_L, regimageL);</div><div class='del'>-					sb_setmixer (devc, SB16_IMASK_R, regimageR);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;recmask = devmask;</div><div class='del'>-	return devc-&gt;recmask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_outmask(sb_devc * devc, int mask)</div><div class='del'>-{</div><div class='del'>-	int devmask, i;</div><div class='del'>-	unsigned char  regimage;</div><div class='del'>-</div><div class='del'>-	devmask = mask &amp; devc-&gt;supported_out_devices;</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MDL_SB16:</div><div class='del'>-			if (devc-&gt;submodel == SUBMDL_ALS007) </div><div class='del'>-				break;</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				regimage = 0;</div><div class='del'>-				for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-				{</div><div class='del'>-					if ((1 &lt;&lt; i) &amp; devmask)</div><div class='del'>-					{</div><div class='del'>-						regimage |= (sb16_recmasks_L[i] | sb16_recmasks_R[i]);</div><div class='del'>-					}</div><div class='del'>-					sb_setmixer (devc, SB16_OMASK, regimage);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;outmask = devmask;</div><div class='del'>-	return devc-&gt;outmask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sb_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	sb_devc *devc = mixer_devs[dev]-&gt;devc;</div><div class='del'>-	int val, ret;</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Use ioctl(fd, SOUND_MIXER_AGC, &amp;mode) to turn AGC off (0) or on (1).</div><div class='del'>-	 * Use ioctl(fd, SOUND_MIXER_3DSE, &amp;mode) to turn 3DSE off (0) or on (1)</div><div class='del'>-	 *					      or mode==2 put 3DSE state to mode.</div><div class='del'>-	 */</div><div class='del'>-	if (devc-&gt;model == MDL_SB16) {</div><div class='del'>-		if (cmd == SOUND_MIXER_AGC) </div><div class='del'>-		{</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			sb_setmixer(devc, 0x43, (~val) &amp; 0x01);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		if (cmd == SOUND_MIXER_3DSE) </div><div class='del'>-		{</div><div class='del'>-			/* I put here 15, but I don't know the exact version.</div><div class='del'>-			   At least my 4.13 havn't 3DSE, 4.16 has it. */</div><div class='del'>-			if (devc-&gt;minor &lt; 15)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val == 0 || val == 1)</div><div class='del'>-				sb_chgmixer(devc, AWE_3DSE, 0x01, val);</div><div class='del'>-			else if (val == 2)</div><div class='del'>-			{</div><div class='del'>-				ret = sb_getmixer(devc, AWE_3DSE)&amp;0x01;</div><div class='del'>-				return put_user(ret, p);</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 0xff) == 'M') </div><div class='del'>-	{</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) </div><div class='del'>-		{</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			switch (cmd &amp; 0xff) </div><div class='del'>-			{</div><div class='del'>-				case SOUND_MIXER_RECSRC:</div><div class='del'>-					ret = set_recmask(devc, val);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				case SOUND_MIXER_OUTSRC:</div><div class='del'>-					ret = set_outmask(devc, val);</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				default:</div><div class='del'>-					ret = sb_mixer_set(devc, cmd &amp; 0xff, val);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else switch (cmd &amp; 0xff) </div><div class='del'>-		{</div><div class='del'>-			case SOUND_MIXER_RECSRC:</div><div class='del'>-				ret = devc-&gt;recmask;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_OUTSRC:</div><div class='del'>-				ret = devc-&gt;outmask;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_DEVMASK:</div><div class='del'>-				ret = devc-&gt;supported_devices;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_STEREODEVS:</div><div class='del'>-				ret = devc-&gt;supported_devices;</div><div class='del'>-				/* The ESS seems to have stereo mic controls */</div><div class='del'>-				if (devc-&gt;model == MDL_ESS)</div><div class='del'>-					ret &amp;= ~(SOUND_MASK_SPEAKER|SOUND_MASK_IMIX);</div><div class='del'>-				else if (devc-&gt;model != MDL_JAZZ &amp;&amp; devc-&gt;model != MDL_SMW)</div><div class='del'>-					ret &amp;= ~(SOUND_MASK_MIC | SOUND_MASK_SPEAKER | SOUND_MASK_IMIX);</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_RECMASK:</div><div class='del'>-				ret = devc-&gt;supported_rec_devices;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_OUTMASK:</div><div class='del'>-				ret = devc-&gt;supported_out_devices;</div><div class='del'>-				break;</div><div class='del'>-				  </div><div class='del'>-			case SOUND_MIXER_CAPS:</div><div class='del'>-				ret = devc-&gt;mixer_caps;</div><div class='del'>-				break;</div><div class='del'>-				    </div><div class='del'>-			default:</div><div class='del'>-				ret = sb_mixer_get(devc, cmd &amp; 0xff);</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		return put_user(ret, p); </div><div class='del'>-	} else</div><div class='del'>-		return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mixer_operations sb_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "SB",</div><div class='del'>-	.name	= "Sound Blaster",</div><div class='del'>-	.ioctl	= sb_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mixer_operations als007_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "ALS007",</div><div class='del'>-	.name	= "Avance ALS-007",</div><div class='del'>-	.ioctl	= sb_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void sb_mixer_reset(sb_devc * devc)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sprintf(name, "SB_%d", devc-&gt;sbmixnum);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;sbmo.sm_games)</div><div class='del'>-		devc-&gt;levels = load_mixer_volumes(name, smg_default_levels, 1);</div><div class='del'>-	else</div><div class='del'>-		devc-&gt;levels = load_mixer_volumes(name, sb_default_levels, 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-		sb_mixer_set(devc, i, devc-&gt;levels[i]);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;model != MDL_ESS || !ess_mixer_reset (devc)) {</div><div class='del'>-		set_recmask(devc, SOUND_MASK_MIC);</div><div class='del'>-	};</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sb_mixer_init(sb_devc * devc, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	int mixer_type = 0;</div><div class='del'>-	int m;</div><div class='del'>-</div><div class='del'>-	devc-&gt;sbmixnum = sbmixnum++;</div><div class='del'>-	devc-&gt;levels = NULL;</div><div class='del'>-</div><div class='del'>-	sb_setmixer(devc, 0x00, 0);	/* Reset mixer */</div><div class='del'>-</div><div class='del'>-	if (!(mixer_type = detect_mixer(devc)))</div><div class='del'>-		return 0;	/* No mixer. Why? */</div><div class='del'>-</div><div class='del'>-	switch (devc-&gt;model)</div><div class='del'>-	{</div><div class='del'>-		case MDL_ESSPCI:</div><div class='del'>-		case MDL_YMPCI:</div><div class='del'>-		case MDL_SBPRO:</div><div class='del'>-		case MDL_AZTECH:</div><div class='del'>-		case MDL_JAZZ:</div><div class='del'>-			devc-&gt;mixer_caps = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-			devc-&gt;supported_devices = SBPRO_MIXER_DEVICES;</div><div class='del'>-			devc-&gt;supported_rec_devices = SBPRO_RECORDING_DEVICES;</div><div class='del'>-			devc-&gt;iomap = &amp;sbpro_mix;</div><div class='del'>-			devc-&gt;iomap_sz = ARRAY_SIZE(sbpro_mix);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_ESS:</div><div class='del'>-			ess_mixer_init (devc);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SMW:</div><div class='del'>-			devc-&gt;mixer_caps = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-			devc-&gt;supported_devices = 0;</div><div class='del'>-			devc-&gt;supported_rec_devices = 0;</div><div class='del'>-			devc-&gt;iomap = &amp;sbpro_mix;</div><div class='del'>-			devc-&gt;iomap_sz = ARRAY_SIZE(sbpro_mix);</div><div class='del'>-			smw_mixer_init(devc);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MDL_SB16:</div><div class='del'>-			devc-&gt;mixer_caps = 0;</div><div class='del'>-			devc-&gt;supported_rec_devices = SB16_RECORDING_DEVICES;</div><div class='del'>-			devc-&gt;supported_out_devices = SB16_OUTFILTER_DEVICES;</div><div class='del'>-			if (devc-&gt;submodel != SUBMDL_ALS007)</div><div class='del'>-			{</div><div class='del'>-				devc-&gt;supported_devices = SB16_MIXER_DEVICES;</div><div class='del'>-				devc-&gt;iomap = &amp;sb16_mix;</div><div class='del'>-				devc-&gt;iomap_sz = ARRAY_SIZE(sb16_mix);</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				devc-&gt;supported_devices = ALS007_MIXER_DEVICES;</div><div class='del'>-				devc-&gt;iomap = &amp;als007_mix;</div><div class='del'>-				devc-&gt;iomap_sz = ARRAY_SIZE(als007_mix);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			printk(KERN_WARNING "sb_mixer: Unsupported mixer type %d\n", devc-&gt;model);</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m = sound_alloc_mixerdev();</div><div class='del'>-	if (m == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	mixer_devs[m] = kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);</div><div class='del'>-	if (mixer_devs[m] == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "sb_mixer: Can't allocate memory\n");</div><div class='del'>-		sound_unload_mixerdev(m);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;submodel != SUBMDL_ALS007)</div><div class='del'>-		memcpy ((char *) mixer_devs[m], (char *) &amp;sb_mixer_operations, sizeof (struct mixer_operations));</div><div class='del'>-	else</div><div class='del'>-		memcpy ((char *) mixer_devs[m], (char *) &amp;als007_mixer_operations, sizeof (struct mixer_operations));</div><div class='del'>-</div><div class='del'>-	mixer_devs[m]-&gt;devc = devc;</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-			 mixer_devs[m]-&gt;owner = owner;</div><div class='del'>-	</div><div class='del'>-	devc-&gt;my_mixerdev = m;</div><div class='del'>-	sb_mixer_reset(devc);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sb_mixer_unload(sb_devc *devc)</div><div class='del'>-{</div><div class='del'>-	if (devc-&gt;my_mixerdev == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	kfree(mixer_devs[devc-&gt;my_mixerdev]);</div><div class='del'>-	sound_unload_mixerdev(devc-&gt;my_mixerdev);</div><div class='del'>-	sbmixnum--;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/sb_mixer.h b/sound/oss/sb_mixer.h<br/>deleted file mode 100644<br/>index 4b9425f085e3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sb_mixer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sb_mixer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sb_mixer.h</div><div class='del'>- * </div><div class='del'>- * Definitions for the SB Pro and SB16 mixers</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Modified:</div><div class='del'>- *	Hunyue Yau	Jan 6 1994</div><div class='del'>- *	Added defines for the Sound Galaxy NX Pro mixer.</div><div class='del'>- *</div><div class='del'>- *	Rolf Fokkens	Dec 20 1998</div><div class='del'>- *	Added defines for some ES188x chips.</div><div class='del'>- *</div><div class='del'>- *	Rolf Fokkens	Dec 27 1998</div><div class='del'>- *	Moved static stuff to sb_mixer.c</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Mixer registers</div><div class='del'>- * </div><div class='del'>- * NOTE!	RECORD_SRC == IN_FILTER</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Mixer registers of SB Pro</div><div class='del'>- */</div><div class='del'>-#define VOC_VOL		0x04</div><div class='del'>-#define MIC_VOL		0x0A</div><div class='del'>-#define MIC_MIX		0x0A</div><div class='del'>-#define RECORD_SRC	0x0C</div><div class='del'>-#define IN_FILTER	0x0C</div><div class='del'>-#define OUT_FILTER	0x0E</div><div class='del'>-#define MASTER_VOL	0x22</div><div class='del'>-#define FM_VOL		0x26</div><div class='del'>-#define CD_VOL		0x28</div><div class='del'>-#define LINE_VOL	0x2E</div><div class='del'>-#define IRQ_NR		0x80</div><div class='del'>-#define DMA_NR		0x81</div><div class='del'>-#define IRQ_STAT	0x82</div><div class='del'>-#define OPSW		0x3c</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Additional registers on the SG NX Pro </div><div class='del'>- */</div><div class='del'>-#define COVOX_VOL	0x42</div><div class='del'>-#define TREBLE_LVL	0x44</div><div class='del'>-#define BASS_LVL	0x46</div><div class='del'>-</div><div class='del'>-#define FREQ_HI         (1 &lt;&lt; 3)/* Use High-frequency ANFI filters */</div><div class='del'>-#define FREQ_LOW        0	/* Use Low-frequency ANFI filters */</div><div class='del'>-#define FILT_ON         0	/* Yes, 0 to turn it on, 1 for off */</div><div class='del'>-#define FILT_OFF        (1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-#define MONO_DAC	0x00</div><div class='del'>-#define STEREO_DAC	0x02</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mixer registers of SB16</div><div class='del'>- */</div><div class='del'>-#define SB16_OMASK	0x3c</div><div class='del'>-#define SB16_IMASK_L	0x3d</div><div class='del'>-#define SB16_IMASK_R	0x3e</div><div class='del'>-</div><div class='del'>-#define LEFT_CHN	0</div><div class='del'>-#define RIGHT_CHN	1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 3DSE register of AWE32/64</div><div class='del'>- */</div><div class='del'>-#define AWE_3DSE	0x90</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mixer registers of ALS007</div><div class='del'>- */</div><div class='del'>-#define ALS007_RECORD_SRC	0x6c</div><div class='del'>-#define ALS007_OUTPUT_CTRL1	0x3c</div><div class='del'>-#define ALS007_OUTPUT_CTRL2	0x4c</div><div class='del'>-</div><div class='del'>-#define MIX_ENT(name, reg_l, bit_l, len_l, reg_r, bit_r, len_r)	\</div><div class='del'>-	{{reg_l, bit_l, len_l}, {reg_r, bit_r, len_r}}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Recording sources (SB Pro)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SRC__MIC         1	/* Select Microphone recording source */</div><div class='del'>-#define SRC__CD          3	/* Select CD recording source */</div><div class='del'>-#define SRC__LINE        7	/* Use Line-in for recording source */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Recording sources for ALS-007</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ALS007_MIC	4</div><div class='del'>-#define ALS007_LINE	6</div><div class='del'>-#define ALS007_CD	2</div><div class='del'>-#define ALS007_SYNTH	7</div><div class='head'>diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c<br/>deleted file mode 100644<br/>index e85789e53816..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sequencer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sequencer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1671 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sequencer.c</div><div class='del'>- *</div><div class='del'>- * The sequencer personality manager.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Alan Cox	   : reformatted and fixed a pair of null pointer bugs</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "midi_ctrl.h"</div><div class='del'>-</div><div class='del'>-static int      sequencer_ok;</div><div class='del'>-static struct sound_timer_operations *tmr;</div><div class='del'>-static int      tmr_no = -1;	/* Currently selected timer */</div><div class='del'>-static int      pending_timer = -1;	/* For timer change operation */</div><div class='del'>-extern unsigned long seq_time;</div><div class='del'>-</div><div class='del'>-static int      obsolete_api_used;</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local counts for number of synth and MIDI devices. These are initialized</div><div class='del'>- * by the sequencer_open.</div><div class='del'>- */</div><div class='del'>-static int      max_mididev;</div><div class='del'>-static int      max_synthdev;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The seq_mode gives the operating mode of the sequencer:</div><div class='del'>- *      1 = level1 (the default)</div><div class='del'>- *      2 = level2 (extended capabilities)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SEQ_1	1</div><div class='del'>-#define SEQ_2	2</div><div class='del'>-static int      seq_mode = SEQ_1;</div><div class='del'>-</div><div class='del'>-static DECLARE_WAIT_QUEUE_HEAD(seq_sleeper);</div><div class='del'>-static DECLARE_WAIT_QUEUE_HEAD(midi_sleeper);</div><div class='del'>-</div><div class='del'>-static int      midi_opened[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static int      midi_written[MAX_MIDI_DEV];</div><div class='del'>-</div><div class='del'>-static unsigned long prev_input_time;</div><div class='del'>-static int      prev_event_time;</div><div class='del'>-</div><div class='del'>-#include "tuning.h"</div><div class='del'>-</div><div class='del'>-#define EV_SZ	8</div><div class='del'>-#define IEV_SZ	8</div><div class='del'>-</div><div class='del'>-static unsigned char *queue;</div><div class='del'>-static unsigned char *iqueue;</div><div class='del'>-</div><div class='del'>-static volatile int qhead, qtail, qlen;</div><div class='del'>-static volatile int iqhead, iqtail, iqlen;</div><div class='del'>-static volatile int seq_playing;</div><div class='del'>-static volatile int sequencer_busy;</div><div class='del'>-static int      output_threshold;</div><div class='del'>-static long     pre_event_timeout;</div><div class='del'>-static unsigned synth_open_mask;</div><div class='del'>-</div><div class='del'>-static int      seq_queue(unsigned char *note, char nonblock);</div><div class='del'>-static void     seq_startplay(void);</div><div class='del'>-static int      seq_sync(void);</div><div class='del'>-static void     seq_reset(void);</div><div class='del'>-</div><div class='del'>-#if MAX_SYNTH_DEV &gt; 15</div><div class='del'>-#error Too many synthesizer devices enabled.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int sequencer_read(int dev, struct file *file, char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	int c = count, p = 0;</div><div class='del'>-	int ev_len;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	ev_len = seq_mode == SEQ_1 ? 4 : 8;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (!iqlen)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>- 		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-  			return -EAGAIN;</div><div class='del'>-  		}</div><div class='del'>-</div><div class='del'>- 		interruptible_sleep_on_timeout(&amp;midi_sleeper,</div><div class='del'>-					       pre_event_timeout);</div><div class='del'>-		spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-		if (!iqlen)</div><div class='del'>-		{</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while (iqlen &amp;&amp; c &gt;= ev_len)</div><div class='del'>-	{</div><div class='del'>-		char *fixit = (char *) &amp;iqueue[iqhead * IEV_SZ];</div><div class='del'>-		spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-		if (copy_to_user(&amp;(buf)[p], fixit, ev_len))</div><div class='del'>-			return count - c;</div><div class='del'>-		p += ev_len;</div><div class='del'>-		c -= ev_len;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-		iqhead = (iqhead + 1) % SEQ_MAX_QUEUE;</div><div class='del'>-		iqlen--;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-	return count - c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sequencer_midi_output(int dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Currently NOP</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void seq_copy_to_input(unsigned char *event_rec, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Verify that the len is valid for the current mode.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (len != 4 &amp;&amp; len != 8)</div><div class='del'>-		return;</div><div class='del'>-	if ((seq_mode == SEQ_1) != (len == 4))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (iqlen &gt;= (SEQ_MAX_QUEUE - 1))</div><div class='del'>-		return;		/* Overflow */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	memcpy(&amp;iqueue[iqtail * IEV_SZ], event_rec, len);</div><div class='del'>-	iqlen++;</div><div class='del'>-	iqtail = (iqtail + 1) % SEQ_MAX_QUEUE;</div><div class='del'>-	wake_up(&amp;midi_sleeper);</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(seq_copy_to_input);</div><div class='del'>-</div><div class='del'>-static void sequencer_midi_input(int dev, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	unsigned int tstamp;</div><div class='del'>-	unsigned char event_rec[4];</div><div class='del'>-</div><div class='del'>-	if (data == 0xfe)	/* Ignore active sensing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tstamp = jiffies - seq_time;</div><div class='del'>-</div><div class='del'>-	if (tstamp != prev_input_time)</div><div class='del'>-	{</div><div class='del'>-		tstamp = (tstamp &lt;&lt; 8) | SEQ_WAIT;</div><div class='del'>-		seq_copy_to_input((unsigned char *) &amp;tstamp, 4);</div><div class='del'>-		prev_input_time = tstamp;</div><div class='del'>-	}</div><div class='del'>-	event_rec[0] = SEQ_MIDIPUTC;</div><div class='del'>-	event_rec[1] = data;</div><div class='del'>-	event_rec[2] = dev;</div><div class='del'>-	event_rec[3] = 0;</div><div class='del'>-</div><div class='del'>-	seq_copy_to_input(event_rec, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void seq_input_event(unsigned char *event_rec, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned long this_time;</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2)</div><div class='del'>-		this_time = tmr-&gt;get_time(tmr_no);</div><div class='del'>-	else</div><div class='del'>-		this_time = jiffies - seq_time;</div><div class='del'>-</div><div class='del'>-	if (this_time != prev_input_time)</div><div class='del'>-	{</div><div class='del'>-		unsigned char   tmp_event[8];</div><div class='del'>-</div><div class='del'>-		tmp_event[0] = EV_TIMING;</div><div class='del'>-		tmp_event[1] = TMR_WAIT_ABS;</div><div class='del'>-		tmp_event[2] = 0;</div><div class='del'>-		tmp_event[3] = 0;</div><div class='del'>-		*(unsigned int *) &amp;tmp_event[4] = this_time;</div><div class='del'>-</div><div class='del'>-		seq_copy_to_input(tmp_event, 8);</div><div class='del'>-		prev_input_time = this_time;</div><div class='del'>-	}</div><div class='del'>-	seq_copy_to_input(event_rec, len);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(seq_input_event);</div><div class='del'>-</div><div class='del'>-int sequencer_write(int dev, struct file *file, const char __user *buf, int count)</div><div class='del'>-{</div><div class='del'>-	unsigned char event_rec[EV_SZ], ev_code;</div><div class='del'>-	int p = 0, c, ev_size;</div><div class='del'>-	int mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	DEB(printk("sequencer_write(dev=%d, count=%d)\n", dev, count));</div><div class='del'>-</div><div class='del'>-	if (mode == OPEN_READ)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	c = count;</div><div class='del'>-</div><div class='del'>-	while (c &gt;= 4)</div><div class='del'>-	{</div><div class='del'>-		if (copy_from_user((char *) event_rec, &amp;(buf)[p], 4))</div><div class='del'>-			goto out;</div><div class='del'>-		ev_code = event_rec[0];</div><div class='del'>-</div><div class='del'>-		if (ev_code == SEQ_FULLSIZE)</div><div class='del'>-		{</div><div class='del'>-			int err, fmt;</div><div class='del'>-</div><div class='del'>-			dev = *(unsigned short *) &amp;event_rec[2];</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= max_synthdev || synth_devs[dev] == NULL)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-				return -ENXIO;</div><div class='del'>-</div><div class='del'>-			fmt = (*(short *) &amp;event_rec[0]) &amp; 0xffff;</div><div class='del'>-			err = synth_devs[dev]-&gt;load_patch(dev, fmt, buf, p + 4, c, 0);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		if (ev_code &gt;= 128)</div><div class='del'>-		{</div><div class='del'>-			if (seq_mode == SEQ_2 &amp;&amp; ev_code == SEQ_EXTENDED)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING "Sequencer: Invalid level 2 event %x\n", ev_code);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			ev_size = 8;</div><div class='del'>-</div><div class='del'>-			if (c &lt; ev_size)</div><div class='del'>-			{</div><div class='del'>-				if (!seq_playing)</div><div class='del'>-					seq_startplay();</div><div class='del'>-				return count - c;</div><div class='del'>-			}</div><div class='del'>-			if (copy_from_user((char *)&amp;event_rec[4],</div><div class='del'>-					   &amp;(buf)[p + 4], 4))</div><div class='del'>-				goto out;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_WARNING "Sequencer: 4 byte event in level 2 mode\n");</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			ev_size = 4;</div><div class='del'>-</div><div class='del'>-			if (event_rec[0] != SEQ_MIDIPUTC)</div><div class='del'>-				obsolete_api_used = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (event_rec[0] == SEQ_MIDIPUTC)</div><div class='del'>-		{</div><div class='del'>-			if (!midi_opened[event_rec[2]])</div><div class='del'>-			{</div><div class='del'>-				int err, mode;</div><div class='del'>-				int dev = event_rec[2];</div><div class='del'>-</div><div class='del'>-				if (dev &gt;= max_mididev || midi_devs[dev]==NULL)</div><div class='del'>-				{</div><div class='del'>-					/*printk("Sequencer Error: Nonexistent MIDI device %d\n", dev);*/</div><div class='del'>-					return -ENXIO;</div><div class='del'>-				}</div><div class='del'>-				mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-				if ((err = midi_devs[dev]-&gt;open(dev, mode,</div><div class='del'>-								sequencer_midi_input, sequencer_midi_output)) &lt; 0)</div><div class='del'>-				{</div><div class='del'>-					seq_reset();</div><div class='del'>-					printk(KERN_WARNING "Sequencer Error: Unable to open Midi #%d\n", dev);</div><div class='del'>-					return err;</div><div class='del'>-				}</div><div class='del'>-				midi_opened[dev] = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!seq_queue(event_rec, (file-&gt;f_flags &amp; (O_NONBLOCK) ? 1 : 0)))</div><div class='del'>-		{</div><div class='del'>-			int processed = count - c;</div><div class='del'>-</div><div class='del'>-			if (!seq_playing)</div><div class='del'>-				seq_startplay();</div><div class='del'>-</div><div class='del'>-			if (!processed &amp;&amp; (file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			else</div><div class='del'>-				return processed;</div><div class='del'>-		}</div><div class='del'>-		p += ev_size;</div><div class='del'>-		c -= ev_size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!seq_playing)</div><div class='del'>-		seq_startplay();</div><div class='del'>-out:</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_queue(unsigned char *note, char nonblock)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Test if there is space in the queue</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (qlen &gt;= SEQ_MAX_QUEUE)</div><div class='del'>-		if (!seq_playing)</div><div class='del'>-			seq_startplay();	/*</div><div class='del'>-						 * Give chance to drain the queue</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-	if (!nonblock &amp;&amp; qlen &gt;= SEQ_MAX_QUEUE &amp;&amp; !waitqueue_active(&amp;seq_sleeper)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Sleep until there is enough space on the queue</div><div class='del'>-		 */</div><div class='del'>-		interruptible_sleep_on(&amp;seq_sleeper);</div><div class='del'>-	}</div><div class='del'>-	if (qlen &gt;= SEQ_MAX_QUEUE)</div><div class='del'>-	{</div><div class='del'>-		return 0;	/*</div><div class='del'>-				 * To be sure</div><div class='del'>-				 */</div><div class='del'>-	}</div><div class='del'>-	memcpy(&amp;queue[qtail * EV_SZ], note, EV_SZ);</div><div class='del'>-</div><div class='del'>-	qtail = (qtail + 1) % SEQ_MAX_QUEUE;</div><div class='del'>-	qlen++;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int extended_event(unsigned char *q)</div><div class='del'>-{</div><div class='del'>-	int dev = q[2];</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= max_synthdev)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	switch (q[1])</div><div class='del'>-	{</div><div class='del'>-		case SEQ_NOTEOFF:</div><div class='del'>-			synth_devs[dev]-&gt;kill_note(dev, q[3], q[4], q[5]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_NOTEON:</div><div class='del'>-			if (q[4] &gt; 127 &amp;&amp; q[4] != 255)</div><div class='del'>-				return 0;</div><div class='del'>-</div><div class='del'>-			if (q[5] == 0)</div><div class='del'>-			{</div><div class='del'>-				synth_devs[dev]-&gt;kill_note(dev, q[3], q[4], q[5]);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			synth_devs[dev]-&gt;start_note(dev, q[3], q[4], q[5]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_PGMCHANGE:</div><div class='del'>-			synth_devs[dev]-&gt;set_instr(dev, q[3], q[4]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_AFTERTOUCH:</div><div class='del'>-			synth_devs[dev]-&gt;aftertouch(dev, q[3], q[4]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_BALANCE:</div><div class='del'>-			synth_devs[dev]-&gt;panning(dev, q[3], (char) q[4]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_CONTROLLER:</div><div class='del'>-			synth_devs[dev]-&gt;controller(dev, q[3], q[4], (short) (q[5] | (q[6] &lt;&lt; 8)));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_VOLMODE:</div><div class='del'>-			if (synth_devs[dev]-&gt;volume_method != NULL)</div><div class='del'>-				synth_devs[dev]-&gt;volume_method(dev, q[3]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int find_voice(int dev, int chn, int note)</div><div class='del'>-{</div><div class='del'>-	unsigned short key;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	key = (chn &lt;&lt; 8) | (note + 1);</div><div class='del'>-	for (i = 0; i &lt; synth_devs[dev]-&gt;alloc.max_voice; i++)</div><div class='del'>-		if (synth_devs[dev]-&gt;alloc.map[i] == key)</div><div class='del'>-			return i;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alloc_voice(int dev, int chn, int note)</div><div class='del'>-{</div><div class='del'>-	unsigned short  key;</div><div class='del'>-	int voice;</div><div class='del'>-</div><div class='del'>-	key = (chn &lt;&lt; 8) | (note + 1);</div><div class='del'>-</div><div class='del'>-	voice = synth_devs[dev]-&gt;alloc_voice(dev, chn, note,</div><div class='del'>-					     &amp;synth_devs[dev]-&gt;alloc);</div><div class='del'>-	synth_devs[dev]-&gt;alloc.map[voice] = key;</div><div class='del'>-	synth_devs[dev]-&gt;alloc.alloc_times[voice] =</div><div class='del'>-			synth_devs[dev]-&gt;alloc.timestamp++;</div><div class='del'>-	return voice;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_chn_voice_event(unsigned char *event_rec)</div><div class='del'>-{</div><div class='del'>-#define dev event_rec[1]</div><div class='del'>-#define cmd event_rec[2]</div><div class='del'>-#define chn event_rec[3]</div><div class='del'>-#define note event_rec[4]</div><div class='del'>-#define parm event_rec[5]</div><div class='del'>-</div><div class='del'>-	int voice = -1;</div><div class='del'>-</div><div class='del'>-	if ((int) dev &gt; max_synthdev || synth_devs[dev] == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		return;</div><div class='del'>-	if (!synth_devs[dev])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2)</div><div class='del'>-	{</div><div class='del'>-		if (synth_devs[dev]-&gt;alloc_voice)</div><div class='del'>-			voice = find_voice(dev, chn, note);</div><div class='del'>-</div><div class='del'>-		if (cmd == MIDI_NOTEON &amp;&amp; parm == 0)</div><div class='del'>-		{</div><div class='del'>-			cmd = MIDI_NOTEOFF;</div><div class='del'>-			parm = 64;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case MIDI_NOTEON:</div><div class='del'>-			if (note &gt; 127 &amp;&amp; note != 255)	/* Not a seq2 feature */</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			if (voice == -1 &amp;&amp; seq_mode == SEQ_2 &amp;&amp; synth_devs[dev]-&gt;alloc_voice)</div><div class='del'>-			{</div><div class='del'>-				/* Internal synthesizer (FM, GUS, etc) */</div><div class='del'>-				voice = alloc_voice(dev, chn, note);</div><div class='del'>-			}</div><div class='del'>-			if (voice == -1)</div><div class='del'>-				voice = chn;</div><div class='del'>-</div><div class='del'>-			if (seq_mode == SEQ_2 &amp;&amp; (int) dev &lt; num_synths)</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 * The MIDI channel 10 is a percussive channel. Use the note</div><div class='del'>-				 * number to select the proper patch (128 to 255) to play.</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-				if (chn == 9)</div><div class='del'>-				{</div><div class='del'>-					synth_devs[dev]-&gt;set_instr(dev, voice, 128 + note);</div><div class='del'>-					synth_devs[dev]-&gt;chn_info[chn].pgm_num = 128 + note;</div><div class='del'>-				}</div><div class='del'>-				synth_devs[dev]-&gt;setup_voice(dev, voice, chn);</div><div class='del'>-			}</div><div class='del'>-			synth_devs[dev]-&gt;start_note(dev, voice, note, parm);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIDI_NOTEOFF:</div><div class='del'>-			if (voice == -1)</div><div class='del'>-				voice = chn;</div><div class='del'>-			synth_devs[dev]-&gt;kill_note(dev, voice, note, parm);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIDI_KEY_PRESSURE:</div><div class='del'>-			if (voice == -1)</div><div class='del'>-				voice = chn;</div><div class='del'>-			synth_devs[dev]-&gt;aftertouch(dev, voice, parm);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-#undef dev</div><div class='del'>-#undef cmd</div><div class='del'>-#undef chn</div><div class='del'>-#undef note</div><div class='del'>-#undef parm</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void seq_chn_common_event(unsigned char *event_rec)</div><div class='del'>-{</div><div class='del'>-	unsigned char dev = event_rec[1];</div><div class='del'>-	unsigned char cmd = event_rec[2];</div><div class='del'>-	unsigned char chn = event_rec[3];</div><div class='del'>-	unsigned char p1 = event_rec[4];</div><div class='del'>-</div><div class='del'>-	/* unsigned char p2 = event_rec[5]; */</div><div class='del'>-	unsigned short w14 = *(short *) &amp;event_rec[6];</div><div class='del'>-</div><div class='del'>-	if ((int) dev &gt; max_synthdev || synth_devs[dev] == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		return;</div><div class='del'>-	if (!synth_devs[dev])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case MIDI_PGM_CHANGE:</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-			{</div><div class='del'>-				synth_devs[dev]-&gt;chn_info[chn].pgm_num = p1;</div><div class='del'>-				if ((int) dev &gt;= num_synths)</div><div class='del'>-					synth_devs[dev]-&gt;set_instr(dev, chn, p1);</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				synth_devs[dev]-&gt;set_instr(dev, chn, p1);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIDI_CTL_CHANGE:</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-			{</div><div class='del'>-				if (chn &gt; 15 || p1 &gt; 127)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				synth_devs[dev]-&gt;chn_info[chn].controllers[p1] = w14 &amp; 0x7f;</div><div class='del'>-</div><div class='del'>-				if (p1 &lt; 32)	/* Setting MSB should clear LSB to 0 */</div><div class='del'>-					synth_devs[dev]-&gt;chn_info[chn].controllers[p1 + 32] = 0;</div><div class='del'>-</div><div class='del'>-				if ((int) dev &lt; num_synths)</div><div class='del'>-				{</div><div class='del'>-					int val = w14 &amp; 0x7f;</div><div class='del'>-					int i, key;</div><div class='del'>-</div><div class='del'>-					if (p1 &lt; 64)	/* Combine MSB and LSB */</div><div class='del'>-					{</div><div class='del'>-						val = ((synth_devs[dev]-&gt;</div><div class='del'>-							chn_info[chn].controllers[p1 &amp; ~32] &amp; 0x7f) &lt;&lt; 7)</div><div class='del'>-							| (synth_devs[dev]-&gt;</div><div class='del'>-							chn_info[chn].controllers[p1 | 32] &amp; 0x7f);</div><div class='del'>-						p1 &amp;= ~32;</div><div class='del'>-					}</div><div class='del'>-					/* Handle all playing notes on this channel */</div><div class='del'>-</div><div class='del'>-					key = ((int) chn &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-					for (i = 0; i &lt; synth_devs[dev]-&gt;alloc.max_voice; i++)</div><div class='del'>-						if ((synth_devs[dev]-&gt;alloc.map[i] &amp; 0xff00) == key)</div><div class='del'>-							synth_devs[dev]-&gt;controller(dev, i, p1, val);</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-					synth_devs[dev]-&gt;controller(dev, chn, p1, w14);</div><div class='del'>-			}</div><div class='del'>-			else	/* Mode 1 */</div><div class='del'>-				synth_devs[dev]-&gt;controller(dev, chn, p1, w14);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIDI_PITCH_BEND:</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-			{</div><div class='del'>-				synth_devs[dev]-&gt;chn_info[chn].bender_value = w14;</div><div class='del'>-</div><div class='del'>-				if ((int) dev &lt; num_synths)</div><div class='del'>-				{</div><div class='del'>-					/* Handle all playing notes on this channel */</div><div class='del'>-					int i, key;</div><div class='del'>-</div><div class='del'>-					key = (chn &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-					for (i = 0; i &lt; synth_devs[dev]-&gt;alloc.max_voice; i++)</div><div class='del'>-						if ((synth_devs[dev]-&gt;alloc.map[i] &amp; 0xff00) == key)</div><div class='del'>-							synth_devs[dev]-&gt;bender(dev, i, w14);</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-					synth_devs[dev]-&gt;bender(dev, chn, w14);</div><div class='del'>-			}</div><div class='del'>-			else	/* MODE 1 */</div><div class='del'>-				synth_devs[dev]-&gt;bender(dev, chn, w14);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_timing_event(unsigned char *event_rec)</div><div class='del'>-{</div><div class='del'>-	unsigned char cmd = event_rec[1];</div><div class='del'>-	unsigned int parm = *(int *) &amp;event_rec[4];</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2)</div><div class='del'>-	{</div><div class='del'>-		int ret;</div><div class='del'>-</div><div class='del'>-		if ((ret = tmr-&gt;event(tmr_no, event_rec)) == TIMER_ARMED)</div><div class='del'>-			if ((SEQ_MAX_QUEUE - qlen) &gt;= output_threshold)</div><div class='del'>-				wake_up(&amp;seq_sleeper);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case TMR_WAIT_REL:</div><div class='del'>-			parm += prev_event_time;</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * NOTE!  No break here. Execution of TMR_WAIT_REL continues in the</div><div class='del'>-			 * next case (TMR_WAIT_ABS)</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-		case TMR_WAIT_ABS:</div><div class='del'>-			if (parm &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				long time;</div><div class='del'>-</div><div class='del'>-				time = parm;</div><div class='del'>-				prev_event_time = time;</div><div class='del'>-</div><div class='del'>-				seq_playing = 1;</div><div class='del'>-				request_sound_timer(time);</div><div class='del'>-</div><div class='del'>-				if ((SEQ_MAX_QUEUE - qlen) &gt;= output_threshold)</div><div class='del'>-					wake_up(&amp;seq_sleeper);</div><div class='del'>-				return TIMER_ARMED;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_START:</div><div class='del'>-			seq_time = jiffies;</div><div class='del'>-			prev_input_time = 0;</div><div class='del'>-			prev_event_time = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_STOP:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_CONTINUE:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_TEMPO:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_ECHO:</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-				seq_copy_to_input(event_rec, 8);</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				parm = (parm &lt;&lt; 8 | SEQ_ECHO);</div><div class='del'>-				seq_copy_to_input((unsigned char *) &amp;parm, 4);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TIMER_NOT_ARMED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_local_event(unsigned char *event_rec)</div><div class='del'>-{</div><div class='del'>-	unsigned char   cmd = event_rec[1];</div><div class='del'>-	unsigned int    parm = *((unsigned int *) &amp;event_rec[4]);</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case LOCL_STARTAUDIO:</div><div class='del'>-			DMAbuf_start_devices(parm);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_sysex_message(unsigned char *event_rec)</div><div class='del'>-{</div><div class='del'>-	unsigned int dev = event_rec[1];</div><div class='del'>-	int i, l = 0;</div><div class='del'>-	unsigned char  *buf = &amp;event_rec[2];</div><div class='del'>-</div><div class='del'>-	if (dev &gt; max_synthdev)</div><div class='del'>-		return;</div><div class='del'>-	if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		return;</div><div class='del'>-	if (!synth_devs[dev])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	l = 0;</div><div class='del'>-	for (i = 0; i &lt; 6 &amp;&amp; buf[i] != 0xff; i++)</div><div class='del'>-		l = i + 1;</div><div class='del'>-</div><div class='del'>-	if (!synth_devs[dev]-&gt;send_sysex)</div><div class='del'>-		return;</div><div class='del'>-	if (l &gt; 0)</div><div class='del'>-		synth_devs[dev]-&gt;send_sysex(dev, buf, l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int play_event(unsigned char *q)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! This routine returns</div><div class='del'>-	 *   0 = normal event played.</div><div class='del'>-	 *   1 = Timer armed. Suspend playback until timer callback.</div><div class='del'>-	 *   2 = MIDI output buffer full. Restore queue and suspend until timer</div><div class='del'>-	 */</div><div class='del'>-	unsigned int *delay;</div><div class='del'>-</div><div class='del'>-	switch (q[0])</div><div class='del'>-	{</div><div class='del'>-		case SEQ_NOTEOFF:</div><div class='del'>-			if (synth_open_mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-				if (synth_devs[0])</div><div class='del'>-					synth_devs[0]-&gt;kill_note(0, q[1], 255, q[3]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_NOTEON:</div><div class='del'>-			if (q[4] &lt; 128 || q[4] == 255)</div><div class='del'>-				if (synth_open_mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-					if (synth_devs[0])</div><div class='del'>-						synth_devs[0]-&gt;start_note(0, q[1], q[2], q[3]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_WAIT:</div><div class='del'>-			delay = (unsigned int *) q;	/*</div><div class='del'>-							 * Bytes 1 to 3 are containing the *</div><div class='del'>-							 * delay in 'ticks'</div><div class='del'>-							 */</div><div class='del'>-			*delay = (*delay &gt;&gt; 8) &amp; 0xffffff;</div><div class='del'>-</div><div class='del'>-			if (*delay &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				long time;</div><div class='del'>-</div><div class='del'>-				seq_playing = 1;</div><div class='del'>-				time = *delay;</div><div class='del'>-				prev_event_time = time;</div><div class='del'>-</div><div class='del'>-				request_sound_timer(time);</div><div class='del'>-</div><div class='del'>-				if ((SEQ_MAX_QUEUE - qlen) &gt;= output_threshold)</div><div class='del'>-					wake_up(&amp;seq_sleeper);</div><div class='del'>-				/*</div><div class='del'>-				 * The timer is now active and will reinvoke this function</div><div class='del'>-				 * after the timer expires. Return to the caller now.</div><div class='del'>-				 */</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_PGMCHANGE:</div><div class='del'>-			if (synth_open_mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-				if (synth_devs[0])</div><div class='del'>-					synth_devs[0]-&gt;set_instr(0, q[1], q[2]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_SYNCTIMER: 	/*</div><div class='del'>-					 * Reset timer</div><div class='del'>-					 */</div><div class='del'>-			seq_time = jiffies;</div><div class='del'>-			prev_input_time = 0;</div><div class='del'>-			prev_event_time = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_MIDIPUTC:	/*</div><div class='del'>-					 * Put a midi character</div><div class='del'>-					 */</div><div class='del'>-			if (midi_opened[q[2]])</div><div class='del'>-			{</div><div class='del'>-				int dev;</div><div class='del'>-</div><div class='del'>-				dev = q[2];</div><div class='del'>-</div><div class='del'>-				if (dev &lt; 0 || dev &gt;= num_midis || midi_devs[dev] == NULL)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				if (!midi_devs[dev]-&gt;outputc(dev, q[1]))</div><div class='del'>-				{</div><div class='del'>-					/*</div><div class='del'>-					 * Output FIFO is full. Wait one timer cycle and try again.</div><div class='del'>-					 */</div><div class='del'>-</div><div class='del'>-					seq_playing = 1;</div><div class='del'>-					request_sound_timer(-1);</div><div class='del'>-					return 2;</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-					midi_written[dev] = 1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_ECHO:</div><div class='del'>-			seq_copy_to_input(q, 4);	/*</div><div class='del'>-							 * Echo back to the process</div><div class='del'>-							 */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_PRIVATE:</div><div class='del'>-			if ((int) q[1] &lt; max_synthdev)</div><div class='del'>-				synth_devs[q[1]]-&gt;hw_control(q[1], q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SEQ_EXTENDED:</div><div class='del'>-			extended_event(q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case EV_CHN_VOICE:</div><div class='del'>-			seq_chn_voice_event(q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case EV_CHN_COMMON:</div><div class='del'>-			seq_chn_common_event(q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case EV_TIMING:</div><div class='del'>-			if (seq_timing_event(q) == TIMER_ARMED)</div><div class='del'>-			{</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case EV_SEQ_LOCAL:</div><div class='del'>-			seq_local_event(q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case EV_SYSEX:</div><div class='del'>-			seq_sysex_message(q);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* called also as timer in irq context */</div><div class='del'>-static void seq_startplay(void)</div><div class='del'>-{</div><div class='del'>-	int this_one, action;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	while (qlen &gt; 0)</div><div class='del'>-	{</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-		qhead = ((this_one = qhead) + 1) % SEQ_MAX_QUEUE;</div><div class='del'>-		qlen--;</div><div class='del'>-		spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-		seq_playing = 1;</div><div class='del'>-</div><div class='del'>-		if ((action = play_event(&amp;queue[this_one * EV_SZ])))</div><div class='del'>-		{		/* Suspend playback. Next timer routine invokes this routine again */</div><div class='del'>-			if (action == 2)</div><div class='del'>-			{</div><div class='del'>-				qlen++;</div><div class='del'>-				qhead = this_one;</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_playing = 0;</div><div class='del'>-</div><div class='del'>-	if ((SEQ_MAX_QUEUE - qlen) &gt;= output_threshold)</div><div class='del'>-		wake_up(&amp;seq_sleeper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void reset_controllers(int dev, unsigned char *controller, int update_dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 128; i++)</div><div class='del'>-		controller[i] = ctrl_def_values[i];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setup_mode2(void)</div><div class='del'>-{</div><div class='del'>-	int dev;</div><div class='del'>-</div><div class='del'>-	max_synthdev = num_synths;</div><div class='del'>-</div><div class='del'>-	for (dev = 0; dev &lt; num_midis; dev++)</div><div class='del'>-	{</div><div class='del'>-		if (midi_devs[dev] &amp;&amp; midi_devs[dev]-&gt;converter != NULL)</div><div class='del'>-		{</div><div class='del'>-			synth_devs[max_synthdev++] = midi_devs[dev]-&gt;converter;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (dev = 0; dev &lt; max_synthdev; dev++)</div><div class='del'>-	{</div><div class='del'>-		int chn;</div><div class='del'>-</div><div class='del'>-		synth_devs[dev]-&gt;sysex_ptr = 0;</div><div class='del'>-		synth_devs[dev]-&gt;emulation = 0;</div><div class='del'>-</div><div class='del'>-		for (chn = 0; chn &lt; 16; chn++)</div><div class='del'>-		{</div><div class='del'>-			synth_devs[dev]-&gt;chn_info[chn].pgm_num = 0;</div><div class='del'>-			reset_controllers(dev,</div><div class='del'>-				synth_devs[dev]-&gt;chn_info[chn].controllers,0);</div><div class='del'>-			synth_devs[dev]-&gt;chn_info[chn].bender_value = (1 &lt;&lt; 7);	/* Neutral */</div><div class='del'>-			synth_devs[dev]-&gt;chn_info[chn].bender_range = 200;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	max_mididev = 0;</div><div class='del'>-	seq_mode = SEQ_2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sequencer_open(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int retval, mode, i;</div><div class='del'>-	int level, tmp;</div><div class='del'>-</div><div class='del'>-	if (!sequencer_ok)</div><div class='del'>-		sequencer_init();</div><div class='del'>-</div><div class='del'>-	level = ((dev &amp; 0x0f) == SND_DEV_SEQ2) ? 2 : 1;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-	mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	DEB(printk("sequencer_open(dev=%d)\n", dev));</div><div class='del'>-</div><div class='del'>-	if (!sequencer_ok)</div><div class='del'>-	{</div><div class='del'>-/*		printk("Sound card: sequencer not initialized\n");*/</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	if (dev)		/* Patch manager device (obsolete) */</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	if(synth_devs[dev] == NULL)</div><div class='del'>-		request_module("synth0");</div><div class='del'>-</div><div class='del'>-	if (mode == OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		if (!num_midis)</div><div class='del'>-		{</div><div class='del'>-			/*printk("Sequencer: No MIDI devices. Input not possible\n");*/</div><div class='del'>-			sequencer_busy = 0;</div><div class='del'>-			return -ENXIO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (sequencer_busy)</div><div class='del'>-	{</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	sequencer_busy = 1;</div><div class='del'>-	obsolete_api_used = 0;</div><div class='del'>-</div><div class='del'>-	max_mididev = num_midis;</div><div class='del'>-	max_synthdev = num_synths;</div><div class='del'>-	pre_event_timeout = MAX_SCHEDULE_TIMEOUT;</div><div class='del'>-	seq_mode = SEQ_1;</div><div class='del'>-</div><div class='del'>-	if (pending_timer != -1)</div><div class='del'>-	{</div><div class='del'>-		tmr_no = pending_timer;</div><div class='del'>-		pending_timer = -1;</div><div class='del'>-	}</div><div class='del'>-	if (tmr_no == -1)	/* Not selected yet */</div><div class='del'>-	{</div><div class='del'>-		int i, best;</div><div class='del'>-</div><div class='del'>-		best = -1;</div><div class='del'>-		for (i = 0; i &lt; num_sound_timers; i++)</div><div class='del'>-			if (sound_timer_devs[i] &amp;&amp; sound_timer_devs[i]-&gt;priority &gt; best)</div><div class='del'>-			{</div><div class='del'>-				tmr_no = i;</div><div class='del'>-				best = sound_timer_devs[i]-&gt;priority;</div><div class='del'>-			}</div><div class='del'>-		if (tmr_no == -1)	/* Should not be */</div><div class='del'>-			tmr_no = 0;</div><div class='del'>-	}</div><div class='del'>-	tmr = sound_timer_devs[tmr_no];</div><div class='del'>-</div><div class='del'>-	if (level == 2)</div><div class='del'>-	{</div><div class='del'>-		if (tmr == NULL)</div><div class='del'>-		{</div><div class='del'>-			/*printk("sequencer: No timer for level 2\n");*/</div><div class='del'>-			sequencer_busy = 0;</div><div class='del'>-			return -ENXIO;</div><div class='del'>-		}</div><div class='del'>-		setup_mode2();</div><div class='del'>-	}</div><div class='del'>-	if (!max_synthdev &amp;&amp; !max_mididev)</div><div class='del'>-	{</div><div class='del'>-		sequencer_busy=0;</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	synth_open_mask = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_mididev; i++)</div><div class='del'>-	{</div><div class='del'>-		midi_opened[i] = 0;</div><div class='del'>-		midi_written[i] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_synthdev; i++)</div><div class='del'>-	{</div><div class='del'>-		if (synth_devs[i]==NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!try_module_get(synth_devs[i]-&gt;owner))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if ((tmp = synth_devs[i]-&gt;open(i, mode)) &lt; 0)</div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "Sequencer: Warning! Cannot open synth device #%d (%d)\n", i, tmp);</div><div class='del'>-			if (synth_devs[i]-&gt;midi_dev)</div><div class='del'>-				printk(KERN_WARNING "(Maps to MIDI dev #%d)\n", synth_devs[i]-&gt;midi_dev);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			synth_open_mask |= (1 &lt;&lt; i);</div><div class='del'>-			if (synth_devs[i]-&gt;midi_dev)</div><div class='del'>-				midi_opened[synth_devs[i]-&gt;midi_dev] = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_time = jiffies;</div><div class='del'>-</div><div class='del'>-	prev_input_time = 0;</div><div class='del'>-	prev_event_time = 0;</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_1 &amp;&amp; (mode == OPEN_READ || mode == OPEN_READWRITE))</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Initialize midi input devices</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; max_mididev; i++)</div><div class='del'>-			if (!midi_opened[i] &amp;&amp; midi_devs[i])</div><div class='del'>-			{</div><div class='del'>-				if (!try_module_get(midi_devs[i]-&gt;owner))</div><div class='del'>-					continue;</div><div class='del'>-	</div><div class='del'>-				if ((retval = midi_devs[i]-&gt;open(i, mode,</div><div class='del'>-					sequencer_midi_input, sequencer_midi_output)) &gt;= 0)</div><div class='del'>-				{</div><div class='del'>-					midi_opened[i] = 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2) {</div><div class='del'>-		if (try_module_get(tmr-&gt;owner))</div><div class='del'>-			tmr-&gt;open(tmr_no, seq_mode);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	init_waitqueue_head(&amp;seq_sleeper);</div><div class='del'>- 	init_waitqueue_head(&amp;midi_sleeper);</div><div class='del'>-	output_threshold = SEQ_MAX_QUEUE / 2;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_drain_midi_queues(void)</div><div class='del'>-{</div><div class='del'>-	int i, n;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Give the Midi drivers time to drain their output queues</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	n = 1;</div><div class='del'>-</div><div class='del'>-	while (!signal_pending(current) &amp;&amp; n)</div><div class='del'>-	{</div><div class='del'>-		n = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; max_mididev; i++)</div><div class='del'>-			if (midi_opened[i] &amp;&amp; midi_written[i])</div><div class='del'>-				if (midi_devs[i]-&gt;buffer_status != NULL)</div><div class='del'>-					if (midi_devs[i]-&gt;buffer_status(i))</div><div class='del'>-						n++;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Let's have a delay</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>- 		if (n)</div><div class='del'>- 			interruptible_sleep_on_timeout(&amp;seq_sleeper,</div><div class='del'>-						       HZ/10);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sequencer_release(int dev, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int mode = translate_mode(file);</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	DEB(printk("sequencer_release(dev=%d)\n", dev));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Wait until the queue is empty (if we don't have nonblock)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (mode != OPEN_READ &amp;&amp; !(file-&gt;f_flags &amp; O_NONBLOCK))</div><div class='del'>-	{</div><div class='del'>-		while (!signal_pending(current) &amp;&amp; qlen &gt; 0)</div><div class='del'>-		{</div><div class='del'>-  			seq_sync();</div><div class='del'>- 			interruptible_sleep_on_timeout(&amp;seq_sleeper,</div><div class='del'>-						       3*HZ);</div><div class='del'>- 			/* Extra delay */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mode != OPEN_READ)</div><div class='del'>-		seq_drain_midi_queues();	/*</div><div class='del'>-						 * Ensure the output queues are empty</div><div class='del'>-						 */</div><div class='del'>-	seq_reset();</div><div class='del'>-	if (mode != OPEN_READ)</div><div class='del'>-		seq_drain_midi_queues();	/*</div><div class='del'>-						 * Flush the all notes off messages</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_synthdev; i++)</div><div class='del'>-	{</div><div class='del'>-		if (synth_open_mask &amp; (1 &lt;&lt; i))	/*</div><div class='del'>-						 * Actually opened</div><div class='del'>-						 */</div><div class='del'>-			if (synth_devs[i])</div><div class='del'>-			{</div><div class='del'>-				synth_devs[i]-&gt;close(i);</div><div class='del'>-</div><div class='del'>-				module_put(synth_devs[i]-&gt;owner);</div><div class='del'>-</div><div class='del'>-				if (synth_devs[i]-&gt;midi_dev)</div><div class='del'>-					midi_opened[synth_devs[i]-&gt;midi_dev] = 0;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_mididev; i++)</div><div class='del'>-	{</div><div class='del'>-		if (midi_opened[i]) {</div><div class='del'>-			midi_devs[i]-&gt;close(i);</div><div class='del'>-			module_put(midi_devs[i]-&gt;owner);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2) {</div><div class='del'>-		tmr-&gt;close(tmr_no);</div><div class='del'>-		module_put(tmr-&gt;owner);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (obsolete_api_used)</div><div class='del'>-		printk(KERN_WARNING "/dev/music: Obsolete (4 byte) API was used by %s\n", current-&gt;comm);</div><div class='del'>-	sequencer_busy = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int seq_sync(void)</div><div class='del'>-{</div><div class='del'>-	if (qlen &amp;&amp; !seq_playing &amp;&amp; !signal_pending(current))</div><div class='del'>-		seq_startplay();</div><div class='del'>-</div><div class='del'>- 	if (qlen &gt; 0)</div><div class='del'>- 		interruptible_sleep_on_timeout(&amp;seq_sleeper, HZ);</div><div class='del'>-	return qlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void midi_outc(int dev, unsigned char data)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! Calls sleep(). Don't call this from interrupt.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	int n;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This routine sends one byte to the Midi channel.</div><div class='del'>-	 * If the output FIFO is full, it waits until there</div><div class='del'>-	 * is space in the queue</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	n = 3 * HZ;		/* Timeout */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>- 	while (n &amp;&amp; !midi_devs[dev]-&gt;outputc(dev, data)) {</div><div class='del'>- 		interruptible_sleep_on_timeout(&amp;seq_sleeper, HZ/25);</div><div class='del'>-  		n--;</div><div class='del'>-  	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_reset(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! Calls sleep(). Don't call this from interrupt.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-	int chn;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	sound_stop_timer();</div><div class='del'>-</div><div class='del'>-	seq_time = jiffies;</div><div class='del'>-	prev_input_time = 0;</div><div class='del'>-	prev_event_time = 0;</div><div class='del'>-</div><div class='del'>-	qlen = qhead = qtail = 0;</div><div class='del'>-	iqlen = iqhead = iqtail = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_synthdev; i++)</div><div class='del'>-		if (synth_open_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-			if (synth_devs[i])</div><div class='del'>-				synth_devs[i]-&gt;reset(i);</div><div class='del'>-</div><div class='del'>-	if (seq_mode == SEQ_2)</div><div class='del'>-	{</div><div class='del'>-		for (chn = 0; chn &lt; 16; chn++)</div><div class='del'>-			for (i = 0; i &lt; max_synthdev; i++)</div><div class='del'>-				if (synth_open_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-					if (synth_devs[i])</div><div class='del'>-					{</div><div class='del'>-						synth_devs[i]-&gt;controller(i, chn, 123, 0);	/* All notes off */</div><div class='del'>-						synth_devs[i]-&gt;controller(i, chn, 121, 0);	/* Reset all ctl */</div><div class='del'>-						synth_devs[i]-&gt;bender(i, chn, 1 &lt;&lt; 13);	/* Bender off */</div><div class='del'>-					}</div><div class='del'>-	}</div><div class='del'>-	else	/* seq_mode == SEQ_1 */</div><div class='del'>-	{</div><div class='del'>-		for (i = 0; i &lt; max_mididev; i++)</div><div class='del'>-			if (midi_written[i])	/*</div><div class='del'>-						 * Midi used. Some notes may still be playing</div><div class='del'>-						 */</div><div class='del'>-			{</div><div class='del'>-				/*</div><div class='del'>-				 *      Sending just a ACTIVE SENSING message should be enough to stop all</div><div class='del'>-				 *      playing notes. Since there are devices not recognizing the</div><div class='del'>-				 *      active sensing, we have to send some all notes off messages also.</div><div class='del'>-				 */</div><div class='del'>-				midi_outc(i, 0xfe);</div><div class='del'>-</div><div class='del'>-				for (chn = 0; chn &lt; 16; chn++)</div><div class='del'>-				{</div><div class='del'>-					midi_outc(i, (unsigned char) (0xb0 + (chn &amp; 0x0f)));		/* control change */</div><div class='del'>-					midi_outc(i, 0x7b);	/* All notes off */</div><div class='del'>-					midi_outc(i, 0);	/* Dummy parameter */</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				midi_devs[i]-&gt;close(i);</div><div class='del'>-</div><div class='del'>-				midi_written[i] = 0;</div><div class='del'>-				midi_opened[i] = 0;</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seq_playing = 0;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (waitqueue_active(&amp;seq_sleeper)) {</div><div class='del'>-		/*      printk( "Sequencer Warning: Unexpected sleeping process - Waking up\n"); */</div><div class='del'>-		wake_up(&amp;seq_sleeper);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void seq_panic(void)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * This routine is called by the application in case the user</div><div class='del'>-	 * wants to reset the system to the default state.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	seq_reset();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Since some of the devices don't recognize the active sensing and</div><div class='del'>-	 * all notes off messages, we have to shut all notes manually.</div><div class='del'>-	 *</div><div class='del'>-	 *      TO BE IMPLEMENTED LATER</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Also return the controllers to their default states</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int midi_dev, orig_dev, val, err;</div><div class='del'>-	int mode = translate_mode(file);</div><div class='del'>-	struct synth_info inf;</div><div class='del'>-	struct seq_event_rec event_rec;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-</div><div class='del'>-	orig_dev = dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_TMR_TIMEBASE:</div><div class='del'>-		case SNDCTL_TMR_TEMPO:</div><div class='del'>-		case SNDCTL_TMR_START:</div><div class='del'>-		case SNDCTL_TMR_STOP:</div><div class='del'>-		case SNDCTL_TMR_CONTINUE:</div><div class='del'>-		case SNDCTL_TMR_METRONOME:</div><div class='del'>-		case SNDCTL_TMR_SOURCE:</div><div class='del'>-			if (seq_mode != SEQ_2)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return tmr-&gt;ioctl(tmr_no, cmd, arg);</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_SELECT:</div><div class='del'>-			if (seq_mode != SEQ_2)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (get_user(pending_timer, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (pending_timer &lt; 0 || pending_timer &gt;= num_sound_timers || sound_timer_devs[pending_timer] == NULL)</div><div class='del'>-			{</div><div class='del'>-				pending_timer = -1;</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			val = pending_timer;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_PANIC:</div><div class='del'>-			seq_panic();</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_SYNC:</div><div class='del'>-			if (mode == OPEN_READ)</div><div class='del'>-				return 0;</div><div class='del'>-			while (qlen &gt; 0 &amp;&amp; !signal_pending(current))</div><div class='del'>-				seq_sync();</div><div class='del'>-			return qlen ? -EINTR : 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_RESET:</div><div class='del'>-			seq_reset();</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_TESTMIDI:</div><div class='del'>-			if (__get_user(midi_dev, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (midi_dev &lt; 0 || midi_dev &gt;= max_mididev || !midi_devs[midi_dev])</div><div class='del'>-				return -ENXIO;</div><div class='del'>-</div><div class='del'>-			if (!midi_opened[midi_dev] &amp;&amp;</div><div class='del'>-				(err = midi_devs[midi_dev]-&gt;open(midi_dev, mode, sequencer_midi_input,</div><div class='del'>-						     sequencer_midi_output)) &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			midi_opened[midi_dev] = 1;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_GETINCOUNT:</div><div class='del'>-			if (mode == OPEN_WRITE)</div><div class='del'>-				return 0;</div><div class='del'>-			val = iqlen;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_GETOUTCOUNT:</div><div class='del'>-			if (mode == OPEN_READ)</div><div class='del'>-				return 0;</div><div class='del'>-			val = SEQ_MAX_QUEUE - qlen;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_GETTIME:</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-				return tmr-&gt;ioctl(tmr_no, cmd, arg);</div><div class='del'>-			val = jiffies - seq_time;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_CTRLRATE:</div><div class='del'>-			/*</div><div class='del'>-			 * If *arg == 0, just return the current rate</div><div class='del'>-			 */</div><div class='del'>-			if (seq_mode == SEQ_2)</div><div class='del'>-				return tmr-&gt;ioctl(tmr_no, cmd, arg);</div><div class='del'>-</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val != 0)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			val = HZ;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_RESETSAMPLES:</div><div class='del'>-		case SNDCTL_SYNTH_REMOVESAMPLE:</div><div class='del'>-		case SNDCTL_SYNTH_CONTROL:</div><div class='del'>-			if (get_user(dev, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= num_synths || synth_devs[dev] == NULL)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)) &amp;&amp; !orig_dev)</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			return synth_devs[dev]-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_NRSYNTHS:</div><div class='del'>-			val = max_synthdev;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_NRMIDIS:</div><div class='del'>-			val = max_mididev;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_MEMAVL:</div><div class='del'>-			if (get_user(dev, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= num_synths || synth_devs[dev] == NULL)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)) &amp;&amp; !orig_dev)</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			val = synth_devs[dev]-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_FM_4OP_ENABLE:</div><div class='del'>-			if (get_user(dev, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= num_synths || synth_devs[dev] == NULL)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)))</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			synth_devs[dev]-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SYNTH_INFO:</div><div class='del'>-			if (get_user(dev, &amp;((struct synth_info __user *)arg)-&gt;device))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= max_synthdev)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)) &amp;&amp; !orig_dev)</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			return synth_devs[dev]-&gt;ioctl(dev, cmd, arg);</div><div class='del'>-</div><div class='del'>-		/* Like SYNTH_INFO but returns ID in the name field */</div><div class='del'>-		case SNDCTL_SYNTH_ID:</div><div class='del'>-			if (get_user(dev, &amp;((struct synth_info __user *)arg)-&gt;device))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= max_synthdev)</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; dev)) &amp;&amp; !orig_dev)</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			memcpy(&amp;inf, synth_devs[dev]-&gt;info, sizeof(inf));</div><div class='del'>-			strlcpy(inf.name, synth_devs[dev]-&gt;id, sizeof(inf.name));</div><div class='del'>-			inf.device = dev;</div><div class='del'>-			return copy_to_user(arg, &amp;inf, sizeof(inf))?-EFAULT:0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_OUTOFBAND:</div><div class='del'>-			if (copy_from_user(&amp;event_rec, arg, sizeof(event_rec)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-			play_event(event_rec.arr);</div><div class='del'>-			spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_MIDI_INFO:</div><div class='del'>-			if (get_user(dev, &amp;((struct midi_info __user *)arg)-&gt;device))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (dev &lt; 0 || dev &gt;= max_mididev || !midi_devs[dev])</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			midi_devs[dev]-&gt;info.device = dev;</div><div class='del'>-			return copy_to_user(arg, &amp;midi_devs[dev]-&gt;info, sizeof(struct midi_info))?-EFAULT:0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_THRESHOLD:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val &lt; 1)</div><div class='del'>-				val = 1;</div><div class='del'>-			if (val &gt;= SEQ_MAX_QUEUE)</div><div class='del'>-				val = SEQ_MAX_QUEUE - 1;</div><div class='del'>-			output_threshold = val;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_MIDI_PRETIME:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val &lt; 0)</div><div class='del'>-				val = 0;</div><div class='del'>-			val = (HZ * val) / 10;</div><div class='del'>-			pre_event_timeout = val;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			if (mode == OPEN_READ)</div><div class='del'>-				return -EIO;</div><div class='del'>-			if (!synth_devs[0])</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!(synth_open_mask &amp; (1 &lt;&lt; 0)))</div><div class='del'>-				return -ENXIO;</div><div class='del'>-			if (!synth_devs[0]-&gt;ioctl)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return synth_devs[0]-&gt;ioctl(0, cmd, arg);</div><div class='del'>-	}</div><div class='del'>-	return put_user(val, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No kernel lock - we're using the global irq lock here */</div><div class='del'>-unsigned int sequencer_poll(int dev, struct file *file, poll_table * wait)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	dev = dev &gt;&gt; 4;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	/* input */</div><div class='del'>-	poll_wait(file, &amp;midi_sleeper, wait);</div><div class='del'>-	if (iqlen)</div><div class='del'>-		mask |= POLLIN | POLLRDNORM;</div><div class='del'>-</div><div class='del'>-	/* output */</div><div class='del'>-	poll_wait(file, &amp;seq_sleeper, wait);</div><div class='del'>-	if ((SEQ_MAX_QUEUE - qlen) &gt;= output_threshold)</div><div class='del'>-		mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void sequencer_timer(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-	seq_startplay();</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sequencer_timer);</div><div class='del'>-</div><div class='del'>-int note_to_freq(int note_num)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This routine converts a midi note to a frequency (multiplied by 1000)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	int note, octave, note_freq;</div><div class='del'>-	static int notes[] =</div><div class='del'>-	{</div><div class='del'>-		261632, 277189, 293671, 311132, 329632, 349232,</div><div class='del'>-		369998, 391998, 415306, 440000, 466162, 493880</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-#define BASE_OCTAVE	5</div><div class='del'>-</div><div class='del'>-	octave = note_num / 12;</div><div class='del'>-	note = note_num % 12;</div><div class='del'>-</div><div class='del'>-	note_freq = notes[note];</div><div class='del'>-</div><div class='del'>-	if (octave &lt; BASE_OCTAVE)</div><div class='del'>-		note_freq &gt;&gt;= (BASE_OCTAVE - octave);</div><div class='del'>-	else if (octave &gt; BASE_OCTAVE)</div><div class='del'>-		note_freq &lt;&lt;= (octave - BASE_OCTAVE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * note_freq &gt;&gt;= 1;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	return note_freq;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(note_to_freq);</div><div class='del'>-</div><div class='del'>-unsigned long compute_finetune(unsigned long base_freq, int bend, int range,</div><div class='del'>-		 int vibrato_cents)</div><div class='del'>-{</div><div class='del'>-	unsigned long amount;</div><div class='del'>-	int negative, semitones, cents, multiplier = 1;</div><div class='del'>-</div><div class='del'>-	if (!bend)</div><div class='del'>-		return base_freq;</div><div class='del'>-	if (!range)</div><div class='del'>-		return base_freq;</div><div class='del'>-</div><div class='del'>-	if (!base_freq)</div><div class='del'>-		return base_freq;</div><div class='del'>-</div><div class='del'>-	if (range &gt;= 8192)</div><div class='del'>-		range = 8192;</div><div class='del'>-</div><div class='del'>-	bend = bend * range / 8192;	/* Convert to cents */</div><div class='del'>-	bend += vibrato_cents;</div><div class='del'>-</div><div class='del'>-	if (!bend)</div><div class='del'>-		return base_freq;</div><div class='del'>-</div><div class='del'>-	negative = bend &lt; 0 ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	if (bend &lt; 0)</div><div class='del'>-		bend *= -1;</div><div class='del'>-	if (bend &gt; range)</div><div class='del'>-		bend = range;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	   if (bend &gt; 2399)</div><div class='del'>-	   bend = 2399;</div><div class='del'>-	 */</div><div class='del'>-	while (bend &gt; 2399)</div><div class='del'>-	{</div><div class='del'>-		multiplier *= 4;</div><div class='del'>-		bend -= 2400;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	semitones = bend / 100;</div><div class='del'>-	cents = bend % 100;</div><div class='del'>-</div><div class='del'>-	amount = (int) (semitone_tuning[semitones] * multiplier * cent_tuning[cents]) / 10000;</div><div class='del'>-</div><div class='del'>-	if (negative)</div><div class='del'>-		return (base_freq * 10000) / amount;	/* Bend down */</div><div class='del'>-	else</div><div class='del'>-		return (base_freq * amount) / 10000;	/* Bend up */</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(compute_finetune);</div><div class='del'>-</div><div class='del'>-void sequencer_init(void)</div><div class='del'>-{</div><div class='del'>-	if (sequencer_ok)</div><div class='del'>-		return;</div><div class='del'>-	queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ);</div><div class='del'>-	if (queue == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "sequencer: Can't allocate memory for sequencer output queue\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	iqueue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * IEV_SZ);</div><div class='del'>-	if (iqueue == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "sequencer: Can't allocate memory for sequencer input queue\n");</div><div class='del'>-		vfree(queue);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	sequencer_ok = 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sequencer_init);</div><div class='del'>-</div><div class='del'>-void sequencer_unload(void)</div><div class='del'>-{</div><div class='del'>-	vfree(queue);</div><div class='del'>-	vfree(iqueue);</div><div class='del'>-	queue = iqueue = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/oss/sound_calls.h b/sound/oss/sound_calls.h<br/>deleted file mode 100644<br/>index 87d8ad4a0340..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sound_calls.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_calls.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	DMA buffer calls</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int DMAbuf_open(int dev, int mode);</div><div class='del'>-int DMAbuf_release(int dev, int mode);</div><div class='del'>-int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock);</div><div class='del'>-int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock);</div><div class='del'>-int DMAbuf_rmchars(int dev, int buff_no, int c);</div><div class='del'>-int DMAbuf_start_output(int dev, int buff_no, int l);</div><div class='del'>-int DMAbuf_move_wrpointer(int dev, int l);</div><div class='del'>-/* int DMAbuf_ioctl(int dev, unsigned int cmd, void __user *arg, int local); */</div><div class='del'>-void DMAbuf_init(int dev, int dma1, int dma2);</div><div class='del'>-void DMAbuf_deinit(int dev);</div><div class='del'>-int DMAbuf_start_dma (int dev, unsigned long physaddr, int count, int dma_mode);</div><div class='del'>-void DMAbuf_inputintr(int dev);</div><div class='del'>-void DMAbuf_outputintr(int dev, int underflow_flag);</div><div class='del'>-struct dma_buffparms;</div><div class='del'>-int DMAbuf_space_in_queue (int dev);</div><div class='del'>-int DMAbuf_activate_recording (int dev, struct dma_buffparms *dmap);</div><div class='del'>-int DMAbuf_get_buffer_pointer (int dev, struct dma_buffparms *dmap, int direction);</div><div class='del'>-void DMAbuf_launch_output(int dev, struct dma_buffparms *dmap);</div><div class='del'>-unsigned int DMAbuf_poll(struct file *file, int dev, poll_table *wait);</div><div class='del'>-void DMAbuf_start_devices(unsigned int devmask);</div><div class='del'>-void DMAbuf_reset (int dev);</div><div class='del'>-int DMAbuf_sync (int dev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	System calls for /dev/dsp and /dev/audio (audio.c)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int audio_read (int dev, struct file *file, char __user *buf, int count);</div><div class='del'>-int audio_write (int dev, struct file *file, const char __user *buf, int count);</div><div class='del'>-int audio_open (int dev, struct file *file);</div><div class='del'>-void audio_release (int dev, struct file *file);</div><div class='del'>-int audio_ioctl (int dev, struct file *file,</div><div class='del'>-	   unsigned int cmd, void __user *arg);</div><div class='del'>-void audio_init_devices (void);</div><div class='del'>-void reorganize_buffers (int dev, struct dma_buffparms *dmap, int recording);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	System calls for the /dev/sequencer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int sequencer_read (int dev, struct file *file, char __user *buf, int count);</div><div class='del'>-int sequencer_write (int dev, struct file *file, const char __user *buf, int count);</div><div class='del'>-int sequencer_open (int dev, struct file *file);</div><div class='del'>-void sequencer_release (int dev, struct file *file);</div><div class='del'>-int sequencer_ioctl (int dev, struct file *file, unsigned int cmd, void __user *arg);</div><div class='del'>-unsigned int sequencer_poll(int dev, struct file *file, poll_table * wait);</div><div class='del'>-</div><div class='del'>-void sequencer_init (void);</div><div class='del'>-void sequencer_unload (void);</div><div class='del'>-void sequencer_timer(unsigned long dummy);</div><div class='del'>-int note_to_freq(int note_num);</div><div class='del'>-unsigned long compute_finetune(unsigned long base_freq, int bend, int range,</div><div class='del'>-			       int vibrato_bend);</div><div class='del'>-void seq_input_event(unsigned char *event, int len);</div><div class='del'>-void seq_copy_to_input (unsigned char *event, int len);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	System calls for the /dev/midi</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-int MIDIbuf_read (int dev, struct file *file, char __user *buf, int count);</div><div class='del'>-int MIDIbuf_write (int dev, struct file *file, const char __user *buf, int count);</div><div class='del'>-int MIDIbuf_open (int dev, struct file *file);</div><div class='del'>-void MIDIbuf_release (int dev, struct file *file);</div><div class='del'>-int MIDIbuf_ioctl (int dev, struct file *file, unsigned int cmd, void __user *arg);</div><div class='del'>-unsigned int MIDIbuf_poll(int dev, struct file *file, poll_table * wait);</div><div class='del'>-int MIDIbuf_avail(int dev);</div><div class='del'>-</div><div class='del'>-void MIDIbuf_bytes_received(int dev, unsigned char *buf, int count);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*	From soundcard.c	*/</div><div class='del'>-void request_sound_timer (int count);</div><div class='del'>-void sound_stop_timer(void);</div><div class='del'>-void conf_printf(char *name, struct address_info *hw_config);</div><div class='del'>-void conf_printf2(char *name, int base, int irq, int dma, int dma2);</div><div class='del'>-</div><div class='del'>-/*	From sound_timer.c */</div><div class='del'>-void sound_timer_interrupt(void);</div><div class='del'>-void sound_timer_syncinterval(unsigned int new_usecs);</div><div class='del'>-</div><div class='del'>-/*      From midi_synth.c       */</div><div class='del'>-void do_midi_msg (int synthno, unsigned char *msg, int mlen);</div><div class='head'>diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h<br/>deleted file mode 100644<br/>index 9d35c4c65b9b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sound_config.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,147 +0,0 @@</div><div class='del'>-/* sound_config.h</div><div class='del'>- *</div><div class='del'>- * A driver for sound cards, misc. configuration parameters.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef  _SOUND_CONFIG_H_</div><div class='del'>-#define  _SOUND_CONFIG_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/fs.h&gt;</div><div class='del'>-#include &lt;linux/sound.h&gt;</div><div class='del'>-</div><div class='del'>-#include "os.h"</div><div class='del'>-#include "soundvers.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef SND_DEFAULT_ENABLE</div><div class='del'>-#define SND_DEFAULT_ENABLE	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef MAX_REALTIME_FACTOR</div><div class='del'>-#define MAX_REALTIME_FACTOR	4</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use always 64k buffer size. There is no reason to use shorter.</div><div class='del'>- */</div><div class='del'>-#undef DSP_BUFFSIZE</div><div class='del'>-#define DSP_BUFFSIZE		(64*1024)</div><div class='del'>-</div><div class='del'>-#ifndef DSP_BUFFCOUNT</div><div class='del'>-#define DSP_BUFFCOUNT		1	/* 1 is recommended. */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define FM_MONO		0x388	/* This is the I/O address used by AdLib */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_PAS_BASE</div><div class='del'>-#define CONFIG_PAS_BASE	0x388</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* SEQ_MAX_QUEUE is the maximum number of sequencer events buffered by the</div><div class='del'>-   driver. (There is no need to alter this) */</div><div class='del'>-#define SEQ_MAX_QUEUE	1024</div><div class='del'>-</div><div class='del'>-#define SBFM_MAXINSTR		(256)	/* Size of the FM Instrument bank */</div><div class='del'>-/* 128 instruments for general MIDI setup and 16 unassigned	 */</div><div class='del'>-</div><div class='del'>-#define SND_NDEVS	256	/* Number of supported devices */</div><div class='del'>-</div><div class='del'>-#define DSP_DEFAULT_SPEED	8000</div><div class='del'>-</div><div class='del'>-#define MAX_AUDIO_DEV	5</div><div class='del'>-#define MAX_MIXER_DEV	5</div><div class='del'>-#define MAX_SYNTH_DEV	5</div><div class='del'>-#define MAX_MIDI_DEV	6</div><div class='del'>-#define MAX_TIMER_DEV	4</div><div class='del'>-</div><div class='del'>-struct address_info {</div><div class='del'>-	int io_base;</div><div class='del'>-	int irq;</div><div class='del'>-	int dma;</div><div class='del'>-	int dma2;</div><div class='del'>-	int always_detect;	/* 1=Trust me, it's there */</div><div class='del'>-	char *name;</div><div class='del'>-	int driver_use_1;	/* Driver defined field 1 */</div><div class='del'>-	int driver_use_2;	/* Driver defined field 2 */</div><div class='del'>-	int *osp;	/* OS specific info */</div><div class='del'>-	int card_subtype;	/* Driver specific. Usually 0 */</div><div class='del'>-	void *memptr;           /* Module memory chainer */</div><div class='del'>-	int slots[6];           /* To remember driver slot ids */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SYNTH_MAX_VOICES	32</div><div class='del'>-</div><div class='del'>-struct voice_alloc_info {</div><div class='del'>-		int max_voice;</div><div class='del'>-		int used_voices;</div><div class='del'>-		int ptr;		/* For device specific use */</div><div class='del'>-		unsigned short map[SYNTH_MAX_VOICES]; /* (ch &lt;&lt; 8) | (note+1) */</div><div class='del'>-		int timestamp;</div><div class='del'>-		int alloc_times[SYNTH_MAX_VOICES];</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-struct channel_info {</div><div class='del'>-		int pgm_num;</div><div class='del'>-		int bender_value;</div><div class='del'>-		int bender_range;</div><div class='del'>-		unsigned char controllers[128];</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Process wakeup reasons</div><div class='del'>- */</div><div class='del'>-#define WK_NONE		0x00</div><div class='del'>-#define WK_WAKEUP	0x01</div><div class='del'>-#define WK_TIMEOUT	0x02</div><div class='del'>-#define WK_SIGNAL	0x04</div><div class='del'>-#define WK_SLEEP	0x08</div><div class='del'>-#define WK_SELECT	0x10</div><div class='del'>-#define WK_ABORT	0x20</div><div class='del'>-</div><div class='del'>-#define OPEN_READ	PCM_ENABLE_INPUT</div><div class='del'>-#define OPEN_WRITE	PCM_ENABLE_OUTPUT</div><div class='del'>-#define OPEN_READWRITE	(OPEN_READ|OPEN_WRITE)</div><div class='del'>-</div><div class='del'>-static inline int translate_mode(struct file *file)</div><div class='del'>-{</div><div class='del'>-	if (OPEN_READ == (__force int)FMODE_READ &amp;&amp;</div><div class='del'>-	    OPEN_WRITE == (__force int)FMODE_WRITE)</div><div class='del'>-		return (__force int)(file-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE));</div><div class='del'>-	else</div><div class='del'>-		return ((file-&gt;f_mode &amp; FMODE_READ) ? OPEN_READ : 0) |</div><div class='del'>-			((file-&gt;f_mode &amp; FMODE_WRITE) ? OPEN_WRITE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include "sound_calls.h"</div><div class='del'>-#include "dev_table.h"</div><div class='del'>-</div><div class='del'>-#ifndef DEB</div><div class='del'>-#define DEB(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef DDB</div><div class='del'>-#define DDB(x) do {} while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef MDB</div><div class='del'>-#ifdef MODULE</div><div class='del'>-#define MDB(x) x</div><div class='del'>-#else</div><div class='del'>-#define MDB(x)</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define TIMER_ARMED	121234</div><div class='del'>-#define TIMER_NOT_ARMED	1</div><div class='del'>-</div><div class='del'>-#define MAX_MEM_BLOCKS 1024</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/oss/sound_firmware.h b/sound/oss/sound_firmware.h<br/>deleted file mode 100644<br/>index 0a0cbfdfb855..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sound_firmware.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_firmware.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-extern int mod_firmware_load(const char *fn, char **fp);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c<br/>deleted file mode 100644<br/>index 48cda6c4c257..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sound_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sound_timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,327 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sound_timer.c</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-static volatile int initialized, opened, tmr_running;</div><div class='del'>-static volatile time_t tmr_offs, tmr_ctr;</div><div class='del'>-static volatile unsigned long ticks_offs;</div><div class='del'>-static volatile int curr_tempo, curr_timebase;</div><div class='del'>-static volatile unsigned long curr_ticks;</div><div class='del'>-static volatile unsigned long next_event_time;</div><div class='del'>-static unsigned long prev_event_time;</div><div class='del'>-static volatile unsigned long usecs_per_tmr;	/* Length of the current interval */</div><div class='del'>-</div><div class='del'>-static struct sound_lowlev_timer *tmr;</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-static unsigned long tmr2ticks(int tmr_value)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *    Convert timer ticks to MIDI ticks</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-	unsigned long scale;</div><div class='del'>-</div><div class='del'>-	tmp = tmr_value * usecs_per_tmr;	/* Convert to usecs */</div><div class='del'>-	scale = (60 * 1000000) / (curr_tempo * curr_timebase);	/* usecs per MIDI tick */</div><div class='del'>-	return (tmp + (scale / 2)) / scale;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void reprogram_timer(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long   usecs_per_tick;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	The user is changing the timer rate before setting a timer</div><div class='del'>-	 *	slap, bad bad not allowed.</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	if(!tmr)</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='del'>-	usecs_per_tick = (60 * 1000000) / (curr_tempo * curr_timebase);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Don't kill the system by setting too high timer rate</div><div class='del'>-	 */</div><div class='del'>-	if (usecs_per_tick &lt; 2000)</div><div class='del'>-		usecs_per_tick = 2000;</div><div class='del'>-</div><div class='del'>-	usecs_per_tmr = tmr-&gt;tmr_start(tmr-&gt;dev, usecs_per_tick);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sound_timer_syncinterval(unsigned int new_usecs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *    This routine is called by the hardware level if</div><div class='del'>-	 *      the clock frequency has changed for some reason.</div><div class='del'>-	 */</div><div class='del'>-	tmr_offs = tmr_ctr;</div><div class='del'>-	ticks_offs += tmr2ticks(tmr_ctr);</div><div class='del'>-	tmr_ctr = 0;</div><div class='del'>-	usecs_per_tmr = new_usecs;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_timer_syncinterval);</div><div class='del'>-</div><div class='del'>-static void tmr_reset(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	tmr_offs = 0;</div><div class='del'>-	ticks_offs = 0;</div><div class='del'>-	tmr_ctr = 0;</div><div class='del'>-	next_event_time = (unsigned long) -1;</div><div class='del'>-	prev_event_time = 0;</div><div class='del'>-	curr_ticks = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int timer_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	if (opened)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	tmr_reset();</div><div class='del'>-	curr_tempo = 60;</div><div class='del'>-	curr_timebase = 100;</div><div class='del'>-	opened = 1;</div><div class='del'>-	reprogram_timer();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void timer_close(int dev)</div><div class='del'>-{</div><div class='del'>-	opened = tmr_running = 0;</div><div class='del'>-	tmr-&gt;tmr_disable(tmr-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int timer_event(int dev, unsigned char *event)</div><div class='del'>-{</div><div class='del'>-	unsigned char cmd = event[1];</div><div class='del'>-	unsigned long parm = *(int *) &amp;event[4];</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	{</div><div class='del'>-		case TMR_WAIT_REL:</div><div class='del'>-			parm += prev_event_time;</div><div class='del'>-		case TMR_WAIT_ABS:</div><div class='del'>-			if (parm &gt; 0)</div><div class='del'>-			{</div><div class='del'>-				long time;</div><div class='del'>-</div><div class='del'>-				if (parm &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-					return TIMER_NOT_ARMED;</div><div class='del'>-				time = parm;</div><div class='del'>-				next_event_time = prev_event_time = time;</div><div class='del'>-				return TIMER_ARMED;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_START:</div><div class='del'>-			tmr_reset();</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			reprogram_timer();</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_STOP:</div><div class='del'>-			tmr_running = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_CONTINUE:</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			reprogram_timer();</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_TEMPO:</div><div class='del'>-			if (parm)</div><div class='del'>-			{</div><div class='del'>-				if (parm &lt; 8)</div><div class='del'>-					parm = 8;</div><div class='del'>-				if (parm &gt; 250)</div><div class='del'>-					parm = 250;</div><div class='del'>-				tmr_offs = tmr_ctr;</div><div class='del'>-				ticks_offs += tmr2ticks(tmr_ctr);</div><div class='del'>-				tmr_ctr = 0;</div><div class='del'>-				curr_tempo = parm;</div><div class='del'>-				reprogram_timer();</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case TMR_ECHO:</div><div class='del'>-			seq_copy_to_input(event, 8);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:;</div><div class='del'>-	}</div><div class='del'>-	return TIMER_NOT_ARMED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long timer_get_time(int dev)</div><div class='del'>-{</div><div class='del'>-	if (!opened)</div><div class='del'>-		return 0;</div><div class='del'>-	return curr_ticks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int timer_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	switch (cmd) </div><div class='del'>-	{</div><div class='del'>-		case SNDCTL_TMR_SOURCE:</div><div class='del'>-			val = TMR_INTERNAL;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_START:</div><div class='del'>-			tmr_reset();</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_TMR_STOP:</div><div class='del'>-			tmr_running = 0;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_CONTINUE:</div><div class='del'>-			tmr_running = 1;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_TIMEBASE:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val) </div><div class='del'>-			{</div><div class='del'>-				if (val &lt; 1)</div><div class='del'>-					val = 1;</div><div class='del'>-				if (val &gt; 1000)</div><div class='del'>-					val = 1000;</div><div class='del'>-				curr_timebase = val;</div><div class='del'>-			}</div><div class='del'>-			val = curr_timebase;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_TMR_TEMPO:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val) </div><div class='del'>-			{</div><div class='del'>-				if (val &lt; 8)</div><div class='del'>-					val = 8;</div><div class='del'>-				if (val &gt; 250)</div><div class='del'>-					val = 250;</div><div class='del'>-				tmr_offs = tmr_ctr;</div><div class='del'>-				ticks_offs += tmr2ticks(tmr_ctr);</div><div class='del'>-				tmr_ctr = 0;</div><div class='del'>-				curr_tempo = val;</div><div class='del'>-				reprogram_timer();</div><div class='del'>-			}</div><div class='del'>-			val = curr_tempo;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SNDCTL_SEQ_CTRLRATE:</div><div class='del'>-			if (get_user(val, p))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			if (val != 0)	/* Can't change */</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			val = ((curr_tempo * curr_timebase) + 30) / 60;</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_SEQ_GETTIME:</div><div class='del'>-			val = curr_ticks;</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		case SNDCTL_TMR_METRONOME:</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return put_user(val, p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void timer_arm(int dev, long time)</div><div class='del'>-{</div><div class='del'>-	if (time &lt; 0)</div><div class='del'>-		time = curr_ticks + 1;</div><div class='del'>-	else if (time &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	next_event_time = prev_event_time = time;</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sound_timer_operations sound_timer =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"Sound Timer", 0},</div><div class='del'>-	.priority	= 1,	/* Priority */</div><div class='del'>-	.devlink	= 0,	/* Local device link */</div><div class='del'>-	.open		= timer_open,</div><div class='del'>-	.close		= timer_close,</div><div class='del'>-	.event		= timer_event,</div><div class='del'>-	.get_time	= timer_get_time,</div><div class='del'>-	.ioctl		= timer_ioctl,</div><div class='del'>-	.arm_timer	= timer_arm</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void sound_timer_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	if (!opened)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tmr-&gt;tmr_restart(tmr-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (!tmr_running)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	tmr_ctr++;</div><div class='del'>-	curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);</div><div class='del'>-</div><div class='del'>-	if (curr_ticks &gt;= next_event_time)</div><div class='del'>-	{</div><div class='del'>-		next_event_time = (unsigned long) -1;</div><div class='del'>-		sequencer_timer(0);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_timer_interrupt);</div><div class='del'>-</div><div class='del'>-void  sound_timer_init(struct sound_lowlev_timer *t, char *name)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if (initialized)</div><div class='del'>-	{</div><div class='del'>-		if (t-&gt;priority &lt;= tmr-&gt;priority)</div><div class='del'>-			return;	/* There is already a similar or better timer */</div><div class='del'>-		tmr = t;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	initialized = 1;</div><div class='del'>-	tmr = t;</div><div class='del'>-</div><div class='del'>-	n = sound_alloc_timerdev();</div><div class='del'>-	if (n == -1)</div><div class='del'>-		n = 0;		/* Overwrite the system timer */</div><div class='del'>-	strcpy(sound_timer.info.name, name);</div><div class='del'>-	sound_timer_devs[n] = &amp;sound_timer;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_timer_init);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c<br/>deleted file mode 100644<br/>index 46c0d03dbecc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/soundcard.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/soundcard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,755 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/sound/oss/soundcard.c</div><div class='del'>- *</div><div class='del'>- * Sound card driver for Linux</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Thomas Sailer     : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- *                   integrated sound_switch.c</div><div class='del'>- * Stefan Reinauer   : integrated /proc/sound (equals to /dev/sndstat,</div><div class='del'>- *                   which should disappear in the near future)</div><div class='del'>- * Eric Dumas	     : devfs support (22-Jan-98) &lt;dumas@linux.eu.org&gt; with</div><div class='del'>- *                   fixups by C. Scott Ananian &lt;cananian@alumni.princeton.edu&gt;</div><div class='del'>- * Richard Gooch     : moved common (non OSS-specific) devices to sound_core.c</div><div class='del'>- * Rob Riggs	     : Added persistent DMA buffers support (1998/10/17)</div><div class='del'>- * Christoph Hellwig : Some cleanup work (2000/03/01)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/stddef.h&gt;</div><div class='del'>-#include &lt;linux/kmod.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/major.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/proc_fs.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/mm.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This ought to be moved into include/asm/dma.h</div><div class='del'>- */</div><div class='del'>-#ifndef valid_dma</div><div class='del'>-#define valid_dma(n) ((n) &gt;= 0 &amp;&amp; (n) &lt; MAX_DMA_CHANNELS &amp;&amp; (n) != 4)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Table for permanently allocated memory (used when unloading the module)</div><div class='del'>- */</div><div class='del'>-void *          sound_mem_blocks[MAX_MEM_BLOCKS];</div><div class='del'>-static DEFINE_MUTEX(soundcard_mutex);</div><div class='del'>-int             sound_nblocks = 0;</div><div class='del'>-</div><div class='del'>-/* Persistent DMA buffers */</div><div class='del'>-#ifdef CONFIG_SOUND_DMAP</div><div class='del'>-int             sound_dmap_flag = 1;</div><div class='del'>-#else</div><div class='del'>-int             sound_dmap_flag = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char     dma_alloc_map[MAX_DMA_CHANNELS];</div><div class='del'>-</div><div class='del'>-#define DMA_MAP_UNAVAIL		0</div><div class='del'>-#define DMA_MAP_FREE		1</div><div class='del'>-#define DMA_MAP_BUSY		2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-unsigned long seq_time = 0;	/* Time for /dev/sequencer */</div><div class='del'>-extern struct class *sound_class;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Table for configurable mixer volume handling</div><div class='del'>- */</div><div class='del'>-static mixer_vol_table mixer_vols[MAX_MIXER_DEV];</div><div class='del'>-static int num_mixer_volumes;</div><div class='del'>-</div><div class='del'>-int *load_mixer_volumes(char *name, int *levels, int present)</div><div class='del'>-{</div><div class='del'>-	int             i, n;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_mixer_volumes; i++) {</div><div class='del'>-		if (strcmp(name, mixer_vols[i].name) == 0) {</div><div class='del'>-			if (present)</div><div class='del'>-				mixer_vols[i].num = i;</div><div class='del'>-			return mixer_vols[i].levels;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (num_mixer_volumes &gt;= MAX_MIXER_DEV) {</div><div class='del'>-		printk(KERN_ERR "Sound: Too many mixers (%s)\n", name);</div><div class='del'>-		return levels;</div><div class='del'>-	}</div><div class='del'>-	n = num_mixer_volumes++;</div><div class='del'>-</div><div class='del'>-	strcpy(mixer_vols[n].name, name);</div><div class='del'>-</div><div class='del'>-	if (present)</div><div class='del'>-		mixer_vols[n].num = n;</div><div class='del'>-	else</div><div class='del'>-		mixer_vols[n].num = -1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 32; i++)</div><div class='del'>-		mixer_vols[n].levels[i] = levels[i];</div><div class='del'>-	return mixer_vols[n].levels;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(load_mixer_volumes);</div><div class='del'>-</div><div class='del'>-static int set_mixer_levels(void __user * arg)</div><div class='del'>-{</div><div class='del'>-        /* mixer_vol_table is 174 bytes, so IMHO no reason to not allocate it on the stack */</div><div class='del'>-	mixer_vol_table buf;   </div><div class='del'>-</div><div class='del'>-	if (__copy_from_user(&amp;buf, arg, sizeof(buf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	load_mixer_volumes(buf.name, buf.levels, 0);</div><div class='del'>-	if (__copy_to_user(arg, &amp;buf, sizeof(buf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_mixer_levels(void __user * arg)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if (__get_user(n, (int __user *)(&amp;(((mixer_vol_table __user *)arg)-&gt;num))))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (n &lt; 0 || n &gt;= num_mixer_volumes)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (__copy_to_user(arg, &amp;mixer_vols[n], sizeof(mixer_vol_table)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 4K page size but our output routines use some slack for overruns */</div><div class='del'>-#define PROC_BLOCK_SIZE (3*1024)</div><div class='del'>-</div><div class='del'>-static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	int dev = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	The OSS drivers aren't remotely happy without this locking,</div><div class='del'>-	 *	and unless someone fixes them when they are about to bite the</div><div class='del'>-	 *	big one anyway, we might as well bandage here..</div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	</div><div class='del'>-	DEB(printk("sound_read(dev=%d, count=%d)\n", dev, count));</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		ret = audio_read(dev, file, buf, count);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		ret = sequencer_read(dev, file, buf, count);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		ret = MIDIbuf_read(dev, file, buf, count);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	int dev = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-	</div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	DEB(printk("sound_write(dev=%d, count=%d)\n", dev, count));</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		ret =  sequencer_write(dev, file, buf, count);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		ret = audio_write(dev, file, buf, count);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		ret =  MIDIbuf_write(dev, file, buf, count);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sound_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int dev = iminor(inode);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	DEB(printk("sound_open(dev=%d)\n", dev));</div><div class='del'>-	if ((dev &gt;= SND_NDEVS) || (dev &lt; 0)) {</div><div class='del'>-		printk(KERN_ERR "Invalid minor device %d\n", dev);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_CTL:</div><div class='del'>-		dev &gt;&gt;= 4;</div><div class='del'>-		if (dev &gt;= 0 &amp;&amp; dev &lt; MAX_MIXER_DEV &amp;&amp; mixer_devs[dev] == NULL) {</div><div class='del'>-			request_module("mixer%d", dev);</div><div class='del'>-		}</div><div class='del'>-		retval = -ENXIO;</div><div class='del'>-		if (dev &amp;&amp; (dev &gt;= num_mixers || mixer_devs[dev] == NULL))</div><div class='del'>-			break;</div><div class='del'>-	</div><div class='del'>-		if (!try_module_get(mixer_devs[dev]-&gt;owner))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		retval = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		retval = sequencer_open(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		retval = MIDIbuf_open(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		retval = audio_open(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "Invalid minor device %d\n", dev);</div><div class='del'>-		retval = -ENXIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sound_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int dev = iminor(inode);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	DEB(printk("sound_release(dev=%d)\n", dev));</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_CTL:</div><div class='del'>-		module_put(mixer_devs[dev &gt;&gt; 4]-&gt;owner);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		sequencer_release(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		MIDIbuf_release(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		audio_release(dev, file);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "Sound error: Releasing unknown device 0x%02x\n", dev);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_mixer_info(int dev, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	mixer_info info;</div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>-	strlcpy(info.id, mixer_devs[dev]-&gt;id, sizeof(info.id));</div><div class='del'>-	strlcpy(info.name, mixer_devs[dev]-&gt;name, sizeof(info.name));</div><div class='del'>-	info.modify_counter = mixer_devs[dev]-&gt;modify_counter;</div><div class='del'>-	if (__copy_to_user(arg, &amp;info,  sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_old_mixer_info(int dev, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	_old_mixer_info info;</div><div class='del'>-	memset(&amp;info, 0, sizeof(info));</div><div class='del'>- 	strlcpy(info.id, mixer_devs[dev]-&gt;id, sizeof(info.id));</div><div class='del'>- 	strlcpy(info.name, mixer_devs[dev]-&gt;name, sizeof(info.name));</div><div class='del'>- 	if (copy_to_user(arg, &amp;info,  sizeof(info)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sound_mixer_ioctl(int mixdev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>- 	if (mixdev &lt; 0 || mixdev &gt;= MAX_MIXER_DEV)</div><div class='del'>- 		return -ENXIO;</div><div class='del'>- 	/* Try to load the mixer... */</div><div class='del'>- 	if (mixer_devs[mixdev] == NULL) {</div><div class='del'>- 		request_module("mixer%d", mixdev);</div><div class='del'>- 	}</div><div class='del'>- 	if (mixdev &gt;= num_mixers || !mixer_devs[mixdev])</div><div class='del'>- 		return -ENXIO;</div><div class='del'>-	if (cmd == SOUND_MIXER_INFO)</div><div class='del'>-		return get_mixer_info(mixdev, arg);</div><div class='del'>-	if (cmd == SOUND_OLD_MIXER_INFO)</div><div class='del'>-		return get_old_mixer_info(mixdev, arg);</div><div class='del'>-	if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE)</div><div class='del'>-		mixer_devs[mixdev]-&gt;modify_counter++;</div><div class='del'>-	if (!mixer_devs[mixdev]-&gt;ioctl)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return mixer_devs[mixdev]-&gt;ioctl(mixdev, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int len = 0, dtype;</div><div class='del'>-	int dev = iminor(file-&gt;f_dentry-&gt;d_inode);</div><div class='del'>-	long ret = -EINVAL;</div><div class='del'>-	void __user *p = (void __user *)arg;</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) != _SIOC_NONE &amp;&amp; _SIOC_DIR(cmd) != 0) {</div><div class='del'>-		/*</div><div class='del'>-		 * Have to validate the address given by the process.</div><div class='del'>-		 */</div><div class='del'>-		len = _SIOC_SIZE(cmd);</div><div class='del'>-		if (len &lt; 1 || len &gt; 65536 || !p)</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE)</div><div class='del'>-			if (!access_ok(VERIFY_READ, p, len))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-		if (_SIOC_DIR(cmd) &amp; _SIOC_READ)</div><div class='del'>-			if (!access_ok(VERIFY_WRITE, p, len))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	DEB(printk("sound_ioctl(dev=%d, cmd=0x%x, arg=0x%x)\n", dev, cmd, arg));</div><div class='del'>-	if (cmd == OSS_GETVERSION)</div><div class='del'>-		return __put_user(SOUND_VERSION, (int __user *)p);</div><div class='del'>-	</div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	if (_IOC_TYPE(cmd) == 'M' &amp;&amp; num_mixers &gt; 0 &amp;&amp;   /* Mixer ioctl */</div><div class='del'>-	    (dev &amp; 0x0f) != SND_DEV_CTL) {              </div><div class='del'>-		dtype = dev &amp; 0x0f;</div><div class='del'>-		switch (dtype) {</div><div class='del'>-		case SND_DEV_DSP:</div><div class='del'>-		case SND_DEV_DSP16:</div><div class='del'>-		case SND_DEV_AUDIO:</div><div class='del'>-			ret = sound_mixer_ioctl(audio_devs[dev &gt;&gt; 4]-&gt;mixer_dev,</div><div class='del'>-						 cmd, p);</div><div class='del'>-			break;			</div><div class='del'>-		default:</div><div class='del'>-			ret = sound_mixer_ioctl(dev &gt;&gt; 4, cmd, p);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_CTL:</div><div class='del'>-		if (cmd == SOUND_MIXER_GETLEVELS)</div><div class='del'>-			ret = get_mixer_levels(p);</div><div class='del'>-		else if (cmd == SOUND_MIXER_SETLEVELS)</div><div class='del'>-			ret = set_mixer_levels(p);</div><div class='del'>-		else</div><div class='del'>-			ret = sound_mixer_ioctl(dev &gt;&gt; 4, cmd, p);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		ret = sequencer_ioctl(dev, file, cmd, p);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		ret = audio_ioctl(dev, file, cmd, p);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		ret = MIDIbuf_ioctl(dev, file, cmd, p);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int sound_poll(struct file *file, poll_table * wait)</div><div class='del'>-{</div><div class='del'>-	struct inode *inode = file-&gt;f_path.dentry-&gt;d_inode;</div><div class='del'>-	int dev = iminor(inode);</div><div class='del'>-</div><div class='del'>-	DEB(printk("sound_poll(dev=%d)\n", dev));</div><div class='del'>-	switch (dev &amp; 0x0f) {</div><div class='del'>-	case SND_DEV_SEQ:</div><div class='del'>-	case SND_DEV_SEQ2:</div><div class='del'>-		return sequencer_poll(dev, file, wait);</div><div class='del'>-</div><div class='del'>-	case SND_DEV_MIDIN:</div><div class='del'>-		return MIDIbuf_poll(dev, file, wait);</div><div class='del'>-</div><div class='del'>-	case SND_DEV_DSP:</div><div class='del'>-	case SND_DEV_DSP16:</div><div class='del'>-	case SND_DEV_AUDIO:</div><div class='del'>-		return DMAbuf_poll(file, dev &gt;&gt; 4, wait);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sound_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	int dev_class;</div><div class='del'>-	unsigned long size;</div><div class='del'>-	struct dma_buffparms *dmap = NULL;</div><div class='del'>-	int dev = iminor(file-&gt;f_path.dentry-&gt;d_inode);</div><div class='del'>-</div><div class='del'>-	dev_class = dev &amp; 0x0f;</div><div class='del'>-	dev &gt;&gt;= 4;</div><div class='del'>-</div><div class='del'>-	if (dev_class != SND_DEV_DSP &amp;&amp; dev_class != SND_DEV_DSP16 &amp;&amp; dev_class != SND_DEV_AUDIO) {</div><div class='del'>-		printk(KERN_ERR "Sound: mmap() not supported for other than audio devices\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;soundcard_mutex);</div><div class='del'>-	if (vma-&gt;vm_flags &amp; VM_WRITE)	/* Map write and read/write to the output buf */</div><div class='del'>-		dmap = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-	else if (vma-&gt;vm_flags &amp; VM_READ)</div><div class='del'>-		dmap = audio_devs[dev]-&gt;dmap_in;</div><div class='del'>-	else {</div><div class='del'>-		printk(KERN_ERR "Sound: Undefined mmap() access\n");</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dmap == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: mmap() error. dmap == NULL\n");</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;raw_buf == NULL) {</div><div class='del'>-		printk(KERN_ERR "Sound: mmap() called when raw_buf == NULL\n");</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (dmap-&gt;mapping_flags) {</div><div class='del'>-		printk(KERN_ERR "Sound: mmap() called twice for the same DMA buffer\n");</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (vma-&gt;vm_pgoff != 0) {</div><div class='del'>-		printk(KERN_ERR "Sound: mmap() offset must be 0.\n");</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	size = vma-&gt;vm_end - vma-&gt;vm_start;</div><div class='del'>-</div><div class='del'>-	if (size != dmap-&gt;bytes_in_use) {</div><div class='del'>-		printk(KERN_WARNING "Sound: mmap() size = %ld. Should be %d\n", size, dmap-&gt;bytes_in_use);</div><div class='del'>-	}</div><div class='del'>-	if (remap_pfn_range(vma, vma-&gt;vm_start,</div><div class='del'>-			virt_to_phys(dmap-&gt;raw_buf) &gt;&gt; PAGE_SHIFT,</div><div class='del'>-			vma-&gt;vm_end - vma-&gt;vm_start, vma-&gt;vm_page_prot)) {</div><div class='del'>-		mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dmap-&gt;mapping_flags |= DMA_MAP_MAPPED;</div><div class='del'>-</div><div class='del'>-	if( audio_devs[dev]-&gt;d-&gt;mmap)</div><div class='del'>-		audio_devs[dev]-&gt;d-&gt;mmap(dev);</div><div class='del'>-</div><div class='del'>-	memset(dmap-&gt;raw_buf,</div><div class='del'>-	       dmap-&gt;neutral_byte,</div><div class='del'>-	       dmap-&gt;bytes_in_use);</div><div class='del'>-	mutex_unlock(&amp;soundcard_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const struct file_operations oss_sound_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.read		= sound_read,</div><div class='del'>-	.write		= sound_write,</div><div class='del'>-	.poll		= sound_poll,</div><div class='del'>-	.unlocked_ioctl	= sound_ioctl,</div><div class='del'>-	.mmap		= sound_mmap,</div><div class='del'>-	.open		= sound_open,</div><div class='del'>-	.release	= sound_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Create the required special subdevices</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int create_special_devices(void)</div><div class='del'>-{</div><div class='del'>-	int seq1,seq2;</div><div class='del'>-	seq1=register_sound_special(&amp;oss_sound_fops, 1);</div><div class='del'>-	if(seq1==-1)</div><div class='del'>-		goto bad;</div><div class='del'>-	seq2=register_sound_special(&amp;oss_sound_fops, 8);</div><div class='del'>-	if(seq2!=-1)</div><div class='del'>-		return 0;</div><div class='del'>-	unregister_sound_special(1);</div><div class='del'>-bad:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These device names follow the official Linux device list,</div><div class='del'>- * Documentation/devices.txt.  Let us know if there are other</div><div class='del'>- * common names we should support for compatibility.</div><div class='del'>- * Only those devices not created by the generic code in sound_core.c are</div><div class='del'>- * registered here.</div><div class='del'>- */</div><div class='del'>-static const struct {</div><div class='del'>-	unsigned short minor;</div><div class='del'>-	char *name;</div><div class='del'>-	umode_t mode;</div><div class='del'>-	int *num;</div><div class='del'>-} dev_list[] = { /* list of minor devices */</div><div class='del'>-/* seems to be some confusion here -- this device is not in the device list */</div><div class='del'>-	{SND_DEV_DSP16,     "dspW",	 S_IWUGO | S_IRUSR | S_IRGRP,</div><div class='del'>-	 &amp;num_audiodevs},</div><div class='del'>-	{SND_DEV_AUDIO,     "audio",	 S_IWUGO | S_IRUSR | S_IRGRP,</div><div class='del'>-	 &amp;num_audiodevs},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int dmabuf;</div><div class='del'>-static int dmabug;</div><div class='del'>-</div><div class='del'>-module_param(dmabuf, int, 0444);</div><div class='del'>-module_param(dmabug, int, 0444);</div><div class='del'>-</div><div class='del'>-static int __init oss_init(void)</div><div class='del'>-{</div><div class='del'>-	int             err;</div><div class='del'>-	int i, j;</div><div class='del'>-	</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	if(dmabug)</div><div class='del'>-		isa_dma_bridge_buggy = dmabug;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = create_special_devices();</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "sound: driver already loaded/included in kernel\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Protecting the innocent */</div><div class='del'>-	sound_dmap_flag = (dmabuf &gt; 0 ? 1 : 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev_list); i++) {</div><div class='del'>-		device_create(sound_class, NULL,</div><div class='del'>-			      MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,</div><div class='del'>-			      "%s", dev_list[i].name);</div><div class='del'>-</div><div class='del'>-		if (!dev_list[i].num)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (j = 1; j &lt; *dev_list[i].num; j++)</div><div class='del'>-			device_create(sound_class, NULL,</div><div class='del'>-				      MKDEV(SOUND_MAJOR,</div><div class='del'>-					    dev_list[i].minor + (j*0x10)),</div><div class='del'>-				      NULL, "%s%d", dev_list[i].name, j);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sound_nblocks &gt;= MAX_MEM_BLOCKS - 1)</div><div class='del'>-		printk(KERN_ERR "Sound warning: Deallocation table was too small.\n");</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit oss_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(dev_list); i++) {</div><div class='del'>-		device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor));</div><div class='del'>-		if (!dev_list[i].num)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 1; j &lt; *dev_list[i].num; j++)</div><div class='del'>-			device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	unregister_sound_special(1);</div><div class='del'>-	unregister_sound_special(8);</div><div class='del'>-</div><div class='del'>-	sound_stop_timer();</div><div class='del'>-</div><div class='del'>-	sequencer_unload();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_DMA_CHANNELS; i++)</div><div class='del'>-		if (dma_alloc_map[i] != DMA_MAP_UNAVAIL) {</div><div class='del'>-			printk(KERN_ERR "Sound: Hmm, DMA%d was left allocated - fixed\n", i);</div><div class='del'>-			sound_free_dma(i);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sound_nblocks; i++)</div><div class='del'>-		vfree(sound_mem_blocks[i]);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(oss_init);</div><div class='del'>-module_exit(oss_cleanup);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("OSS Sound subsystem");</div><div class='del'>-MODULE_AUTHOR("Hannu Savolainen, et al.");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int sound_alloc_dma(int chn, char *deviceID)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = request_dma(chn, deviceID)) != 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	dma_alloc_map[chn] = DMA_MAP_FREE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_alloc_dma);</div><div class='del'>-</div><div class='del'>-int sound_open_dma(int chn, char *deviceID)</div><div class='del'>-{</div><div class='del'>-	if (!valid_dma(chn)) {</div><div class='del'>-		printk(KERN_ERR "sound_open_dma: Invalid DMA channel %d\n", chn);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dma_alloc_map[chn] != DMA_MAP_FREE) {</div><div class='del'>-		printk("sound_open_dma: DMA channel %d busy or not allocated (%d)\n", chn, dma_alloc_map[chn]);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	dma_alloc_map[chn] = DMA_MAP_BUSY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_open_dma);</div><div class='del'>-</div><div class='del'>-void sound_free_dma(int chn)</div><div class='del'>-{</div><div class='del'>-	if (dma_alloc_map[chn] == DMA_MAP_UNAVAIL) {</div><div class='del'>-		/* printk( "sound_free_dma: Bad access to DMA channel %d\n",  chn); */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	free_dma(chn);</div><div class='del'>-	dma_alloc_map[chn] = DMA_MAP_UNAVAIL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_free_dma);</div><div class='del'>-</div><div class='del'>-void sound_close_dma(int chn)</div><div class='del'>-{</div><div class='del'>-	if (dma_alloc_map[chn] != DMA_MAP_BUSY) {</div><div class='del'>-		printk(KERN_ERR "sound_close_dma: Bad access to DMA channel %d\n", chn);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	dma_alloc_map[chn] = DMA_MAP_FREE;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(sound_close_dma);</div><div class='del'>-</div><div class='del'>-static void do_sequencer_timer(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-	sequencer_timer(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static DEFINE_TIMER(seq_timer, do_sequencer_timer, 0, 0);</div><div class='del'>-</div><div class='del'>-void request_sound_timer(int count)</div><div class='del'>-{</div><div class='del'>-	extern unsigned long seq_time;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 0) {</div><div class='del'>-		seq_timer.expires = (-count) + jiffies;</div><div class='del'>-		add_timer(&amp;seq_timer);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	count += seq_time;</div><div class='del'>-</div><div class='del'>-	count -= jiffies;</div><div class='del'>-</div><div class='del'>-	if (count &lt; 1)</div><div class='del'>-		count = 1;</div><div class='del'>-</div><div class='del'>-	seq_timer.expires = (count) + jiffies;</div><div class='del'>-	add_timer(&amp;seq_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sound_stop_timer(void)</div><div class='del'>-{</div><div class='del'>-	del_timer(&amp;seq_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void conf_printf(char *name, struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_SOUND_TRACEINIT</div><div class='del'>-	return;</div><div class='del'>-#else</div><div class='del'>-	printk("&lt;%s&gt; at 0x%03x", name, hw_config-&gt;io_base);</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;irq)</div><div class='del'>-		printk(" irq %d", (hw_config-&gt;irq &gt; 0) ? hw_config-&gt;irq : -hw_config-&gt;irq);</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;dma != -1 || hw_config-&gt;dma2 != -1)</div><div class='del'>-	{</div><div class='del'>-		printk(" dma %d", hw_config-&gt;dma);</div><div class='del'>-		if (hw_config-&gt;dma2 != -1)</div><div class='del'>-			printk(",%d", hw_config-&gt;dma2);</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(conf_printf);</div><div class='del'>-</div><div class='del'>-void conf_printf2(char *name, int base, int irq, int dma, int dma2)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_SOUND_TRACEINIT</div><div class='del'>-	return;</div><div class='del'>-#else</div><div class='del'>-	printk("&lt;%s&gt; at 0x%03x", name, base);</div><div class='del'>-</div><div class='del'>-	if (irq)</div><div class='del'>-		printk(" irq %d", (irq &gt; 0) ? irq : -irq);</div><div class='del'>-</div><div class='del'>-	if (dma != -1 || dma2 != -1)</div><div class='del'>-	{</div><div class='del'>-		  printk(" dma %d", dma);</div><div class='del'>-		  if (dma2 != -1)</div><div class='del'>-			  printk(",%d", dma2);</div><div class='del'>-	}</div><div class='del'>-	printk("\n");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(conf_printf2);</div><div class='del'>-</div><div class='head'>diff --git a/sound/oss/soundvers.h b/sound/oss/soundvers.h<br/>deleted file mode 100644<br/>index e9084d2f46a9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/soundvers.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/soundvers.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-#define SOUND_VERSION_STRING "3.8s2++-971130"</div><div class='del'>-#define SOUND_INTERNAL_VERSION 0x030804</div><div class='head'>diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c<br/>deleted file mode 100644<br/>index 44357d877a27..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/swarm_cs4297a.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/swarm_cs4297a.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2768 +0,0 @@</div><div class='del'>-/*******************************************************************************</div><div class='del'>-*</div><div class='del'>-*      "swarm_cs4297a.c" --  Cirrus Logic-Crystal CS4297a linux audio driver.</div><div class='del'>-*</div><div class='del'>-*      Copyright (C) 2001  Broadcom Corporation.</div><div class='del'>-*      Copyright (C) 2000,2001  Cirrus Logic Corp.  </div><div class='del'>-*            -- adapted from drivers by Thomas Sailer, </div><div class='del'>-*            -- but don't bug him; Problems should go to:</div><div class='del'>-*            -- tom woller (twoller@crystal.cirrus.com) or</div><div class='del'>-*               (audio@crystal.cirrus.com).</div><div class='del'>-*            -- adapted from cs4281 PCI driver for cs4297a on</div><div class='del'>-*               BCM1250 Synchronous Serial interface</div><div class='del'>-*               (Kip Walker, Broadcom Corp.)</div><div class='del'>-*      Copyright (C) 2004  Maciej W. Rozycki</div><div class='del'>-*      Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)</div><div class='del'>-*</div><div class='del'>-*      This program is free software; you can redistribute it and/or modify</div><div class='del'>-*      it under the terms of the GNU General Public License as published by</div><div class='del'>-*      the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-*      (at your option) any later version.</div><div class='del'>-*</div><div class='del'>-*      This program is distributed in the hope that it will be useful,</div><div class='del'>-*      but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-*      GNU General Public License for more details.</div><div class='del'>-*</div><div class='del'>-*      You should have received a copy of the GNU General Public License</div><div class='del'>-*      along with this program; if not, write to the Free Software</div><div class='del'>-*      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-*</div><div class='del'>-* Module command line parameters:</div><div class='del'>-*   none</div><div class='del'>-*</div><div class='del'>-*  Supported devices:</div><div class='del'>-*  /dev/dsp    standard /dev/dsp device, (mostly) OSS compatible</div><div class='del'>-*  /dev/mixer  standard /dev/mixer device, (mostly) OSS compatible</div><div class='del'>-*  /dev/midi   simple MIDI UART interface, no ioctl</div><div class='del'>-*</div><div class='del'>-* Modification History</div><div class='del'>-* 08/20/00 trw - silence and no stopping DAC until release</div><div class='del'>-* 08/23/00 trw - added CS_DBG statements, fix interrupt hang issue on DAC stop.</div><div class='del'>-* 09/18/00 trw - added 16bit only record with conversion </div><div class='del'>-* 09/24/00 trw - added Enhanced Full duplex (separate simultaneous </div><div class='del'>-*                capture/playback rates)</div><div class='del'>-* 10/03/00 trw - fixed mmap (fixed GRECORD and the XMMS mmap test plugin  </div><div class='del'>-*                libOSSm.so)</div><div class='del'>-* 10/11/00 trw - modified for 2.4.0-test9 kernel enhancements (NR_MAP removal)</div><div class='del'>-* 11/03/00 trw - fixed interrupt loss/stutter, added debug.</div><div class='del'>-* 11/10/00 bkz - added __devinit to cs4297a_hw_init()</div><div class='del'>-* 11/10/00 trw - fixed SMP and capture spinlock hang.</div><div class='del'>-* 12/04/00 trw - cleaned up CSDEBUG flags and added "defaultorder" moduleparm.</div><div class='del'>-* 12/05/00 trw - fixed polling (myth2), and added underrun swptr fix.</div><div class='del'>-* 12/08/00 trw - added PM support. </div><div class='del'>-* 12/14/00 trw - added wrapper code, builds under 2.4.0, 2.2.17-20, 2.2.17-8 </div><div class='del'>-*		 (RH/Dell base), 2.2.18, 2.2.12.  cleaned up code mods by ident.</div><div class='del'>-* 12/19/00 trw - added PM support for 2.2 base (apm_callback). other PM cleanup.</div><div class='del'>-* 12/21/00 trw - added fractional "defaultorder" inputs. if &gt;100 then use </div><div class='del'>-*		 defaultorder-100 as power of 2 for the buffer size. example:</div><div class='del'>-*		 106 = 2^(106-100) = 2^6 = 64 bytes for the buffer size.</div><div class='del'>-*</div><div class='del'>-*******************************************************************************/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sound.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/soundcard.h&gt;</div><div class='del'>-#include &lt;linux/ac97_codec.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/poll.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/sibyte/sb1250_regs.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_int.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_dma.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_scd.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_syncser.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250_mac.h&gt;</div><div class='del'>-#include &lt;asm/sibyte/sb1250.h&gt;</div><div class='del'>-</div><div class='del'>-struct cs4297a_state;</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(swarm_cs4297a_mutex);</div><div class='del'>-static void stop_dac(struct cs4297a_state *s);</div><div class='del'>-static void stop_adc(struct cs4297a_state *s);</div><div class='del'>-static void start_dac(struct cs4297a_state *s);</div><div class='del'>-static void start_adc(struct cs4297a_state *s);</div><div class='del'>-#undef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-#define CS4297a_MAGIC           0xf00beef1</div><div class='del'>-</div><div class='del'>-// buffer order determines the size of the dma buffer for the driver.</div><div class='del'>-// under Linux, a smaller buffer allows more responsiveness from many of the </div><div class='del'>-// applications (e.g. games).  A larger buffer allows some of the apps (esound) </div><div class='del'>-// to not underrun the dma buffer as easily.  As default, use 32k (order=3)</div><div class='del'>-// rather than 64k as some of the games work more responsively.</div><div class='del'>-// log base 2( buff sz = 32k).</div><div class='del'>-</div><div class='del'>-//</div><div class='del'>-// Turn on/off debugging compilation by commenting out "#define CSDEBUG"</div><div class='del'>-//</div><div class='del'>-#define CSDEBUG 0</div><div class='del'>-#if CSDEBUG</div><div class='del'>-#define CSDEBUG_INTERFACE 1</div><div class='del'>-#else</div><div class='del'>-#undef CSDEBUG_INTERFACE</div><div class='del'>-#endif</div><div class='del'>-//</div><div class='del'>-// cs_debugmask areas</div><div class='del'>-//</div><div class='del'>-#define CS_INIT	 	0x00000001	// initialization and probe functions</div><div class='del'>-#define CS_ERROR 	0x00000002	// tmp debugging bit placeholder</div><div class='del'>-#define CS_INTERRUPT	0x00000004	// interrupt handler (separate from all other)</div><div class='del'>-#define CS_FUNCTION 	0x00000008	// enter/leave functions</div><div class='del'>-#define CS_WAVE_WRITE 	0x00000010	// write information for wave</div><div class='del'>-#define CS_WAVE_READ 	0x00000020	// read information for wave</div><div class='del'>-#define CS_AC97         0x00000040      // AC97 register access</div><div class='del'>-#define CS_DESCR        0x00000080      // descriptor management</div><div class='del'>-#define CS_OPEN		0x00000400	// all open functions in the driver</div><div class='del'>-#define CS_RELEASE	0x00000800	// all release functions in the driver</div><div class='del'>-#define CS_PARMS	0x00001000	// functional and operational parameters</div><div class='del'>-#define CS_IOCTL	0x00002000	// ioctl (non-mixer)</div><div class='del'>-#define CS_TMP		0x10000000	// tmp debug mask bit</div><div class='del'>-</div><div class='del'>-//</div><div class='del'>-// CSDEBUG is usual mode is set to 1, then use the</div><div class='del'>-// cs_debuglevel and cs_debugmask to turn on or off debugging.</div><div class='del'>-// Debug level of 1 has been defined to be kernel errors and info</div><div class='del'>-// that should be printed on any released driver.</div><div class='del'>-//</div><div class='del'>-#if CSDEBUG</div><div class='del'>-#define CS_DBGOUT(mask,level,x) if((cs_debuglevel &gt;= (level)) &amp;&amp; ((mask) &amp; cs_debugmask) ) {x;}</div><div class='del'>-#else</div><div class='del'>-#define CS_DBGOUT(mask,level,x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if CSDEBUG</div><div class='del'>-static unsigned long cs_debuglevel = 4;	// levels range from 1-9</div><div class='del'>-static unsigned long cs_debugmask = CS_INIT /*| CS_IOCTL*/;</div><div class='del'>-module_param(cs_debuglevel, int, 0);</div><div class='del'>-module_param(cs_debugmask, int, 0);</div><div class='del'>-#endif</div><div class='del'>-#define CS_TRUE 	1</div><div class='del'>-#define CS_FALSE 	0</div><div class='del'>-</div><div class='del'>-#define CS_TYPE_ADC 0</div><div class='del'>-#define CS_TYPE_DAC 1</div><div class='del'>-</div><div class='del'>-#define SER_BASE    (A_SER_BASE_1 + KSEG1)</div><div class='del'>-#define SS_CSR(t)   (SER_BASE+t)</div><div class='del'>-#define SS_TXTBL(t) (SER_BASE+R_SER_TX_TABLE_BASE+(t*8))</div><div class='del'>-#define SS_RXTBL(t) (SER_BASE+R_SER_RX_TABLE_BASE+(t*8))</div><div class='del'>-</div><div class='del'>-#define FRAME_BYTES            32</div><div class='del'>-#define FRAME_SAMPLE_BYTES      4</div><div class='del'>-</div><div class='del'>-/* Should this be variable? */</div><div class='del'>-#define SAMPLE_BUF_SIZE        (16*1024)</div><div class='del'>-#define SAMPLE_FRAME_COUNT     (SAMPLE_BUF_SIZE / FRAME_SAMPLE_BYTES)</div><div class='del'>-/* The driver can explode/shrink the frames to/from a smaller sample</div><div class='del'>-   buffer */</div><div class='del'>-#define DMA_BLOAT_FACTOR       1</div><div class='del'>-#define DMA_DESCR              (SAMPLE_FRAME_COUNT / DMA_BLOAT_FACTOR)</div><div class='del'>-#define DMA_BUF_SIZE           (DMA_DESCR * FRAME_BYTES)</div><div class='del'>-</div><div class='del'>-/* Use the maxmium count (255 == 5.1 ms between interrupts) */</div><div class='del'>-#define DMA_INT_CNT            ((1 &lt;&lt; S_DMA_INT_PKTCNT) - 1)</div><div class='del'>-</div><div class='del'>-/* Figure this out: how many TX DMAs ahead to schedule a reg access */</div><div class='del'>-#define REG_LATENCY            150</div><div class='del'>-</div><div class='del'>-#define FRAME_TX_US             20</div><div class='del'>-</div><div class='del'>-#define SERDMA_NEXTBUF(d,f) (((d)-&gt;f+1) % (d)-&gt;ringsz)</div><div class='del'>-</div><div class='del'>-static const char invalid_magic[] =</div><div class='del'>-    KERN_CRIT "cs4297a: invalid magic value\n";</div><div class='del'>-</div><div class='del'>-#define VALIDATE_STATE(s)                          \</div><div class='del'>-({                                                 \</div><div class='del'>-        if (!(s) || (s)-&gt;magic != CS4297a_MAGIC) { \</div><div class='del'>-                printk(invalid_magic);             \</div><div class='del'>-                return -ENXIO;                     \</div><div class='del'>-        }                                          \</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-struct list_head cs4297a_devs = { &amp;cs4297a_devs, &amp;cs4297a_devs };</div><div class='del'>-</div><div class='del'>-typedef struct serdma_descr_s {</div><div class='del'>-        u64 descr_a;</div><div class='del'>-        u64 descr_b;</div><div class='del'>-} serdma_descr_t;</div><div class='del'>-</div><div class='del'>-typedef unsigned long paddr_t;</div><div class='del'>-</div><div class='del'>-typedef struct serdma_s {</div><div class='del'>-        unsigned         ringsz;</div><div class='del'>-        serdma_descr_t  *descrtab;</div><div class='del'>-        serdma_descr_t  *descrtab_end;</div><div class='del'>-        paddr_t          descrtab_phys;</div><div class='del'>-        </div><div class='del'>-        serdma_descr_t  *descr_add;</div><div class='del'>-        serdma_descr_t  *descr_rem;</div><div class='del'>-        </div><div class='del'>-        u64  *dma_buf;           // buffer for DMA contents (frames)</div><div class='del'>-        paddr_t          dma_buf_phys;</div><div class='del'>-        u16  *sample_buf;		// tmp buffer for sample conversions</div><div class='del'>-        u16  *sb_swptr;</div><div class='del'>-        u16  *sb_hwptr;</div><div class='del'>-        u16  *sb_end;</div><div class='del'>-</div><div class='del'>-        dma_addr_t dmaaddr;</div><div class='del'>-//        unsigned buforder;	// Log base 2 of 'dma_buf' size in bytes..</div><div class='del'>-        unsigned numfrag;	// # of 'fragments' in the buffer.</div><div class='del'>-        unsigned fragshift;	// Log base 2 of fragment size.</div><div class='del'>-        unsigned hwptr, swptr;</div><div class='del'>-        unsigned total_bytes;	// # bytes process since open.</div><div class='del'>-        unsigned blocks;	// last returned blocks value GETOPTR</div><div class='del'>-        unsigned wakeup;	// interrupt occurred on block </div><div class='del'>-        int count;</div><div class='del'>-        unsigned underrun;	// underrun flag</div><div class='del'>-        unsigned error;	// over/underrun </div><div class='del'>-        wait_queue_head_t wait;</div><div class='del'>-        wait_queue_head_t reg_wait;</div><div class='del'>-        // redundant, but makes calculations easier </div><div class='del'>-        unsigned fragsize;	// 2**fragshift..</div><div class='del'>-        unsigned sbufsz;	// 2**buforder.</div><div class='del'>-        unsigned fragsamples;</div><div class='del'>-        // OSS stuff </div><div class='del'>-        unsigned mapped:1;	// Buffer mapped in cs4297a_mmap()?</div><div class='del'>-        unsigned ready:1;	// prog_dmabuf_dac()/adc() successful?</div><div class='del'>-        unsigned endcleared:1;</div><div class='del'>-        unsigned type:1;	// adc or dac buffer (CS_TYPE_XXX)</div><div class='del'>-        unsigned ossfragshift;</div><div class='del'>-        int ossmaxfrags;</div><div class='del'>-        unsigned subdivision;</div><div class='del'>-} serdma_t;</div><div class='del'>-</div><div class='del'>-struct cs4297a_state {</div><div class='del'>-	// magic </div><div class='del'>-	unsigned int magic;</div><div class='del'>-</div><div class='del'>-	struct list_head list;</div><div class='del'>-</div><div class='del'>-	// soundcore stuff </div><div class='del'>-	int dev_audio;</div><div class='del'>-	int dev_mixer;</div><div class='del'>-</div><div class='del'>-	// hardware resources </div><div class='del'>-	unsigned int irq;</div><div class='del'>-</div><div class='del'>-        struct {</div><div class='del'>-                unsigned int rx_ovrrn; /* FIFO */</div><div class='del'>-                unsigned int rx_overflow; /* staging buffer */</div><div class='del'>-                unsigned int tx_underrun;</div><div class='del'>-                unsigned int rx_bad;</div><div class='del'>-                unsigned int rx_good;</div><div class='del'>-        } stats;</div><div class='del'>-</div><div class='del'>-	// mixer registers </div><div class='del'>-	struct {</div><div class='del'>-		unsigned short vol[10];</div><div class='del'>-		unsigned int recsrc;</div><div class='del'>-		unsigned int modcnt;</div><div class='del'>-		unsigned short micpreamp;</div><div class='del'>-	} mix;</div><div class='del'>-</div><div class='del'>-	// wave stuff   </div><div class='del'>-	struct properties {</div><div class='del'>-		unsigned fmt;</div><div class='del'>-		unsigned fmt_original;	// original requested format</div><div class='del'>-		unsigned channels;</div><div class='del'>-		unsigned rate;</div><div class='del'>-	} prop_dac, prop_adc;</div><div class='del'>-	unsigned conversion:1;	// conversion from 16 to 8 bit in progress</div><div class='del'>-	unsigned ena;</div><div class='del'>-	spinlock_t lock;</div><div class='del'>-	struct mutex open_mutex;</div><div class='del'>-	struct mutex open_sem_adc;</div><div class='del'>-	struct mutex open_sem_dac;</div><div class='del'>-	fmode_t open_mode;</div><div class='del'>-	wait_queue_head_t open_wait;</div><div class='del'>-	wait_queue_head_t open_wait_adc;</div><div class='del'>-	wait_queue_head_t open_wait_dac;</div><div class='del'>-</div><div class='del'>-	dma_addr_t dmaaddr_sample_buf;</div><div class='del'>-	unsigned buforder_sample_buf;	// Log base 2 of 'dma_buf' size in bytes..</div><div class='del'>-</div><div class='del'>-        serdma_t dma_dac, dma_adc;</div><div class='del'>-</div><div class='del'>-        volatile u16 read_value;</div><div class='del'>-        volatile u16 read_reg;</div><div class='del'>-        volatile u64 reg_request;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-#define prog_codec(a,b)</div><div class='del'>-#define dealloc_dmabuf(a,b);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int prog_dmabuf_adc(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;dma_adc.ready = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int prog_dmabuf_dac(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	s-&gt;dma_dac.ready = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clear_advance(void *buf, unsigned bsize, unsigned bptr,</div><div class='del'>-			  unsigned len, unsigned char c)</div><div class='del'>-{</div><div class='del'>-	if (bptr + len &gt; bsize) {</div><div class='del'>-		unsigned x = bsize - bptr;</div><div class='del'>-		memset(((char *) buf) + bptr, c, x);</div><div class='del'>-		bptr = 0;</div><div class='del'>-		len -= x;</div><div class='del'>-	}</div><div class='del'>-	CS_DBGOUT(CS_WAVE_WRITE, 4, printk(KERN_INFO</div><div class='del'>-		"cs4297a: clear_advance(): memset %d at 0x%.8x for %d size \n",</div><div class='del'>-			(unsigned)c, (unsigned)((char *) buf) + bptr, len));</div><div class='del'>-	memset(((char *) buf) + bptr, c, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if CSDEBUG</div><div class='del'>-</div><div class='del'>-// DEBUG ROUTINES</div><div class='del'>-</div><div class='del'>-#define SOUND_MIXER_CS_GETDBGLEVEL 	_SIOWR('M',120, int)</div><div class='del'>-#define SOUND_MIXER_CS_SETDBGLEVEL 	_SIOWR('M',121, int)</div><div class='del'>-#define SOUND_MIXER_CS_GETDBGMASK 	_SIOWR('M',122, int)</div><div class='del'>-#define SOUND_MIXER_CS_SETDBGMASK 	_SIOWR('M',123, int)</div><div class='del'>-</div><div class='del'>-static void cs_printioctl(unsigned int x)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	unsigned char vidx;</div><div class='del'>-	// Index of mixtable1[] member is Device ID </div><div class='del'>-	// and must be &lt;= SOUND_MIXER_NRDEVICES.</div><div class='del'>-	// Value of array member is index into s-&gt;mix.vol[]</div><div class='del'>-	static const unsigned char mixtable1[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-		[SOUND_MIXER_PCM] = 1,	// voice </div><div class='del'>-		[SOUND_MIXER_LINE1] = 2,	// AUX</div><div class='del'>-		[SOUND_MIXER_CD] = 3,	// CD </div><div class='del'>-		[SOUND_MIXER_LINE] = 4,	// Line </div><div class='del'>-		[SOUND_MIXER_SYNTH] = 5,	// FM</div><div class='del'>-		[SOUND_MIXER_MIC] = 6,	// Mic </div><div class='del'>-		[SOUND_MIXER_SPEAKER] = 7,	// Speaker </div><div class='del'>-		[SOUND_MIXER_RECLEV] = 8,	// Recording level </div><div class='del'>-		[SOUND_MIXER_VOLUME] = 9	// Master Volume </div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	switch (x) {</div><div class='del'>-	case SOUND_MIXER_CS_GETDBGMASK:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_MIXER_CS_GETDBGMASK:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_CS_GETDBGLEVEL:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_MIXER_CS_GETDBGLEVEL:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_CS_SETDBGMASK:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_MIXER_CS_SETDBGMASK:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_CS_SETDBGLEVEL:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_MIXER_CS_SETDBGLEVEL:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case OSS_GETVERSION:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("OSS_GETVERSION:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SYNC:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SYNC:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SETDUPLEX:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SETDUPLEX:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETCAPS:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETCAPS:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_RESET:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_RESET:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SPEED:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SPEED:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_STEREO:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_STEREO:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_CHANNELS:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_CHANNELS:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETFMTS:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETFMTS:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SETFMT:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SETFMT:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_POST:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_POST:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETTRIGGER:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETTRIGGER:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SETTRIGGER:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SETTRIGGER:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETOSPACE:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETISPACE:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETISPACE:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_NONBLOCK:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_NONBLOCK:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETODELAY:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETODELAY:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETIPTR:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETIPTR:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETOPTR:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETOPTR:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_GETBLKSIZE:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_GETBLKSIZE:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SETFRAGMENT:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SNDCTL_DSP_SETFRAGMENT:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SUBDIVIDE:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SUBDIVIDE:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_PCM_READ_RATE:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_PCM_READ_RATE:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_PCM_READ_CHANNELS:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_PCM_READ_CHANNELS:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_PCM_READ_BITS:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_PCM_READ_BITS:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_PCM_WRITE_FILTER:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-			  printk("SOUND_PCM_WRITE_FILTER:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SNDCTL_DSP_SETSYNCRO:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SNDCTL_DSP_SETSYNCRO:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_PCM_READ_FILTER:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_PCM_READ_FILTER:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_PRIVATE1:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_PRIVATE1:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_PRIVATE2:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_PRIVATE2:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_PRIVATE3:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_PRIVATE3:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_PRIVATE4:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_PRIVATE4:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_PRIVATE5:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_PRIVATE5:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_MIXER_INFO:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_INFO:\n"));</div><div class='del'>-		break;</div><div class='del'>-	case SOUND_OLD_MIXER_INFO:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_OLD_MIXER_INFO:\n"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		switch (_IOC_NR(x)) {</div><div class='del'>-		case SOUND_MIXER_VOLUME:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_VOLUME:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_SPEAKER:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_SPEAKER:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_RECLEV:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_RECLEV:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_MIC:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_MIC:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_SYNTH:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_SYNTH:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_RECSRC:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_RECSRC:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_DEVMASK:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_DEVMASK:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_RECMASK:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_RECMASK:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_STEREODEVS:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4,</div><div class='del'>-				  printk("SOUND_MIXER_STEREODEVS:\n"));</div><div class='del'>-			break;</div><div class='del'>-		case SOUND_MIXER_CAPS:</div><div class='del'>-			CS_DBGOUT(CS_IOCTL, 4, printk("SOUND_MIXER_CAPS:\n"));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			i = _IOC_NR(x);</div><div class='del'>-			if (i &gt;= SOUND_MIXER_NRDEVICES</div><div class='del'>-			    || !(vidx = mixtable1[i])) {</div><div class='del'>-				CS_DBGOUT(CS_IOCTL, 4, printk</div><div class='del'>-					("UNKNOWN IOCTL: 0x%.8x NR=%d\n",</div><div class='del'>-						x, i));</div><div class='del'>-			} else {</div><div class='del'>-				CS_DBGOUT(CS_IOCTL, 4, printk</div><div class='del'>-					("SOUND_MIXER_IOCTL AC9x: 0x%.8x NR=%d\n",</div><div class='del'>-						x, i));</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ser_init(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-        int i;</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_INIT, 2, </div><div class='del'>-                  printk(KERN_INFO "cs4297a: Setting up serial parameters\n"));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(M_SYNCSER_CMD_RX_RESET | M_SYNCSER_CMD_TX_RESET, SS_CSR(R_SER_CMD));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(M_SYNCSER_MSB_FIRST, SS_CSR(R_SER_MODE));</div><div class='del'>-        __raw_writeq(32, SS_CSR(R_SER_MINFRM_SZ));</div><div class='del'>-        __raw_writeq(32, SS_CSR(R_SER_MAXFRM_SZ));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(1, SS_CSR(R_SER_TX_RD_THRSH));</div><div class='del'>-        __raw_writeq(4, SS_CSR(R_SER_TX_WR_THRSH));</div><div class='del'>-        __raw_writeq(8, SS_CSR(R_SER_RX_RD_THRSH));</div><div class='del'>-</div><div class='del'>-        /* This looks good from experimentation */</div><div class='del'>-        __raw_writeq((M_SYNCSER_TXSYNC_INT | V_SYNCSER_TXSYNC_DLY(0) | M_SYNCSER_TXCLK_EXT |</div><div class='del'>-               M_SYNCSER_RXSYNC_INT | V_SYNCSER_RXSYNC_DLY(1) | M_SYNCSER_RXCLK_EXT | M_SYNCSER_RXSYNC_EDGE),</div><div class='del'>-              SS_CSR(R_SER_LINE_MODE));</div><div class='del'>-</div><div class='del'>-        /* This looks good from experimentation */</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(14) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_STROBE,</div><div class='del'>-              SS_TXTBL(0));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(15) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_BYTE,</div><div class='del'>-              SS_TXTBL(1));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(13) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_BYTE,</div><div class='del'>-              SS_TXTBL(2));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT( 0) | M_SYNCSER_SEQ_ENABLE |</div><div class='del'>-              M_SYNCSER_SEQ_STROBE | M_SYNCSER_SEQ_LAST, SS_TXTBL(3));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(14) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_STROBE,</div><div class='del'>-              SS_RXTBL(0));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(15) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_BYTE,</div><div class='del'>-              SS_RXTBL(1));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT(13) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_BYTE,</div><div class='del'>-              SS_RXTBL(2));</div><div class='del'>-        __raw_writeq(V_SYNCSER_SEQ_COUNT( 0) | M_SYNCSER_SEQ_ENABLE | M_SYNCSER_SEQ_STROBE |</div><div class='del'>-              M_SYNCSER_SEQ_LAST, SS_RXTBL(3));</div><div class='del'>-</div><div class='del'>-        for (i=4; i&lt;16; i++) {</div><div class='del'>-                /* Just in case... */</div><div class='del'>-                __raw_writeq(M_SYNCSER_SEQ_LAST, SS_TXTBL(i));</div><div class='del'>-                __raw_writeq(M_SYNCSER_SEQ_LAST, SS_RXTBL(i));</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int init_serdma(serdma_t *dma)</div><div class='del'>-{</div><div class='del'>-        CS_DBGOUT(CS_INIT, 2,</div><div class='del'>-                  printk(KERN_ERR "cs4297a: desc - %d sbufsize - %d dbufsize - %d\n",</div><div class='del'>-                         DMA_DESCR, SAMPLE_BUF_SIZE, DMA_BUF_SIZE));</div><div class='del'>-</div><div class='del'>-        /* Descriptors */</div><div class='del'>-        dma-&gt;ringsz = DMA_DESCR;</div><div class='del'>-        dma-&gt;descrtab = kzalloc(dma-&gt;ringsz * sizeof(serdma_descr_t), GFP_KERNEL);</div><div class='del'>-        if (!dma-&gt;descrtab) {</div><div class='del'>-                printk(KERN_ERR "cs4297a: kzalloc descrtab failed\n");</div><div class='del'>-                return -1;</div><div class='del'>-        }</div><div class='del'>-        dma-&gt;descrtab_end = dma-&gt;descrtab + dma-&gt;ringsz;</div><div class='del'>-	/* XXX bloddy mess, use proper DMA API here ...  */</div><div class='del'>-	dma-&gt;descrtab_phys = CPHYSADDR((long)dma-&gt;descrtab);</div><div class='del'>-        dma-&gt;descr_add = dma-&gt;descr_rem = dma-&gt;descrtab;</div><div class='del'>-</div><div class='del'>-        /* Frame buffer area */</div><div class='del'>-        dma-&gt;dma_buf = kzalloc(DMA_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-        if (!dma-&gt;dma_buf) {</div><div class='del'>-                printk(KERN_ERR "cs4297a: kzalloc dma_buf failed\n");</div><div class='del'>-                kfree(dma-&gt;descrtab);</div><div class='del'>-                return -1;</div><div class='del'>-        }</div><div class='del'>-        dma-&gt;dma_buf_phys = CPHYSADDR((long)dma-&gt;dma_buf);</div><div class='del'>-</div><div class='del'>-        /* Samples buffer area */</div><div class='del'>-        dma-&gt;sbufsz = SAMPLE_BUF_SIZE;</div><div class='del'>-        dma-&gt;sample_buf = kmalloc(dma-&gt;sbufsz, GFP_KERNEL);</div><div class='del'>-        if (!dma-&gt;sample_buf) {</div><div class='del'>-                printk(KERN_ERR "cs4297a: kmalloc sample_buf failed\n");</div><div class='del'>-                kfree(dma-&gt;descrtab);</div><div class='del'>-                kfree(dma-&gt;dma_buf);</div><div class='del'>-                return -1;</div><div class='del'>-        }</div><div class='del'>-        dma-&gt;sb_swptr = dma-&gt;sb_hwptr = dma-&gt;sample_buf;</div><div class='del'>-        dma-&gt;sb_end = (u16 *)((void *)dma-&gt;sample_buf + dma-&gt;sbufsz);</div><div class='del'>-        dma-&gt;fragsize = dma-&gt;sbufsz &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_INIT, 4, </div><div class='del'>-                  printk(KERN_ERR "cs4297a: descrtab - %08x dma_buf - %x sample_buf - %x\n",</div><div class='del'>-                         (int)dma-&gt;descrtab, (int)dma-&gt;dma_buf, </div><div class='del'>-                         (int)dma-&gt;sample_buf));</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dma_init(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-        int i;</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_INIT, 2, </div><div class='del'>-                  printk(KERN_INFO "cs4297a: Setting up DMA\n"));</div><div class='del'>-</div><div class='del'>-        if (init_serdma(&amp;s-&gt;dma_adc) ||</div><div class='del'>-            init_serdma(&amp;s-&gt;dma_dac))</div><div class='del'>-                return -1;</div><div class='del'>-</div><div class='del'>-        if (__raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_RX))||</div><div class='del'>-            __raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_TX))) {</div><div class='del'>-                panic("DMA state corrupted?!");</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* Initialize now - the descr/buffer pairings will never</div><div class='del'>-           change... */</div><div class='del'>-        for (i=0; i&lt;DMA_DESCR; i++) {</div><div class='del'>-                s-&gt;dma_dac.descrtab[i].descr_a = M_DMA_SERRX_SOP | V_DMA_DSCRA_A_SIZE(1) | </div><div class='del'>-                        (s-&gt;dma_dac.dma_buf_phys + i*FRAME_BYTES);</div><div class='del'>-                s-&gt;dma_dac.descrtab[i].descr_b = V_DMA_DSCRB_PKT_SIZE(FRAME_BYTES);</div><div class='del'>-                s-&gt;dma_adc.descrtab[i].descr_a = V_DMA_DSCRA_A_SIZE(1) |</div><div class='del'>-                        (s-&gt;dma_adc.dma_buf_phys + i*FRAME_BYTES);</div><div class='del'>-                s-&gt;dma_adc.descrtab[i].descr_b = 0;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        __raw_writeq((M_DMA_EOP_INT_EN | V_DMA_INT_PKTCNT(DMA_INT_CNT) |</div><div class='del'>-               V_DMA_RINGSZ(DMA_DESCR) | M_DMA_TDX_EN),</div><div class='del'>-              SS_CSR(R_SER_DMA_CONFIG0_RX));</div><div class='del'>-        __raw_writeq(M_DMA_L2CA, SS_CSR(R_SER_DMA_CONFIG1_RX));</div><div class='del'>-        __raw_writeq(s-&gt;dma_adc.descrtab_phys, SS_CSR(R_SER_DMA_DSCR_BASE_RX));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(V_DMA_RINGSZ(DMA_DESCR), SS_CSR(R_SER_DMA_CONFIG0_TX));</div><div class='del'>-        __raw_writeq(M_DMA_L2CA | M_DMA_NO_DSCR_UPDT, SS_CSR(R_SER_DMA_CONFIG1_TX));</div><div class='del'>-        __raw_writeq(s-&gt;dma_dac.descrtab_phys, SS_CSR(R_SER_DMA_DSCR_BASE_TX));</div><div class='del'>-</div><div class='del'>-        /* Prep the receive DMA descriptor ring */</div><div class='del'>-        __raw_writeq(DMA_DESCR, SS_CSR(R_SER_DMA_DSCR_COUNT_RX));</div><div class='del'>-</div><div class='del'>-        __raw_writeq(M_SYNCSER_DMA_RX_EN | M_SYNCSER_DMA_TX_EN, SS_CSR(R_SER_DMA_ENABLE));</div><div class='del'>-</div><div class='del'>-        __raw_writeq((M_SYNCSER_RX_SYNC_ERR | M_SYNCSER_RX_OVERRUN | M_SYNCSER_RX_EOP_COUNT),</div><div class='del'>-              SS_CSR(R_SER_INT_MASK));</div><div class='del'>-</div><div class='del'>-        /* Enable the rx/tx; let the codec warm up to the sync and</div><div class='del'>-           start sending good frames before the receive FIFO is</div><div class='del'>-           enabled */</div><div class='del'>-        __raw_writeq(M_SYNCSER_CMD_TX_EN, SS_CSR(R_SER_CMD));</div><div class='del'>-        udelay(1000);</div><div class='del'>-        __raw_writeq(M_SYNCSER_CMD_RX_EN | M_SYNCSER_CMD_TX_EN, SS_CSR(R_SER_CMD));</div><div class='del'>-</div><div class='del'>-        /* XXXKW is this magic? (the "1" part) */</div><div class='del'>-        while ((__raw_readq(SS_CSR(R_SER_STATUS)) &amp; 0xf1) != 1)</div><div class='del'>-                ;</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_INIT, 4, </div><div class='del'>-                  printk(KERN_INFO "cs4297a: status: %08x\n",</div><div class='del'>-                         (unsigned int)(__raw_readq(SS_CSR(R_SER_STATUS)) &amp; 0xffffffff)));</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int serdma_reg_access(struct cs4297a_state *s, u64 data)</div><div class='del'>-{</div><div class='del'>-        serdma_t *d = &amp;s-&gt;dma_dac;</div><div class='del'>-        u64 *data_p;</div><div class='del'>-        unsigned swptr;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-        serdma_descr_t *descr;</div><div class='del'>-</div><div class='del'>-        if (s-&gt;reg_request) {</div><div class='del'>-                printk(KERN_ERR "cs4297a: attempt to issue multiple reg_access\n");</div><div class='del'>-                return -1;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (s-&gt;ena &amp; FMODE_WRITE) {</div><div class='del'>-                /* Since a writer has the DSP open, we have to mux the</div><div class='del'>-                   request in */</div><div class='del'>-                s-&gt;reg_request = data;</div><div class='del'>-                interruptible_sleep_on(&amp;s-&gt;dma_dac.reg_wait);</div><div class='del'>-                /* XXXKW how can I deal with the starvation case where</div><div class='del'>-                   the opener isn't writing? */</div><div class='del'>-        } else {</div><div class='del'>-                /* Be safe when changing ring pointers */</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-                if (d-&gt;hwptr != d-&gt;swptr) {</div><div class='del'>-                        printk(KERN_ERR "cs4297a: reg access found bookkeeping error (hw/sw = %d/%d\n",</div><div class='del'>-                               d-&gt;hwptr, d-&gt;swptr);</div><div class='del'>-                        spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-                        return -1;</div><div class='del'>-                }</div><div class='del'>-                swptr = d-&gt;swptr;</div><div class='del'>-                d-&gt;hwptr = d-&gt;swptr = (d-&gt;swptr + 1) % d-&gt;ringsz;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-                descr = &amp;d-&gt;descrtab[swptr];</div><div class='del'>-                data_p = &amp;d-&gt;dma_buf[swptr * 4];</div><div class='del'>-		*data_p = cpu_to_be64(data);</div><div class='del'>-                __raw_writeq(1, SS_CSR(R_SER_DMA_DSCR_COUNT_TX));</div><div class='del'>-                CS_DBGOUT(CS_DESCR, 4,</div><div class='del'>-                          printk(KERN_INFO "cs4297a: add_tx  %p (%x -&gt; %x)\n",</div><div class='del'>-                                 data_p, swptr, d-&gt;hwptr));</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_FUNCTION, 6,</div><div class='del'>-                  printk(KERN_INFO "cs4297a: serdma_reg_access()-\n"));</div><div class='del'>-        </div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//****************************************************************************</div><div class='del'>-// "cs4297a_read_ac97" -- Reads an AC97 register</div><div class='del'>-//****************************************************************************</div><div class='del'>-static int cs4297a_read_ac97(struct cs4297a_state *s, u32 offset,</div><div class='del'>-			    u32 * value)</div><div class='del'>-{</div><div class='del'>-        CS_DBGOUT(CS_AC97, 1,</div><div class='del'>-                  printk(KERN_INFO "cs4297a: read reg %2x\n", offset));</div><div class='del'>-        if (serdma_reg_access(s, (0xCLL &lt;&lt; 60) | (1LL &lt;&lt; 47) | ((u64)(offset &amp; 0x7F) &lt;&lt; 40)))</div><div class='del'>-                return -1;</div><div class='del'>-</div><div class='del'>-        interruptible_sleep_on(&amp;s-&gt;dma_adc.reg_wait);</div><div class='del'>-        *value = s-&gt;read_value;</div><div class='del'>-        CS_DBGOUT(CS_AC97, 2,</div><div class='del'>-                  printk(KERN_INFO "cs4297a: rdr reg %x -&gt; %x\n", s-&gt;read_reg, s-&gt;read_value));</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-//****************************************************************************</div><div class='del'>-// "cs4297a_write_ac97()"-- writes an AC97 register</div><div class='del'>-//****************************************************************************</div><div class='del'>-static int cs4297a_write_ac97(struct cs4297a_state *s, u32 offset,</div><div class='del'>-			     u32 value)</div><div class='del'>-{</div><div class='del'>-        CS_DBGOUT(CS_AC97, 1,</div><div class='del'>-                  printk(KERN_INFO "cs4297a: write reg %2x -&gt; %04x\n", offset, value));</div><div class='del'>-        return (serdma_reg_access(s, (0xELL &lt;&lt; 60) | ((u64)(offset &amp; 0x7F) &lt;&lt; 40) | ((value &amp; 0xffff) &lt;&lt; 12)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stop_dac(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_WAVE_WRITE, 3, printk(KERN_INFO "cs4297a: stop_dac():\n"));</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-	s-&gt;ena &amp;= ~FMODE_WRITE;</div><div class='del'>-#if 0</div><div class='del'>-        /* XXXKW what do I really want here?  My theory for now is</div><div class='del'>-           that I just flip the "ena" bit, and the interrupt handler</div><div class='del'>-           will stop processing the xmit channel */</div><div class='del'>-        __raw_writeq((s-&gt;ena &amp; FMODE_READ) ? M_SYNCSER_DMA_RX_EN : 0,</div><div class='del'>-              SS_CSR(R_SER_DMA_ENABLE));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void start_dac(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 3, printk(KERN_INFO "cs4297a: start_dac()+\n"));</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-	if (!(s-&gt;ena &amp; FMODE_WRITE) &amp;&amp; (s-&gt;dma_dac.mapped ||</div><div class='del'>-					(s-&gt;dma_dac.count &gt; 0</div><div class='del'>-	    				&amp;&amp; s-&gt;dma_dac.ready))) {</div><div class='del'>-		s-&gt;ena |= FMODE_WRITE;</div><div class='del'>-                /* XXXKW what do I really want here?  My theory for</div><div class='del'>-                   now is that I just flip the "ena" bit, and the</div><div class='del'>-                   interrupt handler will start processing the xmit</div><div class='del'>-                   channel */</div><div class='del'>-</div><div class='del'>-		CS_DBGOUT(CS_WAVE_WRITE | CS_PARMS, 8, printk(KERN_INFO</div><div class='del'>-			"cs4297a: start_dac(): start dma\n"));</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 3,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: start_dac()-\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void stop_adc(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 3,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: stop_adc()+\n"));</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-	s-&gt;ena &amp;= ~FMODE_READ;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;conversion == 1) {</div><div class='del'>-		s-&gt;conversion = 0;</div><div class='del'>-		s-&gt;prop_adc.fmt = s-&gt;prop_adc.fmt_original;</div><div class='del'>-	}</div><div class='del'>-        /* Nothing to do really, I need to keep the DMA going</div><div class='del'>-           XXXKW when do I get here, and is there more I should do? */</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 3,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: stop_adc()-\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void start_adc(struct cs4297a_state *s)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: start_adc()+\n"));</div><div class='del'>-</div><div class='del'>-	if (!(s-&gt;ena &amp; FMODE_READ) &amp;&amp;</div><div class='del'>-	    (s-&gt;dma_adc.mapped || s-&gt;dma_adc.count &lt;=</div><div class='del'>-	     (signed) (s-&gt;dma_adc.sbufsz - 2 * s-&gt;dma_adc.fragsize))</div><div class='del'>-	    &amp;&amp; s-&gt;dma_adc.ready) {</div><div class='del'>-		if (s-&gt;prop_adc.fmt &amp; AFMT_S8 || s-&gt;prop_adc.fmt &amp; AFMT_U8) {</div><div class='del'>-			// </div><div class='del'>-			// now only use 16 bit capture, due to truncation issue</div><div class='del'>-			// in the chip, noticable distortion occurs.</div><div class='del'>-			// allocate buffer and then convert from 16 bit to </div><div class='del'>-			// 8 bit for the user buffer.</div><div class='del'>-			//</div><div class='del'>-			s-&gt;prop_adc.fmt_original = s-&gt;prop_adc.fmt;</div><div class='del'>-			if (s-&gt;prop_adc.fmt &amp; AFMT_S8) {</div><div class='del'>-				s-&gt;prop_adc.fmt &amp;= ~AFMT_S8;</div><div class='del'>-				s-&gt;prop_adc.fmt |= AFMT_S16_LE;</div><div class='del'>-			}</div><div class='del'>-			if (s-&gt;prop_adc.fmt &amp; AFMT_U8) {</div><div class='del'>-				s-&gt;prop_adc.fmt &amp;= ~AFMT_U8;</div><div class='del'>-				s-&gt;prop_adc.fmt |= AFMT_U16_LE;</div><div class='del'>-			}</div><div class='del'>-			//</div><div class='del'>-			// prog_dmabuf_adc performs a stop_adc() but that is</div><div class='del'>-			// ok since we really haven't started the DMA yet.</div><div class='del'>-			//</div><div class='del'>-			prog_codec(s, CS_TYPE_ADC);</div><div class='del'>-</div><div class='del'>-                        prog_dmabuf_adc(s);</div><div class='del'>-			s-&gt;conversion = 1;</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		s-&gt;ena |= FMODE_READ;</div><div class='del'>-                /* Nothing to do really, I am probably already</div><div class='del'>-                   DMAing...  XXXKW when do I get here, and is there</div><div class='del'>-                   more I should do? */</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-		CS_DBGOUT(CS_PARMS, 6, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: start_adc(): start adc\n"));</div><div class='del'>-	}</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: start_adc()-\n"));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// call with spinlock held! </div><div class='del'>-static void cs4297a_update_ptr(struct cs4297a_state *s, int intflag)</div><div class='del'>-{</div><div class='del'>-	int good_diff, diff, diff2;</div><div class='del'>-        u64 *data_p, data;</div><div class='del'>-        u32 *s_ptr;</div><div class='del'>-	unsigned hwptr;</div><div class='del'>-        u32 status;</div><div class='del'>-        serdma_t *d;</div><div class='del'>-        serdma_descr_t *descr;</div><div class='del'>-</div><div class='del'>-	// update ADC pointer </div><div class='del'>-        status = intflag ? __raw_readq(SS_CSR(R_SER_STATUS)) : 0;</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;ena &amp; FMODE_READ) || (status &amp; (M_SYNCSER_RX_EOP_COUNT))) {</div><div class='del'>-                d = &amp;s-&gt;dma_adc;</div><div class='del'>-                hwptr = (unsigned) (((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_RX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                     d-&gt;descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-</div><div class='del'>-                if (s-&gt;ena &amp; FMODE_READ) {</div><div class='del'>-                        CS_DBGOUT(CS_FUNCTION, 2, </div><div class='del'>-                                  printk(KERN_INFO "cs4297a: upd_rcv sw-&gt;hw-&gt;hw %x/%x/%x (int-%d)n",</div><div class='del'>-                                         d-&gt;swptr, d-&gt;hwptr, hwptr, intflag));</div><div class='del'>-                        /* Number of DMA buffers available for software: */</div><div class='del'>-                        diff2 = diff = (d-&gt;ringsz + hwptr - d-&gt;hwptr) % d-&gt;ringsz;</div><div class='del'>-                        d-&gt;hwptr = hwptr;</div><div class='del'>-                        good_diff = 0;</div><div class='del'>-                        s_ptr = (u32 *)&amp;(d-&gt;dma_buf[d-&gt;swptr*4]);</div><div class='del'>-                        descr = &amp;d-&gt;descrtab[d-&gt;swptr];</div><div class='del'>-                        while (diff2--) {</div><div class='del'>-				u64 data = be64_to_cpu(*(u64 *)s_ptr);</div><div class='del'>-                                u64 descr_a;</div><div class='del'>-                                u16 left, right;</div><div class='del'>-                                descr_a = descr-&gt;descr_a;</div><div class='del'>-                                descr-&gt;descr_a &amp;= ~M_DMA_SERRX_SOP;</div><div class='del'>-                                if ((descr_a &amp; M_DMA_DSCRA_A_ADDR) != CPHYSADDR((long)s_ptr)) {</div><div class='del'>-                                        printk(KERN_ERR "cs4297a: RX Bad address (read)\n");</div><div class='del'>-                                }</div><div class='del'>-                                if (((data &amp; 0x9800000000000000) != 0x9800000000000000) ||</div><div class='del'>-                                    (!(descr_a &amp; M_DMA_SERRX_SOP)) ||</div><div class='del'>-                                    (G_DMA_DSCRB_PKT_SIZE(descr-&gt;descr_b) != FRAME_BYTES)) {</div><div class='del'>-                                        s-&gt;stats.rx_bad++;</div><div class='del'>-                                        printk(KERN_DEBUG "cs4297a: RX Bad attributes (read)\n");</div><div class='del'>-                                        continue;</div><div class='del'>-                                }</div><div class='del'>-                                s-&gt;stats.rx_good++;</div><div class='del'>-                                if ((data &gt;&gt; 61) == 7) {</div><div class='del'>-                                        s-&gt;read_value = (data &gt;&gt; 12) &amp; 0xffff;</div><div class='del'>-                                        s-&gt;read_reg = (data &gt;&gt; 40) &amp; 0x7f;</div><div class='del'>-                                        wake_up(&amp;d-&gt;reg_wait);</div><div class='del'>-                                }</div><div class='del'>-                                if (d-&gt;count &amp;&amp; (d-&gt;sb_hwptr == d-&gt;sb_swptr)) {</div><div class='del'>-                                        s-&gt;stats.rx_overflow++;</div><div class='del'>-                                        printk(KERN_DEBUG "cs4297a: RX overflow\n");</div><div class='del'>-                                        continue;</div><div class='del'>-                                }</div><div class='del'>-                                good_diff++;</div><div class='del'>-				left = ((be32_to_cpu(s_ptr[1]) &amp; 0xff) &lt;&lt; 8) |</div><div class='del'>-				       ((be32_to_cpu(s_ptr[2]) &gt;&gt; 24) &amp; 0xff);</div><div class='del'>-				right = (be32_to_cpu(s_ptr[2]) &gt;&gt; 4) &amp; 0xffff;</div><div class='del'>-				*d-&gt;sb_hwptr++ = cpu_to_be16(left);</div><div class='del'>-				*d-&gt;sb_hwptr++ = cpu_to_be16(right);</div><div class='del'>-                                if (d-&gt;sb_hwptr == d-&gt;sb_end)</div><div class='del'>-                                        d-&gt;sb_hwptr = d-&gt;sample_buf;</div><div class='del'>-                                descr++;</div><div class='del'>-                                if (descr == d-&gt;descrtab_end) {</div><div class='del'>-                                        descr = d-&gt;descrtab;</div><div class='del'>-                                        s_ptr = (u32 *)s-&gt;dma_adc.dma_buf;</div><div class='del'>-                                } else {</div><div class='del'>-                                        s_ptr += 8;</div><div class='del'>-                                }</div><div class='del'>-                        }</div><div class='del'>-                        d-&gt;total_bytes += good_diff * FRAME_SAMPLE_BYTES;</div><div class='del'>-                        d-&gt;count += good_diff * FRAME_SAMPLE_BYTES;</div><div class='del'>-                        if (d-&gt;count &gt; d-&gt;sbufsz) {</div><div class='del'>-                                printk(KERN_ERR "cs4297a: bogus receive overflow!!\n");</div><div class='del'>-                        }</div><div class='del'>-                        d-&gt;swptr = (d-&gt;swptr + diff) % d-&gt;ringsz;</div><div class='del'>-                        __raw_writeq(diff, SS_CSR(R_SER_DMA_DSCR_COUNT_RX));</div><div class='del'>-                        if (d-&gt;mapped) {</div><div class='del'>-                                if (d-&gt;count &gt;= (signed) d-&gt;fragsize)</div><div class='del'>-                                        wake_up(&amp;d-&gt;wait);</div><div class='del'>-                        } else {</div><div class='del'>-                                if (d-&gt;count &gt; 0) {</div><div class='del'>-                                        CS_DBGOUT(CS_WAVE_READ, 4,</div><div class='del'>-                                                  printk(KERN_INFO</div><div class='del'>-                                                         "cs4297a: update count -&gt; %d\n", d-&gt;count));</div><div class='del'>-                                        wake_up(&amp;d-&gt;wait);</div><div class='del'>-                                }</div><div class='del'>-                        }</div><div class='del'>-                } else {</div><div class='del'>-                        /* Receive is going even if no one is</div><div class='del'>-                           listening (for register accesses and to</div><div class='del'>-                           avoid FIFO overrun) */</div><div class='del'>-                        diff2 = diff = (hwptr + d-&gt;ringsz - d-&gt;hwptr) % d-&gt;ringsz;</div><div class='del'>-                        if (!diff) {</div><div class='del'>-                                printk(KERN_ERR "cs4297a: RX full or empty?\n");</div><div class='del'>-                        }</div><div class='del'>-                        </div><div class='del'>-                        descr = &amp;d-&gt;descrtab[d-&gt;swptr];</div><div class='del'>-                        data_p = &amp;d-&gt;dma_buf[d-&gt;swptr*4];</div><div class='del'>-</div><div class='del'>-                        /* Force this to happen at least once; I got</div><div class='del'>-                           here because of an interrupt, so there must</div><div class='del'>-                           be a buffer to process. */</div><div class='del'>-                        do {</div><div class='del'>-				data = be64_to_cpu(*data_p);</div><div class='del'>-                                if ((descr-&gt;descr_a &amp; M_DMA_DSCRA_A_ADDR) != CPHYSADDR((long)data_p)) {</div><div class='del'>-                                        printk(KERN_ERR "cs4297a: RX Bad address %d (%llx %lx)\n", d-&gt;swptr,</div><div class='del'>-                                               (long long)(descr-&gt;descr_a &amp; M_DMA_DSCRA_A_ADDR),</div><div class='del'>-                                               (long)CPHYSADDR((long)data_p));</div><div class='del'>-                                }</div><div class='del'>-                                if (!(data &amp; (1LL &lt;&lt; 63)) ||</div><div class='del'>-                                    !(descr-&gt;descr_a &amp; M_DMA_SERRX_SOP) ||</div><div class='del'>-                                    (G_DMA_DSCRB_PKT_SIZE(descr-&gt;descr_b) != FRAME_BYTES)) {</div><div class='del'>-                                        s-&gt;stats.rx_bad++;</div><div class='del'>-                                        printk(KERN_DEBUG "cs4297a: RX Bad attributes\n");</div><div class='del'>-                                } else {</div><div class='del'>-                                        s-&gt;stats.rx_good++;</div><div class='del'>-                                        if ((data &gt;&gt; 61) == 7) {</div><div class='del'>-                                                s-&gt;read_value = (data &gt;&gt; 12) &amp; 0xffff;</div><div class='del'>-                                                s-&gt;read_reg = (data &gt;&gt; 40) &amp; 0x7f;</div><div class='del'>-                                                wake_up(&amp;d-&gt;reg_wait);</div><div class='del'>-                                        }</div><div class='del'>-                                }</div><div class='del'>-                                descr-&gt;descr_a &amp;= ~M_DMA_SERRX_SOP;</div><div class='del'>-                                descr++;</div><div class='del'>-                                d-&gt;swptr++;</div><div class='del'>-                                data_p += 4;</div><div class='del'>-                                if (descr == d-&gt;descrtab_end) {</div><div class='del'>-                                        descr = d-&gt;descrtab;</div><div class='del'>-                                        d-&gt;swptr = 0;</div><div class='del'>-                                        data_p = d-&gt;dma_buf;</div><div class='del'>-                                }</div><div class='del'>-                                __raw_writeq(1, SS_CSR(R_SER_DMA_DSCR_COUNT_RX));</div><div class='del'>-                        } while (--diff);</div><div class='del'>-                        d-&gt;hwptr = hwptr;</div><div class='del'>-</div><div class='del'>-                        CS_DBGOUT(CS_DESCR, 6, </div><div class='del'>-                                  printk(KERN_INFO "cs4297a: hw/sw %x/%x\n", d-&gt;hwptr, d-&gt;swptr));</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d \n",</div><div class='del'>-				(unsigned)s, d-&gt;hwptr, </div><div class='del'>-				d-&gt;total_bytes, d-&gt;count));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        /* XXXKW worry about s-&gt;reg_request -- there is a starvation</div><div class='del'>-           case if s-&gt;ena has FMODE_WRITE on, but the client isn't</div><div class='del'>-           doing writes */</div><div class='del'>-</div><div class='del'>-	// update DAC pointer </div><div class='del'>-	//</div><div class='del'>-	// check for end of buffer, means that we are going to wait for another interrupt</div><div class='del'>-	// to allow silence to fill the fifos on the part, to keep pops down to a minimum.</div><div class='del'>-	//</div><div class='del'>-	if (s-&gt;ena &amp; FMODE_WRITE) {</div><div class='del'>-                serdma_t *d = &amp;s-&gt;dma_dac;</div><div class='del'>-                hwptr = (unsigned) (((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_TX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                     d-&gt;descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-                diff = (d-&gt;ringsz + hwptr - d-&gt;hwptr) % d-&gt;ringsz;</div><div class='del'>-                CS_DBGOUT(CS_WAVE_WRITE, 4, printk(KERN_INFO</div><div class='del'>-                                                   "cs4297a: cs4297a_update_ptr(): hw/hw/sw %x/%x/%x diff %d count %d\n",</div><div class='del'>-                                                   d-&gt;hwptr, hwptr, d-&gt;swptr, diff, d-&gt;count));</div><div class='del'>-                d-&gt;hwptr = hwptr;</div><div class='del'>-                /* XXXKW stereo? conversion? Just assume 2 16-bit samples for now */</div><div class='del'>-                d-&gt;total_bytes += diff * FRAME_SAMPLE_BYTES;</div><div class='del'>-		if (d-&gt;mapped) {</div><div class='del'>-			d-&gt;count += diff * FRAME_SAMPLE_BYTES;</div><div class='del'>-			if (d-&gt;count &gt;= d-&gt;fragsize) {</div><div class='del'>-				d-&gt;wakeup = 1;</div><div class='del'>-				wake_up(&amp;d-&gt;wait);</div><div class='del'>-				if (d-&gt;count &gt; d-&gt;sbufsz)</div><div class='del'>-					d-&gt;count &amp;= d-&gt;sbufsz - 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			d-&gt;count -= diff * FRAME_SAMPLE_BYTES;</div><div class='del'>-			if (d-&gt;count &lt;= 0) {</div><div class='del'>-				//</div><div class='del'>-				// fill with silence, and do not shut down the DAC.</div><div class='del'>-				// Continue to play silence until the _release.</div><div class='del'>-				//</div><div class='del'>-				CS_DBGOUT(CS_WAVE_WRITE, 6, printk(KERN_INFO</div><div class='del'>-					"cs4297a: cs4297a_update_ptr(): memset %d at 0x%.8x for %d size \n",</div><div class='del'>-						(unsigned)(s-&gt;prop_dac.fmt &amp; </div><div class='del'>-						(AFMT_U8 | AFMT_U16_LE)) ? 0x80 : 0, </div><div class='del'>-						(unsigned)d-&gt;dma_buf, </div><div class='del'>-						d-&gt;ringsz));</div><div class='del'>-				memset(d-&gt;dma_buf, 0, d-&gt;ringsz * FRAME_BYTES);</div><div class='del'>-				if (d-&gt;count &lt; 0) {</div><div class='del'>-					d-&gt;underrun = 1;</div><div class='del'>-                                        s-&gt;stats.tx_underrun++;</div><div class='del'>-					d-&gt;count = 0;</div><div class='del'>-					CS_DBGOUT(CS_ERROR, 9, printk(KERN_INFO</div><div class='del'>-					 "cs4297a: cs4297a_update_ptr(): underrun\n"));</div><div class='del'>-				}</div><div class='del'>-			} else if (d-&gt;count &lt;=</div><div class='del'>-				   (signed) d-&gt;fragsize</div><div class='del'>-				   &amp;&amp; !d-&gt;endcleared) {</div><div class='del'>-                          /* XXXKW what is this for? */</div><div class='del'>-				clear_advance(d-&gt;dma_buf,</div><div class='del'>-					      d-&gt;sbufsz,</div><div class='del'>-					      d-&gt;swptr,</div><div class='del'>-					      d-&gt;fragsize,</div><div class='del'>-					      0);</div><div class='del'>-				d-&gt;endcleared = 1;</div><div class='del'>-			}</div><div class='del'>-			if ( (d-&gt;count &lt;= (signed) d-&gt;sbufsz/2) || intflag)</div><div class='del'>-			{</div><div class='del'>-                                CS_DBGOUT(CS_WAVE_WRITE, 4,</div><div class='del'>-                                          printk(KERN_INFO</div><div class='del'>-                                                 "cs4297a: update count -&gt; %d\n", d-&gt;count));</div><div class='del'>-				wake_up(&amp;d-&gt;wait);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d \n",</div><div class='del'>-				(unsigned) s, d-&gt;hwptr, </div><div class='del'>-				d-&gt;total_bytes, d-&gt;count));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mixer_ioctl(struct cs4297a_state *s, unsigned int cmd,</div><div class='del'>-		       unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	// Index to mixer_src[] is value of AC97 Input Mux Select Reg.</div><div class='del'>-	// Value of array member is recording source Device ID Mask.</div><div class='del'>-	static const unsigned int mixer_src[8] = {</div><div class='del'>-		SOUND_MASK_MIC, SOUND_MASK_CD, 0, SOUND_MASK_LINE1,</div><div class='del'>-		SOUND_MASK_LINE, SOUND_MASK_VOLUME, 0, 0</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	// Index of mixtable1[] member is Device ID </div><div class='del'>-	// and must be &lt;= SOUND_MIXER_NRDEVICES.</div><div class='del'>-	// Value of array member is index into s-&gt;mix.vol[]</div><div class='del'>-	static const unsigned char mixtable1[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-		[SOUND_MIXER_PCM] = 1,	// voice </div><div class='del'>-		[SOUND_MIXER_LINE1] = 2,	// AUX</div><div class='del'>-		[SOUND_MIXER_CD] = 3,	// CD </div><div class='del'>-		[SOUND_MIXER_LINE] = 4,	// Line </div><div class='del'>-		[SOUND_MIXER_SYNTH] = 5,	// FM</div><div class='del'>-		[SOUND_MIXER_MIC] = 6,	// Mic </div><div class='del'>-		[SOUND_MIXER_SPEAKER] = 7,	// Speaker </div><div class='del'>-		[SOUND_MIXER_RECLEV] = 8,	// Recording level </div><div class='del'>-		[SOUND_MIXER_VOLUME] = 9	// Master Volume </div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static const unsigned mixreg[] = {</div><div class='del'>-		AC97_PCMOUT_VOL,</div><div class='del'>-		AC97_AUX_VOL,</div><div class='del'>-		AC97_CD_VOL,</div><div class='del'>-		AC97_LINEIN_VOL</div><div class='del'>-	};</div><div class='del'>-	unsigned char l, r, rl, rr, vidx;</div><div class='del'>-	unsigned char attentbl[11] =</div><div class='del'>-	    { 63, 42, 26, 17, 14, 11, 8, 6, 4, 2, 0 };</div><div class='del'>-	unsigned temp1;</div><div class='del'>-	int i, val;</div><div class='del'>-</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION, 4, printk(KERN_INFO</div><div class='del'>-		 "cs4297a: mixer_ioctl(): s=0x%.8x cmd=0x%.8x\n",</div><div class='del'>-			 (unsigned) s, cmd));</div><div class='del'>-#if CSDEBUG</div><div class='del'>-	cs_printioctl(cmd);</div><div class='del'>-#endif</div><div class='del'>-#if CSDEBUG_INTERFACE</div><div class='del'>-</div><div class='del'>-	if ((cmd == SOUND_MIXER_CS_GETDBGMASK) ||</div><div class='del'>-	    (cmd == SOUND_MIXER_CS_SETDBGMASK) ||</div><div class='del'>-	    (cmd == SOUND_MIXER_CS_GETDBGLEVEL) ||</div><div class='del'>-	    (cmd == SOUND_MIXER_CS_SETDBGLEVEL))</div><div class='del'>-	{</div><div class='del'>-		switch (cmd) {</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CS_GETDBGMASK:</div><div class='del'>-			return put_user(cs_debugmask,</div><div class='del'>-					(unsigned long *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CS_GETDBGLEVEL:</div><div class='del'>-			return put_user(cs_debuglevel,</div><div class='del'>-					(unsigned long *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CS_SETDBGMASK:</div><div class='del'>-			if (get_user(val, (unsigned long *) arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			cs_debugmask = val;</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CS_SETDBGLEVEL:</div><div class='del'>-			if (get_user(val, (unsigned long *) arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			cs_debuglevel = val;</div><div class='del'>-			return 0;</div><div class='del'>-		default:</div><div class='del'>-			CS_DBGOUT(CS_ERROR, 1, printk(KERN_INFO</div><div class='del'>-				"cs4297a: mixer_ioctl(): ERROR unknown debug cmd\n"));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE1) {</div><div class='del'>-                return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_MIXER_PRIVATE2) {</div><div class='del'>-		// enable/disable/query spatializer </div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != -1) {</div><div class='del'>-			temp1 = (val &amp; 0x3f) &gt;&gt; 2;</div><div class='del'>-			cs4297a_write_ac97(s, AC97_3D_CONTROL, temp1);</div><div class='del'>-			cs4297a_read_ac97(s, AC97_GENERAL_PURPOSE,</div><div class='del'>-					 &amp;temp1);</div><div class='del'>-			cs4297a_write_ac97(s, AC97_GENERAL_PURPOSE,</div><div class='del'>-					  temp1 | 0x2000);</div><div class='del'>-		}</div><div class='del'>-		cs4297a_read_ac97(s, AC97_3D_CONTROL, &amp;temp1);</div><div class='del'>-		return put_user((temp1 &lt;&lt; 2) | 3, (int *) arg);</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_MIXER_INFO) {</div><div class='del'>-		mixer_info info;</div><div class='del'>-		memset(&amp;info, 0, sizeof(info));</div><div class='del'>-		strlcpy(info.id, "CS4297a", sizeof(info.id));</div><div class='del'>-		strlcpy(info.name, "Crystal CS4297a", sizeof(info.name));</div><div class='del'>-		info.modify_counter = s-&gt;mix.modcnt;</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (cmd == SOUND_OLD_MIXER_INFO) {</div><div class='del'>-		_old_mixer_info info;</div><div class='del'>-		memset(&amp;info, 0, sizeof(info));</div><div class='del'>-		strlcpy(info.id, "CS4297a", sizeof(info.id));</div><div class='del'>-		strlcpy(info.name, "Crystal CS4297a", sizeof(info.name));</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;info, sizeof(info)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (cmd == OSS_GETVERSION)</div><div class='del'>-		return put_user(SOUND_VERSION, (int *) arg);</div><div class='del'>-</div><div class='del'>-	if (_IOC_TYPE(cmd) != 'M' || _SIOC_SIZE(cmd) != sizeof(int))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	// If ioctl has only the SIOC_READ bit(bit 31)</div><div class='del'>-	// on, process the only-read commands. </div><div class='del'>-	if (_SIOC_DIR(cmd) == _SIOC_READ) {</div><div class='del'>-		switch (_IOC_NR(cmd)) {</div><div class='del'>-		case SOUND_MIXER_RECSRC:	// Arg contains a bit for each recording source </div><div class='del'>-			cs4297a_read_ac97(s, AC97_RECORD_SELECT,</div><div class='del'>-					 &amp;temp1);</div><div class='del'>-			return put_user(mixer_src[temp1 &amp; 7], (int *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_DEVMASK:	// Arg contains a bit for each supported device </div><div class='del'>-			return put_user(SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-					SOUND_MASK_VOLUME | SOUND_MASK_RECLEV,</div><div class='del'>-                                        (int *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_RECMASK:	// Arg contains a bit for each supported recording source </div><div class='del'>-			return put_user(SOUND_MASK_LINE | SOUND_MASK_VOLUME,</div><div class='del'>-                                        (int *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_STEREODEVS:	// Mixer channels supporting stereo </div><div class='del'>-			return put_user(SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-					SOUND_MASK_VOLUME | SOUND_MASK_RECLEV,</div><div class='del'>-                                        (int *) arg);</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CAPS:</div><div class='del'>-			return put_user(SOUND_CAP_EXCL_INPUT, (int *) arg);</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			i = _IOC_NR(cmd);</div><div class='del'>-			if (i &gt;= SOUND_MIXER_NRDEVICES</div><div class='del'>-			    || !(vidx = mixtable1[i]))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			return put_user(s-&gt;mix.vol[vidx - 1], (int *) arg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	// If ioctl doesn't have both the SIOC_READ and </div><div class='del'>-	// the SIOC_WRITE bit set, return invalid.</div><div class='del'>-	if (_SIOC_DIR(cmd) != (_SIOC_READ | _SIOC_WRITE))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	// Increment the count of volume writes.</div><div class='del'>-	s-&gt;mix.modcnt++;</div><div class='del'>-</div><div class='del'>-	// Isolate the command; it must be a write.</div><div class='del'>-	switch (_IOC_NR(cmd)) {</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECSRC:	// Arg contains a bit for each recording source </div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		i = hweight32(val);	// i = # bits on in val.</div><div class='del'>-		if (i != 1)	// One &amp; only 1 bit must be on.</div><div class='del'>-			return 0;</div><div class='del'>-		for (i = 0; i &lt; sizeof(mixer_src) / sizeof(int); i++) {</div><div class='del'>-			if (val == mixer_src[i]) {</div><div class='del'>-				temp1 = (i &lt;&lt; 8) | i;</div><div class='del'>-				cs4297a_write_ac97(s,</div><div class='del'>-						  AC97_RECORD_SELECT,</div><div class='del'>-						  temp1);</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;	// Max soundcard.h vol is 100.</div><div class='del'>-		if (l &lt; 6) {</div><div class='del'>-			rl = 63;</div><div class='del'>-			l = 0;</div><div class='del'>-		} else</div><div class='del'>-			rl = attentbl[(10 * l) / 100];	// Convert 0-100 vol to 63-0 atten.</div><div class='del'>-</div><div class='del'>-		r = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (r &gt; 100)</div><div class='del'>-			r = 100;	// Max right volume is 100, too</div><div class='del'>-		if (r &lt; 6) {</div><div class='del'>-			rr = 63;</div><div class='del'>-			r = 0;</div><div class='del'>-		} else</div><div class='del'>-			rr = attentbl[(10 * r) / 100];	// Convert volume to attenuation.</div><div class='del'>-</div><div class='del'>-		if ((rl &gt; 60) &amp;&amp; (rr &gt; 60))	// If both l &amp; r are 'low',          </div><div class='del'>-			temp1 = 0x8000;	//  turn on the mute bit.</div><div class='del'>-		else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-</div><div class='del'>-		temp1 |= (rl &lt;&lt; 8) | rr;</div><div class='del'>-</div><div class='del'>-		cs4297a_write_ac97(s, AC97_MASTER_VOL_STEREO, temp1);</div><div class='del'>-		cs4297a_write_ac97(s, AC97_PHONE_VOL, temp1);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[8] = ((unsigned int) r &lt;&lt; 8) | l;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[8] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[8], (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_SPEAKER:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;</div><div class='del'>-		if (l &lt; 3) {</div><div class='del'>-			rl = 0;</div><div class='del'>-			l = 0;</div><div class='del'>-		} else {</div><div class='del'>-			rl = (l * 2 - 5) / 13;	// Convert 0-100 range to 0-15.</div><div class='del'>-			l = (rl * 13 + 5) / 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rl &lt; 3) {</div><div class='del'>-			temp1 = 0x8000;</div><div class='del'>-			rl = 0;</div><div class='del'>-		} else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-		rl = 15 - rl;	// Convert volume to attenuation.</div><div class='del'>-		temp1 |= rl &lt;&lt; 1;</div><div class='del'>-		cs4297a_write_ac97(s, AC97_PCBEEP_VOL, temp1);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[6] = l &lt;&lt; 8;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[6] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[6], (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECLEV:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;</div><div class='del'>-		r = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (r &gt; 100)</div><div class='del'>-			r = 100;</div><div class='del'>-		rl = (l * 2 - 5) / 13;	// Convert 0-100 scale to 0-15.</div><div class='del'>-		rr = (r * 2 - 5) / 13;</div><div class='del'>-		if (rl &lt; 3 &amp;&amp; rr &lt; 3)</div><div class='del'>-			temp1 = 0x8000;</div><div class='del'>-		else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-</div><div class='del'>-		temp1 = temp1 | (rl &lt;&lt; 8) | rr;</div><div class='del'>-		cs4297a_write_ac97(s, AC97_RECORD_GAIN, temp1);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[7] = ((unsigned int) r &lt;&lt; 8) | l;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[7] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[7], (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_MIC:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;</div><div class='del'>-		if (l &lt; 1) {</div><div class='del'>-			l = 0;</div><div class='del'>-			rl = 0;</div><div class='del'>-		} else {</div><div class='del'>-			rl = ((unsigned) l * 5 - 4) / 16;	// Convert 0-100 range to 0-31.</div><div class='del'>-			l = (rl * 16 + 4) / 5;</div><div class='del'>-		}</div><div class='del'>-		cs4297a_read_ac97(s, AC97_MIC_VOL, &amp;temp1);</div><div class='del'>-		temp1 &amp;= 0x40;	// Isolate 20db gain bit.</div><div class='del'>-		if (rl &lt; 3) {</div><div class='del'>-			temp1 |= 0x8000;</div><div class='del'>-			rl = 0;</div><div class='del'>-		}</div><div class='del'>-		rl = 31 - rl;	// Convert volume to attenuation.</div><div class='del'>-		temp1 |= rl;</div><div class='del'>-		cs4297a_write_ac97(s, AC97_MIC_VOL, temp1);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[5] = val &lt;&lt; 8;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[5] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[5], (int *) arg);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_SYNTH:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		r = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (r &gt; 100)</div><div class='del'>-			r = 100;</div><div class='del'>-		rl = (l * 2 - 11) / 3;	// Convert 0-100 range to 0-63.</div><div class='del'>-		rr = (r * 2 - 11) / 3;</div><div class='del'>-		if (rl &lt; 3)	// If l is low, turn on</div><div class='del'>-			temp1 = 0x0080;	//  the mute bit.</div><div class='del'>-		else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-</div><div class='del'>-		rl = 63 - rl;	// Convert vol to attenuation.</div><div class='del'>-//		writel(temp1 | rl, s-&gt;pBA0 + FMLVC);</div><div class='del'>-		if (rr &lt; 3)	//  If rr is low, turn on</div><div class='del'>-			temp1 = 0x0080;	//   the mute bit.</div><div class='del'>-		else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-		rr = 63 - rr;	// Convert vol to attenuation.</div><div class='del'>-//		writel(temp1 | rr, s-&gt;pBA0 + FMRVC);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[4] = (r &lt;&lt; 8) | l;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[4] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[4], (int *) arg);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk(KERN_INFO</div><div class='del'>-			"cs4297a: mixer_ioctl(): default\n"));</div><div class='del'>-</div><div class='del'>-		i = _IOC_NR(cmd);</div><div class='del'>-		if (i &gt;= SOUND_MIXER_NRDEVICES || !(vidx = mixtable1[i]))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		l = val &amp; 0xff;</div><div class='del'>-		if (l &gt; 100)</div><div class='del'>-			l = 100;</div><div class='del'>-		if (l &lt; 1) {</div><div class='del'>-			l = 0;</div><div class='del'>-			rl = 31;</div><div class='del'>-		} else</div><div class='del'>-			rl = (attentbl[(l * 10) / 100]) &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-		r = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (r &gt; 100)</div><div class='del'>-			r = 100;</div><div class='del'>-		if (r &lt; 1) {</div><div class='del'>-			r = 0;</div><div class='del'>-			rr = 31;</div><div class='del'>-		} else</div><div class='del'>-			rr = (attentbl[(r * 10) / 100]) &gt;&gt; 1;</div><div class='del'>-		if ((rl &gt; 30) &amp;&amp; (rr &gt; 30))</div><div class='del'>-			temp1 = 0x8000;</div><div class='del'>-		else</div><div class='del'>-			temp1 = 0;</div><div class='del'>-		temp1 = temp1 | (rl &lt;&lt; 8) | rr;</div><div class='del'>-		cs4297a_write_ac97(s, mixreg[vidx - 1], temp1);</div><div class='del'>-</div><div class='del'>-#ifdef OSS_DOCUMENTED_MIXER_SEMANTICS</div><div class='del'>-		s-&gt;mix.vol[vidx - 1] = ((unsigned int) r &lt;&lt; 8) | l;</div><div class='del'>-#else</div><div class='del'>-		s-&gt;mix.vol[vidx - 1] = val;</div><div class='del'>-#endif</div><div class='del'>-		return put_user(s-&gt;mix.vol[vidx - 1], (int *) arg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-static int cs4297a_open_mixdev(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(inode);</div><div class='del'>-	struct cs4297a_state *s=NULL;</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_OPEN, 4,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_open_mixdev()+\n"));</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-	list_for_each(entry, &amp;cs4297a_devs)</div><div class='del'>-	{</div><div class='del'>-		s = list_entry(entry, struct cs4297a_state, list);</div><div class='del'>-		if(s-&gt;dev_mixer == minor)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!s)</div><div class='del'>-	{</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_OPEN | CS_ERROR, 2,</div><div class='del'>-			printk(KERN_INFO "cs4297a: cs4297a_open_mixdev()- -ENODEV\n"));</div><div class='del'>-</div><div class='del'>-		mutex_unlock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	file-&gt;private_data = s;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_OPEN, 4,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_open_mixdev()- 0\n"));</div><div class='del'>-	mutex_unlock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-</div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int cs4297a_release_mixdev(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int cs4297a_ioctl_mixdev(struct file *file,</div><div class='del'>-			       unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	mutex_lock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-	ret = mixer_ioctl((struct cs4297a_state *) file-&gt;private_data, cmd,</div><div class='del'>-			   arg);</div><div class='del'>-	mutex_unlock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// ******************************************************************************************</div><div class='del'>-//   Mixer file operations struct.</div><div class='del'>-// ******************************************************************************************</div><div class='del'>-static const struct file_operations cs4297a_mixer_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.unlocked_ioctl	= cs4297a_ioctl_mixdev,</div><div class='del'>-	.open		= cs4297a_open_mixdev,</div><div class='del'>-	.release	= cs4297a_release_mixdev,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int drain_adc(struct cs4297a_state *s, int nonblock)</div><div class='del'>-{</div><div class='del'>-        /* This routine serves no purpose currently - any samples</div><div class='del'>-           sitting in the receive queue will just be processed by the</div><div class='del'>-           background consumer.  This would be different if DMA</div><div class='del'>-           actually stopped when there were no clients. */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int drain_dac(struct cs4297a_state *s, int nonblock)</div><div class='del'>-{</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-        unsigned hwptr;</div><div class='del'>-	unsigned tmo;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;dma_dac.mapped)</div><div class='del'>-		return 0;</div><div class='del'>-        if (nonblock)</div><div class='del'>-                return -EBUSY;</div><div class='del'>-	add_wait_queue(&amp;s-&gt;dma_dac.wait, &amp;wait);</div><div class='del'>-        while ((count = __raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_TX))) ||</div><div class='del'>-               (s-&gt;dma_dac.count &gt; 0)) {</div><div class='del'>-                if (!signal_pending(current)) {</div><div class='del'>-                        set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-                        /* XXXKW is this calculation working? */</div><div class='del'>-                        tmo = ((count * FRAME_TX_US) * HZ) / 1000000;</div><div class='del'>-                        schedule_timeout(tmo + 1);</div><div class='del'>-                } else {</div><div class='del'>-                        /* XXXKW do I care if there is a signal pending? */</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-        spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-        /* Reset the bookkeeping */</div><div class='del'>-        hwptr = (int)(((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_TX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                       s-&gt;dma_dac.descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-        s-&gt;dma_dac.hwptr = s-&gt;dma_dac.swptr = hwptr;</div><div class='del'>-        spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-	remove_wait_queue(&amp;s-&gt;dma_dac.wait, &amp;wait);</div><div class='del'>-	current-&gt;state = TASK_RUNNING;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-static ssize_t cs4297a_read(struct file *file, char *buffer, size_t count,</div><div class='del'>-			   loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int cnt, count_fr, cnt_by;</div><div class='del'>-	unsigned copied = 0;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_READ, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_read()+ %d \n", count));</div><div class='del'>-</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	if (s-&gt;dma_adc.mapped)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (!s-&gt;dma_adc.ready &amp;&amp; (ret = prog_dmabuf_adc(s)))</div><div class='del'>-		return ret;</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ret = 0;</div><div class='del'>-//</div><div class='del'>-// "count" is the amount of bytes to read (from app), is decremented each loop</div><div class='del'>-//      by the amount of bytes that have been returned to the user buffer.</div><div class='del'>-// "cnt" is the running total of each read from the buffer (changes each loop)</div><div class='del'>-// "buffer" points to the app's buffer</div><div class='del'>-// "ret" keeps a running total of the amount of bytes that have been copied</div><div class='del'>-//      to the user buffer.</div><div class='del'>-// "copied" is the total bytes copied into the user buffer for each loop.</div><div class='del'>-//</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-		CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO</div><div class='del'>-			"_read() count&gt;0 count=%d .count=%d .swptr=%d .hwptr=%d \n",</div><div class='del'>-				count, s-&gt;dma_adc.count,</div><div class='del'>-				s-&gt;dma_adc.swptr, s-&gt;dma_adc.hwptr));</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-                /* cnt will be the number of available samples (16-bit</div><div class='del'>-                   stereo); it starts out as the maxmimum consequetive</div><div class='del'>-                   samples */</div><div class='del'>-		cnt = (s-&gt;dma_adc.sb_end - s-&gt;dma_adc.sb_swptr) / 2;</div><div class='del'>-                count_fr = s-&gt;dma_adc.count / FRAME_SAMPLE_BYTES;</div><div class='del'>-</div><div class='del'>-		// dma_adc.count is the current total bytes that have not been read.</div><div class='del'>-		// if the amount of unread bytes from the current sw pointer to the</div><div class='del'>-		// end of the buffer is greater than the current total bytes that</div><div class='del'>-		// have not been read, then set the "cnt" (unread bytes) to the</div><div class='del'>-		// amount of unread bytes.  </div><div class='del'>-</div><div class='del'>-		if (count_fr &lt; cnt)</div><div class='del'>-			cnt = count_fr;</div><div class='del'>-                cnt_by = cnt * FRAME_SAMPLE_BYTES;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		//</div><div class='del'>-		// if we are converting from 8/16 then we need to copy</div><div class='del'>-		// twice the number of 16 bit bytes then 8 bit bytes.</div><div class='del'>-		// </div><div class='del'>-		if (s-&gt;conversion) {</div><div class='del'>-			if (cnt_by &gt; (count * 2)) {</div><div class='del'>-				cnt = (count * 2) / FRAME_SAMPLE_BYTES;</div><div class='del'>-                                cnt_by = count * 2;</div><div class='del'>-                        }</div><div class='del'>-		} else {</div><div class='del'>-			if (cnt_by &gt; count) {</div><div class='del'>-				cnt = count / FRAME_SAMPLE_BYTES;</div><div class='del'>-                                cnt_by = count;</div><div class='del'>-                        }</div><div class='del'>-		}</div><div class='del'>-		//</div><div class='del'>-		// "cnt" NOW is the smaller of the amount that will be read,</div><div class='del'>-		// and the amount that is requested in this read (or partial).</div><div class='del'>-		// if there are no bytes in the buffer to read, then start the</div><div class='del'>-		// ADC and wait for the interrupt handler to wake us up.</div><div class='del'>-		//</div><div class='del'>-		if (cnt &lt;= 0) {</div><div class='del'>-</div><div class='del'>-			// start up the dma engine and then continue back to the top of</div><div class='del'>-			// the loop when wake up occurs.</div><div class='del'>-			start_adc(s);</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-				return ret ? ret : -EAGAIN;</div><div class='del'>-			interruptible_sleep_on(&amp;s-&gt;dma_adc.wait);</div><div class='del'>-			if (signal_pending(current))</div><div class='del'>-				return ret ? ret : -ERESTARTSYS;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		// there are bytes in the buffer to read.</div><div class='del'>-		// copy from the hw buffer over to the user buffer.</div><div class='del'>-		// user buffer is designated by "buffer"</div><div class='del'>-		// virtual address to copy from is dma_buf+swptr</div><div class='del'>-		// the "cnt" is the number of bytes to read.</div><div class='del'>-</div><div class='del'>-		CS_DBGOUT(CS_WAVE_READ, 2, printk(KERN_INFO</div><div class='del'>-			"_read() copy_to cnt=%d count=%d ", cnt_by, count));</div><div class='del'>-		CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO</div><div class='del'>-			 " .sbufsz=%d .count=%d buffer=0x%.8x ret=%d\n",</div><div class='del'>-				 s-&gt;dma_adc.sbufsz, s-&gt;dma_adc.count,</div><div class='del'>-				 (unsigned) buffer, ret));</div><div class='del'>-</div><div class='del'>-		if (copy_to_user (buffer, ((void *)s-&gt;dma_adc.sb_swptr), cnt_by))</div><div class='del'>-			return ret ? ret : -EFAULT;</div><div class='del'>-                copied = cnt_by;</div><div class='del'>-</div><div class='del'>-                /* Return the descriptors */</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-                CS_DBGOUT(CS_FUNCTION, 2, </div><div class='del'>-                          printk(KERN_INFO "cs4297a: upd_rcv sw-&gt;hw %x/%x\n", s-&gt;dma_adc.swptr, s-&gt;dma_adc.hwptr));</div><div class='del'>-		s-&gt;dma_adc.count -= cnt_by;</div><div class='del'>-                s-&gt;dma_adc.sb_swptr += cnt * 2;</div><div class='del'>-                if (s-&gt;dma_adc.sb_swptr == s-&gt;dma_adc.sb_end)</div><div class='del'>-                        s-&gt;dma_adc.sb_swptr = s-&gt;dma_adc.sample_buf;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		count -= copied;</div><div class='del'>-		buffer += copied;</div><div class='del'>-		ret += copied;</div><div class='del'>-		start_adc(s);</div><div class='del'>-	}</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_READ, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_read()- %d\n", ret));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t cs4297a_write(struct file *file, const char *buffer,</div><div class='del'>-			    size_t count, loff_t * ppos)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned swptr, hwptr;</div><div class='del'>-	int cnt;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_write()+ count=%d\n",</div><div class='del'>-			 count));</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;dma_dac.mapped)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	if (!s-&gt;dma_dac.ready &amp;&amp; (ret = prog_dmabuf_dac(s)))</div><div class='del'>-		return ret;</div><div class='del'>-	if (!access_ok(VERIFY_READ, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ret = 0;</div><div class='del'>-	while (count &gt; 0) {</div><div class='del'>-                serdma_t *d = &amp;s-&gt;dma_dac;</div><div class='del'>-                int copy_cnt;</div><div class='del'>-                u32 *s_tmpl;</div><div class='del'>-                u32 *t_tmpl;</div><div class='del'>-                u32 left, right;</div><div class='del'>-                int swap = (s-&gt;prop_dac.fmt == AFMT_S16_LE) || (s-&gt;prop_dac.fmt == AFMT_U16_LE);</div><div class='del'>-                </div><div class='del'>-                /* XXXXXX this is broken for BLOAT_FACTOR */</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (d-&gt;count &lt; 0) {</div><div class='del'>-			d-&gt;count = 0;</div><div class='del'>-			d-&gt;swptr = d-&gt;hwptr;</div><div class='del'>-		}</div><div class='del'>-		if (d-&gt;underrun) {</div><div class='del'>-			d-&gt;underrun = 0;</div><div class='del'>-                        hwptr = (unsigned) (((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_TX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                             d-&gt;descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-			d-&gt;swptr = d-&gt;hwptr = hwptr;</div><div class='del'>-		}</div><div class='del'>-		swptr = d-&gt;swptr;</div><div class='del'>-		cnt = d-&gt;sbufsz - (swptr * FRAME_SAMPLE_BYTES);</div><div class='del'>-                /* Will this write fill up the buffer? */</div><div class='del'>-		if (d-&gt;count + cnt &gt; d-&gt;sbufsz)</div><div class='del'>-			cnt = d-&gt;sbufsz - d-&gt;count;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		if (cnt &gt; count)</div><div class='del'>-			cnt = count;</div><div class='del'>-		if (cnt &lt;= 0) {</div><div class='del'>-			start_dac(s);</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK)</div><div class='del'>-				return ret ? ret : -EAGAIN;</div><div class='del'>-			interruptible_sleep_on(&amp;d-&gt;wait);</div><div class='del'>-			if (signal_pending(current))</div><div class='del'>-				return ret ? ret : -ERESTARTSYS;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (copy_from_user(d-&gt;sample_buf, buffer, cnt))</div><div class='del'>-			return ret ? ret : -EFAULT;</div><div class='del'>-</div><div class='del'>-                copy_cnt = cnt;</div><div class='del'>-                s_tmpl = (u32 *)d-&gt;sample_buf;</div><div class='del'>-                t_tmpl = (u32 *)(d-&gt;dma_buf + (swptr * 4));</div><div class='del'>-</div><div class='del'>-                /* XXXKW assuming 16-bit stereo! */</div><div class='del'>-                do {</div><div class='del'>-			u32 tmp;</div><div class='del'>-</div><div class='del'>-			t_tmpl[0] = cpu_to_be32(0x98000000);</div><div class='del'>-</div><div class='del'>-			tmp = be32_to_cpu(s_tmpl[0]);</div><div class='del'>-			left = tmp &amp; 0xffff;</div><div class='del'>-			right = tmp &gt;&gt; 16;</div><div class='del'>-			if (swap) {</div><div class='del'>-				left = swab16(left);</div><div class='del'>-				right = swab16(right);</div><div class='del'>-			}</div><div class='del'>-			t_tmpl[1] = cpu_to_be32(left &gt;&gt; 8);</div><div class='del'>-			t_tmpl[2] = cpu_to_be32(((left &amp; 0xff) &lt;&lt; 24) |</div><div class='del'>-						(right &lt;&lt; 4));</div><div class='del'>-</div><div class='del'>-                        s_tmpl++;</div><div class='del'>-                        t_tmpl += 8;</div><div class='del'>-                        copy_cnt -= 4;</div><div class='del'>-                } while (copy_cnt);</div><div class='del'>-</div><div class='del'>-                /* Mux in any pending read/write accesses */</div><div class='del'>-                if (s-&gt;reg_request) {</div><div class='del'>-			*(u64 *)(d-&gt;dma_buf + (swptr * 4)) |=</div><div class='del'>-				cpu_to_be64(s-&gt;reg_request);</div><div class='del'>-                        s-&gt;reg_request = 0;</div><div class='del'>-                        wake_up(&amp;s-&gt;dma_dac.reg_wait);</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                CS_DBGOUT(CS_WAVE_WRITE, 4,</div><div class='del'>-                          printk(KERN_INFO</div><div class='del'>-                                 "cs4297a: copy in %d to swptr %x\n", cnt, swptr));</div><div class='del'>-</div><div class='del'>-		swptr = (swptr + (cnt/FRAME_SAMPLE_BYTES)) % d-&gt;ringsz;</div><div class='del'>-                __raw_writeq(cnt/FRAME_SAMPLE_BYTES, SS_CSR(R_SER_DMA_DSCR_COUNT_TX));</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		d-&gt;swptr = swptr;</div><div class='del'>-		d-&gt;count += cnt;</div><div class='del'>-		d-&gt;endcleared = 0;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		count -= cnt;</div><div class='del'>-		buffer += cnt;</div><div class='del'>-		ret += cnt;</div><div class='del'>-		start_dac(s);</div><div class='del'>-	}</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_write()- %d\n", ret));</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static unsigned int cs4297a_poll(struct file *file,</div><div class='del'>-				struct poll_table_struct *wait)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE | CS_WAVE_READ, 4,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_poll()+\n"));</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE | CS_WAVE_READ, 4,</div><div class='del'>-			  printk(KERN_INFO</div><div class='del'>-				 "cs4297a: cs4297a_poll() wait on FMODE_WRITE\n"));</div><div class='del'>-		if(!s-&gt;dma_dac.ready &amp;&amp; prog_dmabuf_dac(s))</div><div class='del'>-			return 0;</div><div class='del'>-		poll_wait(file, &amp;s-&gt;dma_dac.wait, wait);</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE | CS_WAVE_READ, 4,</div><div class='del'>-			  printk(KERN_INFO</div><div class='del'>-				 "cs4297a: cs4297a_poll() wait on FMODE_READ\n"));</div><div class='del'>-		if(!s-&gt;dma_dac.ready &amp;&amp; prog_dmabuf_adc(s))</div><div class='del'>-			return 0;</div><div class='del'>-		poll_wait(file, &amp;s-&gt;dma_adc.wait, wait);</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-	cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		if (s-&gt;dma_dac.mapped) {</div><div class='del'>-			if (s-&gt;dma_dac.count &gt;=</div><div class='del'>-			    (signed) s-&gt;dma_dac.fragsize) {</div><div class='del'>-				if (s-&gt;dma_dac.wakeup)</div><div class='del'>-					mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-				else</div><div class='del'>-					mask = 0;</div><div class='del'>-				s-&gt;dma_dac.wakeup = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if ((signed) (s-&gt;dma_dac.sbufsz/2) &gt;= s-&gt;dma_dac.count)</div><div class='del'>-				mask |= POLLOUT | POLLWRNORM;</div><div class='del'>-		}</div><div class='del'>-	} else if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		if (s-&gt;dma_adc.mapped) {</div><div class='del'>-			if (s-&gt;dma_adc.count &gt;= (signed) s-&gt;dma_adc.fragsize) </div><div class='del'>-				mask |= POLLIN | POLLRDNORM;</div><div class='del'>-		} else {</div><div class='del'>-			if (s-&gt;dma_adc.count &gt; 0)</div><div class='del'>-				mask |= POLLIN | POLLRDNORM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_WAVE_WRITE | CS_WAVE_READ, 4,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_poll()- 0x%.8x\n",</div><div class='del'>-			 mask));</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int cs4297a_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-        /* XXXKW currently no mmap support */</div><div class='del'>-        return -EINVAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int cs4297a_ioctl(struct file *file,</div><div class='del'>-			unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	audio_buf_info abinfo;</div><div class='del'>-	count_info cinfo;</div><div class='del'>-	int val, mapped, ret;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION|CS_IOCTL, 4, printk(KERN_INFO</div><div class='del'>-		 "cs4297a: cs4297a_ioctl(): file=0x%.8x cmd=0x%.8x\n",</div><div class='del'>-			 (unsigned) file, cmd));</div><div class='del'>-#if CSDEBUG</div><div class='del'>-	cs_printioctl(cmd);</div><div class='del'>-#endif</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	mapped = ((file-&gt;f_mode &amp; FMODE_WRITE) &amp;&amp; s-&gt;dma_dac.mapped) ||</div><div class='del'>-	    ((file-&gt;f_mode &amp; FMODE_READ) &amp;&amp; s-&gt;dma_adc.mapped);</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case OSS_GETVERSION:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_ioctl(): SOUND_VERSION=0x%.8x\n",</div><div class='del'>-				 SOUND_VERSION));</div><div class='del'>-		return put_user(SOUND_VERSION, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SYNC:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_SYNC\n"));</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return drain_dac(s,</div><div class='del'>-					 0 /*file-&gt;f_flags &amp; O_NONBLOCK */</div><div class='del'>-					 );</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETDUPLEX:</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETCAPS:</div><div class='del'>-		return put_user(DSP_CAP_DUPLEX | DSP_CAP_REALTIME |</div><div class='del'>-				DSP_CAP_TRIGGER | DSP_CAP_MMAP,</div><div class='del'>-				(int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_RESET:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_RESET\n"));</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			synchronize_irq(s-&gt;irq);</div><div class='del'>-                        s-&gt;dma_dac.count = s-&gt;dma_dac.total_bytes =</div><div class='del'>-                                s-&gt;dma_dac.blocks = s-&gt;dma_dac.wakeup = 0;</div><div class='del'>-			s-&gt;dma_dac.swptr = s-&gt;dma_dac.hwptr =</div><div class='del'>-                                (int)(((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_TX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                       s-&gt;dma_dac.descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			synchronize_irq(s-&gt;irq);</div><div class='del'>-                        s-&gt;dma_adc.count = s-&gt;dma_adc.total_bytes =</div><div class='del'>-                                s-&gt;dma_adc.blocks = s-&gt;dma_dac.wakeup = 0;</div><div class='del'>-			s-&gt;dma_adc.swptr = s-&gt;dma_adc.hwptr =</div><div class='del'>-                                (int)(((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_RX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                       s-&gt;dma_adc.descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SPEED:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_SPEED val=%d -&gt; 48000\n", val));</div><div class='del'>-                val = 48000;</div><div class='del'>-                return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_STEREO:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_STEREO val=%d\n", val));</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			stop_adc(s);</div><div class='del'>-			s-&gt;dma_adc.ready = 0;</div><div class='del'>-			s-&gt;prop_adc.channels = val ? 2 : 1;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			stop_dac(s);</div><div class='del'>-			s-&gt;dma_dac.ready = 0;</div><div class='del'>-			s-&gt;prop_dac.channels = val ? 2 : 1;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_CHANNELS:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_CHANNELS val=%d\n",</div><div class='del'>-				 val));</div><div class='del'>-		if (val != 0) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				stop_adc(s);</div><div class='del'>-				s-&gt;dma_adc.ready = 0;</div><div class='del'>-				if (val &gt;= 2)</div><div class='del'>-					s-&gt;prop_adc.channels = 2;</div><div class='del'>-				else</div><div class='del'>-					s-&gt;prop_adc.channels = 1;</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				stop_dac(s);</div><div class='del'>-				s-&gt;dma_dac.ready = 0;</div><div class='del'>-				if (val &gt;= 2)</div><div class='del'>-					s-&gt;prop_dac.channels = 2;</div><div class='del'>-				else</div><div class='del'>-					s-&gt;prop_dac.channels = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			val = s-&gt;prop_dac.channels;</div><div class='del'>-		else if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			val = s-&gt;prop_adc.channels;</div><div class='del'>-</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETFMTS:	// Returns a mask </div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_ioctl(): DSP_GETFMT val=0x%.8x\n",</div><div class='del'>-				 AFMT_S16_LE | AFMT_U16_LE | AFMT_S8 |</div><div class='del'>-				 AFMT_U8));</div><div class='del'>-		return put_user(AFMT_S16_LE | AFMT_U16_LE | AFMT_S8 |</div><div class='del'>-				AFMT_U8, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFMT:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_SETFMT val=0x%.8x\n",</div><div class='del'>-				 val));</div><div class='del'>-		if (val != AFMT_QUERY) {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-				stop_adc(s);</div><div class='del'>-				s-&gt;dma_adc.ready = 0;</div><div class='del'>-				if (val != AFMT_S16_LE</div><div class='del'>-				    &amp;&amp; val != AFMT_U16_LE &amp;&amp; val != AFMT_S8</div><div class='del'>-				    &amp;&amp; val != AFMT_U8)</div><div class='del'>-					val = AFMT_U8;</div><div class='del'>-				s-&gt;prop_adc.fmt = val;</div><div class='del'>-				s-&gt;prop_adc.fmt_original = s-&gt;prop_adc.fmt;</div><div class='del'>-			}</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-				stop_dac(s);</div><div class='del'>-				s-&gt;dma_dac.ready = 0;</div><div class='del'>-				if (val != AFMT_S16_LE</div><div class='del'>-				    &amp;&amp; val != AFMT_U16_LE &amp;&amp; val != AFMT_S8</div><div class='del'>-				    &amp;&amp; val != AFMT_U8)</div><div class='del'>-					val = AFMT_U8;</div><div class='del'>-				s-&gt;prop_dac.fmt = val;</div><div class='del'>-				s-&gt;prop_dac.fmt_original = s-&gt;prop_dac.fmt;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-				val = s-&gt;prop_dac.fmt_original;</div><div class='del'>-			else if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-				val = s-&gt;prop_adc.fmt_original;</div><div class='del'>-		}</div><div class='del'>-		CS_DBGOUT(CS_IOCTL | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-		  "cs4297a: cs4297a_ioctl(): DSP_SETFMT return val=0x%.8x\n", </div><div class='del'>-			val));</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_POST:</div><div class='del'>-		CS_DBGOUT(CS_IOCTL, 4, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_ioctl(): DSP_POST\n"));</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETTRIGGER:</div><div class='del'>-		val = 0;</div><div class='del'>-		if (file-&gt;f_mode &amp; s-&gt;ena &amp; FMODE_READ)</div><div class='del'>-			val |= PCM_ENABLE_INPUT;</div><div class='del'>-		if (file-&gt;f_mode &amp; s-&gt;ena &amp; FMODE_WRITE)</div><div class='del'>-			val |= PCM_ENABLE_OUTPUT;</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETTRIGGER:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			if (val &amp; PCM_ENABLE_INPUT) {</div><div class='del'>-				if (!s-&gt;dma_adc.ready</div><div class='del'>-				    &amp;&amp; (ret = prog_dmabuf_adc(s)))</div><div class='del'>-					return ret;</div><div class='del'>-				start_adc(s);</div><div class='del'>-			} else</div><div class='del'>-				stop_adc(s);</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			if (val &amp; PCM_ENABLE_OUTPUT) {</div><div class='del'>-				if (!s-&gt;dma_dac.ready</div><div class='del'>-				    &amp;&amp; (ret = prog_dmabuf_dac(s)))</div><div class='del'>-					return ret;</div><div class='del'>-				start_dac(s);</div><div class='del'>-			} else</div><div class='del'>-				stop_dac(s);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOSPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!s-&gt;dma_dac.ready &amp;&amp; (val = prog_dmabuf_dac(s)))</div><div class='del'>-			return val;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-		abinfo.fragsize = s-&gt;dma_dac.fragsize;</div><div class='del'>-		if (s-&gt;dma_dac.mapped)</div><div class='del'>-			abinfo.bytes = s-&gt;dma_dac.sbufsz;</div><div class='del'>-		else</div><div class='del'>-			abinfo.bytes =</div><div class='del'>-			    s-&gt;dma_dac.sbufsz - s-&gt;dma_dac.count;</div><div class='del'>-		abinfo.fragstotal = s-&gt;dma_dac.numfrag;</div><div class='del'>-		abinfo.fragments = abinfo.bytes &gt;&gt; s-&gt;dma_dac.fragshift;</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_PARMS, 4, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_ioctl(): GETOSPACE .fragsize=%d .bytes=%d .fragstotal=%d .fragments=%d\n",</div><div class='del'>-				abinfo.fragsize,abinfo.bytes,abinfo.fragstotal,</div><div class='del'>-				abinfo.fragments));</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return copy_to_user((void *) arg, &amp;abinfo,</div><div class='del'>-				    sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETISPACE:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (!s-&gt;dma_adc.ready &amp;&amp; (val = prog_dmabuf_adc(s)))</div><div class='del'>-			return val;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-		if (s-&gt;conversion) {</div><div class='del'>-			abinfo.fragsize = s-&gt;dma_adc.fragsize / 2;</div><div class='del'>-			abinfo.bytes = s-&gt;dma_adc.count / 2;</div><div class='del'>-			abinfo.fragstotal = s-&gt;dma_adc.numfrag;</div><div class='del'>-			abinfo.fragments =</div><div class='del'>-			    abinfo.bytes &gt;&gt; (s-&gt;dma_adc.fragshift - 1);</div><div class='del'>-		} else {</div><div class='del'>-			abinfo.fragsize = s-&gt;dma_adc.fragsize;</div><div class='del'>-			abinfo.bytes = s-&gt;dma_adc.count;</div><div class='del'>-			abinfo.fragstotal = s-&gt;dma_adc.numfrag;</div><div class='del'>-			abinfo.fragments =</div><div class='del'>-			    abinfo.bytes &gt;&gt; s-&gt;dma_adc.fragshift;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return copy_to_user((void *) arg, &amp;abinfo,</div><div class='del'>-				    sizeof(abinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_NONBLOCK:</div><div class='del'>-		spin_lock(&amp;file-&gt;f_lock);</div><div class='del'>-		file-&gt;f_flags |= O_NONBLOCK;</div><div class='del'>-		spin_unlock(&amp;file-&gt;f_lock);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETODELAY:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if(!s-&gt;dma_dac.ready &amp;&amp; prog_dmabuf_dac(s))</div><div class='del'>-			return 0;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-		val = s-&gt;dma_dac.count;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return put_user(val, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETIPTR:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_READ))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if(!s-&gt;dma_adc.ready &amp;&amp; prog_dmabuf_adc(s))</div><div class='del'>-			return 0;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-		cinfo.bytes = s-&gt;dma_adc.total_bytes;</div><div class='del'>-		if (s-&gt;dma_adc.mapped) {</div><div class='del'>-			cinfo.blocks =</div><div class='del'>-			    (cinfo.bytes &gt;&gt; s-&gt;dma_adc.fragshift) -</div><div class='del'>-			    s-&gt;dma_adc.blocks;</div><div class='del'>-			s-&gt;dma_adc.blocks =</div><div class='del'>-			    cinfo.bytes &gt;&gt; s-&gt;dma_adc.fragshift;</div><div class='del'>-		} else {</div><div class='del'>-			if (s-&gt;conversion) {</div><div class='del'>-				cinfo.blocks =</div><div class='del'>-				    s-&gt;dma_adc.count /</div><div class='del'>-				    2 &gt;&gt; (s-&gt;dma_adc.fragshift - 1);</div><div class='del'>-			} else</div><div class='del'>-				cinfo.blocks =</div><div class='del'>-				    s-&gt;dma_adc.count &gt;&gt; s-&gt;dma_adc.</div><div class='del'>-				    fragshift;</div><div class='del'>-		}</div><div class='del'>-		if (s-&gt;conversion)</div><div class='del'>-			cinfo.ptr = s-&gt;dma_adc.hwptr / 2;</div><div class='del'>-		else</div><div class='del'>-			cinfo.ptr = s-&gt;dma_adc.hwptr;</div><div class='del'>-		if (s-&gt;dma_adc.mapped)</div><div class='del'>-			s-&gt;dma_adc.count &amp;= s-&gt;dma_adc.fragsize - 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return copy_to_user((void *) arg, &amp;cinfo, sizeof(cinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOPTR:</div><div class='del'>-		if (!(file-&gt;f_mode &amp; FMODE_WRITE))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if(!s-&gt;dma_dac.ready &amp;&amp; prog_dmabuf_dac(s))</div><div class='del'>-			return 0;</div><div class='del'>-		spin_lock_irqsave(&amp;s-&gt;lock, flags);</div><div class='del'>-		cs4297a_update_ptr(s,CS_FALSE);</div><div class='del'>-		cinfo.bytes = s-&gt;dma_dac.total_bytes;</div><div class='del'>-		if (s-&gt;dma_dac.mapped) {</div><div class='del'>-			cinfo.blocks =</div><div class='del'>-			    (cinfo.bytes &gt;&gt; s-&gt;dma_dac.fragshift) -</div><div class='del'>-			    s-&gt;dma_dac.blocks;</div><div class='del'>-			s-&gt;dma_dac.blocks =</div><div class='del'>-			    cinfo.bytes &gt;&gt; s-&gt;dma_dac.fragshift;</div><div class='del'>-		} else {</div><div class='del'>-			cinfo.blocks =</div><div class='del'>-			    s-&gt;dma_dac.count &gt;&gt; s-&gt;dma_dac.fragshift;</div><div class='del'>-		}</div><div class='del'>-		cinfo.ptr = s-&gt;dma_dac.hwptr;</div><div class='del'>-		if (s-&gt;dma_dac.mapped)</div><div class='del'>-			s-&gt;dma_dac.count &amp;= s-&gt;dma_dac.fragsize - 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;s-&gt;lock, flags);</div><div class='del'>-		return copy_to_user((void *) arg, &amp;cinfo, sizeof(cinfo)) ? -EFAULT : 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETBLKSIZE:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			if ((val = prog_dmabuf_dac(s)))</div><div class='del'>-				return val;</div><div class='del'>-			return put_user(s-&gt;dma_dac.fragsize, (int *) arg);</div><div class='del'>-		}</div><div class='del'>-		if ((val = prog_dmabuf_adc(s)))</div><div class='del'>-			return val;</div><div class='del'>-		if (s-&gt;conversion)</div><div class='del'>-			return put_user(s-&gt;dma_adc.fragsize / 2,</div><div class='del'>-					(int *) arg);</div><div class='del'>-		else</div><div class='del'>-			return put_user(s-&gt;dma_adc.fragsize, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFRAGMENT:</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;	// Say OK, but do nothing.</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SUBDIVIDE:</div><div class='del'>-		if ((file-&gt;f_mode &amp; FMODE_READ &amp;&amp; s-&gt;dma_adc.subdivision)</div><div class='del'>-		    || (file-&gt;f_mode &amp; FMODE_WRITE</div><div class='del'>-			&amp;&amp; s-&gt;dma_dac.subdivision)) return -EINVAL;</div><div class='del'>-		if (get_user(val, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != 1 &amp;&amp; val != 2 &amp;&amp; val != 4)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			s-&gt;dma_adc.subdivision = val;</div><div class='del'>-		else if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			s-&gt;dma_dac.subdivision = val;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_RATE:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			return put_user(s-&gt;prop_adc.rate, (int *) arg);</div><div class='del'>-		else if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return put_user(s-&gt;prop_dac.rate, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_CHANNELS:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			return put_user(s-&gt;prop_adc.channels, (int *) arg);</div><div class='del'>-		else if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return put_user(s-&gt;prop_dac.channels, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_BITS:</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			return</div><div class='del'>-			    put_user(</div><div class='del'>-				     (s-&gt;prop_adc.</div><div class='del'>-				      fmt &amp; (AFMT_S8 | AFMT_U8)) ? 8 : 16,</div><div class='del'>-				     (int *) arg);</div><div class='del'>-		else if (file-&gt;f_mode &amp; FMODE_WRITE)</div><div class='del'>-			return</div><div class='del'>-			    put_user(</div><div class='del'>-				     (s-&gt;prop_dac.</div><div class='del'>-				      fmt &amp; (AFMT_S8 | AFMT_U8)) ? 8 : 16,</div><div class='del'>-				     (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_WRITE_FILTER:</div><div class='del'>-	case SNDCTL_DSP_SETSYNCRO:</div><div class='del'>-	case SOUND_PCM_READ_FILTER:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return mixer_ioctl(s, cmd, arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long cs4297a_unlocked_ioctl(struct file *file, u_int cmd, u_long arg)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-	ret = cs4297a_ioctl(file, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs4297a_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s =</div><div class='del'>-	    (struct cs4297a_state *) file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_FUNCTION | CS_RELEASE, 2, printk(KERN_INFO</div><div class='del'>-		 "cs4297a: cs4297a_release(): inode=0x%.8x file=0x%.8x f_mode=0x%x\n",</div><div class='del'>-			 (unsigned) inode, (unsigned) file, file-&gt;f_mode));</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		drain_dac(s, file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-		mutex_lock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-		stop_dac(s);</div><div class='del'>-		dealloc_dmabuf(s, &amp;s-&gt;dma_dac);</div><div class='del'>-		s-&gt;open_mode &amp;= ~FMODE_WRITE;</div><div class='del'>-		mutex_unlock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-		wake_up(&amp;s-&gt;open_wait_dac);</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		drain_adc(s, file-&gt;f_flags &amp; O_NONBLOCK);</div><div class='del'>-		mutex_lock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-		stop_adc(s);</div><div class='del'>-		dealloc_dmabuf(s, &amp;s-&gt;dma_adc);</div><div class='del'>-		s-&gt;open_mode &amp;= ~FMODE_READ;</div><div class='del'>-		mutex_unlock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-		wake_up(&amp;s-&gt;open_wait_adc);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs4297a_locked_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int minor = iminor(inode);</div><div class='del'>-	struct cs4297a_state *s=NULL;</div><div class='del'>-	struct list_head *entry;</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_OPEN, 2, printk(KERN_INFO</div><div class='del'>-		"cs4297a: cs4297a_open(): inode=0x%.8x file=0x%.8x f_mode=0x%x\n",</div><div class='del'>-			(unsigned) inode, (unsigned) file, file-&gt;f_mode));</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_OPEN, 2, printk(KERN_INFO</div><div class='del'>-                "cs4297a: status = %08x\n", (int)__raw_readq(SS_CSR(R_SER_STATUS_DEBUG))));</div><div class='del'>-</div><div class='del'>-	list_for_each(entry, &amp;cs4297a_devs)</div><div class='del'>-	{</div><div class='del'>-		s = list_entry(entry, struct cs4297a_state, list);</div><div class='del'>-</div><div class='del'>-		if (!((s-&gt;dev_audio ^ minor) &amp; ~0xf))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (entry == &amp;cs4297a_devs)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!s) {</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_OPEN, 2, printk(KERN_INFO</div><div class='del'>-			"cs4297a: cs4297a_open(): Error - unable to find audio state struct\n"));</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	VALIDATE_STATE(s);</div><div class='del'>-	file-&gt;private_data = s;</div><div class='del'>-</div><div class='del'>-	// wait for device to become free </div><div class='del'>-	if (!(file-&gt;f_mode &amp; (FMODE_WRITE | FMODE_READ))) {</div><div class='del'>-		CS_DBGOUT(CS_FUNCTION | CS_OPEN | CS_ERROR, 2, printk(KERN_INFO</div><div class='del'>-			 "cs4297a: cs4297a_open(): Error - must open READ and/or WRITE\n"));</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-                if (__raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_TX)) != 0) {</div><div class='del'>-                        printk(KERN_ERR "cs4297a: TX pipe needs to drain\n");</div><div class='del'>-                        while (__raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_TX)))</div><div class='del'>-                                ;</div><div class='del'>-                }</div><div class='del'>-          </div><div class='del'>-		mutex_lock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-		while (s-&gt;open_mode &amp; FMODE_WRITE) {</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				mutex_unlock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='del'>-			mutex_unlock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-			interruptible_sleep_on(&amp;s-&gt;open_wait_dac);</div><div class='del'>-</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-                                printk("open - sig pending\n");</div><div class='del'>-				return -ERESTARTSYS;</div><div class='del'>-                        }</div><div class='del'>-			mutex_lock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		mutex_lock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-		while (s-&gt;open_mode &amp; FMODE_READ) {</div><div class='del'>-			if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				mutex_unlock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='del'>-			mutex_unlock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-			interruptible_sleep_on(&amp;s-&gt;open_wait_adc);</div><div class='del'>-</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-                                printk("open - sig pending\n");</div><div class='del'>-				return -ERESTARTSYS;</div><div class='del'>-                        }</div><div class='del'>-			mutex_lock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	s-&gt;open_mode |= file-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE);</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-		s-&gt;prop_adc.fmt = AFMT_S16_BE;</div><div class='del'>-		s-&gt;prop_adc.fmt_original = s-&gt;prop_adc.fmt;</div><div class='del'>-		s-&gt;prop_adc.channels = 2;</div><div class='del'>-		s-&gt;prop_adc.rate = 48000;</div><div class='del'>-		s-&gt;conversion = 0;</div><div class='del'>-		s-&gt;ena &amp;= ~FMODE_READ;</div><div class='del'>-		s-&gt;dma_adc.ossfragshift = s-&gt;dma_adc.ossmaxfrags =</div><div class='del'>-		    s-&gt;dma_adc.subdivision = 0;</div><div class='del'>-		mutex_unlock(&amp;s-&gt;open_sem_adc);</div><div class='del'>-</div><div class='del'>-		if (prog_dmabuf_adc(s)) {</div><div class='del'>-			CS_DBGOUT(CS_OPEN | CS_ERROR, 2, printk(KERN_ERR</div><div class='del'>-				"cs4297a: adc Program dmabufs failed.\n"));</div><div class='del'>-			cs4297a_release(inode, file);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-		s-&gt;prop_dac.fmt = AFMT_S16_BE;</div><div class='del'>-		s-&gt;prop_dac.fmt_original = s-&gt;prop_dac.fmt;</div><div class='del'>-		s-&gt;prop_dac.channels = 2;</div><div class='del'>-		s-&gt;prop_dac.rate = 48000;</div><div class='del'>-		s-&gt;conversion = 0;</div><div class='del'>-		s-&gt;ena &amp;= ~FMODE_WRITE;</div><div class='del'>-		s-&gt;dma_dac.ossfragshift = s-&gt;dma_dac.ossmaxfrags =</div><div class='del'>-		    s-&gt;dma_dac.subdivision = 0;</div><div class='del'>-		mutex_unlock(&amp;s-&gt;open_sem_dac);</div><div class='del'>-</div><div class='del'>-		if (prog_dmabuf_dac(s)) {</div><div class='del'>-			CS_DBGOUT(CS_OPEN | CS_ERROR, 2, printk(KERN_ERR</div><div class='del'>-				"cs4297a: dac Program dmabufs failed.\n"));</div><div class='del'>-			cs4297a_release(inode, file);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	CS_DBGOUT(CS_FUNCTION | CS_OPEN, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cs4297a_open()- 0\n"));</div><div class='del'>-	return nonseekable_open(inode, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs4297a_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-	ret = cs4297a_open(inode, file);</div><div class='del'>-	mutex_unlock(&amp;swarm_cs4297a_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// ******************************************************************************************</div><div class='del'>-//   Wave (audio) file operations struct.</div><div class='del'>-// ******************************************************************************************</div><div class='del'>-static const struct file_operations cs4297a_audio_fops = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.llseek		= no_llseek,</div><div class='del'>-	.read		= cs4297a_read,</div><div class='del'>-	.write		= cs4297a_write,</div><div class='del'>-	.poll		= cs4297a_poll,</div><div class='del'>-	.unlocked_ioctl	= cs4297a_unlocked_ioctl,</div><div class='del'>-	.mmap		= cs4297a_mmap,</div><div class='del'>-	.open		= cs4297a_open,</div><div class='del'>-	.release	= cs4297a_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cs4297a_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s = (struct cs4297a_state *) dev_id;</div><div class='del'>-        u32 status;</div><div class='del'>-</div><div class='del'>-        status = __raw_readq(SS_CSR(R_SER_STATUS_DEBUG));</div><div class='del'>-</div><div class='del'>-        CS_DBGOUT(CS_INTERRUPT, 6, printk(KERN_INFO</div><div class='del'>-                 "cs4297a: cs4297a_interrupt() HISR=0x%.8x\n", status));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-        /* XXXKW what check *should* be done here? */</div><div class='del'>-        if (!(status &amp; (M_SYNCSER_RX_EOP_COUNT | M_SYNCSER_RX_OVERRUN | M_SYNCSER_RX_SYNC_ERR))) {</div><div class='del'>-                status = __raw_readq(SS_CSR(R_SER_STATUS));</div><div class='del'>-                printk(KERN_ERR "cs4297a: unexpected interrupt (status %08x)\n", status);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-        if (status &amp; M_SYNCSER_RX_SYNC_ERR) {</div><div class='del'>-                status = __raw_readq(SS_CSR(R_SER_STATUS));</div><div class='del'>-                printk(KERN_ERR "cs4297a: rx sync error (status %08x)\n", status);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (status &amp; M_SYNCSER_RX_OVERRUN) {</div><div class='del'>-                int newptr, i;</div><div class='del'>-                s-&gt;stats.rx_ovrrn++;</div><div class='del'>-                printk(KERN_ERR "cs4297a: receive FIFO overrun\n");</div><div class='del'>-</div><div class='del'>-                /* Fix things up: get the receive descriptor pool</div><div class='del'>-                   clean and give them back to the hardware */</div><div class='del'>-                while (__raw_readq(SS_CSR(R_SER_DMA_DSCR_COUNT_RX)))</div><div class='del'>-                        ;</div><div class='del'>-                newptr = (unsigned) (((__raw_readq(SS_CSR(R_SER_DMA_CUR_DSCR_ADDR_RX)) &amp; M_DMA_CURDSCR_ADDR) -</div><div class='del'>-                                     s-&gt;dma_adc.descrtab_phys) / sizeof(serdma_descr_t));</div><div class='del'>-                for (i=0; i&lt;DMA_DESCR; i++) {</div><div class='del'>-                        s-&gt;dma_adc.descrtab[i].descr_a &amp;= ~M_DMA_SERRX_SOP;</div><div class='del'>-                }</div><div class='del'>-                s-&gt;dma_adc.swptr = s-&gt;dma_adc.hwptr = newptr;</div><div class='del'>-                s-&gt;dma_adc.count = 0;</div><div class='del'>-                s-&gt;dma_adc.sb_swptr = s-&gt;dma_adc.sb_hwptr = s-&gt;dma_adc.sample_buf;</div><div class='del'>-                __raw_writeq(DMA_DESCR, SS_CSR(R_SER_DMA_DSCR_COUNT_RX));</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;s-&gt;lock);</div><div class='del'>-	cs4297a_update_ptr(s,CS_TRUE);</div><div class='del'>-	spin_unlock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_INTERRUPT, 6, printk(KERN_INFO</div><div class='del'>-		  "cs4297a: cs4297a_interrupt()-\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static struct initvol {</div><div class='del'>-	int mixch;</div><div class='del'>-	int vol;</div><div class='del'>-} initvol[] __initdata = {</div><div class='del'>-</div><div class='del'>-  	{SOUND_MIXER_WRITE_VOLUME, 0x4040},</div><div class='del'>-        {SOUND_MIXER_WRITE_PCM, 0x4040},</div><div class='del'>-        {SOUND_MIXER_WRITE_SYNTH, 0x4040},</div><div class='del'>-	{SOUND_MIXER_WRITE_CD, 0x4040},</div><div class='del'>-	{SOUND_MIXER_WRITE_LINE, 0x4040},</div><div class='del'>-	{SOUND_MIXER_WRITE_LINE1, 0x4040},</div><div class='del'>-	{SOUND_MIXER_WRITE_RECLEV, 0x0000},</div><div class='del'>-	{SOUND_MIXER_WRITE_SPEAKER, 0x4040},</div><div class='del'>-	{SOUND_MIXER_WRITE_MIC, 0x0000}</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int __init cs4297a_init(void)</div><div class='del'>-{</div><div class='del'>-	struct cs4297a_state *s;</div><div class='del'>-	u32 pwr, id;</div><div class='del'>-	mm_segment_t fs;</div><div class='del'>-	int rval;</div><div class='del'>-#ifndef CONFIG_BCM_CS4297A_CSWARM</div><div class='del'>-	u64 cfg;</div><div class='del'>-	int mdio_val;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO </div><div class='del'>-		"cs4297a: cs4297a_init_module()+ \n"));</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_BCM_CS4297A_CSWARM</div><div class='del'>-        mdio_val = __raw_readq(KSEG1 + A_MAC_REGISTER(2, R_MAC_MDIO)) &amp;</div><div class='del'>-                (M_MAC_MDIO_DIR|M_MAC_MDIO_OUT);</div><div class='del'>-</div><div class='del'>-        /* Check syscfg for synchronous serial on port 1 */</div><div class='del'>-        cfg = __raw_readq(KSEG1 + A_SCD_SYSTEM_CFG);</div><div class='del'>-        if (!(cfg &amp; M_SYS_SER1_ENABLE)) {</div><div class='del'>-                __raw_writeq(cfg | M_SYS_SER1_ENABLE, KSEG1+A_SCD_SYSTEM_CFG);</div><div class='del'>-                cfg = __raw_readq(KSEG1 + A_SCD_SYSTEM_CFG);</div><div class='del'>-                if (!(cfg &amp; M_SYS_SER1_ENABLE)) {</div><div class='del'>-                  printk(KERN_INFO "cs4297a: serial port 1 not configured for synchronous operation\n");</div><div class='del'>-                  return -1;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                printk(KERN_INFO "cs4297a: serial port 1 switching to synchronous operation\n");</div><div class='del'>-                </div><div class='del'>-                /* Force the codec (on SWARM) to reset by clearing</div><div class='del'>-                   GENO, preserving MDIO (no effect on CSWARM) */</div><div class='del'>-                __raw_writeq(mdio_val, KSEG1+A_MAC_REGISTER(2, R_MAC_MDIO));</div><div class='del'>-                udelay(10);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* Now set GENO */</div><div class='del'>-        __raw_writeq(mdio_val | M_MAC_GENC, KSEG1+A_MAC_REGISTER(2, R_MAC_MDIO));</div><div class='del'>-        /* Give the codec some time to finish resetting (start the bit clock) */</div><div class='del'>-        udelay(100);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!(s = kzalloc(sizeof(struct cs4297a_state), GFP_KERNEL))) {</div><div class='del'>-		CS_DBGOUT(CS_ERROR, 1, printk(KERN_ERR</div><div class='del'>-		      "cs4297a: probe() no memory for state struct.\n"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-        s-&gt;magic = CS4297a_MAGIC;</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_adc.wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_dac.wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_adc.reg_wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;dma_dac.reg_wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;open_wait);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;open_wait_adc);</div><div class='del'>-	init_waitqueue_head(&amp;s-&gt;open_wait_dac);</div><div class='del'>-	mutex_init(&amp;s-&gt;open_sem_adc);</div><div class='del'>-	mutex_init(&amp;s-&gt;open_sem_dac);</div><div class='del'>-	spin_lock_init(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-        s-&gt;irq = K_INT_SER_1;</div><div class='del'>-</div><div class='del'>-	if (request_irq</div><div class='del'>-	    (s-&gt;irq, cs4297a_interrupt, 0, "Crystal CS4297a", s)) {</div><div class='del'>-		CS_DBGOUT(CS_INIT | CS_ERROR, 1,</div><div class='del'>-			  printk(KERN_ERR "cs4297a: irq %u in use\n", s-&gt;irq));</div><div class='del'>-		goto err_irq;</div><div class='del'>-	}</div><div class='del'>-	if ((s-&gt;dev_audio = register_sound_dsp(&amp;cs4297a_audio_fops, -1)) &lt;</div><div class='del'>-	    0) {</div><div class='del'>-		CS_DBGOUT(CS_INIT | CS_ERROR, 1, printk(KERN_ERR</div><div class='del'>-			 "cs4297a: probe() register_sound_dsp() failed.\n"));</div><div class='del'>-		goto err_dev1;</div><div class='del'>-	}</div><div class='del'>-	if ((s-&gt;dev_mixer = register_sound_mixer(&amp;cs4297a_mixer_fops, -1)) &lt;</div><div class='del'>-	    0) {</div><div class='del'>-		CS_DBGOUT(CS_INIT | CS_ERROR, 1, printk(KERN_ERR</div><div class='del'>-			 "cs4297a: probe() register_sound_mixer() failed.\n"));</div><div class='del'>-		goto err_dev2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        if (ser_init(s) || dma_init(s)) {</div><div class='del'>-		CS_DBGOUT(CS_INIT | CS_ERROR, 1, printk(KERN_ERR</div><div class='del'>-			 "cs4297a: ser_init failed.\n"));</div><div class='del'>-		goto err_dev3;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        do {</div><div class='del'>-                udelay(4000);</div><div class='del'>-                rval = cs4297a_read_ac97(s, AC97_POWER_CONTROL, &amp;pwr);</div><div class='del'>-        } while (!rval &amp;&amp; (pwr != 0xf));</div><div class='del'>-</div><div class='del'>-        if (!rval) {</div><div class='del'>-		char *sb1250_duart_present;</div><div class='del'>-</div><div class='del'>-                fs = get_fs();</div><div class='del'>-                set_fs(KERNEL_DS);</div><div class='del'>-#if 0</div><div class='del'>-                val = SOUND_MASK_LINE;</div><div class='del'>-                mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &amp;val);</div><div class='del'>-                for (i = 0; i &lt; ARRAY_SIZE(initvol); i++) {</div><div class='del'>-                        val = initvol[i].vol;</div><div class='del'>-                        mixer_ioctl(s, initvol[i].mixch, (unsigned long) &amp;val);</div><div class='del'>-                }</div><div class='del'>-//                cs4297a_write_ac97(s, 0x18, 0x0808);</div><div class='del'>-#else</div><div class='del'>-                //                cs4297a_write_ac97(s, 0x5e, 0x180);</div><div class='del'>-                cs4297a_write_ac97(s, 0x02, 0x0808);</div><div class='del'>-                cs4297a_write_ac97(s, 0x18, 0x0808);</div><div class='del'>-#endif</div><div class='del'>-                set_fs(fs);</div><div class='del'>-</div><div class='del'>-                list_add(&amp;s-&gt;list, &amp;cs4297a_devs);</div><div class='del'>-</div><div class='del'>-                cs4297a_read_ac97(s, AC97_VENDOR_ID1, &amp;id);</div><div class='del'>-</div><div class='del'>-		sb1250_duart_present = symbol_get(sb1250_duart_present);</div><div class='del'>-		if (sb1250_duart_present)</div><div class='del'>-			sb1250_duart_present[1] = 0;</div><div class='del'>-</div><div class='del'>-                printk(KERN_INFO "cs4297a: initialized (vendor id = %x)\n", id);</div><div class='del'>-</div><div class='del'>-                CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,</div><div class='del'>-                          printk(KERN_INFO "cs4297a: cs4297a_init_module()-\n"));</div><div class='del'>-                </div><div class='del'>-                return 0;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>- err_dev3:</div><div class='del'>-	unregister_sound_mixer(s-&gt;dev_mixer);</div><div class='del'>- err_dev2:</div><div class='del'>-	unregister_sound_dsp(s-&gt;dev_audio);</div><div class='del'>- err_dev1:</div><div class='del'>-	free_irq(s-&gt;irq, s);</div><div class='del'>- err_irq:</div><div class='del'>-	kfree(s);</div><div class='del'>-</div><div class='del'>-        printk(KERN_INFO "cs4297a: initialization failed\n");</div><div class='del'>-</div><div class='del'>-        return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cs4297a_cleanup(void)</div><div class='del'>-{</div><div class='del'>-        /*</div><div class='del'>-          XXXKW </div><div class='del'>-           disable_irq, free_irq</div><div class='del'>-           drain DMA queue</div><div class='del'>-           disable DMA</div><div class='del'>-           disable TX/RX</div><div class='del'>-           free memory</div><div class='del'>-        */</div><div class='del'>-	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,</div><div class='del'>-		  printk(KERN_INFO "cs4297a: cleanup_cs4297a() finished\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Kip Walker, Broadcom Corp.");</div><div class='del'>-MODULE_DESCRIPTION("Cirrus Logic CS4297a Driver for Broadcom SWARM board");</div><div class='del'>-</div><div class='del'>-// --------------------------------------------------------------------- </div><div class='del'>-</div><div class='del'>-module_init(cs4297a_init);</div><div class='del'>-module_exit(cs4297a_cleanup);</div><div class='head'>diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c<br/>deleted file mode 100644<br/>index 8db6aefe15e4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/sys_timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/sys_timer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,285 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/sys_timer.c</div><div class='del'>- *</div><div class='del'>- * The default timer for the Level 2 sequencer interface</div><div class='del'>- * Uses the (1/HZ sec) timer of kernel.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>- * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)</div><div class='del'>- * Andrew Veliath  : adapted tmr2ticks from level 1 sequencer (avoid overflow)</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-static volatile int opened, tmr_running;</div><div class='del'>-static volatile time_t tmr_offs, tmr_ctr;</div><div class='del'>-static volatile unsigned long ticks_offs;</div><div class='del'>-static volatile int curr_tempo, curr_timebase;</div><div class='del'>-static volatile unsigned long curr_ticks;</div><div class='del'>-static volatile unsigned long next_event_time;</div><div class='del'>-static unsigned long prev_event_time;</div><div class='del'>-</div><div class='del'>-static void     poll_def_tmr(unsigned long dummy);</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0);</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-tmr2ticks(int tmr_value)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 *    Convert timer ticks to MIDI ticks</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	unsigned long tmp;</div><div class='del'>-	unsigned long scale;</div><div class='del'>-</div><div class='del'>-	/* tmr_value (ticks per sec) *</div><div class='del'>-	   1000000 (usecs per sec) / HZ (ticks per sec) -=&gt; usecs */</div><div class='del'>-	tmp = tmr_value * (1000000 / HZ);</div><div class='del'>-	scale = (60 * 1000000) / (curr_tempo * curr_timebase);	/* usecs per MIDI tick */</div><div class='del'>-	return (tmp + scale / 2) / scale;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-poll_def_tmr(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (opened)</div><div class='del'>-	  {</div><div class='del'>-</div><div class='del'>-		  {</div><div class='del'>-			  def_tmr.expires = (1) + jiffies;</div><div class='del'>-			  add_timer(&amp;def_tmr);</div><div class='del'>-		  };</div><div class='del'>-</div><div class='del'>-		  if (tmr_running)</div><div class='del'>-		    {</div><div class='del'>-				spin_lock(&amp;lock);</div><div class='del'>-			    tmr_ctr++;</div><div class='del'>-			    curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);</div><div class='del'>-</div><div class='del'>-			    if (curr_ticks &gt;= next_event_time)</div><div class='del'>-			      {</div><div class='del'>-				      next_event_time = (unsigned long) -1;</div><div class='del'>-				      sequencer_timer(0);</div><div class='del'>-			      }</div><div class='del'>-				spin_unlock(&amp;lock);</div><div class='del'>-		    }</div><div class='del'>-	  }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tmr_reset(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	tmr_offs = 0;</div><div class='del'>-	ticks_offs = 0;</div><div class='del'>-	tmr_ctr = 0;</div><div class='del'>-	next_event_time = (unsigned long) -1;</div><div class='del'>-	prev_event_time = 0;</div><div class='del'>-	curr_ticks = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-def_tmr_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	if (opened)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	tmr_reset();</div><div class='del'>-	curr_tempo = 60;</div><div class='del'>-	curr_timebase = 100;</div><div class='del'>-	opened = 1;</div><div class='del'>-	{</div><div class='del'>-		def_tmr.expires = (1) + jiffies;</div><div class='del'>-		add_timer(&amp;def_tmr);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-def_tmr_close(int dev)</div><div class='del'>-{</div><div class='del'>-	opened = tmr_running = 0;</div><div class='del'>-	del_timer(&amp;def_tmr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-def_tmr_event(int dev, unsigned char *event)</div><div class='del'>-{</div><div class='del'>-	unsigned char   cmd = event[1];</div><div class='del'>-	unsigned long   parm = *(int *) &amp;event[4];</div><div class='del'>-</div><div class='del'>-	switch (cmd)</div><div class='del'>-	  {</div><div class='del'>-	  case TMR_WAIT_REL:</div><div class='del'>-		  parm += prev_event_time;</div><div class='del'>-	  case TMR_WAIT_ABS:</div><div class='del'>-		  if (parm &gt; 0)</div><div class='del'>-		    {</div><div class='del'>-			    long            time;</div><div class='del'>-</div><div class='del'>-			    if (parm &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-				    return TIMER_NOT_ARMED;</div><div class='del'>-</div><div class='del'>-			    time = parm;</div><div class='del'>-			    next_event_time = prev_event_time = time;</div><div class='del'>-</div><div class='del'>-			    return TIMER_ARMED;</div><div class='del'>-		    }</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case TMR_START:</div><div class='del'>-		  tmr_reset();</div><div class='del'>-		  tmr_running = 1;</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case TMR_STOP:</div><div class='del'>-		  tmr_running = 0;</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case TMR_CONTINUE:</div><div class='del'>-		  tmr_running = 1;</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case TMR_TEMPO:</div><div class='del'>-		  if (parm)</div><div class='del'>-		    {</div><div class='del'>-			    if (parm &lt; 8)</div><div class='del'>-				    parm = 8;</div><div class='del'>-			    if (parm &gt; 360)</div><div class='del'>-				    parm = 360;</div><div class='del'>-			    tmr_offs = tmr_ctr;</div><div class='del'>-			    ticks_offs += tmr2ticks(tmr_ctr);</div><div class='del'>-			    tmr_ctr = 0;</div><div class='del'>-			    curr_tempo = parm;</div><div class='del'>-		    }</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  case TMR_ECHO:</div><div class='del'>-		  seq_copy_to_input(event, 8);</div><div class='del'>-		  break;</div><div class='del'>-</div><div class='del'>-	  default:;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	return TIMER_NOT_ARMED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned long</div><div class='del'>-def_tmr_get_time(int dev)</div><div class='del'>-{</div><div class='del'>-	if (!opened)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return curr_ticks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* same as sound_timer.c:timer_ioctl!? */</div><div class='del'>-static int def_tmr_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int __user *p = arg;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDCTL_TMR_SOURCE:</div><div class='del'>-		return __put_user(TMR_INTERNAL, p);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_TMR_START:</div><div class='del'>-		tmr_reset();</div><div class='del'>-		tmr_running = 1;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_TMR_STOP:</div><div class='del'>-		tmr_running = 0;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_TMR_CONTINUE:</div><div class='del'>-		tmr_running = 1;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_TMR_TIMEBASE:</div><div class='del'>-		if (__get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val) {</div><div class='del'>-			if (val &lt; 1)</div><div class='del'>-				val = 1;</div><div class='del'>-			if (val &gt; 1000)</div><div class='del'>-				val = 1000;</div><div class='del'>-			curr_timebase = val;</div><div class='del'>-		}</div><div class='del'>-		return __put_user(curr_timebase, p);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_TMR_TEMPO:</div><div class='del'>-		if (__get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val) {</div><div class='del'>-			if (val &lt; 8)</div><div class='del'>-				val = 8;</div><div class='del'>-			if (val &gt; 250)</div><div class='del'>-				val = 250;</div><div class='del'>-			tmr_offs = tmr_ctr;</div><div class='del'>-			ticks_offs += tmr2ticks(tmr_ctr);</div><div class='del'>-			tmr_ctr = 0;</div><div class='del'>-			curr_tempo = val;</div><div class='del'>-			reprogram_timer();</div><div class='del'>-		}</div><div class='del'>-		return __put_user(curr_tempo, p);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_SEQ_CTRLRATE:</div><div class='del'>-		if (__get_user(val, p))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (val != 0)	/* Can't change */</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		val = ((curr_tempo * curr_timebase) + 30) / 60;</div><div class='del'>-		return __put_user(val, p);</div><div class='del'>-		</div><div class='del'>-	case SNDCTL_SEQ_GETTIME:</div><div class='del'>-		return __put_user(curr_ticks, p);</div><div class='del'>-		</div><div class='del'>-	case SNDCTL_TMR_METRONOME:</div><div class='del'>-		/* NOP */</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:;</div><div class='del'>-	}</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-def_tmr_arm(int dev, long time)</div><div class='del'>-{</div><div class='del'>-	if (time &lt; 0)</div><div class='del'>-		time = curr_ticks + 1;</div><div class='del'>-	else if (time &lt;= curr_ticks)	/* It's the time */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	next_event_time = prev_event_time = time;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sound_timer_operations default_sound_timer =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"System clock", 0},</div><div class='del'>-	.priority	= 0,	/* Priority */</div><div class='del'>-	.devlink	= 0,	/* Local device link */</div><div class='del'>-	.open		= def_tmr_open,</div><div class='del'>-	.close		= def_tmr_close,</div><div class='del'>-	.event		= def_tmr_event,</div><div class='del'>-	.get_time	= def_tmr_get_time,</div><div class='del'>-	.ioctl		= def_tmr_ioctl,</div><div class='del'>-	.arm_timer	= def_tmr_arm</div><div class='del'>-};</div><div class='head'>diff --git a/sound/oss/trix.c b/sound/oss/trix.c<br/>deleted file mode 100644<br/>index e04169e8e3f8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/trix.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/trix.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,525 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/trix.c</div><div class='del'>- *</div><div class='del'>- * Low level driver for the MediaTrix AudioTrix Pro</div><div class='del'>- * (MT-0002-PC Control Chip)</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Changes</div><div class='del'>- *	Alan Cox		Modularisation, cleanup.</div><div class='del'>- *	Christoph Hellwig	Adapted to module_init/module_exit</div><div class='del'>- *	Arnaldo C. de Melo	Got rid of attach_uart401</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "sb.h"</div><div class='del'>-#include "sound_firmware.h"</div><div class='del'>-</div><div class='del'>-#include "ad1848.h"</div><div class='del'>-#include "mpu401.h"</div><div class='del'>-</div><div class='del'>-#include "trix_boot.h"</div><div class='del'>-</div><div class='del'>-static int mpu;</div><div class='del'>-</div><div class='del'>-static int joystick;</div><div class='del'>-</div><div class='del'>-static unsigned char trix_read(int addr)</div><div class='del'>-{</div><div class='del'>-	outb(((unsigned char) addr), 0x390);	/* MT-0002-PC ASIC address */</div><div class='del'>-	return inb(0x391);	/* MT-0002-PC ASIC data */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void trix_write(int addr, int data)</div><div class='del'>-{</div><div class='del'>-	outb(((unsigned char) addr), 0x390);	/* MT-0002-PC ASIC address */</div><div class='del'>-	outb(((unsigned char) data), 0x391);	/* MT-0002-PC ASIC data */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void download_boot(int base)</div><div class='del'>-{</div><div class='del'>-	int i = 0, n = trix_boot_len;</div><div class='del'>-</div><div class='del'>-	if (trix_boot_len == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	trix_write(0xf8, 0x00);	/* ??????? */</div><div class='del'>-	outb((0x01), base + 6);	/* Clear the internal data pointer */</div><div class='del'>-	outb((0x00), base + 6);	/* Restart */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	   *  Write the boot code to the RAM upload/download register.</div><div class='del'>-	   *  Each write increments the internal data pointer.</div><div class='del'>-	 */</div><div class='del'>-	outb((0x01), base + 6);	/* Clear the internal data pointer */</div><div class='del'>-	outb((0x1A), 0x390);	/* Select RAM download/upload port */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n; i++)</div><div class='del'>-		outb((trix_boot[i]), 0x391);</div><div class='del'>-	for (i = n; i &lt; 10016; i++)	/* Clear up to first 16 bytes of data RAM */</div><div class='del'>-		outb((0x00), 0x391);</div><div class='del'>-	outb((0x00), base + 6);	/* Reset */</div><div class='del'>-	outb((0x50), 0x390);	/* ?????? */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int trix_set_wss_port(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char   addr_bits;</div><div class='del'>-</div><div class='del'>-	if (trix_read(0x15) != 0x71)	/* No ASIC signature */</div><div class='del'>-	{</div><div class='del'>-		MDB(printk(KERN_ERR "No AudioTrix ASIC signature found\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset some registers.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	trix_write(0x13, 0);</div><div class='del'>-	trix_write(0x14, 0);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Configure the ASIC to place the codec to the proper I/O location</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x530:</div><div class='del'>-			addr_bits = 0;</div><div class='del'>-			break;</div><div class='del'>-		case 0x604:</div><div class='del'>-			addr_bits = 1;</div><div class='del'>-			break;</div><div class='del'>-		case 0xE80:</div><div class='del'>-			addr_bits = 2;</div><div class='del'>-			break;</div><div class='del'>-		case 0xF40:</div><div class='del'>-			addr_bits = 3;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	trix_write(0x19, (trix_read(0x19) &amp; 0x03) | addr_bits);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *    Probe and attach routines for the Windows Sound System mode of</div><div class='del'>- *      AudioTrix Pro</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init init_trix_wss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	static unsigned char dma_bits[4] = {</div><div class='del'>-		1, 2, 0, 3</div><div class='del'>-	};</div><div class='del'>-	struct resource *ports;</div><div class='del'>-	int config_port = hw_config-&gt;io_base + 0;</div><div class='del'>-	int dma1 = hw_config-&gt;dma, dma2 = hw_config-&gt;dma2;</div><div class='del'>-	int old_num_mixers = num_mixers;</div><div class='del'>-	u8 config, bits;</div><div class='del'>-	int ret;</div><div class='del'>- </div><div class='del'>-	switch(hw_config-&gt;irq) {</div><div class='del'>-	case 7:</div><div class='del'>-		bits = 8;</div><div class='del'>-		break;</div><div class='del'>-	case 9:</div><div class='del'>-		bits = 0x10;</div><div class='del'>-		break;</div><div class='del'>-	case 10:</div><div class='del'>-		bits = 0x18;</div><div class='del'>-		break;</div><div class='del'>-	case 11:</div><div class='del'>-		bits = 0x20;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Bad WSS IRQ %d\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dma1) {</div><div class='del'>-	case 0:</div><div class='del'>-	case 1:</div><div class='del'>-	case 3:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Bad WSS DMA %d\n", dma1);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (dma2) {</div><div class='del'>-	case -1:</div><div class='del'>-	case 0:</div><div class='del'>-	case 1:</div><div class='del'>-	case 3:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Bad capture DMA %d\n", dma2);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check if the IO port returns valid signature. The original MS Sound</div><div class='del'>-	 * system returns 0x04 while some cards (AudioTrix Pro for example)</div><div class='del'>-	 * return 0x00.</div><div class='del'>-	 */</div><div class='del'>-	ports = request_region(hw_config-&gt;io_base + 4, 4, "ad1848");</div><div class='del'>-	if (!ports) {</div><div class='del'>-		printk(KERN_ERR "AudioTrix: MSS I/O port conflict (%x)\n", hw_config-&gt;io_base);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!request_region(hw_config-&gt;io_base, 4, "MSS config")) {</div><div class='del'>-		printk(KERN_ERR "AudioTrix: MSS I/O port conflict (%x)\n", hw_config-&gt;io_base);</div><div class='del'>-		release_region(hw_config-&gt;io_base + 4, 4);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!trix_set_wss_port(hw_config))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	config = inb(hw_config-&gt;io_base + 3);</div><div class='del'>-</div><div class='del'>-	if ((config &amp; 0x3f) != 0x00)</div><div class='del'>-	{</div><div class='del'>-		MDB(printk(KERN_ERR "No MSS signature detected on port 0x%x\n", hw_config-&gt;io_base));</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check that DMA0 is not in use with a 8 bit board.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (dma1 == 0 &amp;&amp; config &amp; 0x80)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Can't use DMA0 with a 8 bit card slot\n");</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	if (hw_config-&gt;irq &gt; 9 &amp;&amp; config &amp; 0x80)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Can't use IRQ%d with a 8 bit card slot\n", hw_config-&gt;irq);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = ad1848_detect(ports, NULL, hw_config-&gt;osp);</div><div class='del'>-	if (!ret)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (joystick==1)</div><div class='del'>-		trix_write(0x15, 0x80);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set the IRQ and DMA addresses.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	outb((bits | 0x40), config_port);</div><div class='del'>-</div><div class='del'>-	if (dma2 == -1 || dma2 == dma1)</div><div class='del'>-	{</div><div class='del'>-		  bits |= dma_bits[dma1];</div><div class='del'>-		  dma2 = dma1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		unsigned char tmp;</div><div class='del'>-</div><div class='del'>-		tmp = trix_read(0x13) &amp; ~30;</div><div class='del'>-		trix_write(0x13, tmp | 0x80 | (dma1 &lt;&lt; 4));</div><div class='del'>-</div><div class='del'>-		tmp = trix_read(0x14) &amp; ~30;</div><div class='del'>-		trix_write(0x14, tmp | 0x80 | (dma2 &lt;&lt; 4));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outb((bits), config_port);	/* Write IRQ+DMA setup */</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[0] = ad1848_init("AudioTrix Pro", ports,</div><div class='del'>-					  hw_config-&gt;irq,</div><div class='del'>-					  dma1,</div><div class='del'>-					  dma2,</div><div class='del'>-					  0,</div><div class='del'>-					  hw_config-&gt;osp,</div><div class='del'>-					  THIS_MODULE);</div><div class='del'>-</div><div class='del'>-	if (num_mixers &gt; old_num_mixers)	/* Mixer got installed */</div><div class='del'>-	{</div><div class='del'>-		AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_LINE);	/* Line in */</div><div class='del'>-		AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_CD);</div><div class='del'>-		AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_SYNTH);		/* OPL4 */</div><div class='del'>-		AD1848_REROUTE(SOUND_MIXER_SPEAKER, SOUND_MIXER_ALTPCM);	/* SB */</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-	release_region(hw_config-&gt;io_base + 4, 4);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_trix_sb(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int tmp;</div><div class='del'>-	unsigned char conf;</div><div class='del'>-	extern int sb_be_quiet;</div><div class='del'>-	int old_quiet;</div><div class='del'>-	static signed char irq_translate[] = {</div><div class='del'>-		-1, -1, -1, 0, 1, 2, -1, 3</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (trix_boot_len == 0)</div><div class='del'>-		return 0;	/* No boot code -&gt; no fun */</div><div class='del'>-</div><div class='del'>-	if ((hw_config-&gt;io_base &amp; 0xffffff8f) != 0x200)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp = hw_config-&gt;irq;</div><div class='del'>-	if (tmp &gt; 7)</div><div class='del'>-		return 0;</div><div class='del'>-	if (irq_translate[tmp] == -1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp = hw_config-&gt;dma;</div><div class='del'>-	if (tmp != 1 &amp;&amp; tmp != 3)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (!request_region(hw_config-&gt;io_base, 16, "soundblaster")) {</div><div class='del'>-		printk(KERN_ERR "AudioTrix: SB I/O port conflict (%x)\n", hw_config-&gt;io_base);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conf = 0x84;		/* DMA and IRQ enable */</div><div class='del'>-	conf |= hw_config-&gt;io_base &amp; 0x70;	/* I/O address bits */</div><div class='del'>-	conf |= irq_translate[hw_config-&gt;irq];</div><div class='del'>-	if (hw_config-&gt;dma == 3)</div><div class='del'>-		conf |= 0x08;</div><div class='del'>-	trix_write(0x1b, conf);</div><div class='del'>-</div><div class='del'>-	download_boot(hw_config-&gt;io_base);</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;name = "AudioTrix SB";</div><div class='del'>-	if (!sb_dsp_detect(hw_config, 0, 0, NULL)) {</div><div class='del'>-		release_region(hw_config-&gt;io_base, 16);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;driver_use_1 = SB_NO_MIDI | SB_NO_MIXER | SB_NO_RECORDING;</div><div class='del'>-</div><div class='del'>-	/* Prevent false alarms */</div><div class='del'>-	old_quiet = sb_be_quiet;</div><div class='del'>-	sb_be_quiet = 1;</div><div class='del'>-</div><div class='del'>-	sb_dsp_init(hw_config, THIS_MODULE);</div><div class='del'>-</div><div class='del'>-	sb_be_quiet = old_quiet;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_trix_mpu(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unsigned char conf;</div><div class='del'>-	static int irq_bits[] = {</div><div class='del'>-		-1, -1, -1, 1, 2, 3, -1, 4, -1, 5</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;irq &gt; 9)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Bad MPU IRQ %d\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (irq_bits[hw_config-&gt;irq] == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Bad MPU IRQ %d\n", hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	switch (hw_config-&gt;io_base)</div><div class='del'>-	{</div><div class='del'>-		case 0x330:</div><div class='del'>-			conf = 0x00;</div><div class='del'>-			break;</div><div class='del'>-		case 0x370:</div><div class='del'>-			conf = 0x04;</div><div class='del'>-			break;</div><div class='del'>-		case 0x3b0:</div><div class='del'>-			conf = 0x08;</div><div class='del'>-			break;</div><div class='del'>-		case 0x3f0:</div><div class='del'>-			conf = 0x0c;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;	/* Invalid port */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conf |= irq_bits[hw_config-&gt;irq] &lt;&lt; 4;</div><div class='del'>-	trix_write(0x19, (trix_read(0x19) &amp; 0x83) | conf);</div><div class='del'>-	hw_config-&gt;name = "AudioTrix Pro";</div><div class='del'>-	return probe_uart401(hw_config, THIS_MODULE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_trix_wss(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int dma2 = hw_config-&gt;dma2;</div><div class='del'>-</div><div class='del'>-	if (dma2 == -1)</div><div class='del'>-		dma2 = hw_config-&gt;dma;</div><div class='del'>-</div><div class='del'>-	release_region(0x390, 2);</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-</div><div class='del'>-	ad1848_unload(hw_config-&gt;io_base + 4,</div><div class='del'>-		      hw_config-&gt;irq,</div><div class='del'>-		      hw_config-&gt;dma,</div><div class='del'>-		      dma2,</div><div class='del'>-		      0);</div><div class='del'>-	sound_unload_audiodev(hw_config-&gt;slots[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __exit unload_trix_mpu(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	unload_uart401(hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __exit unload_trix_sb(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	sb_dsp_unload(hw_config, mpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-static struct address_info cfg2;</div><div class='del'>-static struct address_info cfg_mpu;</div><div class='del'>-</div><div class='del'>-static int sb;</div><div class='del'>-static int fw_load;</div><div class='del'>-</div><div class='del'>-static int __initdata io	= -1;</div><div class='del'>-static int __initdata irq	= -1;</div><div class='del'>-static int __initdata dma	= -1;</div><div class='del'>-static int __initdata dma2	= -1;	/* Set this for modules that need it */</div><div class='del'>-static int __initdata sb_io	= -1;</div><div class='del'>-static int __initdata sb_dma	= -1;</div><div class='del'>-static int __initdata sb_irq	= -1;</div><div class='del'>-static int __initdata mpu_io	= -1;</div><div class='del'>-static int __initdata mpu_irq	= -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-module_param(irq, int, 0);</div><div class='del'>-module_param(dma, int, 0);</div><div class='del'>-module_param(dma2, int, 0);</div><div class='del'>-module_param(sb_io, int, 0);</div><div class='del'>-module_param(sb_dma, int, 0);</div><div class='del'>-module_param(sb_irq, int, 0);</div><div class='del'>-module_param(mpu_io, int, 0);</div><div class='del'>-module_param(mpu_irq, int, 0);</div><div class='del'>-module_param(joystick, bool, 0);</div><div class='del'>-</div><div class='del'>-static int __init init_trix(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "MediaTrix audio driver Copyright (C) by Hannu Savolainen 1993-1996\n");</div><div class='del'>-</div><div class='del'>-	cfg.io_base = io;</div><div class='del'>-	cfg.irq = irq;</div><div class='del'>-	cfg.dma = dma;</div><div class='del'>-	cfg.dma2 = dma2;</div><div class='del'>-</div><div class='del'>-	cfg2.io_base = sb_io;</div><div class='del'>-	cfg2.irq = sb_irq;</div><div class='del'>-	cfg2.dma = sb_dma;</div><div class='del'>-</div><div class='del'>-	cfg_mpu.io_base = mpu_io;</div><div class='del'>-	cfg_mpu.irq = mpu_irq;</div><div class='del'>-</div><div class='del'>-	if (cfg.io_base == -1 || cfg.dma == -1 || cfg.irq == -1) {</div><div class='del'>-		printk(KERN_INFO "I/O, IRQ, DMA and type are mandatory\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfg2.io_base != -1 &amp;&amp; (cfg2.irq == -1 || cfg2.dma == -1)) {</div><div class='del'>-		printk(KERN_INFO "CONFIG_SB_IRQ and CONFIG_SB_DMA must be specified if SB_IO is set.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (cfg_mpu.io_base != -1 &amp;&amp; cfg_mpu.irq == -1) {</div><div class='del'>-		printk(KERN_INFO "CONFIG_MPU_IRQ must be specified if MPU_IO is set.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (!trix_boot)</div><div class='del'>-	{</div><div class='del'>-		fw_load = 1;</div><div class='del'>-		trix_boot_len = mod_firmware_load("/etc/sound/trxpro.bin",</div><div class='del'>-						    (char **) &amp;trix_boot);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!request_region(0x390, 2, "AudioTrix")) {</div><div class='del'>-		printk(KERN_ERR "AudioTrix: Config port I/O conflict\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!init_trix_wss(&amp;cfg)) {</div><div class='del'>-		release_region(0x390, 2);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *    We must attach in the right order to get the firmware</div><div class='del'>-	 *      loaded up in time.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (cfg2.io_base != -1) {</div><div class='del'>-		sb = probe_trix_sb(&amp;cfg2);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (cfg_mpu.io_base != -1)</div><div class='del'>-		mpu = probe_trix_mpu(&amp;cfg_mpu);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_trix(void)</div><div class='del'>-{</div><div class='del'>-	if (fw_load &amp;&amp; trix_boot)</div><div class='del'>-		vfree(trix_boot);</div><div class='del'>-	if (sb)</div><div class='del'>-		unload_trix_sb(&amp;cfg2);</div><div class='del'>-	if (mpu)</div><div class='del'>-		unload_trix_mpu(&amp;cfg_mpu);</div><div class='del'>-	unload_trix_wss(&amp;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_trix);</div><div class='del'>-module_exit(cleanup_trix);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_trix (char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq, dma, dma2, sb_io, sb_irq, sb_dma, mpu_io, mpu_irq */</div><div class='del'>-	int ints[9];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	io	= ints[1];</div><div class='del'>-	irq	= ints[2];</div><div class='del'>-	dma	= ints[3];</div><div class='del'>-	dma2	= ints[4];</div><div class='del'>-	sb_io	= ints[5];</div><div class='del'>-	sb_irq	= ints[6];</div><div class='del'>-	sb_dma	= ints[6];</div><div class='del'>-	mpu_io	= ints[7];</div><div class='del'>-	mpu_irq	= ints[8];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("trix=", setup_trix);</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/tuning.h b/sound/oss/tuning.h<br/>deleted file mode 100644<br/>index a73e3dd39f9a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/tuning.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/tuning.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-static unsigned short semitone_tuning[24] =</div><div class='del'>-{</div><div class='del'>-/*   0 */ 10000, 10595, 11225, 11892, 12599, 13348, 14142, 14983, </div><div class='del'>-/*   8 */ 15874, 16818, 17818, 18877, 20000, 21189, 22449, 23784, </div><div class='del'>-/*  16 */ 25198, 26697, 28284, 29966, 31748, 33636, 35636, 37755</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short cent_tuning[100] =</div><div class='del'>-{</div><div class='del'>-/*   0 */ 10000, 10006, 10012, 10017, 10023, 10029, 10035, 10041, </div><div class='del'>-/*   8 */ 10046, 10052, 10058, 10064, 10070, 10075, 10081, 10087, </div><div class='del'>-/*  16 */ 10093, 10099, 10105, 10110, 10116, 10122, 10128, 10134, </div><div class='del'>-/*  24 */ 10140, 10145, 10151, 10157, 10163, 10169, 10175, 10181, </div><div class='del'>-/*  32 */ 10187, 10192, 10198, 10204, 10210, 10216, 10222, 10228, </div><div class='del'>-/*  40 */ 10234, 10240, 10246, 10251, 10257, 10263, 10269, 10275, </div><div class='del'>-/*  48 */ 10281, 10287, 10293, 10299, 10305, 10311, 10317, 10323, </div><div class='del'>-/*  56 */ 10329, 10335, 10341, 10347, 10353, 10359, 10365, 10371, </div><div class='del'>-/*  64 */ 10377, 10383, 10389, 10395, 10401, 10407, 10413, 10419, </div><div class='del'>-/*  72 */ 10425, 10431, 10437, 10443, 10449, 10455, 10461, 10467, </div><div class='del'>-/*  80 */ 10473, 10479, 10485, 10491, 10497, 10503, 10509, 10515, </div><div class='del'>-/*  88 */ 10521, 10528, 10534, 10540, 10546, 10552, 10558, 10564, </div><div class='del'>-/*  96 */ 10570, 10576, 10582, 10589</div><div class='del'>-};</div><div class='head'>diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c<br/>deleted file mode 100644<br/>index 8e514a676a0d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/uart401.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/uart401.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,482 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/uart401.c</div><div class='del'>- *</div><div class='del'>- * MPU-401 UART driver (formerly uart401_midi.c)</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- *	Alan Cox		Reformatted, removed sound_mem usage, use normal Linux</div><div class='del'>- *				interrupt allocation. Protect against bogus unload</div><div class='del'>- *				Fixed to allow IRQ &gt; 15</div><div class='del'>- *	Christoph Hellwig	Adapted to module_init/module_exit</div><div class='del'>- *	Arnaldo C. de Melo	got rid of check_region</div><div class='del'>- *</div><div class='del'>- * Status:</div><div class='del'>- *		Untested</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "mpu401.h"</div><div class='del'>-</div><div class='del'>-typedef struct uart401_devc</div><div class='del'>-{</div><div class='del'>-	int             base;</div><div class='del'>-	int             irq;</div><div class='del'>-	int            *osp;</div><div class='del'>-	void            (*midi_input_intr) (int dev, unsigned char data);</div><div class='del'>-	int             opened, disabled;</div><div class='del'>-	volatile unsigned char input_byte;</div><div class='del'>-	int             my_dev;</div><div class='del'>-	int             share_irq;</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-}</div><div class='del'>-uart401_devc;</div><div class='del'>-</div><div class='del'>-#define	DATAPORT   (devc-&gt;base)</div><div class='del'>-#define	COMDPORT   (devc-&gt;base+1)</div><div class='del'>-#define	STATPORT   (devc-&gt;base+1)</div><div class='del'>-</div><div class='del'>-static int uart401_status(uart401_devc * devc)</div><div class='del'>-{</div><div class='del'>-	return inb(STATPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define input_avail(devc) (!(uart401_status(devc)&amp;INPUT_AVAIL))</div><div class='del'>-#define output_ready(devc)	(!(uart401_status(devc)&amp;OUTPUT_READY))</div><div class='del'>-</div><div class='del'>-static void uart401_cmd(uart401_devc * devc, unsigned char cmd)</div><div class='del'>-{</div><div class='del'>-	outb((cmd), COMDPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uart401_read(uart401_devc * devc)</div><div class='del'>-{</div><div class='del'>-	return inb(DATAPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uart401_write(uart401_devc * devc, unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	outb((byte), DATAPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define	OUTPUT_READY	0x40</div><div class='del'>-#define	INPUT_AVAIL	0x80</div><div class='del'>-#define	MPU_ACK		0xFE</div><div class='del'>-#define	MPU_RESET	0xFF</div><div class='del'>-#define	UART_MODE_ON	0x3F</div><div class='del'>-</div><div class='del'>-static int      reset_uart401(uart401_devc * devc);</div><div class='del'>-static void     enter_uart_mode(uart401_devc * devc);</div><div class='del'>-</div><div class='del'>-static void uart401_input_loop(uart401_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int work_limit=30000;</div><div class='del'>-	</div><div class='del'>-	while (input_avail(devc) &amp;&amp; --work_limit)</div><div class='del'>-	{</div><div class='del'>-		unsigned char   c = uart401_read(devc);</div><div class='del'>-</div><div class='del'>-		if (c == MPU_ACK)</div><div class='del'>-			devc-&gt;input_byte = c;</div><div class='del'>-		else if (devc-&gt;opened &amp; OPEN_READ &amp;&amp; devc-&gt;midi_input_intr)</div><div class='del'>-			devc-&gt;midi_input_intr(devc-&gt;my_dev, c);</div><div class='del'>-	}</div><div class='del'>-	if(work_limit==0)</div><div class='del'>-		printk(KERN_WARNING "Too much work in interrupt on uart401 (0x%X). UART jabbering ??\n", devc-&gt;base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-irqreturn_t uart401intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	uart401_devc *devc = dev_id;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "uart401: bad devc\n");</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (input_avail(devc))</div><div class='del'>-		uart401_input_loop(devc);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-uart401_open(int dev, int mode,</div><div class='del'>-	     void            (*input) (int dev, unsigned char data),</div><div class='del'>-	     void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	uart401_devc *devc = (uart401_devc *) midi_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* Flush the UART */</div><div class='del'>-	</div><div class='del'>-	while (input_avail(devc))</div><div class='del'>-		uart401_read(devc);</div><div class='del'>-</div><div class='del'>-	devc-&gt;midi_input_intr = input;</div><div class='del'>-	devc-&gt;opened = mode;</div><div class='del'>-	enter_uart_mode(devc);</div><div class='del'>-	devc-&gt;disabled = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uart401_close(int dev)</div><div class='del'>-{</div><div class='del'>-	uart401_devc *devc = (uart401_devc *) midi_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	reset_uart401(devc);</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uart401_out(int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	int timeout;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	uart401_devc *devc = (uart401_devc *) midi_devs[dev]-&gt;devc;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;disabled)</div><div class='del'>-		return 1;</div><div class='del'>-	/*</div><div class='del'>-	 * Test for input since pending input seems to block the output.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);	</div><div class='del'>-	if (input_avail(devc))</div><div class='del'>-		uart401_input_loop(devc);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sometimes it takes about 13000 loops before the output becomes ready</div><div class='del'>-	 * (After reset). Normally it takes just about 10 loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(devc); timeout--);</div><div class='del'>-</div><div class='del'>-	if (!output_ready(devc))</div><div class='del'>-	{</div><div class='del'>-		  printk(KERN_WARNING "uart401: Timeout - Device not responding\n");</div><div class='del'>-		  devc-&gt;disabled = 1;</div><div class='del'>-		  reset_uart401(devc);</div><div class='del'>-		  enter_uart_mode(devc);</div><div class='del'>-		  return 1;</div><div class='del'>-	}</div><div class='del'>-	uart401_write(devc, midi_byte);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart401_start_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart401_end_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void uart401_kick(int dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart401_buffer_status(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"MPU-401 UART"</div><div class='del'>-#define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static const struct midi_operations uart401_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"MPU-401 (UART) MIDI", 0, 0, SNDCARD_MPU401},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= uart401_open,</div><div class='del'>-	.close		= uart401_close,</div><div class='del'>-	.outputc	= uart401_out,</div><div class='del'>-	.start_read	= uart401_start_read,</div><div class='del'>-	.end_read	= uart401_end_read,</div><div class='del'>-	.kick		= uart401_kick,</div><div class='del'>-	.buffer_status	= uart401_buffer_status,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void enter_uart_mode(uart401_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int ok, timeout;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);	</div><div class='del'>-	for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(devc); timeout--);</div><div class='del'>-</div><div class='del'>-	devc-&gt;input_byte = 0;</div><div class='del'>-	uart401_cmd(devc, UART_MODE_ON);</div><div class='del'>-</div><div class='del'>-	ok = 0;</div><div class='del'>-	for (timeout = 50000; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-		if (devc-&gt;input_byte == MPU_ACK)</div><div class='del'>-			ok = 1;</div><div class='del'>-		else if (input_avail(devc))</div><div class='del'>-			if (uart401_read(devc) == MPU_ACK)</div><div class='del'>-				ok = 1;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reset_uart401(uart401_devc * devc)</div><div class='del'>-{</div><div class='del'>-	int ok, timeout, n;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send the RESET command. Try again if no success at the first time.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ok = 0;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; 2 &amp;&amp; !ok; n++)</div><div class='del'>-	{</div><div class='del'>-		for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(devc); timeout--);</div><div class='del'>-		devc-&gt;input_byte = 0;</div><div class='del'>-		uart401_cmd(devc, MPU_RESET);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Wait at least 25 msec. This method is not accurate so let's make the</div><div class='del'>-		 * loop bit longer. Cannot sleep since this is called during boot.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		for (timeout = 50000; timeout &gt; 0 &amp;&amp; !ok; timeout--)</div><div class='del'>-		{</div><div class='del'>-			if (devc-&gt;input_byte == MPU_ACK)	/* Interrupt */</div><div class='del'>-				ok = 1;</div><div class='del'>-			else if (input_avail(devc))</div><div class='del'>-			{</div><div class='del'>-				if (uart401_read(devc) == MPU_ACK)</div><div class='del'>-					ok = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (ok)</div><div class='del'>-	{</div><div class='del'>-		DEB(printk("Reset UART401 OK\n"));</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		DDB(printk("Reset UART401 failed - No hardware detected.\n"));</div><div class='del'>-</div><div class='del'>-	if (ok)</div><div class='del'>-		uart401_input_loop(devc);	/*</div><div class='del'>-						 * Flush input before enabling interrupts</div><div class='del'>-						 */</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int probe_uart401(struct address_info *hw_config, struct module *owner)</div><div class='del'>-{</div><div class='del'>-	uart401_devc *devc;</div><div class='del'>-	char *name = "MPU-401 (UART) MIDI";</div><div class='del'>-	int ok = 0;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	DDB(printk("Entered probe_uart401()\n"));</div><div class='del'>-</div><div class='del'>-	/* Default to "not found" */</div><div class='del'>-	hw_config-&gt;slots[4] = -1;</div><div class='del'>-</div><div class='del'>-	if (!request_region(hw_config-&gt;io_base, 4, "MPU-401 UART")) {</div><div class='del'>-		printk(KERN_INFO "uart401: could not request_region(%d, 4)\n", hw_config-&gt;io_base);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc = kmalloc(sizeof(uart401_devc), GFP_KERNEL);</div><div class='del'>-	if (!devc) {</div><div class='del'>-		printk(KERN_WARNING "uart401: Can't allocate memory\n");</div><div class='del'>-		goto cleanup_region;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;base = hw_config-&gt;io_base;</div><div class='del'>-	devc-&gt;irq = hw_config-&gt;irq;</div><div class='del'>-	devc-&gt;osp = hw_config-&gt;osp;</div><div class='del'>-	devc-&gt;midi_input_intr = NULL;</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	devc-&gt;input_byte = 0;</div><div class='del'>-	devc-&gt;my_dev = 0;</div><div class='del'>-	devc-&gt;share_irq = 0;</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);	</div><div class='del'>-	ok = reset_uart401(devc);</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (!ok)</div><div class='del'>-		goto cleanup_devc;</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;name)</div><div class='del'>-		name = hw_config-&gt;name;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;irq &lt; 0) {</div><div class='del'>-		devc-&gt;share_irq = 1;</div><div class='del'>-		devc-&gt;irq *= -1;</div><div class='del'>-	} else</div><div class='del'>-		devc-&gt;share_irq = 0;</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;share_irq)</div><div class='del'>-		if (request_irq(devc-&gt;irq, uart401intr, 0, "MPU-401 UART", devc) &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "uart401: Failed to allocate IRQ%d\n", devc-&gt;irq);</div><div class='del'>-			devc-&gt;share_irq = 1;</div><div class='del'>-		}</div><div class='del'>-	devc-&gt;my_dev = sound_alloc_mididev();</div><div class='del'>-	enter_uart_mode(devc);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;my_dev == -1) {</div><div class='del'>-		printk(KERN_INFO "uart401: Too many midi devices detected\n");</div><div class='del'>-		goto cleanup_irq;</div><div class='del'>-	}</div><div class='del'>-	conf_printf(name, hw_config);</div><div class='del'>-	midi_devs[devc-&gt;my_dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);</div><div class='del'>-	if (!midi_devs[devc-&gt;my_dev]) {</div><div class='del'>-		printk(KERN_ERR "uart401: Failed to allocate memory\n");</div><div class='del'>-		goto cleanup_unload_mididev;</div><div class='del'>-	}</div><div class='del'>-	memcpy(midi_devs[devc-&gt;my_dev], &amp;uart401_operations, sizeof(struct midi_operations));</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-		midi_devs[devc-&gt;my_dev]-&gt;owner = owner;</div><div class='del'>-	</div><div class='del'>-	midi_devs[devc-&gt;my_dev]-&gt;devc = devc;</div><div class='del'>-	midi_devs[devc-&gt;my_dev]-&gt;converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);</div><div class='del'>-	if (!midi_devs[devc-&gt;my_dev]-&gt;converter) {</div><div class='del'>-		printk(KERN_WARNING "uart401: Failed to allocate memory\n");</div><div class='del'>-		goto cleanup_midi_devs;</div><div class='del'>-	}</div><div class='del'>-	memcpy(midi_devs[devc-&gt;my_dev]-&gt;converter, &amp;std_midi_synth, sizeof(struct synth_operations));</div><div class='del'>-	strcpy(midi_devs[devc-&gt;my_dev]-&gt;info.name, name);</div><div class='del'>-	midi_devs[devc-&gt;my_dev]-&gt;converter-&gt;id = "UART401";</div><div class='del'>-	midi_devs[devc-&gt;my_dev]-&gt;converter-&gt;midi_dev = devc-&gt;my_dev;</div><div class='del'>-</div><div class='del'>-	if (owner)</div><div class='del'>-		midi_devs[devc-&gt;my_dev]-&gt;converter-&gt;owner = owner;</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[4] = devc-&gt;my_dev;</div><div class='del'>-	sequencer_init();</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	return 1;</div><div class='del'>-cleanup_midi_devs:</div><div class='del'>-	kfree(midi_devs[devc-&gt;my_dev]);</div><div class='del'>-cleanup_unload_mididev:</div><div class='del'>-	sound_unload_mididev(devc-&gt;my_dev);</div><div class='del'>-cleanup_irq:</div><div class='del'>-	if (!devc-&gt;share_irq)</div><div class='del'>-		free_irq(devc-&gt;irq, devc);</div><div class='del'>-cleanup_devc:</div><div class='del'>-	kfree(devc);</div><div class='del'>-cleanup_region:</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void unload_uart401(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	uart401_devc *devc;</div><div class='del'>-	int n=hw_config-&gt;slots[4];</div><div class='del'>-	</div><div class='del'>-	/* Not set up */</div><div class='del'>-	if(n==-1 || midi_devs[n]==NULL)</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='del'>-	/* Not allocated (erm ??) */</div><div class='del'>-	</div><div class='del'>-	devc = midi_devs[hw_config-&gt;slots[4]]-&gt;devc;</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	reset_uart401(devc);</div><div class='del'>-	release_region(hw_config-&gt;io_base, 4);</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;share_irq)</div><div class='del'>-		free_irq(devc-&gt;irq, devc);</div><div class='del'>-	if (devc)</div><div class='del'>-	{</div><div class='del'>-		kfree(midi_devs[devc-&gt;my_dev]-&gt;converter);</div><div class='del'>-		kfree(midi_devs[devc-&gt;my_dev]);</div><div class='del'>-		kfree(devc);</div><div class='del'>-		devc = NULL;</div><div class='del'>-	}</div><div class='del'>-	/* This kills midi_devs[x] */</div><div class='del'>-	sound_unload_mididev(hw_config-&gt;slots[4]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(probe_uart401);</div><div class='del'>-EXPORT_SYMBOL(unload_uart401);</div><div class='del'>-EXPORT_SYMBOL(uart401intr);</div><div class='del'>-</div><div class='del'>-static struct address_info cfg_mpu;</div><div class='del'>-</div><div class='del'>-static int io = -1;</div><div class='del'>-static int irq = -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0444);</div><div class='del'>-module_param(irq, int, 0444);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init init_uart401(void)</div><div class='del'>-{</div><div class='del'>-	cfg_mpu.irq = irq;</div><div class='del'>-	cfg_mpu.io_base = io;</div><div class='del'>-</div><div class='del'>-	/* Can be loaded either for module use or to provide functions</div><div class='del'>-	   to others */</div><div class='del'>-	if (cfg_mpu.io_base != -1 &amp;&amp; cfg_mpu.irq != -1) {</div><div class='del'>-		printk(KERN_INFO "MPU-401 UART driver Copyright (C) Hannu Savolainen 1993-1997");</div><div class='del'>-		if (!probe_uart401(&amp;cfg_mpu, THIS_MODULE))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_uart401(void)</div><div class='del'>-{</div><div class='del'>-	if (cfg_mpu.io_base != -1 &amp;&amp; cfg_mpu.irq != -1)</div><div class='del'>-		unload_uart401(&amp;cfg_mpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_uart401);</div><div class='del'>-module_exit(cleanup_uart401);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_uart401(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq */</div><div class='del'>-	int ints[3];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	io = ints[1];</div><div class='del'>-	irq = ints[2];</div><div class='del'>-	</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("uart401=", setup_uart401);</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c<br/>deleted file mode 100644<br/>index f3f914aa92ee..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/uart6850.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/uart6850.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,361 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/uart6850.c</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- * Extended by Alan Cox for Red Hat Software. Now a loadable MIDI driver.</div><div class='del'>- * 28/4/97 - (C) Copyright Alan Cox. Released under the GPL version 2.</div><div class='del'>- *</div><div class='del'>- * Alan Cox:		Updated for new modular code. Removed snd_* irq handling. Now</div><div class='del'>- *			uses native linux resources</div><div class='del'>- * Christoph Hellwig:	Adapted to module_init/module_exit</div><div class='del'>- * Jeff Garzik:		Made it work again, in theory</div><div class='del'>- *			FIXME: If the request_irq() succeeds, the probe succeeds. Ug.</div><div class='del'>- *</div><div class='del'>- *	Status: Testing required (no shit -jgarzik)</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-/* Mon Nov 22 22:38:35 MET 1993 marco@driq.home.usn.nl:</div><div class='del'>- *      added 6850 support, used with COVOX SoundMaster II and custom cards.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-static int uart6850_base = 0x330;</div><div class='del'>-</div><div class='del'>-static int *uart6850_osp;</div><div class='del'>-</div><div class='del'>-#define	DATAPORT   (uart6850_base)</div><div class='del'>-#define	COMDPORT   (uart6850_base+1)</div><div class='del'>-#define	STATPORT   (uart6850_base+1)</div><div class='del'>-</div><div class='del'>-static int uart6850_status(void)</div><div class='del'>-{</div><div class='del'>-	return inb(STATPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define input_avail()		(uart6850_status()&amp;INPUT_AVAIL)</div><div class='del'>-#define output_ready()		(uart6850_status()&amp;OUTPUT_READY)</div><div class='del'>-</div><div class='del'>-static void uart6850_cmd(unsigned char cmd)</div><div class='del'>-{</div><div class='del'>-	outb(cmd, COMDPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uart6850_read(void)</div><div class='del'>-{</div><div class='del'>-	return inb(DATAPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uart6850_write(unsigned char byte)</div><div class='del'>-{</div><div class='del'>-	outb(byte, DATAPORT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define	OUTPUT_READY	0x02	/* Mask for data ready Bit */</div><div class='del'>-#define	INPUT_AVAIL	0x01	/* Mask for Data Send Ready Bit */</div><div class='del'>-</div><div class='del'>-#define	UART_RESET	0x95</div><div class='del'>-#define	UART_MODE_ON	0x03</div><div class='del'>-</div><div class='del'>-static int uart6850_opened;</div><div class='del'>-static int uart6850_irq;</div><div class='del'>-static int uart6850_detected;</div><div class='del'>-static int my_dev;</div><div class='del'>-static DEFINE_SPINLOCK(lock);</div><div class='del'>-</div><div class='del'>-static void (*midi_input_intr) (int dev, unsigned char data);</div><div class='del'>-static void poll_uart6850(unsigned long dummy);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static DEFINE_TIMER(uart6850_timer, poll_uart6850, 0, 0);</div><div class='del'>-</div><div class='del'>-static void uart6850_input_loop(void)</div><div class='del'>-{</div><div class='del'>-	int count = 10;</div><div class='del'>-</div><div class='del'>-	while (count)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * Not timed out</div><div class='del'>-		 */</div><div class='del'>-		if (input_avail())</div><div class='del'>-		{</div><div class='del'>-			unsigned char c = uart6850_read();</div><div class='del'>-			count = 100;</div><div class='del'>-			if (uart6850_opened &amp; OPEN_READ)</div><div class='del'>-				midi_input_intr(my_dev, c);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-		{</div><div class='del'>-			while (!input_avail() &amp;&amp; count)</div><div class='del'>-				count--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t m6850intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	if (input_avail())</div><div class='del'>-		uart6850_input_loop();</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	It looks like there is no input interrupts in the UART mode. Let's try</div><div class='del'>- *	polling.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void poll_uart6850(unsigned long dummy)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (!(uart6850_opened &amp; OPEN_READ))</div><div class='del'>-		return;		/* Device has been closed */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-	if (input_avail())</div><div class='del'>-		uart6850_input_loop();</div><div class='del'>-</div><div class='del'>-	uart6850_timer.expires = 1 + jiffies;</div><div class='del'>-	add_timer(&amp;uart6850_timer);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 *	Come back later</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uart6850_open(int dev, int mode,</div><div class='del'>-	      void            (*input) (int dev, unsigned char data),</div><div class='del'>-	      void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	if (uart6850_opened)</div><div class='del'>-	{</div><div class='del'>-/*		  printk("Midi6850: Midi busy\n");*/</div><div class='del'>-		  return -EBUSY;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	uart6850_cmd(UART_RESET);</div><div class='del'>-	uart6850_input_loop();</div><div class='del'>-	midi_input_intr = input;</div><div class='del'>-	uart6850_opened = mode;</div><div class='del'>-	poll_uart6850(0);	/*</div><div class='del'>-				 * Enable input polling</div><div class='del'>-				 */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void uart6850_close(int dev)</div><div class='del'>-{</div><div class='del'>-	uart6850_cmd(UART_MODE_ON);</div><div class='del'>-	del_timer(&amp;uart6850_timer);</div><div class='del'>-	uart6850_opened = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int uart6850_out(int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	int timeout;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Test for input since pending input seems to block the output.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	if (input_avail())</div><div class='del'>-		uart6850_input_loop();</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Sometimes it takes about 13000 loops before the output becomes ready</div><div class='del'>-	 * (After reset). Normally it takes just about 10 loops.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(); timeout--);	/*</div><div class='del'>-										 * Wait</div><div class='del'>-										 */</div><div class='del'>-	if (!output_ready())</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "Midi6850: Timeout\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	uart6850_write(midi_byte);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart6850_command(int dev, unsigned char *midi_byte)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart6850_start_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart6850_end_read(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void uart6850_kick(int dev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int uart6850_buffer_status(int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;		/*</div><div class='del'>-				 * No data in buffers</div><div class='del'>-				 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"6850 UART Midi"</div><div class='del'>-#define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static struct midi_operations uart6850_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"6850 UART", 0, 0, SNDCARD_UART6850},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= uart6850_open,</div><div class='del'>-	.close		= uart6850_close,</div><div class='del'>-	.outputc	= uart6850_out,</div><div class='del'>-	.start_read	= uart6850_start_read,</div><div class='del'>-	.end_read	= uart6850_end_read,</div><div class='del'>-	.kick		= uart6850_kick,</div><div class='del'>-	.command	= uart6850_command,</div><div class='del'>-	.buffer_status	= uart6850_buffer_status</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __init attach_uart6850(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int ok, timeout;</div><div class='del'>-	unsigned long   flags;</div><div class='del'>-</div><div class='del'>-	if (!uart6850_detected)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((my_dev = sound_alloc_mididev()) == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_INFO "uart6850: Too many midi devices detected\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	uart6850_base = hw_config-&gt;io_base;</div><div class='del'>-	uart6850_osp = hw_config-&gt;osp;</div><div class='del'>-	uart6850_irq = hw_config-&gt;irq;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	for (timeout = 30000; timeout &gt; 0 &amp;&amp; !output_ready(); timeout--);	/*</div><div class='del'>-										 * Wait</div><div class='del'>-										 */</div><div class='del'>-	uart6850_cmd(UART_MODE_ON);</div><div class='del'>-	ok = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;lock,flags);</div><div class='del'>-</div><div class='del'>-	conf_printf("6850 Midi Interface", hw_config);</div><div class='del'>-</div><div class='del'>-	std_midi_synth.midi_dev = my_dev;</div><div class='del'>-	hw_config-&gt;slots[4] = my_dev;</div><div class='del'>-	midi_devs[my_dev] = &amp;uart6850_operations;</div><div class='del'>-	sequencer_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int reset_uart6850(void)</div><div class='del'>-{</div><div class='del'>-	uart6850_read();</div><div class='del'>-	return 1;		/*</div><div class='del'>-				 * OK</div><div class='del'>-				 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_uart6850(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int ok;</div><div class='del'>-</div><div class='del'>-	uart6850_osp = hw_config-&gt;osp;</div><div class='del'>-	uart6850_base = hw_config-&gt;io_base;</div><div class='del'>-	uart6850_irq = hw_config-&gt;irq;</div><div class='del'>-</div><div class='del'>-	if (request_irq(uart6850_irq, m6850intr, 0, "MIDI6850", NULL) &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	ok = reset_uart6850();</div><div class='del'>-	uart6850_detected = ok;</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_uart6850(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	free_irq(hw_config-&gt;irq, NULL);</div><div class='del'>-	sound_unload_mididev(hw_config-&gt;slots[4]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct address_info cfg_mpu;</div><div class='del'>-</div><div class='del'>-static int __initdata io = -1;</div><div class='del'>-static int __initdata irq = -1;</div><div class='del'>-</div><div class='del'>-module_param(io, int, 0);</div><div class='del'>-module_param(irq, int, 0);</div><div class='del'>-</div><div class='del'>-static int __init init_uart6850(void)</div><div class='del'>-{</div><div class='del'>-	cfg_mpu.io_base = io;</div><div class='del'>-	cfg_mpu.irq = irq;</div><div class='del'>-</div><div class='del'>-	if (cfg_mpu.io_base == -1 || cfg_mpu.irq == -1) {</div><div class='del'>-		printk(KERN_INFO "uart6850: irq and io must be set.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (probe_uart6850(&amp;cfg_mpu))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	attach_uart6850(&amp;cfg_mpu);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_uart6850(void)</div><div class='del'>-{</div><div class='del'>-	unload_uart6850(&amp;cfg_mpu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_uart6850);</div><div class='del'>-module_exit(cleanup_uart6850);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_uart6850(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq */</div><div class='del'>-	int ints[3];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	</div><div class='del'>-	io = ints[1];</div><div class='del'>-	irq = ints[2];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("uart6850=", setup_uart6850);</div><div class='del'>-#endif</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/ulaw.h b/sound/oss/ulaw.h<br/>deleted file mode 100644<br/>index 0ff8c0a3bda0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/ulaw.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/ulaw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-static unsigned char ulaw_dsp[] = {</div><div class='del'>-     3,    7,   11,   15,   19,   23,   27,   31,</div><div class='del'>-    35,   39,   43,   47,   51,   55,   59,   63,</div><div class='del'>-    66,   68,   70,   72,   74,   76,   78,   80,</div><div class='del'>-    82,   84,   86,   88,   90,   92,   94,   96,</div><div class='del'>-    98,   99,  100,  101,  102,  103,  104,  105,</div><div class='del'>-   106,  107,  108,  109,  110,  111,  112,  113,</div><div class='del'>-   113,  114,  114,  115,  115,  116,  116,  117,</div><div class='del'>-   117,  118,  118,  119,  119,  120,  120,  121,</div><div class='del'>-   121,  121,  122,  122,  122,  122,  123,  123,</div><div class='del'>-   123,  123,  124,  124,  124,  124,  125,  125,</div><div class='del'>-   125,  125,  125,  125,  126,  126,  126,  126,</div><div class='del'>-   126,  126,  126,  126,  127,  127,  127,  127,</div><div class='del'>-   127,  127,  127,  127,  127,  127,  127,  127,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-   253,  249,  245,  241,  237,  233,  229,  225,</div><div class='del'>-   221,  217,  213,  209,  205,  201,  197,  193,</div><div class='del'>-   190,  188,  186,  184,  182,  180,  178,  176,</div><div class='del'>-   174,  172,  170,  168,  166,  164,  162,  160,</div><div class='del'>-   158,  157,  156,  155,  154,  153,  152,  151,</div><div class='del'>-   150,  149,  148,  147,  146,  145,  144,  143,</div><div class='del'>-   143,  142,  142,  141,  141,  140,  140,  139,</div><div class='del'>-   139,  138,  138,  137,  137,  136,  136,  135,</div><div class='del'>-   135,  135,  134,  134,  134,  134,  133,  133,</div><div class='del'>-   133,  133,  132,  132,  132,  132,  131,  131,</div><div class='del'>-   131,  131,  131,  131,  130,  130,  130,  130,</div><div class='del'>-   130,  130,  130,  130,  129,  129,  129,  129,</div><div class='del'>-   129,  129,  129,  129,  129,  129,  129,  129,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-   128,  128,  128,  128,  128,  128,  128,  128,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char dsp_ulaw[] = {</div><div class='del'>-     0,    0,    0,    0,    0,    1,    1,    1,</div><div class='del'>-     1,    2,    2,    2,    2,    3,    3,    3,</div><div class='del'>-     3,    4,    4,    4,    4,    5,    5,    5,</div><div class='del'>-     5,    6,    6,    6,    6,    7,    7,    7,</div><div class='del'>-     7,    8,    8,    8,    8,    9,    9,    9,</div><div class='del'>-     9,   10,   10,   10,   10,   11,   11,   11,</div><div class='del'>-    11,   12,   12,   12,   12,   13,   13,   13,</div><div class='del'>-    13,   14,   14,   14,   14,   15,   15,   15,</div><div class='del'>-    15,   16,   16,   17,   17,   18,   18,   19,</div><div class='del'>-    19,   20,   20,   21,   21,   22,   22,   23,</div><div class='del'>-    23,   24,   24,   25,   25,   26,   26,   27,</div><div class='del'>-    27,   28,   28,   29,   29,   30,   30,   31,</div><div class='del'>-    31,   32,   33,   34,   35,   36,   37,   38,</div><div class='del'>-    39,   40,   41,   42,   43,   44,   45,   46,</div><div class='del'>-    47,   49,   51,   53,   55,   57,   59,   61,</div><div class='del'>-    63,   66,   70,   74,   78,   84,   92,  104,</div><div class='del'>-   254,  231,  219,  211,  205,  201,  197,  193,</div><div class='del'>-   190,  188,  186,  184,  182,  180,  178,  176,</div><div class='del'>-   175,  174,  173,  172,  171,  170,  169,  168,</div><div class='del'>-   167,  166,  165,  164,  163,  162,  161,  160,</div><div class='del'>-   159,  159,  158,  158,  157,  157,  156,  156,</div><div class='del'>-   155,  155,  154,  154,  153,  153,  152,  152,</div><div class='del'>-   151,  151,  150,  150,  149,  149,  148,  148,</div><div class='del'>-   147,  147,  146,  146,  145,  145,  144,  144,</div><div class='del'>-   143,  143,  143,  143,  142,  142,  142,  142,</div><div class='del'>-   141,  141,  141,  141,  140,  140,  140,  140,</div><div class='del'>-   139,  139,  139,  139,  138,  138,  138,  138,</div><div class='del'>-   137,  137,  137,  137,  136,  136,  136,  136,</div><div class='del'>-   135,  135,  135,  135,  134,  134,  134,  134,</div><div class='del'>-   133,  133,  133,  133,  132,  132,  132,  132,</div><div class='del'>-   131,  131,  131,  131,  130,  130,  130,  130,</div><div class='del'>-   129,  129,  129,  129,  128,  128,  128,  128,</div><div class='del'>-};</div><div class='head'>diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c<br/>deleted file mode 100644<br/>index f0b4151d9b17..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/v_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/v_midi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,290 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * sound/oss/v_midi.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the Sound Blaster DS chips.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1996</div><div class='del'>- *</div><div class='del'>- * USS/Lite for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- * ??</div><div class='del'>- *</div><div class='del'>- * Changes</div><div class='del'>- *	Alan Cox		Modularisation, changed memory allocations</div><div class='del'>- *	Christoph Hellwig	Adapted to module_init/module_exit</div><div class='del'>- *</div><div class='del'>- * Status</div><div class='del'>- *	Untested</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-#include "v_midi.h"</div><div class='del'>-</div><div class='del'>-static vmidi_devc *v_devc[2] = { NULL, NULL};</div><div class='del'>-static int midi1,midi2;</div><div class='del'>-static void *midi_mem = NULL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The DSP channel can be used either for input or output. Variable</div><div class='del'>- * 'sb_irq_mode' will be set when the program calls read or write first time</div><div class='del'>- * after open. Current version doesn't support mode changes without closing</div><div class='del'>- * and reopening the device. Support for this feature may be implemented in a</div><div class='del'>- * future version of this driver.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int v_midi_open (int dev, int mode,</div><div class='del'>-	      void            (*input) (int dev, unsigned char data),</div><div class='del'>-	      void            (*output) (int dev)</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	vmidi_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return -(ENXIO);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	if (devc-&gt;opened)</div><div class='del'>-	{</div><div class='del'>-		spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-		return -(EBUSY);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;opened = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-</div><div class='del'>-	devc-&gt;intr_active = 1;</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_READ)</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;input_opened = 1;</div><div class='del'>-		devc-&gt;midi_input_intr = input;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void v_midi_close (int dev)</div><div class='del'>-{</div><div class='del'>-	vmidi_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;devc-&gt;lock,flags);</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	devc-&gt;input_opened = 0;</div><div class='del'>-	devc-&gt;opened = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;devc-&gt;lock,flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int v_midi_out (int dev, unsigned char midi_byte)</div><div class='del'>-{</div><div class='del'>-	vmidi_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	vmidi_devc *pdevc;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	pdevc = midi_devs[devc-&gt;pair_mididev]-&gt;devc;</div><div class='del'>-	if (pdevc-&gt;input_opened &gt; 0){</div><div class='del'>-		if (MIDIbuf_avail(pdevc-&gt;my_mididev) &gt; 500)</div><div class='del'>-			return 0;</div><div class='del'>-		pdevc-&gt;midi_input_intr (pdevc-&gt;my_mididev, midi_byte);</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int v_midi_start_read (int dev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int v_midi_end_read (int dev)</div><div class='del'>-{</div><div class='del'>-	vmidi_devc *devc = midi_devs[dev]-&gt;devc;</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc-&gt;intr_active = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* why -EPERM and not -EINVAL?? */</div><div class='del'>-</div><div class='del'>-static inline int v_midi_ioctl (int dev, unsigned cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	return -EPERM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define MIDI_SYNTH_NAME	"Loopback MIDI"</div><div class='del'>-#define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT</div><div class='del'>-</div><div class='del'>-#include "midi_synth.h"</div><div class='del'>-</div><div class='del'>-static struct midi_operations v_midi_operations =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"Loopback MIDI Port 1", 0, 0, SNDCARD_VMIDI},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= v_midi_open,</div><div class='del'>-	.close		= v_midi_close,</div><div class='del'>-	.ioctl		= v_midi_ioctl,</div><div class='del'>-	.outputc	= v_midi_out,</div><div class='del'>-	.start_read	= v_midi_start_read,</div><div class='del'>-	.end_read	= v_midi_end_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct midi_operations v_midi_operations2 =</div><div class='del'>-{</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.info		= {"Loopback MIDI Port 2", 0, 0, SNDCARD_VMIDI},</div><div class='del'>-	.converter	= &amp;std_midi_synth,</div><div class='del'>-	.in_info	= {0},</div><div class='del'>-	.open		= v_midi_open,</div><div class='del'>-	.close		= v_midi_close,</div><div class='del'>-	.ioctl		= v_midi_ioctl,</div><div class='del'>-	.outputc	= v_midi_out,</div><div class='del'>-	.start_read	= v_midi_start_read,</div><div class='del'>-	.end_read	= v_midi_end_read,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	We kmalloc just one of these - it makes life simpler and the code</div><div class='del'>- *	cleaner and the memory handling far more efficient</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-struct vmidi_memory</div><div class='del'>-{</div><div class='del'>-	/* Must be first */</div><div class='del'>-	struct midi_operations m_ops[2];</div><div class='del'>-	struct synth_operations s_ops[2];</div><div class='del'>-	struct vmidi_devc v_ops[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __init attach_v_midi (struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	struct vmidi_memory *m;</div><div class='del'>-	/* printk("Attaching v_midi device.....\n"); */</div><div class='del'>-</div><div class='del'>-	midi1 = sound_alloc_mididev();</div><div class='del'>-	if (midi1 == -1)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "v_midi: Too many midi devices detected\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	m = kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);</div><div class='del'>-	if (m == NULL)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_WARNING "Loopback MIDI: Failed to allocate memory\n");</div><div class='del'>-		sound_unload_mididev(midi1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	midi_mem = m;</div><div class='del'>-	</div><div class='del'>-	midi_devs[midi1] = &amp;m-&gt;m_ops[0];</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	midi2 = sound_alloc_mididev();</div><div class='del'>-	if (midi2 == -1)</div><div class='del'>-	{</div><div class='del'>-		printk (KERN_ERR "v_midi: Too many midi devices detected\n");</div><div class='del'>-		kfree(m);</div><div class='del'>-		sound_unload_mididev(midi1);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	midi_devs[midi2] = &amp;m-&gt;m_ops[1];</div><div class='del'>-</div><div class='del'>-	/* printk("VMIDI1: %d   VMIDI2: %d\n",midi1,midi2); */</div><div class='del'>-</div><div class='del'>-	/* for MIDI-1 */</div><div class='del'>-	v_devc[0] = &amp;m-&gt;v_ops[0];</div><div class='del'>-	memcpy ((char *) midi_devs[midi1], (char *) &amp;v_midi_operations,</div><div class='del'>-		sizeof (struct midi_operations));</div><div class='del'>-</div><div class='del'>-	v_devc[0]-&gt;my_mididev = midi1;</div><div class='del'>-	v_devc[0]-&gt;pair_mididev = midi2;</div><div class='del'>-	v_devc[0]-&gt;opened = v_devc[0]-&gt;input_opened = 0;</div><div class='del'>-	v_devc[0]-&gt;intr_active = 0;</div><div class='del'>-	v_devc[0]-&gt;midi_input_intr = NULL;</div><div class='del'>-	spin_lock_init(&amp;v_devc[0]-&gt;lock);</div><div class='del'>-</div><div class='del'>-	midi_devs[midi1]-&gt;devc = v_devc[0];</div><div class='del'>-</div><div class='del'>-	midi_devs[midi1]-&gt;converter = &amp;m-&gt;s_ops[0];</div><div class='del'>-	std_midi_synth.midi_dev = midi1;</div><div class='del'>-	memcpy ((char *) midi_devs[midi1]-&gt;converter, (char *) &amp;std_midi_synth,</div><div class='del'>-		sizeof (struct synth_operations));</div><div class='del'>-	midi_devs[midi1]-&gt;converter-&gt;id = "V_MIDI 1";</div><div class='del'>-</div><div class='del'>-	/* for MIDI-2 */</div><div class='del'>-	v_devc[1] = &amp;m-&gt;v_ops[1];</div><div class='del'>-</div><div class='del'>-	memcpy ((char *) midi_devs[midi2], (char *) &amp;v_midi_operations2,</div><div class='del'>-		sizeof (struct midi_operations));</div><div class='del'>-</div><div class='del'>-	v_devc[1]-&gt;my_mididev = midi2;</div><div class='del'>-	v_devc[1]-&gt;pair_mididev = midi1;</div><div class='del'>-	v_devc[1]-&gt;opened = v_devc[1]-&gt;input_opened = 0;</div><div class='del'>-	v_devc[1]-&gt;intr_active = 0;</div><div class='del'>-	v_devc[1]-&gt;midi_input_intr = NULL;</div><div class='del'>-	spin_lock_init(&amp;v_devc[1]-&gt;lock);</div><div class='del'>-</div><div class='del'>-	midi_devs[midi2]-&gt;devc = v_devc[1];</div><div class='del'>-	midi_devs[midi2]-&gt;converter = &amp;m-&gt;s_ops[1];</div><div class='del'>-</div><div class='del'>-	std_midi_synth.midi_dev = midi2;</div><div class='del'>-	memcpy ((char *) midi_devs[midi2]-&gt;converter, (char *) &amp;std_midi_synth,</div><div class='del'>-		sizeof (struct synth_operations));</div><div class='del'>-	midi_devs[midi2]-&gt;converter-&gt;id = "V_MIDI 2";</div><div class='del'>-</div><div class='del'>-	sequencer_init();</div><div class='del'>-	/* printk("Attached v_midi device\n"); */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int __init probe_v_midi(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	return(1);	/* always OK */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit unload_v_midi(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	sound_unload_mididev(midi1);</div><div class='del'>-	sound_unload_mididev(midi2);</div><div class='del'>-	kfree(midi_mem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct address_info cfg; /* dummy */</div><div class='del'>-</div><div class='del'>-static int __init init_vmidi(void)</div><div class='del'>-{</div><div class='del'>-	printk("MIDI Loopback device driver\n");</div><div class='del'>-	if (!probe_v_midi(&amp;cfg))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	attach_v_midi(&amp;cfg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_vmidi(void)</div><div class='del'>-{</div><div class='del'>-	unload_v_midi(&amp;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_vmidi);</div><div class='del'>-module_exit(cleanup_vmidi);</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/v_midi.h b/sound/oss/v_midi.h<br/>deleted file mode 100644<br/>index 08e2185ee816..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/v_midi.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/v_midi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-typedef struct vmidi_devc {</div><div class='del'>-	   int dev;</div><div class='del'>-</div><div class='del'>-	/* State variables */</div><div class='del'>-	   int opened;</div><div class='del'>-	   spinlock_t lock;</div><div class='del'>-</div><div class='del'>-	/* MIDI fields */</div><div class='del'>-	   int my_mididev;</div><div class='del'>-	   int pair_mididev;</div><div class='del'>-	   int input_opened;</div><div class='del'>-	   int intr_active;</div><div class='del'>-	   void (*midi_input_intr) (int dev, unsigned char data);</div><div class='del'>-	} vmidi_devc;</div><div class='head'>diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c<br/>deleted file mode 100644<br/>index f0e0caa53200..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/vidc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,558 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/drivers/sound/vidc.c</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1997-2000 by Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  VIDC20 audio driver.</div><div class='del'>- *</div><div class='del'>- * The VIDC20 sound hardware consists of the VIDC20 itself, a DAC and a DMA</div><div class='del'>- * engine.  The DMA transfers fixed-format (16-bit little-endian linear)</div><div class='del'>- * samples to the VIDC20, which then transfers this data serially to the</div><div class='del'>- * DACs.  The samplerate is controlled by the VIDC.</div><div class='del'>- *</div><div class='del'>- * We currently support a mixer device, but it is currently non-functional.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-#include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "vidc.h"</div><div class='del'>-</div><div class='del'>-#ifndef _SIOC_TYPE</div><div class='del'>-#define _SIOC_TYPE(x)	_IOC_TYPE(x)</div><div class='del'>-#endif</div><div class='del'>-#ifndef _SIOC_NR</div><div class='del'>-#define _SIOC_NR(x)	_IOC_NR(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define VIDC_SOUND_CLOCK	(250000)</div><div class='del'>-#define VIDC_SOUND_CLOCK_EXT	(176400)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * When using SERIAL SOUND mode (external DAC), the number of physical</div><div class='del'>- * channels is fixed at 2.</div><div class='del'>- */</div><div class='del'>-static int		vidc_busy;</div><div class='del'>-static int		vidc_adev;</div><div class='del'>-static int		vidc_audio_rate;</div><div class='del'>-static char		vidc_audio_format;</div><div class='del'>-static char		vidc_audio_channels;</div><div class='del'>-</div><div class='del'>-static unsigned char	vidc_level_l[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-	85,		/* master	*/</div><div class='del'>-	50,		/* bass		*/</div><div class='del'>-	50,		/* treble	*/</div><div class='del'>-	0,		/* synth	*/</div><div class='del'>-	75,		/* pcm		*/</div><div class='del'>-	0,		/* speaker	*/</div><div class='del'>-	100,		/* ext line	*/</div><div class='del'>-	0,		/* mic		*/</div><div class='del'>-	100,		/* CD		*/</div><div class='del'>-	0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char	vidc_level_r[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-	85,		/* master	*/</div><div class='del'>-	50,		/* bass		*/</div><div class='del'>-	50,		/* treble	*/</div><div class='del'>-	0,		/* synth	*/</div><div class='del'>-	75,		/* pcm		*/</div><div class='del'>-	0,		/* speaker	*/</div><div class='del'>-	100,		/* ext line	*/</div><div class='del'>-	0,		/* mic		*/</div><div class='del'>-	100,		/* CD		*/</div><div class='del'>-	0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int	vidc_audio_volume_l;	/* left PCM vol, 0 - 65536 */</div><div class='del'>-static unsigned int	vidc_audio_volume_r;	/* right PCM vol, 0 - 65536 */</div><div class='del'>-</div><div class='del'>-extern void	vidc_update_filler(int bits, int channels);</div><div class='del'>-extern int	softoss_dev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vidc_mixer_set(int mdev, unsigned int level)</div><div class='del'>-{</div><div class='del'>-	unsigned int lev_l = level &amp; 0x007f;</div><div class='del'>-	unsigned int lev_r = (level &amp; 0x7f00) &gt;&gt; 8;</div><div class='del'>-	unsigned int mlev_l, mlev_r;</div><div class='del'>-</div><div class='del'>-	if (lev_l &gt; 100)</div><div class='del'>-		lev_l = 100;</div><div class='del'>-	if (lev_r &gt; 100)</div><div class='del'>-		lev_r = 100;</div><div class='del'>-</div><div class='del'>-#define SCALE(lev,master)	((lev) * (master) * 65536 / 10000)</div><div class='del'>-</div><div class='del'>-	mlev_l = vidc_level_l[SOUND_MIXER_VOLUME];</div><div class='del'>-	mlev_r = vidc_level_r[SOUND_MIXER_VOLUME];</div><div class='del'>-</div><div class='del'>-	switch (mdev) {</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-		vidc_level_l[mdev] = lev_l;</div><div class='del'>-		vidc_level_r[mdev] = lev_r;</div><div class='del'>-</div><div class='del'>-		vidc_audio_volume_l = SCALE(lev_l, mlev_l);</div><div class='del'>-		vidc_audio_volume_r = SCALE(lev_r, mlev_r);</div><div class='del'>-/*printk("VIDC: PCM vol %05X %05X\n", vidc_audio_volume_l, vidc_audio_volume_r);*/</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#undef SCALE</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidc_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned int mdev;</div><div class='del'>-</div><div class='del'>-	if (_SIOC_TYPE(cmd) != 'M')</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mdev = _SIOC_NR(cmd);</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) {</div><div class='del'>-		if (get_user(val, (unsigned int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (mdev &lt; SOUND_MIXER_NRDEVICES)</div><div class='del'>-			vidc_mixer_set(mdev, val);</div><div class='del'>-		else</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Return parameters</div><div class='del'>-	 */</div><div class='del'>-	switch (mdev) {</div><div class='del'>-	case SOUND_MIXER_RECSRC:</div><div class='del'>-		val = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_DEVMASK:</div><div class='del'>-		val = SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_SYNTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_STEREODEVS:</div><div class='del'>-		val = SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_SYNTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECMASK:</div><div class='del'>-		val = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_CAPS:</div><div class='del'>-		val = 0;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		if (mdev &lt; SOUND_MIXER_NRDEVICES)</div><div class='del'>-			val = vidc_level_l[mdev] | vidc_level_r[mdev] &lt;&lt; 8;</div><div class='del'>-		else</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return put_user(val, (unsigned int __user *)arg) ? -EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int vidc_audio_set_format(int dev, unsigned int fmt)</div><div class='del'>-{</div><div class='del'>-	switch (fmt) {</div><div class='del'>-	default:</div><div class='del'>-		fmt = AFMT_S16_LE;</div><div class='del'>-	case AFMT_U8:</div><div class='del'>-	case AFMT_S8:</div><div class='del'>-	case AFMT_S16_LE:</div><div class='del'>-		vidc_audio_format = fmt;</div><div class='del'>-		vidc_update_filler(vidc_audio_format, vidc_audio_channels);</div><div class='del'>-	case AFMT_QUERY:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return vidc_audio_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define my_abs(i) ((i)&lt;0 ? -(i) : (i))</div><div class='del'>-</div><div class='del'>-static int vidc_audio_set_speed(int dev, int rate)</div><div class='del'>-{</div><div class='del'>-	if (rate) {</div><div class='del'>-		unsigned int hwctrl, hwrate, hwrate_ext, rate_int, rate_ext;</div><div class='del'>-		unsigned int diff_int, diff_ext;</div><div class='del'>-		unsigned int newsize, new2size;</div><div class='del'>-</div><div class='del'>-		hwctrl = 0x00000003;</div><div class='del'>-</div><div class='del'>-		/* Using internal clock */</div><div class='del'>-		hwrate = (((VIDC_SOUND_CLOCK * 2) / rate) + 1) &gt;&gt; 1;</div><div class='del'>-		if (hwrate &lt; 3)</div><div class='del'>-			hwrate = 3;</div><div class='del'>-		if (hwrate &gt; 255)</div><div class='del'>-			hwrate = 255;</div><div class='del'>-</div><div class='del'>-		/* Using exernal clock */</div><div class='del'>-		hwrate_ext = (((VIDC_SOUND_CLOCK_EXT * 2) / rate) + 1) &gt;&gt; 1;</div><div class='del'>-		if (hwrate_ext &lt; 3)</div><div class='del'>-			hwrate_ext = 3;</div><div class='del'>-		if (hwrate_ext &gt; 255)</div><div class='del'>-			hwrate_ext = 255;</div><div class='del'>-</div><div class='del'>-		rate_int = VIDC_SOUND_CLOCK / hwrate;</div><div class='del'>-		rate_ext = VIDC_SOUND_CLOCK_EXT / hwrate_ext;</div><div class='del'>-</div><div class='del'>-		/* Chose between external and internal clock */</div><div class='del'>-		diff_int = my_abs(rate_ext-rate);</div><div class='del'>-		diff_ext = my_abs(rate_int-rate);</div><div class='del'>-		if (diff_ext &lt; diff_int) {</div><div class='del'>-			/*printk("VIDC: external %d %d %d\n", rate, rate_ext, hwrate_ext);*/</div><div class='del'>-			hwrate=hwrate_ext;</div><div class='del'>-			hwctrl=0x00000002;</div><div class='del'>-			/* Allow roughly 0.4% tolerance */</div><div class='del'>-			if (diff_ext &gt; (rate/256))</div><div class='del'>-				rate=rate_ext;</div><div class='del'>-		} else {</div><div class='del'>-			/*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/</div><div class='del'>-			hwctrl=0x00000003;</div><div class='del'>-			/* Allow rougly 0.4% tolerance */</div><div class='del'>-			if (diff_int &gt; (rate/256))</div><div class='del'>-				rate=rate_int;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vidc_writel(0xb0000000 | (hwrate - 2));</div><div class='del'>-		vidc_writel(0xb1000000 | hwctrl);</div><div class='del'>-</div><div class='del'>-		newsize = (10000 / hwrate) &amp; ~3;</div><div class='del'>-		if (newsize &lt; 208)</div><div class='del'>-			newsize = 208;</div><div class='del'>-		if (newsize &gt; 4096)</div><div class='del'>-			newsize = 4096;</div><div class='del'>-		for (new2size = 128; new2size &lt; newsize; new2size &lt;&lt;= 1);</div><div class='del'>-		if (new2size - newsize &gt; newsize - (new2size &gt;&gt; 1))</div><div class='del'>-			new2size &gt;&gt;= 1;</div><div class='del'>-		if (new2size &gt; 4096) {</div><div class='del'>-			printk(KERN_ERR "VIDC: error: dma buffer (%d) %d &gt; 4K\n",</div><div class='del'>-				newsize, new2size);</div><div class='del'>-			new2size = 4096;</div><div class='del'>-		}</div><div class='del'>-		/*printk("VIDC: dma size %d\n", new2size);*/</div><div class='del'>-		dma_bufsize = new2size;</div><div class='del'>-		vidc_audio_rate = rate;</div><div class='del'>-	}</div><div class='del'>-	return vidc_audio_rate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short vidc_audio_set_channels(int dev, short channels)</div><div class='del'>-{</div><div class='del'>-	switch (channels) {</div><div class='del'>-	default:</div><div class='del'>-		channels = 2;</div><div class='del'>-	case 1:</div><div class='del'>-	case 2:</div><div class='del'>-		vidc_audio_channels = channels;</div><div class='del'>-		vidc_update_filler(vidc_audio_format, vidc_audio_channels);</div><div class='del'>-	case 0:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return vidc_audio_channels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open the device</div><div class='del'>- */</div><div class='del'>-static int vidc_audio_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	/* This audio device does not have recording capability */</div><div class='del'>-	if (mode == OPEN_READ)</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (vidc_busy)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	vidc_busy = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Close the device</div><div class='del'>- */</div><div class='del'>-static void vidc_audio_close(int dev)</div><div class='del'>-{</div><div class='del'>-	vidc_busy = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Output a block via DMA to sound device.</div><div class='del'>- *</div><div class='del'>- * We just set the DMA start and count; the DMA interrupt routine</div><div class='del'>- * will take care of formatting the samples (via the appropriate</div><div class='del'>- * vidc_filler routine), and flag via vidc_audio_dma_interrupt when</div><div class='del'>- * more data is required.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-vidc_audio_output_block(int dev, unsigned long buf, int total_count, int one)</div><div class='del'>-{</div><div class='del'>-	struct dma_buffparms *dmap = audio_devs[dev]-&gt;dmap_out;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	dma_start = buf - (unsigned long)dmap-&gt;raw_buf_phys + (unsigned long)dmap-&gt;raw_buf;</div><div class='del'>-	dma_count = total_count;</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vidc_audio_start_input(int dev, unsigned long buf, int count, int intrflag)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidc_audio_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t vidc_audio_dma_interrupt(void)</div><div class='del'>-{</div><div class='del'>-	DMAbuf_outputintr(vidc_adev, 1);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Prepare for outputting samples.</div><div class='del'>- *</div><div class='del'>- * Each buffer that will be passed will be `bsize' bytes long,</div><div class='del'>- * with a total of `bcount' buffers.</div><div class='del'>- */</div><div class='del'>-static int vidc_audio_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-</div><div class='del'>-	dma_interrupt = NULL;</div><div class='del'>-	adev-&gt;dmap_out-&gt;flags |= DMA_NODMA;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Stop our current operation.</div><div class='del'>- */</div><div class='del'>-static void vidc_audio_reset(int dev)</div><div class='del'>-{</div><div class='del'>-	dma_interrupt = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vidc_audio_local_qlen(int dev)</div><div class='del'>-{</div><div class='del'>-	return /*dma_count !=*/ 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vidc_audio_trigger(int dev, int enable_bits)</div><div class='del'>-{</div><div class='del'>-	struct audio_operations *adev = audio_devs[dev];</div><div class='del'>-</div><div class='del'>-	if (enable_bits &amp; PCM_ENABLE_OUTPUT) {</div><div class='del'>-		if (!(adev-&gt;dmap_out-&gt;flags &amp; DMA_ACTIVE)) {</div><div class='del'>-			unsigned long flags;</div><div class='del'>-</div><div class='del'>-			local_irq_save(flags);</div><div class='del'>-</div><div class='del'>-			/* prevent recusion */</div><div class='del'>-			adev-&gt;dmap_out-&gt;flags |= DMA_ACTIVE;</div><div class='del'>-</div><div class='del'>-			dma_interrupt = vidc_audio_dma_interrupt;</div><div class='del'>-			vidc_sound_dma_irq(0, NULL);</div><div class='del'>-			iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);</div><div class='del'>-</div><div class='del'>-			local_irq_restore(flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver vidc_audio_driver =</div><div class='del'>-{</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= vidc_audio_open,</div><div class='del'>-	.close			= vidc_audio_close,</div><div class='del'>-	.output_block		= vidc_audio_output_block,</div><div class='del'>-	.start_input		= vidc_audio_start_input,</div><div class='del'>-	.prepare_for_input	= vidc_audio_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= vidc_audio_prepare_for_output,</div><div class='del'>-	.halt_io		= vidc_audio_reset,</div><div class='del'>-	.local_qlen		= vidc_audio_local_qlen,</div><div class='del'>-	.trigger		= vidc_audio_trigger,</div><div class='del'>-	.set_speed		= vidc_audio_set_speed,</div><div class='del'>-	.set_bits		= vidc_audio_set_format,</div><div class='del'>-	.set_channels		= vidc_audio_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mixer_operations vidc_mixer_operations = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.id		= "VIDC",</div><div class='del'>-	.name		= "VIDCsound",</div><div class='del'>-	.ioctl		= vidc_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void vidc_update_filler(int format, int channels)</div><div class='del'>-{</div><div class='del'>-#define TYPE(fmt,ch) (((fmt)&lt;&lt;2) | ((ch)&amp;3))</div><div class='del'>-</div><div class='del'>-	switch (TYPE(format, channels)) {</div><div class='del'>-	default:</div><div class='del'>-	case TYPE(AFMT_U8, 1):</div><div class='del'>-		vidc_filler = vidc_fill_1x8_u;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TYPE(AFMT_U8, 2):</div><div class='del'>-		vidc_filler = vidc_fill_2x8_u;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TYPE(AFMT_S8, 1):</div><div class='del'>-		vidc_filler = vidc_fill_1x8_s;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TYPE(AFMT_S8, 2):</div><div class='del'>-		vidc_filler = vidc_fill_2x8_s;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TYPE(AFMT_S16_LE, 1):</div><div class='del'>-		vidc_filler = vidc_fill_1x16_s;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case TYPE(AFMT_S16_LE, 2):</div><div class='del'>-		vidc_filler = vidc_fill_2x16_s;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init attach_vidc(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	int i, adev;</div><div class='del'>-</div><div class='del'>-	sprintf(name, "VIDC %d-bit sound", hw_config-&gt;card_subtype);</div><div class='del'>-	conf_printf(name, hw_config);</div><div class='del'>-	memset(dma_buf, 0, sizeof(dma_buf));</div><div class='del'>-</div><div class='del'>-	adev = sound_install_audiodrv(AUDIO_DRIVER_VERSION, name,</div><div class='del'>-			&amp;vidc_audio_driver, sizeof(vidc_audio_driver),</div><div class='del'>-			DMA_AUTOMODE, AFMT_U8 | AFMT_S8 | AFMT_S16_LE,</div><div class='del'>-			NULL, hw_config-&gt;dma, hw_config-&gt;dma2);</div><div class='del'>-</div><div class='del'>-	if (adev &lt; 0)</div><div class='del'>-		goto audio_failed;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * 1024 bytes =&gt; 64 buffers</div><div class='del'>-	 */</div><div class='del'>-	audio_devs[adev]-&gt;min_fragment = 10;</div><div class='del'>-	audio_devs[adev]-&gt;mixer_dev = num_mixers;</div><div class='del'>-</div><div class='del'>-	audio_devs[adev]-&gt;mixer_dev =</div><div class='del'>-		sound_install_mixer(MIXER_DRIVER_VERSION,</div><div class='del'>-				name, &amp;vidc_mixer_operations,</div><div class='del'>-				sizeof(vidc_mixer_operations), NULL);</div><div class='del'>-</div><div class='del'>-	if (audio_devs[adev]-&gt;mixer_dev &lt; 0)</div><div class='del'>-		goto mixer_failed;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		dma_buf[i] = get_zeroed_page(GFP_KERNEL);</div><div class='del'>-		if (!dma_buf[i]) {</div><div class='del'>-			printk(KERN_ERR "%s: can't allocate required buffers\n",</div><div class='del'>-				name);</div><div class='del'>-			goto mem_failed;</div><div class='del'>-		}</div><div class='del'>-		dma_pbuf[i] = virt_to_phys((void *)dma_buf[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sound_alloc_dma(hw_config-&gt;dma, hw_config-&gt;name)) {</div><div class='del'>-		printk(KERN_ERR "%s: DMA %d is in  use\n", name, hw_config-&gt;dma);</div><div class='del'>-		goto dma_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (request_irq(hw_config-&gt;irq, vidc_sound_dma_irq, 0,</div><div class='del'>-			hw_config-&gt;name, &amp;dma_start)) {</div><div class='del'>-		printk(KERN_ERR "%s: IRQ %d is in use\n", name, hw_config-&gt;irq);</div><div class='del'>-		goto irq_failed;</div><div class='del'>-	}</div><div class='del'>-	vidc_adev = adev;</div><div class='del'>-	vidc_mixer_set(SOUND_MIXER_VOLUME, (85 | 85 &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-irq_failed:</div><div class='del'>-	sound_free_dma(hw_config-&gt;dma);</div><div class='del'>-dma_failed:</div><div class='del'>-mem_failed:</div><div class='del'>-	for (i = 0; i &lt; 2; i++)</div><div class='del'>-		free_page(dma_buf[i]);</div><div class='del'>-	sound_unload_mixerdev(audio_devs[adev]-&gt;mixer_dev);</div><div class='del'>-mixer_failed:</div><div class='del'>-	sound_unload_audiodev(adev);</div><div class='del'>-audio_failed:</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_vidc(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	hw_config-&gt;irq		= IRQ_DMAS0;</div><div class='del'>-	hw_config-&gt;dma		= DMA_VIRTUAL_SOUND;</div><div class='del'>-	hw_config-&gt;dma2		= -1;</div><div class='del'>-	hw_config-&gt;card_subtype	= 16;</div><div class='del'>-	hw_config-&gt;name		= "VIDC20";</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_vidc(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	int i, adev = vidc_adev;</div><div class='del'>-</div><div class='del'>-	vidc_adev = -1;</div><div class='del'>-</div><div class='del'>-	free_irq(hw_config-&gt;irq, &amp;dma_start);</div><div class='del'>-	sound_free_dma(hw_config-&gt;dma);</div><div class='del'>-</div><div class='del'>-	if (adev &gt;= 0) {</div><div class='del'>-		sound_unload_mixerdev(audio_devs[adev]-&gt;mixer_dev);</div><div class='del'>-		sound_unload_audiodev(adev);</div><div class='del'>-		for (i = 0; i &lt; 2; i++)</div><div class='del'>-			free_page(dma_buf[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-</div><div class='del'>-static int __init init_vidc(void)</div><div class='del'>-{</div><div class='del'>-	if (probe_vidc(&amp;cfg) == 0)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	attach_vidc(&amp;cfg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_vidc(void)</div><div class='del'>-{</div><div class='del'>-	unload_vidc(&amp;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_vidc);</div><div class='del'>-module_exit(cleanup_vidc);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Russell King");</div><div class='del'>-MODULE_DESCRIPTION("VIDC20 audio driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/vidc.h b/sound/oss/vidc.h<br/>deleted file mode 100644<br/>index 0d1424751ecd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/vidc.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/drivers/sound/vidc.h</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1997 Russell King &lt;rmk@arm.linux.org.uk&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  VIDC sound function prototypes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* vidc_fill.S */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Filler routines for different channels and sample sizes</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern unsigned long vidc_fill_1x8_u(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				     unsigned long obuf, int mask);</div><div class='del'>-extern unsigned long vidc_fill_2x8_u(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				     unsigned long obuf, int mask);</div><div class='del'>-extern unsigned long vidc_fill_1x8_s(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				     unsigned long obuf, int mask);</div><div class='del'>-extern unsigned long vidc_fill_2x8_s(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				     unsigned long obuf, int mask);</div><div class='del'>-extern unsigned long vidc_fill_1x16_s(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				      unsigned long obuf, int mask);</div><div class='del'>-extern unsigned long vidc_fill_2x16_s(unsigned long ibuf, unsigned long iend,</div><div class='del'>-				      unsigned long obuf, int mask);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DMA Interrupt handler</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern irqreturn_t vidc_sound_dma_irq(int irqnr, void *ref);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Filler routine pointer</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern unsigned long (*vidc_filler) (unsigned long ibuf, unsigned long iend,</div><div class='del'>-				     unsigned long obuf, int mask);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual DMA buffer exhausted</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern irqreturn_t (*dma_interrupt) (void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual DMA buffer addresses</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-extern unsigned long dma_start, dma_count, dma_bufsize;</div><div class='del'>-extern unsigned long dma_buf[2], dma_pbuf[2];</div><div class='del'>-</div><div class='del'>-/* vidc_synth.c */</div><div class='del'>-</div><div class='del'>-extern void     vidc_synth_init(struct address_info *hw_config);</div><div class='del'>-extern void	vidc_synth_exit(struct address_info *hw_config);</div><div class='del'>-extern int      vidc_synth_get_volume(void);</div><div class='del'>-extern int      vidc_synth_set_volume(int vol);</div><div class='head'>diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S<br/>deleted file mode 100644<br/>index bed34921d176..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/vidc_fill.S?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vidc_fill.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/drivers/sound/vidc_fill.S</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 1997 Russell King</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  Filler routines for DMA buffers</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/linkage.h&gt;</div><div class='del'>-#include &lt;asm/assembler.h&gt;</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/hardware/iomd.h&gt;</div><div class='del'>-</div><div class='del'>-		.text</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_1x8_u)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldrb	r4, [r0], #1</div><div class='del'>-		eor	r4, r4, #0x80</div><div class='del'>-		and	r4, ip, r4, lsl #8</div><div class='del'>-		orr	r4, r4, r4, lsl #16</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_2x8_u)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldr	r4, [r0], #2</div><div class='del'>-		and	r5, r4, ip</div><div class='del'>-		and	r4, ip, r4, lsl #8</div><div class='del'>-		orr	r4, r4, r5, lsl #16</div><div class='del'>-		orr	r4, r4, r4, lsr #8</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_1x8_s)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldrb	r4, [r0], #1</div><div class='del'>-		and	r4, ip, r4, lsl #8</div><div class='del'>-		orr	r4, r4, r4, lsl #16</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_2x8_s)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldr	r4, [r0], #2</div><div class='del'>-		and	r5, r4, ip</div><div class='del'>-		and	r4, ip, r4, lsl #8</div><div class='del'>-		orr	r4, r4, r5, lsl #16</div><div class='del'>-		orr	r4, r4, r4, lsr #8</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_1x16_s)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-		orr	ip, ip, ip, lsr #8</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldr	r5, [r0], #2</div><div class='del'>-		and	r4, r5, ip</div><div class='del'>-		orr	r4, r4, r4, lsl #16</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r0, r1</div><div class='del'>-		addlt	r0, r0, #2</div><div class='del'>-		andlt	r4, r5, ip, lsl #16</div><div class='del'>-		orrlt	r4, r4, r4, lsr #16</div><div class='del'>-		strlt	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_2x16_s)</div><div class='del'>-		mov	ip, #0xff00</div><div class='del'>-		orr	ip, ip, ip, lsr #8</div><div class='del'>-1:		cmp	r0, r1</div><div class='del'>-		bge	vidc_clear</div><div class='del'>-		ldr	r4, [r0], #4</div><div class='del'>-		str	r4, [r2], #4</div><div class='del'>-		cmp	r0, r1</div><div class='del'>-		ldrlt	r4, [r0], #4</div><div class='del'>-		strlt	r4, [r2], #4</div><div class='del'>-		cmp	r2, r3</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_fill_noaudio)</div><div class='del'>-		mov	r0, #0</div><div class='del'>-		mov	r1, #0</div><div class='del'>-2:		mov	r4, #0</div><div class='del'>-		mov	r5, #0</div><div class='del'>-1:		cmp	r2, r3</div><div class='del'>-		stmltia	r2!, {r0, r1, r4, r5}</div><div class='del'>-		blt	1b</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_clear)</div><div class='del'>-		mov	r0, #0</div><div class='del'>-		mov	r1, #0</div><div class='del'>-		tst	r2, #4</div><div class='del'>-		str	r0, [r2], #4</div><div class='del'>-		tst	r2, #8</div><div class='del'>-		stmia	r2!, {r0, r1}</div><div class='del'>-		b	2b</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Call filler routines with:</div><div class='del'>- *  r0 = phys address</div><div class='del'>- *  r1 = phys end</div><div class='del'>- *  r2 = buffer</div><div class='del'>- * Returns:</div><div class='del'>- *  r0 = new buffer address</div><div class='del'>- *  r2 = new buffer finish</div><div class='del'>- *  r4 = corrupted</div><div class='del'>- *  r5 = corrupted</div><div class='del'>- *  ip = corrupted</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-ENTRY(vidc_sound_dma_irq)</div><div class='del'>-		stmfd	sp!, {r4 - r8, lr}</div><div class='del'>-		ldr	r8, =dma_start</div><div class='del'>-		ldmia	r8, {r0, r1, r2, r3, r4, r5}</div><div class='del'>-		teq	r1, #0</div><div class='del'>-		adreq	r4, vidc_fill_noaudio</div><div class='del'>-		moveq	r7, #1 &lt;&lt; 31</div><div class='del'>-		movne	r7, #0</div><div class='del'>-		mov	ip, #IOMD_BASE &amp; 0xff000000</div><div class='del'>-		orr	ip, ip, #IOMD_BASE &amp; 0x00ff0000</div><div class='del'>-		ldrb	r6, [ip, #IOMD_SD0ST]</div><div class='del'>-		tst	r6, #DMA_ST_OFL			@ Check for overrun</div><div class='del'>-		eorne	r6, r6, #DMA_ST_AB</div><div class='del'>-		tst	r6, #DMA_ST_AB</div><div class='del'>-		moveq	r2, r3				@ DMAing A, update B</div><div class='del'>-		add	r3, r2, r5			@ End of DMA buffer</div><div class='del'>-		add	r1, r1, r0			@ End of virtual DMA buffer</div><div class='del'>-		mov	lr, pc</div><div class='del'>-		mov	pc, r4				@ Call fill routine (uses r4, ip)</div><div class='del'>-		sub	r1, r1, r0			@ Remaining length</div><div class='del'>-		stmia	r8, {r0, r1}</div><div class='del'>-		mov	r0, #0</div><div class='del'>-		tst	r2, #4				@ Round buffer up to 4 words</div><div class='del'>-		strne	r0, [r2], #4</div><div class='del'>-		tst	r2, #8</div><div class='del'>-		strne	r0, [r2], #4</div><div class='del'>-		strne	r0, [r2], #4</div><div class='del'>-		sub	r2, r2, #16</div><div class='del'>-		mov	r2, r2, lsl #20</div><div class='del'>-		movs	r2, r2, lsr #20</div><div class='del'>-		orreq	r2, r2, #1 &lt;&lt; 30		@ Set L bit</div><div class='del'>-		orr	r2, r2, r7</div><div class='del'>-		ldmdb	r8, {r3, r4, r5}</div><div class='del'>-		tst	r6, #DMA_ST_AB</div><div class='del'>-		mov	ip, #IOMD_BASE &amp; 0xff000000</div><div class='del'>-		orr	ip, ip, #IOMD_BASE &amp; 0x00ff0000</div><div class='del'>-		streq	r4, [ip, #IOMD_SD0CURB]</div><div class='del'>-		strne	r5, [ip, #IOMD_SD0CURA]</div><div class='del'>-		streq	r2, [ip, #IOMD_SD0ENDB]</div><div class='del'>-		strne	r2, [ip, #IOMD_SD0ENDA]</div><div class='del'>-		ldr	lr, [ip, #IOMD_SD0ST]</div><div class='del'>-		tst	lr, #DMA_ST_OFL</div><div class='del'>-		bne	1f</div><div class='del'>-		tst	r6, #DMA_ST_AB</div><div class='del'>-		strne	r4, [ip, #IOMD_SD0CURB]</div><div class='del'>-		streq	r5, [ip, #IOMD_SD0CURA]</div><div class='del'>-		strne	r2, [ip, #IOMD_SD0ENDB]</div><div class='del'>-		streq	r2, [ip, #IOMD_SD0ENDA]</div><div class='del'>-1:		teq	r7, #0</div><div class='del'>-		mov	r0, #0x10</div><div class='del'>-		strneb	r0, [ip, #IOMD_SD0CR]</div><div class='del'>-		ldmfd	sp!, {r4 - r8, lr}</div><div class='del'>-		mov	r0, #1				@ IRQ_HANDLED</div><div class='del'>-		teq	r1, #0				@ If we have no more</div><div class='del'>-		movne	pc, lr</div><div class='del'>-		teq	r3, #0</div><div class='del'>-		movne	pc, r3				@ Call interrupt routine</div><div class='del'>-		mov	pc, lr</div><div class='del'>-</div><div class='del'>-		.data</div><div class='del'>-		.globl	dma_interrupt</div><div class='del'>-dma_interrupt:</div><div class='del'>-		.long	0				@ r3</div><div class='del'>-		.globl	dma_pbuf</div><div class='del'>-dma_pbuf:</div><div class='del'>-		.long	0				@ r4</div><div class='del'>-		.long	0				@ r5</div><div class='del'>-		.globl	dma_start</div><div class='del'>-dma_start:</div><div class='del'>-		.long	0				@ r0</div><div class='del'>-		.globl	dma_count</div><div class='del'>-dma_count:</div><div class='del'>-		.long	0				@ r1</div><div class='del'>-		.globl	dma_buf</div><div class='del'>-dma_buf:</div><div class='del'>-		.long	0				@ r2</div><div class='del'>-		.long	0				@ r3</div><div class='del'>-		.globl	vidc_filler</div><div class='del'>-vidc_filler:</div><div class='del'>-		.long	vidc_fill_noaudio		@ r4</div><div class='del'>-		.globl	dma_bufsize</div><div class='del'>-dma_bufsize:</div><div class='del'>-		.long	0x1000				@ r5</div><div class='head'>diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c<br/>deleted file mode 100644<br/>index 643f1113b1d8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/vwsnd.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/vwsnd.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3498 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Sound driver for Silicon Graphics 320 and 540 Visual Workstations'</div><div class='del'>- * onboard audio.  See notes in Documentation/sound/oss/vwsnd .</div><div class='del'>- *</div><div class='del'>- * Copyright 1999 Silicon Graphics, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#undef VWSND_DEBUG			/* define for debugging */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * XXX to do -</div><div class='del'>- *</div><div class='del'>- *	External sync.</div><div class='del'>- *	Rename swbuf, hwbuf, u&amp;i, hwptr&amp;swptr to something rational.</div><div class='del'>- *	Bug - if select() called before read(), pcm_setup() not called.</div><div class='del'>- *	Bug - output doesn't stop soon enough if process killed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Things to test -</div><div class='del'>- *</div><div class='del'>- *	Will readv/writev work?  Write a test.</div><div class='del'>- *</div><div class='del'>- *	insmod/rmmod 100 million times.</div><div class='del'>- *</div><div class='del'>- *	Run I/O until int ptrs wrap around (roughly 6.2 hours @ DAT</div><div class='del'>- *	rate).</div><div class='del'>- *</div><div class='del'>- *	Concurrent threads banging on mixer simultaneously, both UP</div><div class='del'>- *	and SMP kernels.  Especially, watch for thread A changing</div><div class='del'>- *	OUTSRC while thread B changes gain -- both write to the same</div><div class='del'>- *	ad1843 register.</div><div class='del'>- *</div><div class='del'>- *	What happens if a client opens /dev/audio then forks?</div><div class='del'>- *	Do two procs have /dev/audio open?  Test.</div><div class='del'>- *</div><div class='del'>- *	Pump audio through the CD, MIC and line inputs and verify that</div><div class='del'>- *	they mix/mute into the output.</div><div class='del'>- *</div><div class='del'>- *	Apps:</div><div class='del'>- *		amp</div><div class='del'>- *		mpg123</div><div class='del'>- *		x11amp</div><div class='del'>- *		mxv</div><div class='del'>- *		kmedia</div><div class='del'>- *		esound</div><div class='del'>- *		need more input apps</div><div class='del'>- *</div><div class='del'>- *	Run tests while bombarding with signals.  setitimer(2) will do it...  */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This driver is organized in nine sections.</div><div class='del'>- * The nine sections are:</div><div class='del'>- *</div><div class='del'>- *	debug stuff</div><div class='del'>- * 	low level lithium access</div><div class='del'>- *	high level lithium access</div><div class='del'>- *	AD1843 access</div><div class='del'>- *	PCM I/O</div><div class='del'>- *	audio driver</div><div class='del'>- *	mixer driver</div><div class='del'>- *	probe/attach/unload</div><div class='del'>- *	initialization and loadable kernel module interface</div><div class='del'>- *</div><div class='del'>- * That is roughly the order of increasing abstraction, so forward</div><div class='del'>- * dependencies are minimal.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Locking Notes</div><div class='del'>- *</div><div class='del'>- *	INC_USE_COUNT and DEC_USE_COUNT keep track of the number of</div><div class='del'>- *	open descriptors to this driver. They store it in vwsnd_use_count.</div><div class='del'>- * 	The global device list, vwsnd_dev_list,	is immutable when the IN_USE</div><div class='del'>- *	is true.</div><div class='del'>- *</div><div class='del'>- *	devc-&gt;open_lock is a semaphore that is used to enforce the</div><div class='del'>- *	single reader/single writer rule for /dev/audio.  The rule is</div><div class='del'>- *	that each device may have at most one reader and one writer.</div><div class='del'>- *	Open will block until the previous client has closed the</div><div class='del'>- *	device, unless O_NONBLOCK is specified.</div><div class='del'>- *</div><div class='del'>- *	The semaphore devc-&gt;io_mutex serializes PCM I/O syscalls.  This</div><div class='del'>- *	is unnecessary in Linux 2.2, because the kernel lock</div><div class='del'>- *	serializes read, write, and ioctl globally, but it's there,</div><div class='del'>- *	ready for the brave, new post-kernel-lock world.</div><div class='del'>- *</div><div class='del'>- *	Locking between interrupt and baselevel is handled by the</div><div class='del'>- *	"lock" spinlock in vwsnd_port (one lock each for read and</div><div class='del'>- *	write).  Each half holds the lock just long enough to see what</div><div class='del'>- *	area it owns and update its pointers.  See pcm_output() and</div><div class='del'>- *	pcm_input() for most of the gory stuff.</div><div class='del'>- *</div><div class='del'>- *	devc-&gt;mix_mutex serializes all mixer ioctls.  This is also</div><div class='del'>- *	redundant because of the kernel lock.</div><div class='del'>- *</div><div class='del'>- *	The lowest level lock is lith-&gt;lithium_lock.  It is a</div><div class='del'>- *	spinlock which is held during the two-register tango of</div><div class='del'>- *	reading/writing an AD1843 register.  See</div><div class='del'>- *	li_{read,write}_ad1843_reg().</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sample Format Notes</div><div class='del'>- *</div><div class='del'>- *	Lithium's DMA engine has two formats: 16-bit 2's complement</div><div class='del'>- *	and 8-bit unsigned .  16-bit transfers the data unmodified, 2</div><div class='del'>- *	bytes per sample.  8-bit unsigned transfers 1 byte per sample</div><div class='del'>- *	and XORs each byte with 0x80.  Lithium can input or output</div><div class='del'>- *	either mono or stereo in either format.</div><div class='del'>- *</div><div class='del'>- *	The AD1843 has four formats: 16-bit 2's complement, 8-bit</div><div class='del'>- *	unsigned, 8-bit mu-Law and 8-bit A-Law.</div><div class='del'>- *</div><div class='del'>- *	This driver supports five formats: AFMT_S8, AFMT_U8,</div><div class='del'>- *	AFMT_MU_LAW, AFMT_A_LAW, and AFMT_S16_LE.</div><div class='del'>- *</div><div class='del'>- *	For AFMT_U8 output, we keep the AD1843 in 16-bit mode, and</div><div class='del'>- *	rely on Lithium's XOR to translate between U8 and S8.</div><div class='del'>- *</div><div class='del'>- *	For AFMT_S8, AFMT_MU_LAW and AFMT_A_LAW output, we have to XOR</div><div class='del'>- *	the 0x80 bit in software to compensate for Lithium's XOR.</div><div class='del'>- *	This happens in pcm_copy_{in,out}().</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- * 11-10-2000	Bartlomiej Zolnierkiewicz &lt;bkz@linux-ide.org&gt;</div><div class='del'>- *		Added some __init/__exit</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/visws/cobalt.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* debug stuff */</div><div class='del'>-</div><div class='del'>-#ifdef VWSND_DEBUG</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(vwsnd_mutex);</div><div class='del'>-static int shut_up = 1;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * dbgassert - called when an assertion fails.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void dbgassert(const char *fcn, int line, const char *expr)</div><div class='del'>-{</div><div class='del'>-	if (in_interrupt())</div><div class='del'>-		panic("ASSERTION FAILED IN INTERRUPT, %s:%s:%d %s\n",</div><div class='del'>-		      __FILE__, fcn, line, expr);</div><div class='del'>-	else {</div><div class='del'>-		int x;</div><div class='del'>-		printk(KERN_ERR "ASSERTION FAILED, %s:%s:%d %s\n",</div><div class='del'>-		       __FILE__, fcn, line, expr);</div><div class='del'>-		x = * (volatile int *) 0; /* force proc to exit */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bunch of useful debug macros:</div><div class='del'>- *</div><div class='del'>- *	ASSERT	- print unless e nonzero (panic if in interrupt)</div><div class='del'>- *	DBGDO	- include arbitrary code if debugging</div><div class='del'>- *	DBGX	- debug print raw (w/o function name)</div><div class='del'>- *	DBGP	- debug print w/ function name</div><div class='del'>- *	DBGE	- debug print function entry</div><div class='del'>- *	DBGC	- debug print function call</div><div class='del'>- *	DBGR	- debug print function return</div><div class='del'>- *	DBGXV	- debug print raw when verbose</div><div class='del'>- *	DBGPV	- debug print when verbose</div><div class='del'>- *	DBGEV	- debug print function entry when verbose</div><div class='del'>- *	DBGRV	- debug print function return when verbose</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ASSERT(e)      ((e) ? (void) 0 : dbgassert(__func__, __LINE__, #e))</div><div class='del'>-#define DBGDO(x)            x</div><div class='del'>-#define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args))</div><div class='del'>-#define DBGP(fmt, args...)  (DBGX("%s: " fmt, __func__ , ##args))</div><div class='del'>-#define DBGE(fmt, args...)  (DBGX("%s" fmt, __func__ , ##args))</div><div class='del'>-#define DBGC(rtn)           (DBGP("calling %s\n", rtn))</div><div class='del'>-#define DBGR()              (DBGP("returning\n"))</div><div class='del'>-#define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args))</div><div class='del'>-#define DBGPV(fmt, args...) (shut_up ? 0 : DBGP(fmt, ##args))</div><div class='del'>-#define DBGEV(fmt, args...) (shut_up ? 0 : DBGE(fmt, ##args))</div><div class='del'>-#define DBGCV(rtn)          (shut_up ? 0 : DBGC(rtn))</div><div class='del'>-#define DBGRV()             (shut_up ? 0 : DBGR())</div><div class='del'>-</div><div class='del'>-#else /* !VWSND_DEBUG */</div><div class='del'>-</div><div class='del'>-#define ASSERT(e)           ((void) 0)</div><div class='del'>-#define DBGDO(x)            /* don't */</div><div class='del'>-#define DBGX(fmt, args...)  ((void) 0)</div><div class='del'>-#define DBGP(fmt, args...)  ((void) 0)</div><div class='del'>-#define DBGE(fmt, args...)  ((void) 0)</div><div class='del'>-#define DBGC(rtn)           ((void) 0)</div><div class='del'>-#define DBGR()              ((void) 0)</div><div class='del'>-#define DBGPV(fmt, args...) ((void) 0)</div><div class='del'>-#define DBGXV(fmt, args...) ((void) 0)</div><div class='del'>-#define DBGEV(fmt, args...) ((void) 0)</div><div class='del'>-#define DBGCV(rtn)          ((void) 0)</div><div class='del'>-#define DBGRV()             ((void) 0)</div><div class='del'>-</div><div class='del'>-#endif /* !VWSND_DEBUG */</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* low level lithium access */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We need to talk to Lithium registers on three pages.  Here are</div><div class='del'>- * the pages' offsets from the base address (0xFF001000).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LI_PAGE0_OFFSET = 0x01000 - 0x1000, /* FF001000 */</div><div class='del'>-	LI_PAGE1_OFFSET = 0x0F000 - 0x1000, /* FF00F000 */</div><div class='del'>-	LI_PAGE2_OFFSET = 0x10000 - 0x1000, /* FF010000 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* low-level lithium data */</div><div class='del'>-</div><div class='del'>-typedef struct lithium {</div><div class='del'>-	void *		page0;		/* virtual addresses */</div><div class='del'>-	void *		page1;</div><div class='del'>-	void *		page2;</div><div class='del'>-	spinlock_t	lock;		/* protects codec and UST/MSC access */</div><div class='del'>-} lithium_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_destroy destroys the lithium_t structure and vm mappings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void li_destroy(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	if (lith-&gt;page0) {</div><div class='del'>-		iounmap(lith-&gt;page0);</div><div class='del'>-		lith-&gt;page0 = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (lith-&gt;page1) {</div><div class='del'>-		iounmap(lith-&gt;page1);</div><div class='del'>-		lith-&gt;page1 = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (lith-&gt;page2) {</div><div class='del'>-		iounmap(lith-&gt;page2);</div><div class='del'>-		lith-&gt;page2 = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_create initializes the lithium_t structure and sets up vm mappings</div><div class='del'>- * to access the registers.</div><div class='del'>- * Returns 0 on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init li_create(lithium_t *lith, unsigned long baseaddr)</div><div class='del'>-{</div><div class='del'>-	spin_lock_init(&amp;lith-&gt;lock);</div><div class='del'>-	lith-&gt;page0 = ioremap_nocache(baseaddr + LI_PAGE0_OFFSET, PAGE_SIZE);</div><div class='del'>-	lith-&gt;page1 = ioremap_nocache(baseaddr + LI_PAGE1_OFFSET, PAGE_SIZE);</div><div class='del'>-	lith-&gt;page2 = ioremap_nocache(baseaddr + LI_PAGE2_OFFSET, PAGE_SIZE);</div><div class='del'>-	if (!lith-&gt;page0 || !lith-&gt;page1 || !lith-&gt;page2) {</div><div class='del'>-		li_destroy(lith);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * basic register accessors - read/write long/byte</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned long li_readl(lithium_t *lith, int off)</div><div class='del'>-{</div><div class='del'>-	return * (volatile unsigned long *) (lith-&gt;page0 + off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned char li_readb(lithium_t *lith, int off)</div><div class='del'>-{</div><div class='del'>-	return * (volatile unsigned char *) (lith-&gt;page0 + off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ void li_writel(lithium_t *lith, int off, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	* (volatile unsigned long *) (lith-&gt;page0 + off) = val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ void li_writeb(lithium_t *lith, int off, unsigned char val)</div><div class='del'>-{</div><div class='del'>-	* (volatile unsigned char *) (lith-&gt;page0 + off) = val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* High Level Lithium Access */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lithium DMA Notes</div><div class='del'>- *</div><div class='del'>- * Lithium has two dedicated DMA channels for audio.  They are known</div><div class='del'>- * as comm1 and comm2 (communication areas 1 and 2).  Comm1 is for</div><div class='del'>- * input, and comm2 is for output.  Each is controlled by three</div><div class='del'>- * registers: BASE (base address), CFG (config) and CCTL</div><div class='del'>- * (config/control).</div><div class='del'>- *</div><div class='del'>- * Each DMA channel points to a physically contiguous ring buffer in</div><div class='del'>- * main memory of up to 8 Kbytes.  (This driver always uses 8 Kb.)</div><div class='del'>- * There are three pointers into the ring buffer: read, write, and</div><div class='del'>- * trigger.  The pointers are 8 bits each.  Each pointer points to</div><div class='del'>- * 32-byte "chunks" of data.  The DMA engine moves 32 bytes at a time,</div><div class='del'>- * so there is no finer-granularity control.</div><div class='del'>- *</div><div class='del'>- * In comm1, the hardware updates the write ptr, and software updates</div><div class='del'>- * the read ptr.  In comm2, it's the opposite: hardware updates the</div><div class='del'>- * read ptr, and software updates the write ptr.  I designate the</div><div class='del'>- * hardware-updated ptr as the hwptr, and the software-updated ptr as</div><div class='del'>- * the swptr.</div><div class='del'>- *</div><div class='del'>- * The trigger ptr and trigger mask are used to trigger interrupts.</div><div class='del'>- * From the Lithium spec, section 5.6.8, revision of 12/15/1998:</div><div class='del'>- *</div><div class='del'>- *	Trigger Mask Value</div><div class='del'>- *</div><div class='del'>- *	A three bit wide field that represents a power of two mask</div><div class='del'>- *	that is used whenever the trigger pointer is compared to its</div><div class='del'>- *	respective read or write pointer.  A value of zero here</div><div class='del'>- *	implies a mask of 0xFF and a value of seven implies a mask</div><div class='del'>- *	0x01.  This value can be used to sub-divide the ring buffer</div><div class='del'>- *	into pie sections so that interrupts monitor the progress of</div><div class='del'>- *	hardware from section to section.</div><div class='del'>- *</div><div class='del'>- * My interpretation of that is, whenever the hw ptr is updated, it is</div><div class='del'>- * compared with the trigger ptr, and the result is masked by the</div><div class='del'>- * trigger mask.  (Actually, by the complement of the trigger mask.)</div><div class='del'>- * If the result is zero, an interrupt is triggered.  I.e., interrupt</div><div class='del'>- * if ((hwptr &amp; ~mask) == (trptr &amp; ~mask)).  The mask is formed from</div><div class='del'>- * the trigger register value as mask = (1 &lt;&lt; (8 - tmreg)) - 1.</div><div class='del'>- *</div><div class='del'>- * In yet different words, setting tmreg to 0 causes an interrupt after</div><div class='del'>- * every 256 DMA chunks (8192 bytes) or once per traversal of the</div><div class='del'>- * ring buffer.  Setting it to 7 caues an interrupt every 2 DMA chunks</div><div class='del'>- * (64 bytes) or 128 times per traversal of the ring buffer.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Lithium register offsets and bit definitions */</div><div class='del'>-</div><div class='del'>-#define LI_HOST_CONTROLLER	0x000</div><div class='del'>-# define LI_HC_RESET		 0x00008000</div><div class='del'>-# define LI_HC_LINK_ENABLE	 0x00004000</div><div class='del'>-# define LI_HC_LINK_FAILURE	 0x00000004</div><div class='del'>-# define LI_HC_LINK_CODEC	 0x00000002</div><div class='del'>-# define LI_HC_LINK_READY	 0x00000001</div><div class='del'>-</div><div class='del'>-#define LI_INTR_STATUS		0x010</div><div class='del'>-#define LI_INTR_MASK		0x014</div><div class='del'>-# define LI_INTR_LINK_ERR	 0x00008000</div><div class='del'>-# define LI_INTR_COMM2_TRIG	 0x00000008</div><div class='del'>-# define LI_INTR_COMM2_UNDERFLOW 0x00000004</div><div class='del'>-# define LI_INTR_COMM1_TRIG	 0x00000002</div><div class='del'>-# define LI_INTR_COMM1_OVERFLOW  0x00000001</div><div class='del'>-</div><div class='del'>-#define LI_CODEC_COMMAND	0x018</div><div class='del'>-# define LI_CC_BUSY		 0x00008000</div><div class='del'>-# define LI_CC_DIR		 0x00000080</div><div class='del'>-#  define LI_CC_DIR_RD		  LI_CC_DIR</div><div class='del'>-#  define LI_CC_DIR_WR		(!LI_CC_DIR)</div><div class='del'>-# define LI_CC_ADDR_MASK	 0x0000007F</div><div class='del'>-</div><div class='del'>-#define LI_CODEC_DATA		0x01C</div><div class='del'>-</div><div class='del'>-#define LI_COMM1_BASE		0x100</div><div class='del'>-#define LI_COMM1_CTL		0x104</div><div class='del'>-# define LI_CCTL_RESET		 0x80000000</div><div class='del'>-# define LI_CCTL_SIZE		 0x70000000</div><div class='del'>-# define LI_CCTL_DMA_ENABLE	 0x08000000</div><div class='del'>-# define LI_CCTL_TMASK		 0x07000000 /* trigger mask */</div><div class='del'>-# define LI_CCTL_TPTR		 0x00FF0000 /* trigger pointer */</div><div class='del'>-# define LI_CCTL_RPTR		 0x0000FF00</div><div class='del'>-# define LI_CCTL_WPTR		 0x000000FF</div><div class='del'>-#define LI_COMM1_CFG		0x108</div><div class='del'>-# define LI_CCFG_LOCK		 0x00008000</div><div class='del'>-# define LI_CCFG_SLOT		 0x00000070</div><div class='del'>-# define LI_CCFG_DIRECTION	 0x00000008</div><div class='del'>-#  define LI_CCFG_DIR_IN	(!LI_CCFG_DIRECTION)</div><div class='del'>-#  define LI_CCFG_DIR_OUT	  LI_CCFG_DIRECTION</div><div class='del'>-# define LI_CCFG_MODE		 0x00000004</div><div class='del'>-#  define LI_CCFG_MODE_MONO	(!LI_CCFG_MODE)</div><div class='del'>-#  define LI_CCFG_MODE_STEREO	  LI_CCFG_MODE</div><div class='del'>-# define LI_CCFG_FORMAT		 0x00000003</div><div class='del'>-#  define LI_CCFG_FMT_8BIT	  0x00000000</div><div class='del'>-#  define LI_CCFG_FMT_16BIT	  0x00000001</div><div class='del'>-#define LI_COMM2_BASE		0x10C</div><div class='del'>-#define LI_COMM2_CTL		0x110</div><div class='del'>- /* bit definitions are the same as LI_COMM1_CTL */</div><div class='del'>-#define LI_COMM2_CFG		0x114</div><div class='del'>- /* bit definitions are the same as LI_COMM1_CFG */</div><div class='del'>-</div><div class='del'>-#define LI_UST_LOW		0x200	/* 64-bit Unadjusted System Time is */</div><div class='del'>-#define LI_UST_HIGH		0x204	/* microseconds since boot */</div><div class='del'>-</div><div class='del'>-#define LI_AUDIO1_UST		0x300	/* UST-MSC pairs */</div><div class='del'>-#define LI_AUDIO1_MSC		0x304	/* MSC (Media Stream Counter) */</div><div class='del'>-#define LI_AUDIO2_UST		0x308	/* counts samples actually */</div><div class='del'>-#define LI_AUDIO2_MSC		0x30C	/* processed as of time UST */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Lithium's DMA engine operates on chunks of 32 bytes.  We call that</div><div class='del'>- * a DMACHUNK.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DMACHUNK_SHIFT 5</div><div class='del'>-#define DMACHUNK_SIZE (1 &lt;&lt; DMACHUNK_SHIFT)</div><div class='del'>-#define BYTES_TO_CHUNKS(bytes) ((bytes) &gt;&gt; DMACHUNK_SHIFT)</div><div class='del'>-#define CHUNKS_TO_BYTES(chunks) ((chunks) &lt;&lt; DMACHUNK_SHIFT)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Two convenient macros to shift bitfields into/out of position.</div><div class='del'>- *</div><div class='del'>- * Observe that (mask &amp; -mask) is (1 &lt;&lt; low_set_bit_of(mask)).</div><div class='del'>- * As long as mask is constant, we trust the compiler will change the</div><div class='del'>- * multipy and divide into shifts.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SHIFT_FIELD(val, mask) (((val) * ((mask) &amp; -(mask))) &amp; (mask))</div><div class='del'>-#define UNSHIFT_FIELD(val, mask) (((val) &amp; (mask)) / ((mask) &amp; -(mask)))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * dma_chan_desc is invariant information about a Lithium</div><div class='del'>- * DMA channel.  There are two instances, li_comm1 and li_comm2.</div><div class='del'>- *</div><div class='del'>- * Note that the CCTL register fields are write ptr and read ptr, but what</div><div class='del'>- * we care about are which pointer is updated by software and which by</div><div class='del'>- * hardware.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct dma_chan_desc {</div><div class='del'>-	int basereg;</div><div class='del'>-	int cfgreg;</div><div class='del'>-	int ctlreg;</div><div class='del'>-	int hwptrreg;</div><div class='del'>-	int swptrreg;</div><div class='del'>-	int ustreg;</div><div class='del'>-	int mscreg;</div><div class='del'>-	unsigned long swptrmask;</div><div class='del'>-	int ad1843_slot;</div><div class='del'>-	int direction;			/* LI_CCTL_DIR_IN/OUT */</div><div class='del'>-} dma_chan_desc_t;</div><div class='del'>-</div><div class='del'>-static const dma_chan_desc_t li_comm1 = {</div><div class='del'>-	LI_COMM1_BASE,			/* base register offset */</div><div class='del'>-	LI_COMM1_CFG,			/* config register offset */</div><div class='del'>-	LI_COMM1_CTL,			/* control register offset */</div><div class='del'>-	LI_COMM1_CTL + 0,		/* hw ptr reg offset (write ptr) */</div><div class='del'>-	LI_COMM1_CTL + 1,		/* sw ptr reg offset (read ptr) */</div><div class='del'>-	LI_AUDIO1_UST,			/* ust reg offset */</div><div class='del'>-	LI_AUDIO1_MSC,			/* msc reg offset */</div><div class='del'>-	LI_CCTL_RPTR,			/* sw ptr bitmask in ctlval */</div><div class='del'>-	2,				/* ad1843 serial slot */</div><div class='del'>-	LI_CCFG_DIR_IN			/* direction */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const dma_chan_desc_t li_comm2 = {</div><div class='del'>-	LI_COMM2_BASE,			/* base register offset */</div><div class='del'>-	LI_COMM2_CFG,			/* config register offset */</div><div class='del'>-	LI_COMM2_CTL,			/* control register offset */</div><div class='del'>-	LI_COMM2_CTL + 1,		/* hw ptr reg offset (read ptr) */</div><div class='del'>-	LI_COMM2_CTL + 0,		/* sw ptr reg offset (writr ptr) */</div><div class='del'>-	LI_AUDIO2_UST,			/* ust reg offset */</div><div class='del'>-	LI_AUDIO2_MSC,			/* msc reg offset */</div><div class='del'>-	LI_CCTL_WPTR,			/* sw ptr bitmask in ctlval */</div><div class='del'>-	2,				/* ad1843 serial slot */</div><div class='del'>-	LI_CCFG_DIR_OUT			/* direction */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * dma_chan is variable information about a Lithium DMA channel.</div><div class='del'>- *</div><div class='del'>- * The desc field points to invariant information.</div><div class='del'>- * The lith field points to a lithium_t which is passed</div><div class='del'>- * to li_read* and li_write* to access the registers.</div><div class='del'>- * The *val fields shadow the lithium registers' contents.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct dma_chan {</div><div class='del'>-	const dma_chan_desc_t *desc;</div><div class='del'>-	lithium_t      *lith;</div><div class='del'>-	unsigned long   baseval;</div><div class='del'>-	unsigned long	cfgval;</div><div class='del'>-	unsigned long	ctlval;</div><div class='del'>-} dma_chan_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ustmsc is a UST/MSC pair (Unadjusted System Time/Media Stream Counter).</div><div class='del'>- * UST is time in microseconds since the system booted, and MSC is a</div><div class='del'>- * counter that increments with every audio sample.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct ustmsc {</div><div class='del'>-	unsigned long long ust;</div><div class='del'>-	unsigned long msc;</div><div class='del'>-} ustmsc_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_ad1843_wait waits until lithium says the AD1843 register</div><div class='del'>- * exchange is not busy.  Returns 0 on success, -EBUSY on timeout.</div><div class='del'>- *</div><div class='del'>- * Locking: must be called with lithium_lock held.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int li_ad1843_wait(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	unsigned long later = jiffies + 2;</div><div class='del'>-	while (li_readl(lith, LI_CODEC_COMMAND) &amp; LI_CC_BUSY)</div><div class='del'>-		if (time_after_eq(jiffies, later))</div><div class='del'>-			return -EBUSY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_read_ad1843_reg returns the current contents of a 16 bit AD1843 register.</div><div class='del'>- *</div><div class='del'>- * Returns unsigned register value on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int li_read_ad1843_reg(lithium_t *lith, int reg)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	ASSERT(!in_interrupt());</div><div class='del'>-	spin_lock(&amp;lith-&gt;lock);</div><div class='del'>-	{</div><div class='del'>-		val = li_ad1843_wait(lith);</div><div class='del'>-		if (val == 0) {</div><div class='del'>-			li_writel(lith, LI_CODEC_COMMAND, LI_CC_DIR_RD | reg);</div><div class='del'>-			val = li_ad1843_wait(lith);</div><div class='del'>-		}</div><div class='del'>-		if (val == 0)</div><div class='del'>-			val = li_readl(lith, LI_CODEC_DATA);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;lith-&gt;lock);</div><div class='del'>-</div><div class='del'>-	DBGXV("li_read_ad1843_reg(lith=0x%p, reg=%d) returns 0x%04x\n",</div><div class='del'>-	      lith, reg, val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_write_ad1843_reg writes the specified value to a 16 bit AD1843 register.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void li_write_ad1843_reg(lithium_t *lith, int reg, int newval)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;lith-&gt;lock);</div><div class='del'>-	{</div><div class='del'>-		if (li_ad1843_wait(lith) == 0) {</div><div class='del'>-			li_writel(lith, LI_CODEC_DATA, newval);</div><div class='del'>-			li_writel(lith, LI_CODEC_COMMAND, LI_CC_DIR_WR | reg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;lith-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_setup_dma calculates all the register settings for DMA in a particular</div><div class='del'>- * mode.  It takes too many arguments.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void li_setup_dma(dma_chan_t *chan,</div><div class='del'>-			 const dma_chan_desc_t *desc,</div><div class='del'>-			 lithium_t *lith,</div><div class='del'>-			 unsigned long buffer_paddr,</div><div class='del'>-			 int bufshift,</div><div class='del'>-			 int fragshift,</div><div class='del'>-			 int channels,</div><div class='del'>-			 int sampsize)</div><div class='del'>-{</div><div class='del'>-	unsigned long mode, format;</div><div class='del'>-	unsigned long size, tmask;</div><div class='del'>-</div><div class='del'>-	DBGEV("(chan=0x%p, desc=0x%p, lith=0x%p, buffer_paddr=0x%lx, "</div><div class='del'>-	     "bufshift=%d, fragshift=%d, channels=%d, sampsize=%d)\n",</div><div class='del'>-	     chan, desc, lith, buffer_paddr,</div><div class='del'>-	     bufshift, fragshift, channels, sampsize);</div><div class='del'>-</div><div class='del'>-	/* Reset the channel first. */</div><div class='del'>-</div><div class='del'>-	li_writel(lith, desc-&gt;ctlreg, LI_CCTL_RESET);</div><div class='del'>-</div><div class='del'>-	ASSERT(channels == 1 || channels == 2);</div><div class='del'>-	if (channels == 2)</div><div class='del'>-		mode = LI_CCFG_MODE_STEREO;</div><div class='del'>-	else</div><div class='del'>-		mode = LI_CCFG_MODE_MONO;</div><div class='del'>-	ASSERT(sampsize == 1 || sampsize == 2);</div><div class='del'>-	if (sampsize == 2)</div><div class='del'>-		format = LI_CCFG_FMT_16BIT;</div><div class='del'>-	else</div><div class='del'>-		format = LI_CCFG_FMT_8BIT;</div><div class='del'>-	chan-&gt;desc = desc;</div><div class='del'>-	chan-&gt;lith = lith;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Lithium DMA address register takes a 40-bit physical</div><div class='del'>-	 * address, right-shifted by 8 so it fits in 32 bits.  Bit 37</div><div class='del'>-	 * must be set -- it enables cache coherence.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ASSERT(!(buffer_paddr &amp; 0xFF));</div><div class='del'>-	chan-&gt;baseval = (buffer_paddr &gt;&gt; 8) | 1 &lt;&lt; (37 - 8);</div><div class='del'>-</div><div class='del'>-	chan-&gt;cfgval = ((chan-&gt;cfgval &amp; ~LI_CCFG_LOCK) |</div><div class='del'>-			SHIFT_FIELD(desc-&gt;ad1843_slot, LI_CCFG_SLOT) |</div><div class='del'>-			desc-&gt;direction |</div><div class='del'>-			mode |</div><div class='del'>-			format);</div><div class='del'>-</div><div class='del'>-	size = bufshift - 6;</div><div class='del'>-	tmask = 13 - fragshift;		/* See Lithium DMA Notes above. */</div><div class='del'>-	ASSERT(size &gt;= 2 &amp;&amp; size &lt;= 7);</div><div class='del'>-	ASSERT(tmask &gt;= 1 &amp;&amp; tmask &lt;= 7);</div><div class='del'>-	chan-&gt;ctlval = ((chan-&gt;ctlval &amp; ~LI_CCTL_RESET) |</div><div class='del'>-			SHIFT_FIELD(size, LI_CCTL_SIZE) |</div><div class='del'>-			(chan-&gt;ctlval &amp; ~LI_CCTL_DMA_ENABLE) |</div><div class='del'>-			SHIFT_FIELD(tmask, LI_CCTL_TMASK) |</div><div class='del'>-			SHIFT_FIELD(0, LI_CCTL_TPTR));</div><div class='del'>-</div><div class='del'>-	DBGPV("basereg 0x%x = 0x%lx\n", desc-&gt;basereg, chan-&gt;baseval);</div><div class='del'>-	DBGPV("cfgreg 0x%x = 0x%lx\n", desc-&gt;cfgreg, chan-&gt;cfgval);</div><div class='del'>-	DBGPV("ctlreg 0x%x = 0x%lx\n", desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-</div><div class='del'>-	li_writel(lith, desc-&gt;basereg, chan-&gt;baseval);</div><div class='del'>-	li_writel(lith, desc-&gt;cfgreg, chan-&gt;cfgval);</div><div class='del'>-	li_writel(lith, desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void li_shutdown_dma(dma_chan_t *chan)</div><div class='del'>-{</div><div class='del'>-	lithium_t *lith = chan-&gt;lith;</div><div class='del'>-	void * lith1 = lith-&gt;page1;</div><div class='del'>-</div><div class='del'>-	DBGEV("(chan=0x%p)\n", chan);</div><div class='del'>-	</div><div class='del'>-	chan-&gt;ctlval &amp;= ~LI_CCTL_DMA_ENABLE;</div><div class='del'>-	DBGPV("ctlreg 0x%x = 0x%lx\n", chan-&gt;desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-	li_writel(lith, chan-&gt;desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Offset 0x500 on Lithium page 1 is an undocumented,</div><div class='del'>-	 * unsupported register that holds the zero sample value.</div><div class='del'>-	 * Lithium is supposed to output zero samples when DMA is</div><div class='del'>-	 * inactive, and repeat the last sample when DMA underflows.</div><div class='del'>-	 * But it has a bug, where, after underflow occurs, the zero</div><div class='del'>-	 * sample is not reset.</div><div class='del'>-	 *</div><div class='del'>-	 * I expect this to break in a future rev of Lithium.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (lith1 &amp;&amp; chan-&gt;desc-&gt;direction == LI_CCFG_DIR_OUT)</div><div class='del'>-		* (volatile unsigned long *) (lith1 + 0x500) = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * li_activate_dma always starts dma at the beginning of the buffer.</div><div class='del'>- *</div><div class='del'>- * N.B., these may be called from interrupt.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static __inline__ void li_activate_dma(dma_chan_t *chan)</div><div class='del'>-{</div><div class='del'>-	chan-&gt;ctlval |= LI_CCTL_DMA_ENABLE;</div><div class='del'>-	DBGPV("ctlval = 0x%lx\n", chan-&gt;ctlval);</div><div class='del'>-	li_writel(chan-&gt;lith, chan-&gt;desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void li_deactivate_dma(dma_chan_t *chan)</div><div class='del'>-{</div><div class='del'>-	lithium_t *lith = chan-&gt;lith;</div><div class='del'>-	void * lith2 = lith-&gt;page2;</div><div class='del'>-</div><div class='del'>-	chan-&gt;ctlval &amp;= ~(LI_CCTL_DMA_ENABLE | LI_CCTL_RPTR | LI_CCTL_WPTR);</div><div class='del'>-	DBGPV("ctlval = 0x%lx\n", chan-&gt;ctlval);</div><div class='del'>-	DBGPV("ctlreg 0x%x = 0x%lx\n", chan-&gt;desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-	li_writel(lith, chan-&gt;desc-&gt;ctlreg, chan-&gt;ctlval);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Offsets 0x98 and 0x9C on Lithium page 2 are undocumented,</div><div class='del'>-	 * unsupported registers that are internal copies of the DMA</div><div class='del'>-	 * read and write pointers.  Because of a Lithium bug, these</div><div class='del'>-	 * registers aren't zeroed correctly when DMA is shut off.  So</div><div class='del'>-	 * we whack them directly.</div><div class='del'>-	 *</div><div class='del'>-	 * I expect this to break in a future rev of Lithium.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (lith2 &amp;&amp; chan-&gt;desc-&gt;direction == LI_CCFG_DIR_OUT) {</div><div class='del'>-		* (volatile unsigned long *) (lith2 + 0x98) = 0;</div><div class='del'>-		* (volatile unsigned long *) (lith2 + 0x9C) = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read/write the ring buffer pointers.  These routines' arguments and results</div><div class='del'>- * are byte offsets from the beginning of the ring buffer.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static __inline__ int li_read_swptr(dma_chan_t *chan)</div><div class='del'>-{</div><div class='del'>-	const unsigned long mask = chan-&gt;desc-&gt;swptrmask;</div><div class='del'>-</div><div class='del'>-	return CHUNKS_TO_BYTES(UNSHIFT_FIELD(chan-&gt;ctlval, mask));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ int li_read_hwptr(dma_chan_t *chan)</div><div class='del'>-{</div><div class='del'>-	return CHUNKS_TO_BYTES(li_readb(chan-&gt;lith, chan-&gt;desc-&gt;hwptrreg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ void li_write_swptr(dma_chan_t *chan, int val)</div><div class='del'>-{</div><div class='del'>-	const unsigned long mask = chan-&gt;desc-&gt;swptrmask;</div><div class='del'>-</div><div class='del'>-	ASSERT(!(val &amp; ~CHUNKS_TO_BYTES(0xFF)));</div><div class='del'>-	val = BYTES_TO_CHUNKS(val);</div><div class='del'>-	chan-&gt;ctlval = (chan-&gt;ctlval &amp; ~mask) | SHIFT_FIELD(val, mask);</div><div class='del'>-	li_writeb(chan-&gt;lith, chan-&gt;desc-&gt;swptrreg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* li_read_USTMSC() returns a UST/MSC pair for the given channel. */</div><div class='del'>-</div><div class='del'>-static void li_read_USTMSC(dma_chan_t *chan, ustmsc_t *ustmsc)</div><div class='del'>-{</div><div class='del'>-	lithium_t *lith = chan-&gt;lith;</div><div class='del'>-	const dma_chan_desc_t *desc = chan-&gt;desc;</div><div class='del'>-	unsigned long now_low, now_high0, now_high1, chan_ust;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;lith-&gt;lock);</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * retry until we do all five reads without the</div><div class='del'>-		 * high word changing.  (High word increments</div><div class='del'>-		 * every 2^32 microseconds, i.e., not often)</div><div class='del'>-		 */</div><div class='del'>-		do {</div><div class='del'>-			now_high0 = li_readl(lith, LI_UST_HIGH);</div><div class='del'>-			now_low = li_readl(lith, LI_UST_LOW);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Lithium guarantees these two reads will be</div><div class='del'>-			 * atomic -- ust will not increment after msc</div><div class='del'>-			 * is read.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			ustmsc-&gt;msc = li_readl(lith, desc-&gt;mscreg);</div><div class='del'>-			chan_ust = li_readl(lith, desc-&gt;ustreg);</div><div class='del'>-</div><div class='del'>-			now_high1 = li_readl(lith, LI_UST_HIGH);</div><div class='del'>-		} while (now_high0 != now_high1);</div><div class='del'>-	}	</div><div class='del'>-	spin_unlock(&amp;lith-&gt;lock);</div><div class='del'>-	ustmsc-&gt;ust = ((unsigned long long) now_high0 &lt;&lt; 32 | chan_ust);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void li_enable_interrupts(lithium_t *lith, unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	DBGEV("(lith=0x%p, mask=0x%x)\n", lith, mask);</div><div class='del'>-</div><div class='del'>-	/* clear any already-pending interrupts. */</div><div class='del'>-</div><div class='del'>-	li_writel(lith, LI_INTR_STATUS, mask);</div><div class='del'>-</div><div class='del'>-	/* enable the interrupts. */</div><div class='del'>-</div><div class='del'>-	mask |= li_readl(lith, LI_INTR_MASK);</div><div class='del'>-	li_writel(lith, LI_INTR_MASK, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void li_disable_interrupts(lithium_t *lith, unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	unsigned int keepmask;</div><div class='del'>-</div><div class='del'>-	DBGEV("(lith=0x%p, mask=0x%x)\n", lith, mask);</div><div class='del'>-</div><div class='del'>-	/* disable the interrupts */</div><div class='del'>-</div><div class='del'>-	keepmask = li_readl(lith, LI_INTR_MASK) &amp; ~mask;</div><div class='del'>-	li_writel(lith, LI_INTR_MASK, keepmask);</div><div class='del'>-</div><div class='del'>-	/* clear any pending interrupts. */</div><div class='del'>-</div><div class='del'>-	li_writel(lith, LI_INTR_STATUS, mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get the interrupt status and clear all pending interrupts. */</div><div class='del'>-</div><div class='del'>-static unsigned int li_get_clear_intr_status(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	unsigned int status;</div><div class='del'>-</div><div class='del'>-	status = li_readl(lith, LI_INTR_STATUS);</div><div class='del'>-	li_writel(lith, LI_INTR_STATUS, ~0);</div><div class='del'>-	return status &amp; li_readl(lith, LI_INTR_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int li_init(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	/* 1. System power supplies stabilize. */</div><div class='del'>-</div><div class='del'>-	/* 2. Assert the ~RESET signal. */</div><div class='del'>-</div><div class='del'>-	li_writel(lith, LI_HOST_CONTROLLER, LI_HC_RESET);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	/* 3. Deassert the ~RESET signal and enter a wait period to allow</div><div class='del'>-	   the AD1843 internal clocks and the external crystal oscillator</div><div class='del'>-	   to stabilize. */</div><div class='del'>-</div><div class='del'>-	li_writel(lith, LI_HOST_CONTROLLER, LI_HC_LINK_ENABLE);</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* AD1843 access */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1843 bitfield definitions.  All are named as in the AD1843 data</div><div class='del'>- * sheet, with ad1843_ prepended and individual bit numbers removed.</div><div class='del'>- *</div><div class='del'>- * E.g., bits LSS0 through LSS2 become ad1843_LSS.</div><div class='del'>- *</div><div class='del'>- * Only the bitfields we need are defined.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct ad1843_bitfield {</div><div class='del'>-	char reg;</div><div class='del'>-	char lo_bit;</div><div class='del'>-	char nbits;</div><div class='del'>-} ad1843_bitfield_t;</div><div class='del'>-</div><div class='del'>-static const ad1843_bitfield_t</div><div class='del'>-	ad1843_PDNO   = {  0, 14,  1 },	/* Converter Power-Down Flag */</div><div class='del'>-	ad1843_INIT   = {  0, 15,  1 },	/* Clock Initialization Flag */</div><div class='del'>-	ad1843_RIG    = {  2,  0,  4 },	/* Right ADC Input Gain */</div><div class='del'>-	ad1843_RMGE   = {  2,  4,  1 },	/* Right ADC Mic Gain Enable */</div><div class='del'>-	ad1843_RSS    = {  2,  5,  3 },	/* Right ADC Source Select */</div><div class='del'>-	ad1843_LIG    = {  2,  8,  4 },	/* Left ADC Input Gain */</div><div class='del'>-	ad1843_LMGE   = {  2, 12,  1 },	/* Left ADC Mic Gain Enable */</div><div class='del'>-	ad1843_LSS    = {  2, 13,  3 },	/* Left ADC Source Select */</div><div class='del'>-	ad1843_RX1M   = {  4,  0,  5 },	/* Right Aux 1 Mix Gain/Atten */</div><div class='del'>-	ad1843_RX1MM  = {  4,  7,  1 },	/* Right Aux 1 Mix Mute */</div><div class='del'>-	ad1843_LX1M   = {  4,  8,  5 },	/* Left Aux 1 Mix Gain/Atten */</div><div class='del'>-	ad1843_LX1MM  = {  4, 15,  1 },	/* Left Aux 1 Mix Mute */</div><div class='del'>-	ad1843_RX2M   = {  5,  0,  5 },	/* Right Aux 2 Mix Gain/Atten */</div><div class='del'>-	ad1843_RX2MM  = {  5,  7,  1 },	/* Right Aux 2 Mix Mute */</div><div class='del'>-	ad1843_LX2M   = {  5,  8,  5 },	/* Left Aux 2 Mix Gain/Atten */</div><div class='del'>-	ad1843_LX2MM  = {  5, 15,  1 },	/* Left Aux 2 Mix Mute */</div><div class='del'>-	ad1843_RMCM   = {  7,  0,  5 },	/* Right Mic Mix Gain/Atten */</div><div class='del'>-	ad1843_RMCMM  = {  7,  7,  1 },	/* Right Mic Mix Mute */</div><div class='del'>-	ad1843_LMCM   = {  7,  8,  5 },	/* Left Mic Mix Gain/Atten */</div><div class='del'>-	ad1843_LMCMM  = {  7, 15,  1 },	/* Left Mic Mix Mute */</div><div class='del'>-	ad1843_HPOS   = {  8,  4,  1 },	/* Headphone Output Voltage Swing */</div><div class='del'>-	ad1843_HPOM   = {  8,  5,  1 },	/* Headphone Output Mute */</div><div class='del'>-	ad1843_RDA1G  = {  9,  0,  6 },	/* Right DAC1 Analog/Digital Gain */</div><div class='del'>-	ad1843_RDA1GM = {  9,  7,  1 },	/* Right DAC1 Analog Mute */</div><div class='del'>-	ad1843_LDA1G  = {  9,  8,  6 },	/* Left DAC1 Analog/Digital Gain */</div><div class='del'>-	ad1843_LDA1GM = {  9, 15,  1 },	/* Left DAC1 Analog Mute */</div><div class='del'>-	ad1843_RDA1AM = { 11,  7,  1 },	/* Right DAC1 Digital Mute */</div><div class='del'>-	ad1843_LDA1AM = { 11, 15,  1 },	/* Left DAC1 Digital Mute */</div><div class='del'>-	ad1843_ADLC   = { 15,  0,  2 },	/* ADC Left Sample Rate Source */</div><div class='del'>-	ad1843_ADRC   = { 15,  2,  2 },	/* ADC Right Sample Rate Source */</div><div class='del'>-	ad1843_DA1C   = { 15,  8,  2 },	/* DAC1 Sample Rate Source */</div><div class='del'>-	ad1843_C1C    = { 17,  0, 16 },	/* Clock 1 Sample Rate Select */</div><div class='del'>-	ad1843_C2C    = { 20,  0, 16 },	/* Clock 1 Sample Rate Select */</div><div class='del'>-	ad1843_DAADL  = { 25,  4,  2 },	/* Digital ADC Left Source Select */</div><div class='del'>-	ad1843_DAADR  = { 25,  6,  2 },	/* Digital ADC Right Source Select */</div><div class='del'>-	ad1843_DRSFLT = { 25, 15,  1 },	/* Digital Reampler Filter Mode */</div><div class='del'>-	ad1843_ADLF   = { 26,  0,  2 }, /* ADC Left Channel Data Format */</div><div class='del'>-	ad1843_ADRF   = { 26,  2,  2 }, /* ADC Right Channel Data Format */</div><div class='del'>-	ad1843_ADTLK  = { 26,  4,  1 },	/* ADC Transmit Lock Mode Select */</div><div class='del'>-	ad1843_SCF    = { 26,  7,  1 },	/* SCLK Frequency Select */</div><div class='del'>-	ad1843_DA1F   = { 26,  8,  2 },	/* DAC1 Data Format Select */</div><div class='del'>-	ad1843_DA1SM  = { 26, 14,  1 },	/* DAC1 Stereo/Mono Mode Select */</div><div class='del'>-	ad1843_ADLEN  = { 27,  0,  1 },	/* ADC Left Channel Enable */</div><div class='del'>-	ad1843_ADREN  = { 27,  1,  1 },	/* ADC Right Channel Enable */</div><div class='del'>-	ad1843_AAMEN  = { 27,  4,  1 },	/* Analog to Analog Mix Enable */</div><div class='del'>-	ad1843_ANAEN  = { 27,  7,  1 },	/* Analog Channel Enable */</div><div class='del'>-	ad1843_DA1EN  = { 27,  8,  1 },	/* DAC1 Enable */</div><div class='del'>-	ad1843_DA2EN  = { 27,  9,  1 },	/* DAC2 Enable */</div><div class='del'>-	ad1843_C1EN   = { 28, 11,  1 },	/* Clock Generator 1 Enable */</div><div class='del'>-	ad1843_C2EN   = { 28, 12,  1 },	/* Clock Generator 2 Enable */</div><div class='del'>-	ad1843_PDNI   = { 28, 15,  1 };	/* Converter Power Down */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The various registers of the AD1843 use three different formats for</div><div class='del'>- * specifying gain.  The ad1843_gain structure parameterizes the</div><div class='del'>- * formats.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct ad1843_gain {</div><div class='del'>-</div><div class='del'>-	int	negative;		/* nonzero if gain is negative. */</div><div class='del'>-	const ad1843_bitfield_t *lfield;</div><div class='del'>-	const ad1843_bitfield_t *rfield;</div><div class='del'>-</div><div class='del'>-} ad1843_gain_t;</div><div class='del'>-</div><div class='del'>-static const ad1843_gain_t ad1843_gain_RECLEV</div><div class='del'>-				= { 0, &amp;ad1843_LIG,   &amp;ad1843_RIG };</div><div class='del'>-static const ad1843_gain_t ad1843_gain_LINE</div><div class='del'>-				= { 1, &amp;ad1843_LX1M,  &amp;ad1843_RX1M };</div><div class='del'>-static const ad1843_gain_t ad1843_gain_CD</div><div class='del'>-				= { 1, &amp;ad1843_LX2M,  &amp;ad1843_RX2M };</div><div class='del'>-static const ad1843_gain_t ad1843_gain_MIC</div><div class='del'>-				= { 1, &amp;ad1843_LMCM,  &amp;ad1843_RMCM };</div><div class='del'>-static const ad1843_gain_t ad1843_gain_PCM</div><div class='del'>-				= { 1, &amp;ad1843_LDA1G, &amp;ad1843_RDA1G };</div><div class='del'>-</div><div class='del'>-/* read the current value of an AD1843 bitfield. */</div><div class='del'>-</div><div class='del'>-static int ad1843_read_bits(lithium_t *lith, const ad1843_bitfield_t *field)</div><div class='del'>-{</div><div class='del'>-	int w = li_read_ad1843_reg(lith, field-&gt;reg);</div><div class='del'>-	int val = w &gt;&gt; field-&gt;lo_bit &amp; ((1 &lt;&lt; field-&gt;nbits) - 1);</div><div class='del'>-</div><div class='del'>-	DBGXV("ad1843_read_bits(lith=0x%p, field-&gt;{%d %d %d}) returns 0x%x\n",</div><div class='del'>-	      lith, field-&gt;reg, field-&gt;lo_bit, field-&gt;nbits, val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write a new value to an AD1843 bitfield and return the old value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_write_bits(lithium_t *lith,</div><div class='del'>-			     const ad1843_bitfield_t *field,</div><div class='del'>-			     int newval)</div><div class='del'>-{</div><div class='del'>-	int w = li_read_ad1843_reg(lith, field-&gt;reg);</div><div class='del'>-	int mask = ((1 &lt;&lt; field-&gt;nbits) - 1) &lt;&lt; field-&gt;lo_bit;</div><div class='del'>-	int oldval = (w &amp; mask) &gt;&gt; field-&gt;lo_bit;</div><div class='del'>-	int newbits = (newval &lt;&lt; field-&gt;lo_bit) &amp; mask;</div><div class='del'>-	w = (w &amp; ~mask) | newbits;</div><div class='del'>-	(void) li_write_ad1843_reg(lith, field-&gt;reg, w);</div><div class='del'>-</div><div class='del'>-	DBGXV("ad1843_write_bits(lith=0x%p, field-&gt;{%d %d %d}, val=0x%x) "</div><div class='del'>-	      "returns 0x%x\n",</div><div class='del'>-	      lith, field-&gt;reg, field-&gt;lo_bit, field-&gt;nbits, newval,</div><div class='del'>-	      oldval);</div><div class='del'>-</div><div class='del'>-	return oldval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ad1843_read_multi reads multiple bitfields from the same AD1843</div><div class='del'>- * register.  It uses a single read cycle to do it.  (Reading the</div><div class='del'>- * ad1843 requires 256 bit times at 12.288 MHz, or nearly 20</div><div class='del'>- * microseconds.)</div><div class='del'>- *</div><div class='del'>- * Called ike this.</div><div class='del'>- *</div><div class='del'>- *  ad1843_read_multi(lith, nfields,</div><div class='del'>- *		      &amp;ad1843_FIELD1, &amp;val1,</div><div class='del'>- *		      &amp;ad1843_FIELD2, &amp;val2, ...);</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void ad1843_read_multi(lithium_t *lith, int argcount, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	const ad1843_bitfield_t *fp;</div><div class='del'>-	int w = 0, mask, *value, reg = -1;</div><div class='del'>-</div><div class='del'>-	va_start(ap, argcount);</div><div class='del'>-	while (--argcount &gt;= 0) {</div><div class='del'>-		fp = va_arg(ap, const ad1843_bitfield_t *);</div><div class='del'>-		value = va_arg(ap, int *);</div><div class='del'>-		if (reg == -1) {</div><div class='del'>-			reg = fp-&gt;reg;</div><div class='del'>-			w = li_read_ad1843_reg(lith, reg);</div><div class='del'>-		}</div><div class='del'>-		ASSERT(reg == fp-&gt;reg);</div><div class='del'>-		mask = (1 &lt;&lt; fp-&gt;nbits) - 1;</div><div class='del'>-		*value = w &gt;&gt; fp-&gt;lo_bit &amp; mask;</div><div class='del'>-	}</div><div class='del'>-	va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ad1843_write_multi stores multiple bitfields into the same AD1843</div><div class='del'>- * register.  It uses one read and one write cycle to do it.</div><div class='del'>- *</div><div class='del'>- * Called like this.</div><div class='del'>- *</div><div class='del'>- *  ad1843_write_multi(lith, nfields,</div><div class='del'>- *		       &amp;ad1843_FIELD1, val1,</div><div class='del'>- *		       &amp;ad1843_FIELF2, val2, ...);</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void ad1843_write_multi(lithium_t *lith, int argcount, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	int reg;</div><div class='del'>-	const ad1843_bitfield_t *fp;</div><div class='del'>-	int value;</div><div class='del'>-	int w, m, mask, bits;</div><div class='del'>-</div><div class='del'>-	mask = 0;</div><div class='del'>-	bits = 0;</div><div class='del'>-	reg = -1;</div><div class='del'>-</div><div class='del'>-	va_start(ap, argcount);</div><div class='del'>-	while (--argcount &gt;= 0) {</div><div class='del'>-		fp = va_arg(ap, const ad1843_bitfield_t *);</div><div class='del'>-		value = va_arg(ap, int);</div><div class='del'>-		if (reg == -1)</div><div class='del'>-			reg = fp-&gt;reg;</div><div class='del'>-		ASSERT(fp-&gt;reg == reg);</div><div class='del'>-		m = ((1 &lt;&lt; fp-&gt;nbits) - 1) &lt;&lt; fp-&gt;lo_bit;</div><div class='del'>-		mask |= m;</div><div class='del'>-		bits |= (value &lt;&lt; fp-&gt;lo_bit) &amp; m;</div><div class='del'>-	}</div><div class='del'>-	va_end(ap);</div><div class='del'>-	ASSERT(!(bits &amp; ~mask));</div><div class='del'>-	if (~mask &amp; 0xFFFF)</div><div class='del'>-		w = li_read_ad1843_reg(lith, reg);</div><div class='del'>-	else</div><div class='del'>-		w = 0;</div><div class='del'>-	w = (w &amp; ~mask) | bits;</div><div class='del'>-	(void) li_write_ad1843_reg(lith, reg, w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ad1843_get_gain reads the specified register and extracts the gain value</div><div class='del'>- * using the supplied gain type.  It returns the gain in OSS format.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_get_gain(lithium_t *lith, const ad1843_gain_t *gp)</div><div class='del'>-{</div><div class='del'>-	int lg, rg;</div><div class='del'>-	unsigned short mask = (1 &lt;&lt; gp-&gt;lfield-&gt;nbits) - 1;</div><div class='del'>-</div><div class='del'>-	ad1843_read_multi(lith, 2, gp-&gt;lfield, &amp;lg, gp-&gt;rfield, &amp;rg);</div><div class='del'>-	if (gp-&gt;negative) {</div><div class='del'>-		lg = mask - lg;</div><div class='del'>-		rg = mask - rg;</div><div class='del'>-	}</div><div class='del'>-	lg = (lg * 100 + (mask &gt;&gt; 1)) / mask;</div><div class='del'>-	rg = (rg * 100 + (mask &gt;&gt; 1)) / mask;</div><div class='del'>-	return lg &lt;&lt; 0 | rg &lt;&lt; 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set an audio channel's gain. Converts from OSS format to AD1843's</div><div class='del'>- * format.</div><div class='del'>- *</div><div class='del'>- * Returns the new gain, which may be lower than the old gain.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_set_gain(lithium_t *lith,</div><div class='del'>-			   const ad1843_gain_t *gp,</div><div class='del'>-			   int newval)</div><div class='del'>-{</div><div class='del'>-	unsigned short mask = (1 &lt;&lt; gp-&gt;lfield-&gt;nbits) - 1;</div><div class='del'>-</div><div class='del'>-	int lg = newval &gt;&gt; 0 &amp; 0xFF;</div><div class='del'>-	int rg = newval &gt;&gt; 8;</div><div class='del'>-	if (lg &lt; 0 || lg &gt; 100 || rg &lt; 0 || rg &gt; 100)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	lg = (lg * mask + (mask &gt;&gt; 1)) / 100;</div><div class='del'>-	rg = (rg * mask + (mask &gt;&gt; 1)) / 100;</div><div class='del'>-	if (gp-&gt;negative) {</div><div class='del'>-		lg = mask - lg;</div><div class='del'>-		rg = mask - rg;</div><div class='del'>-	}</div><div class='del'>-	ad1843_write_multi(lith, 2, gp-&gt;lfield, lg, gp-&gt;rfield, rg);</div><div class='del'>-	return ad1843_get_gain(lith, gp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the current recording source, in OSS format. */</div><div class='del'>-</div><div class='del'>-static int ad1843_get_recsrc(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	int ls = ad1843_read_bits(lith, &amp;ad1843_LSS);</div><div class='del'>-</div><div class='del'>-	switch (ls) {</div><div class='del'>-	case 1:</div><div class='del'>-		return SOUND_MASK_MIC;</div><div class='del'>-	case 2:</div><div class='del'>-		return SOUND_MASK_LINE;</div><div class='del'>-	case 3:</div><div class='del'>-		return SOUND_MASK_CD;</div><div class='del'>-	case 6:</div><div class='del'>-		return SOUND_MASK_PCM;</div><div class='del'>-	default:</div><div class='del'>-		ASSERT(0);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enable/disable digital resample mode in the AD1843.</div><div class='del'>- *</div><div class='del'>- * The AD1843 requires that ADL, ADR, DA1 and DA2 be powered down</div><div class='del'>- * while switching modes.  So we save DA1's state (DA2's state is not</div><div class='del'>- * interesting), power them down, switch into/out of resample mode,</div><div class='del'>- * power them up, and restore state.</div><div class='del'>- *</div><div class='del'>- * This will cause audible glitches if D/A or A/D is going on, so the</div><div class='del'>- * driver disallows that (in mixer_write_ioctl()).</div><div class='del'>- *</div><div class='del'>- * The open question is, is this worth doing?  I'm leaving it in,</div><div class='del'>- * because it's written, but...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void ad1843_set_resample_mode(lithium_t *lith, int onoff)</div><div class='del'>-{</div><div class='del'>-	/* Save DA1 mute and gain (addr 9 is DA1 analog gain/attenuation) */</div><div class='del'>-	int save_da1 = li_read_ad1843_reg(lith, 9);</div><div class='del'>-</div><div class='del'>-	/* Power down A/D and D/A. */</div><div class='del'>-	ad1843_write_multi(lith, 4,</div><div class='del'>-			   &amp;ad1843_DA1EN, 0,</div><div class='del'>-			   &amp;ad1843_DA2EN, 0,</div><div class='del'>-			   &amp;ad1843_ADLEN, 0,</div><div class='del'>-			   &amp;ad1843_ADREN, 0);</div><div class='del'>-</div><div class='del'>-	/* Switch mode */</div><div class='del'>-	ASSERT(onoff == 0 || onoff == 1);</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_DRSFLT, onoff);</div><div class='del'>-</div><div class='del'>- 	/* Power up A/D and D/A. */</div><div class='del'>-	ad1843_write_multi(lith, 3,</div><div class='del'>-			   &amp;ad1843_DA1EN, 1,</div><div class='del'>-			   &amp;ad1843_ADLEN, 1,</div><div class='del'>-			   &amp;ad1843_ADREN, 1);</div><div class='del'>-</div><div class='del'>-	/* Restore DA1 mute and gain. */</div><div class='del'>-	li_write_ad1843_reg(lith, 9, save_da1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set recording source.  Arg newsrc specifies an OSS channel mask.</div><div class='del'>- *</div><div class='del'>- * The complication is that when we switch into/out of loopback mode</div><div class='del'>- * (i.e., src = SOUND_MASK_PCM), we change the AD1843 into/out of</div><div class='del'>- * digital resampling mode.</div><div class='del'>- *</div><div class='del'>- * Returns newsrc on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_set_recsrc(lithium_t *lith, int newsrc)</div><div class='del'>-{</div><div class='del'>-	int bits;</div><div class='del'>-	int oldbits;</div><div class='del'>-</div><div class='del'>-	switch (newsrc) {</div><div class='del'>-	case SOUND_MASK_PCM:</div><div class='del'>-		bits = 6;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MASK_MIC:</div><div class='del'>-		bits = 1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MASK_LINE:</div><div class='del'>-		bits = 2;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MASK_CD:</div><div class='del'>-		bits = 3;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	oldbits = ad1843_read_bits(lith, &amp;ad1843_LSS);</div><div class='del'>-	if (newsrc == SOUND_MASK_PCM &amp;&amp; oldbits != 6) {</div><div class='del'>-		DBGP("enabling digital resample mode\n");</div><div class='del'>-		ad1843_set_resample_mode(lith, 1);</div><div class='del'>-		ad1843_write_multi(lith, 2,</div><div class='del'>-				   &amp;ad1843_DAADL, 2,</div><div class='del'>-				   &amp;ad1843_DAADR, 2);</div><div class='del'>-	} else if (newsrc != SOUND_MASK_PCM &amp;&amp; oldbits == 6) {</div><div class='del'>-		DBGP("disabling digital resample mode\n");</div><div class='del'>-		ad1843_set_resample_mode(lith, 0);</div><div class='del'>-		ad1843_write_multi(lith, 2,</div><div class='del'>-				   &amp;ad1843_DAADL, 0,</div><div class='del'>-				   &amp;ad1843_DAADR, 0);</div><div class='del'>-	}</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LSS, bits, &amp;ad1843_RSS, bits);</div><div class='del'>-	return newsrc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Return current output sources, in OSS format.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_get_outsrc(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	int pcm, line, mic, cd;</div><div class='del'>-</div><div class='del'>-	pcm  = ad1843_read_bits(lith, &amp;ad1843_LDA1GM) ? 0 : SOUND_MASK_PCM;</div><div class='del'>-	line = ad1843_read_bits(lith, &amp;ad1843_LX1MM)  ? 0 : SOUND_MASK_LINE;</div><div class='del'>-	cd   = ad1843_read_bits(lith, &amp;ad1843_LX2MM)  ? 0 : SOUND_MASK_CD;</div><div class='del'>-	mic  = ad1843_read_bits(lith, &amp;ad1843_LMCMM)  ? 0 : SOUND_MASK_MIC;</div><div class='del'>-</div><div class='del'>-	return pcm | line | cd | mic;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set output sources.  Arg is a mask of active sources in OSS format.</div><div class='del'>- *</div><div class='del'>- * Returns source mask on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1843_set_outsrc(lithium_t *lith, int mask)</div><div class='del'>-{</div><div class='del'>-	int pcm, line, mic, cd;</div><div class='del'>-</div><div class='del'>-	if (mask &amp; ~(SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-		     SOUND_MASK_CD | SOUND_MASK_MIC))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	pcm  = (mask &amp; SOUND_MASK_PCM)  ? 0 : 1;</div><div class='del'>-	line = (mask &amp; SOUND_MASK_LINE) ? 0 : 1;</div><div class='del'>-	mic  = (mask &amp; SOUND_MASK_MIC)  ? 0 : 1;</div><div class='del'>-	cd   = (mask &amp; SOUND_MASK_CD)   ? 0 : 1;</div><div class='del'>-</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LDA1GM, pcm, &amp;ad1843_RDA1GM, pcm);</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LX1MM, line, &amp;ad1843_RX1MM, line);</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LX2MM, cd,   &amp;ad1843_RX2MM, cd);</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LMCMM, mic,  &amp;ad1843_RMCMM, mic);</div><div class='del'>-</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Setup ad1843 for D/A conversion. */</div><div class='del'>-</div><div class='del'>-static void ad1843_setup_dac(lithium_t *lith,</div><div class='del'>-			     int framerate,</div><div class='del'>-			     int fmt,</div><div class='del'>-			     int channels)</div><div class='del'>-{</div><div class='del'>-	int ad_fmt = 0, ad_mode = 0;</div><div class='del'>-</div><div class='del'>-	DBGEV("(lith=0x%p, framerate=%d, fmt=%d, channels=%d)\n",</div><div class='del'>-	      lith, framerate, fmt, channels);</div><div class='del'>-</div><div class='del'>-	switch (fmt) {</div><div class='del'>-	case AFMT_S8:		ad_fmt = 1; break;</div><div class='del'>-	case AFMT_U8:		ad_fmt = 1; break;</div><div class='del'>-	case AFMT_S16_LE:	ad_fmt = 1; break;</div><div class='del'>-	case AFMT_MU_LAW:	ad_fmt = 2; break;</div><div class='del'>-	case AFMT_A_LAW:	ad_fmt = 3; break;</div><div class='del'>-	default:		ASSERT(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (channels) {</div><div class='del'>-	case 2:			ad_mode = 0; break;</div><div class='del'>-	case 1:			ad_mode = 1; break;</div><div class='del'>-	default:		ASSERT(0);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	DBGPV("ad_mode = %d, ad_fmt = %d\n", ad_mode, ad_fmt);</div><div class='del'>-	ASSERT(framerate &gt;= 4000 &amp;&amp; framerate &lt;= 49000);</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_C1C, framerate);</div><div class='del'>-	ad1843_write_multi(lith, 2,</div><div class='del'>-			   &amp;ad1843_DA1SM, ad_mode, &amp;ad1843_DA1F, ad_fmt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1843_shutdown_dac(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_DA1F, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1843_setup_adc(lithium_t *lith, int framerate, int fmt, int channels)</div><div class='del'>-{</div><div class='del'>-	int da_fmt = 0;</div><div class='del'>-</div><div class='del'>-	DBGEV("(lith=0x%p, framerate=%d, fmt=%d, channels=%d)\n",</div><div class='del'>-	      lith, framerate, fmt, channels);</div><div class='del'>-</div><div class='del'>-	switch (fmt) {</div><div class='del'>-	case AFMT_S8:		da_fmt = 1; break;</div><div class='del'>-	case AFMT_U8:		da_fmt = 1; break;</div><div class='del'>-	case AFMT_S16_LE:	da_fmt = 1; break;</div><div class='del'>-	case AFMT_MU_LAW:	da_fmt = 2; break;</div><div class='del'>-	case AFMT_A_LAW:	da_fmt = 3; break;</div><div class='del'>-	default:		ASSERT(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBGPV("da_fmt = %d\n", da_fmt);</div><div class='del'>-	ASSERT(framerate &gt;= 4000 &amp;&amp; framerate &lt;= 49000);</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_C2C, framerate);</div><div class='del'>-	ad1843_write_multi(lith, 2,</div><div class='del'>-			   &amp;ad1843_ADLF, da_fmt, &amp;ad1843_ADRF, da_fmt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1843_shutdown_adc(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	/* nothing to do */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fully initialize the ad1843.  As described in the AD1843 data</div><div class='del'>- * sheet, section "START-UP SEQUENCE".  The numbered comments are</div><div class='del'>- * subsection headings from the data sheet.  See the data sheet, pages</div><div class='del'>- * 52-54, for more info.</div><div class='del'>- *</div><div class='del'>- * return 0 on success, -errno on failure.  */</div><div class='del'>-</div><div class='del'>-static int __init ad1843_init(lithium_t *lith)</div><div class='del'>-{</div><div class='del'>-	unsigned long later;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = li_init(lith);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (ad1843_read_bits(lith, &amp;ad1843_INIT) != 0) {</div><div class='del'>-		printk(KERN_ERR "vwsnd sound: AD1843 won't initialize\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_SCF, 1);</div><div class='del'>-</div><div class='del'>-	/* 4. Put the conversion resources into standby. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_PDNI, 0);</div><div class='del'>-	later = jiffies + HZ / 2;	/* roughly half a second */</div><div class='del'>-	DBGDO(shut_up++);</div><div class='del'>-	while (ad1843_read_bits(lith, &amp;ad1843_PDNO)) {</div><div class='del'>-		if (time_after(jiffies, later)) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "vwsnd audio: AD1843 won't power up\n");</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	DBGDO(shut_up--);</div><div class='del'>-</div><div class='del'>-	/* 5. Power up the clock generators and enable clock output pins. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_C1EN, 1, &amp;ad1843_C2EN, 1);</div><div class='del'>-</div><div class='del'>-	/* 6. Configure conversion resources while they are in standby. */</div><div class='del'>-</div><div class='del'>- 	/* DAC1 uses clock 1 as source, ADC uses clock 2.  Always. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_multi(lith, 3,</div><div class='del'>-			   &amp;ad1843_DA1C, 1,</div><div class='del'>-			   &amp;ad1843_ADLC, 2,</div><div class='del'>-			   &amp;ad1843_ADRC, 2);</div><div class='del'>-</div><div class='del'>-	/* 7. Enable conversion resources. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_ADTLK, 1);</div><div class='del'>-	ad1843_write_multi(lith, 5,</div><div class='del'>-			   &amp;ad1843_ANAEN, 1,</div><div class='del'>-			   &amp;ad1843_AAMEN, 1,</div><div class='del'>-			   &amp;ad1843_DA1EN, 1,</div><div class='del'>-			   &amp;ad1843_ADLEN, 1,</div><div class='del'>-			   &amp;ad1843_ADREN, 1);</div><div class='del'>-</div><div class='del'>-	/* 8. Configure conversion resources while they are enabled. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_bits(lith, &amp;ad1843_DA1C, 1);</div><div class='del'>-</div><div class='del'>-	/* Unmute all channels. */</div><div class='del'>-</div><div class='del'>-	ad1843_set_outsrc(lith,</div><div class='del'>-			  (SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-			   SOUND_MASK_MIC | SOUND_MASK_CD));</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LDA1AM, 0, &amp;ad1843_RDA1AM, 0);</div><div class='del'>-</div><div class='del'>-	/* Set default recording source to Line In and set</div><div class='del'>-	 * mic gain to +20 dB.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ad1843_set_recsrc(lith, SOUND_MASK_LINE);</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_LMGE, 1, &amp;ad1843_RMGE, 1);</div><div class='del'>-</div><div class='del'>-	/* Set Speaker Out level to +/- 4V and unmute it. */</div><div class='del'>-</div><div class='del'>-	ad1843_write_multi(lith, 2, &amp;ad1843_HPOS, 1, &amp;ad1843_HPOM, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* PCM I/O */</div><div class='del'>-</div><div class='del'>-#define READ_INTR_MASK  (LI_INTR_COMM1_TRIG | LI_INTR_COMM1_OVERFLOW)</div><div class='del'>-#define WRITE_INTR_MASK (LI_INTR_COMM2_TRIG | LI_INTR_COMM2_UNDERFLOW)</div><div class='del'>-</div><div class='del'>-typedef enum vwsnd_port_swstate {	/* software state */</div><div class='del'>-	SW_OFF,</div><div class='del'>-	SW_INITIAL,</div><div class='del'>-	SW_RUN,</div><div class='del'>-	SW_DRAIN,</div><div class='del'>-} vwsnd_port_swstate_t;</div><div class='del'>-</div><div class='del'>-typedef enum vwsnd_port_hwstate {	/* hardware state */</div><div class='del'>-	HW_STOPPED,</div><div class='del'>-	HW_RUNNING,</div><div class='del'>-} vwsnd_port_hwstate_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These flags are read by ISR, but only written at baseline.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef enum vwsnd_port_flags {</div><div class='del'>-	DISABLED = 1 &lt;&lt; 0,</div><div class='del'>-	ERFLOWN  = 1 &lt;&lt; 1,		/* overflown or underflown */</div><div class='del'>-	HW_BUSY  = 1 &lt;&lt; 2,</div><div class='del'>-} vwsnd_port_flags_t;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vwsnd_port is the per-port data structure.  Each device has two</div><div class='del'>- * ports, one for input and one for output.</div><div class='del'>- *</div><div class='del'>- * Locking:</div><div class='del'>- *</div><div class='del'>- *	port-&gt;lock protects: hwstate, flags, swb_[iu]_avail.</div><div class='del'>- *</div><div class='del'>- *	devc-&gt;io_mutex protects: swstate, sw_*, swb_[iu]_idx.</div><div class='del'>- *</div><div class='del'>- *	everything else is only written by open/release or</div><div class='del'>- *	pcm_{setup,shutdown}(), which are serialized by a</div><div class='del'>- *	combination of devc-&gt;open_mutex and devc-&gt;io_mutex.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct vwsnd_port {</div><div class='del'>-</div><div class='del'>-	spinlock_t	lock;</div><div class='del'>-	wait_queue_head_t queue;</div><div class='del'>-	vwsnd_port_swstate_t swstate;</div><div class='del'>-	vwsnd_port_hwstate_t hwstate;</div><div class='del'>-	vwsnd_port_flags_t flags;</div><div class='del'>-</div><div class='del'>-	int		sw_channels;</div><div class='del'>-	int		sw_samplefmt;</div><div class='del'>-	int		sw_framerate;</div><div class='del'>-	int		sample_size;</div><div class='del'>-	int		frame_size;</div><div class='del'>-	unsigned int	zero_word;	/* zero for the sample format */</div><div class='del'>-</div><div class='del'>-	int		sw_fragshift;</div><div class='del'>-	int		sw_fragcount;</div><div class='del'>-	int		sw_subdivshift;</div><div class='del'>-</div><div class='del'>-	unsigned int	hw_fragshift;</div><div class='del'>-	unsigned int	hw_fragsize;</div><div class='del'>-	unsigned int	hw_fragcount;</div><div class='del'>-</div><div class='del'>-	int		hwbuf_size;</div><div class='del'>-	unsigned long	hwbuf_paddr;</div><div class='del'>-	unsigned long	hwbuf_vaddr;</div><div class='del'>-	void *		hwbuf;		/* hwbuf == hwbuf_vaddr */</div><div class='del'>-	int		hwbuf_max;	/* max bytes to preload */</div><div class='del'>-</div><div class='del'>-	void *		swbuf;</div><div class='del'>-	unsigned int	swbuf_size;	/* size in bytes */</div><div class='del'>-	unsigned int	swb_u_idx;	/* index of next user byte */</div><div class='del'>-	unsigned int	swb_i_idx;	/* index of next intr byte */</div><div class='del'>-	unsigned int	swb_u_avail;	/* # bytes avail to user */</div><div class='del'>-	unsigned int	swb_i_avail;	/* # bytes avail to intr */</div><div class='del'>-</div><div class='del'>-	dma_chan_t	chan;</div><div class='del'>-</div><div class='del'>-	/* Accounting */</div><div class='del'>-</div><div class='del'>-	int		byte_count;</div><div class='del'>-	int		frag_count;</div><div class='del'>-	int		MSC_offset;</div><div class='del'>-</div><div class='del'>-} vwsnd_port_t;</div><div class='del'>-</div><div class='del'>-/* vwsnd_dev is the per-device data structure. */</div><div class='del'>-</div><div class='del'>-typedef struct vwsnd_dev {</div><div class='del'>-	struct vwsnd_dev *next_dev;</div><div class='del'>-	int		audio_minor;	/* minor number of audio device */</div><div class='del'>-	int		mixer_minor;	/* minor number of mixer device */</div><div class='del'>-</div><div class='del'>-	struct mutex open_mutex;</div><div class='del'>-	struct mutex io_mutex;</div><div class='del'>-	struct mutex mix_mutex;</div><div class='del'>-	fmode_t		open_mode;</div><div class='del'>-	wait_queue_head_t open_wait;</div><div class='del'>-</div><div class='del'>-	lithium_t	lith;</div><div class='del'>-</div><div class='del'>-	vwsnd_port_t	rport;</div><div class='del'>-	vwsnd_port_t	wport;</div><div class='del'>-} vwsnd_dev_t;</div><div class='del'>-</div><div class='del'>-static vwsnd_dev_t *vwsnd_dev_list;	/* linked list of all devices */</div><div class='del'>-</div><div class='del'>-static atomic_t vwsnd_use_count = ATOMIC_INIT(0);</div><div class='del'>-</div><div class='del'>-# define INC_USE_COUNT (atomic_inc(&amp;vwsnd_use_count))</div><div class='del'>-# define DEC_USE_COUNT (atomic_dec(&amp;vwsnd_use_count))</div><div class='del'>-# define IN_USE        (atomic_read(&amp;vwsnd_use_count) != 0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lithium can only DMA multiples of 32 bytes.  Its DMA buffer may</div><div class='del'>- * be up to 8 Kb.  This driver always uses 8 Kb.</div><div class='del'>- *</div><div class='del'>- * Memory bug workaround -- I'm not sure what's going on here, but</div><div class='del'>- * somehow pcm_copy_out() was triggering segv's going on to the next</div><div class='del'>- * page of the hw buffer.  So, I make the hw buffer one size bigger</div><div class='del'>- * than we actually use.  That way, the following page is allocated</div><div class='del'>- * and mapped, and no error.  I suspect that something is broken</div><div class='del'>- * in Cobalt, but haven't really investigated.  HBO is the actual</div><div class='del'>- * size of the buffer, and HWBUF_ORDER is what we allocate.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define HWBUF_SHIFT 13</div><div class='del'>-#define HWBUF_SIZE (1 &lt;&lt; HWBUF_SHIFT)</div><div class='del'>-# define HBO         (HWBUF_SHIFT &gt; PAGE_SHIFT ? HWBUF_SHIFT - PAGE_SHIFT : 0)</div><div class='del'>-# define HWBUF_ORDER (HBO + 1)		/* next size bigger */</div><div class='del'>-#define MIN_SPEED 4000</div><div class='del'>-#define MAX_SPEED 49000</div><div class='del'>-</div><div class='del'>-#define MIN_FRAGSHIFT			(DMACHUNK_SHIFT + 1)</div><div class='del'>-#define MAX_FRAGSHIFT			(PAGE_SHIFT)</div><div class='del'>-#define MIN_FRAGSIZE			(1 &lt;&lt; MIN_FRAGSHIFT)</div><div class='del'>-#define MAX_FRAGSIZE			(1 &lt;&lt; MAX_FRAGSHIFT)</div><div class='del'>-#define MIN_FRAGCOUNT(fragsize)		3</div><div class='del'>-#define MAX_FRAGCOUNT(fragsize)		(32 * PAGE_SIZE / (fragsize))</div><div class='del'>-#define DEFAULT_FRAGSHIFT		12</div><div class='del'>-#define DEFAULT_FRAGCOUNT		16</div><div class='del'>-#define DEFAULT_SUBDIVSHIFT		0</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The software buffer (swbuf) is a ring buffer shared between user</div><div class='del'>- * level and interrupt level.  Each level owns some of the bytes in</div><div class='del'>- * the buffer, and may give bytes away by calling swb_inc_{u,i}().</div><div class='del'>- * User level calls _u for user, and interrupt level calls _i for</div><div class='del'>- * interrupt.</div><div class='del'>- *</div><div class='del'>- * port-&gt;swb_{u,i}_avail is the number of bytes available to that level.</div><div class='del'>- *</div><div class='del'>- * port-&gt;swb_{u,i}_idx is the index of the first available byte in the</div><div class='del'>- * buffer.</div><div class='del'>- *</div><div class='del'>- * Each level calls swb_inc_{u,i}() to atomically increment its index,</div><div class='del'>- * recalculate the number of bytes available for both sides, and</div><div class='del'>- * return the number of bytes available.  Since each side can only</div><div class='del'>- * give away bytes, the other side can only increase the number of</div><div class='del'>- * bytes available to this side.  Each side updates its own index</div><div class='del'>- * variable, swb_{u,i}_idx, so no lock is needed to read it.</div><div class='del'>- *</div><div class='del'>- * To query the number of bytes available, call swb_inc_{u,i} with an</div><div class='del'>- * increment of zero.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int __swb_inc_u(vwsnd_port_t *port, int inc)</div><div class='del'>-{</div><div class='del'>-	if (inc) {</div><div class='del'>-		port-&gt;swb_u_idx += inc;</div><div class='del'>-		port-&gt;swb_u_idx %= port-&gt;swbuf_size;</div><div class='del'>-		port-&gt;swb_u_avail -= inc;</div><div class='del'>-		port-&gt;swb_i_avail += inc;</div><div class='del'>-	}</div><div class='del'>-	return port-&gt;swb_u_avail;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int swb_inc_u(vwsnd_port_t *port, int inc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;port-&gt;lock, flags);</div><div class='del'>-	{</div><div class='del'>-		ret = __swb_inc_u(port, inc);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;port-&gt;lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int __swb_inc_i(vwsnd_port_t *port, int inc)</div><div class='del'>-{</div><div class='del'>-	if (inc) {</div><div class='del'>-		port-&gt;swb_i_idx += inc;</div><div class='del'>-		port-&gt;swb_i_idx %= port-&gt;swbuf_size;</div><div class='del'>-		port-&gt;swb_i_avail -= inc;</div><div class='del'>-		port-&gt;swb_u_avail += inc;</div><div class='del'>-	}</div><div class='del'>-	return port-&gt;swb_i_avail;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ unsigned int swb_inc_i(vwsnd_port_t *port, int inc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;port-&gt;lock, flags);</div><div class='del'>-	{</div><div class='del'>-		ret = __swb_inc_i(port, inc);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;port-&gt;lock, flags);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_setup - this routine initializes all port state after</div><div class='del'>- * mode-setting ioctls have been done, but before the first I/O is</div><div class='del'>- * done.</div><div class='del'>- *</div><div class='del'>- * Locking: called with devc-&gt;io_mutex held.</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int pcm_setup(vwsnd_dev_t *devc,</div><div class='del'>-		     vwsnd_port_t *rport,</div><div class='del'>-		     vwsnd_port_t *wport)</div><div class='del'>-{</div><div class='del'>-	vwsnd_port_t *aport = rport ? rport : wport;</div><div class='del'>-	int sample_size;</div><div class='del'>-	unsigned int zero_word;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, rport=0x%p, wport=0x%p)\n", devc, rport, wport);</div><div class='del'>-</div><div class='del'>-	ASSERT(aport != NULL);</div><div class='del'>-	if (aport-&gt;swbuf != NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	switch (aport-&gt;sw_samplefmt) {</div><div class='del'>-	case AFMT_MU_LAW:</div><div class='del'>-		sample_size = 1;</div><div class='del'>-		zero_word = 0xFFFFFFFF ^ 0x80808080;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AFMT_A_LAW:</div><div class='del'>-		sample_size = 1;</div><div class='del'>-		zero_word = 0xD5D5D5D5 ^ 0x80808080;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AFMT_U8:</div><div class='del'>-		sample_size = 1;</div><div class='del'>-		zero_word = 0x80808080;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AFMT_S8:</div><div class='del'>-		sample_size = 1;</div><div class='del'>-		zero_word = 0x00000000;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AFMT_S16_LE:</div><div class='del'>-		sample_size = 2;</div><div class='del'>-		zero_word = 0x00000000;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		sample_size = 0;	/* prevent compiler warning */</div><div class='del'>-		zero_word = 0;</div><div class='del'>-		ASSERT(0);</div><div class='del'>-	}</div><div class='del'>-	aport-&gt;sample_size  = sample_size;</div><div class='del'>-	aport-&gt;zero_word    = zero_word;</div><div class='del'>-	aport-&gt;frame_size   = aport-&gt;sw_channels * aport-&gt;sample_size;</div><div class='del'>-	aport-&gt;hw_fragshift = aport-&gt;sw_fragshift - aport-&gt;sw_subdivshift;</div><div class='del'>-	aport-&gt;hw_fragsize  = 1 &lt;&lt; aport-&gt;hw_fragshift;</div><div class='del'>-	aport-&gt;hw_fragcount = aport-&gt;sw_fragcount &lt;&lt; aport-&gt;sw_subdivshift;</div><div class='del'>-	ASSERT(aport-&gt;hw_fragsize &gt;= MIN_FRAGSIZE);</div><div class='del'>-	ASSERT(aport-&gt;hw_fragsize &lt;= MAX_FRAGSIZE);</div><div class='del'>-	ASSERT(aport-&gt;hw_fragcount &gt;= MIN_FRAGCOUNT(aport-&gt;hw_fragsize));</div><div class='del'>-	ASSERT(aport-&gt;hw_fragcount &lt;= MAX_FRAGCOUNT(aport-&gt;hw_fragsize));</div><div class='del'>-	if (rport) {</div><div class='del'>-		int hwfrags, swfrags;</div><div class='del'>-		rport-&gt;hwbuf_max = aport-&gt;hwbuf_size - DMACHUNK_SIZE;</div><div class='del'>-		hwfrags = rport-&gt;hwbuf_max &gt;&gt; aport-&gt;hw_fragshift;</div><div class='del'>-		swfrags = aport-&gt;hw_fragcount - hwfrags;</div><div class='del'>-		if (swfrags &lt; 2)</div><div class='del'>-			swfrags = 2;</div><div class='del'>-		rport-&gt;swbuf_size = swfrags * aport-&gt;hw_fragsize;</div><div class='del'>-		DBGPV("hwfrags = %d, swfrags = %d\n", hwfrags, swfrags);</div><div class='del'>-		DBGPV("read hwbuf_max = %d, swbuf_size = %d\n",</div><div class='del'>-		     rport-&gt;hwbuf_max, rport-&gt;swbuf_size);</div><div class='del'>-	}</div><div class='del'>-	if (wport) {</div><div class='del'>-		int hwfrags, swfrags;</div><div class='del'>-		int total_bytes = aport-&gt;hw_fragcount * aport-&gt;hw_fragsize;</div><div class='del'>-		wport-&gt;hwbuf_max = aport-&gt;hwbuf_size - DMACHUNK_SIZE;</div><div class='del'>-		if (wport-&gt;hwbuf_max &gt; total_bytes)</div><div class='del'>-			wport-&gt;hwbuf_max = total_bytes;</div><div class='del'>-		hwfrags = wport-&gt;hwbuf_max &gt;&gt; aport-&gt;hw_fragshift;</div><div class='del'>-		DBGPV("hwfrags = %d\n", hwfrags);</div><div class='del'>-		swfrags = aport-&gt;hw_fragcount - hwfrags;</div><div class='del'>-		if (swfrags &lt; 2)</div><div class='del'>-			swfrags = 2;</div><div class='del'>-		wport-&gt;swbuf_size = swfrags * aport-&gt;hw_fragsize;</div><div class='del'>-		DBGPV("hwfrags = %d, swfrags = %d\n", hwfrags, swfrags);</div><div class='del'>-		DBGPV("write hwbuf_max = %d, swbuf_size = %d\n",</div><div class='del'>-		     wport-&gt;hwbuf_max, wport-&gt;swbuf_size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	aport-&gt;swb_u_idx    = 0;</div><div class='del'>-	aport-&gt;swb_i_idx    = 0;</div><div class='del'>-	aport-&gt;byte_count   = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Is this a Cobalt bug?  We need to make this buffer extend</div><div class='del'>-	 * one page further than we actually use -- somehow memcpy</div><div class='del'>-	 * causes an exceptoin otherwise.  I suspect there's a bug in</div><div class='del'>-	 * Cobalt (or somewhere) where it's generating a fault on a</div><div class='del'>-	 * speculative load or something.  Obviously, I haven't taken</div><div class='del'>-	 * the time to track it down.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	aport-&gt;swbuf        = vmalloc(aport-&gt;swbuf_size + PAGE_SIZE);</div><div class='del'>-	if (!aport-&gt;swbuf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (rport &amp;&amp; wport) {</div><div class='del'>-		ASSERT(aport == rport);</div><div class='del'>-		ASSERT(wport-&gt;swbuf == NULL);</div><div class='del'>-		/* One extra page - see comment above. */</div><div class='del'>-		wport-&gt;swbuf = vmalloc(aport-&gt;swbuf_size + PAGE_SIZE);</div><div class='del'>-		if (!wport-&gt;swbuf) {</div><div class='del'>-			vfree(aport-&gt;swbuf);</div><div class='del'>-			aport-&gt;swbuf = NULL;</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		wport-&gt;sample_size  = rport-&gt;sample_size;</div><div class='del'>-		wport-&gt;zero_word    = rport-&gt;zero_word;</div><div class='del'>-		wport-&gt;frame_size   = rport-&gt;frame_size;</div><div class='del'>-		wport-&gt;hw_fragshift = rport-&gt;hw_fragshift;</div><div class='del'>-		wport-&gt;hw_fragsize  = rport-&gt;hw_fragsize;</div><div class='del'>-		wport-&gt;hw_fragcount = rport-&gt;hw_fragcount;</div><div class='del'>-		wport-&gt;swbuf_size   = rport-&gt;swbuf_size;</div><div class='del'>-		wport-&gt;hwbuf_max    = rport-&gt;hwbuf_max;</div><div class='del'>-		wport-&gt;swb_u_idx    = rport-&gt;swb_u_idx;</div><div class='del'>-		wport-&gt;swb_i_idx    = rport-&gt;swb_i_idx;</div><div class='del'>-		wport-&gt;byte_count   = rport-&gt;byte_count;</div><div class='del'>-	}</div><div class='del'>-	if (rport) {</div><div class='del'>-		rport-&gt;swb_u_avail = 0;</div><div class='del'>-		rport-&gt;swb_i_avail = rport-&gt;swbuf_size;</div><div class='del'>-		rport-&gt;swstate = SW_RUN;</div><div class='del'>-		li_setup_dma(&amp;rport-&gt;chan,</div><div class='del'>-			     &amp;li_comm1,</div><div class='del'>-			     &amp;devc-&gt;lith,</div><div class='del'>-			     rport-&gt;hwbuf_paddr,</div><div class='del'>-			     HWBUF_SHIFT,</div><div class='del'>-			     rport-&gt;hw_fragshift,</div><div class='del'>-			     rport-&gt;sw_channels,</div><div class='del'>-			     rport-&gt;sample_size);</div><div class='del'>-		ad1843_setup_adc(&amp;devc-&gt;lith,</div><div class='del'>-				 rport-&gt;sw_framerate,</div><div class='del'>-				 rport-&gt;sw_samplefmt,</div><div class='del'>-				 rport-&gt;sw_channels);</div><div class='del'>-		li_enable_interrupts(&amp;devc-&gt;lith, READ_INTR_MASK);</div><div class='del'>-		if (!(rport-&gt;flags &amp; DISABLED)) {</div><div class='del'>-			ustmsc_t ustmsc;</div><div class='del'>-			rport-&gt;hwstate = HW_RUNNING;</div><div class='del'>-			li_activate_dma(&amp;rport-&gt;chan);</div><div class='del'>-			li_read_USTMSC(&amp;rport-&gt;chan, &amp;ustmsc);</div><div class='del'>-			rport-&gt;MSC_offset = ustmsc.msc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (wport) {</div><div class='del'>-		if (wport-&gt;hwbuf_max &gt; wport-&gt;swbuf_size)</div><div class='del'>-			wport-&gt;hwbuf_max = wport-&gt;swbuf_size;</div><div class='del'>-		wport-&gt;flags &amp;= ~ERFLOWN;</div><div class='del'>-		wport-&gt;swb_u_avail = wport-&gt;swbuf_size;</div><div class='del'>-		wport-&gt;swb_i_avail = 0;</div><div class='del'>-		wport-&gt;swstate = SW_RUN;</div><div class='del'>-		li_setup_dma(&amp;wport-&gt;chan,</div><div class='del'>-			     &amp;li_comm2,</div><div class='del'>-			     &amp;devc-&gt;lith,</div><div class='del'>-			     wport-&gt;hwbuf_paddr,</div><div class='del'>-			     HWBUF_SHIFT,</div><div class='del'>-			     wport-&gt;hw_fragshift,</div><div class='del'>-			     wport-&gt;sw_channels,</div><div class='del'>-			     wport-&gt;sample_size);</div><div class='del'>-		ad1843_setup_dac(&amp;devc-&gt;lith,</div><div class='del'>-				 wport-&gt;sw_framerate,</div><div class='del'>-				 wport-&gt;sw_samplefmt,</div><div class='del'>-				 wport-&gt;sw_channels);</div><div class='del'>-		li_enable_interrupts(&amp;devc-&gt;lith, WRITE_INTR_MASK);</div><div class='del'>-	}</div><div class='del'>-	DBGRV();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_shutdown_port - shut down one port (direction) for PCM I/O.</div><div class='del'>- * Only called from pcm_shutdown.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_shutdown_port(vwsnd_dev_t *devc,</div><div class='del'>-			      vwsnd_port_t *aport,</div><div class='del'>-			      unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	vwsnd_port_hwstate_t hwstate;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-</div><div class='del'>-	aport-&gt;swstate = SW_INITIAL;</div><div class='del'>-	add_wait_queue(&amp;aport-&gt;queue, &amp;wait);</div><div class='del'>-	while (1) {</div><div class='del'>-		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-		spin_lock_irqsave(&amp;aport-&gt;lock, flags);</div><div class='del'>-		{</div><div class='del'>-			hwstate = aport-&gt;hwstate;</div><div class='del'>-		}		</div><div class='del'>-		spin_unlock_irqrestore(&amp;aport-&gt;lock, flags);</div><div class='del'>-		if (hwstate == HW_STOPPED)</div><div class='del'>-			break;</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	current-&gt;state = TASK_RUNNING;</div><div class='del'>-	remove_wait_queue(&amp;aport-&gt;queue, &amp;wait);</div><div class='del'>-	li_disable_interrupts(&amp;devc-&gt;lith, mask);</div><div class='del'>-	if (aport == &amp;devc-&gt;rport)</div><div class='del'>-		ad1843_shutdown_adc(&amp;devc-&gt;lith);</div><div class='del'>-	else /* aport == &amp;devc-&gt;wport) */</div><div class='del'>-		ad1843_shutdown_dac(&amp;devc-&gt;lith);</div><div class='del'>-	li_shutdown_dma(&amp;aport-&gt;chan);</div><div class='del'>-	vfree(aport-&gt;swbuf);</div><div class='del'>-	aport-&gt;swbuf = NULL;</div><div class='del'>-	aport-&gt;byte_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_shutdown undoes what pcm_setup did.</div><div class='del'>- * Also sets the ports' swstate to newstate.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_shutdown(vwsnd_dev_t *devc,</div><div class='del'>-			 vwsnd_port_t *rport,</div><div class='del'>-			 vwsnd_port_t *wport)</div><div class='del'>-{</div><div class='del'>-	DBGEV("(devc=0x%p, rport=0x%p, wport=0x%p)\n", devc, rport, wport);</div><div class='del'>-</div><div class='del'>-	if (rport &amp;&amp; rport-&gt;swbuf) {</div><div class='del'>-		DBGPV("shutting down rport\n");</div><div class='del'>-		pcm_shutdown_port(devc, rport, READ_INTR_MASK);</div><div class='del'>-	}</div><div class='del'>-	if (wport &amp;&amp; wport-&gt;swbuf) {</div><div class='del'>-		DBGPV("shutting down wport\n");</div><div class='del'>-		pcm_shutdown_port(devc, wport, WRITE_INTR_MASK);</div><div class='del'>-	}</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pcm_copy_in(vwsnd_port_t *rport, int swidx, int hwidx, int nb)</div><div class='del'>-{</div><div class='del'>-	char *src = rport-&gt;hwbuf + hwidx;</div><div class='del'>-	char *dst = rport-&gt;swbuf + swidx;</div><div class='del'>-	int fmt = rport-&gt;sw_samplefmt;</div><div class='del'>-</div><div class='del'>-	DBGPV("swidx = %d, hwidx = %d\n", swidx, hwidx);</div><div class='del'>-	ASSERT(rport-&gt;hwbuf != NULL);</div><div class='del'>-	ASSERT(rport-&gt;swbuf != NULL);</div><div class='del'>-	ASSERT(nb &gt; 0 &amp;&amp; (nb % 32) == 0);</div><div class='del'>-	ASSERT(swidx % 32 == 0 &amp;&amp; hwidx % 32 == 0);</div><div class='del'>-	ASSERT(swidx &gt;= 0 &amp;&amp; swidx + nb &lt;= rport-&gt;swbuf_size);</div><div class='del'>-	ASSERT(hwidx &gt;= 0 &amp;&amp; hwidx + nb &lt;= rport-&gt;hwbuf_size);</div><div class='del'>-</div><div class='del'>-	if (fmt == AFMT_MU_LAW || fmt == AFMT_A_LAW || fmt == AFMT_S8) {</div><div class='del'>-</div><div class='del'>-		/* See Sample Format Notes above. */</div><div class='del'>-</div><div class='del'>-		char *end = src + nb;</div><div class='del'>-		while (src &lt; end)</div><div class='del'>-			*dst++ = *src++ ^ 0x80;</div><div class='del'>-	} else</div><div class='del'>-		memcpy(dst, src, nb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pcm_copy_out(vwsnd_port_t *wport, int swidx, int hwidx, int nb)</div><div class='del'>-{</div><div class='del'>-	char *src = wport-&gt;swbuf + swidx;</div><div class='del'>-	char *dst = wport-&gt;hwbuf + hwidx;</div><div class='del'>-	int fmt = wport-&gt;sw_samplefmt;</div><div class='del'>-</div><div class='del'>-	ASSERT(nb &gt; 0 &amp;&amp; (nb % 32) == 0);</div><div class='del'>-	ASSERT(wport-&gt;hwbuf != NULL);</div><div class='del'>-	ASSERT(wport-&gt;swbuf != NULL);</div><div class='del'>-	ASSERT(swidx % 32 == 0 &amp;&amp; hwidx % 32 == 0);</div><div class='del'>-	ASSERT(swidx &gt;= 0 &amp;&amp; swidx + nb &lt;= wport-&gt;swbuf_size);</div><div class='del'>-	ASSERT(hwidx &gt;= 0 &amp;&amp; hwidx + nb &lt;= wport-&gt;hwbuf_size);</div><div class='del'>-	if (fmt == AFMT_MU_LAW || fmt == AFMT_A_LAW || fmt == AFMT_S8) {</div><div class='del'>-</div><div class='del'>-		/* See Sample Format Notes above. */</div><div class='del'>-</div><div class='del'>-		char *end = src + nb;</div><div class='del'>-		while (src &lt; end)</div><div class='del'>-			*dst++ = *src++ ^ 0x80;</div><div class='del'>-	} else</div><div class='del'>-		memcpy(dst, src, nb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_output() is called both from baselevel and from interrupt level.</div><div class='del'>- * This is where audio frames are copied into the hardware-accessible</div><div class='del'>- * ring buffer.</div><div class='del'>- *</div><div class='del'>- * Locking note: The part of this routine that figures out what to do</div><div class='del'>- * holds wport-&gt;lock.  The longer part releases wport-&gt;lock, but sets</div><div class='del'>- * wport-&gt;flags &amp; HW_BUSY.  Afterward, it reacquires wport-&gt;lock, and</div><div class='del'>- * checks for more work to do.</div><div class='del'>- *</div><div class='del'>- * If another thread calls pcm_output() while HW_BUSY is set, it</div><div class='del'>- * returns immediately, knowing that the thread that set HW_BUSY will</div><div class='del'>- * look for more work to do before returning.</div><div class='del'>- *</div><div class='del'>- * This has the advantage that port-&gt;lock is held for several short</div><div class='del'>- * periods instead of one long period.  Also, when pcm_output is</div><div class='del'>- * called from base level, it reenables interrupts.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_output(vwsnd_dev_t *devc, int erflown, int nb)</div><div class='del'>-{</div><div class='del'>-	vwsnd_port_t *wport = &amp;devc-&gt;wport;</div><div class='del'>-	const int hwmax  = wport-&gt;hwbuf_max;</div><div class='del'>-	const int hwsize = wport-&gt;hwbuf_size;</div><div class='del'>-	const int swsize = wport-&gt;swbuf_size;</div><div class='del'>-	const int fragsize = wport-&gt;hw_fragsize;</div><div class='del'>-	unsigned long iflags;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, erflown=%d, nb=%d)\n", devc, erflown, nb);</div><div class='del'>-	spin_lock_irqsave(&amp;wport-&gt;lock, iflags);</div><div class='del'>-	if (erflown)</div><div class='del'>-		wport-&gt;flags |= ERFLOWN;</div><div class='del'>-	(void) __swb_inc_u(wport, nb);</div><div class='del'>-	if (wport-&gt;flags &amp; HW_BUSY) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, iflags);</div><div class='del'>-		DBGPV("returning: HW BUSY\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (wport-&gt;flags &amp; DISABLED) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, iflags);</div><div class='del'>-		DBGPV("returning: DISABLED\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	wport-&gt;flags |= HW_BUSY;</div><div class='del'>-	while (1) {</div><div class='del'>-		int swptr, hwptr, hw_avail, sw_avail, swidx;</div><div class='del'>-		vwsnd_port_hwstate_t hwstate = wport-&gt;hwstate;</div><div class='del'>-		vwsnd_port_swstate_t swstate = wport-&gt;swstate;</div><div class='del'>-		int hw_unavail;</div><div class='del'>-		ustmsc_t ustmsc;</div><div class='del'>-</div><div class='del'>-		hwptr = li_read_hwptr(&amp;wport-&gt;chan);</div><div class='del'>-		swptr = li_read_swptr(&amp;wport-&gt;chan);</div><div class='del'>-		hw_unavail = (swptr - hwptr + hwsize) % hwsize;</div><div class='del'>-		hw_avail = (hwmax - hw_unavail) &amp; -fragsize;</div><div class='del'>-		sw_avail = wport-&gt;swb_i_avail &amp; -fragsize;</div><div class='del'>-		if (sw_avail &amp;&amp; swstate == SW_RUN) {</div><div class='del'>-			if (wport-&gt;flags &amp; ERFLOWN) {</div><div class='del'>-				wport-&gt;flags &amp;= ~ERFLOWN;</div><div class='del'>-			}</div><div class='del'>-		} else if (swstate == SW_INITIAL ||</div><div class='del'>-			 swstate == SW_OFF ||</div><div class='del'>-			 (swstate == SW_DRAIN &amp;&amp;</div><div class='del'>-			  !sw_avail &amp;&amp;</div><div class='del'>-			  (wport-&gt;flags &amp; ERFLOWN))) {</div><div class='del'>-			DBGP("stopping.  hwstate = %d\n", hwstate);</div><div class='del'>-			if (hwstate != HW_STOPPED) {</div><div class='del'>-				li_deactivate_dma(&amp;wport-&gt;chan);</div><div class='del'>-				wport-&gt;hwstate = HW_STOPPED;</div><div class='del'>-			}</div><div class='del'>-			wake_up(&amp;wport-&gt;queue);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!sw_avail || !hw_avail)</div><div class='del'>-			break;</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, iflags);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We gave up the port lock, but we have the HW_BUSY flag.</div><div class='del'>-		 * Proceed without accessing any nonlocal state.</div><div class='del'>-		 * Do not exit the loop -- must check for more work.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		swidx = wport-&gt;swb_i_idx;</div><div class='del'>-		nb = hw_avail;</div><div class='del'>-		if (nb &gt; sw_avail)</div><div class='del'>-			nb = sw_avail;</div><div class='del'>-		if (nb &gt; hwsize - swptr)</div><div class='del'>-			nb = hwsize - swptr; /* don't overflow hwbuf */</div><div class='del'>-		if (nb &gt; swsize - swidx)</div><div class='del'>-			nb = swsize - swidx; /* don't overflow swbuf */</div><div class='del'>-		ASSERT(nb &gt; 0);</div><div class='del'>-		if (nb % fragsize) {</div><div class='del'>-			DBGP("nb = %d, fragsize = %d\n", nb, fragsize);</div><div class='del'>-			DBGP("hw_avail = %d\n", hw_avail);</div><div class='del'>-			DBGP("sw_avail = %d\n", sw_avail);</div><div class='del'>-			DBGP("hwsize = %d, swptr = %d\n", hwsize, swptr);</div><div class='del'>-			DBGP("swsize = %d, swidx = %d\n", swsize, swidx);</div><div class='del'>-		}</div><div class='del'>-		ASSERT(!(nb % fragsize));</div><div class='del'>-		DBGPV("copying swb[%d..%d] to hwb[%d..%d]\n",</div><div class='del'>-		      swidx, swidx + nb, swptr, swptr + nb);</div><div class='del'>-		pcm_copy_out(wport, swidx, swptr, nb);</div><div class='del'>-		li_write_swptr(&amp;wport-&gt;chan, (swptr + nb) % hwsize);</div><div class='del'>-		spin_lock_irqsave(&amp;wport-&gt;lock, iflags);</div><div class='del'>-		if (hwstate == HW_STOPPED) {</div><div class='del'>-			DBGPV("starting\n");</div><div class='del'>-			li_activate_dma(&amp;wport-&gt;chan);</div><div class='del'>-			wport-&gt;hwstate = HW_RUNNING;</div><div class='del'>-			li_read_USTMSC(&amp;wport-&gt;chan, &amp;ustmsc);</div><div class='del'>-			ASSERT(wport-&gt;byte_count % wport-&gt;frame_size == 0);</div><div class='del'>-			wport-&gt;MSC_offset = ustmsc.msc - wport-&gt;byte_count / wport-&gt;frame_size;</div><div class='del'>-		}</div><div class='del'>-		__swb_inc_i(wport, nb);</div><div class='del'>-		wport-&gt;byte_count += nb;</div><div class='del'>-		wport-&gt;frag_count += nb / fragsize;</div><div class='del'>-		ASSERT(nb % fragsize == 0);</div><div class='del'>-		wake_up(&amp;wport-&gt;queue);</div><div class='del'>-	}</div><div class='del'>-	wport-&gt;flags &amp;= ~HW_BUSY;</div><div class='del'>-	spin_unlock_irqrestore(&amp;wport-&gt;lock, iflags);</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_input() is called both from baselevel and from interrupt level.</div><div class='del'>- * This is where audio frames are copied out of the hardware-accessible</div><div class='del'>- * ring buffer.</div><div class='del'>- *</div><div class='del'>- * Locking note: The part of this routine that figures out what to do</div><div class='del'>- * holds rport-&gt;lock.  The longer part releases rport-&gt;lock, but sets</div><div class='del'>- * rport-&gt;flags &amp; HW_BUSY.  Afterward, it reacquires rport-&gt;lock, and</div><div class='del'>- * checks for more work to do.</div><div class='del'>- *</div><div class='del'>- * If another thread calls pcm_input() while HW_BUSY is set, it</div><div class='del'>- * returns immediately, knowing that the thread that set HW_BUSY will</div><div class='del'>- * look for more work to do before returning.</div><div class='del'>- *</div><div class='del'>- * This has the advantage that port-&gt;lock is held for several short</div><div class='del'>- * periods instead of one long period.  Also, when pcm_input is</div><div class='del'>- * called from base level, it reenables interrupts.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_input(vwsnd_dev_t *devc, int erflown, int nb)</div><div class='del'>-{</div><div class='del'>-	vwsnd_port_t *rport = &amp;devc-&gt;rport;</div><div class='del'>-	const int hwmax  = rport-&gt;hwbuf_max;</div><div class='del'>-	const int hwsize = rport-&gt;hwbuf_size;</div><div class='del'>-	const int swsize = rport-&gt;swbuf_size;</div><div class='del'>-	const int fragsize = rport-&gt;hw_fragsize;</div><div class='del'>-	unsigned long iflags;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, erflown=%d, nb=%d)\n", devc, erflown, nb);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;rport-&gt;lock, iflags);</div><div class='del'>-	if (erflown)</div><div class='del'>-		rport-&gt;flags |= ERFLOWN;</div><div class='del'>-	(void) __swb_inc_u(rport, nb);</div><div class='del'>-	if (rport-&gt;flags &amp; HW_BUSY || !rport-&gt;swbuf) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;rport-&gt;lock, iflags);</div><div class='del'>-		DBGPV("returning: HW BUSY or !swbuf\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (rport-&gt;flags &amp; DISABLED) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;rport-&gt;lock, iflags);</div><div class='del'>-		DBGPV("returning: DISABLED\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	rport-&gt;flags |= HW_BUSY;</div><div class='del'>-	while (1) {</div><div class='del'>-		int swptr, hwptr, hw_avail, sw_avail, swidx;</div><div class='del'>-		vwsnd_port_hwstate_t hwstate = rport-&gt;hwstate;</div><div class='del'>-		vwsnd_port_swstate_t swstate = rport-&gt;swstate;</div><div class='del'>-</div><div class='del'>-		hwptr = li_read_hwptr(&amp;rport-&gt;chan);</div><div class='del'>-		swptr = li_read_swptr(&amp;rport-&gt;chan);</div><div class='del'>-		hw_avail = (hwptr - swptr + hwsize) % hwsize &amp; -fragsize;</div><div class='del'>-		if (hw_avail &gt; hwmax)</div><div class='del'>-			hw_avail = hwmax;</div><div class='del'>-		sw_avail = rport-&gt;swb_i_avail &amp; -fragsize;</div><div class='del'>-		if (swstate != SW_RUN) {</div><div class='del'>-			DBGP("stopping.  hwstate = %d\n", hwstate);</div><div class='del'>-			if (hwstate != HW_STOPPED) {</div><div class='del'>-				li_deactivate_dma(&amp;rport-&gt;chan);</div><div class='del'>-				rport-&gt;hwstate = HW_STOPPED;</div><div class='del'>-			}</div><div class='del'>-			wake_up(&amp;rport-&gt;queue);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (!sw_avail || !hw_avail)</div><div class='del'>-			break;</div><div class='del'>-		spin_unlock_irqrestore(&amp;rport-&gt;lock, iflags);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We gave up the port lock, but we have the HW_BUSY flag.</div><div class='del'>-		 * Proceed without accessing any nonlocal state.</div><div class='del'>-		 * Do not exit the loop -- must check for more work.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		swidx = rport-&gt;swb_i_idx;</div><div class='del'>-		nb = hw_avail;</div><div class='del'>-		if (nb &gt; sw_avail)</div><div class='del'>-			nb = sw_avail;</div><div class='del'>-		if (nb &gt; hwsize - swptr)</div><div class='del'>-			nb = hwsize - swptr; /* don't overflow hwbuf */</div><div class='del'>-		if (nb &gt; swsize - swidx)</div><div class='del'>-			nb = swsize - swidx; /* don't overflow swbuf */</div><div class='del'>-		ASSERT(nb &gt; 0);</div><div class='del'>-		if (nb % fragsize) {</div><div class='del'>-			DBGP("nb = %d, fragsize = %d\n", nb, fragsize);</div><div class='del'>-			DBGP("hw_avail = %d\n", hw_avail);</div><div class='del'>-			DBGP("sw_avail = %d\n", sw_avail);</div><div class='del'>-			DBGP("hwsize = %d, swptr = %d\n", hwsize, swptr);</div><div class='del'>-			DBGP("swsize = %d, swidx = %d\n", swsize, swidx);</div><div class='del'>-		}</div><div class='del'>-		ASSERT(!(nb % fragsize));</div><div class='del'>-		DBGPV("copying hwb[%d..%d] to swb[%d..%d]\n",</div><div class='del'>-		      swptr, swptr + nb, swidx, swidx + nb);</div><div class='del'>-		pcm_copy_in(rport, swidx, swptr, nb);</div><div class='del'>-		li_write_swptr(&amp;rport-&gt;chan, (swptr + nb) % hwsize);</div><div class='del'>-		spin_lock_irqsave(&amp;rport-&gt;lock, iflags);</div><div class='del'>-		__swb_inc_i(rport, nb);</div><div class='del'>-		rport-&gt;byte_count += nb;</div><div class='del'>-		rport-&gt;frag_count += nb / fragsize;</div><div class='del'>-		ASSERT(nb % fragsize == 0);</div><div class='del'>-		wake_up(&amp;rport-&gt;queue);</div><div class='del'>-	}</div><div class='del'>-	rport-&gt;flags &amp;= ~HW_BUSY;</div><div class='del'>-	spin_unlock_irqrestore(&amp;rport-&gt;lock, iflags);</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * pcm_flush_frag() writes zero samples to fill the current fragment,</div><div class='del'>- * then flushes it to the hardware.</div><div class='del'>- *</div><div class='del'>- * It is only meaningful to flush output, not input.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_flush_frag(vwsnd_dev_t *devc)</div><div class='del'>-{</div><div class='del'>-	vwsnd_port_t *wport = &amp;devc-&gt;wport;</div><div class='del'>-</div><div class='del'>-	DBGPV("swstate = %d\n", wport-&gt;swstate);</div><div class='del'>-	if (wport-&gt;swstate == SW_RUN) {</div><div class='del'>-		int idx = wport-&gt;swb_u_idx;</div><div class='del'>-		int end = (idx + wport-&gt;hw_fragsize - 1)</div><div class='del'>-			&gt;&gt; wport-&gt;hw_fragshift</div><div class='del'>-			&lt;&lt; wport-&gt;hw_fragshift;</div><div class='del'>-		int nb = end - idx;</div><div class='del'>-		DBGPV("clearing %d bytes\n", nb);</div><div class='del'>-		if (nb)</div><div class='del'>-			memset(wport-&gt;swbuf + idx,</div><div class='del'>-			       (char) wport-&gt;zero_word,</div><div class='del'>-			       nb);</div><div class='del'>-		wport-&gt;swstate = SW_DRAIN;</div><div class='del'>-		pcm_output(devc, 0, nb);</div><div class='del'>-	}</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Wait for output to drain.  This sleeps uninterruptibly because</div><div class='del'>- * there is nothing intelligent we can do if interrupted.  This</div><div class='del'>- * means the process will be delayed in responding to the signal.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void pcm_write_sync(vwsnd_dev_t *devc)</div><div class='del'>-{</div><div class='del'>-	vwsnd_port_t *wport = &amp;devc-&gt;wport;</div><div class='del'>-	DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	vwsnd_port_hwstate_t hwstate;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p)\n", devc);</div><div class='del'>-	add_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-	while (1) {</div><div class='del'>-		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='del'>-		spin_lock_irqsave(&amp;wport-&gt;lock, flags);</div><div class='del'>-		{</div><div class='del'>-			hwstate = wport-&gt;hwstate;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, flags);</div><div class='del'>-		if (hwstate == HW_STOPPED)</div><div class='del'>-			break;</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-	current-&gt;state = TASK_RUNNING;</div><div class='del'>-	remove_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-	DBGPV("swstate = %d, hwstate = %d\n", wport-&gt;swstate, wport-&gt;hwstate);</div><div class='del'>-	DBGRV();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* audio driver */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * seek on an audio device always fails.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void vwsnd_audio_read_intr(vwsnd_dev_t *devc, unsigned int status)</div><div class='del'>-{</div><div class='del'>-	int overflown = status &amp; LI_INTR_COMM1_OVERFLOW;</div><div class='del'>-</div><div class='del'>-	if (status &amp; READ_INTR_MASK)</div><div class='del'>-		pcm_input(devc, overflown, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status)</div><div class='del'>-{</div><div class='del'>-	int underflown = status &amp; LI_INTR_COMM2_UNDERFLOW;</div><div class='del'>-</div><div class='del'>-	if (status &amp; WRITE_INTR_MASK)</div><div class='del'>-		pcm_output(devc, underflown, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = dev_id;</div><div class='del'>-	unsigned int status;</div><div class='del'>-</div><div class='del'>-	DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);</div><div class='del'>-</div><div class='del'>-	status = li_get_clear_intr_status(&amp;devc-&gt;lith);</div><div class='del'>-	vwsnd_audio_read_intr(devc, status);</div><div class='del'>-	vwsnd_audio_write_intr(devc, status);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t vwsnd_audio_do_read(struct file *file,</div><div class='del'>-				   char *buffer,</div><div class='del'>-				   size_t count,</div><div class='del'>-				   loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = file-&gt;private_data;</div><div class='del'>-	vwsnd_port_t *rport = ((file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-			       &amp;devc-&gt;rport : NULL);</div><div class='del'>-	int ret, nb;</div><div class='del'>-</div><div class='del'>-	DBGEV("(file=0x%p, buffer=0x%p, count=%d, ppos=0x%p)\n",</div><div class='del'>-	     file, buffer, count, ppos);</div><div class='del'>-</div><div class='del'>-	if (!rport)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (rport-&gt;swbuf == NULL) {</div><div class='del'>-		vwsnd_port_t *wport = (file-&gt;f_mode &amp; FMODE_WRITE) ?</div><div class='del'>-			&amp;devc-&gt;wport : NULL;</div><div class='del'>-		ret = pcm_setup(devc, rport, wport);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!access_ok(VERIFY_READ, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ret = 0;</div><div class='del'>-	while (count) {</div><div class='del'>-		DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-		add_wait_queue(&amp;rport-&gt;queue, &amp;wait);</div><div class='del'>-		while ((nb = swb_inc_u(rport, 0)) == 0) {</div><div class='del'>-			DBGPV("blocking\n");</div><div class='del'>-			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			if (rport-&gt;flags &amp; DISABLED ||</div><div class='del'>-			    file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				current-&gt;state = TASK_RUNNING;</div><div class='del'>-				remove_wait_queue(&amp;rport-&gt;queue, &amp;wait);</div><div class='del'>-				return ret ? ret : -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-			schedule();</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-				current-&gt;state = TASK_RUNNING;</div><div class='del'>-				remove_wait_queue(&amp;rport-&gt;queue, &amp;wait);</div><div class='del'>-				return ret ? ret : -ERESTARTSYS;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		current-&gt;state = TASK_RUNNING;</div><div class='del'>-		remove_wait_queue(&amp;rport-&gt;queue, &amp;wait);</div><div class='del'>-		pcm_input(devc, 0, 0);</div><div class='del'>-		/* nb bytes are available in userbuf. */</div><div class='del'>-		if (nb &gt; count)</div><div class='del'>-			nb = count;</div><div class='del'>-		DBGPV("nb = %d\n", nb);</div><div class='del'>-		if (copy_to_user(buffer, rport-&gt;swbuf + rport-&gt;swb_u_idx, nb))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		(void) swb_inc_u(rport, nb);</div><div class='del'>-		buffer += nb;</div><div class='del'>-		count -= nb;</div><div class='del'>-		ret += nb;</div><div class='del'>-	}</div><div class='del'>-	DBGPV("returning %d\n", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t vwsnd_audio_read(struct file *file,</div><div class='del'>-				char *buffer,</div><div class='del'>-				size_t count,</div><div class='del'>-				loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = file-&gt;private_data;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	ret = vwsnd_audio_do_read(file, buffer, count, ppos);</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t vwsnd_audio_do_write(struct file *file,</div><div class='del'>-				    const char *buffer,</div><div class='del'>-				    size_t count,</div><div class='del'>-				    loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = file-&gt;private_data;</div><div class='del'>-	vwsnd_port_t *wport = ((file-&gt;f_mode &amp; FMODE_WRITE) ?</div><div class='del'>-			       &amp;devc-&gt;wport : NULL);</div><div class='del'>-	int ret, nb;</div><div class='del'>-</div><div class='del'>-	DBGEV("(file=0x%p, buffer=0x%p, count=%d, ppos=0x%p)\n",</div><div class='del'>-	      file, buffer, count, ppos);</div><div class='del'>-</div><div class='del'>-	if (!wport)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (wport-&gt;swbuf == NULL) {</div><div class='del'>-		vwsnd_port_t *rport = (file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-			&amp;devc-&gt;rport : NULL;</div><div class='del'>-		ret = pcm_setup(devc, rport, wport);</div><div class='del'>-		if (ret &lt; 0)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-	if (!access_ok(VERIFY_WRITE, buffer, count))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	ret = 0;</div><div class='del'>-	while (count) {</div><div class='del'>-		DECLARE_WAITQUEUE(wait, current);</div><div class='del'>-		add_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-		while ((nb = swb_inc_u(wport, 0)) == 0) {</div><div class='del'>-			set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-			if (wport-&gt;flags &amp; DISABLED ||</div><div class='del'>-			    file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-				current-&gt;state = TASK_RUNNING;</div><div class='del'>-				remove_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-				return ret ? ret : -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-			schedule();</div><div class='del'>-			if (signal_pending(current)) {</div><div class='del'>-				current-&gt;state = TASK_RUNNING;</div><div class='del'>-				remove_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-				return ret ? ret : -ERESTARTSYS;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		current-&gt;state = TASK_RUNNING;</div><div class='del'>-		remove_wait_queue(&amp;wport-&gt;queue, &amp;wait);</div><div class='del'>-		/* nb bytes are available in userbuf. */</div><div class='del'>-		if (nb &gt; count)</div><div class='del'>-			nb = count;</div><div class='del'>-		DBGPV("nb = %d\n", nb);</div><div class='del'>-		if (copy_from_user(wport-&gt;swbuf + wport-&gt;swb_u_idx, buffer, nb))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		pcm_output(devc, 0, nb);</div><div class='del'>-		buffer += nb;</div><div class='del'>-		count -= nb;</div><div class='del'>-		ret += nb;</div><div class='del'>-	}</div><div class='del'>-	DBGPV("returning %d\n", ret);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t vwsnd_audio_write(struct file *file,</div><div class='del'>-				 const char *buffer,</div><div class='del'>-				 size_t count,</div><div class='del'>-				 loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = file-&gt;private_data;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	ret = vwsnd_audio_do_write(file, buffer, count, ppos);</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No kernel lock - fine */</div><div class='del'>-static unsigned int vwsnd_audio_poll(struct file *file,</div><div class='del'>-				     struct poll_table_struct *wait)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = (vwsnd_dev_t *) file-&gt;private_data;</div><div class='del'>-	vwsnd_port_t *rport = (file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-		&amp;devc-&gt;rport : NULL;</div><div class='del'>-	vwsnd_port_t *wport = (file-&gt;f_mode &amp; FMODE_WRITE) ?</div><div class='del'>-		&amp;devc-&gt;wport : NULL;</div><div class='del'>-	unsigned int mask = 0;</div><div class='del'>-</div><div class='del'>-	DBGEV("(file=0x%p, wait=0x%p)\n", file, wait);</div><div class='del'>-</div><div class='del'>-	ASSERT(rport || wport);</div><div class='del'>-	if (rport) {</div><div class='del'>-		poll_wait(file, &amp;rport-&gt;queue, wait);</div><div class='del'>-		if (swb_inc_u(rport, 0))</div><div class='del'>-			mask |= (POLLIN | POLLRDNORM);</div><div class='del'>-	}</div><div class='del'>-	if (wport) {</div><div class='del'>-		poll_wait(file, &amp;wport-&gt;queue, wait);</div><div class='del'>-		if (wport-&gt;swbuf == NULL || swb_inc_u(wport, 0))</div><div class='del'>-			mask |= (POLLOUT | POLLWRNORM);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DBGPV("returning 0x%x\n", mask);</div><div class='del'>-	return mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vwsnd_audio_do_ioctl(struct file *file,</div><div class='del'>-				unsigned int cmd,</div><div class='del'>-				unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = (vwsnd_dev_t *) file-&gt;private_data;</div><div class='del'>-	vwsnd_port_t *rport = (file-&gt;f_mode &amp; FMODE_READ) ?</div><div class='del'>-		&amp;devc-&gt;rport : NULL;</div><div class='del'>-	vwsnd_port_t *wport = (file-&gt;f_mode &amp; FMODE_WRITE) ?</div><div class='del'>-		&amp;devc-&gt;wport : NULL;</div><div class='del'>-	vwsnd_port_t *aport = rport ? rport : wport;</div><div class='del'>-	struct audio_buf_info buf_info;</div><div class='del'>-	struct count_info info;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ival;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	DBGEV("(file=0x%p, cmd=0x%x, arg=0x%lx)\n",</div><div class='del'>-	      file, cmd, arg);</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case OSS_GETVERSION:		/* _SIOR ('M', 118, int) */</div><div class='del'>-		DBGX("OSS_GETVERSION\n");</div><div class='del'>-		ival = SOUND_VERSION;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETCAPS:	/* _SIOR ('P',15, int) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETCAPS\n");</div><div class='del'>-		ival = DSP_CAP_DUPLEX | DSP_CAP_REALTIME | DSP_CAP_TRIGGER;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETFMTS:	/* _SIOR ('P',11, int) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETFMTS\n");</div><div class='del'>-		ival = (AFMT_S16_LE | AFMT_MU_LAW | AFMT_A_LAW |</div><div class='del'>-			AFMT_U8 | AFMT_S8);</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_RATE:	/* _SIOR ('P', 2, int) */</div><div class='del'>-		DBGX("SOUND_PCM_READ_RATE\n");</div><div class='del'>-		ival = aport-&gt;sw_framerate;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SOUND_PCM_READ_CHANNELS:	/* _SIOR ('P', 6, int) */</div><div class='del'>-		DBGX("SOUND_PCM_READ_CHANNELS\n");</div><div class='del'>-		ival = aport-&gt;sw_channels;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SPEED:		/* _SIOWR('P', 2, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_SPEED %d\n", ival);</div><div class='del'>-		if (ival) {</div><div class='del'>-			if (aport-&gt;swstate != SW_INITIAL) {</div><div class='del'>-				DBGX("SNDCTL_DSP_SPEED failed: swstate = %d\n",</div><div class='del'>-				     aport-&gt;swstate);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			if (ival &lt; MIN_SPEED)</div><div class='del'>-				ival = MIN_SPEED;</div><div class='del'>-			if (ival &gt; MAX_SPEED)</div><div class='del'>-				ival = MAX_SPEED;</div><div class='del'>-			if (rport)</div><div class='del'>-				rport-&gt;sw_framerate = ival;</div><div class='del'>-			if (wport)</div><div class='del'>-				wport-&gt;sw_framerate = ival;</div><div class='del'>-		} else</div><div class='del'>-			ival = aport-&gt;sw_framerate;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_STEREO:		/* _SIOWR('P', 3, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_STEREO %d\n", ival);</div><div class='del'>-		if (ival != 0 &amp;&amp; ival != 1)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (aport-&gt;swstate != SW_INITIAL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (rport)</div><div class='del'>-			rport-&gt;sw_channels = ival + 1;</div><div class='del'>-		if (wport)</div><div class='del'>-			wport-&gt;sw_channels = ival + 1;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_CHANNELS:	/* _SIOWR('P', 6, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_CHANNELS %d\n", ival);</div><div class='del'>-		if (ival != 1 &amp;&amp; ival != 2)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (aport-&gt;swstate != SW_INITIAL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (rport)</div><div class='del'>-			rport-&gt;sw_channels = ival;</div><div class='del'>-		if (wport)</div><div class='del'>-			wport-&gt;sw_channels = ival;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETBLKSIZE:	/* _SIOWR('P', 4, int) */</div><div class='del'>-		ival = pcm_setup(devc, rport, wport);</div><div class='del'>-		if (ival &lt; 0) {</div><div class='del'>-			DBGX("SNDCTL_DSP_GETBLKSIZE failed, errno %d\n", ival);</div><div class='del'>-			return ival;</div><div class='del'>-		}</div><div class='del'>-		ival = 1 &lt;&lt; aport-&gt;sw_fragshift;</div><div class='del'>-		DBGX("SNDCTL_DSP_GETBLKSIZE returning %d\n", ival);</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFRAGMENT:	/* _SIOWR('P',10, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_SETFRAGMENT %d:%d\n",</div><div class='del'>-		     ival &gt;&gt; 16, ival &amp; 0xFFFF);</div><div class='del'>-		if (aport-&gt;swstate != SW_INITIAL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		{</div><div class='del'>-			int sw_fragshift = ival &amp; 0xFFFF;</div><div class='del'>-			int sw_subdivshift = aport-&gt;sw_subdivshift;</div><div class='del'>-			int hw_fragshift = sw_fragshift - sw_subdivshift;</div><div class='del'>-			int sw_fragcount = (ival &gt;&gt; 16) &amp; 0xFFFF;</div><div class='del'>-			int hw_fragsize;</div><div class='del'>-			if (hw_fragshift &lt; MIN_FRAGSHIFT)</div><div class='del'>-				hw_fragshift = MIN_FRAGSHIFT;</div><div class='del'>-			if (hw_fragshift &gt; MAX_FRAGSHIFT)</div><div class='del'>-				hw_fragshift = MAX_FRAGSHIFT;</div><div class='del'>-			sw_fragshift = hw_fragshift + aport-&gt;sw_subdivshift;</div><div class='del'>-			hw_fragsize = 1 &lt;&lt; hw_fragshift;</div><div class='del'>-			if (sw_fragcount &lt; MIN_FRAGCOUNT(hw_fragsize))</div><div class='del'>-				sw_fragcount = MIN_FRAGCOUNT(hw_fragsize);</div><div class='del'>-			if (sw_fragcount &gt; MAX_FRAGCOUNT(hw_fragsize))</div><div class='del'>-				sw_fragcount = MAX_FRAGCOUNT(hw_fragsize);</div><div class='del'>-			DBGPV("sw_fragshift = %d\n", sw_fragshift);</div><div class='del'>-			DBGPV("rport = 0x%p, wport = 0x%p\n", rport, wport);</div><div class='del'>-			if (rport) {</div><div class='del'>-				rport-&gt;sw_fragshift = sw_fragshift;</div><div class='del'>-				rport-&gt;sw_fragcount = sw_fragcount;</div><div class='del'>-			}</div><div class='del'>-			if (wport) {</div><div class='del'>-				wport-&gt;sw_fragshift = sw_fragshift;</div><div class='del'>-				wport-&gt;sw_fragcount = sw_fragcount;</div><div class='del'>-			}</div><div class='del'>-			ival = sw_fragcount &lt;&lt; 16 | sw_fragshift;</div><div class='del'>-		}</div><div class='del'>-		DBGX("SNDCTL_DSP_SETFRAGMENT returns %d:%d\n",</div><div class='del'>-		      ival &gt;&gt; 16, ival &amp; 0xFFFF);</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SUBDIVIDE:	/* _SIOWR('P', 9, int) */</div><div class='del'>-                if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_SUBDIVIDE %d\n", ival);</div><div class='del'>-		if (aport-&gt;swstate != SW_INITIAL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		{</div><div class='del'>-			int subdivshift;</div><div class='del'>-			int hw_fragshift, hw_fragsize, hw_fragcount;</div><div class='del'>-			switch (ival) {</div><div class='del'>-			case 1: subdivshift = 0; break;</div><div class='del'>-			case 2: subdivshift = 1; break;</div><div class='del'>-			case 4: subdivshift = 2; break;</div><div class='del'>-			default: return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			hw_fragshift = aport-&gt;sw_fragshift - subdivshift;</div><div class='del'>-			if (hw_fragshift &lt; MIN_FRAGSHIFT ||</div><div class='del'>-			    hw_fragshift &gt; MAX_FRAGSHIFT)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			hw_fragsize = 1 &lt;&lt; hw_fragshift;</div><div class='del'>-			hw_fragcount = aport-&gt;sw_fragcount &gt;&gt; subdivshift;</div><div class='del'>-			if (hw_fragcount &lt; MIN_FRAGCOUNT(hw_fragsize) ||</div><div class='del'>-			    hw_fragcount &gt; MAX_FRAGCOUNT(hw_fragsize))</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			if (rport)</div><div class='del'>-				rport-&gt;sw_subdivshift = subdivshift;</div><div class='del'>-			if (wport)</div><div class='del'>-				wport-&gt;sw_subdivshift = subdivshift;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETFMT:		/* _SIOWR('P',5, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_SETFMT %d\n", ival);</div><div class='del'>-		if (ival != AFMT_QUERY) {</div><div class='del'>-			if (aport-&gt;swstate != SW_INITIAL) {</div><div class='del'>-				DBGP("SETFMT failed, swstate = %d\n",</div><div class='del'>-				     aport-&gt;swstate);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			switch (ival) {</div><div class='del'>-			case AFMT_MU_LAW:</div><div class='del'>-			case AFMT_A_LAW:</div><div class='del'>-			case AFMT_U8:</div><div class='del'>-			case AFMT_S8:</div><div class='del'>-			case AFMT_S16_LE:</div><div class='del'>-				if (rport)</div><div class='del'>-					rport-&gt;sw_samplefmt = ival;</div><div class='del'>-				if (wport)</div><div class='del'>-					wport-&gt;sw_samplefmt = ival;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ival = aport-&gt;sw_samplefmt;</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOSPACE:	/* _SIOR ('P',12, audio_buf_info) */</div><div class='del'>-		DBGXV("SNDCTL_DSP_GETOSPACE\n");</div><div class='del'>-		if (!wport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		ival = pcm_setup(devc, rport, wport);</div><div class='del'>-		if (ival &lt; 0)</div><div class='del'>-			return ival;</div><div class='del'>-		ival = swb_inc_u(wport, 0);</div><div class='del'>-		buf_info.fragments = ival &gt;&gt; wport-&gt;sw_fragshift;</div><div class='del'>-		buf_info.fragstotal = wport-&gt;sw_fragcount;</div><div class='del'>-		buf_info.fragsize = 1 &lt;&lt; wport-&gt;sw_fragshift;</div><div class='del'>-		buf_info.bytes = ival;</div><div class='del'>-		DBGXV("SNDCTL_DSP_GETOSPACE returns { %d %d %d %d }\n",</div><div class='del'>-		     buf_info.fragments, buf_info.fragstotal,</div><div class='del'>-		     buf_info.fragsize, buf_info.bytes);</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;buf_info, sizeof buf_info))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETISPACE:	/* _SIOR ('P',13, audio_buf_info) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETISPACE\n");</div><div class='del'>-		if (!rport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		ival = pcm_setup(devc, rport, wport);</div><div class='del'>-		if (ival &lt; 0)</div><div class='del'>-			return ival;</div><div class='del'>-		ival = swb_inc_u(rport, 0);</div><div class='del'>-		buf_info.fragments = ival &gt;&gt; rport-&gt;sw_fragshift;</div><div class='del'>-		buf_info.fragstotal = rport-&gt;sw_fragcount;</div><div class='del'>-		buf_info.fragsize = 1 &lt;&lt; rport-&gt;sw_fragshift;</div><div class='del'>-		buf_info.bytes = ival;</div><div class='del'>-		DBGX("SNDCTL_DSP_GETISPACE returns { %d %d %d %d }\n",</div><div class='del'>-		     buf_info.fragments, buf_info.fragstotal,</div><div class='del'>-		     buf_info.fragsize, buf_info.bytes);</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;buf_info, sizeof buf_info))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_NONBLOCK:	/* _SIO  ('P',14) */</div><div class='del'>-		DBGX("SNDCTL_DSP_NONBLOCK\n");</div><div class='del'>-		spin_lock(&amp;file-&gt;f_lock);</div><div class='del'>-		file-&gt;f_flags |= O_NONBLOCK;</div><div class='del'>-		spin_unlock(&amp;file-&gt;f_lock);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_RESET:		/* _SIO  ('P', 0) */</div><div class='del'>-		DBGX("SNDCTL_DSP_RESET\n");</div><div class='del'>-		/*</div><div class='del'>-		 * Nothing special needs to be done for input.  Input</div><div class='del'>-		 * samples sit in swbuf, but it will be reinitialized</div><div class='del'>-		 * to empty when pcm_setup() is called.</div><div class='del'>-		 */</div><div class='del'>-		if (wport &amp;&amp; wport-&gt;swbuf) {</div><div class='del'>-			wport-&gt;swstate = SW_INITIAL;</div><div class='del'>-			pcm_output(devc, 0, 0);</div><div class='del'>-			pcm_write_sync(devc);</div><div class='del'>-		}</div><div class='del'>-		pcm_shutdown(devc, rport, wport);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SYNC:		/* _SIO  ('P', 1) */</div><div class='del'>-		DBGX("SNDCTL_DSP_SYNC\n");</div><div class='del'>-		if (wport) {</div><div class='del'>-			pcm_flush_frag(devc);</div><div class='del'>-			pcm_write_sync(devc);</div><div class='del'>-		}</div><div class='del'>-		pcm_shutdown(devc, rport, wport);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_POST:		/* _SIO  ('P', 8) */</div><div class='del'>-		DBGX("SNDCTL_DSP_POST\n");</div><div class='del'>-		if (!wport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		pcm_flush_frag(devc);</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETIPTR:	/* _SIOR ('P', 17, count_info) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETIPTR\n");</div><div class='del'>-		if (!rport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;rport-&gt;lock, flags);</div><div class='del'>-		{</div><div class='del'>-			ustmsc_t ustmsc;</div><div class='del'>-			if (rport-&gt;hwstate == HW_RUNNING) {</div><div class='del'>-				ASSERT(rport-&gt;swstate == SW_RUN);</div><div class='del'>-				li_read_USTMSC(&amp;rport-&gt;chan, &amp;ustmsc);</div><div class='del'>-				info.bytes = ustmsc.msc - rport-&gt;MSC_offset;</div><div class='del'>-				info.bytes *= rport-&gt;frame_size;</div><div class='del'>-			} else {</div><div class='del'>-				info.bytes = rport-&gt;byte_count;</div><div class='del'>-			}</div><div class='del'>-			info.blocks = rport-&gt;frag_count;</div><div class='del'>-			info.ptr = 0;	/* not implemented */</div><div class='del'>-			rport-&gt;frag_count = 0;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;rport-&gt;lock, flags);</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;info, sizeof info))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETOPTR:	/* _SIOR ('P',18, count_info) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETOPTR\n");</div><div class='del'>-		if (!wport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;wport-&gt;lock, flags);</div><div class='del'>-		{</div><div class='del'>-			ustmsc_t ustmsc;</div><div class='del'>-			if (wport-&gt;hwstate == HW_RUNNING) {</div><div class='del'>-				ASSERT(wport-&gt;swstate == SW_RUN);</div><div class='del'>-				li_read_USTMSC(&amp;wport-&gt;chan, &amp;ustmsc);</div><div class='del'>-				info.bytes = ustmsc.msc - wport-&gt;MSC_offset;</div><div class='del'>-				info.bytes *= wport-&gt;frame_size;</div><div class='del'>-			} else {</div><div class='del'>-				info.bytes = wport-&gt;byte_count;</div><div class='del'>-			}</div><div class='del'>-			info.blocks = wport-&gt;frag_count;</div><div class='del'>-			info.ptr = 0;	/* not implemented */</div><div class='del'>-			wport-&gt;frag_count = 0;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, flags);</div><div class='del'>-		if (copy_to_user((void *) arg, &amp;info, sizeof info))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETODELAY:	/* _SIOR ('P', 23, int) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETODELAY\n");</div><div class='del'>-		if (!wport)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		spin_lock_irqsave(&amp;wport-&gt;lock, flags);</div><div class='del'>-		{</div><div class='del'>-			int fsize = wport-&gt;frame_size;</div><div class='del'>-			ival = wport-&gt;swb_i_avail / fsize;</div><div class='del'>-			if (wport-&gt;hwstate == HW_RUNNING) {</div><div class='del'>-				int swptr, hwptr, hwframes, hwbytes, hwsize;</div><div class='del'>-				int totalhwbytes;</div><div class='del'>-				ustmsc_t ustmsc;</div><div class='del'>-</div><div class='del'>-				hwsize = wport-&gt;hwbuf_size;</div><div class='del'>-				swptr = li_read_swptr(&amp;wport-&gt;chan);</div><div class='del'>-				li_read_USTMSC(&amp;wport-&gt;chan, &amp;ustmsc);</div><div class='del'>-				hwframes = ustmsc.msc - wport-&gt;MSC_offset;</div><div class='del'>-				totalhwbytes = hwframes * fsize;</div><div class='del'>-				hwptr = totalhwbytes % hwsize;</div><div class='del'>-				hwbytes = (swptr - hwptr + hwsize) % hwsize;</div><div class='del'>-				ival += hwbytes / fsize;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;wport-&gt;lock, flags);</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_PROFILE:	/* _SIOW ('P', 23, int) */</div><div class='del'>-		DBGX("SNDCTL_DSP_PROFILE\n");</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Thomas Sailer explains SNDCTL_DSP_PROFILE</div><div class='del'>-		 * (private email, March 24, 1999):</div><div class='del'>-		 *</div><div class='del'>-		 *     This gives the sound driver a hint on what it</div><div class='del'>-		 *     should do with partial fragments</div><div class='del'>-		 *     (i.e. fragments partially filled with write).</div><div class='del'>-		 *     This can direct the driver to zero them or</div><div class='del'>-		 *     leave them alone.  But don't ask me what this</div><div class='del'>-		 *     is good for, my driver just zeroes the last</div><div class='del'>-		 *     fragment before the receiver stops, no idea</div><div class='del'>-		 *     what good for any other behaviour could</div><div class='del'>-		 *     be. Implementing it as NOP seems safe.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_GETTRIGGER:	/* _SIOR ('P',16, int) */</div><div class='del'>-		DBGX("SNDCTL_DSP_GETTRIGGER\n");</div><div class='del'>-		ival = 0;</div><div class='del'>-		if (rport) {</div><div class='del'>-			spin_lock_irqsave(&amp;rport-&gt;lock, flags);</div><div class='del'>-			{</div><div class='del'>-				if (!(rport-&gt;flags &amp; DISABLED))</div><div class='del'>-					ival |= PCM_ENABLE_INPUT;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;rport-&gt;lock, flags);</div><div class='del'>-		}</div><div class='del'>-		if (wport) {</div><div class='del'>-			spin_lock_irqsave(&amp;wport-&gt;lock, flags);</div><div class='del'>-			{</div><div class='del'>-				if (!(wport-&gt;flags &amp; DISABLED))</div><div class='del'>-					ival |= PCM_ENABLE_OUTPUT;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;wport-&gt;lock, flags);</div><div class='del'>-		}</div><div class='del'>-		return put_user(ival, (int *) arg);</div><div class='del'>-</div><div class='del'>-	case SNDCTL_DSP_SETTRIGGER:	/* _SIOW ('P',16, int) */</div><div class='del'>-		if (get_user(ival, (int *) arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		DBGX("SNDCTL_DSP_SETTRIGGER %d\n", ival);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * If user is disabling I/O and port is not in initial</div><div class='del'>-		 * state, fail with EINVAL.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (((rport &amp;&amp; !(ival &amp; PCM_ENABLE_INPUT)) ||</div><div class='del'>-		     (wport &amp;&amp; !(ival &amp; PCM_ENABLE_OUTPUT))) &amp;&amp;</div><div class='del'>-		    aport-&gt;swstate != SW_INITIAL)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		if (rport) {</div><div class='del'>-			vwsnd_port_hwstate_t hwstate;</div><div class='del'>-			spin_lock_irqsave(&amp;rport-&gt;lock, flags);</div><div class='del'>-			{</div><div class='del'>-				hwstate = rport-&gt;hwstate;</div><div class='del'>-				if (ival &amp; PCM_ENABLE_INPUT)</div><div class='del'>-					rport-&gt;flags &amp;= ~DISABLED;</div><div class='del'>-				else</div><div class='del'>-					rport-&gt;flags |= DISABLED;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;rport-&gt;lock, flags);</div><div class='del'>-			if (hwstate != HW_RUNNING &amp;&amp; ival &amp; PCM_ENABLE_INPUT) {</div><div class='del'>-</div><div class='del'>-				if (rport-&gt;swstate == SW_INITIAL)</div><div class='del'>-					pcm_setup(devc, rport, wport);</div><div class='del'>-				else</div><div class='del'>-					li_activate_dma(&amp;rport-&gt;chan);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (wport) {</div><div class='del'>-			vwsnd_port_flags_t pflags;</div><div class='del'>-			spin_lock_irqsave(&amp;wport-&gt;lock, flags);</div><div class='del'>-			{</div><div class='del'>-				pflags = wport-&gt;flags;</div><div class='del'>-				if (ival &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-					wport-&gt;flags &amp;= ~DISABLED;</div><div class='del'>-				else</div><div class='del'>-					wport-&gt;flags |= DISABLED;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_irqrestore(&amp;wport-&gt;lock, flags);</div><div class='del'>-			if (pflags &amp; DISABLED &amp;&amp; ival &amp; PCM_ENABLE_OUTPUT) {</div><div class='del'>-				if (wport-&gt;swstate == SW_RUN)</div><div class='del'>-					pcm_output(devc, 0, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		DBGP("unknown ioctl 0x%x\n", cmd);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	DBGP("unimplemented ioctl 0x%x\n", cmd);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long vwsnd_audio_ioctl(struct file *file,</div><div class='del'>-				unsigned int cmd,</div><div class='del'>-				unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = (vwsnd_dev_t *) file-&gt;private_data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vwsnd_mutex);</div><div class='del'>-	mutex_lock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	ret = vwsnd_audio_do_ioctl(file, cmd, arg);</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* No mmap. */</div><div class='del'>-</div><div class='del'>-static int vwsnd_audio_mmap(struct file *file, struct vm_area_struct *vma)</div><div class='del'>-{</div><div class='del'>-	DBGE("(file=0x%p, vma=0x%p)\n", file, vma);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open the audio device for read and/or write.</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int vwsnd_audio_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc;</div><div class='del'>-	int minor = iminor(inode);</div><div class='del'>-	int sw_samplefmt;</div><div class='del'>-</div><div class='del'>-	DBGE("(inode=0x%p, file=0x%p)\n", inode, file);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vwsnd_mutex);</div><div class='del'>-	INC_USE_COUNT;</div><div class='del'>-	for (devc = vwsnd_dev_list; devc; devc = devc-&gt;next_dev)</div><div class='del'>-		if ((devc-&gt;audio_minor &amp; ~0x0F) == (minor &amp; ~0x0F))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL) {</div><div class='del'>-		DEC_USE_COUNT;</div><div class='del'>-		mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devc-&gt;open_mutex);</div><div class='del'>-	while (devc-&gt;open_mode &amp; file-&gt;f_mode) {</div><div class='del'>-		mutex_unlock(&amp;devc-&gt;open_mutex);</div><div class='del'>-		if (file-&gt;f_flags &amp; O_NONBLOCK) {</div><div class='del'>-			DEC_USE_COUNT;</div><div class='del'>-			mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		interruptible_sleep_on(&amp;devc-&gt;open_wait);</div><div class='del'>-		if (signal_pending(current)) {</div><div class='del'>-			DEC_USE_COUNT;</div><div class='del'>-			mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-			return -ERESTARTSYS;</div><div class='del'>-		}</div><div class='del'>-		mutex_lock(&amp;devc-&gt;open_mutex);</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;open_mode |= file-&gt;f_mode &amp; (FMODE_READ | FMODE_WRITE);</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;open_mutex);</div><div class='del'>-</div><div class='del'>-	/* get default sample format from minor number. */</div><div class='del'>-</div><div class='del'>-	sw_samplefmt = 0;</div><div class='del'>-	if ((minor &amp; 0xF) == SND_DEV_DSP)</div><div class='del'>-		sw_samplefmt = AFMT_U8;</div><div class='del'>-	else if ((minor &amp; 0xF) == SND_DEV_AUDIO)</div><div class='del'>-		sw_samplefmt = AFMT_MU_LAW;</div><div class='del'>-	else if ((minor &amp; 0xF) == SND_DEV_DSP16)</div><div class='del'>-		sw_samplefmt = AFMT_S16_LE;</div><div class='del'>-	else</div><div class='del'>-		ASSERT(0);</div><div class='del'>-</div><div class='del'>-	/* Initialize vwsnd_ports. */</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	{</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ) {</div><div class='del'>-			devc-&gt;rport.swstate        = SW_INITIAL;</div><div class='del'>-			devc-&gt;rport.flags          = 0;</div><div class='del'>-			devc-&gt;rport.sw_channels    = 1;</div><div class='del'>-			devc-&gt;rport.sw_samplefmt   = sw_samplefmt;</div><div class='del'>-			devc-&gt;rport.sw_framerate   = 8000;</div><div class='del'>-			devc-&gt;rport.sw_fragshift   = DEFAULT_FRAGSHIFT;</div><div class='del'>-			devc-&gt;rport.sw_fragcount   = DEFAULT_FRAGCOUNT;</div><div class='del'>-			devc-&gt;rport.sw_subdivshift = DEFAULT_SUBDIVSHIFT;</div><div class='del'>-			devc-&gt;rport.byte_count     = 0;</div><div class='del'>-			devc-&gt;rport.frag_count     = 0;</div><div class='del'>-		}</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			devc-&gt;wport.swstate        = SW_INITIAL;</div><div class='del'>-			devc-&gt;wport.flags          = 0;</div><div class='del'>-			devc-&gt;wport.sw_channels    = 1;</div><div class='del'>-			devc-&gt;wport.sw_samplefmt   = sw_samplefmt;</div><div class='del'>-			devc-&gt;wport.sw_framerate   = 8000;</div><div class='del'>-			devc-&gt;wport.sw_fragshift   = DEFAULT_FRAGSHIFT;</div><div class='del'>-			devc-&gt;wport.sw_fragcount   = DEFAULT_FRAGCOUNT;</div><div class='del'>-			devc-&gt;wport.sw_subdivshift = DEFAULT_SUBDIVSHIFT;</div><div class='del'>-			devc-&gt;wport.byte_count     = 0;</div><div class='del'>-			devc-&gt;wport.frag_count     = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;io_mutex);</div><div class='del'>-</div><div class='del'>-	file-&gt;private_data = devc;</div><div class='del'>-	DBGRV();</div><div class='del'>-	mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Release (close) the audio device.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int vwsnd_audio_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = (vwsnd_dev_t *) file-&gt;private_data;</div><div class='del'>-	vwsnd_port_t *wport = NULL, *rport = NULL;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vwsnd_mutex);</div><div class='del'>-	mutex_lock(&amp;devc-&gt;io_mutex);</div><div class='del'>-	{</div><div class='del'>-		DBGEV("(inode=0x%p, file=0x%p)\n", inode, file);</div><div class='del'>-</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_READ)</div><div class='del'>-			rport = &amp;devc-&gt;rport;</div><div class='del'>-		if (file-&gt;f_mode &amp; FMODE_WRITE) {</div><div class='del'>-			wport = &amp;devc-&gt;wport;</div><div class='del'>-			pcm_flush_frag(devc);</div><div class='del'>-			pcm_write_sync(devc);</div><div class='del'>-		}</div><div class='del'>-		pcm_shutdown(devc, rport, wport);</div><div class='del'>-		if (rport)</div><div class='del'>-			rport-&gt;swstate = SW_OFF;</div><div class='del'>-		if (wport)</div><div class='del'>-			wport-&gt;swstate = SW_OFF;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;io_mutex);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;devc-&gt;open_mutex);</div><div class='del'>-	{</div><div class='del'>-		devc-&gt;open_mode &amp;= ~file-&gt;f_mode;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;open_mutex);</div><div class='del'>-	wake_up(&amp;devc-&gt;open_wait);</div><div class='del'>-	DEC_USE_COUNT;</div><div class='del'>-	DBGR();</div><div class='del'>-	mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations vwsnd_audio_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='del'>-	.read =		vwsnd_audio_read,</div><div class='del'>-	.write =	vwsnd_audio_write,</div><div class='del'>-	.poll =		vwsnd_audio_poll,</div><div class='del'>-	.unlocked_ioctl = vwsnd_audio_ioctl,</div><div class='del'>-	.mmap =		vwsnd_audio_mmap,</div><div class='del'>-	.open =		vwsnd_audio_open,</div><div class='del'>-	.release =	vwsnd_audio_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* mixer driver */</div><div class='del'>-</div><div class='del'>-/* open the mixer device. */</div><div class='del'>-</div><div class='del'>-static int vwsnd_mixer_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc;</div><div class='del'>-</div><div class='del'>-	DBGEV("(inode=0x%p, file=0x%p)\n", inode, file);</div><div class='del'>-</div><div class='del'>-	INC_USE_COUNT;</div><div class='del'>-	mutex_lock(&amp;vwsnd_mutex);</div><div class='del'>-	for (devc = vwsnd_dev_list; devc; devc = devc-&gt;next_dev)</div><div class='del'>-		if (devc-&gt;mixer_minor == iminor(inode))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	if (devc == NULL) {</div><div class='del'>-		DEC_USE_COUNT;</div><div class='del'>-		mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	file-&gt;private_data = devc;</div><div class='del'>-	mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* release (close) the mixer device. */</div><div class='del'>-</div><div class='del'>-static int vwsnd_mixer_release(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	DBGEV("(inode=0x%p, file=0x%p)\n", inode, file);</div><div class='del'>-	DEC_USE_COUNT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mixer_read_ioctl handles all read ioctls on the mixer device. */</div><div class='del'>-</div><div class='del'>-static int mixer_read_ioctl(vwsnd_dev_t *devc, unsigned int nr, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int val = -1;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, nr=0x%x, arg=0x%p)\n", devc, nr, arg);</div><div class='del'>-</div><div class='del'>-	switch (nr) {</div><div class='del'>-	case SOUND_MIXER_CAPS:</div><div class='del'>-		val = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_DEVMASK:</div><div class='del'>-		val = (SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-		       SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_RECLEV);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_STEREODEVS:</div><div class='del'>-		val = (SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-		       SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_RECLEV);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_OUTMASK:</div><div class='del'>-		val = (SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-		       SOUND_MASK_MIC | SOUND_MASK_CD);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECMASK:</div><div class='del'>-		val = (SOUND_MASK_PCM | SOUND_MASK_LINE |</div><div class='del'>-		       SOUND_MASK_MIC | SOUND_MASK_CD);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-		val = ad1843_get_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_PCM);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-		val = ad1843_get_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_LINE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_MIC:</div><div class='del'>-		val = ad1843_get_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_MIC);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_CD:</div><div class='del'>-		val = ad1843_get_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_CD);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECLEV:</div><div class='del'>-		val = ad1843_get_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_RECLEV);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECSRC:</div><div class='del'>-		val = ad1843_get_recsrc(&amp;devc-&gt;lith);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_OUTSRC:</div><div class='del'>-		val = ad1843_get_outsrc(&amp;devc-&gt;lith);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return put_user(val, (int __user *) arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mixer_write_ioctl handles all write ioctls on the mixer device. */</div><div class='del'>-</div><div class='del'>-static int mixer_write_ioctl(vwsnd_dev_t *devc, unsigned int nr, void __user *arg)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, nr=0x%x, arg=0x%p)\n", devc, nr, arg);</div><div class='del'>-</div><div class='del'>-	err = get_user(val, (int __user *) arg);</div><div class='del'>-	if (err)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	switch (nr) {</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-		val = ad1843_set_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_PCM, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-		val = ad1843_set_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_LINE, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_MIC:</div><div class='del'>-		val = ad1843_set_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_MIC, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_CD:</div><div class='del'>-		val = ad1843_set_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_CD, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECLEV:</div><div class='del'>-		val = ad1843_set_gain(&amp;devc-&gt;lith, &amp;ad1843_gain_RECLEV, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_RECSRC:</div><div class='del'>-		if (devc-&gt;rport.swbuf || devc-&gt;wport.swbuf)</div><div class='del'>-			return -EBUSY;	/* can't change recsrc while running */</div><div class='del'>-		val = ad1843_set_recsrc(&amp;devc-&gt;lith, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_OUTSRC:</div><div class='del'>-		val = ad1843_set_outsrc(&amp;devc-&gt;lith, val);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (val &lt; 0)</div><div class='del'>-		return val;</div><div class='del'>-	return put_user(val, (int __user *) arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the ioctl entry to the mixer driver. */</div><div class='del'>-</div><div class='del'>-static long vwsnd_mixer_ioctl(struct file *file,</div><div class='del'>-			      unsigned int cmd,</div><div class='del'>-			      unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = (vwsnd_dev_t *) file-&gt;private_data;</div><div class='del'>-	const unsigned int nrmask = _IOC_NRMASK &lt;&lt; _IOC_NRSHIFT;</div><div class='del'>-	const unsigned int nr = (cmd &amp; nrmask) &gt;&gt; _IOC_NRSHIFT;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	DBGEV("(devc=0x%p, cmd=0x%x, arg=0x%lx)\n", devc, cmd, arg);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vwsnd_mutex);</div><div class='del'>-	mutex_lock(&amp;devc-&gt;mix_mutex);</div><div class='del'>-	{</div><div class='del'>-		if ((cmd &amp; ~nrmask) == MIXER_READ(0))</div><div class='del'>-			retval = mixer_read_ioctl(devc, nr, (void __user *) arg);</div><div class='del'>-		else if ((cmd &amp; ~nrmask) == MIXER_WRITE(0))</div><div class='del'>-			retval = mixer_write_ioctl(devc, nr, (void __user *) arg);</div><div class='del'>-		else</div><div class='del'>-			retval = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;devc-&gt;mix_mutex);</div><div class='del'>-	mutex_unlock(&amp;vwsnd_mutex);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations vwsnd_mixer_fops = {</div><div class='del'>-	.owner =	THIS_MODULE,</div><div class='del'>-	.llseek =	no_llseek,</div><div class='del'>-	.unlocked_ioctl = vwsnd_mixer_ioctl,</div><div class='del'>-	.open =		vwsnd_mixer_open,</div><div class='del'>-	.release =	vwsnd_mixer_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* probe/attach/unload */</div><div class='del'>-</div><div class='del'>-/* driver probe routine.  Return nonzero if hardware is found. */</div><div class='del'>-</div><div class='del'>-static int __init probe_vwsnd(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	lithium_t lith;</div><div class='del'>-	int w;</div><div class='del'>-	unsigned long later;</div><div class='del'>-</div><div class='del'>-	DBGEV("(hw_config=0x%p)\n", hw_config);</div><div class='del'>-</div><div class='del'>-	/* XXX verify lithium present (to prevent crash on non-vw) */</div><div class='del'>-</div><div class='del'>-	if (li_create(&amp;lith, hw_config-&gt;io_base) != 0) {</div><div class='del'>-		printk(KERN_WARNING "probe_vwsnd: can't map lithium\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	later = jiffies + 2;</div><div class='del'>-	li_writel(&amp;lith, LI_HOST_CONTROLLER, LI_HC_LINK_ENABLE);</div><div class='del'>-	do {</div><div class='del'>-		w = li_readl(&amp;lith, LI_HOST_CONTROLLER);</div><div class='del'>-	} while (w == LI_HC_LINK_ENABLE &amp;&amp; time_before(jiffies, later));</div><div class='del'>-	</div><div class='del'>-	li_destroy(&amp;lith);</div><div class='del'>-</div><div class='del'>-	DBGPV("HC = 0x%04x\n", w);</div><div class='del'>-</div><div class='del'>-	if ((w == LI_HC_LINK_ENABLE) || (w &amp; LI_HC_LINK_CODEC)) {</div><div class='del'>-</div><div class='del'>-		/* This may indicate a beta machine with no audio,</div><div class='del'>-		 * or a future machine with different audio.</div><div class='del'>-		 * On beta-release 320 w/ no audio, HC == 0x4000 */</div><div class='del'>-</div><div class='del'>-		printk(KERN_WARNING "probe_vwsnd: audio codec not found\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (w &amp; LI_HC_LINK_FAILURE) {</div><div class='del'>-		printk(KERN_WARNING "probe_vwsnd: can't init audio codec\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "vwsnd: lithium audio at mmio %#x irq %d\n",</div><div class='del'>-		hw_config-&gt;io_base, hw_config-&gt;irq);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * driver attach routine.  Initialize driver data structures and</div><div class='del'>- * initialize hardware.  A new vwsnd_dev_t is allocated and put</div><div class='del'>- * onto the global list, vwsnd_dev_list.</div><div class='del'>- *</div><div class='del'>- * Return +minor_dev on success, -errno on failure.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init attach_vwsnd(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc = NULL;</div><div class='del'>-	int err = -ENOMEM;</div><div class='del'>-</div><div class='del'>-	DBGEV("(hw_config=0x%p)\n", hw_config);</div><div class='del'>-</div><div class='del'>-	devc = kmalloc(sizeof (vwsnd_dev_t), GFP_KERNEL);</div><div class='del'>-	if (devc == NULL)</div><div class='del'>-		goto fail0;</div><div class='del'>-</div><div class='del'>-	err = li_create(&amp;devc-&gt;lith, hw_config-&gt;io_base);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail1;</div><div class='del'>-</div><div class='del'>-	init_waitqueue_head(&amp;devc-&gt;open_wait);</div><div class='del'>-</div><div class='del'>-	devc-&gt;rport.hwbuf_size = HWBUF_SIZE;</div><div class='del'>-	devc-&gt;rport.hwbuf_vaddr = __get_free_pages(GFP_KERNEL, HWBUF_ORDER);</div><div class='del'>-	if (!devc-&gt;rport.hwbuf_vaddr)</div><div class='del'>-		goto fail2;</div><div class='del'>-	devc-&gt;rport.hwbuf = (void *) devc-&gt;rport.hwbuf_vaddr;</div><div class='del'>-	devc-&gt;rport.hwbuf_paddr = virt_to_phys(devc-&gt;rport.hwbuf);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Quote from the NT driver:</div><div class='del'>-	 *</div><div class='del'>-	 * // WARNING!!! HACK to setup output dma!!!</div><div class='del'>-	 * // This is required because even on output there is some data</div><div class='del'>-	 * // trickling into the input DMA channel.  This is a bug in the</div><div class='del'>-	 * // Lithium microcode.</div><div class='del'>-	 * // --sde</div><div class='del'>-	 *</div><div class='del'>-	 * We set the input side's DMA base address here.  It will remain</div><div class='del'>-	 * valid until the driver is unloaded.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	li_writel(&amp;devc-&gt;lith, LI_COMM1_BASE,</div><div class='del'>-		  devc-&gt;rport.hwbuf_paddr &gt;&gt; 8 | 1 &lt;&lt; (37 - 8));</div><div class='del'>-</div><div class='del'>-	devc-&gt;wport.hwbuf_size = HWBUF_SIZE;</div><div class='del'>-	devc-&gt;wport.hwbuf_vaddr = __get_free_pages(GFP_KERNEL, HWBUF_ORDER);</div><div class='del'>-	if (!devc-&gt;wport.hwbuf_vaddr)</div><div class='del'>-		goto fail3;</div><div class='del'>-	devc-&gt;wport.hwbuf = (void *) devc-&gt;wport.hwbuf_vaddr;</div><div class='del'>-	devc-&gt;wport.hwbuf_paddr = virt_to_phys(devc-&gt;wport.hwbuf);</div><div class='del'>-	DBGP("wport hwbuf = 0x%p\n", devc-&gt;wport.hwbuf);</div><div class='del'>-</div><div class='del'>-	DBGDO(shut_up++);</div><div class='del'>-	err = ad1843_init(&amp;devc-&gt;lith);</div><div class='del'>-	DBGDO(shut_up--);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail4;</div><div class='del'>-</div><div class='del'>-	/* install interrupt handler */</div><div class='del'>-</div><div class='del'>-	err = request_irq(hw_config-&gt;irq, vwsnd_audio_intr, 0, "vwsnd", devc);</div><div class='del'>-	if (err)</div><div class='del'>-		goto fail5;</div><div class='del'>-</div><div class='del'>-	/* register this device's drivers. */</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_minor = register_sound_dsp(&amp;vwsnd_audio_fops, -1);</div><div class='del'>-	if ((err = devc-&gt;audio_minor) &lt; 0) {</div><div class='del'>-		DBGDO(printk(KERN_WARNING</div><div class='del'>-			     "attach_vwsnd: register_sound_dsp error %d\n",</div><div class='del'>-			     err));</div><div class='del'>-		goto fail6;</div><div class='del'>-	}</div><div class='del'>-	devc-&gt;mixer_minor = register_sound_mixer(&amp;vwsnd_mixer_fops,</div><div class='del'>-						 devc-&gt;audio_minor &gt;&gt; 4);</div><div class='del'>-	if ((err = devc-&gt;mixer_minor) &lt; 0) {</div><div class='del'>-		DBGDO(printk(KERN_WARNING</div><div class='del'>-			     "attach_vwsnd: register_sound_mixer error %d\n",</div><div class='del'>-			     err));</div><div class='del'>-		goto fail7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Squirrel away device indices for unload routine. */</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;slots[0] = devc-&gt;audio_minor;</div><div class='del'>-</div><div class='del'>-	/* Initialize as much of *devc as possible */</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;devc-&gt;open_mutex);</div><div class='del'>-	mutex_init(&amp;devc-&gt;io_mutex);</div><div class='del'>-	mutex_init(&amp;devc-&gt;mix_mutex);</div><div class='del'>-	devc-&gt;open_mode = 0;</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;rport.lock);</div><div class='del'>-	init_waitqueue_head(&amp;devc-&gt;rport.queue);</div><div class='del'>-	devc-&gt;rport.swstate = SW_OFF;</div><div class='del'>-	devc-&gt;rport.hwstate = HW_STOPPED;</div><div class='del'>-	devc-&gt;rport.flags = 0;</div><div class='del'>-	devc-&gt;rport.swbuf = NULL;</div><div class='del'>-	spin_lock_init(&amp;devc-&gt;wport.lock);</div><div class='del'>-	init_waitqueue_head(&amp;devc-&gt;wport.queue);</div><div class='del'>-	devc-&gt;wport.swstate = SW_OFF;</div><div class='del'>-	devc-&gt;wport.hwstate = HW_STOPPED;</div><div class='del'>-	devc-&gt;wport.flags = 0;</div><div class='del'>-	devc-&gt;wport.swbuf = NULL;</div><div class='del'>-</div><div class='del'>-	/* Success.  Link us onto the local device list. */</div><div class='del'>-</div><div class='del'>-	devc-&gt;next_dev = vwsnd_dev_list;</div><div class='del'>-	vwsnd_dev_list = devc;</div><div class='del'>-	return devc-&gt;audio_minor;</div><div class='del'>-</div><div class='del'>-	/* So many ways to fail.  Undo what we did. */</div><div class='del'>-</div><div class='del'>- fail7:</div><div class='del'>-	unregister_sound_dsp(devc-&gt;audio_minor);</div><div class='del'>- fail6:</div><div class='del'>-	free_irq(hw_config-&gt;irq, devc);</div><div class='del'>- fail5:</div><div class='del'>- fail4:</div><div class='del'>-	free_pages(devc-&gt;wport.hwbuf_vaddr, HWBUF_ORDER);</div><div class='del'>- fail3:</div><div class='del'>-	free_pages(devc-&gt;rport.hwbuf_vaddr, HWBUF_ORDER);</div><div class='del'>- fail2:</div><div class='del'>-	li_destroy(&amp;devc-&gt;lith);</div><div class='del'>- fail1:</div><div class='del'>-	kfree(devc);</div><div class='del'>- fail0:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __exit unload_vwsnd(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	vwsnd_dev_t *devc, **devcp;</div><div class='del'>-</div><div class='del'>-	DBGE("()\n");</div><div class='del'>-</div><div class='del'>-	devcp = &amp;vwsnd_dev_list;</div><div class='del'>-	while ((devc = *devcp)) {</div><div class='del'>-		if (devc-&gt;audio_minor == hw_config-&gt;slots[0]) {</div><div class='del'>-			*devcp = devc-&gt;next_dev;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		devcp = &amp;devc-&gt;next_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!devc)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	unregister_sound_mixer(devc-&gt;mixer_minor);</div><div class='del'>-	unregister_sound_dsp(devc-&gt;audio_minor);</div><div class='del'>-	free_irq(hw_config-&gt;irq, devc);</div><div class='del'>-	free_pages(devc-&gt;wport.hwbuf_vaddr, HWBUF_ORDER);</div><div class='del'>-	free_pages(devc-&gt;rport.hwbuf_vaddr, HWBUF_ORDER);</div><div class='del'>-	li_destroy(&amp;devc-&gt;lith);</div><div class='del'>-	kfree(devc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************/</div><div class='del'>-/* initialization and loadable kernel module interface */</div><div class='del'>-</div><div class='del'>-static struct address_info the_hw_config = {</div><div class='del'>-	0xFF001000,			/* lithium phys addr  */</div><div class='del'>-	CO_IRQ(CO_APIC_LI_AUDIO)	/* irq */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("SGI Visual Workstation sound module");</div><div class='del'>-MODULE_AUTHOR("Bob Miller &lt;kbob@sgi.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-static int __init init_vwsnd(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	DBGXV("\n");</div><div class='del'>-	DBGXV("sound::vwsnd::init_module()\n");</div><div class='del'>-</div><div class='del'>-	if (!probe_vwsnd(&amp;the_hw_config))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	err = attach_vwsnd(&amp;the_hw_config);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_vwsnd(void)</div><div class='del'>-{</div><div class='del'>-	DBGX("sound::vwsnd::cleanup_module()\n");</div><div class='del'>-</div><div class='del'>-	unload_vwsnd(&amp;the_hw_config);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_vwsnd);</div><div class='del'>-module_exit(cleanup_vwsnd);</div><div class='head'>diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c<br/>deleted file mode 100644<br/>index 52468742d9f2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/waveartist.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/waveartist.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2025 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/sound/oss/waveartist.c</div><div class='del'>- *</div><div class='del'>- * The low level driver for the RWA010 Rockwell Wave Artist</div><div class='del'>- * codec chip used in the Rebel.com NetWinder.</div><div class='del'>- *</div><div class='del'>- * Cleaned up and integrated into 2.1 by Russell King (rmk@arm.linux.org.uk)</div><div class='del'>- * and Pat Beirne (patb@corel.ca)</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Rebel.com 1998-1999</div><div class='del'>- *</div><div class='del'>- * RWA010 specs received under NDA from Rockwell</div><div class='del'>- *</div><div class='del'>- * Copyright (C) by Hannu Savolainen 1993-1997</div><div class='del'>- *</div><div class='del'>- * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)</div><div class='del'>- * Version 2 (June 1991). See the "COPYING" file distributed with this software</div><div class='del'>- * for more info.</div><div class='del'>- *</div><div class='del'>- * Changes:</div><div class='del'>- * 11-10-2000	Bartlomiej Zolnierkiewicz &lt;bkz@linux-ide.org&gt;</div><div class='del'>- *		Added __init to waveartist_init()</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Debugging */</div><div class='del'>-#define DEBUG_CMD	1</div><div class='del'>-#define DEBUG_OUT	2</div><div class='del'>-#define DEBUG_IN	4</div><div class='del'>-#define DEBUG_INTR	8</div><div class='del'>-#define DEBUG_MIXER	16</div><div class='del'>-#define DEBUG_TRIGGER	32</div><div class='del'>-</div><div class='del'>-#define debug_flg (0)</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-</div><div class='del'>-#include "sound_config.h"</div><div class='del'>-#include "waveartist.h"</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARM</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-#include &lt;asm/mach-types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef NO_DMA</div><div class='del'>-#define NO_DMA	255</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define SUPPORTED_MIXER_DEVICES		(SOUND_MASK_SYNTH      |\</div><div class='del'>-					 SOUND_MASK_PCM        |\</div><div class='del'>-					 SOUND_MASK_LINE       |\</div><div class='del'>-					 SOUND_MASK_MIC        |\</div><div class='del'>-					 SOUND_MASK_LINE1      |\</div><div class='del'>-					 SOUND_MASK_RECLEV     |\</div><div class='del'>-					 SOUND_MASK_VOLUME     |\</div><div class='del'>-					 SOUND_MASK_IMIX)</div><div class='del'>-</div><div class='del'>-static unsigned short levels[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-	0x5555,		/* Master Volume	 */</div><div class='del'>-	0x0000,		/* Bass			 */</div><div class='del'>-	0x0000,		/* Treble		 */</div><div class='del'>-	0x2323,		/* Synth (FM)		 */</div><div class='del'>-	0x4b4b,		/* PCM			 */</div><div class='del'>-	0x6464,		/* PC Speaker		 */</div><div class='del'>-	0x0000,		/* Ext Line		 */</div><div class='del'>-	0x0000,		/* Mic			 */</div><div class='del'>-	0x0000,		/* CD			 */</div><div class='del'>-	0x6464,		/* Recording monitor	 */</div><div class='del'>-	0x0000,		/* SB PCM (ALT PCM)	 */</div><div class='del'>-	0x0000,		/* Recording level	 */</div><div class='del'>-	0x6464,		/* Input gain		 */</div><div class='del'>-	0x6464,		/* Output gain		 */</div><div class='del'>-	0x0000,		/* Line1 (Aux1)		 */</div><div class='del'>-	0x0000,		/* Line2 (Aux2)		 */</div><div class='del'>-	0x0000,		/* Line3 (Aux3)		 */</div><div class='del'>-	0x0000,		/* Digital1		 */</div><div class='del'>-	0x0000,		/* Digital2		 */</div><div class='del'>-	0x0000,		/* Digital3		 */</div><div class='del'>-	0x0000,		/* Phone In		 */</div><div class='del'>-	0x6464,		/* Phone Out		 */</div><div class='del'>-	0x0000,		/* Video		 */</div><div class='del'>-	0x0000,		/* Radio		 */</div><div class='del'>-	0x0000		/* Monitor		 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	struct address_info  hw;	/* hardware */</div><div class='del'>-	char		*chip_name;</div><div class='del'>-</div><div class='del'>-	int		xfer_count;</div><div class='del'>-	int		audio_mode;</div><div class='del'>-	int		open_mode;</div><div class='del'>-	int		audio_flags;</div><div class='del'>-	int		record_dev;</div><div class='del'>-	int		playback_dev;</div><div class='del'>-	int		dev_no;</div><div class='del'>-</div><div class='del'>-	/* Mixer parameters */</div><div class='del'>-	const struct waveartist_mixer_info *mix;</div><div class='del'>-</div><div class='del'>-	unsigned short	*levels;	   /* cache of volume settings   */</div><div class='del'>-	int		recmask;	   /* currently enabled recording device! */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-	signed int	slider_vol;	   /* hardware slider volume     */</div><div class='del'>-	unsigned int	handset_detect	:1;</div><div class='del'>-	unsigned int	telephone_detect:1;</div><div class='del'>-	unsigned int	no_autoselect	:1;/* handset/telephone autoselects a path */</div><div class='del'>-	unsigned int	spkr_mute_state	:1;/* set by ioctl or autoselect */</div><div class='del'>-	unsigned int	line_mute_state	:1;/* set by ioctl or autoselect */</div><div class='del'>-	unsigned int	use_slider	:1;/* use slider setting for o/p vol */</div><div class='del'>-#endif</div><div class='del'>-} wavnc_info;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the implementation specific mixer information.</div><div class='del'>- */</div><div class='del'>-struct waveartist_mixer_info {</div><div class='del'>-	unsigned int	supported_devs;	   /* Supported devices */</div><div class='del'>-	unsigned int	recording_devs;	   /* Recordable devies */</div><div class='del'>-	unsigned int	stereo_devs;	   /* Stereo devices	*/</div><div class='del'>-</div><div class='del'>-	unsigned int	(*select_input)(wavnc_info *, unsigned int,</div><div class='del'>-					unsigned char *, unsigned char *);</div><div class='del'>-	int		(*decode_mixer)(wavnc_info *, int,</div><div class='del'>-					unsigned char, unsigned char);</div><div class='del'>-	int		(*get_mixer)(wavnc_info *, int);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct wavnc_port_info {</div><div class='del'>-	int		open_mode;</div><div class='del'>-	int		speed;</div><div class='del'>-	int		channels;</div><div class='del'>-	int		audio_format;</div><div class='del'>-} wavnc_port_info;</div><div class='del'>-</div><div class='del'>-static int		nr_waveartist_devs;</div><div class='del'>-static wavnc_info	adev_info[MAX_AUDIO_DEV];</div><div class='del'>-static DEFINE_SPINLOCK(waveartist_lock);</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_ARCH_NETWINDER</div><div class='del'>-#define machine_is_netwinder() 0</div><div class='del'>-#else</div><div class='del'>-static struct timer_list vnc_timer;</div><div class='del'>-static void vnc_configure_mixer(wavnc_info *devc, unsigned int input_mask);</div><div class='del'>-static int vnc_private_ioctl(int dev, unsigned int cmd, int __user *arg);</div><div class='del'>-static void vnc_slider_tick(unsigned long data);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-waveartist_set_ctlr(struct address_info *hw, unsigned char clear, unsigned char set)</div><div class='del'>-{</div><div class='del'>-	unsigned int ctlr_port = hw-&gt;io_base + CTLR;</div><div class='del'>-</div><div class='del'>-	clear = ~clear &amp; inb(ctlr_port);</div><div class='del'>-</div><div class='del'>-	outb(clear | set, ctlr_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Toggle IRQ acknowledge line</div><div class='del'>- */</div><div class='del'>-static inline void</div><div class='del'>-waveartist_iack(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned int ctlr_port = devc-&gt;hw.io_base + CTLR;</div><div class='del'>-	int old_ctlr;</div><div class='del'>-</div><div class='del'>-	old_ctlr = inb(ctlr_port) &amp; ~IRQ_ACK;</div><div class='del'>-</div><div class='del'>-	outb(old_ctlr | IRQ_ACK, ctlr_port);</div><div class='del'>-	outb(old_ctlr, ctlr_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-waveartist_sleep(int timeout_ms)</div><div class='del'>-{</div><div class='del'>-	unsigned int timeout = msecs_to_jiffies(timeout_ms*100);</div><div class='del'>-	return schedule_timeout_interruptible(timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_reset(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	struct address_info *hw = &amp;devc-&gt;hw;</div><div class='del'>-	unsigned int timeout, res = -1;</div><div class='del'>-</div><div class='del'>-	waveartist_set_ctlr(hw, -1, RESET);</div><div class='del'>-	waveartist_sleep(2);</div><div class='del'>-	waveartist_set_ctlr(hw, RESET, 0);</div><div class='del'>-</div><div class='del'>-	timeout = 500;</div><div class='del'>-	do {</div><div class='del'>-		mdelay(2);</div><div class='del'>-</div><div class='del'>-		if (inb(hw-&gt;io_base + STATR) &amp; CMD_RF) {</div><div class='del'>-			res = inw(hw-&gt;io_base + CMDR);</div><div class='del'>-			if (res == 0x55aa)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	} while (--timeout);</div><div class='del'>-</div><div class='del'>-	if (timeout == 0) {</div><div class='del'>-		printk(KERN_WARNING "WaveArtist: reset timeout ");</div><div class='del'>-		if (res != (unsigned int)-1)</div><div class='del'>-			printk("(res=%04X)", res);</div><div class='del'>-		printk("\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Helper function to send and receive words</div><div class='del'>- * from WaveArtist.  It handles all the handshaking</div><div class='del'>- * and can send or receive multiple words.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-waveartist_cmd(wavnc_info *devc,</div><div class='del'>-		int nr_cmd, unsigned int *cmd,</div><div class='del'>-		int nr_resp, unsigned int *resp)</div><div class='del'>-{</div><div class='del'>-	unsigned int io_base = devc-&gt;hw.io_base;</div><div class='del'>-	unsigned int timed_out = 0;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_CMD) {</div><div class='del'>-		printk("waveartist_cmd: cmd=");</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; nr_cmd; i++)</div><div class='del'>-			printk("%04X ", cmd[i]);</div><div class='del'>-</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inb(io_base + STATR) &amp; CMD_RF) {</div><div class='del'>-		int old_data;</div><div class='del'>-</div><div class='del'>-		/* flush the port</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		old_data = inw(io_base + CMDR);</div><div class='del'>-</div><div class='del'>-		if (debug_flg &amp; DEBUG_CMD)</div><div class='del'>-			printk("flushed %04X...", old_data);</div><div class='del'>-</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; !timed_out &amp;&amp; i &lt; nr_cmd; i++) {</div><div class='del'>-		int count;</div><div class='del'>-</div><div class='del'>-		for (count = 5000; count; count--)</div><div class='del'>-			if (inb(io_base + STATR) &amp; CMD_WE)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (!count)</div><div class='del'>-			timed_out = 1;</div><div class='del'>-		else</div><div class='del'>-			outw(cmd[i], io_base + CMDR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; !timed_out &amp;&amp; i &lt; nr_resp; i++) {</div><div class='del'>-		int count;</div><div class='del'>-</div><div class='del'>-		for (count = 5000; count; count--)</div><div class='del'>-			if (inb(io_base + STATR) &amp; CMD_RF)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (!count)</div><div class='del'>-			timed_out = 1;</div><div class='del'>-		else</div><div class='del'>-			resp[i] = inw(io_base + CMDR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_CMD) {</div><div class='del'>-		if (!timed_out) {</div><div class='del'>-			printk("waveartist_cmd: resp=");</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; nr_resp; i++)</div><div class='del'>-				printk("%04X ", resp[i]);</div><div class='del'>-</div><div class='del'>-			printk("\n");</div><div class='del'>-		} else</div><div class='del'>-			printk("waveartist_cmd: timed out\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return timed_out ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send one command word</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-waveartist_cmd1(wavnc_info *devc, unsigned int cmd)</div><div class='del'>-{</div><div class='del'>-	return waveartist_cmd(devc, 1, &amp;cmd, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send one command, receive one word</div><div class='del'>- */</div><div class='del'>-static inline unsigned int</div><div class='del'>-waveartist_cmd1_r(wavnc_info *devc, unsigned int cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-</div><div class='del'>-	waveartist_cmd(devc, 1, &amp;cmd, 1, &amp;ret);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send a double command, receive one</div><div class='del'>- * word (and throw it away)</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-waveartist_cmd2(wavnc_info *devc, unsigned int cmd, unsigned int arg)</div><div class='del'>-{</div><div class='del'>-	unsigned int vals[2];</div><div class='del'>-</div><div class='del'>-	vals[0] = cmd;</div><div class='del'>-	vals[1] = arg;</div><div class='del'>-</div><div class='del'>-	return waveartist_cmd(devc, 2, vals, 1, vals);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send a triple command</div><div class='del'>- */</div><div class='del'>-static inline int</div><div class='del'>-waveartist_cmd3(wavnc_info *devc, unsigned int cmd,</div><div class='del'>-		unsigned int arg1, unsigned int arg2)</div><div class='del'>-{</div><div class='del'>-	unsigned int vals[3];</div><div class='del'>-</div><div class='del'>-	vals[0] = cmd;</div><div class='del'>-	vals[1] = arg1;</div><div class='del'>-	vals[2] = arg2;</div><div class='del'>-</div><div class='del'>-	return waveartist_cmd(devc, 3, vals, 0, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_getrev(wavnc_info *devc, char *rev)</div><div class='del'>-{</div><div class='del'>-	unsigned int temp[2];</div><div class='del'>-	unsigned int cmd = WACMD_GETREV;</div><div class='del'>-</div><div class='del'>-	waveartist_cmd(devc, 1, &amp;cmd, 2, temp);</div><div class='del'>-</div><div class='del'>-	rev[0] = temp[0] &gt;&gt; 8;</div><div class='del'>-	rev[1] = temp[0] &amp; 255;</div><div class='del'>-	rev[2] = '\0';</div><div class='del'>-</div><div class='del'>-	return temp[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void waveartist_halt_output(int dev);</div><div class='del'>-static void waveartist_halt_input(int dev);</div><div class='del'>-static void waveartist_halt(int dev);</div><div class='del'>-static void waveartist_trigger(int dev, int state);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_open(int dev, int mode)</div><div class='del'>-{</div><div class='del'>-	wavnc_info	*devc;</div><div class='del'>-	wavnc_port_info	*portc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-	if (dev &lt; 0 || dev &gt;= num_audiodevs)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	devc  = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-	if (portc-&gt;open_mode || (devc-&gt;open_mode &amp; mode)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode  = 0;</div><div class='del'>-	devc-&gt;open_mode  |= mode;</div><div class='del'>-	portc-&gt;open_mode  = mode;</div><div class='del'>-	waveartist_trigger(dev, 0);</div><div class='del'>-</div><div class='del'>-	if (mode &amp; OPEN_READ)</div><div class='del'>-		devc-&gt;record_dev = dev;</div><div class='del'>-	if (mode &amp; OPEN_WRITE)</div><div class='del'>-		devc-&gt;playback_dev = dev;</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_close(int dev)</div><div class='del'>-{</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	waveartist_halt(dev);</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode = 0;</div><div class='del'>-	devc-&gt;open_mode &amp;= ~portc-&gt;open_mode;</div><div class='del'>-	portc-&gt;open_mode = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_output_block(int dev, unsigned long buf, int __count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	unsigned int	count = __count; </div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_OUT)</div><div class='del'>-		printk("waveartist: output block, buf=0x%lx, count=0x%x...\n",</div><div class='del'>-			buf, count);</div><div class='del'>-	/*</div><div class='del'>-	 * 16 bit data</div><div class='del'>-	 */</div><div class='del'>-	if (portc-&gt;audio_format &amp; (AFMT_S16_LE | AFMT_S16_BE))</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	count -= 1;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;audio_mode &amp; PCM_ENABLE_OUTPUT &amp;&amp;</div><div class='del'>-	    audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE &amp;&amp;</div><div class='del'>-	    intrflag &amp;&amp;</div><div class='del'>-	    count == devc-&gt;xfer_count) {</div><div class='del'>-		devc-&gt;audio_mode |= PCM_ENABLE_OUTPUT;</div><div class='del'>-		return;	/*</div><div class='del'>-			 * Auto DMA mode on. No need to react</div><div class='del'>-			 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set sample count</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd2(devc, WACMD_OUTPUTSIZE, count);</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = count;</div><div class='del'>-	devc-&gt;audio_mode |= PCM_ENABLE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_start_input(int dev, unsigned long buf, int __count, int intrflag)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info *portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	unsigned int	count = __count;</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_IN)</div><div class='del'>-		printk("waveartist: start input, buf=0x%lx, count=0x%x...\n",</div><div class='del'>-			buf, count);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;audio_format &amp; (AFMT_S16_LE | AFMT_S16_BE))	/* 16 bit data */</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;channels &gt; 1)</div><div class='del'>-		count &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-	count -= 1;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;audio_mode &amp; PCM_ENABLE_INPUT &amp;&amp;</div><div class='del'>-	    audio_devs[dev]-&gt;flags &amp; DMA_AUTOMODE &amp;&amp;</div><div class='del'>-	    intrflag &amp;&amp;</div><div class='del'>-	    count == devc-&gt;xfer_count) {</div><div class='del'>-		devc-&gt;audio_mode |= PCM_ENABLE_INPUT;</div><div class='del'>-		return;	/*</div><div class='del'>-			 * Auto DMA mode on. No need to react</div><div class='del'>-			 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set sample count</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd2(devc, WACMD_INPUTSIZE, count);</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = count;</div><div class='del'>-	devc-&gt;audio_mode |= PCM_ENABLE_INPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_ioctl(int dev, unsigned int cmd, void __user * arg)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-waveartist_get_speed(wavnc_port_info *portc)</div><div class='del'>-{</div><div class='del'>-	unsigned int speed;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * program the speed, channels, bits</div><div class='del'>-	 */</div><div class='del'>-	if (portc-&gt;speed == 8000)</div><div class='del'>-		speed = 0x2E71;</div><div class='del'>-	else if (portc-&gt;speed == 11025)</div><div class='del'>-		speed = 0x4000;</div><div class='del'>-	else if (portc-&gt;speed == 22050)</div><div class='del'>-		speed = 0x8000;</div><div class='del'>-	else if (portc-&gt;speed == 44100)</div><div class='del'>-		speed = 0x0;</div><div class='del'>-	else {</div><div class='del'>-		/*</div><div class='del'>-		 * non-standard - just calculate</div><div class='del'>-		 */</div><div class='del'>-		speed = portc-&gt;speed &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-		speed = (speed / 44100) &amp; 65535;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return speed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-waveartist_get_bits(wavnc_port_info *portc)</div><div class='del'>-{</div><div class='del'>-	unsigned int bits;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;audio_format == AFMT_S16_LE)</div><div class='del'>-		bits = 1;</div><div class='del'>-	else if (portc-&gt;audio_format == AFMT_S8)</div><div class='del'>-		bits = 0;</div><div class='del'>-	else</div><div class='del'>-		bits = 2;	//default AFMT_U8</div><div class='del'>-</div><div class='del'>-	return bits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_prepare_for_input(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	unsigned int	speed, bits;</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;audio_mode)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	speed = waveartist_get_speed(portc);</div><div class='del'>-	bits  = waveartist_get_bits(portc);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_INPUTFORMAT, bits))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the "</div><div class='del'>-		       "record format to %d\n", portc-&gt;audio_format);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_INPUTCHANNELS, portc-&gt;channels))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting record "</div><div class='del'>-		       "to %d channels\n", portc-&gt;channels);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * write cmd SetSampleSpeedTimeConstant</div><div class='del'>-	 */</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_INPUTSPEED, speed))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the record "</div><div class='del'>-		       "speed to %dHz.\n", portc-&gt;speed);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_INPUTDMA, 1))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the record "</div><div class='del'>-		       "data path to 0x%X\n", 1);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_INPUTFORMAT, bits))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the record "</div><div class='del'>-		       "format to %d\n", portc-&gt;audio_format);</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-	waveartist_halt_input(dev);</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_INTR) {</div><div class='del'>-		printk("WA CTLR reg: 0x%02X.\n",</div><div class='del'>-		       inb(devc-&gt;hw.io_base + CTLR));</div><div class='del'>-		printk("WA STAT reg: 0x%02X.\n",</div><div class='del'>-		       inb(devc-&gt;hw.io_base + STATR));</div><div class='del'>-		printk("WA IRQS reg: 0x%02X.\n",</div><div class='del'>-		       inb(devc-&gt;hw.io_base + IRQSTAT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_prepare_for_output(int dev, int bsize, int bcount)</div><div class='del'>-{</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	unsigned int	speed, bits;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * program the speed, channels, bits</div><div class='del'>-	 */</div><div class='del'>-	speed = waveartist_get_speed(portc);</div><div class='del'>-	bits  = waveartist_get_bits(portc);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_OUTPUTSPEED, speed) &amp;&amp;</div><div class='del'>-	    waveartist_cmd2(devc, WACMD_OUTPUTSPEED, speed))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the playback "</div><div class='del'>-		       "speed to %dHz.\n", portc-&gt;speed);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_OUTPUTCHANNELS, portc-&gt;channels))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the playback "</div><div class='del'>-		       "to %d channels\n", portc-&gt;channels);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_OUTPUTDMA, 0))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the playback "</div><div class='del'>-		       "data path to 0x%X\n", 0);</div><div class='del'>-</div><div class='del'>-	if (waveartist_cmd2(devc, WACMD_OUTPUTFORMAT, bits))</div><div class='del'>-		printk(KERN_WARNING "waveartist: error setting the playback "</div><div class='del'>-		       "format to %d\n", portc-&gt;audio_format);</div><div class='del'>-</div><div class='del'>-	devc-&gt;xfer_count = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-	waveartist_halt_output(dev);</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_INTR) {</div><div class='del'>-		printk("WA CTLR reg: 0x%02X.\n",inb(devc-&gt;hw.io_base + CTLR));</div><div class='del'>-		printk("WA STAT reg: 0x%02X.\n",inb(devc-&gt;hw.io_base + STATR));</div><div class='del'>-		printk("WA IRQS reg: 0x%02X.\n",inb(devc-&gt;hw.io_base + IRQSTAT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_halt(int dev)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	wavnc_info	*devc;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_WRITE)</div><div class='del'>-		waveartist_halt_output(dev);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_READ)</div><div class='del'>-		waveartist_halt_input(dev);</div><div class='del'>-</div><div class='del'>-	devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	devc-&gt;audio_mode = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_halt_input(int dev)</div><div class='del'>-{</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Stop capture</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd1(devc, WACMD_INPUTSTOP);</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_INPUT;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear interrupt by toggling</div><div class='del'>-	 * the IRQ_ACK bit in CTRL</div><div class='del'>-	 */</div><div class='del'>-	if (inb(devc-&gt;hw.io_base + STATR) &amp; IRQ_REQ)</div><div class='del'>-		waveartist_iack(devc);</div><div class='del'>-</div><div class='del'>-//	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_INPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_halt_output(int dev)</div><div class='del'>-{</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	waveartist_cmd1(devc, WACMD_OUTPUTSTOP);</div><div class='del'>-</div><div class='del'>-	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Clear interrupt by toggling</div><div class='del'>-	 * the IRQ_ACK bit in CTRL</div><div class='del'>-	 */</div><div class='del'>-	if (inb(devc-&gt;hw.io_base + STATR) &amp; IRQ_REQ)</div><div class='del'>-		waveartist_iack(devc);</div><div class='del'>-</div><div class='del'>-//	devc-&gt;audio_mode &amp;= ~PCM_ENABLE_OUTPUT;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_trigger(int dev, int state)</div><div class='del'>-{</div><div class='del'>-	wavnc_info	*devc = (wavnc_info *) audio_devs[dev]-&gt;devc;</div><div class='del'>-	wavnc_port_info	*portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-	unsigned long	flags;</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_TRIGGER) {</div><div class='del'>-		printk("wavnc: audio trigger ");</div><div class='del'>-		if (state &amp; PCM_ENABLE_INPUT)</div><div class='del'>-			printk("in ");</div><div class='del'>-		if (state &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-			printk("out");</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	state &amp;= devc-&gt;audio_mode;</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_READ &amp;&amp;</div><div class='del'>-	    state &amp; PCM_ENABLE_INPUT)</div><div class='del'>-		/*</div><div class='del'>-		 * enable ADC Data Transfer to PC</div><div class='del'>-		 */</div><div class='del'>-		waveartist_cmd1(devc, WACMD_INPUTSTART);</div><div class='del'>-</div><div class='del'>-	if (portc-&gt;open_mode &amp; OPEN_WRITE &amp;&amp;</div><div class='del'>-	    state &amp; PCM_ENABLE_OUTPUT)</div><div class='del'>-		/*</div><div class='del'>-		 * enable DAC data transfer from PC</div><div class='del'>-		 */</div><div class='del'>-		waveartist_cmd1(devc, WACMD_OUTPUTSTART);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_set_speed(int dev, int arg)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info *portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	if (arg &lt;= 0)</div><div class='del'>-		return portc-&gt;speed;</div><div class='del'>-</div><div class='del'>-	if (arg &lt; 5000)</div><div class='del'>-		arg = 5000;</div><div class='del'>-	if (arg &gt; 44100)</div><div class='del'>-		arg = 44100;</div><div class='del'>-</div><div class='del'>-	portc-&gt;speed = arg;</div><div class='del'>-	return portc-&gt;speed;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short</div><div class='del'>-waveartist_set_channels(int dev, short arg)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info *portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	if (arg != 1 &amp;&amp; arg != 2)</div><div class='del'>-		return portc-&gt;channels;</div><div class='del'>-</div><div class='del'>-	portc-&gt;channels = arg;</div><div class='del'>-	return arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-waveartist_set_bits(int dev, unsigned int arg)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info *portc = (wavnc_port_info *) audio_devs[dev]-&gt;portc;</div><div class='del'>-</div><div class='del'>-	if (arg == 0)</div><div class='del'>-		return portc-&gt;audio_format;</div><div class='del'>-</div><div class='del'>-	if ((arg != AFMT_U8) &amp;&amp; (arg != AFMT_S16_LE) &amp;&amp; (arg != AFMT_S8))</div><div class='del'>-		arg = AFMT_U8;</div><div class='del'>-</div><div class='del'>-	portc-&gt;audio_format = arg;</div><div class='del'>-</div><div class='del'>-	return arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct audio_driver waveartist_audio_driver = {</div><div class='del'>-	.owner			= THIS_MODULE,</div><div class='del'>-	.open			= waveartist_open,</div><div class='del'>-	.close			= waveartist_close,</div><div class='del'>-	.output_block		= waveartist_output_block,</div><div class='del'>-	.start_input		= waveartist_start_input,</div><div class='del'>-	.ioctl			= waveartist_ioctl,</div><div class='del'>-	.prepare_for_input	= waveartist_prepare_for_input,</div><div class='del'>-	.prepare_for_output	= waveartist_prepare_for_output,</div><div class='del'>-	.halt_io		= waveartist_halt,</div><div class='del'>-	.halt_input		= waveartist_halt_input,</div><div class='del'>-	.halt_output		= waveartist_halt_output,</div><div class='del'>-	.trigger		= waveartist_trigger,</div><div class='del'>-	.set_speed		= waveartist_set_speed,</div><div class='del'>-	.set_bits		= waveartist_set_bits,</div><div class='del'>-	.set_channels		= waveartist_set_channels</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static irqreturn_t</div><div class='del'>-waveartist_intr(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = dev_id;</div><div class='del'>-	int	   irqstatus, status;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;waveartist_lock);</div><div class='del'>-	irqstatus = inb(devc-&gt;hw.io_base + IRQSTAT);</div><div class='del'>-	status    = inb(devc-&gt;hw.io_base + STATR);</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_INTR)</div><div class='del'>-		printk("waveartist_intr: stat=%02x, irqstat=%02x\n",</div><div class='del'>-		       status, irqstatus);</div><div class='del'>-</div><div class='del'>-	if (status &amp; IRQ_REQ)	/* Clear interrupt */</div><div class='del'>-		waveartist_iack(devc);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_WARNING "waveartist: unexpected interrupt\n");</div><div class='del'>-</div><div class='del'>-	if (irqstatus &amp; 0x01) {</div><div class='del'>-		int temp = 1;</div><div class='del'>-</div><div class='del'>-		/* PCM buffer done</div><div class='del'>-		 */</div><div class='del'>-		if ((status &amp; DMA0) &amp;&amp; (devc-&gt;audio_mode &amp; PCM_ENABLE_OUTPUT)) {</div><div class='del'>-			DMAbuf_outputintr(devc-&gt;playback_dev, 1);</div><div class='del'>-			temp = 0;</div><div class='del'>-		}</div><div class='del'>-		if ((status &amp; DMA1) &amp;&amp; (devc-&gt;audio_mode &amp; PCM_ENABLE_INPUT)) {</div><div class='del'>-			DMAbuf_inputintr(devc-&gt;record_dev);</div><div class='del'>-			temp = 0;</div><div class='del'>-		}</div><div class='del'>-		if (temp)	//default:</div><div class='del'>-			printk(KERN_WARNING "waveartist: Unknown interrupt\n");</div><div class='del'>-	}</div><div class='del'>-	if (irqstatus &amp; 0x2)</div><div class='del'>-		// We do not use SB mode natively...</div><div class='del'>-		printk(KERN_WARNING "waveartist: Unexpected SB interrupt...\n");</div><div class='del'>-	spin_unlock(&amp;waveartist_lock);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* -------------------------------------------------------------------------</div><div class='del'>- * Mixer stuff</div><div class='del'>- */</div><div class='del'>-struct mix_ent {</div><div class='del'>-	unsigned char	reg_l;</div><div class='del'>-	unsigned char	reg_r;</div><div class='del'>-	unsigned char	shift;</div><div class='del'>-	unsigned char	max;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct mix_ent mix_devs[SOUND_MIXER_NRDEVICES] = {</div><div class='del'>-	{ 2, 6, 1,  7 }, /* SOUND_MIXER_VOLUME   */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_BASS     */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_TREBLE   */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_SYNTH    */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_PCM      */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_SPEAKER  */</div><div class='del'>-	{ 0, 4, 6, 31 }, /* SOUND_MIXER_LINE     */</div><div class='del'>-	{ 2, 6, 4,  3 }, /* SOUND_MIXER_MIC      */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_CD       */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_IMIX     */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_ALTPCM   */</div><div class='del'>-#if 0</div><div class='del'>-	{ 3, 7, 0, 10 }, /* SOUND_MIXER_RECLEV   */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_IGAIN    */</div><div class='del'>-#else</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_RECLEV   */</div><div class='del'>-	{ 3, 7, 0,  7 }, /* SOUND_MIXER_IGAIN    */</div><div class='del'>-#endif</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_OGAIN    */</div><div class='del'>-	{ 0, 4, 1, 31 }, /* SOUND_MIXER_LINE1    */</div><div class='del'>-	{ 1, 5, 6, 31 }, /* SOUND_MIXER_LINE2    */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_LINE3    */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_DIGITAL1 */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_DIGITAL2 */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_DIGITAL3 */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_PHONEIN  */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_PHONEOUT */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_VIDEO    */</div><div class='del'>-	{ 0, 0, 0,  0 }, /* SOUND_MIXER_RADIO    */</div><div class='del'>-	{ 0, 0, 0,  0 }  /* SOUND_MIXER_MONITOR  */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_mixer_update(wavnc_info *devc, int whichDev)</div><div class='del'>-{</div><div class='del'>-	unsigned int lev_left, lev_right;</div><div class='del'>-</div><div class='del'>-	lev_left  = devc-&gt;levels[whichDev] &amp; 0xff;</div><div class='del'>-	lev_right = devc-&gt;levels[whichDev] &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	if (lev_left &gt; 100)</div><div class='del'>-		lev_left = 100;</div><div class='del'>-	if (lev_right &gt; 100)</div><div class='del'>-		lev_right = 100;</div><div class='del'>-</div><div class='del'>-#define SCALE(lev,max)	((lev) * (max) / 100)</div><div class='del'>-</div><div class='del'>-	if (machine_is_netwinder() &amp;&amp; whichDev == SOUND_MIXER_PHONEOUT)</div><div class='del'>-		whichDev = SOUND_MIXER_VOLUME;</div><div class='del'>-</div><div class='del'>-	if (mix_devs[whichDev].reg_l || mix_devs[whichDev].reg_r) {</div><div class='del'>-		const struct mix_ent *mix = mix_devs + whichDev;</div><div class='del'>-		unsigned int mask, left, right;</div><div class='del'>-</div><div class='del'>-		mask = mix-&gt;max &lt;&lt; mix-&gt;shift;</div><div class='del'>-		lev_left  = SCALE(lev_left,  mix-&gt;max) &lt;&lt; mix-&gt;shift;</div><div class='del'>-		lev_right = SCALE(lev_right, mix-&gt;max) &lt;&lt; mix-&gt;shift;</div><div class='del'>-</div><div class='del'>-		/* read left setting */</div><div class='del'>-		left  = waveartist_cmd1_r(devc, WACMD_GET_LEVEL |</div><div class='del'>-					       mix-&gt;reg_l &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-		/* read right setting */</div><div class='del'>-		right = waveartist_cmd1_r(devc, WACMD_GET_LEVEL |</div><div class='del'>-						mix-&gt;reg_r &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-		left  = (left  &amp; ~mask) | (lev_left  &amp; mask);</div><div class='del'>-		right = (right &amp; ~mask) | (lev_right &amp; mask);</div><div class='del'>-</div><div class='del'>-		/* write left,right back */</div><div class='del'>-		waveartist_cmd3(devc, WACMD_SET_MIXER, left, right);</div><div class='del'>-	} else {</div><div class='del'>-		switch(whichDev) {</div><div class='del'>-		case SOUND_MIXER_PCM:</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_LEVEL,</div><div class='del'>-					SCALE(lev_left,  32767),</div><div class='del'>-					SCALE(lev_right, 32767));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_SYNTH:</div><div class='del'>-			waveartist_cmd3(devc, 0x0100 | WACMD_SET_LEVEL,</div><div class='del'>-					SCALE(lev_left,  32767),</div><div class='del'>-					SCALE(lev_right, 32767));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set the ADC MUX to the specified values.  We do NOT do any</div><div class='del'>- * checking of the values passed, since we assume that the</div><div class='del'>- * relevant *_select_input function has done that for us.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-waveartist_set_adc_mux(wavnc_info *devc, char left_dev, char right_dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int reg_08, reg_09;</div><div class='del'>-</div><div class='del'>-	reg_08 = waveartist_cmd1_r(devc, WACMD_GET_LEVEL | 0x0800);</div><div class='del'>-	reg_09 = waveartist_cmd1_r(devc, WACMD_GET_LEVEL | 0x0900);</div><div class='del'>-</div><div class='del'>-	reg_08 = (reg_08 &amp; ~0x3f) | right_dev &lt;&lt; 3 | left_dev;</div><div class='del'>-</div><div class='del'>-	waveartist_cmd3(devc, WACMD_SET_MIXER, reg_08, reg_09);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Decode a recording mask into a mixer selection as follows:</div><div class='del'>- *</div><div class='del'>- *     OSS Source	WA Source	Actual source</div><div class='del'>- *  SOUND_MASK_IMIX	Mixer		Mixer output (same as AD1848)</div><div class='del'>- *  SOUND_MASK_LINE	Line		Line in</div><div class='del'>- *  SOUND_MASK_LINE1	Aux 1		Aux 1 in</div><div class='del'>- *  SOUND_MASK_LINE2	Aux 2		Aux 2 in</div><div class='del'>- *  SOUND_MASK_MIC	Mic		Microphone</div><div class='del'>- */</div><div class='del'>-static unsigned int</div><div class='del'>-waveartist_select_input(wavnc_info *devc, unsigned int recmask,</div><div class='del'>-			unsigned char *dev_l, unsigned char *dev_r)</div><div class='del'>-{</div><div class='del'>-	unsigned int recdev = ADC_MUX_NONE;</div><div class='del'>-</div><div class='del'>-	if (recmask &amp; SOUND_MASK_IMIX) {</div><div class='del'>-		recmask = SOUND_MASK_IMIX;</div><div class='del'>-		recdev = ADC_MUX_MIXER;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_LINE2) {</div><div class='del'>-		recmask = SOUND_MASK_LINE2;</div><div class='del'>-		recdev = ADC_MUX_AUX2;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_LINE1) {</div><div class='del'>-		recmask = SOUND_MASK_LINE1;</div><div class='del'>-		recdev = ADC_MUX_AUX1;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_LINE) {</div><div class='del'>-		recmask = SOUND_MASK_LINE;</div><div class='del'>-		recdev = ADC_MUX_LINE;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_MIC) {</div><div class='del'>-		recmask = SOUND_MASK_MIC;</div><div class='del'>-		recdev = ADC_MUX_MIC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*dev_l = *dev_r = recdev;</div><div class='del'>-</div><div class='del'>-	return recmask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_decode_mixer(wavnc_info *devc, int dev, unsigned char lev_l,</div><div class='del'>-			unsigned char lev_r)</div><div class='del'>-{</div><div class='del'>-	switch (dev) {</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-	case SOUND_MIXER_SYNTH:</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-	case SOUND_MIXER_MIC:</div><div class='del'>-	case SOUND_MIXER_IGAIN:</div><div class='del'>-	case SOUND_MIXER_LINE1:</div><div class='del'>-	case SOUND_MIXER_LINE2:</div><div class='del'>-		devc-&gt;levels[dev] = lev_l | lev_r &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_IMIX:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int waveartist_get_mixer(wavnc_info *devc, int dev)</div><div class='del'>-{</div><div class='del'>-	return devc-&gt;levels[dev];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct waveartist_mixer_info waveartist_mixer = {</div><div class='del'>-	.supported_devs	= SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN,</div><div class='del'>-	.recording_devs	= SOUND_MASK_LINE  | SOUND_MASK_MIC   |</div><div class='del'>-			SOUND_MASK_LINE1 | SOUND_MASK_LINE2 |</div><div class='del'>-			SOUND_MASK_IMIX,</div><div class='del'>-	.stereo_devs	= (SUPPORTED_MIXER_DEVICES | SOUND_MASK_IGAIN) &amp; ~</div><div class='del'>-			(SOUND_MASK_SPEAKER | SOUND_MASK_IMIX),</div><div class='del'>-	.select_input	= waveartist_select_input,</div><div class='del'>-	.decode_mixer	= waveartist_decode_mixer,</div><div class='del'>-	.get_mixer	= waveartist_get_mixer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_set_recmask(wavnc_info *devc, unsigned int recmask)</div><div class='del'>-{</div><div class='del'>-	unsigned char dev_l, dev_r;</div><div class='del'>-</div><div class='del'>-	recmask &amp;= devc-&gt;mix-&gt;recording_devs;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If more than one recording device selected,</div><div class='del'>-	 * disable the device that is currently in use.</div><div class='del'>-	 */</div><div class='del'>-	if (hweight32(recmask) &gt; 1)</div><div class='del'>-		recmask &amp;= ~devc-&gt;recmask;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Translate the recording device mask into</div><div class='del'>-	 * the ADC multiplexer settings.</div><div class='del'>-	 */</div><div class='del'>-	devc-&gt;recmask = devc-&gt;mix-&gt;select_input(devc, recmask,</div><div class='del'>-						&amp;dev_l, &amp;dev_r);</div><div class='del'>-</div><div class='del'>-	waveartist_set_adc_mux(devc, dev_l, dev_r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_set_mixer(wavnc_info *devc, int dev, unsigned int level)</div><div class='del'>-{</div><div class='del'>-	unsigned int lev_left  = level &amp; 0x00ff;</div><div class='del'>-	unsigned int lev_right = (level &amp; 0xff00) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	if (lev_left &gt; 100)</div><div class='del'>-		lev_left = 100;</div><div class='del'>-	if (lev_right &gt; 100)</div><div class='del'>-		lev_right = 100;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Mono devices have their right volume forced to their</div><div class='del'>-	 * left volume.  (from ALSA driver OSS emulation).</div><div class='del'>-	 */</div><div class='del'>-	if (!(devc-&gt;mix-&gt;stereo_devs &amp; (1 &lt;&lt; dev)))</div><div class='del'>-		lev_right = lev_left;</div><div class='del'>-</div><div class='del'>-	dev = devc-&gt;mix-&gt;decode_mixer(devc, dev, lev_left, lev_right);</div><div class='del'>-</div><div class='del'>-	if (dev &gt;= 0)</div><div class='del'>-		waveartist_mixer_update(devc, dev);</div><div class='del'>-</div><div class='del'>-	return dev &lt; 0 ? dev : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-waveartist_mixer_ioctl(int dev, unsigned int cmd, void __user * arg)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = (wavnc_info *)audio_devs[dev]-&gt;devc;</div><div class='del'>-	int ret = 0, val, nr;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * All SOUND_MIXER_* ioctls use type 'M'</div><div class='del'>-	 */</div><div class='del'>-	if (((cmd &gt;&gt; 8) &amp; 255) != 'M')</div><div class='del'>-		return -ENOIOCTLCMD;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-	if (machine_is_netwinder()) {</div><div class='del'>-		ret = vnc_private_ioctl(dev, cmd, arg);</div><div class='del'>-		if (ret != -ENOIOCTLCMD)</div><div class='del'>-			return ret;</div><div class='del'>-		else</div><div class='del'>-			ret = 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	nr = cmd &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) {</div><div class='del'>-		if (get_user(val, (int __user *)arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		switch (nr) {</div><div class='del'>-		case SOUND_MIXER_RECSRC:</div><div class='del'>-			waveartist_set_recmask(devc, val);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			if (nr &lt; SOUND_MIXER_NRDEVICES &amp;&amp;</div><div class='del'>-			    devc-&gt;mix-&gt;supported_devs &amp; (1 &lt;&lt; nr))</div><div class='del'>-				ret = waveartist_set_mixer(devc, nr, val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == 0 &amp;&amp; _SIOC_DIR(cmd) &amp; _SIOC_READ) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-		switch (nr) {</div><div class='del'>-		case SOUND_MIXER_RECSRC:</div><div class='del'>-			ret = devc-&gt;recmask;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_DEVMASK:</div><div class='del'>-			ret = devc-&gt;mix-&gt;supported_devs;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_STEREODEVS:</div><div class='del'>-			ret = devc-&gt;mix-&gt;stereo_devs;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_RECMASK:</div><div class='del'>-			ret = devc-&gt;mix-&gt;recording_devs;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case SOUND_MIXER_CAPS:</div><div class='del'>-			ret = SOUND_CAP_EXCL_INPUT;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			if (nr &lt; SOUND_MIXER_NRDEVICES)</div><div class='del'>-				ret = devc-&gt;mix-&gt;get_mixer(devc, nr);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			ret = put_user(ret, (int __user *)arg) ? -EFAULT : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mixer_operations waveartist_mixer_operations =</div><div class='del'>-{</div><div class='del'>-	.owner	= THIS_MODULE,</div><div class='del'>-	.id	= "WaveArtist",</div><div class='del'>-	.name	= "WaveArtist",</div><div class='del'>-	.ioctl	= waveartist_mixer_ioctl</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-waveartist_mixer_reset(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (debug_flg &amp; DEBUG_MIXER)</div><div class='del'>-		printk("%s: mixer_reset\n", devc-&gt;hw.name);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * reset mixer cmd</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd1(devc, WACMD_RST_MIXER);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set input for ADC to come from 'quiet'</div><div class='del'>-	 * turn on default modes</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd3(devc, WACMD_SET_MIXER, 0x9800, 0xa836);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set mixer input select to none, RX filter gains 0 dB</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd3(devc, WACMD_SET_MIXER, 0x4c00, 0x8c00);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * set bit 0 reg 2 to 1 - unmute MonoOut</div><div class='del'>-	 */</div><div class='del'>-	waveartist_cmd3(devc, WACMD_SET_MIXER, 0x2801, 0x6800);</div><div class='del'>-</div><div class='del'>-	/* set default input device = internal mic</div><div class='del'>-	 * current recording device = none</div><div class='del'>-	 */</div><div class='del'>-	waveartist_set_recmask(devc, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; SOUND_MIXER_NRDEVICES; i++)</div><div class='del'>-		waveartist_mixer_update(devc, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init waveartist_init(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	wavnc_port_info *portc;</div><div class='del'>-	char rev[3], dev_name[64];</div><div class='del'>-	int my_dev;</div><div class='del'>-</div><div class='del'>-	if (waveartist_reset(devc))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	sprintf(dev_name, "%s (%s", devc-&gt;hw.name, devc-&gt;chip_name);</div><div class='del'>-</div><div class='del'>-	if (waveartist_getrev(devc, rev)) {</div><div class='del'>-		strcat(dev_name, " rev. ");</div><div class='del'>-		strcat(dev_name, rev);</div><div class='del'>-	}</div><div class='del'>-	strcat(dev_name, ")");</div><div class='del'>-</div><div class='del'>-	conf_printf2(dev_name, devc-&gt;hw.io_base, devc-&gt;hw.irq,</div><div class='del'>-		     devc-&gt;hw.dma, devc-&gt;hw.dma2);</div><div class='del'>-</div><div class='del'>-	portc = kzalloc(sizeof(wavnc_port_info), GFP_KERNEL);</div><div class='del'>-	if (portc == NULL)</div><div class='del'>-		goto nomem;</div><div class='del'>-</div><div class='del'>-	my_dev = sound_install_audiodrv(AUDIO_DRIVER_VERSION, dev_name,</div><div class='del'>-			&amp;waveartist_audio_driver, sizeof(struct audio_driver),</div><div class='del'>-			devc-&gt;audio_flags, AFMT_U8 | AFMT_S16_LE | AFMT_S8,</div><div class='del'>-			devc, devc-&gt;hw.dma, devc-&gt;hw.dma2);</div><div class='del'>-</div><div class='del'>-	if (my_dev &lt; 0)</div><div class='del'>-		goto free;</div><div class='del'>-</div><div class='del'>-	audio_devs[my_dev]-&gt;portc = portc;</div><div class='del'>-</div><div class='del'>-	waveartist_mixer_reset(devc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * clear any pending interrupt</div><div class='del'>-	 */</div><div class='del'>-	waveartist_iack(devc);</div><div class='del'>-</div><div class='del'>-	if (request_irq(devc-&gt;hw.irq, waveartist_intr, 0, devc-&gt;hw.name, devc) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "%s: IRQ %d in use\n",</div><div class='del'>-			devc-&gt;hw.name, devc-&gt;hw.irq);</div><div class='del'>-		goto uninstall;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sound_alloc_dma(devc-&gt;hw.dma, devc-&gt;hw.name)) {</div><div class='del'>-		printk(KERN_ERR "%s: Can't allocate DMA%d\n",</div><div class='del'>-			devc-&gt;hw.name, devc-&gt;hw.dma);</div><div class='del'>-		goto uninstall_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;hw.dma != devc-&gt;hw.dma2 &amp;&amp; devc-&gt;hw.dma2 != NO_DMA)</div><div class='del'>-		if (sound_alloc_dma(devc-&gt;hw.dma2, devc-&gt;hw.name)) {</div><div class='del'>-			printk(KERN_ERR "%s: can't allocate DMA%d\n",</div><div class='del'>-				devc-&gt;hw.name, devc-&gt;hw.dma2);</div><div class='del'>-			goto uninstall_dma;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	waveartist_set_ctlr(&amp;devc-&gt;hw, 0, DMA1_IE | DMA0_IE);</div><div class='del'>-</div><div class='del'>-	audio_devs[my_dev]-&gt;mixer_dev =</div><div class='del'>-		sound_install_mixer(MIXER_DRIVER_VERSION,</div><div class='del'>-				dev_name,</div><div class='del'>-				&amp;waveartist_mixer_operations,</div><div class='del'>-				sizeof(struct mixer_operations),</div><div class='del'>-				devc);</div><div class='del'>-</div><div class='del'>-	return my_dev;</div><div class='del'>-</div><div class='del'>-uninstall_dma:</div><div class='del'>-	sound_free_dma(devc-&gt;hw.dma);</div><div class='del'>-</div><div class='del'>-uninstall_irq:</div><div class='del'>-	free_irq(devc-&gt;hw.irq, devc);</div><div class='del'>-</div><div class='del'>-uninstall:</div><div class='del'>-	sound_unload_audiodev(my_dev);</div><div class='del'>-</div><div class='del'>-free:</div><div class='del'>-	kfree(portc);</div><div class='del'>-</div><div class='del'>-nomem:</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init probe_waveartist(struct address_info *hw_config)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = &amp;adev_info[nr_waveartist_devs];</div><div class='del'>-</div><div class='del'>-	if (nr_waveartist_devs &gt;= MAX_AUDIO_DEV) {</div><div class='del'>-		printk(KERN_WARNING "waveartist: too many audio devices\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!request_region(hw_config-&gt;io_base, 15, hw_config-&gt;name))  {</div><div class='del'>-		printk(KERN_WARNING "WaveArtist: I/O port conflict\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;irq &gt; 15 || hw_config-&gt;irq &lt; 0) {</div><div class='del'>-		release_region(hw_config-&gt;io_base, 15);</div><div class='del'>-		printk(KERN_WARNING "WaveArtist: Bad IRQ %d\n",</div><div class='del'>-		       hw_config-&gt;irq);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hw_config-&gt;dma != 3) {</div><div class='del'>-		release_region(hw_config-&gt;io_base, 15);</div><div class='del'>-		printk(KERN_WARNING "WaveArtist: Bad DMA %d\n",</div><div class='del'>-		       hw_config-&gt;dma);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hw_config-&gt;name = "WaveArtist";</div><div class='del'>-	devc-&gt;hw = *hw_config;</div><div class='del'>-	devc-&gt;open_mode = 0;</div><div class='del'>-	devc-&gt;chip_name = "RWA-010";</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init</div><div class='del'>-attach_waveartist(struct address_info *hw, const struct waveartist_mixer_info *mix)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = &amp;adev_info[nr_waveartist_devs];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * NOTE! If irq &lt; 0, there is another driver which has allocated the</div><div class='del'>-	 *   IRQ so that this driver doesn't need to allocate/deallocate it.</div><div class='del'>-	 *   The actually used IRQ is ABS(irq).</div><div class='del'>-	 */</div><div class='del'>-	devc-&gt;hw = *hw;</div><div class='del'>-	devc-&gt;hw.irq = (hw-&gt;irq &gt; 0) ? hw-&gt;irq : 0;</div><div class='del'>-	devc-&gt;open_mode = 0;</div><div class='del'>-	devc-&gt;playback_dev = 0;</div><div class='del'>-	devc-&gt;record_dev = 0;</div><div class='del'>-	devc-&gt;audio_flags = DMA_AUTOMODE;</div><div class='del'>-	devc-&gt;levels = levels;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;dma != hw-&gt;dma2 &amp;&amp; hw-&gt;dma2 != NO_DMA)</div><div class='del'>-		devc-&gt;audio_flags |= DMA_DUPLEX;</div><div class='del'>-</div><div class='del'>-	devc-&gt;mix = mix;</div><div class='del'>-	devc-&gt;dev_no = waveartist_init(devc);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;dev_no &lt; 0)</div><div class='del'>-		release_region(hw-&gt;io_base, 15);</div><div class='del'>-	else {</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-		if (machine_is_netwinder()) {</div><div class='del'>-			init_timer(&amp;vnc_timer);</div><div class='del'>-			vnc_timer.function = vnc_slider_tick;</div><div class='del'>-			vnc_timer.expires  = jiffies;</div><div class='del'>-			vnc_timer.data     = nr_waveartist_devs;</div><div class='del'>-			add_timer(&amp;vnc_timer);</div><div class='del'>-</div><div class='del'>-			vnc_configure_mixer(devc, 0);</div><div class='del'>-</div><div class='del'>-			devc-&gt;no_autoselect = 1;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		nr_waveartist_devs += 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit unload_waveartist(struct address_info *hw)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nr_waveartist_devs; i++)</div><div class='del'>-		if (hw-&gt;io_base == adev_info[i].hw.io_base) {</div><div class='del'>-			devc = adev_info + i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (devc != NULL) {</div><div class='del'>-		int mixer;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-		if (machine_is_netwinder())</div><div class='del'>-			del_timer(&amp;vnc_timer);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		release_region(devc-&gt;hw.io_base, 15);</div><div class='del'>-</div><div class='del'>-		waveartist_set_ctlr(&amp;devc-&gt;hw, DMA1_IE|DMA0_IE, 0);</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;hw.irq &gt;= 0)</div><div class='del'>-			free_irq(devc-&gt;hw.irq, devc);</div><div class='del'>-</div><div class='del'>-		sound_free_dma(devc-&gt;hw.dma);</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;hw.dma != devc-&gt;hw.dma2 &amp;&amp;</div><div class='del'>-		    devc-&gt;hw.dma2 != NO_DMA)</div><div class='del'>-			sound_free_dma(devc-&gt;hw.dma2);</div><div class='del'>-</div><div class='del'>-		mixer = audio_devs[devc-&gt;dev_no]-&gt;mixer_dev;</div><div class='del'>-</div><div class='del'>-		if (mixer &gt;= 0)</div><div class='del'>-			sound_unload_mixerdev(mixer);</div><div class='del'>-</div><div class='del'>-		if (devc-&gt;dev_no &gt;= 0)</div><div class='del'>-			sound_unload_audiodev(devc-&gt;dev_no);</div><div class='del'>-</div><div class='del'>-		nr_waveartist_devs -= 1;</div><div class='del'>-</div><div class='del'>-		for (; i &lt; nr_waveartist_devs; i++)</div><div class='del'>-			adev_info[i] = adev_info[i + 1];</div><div class='del'>-	} else</div><div class='del'>-		printk(KERN_WARNING "waveartist: can't find device "</div><div class='del'>-		       "to unload\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Rebel.com Netwinder specifics...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/hardware/dec21285.h&gt;</div><div class='del'>- </div><div class='del'>-#define	VNC_TIMER_PERIOD (HZ/4)	//check slider 4 times/sec</div><div class='del'>-</div><div class='del'>-#define	MIXER_PRIVATE3_RESET	0x53570000</div><div class='del'>-#define	MIXER_PRIVATE3_READ	0x53570001</div><div class='del'>-#define	MIXER_PRIVATE3_WRITE	0x53570002</div><div class='del'>-</div><div class='del'>-#define	VNC_MUTE_INTERNAL_SPKR	0x01	//the sw mute on/off control bit</div><div class='del'>-#define	VNC_MUTE_LINE_OUT	0x10</div><div class='del'>-#define VNC_PHONE_DETECT	0x20</div><div class='del'>-#define VNC_HANDSET_DETECT	0x40</div><div class='del'>-#define VNC_DISABLE_AUTOSWITCH	0x80</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-vnc_mute_spkr(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;nw_gpio_lock, flags);</div><div class='del'>-	nw_cpld_modify(CPLD_UNMUTE, devc-&gt;spkr_mute_state ? 0 : CPLD_UNMUTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;nw_gpio_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vnc_mute_lout(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	unsigned int left, right;</div><div class='del'>-</div><div class='del'>-	left  = waveartist_cmd1_r(devc, WACMD_GET_LEVEL);</div><div class='del'>-	right = waveartist_cmd1_r(devc, WACMD_GET_LEVEL | 0x400);</div><div class='del'>-</div><div class='del'>-	if (devc-&gt;line_mute_state) {</div><div class='del'>-		left &amp;= ~1;</div><div class='del'>-		right &amp;= ~1;</div><div class='del'>-	} else {</div><div class='del'>-		left |= 1;</div><div class='del'>-		right |= 1;</div><div class='del'>-	}</div><div class='del'>-	waveartist_cmd3(devc, WACMD_SET_MIXER, left, right);</div><div class='del'>-		</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-vnc_volume_slider(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	static signed int old_slider_volume;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	signed int volume = 255;</div><div class='del'>-</div><div class='del'>-	*CSR_TIMER1_LOAD = 0x00ffffff;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-	outb(0xFF, 0x201);</div><div class='del'>-	*CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_DIV1;</div><div class='del'>-</div><div class='del'>-	while (volume &amp;&amp; (inb(0x201) &amp; 0x01))</div><div class='del'>-		volume--;</div><div class='del'>-</div><div class='del'>-	*CSR_TIMER1_CNTL = 0;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;waveartist_lock,flags);</div><div class='del'>-	</div><div class='del'>-	volume = 0x00ffffff - *CSR_TIMER1_VALUE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef REVERSE</div><div class='del'>-	volume = 150 - (volume &gt;&gt; 5);</div><div class='del'>-#else</div><div class='del'>-	volume = (volume &gt;&gt; 6) - 25;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (volume &lt; 0)</div><div class='del'>-		volume = 0;</div><div class='del'>-</div><div class='del'>-	if (volume &gt; 100)</div><div class='del'>-		volume = 100;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * slider quite often reads +-8, so debounce this random noise</div><div class='del'>-	 */</div><div class='del'>-	if (abs(volume - old_slider_volume) &gt; 7) {</div><div class='del'>-		old_slider_volume = volume;</div><div class='del'>-</div><div class='del'>-		if (debug_flg &amp; DEBUG_MIXER)</div><div class='del'>-			printk(KERN_DEBUG "Slider volume: %d.\n", volume);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return old_slider_volume;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Decode a recording mask into a mixer selection on the NetWinder</div><div class='del'>- * as follows:</div><div class='del'>- *</div><div class='del'>- *     OSS Source	WA Source	Actual source</div><div class='del'>- *  SOUND_MASK_IMIX	Mixer		Mixer output (same as AD1848)</div><div class='del'>- *  SOUND_MASK_LINE	Line		Line in</div><div class='del'>- *  SOUND_MASK_LINE1	Left Mic	Handset</div><div class='del'>- *  SOUND_MASK_PHONEIN	Left Aux	Telephone microphone</div><div class='del'>- *  SOUND_MASK_MIC	Right Mic	Builtin microphone</div><div class='del'>- */</div><div class='del'>-static unsigned int</div><div class='del'>-netwinder_select_input(wavnc_info *devc, unsigned int recmask,</div><div class='del'>-		       unsigned char *dev_l, unsigned char *dev_r)</div><div class='del'>-{</div><div class='del'>-	unsigned int recdev_l = ADC_MUX_NONE, recdev_r = ADC_MUX_NONE;</div><div class='del'>-</div><div class='del'>-	if (recmask &amp; SOUND_MASK_IMIX) {</div><div class='del'>-		recmask = SOUND_MASK_IMIX;</div><div class='del'>-		recdev_l = ADC_MUX_MIXER;</div><div class='del'>-		recdev_r = ADC_MUX_MIXER;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_LINE) {</div><div class='del'>-		recmask = SOUND_MASK_LINE;</div><div class='del'>-		recdev_l = ADC_MUX_LINE;</div><div class='del'>-		recdev_r = ADC_MUX_LINE;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_LINE1) {</div><div class='del'>-		recmask = SOUND_MASK_LINE1;</div><div class='del'>-		waveartist_cmd1(devc, WACMD_SET_MONO); /* left */</div><div class='del'>-		recdev_l = ADC_MUX_MIC;</div><div class='del'>-		recdev_r = ADC_MUX_NONE;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_PHONEIN) {</div><div class='del'>-		recmask = SOUND_MASK_PHONEIN;</div><div class='del'>-		waveartist_cmd1(devc, WACMD_SET_MONO); /* left */</div><div class='del'>-		recdev_l = ADC_MUX_AUX1;</div><div class='del'>-		recdev_r = ADC_MUX_NONE;</div><div class='del'>-	} else if (recmask &amp; SOUND_MASK_MIC) {</div><div class='del'>-		recmask = SOUND_MASK_MIC;</div><div class='del'>-		waveartist_cmd1(devc, WACMD_SET_MONO | 0x100);	/* right */</div><div class='del'>-		recdev_l = ADC_MUX_NONE;</div><div class='del'>-		recdev_r = ADC_MUX_MIC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*dev_l = recdev_l;</div><div class='del'>-	*dev_r = recdev_r;</div><div class='del'>-</div><div class='del'>-	return recmask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-netwinder_decode_mixer(wavnc_info *devc, int dev, unsigned char lev_l,</div><div class='del'>-		       unsigned char lev_r)</div><div class='del'>-{</div><div class='del'>-	switch (dev) {</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-	case SOUND_MIXER_SYNTH:</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-	case SOUND_MIXER_IGAIN:</div><div class='del'>-		devc-&gt;levels[dev] = lev_l | lev_r &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_MIC:		/* right mic only */</div><div class='del'>-		devc-&gt;levels[SOUND_MIXER_MIC] &amp;= 0xff;</div><div class='del'>-		devc-&gt;levels[SOUND_MIXER_MIC] |= lev_l &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_LINE1:		/* left mic only  */</div><div class='del'>-		devc-&gt;levels[SOUND_MIXER_MIC] &amp;= 0xff00;</div><div class='del'>-		devc-&gt;levels[SOUND_MIXER_MIC] |= lev_l;</div><div class='del'>-		dev = SOUND_MIXER_MIC;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_PHONEIN:	/* left aux only  */</div><div class='del'>-		devc-&gt;levels[SOUND_MIXER_LINE1] = lev_l;</div><div class='del'>-		dev = SOUND_MIXER_LINE1;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_IMIX:</div><div class='del'>-	case SOUND_MIXER_PHONEOUT:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int netwinder_get_mixer(wavnc_info *devc, int dev)</div><div class='del'>-{</div><div class='del'>-	int levels;</div><div class='del'>-</div><div class='del'>-	switch (dev) {</div><div class='del'>-	case SOUND_MIXER_VOLUME:</div><div class='del'>-	case SOUND_MIXER_SYNTH:</div><div class='del'>-	case SOUND_MIXER_PCM:</div><div class='del'>-	case SOUND_MIXER_LINE:</div><div class='del'>-	case SOUND_MIXER_IGAIN:</div><div class='del'>-		levels = devc-&gt;levels[dev];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_MIC:		/* builtin mic: right mic only */</div><div class='del'>-		levels = devc-&gt;levels[SOUND_MIXER_MIC] &gt;&gt; 8;</div><div class='del'>-		levels |= levels &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_LINE1:		/* handset mic: left mic only */</div><div class='del'>-		levels = devc-&gt;levels[SOUND_MIXER_MIC] &amp; 0xff;</div><div class='del'>-		levels |= levels &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_PHONEIN:	/* phone mic: left aux1 only */</div><div class='del'>-		levels = devc-&gt;levels[SOUND_MIXER_LINE1] &amp; 0xff;</div><div class='del'>-		levels |= levels &lt;&lt; 8;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		levels = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return levels;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Waveartist specific mixer information.</div><div class='del'>- */</div><div class='del'>-static const struct waveartist_mixer_info netwinder_mixer = {</div><div class='del'>-	.supported_devs	= SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |</div><div class='del'>-			SOUND_MASK_PCM     | SOUND_MASK_SPEAKER |</div><div class='del'>-			SOUND_MASK_LINE    | SOUND_MASK_MIC     |</div><div class='del'>-			SOUND_MASK_IMIX    | SOUND_MASK_LINE1   |</div><div class='del'>-			SOUND_MASK_PHONEIN | SOUND_MASK_PHONEOUT|</div><div class='del'>-			SOUND_MASK_IGAIN,</div><div class='del'>-</div><div class='del'>-	.recording_devs	= SOUND_MASK_LINE    | SOUND_MASK_MIC     |</div><div class='del'>-			SOUND_MASK_IMIX    | SOUND_MASK_LINE1   |</div><div class='del'>-			SOUND_MASK_PHONEIN,</div><div class='del'>-</div><div class='del'>-	.stereo_devs	= SOUND_MASK_VOLUME  | SOUND_MASK_SYNTH   |</div><div class='del'>-			SOUND_MASK_PCM     | SOUND_MASK_LINE    |</div><div class='del'>-			SOUND_MASK_IMIX    | SOUND_MASK_IGAIN,</div><div class='del'>-</div><div class='del'>-	.select_input	= netwinder_select_input,</div><div class='del'>-	.decode_mixer	= netwinder_decode_mixer,</div><div class='del'>-	.get_mixer	= netwinder_get_mixer,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vnc_configure_mixer(wavnc_info *devc, unsigned int recmask)</div><div class='del'>-{</div><div class='del'>-	if (!devc-&gt;no_autoselect) {</div><div class='del'>-		if (devc-&gt;handset_detect) {</div><div class='del'>-			recmask = SOUND_MASK_LINE1;</div><div class='del'>-			devc-&gt;spkr_mute_state = devc-&gt;line_mute_state = 1;</div><div class='del'>-		} else if (devc-&gt;telephone_detect) {</div><div class='del'>-			recmask = SOUND_MASK_PHONEIN;</div><div class='del'>-			devc-&gt;spkr_mute_state = devc-&gt;line_mute_state = 1;</div><div class='del'>-		} else {</div><div class='del'>-			/* unless someone has asked for LINE-IN,</div><div class='del'>-			 * we default to MIC</div><div class='del'>-			 */</div><div class='del'>-			if ((devc-&gt;recmask &amp; SOUND_MASK_LINE) == 0)</div><div class='del'>-				devc-&gt;recmask = SOUND_MASK_MIC;</div><div class='del'>-			devc-&gt;spkr_mute_state = devc-&gt;line_mute_state = 0;</div><div class='del'>-		}</div><div class='del'>-		vnc_mute_spkr(devc);</div><div class='del'>-		vnc_mute_lout(devc);</div><div class='del'>-</div><div class='del'>-		if (recmask != devc-&gt;recmask)</div><div class='del'>-			waveartist_set_recmask(devc, recmask);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-vnc_slider(wavnc_info *devc)</div><div class='del'>-{</div><div class='del'>-	signed int slider_volume;</div><div class='del'>-	unsigned int temp, old_hs, old_td;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * read the "buttons" state.</div><div class='del'>-	 *  Bit 4 = 0 means handset present</div><div class='del'>-	 *  Bit 5 = 1 means phone offhook</div><div class='del'>-	 */</div><div class='del'>-	temp = inb(0x201);</div><div class='del'>-</div><div class='del'>-	old_hs = devc-&gt;handset_detect;</div><div class='del'>-	old_td = devc-&gt;telephone_detect;</div><div class='del'>-</div><div class='del'>-	devc-&gt;handset_detect = !(temp &amp; 0x10);</div><div class='del'>-	devc-&gt;telephone_detect = !!(temp &amp; 0x20);</div><div class='del'>-</div><div class='del'>-	if (!devc-&gt;no_autoselect &amp;&amp;</div><div class='del'>-	    (old_hs != devc-&gt;handset_detect ||</div><div class='del'>-	     old_td != devc-&gt;telephone_detect))</div><div class='del'>-		vnc_configure_mixer(devc, devc-&gt;recmask);</div><div class='del'>-</div><div class='del'>-	slider_volume = vnc_volume_slider(devc);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we're using software controlled volume, and</div><div class='del'>-	 * the slider moves by more than 20%, then we</div><div class='del'>-	 * switch back to slider controlled volume.</div><div class='del'>-	 */</div><div class='del'>-	if (abs(devc-&gt;slider_vol - slider_volume) &gt; 20)</div><div class='del'>-		devc-&gt;use_slider = 1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * use only left channel</div><div class='del'>-	 */</div><div class='del'>-	temp = levels[SOUND_MIXER_VOLUME] &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	if (slider_volume != temp &amp;&amp; devc-&gt;use_slider) {</div><div class='del'>-		devc-&gt;slider_vol = slider_volume;</div><div class='del'>-</div><div class='del'>-		waveartist_set_mixer(devc, SOUND_MIXER_VOLUME,</div><div class='del'>-			slider_volume | slider_volume &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vnc_slider_tick(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	int next_timeout;</div><div class='del'>-</div><div class='del'>-	if (vnc_slider(adev_info + data))</div><div class='del'>-		next_timeout = 5;	// mixer reported change</div><div class='del'>-	else</div><div class='del'>-		next_timeout = VNC_TIMER_PERIOD;</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;vnc_timer, jiffies + next_timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-vnc_private_ioctl(int dev, unsigned int cmd, int __user * arg)</div><div class='del'>-{</div><div class='del'>-	wavnc_info *devc = (wavnc_info *)audio_devs[dev]-&gt;devc;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SOUND_MIXER_PRIVATE1:</div><div class='del'>-	{</div><div class='del'>-		u_int prev_spkr_mute, prev_line_mute, prev_auto_state;</div><div class='del'>-		int val;</div><div class='del'>-</div><div class='del'>-		if (get_user(val, arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		/* check if parameter is logical */</div><div class='del'>-		if (val &amp; ~(VNC_MUTE_INTERNAL_SPKR |</div><div class='del'>-			    VNC_MUTE_LINE_OUT |</div><div class='del'>-			    VNC_DISABLE_AUTOSWITCH))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		prev_auto_state = devc-&gt;no_autoselect;</div><div class='del'>-		prev_spkr_mute  = devc-&gt;spkr_mute_state;</div><div class='del'>-		prev_line_mute  = devc-&gt;line_mute_state;</div><div class='del'>-</div><div class='del'>-		devc-&gt;no_autoselect   = (val &amp; VNC_DISABLE_AUTOSWITCH) ? 1 : 0;</div><div class='del'>-		devc-&gt;spkr_mute_state = (val &amp; VNC_MUTE_INTERNAL_SPKR) ? 1 : 0;</div><div class='del'>-		devc-&gt;line_mute_state = (val &amp; VNC_MUTE_LINE_OUT) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-		if (prev_spkr_mute != devc-&gt;spkr_mute_state)</div><div class='del'>-			vnc_mute_spkr(devc);</div><div class='del'>-</div><div class='del'>-		if (prev_line_mute != devc-&gt;line_mute_state)</div><div class='del'>-			vnc_mute_lout(devc);</div><div class='del'>-</div><div class='del'>-		if (prev_auto_state != devc-&gt;no_autoselect)</div><div class='del'>-			vnc_configure_mixer(devc, devc-&gt;recmask);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case SOUND_MIXER_PRIVATE2:</div><div class='del'>-		if (get_user(val, arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		switch (val) {</div><div class='del'>-#define VNC_SOUND_PAUSE         0x53    //to pause the DSP</div><div class='del'>-#define VNC_SOUND_RESUME        0x57    //to unpause the DSP</div><div class='del'>-		case VNC_SOUND_PAUSE:</div><div class='del'>-			waveartist_cmd1(devc, 0x16);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case VNC_SOUND_RESUME:</div><div class='del'>-			waveartist_cmd1(devc, 0x18);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* private ioctl to allow bulk access to waveartist */</div><div class='del'>-	case SOUND_MIXER_PRIVATE3:</div><div class='del'>-	{</div><div class='del'>-		unsigned long	flags;</div><div class='del'>-		int		mixer_reg[15], i, val;</div><div class='del'>-</div><div class='del'>-		if (get_user(val, arg))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		if (copy_from_user(mixer_reg, (void *)val, sizeof(mixer_reg)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		switch (mixer_reg[14]) {</div><div class='del'>-		case MIXER_PRIVATE3_RESET:</div><div class='del'>-			waveartist_mixer_reset(devc);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIXER_PRIVATE3_WRITE:</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_MIXER, mixer_reg[0], mixer_reg[4]);</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_MIXER, mixer_reg[1], mixer_reg[5]);</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_MIXER, mixer_reg[2], mixer_reg[6]);</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_MIXER, mixer_reg[3], mixer_reg[7]);</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_MIXER, mixer_reg[8], mixer_reg[9]);</div><div class='del'>-</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_LEVEL, mixer_reg[10], mixer_reg[11]);</div><div class='del'>-			waveartist_cmd3(devc, WACMD_SET_LEVEL, mixer_reg[12], mixer_reg[13]);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MIXER_PRIVATE3_READ:</div><div class='del'>-			spin_lock_irqsave(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-			for (i = 0x30; i &lt; 14 &lt;&lt; 8; i += 1 &lt;&lt; 8)</div><div class='del'>-				waveartist_cmd(devc, 1, &amp;i, 1, mixer_reg + (i &gt;&gt; 8));</div><div class='del'>-</div><div class='del'>-			spin_unlock_irqrestore(&amp;waveartist_lock, flags);</div><div class='del'>-</div><div class='del'>-			if (copy_to_user((void *)val, mixer_reg, sizeof(mixer_reg)))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read back the state from PRIVATE1 */</div><div class='del'>-	case SOUND_MIXER_PRIVATE4:</div><div class='del'>-		val = (devc-&gt;spkr_mute_state  ? VNC_MUTE_INTERNAL_SPKR : 0) |</div><div class='del'>-		      (devc-&gt;line_mute_state  ? VNC_MUTE_LINE_OUT      : 0) |</div><div class='del'>-		      (devc-&gt;handset_detect   ? VNC_HANDSET_DETECT     : 0) |</div><div class='del'>-		      (devc-&gt;telephone_detect ? VNC_PHONE_DETECT       : 0) |</div><div class='del'>-		      (devc-&gt;no_autoselect    ? VNC_DISABLE_AUTOSWITCH : 0);</div><div class='del'>-</div><div class='del'>-		return put_user(val, arg) ? -EFAULT : 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (_SIOC_DIR(cmd) &amp; _SIOC_WRITE) {</div><div class='del'>-		/*</div><div class='del'>-		 * special case for master volume: if we</div><div class='del'>-		 * received this call - switch from hw</div><div class='del'>-		 * volume control to a software volume</div><div class='del'>-		 * control, till the hw volume is modified</div><div class='del'>-		 * to signal that user wants to be back in</div><div class='del'>-		 * hardware...</div><div class='del'>-		 */</div><div class='del'>-		if ((cmd &amp; 0xff) == SOUND_MIXER_VOLUME)</div><div class='del'>-			devc-&gt;use_slider = 0;</div><div class='del'>-</div><div class='del'>-		/* speaker output            */</div><div class='del'>-		if ((cmd &amp; 0xff) == SOUND_MIXER_SPEAKER) {</div><div class='del'>-			unsigned int val, l, r;</div><div class='del'>-</div><div class='del'>-			if (get_user(val, arg))</div><div class='del'>-				return -EFAULT;</div><div class='del'>-</div><div class='del'>-			l = val &amp; 0x7f;</div><div class='del'>-			r = (val &amp; 0x7f00) &gt;&gt; 8;</div><div class='del'>-			val = (l + r) / 2;</div><div class='del'>-			devc-&gt;levels[SOUND_MIXER_SPEAKER] = val | (val &lt;&lt; 8);</div><div class='del'>-			devc-&gt;spkr_mute_state = (val &lt;= 50);</div><div class='del'>-			vnc_mute_spkr(devc);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct address_info cfg;</div><div class='del'>-</div><div class='del'>-static int attached;</div><div class='del'>-</div><div class='del'>-static int __initdata io = 0;</div><div class='del'>-static int __initdata irq = 0;</div><div class='del'>-static int __initdata dma = 0;</div><div class='del'>-static int __initdata dma2 = 0;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init init_waveartist(void)</div><div class='del'>-{</div><div class='del'>-	const struct waveartist_mixer_info *mix;</div><div class='del'>-</div><div class='del'>-	if (!io &amp;&amp; machine_is_netwinder()) {</div><div class='del'>-		/*</div><div class='del'>-		 * The NetWinder WaveArtist is at a fixed address.</div><div class='del'>-		 * If the user does not supply an address, use the</div><div class='del'>-		 * well-known parameters.</div><div class='del'>-		 */</div><div class='del'>-		io   = 0x250;</div><div class='del'>-		irq  = 12;</div><div class='del'>-		dma  = 3;</div><div class='del'>-		dma2 = 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mix = &amp;waveartist_mixer;</div><div class='del'>-#ifdef CONFIG_ARCH_NETWINDER</div><div class='del'>-	if (machine_is_netwinder())</div><div class='del'>-		mix = &amp;netwinder_mixer;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	cfg.io_base = io;</div><div class='del'>-	cfg.irq = irq;</div><div class='del'>-	cfg.dma = dma;</div><div class='del'>-	cfg.dma2 = dma2;</div><div class='del'>-</div><div class='del'>-	if (!probe_waveartist(&amp;cfg))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	attach_waveartist(&amp;cfg, mix);</div><div class='del'>-	attached = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cleanup_waveartist(void)</div><div class='del'>-{</div><div class='del'>-	if (attached)</div><div class='del'>-		unload_waveartist(&amp;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(init_waveartist);</div><div class='del'>-module_exit(cleanup_waveartist);</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-static int __init setup_waveartist(char *str)</div><div class='del'>-{</div><div class='del'>-	/* io, irq, dma, dma2 */</div><div class='del'>-	int ints[5];</div><div class='del'>-	</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-	</div><div class='del'>-	io	= ints[1];</div><div class='del'>-	irq	= ints[2];</div><div class='del'>-	dma	= ints[3];</div><div class='del'>-	dma2	= ints[4];</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-__setup("waveartist=", setup_waveartist);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Rockwell WaveArtist RWA-010 sound driver");</div><div class='del'>-module_param(io, int, 0);		/* IO base */</div><div class='del'>-module_param(irq, int, 0);		/* IRQ */</div><div class='del'>-module_param(dma, int, 0);		/* DMA */</div><div class='del'>-module_param(dma2, int, 0);		/* DMA2 */</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/oss/waveartist.h b/sound/oss/waveartist.h<br/>deleted file mode 100644<br/>index dac4ca910d95..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/oss/waveartist.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/oss/waveartist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/sound/oss/waveartist.h</div><div class='del'>- *</div><div class='del'>- * def file for Rockwell RWA010 chip set, as installed in Rebel.com NetWinder</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-//registers</div><div class='del'>-#define CMDR	0</div><div class='del'>-#define DATR	2</div><div class='del'>-#define CTLR	4</div><div class='del'>-#define	STATR	5</div><div class='del'>-#define	IRQSTAT	12</div><div class='del'>-</div><div class='del'>-//bit defs</div><div class='del'>-//reg STATR</div><div class='del'>-#define	CMD_WE	0x80</div><div class='del'>-#define	CMD_RF	0x40</div><div class='del'>-#define	DAT_WE	0x20</div><div class='del'>-#define	DAT_RF	0x10</div><div class='del'>-</div><div class='del'>-#define	IRQ_REQ	0x08</div><div class='del'>-#define	DMA1	0x04</div><div class='del'>-#define	DMA0	0x02</div><div class='del'>-</div><div class='del'>-//bit defs</div><div class='del'>-//reg CTLR</div><div class='del'>-#define	CMD_WEIE	0x80</div><div class='del'>-#define	CMD_RFIE	0x40</div><div class='del'>-#define	DAT_WEIE	0x20</div><div class='del'>-#define	DAT_RFIE	0x10</div><div class='del'>-</div><div class='del'>-#define	RESET	0x08</div><div class='del'>-#define	DMA1_IE	0x04</div><div class='del'>-#define	DMA0_IE	0x02</div><div class='del'>-#define	IRQ_ACK	0x01</div><div class='del'>-</div><div class='del'>-//commands</div><div class='del'>-</div><div class='del'>-#define	WACMD_SYSTEMID		0x00</div><div class='del'>-#define WACMD_GETREV		0x00</div><div class='del'>-#define	WACMD_INPUTFORMAT	0x10	//0-8S, 1-16S, 2-8U</div><div class='del'>-#define	WACMD_INPUTCHANNELS	0x11	//1-Mono, 2-Stereo</div><div class='del'>-#define	WACMD_INPUTSPEED	0x12	//sampling rate</div><div class='del'>-#define	WACMD_INPUTDMA		0x13	//0-8bit, 1-16bit, 2-PIO</div><div class='del'>-#define	WACMD_INPUTSIZE		0x14	//samples to interrupt</div><div class='del'>-#define	WACMD_INPUTSTART	0x15	//start ADC</div><div class='del'>-#define	WACMD_INPUTPAUSE	0x16	//pause ADC</div><div class='del'>-#define	WACMD_INPUTSTOP		0x17	//stop ADC</div><div class='del'>-#define	WACMD_INPUTRESUME	0x18	//resume ADC</div><div class='del'>-#define	WACMD_INPUTPIO		0x19	//PIO ADC</div><div class='del'>-</div><div class='del'>-#define	WACMD_OUTPUTFORMAT	0x20	//0-8S, 1-16S, 2-8U</div><div class='del'>-#define	WACMD_OUTPUTCHANNELS	0x21	//1-Mono, 2-Stereo</div><div class='del'>-#define	WACMD_OUTPUTSPEED	0x22	//sampling rate</div><div class='del'>-#define	WACMD_OUTPUTDMA		0x23	//0-8bit, 1-16bit, 2-PIO</div><div class='del'>-#define	WACMD_OUTPUTSIZE	0x24	//samples to interrupt</div><div class='del'>-#define	WACMD_OUTPUTSTART	0x25	//start ADC</div><div class='del'>-#define	WACMD_OUTPUTPAUSE	0x26	//pause ADC</div><div class='del'>-#define	WACMD_OUTPUTSTOP	0x27	//stop ADC</div><div class='del'>-#define	WACMD_OUTPUTRESUME	0x28	//resume ADC</div><div class='del'>-#define	WACMD_OUTPUTPIO		0x29	//PIO ADC</div><div class='del'>-</div><div class='del'>-#define	WACMD_GET_LEVEL		0x30</div><div class='del'>-#define	WACMD_SET_LEVEL		0x31</div><div class='del'>-#define	WACMD_SET_MIXER		0x32</div><div class='del'>-#define	WACMD_RST_MIXER		0x33</div><div class='del'>-#define	WACMD_SET_MONO		0x34</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Definitions for left/right recording input mux</div><div class='del'>- */</div><div class='del'>-#define ADC_MUX_NONE	0</div><div class='del'>-#define ADC_MUX_MIXER	1</div><div class='del'>-#define ADC_MUX_LINE	2</div><div class='del'>-#define ADC_MUX_AUX2	3</div><div class='del'>-#define ADC_MUX_AUX1	4</div><div class='del'>-#define ADC_MUX_MIC	5</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Definitions for mixer gain settings</div><div class='del'>- */</div><div class='del'>-#define MIX_GAIN_LINE	0	/* line in	 */</div><div class='del'>-#define MIX_GAIN_AUX1	1	/* aux1		 */</div><div class='del'>-#define MIX_GAIN_AUX2	2	/* aux2		 */</div><div class='del'>-#define MIX_GAIN_XMIC	3	/* crossover mic */</div><div class='del'>-#define MIX_GAIN_MIC	4	/* normal mic	 */</div><div class='del'>-#define MIX_GAIN_PREMIC	5	/* preamp mic	 */</div><div class='del'>-#define MIX_GAIN_OUT	6	/* output	 */</div><div class='del'>-#define MIX_GAIN_MONO	7	/* mono in	 */</div><div class='del'>-</div><div class='del'>-int wa_sendcmd(unsigned int cmd);</div><div class='del'>-int wa_writecmd(unsigned int cmd, unsigned int arg);</div><div class='head'>diff --git a/sound/parisc/Kconfig b/sound/parisc/Kconfig<br/>index 9b61d95010f0..425ceaf9c990 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/parisc/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/parisc/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/parisc/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA PA-RISC drivers</div><div class='ctx'> </div><div class='ctx'> menuconfig SND_GSC</div><div class='head'>diff --git a/sound/parisc/Makefile b/sound/parisc/Makefile<br/>index b91e750aba02..84c71490fb72 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/parisc/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/parisc/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/parisc/Makefile</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-harmony-objs := harmony.o</div><div class='add'>+snd-harmony-y := harmony.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_HARMONY) += snd-harmony.o</div><div class='head'>diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c<br/>index f47f9e226b08..4b5a54da25fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/parisc/harmony.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/harmony.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/parisc/harmony.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/parisc/harmony.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Hewlett-Packard Harmony audio driver</div><div class='ctx'>  *</div><div class='ctx'>  *   This is a driver for the Harmony audio chipset found</div><div class='hunk'>@@ -13,26 +14,12 @@</div><div class='ctx'>  *       Copyright 2003 (c) Laurent Canet</div><div class='ctx'>  *       Copyright 2004 (c) Stuart Brady</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License, version 2, as</div><div class='del'>- *   published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  * Notes:</div><div class='ctx'>  *   - graveyard and silence buffers last for lifetime of</div><div class='ctx'>  *     the driver. playback and capture buffers are allocated</div><div class='ctx'>  *     per _open()/_close().</div><div class='ctx'>  * </div><div class='ctx'>  * TODO:</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -44,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -52,7 +40,6 @@</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/hardware.h&gt;</div><div class='ctx'> #include &lt;asm/parisc-device.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +53,7 @@ module_param(id, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for Harmony driver.");</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct parisc_device_id snd_harmony_devtable[] = {</div><div class='add'>+static const struct parisc_device_id snd_harmony_devtable[] __initconst = {</div><div class='ctx'> 	/* bushmaster / flounder */</div><div class='ctx'> 	{ HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x0007A }, </div><div class='ctx'> 	/* 712 / 715 */</div><div class='hunk'>@@ -83,14 +70,14 @@ MODULE_DEVICE_TABLE(parisc, snd_harmony_devtable);</div><div class='ctx'> #define NAME "harmony"</div><div class='ctx'> #define PFX  NAME ": "</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_harmony_rates[] = {</div><div class='add'>+static const unsigned int snd_harmony_rates[] = {</div><div class='ctx'> 	5512, 6615, 8000, 9600,</div><div class='ctx'> 	11025, 16000, 18900, 22050,</div><div class='ctx'> 	27428, 32000, 33075, 37800,</div><div class='ctx'> 	44100, 48000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int rate_bits[14] = {</div><div class='add'>+static const unsigned int rate_bits[14] = {</div><div class='ctx'> 	HARMONY_SR_5KHZ, HARMONY_SR_6KHZ, HARMONY_SR_8KHZ,</div><div class='ctx'> 	HARMONY_SR_9KHZ, HARMONY_SR_11KHZ, HARMONY_SR_16KHZ,</div><div class='ctx'> 	HARMONY_SR_18KHZ, HARMONY_SR_22KHZ, HARMONY_SR_27KHZ,</div><div class='hunk'>@@ -98,7 +85,7 @@ static unsigned int rate_bits[14] = {</div><div class='ctx'> 	HARMONY_SR_44KHZ, HARMONY_SR_48KHZ</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraint_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraint_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(snd_harmony_rates),</div><div class='ctx'> 	.list = snd_harmony_rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -153,32 +140,25 @@ harmony_enable_interrupts(struct snd_harmony *h)</div><div class='ctx'> static void</div><div class='ctx'> harmony_mute(struct snd_harmony *h)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;h-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> 	harmony_wait_for_control(h);</div><div class='ctx'> 	harmony_write(h, HARMONY_GAINCTL, HARMONY_GAIN_SILENCE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;h-&gt;mixer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> harmony_unmute(struct snd_harmony *h)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;h-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> 	harmony_wait_for_control(h);</div><div class='ctx'> 	harmony_write(h, HARMONY_GAINCTL, h-&gt;st.gain);</div><div class='del'>-	spin_unlock_irqrestore(&amp;h-&gt;mixer_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> harmony_set_control(struct snd_harmony *h)</div><div class='ctx'> {</div><div class='ctx'> 	u32 ctrl;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;h-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;h-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ctrl = (HARMONY_CNTL_C      |</div><div class='ctx'> 		(h-&gt;st.format &lt;&lt; 6) |</div><div class='hunk'>@@ -187,8 +167,6 @@ harmony_set_control(struct snd_harmony *h)</div><div class='ctx'> </div><div class='ctx'> 	harmony_wait_for_control(h);</div><div class='ctx'> 	harmony_write(h, HARMONY_CNTL, ctrl);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;h-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t</div><div class='hunk'>@@ -197,53 +175,53 @@ snd_harmony_interrupt(int irq, void *dev)</div><div class='ctx'> 	u32 dstatus;</div><div class='ctx'> 	struct snd_harmony *h = dev;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;h-&gt;lock);</div><div class='del'>-	harmony_disable_interrupts(h);</div><div class='del'>-	harmony_wait_for_control(h);</div><div class='del'>-	dstatus = harmony_read(h, HARMONY_DSTATUS);</div><div class='del'>-	spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+		harmony_disable_interrupts(h);</div><div class='add'>+		harmony_wait_for_control(h);</div><div class='add'>+		dstatus = harmony_read(h, HARMONY_DSTATUS);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dstatus &amp; HARMONY_DSTATUS_PN) {</div><div class='ctx'> 		if (h-&gt;psubs &amp;&amp; h-&gt;st.playing) {</div><div class='del'>-			spin_lock(&amp;h-&gt;lock);</div><div class='del'>-			h-&gt;pbuf.buf += h-&gt;pbuf.count; /* PAGE_SIZE */</div><div class='del'>-			h-&gt;pbuf.buf %= h-&gt;pbuf.size; /* MAX_BUFS*PAGE_SIZE */</div><div class='del'>-</div><div class='del'>-			harmony_write(h, HARMONY_PNXTADD, </div><div class='del'>-				      h-&gt;pbuf.addr + h-&gt;pbuf.buf);</div><div class='del'>-			h-&gt;stats.play_intr++;</div><div class='del'>-			spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+			scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+				h-&gt;pbuf.buf += h-&gt;pbuf.count; /* PAGE_SIZE */</div><div class='add'>+				h-&gt;pbuf.buf %= h-&gt;pbuf.size; /* MAX_BUFS*PAGE_SIZE */</div><div class='add'>+</div><div class='add'>+				harmony_write(h, HARMONY_PNXTADD,</div><div class='add'>+					      h-&gt;pbuf.addr + h-&gt;pbuf.buf);</div><div class='add'>+				h-&gt;stats.play_intr++;</div><div class='add'>+			}</div><div class='ctx'>                         snd_pcm_period_elapsed(h-&gt;psubs);</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_lock(&amp;h-&gt;lock);</div><div class='del'>-			harmony_write(h, HARMONY_PNXTADD, h-&gt;sdma.addr);</div><div class='del'>-			h-&gt;stats.silence_intr++;</div><div class='del'>-			spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+			scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+				harmony_write(h, HARMONY_PNXTADD, h-&gt;sdma.addr);</div><div class='add'>+				h-&gt;stats.silence_intr++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (dstatus &amp; HARMONY_DSTATUS_RN) {</div><div class='ctx'> 		if (h-&gt;csubs &amp;&amp; h-&gt;st.capturing) {</div><div class='del'>-			spin_lock(&amp;h-&gt;lock);</div><div class='del'>-			h-&gt;cbuf.buf += h-&gt;cbuf.count;</div><div class='del'>-			h-&gt;cbuf.buf %= h-&gt;cbuf.size;</div><div class='del'>-</div><div class='del'>-			harmony_write(h, HARMONY_RNXTADD,</div><div class='del'>-				      h-&gt;cbuf.addr + h-&gt;cbuf.buf);</div><div class='del'>-			h-&gt;stats.rec_intr++;</div><div class='del'>-			spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+			scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+				h-&gt;cbuf.buf += h-&gt;cbuf.count;</div><div class='add'>+				h-&gt;cbuf.buf %= h-&gt;cbuf.size;</div><div class='add'>+</div><div class='add'>+				harmony_write(h, HARMONY_RNXTADD,</div><div class='add'>+					      h-&gt;cbuf.addr + h-&gt;cbuf.buf);</div><div class='add'>+				h-&gt;stats.rec_intr++;</div><div class='add'>+			}</div><div class='ctx'>                         snd_pcm_period_elapsed(h-&gt;csubs);</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_lock(&amp;h-&gt;lock);</div><div class='del'>-			harmony_write(h, HARMONY_RNXTADD, h-&gt;gdma.addr);</div><div class='del'>-			h-&gt;stats.graveyard_intr++;</div><div class='del'>-			spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+			scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+				harmony_write(h, HARMONY_RNXTADD, h-&gt;gdma.addr);</div><div class='add'>+				h-&gt;stats.graveyard_intr++;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;h-&gt;lock);</div><div class='del'>-	harmony_enable_interrupts(h);</div><div class='del'>-	spin_unlock(&amp;h-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;h-&gt;lock) {</div><div class='add'>+		harmony_enable_interrupts(h);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -260,7 +238,7 @@ snd_harmony_rate_bits(int rate)</div><div class='ctx'> 	return HARMONY_SR_44KHZ;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_harmony_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_harmony_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =	(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | </div><div class='ctx'> 		 SNDRV_PCM_INFO_JOINT_DUPLEX | SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -281,7 +259,7 @@ static struct snd_pcm_hardware snd_harmony_playback =</div><div class='ctx'> 	.fifo_size = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_harmony_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_harmony_capture =</div><div class='ctx'> {</div><div class='ctx'>         .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'>                  SNDRV_PCM_INFO_JOINT_DUPLEX | SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -310,7 +288,7 @@ snd_harmony_playback_trigger(struct snd_pcm_substream *ss, int cmd)</div><div class='ctx'> 	if (h-&gt;st.capturing)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;h-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;h-&gt;lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		h-&gt;st.playing = 1;</div><div class='hunk'>@@ -329,11 +307,9 @@ snd_harmony_playback_trigger(struct snd_pcm_substream *ss, int cmd)</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -346,7 +322,7 @@ snd_harmony_capture_trigger(struct snd_pcm_substream *ss, int cmd)</div><div class='ctx'> 	if (h-&gt;st.playing)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;h-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;h-&gt;lock);</div><div class='ctx'>         switch (cmd) {</div><div class='ctx'>         case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		h-&gt;st.capturing = 1;</div><div class='hunk'>@@ -365,11 +341,9 @@ snd_harmony_capture_trigger(struct snd_pcm_substream *ss, int cmd)</div><div class='ctx'>         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'>         case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'>         }</div><div class='del'>-	spin_unlock(&amp;h-&gt;lock);</div><div class='ctx'> 		</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -576,43 +550,17 @@ snd_harmony_capture_close(struct snd_pcm_substream *ss)</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='del'>-snd_harmony_hw_params(struct snd_pcm_substream *ss,</div><div class='del'>-		      struct snd_pcm_hw_params *hw)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_harmony *h = snd_pcm_substream_chip(ss);</div><div class='del'>-	</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(ss, params_buffer_bytes(hw));</div><div class='del'>-	if (err &gt; 0 &amp;&amp; h-&gt;dma.type == SNDRV_DMA_TYPE_CONTINUOUS)</div><div class='del'>-		ss-&gt;runtime-&gt;dma_addr = __pa(ss-&gt;runtime-&gt;dma_area);</div><div class='del'>-	</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int </div><div class='del'>-snd_harmony_hw_free(struct snd_pcm_substream *ss) </div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(ss);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_harmony_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_harmony_playback_ops = {</div><div class='ctx'> 	.open =	snd_harmony_playback_open,</div><div class='ctx'> 	.close = snd_harmony_playback_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_harmony_hw_params,</div><div class='del'>-	.hw_free = snd_harmony_hw_free,</div><div class='ctx'> 	.prepare = snd_harmony_playback_prepare,</div><div class='ctx'> 	.trigger = snd_harmony_playback_trigger,</div><div class='ctx'>  	.pointer = snd_harmony_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_harmony_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_harmony_capture_ops = {</div><div class='ctx'>         .open = snd_harmony_capture_open,</div><div class='ctx'>         .close = snd_harmony_capture_close,</div><div class='del'>-        .ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-        .hw_params = snd_harmony_hw_params,</div><div class='del'>-        .hw_free = snd_harmony_hw_free,</div><div class='ctx'>         .prepare = snd_harmony_capture_prepare,</div><div class='ctx'>         .trigger = snd_harmony_capture_trigger,</div><div class='ctx'>         .pointer = snd_harmony_capture_pointer,</div><div class='hunk'>@@ -640,7 +588,7 @@ snd_harmony_pcm_init(struct snd_harmony *h)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = h;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "harmony");</div><div class='add'>+	strscpy(pcm-&gt;name, "harmony");</div><div class='ctx'> 	h-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	h-&gt;psubs = NULL;</div><div class='hunk'>@@ -669,14 +617,8 @@ snd_harmony_pcm_init(struct snd_harmony *h)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* pre-allocate space for DMA */</div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm, h-&gt;dma.type,</div><div class='del'>-						    h-&gt;dma.dev,</div><div class='del'>-						    MAX_BUF_SIZE, </div><div class='del'>-						    MAX_BUF_SIZE);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "buffer allocation error: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, h-&gt;dma.type, h-&gt;dma.dev,</div><div class='add'>+				       MAX_BUF_SIZE, MAX_BUF_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	h-&gt;st.format = snd_harmony_set_data_format(h,</div><div class='ctx'> 		SNDRV_PCM_FORMAT_S16_BE, 1);</div><div class='hunk'>@@ -719,7 +661,7 @@ snd_harmony_volume_get(struct snd_kcontrol *kc,</div><div class='ctx'> 	int invert = (kc-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	int left, right;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;h-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> </div><div class='ctx'> 	left = (h-&gt;st.gain &gt;&gt; shift_left) &amp; mask;</div><div class='ctx'> 	right = (h-&gt;st.gain &gt;&gt; shift_right) &amp; mask;</div><div class='hunk'>@@ -732,8 +674,6 @@ snd_harmony_volume_get(struct snd_kcontrol *kc,</div><div class='ctx'> 	if (shift_left != shift_right)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = right;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;h-&gt;mixer_lock);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }  </div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +689,7 @@ snd_harmony_volume_put(struct snd_kcontrol *kc,</div><div class='ctx'> 	int left, right;</div><div class='ctx'> 	int old_gain = h-&gt;st.gain;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;h-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> </div><div class='ctx'> 	left = ucontrol-&gt;value.integer.value[0] &amp; mask;</div><div class='ctx'> 	if (invert)</div><div class='hunk'>@@ -767,8 +707,6 @@ snd_harmony_volume_put(struct snd_kcontrol *kc,</div><div class='ctx'> </div><div class='ctx'> 	snd_harmony_set_new_gain(h);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;h-&gt;mixer_lock);</div><div class='del'>-	</div><div class='ctx'> 	return h-&gt;st.gain != old_gain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -776,15 +714,9 @@ static int</div><div class='ctx'> snd_harmony_captureroute_info(struct snd_kcontrol *kc, </div><div class='ctx'> 			      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Line", "Mic" };</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	static const char * const texts[2] = { "Line", "Mic" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int </div><div class='hunk'>@@ -794,13 +726,11 @@ snd_harmony_captureroute_get(struct snd_kcontrol *kc,</div><div class='ctx'> 	struct snd_harmony *h = snd_kcontrol_chip(kc);</div><div class='ctx'> 	int value;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;h-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> </div><div class='ctx'> 	value = (h-&gt;st.gain &gt;&gt; HARMONY_GAIN_IS_SHIFT) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = value;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;h-&gt;mixer_lock);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }  </div><div class='ctx'> </div><div class='hunk'>@@ -812,7 +742,7 @@ snd_harmony_captureroute_put(struct snd_kcontrol *kc,</div><div class='ctx'> 	int value;</div><div class='ctx'> 	int old_gain = h-&gt;st.gain;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;h-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;h-&gt;mixer_lock);</div><div class='ctx'> </div><div class='ctx'> 	value = ucontrol-&gt;value.enumerated.item[0] &amp; 1;</div><div class='ctx'> 	h-&gt;st.gain &amp;= ~HARMONY_GAIN_IS_MASK;</div><div class='hunk'>@@ -820,8 +750,6 @@ snd_harmony_captureroute_put(struct snd_kcontrol *kc,</div><div class='ctx'> </div><div class='ctx'> 	snd_harmony_set_new_gain(h);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;h-&gt;mixer_lock);</div><div class='del'>-	</div><div class='ctx'> 	return h-&gt;st.gain != old_gain;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -834,7 +762,7 @@ snd_harmony_captureroute_put(struct snd_kcontrol *kc,</div><div class='ctx'>   .private_value = ((left_shift) | ((right_shift) &lt;&lt; 8) |            \</div><div class='ctx'>                    ((mask) &lt;&lt; 16) | ((invert) &lt;&lt; 24)) }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_harmony_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_harmony_controls[] = {</div><div class='ctx'> 	HARMONY_VOLUME("Master Playback Volume", HARMONY_GAIN_LO_SHIFT, </div><div class='ctx'> 		       HARMONY_GAIN_RO_SHIFT, HARMONY_GAIN_OUT, 1),</div><div class='ctx'> 	HARMONY_VOLUME("Capture Volume", HARMONY_GAIN_LI_SHIFT,</div><div class='hunk'>@@ -856,7 +784,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = {</div><div class='ctx'> 		       HARMONY_GAIN_HE_SHIFT, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_harmony_mixer_reset(struct snd_harmony *h)</div><div class='ctx'> {</div><div class='ctx'> 	harmony_mute(h);</div><div class='hunk'>@@ -865,7 +793,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)</div><div class='ctx'> 	harmony_unmute(h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_harmony_mixer_init(struct snd_harmony *h)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -874,7 +802,7 @@ snd_harmony_mixer_init(struct snd_harmony *h)</div><div class='ctx'> 	if (snd_BUG_ON(!h))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	card = h-&gt;card;</div><div class='del'>-	strcpy(card-&gt;mixername, "Harmony Gain control interface");</div><div class='add'>+	strscpy(card-&gt;mixername, "Harmony Gain control interface");</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; HARMONY_CONTROLS; idx++) {</div><div class='ctx'> 		err = snd_ctl_add(card, </div><div class='hunk'>@@ -899,11 +827,7 @@ snd_harmony_free(struct snd_harmony *h)</div><div class='ctx'> 	if (h-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(h-&gt;irq, h);</div><div class='ctx'> </div><div class='del'>-	if (h-&gt;iobase)</div><div class='del'>-		iounmap(h-&gt;iobase);</div><div class='del'>-</div><div class='del'>-	parisc_set_drvdata(h-&gt;dev, NULL);</div><div class='del'>-</div><div class='add'>+	iounmap(h-&gt;iobase);</div><div class='ctx'> 	kfree(h);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -915,14 +839,14 @@ snd_harmony_dev_free(struct snd_device *dev)</div><div class='ctx'> 	return snd_harmony_free(h);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_harmony_create(struct snd_card *card, </div><div class='ctx'> 		   struct parisc_device *padev, </div><div class='ctx'> 		   struct snd_harmony **rchip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_harmony *h;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = snd_harmony_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -936,7 +860,7 @@ snd_harmony_create(struct snd_card *card,</div><div class='ctx'> 	h-&gt;card = card;</div><div class='ctx'> 	h-&gt;dev = padev;</div><div class='ctx'> 	h-&gt;irq = -1;</div><div class='del'>-	h-&gt;iobase = ioremap_nocache(padev-&gt;hpa.start, HARMONY_SIZE);</div><div class='add'>+	h-&gt;iobase = ioremap(padev-&gt;hpa.start, HARMONY_SIZE);</div><div class='ctx'> 	if (h-&gt;iobase == NULL) {</div><div class='ctx'> 		printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",</div><div class='ctx'> 		       (unsigned long)padev-&gt;hpa.start);</div><div class='hunk'>@@ -956,12 +880,9 @@ snd_harmony_create(struct snd_card *card,</div><div class='ctx'> 	spin_lock_init(&amp;h-&gt;mixer_lock);</div><div class='ctx'> 	spin_lock_init(&amp;h-&gt;lock);</div><div class='ctx'> </div><div class='del'>-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,</div><div class='del'>-                                  h, &amp;ops)) &lt; 0) {</div><div class='del'>-                goto free_and_ret;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;padev-&gt;dev);</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, h, &amp;ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_and_ret;</div><div class='ctx'> </div><div class='ctx'> 	*rchip = h;</div><div class='ctx'> </div><div class='hunk'>@@ -972,14 +893,14 @@ free_and_ret:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int __init</div><div class='ctx'> snd_harmony_probe(struct parisc_device *padev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_harmony *h;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;padev-&gt;dev, index, id, THIS_MODULE, 0, &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -995,8 +916,8 @@ snd_harmony_probe(struct parisc_device *padev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto free_and_ret;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "harmony");</div><div class='del'>-	strcpy(card-&gt;shortname, "Harmony");</div><div class='add'>+	strscpy(card-&gt;driver, "harmony");</div><div class='add'>+	strscpy(card-&gt;shortname, "Harmony");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, h-&gt;hpa, h-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -1012,19 +933,17 @@ free_and_ret:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devexit</div><div class='add'>+static void __exit</div><div class='ctx'> snd_harmony_remove(struct parisc_device *padev)</div><div class='ctx'> {</div><div class='ctx'> 	snd_card_free(parisc_get_drvdata(padev));</div><div class='del'>-	parisc_set_drvdata(padev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct parisc_driver snd_harmony_driver = {</div><div class='add'>+static struct parisc_driver snd_harmony_driver __refdata = {</div><div class='ctx'> 	.name = "harmony",</div><div class='ctx'> 	.id_table = snd_harmony_devtable,</div><div class='ctx'> 	.probe = snd_harmony_probe,</div><div class='del'>-	.remove = __devexit_p(snd_harmony_remove),</div><div class='add'>+	.remove = __exit_p(snd_harmony_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init </div><div class='head'>diff --git a/sound/parisc/harmony.h b/sound/parisc/harmony.h<br/>index 2e434523fedf..f4c29a2e32e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/parisc/harmony.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/parisc/harmony.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/parisc/harmony.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/parisc/harmony.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Hewlett-Packard Harmony audio driver</div><div class='ctx'>  * Copyright (C) 2004, Kyle McMartin &lt;kyle@parisc-linux.org&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig<br/>index 12e34653b8a8..e0996a9d90b0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/Kconfig</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> # ALSA PCI drivers</div><div class='ctx'> </div><div class='ctx'> menuconfig SND_PCI</div><div class='hunk'>@@ -25,6 +26,7 @@ config SND_ALS300</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+</div><div class='ctx'> </div><div class='hunk'>@@ -34,6 +36,7 @@ config SND_ALS300</div><div class='ctx'> config SND_ALS4000</div><div class='ctx'> 	tristate "Avance Logic ALS4000"</div><div class='ctx'> 	depends on ISA_DMA_API</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='hunk'>@@ -49,6 +52,7 @@ config SND_ALI5451</div><div class='ctx'> 	tristate "ALi M5451 PCI Audio Controller"</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for the integrated AC97 sound</div><div class='ctx'> 	  device on motherboards using the ALi M5451 Audio Controller</div><div class='hunk'>@@ -93,6 +97,7 @@ config SND_ATIIXP_MODEM</div><div class='ctx'> </div><div class='ctx'> config SND_AU8810</div><div class='ctx'> 	tristate "Aureal Advantage"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -107,6 +112,7 @@ config SND_AU8810</div><div class='ctx'> </div><div class='ctx'> config SND_AU8820</div><div class='ctx'> 	tristate "Aureal Vortex"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -120,6 +126,7 @@ config SND_AU8820</div><div class='ctx'> </div><div class='ctx'> config SND_AU8830</div><div class='ctx'> 	tristate "Aureal Vortex 2"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -152,10 +159,18 @@ config SND_AZT3328</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='add'>+	select SND_AC97_CODEC</div><div class='add'>+	select SND_TIMER</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Aztech AZF3328 (PCI168)</div><div class='ctx'> 	  soundcards.</div><div class='ctx'> </div><div class='add'>+	  Supported features: AC97-"conformant" mixer, MPU401/OPL3, analog I/O</div><div class='add'>+	  (16bit/8bit, many sample rates [&lt;= 66.2kHz], NO hardware mixing),</div><div class='add'>+	  Digital Enhanced Game Port, 1.024MHz multimedia sequencer timer,</div><div class='add'>+	  ext. codec (I2S port), onboard amp (4W/4Ohms/ch), suspend/resume.</div><div class='add'>+</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-azt3328.</div><div class='ctx'> </div><div class='hunk'>@@ -165,7 +180,7 @@ config SND_BT87X</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want to record audio from TV cards based on</div><div class='ctx'> 	  Brooktree Bt878/Bt879 chips, say Y here and read</div><div class='del'>-	  &lt;file:Documentation/sound/alsa/Bt87x.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/sound/cards/bt87x.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-bt87x.</div><div class='hunk'>@@ -182,6 +197,7 @@ config SND_BT87X_OVERCLOCK</div><div class='ctx'> </div><div class='ctx'> config SND_CA0106</div><div class='ctx'> 	tristate "SB Audigy LS / Live 24bit"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_VMASTER</div><div class='hunk'>@@ -194,22 +210,24 @@ config SND_CA0106</div><div class='ctx'> </div><div class='ctx'> config SND_CMIPCI</div><div class='ctx'> 	tristate "C-Media 8338, 8738, 8768, 8770"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want to use soundcards based on C-Media CMI8338, CMI8738,</div><div class='ctx'> 	  CMI8768 or CMI8770 chips, say Y here and read</div><div class='del'>-	  &lt;file:Documentation/sound/alsa/CMIPCI.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/sound/cards/cmipci.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-cmipci.</div><div class='ctx'> </div><div class='ctx'> config SND_OXYGEN_LIB</div><div class='del'>-        tristate</div><div class='add'>+	tristate</div><div class='ctx'> </div><div class='ctx'> config SND_OXYGEN</div><div class='del'>-	tristate "C-Media 8788 (Oxygen)"</div><div class='add'>+	tristate "C-Media 8786, 8787, 8788 (Oxygen)"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OXYGEN_LIB</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='hunk'>@@ -217,19 +235,25 @@ config SND_OXYGEN</div><div class='ctx'> 	  Say Y here to include support for sound cards based on the</div><div class='ctx'> 	  C-Media CMI8788 (Oxygen HD Audio) chip:</div><div class='ctx'> 	   * Asound A-8788</div><div class='add'>+	   * Asus Xonar DG/DGX</div><div class='ctx'> 	   * AuzenTech X-Meridian</div><div class='add'>+	   * AuzenTech X-Meridian 2G</div><div class='ctx'> 	   * Bgears b-Enspirer</div><div class='ctx'> 	   * Club3D Theatron DTS</div><div class='ctx'> 	   * HT-Omega Claro (plus)</div><div class='ctx'> 	   * HT-Omega Claro halo (XT)</div><div class='add'>+	   * Kuroutoshikou CMI8787-HG2PCI</div><div class='ctx'> 	   * Razer Barracuda AC-1</div><div class='ctx'> 	   * Sondigo Inferno</div><div class='add'>+	   * TempoTec/MediaTek HiFier Fantasia</div><div class='add'>+	   * TempoTec/MediaTek HiFier Serenade</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-oxygen.</div><div class='ctx'> </div><div class='ctx'> config SND_CS4281</div><div class='ctx'> 	tristate "Cirrus Logic (Sound Fusion) CS4281"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='hunk'>@@ -241,8 +265,10 @@ config SND_CS4281</div><div class='ctx'> </div><div class='ctx'> config SND_CS46XX</div><div class='ctx'> 	tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	select FW_LOADER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Cirrus Logic CS4610/CS4612/</div><div class='ctx'> 	  CS4614/CS4615/CS4622/CS4624/CS4630/CS4280 chips.</div><div class='hunk'>@@ -261,7 +287,8 @@ config SND_CS46XX_NEW_DSP</div><div class='ctx'> </div><div class='ctx'> config SND_CS5530</div><div class='ctx'> 	tristate "CS5530 Audio"</div><div class='del'>-	depends on ISA_DMA_API</div><div class='add'>+	depends on ISA_DMA_API &amp;&amp; (X86_32 || COMPILE_TEST)</div><div class='add'>+	depends on !M68K</div><div class='ctx'> 	select SND_SB16_DSP</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.</div><div class='hunk'>@@ -271,6 +298,8 @@ config SND_CS5530</div><div class='ctx'> </div><div class='ctx'> config SND_CS5535AUDIO</div><div class='ctx'> 	tristate "CS5535/CS5536 Audio"</div><div class='add'>+	depends on X86_32 || MIPS || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -288,6 +317,7 @@ config SND_CS5535AUDIO</div><div class='ctx'> </div><div class='ctx'> config SND_CTXFI</div><div class='ctx'> 	tristate "Creative Sound Blaster X-Fi"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want to use soundcards based on Creative Sound Blastr X-Fi</div><div class='hunk'>@@ -442,26 +472,37 @@ config SND_INDIGODJX</div><div class='ctx'> 	  will be called snd-indigodjx</div><div class='ctx'> </div><div class='ctx'> config SND_EMU10K1</div><div class='del'>-	tristate "Emu10k1 (SB Live!, Audigy, E-mu APS)"</div><div class='add'>+	tristate "Emu10k1 (SB Live!, Audigy, E-MU APS/0404/1010/1212/1616/1820)"</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	select SND_TIMER</div><div class='add'>+	select SND_SEQ_DEVICE if SND_SEQUENCER != n</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y to include support for Sound Blaster PCI 512, Live!,</div><div class='del'>-	  Audigy and E-mu APS (partially supported) soundcards.</div><div class='add'>+	  Audigy and E-MU APS/0404/1010/1212/1616/1820 soundcards.</div><div class='ctx'> </div><div class='ctx'> 	  The confusing multitude of mixer controls is documented in</div><div class='del'>-	  &lt;file:Documentation/sound/alsa/SB-Live-mixer.txt&gt; and</div><div class='del'>-	  &lt;file:Documentation/sound/alsa/Audigy-mixer.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/sound/cards/sb-live-mixer.rst&gt; and</div><div class='add'>+	  &lt;file:Documentation/sound/cards/audigy-mixer.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-emu10k1.</div><div class='ctx'> </div><div class='add'>+# select SEQ stuff to min(SND_SEQUENCER,SND_XXX)</div><div class='add'>+config SND_EMU10K1_SEQ</div><div class='add'>+	def_tristate SND_SEQUENCER &amp;&amp; SND_EMU10K1</div><div class='add'>+	select SND_SEQ_MIDI_EMUL</div><div class='add'>+	select SND_SEQ_VIRMIDI</div><div class='add'>+	select SND_SYNTH_EMUX</div><div class='add'>+</div><div class='ctx'> config SND_EMU10K1X</div><div class='ctx'> 	tristate "Emu10k1X (Dell OEM Version)"</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for the Dell OEM version of the</div><div class='ctx'> 	  Sound Blaster Live!.</div><div class='hunk'>@@ -471,6 +512,7 @@ config SND_EMU10K1X</div><div class='ctx'> </div><div class='ctx'> config SND_ENS1370</div><div class='ctx'> 	tristate "(Creative) Ensoniq AudioPCI 1370"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='hunk'>@@ -481,6 +523,7 @@ config SND_ENS1370</div><div class='ctx'> </div><div class='ctx'> config SND_ENS1371</div><div class='ctx'> 	tristate "(Creative) Ensoniq AudioPCI 1371/1373"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -495,6 +538,7 @@ config SND_ES1938</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on ESS Solo-1</div><div class='ctx'> 	  (ES1938, ES1946, ES1969) chips.</div><div class='hunk'>@@ -506,6 +550,7 @@ config SND_ES1968</div><div class='ctx'> 	tristate "ESS ES1968/1978 (Maestro-1/2/2E)"</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on ESS Maestro</div><div class='ctx'> 	  1/2/2E chips.</div><div class='hunk'>@@ -523,8 +568,21 @@ config SND_ES1968_INPUT</div><div class='ctx'> 	  If you say N the buttons will directly control the master volume.</div><div class='ctx'> 	  It is recommended to say Y.</div><div class='ctx'> </div><div class='add'>+config SND_ES1968_RADIO</div><div class='add'>+	bool "Enable TEA5757 radio tuner support for es1968"</div><div class='add'>+	depends on SND_ES1968</div><div class='add'>+	depends on MEDIA_RADIO_SUPPORT</div><div class='add'>+	depends on VIDEO_DEV=y || VIDEO_DEV=SND_ES1968</div><div class='add'>+	select RADIO_ADAPTERS</div><div class='add'>+	select RADIO_TEA575X</div><div class='add'>+</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to include support for TEA5757 radio tuner integrated on</div><div class='add'>+	  some MediaForte cards (e.g. SF64-PCE2).</div><div class='add'>+</div><div class='ctx'> config SND_FM801</div><div class='ctx'> 	tristate "ForteMedia FM801"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='hunk'>@@ -538,21 +596,18 @@ config SND_FM801</div><div class='ctx'> config SND_FM801_TEA575X_BOOL</div><div class='ctx'> 	bool "ForteMedia FM801 + TEA5757 tuner"</div><div class='ctx'> 	depends on SND_FM801</div><div class='del'>-	depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801</div><div class='add'>+	depends on MEDIA_RADIO_SUPPORT</div><div class='add'>+	depends on VIDEO_DEV=y || VIDEO_DEV=SND_FM801</div><div class='add'>+	select RADIO_ADAPTERS</div><div class='add'>+	select RADIO_TEA575X</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on the ForteMedia</div><div class='del'>-	  FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media</div><div class='del'>-	  Forte SF256-PCS-02) into the snd-fm801 driver.</div><div class='del'>-</div><div class='del'>-config SND_FM801_TEA575X</div><div class='del'>-	tristate</div><div class='del'>-	depends on SND_FM801_TEA575X_BOOL</div><div class='del'>-	default SND_FM801</div><div class='del'>-</div><div class='del'>-source "sound/pci/hda/Kconfig"</div><div class='add'>+	  FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and</div><div class='add'>+	  SF64-PCR) into the snd-fm801 driver.</div><div class='ctx'> </div><div class='ctx'> config SND_HDSP</div><div class='ctx'> 	tristate "RME Hammerfall DSP Audio"</div><div class='add'>+	select FW_LOADER</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_PCM</div><div class='hunk'>@@ -567,34 +622,23 @@ comment "Don't forget to add built-in firmwares for HDSP driver"</div><div class='ctx'> 	depends on SND_HDSP=y</div><div class='ctx'> </div><div class='ctx'> config SND_HDSPM</div><div class='del'>-	tristate "RME Hammerfall DSP MADI"</div><div class='add'>+	tristate "RME Hammerfall DSP MADI/RayDAT/AIO"</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y here to include support for RME Hammerfall DSP MADI</div><div class='del'>-	  soundcards.</div><div class='add'>+	  Say Y here to include support for RME Hammerfall DSP MADI,</div><div class='add'>+	  RayDAT and AIO soundcards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-hdspm.</div><div class='ctx'> </div><div class='del'>-config SND_HIFIER</div><div class='del'>-	tristate "TempoTec HiFier Fantasia"</div><div class='del'>-	select SND_OXYGEN_LIB</div><div class='del'>-	select SND_PCM</div><div class='del'>-	select SND_MPU401_UART</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include support for the MediaTek/TempoTec HiFier</div><div class='del'>-	  Fantasia sound card.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module</div><div class='del'>-	  will be called snd-hifier.</div><div class='del'>-</div><div class='ctx'> config SND_ICE1712</div><div class='ctx'> 	tristate "ICEnsemble ICE1712 (Envy24)"</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select BITREVERSE</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on the</div><div class='ctx'> 	  ICE1712 (Envy24) chip.</div><div class='hunk'>@@ -610,6 +654,7 @@ config SND_ICE1712</div><div class='ctx'> </div><div class='ctx'> config SND_ICE1724</div><div class='ctx'> 	tristate "ICE/VT1724/1720 (Envy24HT/PT)"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_RAWMIDI</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	select SND_VMASTER</div><div class='hunk'>@@ -623,7 +668,7 @@ config SND_ICE1724</div><div class='ctx'> 	  AudioTrak Prodigy 192, 7.1 (HIFI/LT/XT), HD2; Hercules</div><div class='ctx'> 	  Fortissimo IV; ESI Juli@; Pontis MS300; EGO-SYS WaveTerminal</div><div class='ctx'> 	  192M; Albatron K8X800 Pro II; Chaintech ZNF3-150/250, 9CJS,</div><div class='del'>-	  AV-710; Shuttle SN25P.</div><div class='add'>+	  AV-710; Shuttle SN25P; Philips PSC724 Ultimate Edge.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-ice1724.</div><div class='hunk'>@@ -659,8 +704,18 @@ config SND_KORG1212</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-korg1212.</div><div class='ctx'> </div><div class='add'>+config SND_LOLA</div><div class='add'>+	tristate "Digigram Lola"</div><div class='add'>+	select SND_PCM</div><div class='add'>+	help</div><div class='add'>+	  Say Y to include support for Digigram Lola boards.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called snd-lola.</div><div class='add'>+</div><div class='ctx'> config SND_LX6464ES</div><div class='ctx'> 	tristate "Digigram LX6464ES"</div><div class='add'>+	depends on HAS_IOPORT_MAP</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Digigram LX6464ES boards.</div><div class='hunk'>@@ -672,6 +727,7 @@ config SND_LX6464ES</div><div class='ctx'> config SND_MAESTRO3</div><div class='ctx'> 	tristate "ESS Allegro/Maestro3"</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on ESS Maestro 3</div><div class='ctx'> 	  (Allegro) chips.</div><div class='hunk'>@@ -691,11 +747,12 @@ config SND_MAESTRO3_INPUT</div><div class='ctx'> </div><div class='ctx'> config SND_MIXART</div><div class='ctx'> 	tristate "Digigram miXart"</div><div class='add'>+	select FW_LOADER</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	help</div><div class='ctx'> 	  If you want to use Digigram miXart soundcards, say Y here and</div><div class='del'>-	  read &lt;file:Documentation/sound/alsa/MIXART.txt&gt;.</div><div class='add'>+	  read &lt;file:Documentation/sound/cards/mixart.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-mixart.</div><div class='hunk'>@@ -711,6 +768,8 @@ config SND_NM256</div><div class='ctx'> </div><div class='ctx'> config SND_PCXHR</div><div class='ctx'> 	tristate "Digigram PCXHR"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='add'>+	select FW_LOADER</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_HWDEP</div><div class='ctx'> 	help</div><div class='hunk'>@@ -721,6 +780,7 @@ config SND_PCXHR</div><div class='ctx'> </div><div class='ctx'> config SND_RIPTIDE</div><div class='ctx'> 	tristate "Conexant Riptide"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='hunk'>@@ -762,10 +822,21 @@ config SND_RME9652</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-rme9652.</div><div class='ctx'> </div><div class='add'>+config SND_SE6X</div><div class='add'>+	tristate "Studio Evolution SE6X"</div><div class='add'>+	depends on SND_OXYGEN=n &amp;&amp; SND_VIRTUOSO=n  # PCI ID conflict</div><div class='add'>+	depends on HAS_IOPORT</div><div class='add'>+	select SND_OXYGEN_LIB</div><div class='add'>+	select SND_PCM</div><div class='add'>+	select SND_MPU401_UART</div><div class='add'>+	help</div><div class='add'>+	  Say Y or M here only if you actually have this sound card.</div><div class='add'>+</div><div class='ctx'> config SND_SIS7019</div><div class='ctx'> 	tristate "SiS 7019 Audio Accelerator"</div><div class='del'>-	depends on X86 &amp;&amp; !X86_64</div><div class='add'>+	depends on X86_32</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for the SiS 7019 Audio Accelerator.</div><div class='ctx'> </div><div class='hunk'>@@ -777,6 +848,7 @@ config SND_SONICVIBES</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on the S3</div><div class='ctx'> 	  SonicVibes chip.</div><div class='hunk'>@@ -788,6 +860,7 @@ config SND_TRIDENT</div><div class='ctx'> 	tristate "Trident 4D-Wave DX/NX; SiS 7018"</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	depends on ZONE_DMA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for soundcards based on Trident</div><div class='ctx'> 	  4D-Wave DX/NX or SiS 7018 chips.</div><div class='hunk'>@@ -797,6 +870,7 @@ config SND_TRIDENT</div><div class='ctx'> </div><div class='ctx'> config SND_VIA82XX</div><div class='ctx'> 	tristate "VIA 82C686A/B, 8233/8235 AC97 Controller"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='hunk'>@@ -808,6 +882,7 @@ config SND_VIA82XX</div><div class='ctx'> </div><div class='ctx'> config SND_VIA82XX_MODEM</div><div class='ctx'> 	tristate "VIA 82C686A/B, 8233 based Modems"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for the integrated MC97 modem on</div><div class='hunk'>@@ -818,22 +893,24 @@ config SND_VIA82XX_MODEM</div><div class='ctx'> </div><div class='ctx'> config SND_VIRTUOSO</div><div class='ctx'> 	tristate "Asus Virtuoso 66/100/200 (Xonar)"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OXYGEN_LIB</div><div class='ctx'> 	select SND_PCM</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='del'>-	select SND_JACK if INPUT=y || INPUT=SND</div><div class='add'>+	select SND_JACK</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for sound cards based on the</div><div class='del'>-	  Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,</div><div class='del'>-	  Essence ST (Deluxe), and Essence STX.</div><div class='del'>-	  Support for the HDAV1.3 (Deluxe) is incomplete; for the</div><div class='del'>-	  HDAV1.3 Slim and Xense, missing.</div><div class='add'>+	  Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS, DSX,</div><div class='add'>+	  Essence ST (Deluxe), and Essence STX (II).</div><div class='add'>+	  Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental;</div><div class='add'>+	  for the Xense, missing.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called snd-virtuoso.</div><div class='ctx'> </div><div class='ctx'> config SND_VX222</div><div class='ctx'> 	tristate "Digigram VX222"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_VX_LIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Digigram VX222 soundcards.</div><div class='hunk'>@@ -843,9 +920,11 @@ config SND_VX222</div><div class='ctx'> </div><div class='ctx'> config SND_YMFPCI</div><div class='ctx'> 	tristate "Yamaha YMF724/740/744/754"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='ctx'> 	select SND_OPL3_LIB</div><div class='ctx'> 	select SND_MPU401_UART</div><div class='ctx'> 	select SND_AC97_CODEC</div><div class='add'>+	select SND_TIMER</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here to include support for Yamaha PCI audio chips -</div><div class='ctx'> 	  YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.</div><div class='head'>diff --git a/sound/pci/Makefile b/sound/pci/Makefile<br/>index 9cf4348ec137..9d5e8e12ae73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/Makefile</a></div><div class='hunk'>@@ -1,32 +1,33 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ad1889-objs := ad1889.o</div><div class='del'>-snd-als300-objs := als300.o</div><div class='del'>-snd-als4000-objs := als4000.o</div><div class='del'>-snd-atiixp-objs := atiixp.o</div><div class='del'>-snd-atiixp-modem-objs := atiixp_modem.o</div><div class='del'>-snd-azt3328-objs := azt3328.o</div><div class='del'>-snd-bt87x-objs := bt87x.o</div><div class='del'>-snd-cmipci-objs := cmipci.o</div><div class='del'>-snd-cs4281-objs := cs4281.o</div><div class='del'>-snd-cs5530-objs := cs5530.o</div><div class='del'>-snd-ens1370-objs := ens1370.o ak4531_codec.o</div><div class='del'>-snd-ens1371-objs := ens1371.o</div><div class='del'>-snd-es1938-objs := es1938.o</div><div class='del'>-snd-es1968-objs := es1968.o</div><div class='del'>-snd-fm801-objs := fm801.o</div><div class='del'>-snd-intel8x0-objs := intel8x0.o</div><div class='del'>-snd-intel8x0m-objs := intel8x0m.o</div><div class='del'>-snd-maestro3-objs := maestro3.o</div><div class='del'>-snd-rme32-objs := rme32.o</div><div class='del'>-snd-rme96-objs := rme96.o</div><div class='del'>-snd-sis7019-objs := sis7019.o</div><div class='del'>-snd-sonicvibes-objs := sonicvibes.o</div><div class='del'>-snd-via82xx-objs := via82xx.o</div><div class='del'>-snd-via82xx-modem-objs := via82xx_modem.o</div><div class='add'>+snd-ad1889-y := ad1889.o</div><div class='add'>+snd-als300-y := als300.o</div><div class='add'>+snd-als4000-y := als4000.o</div><div class='add'>+snd-atiixp-y := atiixp.o</div><div class='add'>+snd-atiixp-modem-y := atiixp_modem.o</div><div class='add'>+snd-azt3328-y := azt3328.o</div><div class='add'>+snd-bt87x-y := bt87x.o</div><div class='add'>+snd-cmipci-y := cmipci.o</div><div class='add'>+snd-cs4281-y := cs4281.o</div><div class='add'>+snd-cs5530-y := cs5530.o</div><div class='add'>+snd-ens1370-y := ens1370.o ak4531_codec.o</div><div class='add'>+snd-ens1371-y := ens1371.o</div><div class='add'>+snd-es1938-y := es1938.o</div><div class='add'>+snd-es1968-y := es1968.o</div><div class='add'>+snd-fm801-y := fm801.o</div><div class='add'>+snd-intel8x0-y := intel8x0.o</div><div class='add'>+snd-intel8x0m-y := intel8x0m.o</div><div class='add'>+snd-maestro3-y := maestro3.o</div><div class='add'>+snd-rme32-y := rme32.o</div><div class='add'>+snd-rme96-y := rme96.o</div><div class='add'>+snd-sis7019-y := sis7019.o</div><div class='add'>+snd-sonicvibes-y := sonicvibes.o</div><div class='add'>+snd-via82xx-y := via82xx.o</div><div class='add'>+snd-via82xx-modem-y := via82xx_modem.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_AD1889) += snd-ad1889.o</div><div class='hunk'>@@ -64,10 +65,10 @@ obj-$(CONFIG_SND) += \</div><div class='ctx'> 	ca0106/ \</div><div class='ctx'> 	cs46xx/ \</div><div class='ctx'> 	cs5535audio/ \</div><div class='add'>+	lola/ \</div><div class='ctx'> 	lx6464es/ \</div><div class='ctx'> 	echoaudio/ \</div><div class='ctx'> 	emu10k1/ \</div><div class='del'>-	hda/ \</div><div class='ctx'> 	ice1712/ \</div><div class='ctx'> 	korg1212/ \</div><div class='ctx'> 	mixart/ \</div><div class='head'>diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile<br/>index 41fa322f0971..c74e769f3523 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/Makefile</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> snd-ac97-codec-y := ac97_codec.o ac97_pcm.o</div><div class='del'>-snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o</div><div class='add'>+snd-ac97-codec-$(CONFIG_SND_PROC_FS) += ac97_proc.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o</div><div class='head'>diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c<br/>index a7630e9edf8a..c54bdefa5afe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_codec.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_codec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_codec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_codec.c</a></div><div class='hunk'>@@ -1,32 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='ctx'>  *</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -42,7 +27,7 @@ MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Universal interface for Audio Codec '97");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int enable_loopback;</div><div class='add'>+static bool enable_loopback;</div><div class='ctx'> </div><div class='ctx'> module_param(enable_loopback, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");</div><div class='hunk'>@@ -71,6 +56,12 @@ static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {</div><div class='ctx'> { 0x414b4d00, 0xffffff00, "Asahi Kasei",	NULL,	NULL },</div><div class='ctx'> { 0x414c4300, 0xffffff00, "Realtek",		NULL,	NULL },</div><div class='ctx'> { 0x414c4700, 0xffffff00, "Realtek",		NULL,	NULL },</div><div class='add'>+/*</div><div class='add'>+ * This is an _inofficial_ Aztech Labs entry</div><div class='add'>+ * (value might differ from unknown official Aztech ID),</div><div class='add'>+ * currently used by the AC97 emulation of the almost-AC97 PCI168 card.</div><div class='add'>+ */</div><div class='add'>+{ 0x415a5400, 0xffffff00, "Aztech Labs (emulated)",	NULL,	NULL },</div><div class='ctx'> { 0x434d4900, 0xffffff00, "C-Media Electronics", NULL,	NULL },</div><div class='ctx'> { 0x43525900, 0xffffff00, "Cirrus Logic",	NULL,	NULL },</div><div class='ctx'> { 0x43585400, 0xffffff00, "Conexant",           NULL,	NULL },</div><div class='hunk'>@@ -127,6 +118,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {</div><div class='ctx'> { 0x414c4781, 0xffffffff, "ALC658D",		NULL,	NULL }, /* already patched */</div><div class='ctx'> { 0x414c4780, 0xfffffff0, "ALC658",		patch_alc655,	NULL },</div><div class='ctx'> { 0x414c4790, 0xfffffff0, "ALC850",		patch_alc850,	NULL },</div><div class='add'>+{ 0x415a5401, 0xffffffff, "AZF3328",		patch_aztech_azf3328,	NULL },</div><div class='ctx'> { 0x434d4941, 0xffffffff, "CMI9738",		patch_cm9738,	NULL },</div><div class='ctx'> { 0x434d4961, 0xffffffff, "CMI9739",		patch_cm9739,	NULL },</div><div class='ctx'> { 0x434d4969, 0xffffffff, "CMI9780",		patch_cm9780,	NULL },</div><div class='hunk'>@@ -160,7 +152,6 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {</div><div class='ctx'> { 0x4e534300, 0xffffffff, "LM4540,43,45,46,48",	NULL,		NULL }, // only guess --jk</div><div class='ctx'> { 0x4e534331, 0xffffffff, "LM4549",		NULL,		NULL },</div><div class='ctx'> { 0x4e534350, 0xffffffff, "LM4550",		patch_lm4550,  	NULL }, // volume wrap fix </div><div class='del'>-{ 0x50534304, 0xffffffff, "UCB1400",		patch_ucb1400,	NULL },</div><div class='ctx'> { 0x53494c20, 0xffffffe0, "Si3036,8",		mpatch_si3036,	mpatch_si3036, AC97_MODEM_PATCH },</div><div class='ctx'> { 0x53544d02, 0xffffffff, "ST7597",		NULL,		NULL },</div><div class='ctx'> { 0x54524102, 0xffffffff, "TR28022",		NULL,		NULL },</div><div class='hunk'>@@ -168,7 +159,9 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {</div><div class='ctx'> { 0x54524106, 0xffffffff, "TR28026",		NULL,		NULL },</div><div class='ctx'> { 0x54524108, 0xffffffff, "TR28028",		patch_tritech_tr28028,	NULL }, // added by xin jin [07/09/99]</div><div class='ctx'> { 0x54524123, 0xffffffff, "TR28602",		NULL,		NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)]</div><div class='add'>+{ 0x54584e03, 0xffffffff, "TLV320AIC27",	NULL,		NULL },</div><div class='ctx'> { 0x54584e20, 0xffffffff, "TLC320AD9xC",	NULL,		NULL },</div><div class='add'>+{ 0x56494120, 0xfffffff0, "VIA1613",		patch_vt1613,	NULL },</div><div class='ctx'> { 0x56494161, 0xffffffff, "VIA1612A",		NULL,		NULL }, // modified ICE1232 with S/PDIF</div><div class='ctx'> { 0x56494170, 0xffffffff, "VIA1617A",		patch_vt1617a,	NULL }, // modified VT1616 with S/PDIF</div><div class='ctx'> { 0x56494182, 0xffffffff, "VIA1618",		patch_vt1618,   NULL },</div><div class='hunk'>@@ -206,6 +199,12 @@ static void update_power_regs(struct snd_ac97 *ac97);</div><div class='ctx'> #define ac97_is_power_save_mode(ac97) 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define ac97_err(ac97, fmt, args...)	\</div><div class='add'>+	dev_err((ac97)-&gt;bus-&gt;card-&gt;dev, fmt, ##args)</div><div class='add'>+#define ac97_warn(ac97, fmt, args...)	\</div><div class='add'>+	dev_warn((ac97)-&gt;bus-&gt;card-&gt;dev, fmt, ##args)</div><div class='add'>+#define ac97_dbg(ac97, fmt, args...)	\</div><div class='add'>+	dev_dbg((ac97)-&gt;bus-&gt;card-&gt;dev, fmt, ##args)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  I/O routines</div><div class='hunk'>@@ -218,11 +217,11 @@ static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> 	case AC97_ID_ST_AC97_ID4:</div><div class='ctx'> 		if (reg == 0x08)</div><div class='ctx'> 			return 0;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case AC97_ID_ST7597:</div><div class='ctx'> 		if (reg == 0x22 || reg == 0x7a)</div><div class='ctx'> 			return 1;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case AC97_ID_AK4540:</div><div class='ctx'> 	case AC97_ID_AK4542:</div><div class='ctx'> 		if (reg &lt;= 0x1c || reg == 0x20 || reg == 0x26 || reg &gt;= 0x7c)</div><div class='hunk'>@@ -292,7 +291,7 @@ EXPORT_SYMBOL(snd_ac97_write);</div><div class='ctx'>  * Reads a value from the given register.  This will invoke the read</div><div class='ctx'>  * callback directly after the register check.</div><div class='ctx'>  *</div><div class='del'>- * Returns the read value.</div><div class='add'>+ * Return: The read value.</div><div class='ctx'>  */</div><div class='ctx'> unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -327,11 +326,10 @@ void snd_ac97_write_cache(struct snd_ac97 *ac97, unsigned short reg, unsigned sh</div><div class='ctx'> {</div><div class='ctx'> 	if (!snd_ac97_valid_reg(ac97, reg))</div><div class='ctx'> 		return;</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	ac97-&gt;regs[reg] = value;</div><div class='ctx'> 	ac97-&gt;bus-&gt;ops-&gt;write(ac97, reg, value);</div><div class='ctx'> 	set_bit(reg, ac97-&gt;reg_accessed);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_ac97_write_cache);</div><div class='hunk'>@@ -345,7 +343,7 @@ EXPORT_SYMBOL(snd_ac97_write_cache);</div><div class='ctx'>  * Compares the value with the register cache and updates the value</div><div class='ctx'>  * only when the value is changed.</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the value is changed, 0 if no change, or a negative</div><div class='add'>+ * Return: 1 if the value is changed, 0 if no change, or a negative</div><div class='ctx'>  * code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value)</div><div class='hunk'>@@ -354,14 +352,13 @@ int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short va</div><div class='ctx'> </div><div class='ctx'> 	if (!snd_ac97_valid_reg(ac97, reg))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	change = ac97-&gt;regs[reg] != value;</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		ac97-&gt;regs[reg] = value;</div><div class='ctx'> 		ac97-&gt;bus-&gt;ops-&gt;write(ac97, reg, value);</div><div class='ctx'> 	}</div><div class='ctx'> 	set_bit(reg, ac97-&gt;reg_accessed);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -377,19 +374,15 @@ EXPORT_SYMBOL(snd_ac97_update);</div><div class='ctx'>  * Updates the masked-bits on the given register only when the value</div><div class='ctx'>  * is changed.</div><div class='ctx'>  *</div><div class='del'>- * Returns 1 if the bits are changed, 0 if no change, or a negative</div><div class='add'>+ * Return: 1 if the bits are changed, 0 if no change, or a negative</div><div class='ctx'>  * code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value)</div><div class='ctx'> {</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='ctx'> 	if (!snd_ac97_valid_reg(ac97, reg))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='del'>-	change = snd_ac97_update_bits_nolock(ac97, reg, mask, value);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='del'>-	return change;</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	return snd_ac97_update_bits_nolock(ac97, reg, mask, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_ac97_update_bits);</div><div class='hunk'>@@ -417,12 +410,12 @@ static int snd_ac97_ad18xx_update_pcm_bits(struct snd_ac97 *ac97, int codec, uns</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned short old, new, cfg;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	old = ac97-&gt;spec.ad18xx.pcmreg[codec];</div><div class='ctx'> 	new = (old &amp; ~mask) | (value &amp; mask);</div><div class='ctx'> 	change = old != new;</div><div class='ctx'> 	if (change) {</div><div class='del'>-		mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+		guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 		cfg = snd_ac97_read_cache(ac97, AC97_AD_SERIAL_CFG);</div><div class='ctx'> 		ac97-&gt;spec.ad18xx.pcmreg[codec] = new;</div><div class='ctx'> 		/* select single codec */</div><div class='hunk'>@@ -434,9 +427,7 @@ static int snd_ac97_ad18xx_update_pcm_bits(struct snd_ac97 *ac97, int codec, uns</div><div class='ctx'> 		/* select all codecs */</div><div class='ctx'> 		ac97-&gt;bus-&gt;ops-&gt;write(ac97, AC97_AD_SERIAL_CFG,</div><div class='ctx'> 				 cfg | 0x7000);</div><div class='del'>-		mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -449,14 +440,8 @@ static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct ac97_enum *e = (struct ac97_enum *)kcontrol-&gt;private_value;</div><div class='ctx'> 	</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = e-&gt;shift_l == e-&gt;shift_r ? 1 : 2;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = e-&gt;mask;</div><div class='del'>-	</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; e-&gt;mask - 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = e-&gt;mask - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, e-&gt;texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, e-&gt;shift_l == e-&gt;shift_r ? 1 : 2,</div><div class='add'>+				 e-&gt;mask, e-&gt;texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -590,9 +575,9 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	snd_ac97_page_restore(ac97, page_save);</div><div class='ctx'> #ifdef CONFIG_SND_AC97_POWER_SAVE</div><div class='ctx'> 	/* check analog mixer power-down */</div><div class='del'>-	if ((val_mask &amp; 0x8000) &amp;&amp;</div><div class='add'>+	if ((val_mask &amp; AC97_PD_EAPD) &amp;&amp;</div><div class='ctx'> 	    (kcontrol-&gt;private_value &amp; (1&lt;&lt;30))) {</div><div class='del'>-		if (val &amp; 0x8000)</div><div class='add'>+		if (val &amp; AC97_PD_EAPD)</div><div class='ctx'> 			ac97-&gt;power_up &amp;= ~(1 &lt;&lt; (reg&gt;&gt;1));</div><div class='ctx'> 		else</div><div class='ctx'> 			ac97-&gt;power_up |= 1 &lt;&lt; (reg&gt;&gt;1);</div><div class='hunk'>@@ -602,11 +587,6 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct snd_kcontrol_new snd_ac97_controls_master_mono[2] = {</div><div class='del'>-AC97_SINGLE("Master Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),</div><div class='del'>-AC97_SINGLE("Master Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1)</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static const struct snd_kcontrol_new snd_ac97_controls_tone[2] = {</div><div class='ctx'> AC97_SINGLE("Tone Control - Bass", AC97_MASTER_TONE, 8, 15, 1),</div><div class='ctx'> AC97_SINGLE("Tone Control - Treble", AC97_MASTER_TONE, 0, 15, 1)</div><div class='hunk'>@@ -728,12 +708,11 @@ static int snd_ac97_spdif_default_get(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = ac97-&gt;spdif_status &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (ac97-&gt;spdif_status &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (ac97-&gt;spdif_status &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = (ac97-&gt;spdif_status &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'>                         </div><div class='hunk'>@@ -772,7 +751,7 @@ static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	change = ac97-&gt;spdif_status != new;</div><div class='ctx'> 	ac97-&gt;spdif_status = new;</div><div class='ctx'> </div><div class='hunk'>@@ -806,7 +785,6 @@ static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> 			snd_ac97_update_bits_nolock(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, AC97_EA_SPDIF); /* turn on again */</div><div class='ctx'>                 }</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='hunk'>@@ -815,7 +793,7 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int reg = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0x0f;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	// int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> 	unsigned short value, old, new;</div><div class='hunk'>@@ -823,7 +801,7 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> </div><div class='ctx'> 	value = (ucontrol-&gt;value.integer.value[0] &amp; mask);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	mask &lt;&lt;= shift;</div><div class='ctx'> 	value &lt;&lt;= shift;</div><div class='ctx'> 	old = snd_ac97_read_cache(ac97, reg);</div><div class='hunk'>@@ -837,7 +815,6 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_</div><div class='ctx'> 		if (extst &amp; AC97_EA_SPDIF)</div><div class='ctx'> 			snd_ac97_update_bits_nolock(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, AC97_EA_SPDIF); /* turn on again */</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -948,10 +925,9 @@ static int snd_ac97_ad18xx_pcm_get_volume(struct snd_kcontrol *kcontrol, struct</div><div class='ctx'> 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int codec = kcontrol-&gt;private_value &amp; 3;</div><div class='ctx'> 	</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = 31 - ((ac97-&gt;spec.ad18xx.pcmreg[codec] &gt;&gt; 0) &amp; 31);</div><div class='del'>-	ucontrol-&gt;value.integer.value[1] = 31 - ((ac97-&gt;spec.ad18xx.pcmreg[codec] &gt;&gt; 8) &amp; 31);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = 31 - ((ac97-&gt;spec.ad18xx.pcmreg[codec] &gt;&gt; 8) &amp; 31);</div><div class='add'>+	ucontrol-&gt;value.integer.value[1] = 31 - ((ac97-&gt;spec.ad18xx.pcmreg[codec] &gt;&gt; 0) &amp; 31);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1014,8 +990,7 @@ static int snd_ac97_free(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	if (ac97) {</div><div class='ctx'> #ifdef CONFIG_SND_AC97_POWER_SAVE</div><div class='del'>-		cancel_delayed_work(&amp;ac97-&gt;power_work);</div><div class='del'>-		flush_scheduled_work();</div><div class='add'>+		cancel_delayed_work_sync(&amp;ac97-&gt;power_work);</div><div class='ctx'> #endif</div><div class='ctx'> 		snd_ac97_proc_done(ac97);</div><div class='ctx'> 		if (ac97-&gt;bus)</div><div class='hunk'>@@ -1036,20 +1011,20 @@ static int snd_ac97_dev_free(struct snd_device *device)</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned short val, mask = 0x8000;</div><div class='add'>+	unsigned short val, mask = AC97_MUTE_MASK_MONO;</div><div class='ctx'> </div><div class='ctx'> 	if (! snd_ac97_valid_reg(ac97, reg))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (reg) {</div><div class='ctx'> 	case AC97_MASTER_TONE:</div><div class='del'>-		return ac97-&gt;caps &amp; 0x04 ? 1 : 0;</div><div class='add'>+		return ac97-&gt;caps &amp; AC97_BC_BASS_TREBLE ? 1 : 0;</div><div class='ctx'> 	case AC97_HEADPHONE:</div><div class='del'>-		return ac97-&gt;caps &amp; 0x10 ? 1 : 0;</div><div class='add'>+		return ac97-&gt;caps &amp; AC97_BC_HEADPHONE ? 1 : 0;</div><div class='ctx'> 	case AC97_REC_GAIN_MIC:</div><div class='del'>-		return ac97-&gt;caps &amp; 0x01 ? 1 : 0;</div><div class='add'>+		return ac97-&gt;caps &amp; AC97_BC_DEDICATED_MIC ? 1 : 0;</div><div class='ctx'> 	case AC97_3D_CONTROL:</div><div class='del'>-		if (ac97-&gt;caps &amp; 0x7c00) {</div><div class='add'>+		if (ac97-&gt;caps &amp; AC97_BC_3D_TECH_ID_MASK) {</div><div class='ctx'> 			val = snd_ac97_read(ac97, reg);</div><div class='ctx'> 			/* if nonzero - fixed and we can't set it */</div><div class='ctx'> 			return val == 0;</div><div class='hunk'>@@ -1105,7 +1080,10 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha</div><div class='ctx'> 	*lo_max = *hi_max = 0;</div><div class='ctx'> 	for (i = 0 ; i &lt; ARRAY_SIZE(cbit); i++) {</div><div class='ctx'> 		unsigned short val;</div><div class='del'>-		snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] &lt;&lt; 8));</div><div class='add'>+		snd_ac97_write(</div><div class='add'>+			ac97, reg,</div><div class='add'>+			AC97_MUTE_MASK_STEREO | cbit[i] | (cbit[i] &lt;&lt; 8)</div><div class='add'>+		);</div><div class='ctx'> 		/* Do the read twice due to buffers on some ac97 codecs.</div><div class='ctx'> 		 * e.g. The STAC9704 returns exactly what you wrote to the register</div><div class='ctx'> 		 * if you read it immediately. This causes the detect routine to fail.</div><div class='hunk'>@@ -1140,14 +1118,14 @@ static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int</div><div class='ctx'> 	unsigned short val, val1;</div><div class='ctx'> </div><div class='ctx'> 	*max = 63;</div><div class='del'>-	val = 0x8080 | (0x20 &lt;&lt; shift);</div><div class='add'>+	val = AC97_MUTE_MASK_STEREO | (0x20 &lt;&lt; shift);</div><div class='ctx'> 	snd_ac97_write(ac97, reg, val);</div><div class='ctx'> 	val1 = snd_ac97_read(ac97, reg);</div><div class='ctx'> 	if (val != val1) {</div><div class='ctx'> 		*max = 31;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* reset volume to zero */</div><div class='del'>-	snd_ac97_write_cache(ac97, reg, 0x8080);</div><div class='add'>+	snd_ac97_write_cache(ac97, reg, AC97_MUTE_MASK_STEREO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int printable(unsigned int x)</div><div class='hunk'>@@ -1184,16 +1162,16 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,</div><div class='ctx'> 	if (! snd_ac97_valid_reg(ac97, reg))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mute_mask = 0x8000;</div><div class='add'>+	mute_mask = AC97_MUTE_MASK_MONO;</div><div class='ctx'> 	val = snd_ac97_read(ac97, reg);</div><div class='ctx'> 	if (check_stereo || (ac97-&gt;flags &amp; AC97_STEREO_MUTES)) {</div><div class='ctx'> 		/* check whether both mute bits work */</div><div class='del'>-		val1 = val | 0x8080;</div><div class='add'>+		val1 = val | AC97_MUTE_MASK_STEREO;</div><div class='ctx'> 		snd_ac97_write(ac97, reg, val1);</div><div class='ctx'> 		if (val1 == snd_ac97_read(ac97, reg))</div><div class='del'>-			mute_mask = 0x8080;</div><div class='add'>+			mute_mask = AC97_MUTE_MASK_STEREO;</div><div class='ctx'> 	}</div><div class='del'>-	if (mute_mask == 0x8080) {</div><div class='add'>+	if (mute_mask == AC97_MUTE_MASK_STEREO) {</div><div class='ctx'> 		struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);</div><div class='ctx'> 		if (check_amix)</div><div class='ctx'> 			tmp.private_value |= (1 &lt;&lt; 30);</div><div class='hunk'>@@ -1262,6 +1240,8 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne</div><div class='ctx'> 		tmp.index = ac97-&gt;num;</div><div class='ctx'> 		kctl = snd_ctl_new1(&amp;tmp, ac97);</div><div class='ctx'> 	}</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	if (reg &gt;= AC97_PHONE &amp;&amp; reg &lt;= AC97_PCM)</div><div class='ctx'> 		set_tlv_db_scale(kctl, db_scale_5bit_12db_max);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1269,9 +1249,11 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne</div><div class='ctx'> 	err = snd_ctl_add(card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	snd_ac97_write_cache(ac97, reg,</div><div class='del'>-			     (snd_ac97_read(ac97, reg) &amp; 0x8080) |</div><div class='del'>-			     lo_max | (hi_max &lt;&lt; 8));</div><div class='add'>+	snd_ac97_write_cache(</div><div class='add'>+		ac97, reg,</div><div class='add'>+		(snd_ac97_read(ac97, reg) &amp; AC97_MUTE_MASK_STEREO)</div><div class='add'>+		| lo_max | (hi_max &lt;&lt; 8)</div><div class='add'>+	);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1283,7 +1265,7 @@ static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx,</div><div class='ctx'> 				    struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	char name[44];</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='ctx'> 	unsigned char lo_max, hi_max;</div><div class='ctx'> </div><div class='ctx'> 	if (! snd_ac97_valid_reg(ac97, reg))</div><div class='hunk'>@@ -1291,15 +1273,17 @@ static int snd_ac97_cmix_new_stereo(struct snd_card *card, const char *pfx,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, reg, 15)) {</div><div class='ctx'> 		sprintf(name, "%s Switch", pfx);</div><div class='del'>-		if ((err = snd_ac97_cmute_new_stereo(card, name, reg,</div><div class='del'>-						     check_stereo, check_amix,</div><div class='del'>-						     ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cmute_new_stereo(card, name, reg,</div><div class='add'>+						check_stereo, check_amix,</div><div class='add'>+						ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	check_volume_resolution(ac97, reg, &amp;lo_max, &amp;hi_max);</div><div class='ctx'> 	if (lo_max) {</div><div class='ctx'> 		sprintf(name, "%s Volume", pfx);</div><div class='del'>-		if ((err = snd_ac97_cvol_new(card, name, reg, lo_max, hi_max, ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cvol_new(card, name, reg, lo_max, hi_max, ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1333,14 +1317,16 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ac97-&gt;regs[AC97_CENTER_LFE_MASTER] = 0x8080;</div><div class='add'>+	ac97-&gt;regs[AC97_CENTER_LFE_MASTER] = AC97_MUTE_MASK_STEREO;</div><div class='ctx'> </div><div class='ctx'> 	/* build center controls */</div><div class='ctx'> 	if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) </div><div class='ctx'> 		&amp;&amp; !(ac97-&gt;flags &amp; AC97_AD_MULTI)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_center[0], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_center[0], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_center[1], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_center[1], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		snd_ac97_change_volume_params2(ac97, AC97_CENTER_LFE_MASTER, 0, &amp;max);</div><div class='ctx'> 		kctl-&gt;private_value &amp;= ~(0xff &lt;&lt; 16);</div><div class='hunk'>@@ -1352,9 +1338,11 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	/* build LFE controls */</div><div class='ctx'> 	if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER+1))</div><div class='ctx'> 		&amp;&amp; !(ac97-&gt;flags &amp; AC97_AD_MULTI)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_lfe[0], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_lfe[0], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_lfe[1], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_lfe[1], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		snd_ac97_change_volume_params2(ac97, AC97_CENTER_LFE_MASTER, 8, &amp;max);</div><div class='ctx'> 		kctl-&gt;private_value &amp;= ~(0xff &lt;&lt; 16);</div><div class='hunk'>@@ -1367,23 +1355,26 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) </div><div class='ctx'> 		&amp;&amp; !(ac97-&gt;flags &amp; AC97_AD_MULTI)) {</div><div class='ctx'> 		/* Surround Master (0x38) is with stereo mutes */</div><div class='del'>-		if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback",</div><div class='del'>-						    AC97_SURROUND_MASTER, 1, 0,</div><div class='del'>-						    ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cmix_new_stereo(card, "Surround Playback",</div><div class='add'>+					       AC97_SURROUND_MASTER, 1, 0,</div><div class='add'>+					       ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build headphone controls */</div><div class='ctx'> 	if (snd_ac97_try_volume_mix(ac97, AC97_HEADPHONE)) {</div><div class='del'>-		if ((err = snd_ac97_cmix_new(card, "Headphone Playback",</div><div class='del'>-					     AC97_HEADPHONE, 0, ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cmix_new(card, "Headphone Playback",</div><div class='add'>+					AC97_HEADPHONE, 0, ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* build master mono controls */</div><div class='ctx'> 	if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_MONO)) {</div><div class='del'>-		if ((err = snd_ac97_cmix_new(card, "Master Mono Playback",</div><div class='del'>-					     AC97_MASTER_MONO, 0, ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cmix_new(card, "Master Mono Playback",</div><div class='add'>+					AC97_MASTER_MONO, 0, ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -1391,7 +1382,9 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_TONE)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_TONE)) {</div><div class='ctx'> 			for (idx = 0; idx &lt; 2; idx++) {</div><div class='del'>-				if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_tone[idx], ac97))) &lt; 0)</div><div class='add'>+				kctl = snd_ac97_cnew(&amp;snd_ac97_controls_tone[idx], ac97);</div><div class='add'>+				err = snd_ctl_add(card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='ctx'> 				if (ac97-&gt;id == AC97_ID_YMF743 ||</div><div class='ctx'> 				    ac97-&gt;id == AC97_ID_YMF753) {</div><div class='hunk'>@@ -1407,19 +1400,27 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_PC_BEEP) &amp;&amp; </div><div class='ctx'> 		((ac97-&gt;flags &amp; AC97_HAS_PC_BEEP) ||</div><div class='ctx'> 	    snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) {</div><div class='del'>-		for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_pc_beep[idx], ac97))) &lt; 0)</div><div class='add'>+		for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+			kctl = snd_ac97_cnew(&amp;snd_ac97_controls_pc_beep[idx], ac97);</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+		}</div><div class='ctx'> 		set_tlv_db_scale(kctl, db_scale_4bit);</div><div class='del'>-		snd_ac97_write_cache(ac97, AC97_PC_BEEP,</div><div class='del'>-				     snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e);</div><div class='add'>+		snd_ac97_write_cache(</div><div class='add'>+			ac97,</div><div class='add'>+			AC97_PC_BEEP,</div><div class='add'>+			(snd_ac97_read(ac97, AC97_PC_BEEP)</div><div class='add'>+				| AC97_MUTE_MASK_MONO | 0x001e)</div><div class='add'>+		);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* build Phone controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_PHONE)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_PHONE)) {</div><div class='del'>-			if ((err = snd_ac97_cmix_new(card, "Phone Playback",</div><div class='del'>-						     AC97_PHONE, 1, ac97)) &lt; 0)</div><div class='add'>+			err = snd_ac97_cmix_new(card, "Phone Playback",</div><div class='add'>+						AC97_PHONE, 1, ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1427,26 +1428,30 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	/* build MIC controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_MIC)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_MIC)) {</div><div class='del'>-			if ((err = snd_ac97_cmix_new(card, "Mic Playback",</div><div class='del'>-						     AC97_MIC, 1, ac97)) &lt; 0)</div><div class='add'>+			err = snd_ac97_cmix_new(card, "Mic Playback",</div><div class='add'>+						AC97_MIC, 1, ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-			if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_mic_boost, ac97))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_mic_boost, ac97));</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build Line controls */</div><div class='ctx'> 	if (snd_ac97_try_volume_mix(ac97, AC97_LINE)) {</div><div class='del'>-		if ((err = snd_ac97_cmix_new(card, "Line Playback",</div><div class='del'>-					     AC97_LINE, 1, ac97)) &lt; 0)</div><div class='add'>+		err = snd_ac97_cmix_new(card, "Line Playback",</div><div class='add'>+					AC97_LINE, 1, ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* build CD controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_CD)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_CD)) {</div><div class='del'>-			if ((err = snd_ac97_cmix_new(card, "CD Playback",</div><div class='del'>-						     AC97_CD, 1, ac97)) &lt; 0)</div><div class='add'>+			err = snd_ac97_cmix_new(card, "CD Playback",</div><div class='add'>+						AC97_CD, 1, ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1454,8 +1459,9 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	/* build Video controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_VIDEO)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_VIDEO)) {</div><div class='del'>-			if ((err = snd_ac97_cmix_new(card, "Video Playback",</div><div class='del'>-						     AC97_VIDEO, 1, ac97)) &lt; 0)</div><div class='add'>+			err = snd_ac97_cmix_new(card, "Video Playback",</div><div class='add'>+						AC97_VIDEO, 1, ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1463,8 +1469,9 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	/* build Aux controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_AUX)) {</div><div class='ctx'> 		if (snd_ac97_try_volume_mix(ac97, AC97_AUX)) {</div><div class='del'>-			if ((err = snd_ac97_cmix_new(card, "Aux Playback",</div><div class='del'>-						     AC97_AUX, 1, ac97)) &lt; 0)</div><div class='add'>+			err = snd_ac97_cmix_new(card, "Aux Playback",</div><div class='add'>+						AC97_AUX, 1, ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1476,26 +1483,38 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 			init_val = 0x9f9f;</div><div class='ctx'> 		else</div><div class='ctx'> 			init_val = 0x9f1f;</div><div class='del'>-		for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_pcm[idx], ac97))) &lt; 0)</div><div class='add'>+		for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+			kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_pcm[idx], ac97);</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+		}</div><div class='ctx'> 		set_tlv_db_scale(kctl, db_scale_5bit);</div><div class='ctx'> 		ac97-&gt;spec.ad18xx.pcmreg[0] = init_val;</div><div class='ctx'> 		if (ac97-&gt;scaps &amp; AC97_SCAP_SURROUND_DAC) {</div><div class='del'>-			for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-				if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_surround[idx], ac97))) &lt; 0)</div><div class='add'>+			for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+				kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_surround[idx], ac97);</div><div class='add'>+				err = snd_ctl_add(card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='add'>+			}</div><div class='ctx'> 			set_tlv_db_scale(kctl, db_scale_5bit);</div><div class='ctx'> 			ac97-&gt;spec.ad18xx.pcmreg[1] = init_val;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ac97-&gt;scaps &amp; AC97_SCAP_CENTER_LFE_DAC) {</div><div class='del'>-			for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-				if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_center[idx], ac97))) &lt; 0)</div><div class='add'>+			for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+				kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_center[idx], ac97);</div><div class='add'>+				err = snd_ctl_add(card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='add'>+			}</div><div class='ctx'> 			set_tlv_db_scale(kctl, db_scale_5bit);</div><div class='del'>-			for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-				if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_lfe[idx], ac97))) &lt; 0)</div><div class='add'>+			for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+				kctl = snd_ac97_cnew(&amp;snd_ac97_controls_ad18xx_lfe[idx], ac97);</div><div class='add'>+				err = snd_ctl_add(card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='add'>+			}</div><div class='ctx'> 			set_tlv_db_scale(kctl, db_scale_5bit);</div><div class='ctx'> 			ac97-&gt;spec.ad18xx.pcmreg[2] = init_val;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1516,7 +1535,8 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> 	/* build Capture controls */</div><div class='ctx'> 	if (!(ac97-&gt;flags &amp; AC97_HAS_NO_REC_GAIN)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_control_capture_src, ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_control_capture_src, ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		if (snd_ac97_try_bit(ac97, AC97_REC_GAIN, 15)) {</div><div class='ctx'> 			err = snd_ac97_cmute_new(card, "Capture Switch",</div><div class='hunk'>@@ -1524,7 +1544,9 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_control_capture_vol, ac97))) &lt; 0)</div><div class='add'>+		kctl = snd_ac97_cnew(&amp;snd_ac97_control_capture_vol, ac97);</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		set_tlv_db_scale(kctl, db_scale_rec_gain);</div><div class='ctx'> 		snd_ac97_write_cache(ac97, AC97_REC_SEL, 0x0000);</div><div class='hunk'>@@ -1532,52 +1554,62 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* build MIC Capture controls */</div><div class='ctx'> 	if (snd_ac97_try_volume_mix(ac97, AC97_REC_GAIN_MIC)) {</div><div class='del'>-		for (idx = 0; idx &lt; 2; idx++)</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_mic_capture[idx], ac97))) &lt; 0)</div><div class='add'>+		for (idx = 0; idx &lt; 2; idx++) {</div><div class='add'>+			kctl = snd_ac97_cnew(&amp;snd_ac97_controls_mic_capture[idx], ac97);</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+		}</div><div class='ctx'> 		set_tlv_db_scale(kctl, db_scale_rec_gain);</div><div class='ctx'> 		snd_ac97_write_cache(ac97, AC97_REC_GAIN_MIC, 0x0000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build PCM out path &amp; mute control */</div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, AC97_GENERAL_PURPOSE, 15)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_PCM_OUT], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_PCM_OUT], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build Simulated Stereo Enhancement control */</div><div class='del'>-	if (ac97-&gt;caps &amp; 0x0008) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_STEREO_ENHANCEMENT], ac97))) &lt; 0)</div><div class='add'>+	if (ac97-&gt;caps &amp; AC97_BC_SIM_STEREO) {</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_STEREO_ENHANCEMENT], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build 3D Stereo Enhancement control */</div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, AC97_GENERAL_PURPOSE, 13)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_3D], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_3D], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build Loudness control */</div><div class='del'>-	if (ac97-&gt;caps &amp; 0x0020) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_LOUDNESS], ac97))) &lt; 0)</div><div class='add'>+	if (ac97-&gt;caps &amp; AC97_BC_LOUDNESS) {</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_LOUDNESS], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build Mono output select control */</div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, AC97_GENERAL_PURPOSE, 9)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_MONO], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_MONO], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build Mic select control */</div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, AC97_GENERAL_PURPOSE, 8)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_MIC], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_MIC], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* build ADC/DAC loopback control */</div><div class='ctx'> 	if (enable_loopback &amp;&amp; snd_ac97_try_bit(ac97, AC97_GENERAL_PURPOSE, 7)) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_LOOPBACK], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_general[AC97_GENERAL_LOOPBACK], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1593,11 +1625,15 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 			snd_ac97_write(ac97, AC97_3D_CONTROL, val);</div><div class='ctx'> 			val = snd_ac97_read(ac97, AC97_3D_CONTROL);</div><div class='ctx'> 			val = val == 0x0606;</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97))) &lt; 0)</div><div class='add'>+			kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97);</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			if (val)</div><div class='ctx'> 				kctl-&gt;private_value = AC97_3D_CONTROL | (9 &lt;&lt; 8) | (7 &lt;&lt; 16);</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[1], ac97))) &lt; 0)</div><div class='add'>+			kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[1], ac97);</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			if (val)</div><div class='ctx'> 				kctl-&gt;private_value = AC97_3D_CONTROL | (1 &lt;&lt; 8) | (7 &lt;&lt; 16);</div><div class='hunk'>@@ -1614,14 +1650,18 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> 	if ((ac97-&gt;ext_id &amp; AC97_EI_SPDIF) &amp;&amp; !(ac97-&gt;scaps &amp; AC97_SCAP_NO_SPDIF)) {</div><div class='ctx'> 		if (ac97-&gt;build_ops-&gt;build_spdif) {</div><div class='del'>-			if ((err = ac97-&gt;build_ops-&gt;build_spdif(ac97)) &lt; 0)</div><div class='add'>+			err = ac97-&gt;build_ops-&gt;build_spdif(ac97);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		} else {</div><div class='del'>-			for (idx = 0; idx &lt; 5; idx++)</div><div class='del'>-				if ((err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_spdif[idx], ac97))) &lt; 0)</div><div class='add'>+			for (idx = 0; idx &lt; 5; idx++) {</div><div class='add'>+				err = snd_ctl_add(card, snd_ac97_cnew(&amp;snd_ac97_controls_spdif[idx], ac97));</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='add'>+			}</div><div class='ctx'> 			if (ac97-&gt;build_ops-&gt;build_post_spdif) {</div><div class='del'>-				if ((err = ac97-&gt;build_ops-&gt;build_post_spdif(ac97)) &lt; 0)</div><div class='add'>+				err = ac97-&gt;build_ops-&gt;build_post_spdif(ac97);</div><div class='add'>+				if (err &lt; 0)</div><div class='ctx'> 					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* set default PCM S/PDIF params */</div><div class='hunk'>@@ -1633,9 +1673,11 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* build chip specific controls */</div><div class='del'>-	if (ac97-&gt;build_ops-&gt;build_specific)</div><div class='del'>-		if ((err = ac97-&gt;build_ops-&gt;build_specific(ac97)) &lt; 0)</div><div class='add'>+	if (ac97-&gt;build_ops-&gt;build_specific) {</div><div class='add'>+		err = ac97-&gt;build_ops-&gt;build_specific(ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_ac97_try_bit(ac97, AC97_POWERDOWN, 15)) {</div><div class='ctx'> 		kctl = snd_ac97_cnew(&amp;snd_ac97_control_eapd, ac97);</div><div class='hunk'>@@ -1643,7 +1685,8 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		if (ac97-&gt;scaps &amp; AC97_SCAP_INV_EAPD)</div><div class='ctx'> 			set_inv_eapd(ac97, kctl);</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1655,7 +1698,7 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97)</div><div class='ctx'> 	int err, idx;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "AC97_GPIO_CFG = %x\n",</div><div class='add'>+	ac97_dbg(ac97, "AC97_GPIO_CFG = %x\n",</div><div class='ctx'> 	       snd_ac97_read(ac97,AC97_GPIO_CFG));</div><div class='ctx'> 	*/</div><div class='ctx'> 	snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff &amp; ~(AC97_GPIO_LINE1_OH));</div><div class='hunk'>@@ -1665,14 +1708,18 @@ static int snd_ac97_modem_build(struct snd_card *card, struct snd_ac97 * ac97)</div><div class='ctx'> 	snd_ac97_write(ac97, AC97_MISC_AFE, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* build modem switches */</div><div class='del'>-	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ac97_controls_modem_switches); idx++)</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ac97_controls_modem_switches[idx], ac97))) &lt; 0)</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ac97_controls_modem_switches); idx++) {</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ac97_controls_modem_switches[idx], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* build chip specific controls */</div><div class='del'>-	if (ac97-&gt;build_ops-&gt;build_specific)</div><div class='del'>-		if ((err = ac97-&gt;build_ops-&gt;build_specific(ac97)) &lt; 0)</div><div class='add'>+	if (ac97-&gt;build_ops-&gt;build_specific) {</div><div class='add'>+		err = ac97-&gt;build_ops-&gt;build_specific(ac97);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1754,10 +1801,10 @@ static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int result = 0;</div><div class='ctx'> 	int i;</div><div class='del'>-	static unsigned short ctl_bits[] = {</div><div class='add'>+	static const unsigned short ctl_bits[] = {</div><div class='ctx'> 		AC97_SC_SPSR_44K, AC97_SC_SPSR_32K, AC97_SC_SPSR_48K</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned int rate_bits[] = {</div><div class='add'>+	static const unsigned int rate_bits[] = {</div><div class='ctx'> 		SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_32000, SNDRV_PCM_RATE_48000</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1781,7 +1828,8 @@ static const struct ac97_codec_id *look_for_codec_id(const struct ac97_codec_id</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int modem)</div><div class='add'>+void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name,</div><div class='add'>+		       size_t maxlen, int modem)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ac97_codec_id *pid;</div><div class='ctx'> </div><div class='hunk'>@@ -1793,7 +1841,7 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int m</div><div class='ctx'> 	if (! pid)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	strcpy(name, pid-&gt;name);</div><div class='add'>+	strscpy(name, pid-&gt;name, maxlen);</div><div class='ctx'> 	if (ac97 &amp;&amp; pid-&gt;patch) {</div><div class='ctx'> 		if ((modem &amp;&amp; (pid-&gt;flags &amp; AC97_MODEM_PATCH)) ||</div><div class='ctx'> 		    (! modem &amp;&amp; ! (pid-&gt;flags &amp; AC97_MODEM_PATCH)))</div><div class='hunk'>@@ -1802,24 +1850,26 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int m</div><div class='ctx'> </div><div class='ctx'> 	pid = look_for_codec_id(snd_ac97_codec_ids, id);</div><div class='ctx'> 	if (pid) {</div><div class='del'>-		strcat(name, " ");</div><div class='del'>-		strcat(name, pid-&gt;name);</div><div class='add'>+		strlcat(name, " ", maxlen);</div><div class='add'>+		strlcat(name, pid-&gt;name, maxlen);</div><div class='ctx'> 		if (pid-&gt;mask != 0xffffffff)</div><div class='del'>-			sprintf(name + strlen(name), " rev %d", id &amp; ~pid-&gt;mask);</div><div class='add'>+			sprintf(name + strlen(name), " rev %u", id &amp; ~pid-&gt;mask);</div><div class='ctx'> 		if (ac97 &amp;&amp; pid-&gt;patch) {</div><div class='ctx'> 			if ((modem &amp;&amp; (pid-&gt;flags &amp; AC97_MODEM_PATCH)) ||</div><div class='ctx'> 			    (! modem &amp;&amp; ! (pid-&gt;flags &amp; AC97_MODEM_PATCH)))</div><div class='ctx'> 				pid-&gt;patch(ac97);</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='del'>-		sprintf(name + strlen(name), " id %x", id &amp; 0xff);</div><div class='add'>+	} else {</div><div class='add'>+		int l = strlen(name);</div><div class='add'>+		snprintf(name + l, maxlen - l, " id %x", id &amp; 0xff);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * snd_ac97_get_short_name - retrieve codec name</div><div class='ctx'>  * @ac97: the codec instance</div><div class='ctx'>  *</div><div class='del'>- * Returns the short identifying name of the codec.</div><div class='add'>+ * Return: The short identifying name of the codec.</div><div class='ctx'>  */</div><div class='ctx'> const char *snd_ac97_get_short_name(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='hunk'>@@ -1888,19 +1938,20 @@ static int ac97_reset_wait(struct snd_ac97 *ac97, int timeout, int with_modem)</div><div class='ctx'>  * write).  The other callbacks, wait and reset, are not mandatory.</div><div class='ctx'>  * </div><div class='ctx'>  * The clock is set to 48000.  If another clock is needed, set</div><div class='del'>- * (*rbus)-&gt;clock manually.</div><div class='add'>+ * ``(*rbus)-&gt;clock`` manually.</div><div class='ctx'>  *</div><div class='ctx'>  * The AC97 bus instance is registered as a low-level device, so you don't</div><div class='ctx'>  * have to release it manually.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='del'>-int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,</div><div class='add'>+int snd_ac97_bus(struct snd_card *card, int num,</div><div class='add'>+		 const struct snd_ac97_bus_ops *ops,</div><div class='ctx'> 		 void *private_data, struct snd_ac97_bus **rbus)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_ac97_bus *bus;</div><div class='del'>-	static struct snd_device_ops dev_ops = {</div><div class='add'>+	static const struct snd_device_ops dev_ops = {</div><div class='ctx'> 		.dev_free =	snd_ac97_bus_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -1916,7 +1967,8 @@ int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,</div><div class='ctx'> 	bus-&gt;clock = 48000;</div><div class='ctx'> 	spin_lock_init(&amp;bus-&gt;bus_lock);</div><div class='ctx'> 	snd_ac97_bus_proc_init(bus);</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_BUS, bus, &amp;dev_ops)) &lt; 0) {</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &amp;dev_ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_ac97_bus_free(bus);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1944,8 +1996,10 @@ static int snd_ac97_dev_register(struct snd_device *device)</div><div class='ctx'> 	dev_set_name(&amp;ac97-&gt;dev, "%d-%d:%s",</div><div class='ctx'> 		     ac97-&gt;bus-&gt;card-&gt;number, ac97-&gt;num,</div><div class='ctx'> 		     snd_ac97_get_short_name(ac97));</div><div class='del'>-	if ((err = device_register(&amp;ac97-&gt;dev)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Can't register ac97 bus\n");</div><div class='add'>+	err = device_register(&amp;ac97-&gt;dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ac97_err(ac97, "Can't register ac97 bus\n");</div><div class='add'>+		put_device(&amp;ac97-&gt;dev);</div><div class='ctx'> 		ac97-&gt;dev.bus = NULL;</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1962,7 +2016,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* build_ops to do nothing */</div><div class='del'>-static struct snd_ac97_build_ops null_build_ops;</div><div class='add'>+static const struct snd_ac97_build_ops null_build_ops;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_AC97_POWER_SAVE</div><div class='ctx'> static void do_update_power(struct work_struct *work)</div><div class='hunk'>@@ -1989,7 +2043,7 @@ static void do_update_power(struct work_struct *work)</div><div class='ctx'>  * The ac97 instance is registered as a low-level device, so you don't</div><div class='ctx'>  * have to release it manually.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, struct snd_ac97 **rac97)</div><div class='ctx'> {</div><div class='hunk'>@@ -2000,16 +2054,15 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	unsigned long end_time;</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> 	const struct ac97_codec_id *pid;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =	snd_ac97_dev_free,</div><div class='ctx'> 		.dev_register =	snd_ac97_dev_register,</div><div class='ctx'> 		.dev_disconnect =	snd_ac97_dev_disconnect,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (rac97)</div><div class='del'>-		*rac97 = NULL;</div><div class='del'>-	if (snd_BUG_ON(!bus || !template))</div><div class='add'>+	if (snd_BUG_ON(!bus || !template || !rac97))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	*rac97 = NULL;</div><div class='ctx'> 	if (snd_BUG_ON(template-&gt;num &gt;= 4))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (bus-&gt;codec[template-&gt;num])</div><div class='hunk'>@@ -2071,7 +2124,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 						      msecs_to_jiffies(500), 1);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "AC'97 %d does not respond - RESET\n", ac97-&gt;num);</div><div class='add'>+			ac97_warn(ac97, "AC'97 %d does not respond - RESET\n",</div><div class='add'>+				 ac97-&gt;num);</div><div class='ctx'> 			/* proceed anyway - it's often non-critical */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2080,7 +2134,9 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	ac97-&gt;id |= snd_ac97_read(ac97, AC97_VENDOR_ID2);</div><div class='ctx'> 	if (! (ac97-&gt;scaps &amp; AC97_SCAP_DETECT_BY_VENDOR) &amp;&amp;</div><div class='ctx'> 	    (ac97-&gt;id == 0x00000000 || ac97-&gt;id == 0xffffffff)) {</div><div class='del'>-		snd_printk(KERN_ERR "AC'97 %d access is not valid [0x%x], removing mixer.\n", ac97-&gt;num, ac97-&gt;id);</div><div class='add'>+		ac97_err(ac97,</div><div class='add'>+			 "AC'97 %d access is not valid [0x%x], removing mixer.\n",</div><div class='add'>+			 ac97-&gt;num, ac97-&gt;id);</div><div class='ctx'> 		snd_ac97_free(ac97);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2092,7 +2148,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	if (!(ac97-&gt;scaps &amp; AC97_SCAP_SKIP_AUDIO) &amp;&amp; !(ac97-&gt;scaps &amp; AC97_SCAP_AUDIO)) {</div><div class='ctx'> 		/* test if we can write to the record gain volume register */</div><div class='ctx'> 		snd_ac97_write_cache(ac97, AC97_REC_GAIN, 0x8a06);</div><div class='del'>-		if (((err = snd_ac97_read(ac97, AC97_REC_GAIN)) &amp; 0x7fff) == 0x0a06)</div><div class='add'>+		err = snd_ac97_read(ac97, AC97_REC_GAIN);</div><div class='add'>+		if ((err &amp; 0x7fff) == 0x0a06)</div><div class='ctx'> 			ac97-&gt;scaps |= AC97_SCAP_AUDIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ac97-&gt;scaps &amp; AC97_SCAP_AUDIO) {</div><div class='hunk'>@@ -2113,7 +2170,9 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> </div><div class='ctx'> 	if (!ac97_is_audio(ac97) &amp;&amp; !ac97_is_modem(ac97)) {</div><div class='ctx'> 		if (!(ac97-&gt;scaps &amp; (AC97_SCAP_SKIP_AUDIO|AC97_SCAP_SKIP_MODEM)))</div><div class='del'>-			snd_printk(KERN_ERR "AC'97 %d access error (not audio or modem codec)\n", ac97-&gt;num);</div><div class='add'>+			ac97_err(ac97,</div><div class='add'>+				 "AC'97 %d access error (not audio or modem codec)\n",</div><div class='add'>+				 ac97-&gt;num);</div><div class='ctx'> 		snd_ac97_free(ac97);</div><div class='ctx'> 		return -EACCES;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2138,7 +2197,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 				goto __ready_ok;</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='del'>-		snd_printk(KERN_WARNING "AC'97 %d analog subsections not ready\n", ac97-&gt;num);</div><div class='add'>+		ac97_warn(ac97,</div><div class='add'>+			  "AC'97 %d analog subsections not ready\n", ac97-&gt;num);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: add powerdown control */</div><div class='hunk'>@@ -2170,7 +2230,10 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 				goto __ready_ok;</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='del'>-		snd_printk(KERN_WARNING "MC'97 %d converters and GPIO not ready (0x%x)\n", ac97-&gt;num, snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS));</div><div class='add'>+		ac97_warn(ac97,</div><div class='add'>+			  "MC'97 %d converters and GPIO not ready (0x%x)\n",</div><div class='add'>+			  ac97-&gt;num,</div><div class='add'>+			  snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS));</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'>       __ready_ok:</div><div class='hunk'>@@ -2223,15 +2286,15 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	/* additional initializations */</div><div class='ctx'> 	if (bus-&gt;ops-&gt;init)</div><div class='ctx'> 		bus-&gt;ops-&gt;init(ac97);</div><div class='del'>-	snd_ac97_get_name(ac97, ac97-&gt;id, name, !ac97_is_audio(ac97));</div><div class='del'>-	snd_ac97_get_name(NULL, ac97-&gt;id, name, !ac97_is_audio(ac97));  // ac97-&gt;id might be changed in the special setup code</div><div class='add'>+	snd_ac97_get_name(ac97, ac97-&gt;id, name, sizeof(name), !ac97_is_audio(ac97));</div><div class='add'>+	snd_ac97_get_name(NULL, ac97-&gt;id, name, sizeof(name), !ac97_is_audio(ac97));  // ac97-&gt;id might be changed in the special setup code</div><div class='ctx'> 	if (! ac97-&gt;build_ops)</div><div class='ctx'> 		ac97-&gt;build_ops = &amp;null_build_ops;</div><div class='ctx'> </div><div class='ctx'> 	if (ac97_is_audio(ac97)) {</div><div class='ctx'> 		char comp[16];</div><div class='ctx'> 		if (card-&gt;mixername[0] == '\0') {</div><div class='del'>-			strcpy(card-&gt;mixername, name);</div><div class='add'>+			strscpy(card-&gt;mixername, name);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (strlen(card-&gt;mixername) + 1 + strlen(name) + 1 &lt;= sizeof(card-&gt;mixername)) {</div><div class='ctx'> 				strcat(card-&gt;mixername, ",");</div><div class='hunk'>@@ -2239,7 +2302,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		sprintf(comp, "AC97a:%08x", ac97-&gt;id);</div><div class='del'>-		if ((err = snd_component_add(card, comp)) &lt; 0) {</div><div class='add'>+		err = snd_component_add(card, comp);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			snd_ac97_free(ac97);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2251,7 +2315,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	if (ac97_is_modem(ac97)) {</div><div class='ctx'> 		char comp[16];</div><div class='ctx'> 		if (card-&gt;mixername[0] == '\0') {</div><div class='del'>-			strcpy(card-&gt;mixername, name);</div><div class='add'>+			strscpy(card-&gt;mixername, name);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (strlen(card-&gt;mixername) + 1 + strlen(name) + 1 &lt;= sizeof(card-&gt;mixername)) {</div><div class='ctx'> 				strcat(card-&gt;mixername, ",");</div><div class='hunk'>@@ -2259,7 +2323,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		sprintf(comp, "AC97m:%08x", ac97-&gt;id);</div><div class='del'>-		if ((err = snd_component_add(card, comp)) &lt; 0) {</div><div class='add'>+		err = snd_component_add(card, comp);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			snd_ac97_free(ac97);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2271,7 +2336,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,</div><div class='ctx'> 	if (ac97_is_audio(ac97))</div><div class='ctx'> 		update_power_regs(ac97);</div><div class='ctx'> 	snd_ac97_proc_init(ac97);</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ac97, &amp;ops)) &lt; 0) {</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, ac97, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_ac97_free(ac97);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2337,7 +2403,7 @@ struct ac97_power_reg {</div><div class='ctx'> </div><div class='ctx'> enum { PWIDX_ADC, PWIDX_FRONT, PWIDX_CLFE, PWIDX_SURR, PWIDX_MIC, PWIDX_SIZE };</div><div class='ctx'> </div><div class='del'>-static struct ac97_power_reg power_regs[PWIDX_SIZE] = {</div><div class='add'>+static const struct ac97_power_reg power_regs[PWIDX_SIZE] = {</div><div class='ctx'> 	[PWIDX_ADC] = { AC97_PCM_LR_ADC_RATE, AC97_POWERDOWN, AC97_PD_PR0},</div><div class='ctx'> 	[PWIDX_FRONT] = { AC97_PCM_FRONT_DAC_RATE, AC97_POWERDOWN, AC97_PD_PR1},</div><div class='ctx'> 	[PWIDX_CLFE] = { AC97_PCM_LFE_DAC_RATE, AC97_EXTENDED_STATUS,</div><div class='hunk'>@@ -2356,6 +2422,8 @@ static struct ac97_power_reg power_regs[PWIDX_SIZE] = {</div><div class='ctx'>  * @powerup: non-zero when power up the part</div><div class='ctx'>  *</div><div class='ctx'>  * Update the AC97 powerdown register bits of the given part.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)</div><div class='ctx'> {</div><div class='hunk'>@@ -2384,8 +2452,7 @@ int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)</div><div class='ctx'> 		 * (for avoiding loud click noises for many (OSS) apps</div><div class='ctx'> 		 *  that open/close frequently)</div><div class='ctx'> 		 */</div><div class='del'>-		schedule_delayed_work(&amp;ac97-&gt;power_work,</div><div class='del'>-				      msecs_to_jiffies(power_save * 1000));</div><div class='add'>+		schedule_delayed_work(&amp;ac97-&gt;power_work, secs_to_jiffies(power_save));</div><div class='ctx'> 	else {</div><div class='ctx'> 		cancel_delayed_work(&amp;ac97-&gt;power_work);</div><div class='ctx'> 		update_power_regs(ac97);</div><div class='hunk'>@@ -2456,8 +2523,7 @@ void snd_ac97_suspend(struct snd_ac97 *ac97)</div><div class='ctx'> 	if (ac97-&gt;build_ops-&gt;suspend)</div><div class='ctx'> 		ac97-&gt;build_ops-&gt;suspend(ac97);</div><div class='ctx'> #ifdef CONFIG_SND_AC97_POWER_SAVE</div><div class='del'>-	cancel_delayed_work(&amp;ac97-&gt;power_work);</div><div class='del'>-	flush_scheduled_work();</div><div class='add'>+	cancel_delayed_work_sync(&amp;ac97-&gt;power_work);</div><div class='ctx'> #endif</div><div class='ctx'> 	snd_ac97_powerdown(ac97);</div><div class='ctx'> }</div><div class='hunk'>@@ -2544,8 +2610,8 @@ void snd_ac97_resume(struct snd_ac97 *ac97)</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> 		/* FIXME: extra delay */</div><div class='del'>-		ac97-&gt;bus-&gt;ops-&gt;write(ac97, AC97_MASTER, 0x8000);</div><div class='del'>-		if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000)</div><div class='add'>+		ac97-&gt;bus-&gt;ops-&gt;write(ac97, AC97_MASTER, AC97_MUTE_MASK_MONO);</div><div class='add'>+		if (snd_ac97_read(ac97, AC97_MASTER) != AC97_MUTE_MASK_MONO)</div><div class='ctx'> 			msleep(250);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		end_time = jiffies + msecs_to_jiffies(100);</div><div class='hunk'>@@ -2578,11 +2644,18 @@ EXPORT_SYMBOL(snd_ac97_resume);</div><div class='ctx'>  */</div><div class='ctx'> static void set_ctl_name(char *dst, const char *src, const char *suffix)</div><div class='ctx'> {</div><div class='del'>-	if (suffix)</div><div class='del'>-		sprintf(dst, "%s %s", src, suffix);</div><div class='del'>-	else</div><div class='del'>-		strcpy(dst, src);</div><div class='del'>-}	</div><div class='add'>+	const size_t msize = SNDRV_CTL_ELEM_ID_NAME_MAXLEN;</div><div class='add'>+</div><div class='add'>+	if (suffix) {</div><div class='add'>+		if (snprintf(dst, msize, "%s %s", src, suffix) &gt;= msize)</div><div class='add'>+			pr_warn("ALSA: AC97 control name '%s %s' truncated to '%s'\n",</div><div class='add'>+				src, suffix, dst);</div><div class='add'>+	} else {</div><div class='add'>+		if (strscpy(dst, src, msize) &lt; 0)</div><div class='add'>+			pr_warn("ALSA: AC97 control name '%s' truncated to '%s'\n",</div><div class='add'>+				src, dst);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* remove the control with the given name and optional suffix */</div><div class='ctx'> static int snd_ac97_remove_ctl(struct snd_ac97 *ac97, const char *name,</div><div class='hunk'>@@ -2609,8 +2682,11 @@ static int snd_ac97_rename_ctl(struct snd_ac97 *ac97, const char *src,</div><div class='ctx'> 			       const char *dst, const char *suffix)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl = ctl_find(ac97, src, suffix);</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='ctx'> 	if (kctl) {</div><div class='del'>-		set_ctl_name(kctl-&gt;id.name, dst, suffix);</div><div class='add'>+		set_ctl_name(name, dst, suffix);</div><div class='add'>+		snd_ctl_rename(ac97-&gt;bus-&gt;card, kctl, name);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOENT;</div><div class='hunk'>@@ -2629,11 +2705,17 @@ static int snd_ac97_swap_ctl(struct snd_ac97 *ac97, const char *s1,</div><div class='ctx'> 			     const char *s2, const char *suffix)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl1, *kctl2;</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];</div><div class='add'>+</div><div class='ctx'> 	kctl1 = ctl_find(ac97, s1, suffix);</div><div class='ctx'> 	kctl2 = ctl_find(ac97, s2, suffix);</div><div class='ctx'> 	if (kctl1 &amp;&amp; kctl2) {</div><div class='del'>-		set_ctl_name(kctl1-&gt;id.name, s2, suffix);</div><div class='del'>-		set_ctl_name(kctl2-&gt;id.name, s1, suffix);</div><div class='add'>+		set_ctl_name(name, s2, suffix);</div><div class='add'>+		snd_ctl_rename(ac97-&gt;bus-&gt;card, kctl1, name);</div><div class='add'>+</div><div class='add'>+		set_ctl_name(name, s1, suffix);</div><div class='add'>+		snd_ctl_rename(ac97-&gt;bus-&gt;card, kctl2, name);</div><div class='add'>+</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOENT;</div><div class='hunk'>@@ -2704,7 +2786,7 @@ static int tune_ad_sharing(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned short scfg;</div><div class='ctx'> 	if ((ac97-&gt;id &amp; 0xffffff00) != 0x41445300) {</div><div class='del'>-		snd_printk(KERN_ERR "ac97_quirk AD_SHARING is only for AD codecs\n");</div><div class='add'>+		ac97_err(ac97, "ac97_quirk AD_SHARING is only for AD codecs\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Turn on OMS bit to route microphone to back panel */</div><div class='hunk'>@@ -2720,7 +2802,8 @@ AC97_SINGLE("Jack Detect", AC97_ALC650_CLOCK, 5, 1, 0);</div><div class='ctx'> static int tune_alc_jack(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	if ((ac97-&gt;id &amp; 0xffffff00) != 0x414c4700) {</div><div class='del'>-		snd_printk(KERN_ERR "ac97_quirk ALC_JACK is only for Realtek codecs\n");</div><div class='add'>+		ac97_err(ac97,</div><div class='add'>+			 "ac97_quirk ALC_JACK is only for Realtek codecs\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ac97_update_bits(ac97, 0x7a, 0x20, 0x20); /* select jack detect function */</div><div class='hunk'>@@ -2749,12 +2832,12 @@ static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 		int rshift = (kcontrol-&gt;private_value &gt;&gt; 12) &amp; 0x0f;</div><div class='ctx'> 		unsigned short mask;</div><div class='ctx'> 		if (shift != rshift)</div><div class='del'>-			mask = 0x8080;</div><div class='add'>+			mask = AC97_MUTE_MASK_STEREO;</div><div class='ctx'> 		else</div><div class='del'>-			mask = 0x8000;</div><div class='del'>-		snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,</div><div class='add'>+			mask = AC97_MUTE_MASK_MONO;</div><div class='add'>+		snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,</div><div class='ctx'> 				     (ac97-&gt;regs[AC97_MASTER] &amp; mask) == mask ?</div><div class='del'>-				     0x8000 : 0);</div><div class='add'>+				     AC97_PD_EAPD : 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2767,7 +2850,10 @@ static int tune_mute_led(struct snd_ac97 *ac97)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	msw-&gt;put = master_mute_sw_put;</div><div class='ctx'> 	snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);</div><div class='del'>-	snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */</div><div class='add'>+	snd_ac97_update_bits(</div><div class='add'>+		ac97, AC97_POWERDOWN,</div><div class='add'>+		AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */</div><div class='add'>+	);</div><div class='ctx'> 	ac97-&gt;scaps |= AC97_SCAP_EAPD_LED;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2782,12 +2868,12 @@ static int hp_master_mute_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		int rshift = (kcontrol-&gt;private_value &gt;&gt; 12) &amp; 0x0f;</div><div class='ctx'> 		unsigned short mask;</div><div class='ctx'> 		if (shift != rshift)</div><div class='del'>-			mask = 0x8080;</div><div class='add'>+			mask = AC97_MUTE_MASK_STEREO;</div><div class='ctx'> 		else</div><div class='del'>-			mask = 0x8000;</div><div class='del'>-		snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,</div><div class='add'>+			mask = AC97_MUTE_MASK_MONO;</div><div class='add'>+		snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,</div><div class='ctx'> 				     (ac97-&gt;regs[AC97_MASTER] &amp; mask) == mask ?</div><div class='del'>-				     0x8000 : 0);</div><div class='add'>+				     AC97_PD_EAPD : 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2803,7 +2889,10 @@ static int tune_hp_mute_led(struct snd_ac97 *ac97)</div><div class='ctx'> 	snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);</div><div class='ctx'> 	snd_ac97_remove_ctl(ac97, "Headphone Playback", "Switch");</div><div class='ctx'> 	snd_ac97_remove_ctl(ac97, "Headphone Playback", "Volume");</div><div class='del'>-	snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */</div><div class='add'>+	snd_ac97_update_bits(</div><div class='add'>+		ac97, AC97_POWERDOWN,</div><div class='add'>+		AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */</div><div class='add'>+	);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2812,7 +2901,7 @@ struct quirk_table {</div><div class='ctx'> 	int (*func)(struct snd_ac97 *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct quirk_table applicable_quirks[] = {</div><div class='add'>+static const struct quirk_table applicable_quirks[] = {</div><div class='ctx'> 	{ "none", NULL },</div><div class='ctx'> 	{ "hp_only", tune_hp_only },</div><div class='ctx'> 	{ "swap_hp", tune_swap_hp },</div><div class='hunk'>@@ -2840,7 +2929,7 @@ static int apply_quirk(struct snd_ac97 *ac97, int type)</div><div class='ctx'> static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct quirk_table *q;</div><div class='add'>+	const struct quirk_table *q;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(applicable_quirks); i++) {</div><div class='ctx'> 		q = &amp;applicable_quirks[i];</div><div class='hunk'>@@ -2863,10 +2952,11 @@ static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr)</div><div class='ctx'>  * headphone (true line-out) control as "Master".</div><div class='ctx'>  * The quirk-list must be terminated with a zero-filled entry.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override)</div><div class='add'>+int snd_ac97_tune_hardware(struct snd_ac97 *ac97,</div><div class='add'>+			   const struct ac97_quirk *quirk, const char *override)</div><div class='ctx'> {</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='hunk'>@@ -2874,7 +2964,8 @@ int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, cons</div><div class='ctx'> 	if (override &amp;&amp; strcmp(override, "-1") &amp;&amp; strcmp(override, "default")) {</div><div class='ctx'> 		result = apply_quirk_str(ac97, override);</div><div class='ctx'> 		if (result &lt; 0)</div><div class='del'>-			snd_printk(KERN_ERR "applying quirk type %s failed (%d)\n", override, result);</div><div class='add'>+			ac97_err(ac97, "applying quirk type %s failed (%d)\n",</div><div class='add'>+				 override, result);</div><div class='ctx'> 		return result;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2888,10 +2979,14 @@ int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, cons</div><div class='ctx'> 		    quirk-&gt;subdevice == (quirk-&gt;mask &amp; ac97-&gt;subsystem_device)) {</div><div class='ctx'> 			if (quirk-&gt;codec_id &amp;&amp; quirk-&gt;codec_id != ac97-&gt;id)</div><div class='ctx'> 				continue;</div><div class='del'>-			snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk-&gt;name, ac97-&gt;subsystem_vendor, ac97-&gt;subsystem_device);</div><div class='add'>+			ac97_dbg(ac97, "ac97 quirk for %s (%04x:%04x)\n",</div><div class='add'>+				 quirk-&gt;name, ac97-&gt;subsystem_vendor,</div><div class='add'>+				 ac97-&gt;subsystem_device);</div><div class='ctx'> 			result = apply_quirk(ac97, quirk-&gt;type);</div><div class='ctx'> 			if (result &lt; 0)</div><div class='del'>-				snd_printk(KERN_ERR "applying quirk type %d for %s failed (%d)\n", quirk-&gt;type, quirk-&gt;name, result);</div><div class='add'>+				ac97_err(ac97,</div><div class='add'>+					 "applying quirk type %d for %s failed (%d)\n",</div><div class='add'>+					 quirk-&gt;type, quirk-&gt;name, result);</div><div class='ctx'> 			return result;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2899,19 +2994,3 @@ int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, cons</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_ac97_tune_hardware);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  INIT part</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int __init alsa_ac97_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_ac97_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_ac97_init)</div><div class='del'>-module_exit(alsa_ac97_exit)</div><div class='head'>diff --git a/sound/pci/ac97/ac97_id.h b/sound/pci/ac97/ac97_id.h<br/>index d603147c4a96..ed6ed048bc50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_id.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_id.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_id.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_id.h</a></div><div class='hunk'>@@ -1,25 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='ctx'>  *</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AC97_ID_AK4540		0x414b4d00</div><div class='head'>diff --git a/sound/pci/ac97/ac97_local.h b/sound/pci/ac97/ac97_local.h<br/>index c276a5e3f7ac..965284eb4b33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_local.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_local.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_local.h</a></div><div class='hunk'>@@ -1,34 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='ctx'>  *</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name,</div><div class='del'>-		       int modem);</div><div class='add'>+		       size_t maxlen, int modem);</div><div class='ctx'> int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg,</div><div class='ctx'> 				unsigned short mask, unsigned short value);</div><div class='ctx'> </div><div class='ctx'> /* ac97_proc.c */</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> void snd_ac97_bus_proc_init(struct snd_ac97_bus * ac97);</div><div class='ctx'> void snd_ac97_bus_proc_done(struct snd_ac97_bus * ac97);</div><div class='ctx'> void snd_ac97_proc_init(struct snd_ac97 * ac97);</div><div class='head'>diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c<br/>index e68c98ef4041..64cc39dd2008 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_patch.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_patch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_patch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_patch.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='hunk'>@@ -5,28 +6,22 @@</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com) and to datasheets</div><div class='ctx'>  *  for specific codecs.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ac97_local.h"</div><div class='ctx'> #include "ac97_patch.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ *  Forward declarations</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,</div><div class='add'>+						    const char *name);</div><div class='add'>+static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,</div><div class='add'>+				const unsigned int *tlv,</div><div class='add'>+				const char * const *followers);</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  *  Chip specific initialization</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -34,9 +29,11 @@ static int patch_build_controls(struct snd_ac97 * ac97, const struct snd_kcontro</div><div class='ctx'> {</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; count; idx++)</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;controls[idx], ac97))) &lt; 0)</div><div class='add'>+	for (idx = 0; idx &lt; count; idx++) {</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;controls[idx], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -44,12 +41,9 @@ static int patch_build_controls(struct snd_ac97 * ac97, const struct snd_kcontro</div><div class='ctx'> static void reset_tlv(struct snd_ac97 *ac97, const char *name,</div><div class='ctx'> 		      const unsigned int *tlv)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_id sid;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	memset(&amp;sid, 0, sizeof(sid));</div><div class='del'>-	strcpy(sid.name, name);</div><div class='del'>-	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	kctl = snd_ctl_find_id(ac97-&gt;bus-&gt;card, &amp;sid);</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_find_id_mixer(ac97-&gt;bus-&gt;card, name);</div><div class='ctx'> 	if (kctl &amp;&amp; kctl-&gt;tlv.p)</div><div class='ctx'> 		kctl-&gt;tlv.p = tlv;</div><div class='ctx'> }</div><div class='hunk'>@@ -60,34 +54,22 @@ static int ac97_update_bits_page(struct snd_ac97 *ac97, unsigned short reg, unsi</div><div class='ctx'> 	unsigned short page_save;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	page_save = snd_ac97_read(ac97, AC97_INT_PAGING) &amp; AC97_PAGE_MASK;</div><div class='ctx'> 	snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);</div><div class='ctx'> 	ret = snd_ac97_update_bits(ac97, reg, mask, value);</div><div class='ctx'> 	snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex); /* unlock paging */</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * shared line-in/mic controls</div><div class='ctx'>  */</div><div class='del'>-static int ac97_enum_text_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo,</div><div class='del'>-			       const char **texts, unsigned int nums)</div><div class='del'>-{</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = nums;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; nums - 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = nums - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ac97_surround_jack_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[] = { "Shared", "Independent" };</div><div class='del'>-	return ac97_enum_text_info(kcontrol, uinfo, texts, 2);</div><div class='add'>+	static const char * const texts[] = { "Shared", "Independent" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ac97_surround_jack_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -114,9 +96,9 @@ static int ac97_surround_jack_mode_put(struct snd_kcontrol *kcontrol, struct snd</div><div class='ctx'> </div><div class='ctx'> static int ac97_channel_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *texts[] = { "2ch", "4ch", "6ch", "8ch" };</div><div class='del'>-	return ac97_enum_text_info(kcontrol, uinfo, texts,</div><div class='del'>-		kcontrol-&gt;private_value);</div><div class='add'>+	static const char * const texts[] = { "2ch", "4ch", "6ch", "8ch" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, kcontrol-&gt;private_value, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ac97_channel_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -231,17 +213,11 @@ static inline int alc850_is_aux_back_surround(struct snd_ac97 *ac97)</div><div class='ctx'> static int snd_ac97_ymf7x3_info_speaker(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {</div><div class='add'>+	static const char * const texts[3] = {</div><div class='ctx'> 		"Standard", "Small", "Smaller"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ymf7x3_get_speaker(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -284,15 +260,9 @@ static const struct snd_kcontrol_new snd_ac97_ymf7x3_controls_speaker =</div><div class='ctx'> static int snd_ac97_ymf7x3_spdif_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					     struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "AC-Link", "A/D Converter" };</div><div class='add'>+	static const char * const texts[2] = { "AC-Link", "A/D Converter" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ymf7x3_spdif_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -327,7 +297,7 @@ static int patch_yamaha_ymf7x3_3d(struct snd_ac97 *ac97)</div><div class='ctx'> 	err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(kctl-&gt;id.name, "3D Control - Wide");</div><div class='add'>+	strscpy(kctl-&gt;id.name, "3D Control - Wide");</div><div class='ctx'> 	kctl-&gt;private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0);</div><div class='ctx'> 	snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);</div><div class='ctx'> 	err = snd_ctl_add(ac97-&gt;bus-&gt;card,</div><div class='hunk'>@@ -371,7 +341,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {</div><div class='ctx'> 	.build_spdif	= patch_yamaha_ymf743_build_spdif,</div><div class='ctx'> 	.build_3d	= patch_yamaha_ymf7x3_3d,</div><div class='ctx'> };</div><div class='hunk'>@@ -392,15 +362,9 @@ static int patch_yamaha_ymf743(struct snd_ac97 *ac97)</div><div class='ctx'>    There is also a bit to mute S/PDIF output in a vendor-specific register. */</div><div class='ctx'> static int snd_ac97_ymf753_spdif_output_pin_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = { "Disabled", "Pin 43", "Pin 48" };</div><div class='add'>+	static const char * const texts[3] = { "Disabled", "Pin 43", "Pin 48" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ymf753_spdif_output_pin_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -450,12 +414,13 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_ymf753_controls_spdif, ARRAY_SIZE(snd_ac97_ymf753_controls_spdif))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_ymf753_controls_spdif, ARRAY_SIZE(snd_ac97_ymf753_controls_spdif));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {</div><div class='ctx'> 	.build_3d	= patch_yamaha_ymf7x3_3d,</div><div class='ctx'> 	.build_post_spdif = patch_yamaha_ymf753_post_spdif</div><div class='ctx'> };</div><div class='hunk'>@@ -495,14 +460,15 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm97xx_snd_ac97_controls[i], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm97xx_snd_ac97_controls[i], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ac97_write_cache(ac97,  AC97_WM97XX_FMIXER_VOL, 0x0808);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {</div><div class='ctx'> 	.build_specific = patch_wolfson_wm9703_specific,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -525,7 +491,8 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm9704_snd_ac97_controls); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm9704_snd_ac97_controls[i], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm9704_snd_ac97_controls[i], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* patch for DVD noise */</div><div class='hunk'>@@ -533,7 +500,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {</div><div class='ctx'> 	.build_specific = patch_wolfson_wm9704_specific,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -665,7 +632,8 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm9711_snd_ac97_controls); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm9711_snd_ac97_controls[i], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm9711_snd_ac97_controls[i], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ac97_write_cache(ac97,  AC97_CODEC_CLASS_REV, 0x0808);</div><div class='hunk'>@@ -677,7 +645,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {</div><div class='ctx'> 	.build_specific = patch_wolfson_wm9711_specific,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -832,7 +800,8 @@ static int patch_wolfson_wm9713_3d (struct snd_ac97 * ac97)</div><div class='ctx'> 	int err, i;</div><div class='ctx'>     </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm13_snd_ac97_controls_3d); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm13_snd_ac97_controls_3d[i], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm13_snd_ac97_controls_3d[i], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -843,7 +812,8 @@ static int patch_wolfson_wm9713_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(wm13_snd_ac97_controls); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm13_snd_ac97_controls[i], ac97))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ac97_cnew(&amp;wm13_snd_ac97_controls[i], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ac97_write_cache(ac97, AC97_PC_BEEP, 0x0808);</div><div class='hunk'>@@ -871,7 +841,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {</div><div class='ctx'> 	.build_specific = patch_wolfson_wm9713_specific,</div><div class='ctx'> 	.build_3d = patch_wolfson_wm9713_3d,</div><div class='ctx'> #ifdef CONFIG_PM	</div><div class='hunk'>@@ -917,9 +887,10 @@ static int patch_sigmatel_stac9700_3d(struct snd_ac97 * ac97)</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(kctl-&gt;id.name, "3D Control Sigmatel - Depth");</div><div class='add'>+	strscpy(kctl-&gt;id.name, "3D Control Sigmatel - Depth");</div><div class='ctx'> 	kctl-&gt;private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 2, 3, 0);</div><div class='ctx'> 	snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -930,13 +901,17 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97)</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97))) &lt; 0)</div><div class='add'>+	kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97);</div><div class='add'>+	err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(kctl-&gt;id.name, "3D Control Sigmatel - Depth");</div><div class='add'>+	strscpy(kctl-&gt;id.name, "3D Control Sigmatel - Depth");</div><div class='ctx'> 	kctl-&gt;private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 0, 3, 0);</div><div class='del'>-	if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97))) &lt; 0)</div><div class='add'>+	kctl = snd_ac97_cnew(&amp;snd_ac97_controls_3d[0], ac97);</div><div class='add'>+	err = snd_ctl_add(ac97-&gt;bus-&gt;card, kctl);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(kctl-&gt;id.name, "3D Control Sigmatel - Rear Depth");</div><div class='add'>+	strscpy(kctl-&gt;id.name, "3D Control Sigmatel - Rear Depth");</div><div class='ctx'> 	kctl-&gt;private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 2, 3, 0);</div><div class='ctx'> 	snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -961,22 +936,30 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	snd_ac97_write_cache(ac97, AC97_SIGMATEL_ANALOG, snd_ac97_read(ac97, AC97_SIGMATEL_ANALOG) &amp; ~0x0003);</div><div class='del'>-	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_ANALOG, 1))</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_controls[0], 1)) &lt; 0)</div><div class='add'>+	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_ANALOG, 1)) {</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_controls[0], 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_ANALOG, 0))</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_controls[1], 1)) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_ANALOG, 0)) {</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_controls[1], 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_DAC2INVERT, 2))</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_4speaker, 1)) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_DAC2INVERT, 2)) {</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_4speaker, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_DAC2INVERT, 3))</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_phaseinvert, 1)) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	if (snd_ac97_try_bit(ac97, AC97_SIGMATEL_DAC2INVERT, 3)) {</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_sigmatel_phaseinvert, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {</div><div class='ctx'> 	.build_3d	= patch_sigmatel_stac9700_3d,</div><div class='ctx'> 	.build_specific	= patch_sigmatel_stac97xx_specific</div><div class='ctx'> };</div><div class='hunk'>@@ -992,12 +975,11 @@ static int snd_ac97_stac9708_put_bias(struct snd_kcontrol *kcontrol, struct snd_</div><div class='ctx'> 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	snd_ac97_write(ac97, AC97_SIGMATEL_BIAS1, 0xabba);</div><div class='ctx'> 	err = snd_ac97_update_bits(ac97, AC97_SIGMATEL_BIAS2, 0x0010,</div><div class='ctx'> 				   (ucontrol-&gt;value.integer.value[0] &amp; 1) &lt;&lt; 4);</div><div class='ctx'> 	snd_ac97_write(ac97, AC97_SIGMATEL_BIAS1, 0);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1018,12 +1000,13 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)</div><div class='ctx'> 	snd_ac97_remove_ctl(ac97, "PCM Out Path &amp; Mute", NULL);</div><div class='ctx'> </div><div class='ctx'> 	snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Sigmatel Surround Playback");</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_stac9708_bias_control, 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_stac9708_bias_control, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return patch_sigmatel_stac97xx_specific(ac97);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {</div><div class='ctx'> 	.build_3d	= patch_sigmatel_stac9708_3d,</div><div class='ctx'> 	.build_specific	= patch_sigmatel_stac9708_specific</div><div class='ctx'> };</div><div class='hunk'>@@ -1094,16 +1077,11 @@ static int patch_sigmatel_stac9756(struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_output_jack_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[5] = { "Input/Disabled", "Front Output",</div><div class='add'>+	static const char * const texts[5] = {</div><div class='add'>+		"Input/Disabled", "Front Output",</div><div class='ctx'> 		"Rear Output", "Center/LFE Output", "Mixer Output" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 4;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_output_jack_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1138,16 +1116,11 @@ static int snd_ac97_stac9758_output_jack_put(struct snd_kcontrol *kcontrol, stru</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_input_jack_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[7] = { "Mic2 Jack", "Mic1 Jack", "Line In Jack",</div><div class='add'>+	static const char * const texts[7] = {</div><div class='add'>+		"Mic2 Jack", "Mic1 Jack", "Line In Jack",</div><div class='ctx'> 		"Front Jack", "Rear Jack", "Center/LFE Jack", "Mute" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 7;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 6)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 6;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 7, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_input_jack_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1172,15 +1145,11 @@ static int snd_ac97_stac9758_input_jack_put(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_phonesel_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = { "None", "Front Jack", "Rear Jack" };</div><div class='add'>+	static const char * const texts[3] = {</div><div class='add'>+		"None", "Front Jack", "Rear Jack"</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_stac9758_phonesel_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1252,32 +1221,32 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {</div><div class='ctx'> 	.build_3d	= patch_sigmatel_stac9700_3d,</div><div class='ctx'> 	.build_specific	= patch_sigmatel_stac9758_specific</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int patch_sigmatel_stac9758(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='del'>-	static unsigned short regs[4] = {</div><div class='add'>+	static const unsigned short regs[4] = {</div><div class='ctx'> 		AC97_SIGMATEL_OUTSEL,</div><div class='ctx'> 		AC97_SIGMATEL_IOMISC,</div><div class='ctx'> 		AC97_SIGMATEL_INSEL,</div><div class='ctx'> 		AC97_SIGMATEL_VARIOUS</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short def_regs[4] = {</div><div class='add'>+	static const unsigned short def_regs[4] = {</div><div class='ctx'> 		/* OUTSEL */ 0xd794, /* CL:CL, SR:SR, LO:MX, LI:DS, MI:DS */</div><div class='ctx'> 		/* IOMISC */ 0x2001,</div><div class='ctx'> 		/* INSEL */ 0x0201, /* LI:LI, MI:M1 */</div><div class='ctx'> 		/* VARIOUS */ 0x0040</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short m675_regs[4] = {</div><div class='add'>+	static const unsigned short m675_regs[4] = {</div><div class='ctx'> 		/* OUTSEL */ 0xfc70, /* CL:MX, SR:MX, LO:DS, LI:MX, MI:DS */</div><div class='ctx'> 		/* IOMISC */ 0x2102, /* HP amp on */</div><div class='ctx'> 		/* INSEL */ 0x0203, /* LI:LI, MI:FR */</div><div class='ctx'> 		/* VARIOUS */ 0x0041 /* stereo mic */</div><div class='ctx'> 	};</div><div class='del'>-	unsigned short *pregs = def_regs;</div><div class='add'>+	const unsigned short *pregs = def_regs;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Gateway M675 notebook */</div><div class='hunk'>@@ -1310,14 +1279,17 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* con mask, pro mask, default */</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_controls_spdif[0], 3)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_controls_spdif[0], 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* switch, spsa */</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_cirrus_controls_spdif[0], 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_cirrus_controls_spdif[0], 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	switch (ac97-&gt;id &amp; AC97_ID_CS_MASK) {</div><div class='ctx'> 	case AC97_ID_CS4205:</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_cirrus_controls_spdif[1], 1)) &lt; 0)</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_cirrus_controls_spdif[1], 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1327,7 +1299,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_cirrus_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_cirrus_ops = {</div><div class='ctx'> 	.build_spdif = patch_cirrus_build_spdif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1372,10 +1344,12 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* con mask, pro mask, default */</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_controls_spdif[0], 3)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_controls_spdif[0], 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* switch */</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_conexant_controls_spdif[0], 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_conexant_controls_spdif[0], 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* set default PCM S/PDIF params */</div><div class='ctx'> 	/* consumer,PCM audio,no copyright,no preemphasis,PCM coder,original,48000Hz */</div><div class='hunk'>@@ -1384,7 +1358,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_conexant_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_conexant_ops = {</div><div class='ctx'> 	.build_spdif = patch_conexant_build_spdif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1404,12 +1378,12 @@ static int patch_cx20551(struct snd_ac97 *ac97)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Analog Device AD18xx, AD19xx codecs</div><div class='add'>+ * Analog Devices AD18xx, AD19xx codecs</div><div class='ctx'>  */</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> static void ad18xx_resume(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	static unsigned short setup_regs[] = {</div><div class='add'>+	static const unsigned short setup_regs[] = {</div><div class='ctx'> 		AC97_AD_MISC, AC97_AD_SERIAL_CFG, AC97_AD_JACK_SPDIF,</div><div class='ctx'> 	};</div><div class='ctx'> 	int i, codec;</div><div class='hunk'>@@ -1518,7 +1492,7 @@ static unsigned short patch_ad1881_unchained(struct snd_ac97 * ac97, int idx, un</div><div class='ctx'> </div><div class='ctx'> static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short codec_bits)</div><div class='ctx'> {</div><div class='del'>-	static int cfg_bits[3] = { 1&lt;&lt;12, 1&lt;&lt;14, 1&lt;&lt;13 };</div><div class='add'>+	static const int cfg_bits[3] = { 1&lt;&lt;12, 1&lt;&lt;14, 1&lt;&lt;13 };</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]);</div><div class='hunk'>@@ -1560,7 +1534,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1881_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1881_build_ops = {</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.resume = ad18xx_resume</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1640,14 +1614,15 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_controls_ad1885, ARRAY_SIZE(snd_ac97_controls_ad1885))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_controls_ad1885, ARRAY_SIZE(snd_ac97_controls_ad1885));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	reset_tlv(ac97, "Headphone Playback Volume",</div><div class='ctx'> 		  db_scale_6bit_6db_max);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1885_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1885_build_ops = {</div><div class='ctx'> 	.build_specific = &amp;patch_ad1885_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.resume = ad18xx_resume</div><div class='hunk'>@@ -1674,7 +1649,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1886_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1886_build_ops = {</div><div class='ctx'> 	.build_specific = &amp;patch_ad1886_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='ctx'> 	.resume = ad18xx_resume</div><div class='hunk'>@@ -1795,15 +1770,9 @@ static int patch_ad1886(struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ad198x_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "AC-Link", "A/D Converter" };</div><div class='add'>+	static const char * const texts[2] = { "AC-Link", "A/D Converter" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ad198x_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1845,10 +1814,10 @@ static const struct snd_kcontrol_new snd_ac97_ad1981x_jack_sense[] = {</div><div class='ctx'> 	AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 12, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* black list to avoid HP/Line jack-sense controls</div><div class='add'>+/* deny list to avoid HP/Line jack-sense controls</div><div class='ctx'>  * (SS vendor &lt;&lt; 16 | device)</div><div class='ctx'>  */</div><div class='del'>-static unsigned int ad1981_jacks_blacklist[] = {</div><div class='add'>+static const unsigned int ad1981_jacks_denylist[] = {</div><div class='ctx'> 	0x10140523, /* Thinkpad R40 */</div><div class='ctx'> 	0x10140534, /* Thinkpad X31 */</div><div class='ctx'> 	0x10140537, /* Thinkpad T41p */</div><div class='hunk'>@@ -1875,13 +1844,13 @@ static int check_list(struct snd_ac97 *ac97, const unsigned int *list)</div><div class='ctx'> </div><div class='ctx'> static int patch_ad1981a_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='del'>-	if (check_list(ac97, ad1981_jacks_blacklist))</div><div class='add'>+	if (check_list(ac97, ad1981_jacks_denylist))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_ad1981x_jack_sense,</div><div class='ctx'> 				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1981a_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1981a_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -1889,10 +1858,10 @@ static struct snd_ac97_build_ops patch_ad1981a_build_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* white list to enable HP jack-sense bits</div><div class='add'>+/* allow list to enable HP jack-sense bits</div><div class='ctx'>  * (SS vendor &lt;&lt; 16 | device)</div><div class='ctx'>  */</div><div class='del'>-static unsigned int ad1981_jacks_whitelist[] = {</div><div class='add'>+static const unsigned int ad1981_jacks_allowlist[] = {</div><div class='ctx'> 	0x0e11005a, /* HP nc4000/4010 */</div><div class='ctx'> 	0x103c0890, /* HP nc6000 */</div><div class='ctx'> 	0x103c0938, /* HP nc4220 */</div><div class='hunk'>@@ -1900,13 +1869,14 @@ static unsigned int ad1981_jacks_whitelist[] = {</div><div class='ctx'> 	0x103c0944, /* HP nc6220 */</div><div class='ctx'> 	0x103c0934, /* HP nc8220 */</div><div class='ctx'> 	0x103c006d, /* HP nx9105 */</div><div class='add'>+	0x103c300d, /* HP Compaq dc5100 SFF(PT003AW) */</div><div class='ctx'> 	0x17340088, /* FSC Scenic-W */</div><div class='ctx'> 	0 /* end */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void check_ad1981_hp_jack_sense(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='del'>-	if (check_list(ac97, ad1981_jacks_whitelist))</div><div class='add'>+	if (check_list(ac97, ad1981_jacks_allowlist))</div><div class='ctx'> 		/* enable headphone jack sense */</div><div class='ctx'> 		snd_ac97_update_bits(ac97, AC97_AD_JACK_SPDIF, 1&lt;&lt;11, 1&lt;&lt;11);</div><div class='ctx'> }</div><div class='hunk'>@@ -1928,15 +1898,16 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if (check_list(ac97, ad1981_jacks_blacklist))</div><div class='add'>+	if (check_list(ac97, ad1981_jacks_denylist))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_ad1981x_jack_sense,</div><div class='ctx'> 				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1981b_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1981b_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -1984,15 +1955,9 @@ static int snd_ac97_ad1888_lohpsel_put(struct snd_kcontrol *kcontrol, struct snd</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ad1888_downmix_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {"Off", "6 -&gt; 4", "6 -&gt; 2"};</div><div class='add'>+	static const char * const texts[3] = {"Off", "6 -&gt; 4", "6 -&gt; 2"};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ad1888_downmix_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -2075,7 +2040,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1888_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1888_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1888_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -2119,12 +2084,13 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_ad1888_specific(ac97)) &lt; 0)</div><div class='add'>+	err = patch_ad1888_specific(ac97);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1980_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1980_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1980_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -2143,16 +2109,11 @@ static int patch_ad1980(struct snd_ac97 * ac97)</div><div class='ctx'> static int snd_ac97_ad1985_vrefout_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = {"High-Z", "3.7 V", "2.25 V", "0 V"};</div><div class='add'>+	static const char * const texts[4] = {</div><div class='add'>+		"High-Z", "3.7 V", "2.25 V", "0 V"</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_ad1985_vrefout_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -2232,14 +2193,15 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)</div><div class='ctx'> 				"Master Surround Playback");</div><div class='ctx'> 	snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Master Playback");</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_ad1985_controls,</div><div class='ctx'> 				    ARRAY_SIZE(snd_ac97_ad1985_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1985_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1985_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1985_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -2524,14 +2486,15 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1)) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_ad198x_2cmic, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_ad1986_controls,</div><div class='ctx'> 				    ARRAY_SIZE(snd_ac97_ad1985_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_ad1986_build_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_ad1986_build_ops = {</div><div class='ctx'> 	.build_post_spdif = patch_ad198x_post_spdif,</div><div class='ctx'> 	.build_specific = patch_ad1986_specific,</div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -2585,6 +2548,21 @@ static void alc650_update_jacks(struct snd_ac97 *ac97)</div><div class='ctx'> 			     shared ? 0 : 0x100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int alc650_swap_surround_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				    struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct snd_pcm_chmap *map = ac97-&gt;chmaps[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='add'>+</div><div class='add'>+	if (map) {</div><div class='add'>+		if (ucontrol-&gt;value.integer.value[0])</div><div class='add'>+			map-&gt;chmap = snd_pcm_std_chmaps;</div><div class='add'>+		else</div><div class='add'>+			map-&gt;chmap = snd_pcm_alt_chmaps;</div><div class='add'>+	}</div><div class='add'>+	return snd_ac97_put_volsw(kcontrol, ucontrol);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct snd_kcontrol_new snd_ac97_controls_alc650[] = {</div><div class='ctx'> 	AC97_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0),</div><div class='ctx'> 	AC97_SINGLE("Surround Down Mix", AC97_ALC650_MULTICH, 1, 1, 0),</div><div class='hunk'>@@ -2598,7 +2576,14 @@ static const struct snd_kcontrol_new snd_ac97_controls_alc650[] = {</div><div class='ctx'> 	/* 9: Line-In/Surround share */</div><div class='ctx'> 	/* 10: Mic/CLFE share */</div><div class='ctx'> 	/* 11-13: in IEC958 controls */</div><div class='del'>-	AC97_SINGLE("Swap Surround Slot", AC97_ALC650_MULTICH, 14, 1, 0),</div><div class='add'>+	{</div><div class='add'>+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.name = "Swap Surround Slot",</div><div class='add'>+		.info = snd_ac97_info_volsw,</div><div class='add'>+		.get = snd_ac97_get_volsw,</div><div class='add'>+		.put = alc650_swap_surround_put,</div><div class='add'>+		.private_value =  AC97_SINGLE_VALUE(AC97_ALC650_MULTICH, 14, 1, 0),</div><div class='add'>+	},</div><div class='ctx'> #if 0 /* always set in patch_alc650 */</div><div class='ctx'> 	AC97_SINGLE("IEC958 Input Clock Enable", AC97_ALC650_CLOCK, 0, 1, 0),</div><div class='ctx'> 	AC97_SINGLE("IEC958 Input Pin Enable", AC97_ALC650_CLOCK, 1, 1, 0),</div><div class='hunk'>@@ -2624,10 +2609,12 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_controls_alc650, ARRAY_SIZE(snd_ac97_controls_alc650))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_controls_alc650, ARRAY_SIZE(snd_ac97_controls_alc650));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (ac97-&gt;ext_id &amp; AC97_EI_SPDIF) {</div><div class='del'>-		if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc650, ARRAY_SIZE(snd_ac97_spdif_controls_alc650))) &lt; 0)</div><div class='add'>+		err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc650, ARRAY_SIZE(snd_ac97_spdif_controls_alc650));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ac97-&gt;id != AC97_ID_ALC650F)</div><div class='hunk'>@@ -2636,7 +2623,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_alc650_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_alc650_ops = {</div><div class='ctx'> 	.build_specific	= patch_alc650_specific,</div><div class='ctx'> 	.update_jacks = alc650_update_jacks</div><div class='ctx'> };</div><div class='hunk'>@@ -2724,20 +2711,18 @@ static const struct snd_kcontrol_new snd_ac97_controls_alc655[] = {</div><div class='ctx'> </div><div class='ctx'> static int alc655_iec958_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts_655[3] = { "PCM", "Analog In", "IEC958 In" };</div><div class='del'>-	static char *texts_658[4] = { "PCM", "Analog1 In", "Analog2 In", "IEC958 In" };</div><div class='add'>+	static const char * const texts_655[3] = {</div><div class='add'>+		"PCM", "Analog In", "IEC958 In"</div><div class='add'>+	};</div><div class='add'>+	static const char * const texts_658[4] = {</div><div class='add'>+		"PCM", "Analog1 In", "Analog2 In", "IEC958 In"</div><div class='add'>+	};</div><div class='ctx'> 	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = ac97-&gt;spec.dev_flags ? 4 : 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       ac97-&gt;spec.dev_flags ?</div><div class='del'>-	       texts_658[uinfo-&gt;value.enumerated.item] :</div><div class='del'>-	       texts_655[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	if (ac97-&gt;spec.dev_flags)</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 4, texts_658);</div><div class='add'>+	else</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 3, texts_655);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alc655_iec958_route_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -2779,16 +2764,18 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_controls_alc655, ARRAY_SIZE(snd_ac97_controls_alc655))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_controls_alc655, ARRAY_SIZE(snd_ac97_controls_alc655));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (ac97-&gt;ext_id &amp; AC97_EI_SPDIF) {</div><div class='del'>-		if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, ARRAY_SIZE(snd_ac97_spdif_controls_alc655))) &lt; 0)</div><div class='add'>+		err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, ARRAY_SIZE(snd_ac97_spdif_controls_alc655));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_alc655_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_alc655_ops = {</div><div class='ctx'> 	.build_specific	= patch_alc655_specific,</div><div class='ctx'> 	.update_jacks = alc655_update_jacks</div><div class='ctx'> };</div><div class='hunk'>@@ -2891,16 +2878,18 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_controls_alc850, ARRAY_SIZE(snd_ac97_controls_alc850))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_controls_alc850, ARRAY_SIZE(snd_ac97_controls_alc850));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (ac97-&gt;ext_id &amp; AC97_EI_SPDIF) {</div><div class='del'>-		if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, ARRAY_SIZE(snd_ac97_spdif_controls_alc655))) &lt; 0)</div><div class='add'>+		err = patch_build_controls(ac97, snd_ac97_spdif_controls_alc655, ARRAY_SIZE(snd_ac97_spdif_controls_alc655));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_alc850_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_alc850_ops = {</div><div class='ctx'> 	.build_specific	= patch_alc850_specific,</div><div class='ctx'> 	.update_jacks = alc850_update_jacks</div><div class='ctx'> };</div><div class='hunk'>@@ -2940,6 +2929,49 @@ static int patch_alc850(struct snd_ac97 *ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int patch_aztech_azf3328_specific(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol *kctl_3d_center =</div><div class='add'>+		snd_ac97_find_mixer_ctl(ac97, "3D Control - Center");</div><div class='add'>+	struct snd_kcontrol *kctl_3d_depth =</div><div class='add'>+		snd_ac97_find_mixer_ctl(ac97, "3D Control - Depth");</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * 3D register is different from AC97 standard layout</div><div class='add'>+	 * (also do some renaming, to resemble Windows driver naming)</div><div class='add'>+	 */</div><div class='add'>+	if (kctl_3d_center) {</div><div class='add'>+		kctl_3d_center-&gt;private_value =</div><div class='add'>+			AC97_SINGLE_VALUE(AC97_3D_CONTROL, 1, 0x07, 0);</div><div class='add'>+		snd_ac97_rename_vol_ctl(ac97,</div><div class='add'>+			"3D Control - Center", "3D Control - Width"</div><div class='add'>+		);</div><div class='add'>+	}</div><div class='add'>+	if (kctl_3d_depth)</div><div class='add'>+		kctl_3d_depth-&gt;private_value =</div><div class='add'>+			AC97_SINGLE_VALUE(AC97_3D_CONTROL, 8, 0x03, 0);</div><div class='add'>+</div><div class='add'>+	/* Aztech Windows driver calls the</div><div class='add'>+	   equivalent control "Modem Playback", thus rename it: */</div><div class='add'>+	snd_ac97_rename_vol_ctl(ac97,</div><div class='add'>+		"Master Mono Playback", "Modem Playback"</div><div class='add'>+	);</div><div class='add'>+	snd_ac97_rename_vol_ctl(ac97,</div><div class='add'>+		"Headphone Playback", "FM Synth Playback"</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_ac97_build_ops patch_aztech_azf3328_ops = {</div><div class='add'>+	.build_specific	= patch_aztech_azf3328_specific</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int patch_aztech_azf3328(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	ac97-&gt;build_ops = &amp;patch_aztech_azf3328_ops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * C-Media CM97xx codecs</div><div class='hunk'>@@ -2962,7 +2994,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_cm9738_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_cm9738_ops = {</div><div class='ctx'> 	.build_specific	= patch_cm9738_specific,</div><div class='ctx'> 	.update_jacks = cm9738_update_jacks</div><div class='ctx'> };</div><div class='hunk'>@@ -2980,15 +3012,9 @@ static int patch_cm9738(struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_cmedia_spdif_playback_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = { "Analog", "Digital" };</div><div class='add'>+	static const char * const texts[] = { "Analog", "Digital" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_cmedia_spdif_playback_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -3053,7 +3079,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_cm9739_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_cm9739_ops = {</div><div class='ctx'> 	.build_specific	= patch_cm9739_specific,</div><div class='ctx'> 	.build_post_spdif = patch_cm9739_post_spdif,</div><div class='ctx'> 	.update_jacks = cm9739_update_jacks</div><div class='hunk'>@@ -3085,7 +3111,7 @@ static int patch_cm9739(struct snd_ac97 * ac97)</div><div class='ctx'> 	/* set-up multi channel */</div><div class='ctx'> 	/* bit 14: 0 = SPDIF, 1 = EAPD */</div><div class='ctx'> 	/* bit 13: enable internal vref output for mic */</div><div class='del'>-	/* bit 12: disable center/lfe (swithable) */</div><div class='add'>+	/* bit 12: disable center/lfe (switchable) */</div><div class='ctx'> 	/* bit 10: disable surround/line (switchable) */</div><div class='ctx'> 	/* bit 9: mix 2 surround off */</div><div class='ctx'> 	/* bit 4: undocumented; 0 mutes the CM9739A, which defaults to 1 */</div><div class='hunk'>@@ -3123,22 +3149,22 @@ static void cm9761_update_jacks(struct snd_ac97 *ac97)</div><div class='ctx'> 	/* FIXME: check the bits for each model</div><div class='ctx'> 	 *        model 83 is confirmed to work</div><div class='ctx'> 	 */</div><div class='del'>-	static unsigned short surr_on[3][2] = {</div><div class='add'>+	static const unsigned short surr_on[3][2] = {</div><div class='ctx'> 		{ 0x0008, 0x0000 }, /* 9761-78 &amp; 82 */</div><div class='ctx'> 		{ 0x0000, 0x0008 }, /* 9761-82 rev.B */</div><div class='ctx'> 		{ 0x0000, 0x0008 }, /* 9761-83 */</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short clfe_on[3][2] = {</div><div class='add'>+	static const unsigned short clfe_on[3][2] = {</div><div class='ctx'> 		{ 0x0000, 0x1000 }, /* 9761-78 &amp; 82 */</div><div class='ctx'> 		{ 0x1000, 0x0000 }, /* 9761-82 rev.B */</div><div class='ctx'> 		{ 0x0000, 0x1000 }, /* 9761-83 */</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short surr_shared[3][2] = {</div><div class='add'>+	static const unsigned short surr_shared[3][2] = {</div><div class='ctx'> 		{ 0x0000, 0x0400 }, /* 9761-78 &amp; 82 */</div><div class='ctx'> 		{ 0x0000, 0x0400 }, /* 9761-82 rev.B */</div><div class='ctx'> 		{ 0x0000, 0x0400 }, /* 9761-83 */</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short clfe_shared[3][2] = {</div><div class='add'>+	static const unsigned short clfe_shared[3][2] = {</div><div class='ctx'> 		{ 0x2000, 0x0880 }, /* 9761-78 &amp; 82 */</div><div class='ctx'> 		{ 0x0000, 0x2880 }, /* 9761-82 rev.B */</div><div class='ctx'> 		{ 0x2000, 0x0800 }, /* 9761-83 */</div><div class='hunk'>@@ -3160,15 +3186,9 @@ static const struct snd_kcontrol_new snd_ac97_cm9761_controls[] = {</div><div class='ctx'> </div><div class='ctx'> static int cm9761_spdif_out_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = { "AC-Link", "ADC", "SPDIF-In" };</div><div class='add'>+	static const char * const texts[] = { "AC-Link", "ADC", "SPDIF-In" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cm9761_spdif_out_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -3195,7 +3215,9 @@ static int cm9761_spdif_out_source_put(struct snd_kcontrol *kcontrol, struct snd</div><div class='ctx'> 				    ucontrol-&gt;value.enumerated.item[0] == 1 ? 0x2 : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *cm9761_dac_clock[] = { "AC-Link", "SPDIF-In", "Both" };</div><div class='add'>+static const char * const cm9761_dac_clock[] = {</div><div class='add'>+	"AC-Link", "SPDIF-In", "Both"</div><div class='add'>+};</div><div class='ctx'> static const struct ac97_enum cm9761_dac_clock_enum =</div><div class='ctx'> 	AC97_ENUM_SINGLE(AC97_CM9761_SPDIF_CTRL, 9, 3, cm9761_dac_clock);</div><div class='ctx'> </div><div class='hunk'>@@ -3227,7 +3249,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_cm9761_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_cm9761_ops = {</div><div class='ctx'> 	.build_specific	= patch_cm9761_specific,</div><div class='ctx'> 	.build_post_spdif = patch_cm9761_post_spdif,</div><div class='ctx'> 	.update_jacks = cm9761_update_jacks</div><div class='hunk'>@@ -3309,7 +3331,9 @@ static int patch_cm9761(struct snd_ac97 *ac97)</div><div class='ctx'> #define AC97_CM9780_MULTI_CHAN	0x66</div><div class='ctx'> #define AC97_CM9780_SPDIF	0x6c</div><div class='ctx'> </div><div class='del'>-static const char *cm9780_ch_select[] = { "Front", "Side", "Center/LFE", "Rear" };</div><div class='add'>+static const char * const cm9780_ch_select[] = {</div><div class='add'>+	"Front", "Side", "Center/LFE", "Rear"</div><div class='add'>+};</div><div class='ctx'> static const struct ac97_enum cm9780_ch_select_enum =</div><div class='ctx'> 	AC97_ENUM_SINGLE(AC97_CM9780_MULTI_CHAN, 6, 4, cm9780_ch_select);</div><div class='ctx'> static const struct snd_kcontrol_new cm9780_controls[] = {</div><div class='hunk'>@@ -3323,7 +3347,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)</div><div class='ctx'> 	return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_cm9780_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_cm9780_ops = {</div><div class='ctx'> 	.build_specific	= patch_cm9780_specific,</div><div class='ctx'> 	.build_post_spdif = patch_cm9761_post_spdif	/* identical with CM9761 */</div><div class='ctx'> };</div><div class='hunk'>@@ -3346,6 +3370,33 @@ static int patch_cm9780(struct snd_ac97 *ac97)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * VIA VT1613 codec</div><div class='add'>+ */</div><div class='add'>+static const struct snd_kcontrol_new snd_ac97_controls_vt1613[] = {</div><div class='add'>+AC97_SINGLE("DC Offset removal", 0x5a, 10, 1, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int patch_vt1613_specific(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	return patch_build_controls(ac97, &amp;snd_ac97_controls_vt1613[0],</div><div class='add'>+				    ARRAY_SIZE(snd_ac97_controls_vt1613));</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ac97_build_ops patch_vt1613_ops = {</div><div class='add'>+	.build_specific	= patch_vt1613_specific</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int patch_vt1613(struct snd_ac97 *ac97)</div><div class='add'>+{</div><div class='add'>+	ac97-&gt;build_ops = &amp;patch_vt1613_ops;</div><div class='add'>+</div><div class='add'>+	ac97-&gt;flags |= AC97_HAS_NO_VIDEO;</div><div class='add'>+	ac97-&gt;caps |= AC97_BC_HEADPHONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * VIA VT1616 codec</div><div class='ctx'>  */</div><div class='ctx'> static const struct snd_kcontrol_new snd_ac97_controls_vt1616[] = {</div><div class='hunk'>@@ -3355,7 +3406,7 @@ AC97_SINGLE("Downmix LFE and Center to Front", 0x5a, 12, 1, 0),</div><div class='ctx'> AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char *slave_vols_vt1616[] = {</div><div class='add'>+static const char * const follower_vols_vt1616[] = {</div><div class='ctx'> 	"Front Playback Volume",</div><div class='ctx'> 	"Surround Playback Volume",</div><div class='ctx'> 	"Center Playback Volume",</div><div class='hunk'>@@ -3363,7 +3414,7 @@ static const char *slave_vols_vt1616[] = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char *slave_sws_vt1616[] = {</div><div class='add'>+static const char * const follower_sws_vt1616[] = {</div><div class='ctx'> 	"Front Playback Switch",</div><div class='ctx'> 	"Surround Playback Switch",</div><div class='ctx'> 	"Center Playback Switch",</div><div class='hunk'>@@ -3375,19 +3426,15 @@ static const char *slave_sws_vt1616[] = {</div><div class='ctx'> static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,</div><div class='ctx'> 						    const char *name)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='del'>-	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(id.name, name);</div><div class='del'>-	return snd_ctl_find_id(ac97-&gt;bus-&gt;card, &amp;id);</div><div class='add'>+	return snd_ctl_find_id_mixer(ac97-&gt;bus-&gt;card, name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* create a virtual master control and add slaves */</div><div class='add'>+/* create a virtual master control and add followers */</div><div class='ctx'> static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,</div><div class='del'>-				const unsigned int *tlv, const char **slaves)</div><div class='add'>+				const unsigned int *tlv,</div><div class='add'>+				const char * const *followers)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='del'>-	const char **s;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	kctl = snd_ctl_make_virtual_master(name, tlv);</div><div class='hunk'>@@ -3397,19 +3444,7 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	for (s = slaves; *s; s++) {</div><div class='del'>-		struct snd_kcontrol *sctl;</div><div class='del'>-</div><div class='del'>-		sctl = snd_ac97_find_mixer_ctl(ac97, *s);</div><div class='del'>-		if (!sctl) {</div><div class='del'>-			snd_printdd("Cannot find slave %s, skipped\n", *s);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		err = snd_ctl_add_slave(kctl, sctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_add_followers(ac97-&gt;bus-&gt;card, kctl, followers);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int patch_vt1616_specific(struct snd_ac97 * ac97)</div><div class='hunk'>@@ -3417,10 +3452,13 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (snd_ac97_try_bit(ac97, 0x5a, 9))</div><div class='del'>-		if ((err = patch_build_controls(ac97, &amp;snd_ac97_controls_vt1616[0], 1)) &lt; 0)</div><div class='add'>+	if (snd_ac97_try_bit(ac97, 0x5a, 9)) {</div><div class='add'>+		err = patch_build_controls(ac97, &amp;snd_ac97_controls_vt1616[0], 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-	if ((err = patch_build_controls(ac97, &amp;snd_ac97_controls_vt1616[1], ARRAY_SIZE(snd_ac97_controls_vt1616) - 1)) &lt; 0)</div><div class='add'>+	}</div><div class='add'>+	err = patch_build_controls(ac97, &amp;snd_ac97_controls_vt1616[1], ARRAY_SIZE(snd_ac97_controls_vt1616) - 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* There is already a misnamed master switch.  Rename it.  */</div><div class='hunk'>@@ -3431,19 +3469,19 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)</div><div class='ctx'> 	snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Front Playback");</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ac97_add_vmaster(ac97, "Master Playback Volume",</div><div class='del'>-				   kctl-&gt;tlv.p, slave_vols_vt1616);</div><div class='add'>+				   kctl-&gt;tlv.p, follower_vols_vt1616);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ac97_add_vmaster(ac97, "Master Playback Switch",</div><div class='del'>-				   NULL, slave_sws_vt1616);</div><div class='add'>+				   NULL, follower_sws_vt1616);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_vt1616_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_vt1616_ops = {</div><div class='ctx'> 	.build_specific	= patch_vt1616_specific</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3476,11 +3514,12 @@ static int snd_ac97_vt1617a_smart51_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	 * is SM51EN *AND* it's Bit14, not Bit15 so the table is very</div><div class='ctx'> 	 * counter-intuitive */ </div><div class='ctx'> </div><div class='del'>-	static const char* texts[] = { "LineIn Mic1", "LineIn Mic1 Mic3",</div><div class='add'>+	static const char * const texts[] = {"LineIn Mic1", "LineIn Mic1 Mic3",</div><div class='ctx'> 				       "Surr LFE/C Mic3", "LineIn LFE/C Mic3",</div><div class='ctx'> 				       "LineIn Mic2", "LineIn Mic2 Mic1",</div><div class='ctx'> 				       "Surr LFE Mic1", "Surr LFE Mic1 Mic2"};</div><div class='del'>-	return ac97_enum_text_info(kcontrol, uinfo, texts, 8);</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 8, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_vt1617a_smart51_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -3609,12 +3648,12 @@ static int patch_vt1617a(struct snd_ac97 * ac97)</div><div class='ctx'> struct vt1618_uaj_item {</div><div class='ctx'> 	unsigned short mask;</div><div class='ctx'> 	unsigned short shift;</div><div class='del'>-	const char *items[4];</div><div class='add'>+	const char * const items[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This list reflects the vt1618 docs for Vendor Defined Register 0x60. */</div><div class='ctx'> </div><div class='del'>-static struct vt1618_uaj_item vt1618_uaj[3] = {</div><div class='add'>+static const struct vt1618_uaj_item vt1618_uaj[3] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* speaker jack */</div><div class='ctx'> 		.mask  = 0x03,</div><div class='hunk'>@@ -3644,9 +3683,8 @@ static struct vt1618_uaj_item vt1618_uaj[3] = {</div><div class='ctx'> static int snd_ac97_vt1618_UAJ_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				    struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	return ac97_enum_text_info(kcontrol, uinfo,</div><div class='del'>-				   vt1618_uaj[kcontrol-&gt;private_value].items,</div><div class='del'>-				   4);</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4,</div><div class='add'>+				 vt1618_uaj[kcontrol-&gt;private_value].items);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* All of the vt1618 Universal Audio Jack twiddlers are on</div><div class='hunk'>@@ -3659,7 +3697,7 @@ static int snd_ac97_vt1618_UAJ_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short datpag, uaj;</div><div class='ctx'> 	struct snd_ac97 *pac97 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;pac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;pac97-&gt;page_mutex);</div><div class='ctx'> </div><div class='ctx'> 	datpag = snd_ac97_read(pac97, AC97_INT_PAGING) &amp; AC97_PAGE_MASK;</div><div class='ctx'> 	snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, 0);</div><div class='hunk'>@@ -3668,7 +3706,6 @@ static int snd_ac97_vt1618_UAJ_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		vt1618_uaj[kcontrol-&gt;private_value].mask;</div><div class='ctx'> </div><div class='ctx'> 	snd_ac97_update_bits(pac97, AC97_INT_PAGING, AC97_PAGE_MASK, datpag);</div><div class='del'>-	mutex_unlock(&amp;pac97-&gt;page_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = uaj &gt;&gt;</div><div class='ctx'> 		vt1618_uaj[kcontrol-&gt;private_value].shift;</div><div class='hunk'>@@ -3691,9 +3728,9 @@ static int snd_ac97_vt1618_UAJ_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_ac97_vt1618_aux_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				     struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static const char *txt_aux[] = {"Aux In", "Back Surr Out"};</div><div class='add'>+	static const char * const txt_aux[] = {"Aux In", "Back Surr Out"};</div><div class='ctx'> </div><div class='del'>-	return ac97_enum_text_info(kcontrol, uinfo, txt_aux, 2);</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, txt_aux);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ac97_vt1618_aux_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -3790,14 +3827,16 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_it2646[] = {</div><div class='ctx'> static int patch_it2646_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_controls_it2646, ARRAY_SIZE(snd_ac97_controls_it2646))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_controls_it2646, ARRAY_SIZE(snd_ac97_controls_it2646));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_it2646, ARRAY_SIZE(snd_ac97_spdif_controls_it2646))) &lt; 0)</div><div class='add'>+	err = patch_build_controls(ac97, snd_ac97_spdif_controls_it2646, ARRAY_SIZE(snd_ac97_spdif_controls_it2646));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_it2646_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_it2646_ops = {</div><div class='ctx'> 	.build_specific	= patch_it2646_specific,</div><div class='ctx'> 	.update_jacks = it2646_update_jacks</div><div class='ctx'> };</div><div class='hunk'>@@ -3825,13 +3864,15 @@ AC97_DOUBLE("Modem Speaker Volume", 0x5c, 14, 12, 3, 1)</div><div class='ctx'> static int patch_si3036_specific(struct snd_ac97 * ac97)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, err;</div><div class='del'>-	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ac97_controls_si3036); idx++)</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ctl_new1(&amp;snd_ac97_controls_si3036[idx], ac97))) &lt; 0)</div><div class='add'>+	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ac97_controls_si3036); idx++) {</div><div class='add'>+		err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ctl_new1(&amp;snd_ac97_controls_si3036[idx], ac97));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_build_ops patch_si3036_ops = {</div><div class='add'>+static const struct snd_ac97_build_ops patch_si3036_ops = {</div><div class='ctx'> 	.build_specific	= patch_si3036_specific,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3851,7 +3892,7 @@ static int mpatch_si3036(struct snd_ac97 * ac97)</div><div class='ctx'>  * check_volume_resolution().</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_ac97_res_table lm4550_restbl[] = {</div><div class='add'>+static const struct snd_ac97_res_table lm4550_restbl[] = {</div><div class='ctx'> 	{ AC97_MASTER, 0x1f1f },</div><div class='ctx'> 	{ AC97_HEADPHONE, 0x1f1f },</div><div class='ctx'> 	{ AC97_MASTER_MONO, 0x001f },</div><div class='hunk'>@@ -3872,41 +3913,3 @@ static int patch_lm4550(struct snd_ac97 *ac97)</div><div class='ctx'> 	ac97-&gt;res_table = lm4550_restbl;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *  UCB1400 codec (http://www.semiconductors.philips.com/acrobat_download/datasheets/UCB1400-02.pdf)</div><div class='del'>- */</div><div class='del'>-static const struct snd_kcontrol_new snd_ac97_controls_ucb1400[] = {</div><div class='del'>-/* enable/disable headphone driver which allows direct connection to</div><div class='del'>-   stereo headphone without the use of external DC blocking</div><div class='del'>-   capacitors */</div><div class='del'>-AC97_SINGLE("Headphone Driver", 0x6a, 6, 1, 0),</div><div class='del'>-/* Filter used to compensate the DC offset is added in the ADC to remove idle</div><div class='del'>-   tones from the audio band. */</div><div class='del'>-AC97_SINGLE("DC Filter", 0x6a, 4, 1, 0),</div><div class='del'>-/* Control smart-low-power mode feature. Allows automatic power down</div><div class='del'>-   of unused blocks in the ADC analog front end and the PLL. */</div><div class='del'>-AC97_SINGLE("Smart Low Power Mode", 0x6c, 4, 3, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ucb1400_specific(struct snd_ac97 * ac97)</div><div class='del'>-{</div><div class='del'>-	int idx, err;</div><div class='del'>-	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ac97_controls_ucb1400); idx++)</div><div class='del'>-		if ((err = snd_ctl_add(ac97-&gt;bus-&gt;card, snd_ctl_new1(&amp;snd_ac97_controls_ucb1400[idx], ac97))) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_ac97_build_ops patch_ucb1400_ops = {</div><div class='del'>-	.build_specific	= patch_ucb1400_specific,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ucb1400(struct snd_ac97 * ac97)</div><div class='del'>-{</div><div class='del'>-	ac97-&gt;build_ops = &amp;patch_ucb1400_ops;</div><div class='del'>-	/* enable headphone driver and smart low power mode by default */</div><div class='del'>-	snd_ac97_write_cache(ac97, 0x6a, 0x0050);</div><div class='del'>-	snd_ac97_write_cache(ac97, 0x6c, 0x0030);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/pci/ac97/ac97_patch.h b/sound/pci/ac97/ac97_patch.h<br/>index 47bf8dfe8276..a8cd89cfd6ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_patch.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_patch.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_patch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_patch.h</a></div><div class='hunk'>@@ -1,25 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='ctx'>  *</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define AC97_SINGLE_VALUE(reg,shift,mask,invert) \</div><div class='hunk'>@@ -49,7 +34,7 @@ struct ac97_enum {</div><div class='ctx'> 	unsigned char shift_l;</div><div class='ctx'> 	unsigned char shift_r;</div><div class='ctx'> 	unsigned short mask;</div><div class='del'>-	const char **texts;</div><div class='add'>+	const char * const *texts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AC97_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \</div><div class='head'>diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c<br/>index 48cbda9378c5..4715d88ff8f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_pcm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='hunk'>@@ -5,28 +6,13 @@</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com) and to datasheets</div><div class='ctx'>  *  for specific codecs.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -40,7 +26,7 @@</div><div class='ctx'>  *  PCM support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char rate_reg_tables[2][4][9] = {</div><div class='add'>+static const unsigned char rate_reg_tables[2][4][9] = {</div><div class='ctx'> {</div><div class='ctx'>   /* standard rates */</div><div class='ctx'>   {</div><div class='hunk'>@@ -143,7 +129,7 @@ static unsigned char rate_reg_tables[2][4][9] = {</div><div class='ctx'> }};</div><div class='ctx'> </div><div class='ctx'> /* FIXME: more various mappings for ADC? */</div><div class='del'>-static unsigned char rate_cregs[9] = {</div><div class='add'>+static const unsigned char rate_cregs[9] = {</div><div class='ctx'> 	AC97_PCM_LR_ADC_RATE,	/* 3 */</div><div class='ctx'> 	AC97_PCM_LR_ADC_RATE,	/* 4 */</div><div class='ctx'> 	0xff,			/* 5 */</div><div class='hunk'>@@ -206,7 +192,7 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate)</div><div class='ctx'> 		mask = AC97_SC_SPSR_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	old = snd_ac97_read(ac97, reg) &amp; mask;</div><div class='ctx'> 	if (old != bits) {</div><div class='ctx'> 		snd_ac97_update_bits_nolock(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, 0);</div><div class='hunk'>@@ -231,7 +217,6 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate)</div><div class='ctx'> 		ac97-&gt;spdif_status = sbits;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ac97_update_bits_nolock(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, AC97_EA_SPDIF);</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;reg_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -245,14 +230,14 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate)</div><div class='ctx'>  * If the codec doesn't support VAR, the rate must be 48000 (except</div><div class='ctx'>  * for SPDIF).</div><div class='ctx'>  *</div><div class='del'>- * The valid registers are AC97_PMC_MIC_ADC_RATE,</div><div class='add'>+ * The valid registers are AC97_PCM_MIC_ADC_RATE,</div><div class='ctx'>  * AC97_PCM_FRONT_DAC_RATE, AC97_PCM_LR_ADC_RATE.</div><div class='ctx'>  * AC97_PCM_SURR_DAC_RATE and AC97_PCM_LFE_DAC_RATE are accepted</div><div class='ctx'>  * if the codec supports them.</div><div class='ctx'>  * AC97_SPDIF is accepted as a pseudo register to modify the SPDIF</div><div class='ctx'>  * status bits.</div><div class='ctx'>  *</div><div class='del'>- * Returns zero if successful, or a negative error code on failure.</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -439,6 +424,8 @@ static unsigned int get_rates(struct ac97_pcm *pcm, unsigned int cidx, unsigned</div><div class='ctx'>  * It assigns available AC97 slots for given PCMs. If none or only</div><div class='ctx'>  * some slots are available, pcm-&gt;xxx.slots and pcm-&gt;xxx.rslots[] members</div><div class='ctx'>  * are reduced and might be zero.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_pcm_assign(struct snd_ac97_bus *bus,</div><div class='ctx'> 			unsigned short pcms_count,</div><div class='hunk'>@@ -561,6 +548,8 @@ EXPORT_SYMBOL(snd_ac97_pcm_assign);</div><div class='ctx'>  * @slots: a subset of allocated slots (snd_ac97_pcm_assign) for this pcm</div><div class='ctx'>  *</div><div class='ctx'>  * It locks the specified slots and sets the given rate to AC97 registers.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,</div><div class='ctx'> 		      enum ac97_pcm_cfg cfg, unsigned short slots)</div><div class='hunk'>@@ -581,31 +570,31 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,</div><div class='ctx'> 					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='del'>-	for (i = 3; i &lt; 12; i++) {</div><div class='del'>-		if (!(slots &amp; (1 &lt;&lt; i)))</div><div class='del'>-			continue;</div><div class='del'>-		ok_flag = 0;</div><div class='del'>-		for (cidx = 0; cidx &lt; 4; cidx++) {</div><div class='del'>-			if (bus-&gt;used_slots[pcm-&gt;stream][cidx] &amp; (1 &lt;&lt; i)) {</div><div class='del'>-				spin_unlock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='del'>-				err = -EBUSY;</div><div class='del'>-				goto error;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;pcm-&gt;bus-&gt;bus_lock) {</div><div class='add'>+		for (i = 3; i &lt; 12; i++) {</div><div class='add'>+			if (!(slots &amp; (1 &lt;&lt; i)))</div><div class='add'>+				continue;</div><div class='add'>+			ok_flag = 0;</div><div class='add'>+			for (cidx = 0; cidx &lt; 4; cidx++) {</div><div class='add'>+				if (bus-&gt;used_slots[pcm-&gt;stream][cidx] &amp; (1 &lt;&lt; i)) {</div><div class='add'>+					err = -EBUSY;</div><div class='add'>+					goto error;</div><div class='add'>+				}</div><div class='add'>+				if (pcm-&gt;r[r].rslots[cidx] &amp; (1 &lt;&lt; i)) {</div><div class='add'>+					bus-&gt;used_slots[pcm-&gt;stream][cidx] |= (1 &lt;&lt; i);</div><div class='add'>+					ok_flag++;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-			if (pcm-&gt;r[r].rslots[cidx] &amp; (1 &lt;&lt; i)) {</div><div class='del'>-				bus-&gt;used_slots[pcm-&gt;stream][cidx] |= (1 &lt;&lt; i);</div><div class='del'>-				ok_flag++;</div><div class='add'>+			if (!ok_flag) {</div><div class='add'>+				dev_err(bus-&gt;card-&gt;dev,</div><div class='add'>+					"cannot find configuration for AC97 slot %i\n",</div><div class='add'>+					i);</div><div class='add'>+				err = -EAGAIN;</div><div class='add'>+				goto error;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (!ok_flag) {</div><div class='del'>-			spin_unlock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='del'>-			snd_printk(KERN_ERR "cannot find configuration for AC97 slot %i\n", i);</div><div class='del'>-			err = -EAGAIN;</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='add'>+		pcm-&gt;cur_dbl = r;</div><div class='ctx'> 	}</div><div class='del'>-	pcm-&gt;cur_dbl = r;</div><div class='del'>-	spin_unlock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='ctx'> 	for (i = 3; i &lt; 12; i++) {</div><div class='ctx'> 		if (!(slots &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -613,15 +602,20 @@ int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,</div><div class='ctx'> 			if (pcm-&gt;r[r].rslots[cidx] &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 				reg = get_slot_reg(pcm, cidx, i, r);</div><div class='ctx'> 				if (reg == 0xff) {</div><div class='del'>-					snd_printk(KERN_ERR "invalid AC97 slot %i?\n", i);</div><div class='add'>+					dev_err(bus-&gt;card-&gt;dev,</div><div class='add'>+						"invalid AC97 slot %i?\n", i);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (reg_ok[cidx] &amp; (1 &lt;&lt; (reg - AC97_PCM_FRONT_DAC_RATE)))</div><div class='ctx'> 					continue;</div><div class='del'>-				//printk(KERN_DEBUG "setting ac97 reg 0x%x to rate %d\n", reg, rate);</div><div class='add'>+				dev_dbg(bus-&gt;card-&gt;dev,</div><div class='add'>+					"setting ac97 reg 0x%x to rate %d\n",</div><div class='add'>+					reg, rate);</div><div class='ctx'> 				err = snd_ac97_set_rate(pcm-&gt;r[r].codec[cidx], reg, rate);</div><div class='ctx'> 				if (err &lt; 0)</div><div class='del'>-					snd_printk(KERN_ERR "error in snd_ac97_set_rate: cidx=%d, reg=0x%x, rate=%d, err=%d\n", cidx, reg, rate, err);</div><div class='add'>+					dev_err(bus-&gt;card-&gt;dev,</div><div class='add'>+						"error in snd_ac97_set_rate: cidx=%d, reg=0x%x, rate=%d, err=%d\n",</div><div class='add'>+						cidx, reg, rate, err);</div><div class='ctx'> 				else</div><div class='ctx'> 					reg_ok[cidx] |= (1 &lt;&lt; (reg - AC97_PCM_FRONT_DAC_RATE));</div><div class='ctx'> 			}</div><div class='hunk'>@@ -643,6 +637,8 @@ EXPORT_SYMBOL(snd_ac97_pcm_open);</div><div class='ctx'>  * @pcm: the ac97 pcm instance</div><div class='ctx'>  *</div><div class='ctx'>  * It frees the locked AC97 slots.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_pcm_close(struct ac97_pcm *pcm)</div><div class='ctx'> {</div><div class='hunk'>@@ -666,7 +662,7 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	bus = pcm-&gt;bus;</div><div class='del'>-	spin_lock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='ctx'> 	for (i = 3; i &lt; 12; i++) {</div><div class='ctx'> 		if (!(slots &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -675,7 +671,6 @@ int snd_ac97_pcm_close(struct ac97_pcm *pcm)</div><div class='ctx'> 	}</div><div class='ctx'> 	pcm-&gt;aslots = 0;</div><div class='ctx'> 	pcm-&gt;cur_dbl = 0;</div><div class='del'>-	spin_unlock_irq(&amp;pcm-&gt;bus-&gt;bus_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -717,6 +712,8 @@ static int double_rate_hw_constraint_channels(struct snd_pcm_hw_params *params,</div><div class='ctx'>  *</div><div class='ctx'>  * Installs the hardware constraint rules to prevent using double rates and</div><div class='ctx'>  * more than two channels at the same time.</div><div class='add'>+ *</div><div class='add'>+ * Return: Zero if successful, or a negative error code on failure.</div><div class='ctx'>  */</div><div class='ctx'> int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime)</div><div class='ctx'> {</div><div class='head'>diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c<br/>index 6320bf084e47..1c9d76994b3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_proc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ac97/ac97_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ac97/ac97_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ac97/ac97_proc.c</a></div><div class='hunk'>@@ -1,25 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal interface for Audio Codec '97</div><div class='ctx'>  *</div><div class='ctx'>  *  For more details look to AC '97 component specification revision 2.2</div><div class='ctx'>  *  by Intel Corporation (http://developer.intel.com).</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='hunk'>@@ -113,7 +98,7 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe</div><div class='ctx'> 	static const char *spdif_rates_cs4205[4] = { " Rate=48kHz", " Rate=44.1kHz", " Rate=res", " Rate=res" };</div><div class='ctx'> 	static const char *double_rate_slots[4] = { "10/11", "7/8", "reserved", "reserved" };</div><div class='ctx'> </div><div class='del'>-	snd_ac97_get_name(NULL, ac97-&gt;id, name, 0);</div><div class='add'>+	snd_ac97_get_name(NULL, ac97-&gt;id, name, sizeof(name), 0);</div><div class='ctx'> 	snd_iprintf(buffer, "%d-%d/%d: %s\n\n", ac97-&gt;addr, ac97-&gt;num, subidx, name);</div><div class='ctx'> </div><div class='ctx'> 	if ((ac97-&gt;scaps &amp; AC97_SCAP_AUDIO) == 0)</div><div class='hunk'>@@ -176,12 +161,12 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe</div><div class='ctx'> 		    "Mic select       : %s\n"</div><div class='ctx'> 		    "ADC/DAC loopback : %s\n",</div><div class='ctx'> 		    val &amp; 0x8000 ? "post" : "pre",</div><div class='del'>-		    val &amp; 0x4000 ? "on" : "off",</div><div class='del'>-		    val &amp; 0x2000 ? "on" : "off",</div><div class='del'>-		    val &amp; 0x1000 ? "on" : "off",</div><div class='add'>+		    str_on_off(val &amp; 0x4000),</div><div class='add'>+		    str_on_off(val &amp; 0x2000),</div><div class='add'>+		    str_on_off(val &amp; 0x1000),</div><div class='ctx'> 		    val &amp; 0x0200 ? "Mic" : "MIX",</div><div class='ctx'> 		    val &amp; 0x0100 ? "Mic2" : "Mic1",</div><div class='del'>-		    val &amp; 0x0080 ? "on" : "off");</div><div class='add'>+		    str_on_off(val &amp; 0x0080));</div><div class='ctx'> 	if (ac97-&gt;ext_id &amp; AC97_EI_DRA)</div><div class='ctx'> 		snd_iprintf(buffer, "Double rate slots: %s\n",</div><div class='ctx'> 			    double_rate_slots[(val &gt;&gt; 10) &amp; 3]);</div><div class='hunk'>@@ -344,7 +329,7 @@ static void snd_ac97_proc_read(struct snd_info_entry *entry, struct snd_info_buf</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97 *ac97 = entry-&gt;private_data;</div><div class='ctx'> 	</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	if ((ac97-&gt;id &amp; 0xffffff40) == AC97_ID_AD1881) {	// Analog Devices AD1881/85/86</div><div class='ctx'> 		int idx;</div><div class='ctx'> 		for (idx = 0; idx &lt; 3; idx++)</div><div class='hunk'>@@ -370,7 +355,6 @@ static void snd_ac97_proc_read(struct snd_info_entry *entry, struct snd_info_buf</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_ac97_proc_read_main(ac97, buffer, 0);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='hunk'>@@ -380,7 +364,8 @@ static void snd_ac97_proc_regs_write(struct snd_info_entry *entry, struct snd_in</div><div class='ctx'> 	struct snd_ac97 *ac97 = entry-&gt;private_data;</div><div class='ctx'> 	char line[64];</div><div class='ctx'> 	unsigned int reg, val;</div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		if (sscanf(line, "%x %x", &amp;reg, &amp;val) != 2)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -388,7 +373,6 @@ static void snd_ac97_proc_regs_write(struct snd_info_entry *entry, struct snd_in</div><div class='ctx'> 		if (reg &lt; 0x80 &amp;&amp; (reg &amp; 1) == 0 &amp;&amp; val &lt;= 0xffff)</div><div class='ctx'> 			snd_ac97_write_cache(ac97, reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +391,7 @@ static void snd_ac97_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97 *ac97 = entry-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ac97-&gt;page_mutex);</div><div class='add'>+	guard(mutex)(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> 	if ((ac97-&gt;id &amp; 0xffffff40) == AC97_ID_AD1881) {	// Analog Devices AD1881/85/86</div><div class='ctx'> </div><div class='ctx'> 		int idx;</div><div class='hunk'>@@ -423,7 +407,6 @@ static void snd_ac97_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_ac97_proc_regs_read_main(ac97, buffer, 0);</div><div class='ctx'> 	}	</div><div class='del'>-	mutex_unlock(&amp;ac97-&gt;page_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_ac97_proc_init(struct snd_ac97 * ac97)</div><div class='hunk'>@@ -436,25 +419,20 @@ void snd_ac97_proc_init(struct snd_ac97 * ac97)</div><div class='ctx'> 		return;</div><div class='ctx'> 	prefix = ac97_is_audio(ac97) ? "ac97" : "mc97";</div><div class='ctx'> 	sprintf(name, "%s#%d-%d", prefix, ac97-&gt;addr, ac97-&gt;num);</div><div class='del'>-	if ((entry = snd_info_create_card_entry(ac97-&gt;bus-&gt;card, name, ac97-&gt;bus-&gt;proc)) != NULL) {</div><div class='add'>+	entry = snd_info_create_card_entry(ac97-&gt;bus-&gt;card, name,</div><div class='add'>+					   ac97-&gt;bus-&gt;proc);</div><div class='add'>+	if (entry)</div><div class='ctx'> 		snd_info_set_text_ops(entry, ac97, snd_ac97_proc_read);</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	ac97-&gt;proc = entry;</div><div class='ctx'> 	sprintf(name, "%s#%d-%d+regs", prefix, ac97-&gt;addr, ac97-&gt;num);</div><div class='del'>-	if ((entry = snd_info_create_card_entry(ac97-&gt;bus-&gt;card, name, ac97-&gt;bus-&gt;proc)) != NULL) {</div><div class='add'>+	entry = snd_info_create_card_entry(ac97-&gt;bus-&gt;card, name,</div><div class='add'>+					   ac97-&gt;bus-&gt;proc);</div><div class='add'>+	if (entry) {</div><div class='ctx'> 		snd_info_set_text_ops(entry, ac97, snd_ac97_proc_regs_read);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='add'>+		entry-&gt;mode |= 0200;</div><div class='ctx'> 		entry-&gt;c.text.write = snd_ac97_proc_regs_write;</div><div class='ctx'> #endif</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ac97-&gt;proc_regs = entry;</div><div class='ctx'> }</div><div class='hunk'>@@ -473,13 +451,10 @@ void snd_ac97_bus_proc_init(struct snd_ac97_bus * bus)</div><div class='ctx'> 	char name[32];</div><div class='ctx'> </div><div class='ctx'> 	sprintf(name, "codec97#%d", bus-&gt;num);</div><div class='del'>-	if ((entry = snd_info_create_card_entry(bus-&gt;card, name, bus-&gt;card-&gt;proc_root)) != NULL) {</div><div class='del'>-		entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	entry = snd_info_create_card_entry(bus-&gt;card, name,</div><div class='add'>+					   bus-&gt;card-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='add'>+		entry-&gt;mode = S_IFDIR | 0555;</div><div class='ctx'> 	bus-&gt;proc = entry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c<br/>index 4382d0fa6b9a..f4ec404c0d15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ad1889.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ad1889.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ad1889.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ad1889.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* Analog Devices 1889 audio driver</div><div class='ctx'>  *</div><div class='ctx'>  * This is a driver for the AD1889 PCI audio chipset found</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'>  * Copyright (C) 2005, Thibaut Varene &lt;varenet@parisc-linux.org&gt;</div><div class='ctx'>  *   Based on the OSS AD1889 driver by Randolph Chung &lt;tausq@debian.org&gt;</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>- *</div><div class='ctx'>  * TODO:</div><div class='ctx'>  *	Do we need to take care of CCS register?</div><div class='ctx'>  *	Maybe we could use finer grained locking (separate locks for pb/cap)?</div><div class='hunk'>@@ -29,7 +17,7 @@</div><div class='ctx'>  *	PM support</div><div class='ctx'>  *	MIDI support</div><div class='ctx'>  *	Game Port support</div><div class='del'>- *	SG DMA support (this will need *alot* of work)</div><div class='add'>+ *	SG DMA support (this will need *a lot* of work)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -39,14 +27,14 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/compiler.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #include "ad1889.h"</div><div class='ctx'> #include "ac97/ac97_id.h"</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +43,6 @@</div><div class='ctx'> MODULE_AUTHOR("Kyle McMartin &lt;kyle@parisc-linux.org&gt;, Thibaut Varene &lt;t-bone@parisc-linux.org&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -65,7 +52,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='ctx'> module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for the AD1889 soundcard.");</div><div class='ctx'> </div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable AD1889 soundcard.");</div><div class='ctx'> </div><div class='hunk'>@@ -76,9 +63,6 @@ MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");</div><div class='ctx'> #define DEVNAME "ad1889"</div><div class='ctx'> #define PFX	DEVNAME ": "</div><div class='ctx'> </div><div class='del'>-/* let's use the global sound debug interfaces */</div><div class='del'>-#define ad1889_debug(fmt, arg...) snd_printd(KERN_DEBUG fmt, ## arg)</div><div class='del'>-</div><div class='ctx'> /* keep track of some hw registers */</div><div class='ctx'> struct ad1889_register_state {</div><div class='ctx'> 	u16 reg;	/* reg setup */</div><div class='hunk'>@@ -261,32 +245,18 @@ snd_ad1889_ac97_ready(struct snd_ad1889 *chip)</div><div class='ctx'> 	</div><div class='ctx'> 	while (!(ad1889_readw(chip, AD_AC97_ACIC) &amp; AD_AC97_ACIC_ACRDY) </div><div class='ctx'> 			&amp;&amp; --retry)</div><div class='del'>-		mdelay(1);</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='ctx'> 	if (!retry) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n",</div><div class='del'>-		       __func__);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "[%s] Link is not ready.\n",</div><div class='add'>+			__func__);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	ad1889_debug("[%s] ready after %d ms\n", __func__, 400 - retry);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "[%s] ready after %d ms\n", __func__, 400 - retry);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int </div><div class='del'>-snd_ad1889_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, </div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_ad1889_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware snd_ad1889_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ad1889_playback_hw = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='hunk'>@@ -303,7 +273,7 @@ static struct snd_pcm_hardware snd_ad1889_playback_hw = {</div><div class='ctx'> 	/*.fifo_size = 0,*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ad1889_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ad1889_capture_hw = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,</div><div class='ctx'> 	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='hunk'>@@ -383,7 +353,7 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)</div><div class='ctx'> 		reg |= AD_DS_WSMC_WAST;</div><div class='ctx'> </div><div class='ctx'> 	/* let's make sure we don't clobber ourselves */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	</div><div class='ctx'> 	chip-&gt;wave.size = size;</div><div class='ctx'> 	chip-&gt;wave.reg = reg;</div><div class='hunk'>@@ -402,11 +372,9 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)</div><div class='ctx'> 	/* writes flush */</div><div class='ctx'> 	ad1889_readw(chip, AD_DS_WSMC);</div><div class='ctx'> 	</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	</div><div class='del'>-	ad1889_debug("prepare playback: addr = 0x%x, count = %u, "</div><div class='del'>-			"size = %u, reg = 0x%x, rate = %u\n", chip-&gt;wave.addr,</div><div class='del'>-			count, size, reg, rt-&gt;rate);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"prepare playback: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",</div><div class='add'>+		chip-&gt;wave.addr, count, size, reg, rt-&gt;rate);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -433,7 +401,7 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)</div><div class='ctx'> 		reg |= AD_DS_RAMC_ADST;</div><div class='ctx'> </div><div class='ctx'> 	/* let's make sure we don't clobber ourselves */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	</div><div class='ctx'> 	chip-&gt;ramc.size = size;</div><div class='ctx'> 	chip-&gt;ramc.reg = reg;</div><div class='hunk'>@@ -449,11 +417,9 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)</div><div class='ctx'> 	/* writes flush */</div><div class='ctx'> 	ad1889_readw(chip, AD_DS_RAMC);</div><div class='ctx'> 	</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	</div><div class='del'>-	ad1889_debug("prepare capture: addr = 0x%x, count = %u, "</div><div class='del'>-			"size = %u, reg = 0x%x, rate = %u\n", chip-&gt;ramc.addr,</div><div class='del'>-			count, size, reg, rt-&gt;rate);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"prepare capture: addr = 0x%x, count = %u, size = %u, reg = 0x%x, rate = %u\n",</div><div class='add'>+		chip-&gt;ramc.addr, count, size, reg, rt-&gt;rate);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -574,23 +540,17 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss)</div><div class='ctx'> 	return bytes_to_frames(ss-&gt;runtime, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ad1889_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ad1889_playback_ops = {</div><div class='ctx'> 	.open = snd_ad1889_playback_open,</div><div class='ctx'> 	.close = snd_ad1889_playback_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_ad1889_hw_params,</div><div class='del'>-	.hw_free = snd_ad1889_hw_free,</div><div class='ctx'> 	.prepare = snd_ad1889_playback_prepare,</div><div class='ctx'> 	.trigger = snd_ad1889_playback_trigger,</div><div class='ctx'> 	.pointer = snd_ad1889_playback_pointer, </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ad1889_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ad1889_capture_ops = {</div><div class='ctx'> 	.open = snd_ad1889_capture_open,</div><div class='ctx'> 	.close = snd_ad1889_capture_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_ad1889_hw_params,</div><div class='del'>-	.hw_free = snd_ad1889_hw_free,</div><div class='ctx'> 	.prepare = snd_ad1889_capture_prepare,</div><div class='ctx'> 	.trigger = snd_ad1889_capture_trigger,</div><div class='ctx'> 	.pointer = snd_ad1889_capture_pointer, </div><div class='hunk'>@@ -613,7 +573,8 @@ snd_ad1889_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (st &amp; (AD_DMA_DISR_PMAI|AD_DMA_DISR_PTAI))</div><div class='del'>-		ad1889_debug("Unexpected master or target abort interrupt!\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Unexpected master or target abort interrupt!\n");</div><div class='ctx'> </div><div class='ctx'> 	if ((st &amp; AD_DMA_DISR_WAVI) &amp;&amp; chip-&gt;psubs)</div><div class='ctx'> 		snd_pcm_period_elapsed(chip-&gt;psubs);</div><div class='hunk'>@@ -623,15 +584,12 @@ snd_ad1889_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='del'>-snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm)</div><div class='add'>+static int</div><div class='add'>+snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, chip-&gt;card-&gt;driver, device, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -643,25 +601,15 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> 	chip-&gt;psubs = NULL;</div><div class='ctx'> 	chip-&gt;csubs = NULL;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-						BUFFER_BYTES_MAX / 2,</div><div class='del'>-						BUFFER_BYTES_MAX);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       BUFFER_BYTES_MAX / 2, BUFFER_BYTES_MAX);</div><div class='ctx'> </div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR PFX "buffer allocation error: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -674,7 +622,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> </div><div class='ctx'> 	reg = ad1889_readw(chip, AD_DS_WSMC);</div><div class='ctx'> 	snd_iprintf(buffer, "Wave output: %s\n",</div><div class='del'>-			(reg &amp; AD_DS_WSMC_WAEN) ? "enabled" : "disabled");</div><div class='add'>+			str_enabled_disabled(reg &amp; AD_DS_WSMC_WAEN));</div><div class='ctx'> 	snd_iprintf(buffer, "Wave Channels: %s\n",</div><div class='ctx'> 			(reg &amp; AD_DS_WSMC_WAST) ? "stereo" : "mono");</div><div class='ctx'> 	snd_iprintf(buffer, "Wave Quality: %d-bit linear\n",</div><div class='hunk'>@@ -682,7 +630,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> 	</div><div class='ctx'> 	/* WARQ is at offset 12 */</div><div class='ctx'> 	tmp = (reg &amp; AD_DS_WSMC_WARQ) ?</div><div class='del'>-			(((reg &amp; AD_DS_WSMC_WARQ &gt;&gt; 12) &amp; 0x01) ? 12 : 18) : 4;</div><div class='add'>+		((((reg &amp; AD_DS_WSMC_WARQ) &gt;&gt; 12) &amp; 0x01) ? 12 : 18) : 4;</div><div class='ctx'> 	tmp /= (reg &amp; AD_DS_WSMC_WAST) ? 2 : 1;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "Wave FIFO: %d %s words\n\n", tmp,</div><div class='hunk'>@@ -690,11 +638,11 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> 				</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "Synthesis output: %s\n",</div><div class='del'>-			reg &amp; AD_DS_WSMC_SYEN ? "enabled" : "disabled");</div><div class='add'>+			str_enabled_disabled(reg &amp; AD_DS_WSMC_SYEN));</div><div class='ctx'> 	</div><div class='ctx'> 	/* SYRQ is at offset 4 */</div><div class='ctx'> 	tmp = (reg &amp; AD_DS_WSMC_SYRQ) ?</div><div class='del'>-			(((reg &amp; AD_DS_WSMC_SYRQ &gt;&gt; 4) &amp; 0x01) ? 12 : 18) : 4;</div><div class='add'>+		((((reg &amp; AD_DS_WSMC_SYRQ) &gt;&gt; 4) &amp; 0x01) ? 12 : 18) : 4;</div><div class='ctx'> 	tmp /= (reg &amp; AD_DS_WSMC_WAST) ? 2 : 1;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "Synthesis FIFO: %d %s words\n\n", tmp,</div><div class='hunk'>@@ -702,7 +650,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> </div><div class='ctx'> 	reg = ad1889_readw(chip, AD_DS_RAMC);</div><div class='ctx'> 	snd_iprintf(buffer, "ADC input: %s\n",</div><div class='del'>-			(reg &amp; AD_DS_RAMC_ADEN) ? "enabled" : "disabled");</div><div class='add'>+			str_enabled_disabled(reg &amp; AD_DS_RAMC_ADEN));</div><div class='ctx'> 	snd_iprintf(buffer, "ADC Channels: %s\n",</div><div class='ctx'> 			(reg &amp; AD_DS_RAMC_ADST) ? "stereo" : "mono");</div><div class='ctx'> 	snd_iprintf(buffer, "ADC Quality: %d-bit linear\n",</div><div class='hunk'>@@ -710,18 +658,18 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> 	</div><div class='ctx'> 	/* ACRQ is at offset 4 */</div><div class='ctx'> 	tmp = (reg &amp; AD_DS_RAMC_ACRQ) ?</div><div class='del'>-			(((reg &amp; AD_DS_RAMC_ACRQ &gt;&gt; 4) &amp; 0x01) ? 12 : 18) : 4;</div><div class='add'>+		((((reg &amp; AD_DS_RAMC_ACRQ) &gt;&gt; 4) &amp; 0x01) ? 12 : 18) : 4;</div><div class='ctx'> 	tmp /= (reg &amp; AD_DS_RAMC_ADST) ? 2 : 1;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "ADC FIFO: %d %s words\n\n", tmp,</div><div class='ctx'> 			(reg &amp; AD_DS_RAMC_ADST) ? "stereo" : "mono");</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "Resampler input: %s\n",</div><div class='del'>-			reg &amp; AD_DS_RAMC_REEN ? "enabled" : "disabled");</div><div class='add'>+			str_enabled_disabled(reg &amp; AD_DS_RAMC_REEN));</div><div class='ctx'> 			</div><div class='ctx'> 	/* RERQ is at offset 12 */</div><div class='ctx'> 	tmp = (reg &amp; AD_DS_RAMC_RERQ) ?</div><div class='del'>-			(((reg &amp; AD_DS_RAMC_RERQ &gt;&gt; 12) &amp; 0x01) ? 12 : 18) : 4;</div><div class='add'>+		((((reg &amp; AD_DS_RAMC_RERQ) &gt;&gt; 12) &amp; 0x01) ? 12 : 18) : 4;</div><div class='ctx'> 	tmp /= (reg &amp; AD_DS_RAMC_ADST) ? 2 : 1;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "Resampler FIFO: %d %s words\n\n", tmp,</div><div class='hunk'>@@ -738,7 +686,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> 	reg = ad1889_readw(chip, AD_DS_WADA);</div><div class='ctx'> 	snd_iprintf(buffer, "Right: %s, -%d dB\n",</div><div class='ctx'> 			(reg &amp; AD_DS_WADA_RWAM) ? "mute" : "unmute",</div><div class='del'>-			((reg &amp; AD_DS_WADA_RWAA) &gt;&gt; 8) * 3);</div><div class='add'>+			(reg &amp; AD_DS_WADA_RWAA) * 3);</div><div class='ctx'> 	</div><div class='ctx'> 	reg = ad1889_readw(chip, AD_DS_WAS);</div><div class='ctx'> 	snd_iprintf(buffer, "Wave samplerate: %u Hz\n", reg);</div><div class='hunk'>@@ -746,16 +694,14 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe</div><div class='ctx'> 	snd_iprintf(buffer, "Resampler samplerate: %u Hz\n", reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_ad1889_proc_init(struct snd_ad1889 *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(chip-&gt;card, chip-&gt;card-&gt;driver, &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_ad1889_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, chip-&gt;card-&gt;driver,</div><div class='add'>+			     chip, snd_ad1889_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ac97_quirk ac97_quirks[] = {</div><div class='add'>+static const struct ac97_quirk ac97_quirks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = 0x11d4,	/* AD */</div><div class='ctx'> 		.subdevice = 0x1889,	/* AD1889 */</div><div class='hunk'>@@ -766,7 +712,7 @@ static struct ac97_quirk ac97_quirks[] = {</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_ad1889_ac97_xinit(struct snd_ad1889 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -790,26 +736,12 @@ snd_ad1889_ac97_xinit(struct snd_ad1889 *chip)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-snd_ad1889_ac97_bus_free(struct snd_ac97_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct snd_ad1889 *chip = bus-&gt;private_data;</div><div class='del'>-	chip-&gt;ac97_bus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-snd_ad1889_ac97_free(struct snd_ac97 *ac97)</div><div class='del'>-{</div><div class='del'>-	struct snd_ad1889 *chip = ac97-&gt;private_data;</div><div class='del'>-	chip-&gt;ac97 = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_ad1889_ac97_write,</div><div class='ctx'> 		.read = snd_ad1889_ac97_read,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -821,11 +753,8 @@ snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	</div><div class='del'>-	chip-&gt;ac97_bus-&gt;private_free = snd_ad1889_ac97_bus_free;</div><div class='del'>-</div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='del'>-	ac97.private_free = snd_ad1889_ac97_free;</div><div class='ctx'> 	ac97.pci = chip-&gt;pci;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='hunk'>@@ -837,13 +766,12 @@ snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_ad1889_free(struct snd_ad1889 *chip)</div><div class='add'>+static void</div><div class='add'>+snd_ad1889_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (chip-&gt;irq &lt; 0)</div><div class='del'>-		goto skip_hw;</div><div class='add'>+	struct snd_ad1889 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ad1889_mute(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -853,133 +781,64 @@ snd_ad1889_free(struct snd_ad1889 *chip)</div><div class='ctx'> 	/* clear DISR. If we don't, we'd better jump off the Eiffel Tower */</div><div class='ctx'> 	ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PTAI | AD_DMA_DISR_PMAI);</div><div class='ctx'> 	ad1889_readl(chip, AD_DMA_DISR);	/* flush, dammit! */</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-</div><div class='del'>-skip_hw:</div><div class='del'>-	if (chip-&gt;iobase)</div><div class='del'>-		iounmap(chip-&gt;iobase);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_ad1889_dev_free(struct snd_device *device) </div><div class='del'>-{</div><div class='del'>-	struct snd_ad1889 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_ad1889_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ad1889_init(struct snd_ad1889 *chip) </div><div class='del'>-{</div><div class='del'>-	ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */</div><div class='del'>-	ad1889_readw(chip, AD_DS_CCS);	/* flush posted write */</div><div class='del'>-</div><div class='del'>-	mdelay(10);</div><div class='del'>-</div><div class='del'>-	/* enable Master and Target abort interrupts */</div><div class='del'>-	ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PMAE | AD_DMA_DISR_PTAE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit</div><div class='del'>-snd_ad1889_create(struct snd_card *card,</div><div class='del'>-		  struct pci_dev *pci,</div><div class='del'>-		  struct snd_ad1889 **rchip)</div><div class='add'>+snd_ad1889_create(struct snd_card *card, struct pci_dev *pci)</div><div class='ctx'> {</div><div class='add'>+	struct snd_ad1889 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	struct snd_ad1889 *chip;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_ad1889_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* check PCI availability (32bit DMA) */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+		dev_err(card-&gt;dev, "error setting 32-bit DMA mask.\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* allocate chip specific data with zero-filled memory */</div><div class='del'>-	if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* (1) PCI resource allocation */</div><div class='del'>-	if ((err = pci_request_regions(pci, card-&gt;driver)) &lt; 0)</div><div class='del'>-		goto free_and_ret;</div><div class='add'>+	chip-&gt;iobase = pcim_iomap_region(pci, 0, card-&gt;driver);</div><div class='add'>+	if (IS_ERR(chip-&gt;iobase))</div><div class='add'>+		return PTR_ERR(chip-&gt;iobase);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;bar = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;iobase = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (chip-&gt;iobase == NULL) {</div><div class='del'>-		printk(KERN_ERR PFX "unable to reserve region.\n");</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto free_and_ret;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;lock);	/* only now can we call ad1889_free */</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_ad1889_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;driver, chip)) {</div><div class='del'>-		printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_ad1889_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_ad1889_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "cannot obtain IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_ad1889_free;</div><div class='ctx'> </div><div class='ctx'> 	/* (2) initialization of the chip hardware */</div><div class='del'>-	if ((err = snd_ad1889_init(chip)) &lt; 0) {</div><div class='del'>-		snd_ad1889_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_ad1889_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */</div><div class='add'>+	ad1889_readw(chip, AD_DS_CCS);	/* flush posted write */</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='add'>+	usleep_range(10000, 11000);</div><div class='ctx'> </div><div class='del'>-	*rchip = chip;</div><div class='add'>+	/* enable Master and Target abort interrupts */</div><div class='add'>+	ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PMAE | AD_DMA_DISR_PTAE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-free_and_ret:</div><div class='del'>-	kfree(chip);</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='del'>-snd_ad1889_probe(struct pci_dev *pci,</div><div class='del'>-		 const struct pci_device_id *pci_id)</div><div class='add'>+static int</div><div class='add'>+__snd_ad1889_probe(struct pci_dev *pci,</div><div class='add'>+		   const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	static int devno;</div><div class='hunk'>@@ -995,18 +854,19 @@ snd_ad1889_probe(struct pci_dev *pci,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* (2) */</div><div class='del'>-	err = snd_card_create(index[devno], id[devno], THIS_MODULE, 0, &amp;card);</div><div class='del'>-	/* XXX REVISIT: we can probably allocate chip in this call */</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[devno], id[devno], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "AD1889");</div><div class='del'>-	strcpy(card-&gt;shortname, "Analog Devices AD1889");</div><div class='add'>+	strscpy(card-&gt;driver, "AD1889");</div><div class='add'>+	strscpy(card-&gt;shortname, "Analog Devices AD1889");</div><div class='ctx'> </div><div class='ctx'> 	/* (3) */</div><div class='del'>-	err = snd_ad1889_create(card, pci, &amp;chip);</div><div class='add'>+	err = snd_ad1889_create(card, pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto free_and_ret;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* (4) */</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='hunk'>@@ -1016,11 +876,11 @@ snd_ad1889_probe(struct pci_dev *pci,</div><div class='ctx'> 	/* register AC97 mixer */</div><div class='ctx'> 	err = snd_ad1889_ac97_init(chip, ac97_quirk[devno]);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto free_and_ret;</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='del'>-	err = snd_ad1889_pcm_init(chip, 0, NULL);</div><div class='add'>+	err = snd_ad1889_pcm_init(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto free_and_ret;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* register proc interface */</div><div class='ctx'> 	snd_ad1889_proc_init(chip);</div><div class='hunk'>@@ -1028,50 +888,31 @@ snd_ad1889_probe(struct pci_dev *pci,</div><div class='ctx'> 	/* (6) */</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto free_and_ret;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* (7) */</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> </div><div class='ctx'> 	devno++;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-free_and_ret:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit</div><div class='del'>-snd_ad1889_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_ad1889_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_ad1889_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_ad1889_ids) = {</div><div class='add'>+static const struct pci_device_id snd_ad1889_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) },</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ad1889_pci_driver = {</div><div class='del'>-	.name = "AD1889 Audio",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_ad1889_ids,</div><div class='ctx'> 	.probe = snd_ad1889_probe,</div><div class='del'>-	.remove = __devexit_p(snd_ad1889_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-alsa_ad1889_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;ad1889_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-alsa_ad1889_fini(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;ad1889_pci_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_ad1889_init);</div><div class='del'>-module_exit(alsa_ad1889_fini);</div><div class='add'>+module_pci_driver(ad1889_pci_driver);</div><div class='head'>diff --git a/sound/pci/ad1889.h b/sound/pci/ad1889.h<br/>index 5e6dad5341a1..d6e8d6c19adc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ad1889.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ad1889.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ad1889.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ad1889.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Analog Devices 1889 audio driver</div><div class='ctx'>  * Copyright (C) 2004, Kyle McMartin &lt;kyle@parisc-linux.org&gt;</div><div class='ctx'>  */</div><div class='head'>diff --git a/sound/pci/ak4531_codec.c b/sound/pci/ak4531_codec.c<br/>index fd135e3d8a84..cdad47e4098d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ak4531_codec.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ak4531_codec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ak4531_codec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ak4531_codec.c</a></div><div class='hunk'>@@ -1,28 +1,14 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Universal routines for AK4531 codec</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/ak4531_codec.h&gt;</div><div class='hunk'>@@ -34,11 +20,7 @@ MODULE_DESCRIPTION("Universal routines for AK4531 codec");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531);</div><div class='del'>-#else</div><div class='del'>-#define snd_ak4531_proc_init(card,ak)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='hunk'>@@ -95,9 +77,8 @@ static int snd_ak4531_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	val = (ak4531-&gt;regs[reg] &gt;&gt; shift) &amp; mask;</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -120,11 +101,10 @@ static int snd_ak4531_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 		val = mask - val;</div><div class='ctx'> 	}</div><div class='ctx'> 	val &lt;&lt;= shift;</div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	val = (ak4531-&gt;regs[reg] &amp; ~(mask &lt;&lt; shift)) | val;</div><div class='ctx'> 	change = val != ak4531-&gt;regs[reg];</div><div class='ctx'> 	ak4531-&gt;write(ak4531, reg, ak4531-&gt;regs[reg] = val);</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -164,10 +144,9 @@ static int snd_ak4531_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 22) &amp; 1;</div><div class='ctx'> 	int left, right;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	left = (ak4531-&gt;regs[left_reg] &gt;&gt; left_shift) &amp; mask;</div><div class='ctx'> 	right = (ak4531-&gt;regs[right_reg] &gt;&gt; right_shift) &amp; mask;</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	if (invert) {</div><div class='ctx'> 		left = mask - left;</div><div class='ctx'> 		right = mask - right;</div><div class='hunk'>@@ -197,7 +176,7 @@ static int snd_ak4531_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	}</div><div class='ctx'> 	left &lt;&lt;= left_shift;</div><div class='ctx'> 	right &lt;&lt;= right_shift;</div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	if (left_reg == right_reg) {</div><div class='ctx'> 		left = (ak4531-&gt;regs[left_reg] &amp; ~((mask &lt;&lt; left_shift) | (mask &lt;&lt; right_shift))) | left | right;</div><div class='ctx'> 		change = left != ak4531-&gt;regs[left_reg];</div><div class='hunk'>@@ -209,7 +188,6 @@ static int snd_ak4531_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 		ak4531-&gt;write(ak4531, left_reg, ak4531-&gt;regs[left_reg] = left);</div><div class='ctx'> 		ak4531-&gt;write(ak4531, right_reg, ak4531-&gt;regs[right_reg] = right);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,12 +214,11 @@ static int snd_ak4531_get_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	int left_shift = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0x0f;</div><div class='ctx'> 	int right_shift = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0x0f;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (ak4531-&gt;regs[reg1] &gt;&gt; left_shift) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (ak4531-&gt;regs[reg2] &gt;&gt; left_shift) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[2] = (ak4531-&gt;regs[reg1] &gt;&gt; right_shift) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[3] = (ak4531-&gt;regs[reg2] &gt;&gt; right_shift) &amp; 1;</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -255,7 +232,7 @@ static int snd_ak4531_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	int change;</div><div class='ctx'> 	int val1, val2;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ak4531-&gt;reg_mutex);</div><div class='add'>+	guard(mutex)(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	val1 = ak4531-&gt;regs[reg1] &amp; ~((1 &lt;&lt; left_shift) | (1 &lt;&lt; right_shift));</div><div class='ctx'> 	val2 = ak4531-&gt;regs[reg2] &amp; ~((1 &lt;&lt; left_shift) | (1 &lt;&lt; right_shift));</div><div class='ctx'> 	val1 |= (ucontrol-&gt;value.integer.value[0] &amp; 1) &lt;&lt; left_shift;</div><div class='hunk'>@@ -265,7 +242,6 @@ static int snd_ak4531_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	change = val1 != ak4531-&gt;regs[reg1] || val2 != ak4531-&gt;regs[reg2];</div><div class='ctx'> 	ak4531-&gt;write(ak4531, reg1, ak4531-&gt;regs[reg1] = val1);</div><div class='ctx'> 	ak4531-&gt;write(ak4531, reg2, ak4531-&gt;regs[reg2] = val2);</div><div class='del'>-	mutex_unlock(&amp;ak4531-&gt;reg_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -273,7 +249,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ak4531_controls[] = {</div><div class='ctx'> </div><div class='ctx'> AK4531_DOUBLE_TLV("Master Playback Switch", 0,</div><div class='ctx'> 		  AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1,</div><div class='hunk'>@@ -353,7 +329,7 @@ static int snd_ak4531_dev_free(struct snd_device *device)</div><div class='ctx'> 	return snd_ak4531_free(ak4531);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 snd_ak4531_initial_map[0x19 + 1] = {</div><div class='add'>+static const u8 snd_ak4531_initial_map[0x19 + 1] = {</div><div class='ctx'> 	0x9f,		/* 00: Master Volume Lch */</div><div class='ctx'> 	0x9f,		/* 01: Master Volume Rch */</div><div class='ctx'> 	0x9f,		/* 02: Voice Volume Lch */</div><div class='hunk'>@@ -382,14 +358,14 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = {</div><div class='ctx'> 	0x01		/* 19: Mic Amp Setup */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ak4531_mixer(struct snd_card *card,</div><div class='del'>-			       struct snd_ak4531 *_ak4531,</div><div class='del'>-			       struct snd_ak4531 **rak4531)</div><div class='add'>+int snd_ak4531_mixer(struct snd_card *card,</div><div class='add'>+		     struct snd_ak4531 *_ak4531,</div><div class='add'>+		     struct snd_ak4531 **rak4531)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_ak4531 *ak4531;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free =	snd_ak4531_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -402,11 +378,12 @@ int __devinit snd_ak4531_mixer(struct snd_card *card,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	*ak4531 = *_ak4531;</div><div class='ctx'> 	mutex_init(&amp;ak4531-&gt;reg_mutex);</div><div class='del'>-	if ((err = snd_component_add(card, "AK4531")) &lt; 0) {</div><div class='add'>+	err = snd_component_add(card, "AK4531");</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_ak4531_free(ak4531);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	strcpy(card-&gt;mixername, "Asahi Kasei AK4531");</div><div class='add'>+	strscpy(card-&gt;mixername, "Asahi Kasei AK4531");</div><div class='ctx'> 	ak4531-&gt;write(ak4531, AK4531_RESET, 0x03);	/* no RST, PD */</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> 	ak4531-&gt;write(ak4531, AK4531_CLOCK, 0x00);	/* CODEC ADC and CODEC DAC use {LR,B}CLK2 and run off LRCLK2 PLL */</div><div class='hunk'>@@ -416,13 +393,15 @@ int __devinit snd_ak4531_mixer(struct snd_card *card,</div><div class='ctx'> 		ak4531-&gt;write(ak4531, idx, ak4531-&gt;regs[idx] = snd_ak4531_initial_map[idx]);	/* recording source is mixer */</div><div class='ctx'> 	}</div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_ak4531_controls); idx++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ak4531_controls[idx], ak4531))) &lt; 0) {</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_ak4531_controls[idx], ak4531));</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			snd_ak4531_free(ak4531);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ak4531_proc_init(card, ak4531);</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &amp;ops)) &lt; 0) {</div><div class='add'>+	err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &amp;ops);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		snd_ak4531_free(ak4531);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -465,7 +444,6 @@ void snd_ak4531_resume(struct snd_ak4531 *ak4531)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * /proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -482,12 +460,8 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		    ak4531-&gt;regs[AK4531_MIC_GAIN] &amp; 1 ? "+30dB" : "+0dB");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(card, "ak4531", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(card, "ak4531", ak4531, snd_ak4531_proc_read);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/pci/ali5451/Makefile b/sound/pci/ali5451/Makefile<br/>index 713459c12d22..e319a4c1d6b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ali5451/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ali5451/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ali5451/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ali5451/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ali5451-objs := ali5451.o</div><div class='add'>+snd-ali5451-y := ali5451.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_ALI5451) += snd-ali5451.o</div><div class='head'>diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c<br/>index 5c6e322a48f0..571d89a6a8da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ali5451/ali5451.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ali5451/ali5451.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ali5451/ali5451.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ali5451/ali5451.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Matt Wu &lt;Matt_Wu@acersoftech.com.cn&gt;</div><div class='ctx'>  *  Apr 26, 2001</div><div class='hunk'>@@ -8,30 +9,15 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  TODO:</div><div class='ctx'>  *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public Lcodecnse as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the Lcodecnse, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public Lcodecnse for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public Lcodecnse</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -43,12 +29,11 @@</div><div class='ctx'> MODULE_AUTHOR("Matt Wu &lt;Matt_Wu@acersoftech.com.cn&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ALI M5451");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ALI,M5451,pci},{ALI,M5451}}");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;	/* Index */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='ctx'> static int pcm_channels = 32;</div><div class='del'>-static int spdif;</div><div class='add'>+static bool spdif;</div><div class='ctx'> </div><div class='ctx'> module_param(index, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for ALI M5451 PCI Audio.");</div><div class='hunk'>@@ -60,23 +45,11 @@ module_param(spdif, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(spdif, "Support SPDIF I/O");</div><div class='ctx'> </div><div class='ctx'> /* just for backward compatibility */</div><div class='del'>-static int enable;</div><div class='add'>+static bool enable;</div><div class='ctx'> module_param(enable, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  Debug part definitions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* #define ALI_DEBUG */</div><div class='del'>-</div><div class='del'>-#ifdef ALI_DEBUG</div><div class='del'>-#define snd_ali_printk(format, args...) printk(KERN_DEBUG format, ##args);</div><div class='del'>-#else</div><div class='del'>-#define snd_ali_printk(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *  Constants definition</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -270,12 +243,10 @@ struct snd_ali {</div><div class='ctx'> 	spinlock_t	reg_lock;</div><div class='ctx'> 	spinlock_t	voice_alloc;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	struct snd_ali_image *image;</div><div class='del'>-#endif</div><div class='add'>+	struct snd_ali_image image;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_ali_ids) = {</div><div class='add'>+static const struct pci_device_id snd_ali_ids[] = {</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0},</div><div class='ctx'> 	{0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -321,7 +292,7 @@ static int snd_ali_codec_ready(struct snd_ali *codec,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_ali_5451_poke(codec, port, res &amp; ~0x8000);</div><div class='del'>-	snd_printdd("ali_codec_ready: codec is not ready.\n ");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "ali_codec_ready: codec is not ready.\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +313,7 @@ static int snd_ali_stimer_ready(struct snd_ali *codec)</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "ali_stimer_read: stimer is not ready.\n");</div><div class='add'>+	dev_err(codec-&gt;card-&gt;dev, "ali_stimer_read: stimer is not ready.\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,7 +325,8 @@ static void snd_ali_codec_poke(struct snd_ali *codec,int secondary,</div><div class='ctx'> 	unsigned int port;</div><div class='ctx'> </div><div class='ctx'> 	if (reg &gt;= 0x80) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_codec_poke: reg(%xh) invalid.\n", reg);</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+			"ali_codec_poke: reg(%xh) invalid.\n", reg);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +357,8 @@ static unsigned short snd_ali_codec_peek(struct snd_ali *codec,</div><div class='ctx'> 	unsigned int port;</div><div class='ctx'> </div><div class='ctx'> 	if (reg &gt;= 0x80) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_codec_peek: reg(%xh) invalid.\n", reg);</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+			"ali_codec_peek: reg(%xh) invalid.\n", reg);</div><div class='ctx'> 		return ~0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +390,7 @@ static void snd_ali_codec_write(struct snd_ac97 *ac97,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali *codec = ac97-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("codec_write: reg=%xh data=%xh.\n", reg, val);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "codec_write: reg=%xh data=%xh.\n", reg, val);</div><div class='ctx'> 	if (reg == AC97_GPIO_STATUS) {</div><div class='ctx'> 		outl((val &lt;&lt; ALI_AC97_GPIO_DATA_SHIFT) | ALI_AC97_GPIO_ENABLE,</div><div class='ctx'> 		     ALI_REG(codec, ALI_AC97_GPIO));</div><div class='hunk'>@@ -433,7 +406,7 @@ static unsigned short snd_ali_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali *codec = ac97-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("codec_read reg=%xh.\n", reg);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "codec_read reg=%xh.\n", reg);</div><div class='ctx'> 	return snd_ali_codec_peek(codec, ac97-&gt;num, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -451,10 +424,10 @@ static int snd_ali_reset_5451(struct snd_ali *codec)</div><div class='ctx'> 	if (pci_dev) {</div><div class='ctx'> 		pci_read_config_dword(pci_dev, 0x7c, &amp;dwVal);</div><div class='ctx'> 		pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000);</div><div class='del'>-		udelay(5000);</div><div class='add'>+		mdelay(5);</div><div class='ctx'> 		pci_read_config_dword(pci_dev, 0x7c, &amp;dwVal);</div><div class='ctx'> 		pci_write_config_dword(pci_dev, 0x7c, dwVal &amp; 0xf7ffffff);</div><div class='del'>-		udelay(5000);</div><div class='add'>+		mdelay(5);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='ctx'> 	pci_dev = codec-&gt;pci;</div><div class='hunk'>@@ -463,18 +436,18 @@ static int snd_ali_reset_5451(struct snd_ali *codec)</div><div class='ctx'> 	udelay(500);</div><div class='ctx'> 	pci_read_config_dword(pci_dev, 0x44, &amp;dwVal);</div><div class='ctx'> 	pci_write_config_dword(pci_dev, 0x44, dwVal &amp; 0xfffbffff);</div><div class='del'>-	udelay(5000);</div><div class='add'>+	mdelay(5);</div><div class='ctx'> 	</div><div class='ctx'> 	wCount = 200;</div><div class='ctx'> 	while(wCount--) {</div><div class='ctx'> 		wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN);</div><div class='ctx'> 		if ((wReg &amp; 0x000f) == 0x000f)</div><div class='ctx'> 			return 0;</div><div class='del'>-		udelay(5000);</div><div class='add'>+		mdelay(5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* non-fatal if you have a non PM capable codec */</div><div class='del'>-	/* snd_printk(KERN_WARNING "ali5451: reset time out\n"); */</div><div class='add'>+	/* dev_warn(codec-&gt;card-&gt;dev, "ali5451: reset time out\n"); */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -528,7 +501,7 @@ static void snd_ali_disable_voice_irq(struct snd_ali *codec,</div><div class='ctx'> 	unsigned int mask;</div><div class='ctx'> 	struct snd_ali_channel_control *pchregs = &amp;(codec-&gt;chregs);</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("disable_voice_irq channel=%d\n",channel);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "disable_voice_irq channel=%d\n", channel);</div><div class='ctx'> </div><div class='ctx'> 	mask = 1 &lt;&lt; (channel &amp; 0x1f);</div><div class='ctx'> 	pchregs-&gt;data.ainten  = inl(ALI_REG(codec, pchregs-&gt;regs.ainten));</div><div class='hunk'>@@ -541,7 +514,7 @@ static int snd_ali_alloc_pcm_channel(struct snd_ali *codec, int channel)</div><div class='ctx'> 	unsigned int idx =  channel &amp; 0x1f;</div><div class='ctx'> </div><div class='ctx'> 	if (codec-&gt;synth.chcnt &gt;= ALI_CHANNELS){</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev,</div><div class='ctx'> 			   "ali_alloc_pcm_channel: no free channels.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -549,7 +522,7 @@ static int snd_ali_alloc_pcm_channel(struct snd_ali *codec, int channel)</div><div class='ctx'> 	if (!(codec-&gt;synth.chmap &amp; (1 &lt;&lt; idx))) {</div><div class='ctx'> 		codec-&gt;synth.chmap |= 1 &lt;&lt; idx;</div><div class='ctx'> 		codec-&gt;synth.chcnt++;</div><div class='del'>-		snd_ali_printk("alloc_pcm_channel no. %d.\n",idx);</div><div class='add'>+		dev_dbg(codec-&gt;card-&gt;dev, "alloc_pcm_channel no. %d.\n", idx);</div><div class='ctx'> 		return idx;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -1;</div><div class='hunk'>@@ -560,7 +533,8 @@ static int snd_ali_find_free_channel(struct snd_ali * codec, int rec)</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int result = -1;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("find_free_channel: for %s\n",rec ? "rec" : "pcm");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev,</div><div class='add'>+		"find_free_channel: for %s\n", rec ? "rec" : "pcm");</div><div class='ctx'> </div><div class='ctx'> 	/* recording */</div><div class='ctx'> 	if (rec) {</div><div class='hunk'>@@ -575,8 +549,8 @@ static int snd_ali_find_free_channel(struct snd_ali * codec, int rec)</div><div class='ctx'> 		if (result &gt;= 0)</div><div class='ctx'> 			return result;</div><div class='ctx'> 		else {</div><div class='del'>-			snd_printk(KERN_ERR "ali_find_free_channel: "</div><div class='del'>-				   "record channel is busy now.\n");</div><div class='add'>+			dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+				"ali_find_free_channel: record channel is busy now.\n");</div><div class='ctx'> 			return -1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -590,8 +564,8 @@ static int snd_ali_find_free_channel(struct snd_ali * codec, int rec)</div><div class='ctx'> 		if (result &gt;= 0)</div><div class='ctx'> 			return result;</div><div class='ctx'> 		else</div><div class='del'>-			snd_printk(KERN_ERR "ali_find_free_channel: "</div><div class='del'>-				   "S/PDIF out channel is in busy now.\n");</div><div class='add'>+			dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+				"ali_find_free_channel: S/PDIF out channel is in busy now.\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ALI_CHANNELS; idx++) {</div><div class='hunk'>@@ -599,7 +573,7 @@ static int snd_ali_find_free_channel(struct snd_ali * codec, int rec)</div><div class='ctx'> 		if (result &gt;= 0)</div><div class='ctx'> 			return result;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "ali_find_free_channel: no free channels.\n");</div><div class='add'>+	dev_err(codec-&gt;card-&gt;dev, "ali_find_free_channel: no free channels.\n");</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -607,14 +581,15 @@ static void snd_ali_free_channel_pcm(struct snd_ali *codec, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx = channel &amp; 0x0000001f;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("free_channel_pcm channel=%d\n",channel);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "free_channel_pcm channel=%d\n", channel);</div><div class='ctx'> </div><div class='ctx'> 	if (channel &lt; 0 || channel &gt;= ALI_CHANNELS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (!(codec-&gt;synth.chmap &amp; (1 &lt;&lt; idx))) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_free_channel_pcm: "</div><div class='del'>-			   "channel %d is not in use.\n", channel);</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+			"ali_free_channel_pcm: channel %d is not in use.\n",</div><div class='add'>+			channel);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		codec-&gt;synth.chmap &amp;= ~(1 &lt;&lt; idx);</div><div class='hunk'>@@ -626,7 +601,7 @@ static void snd_ali_stop_voice(struct snd_ali *codec, unsigned int channel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mask = 1 &lt;&lt; (channel &amp; 0x1f);</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("stop_voice: channel=%d\n",channel);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "stop_voice: channel=%d\n", channel);</div><div class='ctx'> 	outl(mask, ALI_REG(codec, codec-&gt;chregs.regs.stop));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -667,7 +642,7 @@ static void snd_ali_detect_spdif_rate(struct snd_ali *codec)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; 50000) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n");</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev, "ali_detect_spdif_rate: timeout!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -682,7 +657,7 @@ static void snd_ali_detect_spdif_rate(struct snd_ali *codec)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; 50000) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_detect_spdif_rate: timeout!\n");</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev, "ali_detect_spdif_rate: timeout!\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -855,12 +830,8 @@ static void snd_ali_disable_spdif_out(struct snd_ali *codec)</div><div class='ctx'> static void snd_ali_update_ptr(struct snd_ali *codec, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali_voice *pvoice;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	struct snd_ali_channel_control *pchregs;</div><div class='ctx'> 	unsigned int old, mask;</div><div class='del'>-#ifdef ALI_DEBUG</div><div class='del'>-	unsigned int temp, cspf;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	pchregs = &amp;(codec-&gt;chregs);</div><div class='ctx'> </div><div class='hunk'>@@ -872,21 +843,17 @@ static void snd_ali_update_ptr(struct snd_ali *codec, int channel)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pvoice = &amp;codec-&gt;synth.voices[channel];</div><div class='del'>-	runtime = pvoice-&gt;substream-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 	udelay(100);</div><div class='ctx'> 	spin_lock(&amp;codec-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (pvoice-&gt;pcm &amp;&amp; pvoice-&gt;substream) {</div><div class='ctx'> 		/* pcm interrupt */</div><div class='del'>-#ifdef ALI_DEBUG</div><div class='del'>-		outb((u8)(pvoice-&gt;number), ALI_REG(codec, ALI_GC_CIR));</div><div class='del'>-		temp = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2));</div><div class='del'>-		cspf = (inl(ALI_REG(codec, ALI_CSPF)) &amp; mask) == mask;</div><div class='del'>-#endif</div><div class='ctx'> 		if (pvoice-&gt;running) {</div><div class='del'>-			snd_ali_printk("update_ptr: cso=%4.4x cspf=%d.\n",</div><div class='del'>-				       (u16)temp, cspf);</div><div class='add'>+			dev_dbg(codec-&gt;card-&gt;dev,</div><div class='add'>+				"update_ptr: cso=%4.4x cspf=%d.\n",</div><div class='add'>+				inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2)),</div><div class='add'>+				(inl(ALI_REG(codec, ALI_CSPF)) &amp; mask) == mask);</div><div class='ctx'> 			spin_unlock(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 			snd_pcm_period_elapsed(pvoice-&gt;substream);</div><div class='ctx'> 			spin_lock(&amp;codec-&gt;reg_lock);</div><div class='hunk'>@@ -942,15 +909,14 @@ static struct snd_ali_voice *snd_ali_alloc_voice(struct snd_ali * codec,</div><div class='ctx'> 	struct snd_ali_voice *pvoice;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("alloc_voice: type=%d rec=%d\n", type, rec);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "alloc_voice: type=%d rec=%d\n", type, rec);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;codec-&gt;voice_alloc);</div><div class='add'>+	guard(spinlock_irq)(&amp;codec-&gt;voice_alloc);</div><div class='ctx'> 	if (type == SNDRV_ALI_VOICE_TYPE_PCM) {</div><div class='ctx'> 		idx = channel &gt; 0 ? snd_ali_alloc_pcm_channel(codec, channel) :</div><div class='ctx'> 			snd_ali_find_free_channel(codec,rec);</div><div class='ctx'> 		if (idx &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "ali_alloc_voice: err.\n");</div><div class='del'>-			spin_unlock_irq(&amp;codec-&gt;voice_alloc);</div><div class='add'>+			dev_err(codec-&gt;card-&gt;dev, "ali_alloc_voice: err.\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		pvoice = &amp;(codec-&gt;synth.voices[idx]);</div><div class='hunk'>@@ -958,10 +924,8 @@ static struct snd_ali_voice *snd_ali_alloc_voice(struct snd_ali * codec,</div><div class='ctx'> 		pvoice-&gt;use = 1;</div><div class='ctx'> 		pvoice-&gt;pcm = 1;</div><div class='ctx'> 		pvoice-&gt;mode = rec;</div><div class='del'>-		spin_unlock_irq(&amp;codec-&gt;voice_alloc);</div><div class='ctx'> 		return pvoice;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;codec-&gt;voice_alloc);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -972,20 +936,20 @@ static void snd_ali_free_voice(struct snd_ali * codec,</div><div class='ctx'> 	void (*private_free)(void *);</div><div class='ctx'> 	void *private_data;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("free_voice: channel=%d\n",pvoice-&gt;number);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "free_voice: channel=%d\n", pvoice-&gt;number);</div><div class='ctx'> 	if (!pvoice-&gt;use)</div><div class='ctx'> 		return;</div><div class='ctx'> 	snd_ali_clear_voices(codec, pvoice-&gt;number, pvoice-&gt;number);</div><div class='del'>-	spin_lock_irq(&amp;codec-&gt;voice_alloc);</div><div class='del'>-	private_free = pvoice-&gt;private_free;</div><div class='del'>-	private_data = pvoice-&gt;private_data;</div><div class='del'>-	pvoice-&gt;private_free = NULL;</div><div class='del'>-	pvoice-&gt;private_data = NULL;</div><div class='del'>-	if (pvoice-&gt;pcm)</div><div class='del'>-		snd_ali_free_channel_pcm(codec, pvoice-&gt;number);</div><div class='del'>-	pvoice-&gt;use = pvoice-&gt;pcm = pvoice-&gt;synth = 0;</div><div class='del'>-	pvoice-&gt;substream = NULL;</div><div class='del'>-	spin_unlock_irq(&amp;codec-&gt;voice_alloc);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;codec-&gt;voice_alloc) {</div><div class='add'>+		private_free = pvoice-&gt;private_free;</div><div class='add'>+		private_data = pvoice-&gt;private_data;</div><div class='add'>+		pvoice-&gt;private_free = NULL;</div><div class='add'>+		pvoice-&gt;private_data = NULL;</div><div class='add'>+		if (pvoice-&gt;pcm)</div><div class='add'>+			snd_ali_free_channel_pcm(codec, pvoice-&gt;number);</div><div class='add'>+		pvoice-&gt;use = pvoice-&gt;pcm = pvoice-&gt;synth = 0;</div><div class='add'>+		pvoice-&gt;substream = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	if (private_free)</div><div class='ctx'> 		private_free(private_data);</div><div class='ctx'> }</div><div class='hunk'>@@ -1100,7 +1064,7 @@ static int snd_ali_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali *codec = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_substream *s;</div><div class='del'>-	unsigned int what, whati, capture_flag;</div><div class='add'>+	unsigned int what, whati;</div><div class='ctx'> 	struct snd_ali_voice *pvoice, *evoice;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int do_start;</div><div class='hunk'>@@ -1118,7 +1082,7 @@ static int snd_ali_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	what = whati = capture_flag = 0;</div><div class='add'>+	what = whati = 0;</div><div class='ctx'> 	snd_pcm_group_for_each_entry(s, substream) {</div><div class='ctx'> 		if ((struct snd_ali *) snd_pcm_substream_chip(s) == codec) {</div><div class='ctx'> 			pvoice = s-&gt;runtime-&gt;private_data;</div><div class='hunk'>@@ -1140,11 +1104,9 @@ static int snd_ali_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 					evoice-&gt;running = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			snd_pcm_trigger_done(s, substream);</div><div class='del'>-			if (pvoice-&gt;mode)</div><div class='del'>-				capture_flag = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock(&amp;codec-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	if (!do_start)</div><div class='ctx'> 		outl(what, ALI_REG(codec, ALI_STOP));</div><div class='ctx'> 	val = inl(ALI_REG(codec, ALI_AINTEN));</div><div class='hunk'>@@ -1155,8 +1117,7 @@ static int snd_ali_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	outl(val, ALI_REG(codec, ALI_AINTEN));</div><div class='ctx'> 	if (do_start)</div><div class='ctx'> 		outl(what, ALI_REG(codec, ALI_START));</div><div class='del'>-	snd_ali_printk("trigger: what=%xh whati=%xh\n", what, whati);</div><div class='del'>-	spin_unlock(&amp;codec-&gt;reg_lock);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "trigger: what=%xh whati=%xh\n", what, whati);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1168,13 +1129,7 @@ static int snd_ali_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_ali_voice *pvoice = runtime-&gt;private_data;</div><div class='ctx'> 	struct snd_ali_voice *evoice = pvoice-&gt;extra;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	</div><div class='ctx'> 	/* voice management */</div><div class='ctx'> </div><div class='ctx'> 	if (params_buffer_size(hw_params) / 2 !=</div><div class='hunk'>@@ -1205,7 +1160,6 @@ static int snd_ali_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ali_voice *pvoice = runtime-&gt;private_data;</div><div class='ctx'> 	struct snd_ali_voice *evoice = pvoice ? pvoice-&gt;extra : NULL;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	if (evoice) {</div><div class='ctx'> 		snd_ali_free_voice(codec, evoice);</div><div class='ctx'> 		pvoice-&gt;extra = NULL;</div><div class='hunk'>@@ -1213,18 +1167,6 @@ static int snd_ali_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ali_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			     struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ali_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_ali_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali *codec = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -1241,10 +1183,10 @@ static int snd_ali_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned int VOL;</div><div class='ctx'> 	unsigned int EC;</div><div class='ctx'> 	</div><div class='del'>-	snd_ali_printk("playback_prepare ...\n");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "playback_prepare ...\n");</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;codec-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;codec-&gt;reg_lock);	</div><div class='del'>-	</div><div class='ctx'> 	/* set Delta (rate) value */</div><div class='ctx'> 	Delta = snd_ali_convert_rate(runtime-&gt;rate, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1268,7 +1210,7 @@ static int snd_ali_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	/* set target ESO for channel */</div><div class='ctx'> 	pvoice-&gt;eso = runtime-&gt;buffer_size; </div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("playback_prepare: eso=%xh count=%xh\n",</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "playback_prepare: eso=%xh count=%xh\n",</div><div class='ctx'> 		       pvoice-&gt;eso, pvoice-&gt;count);</div><div class='ctx'> </div><div class='ctx'> 	/* set ESO to capture first MIDLP interrupt */</div><div class='hunk'>@@ -1280,8 +1222,9 @@ static int snd_ali_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	PAN = 0;</div><div class='ctx'> 	VOL = 0;</div><div class='ctx'> 	EC = 0;</div><div class='del'>-	snd_ali_printk("playback_prepare:\n");</div><div class='del'>-	snd_ali_printk("ch=%d, Rate=%d Delta=%xh,GVSEL=%xh,PAN=%xh,CTRL=%xh\n",</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "playback_prepare:\n");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev,</div><div class='add'>+		"ch=%d, Rate=%d Delta=%xh,GVSEL=%xh,PAN=%xh,CTRL=%xh\n",</div><div class='ctx'> 		       pvoice-&gt;number,runtime-&gt;rate,Delta,GVSEL,PAN,CTRL);</div><div class='ctx'> 	snd_ali_write_voice_regs(codec,</div><div class='ctx'> 				 pvoice-&gt;number,</div><div class='hunk'>@@ -1312,7 +1255,6 @@ static int snd_ali_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 					 CTRL,</div><div class='ctx'> 					 EC);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1334,7 +1276,7 @@ static int snd_ali_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;codec-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("ali_prepare...\n");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "ali_prepare...\n");</div><div class='ctx'> </div><div class='ctx'> 	snd_ali_enable_special_channel(codec,pvoice-&gt;number);</div><div class='ctx'> </div><div class='hunk'>@@ -1353,15 +1295,16 @@ static int snd_ali_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 		rate = snd_ali_get_spdif_in_rate(codec);</div><div class='ctx'> 		if (rate == 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "ali_capture_preapre: "</div><div class='del'>-				   "spdif rate detect err!\n");</div><div class='add'>+			dev_warn(codec-&gt;card-&gt;dev,</div><div class='add'>+				 "ali_capture_prepare: spdif rate detect err!\n");</div><div class='ctx'> 			rate = 48000;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_lock_irq(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 		bValue = inb(ALI_REG(codec,ALI_SPDIF_CTRL));</div><div class='ctx'> 		if (bValue &amp; 0x10) {</div><div class='ctx'> 			outb(bValue,ALI_REG(codec,ALI_SPDIF_CTRL));</div><div class='del'>-			printk(KERN_WARNING "clear SPDIF parity error flag.\n");</div><div class='add'>+			dev_warn(codec-&gt;card-&gt;dev,</div><div class='add'>+				 "clear SPDIF parity error flag.\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (rate != 48000)</div><div class='hunk'>@@ -1412,16 +1355,14 @@ snd_ali_playback_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ali_voice *pvoice = runtime-&gt;private_data;</div><div class='ctx'> 	unsigned int cso;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;codec-&gt;reg_lock);</div><div class='del'>-	if (!pvoice-&gt;running) {</div><div class='del'>-		spin_unlock(&amp;codec-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;codec-&gt;reg_lock);</div><div class='add'>+	if (!pvoice-&gt;running)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	outb(pvoice-&gt;number, ALI_REG(codec, ALI_GC_CIR));</div><div class='ctx'> 	cso = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2));</div><div class='del'>-	spin_unlock(&amp;codec-&gt;reg_lock);</div><div class='del'>-	snd_ali_printk("playback pointer returned cso=%xh.\n", cso);</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "playback pointer returned cso=%xh.\n", cso);</div><div class='ctx'> </div><div class='add'>+	cso %= runtime-&gt;buffer_size;</div><div class='ctx'> 	return cso;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1433,19 +1374,17 @@ static snd_pcm_uframes_t snd_ali_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ali_voice *pvoice = runtime-&gt;private_data;</div><div class='ctx'> 	unsigned int cso;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;codec-&gt;reg_lock);</div><div class='del'>-	if (!pvoice-&gt;running) {</div><div class='del'>-		spin_unlock_irq(&amp;codec-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;codec-&gt;reg_lock);</div><div class='add'>+	if (!pvoice-&gt;running)</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	outb(pvoice-&gt;number, ALI_REG(codec, ALI_GC_CIR));</div><div class='ctx'> 	cso = inw(ALI_REG(codec, ALI_CSO_ALPHA_FMS + 2));</div><div class='del'>-	spin_unlock(&amp;codec-&gt;reg_lock);</div><div class='ctx'> </div><div class='add'>+	cso %= runtime-&gt;buffer_size;</div><div class='ctx'> 	return cso;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ali_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_ali_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =		(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 			 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1471,7 +1410,7 @@ static struct snd_pcm_hardware snd_ali_playback =</div><div class='ctx'>  *  Capture support device description</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ali_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_ali_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =		(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 			 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1496,16 +1435,13 @@ static struct snd_pcm_hardware snd_ali_capture =</div><div class='ctx'> static void snd_ali_pcm_free_substream(struct snd_pcm_runtime *runtime)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali_voice *pvoice = runtime-&gt;private_data;</div><div class='del'>-	struct snd_ali *codec;</div><div class='ctx'> </div><div class='del'>-	if (pvoice) {</div><div class='del'>-		codec = pvoice-&gt;codec;</div><div class='add'>+	if (pvoice)</div><div class='ctx'> 		snd_ali_free_voice(pvoice-&gt;codec, pvoice);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ali_open(struct snd_pcm_substream *substream, int rec,</div><div class='del'>-			int channel, struct snd_pcm_hardware *phw)</div><div class='add'>+			int channel, const struct snd_pcm_hardware *phw)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ali *codec = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='hunk'>@@ -1552,10 +1488,9 @@ static int snd_ali_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ali_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ali_playback_ops = {</div><div class='ctx'> 	.open =		snd_ali_playback_open,</div><div class='ctx'> 	.close =	snd_ali_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_ali_playback_hw_params,</div><div class='ctx'> 	.hw_free =	snd_ali_playback_hw_free,</div><div class='ctx'> 	.prepare =	snd_ali_playback_prepare,</div><div class='hunk'>@@ -1563,12 +1498,9 @@ static struct snd_pcm_ops snd_ali_playback_ops = {</div><div class='ctx'> 	.pointer =	snd_ali_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ali_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ali_capture_ops = {</div><div class='ctx'> 	.open =		snd_ali_capture_open,</div><div class='ctx'> 	.close =	snd_ali_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ali_hw_params,</div><div class='del'>-	.hw_free =	snd_ali_hw_free,</div><div class='ctx'> 	.prepare =	snd_ali_prepare,</div><div class='ctx'> 	.trigger =	snd_ali_trigger,</div><div class='ctx'> 	.pointer =	snd_ali_pointer,</div><div class='hunk'>@@ -1586,10 +1518,10 @@ static int snd_ali_modem_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	snd_ac97_write(chip-&gt;ac97[modem_num], AC97_LINE1_RATE,</div><div class='ctx'> 		       params_rate(hw_params));</div><div class='ctx'> 	snd_ac97_write(chip-&gt;ac97[modem_num], AC97_LINE1_LEVEL, 0);</div><div class='del'>-	return snd_ali_hw_params(substream, hw_params);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ali_modem =</div><div class='add'>+static const struct snd_pcm_hardware snd_ali_modem =</div><div class='ctx'> {</div><div class='ctx'> 	.info =		(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 			 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1614,8 +1546,8 @@ static struct snd_pcm_hardware snd_ali_modem =</div><div class='ctx'> static int snd_ali_modem_open(struct snd_pcm_substream *substream, int rec,</div><div class='ctx'> 			      int channel)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int rates[] = {8000, 9600, 12000, 16000};</div><div class='del'>-	static struct snd_pcm_hw_constraint_list hw_constraint_rates = {</div><div class='add'>+	static const unsigned int rates[] = {8000, 9600, 12000, 16000};</div><div class='add'>+	static const struct snd_pcm_hw_constraint_list hw_constraint_rates = {</div><div class='ctx'> 		.count = ARRAY_SIZE(rates),</div><div class='ctx'> 		.list = rates,</div><div class='ctx'> 		.mask = 0,</div><div class='hunk'>@@ -1638,23 +1570,19 @@ static int snd_ali_modem_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return snd_ali_modem_open(substream, 1, ALI_MODEM_IN_CHANNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ali_modem_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ali_modem_playback_ops = {</div><div class='ctx'> 	.open =		snd_ali_modem_playback_open,</div><div class='ctx'> 	.close =	snd_ali_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_ali_modem_hw_params,</div><div class='del'>-	.hw_free =	snd_ali_hw_free,</div><div class='ctx'> 	.prepare =	snd_ali_prepare,</div><div class='ctx'> 	.trigger =	snd_ali_trigger,</div><div class='ctx'> 	.pointer =	snd_ali_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ali_modem_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ali_modem_capture_ops = {</div><div class='ctx'> 	.open =		snd_ali_modem_capture_open,</div><div class='ctx'> 	.close =	snd_ali_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_ali_modem_hw_params,</div><div class='del'>-	.hw_free =	snd_ali_hw_free,</div><div class='ctx'> 	.prepare =	snd_ali_prepare,</div><div class='ctx'> 	.trigger =	snd_ali_trigger,</div><div class='ctx'> 	.pointer =	snd_ali_pointer,</div><div class='hunk'>@@ -1665,8 +1593,8 @@ struct ali_pcm_description {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	unsigned int playback_num;</div><div class='ctx'> 	unsigned int capture_num;</div><div class='del'>-	struct snd_pcm_ops *playback_ops;</div><div class='del'>-	struct snd_pcm_ops *capture_ops;</div><div class='add'>+	const struct snd_pcm_ops *playback_ops;</div><div class='add'>+	const struct snd_pcm_ops *capture_ops;</div><div class='ctx'> 	unsigned short class;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1678,8 +1606,8 @@ static void snd_ali_pcm_free(struct snd_pcm *pcm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_pcm(struct snd_ali * codec, int device,</div><div class='del'>-				 struct ali_pcm_description *desc)</div><div class='add'>+static int snd_ali_pcm(struct snd_ali *codec, int device,</div><div class='add'>+		       struct ali_pcm_description *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1687,7 +1615,8 @@ static int __devinit snd_ali_pcm(struct snd_ali * codec, int device,</div><div class='ctx'> 	err = snd_pcm_new(codec-&gt;card, desc-&gt;name, device,</div><div class='ctx'> 			  desc-&gt;playback_num, desc-&gt;capture_num, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "snd_ali_pcm: err called snd_pcm_new.\n");</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev,</div><div class='add'>+			"snd_ali_pcm: err called snd_pcm_new.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	pcm-&gt;private_data = codec;</div><div class='hunk'>@@ -1699,14 +1628,13 @@ static int __devinit snd_ali_pcm(struct snd_ali * codec, int device,</div><div class='ctx'> 		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='ctx'> 				desc-&gt;capture_ops);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(codec-&gt;pci),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;codec-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_class = desc-&gt;class;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='del'>-	strcpy(pcm-&gt;name, desc-&gt;name);</div><div class='add'>+	strscpy(pcm-&gt;name, desc-&gt;name);</div><div class='ctx'> 	codec-&gt;pcm[0] = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1727,7 +1655,7 @@ static struct ali_pcm_description ali_pcms[] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_build_pcms(struct snd_ali *codec)</div><div class='add'>+static int snd_ali_build_pcms(struct snd_ali *codec)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	for (i = 0; i &lt; codec-&gt;num_of_codecs &amp;&amp; i &lt; ARRAY_SIZE(ali_pcms); i++) {</div><div class='hunk'>@@ -1749,12 +1677,12 @@ static int __devinit snd_ali_build_pcms(struct snd_ali *codec)</div><div class='ctx'> static int snd_ali5451_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ali *codec = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_ali *codec = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int spdif_enable;</div><div class='ctx'> </div><div class='ctx'> 	spdif_enable = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;codec-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	switch (kcontrol-&gt;private_value) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		spdif_enable = (codec-&gt;spdif_mask &amp; 0x02) ? 1 : 0;</div><div class='hunk'>@@ -1770,19 +1698,18 @@ static int snd_ali5451_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = spdif_enable;</div><div class='del'>-	spin_unlock_irq(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ali *codec = kcontrol-&gt;private_data;</div><div class='add'>+	struct snd_ali *codec = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int change = 0, spdif_enable = 0;</div><div class='ctx'> </div><div class='ctx'> 	spdif_enable = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;codec-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	switch (kcontrol-&gt;private_value) {</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		change = (codec-&gt;spdif_mask &amp; 0x02) ? 1 : 0;</div><div class='hunk'>@@ -1827,12 +1754,11 @@ static int snd_ali5451_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ali5451_mixer_spdif[] = {</div><div class='ctx'> 	/* spdif aplayback switch */</div><div class='ctx'> 	/* FIXME: "IEC958 Playback Switch" may conflict with one on ac97_codec */</div><div class='ctx'> 	ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH), 0, 0),</div><div class='hunk'>@@ -1842,12 +1768,12 @@ static struct snd_kcontrol_new snd_ali5451_mixer_spdif[] __devinitdata = {</div><div class='ctx'> 	ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, 2)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_mixer(struct snd_ali * codec)</div><div class='add'>+static int snd_ali_mixer(struct snd_ali *codec)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int i, err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_ali_codec_write,</div><div class='ctx'> 		.read = snd_ali_codec_read,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1863,7 +1789,7 @@ static int __devinit snd_ali_mixer(struct snd_ali * codec)</div><div class='ctx'> 		ac97.num = i;</div><div class='ctx'> 		err = snd_ac97_mixer(codec-&gt;ac97_bus, &amp;ac97, &amp;codec-&gt;ac97[i]);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='add'>+			dev_err(codec-&gt;card-&gt;dev,</div><div class='ctx'> 				   "ali mixer %d creating error.\n", i);</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -1883,25 +1809,18 @@ static int __devinit snd_ali_mixer(struct snd_ali * codec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ali_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int ali_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ali *chip = card-&gt;private_data;</div><div class='del'>-	struct snd_ali_image *im;</div><div class='add'>+	struct snd_ali_image *im = &amp;chip-&gt;image;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	im = chip-&gt;image;</div><div class='del'>-	if (!im)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_of_codecs; i++) {</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;num_of_codecs; i++)</div><div class='ctx'> 		snd_ac97_suspend(chip-&gt;ac97[i]);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	</div><div class='ctx'> 	im-&gt;regs[ALI_MISCINT &gt;&gt; 2] = inl(ALI_REG(chip, ALI_MISCINT));</div><div class='ctx'> 	/* im-&gt;regs[ALI_START &gt;&gt; 2] = inl(ALI_REG(chip, ALI_START)); */</div><div class='hunk'>@@ -1925,56 +1844,35 @@ static int ali_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	/* stop all HW channel */</div><div class='ctx'> 	outl(0xffffffff, ALI_REG(chip, ALI_STOP));</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ali_resume(struct pci_dev *pci)</div><div class='add'>+static int ali_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ali *chip = card-&gt;private_data;</div><div class='del'>-	struct snd_ali_image *im;</div><div class='add'>+	struct snd_ali_image *im = &amp;chip-&gt;image;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	im = chip-&gt;image;</div><div class='del'>-	if (!im)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ali5451: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; ALI_CHANNELS; i++) {</div><div class='del'>-		outb(i, ALI_REG(chip, ALI_GC_CIR));</div><div class='del'>-		for (j = 0; j &lt; ALI_CHANNEL_REGS; j++) </div><div class='del'>-			outl(im-&gt;channel_regs[i][j], ALI_REG(chip, j*4 + 0xe0));</div><div class='del'>-	}</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		for (i = 0; i &lt; ALI_CHANNELS; i++) {</div><div class='add'>+			outb(i, ALI_REG(chip, ALI_GC_CIR));</div><div class='add'>+			for (j = 0; j &lt; ALI_CHANNEL_REGS; j++)</div><div class='add'>+				outl(im-&gt;channel_regs[i][j], ALI_REG(chip, j*4 + 0xe0));</div><div class='add'>+		}</div><div class='ctx'> 	</div><div class='del'>-	for (i = 0; i &lt; ALI_GLOBAL_REGS; i++) {	</div><div class='del'>-		if ((i*4 == ALI_MISCINT) || (i*4 == ALI_STOP) ||</div><div class='del'>-		    (i*4 == ALI_START))</div><div class='del'>-			continue;</div><div class='del'>-		outl(im-&gt;regs[i], ALI_REG(chip, i*4));</div><div class='add'>+		for (i = 0; i &lt; ALI_GLOBAL_REGS; i++) {</div><div class='add'>+			if ((i*4 == ALI_MISCINT) || (i*4 == ALI_STOP) ||</div><div class='add'>+			    (i*4 == ALI_START))</div><div class='add'>+				continue;</div><div class='add'>+			outl(im-&gt;regs[i], ALI_REG(chip, i*4));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* start HW channel */</div><div class='add'>+		outl(im-&gt;regs[ALI_START &gt;&gt; 2], ALI_REG(chip, ALI_START));</div><div class='add'>+		/* restore IRQ enable bits */</div><div class='add'>+		outl(im-&gt;regs[ALI_MISCINT &gt;&gt; 2], ALI_REG(chip, ALI_MISCINT));</div><div class='ctx'> 	}</div><div class='del'>-	</div><div class='del'>-	/* start HW channel */</div><div class='del'>-	outl(im-&gt;regs[ALI_START &gt;&gt; 2], ALI_REG(chip, ALI_START));</div><div class='del'>-	/* restore IRQ enable bits */</div><div class='del'>-	outl(im-&gt;regs[ALI_MISCINT &gt;&gt; 2], ALI_REG(chip, ALI_MISCINT));</div><div class='del'>-	</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0 ; i &lt; chip-&gt;num_of_codecs; i++)</div><div class='ctx'> 		snd_ac97_resume(chip-&gt;ac97[i]);</div><div class='hunk'>@@ -1982,24 +1880,17 @@ static int ali_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static int snd_ali_free(struct snd_ali * codec)</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume);</div><div class='add'>+</div><div class='add'>+static void snd_ali_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct snd_ali *codec = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	if (codec-&gt;hw_initialized)</div><div class='ctx'> 		snd_ali_disable_address_interrupt(codec);</div><div class='del'>-	if (codec-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(codec-&gt;irq, codec);</div><div class='del'>-	if (codec-&gt;port)</div><div class='del'>-		pci_release_regions(codec-&gt;pci);</div><div class='del'>-	pci_disable_device(codec-&gt;pci);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	kfree(codec-&gt;image);</div><div class='del'>-#endif</div><div class='ctx'> 	pci_dev_put(codec-&gt;pci_m1533);</div><div class='ctx'> 	pci_dev_put(codec-&gt;pci_m7101);</div><div class='del'>-	kfree(codec);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ali_chip_init(struct snd_ali *codec)</div><div class='hunk'>@@ -2008,10 +1899,10 @@ static int snd_ali_chip_init(struct snd_ali *codec)</div><div class='ctx'> 	unsigned char temp;</div><div class='ctx'> 	struct pci_dev *pci_dev;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("chip initializing ... \n");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "chip initializing ...\n");</div><div class='ctx'> </div><div class='ctx'> 	if (snd_ali_reset_5451(codec)) {</div><div class='del'>-		snd_printk(KERN_ERR "ali_chip_init: reset 5451 error.\n");</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev, "ali_chip_init: reset 5451 error.\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2057,7 +1948,7 @@ static int snd_ali_chip_init(struct snd_ali *codec)</div><div class='ctx'> 		     ALI_REG(codec, ALI_SCTRL));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("chip initialize succeed.\n");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "chip initialize succeed.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -2072,75 +1963,55 @@ static void snd_ali_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		snd_iprintf(buf, "%02x: %08x\n", i, inl(ALI_REG(codec, i)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ali_proc_init(struct snd_ali *codec)</div><div class='add'>+static void snd_ali_proc_init(struct snd_ali *codec)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(codec-&gt;card, "ali5451", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, codec, snd_ali_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(codec-&gt;card, "ali5451", codec, snd_ali_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_resources(struct snd_ali *codec)</div><div class='add'>+static int snd_ali_resources(struct snd_ali *codec)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("resources allocation ...\n");</div><div class='del'>-	err = pci_request_regions(codec-&gt;pci, "ALI 5451");</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "resources allocation ...\n");</div><div class='add'>+	err = pcim_request_all_regions(codec-&gt;pci, "ALI 5451");</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	codec-&gt;port = pci_resource_start(codec-&gt;pci, 0);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(codec-&gt;pci-&gt;irq, snd_ali_card_interrupt,</div><div class='del'>-			IRQF_SHARED, "ALI 5451", codec)) {</div><div class='del'>-		snd_printk(KERN_ERR "Unable to request irq.\n");</div><div class='add'>+	if (devm_request_irq(&amp;codec-&gt;pci-&gt;dev, codec-&gt;pci-&gt;irq,</div><div class='add'>+			     snd_ali_card_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, codec)) {</div><div class='add'>+		dev_err(codec-&gt;card-&gt;dev, "Unable to request irq.\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	codec-&gt;irq = codec-&gt;pci-&gt;irq;</div><div class='del'>-	snd_ali_printk("resources allocated.\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static int snd_ali_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_ali *codec = device-&gt;device_data;</div><div class='del'>-	snd_ali_free(codec);</div><div class='add'>+	codec-&gt;card-&gt;sync_irq = codec-&gt;irq;</div><div class='add'>+	dev_dbg(codec-&gt;card-&gt;dev, "resources allocated.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_create(struct snd_card *card,</div><div class='del'>-				    struct pci_dev *pci,</div><div class='del'>-				    int pcm_streams,</div><div class='del'>-				    int spdif_support,</div><div class='del'>-				    struct snd_ali ** r_ali)</div><div class='add'>+static int snd_ali_create(struct snd_card *card,</div><div class='add'>+			  struct pci_dev *pci,</div><div class='add'>+			  int pcm_streams,</div><div class='add'>+			  int spdif_support)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ali *codec;</div><div class='add'>+	struct snd_ali *codec = card-&gt;private_data;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	unsigned short cmdw;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_ali_dev_free,</div><div class='del'>-        };</div><div class='ctx'> </div><div class='del'>-	*r_ali = NULL;</div><div class='del'>-</div><div class='del'>-	snd_ali_printk("creating ...\n");</div><div class='add'>+	dev_dbg(card-&gt;dev, "creating ...\n");</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* check, if we can restrict PCI DMA transfers to 31 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support "</div><div class='del'>-			   "31bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(31))) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 31bit PCI busmaster DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	codec = kzalloc(sizeof(*codec), GFP_KERNEL);</div><div class='del'>-	if (!codec) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;codec-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;codec-&gt;voice_alloc);</div><div class='ctx'> </div><div class='hunk'>@@ -2161,14 +2032,10 @@ static int __devinit snd_ali_create(struct snd_card *card,</div><div class='ctx'> 		cmdw |= PCI_COMMAND_IO;</div><div class='ctx'> 		pci_write_config_word(pci, PCI_COMMAND, cmdw);</div><div class='ctx'> 	}</div><div class='del'>-	pci_set_master(pci);</div><div class='ctx'> 	</div><div class='del'>-	if (snd_ali_resources(codec)) {</div><div class='del'>-		snd_ali_free(codec);</div><div class='add'>+	if (snd_ali_resources(codec))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	synchronize_irq(pci-&gt;irq);</div><div class='add'>+	card-&gt;private_free = snd_ali_free;</div><div class='ctx'> </div><div class='ctx'> 	codec-&gt;synth.chmap = 0;</div><div class='ctx'> 	codec-&gt;synth.chcnt = 0;</div><div class='hunk'>@@ -2194,126 +2061,90 @@ static int __devinit snd_ali_create(struct snd_card *card,</div><div class='ctx'> 	/* M1533: southbridge */</div><div class='ctx'> 	codec-&gt;pci_m1533 = pci_get_device(0x10b9, 0x1533, NULL);</div><div class='ctx'> 	if (!codec-&gt;pci_m1533) {</div><div class='del'>-		snd_printk(KERN_ERR "ali5451: cannot find ALi 1533 chip.\n");</div><div class='del'>-		snd_ali_free(codec);</div><div class='add'>+		dev_err(card-&gt;dev, "cannot find ALi 1533 chip.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* M7101: power management */</div><div class='ctx'> 	codec-&gt;pci_m7101 = pci_get_device(0x10b9, 0x7101, NULL);</div><div class='ctx'> 	if (!codec-&gt;pci_m7101 &amp;&amp; codec-&gt;revision == ALI_5451_V02) {</div><div class='del'>-		snd_printk(KERN_ERR "ali5451: cannot find ALi 7101 chip.\n");</div><div class='del'>-		snd_ali_free(codec);</div><div class='add'>+		dev_err(card-&gt;dev, "cannot find ALi 7101 chip.\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("snd_device_new is called.\n");</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, codec, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_ali_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	/* initialise synth voices*/</div><div class='ctx'> 	for (i = 0; i &lt; ALI_CHANNELS; i++)</div><div class='ctx'> 		codec-&gt;synth.voices[i].number = i;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ali_chip_init(codec);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "ali create: chip init error.\n");</div><div class='add'>+		dev_err(card-&gt;dev, "ali create: chip init error.\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	codec-&gt;image = kmalloc(sizeof(*codec-&gt;image), GFP_KERNEL);</div><div class='del'>-	if (!codec-&gt;image)</div><div class='del'>-		snd_printk(KERN_WARNING "can't allocate apm buffer\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	snd_ali_enable_address_interrupt(codec);</div><div class='ctx'> 	codec-&gt;hw_initialized = 1;</div><div class='del'>-</div><div class='del'>-	*r_ali = codec;</div><div class='del'>-	snd_ali_printk("created.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ali_probe(struct pci_dev *pci,</div><div class='del'>-				   const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_ali_probe(struct pci_dev *pci,</div><div class='add'>+			   const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ali *codec;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("probe ...\n");</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "probe ...\n");</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*codec), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	codec = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	err = snd_ali_create(card, pci, pcm_channels, spdif, &amp;codec);</div><div class='add'>+	err = snd_ali_create(card, pci, pcm_channels, spdif);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	card-&gt;private_data = codec;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("mixer building ...\n");</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "mixer building ...\n");</div><div class='ctx'> 	err = snd_ali_mixer(codec);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='del'>-	snd_ali_printk("pcm building ...\n");</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "pcm building ...\n");</div><div class='ctx'> 	err = snd_ali_build_pcms(codec);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	snd_ali_proc_init(codec);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ALI5451");</div><div class='del'>-	strcpy(card-&gt;shortname, "ALI 5451");</div><div class='add'>+	strscpy(card-&gt;driver, "ALI5451");</div><div class='add'>+	strscpy(card-&gt;shortname, "ALI 5451");</div><div class='ctx'> 	</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, codec-&gt;port, codec-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	snd_ali_printk("register card.\n");</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "register card.\n");</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_ali_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_ali_probe(struct pci_dev *pci,</div><div class='add'>+			 const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_ali_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ALI 5451",</div><div class='add'>+static struct pci_driver ali5451_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_ali_ids,</div><div class='ctx'> 	.probe = snd_ali_probe,</div><div class='del'>-	.remove = __devexit_p(snd_ali_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = ali_suspend,</div><div class='del'>-	.resume = ali_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;ali_pm,</div><div class='add'>+	},</div><div class='ctx'> };                                </div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_ali_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_ali_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ali_init)</div><div class='del'>-module_exit(alsa_card_ali_exit)</div><div class='add'>+module_pci_driver(ali5451_driver);</div><div class='head'>diff --git a/sound/pci/als300.c b/sound/pci/als300.c<br/>index d7653cb7ac60..733e84def5a7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/als300.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/als300.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/als300.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/als300.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  als300.c - driver for Avance Logic ALS300/ALS300+ soundcards.</div><div class='ctx'>  *  Copyright (C) 2005 by Ash Willis &lt;ashwillis@programmer.net&gt;</div><div class='ctx'>  *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  *  TODO</div><div class='ctx'>  *  4 channel playback for ALS300+</div><div class='ctx'>  *  gameport</div><div class='hunk'>@@ -32,13 +19,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -87,19 +73,8 @@</div><div class='ctx'> #define PLAYBACK_BLOCK_COUNTER	0x9A</div><div class='ctx'> #define RECORD_BLOCK_COUNTER	0x9B</div><div class='ctx'> </div><div class='del'>-#define DEBUG_CALLS	0</div><div class='ctx'> #define DEBUG_PLAY_REC	0</div><div class='ctx'> </div><div class='del'>-#if DEBUG_CALLS</div><div class='del'>-#define snd_als300_dbgcalls(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#define snd_als300_dbgcallenter() printk(KERN_ERR "--&gt; %s\n", __func__)</div><div class='del'>-#define snd_als300_dbgcallleave() printk(KERN_ERR "&lt;-- %s\n", __func__)</div><div class='del'>-#else</div><div class='del'>-#define snd_als300_dbgcalls(format, args...)</div><div class='del'>-#define snd_als300_dbgcallenter()</div><div class='del'>-#define snd_als300_dbgcallleave()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if DEBUG_PLAY_REC</div><div class='ctx'> #define snd_als300_dbgplay(format, args...) printk(KERN_ERR format, ##args)</div><div class='ctx'> #else</div><div class='hunk'>@@ -111,11 +86,17 @@ enum {DEVICE_ALS300, DEVICE_ALS300_PLUS};</div><div class='ctx'> MODULE_AUTHOR("Ash Willis &lt;ashwillis@programmer.net&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Avance Logic ALS300");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS300},{Avance Logic,ALS300+}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for ALS300 sound card.");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for ALS300 sound card.");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable ALS300 sound card.");</div><div class='ctx'> </div><div class='ctx'> struct snd_als300 {</div><div class='ctx'> 	unsigned long port;</div><div class='hunk'>@@ -145,7 +126,7 @@ struct snd_als300_substream_data {</div><div class='ctx'> 	int block_counter_register;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_als300_ids) = {</div><div class='add'>+static const struct pci_device_id snd_als300_ids[] = {</div><div class='ctx'> 	{ 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 },</div><div class='ctx'> 	{ 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS },</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -170,7 +151,6 @@ static inline void snd_als300_gcr_write(unsigned long port,</div><div class='ctx'> static void snd_als300_set_irq_flag(struct snd_als300 *chip, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp = snd_als300_gcr_read(chip-&gt;port, MISC_CONTROL);</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='ctx'> </div><div class='ctx'> 	/* boolean XOR check, since old vs. new hardware have</div><div class='ctx'> 	   directly reversed bit setting for ENABLE and DISABLE.</div><div class='hunk'>@@ -181,26 +161,13 @@ static void snd_als300_set_irq_flag(struct snd_als300 *chip, int cmd)</div><div class='ctx'> 	else</div><div class='ctx'> 		tmp &amp;= ~IRQ_SET_BIT;</div><div class='ctx'> 	snd_als300_gcr_write(chip-&gt;port, MISC_CONTROL, tmp);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_als300_free(struct snd_als300 *chip)</div><div class='add'>+static void snd_als300_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	snd_als300_set_irq_flag(chip, IRQ_DISABLE);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct snd_als300 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-static int snd_als300_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_als300 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_als300_free(chip);</div><div class='add'>+	snd_als300_set_irq_flag(chip, IRQ_DISABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_als300_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -271,14 +238,6 @@ static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_als300_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static unsigned short snd_als300_ac97_read(struct snd_ac97 *ac97,</div><div class='ctx'> 							unsigned short reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -319,19 +278,18 @@ static int snd_als300_ac97(struct snd_als300 *chip)</div><div class='ctx'> 	struct snd_ac97_bus *bus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_als300_ac97_write,</div><div class='ctx'> 		.read = snd_als300_ac97_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;bus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;bus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -342,7 +300,7 @@ static int snd_als300_ac97(struct snd_als300 *chip)</div><div class='ctx'>  * the card when it is running outside of legacy</div><div class='ctx'>  * mode.</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_hardware snd_als300_playback_hw =</div><div class='add'>+static const struct snd_pcm_hardware snd_als300_playback_hw =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -361,7 +319,7 @@ static struct snd_pcm_hardware snd_als300_playback_hw =</div><div class='ctx'> 	.periods_max =		2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_als300_capture_hw =</div><div class='add'>+static const struct snd_pcm_hardware snd_als300_capture_hw =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -387,13 +345,13 @@ static int snd_als300_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_als300_substream_data *data = kzalloc(sizeof(*data),</div><div class='ctx'> 								GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	chip-&gt;playback_substream = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_als300_playback_hw;</div><div class='ctx'> 	runtime-&gt;private_data = data;</div><div class='ctx'> 	data-&gt;control_register = PLAYBACK_CONTROL;</div><div class='ctx'> 	data-&gt;block_counter_register = PLAYBACK_BLOCK_COUNTER;</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -403,11 +361,8 @@ static int snd_als300_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_als300_substream_data *data;</div><div class='ctx'> </div><div class='ctx'> 	data = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -418,13 +373,13 @@ static int snd_als300_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_als300_substream_data *data = kzalloc(sizeof(*data),</div><div class='ctx'> 								GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	chip-&gt;capture_substream = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_als300_capture_hw;</div><div class='ctx'> 	runtime-&gt;private_data = data;</div><div class='ctx'> 	data-&gt;control_register = RECORD_CONTROL;</div><div class='ctx'> 	data-&gt;block_counter_register = RECORD_BLOCK_COUNTER;</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -434,26 +389,11 @@ static int snd_als300_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_als300_substream_data *data;</div><div class='ctx'> </div><div class='ctx'> 	data = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='ctx'> 	kfree(data);</div><div class='ctx'> 	chip-&gt;capture_substream = NULL;</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_als300_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_als300_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='hunk'>@@ -462,8 +402,7 @@ static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned short period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	unsigned short buffer_bytes = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	tmp = snd_als300_gcr_read(chip-&gt;port, PLAYBACK_CONTROL);</div><div class='ctx'> 	tmp &amp;= ~TRANSFER_START;</div><div class='ctx'> </div><div class='hunk'>@@ -480,8 +419,6 @@ static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 					runtime-&gt;dma_addr);</div><div class='ctx'> 	snd_als300_gcr_write(chip-&gt;port, PLAYBACK_END,</div><div class='ctx'> 					runtime-&gt;dma_addr + buffer_bytes - 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -493,8 +430,7 @@ static int snd_als300_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned short period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	unsigned short buffer_bytes = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	tmp = snd_als300_gcr_read(chip-&gt;port, RECORD_CONTROL);</div><div class='ctx'> 	tmp &amp;= ~TRANSFER_START;</div><div class='ctx'> </div><div class='hunk'>@@ -511,8 +447,6 @@ static int snd_als300_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 					runtime-&gt;dma_addr);</div><div class='ctx'> 	snd_als300_gcr_write(chip-&gt;port, RECORD_END,</div><div class='ctx'> 					runtime-&gt;dma_addr + buffer_bytes - 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -527,8 +461,7 @@ static int snd_als300_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	data = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	reg = data-&gt;control_register;</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -557,8 +490,6 @@ static int snd_als300_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		snd_als300_dbgplay("TRIGGER INVALID\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -572,11 +503,10 @@ static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	data = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	current_ptr = (u16) snd_als300_gcr_read(chip-&gt;port,</div><div class='del'>-					data-&gt;block_counter_register) + 4;</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		current_ptr = (u16) snd_als300_gcr_read(chip-&gt;port,</div><div class='add'>+							data-&gt;block_counter_register) + 4;</div><div class='add'>+	}</div><div class='ctx'> 	if (current_ptr &gt; period_bytes)</div><div class='ctx'> 		current_ptr = 0;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -585,43 +515,35 @@ static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (data-&gt;period_flipflop == 0)</div><div class='ctx'> 		current_ptr += period_bytes;</div><div class='ctx'> 	snd_als300_dbgplay("Pointer (bytes): %d\n", current_ptr);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, current_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_als300_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_als300_playback_ops = {</div><div class='ctx'> 	.open =		snd_als300_playback_open,</div><div class='ctx'> 	.close =	snd_als300_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_als300_pcm_hw_params,</div><div class='del'>-	.hw_free =	snd_als300_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_als300_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_als300_trigger,</div><div class='ctx'> 	.pointer =	snd_als300_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_als300_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_als300_capture_ops = {</div><div class='ctx'> 	.open =		snd_als300_capture_open,</div><div class='ctx'> 	.close =	snd_als300_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_als300_pcm_hw_params,</div><div class='del'>-	.hw_free =	snd_als300_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_als300_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_als300_trigger,</div><div class='ctx'> 	.pointer =	snd_als300_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_als300_new_pcm(struct snd_als300 *chip)</div><div class='add'>+static int snd_als300_new_pcm(struct snd_als300 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "ALS300", 0, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "ALS300");</div><div class='add'>+	strscpy(pcm-&gt;name, "ALS300");</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	/* set operators */</div><div class='hunk'>@@ -631,19 +553,16 @@ static int __devinit snd_als300_new_pcm(struct snd_als300 *chip)</div><div class='ctx'> 				&amp;snd_als300_capture_ops);</div><div class='ctx'> </div><div class='ctx'> 	/* pre-allocation of buffers */</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-	snd_dma_pci_data(chip-&gt;pci), 64*1024, 64*1024);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_als300_init(struct snd_als300 *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;revision = (snd_als300_gcr_read(chip-&gt;port, MISC_CONTROL) &gt;&gt; 16)</div><div class='ctx'> 								&amp; 0x0000000F;</div><div class='ctx'> 	/* Setup DRAM */</div><div class='hunk'>@@ -668,52 +587,35 @@ static void snd_als300_init(struct snd_als300 *chip)</div><div class='ctx'> 	tmp = snd_als300_gcr_read(chip-&gt;port, PLAYBACK_CONTROL);</div><div class='ctx'> 	snd_als300_gcr_write(chip-&gt;port, PLAYBACK_CONTROL,</div><div class='ctx'> 			tmp &amp; ~TRANSFER_START);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_als300_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci, int chip_type,</div><div class='del'>-				       struct snd_als300 **rchip)</div><div class='add'>+static int snd_als300_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci, int chip_type)</div><div class='ctx'> {</div><div class='del'>-	struct snd_als300 *chip;</div><div class='add'>+	struct snd_als300 *chip = card-&gt;private_data;</div><div class='ctx'> 	void *irq_handler;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_als300_dev_free,</div><div class='del'>-	};</div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	snd_als300_dbgcallenter();</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "error setting 28bit DMA mask\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(28))) {</div><div class='add'>+		dev_err(card-&gt;dev, "error setting 28bit DMA mask\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	chip-&gt;chip_type = chip_type;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "ALS300")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ALS300");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	chip-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;chip_type == DEVICE_ALS300_PLUS)</div><div class='hunk'>@@ -721,83 +623,57 @@ static int __devinit snd_als300_create(struct snd_card *card,</div><div class='ctx'> 	else</div><div class='ctx'> 		irq_handler = snd_als300_interrupt;</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, irq_handler, IRQF_SHARED,</div><div class='del'>-			card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_als300_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, irq_handler, IRQF_SHARED,</div><div class='add'>+			     KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_als300_free;</div><div class='ctx'> </div><div class='ctx'> 	snd_als300_init(chip);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_als300_ac97(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "Could not create ac97\n");</div><div class='del'>-		snd_als300_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_als300_new_pcm(chip)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "Could not create PCM\n");</div><div class='del'>-		snd_als300_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "Could not create ac97\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,</div><div class='del'>-						chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_als300_free(chip);</div><div class='add'>+	err = snd_als300_new_pcm(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "Could not create PCM\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='del'>-	snd_als300_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_als300_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_als300_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_als300 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_ac97_suspend(chip-&gt;ac97);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_als300_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_als300_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_als300 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "als300: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_als300_init(chip);</div><div class='ctx'> 	snd_ac97_resume(chip-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_als300_probe(struct pci_dev *pci,</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_als300_pm, snd_als300_suspend, snd_als300_resume);</div><div class='add'>+</div><div class='add'>+static int snd_als300_probe(struct pci_dev *pci,</div><div class='ctx'>                              const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='hunk'>@@ -812,20 +688,19 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='del'>-</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	chip_type = pci_id-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_als300_create(card, pci, chip_type, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='add'>+	err = snd_als300_create(card, pci, chip_type);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ALS300");</div><div class='add'>+	strscpy(card-&gt;driver, "ALS300");</div><div class='ctx'> 	if (chip-&gt;chip_type == DEVICE_ALS300_PLUS)</div><div class='ctx'> 		/* don't know much about ALS300+ yet</div><div class='ctx'> 		 * print revision number for now */</div><div class='hunk'>@@ -836,35 +711,26 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='ctx'> 				card-&gt;shortname, chip-&gt;port, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ALS300",</div><div class='add'>+static struct pci_driver als300_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_als300_ids,</div><div class='ctx'> 	.probe = snd_als300_probe,</div><div class='del'>-	.remove = __devexit_p(snd_als300_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_als300_suspend,</div><div class='del'>-	.resume = snd_als300_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_als300_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_als300_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_als300_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_als300_init)</div><div class='del'>-module_exit(alsa_card_als300_exit)</div><div class='add'>+module_pci_driver(als300_driver);</div><div class='head'>diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c<br/>index 0e247cb90ecc..33034e07b3d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/als4000.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/als4000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/als4000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/als4000.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  card-als4000.c - driver for Avance Logic ALS4000 based soundcards.</div><div class='ctx'>  *  Copyright (C) 2000 by Bart Hartgers &lt;bart@etpmod.phys.tue.nl&gt;,</div><div class='hunk'>@@ -6,21 +7,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Framework borrowed from Massimo Piccioni's card-als100.c.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * NOTES</div><div class='ctx'>  *</div><div class='ctx'>  *  Since Avance does not provide any meaningful documentation, and I</div><div class='hunk'>@@ -65,11 +51,11 @@</div><div class='ctx'>  * - power management? (card can do voice wakeup according to datasheet!!)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -82,15 +68,14 @@</div><div class='ctx'> MODULE_AUTHOR("Bart Hartgers &lt;bart@etpmod.phys.tue.nl&gt;, Andreas Mohr");</div><div class='ctx'> MODULE_DESCRIPTION("Avance Logic ALS4000");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_JOYSTICK 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> static int joystick_port[SNDRV_CARDS];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -102,7 +87,7 @@ MODULE_PARM_DESC(id, "ID string for ALS4000 soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable ALS4000 soundcard.");</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-module_param_array(joystick_port, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(joystick_port, int, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_port, "Joystick port address for ALS4000 soundcard. (0 = disabled)");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +101,7 @@ struct snd_card_als4000 {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_als4000_ids) = {</div><div class='add'>+static const struct pci_device_id snd_als4000_ids[] = {</div><div class='ctx'> 	{ 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* ALS4000 */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -368,18 +353,6 @@ CMD_SIGNED|CMD_STEREO,			/* ALS4000_FORMAT_S16L_STEREO */</div><div class='ctx'> };	</div><div class='ctx'> #define capture_cmd(chip) (capture_cmd_vals[(chip)-&gt;capture_format])</div><div class='ctx'> </div><div class='del'>-static int snd_als4000_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_als4000_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_als4000_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -396,14 +369,14 @@ static int snd_als4000_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		count &gt;&gt;= 1;</div><div class='ctx'> 	count--;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	snd_als4000_set_rate(chip, runtime-&gt;rate);</div><div class='del'>-	snd_als4000_set_capture_dma(chip, runtime-&gt;dma_addr, size);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;mixer_lock);</div><div class='del'>-	snd_als4_cr_write(chip, ALS4K_CR1C_FIFO2_BLOCK_LENGTH_LO, count &amp; 0xff);</div><div class='del'>-	snd_als4_cr_write(chip, ALS4K_CR1D_FIFO2_BLOCK_LENGTH_HI, count &gt;&gt; 8);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;mixer_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_als4000_set_rate(chip, runtime-&gt;rate);</div><div class='add'>+		snd_als4000_set_capture_dma(chip, runtime-&gt;dma_addr, size);</div><div class='add'>+	}</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		snd_als4_cr_write(chip, ALS4K_CR1C_FIFO2_BLOCK_LENGTH_LO, count &amp; 0xff);</div><div class='add'>+		snd_als4_cr_write(chip, ALS4K_CR1D_FIFO2_BLOCK_LENGTH_HI, count &gt;&gt; 8);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -429,7 +402,7 @@ static int snd_als4000_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	 * reordering, ...). Something seems to get enabled on playback</div><div class='ctx'> 	 * that I haven't found out how to disable again, which then causes</div><div class='ctx'> 	 * the switching pops to reach the speakers the next time here. */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_als4000_set_rate(chip, runtime-&gt;rate);</div><div class='ctx'> 	snd_als4000_set_playback_dma(chip, runtime-&gt;dma_addr, size);</div><div class='ctx'> 	</div><div class='hunk'>@@ -440,7 +413,6 @@ static int snd_als4000_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_sbdsp_command(chip, count &amp; 0xff);</div><div class='ctx'> 	snd_sbdsp_command(chip, count &gt;&gt; 8);</div><div class='ctx'> 	snd_sbdsp_command(chip, playback_cmd(chip).dma_off);	</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -456,7 +428,7 @@ static int snd_als4000_capture_trigger(struct snd_pcm_substream *substream, int</div><div class='ctx'> 	   Probably need to take reg_lock as outer (or inner??) lock, too.</div><div class='ctx'> 	   (or serialize both lock operations? probably not, though... - racy?)</div><div class='ctx'> 	*/</div><div class='del'>-	spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -474,7 +446,6 @@ static int snd_als4000_capture_trigger(struct snd_pcm_substream *substream, int</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -483,7 +454,7 @@ static int snd_als4000_playback_trigger(struct snd_pcm_substream *substream, int</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -499,7 +470,6 @@ static int snd_als4000_playback_trigger(struct snd_pcm_substream *substream, int</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -508,9 +478,9 @@ static snd_pcm_uframes_t snd_als4000_capture_pointer(struct snd_pcm_substream *s</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int result;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);	</div><div class='del'>-	result = snd_als4k_gcr_read(chip, ALS4K_GCRA4_FIFO2_CURRENT_ADDR);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		result = snd_als4k_gcr_read(chip, ALS4K_GCRA4_FIFO2_CURRENT_ADDR);</div><div class='add'>+	}</div><div class='ctx'> 	result &amp;= 0xffff;</div><div class='ctx'> 	return bytes_to_frames( substream-&gt;runtime, result );</div><div class='ctx'> }</div><div class='hunk'>@@ -520,9 +490,9 @@ static snd_pcm_uframes_t snd_als4000_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned result;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);	</div><div class='del'>-	result = snd_als4k_gcr_read(chip, ALS4K_GCRA0_FIFO1_CURRENT_ADDR);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		result = snd_als4k_gcr_read(chip, ALS4K_GCRA0_FIFO1_CURRENT_ADDR);</div><div class='add'>+	}</div><div class='ctx'> 	result &amp;= 0xffff;</div><div class='ctx'> 	return bytes_to_frames( substream-&gt;runtime, result );</div><div class='ctx'> }</div><div class='hunk'>@@ -563,10 +533,10 @@ static irqreturn_t snd_als4000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	snd_als4k_iobase_writeb(chip-&gt;alt_port,</div><div class='ctx'> 			 ALS4K_IOB_0E_IRQTYPE_SB_CR1E_MPU, pci_irqstatus);</div><div class='ctx'> 	</div><div class='del'>-	spin_lock(&amp;chip-&gt;mixer_lock);</div><div class='del'>-	/* SPECS_PAGE: 20 */</div><div class='del'>-	sb_irqstatus = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;mixer_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		/* SPECS_PAGE: 20 */</div><div class='add'>+		sb_irqstatus = snd_sbmixer_read(chip, SB_DSP4_IRQSTATUS);</div><div class='add'>+	}</div><div class='ctx'> 	</div><div class='ctx'> 	if (sb_irqstatus &amp; SB_IRQTYPE_8BIT)</div><div class='ctx'> 		snd_sb_ack_8bit(chip);</div><div class='hunk'>@@ -578,7 +548,7 @@ static irqreturn_t snd_als4000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		snd_als4k_iobase_readb(chip-&gt;alt_port,</div><div class='ctx'> 					ALS4K_IOB_16_ACK_FOR_CR1E);</div><div class='ctx'> </div><div class='del'>-	/* printk(KERN_INFO "als4000: irq 0x%04x 0x%04x\n",</div><div class='add'>+	/* dev_dbg(chip-&gt;card-&gt;dev, "als4000: irq 0x%04x 0x%04x\n",</div><div class='ctx'> 					 pci_irqstatus, sb_irqstatus); */</div><div class='ctx'> </div><div class='ctx'> 	/* only ack the things we actually handled above */</div><div class='hunk'>@@ -592,7 +562,7 @@ static irqreturn_t snd_als4000_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************/</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_als4000_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_als4000_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -611,7 +581,7 @@ static struct snd_pcm_hardware snd_als4000_playback =</div><div class='ctx'> 	.fifo_size =		0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_als4000_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_als4000_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -647,7 +617,6 @@ static int snd_als4000_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;playback_substream = NULL;</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -666,35 +635,28 @@ static int snd_als4000_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_sb *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;capture_substream = NULL;</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************/</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_als4000_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_als4000_playback_ops = {</div><div class='ctx'> 	.open =		snd_als4000_playback_open,</div><div class='ctx'> 	.close =	snd_als4000_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_als4000_hw_params,</div><div class='del'>-	.hw_free =	snd_als4000_hw_free,</div><div class='ctx'> 	.prepare =	snd_als4000_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_als4000_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_als4000_playback_pointer</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_als4000_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_als4000_capture_ops = {</div><div class='ctx'> 	.open =		snd_als4000_capture_open,</div><div class='ctx'> 	.close =	snd_als4000_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_als4000_hw_params,</div><div class='del'>-	.hw_free =	snd_als4000_hw_free,</div><div class='ctx'> 	.prepare =	snd_als4000_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_als4000_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_als4000_capture_pointer</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_als4000_pcm(struct snd_sb *chip, int device)</div><div class='add'>+static int snd_als4000_pcm(struct snd_sb *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -707,8 +669,8 @@ static int __devinit snd_als4000_pcm(struct snd_sb *chip, int device)</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_als4000_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_als4000_capture_ops);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, 64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='hunk'>@@ -744,18 +706,18 @@ static void snd_als4000_configure(struct snd_sb *chip)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* do some more configuration */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;mixer_lock);</div><div class='del'>-	tmp = snd_als4_cr_read(chip, ALS4K_CR0_SB_CONFIG);</div><div class='del'>-	snd_als4_cr_write(chip, ALS4K_CR0_SB_CONFIG,</div><div class='del'>-				tmp|ALS4K_CR0_MX80_81_REG_WRITE_ENABLE);</div><div class='del'>-	/* always select DMA channel 0, since we do not actually use DMA</div><div class='del'>-	 * SPECS_PAGE: 19/20 */</div><div class='del'>-	snd_sbmixer_write(chip, SB_DSP4_DMASETUP, SB_DMASETUP_DMA0);</div><div class='del'>-	snd_als4_cr_write(chip, ALS4K_CR0_SB_CONFIG,</div><div class='del'>-				 tmp &amp; ~ALS4K_CR0_MX80_81_REG_WRITE_ENABLE);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;mixer_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;mixer_lock) {</div><div class='add'>+		tmp = snd_als4_cr_read(chip, ALS4K_CR0_SB_CONFIG);</div><div class='add'>+		snd_als4_cr_write(chip, ALS4K_CR0_SB_CONFIG,</div><div class='add'>+				  tmp|ALS4K_CR0_MX80_81_REG_WRITE_ENABLE);</div><div class='add'>+		/* always select DMA channel 0, since we do not actually use DMA</div><div class='add'>+		 * SPECS_PAGE: 19/20 */</div><div class='add'>+		snd_sbmixer_write(chip, SB_DSP4_DMASETUP, SB_DMASETUP_DMA0);</div><div class='add'>+		snd_als4_cr_write(chip, ALS4K_CR0_SB_CONFIG,</div><div class='add'>+				  tmp &amp; ~ALS4K_CR0_MX80_81_REG_WRITE_ENABLE);</div><div class='add'>+	}</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* enable interrupts */</div><div class='ctx'> 	snd_als4k_gcr_write(chip, ALS4K_GCR8C_MISC_CTRL,</div><div class='ctx'> 					ALS4K_GCR8C_IRQ_MASK_CTRL_ENABLE);</div><div class='hunk'>@@ -766,11 +728,10 @@ static void snd_als4000_configure(struct snd_sb *chip)</div><div class='ctx'> 	/* enable burst mode to prevent dropouts during high PCI bus usage */</div><div class='ctx'> 	snd_als4k_gcr_write(chip, ALS4K_GCR99_DMA_EMULATION_CTRL,</div><div class='ctx'> 		(snd_als4k_gcr_read(chip, ALS4K_GCR99_DMA_EMULATION_CTRL) &amp; ~0x07) | 0x04);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)</div><div class='add'>+static int snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> 	struct resource *r;</div><div class='hunk'>@@ -781,24 +742,25 @@ static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard,</div><div class='ctx'> </div><div class='ctx'> 	if (joystick_port[dev] == 1) { /* auto-detect */</div><div class='ctx'> 		for (io_port = 0x200; io_port &lt;= 0x218; io_port += 8) {</div><div class='del'>-			r = request_region(io_port, 8, "ALS4000 gameport");</div><div class='add'>+			r = devm_request_region(&amp;acard-&gt;pci-&gt;dev, io_port, 8,</div><div class='add'>+						"ALS4000 gameport");</div><div class='ctx'> 			if (r)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		io_port = joystick_port[dev];</div><div class='del'>-		r = request_region(io_port, 8, "ALS4000 gameport");</div><div class='add'>+		r = devm_request_region(&amp;acard-&gt;pci-&gt;dev, io_port, 8,</div><div class='add'>+					"ALS4000 gameport");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!r) {</div><div class='del'>-		printk(KERN_WARNING "als4000: cannot reserve joystick ports\n");</div><div class='add'>+		dev_warn(&amp;acard-&gt;pci-&gt;dev, "cannot reserve joystick ports\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	acard-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "als4000: cannot allocate memory for gameport\n");</div><div class='del'>-		release_and_free_resource(r);</div><div class='add'>+		dev_err(&amp;acard-&gt;pci-&gt;dev, "cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -806,7 +768,6 @@ static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard,</div><div class='ctx'> 	gameport_set_phys(gp, "pci%s/gameport0", pci_name(acard-&gt;pci));</div><div class='ctx'> 	gameport_set_dev_parent(gp, &amp;acard-&gt;pci-&gt;dev);</div><div class='ctx'> 	gp-&gt;io = io_port;</div><div class='del'>-	gameport_set_port_data(gp, r);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable legacy joystick port */</div><div class='ctx'> 	snd_als4000_set_addr(acard-&gt;iobase, 0, 0, 0, 1);</div><div class='hunk'>@@ -819,15 +780,11 @@ static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard,</div><div class='ctx'> static void snd_als4000_free_gameport(struct snd_card_als4000 *acard)</div><div class='ctx'> {</div><div class='ctx'> 	if (acard-&gt;gameport) {</div><div class='del'>-		struct resource *r = gameport_get_port_data(acard-&gt;gameport);</div><div class='del'>-</div><div class='ctx'> 		gameport_unregister_port(acard-&gt;gameport);</div><div class='ctx'> 		acard-&gt;gameport = NULL;</div><div class='ctx'> </div><div class='ctx'> 		/* disable joystick */</div><div class='ctx'> 		snd_als4000_set_addr(acard-&gt;iobase, 0, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		release_and_free_resource(r);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -843,12 +800,10 @@ static void snd_card_als4000_free( struct snd_card *card )</div><div class='ctx'> 	snd_als4k_gcr_write_addr(acard-&gt;iobase, ALS4K_GCR8C_MISC_CTRL, 0);</div><div class='ctx'> 	/* free resources */</div><div class='ctx'> 	snd_als4000_free_gameport(acard);</div><div class='del'>-	pci_release_regions(acard-&gt;pci);</div><div class='del'>-	pci_disable_device(acard-&gt;pci);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_als4000_probe(struct pci_dev *pci,</div><div class='del'>-					  const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_card_als4000_probe(struct pci_dev *pci,</div><div class='add'>+				    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -867,35 +822,30 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0) {</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* check, if we can restrict PCI DMA transfers to 24 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(24))) {</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "architecture does not support 24bit PCI busmaster DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "ALS4000")) &lt; 0) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ALS4000");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	iobase = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_word(pci, PCI_COMMAND, &amp;word);</div><div class='ctx'> 	pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, </div><div class='del'>-			      sizeof(*acard) /* private_data: acard */,</div><div class='del'>-			      &amp;card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pci_release_regions(pci);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*acard) /* private_data: acard */,</div><div class='add'>+				&amp;card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	acard = card-&gt;private_data;</div><div class='ctx'> 	acard-&gt;pci = pci;</div><div class='hunk'>@@ -905,37 +855,38 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,</div><div class='ctx'> 	/* disable all legacy ISA stuff */</div><div class='ctx'> 	snd_als4000_set_addr(acard-&gt;iobase, 0, 0, 0, 0);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_sbdsp_create(card,</div><div class='del'>-				    iobase + ALS4K_IOB_10_ADLIB_ADDR0,</div><div class='del'>-				    pci-&gt;irq,</div><div class='add'>+	err = snd_sbdsp_create(card,</div><div class='add'>+			       iobase + ALS4K_IOB_10_ADLIB_ADDR0,</div><div class='add'>+			       pci-&gt;irq,</div><div class='ctx'> 		/* internally registered as IRQF_SHARED in case of ALS4000 SB */</div><div class='del'>-				    snd_als4000_interrupt,</div><div class='del'>-				    -1,</div><div class='del'>-				    -1,</div><div class='del'>-				    SB_HW_ALS4000,</div><div class='del'>-				    &amp;chip)) &lt; 0) {</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='add'>+			       snd_als4000_interrupt,</div><div class='add'>+			       -1,</div><div class='add'>+			       -1,</div><div class='add'>+			       SB_HW_ALS4000,</div><div class='add'>+			       &amp;chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	acard-&gt;chip = chip;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;alt_port = iobase;</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	snd_als4000_configure(chip);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ALS4000");</div><div class='del'>-	strcpy(card-&gt;shortname, "Avance Logic ALS4000");</div><div class='add'>+	strscpy(card-&gt;driver, "ALS4000");</div><div class='add'>+	strscpy(card-&gt;shortname, "Avance Logic ALS4000");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;alt_port, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,</div><div class='del'>-					iobase + ALS4K_IOB_30_MIDI_DATA,</div><div class='del'>-					MPU401_INFO_INTEGRATED,</div><div class='del'>-					pci-&gt;irq, 0, &amp;chip-&gt;rmidi)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "als4000: no MPU-401 device at 0x%lx?\n",</div><div class='add'>+	err = snd_mpu401_uart_new(card, 0, MPU401_HW_ALS4000,</div><div class='add'>+				  iobase + ALS4K_IOB_30_MIDI_DATA,</div><div class='add'>+				  MPU401_INFO_INTEGRATED |</div><div class='add'>+				  MPU401_INFO_IRQ_HOOK,</div><div class='add'>+				  -1, &amp;chip-&gt;rmidi);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "no MPU-401 device at 0x%lx?\n",</div><div class='ctx'> 				iobase + ALS4K_IOB_30_MIDI_DATA);</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* FIXME: ALS4000 has interesting MPU401 configuration features</div><div class='ctx'> 	 * at ALS4K_CR1A_MPU401_UART_MODE_CONTROL</div><div class='hunk'>@@ -943,83 +894,62 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,</div><div class='ctx'> 	 * however there doesn't seem to be an ALSA API for this...</div><div class='ctx'> 	 * SPECS_PAGE: 21 */</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_als4000_pcm(chip, 0)) &lt; 0) {</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_sbmixer_new(chip)) &lt; 0) {</div><div class='del'>-		goto out_err;</div><div class='del'>-	}	    </div><div class='add'>+	err = snd_als4000_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_sbmixer_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_opl3_create(card,</div><div class='ctx'> 				iobase + ALS4K_IOB_10_ADLIB_ADDR0,</div><div class='ctx'> 				iobase + ALS4K_IOB_12_ADLIB_ADDR2,</div><div class='ctx'> 			    OPL3_HW_AUTO, 1, &amp;opl3) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "als4000: no OPL device at 0x%lx-0x%lx?\n",</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "no OPL device at 0x%lx-0x%lx?\n",</div><div class='ctx'> 			   iobase + ALS4K_IOB_10_ADLIB_ADDR0,</div><div class='ctx'> 			   iobase + ALS4K_IOB_12_ADLIB_ADDR2);</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-			goto out_err;</div><div class='del'>-		}</div><div class='add'>+		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_als4000_create_gameport(acard, dev);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='del'>-	err = 0;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_card_als4000_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_card_als4000_probe(struct pci_dev *pci,</div><div class='add'>+				  const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_card_als4000_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_als4000_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_als4000_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_card_als4000 *acard = card-&gt;private_data;</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> 	</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_sbmixer_suspend(chip);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_als4000_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_als4000_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_card_als4000 *acard = card-&gt;private_data;</div><div class='ctx'> 	struct snd_sb *chip = acard-&gt;chip;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "als4000: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_als4000_configure(chip);</div><div class='ctx'> 	snd_sbdsp_reset(chip);</div><div class='ctx'> 	snd_sbmixer_resume(chip);</div><div class='hunk'>@@ -1032,29 +962,16 @@ static int snd_als4000_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ALS4000",</div><div class='add'>+static struct pci_driver als4000_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_als4000_ids,</div><div class='ctx'> 	.probe = snd_card_als4000_probe,</div><div class='del'>-	.remove = __devexit_p(snd_card_als4000_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_als4000_suspend,</div><div class='del'>-	.resume = snd_als4000_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_als4000_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_als4000_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_als4000_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_als4000_init)</div><div class='del'>-module_exit(alsa_card_als4000_exit)</div><div class='add'>+module_pci_driver(als4000_driver);</div><div class='head'>diff --git a/sound/pci/asihpi/Makefile b/sound/pci/asihpi/Makefile<br/>index 391830a4556c..d558a974fa7e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='del'>-snd-asihpi-objs := asihpi.o hpioctl.o hpimsginit.o\</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-asihpi-y := asihpi.o hpioctl.o hpimsginit.o\</div><div class='ctx'> 	hpicmn.o hpifunc.o hpidebug.o hpidspcd.o\</div><div class='ctx'> 	hpios.o hpi6000.o hpi6205.o hpimsgx.o</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c<br/>index c80b0b863c54..fd0a67b772d1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/asihpi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/asihpi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/asihpi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/asihpi.c</a></div><div class='hunk'>@@ -1,49 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  Asihpi soundcard</div><div class='del'>- *  Copyright (c) by AudioScience Inc &lt;alsa@audioscience.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of version 2 of the GNU General Public License as</div><div class='del'>- *   published by the Free Software Foundation;</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='add'>+ *  Copyright (c) by AudioScience Inc &lt;support@audioscience.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  The following is not a condition of use, merely a request:</div><div class='ctx'>  *  If you modify this program, particularly if you fix errors, AudioScience Inc</div><div class='ctx'>  *  would appreciate it if you grant us the right to use those modifications</div><div class='ctx'>  *  for any purpose including commercial applications.</div><div class='ctx'>  */</div><div class='del'>-/* &gt;0: print Hw params, timer vars. &gt;1: print stream write/copy sizes  */</div><div class='del'>-#define REALLY_VERBOSE_LOGGING 0</div><div class='del'>-</div><div class='del'>-#if REALLY_VERBOSE_LOGGING</div><div class='del'>-#define VPRINTK1 snd_printd</div><div class='del'>-#else</div><div class='del'>-#define VPRINTK1(...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if REALLY_VERBOSE_LOGGING &gt; 1</div><div class='del'>-#define VPRINTK2 snd_printd</div><div class='del'>-#else</div><div class='del'>-#define VPRINTK2(...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef ASI_STYLE_NAMES</div><div class='del'>-/* not sure how ALSA style name should look */</div><div class='del'>-#define ASI_STYLE_NAMES 1</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='add'>+#include "hpi_version.h"</div><div class='ctx'> #include "hpimsginit.h"</div><div class='ctx'> #include "hpioctl.h"</div><div class='add'>+#include "hpicmn.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -51,6 +21,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -60,38 +31,44 @@</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> #include &lt;sound/hwdep.h&gt;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("AudioScience inc. &lt;support@audioscience.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx");</div><div class='add'>+MODULE_DESCRIPTION("AudioScience ALSA ASI5xxx ASI6xxx ASI87xx ASI89xx "</div><div class='add'>+			HPI_VER_STRING);</div><div class='add'>+</div><div class='add'>+#ifdef ASIHPI_VERBOSE_DEBUG</div><div class='add'>+#define asihpi_dbg(format, args...) pr_debug(format, ##args)</div><div class='add'>+#else</div><div class='add'>+#define asihpi_dbg(format, args...) do { } while (0)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='del'>-static int enable_hpi_hwdep = 1;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable_hpi_hwdep = 1;</div><div class='ctx'> </div><div class='del'>-module_param_array(index, int, NULL, S_IRUGO);</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "ALSA index value for AudioScience soundcard.");</div><div class='ctx'> </div><div class='del'>-module_param_array(id, charp, NULL, S_IRUGO);</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ALSA ID string for AudioScience soundcard.");</div><div class='ctx'> </div><div class='del'>-module_param_array(enable, bool, NULL, S_IRUGO);</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "ALSA enable AudioScience soundcard.");</div><div class='ctx'> </div><div class='del'>-module_param(enable_hpi_hwdep, bool, S_IRUGO|S_IWUSR);</div><div class='add'>+module_param(enable_hpi_hwdep, bool, 0644);</div><div class='ctx'> MODULE_PARM_DESC(enable_hpi_hwdep,</div><div class='ctx'> 		"ALSA enable HPI hwdep for AudioScience soundcard ");</div><div class='ctx'> </div><div class='ctx'> /* identify driver */</div><div class='ctx'> #ifdef KERNEL_ALSA_BUILD</div><div class='del'>-static char *build_info = "built using headers from kernel source";</div><div class='del'>-module_param(build_info, charp, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(build_info, "built using headers from kernel source");</div><div class='add'>+static char *build_info = "Built using headers from kernel source";</div><div class='add'>+module_param(build_info, charp, 0444);</div><div class='add'>+MODULE_PARM_DESC(build_info, "Built using headers from kernel source");</div><div class='ctx'> #else</div><div class='del'>-static char *build_info = "built within ALSA source";</div><div class='del'>-module_param(build_info, charp, S_IRUGO);</div><div class='del'>-MODULE_PARM_DESC(build_info, "built within ALSA source");</div><div class='add'>+static char *build_info = "Built within ALSA source";</div><div class='add'>+module_param(build_info, charp, 0444);</div><div class='add'>+MODULE_PARM_DESC(build_info, "Built within ALSA source");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* set to 1 to dump every control from adapter to log */</div><div class='hunk'>@@ -100,23 +77,17 @@ static const int mixer_dump;</div><div class='ctx'> #define DEFAULT_SAMPLERATE 44100</div><div class='ctx'> static int adapter_fs = DEFAULT_SAMPLERATE;</div><div class='ctx'> </div><div class='del'>-static struct hpi_hsubsys *ss;	/* handle to HPI audio subsystem */</div><div class='del'>-</div><div class='ctx'> /* defaults */</div><div class='ctx'> #define PERIODS_MIN 2</div><div class='del'>-#define PERIOD_BYTES_MIN  2304</div><div class='add'>+#define PERIOD_BYTES_MIN  2048</div><div class='ctx'> #define BUFFER_BYTES_MAX (512 * 1024)</div><div class='ctx'> </div><div class='del'>-/*#define TIMER_MILLISECONDS 20</div><div class='del'>-#define FORCE_TIMER_JIFFIES ((TIMER_MILLISECONDS * HZ + 999)/1000)</div><div class='del'>-*/</div><div class='del'>-</div><div class='ctx'> #define MAX_CLOCKSOURCES (HPI_SAMPLECLOCK_SOURCE_LAST + 1 + 7)</div><div class='ctx'> </div><div class='ctx'> struct clk_source {</div><div class='ctx'> 	int source;</div><div class='ctx'> 	int index;</div><div class='del'>-	char *name;</div><div class='add'>+	const char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct clk_cache {</div><div class='hunk'>@@ -129,22 +100,28 @@ struct clk_cache {</div><div class='ctx'> struct snd_card_asihpi {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct pci_dev *pci;</div><div class='del'>-	u16 adapter_index;</div><div class='del'>-	u32 serial_number;</div><div class='del'>-	u16 type;</div><div class='del'>-	u16 version;</div><div class='del'>-	u16 num_outstreams;</div><div class='del'>-	u16 num_instreams;</div><div class='add'>+	struct hpi_adapter *hpi;</div><div class='add'>+</div><div class='add'>+	/* In low latency mode there is only one stream, a pointer to its</div><div class='add'>+	 * private data is stored here on trigger and cleared on stop.</div><div class='add'>+	 * The interrupt handler uses it as a parameter when calling</div><div class='add'>+	 * snd_card_asihpi_timer_function().</div><div class='add'>+	 */</div><div class='add'>+	struct snd_card_asihpi_pcm *llmode_streampriv;</div><div class='add'>+	void (*pcm_start)(struct snd_pcm_substream *substream);</div><div class='add'>+	void (*pcm_stop)(struct snd_pcm_substream *substream);</div><div class='ctx'> </div><div class='ctx'> 	u32 h_mixer;</div><div class='ctx'> 	struct clk_cache cc;</div><div class='ctx'> </div><div class='del'>-	u16 support_mmap;</div><div class='add'>+	u16 can_dma;</div><div class='ctx'> 	u16 support_grouping;</div><div class='ctx'> 	u16 support_mrx;</div><div class='ctx'> 	u16 update_interval_frames;</div><div class='ctx'> 	u16 in_max_chans;</div><div class='ctx'> 	u16 out_max_chans;</div><div class='add'>+	u16 in_min_chans;</div><div class='add'>+	u16 out_min_chans;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Per stream data */</div><div class='hunk'>@@ -152,11 +129,13 @@ struct snd_card_asihpi_pcm {</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	unsigned int respawn_timer;</div><div class='ctx'> 	unsigned int hpi_buffer_attached;</div><div class='del'>-	unsigned int pcm_size;</div><div class='del'>-	unsigned int pcm_count;</div><div class='add'>+	unsigned int buffer_bytes;</div><div class='add'>+	unsigned int period_bytes;</div><div class='ctx'> 	unsigned int bytes_per_sec;</div><div class='del'>-	unsigned int pcm_irq_pos;	/* IRQ position */</div><div class='del'>-	unsigned int pcm_buf_pos;	/* position in buffer */</div><div class='add'>+	unsigned int pcm_buf_host_rw_ofs; /* Host R/W pos */</div><div class='add'>+	unsigned int pcm_buf_dma_ofs;	/* DMA R/W offset in buffer */</div><div class='add'>+	unsigned int pcm_buf_elapsed_dma_ofs;	/* DMA R/W offset in buffer */</div><div class='add'>+	unsigned int drained_count;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	u32 h_stream;</div><div class='ctx'> 	struct hpi_format format;</div><div class='hunk'>@@ -167,7 +146,6 @@ struct snd_card_asihpi_pcm {</div><div class='ctx'> /* Functions to allow driver to give a buffer to HPI for busmastering */</div><div class='ctx'> </div><div class='ctx'> static u16 hpi_stream_host_buffer_attach(</div><div class='del'>-	struct hpi_hsubsys *hS,</div><div class='ctx'> 	u32 h_stream,   /* handle to outstream. */</div><div class='ctx'> 	u32 size_in_bytes, /* size in bytes of bus mastering buffer */</div><div class='ctx'> 	u32 pci_address</div><div class='hunk'>@@ -194,10 +172,7 @@ static u16 hpi_stream_host_buffer_attach(</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 hpi_stream_host_buffer_detach(</div><div class='del'>-	struct hpi_hsubsys *hS,</div><div class='del'>-	u32  h_stream</div><div class='del'>-)</div><div class='add'>+static u16 hpi_stream_host_buffer_detach(u32  h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -218,24 +193,23 @@ static u16 hpi_stream_host_buffer_detach(</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 hpi_stream_start(struct hpi_hsubsys *hS, u32 h_stream)</div><div class='add'>+static inline u16 hpi_stream_start(u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_start(hS, h_stream);</div><div class='add'>+		return hpi_outstream_start(h_stream);</div><div class='ctx'> 	else</div><div class='del'>-		return hpi_instream_start(hS, h_stream);</div><div class='add'>+		return hpi_instream_start(h_stream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 hpi_stream_stop(struct hpi_hsubsys *hS, u32 h_stream)</div><div class='add'>+static inline u16 hpi_stream_stop(u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_stop(hS, h_stream);</div><div class='add'>+		return hpi_outstream_stop(h_stream);</div><div class='ctx'> 	else</div><div class='del'>-		return hpi_instream_stop(hS, h_stream);</div><div class='add'>+		return hpi_instream_stop(h_stream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u16 hpi_stream_get_info_ex(</div><div class='del'>-    struct hpi_hsubsys *hS,</div><div class='ctx'>     u32 h_stream,</div><div class='ctx'>     u16        *pw_state,</div><div class='ctx'>     u32        *pbuffer_size,</div><div class='hunk'>@@ -244,49 +218,40 @@ static inline u16 hpi_stream_get_info_ex(</div><div class='ctx'>     u32        *pauxiliary_data</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='add'>+	u16 e;</div><div class='ctx'> 	if (hpi_handle_object(h_stream)  ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_get_info_ex(hS, h_stream, pw_state,</div><div class='add'>+		e = hpi_outstream_get_info_ex(h_stream, pw_state,</div><div class='ctx'> 					pbuffer_size, pdata_in_buffer,</div><div class='ctx'> 					psample_count, pauxiliary_data);</div><div class='ctx'> 	else</div><div class='del'>-		return hpi_instream_get_info_ex(hS, h_stream, pw_state,</div><div class='add'>+		e = hpi_instream_get_info_ex(h_stream, pw_state,</div><div class='ctx'> 					pbuffer_size, pdata_in_buffer,</div><div class='ctx'> 					psample_count, pauxiliary_data);</div><div class='add'>+	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 hpi_stream_group_add(struct hpi_hsubsys *hS,</div><div class='add'>+static inline u16 hpi_stream_group_add(</div><div class='ctx'> 					u32 h_master,</div><div class='ctx'> 					u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	if (hpi_handle_object(h_master) ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_group_add(hS, h_master, h_stream);</div><div class='del'>-	else</div><div class='del'>-		return hpi_instream_group_add(hS, h_master, h_stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hpi_stream_group_reset(struct hpi_hsubsys *hS,</div><div class='del'>-						u32 h_stream)</div><div class='del'>-{</div><div class='del'>-	if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_group_reset(hS, h_stream);</div><div class='add'>+		return hpi_outstream_group_add(h_master, h_stream);</div><div class='ctx'> 	else</div><div class='del'>-		return hpi_instream_group_reset(hS, h_stream);</div><div class='add'>+		return hpi_instream_group_add(h_master, h_stream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 hpi_stream_group_get_map(struct hpi_hsubsys *hS,</div><div class='del'>-				u32 h_stream, u32 *mo, u32 *mi)</div><div class='add'>+static inline u16 hpi_stream_group_reset(u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)</div><div class='del'>-		return hpi_outstream_group_get_map(hS, h_stream, mo, mi);</div><div class='add'>+		return hpi_outstream_group_reset(h_stream);</div><div class='ctx'> 	else</div><div class='del'>-		return hpi_instream_group_get_map(hS, h_stream, mo, mi);</div><div class='add'>+		return hpi_instream_group_reset(h_stream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 handle_error(u16 err, int line, char *filename)</div><div class='ctx'> {</div><div class='ctx'> 	if (err)</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-			"in file %s, line %d: HPI error %d\n",</div><div class='add'>+		pr_warn("in file %s, line %d: HPI error %d\n",</div><div class='ctx'> 			filename, line, err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -294,53 +259,58 @@ static u16 handle_error(u16 err, int line, char *filename)</div><div class='ctx'> #define hpi_handle_error(x)  handle_error(x, __LINE__, __FILE__)</div><div class='ctx'> </div><div class='ctx'> /***************************** GENERAL PCM ****************/</div><div class='del'>-#if REALLY_VERBOSE_LOGGING</div><div class='del'>-static void print_hwparams(struct snd_pcm_hw_params *p)</div><div class='del'>-{</div><div class='del'>-	snd_printd("HWPARAMS \n");</div><div class='del'>-	snd_printd("samplerate %d \n", params_rate(p));</div><div class='del'>-	snd_printd("channels %d \n", params_channels(p));</div><div class='del'>-	snd_printd("format %d \n", params_format(p));</div><div class='del'>-	snd_printd("subformat %d \n", params_subformat(p));</div><div class='del'>-	snd_printd("buffer bytes %d \n", params_buffer_bytes(p));</div><div class='del'>-	snd_printd("period bytes %d \n", params_period_bytes(p));</div><div class='del'>-	snd_printd("access %d \n", params_access(p));</div><div class='del'>-	snd_printd("period_size %d \n", params_period_size(p));</div><div class='del'>-	snd_printd("periods %d \n", params_periods(p));</div><div class='del'>-	snd_printd("buffer_size %d \n", params_buffer_size(p));</div><div class='add'>+</div><div class='add'>+static void print_hwparams(struct snd_pcm_substream *substream,</div><div class='add'>+				struct snd_pcm_hw_params *p)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = substream-&gt;pcm-&gt;card-&gt;dev;</div><div class='add'>+	char name[16];</div><div class='add'>+</div><div class='add'>+	snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='add'>+	dev_dbg(dev, "%s HWPARAMS\n", name);</div><div class='add'>+	dev_dbg(dev, " samplerate=%dHz channels=%d format=%d subformat=%d\n",</div><div class='add'>+		params_rate(p), params_channels(p),</div><div class='add'>+		params_format(p), params_subformat(p));</div><div class='add'>+	dev_dbg(dev, " buffer=%dB period=%dB period_size=%dB periods=%d\n",</div><div class='add'>+		params_buffer_bytes(p), params_period_bytes(p),</div><div class='add'>+		params_period_size(p), params_periods(p));</div><div class='add'>+	dev_dbg(dev, " buffer_size=%d access=%d data_rate=%dB/s\n",</div><div class='add'>+		params_buffer_size(p), params_access(p),</div><div class='add'>+		params_rate(p) * params_channels(p) *</div><div class='add'>+		snd_pcm_format_width(params_format(p)) / 8);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define print_hwparams(x)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static snd_pcm_format_t hpi_to_alsa_formats[] = {</div><div class='del'>-	-1,			/* INVALID */</div><div class='add'>+#define INVALID_FORMAT	(__force snd_pcm_format_t)(-1)</div><div class='add'>+</div><div class='add'>+static const snd_pcm_format_t hpi_to_alsa_formats[] = {</div><div class='add'>+	INVALID_FORMAT,		/* INVALID */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_U8,	/* HPI_FORMAT_PCM8_UNSIGNED        1 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_S16,	/* HPI_FORMAT_PCM16_SIGNED         2 */</div><div class='del'>-	-1,			/* HPI_FORMAT_MPEG_L1              3 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_MPEG_L1              3 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_MPEG,	/* HPI_FORMAT_MPEG_L2              4 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_MPEG,	/* HPI_FORMAT_MPEG_L3              5 */</div><div class='del'>-	-1,			/* HPI_FORMAT_DOLBY_AC2            6 */</div><div class='del'>-	-1,			/* HPI_FORMAT_DOLBY_AC3            7 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_DOLBY_AC2            6 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_DOLBY_AC3            7 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_S16_BE,/* HPI_FORMAT_PCM16_BIGENDIAN      8 */</div><div class='del'>-	-1,			/* HPI_FORMAT_AA_TAGIT1_HITS       9 */</div><div class='del'>-	-1,			/* HPI_FORMAT_AA_TAGIT1_INSERTS   10 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_AA_TAGIT1_HITS       9 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_AA_TAGIT1_INSERTS   10 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_S32,	/* HPI_FORMAT_PCM32_SIGNED        11 */</div><div class='del'>-	-1,			/* HPI_FORMAT_RAW_BITSTREAM       12 */</div><div class='del'>-	-1,			/* HPI_FORMAT_AA_TAGIT1_HITS_EX1  13 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_RAW_BITSTREAM       12 */</div><div class='add'>+	INVALID_FORMAT,		/* HPI_FORMAT_AA_TAGIT1_HITS_EX1  13 */</div><div class='ctx'> 	SNDRV_PCM_FORMAT_FLOAT,	/* HPI_FORMAT_PCM32_FLOAT         14 */</div><div class='ctx'> #if 1</div><div class='ctx'> 	/* ALSA can't handle 3 byte sample size together with power-of-2</div><div class='ctx'> 	 *  constraint on buffer_bytes, so disable this format</div><div class='ctx'> 	 */</div><div class='del'>-	-1</div><div class='add'>+	INVALID_FORMAT</div><div class='ctx'> #else</div><div class='del'>-	/* SNDRV_PCM_FORMAT_S24_3LE */	/* { HPI_FORMAT_PCM24_SIGNED        15 */</div><div class='add'>+	/* SNDRV_PCM_FORMAT_S24_3LE */ /* HPI_FORMAT_PCM24_SIGNED 15 */</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int snd_card_asihpi_format_alsa2hpi(snd_pcm_format_t alsa_format,</div><div class='add'>+static int snd_card_asihpi_format_alsa2hpi(struct snd_card_asihpi *asihpi,</div><div class='add'>+					   snd_pcm_format_t alsa_format,</div><div class='ctx'> 					   u16 *hpi_format)</div><div class='ctx'> {</div><div class='ctx'> 	u16 format;</div><div class='hunk'>@@ -353,8 +323,8 @@ static int snd_card_asihpi_format_alsa2hpi(snd_pcm_format_t alsa_format,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_WARNING "failed match for alsa format %d\n",</div><div class='del'>-		   alsa_format);</div><div class='add'>+	dev_dbg(asihpi-&gt;card-&gt;dev, "failed match for alsa format %d\n",</div><div class='add'>+		alsa_format);</div><div class='ctx'> 	*hpi_format = 0;</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -378,21 +348,21 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* on cards without SRC,</div><div class='ctx'> 		   valid rates are determined by sampleclock */</div><div class='del'>-		err = hpi_mixer_get_control(ss, asihpi-&gt;h_mixer,</div><div class='add'>+		err = hpi_mixer_get_control(asihpi-&gt;h_mixer,</div><div class='ctx'> 					  HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,</div><div class='ctx'> 					  HPI_CONTROL_SAMPLECLOCK, &amp;h_control);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				"no local sampleclock, err %d\n", err);</div><div class='add'>+			dev_err(&amp;asihpi-&gt;pci-&gt;dev,</div><div class='add'>+				"No local sampleclock, err %d\n", err);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (idx = 0; idx &lt; 100; idx++) {</div><div class='del'>-			if (hpi_sample_clock_query_local_rate(ss,</div><div class='del'>-				h_control, idx, &amp;sample_rate)) {</div><div class='del'>-				if (!idx)</div><div class='del'>-					snd_printk(KERN_ERR</div><div class='del'>-						"local rate query failed\n");</div><div class='del'>-</div><div class='add'>+		for (idx = -1; idx &lt; 100; idx++) {</div><div class='add'>+			if (idx == -1) {</div><div class='add'>+				if (hpi_sample_clock_get_sample_rate(h_control,</div><div class='add'>+								&amp;sample_rate))</div><div class='add'>+					continue;</div><div class='add'>+			} else if (hpi_sample_clock_query_local_rate(h_control,</div><div class='add'>+							idx, &amp;sample_rate)) {</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -445,8 +415,6 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* printk(KERN_INFO "Supported rates %X %d %d\n",</div><div class='del'>-	   rates, rate_min, rate_max); */</div><div class='ctx'> 	pcmhw-&gt;rates = rates;</div><div class='ctx'> 	pcmhw-&gt;rate_min = rate_min;</div><div class='ctx'> 	pcmhw-&gt;rate_max = rate_max;</div><div class='hunk'>@@ -463,54 +431,41 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int width;</div><div class='ctx'> 	unsigned int bytes_per_sec;</div><div class='ctx'> </div><div class='del'>-	print_hwparams(params);</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = snd_card_asihpi_format_alsa2hpi(params_format(params), &amp;format);</div><div class='add'>+	print_hwparams(substream, params);</div><div class='add'>+	err = snd_card_asihpi_format_alsa2hpi(card, params_format(params), &amp;format);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	VPRINTK1(KERN_INFO "format %d, %d chans, %d_hz\n",</div><div class='del'>-				format, params_channels(params),</div><div class='del'>-				params_rate(params));</div><div class='del'>-</div><div class='ctx'> 	hpi_handle_error(hpi_format_create(&amp;dpcm-&gt;format,</div><div class='ctx'> 			params_channels(params),</div><div class='ctx'> 			format, params_rate(params), 0, 0));</div><div class='ctx'> </div><div class='ctx'> 	if (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) {</div><div class='del'>-		if (hpi_instream_reset(ss, dpcm-&gt;h_stream) != 0)</div><div class='add'>+		if (hpi_instream_reset(dpcm-&gt;h_stream) != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		if (hpi_instream_set_format(ss,</div><div class='add'>+		if (hpi_instream_set_format(</div><div class='ctx'> 			dpcm-&gt;h_stream, &amp;dpcm-&gt;format) != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dpcm-&gt;hpi_buffer_attached = 0;</div><div class='del'>-	if (card-&gt;support_mmap) {</div><div class='del'>-</div><div class='del'>-		err = hpi_stream_host_buffer_attach(ss, dpcm-&gt;h_stream,</div><div class='add'>+	if (card-&gt;can_dma) {</div><div class='add'>+		err = hpi_stream_host_buffer_attach(dpcm-&gt;h_stream,</div><div class='ctx'> 			params_buffer_bytes(params),  runtime-&gt;dma_addr);</div><div class='ctx'> 		if (err == 0) {</div><div class='del'>-			snd_printd(KERN_INFO</div><div class='del'>-				"stream_host_buffer_attach succeeded %u %lu\n",</div><div class='add'>+			dev_dbg(card-&gt;card-&gt;dev,</div><div class='add'>+				"stream_host_buffer_attach success %u %lu\n",</div><div class='ctx'> 				params_buffer_bytes(params),</div><div class='ctx'> 				(unsigned long)runtime-&gt;dma_addr);</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printd(KERN_INFO</div><div class='del'>-					"stream_host_buffer_attach error %d\n",</div><div class='del'>-					err);</div><div class='add'>+			dev_dbg(card-&gt;card-&gt;dev,</div><div class='add'>+				"stream_host_buffer_attach error %d\n", err);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = hpi_stream_get_info_ex(ss, dpcm-&gt;h_stream, NULL,</div><div class='del'>-						&amp;dpcm-&gt;hpi_buffer_attached,</div><div class='del'>-						NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-		snd_printd(KERN_INFO "stream_host_buffer_attach status 0x%x\n",</div><div class='del'>-				dpcm-&gt;hpi_buffer_attached);</div><div class='add'>+		hpi_stream_get_info_ex(dpcm-&gt;h_stream, NULL,</div><div class='add'>+				&amp;dpcm-&gt;hpi_buffer_attached, NULL, NULL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> 	bytes_per_sec = params_rate(params) * params_channels(params);</div><div class='ctx'> 	width = snd_pcm_format_width(params_format(params));</div><div class='hunk'>@@ -520,16 +475,29 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	dpcm-&gt;bytes_per_sec = bytes_per_sec;</div><div class='del'>-	dpcm-&gt;pcm_size = params_buffer_bytes(params);</div><div class='del'>-	dpcm-&gt;pcm_count = params_period_bytes(params);</div><div class='del'>-	snd_printd(KERN_INFO "pcm_size=%d, pcm_count=%d, bps=%d\n",</div><div class='del'>-			dpcm-&gt;pcm_size, dpcm-&gt;pcm_count, bytes_per_sec);</div><div class='add'>+	dpcm-&gt;buffer_bytes = params_buffer_bytes(params);</div><div class='add'>+	dpcm-&gt;period_bytes = params_period_bytes(params);</div><div class='ctx'> </div><div class='del'>-	dpcm-&gt;pcm_irq_pos = 0;</div><div class='del'>-	dpcm-&gt;pcm_buf_pos = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='add'>+	if (dpcm-&gt;hpi_buffer_attached)</div><div class='add'>+		hpi_stream_host_buffer_detach(dpcm-&gt;h_stream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='add'>+	kfree(dpcm);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *</div><div class='ctx'> 					    substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -537,12 +505,11 @@ static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	int expiry;</div><div class='ctx'> </div><div class='del'>-	expiry = (dpcm-&gt;pcm_count * HZ / dpcm-&gt;bytes_per_sec);</div><div class='del'>-	/* wait longer the first time, for samples to propagate */</div><div class='del'>-	expiry = max(expiry, 20);</div><div class='del'>-	dpcm-&gt;timer.expires = jiffies + expiry;</div><div class='add'>+	expiry = HZ / 200;</div><div class='add'>+</div><div class='add'>+	expiry = max(expiry, 1); /* don't let it be zero! */</div><div class='add'>+	mod_timer(&amp;dpcm-&gt;timer, jiffies + expiry);</div><div class='ctx'> 	dpcm-&gt;respawn_timer = 1;</div><div class='del'>-	add_timer(&amp;dpcm-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_card_asihpi_pcm_timer_stop(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -551,7 +518,35 @@ static void snd_card_asihpi_pcm_timer_stop(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	dpcm-&gt;respawn_timer = 0;</div><div class='del'>-	del_timer(&amp;dpcm-&gt;timer);</div><div class='add'>+	timer_delete(&amp;dpcm-&gt;timer);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_card_asihpi_pcm_int_start(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_card_asihpi_pcm *dpcm;</div><div class='add'>+	struct snd_card_asihpi *card;</div><div class='add'>+</div><div class='add'>+	dpcm = (struct snd_card_asihpi_pcm *)substream-&gt;runtime-&gt;private_data;</div><div class='add'>+	card = snd_pcm_substream_chip(substream);</div><div class='add'>+</div><div class='add'>+	WARN_ON(in_interrupt());</div><div class='add'>+	card-&gt;llmode_streampriv = dpcm;</div><div class='add'>+</div><div class='add'>+	hpi_handle_error(hpi_adapter_set_property(card-&gt;hpi-&gt;adapter-&gt;index,</div><div class='add'>+		HPI_ADAPTER_PROPERTY_IRQ_RATE,</div><div class='add'>+		card-&gt;update_interval_frames, 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_card_asihpi_pcm_int_stop(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_card_asihpi *card;</div><div class='add'>+</div><div class='add'>+	card = snd_pcm_substream_chip(substream);</div><div class='add'>+</div><div class='add'>+	hpi_handle_error(hpi_adapter_set_property(card-&gt;hpi-&gt;adapter-&gt;index,</div><div class='add'>+		HPI_ADAPTER_PROPERTY_IRQ_RATE, 0, 0));</div><div class='add'>+</div><div class='add'>+	card-&gt;llmode_streampriv = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -561,38 +556,45 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_substream *s;</div><div class='ctx'> 	u16 e;</div><div class='add'>+	char name[16];</div><div class='add'>+</div><div class='add'>+	snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='ctx'> </div><div class='del'>-	snd_printd("trigger %dstream %d\n",</div><div class='del'>-			substream-&gt;stream, substream-&gt;number);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+		dev_dbg(card-&gt;card-&gt;dev, "%s trigger start\n", name);</div><div class='ctx'> 		snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-			struct snd_card_asihpi_pcm *ds;</div><div class='del'>-			ds = s-&gt;runtime-&gt;private_data;</div><div class='add'>+			struct snd_pcm_runtime *runtime = s-&gt;runtime;</div><div class='add'>+			struct snd_card_asihpi_pcm *ds = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 			if (snd_pcm_substream_chip(s) != card)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			if ((s-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) &amp;&amp;</div><div class='del'>-				(card-&gt;support_mmap)) {</div><div class='add'>+			/* don't link Cap and Play */</div><div class='add'>+			if (substream-&gt;stream != s-&gt;stream)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ds-&gt;drained_count = 0;</div><div class='add'>+			if (s-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='ctx'> 				/* How do I know how much valid data is present</div><div class='del'>-				* in buffer? Just guessing 2 periods, but if</div><div class='add'>+				* in buffer? Must be at least one period!</div><div class='add'>+				* Guessing 2 periods, but if</div><div class='ctx'> 				* buffer is bigger it may contain even more</div><div class='ctx'> 				* data??</div><div class='ctx'> 				*/</div><div class='del'>-				unsigned int preload = ds-&gt;pcm_count * 2;</div><div class='del'>-				VPRINTK2("preload %d\n", preload);</div><div class='add'>+				unsigned int preload = ds-&gt;period_bytes * 1;</div><div class='add'>+				asihpi_dbg("%d preload %d\n", s-&gt;number, preload);</div><div class='ctx'> 				hpi_handle_error(hpi_outstream_write_buf(</div><div class='del'>-						ss, ds-&gt;h_stream,</div><div class='del'>-						&amp;s-&gt;runtime-&gt;dma_area[0],</div><div class='add'>+						ds-&gt;h_stream,</div><div class='add'>+						&amp;runtime-&gt;dma_area[0],</div><div class='ctx'> 						preload,</div><div class='ctx'> 						&amp;ds-&gt;format));</div><div class='add'>+				ds-&gt;pcm_buf_host_rw_ofs = preload;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (card-&gt;support_grouping) {</div><div class='del'>-				VPRINTK1("\t_group %dstream %d\n", s-&gt;stream,</div><div class='del'>-						s-&gt;number);</div><div class='del'>-				e = hpi_stream_group_add(ss,</div><div class='add'>+				dev_dbg(card-&gt;card-&gt;dev, "%d group\n", s-&gt;number);</div><div class='add'>+				e = hpi_stream_group_add(</div><div class='ctx'> 					dpcm-&gt;h_stream,</div><div class='ctx'> 					ds-&gt;h_stream);</div><div class='ctx'> 				if (!e) {</div><div class='hunk'>@@ -604,99 +606,83 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			} else</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		snd_printd("start\n");</div><div class='ctx'> 		/* start the master stream */</div><div class='del'>-		snd_card_asihpi_pcm_timer_start(substream);</div><div class='del'>-		hpi_handle_error(hpi_stream_start(ss, dpcm-&gt;h_stream));</div><div class='add'>+		card-&gt;pcm_start(substream);</div><div class='add'>+		if ((substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE) ||</div><div class='add'>+			!card-&gt;can_dma)</div><div class='add'>+			hpi_handle_error(hpi_stream_start(dpcm-&gt;h_stream));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		snd_card_asihpi_pcm_timer_stop(substream);</div><div class='add'>+		dev_dbg(card-&gt;card-&gt;dev, "%s trigger stop\n", name);</div><div class='add'>+		card-&gt;pcm_stop(substream);</div><div class='ctx'> 		snd_pcm_group_for_each_entry(s, substream) {</div><div class='ctx'> 			if (snd_pcm_substream_chip(s) != card)</div><div class='ctx'> 				continue;</div><div class='add'>+			/* don't link Cap and Play */</div><div class='add'>+			if (substream-&gt;stream != s-&gt;stream)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='ctx'> 			/*? workaround linked streams don't</div><div class='ctx'> 			transition to SETUP 20070706*/</div><div class='del'>-			s-&gt;runtime-&gt;status-&gt;state = SNDRV_PCM_STATE_SETUP;</div><div class='add'>+			__snd_pcm_set_state(s-&gt;runtime, SNDRV_PCM_STATE_SETUP);</div><div class='ctx'> </div><div class='ctx'> 			if (card-&gt;support_grouping) {</div><div class='del'>-				VPRINTK1("\t_group %dstream %d\n", s-&gt;stream,</div><div class='del'>-					s-&gt;number);</div><div class='add'>+				dev_dbg(card-&gt;card-&gt;dev, "%d group\n", s-&gt;number);</div><div class='ctx'> 				snd_pcm_trigger_done(s, substream);</div><div class='ctx'> 			} else</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='del'>-		snd_printd("stop\n");</div><div class='ctx'> </div><div class='ctx'> 		/* _prepare and _hwparams reset the stream */</div><div class='del'>-		hpi_handle_error(hpi_stream_stop(ss, dpcm-&gt;h_stream));</div><div class='add'>+		hpi_handle_error(hpi_stream_stop(dpcm-&gt;h_stream));</div><div class='ctx'> 		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 			hpi_handle_error(</div><div class='del'>-				hpi_outstream_reset(ss, dpcm-&gt;h_stream));</div><div class='add'>+				hpi_outstream_reset(dpcm-&gt;h_stream));</div><div class='ctx'> </div><div class='ctx'> 		if (card-&gt;support_grouping)</div><div class='del'>-			hpi_handle_error(hpi_stream_group_reset(ss,</div><div class='del'>-						dpcm-&gt;h_stream));</div><div class='add'>+			hpi_handle_error(hpi_stream_group_reset(dpcm-&gt;h_stream));</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		snd_printd("pause release\n");</div><div class='del'>-		hpi_handle_error(hpi_stream_start(ss, dpcm-&gt;h_stream));</div><div class='del'>-		snd_card_asihpi_pcm_timer_start(substream);</div><div class='add'>+		dev_dbg(card-&gt;card-&gt;dev, "%s trigger pause release\n", name);</div><div class='add'>+		card-&gt;pcm_start(substream);</div><div class='add'>+		hpi_handle_error(hpi_stream_start(dpcm-&gt;h_stream));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		snd_printd("pause\n");</div><div class='del'>-		snd_card_asihpi_pcm_timer_stop(substream);</div><div class='del'>-		hpi_handle_error(hpi_stream_stop(ss, dpcm-&gt;h_stream));</div><div class='add'>+		dev_dbg(card-&gt;card-&gt;dev, "%s trigger pause push\n", name);</div><div class='add'>+		card-&gt;pcm_stop(substream);</div><div class='add'>+		hpi_handle_error(hpi_stream_stop(dpcm-&gt;h_stream));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printd("\tINVALID\n");</div><div class='add'>+		dev_dbg(card-&gt;card-&gt;dev, "\tINVALID\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='del'>-	if (dpcm-&gt;hpi_buffer_attached)</div><div class='del'>-		hpi_stream_host_buffer_detach(ss, dpcm-&gt;h_stream);</div><div class='del'>-</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)</div><div class='del'>-{</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='del'>-	kfree(dpcm);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*algorithm outline</div><div class='ctx'>  Without linking degenerates to getting single stream pos etc</div><div class='ctx'>  Without mmap 2nd loop degenerates to snd_pcm_period_elapsed</div><div class='ctx'> */</div><div class='ctx'> /*</div><div class='del'>-buf_pos=get_buf_pos(s);</div><div class='add'>+pcm_buf_dma_ofs=get_buf_pos(s);</div><div class='ctx'> for_each_linked_stream(s) {</div><div class='del'>-	buf_pos=get_buf_pos(s);</div><div class='del'>-	min_buf_pos = modulo_min(min_buf_pos, buf_pos, pcm_size)</div><div class='del'>-	new_data = min(new_data, calc_new_data(buf_pos,irq_pos)</div><div class='add'>+	pcm_buf_dma_ofs=get_buf_pos(s);</div><div class='add'>+	min_buf_pos = modulo_min(min_buf_pos, pcm_buf_dma_ofs, buffer_bytes)</div><div class='add'>+	new_data = min(new_data, calc_new_data(pcm_buf_dma_ofs,irq_pos)</div><div class='ctx'> }</div><div class='ctx'> timer.expires = jiffies + predict_next_period_ready(min_buf_pos);</div><div class='ctx'> for_each_linked_stream(s) {</div><div class='del'>-	s-&gt;buf_pos = min_buf_pos;</div><div class='del'>-	if (new_data &gt; pcm_count) {</div><div class='add'>+	s-&gt;pcm_buf_dma_ofs = min_buf_pos;</div><div class='add'>+	if (new_data &gt; period_bytes) {</div><div class='ctx'> 		if (mmap) {</div><div class='del'>-			irq_pos = (irq_pos + pcm_count) % pcm_size;</div><div class='add'>+			irq_pos = (irq_pos + period_bytes) % buffer_bytes;</div><div class='ctx'> 			if (playback) {</div><div class='del'>-				write(pcm_count);</div><div class='add'>+				write(period_bytes);</div><div class='ctx'> 			} else {</div><div class='del'>-				read(pcm_count);</div><div class='add'>+				read(period_bytes);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_pcm_period_elapsed(s);</div><div class='hunk'>@@ -721,136 +707,216 @@ static inline unsigned int modulo_min(unsigned int a, unsigned int b,</div><div class='ctx'> </div><div class='ctx'> /** Timer function, equivalent to interrupt service routine for cards</div><div class='ctx'> */</div><div class='del'>-static void snd_card_asihpi_timer_function(unsigned long data)</div><div class='add'>+static void snd_card_asihpi_timer_function(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = (struct snd_card_asihpi_pcm *)data;</div><div class='del'>-	struct snd_card_asihpi *card = snd_pcm_substream_chip(dpcm-&gt;substream);</div><div class='add'>+	struct snd_card_asihpi_pcm *dpcm = timer_container_of(dpcm, t, timer);</div><div class='add'>+	struct snd_pcm_substream *substream = dpcm-&gt;substream;</div><div class='add'>+	struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='ctx'> 	struct snd_pcm_substream *s;</div><div class='ctx'> 	unsigned int newdata = 0;</div><div class='del'>-	unsigned int buf_pos, min_buf_pos = 0;</div><div class='add'>+	unsigned int pcm_buf_dma_ofs, min_buf_pos = 0;</div><div class='ctx'> 	unsigned int remdata, xfercount, next_jiffies;</div><div class='ctx'> 	int first = 1;</div><div class='ctx'> 	u16 state;</div><div class='del'>-	u32 buffer_size, data_avail, samples_played, aux;</div><div class='add'>+	u32 buffer_size, bytes_avail, samples_played, on_card_bytes;</div><div class='add'>+	char name[16];</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='ctx'> </div><div class='ctx'> 	/* find minimum newdata and buffer pos in group */</div><div class='del'>-	snd_pcm_group_for_each_entry(s, dpcm-&gt;substream) {</div><div class='add'>+	snd_pcm_group_for_each_entry(s, substream) {</div><div class='ctx'> 		struct snd_card_asihpi_pcm *ds = s-&gt;runtime-&gt;private_data;</div><div class='ctx'> 		runtime = s-&gt;runtime;</div><div class='ctx'> </div><div class='ctx'> 		if (snd_pcm_substream_chip(s) != card)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		hpi_handle_error(hpi_stream_get_info_ex(ss,</div><div class='add'>+		/* don't link Cap and Play */</div><div class='add'>+		if (substream-&gt;stream != s-&gt;stream)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hpi_handle_error(hpi_stream_get_info_ex(</div><div class='ctx'> 					ds-&gt;h_stream, &amp;state,</div><div class='del'>-					&amp;buffer_size, &amp;data_avail,</div><div class='del'>-					&amp;samples_played, &amp;aux));</div><div class='add'>+					&amp;buffer_size, &amp;bytes_avail,</div><div class='add'>+					&amp;samples_played, &amp;on_card_bytes));</div><div class='ctx'> </div><div class='ctx'> 		/* number of bytes in on-card buffer */</div><div class='del'>-		runtime-&gt;delay = aux;</div><div class='add'>+		runtime-&gt;delay = on_card_bytes;</div><div class='ctx'> </div><div class='del'>-		if (state == HPI_STATE_DRAINED) {</div><div class='del'>-			snd_printd(KERN_WARNING  "outstream %d drained\n",</div><div class='del'>-					s-&gt;number);</div><div class='del'>-			snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		if (!card-&gt;can_dma)</div><div class='add'>+			on_card_bytes = bytes_avail;</div><div class='ctx'> </div><div class='ctx'> 		if (s-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-			buf_pos = frames_to_bytes(runtime, samples_played);</div><div class='del'>-		} else {</div><div class='del'>-			buf_pos = data_avail + ds-&gt;pcm_irq_pos;</div><div class='del'>-		}</div><div class='add'>+			pcm_buf_dma_ofs = ds-&gt;pcm_buf_host_rw_ofs - bytes_avail;</div><div class='add'>+			if (state == HPI_STATE_STOPPED) {</div><div class='add'>+				if (bytes_avail == 0) {</div><div class='add'>+					hpi_handle_error(hpi_stream_start(ds-&gt;h_stream));</div><div class='add'>+					dev_dbg(card-&gt;card-&gt;dev,</div><div class='add'>+						"P%d start\n", s-&gt;number);</div><div class='add'>+					ds-&gt;drained_count = 0;</div><div class='add'>+				}</div><div class='add'>+			} else if (state == HPI_STATE_DRAINED) {</div><div class='add'>+				dev_dbg(card-&gt;card-&gt;dev,</div><div class='add'>+					"P%d drained\n", s-&gt;number);</div><div class='add'>+				ds-&gt;drained_count++;</div><div class='add'>+				if (ds-&gt;drained_count &gt; 20) {</div><div class='add'>+					snd_pcm_stop_xrun(s);</div><div class='add'>+					continue;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				ds-&gt;drained_count = 0;</div><div class='add'>+			}</div><div class='add'>+		} else</div><div class='add'>+			pcm_buf_dma_ofs = bytes_avail + ds-&gt;pcm_buf_host_rw_ofs;</div><div class='ctx'> </div><div class='ctx'> 		if (first) {</div><div class='ctx'> 			/* can't statically init min when wrap is involved */</div><div class='del'>-			min_buf_pos = buf_pos;</div><div class='del'>-			newdata = (buf_pos - ds-&gt;pcm_irq_pos) % ds-&gt;pcm_size;</div><div class='add'>+			min_buf_pos = pcm_buf_dma_ofs;</div><div class='add'>+			newdata = (pcm_buf_dma_ofs - ds-&gt;pcm_buf_elapsed_dma_ofs) % ds-&gt;buffer_bytes;</div><div class='ctx'> 			first = 0;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			min_buf_pos =</div><div class='del'>-				modulo_min(min_buf_pos, buf_pos, UINT_MAX+1L);</div><div class='add'>+				modulo_min(min_buf_pos, pcm_buf_dma_ofs, UINT_MAX+1L);</div><div class='ctx'> 			newdata = min(</div><div class='del'>-				(buf_pos - ds-&gt;pcm_irq_pos) % ds-&gt;pcm_size,</div><div class='add'>+				(pcm_buf_dma_ofs - ds-&gt;pcm_buf_elapsed_dma_ofs) % ds-&gt;buffer_bytes,</div><div class='ctx'> 				newdata);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		VPRINTK1("PB timer hw_ptr x%04lX, appl_ptr x%04lX\n",</div><div class='add'>+		asihpi_dbg(</div><div class='add'>+			"timer1, %s, %d, S=%d, elap=%d, rw=%d, dsp=%d, left=%d, aux=%d, space=%d, hw_ptr=%ld, appl_ptr=%ld\n",</div><div class='add'>+			name, s-&gt;number, state,</div><div class='add'>+			ds-&gt;pcm_buf_elapsed_dma_ofs,</div><div class='add'>+			ds-&gt;pcm_buf_host_rw_ofs,</div><div class='add'>+			pcm_buf_dma_ofs,</div><div class='add'>+			(int)bytes_avail,</div><div class='add'>+</div><div class='add'>+			(int)on_card_bytes,</div><div class='add'>+			buffer_size-bytes_avail,</div><div class='ctx'> 			(unsigned long)frames_to_bytes(runtime,</div><div class='ctx'> 						runtime-&gt;status-&gt;hw_ptr),</div><div class='ctx'> 			(unsigned long)frames_to_bytes(runtime,</div><div class='del'>-						runtime-&gt;control-&gt;appl_ptr));</div><div class='del'>-		VPRINTK1("%d S=%d, irq=%04X, pos=x%04X, left=x%04X,"</div><div class='del'>-			" aux=x%04X space=x%04X\n", s-&gt;number,</div><div class='del'>-			state,	ds-&gt;pcm_irq_pos, buf_pos, (int)data_avail,</div><div class='del'>-			(int)aux, buffer_size-data_avail);</div><div class='add'>+						runtime-&gt;control-&gt;appl_ptr)</div><div class='add'>+		);</div><div class='ctx'> 	}</div><div class='add'>+	pcm_buf_dma_ofs = min_buf_pos;</div><div class='ctx'> </div><div class='del'>-	remdata = newdata % dpcm-&gt;pcm_count;</div><div class='del'>-	xfercount = newdata - remdata; /* a multiple of pcm_count */</div><div class='del'>-	next_jiffies = ((dpcm-&gt;pcm_count-remdata) * HZ / dpcm-&gt;bytes_per_sec)+1;</div><div class='del'>-	next_jiffies = max(next_jiffies, 2U * HZ / 1000U);</div><div class='add'>+	remdata = newdata % dpcm-&gt;period_bytes;</div><div class='add'>+	xfercount = newdata - remdata; /* a multiple of period_bytes */</div><div class='add'>+	/* come back when on_card_bytes has decreased enough to allow</div><div class='add'>+	   write to happen, or when data has been consumed to make another</div><div class='add'>+	   period</div><div class='add'>+	*/</div><div class='add'>+	if (xfercount &amp;&amp; (on_card_bytes  &gt; dpcm-&gt;period_bytes))</div><div class='add'>+		next_jiffies = ((on_card_bytes - dpcm-&gt;period_bytes) * HZ / dpcm-&gt;bytes_per_sec);</div><div class='add'>+	else</div><div class='add'>+		next_jiffies = ((dpcm-&gt;period_bytes - remdata) * HZ / dpcm-&gt;bytes_per_sec);</div><div class='add'>+</div><div class='add'>+	next_jiffies = max(next_jiffies, 1U);</div><div class='ctx'> 	dpcm-&gt;timer.expires = jiffies + next_jiffies;</div><div class='del'>-	VPRINTK1("jif %d buf pos x%04X newdata x%04X xc x%04X\n",</div><div class='del'>-			next_jiffies, min_buf_pos, newdata, xfercount);</div><div class='add'>+	asihpi_dbg("timer2, jif=%d, buf_pos=%d, newdata=%d, xfer=%d\n",</div><div class='add'>+			next_jiffies, pcm_buf_dma_ofs, newdata, xfercount);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_group_for_each_entry(s, dpcm-&gt;substream) {</div><div class='add'>+	snd_pcm_group_for_each_entry(s, substream) {</div><div class='ctx'> 		struct snd_card_asihpi_pcm *ds = s-&gt;runtime-&gt;private_data;</div><div class='del'>-		ds-&gt;pcm_buf_pos = min_buf_pos;</div><div class='ctx'> </div><div class='del'>-		if (xfercount) {</div><div class='del'>-			if (card-&gt;support_mmap) {</div><div class='del'>-				ds-&gt;pcm_irq_pos = ds-&gt;pcm_irq_pos + xfercount;</div><div class='del'>-				if (s-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-					VPRINTK2("write OS%d x%04x\n",</div><div class='add'>+		/* don't link Cap and Play */</div><div class='add'>+		if (substream-&gt;stream != s-&gt;stream)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Store dma offset for use by pointer callback */</div><div class='add'>+		ds-&gt;pcm_buf_dma_ofs = pcm_buf_dma_ofs;</div><div class='add'>+</div><div class='add'>+		if (xfercount &amp;&amp;</div><div class='add'>+			/* Limit use of on card fifo for playback */</div><div class='add'>+			((on_card_bytes &lt;= ds-&gt;period_bytes) ||</div><div class='add'>+			(s-&gt;stream == SNDRV_PCM_STREAM_CAPTURE)))</div><div class='add'>+</div><div class='add'>+		{</div><div class='add'>+</div><div class='add'>+			unsigned int buf_ofs = ds-&gt;pcm_buf_host_rw_ofs % ds-&gt;buffer_bytes;</div><div class='add'>+			unsigned int xfer1, xfer2;</div><div class='add'>+			char *pd = &amp;s-&gt;runtime-&gt;dma_area[buf_ofs];</div><div class='add'>+</div><div class='add'>+			if (card-&gt;can_dma) { /* buffer wrap is handled at lower level */</div><div class='add'>+				xfer1 = xfercount;</div><div class='add'>+				xfer2 = 0;</div><div class='add'>+			} else {</div><div class='add'>+				xfer1 = min(xfercount, ds-&gt;buffer_bytes - buf_ofs);</div><div class='add'>+				xfer2 = xfercount - xfer1;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (s-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='add'>+				asihpi_dbg("write1, P=%d, xfer=%d, buf_ofs=%d\n",</div><div class='add'>+					s-&gt;number, xfer1, buf_ofs);</div><div class='add'>+				hpi_handle_error(</div><div class='add'>+					hpi_outstream_write_buf(</div><div class='add'>+						ds-&gt;h_stream, pd, xfer1,</div><div class='add'>+						&amp;ds-&gt;format));</div><div class='add'>+</div><div class='add'>+				if (xfer2) {</div><div class='add'>+					pd = s-&gt;runtime-&gt;dma_area;</div><div class='add'>+</div><div class='add'>+					asihpi_dbg("write2, P=%d, xfer=%d, buf_ofs=%d\n",</div><div class='ctx'> 							s-&gt;number,</div><div class='del'>-							ds-&gt;pcm_count);</div><div class='add'>+							xfercount - xfer1, buf_ofs);</div><div class='ctx'> 					hpi_handle_error(</div><div class='ctx'> 						hpi_outstream_write_buf(</div><div class='del'>-							ss, ds-&gt;h_stream,</div><div class='del'>-							&amp;s-&gt;runtime-&gt;</div><div class='del'>-								dma_area[0],</div><div class='del'>-							xfercount,</div><div class='add'>+							ds-&gt;h_stream, pd,</div><div class='add'>+							xfercount - xfer1,</div><div class='ctx'> 							&amp;ds-&gt;format));</div><div class='del'>-				} else {</div><div class='del'>-					VPRINTK2("read IS%d x%04x\n",</div><div class='del'>-						s-&gt;number,</div><div class='del'>-						dpcm-&gt;pcm_count);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				asihpi_dbg("read1, C=%d, xfer=%d\n",</div><div class='add'>+					s-&gt;number, xfer1);</div><div class='add'>+				hpi_handle_error(</div><div class='add'>+					hpi_instream_read_buf(</div><div class='add'>+						ds-&gt;h_stream,</div><div class='add'>+						pd, xfer1));</div><div class='add'>+				if (xfer2) {</div><div class='add'>+					pd = s-&gt;runtime-&gt;dma_area;</div><div class='add'>+					asihpi_dbg("read2, C=%d, xfer=%d\n",</div><div class='add'>+						s-&gt;number, xfer2);</div><div class='ctx'> 					hpi_handle_error(</div><div class='ctx'> 						hpi_instream_read_buf(</div><div class='del'>-							ss, ds-&gt;h_stream,</div><div class='del'>-							NULL, xfercount));</div><div class='add'>+							ds-&gt;h_stream,</div><div class='add'>+							pd, xfer2));</div><div class='ctx'> 				}</div><div class='del'>-			} /* else R/W will be handled by read/write callbacks */</div><div class='add'>+			}</div><div class='add'>+			/* ? host_rw_ofs always ahead of elapsed_dma_ofs by preload size? */</div><div class='add'>+			ds-&gt;pcm_buf_host_rw_ofs += xfercount;</div><div class='add'>+			ds-&gt;pcm_buf_elapsed_dma_ofs += xfercount;</div><div class='ctx'> 			snd_pcm_period_elapsed(s);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dpcm-&gt;respawn_timer)</div><div class='add'>+	if (!card-&gt;hpi-&gt;interrupt_mode &amp;&amp; dpcm-&gt;respawn_timer)</div><div class='ctx'> 		add_timer(&amp;dpcm-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/***************************** PLAYBACK OPS ****************/</div><div class='del'>-static int snd_card_asihpi_playback_ioctl(struct snd_pcm_substream *substream,</div><div class='del'>-					  unsigned int cmd, void *arg)</div><div class='add'>+static void snd_card_asihpi_isr(struct hpi_adapter *a)</div><div class='ctx'> {</div><div class='del'>-	/* snd_printd(KERN_INFO "Playback ioctl %d\n", cmd); */</div><div class='del'>-	return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='add'>+	struct snd_card_asihpi *asihpi;</div><div class='add'>+</div><div class='add'>+	WARN_ON(!a || !a-&gt;snd_card || !a-&gt;snd_card-&gt;private_data);</div><div class='add'>+	asihpi = (struct snd_card_asihpi *)a-&gt;snd_card-&gt;private_data;</div><div class='add'>+	if (asihpi-&gt;llmode_streampriv)</div><div class='add'>+		snd_card_asihpi_timer_function(</div><div class='add'>+			&amp;asihpi-&gt;llmode_streampriv-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/***************************** PLAYBACK OPS ****************/</div><div class='ctx'> static int snd_card_asihpi_playback_prepare(struct snd_pcm_substream *</div><div class='ctx'> 					    substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_printd(KERN_INFO "playback prepare %d\n", substream-&gt;number);</div><div class='del'>-</div><div class='del'>-	hpi_handle_error(hpi_outstream_reset(ss, dpcm-&gt;h_stream));</div><div class='del'>-	dpcm-&gt;pcm_irq_pos = 0;</div><div class='del'>-	dpcm-&gt;pcm_buf_pos = 0;</div><div class='del'>-</div><div class='add'>+	hpi_handle_error(hpi_outstream_reset(dpcm-&gt;h_stream));</div><div class='add'>+	dpcm-&gt;pcm_buf_host_rw_ofs = 0;</div><div class='add'>+	dpcm-&gt;pcm_buf_dma_ofs = 0;</div><div class='add'>+	dpcm-&gt;pcm_buf_elapsed_dma_ofs = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -860,116 +926,101 @@ snd_card_asihpi_playback_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> 	snd_pcm_uframes_t ptr;</div><div class='add'>+	char name[16];</div><div class='add'>+	snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='ctx'> </div><div class='del'>-	u32 samples_played;</div><div class='del'>-	u16 err;</div><div class='del'>-</div><div class='del'>-	if (!snd_pcm_stream_linked(substream)) {</div><div class='del'>-		/* NOTE, can use samples played for playback position here and</div><div class='del'>-		* in timer fn because it LAGS the actual read pointer, and is a</div><div class='del'>-		* better representation of actual playout position</div><div class='del'>-		*/</div><div class='del'>-		err = hpi_outstream_get_info_ex(ss, dpcm-&gt;h_stream, NULL,</div><div class='del'>-					NULL, NULL,</div><div class='del'>-					&amp;samples_played, NULL);</div><div class='del'>-		hpi_handle_error(err);</div><div class='del'>-</div><div class='del'>-		dpcm-&gt;pcm_buf_pos = frames_to_bytes(runtime, samples_played);</div><div class='del'>-	}</div><div class='del'>-	/* else must return most conservative value found in timer func</div><div class='del'>-	 * by looping over all streams</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	ptr = bytes_to_frames(runtime, dpcm-&gt;pcm_buf_pos  % dpcm-&gt;pcm_size);</div><div class='del'>-	VPRINTK2("playback_pointer=%04ld\n", (unsigned long)ptr);</div><div class='add'>+	ptr = bytes_to_frames(runtime, dpcm-&gt;pcm_buf_dma_ofs  % dpcm-&gt;buffer_bytes);</div><div class='add'>+	asihpi_dbg("%s, pointer=%ld\n", name, (unsigned long)ptr);</div><div class='ctx'> 	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,</div><div class='del'>-						u32 h_stream,</div><div class='del'>-						struct snd_pcm_hardware *pcmhw)</div><div class='add'>+static u64 snd_card_asihpi_playback_formats(struct snd_card_asihpi *asihpi,</div><div class='add'>+						u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_format hpi_format;</div><div class='ctx'> 	u16 format;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> 	u32 h_control;</div><div class='ctx'> 	u32 sample_rate = 48000;</div><div class='add'>+	u64 formats = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* on cards without SRC, must query at valid rate,</div><div class='ctx'> 	* maybe set by external sync</div><div class='ctx'> 	*/</div><div class='del'>-	err = hpi_mixer_get_control(ss, asihpi-&gt;h_mixer,</div><div class='add'>+	err = hpi_mixer_get_control(asihpi-&gt;h_mixer,</div><div class='ctx'> 				  HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,</div><div class='ctx'> 				  HPI_CONTROL_SAMPLECLOCK, &amp;h_control);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = hpi_sample_clock_get_sample_rate(ss, h_control,</div><div class='add'>+		err = hpi_sample_clock_get_sample_rate(h_control,</div><div class='ctx'> 				&amp;sample_rate);</div><div class='ctx'> </div><div class='ctx'> 	for (format = HPI_FORMAT_PCM8_UNSIGNED;</div><div class='ctx'> 	     format &lt;= HPI_FORMAT_PCM24_SIGNED; format++) {</div><div class='del'>-		err = hpi_format_create(&amp;hpi_format,</div><div class='del'>-					2, format, sample_rate, 128000, 0);</div><div class='add'>+		err = hpi_format_create(&amp;hpi_format, asihpi-&gt;out_max_chans,</div><div class='add'>+					format, sample_rate, 128000, 0);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			err = hpi_outstream_query_format(ss, h_stream,</div><div class='del'>-							&amp;hpi_format);</div><div class='del'>-		if (!err &amp;&amp; (hpi_to_alsa_formats[format] != -1))</div><div class='del'>-			pcmhw-&gt;formats |=</div><div class='del'>-				(1ULL &lt;&lt; hpi_to_alsa_formats[format]);</div><div class='add'>+			err = hpi_outstream_query_format(h_stream, &amp;hpi_format);</div><div class='add'>+		if (!err &amp;&amp; (hpi_to_alsa_formats[format] != INVALID_FORMAT))</div><div class='add'>+			formats |= pcm_format_to_bits(hpi_to_alsa_formats[format]);</div><div class='ctx'> 	}</div><div class='add'>+	return formats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_card_asihpi_playback = {</div><div class='del'>-	.channels_min = 1,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.buffer_bytes_max = BUFFER_BYTES_MAX,</div><div class='del'>-	.period_bytes_min = PERIOD_BYTES_MIN,</div><div class='del'>-	.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,</div><div class='del'>-	.periods_min = PERIODS_MIN,</div><div class='del'>-	.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,</div><div class='del'>-	.fifo_size = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm;</div><div class='ctx'> 	struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct snd_pcm_hardware snd_card_asihpi_playback;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);</div><div class='ctx'> 	if (dpcm == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    hpi_outstream_open(ss, card-&gt;adapter_index,</div><div class='add'>+	err = hpi_outstream_open(card-&gt;hpi-&gt;adapter-&gt;index,</div><div class='ctx'> 			      substream-&gt;number, &amp;dpcm-&gt;h_stream);</div><div class='ctx'> 	hpi_handle_error(err);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kfree(dpcm);</div><div class='del'>-	if (err == HPI_ERROR_OBJ_ALREADY_OPEN)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	if (err)</div><div class='add'>+		if (err == HPI_ERROR_OBJ_ALREADY_OPEN)</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*? also check ASI5000 samplerate source</div><div class='ctx'> 	    If external, only support external rate.</div><div class='del'>-	    If internal and other stream playing, cant switch</div><div class='add'>+	    If internal and other stream playing, can't switch</div><div class='ctx'> 	*/</div><div class='ctx'> </div><div class='del'>-	init_timer(&amp;dpcm-&gt;timer);</div><div class='del'>-	dpcm-&gt;timer.data = (unsigned long) dpcm;</div><div class='del'>-	dpcm-&gt;timer.function = snd_card_asihpi_timer_function;</div><div class='add'>+	timer_setup(&amp;dpcm-&gt;timer, snd_card_asihpi_timer_function, 0);</div><div class='ctx'> 	dpcm-&gt;substream = substream;</div><div class='ctx'> 	runtime-&gt;private_data = dpcm;</div><div class='ctx'> 	runtime-&gt;private_free = snd_card_asihpi_runtime_free;</div><div class='ctx'> </div><div class='del'>-	snd_card_asihpi_playback.channels_max = card-&gt;out_max_chans;</div><div class='del'>-	/*?snd_card_asihpi_playback.period_bytes_min =</div><div class='del'>-	card-&gt;out_max_chans * 4096; */</div><div class='add'>+	memset(&amp;snd_card_asihpi_playback, 0, sizeof(snd_card_asihpi_playback));</div><div class='add'>+	if (!card-&gt;hpi-&gt;interrupt_mode) {</div><div class='add'>+		snd_card_asihpi_playback.buffer_bytes_max = BUFFER_BYTES_MAX;</div><div class='add'>+		snd_card_asihpi_playback.period_bytes_min = PERIOD_BYTES_MIN;</div><div class='add'>+		snd_card_asihpi_playback.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_playback.periods_min = PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_playback.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN;</div><div class='add'>+	} else {</div><div class='add'>+		size_t pbmin = card-&gt;update_interval_frames *</div><div class='add'>+			card-&gt;out_max_chans;</div><div class='add'>+		snd_card_asihpi_playback.buffer_bytes_max = BUFFER_BYTES_MAX;</div><div class='add'>+		snd_card_asihpi_playback.period_bytes_min = pbmin;</div><div class='add'>+		snd_card_asihpi_playback.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_playback.periods_min = PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_playback.periods_max = BUFFER_BYTES_MAX / pbmin;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	snd_card_asihpi_playback_format(card, dpcm-&gt;h_stream,</div><div class='del'>-					&amp;snd_card_asihpi_playback);</div><div class='add'>+	/* snd_card_asihpi_playback.fifo_size = 0; */</div><div class='add'>+	snd_card_asihpi_playback.channels_max = card-&gt;out_max_chans;</div><div class='add'>+	snd_card_asihpi_playback.channels_min = card-&gt;out_min_chans;</div><div class='add'>+	snd_card_asihpi_playback.formats =</div><div class='add'>+			snd_card_asihpi_playback_formats(card, dpcm-&gt;h_stream);</div><div class='ctx'> </div><div class='ctx'> 	snd_card_asihpi_pcm_samplerates(card,  &amp;snd_card_asihpi_playback);</div><div class='ctx'> </div><div class='hunk'>@@ -977,19 +1028,19 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 					SNDRV_PCM_INFO_DOUBLE |</div><div class='ctx'> 					SNDRV_PCM_INFO_BATCH |</div><div class='ctx'> 					SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='del'>-					SNDRV_PCM_INFO_PAUSE;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;support_mmap)</div><div class='del'>-		snd_card_asihpi_playback.info |= SNDRV_PCM_INFO_MMAP |</div><div class='del'>-						SNDRV_PCM_INFO_MMAP_VALID;</div><div class='add'>+					SNDRV_PCM_INFO_PAUSE |</div><div class='add'>+					SNDRV_PCM_INFO_MMAP |</div><div class='add'>+					SNDRV_PCM_INFO_MMAP_VALID;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;support_grouping)</div><div class='add'>+	if (card-&gt;support_grouping) {</div><div class='ctx'> 		snd_card_asihpi_playback.info |= SNDRV_PCM_INFO_SYNC_START;</div><div class='add'>+		snd_pcm_set_sync(substream);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* struct is copied, so can create initializer dynamically */</div><div class='ctx'> 	runtime-&gt;hw = snd_card_asihpi_playback;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;support_mmap)</div><div class='add'>+	if (card-&gt;can_dma)</div><div class='ctx'> 		err = snd_pcm_hw_constraint_pow2(runtime, 0,</div><div class='ctx'> 					SNDRV_PCM_HW_PARAM_BUFFER_BYTES);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -997,12 +1048,9 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='ctx'> 		card-&gt;update_interval_frames);</div><div class='del'>-	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='del'>-		card-&gt;update_interval_frames * 4, UINT_MAX);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_set_sync(substream);</div><div class='del'>-</div><div class='del'>-	snd_printd(KERN_INFO "playback open\n");</div><div class='add'>+	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+		card-&gt;update_interval_frames, UINT_MAX);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1012,71 +1060,13 @@ static int snd_card_asihpi_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_outstream_close(ss, dpcm-&gt;h_stream));</div><div class='del'>-	snd_printd(KERN_INFO "playback close\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_card_asihpi_playback_copy(struct snd_pcm_substream *substream,</div><div class='del'>-					int channel,</div><div class='del'>-					snd_pcm_uframes_t pos,</div><div class='del'>-					void __user *src,</div><div class='del'>-					snd_pcm_uframes_t count)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='del'>-	unsigned int len;</div><div class='del'>-</div><div class='del'>-	len = frames_to_bytes(runtime, count);</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(runtime-&gt;dma_area, src, len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	VPRINTK2(KERN_DEBUG "playback copy%d %u bytes\n",</div><div class='del'>-			substream-&gt;number, len);</div><div class='del'>-</div><div class='del'>-	hpi_handle_error(hpi_outstream_write_buf(ss, dpcm-&gt;h_stream,</div><div class='del'>-				runtime-&gt;dma_area, len, &amp;dpcm-&gt;format));</div><div class='del'>-</div><div class='add'>+	hpi_handle_error(hpi_outstream_close(dpcm-&gt;h_stream));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_card_asihpi_playback_silence(struct snd_pcm_substream *</div><div class='del'>-					    substream, int channel,</div><div class='del'>-					    snd_pcm_uframes_t pos,</div><div class='del'>-					    snd_pcm_uframes_t count)</div><div class='del'>-{</div><div class='del'>-	unsigned int len;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	len = frames_to_bytes(runtime, count);</div><div class='del'>-	snd_printd(KERN_INFO "playback silence  %u bytes\n", len);</div><div class='del'>-</div><div class='del'>-	memset(runtime-&gt;dma_area, 0, len);</div><div class='del'>-	hpi_handle_error(hpi_outstream_write_buf(ss, dpcm-&gt;h_stream,</div><div class='del'>-				runtime-&gt;dma_area, len, &amp;dpcm-&gt;format));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_card_asihpi_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {</div><div class='ctx'> 	.open = snd_card_asihpi_playback_open,</div><div class='ctx'> 	.close = snd_card_asihpi_playback_close,</div><div class='del'>-	.ioctl = snd_card_asihpi_playback_ioctl,</div><div class='del'>-	.hw_params = snd_card_asihpi_pcm_hw_params,</div><div class='del'>-	.hw_free = snd_card_asihpi_hw_free,</div><div class='del'>-	.prepare = snd_card_asihpi_playback_prepare,</div><div class='del'>-	.trigger = snd_card_asihpi_trigger,</div><div class='del'>-	.pointer = snd_card_asihpi_playback_pointer,</div><div class='del'>-	.copy = snd_card_asihpi_playback_copy,</div><div class='del'>-	.silence = snd_card_asihpi_playback_silence,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {</div><div class='del'>-	.open = snd_card_asihpi_playback_open,</div><div class='del'>-	.close = snd_card_asihpi_playback_close,</div><div class='del'>-	.ioctl = snd_card_asihpi_playback_ioctl,</div><div class='ctx'> 	.hw_params = snd_card_asihpi_pcm_hw_params,</div><div class='ctx'> 	.hw_free = snd_card_asihpi_hw_free,</div><div class='ctx'> 	.prepare = snd_card_asihpi_playback_prepare,</div><div class='hunk'>@@ -1090,20 +1080,15 @@ snd_card_asihpi_capture_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='add'>+	char name[16];</div><div class='add'>+	snd_pcm_debug_name(substream, name, sizeof(name));</div><div class='ctx'> </div><div class='del'>-	VPRINTK2("capture pointer %d=%d\n",</div><div class='del'>-			substream-&gt;number, dpcm-&gt;pcm_buf_pos);</div><div class='del'>-	/* NOTE Unlike playback can't use actual dwSamplesPlayed</div><div class='add'>+	asihpi_dbg("%s, pointer=%d\n", name, dpcm-&gt;pcm_buf_dma_ofs);</div><div class='add'>+	/* NOTE Unlike playback can't use actual samples_played</div><div class='ctx'> 		for the capture position, because those samples aren't yet in</div><div class='ctx'> 		the local buffer available for reading.</div><div class='ctx'> 	*/</div><div class='del'>-	return bytes_to_frames(runtime, dpcm-&gt;pcm_buf_pos % dpcm-&gt;pcm_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_card_asihpi_capture_ioctl(struct snd_pcm_substream *substream,</div><div class='del'>-					 unsigned int cmd, void *arg)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='add'>+	return bytes_to_frames(runtime, dpcm-&gt;pcm_buf_dma_ofs % dpcm-&gt;buffer_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1111,107 +1096,110 @@ static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_instream_reset(ss, dpcm-&gt;h_stream));</div><div class='del'>-	dpcm-&gt;pcm_irq_pos = 0;</div><div class='del'>-	dpcm-&gt;pcm_buf_pos = 0;</div><div class='add'>+	hpi_handle_error(hpi_instream_reset(dpcm-&gt;h_stream));</div><div class='add'>+	dpcm-&gt;pcm_buf_host_rw_ofs = 0;</div><div class='add'>+	dpcm-&gt;pcm_buf_dma_ofs = 0;</div><div class='add'>+	dpcm-&gt;pcm_buf_elapsed_dma_ofs = 0;</div><div class='ctx'> </div><div class='del'>-	snd_printd("capture prepare %d\n", substream-&gt;number);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,</div><div class='del'>-					u32 h_stream,</div><div class='del'>-					 struct snd_pcm_hardware *pcmhw)</div><div class='add'>+static u64 snd_card_asihpi_capture_formats(struct snd_card_asihpi *asihpi,</div><div class='add'>+					u32 h_stream)</div><div class='ctx'> {</div><div class='del'>-  struct hpi_format hpi_format;</div><div class='add'>+	struct hpi_format hpi_format;</div><div class='ctx'> 	u16 format;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> 	u32 h_control;</div><div class='ctx'> 	u32 sample_rate = 48000;</div><div class='add'>+	u64 formats = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* on cards without SRC, must query at valid rate,</div><div class='ctx'> 		maybe set by external sync */</div><div class='del'>-	err = hpi_mixer_get_control(ss, asihpi-&gt;h_mixer,</div><div class='add'>+	err = hpi_mixer_get_control(asihpi-&gt;h_mixer,</div><div class='ctx'> 				  HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,</div><div class='ctx'> 				  HPI_CONTROL_SAMPLECLOCK, &amp;h_control);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='del'>-		err = hpi_sample_clock_get_sample_rate(ss, h_control,</div><div class='add'>+		err = hpi_sample_clock_get_sample_rate(h_control,</div><div class='ctx'> 			&amp;sample_rate);</div><div class='ctx'> </div><div class='ctx'> 	for (format = HPI_FORMAT_PCM8_UNSIGNED;</div><div class='ctx'> 		format &lt;= HPI_FORMAT_PCM24_SIGNED; format++) {</div><div class='ctx'> </div><div class='del'>-		err = hpi_format_create(&amp;hpi_format, 2, format,</div><div class='del'>-				sample_rate, 128000, 0);</div><div class='add'>+		err = hpi_format_create(&amp;hpi_format, asihpi-&gt;in_max_chans,</div><div class='add'>+					format, sample_rate, 128000, 0);</div><div class='ctx'> 		if (!err)</div><div class='del'>-			err = hpi_instream_query_format(ss, h_stream,</div><div class='del'>-					    &amp;hpi_format);</div><div class='del'>-		if (!err)</div><div class='del'>-			pcmhw-&gt;formats |=</div><div class='del'>-				(1ULL &lt;&lt; hpi_to_alsa_formats[format]);</div><div class='add'>+			err = hpi_instream_query_format(h_stream, &amp;hpi_format);</div><div class='add'>+		if (!err &amp;&amp; (hpi_to_alsa_formats[format] != INVALID_FORMAT))</div><div class='add'>+			formats |= pcm_format_to_bits(hpi_to_alsa_formats[format]);</div><div class='ctx'> 	}</div><div class='add'>+	return formats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware snd_card_asihpi_capture = {</div><div class='del'>-	.channels_min = 1,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.buffer_bytes_max = BUFFER_BYTES_MAX,</div><div class='del'>-	.period_bytes_min = PERIOD_BYTES_MIN,</div><div class='del'>-	.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,</div><div class='del'>-	.periods_min = PERIODS_MIN,</div><div class='del'>-	.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,</div><div class='del'>-	.fifo_size = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm;</div><div class='add'>+	struct snd_pcm_hardware snd_card_asihpi_capture;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL);</div><div class='ctx'> 	if (dpcm == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	snd_printd("hpi_instream_open adapter %d stream %d\n",</div><div class='del'>-		   card-&gt;adapter_index, substream-&gt;number);</div><div class='add'>+</div><div class='add'>+	dev_dbg(card-&gt;card-&gt;dev, "capture open adapter %d stream %d\n",</div><div class='add'>+		card-&gt;hpi-&gt;adapter-&gt;index, substream-&gt;number);</div><div class='ctx'> </div><div class='ctx'> 	err = hpi_handle_error(</div><div class='del'>-	    hpi_instream_open(ss, card-&gt;adapter_index,</div><div class='add'>+	    hpi_instream_open(card-&gt;hpi-&gt;adapter-&gt;index,</div><div class='ctx'> 			     substream-&gt;number, &amp;dpcm-&gt;h_stream));</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='ctx'> 		kfree(dpcm);</div><div class='del'>-	if (err == HPI_ERROR_OBJ_ALREADY_OPEN)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	if (err)</div><div class='add'>+		if (err == HPI_ERROR_OBJ_ALREADY_OPEN)</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		return -EIO;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	init_timer(&amp;dpcm-&gt;timer);</div><div class='del'>-	dpcm-&gt;timer.data = (unsigned long) dpcm;</div><div class='del'>-	dpcm-&gt;timer.function = snd_card_asihpi_timer_function;</div><div class='add'>+	timer_setup(&amp;dpcm-&gt;timer, snd_card_asihpi_timer_function, 0);</div><div class='ctx'> 	dpcm-&gt;substream = substream;</div><div class='ctx'> 	runtime-&gt;private_data = dpcm;</div><div class='ctx'> 	runtime-&gt;private_free = snd_card_asihpi_runtime_free;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;snd_card_asihpi_capture, 0, sizeof(snd_card_asihpi_capture));</div><div class='add'>+	if (!card-&gt;hpi-&gt;interrupt_mode) {</div><div class='add'>+		snd_card_asihpi_capture.buffer_bytes_max = BUFFER_BYTES_MAX;</div><div class='add'>+		snd_card_asihpi_capture.period_bytes_min = PERIOD_BYTES_MIN;</div><div class='add'>+		snd_card_asihpi_capture.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_capture.periods_min = PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_capture.periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN;</div><div class='add'>+	} else {</div><div class='add'>+		size_t pbmin = card-&gt;update_interval_frames *</div><div class='add'>+			card-&gt;out_max_chans;</div><div class='add'>+		snd_card_asihpi_capture.buffer_bytes_max = BUFFER_BYTES_MAX;</div><div class='add'>+		snd_card_asihpi_capture.period_bytes_min = pbmin;</div><div class='add'>+		snd_card_asihpi_capture.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_capture.periods_min = PERIODS_MIN;</div><div class='add'>+		snd_card_asihpi_capture.periods_max = BUFFER_BYTES_MAX / pbmin;</div><div class='add'>+	}</div><div class='add'>+	/* snd_card_asihpi_capture.fifo_size = 0; */</div><div class='ctx'> 	snd_card_asihpi_capture.channels_max = card-&gt;in_max_chans;</div><div class='del'>-	snd_card_asihpi_capture_format(card, dpcm-&gt;h_stream,</div><div class='del'>-				       &amp;snd_card_asihpi_capture);</div><div class='add'>+	snd_card_asihpi_capture.channels_min = card-&gt;in_min_chans;</div><div class='add'>+	snd_card_asihpi_capture.formats =</div><div class='add'>+		snd_card_asihpi_capture_formats(card, dpcm-&gt;h_stream);</div><div class='ctx'> 	snd_card_asihpi_pcm_samplerates(card,  &amp;snd_card_asihpi_capture);</div><div class='del'>-	snd_card_asihpi_capture.info = SNDRV_PCM_INFO_INTERLEAVED;</div><div class='add'>+	snd_card_asihpi_capture.info = SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+					SNDRV_PCM_INFO_MMAP |</div><div class='add'>+					SNDRV_PCM_INFO_MMAP_VALID;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;support_mmap)</div><div class='del'>-		snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_MMAP |</div><div class='del'>-						SNDRV_PCM_INFO_MMAP_VALID;</div><div class='add'>+	if (card-&gt;support_grouping)</div><div class='add'>+		snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_SYNC_START;</div><div class='ctx'> </div><div class='ctx'> 	runtime-&gt;hw = snd_card_asihpi_capture;</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;support_mmap)</div><div class='add'>+	if (card-&gt;can_dma)</div><div class='ctx'> 		err = snd_pcm_hw_constraint_pow2(runtime, 0,</div><div class='ctx'> 					SNDRV_PCM_HW_PARAM_BUFFER_BYTES);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1220,7 +1208,7 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='ctx'> 		card-&gt;update_interval_frames);</div><div class='ctx'> 	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='del'>-		card-&gt;update_interval_frames * 2, UINT_MAX);</div><div class='add'>+		card-&gt;update_interval_frames, UINT_MAX);</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='ctx'> </div><div class='hunk'>@@ -1231,37 +1219,13 @@ static int snd_card_asihpi_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card_asihpi_pcm *dpcm = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_instream_close(ss, dpcm-&gt;h_stream));</div><div class='add'>+	hpi_handle_error(hpi_instream_close(dpcm-&gt;h_stream));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_card_asihpi_capture_copy(struct snd_pcm_substream *substream,</div><div class='del'>-				int channel, snd_pcm_uframes_t pos,</div><div class='del'>-				void __user *dst, snd_pcm_uframes_t count)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_card_asihpi_pcm *dpcm = runtime-&gt;private_data;</div><div class='del'>-	u32 data_size;</div><div class='del'>-</div><div class='del'>-	data_size = frames_to_bytes(runtime, count);</div><div class='del'>-</div><div class='del'>-	VPRINTK2("capture copy%d %d bytes\n", substream-&gt;number, data_size);</div><div class='del'>-	hpi_handle_error(hpi_instream_read_buf(ss, dpcm-&gt;h_stream,</div><div class='del'>-				runtime-&gt;dma_area, data_size));</div><div class='del'>-</div><div class='del'>-	/* Used by capture_pointer */</div><div class='del'>-	dpcm-&gt;pcm_irq_pos = dpcm-&gt;pcm_irq_pos + data_size;</div><div class='del'>-</div><div class='del'>-	if (copy_to_user(dst, runtime-&gt;dma_area, data_size))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {</div><div class='ctx'> 	.open = snd_card_asihpi_capture_open,</div><div class='ctx'> 	.close = snd_card_asihpi_capture_close,</div><div class='del'>-	.ioctl = snd_card_asihpi_capture_ioctl,</div><div class='ctx'> 	.hw_params = snd_card_asihpi_pcm_hw_params,</div><div class='ctx'> 	.hw_free = snd_card_asihpi_hw_free,</div><div class='ctx'> 	.prepare = snd_card_asihpi_capture_prepare,</div><div class='hunk'>@@ -1269,51 +1233,37 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {</div><div class='ctx'> 	.pointer = snd_card_asihpi_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_card_asihpi_capture_ops = {</div><div class='del'>-	.open = snd_card_asihpi_capture_open,</div><div class='del'>-	.close = snd_card_asihpi_capture_close,</div><div class='del'>-	.ioctl = snd_card_asihpi_capture_ioctl,</div><div class='del'>-	.hw_params = snd_card_asihpi_pcm_hw_params,</div><div class='del'>-	.hw_free = snd_card_asihpi_hw_free,</div><div class='del'>-	.prepare = snd_card_asihpi_capture_prepare,</div><div class='del'>-	.trigger = snd_card_asihpi_trigger,</div><div class='del'>-	.pointer = snd_card_asihpi_capture_pointer,</div><div class='del'>-	.copy = snd_card_asihpi_capture_copy</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi,</div><div class='del'>-				      int device, int substreams)</div><div class='add'>+static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='add'>+	u16 num_instreams, num_outstreams, x16;</div><div class='add'>+	u32 x32;</div><div class='add'>+</div><div class='add'>+	err = hpi_adapter_get_info(asihpi-&gt;hpi-&gt;adapter-&gt;index,</div><div class='add'>+			&amp;num_outstreams, &amp;num_instreams,</div><div class='add'>+			&amp;x16, &amp;x32, &amp;x16);</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_new(asihpi-&gt;card, "asihpi PCM", device,</div><div class='del'>-			 asihpi-&gt;num_outstreams, asihpi-&gt;num_instreams,</div><div class='del'>-			 &amp;pcm);</div><div class='add'>+	err = snd_pcm_new(asihpi-&gt;card, "Asihpi PCM", device,</div><div class='add'>+			num_outstreams,	num_instreams, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+</div><div class='ctx'> 	/* pointer to ops struct is stored, dont change ops afterwards! */</div><div class='del'>-	if (asihpi-&gt;support_mmap) {</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-				&amp;snd_card_asihpi_playback_mmap_ops);</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-				&amp;snd_card_asihpi_capture_mmap_ops);</div><div class='del'>-	} else {</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='del'>-				&amp;snd_card_asihpi_playback_ops);</div><div class='del'>-		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='del'>-				&amp;snd_card_asihpi_capture_ops);</div><div class='del'>-	}</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+			&amp;snd_card_asihpi_playback_mmap_ops);</div><div class='add'>+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+			&amp;snd_card_asihpi_capture_mmap_ops);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = asihpi;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "asihpi PCM");</div><div class='add'>+	strscpy(pcm-&gt;name, "Asihpi PCM");</div><div class='ctx'> </div><div class='ctx'> 	/*? do we want to emulate MMAP for non-BBM cards?</div><div class='ctx'> 	Jack doesn't work with ALSAs MMAP emulation - WHY NOT? */</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						snd_dma_pci_data(asihpi-&gt;pci),</div><div class='del'>-						64*1024, BUFFER_BYTES_MAX);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;asihpi-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, BUFFER_BYTES_MAX);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1327,11 +1277,10 @@ struct hpi_control {</div><div class='ctx'> 	u16 dst_node_type;</div><div class='ctx'> 	u16 dst_node_index;</div><div class='ctx'> 	u16 band;</div><div class='del'>-	char name[44]; /* copied to snd_ctl_elem_id.name[44]; */</div><div class='add'>+	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* copied to snd_ctl_elem_id.name[44]; */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *asihpi_tuner_band_names[] =</div><div class='del'>-{</div><div class='add'>+static const char * const asihpi_tuner_band_names[] = {</div><div class='ctx'> 	"invalid",</div><div class='ctx'> 	"AM",</div><div class='ctx'> 	"FM mono",</div><div class='hunk'>@@ -1342,78 +1291,53 @@ static char *asihpi_tuner_band_names[] =</div><div class='ctx'> 	"TV PAL I",</div><div class='ctx'> 	"TV PAL DK",</div><div class='ctx'> 	"TV SECAM",</div><div class='add'>+	"TV DAB",</div><div class='ctx'> };</div><div class='del'>-</div><div class='add'>+/* Number of strings must match the enumerations for HPI_TUNER_BAND in hpi.h */</div><div class='ctx'> compile_time_assert(</div><div class='ctx'> 	(ARRAY_SIZE(asihpi_tuner_band_names) ==</div><div class='ctx'> 		(HPI_TUNER_BAND_LAST+1)),</div><div class='ctx'> 	assert_tuner_band_names_size);</div><div class='ctx'> </div><div class='del'>-#if ASI_STYLE_NAMES</div><div class='del'>-static char *asihpi_src_names[] =</div><div class='del'>-{</div><div class='add'>+static const char * const asihpi_src_names[] = {</div><div class='ctx'> 	"no source",</div><div class='del'>-	"outstream",</div><div class='del'>-	"line_in",</div><div class='del'>-	"aes_in",</div><div class='del'>-	"tuner",</div><div class='add'>+	"PCM",</div><div class='add'>+	"Line",</div><div class='add'>+	"Digital",</div><div class='add'>+	"Tuner",</div><div class='ctx'> 	"RF",</div><div class='del'>-	"clock",</div><div class='del'>-	"bitstr",</div><div class='del'>-	"mic",</div><div class='del'>-	"cobranet",</div><div class='del'>-	"analog_in",</div><div class='del'>-	"adapter",</div><div class='add'>+	"Clock",</div><div class='add'>+	"Bitstream",</div><div class='add'>+	"Mic",</div><div class='add'>+	"Net",</div><div class='add'>+	"Analog",</div><div class='add'>+	"Adapter",</div><div class='add'>+	"RTP",</div><div class='add'>+	"Internal",</div><div class='add'>+	"AVB",</div><div class='add'>+	"BLU-Link"</div><div class='ctx'> };</div><div class='del'>-#else</div><div class='del'>-static char *asihpi_src_names[] =</div><div class='del'>-{</div><div class='del'>-	"no source",</div><div class='del'>-	"PCM playback",</div><div class='del'>-	"line in",</div><div class='del'>-	"digital in",</div><div class='del'>-	"tuner",</div><div class='del'>-	"RF",</div><div class='del'>-	"clock",</div><div class='del'>-	"bitstream",</div><div class='del'>-	"mic",</div><div class='del'>-	"cobranet in",</div><div class='del'>-	"analog in",</div><div class='del'>-	"adapter",</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+/* Number of strings must match the enumerations for HPI_SOURCENODES in hpi.h */</div><div class='ctx'> compile_time_assert(</div><div class='ctx'> 	(ARRAY_SIZE(asihpi_src_names) ==</div><div class='ctx'> 		(HPI_SOURCENODE_LAST_INDEX-HPI_SOURCENODE_NONE+1)),</div><div class='ctx'> 	assert_src_names_size);</div><div class='ctx'> </div><div class='del'>-#if ASI_STYLE_NAMES</div><div class='del'>-static char *asihpi_dst_names[] =</div><div class='del'>-{</div><div class='add'>+static const char * const asihpi_dst_names[] = {</div><div class='ctx'> 	"no destination",</div><div class='del'>-	"instream",</div><div class='del'>-	"line_out",</div><div class='del'>-	"aes_out",</div><div class='add'>+	"PCM",</div><div class='add'>+	"Line",</div><div class='add'>+	"Digital",</div><div class='ctx'> 	"RF",</div><div class='del'>-	"speaker" ,</div><div class='del'>-	"cobranet",</div><div class='del'>-	"analog_out",</div><div class='add'>+	"Speaker",</div><div class='add'>+	"Net",</div><div class='add'>+	"Analog",</div><div class='add'>+	"RTP",</div><div class='add'>+	"AVB",</div><div class='add'>+	"Internal",</div><div class='add'>+	"BLU-Link"</div><div class='ctx'> };</div><div class='del'>-#else</div><div class='del'>-static char *asihpi_dst_names[] =</div><div class='del'>-{</div><div class='del'>-	"no destination",</div><div class='del'>-	"PCM capture",</div><div class='del'>-	"line out",</div><div class='del'>-	"digital out",</div><div class='del'>-	"RF",</div><div class='del'>-	"speaker",</div><div class='del'>-	"cobranet out",</div><div class='del'>-	"analog out"</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+/* Number of strings must match the enumerations for HPI_DESTNODES in hpi.h */</div><div class='ctx'> compile_time_assert(</div><div class='ctx'> 	(ARRAY_SIZE(asihpi_dst_names) ==</div><div class='ctx'> 		(HPI_DESTNODE_LAST_INDEX-HPI_DESTNODE_NONE+1)),</div><div class='hunk'>@@ -1428,7 +1352,7 @@ static inline int ctl_add(struct snd_card *card, struct snd_kcontrol_new *ctl,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	else if (mixer_dump)</div><div class='del'>-		snd_printk(KERN_INFO "added %s(%d)\n", ctl-&gt;name, ctl-&gt;index);</div><div class='add'>+		dev_info(&amp;asihpi-&gt;pci-&gt;dev, "added %s(%d)\n", ctl-&gt;name, ctl-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1438,29 +1362,44 @@ static void asihpi_ctl_init(struct snd_kcontrol_new *snd_control,</div><div class='ctx'> 				struct hpi_control *hpi_ctl,</div><div class='ctx'> 				char *name)</div><div class='ctx'> {</div><div class='add'>+	char *dir;</div><div class='ctx'> 	memset(snd_control, 0, sizeof(*snd_control));</div><div class='ctx'> 	snd_control-&gt;name = hpi_ctl-&gt;name;</div><div class='ctx'> 	snd_control-&gt;private_value = hpi_ctl-&gt;h_control;</div><div class='ctx'> 	snd_control-&gt;iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	snd_control-&gt;index = 0;</div><div class='ctx'> </div><div class='add'>+	if (hpi_ctl-&gt;src_node_type + HPI_SOURCENODE_NONE == HPI_SOURCENODE_CLOCK_SOURCE)</div><div class='add'>+		dir = ""; /* clock is neither capture nor playback */</div><div class='add'>+	else if (hpi_ctl-&gt;dst_node_type + HPI_DESTNODE_NONE == HPI_DESTNODE_ISTREAM)</div><div class='add'>+		dir = "Capture ";  /* On or towards a PCM capture destination*/</div><div class='add'>+	else if ((hpi_ctl-&gt;src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &amp;&amp;</div><div class='add'>+		(!hpi_ctl-&gt;dst_node_type))</div><div class='add'>+		dir = "Capture "; /* On a source node that is not PCM playback */</div><div class='add'>+	else if (hpi_ctl-&gt;src_node_type &amp;&amp;</div><div class='add'>+		(hpi_ctl-&gt;src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &amp;&amp;</div><div class='add'>+		(hpi_ctl-&gt;dst_node_type))</div><div class='add'>+		dir = "Monitor Playback "; /* Between an input and an output */</div><div class='add'>+	else</div><div class='add'>+		dir = "Playback "; /* PCM Playback source, or  output node */</div><div class='add'>+</div><div class='ctx'> 	if (hpi_ctl-&gt;src_node_type &amp;&amp; hpi_ctl-&gt;dst_node_type)</div><div class='del'>-		sprintf(hpi_ctl-&gt;name, "%s%d to %s%d %s",</div><div class='add'>+		sprintf(hpi_ctl-&gt;name, "%s %d %s %d %s%s",</div><div class='ctx'> 			asihpi_src_names[hpi_ctl-&gt;src_node_type],</div><div class='ctx'> 			hpi_ctl-&gt;src_node_index,</div><div class='ctx'> 			asihpi_dst_names[hpi_ctl-&gt;dst_node_type],</div><div class='ctx'> 			hpi_ctl-&gt;dst_node_index,</div><div class='del'>-			name);</div><div class='add'>+			dir, name);</div><div class='ctx'> 	else if (hpi_ctl-&gt;dst_node_type) {</div><div class='del'>-		sprintf(hpi_ctl-&gt;name, "%s%d %s",</div><div class='add'>+		sprintf(hpi_ctl-&gt;name, "%s %d %s%s",</div><div class='ctx'> 		asihpi_dst_names[hpi_ctl-&gt;dst_node_type],</div><div class='ctx'> 		hpi_ctl-&gt;dst_node_index,</div><div class='del'>-		name);</div><div class='add'>+		dir, name);</div><div class='ctx'> 	} else {</div><div class='del'>-		sprintf(hpi_ctl-&gt;name, "%s%d %s",</div><div class='add'>+		sprintf(hpi_ctl-&gt;name, "%s %d %s%s",</div><div class='ctx'> 		asihpi_src_names[hpi_ctl-&gt;src_node_type],</div><div class='ctx'> 		hpi_ctl-&gt;src_node_index,</div><div class='del'>-		name);</div><div class='add'>+		dir, name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1472,13 +1411,14 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='add'>+	u32 count;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> 	/* native gains are in millibels */</div><div class='ctx'> 	short min_gain_mB;</div><div class='ctx'> 	short max_gain_mB;</div><div class='ctx'> 	short step_gain_mB;</div><div class='ctx'> </div><div class='del'>-	err = hpi_volume_query_range(ss, h_control,</div><div class='add'>+	err = hpi_volume_query_range(h_control,</div><div class='ctx'> 			&amp;min_gain_mB, &amp;max_gain_mB, &amp;step_gain_mB);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		max_gain_mB = 0;</div><div class='hunk'>@@ -1486,8 +1426,12 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		step_gain_mB = VOL_STEP_mB;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = hpi_meter_query_channels(h_control, &amp;count);</div><div class='add'>+	if (err)</div><div class='add'>+		count = HPI_MAX_CHANNELS;</div><div class='add'>+</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='del'>-	uinfo-&gt;count = 2;</div><div class='add'>+	uinfo-&gt;count = count;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = min_gain_mB / VOL_STEP_mB;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = max_gain_mB / VOL_STEP_mB;</div><div class='ctx'> 	uinfo-&gt;value.integer.step = step_gain_mB / VOL_STEP_mB;</div><div class='hunk'>@@ -1500,7 +1444,7 @@ static int snd_asihpi_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	short an_gain_mB[HPI_MAX_CHANNELS];</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_volume_get_gain(ss, h_control, an_gain_mB));</div><div class='add'>+	hpi_handle_error(hpi_volume_get_gain(h_control, an_gain_mB));</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = an_gain_mB[0] / VOL_STEP_mB;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = an_gain_mB[1] / VOL_STEP_mB;</div><div class='ctx'> </div><div class='hunk'>@@ -1510,7 +1454,6 @@ static int snd_asihpi_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	int change;</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	short an_gain_mB[HPI_MAX_CHANNELS];</div><div class='ctx'> </div><div class='hunk'>@@ -1521,20 +1464,47 @@ static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	/*  change = asihpi-&gt;mixer_volume[addr][0] != left ||</div><div class='ctx'> 	   asihpi-&gt;mixer_volume[addr][1] != right;</div><div class='ctx'> 	 */</div><div class='del'>-	change = 1;</div><div class='del'>-	hpi_handle_error(hpi_volume_set_gain(ss, h_control, an_gain_mB));</div><div class='del'>-	return change;</div><div class='add'>+	hpi_handle_error(hpi_volume_set_gain(h_control, an_gain_mB));</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_100, -10000, VOL_STEP_mB, 0);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+#define snd_asihpi_volume_mute_info	snd_ctl_boolean_mono_info</div><div class='add'>+</div><div class='add'>+static int snd_asihpi_volume_mute_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	u32 h_control = kcontrol-&gt;private_value;</div><div class='add'>+	u32 mute;</div><div class='add'>+</div><div class='add'>+	hpi_handle_error(hpi_volume_get_mute(h_control, &amp;mute));</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = mute ? 0 : 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_asihpi_volume_mute_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				 struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	u32 h_control = kcontrol-&gt;private_value;</div><div class='add'>+	/* HPI currently only supports all or none muting of multichannel volume</div><div class='add'>+	ALSA Switch element has opposite sense to HPI mute: on==unmuted, off=muted</div><div class='add'>+	*/</div><div class='add'>+	int mute =  ucontrol-&gt;value.integer.value[0] ? 0 : HPI_BITMASK_ALL_CHANNELS;</div><div class='add'>+	hpi_handle_error(hpi_volume_set_mute(h_control, mute));</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				 struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='add'>+	int err;</div><div class='add'>+	u32 mute;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "volume");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Volume");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 				SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_volume_info;</div><div class='hunk'>@@ -1542,7 +1512,19 @@ static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	snd_control.put = snd_asihpi_volume_put;</div><div class='ctx'> 	snd_control.tlv.p = db_scale_100;</div><div class='ctx'> </div><div class='del'>-	return ctl_add(card, &amp;snd_control, asihpi);</div><div class='add'>+	err = ctl_add(card, &amp;snd_control, asihpi);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (hpi_volume_get_mute(hpi_ctl-&gt;h_control, &amp;mute) == 0) {</div><div class='add'>+		asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Switch");</div><div class='add'>+		snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+		snd_control.info = snd_asihpi_volume_mute_info;</div><div class='add'>+		snd_control.get = snd_asihpi_volume_mute_get;</div><div class='add'>+		snd_control.put = snd_asihpi_volume_mute_put;</div><div class='add'>+		err = ctl_add(card, &amp;snd_control, asihpi);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------------------------------------------</div><div class='hunk'>@@ -1558,7 +1540,7 @@ static int snd_asihpi_level_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	short step_gain_mB;</div><div class='ctx'> </div><div class='ctx'> 	err =</div><div class='del'>-	    hpi_level_query_range(ss, h_control, &amp;min_gain_mB,</div><div class='add'>+	    hpi_level_query_range(h_control, &amp;min_gain_mB,</div><div class='ctx'> 			       &amp;max_gain_mB, &amp;step_gain_mB);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		max_gain_mB = 2400;</div><div class='hunk'>@@ -1580,7 +1562,7 @@ static int snd_asihpi_level_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	short an_gain_mB[HPI_MAX_CHANNELS];</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_level_get_gain(ss, h_control, an_gain_mB));</div><div class='add'>+	hpi_handle_error(hpi_level_get_gain(h_control, an_gain_mB));</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 	    an_gain_mB[0] / HPI_UNITS_PER_dB;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] =</div><div class='hunk'>@@ -1604,20 +1586,20 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	   asihpi-&gt;mixer_level[addr][1] != right;</div><div class='ctx'> 	 */</div><div class='ctx'> 	change = 1;</div><div class='del'>-	hpi_handle_error(hpi_level_set_gain(ss, h_control, an_gain_mB));</div><div class='add'>+	hpi_handle_error(hpi_level_set_gain(h_control, an_gain_mB));</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_level, -1000, 100, 0);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_level_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='ctx'> 	/* can't use 'volume' cos some nodes have volume as well */</div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "level");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Level");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 				SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_level_info;</div><div class='hunk'>@@ -1633,38 +1615,23 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'>  ------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* AESEBU format */</div><div class='del'>-static char *asihpi_aesebu_format_names[] =</div><div class='del'>-{</div><div class='del'>-	"N/A",</div><div class='del'>-	"S/PDIF",</div><div class='del'>-	"AES/EBU",</div><div class='del'>-};</div><div class='add'>+static const char * const asihpi_aesebu_format_names[] = {</div><div class='add'>+	"N/A", "S/PDIF", "AES/EBU" };</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_format_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		asihpi_aesebu_format_names[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, asihpi_aesebu_format_names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			u16 (*func)(const struct hpi_hsubsys *, u32, u16 *))</div><div class='add'>+			u16 (*func)(u32, u16 *))</div><div class='ctx'> {</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u16 source, err;</div><div class='ctx'> </div><div class='del'>-	err = func(ss, h_control, &amp;source);</div><div class='add'>+	err = func(h_control, &amp;source);</div><div class='ctx'> </div><div class='ctx'> 	/* default to N/A */</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='hunk'>@@ -1681,7 +1648,7 @@ static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			 u16 (*func)(const struct hpi_hsubsys *, u32, u16))</div><div class='add'>+			 u16 (*func)(u32, u16))</div><div class='ctx'> {</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='hunk'>@@ -1693,7 +1660,7 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] == 2)</div><div class='ctx'> 		source = HPI_AESEBU_FORMAT_AESEBU;</div><div class='ctx'> </div><div class='del'>-	if (func(ss, h_control, source) != 0)</div><div class='add'>+	if (func(h_control, source) != 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -1702,13 +1669,13 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_asihpi_aesebu_rx_format_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol) {</div><div class='ctx'> 	return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,</div><div class='del'>-					HPI_AESEBU__receiver_get_format);</div><div class='add'>+					hpi_aesebu_receiver_get_format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_rx_format_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol) {</div><div class='ctx'> 	return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,</div><div class='del'>-					HPI_AESEBU__receiver_set_format);</div><div class='add'>+					hpi_aesebu_receiver_set_format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_rxstatus_info(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1730,19 +1697,19 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u16 status;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(HPI_AESEBU__receiver_get_error_status(</div><div class='del'>-				ss, h_control, &amp;status));</div><div class='add'>+	hpi_handle_error(hpi_aesebu_receiver_get_error_status(</div><div class='add'>+					 h_control, &amp;status));</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = status;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				    struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "format");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Format");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='ctx'> 	snd_control.info = snd_asihpi_aesebu_format_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_aesebu_rx_format_get;</div><div class='hunk'>@@ -1752,7 +1719,7 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	if (ctl_add(card, &amp;snd_control, asihpi) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "status");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Status");</div><div class='ctx'> 	snd_control.access =</div><div class='ctx'> 	    SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_aesebu_rxstatus_info;</div><div class='hunk'>@@ -1764,23 +1731,23 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> static int snd_asihpi_aesebu_tx_format_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol) {</div><div class='ctx'> 	return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,</div><div class='del'>-					HPI_AESEBU__transmitter_get_format);</div><div class='add'>+					hpi_aesebu_transmitter_get_format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol) {</div><div class='ctx'> 	return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,</div><div class='del'>-					HPI_AESEBU__transmitter_set_format);</div><div class='add'>+					hpi_aesebu_transmitter_set_format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				    struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "format");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Format");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='ctx'> 	snd_control.info = snd_asihpi_aesebu_format_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_aesebu_tx_format_get;</div><div class='hunk'>@@ -1804,7 +1771,7 @@ static int snd_asihpi_tuner_gain_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u16 gain_range[3];</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; 3; idx++) {</div><div class='del'>-		err = hpi_tuner_query_gain(ss, h_control,</div><div class='add'>+		err = hpi_tuner_query_gain(h_control,</div><div class='ctx'> 					  idx, &amp;gain_range[idx]);</div><div class='ctx'> 		if (err != 0)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1827,7 +1794,7 @@ static int snd_asihpi_tuner_gain_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	short gain;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_tuner_get_gain(ss, h_control, &amp;gain));</div><div class='add'>+	hpi_handle_error(hpi_tuner_get_gain(h_control, &amp;gain));</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = gain / HPI_UNITS_PER_dB;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1843,7 +1810,7 @@ static int snd_asihpi_tuner_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	short gain;</div><div class='ctx'> </div><div class='ctx'> 	gain = (ucontrol-&gt;value.integer.value[0]) * HPI_UNITS_PER_dB;</div><div class='del'>-	hpi_handle_error(hpi_tuner_set_gain(ss, h_control, gain));</div><div class='add'>+	hpi_handle_error(hpi_tuner_set_gain(h_control, gain));</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1857,7 +1824,7 @@ static int asihpi_tuner_band_query(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		err = hpi_tuner_query_band(ss,</div><div class='add'>+		err = hpi_tuner_query_band(</div><div class='ctx'> 				h_control, i, &amp;band_list[i]);</div><div class='ctx'> 		if (err != 0)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1881,22 +1848,7 @@ static int snd_asihpi_tuner_band_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (num_bands &lt; 0)</div><div class='ctx'> 		return num_bands;</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = num_bands;</div><div class='del'>-</div><div class='del'>-	if (num_bands &gt; 0) {</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt;=</div><div class='del'>-					uinfo-&gt;value.enumerated.items)</div><div class='del'>-			uinfo-&gt;value.enumerated.item =</div><div class='del'>-				uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-			asihpi_tuner_band_names[</div><div class='del'>-				tuner_bands[uinfo-&gt;value.enumerated.item]]);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, num_bands, asihpi_tuner_band_names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_tuner_band_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1908,12 +1860,12 @@ static int snd_asihpi_tuner_band_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	*/</div><div class='ctx'> 	u16 band, idx;</div><div class='ctx'> 	u16 tuner_bands[HPI_TUNER_BAND_LAST];</div><div class='del'>-	u32 num_bands = 0;</div><div class='add'>+	__always_unused u32 num_bands;</div><div class='ctx'> </div><div class='ctx'> 	num_bands = asihpi_tuner_band_query(kcontrol, tuner_bands,</div><div class='ctx'> 				HPI_TUNER_BAND_LAST);</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_tuner_get_band(ss, h_control, &amp;band));</div><div class='add'>+	hpi_handle_error(hpi_tuner_get_band(h_control, &amp;band));</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = -1;</div><div class='ctx'> 	for (idx = 0; idx &lt; HPI_TUNER_BAND_LAST; idx++)</div><div class='hunk'>@@ -1932,15 +1884,19 @@ static int snd_asihpi_tuner_band_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_card_asihpi *asihpi = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	*/</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int idx;</div><div class='ctx'> 	u16 band;</div><div class='ctx'> 	u16 tuner_bands[HPI_TUNER_BAND_LAST];</div><div class='del'>-	u32 num_bands = 0;</div><div class='add'>+	__always_unused u32 num_bands;</div><div class='ctx'> </div><div class='ctx'> 	num_bands = asihpi_tuner_band_query(kcontrol, tuner_bands,</div><div class='ctx'> 			HPI_TUNER_BAND_LAST);</div><div class='ctx'> </div><div class='del'>-	band = tuner_bands[ucontrol-&gt;value.enumerated.item[0]];</div><div class='del'>-	hpi_handle_error(hpi_tuner_set_band(ss, h_control, band));</div><div class='add'>+	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (idx &gt;= ARRAY_SIZE(tuner_bands))</div><div class='add'>+		idx = ARRAY_SIZE(tuner_bands) - 1;</div><div class='add'>+	band = tuner_bands[idx];</div><div class='add'>+	hpi_handle_error(hpi_tuner_set_band(h_control, band));</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1965,7 +1921,7 @@ static int snd_asihpi_tuner_freq_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	for (band_iter = 0; band_iter &lt; num_bands; band_iter++) {</div><div class='ctx'> 		for (idx = 0; idx &lt; 3; idx++) {</div><div class='del'>-			err = hpi_tuner_query_frequency(ss, h_control,</div><div class='add'>+			err = hpi_tuner_query_frequency(h_control,</div><div class='ctx'> 				idx, tuner_bands[band_iter],</div><div class='ctx'> 				&amp;temp_freq_range[idx]);</div><div class='ctx'> 			if (err != 0)</div><div class='hunk'>@@ -1998,7 +1954,7 @@ static int snd_asihpi_tuner_freq_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_tuner_get_frequency(ss, h_control, &amp;freq));</div><div class='add'>+	hpi_handle_error(hpi_tuner_get_frequency(h_control, &amp;freq));</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = freq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2011,14 +1967,14 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> </div><div class='ctx'> 	freq = ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	hpi_handle_error(hpi_tuner_set_frequency(ss, h_control, freq));</div><div class='add'>+	hpi_handle_error(hpi_tuner_set_frequency(h_control, freq));</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Tuner control group initializer  */</div><div class='del'>-static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='hunk'>@@ -2026,8 +1982,8 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	snd_control.private_value = hpi_ctl-&gt;h_control;</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='ctx'> </div><div class='del'>-	if (!hpi_tuner_get_gain(ss, hpi_ctl-&gt;h_control, NULL)) {</div><div class='del'>-		asihpi_ctl_init(&amp;snd_control, hpi_ctl, "gain");</div><div class='add'>+	if (!hpi_tuner_get_gain(hpi_ctl-&gt;h_control, NULL)) {</div><div class='add'>+		asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Gain");</div><div class='ctx'> 		snd_control.info = snd_asihpi_tuner_gain_info;</div><div class='ctx'> 		snd_control.get = snd_asihpi_tuner_gain_get;</div><div class='ctx'> 		snd_control.put = snd_asihpi_tuner_gain_put;</div><div class='hunk'>@@ -2036,7 +1992,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "band");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Band");</div><div class='ctx'> 	snd_control.info = snd_asihpi_tuner_band_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_tuner_band_get;</div><div class='ctx'> 	snd_control.put = snd_asihpi_tuner_band_put;</div><div class='hunk'>@@ -2044,7 +2000,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	if (ctl_add(card, &amp;snd_control, asihpi) &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "freq");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Freq");</div><div class='ctx'> 	snd_control.info = snd_asihpi_tuner_freq_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_tuner_freq_get;</div><div class='ctx'> 	snd_control.put = snd_asihpi_tuner_freq_put;</div><div class='hunk'>@@ -2058,15 +2014,22 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> static int snd_asihpi_meter_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='add'>+	u32 h_control = kcontrol-&gt;private_value;</div><div class='add'>+	u32 count;</div><div class='add'>+	u16 err;</div><div class='add'>+	err = hpi_meter_query_channels(h_control, &amp;count);</div><div class='add'>+	if (err)</div><div class='add'>+		count = HPI_MAX_CHANNELS;</div><div class='add'>+</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='del'>-	uinfo-&gt;count = HPI_MAX_CHANNELS;</div><div class='add'>+	uinfo-&gt;count = count;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = 0x7FFFFFFF;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* linear values for 10dB steps */</div><div class='del'>-static int log2lin[] = {</div><div class='add'>+static const int log2lin[] = {</div><div class='ctx'> 	0x7FFFFFFF, /* 0dB */</div><div class='ctx'> 	679093956,</div><div class='ctx'> 	214748365,</div><div class='hunk'>@@ -2095,7 +2058,7 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	short an_gain_mB[HPI_MAX_CHANNELS], i;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_meter_get_peak(ss, h_control, an_gain_mB);</div><div class='add'>+	err = hpi_meter_get_peak(h_control, an_gain_mB);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; HPI_MAX_CHANNELS; i++) {</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -2114,13 +2077,13 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl, int subidx)</div><div class='add'>+static int snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				struct hpi_control *hpi_ctl, int subidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "meter");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Meter");</div><div class='ctx'> 	snd_control.access =</div><div class='ctx'> 	    SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_meter_info;</div><div class='hunk'>@@ -2140,7 +2103,7 @@ static int snd_card_asihpi_mux_count_sources(struct snd_kcontrol *snd_control)</div><div class='ctx'> 	struct hpi_control hpi_ctl;</div><div class='ctx'> 	int s, err;</div><div class='ctx'> 	for (s = 0; s &lt; 32; s++) {</div><div class='del'>-		err = hpi_multiplexer_query_source(ss, h_control, s,</div><div class='add'>+		err = hpi_multiplexer_query_source(h_control, s,</div><div class='ctx'> 						  &amp;hpi_ctl.</div><div class='ctx'> 						  src_node_type,</div><div class='ctx'> 						  &amp;hpi_ctl.</div><div class='hunk'>@@ -2154,7 +2117,6 @@ static int snd_card_asihpi_mux_count_sources(struct snd_kcontrol *snd_control)</div><div class='ctx'> static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	u16 src_node_type, src_node_index;</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='hunk'>@@ -2167,10 +2129,9 @@ static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		uinfo-&gt;value.enumerated.item =</div><div class='ctx'> 		    uinfo-&gt;value.enumerated.items - 1;</div><div class='ctx'> </div><div class='del'>-	err =</div><div class='del'>-	    hpi_multiplexer_query_source(ss, h_control,</div><div class='del'>-					uinfo-&gt;value.enumerated.item,</div><div class='del'>-					&amp;src_node_type, &amp;src_node_index);</div><div class='add'>+	hpi_multiplexer_query_source(h_control,</div><div class='add'>+				     uinfo-&gt;value.enumerated.item,</div><div class='add'>+				     &amp;src_node_type, &amp;src_node_index);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(uinfo-&gt;value.enumerated.name, "%s %d",</div><div class='ctx'> 		asihpi_src_names[src_node_type - HPI_SOURCENODE_NONE],</div><div class='hunk'>@@ -2186,11 +2147,11 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u16 src_node_type, src_node_index;</div><div class='ctx'> 	int s;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_multiplexer_get_source(ss, h_control,</div><div class='add'>+	hpi_handle_error(hpi_multiplexer_get_source(h_control,</div><div class='ctx'> 				&amp;source_type, &amp;source_index));</div><div class='ctx'> 	/* Should cache this search result! */</div><div class='ctx'> 	for (s = 0; s &lt; 256; s++) {</div><div class='del'>-		if (hpi_multiplexer_query_source(ss, h_control, s,</div><div class='add'>+		if (hpi_multiplexer_query_source(h_control, s,</div><div class='ctx'> 					    &amp;src_node_type, &amp;src_node_index))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -2200,9 +2161,8 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd(KERN_WARNING</div><div class='del'>-		"control %x failed to match mux source %hu %hu\n",</div><div class='del'>-		h_control, source_type, source_index);</div><div class='add'>+	pr_warn("%s: Control %x failed to match mux source %hu %hu\n",</div><div class='add'>+		__func__, h_control, source_type, source_index);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2217,28 +2177,24 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	change = 1;</div><div class='ctx'> </div><div class='del'>-	e = hpi_multiplexer_query_source(ss, h_control,</div><div class='add'>+	e = hpi_multiplexer_query_source(h_control,</div><div class='ctx'> 				    ucontrol-&gt;value.enumerated.item[0],</div><div class='ctx'> 				    &amp;source_type, &amp;source_index);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		hpi_handle_error(</div><div class='del'>-			hpi_multiplexer_set_source(ss, h_control,</div><div class='add'>+			hpi_multiplexer_set_source(h_control,</div><div class='ctx'> 						source_type, source_index));</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int  snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+			       struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-#if ASI_STYLE_NAMES</div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "multiplexer");</div><div class='del'>-#else</div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "route");</div><div class='del'>-#endif</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Route");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='ctx'> 	snd_control.info = snd_asihpi_mux_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_mux_get;</div><div class='hunk'>@@ -2254,35 +2210,33 @@ static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> static int snd_asihpi_cmode_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *mode_names[HPI_CHANNEL_MODE_LAST] = {</div><div class='del'>-		"normal", "swap",</div><div class='del'>-		"from_left", "from_right",</div><div class='del'>-		"to_left", "to_right"</div><div class='add'>+	static const char * const mode_names[HPI_CHANNEL_MODE_LAST + 1] = {</div><div class='add'>+		"invalid",</div><div class='add'>+		"Normal", "Swap",</div><div class='add'>+		"From Left", "From Right",</div><div class='add'>+		"To Left", "To Right"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u16 mode;</div><div class='ctx'> 	int i;</div><div class='add'>+	const char *mapped_names[6];</div><div class='add'>+	int valid_modes = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* HPI channel mode values can be from 1 to 6</div><div class='ctx'> 	Some adapters only support a contiguous subset</div><div class='ctx'> 	*/</div><div class='ctx'> 	for (i = 0; i &lt; HPI_CHANNEL_MODE_LAST; i++)</div><div class='del'>-		if (hpi_channel_mode_query_mode(</div><div class='del'>-			ss,  h_control, i, &amp;mode))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = i;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= i)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = i - 1;</div><div class='add'>+		if (!hpi_channel_mode_query_mode(</div><div class='add'>+			h_control, i, &amp;mode)) {</div><div class='add'>+			mapped_names[valid_modes] = mode_names[mode];</div><div class='add'>+			valid_modes++;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       mode_names[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+	if (!valid_modes)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, valid_modes, mapped_names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_cmode_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -2291,7 +2245,7 @@ static int snd_asihpi_cmode_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u16 mode;</div><div class='ctx'> </div><div class='del'>-	if (hpi_channel_mode_get(ss, h_control, &amp;mode))</div><div class='add'>+	if (hpi_channel_mode_get(h_control, &amp;mode))</div><div class='ctx'> 		mode = 1;</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = mode - 1;</div><div class='hunk'>@@ -2307,19 +2261,19 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	change = 1;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_channel_mode_set(ss, h_control,</div><div class='add'>+	hpi_handle_error(hpi_channel_mode_set(h_control,</div><div class='ctx'> 			   ucontrol-&gt;value.enumerated.item[0] + 1));</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = asihpi-&gt;card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "channel mode");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Mode");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='ctx'> 	snd_control.info = snd_asihpi_cmode_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_cmode_get;</div><div class='hunk'>@@ -2331,21 +2285,22 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> /*------------------------------------------------------------</div><div class='ctx'>    Sampleclock source  controls</div><div class='ctx'>  ------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-static char *sampleclock_sources[MAX_CLOCKSOURCES] =</div><div class='del'>-    { "N/A", "local PLL", "AES/EBU sync", "word external", "word header",</div><div class='del'>-	  "SMPTE", "AES/EBU in1", "auto", "network", "invalid",</div><div class='del'>-	  "prev module",</div><div class='del'>-	  "AES/EBU in2", "AES/EBU in3", "AES/EBU in4", "AES/EBU in5",</div><div class='del'>-	  "AES/EBU in6", "AES/EBU in7", "AES/EBU in8"};</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+static const char * const sampleclock_sources[] = {</div><div class='add'>+	"N/A", "Local PLL", "Digital Sync", "Word External", "Word Header",</div><div class='add'>+	"SMPTE", "Digital1", "Auto", "Network", "Invalid",</div><div class='add'>+	"Prev Module", "BLU-Link",</div><div class='add'>+	"Digital2", "Digital3", "Digital4", "Digital5",</div><div class='add'>+	"Digital6", "Digital7", "Digital8"};</div><div class='add'>+</div><div class='add'>+	/* Number of strings must match expected enumerated values */</div><div class='add'>+	compile_time_assert(</div><div class='add'>+		(ARRAY_SIZE(sampleclock_sources) == MAX_CLOCKSOURCES),</div><div class='add'>+		assert_sampleclock_sources_size);</div><div class='ctx'> </div><div class='ctx'> static int snd_asihpi_clksrc_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card_asihpi *asihpi =</div><div class='del'>-			(struct snd_card_asihpi *)(kcontrol-&gt;private_data);</div><div class='add'>+	struct snd_card_asihpi *asihpi = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct clk_cache *clkcache = &amp;asihpi-&gt;cc;</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='hunk'>@@ -2355,7 +2310,7 @@ static int snd_asihpi_clksrc_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		uinfo-&gt;value.enumerated.item =</div><div class='ctx'> 				uinfo-&gt;value.enumerated.items - 1;</div><div class='ctx'> </div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+	strscpy(uinfo-&gt;value.enumerated.name,</div><div class='ctx'> 	       clkcache-&gt;s[uinfo-&gt;value.enumerated.item].name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2363,19 +2318,18 @@ static int snd_asihpi_clksrc_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_asihpi_clksrc_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card_asihpi *asihpi =</div><div class='del'>-			(struct snd_card_asihpi *)(kcontrol-&gt;private_data);</div><div class='add'>+	struct snd_card_asihpi *asihpi = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct clk_cache *clkcache = &amp;asihpi-&gt;cc;</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> 	u16 source, srcindex = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='del'>-	if (hpi_sample_clock_get_source(ss, h_control, &amp;source))</div><div class='add'>+	if (hpi_sample_clock_get_source(h_control, &amp;source))</div><div class='ctx'> 		source = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)</div><div class='del'>-		if (hpi_sample_clock_get_source_index(ss, h_control, &amp;srcindex))</div><div class='add'>+		if (hpi_sample_clock_get_source_index(h_control, &amp;srcindex))</div><div class='ctx'> 			srcindex = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; clkcache-&gt;count; i++)</div><div class='hunk'>@@ -2391,10 +2345,10 @@ static int snd_asihpi_clksrc_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_asihpi_clksrc_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				 struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card_asihpi *asihpi =</div><div class='del'>-			(struct snd_card_asihpi *)(kcontrol-&gt;private_data);</div><div class='add'>+	struct snd_card_asihpi *asihpi = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct clk_cache *clkcache = &amp;asihpi-&gt;cc;</div><div class='del'>-	int change, item;</div><div class='add'>+	unsigned int item;</div><div class='add'>+	int change;</div><div class='ctx'> 	u32 h_control = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='ctx'> 	change = 1;</div><div class='hunk'>@@ -2402,11 +2356,11 @@ static int snd_asihpi_clksrc_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (item &gt;= clkcache-&gt;count)</div><div class='ctx'> 		item = clkcache-&gt;count-1;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_sample_clock_set_source(ss,</div><div class='add'>+	hpi_handle_error(hpi_sample_clock_set_source(</div><div class='ctx'> 				h_control, clkcache-&gt;s[item].source));</div><div class='ctx'> </div><div class='ctx'> 	if (clkcache-&gt;s[item].source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)</div><div class='del'>-		hpi_handle_error(hpi_sample_clock_set_source_index(ss,</div><div class='add'>+		hpi_handle_error(hpi_sample_clock_set_source_index(</div><div class='ctx'> 				h_control, clkcache-&gt;s[item].index));</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='hunk'>@@ -2434,7 +2388,7 @@ static int snd_asihpi_clklocal_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> 	u16 e;</div><div class='ctx'> </div><div class='del'>-	e = hpi_sample_clock_get_local_rate(ss, h_control, &amp;rate);</div><div class='add'>+	e = hpi_sample_clock_get_local_rate(h_control, &amp;rate);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = rate;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2452,7 +2406,7 @@ static int snd_asihpi_clklocal_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	   asihpi-&gt;mixer_clkrate[addr][1] != right;</div><div class='ctx'> 	 */</div><div class='ctx'> 	change = 1;</div><div class='del'>-	hpi_handle_error(hpi_sample_clock_set_local_rate(ss, h_control,</div><div class='add'>+	hpi_handle_error(hpi_sample_clock_set_local_rate(h_control,</div><div class='ctx'> 				      ucontrol-&gt;value.integer.value[0]));</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='hunk'>@@ -2476,7 +2430,7 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> 	u16 e;</div><div class='ctx'> </div><div class='del'>-	e = hpi_sample_clock_get_sample_rate(ss, h_control, &amp;rate);</div><div class='add'>+	e = hpi_sample_clock_get_sample_rate(h_control, &amp;rate);</div><div class='ctx'> 	if (!e)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = rate;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2484,24 +2438,28 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='del'>-					struct hpi_control *hpi_ctl)</div><div class='add'>+static int snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='add'>+				      struct hpi_control *hpi_ctl)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = asihpi-&gt;card;</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	struct snd_kcontrol_new snd_control;</div><div class='ctx'> </div><div class='del'>-	struct clk_cache *clkcache = &amp;asihpi-&gt;cc;</div><div class='add'>+	struct clk_cache *clkcache;</div><div class='ctx'> 	u32 hSC =  hpi_ctl-&gt;h_control;</div><div class='ctx'> 	int has_aes_in = 0;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> 	u16 source;</div><div class='ctx'> </div><div class='add'>+	if (snd_BUG_ON(!asihpi))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	card = asihpi-&gt;card;</div><div class='add'>+	clkcache = &amp;asihpi-&gt;cc;</div><div class='ctx'> 	snd_control.private_value = hpi_ctl-&gt;h_control;</div><div class='ctx'> </div><div class='ctx'> 	clkcache-&gt;has_local = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= HPI_SAMPLECLOCK_SOURCE_LAST; i++) {</div><div class='del'>-		if  (hpi_sample_clock_query_source(ss, hSC,</div><div class='add'>+		if  (hpi_sample_clock_query_source(hSC,</div><div class='ctx'> 				i, &amp;source))</div><div class='ctx'> 			break;</div><div class='ctx'> 		clkcache-&gt;s[i].source = source;</div><div class='hunk'>@@ -2515,7 +2473,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 	if (has_aes_in)</div><div class='ctx'> 		/* already will have picked up index 0 above */</div><div class='ctx'> 		for (j = 1; j &lt; 8; j++) {</div><div class='del'>-			if (hpi_sample_clock_query_source_index(ss, hSC,</div><div class='add'>+			if (hpi_sample_clock_query_source_index(hSC,</div><div class='ctx'> 				j, HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT,</div><div class='ctx'> 				&amp;source))</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2528,7 +2486,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 		}</div><div class='ctx'> 	clkcache-&gt;count = i;</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "source");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Source");</div><div class='ctx'> 	snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_clksrc_info;</div><div class='ctx'> 	snd_control.get = snd_asihpi_clksrc_get;</div><div class='hunk'>@@ -2538,7 +2496,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	if (clkcache-&gt;has_local) {</div><div class='del'>-		asihpi_ctl_init(&amp;snd_control, hpi_ctl, "local_rate");</div><div class='add'>+		asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Localrate");</div><div class='ctx'> 		snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;</div><div class='ctx'> 		snd_control.info = snd_asihpi_clklocal_info;</div><div class='ctx'> 		snd_control.get = snd_asihpi_clklocal_get;</div><div class='hunk'>@@ -2549,7 +2507,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "rate");</div><div class='add'>+	asihpi_ctl_init(&amp;snd_control, hpi_ctl, "Rate");</div><div class='ctx'> 	snd_control.access =</div><div class='ctx'> 	    SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;</div><div class='ctx'> 	snd_control.info = snd_asihpi_clkrate_info;</div><div class='hunk'>@@ -2561,9 +2519,9 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,</div><div class='ctx'>    Mixer</div><div class='ctx'>  ------------------------------------------------------------*/</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='add'>+static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = asihpi-&gt;card;</div><div class='add'>+	struct snd_card *card;</div><div class='ctx'> 	unsigned int idx = 0;</div><div class='ctx'> 	unsigned int subindex = 0;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2571,10 +2529,11 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!asihpi))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	strcpy(card-&gt;mixername, "asihpi mixer");</div><div class='add'>+	card = asihpi-&gt;card;</div><div class='add'>+	strscpy(card-&gt;mixername, "Asihpi Mixer");</div><div class='ctx'> </div><div class='ctx'> 	err =</div><div class='del'>-	    hpi_mixer_open(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	    hpi_mixer_open(asihpi-&gt;hpi-&gt;adapter-&gt;index,</div><div class='ctx'> 			  &amp;asihpi-&gt;h_mixer);</div><div class='ctx'> 	hpi_handle_error(err);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -2585,7 +2544,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; 2000; idx++) {</div><div class='ctx'> 		err = hpi_mixer_get_control_by_index(</div><div class='del'>-				ss, asihpi-&gt;h_mixer,</div><div class='add'>+				asihpi-&gt;h_mixer,</div><div class='ctx'> 				idx,</div><div class='ctx'> 				&amp;hpi_ctl.src_node_type,</div><div class='ctx'> 				&amp;hpi_ctl.src_node_index,</div><div class='hunk'>@@ -2596,8 +2555,8 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			if (err == HPI_ERROR_CONTROL_DISABLED) {</div><div class='ctx'> 				if (mixer_dump)</div><div class='del'>-					snd_printk(KERN_INFO</div><div class='del'>-						   "disabled HPI control(%d)\n",</div><div class='add'>+					dev_info(&amp;asihpi-&gt;pci-&gt;dev,</div><div class='add'>+						   "Disabled HPI Control(%d)\n",</div><div class='ctx'> 						   idx);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			} else</div><div class='hunk'>@@ -2661,9 +2620,8 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> 		case HPI_CONTROL_COMPANDER:</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (mixer_dump)</div><div class='del'>-				snd_printk(KERN_INFO</div><div class='del'>-					"untranslated HPI control"</div><div class='del'>-					"(%d) %d %d %d %d %d\n",</div><div class='add'>+				dev_info(&amp;asihpi-&gt;pci-&gt;dev,</div><div class='add'>+					"Untranslated HPI Control (%d) %d %d %d %d %d\n",</div><div class='ctx'> 					idx,</div><div class='ctx'> 					hpi_ctl.control_type,</div><div class='ctx'> 					hpi_ctl.src_node_type,</div><div class='hunk'>@@ -2671,14 +2629,14 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)</div><div class='ctx'> 					hpi_ctl.dst_node_type,</div><div class='ctx'> 					hpi_ctl.dst_node_index);</div><div class='ctx'> 			continue;</div><div class='del'>-		};</div><div class='add'>+		}</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (HPI_ERROR_INVALID_OBJ_INDEX != err)</div><div class='ctx'> 		hpi_handle_error(err);</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "%d mixer controls found\n", idx);</div><div class='add'>+	dev_info(&amp;asihpi-&gt;pci-&gt;dev, "%d mixer controls found\n", idx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2692,49 +2650,53 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 			struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card_asihpi *asihpi = entry-&gt;private_data;</div><div class='del'>-	u16 version;</div><div class='ctx'> 	u32 h_control;</div><div class='ctx'> 	u32 rate = 0;</div><div class='ctx'> 	u16 source = 0;</div><div class='add'>+</div><div class='add'>+	u16 num_outstreams;</div><div class='add'>+	u16 num_instreams;</div><div class='add'>+	u16 version;</div><div class='add'>+	u32 serial_number;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer, "ASIHPI driver proc file\n");</div><div class='add'>+</div><div class='add'>+	hpi_handle_error(hpi_adapter_get_info(asihpi-&gt;hpi-&gt;adapter-&gt;index,</div><div class='add'>+			&amp;num_outstreams, &amp;num_instreams,</div><div class='add'>+			&amp;version, &amp;serial_number, &amp;type));</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer,</div><div class='del'>-		"adapter ID=%4X\n_index=%d\n"</div><div class='del'>-		"num_outstreams=%d\n_num_instreams=%d\n",</div><div class='del'>-		asihpi-&gt;type, asihpi-&gt;adapter_index,</div><div class='del'>-		asihpi-&gt;num_outstreams, asihpi-&gt;num_instreams);</div><div class='add'>+			"Adapter type ASI%4X\nHardware Index %d\n"</div><div class='add'>+			"%d outstreams\n%d instreams\n",</div><div class='add'>+			type, asihpi-&gt;hpi-&gt;adapter-&gt;index,</div><div class='add'>+			num_outstreams, num_instreams);</div><div class='ctx'> </div><div class='del'>-	version = asihpi-&gt;version;</div><div class='ctx'> 	snd_iprintf(buffer,</div><div class='del'>-		"serial#=%d\n_hw version %c%d\nDSP code version %03d\n",</div><div class='del'>-		asihpi-&gt;serial_number, ((version &gt;&gt; 3) &amp; 0xf) + 'A',</div><div class='del'>-		version &amp; 0x7,</div><div class='add'>+		"Serial#%d\nHardware version %c%d\nDSP code version %03d\n",</div><div class='add'>+		serial_number, ((version &gt;&gt; 3) &amp; 0xf) + 'A', version &amp; 0x7,</div><div class='ctx'> 		((version &gt;&gt; 13) * 100) + ((version &gt;&gt; 7) &amp; 0x3f));</div><div class='ctx'> </div><div class='del'>-	err = hpi_mixer_get_control(ss, asihpi-&gt;h_mixer,</div><div class='add'>+	err = hpi_mixer_get_control(asihpi-&gt;h_mixer,</div><div class='ctx'> 				  HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,</div><div class='ctx'> 				  HPI_CONTROL_SAMPLECLOCK, &amp;h_control);</div><div class='ctx'> </div><div class='ctx'> 	if (!err) {</div><div class='del'>-		err = hpi_sample_clock_get_sample_rate(ss,</div><div class='del'>-					h_control, &amp;rate);</div><div class='del'>-		err += hpi_sample_clock_get_source(ss, h_control, &amp;source);</div><div class='add'>+		err = hpi_sample_clock_get_sample_rate(h_control, &amp;rate);</div><div class='add'>+		err += hpi_sample_clock_get_source(h_control, &amp;source);</div><div class='ctx'> </div><div class='ctx'> 		if (!err)</div><div class='del'>-			snd_iprintf(buffer, "sample_clock=%d_hz, source %s\n",</div><div class='add'>+			snd_iprintf(buffer, "Sample Clock %dHz, source %s\n",</div><div class='ctx'> 			rate, sampleclock_sources[source]);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static void __devinit snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)</div><div class='add'>+static void snd_asihpi_proc_init(struct snd_card_asihpi *asihpi)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(asihpi-&gt;card, "info", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, asihpi, snd_asihpi_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(asihpi-&gt;card, "info", asihpi,</div><div class='add'>+			     snd_asihpi_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------------------------------------------</div><div class='hunk'>@@ -2771,133 +2733,114 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file,</div><div class='ctx'> /* results in /dev/snd/hwC#D0 file for each card with index #</div><div class='ctx'>    also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card'</div><div class='ctx'> */</div><div class='del'>-static int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,</div><div class='del'>-	int device, struct snd_hwdep **rhwdep)</div><div class='add'>+static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hw;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rhwdep)</div><div class='del'>-		*rhwdep = NULL;</div><div class='ctx'> 	err = snd_hwdep_new(asihpi-&gt;card, "HPI", device, &amp;hw);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(hw-&gt;name, "asihpi (HPI)");</div><div class='add'>+	strscpy(hw-&gt;name, "asihpi (HPI)");</div><div class='ctx'> 	hw-&gt;iface = SNDRV_HWDEP_IFACE_LAST;</div><div class='ctx'> 	hw-&gt;ops.open = snd_asihpi_hpi_open;</div><div class='ctx'> 	hw-&gt;ops.ioctl = snd_asihpi_hpi_ioctl;</div><div class='ctx'> 	hw-&gt;ops.release = snd_asihpi_hpi_release;</div><div class='ctx'> 	hw-&gt;private_data = asihpi;</div><div class='del'>-	if (rhwdep)</div><div class='del'>-		*rhwdep = hw;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------------------------------------------</div><div class='ctx'>    CARD</div><div class='ctx'>  ------------------------------------------------------------*/</div><div class='del'>-static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,</div><div class='del'>-				       const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_asihpi_probe(struct pci_dev *pci_dev,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-</div><div class='del'>-	u16 version;</div><div class='del'>-	int pcm_substreams;</div><div class='del'>-</div><div class='del'>-	struct hpi_adapter *hpi_card;</div><div class='add'>+	struct hpi_adapter *hpi;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_card_asihpi *asihpi;</div><div class='ctx'> </div><div class='ctx'> 	u32 h_control;</div><div class='ctx'> 	u32 h_stream;</div><div class='add'>+	u32 adapter_index;</div><div class='ctx'> </div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Should this be enable[hpi_card-&gt;index] ? */</div><div class='add'>+	/* Should this be enable[hpi-&gt;index] ? */</div><div class='ctx'> 	if (!enable[dev]) {</div><div class='ctx'> 		dev++;</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Initialise low-level HPI driver */</div><div class='ctx'> 	err = asihpi_adapter_probe(pci_dev, pci_id);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	hpi_card = pci_get_drvdata(pci_dev);</div><div class='add'>+	hpi = pci_get_drvdata(pci_dev);</div><div class='add'>+	adapter_index = hpi-&gt;adapter-&gt;index;</div><div class='ctx'> 	/* first try to give the card the same index as its hardware index */</div><div class='del'>-	err = snd_card_create(hpi_card-&gt;index,</div><div class='del'>-			      id[hpi_card-&gt;index], THIS_MODULE,</div><div class='del'>-			      sizeof(struct snd_card_asihpi),</div><div class='del'>-			      &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pci_dev-&gt;dev, adapter_index, id[adapter_index],</div><div class='add'>+			   THIS_MODULE, sizeof(struct snd_card_asihpi), &amp;card);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		/* if that fails, try the default index==next available */</div><div class='del'>-		err =</div><div class='del'>-		    snd_card_create(index[dev], id[dev],</div><div class='del'>-				    THIS_MODULE,</div><div class='del'>-				    sizeof(struct snd_card_asihpi),</div><div class='del'>-				    &amp;card);</div><div class='add'>+		err = snd_card_new(&amp;pci_dev-&gt;dev, index[dev], id[dev],</div><div class='add'>+				   THIS_MODULE, sizeof(struct snd_card_asihpi),</div><div class='add'>+				   &amp;card);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			"**** WARNING **** adapter index %d-&gt;ALSA index %d\n",</div><div class='del'>-			hpi_card-&gt;index, card-&gt;number);</div><div class='add'>+		dev_warn(&amp;pci_dev-&gt;dev, "Adapter index %d-&gt;ALSA index %d\n",</div><div class='add'>+			adapter_index, card-&gt;number);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	asihpi = (struct snd_card_asihpi *) card-&gt;private_data;</div><div class='add'>+	asihpi = card-&gt;private_data;</div><div class='ctx'> 	asihpi-&gt;card = card;</div><div class='del'>-	asihpi-&gt;pci = hpi_card-&gt;pci;</div><div class='del'>-	asihpi-&gt;adapter_index = hpi_card-&gt;index;</div><div class='del'>-	hpi_handle_error(hpi_adapter_get_info(ss,</div><div class='del'>-				 asihpi-&gt;adapter_index,</div><div class='del'>-				 &amp;asihpi-&gt;num_outstreams,</div><div class='del'>-				 &amp;asihpi-&gt;num_instreams,</div><div class='del'>-				 &amp;asihpi-&gt;version,</div><div class='del'>-				 &amp;asihpi-&gt;serial_number, &amp;asihpi-&gt;type));</div><div class='del'>-</div><div class='del'>-	version = asihpi-&gt;version;</div><div class='del'>-	snd_printk(KERN_INFO "adapter ID=%4X index=%d num_outstreams=%d "</div><div class='del'>-			"num_instreams=%d S/N=%d\n"</div><div class='del'>-			"hw version %c%d DSP code version %03d\n",</div><div class='del'>-			asihpi-&gt;type, asihpi-&gt;adapter_index,</div><div class='del'>-			asihpi-&gt;num_outstreams,</div><div class='del'>-			asihpi-&gt;num_instreams, asihpi-&gt;serial_number,</div><div class='del'>-			((version &gt;&gt; 3) &amp; 0xf) + 'A',</div><div class='del'>-			version &amp; 0x7,</div><div class='del'>-			((version &gt;&gt; 13) * 100) + ((version &gt;&gt; 7) &amp; 0x3f));</div><div class='del'>-</div><div class='del'>-	pcm_substreams = asihpi-&gt;num_outstreams;</div><div class='del'>-	if (pcm_substreams &lt; asihpi-&gt;num_instreams)</div><div class='del'>-		pcm_substreams = asihpi-&gt;num_instreams;</div><div class='del'>-</div><div class='del'>-	err = hpi_adapter_get_property(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	asihpi-&gt;pci = pci_dev;</div><div class='add'>+	asihpi-&gt;hpi = hpi;</div><div class='add'>+	hpi-&gt;snd_card = card;</div><div class='add'>+</div><div class='add'>+	err = hpi_adapter_get_property(adapter_index,</div><div class='ctx'> 		HPI_ADAPTER_PROPERTY_CAPS1,</div><div class='ctx'> 		NULL, &amp;asihpi-&gt;support_grouping);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		asihpi-&gt;support_grouping = 0;</div><div class='ctx'> </div><div class='del'>-	err = hpi_adapter_get_property(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	err = hpi_adapter_get_property(adapter_index,</div><div class='ctx'> 		HPI_ADAPTER_PROPERTY_CAPS2,</div><div class='ctx'> 		&amp;asihpi-&gt;support_mrx, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		asihpi-&gt;support_mrx = 0;</div><div class='ctx'> </div><div class='del'>-	err = hpi_adapter_get_property(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	err = hpi_adapter_get_property(adapter_index,</div><div class='ctx'> 		HPI_ADAPTER_PROPERTY_INTERVAL,</div><div class='ctx'> 		NULL, &amp;asihpi-&gt;update_interval_frames);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		asihpi-&gt;update_interval_frames = 512;</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_instream_open(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	if (hpi-&gt;interrupt_mode) {</div><div class='add'>+		asihpi-&gt;pcm_start = snd_card_asihpi_pcm_int_start;</div><div class='add'>+		asihpi-&gt;pcm_stop = snd_card_asihpi_pcm_int_stop;</div><div class='add'>+		hpi-&gt;interrupt_callback = snd_card_asihpi_isr;</div><div class='add'>+	} else {</div><div class='add'>+		asihpi-&gt;pcm_start = snd_card_asihpi_pcm_timer_start;</div><div class='add'>+		asihpi-&gt;pcm_stop = snd_card_asihpi_pcm_timer_stop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hpi_handle_error(hpi_instream_open(adapter_index,</div><div class='ctx'> 			     0, &amp;h_stream));</div><div class='ctx'> </div><div class='del'>-	err = hpi_instream_host_buffer_free(ss, h_stream);</div><div class='del'>-	asihpi-&gt;support_mmap = (!err);</div><div class='add'>+	err = hpi_instream_host_buffer_free(h_stream);</div><div class='add'>+	asihpi-&gt;can_dma = (!err);</div><div class='ctx'> </div><div class='del'>-	hpi_handle_error(hpi_instream_close(ss, h_stream));</div><div class='add'>+	hpi_handle_error(hpi_instream_close(h_stream));</div><div class='ctx'> </div><div class='del'>-	err = hpi_adapter_get_property(ss, asihpi-&gt;adapter_index,</div><div class='add'>+	if (!asihpi-&gt;can_dma)</div><div class='add'>+		asihpi-&gt;update_interval_frames *= 2;</div><div class='add'>+</div><div class='add'>+	err = hpi_adapter_get_property(adapter_index,</div><div class='ctx'> 		HPI_ADAPTER_PROPERTY_CURCHANNELS,</div><div class='ctx'> 		&amp;asihpi-&gt;in_max_chans, &amp;asihpi-&gt;out_max_chans);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -2905,69 +2848,83 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 		asihpi-&gt;out_max_chans = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "supports mmap:%d grouping:%d mrx:%d\n",</div><div class='del'>-			asihpi-&gt;support_mmap,</div><div class='add'>+	if (asihpi-&gt;out_max_chans &gt; 2) { /* assume LL mode */</div><div class='add'>+		asihpi-&gt;out_min_chans = asihpi-&gt;out_max_chans;</div><div class='add'>+		asihpi-&gt;in_min_chans = asihpi-&gt;in_max_chans;</div><div class='add'>+		asihpi-&gt;support_grouping = 0;</div><div class='add'>+	} else {</div><div class='add'>+		asihpi-&gt;out_min_chans = 1;</div><div class='add'>+		asihpi-&gt;in_min_chans = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pci_dev-&gt;dev, "Has dma:%d, grouping:%d, mrx:%d, uif:%d\n",</div><div class='add'>+			asihpi-&gt;can_dma,</div><div class='ctx'> 			asihpi-&gt;support_grouping,</div><div class='del'>-			asihpi-&gt;support_mrx</div><div class='add'>+			asihpi-&gt;support_mrx,</div><div class='add'>+			asihpi-&gt;update_interval_frames</div><div class='ctx'> 	      );</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	err = snd_card_asihpi_pcm_new(asihpi, 0, pcm_substreams);</div><div class='add'>+	err = snd_card_asihpi_pcm_new(asihpi, 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "pcm_new failed\n");</div><div class='add'>+		dev_err(&amp;pci_dev-&gt;dev, "pcm_new failed\n");</div><div class='ctx'> 		goto __nodev;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_card_asihpi_mixer_new(asihpi);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "mixer_new failed\n");</div><div class='add'>+		dev_err(&amp;pci_dev-&gt;dev, "mixer_new failed\n");</div><div class='ctx'> 		goto __nodev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hpi_mixer_get_control(ss, asihpi-&gt;h_mixer,</div><div class='add'>+	err = hpi_mixer_get_control(asihpi-&gt;h_mixer,</div><div class='ctx'> 				  HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,</div><div class='ctx'> 				  HPI_CONTROL_SAMPLECLOCK, &amp;h_control);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = hpi_sample_clock_set_local_rate(</div><div class='del'>-			ss, h_control, adapter_fs);</div><div class='add'>+			h_control, adapter_fs);</div><div class='ctx'> </div><div class='ctx'> 	snd_asihpi_proc_init(asihpi);</div><div class='ctx'> </div><div class='ctx'> 	/* always create, can be enabled or disabled dynamically</div><div class='ctx'> 	    by enable_hwdep  module param*/</div><div class='del'>-	snd_asihpi_hpi_new(asihpi, 0, NULL);</div><div class='add'>+	snd_asihpi_hpi_new(asihpi, 0);</div><div class='ctx'> </div><div class='del'>-	if (asihpi-&gt;support_mmap)</div><div class='del'>-		strcpy(card-&gt;driver, "ASIHPI-MMAP");</div><div class='del'>-	else</div><div class='del'>-		strcpy(card-&gt;driver, "ASIHPI");</div><div class='add'>+	strscpy(card-&gt;driver, "ASIHPI");</div><div class='ctx'> </div><div class='del'>-	sprintf(card-&gt;shortname, "AudioScience ASI%4X", asihpi-&gt;type);</div><div class='add'>+	sprintf(card-&gt;shortname, "AudioScience ASI%4X",</div><div class='add'>+			asihpi-&gt;hpi-&gt;adapter-&gt;type);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s %i",</div><div class='del'>-			card-&gt;shortname, asihpi-&gt;adapter_index);</div><div class='add'>+			card-&gt;shortname, adapter_index);</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='add'>+</div><div class='ctx'> 	if (!err) {</div><div class='del'>-		hpi_card-&gt;snd_card_asihpi = card;</div><div class='ctx'> 		dev++;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> __nodev:</div><div class='ctx'> 	snd_card_free(card);</div><div class='del'>-	snd_printk(KERN_ERR "snd_asihpi_probe error %d\n", err);</div><div class='add'>+	dev_err(&amp;pci_dev-&gt;dev, "snd_asihpi_probe error %d\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_asihpi_remove(struct pci_dev *pci_dev)</div><div class='add'>+static void snd_asihpi_remove(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_adapter *hpi_card = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct hpi_adapter *hpi = pci_get_drvdata(pci_dev);</div><div class='ctx'> </div><div class='del'>-	snd_card_free(hpi_card-&gt;snd_card_asihpi);</div><div class='del'>-	hpi_card-&gt;snd_card_asihpi = NULL;</div><div class='add'>+	/* Stop interrupts */</div><div class='add'>+	if (hpi-&gt;interrupt_mode) {</div><div class='add'>+		hpi-&gt;interrupt_callback = NULL;</div><div class='add'>+		hpi_handle_error(hpi_adapter_set_property(hpi-&gt;adapter-&gt;index,</div><div class='add'>+			HPI_ADAPTER_PROPERTY_IRQ_RATE, 0, 0));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_card_free(hpi-&gt;snd_card);</div><div class='add'>+	hpi-&gt;snd_card = NULL;</div><div class='ctx'> 	asihpi_adapter_remove(pci_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {</div><div class='add'>+static const struct pci_device_id asihpi_pci_tbl[] = {</div><div class='ctx'> 	{HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,</div><div class='ctx'> 		HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0,</div><div class='ctx'> 		(kernel_ulong_t)HPI_6205},</div><div class='hunk'>@@ -2979,14 +2936,10 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver driver = {</div><div class='del'>-	.name = "asihpi",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = asihpi_pci_tbl,</div><div class='ctx'> 	.probe = snd_asihpi_probe,</div><div class='del'>-	.remove = __devexit_p(snd_asihpi_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/*	.suspend = snd_asihpi_suspend,</div><div class='del'>-	.resume = snd_asihpi_resume, */</div><div class='del'>-#endif</div><div class='add'>+	.remove = snd_asihpi_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init snd_asihpi_init(void)</div><div class='head'>diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h<br/>index 23399d02f666..04a5cf6572cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> /** \file hpi.h</div><div class='hunk'>@@ -24,46 +13,20 @@</div><div class='ctx'> </div><div class='ctx'>  The HPI is a low-level hardware abstraction layer to all</div><div class='ctx'>  AudioScience digital audio adapters</div><div class='del'>-*/</div><div class='del'>-/*</div><div class='del'>- You must define one operating system that the HPI is to be compiled under</div><div class='del'>- HPI_OS_WIN32_USER   32bit Windows</div><div class='del'>- HPI_OS_DSP_C6000    DSP TI C6000  (automatically set)</div><div class='del'>- HPI_OS_WDM          Windows WDM kernel driver</div><div class='del'>- HPI_OS_LINUX        Linux userspace</div><div class='del'>- HPI_OS_LINUX_KERNEL Linux kernel (automatically set)</div><div class='ctx'> </div><div class='ctx'> (C) Copyright AudioScience Inc. 1998-2010</div><div class='del'>-******************************************************************************/</div><div class='del'>-#ifndef _HPI_H_</div><div class='del'>-#define _HPI_H_</div><div class='del'>-/* HPI Version</div><div class='del'>-If HPI_VER_MINOR is odd then its a development release not intended for the</div><div class='del'>-public. If HPI_VER_MINOR is even then is a release version</div><div class='del'>-i.e 3.05.02 is a development version</div><div class='ctx'> */</div><div class='del'>-#define HPI_VERSION_CONSTRUCTOR(maj, min, rel) \</div><div class='del'>-	((maj &lt;&lt; 16) + (min &lt;&lt; 8) + rel)</div><div class='ctx'> </div><div class='del'>-#define HPI_VER_MAJOR(v) ((int)(v &gt;&gt; 16))</div><div class='del'>-#define HPI_VER_MINOR(v) ((int)((v &gt;&gt; 8) &amp; 0xFF))</div><div class='del'>-#define HPI_VER_RELEASE(v) ((int)(v &amp; 0xFF))</div><div class='del'>-</div><div class='del'>-/* Use single digits for versions less that 10 to avoid octal. */</div><div class='del'>-#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 4, 1)</div><div class='del'>-#define HPI_VER_STRING "4.04.01"</div><div class='del'>-</div><div class='del'>-/* Library version as documented in hpi-api-versions.txt */</div><div class='del'>-#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(9, 0, 0)</div><div class='add'>+#ifndef _HPI_H_</div><div class='add'>+#define _HPI_H_</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='del'>-#define HPI_EXCLUDE_DEPRECATED</div><div class='add'>+#define HPI_BUILD_KERNEL_MODE</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************/</div><div class='del'>-/******************************************************************************/</div><div class='ctx'> /********       HPI API DEFINITIONS                                       *****/</div><div class='ctx'> /******************************************************************************/</div><div class='del'>-/******************************************************************************/</div><div class='add'>+</div><div class='ctx'> /*******************************************/</div><div class='ctx'> /**  Audio format types</div><div class='ctx'> \ingroup stream</div><div class='hunk'>@@ -174,7 +137,6 @@ The range is +1.0 to -1.0, which corresponds to digital fullscale.</div><div class='ctx'> 	HPI_FORMAT_UNDEFINED = 0xffff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/******************************************* in/out Stream states */</div><div class='ctx'> /*******************************************/</div><div class='ctx'> /** Stream States</div><div class='ctx'> \ingroup stream</div><div class='hunk'>@@ -194,7 +156,7 @@ enum HPI_STREAM_STATES {</div><div class='ctx'> 		cards to be ready. */</div><div class='ctx'> 	HPI_STATE_WAIT = 6</div><div class='ctx'> };</div><div class='del'>-/******************************************* mixer source node types */</div><div class='add'>+/*******************************************/</div><div class='ctx'> /** Source node types</div><div class='ctx'> \ingroup mixer</div><div class='ctx'> */</div><div class='hunk'>@@ -219,12 +181,18 @@ enum HPI_SOURCENODES {</div><div class='ctx'> 	HPI_SOURCENODE_COBRANET = 109,</div><div class='ctx'> 	HPI_SOURCENODE_ANALOG = 110,	     /**&lt; analog input node. */</div><div class='ctx'> 	HPI_SOURCENODE_ADAPTER = 111,	     /**&lt; adapter node. */</div><div class='add'>+	/** RTP stream input node - This node is a destination for</div><div class='add'>+	    packets of RTP audio samples from other devices. */</div><div class='add'>+	HPI_SOURCENODE_RTP_DESTINATION = 112,</div><div class='add'>+	HPI_SOURCENODE_INTERNAL = 113,	     /**&lt; node internal to the device. */</div><div class='add'>+	HPI_SOURCENODE_AVB = 114,	     /**&lt; AVB input stream */</div><div class='add'>+	HPI_SOURCENODE_BLULINK = 115,	     /**&lt; BLU-link input channel */</div><div class='ctx'> 	/* !!!Update this  AND hpidebug.h if you add a new sourcenode type!!! */</div><div class='del'>-	HPI_SOURCENODE_LAST_INDEX = 111	     /**&lt; largest ID */</div><div class='add'>+	HPI_SOURCENODE_LAST_INDEX = 115	     /**&lt; largest ID */</div><div class='ctx'> 		/* AX6 max sourcenode types = 15 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/******************************************* mixer dest node types */</div><div class='add'>+/*******************************************/</div><div class='ctx'> /** Destination node types</div><div class='ctx'> \ingroup mixer</div><div class='ctx'> */</div><div class='hunk'>@@ -236,7 +204,7 @@ enum HPI_DESTNODES {</div><div class='ctx'> 	HPI_DESTNODE_NONE = 200,</div><div class='ctx'> 	/** In Stream (Record) node. */</div><div class='ctx'> 	HPI_DESTNODE_ISTREAM = 201,</div><div class='del'>-	HPI_DESTNODE_LINEOUT = 202,	    /**&lt; line out node. */</div><div class='add'>+	HPI_DESTNODE_LINEOUT = 202,	     /**&lt; line out node. */</div><div class='ctx'> 	HPI_DESTNODE_AESEBU_OUT = 203,	     /**&lt; AES/EBU output node. */</div><div class='ctx'> 	HPI_DESTNODE_RF = 204,		     /**&lt; RF output node. */</div><div class='ctx'> 	HPI_DESTNODE_SPEAKER = 205,	     /**&lt; speaker output node. */</div><div class='hunk'>@@ -244,9 +212,14 @@ enum HPI_DESTNODES {</div><div class='ctx'> 	    Audio samples from the device are sent out on the Cobranet network.*/</div><div class='ctx'> 	HPI_DESTNODE_COBRANET = 206,</div><div class='ctx'> 	HPI_DESTNODE_ANALOG = 207,	     /**&lt; analog output node. */</div><div class='del'>-</div><div class='add'>+	/** RTP stream output node - This node is a source for</div><div class='add'>+	    packets of RTP audio samples that are sent to other devices. */</div><div class='add'>+	HPI_DESTNODE_RTP_SOURCE = 208,</div><div class='add'>+	HPI_DESTNODE_AVB = 209,		     /**&lt; AVB output stream */</div><div class='add'>+	HPI_DESTNODE_INTERNAL = 210,	     /**&lt; node internal to the device. */</div><div class='add'>+	HPI_DESTNODE_BLULINK = 211,	     /**&lt; BLU-link output channel. */</div><div class='ctx'> 	/* !!!Update this AND hpidebug.h if you add a new destnode type!!! */</div><div class='del'>-	HPI_DESTNODE_LAST_INDEX = 207	     /**&lt; largest ID */</div><div class='add'>+	HPI_DESTNODE_LAST_INDEX = 211	     /**&lt; largest ID */</div><div class='ctx'> 		/* AX6 max destnode types = 15 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -262,11 +235,11 @@ enum HPI_CONTROLS {</div><div class='ctx'> 	HPI_CONTROL_MUTE = 4,	/*mute control - not used at present. */</div><div class='ctx'> 	HPI_CONTROL_MULTIPLEXER = 5,	/**&lt; multiplexer control. */</div><div class='ctx'> </div><div class='del'>-	HPI_CONTROL_AESEBU_TRANSMITTER = 6,	/**&lt; AES/EBU transmitter control. */</div><div class='del'>-	HPI_CONTROL_AESEBUTX = HPI_CONTROL_AESEBU_TRANSMITTER,</div><div class='add'>+	HPI_CONTROL_AESEBU_TRANSMITTER = 6, /**&lt; AES/EBU transmitter control */</div><div class='add'>+	HPI_CONTROL_AESEBUTX = 6,	/* HPI_CONTROL_AESEBU_TRANSMITTER */</div><div class='ctx'> </div><div class='ctx'> 	HPI_CONTROL_AESEBU_RECEIVER = 7, /**&lt; AES/EBU receiver control. */</div><div class='del'>-	HPI_CONTROL_AESEBURX = HPI_CONTROL_AESEBU_RECEIVER,</div><div class='add'>+	HPI_CONTROL_AESEBURX = 7,	/* HPI_CONTROL_AESEBU_RECEIVER */</div><div class='ctx'> </div><div class='ctx'> 	HPI_CONTROL_LEVEL = 8, /**&lt; level/trim control - works in d_bu. */</div><div class='ctx'> 	HPI_CONTROL_TUNER = 9,	/**&lt; tuner control. */</div><div class='hunk'>@@ -281,7 +254,7 @@ enum HPI_CONTROLS {</div><div class='ctx'> 	HPI_CONTROL_SAMPLECLOCK = 17,	/**&lt; sample clock control. */</div><div class='ctx'> 	HPI_CONTROL_MICROPHONE = 18,	/**&lt; microphone control. */</div><div class='ctx'> 	HPI_CONTROL_PARAMETRIC_EQ = 19,	/**&lt; parametric EQ control. */</div><div class='del'>-	HPI_CONTROL_EQUALIZER = HPI_CONTROL_PARAMETRIC_EQ,</div><div class='add'>+	HPI_CONTROL_EQUALIZER = 19,	/*HPI_CONTROL_PARAMETRIC_EQ */</div><div class='ctx'> </div><div class='ctx'> 	HPI_CONTROL_COMPANDER = 20,	/**&lt; compander control. */</div><div class='ctx'> 	HPI_CONTROL_COBRANET = 21,	/**&lt; cobranet control. */</div><div class='hunk'>@@ -296,10 +269,7 @@ enum HPI_CONTROLS {</div><div class='ctx'> /* WARNING types 256 or greater impact bit packing in all AX6 DSP code */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Shorthand names that match attribute names */</div><div class='del'>-</div><div class='del'>-/******************************************* ADAPTER ATTRIBUTES ****/</div><div class='del'>-</div><div class='add'>+/*******************************************/</div><div class='ctx'> /** Adapter properties</div><div class='ctx'> These are used in HPI_AdapterSetProperty() and HPI_AdapterGetProperty()</div><div class='ctx'> \ingroup adapter</div><div class='hunk'>@@ -330,12 +300,21 @@ by the driver and is not passed on to the DSP at all.</div><div class='ctx'> Indicates the state of the adapter's SSX2 setting. This setting is stored in</div><div class='ctx'> non-volatile memory on the adapter. A typical call sequence would be to use</div><div class='ctx'> HPI_ADAPTER_PROPERTY_SSX2_SETTING to set SSX2 on the adapter and then to reload</div><div class='del'>-the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during startup</div><div class='del'>-and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2 to enable</div><div class='del'>-SSX2 stream mapping within the kernel level of the driver.</div><div class='add'>+the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during</div><div class='add'>+startup and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2</div><div class='add'>+to enable SSX2 stream mapping within the kernel level of the driver.</div><div class='ctx'> */</div><div class='ctx'> 	HPI_ADAPTER_PROPERTY_SSX2_SETTING = 4,</div><div class='ctx'> </div><div class='add'>+/** Enables/disables PCI(e) IRQ.</div><div class='add'>+A setting of 0 indicates that no interrupts are being generated. A DSP boot</div><div class='add'>+this property is set to 0. Setting to a non-zero value specifies the number</div><div class='add'>+of frames of audio that should be processed between interrupts. This property</div><div class='add'>+should be set to multiple of the mixer interval as read back from the</div><div class='add'>+HPI_ADAPTER_PROPERTY_INTERVAL property.</div><div class='add'>+*/</div><div class='add'>+	HPI_ADAPTER_PROPERTY_IRQ_RATE = 5,</div><div class='add'>+</div><div class='ctx'> /** Base number for readonly properties */</div><div class='ctx'> 	HPI_ADAPTER_PROPERTY_READONLYBASE = 256,</div><div class='ctx'> </div><div class='hunk'>@@ -440,21 +419,42 @@ return value is true (1) or false (0). If the current adapter</div><div class='ctx'> mode is MONO SSX2 is disabled, even though this property will</div><div class='ctx'> return true.</div><div class='ctx'> */</div><div class='del'>-	HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271</div><div class='add'>+	HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271,</div><div class='add'>+/** Readonly supports PCI(e) IRQ.</div><div class='add'>+Indicates that the adapter in it's current mode supports interrupts</div><div class='add'>+across the host bus. Note, this does not imply that interrupts are</div><div class='add'>+enabled. Instead it indicates that they can be enabled.</div><div class='add'>+*/</div><div class='add'>+	HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ = 272,</div><div class='add'>+/** Readonly supports firmware updating.</div><div class='add'>+Indicates that the adapter implements an interface to update firmware</div><div class='add'>+on the adapter.</div><div class='add'>+*/</div><div class='add'>+	HPI_ADAPTER_PROPERTY_SUPPORTS_FW_UPDATE = 273,</div><div class='add'>+/** Readonly Firmware IDs</div><div class='add'>+Identifiy firmware independent of individual adapter type.</div><div class='add'>+May be used as a filter for firmware update images.</div><div class='add'>+Property 1 = Bootloader ID</div><div class='add'>+Property 2 = Main program ID</div><div class='add'>+*/</div><div class='add'>+	HPI_ADAPTER_PROPERTY_FIRMWARE_ID = 274</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Adapter mode commands</div><div class='ctx'> </div><div class='del'>-Used in wQueryOrSet field of HPI_AdapterSetModeEx().</div><div class='add'>+Used in wQueryOrSet parameter of HPI_AdapterSetModeEx().</div><div class='ctx'> \ingroup adapter</div><div class='ctx'> */</div><div class='ctx'> enum HPI_ADAPTER_MODE_CMDS {</div><div class='add'>+	/** Set the mode to the given parameter */</div><div class='ctx'> 	HPI_ADAPTER_MODE_SET = 0,</div><div class='add'>+	/** Return 0 or error depending whether mode is valid,</div><div class='add'>+	but don't set the mode */</div><div class='ctx'> 	HPI_ADAPTER_MODE_QUERY = 1</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Adapter Modes</div><div class='del'>-	These are used by HPI_AdapterSetModeEx()</div><div class='add'>+ These are used by HPI_AdapterSetModeEx()</div><div class='ctx'> </div><div class='ctx'> \warning - more than 16 possible modes breaks</div><div class='ctx'> a bitmask in the Windows WAVE DLL</div><div class='hunk'>@@ -625,14 +625,17 @@ enum HPI_MIXER_STORE_COMMAND {</div><div class='ctx'> 	HPI_MIXER_STORE_ENABLE = 4,</div><div class='ctx'> /** Disable auto storage of some control settings. */</div><div class='ctx'> 	HPI_MIXER_STORE_DISABLE = 5,</div><div class='del'>-/** Save the attributes of a single control. */</div><div class='add'>+/** Unimplemented - save the attributes of a single control. */</div><div class='ctx'> 	HPI_MIXER_STORE_SAVE_SINGLE = 6</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/************************************* CONTROL ATTRIBUTE VALUES ****/</div><div class='add'>+/****************************/</div><div class='add'>+/* CONTROL ATTRIBUTE VALUES */</div><div class='add'>+/****************************/</div><div class='add'>+</div><div class='ctx'> /** Used by mixer plugin enable functions</div><div class='ctx'> </div><div class='del'>-E.g. HPI_ParametricEQ_SetState()</div><div class='add'>+E.g. HPI_ParametricEq_SetState()</div><div class='ctx'> \ingroup mixer</div><div class='ctx'> */</div><div class='ctx'> enum HPI_SWITCH_STATES {</div><div class='hunk'>@@ -641,6 +644,7 @@ enum HPI_SWITCH_STATES {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Volume control special gain values */</div><div class='add'>+</div><div class='ctx'> /** volumes units are 100ths of a dB</div><div class='ctx'> \ingroup volume</div><div class='ctx'> */</div><div class='hunk'>@@ -650,6 +654,11 @@ enum HPI_SWITCH_STATES {</div><div class='ctx'> */</div><div class='ctx'> #define HPI_GAIN_OFF                    (-100 * HPI_UNITS_PER_dB)</div><div class='ctx'> </div><div class='add'>+/** channel mask specifying all channels</div><div class='add'>+\ingroup volume</div><div class='add'>+*/</div><div class='add'>+#define HPI_BITMASK_ALL_CHANNELS        (0xFFFFFFFF)</div><div class='add'>+</div><div class='ctx'> /** value returned for no signal</div><div class='ctx'> \ingroup meter</div><div class='ctx'> */</div><div class='hunk'>@@ -667,7 +676,7 @@ enum HPI_VOLUME_AUTOFADES {</div><div class='ctx'> </div><div class='ctx'> /** The physical encoding format of the AESEBU I/O.</div><div class='ctx'> </div><div class='del'>-Used in HPI_AESEBU_Transmitter_SetFormat(), HPI_AESEBU_Receiver_SetFormat()</div><div class='add'>+Used in HPI_Aesebu_Transmitter_SetFormat(), HPI_Aesebu_Receiver_SetFormat()</div><div class='ctx'> along with related Get and Query functions</div><div class='ctx'> \ingroup aestx</div><div class='ctx'> */</div><div class='hunk'>@@ -680,7 +689,7 @@ enum HPI_AESEBU_FORMATS {</div><div class='ctx'> </div><div class='ctx'> /** AES/EBU error status bits</div><div class='ctx'> </div><div class='del'>-Returned by HPI_AESEBU_Receiver_GetErrorStatus()</div><div class='add'>+Returned by HPI_Aesebu_Receiver_GetErrorStatus()</div><div class='ctx'> \ingroup aesrx</div><div class='ctx'> */</div><div class='ctx'> enum HPI_AESEBU_ERRORS {</div><div class='hunk'>@@ -709,7 +718,7 @@ enum HPI_AESEBU_ERRORS {</div><div class='ctx'> #define HPI_PAD_TITLE_LEN               64</div><div class='ctx'> /** The text string containing the comment. */</div><div class='ctx'> #define HPI_PAD_COMMENT_LEN             256</div><div class='del'>-/** The PTY when the tuner has not recieved any PTY. */</div><div class='add'>+/** The PTY when the tuner has not received any PTY. */</div><div class='ctx'> #define HPI_PAD_PROGRAM_TYPE_INVALID    0xffff</div><div class='ctx'> /** \} */</div><div class='ctx'> </div><div class='hunk'>@@ -737,7 +746,8 @@ enum HPI_TUNER_BAND {</div><div class='ctx'> 	HPI_TUNER_BAND_TV_PAL_I = 7,	 /**&lt; PAL-I TV band*/</div><div class='ctx'> 	HPI_TUNER_BAND_TV_PAL_DK = 8,	 /**&lt; PAL-D/K TV band*/</div><div class='ctx'> 	HPI_TUNER_BAND_TV_SECAM_L = 9,	 /**&lt; SECAM-L TV band*/</div><div class='del'>-	HPI_TUNER_BAND_LAST = 9	/**&lt; the index of the last tuner band. */</div><div class='add'>+	HPI_TUNER_BAND_DAB = 10,</div><div class='add'>+	HPI_TUNER_BAND_LAST = 10 /**&lt; the index of the last tuner band. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Tuner mode attributes</div><div class='hunk'>@@ -767,14 +777,6 @@ enum HPI_TUNER_MODE_VALUES {</div><div class='ctx'> 	HPI_TUNER_MODE_RDS_RBDS = 2 /**&lt;  RDS - RBDS mode */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** Tuner Level settings</div><div class='del'>-\ingroup tuner</div><div class='del'>-*/</div><div class='del'>-enum HPI_TUNER_LEVEL {</div><div class='del'>-	HPI_TUNER_LEVEL_AVERAGE = 0,</div><div class='del'>-	HPI_TUNER_LEVEL_RAW = 1</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /** Tuner Status Bits</div><div class='ctx'> </div><div class='ctx'> These bitfield values are returned by a call to HPI_Tuner_GetStatus().</div><div class='hunk'>@@ -783,13 +785,13 @@ Multiple fields are returned from a single call.</div><div class='ctx'> */</div><div class='ctx'> enum HPI_TUNER_STATUS_BITS {</div><div class='ctx'> 	HPI_TUNER_VIDEO_COLOR_PRESENT = 0x0001,	/**&lt; video color is present. */</div><div class='del'>-	HPI_TUNER_VIDEO_IS_60HZ = 0x0020,	/**&lt; 60 hz video detected. */</div><div class='del'>-	HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040,	/**&lt; video HSYNC is missing. */</div><div class='del'>-	HPI_TUNER_VIDEO_STATUS_VALID = 0x0100,	/**&lt; video status is valid. */</div><div class='del'>-	HPI_TUNER_PLL_LOCKED = 0x1000,		/**&lt; the tuner's PLL is locked. */</div><div class='del'>-	HPI_TUNER_FM_STEREO = 0x2000,		/**&lt; tuner reports back FM stereo. */</div><div class='del'>-	HPI_TUNER_DIGITAL = 0x0200,		/**&lt; tuner reports digital programming. */</div><div class='del'>-	HPI_TUNER_MULTIPROGRAM = 0x0400		/**&lt; tuner reports multiple programs. */</div><div class='add'>+	HPI_TUNER_VIDEO_IS_60HZ = 0x0020, /**&lt; 60 hz video detected. */</div><div class='add'>+	HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040, /**&lt; video HSYNC is missing. */</div><div class='add'>+	HPI_TUNER_VIDEO_STATUS_VALID = 0x0100, /**&lt; video status is valid. */</div><div class='add'>+	HPI_TUNER_DIGITAL = 0x0200, /**&lt; tuner reports digital programming. */</div><div class='add'>+	HPI_TUNER_MULTIPROGRAM = 0x0400, /**&lt; tuner reports multiple programs. */</div><div class='add'>+	HPI_TUNER_PLL_LOCKED = 0x1000, /**&lt; the tuner's PLL is locked. */</div><div class='add'>+	HPI_TUNER_FM_STEREO = 0x2000 /**&lt; tuner reports back FM stereo. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Channel Modes</div><div class='hunk'>@@ -835,11 +837,13 @@ enum HPI_SAMPLECLOCK_SOURCES {</div><div class='ctx'> 	HPI_SAMPLECLOCK_SOURCE_NETWORK = 8,</div><div class='ctx'> /** From previous adjacent module (ASI2416 only)*/</div><div class='ctx'> 	HPI_SAMPLECLOCK_SOURCE_PREV_MODULE = 10,</div><div class='add'>+/** Blu link sample clock*/</div><div class='add'>+	HPI_SAMPLECLOCK_SOURCE_BLULINK = 11,</div><div class='ctx'> /*! Update this if you add a new clock source.*/</div><div class='del'>-	HPI_SAMPLECLOCK_SOURCE_LAST = 10</div><div class='add'>+	HPI_SAMPLECLOCK_SOURCE_LAST = 11</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** Equalizer filter types. Used by HPI_ParametricEQ_SetBand()</div><div class='add'>+/** Equalizer filter types. Used by HPI_ParametricEq_SetBand()</div><div class='ctx'> \ingroup parmeq</div><div class='ctx'> */</div><div class='ctx'> enum HPI_FILTER_TYPE {</div><div class='hunk'>@@ -882,7 +886,7 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_INVALID_OBJ = 101,</div><div class='ctx'> 	/** Function does not exist. */</div><div class='ctx'> 	HPI_ERROR_INVALID_FUNC = 102,</div><div class='del'>-	/** The specified object (adapter/Stream) does not exist. */</div><div class='add'>+	/** The specified object does not exist. */</div><div class='ctx'> 	HPI_ERROR_INVALID_OBJ_INDEX = 103,</div><div class='ctx'> 	/** Trying to access an object that has not been opened yet. */</div><div class='ctx'> 	HPI_ERROR_OBJ_NOT_OPEN = 104,</div><div class='hunk'>@@ -890,8 +894,7 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_OBJ_ALREADY_OPEN = 105,</div><div class='ctx'> 	/** PCI, ISA resource not valid. */</div><div class='ctx'> 	HPI_ERROR_INVALID_RESOURCE = 106,</div><div class='del'>-	/** GetInfo call from SubSysFindAdapters failed. */</div><div class='del'>-	HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO = 107,</div><div class='add'>+	/* HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO= 107 */</div><div class='ctx'> 	/** Default response was never updated with actual error code. */</div><div class='ctx'> 	HPI_ERROR_INVALID_RESPONSE = 108,</div><div class='ctx'> 	/** wSize field of response was not updated,</div><div class='hunk'>@@ -899,38 +902,44 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_PROCESSING_MESSAGE = 109,</div><div class='ctx'> 	/** The network did not respond in a timely manner. */</div><div class='ctx'> 	HPI_ERROR_NETWORK_TIMEOUT = 110,</div><div class='del'>-	/** An HPI handle is invalid (uninitialised?). */</div><div class='add'>+	/* An HPI handle is invalid (uninitialised?). */</div><div class='ctx'> 	HPI_ERROR_INVALID_HANDLE = 111,</div><div class='ctx'> 	/** A function or attribute has not been implemented yet. */</div><div class='ctx'> 	HPI_ERROR_UNIMPLEMENTED = 112,</div><div class='del'>-	/** There are too many clients attempting to access a network resource. */</div><div class='add'>+	/** There are too many clients attempting</div><div class='add'>+	    to access a network resource. */</div><div class='ctx'> 	HPI_ERROR_NETWORK_TOO_MANY_CLIENTS = 113,</div><div class='del'>-	/** Response buffer passed to HPI_Message was smaller than returned response */</div><div class='add'>+	/** Response buffer passed to HPI_Message</div><div class='add'>+	    was smaller than returned response.</div><div class='add'>+	    wSpecificError field of hpi response contains the required size.</div><div class='add'>+	*/</div><div class='ctx'> 	HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL = 114,</div><div class='ctx'> 	/** The returned response did not match the sent message */</div><div class='ctx'> 	HPI_ERROR_RESPONSE_MISMATCH = 115,</div><div class='add'>+	/** A control setting that should have been cached was not. */</div><div class='add'>+	HPI_ERROR_CONTROL_CACHING = 116,</div><div class='add'>+	/** A message buffer in the path to the adapter was smaller</div><div class='add'>+	    than the message size.</div><div class='add'>+	    wSpecificError field of hpi response contains the actual size.</div><div class='add'>+	*/</div><div class='add'>+	HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL = 117,</div><div class='ctx'> </div><div class='del'>-	/** Too many adapters.*/</div><div class='del'>-	HPI_ERROR_TOO_MANY_ADAPTERS = 200,</div><div class='add'>+	/* HPI_ERROR_TOO_MANY_ADAPTERS= 200 */</div><div class='ctx'> 	/** Bad adpater. */</div><div class='ctx'> 	HPI_ERROR_BAD_ADAPTER = 201,</div><div class='ctx'> 	/** Adapter number out of range or not set properly. */</div><div class='ctx'> 	HPI_ERROR_BAD_ADAPTER_NUMBER = 202,</div><div class='ctx'> 	/** 2 adapters with the same adapter number. */</div><div class='del'>-	HPI_DUPLICATE_ADAPTER_NUMBER = 203,</div><div class='del'>-	/** DSP code failed to bootload. */</div><div class='add'>+	HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,</div><div class='add'>+	/** DSP code failed to bootload. Usually a DSP memory test failure. */</div><div class='ctx'> 	HPI_ERROR_DSP_BOOTLOAD = 204,</div><div class='del'>-	/** Adapter failed DSP code self test. */</div><div class='del'>-	HPI_ERROR_DSP_SELFTEST = 205,</div><div class='ctx'> 	/** Couldn't find or open the DSP code file. */</div><div class='ctx'> 	HPI_ERROR_DSP_FILE_NOT_FOUND = 206,</div><div class='ctx'> 	/** Internal DSP hardware error. */</div><div class='ctx'> 	HPI_ERROR_DSP_HARDWARE = 207,</div><div class='del'>-	/** Could not allocate memory in DOS. */</div><div class='del'>-	HPI_ERROR_DOS_MEMORY_ALLOC = 208,</div><div class='ctx'> 	/** Could not allocate memory */</div><div class='ctx'> 	HPI_ERROR_MEMORY_ALLOC = 208,</div><div class='del'>-	/** Failed to correctly load/config PLD .*/</div><div class='add'>+	/** Failed to correctly load/config PLD. (unused) */</div><div class='ctx'> 	HPI_ERROR_PLD_LOAD = 209,</div><div class='ctx'> 	/** Unexpected end of file, block length too big etc. */</div><div class='ctx'> 	HPI_ERROR_DSP_FILE_FORMAT = 210,</div><div class='hunk'>@@ -939,8 +948,7 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_DSP_FILE_ACCESS_DENIED = 211,</div><div class='ctx'> 	/** First DSP code section header not found in DSP file. */</div><div class='ctx'> 	HPI_ERROR_DSP_FILE_NO_HEADER = 212,</div><div class='del'>-	/** File read operation on DSP code file failed. */</div><div class='del'>-	HPI_ERROR_DSP_FILE_READ_ERROR = 213,</div><div class='add'>+	/* HPI_ERROR_DSP_FILE_READ_ERROR= 213, */</div><div class='ctx'> 	/** DSP code for adapter family not found. */</div><div class='ctx'> 	HPI_ERROR_DSP_SECTION_NOT_FOUND = 214,</div><div class='ctx'> 	/** Other OS specific error opening DSP file. */</div><div class='hunk'>@@ -950,23 +958,24 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	/** DSP code section header had size == 0. */</div><div class='ctx'> 	HPI_ERROR_DSP_FILE_NULL_HEADER = 217,</div><div class='ctx'> </div><div class='del'>-	/** Base number for flash errors. */</div><div class='del'>-	HPI_ERROR_FLASH = 220,</div><div class='add'>+	/* HPI_ERROR_FLASH = 220, */</div><div class='ctx'> </div><div class='ctx'> 	/** Flash has bad checksum */</div><div class='del'>-	HPI_ERROR_BAD_CHECKSUM = (HPI_ERROR_FLASH + 1),</div><div class='del'>-	HPI_ERROR_BAD_SEQUENCE = (HPI_ERROR_FLASH + 2),</div><div class='del'>-	HPI_ERROR_FLASH_ERASE = (HPI_ERROR_FLASH + 3),</div><div class='del'>-	HPI_ERROR_FLASH_PROGRAM = (HPI_ERROR_FLASH + 4),</div><div class='del'>-	HPI_ERROR_FLASH_VERIFY = (HPI_ERROR_FLASH + 5),</div><div class='del'>-	HPI_ERROR_FLASH_TYPE = (HPI_ERROR_FLASH + 6),</div><div class='del'>-	HPI_ERROR_FLASH_START = (HPI_ERROR_FLASH + 7),</div><div class='add'>+	HPI_ERROR_BAD_CHECKSUM = 221,</div><div class='add'>+	HPI_ERROR_BAD_SEQUENCE = 222,</div><div class='add'>+	HPI_ERROR_FLASH_ERASE = 223,</div><div class='add'>+	HPI_ERROR_FLASH_PROGRAM = 224,</div><div class='add'>+	HPI_ERROR_FLASH_VERIFY = 225,</div><div class='add'>+	HPI_ERROR_FLASH_TYPE = 226,</div><div class='add'>+	HPI_ERROR_FLASH_START = 227,</div><div class='add'>+	HPI_ERROR_FLASH_READ = 228,</div><div class='add'>+	HPI_ERROR_FLASH_READ_NO_FILE = 229,</div><div class='add'>+	HPI_ERROR_FLASH_SIZE = 230,</div><div class='ctx'> </div><div class='ctx'> 	/** Reserved for OEMs. */</div><div class='ctx'> 	HPI_ERROR_RESERVED_1 = 290,</div><div class='ctx'> </div><div class='del'>-	/** Stream does not exist. */</div><div class='del'>-	HPI_ERROR_INVALID_STREAM = 300,</div><div class='add'>+	/* HPI_ERROR_INVALID_STREAM = 300 use HPI_ERROR_INVALID_OBJ_INDEX */</div><div class='ctx'> 	/** Invalid compression format. */</div><div class='ctx'> 	HPI_ERROR_INVALID_FORMAT = 301,</div><div class='ctx'> 	/** Invalid format samplerate */</div><div class='hunk'>@@ -977,21 +986,19 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_INVALID_BITRATE = 304,</div><div class='ctx'> 	/** Invalid datasize used for stream read/write. */</div><div class='ctx'> 	HPI_ERROR_INVALID_DATASIZE = 305,</div><div class='del'>-	/** Stream buffer is full during stream write. */</div><div class='del'>-	HPI_ERROR_BUFFER_FULL = 306,</div><div class='del'>-	/** Stream buffer is empty during stream read. */</div><div class='del'>-	HPI_ERROR_BUFFER_EMPTY = 307,</div><div class='del'>-	/** Invalid datasize used for stream read/write. */</div><div class='del'>-	HPI_ERROR_INVALID_DATA_TRANSFER = 308,</div><div class='add'>+	/* HPI_ERROR_BUFFER_FULL = 306 use HPI_ERROR_INVALID_DATASIZE */</div><div class='add'>+	/* HPI_ERROR_BUFFER_EMPTY = 307 use HPI_ERROR_INVALID_DATASIZE */</div><div class='add'>+	/** Null data pointer used for stream read/write. */</div><div class='add'>+	HPI_ERROR_INVALID_DATA_POINTER = 308,</div><div class='ctx'> 	/** Packet ordering error for stream read/write. */</div><div class='ctx'> 	HPI_ERROR_INVALID_PACKET_ORDER = 309,</div><div class='ctx'> </div><div class='ctx'> 	/** Object can't do requested operation in its current</div><div class='del'>-	state, eg set format, change rec mux state while recording.*/</div><div class='add'>+	    state, eg set format, change rec mux state while recording.*/</div><div class='ctx'> 	HPI_ERROR_INVALID_OPERATION = 310,</div><div class='ctx'> </div><div class='del'>-	/** Where an SRG is shared amongst streams, an incompatible samplerate is one</div><div class='del'>-	that is different to any currently playing or recording stream. */</div><div class='add'>+	/** Where a SRG is shared amongst streams, an incompatible samplerate</div><div class='add'>+	    is one that is different to any currently active stream. */</div><div class='ctx'> 	HPI_ERROR_INCOMPATIBLE_SAMPLERATE = 311,</div><div class='ctx'> 	/** Adapter mode is illegal.*/</div><div class='ctx'> 	HPI_ERROR_BAD_ADAPTER_MODE = 312,</div><div class='hunk'>@@ -1004,6 +1011,10 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_NO_INTERADAPTER_GROUPS = 314,</div><div class='ctx'> 	/** Streams on different DSPs cannot be grouped. */</div><div class='ctx'> 	HPI_ERROR_NO_INTERDSP_GROUPS = 315,</div><div class='add'>+	/** Stream wait cancelled before threshold reached. */</div><div class='add'>+	HPI_ERROR_WAIT_CANCELLED = 316,</div><div class='add'>+	/** A character string is invalid. */</div><div class='add'>+	HPI_ERROR_INVALID_STRING = 317,</div><div class='ctx'> </div><div class='ctx'> 	/** Invalid mixer node for this adapter. */</div><div class='ctx'> 	HPI_ERROR_INVALID_NODE = 400,</div><div class='hunk'>@@ -1017,6 +1028,7 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_CONTROL_DISABLED = 404,</div><div class='ctx'> 	/** I2C transaction failed due to a missing ACK. */</div><div class='ctx'> 	HPI_ERROR_CONTROL_I2C_MISSING_ACK = 405,</div><div class='add'>+	HPI_ERROR_I2C_MISSING_ACK = 405,</div><div class='ctx'> 	/** Control is busy, or coming out of</div><div class='ctx'> 	reset and cannot be accessed at this time. */</div><div class='ctx'> 	HPI_ERROR_CONTROL_NOT_READY = 407,</div><div class='hunk'>@@ -1027,14 +1039,18 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	HPI_ERROR_NVMEM_FAIL = 452,</div><div class='ctx'> </div><div class='ctx'> 	/** I2C */</div><div class='del'>-	HPI_ERROR_I2C_MISSING_ACK = HPI_ERROR_CONTROL_I2C_MISSING_ACK,</div><div class='ctx'> 	HPI_ERROR_I2C_BAD_ADR = 460,</div><div class='ctx'> </div><div class='del'>-	/** Entity errors */</div><div class='add'>+	/** Entity type did not match requested type */</div><div class='ctx'> 	HPI_ERROR_ENTITY_TYPE_MISMATCH = 470,</div><div class='add'>+	/** Entity item count did not match requested count */</div><div class='ctx'> 	HPI_ERROR_ENTITY_ITEM_COUNT = 471,</div><div class='add'>+	/** Entity type is not one of the valid types */</div><div class='ctx'> 	HPI_ERROR_ENTITY_TYPE_INVALID = 472,</div><div class='add'>+	/** Entity role is not one of the valid roles */</div><div class='ctx'> 	HPI_ERROR_ENTITY_ROLE_INVALID = 473,</div><div class='add'>+	/** Entity size doesn't match target size */</div><div class='add'>+	HPI_ERROR_ENTITY_SIZE_MISMATCH = 474,</div><div class='ctx'> </div><div class='ctx'> 	/* AES18 specific errors were 500..507 */</div><div class='ctx'> </div><div class='hunk'>@@ -1044,18 +1060,24 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> 	/** hpioct32.c can't obtain mutex */</div><div class='ctx'> 	HPI_ERROR_MUTEX_TIMEOUT = 700,</div><div class='ctx'> </div><div class='del'>-	/** errors from HPI backends have values &gt;= this */</div><div class='add'>+	/** Backend errors used to be greater than this.</div><div class='add'>+	    \deprecated Now, all backends return only errors defined here in hpi.h</div><div class='add'>+	*/</div><div class='ctx'> 	HPI_ERROR_BACKEND_BASE = 900,</div><div class='ctx'> </div><div class='del'>-	/** indicates a cached u16 value is invalid. */</div><div class='del'>-	HPI_ERROR_ILLEGAL_CACHE_VALUE = 0xffff</div><div class='add'>+	/** Communication with DSP failed */</div><div class='add'>+	HPI_ERROR_DSP_COMMUNICATION = 900</div><div class='add'>+		/* Note that the dsp communication error is set to this value so that</div><div class='add'>+		   it remains compatible with any software that expects such errors</div><div class='add'>+		   to be backend errors i.e. &gt;= 900.</div><div class='add'>+		   Do not define any new error codes with values &gt; 900.</div><div class='add'>+		 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** \defgroup maximums HPI maximum values</div><div class='ctx'> \{</div><div class='ctx'> */</div><div class='del'>-/** Maximum number of adapters per HPI sub-system</div><div class='del'>-   WARNING: modifying this value changes the response structure size.*/</div><div class='add'>+/** Maximum number of PCI HPI adapters */</div><div class='ctx'> #define HPI_MAX_ADAPTERS                20</div><div class='ctx'> /** Maximum number of in or out streams per adapter */</div><div class='ctx'> #define HPI_MAX_STREAMS                 16</div><div class='hunk'>@@ -1066,6 +1088,9 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> #define HPI_MAX_ANC_BYTES_PER_FRAME     (64)</div><div class='ctx'> #define HPI_STRING_LEN                  16</div><div class='ctx'> </div><div class='add'>+/** Networked adapters have index &gt;= 100 */</div><div class='add'>+#define HPI_MIN_NETWORK_ADAPTER_IDX 100</div><div class='add'>+</div><div class='ctx'> /** Velocity units */</div><div class='ctx'> #define HPI_OSTREAM_VELOCITY_UNITS      4096</div><div class='ctx'> /** OutStream timescale units */</div><div class='hunk'>@@ -1075,7 +1100,7 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> </div><div class='ctx'> /**\}*/</div><div class='ctx'> </div><div class='del'>-/* ////////////////////////////////////////////////////////////////////// */</div><div class='add'>+/**************/</div><div class='ctx'> /* STRUCTURES */</div><div class='ctx'> #ifndef DISABLE_PRAGMA_PACK1</div><div class='ctx'> #pragma pack(push, 1)</div><div class='hunk'>@@ -1087,14 +1112,14 @@ enum HPI_ERROR_CODES {</div><div class='ctx'> struct hpi_format {</div><div class='ctx'> 	u32 sample_rate;</div><div class='ctx'> 				/**&lt; 11025, 32000, 44100 ... */</div><div class='del'>-	u32 bit_rate;	      /**&lt; for MPEG */</div><div class='add'>+	u32 bit_rate;		  /**&lt; for MPEG */</div><div class='ctx'> 	u32 attributes;</div><div class='ctx'> 				/**&lt; Stereo/JointStereo/Mono */</div><div class='ctx'> 	u16 mode_legacy;</div><div class='ctx'> 				/**&lt; Legacy ancillary mode or idle bit  */</div><div class='del'>-	u16 unused;	      /**&lt; unused */</div><div class='del'>-	u16 channels; /**&lt; 1,2..., (or ancillary mode or idle bit */</div><div class='del'>-	u16 format;   /**&lt; HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */</div><div class='add'>+	u16 unused;		  /**&lt; Unused */</div><div class='add'>+	u16 channels;	  /**&lt; 1,2..., (or ancillary mode or idle bit */</div><div class='add'>+	u16 format;	  /**&lt; HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_anc_frame {</div><div class='hunk'>@@ -1106,930 +1131,578 @@ struct hpi_anc_frame {</div><div class='ctx'> */</div><div class='ctx'> struct hpi_async_event {</div><div class='ctx'> 	u16 event_type;	/**&lt; type of event. \sa async_event  */</div><div class='del'>-	u16 sequence;  /**&lt; sequence number, allows lost event detection */</div><div class='del'>-	u32 state;    /**&lt; new state */</div><div class='del'>-	u32 h_object;	 /**&lt; handle to the object returning the event. */</div><div class='add'>+	u16 sequence; /**&lt; Sequence number, allows lost event detection */</div><div class='add'>+	u32 state; /**&lt; New state */</div><div class='add'>+	u32 h_object; /**&lt; handle to the object returning the event. */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u16 index; /**&lt; GPIO bit index. */</div><div class='ctx'> 		} gpio;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u16 node_index;	/**&lt; what node is the control on ? */</div><div class='del'>-			u16 node_type;	/**&lt; what type of node is the control on ? */</div><div class='add'>+			u16 node_type; /**&lt; what type of node is the control on ? */</div><div class='ctx'> 		} control;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*/////////////////////////////////////////////////////////////////////////// */</div><div class='del'>-/* Public HPI Entity related definitions                                     */</div><div class='del'>-</div><div class='del'>-struct hpi_entity;</div><div class='del'>-</div><div class='del'>-enum e_entity_type {</div><div class='del'>-	entity_type_null,</div><div class='del'>-	entity_type_sequence,	/* sequence of potentially heterogeneous TLV entities */</div><div class='del'>-</div><div class='del'>-	entity_type_reference,	/* refers to a TLV entity or NULL */</div><div class='del'>-</div><div class='del'>-	entity_type_int,	/* 32 bit */</div><div class='del'>-	entity_type_float,	/* ieee754 binary 32 bit encoding */</div><div class='del'>-	entity_type_double,</div><div class='del'>-</div><div class='del'>-	entity_type_cstring,</div><div class='del'>-	entity_type_octet,</div><div class='del'>-	entity_type_ip4_address,</div><div class='del'>-	entity_type_ip6_address,</div><div class='del'>-	entity_type_mac_address,</div><div class='del'>-</div><div class='del'>-	LAST_ENTITY_TYPE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum e_entity_role {</div><div class='del'>-	entity_role_null,</div><div class='del'>-	entity_role_value,</div><div class='del'>-	entity_role_classname,</div><div class='del'>-</div><div class='del'>-	entity_role_units,</div><div class='del'>-	entity_role_flags,</div><div class='del'>-	entity_role_range,</div><div class='del'>-</div><div class='del'>-	entity_role_mapping,</div><div class='del'>-	entity_role_enum,</div><div class='del'>-</div><div class='del'>-	entity_role_instance_of,</div><div class='del'>-	entity_role_depends_on,</div><div class='del'>-	entity_role_member_of_group,</div><div class='del'>-	entity_role_value_constraint,</div><div class='del'>-	entity_role_parameter_port,</div><div class='del'>-</div><div class='del'>-	entity_role_block,</div><div class='del'>-	entity_role_node_group,</div><div class='del'>-	entity_role_audio_port,</div><div class='del'>-	entity_role_clock_port,</div><div class='del'>-	LAST_ENTITY_ROLE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* skip host side function declarations for</div><div class='del'>-   DSP compile and documentation extraction */</div><div class='del'>-</div><div class='del'>-struct hpi_hsubsys {</div><div class='del'>-	int not_really_used;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #ifndef DISABLE_PRAGMA_PACK1</div><div class='ctx'> #pragma pack(pop)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/*////////////////////////////////////////////////////////////////////////// */</div><div class='add'>+/*****************/</div><div class='ctx'> /* HPI FUNCTIONS */</div><div class='add'>+/*****************/</div><div class='ctx'> </div><div class='del'>-/*/////////////////////////// */</div><div class='del'>-/* DATA and FORMAT and STREAM */</div><div class='del'>-</div><div class='add'>+/* Stream */</div><div class='ctx'> u16 hpi_stream_estimate_buffer_size(struct hpi_format *pF,</div><div class='ctx'> 	u32 host_polling_rate_in_milli_seconds, u32 *recommended_buffer_size);</div><div class='ctx'> </div><div class='del'>-/*/////////// */</div><div class='del'>-/* SUB SYSTEM */</div><div class='del'>-struct hpi_hsubsys *hpi_subsys_create(void</div><div class='del'>-	);</div><div class='del'>-</div><div class='del'>-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 *pversion);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 *pversion_ex);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,</div><div class='del'>-	u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	int *pn_num_adapters);</div><div class='add'>+/*************/</div><div class='add'>+/* SubSystem */</div><div class='add'>+/*************/</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,</div><div class='del'>-	u32 *padapter_index, u16 *pw_adapter_type);</div><div class='add'>+u16 hpi_subsys_get_version_ex(u32 *pversion_ex);</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass);</div><div class='add'>+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters);</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const char *sz_interface);</div><div class='add'>+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,</div><div class='add'>+	u16 *pw_adapter_type);</div><div class='ctx'> </div><div class='del'>-/*///////// */</div><div class='del'>-/* ADAPTER */</div><div class='add'>+/***********/</div><div class='add'>+/* Adapter */</div><div class='add'>+/***********/</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);</div><div class='add'>+u16 hpi_adapter_open(u16 adapter_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);</div><div class='add'>+u16 hpi_adapter_close(u16 adapter_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,</div><div class='del'>-	u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type);</div><div class='add'>+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,</div><div class='add'>+	u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,</div><div class='add'>+	u16 *pw_adapter_type);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 module_index, u16 *pw_num_outputs,</div><div class='del'>-	u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,</div><div class='del'>-	u16 *pw_module_type, u32 *ph_module);</div><div class='add'>+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,</div><div class='add'>+	u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,</div><div class='add'>+	u32 *pserial_number, u16 *pw_module_type, u32 *ph_module);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 adapter_mode);</div><div class='add'>+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 adapter_mode, u16 query_or_set);</div><div class='add'>+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,</div><div class='add'>+	u16 query_or_set);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 *padapter_mode);</div><div class='add'>+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *assert_present, char *psz_assert,</div><div class='del'>-	u16 *pw_line_number);</div><div class='add'>+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 paramter1,</div><div class='add'>+	u16 paramter2);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *assert_present, char *psz_assert,</div><div class='del'>-	u32 *pline_number, u16 *pw_assert_on_dsp);</div><div class='add'>+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,</div><div class='add'>+	u16 *pw_paramter1, u16 *pw_paramter2);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 assert_id);</div><div class='add'>+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,</div><div class='add'>+	u16 what_to_enumerate, u16 property_index, u32 *psetting);</div><div class='add'>+/*************/</div><div class='add'>+/* OutStream */</div><div class='add'>+/*************/</div><div class='add'>+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,</div><div class='add'>+	u32 *ph_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 capability, u32 key);</div><div class='add'>+u16 hpi_outstream_close(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index);</div><div class='add'>+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,</div><div class='add'>+	u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,</div><div class='add'>+	u32 *pauxiliary_data_to_play);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 dsp_address, char *p_bytes, int *count_bytes);</div><div class='add'>+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_write_buf,</div><div class='add'>+	u32 bytes_to_write, const struct hpi_format *p_format);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 property, u16 paramter1, u16 paramter2);</div><div class='add'>+u16 hpi_outstream_start(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 property, u16 *pw_paramter1,</div><div class='del'>-	u16 *pw_paramter2);</div><div class='add'>+u16 hpi_outstream_wait_start(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 index, u16 what_to_enumerate,</div><div class='del'>-	u16 property_index, u32 *psetting);</div><div class='add'>+u16 hpi_outstream_stop(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-/*////////////// */</div><div class='del'>-/* NonVol Memory */</div><div class='del'>-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_nv_memory, u16 *pw_size_in_bytes);</div><div class='add'>+u16 hpi_outstream_sinegen(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_nv_memory, u16 index, u16 *pw_data);</div><div class='add'>+u16 hpi_outstream_reset(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_nv_memory, u16 index, u16 data);</div><div class='add'>+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format);</div><div class='ctx'> </div><div class='del'>-/*////////////// */</div><div class='del'>-/* Digital I/O */</div><div class='del'>-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits);</div><div class='add'>+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format);</div><div class='ctx'> </div><div class='del'>-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 bit_index, u16 *pw_bit_data);</div><div class='add'>+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,</div><div class='add'>+	u32 punch_out_sample);</div><div class='ctx'> </div><div class='del'>-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 aw_all_bit_data[4]</div><div class='del'>-	);</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 bit_index, u16 bit_data);</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 aw_all_bit_data[4]</div><div class='del'>-	);</div><div class='del'>-</div><div class='del'>-/**********************/</div><div class='del'>-/* Async Event Object */</div><div class='del'>-/**********************/</div><div class='del'>-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 *ph_async);</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async);</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,</div><div class='del'>-	u16 maximum_events, struct hpi_async_event *p_events,</div><div class='del'>-	u16 *pw_number_returned);</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_async, u16 *pw_count);</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,</div><div class='del'>-	u16 maximum_events, struct hpi_async_event *p_events,</div><div class='del'>-	u16 *pw_number_returned);</div><div class='del'>-</div><div class='del'>-/*/////////// */</div><div class='del'>-/* WATCH-DOG  */</div><div class='del'>-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_watchdog);</div><div class='del'>-</div><div class='del'>-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,</div><div class='del'>-	u32 time_millisec);</div><div class='del'>-</div><div class='del'>-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog);</div><div class='del'>-</div><div class='del'>-/**************/</div><div class='del'>-/* OUT STREAM */</div><div class='del'>-/**************/</div><div class='del'>-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u16 outstream_index, u32 *ph_outstream);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,</div><div class='del'>-	u32 *psamples_played, u32 *pauxiliary_data_to_play);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, const u8 *pb_write_buf, u32 bytes_to_write,</div><div class='del'>-	const struct hpi_format *p_format);</div><div class='add'>+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);</div><div class='add'>+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream);</div><div class='add'>+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_format *p_format);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_format *p_format);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, short velocity);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u16 mode);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 *pframes_available);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='add'>+u16 hpi_outstream_ancillary_read(u32 h_outstream,</div><div class='add'>+	struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='ctx'> 	u32 anc_frame_buffer_size_in_bytes,</div><div class='ctx'> 	u32 number_of_ancillary_frames_to_read);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 time_scaleX10000);</div><div class='add'>+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scaleX10000);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 size_in_bytes);</div><div class='add'>+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream);</div><div class='add'>+u16 hpi_outstream_host_buffer_free(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 h_stream);</div><div class='add'>+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map);</div><div class='add'>+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,</div><div class='add'>+	u32 *pinstream_map);</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream);</div><div class='add'>+u16 hpi_outstream_group_reset(u32 h_outstream);</div><div class='ctx'> </div><div class='del'>-/*////////// */</div><div class='del'>-/* IN_STREAM */</div><div class='del'>-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u16 instream_index, u32 *ph_instream);</div><div class='add'>+/************/</div><div class='add'>+/* InStream */</div><div class='add'>+/************/</div><div class='add'>+u16 hpi_instream_open(u16 adapter_index, u16 instream_index,</div><div class='add'>+	u32 *ph_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream);</div><div class='add'>+u16 hpi_instream_close(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_format *p_format);</div><div class='add'>+u16 hpi_instream_query_format(u32 h_instream,</div><div class='add'>+	const struct hpi_format *p_format);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_format *p_format);</div><div class='add'>+u16 hpi_instream_set_format(u32 h_instream,</div><div class='add'>+	const struct hpi_format *p_format);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,</div><div class='del'>-	u8 *pb_read_buf, u32 bytes_to_read);</div><div class='add'>+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_read_buf, u32 bytes_to_read);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream);</div><div class='add'>+u16 hpi_instream_start(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream);</div><div class='add'>+u16 hpi_instream_wait_start(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream);</div><div class='add'>+u16 hpi_instream_stop(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream);</div><div class='add'>+u16 hpi_instream_reset(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,</div><div class='del'>-	u32 *psamples_recorded, u32 *pauxiliary_data_recorded);</div><div class='add'>+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,</div><div class='add'>+	u32 *pdata_recorded, u32 *psamples_recorded,</div><div class='add'>+	u32 *pauxiliary_data_recorded);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,</div><div class='del'>-	u16 idle_bit);</div><div class='add'>+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,</div><div class='add'>+	u16 mode, u16 alignment, u16 idle_bit);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 *pframe_space);</div><div class='add'>+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='add'>+u16 hpi_instream_ancillary_write(u32 h_instream,</div><div class='add'>+	const struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='ctx'> 	u32 anc_frame_buffer_size_in_bytes,</div><div class='ctx'> 	u32 number_of_ancillary_frames_to_write);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 size_in_bytes);</div><div class='add'>+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream);</div><div class='add'>+u16 hpi_instream_host_buffer_free(u32 h_instream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 h_stream);</div><div class='add'>+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 *poutstream_map, u32 *pinstream_map);</div><div class='add'>+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,</div><div class='add'>+	u32 *pinstream_map);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream);</div><div class='add'>+u16 hpi_instream_group_reset(u32 h_instream);</div><div class='ctx'> </div><div class='ctx'> /*********/</div><div class='del'>-/* MIXER */</div><div class='add'>+/* Mixer */</div><div class='ctx'> /*********/</div><div class='del'>-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_mixer);</div><div class='del'>-</div><div class='del'>-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer);</div><div class='del'>-</div><div class='del'>-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='del'>-	u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,</div><div class='del'>-	u16 dst_node_type_index, u16 control_type, u32 *ph_control);</div><div class='del'>-</div><div class='del'>-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_mixer, u16 control_index, u16 *pw_src_node_type,</div><div class='del'>-	u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,</div><div class='del'>-	u16 *pw_control_type, u32 *ph_control);</div><div class='del'>-</div><div class='del'>-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='del'>-	enum HPI_MIXER_STORE_COMMAND command, u16 index);</div><div class='del'>-/*************************/</div><div class='del'>-/* mixer CONTROLS                */</div><div class='del'>-/*************************/</div><div class='del'>-/*************************/</div><div class='del'>-/* volume control                */</div><div class='del'>-/*************************/</div><div class='del'>-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer);</div><div class='add'>+</div><div class='add'>+u16 hpi_mixer_close(u32 h_mixer);</div><div class='add'>+</div><div class='add'>+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,</div><div class='add'>+	u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,</div><div class='add'>+	u16 control_type, u32 *ph_control);</div><div class='add'>+</div><div class='add'>+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,</div><div class='add'>+	u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,</div><div class='add'>+	u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control);</div><div class='add'>+</div><div class='add'>+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,</div><div class='add'>+	u16 index);</div><div class='add'>+/************/</div><div class='add'>+/* Controls */</div><div class='add'>+/************/</div><div class='add'>+/******************/</div><div class='add'>+/* Volume control */</div><div class='add'>+/******************/</div><div class='add'>+u16 hpi_volume_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='add'>+u16 hpi_volume_get_gain(u32 h_control,</div><div class='ctx'> 	short an_gain0_01dB_out[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='add'>+u16 hpi_volume_set_mute(u32 h_control, u32 mute);</div><div class='add'>+</div><div class='add'>+u16 hpi_volume_get_mute(u32 h_control, u32 *mute);</div><div class='add'>+</div><div class='ctx'> #define hpi_volume_get_range hpi_volume_query_range</div><div class='del'>-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);</div><div class='add'>+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,</div><div class='add'>+	short *max_gain_01dB, short *step_gain_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_volume, u32 *p_channels);</div><div class='add'>+u16 hpi_volume_query_channels(const u32 h_control, u32 *p_channels);</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='add'>+u16 hpi_volume_auto_fade(u32 h_control,</div><div class='ctx'> 	short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms);</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],</div><div class='del'>-	u32 duration_ms, u16 profile);</div><div class='add'>+u16 hpi_volume_auto_fade_profile(u32 h_control,</div><div class='add'>+	short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,</div><div class='add'>+	u16 profile);</div><div class='ctx'> </div><div class='del'>-/*************************/</div><div class='del'>-/* level control         */</div><div class='del'>-/*************************/</div><div class='del'>-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);</div><div class='add'>+u16 hpi_volume_query_auto_fade_profile(const u32 h_control, const u32 i,</div><div class='add'>+	u16 *profile);</div><div class='add'>+</div><div class='add'>+/*****************/</div><div class='add'>+/* Level control */</div><div class='add'>+/*****************/</div><div class='add'>+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,</div><div class='add'>+	short *max_gain_01dB, short *step_gain_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='add'>+u16 hpi_level_get_gain(u32 h_control,</div><div class='ctx'> 	short an_gain0_01dB_out[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-/*************************/</div><div class='del'>-/* meter control                 */</div><div class='del'>-/*************************/</div><div class='del'>-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_meter, u32 *p_channels);</div><div class='add'>+/*****************/</div><div class='add'>+/* Meter control */</div><div class='add'>+/*****************/</div><div class='add'>+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='add'>+u16 hpi_meter_get_peak(u32 h_control,</div><div class='ctx'> 	short an_peak0_01dB_out[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_peak0_01dB_out[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_meter_get_rms(u32 h_control, short an_peak0_01dB_out[HPI_MAX_CHANNELS]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 attack, u16 decay);</div><div class='add'>+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 attack, u16 decay);</div><div class='add'>+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *attack, u16 *decay);</div><div class='add'>+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *attack, u16 *decay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *attack, u16 *decay);</div><div class='add'>+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *attack, u16 *decay);</div><div class='ctx'> </div><div class='del'>-/*************************/</div><div class='del'>-/* channel mode control  */</div><div class='del'>-/*************************/</div><div class='del'>-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_mode, const u32 index, u16 *pw_mode);</div><div class='add'>+/************************/</div><div class='add'>+/* ChannelMode control */</div><div class='add'>+/************************/</div><div class='add'>+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,</div><div class='add'>+	u16 *pw_mode);</div><div class='ctx'> </div><div class='del'>-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 mode);</div><div class='add'>+u16 hpi_channel_mode_set(u32 h_control, u16 mode);</div><div class='ctx'> </div><div class='del'>-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *mode);</div><div class='add'>+u16 hpi_channel_mode_get(u32 h_control, u16 *mode);</div><div class='ctx'> </div><div class='del'>-/*************************/</div><div class='del'>-/* Tuner control                 */</div><div class='del'>-/*************************/</div><div class='del'>-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, u16 *pw_band);</div><div class='del'>-</div><div class='del'>-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 band);</div><div class='add'>+/*****************/</div><div class='add'>+/* Tuner control */</div><div class='add'>+/*****************/</div><div class='add'>+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *pw_band);</div><div class='add'>+u16 hpi_tuner_set_band(u32 h_control, u16 band);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq);</div><div class='add'>+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 freq_ink_hz);</div><div class='add'>+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,</div><div class='add'>+	const u16 band, u32 *pfreq);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pw_freq_ink_hz);</div><div class='add'>+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *pw_level);</div><div class='add'>+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short *pw_level);</div><div class='add'>+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, u16 *pw_gain);</div><div class='add'>+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short gain);</div><div class='add'>+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *pn_gain);</div><div class='add'>+u16 hpi_tuner_set_gain(u32 h_control, short gain);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *pw_status_mask, u16 *pw_status);</div><div class='add'>+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 mode, u32 value);</div><div class='add'>+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 mode, u32 *pn_value);</div><div class='add'>+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *p_rds_data);</div><div class='add'>+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis);</div><div class='add'>+u16 hpi_tuner_get_rds(u32 h_control, char *p_rds_data);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 deemphasis);</div><div class='del'>-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pdeemphasis);</div><div class='add'>+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,</div><div class='add'>+	const u16 band, u32 *pdeemphasis);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, u32 *pbitmap_program);</div><div class='add'>+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis);</div><div class='add'>+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 program);</div><div class='add'>+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 *pprogram);</div><div class='add'>+u16 hpi_tuner_set_program(u32 h_control, u32 program);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_dsp_version, const u32 string_size);</div><div class='add'>+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_sdk_version, const u32 string_size);</div><div class='add'>+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,</div><div class='add'>+	const u32 string_size);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pquality);</div><div class='add'>+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,</div><div class='add'>+	const u32 string_size);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pblend);</div><div class='add'>+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, const u32 blend);</div><div class='add'>+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend);</div><div class='ctx'> </div><div class='del'>-/****************************/</div><div class='del'>-/* PADs control             */</div><div class='del'>-/****************************/</div><div class='add'>+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_string, const u32 string_length);</div><div class='add'>+/***************/</div><div class='add'>+/* PAD control */</div><div class='add'>+/***************/</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 string_length);</div><div class='add'>+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 string_length);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 string_length);</div><div class='add'>+u16 hpi_pad_get_artist(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 string_length);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 string_length);</div><div class='add'>+u16 hpi_pad_get_title(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 string_length);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *ppTY);</div><div class='add'>+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 string_length);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 *ppI);</div><div class='add'>+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY);</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_program_type_string(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, const u32 data_type, const u32 pTY, char *psz_string,</div><div class='del'>-	const u32 string_length);</div><div class='add'>+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI);</div><div class='ctx'> </div><div class='ctx'> /****************************/</div><div class='ctx'> /* AES/EBU Receiver control */</div><div class='ctx'> /****************************/</div><div class='del'>-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_aes_rx, const u32 index, u16 *pw_format);</div><div class='add'>+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,</div><div class='add'>+	u16 *pw_format);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source);</div><div class='add'>+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 source);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_source);</div><div class='add'>+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_source);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate);</div><div class='add'>+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *pw_data);</div><div class='add'>+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 *pw_data);</div><div class='add'>+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 *pw_data);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_error_data);</div><div class='add'>+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data);</div><div class='ctx'> </div><div class='ctx'> /*******************************/</div><div class='ctx'> /* AES/EBU Transmitter control */</div><div class='ctx'> /*******************************/</div><div class='del'>-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u32 sample_rate);</div><div class='add'>+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 data);</div><div class='add'>+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 data);</div><div class='add'>+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 data);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 *pw_data);</div><div class='add'>+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 *pw_data);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_aes_tx, const u32 index, u16 *pw_format);</div><div class='add'>+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,</div><div class='add'>+	u16 *pw_format);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 output_format);</div><div class='add'>+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format);</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_output_format);</div><div class='add'>+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format);</div><div class='ctx'> </div><div class='ctx'> /***********************/</div><div class='del'>-/* multiplexer control */</div><div class='add'>+/* Multiplexer control */</div><div class='ctx'> /***********************/</div><div class='del'>-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source_node_type, u16 source_node_index);</div><div class='add'>+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,</div><div class='add'>+	u16 source_node_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *source_node_type, u16 *source_node_index);</div><div class='del'>-</div><div class='del'>-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *source_node_type,</div><div class='add'>+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,</div><div class='ctx'> 	u16 *source_node_index);</div><div class='ctx'> </div><div class='add'>+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,</div><div class='add'>+	u16 *source_node_type, u16 *source_node_index);</div><div class='add'>+</div><div class='ctx'> /***************/</div><div class='del'>-/* VOX control */</div><div class='add'>+/* Vox control */</div><div class='ctx'> /***************/</div><div class='del'>-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB);</div><div class='add'>+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *an_gain0_01dB);</div><div class='add'>+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB);</div><div class='ctx'> </div><div class='ctx'> /*********************/</div><div class='ctx'> /* Bitstream control */</div><div class='ctx'> /*********************/</div><div class='del'>-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 edge_type);</div><div class='add'>+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type);</div><div class='ctx'> </div><div class='del'>-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 polarity);</div><div class='add'>+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity);</div><div class='ctx'> </div><div class='del'>-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity);</div><div class='add'>+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,</div><div class='add'>+	u16 *pw_data_activity);</div><div class='ctx'> </div><div class='ctx'> /***********************/</div><div class='ctx'> /* SampleClock control */</div><div class='ctx'> /***********************/</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, u16 *pw_source);</div><div class='add'>+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,</div><div class='add'>+	u16 *pw_source);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source);</div><div class='add'>+u16 hpi_sample_clock_set_source(u32 h_control, u16 source);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_source);</div><div class='add'>+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, const u32 source,</div><div class='del'>-	u16 *pw_source_index);</div><div class='add'>+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,</div><div class='add'>+	const u32 source, u16 *pw_source_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source_index);</div><div class='add'>+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_source_index);</div><div class='add'>+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate);</div><div class='add'>+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, u32 *psource);</div><div class='add'>+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,</div><div class='add'>+	u32 *psource);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 sample_rate);</div><div class='add'>+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate);</div><div class='add'>+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 enable);</div><div class='add'>+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *penable);</div><div class='add'>+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 lock);</div><div class='add'>+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock);</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *plock);</div><div class='add'>+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock);</div><div class='ctx'> </div><div class='ctx'> /***********************/</div><div class='ctx'> /* Microphone control */</div><div class='ctx'> /***********************/</div><div class='del'>-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 on_off);</div><div class='add'>+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off);</div><div class='ctx'> </div><div class='del'>-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_on_off);</div><div class='add'>+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off);</div><div class='ctx'> </div><div class='del'>-/*******************************</div><div class='del'>-  Parametric Equalizer control</div><div class='del'>-*******************************/</div><div class='del'>-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_number_of_bands, u16 *pw_enabled);</div><div class='add'>+/********************************/</div><div class='add'>+/* Parametric Equalizer control */</div><div class='add'>+/********************************/</div><div class='add'>+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,</div><div class='add'>+	u16 *pw_enabled);</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 on_off);</div><div class='add'>+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off);</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,</div><div class='del'>-	short gain0_01dB);</div><div class='add'>+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,</div><div class='add'>+	u32 frequency_hz, short q100, short gain0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,</div><div class='del'>-	short *pnQ100, short *pn_gain0_01dB);</div><div class='add'>+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,</div><div class='add'>+	u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, short coeffs[5]</div><div class='add'>+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='del'>-/*******************************</div><div class='del'>-  Compressor Expander control</div><div class='del'>-*******************************/</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 on);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pon);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short makeup_gain0_01dB);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short *pn_makeup_gain0_01dB);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u32 index, u32 attack);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u32 index, u32 *pw_attack);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 decay);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 *pw_decay);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, short threshold0_01dB);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, short *pn_threshold0_01dB);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 ratio100);</div><div class='del'>-</div><div class='del'>-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 *pw_ratio100);</div><div class='del'>-</div><div class='del'>-/*******************************</div><div class='del'>-  Cobranet HMI control</div><div class='del'>-*******************************/</div><div class='del'>-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 hmi_address, u32 byte_count, u8 *pb_data);</div><div class='del'>-</div><div class='del'>-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data);</div><div class='del'>-</div><div class='del'>-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pstatus, u32 *preadable_size,</div><div class='del'>-	u32 *pwriteable_size);</div><div class='del'>-</div><div class='del'>-/*Read the current IP address</div><div class='del'>-*/</div><div class='del'>-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pi_paddress);</div><div class='del'>-</div><div class='del'>-/* Write the current IP address</div><div class='del'>-*/</div><div class='del'>-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 i_paddress);</div><div class='add'>+/*******************************/</div><div class='add'>+/* Compressor Expander control */</div><div class='add'>+/*******************************/</div><div class='ctx'> </div><div class='del'>-/* Read the static IP address</div><div class='del'>-*/</div><div class='del'>-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pi_paddress);</div><div class='add'>+u16 hpi_compander_set_enable(u32 h_control, u32 on);</div><div class='ctx'> </div><div class='del'>-/* Write the static IP address</div><div class='del'>-*/</div><div class='del'>-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 i_paddress);</div><div class='add'>+u16 hpi_compander_get_enable(u32 h_control, u32 *pon);</div><div class='ctx'> </div><div class='del'>-/* Read the MAC address</div><div class='del'>-*/</div><div class='del'>-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs);</div><div class='add'>+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB);</div><div class='ctx'> </div><div class='del'>-/*******************************</div><div class='del'>-  Tone Detector control</div><div class='del'>-*******************************/</div><div class='del'>-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	u32 *state);</div><div class='add'>+u16 hpi_compander_get_makeup_gain(u32 h_control, short *pn_makeup_gain0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	u32 enable);</div><div class='add'>+u16 hpi_compander_set_attack_time_constant(u32 h_control, u32 index,</div><div class='add'>+	u32 attack);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	u32 *enable);</div><div class='add'>+u16 hpi_compander_get_attack_time_constant(u32 h_control, u32 index,</div><div class='add'>+	u32 *pw_attack);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 event_enable);</div><div class='add'>+u16 hpi_compander_set_decay_time_constant(u32 h_control, u32 index,</div><div class='add'>+	u32 decay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 *event_enable);</div><div class='add'>+u16 hpi_compander_get_decay_time_constant(u32 h_control, u32 index,</div><div class='add'>+	u32 *pw_decay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, int threshold);</div><div class='add'>+u16 hpi_compander_set_threshold(u32 h_control, u32 index,</div><div class='add'>+	short threshold0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, int *threshold);</div><div class='add'>+u16 hpi_compander_get_threshold(u32 h_control, u32 index,</div><div class='add'>+	short *pn_threshold0_01dB);</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 index, u32 *frequency);</div><div class='add'>+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100);</div><div class='ctx'> </div><div class='del'>-/*******************************</div><div class='del'>-  Silence Detector control</div><div class='del'>-*******************************/</div><div class='del'>-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 *state);</div><div class='add'>+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *pw_ratio100);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 enable);</div><div class='add'>+/********************/</div><div class='add'>+/* Cobranet control */</div><div class='add'>+/********************/</div><div class='add'>+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,</div><div class='add'>+	u8 *pb_data);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 *enable);</div><div class='add'>+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,</div><div class='add'>+	u32 *pbyte_count, u8 *pb_data);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 event_enable);</div><div class='add'>+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,</div><div class='add'>+	u32 *preadable_size, u32 *pwriteable_size);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 *event_enable);</div><div class='add'>+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 delay);</div><div class='add'>+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, u32 *delay);</div><div class='add'>+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, int threshold);</div><div class='add'>+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address);</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 hC, int *threshold);</div><div class='add'>+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,</div><div class='add'>+	u32 *p_mac_lsbs);</div><div class='ctx'> </div><div class='del'>-/*******************************</div><div class='del'>-  Universal control</div><div class='del'>-*******************************/</div><div class='del'>-u16 hpi_entity_find_next(struct hpi_entity *container_entity,</div><div class='del'>-	enum e_entity_type type, enum e_entity_role role, int recursive_flag,</div><div class='del'>-	struct hpi_entity **current_match);</div><div class='del'>-</div><div class='del'>-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,</div><div class='del'>-	enum e_entity_type type, size_t item_count, void *value_dst_p);</div><div class='add'>+/*************************/</div><div class='add'>+/* Tone Detector control */</div><div class='add'>+/*************************/</div><div class='add'>+u16 hpi_tone_detector_get_state(u32 hC, u32 *state);</div><div class='ctx'> </div><div class='del'>-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,</div><div class='del'>-	size_t *items, enum e_entity_role *role, void **value);</div><div class='add'>+u16 hpi_tone_detector_set_enable(u32 hC, u32 enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,</div><div class='del'>-	const size_t item_count, const enum e_entity_role role, void *value,</div><div class='del'>-	struct hpi_entity **entity);</div><div class='add'>+u16 hpi_tone_detector_get_enable(u32 hC, u32 *enable);</div><div class='ctx'> </div><div class='del'>-void hpi_entity_free(struct hpi_entity *entity);</div><div class='add'>+u16 hpi_tone_detector_set_event_enable(u32 hC, u32 event_enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity **info);</div><div class='add'>+u16 hpi_tone_detector_get_event_enable(u32 hC, u32 *event_enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity **value);</div><div class='add'>+u16 hpi_tone_detector_set_threshold(u32 hC, int threshold);</div><div class='ctx'> </div><div class='del'>-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity *value);</div><div class='add'>+u16 hpi_tone_detector_get_threshold(u32 hC, int *threshold);</div><div class='ctx'> </div><div class='del'>-/*/////////// */</div><div class='del'>-/* DSP CLOCK  */</div><div class='del'>-/*/////////// */</div><div class='del'>-u16 hpi_clock_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_dsp_clock);</div><div class='add'>+u16 hpi_tone_detector_get_frequency(u32 hC, u32 index, u32 *frequency);</div><div class='ctx'> </div><div class='del'>-u16 hpi_clock_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,</div><div class='del'>-	u16 hour, u16 minute, u16 second, u16 milli_second);</div><div class='add'>+/****************************/</div><div class='add'>+/* Silence Detector control */</div><div class='add'>+/****************************/</div><div class='add'>+u16 hpi_silence_detector_get_state(u32 hC, u32 *state);</div><div class='ctx'> </div><div class='del'>-u16 hpi_clock_get_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,</div><div class='del'>-	u16 *pw_hour, u16 *pw_minute, u16 *pw_second, u16 *pw_milli_second);</div><div class='add'>+u16 hpi_silence_detector_set_enable(u32 hC, u32 enable);</div><div class='ctx'> </div><div class='del'>-/*/////////// */</div><div class='del'>-/* PROFILE        */</div><div class='del'>-/*/////////// */</div><div class='del'>-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 profile_index, u32 *ph_profile,</div><div class='del'>-	u16 *pw_max_profiles);</div><div class='add'>+u16 hpi_silence_detector_get_enable(u32 hC, u32 *enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,</div><div class='del'>-	u16 index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,</div><div class='del'>-	u32 *pmax_micro_seconds, u32 *pmin_micro_seconds);</div><div class='add'>+u16 hpi_silence_detector_set_event_enable(u32 hC, u32 event_enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);</div><div class='add'>+u16 hpi_silence_detector_get_event_enable(u32 hC, u32 *event_enable);</div><div class='ctx'> </div><div class='del'>-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);</div><div class='add'>+u16 hpi_silence_detector_set_delay(u32 hC, u32 delay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,</div><div class='del'>-	u16 index, char *sz_profile_name, u16 profile_name_length);</div><div class='add'>+u16 hpi_silence_detector_get_delay(u32 hC, u32 *delay);</div><div class='ctx'> </div><div class='del'>-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_profile, u32 *putilization);</div><div class='add'>+u16 hpi_silence_detector_set_threshold(u32 hC, int threshold);</div><div class='ctx'> </div><div class='del'>-/*//////////////////// */</div><div class='del'>-/* UTILITY functions */</div><div class='add'>+u16 hpi_silence_detector_get_threshold(u32 hC, int *threshold);</div><div class='add'>+/*********************/</div><div class='add'>+/* Utility functions */</div><div class='add'>+/*********************/</div><div class='ctx'> </div><div class='ctx'> u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 	u32 sample_rate, u32 bit_rate, u32 attributes);</div><div class='ctx'> </div><div class='del'>-/* Until it's verified, this function is for Windows OSs only */</div><div class='del'>-</div><div class='del'>-#endif	 /*_H_HPI_ */</div><div class='del'>-/*</div><div class='del'>-///////////////////////////////////////////////////////////////////////////////</div><div class='del'>-// See CVS for history.  Last complete set in rev 1.146</div><div class='del'>-////////////////////////////////////////////////////////////////////////////////</div><div class='del'>-*/</div><div class='add'>+#endif	 /*_HPI_H_ */</div><div class='head'>diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c<br/>index f7e374ec4414..b08578c93c6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6000.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi6000.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  Hardware Programming Interface (HPI) for AudioScience ASI6200 series adapters.</div><div class='ctx'>  These PCI bus adapters are based on the TI C6711 DSP.</div><div class='hunk'>@@ -43,16 +32,17 @@</div><div class='ctx'> #define HPI_HIF_ERROR_MASK      0x4000</div><div class='ctx'> </div><div class='ctx'> /* HPI6000 specific error codes */</div><div class='add'>+#define HPI6000_ERROR_BASE 900	/* not actually used anywhere */</div><div class='ctx'> </div><div class='del'>-#define HPI6000_ERROR_BASE                              900</div><div class='add'>+/* operational/messaging errors */</div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_IDLE_TIMEOUT             901</div><div class='del'>-#define HPI6000_ERROR_MSG_RESP_SEND_MSG_ACK             902</div><div class='add'>+#define HPI6000_ERROR_RESP_GET_LEN                      902</div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_GET_RESP_ACK             903</div><div class='ctx'> #define HPI6000_ERROR_MSG_GET_ADR                       904</div><div class='ctx'> #define HPI6000_ERROR_RESP_GET_ADR                      905</div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_BLOCKWRITE32             906</div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_BLOCKREAD32              907</div><div class='del'>-#define HPI6000_ERROR_MSG_INVALID_DSP_INDEX             908</div><div class='add'>+</div><div class='ctx'> #define HPI6000_ERROR_CONTROL_CACHE_PARAMS              909</div><div class='ctx'> </div><div class='ctx'> #define HPI6000_ERROR_SEND_DATA_IDLE_TIMEOUT            911</div><div class='hunk'>@@ -62,7 +52,6 @@</div><div class='ctx'> #define HPI6000_ERROR_SEND_DATA_CMD                     915</div><div class='ctx'> #define HPI6000_ERROR_SEND_DATA_WRITE                   916</div><div class='ctx'> #define HPI6000_ERROR_SEND_DATA_IDLECMD                 917</div><div class='del'>-#define HPI6000_ERROR_SEND_DATA_VERIFY                  918</div><div class='ctx'> </div><div class='ctx'> #define HPI6000_ERROR_GET_DATA_IDLE_TIMEOUT             921</div><div class='ctx'> #define HPI6000_ERROR_GET_DATA_ACK                      922</div><div class='hunk'>@@ -76,9 +65,8 @@</div><div class='ctx'> </div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_GETRESPCMD               961</div><div class='ctx'> #define HPI6000_ERROR_MSG_RESP_IDLECMD                  962</div><div class='del'>-#define HPI6000_ERROR_MSG_RESP_BLOCKVERIFY32            963</div><div class='ctx'> </div><div class='del'>-/* adapter init errors */</div><div class='add'>+/* Initialisation/bootload errors */</div><div class='ctx'> #define HPI6000_ERROR_UNHANDLED_SUBSYS_ID               930</div><div class='ctx'> </div><div class='ctx'> /* can't access PCI2040 */</div><div class='hunk'>@@ -201,8 +189,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,</div><div class='ctx'> static void subsys_create_adapter(struct hpi_message *phm,</div><div class='ctx'> 	struct hpi_response *phr);</div><div class='ctx'> </div><div class='del'>-static void subsys_delete_adapter(struct hpi_message *phm,</div><div class='del'>-	struct hpi_response *phr);</div><div class='add'>+static void adapter_delete(struct hpi_adapter_obj *pao,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr);</div><div class='ctx'> </div><div class='ctx'> static void adapter_get_asserts(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr);</div><div class='hunk'>@@ -210,6 +198,8 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,</div><div class='ctx'> static short create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u32 *pos_error_code);</div><div class='ctx'> </div><div class='add'>+static void delete_adapter_obj(struct hpi_adapter_obj *pao);</div><div class='add'>+</div><div class='ctx'> /* local globals */</div><div class='ctx'> </div><div class='ctx'> static u16 gw_pci_read_asserts;	/* used to count PCI2040 errors */</div><div class='hunk'>@@ -217,23 +207,10 @@ static u16 gw_pci_write_asserts;	/* used to count PCI2040 errors */</div><div class='ctx'> </div><div class='ctx'> static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='del'>-	case HPI_SUBSYS_OPEN:</div><div class='del'>-	case HPI_SUBSYS_CLOSE:</div><div class='del'>-	case HPI_SUBSYS_GET_INFO:</div><div class='del'>-	case HPI_SUBSYS_DRIVER_UNLOAD:</div><div class='del'>-	case HPI_SUBSYS_DRIVER_LOAD:</div><div class='del'>-	case HPI_SUBSYS_FIND_ADAPTERS:</div><div class='del'>-		/* messages that should not get here */</div><div class='del'>-		phr-&gt;error = HPI_ERROR_UNIMPLEMENTED;</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='ctx'> 		subsys_create_adapter(phm, phr);</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_SUBSYS_DELETE_ADAPTER:</div><div class='del'>-		subsys_delete_adapter(phm, phr);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -243,6 +220,7 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> static void control_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='ctx'> 	case HPI_CONTROL_GET_STATE:</div><div class='hunk'>@@ -251,27 +229,29 @@ static void control_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			err = hpi6000_update_control_cache(pao, phm);</div><div class='ctx'> </div><div class='ctx'> 			if (err) {</div><div class='del'>-				phr-&gt;error = err;</div><div class='add'>+				if (err &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='add'>+					phr-&gt;error =</div><div class='add'>+						HPI_ERROR_CONTROL_CACHING;</div><div class='add'>+					phr-&gt;specific_error = err;</div><div class='add'>+				} else {</div><div class='add'>+					phr-&gt;error = err;</div><div class='add'>+				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (hpi_check_control_cache(((struct hpi_hw_obj *)</div><div class='del'>-						pao-&gt;priv)-&gt;p_cache, phm,</div><div class='del'>-					phr))</div><div class='add'>+			if (hpi_check_control_cache(phw-&gt;p_cache, phm, phr))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_CONTROL_GET_INFO:</div><div class='del'>-		hw_message(pao, phm, phr);</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_CONTROL_SET_STATE:</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='del'>-		hpi_sync_control_cache(((struct hpi_hw_obj *)pao-&gt;priv)-&gt;</div><div class='del'>-			p_cache, phm, phr);</div><div class='add'>+		hpi_cmn_control_cache_sync_to_msg(phw-&gt;p_cache, phm, phr);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='add'>+	case HPI_CONTROL_GET_INFO:</div><div class='ctx'> 	default:</div><div class='del'>-		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='add'>+		hw_message(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -280,26 +260,16 @@ static void adapter_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='del'>-	case HPI_ADAPTER_GET_INFO:</div><div class='del'>-		hw_message(pao, phm, phr);</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_ADAPTER_GET_ASSERT:</div><div class='ctx'> 		adapter_get_asserts(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_ADAPTER_OPEN:</div><div class='del'>-	case HPI_ADAPTER_CLOSE:</div><div class='del'>-	case HPI_ADAPTER_TEST_ASSERT:</div><div class='del'>-	case HPI_ADAPTER_SELFTEST:</div><div class='del'>-	case HPI_ADAPTER_GET_MODE:</div><div class='del'>-	case HPI_ADAPTER_SET_MODE:</div><div class='del'>-	case HPI_ADAPTER_FIND_OBJECT:</div><div class='del'>-	case HPI_ADAPTER_GET_PROPERTY:</div><div class='del'>-	case HPI_ADAPTER_SET_PROPERTY:</div><div class='del'>-	case HPI_ADAPTER_ENUM_PROPERTY:</div><div class='del'>-		hw_message(pao, phm, phr);</div><div class='add'>+</div><div class='add'>+	case HPI_ADAPTER_DELETE:</div><div class='add'>+		adapter_delete(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='add'>+		hw_message(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -311,7 +281,7 @@ static void outstream_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	case HPI_OSTREAM_HOSTBUFFER_ALLOC:</div><div class='ctx'> 	case HPI_OSTREAM_HOSTBUFFER_FREE:</div><div class='ctx'> 		/* Don't let these messages go to the HW function because</div><div class='del'>-		 * they're called without allocating the spinlock.</div><div class='add'>+		 * they're called without locking the spinlock.</div><div class='ctx'> 		 * For the HPI6000 adapters the HW would return</div><div class='ctx'> 		 * HPI_ERROR_INVALID_FUNC anyway.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -331,7 +301,7 @@ static void instream_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	case HPI_ISTREAM_HOSTBUFFER_ALLOC:</div><div class='ctx'> 	case HPI_ISTREAM_HOSTBUFFER_FREE:</div><div class='ctx'> 		/* Don't let these messages go to the HW function because</div><div class='del'>-		 * they're called without allocating the spinlock.</div><div class='add'>+		 * they're called without locking the spinlock.</div><div class='ctx'> 		 * For the HPI6000 adapters the HW would return</div><div class='ctx'> 		 * HPI_ERROR_INVALID_FUNC anyway.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -352,26 +322,22 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_adapter_obj *pao = NULL;</div><div class='ctx'> </div><div class='del'>-	/* subsytem messages get executed by every HPI. */</div><div class='del'>-	/* All other messages are ignored unless the adapter index matches */</div><div class='del'>-	/* an adapter in the HPI */</div><div class='del'>-	HPI_DEBUG_LOG(DEBUG, "O %d,F %x\n", phm-&gt;object, phm-&gt;function);</div><div class='del'>-</div><div class='del'>-	/* if Dsp has crashed then do not communicate with it any more */</div><div class='ctx'> 	if (phm-&gt;object != HPI_OBJ_SUBSYSTEM) {</div><div class='ctx'> 		pao = hpi_find_adapter(phm-&gt;adapter_index);</div><div class='ctx'> 		if (!pao) {</div><div class='del'>-			HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-				" %d,%d refused, for another HPI?\n",</div><div class='del'>-				phm-&gt;object, phm-&gt;function);</div><div class='add'>+			hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='add'>+				HPI_ERROR_BAD_ADAPTER_NUMBER);</div><div class='add'>+			HPI_DEBUG_LOG(DEBUG, "invalid adapter index: %d \n",</div><div class='add'>+				phm-&gt;adapter_index);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* Don't even try to communicate with crashed DSP */</div><div class='ctx'> 		if (pao-&gt;dsp_crashed &gt;= 10) {</div><div class='ctx'> 			hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='ctx'> 				HPI_ERROR_DSP_HARDWARE);</div><div class='del'>-			HPI_DEBUG_LOG(DEBUG, " %d,%d dsp crashed.\n",</div><div class='del'>-				phm-&gt;object, phm-&gt;function);</div><div class='add'>+			HPI_DEBUG_LOG(DEBUG, "adapter %d dsp crashed\n",</div><div class='add'>+				phm-&gt;adapter_index);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -381,7 +347,7 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> 			HPI_ERROR_PROCESSING_MESSAGE);</div><div class='ctx'> </div><div class='ctx'> 	switch (phm-&gt;type) {</div><div class='del'>-	case HPI_TYPE_MESSAGE:</div><div class='add'>+	case HPI_TYPE_REQUEST:</div><div class='ctx'> 		switch (phm-&gt;object) {</div><div class='ctx'> 		case HPI_OBJ_SUBSYSTEM:</div><div class='ctx'> 			subsys_message(phm, phr);</div><div class='hunk'>@@ -422,7 +388,7 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> /* SUBSYSTEM */</div><div class='ctx'> </div><div class='ctx'> /* create an adapter object and initialise it based on resource information</div><div class='del'>- * passed in in the message</div><div class='add'>+ * passed in the message</div><div class='ctx'>  * NOTE - you cannot use this function AND the FindAdapters function at the</div><div class='ctx'>  * same time, the application must use only one of them to get the adapters</div><div class='ctx'>  */</div><div class='hunk'>@@ -433,39 +399,34 @@ static void subsys_create_adapter(struct hpi_message *phm,</div><div class='ctx'> 	struct hpi_adapter_obj ao;</div><div class='ctx'> 	struct hpi_adapter_obj *pao;</div><div class='ctx'> 	u32 os_error_code;</div><div class='del'>-	short error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	u32 dsp_index = 0;</div><div class='ctx'> </div><div class='ctx'> 	HPI_DEBUG_LOG(VERBOSE, "subsys_create_adapter\n");</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ao, 0, sizeof(ao));</div><div class='ctx'> </div><div class='del'>-	/* this HPI only creates adapters for TI/PCI2040 based devices */</div><div class='del'>-	if (phm-&gt;u.s.resource.bus_type != HPI_BUS_PCI)</div><div class='del'>-		return;</div><div class='del'>-	if (phm-&gt;u.s.resource.r.pci-&gt;vendor_id != HPI_PCI_VENDOR_ID_TI)</div><div class='del'>-		return;</div><div class='del'>-	if (phm-&gt;u.s.resource.r.pci-&gt;device_id != HPI_PCI_DEV_ID_PCI2040)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);</div><div class='ctx'> 	if (!ao.priv) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_MEMORY_ALLOC;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create the adapter object based on the resource information */</div><div class='del'>-	/*? memcpy(&amp;ao.Pci,&amp;phm-&gt;u.s.Resource.r.Pci,sizeof(ao.Pci)); */</div><div class='ctx'> 	ao.pci = *phm-&gt;u.s.resource.r.pci;</div><div class='ctx'> </div><div class='del'>-	error = create_adapter_obj(&amp;ao, &amp;os_error_code);</div><div class='del'>-	if (!error)</div><div class='del'>-		error = hpi_add_adapter(&amp;ao);</div><div class='del'>-	if (error) {</div><div class='add'>+	err = create_adapter_obj(&amp;ao, &amp;os_error_code);</div><div class='add'>+	if (err) {</div><div class='add'>+		delete_adapter_obj(&amp;ao);</div><div class='add'>+		if (err &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='add'>+			phr-&gt;error = HPI_ERROR_DSP_BOOTLOAD;</div><div class='add'>+			phr-&gt;specific_error = err;</div><div class='add'>+		} else {</div><div class='add'>+			phr-&gt;error = err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		phr-&gt;u.s.data = os_error_code;</div><div class='del'>-		kfree(ao.priv);</div><div class='del'>-		phr-&gt;error = error;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* need to update paParentAdapter */</div><div class='hunk'>@@ -473,39 +434,25 @@ static void subsys_create_adapter(struct hpi_message *phm,</div><div class='ctx'> 	if (!pao) {</div><div class='ctx'> 		/* We just added this adapter, why can't we find it!? */</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR, "lost adapter after boot\n");</div><div class='del'>-		phr-&gt;error = 950;</div><div class='add'>+		phr-&gt;error = HPI_ERROR_BAD_ADAPTER;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (dsp_index = 0; dsp_index &lt; MAX_DSPS; dsp_index++) {</div><div class='del'>-		struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+		struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 		phw-&gt;ado[dsp_index].pa_parent_adapter = pao;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phr-&gt;u.s.aw_adapter_list[ao.index] = ao.adapter_type;</div><div class='add'>+	phr-&gt;u.s.adapter_type = ao.type;</div><div class='ctx'> 	phr-&gt;u.s.adapter_index = ao.index;</div><div class='del'>-	phr-&gt;u.s.num_adapters++;</div><div class='ctx'> 	phr-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void subsys_delete_adapter(struct hpi_message *phm,</div><div class='del'>-	struct hpi_response *phr)</div><div class='add'>+static void adapter_delete(struct hpi_adapter_obj *pao,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_adapter_obj *pao = NULL;</div><div class='del'>-	struct hpi_hw_obj *phw;</div><div class='del'>-</div><div class='del'>-	pao = hpi_find_adapter(phm-&gt;adapter_index);</div><div class='del'>-	if (!pao)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (pao-&gt;has_control_cache)</div><div class='del'>-		hpi_free_control_cache(phw-&gt;p_cache);</div><div class='del'>-</div><div class='add'>+	delete_adapter_obj(pao);</div><div class='ctx'> 	hpi_delete_adapter(pao);</div><div class='del'>-	kfree(phw);</div><div class='del'>-</div><div class='ctx'> 	phr-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -517,10 +464,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u32 dsp_index = 0;</div><div class='ctx'> 	u32 control_cache_size = 0;</div><div class='ctx'> 	u32 control_cache_count = 0;</div><div class='del'>-	struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* init error reporting */</div><div class='del'>-	pao-&gt;dsp_crashed = 0;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* The PCI2040 has the following address map */</div><div class='ctx'> 	/* BAR0 - 4K = HPI control and status registers on PCI2040 (HPI CSR) */</div><div class='hunk'>@@ -575,36 +519,36 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	/* get info about the adapter by asking the adapter */</div><div class='ctx'> 	/* send a HPI_ADAPTER_GET_INFO message */</div><div class='ctx'> 	{</div><div class='del'>-		struct hpi_message hM;</div><div class='del'>-		struct hpi_response hR0;	/* response from DSP 0 */</div><div class='del'>-		struct hpi_response hR1;	/* response from DSP 1 */</div><div class='add'>+		struct hpi_message hm;</div><div class='add'>+		struct hpi_response hr0;	/* response from DSP 0 */</div><div class='add'>+		struct hpi_response hr1;	/* response from DSP 1 */</div><div class='ctx'> 		u16 error = 0;</div><div class='ctx'> </div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n");</div><div class='del'>-		memset(&amp;hM, 0, sizeof(hM));</div><div class='del'>-		hM.type = HPI_TYPE_MESSAGE;</div><div class='del'>-		hM.size = sizeof(struct hpi_message);</div><div class='del'>-		hM.object = HPI_OBJ_ADAPTER;</div><div class='del'>-		hM.function = HPI_ADAPTER_GET_INFO;</div><div class='del'>-		hM.adapter_index = 0;</div><div class='del'>-		memset(&amp;hR0, 0, sizeof(hR0));</div><div class='del'>-		memset(&amp;hR1, 0, sizeof(hR1));</div><div class='del'>-		hR0.size = sizeof(hR0);</div><div class='del'>-		hR1.size = sizeof(hR1);</div><div class='del'>-</div><div class='del'>-		error = hpi6000_message_response_sequence(pao, 0, &amp;hM, &amp;hR0);</div><div class='del'>-		if (hR0.error) {</div><div class='del'>-			HPI_DEBUG_LOG(DEBUG, "message error %d\n", hR0.error);</div><div class='del'>-			return hR0.error;</div><div class='add'>+		memset(&amp;hm, 0, sizeof(hm));</div><div class='add'>+		hm.type = HPI_TYPE_REQUEST;</div><div class='add'>+		hm.size = sizeof(struct hpi_message);</div><div class='add'>+		hm.object = HPI_OBJ_ADAPTER;</div><div class='add'>+		hm.function = HPI_ADAPTER_GET_INFO;</div><div class='add'>+		hm.adapter_index = 0;</div><div class='add'>+		memset(&amp;hr0, 0, sizeof(hr0));</div><div class='add'>+		memset(&amp;hr1, 0, sizeof(hr1));</div><div class='add'>+		hr0.size = sizeof(hr0);</div><div class='add'>+		hr1.size = sizeof(hr1);</div><div class='add'>+</div><div class='add'>+		error = hpi6000_message_response_sequence(pao, 0, &amp;hm, &amp;hr0);</div><div class='add'>+		if (hr0.error) {</div><div class='add'>+			HPI_DEBUG_LOG(DEBUG, "message error %d\n", hr0.error);</div><div class='add'>+			return hr0.error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (phw-&gt;num_dsp == 2) {</div><div class='del'>-			error = hpi6000_message_response_sequence(pao, 1, &amp;hM,</div><div class='del'>-				&amp;hR1);</div><div class='add'>+			error = hpi6000_message_response_sequence(pao, 1, &amp;hm,</div><div class='add'>+				&amp;hr1);</div><div class='ctx'> 			if (error)</div><div class='ctx'> 				return error;</div><div class='ctx'> 		}</div><div class='del'>-		pao-&gt;adapter_type = hR0.u.a.adapter_type;</div><div class='del'>-		pao-&gt;index = hR0.u.a.adapter_index;</div><div class='add'>+		pao-&gt;type = hr0.u.ax.info.adapter_type;</div><div class='add'>+		pao-&gt;index = hr0.u.ax.info.adapter_index;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;phw-&gt;control_cache[0], 0,</div><div class='hunk'>@@ -618,20 +562,36 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		control_cache_count =</div><div class='ctx'> 			hpi_read_word(&amp;phw-&gt;ado[0],</div><div class='ctx'> 			HPI_HIF_ADDR(control_cache_count));</div><div class='del'>-		pao-&gt;has_control_cache = 1;</div><div class='ctx'> </div><div class='ctx'> 		phw-&gt;p_cache =</div><div class='ctx'> 			hpi_alloc_control_cache(control_cache_count,</div><div class='del'>-			control_cache_size, (struct hpi_control_cache_info *)</div><div class='add'>+			control_cache_size, (unsigned char *)</div><div class='ctx'> 			&amp;phw-&gt;control_cache[0]</div><div class='ctx'> 			);</div><div class='del'>-	} else</div><div class='del'>-		pao-&gt;has_control_cache = 0;</div><div class='add'>+		if (phw-&gt;p_cache)</div><div class='add'>+			pao-&gt;has_control_cache = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n",</div><div class='del'>-		pao-&gt;adapter_type, pao-&gt;index);</div><div class='del'>-	pao-&gt;open = 0;	/* upon creation the adapter is closed */</div><div class='del'>-	return 0;</div><div class='add'>+	HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n", pao-&gt;type,</div><div class='add'>+		pao-&gt;index);</div><div class='add'>+</div><div class='add'>+	if (phw-&gt;p_cache)</div><div class='add'>+		phw-&gt;p_cache-&gt;adap_idx = pao-&gt;index;</div><div class='add'>+</div><div class='add'>+	return hpi_add_adapter(pao);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delete_adapter_obj(struct hpi_adapter_obj *pao)</div><div class='add'>+{</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (pao-&gt;has_control_cache)</div><div class='add'>+		hpi_free_control_cache(phw-&gt;p_cache);</div><div class='add'>+</div><div class='add'>+	/* reset DSPs on adapter */</div><div class='add'>+	iowrite32(0x0003000F, phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+</div><div class='add'>+	kfree(phw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /************************************************************************/</div><div class='hunk'>@@ -643,11 +603,13 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,</div><div class='ctx'> #ifndef HIDE_PCI_ASSERTS</div><div class='ctx'> 	/* if we have PCI2040 asserts then collect them */</div><div class='ctx'> 	if ((gw_pci_read_asserts &gt; 0) || (gw_pci_write_asserts &gt; 0)) {</div><div class='del'>-		phr-&gt;u.a.serial_number =</div><div class='add'>+		phr-&gt;u.ax.assert.p1 =</div><div class='ctx'> 			gw_pci_read_asserts * 100 + gw_pci_write_asserts;</div><div class='del'>-		phr-&gt;u.a.adapter_index = 1;	/* assert count */</div><div class='del'>-		phr-&gt;u.a.adapter_type = -1;	/* "dsp index" */</div><div class='del'>-		strcpy(phr-&gt;u.a.sz_adapter_assert, "PCI2040 error");</div><div class='add'>+		phr-&gt;u.ax.assert.p2 = 0;</div><div class='add'>+		phr-&gt;u.ax.assert.count = 1;	/* assert count */</div><div class='add'>+		phr-&gt;u.ax.assert.dsp_index = -1;	/* "dsp index" */</div><div class='add'>+		strscpy(phr-&gt;u.ax.assert.sz_message, "PCI2040 error");</div><div class='add'>+		phr-&gt;u.ax.assert.dsp_msg_addr = 0;</div><div class='ctx'> 		gw_pci_read_asserts = 0;</div><div class='ctx'> 		gw_pci_write_asserts = 0;</div><div class='ctx'> 		phr-&gt;error = 0;</div><div class='hunk'>@@ -664,7 +626,7 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,</div><div class='ctx'> static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u32 *pos_error_code)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	short error;</div><div class='ctx'> 	u32 timeout;</div><div class='ctx'> 	u32 read = 0;</div><div class='hunk'>@@ -684,10 +646,10 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 	/* NOTE don't use wAdapterType in this routine. It is not setup yet */</div><div class='ctx'> </div><div class='del'>-	switch (pao-&gt;pci.subsys_device_id) {</div><div class='add'>+	switch (pao-&gt;pci.pci_dev-&gt;subsystem_device) {</div><div class='ctx'> 	case 0x5100:</div><div class='ctx'> 	case 0x5110:	/* ASI5100 revB or higher with C6711D */</div><div class='del'>-	case 0x5200:	/* ASI5200 PC_ie version of ASI5100 */</div><div class='add'>+	case 0x5200:	/* ASI5200 PCIe version of ASI5100 */</div><div class='ctx'> 	case 0x6100:</div><div class='ctx'> 	case 0x6200:</div><div class='ctx'> 		boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x6200);</div><div class='hunk'>@@ -707,8 +669,9 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	 * note that bits 4..15 are read-only and so should always return zero,</div><div class='ctx'> 	 * even though we wrote 1 to them</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 1000; i++)</div><div class='del'>-		delay = ioread32(phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+	hpios_delay_micro_seconds(1000);</div><div class='add'>+	delay = ioread32(phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+</div><div class='ctx'> 	if (delay != dw2040_reset) {</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR, "INIT_PCI2040 %x %x\n", dw2040_reset,</div><div class='ctx'> 			delay);</div><div class='hunk'>@@ -741,8 +704,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	dw2040_reset = dw2040_reset &amp; (~0x00000008);</div><div class='ctx'> 	iowrite32(dw2040_reset, phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='ctx'> 	/*delay to allow DSP to get going */</div><div class='del'>-	for (i = 0; i &lt; 100; i++)</div><div class='del'>-		delay = ioread32(phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+	hpios_delay_micro_seconds(100);</div><div class='ctx'> </div><div class='ctx'> 	/* loop through all DSPs, downloading DSP code */</div><div class='ctx'> 	for (dsp_index = 0; dsp_index &lt; phw-&gt;num_dsp; dsp_index++) {</div><div class='hunk'>@@ -781,27 +743,27 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			 */</div><div class='ctx'> 			/* bypass PLL */</div><div class='ctx'> 			hpi_write_word(pdo, 0x01B7C100, 0x0000);</div><div class='del'>-			for (i = 0; i &lt; 100; i++)</div><div class='del'>-				delay = ioread32(phw-&gt;dw2040_HPICSR +</div><div class='del'>-					HPI_RESET);</div><div class='add'>+			hpios_delay_micro_seconds(100);</div><div class='ctx'> </div><div class='ctx'> 			/*  ** use default of PLL  x7 ** */</div><div class='ctx'> 			/* EMIF = 225/3=75MHz */</div><div class='ctx'> 			hpi_write_word(pdo, 0x01B7C120, 0x8002);</div><div class='add'>+			hpios_delay_micro_seconds(100);</div><div class='add'>+</div><div class='ctx'> 			/* peri = 225/2 */</div><div class='ctx'> 			hpi_write_word(pdo, 0x01B7C11C, 0x8001);</div><div class='add'>+			hpios_delay_micro_seconds(100);</div><div class='add'>+</div><div class='ctx'> 			/* cpu  = 225/1 */</div><div class='ctx'> 			hpi_write_word(pdo, 0x01B7C118, 0x8000);</div><div class='del'>-			/* ~200us delay */</div><div class='del'>-			for (i = 0; i &lt; 2000; i++)</div><div class='del'>-				delay = ioread32(phw-&gt;dw2040_HPICSR +</div><div class='del'>-					HPI_RESET);</div><div class='add'>+</div><div class='add'>+			/* ~2ms delay */</div><div class='add'>+			hpios_delay_micro_seconds(2000);</div><div class='add'>+</div><div class='ctx'> 			/* PLL not bypassed */</div><div class='ctx'> 			hpi_write_word(pdo, 0x01B7C100, 0x0001);</div><div class='del'>-			/* ~200us delay */</div><div class='del'>-			for (i = 0; i &lt; 2000; i++)</div><div class='del'>-				delay = ioread32(phw-&gt;dw2040_HPICSR +</div><div class='del'>-					HPI_RESET);</div><div class='add'>+			/* ~2ms delay */</div><div class='add'>+			hpios_delay_micro_seconds(2000);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* test r/w to internal DSP memory</div><div class='hunk'>@@ -925,9 +887,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* delay a little to allow SDRAM and DSP to "get going" */</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 1000; i++)</div><div class='del'>-			delay = ioread32(phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+		hpios_delay_micro_seconds(1000);</div><div class='ctx'> </div><div class='ctx'> 		/* test access to SDRAM */</div><div class='ctx'> 		{</div><div class='hunk'>@@ -973,11 +933,8 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* write the DSP code down into the DSPs memory */</div><div class='del'>-		/*HpiDspCode_Open(nBootLoadFamily,&amp;DspCode,pdwOsErrorCode); */</div><div class='del'>-		dsp_code.ps_dev = pao-&gt;pci.p_os_data;</div><div class='del'>-</div><div class='del'>-		error = hpi_dsp_code_open(boot_load_family, &amp;dsp_code,</div><div class='del'>-			pos_error_code);</div><div class='add'>+		error = hpi_dsp_code_open(boot_load_family, pao-&gt;pci.pci_dev,</div><div class='add'>+			&amp;dsp_code, pos_error_code);</div><div class='ctx'> </div><div class='ctx'> 		if (error)</div><div class='ctx'> 			return error;</div><div class='hunk'>@@ -1071,8 +1028,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 		/* step 3. Start code by sending interrupt */</div><div class='ctx'> 		iowrite32(0x00030003, pdo-&gt;prHPI_control);</div><div class='del'>-		for (i = 0; i &lt; 10000; i++)</div><div class='del'>-			delay = ioread32(phw-&gt;dw2040_HPICSR + HPI_RESET);</div><div class='add'>+		hpios_delay_micro_seconds(10000);</div><div class='ctx'> </div><div class='ctx'> 		/* wait for a non-zero value in hostcmd -</div><div class='ctx'> 		 * indicating initialization is complete</div><div class='hunk'>@@ -1099,7 +1055,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			 * locks up with a bluescreen (NOT GPF or pagefault).</div><div class='ctx'> 			 */</div><div class='ctx'> 			else</div><div class='del'>-				hpios_delay_micro_seconds(1000);</div><div class='add'>+				hpios_delay_micro_seconds(10000);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (timeout == 0)</div><div class='ctx'> 			return HPI6000_ERROR_INIT_NOACK;</div><div class='hunk'>@@ -1130,14 +1086,14 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 				mask = 0xFFFFFF00L;</div><div class='ctx'> 				/* ASI5100 uses AX6 code, */</div><div class='ctx'> 				/* but has no PLD r/w register to test */</div><div class='del'>-				if (HPI_ADAPTER_FAMILY_ASI(pao-&gt;pci.</div><div class='del'>-						subsys_device_id) ==</div><div class='add'>+				if (HPI_ADAPTER_FAMILY_ASI(pao-&gt;pci.pci_dev-&gt;</div><div class='add'>+						subsystem_device) ==</div><div class='ctx'> 					HPI_ADAPTER_FAMILY_ASI(0x5100))</div><div class='ctx'> 					mask = 0x00000000L;</div><div class='ctx'> 				/* ASI5200 uses AX6 code, */</div><div class='ctx'> 				/* but has no PLD r/w register to test */</div><div class='del'>-				if (HPI_ADAPTER_FAMILY_ASI(pao-&gt;pci.</div><div class='del'>-						subsys_device_id) ==</div><div class='add'>+				if (HPI_ADAPTER_FAMILY_ASI(pao-&gt;pci.pci_dev-&gt;</div><div class='add'>+						subsystem_device) ==</div><div class='ctx'> 					HPI_ADAPTER_FAMILY_ASI(0x5200))</div><div class='ctx'> 					mask = 0x00000000L;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1202,7 +1158,7 @@ static u32 hpi_read_word(struct dsp_obj *pdo, u32 address)</div><div class='ctx'> 	u32 data = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (hpi_set_address(pdo, address))</div><div class='del'>-		return 0;	/*? no way to return error */</div><div class='add'>+		return 0;	/*? No way to return error */</div><div class='ctx'> </div><div class='ctx'> 	/* take care of errata in revB DSP (2.0.1) */</div><div class='ctx'> 	data = ioread32(pdo-&gt;prHPI_data);</div><div class='hunk'>@@ -1251,8 +1207,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,</div><div class='ctx'> static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u16 dsp_index, u32 hpi_address, u32 *source, u32 count)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 time_out = PCI_TIMEOUT;</div><div class='ctx'> 	int c6711_burst_size = 128;</div><div class='ctx'> 	u32 local_hpi_address = hpi_address;</div><div class='hunk'>@@ -1289,15 +1245,14 @@ static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,</div><div class='ctx'> static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u16 dsp_index, u32 hpi_address, u32 *dest, u32 count)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 time_out = PCI_TIMEOUT;</div><div class='ctx'> 	int c6711_burst_size = 16;</div><div class='ctx'> 	u32 local_hpi_address = hpi_address;</div><div class='ctx'> 	int local_count = count;</div><div class='ctx'> 	int xfer_size;</div><div class='ctx'> 	u32 *pdata = dest;</div><div class='del'>-	u32 loop_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (local_count) {</div><div class='ctx'> 		if (local_count &gt; c6711_burst_size)</div><div class='hunk'>@@ -1317,7 +1272,6 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		pdata += xfer_size;</div><div class='ctx'> 		local_hpi_address += sizeof(u32) * xfer_size;</div><div class='ctx'> 		local_count -= xfer_size;</div><div class='del'>-		loop_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (time_out)</div><div class='hunk'>@@ -1329,7 +1283,7 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,</div><div class='ctx'> static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u16 dsp_index, struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 timeout;</div><div class='ctx'> 	u16 ack;</div><div class='hunk'>@@ -1338,10 +1292,6 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u32 *p_data;</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> </div><div class='del'>-	/* does the DSP we are referencing exist? */</div><div class='del'>-	if (dsp_index &gt;= phw-&gt;num_dsp)</div><div class='del'>-		return HPI6000_ERROR_MSG_INVALID_DSP_INDEX;</div><div class='del'>-</div><div class='ctx'> 	ack = hpi6000_wait_dsp_ack(pao, dsp_index, HPI_HIF_IDLE);</div><div class='ctx'> 	if (ack &amp; HPI_HIF_ERROR_MASK) {</div><div class='ctx'> 		pao-&gt;dsp_crashed++;</div><div class='hunk'>@@ -1349,9 +1299,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	}</div><div class='ctx'> 	pao-&gt;dsp_crashed = 0;</div><div class='ctx'> </div><div class='del'>-	/* send the message */</div><div class='del'>-</div><div class='del'>-	/* get the address and size */</div><div class='add'>+	/* get the message address and size */</div><div class='ctx'> 	if (phw-&gt;message_buffer_address_on_dsp == 0) {</div><div class='ctx'> 		timeout = TIMEOUT;</div><div class='ctx'> 		do {</div><div class='hunk'>@@ -1366,10 +1314,9 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	} else</div><div class='ctx'> 		address = phw-&gt;message_buffer_address_on_dsp;</div><div class='ctx'> </div><div class='del'>-	/*        dwLength = sizeof(struct hpi_message); */</div><div class='ctx'> 	length = phm-&gt;size;</div><div class='ctx'> </div><div class='del'>-	/* send it */</div><div class='add'>+	/* send the message */</div><div class='ctx'> 	p_data = (u32 *)phm;</div><div class='ctx'> 	if (hpi6000_dsp_block_write32(pao, dsp_index, address, p_data,</div><div class='ctx'> 			(u16)length / 4))</div><div class='hunk'>@@ -1383,7 +1330,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	if (ack &amp; HPI_HIF_ERROR_MASK)</div><div class='ctx'> 		return HPI6000_ERROR_MSG_RESP_GET_RESP_ACK;</div><div class='ctx'> </div><div class='del'>-	/* get the address and size */</div><div class='add'>+	/* get the response address */</div><div class='ctx'> 	if (phw-&gt;response_buffer_address_on_dsp == 0) {</div><div class='ctx'> 		timeout = TIMEOUT;</div><div class='ctx'> 		do {</div><div class='hunk'>@@ -1405,9 +1352,12 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		length = hpi_read_word(pdo, HPI_HIF_ADDR(length));</div><div class='ctx'> 	} while (hpi6000_check_PCI2040_error_flag(pao, H6READ) &amp;&amp; --timeout);</div><div class='ctx'> 	if (!timeout)</div><div class='del'>-		length = sizeof(struct hpi_response);</div><div class='add'>+		return HPI6000_ERROR_RESP_GET_LEN;</div><div class='add'>+</div><div class='add'>+	if (length &gt; phr-&gt;size)</div><div class='add'>+		return HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;</div><div class='ctx'> </div><div class='del'>-	/* get it */</div><div class='add'>+	/* get the response */</div><div class='ctx'> 	p_data = (u32 *)phr;</div><div class='ctx'> 	if (hpi6000_dsp_block_read32(pao, dsp_index, address, p_data,</div><div class='ctx'> 			(u16)length / 4))</div><div class='hunk'>@@ -1452,8 +1402,8 @@ static short hpi6000_send_data_check_adr(u32 address, u32 length_in_dwords)</div><div class='ctx'> static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 data_sent = 0;</div><div class='ctx'> 	u16 ack;</div><div class='ctx'> 	u32 length, address;</div><div class='hunk'>@@ -1525,8 +1475,8 @@ static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,</div><div class='ctx'> static short hpi6000_get_data(struct hpi_adapter_obj *pao, u16 dsp_index,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 data_got = 0;</div><div class='ctx'> 	u16 ack;</div><div class='ctx'> 	u32 length, address;</div><div class='hunk'>@@ -1589,8 +1539,8 @@ static void hpi6000_send_dsp_interrupt(struct dsp_obj *pdo)</div><div class='ctx'> static short hpi6000_send_host_command(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u16 dsp_index, u32 host_cmd)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 timeout = TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	/* set command */</div><div class='hunk'>@@ -1615,7 +1565,7 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,</div><div class='ctx'> {</div><div class='ctx'> 	u32 hPI_error;</div><div class='ctx'> </div><div class='del'>-	struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* read the error bits from the PCI2040 */</div><div class='ctx'> 	hPI_error = ioread32(phw-&gt;dw2040_HPICSR + HPI_ERROR_REPORT);</div><div class='hunk'>@@ -1635,8 +1585,8 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,</div><div class='ctx'> static short hpi6000_wait_dsp_ack(struct hpi_adapter_obj *pao, u16 dsp_index,</div><div class='ctx'> 	u32 ack_value)</div><div class='ctx'> {</div><div class='del'>-	struct dsp_obj *pdo =</div><div class='del'>-		&amp;(*(struct hpi_hw_obj *)pao-&gt;priv).ado[dsp_index];</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 ack = 0L;</div><div class='ctx'> 	u32 timeout;</div><div class='ctx'> 	u32 hPIC = 0L;</div><div class='hunk'>@@ -1678,7 +1628,7 @@ static short hpi6000_update_control_cache(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm)</div><div class='ctx'> {</div><div class='ctx'> 	const u16 dsp_index = 0;</div><div class='del'>-	struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	struct dsp_obj *pdo = &amp;phw-&gt;ado[dsp_index];</div><div class='ctx'> 	u32 timeout;</div><div class='ctx'> 	u32 cache_dirty_flag;</div><div class='hunk'>@@ -1778,7 +1728,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> {</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> 	u16 dsp_index = 0;</div><div class='del'>-	u16 num_dsp = ((struct hpi_hw_obj *)pao-&gt;priv)-&gt;num_dsp;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	u16 num_dsp = phw-&gt;num_dsp;</div><div class='ctx'> </div><div class='ctx'> 	if (num_dsp &lt; 2)</div><div class='ctx'> 		dsp_index = 0;</div><div class='hunk'>@@ -1803,17 +1754,11 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> 	hpios_dsplock_lock(pao);</div><div class='ctx'> 	error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);</div><div class='ctx'> </div><div class='del'>-	/* maybe an error response */</div><div class='del'>-	if (error) {</div><div class='del'>-		/* something failed in the HPI/DSP interface */</div><div class='del'>-		phr-&gt;error = error;</div><div class='del'>-		/* just the header of the response is valid */</div><div class='del'>-		phr-&gt;size = sizeof(struct hpi_response_header);</div><div class='add'>+	if (error)	/* something failed in the HPI/DSP interface */</div><div class='ctx'> 		goto err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (phr-&gt;error != 0)	/* something failed in the DSP */</div><div class='del'>-		goto err;</div><div class='add'>+	if (phr-&gt;error)	/* something failed in the DSP */</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='ctx'> 	case HPI_OSTREAM_WRITE:</div><div class='hunk'>@@ -1825,21 +1770,30 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> 		error = hpi6000_get_data(pao, dsp_index, phm, phr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_ADAPTER_GET_ASSERT:</div><div class='del'>-		phr-&gt;u.a.adapter_index = 0;	/* dsp 0 default */</div><div class='add'>+		phr-&gt;u.ax.assert.dsp_index = 0;	/* dsp 0 default */</div><div class='ctx'> 		if (num_dsp == 2) {</div><div class='del'>-			if (!phr-&gt;u.a.adapter_type) {</div><div class='add'>+			if (!phr-&gt;u.ax.assert.count) {</div><div class='ctx'> 				/* no assert from dsp 0, check dsp 1 */</div><div class='ctx'> 				error = hpi6000_message_response_sequence(pao,</div><div class='ctx'> 					1, phm, phr);</div><div class='del'>-				phr-&gt;u.a.adapter_index = 1;</div><div class='add'>+				phr-&gt;u.ax.assert.dsp_index = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (error)</div><div class='del'>-		phr-&gt;error = error;</div><div class='del'>-</div><div class='ctx'> err:</div><div class='add'>+	if (error) {</div><div class='add'>+		if (error &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='add'>+			phr-&gt;error = HPI_ERROR_DSP_COMMUNICATION;</div><div class='add'>+			phr-&gt;specific_error = error;</div><div class='add'>+		} else {</div><div class='add'>+			phr-&gt;error = error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* just the header of the response is valid */</div><div class='add'>+		phr-&gt;size = sizeof(struct hpi_response_header);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='ctx'> 	hpios_dsplock_unlock(pao);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/asihpi/hpi6000.h b/sound/pci/asihpi/hpi6000.h<br/>index 4c7d507c0ecd..4a5256a6e4af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6000.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6000.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6000.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi6000.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> Public declarations for DSP Proramming Interface to TI C6701</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c<br/>index 22c5fc625533..c7d7eff86727 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6205.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6205.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6205.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi6205.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  Hardware Programming Interface (HPI) for AudioScience</div><div class='ctx'>  ASI50xx, AS51xx, ASI6xxx, ASI87xx ASI89xx series adapters.</div><div class='hunk'>@@ -38,27 +27,29 @@</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* HPI6205 specific error codes */</div><div class='del'>-#define HPI6205_ERROR_BASE                      1000</div><div class='del'>-/*#define HPI6205_ERROR_MEM_ALLOC 1001 */</div><div class='del'>-#define HPI6205_ERROR_6205_NO_IRQ               1002</div><div class='del'>-#define HPI6205_ERROR_6205_INIT_FAILED          1003</div><div class='del'>-/*#define HPI6205_ERROR_MISSING_DSPCODE 1004 */</div><div class='del'>-#define HPI6205_ERROR_UNKNOWN_PCI_DEVICE        1005</div><div class='del'>-#define HPI6205_ERROR_6205_REG                  1006</div><div class='del'>-#define HPI6205_ERROR_6205_DSPPAGE              1007</div><div class='del'>-#define HPI6205_ERROR_BAD_DSPINDEX              1008</div><div class='del'>-#define HPI6205_ERROR_C6713_HPIC                1009</div><div class='del'>-#define HPI6205_ERROR_C6713_HPIA                1010</div><div class='del'>-#define HPI6205_ERROR_C6713_PLL                 1011</div><div class='del'>-#define HPI6205_ERROR_DSP_INTMEM                1012</div><div class='del'>-#define HPI6205_ERROR_DSP_EXTMEM                1013</div><div class='del'>-#define HPI6205_ERROR_DSP_PLD                   1014</div><div class='add'>+#define HPI6205_ERROR_BASE 1000	/* not actually used anywhere */</div><div class='add'>+</div><div class='add'>+/* operational/messaging errors */</div><div class='ctx'> #define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT     1015</div><div class='ctx'> #define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016</div><div class='del'>-#define HPI6205_ERROR_6205_EEPROM               1017</div><div class='del'>-#define HPI6205_ERROR_DSP_EMIF                  1018</div><div class='ctx'> </div><div class='del'>-#define hpi6205_error(dsp_index, err) (err)</div><div class='add'>+/* initialization/bootload errors */</div><div class='add'>+#define HPI6205_ERROR_6205_NO_IRQ       1002</div><div class='add'>+#define HPI6205_ERROR_6205_INIT_FAILED  1003</div><div class='add'>+#define HPI6205_ERROR_6205_REG          1006</div><div class='add'>+#define HPI6205_ERROR_6205_DSPPAGE      1007</div><div class='add'>+#define HPI6205_ERROR_C6713_HPIC        1009</div><div class='add'>+#define HPI6205_ERROR_C6713_HPIA        1010</div><div class='add'>+#define HPI6205_ERROR_C6713_PLL         1011</div><div class='add'>+#define HPI6205_ERROR_DSP_INTMEM        1012</div><div class='add'>+#define HPI6205_ERROR_DSP_EXTMEM        1013</div><div class='add'>+#define HPI6205_ERROR_DSP_PLD           1014</div><div class='add'>+#define HPI6205_ERROR_6205_EEPROM       1017</div><div class='add'>+#define HPI6205_ERROR_DSP_EMIF1         1018</div><div class='add'>+#define HPI6205_ERROR_DSP_EMIF2         1019</div><div class='add'>+#define HPI6205_ERROR_DSP_EMIF3         1020</div><div class='add'>+#define HPI6205_ERROR_DSP_EMIF4         1021</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* for C6205 PCI i/f */</div><div class='ctx'> /* Host Status Register (HSR) bitfields */</div><div class='hunk'>@@ -128,9 +119,6 @@ struct hpi_hw_obj {</div><div class='ctx'> 	u32 outstream_host_buffer_size[HPI_MAX_STREAMS];</div><div class='ctx'> </div><div class='ctx'> 	struct consistent_dma_area h_control_cache;</div><div class='del'>-	struct consistent_dma_area h_async_event_buffer;</div><div class='del'>-/*      struct hpi_control_cache_single *pControlCache; */</div><div class='del'>-	struct hpi_async_event *p_async_event_buffer;</div><div class='ctx'> 	struct hpi_control_cache *p_cache;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -156,14 +144,17 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> </div><div class='ctx'> static void subsys_create_adapter(struct hpi_message *phm,</div><div class='ctx'> 	struct hpi_response *phr);</div><div class='del'>-static void subsys_delete_adapter(struct hpi_message *phm,</div><div class='del'>-	struct hpi_response *phr);</div><div class='add'>+static void adapter_delete(struct hpi_adapter_obj *pao,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr);</div><div class='ctx'> </div><div class='ctx'> static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	u32 *pos_error_code);</div><div class='ctx'> </div><div class='ctx'> static void delete_adapter_obj(struct hpi_adapter_obj *pao);</div><div class='ctx'> </div><div class='add'>+static int adapter_irq_query_and_clear(struct hpi_adapter_obj *pao,</div><div class='add'>+	u32 message);</div><div class='add'>+</div><div class='ctx'> static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr);</div><div class='ctx'> </div><div class='hunk'>@@ -208,8 +199,8 @@ static void instream_start(struct hpi_adapter_obj *pao,</div><div class='ctx'> static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='ctx'> 	u32 address);</div><div class='ctx'> </div><div class='del'>-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='del'>-	u32 address, u32 data);</div><div class='add'>+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,</div><div class='add'>+	int dsp_index, u32 address, u32 data);</div><div class='ctx'> </div><div class='ctx'> static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	int dsp_index);</div><div class='hunk'>@@ -227,25 +218,13 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index);</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)</div><div class='add'>+static void subsys_message(struct hpi_adapter_obj *pao,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-</div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='del'>-	case HPI_SUBSYS_OPEN:</div><div class='del'>-	case HPI_SUBSYS_CLOSE:</div><div class='del'>-	case HPI_SUBSYS_GET_INFO:</div><div class='del'>-	case HPI_SUBSYS_DRIVER_UNLOAD:</div><div class='del'>-	case HPI_SUBSYS_DRIVER_LOAD:</div><div class='del'>-	case HPI_SUBSYS_FIND_ADAPTERS:</div><div class='del'>-		/* messages that should not get here */</div><div class='del'>-		phr-&gt;error = HPI_ERROR_UNIMPLEMENTED;</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='ctx'> 		subsys_create_adapter(phm, phr);</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_SUBSYS_DELETE_ADAPTER:</div><div class='del'>-		subsys_delete_adapter(phm, phr);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -257,15 +236,22 @@ static void control_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	u16 pending_cache_error = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='ctx'> 	case HPI_CONTROL_GET_STATE:</div><div class='ctx'> 		if (pao-&gt;has_control_cache) {</div><div class='del'>-			rmb();	/* make sure we see updates DM_aed from DSP */</div><div class='del'>-			if (hpi_check_control_cache(phw-&gt;p_cache, phm, phr))</div><div class='add'>+			rmb();	/* make sure we see updates DMAed from DSP */</div><div class='add'>+			if (hpi_check_control_cache(phw-&gt;p_cache, phm, phr)) {</div><div class='ctx'> 				break;</div><div class='add'>+			} else if (phm-&gt;u.c.attribute == HPI_METER_PEAK) {</div><div class='add'>+				pending_cache_error =</div><div class='add'>+					HPI_ERROR_CONTROL_CACHING;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='add'>+		if (pending_cache_error &amp;&amp; !phr-&gt;error)</div><div class='add'>+			phr-&gt;error = pending_cache_error;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_GET_INFO:</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='hunk'>@@ -273,7 +259,8 @@ static void control_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	case HPI_CONTROL_SET_STATE:</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='ctx'> 		if (pao-&gt;has_control_cache)</div><div class='del'>-			hpi_sync_control_cache(phw-&gt;p_cache, phm, phr);</div><div class='add'>+			hpi_cmn_control_cache_sync_to_msg(phw-&gt;p_cache, phm,</div><div class='add'>+				phr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='hunk'>@@ -285,6 +272,9 @@ static void adapter_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='add'>+	case HPI_ADAPTER_DELETE:</div><div class='add'>+		adapter_delete(pao, phm, phr);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -296,9 +286,9 @@ static void outstream_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (phm-&gt;obj_index &gt;= HPI_MAX_STREAMS) {</div><div class='del'>-		phr-&gt;error = HPI_ERROR_INVALID_STREAM;</div><div class='add'>+		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='ctx'> 		HPI_DEBUG_LOG(WARNING,</div><div class='del'>-			"message referencing invalid stream %d "</div><div class='add'>+			"Message referencing invalid stream %d "</div><div class='ctx'> 			"on adapter index %d\n", phm-&gt;obj_index,</div><div class='ctx'> 			phm-&gt;adapter_index);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -340,9 +330,9 @@ static void instream_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	if (phm-&gt;obj_index &gt;= HPI_MAX_STREAMS) {</div><div class='del'>-		phr-&gt;error = HPI_ERROR_INVALID_STREAM;</div><div class='add'>+		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='ctx'> 		HPI_DEBUG_LOG(WARNING,</div><div class='del'>-			"message referencing invalid stream %d "</div><div class='add'>+			"Message referencing invalid stream %d "</div><div class='ctx'> 			"on adapter index %d\n", phm-&gt;obj_index,</div><div class='ctx'> 			phm-&gt;adapter_index);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -377,59 +367,36 @@ static void instream_message(struct hpi_adapter_obj *pao,</div><div class='ctx'> /** Entry point to this HPI backend</div><div class='ctx'>  * All calls to the HPI start here</div><div class='ctx'>  */</div><div class='del'>-void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)</div><div class='add'>+static</div><div class='add'>+void _HPI_6205(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='add'>+	struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_adapter_obj *pao = NULL;</div><div class='del'>-</div><div class='del'>-	/* subsytem messages are processed by every HPI.</div><div class='del'>-	 * All other messages are ignored unless the adapter index matches</div><div class='del'>-	 * an adapter in the HPI</div><div class='del'>-	 */</div><div class='del'>-	HPI_DEBUG_LOG(DEBUG, "HPI obj=%d, func=%d\n", phm-&gt;object,</div><div class='del'>-		phm-&gt;function);</div><div class='del'>-</div><div class='del'>-	/* if Dsp has crashed then do not communicate with it any more */</div><div class='del'>-	if (phm-&gt;object != HPI_OBJ_SUBSYSTEM) {</div><div class='del'>-		pao = hpi_find_adapter(phm-&gt;adapter_index);</div><div class='del'>-		if (!pao) {</div><div class='del'>-			HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-				" %d,%d refused, for another HPI?\n",</div><div class='del'>-				phm-&gt;object, phm-&gt;function);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((pao-&gt;dsp_crashed &gt;= 10)</div><div class='del'>-			&amp;&amp; (phm-&gt;function != HPI_ADAPTER_DEBUG_READ)) {</div><div class='del'>-			/* allow last resort debug read even after crash */</div><div class='del'>-			hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='del'>-				HPI_ERROR_DSP_HARDWARE);</div><div class='del'>-			HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n",</div><div class='del'>-				phm-&gt;object, phm-&gt;function);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	if (pao &amp;&amp; (pao-&gt;dsp_crashed &gt;= 10)</div><div class='add'>+		&amp;&amp; (phm-&gt;function != HPI_ADAPTER_DEBUG_READ)) {</div><div class='add'>+		/* allow last resort debug read even after crash */</div><div class='add'>+		hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='add'>+			HPI_ERROR_DSP_HARDWARE);</div><div class='add'>+		HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n", phm-&gt;object,</div><div class='add'>+			phm-&gt;function);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init default response  */</div><div class='ctx'> 	if (phm-&gt;function != HPI_SUBSYS_CREATE_ADAPTER)</div><div class='del'>-		hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='del'>-			HPI_ERROR_PROCESSING_MESSAGE);</div><div class='add'>+		phr-&gt;error = HPI_ERROR_PROCESSING_MESSAGE;</div><div class='ctx'> </div><div class='ctx'> 	HPI_DEBUG_LOG(VERBOSE, "start of switch\n");</div><div class='ctx'> 	switch (phm-&gt;type) {</div><div class='del'>-	case HPI_TYPE_MESSAGE:</div><div class='add'>+	case HPI_TYPE_REQUEST:</div><div class='ctx'> 		switch (phm-&gt;object) {</div><div class='ctx'> 		case HPI_OBJ_SUBSYSTEM:</div><div class='del'>-			subsys_message(phm, phr);</div><div class='add'>+			subsys_message(pao, phm, phr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case HPI_OBJ_ADAPTER:</div><div class='del'>-			phr-&gt;size =</div><div class='del'>-				sizeof(struct hpi_response_header) +</div><div class='del'>-				sizeof(struct hpi_adapter_res);</div><div class='ctx'> 			adapter_message(pao, phm, phr);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HPI_OBJ_CONTROLEX:</div><div class='ctx'> 		case HPI_OBJ_CONTROL:</div><div class='ctx'> 			control_message(pao, phm, phr);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -454,11 +421,31 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)</div><div class='add'>+{</div><div class='add'>+	struct hpi_adapter_obj *pao = NULL;</div><div class='add'>+</div><div class='add'>+	if (phm-&gt;object != HPI_OBJ_SUBSYSTEM) {</div><div class='add'>+		/* normal messages must have valid adapter index */</div><div class='add'>+		pao = hpi_find_adapter(phm-&gt;adapter_index);</div><div class='add'>+	} else {</div><div class='add'>+		/* subsys messages don't address an adapter */</div><div class='add'>+		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pao)</div><div class='add'>+		_HPI_6205(pao, phm, phr);</div><div class='add'>+	else</div><div class='add'>+		hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='add'>+			HPI_ERROR_BAD_ADAPTER_NUMBER);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* SUBSYSTEM */</div><div class='ctx'> </div><div class='ctx'> /** Create an adapter object and initialise it based on resource information</div><div class='del'>- * passed in in the message</div><div class='add'>+ * passed in the message</div><div class='ctx'>  * *** NOTE - you cannot use this function AND the FindAdapters function at the</div><div class='ctx'>  * same time, the application must use only one of them to get the adapters ***</div><div class='ctx'>  */</div><div class='hunk'>@@ -474,51 +461,43 @@ static void subsys_create_adapter(struct hpi_message *phm,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ao, 0, sizeof(ao));</div><div class='ctx'> </div><div class='del'>-	/* this HPI only creates adapters for TI/PCI devices */</div><div class='del'>-	if (phm-&gt;u.s.resource.bus_type != HPI_BUS_PCI)</div><div class='del'>-		return;</div><div class='del'>-	if (phm-&gt;u.s.resource.r.pci-&gt;vendor_id != HPI_PCI_VENDOR_ID_TI)</div><div class='del'>-		return;</div><div class='del'>-	if (phm-&gt;u.s.resource.r.pci-&gt;device_id != HPI_PCI_DEV_ID_DSP6205)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);</div><div class='ctx'> 	if (!ao.priv) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_MEMORY_ALLOC;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ao.pci = *phm-&gt;u.s.resource.r.pci;</div><div class='ctx'> 	err = create_adapter_obj(&amp;ao, &amp;os_error_code);</div><div class='del'>-	if (!err)</div><div class='del'>-		err = hpi_add_adapter(&amp;ao);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		phr-&gt;u.s.data = os_error_code;</div><div class='ctx'> 		delete_adapter_obj(&amp;ao);</div><div class='del'>-		phr-&gt;error = err;</div><div class='add'>+		if (err &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='add'>+			phr-&gt;error = HPI_ERROR_DSP_BOOTLOAD;</div><div class='add'>+			phr-&gt;specific_error = err;</div><div class='add'>+		} else {</div><div class='add'>+			phr-&gt;error = err;</div><div class='add'>+		}</div><div class='add'>+		phr-&gt;u.s.data = os_error_code;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phr-&gt;u.s.aw_adapter_list[ao.index] = ao.adapter_type;</div><div class='add'>+	phr-&gt;u.s.adapter_type = ao.type;</div><div class='ctx'> 	phr-&gt;u.s.adapter_index = ao.index;</div><div class='del'>-	phr-&gt;u.s.num_adapters++;</div><div class='ctx'> 	phr-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** delete an adapter - required by WDM driver */</div><div class='del'>-static void subsys_delete_adapter(struct hpi_message *phm,</div><div class='del'>-	struct hpi_response *phr)</div><div class='add'>+static void adapter_delete(struct hpi_adapter_obj *pao,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_adapter_obj *pao;</div><div class='ctx'> 	struct hpi_hw_obj *phw;</div><div class='ctx'> </div><div class='del'>-	pao = hpi_find_adapter(phm-&gt;adapter_index);</div><div class='ctx'> 	if (!pao) {</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	phw = (struct hpi_hw_obj *)pao-&gt;priv;</div><div class='add'>+	phw = pao-&gt;priv;</div><div class='ctx'> 	/* reset adapter h/w */</div><div class='ctx'> 	/* Reset C6713 #1 */</div><div class='ctx'> 	boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 0);</div><div class='hunk'>@@ -526,6 +505,7 @@ static void subsys_delete_adapter(struct hpi_message *phm,</div><div class='ctx'> 	iowrite32(C6205_HDCR_WARMRESET, phw-&gt;prHDCR);</div><div class='ctx'> </div><div class='ctx'> 	delete_adapter_obj(pao);</div><div class='add'>+	hpi_delete_adapter(pao);</div><div class='ctx'> 	phr-&gt;error = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -538,10 +518,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	struct bus_master_interface *interface;</div><div class='ctx'> 	u32 phys_addr;</div><div class='del'>-#ifndef HPI6205_NO_HSR_POLL</div><div class='del'>-	u32 time_out = HPI6205_TIMEOUT;</div><div class='del'>-	u32 temp1;</div><div class='del'>-#endif</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='hunk'>@@ -566,7 +542,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 	if (hpios_locked_mem_alloc(&amp;phw-&gt;h_locked_mem,</div><div class='ctx'> 			sizeof(struct bus_master_interface),</div><div class='del'>-			pao-&gt;pci.p_os_data))</div><div class='add'>+			pao-&gt;pci.pci_dev))</div><div class='ctx'> 		phw-&gt;p_interface_buffer = NULL;</div><div class='ctx'> 	else if (hpios_locked_mem_get_virt_addr(&amp;phw-&gt;h_locked_mem,</div><div class='ctx'> 			(void *)&amp;phw-&gt;p_interface_buffer))</div><div class='hunk'>@@ -582,58 +558,39 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = adapter_boot_load_dsp(pao, pos_error_code);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "DSP code load failed\n");</div><div class='ctx'> 		/* no need to clean up as SubSysCreateAdapter */</div><div class='ctx'> 		/* calls DeleteAdapter on error. */</div><div class='ctx'> 		return err;</div><div class='del'>-</div><div class='add'>+	}</div><div class='ctx'> 	HPI_DEBUG_LOG(INFO, "load DSP code OK\n");</div><div class='ctx'> </div><div class='ctx'> 	/* allow boot load even if mem alloc wont work */</div><div class='ctx'> 	if (!phw-&gt;p_interface_buffer)</div><div class='del'>-		return hpi6205_error(0, HPI_ERROR_MEMORY_ALLOC);</div><div class='add'>+		return HPI_ERROR_MEMORY_ALLOC;</div><div class='ctx'> </div><div class='ctx'> 	interface = phw-&gt;p_interface_buffer;</div><div class='ctx'> </div><div class='del'>-#ifndef HPI6205_NO_HSR_POLL</div><div class='del'>-	/* wait for first interrupt indicating the DSP init is done */</div><div class='del'>-	time_out = HPI6205_TIMEOUT * 10;</div><div class='del'>-	temp1 = 0;</div><div class='del'>-	while (((temp1 &amp; C6205_HSR_INTSRC) == 0) &amp;&amp; --time_out)</div><div class='del'>-		temp1 = ioread32(phw-&gt;prHSR);</div><div class='del'>-</div><div class='del'>-	if (temp1 &amp; C6205_HSR_INTSRC)</div><div class='del'>-		HPI_DEBUG_LOG(INFO,</div><div class='del'>-			"interrupt confirming DSP code running OK\n");</div><div class='del'>-	else {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR,</div><div class='del'>-			"timed out waiting for interrupt "</div><div class='del'>-			"confirming DSP code running\n");</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_NO_IRQ);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset the interrupt */</div><div class='del'>-	iowrite32(C6205_HSR_INTSRC, phw-&gt;prHSR);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* make sure the DSP has started ok */</div><div class='ctx'> 	if (!wait_dsp_ack(phw, H620_HIF_RESET, HPI6205_TIMEOUT * 10)) {</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR, "timed out waiting reset state \n");</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_INIT_FAILED);</div><div class='add'>+		return HPI6205_ERROR_6205_INIT_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Note that *pao, *phw are zeroed after allocation,</div><div class='ctx'> 	 * so pointers and flags are NULL by default.</div><div class='ctx'> 	 * Allocate bus mastering control cache buffer and tell the DSP about it</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (interface-&gt;control_cache.number_of_controls) {</div><div class='del'>-		void *p_control_cache_virtual;</div><div class='add'>+		u8 *p_control_cache_virtual;</div><div class='ctx'> </div><div class='ctx'> 		err = hpios_locked_mem_alloc(&amp;phw-&gt;h_control_cache,</div><div class='ctx'> 			interface-&gt;control_cache.size_in_bytes,</div><div class='del'>-			pao-&gt;pci.p_os_data);</div><div class='add'>+			pao-&gt;pci.pci_dev);</div><div class='ctx'> 		if (!err)</div><div class='ctx'> 			err = hpios_locked_mem_get_virt_addr(&amp;phw-&gt;</div><div class='del'>-				h_control_cache, &amp;p_control_cache_virtual);</div><div class='add'>+				h_control_cache,</div><div class='add'>+				(void *)&amp;p_control_cache_virtual);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			memset(p_control_cache_virtual, 0,</div><div class='ctx'> 				interface-&gt;control_cache.size_in_bytes);</div><div class='hunk'>@@ -642,8 +599,10 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 				hpi_alloc_control_cache(interface-&gt;</div><div class='ctx'> 				control_cache.number_of_controls,</div><div class='ctx'> 				interface-&gt;control_cache.size_in_bytes,</div><div class='del'>-				(struct hpi_control_cache_info *)</div><div class='ctx'> 				p_control_cache_virtual);</div><div class='add'>+</div><div class='add'>+			if (!phw-&gt;p_cache)</div><div class='add'>+				err = HPI_ERROR_MEMORY_ALLOC;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			err = hpios_locked_mem_get_phys_addr(&amp;phw-&gt;</div><div class='hunk'>@@ -660,96 +619,64 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			pao-&gt;has_control_cache = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	/* allocate bus mastering async buffer and tell the DSP about it */</div><div class='del'>-	if (interface-&gt;async_buffer.b.size) {</div><div class='del'>-		err = hpios_locked_mem_alloc(&amp;phw-&gt;h_async_event_buffer,</div><div class='del'>-			interface-&gt;async_buffer.b.size *</div><div class='del'>-			sizeof(struct hpi_async_event), pao-&gt;pci.p_os_data);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = hpios_locked_mem_get_virt_addr</div><div class='del'>-				(&amp;phw-&gt;h_async_event_buffer, (void *)</div><div class='del'>-				&amp;phw-&gt;p_async_event_buffer);</div><div class='del'>-		if (!err)</div><div class='del'>-			memset((void *)phw-&gt;p_async_event_buffer, 0,</div><div class='del'>-				interface-&gt;async_buffer.b.size *</div><div class='del'>-				sizeof(struct hpi_async_event));</div><div class='del'>-		if (!err) {</div><div class='del'>-			err = hpios_locked_mem_get_phys_addr</div><div class='del'>-				(&amp;phw-&gt;h_async_event_buffer, &amp;phys_addr);</div><div class='del'>-			interface-&gt;async_buffer.physical_address32 =</div><div class='del'>-				phys_addr;</div><div class='del'>-		}</div><div class='del'>-		if (err) {</div><div class='del'>-			if (hpios_locked_mem_valid(&amp;phw-&gt;</div><div class='del'>-					h_async_event_buffer)) {</div><div class='del'>-				hpios_locked_mem_free</div><div class='del'>-					(&amp;phw-&gt;h_async_event_buffer);</div><div class='del'>-				phw-&gt;p_async_event_buffer = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	send_dsp_command(phw, H620_HIF_IDLE);</div><div class='ctx'> </div><div class='ctx'> 	{</div><div class='del'>-		struct hpi_message hM;</div><div class='del'>-		struct hpi_response hR;</div><div class='del'>-		u32 max_streams;</div><div class='add'>+		struct hpi_message hm;</div><div class='add'>+		struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n");</div><div class='del'>-		memset(&amp;hM, 0, sizeof(hM));</div><div class='del'>-		hM.type = HPI_TYPE_MESSAGE;</div><div class='del'>-		hM.size = sizeof(hM);</div><div class='del'>-		hM.object = HPI_OBJ_ADAPTER;</div><div class='del'>-		hM.function = HPI_ADAPTER_GET_INFO;</div><div class='del'>-		hM.adapter_index = 0;</div><div class='del'>-		memset(&amp;hR, 0, sizeof(hR));</div><div class='del'>-		hR.size = sizeof(hR);</div><div class='del'>-</div><div class='del'>-		err = message_response_sequence(pao, &amp;hM, &amp;hR);</div><div class='add'>+		memset(&amp;hm, 0, sizeof(hm));</div><div class='add'>+		/* wAdapterIndex == version == 0 */</div><div class='add'>+		hm.type = HPI_TYPE_REQUEST;</div><div class='add'>+		hm.size = sizeof(hm);</div><div class='add'>+		hm.object = HPI_OBJ_ADAPTER;</div><div class='add'>+		hm.function = HPI_ADAPTER_GET_INFO;</div><div class='add'>+</div><div class='add'>+		memset(&amp;hr, 0, sizeof(hr));</div><div class='add'>+		hr.size = sizeof(hr);</div><div class='add'>+</div><div class='add'>+		err = message_response_sequence(pao, &amp;hm, &amp;hr);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			HPI_DEBUG_LOG(ERROR, "message transport error %d\n",</div><div class='ctx'> 				err);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		if (hR.error)</div><div class='del'>-			return hR.error;</div><div class='del'>-</div><div class='del'>-		pao-&gt;adapter_type = hR.u.a.adapter_type;</div><div class='del'>-		pao-&gt;index = hR.u.a.adapter_index;</div><div class='add'>+		if (hr.error)</div><div class='add'>+			return hr.error;</div><div class='ctx'> </div><div class='del'>-		max_streams = hR.u.a.num_outstreams + hR.u.a.num_instreams;</div><div class='del'>-</div><div class='del'>-		hpios_locked_mem_prepare((max_streams * 6) / 10, max_streams,</div><div class='del'>-			65536, pao-&gt;pci.p_os_data);</div><div class='add'>+		pao-&gt;type = hr.u.ax.info.adapter_type;</div><div class='add'>+		pao-&gt;index = hr.u.ax.info.adapter_index;</div><div class='ctx'> </div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE,</div><div class='ctx'> 			"got adapter info type %x index %d serial %d\n",</div><div class='del'>-			hR.u.a.adapter_type, hR.u.a.adapter_index,</div><div class='del'>-			hR.u.a.serial_number);</div><div class='add'>+			hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index,</div><div class='add'>+			hr.u.ax.info.serial_number);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pao-&gt;open = 0;	/* upon creation the adapter is closed */</div><div class='add'>+	if (phw-&gt;p_cache)</div><div class='add'>+		phw-&gt;p_cache-&gt;adap_idx = pao-&gt;index;</div><div class='ctx'> </div><div class='ctx'> 	HPI_DEBUG_LOG(INFO, "bootload DSP OK\n");</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	pao-&gt;irq_query_and_clear = adapter_irq_query_and_clear;</div><div class='add'>+	pao-&gt;instream_host_buffer_status =</div><div class='add'>+		phw-&gt;p_interface_buffer-&gt;instream_host_buffer_status;</div><div class='add'>+	pao-&gt;outstream_host_buffer_status =</div><div class='add'>+		phw-&gt;p_interface_buffer-&gt;outstream_host_buffer_status;</div><div class='add'>+</div><div class='add'>+	return hpi_add_adapter(pao);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** Free memory areas allocated by adapter</div><div class='del'>- * this routine is called from SubSysDeleteAdapter,</div><div class='add'>+ * this routine is called from AdapterDelete,</div><div class='ctx'>   * and SubSysCreateAdapter if duplicate index</div><div class='ctx'> */</div><div class='ctx'> static void delete_adapter_obj(struct hpi_adapter_obj *pao)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_hw_obj *phw;</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	phw = pao-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (hpios_locked_mem_valid(&amp;phw-&gt;h_async_event_buffer)) {</div><div class='del'>-		hpios_locked_mem_free(&amp;phw-&gt;h_async_event_buffer);</div><div class='del'>-		phw-&gt;p_async_event_buffer = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (hpios_locked_mem_valid(&amp;phw-&gt;h_control_cache)) {</div><div class='ctx'> 		hpios_locked_mem_free(&amp;phw-&gt;h_control_cache);</div><div class='ctx'> 		hpi_free_control_cache(phw-&gt;p_cache);</div><div class='hunk'>@@ -773,11 +700,25 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao)</div><div class='ctx'> 				[i]);</div><div class='ctx'> 			phw-&gt;outstream_host_buffer_size[i] = 0;</div><div class='ctx'> 		}</div><div class='add'>+	kfree(phw);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	hpios_locked_mem_unprepare(pao-&gt;pci.p_os_data);</div><div class='add'>+/*****************************************************************************/</div><div class='add'>+/* Adapter functions */</div><div class='add'>+static int adapter_irq_query_and_clear(struct hpi_adapter_obj *pao,</div><div class='add'>+	u32 message)</div><div class='add'>+{</div><div class='add'>+	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='add'>+	u32 hsr = 0;</div><div class='ctx'> </div><div class='del'>-	hpi_delete_adapter(pao);</div><div class='del'>-	kfree(phw);</div><div class='add'>+	hsr = ioread32(phw-&gt;prHSR);</div><div class='add'>+	if (hsr &amp; C6205_HSR_INTSRC) {</div><div class='add'>+		/* reset the interrupt from the DSP */</div><div class='add'>+		iowrite32(C6205_HSR_INTSRC, phw-&gt;prHSR);</div><div class='add'>+		return HPI_IRQ_MIXER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return HPI_IRQ_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -822,7 +763,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 		err = hpios_locked_mem_alloc(&amp;phw-&gt;outstream_host_buffers</div><div class='ctx'> 			[phm-&gt;obj_index], phm-&gt;u.d.u.buffer.buffer_size,</div><div class='del'>-			pao-&gt;pci.p_os_data);</div><div class='add'>+			pao-&gt;pci.pci_dev);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			phr-&gt;error = HPI_ERROR_INVALID_DATASIZE;</div><div class='hunk'>@@ -859,7 +800,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		if (phm-&gt;u.d.u.buffer.buffer_size &amp; (phm-&gt;u.d.u.buffer.</div><div class='ctx'> 				buffer_size - 1)) {</div><div class='ctx'> 			HPI_DEBUG_LOG(ERROR,</div><div class='del'>-				"buffer size must be 2^N not %d\n",</div><div class='add'>+				"Buffer size must be 2^N not %d\n",</div><div class='ctx'> 				phm-&gt;u.d.u.buffer.buffer_size);</div><div class='ctx'> 			phr-&gt;error = HPI_ERROR_INVALID_DATASIZE;</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -870,9 +811,10 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			obj_index];</div><div class='ctx'> 		status-&gt;samples_processed = 0;</div><div class='ctx'> 		status-&gt;stream_state = HPI_STATE_STOPPED;</div><div class='del'>-		status-&gt;dSP_index = 0;</div><div class='del'>-		status-&gt;host_index = status-&gt;dSP_index;</div><div class='add'>+		status-&gt;dsp_index = 0;</div><div class='add'>+		status-&gt;host_index = status-&gt;dsp_index;</div><div class='ctx'> 		status-&gt;size_in_bytes = phm-&gt;u.d.u.buffer.buffer_size;</div><div class='add'>+		status-&gt;auxiliary_data_available = 0;</div><div class='ctx'> </div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='ctx'> </div><div class='hunk'>@@ -944,7 +886,7 @@ static void outstream_host_buffer_free(struct hpi_adapter_obj *pao,</div><div class='ctx'> static u32 outstream_get_space_available(struct hpi_hostbuffer_status *status)</div><div class='ctx'> {</div><div class='ctx'> 	return status-&gt;size_in_bytes - (status-&gt;host_index -</div><div class='del'>-		status-&gt;dSP_index);</div><div class='add'>+		status-&gt;dsp_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void outstream_write(struct hpi_adapter_obj *pao,</div><div class='hunk'>@@ -964,51 +906,6 @@ static void outstream_write(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	hpi_init_response(phr, phm-&gt;object, phm-&gt;function, 0);</div><div class='ctx'> 	status = &amp;interface-&gt;outstream_host_buffer_status[phm-&gt;obj_index];</div><div class='ctx'> </div><div class='del'>-	if (phw-&gt;flag_outstream_just_reset[phm-&gt;obj_index]) {</div><div class='del'>-		/* First OutStremWrite() call following reset will write data to the</div><div class='del'>-		   adapter's buffers, reducing delay before stream can start. The DSP</div><div class='del'>-		   takes care of setting the stream data format using format information</div><div class='del'>-		   embedded in phm.</div><div class='del'>-		 */</div><div class='del'>-		int partial_write = 0;</div><div class='del'>-		unsigned int original_size = 0;</div><div class='del'>-</div><div class='del'>-		phw-&gt;flag_outstream_just_reset[phm-&gt;obj_index] = 0;</div><div class='del'>-</div><div class='del'>-		/* Send the first buffer to the DSP the old way. */</div><div class='del'>-		/* Limit size of first transfer - */</div><div class='del'>-		/* expect that this will not usually be triggered. */</div><div class='del'>-		if (phm-&gt;u.d.u.data.data_size &gt; HPI6205_SIZEOF_DATA) {</div><div class='del'>-			partial_write = 1;</div><div class='del'>-			original_size = phm-&gt;u.d.u.data.data_size;</div><div class='del'>-			phm-&gt;u.d.u.data.data_size = HPI6205_SIZEOF_DATA;</div><div class='del'>-		}</div><div class='del'>-		/* write it */</div><div class='del'>-		phm-&gt;function = HPI_OSTREAM_WRITE;</div><div class='del'>-		hw_message(pao, phm, phr);</div><div class='del'>-</div><div class='del'>-		if (phr-&gt;error)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* update status information that the DSP would typically</div><div class='del'>-		 * update (and will update next time the DSP</div><div class='del'>-		 * buffer update task reads data from the host BBM buffer)</div><div class='del'>-		 */</div><div class='del'>-		status-&gt;auxiliary_data_available = phm-&gt;u.d.u.data.data_size;</div><div class='del'>-		status-&gt;host_index += phm-&gt;u.d.u.data.data_size;</div><div class='del'>-		status-&gt;dSP_index += phm-&gt;u.d.u.data.data_size;</div><div class='del'>-</div><div class='del'>-		/* if we did a full write, we can return from here. */</div><div class='del'>-		if (!partial_write)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* tweak buffer parameters and let the rest of the */</div><div class='del'>-		/* buffer land in internal BBM buffer */</div><div class='del'>-		phm-&gt;u.d.u.data.data_size =</div><div class='del'>-			original_size - HPI6205_SIZEOF_DATA;</div><div class='del'>-		phm-&gt;u.d.u.data.pb_data += HPI6205_SIZEOF_DATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	space_available = outstream_get_space_available(status);</div><div class='ctx'> 	if (space_available &lt; phm-&gt;u.d.u.data.data_size) {</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_DATASIZE;</div><div class='hunk'>@@ -1045,6 +942,24 @@ static void outstream_write(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		memcpy(p_bbm_data, p_app_data + l_first_write,</div><div class='ctx'> 			phm-&gt;u.d.u.data.data_size - l_first_write);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * This version relies on the DSP code triggering an OStream buffer</div><div class='add'>+	 * update immediately following a SET_FORMAT call. The host has</div><div class='add'>+	 * already written data into the BBM buffer, but the DSP won't know</div><div class='add'>+	 * about it until dwHostIndex is adjusted.</div><div class='add'>+	 */</div><div class='add'>+	if (phw-&gt;flag_outstream_just_reset[phm-&gt;obj_index]) {</div><div class='add'>+		/* Format can only change after reset. Must tell DSP. */</div><div class='add'>+		u16 function = phm-&gt;function;</div><div class='add'>+		phw-&gt;flag_outstream_just_reset[phm-&gt;obj_index] = 0;</div><div class='add'>+		phm-&gt;function = HPI_OSTREAM_SET_FORMAT;</div><div class='add'>+		hw_message(pao, phm, phr);	/* send the format to the DSP */</div><div class='add'>+		phm-&gt;function = function;</div><div class='add'>+		if (phr-&gt;error)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	status-&gt;host_index += phm-&gt;u.d.u.data.data_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1130,7 +1045,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 		err = hpios_locked_mem_alloc(&amp;phw-&gt;instream_host_buffers[phm-&gt;</div><div class='ctx'> 				obj_index], phm-&gt;u.d.u.buffer.buffer_size,</div><div class='del'>-			pao-&gt;pci.p_os_data);</div><div class='add'>+			pao-&gt;pci.pci_dev);</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			phr-&gt;error = HPI_ERROR_INVALID_DATASIZE;</div><div class='hunk'>@@ -1161,7 +1076,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		if (phm-&gt;u.d.u.buffer.buffer_size &amp; (phm-&gt;u.d.u.buffer.</div><div class='ctx'> 				buffer_size - 1)) {</div><div class='ctx'> 			HPI_DEBUG_LOG(ERROR,</div><div class='del'>-				"buffer size must be 2^N not %d\n",</div><div class='add'>+				"Buffer size must be 2^N not %d\n",</div><div class='ctx'> 				phm-&gt;u.d.u.buffer.buffer_size);</div><div class='ctx'> 			phr-&gt;error = HPI_ERROR_INVALID_DATASIZE;</div><div class='ctx'> 			return;</div><div class='hunk'>@@ -1173,11 +1088,13 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			obj_index];</div><div class='ctx'> 		status-&gt;samples_processed = 0;</div><div class='ctx'> 		status-&gt;stream_state = HPI_STATE_STOPPED;</div><div class='del'>-		status-&gt;dSP_index = 0;</div><div class='del'>-		status-&gt;host_index = status-&gt;dSP_index;</div><div class='add'>+		status-&gt;dsp_index = 0;</div><div class='add'>+		status-&gt;host_index = status-&gt;dsp_index;</div><div class='ctx'> 		status-&gt;size_in_bytes = phm-&gt;u.d.u.buffer.buffer_size;</div><div class='add'>+		status-&gt;auxiliary_data_available = 0;</div><div class='ctx'> </div><div class='ctx'> 		hw_message(pao, phm, phr);</div><div class='add'>+</div><div class='ctx'> 		if (phr-&gt;error</div><div class='ctx'> 			&amp;&amp; hpios_locked_mem_valid(&amp;phw-&gt;</div><div class='ctx'> 				instream_host_buffers[phm-&gt;obj_index])) {</div><div class='hunk'>@@ -1253,7 +1170,7 @@ static void instream_start(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> static u32 instream_get_bytes_available(struct hpi_hostbuffer_status *status)</div><div class='ctx'> {</div><div class='del'>-	return status-&gt;dSP_index - status-&gt;host_index;</div><div class='add'>+	return status-&gt;dsp_index - status-&gt;host_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void instream_read(struct hpi_adapter_obj *pao,</div><div class='hunk'>@@ -1342,33 +1259,37 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	struct dsp_code dsp_code;</div><div class='ctx'> 	u16 boot_code_id[HPI6205_MAX_FILES_TO_LOAD];</div><div class='del'>-	u16 firmware_id = pao-&gt;pci.subsys_device_id;</div><div class='ctx'> 	u32 temp;</div><div class='ctx'> 	int dsp = 0, i = 0;</div><div class='ctx'> 	u16 err = 0;</div><div class='ctx'> </div><div class='ctx'> 	boot_code_id[0] = HPI_ADAPTER_ASI(0x6205);</div><div class='ctx'> </div><div class='del'>-	/* special cases where firmware_id != subsys ID */</div><div class='del'>-	switch (firmware_id) {</div><div class='add'>+	boot_code_id[1] = pao-&gt;pci.pci_dev-&gt;subsystem_device;</div><div class='add'>+	boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(boot_code_id[1]);</div><div class='add'>+</div><div class='add'>+	/* fix up cases where bootcode id[1] != subsys id */</div><div class='add'>+	switch (boot_code_id[1]) {</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x5000):</div><div class='del'>-		boot_code_id[0] = firmware_id;</div><div class='del'>-		firmware_id = 0;</div><div class='add'>+		boot_code_id[0] = boot_code_id[1];</div><div class='add'>+		boot_code_id[1] = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x5300):</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x5400):</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x6300):</div><div class='del'>-		firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6400);</div><div class='add'>+		boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6400);</div><div class='ctx'> 		break;</div><div class='add'>+	case HPI_ADAPTER_FAMILY_ASI(0x5500):</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x5600):</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x6500):</div><div class='del'>-		firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6600);</div><div class='add'>+		boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6600);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_ADAPTER_FAMILY_ASI(0x8800):</div><div class='del'>-		firmware_id = HPI_ADAPTER_FAMILY_ASI(0x8900);</div><div class='add'>+		boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x8900);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	boot_code_id[1] = firmware_id;</div><div class='ctx'> </div><div class='ctx'> 	/* reset DSP by writing a 1 to the WARMRESET bit */</div><div class='ctx'> 	temp = C6205_HDCR_WARMRESET;</div><div class='hunk'>@@ -1379,7 +1300,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	temp = ioread32(phw-&gt;prHSR);</div><div class='ctx'> 	if ((temp &amp; (C6205_HSR_CFGERR | C6205_HSR_EEREAD)) !=</div><div class='ctx'> 		C6205_HSR_EEREAD)</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_EEPROM);</div><div class='add'>+		return HPI6205_ERROR_6205_EEPROM;</div><div class='ctx'> 	temp |= 0x04;</div><div class='ctx'> 	/* disable PINTA interrupt */</div><div class='ctx'> 	iowrite32(temp, phw-&gt;prHSR);</div><div class='hunk'>@@ -1387,27 +1308,27 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	/* check control register reports PCI boot mode */</div><div class='ctx'> 	temp = ioread32(phw-&gt;prHDCR);</div><div class='ctx'> 	if (!(temp &amp; C6205_HDCR_PCIBOOT))</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_REG);</div><div class='add'>+		return HPI6205_ERROR_6205_REG;</div><div class='ctx'> </div><div class='del'>-	/* try writing a couple of numbers to the DSP page register */</div><div class='add'>+	/* try writing a few numbers to the DSP page register */</div><div class='ctx'> 	/* and reading them back. */</div><div class='del'>-	temp = 1;</div><div class='add'>+	temp = 3;</div><div class='ctx'> 	iowrite32(temp, phw-&gt;prDSPP);</div><div class='ctx'> 	if ((temp | C6205_DSPP_MAP1) != ioread32(phw-&gt;prDSPP))</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);</div><div class='add'>+		return HPI6205_ERROR_6205_DSPPAGE;</div><div class='ctx'> 	temp = 2;</div><div class='ctx'> 	iowrite32(temp, phw-&gt;prDSPP);</div><div class='ctx'> 	if ((temp | C6205_DSPP_MAP1) != ioread32(phw-&gt;prDSPP))</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);</div><div class='del'>-	temp = 3;</div><div class='add'>+		return HPI6205_ERROR_6205_DSPPAGE;</div><div class='add'>+	temp = 1;</div><div class='ctx'> 	iowrite32(temp, phw-&gt;prDSPP);</div><div class='ctx'> 	if ((temp | C6205_DSPP_MAP1) != ioread32(phw-&gt;prDSPP))</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);</div><div class='add'>+		return HPI6205_ERROR_6205_DSPPAGE;</div><div class='ctx'> 	/* reset DSP page to the correct number */</div><div class='ctx'> 	temp = 0;</div><div class='ctx'> 	iowrite32(temp, phw-&gt;prDSPP);</div><div class='ctx'> 	if ((temp | C6205_DSPP_MAP1) != ioread32(phw-&gt;prDSPP))</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);</div><div class='add'>+		return HPI6205_ERROR_6205_DSPPAGE;</div><div class='ctx'> 	phw-&gt;dsp_page = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* release 6713 from reset before 6205 is bootloaded.</div><div class='hunk'>@@ -1417,17 +1338,21 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	if (boot_code_id[1] != 0) {</div><div class='ctx'> 		/* DSP 1 is a C6713 */</div><div class='ctx'> 		/* CLKX0 &lt;- '1' release the C6205 bootmode pulldowns */</div><div class='del'>-		boot_loader_write_mem32(pao, 0, (0x018C0024L), 0x00002202);</div><div class='add'>+		boot_loader_write_mem32(pao, 0, 0x018C0024, 0x00002202);</div><div class='ctx'> 		hpios_delay_micro_seconds(100);</div><div class='ctx'> 		/* Reset the 6713 #1 - revB */</div><div class='ctx'> 		boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 0);</div><div class='del'>-</div><div class='del'>-		/* dummy read every 4 words for 6205 advisory 1.4.4 */</div><div class='del'>-		boot_loader_read_mem32(pao, 0, 0);</div><div class='del'>-</div><div class='add'>+		/* value of bit 3 is unknown after DSP reset, other bits shoudl be 0 */</div><div class='add'>+		if (0 != (boot_loader_read_mem32(pao, 0,</div><div class='add'>+					(C6205_BAR0_TIMER1_CTL)) &amp; ~8))</div><div class='add'>+			return HPI6205_ERROR_6205_REG;</div><div class='ctx'> 		hpios_delay_micro_seconds(100);</div><div class='add'>+</div><div class='ctx'> 		/* Release C6713 from reset - revB */</div><div class='ctx'> 		boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 4);</div><div class='add'>+		if (4 != (boot_loader_read_mem32(pao, 0,</div><div class='add'>+					(C6205_BAR0_TIMER1_CTL)) &amp; ~8))</div><div class='add'>+			return HPI6205_ERROR_6205_REG;</div><div class='ctx'> 		hpios_delay_micro_seconds(100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1453,9 +1378,8 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		/* write the DSP code down into the DSPs memory */</div><div class='del'>-		dsp_code.ps_dev = pao-&gt;pci.p_os_data;</div><div class='del'>-		err = hpi_dsp_code_open(boot_code_id[dsp], &amp;dsp_code,</div><div class='del'>-			pos_error_code);</div><div class='add'>+		err = hpi_dsp_code_open(boot_code_id[dsp], pao-&gt;pci.pci_dev,</div><div class='add'>+			&amp;dsp_code, pos_error_code);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1482,10 +1406,8 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 			for (i = 0; i &lt; (int)length; i++) {</div><div class='del'>-				err = boot_loader_write_mem32(pao, dsp,</div><div class='del'>-					address, *pcode);</div><div class='del'>-				if (err)</div><div class='del'>-					break;</div><div class='add'>+				boot_loader_write_mem32(pao, dsp, address,</div><div class='add'>+					*pcode);</div><div class='ctx'> 				/* dummy read every 4 words */</div><div class='ctx'> 				/* for 6205 advisory 1.4.4 */</div><div class='ctx'> 				if (i % 4 == 0)</div><div class='hunk'>@@ -1559,7 +1481,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,</div><div class='ctx'> 		host_mailbox_address_on_dsp = 0x80000000;</div><div class='ctx'> 		while ((physicalPC_iaddress != physicalPC_iaddress_verify)</div><div class='ctx'> 			&amp;&amp; time_out--) {</div><div class='del'>-			err = boot_loader_write_mem32(pao, 0,</div><div class='add'>+			boot_loader_write_mem32(pao, 0,</div><div class='ctx'> 				host_mailbox_address_on_dsp,</div><div class='ctx'> 				physicalPC_iaddress);</div><div class='ctx'> 			physicalPC_iaddress_verify =</div><div class='hunk'>@@ -1629,11 +1551,10 @@ static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='del'>-	u32 address, u32 data)</div><div class='add'>+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,</div><div class='add'>+	int dsp_index, u32 address, u32 data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='del'>-	u16 err = 0;</div><div class='ctx'> 	__iomem u32 *p_data;</div><div class='ctx'> 	/*      u32 dwVerifyData=0; */</div><div class='ctx'> </div><div class='hunk'>@@ -1673,15 +1594,11 @@ static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='ctx'> </div><div class='ctx'> 		/* dummy read every 4 words for 6205 advisory 1.4.4 */</div><div class='ctx'> 		boot_loader_read_mem32(pao, 0, 0);</div><div class='del'>-	} else</div><div class='del'>-		err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);</div><div class='del'>-	return err;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> {</div><div class='del'>-	u16 err = 0;</div><div class='del'>-</div><div class='ctx'> 	if (dsp_index == 0) {</div><div class='ctx'> 		u32 setting;</div><div class='ctx'> </div><div class='hunk'>@@ -1709,8 +1626,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, 0x01800008, setting);</div><div class='ctx'> 		if (setting != boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x01800008))</div><div class='del'>-			return hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_DSP_EMIF);</div><div class='add'>+			return HPI6205_ERROR_DSP_EMIF1;</div><div class='ctx'> </div><div class='ctx'> 		/* EMIF CE1 setup - 32 bit async. This is 6713 #1 HPI, */</div><div class='ctx'> 		/* which occupies D15..0. 6713 starts at 27MHz, so need */</div><div class='hunk'>@@ -1723,8 +1639,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, 0x01800004, setting);</div><div class='ctx'> 		if (setting != boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x01800004))</div><div class='del'>-			return hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_DSP_EMIF);</div><div class='add'>+			return HPI6205_ERROR_DSP_EMIF2;</div><div class='ctx'> </div><div class='ctx'> 		/* EMIF CE2 setup - 32 bit async. This is 6713 #2 HPI, */</div><div class='ctx'> 		/* which occupies D15..0. 6713 starts at 27MHz, so need */</div><div class='hunk'>@@ -1736,8 +1651,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, 0x01800010, setting);</div><div class='ctx'> 		if (setting != boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x01800010))</div><div class='del'>-			return hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_DSP_EMIF);</div><div class='add'>+			return HPI6205_ERROR_DSP_EMIF3;</div><div class='ctx'> </div><div class='ctx'> 		/* EMIF CE3 setup - 32 bit async. */</div><div class='ctx'> 		/* This is the PLD on the ASI5000 cards only */</div><div class='hunk'>@@ -1748,8 +1662,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, 0x01800014, setting);</div><div class='ctx'> 		if (setting != boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x01800014))</div><div class='del'>-			return hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_DSP_EMIF);</div><div class='add'>+			return HPI6205_ERROR_DSP_EMIF4;</div><div class='ctx'> </div><div class='ctx'> 		/* set EMIF SDRAM control for 2Mx32 SDRAM (512x32x4 bank) */</div><div class='ctx'> 		/*  need to use this else DSP code crashes? */</div><div class='hunk'>@@ -1773,12 +1686,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		read_data =</div><div class='ctx'> 			0xFFF7 &amp; boot_loader_read_mem32(pao, 0, HPICL_ADDR);</div><div class='ctx'> 		if (write_data != read_data) {</div><div class='del'>-			err = hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_C6713_HPIC);</div><div class='ctx'> 			HPI_DEBUG_LOG(ERROR, "HPICL %x %x\n", write_data,</div><div class='ctx'> 				read_data);</div><div class='del'>-</div><div class='del'>-			return err;</div><div class='add'>+			return HPI6205_ERROR_C6713_HPIC;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* HPIA - walking ones test */</div><div class='ctx'> 		write_data = 1;</div><div class='hunk'>@@ -1796,11 +1706,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 						HPIAH_ADDR))</div><div class='ctx'> 				&lt;&lt; 16);</div><div class='ctx'> 			if (read_data != write_data) {</div><div class='del'>-				err = hpi6205_error(dsp_index,</div><div class='del'>-					HPI6205_ERROR_C6713_HPIA);</div><div class='ctx'> 				HPI_DEBUG_LOG(ERROR, "HPIA %x %x\n",</div><div class='ctx'> 					write_data, read_data);</div><div class='del'>-				return err;</div><div class='add'>+				return HPI6205_ERROR_C6713_HPIA;</div><div class='ctx'> 			}</div><div class='ctx'> 			write_data = write_data &lt;&lt; 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1845,30 +1753,81 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 		/* PLL should not be bypassed! */</div><div class='ctx'> 		if ((boot_loader_read_mem32(pao, dsp_index, 0x01B7C100) &amp; 0xF)</div><div class='ctx'> 			!= 0x0001) {</div><div class='del'>-			err = hpi6205_error(dsp_index,</div><div class='del'>-				HPI6205_ERROR_C6713_PLL);</div><div class='del'>-			return err;</div><div class='add'>+			return HPI6205_ERROR_C6713_PLL;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* setup C67x EMIF  (note this is the only use of</div><div class='ctx'> 		   BAR1 via BootLoader_WriteMem32) */</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_GCTL,</div><div class='ctx'> 			0x000034A8);</div><div class='add'>+</div><div class='add'>+		/* EMIF CE0 setup - 2Mx32 Sync DRAM</div><div class='add'>+		   31..28       Wr setup</div><div class='add'>+		   27..22       Wr strobe</div><div class='add'>+		   21..20       Wr hold</div><div class='add'>+		   19..16       Rd setup</div><div class='add'>+		   15..14       -</div><div class='add'>+		   13..8        Rd strobe</div><div class='add'>+		   7..4         MTYPE   0011            Sync DRAM 32bits</div><div class='add'>+		   3            Wr hold MSB</div><div class='add'>+		   2..0         Rd hold</div><div class='add'>+		 */</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_CE0,</div><div class='ctx'> 			0x00000030);</div><div class='add'>+</div><div class='add'>+		/* EMIF SDRAM Extension</div><div class='add'>+		   0x00</div><div class='add'>+		   31-21        0000b 0000b 000b</div><div class='add'>+		   20           WR2RD = 2cycles-1  = 1b</div><div class='add'>+</div><div class='add'>+		   19-18        WR2DEAC = 3cycle-1 = 10b</div><div class='add'>+		   17           WR2WR = 2cycle-1   = 1b</div><div class='add'>+		   16-15        R2WDQM = 4cycle-1  = 11b</div><div class='add'>+		   14-12        RD2WR = 6cycles-1  = 101b</div><div class='add'>+</div><div class='add'>+		   11-10        RD2DEAC = 4cycle-1 = 11b</div><div class='add'>+		   9            RD2RD = 2cycle-1   = 1b</div><div class='add'>+		   8-7          THZP = 3cycle-1    = 10b</div><div class='add'>+		   6-5          TWR  = 2cycle-1    = 01b (tWR = 17ns)</div><div class='add'>+		   4            TRRD = 2cycle      = 0b  (tRRD = 14ns)</div><div class='add'>+		   3-1          TRAS = 5cycle-1    = 100b (Tras=42ns)</div><div class='add'>+		   1            CAS latency = 3cyc = 1b</div><div class='add'>+		   (for Micron 2M32-7 operating at 100MHz)</div><div class='add'>+		 */</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMEXT,</div><div class='ctx'> 			0x001BDF29);</div><div class='add'>+</div><div class='add'>+		/* EMIF SDRAM control - set up for a 2Mx32 SDRAM (512x32x4 bank)</div><div class='add'>+		   31           -       0b       -</div><div class='add'>+		   30           SDBSZ   1b              4 bank</div><div class='add'>+		   29..28       SDRSZ   00b             11 row address pins</div><div class='add'>+</div><div class='add'>+		   27..26       SDCSZ   01b             8 column address pins</div><div class='add'>+		   25           RFEN    1b              refersh enabled</div><div class='add'>+		   24           INIT    1b              init SDRAM!</div><div class='add'>+</div><div class='add'>+		   23..20       TRCD    0001b                   (Trcd/Tcyc)-1 = (20/10)-1 = 1</div><div class='add'>+</div><div class='add'>+		   19..16       TRP     0001b                   (Trp/Tcyc)-1 = (20/10)-1 = 1</div><div class='add'>+</div><div class='add'>+		   15..12       TRC     0110b                   (Trc/Tcyc)-1 = (70/10)-1 = 6</div><div class='add'>+</div><div class='add'>+		   11..0        -       0000b 0000b 0000b</div><div class='add'>+		 */</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMCTL,</div><div class='del'>-			0x47117000);</div><div class='add'>+			0x47116000);</div><div class='add'>+</div><div class='add'>+		/* SDRAM refresh timing</div><div class='add'>+		   Need 4,096 refresh cycles every 64ms = 15.625us = 1562cycles of 100MHz = 0x61A</div><div class='add'>+		 */</div><div class='ctx'> 		boot_loader_write_mem32(pao, dsp_index,</div><div class='ctx'> 			C6713_EMIF_SDRAMTIMING, 0x00000410);</div><div class='ctx'> </div><div class='ctx'> 		hpios_delay_micro_seconds(1000);</div><div class='ctx'> 	} else if (dsp_index == 2) {</div><div class='ctx'> 		/* DSP 2 is a C6713 */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	} else</div><div class='del'>-		err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='hunk'>@@ -1894,7 +1853,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='ctx'> 				test_addr);</div><div class='ctx'> 			if (data != test_data) {</div><div class='ctx'> 				HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-					"memtest error details  "</div><div class='add'>+					"Memtest error details  "</div><div class='ctx'> 					"%08x %08x %08x %i\n", test_addr,</div><div class='ctx'> 					test_data, data, dsp_index);</div><div class='ctx'> 				return 1;	/* error */</div><div class='hunk'>@@ -1914,7 +1873,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,</div><div class='ctx'> 		data = boot_loader_read_mem32(pao, dsp_index, test_addr);</div><div class='ctx'> 		if (data != test_data) {</div><div class='ctx'> 			HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-				"memtest error details  "</div><div class='add'>+				"Memtest error details  "</div><div class='ctx'> 				"%08x %08x %08x %i\n", test_addr, test_data,</div><div class='ctx'> 				data, dsp_index);</div><div class='ctx'> 			return 1;	/* error */</div><div class='hunk'>@@ -1944,8 +1903,8 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			/* 64K data mem */</div><div class='ctx'> 			err = boot_loader_test_memory(pao, dsp_index,</div><div class='ctx'> 				0x80000000, 0x10000);</div><div class='del'>-	} else if ((dsp_index == 1) || (dsp_index == 2)) {</div><div class='del'>-		/* DSP 1&amp;2 are a C6713 */</div><div class='add'>+	} else if (dsp_index == 1) {</div><div class='add'>+		/* DSP 1 is a C6713 */</div><div class='ctx'> 		/* 192K internal mem */</div><div class='ctx'> 		err = boot_loader_test_memory(pao, dsp_index, 0x00000000,</div><div class='ctx'> 			0x30000);</div><div class='hunk'>@@ -1953,11 +1912,10 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,</div><div class='ctx'> 			/* 64K internal mem / L2 cache */</div><div class='ctx'> 			err = boot_loader_test_memory(pao, dsp_index,</div><div class='ctx'> 				0x00030000, 0x10000);</div><div class='del'>-	} else</div><div class='del'>-		return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_INTMEM);</div><div class='add'>+		return HPI6205_ERROR_DSP_INTMEM;</div><div class='ctx'> 	else</div><div class='ctx'> 		return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1970,24 +1928,23 @@ static u16 boot_loader_test_external_memory(struct hpi_adapter_obj *pao,</div><div class='ctx'> </div><div class='ctx'> 	if (dsp_index == 0) {</div><div class='ctx'> 		/* only test for SDRAM if an ASI5000 card */</div><div class='del'>-		if (pao-&gt;pci.subsys_device_id == 0x5000) {</div><div class='add'>+		if (pao-&gt;pci.pci_dev-&gt;subsystem_device == 0x5000) {</div><div class='ctx'> 			/* DSP 0 is always C6205 */</div><div class='ctx'> 			dRAM_start_address = 0x00400000;</div><div class='ctx'> 			dRAM_size = 0x200000;</div><div class='ctx'> 			/*dwDRAMinc=1024; */</div><div class='ctx'> 		} else</div><div class='ctx'> 			return 0;</div><div class='del'>-	} else if ((dsp_index == 1) || (dsp_index == 2)) {</div><div class='add'>+	} else if (dsp_index == 1) {</div><div class='ctx'> 		/* DSP 1 is a C6713 */</div><div class='ctx'> 		dRAM_start_address = 0x80000000;</div><div class='ctx'> 		dRAM_size = 0x200000;</div><div class='ctx'> 		/*dwDRAMinc=1024; */</div><div class='del'>-	} else</div><div class='del'>-		return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (boot_loader_test_memory(pao, dsp_index, dRAM_start_address,</div><div class='ctx'> 			dRAM_size))</div><div class='del'>-		return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_EXTMEM);</div><div class='add'>+		return HPI6205_ERROR_DSP_EXTMEM;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1996,28 +1953,25 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index)</div><div class='ctx'> 	u32 data = 0;</div><div class='ctx'> 	if (dsp_index == 0) {</div><div class='ctx'> 		/* only test for DSP0 PLD on ASI5000 card */</div><div class='del'>-		if (pao-&gt;pci.subsys_device_id == 0x5000) {</div><div class='add'>+		if (pao-&gt;pci.pci_dev-&gt;subsystem_device == 0x5000) {</div><div class='ctx'> 			/* PLD is located at CE3=0x03000000 */</div><div class='ctx'> 			data = boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x03000008);</div><div class='ctx'> 			if ((data &amp; 0xF) != 0x5)</div><div class='del'>-				return hpi6205_error(dsp_index,</div><div class='del'>-					HPI6205_ERROR_DSP_PLD);</div><div class='add'>+				return HPI6205_ERROR_DSP_PLD;</div><div class='ctx'> 			data = boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x0300000C);</div><div class='ctx'> 			if ((data &amp; 0xF) != 0xA)</div><div class='del'>-				return hpi6205_error(dsp_index,</div><div class='del'>-					HPI6205_ERROR_DSP_PLD);</div><div class='add'>+				return HPI6205_ERROR_DSP_PLD;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (dsp_index == 1) {</div><div class='ctx'> 		/* DSP 1 is a C6713 */</div><div class='del'>-		if (pao-&gt;pci.subsys_device_id == 0x8700) {</div><div class='add'>+		if (pao-&gt;pci.pci_dev-&gt;subsystem_device == 0x8700) {</div><div class='ctx'> 			/* PLD is located at CE1=0x90000000 */</div><div class='ctx'> 			data = boot_loader_read_mem32(pao, dsp_index,</div><div class='ctx'> 				0x90000010);</div><div class='ctx'> 			if ((data &amp; 0xFF) != 0xAA)</div><div class='del'>-				return hpi6205_error(dsp_index,</div><div class='del'>-					HPI6205_ERROR_DSP_PLD);</div><div class='add'>+				return HPI6205_ERROR_DSP_PLD;</div><div class='ctx'> 			/* 8713 - LED on */</div><div class='ctx'> 			boot_loader_write_mem32(pao, dsp_index, 0x90000000,</div><div class='ctx'> 				0x02);</div><div class='hunk'>@@ -2035,14 +1989,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,</div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	u32 data_transferred = 0;</div><div class='ctx'> 	u16 err = 0;</div><div class='del'>-#ifndef HPI6205_NO_HSR_POLL</div><div class='del'>-	u32 time_out;</div><div class='del'>-#endif</div><div class='ctx'> 	u32 temp2;</div><div class='ctx'> 	struct bus_master_interface *interface = phw-&gt;p_interface_buffer;</div><div class='ctx'> </div><div class='ctx'> 	if (!p_data)</div><div class='del'>-		return HPI_ERROR_INVALID_DATA_TRANSFER;</div><div class='add'>+		return HPI_ERROR_INVALID_DATA_POINTER;</div><div class='ctx'> </div><div class='ctx'> 	data_size &amp;= ~3L;	/* round data_size down to nearest 4 bytes */</div><div class='ctx'> </div><div class='hunk'>@@ -2062,14 +2013,10 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,</div><div class='ctx'> </div><div class='ctx'> 		interface-&gt;transfer_size_in_bytes = this_copy;</div><div class='ctx'> </div><div class='del'>-#ifdef HPI6205_NO_HSR_POLL</div><div class='ctx'> 		/* DSP must change this back to nOperation */</div><div class='ctx'> 		interface-&gt;dsp_ack = H620_HIF_IDLE;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 		send_dsp_command(phw, operation);</div><div class='ctx'> </div><div class='del'>-#ifdef HPI6205_NO_HSR_POLL</div><div class='ctx'> 		temp2 = wait_dsp_ack(phw, operation, HPI6205_TIMEOUT);</div><div class='ctx'> 		HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",</div><div class='ctx'> 			HPI6205_TIMEOUT - temp2, this_copy);</div><div class='hunk'>@@ -2077,45 +2024,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,</div><div class='ctx'> 		if (!temp2) {</div><div class='ctx'> 			/* timed out */</div><div class='ctx'> 			HPI_DEBUG_LOG(ERROR,</div><div class='del'>-				"timed out waiting for " "state %d got %d\n",</div><div class='add'>+				"Timed out waiting for " "state %d got %d\n",</div><div class='ctx'> 				operation, interface-&gt;dsp_ack);</div><div class='ctx'> </div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-#else</div><div class='del'>-		/* spin waiting on the result */</div><div class='del'>-		time_out = HPI6205_TIMEOUT;</div><div class='del'>-		temp2 = 0;</div><div class='del'>-		while ((temp2 == 0) &amp;&amp; time_out--) {</div><div class='del'>-			/* give 16k bus mastering transfer time to happen */</div><div class='del'>-			/*(16k / 132Mbytes/s = 122usec) */</div><div class='del'>-			hpios_delay_micro_seconds(20);</div><div class='del'>-			temp2 = ioread32(phw-&gt;prHSR);</div><div class='del'>-			temp2 &amp;= C6205_HSR_INTSRC;</div><div class='del'>-		}</div><div class='del'>-		HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",</div><div class='del'>-			HPI6205_TIMEOUT - time_out, this_copy);</div><div class='del'>-		if (temp2 == C6205_HSR_INTSRC) {</div><div class='del'>-			HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-				"interrupt from HIF &lt;data&gt; OK\n");</div><div class='del'>-			/*</div><div class='del'>-			   if(interface-&gt;dwDspAck != nOperation) {</div><div class='del'>-			   HPI_DEBUG_LOG(DEBUG("interface-&gt;dwDspAck=%d,</div><div class='del'>-			   expected %d \n",</div><div class='del'>-			   interface-&gt;dwDspAck,nOperation);</div><div class='del'>-			   }</div><div class='del'>-			 */</div><div class='del'>-		}</div><div class='del'>-/* need to handle this differently... */</div><div class='del'>-		else {</div><div class='del'>-			HPI_DEBUG_LOG(ERROR,</div><div class='del'>-				"interrupt from HIF &lt;data&gt; BAD\n");</div><div class='del'>-			err = HPI_ERROR_DSP_HARDWARE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* reset the interrupt from the DSP */</div><div class='del'>-		iowrite32(C6205_HSR_INTSRC, phw-&gt;prHSR);</div><div class='del'>-#endif</div><div class='ctx'> 		if (operation == H620_HIF_GET_DATA)</div><div class='ctx'> 			memcpy(&amp;p_data[data_transferred],</div><div class='ctx'> 				(void *)&amp;interface-&gt;u.b_data[0], this_copy);</div><div class='hunk'>@@ -2154,7 +2067,6 @@ static int wait_dsp_ack(struct hpi_hw_obj *phw, int state, int timeout_us)</div><div class='ctx'> static void send_dsp_command(struct hpi_hw_obj *phw, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bus_master_interface *interface = phw-&gt;p_interface_buffer;</div><div class='del'>-</div><div class='ctx'> 	u32 r;</div><div class='ctx'> </div><div class='ctx'> 	interface-&gt;host_cmd = cmd;</div><div class='hunk'>@@ -2172,31 +2084,39 @@ static unsigned int message_count;</div><div class='ctx'> static u16 message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-#ifndef HPI6205_NO_HSR_POLL</div><div class='del'>-	u32 temp2;</div><div class='del'>-#endif</div><div class='ctx'> 	u32 time_out, time_out2;</div><div class='ctx'> 	struct hpi_hw_obj *phw = pao-&gt;priv;</div><div class='ctx'> 	struct bus_master_interface *interface = phw-&gt;p_interface_buffer;</div><div class='ctx'> 	u16 err = 0;</div><div class='ctx'> </div><div class='ctx'> 	message_count++;</div><div class='del'>-	/* Assume buffer of type struct bus_master_interface</div><div class='add'>+	if (phm-&gt;size &gt; sizeof(interface-&gt;u.message_buffer)) {</div><div class='add'>+		phr-&gt;error = HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL;</div><div class='add'>+		phr-&gt;specific_error = sizeof(interface-&gt;u.message_buffer);</div><div class='add'>+		phr-&gt;size = sizeof(struct hpi_response_header);</div><div class='add'>+		HPI_DEBUG_LOG(ERROR,</div><div class='add'>+			"message len %d too big for buffer %zd \n", phm-&gt;size,</div><div class='add'>+			sizeof(interface-&gt;u.message_buffer));</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assume buffer of type struct bus_master_interface_62</div><div class='ctx'> 	   is allocated "noncacheable" */</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {</div><div class='ctx'> 		HPI_DEBUG_LOG(DEBUG, "timeout waiting for idle\n");</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);</div><div class='add'>+		return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;</div><div class='ctx'> 	}</div><div class='del'>-	interface-&gt;u.message_buffer = *phm;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;interface-&gt;u.message_buffer, phm, phm-&gt;size);</div><div class='ctx'> 	/* signal we want a response */</div><div class='ctx'> 	send_dsp_command(phw, H620_HIF_GET_RESP);</div><div class='ctx'> </div><div class='ctx'> 	time_out2 = wait_dsp_ack(phw, H620_HIF_GET_RESP, HPI6205_TIMEOUT);</div><div class='ctx'> </div><div class='del'>-	if (time_out2 == 0) {</div><div class='add'>+	if (!time_out2) {</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR,</div><div class='del'>-			"(%u) timed out waiting for " "GET_RESP state [%x]\n",</div><div class='add'>+			"(%u) Timed out waiting for " "GET_RESP state [%x]\n",</div><div class='ctx'> 			message_count, interface-&gt;dsp_ack);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE,</div><div class='hunk'>@@ -2206,58 +2126,39 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao,</div><div class='ctx'> 	/* spin waiting on HIF interrupt flag (end of msg process) */</div><div class='ctx'> 	time_out = HPI6205_TIMEOUT;</div><div class='ctx'> </div><div class='del'>-#ifndef HPI6205_NO_HSR_POLL</div><div class='del'>-	temp2 = 0;</div><div class='del'>-	while ((temp2 == 0) &amp;&amp; --time_out) {</div><div class='del'>-		temp2 = ioread32(phw-&gt;prHSR);</div><div class='del'>-		temp2 &amp;= C6205_HSR_INTSRC;</div><div class='del'>-		hpios_delay_micro_seconds(1);</div><div class='del'>-	}</div><div class='del'>-	if (temp2 == C6205_HSR_INTSRC) {</div><div class='del'>-		rmb();	/* ensure we see latest value for dsp_ack */</div><div class='del'>-		if ((interface-&gt;dsp_ack != H620_HIF_GET_RESP)) {</div><div class='del'>-			HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-				"(%u)interface-&gt;dsp_ack(0x%x) != "</div><div class='del'>-				"H620_HIF_GET_RESP, t=%u\n", message_count,</div><div class='del'>-				interface-&gt;dsp_ack,</div><div class='del'>-				HPI6205_TIMEOUT - time_out);</div><div class='del'>-		} else {</div><div class='del'>-			HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-				"(%u)int with GET_RESP after %u\n",</div><div class='del'>-				message_count, HPI6205_TIMEOUT - time_out);</div><div class='add'>+	/* read the result */</div><div class='add'>+	if (time_out) {</div><div class='add'>+		if (interface-&gt;u.response_buffer.response.size &lt;= phr-&gt;size)</div><div class='add'>+			memcpy(phr, &amp;interface-&gt;u.response_buffer,</div><div class='add'>+				interface-&gt;u.response_buffer.response.size);</div><div class='add'>+		else {</div><div class='add'>+			HPI_DEBUG_LOG(ERROR,</div><div class='add'>+				"response len %d too big for buffer %d\n",</div><div class='add'>+				interface-&gt;u.response_buffer.response.size,</div><div class='add'>+				phr-&gt;size);</div><div class='add'>+			memcpy(phr, &amp;interface-&gt;u.response_buffer,</div><div class='add'>+				sizeof(struct hpi_response_header));</div><div class='add'>+			phr-&gt;error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;</div><div class='add'>+			phr-&gt;specific_error =</div><div class='add'>+				interface-&gt;u.response_buffer.response.size;</div><div class='add'>+			phr-&gt;size = sizeof(struct hpi_response_header);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* can we do anything else in response to the error ? */</div><div class='del'>-		HPI_DEBUG_LOG(ERROR,</div><div class='del'>-			"interrupt from HIF module BAD (function %x)\n",</div><div class='del'>-			phm-&gt;function);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* reset the interrupt from the DSP */</div><div class='del'>-	iowrite32(C6205_HSR_INTSRC, phw-&gt;prHSR);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* read the result */</div><div class='del'>-	if (time_out != 0)</div><div class='del'>-		*phr = interface-&gt;u.response_buffer;</div><div class='del'>-</div><div class='ctx'> 	/* set interface back to idle */</div><div class='ctx'> 	send_dsp_command(phw, H620_HIF_IDLE);</div><div class='ctx'> </div><div class='del'>-	if ((time_out == 0) || (time_out2 == 0)) {</div><div class='add'>+	if (!time_out || !time_out2) {</div><div class='ctx'> 		HPI_DEBUG_LOG(DEBUG, "something timed out!\n");</div><div class='del'>-		return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_TIMEOUT);</div><div class='add'>+		return HPI6205_ERROR_MSG_RESP_TIMEOUT;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* special case for adapter close - */</div><div class='ctx'> 	/* wait for the DSP to indicate it is idle */</div><div class='ctx'> 	if (phm-&gt;function == HPI_ADAPTER_CLOSE) {</div><div class='ctx'> 		if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {</div><div class='ctx'> 			HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-				"timeout waiting for idle "</div><div class='add'>+				"Timeout waiting for idle "</div><div class='ctx'> 				"(on adapter_close)\n");</div><div class='del'>-			return hpi6205_error(0,</div><div class='del'>-				HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);</div><div class='add'>+			return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	err = hpi_validate_response(phm, phr);</div><div class='hunk'>@@ -2277,7 +2178,13 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> 	/* maybe an error response */</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		/* something failed in the HPI/DSP interface */</div><div class='del'>-		phr-&gt;error = err;</div><div class='add'>+		if (err &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='add'>+			phr-&gt;error = HPI_ERROR_DSP_COMMUNICATION;</div><div class='add'>+			phr-&gt;specific_error = err;</div><div class='add'>+		} else {</div><div class='add'>+			phr-&gt;error = err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		pao-&gt;dsp_crashed++;</div><div class='ctx'> </div><div class='ctx'> 		/* just the header of the response is valid */</div><div class='hunk'>@@ -2302,23 +2209,6 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,</div><div class='ctx'> 			phm-&gt;u.d.u.data.data_size, H620_HIF_GET_DATA);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	case HPI_CONTROL_SET_STATE:</div><div class='del'>-		if (phm-&gt;object == HPI_OBJ_CONTROLEX</div><div class='del'>-			&amp;&amp; phm-&gt;u.cx.attribute == HPI_COBRANET_SET_DATA)</div><div class='del'>-			err = hpi6205_transfer_data(pao,</div><div class='del'>-				phm-&gt;u.cx.u.cobranet_bigdata.pb_data,</div><div class='del'>-				phm-&gt;u.cx.u.cobranet_bigdata.byte_count,</div><div class='del'>-				H620_HIF_SEND_DATA);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HPI_CONTROL_GET_STATE:</div><div class='del'>-		if (phm-&gt;object == HPI_OBJ_CONTROLEX</div><div class='del'>-			&amp;&amp; phm-&gt;u.cx.attribute == HPI_COBRANET_GET_DATA)</div><div class='del'>-			err = hpi6205_transfer_data(pao,</div><div class='del'>-				phm-&gt;u.cx.u.cobranet_bigdata.pb_data,</div><div class='del'>-				phr-&gt;u.cx.u.cobranet_data.byte_count,</div><div class='del'>-				H620_HIF_GET_DATA);</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	phr-&gt;error = err;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/asihpi/hpi6205.h b/sound/pci/asihpi/hpi6205.h<br/>index 1adae0857cda..cc70e99a40e9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6205.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi6205.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi6205.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi6205.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> Host Interface module for an ASI6205 based</div><div class='ctx'> bus mastering PCI adapter.</div><div class='hunk'>@@ -25,9 +14,6 @@ Copyright AudioScience, Inc., 2003</div><div class='ctx'> #ifndef _HPI6205_H_</div><div class='ctx'> #define _HPI6205_H_</div><div class='ctx'> </div><div class='del'>-/* transitional conditional compile shared between host and DSP */</div><div class='del'>-/* #define HPI6205_NO_HSR_POLL */</div><div class='del'>-</div><div class='ctx'> #include "hpi_internal.h"</div><div class='ctx'> </div><div class='ctx'> /***********************************************************</div><div class='hunk'>@@ -73,15 +59,28 @@ The Host located memory buffer that the 6205 will bus master</div><div class='ctx'> in and out of.</div><div class='ctx'> ************************************************************/</div><div class='ctx'> #define HPI6205_SIZEOF_DATA (16*1024)</div><div class='add'>+</div><div class='add'>+struct message_buffer_6205 {</div><div class='add'>+	struct hpi_message message;</div><div class='add'>+	char data[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct response_buffer_6205 {</div><div class='add'>+	struct hpi_response response;</div><div class='add'>+	char data[256];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union buffer_6205 {</div><div class='add'>+	struct message_buffer_6205 message_buffer;</div><div class='add'>+	struct response_buffer_6205 response_buffer;</div><div class='add'>+	u8 b_data[HPI6205_SIZEOF_DATA];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct bus_master_interface {</div><div class='ctx'> 	u32 host_cmd;</div><div class='ctx'> 	u32 dsp_ack;</div><div class='ctx'> 	u32 transfer_size_in_bytes;</div><div class='del'>-	union {</div><div class='del'>-		struct hpi_message message_buffer;</div><div class='del'>-		struct hpi_response response_buffer;</div><div class='del'>-		u8 b_data[HPI6205_SIZEOF_DATA];</div><div class='del'>-	} u;</div><div class='add'>+	union buffer_6205 u;</div><div class='ctx'> 	struct controlcache_6205 control_cache;</div><div class='ctx'> 	struct async_event_buffer_6205 async_buffer;</div><div class='ctx'> 	struct hpi_hostbuffer_status</div><div class='head'>diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h<br/>index 16f502d459de..e569e3b33b8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi_internal.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpi_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi_internal.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2012  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> HPI internal definitions</div><div class='ctx'> </div><div class='hunk'>@@ -25,19 +14,14 @@ HPI internal definitions</div><div class='ctx'> #define _HPI_INTERNAL_H_</div><div class='ctx'> </div><div class='ctx'> #include "hpi.h"</div><div class='add'>+</div><div class='ctx'> /** maximum number of memory regions mapped to an adapter */</div><div class='ctx'> #define HPI_MAX_ADAPTER_MEM_SPACES (2)</div><div class='ctx'> </div><div class='del'>-/* Each OS needs its own hpios.h, or specific define as above */</div><div class='add'>+/* Each OS needs its own hpios.h */</div><div class='ctx'> #include "hpios.h"</div><div class='ctx'> </div><div class='ctx'> /* physical memory allocation */</div><div class='del'>-void hpios_locked_mem_init(void</div><div class='del'>-	);</div><div class='del'>-void hpios_locked_mem_free_all(void</div><div class='del'>-	);</div><div class='del'>-#define hpios_locked_mem_prepare(a, b, c, d);</div><div class='del'>-#define hpios_locked_mem_unprepare(a)</div><div class='ctx'> </div><div class='ctx'> /** Allocate and map an area of locked memory for bus master DMA operations.</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +33,7 @@ HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.</div><div class='ctx'> */</div><div class='ctx'> u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,</div><div class='ctx'> 							   /**&lt; memory handle */</div><div class='del'>-	u32 size, /**&lt; size in bytes to allocate */</div><div class='add'>+	u32 size, /**&lt; Size in bytes to allocate */</div><div class='ctx'> 	struct pci_dev *p_os_reference</div><div class='ctx'> 	/**&lt; OS specific data required for memory allocation */</div><div class='ctx'> 	);</div><div class='hunk'>@@ -69,7 +53,7 @@ If handle is invalid *pPhysicalAddr is set to zero and return 1</div><div class='ctx'> u16 hpios_locked_mem_get_phys_addr(struct consistent_dma_area</div><div class='ctx'> 	*locked_mem_handle, u32 *p_physical_addr);</div><div class='ctx'> </div><div class='del'>-/** Get the CPU address of of memory represented by LockedMemHandle.</div><div class='add'>+/** Get the CPU address of memory represented by LockedMemHandle.</div><div class='ctx'> </div><div class='ctx'> If handle is NULL *ppvVirtualAddr is set to NULL and return 1</div><div class='ctx'> */</div><div class='hunk'>@@ -96,41 +80,6 @@ typedef void hpi_handler_func(struct hpi_message *, struct hpi_response *);</div><div class='ctx'> #define compile_time_assert(cond, msg) \</div><div class='ctx'>     typedef char ASSERT_##msg[(cond) ? 1 : -1]</div><div class='ctx'> </div><div class='del'>-/*/////////////////////////////////////////////////////////////////////////// */</div><div class='del'>-/* Private HPI Entity related definitions                                     */</div><div class='del'>-</div><div class='del'>-#define STR_SIZE_FIELD_MAX 65535U</div><div class='del'>-#define STR_TYPE_FIELD_MAX 255U</div><div class='del'>-#define STR_ROLE_FIELD_MAX 255U</div><div class='del'>-</div><div class='del'>-struct hpi_entity_str {</div><div class='del'>-	u16 size;</div><div class='del'>-	u8 type;</div><div class='del'>-	u8 role;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(_MSC_VER)</div><div class='del'>-#pragma warning(push)</div><div class='del'>-#pragma warning(disable : 4200)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct hpi_entity {</div><div class='del'>-	struct hpi_entity_str header;</div><div class='del'>-#if ! defined(HPI_OS_DSP_C6000) || (defined(HPI_OS_DSP_C6000) &amp;&amp; (__TI_COMPILER_VERSION__ &gt; 6000008))</div><div class='del'>-	/* DSP C6000 compiler v6.0.8 and lower</div><div class='del'>-	   do not support  flexible array member */</div><div class='del'>-	u8 value[];</div><div class='del'>-#else</div><div class='del'>-	/* NOTE! Using sizeof(struct hpi_entity) will give erroneous results */</div><div class='del'>-#define HPI_INTERNAL_WARN_ABOUT_ENTITY_VALUE</div><div class='del'>-	u8 value[1];</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if defined(_MSC_VER)</div><div class='del'>-#pragma warning(pop)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /******************************************* bus types */</div><div class='ctx'> enum HPI_BUSES {</div><div class='ctx'> 	HPI_BUS_ISAPNP = 1,</div><div class='hunk'>@@ -139,206 +88,155 @@ enum HPI_BUSES {</div><div class='ctx'> 	HPI_BUS_NET = 4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum HPI_SUBSYS_OPTIONS {</div><div class='add'>+	/* 0, 256 are invalid, 1..255 reserved for global options */</div><div class='add'>+	HPI_SUBSYS_OPT_NET_ENABLE = 257,</div><div class='add'>+	HPI_SUBSYS_OPT_NET_BROADCAST = 258,</div><div class='add'>+	HPI_SUBSYS_OPT_NET_UNICAST = 259,</div><div class='add'>+	HPI_SUBSYS_OPT_NET_ADDR = 260,</div><div class='add'>+	HPI_SUBSYS_OPT_NET_MASK = 261,</div><div class='add'>+	HPI_SUBSYS_OPT_NET_ADAPTER_ADDRESS_ADD = 262</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** Volume flags</div><div class='add'>+*/</div><div class='add'>+enum HPI_VOLUME_FLAGS {</div><div class='add'>+	/** Set if the volume control is muted */</div><div class='add'>+	HPI_VOLUME_FLAG_MUTED = (1 &lt;&lt; 0),</div><div class='add'>+	/** Set if the volume control has a mute function */</div><div class='add'>+	HPI_VOLUME_FLAG_HAS_MUTE = (1 &lt;&lt; 1),</div><div class='add'>+	/** Set if volume control can do autofading */</div><div class='add'>+	HPI_VOLUME_FLAG_HAS_AUTOFADE = (1 &lt;&lt; 2)</div><div class='add'>+		/* Note Flags &gt;= (1&lt;&lt;8) are for DSP internal use only */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /******************************************* CONTROL ATTRIBUTES ****/</div><div class='ctx'> /* (in order of control type ID */</div><div class='ctx'> </div><div class='ctx'> /* This allows for 255 control types, 256 unique attributes each */</div><div class='del'>-#define HPI_CTL_ATTR(ctl, ai) (HPI_CONTROL_##ctl * 0x100 + ai)</div><div class='add'>+#define HPI_CTL_ATTR(ctl, ai) ((HPI_CONTROL_##ctl &lt;&lt; 8) + ai)</div><div class='ctx'> </div><div class='ctx'> /* Get the sub-index of the attribute for a control type */</div><div class='del'>-#define HPI_CTL_ATTR_INDEX(i) (i&amp;0xff)</div><div class='add'>+#define HPI_CTL_ATTR_INDEX(i) (i &amp; 0xff)</div><div class='ctx'> </div><div class='ctx'> /* Extract the control from the control attribute */</div><div class='del'>-#define HPI_CTL_ATTR_CONTROL(i) (i&gt;&gt;8)</div><div class='del'>-</div><div class='del'>-/* Generic control attributes.  */</div><div class='del'>-</div><div class='del'>-/** Enable a control.</div><div class='del'>-0=disable, 1=enable</div><div class='del'>-\note generic to all mixer plugins?</div><div class='del'>-*/</div><div class='del'>-#define HPI_GENERIC_ENABLE HPI_CTL_ATTR(GENERIC, 1)</div><div class='add'>+#define HPI_CTL_ATTR_CONTROL(i) (i &gt;&gt; 8)</div><div class='ctx'> </div><div class='ctx'> /** Enable event generation for a control.</div><div class='ctx'> 0=disable, 1=enable</div><div class='ctx'> \note generic to all controls that can generate events</div><div class='ctx'> */</div><div class='del'>-#define HPI_GENERIC_EVENT_ENABLE HPI_CTL_ATTR(GENERIC, 2)</div><div class='del'>-</div><div class='del'>-/* Volume Control attributes */</div><div class='del'>-#define HPI_VOLUME_GAIN                 HPI_CTL_ATTR(VOLUME, 1)</div><div class='del'>-#define HPI_VOLUME_AUTOFADE             HPI_CTL_ATTR(VOLUME, 2)</div><div class='del'>-</div><div class='del'>-/** For HPI_ControlQuery() to get the number of channels of a volume control*/</div><div class='del'>-#define HPI_VOLUME_NUM_CHANNELS         HPI_CTL_ATTR(VOLUME, 6)</div><div class='del'>-#define HPI_VOLUME_RANGE                HPI_CTL_ATTR(VOLUME, 10)</div><div class='del'>-</div><div class='del'>-/** Level Control attributes */</div><div class='del'>-#define HPI_LEVEL_GAIN                  HPI_CTL_ATTR(LEVEL, 1)</div><div class='del'>-#define HPI_LEVEL_RANGE                 HPI_CTL_ATTR(LEVEL, 10)</div><div class='del'>-</div><div class='del'>-/* Meter Control attributes */</div><div class='del'>-/** return RMS signal level */</div><div class='del'>-#define HPI_METER_RMS                   HPI_CTL_ATTR(METER, 1)</div><div class='del'>-/** return peak signal level */</div><div class='del'>-#define HPI_METER_PEAK                  HPI_CTL_ATTR(METER, 2)</div><div class='del'>-/** ballistics for ALL rms meters on adapter */</div><div class='del'>-#define HPI_METER_RMS_BALLISTICS        HPI_CTL_ATTR(METER, 3)</div><div class='del'>-/** ballistics for ALL peak meters on adapter */</div><div class='del'>-#define HPI_METER_PEAK_BALLISTICS       HPI_CTL_ATTR(METER, 4)</div><div class='del'>-</div><div class='del'>-/** For HPI_ControlQuery() to get the number of channels of a meter control*/</div><div class='del'>-#define HPI_METER_NUM_CHANNELS          HPI_CTL_ATTR(METER, 5)</div><div class='del'>-</div><div class='del'>-/* Multiplexer control attributes */</div><div class='del'>-#define HPI_MULTIPLEXER_SOURCE          HPI_CTL_ATTR(MULTIPLEXER, 1)</div><div class='del'>-#define HPI_MULTIPLEXER_QUERYSOURCE     HPI_CTL_ATTR(MULTIPLEXER, 2)</div><div class='del'>-</div><div class='del'>-/** AES/EBU transmitter control attributes */</div><div class='del'>-/** AESEBU or SPDIF */</div><div class='del'>-#define HPI_AESEBUTX_FORMAT             HPI_CTL_ATTR(AESEBUTX, 1)</div><div class='del'>-#define HPI_AESEBUTX_SAMPLERATE         HPI_CTL_ATTR(AESEBUTX, 3)</div><div class='del'>-#define HPI_AESEBUTX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBUTX, 4)</div><div class='del'>-#define HPI_AESEBUTX_USERDATA           HPI_CTL_ATTR(AESEBUTX, 5)</div><div class='del'>-</div><div class='del'>-/** AES/EBU receiver control attributes */</div><div class='del'>-#define HPI_AESEBURX_FORMAT             HPI_CTL_ATTR(AESEBURX, 1)</div><div class='del'>-#define HPI_AESEBURX_ERRORSTATUS        HPI_CTL_ATTR(AESEBURX, 2)</div><div class='del'>-#define HPI_AESEBURX_SAMPLERATE         HPI_CTL_ATTR(AESEBURX, 3)</div><div class='del'>-#define HPI_AESEBURX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBURX, 4)</div><div class='del'>-#define HPI_AESEBURX_USERDATA           HPI_CTL_ATTR(AESEBURX, 5)</div><div class='del'>-</div><div class='del'>-/** \defgroup tuner_defs Tuners</div><div class='del'>-\{</div><div class='del'>-*/</div><div class='del'>-/** \defgroup tuner_attrs Tuner control attributes</div><div class='del'>-\{</div><div class='del'>-*/</div><div class='del'>-#define HPI_TUNER_BAND                  HPI_CTL_ATTR(TUNER, 1)</div><div class='del'>-#define HPI_TUNER_FREQ                  HPI_CTL_ATTR(TUNER, 2)</div><div class='del'>-#define HPI_TUNER_LEVEL                 HPI_CTL_ATTR(TUNER, 3)</div><div class='del'>-#define HPI_TUNER_AUDIOMUTE             HPI_CTL_ATTR(TUNER, 4)</div><div class='del'>-/* use TUNER_STATUS instead */</div><div class='del'>-#define HPI_TUNER_VIDEO_STATUS          HPI_CTL_ATTR(TUNER, 5)</div><div class='del'>-#define HPI_TUNER_GAIN                  HPI_CTL_ATTR(TUNER, 6)</div><div class='del'>-#define HPI_TUNER_STATUS                HPI_CTL_ATTR(TUNER, 7)</div><div class='del'>-#define HPI_TUNER_MODE                  HPI_CTL_ATTR(TUNER, 8)</div><div class='del'>-/** RDS data. */</div><div class='del'>-#define HPI_TUNER_RDS                   HPI_CTL_ATTR(TUNER, 9)</div><div class='del'>-/** Audio pre-emphasis. */</div><div class='del'>-#define HPI_TUNER_DEEMPHASIS            HPI_CTL_ATTR(TUNER, 10)</div><div class='del'>-/** HD Radio tuner program control. */</div><div class='del'>-#define HPI_TUNER_PROGRAM               HPI_CTL_ATTR(TUNER, 11)</div><div class='del'>-/** HD Radio tuner digital signal quality. */</div><div class='del'>-#define HPI_TUNER_HDRADIO_SIGNAL_QUALITY        HPI_CTL_ATTR(TUNER, 12)</div><div class='del'>-/** HD Radio SDK firmware version. */</div><div class='del'>-#define HPI_TUNER_HDRADIO_SDK_VERSION   HPI_CTL_ATTR(TUNER, 13)</div><div class='del'>-/** HD Radio DSP firmware version. */</div><div class='del'>-#define HPI_TUNER_HDRADIO_DSP_VERSION   HPI_CTL_ATTR(TUNER, 14)</div><div class='del'>-/** HD Radio signal blend (force analog, or automatic). */</div><div class='del'>-#define HPI_TUNER_HDRADIO_BLEND         HPI_CTL_ATTR(TUNER, 15)</div><div class='del'>-</div><div class='del'>-/** \} */</div><div class='del'>-</div><div class='del'>-/** \defgroup pads_attrs Tuner PADs control attributes</div><div class='del'>-\{</div><div class='del'>-*/</div><div class='del'>-/** The text string containing the station/channel combination. */</div><div class='del'>-#define HPI_PAD_CHANNEL_NAME            HPI_CTL_ATTR(PAD, 1)</div><div class='del'>-/** The text string containing the artist. */</div><div class='del'>-#define HPI_PAD_ARTIST                  HPI_CTL_ATTR(PAD, 2)</div><div class='del'>-/** The text string containing the title. */</div><div class='del'>-#define HPI_PAD_TITLE                   HPI_CTL_ATTR(PAD, 3)</div><div class='del'>-/** The text string containing the comment. */</div><div class='del'>-#define HPI_PAD_COMMENT                 HPI_CTL_ATTR(PAD, 4)</div><div class='del'>-/** The integer containing the PTY code. */</div><div class='del'>-#define HPI_PAD_PROGRAM_TYPE            HPI_CTL_ATTR(PAD, 5)</div><div class='del'>-/** The integer containing the program identification. */</div><div class='del'>-#define HPI_PAD_PROGRAM_ID              HPI_CTL_ATTR(PAD, 6)</div><div class='del'>-/** The integer containing whether traffic information is supported.</div><div class='del'>-Contains either 1 or 0. */</div><div class='del'>-#define HPI_PAD_TA_SUPPORT              HPI_CTL_ATTR(PAD, 7)</div><div class='del'>-/** The integer containing whether traffic announcement is in progress.</div><div class='del'>-Contains either 1 or 0. */</div><div class='del'>-#define HPI_PAD_TA_ACTIVE               HPI_CTL_ATTR(PAD, 8)</div><div class='del'>-/** \} */</div><div class='del'>-/** \} */</div><div class='del'>-</div><div class='del'>-/* VOX control attributes */</div><div class='del'>-#define HPI_VOX_THRESHOLD               HPI_CTL_ATTR(VOX, 1)</div><div class='del'>-</div><div class='del'>-/*?? channel mode used hpi_multiplexer_source attribute == 1 */</div><div class='del'>-#define HPI_CHANNEL_MODE_MODE HPI_CTL_ATTR(CHANNEL_MODE, 1)</div><div class='del'>-</div><div class='del'>-/** \defgroup channel_modes Channel Modes</div><div class='del'>-Used for HPI_ChannelModeSet/Get()</div><div class='del'>-\{</div><div class='add'>+</div><div class='add'>+/** Unique identifiers for every control attribute</div><div class='ctx'> */</div><div class='del'>-/** Left channel out = left channel in, Right channel out = right channel in. */</div><div class='del'>-#define HPI_CHANNEL_MODE_NORMAL                 1</div><div class='del'>-/** Left channel out = right channel in, Right channel out = left channel in. */</div><div class='del'>-#define HPI_CHANNEL_MODE_SWAP                   2</div><div class='del'>-/** Left channel out = left channel in, Right channel out = left channel in. */</div><div class='del'>-#define HPI_CHANNEL_MODE_LEFT_TO_STEREO         3</div><div class='del'>-/** Left channel out = right channel in, Right channel out = right channel in.*/</div><div class='del'>-#define HPI_CHANNEL_MODE_RIGHT_TO_STEREO        4</div><div class='del'>-/** Left channel out = (left channel in + right channel in)/2,</div><div class='del'>-    Right channel out = mute. */</div><div class='del'>-#define HPI_CHANNEL_MODE_STEREO_TO_LEFT         5</div><div class='del'>-/** Left channel out = mute,</div><div class='del'>-    Right channel out = (right channel in + left channel in)/2. */</div><div class='del'>-#define HPI_CHANNEL_MODE_STEREO_TO_RIGHT        6</div><div class='del'>-#define HPI_CHANNEL_MODE_LAST                   6</div><div class='del'>-/** \} */</div><div class='del'>-</div><div class='del'>-/* Bitstream control set attributes */</div><div class='del'>-#define HPI_BITSTREAM_DATA_POLARITY     HPI_CTL_ATTR(BITSTREAM, 1)</div><div class='del'>-#define HPI_BITSTREAM_CLOCK_EDGE        HPI_CTL_ATTR(BITSTREAM, 2)</div><div class='del'>-#define HPI_BITSTREAM_CLOCK_SOURCE      HPI_CTL_ATTR(BITSTREAM, 3)</div><div class='add'>+enum HPI_CONTROL_ATTRIBUTES {</div><div class='add'>+	HPI_GENERIC_ENABLE = HPI_CTL_ATTR(GENERIC, 1),</div><div class='add'>+	HPI_GENERIC_EVENT_ENABLE = HPI_CTL_ATTR(GENERIC, 2),</div><div class='add'>+</div><div class='add'>+	HPI_VOLUME_GAIN = HPI_CTL_ATTR(VOLUME, 1),</div><div class='add'>+	HPI_VOLUME_AUTOFADE = HPI_CTL_ATTR(VOLUME, 2),</div><div class='add'>+	HPI_VOLUME_MUTE = HPI_CTL_ATTR(VOLUME, 3),</div><div class='add'>+	HPI_VOLUME_GAIN_AND_FLAGS = HPI_CTL_ATTR(VOLUME, 4),</div><div class='add'>+	HPI_VOLUME_NUM_CHANNELS = HPI_CTL_ATTR(VOLUME, 6),</div><div class='add'>+	HPI_VOLUME_RANGE = HPI_CTL_ATTR(VOLUME, 10),</div><div class='add'>+</div><div class='add'>+	HPI_METER_RMS = HPI_CTL_ATTR(METER, 1),</div><div class='add'>+	HPI_METER_PEAK = HPI_CTL_ATTR(METER, 2),</div><div class='add'>+	HPI_METER_RMS_BALLISTICS = HPI_CTL_ATTR(METER, 3),</div><div class='add'>+	HPI_METER_PEAK_BALLISTICS = HPI_CTL_ATTR(METER, 4),</div><div class='add'>+	HPI_METER_NUM_CHANNELS = HPI_CTL_ATTR(METER, 5),</div><div class='add'>+</div><div class='add'>+	HPI_MULTIPLEXER_SOURCE = HPI_CTL_ATTR(MULTIPLEXER, 1),</div><div class='add'>+	HPI_MULTIPLEXER_QUERYSOURCE = HPI_CTL_ATTR(MULTIPLEXER, 2),</div><div class='add'>+</div><div class='add'>+	HPI_AESEBUTX_FORMAT = HPI_CTL_ATTR(AESEBUTX, 1),</div><div class='add'>+	HPI_AESEBUTX_SAMPLERATE = HPI_CTL_ATTR(AESEBUTX, 3),</div><div class='add'>+	HPI_AESEBUTX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBUTX, 4),</div><div class='add'>+	HPI_AESEBUTX_USERDATA = HPI_CTL_ATTR(AESEBUTX, 5),</div><div class='add'>+</div><div class='add'>+	HPI_AESEBURX_FORMAT = HPI_CTL_ATTR(AESEBURX, 1),</div><div class='add'>+	HPI_AESEBURX_ERRORSTATUS = HPI_CTL_ATTR(AESEBURX, 2),</div><div class='add'>+	HPI_AESEBURX_SAMPLERATE = HPI_CTL_ATTR(AESEBURX, 3),</div><div class='add'>+	HPI_AESEBURX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBURX, 4),</div><div class='add'>+	HPI_AESEBURX_USERDATA = HPI_CTL_ATTR(AESEBURX, 5),</div><div class='add'>+</div><div class='add'>+	HPI_LEVEL_GAIN = HPI_CTL_ATTR(LEVEL, 1),</div><div class='add'>+	HPI_LEVEL_RANGE = HPI_CTL_ATTR(LEVEL, 10),</div><div class='add'>+</div><div class='add'>+	HPI_TUNER_BAND = HPI_CTL_ATTR(TUNER, 1),</div><div class='add'>+	HPI_TUNER_FREQ = HPI_CTL_ATTR(TUNER, 2),</div><div class='add'>+	HPI_TUNER_LEVEL_AVG = HPI_CTL_ATTR(TUNER, 3),</div><div class='add'>+	HPI_TUNER_LEVEL_RAW = HPI_CTL_ATTR(TUNER, 4),</div><div class='add'>+	HPI_TUNER_SNR = HPI_CTL_ATTR(TUNER, 5),</div><div class='add'>+	HPI_TUNER_GAIN = HPI_CTL_ATTR(TUNER, 6),</div><div class='add'>+	HPI_TUNER_STATUS = HPI_CTL_ATTR(TUNER, 7),</div><div class='add'>+	HPI_TUNER_MODE = HPI_CTL_ATTR(TUNER, 8),</div><div class='add'>+	HPI_TUNER_RDS = HPI_CTL_ATTR(TUNER, 9),</div><div class='add'>+	HPI_TUNER_DEEMPHASIS = HPI_CTL_ATTR(TUNER, 10),</div><div class='add'>+	HPI_TUNER_PROGRAM = HPI_CTL_ATTR(TUNER, 11),</div><div class='add'>+	HPI_TUNER_HDRADIO_SIGNAL_QUALITY = HPI_CTL_ATTR(TUNER, 12),</div><div class='add'>+	HPI_TUNER_HDRADIO_SDK_VERSION = HPI_CTL_ATTR(TUNER, 13),</div><div class='add'>+	HPI_TUNER_HDRADIO_DSP_VERSION = HPI_CTL_ATTR(TUNER, 14),</div><div class='add'>+	HPI_TUNER_HDRADIO_BLEND = HPI_CTL_ATTR(TUNER, 15),</div><div class='add'>+</div><div class='add'>+	HPI_VOX_THRESHOLD = HPI_CTL_ATTR(VOX, 1),</div><div class='add'>+</div><div class='add'>+	HPI_CHANNEL_MODE_MODE = HPI_CTL_ATTR(CHANNEL_MODE, 1),</div><div class='add'>+</div><div class='add'>+	HPI_BITSTREAM_DATA_POLARITY = HPI_CTL_ATTR(BITSTREAM, 1),</div><div class='add'>+	HPI_BITSTREAM_CLOCK_EDGE = HPI_CTL_ATTR(BITSTREAM, 2),</div><div class='add'>+	HPI_BITSTREAM_CLOCK_SOURCE = HPI_CTL_ATTR(BITSTREAM, 3),</div><div class='add'>+	HPI_BITSTREAM_ACTIVITY = HPI_CTL_ATTR(BITSTREAM, 4),</div><div class='add'>+</div><div class='add'>+	HPI_SAMPLECLOCK_SOURCE = HPI_CTL_ATTR(SAMPLECLOCK, 1),</div><div class='add'>+	HPI_SAMPLECLOCK_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 2),</div><div class='add'>+	HPI_SAMPLECLOCK_SOURCE_INDEX = HPI_CTL_ATTR(SAMPLECLOCK, 3),</div><div class='add'>+	HPI_SAMPLECLOCK_LOCAL_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 4),</div><div class='add'>+	HPI_SAMPLECLOCK_AUTO = HPI_CTL_ATTR(SAMPLECLOCK, 5),</div><div class='add'>+	HPI_SAMPLECLOCK_LOCAL_LOCK = HPI_CTL_ATTR(SAMPLECLOCK, 6),</div><div class='add'>+</div><div class='add'>+	HPI_MICROPHONE_PHANTOM_POWER = HPI_CTL_ATTR(MICROPHONE, 1),</div><div class='add'>+</div><div class='add'>+	HPI_EQUALIZER_NUM_FILTERS = HPI_CTL_ATTR(EQUALIZER, 1),</div><div class='add'>+	HPI_EQUALIZER_FILTER = HPI_CTL_ATTR(EQUALIZER, 2),</div><div class='add'>+	HPI_EQUALIZER_COEFFICIENTS = HPI_CTL_ATTR(EQUALIZER, 3),</div><div class='add'>+</div><div class='add'>+	HPI_COMPANDER_PARAMS = HPI_CTL_ATTR(COMPANDER, 1),</div><div class='add'>+	HPI_COMPANDER_MAKEUPGAIN = HPI_CTL_ATTR(COMPANDER, 2),</div><div class='add'>+	HPI_COMPANDER_THRESHOLD = HPI_CTL_ATTR(COMPANDER, 3),</div><div class='add'>+	HPI_COMPANDER_RATIO = HPI_CTL_ATTR(COMPANDER, 4),</div><div class='add'>+	HPI_COMPANDER_ATTACK = HPI_CTL_ATTR(COMPANDER, 5),</div><div class='add'>+	HPI_COMPANDER_DECAY = HPI_CTL_ATTR(COMPANDER, 6),</div><div class='add'>+</div><div class='add'>+	HPI_COBRANET_SET = HPI_CTL_ATTR(COBRANET, 1),</div><div class='add'>+	HPI_COBRANET_GET = HPI_CTL_ATTR(COBRANET, 2),</div><div class='add'>+	HPI_COBRANET_GET_STATUS = HPI_CTL_ATTR(COBRANET, 5),</div><div class='add'>+	HPI_COBRANET_SEND_PACKET = HPI_CTL_ATTR(COBRANET, 6),</div><div class='add'>+	HPI_COBRANET_GET_PACKET = HPI_CTL_ATTR(COBRANET, 7),</div><div class='add'>+</div><div class='add'>+	HPI_TONEDETECTOR_THRESHOLD = HPI_CTL_ATTR(TONEDETECTOR, 1),</div><div class='add'>+	HPI_TONEDETECTOR_STATE = HPI_CTL_ATTR(TONEDETECTOR, 2),</div><div class='add'>+	HPI_TONEDETECTOR_FREQUENCY = HPI_CTL_ATTR(TONEDETECTOR, 3),</div><div class='add'>+</div><div class='add'>+	HPI_SILENCEDETECTOR_THRESHOLD = HPI_CTL_ATTR(SILENCEDETECTOR, 1),</div><div class='add'>+	HPI_SILENCEDETECTOR_STATE = HPI_CTL_ATTR(SILENCEDETECTOR, 2),</div><div class='add'>+	HPI_SILENCEDETECTOR_DELAY = HPI_CTL_ATTR(SILENCEDETECTOR, 3),</div><div class='add'>+</div><div class='add'>+	HPI_PAD_CHANNEL_NAME = HPI_CTL_ATTR(PAD, 1),</div><div class='add'>+	HPI_PAD_ARTIST = HPI_CTL_ATTR(PAD, 2),</div><div class='add'>+	HPI_PAD_TITLE = HPI_CTL_ATTR(PAD, 3),</div><div class='add'>+	HPI_PAD_COMMENT = HPI_CTL_ATTR(PAD, 4),</div><div class='add'>+	HPI_PAD_PROGRAM_TYPE = HPI_CTL_ATTR(PAD, 5),</div><div class='add'>+	HPI_PAD_PROGRAM_ID = HPI_CTL_ATTR(PAD, 6),</div><div class='add'>+	HPI_PAD_TA_SUPPORT = HPI_CTL_ATTR(PAD, 7),</div><div class='add'>+	HPI_PAD_TA_ACTIVE = HPI_CTL_ATTR(PAD, 8),</div><div class='add'>+</div><div class='add'>+	HPI_UNIVERSAL_ENTITY = HPI_CTL_ATTR(UNIVERSAL, 1)</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define HPI_POLARITY_POSITIVE           0</div><div class='ctx'> #define HPI_POLARITY_NEGATIVE           1</div><div class='ctx'> </div><div class='del'>-/* Bitstream control get attributes */</div><div class='del'>-#define HPI_BITSTREAM_ACTIVITY          1</div><div class='del'>-</div><div class='del'>-/* SampleClock control attributes */</div><div class='del'>-#define HPI_SAMPLECLOCK_SOURCE                  HPI_CTL_ATTR(SAMPLECLOCK, 1)</div><div class='del'>-#define HPI_SAMPLECLOCK_SAMPLERATE              HPI_CTL_ATTR(SAMPLECLOCK, 2)</div><div class='del'>-#define HPI_SAMPLECLOCK_SOURCE_INDEX            HPI_CTL_ATTR(SAMPLECLOCK, 3)</div><div class='del'>-#define HPI_SAMPLECLOCK_LOCAL_SAMPLERATE\</div><div class='del'>-	HPI_CTL_ATTR(SAMPLECLOCK, 4)</div><div class='del'>-#define HPI_SAMPLECLOCK_AUTO                    HPI_CTL_ATTR(SAMPLECLOCK, 5)</div><div class='del'>-#define HPI_SAMPLECLOCK_LOCAL_LOCK                      HPI_CTL_ATTR(SAMPLECLOCK, 6)</div><div class='del'>-</div><div class='del'>-/* Microphone control attributes */</div><div class='del'>-#define HPI_MICROPHONE_PHANTOM_POWER HPI_CTL_ATTR(MICROPHONE, 1)</div><div class='del'>-</div><div class='del'>-/** Equalizer control attributes */</div><div class='del'>-/** Used to get number of filters in an EQ. (Can't set) */</div><div class='del'>-#define HPI_EQUALIZER_NUM_FILTERS HPI_CTL_ATTR(EQUALIZER, 1)</div><div class='del'>-/** Set/get the filter by type, freq, Q, gain */</div><div class='del'>-#define HPI_EQUALIZER_FILTER HPI_CTL_ATTR(EQUALIZER, 2)</div><div class='del'>-/** Get the biquad coefficients */</div><div class='del'>-#define HPI_EQUALIZER_COEFFICIENTS HPI_CTL_ATTR(EQUALIZER, 3)</div><div class='del'>-</div><div class='del'>-/* Note compander also uses HPI_GENERIC_ENABLE */</div><div class='del'>-#define HPI_COMPANDER_PARAMS     HPI_CTL_ATTR(COMPANDER, 1)</div><div class='del'>-#define HPI_COMPANDER_MAKEUPGAIN HPI_CTL_ATTR(COMPANDER, 2)</div><div class='del'>-#define HPI_COMPANDER_THRESHOLD  HPI_CTL_ATTR(COMPANDER, 3)</div><div class='del'>-#define HPI_COMPANDER_RATIO      HPI_CTL_ATTR(COMPANDER, 4)</div><div class='del'>-#define HPI_COMPANDER_ATTACK     HPI_CTL_ATTR(COMPANDER, 5)</div><div class='del'>-#define HPI_COMPANDER_DECAY      HPI_CTL_ATTR(COMPANDER, 6)</div><div class='del'>-</div><div class='del'>-/* Cobranet control attributes. */</div><div class='del'>-#define HPI_COBRANET_SET         HPI_CTL_ATTR(COBRANET, 1)</div><div class='del'>-#define HPI_COBRANET_GET         HPI_CTL_ATTR(COBRANET, 2)</div><div class='del'>-#define HPI_COBRANET_SET_DATA    HPI_CTL_ATTR(COBRANET, 3)</div><div class='del'>-#define HPI_COBRANET_GET_DATA    HPI_CTL_ATTR(COBRANET, 4)</div><div class='del'>-#define HPI_COBRANET_GET_STATUS  HPI_CTL_ATTR(COBRANET, 5)</div><div class='del'>-#define HPI_COBRANET_SEND_PACKET HPI_CTL_ATTR(COBRANET, 6)</div><div class='del'>-#define HPI_COBRANET_GET_PACKET  HPI_CTL_ATTR(COBRANET, 7)</div><div class='del'>-</div><div class='ctx'> /*------------------------------------------------------------</div><div class='ctx'>  Cobranet Chip Bridge - copied from HMI.H</div><div class='ctx'> ------------------------------------------------------------*/</div><div class='hunk'>@@ -380,7 +278,7 @@ Used for HPI_ChannelModeSet/Get()</div><div class='ctx'> </div><div class='ctx'> /* These defines are used to fill in protocol information for an Ethernet packet</div><div class='ctx'>     sent using HMI on CS18102 */</div><div class='del'>-/** ID supplied by Cirrius for ASI packets. */</div><div class='add'>+/** ID supplied by Cirrus for ASI packets. */</div><div class='ctx'> #define HPI_ETHERNET_PACKET_ID                  0x85</div><div class='ctx'> /** Simple packet - no special routing required */</div><div class='ctx'> #define HPI_ETHERNET_PACKET_V1                  0x01</div><div class='hunk'>@@ -393,71 +291,24 @@ Used for HPI_ChannelModeSet/Get()</div><div class='ctx'> /** This packet must make its way to the host across the HPI interface */</div><div class='ctx'> #define HPI_ETHERNET_PACKET_HOSTED_VIA_HPI_V1   0x41</div><div class='ctx'> </div><div class='del'>-#define HPI_ETHERNET_UDP_PORT (44600)	/*!&lt; UDP messaging port */</div><div class='del'>-</div><div class='del'>-/** Base network time out is set to 100 milli-seconds. */</div><div class='del'>-#define HPI_ETHERNET_TIMEOUT_MS      (100)</div><div class='del'>-</div><div class='del'>-/** \defgroup tonedet_attr Tonedetector attributes</div><div class='del'>-\{</div><div class='del'>-Used by HPI_ToneDetector_Set() and HPI_ToneDetector_Get()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/** Set the threshold level of a tonedetector,</div><div class='del'>-Threshold is a -ve number in units of dB/100,</div><div class='del'>-*/</div><div class='del'>-#define HPI_TONEDETECTOR_THRESHOLD HPI_CTL_ATTR(TONEDETECTOR, 1)</div><div class='del'>-</div><div class='del'>-/** Get the current state of tonedetection</div><div class='del'>-The result is a bitmap of detected tones.  pairs of bits represent the left</div><div class='del'>-and right channels, with left channel in LSB.</div><div class='del'>-The lowest frequency detector state is in the LSB</div><div class='del'>-*/</div><div class='del'>-#define HPI_TONEDETECTOR_STATE HPI_CTL_ATTR(TONEDETECTOR, 2)</div><div class='del'>-</div><div class='del'>-/** Get the frequency of a tonedetector band.</div><div class='del'>-*/</div><div class='del'>-#define HPI_TONEDETECTOR_FREQUENCY HPI_CTL_ATTR(TONEDETECTOR, 3)</div><div class='add'>+#define HPI_ETHERNET_UDP_PORT 44600 /**&lt; HPI UDP service */</div><div class='ctx'> </div><div class='del'>-/**\}*/</div><div class='add'>+/** Default network timeout in milli-seconds. */</div><div class='add'>+#define HPI_ETHERNET_TIMEOUT_MS 500</div><div class='ctx'> </div><div class='del'>-/** \defgroup silencedet_attr SilenceDetector attributes</div><div class='del'>-\{</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/** Get the current state of tonedetection</div><div class='del'>-The result is a bitmap with 1s for silent channels. Left channel is in LSB</div><div class='del'>-*/</div><div class='del'>-#define HPI_SILENCEDETECTOR_STATE \</div><div class='del'>-  HPI_CTL_ATTR(SILENCEDETECTOR, 2)</div><div class='del'>-</div><div class='del'>-/** Set the threshold level of a SilenceDetector,</div><div class='del'>-Threshold is a -ve number in units of dB/100,</div><div class='del'>-*/</div><div class='del'>-#define HPI_SILENCEDETECTOR_THRESHOLD \</div><div class='del'>-  HPI_CTL_ATTR(SILENCEDETECTOR, 1)</div><div class='del'>-</div><div class='del'>-/** get/set the silence time before the detector triggers</div><div class='del'>-*/</div><div class='del'>-#define HPI_SILENCEDETECTOR_DELAY \</div><div class='del'>-       HPI_CTL_ATTR(SILENCEDETECTOR, 3)</div><div class='del'>-</div><div class='del'>-/**\}*/</div><div class='del'>-</div><div class='del'>-/* Locked memory buffer alloc/free phases */</div><div class='del'>-/** use one message to allocate or free physical memory */</div><div class='del'>-#define HPI_BUFFER_CMD_EXTERNAL                 0</div><div class='del'>-/** alloc physical memory */</div><div class='del'>-#define HPI_BUFFER_CMD_INTERNAL_ALLOC           1</div><div class='del'>-/** send physical memory address to adapter */</div><div class='del'>-#define HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER    2</div><div class='del'>-/** notify adapter to stop using physical buffer */</div><div class='del'>-#define HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER   3</div><div class='del'>-/** free physical buffer */</div><div class='del'>-#define HPI_BUFFER_CMD_INTERNAL_FREE            4</div><div class='del'>-</div><div class='del'>-/******************************************* CONTROLX ATTRIBUTES ****/</div><div class='del'>-/* NOTE: All controlx attributes must be unique, unlike control attributes */</div><div class='add'>+/** Locked memory buffer alloc/free phases */</div><div class='add'>+enum HPI_BUFFER_CMDS {</div><div class='add'>+	/** use one message to allocate or free physical memory */</div><div class='add'>+	HPI_BUFFER_CMD_EXTERNAL = 0,</div><div class='add'>+	/** alloc physical memory */</div><div class='add'>+	HPI_BUFFER_CMD_INTERNAL_ALLOC = 1,</div><div class='add'>+	/** send physical memory address to adapter */</div><div class='add'>+	HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER = 2,</div><div class='add'>+	/** notify adapter to stop using physical buffer */</div><div class='add'>+	HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER = 3,</div><div class='add'>+	/** free physical buffer */</div><div class='add'>+	HPI_BUFFER_CMD_INTERNAL_FREE = 4</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -482,6 +333,12 @@ Threshold is a -ve number in units of dB/100,</div><div class='ctx'> #define HPI_USB_W2K_TAG                 0x57495341	/* "ASIW"       */</div><div class='ctx'> #define HPI_USB_LINUX_TAG               0x4C495341	/* "ASIL"       */</div><div class='ctx'> </div><div class='add'>+/** Invalid Adapter index</div><div class='add'>+Used in HPI messages that are not addressed to a specific adapter</div><div class='add'>+Used in DLL to indicate device not present</div><div class='add'>+*/</div><div class='add'>+#define HPI_ADAPTER_INDEX_INVALID 0xFFFF</div><div class='add'>+</div><div class='ctx'> /** First 2 hex digits define the adapter family */</div><div class='ctx'> #define HPI_ADAPTER_FAMILY_MASK         0xff00</div><div class='ctx'> #define HPI_MODULE_FAMILY_MASK          0xfff0</div><div class='hunk'>@@ -490,178 +347,189 @@ Threshold is a -ve number in units of dB/100,</div><div class='ctx'> #define HPI_MODULE_FAMILY_ASI(f)   (f &amp; HPI_MODULE_FAMILY_MASK)</div><div class='ctx'> #define HPI_ADAPTER_ASI(f)   (f)</div><div class='ctx'> </div><div class='del'>-/******************************************* message types */</div><div class='del'>-#define HPI_TYPE_MESSAGE                        1</div><div class='del'>-#define HPI_TYPE_RESPONSE                       2</div><div class='del'>-#define HPI_TYPE_DATA                           3</div><div class='del'>-#define HPI_TYPE_SSX2BYPASS_MESSAGE             4</div><div class='del'>-</div><div class='del'>-/******************************************* object types */</div><div class='del'>-#define HPI_OBJ_SUBSYSTEM                       1</div><div class='del'>-#define HPI_OBJ_ADAPTER                         2</div><div class='del'>-#define HPI_OBJ_OSTREAM                         3</div><div class='del'>-#define HPI_OBJ_ISTREAM                         4</div><div class='del'>-#define HPI_OBJ_MIXER                           5</div><div class='del'>-#define HPI_OBJ_NODE                            6</div><div class='del'>-#define HPI_OBJ_CONTROL                         7</div><div class='del'>-#define HPI_OBJ_NVMEMORY                        8</div><div class='del'>-#define HPI_OBJ_GPIO                            9</div><div class='del'>-#define HPI_OBJ_WATCHDOG                        10</div><div class='del'>-#define HPI_OBJ_CLOCK                           11</div><div class='del'>-#define HPI_OBJ_PROFILE                         12</div><div class='del'>-#define HPI_OBJ_CONTROLEX                       13</div><div class='del'>-#define HPI_OBJ_ASYNCEVENT                      14</div><div class='del'>-</div><div class='del'>-#define HPI_OBJ_MAXINDEX                        14</div><div class='del'>-</div><div class='del'>-/******************************************* methods/functions */</div><div class='del'>-</div><div class='del'>-#define HPI_OBJ_FUNCTION_SPACING        0x100</div><div class='del'>-#define HPI_MAKE_INDEX(obj, index) (obj * HPI_OBJ_FUNCTION_SPACING + index)</div><div class='add'>+enum HPI_MESSAGE_TYPES {</div><div class='add'>+	HPI_TYPE_REQUEST = 1,</div><div class='add'>+	HPI_TYPE_RESPONSE = 2,</div><div class='add'>+	HPI_TYPE_DATA = 3,</div><div class='add'>+	HPI_TYPE_SSX2BYPASS_MESSAGE = 4,</div><div class='add'>+	HPI_TYPE_COMMAND = 5,</div><div class='add'>+	HPI_TYPE_NOTIFICATION = 6</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum HPI_OBJECT_TYPES {</div><div class='add'>+	HPI_OBJ_SUBSYSTEM = 1,</div><div class='add'>+	HPI_OBJ_ADAPTER = 2,</div><div class='add'>+	HPI_OBJ_OSTREAM = 3,</div><div class='add'>+	HPI_OBJ_ISTREAM = 4,</div><div class='add'>+	HPI_OBJ_MIXER = 5,</div><div class='add'>+	HPI_OBJ_NODE = 6,</div><div class='add'>+	HPI_OBJ_CONTROL = 7,</div><div class='add'>+	HPI_OBJ_NVMEMORY = 8,</div><div class='add'>+	HPI_OBJ_GPIO = 9,</div><div class='add'>+	HPI_OBJ_WATCHDOG = 10,</div><div class='add'>+	HPI_OBJ_CLOCK = 11,</div><div class='add'>+	HPI_OBJ_PROFILE = 12,</div><div class='add'>+	/* HPI_ OBJ_ CONTROLEX  = 13, */</div><div class='add'>+	HPI_OBJ_ASYNCEVENT = 14</div><div class='add'>+#define HPI_OBJ_MAXINDEX 14</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HPI_OBJ_FUNCTION_SPACING 0x100</div><div class='add'>+#define HPI_FUNC_ID(obj, i) (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + i)</div><div class='add'>+</div><div class='ctx'> #define HPI_EXTRACT_INDEX(fn) (fn &amp; 0xff)</div><div class='ctx'> </div><div class='del'>-/* SUB-SYSTEM */</div><div class='del'>-#define HPI_SUBSYS_OPEN                 HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 1)</div><div class='del'>-#define HPI_SUBSYS_GET_VERSION          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 2)</div><div class='del'>-#define HPI_SUBSYS_GET_INFO             HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 3)</div><div class='del'>-#define HPI_SUBSYS_FIND_ADAPTERS        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 4)</div><div class='del'>-#define HPI_SUBSYS_CREATE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 5)</div><div class='del'>-#define HPI_SUBSYS_CLOSE                HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 6)</div><div class='del'>-#define HPI_SUBSYS_DELETE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 7)</div><div class='del'>-#define HPI_SUBSYS_DRIVER_LOAD          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 8)</div><div class='del'>-#define HPI_SUBSYS_DRIVER_UNLOAD        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 9)</div><div class='del'>-#define HPI_SUBSYS_READ_PORT_8          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 10)</div><div class='del'>-#define HPI_SUBSYS_WRITE_PORT_8         HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 11)</div><div class='del'>-#define HPI_SUBSYS_GET_NUM_ADAPTERS     HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 12)</div><div class='del'>-#define HPI_SUBSYS_GET_ADAPTER          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 13)</div><div class='del'>-#define HPI_SUBSYS_SET_NETWORK_INTERFACE HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 14)</div><div class='del'>-#define HPI_SUBSYS_FUNCTION_COUNT 14</div><div class='del'>-/* ADAPTER */</div><div class='del'>-#define HPI_ADAPTER_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 1)</div><div class='del'>-#define HPI_ADAPTER_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 2)</div><div class='del'>-#define HPI_ADAPTER_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 3)</div><div class='del'>-#define HPI_ADAPTER_GET_ASSERT          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 4)</div><div class='del'>-#define HPI_ADAPTER_TEST_ASSERT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 5)</div><div class='del'>-#define HPI_ADAPTER_SET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 6)</div><div class='del'>-#define HPI_ADAPTER_GET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 7)</div><div class='del'>-#define HPI_ADAPTER_ENABLE_CAPABILITY   HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 8)</div><div class='del'>-#define HPI_ADAPTER_SELFTEST            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 9)</div><div class='del'>-#define HPI_ADAPTER_FIND_OBJECT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 10)</div><div class='del'>-#define HPI_ADAPTER_QUERY_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 11)</div><div class='del'>-#define HPI_ADAPTER_START_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 12)</div><div class='del'>-#define HPI_ADAPTER_PROGRAM_FLASH       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 13)</div><div class='del'>-#define HPI_ADAPTER_SET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 14)</div><div class='del'>-#define HPI_ADAPTER_GET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 15)</div><div class='del'>-#define HPI_ADAPTER_ENUM_PROPERTY       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 16)</div><div class='del'>-#define HPI_ADAPTER_MODULE_INFO         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 17)</div><div class='del'>-#define HPI_ADAPTER_DEBUG_READ          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 18)</div><div class='del'>-#define HPI_ADAPTER_FUNCTION_COUNT 18</div><div class='del'>-/* OUTPUT STREAM */</div><div class='del'>-#define HPI_OSTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 1)</div><div class='del'>-#define HPI_OSTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 2)</div><div class='del'>-#define HPI_OSTREAM_WRITE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 3)</div><div class='del'>-#define HPI_OSTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 4)</div><div class='del'>-#define HPI_OSTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 5)</div><div class='del'>-#define HPI_OSTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 6)</div><div class='del'>-#define HPI_OSTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 7)</div><div class='del'>-#define HPI_OSTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 8)</div><div class='del'>-#define HPI_OSTREAM_DATA                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 9)</div><div class='del'>-#define HPI_OSTREAM_SET_VELOCITY        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 10)</div><div class='del'>-#define HPI_OSTREAM_SET_PUNCHINOUT      HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 11)</div><div class='del'>-#define HPI_OSTREAM_SINEGEN             HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 12)</div><div class='del'>-#define HPI_OSTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 13)</div><div class='del'>-#define HPI_OSTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 14)</div><div class='del'>-#define HPI_OSTREAM_ANC_READ            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 15)</div><div class='del'>-#define HPI_OSTREAM_SET_TIMESCALE       HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 16)</div><div class='del'>-#define HPI_OSTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 17)</div><div class='del'>-#define HPI_OSTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 18)</div><div class='del'>-#define HPI_OSTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 19)</div><div class='del'>-#define HPI_OSTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 20)</div><div class='del'>-#define HPI_OSTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 21)</div><div class='del'>-#define HPI_OSTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 22)</div><div class='del'>-#define HPI_OSTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 23)</div><div class='del'>-#define HPI_OSTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 24)</div><div class='del'>-#define HPI_OSTREAM_FUNCTION_COUNT              24</div><div class='del'>-/* INPUT STREAM */</div><div class='del'>-#define HPI_ISTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 1)</div><div class='del'>-#define HPI_ISTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 2)</div><div class='del'>-#define HPI_ISTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 3)</div><div class='del'>-#define HPI_ISTREAM_READ                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 4)</div><div class='del'>-#define HPI_ISTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 5)</div><div class='del'>-#define HPI_ISTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 6)</div><div class='del'>-#define HPI_ISTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 7)</div><div class='del'>-#define HPI_ISTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 8)</div><div class='del'>-#define HPI_ISTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 9)</div><div class='del'>-#define HPI_ISTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 10)</div><div class='del'>-#define HPI_ISTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 11)</div><div class='del'>-#define HPI_ISTREAM_ANC_WRITE           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 12)</div><div class='del'>-#define HPI_ISTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 13)</div><div class='del'>-#define HPI_ISTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 14)</div><div class='del'>-#define HPI_ISTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 15)</div><div class='del'>-#define HPI_ISTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 16)</div><div class='del'>-#define HPI_ISTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 17)</div><div class='del'>-#define HPI_ISTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 18)</div><div class='del'>-#define HPI_ISTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 19)</div><div class='del'>-#define HPI_ISTREAM_FUNCTION_COUNT              19</div><div class='del'>-/* MIXER */</div><div class='add'>+enum HPI_FUNCTION_IDS {</div><div class='add'>+	HPI_SUBSYS_OPEN = HPI_FUNC_ID(SUBSYSTEM, 1),</div><div class='add'>+	HPI_SUBSYS_GET_VERSION = HPI_FUNC_ID(SUBSYSTEM, 2),</div><div class='add'>+	HPI_SUBSYS_GET_INFO = HPI_FUNC_ID(SUBSYSTEM, 3),</div><div class='add'>+	HPI_SUBSYS_CREATE_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 5),</div><div class='add'>+	HPI_SUBSYS_CLOSE = HPI_FUNC_ID(SUBSYSTEM, 6),</div><div class='add'>+	HPI_SUBSYS_DRIVER_LOAD = HPI_FUNC_ID(SUBSYSTEM, 8),</div><div class='add'>+	HPI_SUBSYS_DRIVER_UNLOAD = HPI_FUNC_ID(SUBSYSTEM, 9),</div><div class='add'>+	HPI_SUBSYS_GET_NUM_ADAPTERS = HPI_FUNC_ID(SUBSYSTEM, 12),</div><div class='add'>+	HPI_SUBSYS_GET_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 13),</div><div class='add'>+	HPI_SUBSYS_SET_NETWORK_INTERFACE = HPI_FUNC_ID(SUBSYSTEM, 14),</div><div class='add'>+	HPI_SUBSYS_OPTION_INFO = HPI_FUNC_ID(SUBSYSTEM, 15),</div><div class='add'>+	HPI_SUBSYS_OPTION_GET = HPI_FUNC_ID(SUBSYSTEM, 16),</div><div class='add'>+	HPI_SUBSYS_OPTION_SET = HPI_FUNC_ID(SUBSYSTEM, 17),</div><div class='add'>+#define HPI_SUBSYS_FUNCTION_COUNT 17</div><div class='add'>+</div><div class='add'>+	HPI_ADAPTER_OPEN = HPI_FUNC_ID(ADAPTER, 1),</div><div class='add'>+	HPI_ADAPTER_CLOSE = HPI_FUNC_ID(ADAPTER, 2),</div><div class='add'>+	HPI_ADAPTER_GET_INFO = HPI_FUNC_ID(ADAPTER, 3),</div><div class='add'>+	HPI_ADAPTER_GET_ASSERT = HPI_FUNC_ID(ADAPTER, 4),</div><div class='add'>+	HPI_ADAPTER_TEST_ASSERT = HPI_FUNC_ID(ADAPTER, 5),</div><div class='add'>+	HPI_ADAPTER_SET_MODE = HPI_FUNC_ID(ADAPTER, 6),</div><div class='add'>+	HPI_ADAPTER_GET_MODE = HPI_FUNC_ID(ADAPTER, 7),</div><div class='add'>+	HPI_ADAPTER_ENABLE_CAPABILITY = HPI_FUNC_ID(ADAPTER, 8),</div><div class='add'>+	HPI_ADAPTER_SELFTEST = HPI_FUNC_ID(ADAPTER, 9),</div><div class='add'>+	HPI_ADAPTER_FIND_OBJECT = HPI_FUNC_ID(ADAPTER, 10),</div><div class='add'>+	HPI_ADAPTER_QUERY_FLASH = HPI_FUNC_ID(ADAPTER, 11),</div><div class='add'>+	HPI_ADAPTER_START_FLASH = HPI_FUNC_ID(ADAPTER, 12),</div><div class='add'>+	HPI_ADAPTER_PROGRAM_FLASH = HPI_FUNC_ID(ADAPTER, 13),</div><div class='add'>+	HPI_ADAPTER_SET_PROPERTY = HPI_FUNC_ID(ADAPTER, 14),</div><div class='add'>+	HPI_ADAPTER_GET_PROPERTY = HPI_FUNC_ID(ADAPTER, 15),</div><div class='add'>+	HPI_ADAPTER_ENUM_PROPERTY = HPI_FUNC_ID(ADAPTER, 16),</div><div class='add'>+	HPI_ADAPTER_MODULE_INFO = HPI_FUNC_ID(ADAPTER, 17),</div><div class='add'>+	HPI_ADAPTER_DEBUG_READ = HPI_FUNC_ID(ADAPTER, 18),</div><div class='add'>+	HPI_ADAPTER_IRQ_QUERY_AND_CLEAR = HPI_FUNC_ID(ADAPTER, 19),</div><div class='add'>+	HPI_ADAPTER_IRQ_CALLBACK = HPI_FUNC_ID(ADAPTER, 20),</div><div class='add'>+	HPI_ADAPTER_DELETE = HPI_FUNC_ID(ADAPTER, 21),</div><div class='add'>+	HPI_ADAPTER_READ_FLASH = HPI_FUNC_ID(ADAPTER, 22),</div><div class='add'>+	HPI_ADAPTER_END_FLASH = HPI_FUNC_ID(ADAPTER, 23),</div><div class='add'>+	HPI_ADAPTER_FILESTORE_DELETE_ALL = HPI_FUNC_ID(ADAPTER, 24),</div><div class='add'>+#define HPI_ADAPTER_FUNCTION_COUNT 24</div><div class='add'>+</div><div class='add'>+	HPI_OSTREAM_OPEN = HPI_FUNC_ID(OSTREAM, 1),</div><div class='add'>+	HPI_OSTREAM_CLOSE = HPI_FUNC_ID(OSTREAM, 2),</div><div class='add'>+	HPI_OSTREAM_WRITE = HPI_FUNC_ID(OSTREAM, 3),</div><div class='add'>+	HPI_OSTREAM_START = HPI_FUNC_ID(OSTREAM, 4),</div><div class='add'>+	HPI_OSTREAM_STOP = HPI_FUNC_ID(OSTREAM, 5),</div><div class='add'>+	HPI_OSTREAM_RESET = HPI_FUNC_ID(OSTREAM, 6),</div><div class='add'>+	HPI_OSTREAM_GET_INFO = HPI_FUNC_ID(OSTREAM, 7),</div><div class='add'>+	HPI_OSTREAM_QUERY_FORMAT = HPI_FUNC_ID(OSTREAM, 8),</div><div class='add'>+	HPI_OSTREAM_DATA = HPI_FUNC_ID(OSTREAM, 9),</div><div class='add'>+	HPI_OSTREAM_SET_VELOCITY = HPI_FUNC_ID(OSTREAM, 10),</div><div class='add'>+	HPI_OSTREAM_SET_PUNCHINOUT = HPI_FUNC_ID(OSTREAM, 11),</div><div class='add'>+	HPI_OSTREAM_SINEGEN = HPI_FUNC_ID(OSTREAM, 12),</div><div class='add'>+	HPI_OSTREAM_ANC_RESET = HPI_FUNC_ID(OSTREAM, 13),</div><div class='add'>+	HPI_OSTREAM_ANC_GET_INFO = HPI_FUNC_ID(OSTREAM, 14),</div><div class='add'>+	HPI_OSTREAM_ANC_READ = HPI_FUNC_ID(OSTREAM, 15),</div><div class='add'>+	HPI_OSTREAM_SET_TIMESCALE = HPI_FUNC_ID(OSTREAM, 16),</div><div class='add'>+	HPI_OSTREAM_SET_FORMAT = HPI_FUNC_ID(OSTREAM, 17),</div><div class='add'>+	HPI_OSTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(OSTREAM, 18),</div><div class='add'>+	HPI_OSTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(OSTREAM, 19),</div><div class='add'>+	HPI_OSTREAM_GROUP_ADD = HPI_FUNC_ID(OSTREAM, 20),</div><div class='add'>+	HPI_OSTREAM_GROUP_GETMAP = HPI_FUNC_ID(OSTREAM, 21),</div><div class='add'>+	HPI_OSTREAM_GROUP_RESET = HPI_FUNC_ID(OSTREAM, 22),</div><div class='add'>+	HPI_OSTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(OSTREAM, 23),</div><div class='add'>+	HPI_OSTREAM_WAIT_START = HPI_FUNC_ID(OSTREAM, 24),</div><div class='add'>+	HPI_OSTREAM_WAIT = HPI_FUNC_ID(OSTREAM, 25),</div><div class='add'>+#define HPI_OSTREAM_FUNCTION_COUNT 25</div><div class='add'>+</div><div class='add'>+	HPI_ISTREAM_OPEN = HPI_FUNC_ID(ISTREAM, 1),</div><div class='add'>+	HPI_ISTREAM_CLOSE = HPI_FUNC_ID(ISTREAM, 2),</div><div class='add'>+	HPI_ISTREAM_SET_FORMAT = HPI_FUNC_ID(ISTREAM, 3),</div><div class='add'>+	HPI_ISTREAM_READ = HPI_FUNC_ID(ISTREAM, 4),</div><div class='add'>+	HPI_ISTREAM_START = HPI_FUNC_ID(ISTREAM, 5),</div><div class='add'>+	HPI_ISTREAM_STOP = HPI_FUNC_ID(ISTREAM, 6),</div><div class='add'>+	HPI_ISTREAM_RESET = HPI_FUNC_ID(ISTREAM, 7),</div><div class='add'>+	HPI_ISTREAM_GET_INFO = HPI_FUNC_ID(ISTREAM, 8),</div><div class='add'>+	HPI_ISTREAM_QUERY_FORMAT = HPI_FUNC_ID(ISTREAM, 9),</div><div class='add'>+	HPI_ISTREAM_ANC_RESET = HPI_FUNC_ID(ISTREAM, 10),</div><div class='add'>+	HPI_ISTREAM_ANC_GET_INFO = HPI_FUNC_ID(ISTREAM, 11),</div><div class='add'>+	HPI_ISTREAM_ANC_WRITE = HPI_FUNC_ID(ISTREAM, 12),</div><div class='add'>+	HPI_ISTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(ISTREAM, 13),</div><div class='add'>+	HPI_ISTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(ISTREAM, 14),</div><div class='add'>+	HPI_ISTREAM_GROUP_ADD = HPI_FUNC_ID(ISTREAM, 15),</div><div class='add'>+	HPI_ISTREAM_GROUP_GETMAP = HPI_FUNC_ID(ISTREAM, 16),</div><div class='add'>+	HPI_ISTREAM_GROUP_RESET = HPI_FUNC_ID(ISTREAM, 17),</div><div class='add'>+	HPI_ISTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(ISTREAM, 18),</div><div class='add'>+	HPI_ISTREAM_WAIT_START = HPI_FUNC_ID(ISTREAM, 19),</div><div class='add'>+	HPI_ISTREAM_WAIT = HPI_FUNC_ID(ISTREAM, 20),</div><div class='add'>+#define HPI_ISTREAM_FUNCTION_COUNT 20</div><div class='add'>+</div><div class='ctx'> /* NOTE:</div><div class='ctx'>    GET_NODE_INFO, SET_CONNECTION, GET_CONNECTIONS are not currently used */</div><div class='del'>-#define HPI_MIXER_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 1)</div><div class='del'>-#define HPI_MIXER_CLOSE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 2)</div><div class='del'>-#define HPI_MIXER_GET_INFO              HPI_MAKE_INDEX(HPI_OBJ_MIXER, 3)</div><div class='del'>-#define HPI_MIXER_GET_NODE_INFO         HPI_MAKE_INDEX(HPI_OBJ_MIXER, 4)</div><div class='del'>-#define HPI_MIXER_GET_CONTROL           HPI_MAKE_INDEX(HPI_OBJ_MIXER, 5)</div><div class='del'>-#define HPI_MIXER_SET_CONNECTION        HPI_MAKE_INDEX(HPI_OBJ_MIXER, 6)</div><div class='del'>-#define HPI_MIXER_GET_CONNECTIONS       HPI_MAKE_INDEX(HPI_OBJ_MIXER, 7)</div><div class='del'>-#define HPI_MIXER_GET_CONTROL_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 8)</div><div class='del'>-#define HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 9)</div><div class='del'>-#define HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES HPI_MAKE_INDEX(HPI_OBJ_MIXER, 10)</div><div class='del'>-#define HPI_MIXER_STORE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 11)</div><div class='del'>-#define HPI_MIXER_FUNCTION_COUNT        11</div><div class='del'>-/* MIXER CONTROLS */</div><div class='del'>-#define HPI_CONTROL_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 1)</div><div class='del'>-#define HPI_CONTROL_GET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 2)</div><div class='del'>-#define HPI_CONTROL_SET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 3)</div><div class='add'>+	HPI_MIXER_OPEN = HPI_FUNC_ID(MIXER, 1),</div><div class='add'>+	HPI_MIXER_CLOSE = HPI_FUNC_ID(MIXER, 2),</div><div class='add'>+	HPI_MIXER_GET_INFO = HPI_FUNC_ID(MIXER, 3),</div><div class='add'>+	HPI_MIXER_GET_NODE_INFO = HPI_FUNC_ID(MIXER, 4),</div><div class='add'>+	HPI_MIXER_GET_CONTROL = HPI_FUNC_ID(MIXER, 5),</div><div class='add'>+	HPI_MIXER_SET_CONNECTION = HPI_FUNC_ID(MIXER, 6),</div><div class='add'>+	HPI_MIXER_GET_CONNECTIONS = HPI_FUNC_ID(MIXER, 7),</div><div class='add'>+	HPI_MIXER_GET_CONTROL_BY_INDEX = HPI_FUNC_ID(MIXER, 8),</div><div class='add'>+	HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX = HPI_FUNC_ID(MIXER, 9),</div><div class='add'>+	HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES = HPI_FUNC_ID(MIXER, 10),</div><div class='add'>+	HPI_MIXER_STORE = HPI_FUNC_ID(MIXER, 11),</div><div class='add'>+	HPI_MIXER_GET_CACHE_INFO = HPI_FUNC_ID(MIXER, 12),</div><div class='add'>+	HPI_MIXER_GET_BLOCK_HANDLE = HPI_FUNC_ID(MIXER, 13),</div><div class='add'>+	HPI_MIXER_GET_PARAMETER_HANDLE = HPI_FUNC_ID(MIXER, 14),</div><div class='add'>+#define HPI_MIXER_FUNCTION_COUNT 14</div><div class='add'>+</div><div class='add'>+	HPI_CONTROL_GET_INFO = HPI_FUNC_ID(CONTROL, 1),</div><div class='add'>+	HPI_CONTROL_GET_STATE = HPI_FUNC_ID(CONTROL, 2),</div><div class='add'>+	HPI_CONTROL_SET_STATE = HPI_FUNC_ID(CONTROL, 3),</div><div class='ctx'> #define HPI_CONTROL_FUNCTION_COUNT 3</div><div class='del'>-/* NONVOL MEMORY */</div><div class='del'>-#define HPI_NVMEMORY_OPEN               HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 1)</div><div class='del'>-#define HPI_NVMEMORY_READ_BYTE          HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 2)</div><div class='del'>-#define HPI_NVMEMORY_WRITE_BYTE         HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 3)</div><div class='add'>+</div><div class='add'>+	HPI_NVMEMORY_OPEN = HPI_FUNC_ID(NVMEMORY, 1),</div><div class='add'>+	HPI_NVMEMORY_READ_BYTE = HPI_FUNC_ID(NVMEMORY, 2),</div><div class='add'>+	HPI_NVMEMORY_WRITE_BYTE = HPI_FUNC_ID(NVMEMORY, 3),</div><div class='ctx'> #define HPI_NVMEMORY_FUNCTION_COUNT 3</div><div class='del'>-/* GPIO */</div><div class='del'>-#define HPI_GPIO_OPEN                   HPI_MAKE_INDEX(HPI_OBJ_GPIO, 1)</div><div class='del'>-#define HPI_GPIO_READ_BIT               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 2)</div><div class='del'>-#define HPI_GPIO_WRITE_BIT              HPI_MAKE_INDEX(HPI_OBJ_GPIO, 3)</div><div class='del'>-#define HPI_GPIO_READ_ALL               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 4)</div><div class='del'>-#define HPI_GPIO_WRITE_STATUS           HPI_MAKE_INDEX(HPI_OBJ_GPIO, 5)</div><div class='add'>+</div><div class='add'>+	HPI_GPIO_OPEN = HPI_FUNC_ID(GPIO, 1),</div><div class='add'>+	HPI_GPIO_READ_BIT = HPI_FUNC_ID(GPIO, 2),</div><div class='add'>+	HPI_GPIO_WRITE_BIT = HPI_FUNC_ID(GPIO, 3),</div><div class='add'>+	HPI_GPIO_READ_ALL = HPI_FUNC_ID(GPIO, 4),</div><div class='add'>+	HPI_GPIO_WRITE_STATUS = HPI_FUNC_ID(GPIO, 5),</div><div class='ctx'> #define HPI_GPIO_FUNCTION_COUNT 5</div><div class='del'>-/* ASYNC EVENT */</div><div class='del'>-#define HPI_ASYNCEVENT_OPEN             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 1)</div><div class='del'>-#define HPI_ASYNCEVENT_CLOSE            HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 2)</div><div class='del'>-#define HPI_ASYNCEVENT_WAIT             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 3)</div><div class='del'>-#define HPI_ASYNCEVENT_GETCOUNT         HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 4)</div><div class='del'>-#define HPI_ASYNCEVENT_GET              HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 5)</div><div class='del'>-#define HPI_ASYNCEVENT_SENDEVENTS       HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 6)</div><div class='add'>+</div><div class='add'>+	HPI_ASYNCEVENT_OPEN = HPI_FUNC_ID(ASYNCEVENT, 1),</div><div class='add'>+	HPI_ASYNCEVENT_CLOSE = HPI_FUNC_ID(ASYNCEVENT, 2),</div><div class='add'>+	HPI_ASYNCEVENT_WAIT = HPI_FUNC_ID(ASYNCEVENT, 3),</div><div class='add'>+	HPI_ASYNCEVENT_GETCOUNT = HPI_FUNC_ID(ASYNCEVENT, 4),</div><div class='add'>+	HPI_ASYNCEVENT_GET = HPI_FUNC_ID(ASYNCEVENT, 5),</div><div class='add'>+	HPI_ASYNCEVENT_SENDEVENTS = HPI_FUNC_ID(ASYNCEVENT, 6),</div><div class='ctx'> #define HPI_ASYNCEVENT_FUNCTION_COUNT 6</div><div class='del'>-/* WATCH-DOG */</div><div class='del'>-#define HPI_WATCHDOG_OPEN               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 1)</div><div class='del'>-#define HPI_WATCHDOG_SET_TIME           HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 2)</div><div class='del'>-#define HPI_WATCHDOG_PING               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 3)</div><div class='del'>-/* CLOCK */</div><div class='del'>-#define HPI_CLOCK_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 1)</div><div class='del'>-#define HPI_CLOCK_SET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 2)</div><div class='del'>-#define HPI_CLOCK_GET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 3)</div><div class='del'>-/* PROFILE */</div><div class='del'>-#define HPI_PROFILE_OPEN_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 1)</div><div class='del'>-#define HPI_PROFILE_START_ALL           HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 2)</div><div class='del'>-#define HPI_PROFILE_STOP_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 3)</div><div class='del'>-#define HPI_PROFILE_GET                 HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 4)</div><div class='del'>-#define HPI_PROFILE_GET_IDLECOUNT       HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 5)</div><div class='del'>-#define HPI_PROFILE_GET_NAME            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 6)</div><div class='del'>-#define HPI_PROFILE_GET_UTILIZATION     HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 7)</div><div class='add'>+</div><div class='add'>+	HPI_WATCHDOG_OPEN = HPI_FUNC_ID(WATCHDOG, 1),</div><div class='add'>+	HPI_WATCHDOG_SET_TIME = HPI_FUNC_ID(WATCHDOG, 2),</div><div class='add'>+	HPI_WATCHDOG_PING = HPI_FUNC_ID(WATCHDOG, 3),</div><div class='add'>+</div><div class='add'>+	HPI_CLOCK_OPEN = HPI_FUNC_ID(CLOCK, 1),</div><div class='add'>+	HPI_CLOCK_SET_TIME = HPI_FUNC_ID(CLOCK, 2),</div><div class='add'>+	HPI_CLOCK_GET_TIME = HPI_FUNC_ID(CLOCK, 3),</div><div class='add'>+</div><div class='add'>+	HPI_PROFILE_OPEN_ALL = HPI_FUNC_ID(PROFILE, 1),</div><div class='add'>+	HPI_PROFILE_START_ALL = HPI_FUNC_ID(PROFILE, 2),</div><div class='add'>+	HPI_PROFILE_STOP_ALL = HPI_FUNC_ID(PROFILE, 3),</div><div class='add'>+	HPI_PROFILE_GET = HPI_FUNC_ID(PROFILE, 4),</div><div class='add'>+	HPI_PROFILE_GET_IDLECOUNT = HPI_FUNC_ID(PROFILE, 5),</div><div class='add'>+	HPI_PROFILE_GET_NAME = HPI_FUNC_ID(PROFILE, 6),</div><div class='add'>+	HPI_PROFILE_GET_UTILIZATION = HPI_FUNC_ID(PROFILE, 7)</div><div class='ctx'> #define HPI_PROFILE_FUNCTION_COUNT 7</div><div class='del'>-/* ////////////////////////////////////////////////////////////////////// */</div><div class='del'>-/* PRIVATE ATTRIBUTES */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* ////////////////////////////////////////////////////////////////////// */</div><div class='ctx'> /* STRUCTURES */</div><div class='hunk'>@@ -672,42 +540,33 @@ Threshold is a -ve number in units of dB/100,</div><div class='ctx'> /** PCI bus resource */</div><div class='ctx'> struct hpi_pci {</div><div class='ctx'> 	u32 __iomem *ap_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];</div><div class='del'>-	struct pci_dev *p_os_data;</div><div class='add'>+	struct pci_dev *pci_dev;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-#ifndef HPI64BIT		/* keep structure size constant */</div><div class='del'>-	u32 padding[HPI_MAX_ADAPTER_MEM_SPACES + 1];</div><div class='del'>-#endif</div><div class='del'>-	u16 vendor_id;</div><div class='del'>-	u16 device_id;</div><div class='del'>-	u16 subsys_vendor_id;</div><div class='del'>-	u16 subsys_device_id;</div><div class='del'>-	u16 bus_number;</div><div class='del'>-	u16 device_number;</div><div class='del'>-	u32 interrupt;</div><div class='add'>+/** Adapter specification resource */</div><div class='add'>+struct hpi_adapter_specification {</div><div class='add'>+	u32 type;</div><div class='add'>+	u8 modules[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_resource {</div><div class='ctx'> 	union {</div><div class='ctx'> 		const struct hpi_pci *pci;</div><div class='ctx'> 		const char *net_if;</div><div class='add'>+		struct hpi_adapter_specification adapter_spec;</div><div class='add'>+		const void *sw_if;</div><div class='ctx'> 	} r;</div><div class='del'>-#ifndef HPI64BIT		/* keep structure size constant */</div><div class='del'>-	u32 pad_to64;</div><div class='del'>-#endif</div><div class='ctx'> 	u16 bus_type;		/* HPI_BUS_PNPISA, _PCI, _USB etc */</div><div class='ctx'> 	u16 padding;</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** Format info used inside struct hpi_message</div><div class='ctx'>     Not the same as public API struct hpi_format */</div><div class='ctx'> struct hpi_msg_format {</div><div class='del'>-	u32 sample_rate;</div><div class='del'>-				/**&lt; 11025, 32000, 44100 ... */</div><div class='del'>-	u32 bit_rate;	      /**&lt; for MPEG */</div><div class='del'>-	u32 attributes;</div><div class='del'>-				/**&lt; Stereo/JointStereo/Mono */</div><div class='del'>-	u16 channels;	      /**&lt; 1,2..., (or ancillary mode or idle bit */</div><div class='add'>+	u32 sample_rate; /**&lt; 11025, 32000, 44100 etc. */</div><div class='add'>+	u32 bit_rate; /**&lt; for MPEG */</div><div class='add'>+	u32 attributes;	/**&lt; stereo/joint_stereo/mono */</div><div class='add'>+	u16 channels; /**&lt; 1,2..., (or ancillary mode or idle bit */</div><div class='ctx'> 	u16 format; /**&lt; HPI_FORMAT_PCM16, _MPEG etc. see \ref HPI_FORMATS. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -716,7 +575,7 @@ struct hpi_msg_format {</div><div class='ctx'> struct hpi_msg_data {</div><div class='ctx'> 	struct hpi_msg_format format;</div><div class='ctx'> 	u8 *pb_data;</div><div class='del'>-#ifndef HPI64BIT</div><div class='add'>+#ifndef CONFIG_64BIT</div><div class='ctx'> 	u32 padding;</div><div class='ctx'> #endif</div><div class='ctx'> 	u32 data_size;</div><div class='hunk'>@@ -729,7 +588,7 @@ struct hpi_data_legacy32 {</div><div class='ctx'> 	u32 data_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef HPI64BIT</div><div class='add'>+#ifdef CONFIG_64BIT</div><div class='ctx'> /* Compatibility version of struct hpi_data*/</div><div class='ctx'> struct hpi_data_compat32 {</div><div class='ctx'> 	struct hpi_msg_format format;</div><div class='hunk'>@@ -740,9 +599,9 @@ struct hpi_data_compat32 {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> struct hpi_buffer {</div><div class='del'>-  /** placehoder for backward compatability (see dwBufferSize) */</div><div class='add'>+  /** placeholder for backward compatibility (see dwBufferSize) */</div><div class='ctx'> 	struct hpi_msg_format reserved;</div><div class='del'>-	u32 command;	/**&lt; HPI_BUFFER_CMD_xxx*/</div><div class='add'>+	u32 command; /**&lt; HPI_BUFFER_CMD_xxx*/</div><div class='ctx'> 	u32 pci_address; /**&lt; PCI physical address of buffer for DSP DMA */</div><div class='ctx'> 	u32 buffer_size; /**&lt; must line up with data_size of HPI_DATA*/</div><div class='ctx'> };</div><div class='hunk'>@@ -754,7 +613,7 @@ struct hpi_hostbuffer_status {</div><div class='ctx'> 	u32 auxiliary_data_available;</div><div class='ctx'> 	u32 stream_state;</div><div class='ctx'> 	/* DSP index in to the host bus master buffer. */</div><div class='del'>-	u32 dSP_index;</div><div class='add'>+	u32 dsp_index;</div><div class='ctx'> 	/* Host index in to the host bus master buffer. */</div><div class='ctx'> 	u32 host_index;</div><div class='ctx'> 	u32 size_in_bytes;</div><div class='hunk'>@@ -777,60 +636,54 @@ struct hpi_subsys_msg {</div><div class='ctx'> </div><div class='ctx'> struct hpi_subsys_res {</div><div class='ctx'> 	u32 version;</div><div class='del'>-	u32 data;		/* used to return extended version */</div><div class='del'>-	u16 num_adapters;	/* number of adapters */</div><div class='add'>+	u32 data;		/* extended version */</div><div class='add'>+	u16 num_adapters;</div><div class='ctx'> 	u16 adapter_index;</div><div class='del'>-	u16 aw_adapter_list[HPI_MAX_ADAPTERS];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_adapter_msg {</div><div class='del'>-	u32 adapter_mode;	/* adapter mode */</div><div class='del'>-	u16 assert_id;		/* assert number for "test assert" call</div><div class='del'>-				   object_index for find object call</div><div class='del'>-				   query_or_set for hpi_adapter_set_mode_ex() */</div><div class='del'>-	u16 object_type;	/* for adapter find object call */</div><div class='add'>+	u16 adapter_type;</div><div class='add'>+	u16 pad16;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union hpi_adapterx_msg {</div><div class='del'>-	struct hpi_adapter_msg adapter;</div><div class='ctx'> 	struct {</div><div class='del'>-		u32 offset;</div><div class='del'>-	} query_flash;</div><div class='add'>+		u32 dsp_address;</div><div class='add'>+		u32 count_bytes;</div><div class='add'>+	} debug_read;</div><div class='ctx'> 	struct {</div><div class='del'>-		u32 offset;</div><div class='del'>-		u32 length;</div><div class='del'>-		u32 key;</div><div class='del'>-	} start_flash;</div><div class='add'>+		u32 adapter_mode;</div><div class='add'>+		u16 query_or_set;</div><div class='add'>+	} mode;</div><div class='ctx'> 	struct {</div><div class='del'>-		u32 checksum;</div><div class='del'>-		u16 sequence;</div><div class='del'>-		u16 length;</div><div class='del'>-		u16 offset; /**&lt; offset from start of msg to data */</div><div class='del'>-		u16 unused;</div><div class='del'>-	} program_flash;</div><div class='add'>+		u16 index;</div><div class='add'>+	} module_info;</div><div class='add'>+	struct {</div><div class='add'>+		u16 index;</div><div class='add'>+		u16 what;</div><div class='add'>+		u16 property_index;</div><div class='add'>+	} property_enum;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u16 property;</div><div class='ctx'> 		u16 parameter1;</div><div class='ctx'> 		u16 parameter2;</div><div class='ctx'> 	} property_set;</div><div class='ctx'> 	struct {</div><div class='del'>-		u16 index;</div><div class='del'>-		u16 what;</div><div class='del'>-		u16 property_index;</div><div class='del'>-	} property_enum;</div><div class='add'>+		u32 pad32;</div><div class='add'>+		u16 key1;</div><div class='add'>+		u16 key2;</div><div class='add'>+	} restart;</div><div class='ctx'> 	struct {</div><div class='del'>-		u16 index;</div><div class='del'>-	} module_info;</div><div class='add'>+		u32 pad32;</div><div class='add'>+		u16 value;</div><div class='add'>+	} test_assert;</div><div class='ctx'> 	struct {</div><div class='del'>-		u32 dsp_address;</div><div class='del'>-		u32 count_bytes;</div><div class='del'>-	} debug_read;</div><div class='add'>+		u32 message;</div><div class='add'>+	} irq;</div><div class='add'>+	u32 pad[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_adapter_res {</div><div class='ctx'> 	u32 serial_number;</div><div class='ctx'> 	u16 adapter_type;</div><div class='del'>-	u16 adapter_index;	/* is this needed? also used for dsp_index */</div><div class='add'>+	u16 adapter_index;</div><div class='ctx'> 	u16 num_instreams;</div><div class='ctx'> 	u16 num_outstreams;</div><div class='ctx'> 	u16 num_mixers;</div><div class='hunk'>@@ -839,19 +692,25 @@ struct hpi_adapter_res {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union hpi_adapterx_res {</div><div class='del'>-	struct hpi_adapter_res adapter;</div><div class='add'>+	struct hpi_adapter_res info;</div><div class='ctx'> 	struct {</div><div class='del'>-		u32 checksum;</div><div class='del'>-		u32 length;</div><div class='del'>-		u32 version;</div><div class='del'>-	} query_flash;</div><div class='add'>+		u32 p1;</div><div class='add'>+		u16 count;</div><div class='add'>+		u16 dsp_index;</div><div class='add'>+		u32 p2;</div><div class='add'>+		u32 dsp_msg_addr;</div><div class='add'>+		char sz_message[HPI_STRING_LEN];</div><div class='add'>+	} assert;</div><div class='ctx'> 	struct {</div><div class='del'>-		u16 sequence;</div><div class='del'>-	} program_flash;</div><div class='add'>+		u32 adapter_mode;</div><div class='add'>+	} mode;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u16 parameter1;</div><div class='ctx'> 		u16 parameter2;</div><div class='ctx'> 	} property_get;</div><div class='add'>+	struct {</div><div class='add'>+		u32 yes;</div><div class='add'>+	} irq_query;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_stream_msg {</div><div class='hunk'>@@ -863,6 +722,7 @@ struct hpi_stream_msg {</div><div class='ctx'> 		u32 time_scale;</div><div class='ctx'> 		struct hpi_buffer buffer;</div><div class='ctx'> 		struct hpi_streamid stream;</div><div class='add'>+		u32 threshold_bytes;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -911,7 +771,7 @@ struct hpi_stream_res {</div><div class='ctx'> struct hpi_mixer_msg {</div><div class='ctx'> 	u16 control_index;</div><div class='ctx'> 	u16 control_type;	/* = HPI_CONTROL_METER _VOLUME etc */</div><div class='del'>-	u16 padding1;		/* maintain alignment of subsequent fields */</div><div class='add'>+	u16 padding1;		/* Maintain alignment of subsequent fields */</div><div class='ctx'> 	u16 node_type1;		/* = HPI_SOURCENODE_LINEIN etc */</div><div class='ctx'> 	u16 node_index1;	/* = 0..N */</div><div class='ctx'> 	u16 node_type2;</div><div class='hunk'>@@ -949,6 +809,11 @@ union hpi_mixerx_res {</div><div class='ctx'> 		u32 p_data;	/* pointer to data array */</div><div class='ctx'> 		u16 more_to_do;	/* indicates if there is more to do */</div><div class='ctx'> 	} gcabi;</div><div class='add'>+	struct {</div><div class='add'>+		u32 total_controls;	/* count of controls in the mixer */</div><div class='add'>+		u32 cache_controls;	/* count of controls in the cac */</div><div class='add'>+		u32 cache_bytes;	/* size of cache */</div><div class='add'>+	} cache_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_control_msg {</div><div class='hunk'>@@ -1000,107 +865,29 @@ union hpi_control_union_res {</div><div class='ctx'> 		u32 band;</div><div class='ctx'> 		u32 frequency;</div><div class='ctx'> 		u32 gain;</div><div class='del'>-		u32 level;</div><div class='ctx'> 		u32 deemphasis;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			u32 data[2];</div><div class='ctx'> 			u32 bLER;</div><div class='ctx'> 		} rds;</div><div class='add'>+		short s_level;</div><div class='add'>+		struct {</div><div class='add'>+			u16 value;</div><div class='add'>+			u16 mask;</div><div class='add'>+		} status;</div><div class='ctx'> 	} tuner;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		char sz_data[8];</div><div class='ctx'> 		u32 remaining_chars;</div><div class='ctx'> 	} chars8;</div><div class='ctx'> 	char c_data12[12];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* HPI_CONTROLX_STRUCTURES */</div><div class='del'>-</div><div class='del'>-/* Message */</div><div class='del'>-</div><div class='del'>-/** Used for all HMI variables where max length &lt;= 8 bytes</div><div class='del'>-*/</div><div class='del'>-struct hpi_controlx_msg_cobranet_data {</div><div class='del'>-	u32 hmi_address;</div><div class='del'>-	u32 byte_count;</div><div class='del'>-	u32 data[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/** Used for string data, and for packet bridge</div><div class='del'>-*/</div><div class='del'>-struct hpi_controlx_msg_cobranet_bigdata {</div><div class='del'>-	u32 hmi_address;</div><div class='del'>-	u32 byte_count;</div><div class='del'>-	u8 *pb_data;</div><div class='del'>-#ifndef HPI64BIT</div><div class='del'>-	u32 padding;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/** Used for PADS control reading of string fields.</div><div class='del'>-*/</div><div class='del'>-struct hpi_controlx_msg_pad_data {</div><div class='del'>-	u32 field;</div><div class='del'>-	u32 byte_count;</div><div class='del'>-	u8 *pb_data;</div><div class='del'>-#ifndef HPI64BIT</div><div class='del'>-	u32 padding;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/** Used for generic data</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_msg_generic {</div><div class='del'>-	u32 param1;</div><div class='del'>-	u32 param2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_msg {</div><div class='del'>-	u16 attribute;		/* control attribute or property */</div><div class='del'>-	u16 saved_index;</div><div class='ctx'> 	union {</div><div class='del'>-		struct hpi_controlx_msg_cobranet_data cobranet_data;</div><div class='del'>-		struct hpi_controlx_msg_cobranet_bigdata cobranet_bigdata;</div><div class='del'>-		struct hpi_controlx_msg_generic generic;</div><div class='del'>-		struct hpi_controlx_msg_pad_data pad_data;</div><div class='del'>-		/*struct param_value universal_value; */</div><div class='del'>-		/* nothing extra to send for status read */</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Response */</div><div class='del'>-/**</div><div class='del'>-*/</div><div class='del'>-struct hpi_controlx_res_cobranet_data {</div><div class='del'>-	u32 byte_count;</div><div class='del'>-	u32 data[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_res_cobranet_bigdata {</div><div class='del'>-	u32 byte_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_res_cobranet_status {</div><div class='del'>-	u32 status;</div><div class='del'>-	u32 readable_size;</div><div class='del'>-	u32 writeable_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_res_generic {</div><div class='del'>-	u32 param1;</div><div class='del'>-	u32 param2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_controlx_res {</div><div class='del'>-	union {</div><div class='del'>-		struct hpi_controlx_res_cobranet_bigdata cobranet_bigdata;</div><div class='del'>-		struct hpi_controlx_res_cobranet_data cobranet_data;</div><div class='del'>-		struct hpi_controlx_res_cobranet_status cobranet_status;</div><div class='del'>-		struct hpi_controlx_res_generic generic;</div><div class='del'>-		/*struct param_info universal_info; */</div><div class='del'>-		/*struct param_value universal_value; */</div><div class='del'>-	} u;</div><div class='add'>+		struct {</div><div class='add'>+			u32 status;</div><div class='add'>+			u32 readable_size;</div><div class='add'>+			u32 writeable_size;</div><div class='add'>+		} status;</div><div class='add'>+	} cobranet;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_nvmemory_msg {</div><div class='hunk'>@@ -1178,11 +965,11 @@ struct hpi_profile_res_open {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_profile_res_time {</div><div class='del'>-	u32 micro_seconds;</div><div class='add'>+	u32 total_tick_count;</div><div class='ctx'> 	u32 call_count;</div><div class='del'>-	u32 max_micro_seconds;</div><div class='del'>-	u32 min_micro_seconds;</div><div class='del'>-	u16 seconds;</div><div class='add'>+	u32 max_tick_count;</div><div class='add'>+	u32 ticks_per_millisecond;</div><div class='add'>+	u16 profile_interval;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_profile_res_name {</div><div class='hunk'>@@ -1218,7 +1005,6 @@ struct hpi_message {</div><div class='ctx'> 	u16 obj_index;		/*  */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct hpi_subsys_msg s;</div><div class='del'>-		struct hpi_adapter_msg a;</div><div class='ctx'> 		union hpi_adapterx_msg ax;</div><div class='ctx'> 		struct hpi_stream_msg d;</div><div class='ctx'> 		struct hpi_mixer_msg m;</div><div class='hunk'>@@ -1227,7 +1013,6 @@ struct hpi_message {</div><div class='ctx'> 		/* identical to struct hpi_control_msg,</div><div class='ctx'> 		   but field naming is improved */</div><div class='ctx'> 		struct hpi_control_union_msg cu;</div><div class='del'>-		struct hpi_controlx_msg cx;	/* extended mixer control; */</div><div class='ctx'> 		struct hpi_nvmemory_msg n;</div><div class='ctx'> 		struct hpi_gpio_msg l;	/* digital i/o */</div><div class='ctx'> 		struct hpi_watchdog_msg w;</div><div class='hunk'>@@ -1239,7 +1024,7 @@ struct hpi_message {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HPI_MESSAGE_SIZE_BY_OBJECT { \</div><div class='del'>-	sizeof(struct hpi_message_header) ,   /* default, no object type 0 */ \</div><div class='add'>+	sizeof(struct hpi_message_header) ,   /* Default, no object type 0 */ \</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_subsys_msg),\</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(union hpi_adapterx_msg),\</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_stream_msg),\</div><div class='hunk'>@@ -1252,10 +1037,15 @@ struct hpi_message {</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_watchdog_msg),\</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_clock_msg),\</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_profile_msg),\</div><div class='del'>-	sizeof(struct hpi_message_header) + sizeof(struct hpi_controlx_msg),\</div><div class='add'>+	sizeof(struct hpi_message_header), /* controlx obj removed */ \</div><div class='ctx'> 	sizeof(struct hpi_message_header) + sizeof(struct hpi_async_msg) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+Note that the wSpecificError error field should be inspected and potentially</div><div class='add'>+reported whenever HPI_ERROR_DSP_COMMUNICATION or HPI_ERROR_DSP_BOOTLOAD is</div><div class='add'>+returned in wError.</div><div class='add'>+*/</div><div class='ctx'> struct hpi_response_header {</div><div class='ctx'> 	u16 size;</div><div class='ctx'> 	u8 type;		/* HPI_TYPE_RESPONSE  */</div><div class='hunk'>@@ -1277,7 +1067,6 @@ struct hpi_response {</div><div class='ctx'> 	u16 specific_error;	/* adapter specific error */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct hpi_subsys_res s;</div><div class='del'>-		struct hpi_adapter_res a;</div><div class='ctx'> 		union hpi_adapterx_res ax;</div><div class='ctx'> 		struct hpi_stream_res d;</div><div class='ctx'> 		struct hpi_mixer_res m;</div><div class='hunk'>@@ -1285,7 +1074,6 @@ struct hpi_response {</div><div class='ctx'> 		struct hpi_control_res c;	/* mixer control; */</div><div class='ctx'> 		/* identical to hpi_control_res, but field naming is improved */</div><div class='ctx'> 		union hpi_control_union_res cu;</div><div class='del'>-		struct hpi_controlx_res cx;	/* extended mixer control; */</div><div class='ctx'> 		struct hpi_nvmemory_res n;</div><div class='ctx'> 		struct hpi_gpio_res l;	/* digital i/o */</div><div class='ctx'> 		struct hpi_watchdog_res w;</div><div class='hunk'>@@ -1297,7 +1085,7 @@ struct hpi_response {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HPI_RESPONSE_SIZE_BY_OBJECT { \</div><div class='del'>-	sizeof(struct hpi_response_header) ,/* default, no object type 0 */ \</div><div class='add'>+	sizeof(struct hpi_response_header) ,/* Default, no object type 0 */ \</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_subsys_res),\</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(union  hpi_adapterx_res),\</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_stream_res),\</div><div class='hunk'>@@ -1310,11 +1098,11 @@ struct hpi_response {</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_watchdog_res),\</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_clock_res),\</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_profile_res),\</div><div class='del'>-	sizeof(struct hpi_response_header) + sizeof(struct hpi_controlx_res),\</div><div class='add'>+	sizeof(struct hpi_response_header), /* controlx obj removed */ \</div><div class='ctx'> 	sizeof(struct hpi_response_header) + sizeof(struct hpi_async_res) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*********************** version 1 message/response *****************************/</div><div class='add'>+/*********************** version 1 message/response **************************/</div><div class='ctx'> #define HPINET_ETHERNET_DATA_SIZE (1500)</div><div class='ctx'> #define HPINET_IP_HDR_SIZE (20)</div><div class='ctx'> #define HPINET_IP_DATA_SIZE (HPINET_ETHERNET_DATA_SIZE - HPINET_IP_HDR_SIZE)</div><div class='hunk'>@@ -1335,63 +1123,33 @@ struct hpi_res_adapter_get_info {</div><div class='ctx'> 	struct hpi_adapter_res p;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* padding is so these are same size as v0 hpi_message */</div><div class='del'>-struct hpi_msg_adapter_query_flash {</div><div class='del'>-	struct hpi_message_header h;</div><div class='del'>-	u32 offset;</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_message) -	/* V0 res */</div><div class='del'>-		sizeof(struct hpi_message_header) - 1 * sizeof(u32)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* padding is so these are same size as v0 hpi_response */</div><div class='del'>-struct hpi_res_adapter_query_flash {</div><div class='add'>+struct hpi_res_adapter_debug_read {</div><div class='ctx'> 	struct hpi_response_header h;</div><div class='del'>-	u32 checksum;</div><div class='del'>-	u32 length;</div><div class='del'>-	u32 version;</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_response) -	/* V0 res */</div><div class='del'>-		sizeof(struct hpi_response_header) - 3 * sizeof(u32)];</div><div class='add'>+	u8 bytes[1024];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hpi_msg_adapter_start_flash {</div><div class='del'>-	struct hpi_message_header h;</div><div class='del'>-	u32 offset;</div><div class='del'>-	u32 length;</div><div class='del'>-	u32 key;</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_message) -	/* V0 res */</div><div class='del'>-		sizeof(struct hpi_message_header) - 3 * sizeof(u32)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_res_adapter_start_flash {</div><div class='del'>-	struct hpi_response_header h;</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_response) -	/* V0 res */</div><div class='del'>-		sizeof(struct hpi_response_header)];</div><div class='add'>+struct hpi_msg_cobranet_hmi {</div><div class='add'>+	u16 attribute;</div><div class='add'>+	u16 padding;</div><div class='add'>+	u32 hmi_address;</div><div class='add'>+	u32 byte_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hpi_msg_adapter_program_flash_payload {</div><div class='del'>-	u32 checksum;</div><div class='del'>-	u16 sequence;</div><div class='del'>-	u16 length;</div><div class='del'>-	u16 offset; /**&lt; offset from start of msg to data */</div><div class='del'>-	u16 unused;</div><div class='del'>-	/* ensure sizeof(header + payload) == sizeof(hpi_message_V0)</div><div class='del'>-	   because old firmware expects data after message of this size */</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_message) -	/* V0 message */</div><div class='del'>-		sizeof(struct hpi_message_header) - sizeof(u32) -</div><div class='del'>-		4 * sizeof(u16)];</div><div class='add'>+struct hpi_msg_cobranet_hmiwrite {</div><div class='add'>+	struct hpi_message_header h;</div><div class='add'>+	struct hpi_msg_cobranet_hmi p;</div><div class='add'>+	u8 bytes[256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hpi_msg_adapter_program_flash {</div><div class='add'>+struct hpi_msg_cobranet_hmiread {</div><div class='ctx'> 	struct hpi_message_header h;</div><div class='del'>-	struct hpi_msg_adapter_program_flash_payload p;</div><div class='del'>-	u32 data[256];</div><div class='add'>+	struct hpi_msg_cobranet_hmi p;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hpi_res_adapter_program_flash {</div><div class='add'>+struct hpi_res_cobranet_hmiread {</div><div class='ctx'> 	struct hpi_response_header h;</div><div class='del'>-	u16 sequence;</div><div class='del'>-	u8 pad_to_version0_size[sizeof(struct hpi_response) -	/* V0 res */</div><div class='del'>-		sizeof(struct hpi_response_header) - sizeof(u16)];</div><div class='add'>+	u32 byte_count;</div><div class='add'>+	u8 bytes[256];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='hunk'>@@ -1414,30 +1172,16 @@ struct hpi_response_header_v1 {</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* STRV HPI Packet */</div><div class='del'>-struct hpi_msg_strv {</div><div class='del'>-	struct hpi_message_header h;</div><div class='del'>-	struct hpi_entity strv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hpi_res_strv {</div><div class='del'>-	struct hpi_response_header h;</div><div class='del'>-	struct hpi_entity strv;</div><div class='del'>-};</div><div class='del'>-#define MIN_STRV_PACKET_SIZE sizeof(struct hpi_res_strv)</div><div class='del'>-</div><div class='ctx'> struct hpi_msg_payload_v0 {</div><div class='ctx'> 	struct hpi_message_header h;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct hpi_subsys_msg s;</div><div class='del'>-		struct hpi_adapter_msg a;</div><div class='ctx'> 		union hpi_adapterx_msg ax;</div><div class='ctx'> 		struct hpi_stream_msg d;</div><div class='ctx'> 		struct hpi_mixer_msg m;</div><div class='ctx'> 		union hpi_mixerx_msg mx;</div><div class='ctx'> 		struct hpi_control_msg c;</div><div class='ctx'> 		struct hpi_control_union_msg cu;</div><div class='del'>-		struct hpi_controlx_msg cx;</div><div class='ctx'> 		struct hpi_nvmemory_msg n;</div><div class='ctx'> 		struct hpi_gpio_msg l;</div><div class='ctx'> 		struct hpi_watchdog_msg w;</div><div class='hunk'>@@ -1451,14 +1195,12 @@ struct hpi_res_payload_v0 {</div><div class='ctx'> 	struct hpi_response_header h;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct hpi_subsys_res s;</div><div class='del'>-		struct hpi_adapter_res a;</div><div class='ctx'> 		union hpi_adapterx_res ax;</div><div class='ctx'> 		struct hpi_stream_res d;</div><div class='ctx'> 		struct hpi_mixer_res m;</div><div class='ctx'> 		union hpi_mixerx_res mx;</div><div class='ctx'> 		struct hpi_control_res c;</div><div class='ctx'> 		union hpi_control_union_res cu;</div><div class='del'>-		struct hpi_controlx_res cx;</div><div class='ctx'> 		struct hpi_nvmemory_res n;</div><div class='ctx'> 		struct hpi_gpio_res l;</div><div class='ctx'> 		struct hpi_watchdog_res w;</div><div class='hunk'>@@ -1471,13 +1213,13 @@ struct hpi_res_payload_v0 {</div><div class='ctx'> union hpi_message_buffer_v1 {</div><div class='ctx'> 	struct hpi_message m0;	/* version 0 */</div><div class='ctx'> 	struct hpi_message_header_v1 h;</div><div class='del'>-	unsigned char buf[HPI_MAX_PAYLOAD_SIZE];</div><div class='add'>+	u8 buf[HPI_MAX_PAYLOAD_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union hpi_response_buffer_v1 {</div><div class='ctx'> 	struct hpi_response r0;	/* version 0 */</div><div class='ctx'> 	struct hpi_response_header_v1 h;</div><div class='del'>-	unsigned char buf[HPI_MAX_PAYLOAD_SIZE];</div><div class='add'>+	u8 buf[HPI_MAX_PAYLOAD_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> compile_time_assert((sizeof(union hpi_message_buffer_v1) &lt;=</div><div class='hunk'>@@ -1499,6 +1241,11 @@ struct hpi_control_defn {</div><div class='ctx'> /*////////////////////////////////////////////////////////////////////////// */</div><div class='ctx'> /* declarations for control caching (internal to HPI&lt;-&gt;DSP interaction)      */</div><div class='ctx'> </div><div class='add'>+/** indicates a cached u16 value is invalid. */</div><div class='add'>+#define HPI_CACHE_INVALID_UINT16 0xFFFF</div><div class='add'>+/** indicates a cached short value is invalid. */</div><div class='add'>+#define HPI_CACHE_INVALID_SHORT -32768</div><div class='add'>+</div><div class='ctx'> /** A compact representation of (part of) a controls state.</div><div class='ctx'> Used for efficient transfer of the control state</div><div class='ctx'> between DSP and host or across a network</div><div class='hunk'>@@ -1512,67 +1259,106 @@ struct hpi_control_cache_info {</div><div class='ctx'> 	u16 control_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct hpi_control_cache_single {</div><div class='add'>+struct hpi_control_cache_vol {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	short an_log[2];</div><div class='add'>+	unsigned short flags;</div><div class='add'>+	char padding[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_meter {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	short an_log_peak[2];</div><div class='add'>+	short an_logRMS[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_channelmode {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u16 mode;</div><div class='add'>+	char temp_padding[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_mux {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u16 source_node_type;</div><div class='add'>+	u16 source_node_index;</div><div class='add'>+	char temp_padding[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_level {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	short an_log[2];</div><div class='add'>+	char temp_padding[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_tuner {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u32 freq_ink_hz;</div><div class='add'>+	u16 band;</div><div class='add'>+	short s_level_avg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_aes3rx {</div><div class='ctx'> 	struct hpi_control_cache_info i;</div><div class='add'>+	u32 error_status;</div><div class='add'>+	u32 format;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_aes3tx {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u32 format;</div><div class='add'>+	char temp_padding[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_tonedetector {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u16 state;</div><div class='add'>+	char temp_padding[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_silencedetector {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u32 state;</div><div class='add'>+	char temp_padding[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_sampleclock {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u16 source;</div><div class='add'>+	u16 source_index;</div><div class='add'>+	u32 sample_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_microphone {</div><div class='add'>+	struct hpi_control_cache_info i;</div><div class='add'>+	u16 phantom_state;</div><div class='add'>+	char temp_padding[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hpi_control_cache_single {</div><div class='ctx'> 	union {</div><div class='del'>-		struct {	/* volume */</div><div class='del'>-			short an_log[2];</div><div class='del'>-		} v;</div><div class='del'>-		struct {	/* peak meter */</div><div class='del'>-			short an_log_peak[2];</div><div class='del'>-			short an_logRMS[2];</div><div class='del'>-		} p;</div><div class='del'>-		struct {	/* channel mode */</div><div class='del'>-			u16 mode;</div><div class='del'>-		} m;</div><div class='del'>-		struct {	/* multiplexer */</div><div class='del'>-			u16 source_node_type;</div><div class='del'>-			u16 source_node_index;</div><div class='del'>-		} x;</div><div class='del'>-		struct {	/* level/trim */</div><div class='del'>-			short an_log[2];</div><div class='del'>-		} l;</div><div class='del'>-		struct {	/* tuner - partial caching.</div><div class='del'>-				   some attributes go to the DSP. */</div><div class='del'>-			u32 freq_ink_hz;</div><div class='del'>-			u16 band;</div><div class='del'>-			u16 level;</div><div class='del'>-		} t;</div><div class='del'>-		struct {	/* AESEBU rx status */</div><div class='del'>-			u32 error_status;</div><div class='del'>-			u32 source;</div><div class='del'>-		} aes3rx;</div><div class='del'>-		struct {	/* AESEBU tx */</div><div class='del'>-			u32 format;</div><div class='del'>-		} aes3tx;</div><div class='del'>-		struct {	/* tone detector */</div><div class='del'>-			u16 state;</div><div class='del'>-		} tone;</div><div class='del'>-		struct {	/* silence detector */</div><div class='del'>-			u32 state;</div><div class='del'>-			u32 count;</div><div class='del'>-		} silence;</div><div class='del'>-		struct {	/* sample clock */</div><div class='del'>-			u16 source;</div><div class='del'>-			u16 source_index;</div><div class='del'>-			u32 sample_rate;</div><div class='del'>-		} clk;</div><div class='del'>-		struct {	/* microphone control */</div><div class='del'>-			u16 state;</div><div class='del'>-		} phantom_power;</div><div class='del'>-		struct {	/* generic control */</div><div class='del'>-			u32 dw1;</div><div class='del'>-			u32 dw2;</div><div class='del'>-		} g;</div><div class='add'>+		struct hpi_control_cache_info i;</div><div class='add'>+		struct hpi_control_cache_vol vol;</div><div class='add'>+		struct hpi_control_cache_meter meter;</div><div class='add'>+		struct hpi_control_cache_channelmode mode;</div><div class='add'>+		struct hpi_control_cache_mux mux;</div><div class='add'>+		struct hpi_control_cache_level level;</div><div class='add'>+		struct hpi_control_cache_tuner tuner;</div><div class='add'>+		struct hpi_control_cache_aes3rx aes3rx;</div><div class='add'>+		struct hpi_control_cache_aes3tx aes3tx;</div><div class='add'>+		struct hpi_control_cache_tonedetector tone;</div><div class='add'>+		struct hpi_control_cache_silencedetector silence;</div><div class='add'>+		struct hpi_control_cache_sampleclock clk;</div><div class='add'>+		struct hpi_control_cache_microphone microphone;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_control_cache_pad {</div><div class='ctx'> 	struct hpi_control_cache_info i;</div><div class='ctx'> 	u32 field_valid_flags;</div><div class='del'>-	u8 c_channel[8];</div><div class='del'>-	u8 c_artist[40];</div><div class='del'>-	u8 c_title[40];</div><div class='add'>+	u8 c_channel[40];</div><div class='add'>+	u8 c_artist[100];</div><div class='add'>+	u8 c_title[100];</div><div class='ctx'> 	u8 c_comment[200];</div><div class='ctx'> 	u32 pTY;</div><div class='ctx'> 	u32 pI;</div><div class='hunk'>@@ -1580,11 +1366,10 @@ struct hpi_control_cache_pad {</div><div class='ctx'> 	u32 traffic_anouncement;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*/////////////////////////////////////////////////////////////////////////// */</div><div class='del'>-/* declarations for 2^N sized FIFO buffer (internal to HPI&lt;-&gt;DSP interaction) */</div><div class='add'>+/* 2^N sized FIFO buffer (internal to HPI&lt;-&gt;DSP interaction) */</div><div class='ctx'> struct hpi_fifo_buffer {</div><div class='ctx'> 	u32 size;</div><div class='del'>-	u32 dSP_index;</div><div class='add'>+	u32 dsp_index;</div><div class='ctx'> 	u32 host_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1606,29 +1391,15 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,</div><div class='ctx'> /*////////////////////////////////////////////////////////////////////////// */</div><div class='ctx'> </div><div class='ctx'> /* main HPI entry point */</div><div class='del'>-hpi_handler_func hpi_send_recv;</div><div class='del'>-</div><div class='del'>-/* UDP message */</div><div class='del'>-void hpi_send_recvUDP(struct hpi_message *phm, struct hpi_response *phr,</div><div class='del'>-	const unsigned int timeout);</div><div class='add'>+void hpi_send_recv(struct hpi_message *phm, struct hpi_response *phr);</div><div class='ctx'> </div><div class='ctx'> /* used in PnP OS/driver */</div><div class='del'>-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const struct hpi_resource *p_resource, u16 *pw_adapter_index);</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index);</div><div class='del'>-</div><div class='del'>-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u8 **pp_buffer,</div><div class='add'>+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,</div><div class='ctx'> 	struct hpi_hostbuffer_status **pp_status);</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u8 **pp_buffer,</div><div class='add'>+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,</div><div class='ctx'> 	struct hpi_hostbuffer_status **pp_status);</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_restart(u16 adapter_index);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'> The following 3 functions were last declared in header files for</div><div class='ctx'> driver 3.10. HPI_ControlQuery() used to be the recommended way</div><div class='hunk'>@@ -1642,9 +1413,7 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR);</div><div class='ctx'> </div><div class='ctx'> /*////////////////////////////////////////////////////////////////////////// */</div><div class='ctx'> /* declarations for individual HPI entry points */</div><div class='del'>-hpi_handler_func HPI_1000;</div><div class='ctx'> hpi_handler_func HPI_6000;</div><div class='ctx'> hpi_handler_func HPI_6205;</div><div class='del'>-hpi_handler_func HPI_COMMON;</div><div class='ctx'> </div><div class='ctx'> #endif				/* _HPI_INTERNAL_H_ */</div><div class='head'>diff --git a/sound/pci/asihpi/hpi_version.h b/sound/pci/asihpi/hpi_version.h<br/>new file mode 100644<br/>index 000000000000..016bc55457e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpi_version.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpi_version.h</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/** HPI Version Definitions</div><div class='add'>+Development releases have odd minor version.</div><div class='add'>+Production releases have even minor version.</div><div class='add'>+</div><div class='add'>+\file hpi_version.h</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#ifndef _HPI_VERSION_H</div><div class='add'>+#define _HPI_VERSION_H</div><div class='add'>+</div><div class='add'>+/* Use single digits for versions less that 10 to avoid octal. */</div><div class='add'>+/* *** HPI_VER is the only edit required to update version *** */</div><div class='add'>+/** HPI version */</div><div class='add'>+#define HPI_VER HPI_VERSION_CONSTRUCTOR(4, 14, 3)</div><div class='add'>+</div><div class='add'>+/** HPI version string in dotted decimal format */</div><div class='add'>+#define HPI_VER_STRING "4.14.03"</div><div class='add'>+</div><div class='add'>+/** Library version as documented in hpi-api-versions.txt */</div><div class='add'>+#define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(10, 4, 0)</div><div class='add'>+</div><div class='add'>+/** Construct hpi version number from major, minor, release numbers */</div><div class='add'>+#define HPI_VERSION_CONSTRUCTOR(maj, min, r) ((maj &lt;&lt; 16) + (min &lt;&lt; 8) + r)</div><div class='add'>+</div><div class='add'>+/** Extract major version from hpi version number */</div><div class='add'>+#define HPI_VER_MAJOR(v) ((int)(v &gt;&gt; 16))</div><div class='add'>+/** Extract minor version from hpi version number */</div><div class='add'>+#define HPI_VER_MINOR(v) ((int)((v &gt;&gt; 8) &amp; 0xFF))</div><div class='add'>+/** Extract release from hpi version number */</div><div class='add'>+#define HPI_VER_RELEASE(v) ((int)(v &amp; 0xFF))</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c<br/>index dda4f1c6f658..7d1abaedb46a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpicmn.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpicmn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpicmn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpicmn.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> \file hpicmn.c</div><div class='ctx'> </div><div class='hunk'>@@ -26,6 +15,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='ctx'> #include "hpidebug.h"</div><div class='add'>+#include "hpimsginit.h"</div><div class='add'>+</div><div class='ctx'> #include "hpicmn.h"</div><div class='ctx'> </div><div class='ctx'> struct hpi_adapters_list {</div><div class='hunk'>@@ -37,26 +28,38 @@ struct hpi_adapters_list {</div><div class='ctx'> static struct hpi_adapters_list adapters;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* Given an HPI Message that was sent out and a response that was received,</div><div class='del'>-* validate that the response has the correct fields filled in,</div><div class='del'>-* i.e ObjectType, Function etc</div><div class='del'>-**/</div><div class='add'>+ * hpi_validate_response - Given an HPI Message that was sent out and</div><div class='add'>+ * a response that was received, validate that the response has the</div><div class='add'>+ * correct fields filled in, i.e ObjectType, Function etc</div><div class='add'>+ * @phm: message</div><div class='add'>+ * @phr: response</div><div class='add'>+ */</div><div class='ctx'> u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	if (phr-&gt;type != HPI_TYPE_RESPONSE) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "header type %d invalid\n", phr-&gt;type);</div><div class='add'>+		return HPI_ERROR_INVALID_RESPONSE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if ((phr-&gt;type != HPI_TYPE_RESPONSE)</div><div class='del'>-		|| (phr-&gt;object != phm-&gt;object)</div><div class='del'>-		|| (phr-&gt;function != phm-&gt;function))</div><div class='del'>-		error = HPI_ERROR_INVALID_RESPONSE;</div><div class='add'>+	if (phr-&gt;object != phm-&gt;object) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "header object %d invalid\n",</div><div class='add'>+			phr-&gt;object);</div><div class='add'>+		return HPI_ERROR_INVALID_RESPONSE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phr-&gt;function != phm-&gt;function) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "header function %d invalid\n",</div><div class='add'>+			phr-&gt;function);</div><div class='add'>+		return HPI_ERROR_INVALID_RESPONSE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 hpi_add_adapter(struct hpi_adapter_obj *pao)</div><div class='ctx'> {</div><div class='ctx'> 	u16 retval = 0;</div><div class='del'>-	/*HPI_ASSERT(pao-&gt;wAdapterType); */</div><div class='add'>+	/*HPI_ASSERT(pao-&gt;type); */</div><div class='ctx'> </div><div class='ctx'> 	hpios_alistlock_lock(&amp;adapters);</div><div class='ctx'> </div><div class='hunk'>@@ -65,9 +68,19 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (adapters.adapter[pao-&gt;index].adapter_type) {</div><div class='del'>-		{</div><div class='del'>-			retval = HPI_DUPLICATE_ADAPTER_NUMBER;</div><div class='add'>+	if (adapters.adapter[pao-&gt;index].type) {</div><div class='add'>+		int a;</div><div class='add'>+		for (a = HPI_MAX_ADAPTERS - 1; a &gt;= 0; a--) {</div><div class='add'>+			if (!adapters.adapter[a].type) {</div><div class='add'>+				HPI_DEBUG_LOG(WARNING,</div><div class='add'>+					"ASI%X duplicate index %d moved to %d\n",</div><div class='add'>+					pao-&gt;type, pao-&gt;index, a);</div><div class='add'>+				pao-&gt;index = a;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (a &lt; 0) {</div><div class='add'>+			retval = HPI_ERROR_DUPLICATE_ADAPTER_NUMBER;</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -76,36 +89,42 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)</div><div class='ctx'> 	adapters.gw_num_adapters++;</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	hpios_alistlock_un_lock(&amp;adapters);</div><div class='add'>+	hpios_alistlock_unlock(&amp;adapters);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpi_delete_adapter(struct hpi_adapter_obj *pao)</div><div class='ctx'> {</div><div class='del'>-	memset(pao, 0, sizeof(struct hpi_adapter_obj));</div><div class='add'>+	if (!pao-&gt;type) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "removing null adapter?\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	hpios_alistlock_lock(&amp;adapters);</div><div class='del'>-	adapters.gw_num_adapters--;	/* dec the number of adapters */</div><div class='del'>-	hpios_alistlock_un_lock(&amp;adapters);</div><div class='add'>+	if (adapters.adapter[pao-&gt;index].type)</div><div class='add'>+		adapters.gw_num_adapters--;</div><div class='add'>+	memset(&amp;adapters.adapter[pao-&gt;index], 0, sizeof(adapters.adapter[0]));</div><div class='add'>+	hpios_alistlock_unlock(&amp;adapters);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-* FindAdapter returns a pointer to the struct hpi_adapter_obj with</div><div class='del'>-* index wAdapterIndex in an HPI_ADAPTERS_LIST structure.</div><div class='del'>-*</div><div class='del'>-*/</div><div class='add'>+ * hpi_find_adapter - FindAdapter returns a pointer to the struct</div><div class='add'>+ * hpi_adapter_obj with index wAdapterIndex in an HPI_ADAPTERS_LIST</div><div class='add'>+ * structure.</div><div class='add'>+ * @adapter_index: value in [0, HPI_MAX_ADAPTERS[</div><div class='add'>+ */</div><div class='ctx'> struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_adapter_obj *pao = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter_index &gt;= HPI_MAX_ADAPTERS) {</div><div class='del'>-		HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d ",</div><div class='add'>+		HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d\n",</div><div class='ctx'> 			adapter_index);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pao = &amp;adapters.adapter[adapter_index];</div><div class='del'>-	if (pao-&gt;adapter_type != 0) {</div><div class='add'>+	if (pao-&gt;type != 0) {</div><div class='ctx'> 		/*</div><div class='ctx'> 		   HPI_DEBUG_LOG(VERBOSE, "Found adapter index %d\n",</div><div class='ctx'> 		   wAdapterIndex);</div><div class='hunk'>@@ -121,55 +140,37 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>-*</div><div class='del'>-* wipe an HPI_ADAPTERS_LIST structure.</div><div class='del'>-*</div><div class='del'>-**/</div><div class='del'>-static void wipe_adapter_list(void</div><div class='del'>-	)</div><div class='add'>+ * wipe_adapter_list - wipe an HPI_ADAPTERS_LIST structure.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+static void wipe_adapter_list(void)</div><div class='ctx'> {</div><div class='ctx'> 	memset(&amp;adapters, 0, sizeof(adapters));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>-* SubSysGetAdapters fills awAdapterList in an struct hpi_response structure</div><div class='del'>-* with all adapters in the given HPI_ADAPTERS_LIST.</div><div class='del'>-*</div><div class='del'>-*/</div><div class='del'>-static void subsys_get_adapters(struct hpi_response *phr)</div><div class='add'>+static void subsys_get_adapter(struct hpi_message *phm,</div><div class='add'>+	struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	/* fill in the response adapter array with the position */</div><div class='del'>-	/* identified by the adapter number/index of the adapters in */</div><div class='del'>-	/* this HPI */</div><div class='del'>-	/* i.e. if we have an A120 with it's jumper set to */</div><div class='del'>-	/* Adapter Number 2 then put an Adapter type A120 in the */</div><div class='del'>-	/* array in position 1 */</div><div class='del'>-	/* NOTE: AdapterNumber is 1..N, Index is 0..N-1 */</div><div class='del'>-</div><div class='del'>-	/* input:  NONE */</div><div class='del'>-	/* output: wNumAdapters */</div><div class='del'>-	/*                 awAdapter[] */</div><div class='del'>-	/* */</div><div class='del'>-</div><div class='del'>-	short i;</div><div class='del'>-	struct hpi_adapter_obj *pao = NULL;</div><div class='del'>-</div><div class='del'>-	HPI_DEBUG_LOG(VERBOSE, "subsys_get_adapters\n");</div><div class='add'>+	int count = phm-&gt;obj_index;</div><div class='add'>+	u16 index = 0;</div><div class='ctx'> </div><div class='del'>-	/* for each adapter, place it's type in the position of the array */</div><div class='del'>-	/* corresponding to it's adapter number */</div><div class='del'>-	for (i = 0; i &lt; adapters.gw_num_adapters; i++) {</div><div class='del'>-		pao = &amp;adapters.adapter[i];</div><div class='del'>-		if (phr-&gt;u.s.aw_adapter_list[pao-&gt;index] != 0) {</div><div class='del'>-			phr-&gt;error = HPI_DUPLICATE_ADAPTER_NUMBER;</div><div class='del'>-			phr-&gt;specific_error = pao-&gt;index;</div><div class='del'>-			return;</div><div class='add'>+	/* find the nCount'th nonzero adapter in array */</div><div class='add'>+	for (index = 0; index &lt; HPI_MAX_ADAPTERS; index++) {</div><div class='add'>+		if (adapters.adapter[index].type) {</div><div class='add'>+			if (!count)</div><div class='add'>+				break;</div><div class='add'>+			count--;</div><div class='ctx'> 		}</div><div class='del'>-		phr-&gt;u.s.aw_adapter_list[pao-&gt;index] = pao-&gt;adapter_type;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phr-&gt;u.s.num_adapters = adapters.gw_num_adapters;</div><div class='del'>-	phr-&gt;error = 0;	/* the function completed OK; */</div><div class='add'>+	if (index &lt; HPI_MAX_ADAPTERS) {</div><div class='add'>+		phr-&gt;u.s.adapter_index = adapters.adapter[index].index;</div><div class='add'>+		phr-&gt;u.s.adapter_type = adapters.adapter[index].type;</div><div class='add'>+	} else {</div><div class='add'>+		phr-&gt;u.s.adapter_index = 0;</div><div class='add'>+		phr-&gt;u.s.adapter_type = 0;</div><div class='add'>+		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)</div><div class='hunk'>@@ -178,67 +179,107 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)</div><div class='ctx'> 	int cached = 0;</div><div class='ctx'> 	if (!pC)</div><div class='ctx'> 		return 0;</div><div class='del'>-	if ((!pC-&gt;init) &amp;&amp; (pC-&gt;p_cache != NULL) &amp;&amp; (pC-&gt;control_count)</div><div class='del'>-		&amp;&amp; (pC-&gt;cache_size_in_bytes)</div><div class='del'>-		) {</div><div class='del'>-		u32 *p_master_cache;</div><div class='del'>-		pC-&gt;init = 1;</div><div class='del'>-</div><div class='del'>-		p_master_cache = (u32 *)pC-&gt;p_cache;</div><div class='del'>-		HPI_DEBUG_LOG(VERBOSE, "check %d controls\n",</div><div class='add'>+</div><div class='add'>+	if (pC-&gt;init)</div><div class='add'>+		return pC-&gt;init;</div><div class='add'>+</div><div class='add'>+	if (!pC-&gt;p_cache)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (pC-&gt;control_count &amp;&amp; pC-&gt;cache_size_in_bytes) {</div><div class='add'>+		char *p_master_cache;</div><div class='add'>+		unsigned int byte_count = 0;</div><div class='add'>+</div><div class='add'>+		p_master_cache = (char *)pC-&gt;p_cache;</div><div class='add'>+		HPI_DEBUG_LOG(DEBUG, "check %d controls\n",</div><div class='ctx'> 			pC-&gt;control_count);</div><div class='ctx'> 		for (i = 0; i &lt; pC-&gt;control_count; i++) {</div><div class='ctx'> 			struct hpi_control_cache_info *info =</div><div class='ctx'> 				(struct hpi_control_cache_info *)</div><div class='del'>-				p_master_cache;</div><div class='add'>+				&amp;p_master_cache[byte_count];</div><div class='add'>+			u16 control_index = info-&gt;control_index;</div><div class='add'>+</div><div class='add'>+			if (control_index &gt;= pC-&gt;control_count) {</div><div class='add'>+				HPI_DEBUG_LOG(INFO,</div><div class='add'>+					"adap %d control index %d out of range, cache not ready?\n",</div><div class='add'>+					pC-&gt;adap_idx, control_index);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!info-&gt;size_in32bit_words) {</div><div class='add'>+				if (!i) {</div><div class='add'>+					HPI_DEBUG_LOG(INFO,</div><div class='add'>+						"adap %d cache not ready?\n",</div><div class='add'>+						pC-&gt;adap_idx);</div><div class='add'>+					return 0;</div><div class='add'>+				}</div><div class='add'>+				/* The cache is invalid.</div><div class='add'>+				 * Minimum valid entry size is</div><div class='add'>+				 * sizeof(struct hpi_control_cache_info)</div><div class='add'>+				 */</div><div class='add'>+				HPI_DEBUG_LOG(ERROR,</div><div class='add'>+					"adap %d zero size cache entry %d\n",</div><div class='add'>+					pC-&gt;adap_idx, i);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			if (info-&gt;control_type) {</div><div class='del'>-				pC-&gt;p_info[i] = info;</div><div class='add'>+				pC-&gt;p_info[control_index] = info;</div><div class='ctx'> 				cached++;</div><div class='del'>-			} else</div><div class='del'>-				pC-&gt;p_info[i] = NULL;</div><div class='add'>+			} else {	/* dummy cache entry */</div><div class='add'>+				pC-&gt;p_info[control_index] = NULL;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			if (info-&gt;size_in32bit_words)</div><div class='del'>-				p_master_cache += info-&gt;size_in32bit_words;</div><div class='del'>-			else</div><div class='del'>-				p_master_cache +=</div><div class='del'>-					sizeof(struct</div><div class='del'>-					hpi_control_cache_single) /</div><div class='del'>-					sizeof(u32);</div><div class='add'>+			byte_count += info-&gt;size_in32bit_words * 4;</div><div class='ctx'> </div><div class='ctx'> 			HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-				"cached %d, pinfo %p index %d type %d\n",</div><div class='del'>-				cached, pC-&gt;p_info[i], info-&gt;control_index,</div><div class='del'>-				info-&gt;control_type);</div><div class='add'>+				"cached %d, pinfo %p index %d type %d size %d\n",</div><div class='add'>+				cached, pC-&gt;p_info[info-&gt;control_index],</div><div class='add'>+				info-&gt;control_index, info-&gt;control_type,</div><div class='add'>+				info-&gt;size_in32bit_words);</div><div class='add'>+</div><div class='add'>+			/* quit loop early if whole cache has been scanned.</div><div class='add'>+			 * dwControlCount is the maximum possible entries</div><div class='add'>+			 * but some may be absent from the cache</div><div class='add'>+			 */</div><div class='add'>+			if (byte_count &gt;= pC-&gt;cache_size_in_bytes)</div><div class='add'>+				break;</div><div class='add'>+			/* have seen last control index */</div><div class='add'>+			if (info-&gt;control_index == pC-&gt;control_count - 1)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		/*</div><div class='del'>-		   We didn't find anything to cache, so try again later !</div><div class='del'>-		 */</div><div class='del'>-		if (!cached)</div><div class='del'>-			pC-&gt;init = 0;</div><div class='add'>+</div><div class='add'>+		if (byte_count != pC-&gt;cache_size_in_bytes)</div><div class='add'>+			HPI_DEBUG_LOG(WARNING,</div><div class='add'>+				"adap %d bytecount %d != cache size %d\n",</div><div class='add'>+				pC-&gt;adap_idx, byte_count,</div><div class='add'>+				pC-&gt;cache_size_in_bytes);</div><div class='add'>+		else</div><div class='add'>+			HPI_DEBUG_LOG(DEBUG,</div><div class='add'>+				"adap %d cache good, bytecount == cache size = %d\n",</div><div class='add'>+				pC-&gt;adap_idx, byte_count);</div><div class='add'>+</div><div class='add'>+		pC-&gt;init = (u16)cached;</div><div class='ctx'> 	}</div><div class='ctx'> 	return pC-&gt;init;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** Find a control.</div><div class='ctx'> */</div><div class='del'>-static short find_control(struct hpi_message *phm,</div><div class='del'>-	struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI,</div><div class='del'>-	u16 *pw_control_index)</div><div class='add'>+static short find_control(u16 control_index,</div><div class='add'>+	struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI)</div><div class='ctx'> {</div><div class='del'>-	*pw_control_index = phm-&gt;obj_index;</div><div class='del'>-</div><div class='ctx'> 	if (!control_cache_alloc_check(p_cache)) {</div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-			"control_cache_alloc_check() failed. adap%d ci%d\n",</div><div class='del'>-			phm-&gt;adapter_index, *pw_control_index);</div><div class='add'>+			"control_cache_alloc_check() failed %d\n",</div><div class='add'>+			control_index);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*pI = p_cache-&gt;p_info[*pw_control_index];</div><div class='add'>+	*pI = p_cache-&gt;p_info[control_index];</div><div class='ctx'> 	if (!*pI) {</div><div class='del'>-		HPI_DEBUG_LOG(VERBOSE, "uncached adap %d, control %d\n",</div><div class='del'>-			phm-&gt;adapter_index, *pw_control_index);</div><div class='add'>+		HPI_DEBUG_LOG(VERBOSE, "Uncached Control %d\n",</div><div class='add'>+			control_index);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		HPI_DEBUG_LOG(VERBOSE, "find_control() type %d\n",</div><div class='hunk'>@@ -247,25 +288,6 @@ static short find_control(struct hpi_message *phm,</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** Used by the kernel driver to figure out if a buffer needs mapping.</div><div class='del'>- */</div><div class='del'>-short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,</div><div class='del'>-	struct hpi_message *phm, void **p, unsigned int *pN)</div><div class='del'>-{</div><div class='del'>-	*pN = 0;</div><div class='del'>-	*p = NULL;</div><div class='del'>-	if ((phm-&gt;function == HPI_CONTROL_GET_STATE)</div><div class='del'>-		&amp;&amp; (phm-&gt;object == HPI_OBJ_CONTROLEX)</div><div class='del'>-		) {</div><div class='del'>-		u16 control_index;</div><div class='del'>-		struct hpi_control_cache_info *pI;</div><div class='del'>-</div><div class='del'>-		if (!find_control(phm, p_cache, &amp;pI, &amp;control_index))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* allow unified treatment of several string fields within struct */</div><div class='ctx'> #define HPICMN_PAD_OFS_AND_SIZE(m)  {\</div><div class='ctx'> 	offsetof(struct hpi_control_cache_pad, m), \</div><div class='hunk'>@@ -276,7 +298,7 @@ struct pad_ofs_size {</div><div class='ctx'> 	unsigned int field_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct pad_ofs_size pad_desc[] = {</div><div class='add'>+static const struct pad_ofs_size pad_desc[] = {</div><div class='ctx'> 	HPICMN_PAD_OFS_AND_SIZE(c_channel),	/* HPI_PAD_CHANNEL_NAME */</div><div class='ctx'> 	HPICMN_PAD_OFS_AND_SIZE(c_artist),	/* HPI_PAD_ARTIST */</div><div class='ctx'> 	HPICMN_PAD_OFS_AND_SIZE(c_title),	/* HPI_PAD_TITLE */</div><div class='hunk'>@@ -286,79 +308,94 @@ static struct pad_ofs_size pad_desc[] = {</div><div class='ctx'> /** CheckControlCache checks the cache and fills the struct hpi_response</div><div class='ctx'>  * accordingly. It returns one if a cache hit occurred, zero otherwise.</div><div class='ctx'>  */</div><div class='del'>-short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='add'>+short hpi_check_control_cache_single(struct hpi_control_cache_single *pC,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='add'>+	size_t response_size;</div><div class='ctx'> 	short found = 1;</div><div class='del'>-	u16 control_index;</div><div class='del'>-	struct hpi_control_cache_info *pI;</div><div class='del'>-	struct hpi_control_cache_single *pC;</div><div class='del'>-	struct hpi_control_cache_pad *p_pad;</div><div class='del'>-</div><div class='del'>-	if (!find_control(phm, p_cache, &amp;pI, &amp;control_index))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	phr-&gt;error = 0;</div><div class='ctx'> </div><div class='del'>-	/* pC is the default cached control strucure. May be cast to</div><div class='del'>-	   something else in the following switch statement.</div><div class='del'>-	 */</div><div class='del'>-	pC = (struct hpi_control_cache_single *)pI;</div><div class='del'>-	p_pad = (struct hpi_control_cache_pad *)pI;</div><div class='add'>+	/* set the default response size */</div><div class='add'>+	response_size =</div><div class='add'>+		sizeof(struct hpi_response_header) +</div><div class='add'>+		sizeof(struct hpi_control_res);</div><div class='ctx'> </div><div class='del'>-	switch (pI-&gt;control_type) {</div><div class='add'>+	switch (pC-&gt;u.i.control_type) {</div><div class='ctx'> </div><div class='ctx'> 	case HPI_CONTROL_METER:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_METER_PEAK) {</div><div class='del'>-			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.p.an_log_peak[0];</div><div class='del'>-			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.p.an_log_peak[1];</div><div class='add'>+			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.meter.an_log_peak[0];</div><div class='add'>+			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.meter.an_log_peak[1];</div><div class='ctx'> 		} else if (phm-&gt;u.c.attribute == HPI_METER_RMS) {</div><div class='del'>-			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.p.an_logRMS[0];</div><div class='del'>-			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.p.an_logRMS[1];</div><div class='add'>+			if (pC-&gt;u.meter.an_logRMS[0] ==</div><div class='add'>+				HPI_CACHE_INVALID_SHORT) {</div><div class='add'>+				phr-&gt;error =</div><div class='add'>+					HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='add'>+				phr-&gt;u.c.an_log_value[0] = HPI_METER_MINIMUM;</div><div class='add'>+				phr-&gt;u.c.an_log_value[1] = HPI_METER_MINIMUM;</div><div class='add'>+			} else {</div><div class='add'>+				phr-&gt;u.c.an_log_value[0] =</div><div class='add'>+					pC-&gt;u.meter.an_logRMS[0];</div><div class='add'>+				phr-&gt;u.c.an_log_value[1] =</div><div class='add'>+					pC-&gt;u.meter.an_logRMS[1];</div><div class='add'>+			}</div><div class='ctx'> 		} else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_VOLUME:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_VOLUME_GAIN) {</div><div class='del'>-			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.v.an_log[0];</div><div class='del'>-			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.v.an_log[1];</div><div class='del'>-		} else</div><div class='add'>+			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.vol.an_log[0];</div><div class='add'>+			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.vol.an_log[1];</div><div class='add'>+		} else if (phm-&gt;u.c.attribute == HPI_VOLUME_MUTE) {</div><div class='add'>+			if (pC-&gt;u.vol.flags &amp; HPI_VOLUME_FLAG_HAS_MUTE) {</div><div class='add'>+				if (pC-&gt;u.vol.flags &amp; HPI_VOLUME_FLAG_MUTED)</div><div class='add'>+					phr-&gt;u.c.param1 =</div><div class='add'>+						HPI_BITMASK_ALL_CHANNELS;</div><div class='add'>+				else</div><div class='add'>+					phr-&gt;u.c.param1 = 0;</div><div class='add'>+			} else {</div><div class='add'>+				phr-&gt;error =</div><div class='add'>+					HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='add'>+				phr-&gt;u.c.param1 = 0;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='ctx'> 			found = 0;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_MULTIPLEXER:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_MULTIPLEXER_SOURCE) {</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.x.source_node_type;</div><div class='del'>-			phr-&gt;u.c.param2 = pC-&gt;u.x.source_node_index;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.mux.source_node_type;</div><div class='add'>+			phr-&gt;u.c.param2 = pC-&gt;u.mux.source_node_index;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_CHANNEL_MODE:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_CHANNEL_MODE_MODE)</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.m.mode;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.mode.mode;</div><div class='ctx'> 		else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_LEVEL:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_LEVEL_GAIN) {</div><div class='del'>-			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.l.an_log[0];</div><div class='del'>-			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.l.an_log[1];</div><div class='add'>+			phr-&gt;u.c.an_log_value[0] = pC-&gt;u.level.an_log[0];</div><div class='add'>+			phr-&gt;u.c.an_log_value[1] = pC-&gt;u.level.an_log[1];</div><div class='ctx'> 		} else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_TUNER:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_TUNER_FREQ)</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.t.freq_ink_hz;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.tuner.freq_ink_hz;</div><div class='ctx'> 		else if (phm-&gt;u.c.attribute == HPI_TUNER_BAND)</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.t.band;</div><div class='del'>-		else if ((phm-&gt;u.c.attribute == HPI_TUNER_LEVEL)</div><div class='del'>-			&amp;&amp; (phm-&gt;u.c.param1 == HPI_TUNER_LEVEL_AVERAGE))</div><div class='del'>-			if (pC-&gt;u.t.level == HPI_ERROR_ILLEGAL_CACHE_VALUE) {</div><div class='del'>-				phr-&gt;u.c.param1 = 0;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.tuner.band;</div><div class='add'>+		else if (phm-&gt;u.c.attribute == HPI_TUNER_LEVEL_AVG)</div><div class='add'>+			if (pC-&gt;u.tuner.s_level_avg ==</div><div class='add'>+				HPI_CACHE_INVALID_SHORT) {</div><div class='add'>+				phr-&gt;u.cu.tuner.s_level = 0;</div><div class='ctx'> 				phr-&gt;error =</div><div class='ctx'> 					HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='ctx'> 			} else</div><div class='del'>-				phr-&gt;u.c.param1 = pC-&gt;u.t.level;</div><div class='add'>+				phr-&gt;u.cu.tuner.s_level =</div><div class='add'>+					pC-&gt;u.tuner.s_level_avg;</div><div class='ctx'> 		else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -366,7 +403,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_AESEBURX_ERRORSTATUS)</div><div class='ctx'> 			phr-&gt;u.c.param1 = pC-&gt;u.aes3rx.error_status;</div><div class='ctx'> 		else if (phm-&gt;u.c.attribute == HPI_AESEBURX_FORMAT)</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.aes3rx.source;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.aes3rx.format;</div><div class='ctx'> 		else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -385,13 +422,12 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 	case HPI_CONTROL_SILENCEDETECTOR:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_SILENCEDETECTOR_STATE) {</div><div class='ctx'> 			phr-&gt;u.c.param1 = pC-&gt;u.silence.state;</div><div class='del'>-			phr-&gt;u.c.param2 = pC-&gt;u.silence.count;</div><div class='ctx'> 		} else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_MICROPHONE:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)</div><div class='del'>-			phr-&gt;u.c.param1 = pC-&gt;u.phantom_power.state;</div><div class='add'>+			phr-&gt;u.c.param1 = pC-&gt;u.microphone.phantom_state;</div><div class='ctx'> 		else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -400,7 +436,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 			phr-&gt;u.c.param1 = pC-&gt;u.clk.source;</div><div class='ctx'> 		else if (phm-&gt;u.c.attribute == HPI_SAMPLECLOCK_SOURCE_INDEX) {</div><div class='ctx'> 			if (pC-&gt;u.clk.source_index ==</div><div class='del'>-				HPI_ERROR_ILLEGAL_CACHE_VALUE) {</div><div class='add'>+				HPI_CACHE_INVALID_UINT16) {</div><div class='ctx'> 				phr-&gt;u.c.param1 = 0;</div><div class='ctx'> 				phr-&gt;error =</div><div class='ctx'> 					HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='hunk'>@@ -411,60 +447,63 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 		else</div><div class='ctx'> 			found = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_CONTROL_PAD:</div><div class='add'>+	case HPI_CONTROL_PAD:{</div><div class='add'>+			struct hpi_control_cache_pad *p_pad;</div><div class='add'>+			p_pad = (struct hpi_control_cache_pad *)pC;</div><div class='ctx'> </div><div class='del'>-		if (!(p_pad-&gt;field_valid_flags &amp; (1 &lt;&lt;</div><div class='del'>-					HPI_CTL_ATTR_INDEX(phm-&gt;u.c.</div><div class='del'>-						attribute)))) {</div><div class='del'>-			phr-&gt;error = HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (phm-&gt;u.c.attribute == HPI_PAD_PROGRAM_ID)</div><div class='del'>-			phr-&gt;u.c.param1 = p_pad-&gt;pI;</div><div class='del'>-		else if (phm-&gt;u.c.attribute == HPI_PAD_PROGRAM_TYPE)</div><div class='del'>-			phr-&gt;u.c.param1 = p_pad-&gt;pTY;</div><div class='del'>-		else {</div><div class='del'>-			unsigned int index =</div><div class='del'>-				HPI_CTL_ATTR_INDEX(phm-&gt;u.c.attribute) - 1;</div><div class='del'>-			unsigned int offset = phm-&gt;u.c.param1;</div><div class='del'>-			unsigned int pad_string_len, field_size;</div><div class='del'>-			char *pad_string;</div><div class='del'>-			unsigned int tocopy;</div><div class='del'>-</div><div class='del'>-			HPI_DEBUG_LOG(VERBOSE, "PADS HPI_PADS_ %d\n",</div><div class='del'>-				phm-&gt;u.c.attribute);</div><div class='del'>-</div><div class='del'>-			if (index &gt; ARRAY_SIZE(pad_desc) - 1) {</div><div class='add'>+			if (!(p_pad-&gt;field_valid_flags &amp; (1 &lt;&lt;</div><div class='add'>+						HPI_CTL_ATTR_INDEX(phm-&gt;u.c.</div><div class='add'>+							attribute)))) {</div><div class='ctx'> 				phr-&gt;error =</div><div class='ctx'> 					HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			pad_string = ((char *)p_pad) + pad_desc[index].offset;</div><div class='del'>-			field_size = pad_desc[index].field_size;</div><div class='del'>-			/* Ensure null terminator */</div><div class='del'>-			pad_string[field_size - 1] = 0;</div><div class='del'>-</div><div class='del'>-			pad_string_len = strlen(pad_string) + 1;</div><div class='del'>-</div><div class='del'>-			if (offset &gt; pad_string_len) {</div><div class='del'>-				phr-&gt;error = HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='del'>-				break;</div><div class='add'>+			if (phm-&gt;u.c.attribute == HPI_PAD_PROGRAM_ID)</div><div class='add'>+				phr-&gt;u.c.param1 = p_pad-&gt;pI;</div><div class='add'>+			else if (phm-&gt;u.c.attribute == HPI_PAD_PROGRAM_TYPE)</div><div class='add'>+				phr-&gt;u.c.param1 = p_pad-&gt;pTY;</div><div class='add'>+			else {</div><div class='add'>+				unsigned int index =</div><div class='add'>+					HPI_CTL_ATTR_INDEX(phm-&gt;u.c.</div><div class='add'>+					attribute) - 1;</div><div class='add'>+				unsigned int offset = phm-&gt;u.c.param1;</div><div class='add'>+				unsigned int pad_string_len, field_size;</div><div class='add'>+				char *pad_string;</div><div class='add'>+				unsigned int tocopy;</div><div class='add'>+</div><div class='add'>+				if (index &gt; ARRAY_SIZE(pad_desc) - 1) {</div><div class='add'>+					phr-&gt;error =</div><div class='add'>+						HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				pad_string =</div><div class='add'>+					((char *)p_pad) +</div><div class='add'>+					pad_desc[index].offset;</div><div class='add'>+				field_size = pad_desc[index].field_size;</div><div class='add'>+				/* Ensure null terminator */</div><div class='add'>+				pad_string[field_size - 1] = 0;</div><div class='add'>+</div><div class='add'>+				pad_string_len = strlen(pad_string) + 1;</div><div class='add'>+</div><div class='add'>+				if (offset &gt; pad_string_len) {</div><div class='add'>+					phr-&gt;error =</div><div class='add'>+						HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				tocopy = pad_string_len - offset;</div><div class='add'>+				if (tocopy &gt; sizeof(phr-&gt;u.cu.chars8.sz_data))</div><div class='add'>+					tocopy = sizeof(phr-&gt;u.cu.chars8.</div><div class='add'>+						sz_data);</div><div class='add'>+</div><div class='add'>+				memcpy(phr-&gt;u.cu.chars8.sz_data,</div><div class='add'>+					&amp;pad_string[offset], tocopy);</div><div class='add'>+</div><div class='add'>+				phr-&gt;u.cu.chars8.remaining_chars =</div><div class='add'>+					pad_string_len - offset - tocopy;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-			tocopy = pad_string_len - offset;</div><div class='del'>-			if (tocopy &gt; sizeof(phr-&gt;u.cu.chars8.sz_data))</div><div class='del'>-				tocopy = sizeof(phr-&gt;u.cu.chars8.sz_data);</div><div class='del'>-</div><div class='del'>-			HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-				"PADS memcpy(%d), offset %d \n", tocopy,</div><div class='del'>-				offset);</div><div class='del'>-			memcpy(phr-&gt;u.cu.chars8.sz_data, &amp;pad_string[offset],</div><div class='del'>-				tocopy);</div><div class='del'>-</div><div class='del'>-			phr-&gt;u.cu.chars8.remaining_chars =</div><div class='del'>-				pad_string_len - offset - tocopy;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -472,77 +511,83 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (found)</div><div class='del'>-		HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-			"cached adap %d, ctl %d, type %d, attr %d\n",</div><div class='del'>-			phm-&gt;adapter_index, pI-&gt;control_index,</div><div class='del'>-			pI-&gt;control_type, phm-&gt;u.c.attribute);</div><div class='del'>-	else</div><div class='del'>-		HPI_DEBUG_LOG(VERBOSE,</div><div class='del'>-			"uncached adap %d, ctl %d, ctl type %d\n",</div><div class='del'>-			phm-&gt;adapter_index, pI-&gt;control_index,</div><div class='del'>-			pI-&gt;control_type);</div><div class='add'>+	HPI_DEBUG_LOG(VERBOSE, "%s Adap %d, Ctl %d, Type %d, Attr %d\n",</div><div class='add'>+		found ? "Cached" : "Uncached", phm-&gt;adapter_index,</div><div class='add'>+		pC-&gt;u.i.control_index, pC-&gt;u.i.control_type,</div><div class='add'>+		phm-&gt;u.c.attribute);</div><div class='ctx'> </div><div class='del'>-	if (found)</div><div class='del'>-		phr-&gt;size =</div><div class='del'>-			sizeof(struct hpi_response_header) +</div><div class='del'>-			sizeof(struct hpi_control_res);</div><div class='add'>+	if (found) {</div><div class='add'>+		phr-&gt;size = (u16)response_size;</div><div class='add'>+		phr-&gt;type = HPI_TYPE_RESPONSE;</div><div class='add'>+		phr-&gt;object = phm-&gt;object;</div><div class='add'>+		phr-&gt;function = phm-&gt;function;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** Updates the cache with Set values.</div><div class='del'>-</div><div class='del'>-Only update if no error.</div><div class='del'>-Volume and Level return the limited values in the response, so use these</div><div class='del'>-Multiplexer does so use sent values</div><div class='del'>-*/</div><div class='del'>-void hpi_sync_control_cache(struct hpi_control_cache *p_cache,</div><div class='add'>+short hpi_check_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-	u16 control_index;</div><div class='del'>-	struct hpi_control_cache_single *pC;</div><div class='ctx'> 	struct hpi_control_cache_info *pI;</div><div class='ctx'> </div><div class='del'>-	if (phr-&gt;error)</div><div class='del'>-		return;</div><div class='add'>+	if (!find_control(phm-&gt;obj_index, p_cache, &amp;pI)) {</div><div class='add'>+		HPI_DEBUG_LOG(VERBOSE,</div><div class='add'>+			"HPICMN find_control() failed for adap %d\n",</div><div class='add'>+			phm-&gt;adapter_index);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!find_control(phm, p_cache, &amp;pI, &amp;control_index))</div><div class='del'>-		return;</div><div class='add'>+	phr-&gt;error = 0;</div><div class='add'>+	phr-&gt;specific_error = 0;</div><div class='add'>+	phr-&gt;version = 0;</div><div class='ctx'> </div><div class='del'>-	/* pC is the default cached control strucure.</div><div class='del'>-	   May be cast to something else in the following switch statement.</div><div class='del'>-	 */</div><div class='del'>-	pC = (struct hpi_control_cache_single *)pI;</div><div class='add'>+	return hpi_check_control_cache_single((struct hpi_control_cache_single</div><div class='add'>+			*)pI, phm, phr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Updates the cache with Set values.</div><div class='ctx'> </div><div class='del'>-	switch (pI-&gt;control_type) {</div><div class='add'>+Only update if no error.</div><div class='add'>+Volume and Level return the limited values in the response, so use these</div><div class='add'>+Multiplexer does so use sent values</div><div class='add'>+*/</div><div class='add'>+void hpi_cmn_control_cache_sync_to_msg_single(struct hpi_control_cache_single</div><div class='add'>+	*pC, struct hpi_message *phm, struct hpi_response *phr)</div><div class='add'>+{</div><div class='add'>+	switch (pC-&gt;u.i.control_type) {</div><div class='ctx'> 	case HPI_CONTROL_VOLUME:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_VOLUME_GAIN) {</div><div class='del'>-			pC-&gt;u.v.an_log[0] = phr-&gt;u.c.an_log_value[0];</div><div class='del'>-			pC-&gt;u.v.an_log[1] = phr-&gt;u.c.an_log_value[1];</div><div class='add'>+			pC-&gt;u.vol.an_log[0] = phr-&gt;u.c.an_log_value[0];</div><div class='add'>+			pC-&gt;u.vol.an_log[1] = phr-&gt;u.c.an_log_value[1];</div><div class='add'>+		} else if (phm-&gt;u.c.attribute == HPI_VOLUME_MUTE) {</div><div class='add'>+			if (phm-&gt;u.c.param1)</div><div class='add'>+				pC-&gt;u.vol.flags |= HPI_VOLUME_FLAG_MUTED;</div><div class='add'>+			else</div><div class='add'>+				pC-&gt;u.vol.flags &amp;= ~HPI_VOLUME_FLAG_MUTED;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_MULTIPLEXER:</div><div class='ctx'> 		/* mux does not return its setting on Set command. */</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_MULTIPLEXER_SOURCE) {</div><div class='del'>-			pC-&gt;u.x.source_node_type = (u16)phm-&gt;u.c.param1;</div><div class='del'>-			pC-&gt;u.x.source_node_index = (u16)phm-&gt;u.c.param2;</div><div class='add'>+			pC-&gt;u.mux.source_node_type = (u16)phm-&gt;u.c.param1;</div><div class='add'>+			pC-&gt;u.mux.source_node_index = (u16)phm-&gt;u.c.param2;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_CHANNEL_MODE:</div><div class='ctx'> 		/* mode does not return its setting on Set command. */</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_CHANNEL_MODE_MODE)</div><div class='del'>-			pC-&gt;u.m.mode = (u16)phm-&gt;u.c.param1;</div><div class='add'>+			pC-&gt;u.mode.mode = (u16)phm-&gt;u.c.param1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_LEVEL:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_LEVEL_GAIN) {</div><div class='del'>-			pC-&gt;u.v.an_log[0] = phr-&gt;u.c.an_log_value[0];</div><div class='del'>-			pC-&gt;u.v.an_log[1] = phr-&gt;u.c.an_log_value[1];</div><div class='add'>+			pC-&gt;u.vol.an_log[0] = phr-&gt;u.c.an_log_value[0];</div><div class='add'>+			pC-&gt;u.vol.an_log[1] = phr-&gt;u.c.an_log_value[1];</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_MICROPHONE:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)</div><div class='del'>-			pC-&gt;u.phantom_power.state = (u16)phm-&gt;u.c.param1;</div><div class='add'>+			pC-&gt;u.microphone.phantom_state = (u16)phm-&gt;u.c.param1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_AESEBU_TRANSMITTER:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_AESEBUTX_FORMAT)</div><div class='hunk'>@@ -550,7 +595,7 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_AESEBU_RECEIVER:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_AESEBURX_FORMAT)</div><div class='del'>-			pC-&gt;u.aes3rx.source = phm-&gt;u.c.param1;</div><div class='add'>+			pC-&gt;u.aes3rx.format = phm-&gt;u.c.param1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_CONTROL_SAMPLECLOCK:</div><div class='ctx'> 		if (phm-&gt;u.c.attribute == HPI_SAMPLECLOCK_SOURCE)</div><div class='hunk'>@@ -565,53 +610,84 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct hpi_control_cache *hpi_alloc_control_cache(const u32</div><div class='del'>-	number_of_controls, const u32 size_in_bytes,</div><div class='del'>-	struct hpi_control_cache_info *pDSP_control_buffer)</div><div class='add'>+void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr)</div><div class='add'>+{</div><div class='add'>+	struct hpi_control_cache_single *pC;</div><div class='add'>+	struct hpi_control_cache_info *pI;</div><div class='add'>+</div><div class='add'>+	if (phr-&gt;error)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!find_control(phm-&gt;obj_index, p_cache, &amp;pI)) {</div><div class='add'>+		HPI_DEBUG_LOG(VERBOSE,</div><div class='add'>+			"HPICMN find_control() failed for adap %d\n",</div><div class='add'>+			phm-&gt;adapter_index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pC is the default cached control strucure.</div><div class='add'>+	   May be cast to something else in the following switch statement.</div><div class='add'>+	 */</div><div class='add'>+	pC = (struct hpi_control_cache_single *)pI;</div><div class='add'>+</div><div class='add'>+	hpi_cmn_control_cache_sync_to_msg_single(pC, phm, phr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/** Allocate control cache.</div><div class='add'>+</div><div class='add'>+\return Cache pointer, or NULL if allocation fails.</div><div class='add'>+*/</div><div class='add'>+struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,</div><div class='add'>+	const u32 size_in_bytes, u8 *p_dsp_control_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_control_cache *p_cache =</div><div class='ctx'> 		kmalloc(sizeof(*p_cache), GFP_KERNEL);</div><div class='add'>+	if (!p_cache)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	p_cache-&gt;p_info =</div><div class='add'>+		kcalloc(control_count, sizeof(*p_cache-&gt;p_info), GFP_KERNEL);</div><div class='add'>+	if (!p_cache-&gt;p_info) {</div><div class='add'>+		kfree(p_cache);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	p_cache-&gt;cache_size_in_bytes = size_in_bytes;</div><div class='del'>-	p_cache-&gt;control_count = number_of_controls;</div><div class='del'>-	p_cache-&gt;p_cache =</div><div class='del'>-		(struct hpi_control_cache_single *)pDSP_control_buffer;</div><div class='add'>+	p_cache-&gt;control_count = control_count;</div><div class='add'>+	p_cache-&gt;p_cache = p_dsp_control_buffer;</div><div class='ctx'> 	p_cache-&gt;init = 0;</div><div class='del'>-	p_cache-&gt;p_info =</div><div class='del'>-		kmalloc(sizeof(*p_cache-&gt;p_info) * p_cache-&gt;control_count,</div><div class='del'>-		GFP_KERNEL);</div><div class='ctx'> 	return p_cache;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpi_free_control_cache(struct hpi_control_cache *p_cache)</div><div class='ctx'> {</div><div class='del'>-	if (p_cache-&gt;init) {</div><div class='add'>+	if (p_cache) {</div><div class='ctx'> 		kfree(p_cache-&gt;p_info);</div><div class='del'>-		p_cache-&gt;p_info = NULL;</div><div class='del'>-		p_cache-&gt;init = 0;</div><div class='ctx'> 		kfree(p_cache);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='add'>+	hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm-&gt;function, 0);</div><div class='ctx'> </div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='ctx'> 	case HPI_SUBSYS_OPEN:</div><div class='ctx'> 	case HPI_SUBSYS_CLOSE:</div><div class='ctx'> 	case HPI_SUBSYS_DRIVER_UNLOAD:</div><div class='del'>-		phr-&gt;error = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_SUBSYS_DRIVER_LOAD:</div><div class='ctx'> 		wipe_adapter_list();</div><div class='ctx'> 		hpios_alistlock_init(&amp;adapters);</div><div class='del'>-		phr-&gt;error = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_SUBSYS_GET_INFO:</div><div class='del'>-		subsys_get_adapters(phr);</div><div class='add'>+	case HPI_SUBSYS_GET_ADAPTER:</div><div class='add'>+		subsys_get_adapter(phm, phr);</div><div class='add'>+		break;</div><div class='add'>+	case HPI_SUBSYS_GET_NUM_ADAPTERS:</div><div class='add'>+		phr-&gt;u.s.num_adapters = adapters.gw_num_adapters;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='del'>-	case HPI_SUBSYS_DELETE_ADAPTER:</div><div class='del'>-		phr-&gt;error = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_FUNC;</div><div class='hunk'>@@ -622,7 +698,7 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> void HPI_COMMON(struct hpi_message *phm, struct hpi_response *phr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (phm-&gt;type) {</div><div class='del'>-	case HPI_TYPE_MESSAGE:</div><div class='add'>+	case HPI_TYPE_REQUEST:</div><div class='ctx'> 		switch (phm-&gt;object) {</div><div class='ctx'> 		case HPI_OBJ_SUBSYSTEM:</div><div class='ctx'> 			subsys_message(phm, phr);</div><div class='head'>diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h<br/>index 6229022f56cb..8ec656cf8848 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpicmn.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpicmn.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpicmn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpicmn.h</a></div><div class='hunk'>@@ -1,64 +1,71 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='ctx'> </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='add'>+*/</div><div class='ctx'> </div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='add'>+struct hpi_adapter_obj;</div><div class='ctx'> </div><div class='del'>-*/</div><div class='add'>+/* a function that takes an adapter obj and returns an int */</div><div class='add'>+typedef int adapter_int_func(struct hpi_adapter_obj *pao, u32 message);</div><div class='add'>+</div><div class='add'>+#define HPI_IRQ_NONE		(0)</div><div class='add'>+#define HPI_IRQ_MESSAGE		(1)</div><div class='add'>+#define HPI_IRQ_MIXER		(2)</div><div class='ctx'> </div><div class='ctx'> struct hpi_adapter_obj {</div><div class='ctx'> 	struct hpi_pci pci;	/* PCI info - bus#,dev#,address etc */</div><div class='del'>-	u16 adapter_type;	/* ASI6701 etc */</div><div class='del'>-	u16 index;		/* */</div><div class='del'>-	u16 open;		/* =1 when adapter open */</div><div class='del'>-	u16 mixer_open;</div><div class='add'>+	u16 type;		/* 0x6644 == ASI6644 etc */</div><div class='add'>+	u16 index;</div><div class='ctx'> </div><div class='ctx'> 	struct hpios_spinlock dsp_lock;</div><div class='ctx'> </div><div class='ctx'> 	u16 dsp_crashed;</div><div class='ctx'> 	u16 has_control_cache;</div><div class='ctx'> 	void *priv;</div><div class='add'>+	adapter_int_func *irq_query_and_clear;</div><div class='add'>+	struct hpi_hostbuffer_status *instream_host_buffer_status;</div><div class='add'>+	struct hpi_hostbuffer_status *outstream_host_buffer_status;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_control_cache {</div><div class='del'>-	u32 init;	     /**&lt; indicates whether the</div><div class='del'>-				structures are initialized */</div><div class='add'>+	/** indicates whether the structures are initialized */</div><div class='add'>+	u16 init;</div><div class='add'>+	u16 adap_idx;</div><div class='ctx'> 	u32 control_count;</div><div class='ctx'> 	u32 cache_size_in_bytes;</div><div class='del'>-	struct hpi_control_cache_info</div><div class='del'>-	**p_info;		 /**&lt; pointer to allocated memory of</div><div class='del'>-				lookup pointers. */</div><div class='del'>-	struct hpi_control_cache_single</div><div class='del'>-	*p_cache;		 /**&lt; pointer to DSP's control cache. */</div><div class='add'>+	/** pointer to allocated memory of lookup pointers. */</div><div class='add'>+	struct hpi_control_cache_info **p_info;</div><div class='add'>+	/** pointer to DSP's control cache. */</div><div class='add'>+	u8 *p_cache;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index);</div><div class='add'>+</div><div class='ctx'> u16 hpi_add_adapter(struct hpi_adapter_obj *pao);</div><div class='ctx'> </div><div class='ctx'> void hpi_delete_adapter(struct hpi_adapter_obj *pao);</div><div class='ctx'> </div><div class='ctx'> short hpi_check_control_cache(struct hpi_control_cache *pC,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr);</div><div class='add'>+</div><div class='add'>+short hpi_check_control_cache_single(struct hpi_control_cache_single *pC,</div><div class='add'>+	struct hpi_message *phm, struct hpi_response *phr);</div><div class='add'>+</div><div class='ctx'> struct hpi_control_cache *hpi_alloc_control_cache(const u32</div><div class='del'>-	number_of_controls, const u32 size_in_bytes,</div><div class='del'>-	struct hpi_control_cache_info</div><div class='del'>-	*pDSP_control_buffer);</div><div class='add'>+	number_of_controls, const u32 size_in_bytes, u8 *pDSP_control_buffer);</div><div class='add'>+</div><div class='ctx'> void hpi_free_control_cache(struct hpi_control_cache *p_cache);</div><div class='ctx'> </div><div class='del'>-void hpi_sync_control_cache(struct hpi_control_cache *pC,</div><div class='add'>+void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *pC,</div><div class='ctx'> 	struct hpi_message *phm, struct hpi_response *phr);</div><div class='add'>+</div><div class='add'>+void hpi_cmn_control_cache_sync_to_msg_single(struct hpi_control_cache_single</div><div class='add'>+	*pC, struct hpi_message *phm, struct hpi_response *phr);</div><div class='add'>+</div><div class='ctx'> u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr);</div><div class='del'>-short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,</div><div class='del'>-	struct hpi_message *phm, void **p, unsigned int *pN);</div><div class='add'>+</div><div class='add'>+hpi_handler_func HPI_COMMON;</div><div class='head'>diff --git a/sound/pci/asihpi/hpidebug.c b/sound/pci/asihpi/hpidebug.c<br/>index 949836ec913a..9570d9a44fe8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidebug.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidebug.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidebug.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpidebug.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> Debug macro translation.</div><div class='ctx'> </div><div class='hunk'>@@ -45,161 +34,14 @@ int hpi_debug_level_get(void)</div><div class='ctx'> 	return hpi_debug_level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef HPIOS_DEBUG_PRINT</div><div class='del'>-/* implies OS has no printf-like function */</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-void hpi_debug_printf(char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list arglist;</div><div class='del'>-	char buffer[128];</div><div class='del'>-</div><div class='del'>-	va_start(arglist, fmt);</div><div class='del'>-</div><div class='del'>-	if (buffer[0])</div><div class='del'>-		HPIOS_DEBUG_PRINT(buffer);</div><div class='del'>-	va_end(arglist);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct treenode {</div><div class='del'>-	void *array;</div><div class='del'>-	unsigned int num_elements;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define make_treenode_from_array(nodename, array) \</div><div class='del'>-static void *tmp_strarray_##nodename[] = array; \</div><div class='del'>-static struct treenode nodename = { \</div><div class='del'>-	&amp;tmp_strarray_##nodename, \</div><div class='del'>-	ARRAY_SIZE(tmp_strarray_##nodename) \</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define get_treenode_elem(node_ptr, idx, type)  \</div><div class='del'>-	(&amp;(*((type *)(node_ptr)-&gt;array)[idx]))</div><div class='del'>-</div><div class='del'>-make_treenode_from_array(hpi_control_type_strings, HPI_CONTROL_TYPE_STRINGS)</div><div class='del'>-</div><div class='del'>-	make_treenode_from_array(hpi_subsys_strings, HPI_SUBSYS_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_adapter_strings, HPI_ADAPTER_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_istream_strings, HPI_ISTREAM_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_ostream_strings, HPI_OSTREAM_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_mixer_strings, HPI_MIXER_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_node_strings,</div><div class='del'>-	{</div><div class='del'>-	"NODE is invalid object"})</div><div class='del'>-</div><div class='del'>-	make_treenode_from_array(hpi_control_strings, HPI_CONTROL_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_nvmemory_strings, HPI_OBJ_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_digitalio_strings, HPI_DIGITALIO_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_watchdog_strings, HPI_WATCHDOG_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_clock_strings, HPI_CLOCK_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_profile_strings, HPI_PROFILE_STRINGS)</div><div class='del'>-	make_treenode_from_array(hpi_asyncevent_strings, HPI_ASYNCEVENT_STRINGS)</div><div class='del'>-#define HPI_FUNCTION_STRINGS \</div><div class='del'>-{ \</div><div class='del'>-  &amp;hpi_subsys_strings,\</div><div class='del'>-  &amp;hpi_adapter_strings,\</div><div class='del'>-  &amp;hpi_ostream_strings,\</div><div class='del'>-  &amp;hpi_istream_strings,\</div><div class='del'>-  &amp;hpi_mixer_strings,\</div><div class='del'>-  &amp;hpi_node_strings,\</div><div class='del'>-  &amp;hpi_control_strings,\</div><div class='del'>-  &amp;hpi_nvmemory_strings,\</div><div class='del'>-  &amp;hpi_digitalio_strings,\</div><div class='del'>-  &amp;hpi_watchdog_strings,\</div><div class='del'>-  &amp;hpi_clock_strings,\</div><div class='del'>-  &amp;hpi_profile_strings,\</div><div class='del'>-  &amp;hpi_control_strings, \</div><div class='del'>-  &amp;hpi_asyncevent_strings \</div><div class='del'>-}</div><div class='del'>-	make_treenode_from_array(hpi_function_strings, HPI_FUNCTION_STRINGS)</div><div class='del'>-</div><div class='del'>-	compile_time_assert(HPI_OBJ_MAXINDEX == 14, obj_list_doesnt_match);</div><div class='del'>-</div><div class='del'>-static char *hpi_function_string(unsigned int function)</div><div class='del'>-{</div><div class='del'>-	unsigned int object;</div><div class='del'>-	struct treenode *tmp;</div><div class='del'>-</div><div class='del'>-	object = function / HPI_OBJ_FUNCTION_SPACING;</div><div class='del'>-	function = function - object * HPI_OBJ_FUNCTION_SPACING;</div><div class='del'>-</div><div class='del'>-	if (object == 0 || object == HPI_OBJ_NODE</div><div class='del'>-		|| object &gt; hpi_function_strings.num_elements)</div><div class='del'>-		return "invalid object";</div><div class='del'>-</div><div class='del'>-	tmp = get_treenode_elem(&amp;hpi_function_strings, object - 1,</div><div class='del'>-		struct treenode *);</div><div class='del'>-</div><div class='del'>-	if (function == 0 || function &gt; tmp-&gt;num_elements)</div><div class='del'>-		return "invalid function";</div><div class='del'>-</div><div class='del'>-	return get_treenode_elem(tmp, function - 1, char *);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void hpi_debug_message(struct hpi_message *phm, char *sz_fileline)</div><div class='ctx'> {</div><div class='ctx'> 	if (phm) {</div><div class='del'>-		if ((phm-&gt;object &lt;= HPI_OBJ_MAXINDEX) &amp;&amp; phm-&gt;object) {</div><div class='del'>-			u16 index = 0;</div><div class='del'>-			u16 attrib = 0;</div><div class='del'>-			int is_control = 0;</div><div class='del'>-</div><div class='del'>-			index = phm-&gt;obj_index;</div><div class='del'>-			switch (phm-&gt;object) {</div><div class='del'>-			case HPI_OBJ_ADAPTER:</div><div class='del'>-			case HPI_OBJ_PROFILE:</div><div class='del'>-				break;</div><div class='del'>-			case HPI_OBJ_MIXER:</div><div class='del'>-				if (phm-&gt;function ==</div><div class='del'>-					HPI_MIXER_GET_CONTROL_BY_INDEX)</div><div class='del'>-					index = phm-&gt;u.m.control_index;</div><div class='del'>-				break;</div><div class='del'>-			case HPI_OBJ_OSTREAM:</div><div class='del'>-			case HPI_OBJ_ISTREAM:</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case HPI_OBJ_CONTROLEX:</div><div class='del'>-			case HPI_OBJ_CONTROL:</div><div class='del'>-				if (phm-&gt;version == 1)</div><div class='del'>-					attrib = HPI_CTL_ATTR(UNIVERSAL, 1);</div><div class='del'>-				else</div><div class='del'>-					attrib = phm-&gt;u.c.attribute;</div><div class='del'>-				is_control = 1;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (is_control &amp;&amp; (attrib &amp; 0xFF00)) {</div><div class='del'>-				int control_type = (attrib &amp; 0xFF00) &gt;&gt; 8;</div><div class='del'>-				int attr_index = HPI_CTL_ATTR_INDEX(attrib);</div><div class='del'>-				/* note the KERN facility level</div><div class='del'>-				   is in szFileline already */</div><div class='del'>-				printk("%s adapter %d %s "</div><div class='del'>-					"ctrl_index x%04x %s %d\n",</div><div class='del'>-					sz_fileline, phm-&gt;adapter_index,</div><div class='del'>-					hpi_function_string(phm-&gt;function),</div><div class='del'>-					index,</div><div class='del'>-					get_treenode_elem</div><div class='del'>-					(&amp;hpi_control_type_strings,</div><div class='del'>-						control_type, char *),</div><div class='del'>-					attr_index);</div><div class='del'>-</div><div class='del'>-			} else</div><div class='del'>-				printk("%s adapter %d %s "</div><div class='del'>-					"idx x%04x attr x%04x \n",</div><div class='del'>-					sz_fileline, phm-&gt;adapter_index,</div><div class='del'>-					hpi_function_string(phm-&gt;function),</div><div class='del'>-					index, attrib);</div><div class='del'>-		} else {</div><div class='del'>-			printk("adap=%d, invalid obj=%d, func=0x%x\n",</div><div class='del'>-				phm-&gt;adapter_index, phm-&gt;object,</div><div class='del'>-				phm-&gt;function);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-			"NULL message pointer to hpi_debug_message!\n");</div><div class='add'>+		printk(KERN_DEBUG "HPI_MSG%d,%d,%d,%d,%d\n", phm-&gt;version,</div><div class='add'>+			phm-&gt;adapter_index, phm-&gt;obj_index, phm-&gt;function,</div><div class='add'>+			phm-&gt;u.c.attribute);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hpi_debug_data(u16 *pdata, u32 len)</div><div class='hunk'>@@ -210,7 +52,7 @@ void hpi_debug_data(u16 *pdata, u32 len)</div><div class='ctx'> 	int lines;</div><div class='ctx'> 	int cols = 8;</div><div class='ctx'> </div><div class='del'>-	lines = (len + cols - 1) / cols;</div><div class='add'>+	lines = DIV_ROUND_UP(len, cols);</div><div class='ctx'> 	if (lines &gt; 8)</div><div class='ctx'> 		lines = 8;</div><div class='ctx'> </div><div class='hunk'>@@ -218,8 +60,8 @@ void hpi_debug_data(u16 *pdata, u32 len)</div><div class='ctx'> 		printk(KERN_DEBUG "%p:", (pdata + i));</div><div class='ctx'> </div><div class='ctx'> 		for (k = 0; k &lt; cols &amp;&amp; i &lt; len; i++, k++)</div><div class='del'>-			printk("%s%04x", k == 0 ? "" : " ", pdata[i]);</div><div class='add'>+			printk(KERN_CONT "%s%04x", k == 0 ? "" : " ", pdata[i]);</div><div class='ctx'> </div><div class='del'>-		printk("\n");</div><div class='add'>+		printk(KERN_CONT "\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/asihpi/hpidebug.h b/sound/pci/asihpi/hpidebug.h<br/>index a2f0952a99f0..c6dfc229213d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidebug.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidebug.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidebug.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpidebug.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> Debug macros.</div><div class='ctx'> </div><div class='hunk'>@@ -37,26 +26,18 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */</div><div class='ctx'> #define HPI_DEBUG_LEVEL_DEFAULT HPI_DEBUG_LEVEL_NOTICE</div><div class='ctx'> </div><div class='ctx'> /* an OS can define an extra flag string that is appended to</div><div class='del'>-   the start of each message, eg see hpios_linux.h */</div><div class='add'>+   the start of each message, eg see linux kernel hpios.h */</div><div class='ctx'> </div><div class='ctx'> #ifdef SOURCEFILE_NAME</div><div class='add'>+#undef FILE_LINE</div><div class='ctx'> #define FILE_LINE  SOURCEFILE_NAME ":" __stringify(__LINE__) " "</div><div class='del'>-#else</div><div class='del'>-#define FILE_LINE  __FILE__ ":" __stringify(__LINE__) " "</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(HPI_DEBUG) &amp;&amp; defined(_WINDOWS)</div><div class='del'>-#define HPI_DEBUGBREAK() debug_break()</div><div class='del'>-#else</div><div class='del'>-#define HPI_DEBUGBREAK()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define HPI_DEBUG_ASSERT(expression) \</div><div class='ctx'> 	do { \</div><div class='del'>-		if (!(expression)) {\</div><div class='del'>-			printk(KERN_ERR  FILE_LINE\</div><div class='del'>-				"ASSERT " __stringify(expression));\</div><div class='del'>-			HPI_DEBUGBREAK();\</div><div class='add'>+		if (!(expression)) { \</div><div class='add'>+			printk(KERN_ERR  FILE_LINE \</div><div class='add'>+				" ASSERT " __stringify(expression)); \</div><div class='ctx'> 		} \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +45,7 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */</div><div class='ctx'> 	do { \</div><div class='ctx'> 		if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_##level) { \</div><div class='ctx'> 			printk(HPI_DEBUG_FLAG_##level \</div><div class='del'>-			FILE_LINE  __VA_ARGS__); \</div><div class='add'>+			FILE_LINE " " __VA_ARGS__); \</div><div class='ctx'> 		} \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='hunk'>@@ -78,28 +59,27 @@ void hpi_debug_message(struct hpi_message *phm, char *sz_fileline);</div><div class='ctx'> </div><div class='ctx'> void hpi_debug_data(u16 *pdata, u32 len);</div><div class='ctx'> </div><div class='del'>-#define HPI_DEBUG_DATA(pdata, len)                                      \</div><div class='del'>-	do {                                                            \</div><div class='add'>+#define HPI_DEBUG_DATA(pdata, len) \</div><div class='add'>+	do { \</div><div class='ctx'> 		if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_VERBOSE) \</div><div class='ctx'> 			hpi_debug_data(pdata, len); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define HPI_DEBUG_MESSAGE(level, phm)                                   \</div><div class='del'>-	do {                                                            \</div><div class='del'>-		if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_##level) {         \</div><div class='del'>-			hpi_debug_message(phm,HPI_DEBUG_FLAG_##level    \</div><div class='del'>-				FILE_LINE __stringify(level));\</div><div class='del'>-		}                                                       \</div><div class='add'>+#define HPI_DEBUG_MESSAGE(level, phm) \</div><div class='add'>+	do { \</div><div class='add'>+		if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_##level) { \</div><div class='add'>+			hpi_debug_message(phm, HPI_DEBUG_FLAG_##level \</div><div class='add'>+				FILE_LINE " " __stringify(level)); \</div><div class='add'>+		} \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-#define HPI_DEBUG_RESPONSE(phr)                                         \</div><div class='del'>-	do {                                                            \</div><div class='del'>-		if ((hpi_debug_level &gt;= HPI_DEBUG_LEVEL_DEBUG) &amp;&amp; (phr-&gt;error))\</div><div class='del'>-			HPI_DEBUG_LOG(ERROR, \</div><div class='del'>-				"HPI response - error# %d\n", \</div><div class='del'>-				phr-&gt;error); \</div><div class='del'>-		else if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_VERBOSE) \</div><div class='del'>-			HPI_DEBUG_LOG(VERBOSE, "HPI response OK\n");\</div><div class='add'>+#define HPI_DEBUG_RESPONSE(phr) \</div><div class='add'>+	do { \</div><div class='add'>+		if (((hpi_debug_level &gt;= HPI_DEBUG_LEVEL_DEBUG) &amp;&amp; \</div><div class='add'>+			(phr-&gt;error)) ||\</div><div class='add'>+		(hpi_debug_level &gt;= HPI_DEBUG_LEVEL_VERBOSE)) \</div><div class='add'>+			printk(KERN_DEBUG "HPI_RES%d,%d,%d\n", \</div><div class='add'>+				phr-&gt;version, phr-&gt;error, phr-&gt;specific_error); \</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='ctx'> #ifndef compile_time_assert</div><div class='hunk'>@@ -107,279 +87,4 @@ void hpi_debug_data(u16 *pdata, u32 len);</div><div class='ctx'>     typedef char msg[(cond) ? 1 : -1]</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	  /* check that size is exactly some number */</div><div class='del'>-#define function_count_check(sym, size) \</div><div class='del'>-    compile_time_assert((sym##_FUNCTION_COUNT) == (size),\</div><div class='del'>-	    strings_match_defs_##sym)</div><div class='del'>-</div><div class='del'>-/* These strings should be generated using a macro which defines</div><div class='del'>-   the corresponding symbol values.  */</div><div class='del'>-#define HPI_OBJ_STRINGS \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_OBJ_SUBSYSTEM",        \</div><div class='del'>-  "HPI_OBJ_ADAPTER",          \</div><div class='del'>-  "HPI_OBJ_OSTREAM",          \</div><div class='del'>-  "HPI_OBJ_ISTREAM",          \</div><div class='del'>-  "HPI_OBJ_MIXER",            \</div><div class='del'>-  "HPI_OBJ_NODE",             \</div><div class='del'>-  "HPI_OBJ_CONTROL",          \</div><div class='del'>-  "HPI_OBJ_NVMEMORY",         \</div><div class='del'>-  "HPI_OBJ_DIGITALIO",        \</div><div class='del'>-  "HPI_OBJ_WATCHDOG",         \</div><div class='del'>-  "HPI_OBJ_CLOCK",            \</div><div class='del'>-  "HPI_OBJ_PROFILE",          \</div><div class='del'>-  "HPI_OBJ_CONTROLEX"         \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HPI_SUBSYS_STRINGS      \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_SUBSYS_OPEN",          \</div><div class='del'>-  "HPI_SUBSYS_GET_VERSION",   \</div><div class='del'>-  "HPI_SUBSYS_GET_INFO",      \</div><div class='del'>-  "HPI_SUBSYS_FIND_ADAPTERS", \</div><div class='del'>-  "HPI_SUBSYS_CREATE_ADAPTER",\</div><div class='del'>-  "HPI_SUBSYS_CLOSE",         \</div><div class='del'>-  "HPI_SUBSYS_DELETE_ADAPTER", \</div><div class='del'>-  "HPI_SUBSYS_DRIVER_LOAD", \</div><div class='del'>-  "HPI_SUBSYS_DRIVER_UNLOAD", \</div><div class='del'>-  "HPI_SUBSYS_READ_PORT_8",   \</div><div class='del'>-  "HPI_SUBSYS_WRITE_PORT_8",  \</div><div class='del'>-  "HPI_SUBSYS_GET_NUM_ADAPTERS",\</div><div class='del'>-  "HPI_SUBSYS_GET_ADAPTER",   \</div><div class='del'>-  "HPI_SUBSYS_SET_NETWORK_INTERFACE"\</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_SUBSYS, 14);</div><div class='del'>-</div><div class='del'>-#define HPI_ADAPTER_STRINGS     \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_ADAPTER_OPEN",         \</div><div class='del'>-  "HPI_ADAPTER_CLOSE",        \</div><div class='del'>-  "HPI_ADAPTER_GET_INFO",     \</div><div class='del'>-  "HPI_ADAPTER_GET_ASSERT",   \</div><div class='del'>-  "HPI_ADAPTER_TEST_ASSERT",    \</div><div class='del'>-  "HPI_ADAPTER_SET_MODE",       \</div><div class='del'>-  "HPI_ADAPTER_GET_MODE",       \</div><div class='del'>-  "HPI_ADAPTER_ENABLE_CAPABILITY",\</div><div class='del'>-  "HPI_ADAPTER_SELFTEST",        \</div><div class='del'>-  "HPI_ADAPTER_FIND_OBJECT",     \</div><div class='del'>-  "HPI_ADAPTER_QUERY_FLASH",     \</div><div class='del'>-  "HPI_ADAPTER_START_FLASH",     \</div><div class='del'>-  "HPI_ADAPTER_PROGRAM_FLASH",   \</div><div class='del'>-  "HPI_ADAPTER_SET_PROPERTY",    \</div><div class='del'>-  "HPI_ADAPTER_GET_PROPERTY",    \</div><div class='del'>-  "HPI_ADAPTER_ENUM_PROPERTY",    \</div><div class='del'>-  "HPI_ADAPTER_MODULE_INFO",    \</div><div class='del'>-  "HPI_ADAPTER_DEBUG_READ"    \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-function_count_check(HPI_ADAPTER, 18);</div><div class='del'>-</div><div class='del'>-#define HPI_OSTREAM_STRINGS     \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_OSTREAM_OPEN",         \</div><div class='del'>-  "HPI_OSTREAM_CLOSE",        \</div><div class='del'>-  "HPI_OSTREAM_WRITE",        \</div><div class='del'>-  "HPI_OSTREAM_START",        \</div><div class='del'>-  "HPI_OSTREAM_STOP",         \</div><div class='del'>-  "HPI_OSTREAM_RESET",                \</div><div class='del'>-  "HPI_OSTREAM_GET_INFO",     \</div><div class='del'>-  "HPI_OSTREAM_QUERY_FORMAT", \</div><div class='del'>-  "HPI_OSTREAM_DATA",         \</div><div class='del'>-  "HPI_OSTREAM_SET_VELOCITY", \</div><div class='del'>-  "HPI_OSTREAM_SET_PUNCHINOUT", \</div><div class='del'>-  "HPI_OSTREAM_SINEGEN",        \</div><div class='del'>-  "HPI_OSTREAM_ANC_RESET",      \</div><div class='del'>-  "HPI_OSTREAM_ANC_GET_INFO",   \</div><div class='del'>-  "HPI_OSTREAM_ANC_READ",       \</div><div class='del'>-  "HPI_OSTREAM_SET_TIMESCALE",\</div><div class='del'>-  "HPI_OSTREAM_SET_FORMAT", \</div><div class='del'>-  "HPI_OSTREAM_HOSTBUFFER_ALLOC", \</div><div class='del'>-  "HPI_OSTREAM_HOSTBUFFER_FREE", \</div><div class='del'>-  "HPI_OSTREAM_GROUP_ADD",\</div><div class='del'>-  "HPI_OSTREAM_GROUP_GETMAP", \</div><div class='del'>-  "HPI_OSTREAM_GROUP_RESET", \</div><div class='del'>-  "HPI_OSTREAM_HOSTBUFFER_GET_INFO", \</div><div class='del'>-  "HPI_OSTREAM_WAIT_START", \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_OSTREAM, 24);</div><div class='del'>-</div><div class='del'>-#define HPI_ISTREAM_STRINGS     \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_ISTREAM_OPEN",         \</div><div class='del'>-  "HPI_ISTREAM_CLOSE",        \</div><div class='del'>-  "HPI_ISTREAM_SET_FORMAT",   \</div><div class='del'>-  "HPI_ISTREAM_READ",         \</div><div class='del'>-  "HPI_ISTREAM_START",        \</div><div class='del'>-  "HPI_ISTREAM_STOP",         \</div><div class='del'>-  "HPI_ISTREAM_RESET",        \</div><div class='del'>-  "HPI_ISTREAM_GET_INFO",     \</div><div class='del'>-  "HPI_ISTREAM_QUERY_FORMAT", \</div><div class='del'>-  "HPI_ISTREAM_ANC_RESET",      \</div><div class='del'>-  "HPI_ISTREAM_ANC_GET_INFO",   \</div><div class='del'>-  "HPI_ISTREAM_ANC_WRITE",   \</div><div class='del'>-  "HPI_ISTREAM_HOSTBUFFER_ALLOC",\</div><div class='del'>-  "HPI_ISTREAM_HOSTBUFFER_FREE", \</div><div class='del'>-  "HPI_ISTREAM_GROUP_ADD", \</div><div class='del'>-  "HPI_ISTREAM_GROUP_GETMAP", \</div><div class='del'>-  "HPI_ISTREAM_GROUP_RESET", \</div><div class='del'>-  "HPI_ISTREAM_HOSTBUFFER_GET_INFO", \</div><div class='del'>-  "HPI_ISTREAM_WAIT_START", \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_ISTREAM, 19);</div><div class='del'>-</div><div class='del'>-#define HPI_MIXER_STRINGS       \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_MIXER_OPEN",           \</div><div class='del'>-  "HPI_MIXER_CLOSE",          \</div><div class='del'>-  "HPI_MIXER_GET_INFO",       \</div><div class='del'>-  "HPI_MIXER_GET_NODE_INFO",  \</div><div class='del'>-  "HPI_MIXER_GET_CONTROL",    \</div><div class='del'>-  "HPI_MIXER_SET_CONNECTION", \</div><div class='del'>-  "HPI_MIXER_GET_CONNECTIONS",        \</div><div class='del'>-  "HPI_MIXER_GET_CONTROL_BY_INDEX",   \</div><div class='del'>-  "HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX",     \</div><div class='del'>-  "HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES",    \</div><div class='del'>-  "HPI_MIXER_STORE",  \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_MIXER, 11);</div><div class='del'>-</div><div class='del'>-#define HPI_CONTROL_STRINGS     \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_CONTROL_GET_INFO",     \</div><div class='del'>-  "HPI_CONTROL_GET_STATE",    \</div><div class='del'>-  "HPI_CONTROL_SET_STATE"     \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_CONTROL, 3);</div><div class='del'>-</div><div class='del'>-#define HPI_NVMEMORY_STRINGS    \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_NVMEMORY_OPEN",        \</div><div class='del'>-  "HPI_NVMEMORY_READ_BYTE",   \</div><div class='del'>-  "HPI_NVMEMORY_WRITE_BYTE"   \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_NVMEMORY, 3);</div><div class='del'>-</div><div class='del'>-#define HPI_DIGITALIO_STRINGS   \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_GPIO_OPEN",            \</div><div class='del'>-  "HPI_GPIO_READ_BIT",        \</div><div class='del'>-  "HPI_GPIO_WRITE_BIT",       \</div><div class='del'>-  "HPI_GPIO_READ_ALL",                \</div><div class='del'>-  "HPI_GPIO_WRITE_STATUS"\</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_GPIO, 5);</div><div class='del'>-</div><div class='del'>-#define HPI_WATCHDOG_STRINGS    \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_WATCHDOG_OPEN",        \</div><div class='del'>-  "HPI_WATCHDOG_SET_TIME",    \</div><div class='del'>-  "HPI_WATCHDOG_PING"         \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HPI_CLOCK_STRINGS       \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_CLOCK_OPEN",           \</div><div class='del'>-  "HPI_CLOCK_SET_TIME",       \</div><div class='del'>-  "HPI_CLOCK_GET_TIME"        \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HPI_PROFILE_STRINGS     \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_PROFILE_OPEN_ALL",     \</div><div class='del'>-  "HPI_PROFILE_START_ALL",    \</div><div class='del'>-  "HPI_PROFILE_STOP_ALL",     \</div><div class='del'>-  "HPI_PROFILE_GET",          \</div><div class='del'>-  "HPI_PROFILE_GET_IDLECOUNT",  \</div><div class='del'>-  "HPI_PROFILE_GET_NAME",       \</div><div class='del'>-  "HPI_PROFILE_GET_UTILIZATION" \</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_PROFILE, 7);</div><div class='del'>-</div><div class='del'>-#define HPI_ASYNCEVENT_STRINGS  \</div><div class='del'>-{                               \</div><div class='del'>-  "HPI_ASYNCEVENT_OPEN",\</div><div class='del'>-  "HPI_ASYNCEVENT_CLOSE  ",\</div><div class='del'>-  "HPI_ASYNCEVENT_WAIT",\</div><div class='del'>-  "HPI_ASYNCEVENT_GETCOUNT",\</div><div class='del'>-  "HPI_ASYNCEVENT_GET",\</div><div class='del'>-  "HPI_ASYNCEVENT_SENDEVENTS"\</div><div class='del'>-}</div><div class='del'>-function_count_check(HPI_ASYNCEVENT, 6);</div><div class='del'>-</div><div class='del'>-#define HPI_CONTROL_TYPE_STRINGS \</div><div class='del'>-{ \</div><div class='del'>-	"null control", \</div><div class='del'>-	"HPI_CONTROL_CONNECTION", \</div><div class='del'>-	"HPI_CONTROL_VOLUME", \</div><div class='del'>-	"HPI_CONTROL_METER", \</div><div class='del'>-	"HPI_CONTROL_MUTE", \</div><div class='del'>-	"HPI_CONTROL_MULTIPLEXER", \</div><div class='del'>-	"HPI_CONTROL_AESEBU_TRANSMITTER", \</div><div class='del'>-	"HPI_CONTROL_AESEBU_RECEIVER", \</div><div class='del'>-	"HPI_CONTROL_LEVEL", \</div><div class='del'>-	"HPI_CONTROL_TUNER", \</div><div class='del'>-	"HPI_CONTROL_ONOFFSWITCH", \</div><div class='del'>-	"HPI_CONTROL_VOX", \</div><div class='del'>-	"HPI_CONTROL_AES18_TRANSMITTER", \</div><div class='del'>-	"HPI_CONTROL_AES18_RECEIVER", \</div><div class='del'>-	"HPI_CONTROL_AES18_BLOCKGENERATOR", \</div><div class='del'>-	"HPI_CONTROL_CHANNEL_MODE", \</div><div class='del'>-	"HPI_CONTROL_BITSTREAM", \</div><div class='del'>-	"HPI_CONTROL_SAMPLECLOCK", \</div><div class='del'>-	"HPI_CONTROL_MICROPHONE", \</div><div class='del'>-	"HPI_CONTROL_PARAMETRIC_EQ", \</div><div class='del'>-	"HPI_CONTROL_COMPANDER", \</div><div class='del'>-	"HPI_CONTROL_COBRANET", \</div><div class='del'>-	"HPI_CONTROL_TONE_DETECT", \</div><div class='del'>-	"HPI_CONTROL_SILENCE_DETECT", \</div><div class='del'>-	"HPI_CONTROL_PAD", \</div><div class='del'>-	"HPI_CONTROL_SRC" ,\</div><div class='del'>-	"HPI_CONTROL_UNIVERSAL" \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-compile_time_assert((HPI_CONTROL_LAST_INDEX + 1 == 27),</div><div class='del'>-	controltype_strings_match_defs);</div><div class='del'>-</div><div class='del'>-#define HPI_SOURCENODE_STRINGS \</div><div class='del'>-{ \</div><div class='del'>-	"no source", \</div><div class='del'>-	"HPI_SOURCENODE_OSTREAM", \</div><div class='del'>-	"HPI_SOURCENODE_LINEIN", \</div><div class='del'>-	"HPI_SOURCENODE_AESEBU_IN", \</div><div class='del'>-	"HPI_SOURCENODE_TUNER", \</div><div class='del'>-	"HPI_SOURCENODE_RF", \</div><div class='del'>-	"HPI_SOURCENODE_CLOCK_SOURCE", \</div><div class='del'>-	"HPI_SOURCENODE_RAW_BITSTREAM", \</div><div class='del'>-	"HPI_SOURCENODE_MICROPHONE", \</div><div class='del'>-	"HPI_SOURCENODE_COBRANET", \</div><div class='del'>-	"HPI_SOURCENODE_ANALOG", \</div><div class='del'>-	"HPI_SOURCENODE_ADAPTER" \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-compile_time_assert((HPI_SOURCENODE_LAST_INDEX - HPI_SOURCENODE_NONE + 1) ==</div><div class='del'>-	(12), sourcenode_strings_match_defs);</div><div class='del'>-</div><div class='del'>-#define HPI_DESTNODE_STRINGS \</div><div class='del'>-{ \</div><div class='del'>-	"no destination", \</div><div class='del'>-	"HPI_DESTNODE_ISTREAM", \</div><div class='del'>-	"HPI_DESTNODE_LINEOUT", \</div><div class='del'>-	"HPI_DESTNODE_AESEBU_OUT", \</div><div class='del'>-	"HPI_DESTNODE_RF", \</div><div class='del'>-	"HPI_DESTNODE_SPEAKER", \</div><div class='del'>-	"HPI_DESTNODE_COBRANET", \</div><div class='del'>-	"HPI_DESTNODE_ANALOG" \</div><div class='del'>-}</div><div class='del'>-compile_time_assert((HPI_DESTNODE_LAST_INDEX - HPI_DESTNODE_NONE + 1) == (8),</div><div class='del'>-	destnode_strings_match_defs);</div><div class='del'>-</div><div class='del'>-#define HPI_CONTROL_CHANNEL_MODE_STRINGS \</div><div class='del'>-{ \</div><div class='del'>-	"XXX HPI_CHANNEL_MODE_ERROR XXX", \</div><div class='del'>-	"HPI_CHANNEL_MODE_NORMAL", \</div><div class='del'>-	"HPI_CHANNEL_MODE_SWAP", \</div><div class='del'>-	"HPI_CHANNEL_MODE_LEFT_ONLY", \</div><div class='del'>-	"HPI_CHANNEL_MODE_RIGHT_ONLY" \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif				/* _HPIDEBUG_H  */</div><div class='add'>+#endif				/* _HPIDEBUG_H_  */</div><div class='head'>diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c<br/>index 9b10d9a5c255..9acc0ac75eca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidspcd.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidspcd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidspcd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpidspcd.c</a></div><div class='hunk'>@@ -1,172 +1,131 @@</div><div class='del'>-/***********************************************************************/</div><div class='del'>-/*!</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/***********************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Functions for reading DSP code using hotplug firmware loader</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='ctx'> </div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>-</div><div class='del'>-\file</div><div class='del'>-Functions for reading DSP code to load into DSP</div><div class='del'>-</div><div class='del'>-(Linux only:) If DSPCODE_FIRMWARE_LOADER is defined, code is read using</div><div class='del'>-hotplug firmware loader from individual dsp code files</div><div class='del'>-</div><div class='del'>-If neither of the above is defined, code is read from linked arrays.</div><div class='del'>-DSPCODE_ARRAY is defined.</div><div class='del'>-</div><div class='del'>-HPI_INCLUDE_**** must be defined</div><div class='del'>-and the appropriate hzz?????.c or hex?????.c linked in</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-/***********************************************************************/</div><div class='add'>+***********************************************************************/</div><div class='ctx'> #define SOURCEFILE_NAME "hpidspcd.c"</div><div class='ctx'> #include "hpidspcd.h"</div><div class='ctx'> #include "hpidebug.h"</div><div class='add'>+#include "hpi_version.h"</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- Header structure for binary dsp code file (see asidsp.doc)</div><div class='del'>- This structure must match that used in s2bin.c for generation of asidsp.bin</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef DISABLE_PRAGMA_PACK1</div><div class='del'>-#pragma pack(push, 1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct code_header {</div><div class='del'>-	u32 size;</div><div class='del'>-	char type[4];</div><div class='del'>-	u32 adapter;</div><div class='del'>-	u32 version;</div><div class='del'>-	u32 crc;</div><div class='add'>+struct dsp_code_private {</div><div class='add'>+	/**  Firmware descriptor */</div><div class='add'>+	const struct firmware *firmware;</div><div class='add'>+	struct pci_dev *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_PRAGMA_PACK1</div><div class='del'>-#pragma pack(pop)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define HPI_VER_DECIMAL ((int)(HPI_VER_MAJOR(HPI_VER) * 10000 + \</div><div class='del'>-	    HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))</div><div class='del'>-</div><div class='del'>-/***********************************************************************/</div><div class='del'>-#include "linux/pci.h"</div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='del'>-short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code,</div><div class='del'>-	u32 *pos_error_code)</div><div class='add'>+short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code,</div><div class='add'>+	u32 *os_error_code)</div><div class='ctx'> {</div><div class='del'>-	const struct firmware *ps_firmware = ps_dsp_code-&gt;ps_firmware;</div><div class='add'>+	const struct firmware *firmware;</div><div class='add'>+	struct pci_dev *dev = os_data;</div><div class='ctx'> 	struct code_header header;</div><div class='ctx'> 	char fw_name[20];</div><div class='add'>+	short err_ret = HPI_ERROR_DSP_FILE_NOT_FOUND;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	sprintf(fw_name, "asihpi/dsp%04x.bin", adapter);</div><div class='del'>-	HPI_DEBUG_LOG(INFO, "requesting firmware for %s\n", fw_name);</div><div class='ctx'> </div><div class='del'>-	err = request_firmware(&amp;ps_firmware, fw_name,</div><div class='del'>-		&amp;ps_dsp_code-&gt;ps_dev-&gt;dev);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "%d, request_firmware failed for  %s\n",</div><div class='add'>+	err = request_firmware(&amp;firmware, fw_name, &amp;dev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (err || !firmware) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%d, request_firmware failed for %s\n",</div><div class='ctx'> 			err, fw_name);</div><div class='ctx'> 		goto error1;</div><div class='ctx'> 	}</div><div class='del'>-	if (ps_firmware-&gt;size &lt; sizeof(header)) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "header size too small %s\n", fw_name);</div><div class='add'>+	if (firmware-&gt;size &lt; sizeof(header)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "Header size too small %s\n", fw_name);</div><div class='ctx'> 		goto error2;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(&amp;header, ps_firmware-&gt;data, sizeof(header));</div><div class='del'>-	if (header.adapter != adapter) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "adapter type incorrect %4x != %4x\n",</div><div class='del'>-			header.adapter, adapter);</div><div class='add'>+	memcpy(&amp;header, firmware-&gt;data, sizeof(header));</div><div class='add'>+</div><div class='add'>+	if ((header.type != 0x45444F43) ||	/* "CODE" */</div><div class='add'>+		(header.adapter != adapter)</div><div class='add'>+		|| (header.size != firmware-&gt;size)) {</div><div class='add'>+		dev_err(&amp;dev-&gt;dev,</div><div class='add'>+			"Invalid firmware header size %d != file %zd\n",</div><div class='add'>+			header.size, firmware-&gt;size);</div><div class='ctx'> 		goto error2;</div><div class='ctx'> 	}</div><div class='del'>-	if (header.size != ps_firmware-&gt;size) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "code size wrong  %d != %ld\n",</div><div class='del'>-			header.size, (unsigned long)ps_firmware-&gt;size);</div><div class='add'>+</div><div class='add'>+	if (HPI_VER_MAJOR(header.version) != HPI_VER_MAJOR(HPI_VER)) {</div><div class='add'>+		/* Major version change probably means Host-DSP protocol change */</div><div class='add'>+		dev_err(&amp;dev-&gt;dev,</div><div class='add'>+			"Incompatible firmware version DSP image %X != Driver %X\n",</div><div class='add'>+			header.version, HPI_VER);</div><div class='ctx'> 		goto error2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (header.version / 10000 != HPI_VER_DECIMAL / 10000) {</div><div class='del'>-		HPI_DEBUG_LOG(ERROR,</div><div class='del'>-			"firmware major version mismatch "</div><div class='del'>-			"DSP image %d != driver %d\n", header.version,</div><div class='del'>-			HPI_VER_DECIMAL);</div><div class='del'>-		goto error2;</div><div class='add'>+	if (header.version != HPI_VER) {</div><div class='add'>+		dev_warn(&amp;dev-&gt;dev,</div><div class='add'>+			"Firmware version mismatch: DSP image %X != Driver %X\n",</div><div class='add'>+			header.version, HPI_VER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (header.version != HPI_VER_DECIMAL) {</div><div class='del'>-		HPI_DEBUG_LOG(WARNING,</div><div class='del'>-			"version mismatch  DSP image %d != driver %d\n",</div><div class='del'>-			header.version, HPI_VER_DECIMAL);</div><div class='del'>-		/* goto error2;  still allow driver to load */</div><div class='add'>+	HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);</div><div class='add'>+	dsp_code-&gt;pvt = kmalloc(sizeof(*dsp_code-&gt;pvt), GFP_KERNEL);</div><div class='add'>+	if (!dsp_code-&gt;pvt) {</div><div class='add'>+		err_ret = HPI_ERROR_MEMORY_ALLOC;</div><div class='add'>+		goto error2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	HPI_DEBUG_LOG(INFO, "dsp code %s opened\n", fw_name);</div><div class='del'>-	ps_dsp_code-&gt;ps_firmware = ps_firmware;</div><div class='del'>-	ps_dsp_code-&gt;block_length = header.size / sizeof(u32);</div><div class='del'>-	ps_dsp_code-&gt;word_count = sizeof(header) / sizeof(u32);</div><div class='del'>-	ps_dsp_code-&gt;version = header.version;</div><div class='del'>-	ps_dsp_code-&gt;crc = header.crc;</div><div class='add'>+	dsp_code-&gt;pvt-&gt;dev = dev;</div><div class='add'>+	dsp_code-&gt;pvt-&gt;firmware = firmware;</div><div class='add'>+	dsp_code-&gt;header = header;</div><div class='add'>+	dsp_code-&gt;block_length = header.size / sizeof(u32);</div><div class='add'>+	dsp_code-&gt;word_count = sizeof(header) / sizeof(u32);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error2:</div><div class='del'>-	release_firmware(ps_firmware);</div><div class='add'>+	release_firmware(firmware);</div><div class='ctx'> error1:</div><div class='del'>-	ps_dsp_code-&gt;ps_firmware = NULL;</div><div class='del'>-	ps_dsp_code-&gt;block_length = 0;</div><div class='del'>-	return HPI_ERROR_DSP_FILE_NOT_FOUND;</div><div class='add'>+	dsp_code-&gt;block_length = 0;</div><div class='add'>+	return err_ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='del'>-void hpi_dsp_code_close(struct dsp_code *ps_dsp_code)</div><div class='add'>+void hpi_dsp_code_close(struct dsp_code *dsp_code)</div><div class='ctx'> {</div><div class='del'>-	if (ps_dsp_code-&gt;ps_firmware != NULL) {</div><div class='del'>-		HPI_DEBUG_LOG(DEBUG, "dsp code closed\n");</div><div class='del'>-		release_firmware(ps_dsp_code-&gt;ps_firmware);</div><div class='del'>-		ps_dsp_code-&gt;ps_firmware = NULL;</div><div class='del'>-	}</div><div class='add'>+	HPI_DEBUG_LOG(DEBUG, "dsp code closed\n");</div><div class='add'>+	release_firmware(dsp_code-&gt;pvt-&gt;firmware);</div><div class='add'>+	kfree(dsp_code-&gt;pvt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='del'>-void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code)</div><div class='add'>+void hpi_dsp_code_rewind(struct dsp_code *dsp_code)</div><div class='ctx'> {</div><div class='ctx'> 	/* Go back to start of  data, after header */</div><div class='del'>-	ps_dsp_code-&gt;word_count = sizeof(struct code_header) / sizeof(u32);</div><div class='add'>+	dsp_code-&gt;word_count = sizeof(struct code_header) / sizeof(u32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='del'>-short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code, u32 *pword)</div><div class='add'>+short hpi_dsp_code_read_word(struct dsp_code *dsp_code, u32 *pword)</div><div class='ctx'> {</div><div class='del'>-	if (ps_dsp_code-&gt;word_count + 1 &gt; ps_dsp_code-&gt;block_length)</div><div class='del'>-		return (HPI_ERROR_DSP_FILE_FORMAT);</div><div class='add'>+	if (dsp_code-&gt;word_count + 1 &gt; dsp_code-&gt;block_length)</div><div class='add'>+		return HPI_ERROR_DSP_FILE_FORMAT;</div><div class='ctx'> </div><div class='del'>-	*pword = ((u32 *)(ps_dsp_code-&gt;ps_firmware-&gt;data))[ps_dsp_code-&gt;</div><div class='add'>+	*pword = ((u32 *)(dsp_code-&gt;pvt-&gt;firmware-&gt;data))[dsp_code-&gt;</div><div class='ctx'> 		word_count];</div><div class='del'>-	ps_dsp_code-&gt;word_count++;</div><div class='add'>+	dsp_code-&gt;word_count++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------*/</div><div class='ctx'> short hpi_dsp_code_read_block(size_t words_requested,</div><div class='del'>-	struct dsp_code *ps_dsp_code, u32 **ppblock)</div><div class='add'>+	struct dsp_code *dsp_code, u32 **ppblock)</div><div class='ctx'> {</div><div class='del'>-	if (ps_dsp_code-&gt;word_count + words_requested &gt;</div><div class='del'>-		ps_dsp_code-&gt;block_length)</div><div class='add'>+	if (dsp_code-&gt;word_count + words_requested &gt; dsp_code-&gt;block_length)</div><div class='ctx'> 		return HPI_ERROR_DSP_FILE_FORMAT;</div><div class='ctx'> </div><div class='ctx'> 	*ppblock =</div><div class='del'>-		((u32 *)(ps_dsp_code-&gt;ps_firmware-&gt;data)) +</div><div class='del'>-		ps_dsp_code-&gt;word_count;</div><div class='del'>-	ps_dsp_code-&gt;word_count += words_requested;</div><div class='add'>+		((u32 *)(dsp_code-&gt;pvt-&gt;firmware-&gt;data)) +</div><div class='add'>+		dsp_code-&gt;word_count;</div><div class='add'>+	dsp_code-&gt;word_count += words_requested;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/asihpi/hpidspcd.h b/sound/pci/asihpi/hpidspcd.h<br/>index d7c240398225..9f1468ed7096 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidspcd.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpidspcd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpidspcd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpidspcd.h</a></div><div class='hunk'>@@ -1,38 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /***********************************************************************/</div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> \file</div><div class='ctx'> Functions for reading DSP code to load into DSP</div><div class='ctx'> </div><div class='del'>- hpi_dspcode_defines HPI DSP code loading method</div><div class='del'>-Define exactly one of these to select how the DSP code is supplied to</div><div class='del'>-the adapter.</div><div class='del'>-</div><div class='del'>-End users writing applications that use the HPI interface do not have to</div><div class='del'>-use any of the below defines; they are only necessary for building drivers</div><div class='del'>-</div><div class='del'>-HPI_DSPCODE_FILE:</div><div class='del'>-DSP code is supplied as a file that is opened and read from by the driver.</div><div class='del'>-</div><div class='del'>-HPI_DSPCODE_FIRMWARE:</div><div class='del'>-DSP code is read using the hotplug firmware loader module.</div><div class='del'>-     Only valid when compiling the HPI kernel driver under Linux.</div><div class='ctx'> */</div><div class='ctx'> /***********************************************************************/</div><div class='ctx'> #ifndef _HPIDSPCD_H_</div><div class='hunk'>@@ -40,37 +16,52 @@ DSP code is read using the hotplug firmware loader module.</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_PRAGMA_PACK1</div><div class='del'>-#pragma pack(push, 1)</div><div class='del'>-#endif</div><div class='add'>+/** Header structure for dsp firmware file</div><div class='add'>+ This structure must match that used in s2bin.c for generation of asidsp.bin</div><div class='add'>+ */</div><div class='add'>+/*#ifndef DISABLE_PRAGMA_PACK1 */</div><div class='add'>+/*#pragma pack(push, 1) */</div><div class='add'>+/*#endif */</div><div class='add'>+struct code_header {</div><div class='add'>+	/** Size in bytes including header */</div><div class='add'>+	u32 size;</div><div class='add'>+	/** File type tag "CODE" == 0x45444F43 */</div><div class='add'>+	u32 type;</div><div class='add'>+	/** Adapter model number */</div><div class='add'>+	u32 adapter;</div><div class='add'>+	/** Firmware version*/</div><div class='add'>+	u32 version;</div><div class='add'>+	/** Data checksum */</div><div class='add'>+	u32 checksum;</div><div class='add'>+};</div><div class='add'>+/*#ifndef DISABLE_PRAGMA_PACK1 */</div><div class='add'>+/*#pragma pack(pop) */</div><div class='add'>+/*#endif */</div><div class='add'>+</div><div class='add'>+/*? Don't need the pragmas? */</div><div class='add'>+compile_time_assert((sizeof(struct code_header) == 20), code_header_size);</div><div class='ctx'> </div><div class='ctx'> /** Descriptor for dspcode from firmware loader */</div><div class='ctx'> struct dsp_code {</div><div class='del'>-	/**  Firmware descriptor */</div><div class='del'>-	const struct firmware *ps_firmware;</div><div class='del'>-	struct pci_dev *ps_dev;</div><div class='add'>+	/** copy of  file header */</div><div class='add'>+	struct code_header header;</div><div class='ctx'> 	/** Expected number of words in the whole dsp code,INCL header */</div><div class='del'>-	long int block_length;</div><div class='add'>+	u32 block_length;</div><div class='ctx'> 	/** Number of words read so far */</div><div class='del'>-	long int word_count;</div><div class='del'>-	/** Version read from dsp code file */</div><div class='del'>-	u32 version;</div><div class='del'>-	/** CRC read from dsp code file */</div><div class='del'>-	u32 crc;</div><div class='del'>-};</div><div class='add'>+	u32 word_count;</div><div class='ctx'> </div><div class='del'>-#ifndef DISABLE_PRAGMA_PACK1</div><div class='del'>-#pragma pack(pop)</div><div class='del'>-#endif</div><div class='add'>+	/** internal state of DSP code reader */</div><div class='add'>+	struct dsp_code_private *pvt;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/** Prepare *psDspCode to refer to the requuested adapter.</div><div class='del'>- Searches the file, or selects the appropriate linked array</div><div class='add'>+/** Prepare *psDspCode to refer to the requested adapter's firmware.</div><div class='add'>+Code file name is obtained from HpiOs_GetDspCodePath</div><div class='ctx'> </div><div class='ctx'> \return 0 for success, or error code if requested code is not available</div><div class='ctx'> */</div><div class='ctx'> short hpi_dsp_code_open(</div><div class='ctx'> 	/** Code identifier, usually adapter family */</div><div class='del'>-	u32 adapter,</div><div class='add'>+	u32 adapter, void *pci_dev,</div><div class='ctx'> 	/** Pointer to DSP code control structure */</div><div class='ctx'> 	struct dsp_code *ps_dsp_code,</div><div class='ctx'> 	/** Pointer to dword to receive OS specific error code */</div><div class='hunk'>@@ -87,7 +78,7 @@ void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code);</div><div class='ctx'> */</div><div class='ctx'> short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code,</div><div class='ctx'> 				      /**&lt; DSP code descriptor */</div><div class='del'>-	u32 *pword /**&lt; where to store the read word */</div><div class='add'>+	u32 *pword /**&lt; Where to store the read word */</div><div class='ctx'> 	);</div><div class='ctx'> </div><div class='ctx'> /** Get a block of dsp code into an internal buffer, and provide a pointer to</div><div class='head'>diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c<br/>index 1e92eb6dd509..24047fafef51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpifunc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpifunc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpifunc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpifunc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='ctx'> #include "hpimsginit.h"</div><div class='hunk'>@@ -30,16 +31,25 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,</div><div class='ctx'> 	return handle.w;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,</div><div class='del'>-	u16 *pw_object_index)</div><div class='add'>+static u16 hpi_handle_indexes(const u32 h, u16 *p1, u16 *p2)</div><div class='ctx'> {</div><div class='ctx'> 	union handle_word uhandle;</div><div class='del'>-	uhandle.w = handle;</div><div class='add'>+	if (!h)</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='add'>+	uhandle.w = h;</div><div class='add'>+</div><div class='add'>+	*p1 = (u16)uhandle.h.adapter_index;</div><div class='add'>+	if (p2)</div><div class='add'>+		*p2 = (u16)uhandle.h.obj_index;</div><div class='ctx'> </div><div class='del'>-	if (pw_adapter_index)</div><div class='del'>-		*pw_adapter_index = (u16)uhandle.h.adapter_index;</div><div class='del'>-	if (pw_object_index)</div><div class='del'>-		*pw_object_index = (u16)uhandle.h.obj_index;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,</div><div class='add'>+	u16 *pw_object_index)</div><div class='add'>+{</div><div class='add'>+	hpi_handle_indexes(handle, pw_adapter_index, pw_object_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> char hpi_handle_object(const u32 handle)</div><div class='hunk'>@@ -49,22 +59,6 @@ char hpi_handle_object(const u32 handle)</div><div class='ctx'> 	return (char)uhandle.h.obj_type;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define u32TOINDEX(h, i1) \</div><div class='del'>-do {\</div><div class='del'>-	if (h == 0) \</div><div class='del'>-		return HPI_ERROR_INVALID_OBJ; \</div><div class='del'>-	else \</div><div class='del'>-		hpi_handle_to_indexes(h, i1, NULL); \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define u32TOINDEXES(h, i1, i2) \</div><div class='del'>-do {\</div><div class='del'>-	if (h == 0) \</div><div class='del'>-		return HPI_ERROR_INVALID_OBJ; \</div><div class='del'>-	else \</div><div class='del'>-		hpi_handle_to_indexes(h, i1, i2);\</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='ctx'> void hpi_format_to_msg(struct hpi_msg_format *pMF,</div><div class='ctx'> 	const struct hpi_format *pF)</div><div class='ctx'> {</div><div class='hunk'>@@ -94,52 +88,13 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR)</div><div class='ctx'> 	pSR-&gt;u.legacy_stream_info.state = pSR-&gt;u.stream_info.state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hpi_hsubsys gh_subsys;</div><div class='del'>-</div><div class='del'>-struct hpi_hsubsys *hpi_subsys_create(void)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-</div><div class='del'>-	memset(&amp;gh_subsys, 0, sizeof(struct hpi_hsubsys));</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-			HPI_SUBSYS_OPEN);</div><div class='del'>-		hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-		if (hr.error == 0)</div><div class='del'>-			return &amp;gh_subsys;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys)</div><div class='add'>+static inline void hpi_send_recvV1(struct hpi_message_header *m,</div><div class='add'>+	struct hpi_response_header *r)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_CLOSE);</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='add'>+	hpi_send_recv((struct hpi_message *)m, (struct hpi_response *)r);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys, u32 *pversion)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_GET_VERSION);</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	*pversion = hr.u.s.version;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 *pversion_ex)</div><div class='add'>+u16 hpi_subsys_get_version_ex(u32 *pversion_ex)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -151,79 +106,7 @@ u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,</div><div class='del'>-	u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_GET_INFO);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*pversion = hr.u.s.version;</div><div class='del'>-	if (list_length &gt; HPI_MAX_ADAPTERS)</div><div class='del'>-		memcpy(aw_adapter_list, &amp;hr.u.s.aw_adapter_list,</div><div class='del'>-			HPI_MAX_ADAPTERS);</div><div class='del'>-	else</div><div class='del'>-		memcpy(aw_adapter_list, &amp;hr.u.s.aw_adapter_list, list_length);</div><div class='del'>-	*pw_num_adapters = hr.u.s.num_adapters;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_FIND_ADAPTERS);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (list_length &gt; HPI_MAX_ADAPTERS) {</div><div class='del'>-		memcpy(aw_adapter_list, &amp;hr.u.s.aw_adapter_list,</div><div class='del'>-			HPI_MAX_ADAPTERS * sizeof(u16));</div><div class='del'>-		memset(&amp;aw_adapter_list[HPI_MAX_ADAPTERS], 0,</div><div class='del'>-			(list_length - HPI_MAX_ADAPTERS) * sizeof(u16));</div><div class='del'>-	} else</div><div class='del'>-		memcpy(aw_adapter_list, &amp;hr.u.s.aw_adapter_list,</div><div class='del'>-			list_length * sizeof(u16));</div><div class='del'>-	*pw_num_adapters = hr.u.s.num_adapters;</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const struct hpi_resource *p_resource, u16 *pw_adapter_index)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_CREATE_ADAPTER);</div><div class='del'>-	hm.u.s.resource = *p_resource;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*pw_adapter_index = hr.u.s.adapter_index;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_DELETE_ADAPTER);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	int *pn_num_adapters)</div><div class='add'>+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -234,35 +117,22 @@ u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,</div><div class='del'>-	u32 *padapter_index, u16 *pw_adapter_type)</div><div class='add'>+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,</div><div class='add'>+	u16 *pw_adapter_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='ctx'> 		HPI_SUBSYS_GET_ADAPTER);</div><div class='del'>-	hm.adapter_index = (u16)iterator;</div><div class='add'>+	hm.obj_index = (u16)iterator;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	*padapter_index = (int)hr.u.s.adapter_index;</div><div class='del'>-	*pw_adapter_type = hr.u.s.aw_adapter_list[0];</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='add'>+	*pw_adapter_type = hr.u.s.adapter_type;</div><div class='ctx'> </div><div class='del'>-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const char *sz_interface)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_SET_NETWORK_INTERFACE);</div><div class='del'>-	if (sz_interface == NULL)</div><div class='del'>-		return HPI_ERROR_INVALID_RESOURCE;</div><div class='del'>-	hm.u.s.resource.r.net_if = sz_interface;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)</div><div class='add'>+u16 hpi_adapter_open(u16 adapter_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -276,7 +146,7 @@ u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)</div><div class='add'>+u16 hpi_adapter_close(u16 adapter_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -289,15 +159,14 @@ u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 adapter_mode)</div><div class='add'>+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode)</div><div class='ctx'> {</div><div class='del'>-	return hpi_adapter_set_mode_ex(ph_subsys, adapter_index, adapter_mode,</div><div class='add'>+	return hpi_adapter_set_mode_ex(adapter_index, adapter_mode,</div><div class='ctx'> 		HPI_ADAPTER_MODE_SET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 adapter_mode, u16 query_or_set)</div><div class='add'>+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,</div><div class='add'>+	u16 query_or_set)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -305,14 +174,13 @@ u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='ctx'> 		HPI_ADAPTER_SET_MODE);</div><div class='ctx'> 	hm.adapter_index = adapter_index;</div><div class='del'>-	hm.u.a.adapter_mode = adapter_mode;</div><div class='del'>-	hm.u.a.assert_id = query_or_set;</div><div class='add'>+	hm.u.ax.mode.adapter_mode = adapter_mode;</div><div class='add'>+	hm.u.ax.mode.query_or_set = query_or_set;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 *padapter_mode)</div><div class='add'>+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -321,13 +189,13 @@ u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	hm.adapter_index = adapter_index;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (padapter_mode)</div><div class='del'>-		*padapter_mode = hr.u.a.serial_number;</div><div class='add'>+		*padapter_mode = hr.u.ax.mode.adapter_mode;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,</div><div class='del'>-	u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type)</div><div class='add'>+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,</div><div class='add'>+	u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,</div><div class='add'>+	u16 *pw_adapter_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -337,18 +205,17 @@ u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='del'>-	*pw_adapter_type = hr.u.a.adapter_type;</div><div class='del'>-	*pw_num_outstreams = hr.u.a.num_outstreams;</div><div class='del'>-	*pw_num_instreams = hr.u.a.num_instreams;</div><div class='del'>-	*pw_version = hr.u.a.version;</div><div class='del'>-	*pserial_number = hr.u.a.serial_number;</div><div class='add'>+	*pw_adapter_type = hr.u.ax.info.adapter_type;</div><div class='add'>+	*pw_num_outstreams = hr.u.ax.info.num_outstreams;</div><div class='add'>+	*pw_num_instreams = hr.u.ax.info.num_instreams;</div><div class='add'>+	*pw_version = hr.u.ax.info.version;</div><div class='add'>+	*pserial_number = hr.u.ax.info.serial_number;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 module_index, u16 *pw_num_outputs,</div><div class='del'>-	u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,</div><div class='del'>-	u16 *pw_module_type, u32 *ph_module)</div><div class='add'>+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,</div><div class='add'>+	u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,</div><div class='add'>+	u32 *pserial_number, u16 *pw_module_type, u32 *ph_module)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -360,173 +227,18 @@ u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='del'>-	*pw_module_type = hr.u.a.adapter_type;</div><div class='del'>-	*pw_num_outputs = hr.u.a.num_outstreams;</div><div class='del'>-	*pw_num_inputs = hr.u.a.num_instreams;</div><div class='del'>-	*pw_version = hr.u.a.version;</div><div class='del'>-	*pserial_number = hr.u.a.serial_number;</div><div class='add'>+	*pw_module_type = hr.u.ax.info.adapter_type;</div><div class='add'>+	*pw_num_outputs = hr.u.ax.info.num_outstreams;</div><div class='add'>+	*pw_num_inputs = hr.u.ax.info.num_instreams;</div><div class='add'>+	*pw_version = hr.u.ax.info.version;</div><div class='add'>+	*pserial_number = hr.u.ax.info.serial_number;</div><div class='ctx'> 	*ph_module = 0;</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *assert_present, char *psz_assert,</div><div class='del'>-	u16 *pw_line_number)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_GET_ASSERT);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*assert_present = 0;</div><div class='del'>-</div><div class='del'>-	if (!hr.error) {</div><div class='del'>-</div><div class='del'>-		*pw_line_number = (u16)hr.u.a.serial_number;</div><div class='del'>-		if (*pw_line_number) {</div><div class='del'>-</div><div class='del'>-			int i;</div><div class='del'>-			char *src = (char *)hr.u.a.sz_adapter_assert;</div><div class='del'>-			char *dst = psz_assert;</div><div class='del'>-</div><div class='del'>-			*assert_present = 1;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; HPI_STRING_LEN; i++) {</div><div class='del'>-				char c;</div><div class='del'>-				c = *src++;</div><div class='del'>-				*dst++ = c;</div><div class='del'>-				if (c == 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 *assert_present, char *psz_assert,</div><div class='del'>-	u32 *pline_number, u16 *pw_assert_on_dsp)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_GET_ASSERT);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*assert_present = 0;</div><div class='del'>-</div><div class='del'>-	if (!hr.error) {</div><div class='del'>-</div><div class='del'>-		*pline_number = hr.u.a.serial_number;</div><div class='del'>-</div><div class='del'>-		*assert_present = hr.u.a.adapter_type;</div><div class='del'>-</div><div class='del'>-		*pw_assert_on_dsp = hr.u.a.adapter_index;</div><div class='del'>-</div><div class='del'>-		if (!*assert_present &amp;&amp; *pline_number)</div><div class='del'>-</div><div class='del'>-			*assert_present = 1;</div><div class='del'>-</div><div class='del'>-		if (*assert_present) {</div><div class='del'>-</div><div class='del'>-			int i;</div><div class='del'>-			char *src = (char *)hr.u.a.sz_adapter_assert;</div><div class='del'>-			char *dst = psz_assert;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; HPI_STRING_LEN; i++) {</div><div class='del'>-				char c;</div><div class='del'>-				c = *src++;</div><div class='del'>-				*dst++ = c;</div><div class='del'>-				if (c == 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			*psz_assert = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 assert_id)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_TEST_ASSERT);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hm.u.a.assert_id = assert_id;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 capability, u32 key)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_ENABLE_CAPABILITY);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hm.u.a.assert_id = capability;</div><div class='del'>-	hm.u.a.adapter_mode = key;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_SELFTEST);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 dsp_address, char *p_buffer, int *count_bytes)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-		HPI_ADAPTER_DEBUG_READ);</div><div class='del'>-</div><div class='del'>-	hr.size = sizeof(hr);</div><div class='del'>-</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hm.u.ax.debug_read.dsp_address = dsp_address;</div><div class='del'>-</div><div class='del'>-	if (*count_bytes &gt; (int)sizeof(hr.u.bytes))</div><div class='del'>-		*count_bytes = sizeof(hr.u.bytes);</div><div class='del'>-</div><div class='del'>-	hm.u.ax.debug_read.count_bytes = *count_bytes;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (!hr.error) {</div><div class='del'>-		*count_bytes = hr.size - 12;</div><div class='del'>-		memcpy(p_buffer, &amp;hr.u.bytes, *count_bytes);</div><div class='del'>-	} else</div><div class='del'>-		*count_bytes = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 property, u16 parameter1, u16 parameter2)</div><div class='add'>+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 parameter1,</div><div class='add'>+	u16 parameter2)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -542,9 +254,8 @@ u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 property, u16 *pw_parameter1,</div><div class='del'>-	u16 *pw_parameter2)</div><div class='add'>+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,</div><div class='add'>+	u16 *pw_parameter1, u16 *pw_parameter2)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -564,9 +275,8 @@ u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 index, u16 what_to_enumerate,</div><div class='del'>-	u16 property_index, u32 *psetting)</div><div class='add'>+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,</div><div class='add'>+	u16 what_to_enumerate, u16 property_index, u32 *psetting)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -574,7 +284,7 @@ u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 	u32 sample_rate, u32 bit_rate, u32 attributes)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	struct hpi_msg_format fmt;</div><div class='ctx'> </div><div class='ctx'> 	switch (channels) {</div><div class='hunk'>@@ -586,8 +296,8 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		error = HPI_ERROR_INVALID_CHANNELS;</div><div class='del'>-		return error;</div><div class='add'>+		err = HPI_ERROR_INVALID_CHANNELS;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	fmt.channels = channels;</div><div class='ctx'> </div><div class='hunk'>@@ -610,17 +320,17 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 	case HPI_FORMAT_OEM2:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		error = HPI_ERROR_INVALID_FORMAT;</div><div class='del'>-		return error;</div><div class='add'>+		err = HPI_ERROR_INVALID_FORMAT;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	fmt.format = format;</div><div class='ctx'> </div><div class='ctx'> 	if (sample_rate &lt; 8000L) {</div><div class='del'>-		error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;</div><div class='add'>+		err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;</div><div class='ctx'> 		sample_rate = 8000L;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (sample_rate &gt; 200000L) {</div><div class='del'>-		error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;</div><div class='add'>+		err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;</div><div class='ctx'> 		sample_rate = 200000L;</div><div class='ctx'> 	}</div><div class='ctx'> 	fmt.sample_rate = sample_rate;</div><div class='hunk'>@@ -651,10 +361,10 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 		if ((channels == 1)</div><div class='ctx'> 			&amp;&amp; (attributes != HPI_MPEG_MODE_DEFAULT)) {</div><div class='ctx'> 			attributes = HPI_MPEG_MODE_DEFAULT;</div><div class='del'>-			error = HPI_ERROR_INVALID_FORMAT;</div><div class='add'>+			err = HPI_ERROR_INVALID_FORMAT;</div><div class='ctx'> 		} else if (attributes &gt; HPI_MPEG_MODE_DUALCHANNEL) {</div><div class='ctx'> 			attributes = HPI_MPEG_MODE_DEFAULT;</div><div class='del'>-			error = HPI_ERROR_INVALID_FORMAT;</div><div class='add'>+			err = HPI_ERROR_INVALID_FORMAT;</div><div class='ctx'> 		}</div><div class='ctx'> 		fmt.attributes = attributes;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -663,7 +373,7 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hpi_msg_to_format(p_format, &amp;fmt);</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,</div><div class='hunk'>@@ -712,8 +422,8 @@ u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u16 outstream_index, u32 *ph_outstream)</div><div class='add'>+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,</div><div class='add'>+	u32 *ph_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -733,38 +443,41 @@ u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_close(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_HOSTBUFFER_FREE);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_GROUP_RESET);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_CLOSE);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,</div><div class='del'>-	u32 *psamples_played, u32 *pauxiliary_data_to_play)</div><div class='add'>+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,</div><div class='add'>+	u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,</div><div class='add'>+	u32 *pauxiliary_data_to_play)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='hunk'>@@ -782,15 +495,15 @@ u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, const u8 *pb_data, u32 bytes_to_write,</div><div class='del'>-	const struct hpi_format *p_format)</div><div class='add'>+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_data,</div><div class='add'>+	u32 bytes_to_write, const struct hpi_format *p_format)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_WRITE);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.pb_data = (u8 *)pb_data;</div><div class='ctx'> 	hm.u.d.u.data.data_size = bytes_to_write;</div><div class='ctx'> </div><div class='hunk'>@@ -801,82 +514,85 @@ u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_start(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_START);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_wait_start(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_WAIT_START);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_stop(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_STOP);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_sinegen(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_SINEGEN);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_reset(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_RESET);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_format *p_format)</div><div class='add'>+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_QUERY_FORMAT);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_format_to_msg(&amp;hm.u.d.u.data.format, p_format);</div><div class='ctx'> </div><div class='hunk'>@@ -885,15 +601,15 @@ u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_format *p_format)</div><div class='add'>+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_SET_FORMAT);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_format_to_msg(&amp;hm.u.d.u.data.format, p_format);</div><div class='ctx'> </div><div class='hunk'>@@ -902,15 +618,15 @@ u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, short velocity)</div><div class='add'>+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_SET_VELOCITY);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.velocity = velocity;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -918,15 +634,16 @@ u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample)</div><div class='add'>+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,</div><div class='add'>+	u32 punch_out_sample)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_SET_PUNCHINOUT);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hm.u.d.u.pio.punch_in_sample = punch_in_sample;</div><div class='ctx'> 	hm.u.d.u.pio.punch_out_sample = punch_out_sample;</div><div class='hunk'>@@ -936,29 +653,29 @@ u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u16 mode)</div><div class='add'>+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_ANC_RESET);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.format.channels = mode;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 *pframes_available)</div><div class='add'>+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_ANC_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (hr.error == 0) {</div><div class='ctx'> 		if (pframes_available)</div><div class='hunk'>@@ -969,8 +686,8 @@ u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='add'>+u16 hpi_outstream_ancillary_read(u32 h_outstream,</div><div class='add'>+	struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='ctx'> 	u32 anc_frame_buffer_size_in_bytes,</div><div class='ctx'> 	u32 number_of_ancillary_frames_to_read)</div><div class='ctx'> {</div><div class='hunk'>@@ -979,7 +696,8 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_ANC_READ);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;</div><div class='ctx'> 	hm.u.d.u.data.data_size =</div><div class='ctx'> 		number_of_ancillary_frames_to_read *</div><div class='hunk'>@@ -987,19 +705,19 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	if (hm.u.d.u.data.data_size &lt;= anc_frame_buffer_size_in_bytes)</div><div class='ctx'> 		hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	else</div><div class='del'>-		hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;</div><div class='add'>+		hr.error = HPI_ERROR_INVALID_DATASIZE;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 time_scale)</div><div class='add'>+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scale)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_SET_TIMESCALE);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hm.u.d.u.time_scale = time_scale;</div><div class='ctx'> </div><div class='hunk'>@@ -1008,22 +726,21 @@ u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 size_in_bytes)</div><div class='add'>+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_HOSTBUFFER_ALLOC);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.data_size = size_in_bytes;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u8 **pp_buffer,</div><div class='add'>+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,</div><div class='ctx'> 	struct hpi_hostbuffer_status **pp_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -1031,7 +748,8 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_HOSTBUFFER_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	if (hr.error == 0) {</div><div class='hunk'>@@ -1043,21 +761,20 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_host_buffer_free(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_HOSTBUFFER_FREE);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 h_stream)</div><div class='add'>+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -1066,22 +783,22 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_GROUP_ADD);</div><div class='del'>-	hr.error = 0;</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='add'>+	if (hpi_handle_indexes(h_stream, &amp;adapter,</div><div class='add'>+			&amp;hm.u.d.u.stream.stream_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='ctx'> 	c_obj_type = hpi_handle_object(h_stream);</div><div class='ctx'> 	switch (c_obj_type) {</div><div class='ctx'> 	case HPI_OBJ_OSTREAM:</div><div class='del'>-		hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;</div><div class='del'>-		u32TOINDEXES(h_stream, &amp;adapter,</div><div class='del'>-			&amp;hm.u.d.u.stream.stream_index);</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_OBJ_ISTREAM:</div><div class='del'>-		hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;</div><div class='del'>-		u32TOINDEXES(h_stream, &amp;adapter,</div><div class='del'>-			&amp;hm.u.d.u.stream.stream_index);</div><div class='add'>+		hm.u.d.u.stream.object_type = c_obj_type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return HPI_ERROR_INVALID_STREAM;</div><div class='add'>+		return HPI_ERROR_INVALID_OBJ;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (adapter != hm.adapter_index)</div><div class='ctx'> 		return HPI_ERROR_NO_INTERADAPTER_GROUPS;</div><div class='hunk'>@@ -1090,15 +807,16 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map)</div><div class='add'>+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,</div><div class='add'>+	u32 *pinstream_map)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_GROUP_GETMAP);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	if (poutstream_map)</div><div class='hunk'>@@ -1109,21 +827,20 @@ u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_outstream)</div><div class='add'>+u16 hpi_outstream_group_reset(u32 h_outstream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 		HPI_OSTREAM_GROUP_RESET);</div><div class='del'>-	u32TOINDEXES(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_outstream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u16 instream_index, u32 *ph_instream)</div><div class='add'>+u16 hpi_instream_open(u16 adapter_index, u16 instream_index, u32 *ph_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -1145,38 +862,40 @@ u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream)</div><div class='add'>+u16 hpi_instream_close(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_HOSTBUFFER_FREE);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_GROUP_RESET);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_CLOSE);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_format *p_format)</div><div class='add'>+u16 hpi_instream_query_format(u32 h_instream,</div><div class='add'>+	const struct hpi_format *p_format)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_QUERY_FORMAT);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_format_to_msg(&amp;hm.u.d.u.data.format, p_format);</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -1184,15 +903,15 @@ u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_format *p_format)</div><div class='add'>+u16 hpi_instream_set_format(u32 h_instream, const struct hpi_format *p_format)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_SET_FORMAT);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_format_to_msg(&amp;hm.u.d.u.data.format, p_format);</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -1200,15 +919,15 @@ u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,</div><div class='del'>-	u8 *pb_data, u32 bytes_to_read)</div><div class='add'>+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_data, u32 bytes_to_read)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_READ);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.data_size = bytes_to_read;</div><div class='ctx'> 	hm.u.d.u.data.pb_data = pb_data;</div><div class='ctx'> </div><div class='hunk'>@@ -1217,72 +936,76 @@ u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream)</div><div class='add'>+u16 hpi_instream_start(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_START);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream)</div><div class='add'>+u16 hpi_instream_wait_start(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_WAIT_START);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream)</div><div class='add'>+u16 hpi_instream_stop(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_STOP);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream)</div><div class='add'>+u16 hpi_instream_reset(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_RESET);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,</div><div class='del'>-	u32 *psamples_recorded, u32 *pauxiliary_data_recorded)</div><div class='add'>+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,</div><div class='add'>+	u32 *pdata_recorded, u32 *psamples_recorded,</div><div class='add'>+	u32 *pauxiliary_data_recorded)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='hunk'>@@ -1300,15 +1023,15 @@ u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,</div><div class='del'>-	u16 idle_bit)</div><div class='add'>+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,</div><div class='add'>+	u16 mode, u16 alignment, u16 idle_bit)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_ANC_RESET);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.format.attributes = bytes_per_frame;</div><div class='ctx'> 	hm.u.d.u.data.format.format = (mode &lt;&lt; 8) | (alignment &amp; 0xff);</div><div class='ctx'> 	hm.u.d.u.data.format.channels = idle_bit;</div><div class='hunk'>@@ -1316,14 +1039,14 @@ u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 *pframe_space)</div><div class='add'>+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_ANC_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (pframe_space)</div><div class='ctx'> 		*pframe_space =</div><div class='hunk'>@@ -1333,8 +1056,8 @@ u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='add'>+u16 hpi_instream_ancillary_write(u32 h_instream,</div><div class='add'>+	const struct hpi_anc_frame *p_anc_frame_buffer,</div><div class='ctx'> 	u32 anc_frame_buffer_size_in_bytes,</div><div class='ctx'> 	u32 number_of_ancillary_frames_to_write)</div><div class='ctx'> {</div><div class='hunk'>@@ -1343,7 +1066,8 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_ANC_WRITE);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;</div><div class='ctx'> 	hm.u.d.u.data.data_size =</div><div class='ctx'> 		number_of_ancillary_frames_to_write *</div><div class='hunk'>@@ -1351,12 +1075,11 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	if (hm.u.d.u.data.data_size &lt;= anc_frame_buffer_size_in_bytes)</div><div class='ctx'> 		hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	else</div><div class='del'>-		hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;</div><div class='add'>+		hr.error = HPI_ERROR_INVALID_DATASIZE;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 size_in_bytes)</div><div class='add'>+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -1364,14 +1087,14 @@ u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_HOSTBUFFER_ALLOC);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.d.u.data.data_size = size_in_bytes;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u8 **pp_buffer,</div><div class='add'>+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,</div><div class='ctx'> 	struct hpi_hostbuffer_status **pp_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -1379,7 +1102,8 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_HOSTBUFFER_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	if (hr.error == 0) {</div><div class='hunk'>@@ -1391,8 +1115,7 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream)</div><div class='add'>+u16 hpi_instream_host_buffer_free(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -1400,13 +1123,13 @@ u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_HOSTBUFFER_FREE);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 h_stream)</div><div class='add'>+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -1416,22 +1139,23 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_GROUP_ADD);</div><div class='ctx'> 	hr.error = 0;</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='add'>+	if (hpi_handle_indexes(h_stream, &amp;adapter,</div><div class='add'>+			&amp;hm.u.d.u.stream.stream_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='ctx'> 	c_obj_type = hpi_handle_object(h_stream);</div><div class='ctx'> </div><div class='ctx'> 	switch (c_obj_type) {</div><div class='ctx'> 	case HPI_OBJ_OSTREAM:</div><div class='del'>-		hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;</div><div class='del'>-		u32TOINDEXES(h_stream, &amp;adapter,</div><div class='del'>-			&amp;hm.u.d.u.stream.stream_index);</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_OBJ_ISTREAM:</div><div class='del'>-		hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;</div><div class='del'>-		u32TOINDEXES(h_stream, &amp;adapter,</div><div class='del'>-			&amp;hm.u.d.u.stream.stream_index);</div><div class='add'>+		hm.u.d.u.stream.object_type = c_obj_type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return HPI_ERROR_INVALID_STREAM;</div><div class='add'>+		return HPI_ERROR_INVALID_OBJ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (adapter != hm.adapter_index)</div><div class='hunk'>@@ -1441,15 +1165,16 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream, u32 *poutstream_map, u32 *pinstream_map)</div><div class='add'>+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,</div><div class='add'>+	u32 *pinstream_map)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_HOSTBUFFER_FREE);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='ctx'> 	if (poutstream_map)</div><div class='hunk'>@@ -1460,21 +1185,20 @@ u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_instream)</div><div class='add'>+u16 hpi_instream_group_reset(u32 h_instream)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 		HPI_ISTREAM_GROUP_RESET);</div><div class='del'>-	u32TOINDEXES(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_instream, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_mixer)</div><div class='add'>+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='hunk'>@@ -1492,25 +1216,29 @@ u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer)</div><div class='add'>+u16 hpi_mixer_close(u32 h_mixer)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='add'>+</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_MIXER, HPI_MIXER_CLOSE);</div><div class='del'>-	u32TOINDEX(h_mixer, &amp;hm.adapter_index);</div><div class='add'>+	if (hpi_handle_indexes(h_mixer, &amp;hm.adapter_index, NULL))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='del'>-	u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,</div><div class='del'>-	u16 dst_node_type_index, u16 control_type, u32 *ph_control)</div><div class='add'>+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,</div><div class='add'>+	u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,</div><div class='add'>+	u16 control_type, u32 *ph_control)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_MIXER,</div><div class='ctx'> 		HPI_MIXER_GET_CONTROL);</div><div class='del'>-	u32TOINDEX(h_mixer, &amp;hm.adapter_index);</div><div class='add'>+	if (hpi_handle_indexes(h_mixer, &amp;hm.adapter_index, NULL))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.m.node_type1 = src_node_type;</div><div class='ctx'> 	hm.u.m.node_index1 = src_node_type_index;</div><div class='ctx'> 	hm.u.m.node_type2 = dst_node_type;</div><div class='hunk'>@@ -1528,16 +1256,16 @@ u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_mixer, u16 control_index, u16 *pw_src_node_type,</div><div class='del'>-	u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,</div><div class='del'>-	u16 *pw_control_type, u32 *ph_control)</div><div class='add'>+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,</div><div class='add'>+	u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,</div><div class='add'>+	u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_MIXER,</div><div class='ctx'> 		HPI_MIXER_GET_CONTROL_BY_INDEX);</div><div class='del'>-	u32TOINDEX(h_mixer, &amp;hm.adapter_index);</div><div class='add'>+	if (hpi_handle_indexes(h_mixer, &amp;hm.adapter_index, NULL))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.m.control_index = control_index;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> </div><div class='hunk'>@@ -1562,13 +1290,14 @@ u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='del'>-	enum HPI_MIXER_STORE_COMMAND command, u16 index)</div><div class='add'>+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,</div><div class='add'>+	u16 index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_MIXER, HPI_MIXER_STORE);</div><div class='del'>-	u32TOINDEX(h_mixer, &amp;hm.adapter_index);</div><div class='add'>+	if (hpi_handle_indexes(h_mixer, &amp;hm.adapter_index, NULL))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.mx.store.command = command;</div><div class='ctx'> 	hm.u.mx.store.index = index;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -1576,16 +1305,16 @@ u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-u16 hpi_control_param_set(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_control, const u16 attrib, const u32 param1,</div><div class='del'>-	const u32 param2)</div><div class='add'>+u16 hpi_control_param_set(const u32 h_control, const u16 attrib,</div><div class='add'>+	const u32 param1, const u32 param2)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = attrib;</div><div class='ctx'> 	hm.u.c.param1 = param1;</div><div class='ctx'> 	hm.u.c.param2 = param2;</div><div class='hunk'>@@ -1601,7 +1330,8 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = attrib;</div><div class='ctx'> 	hm.u.c.an_log_value[0] = sv0;</div><div class='ctx'> 	hm.u.c.an_log_value[1] = sv1;</div><div class='hunk'>@@ -1610,16 +1340,16 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_control, const u16 attrib, u32 param1, u32 param2,</div><div class='del'>-	u32 *pparam1, u32 *pparam2)</div><div class='add'>+u16 hpi_control_param_get(const u32 h_control, const u16 attrib, u32 param1,</div><div class='add'>+	u32 param2, u32 *pparam1, u32 *pparam2)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = attrib;</div><div class='ctx'> 	hm.u.c.param1 = param1;</div><div class='ctx'> 	hm.u.c.param2 = param2;</div><div class='hunk'>@@ -1632,19 +1362,20 @@ u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define hpi_control_param1_get(s, h, a, p1) \</div><div class='del'>-		hpi_control_param_get(s, h, a, 0, 0, p1, NULL)</div><div class='del'>-#define hpi_control_param2_get(s, h, a, p1, p2) \</div><div class='del'>-		hpi_control_param_get(s, h, a, 0, 0, p1, p2)</div><div class='add'>+#define hpi_control_param1_get(h, a, p1) \</div><div class='add'>+		hpi_control_param_get(h, a, 0, 0, p1, NULL)</div><div class='add'>+#define hpi_control_param2_get(h, a, p1, p2) \</div><div class='add'>+		hpi_control_param_get(h, a, 0, 0, p1, p2)</div><div class='ctx'> </div><div class='del'>-static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 attrib, short *sv0, short *sv1)</div><div class='add'>+static u16 hpi_control_log_get2(u32 h_control, u16 attrib, short *sv0,</div><div class='add'>+	short *sv1)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = attrib;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -1655,8 +1386,7 @@ static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static</div><div class='del'>-u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_control, const u16 attrib, const u32 index,</div><div class='add'>+u16 hpi_control_query(const u32 h_control, const u16 attrib, const u32 index,</div><div class='ctx'> 	const u32 param, u32 *psetting)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -1664,7 +1394,8 @@ u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_INFO);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hm.u.c.attribute = attrib;</div><div class='ctx'> 	hm.u.c.param1 = index;</div><div class='hunk'>@@ -1682,7 +1413,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,</div><div class='ctx'> 	unsigned int sub_string_index = 0, j = 0;</div><div class='ctx'> 	char c = 0;</div><div class='ctx'> 	unsigned int n = 0;</div><div class='del'>-	u16 hE = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((string_length &lt; 1) || (string_length &gt; 256))</div><div class='ctx'> 		return HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='hunk'>@@ -1693,7 +1424,9 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,</div><div class='ctx'> </div><div class='ctx'> 		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 			HPI_CONTROL_GET_STATE);</div><div class='del'>-		u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+		if (hpi_handle_indexes(h_control, &amp;hm.adapter_index,</div><div class='add'>+				&amp;hm.obj_index))</div><div class='add'>+			return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 		hm.u.c.attribute = attribute;</div><div class='ctx'> 		hm.u.c.param1 = sub_string_index;</div><div class='ctx'> 		hm.u.c.param2 = 0;</div><div class='hunk'>@@ -1705,7 +1438,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,</div><div class='ctx'> 			return HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='ctx'> </div><div class='ctx'> 		if (hr.error) {</div><div class='del'>-			hE = hr.error;</div><div class='add'>+			err = hr.error;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (j = 0; j &lt; 8; j++) {</div><div class='hunk'>@@ -1714,7 +1447,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,</div><div class='ctx'> 			n++;</div><div class='ctx'> 			if (n &gt;= string_length) {</div><div class='ctx'> 				psz_string[string_length - 1] = 0;</div><div class='del'>-				hE = HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='add'>+				err = HPI_ERROR_INVALID_CONTROL_VALUE;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 			if (c == 0)</div><div class='hunk'>@@ -1730,57 +1463,52 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,</div><div class='ctx'> 		if (c == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	return hE;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_aes_rx, const u32 index, u16 *pw_format)</div><div class='add'>+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,</div><div class='add'>+	u16 *pw_format)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_aes_rx, HPI_AESEBURX_FORMAT,</div><div class='del'>-		index, 0, &amp;qr);</div><div class='add'>+	err = hpi_control_query(h_aes_rx, HPI_AESEBURX_FORMAT, index, 0, &amp;qr);</div><div class='ctx'> 	*pw_format = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 format)</div><div class='add'>+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 format)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBURX_FORMAT, format, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_AESEBURX_FORMAT, format,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_format)</div><div class='add'>+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_format)</div><div class='ctx'> {</div><div class='ctx'> 	u16 err;</div><div class='ctx'> 	u32 param;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBURX_FORMAT, &amp;param);</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_AESEBURX_FORMAT, &amp;param);</div><div class='ctx'> 	if (!err &amp;&amp; pw_format)</div><div class='ctx'> 		*pw_format = (u16)param;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate)</div><div class='add'>+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBURX_SAMPLERATE, psample_rate);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_AESEBURX_SAMPLERATE,</div><div class='add'>+		psample_rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *pw_data)</div><div class='add'>+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_AESEBURX_USERDATA;</div><div class='ctx'> 	hm.u.c.param1 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -1791,14 +1519,15 @@ u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 *pw_data)</div><div class='add'>+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 *pw_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_AESEBURX_CHANNELSTATUS;</div><div class='ctx'> 	hm.u.c.param1 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -1809,101 +1538,93 @@ u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_error_data)</div><div class='add'>+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data)</div><div class='ctx'> {</div><div class='ctx'> 	u32 error_data = 0;</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBURX_ERRORSTATUS, &amp;error_data);</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_AESEBURX_ERRORSTATUS,</div><div class='add'>+		&amp;error_data);</div><div class='ctx'> 	if (pw_error_data)</div><div class='ctx'> 		*pw_error_data = (u16)error_data;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u32 sample_rate)</div><div class='add'>+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBUTX_SAMPLERATE, sample_rate, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_AESEBUTX_SAMPLERATE,</div><div class='add'>+		sample_rate, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 data)</div><div class='add'>+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBUTX_USERDATA, index, data);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_AESEBUTX_USERDATA, index,</div><div class='add'>+		data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 data)</div><div class='add'>+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 data)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBUTX_CHANNELSTATUS, index, data);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_AESEBUTX_CHANNELSTATUS,</div><div class='add'>+		index, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, u16 index, u16 *pw_data)</div><div class='add'>+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,</div><div class='add'>+	u16 *pw_data)</div><div class='ctx'> {</div><div class='ctx'> 	return HPI_ERROR_INVALID_OPERATION;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_aes_tx, const u32 index, u16 *pw_format)</div><div class='add'>+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,</div><div class='add'>+	u16 *pw_format)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_aes_tx, HPI_AESEBUTX_FORMAT,</div><div class='del'>-		index, 0, &amp;qr);</div><div class='add'>+	err = hpi_control_query(h_aes_tx, HPI_AESEBUTX_FORMAT, index, 0, &amp;qr);</div><div class='ctx'> 	*pw_format = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 output_format)</div><div class='add'>+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBUTX_FORMAT, output_format, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_AESEBUTX_FORMAT,</div><div class='add'>+		output_format, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_output_format)</div><div class='add'>+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format)</div><div class='ctx'> {</div><div class='ctx'> 	u16 err;</div><div class='ctx'> 	u32 param;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_AESEBUTX_FORMAT, &amp;param);</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_AESEBUTX_FORMAT, &amp;param);</div><div class='ctx'> 	if (!err &amp;&amp; pw_output_format)</div><div class='ctx'> 		*pw_output_format = (u16)param;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 edge_type)</div><div class='add'>+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_BITSTREAM_CLOCK_EDGE, edge_type, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_BITSTREAM_CLOCK_EDGE,</div><div class='add'>+		edge_type, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 polarity)</div><div class='add'>+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_BITSTREAM_DATA_POLARITY, polarity, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_BITSTREAM_DATA_POLARITY,</div><div class='add'>+		polarity, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity)</div><div class='add'>+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,</div><div class='add'>+	u16 *pw_data_activity)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_BITSTREAM_ACTIVITY;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (pw_clk_activity)</div><div class='hunk'>@@ -1913,299 +1634,293 @@ u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_mode, const u32 index, u16 *pw_mode)</div><div class='add'>+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,</div><div class='add'>+	u16 *pw_mode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_mode, HPI_CHANNEL_MODE_MODE,</div><div class='del'>-		index, 0, &amp;qr);</div><div class='add'>+	err = hpi_control_query(h_mode, HPI_CHANNEL_MODE_MODE, index, 0, &amp;qr);</div><div class='ctx'> 	*pw_mode = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 mode)</div><div class='add'>+u16 hpi_channel_mode_set(u32 h_control, u16 mode)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_CHANNEL_MODE_MODE, mode, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_CHANNEL_MODE_MODE, mode,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *mode)</div><div class='add'>+u16 hpi_channel_mode_get(u32 h_control, u16 *mode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mode32 = 0;</div><div class='del'>-	u16 error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='add'>+	u16 err = hpi_control_param1_get(h_control,</div><div class='ctx'> 		HPI_CHANNEL_MODE_MODE, &amp;mode32);</div><div class='ctx'> 	if (mode)</div><div class='ctx'> 		*mode = (u16)mode32;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 hmi_address, u32 byte_count, u8 *pb_data)</div><div class='add'>+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,</div><div class='add'>+	u8 *pb_data)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='add'>+	struct hpi_msg_cobranet_hmiwrite hm;</div><div class='add'>+	struct hpi_response_header hr;</div><div class='ctx'> </div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROLEX,</div><div class='del'>-		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_init_message_responseV1(&amp;hm.h, sizeof(hm), &amp;hr, sizeof(hr),</div><div class='add'>+		HPI_OBJ_CONTROL, HPI_CONTROL_SET_STATE);</div><div class='ctx'> </div><div class='del'>-	hm.u.cx.u.cobranet_data.byte_count = byte_count;</div><div class='del'>-	hm.u.cx.u.cobranet_data.hmi_address = hmi_address;</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.h.adapter_index,</div><div class='add'>+			&amp;hm.h.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='del'>-	if (byte_count &lt;= 8) {</div><div class='del'>-		memcpy(hm.u.cx.u.cobranet_data.data, pb_data, byte_count);</div><div class='del'>-		hm.u.cx.attribute = HPI_COBRANET_SET;</div><div class='del'>-	} else {</div><div class='del'>-		hm.u.cx.u.cobranet_bigdata.pb_data = pb_data;</div><div class='del'>-		hm.u.cx.attribute = HPI_COBRANET_SET_DATA;</div><div class='del'>-	}</div><div class='add'>+	if (byte_count &gt; sizeof(hm.bytes))</div><div class='add'>+		return HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL;</div><div class='ctx'> </div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='add'>+	hm.p.attribute = HPI_COBRANET_SET;</div><div class='add'>+	hm.p.byte_count = byte_count;</div><div class='add'>+	hm.p.hmi_address = hmi_address;</div><div class='add'>+	memcpy(hm.bytes, pb_data, byte_count);</div><div class='add'>+	hm.h.size = (u16)(sizeof(hm.h) + sizeof(hm.p) + byte_count);</div><div class='ctx'> </div><div class='add'>+	hpi_send_recvV1(&amp;hm.h, &amp;hr);</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data)</div><div class='add'>+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,</div><div class='add'>+	u32 *pbyte_count, u8 *pb_data)</div><div class='ctx'> {</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='add'>+	struct hpi_msg_cobranet_hmiread hm;</div><div class='add'>+	struct hpi_res_cobranet_hmiread hr;</div><div class='ctx'> </div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROLEX,</div><div class='del'>-		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	hpi_init_message_responseV1(&amp;hm.h, sizeof(hm), &amp;hr.h, sizeof(hr),</div><div class='add'>+		HPI_OBJ_CONTROL, HPI_CONTROL_GET_STATE);</div><div class='ctx'> </div><div class='del'>-	hm.u.cx.u.cobranet_data.byte_count = max_byte_count;</div><div class='del'>-	hm.u.cx.u.cobranet_data.hmi_address = hmi_address;</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.h.adapter_index,</div><div class='add'>+			&amp;hm.h.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='del'>-	if (max_byte_count &lt;= 8) {</div><div class='del'>-		hm.u.cx.attribute = HPI_COBRANET_GET;</div><div class='del'>-	} else {</div><div class='del'>-		hm.u.cx.u.cobranet_bigdata.pb_data = pb_data;</div><div class='del'>-		hm.u.cx.attribute = HPI_COBRANET_GET_DATA;</div><div class='del'>-	}</div><div class='add'>+	if (max_byte_count &gt; sizeof(hr.bytes))</div><div class='add'>+		return HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;</div><div class='ctx'> </div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	if (!hr.error &amp;&amp; pb_data) {</div><div class='add'>+	hm.p.attribute = HPI_COBRANET_GET;</div><div class='add'>+	hm.p.byte_count = max_byte_count;</div><div class='add'>+	hm.p.hmi_address = hmi_address;</div><div class='ctx'> </div><div class='del'>-		*pbyte_count = hr.u.cx.u.cobranet_data.byte_count;</div><div class='add'>+	hpi_send_recvV1(&amp;hm.h, &amp;hr.h);</div><div class='ctx'> </div><div class='del'>-		if (*pbyte_count &lt; max_byte_count)</div><div class='del'>-			max_byte_count = *pbyte_count;</div><div class='add'>+	if (!hr.h.error &amp;&amp; pb_data) {</div><div class='add'>+		if (hr.byte_count &gt; sizeof(hr.bytes))</div><div class='ctx'> </div><div class='del'>-		if (hm.u.cx.attribute == HPI_COBRANET_GET) {</div><div class='del'>-			memcpy(pb_data, hr.u.cx.u.cobranet_data.data,</div><div class='del'>-				max_byte_count);</div><div class='del'>-		} else {</div><div class='add'>+			return HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;</div><div class='ctx'> </div><div class='del'>-		}</div><div class='add'>+		*pbyte_count = hr.byte_count;</div><div class='add'>+</div><div class='add'>+		if (hr.byte_count &lt; max_byte_count)</div><div class='add'>+			max_byte_count = *pbyte_count;</div><div class='ctx'> </div><div class='add'>+		memcpy(pb_data, hr.bytes, max_byte_count);</div><div class='ctx'> 	}</div><div class='del'>-	return hr.error;</div><div class='add'>+	return hr.h.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pstatus, u32 *preadable_size,</div><div class='del'>-	u32 *pwriteable_size)</div><div class='add'>+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,</div><div class='add'>+	u32 *preadable_size, u32 *pwriteable_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROLEX,</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='del'>-	hm.u.cx.attribute = HPI_COBRANET_GET_STATUS;</div><div class='add'>+	hm.u.c.attribute = HPI_COBRANET_GET_STATUS;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (!hr.error) {</div><div class='ctx'> 		if (pstatus)</div><div class='del'>-			*pstatus = hr.u.cx.u.cobranet_status.status;</div><div class='add'>+			*pstatus = hr.u.cu.cobranet.status.status;</div><div class='ctx'> 		if (preadable_size)</div><div class='ctx'> 			*preadable_size =</div><div class='del'>-				hr.u.cx.u.cobranet_status.readable_size;</div><div class='add'>+				hr.u.cu.cobranet.status.readable_size;</div><div class='ctx'> 		if (pwriteable_size)</div><div class='ctx'> 			*pwriteable_size =</div><div class='del'>-				hr.u.cx.u.cobranet_status.writeable_size;</div><div class='add'>+				hr.u.cu.cobranet.status.writeable_size;</div><div class='ctx'> 	}</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pi_paddress)</div><div class='add'>+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address)</div><div class='ctx'> {</div><div class='ctx'> 	u32 byte_count;</div><div class='ctx'> 	u32 iP;</div><div class='del'>-	u16 error;</div><div class='add'>+	u16 err;</div><div class='ctx'> </div><div class='del'>-	error = hpi_cobranet_hmi_read(ph_subsys, h_control,</div><div class='add'>+	err = hpi_cobranet_hmi_read(h_control,</div><div class='ctx'> 		HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, &amp;byte_count,</div><div class='ctx'> 		(u8 *)&amp;iP);</div><div class='ctx'> </div><div class='del'>-	*pi_paddress =</div><div class='add'>+	*pdw_ip_address =</div><div class='ctx'> 		((iP &amp; 0xff000000) &gt;&gt; 8) | ((iP &amp; 0x00ff0000) &lt;&lt; 8) | ((iP &amp;</div><div class='ctx'> 			0x0000ff00) &gt;&gt; 8) | ((iP &amp; 0x000000ff) &lt;&lt; 8);</div><div class='ctx'> </div><div class='del'>-	if (error)</div><div class='del'>-		*pi_paddress = 0;</div><div class='add'>+	if (err)</div><div class='add'>+		*pdw_ip_address = 0;</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 i_paddress)</div><div class='add'>+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address)</div><div class='ctx'> {</div><div class='ctx'> 	u32 iP;</div><div class='del'>-	u16 error;</div><div class='add'>+	u16 err;</div><div class='ctx'> </div><div class='del'>-	iP = ((i_paddress &amp; 0xff000000) &gt;&gt; 8) | ((i_paddress &amp; 0x00ff0000) &lt;&lt;</div><div class='del'>-		8) | ((i_paddress &amp; 0x0000ff00) &gt;&gt; 8) | ((i_paddress &amp;</div><div class='del'>-			0x000000ff) &lt;&lt; 8);</div><div class='add'>+	iP = ((dw_ip_address &amp; 0xff000000) &gt;&gt; 8) | ((dw_ip_address &amp;</div><div class='add'>+			0x00ff0000) &lt;&lt; 8) | ((dw_ip_address &amp; 0x0000ff00) &gt;&gt;</div><div class='add'>+		8) | ((dw_ip_address &amp; 0x000000ff) &lt;&lt; 8);</div><div class='ctx'> </div><div class='del'>-	error = hpi_cobranet_hmi_write(ph_subsys, h_control,</div><div class='add'>+	err = hpi_cobranet_hmi_write(h_control,</div><div class='ctx'> 		HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, (u8 *)&amp;iP);</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pi_paddress)</div><div class='add'>+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address)</div><div class='ctx'> {</div><div class='ctx'> 	u32 byte_count;</div><div class='ctx'> 	u32 iP;</div><div class='del'>-	u16 error;</div><div class='del'>-	error = hpi_cobranet_hmi_read(ph_subsys, h_control,</div><div class='add'>+	u16 err;</div><div class='add'>+	err = hpi_cobranet_hmi_read(h_control,</div><div class='ctx'> 		HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, &amp;byte_count,</div><div class='ctx'> 		(u8 *)&amp;iP);</div><div class='ctx'> </div><div class='del'>-	*pi_paddress =</div><div class='add'>+	*pdw_ip_address =</div><div class='ctx'> 		((iP &amp; 0xff000000) &gt;&gt; 8) | ((iP &amp; 0x00ff0000) &lt;&lt; 8) | ((iP &amp;</div><div class='ctx'> 			0x0000ff00) &gt;&gt; 8) | ((iP &amp; 0x000000ff) &lt;&lt; 8);</div><div class='ctx'> </div><div class='del'>-	if (error)</div><div class='del'>-		*pi_paddress = 0;</div><div class='add'>+	if (err)</div><div class='add'>+		*pdw_ip_address = 0;</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 i_paddress)</div><div class='add'>+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address)</div><div class='ctx'> {</div><div class='ctx'> 	u32 iP;</div><div class='del'>-	u16 error;</div><div class='add'>+	u16 err;</div><div class='ctx'> </div><div class='del'>-	iP = ((i_paddress &amp; 0xff000000) &gt;&gt; 8) | ((i_paddress &amp; 0x00ff0000) &lt;&lt;</div><div class='del'>-		8) | ((i_paddress &amp; 0x0000ff00) &gt;&gt; 8) | ((i_paddress &amp;</div><div class='del'>-			0x000000ff) &lt;&lt; 8);</div><div class='add'>+	iP = ((dw_ip_address &amp; 0xff000000) &gt;&gt; 8) | ((dw_ip_address &amp;</div><div class='add'>+			0x00ff0000) &lt;&lt; 8) | ((dw_ip_address &amp; 0x0000ff00) &gt;&gt;</div><div class='add'>+		8) | ((dw_ip_address &amp; 0x000000ff) &lt;&lt; 8);</div><div class='ctx'> </div><div class='del'>-	error = hpi_cobranet_hmi_write(ph_subsys, h_control,</div><div class='add'>+	err = hpi_cobranet_hmi_write(h_control,</div><div class='ctx'> 		HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, (u8 *)&amp;iP);</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs)</div><div class='add'>+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,</div><div class='add'>+	u32 *p_mac_lsbs)</div><div class='ctx'> {</div><div class='ctx'> 	u32 byte_count;</div><div class='del'>-	u16 error;</div><div class='del'>-	u32 mAC;</div><div class='add'>+	u16 err;</div><div class='add'>+	u32 mac;</div><div class='ctx'> </div><div class='del'>-	error = hpi_cobranet_hmi_read(ph_subsys, h_control,</div><div class='add'>+	err = hpi_cobranet_hmi_read(h_control,</div><div class='ctx'> 		HPI_COBRANET_HMI_cobra_if_phy_address, 4, &amp;byte_count,</div><div class='del'>-		(u8 *)&amp;mAC);</div><div class='del'>-	*pmAC_MS_bs =</div><div class='del'>-		((mAC &amp; 0xff000000) &gt;&gt; 8) | ((mAC &amp; 0x00ff0000) &lt;&lt; 8) | ((mAC</div><div class='del'>-			&amp; 0x0000ff00) &gt;&gt; 8) | ((mAC &amp; 0x000000ff) &lt;&lt; 8);</div><div class='del'>-	error += hpi_cobranet_hmi_read(ph_subsys, h_control,</div><div class='del'>-		HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4, &amp;byte_count,</div><div class='del'>-		(u8 *)&amp;mAC);</div><div class='del'>-	*pmAC_LS_bs =</div><div class='del'>-		((mAC &amp; 0xff000000) &gt;&gt; 8) | ((mAC &amp; 0x00ff0000) &lt;&lt; 8) | ((mAC</div><div class='del'>-			&amp; 0x0000ff00) &gt;&gt; 8) | ((mAC &amp; 0x000000ff) &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-	if (error) {</div><div class='del'>-		*pmAC_MS_bs = 0;</div><div class='del'>-		*pmAC_LS_bs = 0;</div><div class='add'>+		(u8 *)&amp;mac);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		*p_mac_msbs =</div><div class='add'>+			((mac &amp; 0xff000000) &gt;&gt; 8) | ((mac &amp; 0x00ff0000) &lt;&lt; 8)</div><div class='add'>+			| ((mac &amp; 0x0000ff00) &gt;&gt; 8) | ((mac &amp; 0x000000ff) &lt;&lt;</div><div class='add'>+			8);</div><div class='add'>+</div><div class='add'>+		err = hpi_cobranet_hmi_read(h_control,</div><div class='add'>+			HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4,</div><div class='add'>+			&amp;byte_count, (u8 *)&amp;mac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return error;</div><div class='add'>+	if (!err) {</div><div class='add'>+		*p_mac_lsbs =</div><div class='add'>+			((mac &amp; 0xff000000) &gt;&gt; 8) | ((mac &amp; 0x00ff0000) &lt;&lt; 8)</div><div class='add'>+			| ((mac &amp; 0x0000ff00) &gt;&gt; 8) | ((mac &amp; 0x000000ff) &lt;&lt;</div><div class='add'>+			8);</div><div class='add'>+	} else {</div><div class='add'>+		*p_mac_msbs = 0;</div><div class='add'>+		*p_mac_lsbs = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 enable)</div><div class='add'>+u16 hpi_compander_set_enable(u32 h_control, u32 enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,</div><div class='del'>-		enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *enable)</div><div class='add'>+u16 hpi_compander_get_enable(u32 h_control, u32 *enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_ENABLE, enable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short makeup_gain0_01dB)</div><div class='add'>+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_log_set2(h_control, HPI_COMPANDER_MAKEUPGAIN,</div><div class='ctx'> 		makeup_gain0_01dB, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short *makeup_gain0_01dB)</div><div class='add'>+u16 hpi_compander_get_makeup_gain(u32 h_control, short *makeup_gain0_01dB)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_log_get2(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_MAKEUPGAIN, makeup_gain0_01dB, NULL);</div><div class='add'>+	return hpi_control_log_get2(h_control, HPI_COMPANDER_MAKEUPGAIN,</div><div class='add'>+		makeup_gain0_01dB, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, unsigned int index, u32 attack)</div><div class='add'>+u16 hpi_compander_set_attack_time_constant(u32 h_control, unsigned int index,</div><div class='add'>+	u32 attack)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_ATTACK, attack, index);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_COMPANDER_ATTACK, attack,</div><div class='add'>+		index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys</div><div class='del'>-	*ph_subsys, u32 h_control, unsigned int index, u32 *attack)</div><div class='add'>+u16 hpi_compander_get_attack_time_constant(u32 h_control, unsigned int index,</div><div class='add'>+	u32 *attack)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_get(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_ATTACK, 0, index, attack, NULL);</div><div class='add'>+	return hpi_control_param_get(h_control, HPI_COMPANDER_ATTACK, 0,</div><div class='add'>+		index, attack, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, unsigned int index, u32 decay)</div><div class='add'>+u16 hpi_compander_set_decay_time_constant(u32 h_control, unsigned int index,</div><div class='add'>+	u32 decay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_DECAY, decay, index);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_COMPANDER_DECAY, decay,</div><div class='add'>+		index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, unsigned int index, u32 *decay)</div><div class='add'>+u16 hpi_compander_get_decay_time_constant(u32 h_control, unsigned int index,</div><div class='add'>+	u32 *decay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_get(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_DECAY, 0, index, decay, NULL);</div><div class='add'>+	return hpi_control_param_get(h_control, HPI_COMPANDER_DECAY, 0, index,</div><div class='add'>+		decay, NULL);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, unsigned int index, short threshold0_01dB)</div><div class='add'>+u16 hpi_compander_set_threshold(u32 h_control, unsigned int index,</div><div class='add'>+	short threshold0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;</div><div class='ctx'> 	hm.u.c.param2 = index;</div><div class='ctx'> 	hm.u.c.an_log_value[0] = threshold0_01dB;</div><div class='hunk'>@@ -2215,15 +1930,16 @@ u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, unsigned int index, short *threshold0_01dB)</div><div class='add'>+u16 hpi_compander_get_threshold(u32 h_control, unsigned int index,</div><div class='add'>+	short *threshold0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;</div><div class='ctx'> 	hm.u.c.param2 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -2233,29 +1949,28 @@ u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 ratio100)</div><div class='add'>+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_RATIO, ratio100, index);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_COMPANDER_RATIO, ratio100,</div><div class='add'>+		index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 *ratio100)</div><div class='add'>+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *ratio100)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_get(ph_subsys, h_control,</div><div class='del'>-		HPI_COMPANDER_RATIO, 0, index, ratio100, NULL);</div><div class='add'>+	return hpi_control_param_get(h_control, HPI_COMPANDER_RATIO, 0, index,</div><div class='add'>+		ratio100, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)</div><div class='add'>+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,</div><div class='add'>+	short *max_gain_01dB, short *step_gain_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_LEVEL_RANGE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -2273,31 +1988,27 @@ u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_log_set2(h_control, HPI_LEVEL_GAIN,</div><div class='ctx'> 		an_gain0_01dB[0], an_gain0_01dB[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_level_get_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_log_get2(ph_subsys, h_control, HPI_LEVEL_GAIN,</div><div class='add'>+	return hpi_control_log_get2(h_control, HPI_LEVEL_GAIN,</div><div class='ctx'> 		&amp;an_gain0_01dB[0], &amp;an_gain0_01dB[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_meter, u32 *p_channels)</div><div class='add'>+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_query(ph_subsys, h_meter, HPI_METER_NUM_CHANNELS,</div><div class='del'>-		0, 0, p_channels);</div><div class='add'>+	return hpi_control_query(h_meter, HPI_METER_NUM_CHANNELS, 0, 0,</div><div class='add'>+		p_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_peakdB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_meter_get_peak(u32 h_control, short an_peakdB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='ctx'> 	short i = 0;</div><div class='hunk'>@@ -2307,8 +2018,8 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hm.obj_index = hm.obj_index;</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_METER_PEAK;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -2322,8 +2033,7 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_rmsdB[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_meter_get_rms(u32 h_control, short an_rmsdB[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='ctx'> 	short i = 0;</div><div class='hunk'>@@ -2333,7 +2043,8 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_METER_RMS;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -2348,22 +2059,20 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 attack, u16 decay)</div><div class='add'>+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_METER_RMS_BALLISTICS, attack, decay);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_METER_RMS_BALLISTICS,</div><div class='add'>+		attack, decay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pn_attack, u16 *pn_decay)</div><div class='add'>+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *pn_attack, u16 *pn_decay)</div><div class='ctx'> {</div><div class='ctx'> 	u32 attack;</div><div class='ctx'> 	u32 decay;</div><div class='ctx'> 	u16 error;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param2_get(ph_subsys, h_control,</div><div class='del'>-		HPI_METER_RMS_BALLISTICS, &amp;attack, &amp;decay);</div><div class='add'>+	error = hpi_control_param2_get(h_control, HPI_METER_RMS_BALLISTICS,</div><div class='add'>+		&amp;attack, &amp;decay);</div><div class='ctx'> </div><div class='ctx'> 	if (pn_attack)</div><div class='ctx'> 		*pn_attack = (unsigned short)attack;</div><div class='hunk'>@@ -2373,22 +2082,21 @@ u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 attack, u16 decay)</div><div class='add'>+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_METER_PEAK_BALLISTICS, attack, decay);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_METER_PEAK_BALLISTICS,</div><div class='add'>+		attack, decay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pn_attack, u16 *pn_decay)</div><div class='add'>+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *pn_attack,</div><div class='add'>+	u16 *pn_decay)</div><div class='ctx'> {</div><div class='ctx'> 	u32 attack;</div><div class='ctx'> 	u32 decay;</div><div class='ctx'> 	u16 error;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param2_get(ph_subsys, h_control,</div><div class='del'>-		HPI_METER_PEAK_BALLISTICS, &amp;attack, &amp;decay);</div><div class='add'>+	error = hpi_control_param2_get(h_control, HPI_METER_PEAK_BALLISTICS,</div><div class='add'>+		&amp;attack, &amp;decay);</div><div class='ctx'> </div><div class='ctx'> 	if (pn_attack)</div><div class='ctx'> 		*pn_attack = (short)attack;</div><div class='hunk'>@@ -2398,55 +2106,53 @@ u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 on_off)</div><div class='add'>+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_MICROPHONE_PHANTOM_POWER, (u32)on_off, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_MICROPHONE_PHANTOM_POWER,</div><div class='add'>+		(u32)on_off, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_on_off)</div><div class='add'>+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off)</div><div class='ctx'> {</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> 	u32 on_off = 0;</div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='add'>+	error = hpi_control_param1_get(h_control,</div><div class='ctx'> 		HPI_MICROPHONE_PHANTOM_POWER, &amp;on_off);</div><div class='ctx'> 	if (pw_on_off)</div><div class='ctx'> 		*pw_on_off = (u16)on_off;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source_node_type, u16 source_node_index)</div><div class='add'>+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,</div><div class='add'>+	u16 source_node_index)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_MULTIPLEXER_SOURCE, source_node_type, source_node_index);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_MULTIPLEXER_SOURCE,</div><div class='add'>+		source_node_type, source_node_index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *source_node_type, u16 *source_node_index)</div><div class='add'>+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,</div><div class='add'>+	u16 *source_node_index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 node, index;</div><div class='del'>-	u16 error = hpi_control_param2_get(ph_subsys, h_control,</div><div class='add'>+	u16 err = hpi_control_param2_get(h_control,</div><div class='ctx'> 		HPI_MULTIPLEXER_SOURCE, &amp;node,</div><div class='ctx'> 		&amp;index);</div><div class='ctx'> 	if (source_node_type)</div><div class='ctx'> 		*source_node_type = (u16)node;</div><div class='ctx'> 	if (source_node_index)</div><div class='ctx'> 		*source_node_index = (u16)index;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *source_node_type,</div><div class='del'>-	u16 *source_node_index)</div><div class='add'>+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,</div><div class='add'>+	u16 *source_node_type, u16 *source_node_index)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_MULTIPLEXER_QUERYSOURCE;</div><div class='ctx'> 	hm.u.c.param1 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -2459,15 +2165,15 @@ u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_number_of_bands, u16 *pw_on_off)</div><div class='add'>+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,</div><div class='add'>+	u16 *pw_on_off)</div><div class='ctx'> {</div><div class='ctx'> 	u32 oB = 0;</div><div class='ctx'> 	u32 oO = 0;</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param2_get(ph_subsys, h_control,</div><div class='del'>-		HPI_EQUALIZER_NUM_FILTERS, &amp;oO, &amp;oB);</div><div class='add'>+	error = hpi_control_param2_get(h_control, HPI_EQUALIZER_NUM_FILTERS,</div><div class='add'>+		&amp;oO, &amp;oB);</div><div class='ctx'> 	if (pw_number_of_bands)</div><div class='ctx'> 		*pw_number_of_bands = (u16)oB;</div><div class='ctx'> 	if (pw_on_off)</div><div class='hunk'>@@ -2475,23 +2181,22 @@ u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 on_off)</div><div class='add'>+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_EQUALIZER_NUM_FILTERS, on_off, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_EQUALIZER_NUM_FILTERS,</div><div class='add'>+		on_off, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,</div><div class='del'>-	short *pnQ100, short *pn_gain0_01dB)</div><div class='add'>+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,</div><div class='add'>+	u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_EQUALIZER_FILTER;</div><div class='ctx'> 	hm.u.c.param2 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -2509,16 +2214,16 @@ u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,</div><div class='del'>-	short gain0_01dB)</div><div class='add'>+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,</div><div class='add'>+	u32 frequency_hz, short q100, short gain0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	hm.u.c.param1 = frequency_hz;</div><div class='ctx'> 	hm.u.c.param2 = (index &amp; 0xFFFFL) + ((u32)type &lt;&lt; 16);</div><div class='hunk'>@@ -2531,8 +2236,7 @@ u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 index, short coeffs[5]</div><div class='add'>+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='hunk'>@@ -2540,7 +2244,8 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_EQUALIZER_COEFFICIENTS;</div><div class='ctx'> 	hm.u.c.param2 = index;</div><div class='ctx'> </div><div class='hunk'>@@ -2555,444 +2260,385 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, u16 *pw_source)</div><div class='add'>+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,</div><div class='add'>+	u16 *pw_source)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_clock, HPI_SAMPLECLOCK_SOURCE,</div><div class='del'>-		index, 0, &amp;qr);</div><div class='add'>+	err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE, index, 0,</div><div class='add'>+		&amp;qr);</div><div class='ctx'> 	*pw_source = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source)</div><div class='add'>+u16 hpi_sample_clock_set_source(u32 h_control, u16 source)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_SOURCE, source, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE,</div><div class='add'>+		source, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_source)</div><div class='add'>+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	u32 source = 0;</div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_SOURCE, &amp;source);</div><div class='del'>-	if (!error)</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE,</div><div class='add'>+		&amp;source);</div><div class='add'>+	if (!err)</div><div class='ctx'> 		if (pw_source)</div><div class='ctx'> 			*pw_source = (u16)source;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, const u32 source,</div><div class='del'>-	u16 *pw_source_index)</div><div class='add'>+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,</div><div class='add'>+	const u32 source, u16 *pw_source_index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_clock,</div><div class='del'>-		HPI_SAMPLECLOCK_SOURCE_INDEX, index, source, &amp;qr);</div><div class='add'>+	err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE_INDEX, index,</div><div class='add'>+		source, &amp;qr);</div><div class='ctx'> 	*pw_source_index = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 source_index)</div><div class='add'>+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_SOURCE_INDEX, source_index, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,</div><div class='add'>+		source_index, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u16 *pw_source_index)</div><div class='add'>+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	u32 source_index = 0;</div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_SOURCE_INDEX, &amp;source_index);</div><div class='del'>-	if (!error)</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,</div><div class='add'>+		&amp;source_index);</div><div class='add'>+	if (!err)</div><div class='ctx'> 		if (pw_source_index)</div><div class='ctx'> 			*pw_source_index = (u16)source_index;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_clock, const u32 index, u32 *prate)</div><div class='add'>+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,</div><div class='add'>+	u32 *prate)</div><div class='ctx'> {</div><div class='del'>-	u16 err;</div><div class='del'>-	err = hpi_control_query(ph_subsys, h_clock,</div><div class='del'>-		HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, index, 0, prate);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,</div><div class='add'>+				 index, 0, prate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 sample_rate)</div><div class='add'>+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='add'>+	return hpi_control_param_set(h_control,</div><div class='ctx'> 		HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, sample_rate, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate)</div><div class='add'>+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	u32 sample_rate = 0;</div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='add'>+	err = hpi_control_param1_get(h_control,</div><div class='ctx'> 		HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, &amp;sample_rate);</div><div class='del'>-	if (!error)</div><div class='add'>+	if (!err)</div><div class='ctx'> 		if (psample_rate)</div><div class='ctx'> 			*psample_rate = sample_rate;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *psample_rate)</div><div class='add'>+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate)</div><div class='ctx'> {</div><div class='del'>-	u16 error = 0;</div><div class='add'>+	u16 err = 0;</div><div class='ctx'> 	u32 sample_rate = 0;</div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_SAMPLERATE, &amp;sample_rate);</div><div class='del'>-	if (!error)</div><div class='add'>+	err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SAMPLERATE,</div><div class='add'>+		&amp;sample_rate);</div><div class='add'>+	if (!err)</div><div class='ctx'> 		if (psample_rate)</div><div class='ctx'> 			*psample_rate = sample_rate;</div><div class='del'>-	return error;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 enable)</div><div class='add'>+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_AUTO, enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_AUTO, enable,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *penable)</div><div class='add'>+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_AUTO, penable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_AUTO,</div><div class='add'>+		penable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 lock)</div><div class='add'>+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_LOCAL_LOCK, lock, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,</div><div class='add'>+		lock, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *plock)</div><div class='add'>+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SAMPLECLOCK_LOCAL_LOCK, plock);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,</div><div class='add'>+		plock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 index, u32 *frequency)</div><div class='add'>+u16 hpi_tone_detector_get_frequency(u32 h_control, u32 index, u32 *frequency)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_get(ph_subsys, h_control,</div><div class='del'>-		HPI_TONEDETECTOR_FREQUENCY, index, 0, frequency, NULL);</div><div class='add'>+	return hpi_control_param_get(h_control, HPI_TONEDETECTOR_FREQUENCY,</div><div class='add'>+		index, 0, frequency, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *state)</div><div class='add'>+u16 hpi_tone_detector_get_state(u32 h_control, u32 *state)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_TONEDETECTOR_STATE, state);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_STATE,</div><div class='add'>+		state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 enable)</div><div class='add'>+u16 hpi_tone_detector_set_enable(u32 h_control, u32 enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,</div><div class='del'>-		(u32)enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *enable)</div><div class='add'>+u16 hpi_tone_detector_get_enable(u32 h_control, u32 *enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_ENABLE, enable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 event_enable)</div><div class='add'>+u16 hpi_tone_detector_set_event_enable(u32 h_control, u32 event_enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_EVENT_ENABLE, (u32)event_enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,</div><div class='add'>+		(u32)event_enable, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *event_enable)</div><div class='add'>+u16 hpi_tone_detector_get_event_enable(u32 h_control, u32 *event_enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_EVENT_ENABLE, event_enable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,</div><div class='add'>+		event_enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, int threshold)</div><div class='add'>+u16 hpi_tone_detector_set_threshold(u32 h_control, int threshold)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_TONEDETECTOR_THRESHOLD, (u32)threshold, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TONEDETECTOR_THRESHOLD,</div><div class='add'>+		(u32)threshold, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, int *threshold)</div><div class='add'>+u16 hpi_tone_detector_get_threshold(u32 h_control, int *threshold)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_TONEDETECTOR_THRESHOLD, (u32 *)threshold);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_THRESHOLD,</div><div class='add'>+		(u32 *)threshold);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *state)</div><div class='add'>+u16 hpi_silence_detector_get_state(u32 h_control, u32 *state)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SILENCEDETECTOR_STATE, state);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_STATE,</div><div class='add'>+		state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 enable)</div><div class='add'>+u16 hpi_silence_detector_set_enable(u32 h_control, u32 enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,</div><div class='del'>-		(u32)enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *enable)</div><div class='add'>+u16 hpi_silence_detector_get_enable(u32 h_control, u32 *enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_ENABLE, enable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 event_enable)</div><div class='add'>+u16 hpi_silence_detector_set_event_enable(u32 h_control, u32 event_enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_EVENT_ENABLE, event_enable, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,</div><div class='add'>+		event_enable, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *event_enable)</div><div class='add'>+u16 hpi_silence_detector_get_event_enable(u32 h_control, u32 *event_enable)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_GENERIC_EVENT_ENABLE, event_enable);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,</div><div class='add'>+		event_enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 delay)</div><div class='add'>+u16 hpi_silence_detector_set_delay(u32 h_control, u32 delay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SILENCEDETECTOR_DELAY, delay, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_DELAY,</div><div class='add'>+		delay, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *delay)</div><div class='add'>+u16 hpi_silence_detector_get_delay(u32 h_control, u32 *delay)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_SILENCEDETECTOR_DELAY, delay);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_DELAY,</div><div class='add'>+		delay);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, int threshold)</div><div class='add'>+u16 hpi_silence_detector_set_threshold(u32 h_control, int threshold)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_SILENCEDETECTOR_THRESHOLD, threshold, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_THRESHOLD,</div><div class='add'>+		threshold, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, int *threshold)</div><div class='add'>+u16 hpi_silence_detector_get_threshold(u32 h_control, int *threshold)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='add'>+	return hpi_control_param1_get(h_control,</div><div class='ctx'> 		HPI_SILENCEDETECTOR_THRESHOLD, (u32 *)threshold);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, u16 *pw_band)</div><div class='add'>+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,</div><div class='del'>-		&amp;qr);</div><div class='add'>+	err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &amp;qr);</div><div class='ctx'> 	*pw_band = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 band)</div><div class='add'>+u16 hpi_tuner_set_band(u32 h_control, u16 band)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_BAND,</div><div class='del'>-		band, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_BAND, band, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *pw_band)</div><div class='add'>+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band)</div><div class='ctx'> {</div><div class='ctx'> 	u32 band = 0;</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_BAND,</div><div class='del'>-		&amp;band);</div><div class='add'>+	error = hpi_control_param1_get(h_control, HPI_TUNER_BAND, &amp;band);</div><div class='ctx'> 	if (pw_band)</div><div class='ctx'> 		*pw_band = (u16)band;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq)</div><div class='add'>+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,</div><div class='add'>+	const u16 band, u32 *pfreq)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_FREQ, index,</div><div class='del'>-		band, pfreq);</div><div class='add'>+	return hpi_control_query(h_tuner, HPI_TUNER_FREQ, index, band, pfreq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 freq_ink_hz)</div><div class='add'>+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_FREQ,</div><div class='del'>-		freq_ink_hz, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_FREQ, freq_ink_hz,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pw_freq_ink_hz)</div><div class='add'>+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_FREQ,</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TUNER_FREQ,</div><div class='ctx'> 		pw_freq_ink_hz);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, u16 *pw_gain)</div><div class='add'>+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain)</div><div class='ctx'> {</div><div class='ctx'> 	u32 qr;</div><div class='ctx'> 	u16 err;</div><div class='ctx'> </div><div class='del'>-	err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,</div><div class='del'>-		&amp;qr);</div><div class='add'>+	err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &amp;qr);</div><div class='ctx'> 	*pw_gain = (u16)qr;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short gain)</div><div class='add'>+u16 hpi_tuner_set_gain(u32 h_control, short gain)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_GAIN,</div><div class='del'>-		gain, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_GAIN, gain, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *pn_gain)</div><div class='add'>+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain)</div><div class='ctx'> {</div><div class='ctx'> 	u32 gain = 0;</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_GAIN,</div><div class='del'>-		&amp;gain);</div><div class='add'>+	error = hpi_control_param1_get(h_control, HPI_TUNER_GAIN, &amp;gain);</div><div class='ctx'> 	if (pn_gain)</div><div class='ctx'> 		*pn_gain = (u16)gain;</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *pw_level)</div><div class='add'>+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hm.u.c.attribute = HPI_TUNER_LEVEL;</div><div class='del'>-	hm.u.c.param1 = HPI_TUNER_LEVEL_AVERAGE;</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+	hm.u.cu.attribute = HPI_TUNER_LEVEL_AVG;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (pw_level)</div><div class='del'>-		*pw_level = (short)hr.u.c.param1;</div><div class='add'>+		*pw_level = hr.u.cu.tuner.s_level;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short *pw_level)</div><div class='add'>+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hm.u.c.attribute = HPI_TUNER_LEVEL;</div><div class='del'>-	hm.u.c.param1 = HPI_TUNER_LEVEL_RAW;</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='add'>+	hm.u.cu.attribute = HPI_TUNER_LEVEL_RAW;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (pw_level)</div><div class='del'>-		*pw_level = (short)hr.u.c.param1;</div><div class='add'>+		*pw_level = hr.u.cu.tuner.s_level;</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis)</div><div class='add'>+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,</div><div class='add'>+	const u16 band, u32 *pdeemphasis)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_DEEMPHASIS,</div><div class='del'>-		index, band, pdeemphasis);</div><div class='add'>+	return hpi_control_query(h_tuner, HPI_TUNER_DEEMPHASIS, index, band,</div><div class='add'>+		pdeemphasis);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 deemphasis)</div><div class='add'>+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_TUNER_DEEMPHASIS, deemphasis, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_DEEMPHASIS,</div><div class='add'>+		deemphasis, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pdeemphasis)</div><div class='add'>+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_TUNER_DEEMPHASIS, pdeemphasis);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TUNER_DEEMPHASIS,</div><div class='add'>+		pdeemphasis);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_tuner, u32 *pbitmap_program)</div><div class='add'>+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_PROGRAM, 0, 0,</div><div class='add'>+	return hpi_control_query(h_tuner, HPI_TUNER_PROGRAM, 0, 0,</div><div class='ctx'> 		pbitmap_program);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 program)</div><div class='add'>+u16 hpi_tuner_set_program(u32 h_control, u32 program)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_PROGRAM,</div><div class='del'>-		program, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_PROGRAM, program,</div><div class='add'>+		0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 *pprogram)</div><div class='add'>+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_PROGRAM,</div><div class='del'>-		pprogram);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TUNER_PROGRAM, pprogram);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_dsp_version, const u32 string_size)</div><div class='add'>+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,</div><div class='add'>+	const u32 string_size)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control,</div><div class='ctx'> 		HPI_TUNER_HDRADIO_DSP_VERSION, psz_dsp_version, string_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_sdk_version, const u32 string_size)</div><div class='add'>+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,</div><div class='add'>+	const u32 string_size)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control,</div><div class='ctx'> 		HPI_TUNER_HDRADIO_SDK_VERSION, psz_sdk_version, string_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u16 *pw_status_mask, u16 *pw_status)</div><div class='add'>+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status = 0;</div><div class='ctx'> 	u16 error = 0;</div><div class='ctx'> </div><div class='del'>-	error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_STATUS,</div><div class='del'>-		&amp;status);</div><div class='add'>+	error = hpi_control_param1_get(h_control, HPI_TUNER_STATUS, &amp;status);</div><div class='ctx'> 	if (pw_status) {</div><div class='ctx'> 		if (!error) {</div><div class='ctx'> 			*pw_status_mask = (u16)(status &gt;&gt; 16);</div><div class='hunk'>@@ -3005,50 +2651,44 @@ u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 mode, u32 value)</div><div class='add'>+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_MODE,</div><div class='del'>-		mode, value);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_MODE, mode, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 mode, u32 *pn_value)</div><div class='add'>+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_get(ph_subsys, h_control, HPI_TUNER_MODE,</div><div class='del'>-		mode, 0, pn_value, NULL);</div><div class='add'>+	return hpi_control_param_get(h_control, HPI_TUNER_MODE, mode, 0,</div><div class='add'>+		pn_value, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pquality)</div><div class='add'>+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='add'>+	return hpi_control_param1_get(h_control,</div><div class='ctx'> 		HPI_TUNER_HDRADIO_SIGNAL_QUALITY, pquality);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *pblend)</div><div class='add'>+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_TUNER_HDRADIO_BLEND, pblend);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_TUNER_HDRADIO_BLEND,</div><div class='add'>+		pblend);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, const u32 blend)</div><div class='add'>+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param_set(ph_subsys, h_control,</div><div class='del'>-		HPI_TUNER_HDRADIO_BLEND, blend, 0);</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_TUNER_HDRADIO_BLEND,</div><div class='add'>+		blend, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *p_data)</div><div class='add'>+u16 hpi_tuner_get_rds(u32 h_control, char *p_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_TUNER_RDS;</div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='ctx'> 	if (p_data) {</div><div class='hunk'>@@ -3059,80 +2699,82 @@ u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, char *psz_string, const u32 data_length)</div><div class='add'>+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 data_length)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control, HPI_PAD_CHANNEL_NAME,</div><div class='ctx'> 		psz_string, data_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 data_length)</div><div class='add'>+u16 hpi_pad_get_artist(u32 h_control, char *psz_string, const u32 data_length)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control, HPI_PAD_ARTIST, psz_string,</div><div class='ctx'> 		data_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 data_length)</div><div class='add'>+u16 hpi_pad_get_title(u32 h_control, char *psz_string, const u32 data_length)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control, HPI_PAD_TITLE, psz_string,</div><div class='ctx'> 		data_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	char *psz_string, const u32 data_length)</div><div class='add'>+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,</div><div class='add'>+	const u32 data_length)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_get_string(h_control, HPI_PAD_COMMENT, psz_string,</div><div class='ctx'> 		data_length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, u32 *ppTY)</div><div class='add'>+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_PAD_PROGRAM_TYPE, ppTY);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_TYPE, ppTY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	u32 *ppI)</div><div class='add'>+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_param1_get(ph_subsys, h_control,</div><div class='del'>-		HPI_PAD_PROGRAM_ID, ppI);</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_ID, ppI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	const u32 h_volume, u32 *p_channels)</div><div class='add'>+u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_query(ph_subsys, h_volume, HPI_VOLUME_NUM_CHANNELS,</div><div class='del'>-		0, 0, p_channels);</div><div class='add'>+	return hpi_control_query(h_volume, HPI_VOLUME_NUM_CHANNELS, 0, 0,</div><div class='add'>+		p_channels);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_log_gain[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_volume_set_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='ctx'> 	return hpi_control_log_set2(h_control, HPI_VOLUME_GAIN,</div><div class='ctx'> 		an_log_gain[0], an_log_gain[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_log_gain[HPI_MAX_CHANNELS]</div><div class='add'>+u16 hpi_volume_get_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]</div><div class='ctx'> 	)</div><div class='ctx'> {</div><div class='del'>-	return hpi_control_log_get2(ph_subsys, h_control, HPI_VOLUME_GAIN,</div><div class='add'>+	return hpi_control_log_get2(h_control, HPI_VOLUME_GAIN,</div><div class='ctx'> 		&amp;an_log_gain[0], &amp;an_log_gain[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)</div><div class='add'>+u16 hpi_volume_set_mute(u32 h_control, u32 mute)</div><div class='add'>+{</div><div class='add'>+	return hpi_control_param_set(h_control, HPI_VOLUME_MUTE, mute, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 hpi_volume_get_mute(u32 h_control, u32 *mute)</div><div class='add'>+{</div><div class='add'>+	return hpi_control_param1_get(h_control, HPI_VOLUME_MUTE, mute);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,</div><div class='add'>+	short *max_gain_01dB, short *step_gain_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_VOLUME_RANGE;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -3150,16 +2792,17 @@ u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],</div><div class='del'>-	u32 duration_ms, u16 profile)</div><div class='add'>+u16 hpi_volume_auto_fade_profile(u32 h_control,</div><div class='add'>+	short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,</div><div class='add'>+	u16 profile)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hm.u.c.an_log_value, an_stop_gain0_01dB,</div><div class='ctx'> 		sizeof(short) * HPI_MAX_CHANNELS);</div><div class='hunk'>@@ -3173,21 +2816,31 @@ u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='add'>+u16 hpi_volume_auto_fade(u32 h_control,</div><div class='ctx'> 	short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms)</div><div class='ctx'> {</div><div class='del'>-	return hpi_volume_auto_fade_profile(ph_subsys, h_control,</div><div class='del'>-		an_stop_gain0_01dB, duration_ms, HPI_VOLUME_AUTOFADE_LOG);</div><div class='add'>+	return hpi_volume_auto_fade_profile(h_control, an_stop_gain0_01dB,</div><div class='add'>+		duration_ms, HPI_VOLUME_AUTOFADE_LOG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short an_gain0_01dB)</div><div class='add'>+u16 hpi_volume_query_auto_fade_profile(const u32 h_volume, const u32 i,</div><div class='add'>+	u16 *profile)</div><div class='add'>+{</div><div class='add'>+	u16 e;</div><div class='add'>+	u32 u;</div><div class='add'>+	e = hpi_control_query(h_volume, HPI_VOLUME_AUTOFADE, i, 0, &amp;u);</div><div class='add'>+	*profile = (u16)u;</div><div class='add'>+	return e;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_VOX_THRESHOLD;</div><div class='ctx'> </div><div class='ctx'> 	hm.u.c.an_log_value[0] = an_gain0_01dB;</div><div class='hunk'>@@ -3197,14 +2850,14 @@ u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='del'>-	short *an_gain0_01dB)</div><div class='add'>+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB)</div><div class='ctx'> {</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_CONTROL,</div><div class='ctx'> 		HPI_CONTROL_GET_STATE);</div><div class='del'>-	u32TOINDEXES(h_control, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='add'>+	if (hpi_handle_indexes(h_control, &amp;hm.adapter_index, &amp;hm.obj_index))</div><div class='add'>+		return HPI_ERROR_INVALID_HANDLE;</div><div class='ctx'> 	hm.u.c.attribute = HPI_VOX_THRESHOLD;</div><div class='ctx'> </div><div class='ctx'> 	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='hunk'>@@ -3213,728 +2866,3 @@ u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,</div><div class='ctx'> </div><div class='ctx'> 	return hr.error;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static size_t strv_packet_size = MIN_STRV_PACKET_SIZE;</div><div class='del'>-</div><div class='del'>-static size_t entity_type_to_size[LAST_ENTITY_TYPE] = {</div><div class='del'>-	0,</div><div class='del'>-	sizeof(struct hpi_entity),</div><div class='del'>-	sizeof(void *),</div><div class='del'>-</div><div class='del'>-	sizeof(int),</div><div class='del'>-	sizeof(float),</div><div class='del'>-	sizeof(double),</div><div class='del'>-</div><div class='del'>-	sizeof(char),</div><div class='del'>-	sizeof(char),</div><div class='del'>-</div><div class='del'>-	4 * sizeof(char),</div><div class='del'>-	16 * sizeof(char),</div><div class='del'>-	6 * sizeof(char),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline size_t hpi_entity_size(struct hpi_entity *entity_ptr)</div><div class='del'>-{</div><div class='del'>-	return entity_ptr-&gt;header.size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t hpi_entity_header_size(struct hpi_entity *entity_ptr)</div><div class='del'>-{</div><div class='del'>-	return sizeof(entity_ptr-&gt;header);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t hpi_entity_value_size(struct hpi_entity *entity_ptr)</div><div class='del'>-{</div><div class='del'>-	return hpi_entity_size(entity_ptr) -</div><div class='del'>-		hpi_entity_header_size(entity_ptr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline size_t hpi_entity_item_count(struct hpi_entity *entity_ptr)</div><div class='del'>-{</div><div class='del'>-	return hpi_entity_value_size(entity_ptr) /</div><div class='del'>-		entity_type_to_size[entity_ptr-&gt;header.type];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline struct hpi_entity *hpi_entity_ptr_to_next(struct hpi_entity</div><div class='del'>-	*entity_ptr)</div><div class='del'>-{</div><div class='del'>-	return (void *)(((u8 *)entity_ptr) + hpi_entity_size(entity_ptr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hpi_entity_check_type(const enum e_entity_type t)</div><div class='del'>-{</div><div class='del'>-	if (t &gt;= 0 &amp;&amp; t &lt; STR_TYPE_FIELD_MAX)</div><div class='del'>-		return 0;</div><div class='del'>-	return HPI_ERROR_ENTITY_TYPE_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 hpi_entity_check_role(const enum e_entity_role r)</div><div class='del'>-{</div><div class='del'>-	if (r &gt;= 0 &amp;&amp; r &lt; STR_ROLE_FIELD_MAX)</div><div class='del'>-		return 0;</div><div class='del'>-	return HPI_ERROR_ENTITY_ROLE_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 hpi_entity_get_next(struct hpi_entity *entity, int recursive_flag,</div><div class='del'>-	void *guard_p, struct hpi_entity **next)</div><div class='del'>-{</div><div class='del'>-	HPI_DEBUG_ASSERT(entity != NULL);</div><div class='del'>-	HPI_DEBUG_ASSERT(next != NULL);</div><div class='del'>-	HPI_DEBUG_ASSERT(hpi_entity_size(entity) != 0);</div><div class='del'>-</div><div class='del'>-	if (guard_p &lt;= (void *)entity) {</div><div class='del'>-		*next = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recursive_flag &amp;&amp; entity-&gt;header.type == entity_type_sequence)</div><div class='del'>-		*next = (struct hpi_entity *)entity-&gt;value;</div><div class='del'>-	else</div><div class='del'>-		*next = (struct hpi_entity *)hpi_entity_ptr_to_next(entity);</div><div class='del'>-</div><div class='del'>-	if (guard_p &lt;= (void *)*next) {</div><div class='del'>-		*next = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	HPI_DEBUG_ASSERT(guard_p &gt;= (void *)hpi_entity_ptr_to_next(*next));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_entity_find_next(struct hpi_entity *container_entity,</div><div class='del'>-	enum e_entity_type type, enum e_entity_role role, int recursive_flag,</div><div class='del'>-	struct hpi_entity **current_match)</div><div class='del'>-{</div><div class='del'>-	struct hpi_entity *tmp = NULL;</div><div class='del'>-	void *guard_p = NULL;</div><div class='del'>-</div><div class='del'>-	HPI_DEBUG_ASSERT(container_entity != NULL);</div><div class='del'>-	guard_p = hpi_entity_ptr_to_next(container_entity);</div><div class='del'>-</div><div class='del'>-	if (*current_match != NULL)</div><div class='del'>-		hpi_entity_get_next(*current_match, recursive_flag, guard_p,</div><div class='del'>-			&amp;tmp);</div><div class='del'>-	else</div><div class='del'>-		hpi_entity_get_next(container_entity, 1, guard_p, &amp;tmp);</div><div class='del'>-</div><div class='del'>-	while (tmp) {</div><div class='del'>-		u16 err;</div><div class='del'>-</div><div class='del'>-		HPI_DEBUG_ASSERT((void *)tmp &gt;= (void *)container_entity);</div><div class='del'>-</div><div class='del'>-		if ((!type || tmp-&gt;header.type == type) &amp;&amp; (!role</div><div class='del'>-				|| tmp-&gt;header.role == role)) {</div><div class='del'>-			*current_match = tmp;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = hpi_entity_get_next(tmp, recursive_flag, guard_p,</div><div class='del'>-			current_match);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		tmp = *current_match;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*current_match = NULL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void hpi_entity_free(struct hpi_entity *entity)</div><div class='del'>-{</div><div class='del'>-	kfree(entity);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u16 hpi_entity_alloc_and_copy(struct hpi_entity *src,</div><div class='del'>-	struct hpi_entity **dst)</div><div class='del'>-{</div><div class='del'>-	size_t buf_size;</div><div class='del'>-	HPI_DEBUG_ASSERT(dst != NULL);</div><div class='del'>-	HPI_DEBUG_ASSERT(src != NULL);</div><div class='del'>-</div><div class='del'>-	buf_size = hpi_entity_size(src);</div><div class='del'>-	*dst = kmalloc(buf_size, GFP_KERNEL);</div><div class='del'>-	if (*dst == NULL)</div><div class='del'>-		return HPI_ERROR_MEMORY_ALLOC;</div><div class='del'>-	memcpy(*dst, src, buf_size);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity **info)</div><div class='del'>-{</div><div class='del'>-	struct hpi_msg_strv hm;</div><div class='del'>-	struct hpi_res_strv *phr;</div><div class='del'>-	u16 hpi_err;</div><div class='del'>-	int remaining_attempts = 2;</div><div class='del'>-	size_t resp_packet_size = 1024;</div><div class='del'>-</div><div class='del'>-	*info = NULL;</div><div class='del'>-</div><div class='del'>-	while (remaining_attempts--) {</div><div class='del'>-		phr = kmalloc(resp_packet_size, GFP_KERNEL);</div><div class='del'>-		HPI_DEBUG_ASSERT(phr != NULL);</div><div class='del'>-</div><div class='del'>-		hpi_init_message_responseV1(&amp;hm.h, (u16)sizeof(hm), &amp;phr-&gt;h,</div><div class='del'>-			(u16)resp_packet_size, HPI_OBJ_CONTROL,</div><div class='del'>-			HPI_CONTROL_GET_INFO);</div><div class='del'>-		u32TOINDEXES(hC, &amp;hm.h.adapter_index, &amp;hm.h.obj_index);</div><div class='del'>-</div><div class='del'>-		hm.strv.header.size = sizeof(hm.strv);</div><div class='del'>-		phr-&gt;strv.header.size = resp_packet_size - sizeof(phr-&gt;h);</div><div class='del'>-</div><div class='del'>-		hpi_send_recv((struct hpi_message *)&amp;hm.h,</div><div class='del'>-			(struct hpi_response *)&amp;phr-&gt;h);</div><div class='del'>-		if (phr-&gt;h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {</div><div class='del'>-</div><div class='del'>-			HPI_DEBUG_ASSERT(phr-&gt;h.specific_error &gt;</div><div class='del'>-				MIN_STRV_PACKET_SIZE</div><div class='del'>-				&amp;&amp; phr-&gt;h.specific_error &lt; 1500);</div><div class='del'>-			resp_packet_size = phr-&gt;h.specific_error;</div><div class='del'>-		} else {</div><div class='del'>-			remaining_attempts = 0;</div><div class='del'>-			if (!phr-&gt;h.error)</div><div class='del'>-				hpi_entity_alloc_and_copy(&amp;phr-&gt;strv, info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hpi_err = phr-&gt;h.error;</div><div class='del'>-		kfree(phr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hpi_err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity **value)</div><div class='del'>-{</div><div class='del'>-	struct hpi_msg_strv hm;</div><div class='del'>-	struct hpi_res_strv *phr;</div><div class='del'>-	u16 hpi_err;</div><div class='del'>-	int remaining_attempts = 2;</div><div class='del'>-</div><div class='del'>-	*value = NULL;</div><div class='del'>-</div><div class='del'>-	while (remaining_attempts--) {</div><div class='del'>-		phr = kmalloc(strv_packet_size, GFP_KERNEL);</div><div class='del'>-		if (!phr)</div><div class='del'>-			return HPI_ERROR_MEMORY_ALLOC;</div><div class='del'>-</div><div class='del'>-		hpi_init_message_responseV1(&amp;hm.h, (u16)sizeof(hm), &amp;phr-&gt;h,</div><div class='del'>-			(u16)strv_packet_size, HPI_OBJ_CONTROL,</div><div class='del'>-			HPI_CONTROL_GET_STATE);</div><div class='del'>-		u32TOINDEXES(hC, &amp;hm.h.adapter_index, &amp;hm.h.obj_index);</div><div class='del'>-</div><div class='del'>-		hm.strv.header.size = sizeof(hm.strv);</div><div class='del'>-		phr-&gt;strv.header.size = strv_packet_size - sizeof(phr-&gt;h);</div><div class='del'>-</div><div class='del'>-		hpi_send_recv((struct hpi_message *)&amp;hm.h,</div><div class='del'>-			(struct hpi_response *)&amp;phr-&gt;h);</div><div class='del'>-		if (phr-&gt;h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {</div><div class='del'>-</div><div class='del'>-			HPI_DEBUG_ASSERT(phr-&gt;h.specific_error &gt;</div><div class='del'>-				MIN_STRV_PACKET_SIZE</div><div class='del'>-				&amp;&amp; phr-&gt;h.specific_error &lt; 1000);</div><div class='del'>-			strv_packet_size = phr-&gt;h.specific_error;</div><div class='del'>-		} else {</div><div class='del'>-			remaining_attempts = 0;</div><div class='del'>-			if (!phr-&gt;h.error)</div><div class='del'>-				hpi_entity_alloc_and_copy(&amp;phr-&gt;strv, value);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hpi_err = phr-&gt;h.error;</div><div class='del'>-		kfree(phr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hpi_err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,</div><div class='del'>-	struct hpi_entity *value)</div><div class='del'>-{</div><div class='del'>-	struct hpi_msg_strv *phm;</div><div class='del'>-	struct hpi_res_strv hr;</div><div class='del'>-</div><div class='del'>-	phm = kmalloc(sizeof(phm-&gt;h) + value-&gt;header.size, GFP_KERNEL);</div><div class='del'>-	HPI_DEBUG_ASSERT(phm != NULL);</div><div class='del'>-</div><div class='del'>-	hpi_init_message_responseV1(&amp;phm-&gt;h,</div><div class='del'>-		sizeof(phm-&gt;h) + value-&gt;header.size, &amp;hr.h, sizeof(hr),</div><div class='del'>-		HPI_OBJ_CONTROL, HPI_CONTROL_SET_STATE);</div><div class='del'>-	u32TOINDEXES(hC, &amp;phm-&gt;h.adapter_index, &amp;phm-&gt;h.obj_index);</div><div class='del'>-	hr.strv.header.size = sizeof(hr.strv);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;phm-&gt;strv, value, value-&gt;header.size);</div><div class='del'>-	hpi_send_recv((struct hpi_message *)&amp;phm-&gt;h,</div><div class='del'>-		(struct hpi_response *)&amp;hr.h);</div><div class='del'>-</div><div class='del'>-	return hr.h.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,</div><div class='del'>-	const size_t item_count, const enum e_entity_role role, void *value,</div><div class='del'>-	struct hpi_entity **entity)</div><div class='del'>-{</div><div class='del'>-	size_t bytes_to_copy, total_size;</div><div class='del'>-	u16 hE = 0;</div><div class='del'>-	*entity = NULL;</div><div class='del'>-</div><div class='del'>-	hE = hpi_entity_check_type(type);</div><div class='del'>-	if (hE)</div><div class='del'>-		return hE;</div><div class='del'>-</div><div class='del'>-	HPI_DEBUG_ASSERT(role &gt; entity_role_null &amp;&amp; type &lt; LAST_ENTITY_TYPE);</div><div class='del'>-</div><div class='del'>-	bytes_to_copy = entity_type_to_size[type] * item_count;</div><div class='del'>-	total_size = hpi_entity_header_size(*entity) + bytes_to_copy;</div><div class='del'>-</div><div class='del'>-	HPI_DEBUG_ASSERT(total_size &gt;= hpi_entity_header_size(*entity)</div><div class='del'>-		&amp;&amp; total_size &lt; STR_SIZE_FIELD_MAX);</div><div class='del'>-</div><div class='del'>-	*entity = kmalloc(total_size, GFP_KERNEL);</div><div class='del'>-	if (*entity == NULL)</div><div class='del'>-		return HPI_ERROR_MEMORY_ALLOC;</div><div class='del'>-	memcpy((*entity)-&gt;value, value, bytes_to_copy);</div><div class='del'>-	(*entity)-&gt;header.size =</div><div class='del'>-		hpi_entity_header_size(*entity) + bytes_to_copy;</div><div class='del'>-	(*entity)-&gt;header.type = type;</div><div class='del'>-	(*entity)-&gt;header.role = role;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,</div><div class='del'>-	enum e_entity_type type, size_t item_count, void *value_dst_p)</div><div class='del'>-{</div><div class='del'>-	size_t bytes_to_copy;</div><div class='del'>-</div><div class='del'>-	if (entity-&gt;header.type != type)</div><div class='del'>-		return HPI_ERROR_ENTITY_TYPE_MISMATCH;</div><div class='del'>-</div><div class='del'>-	if (hpi_entity_item_count(entity) != item_count)</div><div class='del'>-		return HPI_ERROR_ENTITY_ITEM_COUNT;</div><div class='del'>-</div><div class='del'>-	bytes_to_copy = entity_type_to_size[type] * item_count;</div><div class='del'>-	memcpy(value_dst_p, entity-&gt;value, bytes_to_copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,</div><div class='del'>-	size_t *item_count, enum e_entity_role *role, void **value)</div><div class='del'>-{</div><div class='del'>-	u16 err = 0;</div><div class='del'>-	HPI_DEBUG_ASSERT(entity != NULL);</div><div class='del'>-</div><div class='del'>-	if (type)</div><div class='del'>-		*type = entity-&gt;header.type;</div><div class='del'>-</div><div class='del'>-	if (role)</div><div class='del'>-		*role = entity-&gt;header.role;</div><div class='del'>-</div><div class='del'>-	if (value)</div><div class='del'>-		*value = entity-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (item_count != NULL) {</div><div class='del'>-		if (entity-&gt;header.type == entity_type_sequence) {</div><div class='del'>-			void *guard_p = hpi_entity_ptr_to_next(entity);</div><div class='del'>-			struct hpi_entity *next = NULL;</div><div class='del'>-			void *contents = entity-&gt;value;</div><div class='del'>-</div><div class='del'>-			*item_count = 0;</div><div class='del'>-			while (contents &lt; guard_p) {</div><div class='del'>-				(*item_count)++;</div><div class='del'>-				err = hpi_entity_get_next(contents, 0,</div><div class='del'>-					guard_p, &amp;next);</div><div class='del'>-				if (next == NULL || err)</div><div class='del'>-					break;</div><div class='del'>-				contents = next;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*item_count = hpi_entity_item_count(entity);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_GPIO, HPI_GPIO_OPEN);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (hr.error == 0) {</div><div class='del'>-		*ph_gpio =</div><div class='del'>-			hpi_indexes_to_handle(HPI_OBJ_GPIO, adapter_index, 0);</div><div class='del'>-		if (pw_number_input_bits)</div><div class='del'>-			*pw_number_input_bits = hr.u.l.number_input_bits;</div><div class='del'>-		if (pw_number_output_bits)</div><div class='del'>-			*pw_number_output_bits = hr.u.l.number_output_bits;</div><div class='del'>-	} else</div><div class='del'>-		*ph_gpio = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 bit_index, u16 *pw_bit_data)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_GPIO, HPI_GPIO_READ_BIT);</div><div class='del'>-	u32TOINDEX(h_gpio, &amp;hm.adapter_index);</div><div class='del'>-	hm.u.l.bit_index = bit_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*pw_bit_data = hr.u.l.bit_data[0];</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 aw_all_bit_data[4]</div><div class='del'>-	)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_GPIO, HPI_GPIO_READ_ALL);</div><div class='del'>-	u32TOINDEX(h_gpio, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (aw_all_bit_data) {</div><div class='del'>-		aw_all_bit_data[0] = hr.u.l.bit_data[0];</div><div class='del'>-		aw_all_bit_data[1] = hr.u.l.bit_data[1];</div><div class='del'>-		aw_all_bit_data[2] = hr.u.l.bit_data[2];</div><div class='del'>-		aw_all_bit_data[3] = hr.u.l.bit_data[3];</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 bit_index, u16 bit_data)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_GPIO, HPI_GPIO_WRITE_BIT);</div><div class='del'>-	u32TOINDEX(h_gpio, &amp;hm.adapter_index);</div><div class='del'>-	hm.u.l.bit_index = bit_index;</div><div class='del'>-	hm.u.l.bit_data = bit_data;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,</div><div class='del'>-	u16 aw_all_bit_data[4]</div><div class='del'>-	)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_GPIO,</div><div class='del'>-		HPI_GPIO_WRITE_STATUS);</div><div class='del'>-	u32TOINDEX(h_gpio, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (aw_all_bit_data) {</div><div class='del'>-		aw_all_bit_data[0] = hr.u.l.bit_data[0];</div><div class='del'>-		aw_all_bit_data[1] = hr.u.l.bit_data[1];</div><div class='del'>-		aw_all_bit_data[2] = hr.u.l.bit_data[2];</div><div class='del'>-		aw_all_bit_data[3] = hr.u.l.bit_data[3];</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u32 *ph_async)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ASYNCEVENT,</div><div class='del'>-		HPI_ASYNCEVENT_OPEN);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (hr.error == 0)</div><div class='del'>-</div><div class='del'>-		*ph_async =</div><div class='del'>-			hpi_indexes_to_handle(HPI_OBJ_ASYNCEVENT,</div><div class='del'>-			adapter_index, 0);</div><div class='del'>-	else</div><div class='del'>-		*ph_async = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ASYNCEVENT,</div><div class='del'>-		HPI_ASYNCEVENT_OPEN);</div><div class='del'>-	u32TOINDEX(h_async, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,</div><div class='del'>-	u16 maximum_events, struct hpi_async_event *p_events,</div><div class='del'>-	u16 *pw_number_returned)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_async, u16 *pw_count)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ASYNCEVENT,</div><div class='del'>-		HPI_ASYNCEVENT_GETCOUNT);</div><div class='del'>-	u32TOINDEX(h_async, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (hr.error == 0)</div><div class='del'>-		if (pw_count)</div><div class='del'>-			*pw_count = hr.u.as.u.count.count;</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,</div><div class='del'>-	u16 maximum_events, struct hpi_async_event *p_events,</div><div class='del'>-	u16 *pw_number_returned)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ASYNCEVENT,</div><div class='del'>-		HPI_ASYNCEVENT_GET);</div><div class='del'>-	u32TOINDEX(h_async, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	if (!hr.error) {</div><div class='del'>-		memcpy(p_events, &amp;hr.u.as.u.event,</div><div class='del'>-			sizeof(struct hpi_async_event));</div><div class='del'>-		*pw_number_returned = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_nv_memory, u16 *pw_size_in_bytes)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_NVMEMORY,</div><div class='del'>-		HPI_NVMEMORY_OPEN);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (hr.error == 0) {</div><div class='del'>-		*ph_nv_memory =</div><div class='del'>-			hpi_indexes_to_handle(HPI_OBJ_NVMEMORY, adapter_index,</div><div class='del'>-			0);</div><div class='del'>-		if (pw_size_in_bytes)</div><div class='del'>-			*pw_size_in_bytes = hr.u.n.size_in_bytes;</div><div class='del'>-	} else</div><div class='del'>-		*ph_nv_memory = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_nv_memory, u16 index, u16 *pw_data)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_NVMEMORY,</div><div class='del'>-		HPI_NVMEMORY_READ_BYTE);</div><div class='del'>-	u32TOINDEX(h_nv_memory, &amp;hm.adapter_index);</div><div class='del'>-	hm.u.n.address = index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*pw_data = hr.u.n.data;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_nv_memory, u16 index, u16 data)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_NVMEMORY,</div><div class='del'>-		HPI_NVMEMORY_WRITE_BYTE);</div><div class='del'>-	u32TOINDEX(h_nv_memory, &amp;hm.adapter_index);</div><div class='del'>-	hm.u.n.address = index;</div><div class='del'>-	hm.u.n.data = data;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u16 adapter_index, u16 profile_index, u32 *ph_profile,</div><div class='del'>-	u16 *pw_max_profiles)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE,</div><div class='del'>-		HPI_PROFILE_OPEN_ALL);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-	hm.obj_index = profile_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	*pw_max_profiles = hr.u.p.u.o.max_profiles;</div><div class='del'>-	if (hr.error == 0)</div><div class='del'>-		*ph_profile =</div><div class='del'>-			hpi_indexes_to_handle(HPI_OBJ_PROFILE, adapter_index,</div><div class='del'>-			profile_index);</div><div class='del'>-	else</div><div class='del'>-		*ph_profile = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,</div><div class='del'>-	u16 bin_index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,</div><div class='del'>-	u32 *pmax_micro_seconds, u32 *pmin_micro_seconds)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE, HPI_PROFILE_GET);</div><div class='del'>-	u32TOINDEXES(h_profile, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hm.u.p.bin_index = bin_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	if (pw_seconds)</div><div class='del'>-		*pw_seconds = hr.u.p.u.t.seconds;</div><div class='del'>-	if (pmicro_seconds)</div><div class='del'>-		*pmicro_seconds = hr.u.p.u.t.micro_seconds;</div><div class='del'>-	if (pcall_count)</div><div class='del'>-		*pcall_count = hr.u.p.u.t.call_count;</div><div class='del'>-	if (pmax_micro_seconds)</div><div class='del'>-		*pmax_micro_seconds = hr.u.p.u.t.max_micro_seconds;</div><div class='del'>-	if (pmin_micro_seconds)</div><div class='del'>-		*pmin_micro_seconds = hr.u.p.u.t.min_micro_seconds;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,</div><div class='del'>-	u32 h_profile, u32 *putilization)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE,</div><div class='del'>-		HPI_PROFILE_GET_UTILIZATION);</div><div class='del'>-	u32TOINDEXES(h_profile, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	if (hr.error) {</div><div class='del'>-		if (putilization)</div><div class='del'>-			*putilization = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (putilization)</div><div class='del'>-			*putilization = hr.u.p.u.t.call_count;</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,</div><div class='del'>-	u16 bin_index, char *sz_name, u16 name_length)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE,</div><div class='del'>-		HPI_PROFILE_GET_NAME);</div><div class='del'>-	u32TOINDEXES(h_profile, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hm.u.p.bin_index = bin_index;</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-	if (hr.error) {</div><div class='del'>-		if (sz_name)</div><div class='del'>-			strcpy(sz_name, "??");</div><div class='del'>-	} else {</div><div class='del'>-		if (sz_name)</div><div class='del'>-			memcpy(sz_name, (char *)hr.u.p.u.n.sz_name,</div><div class='del'>-				name_length);</div><div class='del'>-	}</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE,</div><div class='del'>-		HPI_PROFILE_START_ALL);</div><div class='del'>-	u32TOINDEXES(h_profile, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_PROFILE,</div><div class='del'>-		HPI_PROFILE_STOP_ALL);</div><div class='del'>-	u32TOINDEXES(h_profile, &amp;hm.adapter_index, &amp;hm.obj_index);</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,</div><div class='del'>-	u32 *ph_watchdog)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_WATCHDOG,</div><div class='del'>-		HPI_WATCHDOG_OPEN);</div><div class='del'>-	hm.adapter_index = adapter_index;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	if (hr.error == 0)</div><div class='del'>-		*ph_watchdog =</div><div class='del'>-			hpi_indexes_to_handle(HPI_OBJ_WATCHDOG, adapter_index,</div><div class='del'>-			0);</div><div class='del'>-	else</div><div class='del'>-		*ph_watchdog = 0;</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,</div><div class='del'>-	u32 time_millisec)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_WATCHDOG,</div><div class='del'>-		HPI_WATCHDOG_SET_TIME);</div><div class='del'>-	u32TOINDEX(h_watchdog, &amp;hm.adapter_index);</div><div class='del'>-	hm.u.w.time_ms = time_millisec;</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog)</div><div class='del'>-{</div><div class='del'>-	struct hpi_message hm;</div><div class='del'>-	struct hpi_response hr;</div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_WATCHDOG,</div><div class='del'>-		HPI_WATCHDOG_PING);</div><div class='del'>-	u32TOINDEX(h_watchdog, &amp;hm.adapter_index);</div><div class='del'>-</div><div class='del'>-	hpi_send_recv(&amp;hm, &amp;hr);</div><div class='del'>-</div><div class='del'>-	return hr.error;</div><div class='del'>-}</div><div class='head'>diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c<br/>index 8e1d099ed7e4..a3fdcbf4990e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsginit.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsginit.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsginit.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpimsginit.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  Hardware Programming Interface (HPI) Utility functions.</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='ctx'> #include "hpimsginit.h"</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* The actual message size for each object type */</div><div class='ctx'> static u16 msg_size[HPI_OBJ_MAXINDEX + 1] = HPI_MESSAGE_SIZE_BY_OBJECT;</div><div class='hunk'>@@ -32,40 +22,32 @@ static u16 res_size[HPI_OBJ_MAXINDEX + 1] = HPI_RESPONSE_SIZE_BY_OBJECT;</div><div class='ctx'> static u16 gwSSX2_bypass;</div><div class='ctx'> </div><div class='ctx'> /** \internal</div><div class='del'>-  * Used by ASIO driver to disable SSX2 for a single process</div><div class='del'>-  * \param phSubSys Pointer to HPI subsystem handle.</div><div class='del'>-  * \param wBypass New bypass setting 0 = off, nonzero = on</div><div class='del'>-  * \return Previous bypass setting.</div><div class='del'>-  */</div><div class='del'>-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass)</div><div class='del'>-{</div><div class='del'>-	u16 old_value = gwSSX2_bypass;</div><div class='del'>-</div><div class='del'>-	gwSSX2_bypass = bypass;</div><div class='del'>-</div><div class='del'>-	return old_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** \internal</div><div class='ctx'>   * initialize the HPI message structure</div><div class='ctx'>   */</div><div class='ctx'> static void hpi_init_message(struct hpi_message *phm, u16 object,</div><div class='ctx'> 	u16 function)</div><div class='ctx'> {</div><div class='del'>-	memset(phm, 0, sizeof(*phm));</div><div class='del'>-	if ((object &gt; 0) &amp;&amp; (object &lt;= HPI_OBJ_MAXINDEX))</div><div class='del'>-		phm-&gt;size = msg_size[object];</div><div class='del'>-	else</div><div class='del'>-		phm-&gt;size = sizeof(*phm);</div><div class='add'>+	u16 size;</div><div class='add'>+</div><div class='add'>+	if ((object &gt; 0) &amp;&amp; (object &lt;= HPI_OBJ_MAXINDEX)) {</div><div class='add'>+		object = array_index_nospec(object, HPI_OBJ_MAXINDEX + 1);</div><div class='add'>+		size = msg_size[object];</div><div class='add'>+	} else {</div><div class='add'>+		size = sizeof(*phm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(phm, 0, size);</div><div class='add'>+	phm-&gt;size = size;</div><div class='ctx'> </div><div class='ctx'> 	if (gwSSX2_bypass)</div><div class='ctx'> 		phm-&gt;type = HPI_TYPE_SSX2BYPASS_MESSAGE;</div><div class='ctx'> 	else</div><div class='del'>-		phm-&gt;type = HPI_TYPE_MESSAGE;</div><div class='add'>+		phm-&gt;type = HPI_TYPE_REQUEST;</div><div class='ctx'> 	phm-&gt;object = object;</div><div class='ctx'> 	phm-&gt;function = function;</div><div class='ctx'> 	phm-&gt;version = 0;</div><div class='del'>-	/* Expect adapter index to be set by caller */</div><div class='add'>+	phm-&gt;adapter_index = HPI_ADAPTER_INDEX_INVALID;</div><div class='add'>+	/* Expect actual adapter index to be set by caller */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /** \internal</div><div class='hunk'>@@ -74,12 +56,18 @@ static void hpi_init_message(struct hpi_message *phm, u16 object,</div><div class='ctx'> void hpi_init_response(struct hpi_response *phr, u16 object, u16 function,</div><div class='ctx'> 	u16 error)</div><div class='ctx'> {</div><div class='add'>+	u16 size;</div><div class='add'>+</div><div class='add'>+	if ((object &gt; 0) &amp;&amp; (object &lt;= HPI_OBJ_MAXINDEX)) {</div><div class='add'>+		object = array_index_nospec(object, HPI_OBJ_MAXINDEX + 1);</div><div class='add'>+		size = res_size[object];</div><div class='add'>+	} else {</div><div class='add'>+		size = sizeof(*phr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	memset(phr, 0, sizeof(*phr));</div><div class='add'>+	phr-&gt;size = size;</div><div class='ctx'> 	phr-&gt;type = HPI_TYPE_RESPONSE;</div><div class='del'>-	if ((object &gt; 0) &amp;&amp; (object &lt;= HPI_OBJ_MAXINDEX))</div><div class='del'>-		phr-&gt;size = res_size[object];</div><div class='del'>-	else</div><div class='del'>-		phr-&gt;size = sizeof(*phr);</div><div class='ctx'> 	phr-&gt;object = object;</div><div class='ctx'> 	phr-&gt;function = function;</div><div class='ctx'> 	phr-&gt;error = error;</div><div class='hunk'>@@ -100,10 +88,10 @@ void hpi_init_message_response(struct hpi_message *phm,</div><div class='ctx'> static void hpi_init_messageV1(struct hpi_message_header *phm, u16 size,</div><div class='ctx'> 	u16 object, u16 function)</div><div class='ctx'> {</div><div class='del'>-	memset(phm, 0, sizeof(*phm));</div><div class='add'>+	memset(phm, 0, size);</div><div class='ctx'> 	if ((object &gt; 0) &amp;&amp; (object &lt;= HPI_OBJ_MAXINDEX)) {</div><div class='ctx'> 		phm-&gt;size = size;</div><div class='del'>-		phm-&gt;type = HPI_TYPE_MESSAGE;</div><div class='add'>+		phm-&gt;type = HPI_TYPE_REQUEST;</div><div class='ctx'> 		phm-&gt;object = object;</div><div class='ctx'> 		phm-&gt;function = function;</div><div class='ctx'> 		phm-&gt;version = 1;</div><div class='hunk'>@@ -114,7 +102,9 @@ static void hpi_init_messageV1(struct hpi_message_header *phm, u16 size,</div><div class='ctx'> void hpi_init_responseV1(struct hpi_response_header *phr, u16 size,</div><div class='ctx'> 	u16 object, u16 function)</div><div class='ctx'> {</div><div class='del'>-	memset(phr, 0, sizeof(*phr));</div><div class='add'>+	(void)object;</div><div class='add'>+	(void)function;</div><div class='add'>+	memset(phr, 0, size);</div><div class='ctx'> 	phr-&gt;size = size;</div><div class='ctx'> 	phr-&gt;version = 1;</div><div class='ctx'> 	phr-&gt;type = HPI_TYPE_RESPONSE;</div><div class='head'>diff --git a/sound/pci/asihpi/hpimsginit.h b/sound/pci/asihpi/hpimsginit.h<br/>index 864ad020c9b3..c64126b30f8d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsginit.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsginit.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsginit.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpimsginit.h</a></div><div class='hunk'>@@ -1,31 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  Hardware Programming Interface (HPI) Utility functions</div><div class='ctx'> </div><div class='ctx'>  (C) Copyright AudioScience Inc. 2007</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> /* Initialise response headers, or msg/response pairs.</div><div class='del'>-Note that it is valid to just init a response e.g. when a lower level is preparing</div><div class='del'>-a response to a message.</div><div class='del'>-However, when sending a message, a matching response buffer always must be prepared</div><div class='add'>+Note that it is valid to just init a response e.g. when a lower level is</div><div class='add'>+preparing a response to a message.</div><div class='add'>+However, when sending a message, a matching response buffer must always be</div><div class='add'>+prepared.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+#ifndef _HPIMSGINIT_H_</div><div class='add'>+#define _HPIMSGINIT_H_</div><div class='add'>+</div><div class='ctx'> void hpi_init_response(struct hpi_response *phr, u16 object, u16 function,</div><div class='ctx'> 	u16 error);</div><div class='ctx'> </div><div class='hunk'>@@ -38,3 +31,5 @@ void hpi_init_responseV1(struct hpi_response_header *phr, u16 size,</div><div class='ctx'> void hpi_init_message_responseV1(struct hpi_message_header *phm, u16 msg_size,</div><div class='ctx'> 	struct hpi_response_header *phr, u16 res_size, u16 object,</div><div class='ctx'> 	u16 function);</div><div class='add'>+</div><div class='add'>+#endif				/* _HPIMSGINIT_H_ */</div><div class='head'>diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c<br/>index f01ab964f602..b68e6bfbbfba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsgx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsgx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsgx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpimsgx.c</a></div><div class='hunk'>@@ -1,38 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='ctx'> </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>-</div><div class='del'>-Extended Message Function With Response Cacheing</div><div class='add'>+Extended Message Function With Response Caching</div><div class='ctx'> </div><div class='ctx'> (C) Copyright AudioScience Inc. 2002</div><div class='ctx'> *****************************************************************************/</div><div class='ctx'> #define SOURCEFILE_NAME "hpimsgx.c"</div><div class='ctx'> #include "hpi_internal.h"</div><div class='add'>+#include "hpi_version.h"</div><div class='ctx'> #include "hpimsginit.h"</div><div class='add'>+#include "hpicmn.h"</div><div class='ctx'> #include "hpimsgx.h"</div><div class='ctx'> #include "hpidebug.h"</div><div class='ctx'> </div><div class='del'>-static struct pci_device_id asihpi_pci_tbl[] = {</div><div class='add'>+static const struct pci_device_id asihpi_pci_tbl[] = {</div><div class='ctx'> #include "hpipcida.h"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct hpios_spinlock msgx_lock;</div><div class='ctx'> </div><div class='ctx'> static hpi_handler_func *hpi_entry_points[HPI_MAX_ADAPTERS];</div><div class='add'>+static int logging_enabled = 1;</div><div class='ctx'> </div><div class='ctx'> static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci</div><div class='ctx'> 	*pci_info)</div><div class='hunk'>@@ -42,22 +34,24 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; asihpi_pci_tbl[i].vendor != 0; i++) {</div><div class='ctx'> 		if (asihpi_pci_tbl[i].vendor != PCI_ANY_ID</div><div class='del'>-			&amp;&amp; asihpi_pci_tbl[i].vendor != pci_info-&gt;vendor_id)</div><div class='add'>+			&amp;&amp; asihpi_pci_tbl[i].vendor !=</div><div class='add'>+			pci_info-&gt;pci_dev-&gt;vendor)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (asihpi_pci_tbl[i].device != PCI_ANY_ID</div><div class='del'>-			&amp;&amp; asihpi_pci_tbl[i].device != pci_info-&gt;device_id)</div><div class='add'>+			&amp;&amp; asihpi_pci_tbl[i].device !=</div><div class='add'>+			pci_info-&gt;pci_dev-&gt;device)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (asihpi_pci_tbl[i].subvendor != PCI_ANY_ID</div><div class='ctx'> 			&amp;&amp; asihpi_pci_tbl[i].subvendor !=</div><div class='del'>-			pci_info-&gt;subsys_vendor_id)</div><div class='add'>+			pci_info-&gt;pci_dev-&gt;subsystem_vendor)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (asihpi_pci_tbl[i].subdevice != PCI_ANY_ID</div><div class='ctx'> 			&amp;&amp; asihpi_pci_tbl[i].subdevice !=</div><div class='del'>-			pci_info-&gt;subsys_device_id)</div><div class='add'>+			pci_info-&gt;pci_dev-&gt;subsystem_device)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		HPI_DEBUG_LOG(DEBUG, " %x,%lu\n", i,</div><div class='del'>-			asihpi_pci_tbl[i].driver_data);</div><div class='add'>+		/* HPI_DEBUG_LOG(DEBUG, " %x,%lx\n", i,</div><div class='add'>+		   asihpi_pci_tbl[i].driver_data); */</div><div class='ctx'> 		return (hpi_handler_func *) asihpi_pci_tbl[i].driver_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -67,21 +61,12 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci</div><div class='ctx'> static inline void hw_entry_point(struct hpi_message *phm,</div><div class='ctx'> 	struct hpi_response *phr)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	hpi_handler_func *ep;</div><div class='del'>-</div><div class='del'>-	if (phm-&gt;adapter_index &lt; HPI_MAX_ADAPTERS) {</div><div class='del'>-		ep = (hpi_handler_func *) hpi_entry_points[phm-&gt;</div><div class='del'>-			adapter_index];</div><div class='del'>-		if (ep) {</div><div class='del'>-			HPI_DEBUG_MESSAGE(DEBUG, phm);</div><div class='del'>-			ep(phm, phr);</div><div class='del'>-			HPI_DEBUG_RESPONSE(phr);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='del'>-		HPI_ERROR_PROCESSING_MESSAGE);</div><div class='add'>+	if ((phm-&gt;adapter_index &lt; HPI_MAX_ADAPTERS)</div><div class='add'>+		&amp;&amp; hpi_entry_points[phm-&gt;adapter_index])</div><div class='add'>+		hpi_entry_points[phm-&gt;adapter_index] (phm, phr);</div><div class='add'>+	else</div><div class='add'>+		hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='add'>+			HPI_ERROR_PROCESSING_MESSAGE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void adapter_open(struct hpi_message *phm, struct hpi_response *phr);</div><div class='hunk'>@@ -100,6 +85,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	void *h_owner);</div><div class='ctx'> </div><div class='ctx'> static void HPIMSGX__reset(u16 adapter_index);</div><div class='add'>+</div><div class='ctx'> static u16 HPIMSGX__init(struct hpi_message *phm, struct hpi_response *phr);</div><div class='ctx'> static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner);</div><div class='ctx'> </div><div class='hunk'>@@ -107,11 +93,6 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner);</div><div class='ctx'> #pragma pack(push, 1)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-struct hpi_subsys_response {</div><div class='del'>-	struct hpi_response_header h;</div><div class='del'>-	struct hpi_subsys_res s;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct hpi_adapter_response {</div><div class='ctx'> 	struct hpi_response_header h;</div><div class='ctx'> 	struct hpi_adapter_res a;</div><div class='hunk'>@@ -153,8 +134,6 @@ static struct hpi_stream_response</div><div class='ctx'> </div><div class='ctx'> static struct hpi_mixer_response rESP_HPI_MIXER_OPEN[HPI_MAX_ADAPTERS];</div><div class='ctx'> </div><div class='del'>-static struct hpi_subsys_response gRESP_HPI_SUBSYS_FIND_ADAPTERS;</div><div class='del'>-</div><div class='ctx'> static struct adapter_info aDAPTER_INFO[HPI_MAX_ADAPTERS];</div><div class='ctx'> </div><div class='ctx'> /* use these to keep track of opens from user mode apps/DLLs */</div><div class='hunk'>@@ -167,6 +146,11 @@ static struct asi_open_state</div><div class='ctx'> static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	void *h_owner)</div><div class='ctx'> {</div><div class='add'>+	if (phm-&gt;adapter_index != HPI_ADAPTER_INDEX_INVALID)</div><div class='add'>+		HPI_DEBUG_LOG(WARNING,</div><div class='add'>+			"suspicious adapter index %d in subsys message 0x%x.\n",</div><div class='add'>+			phm-&gt;adapter_index, phm-&gt;function);</div><div class='add'>+</div><div class='ctx'> 	switch (phm-&gt;function) {</div><div class='ctx'> 	case HPI_SUBSYS_GET_VERSION:</div><div class='ctx'> 		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,</div><div class='hunk'>@@ -188,7 +172,6 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 		/* Initialize this module's internal state */</div><div class='ctx'> 		hpios_msgxlock_init(&amp;msgx_lock);</div><div class='ctx'> 		memset(&amp;hpi_entry_points, 0, sizeof(hpi_entry_points));</div><div class='del'>-		hpios_locked_mem_init();</div><div class='ctx'> 		/* Init subsys_findadapters response to no-adapters */</div><div class='ctx'> 		HPIMSGX__reset(HPIMSGX_ALLADAPTERS);</div><div class='ctx'> 		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,</div><div class='hunk'>@@ -199,90 +182,23 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	case HPI_SUBSYS_DRIVER_UNLOAD:</div><div class='ctx'> 		HPI_COMMON(phm, phr);</div><div class='ctx'> 		HPIMSGX__cleanup(HPIMSGX_ALLADAPTERS, h_owner);</div><div class='del'>-		hpios_locked_mem_free_all();</div><div class='ctx'> 		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,</div><div class='ctx'> 			HPI_SUBSYS_DRIVER_UNLOAD, 0);</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	case HPI_SUBSYS_GET_INFO:</div><div class='del'>-		HPI_COMMON(phm, phr);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HPI_SUBSYS_FIND_ADAPTERS:</div><div class='del'>-		memcpy(phr, &amp;gRESP_HPI_SUBSYS_FIND_ADAPTERS,</div><div class='del'>-			sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_SUBSYS_GET_NUM_ADAPTERS:</div><div class='del'>-		memcpy(phr, &amp;gRESP_HPI_SUBSYS_FIND_ADAPTERS,</div><div class='del'>-			sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));</div><div class='del'>-		phr-&gt;function = HPI_SUBSYS_GET_NUM_ADAPTERS;</div><div class='del'>-		break;</div><div class='ctx'> 	case HPI_SUBSYS_GET_ADAPTER:</div><div class='del'>-		{</div><div class='del'>-			int count = phm-&gt;adapter_index;</div><div class='del'>-			int index = 0;</div><div class='del'>-			hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-				HPI_SUBSYS_GET_ADAPTER, 0);</div><div class='del'>-</div><div class='del'>-			/* This is complicated by the fact that we want to</div><div class='del'>-			 * "skip" 0's in the adapter list.</div><div class='del'>-			 * First, make sure we are pointing to a</div><div class='del'>-			 * non-zero adapter type.</div><div class='del'>-			 */</div><div class='del'>-			while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.</div><div class='del'>-				s.aw_adapter_list[index] == 0) {</div><div class='del'>-				index++;</div><div class='del'>-				if (index &gt;= HPI_MAX_ADAPTERS)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			while (count) {</div><div class='del'>-				/* move on to the next adapter */</div><div class='del'>-				index++;</div><div class='del'>-				if (index &gt;= HPI_MAX_ADAPTERS)</div><div class='del'>-					break;</div><div class='del'>-				while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.</div><div class='del'>-					s.aw_adapter_list[index] == 0) {</div><div class='del'>-					index++;</div><div class='del'>-					if (index &gt;= HPI_MAX_ADAPTERS)</div><div class='del'>-						break;</div><div class='del'>-				}</div><div class='del'>-				count--;</div><div class='del'>-			}</div><div class='add'>+		HPI_COMMON(phm, phr);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-			if (index &lt; HPI_MAX_ADAPTERS) {</div><div class='del'>-				phr-&gt;u.s.adapter_index = (u16)index;</div><div class='del'>-				phr-&gt;u.s.aw_adapter_list[0] =</div><div class='del'>-					gRESP_HPI_SUBSYS_FIND_ADAPTERS.</div><div class='del'>-					s.aw_adapter_list[index];</div><div class='del'>-			} else {</div><div class='del'>-				phr-&gt;u.s.adapter_index = 0;</div><div class='del'>-				phr-&gt;u.s.aw_adapter_list[0] = 0;</div><div class='del'>-				phr-&gt;error = HPI_ERROR_BAD_ADAPTER_NUMBER;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='ctx'> 	case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='ctx'> 		HPIMSGX__init(phm, phr);</div><div class='ctx'> 		break;</div><div class='del'>-	case HPI_SUBSYS_DELETE_ADAPTER:</div><div class='del'>-		HPIMSGX__cleanup(phm-&gt;adapter_index, h_owner);</div><div class='del'>-		{</div><div class='del'>-			struct hpi_message hm;</div><div class='del'>-			struct hpi_response hr;</div><div class='del'>-			/* call to HPI_ADAPTER_CLOSE */</div><div class='del'>-			hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='del'>-				HPI_ADAPTER_CLOSE);</div><div class='del'>-			hm.adapter_index = phm-&gt;adapter_index;</div><div class='del'>-			hw_entry_point(&amp;hm, &amp;hr);</div><div class='del'>-		}</div><div class='del'>-		hw_entry_point(phm, phr);</div><div class='del'>-		gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.</div><div class='del'>-			aw_adapter_list[phm-&gt;adapter_index]</div><div class='del'>-			= 0;</div><div class='del'>-		hpi_entry_points[phm-&gt;adapter_index] = NULL;</div><div class='del'>-		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='del'>-		hw_entry_point(phm, phr);</div><div class='add'>+		/* Must explicitly handle every subsys message in this switch */</div><div class='add'>+		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm-&gt;function,</div><div class='add'>+			HPI_ERROR_INVALID_FUNC);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -297,6 +213,19 @@ static void adapter_message(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	case HPI_ADAPTER_CLOSE:</div><div class='ctx'> 		adapter_close(phm, phr);</div><div class='ctx'> 		break;</div><div class='add'>+	case HPI_ADAPTER_DELETE:</div><div class='add'>+		HPIMSGX__cleanup(phm-&gt;adapter_index, h_owner);</div><div class='add'>+		{</div><div class='add'>+			struct hpi_message hm;</div><div class='add'>+			struct hpi_response hr;</div><div class='add'>+			hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+				HPI_ADAPTER_CLOSE);</div><div class='add'>+			hm.adapter_index = phm-&gt;adapter_index;</div><div class='add'>+			hw_entry_point(&amp;hm, &amp;hr);</div><div class='add'>+		}</div><div class='add'>+		hw_entry_point(phm, phr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	default:</div><div class='ctx'> 		hw_entry_point(phm, phr);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -368,9 +297,11 @@ static void instream_message(struct hpi_message *phm,</div><div class='ctx'> void hpi_send_recv_ex(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	void *h_owner)</div><div class='ctx'> {</div><div class='del'>-	HPI_DEBUG_MESSAGE(DEBUG, phm);</div><div class='ctx'> </div><div class='del'>-	if (phm-&gt;type != HPI_TYPE_MESSAGE) {</div><div class='add'>+	if (logging_enabled)</div><div class='add'>+		HPI_DEBUG_MESSAGE(DEBUG, phm);</div><div class='add'>+</div><div class='add'>+	if (phm-&gt;type != HPI_TYPE_REQUEST) {</div><div class='ctx'> 		hpi_init_response(phr, phm-&gt;object, phm-&gt;function,</div><div class='ctx'> 			HPI_ERROR_INVALID_TYPE);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -408,34 +339,14 @@ void hpi_send_recv_ex(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 		hw_entry_point(phm, phr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	HPI_DEBUG_RESPONSE(phr);</div><div class='del'>-#if 1</div><div class='del'>-	if (phr-&gt;error &gt;= HPI_ERROR_BACKEND_BASE) {</div><div class='del'>-		void *ep = NULL;</div><div class='del'>-		char *ep_name;</div><div class='del'>-</div><div class='del'>-		HPI_DEBUG_MESSAGE(ERROR, phm);</div><div class='del'>-</div><div class='del'>-		if (phm-&gt;adapter_index &lt; HPI_MAX_ADAPTERS)</div><div class='del'>-			ep = hpi_entry_points[phm-&gt;adapter_index];</div><div class='del'>-</div><div class='del'>-		/* Don't need this? Have adapter index in debug info</div><div class='del'>-		   Know at driver load time index-&gt;backend mapping */</div><div class='del'>-		if (ep == HPI_6000)</div><div class='del'>-			ep_name = "HPI_6000";</div><div class='del'>-		else if (ep == HPI_6205)</div><div class='del'>-			ep_name = "HPI_6205";</div><div class='del'>-		else</div><div class='del'>-			ep_name = "unknown";</div><div class='del'>-</div><div class='del'>-		HPI_DEBUG_LOG(ERROR, "HPI %s response - error# %d\n", ep_name,</div><div class='del'>-			phr-&gt;error);</div><div class='del'>-</div><div class='del'>-		if (hpi_debug_level &gt;= HPI_DEBUG_LEVEL_VERBOSE)</div><div class='del'>-			hpi_debug_data((u16 *)phm,</div><div class='del'>-				sizeof(*phm) / sizeof(u16));</div><div class='add'>+</div><div class='add'>+	if (logging_enabled)</div><div class='add'>+		HPI_DEBUG_RESPONSE(phr);</div><div class='add'>+</div><div class='add'>+	if (phr-&gt;error &gt;= HPI_ERROR_DSP_COMMUNICATION) {</div><div class='add'>+		hpi_debug_level_set(HPI_DEBUG_LEVEL_ERROR);</div><div class='add'>+		logging_enabled = 0;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void adapter_open(struct hpi_message *phm, struct hpi_response *phr)</div><div class='hunk'>@@ -484,7 +395,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	else {</div><div class='ctx'> 		instream_user_open[phm-&gt;adapter_index][phm-&gt;</div><div class='ctx'> 			obj_index].open_flag = 1;</div><div class='del'>-		hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+		hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> </div><div class='ctx'> 		/* issue a reset */</div><div class='ctx'> 		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='hunk'>@@ -509,7 +420,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 				sizeof(rESP_HPI_ISTREAM_OPEN[0][0]));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+	hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void instream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='hunk'>@@ -530,7 +441,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 		   phm-&gt;wAdapterIndex, phm-&gt;wObjIndex, hOwner); */</div><div class='ctx'> 		instream_user_open[phm-&gt;adapter_index][phm-&gt;</div><div class='ctx'> 			obj_index].h_owner = NULL;</div><div class='del'>-		hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+		hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> 		/* issue a reset */</div><div class='ctx'> 		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ISTREAM,</div><div class='ctx'> 			HPI_ISTREAM_RESET);</div><div class='hunk'>@@ -556,7 +467,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 				obj_index].h_owner);</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_OBJ_NOT_OPEN;</div><div class='ctx'> 	}</div><div class='del'>-	hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+	hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,</div><div class='hunk'>@@ -581,7 +492,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	else {</div><div class='ctx'> 		outstream_user_open[phm-&gt;adapter_index][phm-&gt;</div><div class='ctx'> 			obj_index].open_flag = 1;</div><div class='del'>-		hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+		hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> </div><div class='ctx'> 		/* issue a reset */</div><div class='ctx'> 		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='hunk'>@@ -606,7 +517,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 				sizeof(rESP_HPI_OSTREAM_OPEN[0][0]));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+	hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='hunk'>@@ -628,7 +539,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 		   phm-&gt;wAdapterIndex, phm-&gt;wObjIndex, hOwner); */</div><div class='ctx'> 		outstream_user_open[phm-&gt;adapter_index][phm-&gt;</div><div class='ctx'> 			obj_index].h_owner = NULL;</div><div class='del'>-		hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+		hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> 		/* issue a reset */</div><div class='ctx'> 		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_OSTREAM,</div><div class='ctx'> 			HPI_OSTREAM_RESET);</div><div class='hunk'>@@ -654,7 +565,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 				obj_index].h_owner);</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_OBJ_NOT_OPEN;</div><div class='ctx'> 	}</div><div class='del'>-	hpios_msgxlock_un_lock(&amp;msgx_lock);</div><div class='add'>+	hpios_msgxlock_unlock(&amp;msgx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 adapter_prepare(u16 adapter)</div><div class='hunk'>@@ -683,16 +594,9 @@ static u16 adapter_prepare(u16 adapter)</div><div class='ctx'> 	if (hr.error)</div><div class='ctx'> 		return hr.error;</div><div class='ctx'> </div><div class='del'>-	aDAPTER_INFO[adapter].num_outstreams = hr.u.a.num_outstreams;</div><div class='del'>-	aDAPTER_INFO[adapter].num_instreams = hr.u.a.num_instreams;</div><div class='del'>-	aDAPTER_INFO[adapter].type = hr.u.a.adapter_type;</div><div class='del'>-</div><div class='del'>-	gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list[adapter] =</div><div class='del'>-		hr.u.a.adapter_type;</div><div class='del'>-	gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters++;</div><div class='del'>-	if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters &gt; HPI_MAX_ADAPTERS)</div><div class='del'>-		gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters =</div><div class='del'>-			HPI_MAX_ADAPTERS;</div><div class='add'>+	aDAPTER_INFO[adapter].num_outstreams = hr.u.ax.info.num_outstreams;</div><div class='add'>+	aDAPTER_INFO[adapter].num_instreams = hr.u.ax.info.num_instreams;</div><div class='add'>+	aDAPTER_INFO[adapter].type = hr.u.ax.info.adapter_type;</div><div class='ctx'> </div><div class='ctx'> 	/* call to HPI_OSTREAM_OPEN */</div><div class='ctx'> 	for (i = 0; i &lt; aDAPTER_INFO[adapter].num_outstreams; i++) {</div><div class='hunk'>@@ -727,7 +631,7 @@ static u16 adapter_prepare(u16 adapter)</div><div class='ctx'> 	memcpy(&amp;rESP_HPI_MIXER_OPEN[adapter], &amp;hr,</div><div class='ctx'> 		sizeof(rESP_HPI_MIXER_OPEN[0]));</div><div class='ctx'> </div><div class='del'>-	return gRESP_HPI_SUBSYS_FIND_ADAPTERS.h.error;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void HPIMSGX__reset(u16 adapter_index)</div><div class='hunk'>@@ -737,12 +641,6 @@ static void HPIMSGX__reset(u16 adapter_index)</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter_index == HPIMSGX_ALLADAPTERS) {</div><div class='del'>-		/* reset all responses to contain errors */</div><div class='del'>-		hpi_init_response(&amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-			HPI_SUBSYS_FIND_ADAPTERS, 0);</div><div class='del'>-		memcpy(&amp;gRESP_HPI_SUBSYS_FIND_ADAPTERS, &amp;hr,</div><div class='del'>-			sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));</div><div class='del'>-</div><div class='ctx'> 		for (adapter = 0; adapter &lt; HPI_MAX_ADAPTERS; adapter++) {</div><div class='ctx'> </div><div class='ctx'> 			hpi_init_response(&amp;hr, HPI_OBJ_ADAPTER,</div><div class='hunk'>@@ -783,12 +681,6 @@ static void HPIMSGX__reset(u16 adapter_index)</div><div class='ctx'> 			rESP_HPI_ISTREAM_OPEN[adapter_index][i].h.error =</div><div class='ctx'> 				HPI_ERROR_INVALID_OBJ;</div><div class='ctx'> 		}</div><div class='del'>-		if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.</div><div class='del'>-			s.aw_adapter_list[adapter_index]) {</div><div class='del'>-			gRESP_HPI_SUBSYS_FIND_ADAPTERS.</div><div class='del'>-				s.aw_adapter_list[adapter_index] = 0;</div><div class='del'>-			gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters--;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -802,15 +694,9 @@ static u16 HPIMSGX__init(struct hpi_message *phm,</div><div class='ctx'> 	hpi_handler_func *entry_point_func;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> </div><div class='del'>-	if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters &gt;= HPI_MAX_ADAPTERS)</div><div class='del'>-		return HPI_ERROR_BAD_ADAPTER_NUMBER;</div><div class='del'>-</div><div class='ctx'> 	/* Init response here so we can pass in previous adapter list */</div><div class='ctx'> 	hpi_init_response(&amp;hr, phm-&gt;object, phm-&gt;function,</div><div class='ctx'> 		HPI_ERROR_INVALID_OBJ);</div><div class='del'>-	memcpy(hr.u.s.aw_adapter_list,</div><div class='del'>-		gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list,</div><div class='del'>-		sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list));</div><div class='ctx'> </div><div class='ctx'> 	entry_point_func =</div><div class='ctx'> 		hpi_lookup_entry_point_function(phm-&gt;u.s.resource.r.pci);</div><div class='hunk'>@@ -822,8 +708,8 @@ static u16 HPIMSGX__init(struct hpi_message *phm,</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_PROCESSING_MESSAGE;</div><div class='ctx'> 		return phr-&gt;error;</div><div class='ctx'> 	}</div><div class='del'>-	if (hr.error == 0) {</div><div class='del'>-		/* the adapter was created succesfully</div><div class='add'>+	if (hr.error == 0 &amp;&amp; hr.u.s.adapter_index &lt; HPI_MAX_ADAPTERS) {</div><div class='add'>+		/* the adapter was created successfully</div><div class='ctx'> 		   save the mapping for future use */</div><div class='ctx'> 		hpi_entry_points[hr.u.s.adapter_index] = entry_point_func;</div><div class='ctx'> 		/* prepare adapter (pre-open streams etc.) */</div><div class='hunk'>@@ -860,7 +746,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)</div><div class='ctx'> 				struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 				HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-					"close adapter %d ostream %d\n",</div><div class='add'>+					"Close adapter %d ostream %d\n",</div><div class='ctx'> 					adapter, i);</div><div class='ctx'> </div><div class='ctx'> 				hpi_init_message_response(&amp;hm, &amp;hr,</div><div class='hunk'>@@ -884,7 +770,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)</div><div class='ctx'> 				struct hpi_response hr;</div><div class='ctx'> </div><div class='ctx'> 				HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-					"close adapter %d istream %d\n",</div><div class='add'>+					"Close adapter %d istream %d\n",</div><div class='ctx'> 					adapter, i);</div><div class='ctx'> </div><div class='ctx'> 				hpi_init_message_response(&amp;hm, &amp;hr,</div><div class='head'>diff --git a/sound/pci/asihpi/hpimsgx.h b/sound/pci/asihpi/hpimsgx.h<br/>index fd49e7542a88..14c01cc91d71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsgx.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpimsgx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpimsgx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpimsgx.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  HPI Extended Message Handler Functions</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c<br/>index 62895a719fcb..9fb0c8e503df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpioctl.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpioctl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpioctl.c</a></div><div class='hunk'>@@ -1,36 +1,32 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*******************************************************************************</div><div class='del'>-</div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='add'>+    Common Linux HPI ioctl and module probe/remove functions</div><div class='ctx'> </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='add'>+    Copyright (C) 1997-2014  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='del'>-Common Linux HPI ioctl and module probe/remove functions</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> #define SOURCEFILE_NAME "hpioctl.c"</div><div class='ctx'> </div><div class='ctx'> #include "hpi_internal.h"</div><div class='add'>+#include "hpi_version.h"</div><div class='ctx'> #include "hpimsginit.h"</div><div class='ctx'> #include "hpidebug.h"</div><div class='ctx'> #include "hpimsgx.h"</div><div class='ctx'> #include "hpioctl.h"</div><div class='add'>+#include "hpicmn.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/fs.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;asm/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE_FIRMWARE</div><div class='ctx'> MODULE_FIRMWARE("asihpi/dsp5000.bin");</div><div class='hunk'>@@ -43,14 +39,14 @@ MODULE_FIRMWARE("asihpi/dsp8900.bin");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int prealloc_stream_buf;</div><div class='del'>-module_param(prealloc_stream_buf, int, S_IRUGO);</div><div class='add'>+module_param(prealloc_stream_buf, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(prealloc_stream_buf,</div><div class='del'>-	"preallocate size for per-adapter stream buffer");</div><div class='add'>+	"Preallocate size for per-adapter stream buffer");</div><div class='ctx'> </div><div class='ctx'> /* Allow the debug level to be changed after module load.</div><div class='ctx'>  E.g.   echo 2 &gt; /sys/module/asihpi/parameters/hpiDebugLevel</div><div class='ctx'> */</div><div class='del'>-module_param(hpi_debug_level, int, S_IRUGO | S_IWUSR);</div><div class='add'>+module_param(hpi_debug_level, int, 0644);</div><div class='ctx'> MODULE_PARM_DESC(hpi_debug_level, "debug verbosity 0..5");</div><div class='ctx'> </div><div class='ctx'> /* List of adapters found */</div><div class='hunk'>@@ -62,9 +58,7 @@ static struct hpi_adapter adapters[HPI_MAX_ADAPTERS];</div><div class='ctx'> static void hpi_send_recv_f(struct hpi_message *phm, struct hpi_response *phr,</div><div class='ctx'> 	struct file *file)</div><div class='ctx'> {</div><div class='del'>-	int adapter = phm-&gt;adapter_index;</div><div class='del'>-</div><div class='del'>-	if ((adapter &gt;= HPI_MAX_ADAPTERS || adapter &lt; 0)</div><div class='add'>+	if ((phm-&gt;adapter_index &gt;= HPI_MAX_ADAPTERS)</div><div class='ctx'> 		&amp;&amp; (phm-&gt;object != HPI_OBJ_SUBSYSTEM))</div><div class='ctx'> 		phr-&gt;error = HPI_ERROR_INVALID_OBJ_INDEX;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -103,16 +97,16 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	void __user *puhr;</div><div class='ctx'> 	union hpi_message_buffer_v1 *hm;</div><div class='ctx'> 	union hpi_response_buffer_v1 *hr;</div><div class='add'>+	u16 msg_size;</div><div class='ctx'> 	u16 res_max_size;</div><div class='ctx'> 	u32 uncopied_bytes;</div><div class='del'>-	struct hpi_adapter *pa = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd != HPI_IOCTL_LINUX)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	hm = kmalloc(sizeof(*hm), GFP_KERNEL);</div><div class='del'>-	hr = kmalloc(sizeof(*hr), GFP_KERNEL);</div><div class='add'>+	hr = kzalloc(sizeof(*hr), GFP_KERNEL);</div><div class='ctx'> 	if (!hm || !hr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -121,29 +115,32 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the message and response pointers from user space.  */</div><div class='del'>-	if (get_user(puhm, &amp;phpi_ioctl_data-&gt;phm) ||</div><div class='del'>-	    get_user(puhr, &amp;phpi_ioctl_data-&gt;phr)) {</div><div class='add'>+	if (get_user(puhm, &amp;phpi_ioctl_data-&gt;phm)</div><div class='add'>+		|| get_user(puhr, &amp;phpi_ioctl_data-&gt;phr)) {</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Now read the message size and data from user space.  */</div><div class='del'>-	if (get_user(hm-&gt;h.size, (u16 __user *)puhm)) {</div><div class='add'>+	if (get_user(msg_size, (u16 __user *)puhm)) {</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='del'>-	if (hm-&gt;h.size &gt; sizeof(*hm))</div><div class='del'>-		hm-&gt;h.size = sizeof(*hm);</div><div class='add'>+	if (msg_size &gt; sizeof(*hm))</div><div class='add'>+		msg_size = sizeof(*hm);</div><div class='ctx'> </div><div class='del'>-	/*printk(KERN_INFO "message size %d\n", hm-&gt;h.wSize); */</div><div class='add'>+	/* printk(KERN_INFO "message size %d\n", hm-&gt;h.wSize); */</div><div class='ctx'> </div><div class='del'>-	uncopied_bytes = copy_from_user(hm, puhm, hm-&gt;h.size);</div><div class='add'>+	uncopied_bytes = copy_from_user(hm, puhm, msg_size);</div><div class='ctx'> 	if (uncopied_bytes) {</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR, "uncopied bytes %d\n", uncopied_bytes);</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Override h.size in case it is changed between two userspace fetches */</div><div class='add'>+	hm-&gt;h.size = msg_size;</div><div class='add'>+</div><div class='ctx'> 	if (get_user(res_max_size, (u16 __user *)puhr)) {</div><div class='ctx'> 		err = -EFAULT;</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -155,38 +152,40 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pa = &amp;adapters[hm-&gt;h.adapter_index];</div><div class='del'>-	hr-&gt;h.size = 0;</div><div class='del'>-	if (hm-&gt;h.object == HPI_OBJ_SUBSYSTEM) {</div><div class='del'>-		switch (hm-&gt;h.function) {</div><div class='del'>-		case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='del'>-		case HPI_SUBSYS_DELETE_ADAPTER:</div><div class='del'>-			/* Application must not use these functions! */</div><div class='del'>-			hr-&gt;h.size = sizeof(hr-&gt;h);</div><div class='del'>-			hr-&gt;h.error = HPI_ERROR_INVALID_OPERATION;</div><div class='del'>-			hr-&gt;h.function = hm-&gt;h.function;</div><div class='del'>-			uncopied_bytes = copy_to_user(puhr, hr, hr-&gt;h.size);</div><div class='del'>-			if (uncopied_bytes)</div><div class='del'>-				err = -EFAULT;</div><div class='del'>-			else</div><div class='del'>-				err = 0;</div><div class='del'>-			goto out;</div><div class='add'>+	res_max_size = min_t(size_t, res_max_size, sizeof(*hr));</div><div class='add'>+</div><div class='add'>+	switch (hm-&gt;h.function) {</div><div class='add'>+	case HPI_SUBSYS_CREATE_ADAPTER:</div><div class='add'>+	case HPI_ADAPTER_DELETE:</div><div class='add'>+		/* Application must not use these functions! */</div><div class='add'>+		hr-&gt;h.size = sizeof(hr-&gt;h);</div><div class='add'>+		hr-&gt;h.error = HPI_ERROR_INVALID_OPERATION;</div><div class='add'>+		hr-&gt;h.function = hm-&gt;h.function;</div><div class='add'>+		uncopied_bytes = copy_to_user(puhr, hr, hr-&gt;h.size);</div><div class='add'>+		if (uncopied_bytes)</div><div class='add'>+			err = -EFAULT;</div><div class='add'>+		else</div><div class='add'>+			err = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		default:</div><div class='del'>-			hpi_send_recv_f(&amp;hm-&gt;m0, &amp;hr-&gt;r0, file);</div><div class='del'>-		}</div><div class='add'>+	hr-&gt;h.size = res_max_size;</div><div class='add'>+	if (hm-&gt;h.object == HPI_OBJ_SUBSYSTEM) {</div><div class='add'>+		hpi_send_recv_f(&amp;hm-&gt;m0, &amp;hr-&gt;r0, file);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u16 __user *ptr = NULL;</div><div class='ctx'> 		u32 size = 0;</div><div class='del'>-</div><div class='ctx'> 		/* -1=no data 0=read from user mem, 1=write to user mem */</div><div class='ctx'> 		int wrflag = -1;</div><div class='del'>-		u32 adapter = hm-&gt;h.adapter_index;</div><div class='add'>+		struct hpi_adapter *pa = NULL;</div><div class='ctx'> </div><div class='del'>-		if ((hm-&gt;h.adapter_index &gt; HPI_MAX_ADAPTERS) || (!pa-&gt;type)) {</div><div class='del'>-			hpi_init_response(&amp;hr-&gt;r0, HPI_OBJ_ADAPTER,</div><div class='del'>-				HPI_ADAPTER_OPEN,</div><div class='del'>-				HPI_ERROR_BAD_ADAPTER_NUMBER);</div><div class='add'>+		if (hm-&gt;h.adapter_index &lt; ARRAY_SIZE(adapters))</div><div class='add'>+			pa = &amp;adapters[array_index_nospec(hm-&gt;h.adapter_index,</div><div class='add'>+							  ARRAY_SIZE(adapters))];</div><div class='add'>+</div><div class='add'>+		if (!pa || !pa-&gt;adapter || !pa-&gt;adapter-&gt;type) {</div><div class='add'>+			hpi_init_response(&amp;hr-&gt;r0, hm-&gt;h.object,</div><div class='add'>+				hm-&gt;h.function, HPI_ERROR_BAD_ADAPTER_NUMBER);</div><div class='ctx'> </div><div class='ctx'> 			uncopied_bytes =</div><div class='ctx'> 				copy_to_user(puhr, hr, sizeof(hr-&gt;h));</div><div class='hunk'>@@ -197,7 +196,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (mutex_lock_interruptible(&amp;adapters[adapter].mutex)) {</div><div class='add'>+		if (mutex_lock_interruptible(&amp;pa-&gt;mutex)) {</div><div class='ctx'> 			err = -EINTR;</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -216,7 +215,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (pa-&gt;buffer_size &lt; size) {</div><div class='ctx'> 					HPI_DEBUG_LOG(DEBUG,</div><div class='del'>-						"realloc adapter %d stream "</div><div class='add'>+						"Realloc adapter %d stream "</div><div class='ctx'> 						"buffer from %zd to %d\n",</div><div class='ctx'> 						hm-&gt;h.adapter_index,</div><div class='ctx'> 						pa-&gt;buffer_size, size);</div><div class='hunk'>@@ -233,8 +232,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 							"stream buffer size %d\n",</div><div class='ctx'> 							size);</div><div class='ctx'> </div><div class='del'>-						mutex_unlock(&amp;adapters</div><div class='del'>-							[adapter].mutex);</div><div class='add'>+						mutex_unlock(&amp;pa-&gt;mutex);</div><div class='ctx'> 						err = -EINVAL;</div><div class='ctx'> 						goto out;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -259,7 +257,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 				copy_from_user(pa-&gt;p_buffer, ptr, size);</div><div class='ctx'> 			if (uncopied_bytes)</div><div class='ctx'> 				HPI_DEBUG_LOG(WARNING,</div><div class='del'>-					"missed %d of %d "</div><div class='add'>+					"Missed %d of %d "</div><div class='ctx'> 					"bytes from user\n", uncopied_bytes,</div><div class='ctx'> 					size);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -271,11 +269,11 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 				copy_to_user(ptr, pa-&gt;p_buffer, size);</div><div class='ctx'> 			if (uncopied_bytes)</div><div class='ctx'> 				HPI_DEBUG_LOG(WARNING,</div><div class='del'>-					"missed %d of %d " "bytes to user\n",</div><div class='add'>+					"Missed %d of %d " "bytes to user\n",</div><div class='ctx'> 					uncopied_bytes, size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mutex_unlock(&amp;adapters[adapter].mutex);</div><div class='add'>+		mutex_unlock(&amp;pa-&gt;mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* on return response size must be set */</div><div class='hunk'>@@ -290,9 +288,9 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)</div><div class='ctx'> 	if (hr-&gt;h.size &gt; res_max_size) {</div><div class='ctx'> 		HPI_DEBUG_LOG(ERROR, "response too big %d %d\n", hr-&gt;h.size,</div><div class='ctx'> 			res_max_size);</div><div class='del'>-		/*HPI_DEBUG_MESSAGE(ERROR, hm); */</div><div class='del'>-		err = -EFAULT;</div><div class='del'>-		goto out;</div><div class='add'>+		hr-&gt;h.error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;</div><div class='add'>+		hr-&gt;h.specific_error = hr-&gt;h.size;</div><div class='add'>+		hr-&gt;h.size = sizeof(hr-&gt;h);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	uncopied_bytes = copy_to_user(puhr, hr, hr-&gt;h.size);</div><div class='hunk'>@@ -308,70 +306,97 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='del'>-	const struct pci_device_id *pci_id)</div><div class='add'>+static int asihpi_irq_count;</div><div class='add'>+</div><div class='add'>+static irqreturn_t asihpi_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	int err, idx, nm;</div><div class='add'>+	struct hpi_adapter *a = dev_id;</div><div class='add'>+	int handled;</div><div class='add'>+</div><div class='add'>+	if (!a-&gt;adapter-&gt;irq_query_and_clear) {</div><div class='add'>+		pr_err("asihpi_isr ASI%04X:%d no handler\n", a-&gt;adapter-&gt;type,</div><div class='add'>+			a-&gt;adapter-&gt;index);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	handled = a-&gt;adapter-&gt;irq_query_and_clear(a-&gt;adapter, 0);</div><div class='add'>+</div><div class='add'>+	if (!handled)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	asihpi_irq_count++;</div><div class='add'>+	/* printk(KERN_INFO "asihpi_isr %d ASI%04X:%d irq handled\n",</div><div class='add'>+	   asihpi_irq_count, a-&gt;adapter-&gt;type, a-&gt;adapter-&gt;index); */</div><div class='add'>+</div><div class='add'>+	if (a-&gt;interrupt_callback)</div><div class='add'>+		return IRQ_WAKE_THREAD;</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t asihpi_isr_thread(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct hpi_adapter *a = dev_id;</div><div class='add'>+</div><div class='add'>+	if (a-&gt;interrupt_callback)</div><div class='add'>+		a-&gt;interrupt_callback(a);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='add'>+			 const struct pci_device_id *pci_id)</div><div class='add'>+{</div><div class='add'>+	int idx, nm, low_latency_mode = 0, irq_supported = 0;</div><div class='add'>+	int adapter_index;</div><div class='ctx'> 	unsigned int memlen;</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	struct hpi_adapter adapter;</div><div class='del'>-	struct hpi_pci pci;</div><div class='add'>+	struct hpi_pci pci = { 0 };</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;adapter, 0, sizeof(adapter));</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "probe PCI device (%04x:%04x,%04x:%04x,%04x)\n",</div><div class='del'>-		pci_dev-&gt;vendor, pci_dev-&gt;device, pci_dev-&gt;subsystem_vendor,</div><div class='add'>+	dev_dbg(&amp;pci_dev-&gt;dev,</div><div class='add'>+		"probe %04x:%04x,%04x:%04x,%04x\n", pci_dev-&gt;vendor,</div><div class='add'>+		pci_dev-&gt;device, pci_dev-&gt;subsystem_vendor,</div><div class='ctx'> 		pci_dev-&gt;subsystem_device, pci_dev-&gt;devfn);</div><div class='ctx'> </div><div class='add'>+	if (pcim_enable_device(pci_dev) &lt; 0) {</div><div class='add'>+		dev_err(&amp;pci_dev-&gt;dev,</div><div class='add'>+			"pci_enable_device failed, disabling device\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pci_dev);	/* also sets latency timer if &lt; 16 */</div><div class='add'>+</div><div class='ctx'> 	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='ctx'> 		HPI_SUBSYS_CREATE_ADAPTER);</div><div class='ctx'> 	hpi_init_response(&amp;hr, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CREATE_ADAPTER,</div><div class='ctx'> 		HPI_ERROR_PROCESSING_MESSAGE);</div><div class='ctx'> </div><div class='del'>-	hm.adapter_index = -1;	/* an invalid index */</div><div class='del'>-</div><div class='del'>-	/* fill in HPI_PCI information from kernel provided information */</div><div class='del'>-	adapter.pci = pci_dev;</div><div class='add'>+	hm.adapter_index = HPI_ADAPTER_INDEX_INVALID;</div><div class='ctx'> </div><div class='ctx'> 	nm = HPI_MAX_ADAPTER_MEM_SPACES;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; nm; idx++) {</div><div class='del'>-		HPI_DEBUG_LOG(INFO, "resource %d %s %08llx-%08llx %04llx\n",</div><div class='del'>-			idx, pci_dev-&gt;resource[idx].name,</div><div class='del'>-			(unsigned long long)pci_resource_start(pci_dev, idx),</div><div class='del'>-			(unsigned long long)pci_resource_end(pci_dev, idx),</div><div class='del'>-			(unsigned long long)pci_resource_flags(pci_dev, idx));</div><div class='add'>+		HPI_DEBUG_LOG(INFO, "resource %d %pR\n", idx,</div><div class='add'>+			&amp;pci_dev-&gt;resource[idx]);</div><div class='ctx'> </div><div class='ctx'> 		if (pci_resource_flags(pci_dev, idx) &amp; IORESOURCE_MEM) {</div><div class='ctx'> 			memlen = pci_resource_len(pci_dev, idx);</div><div class='del'>-			adapter.ap_remapped_mem_base[idx] =</div><div class='add'>+			pci.ap_mem_base[idx] =</div><div class='ctx'> 				ioremap(pci_resource_start(pci_dev, idx),</div><div class='ctx'> 				memlen);</div><div class='del'>-			if (!adapter.ap_remapped_mem_base[idx]) {</div><div class='add'>+			if (!pci.ap_mem_base[idx]) {</div><div class='ctx'> 				HPI_DEBUG_LOG(ERROR,</div><div class='ctx'> 					"ioremap failed, aborting\n");</div><div class='ctx'> 				/* unmap previously mapped pci mem space */</div><div class='ctx'> 				goto err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		pci.ap_mem_base[idx] = adapter.ap_remapped_mem_base[idx];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* could replace Pci with direct pointer to pci_dev for linux</div><div class='del'>-	   Instead wrap accessor functions for IDs etc.</div><div class='del'>-	   Would it work for windows?</div><div class='del'>-	 */</div><div class='del'>-	pci.bus_number = pci_dev-&gt;bus-&gt;number;</div><div class='del'>-	pci.vendor_id = (u16)pci_dev-&gt;vendor;</div><div class='del'>-	pci.device_id = (u16)pci_dev-&gt;device;</div><div class='del'>-	pci.subsys_vendor_id = (u16)(pci_dev-&gt;subsystem_vendor &amp; 0xffff);</div><div class='del'>-	pci.subsys_device_id = (u16)(pci_dev-&gt;subsystem_device &amp; 0xffff);</div><div class='del'>-	pci.device_number = pci_dev-&gt;devfn;</div><div class='del'>-	pci.interrupt = pci_dev-&gt;irq;</div><div class='del'>-	pci.p_os_data = pci_dev;</div><div class='del'>-</div><div class='add'>+	pci.pci_dev = pci_dev;</div><div class='ctx'> 	hm.u.s.resource.bus_type = HPI_BUS_PCI;</div><div class='ctx'> 	hm.u.s.resource.r.pci = &amp;pci;</div><div class='ctx'> </div><div class='hunk'>@@ -380,6 +405,9 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 	if (hr.error)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	adapter_index = hr.u.s.adapter_index;</div><div class='add'>+	adapter.adapter = hpi_find_adapter(adapter_index);</div><div class='add'>+</div><div class='ctx'> 	if (prealloc_stream_buf) {</div><div class='ctx'> 		adapter.p_buffer = vmalloc(prealloc_stream_buf);</div><div class='ctx'> 		if (!adapter.p_buffer) {</div><div class='hunk'>@@ -391,32 +419,100 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter.index = hr.u.s.adapter_index;</div><div class='del'>-	adapter.type = hr.u.s.aw_adapter_list[adapter.index];</div><div class='del'>-	hm.adapter_index = adapter.index;</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+		HPI_ADAPTER_OPEN);</div><div class='add'>+	hm.adapter_index = adapter.adapter-&gt;index;</div><div class='add'>+	hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='ctx'> </div><div class='del'>-	err = hpi_adapter_open(NULL, adapter.index);</div><div class='del'>-	if (err)</div><div class='add'>+	if (hr.error) {</div><div class='add'>+		HPI_DEBUG_LOG(ERROR, "HPI_ADAPTER_OPEN failed, aborting\n");</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if current mode == Low Latency mode */</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+		HPI_ADAPTER_GET_MODE);</div><div class='add'>+	hm.adapter_index = adapter.adapter-&gt;index;</div><div class='add'>+	hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!hr.error</div><div class='add'>+		&amp;&amp; hr.u.ax.mode.adapter_mode == HPI_ADAPTER_MODE_LOW_LATENCY)</div><div class='add'>+		low_latency_mode = 1;</div><div class='add'>+	else</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev,</div><div class='add'>+			"Adapter at index %d is not in low latency mode\n",</div><div class='add'>+			adapter.adapter-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* Check if IRQs are supported */</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+		HPI_ADAPTER_GET_PROPERTY);</div><div class='add'>+	hm.adapter_index = adapter.adapter-&gt;index;</div><div class='add'>+	hm.u.ax.property_set.property = HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ;</div><div class='add'>+	hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='add'>+	if (hr.error || !hr.u.ax.property_get.parameter1) {</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev,</div><div class='add'>+			"IRQs not supported by adapter at index %d\n",</div><div class='add'>+			adapter.adapter-&gt;index);</div><div class='add'>+	} else {</div><div class='add'>+		irq_supported = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	adapter.snd_card_asihpi = NULL;</div><div class='ctx'> 	/* WARNING can't init mutex in 'adapter'</div><div class='ctx'> 	 * and then copy it to adapters[] ?!?!</div><div class='ctx'> 	 */</div><div class='del'>-	adapters[hr.u.s.adapter_index] = adapter;</div><div class='del'>-	mutex_init(&amp;adapters[adapter.index].mutex);</div><div class='del'>-	pci_set_drvdata(pci_dev, &amp;adapters[adapter.index]);</div><div class='add'>+	adapters[adapter_index] = adapter;</div><div class='add'>+	mutex_init(&amp;adapters[adapter_index].mutex);</div><div class='add'>+	pci_set_drvdata(pci_dev, &amp;adapters[adapter_index]);</div><div class='add'>+</div><div class='add'>+	if (low_latency_mode &amp;&amp; irq_supported) {</div><div class='add'>+		if (!adapter.adapter-&gt;irq_query_and_clear) {</div><div class='add'>+			dev_err(&amp;pci_dev-&gt;dev,</div><div class='add'>+				"no IRQ handler for adapter %d, aborting\n",</div><div class='add'>+				adapter.adapter-&gt;index);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "probe found adapter ASI%04X HPI index #%d.\n",</div><div class='del'>-		adapter.type, adapter.index);</div><div class='add'>+		/* Disable IRQ generation on DSP side by setting the rate to 0 */</div><div class='add'>+		hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+			HPI_ADAPTER_SET_PROPERTY);</div><div class='add'>+		hm.adapter_index = adapter.adapter-&gt;index;</div><div class='add'>+		hm.u.ax.property_set.property = HPI_ADAPTER_PROPERTY_IRQ_RATE;</div><div class='add'>+		hm.u.ax.property_set.parameter1 = 0;</div><div class='add'>+		hm.u.ax.property_set.parameter2 = 0;</div><div class='add'>+		hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='add'>+		if (hr.error) {</div><div class='add'>+			HPI_DEBUG_LOG(ERROR,</div><div class='add'>+				"HPI_ADAPTER_GET_MODE failed, aborting\n");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Note: request_irq calls asihpi_isr here */</div><div class='add'>+		if (request_threaded_irq(pci_dev-&gt;irq, asihpi_isr,</div><div class='add'>+					 asihpi_isr_thread, IRQF_SHARED,</div><div class='add'>+					 "asihpi", &amp;adapters[adapter_index])) {</div><div class='add'>+			dev_err(&amp;pci_dev-&gt;dev, "request_irq(%d) failed\n",</div><div class='add'>+				pci_dev-&gt;irq);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		adapters[adapter_index].interrupt_mode = 1;</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev, "using irq %d\n", pci_dev-&gt;irq);</div><div class='add'>+		adapters[adapter_index].irq = pci_dev-&gt;irq;</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev, "using polled mode\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pci_dev-&gt;dev, "probe succeeded for ASI%04X HPI index %d\n",</div><div class='add'>+		 adapter.adapter-&gt;type, adapter_index);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	for (idx = 0; idx &lt; HPI_MAX_ADAPTER_MEM_SPACES; idx++) {</div><div class='del'>-		if (adapter.ap_remapped_mem_base[idx]) {</div><div class='del'>-			iounmap(adapter.ap_remapped_mem_base[idx]);</div><div class='del'>-			adapter.ap_remapped_mem_base[idx] = NULL;</div><div class='add'>+	while (--idx &gt;= 0) {</div><div class='add'>+		if (pci.ap_mem_base[idx]) {</div><div class='add'>+			iounmap(pci.ap_mem_base[idx]);</div><div class='add'>+			pci.ap_mem_base[idx] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -429,41 +525,48 @@ err:</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)</div><div class='add'>+void asihpi_adapter_remove(struct pci_dev *pci_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	struct hpi_message hm;</div><div class='ctx'> 	struct hpi_response hr;</div><div class='ctx'> 	struct hpi_adapter *pa;</div><div class='del'>-	pa = (struct hpi_adapter *)pci_get_drvdata(pci_dev);</div><div class='add'>+	struct hpi_pci pci;</div><div class='ctx'> </div><div class='del'>-	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_SUBSYSTEM,</div><div class='del'>-		HPI_SUBSYS_DELETE_ADAPTER);</div><div class='del'>-	hm.adapter_index = pa-&gt;index;</div><div class='add'>+	pa = pci_get_drvdata(pci_dev);</div><div class='add'>+	pci = pa-&gt;adapter-&gt;pci;</div><div class='add'>+</div><div class='add'>+	/* Disable IRQ generation on DSP side */</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+		HPI_ADAPTER_SET_PROPERTY);</div><div class='add'>+	hm.adapter_index = pa-&gt;adapter-&gt;index;</div><div class='add'>+	hm.u.ax.property_set.property = HPI_ADAPTER_PROPERTY_IRQ_RATE;</div><div class='add'>+	hm.u.ax.property_set.parameter1 = 0;</div><div class='add'>+	hm.u.ax.property_set.parameter2 = 0;</div><div class='add'>+	hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='add'>+</div><div class='add'>+	hpi_init_message_response(&amp;hm, &amp;hr, HPI_OBJ_ADAPTER,</div><div class='add'>+		HPI_ADAPTER_DELETE);</div><div class='add'>+	hm.adapter_index = pa-&gt;adapter-&gt;index;</div><div class='ctx'> 	hpi_send_recv_ex(&amp;hm, &amp;hr, HOWNER_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap PCI memory space, mapped during device init. */</div><div class='del'>-	for (idx = 0; idx &lt; HPI_MAX_ADAPTER_MEM_SPACES; idx++) {</div><div class='del'>-		if (pa-&gt;ap_remapped_mem_base[idx]) {</div><div class='del'>-			iounmap(pa-&gt;ap_remapped_mem_base[idx]);</div><div class='del'>-			pa-&gt;ap_remapped_mem_base[idx] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (idx = 0; idx &lt; HPI_MAX_ADAPTER_MEM_SPACES; ++idx)</div><div class='add'>+		iounmap(pci.ap_mem_base[idx]);</div><div class='ctx'> </div><div class='del'>-	if (pa-&gt;p_buffer) {</div><div class='del'>-		pa-&gt;buffer_size = 0;</div><div class='del'>-		vfree(pa-&gt;p_buffer);</div><div class='del'>-	}</div><div class='add'>+	if (pa-&gt;irq)</div><div class='add'>+		free_irq(pa-&gt;irq, pa);</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pci_dev, NULL);</div><div class='del'>-	/*</div><div class='del'>-	   printk(KERN_INFO "PCI device (%04x:%04x,%04x:%04x,%04x),"</div><div class='del'>-	   " HPI index # %d, removed.\n",</div><div class='del'>-	   pci_dev-&gt;vendor, pci_dev-&gt;device,</div><div class='del'>-	   pci_dev-&gt;subsystem_vendor,</div><div class='del'>-	   pci_dev-&gt;subsystem_device, pci_dev-&gt;devfn,</div><div class='del'>-	   pa-&gt;index);</div><div class='del'>-	 */</div><div class='add'>+	vfree(pa-&gt;p_buffer);</div><div class='add'>+</div><div class='add'>+	if (1)</div><div class='add'>+		dev_info(&amp;pci_dev-&gt;dev,</div><div class='add'>+			 "remove %04x:%04x,%04x:%04x,%04x, HPI index %d\n",</div><div class='add'>+			 pci_dev-&gt;vendor, pci_dev-&gt;device,</div><div class='add'>+			 pci_dev-&gt;subsystem_vendor, pci_dev-&gt;subsystem_device,</div><div class='add'>+			 pci_dev-&gt;devfn, pa-&gt;adapter-&gt;index);</div><div class='add'>+</div><div class='add'>+	memset(pa, 0, sizeof(*pa));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void __init asihpi_init(void)</div><div class='head'>diff --git a/sound/pci/asihpi/hpioctl.h b/sound/pci/asihpi/hpioctl.h<br/>index 847f72f03fe1..f2ee172da56c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpioctl.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpioctl.h</a></div><div class='hunk'>@@ -1,27 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> Linux HPI ioctl, and shared module init functions</div><div class='ctx'> *******************************************************************************/</div><div class='ctx'> </div><div class='del'>-int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='del'>-	const struct pci_device_id *pci_id);</div><div class='del'>-void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev);</div><div class='add'>+int asihpi_adapter_probe(struct pci_dev *pci_dev,</div><div class='add'>+			 const struct pci_device_id *pci_id);</div><div class='add'>+void asihpi_adapter_remove(struct pci_dev *pci_dev);</div><div class='ctx'> void __init asihpi_init(void);</div><div class='ctx'> void __exit asihpi_exit(void);</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c<br/>index 742ee12a9e17..6fe60d13e24b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpios.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpios.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpios.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpios.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2012  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> HPI Operating System function implementation for Linux</div><div class='ctx'> </div><div class='hunk'>@@ -39,13 +28,9 @@ void hpios_delay_micro_seconds(u32 num_micro_sec)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hpios_locked_mem_init(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** Allocated an area of locked memory for bus master DMA operations.</div><div class='add'>+/** Allocate an area of locked memory for bus master DMA operations.</div><div class='ctx'> </div><div class='del'>-On error, return -ENOMEM, and *pMemArea.size = 0</div><div class='add'>+If allocation fails, return 1, and *pMemArea.size = 0</div><div class='ctx'> */</div><div class='ctx'> u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,</div><div class='ctx'> 	struct pci_dev *pdev)</div><div class='hunk'>@@ -53,7 +38,7 @@ u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,</div><div class='ctx'> 	/*?? any benefit in using managed dmam_alloc_coherent? */</div><div class='ctx'> 	p_mem_area-&gt;vaddr =</div><div class='ctx'> 		dma_alloc_coherent(&amp;pdev-&gt;dev, size, &amp;p_mem_area-&gt;dma_handle,</div><div class='del'>-		GFP_DMA32 | GFP_KERNEL);</div><div class='add'>+		GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (p_mem_area-&gt;vaddr) {</div><div class='ctx'> 		HPI_DEBUG_LOG(DEBUG, "allocated %d bytes, dma 0x%x vma %p\n",</div><div class='hunk'>@@ -66,7 +51,7 @@ u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size,</div><div class='ctx'> 		HPI_DEBUG_LOG(WARNING,</div><div class='ctx'> 			"failed to allocate %d bytes locked memory\n", size);</div><div class='ctx'> 		p_mem_area-&gt;size = 0;</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +70,3 @@ u16 hpios_locked_mem_free(struct consistent_dma_area *p_mem_area)</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-void hpios_locked_mem_free_all(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='head'>diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h<br/>index 370f39b43f85..9e551bc46264 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpios.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpios.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpios.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpios.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'> HPI Operating System Specific macros for Linux Kernel driver</div><div class='ctx'> </div><div class='hunk'>@@ -27,12 +16,9 @@ HPI Operating System Specific macros for Linux Kernel driver</div><div class='ctx'> #define HPI_OS_LINUX_KERNEL</div><div class='ctx'> </div><div class='ctx'> #define HPI_OS_DEFINED</div><div class='del'>-#define HPI_KERNEL_MODE</div><div class='del'>-</div><div class='del'>-#define HPI_REASSIGN_DUPLICATE_ADAPTER_IDX</div><div class='add'>+#define HPI_BUILD_KERNEL_MODE</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='ctx'> #include &lt;linux/ioctl.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -40,13 +26,10 @@ HPI Operating System Specific macros for Linux Kernel driver</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define HPI_NO_OS_FILE_OPS</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_64BIT</div><div class='del'>-#define HPI64BIT</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /** Details of a memory area allocated with  pci_alloc_consistent</div><div class='ctx'> Need all info for parameters to pci_free_consistent</div><div class='ctx'> */</div><div class='hunk'>@@ -84,7 +67,7 @@ struct hpi_ioctl_linux {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Conflict?: H is already used by a number of drivers hid, bluetooth hci,</div><div class='del'>-   and some sound drivers sb16, hdsp, emu10k. AFAIK 0xFC is ununsed command</div><div class='add'>+   and some sound drivers sb16, hdsp, emu10k. AFAIK 0xFC is unused command</div><div class='ctx'> */</div><div class='ctx'> #define HPI_IOCTL_LINUX _IOWR('H', 0xFC, struct hpi_ioctl_linux)</div><div class='ctx'> </div><div class='hunk'>@@ -135,35 +118,37 @@ static inline void cond_unlock(struct hpios_spinlock *l)</div><div class='ctx'> </div><div class='ctx'> #define hpios_msgxlock_init(obj)      spin_lock_init(&amp;(obj)-&gt;lock)</div><div class='ctx'> #define hpios_msgxlock_lock(obj)   cond_lock(obj)</div><div class='del'>-#define hpios_msgxlock_un_lock(obj) cond_unlock(obj)</div><div class='add'>+#define hpios_msgxlock_unlock(obj) cond_unlock(obj)</div><div class='ctx'> </div><div class='ctx'> #define hpios_dsplock_init(obj)       spin_lock_init(&amp;(obj)-&gt;dsp_lock.lock)</div><div class='ctx'> #define hpios_dsplock_lock(obj)    cond_lock(&amp;(obj)-&gt;dsp_lock)</div><div class='ctx'> #define hpios_dsplock_unlock(obj)  cond_unlock(&amp;(obj)-&gt;dsp_lock)</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define HPI_DEBUG</div><div class='add'>+#define HPI_BUILD_DEBUG</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define HPI_ALIST_LOCKING</div><div class='ctx'> #define hpios_alistlock_init(obj)    spin_lock_init(&amp;((obj)-&gt;list_lock.lock))</div><div class='ctx'> #define hpios_alistlock_lock(obj) spin_lock(&amp;((obj)-&gt;list_lock.lock))</div><div class='del'>-#define hpios_alistlock_un_lock(obj) spin_unlock(&amp;((obj)-&gt;list_lock.lock))</div><div class='add'>+#define hpios_alistlock_unlock(obj) spin_unlock(&amp;((obj)-&gt;list_lock.lock))</div><div class='ctx'> </div><div class='add'>+struct snd_card;</div><div class='add'>+</div><div class='add'>+/** pci drvdata points to an instance of this struct */</div><div class='ctx'> struct hpi_adapter {</div><div class='add'>+	struct hpi_adapter_obj *adapter;</div><div class='add'>+	struct snd_card *snd_card;</div><div class='add'>+</div><div class='add'>+	int irq;</div><div class='add'>+	int interrupt_mode;</div><div class='add'>+	void (*interrupt_callback) (struct hpi_adapter *);</div><div class='add'>+</div><div class='ctx'> 	/* mutex prevents contention for one card</div><div class='ctx'> 	   between multiple user programs (via ioctl) */</div><div class='ctx'> 	struct mutex mutex;</div><div class='del'>-	u16 index;</div><div class='del'>-	u16 type;</div><div class='del'>-</div><div class='del'>-	/* ALSA card structure */</div><div class='del'>-	void *snd_card_asihpi;</div><div class='del'>-</div><div class='ctx'> 	char *p_buffer;</div><div class='ctx'> 	size_t buffer_size;</div><div class='del'>-	struct pci_dev *pci;</div><div class='del'>-	void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/pci/asihpi/hpipcida.h b/sound/pci/asihpi/hpipcida.h<br/>index bb30868ce1a3..0673e8278070 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpipcida.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/asihpi/hpipcida.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/asihpi/hpipcida.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/asihpi/hpipcida.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> </div><div class='ctx'>     AudioScience HPI driver</div><div class='del'>-    Copyright (C) 1997-2010  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='add'>+    Copyright (C) 1997-2011  AudioScience Inc. &lt;support@audioscience.com&gt;</div><div class='ctx'> </div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of version 2 of the GNU General Public License as</div><div class='del'>-    published by the Free Software Foundation;</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='ctx'> </div><div class='ctx'>  Array initializer for PCI card IDs</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c<br/>index 49d572a7b235..2a0c59d5afa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/atiixp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/atiixp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/atiixp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/atiixp.c</a></div><div class='hunk'>@@ -1,31 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ATI IXP 150/200/250/300 AC97 controllers</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -37,13 +23,12 @@</div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ATI IXP AC97 controller");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ATI,IXP150/200/250/300/400/600}}");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='ctx'> static int ac97_clock = 48000;</div><div class='ctx'> static char *ac97_quirk;</div><div class='del'>-static int spdif_aclink = 1;</div><div class='add'>+static bool spdif_aclink = 1;</div><div class='ctx'> static int ac97_codec = -1;</div><div class='ctx'> </div><div class='ctx'> module_param(index, int, 0444);</div><div class='hunk'>@@ -60,7 +45,7 @@ module_param(spdif_aclink, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");</div><div class='ctx'> </div><div class='ctx'> /* just for backward compatibility */</div><div class='del'>-static int enable;</div><div class='add'>+static bool enable;</div><div class='ctx'> module_param(enable, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -207,10 +192,10 @@ struct atiixp;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct atiixp_dma_desc {</div><div class='del'>-	u32 addr;	/* DMA buffer address */</div><div class='add'>+	__le32 addr;	/* DMA buffer address */</div><div class='ctx'> 	u16 status;	/* status bits */</div><div class='ctx'> 	u16 size;	/* size of the packet in dwords */</div><div class='del'>-	u32 next;	/* address of the next packet descriptor */</div><div class='add'>+	__le32 next;	/* address of the next packet descriptor */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -286,7 +271,7 @@ struct atiixp {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {</div><div class='add'>+static const struct pci_device_id snd_atiixp_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */</div><div class='hunk'>@@ -296,7 +281,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk atiixp_quirks[] __devinitdata = {</div><div class='add'>+static const struct snd_pci_quirk atiixp_quirks[] = {</div><div class='ctx'> 	SND_PCI_QUIRK(0x105b, 0x0c81, "Foxconn RC4107MA-RS2", 0),</div><div class='ctx'> 	SND_PCI_QUIRK(0x15bd, 0x3100, "DFI RS482", 0),</div><div class='ctx'> 	{ } /* terminator */</div><div class='hunk'>@@ -360,14 +345,13 @@ static int atiixp_build_dma_packets(struct atiixp *chip, struct atiixp_dma *dma,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 addr, desc_addr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (periods &gt; ATI_MAX_DESCRIPTORS)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (dma-&gt;desc_buf.area == NULL) {</div><div class='ctx'> 		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+					&amp;chip-&gt;pci-&gt;dev,</div><div class='ctx'> 					ATI_DESC_LIST_SIZE,</div><div class='ctx'> 					&amp;dma-&gt;desc_buf) &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -378,11 +362,11 @@ static int atiixp_build_dma_packets(struct atiixp *chip, struct atiixp_dma *dma,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* reset DMA before changing the descriptor table */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	writel(0, chip-&gt;remap_addr + dma-&gt;ops-&gt;llp_offset);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		writel(0, chip-&gt;remap_addr + dma-&gt;ops-&gt;llp_offset);</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* fill the entries */</div><div class='ctx'> 	addr = (u32)substream-&gt;runtime-&gt;dma_addr;</div><div class='hunk'>@@ -432,7 +416,7 @@ static int snd_atiixp_acquire_codec(struct atiixp *chip)</div><div class='ctx'> </div><div class='ctx'> 	while (atiixp_read(chip, PHYS_OUT_ADDR) &amp; ATI_REG_PHYS_OUT_ADDR_EN) {</div><div class='ctx'> 		if (! timeout--) {</div><div class='del'>-			snd_printk(KERN_WARNING "atiixp: codec acquire timeout\n");</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev, "codec acquire timeout\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		udelay(1);</div><div class='hunk'>@@ -463,7 +447,7 @@ static unsigned short snd_atiixp_codec_read(struct atiixp *chip, unsigned short</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> 	/* time out may happen during reset */</div><div class='ctx'> 	if (reg &lt; 0x7c)</div><div class='del'>-		snd_printk(KERN_WARNING "atiixp: codec read timeout (reg %x)\n", reg);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "codec read timeout (reg %x)\n", reg);</div><div class='ctx'> 	return 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -522,8 +506,8 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)</div><div class='ctx'> 		atiixp_read(chip, CMD);</div><div class='ctx'> 		mdelay(1);</div><div class='ctx'> 		atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);</div><div class='del'>-		if (--timeout) {</div><div class='del'>-			snd_printk(KERN_ERR "atiixp: codec reset timeout\n");</div><div class='add'>+		if (!--timeout) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "codec reset timeout\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -535,7 +519,6 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static int snd_atiixp_aclink_down(struct atiixp *chip)</div><div class='ctx'> {</div><div class='ctx'> 	// if (atiixp_read(chip, MODEM_MIRROR) &amp; 0x1) /* modem running, too? */</div><div class='hunk'>@@ -545,7 +528,6 @@ static int snd_atiixp_aclink_down(struct atiixp *chip)</div><div class='ctx'> 		     ATI_REG_CMD_POWERDOWN);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * auto-detection of codecs</div><div class='hunk'>@@ -561,21 +543,21 @@ static int snd_atiixp_aclink_down(struct atiixp *chip)</div><div class='ctx'> 	     ATI_REG_ISR_CODEC2_NOT_READY)</div><div class='ctx'> #define CODEC_CHECK_BITS (ALL_CODEC_NOT_READY|ATI_REG_ISR_NEW_FRAME)</div><div class='ctx'> </div><div class='del'>-static int __devinit ac97_probing_bugs(struct pci_dev *pci)</div><div class='add'>+static int ac97_probing_bugs(struct pci_dev *pci)</div><div class='ctx'> {</div><div class='ctx'> 	const struct snd_pci_quirk *q;</div><div class='ctx'> </div><div class='ctx'> 	q = snd_pci_quirk_lookup(pci, atiixp_quirks);</div><div class='ctx'> 	if (q) {</div><div class='del'>-		snd_printdd(KERN_INFO "Atiixp quirk for %s.  "</div><div class='del'>-			    "Forcing codec %d\n", q-&gt;name, q-&gt;value);</div><div class='add'>+		dev_dbg(&amp;pci-&gt;dev, "atiixp quirk for %s.  Forcing codec %d\n",</div><div class='add'>+			snd_pci_quirk_name(q), q-&gt;value);</div><div class='ctx'> 		return q-&gt;value;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* this hardware doesn't need workarounds.  Probe for codec */</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_codec_detect(struct atiixp *chip)</div><div class='add'>+static int snd_atiixp_codec_detect(struct atiixp *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int timeout;</div><div class='ctx'> </div><div class='hunk'>@@ -599,7 +581,7 @@ static int __devinit snd_atiixp_codec_detect(struct atiixp *chip)</div><div class='ctx'> 	atiixp_write(chip, IER, 0); /* disable irqs */</div><div class='ctx'> </div><div class='ctx'> 	if ((chip-&gt;codec_not_ready_bits &amp; ALL_CODEC_NOT_READY) == ALL_CODEC_NOT_READY) {</div><div class='del'>-		snd_printk(KERN_ERR "atiixp: no codec detected!\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "no codec detected!\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -675,7 +657,7 @@ static snd_pcm_uframes_t snd_atiixp_pcm_pointer(struct snd_pcm_substream *substr</div><div class='ctx'> 			continue;</div><div class='ctx'> 		return bytes_to_frames(runtime, curptr);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("atiixp: invalid DMA pointer read 0x%x (buf=%x)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "invalid DMA pointer read 0x%x (buf=%x)\n",</div><div class='ctx'> 		   readl(chip-&gt;remap_addr + dma-&gt;ops-&gt;dt_cur), dma-&gt;buf_addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -687,8 +669,8 @@ static void snd_atiixp_xrun_dma(struct atiixp *chip, struct atiixp_dma *dma)</div><div class='ctx'> {</div><div class='ctx'> 	if (! dma-&gt;substream || ! dma-&gt;running)</div><div class='ctx'> 		return;</div><div class='del'>-	snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma-&gt;ops-&gt;type);</div><div class='del'>-	snd_pcm_stop(dma-&gt;substream, SNDRV_PCM_STATE_XRUN);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "XRUN detected (DMA %d)\n", dma-&gt;ops-&gt;type);</div><div class='add'>+	snd_pcm_stop_xrun(dma-&gt;substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -728,11 +710,15 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		       !dma-&gt;ops-&gt;flush_dma))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='add'>+		if (dma-&gt;running &amp;&amp; dma-&gt;suspended &amp;&amp;</div><div class='add'>+		    cmd == SNDRV_PCM_TRIGGER_RESUME)</div><div class='add'>+			writel(dma-&gt;saved_curptr, chip-&gt;remap_addr +</div><div class='add'>+			       dma-&gt;ops-&gt;dt_cur);</div><div class='ctx'> 		dma-&gt;ops-&gt;enable_transfer(chip, 1);</div><div class='ctx'> 		dma-&gt;running = 1;</div><div class='ctx'> 		dma-&gt;suspended = 0;</div><div class='hunk'>@@ -740,9 +726,12 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='add'>+		dma-&gt;suspended = cmd == SNDRV_PCM_TRIGGER_SUSPEND;</div><div class='add'>+		if (dma-&gt;running &amp;&amp; dma-&gt;suspended)</div><div class='add'>+			dma-&gt;saved_curptr = readl(chip-&gt;remap_addr +</div><div class='add'>+						  dma-&gt;ops-&gt;dt_cur);</div><div class='ctx'> 		dma-&gt;ops-&gt;enable_transfer(chip, 0);</div><div class='ctx'> 		dma-&gt;running = 0;</div><div class='del'>-		dma-&gt;suspended = cmd == SNDRV_PCM_TRIGGER_SUSPEND;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -755,7 +744,6 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 			snd_atiixp_check_bus_busy(chip);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -869,7 +857,7 @@ static int snd_atiixp_spdif_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (chip-&gt;spdif_over_aclink) {</div><div class='ctx'> 		unsigned int data;</div><div class='ctx'> 		/* enable slots 10/11 */</div><div class='hunk'>@@ -887,7 +875,6 @@ static int snd_atiixp_spdif_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		atiixp_update(chip, CMD, ATI_REG_CMD_SPDF_CONFIG_MASK, 0);</div><div class='ctx'> 		atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_SPDF, 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -897,21 +884,21 @@ static int snd_atiixp_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	data = atiixp_read(chip, OUT_DMA_SLOT) &amp; ~ATI_REG_OUT_DMA_SLOT_MASK;</div><div class='ctx'> 	switch (substream-&gt;runtime-&gt;channels) {</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		data |= ATI_REG_OUT_DMA_SLOT_BIT(10) |</div><div class='ctx'> 			ATI_REG_OUT_DMA_SLOT_BIT(11);</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		data |= ATI_REG_OUT_DMA_SLOT_BIT(7) |</div><div class='ctx'> 			ATI_REG_OUT_DMA_SLOT_BIT(8);</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		data |= ATI_REG_OUT_DMA_SLOT_BIT(6) |</div><div class='ctx'> 			ATI_REG_OUT_DMA_SLOT_BIT(9);</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	default:</div><div class='ctx'> 		data |= ATI_REG_OUT_DMA_SLOT_BIT(3) |</div><div class='ctx'> 			ATI_REG_OUT_DMA_SLOT_BIT(4);</div><div class='hunk'>@@ -932,7 +919,6 @@ static int snd_atiixp_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	atiixp_update(chip, 6CH_REORDER, ATI_REG_6CH_REORDER_EN,</div><div class='ctx'> 		      substream-&gt;runtime-&gt;channels &gt;= 6 ? ATI_REG_6CH_REORDER_EN: 0);</div><div class='ctx'>     </div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -941,11 +927,10 @@ static int snd_atiixp_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_IN,</div><div class='ctx'> 		      substream-&gt;runtime-&gt;format == SNDRV_PCM_FORMAT_S16_LE ?</div><div class='ctx'> 		      ATI_REG_CMD_INTERLEAVE_IN : 0);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -959,9 +944,6 @@ static int snd_atiixp_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct atiixp_dma *dma = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	dma-&gt;buf_addr = substream-&gt;runtime-&gt;dma_addr;</div><div class='ctx'> 	dma-&gt;buf_bytes = params_buffer_bytes(hw_params);</div><div class='ctx'> </div><div class='hunk'>@@ -1001,7 +983,6 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 		dma-&gt;pcm_open_flag = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	atiixp_clear_dma_packets(chip, dma, substream);</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1009,7 +990,7 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> /*</div><div class='ctx'>  * pcm hardware definition, identical for all DMA types</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_hardware snd_atiixp_pcm_hw =</div><div class='add'>+static const struct snd_pcm_hardware snd_atiixp_pcm_hw =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1051,14 +1032,15 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> 		/* direct SPDIF */</div><div class='ctx'> 		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;private_data = dma;</div><div class='ctx'> </div><div class='ctx'> 	/* enable DMA bits */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='add'>+	}</div><div class='ctx'> 	dma-&gt;opened = 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1071,9 +1053,9 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* disable DMA bits */</div><div class='ctx'> 	if (snd_BUG_ON(!dma-&gt;ops || !dma-&gt;ops-&gt;enable_dma))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='add'>+	}</div><div class='ctx'> 	dma-&gt;substream = NULL;</div><div class='ctx'> 	dma-&gt;opened = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1086,9 +1068,8 @@ static int snd_atiixp_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	err = snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK], 0);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	substream-&gt;runtime-&gt;hw.channels_max = chip-&gt;max_channels;</div><div class='hunk'>@@ -1102,11 +1083,9 @@ static int snd_atiixp_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> static int snd_atiixp_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	err = snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	return snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_atiixp_capture_open(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1124,34 +1103,29 @@ static int snd_atiixp_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> static int snd_atiixp_spdif_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	if (chip-&gt;spdif_over_aclink) /* share DMA_PLAYBACK */</div><div class='del'>-		err = snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK], 2);</div><div class='add'>+		return snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK], 2);</div><div class='ctx'> 	else</div><div class='del'>-		err = snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_SPDIF], -1);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return err;</div><div class='add'>+		return snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_SPDIF], -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_atiixp_spdif_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	if (chip-&gt;spdif_over_aclink)</div><div class='del'>-		err = snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='add'>+		return snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='ctx'> 	else</div><div class='del'>-		err = snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_SPDIF]);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return err;</div><div class='add'>+		return snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_SPDIF]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* AC97 playback */</div><div class='del'>-static struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='ctx'> 	.open =		snd_atiixp_playback_open,</div><div class='ctx'> 	.close =	snd_atiixp_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_atiixp_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_atiixp_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_atiixp_playback_prepare,</div><div class='hunk'>@@ -1160,10 +1134,9 @@ static struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* AC97 capture */</div><div class='del'>-static struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='ctx'> 	.open =		snd_atiixp_capture_open,</div><div class='ctx'> 	.close =	snd_atiixp_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_atiixp_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_atiixp_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_atiixp_capture_prepare,</div><div class='hunk'>@@ -1172,10 +1145,9 @@ static struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SPDIF playback */</div><div class='del'>-static struct snd_pcm_ops snd_atiixp_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_atiixp_spdif_ops = {</div><div class='ctx'> 	.open =		snd_atiixp_spdif_open,</div><div class='ctx'> 	.close =	snd_atiixp_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_atiixp_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_atiixp_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_atiixp_spdif_prepare,</div><div class='hunk'>@@ -1183,7 +1155,7 @@ static struct snd_pcm_ops snd_atiixp_spdif_ops = {</div><div class='ctx'> 	.pointer =	snd_atiixp_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ac97_pcm atiixp_pcm_defs[] __devinitdata = {</div><div class='add'>+static const struct ac97_pcm atiixp_pcm_defs[] = {</div><div class='ctx'> 	/* front PCM */</div><div class='ctx'> 	{</div><div class='ctx'> 		.exclusive = 1,</div><div class='hunk'>@@ -1219,7 +1191,7 @@ static struct ac97_pcm atiixp_pcm_defs[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='add'>+static const struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='ctx'> 	.type = ATI_DMA_PLAYBACK,</div><div class='ctx'> 	.llp_offset = ATI_REG_OUT_DMA_LINKPTR,</div><div class='ctx'> 	.dt_cur = ATI_REG_OUT_DMA_DT_CUR,</div><div class='hunk'>@@ -1228,7 +1200,7 @@ static struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='ctx'> 	.flush_dma = atiixp_out_flush_dma,</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='add'>+static const struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='ctx'> 	.type = ATI_DMA_CAPTURE,</div><div class='ctx'> 	.llp_offset = ATI_REG_IN_DMA_LINKPTR,</div><div class='ctx'> 	.dt_cur = ATI_REG_IN_DMA_DT_CUR,</div><div class='hunk'>@@ -1237,7 +1209,7 @@ static struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='ctx'> 	.flush_dma = atiixp_in_flush_dma,</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static struct atiixp_dma_ops snd_atiixp_spdif_dma_ops = {</div><div class='add'>+static const struct atiixp_dma_ops snd_atiixp_spdif_dma_ops = {</div><div class='ctx'> 	.type = ATI_DMA_SPDIF,</div><div class='ctx'> 	.llp_offset = ATI_REG_SPDF_DMA_LINKPTR,</div><div class='ctx'> 	.dt_cur = ATI_REG_SPDF_DMA_DT_CUR,</div><div class='hunk'>@@ -1247,9 +1219,10 @@ static struct atiixp_dma_ops snd_atiixp_spdif_dma_ops = {</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_pcm_new(struct atiixp *chip)</div><div class='add'>+static int snd_atiixp_pcm_new(struct atiixp *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='add'>+	struct snd_pcm_chmap *chmap;</div><div class='ctx'> 	struct snd_ac97_bus *pbus = chip-&gt;ac97_bus;</div><div class='ctx'> 	int err, i, num_pcms;</div><div class='ctx'> </div><div class='hunk'>@@ -1286,12 +1259,19 @@ static int __devinit snd_atiixp_pcm_new(struct atiixp *chip)</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_atiixp_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_atiixp_capture_ops);</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "ATI IXP AC97");</div><div class='add'>+	strscpy(pcm-&gt;name, "ATI IXP AC97");</div><div class='ctx'> 	chip-&gt;pcmdevs[ATI_PCMDEV_ANALOG] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_alt_chmaps, chip-&gt;max_channels, 0,</div><div class='add'>+				     &amp;chmap);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	chmap-&gt;channel_mask = SND_PCM_CHMAP_MASK_2468;</div><div class='add'>+	chip-&gt;ac97[0]-&gt;chmaps[SNDRV_PCM_STREAM_PLAYBACK] = chmap;</div><div class='ctx'> </div><div class='ctx'> 	/* no SPDIF support on codec? */</div><div class='ctx'> 	if (chip-&gt;pcms[ATI_PCM_SPDIF] &amp;&amp; ! chip-&gt;pcms[ATI_PCM_SPDIF]-&gt;rates)</div><div class='hunk'>@@ -1309,14 +1289,13 @@ static int __devinit snd_atiixp_pcm_new(struct atiixp *chip)</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_atiixp_spdif_ops);</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	if (chip-&gt;spdif_over_aclink)</div><div class='del'>-		strcpy(pcm-&gt;name, "ATI IXP IEC958 (AC97)");</div><div class='add'>+		strscpy(pcm-&gt;name, "ATI IXP IEC958 (AC97)");</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(pcm-&gt;name, "ATI IXP IEC958 (Direct)");</div><div class='add'>+		strscpy(pcm-&gt;name, "ATI IXP IEC958 (Direct)");</div><div class='ctx'> 	chip-&gt;pcmdevs[ATI_PCMDEV_DIGITAL] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	/* pre-select AC97 SPDIF slots 10/11 */</div><div class='ctx'> 	for (i = 0; i &lt; NUM_ATI_CODECS; i++) {</div><div class='hunk'>@@ -1364,10 +1343,9 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (status &amp; CODEC_CHECK_BITS) {</div><div class='ctx'> 		unsigned int detected;</div><div class='ctx'> 		detected = status &amp; CODEC_CHECK_BITS;</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		chip-&gt;codec_not_ready_bits |= detected;</div><div class='ctx'> 		atiixp_update(chip, IER, detected, 0); /* disable the detected irqs */</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ack */</div><div class='hunk'>@@ -1381,7 +1359,7 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id)</div><div class='ctx'>  * ac97 mixer section</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='add'>+static const struct ac97_quirk ac97_quirks[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = 0x103c,</div><div class='ctx'> 		.subdevice = 0x006b,</div><div class='hunk'>@@ -1403,18 +1381,18 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_mixer_new(struct atiixp *chip, int clock,</div><div class='del'>-					  const char *quirk_override)</div><div class='add'>+static int snd_atiixp_mixer_new(struct atiixp *chip, int clock,</div><div class='add'>+				const char *quirk_override)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	int codec_count;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_atiixp_ac97_write,</div><div class='ctx'> 		.read = snd_atiixp_ac97_read,</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned int codec_skip[NUM_ATI_CODECS] = {</div><div class='add'>+	static const unsigned int codec_skip[NUM_ATI_CODECS] = {</div><div class='ctx'> 		ATI_REG_ISR_CODEC0_NOT_READY,</div><div class='ctx'> 		ATI_REG_ISR_CODEC1_NOT_READY,</div><div class='ctx'> 		ATI_REG_ISR_CODEC2_NOT_READY,</div><div class='hunk'>@@ -1423,7 +1401,8 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp *chip, int clock,</div><div class='ctx'> 	if (snd_atiixp_codec_detect(chip) &lt; 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pbus-&gt;clock = clock;</div><div class='ctx'> 	chip-&gt;ac97_bus = pbus;</div><div class='hunk'>@@ -1439,16 +1418,18 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp *chip, int clock,</div><div class='ctx'> 		ac97.scaps = AC97_SCAP_SKIP_MODEM | AC97_SCAP_POWER_SAVE;</div><div class='ctx'> 		if (! chip-&gt;spdif_over_aclink)</div><div class='ctx'> 			ac97.scaps |= AC97_SCAP_NO_SPDIF;</div><div class='del'>-		if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i])) &lt; 0) {</div><div class='add'>+		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i]);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			chip-&gt;ac97[i] = NULL; /* to be sure */</div><div class='del'>-			snd_printdd("atiixp: codec %d not available for audio\n", i);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec %d not available for audio\n", i);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		codec_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (! codec_count) {</div><div class='del'>-		snd_printk(KERN_ERR "atiixp: no codec available\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "no codec available\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1458,52 +1439,29 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp *chip, int clock,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * power management</div><div class='ctx'>  */</div><div class='del'>-static int snd_atiixp_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_atiixp_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atiixp *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; NUM_ATI_PCMDEVS; i++)</div><div class='del'>-		if (chip-&gt;pcmdevs[i]) {</div><div class='del'>-			struct atiixp_dma *dma = &amp;chip-&gt;dmas[i];</div><div class='del'>-			if (dma-&gt;substream &amp;&amp; dma-&gt;running)</div><div class='del'>-				dma-&gt;saved_curptr = readl(chip-&gt;remap_addr +</div><div class='del'>-							  dma-&gt;ops-&gt;dt_cur);</div><div class='del'>-			snd_pcm_suspend_all(chip-&gt;pcmdevs[i]);</div><div class='del'>-		}</div><div class='ctx'> 	for (i = 0; i &lt; NUM_ATI_CODECS; i++)</div><div class='ctx'> 		snd_ac97_suspend(chip-&gt;ac97[i]);</div><div class='ctx'> 	snd_atiixp_aclink_down(chip);</div><div class='ctx'> 	snd_atiixp_chip_stop(chip);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_atiixp_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_atiixp_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atiixp *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "atiixp: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_atiixp_aclink_reset(chip);</div><div class='ctx'> 	snd_atiixp_chip_start(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1518,18 +1476,15 @@ static int snd_atiixp_resume(struct pci_dev *pci)</div><div class='ctx'> 				dma-&gt;substream-&gt;ops-&gt;prepare(dma-&gt;substream);</div><div class='ctx'> 				writel((u32)dma-&gt;desc_buf.addr | ATI_REG_LINKPTR_EN,</div><div class='ctx'> 				       chip-&gt;remap_addr + dma-&gt;ops-&gt;llp_offset);</div><div class='del'>-				writel(dma-&gt;saved_curptr, chip-&gt;remap_addr +</div><div class='del'>-				       dma-&gt;ops-&gt;dt_cur);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface for register dump</div><div class='ctx'>  */</div><div class='hunk'>@@ -1544,134 +1499,89 @@ static void snd_atiixp_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		snd_iprintf(buffer, "%02x: %08x\n", i, readl(chip-&gt;remap_addr + i));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_atiixp_proc_init(struct atiixp *chip)</div><div class='add'>+static void snd_atiixp_proc_init(struct atiixp *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "atiixp", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "atiixp", chip, snd_atiixp_proc_read);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-#define snd_atiixp_proc_init(chip)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * destructor</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_atiixp_free(struct atiixp *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;irq &lt; 0)</div><div class='del'>-		goto __hw_end;</div><div class='del'>-	snd_atiixp_chip_stop(chip);</div><div class='del'>-</div><div class='del'>-      __hw_end:</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;remap_addr)</div><div class='del'>-		iounmap(chip-&gt;remap_addr);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_atiixp_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_atiixp_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct atiixp *chip = device-&gt;device_data;</div><div class='del'>-	return snd_atiixp_free(chip);</div><div class='add'>+	snd_atiixp_chip_stop(card-&gt;private_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * constructor for chip instance</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_atiixp_create(struct snd_card *card,</div><div class='del'>-				      struct pci_dev *pci,</div><div class='del'>-				      struct atiixp **r_chip)</div><div class='add'>+static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_atiixp_dev_free,</div><div class='del'>-	};</div><div class='del'>-	struct atiixp *chip;</div><div class='add'>+	struct atiixp *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='del'>-	if ((err = pci_request_regions(pci, "ATI IXP AC97")) &lt; 0) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		kfree(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;remap_addr = pcim_iomap_region(pci, 0, "ATI IXP AC97");</div><div class='add'>+	if (IS_ERR(chip-&gt;remap_addr))</div><div class='add'>+		return PTR_ERR(chip-&gt;remap_addr);</div><div class='ctx'> 	chip-&gt;addr = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;remap_addr = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (chip-&gt;remap_addr == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_atiixp_interrupt, IRQF_SHARED,</div><div class='del'>-			card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_atiixp_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_atiixp_free;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	*r_chip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_probe(struct pci_dev *pci,</div><div class='del'>-				     const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_atiixp_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct atiixp *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");</div><div class='del'>-	strcpy(card-&gt;shortname, "ATI IXP");</div><div class='del'>-	if ((err = snd_atiixp_create(card, pci, &amp;chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='add'>+	strscpy(card-&gt;driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");</div><div class='add'>+	strscpy(card-&gt;shortname, "ATI IXP");</div><div class='add'>+	err = snd_atiixp_init(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_aclink_reset(chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_aclink_reset(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;spdif_over_aclink = spdif_aclink;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_mixer_new(chip, ac97_clock, ac97_quirk)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_mixer_new(chip, ac97_clock, ac97_quirk);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_pcm_new(chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_pcm_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_atiixp_proc_init(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1683,44 +1593,27 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,</div><div class='ctx'> 		 chip-&gt;ac97[0] ? snd_ac97_get_short_name(chip-&gt;ac97[0]) : "?",</div><div class='ctx'> 		 chip-&gt;addr, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- __error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_atiixp_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_atiixp_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_atiixp_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ATI IXP AC97 controller",</div><div class='add'>+static struct pci_driver atiixp_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_atiixp_ids,</div><div class='ctx'> 	.probe = snd_atiixp_probe,</div><div class='del'>-	.remove = __devexit_p(snd_atiixp_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_atiixp_suspend,</div><div class='del'>-	.resume = snd_atiixp_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_atiixp_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init alsa_card_atiixp_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_atiixp_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_atiixp_init)</div><div class='del'>-module_exit(alsa_card_atiixp_exit)</div><div class='add'>+module_pci_driver(atiixp_driver);</div><div class='head'>diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c<br/>index 91d7036b6411..91f31e2ad3d3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/atiixp_modem.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/atiixp_modem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/atiixp_modem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/atiixp_modem.c</a></div><div class='hunk'>@@ -1,31 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ATI IXP 150/200/250 AC97 modem controllers</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -37,7 +23,6 @@</div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ATI IXP MC97 controller");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ATI,IXP150/200/250}}");</div><div class='ctx'> </div><div class='ctx'> static int index = -2; /* Exclude the first card */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='hunk'>@@ -51,7 +36,7 @@ module_param(ac97_clock, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");</div><div class='ctx'> </div><div class='ctx'> /* just for backward compatibility */</div><div class='del'>-static int enable;</div><div class='add'>+static bool enable;</div><div class='ctx'> module_param(enable, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -183,10 +168,10 @@ struct atiixp_modem;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> struct atiixp_dma_desc {</div><div class='del'>-	u32 addr;	/* DMA buffer address */</div><div class='add'>+	__le32 addr;	/* DMA buffer address */</div><div class='ctx'> 	u16 status;	/* status bits */</div><div class='ctx'> 	u16 size;	/* size of the packet in dwords */</div><div class='del'>-	u32 next;	/* address of the next packet descriptor */</div><div class='add'>+	__le32 next;	/* address of the next packet descriptor */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -261,7 +246,7 @@ struct atiixp_modem {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {</div><div class='add'>+static const struct pci_device_id snd_atiixp_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */</div><div class='ctx'> 	{ PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -329,13 +314,12 @@ static int atiixp_build_dma_packets(struct atiixp_modem *chip,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 addr, desc_addr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (periods &gt; ATI_MAX_DESCRIPTORS)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (dma-&gt;desc_buf.area == NULL) {</div><div class='del'>-		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='ctx'> 					ATI_DESC_LIST_SIZE, &amp;dma-&gt;desc_buf) &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		dma-&gt;period_bytes = dma-&gt;periods = 0; /* clear */</div><div class='hunk'>@@ -345,11 +329,11 @@ static int atiixp_build_dma_packets(struct atiixp_modem *chip,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* reset DMA before changing the descriptor table */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	writel(0, chip-&gt;remap_addr + dma-&gt;ops-&gt;llp_offset);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		writel(0, chip-&gt;remap_addr + dma-&gt;ops-&gt;llp_offset);</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* fill the entries */</div><div class='ctx'> 	addr = (u32)substream-&gt;runtime-&gt;dma_addr;</div><div class='hunk'>@@ -400,7 +384,7 @@ static int snd_atiixp_acquire_codec(struct atiixp_modem *chip)</div><div class='ctx'> </div><div class='ctx'> 	while (atiixp_read(chip, PHYS_OUT_ADDR) &amp; ATI_REG_PHYS_OUT_ADDR_EN) {</div><div class='ctx'> 		if (! timeout--) {</div><div class='del'>-			snd_printk(KERN_WARNING "atiixp-modem: codec acquire timeout\n");</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev, "codec acquire timeout\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		udelay(1);</div><div class='hunk'>@@ -433,7 +417,7 @@ static unsigned short snd_atiixp_codec_read(struct atiixp_modem *chip,</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> 	/* time out may happen during reset */</div><div class='ctx'> 	if (reg &lt; 0x7c)</div><div class='del'>-		snd_printk(KERN_WARNING "atiixp-modem: codec read timeout (reg %x)\n", reg);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "codec read timeout (reg %x)\n", reg);</div><div class='ctx'> 	return 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -498,8 +482,8 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)</div><div class='ctx'> 		atiixp_read(chip, CMD);</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 		atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);</div><div class='del'>-		if (--timeout) {</div><div class='del'>-			snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");</div><div class='add'>+		if (!--timeout) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "codec reset timeout\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -511,7 +495,6 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static int snd_atiixp_aclink_down(struct atiixp_modem *chip)</div><div class='ctx'> {</div><div class='ctx'> 	// if (atiixp_read(chip, MODEM_MIRROR) &amp; 0x1) /* modem running, too? */</div><div class='hunk'>@@ -521,7 +504,6 @@ static int snd_atiixp_aclink_down(struct atiixp_modem *chip)</div><div class='ctx'> 		     ATI_REG_CMD_POWERDOWN);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * auto-detection of codecs</div><div class='hunk'>@@ -553,7 +535,7 @@ static int snd_atiixp_codec_detect(struct atiixp_modem *chip)</div><div class='ctx'> 	atiixp_write(chip, IER, 0); /* disable irqs */</div><div class='ctx'> </div><div class='ctx'> 	if ((chip-&gt;codec_not_ready_bits &amp; ALL_CODEC_NOT_READY) == ALL_CODEC_NOT_READY) {</div><div class='del'>-		snd_printk(KERN_ERR "atiixp-modem: no codec detected!\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "no codec detected!\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -624,7 +606,7 @@ static snd_pcm_uframes_t snd_atiixp_pcm_pointer(struct snd_pcm_substream *substr</div><div class='ctx'> 			continue;</div><div class='ctx'> 		return bytes_to_frames(runtime, curptr);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("atiixp-modem: invalid DMA pointer read 0x%x (buf=%x)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "invalid DMA pointer read 0x%x (buf=%x)\n",</div><div class='ctx'> 		   readl(chip-&gt;remap_addr + dma-&gt;ops-&gt;dt_cur), dma-&gt;buf_addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -637,8 +619,8 @@ static void snd_atiixp_xrun_dma(struct atiixp_modem *chip,</div><div class='ctx'> {</div><div class='ctx'> 	if (! dma-&gt;substream || ! dma-&gt;running)</div><div class='ctx'> 		return;</div><div class='del'>-	snd_printdd("atiixp-modem: XRUN detected (DMA %d)\n", dma-&gt;ops-&gt;type);</div><div class='del'>-	snd_pcm_stop(dma-&gt;substream, SNDRV_PCM_STATE_XRUN);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "XRUN detected (DMA %d)\n", dma-&gt;ops-&gt;type);</div><div class='add'>+	snd_pcm_stop_xrun(dma-&gt;substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -678,7 +660,7 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		       !dma-&gt;ops-&gt;flush_dma))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		dma-&gt;ops-&gt;enable_transfer(chip, 1);</div><div class='hunk'>@@ -699,7 +681,6 @@ static int snd_atiixp_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		snd_atiixp_check_bus_busy(chip);</div><div class='ctx'> 	}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -770,13 +751,12 @@ static int snd_atiixp_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atiixp_modem *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* set output threshold */</div><div class='ctx'> 	data = atiixp_read(chip, MODEM_OUT_FIFO);</div><div class='ctx'> 	data &amp;= ~ATI_REG_MODEM_OUT1_DMA_THRESHOLD_MASK;</div><div class='ctx'> 	data |= 0x04 &lt;&lt; ATI_REG_MODEM_OUT1_DMA_THRESHOLD_SHIFT;</div><div class='ctx'> 	atiixp_write(chip, MODEM_OUT_FIFO, data);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -797,9 +777,6 @@ static int snd_atiixp_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	dma-&gt;buf_addr = substream-&gt;runtime-&gt;dma_addr;</div><div class='ctx'> 	dma-&gt;buf_bytes = params_buffer_bytes(hw_params);</div><div class='ctx'> </div><div class='hunk'>@@ -826,7 +803,6 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct atiixp_dma *dma = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	atiixp_clear_dma_packets(chip, dma, substream);</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -834,7 +810,7 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> /*</div><div class='ctx'>  * pcm hardware definition, identical for all DMA types</div><div class='ctx'>  */</div><div class='del'>-static struct snd_pcm_hardware snd_atiixp_pcm_hw =</div><div class='add'>+static const struct snd_pcm_hardware snd_atiixp_pcm_hw =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -860,8 +836,8 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct atiixp_modem *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='del'>-	static unsigned int rates[] = { 8000,  9600, 12000, 16000 };</div><div class='del'>-	static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+	static const unsigned int rates[] = { 8000,  9600, 12000, 16000 };</div><div class='add'>+	static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 		.count = ARRAY_SIZE(rates),</div><div class='ctx'> 		.list = rates,</div><div class='ctx'> 		.mask = 0,</div><div class='hunk'>@@ -875,19 +851,19 @@ static int snd_atiixp_pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> 	dma-&gt;substream = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_atiixp_pcm_hw;</div><div class='ctx'> 	dma-&gt;ac97_pcm_type = pcm_type;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='del'>-					      SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-					      &amp;hw_constraints_rates)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+					 &amp;hw_constraints_rates);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime,</div><div class='del'>-						 SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;private_data = dma;</div><div class='ctx'> </div><div class='ctx'> 	/* enable DMA bits */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 1);</div><div class='add'>+	}</div><div class='ctx'> 	dma-&gt;opened = 1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -900,9 +876,9 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* disable DMA bits */</div><div class='ctx'> 	if (snd_BUG_ON(!dma-&gt;ops || !dma-&gt;ops-&gt;enable_dma))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		dma-&gt;ops-&gt;enable_dma(chip, 0);</div><div class='add'>+	}</div><div class='ctx'> 	dma-&gt;substream = NULL;</div><div class='ctx'> 	dma-&gt;opened = 0;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -913,24 +889,17 @@ static int snd_atiixp_pcm_close(struct snd_pcm_substream *substream,</div><div class='ctx'> static int snd_atiixp_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp_modem *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	err = snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK], 0);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	return snd_atiixp_pcm_open(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK], 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_atiixp_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct atiixp_modem *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	err = snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	return snd_atiixp_pcm_close(substream, &amp;chip-&gt;dmas[ATI_DMA_PLAYBACK]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_atiixp_capture_open(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -947,10 +916,9 @@ static int snd_atiixp_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* AC97 playback */</div><div class='del'>-static struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='ctx'> 	.open =		snd_atiixp_playback_open,</div><div class='ctx'> 	.close =	snd_atiixp_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_atiixp_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_atiixp_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_atiixp_playback_prepare,</div><div class='hunk'>@@ -959,10 +927,9 @@ static struct snd_pcm_ops snd_atiixp_playback_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* AC97 capture */</div><div class='del'>-static struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='ctx'> 	.open =		snd_atiixp_capture_open,</div><div class='ctx'> 	.close =	snd_atiixp_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_atiixp_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_atiixp_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_atiixp_capture_prepare,</div><div class='hunk'>@@ -970,7 +937,7 @@ static struct snd_pcm_ops snd_atiixp_capture_ops = {</div><div class='ctx'> 	.pointer =	snd_atiixp_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='add'>+static const struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='ctx'> 	.type = ATI_DMA_PLAYBACK,</div><div class='ctx'> 	.llp_offset = ATI_REG_MODEM_OUT_DMA1_LINKPTR,</div><div class='ctx'> 	.dt_cur = ATI_REG_MODEM_OUT_DMA1_DT_CUR,</div><div class='hunk'>@@ -979,7 +946,7 @@ static struct atiixp_dma_ops snd_atiixp_playback_dma_ops = {</div><div class='ctx'> 	.flush_dma = atiixp_out_flush_dma,</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='add'>+static const struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='ctx'> 	.type = ATI_DMA_CAPTURE,</div><div class='ctx'> 	.llp_offset = ATI_REG_MODEM_IN_DMA_LINKPTR,</div><div class='ctx'> 	.dt_cur = ATI_REG_MODEM_IN_DMA_DT_CUR,</div><div class='hunk'>@@ -988,7 +955,7 @@ static struct atiixp_dma_ops snd_atiixp_capture_dma_ops = {</div><div class='ctx'> 	.flush_dma = atiixp_in_flush_dma,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_pcm_new(struct atiixp_modem *chip)</div><div class='add'>+static int snd_atiixp_pcm_new(struct atiixp_modem *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1005,12 +972,11 @@ static int __devinit snd_atiixp_pcm_new(struct atiixp_modem *chip)</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_atiixp_capture_ops);</div><div class='ctx'> 	pcm-&gt;dev_class = SNDRV_PCM_CLASS_MODEM;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, "ATI IXP MC97");</div><div class='add'>+	strscpy(pcm-&gt;name, "ATI IXP MC97");</div><div class='ctx'> 	chip-&gt;pcmdevs[ATI_PCMDEV_ANALOG] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1044,10 +1010,9 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (status &amp; CODEC_CHECK_BITS) {</div><div class='ctx'> 		unsigned int detected;</div><div class='ctx'> 		detected = status &amp; CODEC_CHECK_BITS;</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		chip-&gt;codec_not_ready_bits |= detected;</div><div class='ctx'> 		atiixp_update(chip, IER, detected, 0); /* disable the detected irqs */</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ack */</div><div class='hunk'>@@ -1061,17 +1026,17 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id)</div><div class='ctx'>  * ac97 mixer section</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)</div><div class='add'>+static int snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	int codec_count;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_atiixp_ac97_write,</div><div class='ctx'> 		.read = snd_atiixp_ac97_read,</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned int codec_skip[NUM_ATI_CODECS] = {</div><div class='add'>+	static const unsigned int codec_skip[NUM_ATI_CODECS] = {</div><div class='ctx'> 		ATI_REG_ISR_CODEC0_NOT_READY,</div><div class='ctx'> 		ATI_REG_ISR_CODEC1_NOT_READY,</div><div class='ctx'> 		ATI_REG_ISR_CODEC2_NOT_READY,</div><div class='hunk'>@@ -1080,7 +1045,8 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)</div><div class='ctx'> 	if (snd_atiixp_codec_detect(chip) &lt; 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pbus-&gt;clock = clock;</div><div class='ctx'> 	chip-&gt;ac97_bus = pbus;</div><div class='hunk'>@@ -1094,16 +1060,18 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)</div><div class='ctx'> 		ac97.pci = chip-&gt;pci;</div><div class='ctx'> 		ac97.num = i;</div><div class='ctx'> 		ac97.scaps = AC97_SCAP_SKIP_AUDIO | AC97_SCAP_POWER_SAVE;</div><div class='del'>-		if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i])) &lt; 0) {</div><div class='add'>+		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i]);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			chip-&gt;ac97[i] = NULL; /* to be sure */</div><div class='del'>-			snd_printdd("atiixp-modem: codec %d not available for modem\n", i);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec %d not available for modem\n", i);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> 		codec_count++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (! codec_count) {</div><div class='del'>-		snd_printk(KERN_ERR "atiixp-modem: no codec available\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "no codec available\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1113,46 +1081,29 @@ static int __devinit snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * power management</div><div class='ctx'>  */</div><div class='del'>-static int snd_atiixp_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_atiixp_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atiixp_modem *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; NUM_ATI_PCMDEVS; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcmdevs[i]);</div><div class='ctx'> 	for (i = 0; i &lt; NUM_ATI_CODECS; i++)</div><div class='ctx'> 		snd_ac97_suspend(chip-&gt;ac97[i]);</div><div class='ctx'> 	snd_atiixp_aclink_down(chip);</div><div class='ctx'> 	snd_atiixp_chip_stop(chip);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_atiixp_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_atiixp_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atiixp_modem *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "atiixp-modem: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_atiixp_aclink_reset(chip);</div><div class='ctx'> 	snd_atiixp_chip_start(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1162,10 +1113,9 @@ static int snd_atiixp_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  * proc interface for register dump</div><div class='ctx'>  */</div><div class='hunk'>@@ -1180,132 +1130,88 @@ static void snd_atiixp_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 		snd_iprintf(buffer, "%02x: %08x\n", i, readl(chip-&gt;remap_addr + i));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_atiixp_proc_init(struct atiixp_modem *chip)</div><div class='add'>+static void snd_atiixp_proc_init(struct atiixp_modem *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "atiixp-modem", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "atiixp-modem", chip,</div><div class='add'>+			     snd_atiixp_proc_read);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define snd_atiixp_proc_init(chip)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * destructor</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_atiixp_free(struct atiixp_modem *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;irq &lt; 0)</div><div class='del'>-		goto __hw_end;</div><div class='del'>-	snd_atiixp_chip_stop(chip);</div><div class='del'>-</div><div class='del'>-      __hw_end:</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;remap_addr)</div><div class='del'>-		iounmap(chip-&gt;remap_addr);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_atiixp_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_atiixp_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct atiixp_modem *chip = device-&gt;device_data;</div><div class='del'>-	return snd_atiixp_free(chip);</div><div class='add'>+	snd_atiixp_chip_stop(card-&gt;private_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * constructor for chip instance</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_atiixp_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci,</div><div class='del'>-				       struct atiixp_modem **r_chip)</div><div class='add'>+static int snd_atiixp_init(struct snd_card *card, struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_atiixp_dev_free,</div><div class='del'>-	};</div><div class='del'>-	struct atiixp_modem *chip;</div><div class='add'>+	struct atiixp_modem *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='del'>-	if ((err = pci_request_regions(pci, "ATI IXP MC97")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;remap_addr = pcim_iomap_region(pci, 0, "ATI IXP MC97");</div><div class='add'>+	if (IS_ERR(chip-&gt;remap_addr))</div><div class='add'>+		return PTR_ERR(chip-&gt;remap_addr);</div><div class='ctx'> 	chip-&gt;addr = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;remap_addr = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (chip-&gt;remap_addr == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_atiixp_interrupt, IRQF_SHARED,</div><div class='del'>-			card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_atiixp_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_atiixp_free;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_atiixp_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*r_chip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_atiixp_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_atiixp_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct atiixp_modem *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ATIIXP-MODEM");</div><div class='del'>-	strcpy(card-&gt;shortname, "ATI IXP Modem");</div><div class='del'>-	if ((err = snd_atiixp_create(card, pci, &amp;chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='add'>+	strscpy(card-&gt;driver, "ATIIXP-MODEM");</div><div class='add'>+	strscpy(card-&gt;shortname, "ATI IXP Modem");</div><div class='add'>+	err = snd_atiixp_init(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_aclink_reset(chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_aclink_reset(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_mixer_new(chip, ac97_clock)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_mixer_new(chip, ac97_clock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_atiixp_pcm_new(chip)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_atiixp_pcm_new(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_atiixp_proc_init(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -1314,44 +1220,27 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s rev %x at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, pci-&gt;revision, chip-&gt;addr, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- __error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_atiixp_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_atiixp_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_atiixp_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ATI IXP MC97 controller",</div><div class='add'>+static struct pci_driver atiixp_modem_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_atiixp_ids,</div><div class='ctx'> 	.probe = snd_atiixp_probe,</div><div class='del'>-	.remove = __devexit_p(snd_atiixp_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_atiixp_suspend,</div><div class='del'>-	.resume = snd_atiixp_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_atiixp_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init alsa_card_atiixp_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_atiixp_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_atiixp_init)</div><div class='del'>-module_exit(alsa_card_atiixp_exit)</div><div class='add'>+module_pci_driver(atiixp_modem_driver);</div><div class='head'>diff --git a/sound/pci/au88x0/Makefile b/sound/pci/au88x0/Makefile<br/>index d0a66bc5d4a7..5ec5abdee28d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='del'>-snd-au8810-objs := au8810.o</div><div class='del'>-snd-au8820-objs := au8820.o</div><div class='del'>-snd-au8830-objs := au8830.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+snd-au8810-y := au8810.o</div><div class='add'>+snd-au8820-y := au8820.o</div><div class='add'>+snd-au8830-y := au8830.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_AU8810) += snd-au8810.o</div><div class='ctx'> obj-$(CONFIG_SND_AU8820) += snd-au8820.o</div><div class='head'>diff --git a/sound/pci/au88x0/au8810.c b/sound/pci/au88x0/au8810.c<br/>index aa51cc7771dd..b2bfa50bfe30 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8810.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8810.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8810.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8810.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include "au8810.h"</div><div class='ctx'> #include "au88x0.h"</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {</div><div class='add'>+static const struct pci_device_id snd_vortex_ids[] = {</div><div class='ctx'> 	{PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/pci/au88x0/au8810.h b/sound/pci/au88x0/au8810.h<br/>index 5d69c31fe3f4..94f11032067e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8810.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8810.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8810.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8810.h</a></div><div class='hunk'>@@ -1,10 +1,11 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>     Aureal Advantage Soundcard driver.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define CHIP_AU8810</div><div class='ctx'> </div><div class='del'>-#define CARD_NAME "Aureal Advantage 3D Sound Processor"</div><div class='add'>+#define CARD_NAME "Aureal Advantage"</div><div class='ctx'> #define CARD_NAME_SHORT "au8810"</div><div class='ctx'> </div><div class='ctx'> #define NR_ADB		0x10</div><div class='head'>diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c<br/>index 2f321e7306cd..dbc2263b49c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8820.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8820.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8820.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8820.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include "au8820.h"</div><div class='ctx'> #include "au88x0.h"</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {</div><div class='add'>+static const struct pci_device_id snd_vortex_ids[] = {</div><div class='ctx'> 	{PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/pci/au88x0/au8820.h b/sound/pci/au88x0/au8820.h<br/>index abbe85e4f7a9..8a128e8febbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8820.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8820.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8820.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8820.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>     Aureal Vortex Soundcard driver.</div><div class='ctx'> </div><div class='hunk'>@@ -11,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #define CHIP_AU8820</div><div class='ctx'> </div><div class='del'>-#define CARD_NAME "Aureal Vortex 3D Sound Processor"</div><div class='add'>+#define CARD_NAME "Aureal Vortex"</div><div class='ctx'> #define CARD_NAME_SHORT "au8820"</div><div class='ctx'> </div><div class='ctx'> /* Number of ADB and WT channels */</div><div class='head'>diff --git a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c<br/>index 279b78f06d22..e963c4e2f026 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8830.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8830.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8830.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8830.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include "au8830.h"</div><div class='ctx'> #include "au88x0.h"</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_vortex_ids) = {</div><div class='add'>+static const struct pci_device_id snd_vortex_ids[] = {</div><div class='ctx'> 	{PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/pci/au88x0/au8830.h b/sound/pci/au88x0/au8830.h<br/>index 04ece1b1c218..40f671ffd45a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8830.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au8830.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au8830.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au8830.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>     Aureal Vortex Soundcard driver.</div><div class='ctx'> </div><div class='hunk'>@@ -11,7 +12,7 @@</div><div class='ctx'> </div><div class='ctx'> #define CHIP_AU8830</div><div class='ctx'> </div><div class='del'>-#define CARD_NAME "Aureal Vortex 2 3D Sound Processor"</div><div class='add'>+#define CARD_NAME "Aureal Vortex 2"</div><div class='ctx'> #define CARD_NAME_SHORT "au8830"</div><div class='ctx'> </div><div class='ctx'> #define NR_ADB 0x20</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c<br/>index 7b72c88e449d..bb02945793f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * ALSA driver for the Aureal Vortex family of soundprocessors.</div><div class='ctx'>  * Author: Manuel Jander (mjander@embedded.cl)</div><div class='hunk'>@@ -9,7 +10,7 @@</div><div class='ctx'>  *   Thanks to the ALSA developers, they helped a lot working out</div><div class='ctx'>  * the ALSA part.</div><div class='ctx'>  *   Thanks also to Sourceforge for maintaining the old binary drivers,</div><div class='del'>- * and the forum, where developers could comunicate.</div><div class='add'>+ * and the forum, where developers could communicate.</div><div class='ctx'>  *</div><div class='ctx'>  * Now at least i can play Legacy DOOM with MIDI music :-)</div><div class='ctx'>  */</div><div class='hunk'>@@ -19,14 +20,14 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='ctx'> // module parameters (see "Module Parameters")</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> static int pcifix[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 255 };</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -40,19 +41,17 @@ MODULE_PARM_DESC(pcifix, "Enable VIA-workaround for " CARD_NAME " soundcard.");</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("Aureal vortex");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Aureal Semiconductor Inc., Aureal Vortex Sound Processor}}");</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_vortex_ids);</div><div class='ctx'> </div><div class='ctx'> static void vortex_fix_latency(struct pci_dev *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='del'>-	if (!(rc = pci_write_config_byte(vortex, 0x40, 0xff))) {</div><div class='del'>-			printk(KERN_INFO CARD_NAME</div><div class='del'>-			       ": vortex latency is 0xff\n");</div><div class='add'>+	rc = pci_write_config_byte(vortex, 0x40, 0xff);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		dev_info(&amp;vortex-&gt;dev, "vortex latency is 0xff\n");</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_WARNING CARD_NAME</div><div class='del'>-				": could not set vortex latency: pci error 0x%x\n", rc);</div><div class='add'>+		dev_warn(&amp;vortex-&gt;dev,</div><div class='add'>+			 "could not set vortex latency: pci error 0x%x\n", rc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -67,18 +66,20 @@ static void vortex_fix_agp_bridge(struct pci_dev *via)</div><div class='ctx'> 	 * read the config and it is not already set</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (!(rc = pci_read_config_byte(via, 0x42, &amp;value))</div><div class='del'>-			&amp;&amp; ((value &amp; 0x10)</div><div class='del'>-				|| !(rc = pci_write_config_byte(via, 0x42, value | 0x10)))) {</div><div class='del'>-		printk(KERN_INFO CARD_NAME</div><div class='del'>-				": bridge config is 0x%x\n", value | 0x10);</div><div class='add'>+	rc = pci_read_config_byte(via, 0x42, &amp;value);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		if (!(value &amp; 0x10))</div><div class='add'>+			rc = pci_write_config_byte(via, 0x42, value | 0x10);</div><div class='add'>+	}</div><div class='add'>+	if (!rc) {</div><div class='add'>+		dev_info(&amp;via-&gt;dev, "bridge config is 0x%x\n", value | 0x10);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_WARNING CARD_NAME</div><div class='del'>-				": could not set vortex latency: pci error 0x%x\n", rc);</div><div class='add'>+		dev_warn(&amp;via-&gt;dev,</div><div class='add'>+			 "could not set vortex latency: pci error 0x%x\n", rc);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)</div><div class='add'>+static void snd_vortex_workaround(struct pci_dev *vortex, int fix)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *via = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -97,21 +98,24 @@ static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)</div><div class='ctx'> 					PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (via) {</div><div class='del'>-			printk(KERN_INFO CARD_NAME ": Activating latency workaround...\n");</div><div class='add'>+			dev_info(&amp;vortex-&gt;dev,</div><div class='add'>+				 "Activating latency workaround...\n");</div><div class='ctx'> 			vortex_fix_latency(vortex);</div><div class='ctx'> 			vortex_fix_agp_bridge(via);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (fix &amp; 0x1)</div><div class='ctx'> 			vortex_fix_latency(vortex);</div><div class='del'>-		if ((fix &amp; 0x2) &amp;&amp; (via = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='del'>-				PCI_DEVICE_ID_VIA_8365_1, NULL)))</div><div class='del'>-			vortex_fix_agp_bridge(via);</div><div class='del'>-		if ((fix &amp; 0x4) &amp;&amp; (via = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='del'>-				PCI_DEVICE_ID_VIA_82C598_1, NULL)))</div><div class='del'>-			vortex_fix_agp_bridge(via);</div><div class='del'>-		if ((fix &amp; 0x8) &amp;&amp; (via = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='del'>-				PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL)))</div><div class='add'>+		if (fix &amp; 0x2)</div><div class='add'>+			via = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+					     PCI_DEVICE_ID_VIA_8365_1, NULL);</div><div class='add'>+		else if (fix &amp; 0x4)</div><div class='add'>+			via = pci_get_device(PCI_VENDOR_ID_VIA,</div><div class='add'>+					     PCI_DEVICE_ID_VIA_82C598_1, NULL);</div><div class='add'>+		else if (fix &amp; 0x8)</div><div class='add'>+			via = pci_get_device(PCI_VENDOR_ID_AMD,</div><div class='add'>+					     PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL);</div><div class='add'>+		if (via)</div><div class='ctx'> 			vortex_fix_agp_bridge(via);</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_dev_put(via);</div><div class='hunk'>@@ -119,56 +123,35 @@ static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)</div><div class='ctx'> </div><div class='ctx'> // component-destructor</div><div class='ctx'> // (see "Management of Cards and Components")</div><div class='del'>-static int snd_vortex_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_vortex_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	vortex_t *vortex = device-&gt;device_data;</div><div class='add'>+	vortex_t *vortex = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	vortex_gameport_unregister(vortex);</div><div class='ctx'> 	vortex_core_shutdown(vortex);</div><div class='del'>-	// Take down PCI interface.</div><div class='del'>-	free_irq(vortex-&gt;irq, vortex);</div><div class='del'>-	iounmap(vortex-&gt;mmio);</div><div class='del'>-	pci_release_regions(vortex-&gt;pci_dev);</div><div class='del'>-	pci_disable_device(vortex-&gt;pci_dev);</div><div class='del'>-	kfree(vortex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // chip-specific constructor</div><div class='ctx'> // (see "Management of Cards and Components")</div><div class='del'>-static int __devinit</div><div class='del'>-snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)</div><div class='add'>+static int</div><div class='add'>+snd_vortex_create(struct snd_card *card, struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	vortex_t *chip;</div><div class='add'>+	vortex_t *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_vortex_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='ctx'> 	// check PCI availability (DMA).</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "error to set DMA mask\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+		dev_err(card-&gt;dev, "error to set DMA mask\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> </div><div class='ctx'> 	// initialize the stuff</div><div class='ctx'> 	chip-&gt;pci_dev = pci;</div><div class='del'>-	chip-&gt;io = pci_resource_start(pci, 0);</div><div class='ctx'> 	chip-&gt;vendor = pci-&gt;vendor;</div><div class='ctx'> 	chip-&gt;device = pci-&gt;device;</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='hunk'>@@ -177,65 +160,39 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)</div><div class='ctx'> 	// (1) PCI resource allocation</div><div class='ctx'> 	// Get MMIO area</div><div class='ctx'> 	//</div><div class='del'>-	if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)</div><div class='del'>-		goto regions_out;</div><div class='del'>-</div><div class='del'>-	chip-&gt;mmio = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (!chip-&gt;mmio) {</div><div class='del'>-		printk(KERN_ERR "MMIO area remap failed.\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto ioremap_out;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;mmio = pcim_iomap_region(pci, 0, KBUILD_MODNAME);</div><div class='add'>+	if (IS_ERR(chip-&gt;mmio))</div><div class='add'>+		return PTR_ERR(chip-&gt;mmio);</div><div class='add'>+</div><div class='add'>+	chip-&gt;io = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Init audio core.</div><div class='ctx'> 	 * This must be done before we do request_irq otherwise we can get spurious</div><div class='ctx'> 	 * interrupts that we do not handle properly and make a mess of things */</div><div class='del'>-	if ((err = vortex_core_init(chip)) != 0) {</div><div class='del'>-		printk(KERN_ERR "hw core init failed\n");</div><div class='del'>-		goto core_out;</div><div class='add'>+	err = vortex_core_init(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(card-&gt;dev, "hw core init failed\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = request_irq(pci-&gt;irq, vortex_interrupt,</div><div class='del'>-	                       IRQF_SHARED, CARD_NAME_SHORT,</div><div class='del'>-	                       chip)) != 0) {</div><div class='del'>-		printk(KERN_ERR "cannot grab irq\n");</div><div class='del'>-		goto irq_out;</div><div class='add'>+	err = devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, vortex_interrupt,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(card-&gt;dev, "cannot grab irq\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_vortex_free;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	// End of PCI setup.</div><div class='del'>-</div><div class='del'>-	// Register alsa root device.</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		goto alloc_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-      alloc_out:</div><div class='del'>-	free_irq(chip-&gt;irq, chip);</div><div class='del'>-      irq_out:</div><div class='del'>-	vortex_core_shutdown(chip);</div><div class='del'>-      core_out:</div><div class='del'>-	iounmap(chip-&gt;mmio);</div><div class='del'>-      ioremap_out:</div><div class='del'>-	pci_release_regions(chip-&gt;pci_dev);</div><div class='del'>-      regions_out:</div><div class='del'>-	pci_disable_device(chip-&gt;pci_dev);</div><div class='del'>-	//FIXME: this not the right place to unregister the gameport</div><div class='del'>-	vortex_gameport_unregister(chip);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // constructor -- see "Constructor" sub-section</div><div class='del'>-static int __devinit</div><div class='del'>-snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='add'>+static int</div><div class='add'>+__snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -250,64 +207,57 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	// (2)</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	// (3)</div><div class='del'>-	if ((err = snd_vortex_create(card, pci, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	snd_vortex_workaround(pci, pcifix[dev]);</div><div class='ctx'> </div><div class='ctx'> 	// Card details needed in snd_vortex_midi</div><div class='del'>-	strcpy(card-&gt;driver, CARD_NAME_SHORT);</div><div class='add'>+	strscpy(card-&gt;driver, CARD_NAME_SHORT);</div><div class='ctx'> 	sprintf(card-&gt;shortname, "Aureal Vortex %s", CARD_NAME_SHORT);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;io, chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	// (4) Alloc components.</div><div class='add'>+	err = snd_vortex_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	// ADB pcm.</div><div class='del'>-	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_ADB)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_PCM);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> 	// ADB SPDIF</div><div class='del'>-	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_SPDIF, 1)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_new_pcm(chip, VORTEX_PCM_SPDIF, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	// A3D</div><div class='del'>-	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_A3D, NR_A3D)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_new_pcm(chip, VORTEX_PCM_A3D, NR_A3D);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> 	/*</div><div class='ctx'> 	   // ADB I2S</div><div class='ctx'> 	   if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_I2S, 1)) &lt; 0) {</div><div class='del'>-	   snd_card_free(card);</div><div class='ctx'> 	   return err;</div><div class='ctx'> 	   }</div><div class='ctx'> 	 */</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 	// WT pcm.</div><div class='del'>-	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_WT, NR_WT)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_new_pcm(chip, VORTEX_PCM_WT, NR_WT);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='del'>-	// snd_ac97_mixer and Vortex mixer.</div><div class='del'>-	if ((err = snd_vortex_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_vortex_midi(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vortex_midi(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	vortex_gameport_register(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -315,12 +265,12 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 	if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH,</div><div class='ctx'> 			       sizeof(snd_vortex_synth_arg_t), &amp;wave) &lt; 0</div><div class='ctx'> 	    || wave == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "Can't initialize Aureal wavetable synth\n");</div><div class='add'>+		dev_err(card-&gt;dev, "Can't initialize Aureal wavetable synth\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_vortex_synth_arg_t *arg;</div><div class='ctx'> </div><div class='ctx'> 		arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);</div><div class='del'>-		strcpy(wave-&gt;name, "Aureal Synth");</div><div class='add'>+		strscpy(wave-&gt;name, "Aureal Synth");</div><div class='ctx'> 		arg-&gt;hwptr = vortex;</div><div class='ctx'> 		arg-&gt;index = 1;</div><div class='ctx'> 		arg-&gt;seq_ports = seq_ports[dev];</div><div class='hunk'>@@ -329,35 +279,28 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	// (5)</div><div class='del'>-	if ((err = pci_read_config_word(pci, PCI_DEVICE_ID,</div><div class='del'>-				  &amp;(chip-&gt;device))) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}	</div><div class='del'>-	if ((err = pci_read_config_word(pci, PCI_VENDOR_ID,</div><div class='del'>-				  &amp;(chip-&gt;vendor))) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = pci_read_config_word(pci, PCI_DEVICE_ID, &amp;chip-&gt;device);</div><div class='add'>+	if (err)</div><div class='add'>+		return pcibios_err_to_errno(err);</div><div class='add'>+	err = pci_read_config_word(pci, PCI_VENDOR_ID, &amp;chip-&gt;vendor);</div><div class='add'>+	if (err)</div><div class='add'>+		return pcibios_err_to_errno(err);</div><div class='ctx'> 	chip-&gt;rev = pci-&gt;revision;</div><div class='ctx'> #ifdef CHIP_AU8830</div><div class='ctx'> 	if ((chip-&gt;rev) != 0xfe &amp;&amp; (chip-&gt;rev) != 0xfa) {</div><div class='del'>-		printk(KERN_ALERT</div><div class='del'>-		       "vortex: The revision (%x) of your card has not been seen before.\n",</div><div class='add'>+		dev_alert(card-&gt;dev,</div><div class='add'>+			  "The revision (%x) of your card has not been seen before.\n",</div><div class='ctx'> 		       chip-&gt;rev);</div><div class='del'>-		printk(KERN_ALERT</div><div class='del'>-		       "vortex: Please email the results of 'lspci -vv' to openvortex-dev@nongnu.org.\n");</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		return err;</div><div class='add'>+		dev_alert(card-&gt;dev,</div><div class='add'>+			  "Please email the results of 'lspci -vv' to openvortex-dev@nongnu.org.\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	// (6)</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	// (7)</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='hunk'>@@ -366,32 +309,17 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// destructor -- see "Destructor" sub-section</div><div class='del'>-static void __devexit snd_vortex_remove(struct pci_dev *pci)</div><div class='add'>+static int</div><div class='add'>+snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_vortex_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // pci_driver definition</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = CARD_NAME_SHORT,</div><div class='add'>+static struct pci_driver vortex_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_vortex_ids,</div><div class='ctx'> 	.probe = snd_vortex_probe,</div><div class='del'>-	.remove = __devexit_p(snd_vortex_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-// initialization of the module</div><div class='del'>-static int __init alsa_card_vortex_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// clean up the module</div><div class='del'>-static void __exit alsa_card_vortex_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_vortex_init)</div><div class='del'>-module_exit(alsa_card_vortex_exit)</div><div class='add'>+module_pci_driver(vortex_driver);</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h<br/>index cf46bba563cf..6cbb2bc4a048 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0.h</a></div><div class='hunk'>@@ -1,33 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> #ifndef __SOUND_AU88X0_H</div><div class='ctx'> #define __SOUND_AU88X0_H</div><div class='ctx'> </div><div class='del'>-#ifdef __KERNEL__</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/hwdep.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> #include "au88x0_eq.h"</div><div class='hunk'>@@ -104,7 +90,16 @@</div><div class='ctx'> #define MIX_PLAYB(x) (vortex-&gt;mixplayb[x])</div><div class='ctx'> #define MIX_SPDIF(x) (vortex-&gt;mixspdif[x])</div><div class='ctx'> </div><div class='del'>-#define NR_WTPB 0x20		/* WT channels per eahc bank. */</div><div class='add'>+#define NR_WTPB 0x20		/* WT channels per each bank. */</div><div class='add'>+#define NR_PCM	0x10</div><div class='add'>+</div><div class='add'>+struct pcm_vol {</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	int active;</div><div class='add'>+	int dma;</div><div class='add'>+	int mixin[4];</div><div class='add'>+	int vol[4];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Structs */</div><div class='ctx'> typedef struct {</div><div class='hunk'>@@ -146,7 +141,7 @@ struct snd_vortex {</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 	stream_t dma_wt[NR_WT];</div><div class='ctx'> 	wt_voice_t wt_voice[NR_WT];	/* WT register cache. */</div><div class='del'>-	char mixwt[(NR_WT / NR_WTPB) * 6];	/* WT mixin objects */</div><div class='add'>+	s8 mixwt[(NR_WT / NR_WTPB) * 6];	/* WT mixin objects */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Global resources */</div><div class='hunk'>@@ -167,6 +162,7 @@ struct snd_vortex {</div><div class='ctx'> 	/* Xtalk canceler */</div><div class='ctx'> 	int xt_mode;		/* 1: speakers, 0:headphones. */</div><div class='ctx'> #endif</div><div class='add'>+	struct pcm_vol pcm_vol[NR_PCM];</div><div class='ctx'> </div><div class='ctx'> 	int isquad;		/* cache of extended ID codec flag. */</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +207,7 @@ static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma);</div><div class='ctx'> //static void vortex_adbdma_stopfifo(vortex_t *vortex, int adbdma);</div><div class='ctx'> static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma);</div><div class='ctx'> static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma);</div><div class='del'>-static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma);</div><div class='add'>+static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma);</div><div class='ctx'> static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma);</div><div class='ctx'> </div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='hunk'>@@ -219,7 +215,7 @@ static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma);</div><div class='ctx'> static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma);</div><div class='ctx'> static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma);</div><div class='ctx'> static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma);</div><div class='del'>-static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma);</div><div class='add'>+static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* global stuff. */</div><div class='hunk'>@@ -233,14 +229,14 @@ static int vortex_core_init(vortex_t * card);</div><div class='ctx'> static int vortex_core_shutdown(vortex_t * card);</div><div class='ctx'> static void vortex_enable_int(vortex_t * card);</div><div class='ctx'> static irqreturn_t vortex_interrupt(int irq, void *dev_id);</div><div class='del'>-static int vortex_alsafmt_aspfmt(int alsafmt);</div><div class='add'>+static int vortex_alsafmt_aspfmt(snd_pcm_format_t alsafmt, vortex_t *v);</div><div class='ctx'> </div><div class='ctx'> /* Connection  stuff. */</div><div class='ctx'> static void vortex_connect_default(vortex_t * vortex, int en);</div><div class='ctx'> static int vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch,</div><div class='del'>-				 int dir, int type);</div><div class='del'>-static char vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out,</div><div class='del'>-				  int restype);</div><div class='add'>+				 int dir, int type, int subdev);</div><div class='add'>+static int vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out,</div><div class='add'>+				 int restype);</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> static int vortex_wt_allocroute(vortex_t * vortex, int dma, int nr_ch);</div><div class='ctx'> static void vortex_wt_connect(vortex_t * vortex, int en);</div><div class='hunk'>@@ -268,7 +264,7 @@ static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix,</div><div class='ctx'> static void vortex_Vort3D_enable(vortex_t * v);</div><div class='ctx'> static void vortex_Vort3D_disable(vortex_t * v);</div><div class='ctx'> static void vortex_Vort3D_connect(vortex_t * vortex, int en);</div><div class='del'>-static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en);</div><div class='add'>+static void vortex_Vort3D_InitializeSource(a3dsrc_t *a, int en, vortex_t *v);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Driver stuff. */</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c<br/>index f4aa8ff6f5f9..d5cafaa229f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3d.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3d.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3d.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_a3d.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_a3d.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,19 +10,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "au88x0_a3d.h"</div><div class='hunk'>@@ -53,7 +41,7 @@ a3dsrc_GetTimeConsts(a3dsrc_t * a, short *HrtfTrack, short *ItdTrack,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='del'>-/* Atmospheric absorbtion. */</div><div class='add'>+/* Atmospheric absorption. */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> a3dsrc_SetAtmosTarget(a3dsrc_t * a, short aa, short b, short c, short d,</div><div class='hunk'>@@ -463,7 +451,7 @@ static void a3dsrc_ZeroSliceIO(a3dsrc_t * a)</div><div class='ctx'> static void a3dsrc_ZeroState(a3dsrc_t * a)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "vortex: ZeroState slice: %d, source %d\n",</div><div class='add'>+	pr_debug( "vortex: ZeroState slice: %d, source %d\n",</div><div class='ctx'> 	       a-&gt;slice, a-&gt;source);</div><div class='ctx'> 	*/</div><div class='ctx'> 	a3dsrc_SetAtmosState(a, 0, 0, 0, 0);</div><div class='hunk'>@@ -484,12 +472,13 @@ static void a3dsrc_ZeroState(a3dsrc_t * a)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reset entire A3D engine */</div><div class='del'>-static void a3dsrc_ZeroStateA3D(a3dsrc_t * a)</div><div class='add'>+static void a3dsrc_ZeroStateA3D(a3dsrc_t *a, vortex_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	int i, var, var2;</div><div class='ctx'> </div><div class='ctx'> 	if ((a-&gt;vortex) == NULL) {</div><div class='del'>-		printk(KERN_ERR "vortex: ZeroStateA3D: ERROR: a-&gt;vortex is NULL\n");</div><div class='add'>+		dev_err(v-&gt;card-&gt;dev,</div><div class='add'>+			"ZeroStateA3D: ERROR: a-&gt;vortex is NULL\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -594,14 +583,14 @@ static int Vort3DRend_Initialize(vortex_t * v, unsigned short mode)</div><div class='ctx'> static int vortex_a3d_register_controls(vortex_t * vortex);</div><div class='ctx'> static void vortex_a3d_unregister_controls(vortex_t * vortex);</div><div class='ctx'> /* A3D base support init/shudown */</div><div class='del'>-static void __devinit vortex_Vort3D_enable(vortex_t * v)</div><div class='add'>+static void vortex_Vort3D_enable(vortex_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	Vort3DRend_Initialize(v, XT_HEADPHONE);</div><div class='ctx'> 	for (i = 0; i &lt; NR_A3D; i++) {</div><div class='ctx'> 		vortex_A3dSourceHw_Initialize(v, i % 4, i &gt;&gt; 2);</div><div class='del'>-		a3dsrc_ZeroStateA3D(&amp;(v-&gt;a3d[0]));</div><div class='add'>+		a3dsrc_ZeroStateA3D(&amp;v-&gt;a3d[0], v);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Register ALSA controls */</div><div class='ctx'> 	vortex_a3d_register_controls(v);</div><div class='hunk'>@@ -628,15 +617,15 @@ static void vortex_Vort3D_connect(vortex_t * v, int en)</div><div class='ctx'> 	v-&gt;mixxtlk[0] =</div><div class='ctx'> 	    vortex_adb_checkinout(v, v-&gt;fixed_res, en, VORTEX_RESOURCE_MIXIN);</div><div class='ctx'> 	if (v-&gt;mixxtlk[0] &lt; 0) {</div><div class='del'>-		printk</div><div class='del'>-		    ("vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n");</div><div class='add'>+		dev_warn(v-&gt;card-&gt;dev,</div><div class='add'>+			 "vortex_Vort3D: ERROR: not enough free mixer resources.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	v-&gt;mixxtlk[1] =</div><div class='ctx'> 	    vortex_adb_checkinout(v, v-&gt;fixed_res, en, VORTEX_RESOURCE_MIXIN);</div><div class='ctx'> 	if (v-&gt;mixxtlk[1] &lt; 0) {</div><div class='del'>-		printk</div><div class='del'>-		    ("vortex: vortex_Vort3D: ERROR: not enough free mixer resources.\n");</div><div class='add'>+		dev_warn(v-&gt;card-&gt;dev,</div><div class='add'>+			 "vortex_Vort3D: ERROR: not enough free mixer resources.\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -676,11 +665,11 @@ static void vortex_Vort3D_connect(vortex_t * v, int en)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize one single A3D source. */</div><div class='del'>-static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en)</div><div class='add'>+static void vortex_Vort3D_InitializeSource(a3dsrc_t *a, int en, vortex_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	if (a-&gt;vortex == NULL) {</div><div class='del'>-		printk</div><div class='del'>-		    ("vortex: Vort3D_InitializeSource: A3D source not initialized\n");</div><div class='add'>+		dev_warn(v-&gt;card-&gt;dev,</div><div class='add'>+			 "Vort3D_InitializeSource: A3D source not initialized\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (en) {</div><div class='hunk'>@@ -765,7 +754,7 @@ snd_vortex_a3d_filter_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int</div><div class='ctx'> snd_vortex_a3d_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	//a3dsrc_t *a = kcontrol-&gt;private_data;</div><div class='add'>+	//a3dsrc_t *a = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	/* No read yet. Would this be really useable/needed ? */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -775,8 +764,8 @@ static int</div><div class='ctx'> snd_vortex_a3d_hrtf_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	a3dsrc_t *a = kcontrol-&gt;private_data;</div><div class='del'>-	int changed = 1, i;</div><div class='add'>+	a3dsrc_t *a = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int i;</div><div class='ctx'> 	int coord[6];</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		coord[i] = ucontrol-&gt;value.integer.value[i];</div><div class='hunk'>@@ -785,16 +774,16 @@ snd_vortex_a3d_hrtf_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	vortex_a3d_coord2hrtf(a-&gt;hrtf[1], coord);</div><div class='ctx'> 	a3dsrc_SetHrtfTarget(a, a-&gt;hrtf[0], a-&gt;hrtf[1]);</div><div class='ctx'> 	a3dsrc_SetHrtfCurrent(a, a-&gt;hrtf[0], a-&gt;hrtf[1]);</div><div class='del'>-	return changed;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> snd_vortex_a3d_itd_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	a3dsrc_t *a = kcontrol-&gt;private_data;</div><div class='add'>+	a3dsrc_t *a = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int coord[6];</div><div class='del'>-	int i, changed = 1;</div><div class='add'>+	int i;</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		coord[i] = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 	/* Translate orientation coordinates to a3d params. */</div><div class='hunk'>@@ -804,15 +793,14 @@ snd_vortex_a3d_itd_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	a3dsrc_SetItdTarget(a, a-&gt;itd[0], a-&gt;itd[1]);</div><div class='ctx'> 	a3dsrc_SetItdCurrent(a, a-&gt;itd[0], a-&gt;itd[1]);</div><div class='ctx'> 	a3dsrc_SetItdDline(a, a-&gt;dline);</div><div class='del'>-	return changed;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> snd_vortex_a3d_ild_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		       struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	a3dsrc_t *a = kcontrol-&gt;private_data;</div><div class='del'>-	int changed = 1;</div><div class='add'>+	a3dsrc_t *a = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int l, r;</div><div class='ctx'> 	/* There may be some scale tranlation needed here. */</div><div class='ctx'> 	l = ucontrol-&gt;value.integer.value[0];</div><div class='hunk'>@@ -821,31 +809,31 @@ snd_vortex_a3d_ild_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	/* Left Right panning. */</div><div class='ctx'> 	a3dsrc_SetGainTarget(a, l, r);</div><div class='ctx'> 	a3dsrc_SetGainCurrent(a, l, r);</div><div class='del'>-	return changed;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			  struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	a3dsrc_t *a = kcontrol-&gt;private_data;</div><div class='del'>-	int i, changed = 1;</div><div class='add'>+	a3dsrc_t *a = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int i;</div><div class='ctx'> 	int params[6];</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		params[i] = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 	/* Translate generic filter params to a3d filter params. */</div><div class='ctx'> 	vortex_a3d_translate_filter(a-&gt;filter, params);</div><div class='del'>-	/* Atmospheric absorbtion and filtering. */</div><div class='add'>+	/* Atmospheric absorption and filtering. */</div><div class='ctx'> 	a3dsrc_SetAtmosTarget(a, a-&gt;filter[0],</div><div class='ctx'> 			      a-&gt;filter[1], a-&gt;filter[2],</div><div class='ctx'> 			      a-&gt;filter[3], a-&gt;filter[4]);</div><div class='ctx'> 	a3dsrc_SetAtmosCurrent(a, a-&gt;filter[0],</div><div class='ctx'> 			       a-&gt;filter[1], a-&gt;filter[2],</div><div class='ctx'> 			       a-&gt;filter[3], a-&gt;filter[4]);</div><div class='del'>-	return changed;</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vortex_a3d_kcontrol __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new vortex_a3d_kcontrol = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name = "Playback PCM advanced processing",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='hunk'>@@ -855,52 +843,56 @@ static struct snd_kcontrol_new vortex_a3d_kcontrol __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Control (un)registration. */</div><div class='del'>-static int __devinit vortex_a3d_register_controls(vortex_t * vortex)</div><div class='add'>+static int vortex_a3d_register_controls(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kcontrol;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	/* HRTF controls. */</div><div class='ctx'> 	for (i = 0; i &lt; NR_A3D; i++) {</div><div class='del'>-		if ((kcontrol =</div><div class='del'>-		     snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i])) == NULL)</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i]);</div><div class='add'>+		if (!kcontrol)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		kcontrol-&gt;id.numid = CTRLID_HRTF;</div><div class='ctx'> 		kcontrol-&gt;info = snd_vortex_a3d_hrtf_info;</div><div class='ctx'> 		kcontrol-&gt;put = snd_vortex_a3d_hrtf_put;</div><div class='del'>-		if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* ITD controls. */</div><div class='ctx'> 	for (i = 0; i &lt; NR_A3D; i++) {</div><div class='del'>-		if ((kcontrol =</div><div class='del'>-		     snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i])) == NULL)</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i]);</div><div class='add'>+		if (!kcontrol)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		kcontrol-&gt;id.numid = CTRLID_ITD;</div><div class='ctx'> 		kcontrol-&gt;info = snd_vortex_a3d_itd_info;</div><div class='ctx'> 		kcontrol-&gt;put = snd_vortex_a3d_itd_put;</div><div class='del'>-		if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* ILD (gains) controls. */</div><div class='ctx'> 	for (i = 0; i &lt; NR_A3D; i++) {</div><div class='del'>-		if ((kcontrol =</div><div class='del'>-		     snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i])) == NULL)</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i]);</div><div class='add'>+		if (!kcontrol)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		kcontrol-&gt;id.numid = CTRLID_GAINS;</div><div class='ctx'> 		kcontrol-&gt;info = snd_vortex_a3d_ild_info;</div><div class='ctx'> 		kcontrol-&gt;put = snd_vortex_a3d_ild_put;</div><div class='del'>-		if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Filter controls. */</div><div class='ctx'> 	for (i = 0; i &lt; NR_A3D; i++) {</div><div class='del'>-		if ((kcontrol =</div><div class='del'>-		     snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i])) == NULL)</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;vortex_a3d_kcontrol, &amp;vortex-&gt;a3d[i]);</div><div class='add'>+		if (!kcontrol)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		kcontrol-&gt;id.numid = CTRLID_FILTER;</div><div class='ctx'> 		kcontrol-&gt;info = snd_vortex_a3d_filter_info;</div><div class='ctx'> 		kcontrol-&gt;put = snd_vortex_a3d_filter_put;</div><div class='del'>-		if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_a3d.h b/sound/pci/au88x0/au88x0_a3d.h<br/>index 0584c65bcab0..4078173da4a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3d.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3d.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3d.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_a3d.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_a3d.h</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _AU88X0_A3D_H</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_a3ddata.c b/sound/pci/au88x0/au88x0_a3ddata.c<br/>index 6fab4bba5a05..a5da3b3a546a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3ddata.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_a3ddata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_a3ddata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_a3ddata.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_a3ddata.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Constant initializer values. */</div><div class='hunk'>@@ -33,7 +21,7 @@ static const a3d_Hrtf_t A3dHrirZeros = {</div><div class='ctx'> 	0, 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const a3d_Hrtf_t A3dHrirImpulse = {</div><div class='add'>+static __maybe_unused const a3d_Hrtf_t A3dHrirImpulse = {</div><div class='ctx'> 	0x7fff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	0, 0, 0,</div><div class='ctx'> 	0, 0, 0, 0,</div><div class='hunk'>@@ -42,7 +30,7 @@ static const a3d_Hrtf_t A3dHrirImpulse = {</div><div class='ctx'> 	0, 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const a3d_Hrtf_t A3dHrirOnes = {</div><div class='add'>+static __maybe_unused const a3d_Hrtf_t A3dHrirOnes = {</div><div class='ctx'> 	0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff,</div><div class='ctx'> 	0x7fff,</div><div class='ctx'> 	0x7fff,</div><div class='hunk'>@@ -59,7 +47,7 @@ static const a3d_Hrtf_t A3dHrirOnes = {</div><div class='ctx'> 	0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const a3d_Hrtf_t A3dHrirSatTest = {</div><div class='add'>+static __maybe_unused const a3d_Hrtf_t A3dHrirSatTest = {</div><div class='ctx'> 	0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff,</div><div class='ctx'> 	0x7fff,</div><div class='ctx'> 	0x7fff,</div><div class='hunk'>@@ -71,7 +59,7 @@ static const a3d_Hrtf_t A3dHrirSatTest = {</div><div class='ctx'> 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const a3d_Hrtf_t A3dHrirDImpulse = {</div><div class='add'>+static __maybe_unused const a3d_Hrtf_t A3dHrirDImpulse = {</div><div class='ctx'> 	0, 0x7fff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='ctx'> 	0, 0, 0,</div><div class='ctx'> 	0, 0, 0, 0,</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c<br/>index 23f49f356e0f..e5d867637336 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_core.c</a></div><div class='hunk'>@@ -1,17 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -285,8 +273,8 @@ vortex_mixer_addWTD(vortex_t * vortex, unsigned char mix, unsigned char ch)</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, prev);</div><div class='ctx'> 		//printk(KERN_INFO "vortex: mixAddWTD: while addr=%x, val=%x\n", prev, temp);</div><div class='ctx'> 		if ((++lifeboat) &gt; 0xf) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "vortex_mixer_addWTD: lifeboat overflow\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_mixer_addWTD: lifeboat overflow\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -303,7 +291,7 @@ vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> 	eax = hwread(vortex-&gt;mmio, VORTEX_MIXER_SR);</div><div class='ctx'> 	if (((1 &lt;&lt; ch) &amp; eax) == 0) {</div><div class='del'>-		printk(KERN_ERR "mix ALARM %x\n", eax);</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev, "mix ALARM %x\n", eax);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ebp = VORTEX_MIXER_CHNBASE + (ch &lt;&lt; 2);</div><div class='hunk'>@@ -324,8 +312,8 @@ vortex_mixer_delWTD(vortex_t * vortex, unsigned char mix, unsigned char ch)</div><div class='ctx'> 			//printk(KERN_INFO "vortex: mixdelWTD: 1 addr=%x, val=%x, src=%x\n", ebx, edx, src);</div><div class='ctx'> 			while ((edx &amp; 0xf) != mix) {</div><div class='ctx'> 				if ((esi) &gt; 0xf) {</div><div class='del'>-					printk(KERN_ERR</div><div class='del'>-					       "vortex: mixdelWTD: error lifeboat overflow\n");</div><div class='add'>+					dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+						"mixdelWTD: error lifeboat overflow\n");</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				}</div><div class='ctx'> 				esp14 = ebx;</div><div class='hunk'>@@ -492,7 +480,7 @@ vortex_src_persist_convratio(vortex_t * vortex, unsigned char src, int ratio)</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_SRC_CONVRATIO + (src &lt;&lt; 2), ratio);</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, VORTEX_SRC_CONVRATIO + (src &lt;&lt; 2));</div><div class='ctx'> 		if ((++lifeboat) &gt; 0x9) {</div><div class='del'>-			printk(KERN_ERR "Vortex: Src cvr fail\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "Src cvr fail\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -545,7 +533,7 @@ vortex_src_checkratio(vortex_t * vortex, unsigned char src,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_SRC_CONVRATIO + (src &lt;&lt; 2), desired_ratio);</div><div class='ctx'> </div><div class='ctx'> 		if ((lifeboat++) &gt; 15) {</div><div class='del'>-			printk(KERN_ERR "Vortex: could not set src-%d from %d to %d\n",</div><div class='add'>+			pr_err( "Vortex: could not set src-%d from %d to %d\n",</div><div class='ctx'> 			       src, hw_ratio, desired_ratio);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -684,8 +672,8 @@ vortex_src_addWTD(vortex_t * vortex, unsigned char src, unsigned char ch)</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, prev);</div><div class='ctx'> 		//printk(KERN_INFO "vortex: srcAddWTD: while addr=%x, val=%x\n", prev, temp);</div><div class='ctx'> 		if ((++lifeboat) &gt; 0xf) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "vortex_src_addWTD: lifeboat overflow\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_src_addWTD: lifeboat overflow\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -703,7 +691,7 @@ vortex_src_delWTD(vortex_t * vortex, unsigned char src, unsigned char ch)</div><div class='ctx'> </div><div class='ctx'> 	eax = hwread(vortex-&gt;mmio, VORTEX_SRCBLOCK_SR);</div><div class='ctx'> 	if (((1 &lt;&lt; ch) &amp; eax) == 0) {</div><div class='del'>-		printk(KERN_ERR "src alarm\n");</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev, "src alarm\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ebp = VORTEX_SRC_CHNBASE + (ch &lt;&lt; 2);</div><div class='hunk'>@@ -724,8 +712,8 @@ vortex_src_delWTD(vortex_t * vortex, unsigned char src, unsigned char ch)</div><div class='ctx'> 			//printk(KERN_INFO "vortex: srcdelWTD: 1 addr=%x, val=%x, src=%x\n", ebx, edx, src);</div><div class='ctx'> 			while ((edx &amp; 0xf) != src) {</div><div class='ctx'> 				if ((esi) &gt; 0xf) {</div><div class='del'>-					printk</div><div class='del'>-					    ("vortex: srcdelWTD: error, lifeboat overflow\n");</div><div class='add'>+					dev_warn(vortex-&gt;card-&gt;dev,</div><div class='add'>+						 "srcdelWTD: error, lifeboat overflow\n");</div><div class='ctx'> 					return 0;</div><div class='ctx'> 				}</div><div class='ctx'> 				esp14 = ebx;</div><div class='hunk'>@@ -805,7 +793,7 @@ static void vortex_fifo_setadbvalid(vortex_t * vortex, int fifo, int en)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b, int priority,</div><div class='add'>+vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int stereo, int priority,</div><div class='ctx'> 		       int empty, int valid, int f)</div><div class='ctx'> {</div><div class='ctx'> 	int temp, lifeboat = 0;</div><div class='hunk'>@@ -819,8 +807,8 @@ vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b, int priority,</div><div class='ctx'> 	do {</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, VORTEX_FIFO_ADBCTRL + (fifo &lt;&lt; 2));</div><div class='ctx'> 		if (lifeboat++ &gt; 0xbb8) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "Vortex: vortex_fifo_setadbctrl fail\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_fifo_setadbctrl fail\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -837,7 +825,7 @@ vortex_fifo_setadbctrl(vortex_t * vortex, int fifo, int b, int priority,</div><div class='ctx'> #else</div><div class='ctx'> 			temp = (this_4 &amp; 0x3f) &lt;&lt; 0xc;</div><div class='ctx'> #endif</div><div class='del'>-			temp = (temp &amp; 0xfffffffd) | ((b &amp; 1) &lt;&lt; 1);</div><div class='add'>+			temp = (temp &amp; 0xfffffffd) | ((stereo &amp; 1) &lt;&lt; 1);</div><div class='ctx'> 			temp = (temp &amp; 0xfffffff3) | ((priority &amp; 3) &lt;&lt; 2);</div><div class='ctx'> 			temp = (temp &amp; 0xffffffef) | ((valid &amp; 1) &lt;&lt; 4);</div><div class='ctx'> 			temp |= FIFO_U1;</div><div class='hunk'>@@ -915,7 +903,8 @@ vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,</div><div class='ctx'> 	do {</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, VORTEX_FIFO_WTCTRL + (fifo &lt;&lt; 2));</div><div class='ctx'> 		if (lifeboat++ &gt; 0xbb8) {</div><div class='del'>-			printk(KERN_ERR "Vortex: vortex_fifo_setwtctrl fail\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_fifo_setwtctrl fail\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -970,7 +959,7 @@ vortex_fifo_setwtctrl(vortex_t * vortex, int fifo, int ctrl, int priority,</div><div class='ctx'>     do {</div><div class='ctx'> 		temp = hwread(vortex-&gt;mmio, VORTEX_FIFO_WTCTRL + (fifo &lt;&lt; 2));</div><div class='ctx'> 		if (lifeboat++ &gt; 0xbb8) {</div><div class='del'>-			printk(KERN_ERR "Vortex: vortex_fifo_setwtctrl fail (hanging)\n");</div><div class='add'>+			pr_err( "Vortex: vortex_fifo_setwtctrl fail (hanging)\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'>     } while ((temp &amp; FIFO_RDONLY)&amp;&amp;(temp &amp; FIFO_VALID)&amp;&amp;(temp != 0xFFFFFFFF));</div><div class='hunk'>@@ -1042,7 +1031,7 @@ static void vortex_fifo_init(vortex_t * vortex)</div><div class='ctx'> 	for (x = NR_ADB - 1; x &gt;= 0; x--) {</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, addr, (FIFO_U0 | FIFO_U1));</div><div class='ctx'> 		if (hwread(vortex-&gt;mmio, addr) != (FIFO_U0 | FIFO_U1))</div><div class='del'>-			printk(KERN_ERR "bad adb fifo reset!");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "bad adb fifo reset!\n");</div><div class='ctx'> 		vortex_fifo_clearadbdata(vortex, x, FIFO_SIZE);</div><div class='ctx'> 		addr -= 4;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1053,9 +1042,9 @@ static void vortex_fifo_init(vortex_t * vortex)</div><div class='ctx'> 	for (x = NR_WT - 1; x &gt;= 0; x--) {</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, addr, FIFO_U0);</div><div class='ctx'> 		if (hwread(vortex-&gt;mmio, addr) != FIFO_U0)</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "bad wt fifo reset (0x%08x, 0x%08x)!\n",</div><div class='del'>-			       addr, hwread(vortex-&gt;mmio, addr));</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"bad wt fifo reset (0x%08x, 0x%08x)!\n",</div><div class='add'>+				addr, hwread(vortex-&gt;mmio, addr));</div><div class='ctx'> 		vortex_fifo_clearwtdata(vortex, x, FIFO_SIZE);</div><div class='ctx'> 		addr -= 4;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1114,6 +1103,7 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio,</div><div class='ctx'> 			VORTEX_ADBDMA_BUFBASE + (adbdma &lt;&lt; 4) + 0xc,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize * 3));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 3 pages */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x12000000;</div><div class='hunk'>@@ -1121,12 +1111,14 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio,</div><div class='ctx'> 			VORTEX_ADBDMA_BUFBASE + (adbdma &lt;&lt; 4) + 0x8,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize * 2));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 2 pages */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x88000000 | 0x44000000 | 0x10000000 | (psize - 1);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio,</div><div class='ctx'> 			VORTEX_ADBDMA_BUFBASE + (adbdma &lt;&lt; 4) + 0x4,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 1 page */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x80000000 | 0x40000000 | ((psize - 1) &lt;&lt; 0xc);</div><div class='hunk'>@@ -1136,7 +1128,7 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n",</div><div class='add'>+	pr_debug( "vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n",</div><div class='ctx'> 	       dma-&gt;cfg0, dma-&gt;cfg1);</div><div class='ctx'> 	*/</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, VORTEX_ADBDMA_BUFCFG0 + (adbdma &lt;&lt; 3), dma-&gt;cfg0);</div><div class='hunk'>@@ -1148,11 +1140,11 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, int dir,</div><div class='del'>-		      int fmt, int d, u32 offset)</div><div class='add'>+		      int fmt, int stereo, u32 offset)</div><div class='ctx'> {</div><div class='ctx'> 	stream_t *dma = &amp;vortex-&gt;dma_adb[adbdma];</div><div class='ctx'> </div><div class='del'>-	dma-&gt;dma_unknown = d;</div><div class='add'>+	dma-&gt;dma_unknown = stereo;</div><div class='ctx'> 	dma-&gt;dma_ctrl =</div><div class='ctx'> 	    ((offset &amp; OFFSET_MASK) | (dma-&gt;dma_ctrl &amp; ~OFFSET_MASK));</div><div class='ctx'> 	/* Enable PCMOUT interrupts. */</div><div class='hunk'>@@ -1203,7 +1195,7 @@ static int vortex_adbdma_bufshift(vortex_t * vortex, int adbdma)</div><div class='ctx'> 				VORTEX_ADBDMA_BUFBASE + (((adbdma &lt;&lt; 2) + pp) &lt;&lt; 2),</div><div class='ctx'> 				snd_pcm_sgbuf_get_addr(dma-&gt;substream,</div><div class='ctx'> 				dma-&gt;period_bytes * p));</div><div class='del'>-			/* Force write thru cache. */</div><div class='add'>+			/* Force write through cache. */</div><div class='ctx'> 			hwread(vortex-&gt;mmio, VORTEX_ADBDMA_BUFBASE +</div><div class='ctx'> 			       (((adbdma &lt;&lt; 2) + pp) &lt;&lt; 2));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1213,8 +1205,9 @@ static int vortex_adbdma_bufshift(vortex_t * vortex, int adbdma)</div><div class='ctx'> 	if (dma-&gt;period_virt &gt;= dma-&gt;nr_periods)</div><div class='ctx'> 		dma-&gt;period_virt -= dma-&gt;nr_periods;</div><div class='ctx'> 	if (delta != 1)</div><div class='del'>-		printk(KERN_INFO "vortex: %d virt=%d, real=%d, delta=%d\n",</div><div class='del'>-		       adbdma, dma-&gt;period_virt, dma-&gt;period_real, delta);</div><div class='add'>+		dev_info(vortex-&gt;card-&gt;dev,</div><div class='add'>+			 "%d virt=%d, real=%d, delta=%d\n",</div><div class='add'>+			 adbdma, dma-&gt;period_virt, dma-&gt;period_real, delta);</div><div class='ctx'> </div><div class='ctx'> 	return delta;</div><div class='ctx'> }</div><div class='hunk'>@@ -1244,19 +1237,27 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) {</div><div class='ctx'> 			VORTEX_ADBDMA_BUFBASE + (((adbdma &lt;&lt; 2) + pp) &lt;&lt; 2),</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream,</div><div class='ctx'> 					       dma-&gt;period_bytes * p));</div><div class='del'>-		/* Force write thru cache. */</div><div class='add'>+		/* Force write through cache. */</div><div class='ctx'> 		hwread(vortex-&gt;mmio, VORTEX_ADBDMA_BUFBASE + (((adbdma &lt;&lt; 2)+pp) &lt;&lt; 2));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)</div><div class='add'>+static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)</div><div class='ctx'> {</div><div class='ctx'> 	stream_t *dma = &amp;vortex-&gt;dma_adb[adbdma];</div><div class='del'>-	int temp;</div><div class='add'>+	int temp, page, delta;</div><div class='ctx'> </div><div class='ctx'> 	temp = hwread(vortex-&gt;mmio, VORTEX_ADBDMA_STAT + (adbdma &lt;&lt; 2));</div><div class='del'>-	temp = (dma-&gt;period_virt * dma-&gt;period_bytes) + (temp &amp; (dma-&gt;period_bytes - 1));</div><div class='del'>-	return temp;</div><div class='add'>+	page = (temp &amp; ADB_SUBBUF_MASK) &gt;&gt; ADB_SUBBUF_SHIFT;</div><div class='add'>+	if (dma-&gt;nr_periods &gt;= 4)</div><div class='add'>+		delta = (page - dma-&gt;period_real) &amp; 3;</div><div class='add'>+	else {</div><div class='add'>+		delta = (page - dma-&gt;period_real);</div><div class='add'>+		if (delta &lt; 0)</div><div class='add'>+			delta += dma-&gt;nr_periods;</div><div class='add'>+	}</div><div class='add'>+	return (dma-&gt;period_virt + delta) * dma-&gt;period_bytes</div><div class='add'>+		+ (temp &amp; (dma-&gt;period_bytes - 1));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)</div><div class='hunk'>@@ -1328,7 +1329,6 @@ static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma)</div><div class='ctx'> 	dma-&gt;fifo_status = FIFO_PAUSE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if 0				// Using pause instead</div><div class='ctx'> static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)</div><div class='ctx'> {</div><div class='ctx'> 	stream_t *dma = &amp;vortex-&gt;dma_adb[adbdma];</div><div class='hunk'>@@ -1343,7 +1343,6 @@ static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma)</div><div class='ctx'> 	dma-&gt;fifo_enabled = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif</div><div class='ctx'> /* WTDMA */</div><div class='ctx'> </div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='hunk'>@@ -1382,17 +1381,20 @@ vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,</div><div class='ctx'> 		dma-&gt;cfg1 |= 0x88000000 | 0x44000000 | 0x30000000 | (psize-1);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_WTDMA_BUFBASE + (wtdma &lt;&lt; 4) + 0xc,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize * 3));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 3 pages */</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x12000000;</div><div class='ctx'> 		dma-&gt;cfg1 |= 0x80000000 | 0x40000000 | ((psize-1) &lt;&lt; 0xc);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_WTDMA_BUFBASE + (wtdma &lt;&lt; 4)  + 0x8,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize * 2));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 2 pages */</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x88000000 | 0x44000000 | 0x10000000 | (psize-1);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_WTDMA_BUFBASE + (wtdma &lt;&lt; 4) + 0x4,</div><div class='ctx'> 			snd_pcm_sgbuf_get_addr(dma-&gt;substream, psize));</div><div class='add'>+		fallthrough;</div><div class='ctx'> 		/* 1 page */</div><div class='ctx'> 	case 1:</div><div class='ctx'> 		dma-&gt;cfg0 |= 0x80000000 | 0x40000000 | ((psize-1) &lt;&lt; 0xc);</div><div class='hunk'>@@ -1436,9 +1438,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)</div><div class='ctx'> 	int page, p, pp, delta, i;</div><div class='ctx'> </div><div class='ctx'> 	page =</div><div class='del'>-	    (hwread(vortex-&gt;mmio, VORTEX_WTDMA_STAT + (wtdma &lt;&lt; 2)) &amp;</div><div class='del'>-	     WT_SUBBUF_MASK)</div><div class='del'>-	    &gt;&gt; WT_SUBBUF_SHIFT;</div><div class='add'>+	    (hwread(vortex-&gt;mmio, VORTEX_WTDMA_STAT + (wtdma &lt;&lt; 2))</div><div class='add'>+	     &gt;&gt; WT_SUBBUF_SHIFT) &amp; WT_SUBBUF_MASK;</div><div class='ctx'> 	if (dma-&gt;nr_periods &gt;= 4)</div><div class='ctx'> 		delta = (page - dma-&gt;period_real) &amp; 3;</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -1465,7 +1466,7 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)</div><div class='ctx'> 				(((wtdma &lt;&lt; 2) + pp) &lt;&lt; 2),</div><div class='ctx'> 				snd_pcm_sgbuf_get_addr(dma-&gt;substream,</div><div class='ctx'> 						       dma-&gt;period_bytes * p));</div><div class='del'>-			/* Force write thru cache. */</div><div class='add'>+			/* Force write through cache. */</div><div class='ctx'> 			hwread(vortex-&gt;mmio, VORTEX_WTDMA_BUFBASE +</div><div class='ctx'> 			       (((wtdma &lt;&lt; 2) + pp) &lt;&lt; 2));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1476,8 +1477,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)</div><div class='ctx'> 	dma-&gt;period_real = page;</div><div class='ctx'> </div><div class='ctx'> 	if (delta != 1)</div><div class='del'>-		printk(KERN_WARNING "vortex: wt virt = %d, delta = %d\n",</div><div class='del'>-		       dma-&gt;period_virt, delta);</div><div class='add'>+		dev_warn(vortex-&gt;card-&gt;dev, "wt virt = %d, delta = %d\n",</div><div class='add'>+			 dma-&gt;period_virt, delta);</div><div class='ctx'> </div><div class='ctx'> 	return delta;</div><div class='ctx'> }</div><div class='hunk'>@@ -1498,7 +1499,7 @@ static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma)</div><div class='ctx'> 		 POS_SHIFT) &amp; POS_MASK);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)</div><div class='add'>+static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)</div><div class='ctx'> {</div><div class='ctx'> 	stream_t *dma = &amp;vortex-&gt;dma_wt[wtdma];</div><div class='ctx'> 	int temp;</div><div class='hunk'>@@ -1661,9 +1662,9 @@ vortex_adb_addroutes(vortex_t * vortex, unsigned char channel,</div><div class='ctx'> 		    hwread(vortex-&gt;mmio,</div><div class='ctx'> 			   VORTEX_ADB_RTBASE + (temp &lt;&lt; 2)) &amp; ADB_MASK;</div><div class='ctx'> 		if ((lifeboat++) &gt; ADB_MASK) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "vortex_adb_addroutes: unending route! 0x%x\n",</div><div class='del'>-			       *route);</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_adb_addroutes: unending route! 0x%x\n",</div><div class='add'>+				*route);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1697,9 +1698,9 @@ vortex_adb_delroutes(vortex_t * vortex, unsigned char channel,</div><div class='ctx'> 		    hwread(vortex-&gt;mmio,</div><div class='ctx'> 			   VORTEX_ADB_RTBASE + (prev &lt;&lt; 2)) &amp; ADB_MASK;</div><div class='ctx'> 		if (((lifeboat++) &gt; ADB_MASK) || (temp == ADB_MASK)) {</div><div class='del'>-			printk(KERN_ERR</div><div class='del'>-			       "vortex_adb_delroutes: route not found! 0x%x\n",</div><div class='del'>-			       route0);</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"vortex_adb_delroutes: route not found! 0x%x\n",</div><div class='add'>+				route0);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1853,7 +1854,7 @@ vortex_connection_mixin_mix(vortex_t * vortex, int en, unsigned char mixin,</div><div class='ctx'> 		vortex_mix_disableinput(vortex, mix, mixin, a);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// Connect absolut address to mixin.</div><div class='add'>+// Connect absolute address to mixin.</div><div class='ctx'> static void</div><div class='ctx'> vortex_connection_adb_mixin(vortex_t * vortex, int en,</div><div class='ctx'> 			    unsigned char channel, unsigned char source,</div><div class='hunk'>@@ -1879,7 +1880,7 @@ vortex_connection_src_src_adbdma(vortex_t * vortex, int en,</div><div class='ctx'> 			ADB_DMA(adbdma));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// mix to absolut address.</div><div class='add'>+// mix to absolute address.</div><div class='ctx'> static void</div><div class='ctx'> vortex_connection_mix_adb(vortex_t * vortex, int en, unsigned char ch,</div><div class='ctx'> 			  unsigned char mix, unsigned char dest)</div><div class='hunk'>@@ -1961,7 +1962,7 @@ vortex_connect_codecplay(vortex_t * vortex, int en, unsigned char mixers[])</div><div class='ctx'> 					  ADB_CODECOUT(0 + 4));</div><div class='ctx'> 		vortex_connection_mix_adb(vortex, en, 0x11, mixers[3],</div><div class='ctx'> 					  ADB_CODECOUT(1 + 4));</div><div class='del'>-		/* printk(KERN_DEBUG "SDAC detected "); */</div><div class='add'>+		/* pr_debug( "SDAC detected "); */</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	// Use plain direct output to codec.</div><div class='hunk'>@@ -1988,7 +1989,7 @@ vortex_connect_codecrec(vortex_t * vortex, int en, unsigned char mixin0,</div><div class='ctx'> // Higher level ADB audio path (de)allocator.</div><div class='ctx'> </div><div class='ctx'> /* Resource manager */</div><div class='del'>-static int resnum[VORTEX_RESOURCE_LAST] =</div><div class='add'>+static const int resnum[VORTEX_RESOURCE_LAST] =</div><div class='ctx'>     { NR_ADB, NR_SRC, NR_MIXIN, NR_MIXOUT, NR_A3D };</div><div class='ctx'> /*</div><div class='ctx'>  Checkout/Checkin resource of given type. </div><div class='hunk'>@@ -1997,7 +1998,7 @@ static int resnum[VORTEX_RESOURCE_LAST] =</div><div class='ctx'>  out: Mean checkout if != 0. Else mean Checkin resource.</div><div class='ctx'>  restype: Indicates type of resource to be checked in or out.</div><div class='ctx'> */</div><div class='del'>-static char</div><div class='add'>+static int</div><div class='ctx'> vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)</div><div class='ctx'> {</div><div class='ctx'> 	int i, qty = resnum[restype], resinuse = 0;</div><div class='hunk'>@@ -2016,7 +2017,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)</div><div class='ctx'> 				else</div><div class='ctx'> 					vortex-&gt;dma_adb[i].resources[restype] |= (1 &lt;&lt; i);</div><div class='ctx'> 				/*</div><div class='del'>-				printk(KERN_DEBUG</div><div class='add'>+				pr_debug(</div><div class='ctx'> 				       "vortex: ResManager: type %d out %d\n",</div><div class='ctx'> 				       restype, i);</div><div class='ctx'> 				*/</div><div class='hunk'>@@ -2031,7 +2032,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)</div><div class='ctx'> 			if (resmap[restype] &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 				resmap[restype] &amp;= ~(1 &lt;&lt; i);</div><div class='ctx'> 				/*</div><div class='del'>-				printk(KERN_DEBUG</div><div class='add'>+				pr_debug(</div><div class='ctx'> 				       "vortex: ResManager: type %d in %d\n",</div><div class='ctx'> 				       restype, i);</div><div class='ctx'> 				*/</div><div class='hunk'>@@ -2039,13 +2040,13 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_ERR "vortex: FATAL: ResManager: resource type %d exhausted.\n", restype);</div><div class='add'>+	dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+		"FATAL: ResManager: resource type %d exhausted.\n",</div><div class='add'>+		restype);</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Default Connections  */</div><div class='del'>-static int</div><div class='del'>-vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type);</div><div class='ctx'> </div><div class='ctx'> static void vortex_connect_default(vortex_t * vortex, int en)</div><div class='ctx'> {</div><div class='hunk'>@@ -2105,15 +2106,13 @@ static void vortex_connect_default(vortex_t * vortex, int en)</div><div class='ctx'>   Return: Return allocated DMA or same DMA passed as "dma" when dma &gt;= 0.</div><div class='ctx'> */</div><div class='ctx'> static int</div><div class='del'>-vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='add'>+vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,</div><div class='add'>+			int type, int subdev)</div><div class='ctx'> {</div><div class='ctx'> 	stream_t *stream;</div><div class='ctx'> 	int i, en;</div><div class='add'>+	struct pcm_vol *p;</div><div class='ctx'> 	</div><div class='del'>-	if ((nr_ch == 3)</div><div class='del'>-	    || ((dir == SNDRV_PCM_STREAM_CAPTURE) &amp;&amp; (nr_ch &gt; 2)))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='ctx'> 	if (dma &gt;= 0) {</div><div class='ctx'> 		en = 0;</div><div class='ctx'> 		vortex_adb_checkinout(vortex,</div><div class='hunk'>@@ -2121,9 +2120,9 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='ctx'> 				      VORTEX_RESOURCE_DMA);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		en = 1;</div><div class='del'>-		if ((dma =</div><div class='del'>-		     vortex_adb_checkinout(vortex, NULL, en,</div><div class='del'>-					   VORTEX_RESOURCE_DMA)) &lt; 0)</div><div class='add'>+		dma = vortex_adb_checkinout(vortex, NULL, en,</div><div class='add'>+					    VORTEX_RESOURCE_DMA);</div><div class='add'>+		if (dma &lt; 0)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2141,22 +2140,23 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='ctx'> 		/* Get SRC and MIXER hardware resources. */</div><div class='ctx'> 		if (stream-&gt;type != VORTEX_PCM_SPDIF) {</div><div class='ctx'> 			for (i = 0; i &lt; nr_ch; i++) {</div><div class='del'>-				if ((src[i] = vortex_adb_checkinout(vortex,</div><div class='del'>-							   stream-&gt;resources, en,</div><div class='del'>-							   VORTEX_RESOURCE_SRC)) &lt; 0) {</div><div class='add'>+				src[i] = vortex_adb_checkinout(vortex,</div><div class='add'>+							       stream-&gt;resources, en,</div><div class='add'>+							       VORTEX_RESOURCE_SRC);</div><div class='add'>+				if (src[i] &lt; 0) {</div><div class='ctx'> 					memset(stream-&gt;resources, 0,</div><div class='del'>-					       sizeof(unsigned char) *</div><div class='del'>-					       VORTEX_RESOURCE_LAST);</div><div class='add'>+					       sizeof(stream-&gt;resources));</div><div class='ctx'> 					return -EBUSY;</div><div class='ctx'> 				}</div><div class='ctx'> 				if (stream-&gt;type != VORTEX_PCM_A3D) {</div><div class='del'>-					if ((mix[i] = vortex_adb_checkinout(vortex,</div><div class='del'>-								   stream-&gt;resources,</div><div class='del'>-								   en,</div><div class='del'>-								   VORTEX_RESOURCE_MIXIN)) &lt; 0) {</div><div class='add'>+					mix[i] = vortex_adb_checkinout(vortex,</div><div class='add'>+								       stream-&gt;resources,</div><div class='add'>+								       en,</div><div class='add'>+								       VORTEX_RESOURCE_MIXIN);</div><div class='add'>+					if (mix[i] &lt; 0) {</div><div class='ctx'> 						memset(stream-&gt;resources,</div><div class='ctx'> 						       0,</div><div class='del'>-						       sizeof(unsigned char) * VORTEX_RESOURCE_LAST);</div><div class='add'>+						       sizeof(stream-&gt;resources));</div><div class='ctx'> 						return -EBUSY;</div><div class='ctx'> 					}</div><div class='ctx'> 				}</div><div class='hunk'>@@ -2164,18 +2164,19 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='ctx'> 		}</div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> 		if (stream-&gt;type == VORTEX_PCM_A3D) {</div><div class='del'>-			if ((a3d =</div><div class='del'>-			     vortex_adb_checkinout(vortex,</div><div class='del'>-						   stream-&gt;resources, en,</div><div class='del'>-						   VORTEX_RESOURCE_A3D)) &lt; 0) {</div><div class='add'>+			a3d = vortex_adb_checkinout(vortex,</div><div class='add'>+						    stream-&gt;resources, en,</div><div class='add'>+						    VORTEX_RESOURCE_A3D);</div><div class='add'>+			if (a3d &lt; 0) {</div><div class='ctx'> 				memset(stream-&gt;resources, 0,</div><div class='del'>-				       sizeof(unsigned char) *</div><div class='del'>-				       VORTEX_RESOURCE_LAST);</div><div class='del'>-				printk(KERN_ERR "vortex: out of A3D sources. Sorry\n");</div><div class='add'>+				       sizeof(stream-&gt;resources));</div><div class='add'>+				dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+					"out of A3D sources. Sorry\n");</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			}</div><div class='ctx'> 			/* (De)Initialize A3D hardware source. */</div><div class='del'>-			vortex_Vort3D_InitializeSource(&amp;(vortex-&gt;a3d[a3d]), en);</div><div class='add'>+			vortex_Vort3D_InitializeSource(&amp;vortex-&gt;a3d[a3d], en,</div><div class='add'>+						       vortex);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Make SPDIF out exclusive to "spdif" device when in use. */</div><div class='ctx'> 		if ((stream-&gt;type == VORTEX_PCM_SPDIF) &amp;&amp; (en)) {</div><div class='hunk'>@@ -2244,6 +2245,14 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='ctx'> 							      MIX_DEFIGAIN);</div><div class='ctx'> #endif</div><div class='ctx'> 			}</div><div class='add'>+			if (stream-&gt;type == VORTEX_PCM_ADB &amp;&amp; en) {</div><div class='add'>+				p = &amp;vortex-&gt;pcm_vol[subdev];</div><div class='add'>+				p-&gt;dma = dma;</div><div class='add'>+				for (i = 0; i &lt; nr_ch; i++)</div><div class='add'>+					p-&gt;mixin[i] = mix[i];</div><div class='add'>+				for (i = 0; i &lt; ch_top; i++)</div><div class='add'>+					p-&gt;vol[i] = 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> 		else {</div><div class='hunk'>@@ -2266,25 +2275,25 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		int src[2], mix[2];</div><div class='ctx'> </div><div class='add'>+		if (nr_ch &lt; 1)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 		/* Get SRC and MIXER hardware resources. */</div><div class='ctx'> 		for (i = 0; i &lt; nr_ch; i++) {</div><div class='del'>-			if ((mix[i] =</div><div class='del'>-			     vortex_adb_checkinout(vortex,</div><div class='del'>-						   stream-&gt;resources, en,</div><div class='del'>-						   VORTEX_RESOURCE_MIXOUT))</div><div class='del'>-			    &lt; 0) {</div><div class='add'>+			mix[i] = vortex_adb_checkinout(vortex,</div><div class='add'>+						       stream-&gt;resources, en,</div><div class='add'>+						       VORTEX_RESOURCE_MIXOUT);</div><div class='add'>+			if (mix[i] &lt; 0) {</div><div class='ctx'> 				memset(stream-&gt;resources, 0,</div><div class='del'>-				       sizeof(unsigned char) *</div><div class='del'>-				       VORTEX_RESOURCE_LAST);</div><div class='add'>+				       sizeof(stream-&gt;resources));</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			}</div><div class='del'>-			if ((src[i] =</div><div class='del'>-			     vortex_adb_checkinout(vortex,</div><div class='del'>-						   stream-&gt;resources, en,</div><div class='del'>-						   VORTEX_RESOURCE_SRC)) &lt; 0) {</div><div class='add'>+			src[i] = vortex_adb_checkinout(vortex,</div><div class='add'>+						       stream-&gt;resources, en,</div><div class='add'>+						       VORTEX_RESOURCE_SRC);</div><div class='add'>+			if (src[i] &lt; 0) {</div><div class='ctx'> 				memset(stream-&gt;resources, 0,</div><div class='del'>-				       sizeof(unsigned char) *</div><div class='del'>-				       VORTEX_RESOURCE_LAST);</div><div class='add'>+				       sizeof(stream-&gt;resources));</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2411,7 +2420,7 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	hwread(vortex-&gt;mmio, VORTEX_IRQ_SOURCE);</div><div class='ctx'> 	// Is at least one IRQ flag set?</div><div class='ctx'> 	if (source == 0) {</div><div class='del'>-		printk(KERN_ERR "vortex: missing irq source\n");</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev, "missing irq source\n");</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2419,19 +2428,19 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	// Attend every interrupt source.</div><div class='ctx'> 	if (unlikely(source &amp; IRQ_ERR_MASK)) {</div><div class='ctx'> 		if (source &amp; IRQ_FATAL) {</div><div class='del'>-			printk(KERN_ERR "vortex: IRQ fatal error\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "IRQ fatal error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (source &amp; IRQ_PARITY) {</div><div class='del'>-			printk(KERN_ERR "vortex: IRQ parity error\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "IRQ parity error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (source &amp; IRQ_REG) {</div><div class='del'>-			printk(KERN_ERR "vortex: IRQ reg error\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "IRQ reg error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (source &amp; IRQ_FIFO) {</div><div class='del'>-			printk(KERN_ERR "vortex: IRQ fifo error\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "IRQ fifo error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (source &amp; IRQ_DMA) {</div><div class='del'>-			printk(KERN_ERR "vortex: IRQ dma error\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev, "IRQ dma error\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2451,7 +2460,12 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id)</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 		for (i = 0; i &lt; NR_WT; i++) {</div><div class='ctx'> 			if (vortex-&gt;dma_wt[i].fifo_status == FIFO_START) {</div><div class='del'>-				if (vortex_wtdma_bufshift(vortex, i)) ;</div><div class='add'>+				/* FIXME: we ignore the return value from</div><div class='add'>+				 * vortex_wtdma_bufshift() below as the delta</div><div class='add'>+				 * calculation seems not working for wavetable</div><div class='add'>+				 * by some reason</div><div class='add'>+				 */</div><div class='add'>+				vortex_wtdma_bufshift(vortex, i);</div><div class='ctx'> 				spin_unlock(&amp;vortex-&gt;lock);</div><div class='ctx'> 				snd_pcm_period_elapsed(vortex-&gt;dma_wt[i].</div><div class='ctx'> 						       substream);</div><div class='hunk'>@@ -2467,14 +2481,14 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		hwread(vortex-&gt;mmio, VORTEX_IRQ_STAT);</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='del'>-	if (source &amp; IRQ_MIDI) {</div><div class='add'>+	if ((source &amp; IRQ_MIDI) &amp;&amp; vortex-&gt;rmidi) {</div><div class='ctx'> 		snd_mpu401_uart_interrupt(vortex-&gt;irq,</div><div class='ctx'> 					  vortex-&gt;rmidi-&gt;private_data);</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!handled) {</div><div class='del'>-		printk(KERN_ERR "vortex: unknown irq source %x\n", source);</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev, "unknown irq source %x\n", source);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='hunk'>@@ -2531,7 +2545,7 @@ vortex_codec_write(struct snd_ac97 * codec, unsigned short addr, unsigned short</div><div class='ctx'> 	while (!(hwread(card-&gt;mmio, VORTEX_CODEC_CTRL) &amp; 0x100)) {</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 		if (lifeboat++ &gt; POLL_COUNT) {</div><div class='del'>-			printk(KERN_ERR "vortex: ac97 codec stuck busy\n");</div><div class='add'>+			dev_err(card-&gt;card-&gt;dev, "ac97 codec stuck busy\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2557,7 +2571,7 @@ static unsigned short vortex_codec_read(struct snd_ac97 * codec, unsigned short</div><div class='ctx'> 	while (!(hwread(card-&gt;mmio, VORTEX_CODEC_CTRL) &amp; 0x100)) {</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 		if (lifeboat++ &gt; POLL_COUNT) {</div><div class='del'>-			printk(KERN_ERR "vortex: ac97 codec stuck busy\n");</div><div class='add'>+			dev_err(card-&gt;card-&gt;dev, "ac97 codec stuck busy\n");</div><div class='ctx'> 			return 0xffff;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2571,7 +2585,8 @@ static unsigned short vortex_codec_read(struct snd_ac97 * codec, unsigned short</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 		data = hwread(card-&gt;mmio, VORTEX_CODEC_IO);</div><div class='ctx'> 		if (lifeboat++ &gt; POLL_COUNT) {</div><div class='del'>-			printk(KERN_ERR "vortex: ac97 address never arrived\n");</div><div class='add'>+			dev_err(card-&gt;card-&gt;dev,</div><div class='add'>+				"ac97 address never arrived\n");</div><div class='ctx'> 			return 0xffff;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while ((data &amp; VORTEX_CODEC_ADDMASK) !=</div><div class='hunk'>@@ -2608,7 +2623,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)</div><div class='ctx'> 			else</div><div class='ctx'> 				edi = 0x1ffff;</div><div class='ctx'> 		} else {</div><div class='del'>-			i = edi = 0x800;</div><div class='add'>+			edi = 0x800;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* this_04 and this_08 are the CASp4Src's (samplerate converters) */</div><div class='ctx'> 		vortex_src_setupchannel(vortex, this_04, edi, 0, 1,</div><div class='hunk'>@@ -2665,10 +2680,10 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)</div><div class='ctx'> </div><div class='ctx'> /* Initialization */</div><div class='ctx'> </div><div class='del'>-static int __devinit vortex_core_init(vortex_t * vortex)</div><div class='add'>+static int vortex_core_init(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Vortex: init.... ");</div><div class='add'>+	dev_info(vortex-&gt;card-&gt;dev, "init started\n");</div><div class='ctx'> 	/* Hardware Init. */</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, VORTEX_CTRL, 0xffffffff);</div><div class='ctx'> 	msleep(5);</div><div class='hunk'>@@ -2713,7 +2728,7 @@ static int __devinit vortex_core_init(vortex_t * vortex)</div><div class='ctx'> 	//vortex_enable_timer_int(vortex);</div><div class='ctx'> 	//vortex_disable_timer_int(vortex);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "done.\n");</div><div class='add'>+	dev_info(vortex-&gt;card-&gt;dev, "init.... done.\n");</div><div class='ctx'> 	spin_lock_init(&amp;vortex-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2722,7 +2737,7 @@ static int __devinit vortex_core_init(vortex_t * vortex)</div><div class='ctx'> static int vortex_core_shutdown(vortex_t * vortex)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "Vortex: shutdown...");</div><div class='add'>+	dev_info(vortex-&gt;card-&gt;dev, "shutdown started\n");</div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> 	vortex_eq_free(vortex);</div><div class='ctx'> 	vortex_Vort3D_disable(vortex);</div><div class='hunk'>@@ -2744,13 +2759,13 @@ static int vortex_core_shutdown(vortex_t * vortex)</div><div class='ctx'> 	msleep(5);</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, VORTEX_IRQ_SOURCE, 0xffff);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "done.\n");</div><div class='add'>+	dev_info(vortex-&gt;card-&gt;dev, "shutdown.... done.\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Alsa support. */</div><div class='ctx'> </div><div class='del'>-static int vortex_alsafmt_aspfmt(int alsafmt)</div><div class='add'>+static int vortex_alsafmt_aspfmt(snd_pcm_format_t alsafmt, vortex_t *v)</div><div class='ctx'> {</div><div class='ctx'> 	int fmt;</div><div class='ctx'> </div><div class='hunk'>@@ -2778,7 +2793,8 @@ static int vortex_alsafmt_aspfmt(int alsafmt)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		fmt = 0x8;</div><div class='del'>-		printk(KERN_ERR "vortex: format unsupported %d\n", alsafmt);</div><div class='add'>+		dev_err(v-&gt;card-&gt;dev,</div><div class='add'>+			"format unsupported %d\n", alsafmt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return fmt;</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c<br/>index 38602b85874d..81a63b5bb31c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_eq.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_eq.c</div><div class='ctx'>  *  Aureal Vortex Hardware EQ control/access.</div><div class='hunk'>@@ -15,19 +16,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -63,7 +51,7 @@ static inline u16 sign_invert(u16 a)</div><div class='ctx'> 		return -a;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 coefs[])</div><div class='add'>+static void vortex_EqHw_SetLeftCoefs(vortex_t *vortex, const u16 coefs[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int i = 0, n /*esp2c */;</div><div class='hunk'>@@ -85,7 +73,7 @@ static void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 coefs[])</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetRightCoefs(vortex_t * vortex, u16 coefs[])</div><div class='add'>+static void vortex_EqHw_SetRightCoefs(vortex_t *vortex, const u16 coefs[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int i = 0, n /*esp2c */;</div><div class='hunk'>@@ -108,7 +96,7 @@ static void vortex_EqHw_SetRightCoefs(vortex_t * vortex, u16 coefs[])</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetLeftStates(vortex_t * vortex, u16 a[], u16 b[])</div><div class='add'>+static void vortex_EqHw_SetLeftStates(vortex_t *vortex, const u16 a[], const u16 b[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int i = 0, ebx;</div><div class='hunk'>@@ -125,7 +113,7 @@ static void vortex_EqHw_SetLeftStates(vortex_t * vortex, u16 a[], u16 b[])</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetRightStates(vortex_t * vortex, u16 a[], u16 b[])</div><div class='add'>+static void vortex_EqHw_SetRightStates(vortex_t *vortex, const u16 a[], const u16 b[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int i = 0, ebx;</div><div class='hunk'>@@ -218,7 +206,7 @@ vortex_EqHw_SetRightGainsSingleTarget(vortex_t * vortex, u16 index, u16 b)</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, 0x2b20c + (index * 0x30), b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetLeftGainsTarget(vortex_t * vortex, u16 a[])</div><div class='add'>+static void vortex_EqHw_SetLeftGainsTarget(vortex_t *vortex, const u16 a[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int ebx;</div><div class='hunk'>@@ -228,7 +216,7 @@ static void vortex_EqHw_SetLeftGainsTarget(vortex_t * vortex, u16 a[])</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetRightGainsTarget(vortex_t * vortex, u16 a[])</div><div class='add'>+static void vortex_EqHw_SetRightGainsTarget(vortex_t *vortex, const u16 a[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int ebx;</div><div class='hunk'>@@ -238,7 +226,7 @@ static void vortex_EqHw_SetRightGainsTarget(vortex_t * vortex, u16 a[])</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetLeftGainsCurrent(vortex_t * vortex, u16 a[])</div><div class='add'>+static void vortex_EqHw_SetLeftGainsCurrent(vortex_t *vortex, const u16 a[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int ebx;</div><div class='hunk'>@@ -248,7 +236,7 @@ static void vortex_EqHw_SetLeftGainsCurrent(vortex_t * vortex, u16 a[])</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_EqHw_SetRightGainsCurrent(vortex_t * vortex, u16 a[])</div><div class='add'>+static void vortex_EqHw_SetRightGainsCurrent(vortex_t *vortex, const u16 a[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int ebx;</div><div class='hunk'>@@ -321,7 +309,7 @@ static void vortex_EqHw_GetRightGainsCurrent(vortex_t * vortex, u16 a[])</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> /* EQ band levels settings */</div><div class='del'>-static void vortex_EqHw_SetLevels(vortex_t * vortex, u16 peaks[])</div><div class='add'>+static void vortex_EqHw_SetLevels(vortex_t *vortex, const u16 peaks[])</div><div class='ctx'> {</div><div class='ctx'> 	eqhw_t *eqhw = &amp;(vortex-&gt;eq.this04);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -580,13 +568,13 @@ static int vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex_t * vortex)</div><div class='ctx'> 	eqlzr_t *eq = &amp;(vortex-&gt;eq);</div><div class='ctx'> </div><div class='ctx'> 	vortex_EqHw_SetLeftGainsTarget(vortex, eq-&gt;this130);</div><div class='del'>-	vortex_EqHw_SetRightGainsTarget(vortex, &amp;(eq-&gt;this130[eq-&gt;this10]));</div><div class='add'>+	vortex_EqHw_SetRightGainsTarget(vortex, eq-&gt;this130 + eq-&gt;this10);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-vortex_Eqlzr_SetAllBands(vortex_t * vortex, u16 gains[], s32 count)</div><div class='add'>+vortex_Eqlzr_SetAllBands(vortex_t *vortex, const u16 gains[], s32 count)</div><div class='ctx'> {</div><div class='ctx'> 	eqlzr_t *eq = &amp;(vortex-&gt;eq);</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -757,7 +745,7 @@ snd_vortex_eqtoggle_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 1;		/* Allways changes */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vortex_eqtoggle_kcontrol __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new vortex_eqtoggle_kcontrol = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "EQ Enable",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -815,7 +803,7 @@ snd_vortex_eq_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucon</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vortex_eq_kcontrol __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new vortex_eq_kcontrol = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "                        .",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -845,7 +833,8 @@ snd_vortex_peaks_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *u</div><div class='ctx'> </div><div class='ctx'> 	vortex_Eqlzr_GetAllPeaks(vortex, peaks, &amp;count);</div><div class='ctx'> 	if (count != 20) {</div><div class='del'>-		printk(KERN_ERR "vortex: peak count error 20 != %d \n", count);</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+			"peak count error 20 != %d\n", count);</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 20; i++)</div><div class='hunk'>@@ -854,7 +843,7 @@ snd_vortex_peaks_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *u</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new vortex_levels_kcontrol __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new vortex_levels_kcontrol = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "EQ Peaks",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='hunk'>@@ -863,7 +852,7 @@ static struct snd_kcontrol_new vortex_levels_kcontrol __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* EQ band gain labels. */</div><div class='del'>-static char *EqBandLabels[10] __devinitdata = {</div><div class='add'>+static const char * const EqBandLabels[10] = {</div><div class='ctx'> 	"EQ0 31Hz\0",</div><div class='ctx'> 	"EQ1 63Hz\0",</div><div class='ctx'> 	"EQ2 125Hz\0",</div><div class='hunk'>@@ -877,35 +866,40 @@ static char *EqBandLabels[10] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ALSA driver entry points. Init and exit. */</div><div class='del'>-static int __devinit vortex_eq_init(vortex_t * vortex)</div><div class='add'>+static int vortex_eq_init(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol *kcontrol;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	vortex_Eqlzr_init(vortex);</div><div class='ctx'> </div><div class='del'>-	if ((kcontrol =</div><div class='del'>-	     snd_ctl_new1(&amp;vortex_eqtoggle_kcontrol, vortex)) == NULL)</div><div class='add'>+	kcontrol = snd_ctl_new1(&amp;vortex_eqtoggle_kcontrol, vortex);</div><div class='add'>+	if (!kcontrol)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kcontrol-&gt;private_value = 0;</div><div class='del'>-	if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* EQ gain controls */</div><div class='ctx'> 	for (i = 0; i &lt; 10; i++) {</div><div class='del'>-		if ((kcontrol =</div><div class='del'>-		     snd_ctl_new1(&amp;vortex_eq_kcontrol, vortex)) == NULL)</div><div class='add'>+		kcontrol = snd_ctl_new1(&amp;vortex_eq_kcontrol, vortex);</div><div class='add'>+		if (!kcontrol)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		strcpy(kcontrol-&gt;id.name, EqBandLabels[i]);</div><div class='add'>+		snprintf(kcontrol-&gt;id.name, sizeof(kcontrol-&gt;id.name),</div><div class='add'>+			"%s Playback Volume", EqBandLabels[i]);</div><div class='ctx'> 		kcontrol-&gt;private_value = i;</div><div class='del'>-		if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		//vortex-&gt;eqctrl[i] = kcontrol;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* EQ band levels */</div><div class='del'>-	if ((kcontrol = snd_ctl_new1(&amp;vortex_levels_kcontrol, vortex)) == NULL)</div><div class='add'>+	kcontrol = snd_ctl_new1(&amp;vortex_levels_kcontrol, vortex);</div><div class='add'>+	if (!kcontrol)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if ((err = snd_ctl_add(vortex-&gt;card, kcontrol)) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(vortex-&gt;card, kcontrol);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_eq.h b/sound/pci/au88x0/au88x0_eq.h<br/>index 474cd0046294..797cdae1db98 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eq.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_eq.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef AU88X0_EQ_H</div><div class='ctx'> #define AU88X0_EQ_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_eqdata.c b/sound/pci/au88x0/au88x0_eqdata.c<br/>index ce8dca8ce1e2..a74f266f0bd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eqdata.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_eqdata.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_eqdata.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_eqdata.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /* Data structs */</div><div class='ctx'> </div><div class='del'>-static u16 asEqCoefsZeros[50] = {</div><div class='add'>+static const u16 asEqCoefsZeros[50] = {</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='hunk'>@@ -13,7 +14,7 @@ static u16 asEqCoefsZeros[50] = {</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u16 asEqCoefsPipes[64] = {</div><div class='add'>+static const u16 asEqCoefsPipes[64] = {</div><div class='ctx'> 	0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0666, 0x0000, 0x0000, 0x0666,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='hunk'>@@ -32,7 +33,7 @@ static u16 asEqCoefsPipes[64] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* More coef sets can be found in the win2k "inf" file. */</div><div class='del'>-static auxxEqCoeffSet_t asEqCoefsNormal = {</div><div class='add'>+static const auxxEqCoeffSet_t asEqCoefsNormal = {</div><div class='ctx'> 	.LeftCoefs = {</div><div class='ctx'> 		      0x7e60, 0xc19e, 0x0001, 0x0002, 0x0001,</div><div class='ctx'> 		      0x7fa0, 0xc05f, 0x004f, 0x0000, 0xffb1,</div><div class='hunk'>@@ -65,7 +66,7 @@ static auxxEqCoeffSet_t asEqCoefsNormal = {</div><div class='ctx'> 		       0x3e96, 0x3e96, 0x3e96, 0x3e96, 0x3e96}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u16 eq_gains_normal[20] = {</div><div class='add'>+static const u16 eq_gains_normal[20] = {</div><div class='ctx'> 	0x3e96, 0x3e96, 0x3e96, 0x3e96, 0x3e96,</div><div class='ctx'> 	0x3e96, 0x3e96, 0x3e96, 0x3e96, 0x3e96,</div><div class='ctx'> 	0x3e96, 0x3e96, 0x3e96, 0x3e96, 0x3e96,</div><div class='hunk'>@@ -73,22 +74,22 @@ static u16 eq_gains_normal[20] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* _rodatab60 */</div><div class='del'>-static u16 eq_gains_zero[10] = {</div><div class='add'>+static const u16 eq_gains_zero[10] = {</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* _rodatab7c:  ProgramPipe */</div><div class='del'>-static u16 eq_gains_current[12] = {</div><div class='add'>+static const u16 eq_gains_current[12] = {</div><div class='ctx'> 	0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff,</div><div class='ctx'> 	0x7fff,</div><div class='ctx'> 	0x7fff, 0x7fff, 0x7fff</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* _rodatab78 */</div><div class='del'>-static u16 eq_states_zero[2] = { 0x0000, 0x0000 };</div><div class='add'>+static const u16 eq_states_zero[2] = { 0x0000, 0x0000 };</div><div class='ctx'> </div><div class='del'>-static u16 asEqOutStateZeros[48] = {</div><div class='add'>+static const u16 asEqOutStateZeros[48] = {</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000,</div><div class='hunk'>@@ -104,7 +105,7 @@ static u16 asEqOutStateZeros[48] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*_rodataba0:*/</div><div class='del'>-static u16 eq_levels[64] = {</div><div class='add'>+static const u16 eq_levels[64] = {</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='ctx'> 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_game.c b/sound/pci/au88x0/au88x0_game.c<br/>index e291aa59742e..51c154e34026 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_game.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_game.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_game.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_game.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Manuel Jander.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *  Vojtech Pavlik</div><div class='ctx'>  *  Raymond Ingles</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * Should you need to contact me, the author, you can do so either by</div><div class='ctx'>  * e-mail - mail your message to &lt;vojtech@suse.cz&gt;, or by paper mail:</div><div class='ctx'>  * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic</div><div class='hunk'>@@ -34,8 +21,9 @@</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include "au88x0.h"</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> </div><div class='ctx'> #define VORTEX_GAME_DWAIT	20	/* 20 ms */</div><div class='ctx'> </div><div class='hunk'>@@ -91,15 +79,16 @@ static int vortex_game_open(struct gameport *gameport, int mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit vortex_gameport_register(vortex_t * vortex)</div><div class='add'>+static int vortex_gameport_register(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> </div><div class='ctx'> 	vortex-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "vortex: cannot allocate memory for gameport\n");</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	};</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	gameport_set_name(gp, "AU88x0 Gameport");</div><div class='ctx'> 	gameport_set_phys(gp, "pci%s/gameport0", pci_name(vortex-&gt;pci_dev));</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_mixer.c b/sound/pci/au88x0/au88x0_mixer.c<br/>index 557c782ae4fc..00781a7fd28c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_mixer.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> /*</div><div class='ctx'>  * Vortex Mixer support.</div><div class='ctx'>  *</div><div class='hunk'>@@ -10,17 +11,27 @@</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include "au88x0.h"</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vortex_mixer(vortex_t * vortex)</div><div class='add'>+static int remove_ctl(struct snd_card *card, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+	memset(&amp;id, 0, sizeof(id));</div><div class='add'>+	strscpy(id.name, name);</div><div class='add'>+	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	return snd_ctl_remove_id(card, &amp;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_vortex_mixer(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = vortex_codec_write,</div><div class='ctx'> 		.read = vortex_codec_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(vortex-&gt;card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(vortex-&gt;card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	// Initialize AC97 codec stuff.</div><div class='hunk'>@@ -28,5 +39,7 @@ static int __devinit snd_vortex_mixer(vortex_t * vortex)</div><div class='ctx'> 	ac97.scaps = AC97_SCAP_NO_SPDIF;</div><div class='ctx'> 	err = snd_ac97_mixer(pbus, &amp;ac97, &amp;vortex-&gt;codec);</div><div class='ctx'> 	vortex-&gt;isquad = ((vortex-&gt;codec == NULL) ?  0 : (vortex-&gt;codec-&gt;ext_id&amp;0x80));</div><div class='add'>+	remove_ctl(vortex-&gt;card, "Master Mono Playback Volume");</div><div class='add'>+	remove_ctl(vortex-&gt;card, "Master Mono Playback Switch");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c<br/>index 0dc8d259d1ed..164f6b7039ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_mpu401.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_mpu401.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_mpu401.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_mpu401.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of MPU-401 in UART mode</div><div class='ctx'>  *</div><div class='ctx'>  *   Modified for the Aureal Vortex based Soundcards</div><div class='ctx'>  *   by Manuel Jander (mjande@embedded.cl).</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -41,7 +27,7 @@</div><div class='ctx'> #define MPU401_ENTER_UART	0x3f</div><div class='ctx'> #define MPU401_ACK		    0xfe</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vortex_midi(vortex_t * vortex)</div><div class='add'>+static int snd_vortex_midi(vortex_t *vortex)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int temp, mode;</div><div class='hunk'>@@ -73,7 +59,7 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)</div><div class='ctx'> 	/* Check if anything is OK. */</div><div class='ctx'> 	temp = hwread(vortex-&gt;mmio, VORTEX_MIDI_DATA);</div><div class='ctx'> 	if (temp != MPU401_ACK /*0xfe */ ) {</div><div class='del'>-		printk(KERN_ERR "midi port doesn't acknowledge!\n");</div><div class='add'>+		dev_err(vortex-&gt;card-&gt;dev, "midi port doesn't acknowledge!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Enable MPU401 interrupts. */</div><div class='hunk'>@@ -82,9 +68,9 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)</div><div class='ctx'> </div><div class='ctx'> 	/* Create MPU401 instance. */</div><div class='ctx'> #ifdef VORTEX_MPU401_LEGACY</div><div class='del'>-	if ((temp =</div><div class='del'>-	     snd_mpu401_uart_new(vortex-&gt;card, 0, MPU401_HW_MPU401, 0x330,</div><div class='del'>-				 0, 0, 0, &amp;rmidi)) != 0) {</div><div class='add'>+	temp = snd_mpu401_uart_new(vortex-&gt;card, 0, MPU401_HW_MPU401, 0x330,</div><div class='add'>+				   MPU401_INFO_IRQ_HOOK, -1, &amp;rmidi);</div><div class='add'>+	if (temp) {</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_CTRL,</div><div class='ctx'> 			(hwread(vortex-&gt;mmio, VORTEX_CTRL) &amp;</div><div class='ctx'> 			 ~CTRL_MIDI_PORT) &amp; ~CTRL_MIDI_EN);</div><div class='hunk'>@@ -92,10 +78,10 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)</div><div class='ctx'> 	}</div><div class='ctx'> #else</div><div class='ctx'> 	port = (unsigned long)(vortex-&gt;mmio + VORTEX_MIDI_DATA);</div><div class='del'>-	if ((temp =</div><div class='del'>-	     snd_mpu401_uart_new(vortex-&gt;card, 0, MPU401_HW_AUREAL, port,</div><div class='del'>-				 MPU401_INFO_INTEGRATED | MPU401_INFO_MMIO,</div><div class='del'>-				 0, 0, &amp;rmidi)) != 0) {</div><div class='add'>+	temp = snd_mpu401_uart_new(vortex-&gt;card, 0, MPU401_HW_AUREAL, port,</div><div class='add'>+				   MPU401_INFO_INTEGRATED | MPU401_INFO_MMIO |</div><div class='add'>+				   MPU401_INFO_IRQ_HOOK, -1, &amp;rmidi);</div><div class='add'>+	if (temp) {</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, VORTEX_CTRL,</div><div class='ctx'> 			(hwread(vortex-&gt;mmio, VORTEX_CTRL) &amp;</div><div class='ctx'> 			 ~CTRL_MIDI_PORT) &amp; ~CTRL_MIDI_EN);</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c<br/>index b9d2f202cf9b..546f71220604 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_pcm.c</a></div><div class='hunk'>@@ -1,17 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> /*</div><div class='hunk'>@@ -30,7 +18,7 @@</div><div class='ctx'> #define VORTEX_PCM_TYPE(x) (x-&gt;name[40])</div><div class='ctx'> </div><div class='ctx'> /* hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_vortex_playback_hw_adb = {</div><div class='add'>+static const struct snd_pcm_hardware snd_vortex_playback_hw_adb = {</div><div class='ctx'> 	.info =</div><div class='ctx'> 	    (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */</div><div class='ctx'> 	     SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -42,20 +30,16 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_adb = {</div><div class='ctx'> 	.rate_min = 5000,</div><div class='ctx'> 	.rate_max = 48000,</div><div class='ctx'> 	.channels_min = 1,</div><div class='del'>-#ifdef CHIP_AU8830</div><div class='del'>-	.channels_max = 4,</div><div class='del'>-#else</div><div class='ctx'> 	.channels_max = 2,</div><div class='del'>-#endif</div><div class='ctx'> 	.buffer_bytes_max = 0x10000,</div><div class='del'>-	.period_bytes_min = 0x1,</div><div class='add'>+	.period_bytes_min = 0x20,</div><div class='ctx'> 	.period_bytes_max = 0x1000,</div><div class='ctx'> 	.periods_min = 2,</div><div class='del'>-	.periods_max = 32,</div><div class='add'>+	.periods_max = 1024,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='del'>-static struct snd_pcm_hardware snd_vortex_playback_hw_a3d = {</div><div class='add'>+static const struct snd_pcm_hardware snd_vortex_playback_hw_a3d = {</div><div class='ctx'> 	.info =</div><div class='ctx'> 	    (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */</div><div class='ctx'> 	     SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -75,7 +59,7 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_a3d = {</div><div class='ctx'> 	.periods_max = 64,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='del'>-static struct snd_pcm_hardware snd_vortex_playback_hw_spdif = {</div><div class='add'>+static const struct snd_pcm_hardware snd_vortex_playback_hw_spdif = {</div><div class='ctx'> 	.info =</div><div class='ctx'> 	    (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */</div><div class='ctx'> 	     SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -98,7 +82,7 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_spdif = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='del'>-static struct snd_pcm_hardware snd_vortex_playback_hw_wt = {</div><div class='add'>+static const struct snd_pcm_hardware snd_vortex_playback_hw_wt = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -115,6 +99,29 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_wt = {</div><div class='ctx'> 	.periods_max = 64,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='add'>+#ifdef CHIP_AU8830</div><div class='add'>+static const unsigned int au8830_channels[3] = {</div><div class='add'>+	1, 2, 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_au8830_channels = {</div><div class='add'>+	.count = ARRAY_SIZE(au8830_channels),</div><div class='add'>+	.list = au8830_channels,</div><div class='add'>+	.mask = 0,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void vortex_notify_pcm_vol_change(struct snd_card *card,</div><div class='add'>+			struct snd_kcontrol *kctl, int activate)</div><div class='add'>+{</div><div class='add'>+	if (activate)</div><div class='add'>+		kctl-&gt;vd[0].access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	else</div><div class='add'>+		kctl-&gt;vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE |</div><div class='add'>+				SNDRV_CTL_EVENT_MASK_INFO, &amp;(kctl-&gt;id));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* open callback */</div><div class='ctx'> static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -123,16 +130,19 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Force equal size periods */</div><div class='del'>-	if ((err =</div><div class='del'>-	     snd_pcm_hw_constraint_integer(runtime,</div><div class='del'>-					   SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='add'>+					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* Avoid PAGE_SIZE boundary to fall inside of a period. */</div><div class='del'>-	if ((err =</div><div class='del'>-	     snd_pcm_hw_constraint_pow2(runtime, 0,</div><div class='del'>-					SNDRV_PCM_HW_PARAM_PERIOD_BYTES)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_pow2(runtime, 0,</div><div class='add'>+					 SNDRV_PCM_HW_PARAM_PERIOD_BYTES);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	snd_pcm_hw_constraint_step(runtime, 0,</div><div class='add'>+					SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 64);</div><div class='add'>+</div><div class='ctx'> 	if (VORTEX_PCM_TYPE(substream-&gt;pcm) != VORTEX_PCM_WT) {</div><div class='ctx'> #ifndef CHIP_AU8820</div><div class='ctx'> 		if (VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_A3D) {</div><div class='hunk'>@@ -156,6 +166,16 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		if (VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_ADB</div><div class='ctx'> 		    || VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_I2S)</div><div class='ctx'> 			runtime-&gt;hw = snd_vortex_playback_hw_adb;</div><div class='add'>+#ifdef CHIP_AU8830</div><div class='add'>+		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK &amp;&amp;</div><div class='add'>+			VORTEX_IS_QUAD(vortex) &amp;&amp;</div><div class='add'>+			VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_ADB) {</div><div class='add'>+			runtime-&gt;hw.channels_max = 4;</div><div class='add'>+			snd_pcm_hw_constraint_list(runtime, 0,</div><div class='add'>+				SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				&amp;hw_constraints_au8830_channels);</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='ctx'> 		substream-&gt;runtime-&gt;private_data = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='hunk'>@@ -189,17 +209,9 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	vortex_t *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	stream_t *stream = (stream_t *) (substream-&gt;runtime-&gt;private_data);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	// Alloc buffer memory.</div><div class='del'>-	err =</div><div class='del'>-	    snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Vortex: pcm page alloc failed!\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> 	/*</div><div class='del'>-	   printk(KERN_INFO "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params),</div><div class='add'>+	   pr_info( "Vortex: periods %d, period_bytes %d, channels = %d\n", params_periods(hw_params),</div><div class='ctx'> 	   params_period_bytes(hw_params), params_channels(hw_params));</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='hunk'>@@ -210,12 +222,14 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		if (stream != NULL)</div><div class='ctx'> 			vortex_adb_allocroute(chip, stream-&gt;dma,</div><div class='ctx'> 					      stream-&gt;nr_ch, stream-&gt;dir,</div><div class='del'>-					      stream-&gt;type);</div><div class='add'>+					      stream-&gt;type,</div><div class='add'>+					      substream-&gt;number);</div><div class='ctx'> 		/* Alloc routes. */</div><div class='ctx'> 		dma =</div><div class='ctx'> 		    vortex_adb_allocroute(chip, -1,</div><div class='ctx'> 					  params_channels(hw_params),</div><div class='del'>-					  substream-&gt;stream, type);</div><div class='add'>+					  substream-&gt;stream, type,</div><div class='add'>+					  substream-&gt;number);</div><div class='ctx'> 		if (dma &lt; 0) {</div><div class='ctx'> 			spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 			return dma;</div><div class='hunk'>@@ -226,6 +240,11 @@ snd_vortex_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		vortex_adbdma_setbuffers(chip, dma,</div><div class='ctx'> 					 params_period_bytes(hw_params),</div><div class='ctx'> 					 params_periods(hw_params));</div><div class='add'>+		if (VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_ADB) {</div><div class='add'>+			chip-&gt;pcm_vol[substream-&gt;number].active = 1;</div><div class='add'>+			vortex_notify_pcm_vol_change(chip-&gt;card,</div><div class='add'>+				chip-&gt;pcm_vol[substream-&gt;number].kctl, 1);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -255,10 +274,18 @@ static int snd_vortex_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	// Delete audio routes.</div><div class='ctx'> 	if (VORTEX_PCM_TYPE(substream-&gt;pcm) != VORTEX_PCM_WT) {</div><div class='del'>-		if (stream != NULL)</div><div class='add'>+		if (stream != NULL) {</div><div class='add'>+			if (VORTEX_PCM_TYPE(substream-&gt;pcm) == VORTEX_PCM_ADB) {</div><div class='add'>+				chip-&gt;pcm_vol[substream-&gt;number].active = 0;</div><div class='add'>+				vortex_notify_pcm_vol_change(chip-&gt;card,</div><div class='add'>+					chip-&gt;pcm_vol[substream-&gt;number].kctl,</div><div class='add'>+					0);</div><div class='add'>+			}</div><div class='ctx'> 			vortex_adb_allocroute(chip, stream-&gt;dma,</div><div class='ctx'> 					      stream-&gt;nr_ch, stream-&gt;dir,</div><div class='del'>-					      stream-&gt;type);</div><div class='add'>+					      stream-&gt;type,</div><div class='add'>+					      substream-&gt;number);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -269,7 +296,7 @@ static int snd_vortex_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = NULL;</div><div class='ctx'> 	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* prepare callback */</div><div class='hunk'>@@ -285,11 +312,11 @@ static int snd_vortex_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		dir = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		dir = 0;</div><div class='del'>-	fmt = vortex_alsafmt_aspfmt(runtime-&gt;format);</div><div class='add'>+	fmt = vortex_alsafmt_aspfmt(runtime-&gt;format, chip);</div><div class='ctx'> 	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (VORTEX_PCM_TYPE(substream-&gt;pcm) != VORTEX_PCM_WT) {</div><div class='del'>-		vortex_adbdma_setmode(chip, dma, 1, dir, fmt, 0 /*? */ ,</div><div class='del'>-				      0);</div><div class='add'>+		vortex_adbdma_setmode(chip, dma, 1, dir, fmt,</div><div class='add'>+				runtime-&gt;channels == 1 ? 0 : 1, 0);</div><div class='ctx'> 		vortex_adbdma_setstartbuffer(chip, dma, 0);</div><div class='ctx'> 		if (VORTEX_PCM_TYPE(substream-&gt;pcm) != VORTEX_PCM_SPDIF)</div><div class='ctx'> 			vortex_adb_setsrc(chip, dma, runtime-&gt;rate, dir);</div><div class='hunk'>@@ -324,7 +351,7 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		}</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 		else {</div><div class='del'>-			printk(KERN_INFO "vortex: wt start %d\n", dma);</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev, "wt start %d\n", dma);</div><div class='ctx'> 			vortex_wtdma_startfifo(chip, dma);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -334,11 +361,10 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		//printk(KERN_INFO "vortex: stop %d\n", dma);</div><div class='ctx'> 		stream-&gt;fifo_enabled = 0;</div><div class='ctx'> 		if (VORTEX_PCM_TYPE(substream-&gt;pcm) != VORTEX_PCM_WT)</div><div class='del'>-			vortex_adbdma_pausefifo(chip, dma);</div><div class='del'>-		//vortex_adbdma_stopfifo(chip, dma);</div><div class='add'>+			vortex_adbdma_stopfifo(chip, dma);</div><div class='ctx'> #ifndef CHIP_AU8810</div><div class='ctx'> 		else {</div><div class='del'>-			printk(KERN_INFO "vortex: wt stop %d\n", dma);</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev, "wt stop %d\n", dma);</div><div class='ctx'> 			vortex_wtdma_stopfifo(chip, dma);</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -386,34 +412,35 @@ static snd_pcm_uframes_t snd_vortex_pcm_pointer(struct snd_pcm_substream *substr</div><div class='ctx'> #endif</div><div class='ctx'> 	//printk(KERN_INFO "vortex: pointer = 0x%x\n", current_ptr);</div><div class='ctx'> 	spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-	return (bytes_to_frames(substream-&gt;runtime, current_ptr));</div><div class='add'>+	current_ptr = bytes_to_frames(substream-&gt;runtime, current_ptr);</div><div class='add'>+	if (current_ptr &gt;= substream-&gt;runtime-&gt;buffer_size)</div><div class='add'>+		current_ptr = 0;</div><div class='add'>+	return current_ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operators */</div><div class='del'>-static struct snd_pcm_ops snd_vortex_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vortex_playback_ops = {</div><div class='ctx'> 	.open = snd_vortex_pcm_open,</div><div class='ctx'> 	.close = snd_vortex_pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = snd_vortex_pcm_hw_params,</div><div class='ctx'> 	.hw_free = snd_vortex_pcm_hw_free,</div><div class='ctx'> 	.prepare = snd_vortex_pcm_prepare,</div><div class='ctx'> 	.trigger = snd_vortex_pcm_trigger,</div><div class='ctx'> 	.pointer = snd_vortex_pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> *  definitions of capture are omitted here...</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {</div><div class='del'>-	"AU88x0 ADB",</div><div class='del'>-	"AU88x0 SPDIF",</div><div class='del'>-	"AU88x0 A3D",</div><div class='del'>-	"AU88x0 WT",</div><div class='del'>-	"AU88x0 I2S",</div><div class='add'>+static const char * const vortex_pcm_prettyname[VORTEX_PCM_LAST] = {</div><div class='add'>+	CARD_NAME " ADB",</div><div class='add'>+	CARD_NAME " SPDIF",</div><div class='add'>+	CARD_NAME " A3D",</div><div class='add'>+	CARD_NAME " WT",</div><div class='add'>+	CARD_NAME " I2S",</div><div class='ctx'> };</div><div class='del'>-static char *vortex_pcm_name[VORTEX_PCM_LAST] = {</div><div class='add'>+static const char * const vortex_pcm_name[VORTEX_PCM_LAST] = {</div><div class='ctx'> 	"adb",</div><div class='ctx'> 	"spdif",</div><div class='ctx'> 	"a3d",</div><div class='hunk'>@@ -470,7 +497,7 @@ static int snd_vortex_spdif_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* spdif controls */</div><div class='del'>-static struct snd_kcontrol_new snd_vortex_mixer_spdif[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vortex_mixer_spdif[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 		.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='hunk'>@@ -487,8 +514,85 @@ static struct snd_kcontrol_new snd_vortex_mixer_spdif[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* subdevice PCM Volume control */</div><div class='add'>+</div><div class='add'>+static int snd_vortex_pcm_vol_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	vortex_t *vortex = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = (VORTEX_IS_QUAD(vortex) ? 4 : 2);</div><div class='add'>+	uinfo-&gt;value.integer.min = -128;</div><div class='add'>+	uinfo-&gt;value.integer.max = 32;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_vortex_pcm_vol_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	vortex_t *vortex = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int subdev = kcontrol-&gt;id.subdevice;</div><div class='add'>+	struct pcm_vol *p = &amp;vortex-&gt;pcm_vol[subdev];</div><div class='add'>+	int max_chn = (VORTEX_IS_QUAD(vortex) ? 4 : 2);</div><div class='add'>+	for (i = 0; i &lt; max_chn; i++)</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] = p-&gt;vol[i];</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_vortex_pcm_vol_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int changed = 0;</div><div class='add'>+	int mixin;</div><div class='add'>+	unsigned char vol;</div><div class='add'>+	vortex_t *vortex = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int subdev = kcontrol-&gt;id.subdevice;</div><div class='add'>+	struct pcm_vol *p = &amp;vortex-&gt;pcm_vol[subdev];</div><div class='add'>+	int max_chn = (VORTEX_IS_QUAD(vortex) ? 4 : 2);</div><div class='add'>+	for (i = 0; i &lt; max_chn; i++) {</div><div class='add'>+		if (p-&gt;vol[i] != ucontrol-&gt;value.integer.value[i]) {</div><div class='add'>+			p-&gt;vol[i] = ucontrol-&gt;value.integer.value[i];</div><div class='add'>+			if (p-&gt;active) {</div><div class='add'>+				switch (vortex-&gt;dma_adb[p-&gt;dma].nr_ch) {</div><div class='add'>+				case 1:</div><div class='add'>+					mixin = p-&gt;mixin[0];</div><div class='add'>+					break;</div><div class='add'>+				case 2:</div><div class='add'>+				default:</div><div class='add'>+					mixin = p-&gt;mixin[(i &lt; 2) ? i : (i - 2)];</div><div class='add'>+					break;</div><div class='add'>+				case 4:</div><div class='add'>+					mixin = p-&gt;mixin[i];</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				vol = p-&gt;vol[i];</div><div class='add'>+				vortex_mix_setinputvolumebyte(vortex,</div><div class='add'>+					vortex-&gt;mixplayb[i], mixin, vol);</div><div class='add'>+			}</div><div class='add'>+			changed = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return changed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_MINMAX(vortex_pcm_vol_db_scale, -9600, 2400);</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new snd_vortex_pcm_vol = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='add'>+	.name = "PCM Playback Volume",</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		SNDRV_CTL_ELEM_ACCESS_TLV_READ |</div><div class='add'>+		SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='add'>+	.info = snd_vortex_pcm_vol_info,</div><div class='add'>+	.get = snd_vortex_pcm_vol_get,</div><div class='add'>+	.put = snd_vortex_pcm_vol_put,</div><div class='add'>+	.tlv = { .p = vortex_pcm_vol_db_scale },</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* create a pcm device */</div><div class='del'>-static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)</div><div class='add'>+static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -499,7 +603,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the </div><div class='del'>-	 * same dma engine. WT uses it own separate dma engine whcih cant capture. */</div><div class='add'>+	 * same dma engine. WT uses it own separate dma engine which can't capture. */</div><div class='ctx'> 	if (idx == VORTEX_PCM_ADB)</div><div class='ctx'> 		nr_capt = nr;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -508,7 +612,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)</div><div class='ctx'> 			  nr_capt, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(pcm-&gt;name, vortex_pcm_name[idx]);</div><div class='add'>+	snprintf(pcm-&gt;name, sizeof(pcm-&gt;name),</div><div class='add'>+		"%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);</div><div class='ctx'> 	chip-&gt;pcm[idx] = pcm;</div><div class='ctx'> 	// This is an evil hack, but it saves a lot of duplicated code.</div><div class='ctx'> 	VORTEX_PCM_TYPE(pcm) = idx;</div><div class='hunk'>@@ -522,16 +627,54 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)</div><div class='ctx'> 	</div><div class='ctx'> 	/* pre-allocation of Scatter-Gather buffers */</div><div class='ctx'> 	</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci_dev),</div><div class='del'>-					      0x10000, 0x10000);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+				       &amp;chip-&gt;pci_dev-&gt;dev, 0x10000, 0x10000);</div><div class='add'>+</div><div class='add'>+	switch (VORTEX_PCM_TYPE(pcm)) {</div><div class='add'>+	case VORTEX_PCM_ADB:</div><div class='add'>+		err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+					     snd_pcm_std_chmaps,</div><div class='add'>+					     VORTEX_IS_QUAD(chip) ? 4 : 2,</div><div class='add'>+					     0, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+					     snd_pcm_std_chmaps, 2, 0, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+#ifdef CHIP_AU8830</div><div class='add'>+	case VORTEX_PCM_A3D:</div><div class='add'>+		err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+					     snd_pcm_std_chmaps, 1, 0, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(snd_vortex_mixer_spdif); i++) {</div><div class='ctx'> 			kctl = snd_ctl_new1(&amp;snd_vortex_mixer_spdif[i], chip);</div><div class='ctx'> 			if (!kctl)</div><div class='ctx'> 				return -ENOMEM;</div><div class='del'>-			if ((err = snd_ctl_add(chip-&gt;card, kctl)) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(chip-&gt;card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_ADB) {</div><div class='add'>+		for (i = 0; i &lt; NR_PCM; i++) {</div><div class='add'>+			chip-&gt;pcm_vol[i].active = 0;</div><div class='add'>+			chip-&gt;pcm_vol[i].dma = -1;</div><div class='add'>+			kctl = snd_ctl_new1(&amp;snd_vortex_pcm_vol, chip);</div><div class='add'>+			if (!kctl)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			chip-&gt;pcm_vol[i].kctl = kctl;</div><div class='add'>+			kctl-&gt;id.device = 0;</div><div class='add'>+			kctl-&gt;id.subdevice = i;</div><div class='add'>+			err = snd_ctl_add(chip-&gt;card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c<br/>index 2805e34bd41d..84d961e7c79c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_synth.c</a></div><div class='hunk'>@@ -1,17 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -58,7 +46,7 @@ static void vortex_wt_setdsout(vortex_t * vortex, u32 wt, int en)</div><div class='ctx'> 	if (en)</div><div class='ctx'> 		temp |= (1 &lt;&lt; (wt &amp; 0x1f));</div><div class='ctx'> 	else</div><div class='del'>-		temp &amp;= (1 &lt;&lt; ~(wt &amp; 0x1f));</div><div class='add'>+		temp &amp;= ~(1 &lt;&lt; (wt &amp; 0x1f));</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_DSREG((wt &gt;= 0x20) ? 1 : 0), temp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -90,7 +78,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_PARM(wt, 2), 0);</div><div class='ctx'> </div><div class='ctx'> 	temp = hwread(vortex-&gt;mmio, WT_PARM(wt, 3));</div><div class='del'>-	printk(KERN_DEBUG "vortex: WT PARM3: %x\n", temp);</div><div class='add'>+	dev_dbg(vortex-&gt;card-&gt;dev, "WT PARM3: %x\n", temp);</div><div class='ctx'> 	//hwwrite(vortex-&gt;mmio, WT_PARM(wt, 3), temp);</div><div class='ctx'> </div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 0), 0);</div><div class='hunk'>@@ -98,7 +86,8 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 2), 0);</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 3), 0);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_DEBUG "vortex: WT GMODE: %x\n", hwread(vortex-&gt;mmio, WT_GMODE(wt)));</div><div class='add'>+	dev_dbg(vortex-&gt;card-&gt;dev, "WT GMODE: %x\n",</div><div class='add'>+		hwread(vortex-&gt;mmio, WT_GMODE(wt)));</div><div class='ctx'> </div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_PARM(wt, 2), 0xffffffff);</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_PARM(wt, 3), 0xcff1c810);</div><div class='hunk'>@@ -106,7 +95,8 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch)</div><div class='ctx'> 	voice-&gt;parm0 = voice-&gt;parm1 = 0xcfb23e2f;</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_PARM(wt, 0), voice-&gt;parm0);</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, WT_PARM(wt, 1), voice-&gt;parm1);</div><div class='del'>-	printk(KERN_DEBUG "vortex: WT GMODE 2 : %x\n", hwread(vortex-&gt;mmio, WT_GMODE(wt)));</div><div class='add'>+	dev_dbg(vortex-&gt;card-&gt;dev, "WT GMODE 2 : %x\n",</div><div class='add'>+		hwread(vortex-&gt;mmio, WT_GMODE(wt)));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,14 +186,15 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,</div><div class='ctx'> </div><div class='ctx'> 	if ((reg == 5) || ((reg &gt;= 7) &amp;&amp; (reg &lt;= 10)) || (reg == 0xc)) {</div><div class='ctx'> 		if (wt &gt;= (NR_WT / NR_WT_PB)) {</div><div class='del'>-			printk</div><div class='del'>-			    ("vortex: WT SetReg: bank out of range. reg=0x%x, wt=%d\n",</div><div class='del'>-			     reg, wt);</div><div class='add'>+			dev_warn(vortex-&gt;card-&gt;dev,</div><div class='add'>+				 "WT SetReg: bank out of range. reg=0x%x, wt=%d\n",</div><div class='add'>+				 reg, wt);</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (wt &gt;= NR_WT) {</div><div class='del'>-			printk(KERN_ERR "vortex: WT SetReg: voice out of range\n");</div><div class='add'>+			dev_err(vortex-&gt;card-&gt;dev,</div><div class='add'>+				"WT SetReg: voice out of range\n");</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -214,65 +205,57 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,</div><div class='ctx'> 		/* Voice specific parameters */</div><div class='ctx'> 	case 0:		/* running */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_RUN(wt), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_RUN(wt), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 1:		/* param 0 */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_PARM(wt,0), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_PARM(wt, 0), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 2:		/* param 1 */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_PARM(wt,1), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_PARM(wt, 1), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 3:		/* param 2 */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_PARM(wt,2), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_PARM(wt, 2), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 4:		/* param 3 */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_PARM(wt,3), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_PARM(wt, 3), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 6:		/* mute */</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='ctx'> 		       WT_MUTE(wt), (int)val);</div><div class='ctx'> 		*/</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, WT_MUTE(wt), val);</div><div class='ctx'> 		return 0xc;</div><div class='del'>-		break;</div><div class='ctx'> 	case 0xb:</div><div class='del'>-		{		/* delay */</div><div class='del'>-			/*</div><div class='del'>-			printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='del'>-			       WT_DELAY(wt,0), (int)val);</div><div class='del'>-			*/</div><div class='del'>-			hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 3), val);</div><div class='del'>-			hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 2), val);</div><div class='del'>-			hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 1), val);</div><div class='del'>-			hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 0), val);</div><div class='del'>-			return 0xc;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+			/* delay */</div><div class='add'>+		/*</div><div class='add'>+		pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n",</div><div class='add'>+		       WT_DELAY(wt,0), (int)val);</div><div class='add'>+		*/</div><div class='add'>+		hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 3), val);</div><div class='add'>+		hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 2), val);</div><div class='add'>+		hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 1), val);</div><div class='add'>+		hwwrite(vortex-&gt;mmio, WT_DELAY(wt, 0), val);</div><div class='add'>+		return 0xc;</div><div class='ctx'> 		/* Global WT block parameters */</div><div class='ctx'> 	case 5:		/* sramp */</div><div class='ctx'> 		ecx = WT_SRAMP(wt);</div><div class='hunk'>@@ -291,10 +274,9 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return 0;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);</div><div class='add'>+	pr_debug( "vortex: WT SetReg(0x%x) = 0x%08x\n", ecx, (int)val);</div><div class='ctx'> 	*/</div><div class='ctx'> 	hwwrite(vortex-&gt;mmio, ecx, val);</div><div class='ctx'> 	return 1;</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_wt.h b/sound/pci/au88x0/au88x0_wt.h<br/>index 38d98f88a95c..7b2cffad8643 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_wt.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_wt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_wt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_wt.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *           WT register offsets.</div><div class='ctx'>  *</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_xtalk.c b/sound/pci/au88x0/au88x0_xtalk.c<br/>index b4151e208b71..27859536d7c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_xtalk.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_xtalk.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_xtalk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_xtalk.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_cxtalk.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "au88x0_xtalk.h"</div><div class='hunk'>@@ -29,94 +17,112 @@</div><div class='ctx'> static short const sXtalkWideKLeftEq = 0x269C;</div><div class='ctx'> static short const sXtalkWideKRightEq = 0x269C;</div><div class='ctx'> static short const sXtalkWideKLeftXt = 0xF25E;</div><div class='del'>-static short const sXtalkWideKRightXt = 0xF25E;</div><div class='add'>+static __maybe_unused short const sXtalkWideKRightXt = 0xF25E;</div><div class='ctx'> static short const sXtalkWideShiftLeftEq = 1;</div><div class='ctx'> static short const sXtalkWideShiftRightEq = 1;</div><div class='ctx'> static short const sXtalkWideShiftLeftXt = 0;</div><div class='del'>-static short const sXtalkWideShiftRightXt = 0;</div><div class='add'>+static __maybe_unused short const sXtalkWideShiftRightXt = 0;</div><div class='ctx'> static unsigned short const wXtalkWideLeftDelay = 0xd;</div><div class='ctx'> static unsigned short const wXtalkWideRightDelay = 0xd;</div><div class='ctx'> static short const sXtalkNarrowKLeftEq = 0x468D;</div><div class='ctx'> static short const sXtalkNarrowKRightEq = 0x468D;</div><div class='ctx'> static short const sXtalkNarrowKLeftXt = 0xF82E;</div><div class='del'>-static short const sXtalkNarrowKRightXt = 0xF82E;</div><div class='add'>+static __maybe_unused short const sXtalkNarrowKRightXt = 0xF82E;</div><div class='ctx'> static short const sXtalkNarrowShiftLeftEq = 0x3;</div><div class='ctx'> static short const sXtalkNarrowShiftRightEq = 0x3;</div><div class='ctx'> static short const sXtalkNarrowShiftLeftXt = 0;</div><div class='del'>-static short const sXtalkNarrowShiftRightXt = 0;</div><div class='add'>+static __maybe_unused short const sXtalkNarrowShiftRightXt = 0;</div><div class='ctx'> static unsigned short const wXtalkNarrowLeftDelay = 0x7;</div><div class='ctx'> static unsigned short const wXtalkNarrowRightDelay = 0x7;</div><div class='ctx'> </div><div class='del'>-static xtalk_gains_t const asXtalkGainsDefault = {</div><div class='del'>-	0x4000, 0x4000, 4000, 0x4000, 4000, 0x4000, 4000, 0x4000, 4000,</div><div class='del'>-	0x4000</div><div class='add'>+static __maybe_unused xtalk_gains_t const asXtalkGainsDefault = {</div><div class='add'>+	0x4000, 0x4000, 0x4000, 0x4000, 0x4000,</div><div class='add'>+	0x4000, 0x4000, 0x4000, 0x4000,	0x4000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_gains_t const asXtalkGainsTest = {</div><div class='del'>-	0x8000, 0x7FFF, 0, 0xFFFF, 0x0001, 0xC000, 0x4000, 0xFFFE, 0x0002,</div><div class='del'>-	0</div><div class='add'>+static __maybe_unused xtalk_gains_t const asXtalkGainsTest = {</div><div class='add'>+	0x7fff, 0x8000, 0x0000, 0x0000, 0x0001,</div><div class='add'>+	0xffff, 0x4000, 0xc000, 0x0002, 0xfffe</div><div class='ctx'> };</div><div class='del'>-static xtalk_gains_t const asXtalkGains1Chan = {</div><div class='del'>-	0x7FFF, 0, 0, 0, 0x7FFF, 0, 0, 0, 0, 0</div><div class='add'>+</div><div class='add'>+static __maybe_unused xtalk_gains_t const asXtalkGains1Chan = {</div><div class='add'>+	0x7FFF, 0, 0, 0, 0,</div><div class='add'>+	0x7FFF, 0, 0, 0, 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> // Input gain for 4 A3D slices. One possible input pair is left zero.</div><div class='ctx'> static xtalk_gains_t const asXtalkGainsAllChan = {</div><div class='del'>-	0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,</div><div class='del'>-	0</div><div class='del'>-	    //0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff,0x7FFF,0x7FFF,0x7FFF,0x7FFF,0x7fff</div><div class='add'>+	0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0,</div><div class='add'>+	0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF,	0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static xtalk_gains_t const asXtalkGainsZeros = {</div><div class='add'>+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='ctx'> };</div><div class='del'>-static xtalk_gains_t const asXtalkGainsZeros;</div><div class='ctx'> </div><div class='del'>-static xtalk_dline_t const alXtalkDlineZeros;</div><div class='del'>-static xtalk_dline_t const alXtalkDlineTest = {</div><div class='del'>-	0xFC18, 0x03E8FFFF, 0x186A0, 0x7960FFFE, 1, 0xFFFFFFFF,</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+static xtalk_dline_t const alXtalkDlineZeros = {</div><div class='add'>+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+static __maybe_unused xtalk_dline_t const alXtalkDlineTest = {</div><div class='add'>+	0x0000fc18, 0xfff03e8, 0x000186a0, 0xfffe7960, 1, 0xffffffff, 0, 0,</div><div class='add'>+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='add'>+	0, 0, 0, 0, 0, 0, 0, 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static xtalk_instate_t const asXtalkInStateZeros = {</div><div class='ctx'> 	0, 0, 0, 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_instate_t const asXtalkInStateZeros;</div><div class='del'>-static xtalk_instate_t const asXtalkInStateTest =</div><div class='del'>-    { 0xFF80, 0x0080, 0xFFFF, 0x0001 };</div><div class='del'>-static xtalk_state_t const asXtalkOutStateZeros;</div><div class='add'>+static __maybe_unused xtalk_instate_t const asXtalkInStateTest = {</div><div class='add'>+	0x0080, 0xff80, 0x0001, 0xffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static xtalk_state_t const asXtalkOutStateZeros = {</div><div class='add'>+	{0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0}</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static short const sDiamondKLeftEq = 0x401d;</div><div class='ctx'> static short const sDiamondKRightEq = 0x401d;</div><div class='ctx'> static short const sDiamondKLeftXt = 0xF90E;</div><div class='del'>-static short const sDiamondKRightXt = 0xF90E;</div><div class='del'>-static short const sDiamondShiftLeftEq = 1;	/* 0xF90E Is this a bug ??? */</div><div class='add'>+static __maybe_unused short const sDiamondKRightXt = 0xF90E;</div><div class='add'>+static short const sDiamondShiftLeftEq = 1;</div><div class='ctx'> static short const sDiamondShiftRightEq = 1;</div><div class='ctx'> static short const sDiamondShiftLeftXt = 0;</div><div class='del'>-static short const sDiamondShiftRightXt = 0;</div><div class='add'>+static __maybe_unused short const sDiamondShiftRightXt = 0;</div><div class='ctx'> static unsigned short const wDiamondLeftDelay = 0xb;</div><div class='ctx'> static unsigned short const wDiamondRightDelay = 0xb;</div><div class='ctx'> </div><div class='ctx'> static xtalk_coefs_t const asXtalkWideCoefsLeftEq = {</div><div class='ctx'> 	{0xEC4C, 0xDCE9, 0xFDC2, 0xFEEC, 0},</div><div class='ctx'> 	{0x5F60, 0xCBCB, 0xFC26, 0x0305, 0},</div><div class='del'>-	{0x340B, 0xf504, 0x6CE8, 0x0D23, 0x00E4},</div><div class='del'>-	{0xD500, 0x8D76, 0xACC7, 0x5B05, 0x00FA},</div><div class='add'>+	{0x340B, 0xe8f5, 0x236c, 0xe40d, 0},</div><div class='add'>+	{0x76d5, 0xc78d, 0x05ac, 0xfa5b, 0},</div><div class='ctx'> 	{0x7F04, 0xC0FA, 0x0263, 0xFDA2, 0}</div><div class='ctx'> };</div><div class='ctx'> static xtalk_coefs_t const asXtalkWideCoefsRightEq = {</div><div class='ctx'> 	{0xEC4C, 0xDCE9, 0xFDC2, 0xFEEC, 0},</div><div class='ctx'> 	{0x5F60, 0xCBCB, 0xFC26, 0x0305, 0},</div><div class='del'>-	{0x340B, 0xF504, 0x6CE8, 0x0D23, 0x00E4},</div><div class='del'>-	{0xD500, 0x8D76, 0xACC7, 0x5B05, 0x00FA},</div><div class='add'>+	{0x340B, 0xe8f5, 0x236c, 0xe40d, 0},</div><div class='add'>+	{0x76d5, 0xc78d, 0x05ac, 0xfa5b, 0},</div><div class='ctx'> 	{0x7F04, 0xC0FA, 0x0263, 0xFDA2, 0}</div><div class='ctx'> };</div><div class='ctx'> static xtalk_coefs_t const asXtalkWideCoefsLeftXt = {</div><div class='del'>-	{0x86C3, 0x7B55, 0x89C3, 0x005B, 0x0047},</div><div class='del'>-	{0x6000, 0x206A, 0xC6CA, 0x40FF, 0},</div><div class='del'>-	{0x1100, 0x1164, 0xA1D7, 0x90FC, 0x0001},</div><div class='del'>-	{0xDC00, 0x9E77, 0xB8C7, 0x0AFF, 0},</div><div class='add'>+	{0x55c6, 0xc97b, 0x005b, 0x0047, 0},</div><div class='add'>+	{0x6a60, 0xca20, 0xffc6, 0x0040, 0},</div><div class='add'>+	{0x6411, 0xd711, 0xfca1, 0x0190, 0},</div><div class='add'>+	{0x77dc, 0xc79e, 0xffb8, 0x000a, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='del'>-static xtalk_coefs_t const asXtalkWideCoefsRightXt = {</div><div class='del'>-	{0x86C3, 0x7B55, 0x89C3, 0x005B, 0x0047},</div><div class='del'>-	{0x6000, 0x206A, 0xC6CA, 0x40FF, 0},</div><div class='del'>-	{0x1100, 0x1164, 0xA1D7, 0x90FC, 0x0001},</div><div class='del'>-	{0xDC00, 0x9E77, 0xB8C7, 0x0AFF, 0},</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asXtalkWideCoefsRightXt = {</div><div class='add'>+	{0x55c6, 0xc97b, 0x005b, 0x0047, 0},</div><div class='add'>+	{0x6a60, 0xca20, 0xffc6, 0x0040, 0},</div><div class='add'>+	{0x6411, 0xd711, 0xfca1, 0x0190, 0},</div><div class='add'>+	{0x77dc, 0xc79e, 0xffb8, 0x000a, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> static xtalk_coefs_t const asXtalkNarrowCoefsLeftEq = {</div><div class='hunk'>@@ -143,7 +149,7 @@ static xtalk_coefs_t const asXtalkNarrowCoefsLeftXt = {</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_coefs_t const asXtalkNarrowCoefsRightXt = {</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asXtalkNarrowCoefsRightXt = {</div><div class='ctx'> 	{0x3CB2, 0xDF49, 0xF6EA, 0x095B, 0},</div><div class='ctx'> 	{0x6777, 0xC915, 0xFEAF, 0x00B1, 0},</div><div class='ctx'> 	{0x7762, 0xC7D9, 0x025B, 0xFDA6, 0},</div><div class='hunk'>@@ -151,7 +157,14 @@ static xtalk_coefs_t const asXtalkNarrowCoefsRightXt = {</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_coefs_t const asXtalkCoefsZeros;</div><div class='add'>+static xtalk_coefs_t const asXtalkCoefsZeros = {</div><div class='add'>+	{0, 0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0, 0},</div><div class='add'>+	{0, 0, 0, 0, 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static xtalk_coefs_t const asXtalkCoefsPipe = {</div><div class='ctx'> 	{0, 0, 0x0FA0, 0, 0},</div><div class='ctx'> 	{0, 0, 0x0FA0, 0, 0},</div><div class='hunk'>@@ -159,7 +172,7 @@ static xtalk_coefs_t const asXtalkCoefsPipe = {</div><div class='ctx'> 	{0, 0, 0x0FA0, 0, 0},</div><div class='ctx'> 	{0, 0, 0x1180, 0, 0},</div><div class='ctx'> };</div><div class='del'>-static xtalk_coefs_t const asXtalkCoefsNegPipe = {</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asXtalkCoefsNegPipe = {</div><div class='ctx'> 	{0, 0, 0xF380, 0, 0},</div><div class='ctx'> 	{0, 0, 0xF380, 0, 0},</div><div class='ctx'> 	{0, 0, 0xF380, 0, 0},</div><div class='hunk'>@@ -167,7 +180,7 @@ static xtalk_coefs_t const asXtalkCoefsNegPipe = {</div><div class='ctx'> 	{0, 0, 0xF200, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_coefs_t const asXtalkCoefsNumTest = {</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asXtalkCoefsNumTest = {</div><div class='ctx'> 	{0, 0, 0xF380, 0x8000, 0x6D60},</div><div class='ctx'> 	{0, 0, 0, 0, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0},</div><div class='hunk'>@@ -175,7 +188,7 @@ static xtalk_coefs_t const asXtalkCoefsNumTest = {</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_coefs_t const asXtalkCoefsDenTest = {</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asXtalkCoefsDenTest = {</div><div class='ctx'> 	{0xC000, 0x2000, 0x4000, 0, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0},</div><div class='hunk'>@@ -183,10 +196,10 @@ static xtalk_coefs_t const asXtalkCoefsDenTest = {</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_state_t const asXtalkOutStateTest = {</div><div class='add'>+static __maybe_unused xtalk_state_t const asXtalkOutStateTest = {</div><div class='ctx'> 	{0x7FFF, 0x0004, 0xFFFC, 0},</div><div class='ctx'> 	{0xFE00, 0x0008, 0xFFF8, 0x4000},</div><div class='del'>-	{0x200, 0x0010, 0xFFF0, 0xC000},</div><div class='add'>+	{0x0200, 0x0010, 0xFFF0, 0xC000},</div><div class='ctx'> 	{0x8000, 0x0020, 0xFFE0, 0},</div><div class='ctx'> 	{0, 0, 0, 0}</div><div class='ctx'> };</div><div class='hunk'>@@ -215,7 +228,7 @@ static xtalk_coefs_t const asDiamondCoefsLeftXt = {</div><div class='ctx'> 	{0, 0, 0, 0, 0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static xtalk_coefs_t const asDiamondCoefsRightXt = {</div><div class='add'>+static __maybe_unused xtalk_coefs_t const asDiamondCoefsRightXt = {</div><div class='ctx'> 	{0x3B50, 0xFE08, 0xF959, 0x0060, 0},</div><div class='ctx'> 	{0x9FCB, 0xD8F1, 0x00A2, 0x003A, 0},</div><div class='ctx'> 	{0, 0, 0, 0, 0},</div><div class='hunk'>@@ -306,10 +319,10 @@ vortex_XtalkHw_SetLeftEQStates(vortex_t * vortex,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x2421C + i * 0x24, coefs[i][2]);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x24220 + i * 0x24, coefs[i][3]);</div><div class='ctx'> 	}</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x244F8 + i * 0x24, arg_0[0]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x244FC + i * 0x24, arg_0[1]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24500 + i * 0x24, arg_0[2]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24504 + i * 0x24, arg_0[3]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x244F8, arg_0[0]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x244FC, arg_0[1]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24500, arg_0[2]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24504, arg_0[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -325,10 +338,10 @@ vortex_XtalkHw_SetRightEQStates(vortex_t * vortex,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x242D0 + i * 0x24, coefs[i][2]);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x244D4 + i * 0x24, coefs[i][3]);</div><div class='ctx'> 	}</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24508 + i * 0x24, arg_0[0]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x2450C + i * 0x24, arg_0[1]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24510 + i * 0x24, arg_0[2]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24514 + i * 0x24, arg_0[3]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24508, arg_0[0]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x2450C, arg_0[1]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24510, arg_0[2]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24514, arg_0[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -344,10 +357,10 @@ vortex_XtalkHw_SetLeftXTStates(vortex_t * vortex,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x24384 + i * 0x24, coefs[i][2]);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x24388 + i * 0x24, coefs[i][3]);</div><div class='ctx'> 	}</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24518 + i * 0x24, arg_0[0]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x2451C + i * 0x24, arg_0[1]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24520 + i * 0x24, arg_0[2]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24524 + i * 0x24, arg_0[3]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24518, arg_0[0]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x2451C, arg_0[1]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24520, arg_0[2]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24524, arg_0[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -363,10 +376,10 @@ vortex_XtalkHw_SetRightXTStates(vortex_t * vortex,</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x24438 + i * 0x24, coefs[i][2]);</div><div class='ctx'> 		hwwrite(vortex-&gt;mmio, 0x2443C + i * 0x24, coefs[i][3]);</div><div class='ctx'> 	}</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24528 + i * 0x24, arg_0[0]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x2452C + i * 0x24, arg_0[1]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24530 + i * 0x24, arg_0[2]);</div><div class='del'>-	hwwrite(vortex-&gt;mmio, 0x24534 + i * 0x24, arg_0[3]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24528, arg_0[0]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x2452C, arg_0[1]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24530, arg_0[2]);</div><div class='add'>+	hwwrite(vortex-&gt;mmio, 0x24534, arg_0[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -450,10 +463,10 @@ vortex_XtalkHw_GetLeftEQStates(vortex_t * vortex, xtalk_instate_t arg_0,</div><div class='ctx'> 		coefs[i][2] = hwread(vortex-&gt;mmio, 0x2421C + i * 0x24);</div><div class='ctx'> 		coefs[i][3] = hwread(vortex-&gt;mmio, 0x24220 + i * 0x24);</div><div class='ctx'> 	}</div><div class='del'>-	arg_0[0] = hwread(vortex-&gt;mmio, 0x244F8 + i * 0x24);</div><div class='del'>-	arg_0[1] = hwread(vortex-&gt;mmio, 0x244FC + i * 0x24);</div><div class='del'>-	arg_0[2] = hwread(vortex-&gt;mmio, 0x24500 + i * 0x24);</div><div class='del'>-	arg_0[3] = hwread(vortex-&gt;mmio, 0x24504 + i * 0x24);</div><div class='add'>+	arg_0[0] = hwread(vortex-&gt;mmio, 0x244F8);</div><div class='add'>+	arg_0[1] = hwread(vortex-&gt;mmio, 0x244FC);</div><div class='add'>+	arg_0[2] = hwread(vortex-&gt;mmio, 0x24500);</div><div class='add'>+	arg_0[3] = hwread(vortex-&gt;mmio, 0x24504);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -468,10 +481,10 @@ vortex_XtalkHw_GetRightEQStates(vortex_t * vortex, xtalk_instate_t arg_0,</div><div class='ctx'> 		coefs[i][2] = hwread(vortex-&gt;mmio, 0x242D0 + i * 0x24);</div><div class='ctx'> 		coefs[i][3] = hwread(vortex-&gt;mmio, 0x242D4 + i * 0x24);</div><div class='ctx'> 	}</div><div class='del'>-	arg_0[0] = hwread(vortex-&gt;mmio, 0x24508 + i * 0x24);</div><div class='del'>-	arg_0[1] = hwread(vortex-&gt;mmio, 0x2450C + i * 0x24);</div><div class='del'>-	arg_0[2] = hwread(vortex-&gt;mmio, 0x24510 + i * 0x24);</div><div class='del'>-	arg_0[3] = hwread(vortex-&gt;mmio, 0x24514 + i * 0x24);</div><div class='add'>+	arg_0[0] = hwread(vortex-&gt;mmio, 0x24508);</div><div class='add'>+	arg_0[1] = hwread(vortex-&gt;mmio, 0x2450C);</div><div class='add'>+	arg_0[2] = hwread(vortex-&gt;mmio, 0x24510);</div><div class='add'>+	arg_0[3] = hwread(vortex-&gt;mmio, 0x24514);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -486,10 +499,10 @@ vortex_XtalkHw_GetLeftXTStates(vortex_t * vortex, xtalk_instate_t arg_0,</div><div class='ctx'> 		coefs[i][2] = hwread(vortex-&gt;mmio, 0x24384 + i * 0x24);</div><div class='ctx'> 		coefs[i][3] = hwread(vortex-&gt;mmio, 0x24388 + i * 0x24);</div><div class='ctx'> 	}</div><div class='del'>-	arg_0[0] = hwread(vortex-&gt;mmio, 0x24518 + i * 0x24);</div><div class='del'>-	arg_0[1] = hwread(vortex-&gt;mmio, 0x2451C + i * 0x24);</div><div class='del'>-	arg_0[2] = hwread(vortex-&gt;mmio, 0x24520 + i * 0x24);</div><div class='del'>-	arg_0[3] = hwread(vortex-&gt;mmio, 0x24524 + i * 0x24);</div><div class='add'>+	arg_0[0] = hwread(vortex-&gt;mmio, 0x24518);</div><div class='add'>+	arg_0[1] = hwread(vortex-&gt;mmio, 0x2451C);</div><div class='add'>+	arg_0[2] = hwread(vortex-&gt;mmio, 0x24520);</div><div class='add'>+	arg_0[3] = hwread(vortex-&gt;mmio, 0x24524);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -504,10 +517,10 @@ vortex_XtalkHw_GetRightXTStates(vortex_t * vortex, xtalk_instate_t arg_0,</div><div class='ctx'> 		coefs[i][2] = hwread(vortex-&gt;mmio, 0x24438 + i * 0x24);</div><div class='ctx'> 		coefs[i][3] = hwread(vortex-&gt;mmio, 0x2443C + i * 0x24);</div><div class='ctx'> 	}</div><div class='del'>-	arg_0[0] = hwread(vortex-&gt;mmio, 0x24528 + i * 0x24);</div><div class='del'>-	arg_0[1] = hwread(vortex-&gt;mmio, 0x2452C + i * 0x24);</div><div class='del'>-	arg_0[2] = hwread(vortex-&gt;mmio, 0x24530 + i * 0x24);</div><div class='del'>-	arg_0[3] = hwread(vortex-&gt;mmio, 0x24534 + i * 0x24);</div><div class='add'>+	arg_0[0] = hwread(vortex-&gt;mmio, 0x24528);</div><div class='add'>+	arg_0[1] = hwread(vortex-&gt;mmio, 0x2452C);</div><div class='add'>+	arg_0[2] = hwread(vortex-&gt;mmio, 0x24530);</div><div class='add'>+	arg_0[3] = hwread(vortex-&gt;mmio, 0x24534);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/sound/pci/au88x0/au88x0_xtalk.h b/sound/pci/au88x0/au88x0_xtalk.h<br/>index 7f4534b94d00..4791bd4fec2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_xtalk.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/au88x0/au88x0_xtalk.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/au88x0/au88x0_xtalk.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/au88x0/au88x0_xtalk.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /***************************************************************************</div><div class='ctx'>  *            au88x0_cxtalk.h</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,19 +8,6 @@</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* The crosstalk canceler supports 5 stereo input channels. The result is </div><div class='head'>diff --git a/sound/pci/aw2/Makefile b/sound/pci/aw2/Makefile<br/>index 842335d3b735..c246f7c7f2bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='del'>-snd-aw2-objs := aw2-alsa.o aw2-saa7146.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-aw2-y := aw2-alsa.o aw2-saa7146.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_AW2) += snd-aw2.o</div><div class='head'>diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c<br/>index c15002242d98..e2c501f4394c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-alsa.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-alsa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-alsa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/aw2-alsa.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Cedric Bregardis &lt;cedric.bregardis@free.fr&gt; and</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is part of the Audiowerk2 ALSA driver</div><div class='ctx'>  *</div><div class='del'>- * The Audiowerk2 ALSA driver is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2.</div><div class='del'>- *</div><div class='del'>- * The Audiowerk2 ALSA driver is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with the Audiowerk2 ALSA driver; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -27,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -51,7 +39,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  * TYPEDEFS</div><div class='ctx'>  ********************************/</div><div class='ctx'>   /* hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_aw2_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_aw2_playback_hw = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -68,7 +56,7 @@ static struct snd_pcm_hardware snd_aw2_playback_hw = {</div><div class='ctx'> 	.periods_max = 1024,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_aw2_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_aw2_capture_hw = {</div><div class='ctx'> 	.info = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID),</div><div class='hunk'>@@ -111,21 +99,13 @@ struct aw2 {</div><div class='ctx'> /*********************************</div><div class='ctx'>  * FUNCTION DECLARATIONS</div><div class='ctx'>  ********************************/</div><div class='del'>-static int __init alsa_card_aw2_init(void);</div><div class='del'>-static void __exit alsa_card_aw2_exit(void);</div><div class='del'>-static int snd_aw2_dev_free(struct snd_device *device);</div><div class='del'>-static int __devinit snd_aw2_create(struct snd_card *card,</div><div class='del'>-				    struct pci_dev *pci, struct aw2 **rchip);</div><div class='del'>-static int __devinit snd_aw2_probe(struct pci_dev *pci,</div><div class='del'>-				   const struct pci_device_id *pci_id);</div><div class='del'>-static void __devexit snd_aw2_remove(struct pci_dev *pci);</div><div class='add'>+static int snd_aw2_create(struct snd_card *card, struct pci_dev *pci);</div><div class='add'>+static int snd_aw2_probe(struct pci_dev *pci,</div><div class='add'>+			 const struct pci_device_id *pci_id);</div><div class='ctx'> static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_playback_close(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_capture_open(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_capture_close(struct snd_pcm_substream *substream);</div><div class='del'>-static int snd_aw2_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params);</div><div class='del'>-static int snd_aw2_pcm_hw_free(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream);</div><div class='ctx'> static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -136,7 +116,7 @@ static snd_pcm_uframes_t snd_aw2_pcm_pointer_playback(struct snd_pcm_substream</div><div class='ctx'> 						      *substream);</div><div class='ctx'> static snd_pcm_uframes_t snd_aw2_pcm_pointer_capture(struct snd_pcm_substream</div><div class='ctx'> 						     *substream);</div><div class='del'>-static int __devinit snd_aw2_new_pcm(struct aw2 *chip);</div><div class='add'>+static int snd_aw2_new_pcm(struct aw2 *chip);</div><div class='ctx'> </div><div class='ctx'> static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					       struct snd_ctl_elem_info *uinfo);</div><div class='hunk'>@@ -152,7 +132,7 @@ static int snd_aw2_control_switch_capture_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>  ********************************/</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Audiowerk2 soundcard.");</div><div class='hunk'>@@ -161,7 +141,7 @@ MODULE_PARM_DESC(id, "ID string for the Audiowerk2 soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = {</div><div class='add'>+static const struct pci_device_id snd_aw2_ids[] = {</div><div class='ctx'> 	{PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0,</div><div class='ctx'> 	 0, 0, 0},</div><div class='ctx'> 	{0}</div><div class='hunk'>@@ -170,38 +150,33 @@ static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_aw2_ids);</div><div class='ctx'> </div><div class='ctx'> /* pci_driver definition */</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "Emagic Audiowerk 2",</div><div class='add'>+static struct pci_driver aw2_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_aw2_ids,</div><div class='ctx'> 	.probe = snd_aw2_probe,</div><div class='del'>-	.remove = __devexit_p(snd_aw2_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+module_pci_driver(aw2_driver);</div><div class='add'>+</div><div class='ctx'> /* operators for playback PCM alsa interface */</div><div class='del'>-static struct snd_pcm_ops snd_aw2_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_aw2_playback_ops = {</div><div class='ctx'> 	.open = snd_aw2_pcm_playback_open,</div><div class='ctx'> 	.close = snd_aw2_pcm_playback_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_aw2_pcm_hw_params,</div><div class='del'>-	.hw_free = snd_aw2_pcm_hw_free,</div><div class='ctx'> 	.prepare = snd_aw2_pcm_prepare_playback,</div><div class='ctx'> 	.trigger = snd_aw2_pcm_trigger_playback,</div><div class='ctx'> 	.pointer = snd_aw2_pcm_pointer_playback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* operators for capture PCM alsa interface */</div><div class='del'>-static struct snd_pcm_ops snd_aw2_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_aw2_capture_ops = {</div><div class='ctx'> 	.open = snd_aw2_pcm_capture_open,</div><div class='ctx'> 	.close = snd_aw2_pcm_capture_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = snd_aw2_pcm_hw_params,</div><div class='del'>-	.hw_free = snd_aw2_pcm_hw_free,</div><div class='ctx'> 	.prepare = snd_aw2_pcm_prepare_capture,</div><div class='ctx'> 	.trigger = snd_aw2_pcm_trigger_capture,</div><div class='ctx'> 	.pointer = snd_aw2_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new aw2_control __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new aw2_control = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "PCM Capture Route",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -216,77 +191,33 @@ static struct snd_kcontrol_new aw2_control __devinitdata = {</div><div class='ctx'>  * FUNCTION IMPLEMENTATIONS</div><div class='ctx'>  ********************************/</div><div class='ctx'> </div><div class='del'>-/* initialization of the module */</div><div class='del'>-static int __init alsa_card_aw2_init(void)</div><div class='del'>-{</div><div class='del'>-	snd_printdd(KERN_DEBUG "aw2: Load aw2 module\n");</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clean up the module */</div><div class='del'>-static void __exit alsa_card_aw2_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_printdd(KERN_DEBUG "aw2: Unload aw2 module\n");</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_aw2_init);</div><div class='del'>-module_exit(alsa_card_aw2_exit);</div><div class='del'>-</div><div class='ctx'> /* component-destructor */</div><div class='del'>-static int snd_aw2_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_aw2_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct aw2 *chip = device-&gt;device_data;</div><div class='add'>+	struct aw2 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Free hardware */</div><div class='ctx'> 	snd_aw2_saa7146_free(&amp;chip-&gt;saa7146);</div><div class='del'>-</div><div class='del'>-	/* release the irq */</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, (void *)chip);</div><div class='del'>-	/* release the i/o ports &amp; memory */</div><div class='del'>-	if (chip-&gt;iobase_virt)</div><div class='del'>-		iounmap(chip-&gt;iobase_virt);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	/* disable the PCI entry */</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	/* release the data */</div><div class='del'>-	kfree(chip);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* chip-specific constructor */</div><div class='del'>-static int __devinit snd_aw2_create(struct snd_card *card,</div><div class='del'>-				    struct pci_dev *pci, struct aw2 **rchip)</div><div class='add'>+static int snd_aw2_create(struct snd_card *card,</div><div class='add'>+			  struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct aw2 *chip;</div><div class='add'>+	struct aw2 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_aw2_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the PCI entry */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='ctx'> 	/* check PCI availability (32bit DMA) */</div><div class='del'>-	if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0) ||</div><div class='del'>-	    (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0)) {</div><div class='del'>-		printk(KERN_ERR "aw2: Impossible to set 32bit mask DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+		dev_err(card-&gt;dev, "Impossible to set 32bit mask DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* initialize the stuff */</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='hunk'>@@ -294,62 +225,31 @@ static int __devinit snd_aw2_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* (1) PCI resource allocation */</div><div class='del'>-	err = pci_request_regions(pci, "Audiowerk2");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		kfree(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;iobase_virt = pcim_iomap_region(pci, 0, "Audiowerk2");</div><div class='add'>+	if (IS_ERR(chip-&gt;iobase_virt))</div><div class='add'>+		return PTR_ERR(chip-&gt;iobase_virt);</div><div class='ctx'> 	chip-&gt;iobase_phys = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;iobase_virt =</div><div class='del'>-		ioremap_nocache(chip-&gt;iobase_phys,</div><div class='del'>-				pci_resource_len(pci, 0));</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;iobase_virt == NULL) {</div><div class='del'>-		printk(KERN_ERR "aw2: unable to remap memory region");</div><div class='del'>-		pci_release_regions(pci);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		kfree(chip);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* (2) initialization of the chip hardware */</div><div class='ctx'> 	snd_aw2_saa7146_setup(&amp;chip-&gt;saa7146, chip-&gt;iobase_virt);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_aw2_saa7146_interrupt,</div><div class='del'>-			IRQF_SHARED, "Audiowerk2", chip)) {</div><div class='del'>-		printk(KERN_ERR "aw2: Cannot grab irq %d\n", pci-&gt;irq);</div><div class='del'>-</div><div class='del'>-		iounmap(chip-&gt;iobase_virt);</div><div class='del'>-		pci_release_regions(chip-&gt;pci);</div><div class='del'>-		pci_disable_device(chip-&gt;pci);</div><div class='del'>-		kfree(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_aw2_saa7146_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "Cannot grab irq %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_aw2_free;</div><div class='ctx'> </div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		free_irq(chip-&gt;irq, (void *)chip);</div><div class='del'>-		iounmap(chip-&gt;iobase_virt);</div><div class='del'>-		pci_release_regions(chip-&gt;pci);</div><div class='del'>-		pci_disable_device(chip-&gt;pci);</div><div class='del'>-		kfree(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-	*rchip = chip;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-	       "Audiowerk 2 sound card (saa7146 chipset) detected and "</div><div class='del'>-	       "managed\n");</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "Audiowerk 2 sound card (saa7146 chipset) detected and managed\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* constructor */</div><div class='del'>-static int __devinit snd_aw2_probe(struct pci_dev *pci,</div><div class='del'>-				   const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_aw2_probe(struct pci_dev *pci,</div><div class='add'>+			 const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -365,24 +265,24 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* (2) Create card instance */</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	/* (3) Create main component */</div><div class='del'>-	err = snd_aw2_create(card, pci, &amp;chip);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_aw2_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize mutex */</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;mtx);</div><div class='ctx'> 	/* init spinlock */</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* (4) Define driver ID and name string */</div><div class='del'>-	strcpy(card-&gt;driver, "aw2");</div><div class='del'>-	strcpy(card-&gt;shortname, "Audiowerk2");</div><div class='add'>+	strscpy(card-&gt;driver, "aw2");</div><div class='add'>+	strscpy(card-&gt;shortname, "Audiowerk2");</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname, "%s with SAA7146 irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;irq);</div><div class='hunk'>@@ -392,23 +292,18 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 	/* (6) Register card instance */</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	/* (7) Set PCI driver data */</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> </div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* destructor */</div><div class='del'>-static void __devexit snd_aw2_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+ error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* open callback */</div><div class='hunk'>@@ -416,7 +311,7 @@ static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	snd_printdd(KERN_DEBUG "aw2: Playback_open\n");</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "Playback_open\n");</div><div class='ctx'> 	runtime-&gt;hw = snd_aw2_playback_hw;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -432,7 +327,7 @@ static int snd_aw2_pcm_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	snd_printdd(KERN_DEBUG "aw2: Capture_open\n");</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "Capture_open\n");</div><div class='ctx'> 	runtime-&gt;hw = snd_aw2_capture_hw;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -444,20 +339,6 @@ static int snd_aw2_pcm_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- /* hw_params callback */</div><div class='del'>-static int snd_aw2_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_aw2_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* prepare callback for playback */</div><div class='ctx'> static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -466,7 +347,7 @@ static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned long period_size, buffer_size;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	period_size = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	buffer_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='hunk'>@@ -482,8 +363,6 @@ static int snd_aw2_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 						    snd_pcm_period_elapsed,</div><div class='ctx'> 						    (void *)substream);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mtx);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -495,7 +374,7 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	unsigned long period_size, buffer_size;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mtx);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	period_size = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	buffer_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='hunk'>@@ -511,8 +390,6 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 						   snd_pcm_period_elapsed,</div><div class='ctx'> 						   (void *)substream);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mtx);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -520,10 +397,10 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='ctx'> 					int cmd)</div><div class='ctx'> {</div><div class='del'>-	int status = 0;</div><div class='ctx'> 	struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct aw2 *chip = pcm_device-&gt;chip;</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		snd_aw2_saa7146_pcm_trigger_start_playback(&amp;chip-&gt;saa7146,</div><div class='hunk'>@@ -536,20 +413,19 @@ static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='ctx'> 							  stream_number);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		status = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* capture trigger callback */</div><div class='ctx'> static int snd_aw2_pcm_trigger_capture(struct snd_pcm_substream *substream,</div><div class='ctx'> 				       int cmd)</div><div class='ctx'> {</div><div class='del'>-	int status = 0;</div><div class='ctx'> 	struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct aw2 *chip = pcm_device-&gt;chip;</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		snd_aw2_saa7146_pcm_trigger_start_capture(&amp;chip-&gt;saa7146,</div><div class='hunk'>@@ -562,10 +438,9 @@ static int snd_aw2_pcm_trigger_capture(struct snd_pcm_substream *substream,</div><div class='ctx'> 							 stream_number);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		status = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	return status;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* playback pointer callback */</div><div class='hunk'>@@ -607,7 +482,7 @@ static snd_pcm_uframes_t snd_aw2_pcm_pointer_capture(struct snd_pcm_substream</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* create a pcm device */</div><div class='del'>-static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='add'>+static int snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm_playback_ana;</div><div class='ctx'> 	struct snd_pcm *pcm_playback_num;</div><div class='hunk'>@@ -620,7 +495,7 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "Audiowerk2 analog playback", 0, 1, 0,</div><div class='ctx'> 			  &amp;pcm_playback_ana);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "aw2: snd_pcm_new error (0x%X)\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "snd_pcm_new error (0x%X)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -628,7 +503,7 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> 	pcm_device = &amp;chip-&gt;device_playback[NUM_STREAM_PLAYBACK_ANA];</div><div class='ctx'> </div><div class='ctx'> 	/* Set PCM device name */</div><div class='del'>-	strcpy(pcm_playback_ana-&gt;name, "Analog playback");</div><div class='add'>+	strscpy(pcm_playback_ana-&gt;name, "Analog playback");</div><div class='ctx'> 	/* Associate private data to PCM device */</div><div class='ctx'> 	pcm_playback_ana-&gt;private_data = pcm_device;</div><div class='ctx'> 	/* set operators of PCM device */</div><div class='hunk'>@@ -644,27 +519,23 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* pre-allocation of buffers */</div><div class='ctx'> 	/* Preallocate continuous pages. */</div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm_playback_ana,</div><div class='del'>-						    SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						    snd_dma_pci_data</div><div class='del'>-						    (chip-&gt;pci),</div><div class='del'>-						    64 * 1024, 64 * 1024);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR "aw2: snd_pcm_lib_preallocate_pages_for_all "</div><div class='del'>-		       "error (0x%X)\n", err);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm_playback_ana,</div><div class='add'>+				       SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64 * 1024, 64 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "Audiowerk2 digital playback", 1, 1, 0,</div><div class='ctx'> 			  &amp;pcm_playback_num);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "aw2: snd_pcm_new error (0x%X)\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "snd_pcm_new error (0x%X)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Creation ok */</div><div class='ctx'> 	pcm_device = &amp;chip-&gt;device_playback[NUM_STREAM_PLAYBACK_DIG];</div><div class='ctx'> </div><div class='ctx'> 	/* Set PCM device name */</div><div class='del'>-	strcpy(pcm_playback_num-&gt;name, "Digital playback");</div><div class='add'>+	strscpy(pcm_playback_num-&gt;name, "Digital playback");</div><div class='ctx'> 	/* Associate private data to PCM device */</div><div class='ctx'> 	pcm_playback_num-&gt;private_data = pcm_device;</div><div class='ctx'> 	/* set operators of PCM device */</div><div class='hunk'>@@ -680,23 +551,16 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* pre-allocation of buffers */</div><div class='ctx'> 	/* Preallocate continuous pages. */</div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm_playback_num,</div><div class='del'>-						    SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						    snd_dma_pci_data</div><div class='del'>-						    (chip-&gt;pci),</div><div class='del'>-						    64 * 1024, 64 * 1024);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "aw2: snd_pcm_lib_preallocate_pages_for_all error "</div><div class='del'>-		       "(0x%X)\n", err);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm_playback_num,</div><div class='add'>+				       SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64 * 1024, 64 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "Audiowerk2 capture", 2, 0, 1,</div><div class='ctx'> 			  &amp;pcm_capture);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "aw2: snd_pcm_new error (0x%X)\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "snd_pcm_new error (0x%X)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -704,7 +568,7 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> 	pcm_device = &amp;chip-&gt;device_capture[NUM_STREAM_CAPTURE_ANA];</div><div class='ctx'> </div><div class='ctx'> 	/* Set PCM device name */</div><div class='del'>-	strcpy(pcm_capture-&gt;name, "Capture");</div><div class='add'>+	strscpy(pcm_capture-&gt;name, "Capture");</div><div class='ctx'> 	/* Associate private data to PCM device */</div><div class='ctx'> 	pcm_capture-&gt;private_data = pcm_device;</div><div class='ctx'> 	/* set operators of PCM device */</div><div class='hunk'>@@ -720,21 +584,15 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* pre-allocation of buffers */</div><div class='ctx'> 	/* Preallocate continuous pages. */</div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm_capture,</div><div class='del'>-						    SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						    snd_dma_pci_data</div><div class='del'>-						    (chip-&gt;pci),</div><div class='del'>-						    64 * 1024, 64 * 1024);</div><div class='del'>-	if (err)</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "aw2: snd_pcm_lib_preallocate_pages_for_all error "</div><div class='del'>-		       "(0x%X)\n", err);</div><div class='del'>-</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm_capture,</div><div class='add'>+				       SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64 * 1024, 64 * 1024);</div><div class='ctx'> </div><div class='ctx'> 	/* Create control */</div><div class='ctx'> 	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;aw2_control, chip));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "aw2: snd_ctl_add error (0x%X)\n", err);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "snd_ctl_add error (0x%X)\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -744,19 +602,10 @@ static int __devinit snd_aw2_new_pcm(struct aw2 *chip)</div><div class='ctx'> static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = {</div><div class='add'>+	static const char * const texts[2] = {</div><div class='ctx'> 		"Analog", "Digital"</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items) {</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-		    uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	}</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_aw2_control_switch_capture_get(struct snd_kcontrol *kcontrol,</div><div class='head'>diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c<br/>index 8afd8b5d1ac7..c84f1a45194f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-saa7146.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-saa7146.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-saa7146.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/aw2-saa7146.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Cedric Bregardis &lt;cedric.bregardis@free.fr&gt; and</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is part of the Audiowerk2 ALSA driver</div><div class='ctx'>  *</div><div class='del'>- * The Audiowerk2 ALSA driver is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2.</div><div class='del'>- *</div><div class='del'>- * The Audiowerk2 ALSA driver is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with the Audiowerk2 ALSA driver; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define AW2_SAA7146_M</div><div class='hunk'>@@ -27,8 +14,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;asm/system.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -205,8 +191,7 @@ void snd_aw2_saa7146_pcm_init_playback(struct snd_aw2_saa7146 *chip,</div><div class='ctx'> 		/* Define upper limit for DMA access */</div><div class='ctx'> 		WRITEREG(dma_addr + buffer_size, ProtA1_out);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "aw2: snd_aw2_saa7146_pcm_init_playback: "</div><div class='add'>+		pr_err("aw2: snd_aw2_saa7146_pcm_init_playback: "</div><div class='ctx'> 		       "Substream number is not 0 or 1 -&gt; not managed\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -252,8 +237,7 @@ void snd_aw2_saa7146_pcm_init_capture(struct snd_aw2_saa7146 *chip,</div><div class='ctx'> 		/* Define upper limit for DMA access  */</div><div class='ctx'> 		WRITEREG(dma_addr + buffer_size, ProtA1_in);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "aw2: snd_aw2_saa7146_pcm_init_capture: "</div><div class='add'>+		pr_err("aw2: snd_aw2_saa7146_pcm_init_capture: "</div><div class='ctx'> 		       "Substream number is not 0 -&gt; not managed\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -346,7 +330,7 @@ void snd_aw2_saa7146_pcm_trigger_stop_capture(struct snd_aw2_saa7146 *chip,</div><div class='ctx'> irqreturn_t snd_aw2_saa7146_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int isr;</div><div class='del'>-	unsigned int iicsta;</div><div class='add'>+	__always_unused unsigned int iicsta;</div><div class='ctx'> 	struct snd_aw2_saa7146 *chip = dev_id;</div><div class='ctx'> </div><div class='ctx'> 	isr = READREG(ISR);</div><div class='head'>diff --git a/sound/pci/aw2/aw2-saa7146.h b/sound/pci/aw2/aw2-saa7146.h<br/>index 5b35e358937f..3a3de56b9b07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-saa7146.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-saa7146.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-saa7146.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/aw2-saa7146.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Cedric Bregardis &lt;cedric.bregardis@free.fr&gt; and</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is part of the Audiowerk2 ALSA driver</div><div class='ctx'>  *</div><div class='del'>- * The Audiowerk2 ALSA driver is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2.</div><div class='del'>- *</div><div class='del'>- * The Audiowerk2 ALSA driver is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with the Audiowerk2 ALSA driver; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifndef AW2_SAA7146_H</div><div class='hunk'>@@ -32,11 +19,12 @@</div><div class='ctx'> </div><div class='ctx'> #define NUM_STREAM_CAPTURE_ANA 0</div><div class='ctx'> </div><div class='del'>-typedef void (*snd_aw2_saa7146_it_cb) (void *);</div><div class='add'>+struct snd_pcm_substream;</div><div class='add'>+typedef void (*snd_aw2_saa7146_it_cb) (struct snd_pcm_substream *);</div><div class='ctx'> </div><div class='ctx'> struct snd_aw2_saa7146_cb_param {</div><div class='ctx'> 	snd_aw2_saa7146_it_cb p_it_callback;</div><div class='del'>-	void *p_callback_param;</div><div class='add'>+	struct snd_pcm_substream *p_callback_param;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* definition of the chip-specific record */</div><div class='head'>diff --git a/sound/pci/aw2/aw2-tsl.c b/sound/pci/aw2/aw2-tsl.c<br/>index 459b0311ea31..2f35b08809a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-tsl.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/aw2-tsl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/aw2-tsl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/aw2-tsl.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Cedric Bregardis &lt;cedric.bregardis@free.fr&gt; and</div><div class='hunk'>@@ -7,20 +8,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is part of the Audiowerk2 ALSA driver</div><div class='ctx'>  *</div><div class='del'>- * The Audiowerk2 ALSA driver is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2.</div><div class='del'>- *</div><div class='del'>- * The Audiowerk2 ALSA driver is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with the Audiowerk2 ALSA driver; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #define TSL_WS0		(1UL &lt;&lt; 31)</div><div class='hunk'>@@ -72,7 +59,7 @@</div><div class='ctx'>     /*      SD3:          &gt;-------&lt;_4-L___&gt;-------&lt;_4-R___&gt; */</div><div class='ctx'>     /*      WS4:          -------\_______________/--------- */</div><div class='ctx'> </div><div class='del'>-static int tsl1[8] = {</div><div class='add'>+static const int tsl1[8] = {</div><div class='ctx'> 	1 * TSL_SDW_A1 | 3 * TSL_BSEL_A1 |</div><div class='ctx'> 	0 * TSL_DIS_A1 | 0 * TSL_DOD_A1 | TSL_LF_A1,</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +85,7 @@ static int tsl1[8] = {</div><div class='ctx'> 	0 * TSL_DOD_A1 | TSL_WS1 | TSL_WS0 | TSL_SF_A1 | TSL_EOS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int tsl2[8] = {</div><div class='add'>+static const int tsl2[8] = {</div><div class='ctx'> 	0 * TSL_SDW_A2 | 3 * TSL_BSEL_A2 | 2 * TSL_DOD_A2 | TSL_LF_A2,</div><div class='ctx'> 	0 * TSL_SDW_A2 | 2 * TSL_BSEL_A2 | 2 * TSL_DOD_A2,</div><div class='ctx'> 	0 * TSL_SDW_A2 | 3 * TSL_BSEL_A2 | 2 * TSL_DOD_A2,</div><div class='head'>diff --git a/sound/pci/aw2/saa7146.h b/sound/pci/aw2/saa7146.h<br/>index ce0ab5f9ee9c..90492a4c4db1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/saa7146.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/aw2/saa7146.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/aw2/saa7146.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/aw2/saa7146.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Cedric Bregardis &lt;cedric.bregardis@free.fr&gt; and</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This file is part of the Audiowerk2 ALSA driver</div><div class='ctx'>  *</div><div class='del'>- * The Audiowerk2 ALSA driver is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2.</div><div class='del'>- *</div><div class='del'>- * The Audiowerk2 ALSA driver is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with the Audiowerk2 ALSA driver; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,</div><div class='del'>- * USA.</div><div class='del'>- *</div><div class='ctx'>  *****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /* SAA7146 registers */</div><div class='head'>diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c<br/>index 4679ed83a43b..6cdf76e2b7d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/azt3328.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/azt3328.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/azt3328.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/azt3328.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-/*</div><div class='del'>- *  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).</div><div class='del'>- *  Copyright (C) 2002, 2005 - 2009 by Andreas Mohr &lt;andi AT lisas.de&gt;</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).</div><div class='add'>+ *  Copyright (C) 2002, 2005 - 2011 by Andreas Mohr &lt;andi AT lisas.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Framework borrowed from Bart Hartgers's als4000.c.</div><div class='ctx'>  *  Driver developed on PCI168 AP(W) version (PCI rev. 10, subsystem ID 1801),</div><div class='hunk'>@@ -17,21 +17,6 @@</div><div class='ctx'>  *   despite the high level of Internet ignorance - as usual :-P -</div><div class='ctx'>  *   about very good support for this card - on Linux!)</div><div class='ctx'>  *</div><div class='del'>- * GPL LICENSE</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * NOTES</div><div class='ctx'>  *  Since Aztech does not provide any chipset documentation,</div><div class='ctx'>  *  even on repeated request to various addresses,</div><div class='hunk'>@@ -66,6 +51,13 @@</div><div class='ctx'>  *    addresses illegally. So far unfortunately it looks like the very flexible</div><div class='ctx'>  *    ALSA AC97 support is still not enough to easily compensate for such a</div><div class='ctx'>  *    grave layout violation despite all tweaks and quirks mechanisms it offers.</div><div class='add'>+ *    Well, not quite: now ac97 layer is much improved (bus-specific ops!),</div><div class='add'>+ *    thus I was able to implement support - it's actually working quite well.</div><div class='add'>+ *    An interesting item might be Aztech AMR 2800-W, since it's an AC97</div><div class='add'>+ *    modem card which might reveal the Aztech-specific codec ID which</div><div class='add'>+ *    we might want to pretend, too. Dito PCI168's brother, PCI368,</div><div class='add'>+ *    where the advertising datasheet says it's AC97-based and has a</div><div class='add'>+ *    Digital Enhanced Game Port.</div><div class='ctx'>  *  - builtin genuine OPL3 - verified to work fine, 20080506</div><div class='ctx'>  *  - full duplex 16bit playback/record at independent sampling rate</div><div class='ctx'>  *  - MPU401 (+ legacy address support, claimed by one official spec sheet)</div><div class='hunk'>@@ -134,7 +126,7 @@</div><div class='ctx'>  *  Possible remedies:</div><div class='ctx'>  *  - use speaker (amplifier) output instead of headphone output</div><div class='ctx'>  *    (in case crackling is due to overloaded output clipping)</div><div class='del'>- *  - plug card into a different PCI slot, preferrably one that isn't shared</div><div class='add'>+ *  - plug card into a different PCI slot, preferably one that isn't shared</div><div class='ctx'>  *    too much (this helps a lot, but not completely!)</div><div class='ctx'>  *  - get rid of PCI VGA card, use AGP instead</div><div class='ctx'>  *  - upgrade or downgrade BIOS</div><div class='hunk'>@@ -173,13 +165,14 @@</div><div class='ctx'>  *  - use MMIO (memory-mapped I/O)? Slightly faster access, e.g. for gameport.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bug.h&gt; /* WARN_ONCE */</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -188,27 +181,37 @@</div><div class='ctx'> #include &lt;sound/mpu401.h&gt;</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='add'>+/*</div><div class='add'>+ * Config switch, to use ALSA's AC97 layer instead of old custom mixer crap.</div><div class='add'>+ * If the AC97 compatibility parts we needed to implement locally turn out</div><div class='add'>+ * to work nicely, then remove the old implementation eventually.</div><div class='add'>+ */</div><div class='add'>+#define AZF_USE_AC97_LAYER 1</div><div class='add'>+</div><div class='add'>+#ifdef AZF_USE_AC97_LAYER</div><div class='add'>+#include &lt;sound/ac97_codec.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> #include "azt3328.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Andreas Mohr &lt;andi AT lisas.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Aztech AZF3328 (PCI168)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_GAMEPORT 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* === Debug settings ===</div><div class='ctx'>   Further diagnostic functionality than the settings below</div><div class='del'>-  does not need to be provided, since one can easily write a bash script</div><div class='add'>+  does not need to be provided, since one can easily write a POSIX shell script</div><div class='ctx'>   to dump the card's I/O ports (those listed in lspci -v -v):</div><div class='del'>-  function dump()</div><div class='add'>+  dump()</div><div class='ctx'>   {</div><div class='ctx'>     local descr=$1; local addr=$2; local count=$3</div><div class='ctx'> </div><div class='ctx'>     echo "${descr}: ${count} @ ${addr}:"</div><div class='del'>-    dd if=/dev/port skip=$[${addr}] count=${count} bs=1 2&gt;/dev/null| hexdump -C</div><div class='add'>+    dd if=/dev/port skip=`printf %d ${addr}` count=${count} bs=1 \</div><div class='add'>+      2&gt;/dev/null| hexdump -C</div><div class='ctx'>   }</div><div class='ctx'>   and then use something like</div><div class='ctx'>   "dump joy200 0x200 8", "dump mpu388 0x388 4", "dump joy 0xb400 8",</div><div class='hunk'>@@ -216,65 +219,10 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");</div><div class='ctx'>   possibly within a "while true; do ... sleep 1; done" loop.</div><div class='ctx'>   Tweaking ports could be done using</div><div class='ctx'>   VALSTRING="`printf "%02x" $value`"</div><div class='del'>-  printf "\x""$VALSTRING"|dd of=/dev/port seek=$[${addr}] bs=1 2&gt;/dev/null</div><div class='add'>+  printf "\x""$VALSTRING"|dd of=/dev/port seek=`printf %d ${addr}` bs=1 \</div><div class='add'>+    2&gt;/dev/null</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#define DEBUG_MISC	0</div><div class='del'>-#define DEBUG_CALLS	0</div><div class='del'>-#define DEBUG_MIXER	0</div><div class='del'>-#define DEBUG_CODEC	0</div><div class='del'>-#define DEBUG_IO	0</div><div class='del'>-#define DEBUG_TIMER	0</div><div class='del'>-#define DEBUG_GAME	0</div><div class='del'>-#define DEBUG_PM	0</div><div class='del'>-#define MIXER_TESTING	0</div><div class='del'>-</div><div class='del'>-#if DEBUG_MISC</div><div class='del'>-#define snd_azf3328_dbgmisc(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgmisc(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_CALLS</div><div class='del'>-#define snd_azf3328_dbgcalls(format, args...) printk(format, ##args)</div><div class='del'>-#define snd_azf3328_dbgcallenter() printk(KERN_DEBUG "--&gt; %s\n", __func__)</div><div class='del'>-#define snd_azf3328_dbgcallleave() printk(KERN_DEBUG "&lt;-- %s\n", __func__)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgcalls(format, args...)</div><div class='del'>-#define snd_azf3328_dbgcallenter()</div><div class='del'>-#define snd_azf3328_dbgcallleave()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_MIXER</div><div class='del'>-#define snd_azf3328_dbgmixer(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgmixer(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_CODEC</div><div class='del'>-#define snd_azf3328_dbgcodec(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgcodec(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_MISC</div><div class='del'>-#define snd_azf3328_dbgtimer(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgtimer(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_GAME</div><div class='del'>-#define snd_azf3328_dbggame(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbggame(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if DEBUG_PM</div><div class='del'>-#define snd_azf3328_dbgpm(format, args...) printk(KERN_DEBUG format, ##args)</div><div class='del'>-#else</div><div class='del'>-#define snd_azf3328_dbgpm(format, args...)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for AZF3328 soundcard.");</div><div class='hunk'>@@ -283,7 +231,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='ctx'> module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for AZF3328 soundcard.");</div><div class='ctx'> </div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable AZF3328 soundcard.");</div><div class='ctx'> </div><div class='hunk'>@@ -291,19 +239,23 @@ static int seqtimer_scaling = 128;</div><div class='ctx'> module_param(seqtimer_scaling, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(seqtimer_scaling, "Set 1024000Hz sequencer timer scale factor (lockup danger!). Default 128.");</div><div class='ctx'> </div><div class='del'>-struct snd_azf3328_codec_data {</div><div class='del'>-	unsigned long io_base;</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	bool running;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum snd_azf3328_codec_type {</div><div class='add'>+  /* warning: fixed indices (also used for bitmask checks!) */</div><div class='ctx'>   AZF_CODEC_PLAYBACK = 0,</div><div class='ctx'>   AZF_CODEC_CAPTURE = 1,</div><div class='ctx'>   AZF_CODEC_I2S_OUT = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct snd_azf3328_codec_data {</div><div class='add'>+	unsigned long io_base; /* keep first! (avoid offset calc) */</div><div class='add'>+	unsigned int dma_base; /* helper to avoid an indirection in hotpath */</div><div class='add'>+	spinlock_t *lock; /* TODO: convert to our own per-codec lock member */</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+	bool running;</div><div class='add'>+	enum snd_azf3328_codec_type type;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct snd_azf3328 {</div><div class='ctx'> 	/* often-used fields towards beginning, then grouped */</div><div class='ctx'> </div><div class='hunk'>@@ -322,6 +274,10 @@ struct snd_azf3328 {</div><div class='ctx'> 	/* playback, recording and I2S out codecs */</div><div class='ctx'> 	struct snd_azf3328_codec_data codecs[3];</div><div class='ctx'> </div><div class='add'>+#ifdef AZF_USE_AC97_LAYER</div><div class='add'>+	struct snd_ac97 *ac97;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> </div><div class='hunk'>@@ -339,7 +295,6 @@ struct snd_azf3328 {</div><div class='ctx'> 	 * CONFIG_PM register storage below, but that's slightly difficult. */</div><div class='ctx'> 	u16 shadow_reg_ctrl_6AH;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	/* register value containers for power management</div><div class='ctx'> 	 * Note: not always full I/O range preserved (similar to Win driver!) */</div><div class='ctx'> 	u32 saved_regs_ctrl[AZF_ALIGN(AZF_IO_SIZE_CTRL_PM) / 4];</div><div class='hunk'>@@ -347,10 +302,9 @@ struct snd_azf3328 {</div><div class='ctx'> 	u32 saved_regs_mpu[AZF_ALIGN(AZF_IO_SIZE_MPU_PM) / 4];</div><div class='ctx'> 	u32 saved_regs_opl3[AZF_ALIGN(AZF_IO_SIZE_OPL3_PM) / 4];</div><div class='ctx'> 	u32 saved_regs_mixer[AZF_ALIGN(AZF_IO_SIZE_MIXER_PM) / 4];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_azf3328_ids) = {</div><div class='add'>+static const struct pci_device_id snd_azf3328_ids[] = {</div><div class='ctx'> 	{ 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* PCI168/3328 */</div><div class='ctx'> 	{ 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },   /* 3328 */</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -362,6 +316,9 @@ MODULE_DEVICE_TABLE(pci, snd_azf3328_ids);</div><div class='ctx'> static int</div><div class='ctx'> snd_azf3328_io_reg_setb(unsigned reg, u8 mask, bool do_set)</div><div class='ctx'> {</div><div class='add'>+	/* Well, strictly spoken, the inb/outb sequence isn't atomic</div><div class='add'>+	   and would need locking. However we currently don't care</div><div class='add'>+	   since it potentially complicates matters. */</div><div class='ctx'> 	u8 prev = inb(reg), new;</div><div class='ctx'> </div><div class='ctx'> 	new = (do_set) ? (prev|mask) : (prev &amp; ~mask);</div><div class='hunk'>@@ -405,12 +362,18 @@ snd_azf3328_codec_inw(const struct snd_azf3328_codec_data *codec, unsigned reg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-snd_azf3328_codec_outl(const struct snd_azf3328_codec_data *codec,</div><div class='del'>-		       unsigned reg,</div><div class='del'>-		       u32 value</div><div class='add'>+snd_azf3328_codec_outl_multi(const struct snd_azf3328_codec_data *codec,</div><div class='add'>+			     unsigned reg, const void *buffer, int count</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	outl(value, codec-&gt;io_base + reg);</div><div class='add'>+	unsigned long addr = codec-&gt;io_base + reg;</div><div class='add'>+	if (count) {</div><div class='add'>+		const u32 *buf = buffer;</div><div class='add'>+		do {</div><div class='add'>+			outl(*buf++, addr);</div><div class='add'>+			addr += 4;</div><div class='add'>+		} while (--count);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32</div><div class='hunk'>@@ -431,6 +394,12 @@ snd_azf3328_ctrl_inb(const struct snd_azf3328 *chip, unsigned reg)</div><div class='ctx'> 	return inb(chip-&gt;ctrl_io + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u16</div><div class='add'>+snd_azf3328_ctrl_inw(const struct snd_azf3328 *chip, unsigned reg)</div><div class='add'>+{</div><div class='add'>+	return inw(chip-&gt;ctrl_io + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void</div><div class='ctx'> snd_azf3328_ctrl_outw(const struct snd_azf3328 *chip, unsigned reg, u16 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -443,25 +412,25 @@ snd_azf3328_ctrl_outl(const struct snd_azf3328 *chip, unsigned reg, u32 value)</div><div class='ctx'> 	outl(value, chip-&gt;ctrl_io + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline void __maybe_unused</div><div class='ctx'> snd_azf3328_game_outb(const struct snd_azf3328 *chip, unsigned reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	outb(value, chip-&gt;game_io + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='add'>+static inline void __maybe_unused</div><div class='ctx'> snd_azf3328_game_outw(const struct snd_azf3328 *chip, unsigned reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	outw(value, chip-&gt;game_io + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8</div><div class='add'>+static inline u8 __maybe_unused</div><div class='ctx'> snd_azf3328_game_inb(const struct snd_azf3328 *chip, unsigned reg)</div><div class='ctx'> {</div><div class='ctx'> 	return inb(chip-&gt;game_io + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16</div><div class='add'>+static inline u16 __maybe_unused</div><div class='ctx'> snd_azf3328_game_inw(const struct snd_azf3328 *chip, unsigned reg)</div><div class='ctx'> {</div><div class='ctx'> 	return inw(chip-&gt;game_io + reg);</div><div class='hunk'>@@ -482,7 +451,7 @@ snd_azf3328_mixer_inw(const struct snd_azf3328 *chip, unsigned reg)</div><div class='ctx'> #define AZF_MUTE_BIT 0x80</div><div class='ctx'> </div><div class='ctx'> static bool</div><div class='del'>-snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,</div><div class='add'>+snd_azf3328_mixer_mute_control(const struct snd_azf3328 *chip,</div><div class='ctx'> 			   unsigned reg, bool do_mute</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='hunk'>@@ -497,6 +466,321 @@ snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,</div><div class='ctx'> 	return (do_mute) ? !updated : updated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool</div><div class='add'>+snd_azf3328_mixer_mute_control_master(const struct snd_azf3328 *chip,</div><div class='add'>+			   bool do_mute</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	return snd_azf3328_mixer_mute_control(</div><div class='add'>+		chip,</div><div class='add'>+		IDX_MIXER_PLAY_MASTER,</div><div class='add'>+		do_mute</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+snd_azf3328_mixer_mute_control_pcm(const struct snd_azf3328 *chip,</div><div class='add'>+			   bool do_mute</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	return snd_azf3328_mixer_mute_control(</div><div class='add'>+		chip,</div><div class='add'>+		IDX_MIXER_WAVEOUT,</div><div class='add'>+		do_mute</div><div class='add'>+	);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_azf3328_mixer_reset(const struct snd_azf3328 *chip)</div><div class='add'>+{</div><div class='add'>+	/* reset (close) mixer:</div><div class='add'>+	 * first mute master volume, then reset</div><div class='add'>+	 */</div><div class='add'>+	snd_azf3328_mixer_mute_control_master(chip, 1);</div><div class='add'>+	snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef AZF_USE_AC97_LAYER</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_azf3328_mixer_ac97_map_unsupported(const struct snd_azf3328 *chip,</div><div class='add'>+				       unsigned short reg, const char *mode)</div><div class='add'>+{</div><div class='add'>+	/* need to add some more or less clever emulation? */</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+		"missing %s emulation for AC97 register 0x%02x!\n",</div><div class='add'>+		mode, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Need to have _special_ AC97 mixer hardware register index mapper,</div><div class='add'>+ * to compensate for the issue of a rather AC97-incompatible hardware layout.</div><div class='add'>+ */</div><div class='add'>+#define AZF_REG_MASK 0x3f</div><div class='add'>+#define AZF_AC97_REG_UNSUPPORTED 0x8000</div><div class='add'>+#define AZF_AC97_REG_REAL_IO_READ 0x4000</div><div class='add'>+#define AZF_AC97_REG_REAL_IO_WRITE 0x2000</div><div class='add'>+#define AZF_AC97_REG_REAL_IO_RW \</div><div class='add'>+	(AZF_AC97_REG_REAL_IO_READ | AZF_AC97_REG_REAL_IO_WRITE)</div><div class='add'>+#define AZF_AC97_REG_EMU_IO_READ 0x0400</div><div class='add'>+#define AZF_AC97_REG_EMU_IO_WRITE 0x0200</div><div class='add'>+#define AZF_AC97_REG_EMU_IO_RW \</div><div class='add'>+	(AZF_AC97_REG_EMU_IO_READ | AZF_AC97_REG_EMU_IO_WRITE)</div><div class='add'>+static unsigned short</div><div class='add'>+snd_azf3328_mixer_ac97_map_reg_idx(unsigned short reg)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		unsigned short azf_reg;</div><div class='add'>+	} azf_reg_mapper[] = {</div><div class='add'>+		/* Especially when taking into consideration</div><div class='add'>+		 * mono/stereo-based sequence of azf vs. AC97 control series,</div><div class='add'>+		 * it's quite obvious that azf simply got rid</div><div class='add'>+		 * of the AC97_HEADPHONE control at its intended offset,</div><div class='add'>+		 * thus shifted _all_ controls by one,</div><div class='add'>+		 * and _then_ simply added it as an FMSYNTH control at the end,</div><div class='add'>+		 * to make up for the offset.</div><div class='add'>+		 * This means we'll have to translate indices here as</div><div class='add'>+		 * needed and then do some tiny AC97 patch action</div><div class='add'>+		 * (snd_ac97_rename_vol_ctl() etc.) - that's it.</div><div class='add'>+		 */</div><div class='add'>+		{ /* AC97_RESET */ IDX_MIXER_RESET</div><div class='add'>+			| AZF_AC97_REG_REAL_IO_WRITE</div><div class='add'>+			| AZF_AC97_REG_EMU_IO_READ },</div><div class='add'>+		{ /* AC97_MASTER */ IDX_MIXER_PLAY_MASTER },</div><div class='add'>+		 /* note large shift: AC97_HEADPHONE to IDX_MIXER_FMSYNTH! */</div><div class='add'>+		{ /* AC97_HEADPHONE */ IDX_MIXER_FMSYNTH },</div><div class='add'>+		{ /* AC97_MASTER_MONO */ IDX_MIXER_MODEMOUT },</div><div class='add'>+		{ /* AC97_MASTER_TONE */ IDX_MIXER_BASSTREBLE },</div><div class='add'>+		{ /* AC97_PC_BEEP */ IDX_MIXER_PCBEEP },</div><div class='add'>+		{ /* AC97_PHONE */ IDX_MIXER_MODEMIN },</div><div class='add'>+		{ /* AC97_MIC */ IDX_MIXER_MIC },</div><div class='add'>+		{ /* AC97_LINE */ IDX_MIXER_LINEIN },</div><div class='add'>+		{ /* AC97_CD */ IDX_MIXER_CDAUDIO },</div><div class='add'>+		{ /* AC97_VIDEO */ IDX_MIXER_VIDEO },</div><div class='add'>+		{ /* AC97_AUX */ IDX_MIXER_AUX },</div><div class='add'>+		{ /* AC97_PCM */ IDX_MIXER_WAVEOUT },</div><div class='add'>+		{ /* AC97_REC_SEL */ IDX_MIXER_REC_SELECT },</div><div class='add'>+		{ /* AC97_REC_GAIN */ IDX_MIXER_REC_VOLUME },</div><div class='add'>+		{ /* AC97_REC_GAIN_MIC */ AZF_AC97_REG_EMU_IO_RW },</div><div class='add'>+		{ /* AC97_GENERAL_PURPOSE */ IDX_MIXER_ADVCTL2 },</div><div class='add'>+		{ /* AC97_3D_CONTROL */ IDX_MIXER_ADVCTL1 },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	unsigned short reg_azf = AZF_AC97_REG_UNSUPPORTED;</div><div class='add'>+</div><div class='add'>+	/* azf3328 supports the low-numbered and low-spec:ed range</div><div class='add'>+	   of AC97 regs only */</div><div class='add'>+	if (reg &lt;= AC97_3D_CONTROL) {</div><div class='add'>+		unsigned short reg_idx = reg / 2;</div><div class='add'>+		reg_azf = azf_reg_mapper[reg_idx].azf_reg;</div><div class='add'>+		/* a translation-only entry means it's real read/write: */</div><div class='add'>+		if (!(reg_azf &amp; ~AZF_REG_MASK))</div><div class='add'>+			reg_azf |= AZF_AC97_REG_REAL_IO_RW;</div><div class='add'>+	} else {</div><div class='add'>+		switch (reg) {</div><div class='add'>+		case AC97_POWERDOWN:</div><div class='add'>+			reg_azf = AZF_AC97_REG_EMU_IO_RW;</div><div class='add'>+			break;</div><div class='add'>+		case AC97_EXTENDED_ID:</div><div class='add'>+			reg_azf = AZF_AC97_REG_EMU_IO_READ;</div><div class='add'>+			break;</div><div class='add'>+		case AC97_EXTENDED_STATUS:</div><div class='add'>+			/* I don't know what the h*ll AC97 layer</div><div class='add'>+			 * would consult this _extended_ register for</div><div class='add'>+			 * given a base-AC97-advertised card,</div><div class='add'>+			 * but let's just emulate it anyway :-P</div><div class='add'>+			 */</div><div class='add'>+			reg_azf = AZF_AC97_REG_EMU_IO_RW;</div><div class='add'>+			break;</div><div class='add'>+		case AC97_VENDOR_ID1:</div><div class='add'>+		case AC97_VENDOR_ID2:</div><div class='add'>+			reg_azf = AZF_AC97_REG_EMU_IO_READ;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return reg_azf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const unsigned short</div><div class='add'>+azf_emulated_ac97_caps =</div><div class='add'>+	AC97_BC_DEDICATED_MIC |</div><div class='add'>+	AC97_BC_BASS_TREBLE |</div><div class='add'>+	/* Headphone is an FM Synth control here */</div><div class='add'>+	AC97_BC_HEADPHONE |</div><div class='add'>+	/* no AC97_BC_LOUDNESS! */</div><div class='add'>+	/* mask 0x7c00 is</div><div class='add'>+	   vendor-specific 3D enhancement</div><div class='add'>+	   vendor indicator.</div><div class='add'>+	   Since there actually _is_ an</div><div class='add'>+	   entry for Aztech Labs</div><div class='add'>+	   (13), make damn sure</div><div class='add'>+	   to indicate it. */</div><div class='add'>+	(13 &lt;&lt; 10);</div><div class='add'>+</div><div class='add'>+static const unsigned short</div><div class='add'>+azf_emulated_ac97_powerdown =</div><div class='add'>+	/* pretend everything to be active */</div><div class='add'>+		AC97_PD_ADC_STATUS |</div><div class='add'>+		AC97_PD_DAC_STATUS |</div><div class='add'>+		AC97_PD_MIXER_STATUS |</div><div class='add'>+		AC97_PD_VREF_STATUS;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Emulated, _inofficial_ vendor ID</div><div class='add'>+ * (there might be some devices such as the MR 2800-W</div><div class='add'>+ * which could reveal the real Aztech AC97 ID).</div><div class='add'>+ * We choose to use "AZT" prefix, and then use 1 to indicate PCI168</div><div class='add'>+ * (better don't use 0x68 since there's a PCI368 as well).</div><div class='add'>+ */</div><div class='add'>+static const unsigned int</div><div class='add'>+azf_emulated_ac97_vendor_id = 0x415a5401;</div><div class='add'>+</div><div class='add'>+static unsigned short</div><div class='add'>+snd_azf3328_mixer_ac97_read(struct snd_ac97 *ac97, unsigned short reg_ac97)</div><div class='add'>+{</div><div class='add'>+	const struct snd_azf3328 *chip = ac97-&gt;private_data;</div><div class='add'>+	unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);</div><div class='add'>+	unsigned short reg_val = 0;</div><div class='add'>+	bool unsupported = false;</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "snd_azf3328_mixer_ac97_read reg_ac97 %u\n",</div><div class='add'>+		reg_ac97);</div><div class='add'>+	if (reg_azf &amp; AZF_AC97_REG_UNSUPPORTED)</div><div class='add'>+		unsupported = true;</div><div class='add'>+	else {</div><div class='add'>+		if (reg_azf &amp; AZF_AC97_REG_REAL_IO_READ)</div><div class='add'>+			reg_val = snd_azf3328_mixer_inw(chip,</div><div class='add'>+						reg_azf &amp; AZF_REG_MASK);</div><div class='add'>+		else {</div><div class='add'>+			/*</div><div class='add'>+			 * Proceed with dummy I/O read,</div><div class='add'>+			 * to ensure compatible timing where this may matter.</div><div class='add'>+			 * (ALSA AC97 layer usually doesn't call I/O functions</div><div class='add'>+			 * due to intelligent I/O caching anyway)</div><div class='add'>+			 * Choose a mixer register that's thoroughly unrelated</div><div class='add'>+			 * to common audio (try to minimize distortion).</div><div class='add'>+			 */</div><div class='add'>+			snd_azf3328_mixer_inw(chip, IDX_MIXER_SOMETHING30H);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg_azf &amp; AZF_AC97_REG_EMU_IO_READ) {</div><div class='add'>+			switch (reg_ac97) {</div><div class='add'>+			case AC97_RESET:</div><div class='add'>+				reg_val |= azf_emulated_ac97_caps;</div><div class='add'>+				break;</div><div class='add'>+			case AC97_POWERDOWN:</div><div class='add'>+				reg_val |= azf_emulated_ac97_powerdown;</div><div class='add'>+				break;</div><div class='add'>+			case AC97_EXTENDED_ID:</div><div class='add'>+			case AC97_EXTENDED_STATUS:</div><div class='add'>+				/* AFAICS we simply can't support anything: */</div><div class='add'>+				reg_val |= 0;</div><div class='add'>+				break;</div><div class='add'>+			case AC97_VENDOR_ID1:</div><div class='add'>+				reg_val = azf_emulated_ac97_vendor_id &gt;&gt; 16;</div><div class='add'>+				break;</div><div class='add'>+			case AC97_VENDOR_ID2:</div><div class='add'>+				reg_val = azf_emulated_ac97_vendor_id &amp; 0xffff;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				unsupported = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (unsupported)</div><div class='add'>+		snd_azf3328_mixer_ac97_map_unsupported(chip, reg_ac97, "read");</div><div class='add'>+</div><div class='add'>+	return reg_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snd_azf3328_mixer_ac97_write(struct snd_ac97 *ac97,</div><div class='add'>+		     unsigned short reg_ac97, unsigned short val)</div><div class='add'>+{</div><div class='add'>+	const struct snd_azf3328 *chip = ac97-&gt;private_data;</div><div class='add'>+	unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);</div><div class='add'>+	bool unsupported = false;</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"snd_azf3328_mixer_ac97_write reg_ac97 %u val %u\n",</div><div class='add'>+		reg_ac97, val);</div><div class='add'>+	if (reg_azf &amp; AZF_AC97_REG_UNSUPPORTED)</div><div class='add'>+		unsupported = true;</div><div class='add'>+	else {</div><div class='add'>+		if (reg_azf &amp; AZF_AC97_REG_REAL_IO_WRITE)</div><div class='add'>+			snd_azf3328_mixer_outw(</div><div class='add'>+				chip,</div><div class='add'>+				reg_azf &amp; AZF_REG_MASK,</div><div class='add'>+				val</div><div class='add'>+			);</div><div class='add'>+		else</div><div class='add'>+		if (reg_azf &amp; AZF_AC97_REG_EMU_IO_WRITE) {</div><div class='add'>+			switch (reg_ac97) {</div><div class='add'>+			case AC97_REC_GAIN_MIC:</div><div class='add'>+			case AC97_POWERDOWN:</div><div class='add'>+			case AC97_EXTENDED_STATUS:</div><div class='add'>+				/*</div><div class='add'>+				 * Silently swallow these writes.</div><div class='add'>+				 * Since for most registers our card doesn't</div><div class='add'>+				 * actually support a comparable feature,</div><div class='add'>+				 * this is exactly what we should do here.</div><div class='add'>+				 * The AC97 layer's I/O caching probably</div><div class='add'>+				 * automatically takes care of all the rest...</div><div class='add'>+				 * (remembers written values etc.)</div><div class='add'>+				 */</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				unsupported = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (unsupported)</div><div class='add'>+		snd_azf3328_mixer_ac97_map_unsupported(chip, reg_ac97, "write");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+snd_azf3328_mixer_new(struct snd_azf3328 *chip)</div><div class='add'>+{</div><div class='add'>+	struct snd_ac97_bus *bus;</div><div class='add'>+	struct snd_ac97_template ac97;</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='add'>+		.write = snd_azf3328_mixer_ac97_write,</div><div class='add'>+		.read = snd_azf3328_mixer_ac97_read,</div><div class='add'>+	};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='add'>+	ac97.scaps = AC97_SCAP_SKIP_MODEM</div><div class='add'>+			| AC97_SCAP_AUDIO /* we support audio! */</div><div class='add'>+			| AC97_SCAP_NO_SPDIF;</div><div class='add'>+	ac97.private_data = chip;</div><div class='add'>+	ac97.pci = chip-&gt;pci;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * ALSA's AC97 layer has terrible init crackling issues,</div><div class='add'>+	 * unfortunately, and since it makes use of AC97_RESET,</div><div class='add'>+	 * there's no use trying to mute Master Playback proactively.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	rc = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;bus);</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = snd_ac97_mixer(bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+		/*</div><div class='add'>+		 * Make sure to complain loudly in case of AC97 init failure,</div><div class='add'>+		 * since failure may happen quite often,</div><div class='add'>+		 * due to this card being a very quirky AC97 "lookalike".</div><div class='add'>+		 */</div><div class='add'>+	if (rc)</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AC97 init failed, err %d!\n", rc);</div><div class='add'>+</div><div class='add'>+	/* If we return an error here, then snd_card_free() should</div><div class='add'>+	 * free up any ac97 codecs that got created, as well as the bus.</div><div class='add'>+	 */</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+#else /* AZF_USE_AC97_LAYER */</div><div class='ctx'> static void</div><div class='ctx'> snd_azf3328_mixer_write_volume_gradually(const struct snd_azf3328 *chip,</div><div class='ctx'> 					 unsigned reg,</div><div class='hunk'>@@ -509,8 +793,6 @@ snd_azf3328_mixer_write_volume_gradually(const struct snd_azf3328 *chip,</div><div class='ctx'> 	unsigned char curr_vol_left = 0, curr_vol_right = 0;</div><div class='ctx'> 	int left_change = 0, right_change = 0;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-</div><div class='ctx'> 	if (chan_sel &amp; SET_CHAN_LEFT) {</div><div class='ctx'> 		curr_vol_left  = inb(portbase + 1);</div><div class='ctx'> </div><div class='hunk'>@@ -551,7 +833,6 @@ snd_azf3328_mixer_write_volume_gradually(const struct snd_azf3328 *chip,</div><div class='ctx'> 		if (delay)</div><div class='ctx'> 			mdelay(delay);</div><div class='ctx'> 	} while ((left_change) || (right_change));</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -629,14 +910,12 @@ snd_azf3328_info_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct azf3328_mixer_reg reg;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	snd_azf3328_mixer_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='ctx'> 	uinfo-&gt;type = reg.mask == 1 ?</div><div class='ctx'> 		SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = reg.stereo + 1;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = reg.mask;</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -648,7 +927,6 @@ snd_azf3328_get_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct azf3328_mixer_reg reg;</div><div class='ctx'> 	u16 oreg, val;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	snd_azf3328_mixer_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='ctx'> </div><div class='ctx'> 	oreg = snd_azf3328_mixer_inw(chip, reg.reg);</div><div class='hunk'>@@ -662,12 +940,11 @@ snd_azf3328_get_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			val = reg.mask - val;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = val;</div><div class='ctx'> 	}</div><div class='del'>-	snd_azf3328_dbgmixer("get: %02x is %04x -&gt; vol %02lx|%02lx "</div><div class='del'>-			     "(shift %02d|%02d, mask %02x, inv. %d, stereo %d)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"get: %02x is %04x -&gt; vol %02lx|%02lx (shift %02d|%02d, mask %02x, inv. %d, stereo %d)\n",</div><div class='ctx'> 		reg.reg, oreg,</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0], ucontrol-&gt;value.integer.value[1],</div><div class='ctx'> 		reg.lchan_shift, reg.rchan_shift, reg.mask, reg.invert, reg.stereo);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +956,6 @@ snd_azf3328_put_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct azf3328_mixer_reg reg;</div><div class='ctx'> 	u16 oreg, nreg, val;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	snd_azf3328_mixer_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='ctx'> 	oreg = snd_azf3328_mixer_inw(chip, reg.reg);</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0] &amp; reg.mask;</div><div class='hunk'>@@ -703,12 +979,11 @@ snd_azf3328_put_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	else</div><div class='ctx'>         	snd_azf3328_mixer_outw(chip, reg.reg, nreg);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgmixer("put: %02x to %02lx|%02lx, "</div><div class='del'>-			     "oreg %04x; shift %02d|%02d -&gt; nreg %04x; after: %04x\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"put: %02x to %02lx|%02lx, oreg %04x; shift %02d|%02d -&gt; nreg %04x; after: %04x\n",</div><div class='ctx'> 		reg.reg, ucontrol-&gt;value.integer.value[0], ucontrol-&gt;value.integer.value[1],</div><div class='ctx'> 		oreg, reg.lchan_shift, reg.rchan_shift,</div><div class='ctx'> 		nreg, snd_azf3328_mixer_inw(chip, reg.reg));</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return (nreg != oreg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,11 +1008,6 @@ snd_azf3328_info_mixer_enum(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	const char * const *p = NULL;</div><div class='ctx'> </div><div class='ctx'> 	snd_azf3328_mixer_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-        uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-        uinfo-&gt;count = (reg.reg == IDX_MIXER_REC_SELECT) ? 2 : 1;</div><div class='del'>-        uinfo-&gt;value.enumerated.items = reg.enum_c;</div><div class='del'>-        if (uinfo-&gt;value.enumerated.item &gt; reg.enum_c - 1U)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = reg.enum_c - 1U;</div><div class='ctx'> 	if (reg.reg == IDX_MIXER_ADVCTL2) {</div><div class='ctx'> 		switch(reg.lchan_shift) {</div><div class='ctx'> 		case 8: /* modem out sel */</div><div class='hunk'>@@ -750,12 +1020,12 @@ snd_azf3328_info_mixer_enum(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			p = texts4;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	} else</div><div class='del'>-	if (reg.reg == IDX_MIXER_REC_SELECT)</div><div class='add'>+	} else if (reg.reg == IDX_MIXER_REC_SELECT)</div><div class='ctx'> 		p = texts3;</div><div class='ctx'> </div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, p[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-        return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo,</div><div class='add'>+				 (reg.reg == IDX_MIXER_REC_SELECT) ? 2 : 1,</div><div class='add'>+				 reg.enum_c, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -774,7 +1044,8 @@ snd_azf3328_get_mixer_enum(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	} else</div><div class='ctx'>         	ucontrol-&gt;value.enumerated.item[0] = (val &gt;&gt; reg.lchan_shift) &amp; (reg.enum_c - 1);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgmixer("get_enum: %02x is %04x -&gt; %d|%d (shift %02d, enum_c %d)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"get_enum: %02x is %04x -&gt; %d|%d (shift %02d, enum_c %d)\n",</div><div class='ctx'> 		reg.reg, val, ucontrol-&gt;value.enumerated.item[0], ucontrol-&gt;value.enumerated.item[1],</div><div class='ctx'> 		reg.lchan_shift, reg.enum_c);</div><div class='ctx'>         return 0;</div><div class='hunk'>@@ -806,11 +1077,12 @@ snd_azf3328_put_mixer_enum(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	snd_azf3328_mixer_outw(chip, reg.reg, val);</div><div class='ctx'> 	nreg = val;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgmixer("put_enum: %02x to %04x, oreg %04x\n", reg.reg, val, oreg);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"put_enum: %02x to %04x, oreg %04x\n", reg.reg, val, oreg);</div><div class='ctx'> 	return (nreg != oreg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_azf3328_mixer_controls[] = {</div><div class='ctx'> 	AZF3328_MIXER_SWITCH("Master Playback Switch", IDX_MIXER_PLAY_MASTER, 15, 1),</div><div class='ctx'> 	AZF3328_MIXER_VOL_STEREO("Master Playback Volume", IDX_MIXER_PLAY_MASTER, 0x1f, 1),</div><div class='ctx'> 	AZF3328_MIXER_SWITCH("PCM Playback Switch", IDX_MIXER_WAVEOUT, 15, 1),</div><div class='hunk'>@@ -868,7 +1140,7 @@ static struct snd_kcontrol_new snd_azf3328_mixer_controls[] __devinitdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u16 __devinitdata snd_azf3328_init_values[][2] = {</div><div class='add'>+static const u16 snd_azf3328_init_values[][2] = {</div><div class='ctx'>         { IDX_MIXER_PLAY_MASTER,	MIXER_MUTE_MASK|0x1f1f },</div><div class='ctx'>         { IDX_MIXER_MODEMOUT,		MIXER_MUTE_MASK|0x1f1f },</div><div class='ctx'> 	{ IDX_MIXER_BASSTREBLE,		0x0000 },</div><div class='hunk'>@@ -884,7 +1156,7 @@ static u16 __devinitdata snd_azf3328_init_values[][2] = {</div><div class='ctx'>         { IDX_MIXER_REC_VOLUME,		MIXER_MUTE_MASK|0x0707 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_azf3328_mixer_new(struct snd_azf3328 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -892,7 +1164,6 @@ snd_azf3328_mixer_new(struct snd_azf3328 *chip)</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	if (snd_BUG_ON(!chip || !chip-&gt;card))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -912,69 +1183,47 @@ snd_azf3328_mixer_new(struct snd_azf3328 *chip)</div><div class='ctx'> 	sw = snd_azf3328_mixer_controls;</div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_azf3328_mixer_controls);</div><div class='ctx'> 			++idx, ++sw) {</div><div class='del'>-		if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(sw, chip))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(sw, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_component_add(card, "AZF3328 mixer");</div><div class='del'>-	strcpy(card-&gt;mixername, "AZF3328 mixer");</div><div class='del'>-</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	strscpy(card-&gt;mixername, "AZF3328 mixer");</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_azf3328_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	res = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif /* AZF_USE_AC97_LAYER */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,</div><div class='del'>-			       enum snd_azf3328_codec_type codec_type,</div><div class='add'>+snd_azf3328_codec_setfmt(struct snd_azf3328_codec_data *codec,</div><div class='ctx'> 			       enum azf_freq_t bitrate,</div><div class='ctx'> 			       unsigned int format_width,</div><div class='ctx'> 			       unsigned int channels</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	const struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='ctx'> 	u16 val = 0xff00;</div><div class='add'>+	u8 freq = 0;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	switch (bitrate) {</div><div class='del'>-	case AZF_FREQ_4000:  val |= SOUNDFORMAT_FREQ_SUSPECTED_4000; break;</div><div class='del'>-	case AZF_FREQ_4800:  val |= SOUNDFORMAT_FREQ_SUSPECTED_4800; break;</div><div class='add'>+	case AZF_FREQ_4000:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4000; break;</div><div class='add'>+	case AZF_FREQ_4800:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4800; break;</div><div class='ctx'> 	case AZF_FREQ_5512:</div><div class='ctx'> 		/* the AZF3328 names it "5510" for some strange reason */</div><div class='del'>-			     val |= SOUNDFORMAT_FREQ_5510; break;</div><div class='del'>-	case AZF_FREQ_6620:  val |= SOUNDFORMAT_FREQ_6620; break;</div><div class='del'>-	case AZF_FREQ_8000:  val |= SOUNDFORMAT_FREQ_8000; break;</div><div class='del'>-	case AZF_FREQ_9600:  val |= SOUNDFORMAT_FREQ_9600; break;</div><div class='del'>-	case AZF_FREQ_11025: val |= SOUNDFORMAT_FREQ_11025; break;</div><div class='del'>-	case AZF_FREQ_13240: val |= SOUNDFORMAT_FREQ_SUSPECTED_13240; break;</div><div class='del'>-	case AZF_FREQ_16000: val |= SOUNDFORMAT_FREQ_16000; break;</div><div class='del'>-	case AZF_FREQ_22050: val |= SOUNDFORMAT_FREQ_22050; break;</div><div class='del'>-	case AZF_FREQ_32000: val |= SOUNDFORMAT_FREQ_32000; break;</div><div class='add'>+			     freq = SOUNDFORMAT_FREQ_5510; break;</div><div class='add'>+	case AZF_FREQ_6620:  freq = SOUNDFORMAT_FREQ_6620; break;</div><div class='add'>+	case AZF_FREQ_8000:  freq = SOUNDFORMAT_FREQ_8000; break;</div><div class='add'>+	case AZF_FREQ_9600:  freq = SOUNDFORMAT_FREQ_9600; break;</div><div class='add'>+	case AZF_FREQ_11025: freq = SOUNDFORMAT_FREQ_11025; break;</div><div class='add'>+	case AZF_FREQ_13240: freq = SOUNDFORMAT_FREQ_SUSPECTED_13240; break;</div><div class='add'>+	case AZF_FREQ_16000: freq = SOUNDFORMAT_FREQ_16000; break;</div><div class='add'>+	case AZF_FREQ_22050: freq = SOUNDFORMAT_FREQ_22050; break;</div><div class='add'>+	case AZF_FREQ_32000: freq = SOUNDFORMAT_FREQ_32000; break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate);</div><div class='del'>-		/* fall-through */</div><div class='del'>-	case AZF_FREQ_44100: val |= SOUNDFORMAT_FREQ_44100; break;</div><div class='del'>-	case AZF_FREQ_48000: val |= SOUNDFORMAT_FREQ_48000; break;</div><div class='del'>-	case AZF_FREQ_66200: val |= SOUNDFORMAT_FREQ_SUSPECTED_66200; break;</div><div class='add'>+		pr_warn("azf3328: unknown bitrate %d, assuming 44.1kHz!\n", bitrate);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case AZF_FREQ_44100: freq = SOUNDFORMAT_FREQ_44100; break;</div><div class='add'>+	case AZF_FREQ_48000: freq = SOUNDFORMAT_FREQ_48000; break;</div><div class='add'>+	case AZF_FREQ_66200: freq = SOUNDFORMAT_FREQ_SUSPECTED_66200; break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* val = 0xff07; 3m27.993s (65301Hz; -&gt; 64000Hz???) hmm, 66120, 65967, 66123 */</div><div class='ctx'> 	/* val = 0xff09; 17m15.098s (13123,478Hz; -&gt; 12000Hz???) hmm, 13237.2Hz? */</div><div class='hunk'>@@ -986,13 +1235,15 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,</div><div class='ctx'> 	/* val = 0xff0d; 41m23.135s (5523,600Hz; -&gt; 5512Hz???) */</div><div class='ctx'> 	/* val = 0xff0e; 28m30.777s (8017Hz; -&gt; 8000Hz???) */</div><div class='ctx'> </div><div class='add'>+	val |= freq;</div><div class='add'>+</div><div class='ctx'> 	if (channels == 2)</div><div class='ctx'> 		val |= SOUNDFORMAT_FLAG_2CHANNELS;</div><div class='ctx'> </div><div class='ctx'> 	if (format_width == 16)</div><div class='ctx'> 		val |= SOUNDFORMAT_FLAG_16BIT;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(codec-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* set bitrate/format */</div><div class='ctx'> 	snd_azf3328_codec_outw(codec, IDX_IO_CODEC_SOUNDFORMAT, val);</div><div class='hunk'>@@ -1004,7 +1255,8 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,</div><div class='ctx'> 	 * (FIXME: yes, it works, but what exactly am I doing here?? :)</div><div class='ctx'> 	 * FIXME: does this have some side effects for full-duplex</div><div class='ctx'> 	 * or other dramatic side effects? */</div><div class='del'>-	if (codec_type == AZF_CODEC_PLAYBACK) /* only do it for playback */</div><div class='add'>+	/* do it for non-capture codecs only */</div><div class='add'>+	if (codec-&gt;type != AZF_CODEC_CAPTURE)</div><div class='ctx'> 		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='ctx'> 			snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS) |</div><div class='ctx'> 			DMA_RUN_SOMETHING1 |</div><div class='hunk'>@@ -1013,21 +1265,17 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,</div><div class='ctx'> 			DMA_EPILOGUE_SOMETHING |</div><div class='ctx'> 			DMA_SOMETHING_ELSE</div><div class='ctx'> 		);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-snd_azf3328_codec_setfmt_lowpower(struct snd_azf3328 *chip,</div><div class='del'>-			    enum snd_azf3328_codec_type codec_type</div><div class='add'>+snd_azf3328_codec_setfmt_lowpower(struct snd_azf3328_codec_data *codec</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='ctx'> 	/* choose lowest frequency for low power consumption.</div><div class='ctx'> 	 * While this will cause louder noise due to rather coarse frequency,</div><div class='ctx'> 	 * it should never matter since output should always</div><div class='ctx'> 	 * get disabled properly when idle anyway. */</div><div class='del'>-	snd_azf3328_codec_setfmt(chip, codec_type, AZF_FREQ_4000, 8, 1);</div><div class='add'>+	snd_azf3328_codec_setfmt(codec, AZF_FREQ_4000, 8, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1041,15 +1289,16 @@ snd_azf3328_ctrl_reg_6AH_update(struct snd_azf3328 *chip,</div><div class='ctx'> 		chip-&gt;shadow_reg_ctrl_6AH |= bitmask;</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;shadow_reg_ctrl_6AH &amp;= ~bitmask;</div><div class='del'>-	snd_azf3328_dbgcodec("6AH_update mask 0x%04x do_mask %d: val 0x%04x\n",</div><div class='del'>-			bitmask, do_mask, chip-&gt;shadow_reg_ctrl_6AH);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"6AH_update mask 0x%04x do_mask %d: val 0x%04x\n",</div><div class='add'>+		bitmask, do_mask, chip-&gt;shadow_reg_ctrl_6AH);</div><div class='ctx'> 	snd_azf3328_ctrl_outw(chip, IDX_IO_6AH, chip-&gt;shadow_reg_ctrl_6AH);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> snd_azf3328_ctrl_enable_codecs(struct snd_azf3328 *chip, bool enable)</div><div class='ctx'> {</div><div class='del'>-	snd_azf3328_dbgcodec("codec_enable %d\n", enable);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "codec_enable %d\n", enable);</div><div class='ctx'> 	/* no idea what exactly is being done here, but I strongly assume it's</div><div class='ctx'> 	 * PM related */</div><div class='ctx'> 	snd_azf3328_ctrl_reg_6AH_update(</div><div class='hunk'>@@ -1066,7 +1315,7 @@ snd_azf3328_ctrl_codec_activity(struct snd_azf3328 *chip,</div><div class='ctx'> 	struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='ctx'> 	bool need_change = (codec-&gt;running != enable);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcodec(</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"codec_activity: %s codec, enable %d, need_change %d\n",</div><div class='ctx'> 				codec-&gt;name, enable, need_change</div><div class='ctx'> 	);</div><div class='hunk'>@@ -1094,219 +1343,228 @@ snd_azf3328_ctrl_codec_activity(struct snd_azf3328 *chip,</div><div class='ctx'> 					.running)</div><div class='ctx'> 			     &amp;&amp;  (!chip-&gt;codecs[peer_codecs[codec_type].other2]</div><div class='ctx'> 					.running));</div><div class='del'>-		 }</div><div class='del'>-		 if (call_function)</div><div class='add'>+		}</div><div class='add'>+		if (call_function)</div><div class='ctx'> 			snd_azf3328_ctrl_enable_codecs(chip, enable);</div><div class='ctx'> </div><div class='ctx'> 		/* ...and adjust clock, too</div><div class='ctx'> 		 * (reduce noise and power consumption) */</div><div class='ctx'> 		if (!enable)</div><div class='del'>-			snd_azf3328_codec_setfmt_lowpower(</div><div class='del'>-				chip,</div><div class='del'>-				codec_type</div><div class='del'>-			);</div><div class='add'>+			snd_azf3328_codec_setfmt_lowpower(codec);</div><div class='ctx'> 		codec-&gt;running = enable;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> snd_azf3328_codec_setdmaa(struct snd_azf3328 *chip,</div><div class='del'>-				enum snd_azf3328_codec_type codec_type,</div><div class='del'>-				unsigned long addr,</div><div class='del'>-				unsigned int count,</div><div class='del'>-				unsigned int size</div><div class='add'>+			  struct snd_azf3328_codec_data *codec,</div><div class='add'>+			  unsigned long addr,</div><div class='add'>+			  unsigned int period_bytes,</div><div class='add'>+			  unsigned int buffer_bytes</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	const struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='add'>+	WARN_ONCE(period_bytes &amp; 1, "odd period length!?\n");</div><div class='add'>+	WARN_ONCE(buffer_bytes != 2 * period_bytes,</div><div class='add'>+		 "missed our input expectations! %u vs. %u\n",</div><div class='add'>+		 buffer_bytes, period_bytes);</div><div class='ctx'> 	if (!codec-&gt;running) {</div><div class='ctx'> 		/* AZF3328 uses a two buffer pointer DMA transfer approach */</div><div class='ctx'> </div><div class='del'>-		unsigned long flags, addr_area2;</div><div class='del'>-</div><div class='ctx'> 		/* width 32bit (prevent overflow): */</div><div class='del'>-		u32 count_areas, lengths;</div><div class='add'>+		u32 area_length;</div><div class='add'>+		struct codec_setup_io {</div><div class='add'>+			u32 dma_start_1;</div><div class='add'>+			u32 dma_start_2;</div><div class='add'>+			u32 dma_lengths;</div><div class='add'>+		} __packed setup_io;</div><div class='ctx'> </div><div class='del'>-		count_areas = size/2;</div><div class='del'>-		addr_area2 = addr+count_areas;</div><div class='del'>-		count_areas--; /* max. index */</div><div class='del'>-		snd_azf3328_dbgcodec("setdma: buffers %08lx[%u] / %08lx[%u]\n",</div><div class='del'>-				addr, count_areas, addr_area2, count_areas);</div><div class='add'>+		area_length = buffer_bytes/2;</div><div class='add'>+</div><div class='add'>+		setup_io.dma_start_1 = addr;</div><div class='add'>+		setup_io.dma_start_2 = addr+area_length;</div><div class='add'>+</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"setdma: buffers %08x[%u] / %08x[%u], %u, %u\n",</div><div class='add'>+				setup_io.dma_start_1, area_length,</div><div class='add'>+				setup_io.dma_start_2, area_length,</div><div class='add'>+				period_bytes, buffer_bytes);</div><div class='add'>+</div><div class='add'>+		/* Hmm, are we really supposed to decrement this by 1??</div><div class='add'>+		   Most definitely certainly not: configuring full length does</div><div class='add'>+		   work properly (i.e. likely better), and BTW we</div><div class='add'>+		   violated possibly differing frame sizes with this...</div><div class='add'>+</div><div class='add'>+		area_length--; |* max. index *|</div><div class='add'>+		*/</div><div class='ctx'> </div><div class='ctx'> 		/* build combined I/O buffer length word */</div><div class='del'>-		lengths = (count_areas &lt;&lt; 16) | (count_areas);</div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-		snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_START_1, addr);</div><div class='del'>-		snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_START_2,</div><div class='del'>-								addr_area2);</div><div class='del'>-		snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_LENGTHS,</div><div class='del'>-								lengths);</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		setup_io.dma_lengths = (area_length &lt;&lt; 16) | (area_length);</div><div class='add'>+</div><div class='add'>+		guard(spinlock_irqsave)(codec-&gt;lock);</div><div class='add'>+		snd_azf3328_codec_outl_multi(</div><div class='add'>+			codec, IDX_IO_CODEC_DMA_START_1, &amp;setup_io, 3</div><div class='add'>+		);</div><div class='ctx'> 	}</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_codec_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+snd_azf3328_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-#if 0</div><div class='del'>-	struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_azf3328_codec_data *codec = runtime-&gt;private_data;</div><div class='add'>+#if 0</div><div class='ctx'>         unsigned int size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	unsigned int count = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='add'>+	codec-&gt;dma_base = runtime-&gt;dma_addr;</div><div class='add'>+</div><div class='ctx'> #if 0</div><div class='del'>-	snd_azf3328_codec_setfmt(chip, AZF_CODEC_...,</div><div class='add'>+	snd_azf3328_codec_setfmt(codec,</div><div class='ctx'> 		runtime-&gt;rate,</div><div class='ctx'> 		snd_pcm_format_width(runtime-&gt;format),</div><div class='ctx'> 		runtime-&gt;channels);</div><div class='del'>-	snd_azf3328_codec_setdmaa(chip, AZF_CODEC_...,</div><div class='add'>+	snd_azf3328_codec_setdmaa(chip, codec,</div><div class='ctx'> 					runtime-&gt;dma_addr, count, size);</div><div class='ctx'> #endif</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,</div><div class='del'>-			struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	const struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_azf3328_codec_data *codec = runtime-&gt;private_data;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	u16 flags1;</div><div class='del'>-	bool previously_muted = 0;</div><div class='del'>-	bool is_playback_codec = (AZF_CODEC_PLAYBACK == codec_type);</div><div class='del'>-</div><div class='del'>-	snd_azf3328_dbgcalls("snd_azf3328_codec_trigger cmd %d\n", cmd);</div><div class='add'>+	bool previously_muted = false;</div><div class='add'>+	bool is_main_mixer_playback_codec = (AZF_CODEC_PLAYBACK == codec-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		snd_azf3328_dbgcodec("START %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "START PCM %s\n", codec-&gt;name);</div><div class='ctx'> </div><div class='del'>-		if (is_playback_codec) {</div><div class='add'>+		if (is_main_mixer_playback_codec) {</div><div class='ctx'> 			/* mute WaveOut (avoid clicking during setup) */</div><div class='ctx'> 			previously_muted =</div><div class='del'>-				snd_azf3328_mixer_set_mute(</div><div class='del'>-						chip, IDX_MIXER_WAVEOUT, 1</div><div class='add'>+				snd_azf3328_mixer_mute_control_pcm(</div><div class='add'>+						chip, 1</div><div class='ctx'> 				);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		snd_azf3328_codec_setfmt(chip, codec_type,</div><div class='add'>+		snd_azf3328_codec_setfmt(codec,</div><div class='ctx'> 			runtime-&gt;rate,</div><div class='ctx'> 			snd_pcm_format_width(runtime-&gt;format),</div><div class='ctx'> 			runtime-&gt;channels);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		/* first, remember current value: */</div><div class='del'>-		flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);</div><div class='add'>+		scoped_guard(spinlock, codec-&gt;lock) {</div><div class='add'>+			/* first, remember current value: */</div><div class='add'>+			flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);</div><div class='ctx'> </div><div class='del'>-		/* stop transfer */</div><div class='del'>-		flags1 &amp;= ~DMA_RESUME;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+			/* stop transfer */</div><div class='add'>+			flags1 &amp;= ~DMA_RESUME;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='ctx'> </div><div class='del'>-		/* FIXME: clear interrupts or what??? */</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_IRQTYPE, 0xffff);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+			/* FIXME: clear interrupts or what??? */</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_IRQTYPE, 0xffff);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		snd_azf3328_codec_setdmaa(chip, codec_type, runtime-&gt;dma_addr,</div><div class='add'>+		snd_azf3328_codec_setdmaa(chip, codec, runtime-&gt;dma_addr,</div><div class='ctx'> 			snd_pcm_lib_period_bytes(substream),</div><div class='ctx'> 			snd_pcm_lib_buffer_bytes(substream)</div><div class='ctx'> 		);</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, codec-&gt;lock) {</div><div class='ctx'> #ifdef WIN9X</div><div class='del'>-		/* FIXME: enable playback/recording??? */</div><div class='del'>-		flags1 |= DMA_RUN_SOMETHING1 | DMA_RUN_SOMETHING2;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='del'>-</div><div class='del'>-		/* start transfer again */</div><div class='del'>-		/* FIXME: what is this value (0x0010)??? */</div><div class='del'>-		flags1 |= DMA_RESUME | DMA_EPILOGUE_SOMETHING;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+			/* FIXME: enable playback/recording??? */</div><div class='add'>+			flags1 |= DMA_RUN_SOMETHING1 | DMA_RUN_SOMETHING2;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+</div><div class='add'>+			/* start transfer again */</div><div class='add'>+			/* FIXME: what is this value (0x0010)??? */</div><div class='add'>+			flags1 |= DMA_RESUME | DMA_EPILOGUE_SOMETHING;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='ctx'> #else /* NT4 */</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='del'>-			0x0000);</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='del'>-			DMA_RUN_SOMETHING1);</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='del'>-			DMA_RUN_SOMETHING1 |</div><div class='del'>-			DMA_RUN_SOMETHING2);</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='del'>-			DMA_RESUME |</div><div class='del'>-			SOMETHING_ALMOST_ALWAYS_SET |</div><div class='del'>-			DMA_EPILOGUE_SOMETHING |</div><div class='del'>-			DMA_SOMETHING_ELSE);</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='add'>+					       0x0000);</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='add'>+					       DMA_RUN_SOMETHING1);</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='add'>+					       DMA_RUN_SOMETHING1 |</div><div class='add'>+					       DMA_RUN_SOMETHING2);</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='add'>+					       DMA_RESUME |</div><div class='add'>+					       SOMETHING_ALMOST_ALWAYS_SET |</div><div class='add'>+					       DMA_EPILOGUE_SOMETHING |</div><div class='add'>+					       DMA_SOMETHING_ELSE);</div><div class='ctx'> #endif</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		snd_azf3328_ctrl_codec_activity(chip, codec_type, 1);</div><div class='add'>+		}</div><div class='add'>+		snd_azf3328_ctrl_codec_activity(chip, codec-&gt;type, 1);</div><div class='ctx'> </div><div class='del'>-		if (is_playback_codec) {</div><div class='add'>+		if (is_main_mixer_playback_codec) {</div><div class='ctx'> 			/* now unmute WaveOut */</div><div class='ctx'> 			if (!previously_muted)</div><div class='del'>-				snd_azf3328_mixer_set_mute(</div><div class='del'>-						chip, IDX_MIXER_WAVEOUT, 0</div><div class='add'>+				snd_azf3328_mixer_mute_control_pcm(</div><div class='add'>+						chip, 0</div><div class='ctx'> 				);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		snd_azf3328_dbgcodec("STARTED %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCM STARTED %s\n", codec-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		snd_azf3328_dbgcodec("RESUME %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCM RESUME %s\n", codec-&gt;name);</div><div class='ctx'> 		/* resume codec if we were active */</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (codec-&gt;running)</div><div class='del'>-			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='del'>-				snd_azf3328_codec_inw(</div><div class='del'>-					codec, IDX_IO_CODEC_DMA_FLAGS</div><div class='del'>-				) | DMA_RESUME</div><div class='del'>-			);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, codec-&gt;lock) {</div><div class='add'>+			if (codec-&gt;running)</div><div class='add'>+				snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='add'>+						       snd_azf3328_codec_inw(</div><div class='add'>+									     codec, IDX_IO_CODEC_DMA_FLAGS</div><div class='add'>+									     ) | DMA_RESUME</div><div class='add'>+						       );</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		snd_azf3328_dbgcodec("STOP %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCM STOP %s\n", codec-&gt;name);</div><div class='ctx'> </div><div class='del'>-		if (is_playback_codec) {</div><div class='add'>+		if (is_main_mixer_playback_codec) {</div><div class='ctx'> 			/* mute WaveOut (avoid clicking during setup) */</div><div class='ctx'> 			previously_muted =</div><div class='del'>-				snd_azf3328_mixer_set_mute(</div><div class='del'>-						chip, IDX_MIXER_WAVEOUT, 1</div><div class='add'>+				snd_azf3328_mixer_mute_control_pcm(</div><div class='add'>+						chip, 1</div><div class='ctx'> 				);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		/* first, remember current value: */</div><div class='del'>-		flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);</div><div class='add'>+		scoped_guard(spinlock, codec-&gt;lock) {</div><div class='add'>+			/* first, remember current value: */</div><div class='add'>+			flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);</div><div class='ctx'> </div><div class='del'>-		/* stop transfer */</div><div class='del'>-		flags1 &amp;= ~DMA_RESUME;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+			/* stop transfer */</div><div class='add'>+			flags1 &amp;= ~DMA_RESUME;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='ctx'> </div><div class='del'>-		/* hmm, is this really required? we're resetting the same bit</div><div class='del'>-		 * immediately thereafter... */</div><div class='del'>-		flags1 |= DMA_RUN_SOMETHING1;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+			/* hmm, is this really required? we're resetting the same bit</div><div class='add'>+			 * immediately thereafter... */</div><div class='add'>+			flags1 |= DMA_RUN_SOMETHING1;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='ctx'> </div><div class='del'>-		flags1 &amp;= ~DMA_RUN_SOMETHING1;</div><div class='del'>-		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		snd_azf3328_ctrl_codec_activity(chip, codec_type, 0);</div><div class='add'>+			flags1 &amp;= ~DMA_RUN_SOMETHING1;</div><div class='add'>+			snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);</div><div class='add'>+		}</div><div class='add'>+		snd_azf3328_ctrl_codec_activity(chip, codec-&gt;type, 0);</div><div class='ctx'> </div><div class='del'>-		if (is_playback_codec) {</div><div class='add'>+		if (is_main_mixer_playback_codec) {</div><div class='ctx'> 			/* now unmute WaveOut */</div><div class='ctx'> 			if (!previously_muted)</div><div class='del'>-				snd_azf3328_mixer_set_mute(</div><div class='del'>-						chip, IDX_MIXER_WAVEOUT, 0</div><div class='add'>+				snd_azf3328_mixer_mute_control_pcm(</div><div class='add'>+						chip, 0</div><div class='ctx'> 				);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		snd_azf3328_dbgcodec("STOPPED %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCM STOPPED %s\n", codec-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		snd_azf3328_dbgcodec("SUSPEND %s\n", codec-&gt;name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "PCM SUSPEND %s\n", codec-&gt;name);</div><div class='ctx'> 		/* make sure codec is stopped */</div><div class='ctx'> 		snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='ctx'> 			snd_azf3328_codec_inw(</div><div class='hunk'>@@ -1315,81 +1573,42 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,</div><div class='ctx'> 		);</div><div class='ctx'> 		break;</div><div class='ctx'>         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");</div><div class='add'>+		WARN(1, "FIXME: SNDRV_PCM_TRIGGER_PAUSE_PUSH NIY!\n");</div><div class='ctx'>                 break;</div><div class='ctx'>         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		snd_printk(KERN_ERR "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");</div><div class='add'>+		WARN(1, "FIXME: SNDRV_PCM_TRIGGER_PAUSE_RELEASE NIY!\n");</div><div class='ctx'>                 break;</div><div class='ctx'>         default:</div><div class='del'>-		snd_printk(KERN_ERR "FIXME: unknown trigger mode!\n");</div><div class='add'>+		WARN(1, "FIXME: unknown trigger mode!\n");</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_azf3328_codec_playback_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_trigger(AZF_CODEC_PLAYBACK, substream, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_codec_capture_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_trigger(AZF_CODEC_CAPTURE, substream, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_codec_i2s_out_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_trigger(AZF_CODEC_I2S_OUT, substream, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static snd_pcm_uframes_t</div><div class='del'>-snd_azf3328_codec_pointer(struct snd_pcm_substream *substream,</div><div class='del'>-			  enum snd_azf3328_codec_type codec_type</div><div class='add'>+snd_azf3328_pcm_pointer(struct snd_pcm_substream *substream</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	const struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	const struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='del'>-	unsigned long bufptr, result;</div><div class='add'>+	const struct snd_azf3328_codec_data *codec =</div><div class='add'>+		substream-&gt;runtime-&gt;private_data;</div><div class='add'>+	unsigned long result;</div><div class='ctx'> 	snd_pcm_uframes_t frmres;</div><div class='ctx'> </div><div class='del'>-#ifdef QUERY_HARDWARE</div><div class='del'>-	bufptr = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);</div><div class='del'>-#else</div><div class='del'>-	bufptr = substream-&gt;runtime-&gt;dma_addr;</div><div class='del'>-#endif</div><div class='ctx'> 	result = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_CURRPOS);</div><div class='ctx'> </div><div class='ctx'> 	/* calculate offset */</div><div class='del'>-	result -= bufptr;</div><div class='add'>+#ifdef QUERY_HARDWARE</div><div class='add'>+	result -= snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);</div><div class='add'>+#else</div><div class='add'>+	result -= codec-&gt;dma_base;</div><div class='add'>+#endif</div><div class='ctx'> 	frmres = bytes_to_frames( substream-&gt;runtime, result);</div><div class='del'>-	snd_azf3328_dbgcodec("%s @ 0x%8lx, frames %8ld\n",</div><div class='del'>-				codec-&gt;name, result, frmres);</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "%08li %s @ 0x%8lx, frames %8ld\n",</div><div class='add'>+		jiffies, codec-&gt;name, result, frmres);</div><div class='ctx'> 	return frmres;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-snd_azf3328_codec_playback_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_pointer(substream, AZF_CODEC_PLAYBACK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-snd_azf3328_codec_capture_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_pointer(substream, AZF_CODEC_CAPTURE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t</div><div class='del'>-snd_azf3328_codec_i2s_out_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_codec_pointer(substream, AZF_CODEC_I2S_OUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_GAMEPORT</div><div class='hunk'>@@ -1449,7 +1668,7 @@ snd_azf3328_gameport_interrupt(struct snd_azf3328 *chip)</div><div class='ctx'> 	 * skeleton handler only</div><div class='ctx'> 	 * (we do not want axis reading in interrupt handler - too much load!)</div><div class='ctx'> 	 */</div><div class='del'>-	snd_azf3328_dbggame("gameport irq\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "gameport irq\n");</div><div class='ctx'> </div><div class='ctx'> 	 /* this should ACK the gameport IRQ properly, hopefully. */</div><div class='ctx'> 	snd_azf3328_game_inw(chip, IDX_GAME_AXIS_VALUE);</div><div class='hunk'>@@ -1461,7 +1680,7 @@ snd_azf3328_gameport_open(struct gameport *gameport, int mode)</div><div class='ctx'> 	struct snd_azf3328 *chip = gameport_get_port_data(gameport);</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbggame("gameport_open, mode %d\n", mode);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "gameport_open, mode %d\n", mode);</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case GAMEPORT_MODE_COOKED:</div><div class='ctx'> 	case GAMEPORT_MODE_RAW:</div><div class='hunk'>@@ -1484,7 +1703,7 @@ snd_azf3328_gameport_close(struct gameport *gameport)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip = gameport_get_port_data(gameport);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbggame("gameport_close\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "gameport_close\n");</div><div class='ctx'> 	snd_azf3328_gameport_set_counter_frequency(chip,</div><div class='ctx'> 				GAME_HWCFG_ADC_COUNTER_FREQ_1_200);</div><div class='ctx'> 	snd_azf3328_gameport_axis_circuit_enable(chip, 0);</div><div class='hunk'>@@ -1499,12 +1718,11 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,</div><div class='ctx'> 	struct snd_azf3328 *chip = gameport_get_port_data(gameport);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u8 val;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!chip))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val = snd_azf3328_game_inb(chip, IDX_GAME_LEGACY_COMPATIBLE);</div><div class='ctx'> 	*buttons = (~(val) &gt;&gt; 4) &amp; 0xf;</div><div class='ctx'> </div><div class='hunk'>@@ -1531,7 +1749,7 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* trigger next axes sampling, to be evaluated the next time we</div><div class='add'>+	/* trigger next sampling of axes, to be evaluated the next time we</div><div class='ctx'> 	 * enter this function */</div><div class='ctx'> </div><div class='ctx'> 	/* for some very, very strange reason we cannot enable</div><div class='hunk'>@@ -1541,7 +1759,6 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,</div><div class='ctx'> 	snd_azf3328_game_outb(chip, IDX_GAME_AXES_CONFIG, val);</div><div class='ctx'> </div><div class='ctx'> 	snd_azf3328_game_outw(chip, IDX_GAME_AXIS_VALUE, 0xffff);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(chip-&gt;axes); i++) {</div><div class='ctx'> 		axes[i] = chip-&gt;axes[i];</div><div class='hunk'>@@ -1549,21 +1766,20 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,</div><div class='ctx'> 			axes[i] = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbggame("cooked_read: axes %d %d %d %d buttons %d\n",</div><div class='del'>-		axes[0], axes[1], axes[2], axes[3], *buttons</div><div class='del'>-	);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "cooked_read: axes %d %d %d %d buttons %d\n",</div><div class='add'>+		axes[0], axes[1], axes[2], axes[3], *buttons);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_azf3328_gameport(struct snd_azf3328 *chip, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "azt3328: cannot alloc memory for gameport\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "cannot alloc memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1607,57 +1823,55 @@ snd_azf3328_gameport_free(struct snd_azf3328 *chip) { }</div><div class='ctx'> static inline void</div><div class='ctx'> snd_azf3328_gameport_interrupt(struct snd_azf3328 *chip)</div><div class='ctx'> {</div><div class='del'>-	printk(KERN_WARNING "huh, game port IRQ occurred!?\n");</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "huh, game port IRQ occurred!?\n");</div><div class='ctx'> }</div><div class='ctx'> #endif /* SUPPORT_GAMEPORT */</div><div class='ctx'> </div><div class='ctx'> /******************************************************************/</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-snd_azf3328_irq_log_unknown_type(u8 which)</div><div class='add'>+snd_azf3328_irq_log_unknown_type(struct snd_azf3328 *chip, u8 which)</div><div class='ctx'> {</div><div class='del'>-	snd_azf3328_dbgcodec(</div><div class='del'>-	"azt3328: unknown IRQ type (%x) occurred, please report!\n",</div><div class='del'>-		which</div><div class='del'>-	);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"unknown IRQ type (%x) occurred, please report!\n",</div><div class='add'>+		which);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='del'>-snd_azf3328_codec_interrupt(struct snd_azf3328 *chip, u8 status)</div><div class='add'>+snd_azf3328_pcm_interrupt(struct snd_azf3328 *chip,</div><div class='add'>+			  const struct snd_azf3328_codec_data *first_codec,</div><div class='add'>+			  u8 status</div><div class='add'>+)</div><div class='ctx'> {</div><div class='ctx'> 	u8 which;</div><div class='ctx'> 	enum snd_azf3328_codec_type codec_type;</div><div class='del'>-	const struct snd_azf3328_codec_data *codec;</div><div class='add'>+	const struct snd_azf3328_codec_data *codec = first_codec;</div><div class='ctx'> </div><div class='ctx'> 	for (codec_type = AZF_CODEC_PLAYBACK;</div><div class='ctx'> 		 codec_type &lt;= AZF_CODEC_I2S_OUT;</div><div class='del'>-			 ++codec_type) {</div><div class='add'>+			 ++codec_type, ++codec) {</div><div class='ctx'> </div><div class='ctx'> 		/* skip codec if there's no interrupt for it */</div><div class='ctx'> 		if (!(status &amp; (1 &lt;&lt; codec_type)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		codec = &amp;chip-&gt;codecs[codec_type];</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		which = snd_azf3328_codec_inb(codec, IDX_IO_CODEC_IRQTYPE);</div><div class='del'>-		/* ack all IRQ types immediately */</div><div class='del'>-		snd_azf3328_codec_outb(codec, IDX_IO_CODEC_IRQTYPE, which);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, codec-&gt;lock) {</div><div class='add'>+			which = snd_azf3328_codec_inb(codec, IDX_IO_CODEC_IRQTYPE);</div><div class='add'>+			/* ack all IRQ types immediately */</div><div class='add'>+			snd_azf3328_codec_outb(codec, IDX_IO_CODEC_IRQTYPE, which);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if ((chip-&gt;pcm[codec_type]) &amp;&amp; (codec-&gt;substream)) {</div><div class='add'>+		if (codec-&gt;substream) {</div><div class='ctx'> 			snd_pcm_period_elapsed(codec-&gt;substream);</div><div class='del'>-			snd_azf3328_dbgcodec("%s period done (#%x), @ %x\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "%s period done (#%x), @ %x\n",</div><div class='ctx'> 				codec-&gt;name,</div><div class='ctx'> 				which,</div><div class='ctx'> 				snd_azf3328_codec_inl(</div><div class='del'>-					codec, IDX_IO_CODEC_DMA_CURRPOS</div><div class='del'>-				)</div><div class='del'>-			);</div><div class='add'>+					codec, IDX_IO_CODEC_DMA_CURRPOS));</div><div class='ctx'> 		} else</div><div class='del'>-			printk(KERN_WARNING "azt3328: irq handler problem!\n");</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev, "irq handler problem!\n");</div><div class='ctx'> 		if (which &amp; IRQ_SOMETHING)</div><div class='del'>-			snd_azf3328_irq_log_unknown_type(which);</div><div class='add'>+			snd_azf3328_irq_log_unknown_type(chip, which);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1666,9 +1880,7 @@ snd_azf3328_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip = dev_id;</div><div class='ctx'> 	u8 status;</div><div class='del'>-#if DEBUG_CODEC</div><div class='ctx'> 	static unsigned long irq_count;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	status = snd_azf3328_ctrl_inb(chip, IDX_IO_IRQSTATUS);</div><div class='ctx'> </div><div class='hunk'>@@ -1679,28 +1891,27 @@ snd_azf3328_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	))</div><div class='ctx'> 		return IRQ_NONE; /* must be interrupt for another device */</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcodec(</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"irq_count %ld! IDX_IO_IRQSTATUS %04x\n",</div><div class='ctx'> 			irq_count++ /* debug-only */,</div><div class='del'>-			status</div><div class='del'>-	);</div><div class='add'>+			status);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; IRQ_TIMER) {</div><div class='del'>-		/* snd_azf3328_dbgcodec("timer %ld\n",</div><div class='add'>+		/* dev_dbg(chip-&gt;card-&gt;dev, "timer %ld\n",</div><div class='ctx'> 			snd_azf3328_codec_inl(chip, IDX_IO_TIMER_VALUE)</div><div class='ctx'> 				&amp; TIMER_VALUE_MASK</div><div class='ctx'> 		); */</div><div class='ctx'> 		if (chip-&gt;timer)</div><div class='ctx'> 			snd_timer_interrupt(chip-&gt;timer, chip-&gt;timer-&gt;sticks);</div><div class='ctx'> 		/* ACK timer */</div><div class='del'>-                spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x07);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		snd_azf3328_dbgcodec("azt3328: timer IRQ\n");</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x07);</div><div class='add'>+		}</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "timer IRQ\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (IRQ_PLAYBACK|IRQ_RECORDING|IRQ_I2S_OUT))</div><div class='del'>-		snd_azf3328_codec_interrupt(chip, status);</div><div class='add'>+		snd_azf3328_pcm_interrupt(chip, chip-&gt;codecs, status);</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; IRQ_GAMEPORT)</div><div class='ctx'> 		snd_azf3328_gameport_interrupt(chip);</div><div class='hunk'>@@ -1712,7 +1923,7 @@ snd_azf3328_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		/* hmm, do we have to ack the IRQ here somehow?</div><div class='ctx'> 		 * If so, then I don't know how yet... */</div><div class='del'>-		snd_azf3328_dbgcodec("azt3328: MPU401 IRQ\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "MPU401 IRQ\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1740,11 +1951,15 @@ static const struct snd_pcm_hardware snd_azf3328_hardware =</div><div class='ctx'> 	.rate_max =		AZF_FREQ_66200,</div><div class='ctx'> 	.channels_min =		1,</div><div class='ctx'> 	.channels_max =		2,</div><div class='del'>-	.buffer_bytes_max =	65536,</div><div class='del'>-	.period_bytes_min =	64,</div><div class='del'>-	.period_bytes_max =	65536,</div><div class='del'>-	.periods_min =		1,</div><div class='del'>-	.periods_max =		1024,</div><div class='add'>+	.buffer_bytes_max =	(64*1024),</div><div class='add'>+	.period_bytes_min =	1024,</div><div class='add'>+	.period_bytes_max =	(32*1024),</div><div class='add'>+	/* We simply have two DMA areas (instead of a list of descriptors</div><div class='add'>+	   such as other cards); I believe that this is a fixed hardware</div><div class='add'>+	   attribute and there isn't much driver magic to be done to expand it.</div><div class='add'>+	   Thus indicate that we have at least and at most 2 periods. */</div><div class='add'>+	.periods_min =		2,</div><div class='add'>+	.periods_max =		2,</div><div class='ctx'> 	/* FIXME: maybe that card actually has a FIFO?</div><div class='ctx'> 	 * Hmm, it seems newer revisions do have one, but we still don't know</div><div class='ctx'> 	 * its size... */</div><div class='hunk'>@@ -1752,7 +1967,7 @@ static const struct snd_pcm_hardware snd_azf3328_hardware =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static unsigned int snd_azf3328_fixed_rates[] = {</div><div class='add'>+static const unsigned int snd_azf3328_fixed_rates[] = {</div><div class='ctx'> 	AZF_FREQ_4000,</div><div class='ctx'> 	AZF_FREQ_4800,</div><div class='ctx'> 	AZF_FREQ_5512,</div><div class='hunk'>@@ -1769,7 +1984,7 @@ static unsigned int snd_azf3328_fixed_rates[] = {</div><div class='ctx'> 	AZF_FREQ_66200</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list snd_azf3328_hw_constraints_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list snd_azf3328_hw_constraints_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(snd_azf3328_fixed_rates),</div><div class='ctx'> 	.list = snd_azf3328_fixed_rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -1784,113 +1999,83 @@ snd_azf3328_pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_azf3328_codec_data *codec = &amp;chip-&gt;codecs[codec_type];</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	chip-&gt;codecs[codec_type].substream = substream;</div><div class='add'>+	codec-&gt;substream = substream;</div><div class='ctx'> </div><div class='ctx'> 	/* same parameters for all our codecs - at least we think so... */</div><div class='ctx'> 	runtime-&gt;hw = snd_azf3328_hardware;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='ctx'> 				   &amp;snd_azf3328_hw_constraints_rates);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='add'>+	runtime-&gt;private_data = codec;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_playback_open(struct snd_pcm_substream *substream)</div><div class='add'>+snd_azf3328_pcm_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_azf3328_pcm_open(substream, AZF_CODEC_PLAYBACK);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_capture_open(struct snd_pcm_substream *substream)</div><div class='add'>+snd_azf3328_pcm_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_azf3328_pcm_open(substream, AZF_CODEC_CAPTURE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_i2s_out_open(struct snd_pcm_substream *substream)</div><div class='add'>+snd_azf3328_pcm_i2s_out_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	return snd_azf3328_pcm_open(substream, AZF_CODEC_I2S_OUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_pcm_close(struct snd_pcm_substream *substream,</div><div class='del'>-		      enum snd_azf3328_codec_type codec_type</div><div class='add'>+snd_azf3328_pcm_close(struct snd_pcm_substream *substream</div><div class='ctx'> )</div><div class='ctx'> {</div><div class='del'>-	struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct snd_azf3328_codec_data *codec =</div><div class='add'>+		substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	chip-&gt;codecs[codec_type].substream = NULL;</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='add'>+	codec-&gt;substream = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_azf3328_playback_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_pcm_close(substream, AZF_CODEC_PLAYBACK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_capture_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_pcm_close(substream, AZF_CODEC_CAPTURE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_i2s_out_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_azf3328_pcm_close(substream, AZF_CODEC_I2S_OUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_azf3328_playback_ops = {</div><div class='del'>-	.open =		snd_azf3328_playback_open,</div><div class='del'>-	.close =	snd_azf3328_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_azf3328_hw_params,</div><div class='del'>-	.hw_free =	snd_azf3328_hw_free,</div><div class='del'>-	.prepare =	snd_azf3328_codec_prepare,</div><div class='del'>-	.trigger =	snd_azf3328_codec_playback_trigger,</div><div class='del'>-	.pointer =	snd_azf3328_codec_playback_pointer</div><div class='add'>+static const struct snd_pcm_ops snd_azf3328_playback_ops = {</div><div class='add'>+	.open =		snd_azf3328_pcm_playback_open,</div><div class='add'>+	.close =	snd_azf3328_pcm_close,</div><div class='add'>+	.prepare =	snd_azf3328_pcm_prepare,</div><div class='add'>+	.trigger =	snd_azf3328_pcm_trigger,</div><div class='add'>+	.pointer =	snd_azf3328_pcm_pointer</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_azf3328_capture_ops = {</div><div class='del'>-	.open =		snd_azf3328_capture_open,</div><div class='del'>-	.close =	snd_azf3328_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_azf3328_hw_params,</div><div class='del'>-	.hw_free =	snd_azf3328_hw_free,</div><div class='del'>-	.prepare =	snd_azf3328_codec_prepare,</div><div class='del'>-	.trigger =	snd_azf3328_codec_capture_trigger,</div><div class='del'>-	.pointer =	snd_azf3328_codec_capture_pointer</div><div class='add'>+static const struct snd_pcm_ops snd_azf3328_capture_ops = {</div><div class='add'>+	.open =		snd_azf3328_pcm_capture_open,</div><div class='add'>+	.close =	snd_azf3328_pcm_close,</div><div class='add'>+	.prepare =	snd_azf3328_pcm_prepare,</div><div class='add'>+	.trigger =	snd_azf3328_pcm_trigger,</div><div class='add'>+	.pointer =	snd_azf3328_pcm_pointer</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_azf3328_i2s_out_ops = {</div><div class='del'>-	.open =		snd_azf3328_i2s_out_open,</div><div class='del'>-	.close =	snd_azf3328_i2s_out_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_azf3328_hw_params,</div><div class='del'>-	.hw_free =	snd_azf3328_hw_free,</div><div class='del'>-	.prepare =	snd_azf3328_codec_prepare,</div><div class='del'>-	.trigger =	snd_azf3328_codec_i2s_out_trigger,</div><div class='del'>-	.pointer =	snd_azf3328_codec_i2s_out_pointer</div><div class='add'>+static const struct snd_pcm_ops snd_azf3328_i2s_out_ops = {</div><div class='add'>+	.open =		snd_azf3328_pcm_i2s_out_open,</div><div class='add'>+	.close =	snd_azf3328_pcm_close,</div><div class='add'>+	.prepare =	snd_azf3328_pcm_prepare,</div><div class='add'>+	.trigger =	snd_azf3328_pcm_trigger,</div><div class='add'>+	.pointer =	snd_azf3328_pcm_pointer</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_azf3328_pcm(struct snd_azf3328 *chip)</div><div class='ctx'> {</div><div class='del'>-enum { AZF_PCMDEV_STD, AZF_PCMDEV_I2S_OUT, NUM_AZF_PCMDEVS }; /* pcm devices */</div><div class='add'>+	/* pcm devices */</div><div class='add'>+	enum { AZF_PCMDEV_STD, AZF_PCMDEV_I2S_OUT, NUM_AZF_PCMDEVS };</div><div class='ctx'> </div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "AZF3328 DSP", AZF_PCMDEV_STD,</div><div class='ctx'> 								1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -1902,14 +2087,13 @@ enum { AZF_PCMDEV_STD, AZF_PCMDEV_I2S_OUT, NUM_AZF_PCMDEVS }; /* pcm devices */</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	/* same pcm object for playback/capture (see snd_pcm_new() above) */</div><div class='ctx'> 	chip-&gt;pcm[AZF_CODEC_PLAYBACK] = pcm;</div><div class='ctx'> 	chip-&gt;pcm[AZF_CODEC_CAPTURE] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-							64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "AZF3328 I2S OUT", AZF_PCMDEV_I2S_OUT,</div><div class='ctx'> 								1, 0, &amp;pcm);</div><div class='hunk'>@@ -1920,14 +2104,12 @@ enum { AZF_PCMDEV_STD, AZF_PCMDEV_I2S_OUT, NUM_AZF_PCMDEVS }; /* pcm devices */</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	chip-&gt;pcm[AZF_CODEC_I2S_OUT] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-							64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1947,10 +2129,8 @@ static int</div><div class='ctx'> snd_azf3328_timer_start(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int delay;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	chip = snd_timer_chip(timer);</div><div class='ctx'> 	delay = ((timer-&gt;sticks * seqtimer_scaling) - 1) &amp; TIMER_VALUE_MASK;</div><div class='ctx'> 	if (delay &lt; 49) {</div><div class='hunk'>@@ -1958,15 +2138,13 @@ snd_azf3328_timer_start(struct snd_timer *timer)</div><div class='ctx'> 		 * this timing tweak</div><div class='ctx'> 		 * (we need to do it to avoid a lockup, though) */</div><div class='ctx'> </div><div class='del'>-		snd_azf3328_dbgtimer("delay was too low (%d)!\n", delay);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "delay was too low (%d)!\n", delay);</div><div class='ctx'> 		delay = 49; /* minimum time is 49 ticks */</div><div class='ctx'> 	}</div><div class='del'>-	snd_azf3328_dbgtimer("setting timer countdown value %d, add COUNTDOWN|IRQ\n", delay);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "setting timer countdown value %d\n", delay);</div><div class='ctx'> 	delay |= TIMER_COUNTDOWN_ENABLE | TIMER_IRQ_ENABLE;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_azf3328_ctrl_outl(chip, IDX_IO_TIMER_VALUE, delay);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1974,16 +2152,17 @@ static int</div><div class='ctx'> snd_azf3328_timer_stop(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_azf3328 *chip;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	chip = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* disable timer countdown and interrupt */</div><div class='del'>-	/* FIXME: should we write TIMER_IRQ_ACK here? */</div><div class='del'>-	snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='add'>+	/* Hmm, should we write TIMER_IRQ_ACK here?</div><div class='add'>+	   YES indeed, otherwise a rogue timer operation - which prompts</div><div class='add'>+	   ALSA(?) to call repeated stop() in vain, but NOT start() -</div><div class='add'>+	   will never end (value 0x03 is kept shown in control byte).</div><div class='add'>+	   Simply manually poking 0x04 _once_ immediately successfully stops</div><div class='add'>+	   the hardware/ALSA interrupt activity. */</div><div class='add'>+	snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x04);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1992,10 +2171,8 @@ static int</div><div class='ctx'> snd_azf3328_timer_precise_resolution(struct snd_timer *timer,</div><div class='ctx'> 					       unsigned long *num, unsigned long *den)</div><div class='ctx'> {</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	*num = 1;</div><div class='ctx'> 	*den = 1024000 / seqtimer_scaling;</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2008,14 +2185,13 @@ static struct snd_timer_hardware snd_azf3328_timer_hw = {</div><div class='ctx'> 	.precise_resolution = snd_azf3328_timer_precise_resolution,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_azf3328_timer(struct snd_azf3328 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer = NULL;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	tid.dev_class = SNDRV_TIMER_CLASS_CARD;</div><div class='ctx'> 	tid.dev_sclass = SNDRV_TIMER_SCLASS_NONE;</div><div class='ctx'> 	tid.card = chip-&gt;card-&gt;number;</div><div class='hunk'>@@ -2029,7 +2205,7 @@ snd_azf3328_timer(struct snd_azf3328 *chip, int device)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	strcpy(timer-&gt;name, "AZF3328 timer");</div><div class='add'>+	strscpy(timer-&gt;name, "AZF3328 timer");</div><div class='ctx'> 	timer-&gt;private_data = chip;</div><div class='ctx'> 	timer-&gt;hw = snd_azf3328_timer_hw;</div><div class='ctx'> </div><div class='hunk'>@@ -2040,44 +2216,20 @@ snd_azf3328_timer(struct snd_azf3328 *chip, int device)</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /******************************************************************/</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_azf3328_free(struct snd_azf3328 *chip)</div><div class='add'>+static void</div><div class='add'>+snd_azf3328_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (chip-&gt;irq &lt; 0)</div><div class='del'>-		goto __end_hw;</div><div class='add'>+	struct snd_azf3328 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	/* reset (close) mixer:</div><div class='del'>-	 * first mute master volume, then reset</div><div class='del'>-	 */</div><div class='del'>-	snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);</div><div class='del'>-	snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);</div><div class='add'>+	snd_azf3328_mixer_reset(chip);</div><div class='ctx'> </div><div class='ctx'> 	snd_azf3328_timer_stop(chip-&gt;timer);</div><div class='ctx'> 	snd_azf3328_gameport_free(chip);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		synchronize_irq(chip-&gt;irq);</div><div class='del'>-__end_hw:</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-snd_azf3328_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_azf3328 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_azf3328_free(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -2106,34 +2258,34 @@ snd_azf3328_test_bit(unsigned unsigned reg, int bit)</div><div class='ctx'> static inline void</div><div class='ctx'> snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip)</div><div class='ctx'> {</div><div class='del'>-#if DEBUG_MISC</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgmisc(</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		"ctrl_io 0x%lx, game_io 0x%lx, mpu_io 0x%lx, "</div><div class='ctx'> 		"opl3_io 0x%lx, mixer_io 0x%lx, irq %d\n",</div><div class='ctx'> 		chip-&gt;ctrl_io, chip-&gt;game_io, chip-&gt;mpu_io,</div><div class='del'>-		chip-&gt;opl3_io, chip-&gt;mixer_io, chip-&gt;irq</div><div class='del'>-	);</div><div class='add'>+		chip-&gt;opl3_io, chip-&gt;mixer_io, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgmisc("game %02x %02x %02x %02x %02x %02x\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"game %02x %02x %02x %02x %02x %02x\n",</div><div class='ctx'> 		snd_azf3328_game_inb(chip, 0),</div><div class='ctx'> 		snd_azf3328_game_inb(chip, 1),</div><div class='ctx'> 		snd_azf3328_game_inb(chip, 2),</div><div class='ctx'> 		snd_azf3328_game_inb(chip, 3),</div><div class='ctx'> 		snd_azf3328_game_inb(chip, 4),</div><div class='del'>-		snd_azf3328_game_inb(chip, 5)</div><div class='del'>-	);</div><div class='add'>+		snd_azf3328_game_inb(chip, 5));</div><div class='ctx'> </div><div class='ctx'> 	for (tmp = 0; tmp &lt; 0x07; tmp += 1)</div><div class='del'>-		snd_azf3328_dbgmisc("mpu_io 0x%04x\n", inb(chip-&gt;mpu_io + tmp));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mpu_io 0x%04x\n", inb(chip-&gt;mpu_io + tmp));</div><div class='ctx'> </div><div class='ctx'> 	for (tmp = 0; tmp &lt;= 0x07; tmp += 1)</div><div class='del'>-		snd_azf3328_dbgmisc("0x%02x: game200 0x%04x, game208 0x%04x\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"0x%02x: game200 0x%04x, game208 0x%04x\n",</div><div class='ctx'> 			tmp, inb(0x200 + tmp), inb(0x208 + tmp));</div><div class='ctx'> </div><div class='ctx'> 	for (tmp = 0; tmp &lt;= 0x01; tmp += 1)</div><div class='del'>-		snd_azf3328_dbgmisc(</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 			"0x%02x: mpu300 0x%04x, mpu310 0x%04x, mpu320 0x%04x, "</div><div class='ctx'> 			"mpu330 0x%04x opl388 0x%04x opl38c 0x%04x\n",</div><div class='ctx'> 				tmp,</div><div class='hunk'>@@ -2142,64 +2294,50 @@ snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip)</div><div class='ctx'> 				inb(0x320 + tmp),</div><div class='ctx'> 				inb(0x330 + tmp),</div><div class='ctx'> 				inb(0x388 + tmp),</div><div class='del'>-				inb(0x38c + tmp)</div><div class='del'>-		);</div><div class='add'>+				inb(0x38c + tmp));</div><div class='ctx'> </div><div class='ctx'> 	for (tmp = 0; tmp &lt; AZF_IO_SIZE_CTRL; tmp += 2)</div><div class='del'>-		snd_azf3328_dbgmisc("ctrl 0x%02x: 0x%04x\n",</div><div class='del'>-			tmp, snd_azf3328_ctrl_inw(chip, tmp)</div><div class='del'>-		);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"ctrl 0x%02x: 0x%04x\n",</div><div class='add'>+			tmp, snd_azf3328_ctrl_inw(chip, tmp));</div><div class='ctx'> </div><div class='ctx'> 	for (tmp = 0; tmp &lt; AZF_IO_SIZE_MIXER; tmp += 2)</div><div class='del'>-		snd_azf3328_dbgmisc("mixer 0x%02x: 0x%04x\n",</div><div class='del'>-			tmp, snd_azf3328_mixer_inw(chip, tmp)</div><div class='del'>-		);</div><div class='del'>-#endif /* DEBUG_MISC */</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"mixer 0x%02x: 0x%04x\n",</div><div class='add'>+			tmp, snd_azf3328_mixer_inw(chip, tmp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_azf3328_create(struct snd_card *card,</div><div class='ctx'> 		   struct pci_dev *pci,</div><div class='del'>-		   unsigned long device_type,</div><div class='del'>-		   struct snd_azf3328 **rchip)</div><div class='add'>+		   unsigned long device_type)</div><div class='ctx'> {</div><div class='del'>-	struct snd_azf3328 *chip;</div><div class='add'>+	struct snd_azf3328 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =     snd_azf3328_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	u8 dma_init;</div><div class='ctx'> 	enum snd_azf3328_codec_type codec_type;</div><div class='add'>+	struct snd_azf3328_codec_data *codec_setup;</div><div class='ctx'> </div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out_err;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* check if we can restrict PCI DMA transfers to 24 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support "</div><div class='del'>-					"24bit PCI busmaster DMA\n"</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(24))) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 24bit PCI busmaster DMA\n"</div><div class='ctx'> 		);</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto out_err;</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pci, "Aztech AZF3328");</div><div class='add'>+	err = pcim_request_all_regions(pci, "Aztech AZF3328");</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;ctrl_io  = pci_resource_start(pci, 0);</div><div class='ctx'> 	chip-&gt;game_io  = pci_resource_start(pci, 1);</div><div class='hunk'>@@ -2207,36 +2345,40 @@ snd_azf3328_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;opl3_io  = pci_resource_start(pci, 3);</div><div class='ctx'> 	chip-&gt;mixer_io = pci_resource_start(pci, 4);</div><div class='ctx'> </div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_PLAYBACK].io_base =</div><div class='del'>-				chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_PLAYBACK;</div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_PLAYBACK].name = "PLAYBACK";</div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_CAPTURE].io_base =</div><div class='del'>-				chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_CAPTURE;</div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_CAPTURE].name = "CAPTURE";</div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_I2S_OUT].io_base =</div><div class='del'>-				chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_I2S_OUT;</div><div class='del'>-	chip-&gt;codecs[AZF_CODEC_I2S_OUT].name = "I2S_OUT";</div><div class='del'>-</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_azf3328_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto out_err;</div><div class='add'>+	codec_setup = &amp;chip-&gt;codecs[AZF_CODEC_PLAYBACK];</div><div class='add'>+	codec_setup-&gt;io_base = chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_PLAYBACK;</div><div class='add'>+	codec_setup-&gt;lock = &amp;chip-&gt;reg_lock;</div><div class='add'>+	codec_setup-&gt;type = AZF_CODEC_PLAYBACK;</div><div class='add'>+	codec_setup-&gt;name = "PLAYBACK";</div><div class='add'>+</div><div class='add'>+	codec_setup = &amp;chip-&gt;codecs[AZF_CODEC_CAPTURE];</div><div class='add'>+	codec_setup-&gt;io_base = chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_CAPTURE;</div><div class='add'>+	codec_setup-&gt;lock = &amp;chip-&gt;reg_lock;</div><div class='add'>+	codec_setup-&gt;type = AZF_CODEC_CAPTURE;</div><div class='add'>+	codec_setup-&gt;name = "CAPTURE";</div><div class='add'>+</div><div class='add'>+	codec_setup = &amp;chip-&gt;codecs[AZF_CODEC_I2S_OUT];</div><div class='add'>+	codec_setup-&gt;io_base = chip-&gt;ctrl_io + AZF_IO_OFFS_CODEC_I2S_OUT;</div><div class='add'>+	codec_setup-&gt;lock = &amp;chip-&gt;reg_lock;</div><div class='add'>+	codec_setup-&gt;type = AZF_CODEC_I2S_OUT;</div><div class='add'>+	codec_setup-&gt;name = "I2S_OUT";</div><div class='add'>+</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_azf3328_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_azf3328_free;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	snd_azf3328_debug_show_ports(chip);</div><div class='ctx'> </div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='ctx'> 	/* create mixer interface &amp; switches */</div><div class='ctx'> 	err = snd_azf3328_mixer_new(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* standard codec init stuff */</div><div class='ctx'> 		/* default DMA init value */</div><div class='hunk'>@@ -2247,35 +2389,21 @@ snd_azf3328_create(struct snd_card *card,</div><div class='ctx'> 		struct snd_azf3328_codec_data *codec =</div><div class='ctx'> 			 &amp;chip-&gt;codecs[codec_type];</div><div class='ctx'> </div><div class='del'>-		/* shutdown codecs to save power */</div><div class='add'>+		/* shutdown codecs to reduce power / noise */</div><div class='ctx'> 			/* have ...ctrl_codec_activity() act properly */</div><div class='del'>-		codec-&gt;running = 1;</div><div class='add'>+		codec-&gt;running = true;</div><div class='ctx'> 		snd_azf3328_ctrl_codec_activity(chip, codec_type, 0);</div><div class='ctx'> </div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+		guard(spinlock_irq)(codec-&gt;lock);</div><div class='ctx'> 		snd_azf3328_codec_outb(codec, IDX_IO_CODEC_DMA_FLAGS,</div><div class='ctx'> 						 dma_init);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	if (chip)</div><div class='del'>-		snd_azf3328_free(chip);</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='del'>-snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='add'>+static int</div><div class='add'>+__snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -2283,7 +2411,6 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 	struct snd_opl3 *opl3;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	if (!enable[dev]) {</div><div class='hunk'>@@ -2291,240 +2418,214 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "AZF3328");</div><div class='del'>-	strcpy(card-&gt;shortname, "Aztech AZF3328 (PCI168)");</div><div class='add'>+	strscpy(card-&gt;driver, "AZF3328");</div><div class='add'>+	strscpy(card-&gt;shortname, "Aztech AZF3328 (PCI168)");</div><div class='ctx'> </div><div class='del'>-	err = snd_azf3328_create(card, pci, pci_id-&gt;driver_data, &amp;chip);</div><div class='add'>+	err = snd_azf3328_create(card, pci, pci_id-&gt;driver_data);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='del'>-</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* chose to use MPU401_HW_AZT2320 ID instead of MPU401_HW_MPU401,</div><div class='ctx'> 	   since our hardware ought to be similar, thus use same ID. */</div><div class='ctx'> 	err = snd_mpu401_uart_new(</div><div class='ctx'> 		card, 0,</div><div class='del'>-		MPU401_HW_AZT2320, chip-&gt;mpu_io, MPU401_INFO_INTEGRATED,</div><div class='del'>-		pci-&gt;irq, 0, &amp;chip-&gt;rmidi</div><div class='add'>+		MPU401_HW_AZT2320, chip-&gt;mpu_io,</div><div class='add'>+		MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,</div><div class='add'>+		-1, &amp;chip-&gt;rmidi</div><div class='ctx'> 	);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "azf3328: no MPU-401 device at 0x%lx?\n",</div><div class='add'>+		dev_err(card-&gt;dev, "no MPU-401 device at 0x%lx?\n",</div><div class='ctx'> 				chip-&gt;mpu_io</div><div class='ctx'> 		);</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_azf3328_timer(chip, 0);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_azf3328_pcm(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_opl3_create(card, chip-&gt;opl3_io, chip-&gt;opl3_io+2,</div><div class='ctx'> 			    OPL3_HW_AUTO, 1, &amp;opl3) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "azf3328: no OPL3 device at 0x%lx-0x%lx?\n",</div><div class='add'>+		dev_err(card-&gt;dev, "no OPL3 device at 0x%lx-0x%lx?\n",</div><div class='ctx'> 			   chip-&gt;opl3_io, chip-&gt;opl3_io+2</div><div class='ctx'> 		);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* need to use IDs 1, 2 since ID 0 is snd_azf3328_timer above */</div><div class='ctx'> 		err = snd_opl3_timer_new(opl3, 1, 2);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto out_err;</div><div class='add'>+			return err;</div><div class='ctx'> 		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto out_err;</div><div class='add'>+			return err;</div><div class='add'>+		opl3-&gt;private_data = chip;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	opl3-&gt;private_data = chip;</div><div class='del'>-</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;ctrl_io, chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_err;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-"azt3328: Sound driver for Aztech AZF3328-based soundcards such as PCI168.\n"</div><div class='del'>-"azt3328: Hardware was completely undocumented, unfortunately.\n"</div><div class='del'>-"azt3328: Feel free to contact andi AT lisas.de for bug reports etc.!\n"</div><div class='del'>-"azt3328: User-scalable sequencer timer set to %dHz (1024000Hz / %d).\n",</div><div class='del'>-	1024000 / seqtimer_scaling, seqtimer_scaling);</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "Sound driver for Aztech AZF3328-based soundcards such as PCI168.\n");</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "Hardware was completely undocumented, unfortunately.\n");</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "Feel free to contact andi AT lisas.de for bug reports etc.!\n");</div><div class='add'>+	dev_info(card-&gt;dev,</div><div class='add'>+		 "User-scalable sequencer timer set to %dHz (1024000Hz / %d).\n",</div><div class='add'>+		 1024000 / seqtimer_scaling, seqtimer_scaling);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	snd_azf3328_gameport(chip, dev);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>-out_err:</div><div class='del'>-	snd_printk(KERN_ERR "azf3328: something failed, exiting\n");</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit</div><div class='del'>-snd_azf3328_remove(struct pci_dev *pci)</div><div class='add'>+static int</div><div class='add'>+snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_azf3328_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> static inline void</div><div class='del'>-snd_azf3328_suspend_regs(unsigned long io_addr, unsigned count, u32 *saved_regs)</div><div class='add'>+snd_azf3328_suspend_regs(const struct snd_azf3328 *chip,</div><div class='add'>+			 unsigned long io_addr, unsigned count, u32 *saved_regs)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned reg;</div><div class='ctx'> </div><div class='ctx'> 	for (reg = 0; reg &lt; count; ++reg) {</div><div class='ctx'> 		*saved_regs = inl(io_addr);</div><div class='del'>-		snd_azf3328_dbgpm("suspend: io 0x%04lx: 0x%08x\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "suspend: io 0x%04lx: 0x%08x\n",</div><div class='ctx'> 			io_addr, *saved_regs);</div><div class='ctx'> 		++saved_regs;</div><div class='ctx'> 		io_addr += sizeof(*saved_regs);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void</div><div class='add'>+snd_azf3328_resume_regs(const struct snd_azf3328 *chip,</div><div class='add'>+			const u32 *saved_regs,</div><div class='add'>+			unsigned long io_addr,</div><div class='add'>+			unsigned count</div><div class='add'>+)</div><div class='add'>+{</div><div class='add'>+	unsigned reg;</div><div class='add'>+</div><div class='add'>+	for (reg = 0; reg &lt; count; ++reg) {</div><div class='add'>+		outl(*saved_regs, io_addr);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"resume: io 0x%04lx: 0x%08x --&gt; 0x%08x\n",</div><div class='add'>+			io_addr, *saved_regs, inl(io_addr));</div><div class='add'>+		++saved_regs;</div><div class='add'>+		io_addr += sizeof(*saved_regs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_azf3328_suspend_ac97(struct snd_azf3328 *chip)</div><div class='add'>+{</div><div class='add'>+#ifdef AZF_USE_AC97_LAYER</div><div class='add'>+	snd_ac97_suspend(chip-&gt;ac97);</div><div class='add'>+#else</div><div class='add'>+	snd_azf3328_suspend_regs(chip, chip-&gt;mixer_io,</div><div class='add'>+		ARRAY_SIZE(chip-&gt;saved_regs_mixer), chip-&gt;saved_regs_mixer);</div><div class='add'>+</div><div class='add'>+	/* make sure to disable master volume etc. to prevent looping sound */</div><div class='add'>+	snd_azf3328_mixer_mute_control_master(chip, 1);</div><div class='add'>+	snd_azf3328_mixer_mute_control_pcm(chip, 1);</div><div class='add'>+#endif /* AZF_USE_AC97_LAYER */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+snd_azf3328_resume_ac97(const struct snd_azf3328 *chip)</div><div class='add'>+{</div><div class='add'>+#ifdef AZF_USE_AC97_LAYER</div><div class='add'>+	snd_ac97_resume(chip-&gt;ac97);</div><div class='add'>+#else</div><div class='add'>+	snd_azf3328_resume_regs(chip, chip-&gt;saved_regs_mixer, chip-&gt;mixer_io,</div><div class='add'>+					ARRAY_SIZE(chip-&gt;saved_regs_mixer));</div><div class='add'>+</div><div class='add'>+	/* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)</div><div class='add'>+	   and IDX_MIXER_RESET (offset 0x00) get touched at the same time,</div><div class='add'>+	   resulting in a mixer reset condition persisting until _after_</div><div class='add'>+	   master vol was restored. Thus master vol needs an extra restore. */</div><div class='add'>+	outw(((u16 *)chip-&gt;saved_regs_mixer)[1], chip-&gt;mixer_io + 2);</div><div class='add'>+#endif /* AZF_USE_AC97_LAYER */</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+snd_azf3328_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_azf3328 *chip = card-&gt;private_data;</div><div class='ctx'> 	u16 *saved_regs_ctrl_u16;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm[AZF_CODEC_PLAYBACK]);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm[AZF_CODEC_I2S_OUT]);</div><div class='add'>+	snd_azf3328_suspend_ac97(chip);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_suspend_regs(chip-&gt;mixer_io,</div><div class='del'>-		ARRAY_SIZE(chip-&gt;saved_regs_mixer), chip-&gt;saved_regs_mixer);</div><div class='del'>-</div><div class='del'>-	/* make sure to disable master volume etc. to prevent looping sound */</div><div class='del'>-	snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);</div><div class='del'>-	snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 1);</div><div class='del'>-</div><div class='del'>-	snd_azf3328_suspend_regs(chip-&gt;ctrl_io,</div><div class='add'>+	snd_azf3328_suspend_regs(chip, chip-&gt;ctrl_io,</div><div class='ctx'> 		ARRAY_SIZE(chip-&gt;saved_regs_ctrl), chip-&gt;saved_regs_ctrl);</div><div class='ctx'> </div><div class='ctx'> 	/* manually store the one currently relevant write-only reg, too */</div><div class='ctx'> 	saved_regs_ctrl_u16 = (u16 *)chip-&gt;saved_regs_ctrl;</div><div class='ctx'> 	saved_regs_ctrl_u16[IDX_IO_6AH / 2] = chip-&gt;shadow_reg_ctrl_6AH;</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_suspend_regs(chip-&gt;game_io,</div><div class='add'>+	snd_azf3328_suspend_regs(chip, chip-&gt;game_io,</div><div class='ctx'> 		ARRAY_SIZE(chip-&gt;saved_regs_game), chip-&gt;saved_regs_game);</div><div class='del'>-	snd_azf3328_suspend_regs(chip-&gt;mpu_io,</div><div class='add'>+	snd_azf3328_suspend_regs(chip, chip-&gt;mpu_io,</div><div class='ctx'> 		ARRAY_SIZE(chip-&gt;saved_regs_mpu), chip-&gt;saved_regs_mpu);</div><div class='del'>-	snd_azf3328_suspend_regs(chip-&gt;opl3_io,</div><div class='add'>+	snd_azf3328_suspend_regs(chip, chip-&gt;opl3_io,</div><div class='ctx'> 		ARRAY_SIZE(chip-&gt;saved_regs_opl3), chip-&gt;saved_regs_opl3);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void</div><div class='del'>-snd_azf3328_resume_regs(const u32 *saved_regs,</div><div class='del'>-			unsigned long io_addr,</div><div class='del'>-			unsigned count</div><div class='del'>-)</div><div class='del'>-{</div><div class='del'>-	unsigned reg;</div><div class='del'>-</div><div class='del'>-	for (reg = 0; reg &lt; count; ++reg) {</div><div class='del'>-		outl(*saved_regs, io_addr);</div><div class='del'>-		snd_azf3328_dbgpm("resume: io 0x%04lx: 0x%08x --&gt; 0x%08x\n",</div><div class='del'>-			io_addr, *saved_regs, inl(io_addr));</div><div class='del'>-		++saved_regs;</div><div class='del'>-		io_addr += sizeof(*saved_regs);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int</div><div class='del'>-snd_azf3328_resume(struct pci_dev *pci)</div><div class='add'>+snd_azf3328_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	const struct snd_azf3328 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "azt3328: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='del'>-	snd_azf3328_resume_regs(chip-&gt;saved_regs_game, chip-&gt;game_io,</div><div class='add'>+	snd_azf3328_resume_regs(chip, chip-&gt;saved_regs_game, chip-&gt;game_io,</div><div class='ctx'> 					ARRAY_SIZE(chip-&gt;saved_regs_game));</div><div class='del'>-	snd_azf3328_resume_regs(chip-&gt;saved_regs_mpu, chip-&gt;mpu_io,</div><div class='add'>+	snd_azf3328_resume_regs(chip, chip-&gt;saved_regs_mpu, chip-&gt;mpu_io,</div><div class='ctx'> 					ARRAY_SIZE(chip-&gt;saved_regs_mpu));</div><div class='del'>-	snd_azf3328_resume_regs(chip-&gt;saved_regs_opl3, chip-&gt;opl3_io,</div><div class='add'>+	snd_azf3328_resume_regs(chip, chip-&gt;saved_regs_opl3, chip-&gt;opl3_io,</div><div class='ctx'> 					ARRAY_SIZE(chip-&gt;saved_regs_opl3));</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_resume_regs(chip-&gt;saved_regs_mixer, chip-&gt;mixer_io,</div><div class='del'>-					ARRAY_SIZE(chip-&gt;saved_regs_mixer));</div><div class='del'>-</div><div class='del'>-	/* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)</div><div class='del'>-	   and IDX_MIXER_RESET (offset 0x00) get touched at the same time,</div><div class='del'>-	   resulting in a mixer reset condition persisting until _after_</div><div class='del'>-	   master vol was restored. Thus master vol needs an extra restore. */</div><div class='del'>-	outw(((u16 *)chip-&gt;saved_regs_mixer)[1], chip-&gt;mixer_io + 2);</div><div class='add'>+	snd_azf3328_resume_ac97(chip);</div><div class='ctx'> </div><div class='del'>-	snd_azf3328_resume_regs(chip-&gt;saved_regs_ctrl, chip-&gt;ctrl_io,</div><div class='add'>+	snd_azf3328_resume_regs(chip, chip-&gt;saved_regs_ctrl, chip-&gt;ctrl_io,</div><div class='ctx'> 					ARRAY_SIZE(chip-&gt;saved_regs_ctrl));</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_azf3328_pm, snd_azf3328_suspend, snd_azf3328_resume);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "AZF3328",</div><div class='add'>+static struct pci_driver azf3328_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_azf3328_ids,</div><div class='ctx'> 	.probe = snd_azf3328_probe,</div><div class='del'>-	.remove = __devexit_p(snd_azf3328_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_azf3328_suspend,</div><div class='del'>-	.resume = snd_azf3328_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_azf3328_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init</div><div class='del'>-alsa_card_azf3328_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	err = pci_register_driver(&amp;driver);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit</div><div class='del'>-alsa_card_azf3328_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_azf3328_dbgcallenter();</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-	snd_azf3328_dbgcallleave();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_azf3328_init)</div><div class='del'>-module_exit(alsa_card_azf3328_exit)</div><div class='add'>+module_pci_driver(azf3328_driver);</div><div class='head'>diff --git a/sound/pci/azt3328.h b/sound/pci/azt3328.h<br/>index 6f46b97650cc..6f9022784499 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/azt3328.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/azt3328.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/azt3328.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/azt3328.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_AZT3328_H</div><div class='ctx'> #define __SOUND_AZT3328_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c<br/>index 37e1b5df5ab8..383def1f2af7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/bt87x.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/bt87x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/bt87x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/bt87x.c</a></div><div class='hunk'>@@ -1,33 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * bt87x.c - Brooktree Bt878/Bt879 driver for ALSA</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * based on btaudio.c by Gerd Knorr &lt;kraxel@bytesex.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='hunk'>@@ -37,14 +23,12 @@</div><div class='ctx'> MODULE_AUTHOR("Clemens Ladisch &lt;clemens@ladisch.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Brooktree Bt87x audio driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Brooktree,Bt878},"</div><div class='del'>-		"{Brooktree,Bt879}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -2}; /* Exclude the first card */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> static int digital_rate[SNDRV_CARDS];	/* digital input rate */</div><div class='del'>-static int load_all;	/* allow to load the non-whitelisted cards */</div><div class='add'>+static bool load_all;	/* allow to load cards not the allowlist */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Bt87x soundcard");</div><div class='hunk'>@@ -55,7 +39,7 @@ MODULE_PARM_DESC(enable, "Enable Bt87x soundcard");</div><div class='ctx'> module_param_array(digital_rate, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(digital_rate, "Digital input rate for Bt87x soundcard");</div><div class='ctx'> module_param(load_all, bool, 0444);</div><div class='del'>-MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards");</div><div class='add'>+MODULE_PARM_DESC(load_all, "Allow to load cards not on the allowlist");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* register offsets */</div><div class='hunk'>@@ -164,7 +148,7 @@ struct snd_bt87x_board {</div><div class='ctx'> 	unsigned no_digital:1;	/* No digital input */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = {</div><div class='add'>+static const struct snd_bt87x_board snd_bt87x_boards[] = {</div><div class='ctx'> 	[SND_BT87X_BOARD_UNKNOWN] = {</div><div class='ctx'> 		.dig_rate = 32000, /* just a guess */</div><div class='ctx'> 	},</div><div class='hunk'>@@ -228,14 +212,14 @@ static int snd_bt87x_create_risc(struct snd_bt87x *chip, struct snd_pcm_substrea</div><div class='ctx'> 			       	 unsigned int periods, unsigned int period_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, offset;</div><div class='del'>-	u32 *risc;</div><div class='add'>+	__le32 *risc;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dma_risc.area == NULL) {</div><div class='del'>-		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='ctx'> 					PAGE_ALIGN(MAX_RISC_SIZE), &amp;chip-&gt;dma_risc) &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	risc = (u32 *)chip-&gt;dma_risc.area;</div><div class='add'>+	risc = (__le32 *)chip-&gt;dma_risc.area;</div><div class='ctx'> 	offset = 0;</div><div class='ctx'> 	*risc++ = cpu_to_le32(RISC_SYNC | RISC_SYNC_FM1);</div><div class='ctx'> 	*risc++ = cpu_to_le32(0);</div><div class='hunk'>@@ -285,25 +269,26 @@ static void snd_bt87x_free_risc(struct snd_bt87x *chip)</div><div class='ctx'> </div><div class='ctx'> static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status)</div><div class='ctx'> {</div><div class='del'>-	u16 pci_status;</div><div class='add'>+	int pci_status = pci_status_get_and_clear_errors(chip-&gt;pci);</div><div class='ctx'> </div><div class='del'>-	pci_read_config_word(chip-&gt;pci, PCI_STATUS, &amp;pci_status);</div><div class='del'>-	pci_status &amp;= PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT |</div><div class='del'>-		PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT |</div><div class='del'>-		PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY;</div><div class='del'>-	pci_write_config_word(chip-&gt;pci, PCI_STATUS, pci_status);</div><div class='ctx'> 	if (pci_status != PCI_STATUS_DETECTED_PARITY)</div><div class='del'>-		snd_printk(KERN_ERR "Aieee - PCI error! status %#08x, PCI status %#04x\n",</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Aieee - PCI error! status %#08x, PCI status %#04x\n",</div><div class='ctx'> 			   status &amp; ERROR_INTERRUPTS, pci_status);</div><div class='ctx'> 	else {</div><div class='del'>-		snd_printk(KERN_ERR "Aieee - PCI parity error detected!\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Aieee - PCI parity error detected!\n");</div><div class='ctx'> 		/* error 'handling' similar to aic7xxx_pci.c: */</div><div class='ctx'> 		chip-&gt;pci_parity_errors++;</div><div class='ctx'> 		if (chip-&gt;pci_parity_errors &gt; 20) {</div><div class='del'>-			snd_printk(KERN_ERR "Too many PCI parity errors observed.\n");</div><div class='del'>-			snd_printk(KERN_ERR "Some device on this bus is generating bad parity.\n");</div><div class='del'>-			snd_printk(KERN_ERR "This is an error *observed by*, not *generated by*, this card.\n");</div><div class='del'>-			snd_printk(KERN_ERR "PCI parity error checking has been disabled.\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Too many PCI parity errors observed.\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Some device on this bus is generating bad parity.\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"This is an error *observed by*, not *generated by*, this card.\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"PCI parity error checking has been disabled.\n");</div><div class='ctx'> 			chip-&gt;interrupt_mask &amp;= ~(INT_PPERR | INT_RIPERR);</div><div class='ctx'> 			snd_bt87x_writel(chip, REG_INT_MASK, chip-&gt;interrupt_mask);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -323,9 +308,11 @@ static irqreturn_t snd_bt87x_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	if (irq_status &amp; ERROR_INTERRUPTS) {</div><div class='ctx'> 		if (irq_status &amp; (INT_FBUS | INT_FTRGT))</div><div class='del'>-			snd_printk(KERN_WARNING "FIFO overrun, status %#08x\n", status);</div><div class='add'>+			dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "FIFO overrun, status %#08x\n", status);</div><div class='ctx'> 		if (irq_status &amp; INT_OCERR)</div><div class='del'>-			snd_printk(KERN_ERR "internal RISC error, status %#08x\n", status);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"internal RISC error, status %#08x\n", status);</div><div class='ctx'> 		if (irq_status &amp; (INT_PPERR | INT_RIPERR | INT_PABORT))</div><div class='ctx'> 			snd_bt87x_pci_error(chip, irq_status);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -338,14 +325,15 @@ static irqreturn_t snd_bt87x_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		current_block = chip-&gt;current_line * 16 / chip-&gt;lines;</div><div class='ctx'> 		irq_block = status &gt;&gt; INT_RISCS_SHIFT;</div><div class='ctx'> 		if (current_block != irq_block)</div><div class='del'>-			chip-&gt;current_line = (irq_block * chip-&gt;lines + 15) / 16;</div><div class='add'>+			chip-&gt;current_line = DIV_ROUND_UP(irq_block * chip-&gt;lines,</div><div class='add'>+							  16);</div><div class='ctx'> </div><div class='ctx'> 		snd_pcm_period_elapsed(chip-&gt;substream);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_bt87x_digital_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_bt87x_digital_hw = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -362,7 +350,7 @@ static struct snd_pcm_hardware snd_bt87x_digital_hw = {</div><div class='ctx'> 	.periods_max = 255,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_bt87x_analog_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_bt87x_analog_hw = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -393,13 +381,13 @@ static int snd_bt87x_set_digital_hw(struct snd_bt87x *chip, struct snd_pcm_runti</div><div class='ctx'> </div><div class='ctx'> static int snd_bt87x_set_analog_hw(struct snd_bt87x *chip, struct snd_pcm_runtime *runtime)</div><div class='ctx'> {</div><div class='del'>-	static struct snd_ratnum analog_clock = {</div><div class='add'>+	static const struct snd_ratnum analog_clock = {</div><div class='ctx'> 		.num = ANALOG_CLOCK,</div><div class='ctx'> 		.den_min = CLOCK_DIV_MIN,</div><div class='ctx'> 		.den_max = CLOCK_DIV_MAX,</div><div class='ctx'> 		.den_step = 1</div><div class='ctx'> 	};</div><div class='del'>-	static struct snd_pcm_hw_constraint_ratnums constraint_rates = {</div><div class='add'>+	static const struct snd_pcm_hw_constraint_ratnums constraint_rates = {</div><div class='ctx'> 		.nrats = 1,</div><div class='ctx'> 		.rats = &amp;analog_clock</div><div class='ctx'> 	};</div><div class='hunk'>@@ -435,7 +423,7 @@ static int snd_bt87x_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> _error:</div><div class='ctx'> 	clear_bit(0, &amp;chip-&gt;opened);</div><div class='del'>-	smp_mb__after_clear_bit();</div><div class='add'>+	smp_mb__after_atomic();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -443,14 +431,14 @@ static int snd_bt87x_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_bt87x *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	chip-&gt;reg_control |= CTL_A_PWRDN;</div><div class='del'>-	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;reg_control |= CTL_A_PWRDN;</div><div class='add'>+		snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;substream = NULL;</div><div class='ctx'> 	clear_bit(0, &amp;chip-&gt;opened);</div><div class='del'>-	smp_mb__after_clear_bit();</div><div class='add'>+	smp_mb__after_atomic();</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -458,12 +446,7 @@ static int snd_bt87x_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 			       struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_bt87x *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	return snd_bt87x_create_risc(chip, substream,</div><div class='ctx'> 				     params_periods(hw_params),</div><div class='ctx'> 				     params_period_bytes(hw_params));</div><div class='hunk'>@@ -474,7 +457,6 @@ static int snd_bt87x_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_bt87x *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	snd_bt87x_free_risc(chip);</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -484,20 +466,19 @@ static int snd_bt87x_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int decimation;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;reg_control &amp;= ~(CTL_DA_SDR_MASK | CTL_DA_SBR);</div><div class='ctx'> 	decimation = (ANALOG_CLOCK + runtime-&gt;rate / 4) / runtime-&gt;rate;</div><div class='ctx'> 	chip-&gt;reg_control |= decimation &lt;&lt; CTL_DA_SDR_SHIFT;</div><div class='ctx'> 	if (runtime-&gt;format == SNDRV_PCM_FORMAT_S8)</div><div class='ctx'> 		chip-&gt;reg_control |= CTL_DA_SBR;</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_bt87x_start(struct snd_bt87x *chip)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;current_line = 0;</div><div class='ctx'> 	chip-&gt;reg_control |= CTL_FIFO_ENABLE | CTL_RISC_ENABLE | CTL_ACAP_EN;</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_RISC_STRT_ADD, chip-&gt;dma_risc.addr);</div><div class='hunk'>@@ -505,18 +486,16 @@ static int snd_bt87x_start(struct snd_bt87x *chip)</div><div class='ctx'> 			 chip-&gt;line_bytes | (chip-&gt;lines &lt;&lt; 16));</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_INT_MASK, chip-&gt;interrupt_mask);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_bt87x_stop(struct snd_bt87x *chip)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;reg_control &amp;= ~(CTL_FIFO_ENABLE | CTL_RISC_ENABLE | CTL_ACAP_EN);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_INT_MASK, 0);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -542,16 +521,14 @@ static snd_pcm_uframes_t snd_bt87x_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return (snd_pcm_uframes_t)bytes_to_frames(runtime, chip-&gt;current_line * chip-&gt;line_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_bt87x_pcm_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_bt87x_pcm_ops = {</div><div class='ctx'> 	.open = snd_bt87x_pcm_open,</div><div class='ctx'> 	.close = snd_bt87x_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = snd_bt87x_hw_params,</div><div class='ctx'> 	.hw_free = snd_bt87x_hw_free,</div><div class='ctx'> 	.prepare = snd_bt87x_prepare,</div><div class='ctx'> 	.trigger = snd_bt87x_trigger,</div><div class='ctx'> 	.pointer = snd_bt87x_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int snd_bt87x_capture_volume_info(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -580,17 +557,16 @@ static int snd_bt87x_capture_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 old_control;</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	old_control = chip-&gt;reg_control;</div><div class='ctx'> 	chip-&gt;reg_control = (chip-&gt;reg_control &amp; ~CTL_A_GAIN_MASK)</div><div class='ctx'> 		| (value-&gt;value.integer.value[0] &lt;&lt; CTL_A_GAIN_SHIFT);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='ctx'> 	changed = old_control != chip-&gt;reg_control;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_bt87x_capture_volume = {</div><div class='add'>+static const struct snd_kcontrol_new snd_bt87x_capture_volume = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Capture Volume",</div><div class='ctx'> 	.info = snd_bt87x_capture_volume_info,</div><div class='hunk'>@@ -616,17 +592,16 @@ static int snd_bt87x_capture_boost_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 old_control;</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	old_control = chip-&gt;reg_control;</div><div class='ctx'> 	chip-&gt;reg_control = (chip-&gt;reg_control &amp; ~CTL_A_G2X)</div><div class='ctx'> 		| (value-&gt;value.integer.value[0] ? CTL_A_G2X : 0);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='ctx'> 	changed = chip-&gt;reg_control != old_control;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_bt87x_capture_boost = {</div><div class='add'>+static const struct snd_kcontrol_new snd_bt87x_capture_boost = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Capture Boost",</div><div class='ctx'> 	.info = snd_bt87x_capture_boost_info,</div><div class='hunk'>@@ -637,15 +612,9 @@ static struct snd_kcontrol_new snd_bt87x_capture_boost = {</div><div class='ctx'> static int snd_bt87x_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					 struct snd_ctl_elem_info *info)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {"TV Tuner", "FM", "Mic/Line"};</div><div class='add'>+	static const char *const texts[3] = {"TV Tuner", "FM", "Mic/Line"};</div><div class='ctx'> </div><div class='del'>-	info-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	info-&gt;count = 1;</div><div class='del'>-	info-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (info-&gt;value.enumerated.item &gt; 2)</div><div class='del'>-		info-&gt;value.enumerated.item = 2;</div><div class='del'>-	strcpy(info-&gt;value.enumerated.name, texts[info-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(info, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_bt87x_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -664,17 +633,16 @@ static int snd_bt87x_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	u32 old_control;</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	old_control = chip-&gt;reg_control;</div><div class='ctx'> 	chip-&gt;reg_control = (chip-&gt;reg_control &amp; ~CTL_A_SEL_MASK)</div><div class='ctx'> 		| (value-&gt;value.enumerated.item[0] &lt;&lt; CTL_A_SEL_SHIFT);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip-&gt;reg_control);</div><div class='ctx'> 	changed = chip-&gt;reg_control != old_control;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_bt87x_capture_source = {</div><div class='add'>+static const struct snd_kcontrol_new snd_bt87x_capture_source = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Capture Source",</div><div class='ctx'> 	.info = snd_bt87x_capture_source_info,</div><div class='hunk'>@@ -682,27 +650,14 @@ static struct snd_kcontrol_new snd_bt87x_capture_source = {</div><div class='ctx'> 	.put = snd_bt87x_capture_source_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_bt87x_free(struct snd_bt87x *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;mmio)</div><div class='del'>-		snd_bt87x_stop(chip);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;mmio)</div><div class='del'>-		iounmap(chip-&gt;mmio);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_bt87x_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_bt87x_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	struct snd_bt87x *chip = device-&gt;device_data;</div><div class='del'>-	return snd_bt87x_free(chip);</div><div class='add'>+	struct snd_bt87x *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	snd_bt87x_stop(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)</div><div class='add'>+static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='hunk'>@@ -711,52 +666,33 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *nam</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='del'>-	strcpy(pcm-&gt;name, name);</div><div class='add'>+	strscpy(pcm-&gt;name, name);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_bt87x_pcm_ops);</div><div class='del'>-	return snd_pcm_lib_preallocate_pages_for_all(pcm,</div><div class='del'>-						     SNDRV_DMA_TYPE_DEV_SG,</div><div class='del'>-						     snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-							128 * 1024,</div><div class='del'>-							ALIGN(255 * 4092, 1024));</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       128 * 1024,</div><div class='add'>+				       ALIGN(255 * 4092, 1024));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_bt87x_create(struct snd_card *card,</div><div class='del'>-				      struct pci_dev *pci,</div><div class='del'>-				      struct snd_bt87x **rchip)</div><div class='add'>+static int snd_bt87x_create(struct snd_card *card,</div><div class='add'>+			    struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct snd_bt87x *chip;</div><div class='add'>+	struct snd_bt87x *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_bt87x_dev_free</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (!chip) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "Bt87x audio")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;mmio = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (!chip-&gt;mmio) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot remap io memory\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;mmio = pcim_iomap_region(pci, 0, "Bt87x audio");</div><div class='add'>+	if (IS_ERR(chip-&gt;mmio))</div><div class='add'>+		return PTR_ERR(chip-&gt;mmio);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;reg_control = CTL_A_PWRDN | CTL_DA_ES2 |</div><div class='ctx'> 			    CTL_PKTP_16 | (15 &lt;&lt; CTL_DA_SDR_SHIFT);</div><div class='hunk'>@@ -765,27 +701,18 @@ static int __devinit snd_bt87x_create(struct snd_card *card,</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_INT_MASK, 0);</div><div class='ctx'> 	snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pci-&gt;irq, snd_bt87x_interrupt, IRQF_SHARED,</div><div class='del'>-			  "Bt87x audio", chip);</div><div class='add'>+	err = devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_bt87x_interrupt,</div><div class='add'>+			       IRQF_SHARED, KBUILD_MODNAME, chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot grab irq %d\n", pci-&gt;irq);</div><div class='del'>-		goto fail;</div><div class='add'>+		dev_err(card-&gt;dev, "cannot grab irq %d\n", pci-&gt;irq);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_bt87x_free;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto fail;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	snd_bt87x_free(chip);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BT_DEVICE(chip, subvend, subdev, id) \</div><div class='hunk'>@@ -795,7 +722,7 @@ fail:</div><div class='ctx'> 	  .driver_data = SND_BT87X_BOARD_ ## id }</div><div class='ctx'> /* driver_data is the card id for that device */</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_ids) = {</div><div class='add'>+static const struct pci_device_id snd_bt87x_ids[] = {</div><div class='ctx'> 	/* Hauppauge WinTV series */</div><div class='ctx'> 	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC),</div><div class='ctx'> 	/* Hauppauge WinTV series */</div><div class='hunk'>@@ -828,7 +755,7 @@ MODULE_DEVICE_TABLE(pci, snd_bt87x_ids);</div><div class='ctx'>  * (DVB cards use the audio function to transfer MPEG data) */</div><div class='ctx'> static struct {</div><div class='ctx'> 	unsigned short subvendor, subdevice;</div><div class='del'>-} blacklist[] __devinitdata = {</div><div class='add'>+} denylist[] = {</div><div class='ctx'> 	{0x0071, 0x0101}, /* Nebula Electronics DigiTV */</div><div class='ctx'> 	{0x11bd, 0x001c}, /* Pinnacle PCTV Sat */</div><div class='ctx'> 	{0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */</div><div class='hunk'>@@ -844,8 +771,8 @@ static struct {</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver driver;</div><div class='ctx'> </div><div class='del'>-/* return the id of the card, or a negative value if it's blacklisted */</div><div class='del'>-static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)</div><div class='add'>+/* return the id of the card, or a negative value if it's on the denylist */</div><div class='add'>+static int snd_bt87x_detect_card(struct pci_dev *pci)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	const struct pci_device_id *supported;</div><div class='hunk'>@@ -854,24 +781,25 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)</div><div class='ctx'> 	if (supported &amp;&amp; supported-&gt;driver_data &gt; 0)</div><div class='ctx'> 		return supported-&gt;driver_data;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(blacklist); ++i)</div><div class='del'>-		if (blacklist[i].subvendor == pci-&gt;subsystem_vendor &amp;&amp;</div><div class='del'>-		    blacklist[i].subdevice == pci-&gt;subsystem_device) {</div><div class='del'>-			snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n",</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(denylist); ++i)</div><div class='add'>+		if (denylist[i].subvendor == pci-&gt;subsystem_vendor &amp;&amp;</div><div class='add'>+		    denylist[i].subdevice == pci-&gt;subsystem_device) {</div><div class='add'>+			dev_dbg(&amp;pci-&gt;dev,</div><div class='add'>+				"card %#04x-%#04x:%#04x has no audio\n",</div><div class='ctx'> 				    pci-&gt;device, pci-&gt;subsystem_vendor, pci-&gt;subsystem_device);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x\n",</div><div class='add'>+	dev_info(&amp;pci-&gt;dev, "unknown card %#04x-%#04x:%#04x\n",</div><div class='ctx'> 		   pci-&gt;device, pci-&gt;subsystem_vendor, pci-&gt;subsystem_device);</div><div class='del'>-	snd_printk(KERN_DEBUG "please mail id, board name, and, "</div><div class='add'>+	dev_info(&amp;pci-&gt;dev, "please mail id, board name, and, "</div><div class='ctx'> 		   "if it works, the correct digital_rate option to "</div><div class='ctx'> 		   "&lt;alsa-devel@alsa-project.org&gt;\n");</div><div class='ctx'> 	return SND_BT87X_BOARD_UNKNOWN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_bt87x_probe(struct pci_dev *pci,</div><div class='del'>-				     const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_bt87x_probe(struct pci_dev *pci,</div><div class='add'>+			     const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -894,13 +822,15 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	err = snd_bt87x_create(card, pci, &amp;chip);</div><div class='add'>+	err = snd_bt87x_create(card, pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;chip-&gt;board, &amp;snd_bt87x_boards[boardid], sizeof(chip-&gt;board));</div><div class='ctx'> </div><div class='hunk'>@@ -912,69 +842,64 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 		err = snd_bt87x_pcm(chip, DEVICE_DIGITAL, "Bt87x Digital");</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!chip-&gt;board.no_analog) {</div><div class='ctx'> 		err = snd_bt87x_pcm(chip, DEVICE_ANALOG, "Bt87x Analog");</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='add'>+			return err;</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(</div><div class='ctx'> 				  &amp;snd_bt87x_capture_volume, chip));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='add'>+			return err;</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(</div><div class='ctx'> 				  &amp;snd_bt87x_capture_boost, chip));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='add'>+			return err;</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(</div><div class='ctx'> 				  &amp;snd_bt87x_capture_source, chip));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto _error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_INFO "bt87x%d: Using board %d, %sanalog, %sdigital "</div><div class='add'>+	dev_info(card-&gt;dev, "bt87x%d: Using board %d, %sanalog, %sdigital "</div><div class='ctx'> 		   "(rate %d Hz)\n", dev, boardid,</div><div class='ctx'> 		   chip-&gt;board.no_analog ? "no " : "",</div><div class='ctx'> 		   chip-&gt;board.no_digital ? "no " : "", chip-&gt;board.dig_rate);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "Bt87x");</div><div class='add'>+	strscpy(card-&gt;driver, "Bt87x");</div><div class='ctx'> 	sprintf(card-&gt;shortname, "Brooktree Bt%x", pci-&gt;device);</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at %#llx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, (unsigned long long)pci_resource_start(pci, 0),</div><div class='ctx'> 		chip-&gt;irq);</div><div class='del'>-	strcpy(card-&gt;mixername, "Bt87x");</div><div class='add'>+	strscpy(card-&gt;mixername, "Bt87x");</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto _error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	++dev;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-_error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_bt87x_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_bt87x_probe(struct pci_dev *pci,</div><div class='add'>+			   const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_bt87x_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* default entries for all Bt87x cards - it's not exported */</div><div class='ctx'> /* driver_data is set to 0 to call detection */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {</div><div class='add'>+static const struct pci_device_id snd_bt87x_default_ids[] = {</div><div class='ctx'> 	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),</div><div class='ctx'> 	BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver driver = {</div><div class='del'>-	.name = "Bt87x",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_bt87x_ids,</div><div class='ctx'> 	.probe = snd_bt87x_probe,</div><div class='del'>-	.remove = __devexit_p(snd_bt87x_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init alsa_card_bt87x_init(void)</div><div class='head'>diff --git a/sound/pci/ca0106/Makefile b/sound/pci/ca0106/Makefile<br/>index dcbae7b31546..693dc4d80925 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/Makefile</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='del'>-snd-ca0106-objs := ca0106_main.o ca0106_proc.o ca0106_mixer.o ca_midi.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-ca0106-y := ca0106_main.o ca0106_mixer.o ca_midi.o</div><div class='add'>+snd-ca0106-$(CONFIG_SND_PROC_FS) += ca0106_proc.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_CA0106) += snd-ca0106.o</div><div class='head'>diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h<br/>index f19c11077255..991b1c5d41d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca0106.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 2004 James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit</div><div class='hunk'>@@ -50,39 +51,23 @@</div><div class='ctx'>  *  0.0.22</div><div class='ctx'>  *    Add support for mute control on SB Live 24bit (cards w/ SPI DAC)</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /************************************************************************************************/</div><div class='ctx'> /* PCI function 0 registers, address = &lt;val&gt; + PCIBASE0						*/</div><div class='ctx'> /************************************************************************************************/</div><div class='ctx'> </div><div class='del'>-#define PTR			0x00		/* Indexed register set pointer register	*/</div><div class='add'>+#define CA0106_PTR		0x00		/* Indexed register set pointer register	*/</div><div class='ctx'> 						/* NOTE: The CHANNELNUM and ADDRESS words can	*/</div><div class='ctx'> 						/* be modified independently of each other.	*/</div><div class='ctx'> 						/* CNL[1:0], ADDR[27:16]                        */</div><div class='ctx'> </div><div class='del'>-#define DATA			0x04		/* Indexed register set data register		*/</div><div class='add'>+#define CA0106_DATA		0x04		/* Indexed register set data register		*/</div><div class='ctx'> 						/* DATA[31:0]					*/</div><div class='ctx'> </div><div class='del'>-#define IPR			0x08		/* Global interrupt pending register		*/</div><div class='add'>+#define CA0106_IPR		0x08		/* Global interrupt pending register		*/</div><div class='ctx'> 						/* Clear pending interrupts by writing a 1 to	*/</div><div class='ctx'> 						/* the relevant bits and zero to the other bits	*/</div><div class='ctx'> #define IPR_MIDI_RX_B		0x00020000	/* MIDI UART-B Receive buffer non-empty		*/</div><div class='hunk'>@@ -103,7 +88,7 @@</div><div class='ctx'> #define IPR_MIDI_TX_A		0x00000002	/* MIDI UART-A Transmit buffer empty		*/</div><div class='ctx'> #define IPR_PCI			0x00000001	/* PCI Bus error				*/</div><div class='ctx'> </div><div class='del'>-#define INTE			0x0c		/* Interrupt enable register			*/</div><div class='add'>+#define CA0106_INTE		0x0c		/* Interrupt enable register			*/</div><div class='ctx'> </div><div class='ctx'> #define INTE_MIDI_RX_B		0x00020000	/* MIDI UART-B Receive buffer non-empty		*/</div><div class='ctx'> #define INTE_MIDI_TX_B		0x00010000	/* MIDI UART-B Transmit buffer empty		*/</div><div class='hunk'>@@ -123,8 +108,8 @@</div><div class='ctx'> #define INTE_MIDI_TX_A		0x00000002	/* MIDI UART-A Transmit buffer empty		*/</div><div class='ctx'> #define INTE_PCI		0x00000001	/* PCI Bus error				*/</div><div class='ctx'> </div><div class='del'>-#define UNKNOWN10		0x10		/* Unknown ??. Defaults to 0 */</div><div class='del'>-#define HCFG			0x14		/* Hardware config register			*/</div><div class='add'>+#define CA0106_UNKNOWN10	0x10		/* Unknown ??. Defaults to 0 */</div><div class='add'>+#define CA0106_HCFG		0x14		/* Hardware config register			*/</div><div class='ctx'> 						/* 0x1000 causes AC3 to fails. It adds a dither bit. */</div><div class='ctx'> </div><div class='ctx'> #define HCFG_STAC		0x10000000	/* Special mode for STAC9460 Codec. */</div><div class='hunk'>@@ -148,7 +133,7 @@</div><div class='ctx'> #define HCFG_AUDIOENABLE	0x00000001	/* 0 = CODECs transmit zero-valued samples	*/</div><div class='ctx'> 						/* Should be set to 1 when the EMU10K1 is	*/</div><div class='ctx'> 						/* completely initialized.			*/</div><div class='del'>-#define GPIO			0x18		/* Defaults: 005f03a3-Analog, 005f02a2-SPDIF.   */</div><div class='add'>+#define CA0106_GPIO		0x18		/* Defaults: 005f03a3-Analog, 005f02a2-SPDIF.   */</div><div class='ctx'> 						/* Here pins 0,1,2,3,4,,6 are output. 5,7 are input */</div><div class='ctx'> 						/* For the Audigy LS, pin 0 (or bit 8) controls the SPDIF/Analog jack. */</div><div class='ctx'> 						/* SB Live 24bit:</div><div class='hunk'>@@ -167,15 +152,15 @@</div><div class='ctx'> 						 * GPO [15:8] Default 0x9. (Default to SPDIF jack enabled for SPDIF)</div><div class='ctx'> 						 * GPO Enable [23:16] Default 0x0f. Setting a bit to 1, causes the pin to be an output pin.</div><div class='ctx'> 						 */</div><div class='del'>-#define AC97DATA		0x1c		/* AC97 register set data register (16 bit)	*/</div><div class='add'>+#define CA0106_AC97DATA		0x1c		/* AC97 register set data register (16 bit)	*/</div><div class='ctx'> </div><div class='del'>-#define AC97ADDRESS		0x1e		/* AC97 register set address register (8 bit)	*/</div><div class='add'>+#define CA0106_AC97ADDRESS	0x1e		/* AC97 register set address register (8 bit)	*/</div><div class='ctx'> </div><div class='ctx'> /********************************************************************************************************/</div><div class='ctx'> /* CA0106 pointer-offset register set, accessed through the PTR and DATA registers                     */</div><div class='ctx'> /********************************************************************************************************/</div><div class='ctx'>                                                                                                                            </div><div class='del'>-/* Initally all registers from 0x00 to 0x3f have zero contents. */</div><div class='add'>+/* Initially all registers from 0x00 to 0x3f have zero contents. */</div><div class='ctx'> #define PLAYBACK_LIST_ADDR	0x00		/* Base DMA address of a list of pointers to each period/size */</div><div class='ctx'> 						/* One list entry: 4 bytes for DMA address, </div><div class='ctx'> 						 * 4 bytes for period_size &lt;&lt; 16.</div><div class='hunk'>@@ -188,7 +173,7 @@</div><div class='ctx'> #define PLAYBACK_LIST_PTR	0x02		/* Pointer to the current period being played */</div><div class='ctx'> 						/* PTR[5:0], Default: 0x0 */</div><div class='ctx'> #define PLAYBACK_UNKNOWN3	0x03		/* Not used ?? */</div><div class='del'>-#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA addresss */</div><div class='add'>+#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA address */</div><div class='ctx'> 						/* DMA[31:0], Default: 0x0 */</div><div class='ctx'> #define PLAYBACK_PERIOD_SIZE	0x05		/* Playback period size. win2000 uses 0x04000000 */</div><div class='ctx'> 						/* SIZE[31:16], Default: 0x0 */</div><div class='hunk'>@@ -223,7 +208,7 @@</div><div class='ctx'>  * The jack has 4 poles. I will call 1 - Tip, 2 - Next to 1, 3 - Next to 2, 4 - Next to 3</div><div class='ctx'>  * For Analogue: 1 -&gt; Center Speaker, 2 -&gt; Sub Woofer, 3 -&gt; Ground, 4 -&gt; Ground</div><div class='ctx'>  * For Digital: 1 -&gt; Front SPDIF, 2 -&gt; Rear SPDIF, 3 -&gt; Center/Subwoofer SPDIF, 4 -&gt; Ground.</div><div class='del'>- * Standard 4 pole Video A/V cable with RCA outputs: 1 -&gt; White, 2 -&gt; Yellow, 3 -&gt; Sheild on all three, 4 -&gt; Red.</div><div class='add'>+ * Standard 4 pole Video A/V cable with RCA outputs: 1 -&gt; White, 2 -&gt; Yellow, 3 -&gt; Shield on all three, 4 -&gt; Red.</div><div class='ctx'>  * So, from this you can see that you cannot use a Standard 4 pole Video A/V cable with the SB Audigy LS card.</div><div class='ctx'>  */</div><div class='ctx'> /* The Front SPDIF PCM gets mixed with samples from the AC97 codec, so can only work for Stereo PCM and not AC3/DTS</div><div class='hunk'>@@ -582,7 +567,7 @@</div><div class='ctx'> #define SPI_PL_BIT_R_R		(2&lt;&lt;7)	/* right channel = right */</div><div class='ctx'> #define SPI_PL_BIT_R_C		(3&lt;&lt;7)	/* right channel = (L+R)/2 */</div><div class='ctx'> #define SPI_IZD_REG		2</div><div class='del'>-#define SPI_IZD_BIT		(1&lt;&lt;4)	/* infinite zero detect */</div><div class='add'>+#define SPI_IZD_BIT		(0&lt;&lt;4)	/* infinite zero detect */</div><div class='ctx'> </div><div class='ctx'> #define SPI_FMT_REG		3</div><div class='ctx'> #define SPI_FMT_BIT_RJ		(0&lt;&lt;0)	/* right justified mode */</div><div class='hunk'>@@ -678,11 +663,10 @@ struct snd_ca0106_details {</div><div class='ctx'> // definition of the chip-specific record</div><div class='ctx'> struct snd_ca0106 {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct snd_ca0106_details *details;</div><div class='add'>+	const struct snd_ca0106_details *details;</div><div class='ctx'> 	struct pci_dev *pci;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long port;</div><div class='del'>-	struct resource *res_port;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int serial;            /* serial number */</div><div class='hunk'>@@ -703,14 +687,14 @@ struct snd_ca0106 {</div><div class='ctx'> 	u8 i2c_capture_volume[4][2];</div><div class='ctx'> 	int capture_mic_line_in;</div><div class='ctx'> </div><div class='del'>-	struct snd_dma_buffer buffer;</div><div class='add'>+	struct snd_dma_buffer *buffer;</div><div class='ctx'> </div><div class='ctx'> 	struct snd_ca_midi midi;</div><div class='ctx'> 	struct snd_ca_midi midi2;</div><div class='ctx'> </div><div class='ctx'> 	u16 spi_dac_reg[16];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> #define NUM_SAVED_VOLUMES	9</div><div class='ctx'> 	unsigned int saved_vol[NUM_SAVED_VOLUMES];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -733,7 +717,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value);</div><div class='ctx'> int snd_ca0106_spi_write(struct snd_ca0106 * emu,</div><div class='ctx'> 				   unsigned int data);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> void snd_ca0106_mixer_suspend(struct snd_ca0106 *chip);</div><div class='ctx'> void snd_ca0106_mixer_resume(struct snd_ca0106 *chip);</div><div class='ctx'> #else</div><div class='head'>diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c<br/>index d2d12c08f937..41774e2ef53f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_main.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca0106_main.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 2004 James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit</div><div class='hunk'>@@ -117,30 +118,15 @@</div><div class='ctx'>  *    DAC: Unknown</div><div class='ctx'>  *    Trying to handle it like the SB0410.</div><div class='ctx'>  *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -151,12 +137,11 @@</div><div class='ctx'> MODULE_AUTHOR("James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("CA0106");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative,SB CA0106 chip}}");</div><div class='ctx'> </div><div class='ctx'> // module parameters (see "Module Parameters")</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -170,7 +155,7 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");</div><div class='ctx'> </div><div class='ctx'> #include "ca0106.h"</div><div class='ctx'> </div><div class='del'>-static struct snd_ca0106_details ca0106_chip_details[] = {</div><div class='add'>+static const struct snd_ca0106_details ca0106_chip_details[] = {</div><div class='ctx'> 	 /* Sound Blaster X-Fi Extreme Audio. This does not have an AC97. 53SB079000000 */</div><div class='ctx'> 	 /* It is really just a normal SB Live 24bit. */</div><div class='ctx'> 	 /* Tested:</div><div class='hunk'>@@ -296,7 +281,7 @@ static struct snd_ca0106_details ca0106_chip_details[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_ca0106_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ca0106_playback_hw = {</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_MMAP | </div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -317,7 +302,7 @@ static struct snd_pcm_hardware snd_ca0106_playback_hw = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ca0106_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_ca0106_capture_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | </div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -347,16 +332,13 @@ unsigned int snd_ca0106_ptr_read(struct snd_ca0106 * emu,</div><div class='ctx'> 					  unsigned int reg, </div><div class='ctx'> 					  unsigned int chn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int regptr, val;</div><div class='add'>+	unsigned int regptr;</div><div class='ctx'>   </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-	val = inl(emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(regptr, emu-&gt;port + CA0106_PTR);</div><div class='add'>+	return inl(emu-&gt;port + CA0106_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_ca0106_ptr_write(struct snd_ca0106 *emu, </div><div class='hunk'>@@ -365,14 +347,12 @@ void snd_ca0106_ptr_write(struct snd_ca0106 *emu,</div><div class='ctx'> 				   unsigned int data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int regptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-	outl(data, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(regptr, emu-&gt;port + CA0106_PTR);</div><div class='add'>+	outl(data, emu-&gt;port + CA0106_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_ca0106_spi_write(struct snd_ca0106 * emu,</div><div class='hunk'>@@ -417,13 +397,13 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int retry;</div><div class='ctx'> 	if ((reg &gt; 0x7f) || (value &gt; 0x1ff)) {</div><div class='del'>-		snd_printk(KERN_ERR "i2c_write: invalid values.\n");</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "i2c_write: invalid values.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = reg &lt;&lt; 25 | value &lt;&lt; 16;</div><div class='ctx'> 	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "I2C-write:reg=0x%x, value=0x%x\n", reg, value);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "I2C-write:reg=0x%x, value=0x%x\n", reg, value);</div><div class='ctx'> 	*/</div><div class='ctx'> 	/* Not sure what this I2C channel controls. */</div><div class='ctx'> 	/* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */</div><div class='hunk'>@@ -442,7 +422,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,</div><div class='ctx'> 		/* Wait till the transaction ends */</div><div class='ctx'> 		while (1) {</div><div class='ctx'> 			status = snd_ca0106_ptr_read(emu, I2C_A, 0);</div><div class='del'>-			/*snd_printk(KERN_DEBUG "I2C:status=0x%x\n", status);*/</div><div class='add'>+			/*dev_dbg(emu-&gt;card-&gt;dev, "I2C:status=0x%x\n", status);*/</div><div class='ctx'> 			timeout++;</div><div class='ctx'> 			if ((status &amp; I2C_A_ADC_START) == 0)</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -456,7 +436,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retry == 10) {</div><div class='del'>-		snd_printk(KERN_ERR "Writing to ADC failed!\n");</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "Writing to ADC failed!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'>     </div><div class='hunk'>@@ -466,24 +446,20 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,</div><div class='ctx'> </div><div class='ctx'> static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int intr_enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	intr_enable = inl(emu-&gt;port + INTE) | intrenb;</div><div class='del'>-	outl(intr_enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	intr_enable = inl(emu-&gt;port + CA0106_INTE) | intrenb;</div><div class='add'>+	outl(intr_enable, emu-&gt;port + CA0106_INTE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int intr_enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	intr_enable = inl(emu-&gt;port + INTE) &amp; ~intrenb;</div><div class='del'>-	outl(intr_enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	intr_enable = inl(emu-&gt;port + CA0106_INTE) &amp; ~intrenb;</div><div class='add'>+	outl(intr_enable, emu-&gt;port + CA0106_INTE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -516,7 +492,8 @@ static void restore_spdif_bits(struct snd_ca0106 *chip, int idx)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ca0106_channel_dac(struct snd_ca0106_details *details,</div><div class='add'>+static int snd_ca0106_channel_dac(struct snd_ca0106 *chip,</div><div class='add'>+				  const struct snd_ca0106_details *details,</div><div class='ctx'> 				  int channel_id)</div><div class='ctx'> {</div><div class='ctx'> 	switch (channel_id) {</div><div class='hunk'>@@ -529,7 +506,7 @@ static int snd_ca0106_channel_dac(struct snd_ca0106_details *details,</div><div class='ctx'> 	case PCM_UNKNOWN_CHANNEL:</div><div class='ctx'> 		return (details-&gt;spi_dac &amp; 0x000f) &gt;&gt; (4 * 0);</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_DEBUG "ca0106: unknown channel_id %d\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "ca0106: unknown channel_id %d\n",</div><div class='ctx'> 			   channel_id);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -539,7 +516,7 @@ static int snd_ca0106_pcm_power_dac(struct snd_ca0106 *chip, int channel_id,</div><div class='ctx'> 				    int power)</div><div class='ctx'> {</div><div class='ctx'> 	if (chip-&gt;details-&gt;spi_dac) {</div><div class='del'>-		const int dac = snd_ca0106_channel_dac(chip-&gt;details,</div><div class='add'>+		const int dac = snd_ca0106_channel_dac(chip, chip-&gt;details,</div><div class='ctx'> 						       channel_id);</div><div class='ctx'> 		const int reg = spi_dacd_reg[dac];</div><div class='ctx'> 		const int bit = spi_dacd_bit[dac];</div><div class='hunk'>@@ -550,7 +527,8 @@ static int snd_ca0106_pcm_power_dac(struct snd_ca0106 *chip, int channel_id,</div><div class='ctx'> 		else</div><div class='ctx'> 			/* Power down */</div><div class='ctx'> 			chip-&gt;spi_dac_reg[reg] |= bit;</div><div class='del'>-		return snd_ca0106_spi_write(chip, chip-&gt;spi_dac_reg[reg]);</div><div class='add'>+		if (snd_ca0106_spi_write(chip, chip-&gt;spi_dac_reg[reg]) != 0)</div><div class='add'>+			return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -583,14 +561,16 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr</div><div class='ctx'> </div><div class='ctx'> 	channel-&gt;use = 1;</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='ctx'> 	       channel_id, chip, channel);</div><div class='ctx'> 	*/</div><div class='ctx'>         //channel-&gt;interrupt = snd_ca0106_pcm_channel_interrupt;</div><div class='ctx'> 	channel-&gt;epcm = epcm;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='ctx'> </div><div class='hunk'>@@ -659,10 +639,9 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='del'>-	if (epcm == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "open_capture_channel: failed epcm alloc\n");</div><div class='add'>+	if (!epcm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-        }</div><div class='add'>+</div><div class='ctx'> 	epcm-&gt;emu = chip;</div><div class='ctx'> 	epcm-&gt;substream = substream;</div><div class='ctx'>         epcm-&gt;channel_id=channel_id;</div><div class='hunk'>@@ -677,15 +656,17 @@ static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substre</div><div class='ctx'> </div><div class='ctx'> 	channel-&gt;use = 1;</div><div class='ctx'> 	/*</div><div class='del'>-        printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='ctx'> 	       channel_id, chip, channel);</div><div class='ctx'> 	*/</div><div class='ctx'>         //channel-&gt;interrupt = snd_ca0106_pcm_channel_interrupt;</div><div class='ctx'>         channel-&gt;epcm = epcm;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> 	//snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, &amp;hw_constraints_capture_period_sizes);</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -721,34 +702,6 @@ static int snd_ca0106_pcm_open_3_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return snd_ca0106_pcm_open_capture_channel(substream, 3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* hw_params callback */</div><div class='del'>-static int snd_ca0106_pcm_hw_params_playback(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_ca0106_pcm_hw_free_playback(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_params callback */</div><div class='del'>-static int snd_ca0106_pcm_hw_params_capture(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_ca0106_pcm_hw_free_capture(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* prepare playback callback */</div><div class='ctx'> static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='hunk'>@@ -756,7 +709,7 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_ca0106_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	int channel = epcm-&gt;channel_id;</div><div class='del'>-	u32 *table_base = (u32 *)(emu-&gt;buffer.area+(8*16*channel));</div><div class='add'>+	u32 *table_base = (u32 *)(emu-&gt;buffer-&gt;area+(8*16*channel));</div><div class='ctx'> 	u32 period_size_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='ctx'> 	u32 hcfg_mask = HCFG_PLAYBACK_S32_LE;</div><div class='ctx'> 	u32 hcfg_set = 0x00000000;</div><div class='hunk'>@@ -771,7 +724,7 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	</div><div class='ctx'> #if 0 /* debug */</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 		   "prepare:channel_number=%d, rate=%d, format=0x%x, "</div><div class='ctx'> 		   "channels=%d, buffer_size=%ld, period_size=%ld, "</div><div class='ctx'> 		   "periods=%u, frames_to_bytes=%d\n",</div><div class='hunk'>@@ -779,10 +732,12 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 		   runtime-&gt;channels, runtime-&gt;buffer_size,</div><div class='ctx'> 		   runtime-&gt;period_size, runtime-&gt;periods,</div><div class='ctx'> 		   frames_to_bytes(runtime, 1));</div><div class='del'>-	snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='ctx'> 		   runtime-&gt;dma_addr, runtime-&gt;dma_area, table_base);</div><div class='del'>-	snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='del'>-		   emu-&gt;buffer.addr, emu-&gt;buffer.area, emu-&gt;buffer.bytes);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='add'>+		   emu-&gt;buffer-&gt;addr, emu-&gt;buffer-&gt;area, emu-&gt;buffer-&gt;bytes);</div><div class='ctx'> #endif /* debug */</div><div class='ctx'> 	/* Rate can be set per channel. */</div><div class='ctx'> 	/* reg40 control host to fifo */</div><div class='hunk'>@@ -822,9 +777,9 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 		hcfg_set = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	hcfg = inl(emu-&gt;port + HCFG) ;</div><div class='add'>+	hcfg = inl(emu-&gt;port + CA0106_HCFG) ;</div><div class='ctx'> 	hcfg = (hcfg &amp; ~hcfg_mask) | hcfg_set;</div><div class='del'>-	outl(hcfg, emu-&gt;port + HCFG);</div><div class='add'>+	outl(hcfg, emu-&gt;port + CA0106_HCFG);</div><div class='ctx'> 	reg40 = snd_ca0106_ptr_read(emu, 0x40, 0);</div><div class='ctx'> 	reg40 = (reg40 &amp; ~reg40_mask) | reg40_set;</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, 0x40, 0, reg40);</div><div class='hunk'>@@ -832,13 +787,13 @@ static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 	reg71 = (reg71 &amp; ~reg71_mask) | reg71_set;</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, 0x71, 0, reg71);</div><div class='ctx'> </div><div class='del'>-	/* FIXME: Check emu-&gt;buffer.size before actually writing to it. */</div><div class='add'>+	/* FIXME: Check emu-&gt;buffer-&gt;size before actually writing to it. */</div><div class='ctx'>         for(i=0; i &lt; runtime-&gt;periods; i++) {</div><div class='ctx'> 		table_base[i*2] = runtime-&gt;dma_addr + (i * period_size_bytes);</div><div class='ctx'> 		table_base[i*2+1] = period_size_bytes &lt;&lt; 16;</div><div class='ctx'> 	}</div><div class='ctx'>  </div><div class='del'>-	snd_ca0106_ptr_write(emu, PLAYBACK_LIST_ADDR, channel, emu-&gt;buffer.addr+(8*16*channel));</div><div class='add'>+	snd_ca0106_ptr_write(emu, PLAYBACK_LIST_ADDR, channel, emu-&gt;buffer-&gt;addr+(8*16*channel));</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, PLAYBACK_LIST_SIZE, channel, (runtime-&gt;periods - 1) &lt;&lt; 19);</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, PLAYBACK_LIST_PTR, channel, 0);</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, PLAYBACK_DMA_ADDR, channel, runtime-&gt;dma_addr);</div><div class='hunk'>@@ -876,7 +831,7 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	u32 reg71;</div><div class='ctx'> 	</div><div class='ctx'> #if 0 /* debug */</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 		   "prepare:channel_number=%d, rate=%d, format=0x%x, "</div><div class='ctx'> 		   "channels=%d, buffer_size=%ld, period_size=%ld, "</div><div class='ctx'> 		   "periods=%u, frames_to_bytes=%d\n",</div><div class='hunk'>@@ -884,10 +839,12 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 		   runtime-&gt;channels, runtime-&gt;buffer_size,</div><div class='ctx'> 		   runtime-&gt;period_size, runtime-&gt;periods,</div><div class='ctx'> 		   frames_to_bytes(runtime, 1));</div><div class='del'>-        snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='ctx'> 		   runtime-&gt;dma_addr, runtime-&gt;dma_area, table_base);</div><div class='del'>-	snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='del'>-		   emu-&gt;buffer.addr, emu-&gt;buffer.area, emu-&gt;buffer.bytes);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='add'>+		   emu-&gt;buffer-&gt;addr, emu-&gt;buffer-&gt;area, emu-&gt;buffer-&gt;bytes);</div><div class='ctx'> #endif /* debug */</div><div class='ctx'> 	/* reg71 controls ADC rate. */</div><div class='ctx'> 	switch (runtime-&gt;rate) {</div><div class='hunk'>@@ -922,9 +879,9 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 		hcfg_set = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	hcfg = inl(emu-&gt;port + HCFG) ;</div><div class='add'>+	hcfg = inl(emu-&gt;port + CA0106_HCFG) ;</div><div class='ctx'> 	hcfg = (hcfg &amp; ~hcfg_mask) | hcfg_set;</div><div class='del'>-	outl(hcfg, emu-&gt;port + HCFG);</div><div class='add'>+	outl(hcfg, emu-&gt;port + CA0106_HCFG);</div><div class='ctx'> 	reg71 = snd_ca0106_ptr_read(emu, 0x71, 0);</div><div class='ctx'> 	reg71 = (reg71 &amp; ~reg71_mask) | reg71_set;</div><div class='ctx'> 	snd_ca0106_ptr_write(emu, 0x71, 0, reg71);</div><div class='hunk'>@@ -934,7 +891,7 @@ static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 	       "prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, "</div><div class='ctx'> 	       "buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",</div><div class='ctx'> 	       channel, runtime-&gt;rate, runtime-&gt;format, runtime-&gt;channels,</div><div class='hunk'>@@ -982,13 +939,13 @@ static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='ctx'> 		runtime = s-&gt;runtime;</div><div class='ctx'> 		epcm = runtime-&gt;private_data;</div><div class='ctx'> 		channel = epcm-&gt;channel_id;</div><div class='del'>-		/* snd_printk(KERN_DEBUG "channel=%d\n", channel); */</div><div class='add'>+		/* dev_dbg(emu-&gt;card-&gt;dev, "channel=%d\n", channel); */</div><div class='ctx'> 		epcm-&gt;running = running;</div><div class='ctx'> 		basic |= (0x1 &lt;&lt; channel);</div><div class='ctx'> 		extended |= (0x10 &lt;&lt; channel);</div><div class='ctx'>                 snd_pcm_trigger_done(s, substream);</div><div class='ctx'>         }</div><div class='del'>-	/* snd_printk(KERN_DEBUG "basic=0x%x, extended=0x%x\n",basic, extended); */</div><div class='add'>+	/* dev_dbg(emu-&gt;card-&gt;dev, "basic=0x%x, extended=0x%x\n",basic, extended); */</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -1070,7 +1027,7 @@ snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 			return ptr;</div><div class='ctx'> 		prev_ptr = ptr;</div><div class='ctx'> 	} while (--timeout);</div><div class='del'>-	snd_printk(KERN_WARNING "ca0106: unstable DMA pointer!\n");</div><div class='add'>+	dev_warn(emu-&gt;card-&gt;dev, "ca0106: unstable DMA pointer!\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1082,7 +1039,7 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_ca0106_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;</div><div class='del'>-	int channel = channel=epcm-&gt;channel_id;</div><div class='add'>+	int channel = epcm-&gt;channel_id;</div><div class='ctx'> </div><div class='ctx'> 	if (!epcm-&gt;running)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1093,7 +1050,7 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'>         if (ptr &gt;= runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr -= runtime-&gt;buffer_size;</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "</div><div class='ctx'> 	       "buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",</div><div class='ctx'> 	       ptr1, ptr2, ptr, (int)runtime-&gt;buffer_size,</div><div class='ctx'> 	       (int)runtime-&gt;period_size, (int)runtime-&gt;frame_bits,</div><div class='hunk'>@@ -1103,89 +1060,65 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operators */</div><div class='del'>-static struct snd_pcm_ops snd_ca0106_playback_front_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_playback_front_ops = {</div><div class='ctx'> 	.open =        snd_ca0106_pcm_open_playback_front,</div><div class='ctx'> 	.close =       snd_ca0106_pcm_close_playback,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_ca0106_pcm_hw_params_playback,</div><div class='del'>-	.hw_free =     snd_ca0106_pcm_hw_free_playback,</div><div class='ctx'> 	.prepare =     snd_ca0106_pcm_prepare_playback,</div><div class='ctx'> 	.trigger =     snd_ca0106_pcm_trigger_playback,</div><div class='ctx'> 	.pointer =     snd_ca0106_pcm_pointer_playback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_capture_0_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_capture_0_ops = {</div><div class='ctx'> 	.open =        snd_ca0106_pcm_open_0_capture,</div><div class='ctx'> 	.close =       snd_ca0106_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_ca0106_pcm_hw_params_capture,</div><div class='del'>-	.hw_free =     snd_ca0106_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_ca0106_pcm_prepare_capture,</div><div class='ctx'> 	.trigger =     snd_ca0106_pcm_trigger_capture,</div><div class='ctx'> 	.pointer =     snd_ca0106_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_capture_1_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_capture_1_ops = {</div><div class='ctx'> 	.open =        snd_ca0106_pcm_open_1_capture,</div><div class='ctx'> 	.close =       snd_ca0106_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_ca0106_pcm_hw_params_capture,</div><div class='del'>-	.hw_free =     snd_ca0106_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_ca0106_pcm_prepare_capture,</div><div class='ctx'> 	.trigger =     snd_ca0106_pcm_trigger_capture,</div><div class='ctx'> 	.pointer =     snd_ca0106_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_capture_2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_capture_2_ops = {</div><div class='ctx'> 	.open =        snd_ca0106_pcm_open_2_capture,</div><div class='ctx'> 	.close =       snd_ca0106_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_ca0106_pcm_hw_params_capture,</div><div class='del'>-	.hw_free =     snd_ca0106_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_ca0106_pcm_prepare_capture,</div><div class='ctx'> 	.trigger =     snd_ca0106_pcm_trigger_capture,</div><div class='ctx'> 	.pointer =     snd_ca0106_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_capture_3_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_capture_3_ops = {</div><div class='ctx'> 	.open =        snd_ca0106_pcm_open_3_capture,</div><div class='ctx'> 	.close =       snd_ca0106_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_ca0106_pcm_hw_params_capture,</div><div class='del'>-	.hw_free =     snd_ca0106_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_ca0106_pcm_prepare_capture,</div><div class='ctx'> 	.trigger =     snd_ca0106_pcm_trigger_capture,</div><div class='ctx'> 	.pointer =     snd_ca0106_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_playback_center_lfe_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_playback_center_lfe_ops = {</div><div class='ctx'>         .open =         snd_ca0106_pcm_open_playback_center_lfe,</div><div class='ctx'>         .close =        snd_ca0106_pcm_close_playback,</div><div class='del'>-        .ioctl =        snd_pcm_lib_ioctl,</div><div class='del'>-        .hw_params =    snd_ca0106_pcm_hw_params_playback,</div><div class='del'>-        .hw_free =      snd_ca0106_pcm_hw_free_playback,</div><div class='ctx'>         .prepare =      snd_ca0106_pcm_prepare_playback,     </div><div class='ctx'>         .trigger =      snd_ca0106_pcm_trigger_playback,  </div><div class='ctx'>         .pointer =      snd_ca0106_pcm_pointer_playback, </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_playback_unknown_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_playback_unknown_ops = {</div><div class='ctx'>         .open =         snd_ca0106_pcm_open_playback_unknown,</div><div class='ctx'>         .close =        snd_ca0106_pcm_close_playback,</div><div class='del'>-        .ioctl =        snd_pcm_lib_ioctl,</div><div class='del'>-        .hw_params =    snd_ca0106_pcm_hw_params_playback,</div><div class='del'>-        .hw_free =      snd_ca0106_pcm_hw_free_playback,</div><div class='ctx'>         .prepare =      snd_ca0106_pcm_prepare_playback,     </div><div class='ctx'>         .trigger =      snd_ca0106_pcm_trigger_playback,  </div><div class='ctx'>         .pointer =      snd_ca0106_pcm_pointer_playback, </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ca0106_playback_rear_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ca0106_playback_rear_ops = {</div><div class='ctx'>         .open =         snd_ca0106_pcm_open_playback_rear,</div><div class='ctx'>         .close =        snd_ca0106_pcm_close_playback,</div><div class='del'>-        .ioctl =        snd_pcm_lib_ioctl,</div><div class='del'>-        .hw_params =    snd_ca0106_pcm_hw_params_playback,</div><div class='del'>-		.hw_free =      snd_ca0106_pcm_hw_free_playback,</div><div class='ctx'>         .prepare =      snd_ca0106_pcm_prepare_playback,     </div><div class='ctx'>         .trigger =      snd_ca0106_pcm_trigger_playback,  </div><div class='ctx'>         .pointer =      snd_ca0106_pcm_pointer_playback, </div><div class='hunk'>@@ -1196,26 +1129,20 @@ static unsigned short snd_ca0106_ac97_read(struct snd_ac97 *ac97,</div><div class='ctx'> 					     unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short val;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='del'>-	val = inw(emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outb(reg, emu-&gt;port + CA0106_AC97ADDRESS);</div><div class='add'>+	return inw(emu-&gt;port + CA0106_AC97DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ca0106_ac97_write(struct snd_ac97 *ac97,</div><div class='ctx'> 				    unsigned short reg, unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'>   </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='del'>-	outw(val, emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outb(reg, emu-&gt;port + CA0106_AC97ADDRESS);</div><div class='add'>+	outw(val, emu-&gt;port + CA0106_AC97DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ca0106_ac97(struct snd_ca0106 *chip)</div><div class='hunk'>@@ -1223,12 +1150,13 @@ static int snd_ca0106_ac97(struct snd_ca0106 *chip)</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_ca0106_ac97_write,</div><div class='ctx'> 		.read = snd_ca0106_ac97_read,</div><div class='ctx'> 	};</div><div class='ctx'>   </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pbus-&gt;no_vra = 1; /* we don't need VRA */</div><div class='ctx'> </div><div class='hunk'>@@ -1240,32 +1168,11 @@ static int snd_ca0106_ac97(struct snd_ca0106 *chip)</div><div class='ctx'> </div><div class='ctx'> static void ca0106_stop_chip(struct snd_ca0106 *chip);</div><div class='ctx'> </div><div class='del'>-static int snd_ca0106_free(struct snd_ca0106 *chip)</div><div class='add'>+static void snd_ca0106_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (chip-&gt;res_port != NULL) {</div><div class='del'>-		/* avoid access to already used hardware */</div><div class='del'>-		ca0106_stop_chip(chip);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	// release the data</div><div class='del'>-#if 1</div><div class='del'>-	if (chip-&gt;buffer.area)</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;buffer);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	// release the i/o port</div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	struct snd_ca0106 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-static int snd_ca0106_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_ca0106 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_ca0106_free(chip);</div><div class='add'>+	ca0106_stop_chip(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -1278,15 +1185,15 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)</div><div class='ctx'>         unsigned int stat76;</div><div class='ctx'> 	struct snd_ca0106_channel *pchannel;</div><div class='ctx'> </div><div class='del'>-	status = inl(chip-&gt;port + IPR);</div><div class='add'>+	status = inl(chip-&gt;port + CA0106_IPR);</div><div class='ctx'> 	if (! status)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'>         stat76 = snd_ca0106_ptr_read(chip, EXTENDED_INT, 0);</div><div class='ctx'> 	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "interrupt status = 0x%08x, stat76=0x%08x\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "interrupt status = 0x%08x, stat76=0x%08x\n",</div><div class='ctx'> 		   status, stat76);</div><div class='del'>-	snd_printk(KERN_DEBUG "ptr=0x%08x\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "ptr=0x%08x\n",</div><div class='ctx'> 		   snd_ca0106_ptr_read(chip, PLAYBACK_POINTER, 0));</div><div class='ctx'> 	*/</div><div class='ctx'>         mask = 0x11; /* 0x1 for one half, 0x10 for the other half period. */</div><div class='hunk'>@@ -1296,11 +1203,13 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)</div><div class='ctx'> /* FIXME: Select the correct substream for period elapsed */</div><div class='ctx'> 			if(pchannel-&gt;use) {</div><div class='ctx'> 				snd_pcm_period_elapsed(pchannel-&gt;epcm-&gt;substream);</div><div class='del'>-				//printk(KERN_INFO "interrupt [%d] used\n", i);</div><div class='add'>+				/* dev_dbg(emu-&gt;card-&gt;dev, "interrupt [%d] used\n", i); */</div><div class='ctx'>                         }</div><div class='ctx'> 		}</div><div class='del'>-	        //printk(KERN_INFO "channel=%p\n",pchannel);</div><div class='del'>-	        //printk(KERN_INFO "interrupt stat76[%d] = %08x, use=%d, channel=%d\n", i, stat76, pchannel-&gt;use, pchannel-&gt;number);</div><div class='add'>+		/*</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "channel=%p\n", pchannel);</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "interrupt stat76[%d] = %08x, use=%d, channel=%d\n", i, stat76, pchannel-&gt;use, pchannel-&gt;number);</div><div class='add'>+		*/</div><div class='ctx'> 		mask &lt;&lt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'>         mask = 0x110000; /* 0x1 for one half, 0x10 for the other half period. */</div><div class='hunk'>@@ -1310,11 +1219,13 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)</div><div class='ctx'> /* FIXME: Select the correct substream for period elapsed */</div><div class='ctx'> 			if(pchannel-&gt;use) {</div><div class='ctx'> 				snd_pcm_period_elapsed(pchannel-&gt;epcm-&gt;substream);</div><div class='del'>-				//printk(KERN_INFO "interrupt [%d] used\n", i);</div><div class='add'>+				/* dev_dbg(emu-&gt;card-&gt;dev, "interrupt [%d] used\n", i); */</div><div class='ctx'>                         }</div><div class='ctx'> 		}</div><div class='del'>-	        //printk(KERN_INFO "channel=%p\n",pchannel);</div><div class='del'>-	        //printk(KERN_INFO "interrupt stat76[%d] = %08x, use=%d, channel=%d\n", i, stat76, pchannel-&gt;use, pchannel-&gt;number);</div><div class='add'>+		/*</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "channel=%p\n", pchannel);</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "interrupt stat76[%d] = %08x, use=%d, channel=%d\n", i, stat76, pchannel-&gt;use, pchannel-&gt;number);</div><div class='add'>+		*/</div><div class='ctx'> 		mask &lt;&lt;= 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1329,15 +1240,34 @@ static irqreturn_t snd_ca0106_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	// acknowledge the interrupt if necessary</div><div class='del'>-	outl(status, chip-&gt;port+IPR);</div><div class='add'>+	outl(status, chip-&gt;port + CA0106_IPR);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)</div><div class='add'>+static const struct snd_pcm_chmap_elem surround_map[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem clfe_map[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem side_map[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_ca0106_pcm(struct snd_ca0106 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='add'>+	const struct snd_pcm_chmap_elem *map = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'>   </div><div class='ctx'> 	err = snd_pcm_new(emu-&gt;card, "ca0106", device, 1, 1, &amp;pcm);</div><div class='hunk'>@@ -1350,51 +1280,56 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)</div><div class='ctx'> 	case 0:</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_ca0106_playback_front_ops);</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_ca0106_capture_0_ops);</div><div class='add'>+	  map = snd_pcm_std_chmaps;</div><div class='ctx'>           break;</div><div class='ctx'> 	case 1:</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_ca0106_playback_rear_ops);</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_ca0106_capture_1_ops);</div><div class='add'>+	  map = surround_map;</div><div class='ctx'>           break;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_ca0106_playback_center_lfe_ops);</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_ca0106_capture_2_ops);</div><div class='add'>+	  map = clfe_map;</div><div class='ctx'>           break;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_ca0106_playback_unknown_ops);</div><div class='ctx'> 	  snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_ca0106_capture_3_ops);</div><div class='add'>+	  map = side_map;</div><div class='ctx'>           break;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CA0106");</div><div class='add'>+	strscpy(pcm-&gt;name, "CA0106");</div><div class='ctx'> </div><div class='ctx'> 	for(substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; </div><div class='ctx'> 	    substream; </div><div class='ctx'> 	    substream = substream-&gt;next) {</div><div class='del'>-		if ((err = snd_pcm_lib_preallocate_pages(substream, </div><div class='del'>-							 SNDRV_DMA_TYPE_DEV, </div><div class='del'>-							 snd_dma_pci_data(emu-&gt;pci), </div><div class='del'>-							 64*1024, 64*1024)) &lt; 0) /* FIXME: 32*1024 for sound buffer, between 32and64 for Periods table. */</div><div class='del'>-			return err;</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					   64*1024, 64*1024);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream; </div><div class='ctx'> 	      substream; </div><div class='ctx'> 	      substream = substream-&gt;next) {</div><div class='del'>- 		if ((err = snd_pcm_lib_preallocate_pages(substream, </div><div class='del'>-	                                           SNDRV_DMA_TYPE_DEV, </div><div class='del'>-	                                           snd_dma_pci_data(emu-&gt;pci), </div><div class='del'>-	                                           64*1024, 64*1024)) &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					   64*1024, 64*1024);</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,</div><div class='add'>+				     1 &lt;&lt; 2, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	emu-&gt;pcm[device] = pcm;</div><div class='ctx'>   </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SPI_REG(reg, value)	(((reg) &lt;&lt; SPI_REG_SHIFT) | (value))</div><div class='del'>-static unsigned int spi_dac_init[] = {</div><div class='add'>+static const unsigned int spi_dac_init[] = {</div><div class='ctx'> 	SPI_REG(SPI_LDA1_REG,	SPI_DA_BIT_0dB), /* 0dB dig. attenuation */</div><div class='ctx'> 	SPI_REG(SPI_RDA1_REG,	SPI_DA_BIT_0dB),</div><div class='ctx'> 	SPI_REG(SPI_PL_REG,	SPI_PL_BIT_L_L | SPI_PL_BIT_R_R | SPI_IZD_BIT),</div><div class='hunk'>@@ -1412,7 +1347,7 @@ static unsigned int spi_dac_init[] = {</div><div class='ctx'> 	SPI_REG(SPI_DACD4_REG,	SPI_DACD4_BIT),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int i2c_adc_init[][2] = {</div><div class='add'>+static const unsigned int i2c_adc_init[][2] = {</div><div class='ctx'> 	{ 0x17, 0x00 }, /* Reset */</div><div class='ctx'> 	{ 0x07, 0x00 }, /* Timeout */</div><div class='ctx'> 	{ 0x0b, 0x22 },  /* Interface control */</div><div class='hunk'>@@ -1433,7 +1368,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)</div><div class='ctx'> 	int ch;</div><div class='ctx'> 	unsigned int def_bits;</div><div class='ctx'> </div><div class='del'>-	outl(0, chip-&gt;port + INTE);</div><div class='add'>+	outl(0, chip-&gt;port + CA0106_INTE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Init to 0x02109204 :</div><div class='hunk'>@@ -1470,8 +1405,8 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)</div><div class='ctx'>         snd_ca0106_ptr_write(chip, CAPTURE_MUTE, 0, 0x00fc0000);</div><div class='ctx'> </div><div class='ctx'>         /* Write 0x8000 to AC97_REC_GAIN to mute it. */</div><div class='del'>-        outb(AC97_REC_GAIN, chip-&gt;port + AC97ADDRESS);</div><div class='del'>-        outw(0x8000, chip-&gt;port + AC97DATA);</div><div class='add'>+        outb(AC97_REC_GAIN, chip-&gt;port + CA0106_AC97ADDRESS);</div><div class='add'>+        outw(0x8000, chip-&gt;port + CA0106_AC97DATA);</div><div class='ctx'> #if 0 /* FIXME: what are these? */</div><div class='ctx'> 	snd_ca0106_ptr_write(chip, SPCS0, 0, 0x2108006);</div><div class='ctx'> 	snd_ca0106_ptr_write(chip, 0x42, 0, 0x2108006);</div><div class='hunk'>@@ -1545,37 +1480,37 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)</div><div class='ctx'> 		/* FIXME: Still need to find out what the other GPIO bits do.</div><div class='ctx'> 		 * E.g. For digital spdif out.</div><div class='ctx'> 		 */</div><div class='del'>-		outl(0x0, chip-&gt;port+GPIO);</div><div class='del'>-		/* outl(0x00f0e000, chip-&gt;port+GPIO); */ /* Analog */</div><div class='del'>-		outl(0x005f5301, chip-&gt;port+GPIO); /* Analog */</div><div class='add'>+		outl(0x0, chip-&gt;port + CA0106_GPIO);</div><div class='add'>+		/* outl(0x00f0e000, chip-&gt;port + CA0106_GPIO); */ /* Analog */</div><div class='add'>+		outl(0x005f5301, chip-&gt;port + CA0106_GPIO); /* Analog */</div><div class='ctx'> 	} else if (chip-&gt;details-&gt;gpio_type == 1) {</div><div class='ctx'> 		/* The SB0410 and SB0413 use GPIO differently. */</div><div class='ctx'> 		/* FIXME: Still need to find out what the other GPIO bits do.</div><div class='ctx'> 		 * E.g. For digital spdif out.</div><div class='ctx'> 		 */</div><div class='del'>-		outl(0x0, chip-&gt;port+GPIO);</div><div class='del'>-		/* outl(0x00f0e000, chip-&gt;port+GPIO); */ /* Analog */</div><div class='del'>-		outl(0x005f5301, chip-&gt;port+GPIO); /* Analog */</div><div class='add'>+		outl(0x0, chip-&gt;port + CA0106_GPIO);</div><div class='add'>+		/* outl(0x00f0e000, chip-&gt;port + CA0106_GPIO); */ /* Analog */</div><div class='add'>+		outl(0x005f5301, chip-&gt;port + CA0106_GPIO); /* Analog */</div><div class='ctx'> 	} else {</div><div class='del'>-		outl(0x0, chip-&gt;port+GPIO);</div><div class='del'>-		outl(0x005f03a3, chip-&gt;port+GPIO); /* Analog */</div><div class='del'>-		/* outl(0x005f02a2, chip-&gt;port+GPIO); */ /* SPDIF */</div><div class='add'>+		outl(0x0, chip-&gt;port + CA0106_GPIO);</div><div class='add'>+		outl(0x005f03a3, chip-&gt;port + CA0106_GPIO); /* Analog */</div><div class='add'>+		/* outl(0x005f02a2, chip-&gt;port + CA0106_GPIO); */ /* SPDIF */</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ca0106_intr_enable(chip, 0x105); /* Win2000 uses 0x1e0 */</div><div class='ctx'> </div><div class='ctx'> 	/* outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip-&gt;port+HCFG); */</div><div class='ctx'> 	/* 0x1000 causes AC3 to fails. Maybe it effects 24 bit output. */</div><div class='del'>-	/* outl(0x00001409, chip-&gt;port+HCFG); */</div><div class='del'>-	/* outl(0x00000009, chip-&gt;port+HCFG); */</div><div class='add'>+	/* outl(0x00001409, chip-&gt;port + CA0106_HCFG); */</div><div class='add'>+	/* outl(0x00000009, chip-&gt;port + CA0106_HCFG); */</div><div class='ctx'> 	/* AC97 2.0, Enable outputs. */</div><div class='del'>-	outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip-&gt;port+HCFG);</div><div class='add'>+	outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip-&gt;port + CA0106_HCFG);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;details-&gt;i2c_adc == 1) {</div><div class='ctx'> 		/* The SB0410 and SB0413 use I2C to control ADC. */</div><div class='ctx'> 		int size, n;</div><div class='ctx'> </div><div class='ctx'> 		size = ARRAY_SIZE(i2c_adc_init);</div><div class='del'>-		/* snd_printk(KERN_DEBUG "I2C:array size=0x%x\n", size); */</div><div class='add'>+		/* dev_dbg(emu-&gt;card-&gt;dev, "I2C:array size=0x%x\n", size); */</div><div class='ctx'> 		for (n = 0; n &lt; size; n++)</div><div class='ctx'> 			snd_ca0106_i2c_write(chip, i2c_adc_init[n][0],</div><div class='ctx'> 					     i2c_adc_init[n][1]);</div><div class='hunk'>@@ -1610,84 +1545,65 @@ static void ca0106_stop_chip(struct snd_ca0106 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	snd_ca0106_ptr_write(chip, BASIC_INTERRUPT, 0, 0);</div><div class='del'>-	outl(0, chip-&gt;port + INTE);</div><div class='add'>+	outl(0, chip-&gt;port + CA0106_INTE);</div><div class='ctx'> 	snd_ca0106_ptr_write(chip, EXTENDED_INT_MASK, 0, 0);</div><div class='ctx'> 	udelay(1000);</div><div class='ctx'> 	/* disable audio */</div><div class='ctx'> 	/* outl(HCFG_LOCKSOUNDCACHE, chip-&gt;port + HCFG); */</div><div class='del'>-	outl(0, chip-&gt;port + HCFG);</div><div class='add'>+	outl(0, chip-&gt;port + CA0106_HCFG);</div><div class='ctx'> 	/* FIXME: We need to stop and DMA transfers here.</div><div class='ctx'> 	 *        But as I am not sure how yet, we cannot from the dma pages.</div><div class='ctx'> 	 * So we can fix: snd-malloc: Memory leak?  pages not freed = 8</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ca0106_create(int dev, struct snd_card *card,</div><div class='del'>-					 struct pci_dev *pci,</div><div class='del'>-					 struct snd_ca0106 **rchip)</div><div class='add'>+static int snd_ca0106_create(int dev, struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ca0106 *chip;</div><div class='del'>-	struct snd_ca0106_details *c;</div><div class='add'>+	struct snd_ca0106 *chip = card-&gt;private_data;</div><div class='add'>+	const struct snd_ca0106_details *c;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_ca0106_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "error to set 32bit mask DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+		dev_err(card-&gt;dev, "error to set 32bit mask DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;emu_lock);</div><div class='ctx'> </div><div class='add'>+	err = pcim_request_all_regions(pci, "snd_ca0106");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	chip-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;res_port = request_region(chip-&gt;port, 0x20, "snd_ca0106");</div><div class='del'>-	if (!chip-&gt;res_port) {</div><div class='del'>-		snd_ca0106_free(chip);</div><div class='del'>-		printk(KERN_ERR "cannot allocate the port\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_ca0106_interrupt,</div><div class='del'>-			IRQF_SHARED, "snd_ca0106", chip)) {</div><div class='del'>-		snd_ca0106_free(chip);</div><div class='del'>-		printk(KERN_ERR "cannot grab irq\n");</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_ca0106_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "cannot grab irq\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	/* This stores the periods table. */</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				1024, &amp;chip-&gt;buffer) &lt; 0) {</div><div class='del'>-		snd_ca0106_free(chip);</div><div class='add'>+	chip-&gt;buffer = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV, 1024);</div><div class='add'>+	if (!chip-&gt;buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	/* read serial */</div><div class='ctx'> 	pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &amp;chip-&gt;serial);</div><div class='ctx'> 	pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &amp;chip-&gt;model);</div><div class='del'>-	printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n",</div><div class='add'>+	dev_info(card-&gt;dev, "Model %04x Rev %08x Serial %08x\n",</div><div class='ctx'> 	       chip-&gt;model, pci-&gt;revision, chip-&gt;serial);</div><div class='del'>-	strcpy(card-&gt;driver, "CA0106");</div><div class='del'>-	strcpy(card-&gt;shortname, "CA0106");</div><div class='add'>+	strscpy(card-&gt;driver, "CA0106");</div><div class='add'>+	strscpy(card-&gt;shortname, "CA0106");</div><div class='ctx'> </div><div class='ctx'> 	for (c = ca0106_chip_details; c-&gt;serial; c++) {</div><div class='ctx'> 		if (subsystem[dev]) {</div><div class='hunk'>@@ -1698,7 +1614,7 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;details = c;</div><div class='ctx'> 	if (subsystem[dev]) {</div><div class='del'>-		printk(KERN_INFO "snd-ca0106: Sound card name=%s, "</div><div class='add'>+		dev_info(card-&gt;dev, "Sound card name=%s, "</div><div class='ctx'> 		       "subsystem=0x%x. Forced to subsystem=0x%x\n",</div><div class='ctx'> 		       c-&gt;name, chip-&gt;serial, subsystem[dev]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1707,13 +1623,6 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,</div><div class='ctx'> 		c-&gt;name, chip-&gt;port, chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	ca0106_init_chip(chip, 0);</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_ca0106_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1749,7 +1658,7 @@ static int ca0106_dev_id_port(void *dev_id)</div><div class='ctx'> 	return ((struct snd_ca0106 *)dev_id)-&gt;port;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int channel)</div><div class='add'>+static int snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi;</div><div class='ctx'> 	char *name;</div><div class='hunk'>@@ -1793,15 +1702,16 @@ static int __devinit snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int chann</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;dev_id = chip;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = ca_midi_init(chip, midi, 0, name)) &lt; 0)</div><div class='add'>+	err = ca_midi_init(chip, midi, 0, name);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ca0106_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_ca0106_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -1815,100 +1725,79 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	err = snd_ca0106_create(dev, card, pci, &amp;chip);</div><div class='add'>+	err = snd_ca0106_create(dev, card, pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='add'>+		return err;</div><div class='add'>+	card-&gt;private_free = snd_ca0106_free;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 4; i++) {</div><div class='ctx'> 		err = snd_ca0106_pcm(chip, i);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;details-&gt;ac97 == 1) {</div><div class='ctx'> 		/* The SB0410 and SB0413 do not have an AC97 chip. */</div><div class='ctx'> 		err = snd_ca0106_ac97(chip);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_ca0106_mixer(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("ca0106: probe for MIDI channel A ...");</div><div class='add'>+	dev_dbg(card-&gt;dev, "probe for MIDI channel A ...");</div><div class='ctx'> 	err = snd_ca0106_midi(chip, CA0106_MIDI_CHAN_A);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	snd_printdd(" done.\n");</div><div class='add'>+		return err;</div><div class='add'>+	dev_dbg(card-&gt;dev, " done.\n");</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> 	snd_ca0106_proc_init(chip);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_ca0106_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_ca0106_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_ca0106_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_ca0106_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int snd_ca0106_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ca0106 *chip = card-&gt;private_data;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='ctx'> 	if (chip-&gt;details-&gt;ac97)</div><div class='ctx'> 		snd_ac97_suspend(chip-&gt;ac97);</div><div class='ctx'> 	snd_ca0106_mixer_suspend(chip);</div><div class='ctx'> </div><div class='ctx'> 	ca0106_stop_chip(chip);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ca0106_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_ca0106_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ca0106 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	ca0106_init_chip(chip, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;details-&gt;ac97)</div><div class='hunk'>@@ -1922,38 +1811,28 @@ static int snd_ca0106_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(snd_ca0106_pm, snd_ca0106_suspend, snd_ca0106_resume);</div><div class='add'>+#define SND_CA0106_PM_OPS	&amp;snd_ca0106_pm</div><div class='add'>+#else</div><div class='add'>+#define SND_CA0106_PM_OPS	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> // PCI IDs</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_ca0106_ids) = {</div><div class='add'>+static const struct pci_device_id snd_ca0106_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CREATIVE, 0x0007), 0 },	/* Audigy LS or Live 24bit */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);</div><div class='ctx'> </div><div class='ctx'> // pci_driver definition</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "CA0106",</div><div class='add'>+static struct pci_driver ca0106_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_ca0106_ids,</div><div class='ctx'> 	.probe = snd_ca0106_probe,</div><div class='del'>-	.remove = __devexit_p(snd_ca0106_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_ca0106_suspend,</div><div class='del'>-	.resume = snd_ca0106_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = SND_CA0106_PM_OPS,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-// initialization of the module</div><div class='del'>-static int __init alsa_card_ca0106_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// clean up the module</div><div class='del'>-static void __exit alsa_card_ca0106_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ca0106_init)</div><div class='del'>-module_exit(alsa_card_ca0106_exit)</div><div class='add'>+module_pci_driver(ca0106_driver);</div><div class='head'>diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c<br/>index 630aa4998189..f7b6b2db889b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_mixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_mixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca0106_mixer.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 2004 James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit</div><div class='hunk'>@@ -42,23 +43,8 @@</div><div class='ctx'>  *  0.0.18</div><div class='ctx'>  *    Add support for mute control on SB Live 24bit (cards w/ SPI DAC)</div><div class='ctx'>  *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -70,7 +56,7 @@</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ca0106.h"</div><div class='ctx'> </div><div class='hunk'>@@ -84,8 +70,8 @@ static void ca0106_spdif_enable(struct snd_ca0106 *emu)</div><div class='ctx'> 		snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x0b000000);</div><div class='ctx'> 		val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) &amp; ~0x1000;</div><div class='ctx'> 		snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val);</div><div class='del'>-		val = inl(emu-&gt;port + GPIO) &amp; ~0x101;</div><div class='del'>-		outl(val, emu-&gt;port + GPIO);</div><div class='add'>+		val = inl(emu-&gt;port + CA0106_GPIO) &amp; ~0x101;</div><div class='add'>+		outl(val, emu-&gt;port + CA0106_GPIO);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Analog */</div><div class='hunk'>@@ -93,8 +79,8 @@ static void ca0106_spdif_enable(struct snd_ca0106 *emu)</div><div class='ctx'> 		snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);</div><div class='ctx'> 		val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000;</div><div class='ctx'> 		snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val);</div><div class='del'>-		val = inl(emu-&gt;port + GPIO) | 0x101;</div><div class='del'>-		outl(val, emu-&gt;port + GPIO);</div><div class='add'>+		val = inl(emu-&gt;port + CA0106_GPIO) | 0x101;</div><div class='add'>+		outl(val, emu-&gt;port + CA0106_GPIO);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -133,14 +119,14 @@ static void ca0106_set_capture_mic_line_in(struct snd_ca0106 *emu)</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;capture_mic_line_in) {</div><div class='ctx'> 		/* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */</div><div class='del'>-		tmp = inl(emu-&gt;port+GPIO) &amp; ~0x400;</div><div class='add'>+		tmp = inl(emu-&gt;port + CA0106_GPIO) &amp; ~0x400;</div><div class='ctx'> 		tmp = tmp | 0x400;</div><div class='del'>-		outl(tmp, emu-&gt;port+GPIO);</div><div class='add'>+		outl(tmp, emu-&gt;port + CA0106_GPIO);</div><div class='ctx'> 		/* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC); */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */</div><div class='del'>-		tmp = inl(emu-&gt;port+GPIO) &amp; ~0x400;</div><div class='del'>-		outl(tmp, emu-&gt;port+GPIO);</div><div class='add'>+		tmp = inl(emu-&gt;port + CA0106_GPIO) &amp; ~0x400;</div><div class='add'>+		outl(tmp, emu-&gt;port + CA0106_GPIO);</div><div class='ctx'> 		/* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN); */</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -185,17 +171,11 @@ static int snd_ca0106_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_ca0106_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[6] = {</div><div class='add'>+	static const char * const texts[6] = {</div><div class='ctx'> 		"IEC958 out", "i2s mixer out", "IEC958 in", "i2s in", "AC97 in", "SRC out"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 6;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 5)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 5;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 6, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ca0106_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -228,17 +208,11 @@ static int snd_ca0106_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_ca0106_i2c_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[6] = {</div><div class='add'>+	static const char * const texts[4] = {</div><div class='ctx'> 		"Phone", "Mic", "Line in", "Aux"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ca0106_i2c_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -273,29 +247,17 @@ static int snd_ca0106_i2c_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_ca0106_capture_line_in_side_out_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Side out", "Line in" };</div><div class='add'>+	static const char * const texts[2] = { "Side out", "Line in" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ca0106_capture_mic_line_in_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Line in", "Mic in" };</div><div class='add'>+	static const char * const texts[2] = { "Line in", "Mic in" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ca0106_capture_mic_line_in_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -325,7 +287,7 @@ static int snd_ca0106_capture_mic_line_in_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>         return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ca0106_capture_mic_line_in __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ca0106_capture_mic_line_in =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Shared Mic/Line in Capture Switch",</div><div class='hunk'>@@ -334,7 +296,7 @@ static struct snd_kcontrol_new snd_ca0106_capture_mic_line_in __devinitdata =</div><div class='ctx'> 	.put =		snd_ca0106_capture_mic_line_in_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ca0106_capture_line_in_side_out __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ca0106_capture_line_in_side_out =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Shared Line in/Side out Capture Switch",</div><div class='hunk'>@@ -588,7 +550,7 @@ static int spi_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	.private_value = ((chid) &lt;&lt; 8) | (reg)			\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ca0106_volume_ctls[] = {</div><div class='ctx'> 	CA_VOLUME("Analog Front Playback Volume",</div><div class='ctx'> 		  CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2),</div><div class='ctx'>         CA_VOLUME("Analog Rear Playback Volume",</div><div class='hunk'>@@ -669,7 +631,7 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {</div><div class='ctx'> 	.private_value = chid					\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ca0106_volume_i2c_adc_ctls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ca0106_volume_i2c_adc_ctls[] = {</div><div class='ctx'>         I2C_VOLUME("Phone Capture Volume", 0),</div><div class='ctx'>         I2C_VOLUME("Mic Capture Volume", 1),</div><div class='ctx'>         I2C_VOLUME("Line in Capture Volume", 2),</div><div class='hunk'>@@ -691,8 +653,8 @@ static const int spi_dmute_bit[] = {</div><div class='ctx'> 	SPI_DMUTE4_BIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new __devinit</div><div class='del'>-snd_ca0106_volume_spi_dac_ctl(struct snd_ca0106_details *details,</div><div class='add'>+static struct snd_kcontrol_new</div><div class='add'>+snd_ca0106_volume_spi_dac_ctl(const struct snd_ca0106_details *details,</div><div class='ctx'> 			      int channel_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_kcontrol_new spi_switch = {0};</div><div class='hunk'>@@ -735,30 +697,20 @@ snd_ca0106_volume_spi_dac_ctl(struct snd_ca0106_details *details,</div><div class='ctx'> 	return spi_switch;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit remove_ctl(struct snd_card *card, const char *name)</div><div class='add'>+static int remove_ctl(struct snd_card *card, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_id id;</div><div class='ctx'> 	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	strcpy(id.name, name);</div><div class='add'>+	strscpy(id.name, name);</div><div class='ctx'> 	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	return snd_ctl_remove_id(card, &amp;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card, const char *name)</div><div class='add'>+static int rename_ctl(struct snd_card *card, const char *src, const char *dst)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ctl_elem_id sid;</div><div class='del'>-	memset(&amp;sid, 0, sizeof(sid));</div><div class='del'>-	/* FIXME: strcpy is bad. */</div><div class='del'>-	strcpy(sid.name, name);</div><div class='del'>-	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	return snd_ctl_find_id(card, &amp;sid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit rename_ctl(struct snd_card *card, const char *src, const char *dst)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol *kctl = ctl_find(card, src);</div><div class='add'>+	struct snd_kcontrol *kctl = snd_ctl_find_id_mixer(card, src);</div><div class='ctx'> 	if (kctl) {</div><div class='del'>-		strcpy(kctl-&gt;id.name, dst);</div><div class='add'>+		snd_ctl_rename(card, kctl, dst);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOENT;</div><div class='hunk'>@@ -774,10 +726,10 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch</div><div class='ctx'> 		}							\</div><div class='ctx'> 	} while (0)</div><div class='ctx'> </div><div class='del'>-static __devinitdata</div><div class='add'>+static</div><div class='ctx'> DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1);</div><div class='ctx'> </div><div class='del'>-static char *slave_vols[] __devinitdata = {</div><div class='add'>+static const char * const follower_vols[] = {</div><div class='ctx'> 	"Analog Front Playback Volume",</div><div class='ctx'>         "Analog Rear Playback Volume",</div><div class='ctx'> 	"Analog Center/LFE Playback Volume",</div><div class='hunk'>@@ -790,7 +742,7 @@ static char *slave_vols[] __devinitdata = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *slave_sws[] __devinitdata = {</div><div class='add'>+static const char * const follower_sws[] = {</div><div class='ctx'> 	"Analog Front Playback Switch",</div><div class='ctx'> 	"Analog Rear Playback Switch",</div><div class='ctx'> 	"Analog Center/LFE Playback Switch",</div><div class='hunk'>@@ -799,23 +751,13 @@ static char *slave_sws[] __devinitdata = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit add_slaves(struct snd_card *card,</div><div class='del'>-				 struct snd_kcontrol *master, char **list)</div><div class='del'>-{</div><div class='del'>-	for (; *list; list++) {</div><div class='del'>-		struct snd_kcontrol *slave = ctl_find(card, *list);</div><div class='del'>-		if (slave)</div><div class='del'>-			snd_ctl_add_slave(master, slave);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)</div><div class='add'>+int snd_ca0106_mixer(struct snd_ca0106 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'>         struct snd_card *card = emu-&gt;card;</div><div class='del'>-	char **c;</div><div class='add'>+	const char * const *c;</div><div class='ctx'> 	struct snd_kcontrol *vmaster;</div><div class='del'>-	static char *ca0106_remove_ctls[] = {</div><div class='add'>+	static const char * const ca0106_remove_ctls[] = {</div><div class='ctx'> 		"Master Mono Playback Switch",</div><div class='ctx'> 		"Master Mono Playback Volume",</div><div class='ctx'> 		"3D Control - Switch",</div><div class='hunk'>@@ -839,7 +781,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)</div><div class='ctx'> 		"Surround Phase Inversion Playback Switch",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *ca0106_rename_ctls[] = {</div><div class='add'>+	static const char * const ca0106_rename_ctls[] = {</div><div class='ctx'> 		"Master Playback Switch", "Capture Switch",</div><div class='ctx'> 		"Master Playback Volume", "Capture Volume",</div><div class='ctx'> 		"Line Playback Switch", "AC97 Line Capture Switch",</div><div class='hunk'>@@ -890,7 +832,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)</div><div class='ctx'> 	err = snd_ctl_add(card, vmaster);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	add_slaves(card, vmaster, slave_vols);</div><div class='add'>+	err = snd_ctl_add_followers(card, vmaster, follower_vols);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;details-&gt;spi_dac) {</div><div class='ctx'> 		vmaster = snd_ctl_make_virtual_master("Master Playback Switch",</div><div class='hunk'>@@ -900,20 +844,22 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)</div><div class='ctx'> 		err = snd_ctl_add(card, vmaster);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		add_slaves(card, vmaster, slave_sws);</div><div class='add'>+		err = snd_ctl_add_followers(card, vmaster, follower_sws);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, "CA0106");</div><div class='add'>+	strscpy(card-&gt;mixername, "CA0106");</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> struct ca0106_vol_tbl {</div><div class='ctx'> 	unsigned int channel_id;</div><div class='ctx'> 	unsigned int reg;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ca0106_vol_tbl saved_volumes[NUM_SAVED_VOLUMES] = {</div><div class='add'>+static const struct ca0106_vol_tbl saved_volumes[NUM_SAVED_VOLUMES] = {</div><div class='ctx'> 	{ CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2 },</div><div class='ctx'> 	{ CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME2 },</div><div class='ctx'> 	{ CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME2 },</div><div class='hunk'>@@ -953,4 +899,4 @@ void snd_ca0106_mixer_resume(struct snd_ca0106  *chip)</div><div class='ctx'> 	if (chip-&gt;details-&gt;i2c_adc)</div><div class='ctx'> 		ca0106_set_capture_mic_line_in(chip);</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='head'>diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c<br/>index ba96428c9f4c..c181e4954579 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_proc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca0106_proc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca0106_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca0106_proc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) 2004 James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit</div><div class='hunk'>@@ -42,47 +43,30 @@</div><div class='ctx'>  *  0.0.18</div><div class='ctx'>  *    Implement support for Line-in capture on SB Live 24bit.</div><div class='ctx'>  *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ca0106.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='ctx'> struct snd_ca0106_category_str {</div><div class='ctx'> 	int val;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ca0106_category_str snd_ca0106_con_category[] = {</div><div class='add'>+static const struct snd_ca0106_category_str snd_ca0106_con_category[] = {</div><div class='ctx'> 	{ IEC958_AES1_CON_DAT, "DAT" },</div><div class='ctx'> 	{ IEC958_AES1_CON_VCR, "VCR" },</div><div class='ctx'> 	{ IEC958_AES1_CON_MICROPHONE, "microphone" },</div><div class='hunk'>@@ -297,16 +281,14 @@ static void snd_ca0106_proc_reg_write32(struct snd_info_entry *entry,</div><div class='ctx'> 				       struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = entry-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'>         char line[64];</div><div class='ctx'>         u32 reg, val;</div><div class='ctx'>         while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'>                 if (sscanf(line, "%x %x", &amp;reg, &amp;val) != 2)</div><div class='ctx'>                         continue;</div><div class='ctx'> 		if (reg &lt; 0x40 &amp;&amp; val &lt;= 0xffffffff) {</div><div class='del'>-			spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+			guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 			outl(val, emu-&gt;port + (reg &amp; 0xfffffffc));</div><div class='del'>-			spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='hunk'>@@ -316,13 +298,13 @@ static void snd_ca0106_proc_reg_read32(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = entry-&gt;private_data;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer, "Registers:\n\n");</div><div class='ctx'> 	for(i = 0; i &lt; 0x20; i+=4) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		value = inl(emu-&gt;port + i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;emu-&gt;emu_lock) {</div><div class='add'>+			value = inl(emu-&gt;port + i);</div><div class='add'>+		}</div><div class='ctx'> 		snd_iprintf(buffer, "Register %02X: %08lX\n", i, value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -332,13 +314,13 @@ static void snd_ca0106_proc_reg_read16(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = entry-&gt;private_data;</div><div class='ctx'>         unsigned int value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer, "Registers:\n\n");</div><div class='ctx'> 	for(i = 0; i &lt; 0x20; i+=2) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		value = inw(emu-&gt;port + i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;emu-&gt;emu_lock) {</div><div class='add'>+			value = inw(emu-&gt;port + i);</div><div class='add'>+		}</div><div class='ctx'> 		snd_iprintf(buffer, "Register %02X: %04X\n", i, value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -348,13 +330,13 @@ static void snd_ca0106_proc_reg_read8(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca0106 *emu = entry-&gt;private_data;</div><div class='ctx'> 	unsigned int value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer, "Registers:\n\n");</div><div class='ctx'> 	for(i = 0; i &lt; 0x20; i+=1) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		value = inb(emu-&gt;port + i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;emu-&gt;emu_lock) {</div><div class='add'>+			value = inb(emu-&gt;port + i);</div><div class='add'>+		}</div><div class='ctx'> 		snd_iprintf(buffer, "Register %02X: %02X\n", i, value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -424,34 +406,22 @@ static void snd_ca0106_proc_i2c_write(struct snd_info_entry *entry,</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ca0106_proc_init(struct snd_ca0106 * emu)</div><div class='add'>+int snd_ca0106_proc_init(struct snd_ca0106 *emu)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "iec958", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_iec958);</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_reg32", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read32);</div><div class='del'>-		entry-&gt;c.text.write = snd_ca0106_proc_reg_write32;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_reg16", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read16);</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_reg8", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read8);</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_regs1", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read1);</div><div class='del'>-		entry-&gt;c.text.write = snd_ca0106_proc_reg_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_i2c", &amp;entry)) {</div><div class='del'>-		entry-&gt;c.text.write = snd_ca0106_proc_i2c_write;</div><div class='del'>-		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "ca0106_regs2", &amp;entry)) </div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_ca0106_proc_reg_read2);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "iec958", emu, snd_ca0106_proc_iec958);</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "ca0106_reg32", emu,</div><div class='add'>+			     snd_ca0106_proc_reg_read32,</div><div class='add'>+			     snd_ca0106_proc_reg_write32);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "ca0106_reg16", emu,</div><div class='add'>+			     snd_ca0106_proc_reg_read16);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "ca0106_reg8", emu,</div><div class='add'>+			     snd_ca0106_proc_reg_read8);</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "ca0106_regs1", emu,</div><div class='add'>+			     snd_ca0106_proc_reg_read1,</div><div class='add'>+			     snd_ca0106_proc_reg_write);</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "ca0106_i2c", emu, NULL,</div><div class='add'>+			     snd_ca0106_proc_i2c_write);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "ca0106_regs2", emu,</div><div class='add'>+			     snd_ca0106_proc_reg_read2);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='head'>diff --git a/sound/pci/ca0106/ca_midi.c b/sound/pci/ca0106/ca_midi.c<br/>index c7885117da33..6efd93abddb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca_midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca_midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca_midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca_midi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* </div><div class='ctx'>  *  Copyright 10/16/2005 Tilman Kranz &lt;tilde@tk-sls.de&gt;</div><div class='ctx'>  *  Creative Audio MIDI, for the CA0106 Driver</div><div class='hunk'>@@ -8,22 +9,6 @@</div><div class='ctx'>  *    tested with ca0106.</div><div class='ctx'>  *    mpu401: Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *    emu10k1x: Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -46,7 +31,7 @@ static void ca_midi_clear_rx(struct snd_ca_midi *midi)</div><div class='ctx'> 		ca_midi_read_data(midi);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (timeout &lt;= 0)</div><div class='del'>-		snd_printk(KERN_ERR "ca_midi_clear_rx: timeout (status = 0x%x)\n",</div><div class='add'>+		pr_err("ca_midi_clear_rx: timeout (status = 0x%x)\n",</div><div class='ctx'> 			   ca_midi_read_stat(midi));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -60,60 +45,56 @@ static void ca_midi_interrupt(struct snd_ca_midi *midi, unsigned int status)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;input_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; ca_midi_input_avail(midi)) {</div><div class='del'>-		if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)) {</div><div class='del'>-			ca_midi_clear_rx(midi);</div><div class='del'>-		} else {</div><div class='del'>-			byte = ca_midi_read_data(midi);</div><div class='del'>-			if(midi-&gt;substream_input)</div><div class='del'>-				snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;input_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; ca_midi_input_avail(midi)) {</div><div class='add'>+			if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)) {</div><div class='add'>+				ca_midi_clear_rx(midi);</div><div class='add'>+			} else {</div><div class='add'>+				byte = ca_midi_read_data(midi);</div><div class='add'>+				if (midi-&gt;substream_input)</div><div class='add'>+					snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;input_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;output_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; ca_midi_output_ready(midi)) {</div><div class='del'>-		if (midi-&gt;substream_output &amp;&amp;</div><div class='del'>-		    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='del'>-			ca_midi_write_data(midi, byte);</div><div class='del'>-		} else {</div><div class='del'>-			midi-&gt;interrupt_disable(midi,midi-&gt;tx_enable);</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;output_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; ca_midi_output_ready(midi)) {</div><div class='add'>+			if (midi-&gt;substream_output &amp;&amp;</div><div class='add'>+			    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='add'>+				ca_midi_write_data(midi, byte);</div><div class='add'>+			} else {</div><div class='add'>+				midi-&gt;interrupt_disable(midi, midi-&gt;tx_enable);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;output_lock);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ca_midi_cmd(struct snd_ca_midi *midi, unsigned char cmd, int ack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int timeout, ok;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;input_lock, flags);</div><div class='del'>-	ca_midi_write_data(midi, 0x00);</div><div class='del'>-	/* ca_midi_clear_rx(midi); */</div><div class='del'>-</div><div class='del'>-	ca_midi_write_cmd(midi, cmd);</div><div class='del'>-	if (ack) {</div><div class='del'>-		ok = 0;</div><div class='del'>-		timeout = 10000;</div><div class='del'>-		while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='del'>-			if (ca_midi_input_avail(midi)) {</div><div class='del'>-				if (ca_midi_read_data(midi) == midi-&gt;ack)</div><div class='del'>-					ok = 1;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;input_lock) {</div><div class='add'>+		ca_midi_write_data(midi, 0x00);</div><div class='add'>+		/* ca_midi_clear_rx(midi); */</div><div class='add'>+</div><div class='add'>+		ca_midi_write_cmd(midi, cmd);</div><div class='add'>+		if (ack) {</div><div class='add'>+			ok = 0;</div><div class='add'>+			timeout = 10000;</div><div class='add'>+			while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='add'>+				if (ca_midi_input_avail(midi)) {</div><div class='add'>+					if (ca_midi_read_data(midi) == midi-&gt;ack)</div><div class='add'>+						ok = 1;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		if (!ok &amp;&amp; ca_midi_read_data(midi) == midi-&gt;ack)</div><div class='add'>+			if (!ok &amp;&amp; ca_midi_read_data(midi) == midi-&gt;ack)</div><div class='add'>+				ok = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			ok = 1;</div><div class='del'>-	} else {</div><div class='del'>-		ok = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;midi-&gt;input_lock, flags);</div><div class='ctx'> 	if (!ok)</div><div class='del'>-		snd_printk(KERN_ERR "ca_midi_cmd: 0x%x failed at 0x%x (status = 0x%x, data = 0x%x)!!!\n",</div><div class='add'>+		pr_err("ca_midi_cmd: 0x%x failed at 0x%x (status = 0x%x, data = 0x%x)!!!\n",</div><div class='ctx'> 			   cmd,</div><div class='ctx'> 			   midi-&gt;get_dev_id_port(midi-&gt;dev_id),</div><div class='ctx'> 			   ca_midi_read_stat(midi),</div><div class='hunk'>@@ -123,83 +104,69 @@ static void ca_midi_cmd(struct snd_ca_midi *midi, unsigned char cmd, int ack)</div><div class='ctx'> static int ca_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='ctx'> 	if (snd_BUG_ON(!midi-&gt;dev_id))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= CA_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;reset, 1);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;enter_uart, 1);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= CA_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;reset, 1);</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;enter_uart, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ca_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!midi-&gt;dev_id))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= CA_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;reset, 1);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;enter_uart, 1);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= CA_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;reset, 1);</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;enter_uart, 1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ca_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!midi-&gt;dev_id))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;interrupt_disable(midi,midi-&gt;rx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~CA_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = NULL;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;reset, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;interrupt_disable(midi, midi-&gt;rx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~CA_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;reset, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ca_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!midi-&gt;dev_id))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-</div><div class='del'>-	midi-&gt;interrupt_disable(midi,midi-&gt;tx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~CA_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = NULL;</div><div class='del'>-	</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		ca_midi_cmd(midi, midi-&gt;reset, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;interrupt_disable(midi, midi-&gt;tx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~CA_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; CA_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	ca_midi_cmd(midi, midi-&gt;reset, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +187,6 @@ static void ca_midi_input_trigger(struct snd_rawmidi_substream *substream, int u</div><div class='ctx'> static void ca_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ca_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!midi-&gt;dev_id))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -229,25 +195,23 @@ static void ca_midi_output_trigger(struct snd_rawmidi_substream *substream, int</div><div class='ctx'> 		int max = 4;</div><div class='ctx'> 		unsigned char byte;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;midi-&gt;output_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;midi-&gt;output_lock) {</div><div class='ctx'> 	</div><div class='del'>-		/* try to send some amount of bytes here before interrupts */</div><div class='del'>-		while (max &gt; 0) {</div><div class='del'>-			if (ca_midi_output_ready(midi)) {</div><div class='del'>-				if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT) ||</div><div class='del'>-				    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='del'>-					/* no more data */</div><div class='del'>-					spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='del'>-					return;</div><div class='add'>+			/* try to send some amount of bytes here before interrupts */</div><div class='add'>+			while (max &gt; 0) {</div><div class='add'>+				if (ca_midi_output_ready(midi)) {</div><div class='add'>+					if (!(midi-&gt;midi_mode &amp; CA_MIDI_MODE_OUTPUT) ||</div><div class='add'>+					    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='add'>+						/* no more data */</div><div class='add'>+						return;</div><div class='add'>+					}</div><div class='add'>+					ca_midi_write_data(midi, byte);</div><div class='add'>+					max--;</div><div class='add'>+				} else {</div><div class='add'>+					break;</div><div class='ctx'> 				}</div><div class='del'>-				ca_midi_write_data(midi, byte);</div><div class='del'>-				max--;</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='ctx'> 		midi-&gt;interrupt_enable(midi,midi-&gt;tx_enable);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -255,14 +219,14 @@ static void ca_midi_output_trigger(struct snd_rawmidi_substream *substream, int</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops ca_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops ca_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		ca_midi_output_open,</div><div class='ctx'> 	.close =	ca_midi_output_close,</div><div class='ctx'> 	.trigger =	ca_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops ca_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops ca_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		ca_midi_input_open,</div><div class='ctx'> 	.close =	ca_midi_input_close,</div><div class='hunk'>@@ -286,12 +250,13 @@ static void ca_rmidi_free(struct snd_rawmidi *rmidi)</div><div class='ctx'> 	ca_midi_free(rmidi-&gt;private_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit ca_midi_init(void *dev_id, struct snd_ca_midi *midi, int device, char *name)</div><div class='add'>+int ca_midi_init(void *dev_id, struct snd_ca_midi *midi, int device, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_rawmidi_new(midi-&gt;get_dev_id_card(midi-&gt;dev_id), name, device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(midi-&gt;get_dev_id_card(midi-&gt;dev_id), name, device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;dev_id = dev_id;</div><div class='hunk'>@@ -301,7 +266,7 @@ int __devinit ca_midi_init(void *dev_id, struct snd_ca_midi *midi, int device, c</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;input_lock);</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;output_lock);</div><div class='ctx'> </div><div class='del'>-	strcpy(rmidi-&gt;name, name);</div><div class='add'>+	strscpy(rmidi-&gt;name, name);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;ca_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;ca_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='head'>diff --git a/sound/pci/ca0106/ca_midi.h b/sound/pci/ca0106/ca_midi.h<br/>index 922ed3e3731e..1d0476c8af62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca_midi.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ca0106/ca_midi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ca0106/ca_midi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ca0106/ca_midi.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /* </div><div class='ctx'>  *  Copyright 10/16/2005 Tilman Kranz &lt;tilde@tk-sls.de&gt;</div><div class='ctx'>  *  Creative Audio MIDI, for the CA0106 Driver</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  Changelog:</div><div class='ctx'>  *    See ca_midi.c</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='head'>diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c<br/>index 329968edca9b..0666be543474 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cmipci.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cmipci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cmipci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cmipci.c</a></div><div class='hunk'>@@ -1,33 +1,20 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for C-Media CMI8338 and 8738 PCI soundcards.</div><div class='ctx'>  * Copyright (c) 2000 by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'>  </div><div class='ctx'> /* Does not work. Warning may block system in capture mode */</div><div class='ctx'> /* #define USE_VAR48KRATE */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -43,21 +30,17 @@</div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("C-Media CMI8x38 PCI");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8738},"</div><div class='del'>-		"{C-Media,CMI8738B},"</div><div class='del'>-		"{C-Media,CMI8338A},"</div><div class='del'>-		"{C-Media,CMI8338B}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_JOYSTICK 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='del'>-static long mpu_port[SNDRV_CARDS];</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='add'>+static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};</div><div class='ctx'> static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};</div><div class='del'>-static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};</div><div class='add'>+static bool soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> static int joystick_port[SNDRV_CARDS];</div><div class='ctx'> #endif</div><div class='hunk'>@@ -68,14 +51,14 @@ module_param_array(id, charp, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for C-Media PCI soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable C-Media PCI soundcard.");</div><div class='del'>-module_param_array(mpu_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mpu_port, "MPU-401 port.");</div><div class='del'>-module_param_array(fm_port, long, NULL, 0444);</div><div class='add'>+module_param_hw_array(fm_port, long, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(fm_port, "FM port.");</div><div class='ctx'> module_param_array(soft_ac3, bool, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(soft_ac3, "Sofware-conversion of raw SPDIF packets (model 033 only).");</div><div class='add'>+MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-module_param_array(joystick_port, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(joystick_port, int, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_port, "Joystick port address.");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -315,7 +298,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");</div><div class='ctx'> #define CM_MICGAINZ		0x01	/* mic boost */</div><div class='ctx'> #define CM_MICGAINZ_SHIFT	0</div><div class='ctx'> </div><div class='del'>-#define CM_REG_MIXER3		0x24</div><div class='ctx'> #define CM_REG_AUX_VOL		0x26</div><div class='ctx'> #define CM_VAUXL_MASK		0xf0</div><div class='ctx'> #define CM_VAUXR_MASK		0x0f</div><div class='hunk'>@@ -504,10 +486,8 @@ struct cmipci {</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	unsigned int saved_regs[0x20];</div><div class='ctx'> 	unsigned char saved_mixers[0x20];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -599,7 +579,7 @@ static int snd_cmipci_clear_bit_b(struct cmipci *cm, unsigned int cmd, unsigned</div><div class='ctx'>  * calculate frequency</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 };</div><div class='add'>+static const unsigned int rates[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 48000 };</div><div class='ctx'> </div><div class='ctx'> static unsigned int snd_cmipci_rate_freq(unsigned int rate)</div><div class='ctx'> {</div><div class='hunk'>@@ -656,8 +636,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff</div><div class='del'>- * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen</div><div class='add'>+ * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff</div><div class='add'>+ * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen</div><div class='ctx'>  * at the register CM_REG_FUNCTRL1 (0x04).</div><div class='ctx'>  * Problem: other ways are also possible (any information about that?)</div><div class='ctx'>  */</div><div class='hunk'>@@ -666,7 +646,7 @@ static void snd_cmipci_set_pll(struct cmipci *cm, unsigned int rate, unsigned in</div><div class='ctx'> 	unsigned int reg = CM_REG_PLL + slot;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Guess that this programs at reg. 0x04 the pos 15:13/12:10</div><div class='del'>-	 * for DSFC/ASFC (000 upto 111).</div><div class='add'>+	 * for DSFC/ASFC (000 up to 111).</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: Init (Do we've to set an other register first before programming?) */</div><div class='hunk'>@@ -679,27 +659,18 @@ static void snd_cmipci_set_pll(struct cmipci *cm, unsigned int rate, unsigned in</div><div class='ctx'> }</div><div class='ctx'> #endif /* USE_VAR48KRATE */</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_cmipci_playback2_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 					  struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	if (params_channels(hw_params) &gt; 2) {</div><div class='del'>-		mutex_lock(&amp;cm-&gt;open_mutex);</div><div class='del'>-		if (cm-&gt;opened[CM_CH_PLAY]) {</div><div class='del'>-			mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='add'>+		guard(mutex)(&amp;cm-&gt;open_mutex);</div><div class='add'>+		if (cm-&gt;opened[CM_CH_PLAY])</div><div class='ctx'> 			return -EBUSY;</div><div class='del'>-		}</div><div class='ctx'> 		/* reserve the channel A */</div><div class='ctx'> 		cm-&gt;opened[CM_CH_PLAY] = CM_OPEN_PLAYBACK_MULTI;</div><div class='del'>-		mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	}</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cmipci_ch_reset(struct cmipci *cm, int ch)</div><div class='hunk'>@@ -710,27 +681,22 @@ static void snd_cmipci_ch_reset(struct cmipci *cm, int ch)</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int hw_channels[] = {1, 2, 4, 6, 8};</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels_4 = {</div><div class='add'>+static const unsigned int hw_channels[] = {1, 2, 4, 6, 8};</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_4 = {</div><div class='ctx'> 	.count = 3,</div><div class='ctx'> 	.list = hw_channels,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels_6 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_6 = {</div><div class='ctx'> 	.count = 4,</div><div class='ctx'> 	.list = hw_channels,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {</div><div class='ctx'> 	.count = 5,</div><div class='ctx'> 	.list = hw_channels,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -746,7 +712,7 @@ static int set_dac_channels(struct cmipci *cm, struct cmipci_pcm *rec, int chann</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cm-&gt;can_multi_ch) {</div><div class='del'>-		spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 		if (channels &gt; 2) {</div><div class='ctx'> 			snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);</div><div class='ctx'> 			snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);</div><div class='hunk'>@@ -769,7 +735,6 @@ static int set_dac_channels(struct cmipci *cm, struct cmipci_pcm *rec, int chann</div><div class='ctx'> 			snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);</div><div class='ctx'> 		else</div><div class='ctx'> 			snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -796,7 +761,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 	if (runtime-&gt;channels &gt; 1)</div><div class='ctx'> 		rec-&gt;fmt |= 0x01;</div><div class='ctx'> 	if (rec-&gt;is_dac &amp;&amp; set_dac_channels(cm, rec, runtime-&gt;channels) &lt; 0) {</div><div class='del'>-		snd_printd("cannot set dac channels\n");</div><div class='add'>+		dev_dbg(cm-&gt;card-&gt;dev, "cannot set dac channels\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -810,7 +775,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 		period_size = (period_size * runtime-&gt;channels) / 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* set buffer address */</div><div class='ctx'> 	reg = rec-&gt;ch ? CM_REG_CH1_FRAME1 : CM_REG_CH0_FRAME1;</div><div class='hunk'>@@ -827,7 +792,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 	else</div><div class='ctx'> 		cm-&gt;ctrl |= val;</div><div class='ctx'> 	snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl);</div><div class='del'>-	//snd_printd("cmipci: functrl0 = %08x\n", cm-&gt;ctrl);</div><div class='add'>+	/* dev_dbg(cm-&gt;card-&gt;dev, "functrl0 = %08x\n", cm-&gt;ctrl); */</div><div class='ctx'> </div><div class='ctx'> 	/* set sample rate */</div><div class='ctx'> 	freq = 0;</div><div class='hunk'>@@ -850,7 +815,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 		val |= (freq &lt;&lt; CM_ASFC_SHIFT) &amp; CM_ASFC_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);</div><div class='del'>-	//snd_printd("cmipci: functrl1 = %08x\n", val);</div><div class='add'>+	dev_dbg(cm-&gt;card-&gt;dev, "functrl1 = %08x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	/* set format */</div><div class='ctx'> 	val = snd_cmipci_read(cm, CM_REG_CHFORMAT);</div><div class='hunk'>@@ -866,7 +831,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 		val |= freq_ext &lt;&lt; (rec-&gt;ch * 2);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_cmipci_write(cm, CM_REG_CHFORMAT, val);</div><div class='del'>-	//snd_printd("cmipci: chformat = %08x\n", val);</div><div class='add'>+	dev_dbg(cm-&gt;card-&gt;dev, "chformat = %08x\n", val);</div><div class='ctx'> </div><div class='ctx'> 	if (!rec-&gt;is_dac &amp;&amp; cm-&gt;chip_version) {</div><div class='ctx'> 		if (runtime-&gt;rate &gt; 44100)</div><div class='hunk'>@@ -876,7 +841,6 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rec-&gt;running = 0;</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -888,14 +852,13 @@ static int snd_cmipci_pcm_trigger(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 				  int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int inthld, chen, reset, pause;</div><div class='del'>-	int result = 0;</div><div class='ctx'> </div><div class='ctx'> 	inthld = CM_CH0_INT_EN &lt;&lt; rec-&gt;ch;</div><div class='ctx'> 	chen = CM_CHEN0 &lt;&lt; rec-&gt;ch;</div><div class='ctx'> 	reset = CM_RST_CH0 &lt;&lt; rec-&gt;ch;</div><div class='ctx'> 	pause = CM_PAUSE0 &lt;&lt; rec-&gt;ch;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		rec-&gt;running = 1;</div><div class='hunk'>@@ -904,7 +867,7 @@ static int snd_cmipci_pcm_trigger(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 		cm-&gt;ctrl |= chen;</div><div class='ctx'> 		/* enable channel */</div><div class='ctx'> 		snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl);</div><div class='del'>-		//snd_printd("cmipci: functrl0 = %08x\n", cm-&gt;ctrl);</div><div class='add'>+		dev_dbg(cm-&gt;card-&gt;dev, "functrl0 = %08x\n", cm-&gt;ctrl);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 		rec-&gt;running = 0;</div><div class='hunk'>@@ -927,11 +890,9 @@ static int snd_cmipci_pcm_trigger(struct cmipci *cm, struct cmipci_pcm *rec,</div><div class='ctx'> 		snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;cm-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -952,7 +913,7 @@ static snd_pcm_uframes_t snd_cmipci_pcm_pointer(struct cmipci *cm, struct cmipci</div><div class='ctx'> 		if (rem &lt; rec-&gt;dma_size)</div><div class='ctx'> 			goto ok;</div><div class='ctx'> 	} </div><div class='del'>-	printk(KERN_ERR "cmipci: invalid PCM pointer: %#x\n", rem);</div><div class='add'>+	dev_err(cm-&gt;card-&gt;dev, "invalid PCM pointer: %#x\n", rem);</div><div class='ctx'> 	return SNDRV_PCM_POS_XRUN;</div><div class='ctx'> ok:</div><div class='ctx'> 	ptr = (rec-&gt;dma_size - (rem + 1)) &gt;&gt; rec-&gt;shift;</div><div class='hunk'>@@ -1021,10 +982,9 @@ static int snd_cmipci_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct cmipci *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		ucontrol-&gt;value.iec958.status[i] = (chip-&gt;dig_status &gt;&gt; (i * 8)) &amp; 0xff;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1036,16 +996,15 @@ static int snd_cmipci_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	val = 0;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		val |= (unsigned int)ucontrol-&gt;value.iec958.status[i] &lt;&lt; (i * 8);</div><div class='ctx'> 	change = val != chip-&gt;dig_status;</div><div class='ctx'> 	chip-&gt;dig_status = val;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_spdif_default __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_spdif_default =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='hunk'>@@ -1072,7 +1031,7 @@ static int snd_cmipci_spdif_mask_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_spdif_mask __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_spdif_mask =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1095,10 +1054,9 @@ static int snd_cmipci_spdif_stream_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct cmipci *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		ucontrol-&gt;value.iec958.status[i] = (chip-&gt;dig_pcm_status &gt;&gt; (i * 8)) &amp; 0xff;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1110,16 +1068,15 @@ static int snd_cmipci_spdif_stream_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	val = 0;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	for (i = 0; i &lt; 4; i++)</div><div class='ctx'> 		val |= (unsigned int)ucontrol-&gt;value.iec958.status[i] &lt;&lt; (i * 8);</div><div class='ctx'> 	change = val != chip-&gt;dig_pcm_status;</div><div class='ctx'> 	chip-&gt;dig_pcm_status = val;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_spdif_stream __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_spdif_stream =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1139,7 +1096,7 @@ static int save_mixer_state(struct cmipci *cm)</div><div class='ctx'> 		struct snd_ctl_elem_value *val;</div><div class='ctx'> 		unsigned int i;</div><div class='ctx'> </div><div class='del'>-		val = kmalloc(sizeof(*val), GFP_ATOMIC);</div><div class='add'>+		val = kmalloc(sizeof(*val), GFP_KERNEL);</div><div class='ctx'> 		if (!val)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		for (i = 0; i &lt; CM_SAVED_MIXERS; i++) {</div><div class='hunk'>@@ -1253,11 +1210,13 @@ static int setup_spdif_playback(struct cmipci *cm, struct snd_pcm_substream *sub</div><div class='ctx'> </div><div class='ctx'> 	rate = subs-&gt;runtime-&gt;rate;</div><div class='ctx'> </div><div class='del'>-	if (up &amp;&amp; do_ac3)</div><div class='del'>-		if ((err = save_mixer_state(cm)) &lt; 0)</div><div class='add'>+	if (up &amp;&amp; do_ac3) {</div><div class='add'>+		err = save_mixer_state(cm);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	cm-&gt;spdif_playback_avail = up;</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		/* they are controlled via "IEC958 Output Switch" */</div><div class='hunk'>@@ -1283,7 +1242,6 @@ static int setup_spdif_playback(struct cmipci *cm, struct snd_pcm_substream *sub</div><div class='ctx'> 		snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_PLAYBACK_SPDF);</div><div class='ctx'> 		setup_ac3(cm, subs, 0, 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1304,7 +1262,8 @@ static int snd_cmipci_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		    substream-&gt;runtime-&gt;channels == 2);</div><div class='ctx'> 	if (do_spdif &amp;&amp; cm-&gt;can_ac3_hw) </div><div class='ctx'> 		do_ac3 = cm-&gt;dig_pcm_status &amp; IEC958_AES0_NONAUDIO;</div><div class='del'>-	if ((err = setup_spdif_playback(cm, substream, do_spdif, do_ac3)) &lt; 0)</div><div class='add'>+	err = setup_spdif_playback(cm, substream, do_spdif, do_ac3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return snd_cmipci_pcm_prepare(cm, &amp;cm-&gt;channel[CM_CH_PLAY], substream);</div><div class='ctx'> }</div><div class='hunk'>@@ -1319,7 +1278,8 @@ static int snd_cmipci_playback_spdif_prepare(struct snd_pcm_substream *substream</div><div class='ctx'> 		do_ac3 = cm-&gt;dig_pcm_status &amp; IEC958_AES0_NONAUDIO;</div><div class='ctx'> 	else</div><div class='ctx'> 		do_ac3 = 1; /* doesn't matter */</div><div class='del'>-	if ((err = setup_spdif_playback(cm, substream, 1, do_ac3)) &lt; 0)</div><div class='add'>+	err = setup_spdif_playback(cm, substream, 1, do_ac3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return snd_cmipci_pcm_prepare(cm, &amp;cm-&gt;channel[CM_CH_PLAY], substream);</div><div class='ctx'> }</div><div class='hunk'>@@ -1347,32 +1307,32 @@ static void snd_cmipci_silence_hack(struct cmipci *cm, struct cmipci_pcm *rec)</div><div class='ctx'> 		/* configure for 16 bits, 2 channels, 8 kHz */</div><div class='ctx'> 		if (runtime-&gt;channels &gt; 2)</div><div class='ctx'> 			set_dac_channels(cm, rec, 2);</div><div class='del'>-		spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='del'>-		val = snd_cmipci_read(cm, CM_REG_FUNCTRL1);</div><div class='del'>-		val &amp;= ~(CM_ASFC_MASK &lt;&lt; (rec-&gt;ch * 3));</div><div class='del'>-		val |= (4 &lt;&lt; CM_ASFC_SHIFT) &lt;&lt; (rec-&gt;ch * 3);</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);</div><div class='del'>-		val = snd_cmipci_read(cm, CM_REG_CHFORMAT);</div><div class='del'>-		val &amp;= ~(CM_CH0FMT_MASK &lt;&lt; (rec-&gt;ch * 2));</div><div class='del'>-		val |= (3 &lt;&lt; CM_CH0FMT_SHIFT) &lt;&lt; (rec-&gt;ch * 2);</div><div class='del'>-		if (cm-&gt;can_96k)</div><div class='del'>-			val &amp;= ~(CM_CH0_SRATE_MASK &lt;&lt; (rec-&gt;ch * 2));</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_CHFORMAT, val);</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;cm-&gt;reg_lock) {</div><div class='add'>+			val = snd_cmipci_read(cm, CM_REG_FUNCTRL1);</div><div class='add'>+			val &amp;= ~(CM_ASFC_MASK &lt;&lt; (rec-&gt;ch * 3));</div><div class='add'>+			val |= (4 &lt;&lt; CM_ASFC_SHIFT) &lt;&lt; (rec-&gt;ch * 3);</div><div class='add'>+			snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);</div><div class='add'>+			val = snd_cmipci_read(cm, CM_REG_CHFORMAT);</div><div class='add'>+			val &amp;= ~(CM_CH0FMT_MASK &lt;&lt; (rec-&gt;ch * 2));</div><div class='add'>+			val |= (3 &lt;&lt; CM_CH0FMT_SHIFT) &lt;&lt; (rec-&gt;ch * 2);</div><div class='add'>+			if (cm-&gt;can_96k)</div><div class='add'>+				val &amp;= ~(CM_CH0_SRATE_MASK &lt;&lt; (rec-&gt;ch * 2));</div><div class='add'>+			snd_cmipci_write(cm, CM_REG_CHFORMAT, val);</div><div class='ctx'> 	</div><div class='del'>-		/* start stream (we don't need interrupts) */</div><div class='del'>-		cm-&gt;ctrl |= CM_CHEN0 &lt;&lt; rec-&gt;ch;</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl);</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+			/* start stream (we don't need interrupts) */</div><div class='add'>+			cm-&gt;ctrl |= CM_CHEN0 &lt;&lt; rec-&gt;ch;</div><div class='add'>+			snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		msleep(1);</div><div class='ctx'> </div><div class='ctx'> 		/* stop and reset stream */</div><div class='del'>-		spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='del'>-		cm-&gt;ctrl &amp;= ~(CM_CHEN0 &lt;&lt; rec-&gt;ch);</div><div class='del'>-		val = CM_RST_CH0 &lt;&lt; rec-&gt;ch;</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl | val);</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl &amp; ~val);</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;cm-&gt;reg_lock) {</div><div class='add'>+			cm-&gt;ctrl &amp;= ~(CM_CHEN0 &lt;&lt; rec-&gt;ch);</div><div class='add'>+			val = CM_RST_CH0 &lt;&lt; rec-&gt;ch;</div><div class='add'>+			snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl | val);</div><div class='add'>+			snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm-&gt;ctrl &amp; ~val);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		rec-&gt;needs_silencing = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1384,14 +1344,14 @@ static int snd_cmipci_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	setup_spdif_playback(cm, substream, 0, 0);</div><div class='ctx'> 	restore_mixer_state(cm);</div><div class='ctx'> 	snd_cmipci_silence_hack(cm, &amp;cm-&gt;channel[0]);</div><div class='del'>-	return snd_cmipci_hw_free(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cmipci_playback2_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	snd_cmipci_silence_hack(cm, &amp;cm-&gt;channel[1]);</div><div class='del'>-	return snd_cmipci_hw_free(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* capture */</div><div class='hunk'>@@ -1406,20 +1366,19 @@ static int snd_cmipci_capture_spdif_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='del'>-	snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_CAPTURE_SPDF);</div><div class='del'>-	if (cm-&gt;can_96k) {</div><div class='del'>-		if (substream-&gt;runtime-&gt;rate &gt; 48000)</div><div class='del'>-			snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;cm-&gt;reg_lock) {</div><div class='add'>+		snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_CAPTURE_SPDF);</div><div class='add'>+		if (cm-&gt;can_96k) {</div><div class='add'>+			if (substream-&gt;runtime-&gt;rate &gt; 48000)</div><div class='add'>+				snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);</div><div class='add'>+			else</div><div class='add'>+				snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);</div><div class='add'>+		}</div><div class='add'>+		if (snd_pcm_format_width(substream-&gt;runtime-&gt;format) &gt; 16)</div><div class='add'>+			snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_SPD32SEL);</div><div class='ctx'> 		else</div><div class='del'>-			snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);</div><div class='add'>+			snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_SPD32SEL);</div><div class='ctx'> 	}</div><div class='del'>-	if (snd_pcm_format_width(substream-&gt;runtime-&gt;format) &gt; 16)</div><div class='del'>-		snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_SPD32SEL);</div><div class='del'>-	else</div><div class='del'>-		snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_SPD32SEL);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return snd_cmipci_pcm_prepare(cm, &amp;cm-&gt;channel[CM_CH_CAPT], substream);</div><div class='ctx'> }</div><div class='hunk'>@@ -1428,12 +1387,11 @@ static int snd_cmipci_capture_spdif_hw_free(struct snd_pcm_substream *subs)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_pcm_substream_chip(subs);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_CAPTURE_SPDF);</div><div class='ctx'> 	snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_SPD32SEL);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	return snd_cmipci_hw_free(subs);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1451,14 +1409,14 @@ static irqreturn_t snd_cmipci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	/* acknowledge interrupt */</div><div class='del'>-	spin_lock(&amp;cm-&gt;reg_lock);</div><div class='del'>-	if (status &amp; CM_CHINT0)</div><div class='del'>-		mask |= CM_CH0_INT_EN;</div><div class='del'>-	if (status &amp; CM_CHINT1)</div><div class='del'>-		mask |= CM_CH1_INT_EN;</div><div class='del'>-	snd_cmipci_clear_bit(cm, CM_REG_INT_HLDCLR, mask);</div><div class='del'>-	snd_cmipci_set_bit(cm, CM_REG_INT_HLDCLR, mask);</div><div class='del'>-	spin_unlock(&amp;cm-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;cm-&gt;reg_lock) {</div><div class='add'>+		if (status &amp; CM_CHINT0)</div><div class='add'>+			mask |= CM_CH0_INT_EN;</div><div class='add'>+		if (status &amp; CM_CHINT1)</div><div class='add'>+			mask |= CM_CH1_INT_EN;</div><div class='add'>+		snd_cmipci_clear_bit(cm, CM_REG_INT_HLDCLR, mask);</div><div class='add'>+		snd_cmipci_set_bit(cm, CM_REG_INT_HLDCLR, mask);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cm-&gt;rmidi &amp;&amp; (status &amp; CM_UARTINT))</div><div class='ctx'> 		snd_mpu401_uart_interrupt(irq, cm-&gt;rmidi-&gt;private_data);</div><div class='hunk'>@@ -1477,7 +1435,7 @@ static irqreturn_t snd_cmipci_interrupt(int irq, void *dev_id)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* playback on channel A */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1497,7 +1455,7 @@ static struct snd_pcm_hardware snd_cmipci_playback =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* capture on channel B */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1517,7 +1475,7 @@ static struct snd_pcm_hardware snd_cmipci_capture =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* playback on channel B - stereo 16bit only? */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_playback2 =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_playback2 =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1537,7 +1495,7 @@ static struct snd_pcm_hardware snd_cmipci_playback2 =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* spdif playback on channel A */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_playback_spdif =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_playback_spdif =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1557,7 +1515,7 @@ static struct snd_pcm_hardware snd_cmipci_playback_spdif =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* spdif playback on channel A (32bit, IEC958 subframes) */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_playback_iec958_subframe =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_playback_iec958_subframe =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1577,7 +1535,7 @@ static struct snd_pcm_hardware snd_cmipci_playback_iec958_subframe =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* spdif capture on channel B */</div><div class='del'>-static struct snd_pcm_hardware snd_cmipci_capture_spdif =</div><div class='add'>+static const struct snd_pcm_hardware snd_cmipci_capture_spdif =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE |</div><div class='hunk'>@@ -1597,14 +1555,6 @@ static struct snd_pcm_hardware snd_cmipci_capture_spdif =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int rate_constraints[] = { 5512, 8000, 11025, 16000, 22050,</div><div class='del'>-			32000, 44100, 48000, 88200, 96000, 128000 };</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='del'>-		.count = ARRAY_SIZE(rate_constraints),</div><div class='del'>-		.list = rate_constraints,</div><div class='del'>-		.mask = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * check device open/close</div><div class='ctx'>  */</div><div class='hunk'>@@ -1617,21 +1567,17 @@ static int open_device_check(struct cmipci *cm, int mode, struct snd_pcm_substre</div><div class='ctx'> 	 * pcm framework doesn't pass file pointer before actually opened,</div><div class='ctx'> 	 * we can't know whether blocking mode or not in open callback..</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;cm-&gt;open_mutex);</div><div class='del'>-	if (cm-&gt;opened[ch]) {</div><div class='del'>-		mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;cm-&gt;open_mutex);</div><div class='add'>+	if (cm-&gt;opened[ch])</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> 	cm-&gt;opened[ch] = mode;</div><div class='ctx'> 	cm-&gt;channel[ch].substream = subs;</div><div class='ctx'> 	if (! (mode &amp; CM_OPEN_DAC)) {</div><div class='ctx'> 		/* disable dual DAC mode */</div><div class='ctx'> 		cm-&gt;channel[ch].is_dac = 0;</div><div class='del'>-		spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 		snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_ENDBDAC);</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1639,7 +1585,7 @@ static void close_device_check(struct cmipci *cm, int mode)</div><div class='ctx'> {</div><div class='ctx'> 	int ch = mode &amp; CM_OPEN_CH_MASK;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;cm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	if (cm-&gt;opened[ch] == mode) {</div><div class='ctx'> 		if (cm-&gt;channel[ch].substream) {</div><div class='ctx'> 			snd_cmipci_ch_reset(cm, ch);</div><div class='hunk'>@@ -1650,12 +1596,10 @@ static void close_device_check(struct cmipci *cm, int mode)</div><div class='ctx'> 		if (! cm-&gt;channel[ch].is_dac) {</div><div class='ctx'> 			/* enable dual DAC mode again */</div><div class='ctx'> 			cm-&gt;channel[ch].is_dac = 1;</div><div class='del'>-			spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+			guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 			snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_ENDBDAC);</div><div class='del'>-			spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1667,7 +1611,8 @@ static int snd_cmipci_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = open_device_check(cm, CM_OPEN_PLAYBACK, substream)) &lt; 0)</div><div class='add'>+	err = open_device_check(cm, CM_OPEN_PLAYBACK, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;hw = snd_cmipci_playback;</div><div class='ctx'> 	if (cm-&gt;chip_version == 68) {</div><div class='hunk'>@@ -1675,11 +1620,9 @@ static int snd_cmipci_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				     SNDRV_PCM_RATE_96000;</div><div class='ctx'> 		runtime-&gt;hw.rate_max = 96000;</div><div class='ctx'> 	} else if (cm-&gt;chip_version == 55) {</div><div class='del'>-		err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='del'>-			SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_rates);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_KNOT;</div><div class='add'>+		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_88200 |</div><div class='add'>+				     SNDRV_PCM_RATE_96000 |</div><div class='add'>+				     SNDRV_PCM_RATE_128000;</div><div class='ctx'> 		runtime-&gt;hw.rate_max = 128000;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);</div><div class='hunk'>@@ -1693,18 +1636,17 @@ static int snd_cmipci_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = open_device_check(cm, CM_OPEN_CAPTURE, substream)) &lt; 0)</div><div class='add'>+	err = open_device_check(cm, CM_OPEN_CAPTURE, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;hw = snd_cmipci_capture;</div><div class='ctx'> 	if (cm-&gt;chip_version == 68) {	// 8768 only supports 44k/48k recording</div><div class='ctx'> 		runtime-&gt;hw.rate_min = 41000;</div><div class='ctx'> 		runtime-&gt;hw.rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;</div><div class='ctx'> 	} else if (cm-&gt;chip_version == 55) {</div><div class='del'>-		err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='del'>-			SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_rates);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_KNOT;</div><div class='add'>+		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_88200 |</div><div class='add'>+				     SNDRV_PCM_RATE_96000 |</div><div class='add'>+				     SNDRV_PCM_RATE_128000;</div><div class='ctx'> 		runtime-&gt;hw.rate_max = 128000;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);</div><div class='hunk'>@@ -1717,10 +1659,12 @@ static int snd_cmipci_playback2_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = open_device_check(cm, CM_OPEN_PLAYBACK2, substream)) &lt; 0) /* use channel B */</div><div class='add'>+	/* use channel B */</div><div class='add'>+	err = open_device_check(cm, CM_OPEN_PLAYBACK2, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;hw = snd_cmipci_playback2;</div><div class='del'>-	mutex_lock(&amp;cm-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	if (! cm-&gt;opened[CM_CH_PLAY]) {</div><div class='ctx'> 		if (cm-&gt;can_multi_ch) {</div><div class='ctx'> 			runtime-&gt;hw.channels_max = cm-&gt;max_channels;</div><div class='hunk'>@@ -1732,17 +1676,14 @@ static int snd_cmipci_playback2_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &amp;hw_constraints_channels_8);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	if (cm-&gt;chip_version == 68) {</div><div class='ctx'> 		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_88200 |</div><div class='ctx'> 				     SNDRV_PCM_RATE_96000;</div><div class='ctx'> 		runtime-&gt;hw.rate_max = 96000;</div><div class='ctx'> 	} else if (cm-&gt;chip_version == 55) {</div><div class='del'>-		err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='del'>-			SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_rates);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_KNOT;</div><div class='add'>+		runtime-&gt;hw.rates |= SNDRV_PCM_RATE_88200 |</div><div class='add'>+				     SNDRV_PCM_RATE_96000 |</div><div class='add'>+				     SNDRV_PCM_RATE_128000;</div><div class='ctx'> 		runtime-&gt;hw.rate_max = 128000;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);</div><div class='hunk'>@@ -1755,7 +1696,9 @@ static int snd_cmipci_playback_spdif_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = open_device_check(cm, CM_OPEN_SPDIF_PLAYBACK, substream)) &lt; 0) /* use channel A */</div><div class='add'>+	/* use channel A */</div><div class='add'>+	err = open_device_check(cm, CM_OPEN_SPDIF_PLAYBACK, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (cm-&gt;can_ac3_hw) {</div><div class='ctx'> 		runtime-&gt;hw = snd_cmipci_playback_spdif;</div><div class='hunk'>@@ -1782,7 +1725,9 @@ static int snd_cmipci_capture_spdif_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = open_device_check(cm, CM_OPEN_SPDIF_CAPTURE, substream)) &lt; 0) /* use channel B */</div><div class='add'>+	/* use channel B */</div><div class='add'>+	err = open_device_check(cm, CM_OPEN_SPDIF_CAPTURE, substream);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;hw = snd_cmipci_capture_spdif;</div><div class='ctx'> 	if (cm-&gt;can_96k &amp;&amp; !(cm-&gt;chip_version == 68)) {</div><div class='hunk'>@@ -1838,32 +1783,26 @@ static int snd_cmipci_capture_spdif_close(struct snd_pcm_substream *substream)</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cmipci_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cmipci_playback_ops = {</div><div class='ctx'> 	.open =		snd_cmipci_playback_open,</div><div class='ctx'> 	.close =	snd_cmipci_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cmipci_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cmipci_playback_hw_free,</div><div class='ctx'> 	.prepare =	snd_cmipci_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_cmipci_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_cmipci_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cmipci_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cmipci_capture_ops = {</div><div class='ctx'> 	.open =		snd_cmipci_capture_open,</div><div class='ctx'> 	.close =	snd_cmipci_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cmipci_hw_params,</div><div class='del'>-	.hw_free =	snd_cmipci_hw_free,</div><div class='ctx'> 	.prepare =	snd_cmipci_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_cmipci_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_cmipci_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cmipci_playback2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cmipci_playback2_ops = {</div><div class='ctx'> 	.open =		snd_cmipci_playback2_open,</div><div class='ctx'> 	.close =	snd_cmipci_playback2_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_cmipci_playback2_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cmipci_playback2_hw_free,</div><div class='ctx'> 	.prepare =	snd_cmipci_capture_prepare,	/* channel B */</div><div class='hunk'>@@ -1871,22 +1810,18 @@ static struct snd_pcm_ops snd_cmipci_playback2_ops = {</div><div class='ctx'> 	.pointer =	snd_cmipci_capture_pointer,	/* channel B */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cmipci_playback_spdif_ops = {</div><div class='ctx'> 	.open =		snd_cmipci_playback_spdif_open,</div><div class='ctx'> 	.close =	snd_cmipci_playback_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cmipci_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cmipci_playback_hw_free,</div><div class='ctx'> 	.prepare =	snd_cmipci_playback_spdif_prepare,	/* set up rate */</div><div class='ctx'> 	.trigger =	snd_cmipci_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_cmipci_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {</div><div class='ctx'> 	.open =		snd_cmipci_capture_spdif_open,</div><div class='ctx'> 	.close =	snd_cmipci_capture_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cmipci_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cmipci_capture_spdif_hw_free,</div><div class='ctx'> 	.prepare =	snd_cmipci_capture_spdif_prepare,</div><div class='ctx'> 	.trigger =	snd_cmipci_capture_trigger,</div><div class='hunk'>@@ -1897,7 +1832,7 @@ static struct snd_pcm_ops snd_cmipci_capture_spdif_ops = {</div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_pcm_new(struct cmipci *cm, int device)</div><div class='add'>+static int snd_cmipci_pcm_new(struct cmipci *cm, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1911,16 +1846,16 @@ static int __devinit snd_cmipci_pcm_new(struct cmipci *cm, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = cm;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "C-Media PCI DAC/ADC");</div><div class='add'>+	strscpy(pcm-&gt;name, "C-Media PCI DAC/ADC");</div><div class='ctx'> 	cm-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(cm-&gt;pci), 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;cm-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_pcm2_new(struct cmipci *cm, int device)</div><div class='add'>+static int snd_cmipci_pcm2_new(struct cmipci *cm, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1933,16 +1868,16 @@ static int __devinit snd_cmipci_pcm2_new(struct cmipci *cm, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = cm;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "C-Media PCI 2nd DAC");</div><div class='add'>+	strscpy(pcm-&gt;name, "C-Media PCI 2nd DAC");</div><div class='ctx'> 	cm-&gt;pcm2 = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(cm-&gt;pci), 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;cm-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)</div><div class='add'>+static int snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1956,11 +1891,17 @@ static int __devinit snd_cmipci_pcm_spdif_new(struct cmipci *cm, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = cm;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "C-Media PCI IEC958");</div><div class='add'>+	strscpy(pcm-&gt;name, "C-Media PCI IEC958");</div><div class='ctx'> 	cm-&gt;pcm_spdif = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(cm-&gt;pci), 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;cm-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_alt_chmaps, cm-&gt;max_channels, 0,</div><div class='add'>+				     NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2047,7 +1988,7 @@ static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='ctx'> 	cmipci_sb_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	val = (snd_cmipci_mixer_read(cm, reg.left_reg) &gt;&gt; reg.left_shift) &amp; reg.mask;</div><div class='ctx'> 	if (reg.invert)</div><div class='ctx'> 		val = reg.mask - val;</div><div class='hunk'>@@ -2056,9 +1997,8 @@ static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		val = (snd_cmipci_mixer_read(cm, reg.right_reg) &gt;&gt; reg.right_shift) &amp; reg.mask;</div><div class='ctx'> 		if (reg.invert)</div><div class='ctx'> 			val = reg.mask - val;</div><div class='del'>-		 ucontrol-&gt;value.integer.value[1] = val;</div><div class='add'>+		ucontrol-&gt;value.integer.value[1] = val;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2082,7 +2022,7 @@ static int snd_cmipci_put_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		right &lt;&lt;= reg.right_shift;</div><div class='ctx'> 	} else</div><div class='ctx'> 		right = 0;</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	oleft = snd_cmipci_mixer_read(cm, reg.left_reg);</div><div class='ctx'> 	left |= oleft &amp; ~(reg.mask &lt;&lt; reg.left_shift);</div><div class='ctx'> 	change = left != oleft;</div><div class='hunk'>@@ -2097,7 +2037,6 @@ static int snd_cmipci_put_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		snd_cmipci_mixer_write(cm, reg.right_reg, right);</div><div class='ctx'> 	} else</div><div class='ctx'> 		snd_cmipci_mixer_write(cm, reg.left_reg, left);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2129,10 +2068,9 @@ static int snd_cmipci_get_input_sw(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int val1, val2;</div><div class='ctx'> </div><div class='ctx'> 	cmipci_sb_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	val1 = snd_cmipci_mixer_read(cm, reg.left_reg);</div><div class='ctx'> 	val2 = snd_cmipci_mixer_read(cm, reg.right_reg);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (val1 &gt;&gt; reg.left_shift) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = (val2 &gt;&gt; reg.left_shift) &amp; 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[2] = (val1 &gt;&gt; reg.right_shift) &amp; 1;</div><div class='hunk'>@@ -2149,7 +2087,7 @@ static int snd_cmipci_put_input_sw(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int val1, val2, oval1, oval2;</div><div class='ctx'> </div><div class='ctx'> 	cmipci_sb_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	oval1 = snd_cmipci_mixer_read(cm, reg.left_reg);</div><div class='ctx'> 	oval2 = snd_cmipci_mixer_read(cm, reg.right_reg);</div><div class='ctx'> 	val1 = oval1 &amp; ~((1 &lt;&lt; reg.left_shift) | (1 &lt;&lt; reg.right_shift));</div><div class='hunk'>@@ -2161,7 +2099,6 @@ static int snd_cmipci_put_input_sw(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = val1 != oval1 || val2 != oval2;</div><div class='ctx'> 	snd_cmipci_mixer_write(cm, reg.left_reg, val1);</div><div class='ctx'> 	snd_cmipci_mixer_write(cm, reg.right_reg, val2);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2219,7 +2156,7 @@ static int snd_cmipci_get_native_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned char oreg, val;</div><div class='ctx'> </div><div class='ctx'> 	cmipci_sb_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	oreg = inb(cm-&gt;iobase + reg.left_reg);</div><div class='ctx'> 	val = (oreg &gt;&gt; reg.left_shift) &amp; reg.mask;</div><div class='ctx'> 	if (reg.invert)</div><div class='hunk'>@@ -2231,7 +2168,6 @@ static int snd_cmipci_get_native_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			val = reg.mask - val;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = val;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2243,7 +2179,7 @@ static int snd_cmipci_put_native_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned char oreg, nreg, val;</div><div class='ctx'> </div><div class='ctx'> 	cmipci_sb_reg_decode(&amp;reg, kcontrol-&gt;private_value);</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	oreg = inb(cm-&gt;iobase + reg.left_reg);</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0] &amp; reg.mask;</div><div class='ctx'> 	if (reg.invert)</div><div class='hunk'>@@ -2258,7 +2194,6 @@ static int snd_cmipci_put_native_mixer(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		nreg |= (val &lt;&lt; reg.right_shift);</div><div class='ctx'> 	}</div><div class='ctx'> 	outb(nreg, cm-&gt;iobase + reg.left_reg);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return (nreg != oreg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2284,7 +2219,7 @@ static int snd_cmipci_put_native_mixer_sensitive(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_mixers[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_mixers[] = {</div><div class='ctx'> 	CMIPCI_SB_VOL_STEREO("Master Playback Volume", SB_DSP4_MASTER_DEV, 3, 31),</div><div class='ctx'> 	CMIPCI_MIXER_SW_MONO("3D Control - Switch", CM_REG_MIXER1, CM_X3DEN_SHIFT, 0),</div><div class='ctx'> 	CMIPCI_SB_VOL_STEREO("PCM Playback Volume", SB_DSP4_PCM_DEV, 3, 31),</div><div class='hunk'>@@ -2345,10 +2280,9 @@ static int _snd_cmipci_uswitch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	if (args-&gt;ac3_sensitive &amp;&amp; cm-&gt;mixer_insensitive) {</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = 0;</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (args-&gt;is_byte)</div><div class='hunk'>@@ -2356,7 +2290,6 @@ static int _snd_cmipci_uswitch_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	else</div><div class='ctx'> 		val = snd_cmipci_read(cm, args-&gt;reg);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = ((val &amp; args-&gt;mask) == args-&gt;mask_on) ? 1 : 0;</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2378,10 +2311,9 @@ static int _snd_cmipci_uswitch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change;</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	if (args-&gt;ac3_sensitive &amp;&amp; cm-&gt;mixer_insensitive) {</div><div class='ctx'> 		/* ignored */</div><div class='del'>-		spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (args-&gt;is_byte)</div><div class='hunk'>@@ -2401,7 +2333,6 @@ static int _snd_cmipci_uswitch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		else</div><div class='ctx'> 			snd_cmipci_write(cm, args-&gt;reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2507,14 +2438,12 @@ static int snd_cmipci_line_in_mode_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" };</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = cm-&gt;chip_version &gt;= 39 ? 3 : 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	static const char *const texts[3] = {</div><div class='add'>+		"Line-In", "Rear Output", "Bass Output"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1,</div><div class='add'>+				 cm-&gt;chip_version &gt;= 39 ? 3 : 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int get_line_in_mode(struct cmipci *cm)</div><div class='hunk'>@@ -2536,9 +2465,8 @@ static int snd_cmipci_line_in_mode_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = get_line_in_mode(cm);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2548,7 +2476,7 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] == 2)</div><div class='ctx'> 		change = snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_CENTR2LIN | CM_BASE2LIN);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -2557,32 +2485,26 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		change |= snd_cmipci_set_bit_b(cm, CM_REG_MIXER1, CM_REAR2LIN);</div><div class='ctx'> 	else</div><div class='ctx'> 		change |= snd_cmipci_clear_bit_b(cm, CM_REG_MIXER1, CM_REAR2LIN);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cmipci_mic_in_mode_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Mic-In", "Center/LFE Output" };</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	static const char *const texts[2] = { "Mic-In", "Center/LFE Output" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cmipci_mic_in_mode_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				      struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='ctx'> 	/* same bit as spdi_phase */</div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = </div><div class='ctx'> 		(snd_cmipci_read_b(cm, CM_REG_MISC) &amp; CM_SPDIF_INVERSE) ? 1 : 0;</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2592,17 +2514,16 @@ static int snd_cmipci_mic_in_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct cmipci *cm = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0])</div><div class='ctx'> 		change = snd_cmipci_set_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);</div><div class='ctx'> 	else</div><div class='ctx'> 		change = snd_cmipci_clear_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* both for CM8338/8738 */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_mixer_switches[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_mixer_switches[] = {</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "Line-In Mode",</div><div class='hunk'>@@ -2614,11 +2535,11 @@ static struct snd_kcontrol_new snd_cmipci_mixer_switches[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* for non-multichannel chips */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_nomulti_switch __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_nomulti_switch =</div><div class='ctx'> DEFINE_MIXER_SWITCH("Exchange DAC", exchange_dac);</div><div class='ctx'> </div><div class='ctx'> /* only for CM8738 */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] = {</div><div class='ctx'> #if 0 /* controlled in pcm device */</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 In Record", spdif_in),</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 Out", spdif_out),</div><div class='hunk'>@@ -2640,14 +2561,14 @@ static struct snd_kcontrol_new snd_cmipci_8738_mixer_switches[] __devinitdata =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* only for model 033/037 */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_old_mixer_switches[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_old_mixer_switches[] = {</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 Mix Analog", spdif_dac_out),</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase),</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 In Select", spdif_in_sel1),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* only for model 039 or later */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] = {</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 In Select", spdif_in_sel2),</div><div class='ctx'> 	DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase2),</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2660,14 +2581,14 @@ static struct snd_kcontrol_new snd_cmipci_extra_mixer_switches[] __devinitdata =</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* card control switches */</div><div class='del'>-static struct snd_kcontrol_new snd_cmipci_modem_switch __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_cmipci_modem_switch =</div><div class='ctx'> DEFINE_CARD_SWITCH("Modem", modem);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)</div><div class='add'>+static int snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct snd_kcontrol_new *sw;</div><div class='add'>+	const struct snd_kcontrol_new *sw;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2677,11 +2598,11 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic</div><div class='ctx'> </div><div class='ctx'> 	card = cm-&gt;card;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, "CMedia PCI");</div><div class='add'>+	strscpy(card-&gt;mixername, "CMedia PCI");</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;cm-&gt;reg_lock);</div><div class='del'>-	snd_cmipci_mixer_write(cm, 0x00, 0x00);		/* mixer reset */</div><div class='del'>-	spin_unlock_irq(&amp;cm-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;cm-&gt;reg_lock) {</div><div class='add'>+		snd_cmipci_mixer_write(cm, 0x00, 0x00);	/* mixer reset */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_cmipci_mixers); idx++) {</div><div class='ctx'> 		if (cm-&gt;chip_version == 68) {	// 8768 has no PCM volume</div><div class='hunk'>@@ -2689,7 +2610,8 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic</div><div class='ctx'> 				"PCM Playback Volume"))</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cmipci_mixers[idx], cm))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cmipci_mixers[idx], cm));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2714,15 +2636,21 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (cm-&gt;can_ac3_hw) {</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_default, cm))) &lt; 0)</div><div class='del'>-				return err;</div><div class='add'>+			kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_default, cm);</div><div class='ctx'> 			kctl-&gt;id.device = pcm_spdif_device;</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_mask, cm))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+			kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_mask, cm);</div><div class='ctx'> 			kctl-&gt;id.device = pcm_spdif_device;</div><div class='del'>-			if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_stream, cm))) &lt; 0)</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='add'>+			kctl = snd_ctl_new1(&amp;snd_cmipci_spdif_stream, cm);</div><div class='ctx'> 			kctl-&gt;id.device = pcm_spdif_device;</div><div class='add'>+			err = snd_ctl_add(card, kctl);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (cm-&gt;chip_version &lt;= 37) {</div><div class='ctx'> 			sw = snd_cmipci_old_mixer_switches;</div><div class='hunk'>@@ -2755,12 +2683,8 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; CM_SAVED_MIXERS; idx++) {</div><div class='del'>-		struct snd_ctl_elem_id elem_id;</div><div class='ctx'> 		struct snd_kcontrol *ctl;</div><div class='del'>-		memset(&amp;elem_id, 0, sizeof(elem_id));</div><div class='del'>-		elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-		strcpy(elem_id.name, cm_saved_mixer[idx].name);</div><div class='del'>-		ctl = snd_ctl_find_id(cm-&gt;card, &amp;elem_id);</div><div class='add'>+		ctl = snd_ctl_find_id_mixer(cm-&gt;card, cm_saved_mixer[idx].name);</div><div class='ctx'> 		if (ctl)</div><div class='ctx'> 			cm-&gt;mixer_res_ctl[idx] = ctl;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2773,7 +2697,6 @@ static int __devinit snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_devic</div><div class='ctx'>  * proc interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static void snd_cmipci_proc_read(struct snd_info_entry *entry, </div><div class='ctx'> 				 struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -2792,19 +2715,12 @@ static void snd_cmipci_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_cmipci_proc_init(struct cmipci *cm)</div><div class='add'>+static void snd_cmipci_proc_init(struct cmipci *cm)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(cm-&gt;card, "cmipci", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(cm-&gt;card, "cmipci", cm, snd_cmipci_proc_read);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-static inline void snd_cmipci_proc_init(struct cmipci *cm) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_cmipci_ids) = {</div><div class='add'>+static const struct pci_device_id snd_cmipci_ids[] = {</div><div class='ctx'> 	{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},</div><div class='ctx'> 	{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0},</div><div class='ctx'> 	{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0},</div><div class='hunk'>@@ -2818,7 +2734,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_cmipci_ids) = {</div><div class='ctx'>  * check chip version and capabilities</div><div class='ctx'>  * driver name is modified according to the chip model</div><div class='ctx'>  */</div><div class='del'>-static void __devinit query_chip(struct cmipci *cm)</div><div class='add'>+static void query_chip(struct cmipci *cm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int detect;</div><div class='ctx'> </div><div class='hunk'>@@ -2867,9 +2783,9 @@ static void __devinit query_chip(struct cmipci *cm)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-static int __devinit snd_cmipci_create_gameport(struct cmipci *cm, int dev)</div><div class='add'>+static int snd_cmipci_create_gameport(struct cmipci *cm, int dev)</div><div class='ctx'> {</div><div class='del'>-	static int ports[] = { 0x201, 0x200, 0 }; /* FIXME: majority is 0x201? */</div><div class='add'>+	static const int ports[] = { 0x201, 0x200, 0 }; /* FIXME: majority is 0x201? */</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> 	struct resource *r = NULL;</div><div class='ctx'> 	int i, io_port = 0;</div><div class='hunk'>@@ -2880,31 +2796,31 @@ static int __devinit snd_cmipci_create_gameport(struct cmipci *cm, int dev)</div><div class='ctx'> 	if (joystick_port[dev] == 1) { /* auto-detect */</div><div class='ctx'> 		for (i = 0; ports[i]; i++) {</div><div class='ctx'> 			io_port = ports[i];</div><div class='del'>-			r = request_region(io_port, 1, "CMIPCI gameport");</div><div class='add'>+			r = devm_request_region(&amp;cm-&gt;pci-&gt;dev, io_port, 1,</div><div class='add'>+						"CMIPCI gameport");</div><div class='ctx'> 			if (r)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		io_port = joystick_port[dev];</div><div class='del'>-		r = request_region(io_port, 1, "CMIPCI gameport");</div><div class='add'>+		r = devm_request_region(&amp;cm-&gt;pci-&gt;dev, io_port, 1,</div><div class='add'>+					"CMIPCI gameport");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!r) {</div><div class='del'>-		printk(KERN_WARNING "cmipci: cannot reserve joystick ports\n");</div><div class='add'>+		dev_warn(cm-&gt;card-&gt;dev, "cannot reserve joystick ports\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cm-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "cmipci: cannot allocate memory for gameport\n");</div><div class='del'>-		release_and_free_resource(r);</div><div class='add'>+		dev_err(cm-&gt;card-&gt;dev, "cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	gameport_set_name(gp, "C-Media Gameport");</div><div class='ctx'> 	gameport_set_phys(gp, "pci%s/gameport0", pci_name(cm-&gt;pci));</div><div class='ctx'> 	gameport_set_dev_parent(gp, &amp;cm-&gt;pci-&gt;dev);</div><div class='ctx'> 	gp-&gt;io = io_port;</div><div class='del'>-	gameport_set_port_data(gp, r);</div><div class='ctx'> </div><div class='ctx'> 	snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);</div><div class='ctx'> </div><div class='hunk'>@@ -2916,13 +2832,10 @@ static int __devinit snd_cmipci_create_gameport(struct cmipci *cm, int dev)</div><div class='ctx'> static void snd_cmipci_free_gameport(struct cmipci *cm)</div><div class='ctx'> {</div><div class='ctx'> 	if (cm-&gt;gameport) {</div><div class='del'>-		struct resource *r = gameport_get_port_data(cm-&gt;gameport);</div><div class='del'>-</div><div class='ctx'> 		gameport_unregister_port(cm-&gt;gameport);</div><div class='ctx'> 		cm-&gt;gameport = NULL;</div><div class='ctx'> </div><div class='ctx'> 		snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);</div><div class='del'>-		release_and_free_resource(r);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -2930,37 +2843,25 @@ static inline int snd_cmipci_create_gameport(struct cmipci *cm, int dev) { retur</div><div class='ctx'> static inline void snd_cmipci_free_gameport(struct cmipci *cm) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_free(struct cmipci *cm)</div><div class='add'>+static void snd_cmipci_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (cm-&gt;irq &gt;= 0) {</div><div class='del'>-		snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);</div><div class='del'>-		snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_ENSPDOUT);</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);  /* disable ints */</div><div class='del'>-		snd_cmipci_ch_reset(cm, CM_CH_PLAY);</div><div class='del'>-		snd_cmipci_ch_reset(cm, CM_CH_CAPT);</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL0, 0); /* disable channels */</div><div class='del'>-		snd_cmipci_write(cm, CM_REG_FUNCTRL1, 0);</div><div class='add'>+	struct cmipci *cm = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-		/* reset mixer */</div><div class='del'>-		snd_cmipci_mixer_write(cm, 0, 0);</div><div class='add'>+	snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);</div><div class='add'>+	snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_ENSPDOUT);</div><div class='add'>+	snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);  /* disable ints */</div><div class='add'>+	snd_cmipci_ch_reset(cm, CM_CH_PLAY);</div><div class='add'>+	snd_cmipci_ch_reset(cm, CM_CH_CAPT);</div><div class='add'>+	snd_cmipci_write(cm, CM_REG_FUNCTRL0, 0); /* disable channels */</div><div class='add'>+	snd_cmipci_write(cm, CM_REG_FUNCTRL1, 0);</div><div class='ctx'> </div><div class='del'>-		free_irq(cm-&gt;irq, cm);</div><div class='del'>-	}</div><div class='add'>+	/* reset mixer */</div><div class='add'>+	snd_cmipci_mixer_write(cm, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	snd_cmipci_free_gameport(cm);</div><div class='del'>-	pci_release_regions(cm-&gt;pci);</div><div class='del'>-	pci_disable_device(cm-&gt;pci);</div><div class='del'>-	kfree(cm);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct cmipci *cm = device-&gt;device_data;</div><div class='del'>-	return snd_cmipci_free(cm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)</div><div class='add'>+static int snd_cmipci_create_fm(struct cmipci *cm, long fm_port)</div><div class='ctx'> {</div><div class='ctx'> 	long iosynth;</div><div class='ctx'> 	unsigned int val;</div><div class='hunk'>@@ -2996,13 +2897,15 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)</div><div class='ctx'> </div><div class='ctx'> 		if (snd_opl3_create(cm-&gt;card, iosynth, iosynth + 2,</div><div class='ctx'> 				    OPL3_HW_OPL3, 0, &amp;opl3) &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "cmipci: no OPL device at %#lx, "</div><div class='del'>-			       "skipping...\n", iosynth);</div><div class='add'>+			dev_err(cm-&gt;card-&gt;dev,</div><div class='add'>+				"no OPL device at %#lx, skipping...\n",</div><div class='add'>+				iosynth);</div><div class='ctx'> 			goto disable_fm;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cmipci: cannot create OPL3 hwdep\n");</div><div class='add'>+	err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(cm-&gt;card-&gt;dev, "cannot create OPL3 hwdep\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3013,35 +2916,25 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,</div><div class='del'>-				       int dev, struct cmipci **rcmipci)</div><div class='add'>+static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,</div><div class='add'>+			     int dev)</div><div class='ctx'> {</div><div class='del'>-	struct cmipci *cm;</div><div class='add'>+	struct cmipci *cm = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_cmipci_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	long iomidi = 0;</div><div class='ctx'> 	int integrated_midi = 0;</div><div class='ctx'> 	char modelstr[16];</div><div class='ctx'> 	int pcm_index, pcm_spdif_index;</div><div class='del'>-	static DEFINE_PCI_DEVICE_TABLE(intel_82437vx) = {</div><div class='add'>+	static const struct pci_device_id intel_82437vx[] = {</div><div class='ctx'> 		{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },</div><div class='ctx'> 		{ },</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	*rcmipci = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	cm = kzalloc(sizeof(*cm), GFP_KERNEL);</div><div class='del'>-	if (cm == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;cm-&gt;reg_lock);</div><div class='ctx'> 	mutex_init(&amp;cm-&gt;open_mutex);</div><div class='ctx'> 	cm-&gt;device = pci-&gt;device;</div><div class='hunk'>@@ -3052,20 +2945,19 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> 	cm-&gt;channel[1].ch = 1;</div><div class='ctx'> 	cm-&gt;channel[0].is_dac = cm-&gt;channel[1].is_dac = 1; /* dual DAC mode */</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, card-&gt;driver)) &lt; 0) {</div><div class='del'>-		kfree(cm);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, card-&gt;driver);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	cm-&gt;iobase = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_cmipci_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;driver, cm)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_cmipci_free(cm);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_cmipci_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, cm)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	cm-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = cm-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_cmipci_free;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(cm-&gt;pci);</div><div class='ctx'> </div><div class='hunk'>@@ -3081,11 +2973,12 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> 	    pci-&gt;device != PCI_DEVICE_ID_CMEDIA_CM8338B)</div><div class='ctx'> 		query_chip(cm);</div><div class='ctx'> 	/* added -MCx suffix for chip supporting multi-channels */</div><div class='del'>-	if (cm-&gt;can_multi_ch)</div><div class='del'>-		sprintf(cm-&gt;card-&gt;driver + strlen(cm-&gt;card-&gt;driver),</div><div class='del'>-			"-MC%d", cm-&gt;max_channels);</div><div class='del'>-	else if (cm-&gt;can_ac3_sw)</div><div class='del'>-		strcpy(cm-&gt;card-&gt;driver + strlen(cm-&gt;card-&gt;driver), "-SWIEC");</div><div class='add'>+	if (cm-&gt;can_multi_ch) {</div><div class='add'>+		int l = strlen(cm-&gt;card-&gt;driver);</div><div class='add'>+		scnprintf(cm-&gt;card-&gt;driver + l, sizeof(cm-&gt;card-&gt;driver) - l,</div><div class='add'>+			  "-MC%d", cm-&gt;max_channels);</div><div class='add'>+	} else if (cm-&gt;can_ac3_sw)</div><div class='add'>+		strlcat(cm-&gt;card-&gt;driver, "-SWIEC", sizeof(cm-&gt;card-&gt;driver));</div><div class='ctx'> </div><div class='ctx'> 	cm-&gt;dig_status = SNDRV_PCM_DEFAULT_CON_SPDIF;</div><div class='ctx'> 	cm-&gt;dig_pcm_status = SNDRV_PCM_DEFAULT_CON_SPDIF;</div><div class='hunk'>@@ -3157,23 +3050,21 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	sprintf(card-&gt;shortname, "C-Media CMI%d", val);</div><div class='add'>+	sprintf(card-&gt;shortname, "C-Media CMI%u", val);</div><div class='ctx'> 	if (cm-&gt;chip_version &lt; 68)</div><div class='del'>-		sprintf(modelstr, " (model %d)", cm-&gt;chip_version);</div><div class='add'>+		scnprintf(modelstr, sizeof(modelstr),</div><div class='add'>+			  " (model %d)", cm-&gt;chip_version);</div><div class='ctx'> 	else</div><div class='ctx'> 		modelstr[0] = '\0';</div><div class='del'>-	sprintf(card-&gt;longname, "%s%s at %#lx, irq %i",</div><div class='del'>-		card-&gt;shortname, modelstr, cm-&gt;iobase, cm-&gt;irq);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_cmipci_free(cm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	scnprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		  "%s%s at %#lx, irq %i",</div><div class='add'>+		  card-&gt;shortname, modelstr, cm-&gt;iobase, cm-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	if (cm-&gt;chip_version &gt;= 39) {</div><div class='ctx'> 		val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);</div><div class='ctx'> 		if (val != 0x00 &amp;&amp; val != 0xff) {</div><div class='del'>-			iomidi = cm-&gt;iobase + CM_REG_MPU_PCI;</div><div class='add'>+			if (mpu_port[dev])</div><div class='add'>+				iomidi = cm-&gt;iobase + CM_REG_MPU_PCI;</div><div class='ctx'> 			integrated_midi = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3193,8 +3084,9 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> 			/* enable UART */</div><div class='ctx'> 			snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_UART_EN);</div><div class='ctx'> 			if (inb(iomidi + 1) == 0xff) {</div><div class='del'>-				snd_printk(KERN_ERR "cannot enable MPU-401 port"</div><div class='del'>-					   " at %#lx\n", iomidi);</div><div class='add'>+				dev_err(cm-&gt;card-&gt;dev,</div><div class='add'>+					"cannot enable MPU-401 port at %#lx\n",</div><div class='add'>+					iomidi);</div><div class='ctx'> 				snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1,</div><div class='ctx'> 						     CM_UART_EN);</div><div class='ctx'> 				iomidi = 0;</div><div class='hunk'>@@ -3215,30 +3107,36 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> </div><div class='ctx'> 	/* create pcm devices */</div><div class='ctx'> 	pcm_index = pcm_spdif_index = 0;</div><div class='del'>-	if ((err = snd_cmipci_pcm_new(cm, pcm_index)) &lt; 0)</div><div class='add'>+	err = snd_cmipci_pcm_new(cm, pcm_index);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm_index++;</div><div class='del'>-	if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) &lt; 0)</div><div class='add'>+	err = snd_cmipci_pcm2_new(cm, pcm_index);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm_index++;</div><div class='ctx'> 	if (cm-&gt;can_ac3_hw || cm-&gt;can_ac3_sw) {</div><div class='ctx'> 		pcm_spdif_index = pcm_index;</div><div class='del'>-		if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) &lt; 0)</div><div class='add'>+		err = snd_cmipci_pcm_spdif_new(cm, pcm_index);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* create mixer interface &amp; switches */</div><div class='del'>-	if ((err = snd_cmipci_mixer_new(cm, pcm_spdif_index)) &lt; 0)</div><div class='add'>+	err = snd_cmipci_mixer_new(cm, pcm_spdif_index);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (iomidi &gt; 0) {</div><div class='del'>-		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,</div><div class='del'>-					       iomidi,</div><div class='del'>-					       (integrated_midi ?</div><div class='del'>-						MPU401_INFO_INTEGRATED : 0),</div><div class='del'>-					       cm-&gt;irq, 0, &amp;cm-&gt;rmidi)) &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "cmipci: no UART401 device at 0x%lx\n", iomidi);</div><div class='del'>-		}</div><div class='add'>+		err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,</div><div class='add'>+					  iomidi,</div><div class='add'>+					  (integrated_midi ?</div><div class='add'>+					   MPU401_INFO_INTEGRATED : 0) |</div><div class='add'>+					  MPU401_INFO_IRQ_HOOK,</div><div class='add'>+					  -1, &amp;cm-&gt;rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			dev_err(cm-&gt;card-&gt;dev,</div><div class='add'>+				"no UART401 device at 0x%lx\n", iomidi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_VAR48KRATE</div><div class='hunk'>@@ -3254,9 +3152,6 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> 	if (snd_cmipci_create_gameport(cm, dev) &lt; 0)</div><div class='ctx'> 		snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_JYSTK_EN);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rcmipci = cm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3265,12 +3160,11 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_cmipci_ids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cmipci_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_cmipci_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct cmipci *cm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='hunk'>@@ -3280,60 +3174,54 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(struct cmipci), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	</div><div class='ctx'> 	switch (pci-&gt;device) {</div><div class='ctx'> 	case PCI_DEVICE_ID_CMEDIA_CM8738:</div><div class='ctx'> 	case PCI_DEVICE_ID_CMEDIA_CM8738B:</div><div class='del'>-		strcpy(card-&gt;driver, "CMI8738");</div><div class='add'>+		strscpy(card-&gt;driver, "CMI8738");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PCI_DEVICE_ID_CMEDIA_CM8338A:</div><div class='ctx'> 	case PCI_DEVICE_ID_CMEDIA_CM8338B:</div><div class='del'>-		strcpy(card-&gt;driver, "CMI8338");</div><div class='add'>+		strscpy(card-&gt;driver, "CMI8338");</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		strcpy(card-&gt;driver, "CMIPCI");</div><div class='add'>+		strscpy(card-&gt;driver, "CMIPCI");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cmipci_create(card, pci, dev, &amp;cm)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = cm;</div><div class='add'>+	err = snd_cmipci_create(card, pci, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cmipci_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * power management</div><div class='ctx'>  */</div><div class='del'>-static unsigned char saved_regs[] = {</div><div class='add'>+static const unsigned char saved_regs[] = {</div><div class='ctx'> 	CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,</div><div class='del'>-	CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL,</div><div class='add'>+	CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_AUX_VOL, CM_REG_PLL,</div><div class='ctx'> 	CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2,</div><div class='ctx'> 	CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,</div><div class='ctx'> 	CM_REG_INT_STATUS, CM_REG_INT_HLDCLR, CM_REG_FUNCTRL0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char saved_mixers[] = {</div><div class='add'>+static const unsigned char saved_mixers[] = {</div><div class='ctx'> 	SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,</div><div class='ctx'> 	SB_DSP4_PCM_DEV, SB_DSP4_PCM_DEV + 1,</div><div class='ctx'> 	SB_DSP4_SYNTH_DEV, SB_DSP4_SYNTH_DEV + 1,</div><div class='hunk'>@@ -3344,18 +3232,14 @@ static unsigned char saved_mixers[] = {</div><div class='ctx'> 	SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_cmipci_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cmipci *cm = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> 	</div><div class='del'>-	snd_pcm_suspend_all(cm-&gt;pcm);</div><div class='del'>-	snd_pcm_suspend_all(cm-&gt;pcm2);</div><div class='del'>-	snd_pcm_suspend_all(cm-&gt;pcm_spdif);</div><div class='del'>-</div><div class='ctx'> 	/* save registers */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(saved_regs); i++)</div><div class='ctx'> 		cm-&gt;saved_regs[i] = snd_cmipci_read(cm, saved_regs[i]);</div><div class='hunk'>@@ -3364,29 +3248,15 @@ static int snd_cmipci_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	/* disable ints */</div><div class='ctx'> 	snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_cmipci_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_cmipci_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cmipci *cm = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cmipci: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	/* reset / initialize to a sane state */</div><div class='ctx'> 	snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);</div><div class='ctx'> 	snd_cmipci_ch_reset(cm, CM_CH_PLAY);</div><div class='hunk'>@@ -3402,28 +3272,16 @@ static int snd_cmipci_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "C-Media PCI",</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_cmipci_pm, snd_cmipci_suspend, snd_cmipci_resume);</div><div class='add'>+</div><div class='add'>+static struct pci_driver cmipci_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_cmipci_ids,</div><div class='ctx'> 	.probe = snd_cmipci_probe,</div><div class='del'>-	.remove = __devexit_p(snd_cmipci_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_cmipci_suspend,</div><div class='del'>-	.resume = snd_cmipci_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_cmipci_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static int __init alsa_card_cmipci_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cmipci_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cmipci_init)</div><div class='del'>-module_exit(alsa_card_cmipci_exit)</div><div class='add'>+module_pci_driver(cmipci_driver);</div><div class='head'>diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c<br/>index 6772070ed492..d00b2c9fb1e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs4281.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs4281.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs4281.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs4281.c</a></div><div class='hunk'>@@ -1,32 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Cirrus Logic CS4281 based PCI soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -40,12 +25,11 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Cirrus Logic CS4281");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,CS4281}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='del'>-static int dual_codec[SNDRV_CARDS];	/* dual codec */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='add'>+static bool dual_codec[SNDRV_CARDS];	/* dual codec */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for CS4281 soundcard.");</div><div class='hunk'>@@ -486,15 +470,12 @@ struct cs4281 {</div><div class='ctx'> </div><div class='ctx'> 	struct gameport *gameport;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	u32 suspend_regs[SUSPEND_REGISTERS];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_cs4281_ids) = {</div><div class='add'>+static const struct pci_device_id snd_cs4281_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CIRRUS, 0x6005), 0, },	/* CS4281 */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -564,7 +545,8 @@ static void snd_cs4281_ac97_write(struct snd_ac97 *ac97,</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 write problem, reg = 0x%x, val = 0x%x\n", reg, val);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 write problem, reg = 0x%x, val = 0x%x\n", reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned short snd_cs4281_ac97_read(struct snd_ac97 *ac97,</div><div class='hunk'>@@ -624,7 +606,8 @@ static unsigned short snd_cs4281_ac97_read(struct snd_ac97 *ac97,</div><div class='ctx'> 			goto __ok1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);</div><div class='ctx'> 	result = 0xffff;</div><div class='ctx'> 	goto __end;</div><div class='ctx'> 	</div><div class='hunk'>@@ -643,7 +626,8 @@ static unsigned short snd_cs4281_ac97_read(struct snd_ac97 *ac97,</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 read problem (ACSTS_VSTS), reg = 0x%x\n", reg);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 read problem (ACSTS_VSTS), reg = 0x%x\n", reg);</div><div class='ctx'> 	result = 0xffff;</div><div class='ctx'> 	goto __end;</div><div class='ctx'> </div><div class='hunk'>@@ -667,7 +651,7 @@ static int snd_cs4281_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	struct cs4281_dma *dma = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	struct cs4281 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 		dma-&gt;valDCR |= BA0_DCR_MSK;</div><div class='hunk'>@@ -694,19 +678,17 @@ static int snd_cs4281_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 			dma-&gt;valFCR &amp;= ~BA0_FCR_FEN;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, dma-&gt;regDMR, dma-&gt;valDMR);</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, dma-&gt;regFCR, dma-&gt;valFCR);</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, dma-&gt;regDCR, dma-&gt;valDCR);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int snd_cs4281_rate(unsigned int rate, unsigned int *real_rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned int val = ~0;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	</div><div class='ctx'> 	if (real_rate)</div><div class='ctx'> 		*real_rate = rate;</div><div class='hunk'>@@ -719,9 +701,8 @@ static unsigned int snd_cs4281_rate(unsigned int rate, unsigned int *real_rate)</div><div class='ctx'> 	case 44100:	return 1;</div><div class='ctx'> 	case 48000:	return 0;</div><div class='ctx'> 	default:</div><div class='del'>-		goto __variable;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-      __variable:</div><div class='ctx'> 	val = 1536000 / rate;</div><div class='ctx'> 	if (real_rate)</div><div class='ctx'> 		*real_rate = 1536000 / val;</div><div class='hunk'>@@ -793,26 +774,14 @@ static void snd_cs4281_mode(struct cs4281 *chip, struct cs4281_dma *dma,</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, dma-&gt;regFSIC, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_cs4281_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs4281_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_cs4281_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct cs4281_dma *dma = runtime-&gt;private_data;</div><div class='ctx'> 	struct cs4281 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_cs4281_mode(chip, dma, runtime, 0, 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -822,9 +791,8 @@ static int snd_cs4281_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct cs4281_dma *dma = runtime-&gt;private_data;</div><div class='ctx'> 	struct cs4281 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_cs4281_mode(chip, dma, runtime, 1, 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -835,15 +803,16 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct cs4281 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n",</div><div class='del'>-	       snd_cs4281_peekBA0(chip, dma-&gt;regDCC), runtime-&gt;buffer_size,</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"DCC = 0x%x, buffer_size = 0x%x, jiffies = %li\n",</div><div class='add'>+		snd_cs4281_peekBA0(chip, dma-&gt;regDCC), runtime-&gt;buffer_size,</div><div class='ctx'> 	       jiffies);</div><div class='ctx'> 	*/</div><div class='ctx'> 	return runtime-&gt;buffer_size -</div><div class='ctx'> 	       snd_cs4281_peekBA0(chip, dma-&gt;regDCC) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs4281_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs4281_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -868,7 +837,7 @@ static struct snd_pcm_hardware snd_cs4281_playback =</div><div class='ctx'> 	.fifo_size =		CS4281_FIFO_SIZE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs4281_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs4281_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -947,36 +916,27 @@ static int snd_cs4281_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs4281_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs4281_playback_ops = {</div><div class='ctx'> 	.open =		snd_cs4281_playback_open,</div><div class='ctx'> 	.close =	snd_cs4281_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cs4281_hw_params,</div><div class='del'>-	.hw_free =	snd_cs4281_hw_free,</div><div class='ctx'> 	.prepare =	snd_cs4281_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_cs4281_trigger,</div><div class='ctx'> 	.pointer =	snd_cs4281_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs4281_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs4281_capture_ops = {</div><div class='ctx'> 	.open =		snd_cs4281_capture_open,</div><div class='ctx'> 	.close =	snd_cs4281_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_cs4281_hw_params,</div><div class='del'>-	.hw_free =	snd_cs4281_hw_free,</div><div class='ctx'> 	.prepare =	snd_cs4281_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_cs4281_trigger,</div><div class='ctx'> 	.pointer =	snd_cs4281_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_pcm(struct cs4281 * chip, int device,</div><div class='del'>-				    struct snd_pcm ** rpcm)</div><div class='add'>+static int snd_cs4281_pcm(struct cs4281 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, "CS4281", device, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -986,14 +946,12 @@ static int __devinit snd_cs4281_pcm(struct cs4281 * chip, int device,</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS4281");</div><div class='add'>+	strscpy(pcm-&gt;name, "CS4281");</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 512*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 512*1024);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +1014,7 @@ static int snd_cs4281_put_volume(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_dsp, -4650, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4281_fm_vol = </div><div class='add'>+static const struct snd_kcontrol_new snd_cs4281_fm_vol =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Synth Playback Volume",</div><div class='hunk'>@@ -1067,7 +1025,7 @@ static struct snd_kcontrol_new snd_cs4281_fm_vol =</div><div class='ctx'> 	.tlv = { .p = db_scale_dsp },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs4281_pcm_vol = </div><div class='add'>+static const struct snd_kcontrol_new snd_cs4281_pcm_vol =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "PCM Stream Playback Volume",</div><div class='hunk'>@@ -1093,33 +1051,38 @@ static void snd_cs4281_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='ctx'> 		chip-&gt;ac97 = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_mixer(struct cs4281 * chip)</div><div class='add'>+static int snd_cs4281_mixer(struct cs4281 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_cs4281_ac97_write,</div><div class='ctx'> 		.read = snd_cs4281_ac97_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;ac97_bus-&gt;private_free = snd_cs4281_mixer_free_ac97_bus;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='ctx'> 	ac97.private_free = snd_cs4281_mixer_free_ac97;</div><div class='del'>-	if ((err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97)) &lt; 0)</div><div class='add'>+	err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (chip-&gt;dual_codec) {</div><div class='ctx'> 		ac97.num = 1;</div><div class='del'>-		if ((err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97_secondary)) &lt; 0)</div><div class='add'>+		err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97_secondary);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4281_fm_vol, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4281_fm_vol, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4281_pcm_vol, chip))) &lt; 0)</div><div class='add'>+	err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs4281_pcm_vol, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1163,20 +1126,19 @@ static ssize_t snd_cs4281_BA1_read(struct snd_info_entry *entry,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {</div><div class='add'>+static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {</div><div class='ctx'> 	.read = snd_cs4281_BA0_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {</div><div class='add'>+static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {</div><div class='ctx'> 	.read = snd_cs4281_BA1_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_cs4281_proc_init(struct cs4281 * chip)</div><div class='add'>+static void snd_cs4281_proc_init(struct cs4281 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> </div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "cs4281", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_cs4281_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "cs4281", chip, snd_cs4281_proc_read);</div><div class='ctx'> 	if (! snd_card_proc_new(chip-&gt;card, "cs4281_BA0", &amp;entry)) {</div><div class='ctx'> 		entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='ctx'> 		entry-&gt;private_data = chip;</div><div class='hunk'>@@ -1195,7 +1157,7 @@ static void __devinit snd_cs4281_proc_init(struct cs4281 * chip)</div><div class='ctx'>  * joystick support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> </div><div class='ctx'> static void snd_cs4281_gameport_trigger(struct gameport *gameport)</div><div class='ctx'> {</div><div class='hunk'>@@ -1259,13 +1221,14 @@ static int snd_cs4281_gameport_open(struct gameport *gameport, int mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_create_gameport(struct cs4281 *chip)</div><div class='add'>+static int snd_cs4281_create_gameport(struct cs4281 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "cs4281: cannot allocate memory for gameport\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1296,14 +1259,13 @@ static void snd_cs4281_free_gameport(struct cs4281 *chip)</div><div class='ctx'> #else</div><div class='ctx'> static inline int snd_cs4281_create_gameport(struct cs4281 *chip) { return -ENOSYS; }</div><div class='ctx'> static inline void snd_cs4281_free_gameport(struct cs4281 *chip) { }</div><div class='del'>-#endif /* CONFIG_GAMEPORT || (MODULE &amp;&amp; CONFIG_GAMEPORT_MODULE) */</div><div class='add'>+#endif /* IS_REACHABLE(CONFIG_GAMEPORT) */</div><div class='ctx'> </div><div class='del'>-static int snd_cs4281_free(struct cs4281 *chip)</div><div class='add'>+static void snd_cs4281_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	snd_cs4281_free_gameport(chip);</div><div class='add'>+	struct cs4281 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		synchronize_irq(chip-&gt;irq);</div><div class='add'>+	snd_cs4281_free_gameport(chip);</div><div class='ctx'> </div><div class='ctx'> 	/* Mask interrupts */</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_HIMR, 0x7fffffff);</div><div class='hunk'>@@ -1311,100 +1273,55 @@ static int snd_cs4281_free(struct cs4281 *chip)</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_CLKCR1, 0);</div><div class='ctx'> 	/* Sound System Power Management - Turn Everything OFF */</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_SSPM, 0);</div><div class='del'>-	/* PCI interface - D3 state */</div><div class='del'>-	pci_set_power_state(chip-&gt;pci, 3);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;ba0)</div><div class='del'>-		iounmap(chip-&gt;ba0);</div><div class='del'>-	if (chip-&gt;ba1)</div><div class='del'>-		iounmap(chip-&gt;ba1);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs4281_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct cs4281 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_cs4281_free(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs4281_chip_init(struct cs4281 *chip); /* defined below */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci,</div><div class='del'>-				       struct cs4281 ** rchip,</div><div class='del'>-				       int dual_codec)</div><div class='add'>+static int snd_cs4281_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci,</div><div class='add'>+			     int dual_codec)</div><div class='ctx'> {</div><div class='del'>-	struct cs4281 *chip;</div><div class='del'>-	unsigned int tmp;</div><div class='add'>+	struct cs4281 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_cs4281_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rchip = NULL;</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	if (dual_codec &lt; 0 || dual_codec &gt; 3) {</div><div class='del'>-		snd_printk(KERN_ERR "invalid dual_codec option %d\n", dual_codec);</div><div class='add'>+		dev_err(card-&gt;dev, "invalid dual_codec option %d\n", dual_codec);</div><div class='ctx'> 		dual_codec = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;dual_codec = dual_codec;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "CS4281")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;ba0 = pcim_iomap_region(pci, 0, "CS4281");</div><div class='add'>+	if (IS_ERR(chip-&gt;ba0))</div><div class='add'>+		return PTR_ERR(chip-&gt;ba0);</div><div class='ctx'> 	chip-&gt;ba0_addr = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;ba1_addr = pci_resource_start(pci, 1);</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ba0 = pci_ioremap_bar(pci, 0);</div><div class='del'>-	chip-&gt;ba1 = pci_ioremap_bar(pci, 1);</div><div class='del'>-	if (!chip-&gt;ba0 || !chip-&gt;ba1) {</div><div class='del'>-		snd_cs4281_free(chip);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;ba1 = pcim_iomap_region(pci, 1, "CS4281");</div><div class='add'>+	if (IS_ERR(chip-&gt;ba1))</div><div class='add'>+		return PTR_ERR(chip-&gt;ba1);</div><div class='add'>+	chip-&gt;ba1_addr = pci_resource_start(pci, 1);</div><div class='ctx'> 	</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_cs4281_interrupt, IRQF_SHARED,</div><div class='del'>-			"CS4281", chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_cs4281_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_cs4281_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_cs4281_free;</div><div class='ctx'> </div><div class='del'>-	tmp = snd_cs4281_chip_init(chip);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		snd_cs4281_free(chip);</div><div class='del'>-		return tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_cs4281_free(chip);</div><div class='add'>+	err = snd_cs4281_chip_init(chip);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_cs4281_proc_init(chip);</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1425,7 +1342,8 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> 		snd_cs4281_pokeBA0(chip, BA0_CFLR, BA0_CFLR_DEFAULT);</div><div class='ctx'> 		tmp = snd_cs4281_peekBA0(chip, BA0_CFLR);</div><div class='ctx'> 		if (tmp != BA0_CFLR_DEFAULT) {</div><div class='del'>-			snd_printk(KERN_ERR "CFLR setup failed (0x%x)\n", tmp);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"CFLR setup failed (0x%x)\n", tmp);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1435,12 +1353,16 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'>          * space between 0e4h and 0ffh to be written. */	</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_CWPR, 0x4281);</div><div class='ctx'> 	</div><div class='del'>-	if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC1)) != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) {</div><div class='del'>-		snd_printk(KERN_ERR "SERC1 AC'97 check failed (0x%x)\n", tmp);</div><div class='add'>+	tmp = snd_cs4281_peekBA0(chip, BA0_SERC1);</div><div class='add'>+	if (tmp != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"SERC1 AC'97 check failed (0x%x)\n", tmp);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC2)) != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) {</div><div class='del'>-		snd_printk(KERN_ERR "SERC2 AC'97 check failed (0x%x)\n", tmp);</div><div class='add'>+	tmp = snd_cs4281_peekBA0(chip, BA0_SERC2);</div><div class='add'>+	if (tmp != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"SERC2 AC'97 check failed (0x%x)\n", tmp);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1502,7 +1424,7 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "DLLRDY not seen\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "DLLRDY not seen\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'>       __ok0:</div><div class='hunk'>@@ -1528,7 +1450,9 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "never read codec ready from AC'97 (0x%x)\n", snd_cs4281_peekBA0(chip, BA0_ACSTS));</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"never read codec ready from AC'97 (0x%x)\n",</div><div class='add'>+		snd_cs4281_peekBA0(chip, BA0_ACSTS));</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'>       __ok1:</div><div class='hunk'>@@ -1539,7 +1463,8 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> 				goto __codec2_ok;</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='del'>-		snd_printk(KERN_INFO "secondary codec doesn't respond. disable it...\n");</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "secondary codec doesn't respond. disable it...\n");</div><div class='ctx'> 		chip-&gt;dual_codec = 0;</div><div class='ctx'> 	__codec2_ok: ;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1569,7 +1494,7 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> </div><div class='ctx'> 	if (--retry_count &gt; 0)</div><div class='ctx'> 		goto __retry;</div><div class='del'>-	snd_printk(KERN_ERR "never read ISV3 and ISV4 from AC'97\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "never read ISV3 and ISV4 from AC'97\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='ctx'>       __ok2:</div><div class='hunk'>@@ -1632,7 +1557,6 @@ static int snd_cs4281_chip_init(struct cs4281 *chip)</div><div class='ctx'> 					BA0_HISR_DMA(1) |</div><div class='ctx'> 					BA0_HISR_DMA(2) |</div><div class='ctx'> 					BA0_HISR_DMA(3)));</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1652,7 +1576,7 @@ static int snd_cs4281_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'>  	chip-&gt;midcr |= BA0_MIDCR_RXE;</div><div class='ctx'> 	chip-&gt;midi_input = substream;</div><div class='ctx'> 	if (!(chip-&gt;uartm &amp; CS4281_MODE_OUTPUT)) {</div><div class='hunk'>@@ -1660,7 +1584,6 @@ static int snd_cs4281_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1668,7 +1591,7 @@ static int snd_cs4281_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;midcr &amp;= ~(BA0_MIDCR_RXE | BA0_MIDCR_RIE);</div><div class='ctx'> 	chip-&gt;midi_input = NULL;</div><div class='ctx'> 	if (!(chip-&gt;uartm &amp; CS4281_MODE_OUTPUT)) {</div><div class='hunk'>@@ -1677,7 +1600,6 @@ static int snd_cs4281_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;uartm &amp;= ~CS4281_MODE_INPUT;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1685,7 +1607,7 @@ static int snd_cs4281_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;uartm |= CS4281_MODE_OUTPUT;</div><div class='ctx'> 	chip-&gt;midcr |= BA0_MIDCR_TXE;</div><div class='ctx'> 	chip-&gt;midi_output = substream;</div><div class='hunk'>@@ -1694,7 +1616,6 @@ static int snd_cs4281_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1702,7 +1623,7 @@ static int snd_cs4281_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;midcr &amp;= ~(BA0_MIDCR_TXE | BA0_MIDCR_TIE);</div><div class='ctx'> 	chip-&gt;midi_output = NULL;</div><div class='ctx'> 	if (!(chip-&gt;uartm &amp; CS4281_MODE_INPUT)) {</div><div class='hunk'>@@ -1711,16 +1632,14 @@ static int snd_cs4281_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;uartm &amp;= ~CS4281_MODE_OUTPUT;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs4281_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((chip-&gt;midcr &amp; BA0_MIDCR_RIE) == 0) {</div><div class='ctx'> 			chip-&gt;midcr |= BA0_MIDCR_RIE;</div><div class='hunk'>@@ -1732,16 +1651,14 @@ static void snd_cs4281_midi_input_trigger(struct snd_rawmidi_substream *substrea</div><div class='ctx'> 			snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs4281_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct cs4281 *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	unsigned char byte;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((chip-&gt;midcr &amp; BA0_MIDCR_TIE) == 0) {</div><div class='ctx'> 			chip-&gt;midcr |= BA0_MIDCR_TIE;</div><div class='hunk'>@@ -1762,41 +1679,36 @@ static void snd_cs4281_midi_output_trigger(struct snd_rawmidi_substream *substre</div><div class='ctx'> 			snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_cs4281_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_cs4281_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_cs4281_midi_output_open,</div><div class='ctx'> 	.close =	snd_cs4281_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_cs4281_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_cs4281_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_cs4281_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open = 	snd_cs4281_midi_input_open,</div><div class='ctx'> 	.close =	snd_cs4281_midi_input_close,</div><div class='ctx'> 	.trigger =	snd_cs4281_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_midi(struct cs4281 * chip, int device,</div><div class='del'>-				     struct snd_rawmidi **rrawmidi)</div><div class='add'>+static int snd_cs4281_midi(struct cs4281 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(chip-&gt;card, "CS4281", device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(chip-&gt;card, "CS4281", device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(rmidi-&gt;name, "CS4281");</div><div class='add'>+	strscpy(rmidi-&gt;name, "CS4281");</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_cs4281_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_cs4281_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	rmidi-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;rmidi = rmidi;</div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1819,10 +1731,12 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; (BA0_HISR_DMA(0)|BA0_HISR_DMA(1)|BA0_HISR_DMA(2)|BA0_HISR_DMA(3))) {</div><div class='del'>-		for (dma = 0; dma &lt; 4; dma++)</div><div class='add'>+		for (dma = 0; dma &lt; 4; dma++) {</div><div class='add'>+			bool period_elapsed = false;</div><div class='add'>+			cdma = &amp;chip-&gt;dma[dma];</div><div class='add'>+</div><div class='ctx'> 			if (status &amp; BA0_HISR_DMA(dma)) {</div><div class='del'>-				cdma = &amp;chip-&gt;dma[dma];</div><div class='del'>-				spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+				guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 				/* ack DMA IRQ */</div><div class='ctx'> 				val = snd_cs4281_peekBA0(chip, cdma-&gt;regHDSR);</div><div class='ctx'> 				/* workaround, sometimes CS4281 acknowledges */</div><div class='hunk'>@@ -1831,24 +1745,24 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				if ((val &amp; BA0_HDSR_DHTC) &amp;&amp; !(cdma-&gt;frag &amp; 1)) {</div><div class='ctx'> 					cdma-&gt;frag--;</div><div class='ctx'> 					chip-&gt;spurious_dhtc_irq++;</div><div class='del'>-					spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> 				if ((val &amp; BA0_HDSR_DTC) &amp;&amp; (cdma-&gt;frag &amp; 1)) {</div><div class='ctx'> 					cdma-&gt;frag--;</div><div class='ctx'> 					chip-&gt;spurious_dtc_irq++;</div><div class='del'>-					spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='del'>-				spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-				snd_pcm_period_elapsed(cdma-&gt;substream);</div><div class='add'>+				period_elapsed = true;</div><div class='ctx'> 			}</div><div class='add'>+			if (period_elapsed)</div><div class='add'>+				snd_pcm_period_elapsed(cdma-&gt;substream);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((status &amp; BA0_HISR_MIDI) &amp;&amp; chip-&gt;rmidi) {</div><div class='ctx'> 		unsigned char c;</div><div class='ctx'> 		</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		while ((snd_cs4281_peekBA0(chip, BA0_MIDSR) &amp; BA0_MIDSR_RBE) == 0) {</div><div class='ctx'> 			c = snd_cs4281_peekBA0(chip, BA0_MIDRP);</div><div class='ctx'> 			if ((chip-&gt;midcr &amp; BA0_MIDCR_RIE) == 0)</div><div class='hunk'>@@ -1865,7 +1779,6 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			}</div><div class='ctx'> 			snd_cs4281_pokeBA0(chip, BA0_MIDWP, c);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* EOI to the PCI part... reenables interrupts */</div><div class='hunk'>@@ -1881,7 +1794,6 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)</div><div class='ctx'> static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd,</div><div class='ctx'> 				    unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct cs4281 *chip = opl3-&gt;private_data;</div><div class='ctx'> 	void __iomem *port;</div><div class='ctx'> </div><div class='hunk'>@@ -1890,19 +1802,17 @@ static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd,</div><div class='ctx'> 	else</div><div class='ctx'> 		port = chip-&gt;ba0 + BA0_B0AP; /* left port */</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;opl3-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;opl3-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	writel((unsigned int)cmd, port);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='ctx'> 	writel((unsigned int)val, port + 4);</div><div class='ctx'> 	udelay(30);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;opl3-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs4281_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_cs4281_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -1917,69 +1827,61 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cs4281_create(card, pci, &amp;chip, dual_codec[dev])) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs4281_create(card, pci, dual_codec[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cs4281_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs4281_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_cs4281_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs4281_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_cs4281_midi(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs4281_midi(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &amp;opl3)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &amp;opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	opl3-&gt;private_data = chip;</div><div class='ctx'> 	opl3-&gt;command = snd_cs4281_opl3_command;</div><div class='ctx'> 	snd_opl3_init(opl3);</div><div class='del'>-	if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	snd_cs4281_create_gameport(chip);</div><div class='del'>-	strcpy(card-&gt;driver, "CS4281");</div><div class='del'>-	strcpy(card-&gt;shortname, "Cirrus Logic CS4281");</div><div class='add'>+	strscpy(card-&gt;driver, "CS4281");</div><div class='add'>+	strscpy(card-&gt;shortname, "Cirrus Logic CS4281");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		chip-&gt;ba0_addr,</div><div class='ctx'> 		chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cs4281_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_cs4281_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_cs4281_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Power Management</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static int saved_regs[SUSPEND_REGISTERS] = {</div><div class='add'>+static const int saved_regs[SUSPEND_REGISTERS] = {</div><div class='ctx'> 	BA0_JSCTL,</div><div class='ctx'> 	BA0_GPIOR,</div><div class='ctx'> 	BA0_SSCR,</div><div class='hunk'>@@ -1997,16 +1899,14 @@ static int saved_regs[SUSPEND_REGISTERS] = {</div><div class='ctx'> </div><div class='ctx'> #define CLKCR1_CKRA                             0x00010000L</div><div class='ctx'> </div><div class='del'>-static int cs4281_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int cs4281_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cs4281 *chip = card-&gt;private_data;</div><div class='ctx'> 	u32 ulCLK;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='del'>-</div><div class='ctx'> 	snd_ac97_suspend(chip-&gt;ac97);</div><div class='ctx'> 	snd_ac97_suspend(chip-&gt;ac97_secondary);</div><div class='ctx'> </div><div class='hunk'>@@ -2037,30 +1937,16 @@ static int cs4281_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	ulCLK = snd_cs4281_peekBA0(chip, BA0_CLKCR1);</div><div class='ctx'> 	ulCLK &amp;= ~CLKCR1_CKRA;</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_CLKCR1, ulCLK);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cs4281_resume(struct pci_dev *pci)</div><div class='add'>+static int cs4281_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cs4281 *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 ulCLK;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cs4281: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	ulCLK = snd_cs4281_peekBA0(chip, BA0_CLKCR1);</div><div class='ctx'> 	ulCLK |= CLKCR1_CKRA;</div><div class='ctx'> 	snd_cs4281_pokeBA0(chip, BA0_CLKCR1, ulCLK);</div><div class='hunk'>@@ -2082,28 +1968,16 @@ static int cs4281_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "CS4281",</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(cs4281_pm, cs4281_suspend, cs4281_resume);</div><div class='add'>+</div><div class='add'>+static struct pci_driver cs4281_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_cs4281_ids,</div><div class='ctx'> 	.probe = snd_cs4281_probe,</div><div class='del'>-	.remove = __devexit_p(snd_cs4281_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = cs4281_suspend,</div><div class='del'>-	.resume = cs4281_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;cs4281_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static int __init alsa_card_cs4281_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cs4281_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cs4281_init)</div><div class='del'>-module_exit(alsa_card_cs4281_exit)</div><div class='add'>+module_pci_driver(cs4281_driver);</div><div class='head'>diff --git a/sound/pci/cs46xx/Makefile b/sound/pci/cs46xx/Makefile<br/>index 67e811ec8539..3ed2ceb404e5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/Makefile</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c<br/>index 767fa7f06cd0..9c1995737eb7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -28,28 +13,21 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/cs46xx.h&gt;</div><div class='add'>+#include "cs46xx.h"</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Cirrus Logic Sound Fusion CS46XX");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,Sound Fusion (CS4280)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4610)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4612)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4615)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4622)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4624)},"</div><div class='del'>-		"{Cirrus Logic,Sound Fusion (CS4630)}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='del'>-static int external_amp[SNDRV_CARDS];</div><div class='del'>-static int thinkpad[SNDRV_CARDS];</div><div class='del'>-static int mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool external_amp[SNDRV_CARDS];</div><div class='add'>+static bool thinkpad[SNDRV_CARDS];</div><div class='add'>+static bool mmap_valid[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for the CS46xx soundcard.");</div><div class='hunk'>@@ -58,13 +36,13 @@ MODULE_PARM_DESC(id, "ID string for the CS46xx soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable CS46xx soundcard.");</div><div class='ctx'> module_param_array(external_amp, bool, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(external_amp, "Force to enable external amplifer.");</div><div class='add'>+MODULE_PARM_DESC(external_amp, "Force to enable external amplifier.");</div><div class='ctx'> module_param_array(thinkpad, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(thinkpad, "Force to enable Thinkpad's CLKRUN control.");</div><div class='ctx'> module_param_array(mmap_valid, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_cs46xx_ids) = {</div><div class='add'>+static const struct pci_device_id snd_cs46xx_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CIRRUS, 0x6001), 0, },   /* CS4280 */</div><div class='ctx'> 	{ PCI_VDEVICE(CIRRUS, 0x6003), 0, },   /* CS4612 */</div><div class='ctx'> 	{ PCI_VDEVICE(CIRRUS, 0x6004), 0, },   /* CS4615 */</div><div class='hunk'>@@ -73,8 +51,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_cs46xx_ids) = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_cs46xx_ids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,</div><div class='del'>-					   const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_card_cs46xx_probe(struct pci_dev *pci,</div><div class='add'>+				 const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -88,99 +66,77 @@ static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_cs46xx_create(card, pci,</div><div class='del'>-				     external_amp[dev], thinkpad[dev],</div><div class='del'>-				     &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	err = snd_cs46xx_create(card, pci,</div><div class='add'>+				external_amp[dev], thinkpad[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> 	card-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;accept_valid = mmap_valid[dev];</div><div class='del'>-	if ((err = snd_cs46xx_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_cs46xx_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	if ((err = snd_cs46xx_pcm_rear(chip,1, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_cs46xx_pcm_iec958(chip,2,NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_cs46xx_pcm_rear(chip, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_cs46xx_pcm_iec958(chip, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> #endif</div><div class='del'>-	if ((err = snd_cs46xx_mixer(chip, 2)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_cs46xx_mixer(chip, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	if (chip-&gt;nr_ac97_codecs ==2) {</div><div class='del'>-		if ((err = snd_cs46xx_pcm_center_lfe(chip,3,NULL)) &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+		err = snd_cs46xx_pcm_center_lfe(chip, 3);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto error;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	if ((err = snd_cs46xx_midi(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_cs46xx_start_dsp(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	err = snd_cs46xx_midi(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+	err = snd_cs46xx_start_dsp(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	snd_cs46xx_gameport(chip);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "CS46xx");</div><div class='del'>-	strcpy(card-&gt;shortname, "Sound Fusion CS46xx");</div><div class='add'>+	strscpy(card-&gt;driver, "CS46xx");</div><div class='add'>+	strscpy(card-&gt;shortname, "Sound Fusion CS46xx");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx/0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		chip-&gt;ba0_addr,</div><div class='ctx'> 		chip-&gt;ba1_addr,</div><div class='ctx'> 		chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+ error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "Sound Fusion CS46xx",</div><div class='add'>+static struct pci_driver cs46xx_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_cs46xx_ids,</div><div class='ctx'> 	.probe = snd_card_cs46xx_probe,</div><div class='del'>-	.remove = __devexit_p(snd_card_cs46xx_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_cs46xx_suspend,</div><div class='del'>-	.resume = snd_cs46xx_resume,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_cs46xx_pm,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_cs46xx_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cs46xx_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cs46xx_init)</div><div class='del'>-module_exit(alsa_card_cs46xx_exit)</div><div class='add'>+module_pci_driver(cs46xx_driver);</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx.h b/sound/pci/cs46xx/cs46xx.h<br/>new file mode 100644<br/>index 000000000000..c4f0a0b94270<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx.h</a></div><div class='hunk'>@@ -0,0 +1,1732 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef __SOUND_CS46XX_H</div><div class='add'>+#define __SOUND_CS46XX_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='add'>+ *		     Cirrus Logic, Inc.</div><div class='add'>+ *  Definitions for Cirrus Logic CS46xx chips</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/pcm-indirect.h&gt;</div><div class='add'>+#include &lt;sound/rawmidi.h&gt;</div><div class='add'>+#include &lt;sound/ac97_codec.h&gt;</div><div class='add'>+#include "cs46xx_dsp_spos.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  Direct registers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following define the offsets of the registers accessed via base address</div><div class='add'>+ *  register zero on the CS46xx part.</div><div class='add'>+ */</div><div class='add'>+#define BA0_HISR				0x00000000</div><div class='add'>+#define BA0_HSR0                                0x00000004</div><div class='add'>+#define BA0_HICR                                0x00000008</div><div class='add'>+#define BA0_DMSR                                0x00000100</div><div class='add'>+#define BA0_HSAR                                0x00000110</div><div class='add'>+#define BA0_HDAR                                0x00000114</div><div class='add'>+#define BA0_HDMR                                0x00000118</div><div class='add'>+#define BA0_HDCR                                0x0000011C</div><div class='add'>+#define BA0_PFMC                                0x00000200</div><div class='add'>+#define BA0_PFCV1                               0x00000204</div><div class='add'>+#define BA0_PFCV2                               0x00000208</div><div class='add'>+#define BA0_PCICFG00                            0x00000300</div><div class='add'>+#define BA0_PCICFG04                            0x00000304</div><div class='add'>+#define BA0_PCICFG08                            0x00000308</div><div class='add'>+#define BA0_PCICFG0C                            0x0000030C</div><div class='add'>+#define BA0_PCICFG10                            0x00000310</div><div class='add'>+#define BA0_PCICFG14                            0x00000314</div><div class='add'>+#define BA0_PCICFG18                            0x00000318</div><div class='add'>+#define BA0_PCICFG1C                            0x0000031C</div><div class='add'>+#define BA0_PCICFG20                            0x00000320</div><div class='add'>+#define BA0_PCICFG24                            0x00000324</div><div class='add'>+#define BA0_PCICFG28                            0x00000328</div><div class='add'>+#define BA0_PCICFG2C                            0x0000032C</div><div class='add'>+#define BA0_PCICFG30                            0x00000330</div><div class='add'>+#define BA0_PCICFG34                            0x00000334</div><div class='add'>+#define BA0_PCICFG38                            0x00000338</div><div class='add'>+#define BA0_PCICFG3C                            0x0000033C</div><div class='add'>+#define BA0_CLKCR1                              0x00000400</div><div class='add'>+#define BA0_CLKCR2                              0x00000404</div><div class='add'>+#define BA0_PLLM                                0x00000408</div><div class='add'>+#define BA0_PLLCC                               0x0000040C</div><div class='add'>+#define BA0_FRR                                 0x00000410 </div><div class='add'>+#define BA0_CFL1                                0x00000414</div><div class='add'>+#define BA0_CFL2                                0x00000418</div><div class='add'>+#define BA0_SERMC1                              0x00000420</div><div class='add'>+#define BA0_SERMC2                              0x00000424</div><div class='add'>+#define BA0_SERC1                               0x00000428</div><div class='add'>+#define BA0_SERC2                               0x0000042C</div><div class='add'>+#define BA0_SERC3                               0x00000430</div><div class='add'>+#define BA0_SERC4                               0x00000434</div><div class='add'>+#define BA0_SERC5                               0x00000438</div><div class='add'>+#define BA0_SERBSP                              0x0000043C</div><div class='add'>+#define BA0_SERBST                              0x00000440</div><div class='add'>+#define BA0_SERBCM                              0x00000444</div><div class='add'>+#define BA0_SERBAD                              0x00000448</div><div class='add'>+#define BA0_SERBCF                              0x0000044C</div><div class='add'>+#define BA0_SERBWP                              0x00000450</div><div class='add'>+#define BA0_SERBRP                              0x00000454</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define BA0_ASER_FADDR                          0x00000458</div><div class='add'>+#endif</div><div class='add'>+#define BA0_ACCTL                               0x00000460</div><div class='add'>+#define BA0_ACSTS                               0x00000464</div><div class='add'>+#define BA0_ACOSV                               0x00000468</div><div class='add'>+#define BA0_ACCAD                               0x0000046C</div><div class='add'>+#define BA0_ACCDA                               0x00000470</div><div class='add'>+#define BA0_ACISV                               0x00000474</div><div class='add'>+#define BA0_ACSAD                               0x00000478</div><div class='add'>+#define BA0_ACSDA                               0x0000047C</div><div class='add'>+#define BA0_JSPT                                0x00000480</div><div class='add'>+#define BA0_JSCTL                               0x00000484</div><div class='add'>+#define BA0_JSC1                                0x00000488</div><div class='add'>+#define BA0_JSC2                                0x0000048C</div><div class='add'>+#define BA0_MIDCR                               0x00000490</div><div class='add'>+#define BA0_MIDSR                               0x00000494</div><div class='add'>+#define BA0_MIDWP                               0x00000498</div><div class='add'>+#define BA0_MIDRP                               0x0000049C</div><div class='add'>+#define BA0_JSIO                                0x000004A0</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define BA0_ASER_MASTER                         0x000004A4</div><div class='add'>+#endif</div><div class='add'>+#define BA0_CFGI                                0x000004B0</div><div class='add'>+#define BA0_SSVID                               0x000004B4</div><div class='add'>+#define BA0_GPIOR                               0x000004B8</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define BA0_EGPIODR                             0x000004BC</div><div class='add'>+#define BA0_EGPIOPTR                            0x000004C0</div><div class='add'>+#define BA0_EGPIOTR                             0x000004C4</div><div class='add'>+#define BA0_EGPIOWR                             0x000004C8</div><div class='add'>+#define BA0_EGPIOSR                             0x000004CC</div><div class='add'>+#define BA0_SERC6                               0x000004D0</div><div class='add'>+#define BA0_SERC7                               0x000004D4</div><div class='add'>+#define BA0_SERACC                              0x000004D8</div><div class='add'>+#define BA0_ACCTL2                              0x000004E0</div><div class='add'>+#define BA0_ACSTS2                              0x000004E4</div><div class='add'>+#define BA0_ACOSV2                              0x000004E8</div><div class='add'>+#define BA0_ACCAD2                              0x000004EC</div><div class='add'>+#define BA0_ACCDA2                              0x000004F0</div><div class='add'>+#define BA0_ACISV2                              0x000004F4</div><div class='add'>+#define BA0_ACSAD2                              0x000004F8</div><div class='add'>+#define BA0_ACSDA2                              0x000004FC</div><div class='add'>+#define BA0_IOTAC0                              0x00000500</div><div class='add'>+#define BA0_IOTAC1                              0x00000504</div><div class='add'>+#define BA0_IOTAC2                              0x00000508</div><div class='add'>+#define BA0_IOTAC3                              0x0000050C</div><div class='add'>+#define BA0_IOTAC4                              0x00000510</div><div class='add'>+#define BA0_IOTAC5                              0x00000514</div><div class='add'>+#define BA0_IOTAC6                              0x00000518</div><div class='add'>+#define BA0_IOTAC7                              0x0000051C</div><div class='add'>+#define BA0_IOTAC8                              0x00000520</div><div class='add'>+#define BA0_IOTAC9                              0x00000524</div><div class='add'>+#define BA0_IOTAC10                             0x00000528</div><div class='add'>+#define BA0_IOTAC11                             0x0000052C</div><div class='add'>+#define BA0_IOTFR0                              0x00000540</div><div class='add'>+#define BA0_IOTFR1                              0x00000544</div><div class='add'>+#define BA0_IOTFR2                              0x00000548</div><div class='add'>+#define BA0_IOTFR3                              0x0000054C</div><div class='add'>+#define BA0_IOTFR4                              0x00000550</div><div class='add'>+#define BA0_IOTFR5                              0x00000554</div><div class='add'>+#define BA0_IOTFR6                              0x00000558</div><div class='add'>+#define BA0_IOTFR7                              0x0000055C</div><div class='add'>+#define BA0_IOTFIFO                             0x00000580</div><div class='add'>+#define BA0_IOTRRD                              0x00000584</div><div class='add'>+#define BA0_IOTFP                               0x00000588</div><div class='add'>+#define BA0_IOTCR                               0x0000058C</div><div class='add'>+#define BA0_DPCID                               0x00000590</div><div class='add'>+#define BA0_DPCIA                               0x00000594</div><div class='add'>+#define BA0_DPCIC                               0x00000598</div><div class='add'>+#define BA0_PCPCIR                              0x00000600</div><div class='add'>+#define BA0_PCPCIG                              0x00000604</div><div class='add'>+#define BA0_PCPCIEN                             0x00000608</div><div class='add'>+#define BA0_EPCIPMC                             0x00000610</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following define the offsets of the registers and memories accessed via</div><div class='add'>+ *  base address register one on the CS46xx part.</div><div class='add'>+ */</div><div class='add'>+#define BA1_SP_DMEM0                            0x00000000</div><div class='add'>+#define BA1_SP_DMEM1                            0x00010000</div><div class='add'>+#define BA1_SP_PMEM                             0x00020000</div><div class='add'>+#define BA1_SP_REG				0x00030000</div><div class='add'>+#define BA1_SPCR                                0x00030000</div><div class='add'>+#define BA1_DREG                                0x00030004</div><div class='add'>+#define BA1_DSRWP                               0x00030008</div><div class='add'>+#define BA1_TWPR                                0x0003000C</div><div class='add'>+#define BA1_SPWR                                0x00030010</div><div class='add'>+#define BA1_SPIR                                0x00030014</div><div class='add'>+#define BA1_FGR1                                0x00030020</div><div class='add'>+#define BA1_SPCS                                0x00030028</div><div class='add'>+#define BA1_SDSR                                0x0003002C</div><div class='add'>+#define BA1_FRMT                                0x00030030</div><div class='add'>+#define BA1_FRCC                                0x00030034</div><div class='add'>+#define BA1_FRSC                                0x00030038</div><div class='add'>+#define BA1_OMNI_MEM                            0x000E0000</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host interrupt status</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define HISR_VC_MASK                            0x0000FFFF</div><div class='add'>+#define HISR_VC0                                0x00000001</div><div class='add'>+#define HISR_VC1                                0x00000002</div><div class='add'>+#define HISR_VC2                                0x00000004</div><div class='add'>+#define HISR_VC3                                0x00000008</div><div class='add'>+#define HISR_VC4                                0x00000010</div><div class='add'>+#define HISR_VC5                                0x00000020</div><div class='add'>+#define HISR_VC6                                0x00000040</div><div class='add'>+#define HISR_VC7                                0x00000080</div><div class='add'>+#define HISR_VC8                                0x00000100</div><div class='add'>+#define HISR_VC9                                0x00000200</div><div class='add'>+#define HISR_VC10                               0x00000400</div><div class='add'>+#define HISR_VC11                               0x00000800</div><div class='add'>+#define HISR_VC12                               0x00001000</div><div class='add'>+#define HISR_VC13                               0x00002000</div><div class='add'>+#define HISR_VC14                               0x00004000</div><div class='add'>+#define HISR_VC15                               0x00008000</div><div class='add'>+#define HISR_INT0                               0x00010000</div><div class='add'>+#define HISR_INT1                               0x00020000</div><div class='add'>+#define HISR_DMAI                               0x00040000</div><div class='add'>+#define HISR_FROVR                              0x00080000</div><div class='add'>+#define HISR_MIDI                               0x00100000</div><div class='add'>+#ifdef NO_CS4612</div><div class='add'>+#define HISR_RESERVED                           0x0FE00000</div><div class='add'>+#else</div><div class='add'>+#define HISR_SBINT                              0x00200000</div><div class='add'>+#define HISR_RESERVED                           0x0FC00000</div><div class='add'>+#endif</div><div class='add'>+#define HISR_H0P                                0x40000000</div><div class='add'>+#define HISR_INTENA                             0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host signal register 0.</div><div class='add'>+ */</div><div class='add'>+#define HSR0_VC_MASK                            0xFFFFFFFF</div><div class='add'>+#define HSR0_VC16                               0x00000001</div><div class='add'>+#define HSR0_VC17                               0x00000002</div><div class='add'>+#define HSR0_VC18                               0x00000004</div><div class='add'>+#define HSR0_VC19                               0x00000008</div><div class='add'>+#define HSR0_VC20                               0x00000010</div><div class='add'>+#define HSR0_VC21                               0x00000020</div><div class='add'>+#define HSR0_VC22                               0x00000040</div><div class='add'>+#define HSR0_VC23                               0x00000080</div><div class='add'>+#define HSR0_VC24                               0x00000100</div><div class='add'>+#define HSR0_VC25                               0x00000200</div><div class='add'>+#define HSR0_VC26                               0x00000400</div><div class='add'>+#define HSR0_VC27                               0x00000800</div><div class='add'>+#define HSR0_VC28                               0x00001000</div><div class='add'>+#define HSR0_VC29                               0x00002000</div><div class='add'>+#define HSR0_VC30                               0x00004000</div><div class='add'>+#define HSR0_VC31                               0x00008000</div><div class='add'>+#define HSR0_VC32                               0x00010000</div><div class='add'>+#define HSR0_VC33                               0x00020000</div><div class='add'>+#define HSR0_VC34                               0x00040000</div><div class='add'>+#define HSR0_VC35                               0x00080000</div><div class='add'>+#define HSR0_VC36                               0x00100000</div><div class='add'>+#define HSR0_VC37                               0x00200000</div><div class='add'>+#define HSR0_VC38                               0x00400000</div><div class='add'>+#define HSR0_VC39                               0x00800000</div><div class='add'>+#define HSR0_VC40                               0x01000000</div><div class='add'>+#define HSR0_VC41                               0x02000000</div><div class='add'>+#define HSR0_VC42                               0x04000000</div><div class='add'>+#define HSR0_VC43                               0x08000000</div><div class='add'>+#define HSR0_VC44                               0x10000000</div><div class='add'>+#define HSR0_VC45                               0x20000000</div><div class='add'>+#define HSR0_VC46                               0x40000000</div><div class='add'>+#define HSR0_VC47                               0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host interrupt control</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define HICR_IEV                                0x00000001</div><div class='add'>+#define HICR_CHGM                               0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the DMA status register.</div><div class='add'>+ */</div><div class='add'>+#define DMSR_HP                                 0x00000001</div><div class='add'>+#define DMSR_HR                                 0x00000002</div><div class='add'>+#define DMSR_SP                                 0x00000004</div><div class='add'>+#define DMSR_SR                                 0x00000008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host DMA source address</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define HSAR_HOST_ADDR_MASK                     0xFFFFFFFF</div><div class='add'>+#define HSAR_DSP_ADDR_MASK                      0x0000FFFF</div><div class='add'>+#define HSAR_MEMID_MASK                         0x000F0000</div><div class='add'>+#define HSAR_MEMID_SP_DMEM0                     0x00000000</div><div class='add'>+#define HSAR_MEMID_SP_DMEM1                     0x00010000</div><div class='add'>+#define HSAR_MEMID_SP_PMEM                      0x00020000</div><div class='add'>+#define HSAR_MEMID_SP_DEBUG                     0x00030000</div><div class='add'>+#define HSAR_MEMID_OMNI_MEM                     0x000E0000</div><div class='add'>+#define HSAR_END                                0x40000000</div><div class='add'>+#define HSAR_ERR                                0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host DMA destination address</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define HDAR_HOST_ADDR_MASK                     0xFFFFFFFF</div><div class='add'>+#define HDAR_DSP_ADDR_MASK                      0x0000FFFF</div><div class='add'>+#define HDAR_MEMID_MASK                         0x000F0000</div><div class='add'>+#define HDAR_MEMID_SP_DMEM0                     0x00000000</div><div class='add'>+#define HDAR_MEMID_SP_DMEM1                     0x00010000</div><div class='add'>+#define HDAR_MEMID_SP_PMEM                      0x00020000</div><div class='add'>+#define HDAR_MEMID_SP_DEBUG                     0x00030000</div><div class='add'>+#define HDAR_MEMID_OMNI_MEM                     0x000E0000</div><div class='add'>+#define HDAR_END                                0x40000000</div><div class='add'>+#define HDAR_ERR                                0x80000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host DMA control register.</div><div class='add'>+ */</div><div class='add'>+#define HDMR_AC_MASK                            0x0000F000</div><div class='add'>+#define HDMR_AC_8_16                            0x00001000</div><div class='add'>+#define HDMR_AC_M_S                             0x00002000</div><div class='add'>+#define HDMR_AC_B_L                             0x00004000</div><div class='add'>+#define HDMR_AC_S_U                             0x00008000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the host DMA control register.</div><div class='add'>+ */</div><div class='add'>+#define HDCR_COUNT_MASK                         0x000003FF</div><div class='add'>+#define HDCR_DONE                               0x00004000</div><div class='add'>+#define HDCR_OPT                                0x00008000</div><div class='add'>+#define HDCR_WBD                                0x00400000</div><div class='add'>+#define HDCR_WBS                                0x00800000</div><div class='add'>+#define HDCR_DMS_MASK                           0x07000000</div><div class='add'>+#define HDCR_DMS_LINEAR                         0x00000000</div><div class='add'>+#define HDCR_DMS_16_DWORDS                      0x01000000</div><div class='add'>+#define HDCR_DMS_32_DWORDS                      0x02000000</div><div class='add'>+#define HDCR_DMS_64_DWORDS                      0x03000000</div><div class='add'>+#define HDCR_DMS_128_DWORDS                     0x04000000</div><div class='add'>+#define HDCR_DMS_256_DWORDS                     0x05000000</div><div class='add'>+#define HDCR_DMS_512_DWORDS                     0x06000000</div><div class='add'>+#define HDCR_DMS_1024_DWORDS                    0x07000000</div><div class='add'>+#define HDCR_DH                                 0x08000000</div><div class='add'>+#define HDCR_SMS_MASK                           0x70000000</div><div class='add'>+#define HDCR_SMS_LINEAR                         0x00000000</div><div class='add'>+#define HDCR_SMS_16_DWORDS                      0x10000000</div><div class='add'>+#define HDCR_SMS_32_DWORDS                      0x20000000</div><div class='add'>+#define HDCR_SMS_64_DWORDS                      0x30000000</div><div class='add'>+#define HDCR_SMS_128_DWORDS                     0x40000000</div><div class='add'>+#define HDCR_SMS_256_DWORDS                     0x50000000</div><div class='add'>+#define HDCR_SMS_512_DWORDS                     0x60000000</div><div class='add'>+#define HDCR_SMS_1024_DWORDS                    0x70000000</div><div class='add'>+#define HDCR_SH                                 0x80000000</div><div class='add'>+#define HDCR_COUNT_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the performance monitor control</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define PFMC_C1SS_MASK                          0x0000001F</div><div class='add'>+#define PFMC_C1EV                               0x00000020</div><div class='add'>+#define PFMC_C1RS                               0x00008000</div><div class='add'>+#define PFMC_C2SS_MASK                          0x001F0000</div><div class='add'>+#define PFMC_C2EV                               0x00200000</div><div class='add'>+#define PFMC_C2RS                               0x80000000</div><div class='add'>+#define PFMC_C1SS_SHIFT                         0</div><div class='add'>+#define PFMC_C2SS_SHIFT                         16</div><div class='add'>+#define PFMC_BUS_GRANT                          0</div><div class='add'>+#define PFMC_GRANT_AFTER_REQ                    1</div><div class='add'>+#define PFMC_TRANSACTION                        2</div><div class='add'>+#define PFMC_DWORD_TRANSFER                     3</div><div class='add'>+#define PFMC_SLAVE_READ                         4</div><div class='add'>+#define PFMC_SLAVE_WRITE                        5</div><div class='add'>+#define PFMC_PREEMPTION                         6</div><div class='add'>+#define PFMC_DISCONNECT_RETRY                   7</div><div class='add'>+#define PFMC_INTERRUPT                          8</div><div class='add'>+#define PFMC_BUS_OWNERSHIP                      9</div><div class='add'>+#define PFMC_TRANSACTION_LAG                    10</div><div class='add'>+#define PFMC_PCI_CLOCK                          11</div><div class='add'>+#define PFMC_SERIAL_CLOCK                       12</div><div class='add'>+#define PFMC_SP_CLOCK                           13</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the performance counter value 1</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define PFCV1_PC1V_MASK                         0xFFFFFFFF</div><div class='add'>+#define PFCV1_PC1V_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the performance counter value 2</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define PFCV2_PC2V_MASK                         0xFFFFFFFF</div><div class='add'>+#define PFCV2_PC2V_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the clock control register 1.</div><div class='add'>+ */</div><div class='add'>+#define CLKCR1_OSCS                             0x00000001</div><div class='add'>+#define CLKCR1_OSCP                             0x00000002</div><div class='add'>+#define CLKCR1_PLLSS_MASK                       0x0000000C</div><div class='add'>+#define CLKCR1_PLLSS_SERIAL                     0x00000000</div><div class='add'>+#define CLKCR1_PLLSS_CRYSTAL                    0x00000004</div><div class='add'>+#define CLKCR1_PLLSS_PCI                        0x00000008</div><div class='add'>+#define CLKCR1_PLLSS_RESERVED                   0x0000000C</div><div class='add'>+#define CLKCR1_PLLP                             0x00000010</div><div class='add'>+#define CLKCR1_SWCE                             0x00000020</div><div class='add'>+#define CLKCR1_PLLOS                            0x00000040</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the clock control register 2.</div><div class='add'>+ */</div><div class='add'>+#define CLKCR2_PDIVS_MASK                       0x0000000F</div><div class='add'>+#define CLKCR2_PDIVS_1                          0x00000001</div><div class='add'>+#define CLKCR2_PDIVS_2                          0x00000002</div><div class='add'>+#define CLKCR2_PDIVS_4                          0x00000004</div><div class='add'>+#define CLKCR2_PDIVS_7                          0x00000007</div><div class='add'>+#define CLKCR2_PDIVS_8                          0x00000008</div><div class='add'>+#define CLKCR2_PDIVS_16                         0x00000000</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the PLL multiplier register.</div><div class='add'>+ */</div><div class='add'>+#define PLLM_MASK                               0x000000FF</div><div class='add'>+#define PLLM_SHIFT                              0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the PLL capacitor coefficient</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define PLLCC_CDR_MASK                          0x00000007</div><div class='add'>+#ifndef NO_CS4610</div><div class='add'>+#define PLLCC_CDR_240_350_MHZ                   0x00000000</div><div class='add'>+#define PLLCC_CDR_184_265_MHZ                   0x00000001</div><div class='add'>+#define PLLCC_CDR_144_205_MHZ                   0x00000002</div><div class='add'>+#define PLLCC_CDR_111_160_MHZ                   0x00000003</div><div class='add'>+#define PLLCC_CDR_87_123_MHZ                    0x00000004</div><div class='add'>+#define PLLCC_CDR_67_96_MHZ                     0x00000005</div><div class='add'>+#define PLLCC_CDR_52_74_MHZ                     0x00000006</div><div class='add'>+#define PLLCC_CDR_45_58_MHZ                     0x00000007</div><div class='add'>+#endif</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define PLLCC_CDR_271_398_MHZ                   0x00000000</div><div class='add'>+#define PLLCC_CDR_227_330_MHZ                   0x00000001</div><div class='add'>+#define PLLCC_CDR_167_239_MHZ                   0x00000002</div><div class='add'>+#define PLLCC_CDR_150_215_MHZ                   0x00000003</div><div class='add'>+#define PLLCC_CDR_107_154_MHZ                   0x00000004</div><div class='add'>+#define PLLCC_CDR_98_140_MHZ                    0x00000005</div><div class='add'>+#define PLLCC_CDR_73_104_MHZ                    0x00000006</div><div class='add'>+#define PLLCC_CDR_63_90_MHZ                     0x00000007</div><div class='add'>+#endif</div><div class='add'>+#define PLLCC_LPF_MASK                          0x000000F8</div><div class='add'>+#ifndef NO_CS4610</div><div class='add'>+#define PLLCC_LPF_23850_60000_KHZ               0x00000000</div><div class='add'>+#define PLLCC_LPF_7960_26290_KHZ                0x00000008</div><div class='add'>+#define PLLCC_LPF_4160_10980_KHZ                0x00000018</div><div class='add'>+#define PLLCC_LPF_1740_4580_KHZ                 0x00000038</div><div class='add'>+#define PLLCC_LPF_724_1910_KHZ                  0x00000078</div><div class='add'>+#define PLLCC_LPF_317_798_KHZ                   0x000000F8</div><div class='add'>+#endif</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define PLLCC_LPF_25580_64530_KHZ               0x00000000</div><div class='add'>+#define PLLCC_LPF_14360_37270_KHZ               0x00000008</div><div class='add'>+#define PLLCC_LPF_6100_16020_KHZ                0x00000018</div><div class='add'>+#define PLLCC_LPF_2540_6690_KHZ                 0x00000038</div><div class='add'>+#define PLLCC_LPF_1050_2780_KHZ                 0x00000078</div><div class='add'>+#define PLLCC_LPF_450_1160_KHZ                  0x000000F8</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the feature reporting register.</div><div class='add'>+ */</div><div class='add'>+#define FRR_FAB_MASK                            0x00000003</div><div class='add'>+#define FRR_MASK_MASK                           0x0000001C</div><div class='add'>+#ifdef NO_CS4612</div><div class='add'>+#define FRR_CFOP_MASK                           0x000000E0</div><div class='add'>+#else</div><div class='add'>+#define FRR_CFOP_MASK                           0x00000FE0</div><div class='add'>+#endif</div><div class='add'>+#define FRR_CFOP_NOT_DVD                        0x00000020</div><div class='add'>+#define FRR_CFOP_A3D                            0x00000040</div><div class='add'>+#define FRR_CFOP_128_PIN                        0x00000080</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define FRR_CFOP_CS4280                         0x00000800</div><div class='add'>+#endif</div><div class='add'>+#define FRR_FAB_SHIFT                           0</div><div class='add'>+#define FRR_MASK_SHIFT                          2</div><div class='add'>+#define FRR_CFOP_SHIFT                          5</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the configuration load 1</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define CFL1_CLOCK_SOURCE_MASK                  0x00000003</div><div class='add'>+#define CFL1_CLOCK_SOURCE_CS423X                0x00000000</div><div class='add'>+#define CFL1_CLOCK_SOURCE_AC97                  0x00000001</div><div class='add'>+#define CFL1_CLOCK_SOURCE_CRYSTAL               0x00000002</div><div class='add'>+#define CFL1_CLOCK_SOURCE_DUAL_AC97             0x00000003</div><div class='add'>+#define CFL1_VALID_DATA_MASK                    0x000000FF</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the configuration load 2</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define CFL2_VALID_DATA_MASK                    0x000000FF</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port master control</div><div class='add'>+ *  register 1.</div><div class='add'>+ */</div><div class='add'>+#define SERMC1_MSPE                             0x00000001</div><div class='add'>+#define SERMC1_PTC_MASK                         0x0000000E</div><div class='add'>+#define SERMC1_PTC_CS423X                       0x00000000</div><div class='add'>+#define SERMC1_PTC_AC97                         0x00000002</div><div class='add'>+#define SERMC1_PTC_DAC                          0x00000004</div><div class='add'>+#define SERMC1_PLB                              0x00000010</div><div class='add'>+#define SERMC1_XLB                              0x00000020</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port master control</div><div class='add'>+ *  register 2.</div><div class='add'>+ */</div><div class='add'>+#define SERMC2_LROE                             0x00000001</div><div class='add'>+#define SERMC2_MCOE                             0x00000002</div><div class='add'>+#define SERMC2_MCDIV                            0x00000004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 1 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERC1_SO1EN                             0x00000001</div><div class='add'>+#define SERC1_SO1F_MASK                         0x0000000E</div><div class='add'>+#define SERC1_SO1F_CS423X                       0x00000000</div><div class='add'>+#define SERC1_SO1F_AC97                         0x00000002</div><div class='add'>+#define SERC1_SO1F_DAC                          0x00000004</div><div class='add'>+#define SERC1_SO1F_SPDIF                        0x00000006</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 2 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERC2_SI1EN                             0x00000001</div><div class='add'>+#define SERC2_SI1F_MASK                         0x0000000E</div><div class='add'>+#define SERC2_SI1F_CS423X                       0x00000000</div><div class='add'>+#define SERC2_SI1F_AC97                         0x00000002</div><div class='add'>+#define SERC2_SI1F_ADC                          0x00000004</div><div class='add'>+#define SERC2_SI1F_SPDIF                        0x00000006</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 3 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERC3_SO2EN                             0x00000001</div><div class='add'>+#define SERC3_SO2F_MASK                         0x00000006</div><div class='add'>+#define SERC3_SO2F_DAC                          0x00000000</div><div class='add'>+#define SERC3_SO2F_SPDIF                        0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 4 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERC4_SO3EN                             0x00000001</div><div class='add'>+#define SERC4_SO3F_MASK                         0x00000006</div><div class='add'>+#define SERC4_SO3F_DAC                          0x00000000</div><div class='add'>+#define SERC4_SO3F_SPDIF                        0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 5 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERC5_SI2EN                             0x00000001</div><div class='add'>+#define SERC5_SI2F_MASK                         0x00000006</div><div class='add'>+#define SERC5_SI2F_ADC                          0x00000000</div><div class='add'>+#define SERC5_SI2F_SPDIF                        0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor sample</div><div class='add'>+ *  pointer register.</div><div class='add'>+ */</div><div class='add'>+#define SERBSP_FSP_MASK                         0x0000000F</div><div class='add'>+#define SERBSP_FSP_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor status</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERBST_RRDY                             0x00000001</div><div class='add'>+#define SERBST_WBSY                             0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor command</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SERBCM_RDC                              0x00000001</div><div class='add'>+#define SERBCM_WRC                              0x00000002</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor address</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifdef NO_CS4612</div><div class='add'>+#define SERBAD_FAD_MASK                         0x000000FF</div><div class='add'>+#else</div><div class='add'>+#define SERBAD_FAD_MASK                         0x000001FF</div><div class='add'>+#endif</div><div class='add'>+#define SERBAD_FAD_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor</div><div class='add'>+ *  configuration register.</div><div class='add'>+ */</div><div class='add'>+#define SERBCF_HBP                              0x00000001</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor write</div><div class='add'>+ *  port register.</div><div class='add'>+ */</div><div class='add'>+#define SERBWP_FWD_MASK                         0x000FFFFF</div><div class='add'>+#define SERBWP_FWD_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port backdoor read</div><div class='add'>+ *  port register.</div><div class='add'>+ */</div><div class='add'>+#define SERBRP_FRD_MASK                         0x000FFFFF</div><div class='add'>+#define SERBRP_FRD_SHIFT                        0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the async FIFO address register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ASER_FADDR_A1_MASK                      0x000001FF</div><div class='add'>+#define ASER_FADDR_EN1                          0x00008000</div><div class='add'>+#define ASER_FADDR_A2_MASK                      0x01FF0000</div><div class='add'>+#define ASER_FADDR_EN2                          0x80000000</div><div class='add'>+#define ASER_FADDR_A1_SHIFT                     0</div><div class='add'>+#define ASER_FADDR_A2_SHIFT                     16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 control register.</div><div class='add'>+ */</div><div class='add'>+#define ACCTL_RSTN                              0x00000001</div><div class='add'>+#define ACCTL_ESYN                              0x00000002</div><div class='add'>+#define ACCTL_VFRM                              0x00000004</div><div class='add'>+#define ACCTL_DCV                               0x00000008</div><div class='add'>+#define ACCTL_CRW                               0x00000010</div><div class='add'>+#define ACCTL_ASYN                              0x00000020</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACCTL_TC                                0x00000040</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status register.</div><div class='add'>+ */</div><div class='add'>+#define ACSTS_CRDY                              0x00000001</div><div class='add'>+#define ACSTS_VSTS                              0x00000002</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACSTS_WKUP                              0x00000004</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 output slot valid</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define ACOSV_SLV3                              0x00000001</div><div class='add'>+#define ACOSV_SLV4                              0x00000002</div><div class='add'>+#define ACOSV_SLV5                              0x00000004</div><div class='add'>+#define ACOSV_SLV6                              0x00000008</div><div class='add'>+#define ACOSV_SLV7                              0x00000010</div><div class='add'>+#define ACOSV_SLV8                              0x00000020</div><div class='add'>+#define ACOSV_SLV9                              0x00000040</div><div class='add'>+#define ACOSV_SLV10                             0x00000080</div><div class='add'>+#define ACOSV_SLV11                             0x00000100</div><div class='add'>+#define ACOSV_SLV12                             0x00000200</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 command address</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define ACCAD_CI_MASK                           0x0000007F</div><div class='add'>+#define ACCAD_CI_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 command data register.</div><div class='add'>+ */</div><div class='add'>+#define ACCDA_CD_MASK                           0x0000FFFF</div><div class='add'>+#define ACCDA_CD_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 input slot valid</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define ACISV_ISV3                              0x00000001</div><div class='add'>+#define ACISV_ISV4                              0x00000002</div><div class='add'>+#define ACISV_ISV5                              0x00000004</div><div class='add'>+#define ACISV_ISV6                              0x00000008</div><div class='add'>+#define ACISV_ISV7                              0x00000010</div><div class='add'>+#define ACISV_ISV8                              0x00000020</div><div class='add'>+#define ACISV_ISV9                              0x00000040</div><div class='add'>+#define ACISV_ISV10                             0x00000080</div><div class='add'>+#define ACISV_ISV11                             0x00000100</div><div class='add'>+#define ACISV_ISV12                             0x00000200</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status address</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define ACSAD_SI_MASK                           0x0000007F</div><div class='add'>+#define ACSAD_SI_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status data register.</div><div class='add'>+ */</div><div class='add'>+#define ACSDA_SD_MASK                           0x0000FFFF</div><div class='add'>+#define ACSDA_SD_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the joystick poll/trigger</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define JSPT_CAX                                0x00000001</div><div class='add'>+#define JSPT_CAY                                0x00000002</div><div class='add'>+#define JSPT_CBX                                0x00000004</div><div class='add'>+#define JSPT_CBY                                0x00000008</div><div class='add'>+#define JSPT_BA1                                0x00000010</div><div class='add'>+#define JSPT_BA2                                0x00000020</div><div class='add'>+#define JSPT_BB1                                0x00000040</div><div class='add'>+#define JSPT_BB2                                0x00000080</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the joystick control register.</div><div class='add'>+ */</div><div class='add'>+#define JSCTL_SP_MASK                           0x00000003</div><div class='add'>+#define JSCTL_SP_SLOW                           0x00000000</div><div class='add'>+#define JSCTL_SP_MEDIUM_SLOW                    0x00000001</div><div class='add'>+#define JSCTL_SP_MEDIUM_FAST                    0x00000002</div><div class='add'>+#define JSCTL_SP_FAST                           0x00000003</div><div class='add'>+#define JSCTL_ARE                               0x00000004</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the joystick coordinate pair 1</div><div class='add'>+ *  readback register.</div><div class='add'>+ */</div><div class='add'>+#define JSC1_Y1V_MASK                           0x0000FFFF</div><div class='add'>+#define JSC1_X1V_MASK                           0xFFFF0000</div><div class='add'>+#define JSC1_Y1V_SHIFT                          0</div><div class='add'>+#define JSC1_X1V_SHIFT                          16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the joystick coordinate pair 2</div><div class='add'>+ *  readback register.</div><div class='add'>+ */</div><div class='add'>+#define JSC2_Y2V_MASK                           0x0000FFFF</div><div class='add'>+#define JSC2_X2V_MASK                           0xFFFF0000</div><div class='add'>+#define JSC2_Y2V_SHIFT                          0</div><div class='add'>+#define JSC2_X2V_SHIFT                          16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the MIDI control register.</div><div class='add'>+ */</div><div class='add'>+#define MIDCR_TXE                               0x00000001	/* Enable transmitting. */</div><div class='add'>+#define MIDCR_RXE                               0x00000002	/* Enable receiving. */</div><div class='add'>+#define MIDCR_RIE                               0x00000004	/* Interrupt upon tx ready. */</div><div class='add'>+#define MIDCR_TIE                               0x00000008	/* Interrupt upon rx ready. */</div><div class='add'>+#define MIDCR_MLB                               0x00000010	/* Enable midi loopback. */</div><div class='add'>+#define MIDCR_MRST                              0x00000020	/* Reset interface. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the MIDI status register.</div><div class='add'>+ */</div><div class='add'>+#define MIDSR_TBF                               0x00000001	/* Tx FIFO is full. */</div><div class='add'>+#define MIDSR_RBE                               0x00000002	/* Rx FIFO is empty. */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the MIDI write port register.</div><div class='add'>+ */</div><div class='add'>+#define MIDWP_MWD_MASK                          0x000000FF</div><div class='add'>+#define MIDWP_MWD_SHIFT                         0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the MIDI read port register.</div><div class='add'>+ */</div><div class='add'>+#define MIDRP_MRD_MASK                          0x000000FF</div><div class='add'>+#define MIDRP_MRD_SHIFT                         0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the joystick GPIO register.</div><div class='add'>+ */</div><div class='add'>+#define JSIO_DAX                                0x00000001</div><div class='add'>+#define JSIO_DAY                                0x00000002</div><div class='add'>+#define JSIO_DBX                                0x00000004</div><div class='add'>+#define JSIO_DBY                                0x00000008</div><div class='add'>+#define JSIO_AXOE                               0x00000010</div><div class='add'>+#define JSIO_AYOE                               0x00000020</div><div class='add'>+#define JSIO_BXOE                               0x00000040</div><div class='add'>+#define JSIO_BYOE                               0x00000080</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the master async/sync serial</div><div class='add'>+ *  port enable register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ASER_MASTER_ME                          0x00000001</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the configuration interface</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define CFGI_CLK                                0x00000001</div><div class='add'>+#define CFGI_DOUT                               0x00000002</div><div class='add'>+#define CFGI_DIN_EEN                            0x00000004</div><div class='add'>+#define CFGI_EELD                               0x00000008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the subsystem ID and vendor ID</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SSVID_VID_MASK                          0x0000FFFF</div><div class='add'>+#define SSVID_SID_MASK                          0xFFFF0000</div><div class='add'>+#define SSVID_VID_SHIFT                         0</div><div class='add'>+#define SSVID_SID_SHIFT                         16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the GPIO pin interface register.</div><div class='add'>+ */</div><div class='add'>+#define GPIOR_VOLDN                             0x00000001</div><div class='add'>+#define GPIOR_VOLUP                             0x00000002</div><div class='add'>+#define GPIOR_SI2D                              0x00000004</div><div class='add'>+#define GPIOR_SI2OE                             0x00000008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended GPIO pin direction</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EGPIODR_GPOE0                           0x00000001</div><div class='add'>+#define EGPIODR_GPOE1                           0x00000002</div><div class='add'>+#define EGPIODR_GPOE2                           0x00000004</div><div class='add'>+#define EGPIODR_GPOE3                           0x00000008</div><div class='add'>+#define EGPIODR_GPOE4                           0x00000010</div><div class='add'>+#define EGPIODR_GPOE5                           0x00000020</div><div class='add'>+#define EGPIODR_GPOE6                           0x00000040</div><div class='add'>+#define EGPIODR_GPOE7                           0x00000080</div><div class='add'>+#define EGPIODR_GPOE8                           0x00000100</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended GPIO pin polarity/</div><div class='add'>+ *  type register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EGPIOPTR_GPPT0                          0x00000001</div><div class='add'>+#define EGPIOPTR_GPPT1                          0x00000002</div><div class='add'>+#define EGPIOPTR_GPPT2                          0x00000004</div><div class='add'>+#define EGPIOPTR_GPPT3                          0x00000008</div><div class='add'>+#define EGPIOPTR_GPPT4                          0x00000010</div><div class='add'>+#define EGPIOPTR_GPPT5                          0x00000020</div><div class='add'>+#define EGPIOPTR_GPPT6                          0x00000040</div><div class='add'>+#define EGPIOPTR_GPPT7                          0x00000080</div><div class='add'>+#define EGPIOPTR_GPPT8                          0x00000100</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended GPIO pin sticky</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EGPIOTR_GPS0                            0x00000001</div><div class='add'>+#define EGPIOTR_GPS1                            0x00000002</div><div class='add'>+#define EGPIOTR_GPS2                            0x00000004</div><div class='add'>+#define EGPIOTR_GPS3                            0x00000008</div><div class='add'>+#define EGPIOTR_GPS4                            0x00000010</div><div class='add'>+#define EGPIOTR_GPS5                            0x00000020</div><div class='add'>+#define EGPIOTR_GPS6                            0x00000040</div><div class='add'>+#define EGPIOTR_GPS7                            0x00000080</div><div class='add'>+#define EGPIOTR_GPS8                            0x00000100</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended GPIO ping wakeup</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EGPIOWR_GPW0                            0x00000001</div><div class='add'>+#define EGPIOWR_GPW1                            0x00000002</div><div class='add'>+#define EGPIOWR_GPW2                            0x00000004</div><div class='add'>+#define EGPIOWR_GPW3                            0x00000008</div><div class='add'>+#define EGPIOWR_GPW4                            0x00000010</div><div class='add'>+#define EGPIOWR_GPW5                            0x00000020</div><div class='add'>+#define EGPIOWR_GPW6                            0x00000040</div><div class='add'>+#define EGPIOWR_GPW7                            0x00000080</div><div class='add'>+#define EGPIOWR_GPW8                            0x00000100</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended GPIO pin status</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EGPIOSR_GPS0                            0x00000001</div><div class='add'>+#define EGPIOSR_GPS1                            0x00000002</div><div class='add'>+#define EGPIOSR_GPS2                            0x00000004</div><div class='add'>+#define EGPIOSR_GPS3                            0x00000008</div><div class='add'>+#define EGPIOSR_GPS4                            0x00000010</div><div class='add'>+#define EGPIOSR_GPS5                            0x00000020</div><div class='add'>+#define EGPIOSR_GPS6                            0x00000040</div><div class='add'>+#define EGPIOSR_GPS7                            0x00000080</div><div class='add'>+#define EGPIOSR_GPS8                            0x00000100</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 6 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define SERC6_ASDO2EN                           0x00000001</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port 7 configuration</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define SERC7_ASDI2EN                           0x00000001</div><div class='add'>+#define SERC7_POSILB                            0x00000002</div><div class='add'>+#define SERC7_SIPOLB                            0x00000004</div><div class='add'>+#define SERC7_SOSILB                            0x00000008</div><div class='add'>+#define SERC7_SISOLB                            0x00000010</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the serial port AC link</div><div class='add'>+ *  configuration register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define SERACC_CHIP_TYPE_MASK                  0x00000001</div><div class='add'>+#define SERACC_CHIP_TYPE_1_03                  0x00000000</div><div class='add'>+#define SERACC_CHIP_TYPE_2_0                   0x00000001</div><div class='add'>+#define SERACC_TWO_CODECS                      0x00000002</div><div class='add'>+#define SERACC_MDM                             0x00000004</div><div class='add'>+#define SERACC_HSP                             0x00000008</div><div class='add'>+#define SERACC_ODT                             0x00000010 /* only CS4630 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 control register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACCTL2_RSTN                             0x00000001</div><div class='add'>+#define ACCTL2_ESYN                             0x00000002</div><div class='add'>+#define ACCTL2_VFRM                             0x00000004</div><div class='add'>+#define ACCTL2_DCV                              0x00000008</div><div class='add'>+#define ACCTL2_CRW                              0x00000010</div><div class='add'>+#define ACCTL2_ASYN                             0x00000020</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACSTS2_CRDY                             0x00000001</div><div class='add'>+#define ACSTS2_VSTS                             0x00000002</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 output slot valid</div><div class='add'>+ *  register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACOSV2_SLV3                             0x00000001</div><div class='add'>+#define ACOSV2_SLV4                             0x00000002</div><div class='add'>+#define ACOSV2_SLV5                             0x00000004</div><div class='add'>+#define ACOSV2_SLV6                             0x00000008</div><div class='add'>+#define ACOSV2_SLV7                             0x00000010</div><div class='add'>+#define ACOSV2_SLV8                             0x00000020</div><div class='add'>+#define ACOSV2_SLV9                             0x00000040</div><div class='add'>+#define ACOSV2_SLV10                            0x00000080</div><div class='add'>+#define ACOSV2_SLV11                            0x00000100</div><div class='add'>+#define ACOSV2_SLV12                            0x00000200</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 command address</div><div class='add'>+ *  register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACCAD2_CI_MASK                          0x0000007F</div><div class='add'>+#define ACCAD2_CI_SHIFT                         0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 command data register</div><div class='add'>+ *  2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACCDA2_CD_MASK                          0x0000FFFF</div><div class='add'>+#define ACCDA2_CD_SHIFT                         0  </div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 input slot valid</div><div class='add'>+ *  register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACISV2_ISV3                             0x00000001</div><div class='add'>+#define ACISV2_ISV4                             0x00000002</div><div class='add'>+#define ACISV2_ISV5                             0x00000004</div><div class='add'>+#define ACISV2_ISV6                             0x00000008</div><div class='add'>+#define ACISV2_ISV7                             0x00000010</div><div class='add'>+#define ACISV2_ISV8                             0x00000020</div><div class='add'>+#define ACISV2_ISV9                             0x00000040</div><div class='add'>+#define ACISV2_ISV10                            0x00000080</div><div class='add'>+#define ACISV2_ISV11                            0x00000100</div><div class='add'>+#define ACISV2_ISV12                            0x00000200</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status address</div><div class='add'>+ *  register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACSAD2_SI_MASK                          0x0000007F</div><div class='add'>+#define ACSAD2_SI_SHIFT                         0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the AC97 status data register 2.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define ACSDA2_SD_MASK                          0x0000FFFF</div><div class='add'>+#define ACSDA2_SD_SHIFT                         0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap address and control</div><div class='add'>+ *  registers (all 12).</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTAC_SA_MASK                           0x0000FFFF</div><div class='add'>+#define IOTAC_MSK_MASK                          0x000F0000</div><div class='add'>+#define IOTAC_IODC_MASK                         0x06000000</div><div class='add'>+#define IOTAC_IODC_16_BIT                       0x00000000</div><div class='add'>+#define IOTAC_IODC_10_BIT                       0x02000000</div><div class='add'>+#define IOTAC_IODC_12_BIT                       0x04000000</div><div class='add'>+#define IOTAC_WSPI                              0x08000000</div><div class='add'>+#define IOTAC_RSPI                              0x10000000</div><div class='add'>+#define IOTAC_WSE                               0x20000000</div><div class='add'>+#define IOTAC_WE                                0x40000000</div><div class='add'>+#define IOTAC_RE                                0x80000000</div><div class='add'>+#define IOTAC_SA_SHIFT                          0</div><div class='add'>+#define IOTAC_MSK_SHIFT                         16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap fast read registers</div><div class='add'>+ *  (all 8).</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTFR_D_MASK                            0x0000FFFF</div><div class='add'>+#define IOTFR_A_MASK                            0x000F0000</div><div class='add'>+#define IOTFR_R_MASK                            0x0F000000</div><div class='add'>+#define IOTFR_ALL                               0x40000000</div><div class='add'>+#define IOTFR_VL                                0x80000000</div><div class='add'>+#define IOTFR_D_SHIFT                           0</div><div class='add'>+#define IOTFR_A_SHIFT                           16</div><div class='add'>+#define IOTFR_R_SHIFT                           24</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap FIFO register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTFIFO_BA_MASK                         0x00003FFF</div><div class='add'>+#define IOTFIFO_S_MASK                          0x00FF0000</div><div class='add'>+#define IOTFIFO_OF                              0x40000000</div><div class='add'>+#define IOTFIFO_SPIOF                           0x80000000</div><div class='add'>+#define IOTFIFO_BA_SHIFT                        0</div><div class='add'>+#define IOTFIFO_S_SHIFT                         16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap retry read data</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTRRD_D_MASK                           0x0000FFFF</div><div class='add'>+#define IOTRRD_RDV                              0x80000000</div><div class='add'>+#define IOTRRD_D_SHIFT                          0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap FIFO pointer</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTFP_CA_MASK                           0x00003FFF</div><div class='add'>+#define IOTFP_PA_MASK                           0x3FFF0000</div><div class='add'>+#define IOTFP_CA_SHIFT                          0</div><div class='add'>+#define IOTFP_PA_SHIFT                          16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the I/O trap control register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define IOTCR_ITD                               0x00000001</div><div class='add'>+#define IOTCR_HRV                               0x00000002</div><div class='add'>+#define IOTCR_SRV                               0x00000004</div><div class='add'>+#define IOTCR_DTI                               0x00000008</div><div class='add'>+#define IOTCR_DFI                               0x00000010</div><div class='add'>+#define IOTCR_DDP                               0x00000020</div><div class='add'>+#define IOTCR_JTE                               0x00000040</div><div class='add'>+#define IOTCR_PPE                               0x00000080</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the direct PCI data register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define DPCID_D_MASK                            0xFFFFFFFF</div><div class='add'>+#define DPCID_D_SHIFT                           0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the direct PCI address register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define DPCIA_A_MASK                            0xFFFFFFFF</div><div class='add'>+#define DPCIA_A_SHIFT                           0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the direct PCI command register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define DPCIC_C_MASK                            0x0000000F</div><div class='add'>+#define DPCIC_C_IOREAD                          0x00000002</div><div class='add'>+#define DPCIC_C_IOWRITE                         0x00000003</div><div class='add'>+#define DPCIC_BE_MASK                           0x000000F0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the PC/PCI request register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define PCPCIR_RDC_MASK                         0x00000007</div><div class='add'>+#define PCPCIR_C_MASK                           0x00007000</div><div class='add'>+#define PCPCIR_REQ                              0x00008000</div><div class='add'>+#define PCPCIR_RDC_SHIFT                        0</div><div class='add'>+#define PCPCIR_C_SHIFT                          12</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the PC/PCI grant register.</div><div class='add'>+ */ </div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define PCPCIG_GDC_MASK                         0x00000007</div><div class='add'>+#define PCPCIG_VL                               0x00008000</div><div class='add'>+#define PCPCIG_GDC_SHIFT                        0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the PC/PCI master enable</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define PCPCIEN_EN                              0x00000001</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the extended PCI power</div><div class='add'>+ *  management control register.</div><div class='add'>+ */</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define EPCIPMC_GWU                             0x00000001</div><div class='add'>+#define EPCIPMC_FSPC                            0x00000002</div><div class='add'>+#endif </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the SP control register.</div><div class='add'>+ */</div><div class='add'>+#define SPCR_RUN                                0x00000001</div><div class='add'>+#define SPCR_STPFR                              0x00000002</div><div class='add'>+#define SPCR_RUNFR                              0x00000004</div><div class='add'>+#define SPCR_TICK                               0x00000008</div><div class='add'>+#define SPCR_DRQEN                              0x00000020</div><div class='add'>+#define SPCR_RSTSP                              0x00000040</div><div class='add'>+#define SPCR_OREN                               0x00000080</div><div class='add'>+#ifndef NO_CS4612</div><div class='add'>+#define SPCR_PCIINT                             0x00000100</div><div class='add'>+#define SPCR_OINTD                              0x00000200</div><div class='add'>+#define SPCR_CRE                                0x00008000</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the debug index register.</div><div class='add'>+ */</div><div class='add'>+#define DREG_REGID_MASK                         0x0000007F</div><div class='add'>+#define DREG_DEBUG                              0x00000080</div><div class='add'>+#define DREG_RGBK_MASK                          0x00000700</div><div class='add'>+#define DREG_TRAP                               0x00000800</div><div class='add'>+#if !defined(NO_CS4612)</div><div class='add'>+#if !defined(NO_CS4615)</div><div class='add'>+#define DREG_TRAPX                              0x00001000</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#define DREG_REGID_SHIFT                        0</div><div class='add'>+#define DREG_RGBK_SHIFT                         8</div><div class='add'>+#define DREG_RGBK_REGID_MASK                    0x0000077F</div><div class='add'>+#define DREG_REGID_R0                           0x00000010</div><div class='add'>+#define DREG_REGID_R1                           0x00000011</div><div class='add'>+#define DREG_REGID_R2                           0x00000012</div><div class='add'>+#define DREG_REGID_R3                           0x00000013</div><div class='add'>+#define DREG_REGID_R4                           0x00000014</div><div class='add'>+#define DREG_REGID_R5                           0x00000015</div><div class='add'>+#define DREG_REGID_R6                           0x00000016</div><div class='add'>+#define DREG_REGID_R7                           0x00000017</div><div class='add'>+#define DREG_REGID_R8                           0x00000018</div><div class='add'>+#define DREG_REGID_R9                           0x00000019</div><div class='add'>+#define DREG_REGID_RA                           0x0000001A</div><div class='add'>+#define DREG_REGID_RB                           0x0000001B</div><div class='add'>+#define DREG_REGID_RC                           0x0000001C</div><div class='add'>+#define DREG_REGID_RD                           0x0000001D</div><div class='add'>+#define DREG_REGID_RE                           0x0000001E</div><div class='add'>+#define DREG_REGID_RF                           0x0000001F</div><div class='add'>+#define DREG_REGID_RA_BUS_LOW                   0x00000020</div><div class='add'>+#define DREG_REGID_RA_BUS_HIGH                  0x00000038</div><div class='add'>+#define DREG_REGID_YBUS_LOW                     0x00000050</div><div class='add'>+#define DREG_REGID_YBUS_HIGH                    0x00000058</div><div class='add'>+#define DREG_REGID_TRAP_0                       0x00000100</div><div class='add'>+#define DREG_REGID_TRAP_1                       0x00000101</div><div class='add'>+#define DREG_REGID_TRAP_2                       0x00000102</div><div class='add'>+#define DREG_REGID_TRAP_3                       0x00000103</div><div class='add'>+#define DREG_REGID_TRAP_4                       0x00000104</div><div class='add'>+#define DREG_REGID_TRAP_5                       0x00000105</div><div class='add'>+#define DREG_REGID_TRAP_6                       0x00000106</div><div class='add'>+#define DREG_REGID_TRAP_7                       0x00000107</div><div class='add'>+#define DREG_REGID_INDIRECT_ADDRESS             0x0000010E</div><div class='add'>+#define DREG_REGID_TOP_OF_STACK                 0x0000010F</div><div class='add'>+#if !defined(NO_CS4612)</div><div class='add'>+#if !defined(NO_CS4615)</div><div class='add'>+#define DREG_REGID_TRAP_8                       0x00000110</div><div class='add'>+#define DREG_REGID_TRAP_9                       0x00000111</div><div class='add'>+#define DREG_REGID_TRAP_10                      0x00000112</div><div class='add'>+#define DREG_REGID_TRAP_11                      0x00000113</div><div class='add'>+#define DREG_REGID_TRAP_12                      0x00000114</div><div class='add'>+#define DREG_REGID_TRAP_13                      0x00000115</div><div class='add'>+#define DREG_REGID_TRAP_14                      0x00000116</div><div class='add'>+#define DREG_REGID_TRAP_15                      0x00000117</div><div class='add'>+#define DREG_REGID_TRAP_16                      0x00000118</div><div class='add'>+#define DREG_REGID_TRAP_17                      0x00000119</div><div class='add'>+#define DREG_REGID_TRAP_18                      0x0000011A</div><div class='add'>+#define DREG_REGID_TRAP_19                      0x0000011B</div><div class='add'>+#define DREG_REGID_TRAP_20                      0x0000011C</div><div class='add'>+#define DREG_REGID_TRAP_21                      0x0000011D</div><div class='add'>+#define DREG_REGID_TRAP_22                      0x0000011E</div><div class='add'>+#define DREG_REGID_TRAP_23                      0x0000011F</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#define DREG_REGID_RSA0_LOW                     0x00000200</div><div class='add'>+#define DREG_REGID_RSA0_HIGH                    0x00000201</div><div class='add'>+#define DREG_REGID_RSA1_LOW                     0x00000202</div><div class='add'>+#define DREG_REGID_RSA1_HIGH                    0x00000203</div><div class='add'>+#define DREG_REGID_RSA2                         0x00000204</div><div class='add'>+#define DREG_REGID_RSA3                         0x00000205</div><div class='add'>+#define DREG_REGID_RSI0_LOW                     0x00000206</div><div class='add'>+#define DREG_REGID_RSI0_HIGH                    0x00000207</div><div class='add'>+#define DREG_REGID_RSI1                         0x00000208</div><div class='add'>+#define DREG_REGID_RSI2                         0x00000209</div><div class='add'>+#define DREG_REGID_SAGUSTATUS                   0x0000020A</div><div class='add'>+#define DREG_REGID_RSCONFIG01_LOW               0x0000020B</div><div class='add'>+#define DREG_REGID_RSCONFIG01_HIGH              0x0000020C</div><div class='add'>+#define DREG_REGID_RSCONFIG23_LOW               0x0000020D</div><div class='add'>+#define DREG_REGID_RSCONFIG23_HIGH              0x0000020E</div><div class='add'>+#define DREG_REGID_RSDMA01E                     0x0000020F</div><div class='add'>+#define DREG_REGID_RSDMA23E                     0x00000210</div><div class='add'>+#define DREG_REGID_RSD0_LOW                     0x00000211</div><div class='add'>+#define DREG_REGID_RSD0_HIGH                    0x00000212</div><div class='add'>+#define DREG_REGID_RSD1_LOW                     0x00000213</div><div class='add'>+#define DREG_REGID_RSD1_HIGH                    0x00000214</div><div class='add'>+#define DREG_REGID_RSD2_LOW                     0x00000215</div><div class='add'>+#define DREG_REGID_RSD2_HIGH                    0x00000216</div><div class='add'>+#define DREG_REGID_RSD3_LOW                     0x00000217</div><div class='add'>+#define DREG_REGID_RSD3_HIGH                    0x00000218</div><div class='add'>+#define DREG_REGID_SRAR_HIGH                    0x0000021A</div><div class='add'>+#define DREG_REGID_SRAR_LOW                     0x0000021B</div><div class='add'>+#define DREG_REGID_DMA_STATE                    0x0000021C</div><div class='add'>+#define DREG_REGID_CURRENT_DMA_STREAM           0x0000021D</div><div class='add'>+#define DREG_REGID_NEXT_DMA_STREAM              0x0000021E</div><div class='add'>+#define DREG_REGID_CPU_STATUS                   0x00000300</div><div class='add'>+#define DREG_REGID_MAC_MODE                     0x00000301</div><div class='add'>+#define DREG_REGID_STACK_AND_REPEAT             0x00000302</div><div class='add'>+#define DREG_REGID_INDEX0                       0x00000304</div><div class='add'>+#define DREG_REGID_INDEX1                       0x00000305</div><div class='add'>+#define DREG_REGID_DMA_STATE_0_3                0x00000400</div><div class='add'>+#define DREG_REGID_DMA_STATE_4_7                0x00000404</div><div class='add'>+#define DREG_REGID_DMA_STATE_8_11               0x00000408</div><div class='add'>+#define DREG_REGID_DMA_STATE_12_15              0x0000040C</div><div class='add'>+#define DREG_REGID_DMA_STATE_16_19              0x00000410</div><div class='add'>+#define DREG_REGID_DMA_STATE_20_23              0x00000414</div><div class='add'>+#define DREG_REGID_DMA_STATE_24_27              0x00000418</div><div class='add'>+#define DREG_REGID_DMA_STATE_28_31              0x0000041C</div><div class='add'>+#define DREG_REGID_DMA_STATE_32_35              0x00000420</div><div class='add'>+#define DREG_REGID_DMA_STATE_36_39              0x00000424</div><div class='add'>+#define DREG_REGID_DMA_STATE_40_43              0x00000428</div><div class='add'>+#define DREG_REGID_DMA_STATE_44_47              0x0000042C</div><div class='add'>+#define DREG_REGID_DMA_STATE_48_51              0x00000430</div><div class='add'>+#define DREG_REGID_DMA_STATE_52_55              0x00000434</div><div class='add'>+#define DREG_REGID_DMA_STATE_56_59              0x00000438</div><div class='add'>+#define DREG_REGID_DMA_STATE_60_63              0x0000043C</div><div class='add'>+#define DREG_REGID_DMA_STATE_64_67              0x00000440</div><div class='add'>+#define DREG_REGID_DMA_STATE_68_71              0x00000444</div><div class='add'>+#define DREG_REGID_DMA_STATE_72_75              0x00000448</div><div class='add'>+#define DREG_REGID_DMA_STATE_76_79              0x0000044C</div><div class='add'>+#define DREG_REGID_DMA_STATE_80_83              0x00000450</div><div class='add'>+#define DREG_REGID_DMA_STATE_84_87              0x00000454</div><div class='add'>+#define DREG_REGID_DMA_STATE_88_91              0x00000458</div><div class='add'>+#define DREG_REGID_DMA_STATE_92_95              0x0000045C</div><div class='add'>+#define DREG_REGID_TRAP_SELECT                  0x00000500</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_0                 0x00000500</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_1                 0x00000501</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_2                 0x00000502</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_3                 0x00000503</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_4                 0x00000504</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_5                 0x00000505</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_6                 0x00000506</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_7                 0x00000507</div><div class='add'>+#if !defined(NO_CS4612)</div><div class='add'>+#if !defined(NO_CS4615)</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_8                 0x00000510</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_9                 0x00000511</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_10                0x00000512</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_11                0x00000513</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_12                0x00000514</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_13                0x00000515</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_14                0x00000516</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_15                0x00000517</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_16                0x00000518</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_17                0x00000519</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_18                0x0000051A</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_19                0x0000051B</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_20                0x0000051C</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_21                0x0000051D</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_22                0x0000051E</div><div class='add'>+#define DREG_REGID_TRAP_WRITE_23                0x0000051F</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#define DREG_REGID_MAC0_ACC0_LOW                0x00000600</div><div class='add'>+#define DREG_REGID_MAC0_ACC1_LOW                0x00000601</div><div class='add'>+#define DREG_REGID_MAC0_ACC2_LOW                0x00000602</div><div class='add'>+#define DREG_REGID_MAC0_ACC3_LOW                0x00000603</div><div class='add'>+#define DREG_REGID_MAC1_ACC0_LOW                0x00000604</div><div class='add'>+#define DREG_REGID_MAC1_ACC1_LOW                0x00000605</div><div class='add'>+#define DREG_REGID_MAC1_ACC2_LOW                0x00000606</div><div class='add'>+#define DREG_REGID_MAC1_ACC3_LOW                0x00000607</div><div class='add'>+#define DREG_REGID_MAC0_ACC0_MID                0x00000608</div><div class='add'>+#define DREG_REGID_MAC0_ACC1_MID                0x00000609</div><div class='add'>+#define DREG_REGID_MAC0_ACC2_MID                0x0000060A</div><div class='add'>+#define DREG_REGID_MAC0_ACC3_MID                0x0000060B</div><div class='add'>+#define DREG_REGID_MAC1_ACC0_MID                0x0000060C</div><div class='add'>+#define DREG_REGID_MAC1_ACC1_MID                0x0000060D</div><div class='add'>+#define DREG_REGID_MAC1_ACC2_MID                0x0000060E</div><div class='add'>+#define DREG_REGID_MAC1_ACC3_MID                0x0000060F</div><div class='add'>+#define DREG_REGID_MAC0_ACC0_HIGH               0x00000610</div><div class='add'>+#define DREG_REGID_MAC0_ACC1_HIGH               0x00000611</div><div class='add'>+#define DREG_REGID_MAC0_ACC2_HIGH               0x00000612</div><div class='add'>+#define DREG_REGID_MAC0_ACC3_HIGH               0x00000613</div><div class='add'>+#define DREG_REGID_MAC1_ACC0_HIGH               0x00000614</div><div class='add'>+#define DREG_REGID_MAC1_ACC1_HIGH               0x00000615</div><div class='add'>+#define DREG_REGID_MAC1_ACC2_HIGH               0x00000616</div><div class='add'>+#define DREG_REGID_MAC1_ACC3_HIGH               0x00000617</div><div class='add'>+#define DREG_REGID_RSHOUT_LOW                   0x00000620</div><div class='add'>+#define DREG_REGID_RSHOUT_MID                   0x00000628</div><div class='add'>+#define DREG_REGID_RSHOUT_HIGH                  0x00000630</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the DMA stream requestor write</div><div class='add'>+ */</div><div class='add'>+#define DSRWP_DSR_MASK                          0x0000000F</div><div class='add'>+#define DSRWP_DSR_BG_RQ                         0x00000001</div><div class='add'>+#define DSRWP_DSR_PRIORITY_MASK                 0x00000006</div><div class='add'>+#define DSRWP_DSR_PRIORITY_0                    0x00000000</div><div class='add'>+#define DSRWP_DSR_PRIORITY_1                    0x00000002</div><div class='add'>+#define DSRWP_DSR_PRIORITY_2                    0x00000004</div><div class='add'>+#define DSRWP_DSR_PRIORITY_3                    0x00000006</div><div class='add'>+#define DSRWP_DSR_RQ_PENDING                    0x00000008</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the trap write port register.</div><div class='add'>+ */</div><div class='add'>+#define TWPR_TW_MASK                            0x0000FFFF</div><div class='add'>+#define TWPR_TW_SHIFT                           0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the stack pointer write</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SPWR_STKP_MASK                          0x0000000F</div><div class='add'>+#define SPWR_STKP_SHIFT                         0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the SP interrupt register.</div><div class='add'>+ */</div><div class='add'>+#define SPIR_FRI                                0x00000001</div><div class='add'>+#define SPIR_DOI                                0x00000002</div><div class='add'>+#define SPIR_GPI2                               0x00000004</div><div class='add'>+#define SPIR_GPI3                               0x00000008</div><div class='add'>+#define SPIR_IP0                                0x00000010</div><div class='add'>+#define SPIR_IP1                                0x00000020</div><div class='add'>+#define SPIR_IP2                                0x00000040</div><div class='add'>+#define SPIR_IP3                                0x00000080</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the functional group 1 register.</div><div class='add'>+ */</div><div class='add'>+#define FGR1_F1S_MASK                           0x0000FFFF</div><div class='add'>+#define FGR1_F1S_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the SP clock status register.</div><div class='add'>+ */</div><div class='add'>+#define SPCS_FRI                                0x00000001</div><div class='add'>+#define SPCS_DOI                                0x00000002</div><div class='add'>+#define SPCS_GPI2                               0x00000004</div><div class='add'>+#define SPCS_GPI3                               0x00000008</div><div class='add'>+#define SPCS_IP0                                0x00000010</div><div class='add'>+#define SPCS_IP1                                0x00000020</div><div class='add'>+#define SPCS_IP2                                0x00000040</div><div class='add'>+#define SPCS_IP3                                0x00000080</div><div class='add'>+#define SPCS_SPRUN                              0x00000100</div><div class='add'>+#define SPCS_SLEEP                              0x00000200</div><div class='add'>+#define SPCS_FG                                 0x00000400</div><div class='add'>+#define SPCS_ORUN                               0x00000800</div><div class='add'>+#define SPCS_IRQ                                0x00001000</div><div class='add'>+#define SPCS_FGN_MASK                           0x0000E000</div><div class='add'>+#define SPCS_FGN_SHIFT                          13</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the SP DMA requestor status</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define SDSR_DCS_MASK                           0x000000FF</div><div class='add'>+#define SDSR_DCS_SHIFT                          0</div><div class='add'>+#define SDSR_DCS_NONE                           0x00000007</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the frame timer register.</div><div class='add'>+ */</div><div class='add'>+#define FRMT_FTV_MASK                           0x0000FFFF</div><div class='add'>+#define FRMT_FTV_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the frame timer current count</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define FRCC_FCC_MASK                           0x0000FFFF</div><div class='add'>+#define FRCC_FCC_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the frame timer save count</div><div class='add'>+ *  register.</div><div class='add'>+ */</div><div class='add'>+#define FRSC_FCS_MASK                           0x0000FFFF</div><div class='add'>+#define FRSC_FCS_SHIFT                          0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following define the various flags stored in the scatter/gather</div><div class='add'>+ *  descriptors.</div><div class='add'>+ */</div><div class='add'>+#define DMA_SG_NEXT_ENTRY_MASK                  0x00000FF8</div><div class='add'>+#define DMA_SG_SAMPLE_END_MASK                  0x0FFF0000</div><div class='add'>+#define DMA_SG_SAMPLE_END_FLAG                  0x10000000</div><div class='add'>+#define DMA_SG_LOOP_END_FLAG                    0x20000000</div><div class='add'>+#define DMA_SG_SIGNAL_END_FLAG                  0x40000000</div><div class='add'>+#define DMA_SG_SIGNAL_PAGE_FLAG                 0x80000000</div><div class='add'>+#define DMA_SG_NEXT_ENTRY_SHIFT                 3</div><div class='add'>+#define DMA_SG_SAMPLE_END_SHIFT                 16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following define the offsets of the fields within the on-chip generic</div><div class='add'>+ *  DMA requestor.</div><div class='add'>+ */</div><div class='add'>+#define DMA_RQ_CONTROL1                         0x00000000</div><div class='add'>+#define DMA_RQ_CONTROL2                         0x00000004</div><div class='add'>+#define DMA_RQ_SOURCE_ADDR                      0x00000008</div><div class='add'>+#define DMA_RQ_DESTINATION_ADDR                 0x0000000C</div><div class='add'>+#define DMA_RQ_NEXT_PAGE_ADDR                   0x00000010</div><div class='add'>+#define DMA_RQ_NEXT_PAGE_SGDESC                 0x00000014</div><div class='add'>+#define DMA_RQ_LOOP_START_ADDR                  0x00000018</div><div class='add'>+#define DMA_RQ_POST_LOOP_ADDR                   0x0000001C</div><div class='add'>+#define DMA_RQ_PAGE_MAP_ADDR                    0x00000020</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the first control word of the</div><div class='add'>+ *  on-chip generic DMA requestor.</div><div class='add'>+ */</div><div class='add'>+#define DMA_RQ_C1_COUNT_MASK                    0x000003FF</div><div class='add'>+#define DMA_RQ_C1_DESTINATION_SCATTER           0x00001000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_GATHER                 0x00002000</div><div class='add'>+#define DMA_RQ_C1_DONE_FLAG                     0x00004000</div><div class='add'>+#define DMA_RQ_C1_OPTIMIZE_STATE                0x00008000</div><div class='add'>+#define DMA_RQ_C1_SAMPLE_END_STATE_MASK         0x00030000</div><div class='add'>+#define DMA_RQ_C1_FULL_PAGE                     0x00000000</div><div class='add'>+#define DMA_RQ_C1_BEFORE_SAMPLE_END             0x00010000</div><div class='add'>+#define DMA_RQ_C1_PAGE_MAP_ERROR                0x00020000</div><div class='add'>+#define DMA_RQ_C1_AT_SAMPLE_END                 0x00030000</div><div class='add'>+#define DMA_RQ_C1_LOOP_END_STATE_MASK           0x000C0000</div><div class='add'>+#define DMA_RQ_C1_NOT_LOOP_END                  0x00000000</div><div class='add'>+#define DMA_RQ_C1_BEFORE_LOOP_END               0x00040000</div><div class='add'>+#define DMA_RQ_C1_2PAGE_LOOP_BEGIN              0x00080000</div><div class='add'>+#define DMA_RQ_C1_LOOP_BEGIN                    0x000C0000</div><div class='add'>+#define DMA_RQ_C1_PAGE_MAP_MASK                 0x00300000</div><div class='add'>+#define DMA_RQ_C1_PM_NONE_PENDING               0x00000000</div><div class='add'>+#define DMA_RQ_C1_PM_NEXT_PENDING               0x00100000</div><div class='add'>+#define DMA_RQ_C1_PM_RESERVED                   0x00200000</div><div class='add'>+#define DMA_RQ_C1_PM_LOOP_NEXT_PENDING          0x00300000</div><div class='add'>+#define DMA_RQ_C1_WRITEBACK_DEST_FLAG           0x00400000</div><div class='add'>+#define DMA_RQ_C1_WRITEBACK_SRC_FLAG            0x00800000</div><div class='add'>+#define DMA_RQ_C1_DEST_SIZE_MASK                0x07000000</div><div class='add'>+#define DMA_RQ_C1_DEST_LINEAR                   0x00000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD16                    0x01000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD32                    0x02000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD64                    0x03000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD128                   0x04000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD256                   0x05000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD512                   0x06000000</div><div class='add'>+#define DMA_RQ_C1_DEST_MOD1024                  0x07000000</div><div class='add'>+#define DMA_RQ_C1_DEST_ON_HOST                  0x08000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_SIZE_MASK              0x70000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_LINEAR                 0x00000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD16                  0x10000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD32                  0x20000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD64                  0x30000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD128                 0x40000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD256                 0x50000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD512                 0x60000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_MOD1024                0x70000000</div><div class='add'>+#define DMA_RQ_C1_SOURCE_ON_HOST                0x80000000</div><div class='add'>+#define DMA_RQ_C1_COUNT_SHIFT                   0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the second control word of the</div><div class='add'>+ *  on-chip generic DMA requestor.</div><div class='add'>+ */</div><div class='add'>+#define DMA_RQ_C2_VIRTUAL_CHANNEL_MASK          0x0000003F</div><div class='add'>+#define DMA_RQ_C2_VIRTUAL_SIGNAL_MASK           0x00000300</div><div class='add'>+#define DMA_RQ_C2_NO_VIRTUAL_SIGNAL             0x00000000</div><div class='add'>+#define DMA_RQ_C2_SIGNAL_EVERY_DMA              0x00000100</div><div class='add'>+#define DMA_RQ_C2_SIGNAL_SOURCE_PINGPONG        0x00000200</div><div class='add'>+#define DMA_RQ_C2_SIGNAL_DEST_PINGPONG          0x00000300</div><div class='add'>+#define DMA_RQ_C2_AUDIO_CONVERT_MASK            0x0000F000</div><div class='add'>+#define DMA_RQ_C2_AC_NONE                       0x00000000</div><div class='add'>+#define DMA_RQ_C2_AC_8_TO_16_BIT                0x00001000</div><div class='add'>+#define DMA_RQ_C2_AC_MONO_TO_STEREO             0x00002000</div><div class='add'>+#define DMA_RQ_C2_AC_ENDIAN_CONVERT             0x00004000</div><div class='add'>+#define DMA_RQ_C2_AC_SIGNED_CONVERT             0x00008000</div><div class='add'>+#define DMA_RQ_C2_LOOP_END_MASK                 0x0FFF0000</div><div class='add'>+#define DMA_RQ_C2_LOOP_MASK                     0x30000000</div><div class='add'>+#define DMA_RQ_C2_NO_LOOP                       0x00000000</div><div class='add'>+#define DMA_RQ_C2_ONE_PAGE_LOOP                 0x10000000</div><div class='add'>+#define DMA_RQ_C2_TWO_PAGE_LOOP                 0x20000000</div><div class='add'>+#define DMA_RQ_C2_MULTI_PAGE_LOOP               0x30000000</div><div class='add'>+#define DMA_RQ_C2_SIGNAL_LOOP_BACK              0x40000000</div><div class='add'>+#define DMA_RQ_C2_SIGNAL_POST_BEGIN_PAGE        0x80000000</div><div class='add'>+#define DMA_RQ_C2_VIRTUAL_CHANNEL_SHIFT         0</div><div class='add'>+#define DMA_RQ_C2_LOOP_END_SHIFT                16</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the source and destination words</div><div class='add'>+ *  of the on-chip generic DMA requestor.</div><div class='add'>+ */</div><div class='add'>+#define DMA_RQ_SD_ADDRESS_MASK                  0x0000FFFF</div><div class='add'>+#define DMA_RQ_SD_MEMORY_ID_MASK                0x000F0000</div><div class='add'>+#define DMA_RQ_SD_SP_PARAM_ADDR                 0x00000000</div><div class='add'>+#define DMA_RQ_SD_SP_SAMPLE_ADDR                0x00010000</div><div class='add'>+#define DMA_RQ_SD_SP_PROGRAM_ADDR               0x00020000</div><div class='add'>+#define DMA_RQ_SD_SP_DEBUG_ADDR                 0x00030000</div><div class='add'>+#define DMA_RQ_SD_OMNIMEM_ADDR                  0x000E0000</div><div class='add'>+#define DMA_RQ_SD_END_FLAG                      0x40000000</div><div class='add'>+#define DMA_RQ_SD_ERROR_FLAG                    0x80000000</div><div class='add'>+#define DMA_RQ_SD_ADDRESS_SHIFT                 0</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *  The following defines are for the flags in the page map address word of the</div><div class='add'>+ *  on-chip generic DMA requestor.</div><div class='add'>+ */</div><div class='add'>+#define DMA_RQ_PMA_LOOP_THIRD_PAGE_ENTRY_MASK   0x00000FF8</div><div class='add'>+#define DMA_RQ_PMA_PAGE_TABLE_MASK              0xFFFFF000</div><div class='add'>+#define DMA_RQ_PMA_LOOP_THIRD_PAGE_ENTRY_SHIFT  3</div><div class='add'>+#define DMA_RQ_PMA_PAGE_TABLE_SHIFT             12</div><div class='add'>+</div><div class='add'>+#define BA1_VARIDEC_BUF_1       0x000</div><div class='add'>+</div><div class='add'>+#define BA1_PDTC                0x0c0    /* BA1_PLAY_DMA_TRANSACTION_COUNT_REG */</div><div class='add'>+#define BA1_PFIE                0x0c4    /* BA1_PLAY_FORMAT_&amp;_INTERRUPT_ENABLE_REG */</div><div class='add'>+#define BA1_PBA                 0x0c8    /* BA1_PLAY_BUFFER_ADDRESS */</div><div class='add'>+#define BA1_PVOL                0x0f8    /* BA1_PLAY_VOLUME_REG */</div><div class='add'>+#define BA1_PSRC                0x288    /* BA1_PLAY_SAMPLE_RATE_CORRECTION_REG */</div><div class='add'>+#define BA1_PCTL                0x2a4    /* BA1_PLAY_CONTROL_REG */</div><div class='add'>+#define BA1_PPI                 0x2b4    /* BA1_PLAY_PHASE_INCREMENT_REG */</div><div class='add'>+</div><div class='add'>+#define BA1_CCTL                0x064    /* BA1_CAPTURE_CONTROL_REG */</div><div class='add'>+#define BA1_CIE                 0x104    /* BA1_CAPTURE_INTERRUPT_ENABLE_REG */</div><div class='add'>+#define BA1_CBA                 0x10c    /* BA1_CAPTURE_BUFFER_ADDRESS */</div><div class='add'>+#define BA1_CSRC                0x2c8    /* BA1_CAPTURE_SAMPLE_RATE_CORRECTION_REG */</div><div class='add'>+#define BA1_CCI                 0x2d8    /* BA1_CAPTURE_COEFFICIENT_INCREMENT_REG */</div><div class='add'>+#define BA1_CD                  0x2e0    /* BA1_CAPTURE_DELAY_REG */</div><div class='add'>+#define BA1_CPI                 0x2f4    /* BA1_CAPTURE_PHASE_INCREMENT_REG */</div><div class='add'>+#define BA1_CVOL                0x2f8    /* BA1_CAPTURE_VOLUME_REG */</div><div class='add'>+</div><div class='add'>+#define BA1_CFG1                0x134    /* BA1_CAPTURE_FRAME_GROUP_1_REG */</div><div class='add'>+#define BA1_CFG2                0x138    /* BA1_CAPTURE_FRAME_GROUP_2_REG */</div><div class='add'>+#define BA1_CCST                0x13c    /* BA1_CAPTURE_CONSTANT_REG */</div><div class='add'>+#define BA1_CSPB                0x340    /* BA1_CAPTURE_SPB_ADDRESS */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CS46XX_MODE_OUTPUT	(1&lt;&lt;0)	 /* MIDI UART - output */ </div><div class='add'>+#define CS46XX_MODE_INPUT	(1&lt;&lt;1)	 /* MIDI UART - input */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SAVE_REG_MAX             0x10</div><div class='add'>+#define POWER_DOWN_ALL         0x7f0f</div><div class='add'>+</div><div class='add'>+/* maxinum number of AC97 codecs connected, AC97 2.0 defined 4 */</div><div class='add'>+#define MAX_NR_AC97				            4</div><div class='add'>+#define CS46XX_PRIMARY_CODEC_INDEX          0</div><div class='add'>+#define CS46XX_SECONDARY_CODEC_INDEX		1</div><div class='add'>+#define CS46XX_SECONDARY_CODEC_OFFSET		0x80</div><div class='add'>+#define CS46XX_DSP_CAPTURE_CHANNEL          1</div><div class='add'>+</div><div class='add'>+/* capture */</div><div class='add'>+#define CS46XX_DSP_CAPTURE_CHANNEL          1</div><div class='add'>+</div><div class='add'>+/* mixer */</div><div class='add'>+#define CS46XX_MIXER_SPDIF_INPUT_ELEMENT    1</div><div class='add'>+#define CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT   2</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct snd_cs46xx_pcm {</div><div class='add'>+	struct snd_dma_buffer hw_buf;</div><div class='add'>+  </div><div class='add'>+	unsigned int ctl;</div><div class='add'>+	unsigned int shift;	/* Shift count to trasform frames in bytes */</div><div class='add'>+	struct snd_pcm_indirect pcm_rec;</div><div class='add'>+	struct snd_pcm_substream *substream;</div><div class='add'>+</div><div class='add'>+	struct dsp_pcm_channel_descriptor * pcm_channel;</div><div class='add'>+</div><div class='add'>+	int pcm_channel_id;    /* Fron Rear, Center Lfe  ... */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_cs46xx_region {</div><div class='add'>+	char name[24];</div><div class='add'>+	unsigned long base;</div><div class='add'>+	void __iomem *remap_addr;</div><div class='add'>+	unsigned long size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_cs46xx {</div><div class='add'>+	int irq;</div><div class='add'>+	unsigned long ba0_addr;</div><div class='add'>+	unsigned long ba1_addr;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct snd_cs46xx_region ba0;</div><div class='add'>+			struct snd_cs46xx_region data0;</div><div class='add'>+			struct snd_cs46xx_region data1;</div><div class='add'>+			struct snd_cs46xx_region pmem;</div><div class='add'>+			struct snd_cs46xx_region reg;</div><div class='add'>+		} name;</div><div class='add'>+		struct snd_cs46xx_region idx[5];</div><div class='add'>+	} region;</div><div class='add'>+</div><div class='add'>+	unsigned int mode;</div><div class='add'>+	</div><div class='add'>+	struct {</div><div class='add'>+		struct snd_dma_buffer hw_buf;</div><div class='add'>+</div><div class='add'>+		unsigned int ctl;</div><div class='add'>+		unsigned int shift;	/* Shift count to trasform frames in bytes */</div><div class='add'>+		struct snd_pcm_indirect pcm_rec;</div><div class='add'>+		struct snd_pcm_substream *substream;</div><div class='add'>+	} capt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	int nr_ac97_codecs;</div><div class='add'>+	struct snd_ac97_bus *ac97_bus;</div><div class='add'>+	struct snd_ac97 *ac97[MAX_NR_AC97];</div><div class='add'>+</div><div class='add'>+	struct pci_dev *pci;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+</div><div class='add'>+	struct snd_rawmidi *rmidi;</div><div class='add'>+	struct snd_rawmidi_substream *midi_input;</div><div class='add'>+	struct snd_rawmidi_substream *midi_output;</div><div class='add'>+</div><div class='add'>+	spinlock_t reg_lock;</div><div class='add'>+	unsigned int midcr;</div><div class='add'>+	unsigned int uartm;</div><div class='add'>+</div><div class='add'>+	int amplifier;</div><div class='add'>+	void (*amplifier_ctrl)(struct snd_cs46xx *, int);</div><div class='add'>+	void (*active_ctrl)(struct snd_cs46xx *, int);</div><div class='add'>+  	void (*mixer_init)(struct snd_cs46xx *);</div><div class='add'>+</div><div class='add'>+	int acpi_port;</div><div class='add'>+	struct snd_kcontrol *eapd_switch; /* for amplifier hack */</div><div class='add'>+	int accept_valid;	/* accept mmap valid (for OSS) */</div><div class='add'>+	int in_suspend;</div><div class='add'>+</div><div class='add'>+	struct gameport *gameport;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='add'>+	struct mutex spos_mutex;</div><div class='add'>+</div><div class='add'>+	struct dsp_spos_instance * dsp_spos_instance;</div><div class='add'>+</div><div class='add'>+	struct snd_pcm *pcm_rear;</div><div class='add'>+	struct snd_pcm *pcm_center_lfe;</div><div class='add'>+	struct snd_pcm *pcm_iec958;</div><div class='add'>+</div><div class='add'>+#define CS46XX_DSP_MODULES	5</div><div class='add'>+	struct dsp_module_desc *modules[CS46XX_DSP_MODULES];</div><div class='add'>+#else /* for compatibility */</div><div class='add'>+	struct snd_cs46xx_pcm *playback_pcm;</div><div class='add'>+	unsigned int play_ctl;</div><div class='add'>+</div><div class='add'>+	struct ba1_struct *ba1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	u32 *saved_regs;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int snd_cs46xx_create(struct snd_card *card,</div><div class='add'>+		      struct pci_dev *pci,</div><div class='add'>+		      int external_amp, int thinkpad);</div><div class='add'>+extern const struct dev_pm_ops snd_cs46xx_pm;</div><div class='add'>+</div><div class='add'>+int snd_cs46xx_pcm(struct snd_cs46xx *chip, int device);</div><div class='add'>+int snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device);</div><div class='add'>+int snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device);</div><div class='add'>+int snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device);</div><div class='add'>+int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device);</div><div class='add'>+int snd_cs46xx_midi(struct snd_cs46xx *chip, int device);</div><div class='add'>+int snd_cs46xx_start_dsp(struct snd_cs46xx *chip);</div><div class='add'>+int snd_cs46xx_gameport(struct snd_cs46xx *chip);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_CS46XX_H */</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_dsp_scb_types.h b/sound/pci/cs46xx/cs46xx_dsp_scb_types.h<br/>new file mode 100644<br/>index 000000000000..7339c38570be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_dsp_scb_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx_dsp_scb_types.h</a></div><div class='hunk'>@@ -0,0 +1,1198 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='add'>+ *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * NOTE: comments are copy/paste from cwcemb80.lst </div><div class='add'>+ * provided by Tom Woller at Cirrus (my only</div><div class='add'>+ * documentation about the SP OS running inside</div><div class='add'>+ * the DSP) </div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS46XX_DSP_SCB_TYPES_H__</div><div class='add'>+#define __CS46XX_DSP_SCB_TYPES_H__</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef ___DSP_DUAL_16BIT_ALLOC</div><div class='add'>+#if   defined(__LITTLE_ENDIAN)</div><div class='add'>+#define ___DSP_DUAL_16BIT_ALLOC(a,b) u16 a; u16 b;</div><div class='add'>+#elif defined(__BIG_ENDIAN)</div><div class='add'>+#define ___DSP_DUAL_16BIT_ALLOC(a,b) u16 b; u16 a;</div><div class='add'>+#else</div><div class='add'>+#error Not __LITTLE_ENDIAN and not __BIG_ENDIAN, then what ???</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* This structs are used internally by the SP */</div><div class='add'>+</div><div class='add'>+struct dsp_basic_dma_req {</div><div class='add'>+	/* DMA Requestor Word 0 (DCW)  fields:</div><div class='add'>+</div><div class='add'>+	   31 [30-28]27  [26:24] 23 22 21 20 [19:18] [17:16] 15 14 13  12  11 10 9 8 7 6  [5:0]</div><div class='add'>+	   _______________________________________________________________________________________	</div><div class='add'>+	   |S| SBT  |D|  DBT    |wb|wb|  |  |  LS  |  SS   |Opt|Do|SSG|DSG|  |  | | | | | Dword   |</div><div class='add'>+	   |H|_____ |H|_________|S_|D |__|__|______|_______|___|ne|__ |__ |__|__|_|_|_|_|_Count -1|</div><div class='add'>+	*/</div><div class='add'>+	u32 dcw;                 /* DMA Control Word */</div><div class='add'>+	u32 dmw;                 /* DMA Mode Word */</div><div class='add'>+	u32 saw;                 /* Source Address Word */</div><div class='add'>+	u32 daw;                 /* Destination Address Word  */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_scatter_gather_ext {</div><div class='add'>+	u32 npaw;                /* Next-Page Address Word */</div><div class='add'>+</div><div class='add'>+	/* DMA Requestor Word 5 (NPCW)  fields:</div><div class='add'>+     </div><div class='add'>+	   31-30 29 28          [27:16]              [15:12]             [11:3]                [2:0] 				</div><div class='add'>+	   _________________________________________________________________________________________	</div><div class='add'>+	   |SV  |LE|SE|   Sample-end byte offset   |         | Page-map entry offset for next  |    | </div><div class='add'>+	   |page|__|__| ___________________________|_________|__page, if !sample-end___________|____|</div><div class='add'>+	*/</div><div class='add'>+	u32 npcw;                /* Next-Page Control Word */</div><div class='add'>+	u32 lbaw;                /* Loop-Begin Address Word */</div><div class='add'>+	u32 nplbaw;              /* Next-Page after Loop-Begin Address Word */</div><div class='add'>+	u32 sgaw;                /* Scatter/Gather Address Word */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_volume_control {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	   rightTarg,  /* Target volume for left &amp; right channels */</div><div class='add'>+	   leftTarg</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	   rightVol,   /* Current left &amp; right channel volumes */</div><div class='add'>+	   leftVol</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Generic stream control block (SCB) structure definition */</div><div class='add'>+struct dsp_generic_scb {</div><div class='add'>+	/* For streaming I/O, the DSP should never alter any words in the DMA</div><div class='add'>+	   requestor or the scatter/gather extension.  Only ad hoc DMA request</div><div class='add'>+	   streams are free to alter the requestor (currently only occur in the</div><div class='add'>+	   DOS-based MIDI controller and in debugger-inserted code).</div><div class='add'>+    </div><div class='add'>+	   If an SCB does not have any associated DMA requestor, these 9 ints</div><div class='add'>+	   may be freed for use by other tasks, but the pointer to the SCB must</div><div class='add'>+	   still be such that the insOrd:nextSCB appear at offset 9 from the</div><div class='add'>+	   SCB pointer.</div><div class='add'>+     </div><div class='add'>+	   Basic (non scatter/gather) DMA requestor (4 ints)</div><div class='add'>+	*/</div><div class='add'>+  </div><div class='add'>+	/* Initialized by the host, only modified by DMA </div><div class='add'>+	   R/O for the DSP task */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+</div><div class='add'>+	/* Scatter/gather DMA requestor extension   (5 ints) </div><div class='add'>+	   Initialized by the host, only modified by DMA</div><div class='add'>+	   DSP task never needs to even read these.</div><div class='add'>+	*/</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+</div><div class='add'>+	/* Sublist pointer &amp; next stream control block (SCB) link.</div><div class='add'>+	   Initialized &amp; modified by the host R/O for the DSP task</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,     /* REQUIRED */</div><div class='add'>+	    sub_list_ptr  /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	/* Pointer to this tasks parameter block &amp; stream function pointer </div><div class='add'>+	   Initialized by the host  R/O for the DSP task */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,  /* REQUIRED */</div><div class='add'>+	    this_spb      /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* rsConfig register for stream buffer (rsDMA reg. </div><div class='add'>+	   is loaded from basicReq.daw for incoming streams, or </div><div class='add'>+	   basicReq.saw, for outgoing streams) </div><div class='add'>+</div><div class='add'>+	   31 30 29  [28:24]     [23:16] 15 14 13 12 11 10 9 8 7 6  5      4      [3:0]</div><div class='add'>+	   ______________________________________________________________________________</div><div class='add'>+	   |DMA  |D|maxDMAsize| streamNum|dir|p|  |  |  |  | | |ds |shr 1|rev Cy | mod   |</div><div class='add'>+	   |prio |_|__________|__________|___|_|__|__|__|__|_|_|___|_____|_______|_______|</div><div class='add'>+	   31 30 29  [28:24]     [23:16] 15 14 13 12 11 10 9 8 7 6  5      4      [3:0]</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	   Initialized by the host R/O for the DSP task</div><div class='add'>+	*/</div><div class='add'>+	u32  strm_rs_config; /* REQUIRED */</div><div class='add'>+               // </div><div class='add'>+	/* On mixer input streams: indicates mixer input stream configuration</div><div class='add'>+	   On Tees, this is copied from the stream being snooped</div><div class='add'>+</div><div class='add'>+	   Stream sample pointer &amp; MAC-unit mode for this stream </div><div class='add'>+     </div><div class='add'>+	   Initialized by the host Updated by the DSP task</div><div class='add'>+	*/</div><div class='add'>+	u32  strm_buf_ptr; /* REQUIRED  */</div><div class='add'>+</div><div class='add'>+	/* On mixer input streams: points to next mixer input and is updated by the</div><div class='add'>+                                   mixer subroutine in the "parent" DSP task</div><div class='add'>+				   (least-significant 16 bits are preserved, unused)</div><div class='add'>+    </div><div class='add'>+           On Tees, the pointer is copied from the stream being snooped on</div><div class='add'>+	   initialization, and, subsequently, it is copied into the</div><div class='add'>+	   stream being snooped.</div><div class='add'>+</div><div class='add'>+	   On wavetable/3D voices: the strmBufPtr will use all 32 bits to allow for</div><div class='add'>+                                   fractional phase accumulation</div><div class='add'>+</div><div class='add'>+	   Fractional increment per output sample in the input sample buffer</div><div class='add'>+</div><div class='add'>+	   (Not used on mixer input streams &amp; redefined on Tees)</div><div class='add'>+	   On wavetable/3D voices: this 32-bit word specifies the integer.fractional </div><div class='add'>+	   increment per output sample.</div><div class='add'>+	*/</div><div class='add'>+	u32  strmPhiIncr;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Standard stereo volume control</div><div class='add'>+	   Initialized by the host (host updates target volumes) </div><div class='add'>+</div><div class='add'>+	   Current volumes update by the DSP task</div><div class='add'>+	   On mixer input streams: required &amp; updated by the mixer subroutine in the</div><div class='add'>+                                   "parent" DSP task</div><div class='add'>+</div><div class='add'>+	   On Tees, both current &amp; target volumes are copied up on initialization,</div><div class='add'>+	   and, subsequently, the target volume is copied up while the current</div><div class='add'>+	   volume is copied down.</div><div class='add'>+     </div><div class='add'>+	   These two 32-bit words are redefined for wavetable &amp; 3-D voices.    </div><div class='add'>+	*/</div><div class='add'>+	struct dsp_volume_control vol_ctrl_t;   /* Optional */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_spos_control_block {</div><div class='add'>+	/* WARNING: Certain items in this structure are modified by the host</div><div class='add'>+	            Any dword that can be modified by the host, must not be</div><div class='add'>+		    modified by the SP as the host can only do atomic dword</div><div class='add'>+		    writes, and to do otherwise, even a read modify write, </div><div class='add'>+		    may lead to corrupted data on the SP.</div><div class='add'>+  </div><div class='add'>+		    This rule does not apply to one off boot time initialisation prior to starting the SP</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC( </div><div class='add'>+	/* First element on the Hyper forground task tree */</div><div class='add'>+	    hfg_tree_root_ptr,  /* HOST */			    </div><div class='add'>+	/* First 3 dwords are written by the host and read-only on the DSP */</div><div class='add'>+	    hfg_stack_base      /* HOST */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Point to this data structure to enable easy access */</div><div class='add'>+	    spos_cb_ptr,	 /* SP */</div><div class='add'>+	    prev_task_tree_ptr   /* SP &amp;&amp; HOST */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Currently Unused */</div><div class='add'>+	    xxinterval_timer_period,</div><div class='add'>+	/* Enable extension of SPOS data structure */</div><div class='add'>+	    HFGSPB_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    xxnum_HFG_ticks_thisInterval,</div><div class='add'>+	/* Modified by the DSP */</div><div class='add'>+	    xxnum_tntervals</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Set by DSP upon encountering a trap (breakpoint) or a spurious</div><div class='add'>+	   interrupt.  The host must clear this dword after reading it</div><div class='add'>+	   upon receiving spInt1. */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    spurious_int_flag,	 /* (Host &amp; SP) Nature of the spurious interrupt */</div><div class='add'>+	    trap_flag            /* (Host &amp; SP) Nature of detected Trap */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused2,					</div><div class='add'>+	    invalid_IP_flag        /* (Host &amp; SP ) Indicate detection of invalid instruction pointer */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* pointer to forground task tree header for use in next task search */</div><div class='add'>+	    fg_task_tree_hdr_ptr,	  /* HOST */		</div><div class='add'>+	/* Data structure for controlling synchronous link update */</div><div class='add'>+	    hfg_sync_update_ptr           /* HOST */</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     begin_foreground_FCNT,  /* SP */</div><div class='add'>+	/* Place holder for holding sleep timing */</div><div class='add'>+	     last_FCNT_before_sleep  /* SP */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused7,           /* SP */</div><div class='add'>+	    next_task_treePtr  /* SP */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 unused5;        </div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    active_flags,   /* SP */</div><div class='add'>+	/* State flags, used to assist control of execution of Hyper Forground */</div><div class='add'>+	    HFG_flags       /* SP */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused9,</div><div class='add'>+	    unused8</div><div class='add'>+	)</div><div class='add'>+                              </div><div class='add'>+	/* Space for saving enough context so that we can set up enough </div><div class='add'>+	   to save some more context.</div><div class='add'>+	*/</div><div class='add'>+	u32 rFE_save_for_invalid_IP;</div><div class='add'>+	u32 r32_save_for_spurious_int;</div><div class='add'>+	u32 r32_save_for_trap;</div><div class='add'>+	u32 r32_save_for_HFG;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SPB for MIX_TO_OSTREAM algorithm family */</div><div class='add'>+struct dsp_mix2_ostream_spb</div><div class='add'>+{</div><div class='add'>+	/* 16b.16b integer.frac approximation to the</div><div class='add'>+	   number of 3 sample triplets to output each</div><div class='add'>+	   frame. (approximation must be floor, to</div><div class='add'>+	   insure that the fractional error is always</div><div class='add'>+	   positive)</div><div class='add'>+	*/</div><div class='add'>+	u32 outTripletsPerFrame;</div><div class='add'>+</div><div class='add'>+	/* 16b.16b integer.frac accumulated number of</div><div class='add'>+	   output triplets since the start of group </div><div class='add'>+	*/</div><div class='add'>+	u32 accumOutTriplets;  </div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCB for Timing master algorithm */</div><div class='add'>+struct dsp_timing_master_scb {</div><div class='add'>+	/* First 12 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,     /* REQUIRED */</div><div class='add'>+	    sub_list_ptr  /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,  /* REQUIRED */</div><div class='add'>+	    this_spb      /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Initial values are 0000:xxxx */</div><div class='add'>+ 	    reserved,</div><div class='add'>+	    extra_sample_accum</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+  </div><div class='add'>+	/* Initial values are xxxx:0000</div><div class='add'>+	   hi: Current CODEC output FIFO pointer</div><div class='add'>+	       (0 to 0x0f)</div><div class='add'>+           lo: Flag indicating that the CODEC</div><div class='add'>+	       FIFO is sync'd (host clears to</div><div class='add'>+	       resynchronize the FIFO pointer</div><div class='add'>+	       upon start/restart) </div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    codec_FIFO_syncd, </div><div class='add'>+	    codec_FIFO_ptr</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	/* Init. 8000:0005 for 44.1k</div><div class='add'>+                 8000:0001 for 48k</div><div class='add'>+	   hi: Fractional sample accumulator 0.16b</div><div class='add'>+	   lo: Number of frames remaining to be</div><div class='add'>+	       processed in the current group of</div><div class='add'>+	       frames</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    frac_samp_accum_qm1,</div><div class='add'>+	    TM_frms_left_in_group</div><div class='add'>+	) </div><div class='add'>+</div><div class='add'>+	/* Init. 0001:0005 for 44.1k</div><div class='add'>+                 0000:0001 for 48k</div><div class='add'>+	   hi: Fractional sample correction factor 0.16b</div><div class='add'>+	       to be added every frameGroupLength frames</div><div class='add'>+	       to correct for truncation error in</div><div class='add'>+	       nsamp_per_frm_q15</div><div class='add'>+	   lo: Number of frames in the group</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    frac_samp_correction_qm1,</div><div class='add'>+	    TM_frm_group_length  </div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Init. 44.1k*65536/8k = 0x00058333 for 44.1k</div><div class='add'>+                 48k*65536/8k = 0x00060000 for 48k</div><div class='add'>+	   16b.16b integer.frac approximation to the</div><div class='add'>+	   number of samples to output each frame.</div><div class='add'>+	   (approximation must be floor, to insure */</div><div class='add'>+	u32 nsamp_per_frm_q15;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCB for CODEC output algorithm */</div><div class='add'>+struct dsp_codec_output_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+</div><div class='add'>+	/* NOTE: The CODEC output task reads samples from the first task on its</div><div class='add'>+                 sublist at the stream buffer pointer (init. to lag DMA destination</div><div class='add'>+		 address word).  After the required number of samples is transferred,</div><div class='add'>+		 the CODEC output task advances sub_list_ptr-&gt;strm_buf_ptr past the samples</div><div class='add'>+		 consumed.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* Init. 0000:0010 for SDout</div><div class='add'>+                 0060:0010 for SDout2</div><div class='add'>+		 0080:0010 for SDout3</div><div class='add'>+	   hi: Base IO address of FIFO to which</div><div class='add'>+	       the left-channel samples are to</div><div class='add'>+	       be written.</div><div class='add'>+	   lo: Displacement for the base IO</div><div class='add'>+	       address for left-channel to obtain</div><div class='add'>+	       the base IO address for the FIFO</div><div class='add'>+	       to which the right-channel samples</div><div class='add'>+	       are to be written.</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    left_chan_base_IO_addr,</div><div class='add'>+	    right_chan_IO_disp</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* Init: 0x0080:0004 for non-AC-97</div><div class='add'>+	   Init: 0x0080:0000 for AC-97</div><div class='add'>+	   hi: Exponential volume change rate</div><div class='add'>+	       for input stream</div><div class='add'>+	   lo: Positive shift count to shift the</div><div class='add'>+	       16-bit input sample to obtain the</div><div class='add'>+	       32-bit output word</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    CO_scale_shift_count, </div><div class='add'>+	    CO_exp_vol_change_rate</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Pointer to SCB at end of input chain */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    reserved,</div><div class='add'>+	    last_sub_ptr</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCB for CODEC input algorithm */</div><div class='add'>+struct dsp_codec_input_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+</div><div class='add'>+	/* NOTE: The CODEC input task reads samples from the hardware FIFO </div><div class='add'>+                 sublist at the DMA source address word (sub_list_ptr-&gt;basic_req.saw).</div><div class='add'>+                 After the required number of samples is transferred, the CODEC</div><div class='add'>+                 output task advances sub_list_ptr-&gt;basic_req.saw past the samples</div><div class='add'>+                 consumed.  SPuD must initialize the sub_list_ptr-&gt;basic_req.saw</div><div class='add'>+                 to point half-way around from the initial sub_list_ptr-&gt;strm_nuf_ptr</div><div class='add'>+                 to allow for lag/lead.</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	/* Init. 0000:0010 for SDout</div><div class='add'>+                 0060:0010 for SDout2</div><div class='add'>+		 0080:0010 for SDout3</div><div class='add'>+	   hi: Base IO address of FIFO to which</div><div class='add'>+	       the left-channel samples are to</div><div class='add'>+	       be written.</div><div class='add'>+	   lo: Displacement for the base IO</div><div class='add'>+	       address for left-channel to obtain</div><div class='add'>+	       the base IO address for the FIFO</div><div class='add'>+	       to which the right-channel samples</div><div class='add'>+	       are to be written.</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    rightChanINdisp, </div><div class='add'>+	    left_chan_base_IN_addr</div><div class='add'>+	)</div><div class='add'>+	/* Init. ?:fffc</div><div class='add'>+	   lo: Negative shift count to shift the</div><div class='add'>+	       32-bit input dword to obtain the</div><div class='add'>+	       16-bit sample msb-aligned (count</div><div class='add'>+	       is negative to shift left)</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    scaleShiftCount, </div><div class='add'>+	    reserver1</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  reserved2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_pcm_serial_input_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+  </div><div class='add'>+	/* Init. Ptr to CODEC input SCB</div><div class='add'>+	   hi: Pointer to the SCB containing the</div><div class='add'>+	       input buffer to which CODEC input</div><div class='add'>+	       samples are written</div><div class='add'>+	   lo: Flag indicating the link to the CODEC</div><div class='add'>+	       input task is to be initialized</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    init_codec_input_link,</div><div class='add'>+	    codec_input_buf_scb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Initialized by the host (host updates target volumes) */</div><div class='add'>+	struct dsp_volume_control psi_vol_ctrl;   </div><div class='add'>+  </div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_src_task_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    frames_left_in_gof,</div><div class='add'>+	    gofs_left_in_sec</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    const2_thirds,</div><div class='add'>+	    num_extra_tnput_samples</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    cor_per_gof,</div><div class='add'>+	    correction_per_sec </div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    output_buf_producer_ptr,  </div><div class='add'>+	    junk_DMA_MID</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    gof_length,  </div><div class='add'>+	    gofs_per_sec</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 input_buf_strm_config;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    reserved_for_SRC_use,</div><div class='add'>+	    input_buf_consumer_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 accum_phi;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    exp_src_vol_change_rate,</div><div class='add'>+	    input_buf_producer_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    src_next_scb,</div><div class='add'>+	    src_sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    src_entry_point,</div><div class='add'>+	    src_this_sbp</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  src_strm_rs_config;</div><div class='add'>+	u32  src_strm_buf_ptr;</div><div class='add'>+  </div><div class='add'>+	u32   phiIncr6int_26frac;</div><div class='add'>+  </div><div class='add'>+	struct dsp_volume_control src_vol_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_decimate_by_pow2_scb {</div><div class='add'>+	/* decimationFactor = 2, 4, or 8 (larger factors waste too much memory</div><div class='add'>+	                                  when compared to cascading decimators)</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_coef_base_ptr,</div><div class='add'>+	    dec2_coef_increment</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* coefIncrement = 128 / decimationFactor (for our ROM filter)</div><div class='add'>+	   coefBasePtr = 0x8000 (for our ROM filter)</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_in_samples_per_out_triplet,</div><div class='add'>+	    dec2_extra_in_samples</div><div class='add'>+	)</div><div class='add'>+	/* extraInSamples: # of accumulated, unused input samples (init. to 0)</div><div class='add'>+	   inSamplesPerOutTriplet = 3 * decimationFactor</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_const2_thirds,</div><div class='add'>+	    dec2_half_num_taps_mp5</div><div class='add'>+	)</div><div class='add'>+	/* halfNumTapsM5: (1/2 number of taps in decimation filter) minus 5</div><div class='add'>+	   const2thirds: constant 2/3 in 16Q0 format (sign.15)</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_output_buf_producer_ptr,</div><div class='add'>+	    dec2_junkdma_mid</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  dec2_reserved2;</div><div class='add'>+</div><div class='add'>+	u32  dec2_input_nuf_strm_config;</div><div class='add'>+	/* inputBufStrmConfig: rsConfig for the input buffer to the decimator</div><div class='add'>+	   (buffer size = decimationFactor * 32 dwords)</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_phi_incr,</div><div class='add'>+	    dec2_input_buf_consumer_ptr</div><div class='add'>+	)</div><div class='add'>+	/* inputBufConsumerPtr: Input buffer read pointer (into SRC filter)</div><div class='add'>+	   phiIncr = decimationFactor * 4</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	u32 dec2_reserved3;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_exp_vol_change_rate,</div><div class='add'>+	    dec2_input_buf_producer_ptr</div><div class='add'>+	)</div><div class='add'>+	/* inputBufProducerPtr: Input buffer write pointer</div><div class='add'>+	   expVolChangeRate: Exponential volume change rate for possible</div><div class='add'>+	                     future mixer on input streams</div><div class='add'>+	*/</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_next_scb,</div><div class='add'>+	    dec2_sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    dec2_entry_point,</div><div class='add'>+	    dec2_this_spb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  dec2_strm_rs_config;</div><div class='add'>+	u32  dec2_strm_buf_ptr;</div><div class='add'>+</div><div class='add'>+	u32  dec2_reserved4;</div><div class='add'>+</div><div class='add'>+	struct dsp_volume_control dec2_vol_ctrl; /* Not used! */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_vari_decimate_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_frames_left_in_gof,</div><div class='add'>+	    vdec_gofs_left_in_sec</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_const2_thirds,</div><div class='add'>+	    vdec_extra_in_samples</div><div class='add'>+	)</div><div class='add'>+	/* extraInSamples: # of accumulated, unused input samples (init. to 0)</div><div class='add'>+	   const2thirds: constant 2/3 in 16Q0 format (sign.15) */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_cor_per_gof,</div><div class='add'>+	    vdec_correction_per_sec</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_output_buf_producer_ptr,</div><div class='add'>+	    vdec_input_buf_consumer_ptr</div><div class='add'>+	)</div><div class='add'>+	/* inputBufConsumerPtr: Input buffer read pointer (into SRC filter) */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_gof_length,</div><div class='add'>+	    vdec_gofs_per_sec</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  vdec_input_buf_strm_config;</div><div class='add'>+	/* inputBufStrmConfig: rsConfig for the input buffer to the decimator</div><div class='add'>+	   (buffer size = 64 dwords) */</div><div class='add'>+	u32  vdec_coef_increment;</div><div class='add'>+	/* coefIncrement = - 128.0 / decimationFactor (as a 32Q15 number) */</div><div class='add'>+</div><div class='add'>+	u32  vdec_accumphi;</div><div class='add'>+	/* accumPhi: accumulated fractional phase increment (6.26) */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+ 	    vdec_exp_vol_change_rate,</div><div class='add'>+	    vdec_input_buf_producer_ptr</div><div class='add'>+	)</div><div class='add'>+	/* inputBufProducerPtr: Input buffer write pointer</div><div class='add'>+	   expVolChangeRate: Exponential volume change rate for possible</div><div class='add'>+	   future mixer on input streams */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_next_scb,</div><div class='add'>+	    vdec_sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    vdec_entry_point,</div><div class='add'>+	    vdec_this_spb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 vdec_strm_rs_config;</div><div class='add'>+	u32 vdec_strm_buf_ptr;</div><div class='add'>+</div><div class='add'>+	u32 vdec_phi_incr_6int_26frac;</div><div class='add'>+</div><div class='add'>+	struct dsp_volume_control vdec_vol_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SCB for MIX_TO_OSTREAM algorithm family */</div><div class='add'>+struct dsp_mix2_ostream_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	/* hi: Number of mixed-down input triplets</div><div class='add'>+	       computed since start of group</div><div class='add'>+	   lo: Number of frames remaining to be</div><div class='add'>+	       processed in the current group of</div><div class='add'>+	       frames</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    frames_left_in_group,</div><div class='add'>+	    accum_input_triplets</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* hi: Exponential volume change rate</div><div class='add'>+	       for mixer on input streams</div><div class='add'>+	   lo: Number of frames in the group</div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    frame_group_length,</div><div class='add'>+	    exp_vol_change_rate</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    const_FFFF,</div><div class='add'>+	    const_zero</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SCB for S16_MIX algorithm */</div><div class='add'>+struct dsp_mix_only_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+</div><div class='add'>+	u32 reserved;</div><div class='add'>+	struct dsp_volume_control vol_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SCB for the async. CODEC input algorithm */</div><div class='add'>+struct dsp_async_codec_input_scb {</div><div class='add'>+	u32 io_free2;     </div><div class='add'>+  </div><div class='add'>+	u32 io_current_total;</div><div class='add'>+	u32 io_previous_total;</div><div class='add'>+  </div><div class='add'>+	u16 io_count;</div><div class='add'>+	u16 io_count_limit;</div><div class='add'>+  </div><div class='add'>+	u16 o_fifo_base_addr;            </div><div class='add'>+	u16 ost_mo_format;</div><div class='add'>+	/* 1 = stereo; 0 = mono </div><div class='add'>+	   xxx for ASER 1 (not allowed); 118 for ASER2 */</div><div class='add'>+</div><div class='add'>+	u32  ostrm_rs_config;</div><div class='add'>+	u32  ostrm_buf_ptr;</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    io_sclks_per_lr_clk,</div><div class='add'>+	    io_io_enable</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  io_free4;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    io_next_scb,</div><div class='add'>+	    io_sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    io_entry_point,</div><div class='add'>+	    io_this_spb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 istrm_rs_config;</div><div class='add'>+	u32 istrm_buf_ptr;</div><div class='add'>+</div><div class='add'>+	/* Init. 0000:8042: for ASER1</div><div class='add'>+                 0000:8044: for ASER2  */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    io_stat_reg_addr,</div><div class='add'>+	    iofifo_pointer</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Init 1 stero:100 ASER1</div><div class='add'>+	   Init 0 mono:110 ASER2 </div><div class='add'>+	*/</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    ififo_base_addr,            </div><div class='add'>+	    ist_mo_format</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 i_free;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SCB for the SP/DIF CODEC input and output */</div><div class='add'>+struct dsp_spdifiscb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    status_ptr,     </div><div class='add'>+	    status_start_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 current_total;</div><div class='add'>+	u32 previous_total;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    count,</div><div class='add'>+	    count_limit</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 status_data;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    status,</div><div class='add'>+	    free4</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 free3;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    free2,</div><div class='add'>+	    bit_count</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  temp_status;</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_SCB,</div><div class='add'>+	    sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,</div><div class='add'>+	    this_spb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  strm_rs_config;</div><div class='add'>+	u32  strm_buf_ptr;</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    stat_reg_addr, </div><div class='add'>+	    fifo_pointer</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    fifo_base_addr, </div><div class='add'>+	    st_mo_format</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  free1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* SCB for the SP/DIF CODEC input and output  */</div><div class='add'>+struct dsp_spdifoscb {		 </div><div class='add'>+</div><div class='add'>+	u32 free2;     </div><div class='add'>+</div><div class='add'>+	u32 free3[4];             </div><div class='add'>+</div><div class='add'>+	/* Need to be here for compatibility with AsynchFGTxCode */</div><div class='add'>+	u32 strm_rs_config;</div><div class='add'>+                               </div><div class='add'>+	u32 strm_buf_ptr;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    status,</div><div class='add'>+	    free5</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 free4;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    next_scb,</div><div class='add'>+	    sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,</div><div class='add'>+	    this_spb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 free6[2];</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    stat_reg_addr, </div><div class='add'>+	    fifo_pointer</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    fifo_base_addr,</div><div class='add'>+	    st_mo_format</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  free1;                                         </div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_asynch_fg_rx_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    bot_buf_mask,</div><div class='add'>+	    buf_Mask</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    max,</div><div class='add'>+	    min</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    old_producer_pointer,</div><div class='add'>+	    hfg_scb_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    delta,</div><div class='add'>+	    adjust_count</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 unused2[5];  </div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(  </div><div class='add'>+	    sibling_ptr,  </div><div class='add'>+	    child_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    code_ptr,</div><div class='add'>+	    this_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; </div><div class='add'>+</div><div class='add'>+	u32 strm_buf_ptr;</div><div class='add'>+  </div><div class='add'>+	u32 unused_phi_incr;</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    right_targ,   </div><div class='add'>+	    left_targ</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    right_vol,</div><div class='add'>+	    left_vol</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_asynch_fg_tx_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    not_buf_mask,</div><div class='add'>+	    buf_mask</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    max,</div><div class='add'>+	    min</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused1,</div><div class='add'>+	    hfg_scb_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    delta,</div><div class='add'>+	    adjust_count</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 accum_phi;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused2,</div><div class='add'>+	    const_one_third</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 unused3[3];</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    sibling_ptr,</div><div class='add'>+	    child_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    codePtr,</div><div class='add'>+	    this_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config;</div><div class='add'>+</div><div class='add'>+	u32 strm_buf_ptr;</div><div class='add'>+</div><div class='add'>+	u32 phi_incr;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused_right_targ,</div><div class='add'>+	    unused_left_targ</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused_right_vol,</div><div class='add'>+	    unused_left_vol</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_output_snoop_scb {</div><div class='add'>+	/* First 13 dwords from generic_scb_t */</div><div class='add'>+	struct dsp_basic_dma_req  basic_req;  /* Optional */</div><div class='add'>+	struct dsp_scatter_gather_ext sg_ext;  /* Optional */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,       /* REQUIRED */</div><div class='add'>+	    sub_list_ptr    /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,    /* REQUIRED */</div><div class='add'>+	    this_spb        /* REQUIRED */</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_rs_config; /* REQUIRED */</div><div class='add'>+	u32 strm_buf_ptr;   /* REQUIRED */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    init_snoop_input_link,</div><div class='add'>+	    snoop_child_input_scb</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 snoop_input_buf_ptr;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    reserved,</div><div class='add'>+	    input_scb</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_spio_write_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    address1,</div><div class='add'>+	    address2</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 data1;</div><div class='add'>+</div><div class='add'>+	u32 data2;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    address3,</div><div class='add'>+	    address4</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 data3;</div><div class='add'>+</div><div class='add'>+	u32 data4;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    unused1,</div><div class='add'>+	    data_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 unused2[2];</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    sibling_ptr,</div><div class='add'>+	    child_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,</div><div class='add'>+	    this_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 unused3[5];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_magic_snoop_task {</div><div class='add'>+	u32 i0;</div><div class='add'>+	u32 i1;</div><div class='add'>+</div><div class='add'>+	u32 strm_buf_ptr1;</div><div class='add'>+  </div><div class='add'>+	u16 i2;</div><div class='add'>+	u16 snoop_scb;</div><div class='add'>+</div><div class='add'>+	u32 i3;</div><div class='add'>+	u32 i4;</div><div class='add'>+	u32 i5;</div><div class='add'>+	u32 i6;</div><div class='add'>+</div><div class='add'>+	u32 i7;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    next_scb,</div><div class='add'>+	    sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    entry_point,</div><div class='add'>+	    this_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 strm_buf_config;</div><div class='add'>+	u32 strm_buf_ptr2;</div><div class='add'>+</div><div class='add'>+	u32 i8;</div><div class='add'>+</div><div class='add'>+	struct dsp_volume_control vdec_vol_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_filter_scb {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      a0_right,          /* 0x00 */</div><div class='add'>+	      a0_left</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      a1_right,          /* 0x01 */</div><div class='add'>+	      a1_left</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      a2_right,          /* 0x02 */</div><div class='add'>+	      a2_left</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      output_buf_ptr,    /* 0x03 */</div><div class='add'>+	      init</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      filter_unused3,    /* 0x04 */</div><div class='add'>+	      filter_unused2</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32 prev_sample_output1; /* 0x05 */</div><div class='add'>+	u32 prev_sample_output2; /* 0x06 */</div><div class='add'>+	u32 prev_sample_input1;  /* 0x07 */</div><div class='add'>+	u32 prev_sample_input2;  /* 0x08 */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      next_scb_ptr,      /* 0x09 */</div><div class='add'>+	      sub_list_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      entry_point,       /* 0x0A */</div><div class='add'>+	      spb_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32  strm_rs_config;     /* 0x0B */</div><div class='add'>+	u32  strm_buf_ptr;       /* 0x0C */</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+              b0_right,          /* 0x0D */</div><div class='add'>+	      b0_left</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+              b1_right,          /* 0x0E */</div><div class='add'>+	      b1_left</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+              b2_right,          /* 0x0F */</div><div class='add'>+	      b2_left</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+#endif /* __DSP_SCB_TYPES_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_dsp_spos.h b/sound/pci/cs46xx/cs46xx_dsp_spos.h<br/>new file mode 100644<br/>index 000000000000..2fa9c7d6acc3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_dsp_spos.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx_dsp_spos.h</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='add'>+ *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS46XX_DSP_SPOS_H__</div><div class='add'>+#define __CS46XX_DSP_SPOS_H__</div><div class='add'>+</div><div class='add'>+#include "cs46xx_dsp_scb_types.h"</div><div class='add'>+#include "cs46xx_dsp_task_types.h"</div><div class='add'>+</div><div class='add'>+#define SYMBOL_CONSTANT  0x0</div><div class='add'>+#define SYMBOL_SAMPLE    0x1</div><div class='add'>+#define SYMBOL_PARAMETER 0x2</div><div class='add'>+#define SYMBOL_CODE      0x3</div><div class='add'>+</div><div class='add'>+#define SEGTYPE_SP_PROGRAM              0x00000001</div><div class='add'>+#define SEGTYPE_SP_PARAMETER            0x00000002</div><div class='add'>+#define SEGTYPE_SP_SAMPLE               0x00000003</div><div class='add'>+#define SEGTYPE_SP_COEFFICIENT          0x00000004</div><div class='add'>+</div><div class='add'>+#define DSP_SPOS_UU      0x0deadul     /* unused */</div><div class='add'>+#define DSP_SPOS_DC      0x0badul      /* don't care */</div><div class='add'>+#define DSP_SPOS_DC_DC   0x0bad0badul  /* don't care */</div><div class='add'>+#define DSP_SPOS_UUUU    0xdeadc0edul  /* unused */</div><div class='add'>+#define DSP_SPOS_UUHI    0xdeadul</div><div class='add'>+#define DSP_SPOS_UULO    0xc0edul</div><div class='add'>+#define DSP_SPOS_DCDC    0x0badf1d0ul  /* don't care */</div><div class='add'>+#define DSP_SPOS_DCDCHI  0x0badul</div><div class='add'>+#define DSP_SPOS_DCDCLO  0xf1d0ul</div><div class='add'>+</div><div class='add'>+#define DSP_MAX_TASK_NAME   60</div><div class='add'>+#define DSP_MAX_SYMBOL_NAME 100</div><div class='add'>+#define DSP_MAX_SCB_NAME    60</div><div class='add'>+#define DSP_MAX_SCB_DESC    200</div><div class='add'>+#define DSP_MAX_TASK_DESC   50</div><div class='add'>+</div><div class='add'>+#define DSP_MAX_PCM_CHANNELS 32</div><div class='add'>+#define DSP_MAX_SRC_NR       14</div><div class='add'>+</div><div class='add'>+#define DSP_PCM_MAIN_CHANNEL        1</div><div class='add'>+#define DSP_PCM_REAR_CHANNEL        2</div><div class='add'>+#define DSP_PCM_CENTER_LFE_CHANNEL  3</div><div class='add'>+#define DSP_PCM_S71_CHANNEL         4 /* surround 7.1 */</div><div class='add'>+#define DSP_IEC958_CHANNEL          5</div><div class='add'>+</div><div class='add'>+#define DSP_SPDIF_STATUS_OUTPUT_ENABLED       1</div><div class='add'>+#define DSP_SPDIF_STATUS_PLAYBACK_OPEN        2</div><div class='add'>+#define DSP_SPDIF_STATUS_HW_ENABLED           4</div><div class='add'>+#define DSP_SPDIF_STATUS_INPUT_CTRL_ENABLED   8</div><div class='add'>+</div><div class='add'>+struct dsp_symbol_entry {</div><div class='add'>+	u32 address;</div><div class='add'>+	char symbol_name[DSP_MAX_SYMBOL_NAME];</div><div class='add'>+	int symbol_type;</div><div class='add'>+</div><div class='add'>+	/* initialized by driver */</div><div class='add'>+	struct dsp_module_desc * module;</div><div class='add'>+	int deleted;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_symbol_desc {</div><div class='add'>+	int nsymbols;</div><div class='add'>+</div><div class='add'>+	struct dsp_symbol_entry *symbols;</div><div class='add'>+</div><div class='add'>+	/* initialized by driver */</div><div class='add'>+	int highest_frag_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_segment_desc {</div><div class='add'>+	int segment_type;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 size;</div><div class='add'>+	u32 * data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_module_desc {</div><div class='add'>+	char * module_name;</div><div class='add'>+	struct dsp_symbol_desc symbol_table;</div><div class='add'>+	int nsegments;</div><div class='add'>+	struct dsp_segment_desc * segments;</div><div class='add'>+</div><div class='add'>+	/* initialized by driver */</div><div class='add'>+	u32 overlay_begin_address;</div><div class='add'>+	u32 load_address;</div><div class='add'>+	int nfixups;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_scb_descriptor {</div><div class='add'>+	char scb_name[DSP_MAX_SCB_NAME];</div><div class='add'>+	u32 address;</div><div class='add'>+	int index;</div><div class='add'>+	u32 *data;</div><div class='add'>+</div><div class='add'>+	struct dsp_scb_descriptor * sub_list_ptr;</div><div class='add'>+	struct dsp_scb_descriptor * next_scb_ptr;</div><div class='add'>+	struct dsp_scb_descriptor * parent_scb_ptr;</div><div class='add'>+</div><div class='add'>+	struct dsp_symbol_entry * task_entry;</div><div class='add'>+	struct dsp_symbol_entry * scb_symbol;</div><div class='add'>+</div><div class='add'>+	struct snd_info_entry *proc_info;</div><div class='add'>+	int ref_count;</div><div class='add'>+</div><div class='add'>+	u16 volume[2];</div><div class='add'>+	unsigned int deleted :1;</div><div class='add'>+	unsigned int updated :1;</div><div class='add'>+	unsigned int volume_set :1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_task_descriptor {</div><div class='add'>+	char task_name[DSP_MAX_TASK_NAME];</div><div class='add'>+	int size;</div><div class='add'>+	u32 address;</div><div class='add'>+	int index;</div><div class='add'>+	u32 *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_pcm_channel_descriptor {</div><div class='add'>+	int active;</div><div class='add'>+	int src_slot;</div><div class='add'>+	int pcm_slot;</div><div class='add'>+	u32 sample_rate;</div><div class='add'>+	u32 unlinked;</div><div class='add'>+	struct dsp_scb_descriptor * pcm_reader_scb;</div><div class='add'>+	struct dsp_scb_descriptor * src_scb;</div><div class='add'>+	struct dsp_scb_descriptor * mixer_scb;</div><div class='add'>+</div><div class='add'>+	void * private_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dsp_spos_instance {</div><div class='add'>+	struct dsp_symbol_desc symbol_table; /* currently available loaded symbols in SP */</div><div class='add'>+</div><div class='add'>+	int nmodules;</div><div class='add'>+	struct dsp_module_desc * modules; /* modules loaded into SP */</div><div class='add'>+</div><div class='add'>+	struct dsp_segment_desc code;</div><div class='add'>+</div><div class='add'>+	/* Main PCM playback mixer */</div><div class='add'>+	struct dsp_scb_descriptor * master_mix_scb;</div><div class='add'>+	u16 dac_volume_right;</div><div class='add'>+	u16 dac_volume_left;</div><div class='add'>+</div><div class='add'>+	/* Rear/surround PCM playback mixer */</div><div class='add'>+	struct dsp_scb_descriptor * rear_mix_scb;</div><div class='add'>+</div><div class='add'>+	/* Center/LFE mixer */</div><div class='add'>+	struct dsp_scb_descriptor * center_lfe_mix_scb;</div><div class='add'>+</div><div class='add'>+	int npcm_channels;</div><div class='add'>+	int nsrc_scb;</div><div class='add'>+	struct dsp_pcm_channel_descriptor pcm_channels[DSP_MAX_PCM_CHANNELS];</div><div class='add'>+	int src_scb_slots[DSP_MAX_SRC_NR];</div><div class='add'>+</div><div class='add'>+	/* cache this symbols */</div><div class='add'>+	struct dsp_symbol_entry * null_algorithm; /* used by PCMreaderSCB's */</div><div class='add'>+	struct dsp_symbol_entry * s16_up;         /* used by SRCtaskSCB's */</div><div class='add'>+</div><div class='add'>+	/* proc fs */  </div><div class='add'>+	struct snd_card *snd_card;</div><div class='add'>+	struct snd_info_entry * proc_dsp_dir;</div><div class='add'>+</div><div class='add'>+	/* SCB's descriptors */</div><div class='add'>+	int nscb;</div><div class='add'>+	int scb_highest_frag_index;</div><div class='add'>+	struct dsp_scb_descriptor scbs[DSP_MAX_SCB_DESC];</div><div class='add'>+	struct dsp_scb_descriptor * the_null_scb;</div><div class='add'>+</div><div class='add'>+	/* Task's descriptors */</div><div class='add'>+	int ntask;</div><div class='add'>+	struct dsp_task_descriptor tasks[DSP_MAX_TASK_DESC];</div><div class='add'>+</div><div class='add'>+	/* SPDIF status */</div><div class='add'>+	int spdif_status_out;</div><div class='add'>+	int spdif_status_in;</div><div class='add'>+	u16 spdif_input_volume_right;</div><div class='add'>+	u16 spdif_input_volume_left;</div><div class='add'>+	/* spdif channel status,</div><div class='add'>+	   left right and user validity bits */</div><div class='add'>+	unsigned int spdif_csuv_default;</div><div class='add'>+	unsigned int spdif_csuv_stream;</div><div class='add'>+</div><div class='add'>+	/* SPDIF input sample rate converter */</div><div class='add'>+	struct dsp_scb_descriptor * spdif_in_src;</div><div class='add'>+	/* SPDIF input asynch. receiver */</div><div class='add'>+	struct dsp_scb_descriptor * asynch_rx_scb;</div><div class='add'>+</div><div class='add'>+	/* Capture record mixer SCB */</div><div class='add'>+	struct dsp_scb_descriptor * record_mixer_scb;</div><div class='add'>+    </div><div class='add'>+	/* CODEC input SCB */</div><div class='add'>+	struct dsp_scb_descriptor * codec_in_scb;</div><div class='add'>+</div><div class='add'>+	/* reference snooper */</div><div class='add'>+	struct dsp_scb_descriptor * ref_snoop_scb;</div><div class='add'>+</div><div class='add'>+	/* SPDIF output  PCM reference  */</div><div class='add'>+	struct dsp_scb_descriptor * spdif_pcm_input_scb;</div><div class='add'>+</div><div class='add'>+	/* asynch TX task */</div><div class='add'>+	struct dsp_scb_descriptor * asynch_tx_scb;</div><div class='add'>+</div><div class='add'>+	/* record sources */</div><div class='add'>+	struct dsp_scb_descriptor * pcm_input;</div><div class='add'>+	struct dsp_scb_descriptor * adc_input;</div><div class='add'>+</div><div class='add'>+	int spdif_in_sample_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __DSP_SPOS_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_dsp_task_types.h b/sound/pci/cs46xx/cs46xx_dsp_task_types.h<br/>new file mode 100644<br/>index 000000000000..fcbd31e40c5a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_dsp_task_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx_dsp_task_types.h</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='add'>+ *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * NOTE: comments are copy/paste from cwcemb80.lst </div><div class='add'>+ * provided by Tom Woller at Cirrus (my only</div><div class='add'>+ * documentation about the SP OS running inside</div><div class='add'>+ * the DSP) </div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CS46XX_DSP_TASK_TYPES_H__</div><div class='add'>+#define __CS46XX_DSP_TASK_TYPES_H__</div><div class='add'>+</div><div class='add'>+#include "cs46xx_dsp_scb_types.h"</div><div class='add'>+</div><div class='add'>+/*********************************************************************************************</div><div class='add'>+Example hierarchy of stream control blocks in the SP</div><div class='add'>+</div><div class='add'>+hfgTree</div><div class='add'>+Ptr____Call (c)</div><div class='add'>+       \</div><div class='add'>+ -------+------         -------------      -------------      -------------      -----</div><div class='add'>+| SBlaster IF  |______\| Foreground  |___\| Middlegr'nd |___\| Background  |___\| Nul |</div><div class='add'>+|              |Goto  /| tree header |g  /| tree header |g  /| tree header |g  /| SCB |r</div><div class='add'>+ -------------- (g)     -------------      -------------      -------------      -----</div><div class='add'>+       |c                     |c                 |c                 |c</div><div class='add'>+       |                      |                  |                  |</div><div class='add'>+      \/                  -------------      -------------      -------------   </div><div class='add'>+                       | Foreground  |_\  | Middlegr'nd |_\  | Background  |_\</div><div class='add'>+                       |     tree    |g/  |    tree     |g/  |     tree    |g/</div><div class='add'>+                        -------------      -------------      -------------   </div><div class='add'>+                              |c                 |c                 |c</div><div class='add'>+                              |                  |                  | </div><div class='add'>+                             \/                 \/                 \/ </div><div class='add'>+</div><div class='add'>+*********************************************************************************************/</div><div class='add'>+</div><div class='add'>+#define		HFG_FIRST_EXECUTE_MODE			0x0001</div><div class='add'>+#define		HFG_FIRST_EXECUTE_MODE_BIT		0</div><div class='add'>+#define		HFG_CONTEXT_SWITCH_MODE			0x0002</div><div class='add'>+#define		HFG_CONTEXT_SWITCH_MODE_BIT		1</div><div class='add'>+</div><div class='add'>+#define MAX_FG_STACK_SIZE 	32			/* THESE NEED TO BE COMPUTED PROPERLY */</div><div class='add'>+#define MAX_MG_STACK_SIZE 	16</div><div class='add'>+#define MAX_BG_STACK_SIZE 	9</div><div class='add'>+#define MAX_HFG_STACK_SIZE	4</div><div class='add'>+</div><div class='add'>+#define SLEEP_ACTIVE_INCREMENT		0		/* Enable task tree thread to go to sleep</div><div class='add'>+											   This should only ever be used on the Background thread */</div><div class='add'>+#define STANDARD_ACTIVE_INCREMENT	1		/* Task tree thread normal operation */</div><div class='add'>+#define SUSPEND_ACTIVE_INCREMENT	2		/* Cause execution to suspend in the task tree thread</div><div class='add'>+                                               This should only ever be used on the Background thread */</div><div class='add'>+</div><div class='add'>+#define HOSTFLAGS_DISABLE_BG_SLEEP  0       /* Host-controlled flag that determines whether we go to sleep</div><div class='add'>+                                               at the end of BG */</div><div class='add'>+</div><div class='add'>+/* Minimal context save area for Hyper Forground */</div><div class='add'>+struct dsp_hf_save_area {</div><div class='add'>+	u32	r10_save;</div><div class='add'>+	u32	r54_save;</div><div class='add'>+	u32	r98_save;</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    status_save,</div><div class='add'>+	    ind_save</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    rci1_save,</div><div class='add'>+	    rci0_save</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32	r32_save;</div><div class='add'>+	u32	r76_save;</div><div class='add'>+	u32	rsd2_save;</div><div class='add'>+</div><div class='add'>+       	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	      rsi2_save,	  /* See TaskTreeParameterBlock for </div><div class='add'>+				     remainder of registers  */</div><div class='add'>+	      rsa2Save</div><div class='add'>+	)</div><div class='add'>+	/* saved as part of HFG context  */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* Task link data structure */</div><div class='add'>+struct dsp_tree_link {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Pointer to sibling task control block */</div><div class='add'>+	    next_scb,</div><div class='add'>+	/* Pointer to child task control block */</div><div class='add'>+	    sub_ptr</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Pointer to code entry point */</div><div class='add'>+	    entry_point, </div><div class='add'>+	/* Pointer to local data */</div><div class='add'>+	    this_spb</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_task_tree_data {</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Initial tock count; controls task tree execution rate */</div><div class='add'>+	    tock_count_limit,</div><div class='add'>+	/* Tock down counter */</div><div class='add'>+	    tock_count</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Add to ActiveCount when TockCountLimit reached: </div><div class='add'>+	   Subtract on task tree termination */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    active_tncrement,		</div><div class='add'>+	/* Number of pending activations for task tree */</div><div class='add'>+	    active_count</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+        ___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* BitNumber to enable modification of correct bit in ActiveTaskFlags */</div><div class='add'>+	    active_bit,	    </div><div class='add'>+	/* Pointer to OS location for indicating current activity on task level */</div><div class='add'>+	    active_task_flags_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* Data structure for controlling movement of memory blocks:- </div><div class='add'>+	   currently unused */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	    mem_upd_ptr,</div><div class='add'>+	/* Data structure for controlling synchronous link update */</div><div class='add'>+	    link_upd_ptr</div><div class='add'>+	)</div><div class='add'>+  </div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	/* Save area for remainder of full context. */</div><div class='add'>+	    save_area,</div><div class='add'>+	/* Address of start of local stack for data storage */</div><div class='add'>+	    data_stack_base_ptr</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct dsp_interval_timer_data</div><div class='add'>+{</div><div class='add'>+	/* These data items have the same relative locations to those */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     interval_timer_period,</div><div class='add'>+	     itd_unused</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	/* used for this data in the SPOS control block for SPOS 1.0 */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     num_FG_ticks_this_interval,        </div><div class='add'>+	     num_intervals</div><div class='add'>+	)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This structure contains extra storage for the task tree</div><div class='add'>+   Currently, this additional data is related only to a full context save */</div><div class='add'>+struct dsp_task_tree_context_block {</div><div class='add'>+	/* Up to 10 values are saved onto the stack.  8 for the task tree, 1 for</div><div class='add'>+	   The access to the context switch (call or interrupt), and 1 spare that</div><div class='add'>+	   users should never use.  This last may be required by the system */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     stack1,</div><div class='add'>+	     stack0</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     stack3,</div><div class='add'>+	     stack2</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     stack5,</div><div class='add'>+	     stack4</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     stack7,</div><div class='add'>+	     stack6</div><div class='add'>+	)</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+	     stack9,</div><div class='add'>+	     stack8</div><div class='add'>+	)</div><div class='add'>+</div><div class='add'>+	u32	  saverfe;					</div><div class='add'>+</div><div class='add'>+	/* Value may be overwritten by stack save algorithm.</div><div class='add'>+	   Retain the size of the stack data saved here if used */</div><div class='add'>+	___DSP_DUAL_16BIT_ALLOC(</div><div class='add'>+             reserved1,	</div><div class='add'>+  	     stack_size</div><div class='add'>+	)</div><div class='add'>+	u32		saverba;	  /* (HFG) */</div><div class='add'>+	u32		saverdc;</div><div class='add'>+	u32		savers_config_23; /* (HFG) */</div><div class='add'>+	u32		savers_DMA23;	  /* (HFG) */</div><div class='add'>+	u32		saversa0;</div><div class='add'>+	u32		saversi0;</div><div class='add'>+	u32		saversa1;</div><div class='add'>+	u32		saversi1;</div><div class='add'>+	u32		saversa3;</div><div class='add'>+	u32		saversd0;</div><div class='add'>+	u32		saversd1;</div><div class='add'>+	u32		saversd3;</div><div class='add'>+	u32		savers_config01;</div><div class='add'>+	u32		savers_DMA01;</div><div class='add'>+	u32		saveacc0hl;</div><div class='add'>+	u32		saveacc1hl;</div><div class='add'>+	u32		saveacc0xacc1x;</div><div class='add'>+	u32		saveacc2hl;</div><div class='add'>+	u32		saveacc3hl;</div><div class='add'>+	u32		saveacc2xacc3x;</div><div class='add'>+	u32		saveaux0hl;</div><div class='add'>+	u32		saveaux1hl;</div><div class='add'>+	u32		saveaux0xaux1x;</div><div class='add'>+	u32		saveaux2hl;</div><div class='add'>+	u32		saveaux3hl;</div><div class='add'>+	u32		saveaux2xaux3x;</div><div class='add'>+	u32		savershouthl;</div><div class='add'>+	u32		savershoutxmacmode;</div><div class='add'>+};</div><div class='add'>+                </div><div class='add'>+</div><div class='add'>+struct dsp_task_tree_control_block {</div><div class='add'>+	struct dsp_hf_save_area			context;</div><div class='add'>+	struct dsp_tree_link			links;</div><div class='add'>+	struct dsp_task_tree_data		data;</div><div class='add'>+	struct dsp_task_tree_context_block	context_blk;</div><div class='add'>+	struct dsp_interval_timer_data		int_timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* __DSP_TASK_TYPES_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_image.h b/sound/pci/cs46xx/cs46xx_image.h<br/>deleted file mode 100644<br/>index dc93f62db2c2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_image.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_image.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3468 +0,0 @@</div><div class='del'>-struct BA1struct {</div><div class='del'>-	struct {</div><div class='del'>-		unsigned long offset;</div><div class='del'>-		unsigned long size;</div><div class='del'>-	} memory[BA1_MEMORY_COUNT];</div><div class='del'>-	u32 map[BA1_DWORD_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct BA1struct BA1Struct = {</div><div class='del'>-{{ 0x00000000, 0x00003000 },{ 0x00010000, 0x00003800 },{ 0x00020000, 0x00007000 }},</div><div class='del'>-{0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000163,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00200040,0x00008010,0x00000000,</div><div class='del'>-0x00000000,0x80000001,0x00000001,0x00060000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00900080,0x00000173,0x00000000,</div><div class='del'>-0x00000000,0x00000010,0x00800000,0x00900000,</div><div class='del'>-0xf2c0000f,0x00000200,0x00000000,0x00010600,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000163,0x330300c2,</div><div class='del'>-0x06000000,0x00000000,0x80008000,0x80008000,</div><div class='del'>-0x3fc0000f,0x00000301,0x00010400,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00b00000,0x00d0806d,0x330480c3,</div><div class='del'>-0x04800000,0x00000001,0x00800001,0x0000ffff,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x066a0600,0x06350070,0x0000929d,0x929d929d,</div><div class='del'>-0x00000000,0x0000735a,0x00000600,0x00000000,</div><div class='del'>-0x929d735a,0x8734abfe,0x00010000,0x735a735a,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x0000804f,0x000000c3,</div><div class='del'>-0x05000000,0x00a00010,0x00000000,0x80008000,</div><div class='del'>-0x00000000,0x00000000,0x00000700,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000080,0x00a00000,0x0000809a,0x000000c2,</div><div class='del'>-0x07400000,0x00000000,0x80008000,0xffffffff,</div><div class='del'>-0x00c80028,0x00005555,0x00000000,0x000107a0,</div><div class='del'>-0x00c80028,0x000000c2,0x06800000,0x00000000,</div><div class='del'>-0x06e00080,0x00300000,0x000080bb,0x000000c9,</div><div class='del'>-0x07a00000,0x04000000,0x80008000,0xffffffff,</div><div class='del'>-0x00c80028,0x00005555,0x00000000,0x00000780,</div><div class='del'>-0x00c80028,0x000000c5,0xff800000,0x00000000,</div><div class='del'>-0x00640080,0x00c00000,0x00008197,0x000000c9,</div><div class='del'>-0x07800000,0x04000000,0x80008000,0xffffffff,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x0000805e,0x000000c1,</div><div class='del'>-0x00000000,0x00800000,0x80008000,0x80008000,</div><div class='del'>-0x00020000,0x0000ffff,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x929d0600,0x929d929d,0x929d929d,0x929d0000,</div><div class='del'>-0x929d929d,0x929d929d,0x929d929d,0x929d929d,</div><div class='del'>-0x929d929d,0x00100635,0x060b013f,0x00000004,</div><div class='del'>-0x00000001,0x007a0002,0x00000000,0x066e0610,</div><div class='del'>-0x0105929d,0x929d929d,0x929d929d,0x929d929d,</div><div class='del'>-0x929d929d,0xa431ac75,0x0001735a,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0x735a0051,</div><div class='del'>-0x00000000,0x929d929d,0x929d929d,0x929d929d,</div><div class='del'>-0x929d929d,0x929d929d,0x929d929d,0x929d929d,</div><div class='del'>-0x929d929d,0x929d929d,0x00000000,0x06400136,</div><div class='del'>-0x0000270f,0x00010000,0x007a0000,0x00000000,</div><div class='del'>-0x068e0645,0x0105929d,0x929d929d,0x929d929d,</div><div class='del'>-0x929d929d,0x929d929d,0xa431ac75,0x0001735a,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0xa431ac75,0xa431ac75,0xa431ac75,0xa431ac75,</div><div class='del'>-0x735a0100,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00010004,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00001705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00009705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00011705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00019705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00021705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00029705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00031705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-0x00039705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-0x000fe19e,0x00001003,0x0009c730,0x00001003,</div><div class='del'>-0x0008e19c,0x00001003,0x000083c1,0x00093040,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00009705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00011705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00019705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00021705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00029705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00031705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-0x00039705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-0x0000a730,0x00001008,0x000e2730,0x00001002,</div><div class='del'>-0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-0x00000000,0x00000000,0x000f619c,0x00001003,</div><div class='del'>-0x0007f801,0x000c0000,0x00000037,0x00001000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x000c0000,0x00000000,0x00000000,</div><div class='del'>-0x0000373c,0x00001000,0x00000000,0x00000000,</div><div class='del'>-0x000ee19c,0x00001003,0x0007f801,0x000c0000,</div><div class='del'>-0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x0000273c,0x00001000,</div><div class='del'>-0x00000033,0x00001000,0x000e679e,0x00001003,</div><div class='del'>-0x00007705,0x00001400,0x000ac71e,0x00001003,</div><div class='del'>-0x00087fc1,0x000c3be0,0x0007f801,0x000c0000,</div><div class='del'>-0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x0000a730,0x00001003,</div><div class='del'>-0x00000033,0x00001000,0x0007f801,0x000c0000,</div><div class='del'>-0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x000c0000,</div><div class='del'>-0x00000032,0x00001000,0x0000273d,0x00001000,</div><div class='del'>-0x0004a730,0x00001003,0x00000f41,0x00097140,</div><div class='del'>-0x0000a841,0x0009b240,0x0000a0c1,0x0009f040,</div><div class='del'>-0x0001c641,0x00093540,0x0001cec1,0x0009b5c0,</div><div class='del'>-0x00000000,0x00000000,0x0001bf05,0x0003fc40,</div><div class='del'>-0x00002725,0x000aa400,0x00013705,0x00093a00,</div><div class='del'>-0x0000002e,0x0009d6c0,0x00038630,0x00001004,</div><div class='del'>-0x0004ef0a,0x000eb785,0x0003fc8a,0x00000000,</div><div class='del'>-0x00000000,0x000c70e0,0x0007d182,0x0002c640,</div><div class='del'>-0x00000630,0x00001004,0x000799b8,0x0002c6c0,</div><div class='del'>-0x00031705,0x00092240,0x00039f05,0x000932c0,</div><div class='del'>-0x0003520a,0x00000000,0x00040731,0x0000100b,</div><div class='del'>-0x00010705,0x000b20c0,0x00000000,0x000eba44,</div><div class='del'>-0x00032108,0x000c60c4,0x00065208,0x000c2917,</div><div class='del'>-0x000406b0,0x00001007,0x00012f05,0x00036880,</div><div class='del'>-0x0002818e,0x000c0000,0x0004410a,0x00000000,</div><div class='del'>-0x00040630,0x00001007,0x00029705,0x000c0000,</div><div class='del'>-0x00000000,0x00000000,0x00003fc1,0x0003fc40,</div><div class='del'>-0x000037c1,0x00091b40,0x00003fc1,0x000911c0,</div><div class='del'>-0x000037c1,0x000957c0,0x00003fc1,0x000951c0,</div><div class='del'>-0x000037c1,0x00000000,0x00003fc1,0x000991c0,</div><div class='del'>-0x000037c1,0x00000000,0x00003fc1,0x0009d1c0,</div><div class='del'>-0x000037c1,0x00000000,0x0001ccc1,0x000915c0,</div><div class='del'>-0x0001c441,0x0009d800,0x0009cdc1,0x00091240,</div><div class='del'>-0x0001c541,0x00091d00,0x0009cfc1,0x00095240,</div><div class='del'>-0x0001c741,0x00095c80,0x000e8ca9,0x00099240,</div><div class='del'>-0x000e85ad,0x00095640,0x00069ca9,0x00099d80,</div><div class='del'>-0x000e952d,0x00099640,0x000eaca9,0x0009d6c0,</div><div class='del'>-0x000ea5ad,0x00091a40,0x0006bca9,0x0009de80,</div><div class='del'>-0x000eb52d,0x00095a40,0x000ecca9,0x00099ac0,</div><div class='del'>-0x000ec5ad,0x0009da40,0x000edca9,0x0009d300,</div><div class='del'>-0x000a6e0a,0x00001000,0x000ed52d,0x00091e40,</div><div class='del'>-0x000eeca9,0x00095ec0,0x000ee5ad,0x00099e40,</div><div class='del'>-0x0006fca9,0x00002500,0x000fb208,0x000c59a0,</div><div class='del'>-0x000ef52d,0x0009de40,0x00068ca9,0x000912c1,</div><div class='del'>-0x000683ad,0x00095241,0x00020f05,0x000991c1,</div><div class='del'>-0x00000000,0x00000000,0x00086f88,0x00001000,</div><div class='del'>-0x0009cf81,0x000b5340,0x0009c701,0x000b92c0,</div><div class='del'>-0x0009de81,0x000bd300,0x0009d601,0x000b1700,</div><div class='del'>-0x0001fd81,0x000b9d80,0x0009f501,0x000b57c0,</div><div class='del'>-0x000a0f81,0x000bd740,0x00020701,0x000b5c80,</div><div class='del'>-0x000a1681,0x000b97c0,0x00021601,0x00002500,</div><div class='del'>-0x000a0701,0x000b9b40,0x000a0f81,0x000b1bc0,</div><div class='del'>-0x00021681,0x00002d00,0x00020f81,0x000bd800,</div><div class='del'>-0x000a0701,0x000b5bc0,0x00021601,0x00003500,</div><div class='del'>-0x000a0f81,0x000b5f40,0x000a0701,0x000bdbc0,</div><div class='del'>-0x00021681,0x00003d00,0x00020f81,0x000b1d00,</div><div class='del'>-0x000a0701,0x000b1fc0,0x00021601,0x00020500,</div><div class='del'>-0x00020f81,0x000b1341,0x000a0701,0x000b9fc0,</div><div class='del'>-0x00021681,0x00020d00,0x00020f81,0x000bde80,</div><div class='del'>-0x000a0701,0x000bdfc0,0x00021601,0x00021500,</div><div class='del'>-0x00020f81,0x000b9341,0x00020701,0x000b53c1,</div><div class='del'>-0x00021681,0x00021d00,0x000a0f81,0x000d0380,</div><div class='del'>-0x0000b601,0x000b15c0,0x00007b01,0x00000000,</div><div class='del'>-0x00007b81,0x000bd1c0,0x00007b01,0x00000000,</div><div class='del'>-0x00007b81,0x000b91c0,0x00007b01,0x000b57c0,</div><div class='del'>-0x00007b81,0x000b51c0,0x00007b01,0x000b1b40,</div><div class='del'>-0x00007b81,0x000b11c0,0x00087b01,0x000c3dc0,</div><div class='del'>-0x0007e488,0x000d7e45,0x00000000,0x000d7a44,</div><div class='del'>-0x0007e48a,0x00000000,0x00011f05,0x00084080,</div><div class='del'>-0x00000000,0x00000000,0x00001705,0x000b3540,</div><div class='del'>-0x00008a01,0x000bf040,0x00007081,0x000bb5c0,</div><div class='del'>-0x00055488,0x00000000,0x0000d482,0x0003fc40,</div><div class='del'>-0x0003fc88,0x00000000,0x0001e401,0x000b3a00,</div><div class='del'>-0x0001ec81,0x000bd6c0,0x0004ef08,0x000eb784,</div><div class='del'>-0x000c86b0,0x00001007,0x00008281,0x000bb240,</div><div class='del'>-0x0000b801,0x000b7140,0x00007888,0x00000000,</div><div class='del'>-0x0000073c,0x00001000,0x0007f188,0x000c0000,</div><div class='del'>-0x00000000,0x00000000,0x00055288,0x000c555c,</div><div class='del'>-0x0005528a,0x000c0000,0x0009fa88,0x000c5d00,</div><div class='del'>-0x0000fa88,0x00000000,0x00000032,0x00001000,</div><div class='del'>-0x0000073d,0x00001000,0x0007f188,0x000c0000,</div><div class='del'>-0x00000000,0x00000000,0x0008c01c,0x00001003,</div><div class='del'>-0x00002705,0x00001008,0x0008b201,0x000c1392,</div><div class='del'>-0x0000ba01,0x00000000,0x00008731,0x00001400,</div><div class='del'>-0x0004c108,0x000fe0c4,0x00057488,0x00000000,</div><div class='del'>-0x000a6388,0x00001001,0x0008b334,0x000bc141,</div><div class='del'>-0x0003020e,0x00000000,0x000886b0,0x00001008,</div><div class='del'>-0x00003625,0x000c5dfa,0x000a638a,0x00001001,</div><div class='del'>-0x0008020e,0x00001002,0x0008a6b0,0x00001008,</div><div class='del'>-0x0007f301,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00002725,0x000a8c40,0x000000ae,0x00000000,</div><div class='del'>-0x000d8630,0x00001008,0x00000000,0x000c74e0,</div><div class='del'>-0x0007d182,0x0002d640,0x000a8630,0x00001008,</div><div class='del'>-0x000799b8,0x0002d6c0,0x0000748a,0x000c3ec5,</div><div class='del'>-0x0007420a,0x000c0000,0x00062208,0x000c4117,</div><div class='del'>-0x00070630,0x00001009,0x00000000,0x000c0000,</div><div class='del'>-0x0001022e,0x00000000,0x0003a630,0x00001009,</div><div class='del'>-0x00000000,0x000c0000,0x00000036,0x00001000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x0002a730,0x00001008,0x0007f801,0x000c0000,</div><div class='del'>-0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x0002a730,0x00001008,</div><div class='del'>-0x00000033,0x00001000,0x0002a705,0x00001008,</div><div class='del'>-0x00007a01,0x000c0000,0x000e6288,0x000d550a,</div><div class='del'>-0x0006428a,0x00000000,0x00060730,0x0000100a,</div><div class='del'>-0x00000000,0x000c0000,0x00000000,0x00000000,</div><div class='del'>-0x0007aab0,0x00034880,0x00078fb0,0x0000100b,</div><div class='del'>-0x00057488,0x00000000,0x00033b94,0x00081140,</div><div class='del'>-0x000183ae,0x00000000,0x000786b0,0x0000100b,</div><div class='del'>-0x00022f05,0x000c3545,0x0000eb8a,0x00000000,</div><div class='del'>-0x00042731,0x00001003,0x0007aab0,0x00034880,</div><div class='del'>-0x00048fb0,0x0000100a,0x00057488,0x00000000,</div><div class='del'>-0x00033b94,0x00081140,0x000183ae,0x00000000,</div><div class='del'>-0x000806b0,0x0000100b,0x00022f05,0x00000000,</div><div class='del'>-0x00007401,0x00091140,0x00048f05,0x000951c0,</div><div class='del'>-0x00042731,0x00001003,0x0000473d,0x00001000,</div><div class='del'>-0x000f19b0,0x000bbc47,0x00080000,0x000bffc7,</div><div class='del'>-0x000fe19e,0x00001003,0x00000000,0x00000000,</div><div class='del'>-0x0008e19c,0x00001003,0x000083c1,0x00093040,</div><div class='del'>-0x00000f41,0x00097140,0x0000a841,0x0009b240,</div><div class='del'>-0x0000a0c1,0x0009f040,0x0001c641,0x00093540,</div><div class='del'>-0x0001cec1,0x0009b5c0,0x00000000,0x000fdc44,</div><div class='del'>-0x00055208,0x00000000,0x00010705,0x000a2880,</div><div class='del'>-0x0000a23a,0x00093a00,0x0003fc8a,0x000df6c5,</div><div class='del'>-0x0004ef0a,0x000c0000,0x00012f05,0x00036880,</div><div class='del'>-0x00065308,0x000c2997,0x000d86b0,0x0000100a,</div><div class='del'>-0x0004410a,0x000d40c7,0x00000000,0x00000000,</div><div class='del'>-0x00080730,0x00001004,0x00056f0a,0x000ea105,</div><div class='del'>-0x00000000,0x00000000,0x0000473d,0x00001000,</div><div class='del'>-0x000f19b0,0x000bbc47,0x00080000,0x000bffc7,</div><div class='del'>-0x0000273d,0x00001000,0x00000000,0x000eba44,</div><div class='del'>-0x00048f05,0x0000f440,0x00007401,0x0000f7c0,</div><div class='del'>-0x00000734,0x00001000,0x00010705,0x000a6880,</div><div class='del'>-0x00006a88,0x000c75c4,0x00000000,0x000e5084,</div><div class='del'>-0x00000000,0x000eba44,0x00087401,0x000e4782,</div><div class='del'>-0x00000734,0x00001000,0x00010705,0x000a6880,</div><div class='del'>-0x00006a88,0x000c75c4,0x0007c108,0x000c0000,</div><div class='del'>-0x0007e721,0x000bed40,0x00005f25,0x000badc0,</div><div class='del'>-0x0003ba97,0x000beb80,0x00065590,0x000b2e00,</div><div class='del'>-0x00033217,0x00003ec0,0x00065590,0x000b8e40,</div><div class='del'>-0x0003ed80,0x000491c0,0x00073fb0,0x00074c80,</div><div class='del'>-0x000283a0,0x0000100c,0x000ee388,0x00042970,</div><div class='del'>-0x00008301,0x00021ef2,0x000b8f14,0x0000000f,</div><div class='del'>-0x000c4d8d,0x0000001b,0x000d6dc2,0x000e06c6,</div><div class='del'>-0x000032ac,0x000c3916,0x0004edc2,0x00074c80,</div><div class='del'>-0x00078898,0x00001000,0x00038894,0x00000032,</div><div class='del'>-0x000c4d8d,0x00092e1b,0x000d6dc2,0x000e06c6,</div><div class='del'>-0x0004edc2,0x000c1956,0x0000722c,0x00034a00,</div><div class='del'>-0x00041705,0x0009ed40,0x00058730,0x00001400,</div><div class='del'>-0x000d7488,0x000c3a00,0x00048f05,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-0x00000000,0x00000000,0x00000000,0x00000000}</div><div class='del'>- };</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c<br/>index aad37082cb6e..b96ab7fd464c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx_lib.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Abramo Bagnara &lt;abramo@alsa-project.org&gt;</div><div class='hunk'>@@ -28,21 +29,6 @@</div><div class='ctx'>  *           references to be able to implement all fancy feutures</div><div class='ctx'>  *           supported by the cs46xx DSP's. </div><div class='ctx'>  *           Benny &lt;benny@hostmobility.com&gt;</div><div class='del'>- *                </div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -53,16 +39,18 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='del'>-#include &lt;sound/cs46xx.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include "cs46xx.h"</div><div class='ctx'> </div><div class='ctx'> #include "cs46xx_lib.h"</div><div class='ctx'> #include "dsp_spos.h"</div><div class='hunk'>@@ -70,18 +58,18 @@</div><div class='ctx'> static void amp_voyetra(struct snd_cs46xx *chip, int change);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_rear_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_rear_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_clfe_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_clfe_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_iec958_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_iec958_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_rear_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_rear_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_clfe_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_clfe_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_iec958_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_iec958_ops;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_capture_ops;</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_capture_indirect_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_capture_ops;</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_capture_indirect_ops;</div><div class='ctx'> </div><div class='ctx'> static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> 					    unsigned short reg,</div><div class='hunk'>@@ -93,7 +81,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(codec_index != CS46XX_PRIMARY_CODEC_INDEX &amp;&amp;</div><div class='ctx'> 		       codec_index != CS46XX_SECONDARY_CODEC_INDEX))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return 0xffff;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;active_ctrl(chip, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +101,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	tmp = snd_cs46xx_peekBA0(chip, BA0_ACCTL);</div><div class='ctx'> 	if ((tmp &amp; ACCTL_VFRM) == 0) {</div><div class='del'>-		snd_printk(KERN_WARNING  "cs46xx: ACCTL_VFRM not set 0x%x\n",tmp);</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "ACCTL_VFRM not set 0x%x\n", tmp);</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_ACCTL, (tmp &amp; (~ACCTL_ESYN)) | ACCTL_VFRM );</div><div class='ctx'> 		msleep(50);</div><div class='ctx'> 		tmp = snd_cs46xx_peekBA0(chip, BA0_ACCTL + offset);</div><div class='hunk'>@@ -165,7 +153,8 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> 			goto ok1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 read problem (ACCTL_DCV), reg = 0x%x\n", reg);</div><div class='ctx'> 	result = 0xffff;</div><div class='ctx'> 	goto end;</div><div class='ctx'> 	</div><div class='hunk'>@@ -184,7 +173,9 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n", codec_index, reg);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 read problem (ACSTS_VSTS), codec_index %d, reg = 0x%x\n",</div><div class='add'>+		codec_index, reg);</div><div class='ctx'> 	result = 0xffff;</div><div class='ctx'> 	goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -194,7 +185,8 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,</div><div class='ctx'> 	 *  ACSDA = Status Data Register = 474h</div><div class='ctx'> 	 */</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg,</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"e) reg = 0x%x, val = 0x%x, BA0_ACCAD = 0x%x\n", reg,</div><div class='ctx'> 			snd_cs46xx_peekBA0(chip, BA0_ACSDA),</div><div class='ctx'> 			snd_cs46xx_peekBA0(chip, BA0_ACCAD));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -283,7 +275,9 @@ static void snd_cs46xx_codec_write(struct snd_cs46xx *chip,</div><div class='ctx'> 			goto end;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n", codec_index, reg, val);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"AC'97 write problem, codec_index = %d, reg = 0x%x, val = 0x%x\n",</div><div class='add'>+		codec_index, reg, val);</div><div class='ctx'>  end:</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -1);</div><div class='ctx'> }</div><div class='hunk'>@@ -329,13 +323,147 @@ int snd_cs46xx_download(struct snd_cs46xx *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void memcpy_le32(void *dst, const void *src, unsigned int len)</div><div class='add'>+{</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	memcpy(dst, src, len);</div><div class='add'>+#else</div><div class='add'>+	u32 *_dst = dst;</div><div class='add'>+	const __le32 *_src = src;</div><div class='add'>+	len /= 4;</div><div class='add'>+	while (len-- &gt; 0)</div><div class='add'>+		*_dst++ = le32_to_cpu(*_src++);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> </div><div class='del'>-#include "imgs/cwc4630.h"</div><div class='del'>-#include "imgs/cwcasync.h"</div><div class='del'>-#include "imgs/cwcsnoop.h"</div><div class='del'>-#include "imgs/cwcbinhack.h"</div><div class='del'>-#include "imgs/cwcdma.h"</div><div class='add'>+static const char *module_names[CS46XX_DSP_MODULES] = {</div><div class='add'>+	"cwc4630", "cwcasync", "cwcsnoop", "cwcbinhack", "cwcdma"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE("cs46xx/cwc4630");</div><div class='add'>+MODULE_FIRMWARE("cs46xx/cwcasync");</div><div class='add'>+MODULE_FIRMWARE("cs46xx/cwcsnoop");</div><div class='add'>+MODULE_FIRMWARE("cs46xx/cwcbinhack");</div><div class='add'>+MODULE_FIRMWARE("cs46xx/cwcdma");</div><div class='add'>+</div><div class='add'>+static void free_module_desc(struct dsp_module_desc *module)</div><div class='add'>+{</div><div class='add'>+	if (!module)</div><div class='add'>+		return;</div><div class='add'>+	kfree(module-&gt;module_name);</div><div class='add'>+	kfree(module-&gt;symbol_table.symbols);</div><div class='add'>+	if (module-&gt;segments) {</div><div class='add'>+		int i;</div><div class='add'>+		for (i = 0; i &lt; module-&gt;nsegments; i++)</div><div class='add'>+			kfree(module-&gt;segments[i].data);</div><div class='add'>+		kfree(module-&gt;segments);</div><div class='add'>+	}</div><div class='add'>+	kfree(module);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* firmware binary format:</div><div class='add'>+ * le32 nsymbols;</div><div class='add'>+ * struct {</div><div class='add'>+ *	le32 address;</div><div class='add'>+ *	char symbol_name[DSP_MAX_SYMBOL_NAME];</div><div class='add'>+ *	le32 symbol_type;</div><div class='add'>+ * } symbols[nsymbols];</div><div class='add'>+ * le32 nsegments;</div><div class='add'>+ * struct {</div><div class='add'>+ *	le32 segment_type;</div><div class='add'>+ *	le32 offset;</div><div class='add'>+ *	le32 size;</div><div class='add'>+ *	le32 data[size];</div><div class='add'>+ * } segments[nsegments];</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int load_firmware(struct snd_cs46xx *chip,</div><div class='add'>+			 struct dsp_module_desc **module_ret,</div><div class='add'>+			 const char *fw_name)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+	unsigned int nums, fwlen, fwsize;</div><div class='add'>+	const __le32 *fwdat;</div><div class='add'>+	struct dsp_module_desc *module = NULL;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	char fw_path[32];</div><div class='add'>+</div><div class='add'>+	sprintf(fw_path, "cs46xx/%s", fw_name);</div><div class='add'>+	err = request_firmware(&amp;fw, fw_path, &amp;chip-&gt;pci-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	fwsize = fw-&gt;size / 4;</div><div class='add'>+	if (fwsize &lt; 2) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	module = kzalloc(sizeof(*module), GFP_KERNEL);</div><div class='add'>+	if (!module)</div><div class='add'>+		goto error;</div><div class='add'>+	module-&gt;module_name = kstrdup(fw_name, GFP_KERNEL);</div><div class='add'>+	if (!module-&gt;module_name)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	fwlen = 0;</div><div class='add'>+	fwdat = (const __le32 *)fw-&gt;data;</div><div class='add'>+	nums = module-&gt;symbol_table.nsymbols = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+	if (nums &gt;= 40)</div><div class='add'>+		goto error_inval;</div><div class='add'>+	module-&gt;symbol_table.symbols =</div><div class='add'>+		kcalloc(nums, sizeof(struct dsp_symbol_entry), GFP_KERNEL);</div><div class='add'>+	if (!module-&gt;symbol_table.symbols)</div><div class='add'>+		goto error;</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		struct dsp_symbol_entry *entry =</div><div class='add'>+			&amp;module-&gt;symbol_table.symbols[i];</div><div class='add'>+		if (fwlen + 2 + DSP_MAX_SYMBOL_NAME / 4 &gt; fwsize)</div><div class='add'>+			goto error_inval;</div><div class='add'>+		entry-&gt;address = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+		memcpy(entry-&gt;symbol_name, &amp;fwdat[fwlen], DSP_MAX_SYMBOL_NAME - 1);</div><div class='add'>+		fwlen += DSP_MAX_SYMBOL_NAME / 4;</div><div class='add'>+		entry-&gt;symbol_type = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fwlen &gt;= fwsize)</div><div class='add'>+		goto error_inval;</div><div class='add'>+	nums = module-&gt;nsegments = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+	if (nums &gt; 10)</div><div class='add'>+		goto error_inval;</div><div class='add'>+	module-&gt;segments =</div><div class='add'>+		kcalloc(nums, sizeof(struct dsp_segment_desc), GFP_KERNEL);</div><div class='add'>+	if (!module-&gt;segments)</div><div class='add'>+		goto error;</div><div class='add'>+	for (i = 0; i &lt; nums; i++) {</div><div class='add'>+		struct dsp_segment_desc *entry = &amp;module-&gt;segments[i];</div><div class='add'>+		if (fwlen + 3 &gt; fwsize)</div><div class='add'>+			goto error_inval;</div><div class='add'>+		entry-&gt;segment_type = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+		entry-&gt;offset = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+		entry-&gt;size = le32_to_cpu(fwdat[fwlen++]);</div><div class='add'>+		if (fwlen + entry-&gt;size &gt; fwsize)</div><div class='add'>+			goto error_inval;</div><div class='add'>+		entry-&gt;data = kmalloc_array(entry-&gt;size, 4, GFP_KERNEL);</div><div class='add'>+		if (!entry-&gt;data)</div><div class='add'>+			goto error;</div><div class='add'>+		memcpy_le32(entry-&gt;data, &amp;fwdat[fwlen], entry-&gt;size * 4);</div><div class='add'>+		fwlen += entry-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*module_ret = module;</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error_inval:</div><div class='add'>+	err = -EINVAL;</div><div class='add'>+ error:</div><div class='add'>+	free_module_desc(module);</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int snd_cs46xx_clear_BA1(struct snd_cs46xx *chip,</div><div class='ctx'>                          unsigned long offset,</div><div class='hunk'>@@ -360,20 +488,63 @@ int snd_cs46xx_clear_BA1(struct snd_cs46xx *chip,</div><div class='ctx'> </div><div class='ctx'> #else /* old DSP image */</div><div class='ctx'> </div><div class='del'>-#include "cs46xx_image.h"</div><div class='add'>+struct ba1_struct {</div><div class='add'>+	struct {</div><div class='add'>+		u32 offset;</div><div class='add'>+		u32 size;</div><div class='add'>+	} memory[BA1_MEMORY_COUNT];</div><div class='add'>+	u32 map[BA1_DWORD_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE("cs46xx/ba1");</div><div class='add'>+</div><div class='add'>+static int load_firmware(struct snd_cs46xx *chip)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int i, size, err;</div><div class='add'>+</div><div class='add'>+	err = request_firmware(&amp;fw, "cs46xx/ba1", &amp;chip-&gt;pci-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (fw-&gt;size != sizeof(*chip-&gt;ba1)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;ba1 = vmalloc(sizeof(*chip-&gt;ba1));</div><div class='add'>+	if (!chip-&gt;ba1) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy_le32(chip-&gt;ba1, fw-&gt;data, sizeof(*chip-&gt;ba1));</div><div class='add'>+</div><div class='add'>+	/* sanity check */</div><div class='add'>+	size = 0;</div><div class='add'>+	for (i = 0; i &lt; BA1_MEMORY_COUNT; i++)</div><div class='add'>+		size += chip-&gt;ba1-&gt;memory[i].size;</div><div class='add'>+	if (size &gt; BA1_DWORD_SIZE * 4)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-int snd_cs46xx_download_image(struct snd_cs46xx *chip)</div><div class='add'>+static __maybe_unused int snd_cs46xx_download_image(struct snd_cs46xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, err;</div><div class='del'>-	unsigned long offset = 0;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	struct ba1_struct *ba1 = chip-&gt;ba1;</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; BA1_MEMORY_COUNT; idx++) {</div><div class='del'>-		if ((err = snd_cs46xx_download(chip,</div><div class='del'>-					       &amp;BA1Struct.map[offset],</div><div class='del'>-					       BA1Struct.memory[idx].offset,</div><div class='del'>-					       BA1Struct.memory[idx].size)) &lt; 0)</div><div class='add'>+		err = snd_cs46xx_download(chip,</div><div class='add'>+					  &amp;ba1-&gt;map[offset],</div><div class='add'>+					  ba1-&gt;memory[idx].offset,</div><div class='add'>+					  ba1-&gt;memory[idx].size);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		offset += BA1Struct.memory[idx].size &gt;&gt; 2;</div><div class='add'>+		offset += ba1-&gt;memory[idx].size &gt;&gt; 2;</div><div class='ctx'> 	}	</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -428,8 +599,8 @@ static int cs46xx_wait_for_fifo(struct snd_cs46xx * chip,int retry_timeout)</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='ctx'> 	if(status &amp; SERBST_WBSY) {</div><div class='del'>-		snd_printk(KERN_ERR "cs46xx: failure waiting for "</div><div class='del'>-			   "FIFO command to complete\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"failure waiting for FIFO command to complete\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -466,7 +637,9 @@ static void snd_cs46xx_clear_serial_FIFOs(struct snd_cs46xx *chip)</div><div class='ctx'> 		 *  Make sure the previous FIFO write operation has completed.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (cs46xx_wait_for_fifo(chip,1)) {</div><div class='del'>-			snd_printdd ("failed waiting for FIFO at addr (%02X)\n",idx);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"failed waiting for FIFO at addr (%02X)\n",</div><div class='add'>+				idx);</div><div class='ctx'> </div><div class='ctx'> 			if (powerdown)</div><div class='ctx'> 				snd_cs46xx_pokeBA0(chip, BA0_CLKCR1, tmp);</div><div class='hunk'>@@ -514,7 +687,7 @@ static void snd_cs46xx_proc_start(struct snd_cs46xx *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_cs46xx_peek(chip, BA1_SPCR) &amp; SPCR_RUNFR)</div><div class='del'>-		snd_printk(KERN_ERR "SPCR_RUNFR never reset\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "SPCR_RUNFR never reset\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_proc_stop(struct snd_cs46xx *chip)</div><div class='hunk'>@@ -534,7 +707,6 @@ static void snd_cs46xx_proc_stop(struct snd_cs46xx *chip)</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_set_play_sample_rate(struct snd_cs46xx *chip, unsigned int rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int tmp1, tmp2;</div><div class='ctx'> 	unsigned int phiIncr;</div><div class='ctx'> 	unsigned int correctionPerGOF, correctionPerSec;</div><div class='hunk'>@@ -571,16 +743,14 @@ static void snd_cs46xx_set_play_sample_rate(struct snd_cs46xx *chip, unsigned in</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Fill in the SampleRateConverter control block.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_PSRC,</div><div class='ctx'> 	  ((correctionPerSec &lt;&lt; 16) &amp; 0xFFFF0000) | (correctionPerGOF &amp; 0xFFFF));</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_PPI, phiIncr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned int rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int phiIncr, coeffIncr, tmp1, tmp2;</div><div class='ctx'> 	unsigned int correctionPerGOF, correctionPerSec, initialDelay;</div><div class='ctx'> 	unsigned int frameGroupLength, cnt;</div><div class='hunk'>@@ -593,7 +763,7 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned</div><div class='ctx'> 		rate = 48000 / 9;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *  We can not capture at at rate greater than the Input Rate (48000).</div><div class='add'>+	 *  We can not capture at a rate greater than the Input Rate (48000).</div><div class='ctx'> 	 *  Return an error if an attempt is made to stray outside that limit.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rate &gt; 48000)</div><div class='hunk'>@@ -640,19 +810,19 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned</div><div class='ctx'> 	correctionPerGOF = tmp1 / GOF_PER_SEC;</div><div class='ctx'> 	tmp1 -= correctionPerGOF * GOF_PER_SEC;</div><div class='ctx'> 	correctionPerSec = tmp1;</div><div class='del'>-	initialDelay = ((48000 * 24) + rate - 1) / rate;</div><div class='add'>+	initialDelay = DIV_ROUND_UP(48000 * 24, rate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Fill in the VariDecimate control block.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	snd_cs46xx_poke(chip, BA1_CSRC,</div><div class='del'>-		((correctionPerSec &lt;&lt; 16) &amp; 0xFFFF0000) | (correctionPerGOF &amp; 0xFFFF));</div><div class='del'>-	snd_cs46xx_poke(chip, BA1_CCI, coeffIncr);</div><div class='del'>-	snd_cs46xx_poke(chip, BA1_CD,</div><div class='del'>-		(((BA1_VARIDEC_BUF_1 + (initialDelay &lt;&lt; 2)) &lt;&lt; 16) &amp; 0xFFFF0000) | 0x80);</div><div class='del'>-	snd_cs46xx_poke(chip, BA1_CPI, phiIncr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_cs46xx_poke(chip, BA1_CSRC,</div><div class='add'>+			((correctionPerSec &lt;&lt; 16) &amp; 0xFFFF0000) | (correctionPerGOF &amp; 0xFFFF));</div><div class='add'>+		snd_cs46xx_poke(chip, BA1_CCI, coeffIncr);</div><div class='add'>+		snd_cs46xx_poke(chip, BA1_CD,</div><div class='add'>+			(((BA1_VARIDEC_BUF_1 + (initialDelay &lt;&lt; 2)) &lt;&lt; 16) &amp; 0xFFFF0000) | 0x80);</div><div class='add'>+		snd_cs46xx_poke(chip, BA1_CPI, phiIncr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Figure out the frame group length for the write back task.  Basically,</div><div class='hunk'>@@ -675,13 +845,12 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Fill in the WriteBack control block.</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_CFG1, frameGroupLength);</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_CFG2, (0x00800000 | frameGroupLength));</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_CCST, 0x0000FFFF);</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_CSPB, ((65536 * rate) / 24000));</div><div class='ctx'> 	snd_cs46xx_poke(chip, (BA1_CSPB + 4), 0x0000FFFF);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -700,8 +869,8 @@ static int snd_cs46xx_playback_transfer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_cs46xx_pcm * cpcm = runtime-&gt;private_data;</div><div class='del'>-	snd_pcm_indirect_playback_transfer(substream, &amp;cpcm-&gt;pcm_rec, snd_cs46xx_pb_trans_copy);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_indirect_playback_transfer(substream, &amp;cpcm-&gt;pcm_rec,</div><div class='add'>+						  snd_cs46xx_pb_trans_copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -716,8 +885,8 @@ static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,</div><div class='ctx'> static int snd_cs46xx_capture_transfer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	snd_pcm_indirect_capture_transfer(substream, &amp;chip-&gt;capt.pcm_rec, snd_cs46xx_cp_trans_copy);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_indirect_capture_transfer(substream, &amp;chip-&gt;capt.pcm_rec,</div><div class='add'>+						 snd_cs46xx_cp_trans_copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_cs46xx_playback_direct_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -796,15 +965,14 @@ static int snd_cs46xx_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		if (substream-&gt;runtime-&gt;periods != CS46XX_FRAGS)</div><div class='ctx'> 			snd_cs46xx_playback_transfer(substream);</div><div class='ctx'> #else</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (substream-&gt;runtime-&gt;periods != CS46XX_FRAGS)</div><div class='del'>-			snd_cs46xx_playback_transfer(substream);</div><div class='del'>-		{ unsigned int tmp;</div><div class='del'>-		tmp = snd_cs46xx_peek(chip, BA1_PCTL);</div><div class='del'>-		tmp &amp;= 0x0000ffff;</div><div class='del'>-		snd_cs46xx_poke(chip, BA1_PCTL, chip-&gt;play_ctl | tmp);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			unsigned int tmp;</div><div class='add'>+			if (substream-&gt;runtime-&gt;periods != CS46XX_FRAGS)</div><div class='add'>+				snd_cs46xx_playback_transfer(substream);</div><div class='add'>+			tmp = snd_cs46xx_peek(chip, BA1_PCTL);</div><div class='add'>+			tmp &amp;= 0x0000ffff;</div><div class='add'>+			snd_cs46xx_poke(chip, BA1_PCTL, chip-&gt;play_ctl | tmp);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='hunk'>@@ -817,13 +985,12 @@ static int snd_cs46xx_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		if (!cpcm-&gt;pcm_channel-&gt;unlinked)</div><div class='ctx'> 			cs46xx_dsp_pcm_unlink(chip,cpcm-&gt;pcm_channel);</div><div class='ctx'> #else</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		{ unsigned int tmp;</div><div class='del'>-		tmp = snd_cs46xx_peek(chip, BA1_PCTL);</div><div class='del'>-		tmp &amp;= 0x0000ffff;</div><div class='del'>-		snd_cs46xx_poke(chip, BA1_PCTL, tmp);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			unsigned int tmp;</div><div class='add'>+			tmp = snd_cs46xx_peek(chip, BA1_PCTL);</div><div class='add'>+			tmp &amp;= 0x0000ffff;</div><div class='add'>+			snd_cs46xx_poke(chip, BA1_PCTL, tmp);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> #endif</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -839,9 +1006,8 @@ static int snd_cs46xx_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int tmp;</div><div class='del'>-	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -856,12 +1022,9 @@ static int snd_cs46xx_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		snd_cs46xx_poke(chip, BA1_CCTL, tmp);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='hunk'>@@ -874,7 +1037,8 @@ static int _cs46xx_adjust_sample_rate (struct snd_cs46xx *chip, struct snd_cs46x</div><div class='ctx'> 		cpcm-&gt;pcm_channel = cs46xx_dsp_create_pcm_channel (chip, sample_rate, </div><div class='ctx'> 								   cpcm, cpcm-&gt;hw_buf.addr,cpcm-&gt;pcm_channel_id);</div><div class='ctx'> 		if (cpcm-&gt;pcm_channel == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "cs46xx: failed to create virtual PCM channel\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"failed to create virtual PCM channel\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 		cpcm-&gt;pcm_channel-&gt;sample_rate = sample_rate;</div><div class='hunk'>@@ -884,10 +1048,12 @@ static int _cs46xx_adjust_sample_rate (struct snd_cs46xx *chip, struct snd_cs46x</div><div class='ctx'> 		int unlinked = cpcm-&gt;pcm_channel-&gt;unlinked;</div><div class='ctx'> 		cs46xx_dsp_destroy_pcm_channel (chip,cpcm-&gt;pcm_channel);</div><div class='ctx'> </div><div class='del'>-		if ( (cpcm-&gt;pcm_channel = cs46xx_dsp_create_pcm_channel (chip, sample_rate, cpcm, </div><div class='del'>-									 cpcm-&gt;hw_buf.addr,</div><div class='del'>-									 cpcm-&gt;pcm_channel_id)) == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "cs46xx: failed to re-create virtual PCM channel\n");</div><div class='add'>+		cpcm-&gt;pcm_channel = cs46xx_dsp_create_pcm_channel(chip, sample_rate, cpcm,</div><div class='add'>+								  cpcm-&gt;hw_buf.addr,</div><div class='add'>+								  cpcm-&gt;pcm_channel_id);</div><div class='add'>+		if (!cpcm-&gt;pcm_channel) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"failed to re-create virtual PCM channel\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -917,26 +1083,20 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (snd_BUG_ON(!sample_rate))</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='del'>-	if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) {</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	if (_cs46xx_adjust_sample_rate(chip, cpcm, sample_rate))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_BUG_ON(!cpcm-&gt;pcm_channel);</div><div class='del'>-	if (!cpcm-&gt;pcm_channel) {</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	if (!cpcm-&gt;pcm_channel)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_pcm_channel_set_period (chip,cpcm-&gt;pcm_channel,period_size)) {</div><div class='del'>-		 mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	if (cs46xx_dsp_pcm_channel_set_period(chip, cpcm-&gt;pcm_channel, period_size))</div><div class='ctx'> 		 return -EINVAL;</div><div class='del'>-	 }</div><div class='ctx'> </div><div class='del'>-	snd_printdd ("period_size (%d), periods (%d) buffer_size(%d)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"period_size (%d), periods (%d) buffer_size(%d)\n",</div><div class='ctx'> 		     period_size, params_periods(hw_params),</div><div class='ctx'> 		     params_buffer_bytes(hw_params));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -944,9 +1104,7 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (params_periods(hw_params) == CS46XX_FRAGS) {</div><div class='ctx'> 		if (runtime-&gt;dma_area != cpcm-&gt;hw_buf.area)</div><div class='ctx'> 			snd_pcm_lib_free_pages(substream);</div><div class='del'>-		runtime-&gt;dma_area = cpcm-&gt;hw_buf.area;</div><div class='del'>-		runtime-&gt;dma_addr = cpcm-&gt;hw_buf.addr;</div><div class='del'>-		runtime-&gt;dma_bytes = cpcm-&gt;hw_buf.bytes;</div><div class='add'>+		snd_pcm_set_runtime_buffer(substream, &amp;cpcm-&gt;hw_buf);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='hunk'>@@ -966,17 +1124,11 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		if (runtime-&gt;dma_area == cpcm-&gt;hw_buf.area) {</div><div class='del'>-			runtime-&gt;dma_area = NULL;</div><div class='del'>-			runtime-&gt;dma_addr = 0;</div><div class='del'>-			runtime-&gt;dma_bytes = 0;</div><div class='del'>-		}</div><div class='del'>-		if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0) {</div><div class='del'>-#ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-			mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-#endif</div><div class='add'>+		if (runtime-&gt;dma_area == cpcm-&gt;hw_buf.area)</div><div class='add'>+			snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='add'>+		err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 		if (cpcm-&gt;pcm_channel_id == DSP_PCM_MAIN_CHANNEL) {</div><div class='hunk'>@@ -996,10 +1148,6 @@ static int snd_cs46xx_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1018,9 +1166,7 @@ static int snd_cs46xx_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (runtime-&gt;dma_area != cpcm-&gt;hw_buf.area)</div><div class='ctx'> 		snd_pcm_lib_free_pages(substream);</div><div class='ctx'>     </div><div class='del'>-	runtime-&gt;dma_area = NULL;</div><div class='del'>-	runtime-&gt;dma_addr = 0;</div><div class='del'>-	runtime-&gt;dma_bytes = 0;</div><div class='add'>+	snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1109,17 +1255,13 @@ static int snd_cs46xx_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	if (runtime-&gt;periods == CS46XX_FRAGS) {</div><div class='ctx'> 		if (runtime-&gt;dma_area != chip-&gt;capt.hw_buf.area)</div><div class='ctx'> 			snd_pcm_lib_free_pages(substream);</div><div class='del'>-		runtime-&gt;dma_area = chip-&gt;capt.hw_buf.area;</div><div class='del'>-		runtime-&gt;dma_addr = chip-&gt;capt.hw_buf.addr;</div><div class='del'>-		runtime-&gt;dma_bytes = chip-&gt;capt.hw_buf.bytes;</div><div class='add'>+		snd_pcm_set_runtime_buffer(substream, &amp;chip-&gt;capt.hw_buf);</div><div class='ctx'> 		substream-&gt;ops = &amp;snd_cs46xx_capture_ops;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (runtime-&gt;dma_area == chip-&gt;capt.hw_buf.area) {</div><div class='del'>-			runtime-&gt;dma_area = NULL;</div><div class='del'>-			runtime-&gt;dma_addr = 0;</div><div class='del'>-			runtime-&gt;dma_bytes = 0;</div><div class='del'>-		}</div><div class='del'>-		if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='add'>+		if (runtime-&gt;dma_area == chip-&gt;capt.hw_buf.area)</div><div class='add'>+			snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='add'>+		err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		substream-&gt;ops = &amp;snd_cs46xx_capture_indirect_ops;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1134,9 +1276,7 @@ static int snd_cs46xx_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	if (runtime-&gt;dma_area != chip-&gt;capt.hw_buf.area)</div><div class='ctx'> 		snd_pcm_lib_free_pages(substream);</div><div class='del'>-	runtime-&gt;dma_area = NULL;</div><div class='del'>-	runtime-&gt;dma_addr = 0;</div><div class='del'>-	runtime-&gt;dma_bytes = 0;</div><div class='add'>+	snd_pcm_set_runtime_buffer(substream, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1221,7 +1361,7 @@ static irqreturn_t snd_cs46xx_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if ((status1 &amp; HISR_MIDI) &amp;&amp; chip-&gt;rmidi) {</div><div class='ctx'> 		unsigned char c;</div><div class='ctx'> 		</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		while ((snd_cs46xx_peekBA0(chip, BA0_MIDSR) &amp; MIDSR_RBE) == 0) {</div><div class='ctx'> 			c = snd_cs46xx_peekBA0(chip, BA0_MIDRP);</div><div class='ctx'> 			if ((chip-&gt;midcr &amp; MIDCR_RIE) == 0)</div><div class='hunk'>@@ -1238,7 +1378,6 @@ static irqreturn_t snd_cs46xx_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			}</div><div class='ctx'> 			snd_cs46xx_pokeBA0(chip, BA0_MIDWP, c);</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  EOI to the PCI part....reenables interrupts</div><div class='hunk'>@@ -1248,12 +1387,13 @@ static irqreturn_t snd_cs46xx_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs46xx_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs46xx_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED | </div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER /*|*/</div><div class='del'>-				 /*SNDRV_PCM_INFO_RESUME*/),</div><div class='add'>+				 /*SNDRV_PCM_INFO_RESUME*/ |</div><div class='add'>+				 SNDRV_PCM_INFO_SYNC_APPLPTR),</div><div class='ctx'> 	.formats =		(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |</div><div class='ctx'> 				 SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |</div><div class='ctx'> 				 SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE),</div><div class='hunk'>@@ -1270,12 +1410,13 @@ static struct snd_pcm_hardware snd_cs46xx_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs46xx_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs46xx_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER /*|*/</div><div class='del'>-				 /*SNDRV_PCM_INFO_RESUME*/),</div><div class='add'>+				 /*SNDRV_PCM_INFO_RESUME*/ |</div><div class='add'>+				 SNDRV_PCM_INFO_SYNC_APPLPTR),</div><div class='ctx'> 	.formats =		SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> 	.rates =		SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,</div><div class='ctx'> 	.rate_min =		5500,</div><div class='hunk'>@@ -1292,9 +1433,9 @@ static struct snd_pcm_hardware snd_cs46xx_capture =</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> </div><div class='del'>-static unsigned int period_sizes[] = { 32, 64, 128, 256, 512, 1024, 2048 };</div><div class='add'>+static const unsigned int period_sizes[] = { 32, 64, 128, 256, 512, 1024, 2048 };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = {</div><div class='ctx'> 	.count = ARRAY_SIZE(period_sizes),</div><div class='ctx'> 	.list = period_sizes,</div><div class='ctx'> 	.mask = 0</div><div class='hunk'>@@ -1316,7 +1457,7 @@ static int _cs46xx_playback_open_channel (struct snd_pcm_substream *substream,in</div><div class='ctx'> 	cpcm = kzalloc(sizeof(*cpcm), GFP_KERNEL);</div><div class='ctx'> 	if (cpcm == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='ctx'> 				PAGE_SIZE, &amp;cpcm-&gt;hw_buf) &lt; 0) {</div><div class='ctx'> 		kfree(cpcm);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1328,16 +1469,14 @@ static int _cs46xx_playback_open_channel (struct snd_pcm_substream *substream,in</div><div class='ctx'> </div><div class='ctx'> 	cpcm-&gt;substream = substream;</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-	cpcm-&gt;pcm_channel = NULL; </div><div class='del'>-	cpcm-&gt;pcm_channel_id = pcm_channel_id;</div><div class='del'>-</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		cpcm-&gt;pcm_channel = NULL;</div><div class='add'>+		cpcm-&gt;pcm_channel_id = pcm_channel_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_hw_constraint_list(runtime, 0,</div><div class='ctx'> 				   SNDRV_PCM_HW_PARAM_PERIOD_BYTES, </div><div class='ctx'> 				   &amp;hw_constraints_period_sizes);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> #else</div><div class='ctx'> 	chip-&gt;playback_pcm = cpcm; /* HACK */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1351,22 +1490,20 @@ static int _cs46xx_playback_open_channel (struct snd_pcm_substream *substream,in</div><div class='ctx'> </div><div class='ctx'> static int snd_cs46xx_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd("open front channel\n");</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "open front channel\n");</div><div class='ctx'> 	return _cs46xx_playback_open_channel(substream,DSP_PCM_MAIN_CHANNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> static int snd_cs46xx_playback_open_rear(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd("open rear channel\n");</div><div class='del'>-</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "open rear channel\n");</div><div class='ctx'> 	return _cs46xx_playback_open_channel(substream,DSP_PCM_REAR_CHANNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs46xx_playback_open_clfe(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd("open center - LFE channel\n");</div><div class='del'>-</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "open center - LFE channel\n");</div><div class='ctx'> 	return _cs46xx_playback_open_channel(substream,DSP_PCM_CENTER_LFE_CHANNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1374,11 +1511,11 @@ static int snd_cs46xx_playback_open_iec958(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("open raw iec958 channel\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "open raw iec958 channel\n");</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-	cs46xx_iec958_pre_open (chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		cs46xx_iec958_pre_open(chip);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return _cs46xx_playback_open_channel(substream,DSP_IEC958_CHANNEL);</div><div class='ctx'> }</div><div class='hunk'>@@ -1390,13 +1527,13 @@ static int snd_cs46xx_playback_close_iec958(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'>   </div><div class='del'>-	snd_printdd("close raw iec958 channel\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "close raw iec958 channel\n");</div><div class='ctx'> </div><div class='ctx'> 	err = snd_cs46xx_playback_close(substream);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-	cs46xx_iec958_post_close (chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		cs46xx_iec958_post_close(chip);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1406,7 +1543,7 @@ static int snd_cs46xx_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='add'>+	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &amp;chip-&gt;pci-&gt;dev,</div><div class='ctx'> 				PAGE_SIZE, &amp;chip-&gt;capt.hw_buf) &lt; 0)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	chip-&gt;capt.substream = substream;</div><div class='hunk'>@@ -1437,12 +1574,12 @@ static int snd_cs46xx_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (!cpcm) return -ENXIO;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-	if (cpcm-&gt;pcm_channel) {</div><div class='del'>-		cs46xx_dsp_destroy_pcm_channel(chip,cpcm-&gt;pcm_channel);</div><div class='del'>-		cpcm-&gt;pcm_channel = NULL;</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		if (cpcm-&gt;pcm_channel) {</div><div class='add'>+			cs46xx_dsp_destroy_pcm_channel(chip, cpcm-&gt;pcm_channel);</div><div class='add'>+			cpcm-&gt;pcm_channel = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> #else</div><div class='ctx'> 	chip-&gt;playback_pcm = NULL;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1466,10 +1603,9 @@ static int snd_cs46xx_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_rear_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_rear_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_rear,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1477,10 +1613,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_rear_ops = {</div><div class='ctx'> 	.pointer =		snd_cs46xx_playback_direct_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_rear_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_rear_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_rear,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1489,10 +1624,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_indirect_rear_ops = {</div><div class='ctx'> 	.ack =			snd_cs46xx_playback_transfer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_clfe_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_clfe_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_clfe,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1500,10 +1634,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_clfe_ops = {</div><div class='ctx'> 	.pointer =		snd_cs46xx_playback_direct_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_clfe_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_clfe_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_clfe,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1512,10 +1645,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_indirect_clfe_ops = {</div><div class='ctx'> 	.ack =			snd_cs46xx_playback_transfer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_iec958_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_iec958_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_iec958,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close_iec958,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1523,10 +1655,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_iec958_ops = {</div><div class='ctx'> 	.pointer =		snd_cs46xx_playback_direct_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_iec958_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_iec958_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open_iec958,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close_iec958,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1537,10 +1668,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_indirect_iec958_ops = {</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1548,10 +1678,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_ops = {</div><div class='ctx'> 	.pointer =		snd_cs46xx_playback_direct_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_playback_indirect_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_playback_indirect_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_playback_open,</div><div class='ctx'> 	.close =		snd_cs46xx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_playback_prepare,</div><div class='hunk'>@@ -1560,10 +1689,9 @@ static struct snd_pcm_ops snd_cs46xx_playback_indirect_ops = {</div><div class='ctx'> 	.ack =			snd_cs46xx_playback_transfer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_capture_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_capture_open,</div><div class='ctx'> 	.close =		snd_cs46xx_capture_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_capture_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_capture_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_capture_prepare,</div><div class='hunk'>@@ -1571,10 +1699,9 @@ static struct snd_pcm_ops snd_cs46xx_capture_ops = {</div><div class='ctx'> 	.pointer =		snd_cs46xx_capture_direct_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs46xx_capture_indirect_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs46xx_capture_indirect_ops = {</div><div class='ctx'> 	.open =			snd_cs46xx_capture_open,</div><div class='ctx'> 	.close =		snd_cs46xx_capture_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_cs46xx_capture_hw_params,</div><div class='ctx'> 	.hw_free =		snd_cs46xx_capture_hw_free,</div><div class='ctx'> 	.prepare =		snd_cs46xx_capture_prepare,</div><div class='hunk'>@@ -1589,14 +1716,13 @@ static struct snd_pcm_ops snd_cs46xx_capture_indirect_ops = {</div><div class='ctx'> #define MAX_PLAYBACK_CHANNELS	1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_cs46xx_pcm(struct snd_cs46xx *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "CS46xx", device, MAX_PLAYBACK_CHANNELS, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "CS46xx", device, MAX_PLAYBACK_CHANNELS, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='hunk'>@@ -1606,29 +1732,25 @@ int __devinit snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm</div><div class='ctx'> </div><div class='ctx'> 	/* global setup */</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS46xx");</div><div class='add'>+	strscpy(pcm-&gt;name, "CS46xx");</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 256*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+					      &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-int __devinit snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "CS46xx - Rear", device, MAX_PLAYBACK_CHANNELS, 0, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "CS46xx - Rear", device, MAX_PLAYBACK_CHANNELS, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='hunk'>@@ -1637,27 +1759,23 @@ int __devinit snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device, struct sn</div><div class='ctx'> </div><div class='ctx'> 	/* global setup */</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS46xx - Rear");</div><div class='add'>+	strscpy(pcm-&gt;name, "CS46xx - Rear");</div><div class='ctx'> 	chip-&gt;pcm_rear = pcm;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 256*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+					      &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "CS46xx - Center LFE", device, MAX_PLAYBACK_CHANNELS, 0, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "CS46xx - Center LFE", device, MAX_PLAYBACK_CHANNELS, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='hunk'>@@ -1666,27 +1784,23 @@ int __devinit snd_cs46xx_pcm_center_lfe(struct snd_cs46xx *chip, int device, str</div><div class='ctx'> </div><div class='ctx'> 	/* global setup */</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS46xx - Center LFE");</div><div class='add'>+	strscpy(pcm-&gt;name, "CS46xx - Center LFE");</div><div class='ctx'> 	chip-&gt;pcm_center_lfe = pcm;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 256*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+					      &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "CS46xx - IEC958", device, 1, 0, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "CS46xx - IEC958", device, 1, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='hunk'>@@ -1695,14 +1809,12 @@ int __devinit snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device, struct</div><div class='ctx'> </div><div class='ctx'> 	/* global setup */</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS46xx - IEC958");</div><div class='del'>-	chip-&gt;pcm_rear = pcm;</div><div class='add'>+	strscpy(pcm-&gt;name, "CS46xx - IEC958");</div><div class='add'>+	chip-&gt;pcm_iec958 = pcm;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 256*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+					      &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1711,13 +1823,6 @@ int __devinit snd_cs46xx_pcm_iec958(struct snd_cs46xx *chip, int device, struct</div><div class='ctx'> /*</div><div class='ctx'>  *  Mixer routines</div><div class='ctx'>  */</div><div class='del'>-static void snd_cs46xx_mixer_free_ac97_bus(struct snd_ac97_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct snd_cs46xx *chip = bus-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	chip-&gt;ac97_bus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void snd_cs46xx_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = ac97-&gt;private_data;</div><div class='hunk'>@@ -1849,15 +1954,15 @@ static int snd_cs46xx_iec958_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	switch (kcontrol-&gt;private_value) {</div><div class='ctx'> 	case CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT:</div><div class='del'>-		mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-		change = (chip-&gt;dsp_spos_instance-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_OUTPUT_ENABLED);</div><div class='del'>-		if (ucontrol-&gt;value.integer.value[0] &amp;&amp; !change) </div><div class='del'>-			cs46xx_dsp_enable_spdif_out(chip);</div><div class='del'>-		else if (change &amp;&amp; !ucontrol-&gt;value.integer.value[0])</div><div class='del'>-			cs46xx_dsp_disable_spdif_out(chip);</div><div class='del'>-</div><div class='del'>-		res = (change != (chip-&gt;dsp_spos_instance-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_OUTPUT_ENABLED));</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+		scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+			change = (chip-&gt;dsp_spos_instance-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_OUTPUT_ENABLED);</div><div class='add'>+			if (ucontrol-&gt;value.integer.value[0] &amp;&amp; !change)</div><div class='add'>+				cs46xx_dsp_enable_spdif_out(chip);</div><div class='add'>+			else if (change &amp;&amp; !ucontrol-&gt;value.integer.value[0])</div><div class='add'>+				cs46xx_dsp_disable_spdif_out(chip);</div><div class='add'>+</div><div class='add'>+			res = (change != (chip-&gt;dsp_spos_instance-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_OUTPUT_ENABLED));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CS46XX_MIXER_SPDIF_INPUT_ELEMENT:</div><div class='ctx'> 		change = chip-&gt;dsp_spos_instance-&gt;spdif_status_in;</div><div class='hunk'>@@ -1998,12 +2103,11 @@ static int snd_cs46xx_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = _wrap_all_bits((ins-&gt;spdif_csuv_default &gt;&gt; 24) &amp; 0xff);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = _wrap_all_bits((ins-&gt;spdif_csuv_default &gt;&gt; 16) &amp; 0xff);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = 0;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = _wrap_all_bits((ins-&gt;spdif_csuv_default) &amp; 0xff);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2016,7 +2120,7 @@ static int snd_cs46xx_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	val = ((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[0]) &lt;&lt; 24) |</div><div class='ctx'> 		((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[2]) &lt;&lt; 16) |</div><div class='ctx'> 		((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[3]))  |</div><div class='hunk'>@@ -2030,8 +2134,6 @@ static int snd_cs46xx_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if ( !(ins-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_PLAYBACK_OPEN) )</div><div class='ctx'> 		cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2051,12 +2153,11 @@ static int snd_cs46xx_spdif_stream_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_cs46xx *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = _wrap_all_bits((ins-&gt;spdif_csuv_stream &gt;&gt; 24) &amp; 0xff);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = _wrap_all_bits((ins-&gt;spdif_csuv_stream &gt;&gt; 16) &amp; 0xff);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = 0;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = _wrap_all_bits((ins-&gt;spdif_csuv_stream) &amp; 0xff);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2069,7 +2170,7 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	val = ((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[0]) &lt;&lt; 24) |</div><div class='ctx'> 		((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[1]) &lt;&lt; 16) |</div><div class='ctx'> 		((unsigned int)_wrap_all_bits(ucontrol-&gt;value.iec958.status[3])) |</div><div class='hunk'>@@ -2083,15 +2184,13 @@ static int snd_cs46xx_spdif_stream_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if ( ins-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_PLAYBACK_OPEN )</div><div class='ctx'> 		cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_SND_CS46XX_NEW_DSP */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs46xx_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs46xx_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "DAC Volume",</div><div class='hunk'>@@ -2206,7 +2305,7 @@ static int snd_cs46xx_front_dup_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				    ucontrol-&gt;value.integer.value[0] ? 0 : 0x200);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_cs46xx_front_dup_ctl = {</div><div class='add'>+static const struct snd_kcontrol_new snd_cs46xx_front_dup_ctl = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Duplicate Front",</div><div class='ctx'> 	.info = snd_mixer_boolean_info,</div><div class='hunk'>@@ -2217,7 +2316,7 @@ static struct snd_kcontrol_new snd_cs46xx_front_dup_ctl = {</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> /* Only available on the Hercules Game Theater XP soundcard */</div><div class='del'>-static struct snd_kcontrol_new snd_hercules_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_hercules_controls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Optical/Coaxial SPDIF Input Switch",</div><div class='hunk'>@@ -2238,10 +2337,10 @@ static void snd_cs46xx_codec_reset (struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> 	/* set the desired CODEC mode */</div><div class='ctx'> 	if (ac97-&gt;num == CS46XX_PRIMARY_CODEC_INDEX) {</div><div class='del'>-		snd_printdd("cs46xx: CODEC1 mode %04x\n", 0x0);</div><div class='add'>+		dev_dbg(ac97-&gt;bus-&gt;card-&gt;dev, "CODEC1 mode %04x\n", 0x0);</div><div class='ctx'> 		snd_cs46xx_ac97_write(ac97, AC97_CSR_ACMODE, 0x0);</div><div class='ctx'> 	} else if (ac97-&gt;num == CS46XX_SECONDARY_CODEC_INDEX) {</div><div class='del'>-		snd_printdd("cs46xx: CODEC2 mode %04x\n", 0x3);</div><div class='add'>+		dev_dbg(ac97-&gt;bus-&gt;card-&gt;dev, "CODEC2 mode %04x\n", 0x3);</div><div class='ctx'> 		snd_cs46xx_ac97_write(ac97, AC97_CSR_ACMODE, 0x3);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_BUG(); /* should never happen ... */</div><div class='hunk'>@@ -2267,17 +2366,19 @@ static void snd_cs46xx_codec_reset (struct snd_ac97 * ac97)</div><div class='ctx'> </div><div class='ctx'> 		/* test if we can write to the record gain volume register */</div><div class='ctx'> 		snd_ac97_write(ac97, AC97_REC_GAIN, 0x8a05);</div><div class='del'>-		if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05)</div><div class='add'>+		err = snd_ac97_read(ac97, AC97_REC_GAIN);</div><div class='add'>+		if (err == 0x8a05)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "CS46xx secondary codec doesn't respond!\n");  </div><div class='add'>+	dev_err(ac97-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+		"CS46xx secondary codec doesn't respond!\n");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)</div><div class='add'>+static int cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)</div><div class='ctx'> {</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='hunk'>@@ -2293,7 +2394,8 @@ static int __devinit cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)</div><div class='ctx'> 		snd_cs46xx_codec_write(chip, AC97_RESET, 0, codec);</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 		if (snd_cs46xx_codec_read(chip, AC97_RESET, codec) &amp; 0x8000) {</div><div class='del'>-			snd_printdd("snd_cs46xx: seconadry codec not present\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"secondary codec not present\n");</div><div class='ctx'> 			return -ENXIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2306,17 +2408,16 @@ static int __devinit cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printdd("snd_cs46xx: codec %d detection timeout\n", codec);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "codec %d detection timeout\n", codec);</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)</div><div class='add'>+int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = chip-&gt;card;</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int idx;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 		.reset = snd_cs46xx_codec_reset,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2326,17 +2427,17 @@ int __devinit snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)</div><div class='ctx'> </div><div class='ctx'> 	/* detect primary codec */</div><div class='ctx'> 	chip-&gt;nr_ac97_codecs = 0;</div><div class='del'>-	snd_printdd("snd_cs46xx: detecting primary codec\n");</div><div class='del'>-	if ((err = snd_ac97_bus(card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus)) &lt; 0)</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "detecting primary codec\n");</div><div class='add'>+	err = snd_ac97_bus(card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;ac97_bus-&gt;private_free = snd_cs46xx_mixer_free_ac97_bus;</div><div class='ctx'> </div><div class='ctx'> 	if (cs46xx_detect_codec(chip, CS46XX_PRIMARY_CODEC_INDEX) &lt; 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	chip-&gt;nr_ac97_codecs = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	snd_printdd("snd_cs46xx: detecting seconadry codec\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "detecting secondary codec\n");</div><div class='ctx'> 	/* try detect a secondary codec */</div><div class='ctx'> 	if (! cs46xx_detect_codec(chip, CS46XX_SECONDARY_CODEC_INDEX))</div><div class='ctx'> 		chip-&gt;nr_ac97_codecs = 2;</div><div class='hunk'>@@ -2348,20 +2449,19 @@ int __devinit snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)</div><div class='ctx'> 		kctl = snd_ctl_new1(&amp;snd_cs46xx_controls[idx], chip);</div><div class='ctx'> 		if (kctl &amp;&amp; kctl-&gt;id.iface == SNDRV_CTL_ELEM_IFACE_PCM)</div><div class='ctx'> 			kctl-&gt;id.device = spdif_device;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get EAPD mixer switch (for voyetra hack) */</div><div class='del'>-	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(id.name, "External Amplifier");</div><div class='del'>-	chip-&gt;eapd_switch = snd_ctl_find_id(chip-&gt;card, &amp;id);</div><div class='add'>+	chip-&gt;eapd_switch = snd_ctl_find_id_mixer(chip-&gt;card,</div><div class='add'>+						  "External Amplifier");</div><div class='ctx'>     </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	if (chip-&gt;nr_ac97_codecs == 1) {</div><div class='ctx'> 		unsigned int id2 = chip-&gt;ac97[CS46XX_PRIMARY_CODEC_INDEX]-&gt;id &amp; 0xffff;</div><div class='del'>-		if (id2 == 0x592b || id2 == 0x592d) {</div><div class='add'>+		if ((id2 &amp; 0xfff0) == 0x5920) {	/* CS4294 and CS4298 */</div><div class='ctx'> 			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_cs46xx_front_dup_ctl, chip));</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='hunk'>@@ -2371,7 +2471,7 @@ int __devinit snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* do soundcard specific mixer setup */</div><div class='ctx'> 	if (chip-&gt;mixer_init) {</div><div class='del'>-		snd_printdd ("calling chip-&gt;mixer_init(chip);\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "calling chip-&gt;mixer_init(chip);\n");</div><div class='ctx'> 		chip-&gt;mixer_init(chip);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2398,7 +2498,7 @@ static int snd_cs46xx_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct snd_cs46xx *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;active_ctrl(chip, 1);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;uartm |= CS46XX_MODE_INPUT;</div><div class='ctx'> 	chip-&gt;midcr |= MIDCR_RXE;</div><div class='ctx'> 	chip-&gt;midi_input = substream;</div><div class='hunk'>@@ -2407,7 +2507,6 @@ static int snd_cs46xx_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2415,16 +2514,16 @@ static int snd_cs46xx_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	chip-&gt;midcr &amp;= ~(MIDCR_RXE | MIDCR_RIE);</div><div class='del'>-	chip-&gt;midi_input = NULL;</div><div class='del'>-	if (!(chip-&gt;uartm &amp; CS46XX_MODE_OUTPUT)) {</div><div class='del'>-		snd_cs46xx_midi_reset(chip);</div><div class='del'>-	} else {</div><div class='del'>-		snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;midcr &amp;= ~(MIDCR_RXE | MIDCR_RIE);</div><div class='add'>+		chip-&gt;midi_input = NULL;</div><div class='add'>+		if (!(chip-&gt;uartm &amp; CS46XX_MODE_OUTPUT)) {</div><div class='add'>+			snd_cs46xx_midi_reset(chip);</div><div class='add'>+		} else {</div><div class='add'>+			snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='add'>+		}</div><div class='add'>+		chip-&gt;uartm &amp;= ~CS46XX_MODE_INPUT;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;uartm &amp;= ~CS46XX_MODE_INPUT;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2435,7 +2534,7 @@ static int snd_cs46xx_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;active_ctrl(chip, 1);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;uartm |= CS46XX_MODE_OUTPUT;</div><div class='ctx'> 	chip-&gt;midcr |= MIDCR_TXE;</div><div class='ctx'> 	chip-&gt;midi_output = substream;</div><div class='hunk'>@@ -2444,7 +2543,6 @@ static int snd_cs46xx_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2452,26 +2550,25 @@ static int snd_cs46xx_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_cs46xx *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	chip-&gt;midcr &amp;= ~(MIDCR_TXE | MIDCR_TIE);</div><div class='del'>-	chip-&gt;midi_output = NULL;</div><div class='del'>-	if (!(chip-&gt;uartm &amp; CS46XX_MODE_INPUT)) {</div><div class='del'>-		snd_cs46xx_midi_reset(chip);</div><div class='del'>-	} else {</div><div class='del'>-		snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;midcr &amp;= ~(MIDCR_TXE | MIDCR_TIE);</div><div class='add'>+		chip-&gt;midi_output = NULL;</div><div class='add'>+		if (!(chip-&gt;uartm &amp; CS46XX_MODE_INPUT)) {</div><div class='add'>+			snd_cs46xx_midi_reset(chip);</div><div class='add'>+		} else {</div><div class='add'>+			snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='add'>+		}</div><div class='add'>+		chip-&gt;uartm &amp;= ~CS46XX_MODE_OUTPUT;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;uartm &amp;= ~CS46XX_MODE_OUTPUT;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -1);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_cs46xx *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((chip-&gt;midcr &amp; MIDCR_RIE) == 0) {</div><div class='ctx'> 			chip-&gt;midcr |= MIDCR_RIE;</div><div class='hunk'>@@ -2483,16 +2580,14 @@ static void snd_cs46xx_midi_input_trigger(struct snd_rawmidi_substream *substrea</div><div class='ctx'> 			snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_cs46xx *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	unsigned char byte;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((chip-&gt;midcr &amp; MIDCR_TIE) == 0) {</div><div class='ctx'> 			chip-&gt;midcr |= MIDCR_TIE;</div><div class='hunk'>@@ -2513,40 +2608,36 @@ static void snd_cs46xx_midi_output_trigger(struct snd_rawmidi_substream *substre</div><div class='ctx'> 			snd_cs46xx_pokeBA0(chip, BA0_MIDCR, chip-&gt;midcr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_cs46xx_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_cs46xx_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_cs46xx_midi_output_open,</div><div class='ctx'> 	.close =	snd_cs46xx_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_cs46xx_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_cs46xx_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_cs46xx_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_cs46xx_midi_input_open,</div><div class='ctx'> 	.close =	snd_cs46xx_midi_input_close,</div><div class='ctx'> 	.trigger =	snd_cs46xx_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_midi(struct snd_cs46xx *chip, int device, struct snd_rawmidi **rrawmidi)</div><div class='add'>+int snd_cs46xx_midi(struct snd_cs46xx *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(chip-&gt;card, "CS46XX", device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(chip-&gt;card, "CS46XX", device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(rmidi-&gt;name, "CS46XX");</div><div class='add'>+	strscpy(rmidi-&gt;name, "CS46XX");</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_cs46xx_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_cs46xx_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	rmidi-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;rmidi = rmidi;</div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2555,7 +2646,7 @@ int __devinit snd_cs46xx_midi(struct snd_cs46xx *chip, int device, struct snd_ra</div><div class='ctx'>  * gameport interface</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> </div><div class='ctx'> static void snd_cs46xx_gameport_trigger(struct gameport *gameport)</div><div class='ctx'> {</div><div class='hunk'>@@ -2612,13 +2703,14 @@ static int snd_cs46xx_gameport_open(struct gameport *gameport, int mode)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_gameport(struct snd_cs46xx *chip)</div><div class='add'>+int snd_cs46xx_gameport(struct snd_cs46xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "cs46xx: cannot allocate memory for gameport\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2648,11 +2740,11 @@ static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-int __devinit snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }</div><div class='add'>+int snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }</div><div class='ctx'> static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }</div><div class='ctx'> #endif /* CONFIG_GAMEPORT */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> /*</div><div class='ctx'>  *  proc interface</div><div class='ctx'>  */</div><div class='hunk'>@@ -2669,11 +2761,11 @@ static ssize_t snd_cs46xx_io_read(struct snd_info_entry *entry,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {</div><div class='add'>+static const struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {</div><div class='ctx'> 	.read = snd_cs46xx_io_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46xx *chip)</div><div class='add'>+static int snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46xx *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> 	int idx;</div><div class='hunk'>@@ -2685,7 +2777,7 @@ static int __devinit snd_cs46xx_proc_init(struct snd_card *card, struct snd_cs46</div><div class='ctx'> 			entry-&gt;private_data = chip;</div><div class='ctx'> 			entry-&gt;c.ops = &amp;snd_cs46xx_proc_io_ops;</div><div class='ctx'> 			entry-&gt;size = region-&gt;size;</div><div class='del'>-			entry-&gt;mode = S_IFREG | S_IRUSR;</div><div class='add'>+			entry-&gt;mode = S_IFREG | 0400;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='hunk'>@@ -2701,7 +2793,7 @@ static int snd_cs46xx_proc_done(struct snd_cs46xx *chip)</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='add'>+#else /* !CONFIG_SND_PROC_FS */</div><div class='ctx'> #define snd_cs46xx_proc_init(card, chip)</div><div class='ctx'> #define snd_cs46xx_proc_done(chip)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2756,12 +2848,12 @@ static void snd_cs46xx_hw_stop(struct snd_cs46xx *chip)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int snd_cs46xx_free(struct snd_cs46xx *chip)</div><div class='add'>+static void snd_cs46xx_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct snd_cs46xx *chip = card-&gt;private_data;</div><div class='add'>+#ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	int idx;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!chip))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;active_ctrl)</div><div class='ctx'> 		chip-&gt;active_ctrl(chip, 1);</div><div class='hunk'>@@ -2773,42 +2865,21 @@ static int snd_cs46xx_free(struct snd_cs46xx *chip)</div><div class='ctx'> 	</div><div class='ctx'> 	snd_cs46xx_proc_done(chip);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;region.idx[0].resource)</div><div class='del'>-		snd_cs46xx_hw_stop(chip);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='add'>+	snd_cs46xx_hw_stop(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;active_ctrl)</div><div class='ctx'> 		chip-&gt;active_ctrl(chip, -chip-&gt;amplifier);</div><div class='ctx'> </div><div class='del'>-	for (idx = 0; idx &lt; 5; idx++) {</div><div class='del'>-		struct snd_cs46xx_region *region = &amp;chip-&gt;region.idx[idx];</div><div class='del'>-		if (region-&gt;remap_addr)</div><div class='del'>-			iounmap(region-&gt;remap_addr);</div><div class='del'>-		release_and_free_resource(region-&gt;resource);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	if (chip-&gt;dsp_spos_instance) {</div><div class='ctx'> 		cs46xx_dsp_spos_destroy(chip);</div><div class='ctx'> 		chip-&gt;dsp_spos_instance = NULL;</div><div class='ctx'> 	}</div><div class='add'>+	for (idx = 0; idx &lt; CS46XX_DSP_MODULES; idx++)</div><div class='add'>+		free_module_desc(chip-&gt;modules[idx]);</div><div class='add'>+#else</div><div class='add'>+	vfree(chip-&gt;ba1);</div><div class='ctx'> #endif</div><div class='del'>-	</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	kfree(chip-&gt;saved_regs);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs46xx_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_cs46xx *chip = device-&gt;device_data;</div><div class='del'>-	return snd_cs46xx_free(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2951,8 +3022,10 @@ static int snd_cs46xx_chip_init(struct snd_cs46xx *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "create - never read codec ready from AC'97\n");</div><div class='del'>-	snd_printk(KERN_ERR "it is not probably bug, try to use CS4236 driver\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"create - never read codec ready from AC'97\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"it is not probably bug, try to use CS4236 driver\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'>  ok1:</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='hunk'>@@ -2970,7 +3043,8 @@ static int snd_cs46xx_chip_init(struct snd_cs46xx *chip)</div><div class='ctx'> 		 *  Make sure CODEC is READY.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(snd_cs46xx_peekBA0(chip, BA0_ACSTS2) &amp; ACSTS_CRDY))</div><div class='del'>-			snd_printdd("cs46xx: never read card ready from secondary AC'97\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"never read card ready from secondary AC'97\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -3000,17 +3074,21 @@ static int snd_cs46xx_chip_init(struct snd_cs46xx *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-	snd_printk(KERN_ERR "create - never read ISV3 &amp; ISV4 from AC'97\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"create - never read ISV3 &amp; ISV4 from AC'97\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> #else</div><div class='ctx'> 	/* This may happen on a cold boot with a Terratec SiXPack 5.1.</div><div class='ctx'> 	   Reloading the driver may help, if there's other soundcards </div><div class='ctx'> 	   with the same problem I would like to know. (Benny) */</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "ERROR: snd-cs46xx: never read ISV3 &amp; ISV4 from AC'97\n");</div><div class='del'>-	snd_printk(KERN_ERR "       Try reloading the ALSA driver, if you find something\n");</div><div class='del'>-        snd_printk(KERN_ERR "       broken or not working on your soundcard upon\n");</div><div class='del'>-	snd_printk(KERN_ERR "       this message please report to alsa-devel@alsa-project.org\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "never read ISV3 &amp; ISV4 from AC'97\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"Try reloading the ALSA driver, if you find something\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"broken or not working on your soundcard upon\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"this message please report to alsa-devel@alsa-project.org\n");</div><div class='ctx'> </div><div class='ctx'> 	return -EIO;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -3060,9 +3138,14 @@ static void cs46xx_enable_stream_irqs(struct snd_cs46xx *chip)</div><div class='ctx'> 	snd_cs46xx_poke(chip, BA1_CIE, tmp);	/* capture interrupt enable */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_start_dsp(struct snd_cs46xx *chip)</div><div class='add'>+int snd_cs46xx_start_dsp(struct snd_cs46xx *chip)</div><div class='ctx'> {	</div><div class='ctx'> 	unsigned int tmp;</div><div class='add'>+#ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='add'>+	int i;</div><div class='add'>+#endif</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Reset the processor.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3071,45 +3154,33 @@ int __devinit snd_cs46xx_start_dsp(struct snd_cs46xx *chip)</div><div class='ctx'> 	 *  Download the image to the processor.</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='del'>-#if 0</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwcemb80_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwc4630_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error [cwc4630]\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwcasync_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error [cwcasync]\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwcsnoop_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error [cwcsnoop]\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwcbinhack_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error [cwcbinhack]\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cs46xx_dsp_load_module(chip, &amp;cwcdma_module) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error [cwcdma]\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+	for (i = 0; i &lt; CS46XX_DSP_MODULES; i++) {</div><div class='add'>+		err = load_firmware(chip, &amp;chip-&gt;modules[i], module_names[i]);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "firmware load error [%s]\n",</div><div class='add'>+				   module_names[i]);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		err = cs46xx_dsp_load_module(chip, chip-&gt;modules[i]);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "image download error [%s]\n",</div><div class='add'>+				   module_names[i]);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cs46xx_dsp_scb_and_task_init(chip) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> #else</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/* old image */</div><div class='del'>-	if (snd_cs46xx_download_image(chip) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "image download error\n");</div><div class='del'>-		return -EIO;</div><div class='add'>+	err = snd_cs46xx_download_image(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "image download error\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3161,7 +3232,7 @@ static int voyetra_setup_eapd_slot(struct snd_cs46xx *chip)</div><div class='ctx'> 	u32 idx, valid_slots,tmp,powerdown = 0;</div><div class='ctx'> 	u16 modem_power,pin_config,logic_type;</div><div class='ctx'> </div><div class='del'>-	snd_printdd ("cs46xx: cs46xx_setup_eapd_slot()+\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "cs46xx_setup_eapd_slot()+\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  See if the devices are powered down.  If so, we must power them up first</div><div class='hunk'>@@ -3179,7 +3250,8 @@ static int voyetra_setup_eapd_slot(struct snd_cs46xx *chip)</div><div class='ctx'> 	 * stuff.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if(chip-&gt;nr_ac97_codecs != 2) {</div><div class='del'>-		snd_printk (KERN_ERR "cs46xx: cs46xx_setup_eapd_slot() - no secondary codec configured\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cs46xx_setup_eapd_slot() - no secondary codec configured\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3220,7 +3292,7 @@ static int voyetra_setup_eapd_slot(struct snd_cs46xx *chip)</div><div class='ctx'> 	snd_cs46xx_pokeBA0(chip, BA0_ACOSV, valid_slots);</div><div class='ctx'> </div><div class='ctx'> 	if ( cs46xx_wait_for_fifo(chip,1) ) {</div><div class='del'>-	  snd_printdd("FIFO is busy\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "FIFO is busy\n");</div><div class='ctx'> 	  </div><div class='ctx'> 	  return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3241,7 +3313,9 @@ static int voyetra_setup_eapd_slot(struct snd_cs46xx *chip)</div><div class='ctx'> 		 * Wait for command to complete</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ( cs46xx_wait_for_fifo(chip,200) ) {</div><div class='del'>-			snd_printdd("failed waiting for FIFO at addr (%02X)\n",idx);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"failed waiting for FIFO at addr (%02X)\n",</div><div class='add'>+				idx);</div><div class='ctx'> </div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3330,14 +3404,14 @@ static void amp_hercules(struct snd_cs46xx *chip, int change)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;amplifier += change;</div><div class='ctx'> 	if (chip-&gt;amplifier &amp;&amp; !old) {</div><div class='del'>-		snd_printdd ("Hercules amplifier ON\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Hercules amplifier ON\n");</div><div class='ctx'> </div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_EGPIODR, </div><div class='ctx'> 				   EGPIODR_GPOE2 | val1);     /* enable EGPIO2 output */</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_EGPIOPTR, </div><div class='ctx'> 				   EGPIOPTR_GPPT2 | val2);   /* open-drain on output */</div><div class='ctx'> 	} else if (old &amp;&amp; !chip-&gt;amplifier) {</div><div class='del'>-		snd_printdd ("Hercules amplifier OFF\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Hercules amplifier OFF\n");</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_EGPIODR,  val1 &amp; ~EGPIODR_GPOE2); /* disable */</div><div class='ctx'> 		snd_cs46xx_pokeBA0(chip, BA0_EGPIOPTR, val2 &amp; ~EGPIOPTR_GPPT2); /* disable */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3345,7 +3419,7 @@ static void amp_hercules(struct snd_cs46xx *chip, int change)</div><div class='ctx'> </div><div class='ctx'> static void voyetra_mixer_init (struct snd_cs46xx *chip)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd ("initializing Voyetra mixer\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "initializing Voyetra mixer\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Enable SPDIF out */</div><div class='ctx'> 	snd_cs46xx_pokeBA0(chip, BA0_EGPIODR, EGPIODR_GPOE0);</div><div class='hunk'>@@ -3363,7 +3437,7 @@ static void hercules_mixer_init (struct snd_cs46xx *chip)</div><div class='ctx'> 	/* set EGPIO to default */</div><div class='ctx'> 	hercules_init(chip);</div><div class='ctx'> </div><div class='del'>-	snd_printdd ("initializing Hercules mixer\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "initializing Hercules mixer\n");</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	if (chip-&gt;in_suspend)</div><div class='hunk'>@@ -3373,8 +3447,11 @@ static void hercules_mixer_init (struct snd_cs46xx *chip)</div><div class='ctx'> 		struct snd_kcontrol *kctl;</div><div class='ctx'> </div><div class='ctx'> 		kctl = snd_ctl_new1(&amp;snd_hercules_controls[idx], chip);</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)) &lt; 0) {</div><div class='del'>-			printk (KERN_ERR "cs46xx: failed to initialize Hercules mixer (%d)\n",err);</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(card-&gt;dev,</div><div class='add'>+				"failed to initialize Hercules mixer (%d)\n",</div><div class='add'>+				err);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3476,7 +3553,7 @@ struct cs_card_type</div><div class='ctx'> 	void (*mixer_init)(struct snd_cs46xx *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cs_card_type __devinitdata cards[] = {</div><div class='add'>+static struct cs_card_type cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor = 0x1489,</div><div class='ctx'> 		.id = 0x7001,</div><div class='hunk'>@@ -3589,8 +3666,8 @@ static struct cs_card_type __devinitdata cards[] = {</div><div class='ctx'> /*</div><div class='ctx'>  * APM support</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static unsigned int saved_regs[] = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static const unsigned int saved_regs[] = {</div><div class='ctx'> 	BA0_ACOSV,</div><div class='ctx'> 	/*BA0_ASER_FADDR,*/</div><div class='ctx'> 	BA0_ASER_MASTER,</div><div class='hunk'>@@ -3598,15 +3675,14 @@ static unsigned int saved_regs[] = {</div><div class='ctx'> 	BA1_CVOL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int snd_cs46xx_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_cs46xx_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_cs46xx *chip = card-&gt;private_data;</div><div class='ctx'> 	int i, amp_saved;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> 	chip-&gt;in_suspend = 1;</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	// chip-&gt;ac97_powerdown = snd_cs46xx_codec_read(chip, AC97_POWER_CONTROL);</div><div class='ctx'> 	// chip-&gt;ac97_general_purpose = snd_cs46xx_codec_read(chip, BA0_AC97_GENERAL_PURPOSE);</div><div class='ctx'> </div><div class='hunk'>@@ -3624,16 +3700,12 @@ int snd_cs46xx_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	/* disable CLKRUN */</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -chip-&gt;amplifier);</div><div class='ctx'> 	chip-&gt;amplifier = amp_saved; /* restore the status */</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_cs46xx_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_cs46xx_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_cs46xx *chip = card-&gt;private_data;</div><div class='ctx'> 	int amp_saved;</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='hunk'>@@ -3641,16 +3713,6 @@ int snd_cs46xx_resume(struct pci_dev *pci)</div><div class='ctx'> #endif</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cs46xx: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	amp_saved = chip-&gt;amplifier;</div><div class='ctx'> 	chip-&gt;amplifier = 0;</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, 1); /* force to on */</div><div class='hunk'>@@ -3706,37 +3768,29 @@ int snd_cs46xx_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+SIMPLE_DEV_PM_OPS(snd_cs46xx_pm, snd_cs46xx_suspend, snd_cs46xx_resume);</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs46xx_create(struct snd_card *card,</div><div class='del'>-		      struct pci_dev * pci,</div><div class='del'>-		      int external_amp, int thinkpad,</div><div class='del'>-		      struct snd_cs46xx ** rchip)</div><div class='add'>+int snd_cs46xx_create(struct snd_card *card,</div><div class='add'>+		      struct pci_dev *pci,</div><div class='add'>+		      int external_amp, int thinkpad)</div><div class='ctx'> {</div><div class='del'>-	struct snd_cs46xx *chip;</div><div class='add'>+	struct snd_cs46xx *chip = card-&gt;private_data;</div><div class='ctx'> 	int err, idx;</div><div class='ctx'> 	struct snd_cs46xx_region *region;</div><div class='ctx'> 	struct cs_card_type *cp;</div><div class='ctx'> 	u16 ss_card, ss_vendor;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_cs46xx_dev_free,</div><div class='del'>-	};</div><div class='ctx'> 	</div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;spos_mutex);</div><div class='hunk'>@@ -3744,38 +3798,42 @@ int __devinit snd_cs46xx_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='add'>+</div><div class='add'>+	err = pcim_request_all_regions(pci, "CS46xx");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	chip-&gt;ba0_addr = pci_resource_start(pci, 0);</div><div class='ctx'> 	chip-&gt;ba1_addr = pci_resource_start(pci, 1);</div><div class='ctx'> 	if (chip-&gt;ba0_addr == 0 || chip-&gt;ba0_addr == (unsigned long)~0 ||</div><div class='ctx'> 	    chip-&gt;ba1_addr == 0 || chip-&gt;ba1_addr == (unsigned long)~0) {</div><div class='del'>-	    	snd_printk(KERN_ERR "wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n",</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"wrong address(es) - ba0 = 0x%lx, ba1 = 0x%lx\n",</div><div class='ctx'> 			   chip-&gt;ba0_addr, chip-&gt;ba1_addr);</div><div class='del'>-	    	snd_cs46xx_free(chip);</div><div class='ctx'> 	    	return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	region = &amp;chip-&gt;region.name.ba0;</div><div class='del'>-	strcpy(region-&gt;name, "CS46xx_BA0");</div><div class='add'>+	strscpy(region-&gt;name, "CS46xx_BA0");</div><div class='ctx'> 	region-&gt;base = chip-&gt;ba0_addr;</div><div class='ctx'> 	region-&gt;size = CS46XX_BA0_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	region = &amp;chip-&gt;region.name.data0;</div><div class='del'>-	strcpy(region-&gt;name, "CS46xx_BA1_data0");</div><div class='add'>+	strscpy(region-&gt;name, "CS46xx_BA1_data0");</div><div class='ctx'> 	region-&gt;base = chip-&gt;ba1_addr + BA1_SP_DMEM0;</div><div class='ctx'> 	region-&gt;size = CS46XX_BA1_DATA0_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	region = &amp;chip-&gt;region.name.data1;</div><div class='del'>-	strcpy(region-&gt;name, "CS46xx_BA1_data1");</div><div class='add'>+	strscpy(region-&gt;name, "CS46xx_BA1_data1");</div><div class='ctx'> 	region-&gt;base = chip-&gt;ba1_addr + BA1_SP_DMEM1;</div><div class='ctx'> 	region-&gt;size = CS46XX_BA1_DATA1_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	region = &amp;chip-&gt;region.name.pmem;</div><div class='del'>-	strcpy(region-&gt;name, "CS46xx_BA1_pmem");</div><div class='add'>+	strscpy(region-&gt;name, "CS46xx_BA1_pmem");</div><div class='ctx'> 	region-&gt;base = chip-&gt;ba1_addr + BA1_SP_PMEM;</div><div class='ctx'> 	region-&gt;size = CS46XX_BA1_PRG_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	region = &amp;chip-&gt;region.name.reg;</div><div class='del'>-	strcpy(region-&gt;name, "CS46xx_BA1_reg");</div><div class='add'>+	strscpy(region-&gt;name, "CS46xx_BA1_reg");</div><div class='ctx'> 	region-&gt;base = chip-&gt;ba1_addr + BA1_SP_REG;</div><div class='ctx'> 	region-&gt;size = CS46XX_BA1_REG_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -3785,7 +3843,8 @@ int __devinit snd_cs46xx_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	for (cp = &amp;cards[0]; cp-&gt;name; cp++) {</div><div class='ctx'> 		if (cp-&gt;vendor == ss_vendor &amp;&amp; cp-&gt;id == ss_card) {</div><div class='del'>-			snd_printdd ("hack for %s enabled\n", cp-&gt;name);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "hack for %s enabled\n",</div><div class='add'>+				cp-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 			chip-&gt;amplifier_ctrl = cp-&gt;amp;</div><div class='ctx'> 			chip-&gt;active_ctrl = cp-&gt;active;</div><div class='hunk'>@@ -3798,12 +3857,14 @@ int __devinit snd_cs46xx_create(struct snd_card *card,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (external_amp) {</div><div class='del'>-		snd_printk(KERN_INFO "Crystal EAPD support forced on.\n");</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Crystal EAPD support forced on.\n");</div><div class='ctx'> 		chip-&gt;amplifier_ctrl = amp_voyetra;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (thinkpad) {</div><div class='del'>-		snd_printk(KERN_INFO "Activating CLKRUN hack for Thinkpad.\n");</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Activating CLKRUN hack for Thinkpad.\n");</div><div class='ctx'> 		chip-&gt;active_ctrl = clkrun_hack;</div><div class='ctx'> 		clkrun_init(chip);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3819,63 +3880,45 @@ int __devinit snd_cs46xx_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; 5; idx++) {</div><div class='ctx'> 		region = &amp;chip-&gt;region.idx[idx];</div><div class='del'>-		if ((region-&gt;resource = request_mem_region(region-&gt;base, region-&gt;size,</div><div class='del'>-							   region-&gt;name)) == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to request memory region 0x%lx-0x%lx\n",</div><div class='del'>-				   region-&gt;base, region-&gt;base + region-&gt;size - 1);</div><div class='del'>-			snd_cs46xx_free(chip);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		region-&gt;remap_addr = ioremap_nocache(region-&gt;base, region-&gt;size);</div><div class='add'>+		region-&gt;remap_addr = devm_ioremap(&amp;pci-&gt;dev, region-&gt;base,</div><div class='add'>+						  region-&gt;size);</div><div class='ctx'> 		if (region-&gt;remap_addr == NULL) {</div><div class='del'>-			snd_printk(KERN_ERR "%s ioremap problem\n", region-&gt;name);</div><div class='del'>-			snd_cs46xx_free(chip);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"%s ioremap problem\n", region-&gt;name);</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_cs46xx_interrupt, IRQF_SHARED,</div><div class='del'>-			"CS46XX", chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_cs46xx_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_cs46xx_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_cs46xx_free;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_CS46XX_NEW_DSP</div><div class='ctx'> 	chip-&gt;dsp_spos_instance = cs46xx_dsp_spos_create(chip);</div><div class='del'>-	if (chip-&gt;dsp_spos_instance == NULL) {</div><div class='del'>-		snd_cs46xx_free(chip);</div><div class='add'>+	if (!chip-&gt;dsp_spos_instance)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	err = snd_cs46xx_chip_init(chip);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_cs46xx_free(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_cs46xx_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	snd_cs46xx_proc_init(card, chip);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	chip-&gt;saved_regs = kmalloc(sizeof(*chip-&gt;saved_regs) *</div><div class='del'>-				   ARRAY_SIZE(saved_regs), GFP_KERNEL);</div><div class='del'>-	if (!chip-&gt;saved_regs) {</div><div class='del'>-		snd_cs46xx_free(chip);</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	chip-&gt;saved_regs = devm_kmalloc_array(&amp;pci-&gt;dev,</div><div class='add'>+					      ARRAY_SIZE(saved_regs),</div><div class='add'>+					      sizeof(*chip-&gt;saved_regs),</div><div class='add'>+					      GFP_KERNEL);</div><div class='add'>+	if (!chip-&gt;saved_regs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -1); /* disable CLKRUN */</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/cs46xx/cs46xx_lib.h b/sound/pci/cs46xx/cs46xx_lib.h<br/>index b5189495d58a..6bcf2b636e8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_lib.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/cs46xx_lib.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/cs46xx_lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/cs46xx_lib.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __CS46XX_LIB_H__</div><div class='hunk'>@@ -90,12 +75,12 @@ static inline unsigned int snd_cs46xx_peekBA0(struct snd_cs46xx *chip, unsigned</div><div class='ctx'> struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip);</div><div class='ctx'> void cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip);</div><div class='ctx'> int cs46xx_dsp_load_module (struct snd_cs46xx * chip, struct dsp_module_desc * module);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> int cs46xx_dsp_resume(struct snd_cs46xx * chip);</div><div class='ctx'> #endif</div><div class='ctx'> struct dsp_symbol_entry *cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name,</div><div class='ctx'> 						   int symbol_type);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip);</div><div class='ctx'> int cs46xx_dsp_proc_done (struct snd_cs46xx *chip);</div><div class='ctx'> #else</div><div class='hunk'>@@ -118,7 +103,7 @@ int cs46xx_dsp_disable_adc_capture (struct snd_cs46xx *chip);</div><div class='ctx'> int cs46xx_poke_via_dsp (struct snd_cs46xx *chip, u32 address, u32 data);</div><div class='ctx'> struct dsp_scb_descriptor * cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name,</div><div class='ctx'> 						   u32 * scb_data, u32 dest);</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb);</div><div class='ctx'> void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,</div><div class='ctx'> 					struct dsp_scb_descriptor * scb);</div><div class='head'>diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c<br/>index 3e5ca8fb519f..3d34575a0e8f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/dsp_spos.c</a></div><div class='hunk'>@@ -1,18 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -20,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -32,7 +19,7 @@</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='del'>-#include &lt;sound/cs46xx.h&gt;</div><div class='add'>+#include "cs46xx.h"</div><div class='ctx'> </div><div class='ctx'> #include "cs46xx_lib.h"</div><div class='ctx'> #include "dsp_spos.h"</div><div class='hunk'>@@ -40,7 +27,7 @@</div><div class='ctx'> static int cs46xx_dsp_async_init (struct snd_cs46xx *chip,</div><div class='ctx'> 				  struct dsp_scb_descriptor * fg_entry);</div><div class='ctx'> </div><div class='del'>-static enum wide_opcode wide_opcodes[] = { </div><div class='add'>+static const enum wide_opcode wide_opcodes[] = {</div><div class='ctx'> 	WIDE_FOR_BEGIN_LOOP,</div><div class='ctx'> 	WIDE_FOR_BEGIN_LOOP2,</div><div class='ctx'> 	WIDE_COND_GOTO_ADDR,</div><div class='hunk'>@@ -85,12 +72,15 @@ static int shadow_and_reallocate_code (struct snd_cs46xx * chip, u32 * data, u32</div><div class='ctx'> 						address  = (hival &amp; 0x00FFF) &lt;&lt; 5;</div><div class='ctx'> 						address |=  loval &gt;&gt; 15;</div><div class='ctx'>             </div><div class='del'>-						snd_printdd("handle_wideop[1]: %05x:%05x addr %04x\n",hival,loval,address);</div><div class='add'>+						dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+							"handle_wideop[1]: %05x:%05x addr %04x\n",</div><div class='add'>+							hival, loval, address);</div><div class='ctx'>             </div><div class='ctx'> 						if ( !(address &amp; 0x8000) ) {</div><div class='ctx'> 							address += (ins-&gt;code.offset / 2) - overlay_begin_address;</div><div class='ctx'> 						} else {</div><div class='del'>-							snd_printdd("handle_wideop[1]: ROM symbol not reallocated\n");</div><div class='add'>+							dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+								"handle_wideop[1]: ROM symbol not reallocated\n");</div><div class='ctx'> 						}</div><div class='ctx'>             </div><div class='ctx'> 						hival &amp;= 0xFF000;</div><div class='hunk'>@@ -102,8 +92,10 @@ static int shadow_and_reallocate_code (struct snd_cs46xx * chip, u32 * data, u32</div><div class='ctx'> 						address  = (hival &amp; 0x00FFF) &lt;&lt; 5;</div><div class='ctx'> 						address |=  loval &gt;&gt; 15;</div><div class='ctx'>             </div><div class='del'>-						snd_printdd("handle_wideop:[2] %05x:%05x addr %04x\n",hival,loval,address);            </div><div class='del'>-						nreallocated ++;</div><div class='add'>+						dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+							"handle_wideop:[2] %05x:%05x addr %04x\n",</div><div class='add'>+							hival, loval, address);</div><div class='add'>+						nreallocated++;</div><div class='ctx'> 					} /* wide_opcodes[j] == wide_op */</div><div class='ctx'> 				} /* for */</div><div class='ctx'> 			} /* mod_type == 0 ... */</div><div class='hunk'>@@ -113,7 +105,8 @@ static int shadow_and_reallocate_code (struct snd_cs46xx * chip, u32 * data, u32</div><div class='ctx'> 		ins-&gt;code.data[ins-&gt;code.size++] = hival;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dsp_spos: %d instructions reallocated\n",nreallocated);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"dsp_spos: %d instructions reallocated\n", nreallocated);</div><div class='ctx'> 	return nreallocated;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +150,8 @@ static int add_symbols (struct snd_cs46xx * chip, struct dsp_module_desc * modul</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0;i &lt; module-&gt;symbol_table.nsymbols; ++i) {</div><div class='ctx'> 		if (ins-&gt;symbol_table.nsymbols == (DSP_MAX_SYMBOLS - 1)) {</div><div class='del'>-			snd_printk(KERN_ERR "dsp_spos: symbol table is full\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: symbol table is full\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -176,8 +170,11 @@ static int add_symbols (struct snd_cs46xx * chip, struct dsp_module_desc * modul</div><div class='ctx'> </div><div class='ctx'> 			ins-&gt;symbol_table.nsymbols++;</div><div class='ctx'> 		} else {</div><div class='del'>-          /* if (0) printk ("dsp_spos: symbol &lt;%s&gt; duplicated, probably nothing wrong with that (Cirrus?)\n",</div><div class='del'>-                             module-&gt;symbol_table.symbols[i].symbol_name); */</div><div class='add'>+#if 0</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: symbol &lt;%s&gt; duplicated, probably nothing wrong with that (Cirrus?)\n",</div><div class='add'>+				module-&gt;symbol_table.symbols[i].symbol_name); */</div><div class='add'>+#endif</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -192,20 +189,21 @@ add_symbol (struct snd_cs46xx * chip, char * symbol_name, u32 address, int type)</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;symbol_table.nsymbols == (DSP_MAX_SYMBOLS - 1)) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol table is full\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "dsp_spos: symbol table is full\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='ctx'> 	if (cs46xx_dsp_lookup_symbol(chip,</div><div class='ctx'> 				     symbol_name,</div><div class='ctx'> 				     type) != NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol &lt;%s&gt; duplicated\n", symbol_name);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol &lt;%s&gt; duplicated\n", symbol_name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index = find_free_symbol_index (ins);</div><div class='ctx'> </div><div class='del'>-	strcpy (ins-&gt;symbol_table.symbols[index].symbol_name, symbol_name);</div><div class='add'>+	strscpy (ins-&gt;symbol_table.symbols[index].symbol_name, symbol_name);</div><div class='ctx'> 	ins-&gt;symbol_table.symbols[index].address = address;</div><div class='ctx'> 	ins-&gt;symbol_table.symbols[index].symbol_type = type;</div><div class='ctx'> 	ins-&gt;symbol_table.symbols[index].module = NULL;</div><div class='hunk'>@@ -225,39 +223,28 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_spos_instance * ins = kzalloc(sizeof(struct dsp_spos_instance), GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	if (ins == NULL) </div><div class='add'>+	if (ins == NULL)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* better to use vmalloc for this big table */</div><div class='del'>-	ins-&gt;symbol_table.nsymbols = 0;</div><div class='del'>-	ins-&gt;symbol_table.symbols = vmalloc(sizeof(struct dsp_symbol_entry) *</div><div class='del'>-					    DSP_MAX_SYMBOLS);</div><div class='del'>-	ins-&gt;symbol_table.highest_frag_index = 0;</div><div class='del'>-</div><div class='del'>-	if (ins-&gt;symbol_table.symbols == NULL) {</div><div class='add'>+	ins-&gt;symbol_table.symbols =</div><div class='add'>+		vmalloc(array_size(DSP_MAX_SYMBOLS,</div><div class='add'>+				   sizeof(struct dsp_symbol_entry)));</div><div class='add'>+	ins-&gt;code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);</div><div class='add'>+	ins-&gt;modules = kmalloc_array(DSP_MAX_MODULES,</div><div class='add'>+				     sizeof(struct dsp_module_desc),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+	if (!ins-&gt;symbol_table.symbols || !ins-&gt;code.data || !ins-&gt;modules) {</div><div class='ctx'> 		cs46xx_dsp_spos_destroy(chip);</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='add'>+	ins-&gt;symbol_table.nsymbols = 0;</div><div class='add'>+	ins-&gt;symbol_table.highest_frag_index = 0;</div><div class='ctx'> 	ins-&gt;code.offset = 0;</div><div class='ctx'> 	ins-&gt;code.size = 0;</div><div class='del'>-	ins-&gt;code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (ins-&gt;code.data == NULL) {</div><div class='del'>-		cs46xx_dsp_spos_destroy(chip);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	ins-&gt;nscb = 0;</div><div class='ctx'> 	ins-&gt;ntask = 0;</div><div class='del'>-</div><div class='ctx'> 	ins-&gt;nmodules = 0;</div><div class='del'>-	ins-&gt;modules = kmalloc(sizeof(struct dsp_module_desc) * DSP_MAX_MODULES, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (ins-&gt;modules == NULL) {</div><div class='del'>-		cs46xx_dsp_spos_destroy(chip);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* default SPDIF input sample rate</div><div class='ctx'> 	   to 48000 khz */</div><div class='hunk'>@@ -271,8 +258,8 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)</div><div class='ctx'> </div><div class='ctx'> 	/* set left and right validity bits and</div><div class='ctx'> 	   default channel status */</div><div class='del'>-	ins-&gt;spdif_csuv_default = </div><div class='del'>-		ins-&gt;spdif_csuv_stream =  </div><div class='add'>+	ins-&gt;spdif_csuv_default =</div><div class='add'>+		ins-&gt;spdif_csuv_stream =</div><div class='ctx'> 	 /* byte 0 */  ((unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF        &amp; 0xff)) &lt;&lt; 24) |</div><div class='ctx'> 	 /* byte 1 */  ((unsigned int)_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF &gt;&gt; 8) &amp; 0xff)) &lt;&lt; 16) |</div><div class='ctx'> 	 /* byte 3 */   (unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF &gt;&gt; 24) &amp; 0xff) |</div><div class='hunk'>@@ -281,6 +268,9 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)</div><div class='ctx'> 	return ins;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='add'>+	kfree(ins-&gt;modules);</div><div class='add'>+	kfree(ins-&gt;code.data);</div><div class='add'>+	vfree(ins-&gt;symbol_table.symbols);</div><div class='ctx'> 	kfree(ins);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -293,12 +283,12 @@ void  cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; ins-&gt;nscb; ++i) {</div><div class='ctx'> 		if (ins-&gt;scbs[i].deleted) continue;</div><div class='ctx'> </div><div class='ctx'> 		cs46xx_dsp_proc_free_scb_desc ( (ins-&gt;scbs + i) );</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 		kfree(ins-&gt;scbs[i].data);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,7 +297,6 @@ void  cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip)</div><div class='ctx'> 	vfree(ins-&gt;symbol_table.symbols);</div><div class='ctx'> 	kfree(ins-&gt;modules);</div><div class='ctx'> 	kfree(ins);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsp_load_parameter(struct snd_cs46xx *chip,</div><div class='hunk'>@@ -316,19 +305,20 @@ static int dsp_load_parameter(struct snd_cs46xx *chip,</div><div class='ctx'> 	u32 doffset, dsize;</div><div class='ctx'> </div><div class='ctx'> 	if (!parameter) {</div><div class='del'>-		snd_printdd("dsp_spos: module got no parameter segment\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: module got no parameter segment\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	doffset = (parameter-&gt;offset * 4 + DSP_PARAMETER_BYTE_OFFSET);</div><div class='ctx'> 	dsize   = parameter-&gt;size * 4;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dsp_spos: "</div><div class='del'>-		    "downloading parameter data to chip (%08x-%08x)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"dsp_spos: downloading parameter data to chip (%08x-%08x)\n",</div><div class='ctx'> 		    doffset,doffset + dsize);</div><div class='ctx'> 	if (snd_cs46xx_download (chip, parameter-&gt;data, doffset, dsize)) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: "</div><div class='del'>-			   "failed to download parameter data to DSP\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: failed to download parameter data to DSP\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -340,18 +330,21 @@ static int dsp_load_sample(struct snd_cs46xx *chip,</div><div class='ctx'> 	u32 doffset, dsize;</div><div class='ctx'> </div><div class='ctx'> 	if (!sample) {</div><div class='del'>-		snd_printdd("dsp_spos: module got no sample segment\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: module got no sample segment\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	doffset = (sample-&gt;offset * 4  + DSP_SAMPLE_BYTE_OFFSET);</div><div class='ctx'> 	dsize   =  sample-&gt;size * 4;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dsp_spos: downloading sample data to chip (%08x-%08x)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"dsp_spos: downloading sample data to chip (%08x-%08x)\n",</div><div class='ctx'> 		    doffset,doffset + dsize);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_cs46xx_download (chip,sample-&gt;data,doffset,dsize)) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: failed to sample data to DSP\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: failed to sample data to DSP\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -365,14 +358,16 @@ int cs46xx_dsp_load_module (struct snd_cs46xx * chip, struct dsp_module_desc * m</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;nmodules == DSP_MAX_MODULES - 1) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: to many modules loaded into DSP\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: to many modules loaded into DSP\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dsp_spos: loading module %s into DSP\n", module-&gt;module_name);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"dsp_spos: loading module %s into DSP\n", module-&gt;module_name);</div><div class='ctx'>   </div><div class='ctx'> 	if (ins-&gt;nmodules == 0) {</div><div class='del'>-		snd_printdd("dsp_spos: clearing parameter area\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: clearing parameter area\n");</div><div class='ctx'> 		snd_cs46xx_clear_BA1(chip, DSP_PARAMETER_BYTE_OFFSET, DSP_PARAMETER_BYTE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='hunk'>@@ -382,7 +377,7 @@ int cs46xx_dsp_load_module (struct snd_cs46xx * chip, struct dsp_module_desc * m</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;nmodules == 0) {</div><div class='del'>-		snd_printdd("dsp_spos: clearing sample area\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: clearing sample area\n");</div><div class='ctx'> 		snd_cs46xx_clear_BA1(chip, DSP_SAMPLE_BYTE_OFFSET, DSP_SAMPLE_BYTE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -392,15 +387,17 @@ int cs46xx_dsp_load_module (struct snd_cs46xx * chip, struct dsp_module_desc * m</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;nmodules == 0) {</div><div class='del'>-		snd_printdd("dsp_spos: clearing code area\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: clearing code area\n");</div><div class='ctx'> 		snd_cs46xx_clear_BA1(chip, DSP_CODE_BYTE_OFFSET, DSP_CODE_BYTE_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (code == NULL) {</div><div class='del'>-		snd_printdd("dsp_spos: module got no code segment\n");</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: module got no code segment\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ins-&gt;code.offset + code-&gt;size &gt; DSP_CODE_BYTE_SIZE) {</div><div class='del'>-			snd_printk(KERN_ERR "dsp_spos: no space available in DSP\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: no space available in DSP\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -412,19 +409,22 @@ int cs46xx_dsp_load_module (struct snd_cs46xx * chip, struct dsp_module_desc * m</div><div class='ctx'> 		if (snd_BUG_ON(!module-&gt;symbol_table.symbols))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		if (add_symbols(chip,module)) {</div><div class='del'>-			snd_printk(KERN_ERR "dsp_spos: failed to load symbol table\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: failed to load symbol table\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'>     </div><div class='ctx'> 		doffset = (code-&gt;offset * 4 + ins-&gt;code.offset * 4 + DSP_CODE_BYTE_OFFSET);</div><div class='ctx'> 		dsize   = code-&gt;size * 4;</div><div class='del'>-		snd_printdd("dsp_spos: downloading code to chip (%08x-%08x)\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: downloading code to chip (%08x-%08x)\n",</div><div class='ctx'> 			    doffset,doffset + dsize);   </div><div class='ctx'> </div><div class='ctx'> 		module-&gt;nfixups = shadow_and_reallocate_code(chip,code-&gt;data,code-&gt;size,module-&gt;overlay_begin_address);</div><div class='ctx'> </div><div class='ctx'> 		if (snd_cs46xx_download (chip,(ins-&gt;code.data + ins-&gt;code.offset),doffset,dsize)) {</div><div class='del'>-			snd_printk(KERN_ERR "dsp_spos: failed to download code to DSP\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: failed to download code to DSP\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -458,7 +458,7 @@ cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name, int symb</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk ("dsp_spos: symbol &lt;%s&gt; type %02x not found\n",</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "dsp_spos: symbol &lt;%s&gt; type %02x not found\n",</div><div class='ctx'> 		symbol_name,symbol_type);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -466,7 +466,7 @@ cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name, int symb</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> static struct dsp_symbol_entry *</div><div class='ctx'> cs46xx_dsp_lookup_symbol_addr (struct snd_cs46xx * chip, u32 address, int symbol_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -524,7 +524,7 @@ static void cs46xx_dsp_proc_modules_read (struct snd_info_entry *entry,</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	int i,j;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	snd_iprintf(buffer, "MODULES:\n");</div><div class='ctx'> 	for ( i = 0; i &lt; ins-&gt;nmodules; ++i ) {</div><div class='ctx'> 		snd_iprintf(buffer, "\n%s:\n", ins-&gt;modules[i].module_name);</div><div class='hunk'>@@ -537,7 +537,6 @@ static void cs46xx_dsp_proc_modules_read (struct snd_info_entry *entry,</div><div class='ctx'> 				    desc-&gt;segment_type,desc-&gt;offset, desc-&gt;size);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cs46xx_dsp_proc_task_tree_read (struct snd_info_entry *entry,</div><div class='hunk'>@@ -548,7 +547,7 @@ static void cs46xx_dsp_proc_task_tree_read (struct snd_info_entry *entry,</div><div class='ctx'> 	int i, j, col;</div><div class='ctx'> 	void __iomem *dst = chip-&gt;region.idx[1].remap_addr + DSP_PARAMETER_BYTE_OFFSET;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	snd_iprintf(buffer, "TASK TREES:\n");</div><div class='ctx'> 	for ( i = 0; i &lt; ins-&gt;ntask; ++i) {</div><div class='ctx'> 		snd_iprintf(buffer,"\n%04x %s:\n",ins-&gt;tasks[i].address,ins-&gt;tasks[i].task_name);</div><div class='hunk'>@@ -565,7 +564,6 @@ static void cs46xx_dsp_proc_task_tree_read (struct snd_info_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer,"\n");  </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cs46xx_dsp_proc_scb_read (struct snd_info_entry *entry,</div><div class='hunk'>@@ -575,7 +573,7 @@ static void cs46xx_dsp_proc_scb_read (struct snd_info_entry *entry,</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	snd_iprintf(buffer, "SCB's:\n");</div><div class='ctx'> 	for ( i = 0; i &lt; ins-&gt;nscb; ++i) {</div><div class='ctx'> 		if (ins-&gt;scbs[i].deleted)</div><div class='hunk'>@@ -598,7 +596,6 @@ static void cs46xx_dsp_proc_scb_read (struct snd_info_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer,"\n");</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cs46xx_dsp_proc_parameter_dump_read (struct snd_info_entry *entry,</div><div class='hunk'>@@ -616,7 +613,8 @@ static void cs46xx_dsp_proc_parameter_dump_read (struct snd_info_entry *entry,</div><div class='ctx'> 			col = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if ( (symbol = cs46xx_dsp_lookup_symbol_addr (chip,i / sizeof(u32), SYMBOL_PARAMETER)) != NULL) {</div><div class='add'>+		symbol = cs46xx_dsp_lookup_symbol_addr(chip, i / sizeof(u32), SYMBOL_PARAMETER);</div><div class='add'>+		if (symbol) {</div><div class='ctx'> 			col = 0;</div><div class='ctx'> 			snd_iprintf (buffer,"\n%s:\n",symbol-&gt;symbol_name);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -785,101 +783,57 @@ int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip)</div><div class='ctx'> </div><div class='ctx'> 	ins-&gt;snd_card = card;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "dsp", card-&gt;proc_root)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;mode = S_IFDIR | S_IRUGO | S_IXUGO;</div><div class='del'>-      </div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	entry = snd_info_create_card_entry(card, "dsp", card-&gt;proc_root);</div><div class='add'>+	if (entry)</div><div class='add'>+		entry-&gt;mode = S_IFDIR | 0555;</div><div class='ctx'> 	ins-&gt;proc_dsp_dir = entry;</div><div class='ctx'> </div><div class='ctx'> 	if (!ins-&gt;proc_dsp_dir)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "spos_symbols", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_symbol_table_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_sym_info_entry = entry;</div><div class='add'>+	entry = snd_info_create_card_entry(card, "spos_symbols",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_symbol_table_read);</div><div class='ctx'>     </div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "spos_modules", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_modules_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_modules_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "parameter", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_parameter_dump_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_parameter_dump_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "sample", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_sample_dump_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_sample_dump_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "task_tree", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_task_tree_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_task_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	if ((entry = snd_info_create_card_entry(card, "scb_info", ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = chip;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.read = cs46xx_dsp_proc_scb_read;</div><div class='del'>-		if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-			snd_info_free_entry(entry);</div><div class='del'>-			entry = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ins-&gt;proc_scb_info_entry = entry;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	entry = snd_info_create_card_entry(card, "spos_modules",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_modules_read);</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(card, "parameter",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_parameter_dump_read);</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(card, "sample",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_sample_dump_read);</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(card, "task_tree",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_task_tree_read);</div><div class='add'>+</div><div class='add'>+	entry = snd_info_create_card_entry(card, "scb_info",</div><div class='add'>+					   ins-&gt;proc_dsp_dir);</div><div class='add'>+	if (entry)</div><div class='add'>+		snd_info_set_text_ops(entry, chip,</div><div class='add'>+				      cs46xx_dsp_proc_scb_read);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	/* register/update SCB's entries on proc */</div><div class='ctx'> 	for (i = 0; i &lt; ins-&gt;nscb; ++i) {</div><div class='ctx'> 		if (ins-&gt;scbs[i].deleted) continue;</div><div class='ctx'> </div><div class='ctx'> 		cs46xx_dsp_proc_register_scb_desc (chip, (ins-&gt;scbs + i));</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -889,39 +843,24 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_sym_info_entry);</div><div class='del'>-	ins-&gt;proc_sym_info_entry = NULL;</div><div class='del'>-</div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_modules_info_entry);</div><div class='del'>-	ins-&gt;proc_modules_info_entry = NULL;</div><div class='del'>-</div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_parameter_dump_info_entry);</div><div class='del'>-	ins-&gt;proc_parameter_dump_info_entry = NULL;</div><div class='del'>-</div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_sample_dump_info_entry);</div><div class='del'>-	ins-&gt;proc_sample_dump_info_entry = NULL;</div><div class='del'>-</div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_scb_info_entry);</div><div class='del'>-	ins-&gt;proc_scb_info_entry = NULL;</div><div class='del'>-</div><div class='del'>-	snd_info_free_entry(ins-&gt;proc_task_info_entry);</div><div class='del'>-	ins-&gt;proc_task_info_entry = NULL;</div><div class='add'>+	if (!ins)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-	for (i = 0; i &lt; ins-&gt;nscb; ++i) {</div><div class='del'>-		if (ins-&gt;scbs[i].deleted) continue;</div><div class='del'>-		cs46xx_dsp_proc_free_scb_desc ( (ins-&gt;scbs + i) );</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		for (i = 0; i &lt; ins-&gt;nscb; ++i) {</div><div class='add'>+			if (ins-&gt;scbs[i].deleted)</div><div class='add'>+				continue;</div><div class='add'>+			cs46xx_dsp_proc_free_scb_desc((ins-&gt;scbs + i));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	snd_info_free_entry(ins-&gt;proc_dsp_dir);</div><div class='ctx'> 	ins-&gt;proc_dsp_dir = NULL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='del'>-static int debug_tree;</div><div class='ctx'> static void _dsp_create_task_tree (struct snd_cs46xx *chip, u32 * task_data,</div><div class='ctx'> 				   u32  dest, int size)</div><div class='ctx'> {</div><div class='hunk'>@@ -930,13 +869,13 @@ static void _dsp_create_task_tree (struct snd_cs46xx *chip, u32 * task_data,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; size; ++i) {</div><div class='del'>-		if (debug_tree) printk ("addr %p, val %08x\n",spdst,task_data[i]);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "addr %p, val %08x\n",</div><div class='add'>+			spdst, task_data[i]);</div><div class='ctx'> 		writel(task_data[i],spdst);</div><div class='ctx'> 		spdst += sizeof(u32);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int debug_scb;</div><div class='ctx'> static void _dsp_create_scb (struct snd_cs46xx *chip, u32 * scb_data, u32 dest)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *spdst = chip-&gt;region.idx[1].remap_addr + </div><div class='hunk'>@@ -944,7 +883,8 @@ static void _dsp_create_scb (struct snd_cs46xx *chip, u32 * scb_data, u32 dest)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 0x10; ++i) {</div><div class='del'>-		if (debug_scb) printk ("addr %p, val %08x\n",spdst,scb_data[i]);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "addr %p, val %08x\n",</div><div class='add'>+			spdst, scb_data[i]);</div><div class='ctx'> 		writel(scb_data[i],spdst);</div><div class='ctx'> 		spdst += sizeof(u32);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -971,14 +911,15 @@ static struct dsp_scb_descriptor * _map_scb (struct snd_cs46xx *chip, char * nam</div><div class='ctx'> 	int index;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;nscb == DSP_MAX_SCB_DESC - 1) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: got no place for other SCB\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: got no place for other SCB\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	index = find_free_scb_index (ins);</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ins-&gt;scbs[index], 0, sizeof(ins-&gt;scbs[index]));</div><div class='del'>-	strcpy(ins-&gt;scbs[index].scb_name, name);</div><div class='add'>+	strscpy(ins-&gt;scbs[index].scb_name, name);</div><div class='ctx'> 	ins-&gt;scbs[index].address = dest;</div><div class='ctx'> 	ins-&gt;scbs[index].index = index;</div><div class='ctx'> 	ins-&gt;scbs[index].ref_count = 1;</div><div class='hunk'>@@ -1002,14 +943,15 @@ _map_task_tree (struct snd_cs46xx *chip, char * name, u32 dest, u32 size)</div><div class='ctx'> 	struct dsp_task_descriptor * desc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;ntask == DSP_MAX_TASK_DESC - 1) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: got no place for other TASK\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: got no place for other TASK\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (name)</div><div class='del'>-		strcpy(ins-&gt;tasks[ins-&gt;ntask].task_name, name);</div><div class='add'>+		strscpy(ins-&gt;tasks[ins-&gt;ntask].task_name, name);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(ins-&gt;tasks[ins-&gt;ntask].task_name, "(NULL)");</div><div class='add'>+		strscpy(ins-&gt;tasks[ins-&gt;ntask].task_name, "(NULL)");</div><div class='ctx'> 	ins-&gt;tasks[ins-&gt;ntask].address = dest;</div><div class='ctx'> 	ins-&gt;tasks[ins-&gt;ntask].size = size;</div><div class='ctx'> </div><div class='hunk'>@@ -1030,7 +972,7 @@ cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_scb_descriptor * desc;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	/* copy the data for resume */</div><div class='ctx'> 	scb_data = kmemdup(scb_data, SCB_BYTES, GFP_KERNEL);</div><div class='ctx'> 	if (!scb_data)</div><div class='hunk'>@@ -1042,8 +984,8 @@ cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32</div><div class='ctx'> 		desc-&gt;data = scb_data;</div><div class='ctx'> 		_dsp_create_scb(chip,scb_data,dest);</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: failed to map SCB\n");</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "dsp_spos: failed to map SCB\n");</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 		kfree(scb_data);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1063,7 +1005,7 @@ cs46xx_dsp_create_task_tree (struct snd_cs46xx *chip, char * name, u32 * task_da</div><div class='ctx'> 		desc-&gt;data = task_data;</div><div class='ctx'> 		_dsp_create_task_tree(chip,task_data,dest,size);</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: failed to map TASK\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "dsp_spos: failed to map TASK\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return desc;</div><div class='hunk'>@@ -1093,7 +1035,7 @@ int cs46xx_dsp_scb_and_task_init (struct snd_cs46xx *chip)</div><div class='ctx'> 	</div><div class='ctx'> 	int fifo_addr, fifo_span, valid_slots;</div><div class='ctx'> </div><div class='del'>-	static struct dsp_spos_control_block sposcb = {</div><div class='add'>+	static const struct dsp_spos_control_block sposcb = {</div><div class='ctx'> 		/* 0 */ HFG_TREE_SCB,HFG_STACK,</div><div class='ctx'> 		/* 1 */ SPOSCB_ADDR,BG_TREE_SCB_ADDR,</div><div class='ctx'> 		/* 2 */ DSP_SPOS_DC,0,</div><div class='hunk'>@@ -1116,31 +1058,36 @@ int cs46xx_dsp_scb_and_task_init (struct snd_cs46xx *chip)</div><div class='ctx'> </div><div class='ctx'> 	null_algorithm  = cs46xx_dsp_lookup_symbol(chip, "NULLALGORITHM", SYMBOL_CODE);</div><div class='ctx'> 	if (null_algorithm == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol NULLALGORITHM not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol NULLALGORITHM not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fg_task_tree_header_code = cs46xx_dsp_lookup_symbol(chip, "FGTASKTREEHEADERCODE", SYMBOL_CODE);  </div><div class='ctx'> 	if (fg_task_tree_header_code == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol FGTASKTREEHEADERCODE not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol FGTASKTREEHEADERCODE not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	task_tree_header_code = cs46xx_dsp_lookup_symbol(chip, "TASKTREEHEADERCODE", SYMBOL_CODE);  </div><div class='ctx'> 	if (task_tree_header_code == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol TASKTREEHEADERCODE not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol TASKTREEHEADERCODE not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='ctx'> 	task_tree_thread = cs46xx_dsp_lookup_symbol(chip, "TASKTREETHREAD", SYMBOL_CODE);</div><div class='ctx'> 	if (task_tree_thread == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol TASKTREETHREAD not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol TASKTREETHREAD not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	magic_snoop_task = cs46xx_dsp_lookup_symbol(chip, "MAGICSNOOPTASK", SYMBOL_CODE);</div><div class='ctx'> 	if (magic_snoop_task == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol MAGICSNOOPTASK not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol MAGICSNOOPTASK not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='hunk'>@@ -1424,7 +1371,7 @@ int cs46xx_dsp_scb_and_task_init (struct snd_cs46xx *chip)</div><div class='ctx'> 	</div><div class='ctx'> 	if (chip-&gt;nr_ac97_codecs == 2) {</div><div class='ctx'> 		/* create CODEC tasklet for rear Center/LFE output </div><div class='del'>-		   slot 6 and 9 on seconadry CODEC */</div><div class='add'>+		   slot 6 and 9 on secondary CODEC */</div><div class='ctx'> 		clfe_codec_out_scb = cs46xx_dsp_create_codec_out_scb(chip,"CodecOutSCB_CLFE",0x0030,0x0030,</div><div class='ctx'> 								     CLFE_MIXER_SCB_ADDR,</div><div class='ctx'> 								     CLFE_CODEC_SCB_ADDR,</div><div class='hunk'>@@ -1487,7 +1434,7 @@ int cs46xx_dsp_scb_and_task_init (struct snd_cs46xx *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  _fail_end:</div><div class='del'>-	snd_printk(KERN_ERR "dsp_spos: failed to setup SCB's in DSP\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "dsp_spos: failed to setup SCB's in DSP\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1502,18 +1449,21 @@ static int cs46xx_dsp_async_init (struct snd_cs46xx *chip,</div><div class='ctx'> </div><div class='ctx'> 	s16_async_codec_input_task = cs46xx_dsp_lookup_symbol(chip, "S16_ASYNCCODECINPUTTASK", SYMBOL_CODE);</div><div class='ctx'> 	if (s16_async_codec_input_task == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol S16_ASYNCCODECINPUTTASK not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol S16_ASYNCCODECINPUTTASK not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	spdifo_task = cs46xx_dsp_lookup_symbol(chip, "SPDIFOTASK", SYMBOL_CODE);</div><div class='ctx'> 	if (spdifo_task == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol SPDIFOTASK not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol SPDIFOTASK not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spdifi_task = cs46xx_dsp_lookup_symbol(chip, "SPDIFITASK", SYMBOL_CODE);</div><div class='ctx'> 	if (spdifi_task == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: symbol SPDIFITASK not found\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol SPDIFITASK not found\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1723,7 +1673,7 @@ int cs46xx_dsp_enable_spdif_in (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;spdif_in_src))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if ( ! (ins-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_INPUT_CTRL_ENABLED) ) {</div><div class='ctx'> 		/* time countdown enable */</div><div class='hunk'>@@ -1746,7 +1696,7 @@ int cs46xx_dsp_enable_spdif_in (struct snd_cs46xx *chip)</div><div class='ctx'> 								ins-&gt;spdif_in_src,</div><div class='ctx'> 								SCB_ON_PARENT_SUBLIST_SCB);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* reset SPDIF input sample buffer pointer */</div><div class='ctx'> 	/*snd_cs46xx_poke (chip, (SPDIFI_SCB_INST + 0x0c) &lt;&lt; 2,</div><div class='hunk'>@@ -1759,15 +1709,12 @@ int cs46xx_dsp_enable_spdif_in (struct snd_cs46xx *chip)</div><div class='ctx'> 	/* unmute SRC volume */</div><div class='ctx'> 	cs46xx_dsp_scb_set_volume (chip,ins-&gt;spdif_in_src,0x7fff,0x7fff);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='ctx'> 	/* set SPDIF input sample rate and unmute</div><div class='ctx'> 	   NOTE: only 48khz support for SPDIF input this time */</div><div class='ctx'> 	/* cs46xx_dsp_set_src_sample_rate(chip,ins-&gt;spdif_in_src,48000); */</div><div class='ctx'> </div><div class='ctx'> 	/* monitor state */</div><div class='ctx'> 	ins-&gt;spdif_status_in = 1;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1781,17 +1728,16 @@ int cs46xx_dsp_disable_spdif_in (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;spdif_in_src))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;spos_mutex) {</div><div class='add'>+		/* Remove the asynchronous receiver SCB */</div><div class='add'>+		cs46xx_dsp_remove_scb(chip, ins-&gt;asynch_rx_scb);</div><div class='add'>+		ins-&gt;asynch_rx_scb = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Remove the asynchronous receiver SCB */</div><div class='del'>-	cs46xx_dsp_remove_scb (chip,ins-&gt;asynch_rx_scb);</div><div class='del'>-	ins-&gt;asynch_rx_scb = NULL;</div><div class='add'>+		cs46xx_src_unlink(chip, ins-&gt;spdif_in_src);</div><div class='ctx'> </div><div class='del'>-	cs46xx_src_unlink(chip,ins-&gt;spdif_in_src);</div><div class='del'>-</div><div class='del'>-	/* monitor state */</div><div class='del'>-	ins-&gt;spdif_status_in = 0;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+		/* monitor state */</div><div class='add'>+		ins-&gt;spdif_status_in = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* restore amplifier */</div><div class='ctx'> 	chip-&gt;active_ctrl(chip, -1);</div><div class='hunk'>@@ -1809,10 +1755,9 @@ int cs46xx_dsp_enable_pcm_capture (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;ref_snoop_scb))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	ins-&gt;pcm_input = cs46xx_add_record_source(chip,ins-&gt;ref_snoop_scb,PCMSERIALIN_PCM_SCB_ADDR,</div><div class='ctx'>                                                   "PCMSerialInput_Wave");</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1824,10 +1769,9 @@ int cs46xx_dsp_disable_pcm_capture (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;pcm_input))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	cs46xx_dsp_remove_scb (chip,ins-&gt;pcm_input);</div><div class='ctx'> 	ins-&gt;pcm_input = NULL;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1841,10 +1785,9 @@ int cs46xx_dsp_enable_adc_capture (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;codec_in_scb))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	ins-&gt;adc_input = cs46xx_add_record_source(chip,ins-&gt;codec_in_scb,PCMSERIALIN_SCB_ADDR,</div><div class='ctx'> 						  "PCMSerialInput_ADC");</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1856,10 +1799,9 @@ int cs46xx_dsp_disable_adc_capture (struct snd_cs46xx *chip)</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;adc_input))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	cs46xx_dsp_remove_scb (chip,ins-&gt;adc_input);</div><div class='ctx'> 	ins-&gt;adc_input = NULL;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1894,7 +1836,8 @@ int cs46xx_poke_via_dsp (struct snd_cs46xx *chip, u32 address, u32 data)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == 25) {</div><div class='del'>-		snd_printk(KERN_ERR "dsp_spos: SPIOWriteTask not responding\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: SPIOWriteTask not responding\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1906,7 +1849,7 @@ int cs46xx_dsp_set_dac_volume (struct snd_cs46xx * chip, u16 left, u16 right)</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	struct dsp_scb_descriptor * scb; </div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	</div><div class='ctx'> 	/* main output */</div><div class='ctx'> 	scb = ins-&gt;master_mix_scb-&gt;sub_list_ptr;</div><div class='hunk'>@@ -1925,8 +1868,6 @@ int cs46xx_dsp_set_dac_volume (struct snd_cs46xx * chip, u16 left, u16 right)</div><div class='ctx'> 	ins-&gt;dac_volume_left = left;</div><div class='ctx'> 	ins-&gt;dac_volume_right = right;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1934,7 +1875,7 @@ int cs46xx_dsp_set_iec958_volume (struct snd_cs46xx * chip, u16 left, u16 right)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (ins-&gt;asynch_rx_scb != NULL)</div><div class='ctx'> 		cs46xx_dsp_scb_set_volume (chip,ins-&gt;asynch_rx_scb,</div><div class='hunk'>@@ -1943,12 +1884,10 @@ int cs46xx_dsp_set_iec958_volume (struct snd_cs46xx * chip, u16 left, u16 right)</div><div class='ctx'> 	ins-&gt;spdif_input_volume_left = left;</div><div class='ctx'> 	ins-&gt;spdif_input_volume_right = right;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> int cs46xx_dsp_resume(struct snd_cs46xx * chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='head'>diff --git a/sound/pci/cs46xx/dsp_spos.h b/sound/pci/cs46xx/dsp_spos.h<br/>index ca47a8114c7f..a4853c748efe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/dsp_spos.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c<br/>index 00b148a10239..32ed415bf427 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos_scb_lib.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/dsp_spos_scb_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/dsp_spos_scb_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs46xx/dsp_spos_scb_lib.c</a></div><div class='hunk'>@@ -1,19 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -21,7 +7,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -31,7 +17,7 @@</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/cs46xx.h&gt;</div><div class='add'>+#include "cs46xx.h"</div><div class='ctx'> </div><div class='ctx'> #include "cs46xx_lib.h"</div><div class='ctx'> #include "dsp_spos.h"</div><div class='hunk'>@@ -67,20 +53,17 @@ static void remove_symbol (struct snd_cs46xx * chip, struct dsp_symbol_entry * s</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,</div><div class='ctx'> 					   struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct proc_scb_info * scb_info  = entry-&gt;private_data;</div><div class='ctx'> 	struct dsp_scb_descriptor * scb = scb_info-&gt;scb_desc;</div><div class='del'>-	struct dsp_spos_instance * ins;</div><div class='ctx'> 	struct snd_cs46xx *chip = scb_info-&gt;chip;</div><div class='ctx'> 	int j,col;</div><div class='ctx'> 	void __iomem *dst = chip-&gt;region.idx[1].remap_addr + DSP_PARAMETER_BYTE_OFFSET;</div><div class='ctx'> </div><div class='del'>-	ins = chip-&gt;dsp_spos_instance;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;spos_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> 	snd_iprintf(buffer,"%04x %s:\n",scb-&gt;address,scb-&gt;scb_name);</div><div class='ctx'> </div><div class='ctx'> 	for (col = 0,j = 0;j &lt; 0x10; j++,col++) {</div><div class='hunk'>@@ -108,7 +91,6 @@ static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,</div><div class='ctx'> 		    scb-&gt;task_entry-&gt;address);</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer,"index [%d] ref_count [%d]\n",scb-&gt;index,scb-&gt;ref_count);  </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;spos_mutex);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +159,6 @@ static void _dsp_clear_sample_buffer (struct snd_cs46xx *chip, u32 sample_buffer</div><div class='ctx'> void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor * scb)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* check integrety */</div><div class='ctx'> 	if (snd_BUG_ON(scb-&gt;index &lt; 0 ||</div><div class='hunk'>@@ -193,9 +174,9 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *</div><div class='ctx'> 		goto _end;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);    </div><div class='del'>-	_dsp_unlink_scb (chip,scb);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		_dsp_unlink_scb(chip, scb);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cs46xx_dsp_proc_free_scb_desc(scb);</div><div class='ctx'> 	if (snd_BUG_ON(!scb-&gt;scb_symbol))</div><div class='hunk'>@@ -203,7 +184,7 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *</div><div class='ctx'> 	remove_symbol (chip,scb-&gt;scb_symbol);</div><div class='ctx'> </div><div class='ctx'> 	ins-&gt;scbs[scb-&gt;index].deleted = 1;</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	kfree(ins-&gt;scbs[scb-&gt;index].data);</div><div class='ctx'> 	ins-&gt;scbs[scb-&gt;index].data = NULL;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -218,23 +199,19 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *</div><div class='ctx'> 	if (ins-&gt;scb_highest_frag_index &gt; ins-&gt;nscb) {</div><div class='ctx'> 		ins-&gt;scb_highest_frag_index = ins-&gt;nscb;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* !!!! THIS IS A PIECE OF SHIT MADE BY ME !!! */</div><div class='del'>-	for(i = scb-&gt;index + 1;i &lt; ins-&gt;nscb; ++i) {</div><div class='del'>-		ins-&gt;scbs[i - 1].index = i - 1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb)</div><div class='ctx'> {</div><div class='ctx'> 	if (scb-&gt;proc_info) {</div><div class='ctx'> 		struct proc_scb_info * scb_info = scb-&gt;proc_info-&gt;private_data;</div><div class='add'>+		struct snd_cs46xx *chip = scb_info-&gt;chip;</div><div class='ctx'> </div><div class='del'>-		snd_printdd("cs46xx_dsp_proc_free_scb_desc: freeing %s\n",scb-&gt;scb_name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cs46xx_dsp_proc_free_scb_desc: freeing %s\n",</div><div class='add'>+			scb-&gt;scb_name);</div><div class='ctx'> </div><div class='ctx'> 		snd_info_free_entry(scb-&gt;proc_info);</div><div class='ctx'> 		scb-&gt;proc_info = NULL;</div><div class='hunk'>@@ -254,8 +231,9 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,</div><div class='ctx'> 	if (ins-&gt;snd_card != NULL &amp;&amp; ins-&gt;proc_dsp_dir != NULL &amp;&amp;</div><div class='ctx'> 	    scb-&gt;proc_info == NULL) {</div><div class='ctx'>   </div><div class='del'>-		if ((entry = snd_info_create_card_entry(ins-&gt;snd_card, scb-&gt;scb_name, </div><div class='del'>-							ins-&gt;proc_dsp_dir)) != NULL) {</div><div class='add'>+		entry = snd_info_create_card_entry(ins-&gt;snd_card, scb-&gt;scb_name,</div><div class='add'>+						   ins-&gt;proc_dsp_dir);</div><div class='add'>+		if (entry) {</div><div class='ctx'> 			scb_info = kmalloc(sizeof(struct proc_scb_info), GFP_KERNEL);</div><div class='ctx'> 			if (!scb_info) {</div><div class='ctx'> 				snd_info_free_entry(entry);</div><div class='hunk'>@@ -265,24 +243,14 @@ void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,</div><div class='ctx'> </div><div class='ctx'> 			scb_info-&gt;chip = chip;</div><div class='ctx'> 			scb_info-&gt;scb_desc = scb;</div><div class='del'>-      </div><div class='del'>-			entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-			entry-&gt;private_data = scb_info;</div><div class='del'>-			entry-&gt;mode = S_IFREG | S_IRUGO | S_IWUSR;</div><div class='del'>-      </div><div class='del'>-			entry-&gt;c.text.read = cs46xx_dsp_proc_scb_info_read;</div><div class='del'>-      </div><div class='del'>-			if (snd_info_register(entry) &lt; 0) {</div><div class='del'>-				snd_info_free_entry(entry);</div><div class='del'>-				kfree (scb_info);</div><div class='del'>-				entry = NULL;</div><div class='del'>-			}</div><div class='add'>+			snd_info_set_text_ops(entry, scb_info,</div><div class='add'>+					      cs46xx_dsp_proc_scb_info_read);</div><div class='ctx'> 		}</div><div class='ctx'> out:</div><div class='ctx'> 		scb-&gt;proc_info = entry;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='add'>+#endif /* CONFIG_SND_PROC_FS */</div><div class='ctx'> </div><div class='ctx'> static struct dsp_scb_descriptor * </div><div class='ctx'> _dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32 dest,</div><div class='hunk'>@@ -293,8 +261,6 @@ _dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	struct dsp_scb_descriptor * scb;</div><div class='ctx'>   </div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!ins-&gt;the_null_scb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -305,7 +271,7 @@ _dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u</div><div class='ctx'> 	scb_data[SCBfuncEntryPtr] &amp;= 0xFFFF0000;</div><div class='ctx'> 	scb_data[SCBfuncEntryPtr] |= task_entry-&gt;address;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("dsp_spos: creating SCB &lt;%s&gt;\n",name);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: creating SCB &lt;%s&gt;\n", name);</div><div class='ctx'> </div><div class='ctx'> 	scb = cs46xx_dsp_create_scb(chip,name,scb_data,dest);</div><div class='ctx'> </div><div class='hunk'>@@ -320,9 +286,15 @@ _dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u</div><div class='ctx'> 	/* update parent SCB */</div><div class='ctx'> 	if (scb-&gt;parent_scb_ptr) {</div><div class='ctx'> #if 0</div><div class='del'>-		printk ("scb-&gt;parent_scb_ptr = %s\n",scb-&gt;parent_scb_ptr-&gt;scb_name);</div><div class='del'>-		printk ("scb-&gt;parent_scb_ptr-&gt;next_scb_ptr = %s\n",scb-&gt;parent_scb_ptr-&gt;next_scb_ptr-&gt;scb_name);</div><div class='del'>-		printk ("scb-&gt;parent_scb_ptr-&gt;sub_list_ptr = %s\n",scb-&gt;parent_scb_ptr-&gt;sub_list_ptr-&gt;scb_name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"scb-&gt;parent_scb_ptr = %s\n",</div><div class='add'>+			scb-&gt;parent_scb_ptr-&gt;scb_name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"scb-&gt;parent_scb_ptr-&gt;next_scb_ptr = %s\n",</div><div class='add'>+			scb-&gt;parent_scb_ptr-&gt;next_scb_ptr-&gt;scb_name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"scb-&gt;parent_scb_ptr-&gt;sub_list_ptr = %s\n",</div><div class='add'>+			scb-&gt;parent_scb_ptr-&gt;sub_list_ptr-&gt;scb_name);</div><div class='ctx'> #endif</div><div class='ctx'> 		/* link to  parent SCB */</div><div class='ctx'> 		if (scb_child_type == SCB_ON_PARENT_NEXT_SCB) {</div><div class='hunk'>@@ -342,12 +314,10 @@ _dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u</div><div class='ctx'> 			snd_BUG();</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-		/* update entry in DSP RAM */</div><div class='del'>-		cs46xx_dsp_spos_update_scb(chip,scb-&gt;parent_scb_ptr);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			/* update entry in DSP RAM */</div><div class='add'>+			cs46xx_dsp_spos_update_scb(chip, scb-&gt;parent_scb_ptr);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -368,7 +338,8 @@ cs46xx_dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_d</div><div class='ctx'> 					       SYMBOL_CODE);</div><div class='ctx'>   </div><div class='ctx'> 	if (task_entry == NULL) {</div><div class='del'>-		snd_printk (KERN_ERR "dsp_spos: symbol %s not found\n",task_entry_name);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: symbol %s not found\n", task_entry_name);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='hunk'>@@ -582,7 +553,8 @@ cs46xx_dsp_create_pcm_reader_scb(struct snd_cs46xx * chip, char * scb_name,</div><div class='ctx'> 								 SYMBOL_CODE);</div><div class='ctx'>     </div><div class='ctx'> 		if (ins-&gt;null_algorithm == NULL) {</div><div class='del'>-			snd_printk (KERN_ERR "dsp_spos: symbol NULLALGORITHM not found\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: symbol NULLALGORITHM not found\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}    </div><div class='ctx'> 	}</div><div class='hunk'>@@ -612,7 +584,8 @@ cs46xx_dsp_create_src_task_scb(struct snd_cs46xx * chip, char * scb_name,</div><div class='ctx'> 	unsigned int phiIncr;</div><div class='ctx'> 	unsigned int correctionPerGOF, correctionPerSec;</div><div class='ctx'> </div><div class='del'>-	snd_printdd( "dsp_spos: setting %s rate to %u\n",scb_name,rate);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: setting %s rate to %u\n",</div><div class='add'>+		scb_name, rate);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Compute the values used to drive the actual sample rate conversion.</div><div class='hunk'>@@ -670,7 +643,8 @@ cs46xx_dsp_create_src_task_scb(struct snd_cs46xx * chip, char * scb_name,</div><div class='ctx'> 								 SYMBOL_CODE);</div><div class='ctx'> 			</div><div class='ctx'> 			if (ins-&gt;s16_up == NULL) {</div><div class='del'>-				snd_printk (KERN_ERR "dsp_spos: symbol S16_UPSRC not found\n");</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"dsp_spos: symbol S16_UPSRC not found\n");</div><div class='ctx'> 				return NULL;</div><div class='ctx'> 			}    </div><div class='ctx'> 		}</div><div class='hunk'>@@ -1158,7 +1132,7 @@ find_next_free_scb (struct snd_cs46xx * chip, struct dsp_scb_descriptor * from)</div><div class='ctx'> 	return scb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 pcm_reader_buffer_addr[DSP_MAX_PCM_CHANNELS] = {</div><div class='add'>+static const u32 pcm_reader_buffer_addr[DSP_MAX_PCM_CHANNELS] = {</div><div class='ctx'> 	0x0600, /* 1 */</div><div class='ctx'> 	0x1500, /* 2 */</div><div class='ctx'> 	0x1580, /* 3 */</div><div class='hunk'>@@ -1193,7 +1167,7 @@ static u32 pcm_reader_buffer_addr[DSP_MAX_PCM_CHANNELS] = {</div><div class='ctx'> 	0x2400, /* 32 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 src_output_buffer_addr[DSP_MAX_SRC_NR] = {</div><div class='add'>+static const u32 src_output_buffer_addr[DSP_MAX_SRC_NR] = {</div><div class='ctx'> 	0x2B80,</div><div class='ctx'> 	0x2BA0,</div><div class='ctx'> 	0x2BC0,</div><div class='hunk'>@@ -1210,7 +1184,7 @@ static u32 src_output_buffer_addr[DSP_MAX_SRC_NR] = {</div><div class='ctx'> 	0x2E20</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 src_delay_buffer_addr[DSP_MAX_SRC_NR] = {</div><div class='add'>+static const u32 src_delay_buffer_addr[DSP_MAX_SRC_NR] = {</div><div class='ctx'> 	0x2480,</div><div class='ctx'> 	0x2500,</div><div class='ctx'> 	0x2580,</div><div class='hunk'>@@ -1240,7 +1214,6 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 	/* struct dsp_scb_descriptor * pcm_parent_scb; */</div><div class='ctx'> 	char scb_name[DSP_MAX_SCB_NAME];</div><div class='ctx'> 	int i, pcm_index = -1, insert_point, src_index = -1, pass_through = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	switch (pcm_channel_id) {</div><div class='ctx'> 	case DSP_PCM_MAIN_CHANNEL:</div><div class='hunk'>@@ -1265,7 +1238,7 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 		   the Sample Rate Converted (which could</div><div class='ctx'> 		   alter the raw data stream ...) */</div><div class='ctx'> 		if (sample_rate == 48000) {</div><div class='del'>-			snd_printdd ("IEC958 pass through\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "IEC958 pass through\n");</div><div class='ctx'> 			/* Hack to bypass creating a new SRC */</div><div class='ctx'> 			pass_through = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1299,13 +1272,14 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pcm_index == -1) {</div><div class='del'>-		snd_printk (KERN_ERR "dsp_spos: no free PCM channel\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "dsp_spos: no free PCM channel\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (src_scb == NULL) {</div><div class='ctx'> 		if (ins-&gt;nsrc_scb &gt;= DSP_MAX_SRC_NR) {</div><div class='del'>-			snd_printk(KERN_ERR "dsp_spos: to many SRC instances\n!");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: too many SRC instances\n!");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1331,7 +1305,8 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> </div><div class='ctx'> 		snprintf (scb_name,DSP_MAX_SCB_NAME,"SrcTask_SCB%d",src_index);</div><div class='ctx'> 		</div><div class='del'>-		snd_printdd( "dsp_spos: creating SRC \"%s\"\n",scb_name);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: creating SRC \"%s\"\n", scb_name);</div><div class='ctx'> 		src_scb = cs46xx_dsp_create_src_task_scb(chip,scb_name,</div><div class='ctx'> 							 sample_rate,</div><div class='ctx'> 							 src_output_buffer_addr[src_index],</div><div class='hunk'>@@ -1343,7 +1318,8 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 							 pass_through);</div><div class='ctx'> </div><div class='ctx'> 		if (!src_scb) {</div><div class='del'>-			snd_printk (KERN_ERR "dsp_spos: failed to create SRCtaskSCB\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"dsp_spos: failed to create SRCtaskSCB\n");</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1355,8 +1331,8 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'>   </div><div class='ctx'> 	snprintf (scb_name,DSP_MAX_SCB_NAME,"PCMReader_SCB%d",pcm_index);</div><div class='ctx'> </div><div class='del'>-	snd_printdd( "dsp_spos: creating PCM \"%s\" (%d)\n",scb_name,</div><div class='del'>-                 pcm_channel_id);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "dsp_spos: creating PCM \"%s\" (%d)\n",</div><div class='add'>+		scb_name, pcm_channel_id);</div><div class='ctx'> </div><div class='ctx'> 	pcm_scb = cs46xx_dsp_create_pcm_reader_scb(chip,scb_name,</div><div class='ctx'> 						   pcm_reader_buffer_addr[pcm_index],</div><div class='hunk'>@@ -1369,11 +1345,12 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'>                            );</div><div class='ctx'> </div><div class='ctx'> 	if (!pcm_scb) {</div><div class='del'>-		snd_printk (KERN_ERR "dsp_spos: failed to create PCMreaderSCB\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"dsp_spos: failed to create PCMreaderSCB\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	ins-&gt;pcm_channels[pcm_index].sample_rate = sample_rate;</div><div class='ctx'> 	ins-&gt;pcm_channels[pcm_index].pcm_reader_scb = pcm_scb;</div><div class='ctx'> 	ins-&gt;pcm_channels[pcm_index].src_scb = src_scb;</div><div class='hunk'>@@ -1384,7 +1361,6 @@ cs46xx_dsp_create_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 	ins-&gt;pcm_channels[pcm_index].pcm_slot = pcm_index;</div><div class='ctx'> 	ins-&gt;pcm_channels[pcm_index].mixer_scb = mixer_scb;</div><div class='ctx'> 	ins-&gt;npcm_channels ++;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return (ins-&gt;pcm_channels + pcm_index);</div><div class='ctx'> }</div><div class='hunk'>@@ -1419,7 +1395,8 @@ int cs46xx_dsp_pcm_channel_set_period (struct snd_cs46xx * chip,</div><div class='ctx'> 		temp |= DMA_RQ_C1_SOURCE_MOD16;</div><div class='ctx'> 		break; </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printdd ("period size (%d) not supported by HW\n", period_size);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"period size (%d) not supported by HW\n", period_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1457,7 +1434,8 @@ int cs46xx_dsp_pcm_ostream_set_period (struct snd_cs46xx * chip,</div><div class='ctx'> 		temp |= DMA_RQ_C1_DEST_MOD16;</div><div class='ctx'> 		break; </div><div class='ctx'> 	default:</div><div class='del'>-		snd_printdd ("period size (%d) not supported by HW\n", period_size);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"period size (%d) not supported by HW\n", period_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1470,20 +1448,19 @@ void cs46xx_dsp_destroy_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> 				     struct dsp_pcm_channel_descriptor * pcm_channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!pcm_channel-&gt;active ||</div><div class='ctx'> 		       ins-&gt;npcm_channels &lt;= 0 ||</div><div class='ctx'> 		       pcm_channel-&gt;src_scb-&gt;ref_count &lt;= 0))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	pcm_channel-&gt;unlinked = 1;</div><div class='del'>-	pcm_channel-&gt;active = 0;</div><div class='del'>-	pcm_channel-&gt;private_data = NULL;</div><div class='del'>-	pcm_channel-&gt;src_scb-&gt;ref_count --;</div><div class='del'>-	ins-&gt;npcm_channels --;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		pcm_channel-&gt;unlinked = 1;</div><div class='add'>+		pcm_channel-&gt;active = 0;</div><div class='add'>+		pcm_channel-&gt;private_data = NULL;</div><div class='add'>+		pcm_channel-&gt;src_scb-&gt;ref_count--;</div><div class='add'>+		ins-&gt;npcm_channels--;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cs46xx_dsp_remove_scb(chip,pcm_channel-&gt;pcm_reader_scb);</div><div class='ctx'> </div><div class='hunk'>@@ -1502,22 +1479,17 @@ void cs46xx_dsp_destroy_pcm_channel (struct snd_cs46xx * chip,</div><div class='ctx'> int cs46xx_dsp_pcm_unlink (struct snd_cs46xx * chip,</div><div class='ctx'> 			   struct dsp_pcm_channel_descriptor * pcm_channel)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!pcm_channel-&gt;active ||</div><div class='ctx'> 		       chip-&gt;dsp_spos_instance-&gt;npcm_channels &lt;= 0))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	if (pcm_channel-&gt;unlinked) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (pcm_channel-&gt;unlinked)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pcm_channel-&gt;unlinked = 1;</div><div class='ctx'> </div><div class='ctx'> 	_dsp_unlink_scb (chip,pcm_channel-&gt;pcm_reader_scb);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1528,14 +1500,11 @@ int cs46xx_dsp_pcm_link (struct snd_cs46xx * chip,</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> 	struct dsp_scb_descriptor * parent_scb;</div><div class='ctx'> 	struct dsp_scb_descriptor * src_scb = pcm_channel-&gt;src_scb;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	if (pcm_channel-&gt;unlinked == 0) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	if (pcm_channel-&gt;unlinked == 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	parent_scb = src_scb;</div><div class='ctx'> </div><div class='hunk'>@@ -1556,7 +1525,6 @@ int cs46xx_dsp_pcm_link (struct snd_cs46xx * chip,</div><div class='ctx'> 	cs46xx_dsp_spos_update_scb(chip,parent_scb);</div><div class='ctx'> </div><div class='ctx'> 	pcm_channel-&gt;unlinked = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1589,17 +1557,14 @@ cs46xx_add_record_source (struct snd_cs46xx *chip, struct dsp_scb_descriptor * s</div><div class='ctx'> </div><div class='ctx'> int cs46xx_src_unlink(struct snd_cs46xx *chip, struct dsp_scb_descriptor * src)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	if (snd_BUG_ON(!src-&gt;parent_scb_ptr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* mute SCB */</div><div class='ctx'> 	cs46xx_dsp_scb_set_volume (chip,src,0,0);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	_dsp_unlink_scb (chip,src);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1723,7 +1688,7 @@ int cs46xx_iec958_pre_open (struct snd_cs46xx *chip)</div><div class='ctx'> 	struct dsp_spos_instance * ins = chip-&gt;dsp_spos_instance;</div><div class='ctx'> </div><div class='ctx'> 	if ( ins-&gt;spdif_status_out &amp; DSP_SPDIF_STATUS_OUTPUT_ENABLED ) {</div><div class='del'>-		/* remove AsynchFGTxSCB and and PCMSerialInput_II */</div><div class='add'>+		/* remove AsynchFGTxSCB and PCMSerialInput_II */</div><div class='ctx'> 		cs46xx_dsp_disable_spdif_out (chip);</div><div class='ctx'> </div><div class='ctx'> 		/* save state */</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwc4630.h b/sound/pci/cs46xx/imgs/cwc4630.h<br/>deleted file mode 100644<br/>index 37c4f1318dc5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwc4630.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwc4630.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,320 +0,0 @@</div><div class='del'>-/* generated from cwc4630.osp DO NOT MODIFY */</div><div class='del'>-</div><div class='del'>-#ifndef __HEADER_cwc4630_H__</div><div class='del'>-#define __HEADER_cwc4630_H__</div><div class='del'>-</div><div class='del'>-static struct dsp_symbol_entry cwc4630_symbols[] = {</div><div class='del'>-  { 0x0000, "BEGINADDRESS",0x00 },</div><div class='del'>-  { 0x8000, "EXECCHILD",0x03 },</div><div class='del'>-  { 0x8001, "EXECCHILD_98",0x03 },</div><div class='del'>-  { 0x8003, "EXECCHILD_PUSH1IND",0x03 },</div><div class='del'>-  { 0x8008, "EXECSIBLING",0x03 },</div><div class='del'>-  { 0x800a, "EXECSIBLING_298",0x03 },</div><div class='del'>-  { 0x800b, "EXECSIBLING_2IND1",0x03 },</div><div class='del'>-  { 0x8010, "TIMINGMASTER",0x03 },</div><div class='del'>-  { 0x804f, "S16_CODECINPUTTASK",0x03 },</div><div class='del'>-  { 0x805e, "PCMSERIALINPUTTASK",0x03 },</div><div class='del'>-  { 0x806d, "S16_MIX_TO_OSTREAM",0x03 },</div><div class='del'>-  { 0x809a, "S16_MIX",0x03 },</div><div class='del'>-  { 0x80bb, "S16_UPSRC",0x03 },</div><div class='del'>-  { 0x813b, "MIX3_EXP",0x03 },</div><div class='del'>-  { 0x8164, "DECIMATEBYPOW2",0x03 },</div><div class='del'>-  { 0x8197, "VARIDECIMATE",0x03 },</div><div class='del'>-  { 0x81f2, "_3DINPUTTASK",0x03 },</div><div class='del'>-  { 0x820a, "_3DPRLGCINPTASK",0x03 },</div><div class='del'>-  { 0x8227, "_3DSTEREOINPUTTASK",0x03 },</div><div class='del'>-  { 0x8242, "_3DOUTPUTTASK",0x03 },</div><div class='del'>-  { 0x82c4, "HRTF_MORPH_TASK",0x03 },</div><div class='del'>-  { 0x82c6, "WAIT4DATA",0x03 },</div><div class='del'>-  { 0x82fa, "PROLOGIC",0x03 },</div><div class='del'>-  { 0x8496, "DECORRELATOR",0x03 },</div><div class='del'>-  { 0x84a4, "STEREO2MONO",0x03 },</div><div class='del'>-  { 0x0070, "SPOSCB",0x02 },</div><div class='del'>-  { 0x0107, "TASKTREETHREAD",0x03 },</div><div class='del'>-  { 0x013c, "TASKTREEHEADERCODE",0x03 },</div><div class='del'>-  { 0x0145, "FGTASKTREEHEADERCODE",0x03 },</div><div class='del'>-  { 0x0169, "NULLALGORITHM",0x03 },</div><div class='del'>-  { 0x016d, "HFGEXECCHILD",0x03 },</div><div class='del'>-  { 0x016e, "HFGEXECCHILD_98",0x03 },</div><div class='del'>-  { 0x0170, "HFGEXECCHILD_PUSH1IND",0x03 },</div><div class='del'>-  { 0x0173, "HFGEXECSIBLING",0x03 },</div><div class='del'>-  { 0x0175, "HFGEXECSIBLING_298",0x03 },</div><div class='del'>-  { 0x0176, "HFGEXECSIBLING_2IND1",0x03 },</div><div class='del'>-  { 0x0179, "S16_CODECOUTPUTTASK",0x03 },</div><div class='del'>-  { 0x0194, "#CODE_END",0x00 },</div><div class='del'>-}; /* cwc4630 symbols */</div><div class='del'>-</div><div class='del'>-static u32 cwc4630_code[] = {</div><div class='del'>-/* BEGINADDRESS */</div><div class='del'>-/* 0000 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 0002 */ 0x00001705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0004 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 0006 */ 0x00009705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0008 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 000A */ 0x00011705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 000C */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 000E */ 0x00019705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0010 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 0012 */ 0x00021705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0014 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 0016 */ 0x00029705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0018 */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 001A */ 0x00031705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 001C */ 0x00040730,0x00001002,0x000f619e,0x00001003,</div><div class='del'>-/* 001E */ 0x00039705,0x00001400,0x000a411e,0x00001003,</div><div class='del'>-/* 0020 */ 0x000fe19e,0x00001003,0x0009c730,0x00001003,</div><div class='del'>-/* 0022 */ 0x0008e19c,0x00001003,0x000083c1,0x00093040,</div><div class='del'>-/* 0024 */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 0026 */ 0x00009705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 0028 */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 002A */ 0x00011705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 002C */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 002E */ 0x00019705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 0030 */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 0032 */ 0x00021705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 0034 */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 0036 */ 0x00029705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 0038 */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 003A */ 0x00031705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 003C */ 0x00098730,0x00001002,0x000ee19e,0x00001003,</div><div class='del'>-/* 003E */ 0x00039705,0x00001400,0x000a211e,0x00001003,</div><div class='del'>-/* 0040 */ 0x0001a730,0x00001008,0x000e2730,0x00001002,</div><div class='del'>-/* 0042 */ 0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-/* 0044 */ 0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-/* 0046 */ 0x0000a731,0x00001002,0x0000a731,0x00001002,</div><div class='del'>-/* 0048 */ 0x00000000,0x00000000,0x000f619c,0x00001003,</div><div class='del'>-/* 004A */ 0x0007f801,0x000c0000,0x00000037,0x00001000,</div><div class='del'>-/* 004C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 004E */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0050 */ 0x00000000,0x000c0000,0x00000000,0x00000000,</div><div class='del'>-/* 0052 */ 0x0000373c,0x00001000,0x00000000,0x00000000,</div><div class='del'>-/* 0054 */ 0x000ee19c,0x00001003,0x0007f801,0x000c0000,</div><div class='del'>-/* 0056 */ 0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-/* 0058 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 005A */ 0x00000000,0x00000000,0x0000273c,0x00001000,</div><div class='del'>-/* 005C */ 0x00000033,0x00001000,0x000e679e,0x00001003,</div><div class='del'>-/* 005E */ 0x00007705,0x00001400,0x000ac71e,0x00001003,</div><div class='del'>-/* 0060 */ 0x00087fc1,0x000c3be0,0x0007f801,0x000c0000,</div><div class='del'>-/* 0062 */ 0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-/* 0064 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0066 */ 0x00000000,0x00000000,0x0000a730,0x00001003,</div><div class='del'>-/* 0068 */ 0x00000033,0x00001000,0x0007f801,0x000c0000,</div><div class='del'>-/* 006A */ 0x00000037,0x00001000,0x00000000,0x00000000,</div><div class='del'>-/* 006C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 006E */ 0x00000000,0x00000000,0x00000000,0x000c0000,</div><div class='del'>-/* 0070 */ 0x00000032,0x00001000,0x0000273d,0x00001000,</div><div class='del'>-/* 0072 */ 0x0004a730,0x00001003,0x00000f41,0x00097140,</div><div class='del'>-/* 0074 */ 0x0000a841,0x0009b240,0x0000a0c1,0x0009f040,</div><div class='del'>-/* 0076 */ 0x0001c641,0x00093540,0x0001cec1,0x0009b5c0,</div><div class='del'>-/* 0078 */ 0x00000000,0x00000000,0x0001bf05,0x0003fc40,</div><div class='del'>-/* 007A */ 0x00002725,0x000aa400,0x00013705,0x00093a00,</div><div class='del'>-/* 007C */ 0x0000002e,0x0009d6c0,0x0002ef8a,0x00000000,</div><div class='del'>-/* 007E */ 0x00040630,0x00001004,0x0004ef0a,0x000eb785,</div><div class='del'>-/* 0080 */ 0x0003fc8a,0x00000000,0x00000000,0x000c70e0,</div><div class='del'>-/* 0082 */ 0x0007d182,0x0002c640,0x00008630,0x00001004,</div><div class='del'>-/* 0084 */ 0x000799b8,0x0002c6c0,0x00031705,0x00092240,</div><div class='del'>-/* 0086 */ 0x00039f05,0x000932c0,0x0003520a,0x00000000,</div><div class='del'>-/* 0088 */ 0x00070731,0x0000100b,0x00010705,0x000b20c0,</div><div class='del'>-/* 008A */ 0x00000000,0x000eba44,0x00032108,0x000c60c4,</div><div class='del'>-/* 008C */ 0x00065208,0x000c2917,0x000486b0,0x00001007,</div><div class='del'>-/* 008E */ 0x00012f05,0x00036880,0x0002818e,0x000c0000,</div><div class='del'>-/* 0090 */ 0x0004410a,0x00000000,0x00048630,0x00001007,</div><div class='del'>-/* 0092 */ 0x00029705,0x000c0000,0x00000000,0x00000000,</div><div class='del'>-/* 0094 */ 0x00003fc1,0x0003fc40,0x000037c1,0x00091b40,</div><div class='del'>-/* 0096 */ 0x00003fc1,0x000911c0,0x000037c1,0x000957c0,</div><div class='del'>-/* 0098 */ 0x00003fc1,0x000951c0,0x000037c1,0x00000000,</div><div class='del'>-/* 009A */ 0x00003fc1,0x000991c0,0x000037c1,0x00000000,</div><div class='del'>-/* 009C */ 0x00003fc1,0x0009d1c0,0x000037c1,0x00000000,</div><div class='del'>-/* 009E */ 0x0001ccc1,0x000915c0,0x0001c441,0x0009d800,</div><div class='del'>-/* 00A0 */ 0x0009cdc1,0x00091240,0x0001c541,0x00091d00,</div><div class='del'>-/* 00A2 */ 0x0009cfc1,0x00095240,0x0001c741,0x00095c80,</div><div class='del'>-/* 00A4 */ 0x000e8ca9,0x00099240,0x000e85ad,0x00095640,</div><div class='del'>-/* 00A6 */ 0x00069ca9,0x00099d80,0x000e952d,0x00099640,</div><div class='del'>-/* 00A8 */ 0x000eaca9,0x0009d6c0,0x000ea5ad,0x00091a40,</div><div class='del'>-/* 00AA */ 0x0006bca9,0x0009de80,0x000eb52d,0x00095a40,</div><div class='del'>-/* 00AC */ 0x000ecca9,0x00099ac0,0x000ec5ad,0x0009da40,</div><div class='del'>-/* 00AE */ 0x000edca9,0x0009d300,0x000a6e0a,0x00001000,</div><div class='del'>-/* 00B0 */ 0x000ed52d,0x00091e40,0x000eeca9,0x00095ec0,</div><div class='del'>-/* 00B2 */ 0x000ee5ad,0x00099e40,0x0006fca9,0x00002500,</div><div class='del'>-/* 00B4 */ 0x000fb208,0x000c59a0,0x000ef52d,0x0009de40,</div><div class='del'>-/* 00B6 */ 0x00068ca9,0x000912c1,0x000683ad,0x00095241,</div><div class='del'>-/* 00B8 */ 0x00020f05,0x000991c1,0x00000000,0x00000000,</div><div class='del'>-/* 00BA */ 0x00086f88,0x00001000,0x0009cf81,0x000b5340,</div><div class='del'>-/* 00BC */ 0x0009c701,0x000b92c0,0x0009de81,0x000bd300,</div><div class='del'>-/* 00BE */ 0x0009d601,0x000b1700,0x0001fd81,0x000b9d80,</div><div class='del'>-/* 00C0 */ 0x0009f501,0x000b57c0,0x000a0f81,0x000bd740,</div><div class='del'>-/* 00C2 */ 0x00020701,0x000b5c80,0x000a1681,0x000b97c0,</div><div class='del'>-/* 00C4 */ 0x00021601,0x00002500,0x000a0701,0x000b9b40,</div><div class='del'>-/* 00C6 */ 0x000a0f81,0x000b1bc0,0x00021681,0x00002d00,</div><div class='del'>-/* 00C8 */ 0x00020f81,0x000bd800,0x000a0701,0x000b5bc0,</div><div class='del'>-/* 00CA */ 0x00021601,0x00003500,0x000a0f81,0x000b5f40,</div><div class='del'>-/* 00CC */ 0x000a0701,0x000bdbc0,0x00021681,0x00003d00,</div><div class='del'>-/* 00CE */ 0x00020f81,0x000b1d00,0x000a0701,0x000b1fc0,</div><div class='del'>-/* 00D0 */ 0x00021601,0x00020500,0x00020f81,0x000b1341,</div><div class='del'>-/* 00D2 */ 0x000a0701,0x000b9fc0,0x00021681,0x00020d00,</div><div class='del'>-/* 00D4 */ 0x00020f81,0x000bde80,0x000a0701,0x000bdfc0,</div><div class='del'>-/* 00D6 */ 0x00021601,0x00021500,0x00020f81,0x000b9341,</div><div class='del'>-/* 00D8 */ 0x00020701,0x000b53c1,0x00021681,0x00021d00,</div><div class='del'>-/* 00DA */ 0x000a0f81,0x000d0380,0x0000b601,0x000b15c0,</div><div class='del'>-/* 00DC */ 0x00007b01,0x00000000,0x00007b81,0x000bd1c0,</div><div class='del'>-/* 00DE */ 0x00007b01,0x00000000,0x00007b81,0x000b91c0,</div><div class='del'>-/* 00E0 */ 0x00007b01,0x000b57c0,0x00007b81,0x000b51c0,</div><div class='del'>-/* 00E2 */ 0x00007b01,0x000b1b40,0x00007b81,0x000b11c0,</div><div class='del'>-/* 00E4 */ 0x00087b01,0x000c3dc0,0x0007e488,0x000d7e45,</div><div class='del'>-/* 00E6 */ 0x00000000,0x000d7a44,0x0007e48a,0x00000000,</div><div class='del'>-/* 00E8 */ 0x00011f05,0x00084080,0x00000000,0x00000000,</div><div class='del'>-/* 00EA */ 0x00001705,0x000b3540,0x00008a01,0x000bf040,</div><div class='del'>-/* 00EC */ 0x00007081,0x000bb5c0,0x00055488,0x00000000,</div><div class='del'>-/* 00EE */ 0x0000d482,0x0003fc40,0x0003fc88,0x00000000,</div><div class='del'>-/* 00F0 */ 0x0001e401,0x000b3a00,0x0001ec81,0x000bd6c0,</div><div class='del'>-/* 00F2 */ 0x0002ef88,0x000e7784,0x00056f08,0x00000000,</div><div class='del'>-/* 00F4 */ 0x000d86b0,0x00001007,0x00008281,0x000bb240,</div><div class='del'>-/* 00F6 */ 0x0000b801,0x000b7140,0x00007888,0x00000000,</div><div class='del'>-/* 00F8 */ 0x0000073c,0x00001000,0x0007f188,0x000c0000,</div><div class='del'>-/* 00FA */ 0x00000000,0x00000000,0x00055288,0x000c555c,</div><div class='del'>-/* 00FC */ 0x0005528a,0x000c0000,0x0009fa88,0x000c5d00,</div><div class='del'>-/* 00FE */ 0x0000fa88,0x00000000,0x00000032,0x00001000,</div><div class='del'>-/* 0100 */ 0x0000073d,0x00001000,0x0007f188,0x000c0000,</div><div class='del'>-/* 0102 */ 0x00000000,0x00000000,0x0008c01c,0x00001003,</div><div class='del'>-/* 0104 */ 0x00002705,0x00001008,0x0008b201,0x000c1392,</div><div class='del'>-/* 0106 */ 0x0000ba01,0x00000000,</div><div class='del'>-/* TASKTREETHREAD */</div><div class='del'>-/* 0107 */ 0x00008731,0x00001400,0x0004c108,0x000fe0c4,</div><div class='del'>-/* 0109 */ 0x00057488,0x00000000,0x000a6388,0x00001001,</div><div class='del'>-/* 010B */ 0x0008b334,0x000bc141,0x0003020e,0x00000000,</div><div class='del'>-/* 010D */ 0x000986b0,0x00001008,0x00003625,0x000c5dfa,</div><div class='del'>-/* 010F */ 0x000a638a,0x00001001,0x0008020e,0x00001002,</div><div class='del'>-/* 0111 */ 0x0009a6b0,0x00001008,0x0007f301,0x00000000,</div><div class='del'>-/* 0113 */ 0x00000000,0x00000000,0x00002725,0x000a8c40,</div><div class='del'>-/* 0115 */ 0x000000ae,0x00000000,0x000e8630,0x00001008,</div><div class='del'>-/* 0117 */ 0x00000000,0x000c74e0,0x0007d182,0x0002d640,</div><div class='del'>-/* 0119 */ 0x000b8630,0x00001008,0x000799b8,0x0002d6c0,</div><div class='del'>-/* 011B */ 0x0000748a,0x000c3ec5,0x0007420a,0x000c0000,</div><div class='del'>-/* 011D */ 0x00062208,0x000c4117,0x000a0630,0x00001009,</div><div class='del'>-/* 011F */ 0x00000000,0x000c0000,0x0001022e,0x00000000,</div><div class='del'>-/* 0121 */ 0x0006a630,0x00001009,0x00000032,0x00001000,</div><div class='del'>-/* 0123 */ 0x000ca21c,0x00001003,0x00005a02,0x00000000,</div><div class='del'>-/* 0125 */ 0x0001a630,0x00001009,0x00000000,0x000c0000,</div><div class='del'>-/* 0127 */ 0x00000036,0x00001000,0x00000000,0x00000000,</div><div class='del'>-/* 0129 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 012B */ 0x00000000,0x00000000,0x0003a730,0x00001008,</div><div class='del'>-/* 012D */ 0x0007f801,0x000c0000,0x00000037,0x00001000,</div><div class='del'>-/* 012F */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0131 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0133 */ 0x0003a730,0x00001008,0x00000033,0x00001000,</div><div class='del'>-/* 0135 */ 0x0003a705,0x00001008,0x00007a01,0x000c0000,</div><div class='del'>-/* 0137 */ 0x000e6288,0x000d550a,0x0006428a,0x00000000,</div><div class='del'>-/* 0139 */ 0x00090730,0x0000100a,0x00000000,0x000c0000,</div><div class='del'>-/* 013B */ 0x00000000,0x00000000,</div><div class='del'>-/* TASKTREEHEADERCODE */</div><div class='del'>-/* 013C */ 0x0007aab0,0x00034880,0x000a8fb0,0x0000100b,</div><div class='del'>-/* 013E */ 0x00057488,0x00000000,0x00033b94,0x00081140,</div><div class='del'>-/* 0140 */ 0x000183ae,0x00000000,0x000a86b0,0x0000100b,</div><div class='del'>-/* 0142 */ 0x00022f05,0x000c3545,0x0000eb8a,0x00000000,</div><div class='del'>-/* 0144 */ 0x00042731,0x00001003,</div><div class='del'>-/* FGTASKTREEHEADERCODE */</div><div class='del'>-/* 0145 */ 0x0007aab0,0x00034880,0x00078fb0,0x0000100a,</div><div class='del'>-/* 0147 */ 0x00057488,0x00000000,0x00033b94,0x00081140,</div><div class='del'>-/* 0149 */ 0x000183ae,0x00000000,0x000b06b0,0x0000100b,</div><div class='del'>-/* 014B */ 0x00022f05,0x00000000,0x00007401,0x00091140,</div><div class='del'>-/* 014D */ 0x00048f05,0x000951c0,0x00042731,0x00001003,</div><div class='del'>-/* 014F */ 0x0000473d,0x00001000,0x000f19b0,0x000bbc47,</div><div class='del'>-/* 0151 */ 0x00080000,0x000bffc7,0x000fe19e,0x00001003,</div><div class='del'>-/* 0153 */ 0x00000000,0x00000000,0x0008e19c,0x00001003,</div><div class='del'>-/* 0155 */ 0x000083c1,0x00093040,0x00000f41,0x00097140,</div><div class='del'>-/* 0157 */ 0x0000a841,0x0009b240,0x0000a0c1,0x0009f040,</div><div class='del'>-/* 0159 */ 0x0001c641,0x00093540,0x0001cec1,0x0009b5c0,</div><div class='del'>-/* 015B */ 0x00000000,0x000fdc44,0x00055208,0x00000000,</div><div class='del'>-/* 015D */ 0x00010705,0x000a2880,0x0000a23a,0x00093a00,</div><div class='del'>-/* 015F */ 0x0003fc8a,0x000df6c5,0x0004ef0a,0x000c0000,</div><div class='del'>-/* 0161 */ 0x00012f05,0x00036880,0x00065308,0x000c2997,</div><div class='del'>-/* 0163 */ 0x000086b0,0x0000100b,0x0004410a,0x000d40c7,</div><div class='del'>-/* 0165 */ 0x00000000,0x00000000,0x00088730,0x00001004,</div><div class='del'>-/* 0167 */ 0x00056f0a,0x000ea105,0x00000000,0x00000000,</div><div class='del'>-/* NULLALGORITHM */</div><div class='del'>-/* 0169 */ 0x0000473d,0x00001000,0x000f19b0,0x000bbc47,</div><div class='del'>-/* 016B */ 0x00080000,0x000bffc7,0x0000273d,0x00001000,</div><div class='del'>-/* HFGEXECCHILD */</div><div class='del'>-/* 016D */ 0x00000000,0x000eba44,</div><div class='del'>-/* HFGEXECCHILD_98 */</div><div class='del'>-/* 016E */ 0x00048f05,0x0000f440,0x00007401,0x0000f7c0,</div><div class='del'>-/* HFGEXECCHILD_PUSH1IND */</div><div class='del'>-/* 0170 */ 0x00000734,0x00001000,0x00010705,0x000a6880,</div><div class='del'>-/* 0172 */ 0x00006a88,0x000c75c4,</div><div class='del'>-/* HFGEXECSIBLING */</div><div class='del'>-/* 0173 */ 0x00000000,0x000e5084,0x00000000,0x000eba44,</div><div class='del'>-/* HFGEXECSIBLING_298 */</div><div class='del'>-/* 0175 */ 0x00087401,0x000e4782,</div><div class='del'>-/* HFGEXECSIBLING_2IND1 */</div><div class='del'>-/* 0176 */ 0x00000734,0x00001000,0x00010705,0x000a6880,</div><div class='del'>-/* 0178 */ 0x00006a88,0x000c75c4,</div><div class='del'>-/* S16_CODECOUTPUTTASK */</div><div class='del'>-/* 0179 */ 0x0007c108,0x000c0000,0x0007e721,0x000bed40,</div><div class='del'>-/* 017B */ 0x00005f25,0x000badc0,0x0003ba97,0x000beb80,</div><div class='del'>-/* 017D */ 0x00065590,0x000b2e00,0x00033217,0x00003ec0,</div><div class='del'>-/* 017F */ 0x00065590,0x000b8e40,0x0003ed80,0x000491c0,</div><div class='del'>-/* 0181 */ 0x00073fb0,0x00074c80,0x000583a0,0x0000100c,</div><div class='del'>-/* 0183 */ 0x000ee388,0x00042970,0x00008301,0x00021ef2,</div><div class='del'>-/* 0185 */ 0x000b8f14,0x0000000f,0x000c4d8d,0x0000001b,</div><div class='del'>-/* 0187 */ 0x000d6dc2,0x000e06c6,0x000032ac,0x000c3916,</div><div class='del'>-/* 0189 */ 0x0004edc2,0x00074c80,0x00078898,0x00001000,</div><div class='del'>-/* 018B */ 0x00038894,0x00000032,0x000c4d8d,0x00092e1b,</div><div class='del'>-/* 018D */ 0x000d6dc2,0x000e06c6,0x0004edc2,0x000c1956,</div><div class='del'>-/* 018F */ 0x0000722c,0x00034a00,0x00041705,0x0009ed40,</div><div class='del'>-/* 0191 */ 0x00058730,0x00001400,0x000d7488,0x000c3a00,</div><div class='del'>-/* 0193 */ 0x00048f05,0x00000000</div><div class='del'>-};</div><div class='del'>-/* #CODE_END */</div><div class='del'>-</div><div class='del'>-static u32 cwc4630_parameter[] = {</div><div class='del'>-/* 0000 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0004 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0008 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 000C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0010 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0014 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0018 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 001C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0020 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0024 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0028 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 002C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0030 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0034 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0038 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 003C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0040 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0044 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0048 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 004C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0050 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0054 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0058 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 005C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0060 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0064 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0068 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 006C */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0070 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0074 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 0078 */ 0x00000000,0x00000000,0x00000000,0x00000000,</div><div class='del'>-/* 007C */ 0x00000000,0x00000000,0x00000000,0x00000000</div><div class='del'>-}; /* #PARAMETER_END */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct dsp_segment_desc cwc4630_segments[] = {</div><div class='del'>-  { SEGTYPE_SP_PROGRAM, 0x00000000, 0x00000328, cwc4630_code },</div><div class='del'>-  { SEGTYPE_SP_PARAMETER, 0x00000000, 0x00000080, cwc4630_parameter },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsp_module_desc cwc4630_module = {</div><div class='del'>-  "cwc4630",</div><div class='del'>-  {</div><div class='del'>-    38,</div><div class='del'>-    cwc4630_symbols</div><div class='del'>-  },</div><div class='del'>-  2,</div><div class='del'>-  cwc4630_segments,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __HEADER_cwc4630_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwcasync.h b/sound/pci/cs46xx/imgs/cwcasync.h<br/>deleted file mode 100644<br/>index 70e63e13c2b3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwcasync.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcasync.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,176 +0,0 @@</div><div class='del'>-/* generated from cwcasync.osp DO NOT MODIFY */</div><div class='del'>-</div><div class='del'>-#ifndef __HEADER_cwcasync_H__</div><div class='del'>-#define __HEADER_cwcasync_H__</div><div class='del'>-</div><div class='del'>-static struct dsp_symbol_entry cwcasync_symbols[] = {</div><div class='del'>-  { 0x8000, "EXECCHILD",0x03 },</div><div class='del'>-  { 0x8001, "EXECCHILD_98",0x03 },</div><div class='del'>-  { 0x8003, "EXECCHILD_PUSH1IND",0x03 },</div><div class='del'>-  { 0x8008, "EXECSIBLING",0x03 },</div><div class='del'>-  { 0x800a, "EXECSIBLING_298",0x03 },</div><div class='del'>-  { 0x800b, "EXECSIBLING_2IND1",0x03 },</div><div class='del'>-  { 0x8010, "TIMINGMASTER",0x03 },</div><div class='del'>-  { 0x804f, "S16_CODECINPUTTASK",0x03 },</div><div class='del'>-  { 0x805e, "PCMSERIALINPUTTASK",0x03 },</div><div class='del'>-  { 0x806d, "S16_MIX_TO_OSTREAM",0x03 },</div><div class='del'>-  { 0x809a, "S16_MIX",0x03 },</div><div class='del'>-  { 0x80bb, "S16_UPSRC",0x03 },</div><div class='del'>-  { 0x813b, "MIX3_EXP",0x03 },</div><div class='del'>-  { 0x8164, "DECIMATEBYPOW2",0x03 },</div><div class='del'>-  { 0x8197, "VARIDECIMATE",0x03 },</div><div class='del'>-  { 0x81f2, "_3DINPUTTASK",0x03 },</div><div class='del'>-  { 0x820a, "_3DPRLGCINPTASK",0x03 },</div><div class='del'>-  { 0x8227, "_3DSTEREOINPUTTASK",0x03 },</div><div class='del'>-  { 0x8242, "_3DOUTPUTTASK",0x03 },</div><div class='del'>-  { 0x82c4, "HRTF_MORPH_TASK",0x03 },</div><div class='del'>-  { 0x82c6, "WAIT4DATA",0x03 },</div><div class='del'>-  { 0x82fa, "PROLOGIC",0x03 },</div><div class='del'>-  { 0x8496, "DECORRELATOR",0x03 },</div><div class='del'>-  { 0x84a4, "STEREO2MONO",0x03 },</div><div class='del'>-  { 0x0000, "OVERLAYBEGINADDRESS",0x00 },</div><div class='del'>-  { 0x0000, "SPIOWRITE",0x03 },</div><div class='del'>-  { 0x000d, "S16_ASYNCCODECINPUTTASK",0x03 },</div><div class='del'>-  { 0x0043, "SPDIFITASK",0x03 },</div><div class='del'>-  { 0x007b, "SPDIFOTASK",0x03 },</div><div class='del'>-  { 0x0097, "ASYNCHFGTXCODE",0x03 },</div><div class='del'>-  { 0x00be, "ASYNCHFGRXCODE",0x03 },</div><div class='del'>-  { 0x00db, "#CODE_END",0x00 },</div><div class='del'>-}; /* cwcasync symbols */</div><div class='del'>-</div><div class='del'>-static u32 cwcasync_code[] = {</div><div class='del'>-/* OVERLAYBEGINADDRESS */</div><div class='del'>-/* 0000 */ 0x00002731,0x00001400,0x00003725,0x000a8440,</div><div class='del'>-/* 0002 */ 0x000000ae,0x00000000,0x00060630,0x00001000,</div><div class='del'>-/* 0004 */ 0x00000000,0x000c7560,0x00075282,0x0002d640,</div><div class='del'>-/* 0006 */ 0x00021705,0x00000000,0x00072ab8,0x0002d6c0,</div><div class='del'>-/* 0008 */ 0x00020630,0x00001000,0x000c74c2,0x000d4b82,</div><div class='del'>-/* 000A */ 0x000475c2,0x00000000,0x0003430a,0x000c0000,</div><div class='del'>-/* 000C */ 0x00042730,0x00001400,</div><div class='del'>-/* S16_ASYNCCODECINPUTTASK */</div><div class='del'>-/* 000D */ 0x0006a108,0x000cf2c4,0x0004f4c0,0x00000000,</div><div class='del'>-/* 000F */ 0x000fa418,0x0000101f,0x0005d402,0x0001c500,</div><div class='del'>-/* 0011 */ 0x000f0630,0x00001000,0x00004418,0x00001380,</div><div class='del'>-/* 0013 */ 0x000e243d,0x000d394a,0x00049705,0x00000000,</div><div class='del'>-/* 0015 */ 0x0007d530,0x000b4240,0x000e00f2,0x00001000,</div><div class='del'>-/* 0017 */ 0x00009134,0x000ca20a,0x00004c90,0x00001000,</div><div class='del'>-/* 0019 */ 0x0005d705,0x00000000,0x00004f25,0x00098240,</div><div class='del'>-/* 001B */ 0x00004725,0x00000000,0x0000e48a,0x00000000,</div><div class='del'>-/* 001D */ 0x00027295,0x0009c2c0,0x0003df25,0x00000000,</div><div class='del'>-/* 001F */ 0x000e8030,0x00001001,0x0005f718,0x000ac600,</div><div class='del'>-/* 0021 */ 0x0007cf30,0x000c2a01,0x00082630,0x00001001,</div><div class='del'>-/* 0023 */ 0x000504a0,0x00001001,0x00029314,0x000bcb80,</div><div class='del'>-/* 0025 */ 0x0003cf25,0x000b0e00,0x0004f5c0,0x00000000,</div><div class='del'>-/* 0027 */ 0x00049118,0x000d888a,0x0007dd02,0x000c6efa,</div><div class='del'>-/* 0029 */ 0x00000000,0x00000000,0x0004f5c0,0x00069c80,</div><div class='del'>-/* 002B */ 0x0000d402,0x00000000,0x000e8630,0x00001001,</div><div class='del'>-/* 002D */ 0x00079130,0x00000000,0x00049118,0x00090e00,</div><div class='del'>-/* 002F */ 0x0006c10a,0x00000000,0x00000000,0x000c0000,</div><div class='del'>-/* 0031 */ 0x0007cf30,0x00030580,0x00005725,0x00000000,</div><div class='del'>-/* 0033 */ 0x000d84a0,0x00001001,0x00029314,0x000b4780,</div><div class='del'>-/* 0035 */ 0x0003cf25,0x000b8600,0x00000000,0x00000000,</div><div class='del'>-/* 0037 */ 0x00000000,0x000c0000,0x00000000,0x00042c80,</div><div class='del'>-/* 0039 */ 0x0001dec1,0x000e488c,0x00031114,0x00000000,</div><div class='del'>-/* 003B */ 0x0004f5c2,0x00000000,0x0003640a,0x00000000,</div><div class='del'>-/* 003D */ 0x00000000,0x000e5084,0x00000000,0x000eb844,</div><div class='del'>-/* 003F */ 0x00007001,0x00000000,0x00000734,0x00001000,</div><div class='del'>-/* 0041 */ 0x00010705,0x000a6880,0x00006a88,0x000c75c4,</div><div class='del'>-/* SPDIFITASK */</div><div class='del'>-/* 0043 */ 0x0006a108,0x000cf2c4,0x0004f4c0,0x000d5384,</div><div class='del'>-/* 0045 */ 0x0007e48a,0x00000000,0x00067718,0x00001000,</div><div class='del'>-/* 0047 */ 0x0007a418,0x00001000,0x0007221a,0x00000000,</div><div class='del'>-/* 0049 */ 0x0005d402,0x00014500,0x000b8630,0x00001002,</div><div class='del'>-/* 004B */ 0x00004418,0x00001780,0x000e243d,0x000d394a,</div><div class='del'>-/* 004D */ 0x00049705,0x00000000,0x0007d530,0x000b4240,</div><div class='del'>-/* 004F */ 0x000ac0f2,0x00001002,0x00014414,0x00000000,</div><div class='del'>-/* 0051 */ 0x00004c90,0x00001000,0x0005d705,0x00000000,</div><div class='del'>-/* 0053 */ 0x00004f25,0x00098240,0x00004725,0x00000000,</div><div class='del'>-/* 0055 */ 0x0000e48a,0x00000000,0x00027295,0x0009c2c0,</div><div class='del'>-/* 0057 */ 0x0007df25,0x00000000,0x000ac030,0x00001003,</div><div class='del'>-/* 0059 */ 0x0005f718,0x000fe798,0x00029314,0x000bcb80,</div><div class='del'>-/* 005B */ 0x00000930,0x000b0e00,0x0004f5c0,0x000de204,</div><div class='del'>-/* 005D */ 0x000884a0,0x00001003,0x0007cf25,0x000e3560,</div><div class='del'>-/* 005F */ 0x00049118,0x00000000,0x00049118,0x000d888a,</div><div class='del'>-/* 0061 */ 0x0007dd02,0x000c6efa,0x0000c434,0x00030040,</div><div class='del'>-/* 0063 */ 0x000fda82,0x000c2312,0x000fdc0e,0x00001001,</div><div class='del'>-/* 0065 */ 0x00083402,0x000c2b92,0x000706b0,0x00001003,</div><div class='del'>-/* 0067 */ 0x00075a82,0x00000000,0x0000d625,0x000b0940,</div><div class='del'>-/* 0069 */ 0x0000840e,0x00001002,0x0000aabc,0x000c511e,</div><div class='del'>-/* 006B */ 0x00078730,0x00001003,0x0000aaf4,0x000e910a,</div><div class='del'>-/* 006D */ 0x0004628a,0x00000000,0x00006aca,0x00000000,</div><div class='del'>-/* 006F */ 0x00000930,0x00000000,0x0004f5c0,0x00069c80,</div><div class='del'>-/* 0071 */ 0x00046ac0,0x00000000,0x0003c40a,0x000fc898,</div><div class='del'>-/* 0073 */ 0x00049118,0x00090e00,0x0006c10a,0x00000000,</div><div class='del'>-/* 0075 */ 0x00000000,0x000e5084,0x00000000,0x000eb844,</div><div class='del'>-/* 0077 */ 0x00007001,0x00000000,0x00000734,0x00001000,</div><div class='del'>-/* 0079 */ 0x00010705,0x000a6880,0x00006a88,0x000c75c4,</div><div class='del'>-/* SPDIFOTASK */</div><div class='del'>-/* 007B */ 0x0006a108,0x000c0000,0x0004f4c0,0x000c3245,</div><div class='del'>-/* 007D */ 0x0000a418,0x00001000,0x0003a20a,0x00000000,</div><div class='del'>-/* 007F */ 0x00004418,0x00001380,0x000e243d,0x000d394a,</div><div class='del'>-/* 0081 */ 0x000c9705,0x000def92,0x0008c030,0x00001004,</div><div class='del'>-/* 0083 */ 0x0005f718,0x000fe798,0x00000000,0x000c0000,</div><div class='del'>-/* 0085 */ 0x00005725,0x00000000,0x000704a0,0x00001004,</div><div class='del'>-/* 0087 */ 0x00029314,0x000b4780,0x0003cf25,0x000b8600,</div><div class='del'>-/* 0089 */ 0x00000000,0x00000000,0x00000000,0x000c0000,</div><div class='del'>-/* 008B */ 0x00000000,0x00042c80,0x0001dec1,0x000e488c,</div><div class='del'>-/* 008D */ 0x00031114,0x00000000,0x0004f5c2,0x00000000,</div><div class='del'>-/* 008F */ 0x0004a918,0x00098600,0x0006c28a,0x00000000,</div><div class='del'>-/* 0091 */ 0x00000000,0x000e5084,0x00000000,0x000eb844,</div><div class='del'>-/* 0093 */ 0x00007001,0x00000000,0x00000734,0x00001000,</div><div class='del'>-/* 0095 */ 0x00010705,0x000a6880,0x00006a88,0x000c75c4,</div><div class='del'>-/* ASYNCHFGTXCODE */</div><div class='del'>-/* 0097 */ 0x0002a880,0x000b4e40,0x00042214,0x000e5548,</div><div class='del'>-/* 0099 */ 0x000542bf,0x00000000,0x00000000,0x000481c0,</div><div class='del'>-/* 009B */ 0x00000000,0x00000000,0x00000000,0x00000030,</div><div class='del'>-/* 009D */ 0x0000072d,0x000fbf8a,0x00077f94,0x000ea7df,</div><div class='del'>-/* 009F */ 0x0002ac95,0x000d3145,0x00002731,0x00001400,</div><div class='del'>-/* 00A1 */ 0x00006288,0x000c71c4,0x00014108,0x000e6044,</div><div class='del'>-/* 00A3 */ 0x00035408,0x00000000,0x00025418,0x000a0ec0,</div><div class='del'>-/* 00A5 */ 0x0001443d,0x000ca21e,0x00046595,0x000d730c,</div><div class='del'>-/* 00A7 */ 0x0006538e,0x00000000,0x00064630,0x00001005,</div><div class='del'>-/* 00A9 */ 0x000e7b0e,0x000df782,0x000746b0,0x00001005,</div><div class='del'>-/* 00AB */ 0x00036f05,0x000c0000,0x00043695,0x000d598c,</div><div class='del'>-/* 00AD */ 0x0005331a,0x000f2185,0x00000000,0x00000000,</div><div class='del'>-/* 00AF */ 0x000007ae,0x000bdb00,0x00040630,0x00001400,</div><div class='del'>-/* 00B1 */ 0x0005e708,0x000c0000,0x0007ef30,0x000b1c00,</div><div class='del'>-/* 00B3 */ 0x000d86a0,0x00001005,0x00066408,0x000c0000,</div><div class='del'>-/* 00B5 */ 0x00000000,0x00000000,0x00021843,0x00000000,</div><div class='del'>-/* 00B7 */ 0x00000cac,0x00062c00,0x00001dac,0x00063400,</div><div class='del'>-/* 00B9 */ 0x00002cac,0x0006cc80,0x000db943,0x000e5ca1,</div><div class='del'>-/* 00BB */ 0x00000000,0x00000000,0x0006680a,0x000f3205,</div><div class='del'>-/* 00BD */ 0x00042730,0x00001400,</div><div class='del'>-/* ASYNCHFGRXCODE */</div><div class='del'>-/* 00BE */ 0x00014108,0x000f2204,0x00025418,0x000a2ec0,</div><div class='del'>-/* 00C0 */ 0x00015dbd,0x00038100,0x00015dbc,0x00000000,</div><div class='del'>-/* 00C2 */ 0x0005e415,0x00034880,0x0001258a,0x000d730c,</div><div class='del'>-/* 00C4 */ 0x0006538e,0x000baa40,0x00060630,0x00001006,</div><div class='del'>-/* 00C6 */ 0x00067b0e,0x000ac380,0x0003ef05,0x00000000,</div><div class='del'>-/* 00C8 */ 0x0000f734,0x0001c300,0x000586b0,0x00001400,</div><div class='del'>-/* 00CA */ 0x000b6f05,0x000c3a00,0x00048f05,0x00000000,</div><div class='del'>-/* 00CC */ 0x0005b695,0x0008c380,0x0002058e,0x00000000,</div><div class='del'>-/* 00CE */ 0x000500b0,0x00001400,0x0002b318,0x000e998d,</div><div class='del'>-/* 00D0 */ 0x0006430a,0x00000000,0x00000000,0x000ef384,</div><div class='del'>-/* 00D2 */ 0x00004725,0x000c0000,0x00000000,0x000f3204,</div><div class='del'>-/* 00D4 */ 0x00004f25,0x000c0000,0x00080000,0x000e5ca1,</div><div class='del'>-/* 00D6 */ 0x000cb943,0x000e5ca1,0x0004b943,0x00000000,</div><div class='del'>-/* 00D8 */ 0x00040730,0x00001400,0x000cb943,0x000e5ca1,</div><div class='del'>-/* 00DA */ 0x0004b943,0x00000000</div><div class='del'>-};</div><div class='del'>-/* #CODE_END */</div><div class='del'>-</div><div class='del'>-static struct dsp_segment_desc cwcasync_segments[] = {</div><div class='del'>-  { SEGTYPE_SP_PROGRAM, 0x00000000, 0x000001b6, cwcasync_code },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsp_module_desc cwcasync_module = {</div><div class='del'>-  "cwcasync",</div><div class='del'>-  {</div><div class='del'>-    32,</div><div class='del'>-    cwcasync_symbols</div><div class='del'>-  },</div><div class='del'>-  1,</div><div class='del'>-  cwcasync_segments,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __HEADER_cwcasync_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwcbinhack.h b/sound/pci/cs46xx/imgs/cwcbinhack.h<br/>deleted file mode 100644<br/>index f4d93689cd49..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwcbinhack.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcbinhack.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* generated by Benny </div><div class='del'>-   MODIFY ON YOUR OWN RISK */</div><div class='del'>-</div><div class='del'>-#ifndef __HEADER_cwcbinhack_H__</div><div class='del'>-#define __HEADER_cwcbinhack_H__</div><div class='del'>-</div><div class='del'>-static struct dsp_symbol_entry cwcbinhack_symbols[] = {</div><div class='del'>-  { 0x02c8, "OVERLAYBEGINADDRESS",0x00 },</div><div class='del'>-  { 0x02c8, "MAGICSNOOPTASK",0x03 },</div><div class='del'>-  { 0x0308, "#CODE_END",0x00 },</div><div class='del'>-}; /* cwcbinhack symbols */</div><div class='del'>-</div><div class='del'>-static u32 cwcbinhack_code[] = {</div><div class='del'>-  /* 0x02c8 */</div><div class='del'>-  0x0007bfb0,0x000bc240,0x00000c2e,0x000c6084, /* 1 */</div><div class='del'>-  0x000b8630,0x00001016,0x00006408,0x000efb84, /* 2 */</div><div class='del'>-  0x00016008,0x00000000,0x0001c088,0x000c0000, /* 3 */</div><div class='del'>-  0x000fc908,0x000e3392,0x0005f488,0x000efb84, /* 4 */</div><div class='del'>-  0x0001d402,0x000b2e00,0x0003d418,0x00001000, /* 5 */</div><div class='del'>-  0x0008d574,0x000c4293,0x00065625,0x000ea30e, /* 6 */</div><div class='del'>-  0x00096c01,0x000c6f92,0x0001a58a,0x000c6085, /* 7 */</div><div class='del'>-  0x00002f43,0x00000000,0x000e03a0,0x00001016, /* 8 */</div><div class='del'>-  0x0005e608,0x000c0000,0x00000000,0x00000000, /* 9 */</div><div class='del'>-  0x000ca108,0x000dcca1,0x00003bac,0x000c3205, /* 10 */</div><div class='del'>-  0x00073843,0x00000000,0x00010730,0x00001017, /* 11 */</div><div class='del'>-  0x0001600a,0x000c0000,0x00057488,0x00000000, /* 12 */</div><div class='del'>-  0x00000000,0x000e5084,0x00000000,0x000eba44, /* 13 */</div><div class='del'>-  0x00087401,0x000e4782,0x00000734,0x00001000, /* 14 */</div><div class='del'>-  0x00010705,0x000a6880,0x00006a88,0x000c75c4, /* 15 */</div><div class='del'>-  0x00000000,0x00000000,0x00000000,0x00000000, /* 16 */</div><div class='del'>-};</div><div class='del'>-/* #CODE_END */</div><div class='del'>-</div><div class='del'>-static struct dsp_segment_desc cwcbinhack_segments[] = {</div><div class='del'>-  { SEGTYPE_SP_PROGRAM, 0x00000000, 64, cwcbinhack_code },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsp_module_desc cwcbinhack_module = {</div><div class='del'>-  "cwcbinhack",</div><div class='del'>-  {</div><div class='del'>-    3,</div><div class='del'>-    cwcbinhack_symbols</div><div class='del'>-  },</div><div class='del'>-  1,</div><div class='del'>-  cwcbinhack_segments,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __HEADER_cwcbinhack_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwcdma.asp b/sound/pci/cs46xx/imgs/cwcdma.asp<br/>deleted file mode 100644<br/>index a65e1193c89a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwcdma.asp?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcdma.asp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,170 +0,0 @@</div><div class='del'>-// </div><div class='del'>-//  Copyright(c) by Benny Sjostrand (benny@hostmobility.com)</div><div class='del'>-//</div><div class='del'>-//  This program is free software; you can redistribute it and/or modify</div><div class='del'>-//  it under the terms of the GNU General Public License as published by</div><div class='del'>-//  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-//  (at your option) any later version.</div><div class='del'>-//</div><div class='del'>-//  This program is distributed in the hope that it will be useful,</div><div class='del'>-//  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-//  GNU General Public License for more details.</div><div class='del'>-//</div><div class='del'>-//  You should have received a copy of the GNU General Public License</div><div class='del'>-//  along with this program; if not, write to the Free Software</div><div class='del'>-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>-//</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-//</div><div class='del'>-// This code runs inside the DSP (cs4610, cs4612, cs4624, or cs4630),</div><div class='del'>-// to compile it you need a tool named SPASM 3.0 and DSP code owned by </div><div class='del'>-// Cirrus Logic(R). The SPASM program will generate a object file (cwcdma.osp),</div><div class='del'>-// the "ospparser"  tool will genereate the cwcdma.h file it's included from</div><div class='del'>-// the cs46xx_lib.c file.</div><div class='del'>-//</div><div class='del'>-//</div><div class='del'>-// The purpose of this code is very simple: make it possible to tranfser</div><div class='del'>-// the samples 'as they are' with no alteration from a PCMreader</div><div class='del'>-// SCB (DMA from host) to any other SCB. This is useful for AC3 through SPDIF.</div><div class='del'>-// SRC (source rate converters) task always alters the samples in somehow,</div><div class='del'>-// however it's from 48khz -&gt; 48khz.</div><div class='del'>-// The alterations are not audible, but AC3 wont work. </div><div class='del'>-//</div><div class='del'>-//        ...</div><div class='del'>-//         |</div><div class='del'>-// +---------------+</div><div class='del'>-// | AsynchFGTxSCB |</div><div class='del'>-// +---------------+</div><div class='del'>-//        |</div><div class='del'>-//    subListPtr</div><div class='del'>-//        |</div><div class='del'>-// +--------------+</div><div class='del'>-// |   DMAReader  |</div><div class='del'>-// +--------------+</div><div class='del'>-//        |</div><div class='del'>-//    subListPtr</div><div class='del'>-//        |</div><div class='del'>-// +-------------+</div><div class='del'>-// | PCMReader   |</div><div class='del'>-// +-------------+</div><div class='del'>-// (DMA from host)</div><div class='del'>-//</div><div class='del'>-</div><div class='del'>-struct dmaSCB</div><div class='del'>-  {</div><div class='del'>-    long  dma_reserved1[3];</div><div class='del'>-</div><div class='del'>-    short dma_reserved2:dma_outBufPtr;</div><div class='del'>-</div><div class='del'>-    short dma_unused1:dma_unused2;</div><div class='del'>-</div><div class='del'>-    long  dma_reserved3[4];</div><div class='del'>-</div><div class='del'>-    short dma_subListPtr:dma_nextSCB;</div><div class='del'>-    short dma_SPBptr:dma_entryPoint;</div><div class='del'>-</div><div class='del'>-    long  dma_strmRsConfig;</div><div class='del'>-    long  dma_strmBufPtr;</div><div class='del'>-</div><div class='del'>-    long  dma_reserved4;</div><div class='del'>-</div><div class='del'>-    VolumeControl s2m_volume;</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-#export DMAReader</div><div class='del'>-void DMAReader()</div><div class='del'>-{</div><div class='del'>-  execChild();</div><div class='del'>-  r2 = r0-&gt;dma_subListPtr;</div><div class='del'>-  r1 = r0-&gt;nextSCB;</div><div class='del'>-	</div><div class='del'>-  rsConfig01 = r2-&gt;strmRsConfig;</div><div class='del'>-  // Load rsConfig for input buffer</div><div class='del'>-</div><div class='del'>-  rsDMA01 = r2-&gt;basicReq.daw,       ,                   tb = Z(0 - rf);</div><div class='del'>-  // Load rsDMA in case input buffer is a DMA buffer    Test to see if there is any data to transfer</div><div class='del'>-</div><div class='del'>-  if (tb) goto execSibling_2ind1 after {</div><div class='del'>-      r5 = rf + (-1);</div><div class='del'>-      r6 = r1-&gt;dma_entryPoint;           // r6 = entry point of sibling task</div><div class='del'>-      r1 = r1-&gt;dma_SPBptr,               // r1 = pointer to sibling task's SPB</div><div class='del'>-          ,   ind = r6;                  // Load entry point of sibling task</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  rsConfig23 = r0-&gt;dma_strmRsConfig;</div><div class='del'>-  // Load rsConfig for output buffer (never a DMA buffer)</div><div class='del'>-</div><div class='del'>-  r4 = r0-&gt;dma_outBufPtr;</div><div class='del'>-</div><div class='del'>-  rsa0 = r2-&gt;strmBufPtr;</div><div class='del'>-  // rsa0 = input buffer pointer                        </div><div class='del'>-</div><div class='del'>-  for (i = r5; i &gt;= 0; --i)</div><div class='del'>-    after {</div><div class='del'>-      rsa2 = r4;</div><div class='del'>-      // rsa2 = output buffer pointer</div><div class='del'>-</div><div class='del'>-      nop;</div><div class='del'>-      nop;</div><div class='del'>-    }</div><div class='del'>-  //*****************************</div><div class='del'>-  // TODO: cycles to this point *</div><div class='del'>-  //*****************************</div><div class='del'>-    {</div><div class='del'>-      acc0 =  (rsd0 = *rsa0++1);</div><div class='del'>-      // get sample</div><div class='del'>-</div><div class='del'>-      nop;  // Those "nop"'s are really uggly, but there's</div><div class='del'>-      nop;  // something with DSP's pipelines which I don't</div><div class='del'>-      nop;  // understand, resulting this code to fail without</div><div class='del'>-            // having those "nop"'s (Benny)</div><div class='del'>-</div><div class='del'>-      rsa0?reqDMA = r2;</div><div class='del'>-      // Trigger DMA transfer on input stream, </div><div class='del'>-      // if needed to replenish input buffer</div><div class='del'>-</div><div class='del'>-      nop;</div><div class='del'>-      // Yet another magic "nop" to make stuff work</div><div class='del'>-</div><div class='del'>-      ,,r98 = acc0 $+&gt;&gt; 0;</div><div class='del'>-      // store sample in ALU</div><div class='del'>-</div><div class='del'>-      nop;</div><div class='del'>-      // latency on load register.</div><div class='del'>-      // (this one is understandable)</div><div class='del'>-</div><div class='del'>-      *rsa2++1 = r98;</div><div class='del'>-      // store sample in output buffer</div><div class='del'>-</div><div class='del'>-      nop; // The same story</div><div class='del'>-      nop; // as above again ...</div><div class='del'>-      nop;</div><div class='del'>-    }</div><div class='del'>-  // TODO: cycles per loop iteration</div><div class='del'>-</div><div class='del'>-  r2-&gt;strmBufPtr = rsa0,,   ;</div><div class='del'>-  // Update the modified buffer pointers</div><div class='del'>-</div><div class='del'>-  r4 = rsa2;</div><div class='del'>-  // Load output pointer position into r4</div><div class='del'>-</div><div class='del'>-  r2 = r0-&gt;nextSCB;</div><div class='del'>-  // Sibling task</div><div class='del'>-</div><div class='del'>-  goto execSibling_2ind1 // takes 6 cycles</div><div class='del'>-    after {</div><div class='del'>-      r98 = r2-&gt;thisSPB:entryPoint;</div><div class='del'>-      // Load child routine entry and data address </div><div class='del'>-</div><div class='del'>-      r1 = r9;</div><div class='del'>-      // r9 is r2-&gt;thisSPB</div><div class='del'>-</div><div class='del'>-      r0-&gt;dma_outBufPtr = r4,,</div><div class='del'>-      // Store updated output buffer pointer</div><div class='del'>-</div><div class='del'>-      ind = r8;</div><div class='del'>-      // r8 is r2-&gt;entryPoint</div><div class='del'>-    }</div><div class='del'>-}</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwcdma.h b/sound/pci/cs46xx/imgs/cwcdma.h<br/>deleted file mode 100644<br/>index 7ff0d4587161..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwcdma.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcdma.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* generated from cwcdma.osp DO NOT MODIFY */</div><div class='del'>-</div><div class='del'>-#ifndef __HEADER_cwcdma_H__</div><div class='del'>-#define __HEADER_cwcdma_H__</div><div class='del'>-</div><div class='del'>-static struct dsp_symbol_entry cwcdma_symbols[] = {</div><div class='del'>-  { 0x8000, "EXECCHILD",0x03 },</div><div class='del'>-  { 0x8001, "EXECCHILD_98",0x03 },</div><div class='del'>-  { 0x8003, "EXECCHILD_PUSH1IND",0x03 },</div><div class='del'>-  { 0x8008, "EXECSIBLING",0x03 },</div><div class='del'>-  { 0x800a, "EXECSIBLING_298",0x03 },</div><div class='del'>-  { 0x800b, "EXECSIBLING_2IND1",0x03 },</div><div class='del'>-  { 0x8010, "TIMINGMASTER",0x03 },</div><div class='del'>-  { 0x804f, "S16_CODECINPUTTASK",0x03 },</div><div class='del'>-  { 0x805e, "PCMSERIALINPUTTASK",0x03 },</div><div class='del'>-  { 0x806d, "S16_MIX_TO_OSTREAM",0x03 },</div><div class='del'>-  { 0x809a, "S16_MIX",0x03 },</div><div class='del'>-  { 0x80bb, "S16_UPSRC",0x03 },</div><div class='del'>-  { 0x813b, "MIX3_EXP",0x03 },</div><div class='del'>-  { 0x8164, "DECIMATEBYPOW2",0x03 },</div><div class='del'>-  { 0x8197, "VARIDECIMATE",0x03 },</div><div class='del'>-  { 0x81f2, "_3DINPUTTASK",0x03 },</div><div class='del'>-  { 0x820a, "_3DPRLGCINPTASK",0x03 },</div><div class='del'>-  { 0x8227, "_3DSTEREOINPUTTASK",0x03 },</div><div class='del'>-  { 0x8242, "_3DOUTPUTTASK",0x03 },</div><div class='del'>-  { 0x82c4, "HRTF_MORPH_TASK",0x03 },</div><div class='del'>-  { 0x82c6, "WAIT4DATA",0x03 },</div><div class='del'>-  { 0x82fa, "PROLOGIC",0x03 },</div><div class='del'>-  { 0x8496, "DECORRELATOR",0x03 },</div><div class='del'>-  { 0x84a4, "STEREO2MONO",0x03 },</div><div class='del'>-  { 0x0000, "OVERLAYBEGINADDRESS",0x00 },</div><div class='del'>-  { 0x0000, "DMAREADER",0x03 },</div><div class='del'>-  { 0x0018, "#CODE_END",0x00 },</div><div class='del'>-}; /* cwcdma symbols */</div><div class='del'>-</div><div class='del'>-static u32 cwcdma_code[] = {</div><div class='del'>-/* OVERLAYBEGINADDRESS */</div><div class='del'>-/* 0000 */ 0x00002731,0x00001400,0x0004c108,0x000e5044,</div><div class='del'>-/* 0002 */ 0x0005f608,0x00000000,0x000007ae,0x000be300,</div><div class='del'>-/* 0004 */ 0x00058630,0x00001400,0x0007afb0,0x000e9584,</div><div class='del'>-/* 0006 */ 0x00007301,0x000a9840,0x0005e708,0x000cd104,</div><div class='del'>-/* 0008 */ 0x00067008,0x00000000,0x000902a0,0x00001000,</div><div class='del'>-/* 000A */ 0x00012a01,0x000c0000,0x00000000,0x00000000,</div><div class='del'>-/* 000C */ 0x00021843,0x000c0000,0x00000000,0x000c0000,</div><div class='del'>-/* 000E */ 0x0000e101,0x000c0000,0x00000cac,0x00000000,</div><div class='del'>-/* 0010 */ 0x00080000,0x000e5ca1,0x00000000,0x000c0000,</div><div class='del'>-/* 0012 */ 0x00000000,0x00000000,0x00000000,0x00092c00,</div><div class='del'>-/* 0014 */ 0x000122c1,0x000e5084,0x00058730,0x00001400,</div><div class='del'>-/* 0016 */ 0x000d7488,0x000e4782,0x00007401,0x0001c100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* #CODE_END */</div><div class='del'>-</div><div class='del'>-static struct dsp_segment_desc cwcdma_segments[] = {</div><div class='del'>-  { SEGTYPE_SP_PROGRAM, 0x00000000, 0x00000030, cwcdma_code },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsp_module_desc cwcdma_module = {</div><div class='del'>-  "cwcdma",</div><div class='del'>-  {</div><div class='del'>-    27,</div><div class='del'>-    cwcdma_symbols</div><div class='del'>-  },</div><div class='del'>-  1,</div><div class='del'>-  cwcdma_segments,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __HEADER_cwcdma_H__ */</div><div class='head'>diff --git a/sound/pci/cs46xx/imgs/cwcsnoop.h b/sound/pci/cs46xx/imgs/cwcsnoop.h<br/>deleted file mode 100644<br/>index 6929d0a5a3f3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs46xx/imgs/cwcsnoop.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs46xx/imgs/cwcsnoop.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* generated from cwcsnoop.osp DO NOT MODIFY */</div><div class='del'>-</div><div class='del'>-#ifndef __HEADER_cwcsnoop_H__</div><div class='del'>-#define __HEADER_cwcsnoop_H__</div><div class='del'>-</div><div class='del'>-static struct dsp_symbol_entry cwcsnoop_symbols[] = {</div><div class='del'>-  { 0x0500, "OVERLAYBEGINADDRESS",0x00 },</div><div class='del'>-  { 0x0500, "OUTPUTSNOOP",0x03 },</div><div class='del'>-  { 0x051f, "#CODE_END",0x00 },</div><div class='del'>-}; /* cwcsnoop symbols */</div><div class='del'>-</div><div class='del'>-static u32 cwcsnoop_code[] = {</div><div class='del'>-/* 0000 */ 0x0007bfb0,0x000b4e40,0x0007c088,0x000c0617,</div><div class='del'>-/* 0002 */ 0x00049705,0x00000000,0x00080630,0x00001028,</div><div class='del'>-/* 0004 */ 0x00076408,0x000efb84,0x00066008,0x00000000,</div><div class='del'>-/* 0006 */ 0x0007c908,0x000c0000,0x00046725,0x000efa44,</div><div class='del'>-/* 0008 */ 0x0005f708,0x00000000,0x0001d402,0x000b2e00,</div><div class='del'>-/* 000A */ 0x0003d418,0x00001000,0x0008d574,0x000c4293,</div><div class='del'>-/* 000C */ 0x00065625,0x000ea30e,0x00096c01,0x000c6f92,</div><div class='del'>-/* 000E */ 0x0006a58a,0x000f6085,0x00002f43,0x00000000,</div><div class='del'>-/* 0010 */ 0x000a83a0,0x00001028,0x0005e608,0x000c0000,</div><div class='del'>-/* 0012 */ 0x00000000,0x00000000,0x000ca108,0x000dcca1,</div><div class='del'>-/* 0014 */ 0x00003bac,0x000fb205,0x00073843,0x00000000,</div><div class='del'>-/* 0016 */ 0x000d8730,0x00001028,0x0006600a,0x000c0000,</div><div class='del'>-/* 0018 */ 0x00057488,0x00000000,0x00000000,0x000e5084,</div><div class='del'>-/* 001A */ 0x00000000,0x000eba44,0x00087401,0x000e4782,</div><div class='del'>-/* 001C */ 0x00000734,0x00001000,0x00010705,0x000a6880,</div><div class='del'>-/* 001E */ 0x00006a88,0x000c75c4</div><div class='del'>-};</div><div class='del'>-/* #CODE_END */</div><div class='del'>-</div><div class='del'>-static struct dsp_segment_desc cwcsnoop_segments[] = {</div><div class='del'>-  { SEGTYPE_SP_PROGRAM, 0x00000000, 0x0000003e, cwcsnoop_code },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct dsp_module_desc cwcsnoop_module = {</div><div class='del'>-  "cwcsnoop",</div><div class='del'>-  {</div><div class='del'>-    3,</div><div class='del'>-    cwcsnoop_symbols</div><div class='del'>-  },</div><div class='del'>-  1,</div><div class='del'>-  cwcsnoop_segments,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __HEADER_cwcsnoop_H__ */</div><div class='head'>diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c<br/>index bc07e275d4d4..292b65aa758a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5530.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5530.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5530.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5530.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio</div><div class='ctx'>  *</div><div class='hunk'>@@ -21,23 +22,13 @@</div><div class='ctx'>  * Thanks to National Semiconductor for providing the needed information</div><div class='ctx'>  * on the XpressAudio(tm) internals.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the</div><div class='del'>- * Free Software Foundation; either version 2, or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  * TO DO:</div><div class='ctx'>  *	Investigate whether we can portably support Cognac (5520) in the</div><div class='ctx'>  *	same manner.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -50,7 +41,14 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for CS5530 Audio driver.");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for CS5530 Audio driver.");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable CS5530 Audio driver.");</div><div class='ctx'> </div><div class='ctx'> struct snd_cs5530 {</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -59,7 +57,7 @@ struct snd_cs5530 {</div><div class='ctx'> 	unsigned long pci_base;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = {</div><div class='add'>+static const struct pci_device_id snd_cs5530_ids[] = {</div><div class='ctx'> 	{PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID,</div><div class='ctx'> 							PCI_ANY_ID, 0, 0},</div><div class='ctx'> 	{0,}</div><div class='hunk'>@@ -67,27 +65,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_cs5530_ids);</div><div class='ctx'> </div><div class='del'>-static int snd_cs5530_free(struct snd_cs5530 *chip)</div><div class='del'>-{</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs5530_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_cs5530 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_cs5530_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit snd_cs5530_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 __devinit snd_cs5530_mixer_read(unsigned long io, u8 reg)</div><div class='add'>+static u8 snd_cs5530_mixer_read(unsigned long io, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	outb(reg, io + 4);</div><div class='ctx'> 	udelay(20);</div><div class='hunk'>@@ -96,52 +74,28 @@ static u8 __devinit snd_cs5530_mixer_read(unsigned long io, u8 reg)</div><div class='ctx'> 	return reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs5530_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci,</div><div class='del'>-				       struct snd_cs5530 **rchip)</div><div class='add'>+static int snd_cs5530_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct snd_cs5530 *chip;</div><div class='add'>+	struct snd_cs5530 *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned long sb_base;</div><div class='ctx'> 	u8 irq, dma8, dma16 = 0;</div><div class='ctx'> 	u16 map;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_cs5530_dev_free,</div><div class='del'>-	};</div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'>  	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pci, "CS5530");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(chip); </div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	mem = pcim_iomap_region(pci, 0, "CS5530");</div><div class='add'>+	if (IS_ERR(mem))</div><div class='add'>+		return PTR_ERR(mem);</div><div class='ctx'> 	chip-&gt;pci_base = pci_resource_start(pci, 0);</div><div class='del'>-</div><div class='del'>-	mem = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (mem == NULL) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	map = readw(mem + 0x18);</div><div class='del'>-	iounmap(mem);</div><div class='ctx'> </div><div class='ctx'> 	/* Map bits</div><div class='ctx'> 		0:1	* 0x20 + 0x200 = sb base</div><div class='hunk'>@@ -155,17 +109,16 @@ static int __devinit snd_cs5530_create(struct snd_card *card,</div><div class='ctx'> 	sb_base = 0x220 + 0x20 * (map &amp; 3);</div><div class='ctx'> </div><div class='ctx'> 	if (map &amp; (1&lt;&lt;2))</div><div class='del'>-		printk(KERN_INFO "CS5530: XpressAudio at 0x%lx\n", sb_base);</div><div class='add'>+		dev_info(card-&gt;dev, "XpressAudio at 0x%lx\n", sb_base);</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_ERR "Could not find XpressAudio!\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "Could not find XpressAudio!\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (map &amp; (1&lt;&lt;5))</div><div class='del'>-		printk(KERN_INFO "CS5530: MPU at 0x300\n");</div><div class='add'>+		dev_info(card-&gt;dev, "MPU at 0x300\n");</div><div class='ctx'> 	else if (map &amp; (1&lt;&lt;6))</div><div class='del'>-		printk(KERN_INFO "CS5530: MPU at 0x330\n");</div><div class='add'>+		dev_info(card-&gt;dev, "MPU at 0x330\n");</div><div class='ctx'> </div><div class='ctx'> 	irq = snd_cs5530_mixer_read(sb_base, 0x80) &amp; 0x0F;</div><div class='ctx'> 	dma8 = snd_cs5530_mixer_read(sb_base, 0x81);</div><div class='hunk'>@@ -177,8 +130,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,</div><div class='ctx'> 	else if (dma8 &amp; 0x80)</div><div class='ctx'> 		dma16 = 7;</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_ERR "CS5530: No 16bit DMA enabled\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "No 16bit DMA enabled\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -189,8 +141,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,</div><div class='ctx'> 	else if (dma8 &amp; 0x08)</div><div class='ctx'> 		dma8 = 3;</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_ERR "CS5530: No 8bit DMA enabled\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "No 8bit DMA enabled\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -203,53 +154,40 @@ static int __devinit snd_cs5530_create(struct snd_card *card,</div><div class='ctx'> 	else if (irq &amp; 8)</div><div class='ctx'> 		irq = 10;</div><div class='ctx'> 	else {</div><div class='del'>-		printk(KERN_ERR "CS5530: SoundBlaster IRQ not set\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "SoundBlaster IRQ not set\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	printk(KERN_INFO "CS5530: IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, </div><div class='del'>-									dma16);</div><div class='add'>+	dev_info(card-&gt;dev, "IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, dma16);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_sbdsp_create(card, sb_base, irq, snd_sb16dsp_interrupt, dma8,</div><div class='ctx'> 						dma16, SB_HW_CS5530, &amp;chip-&gt;sb);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "CS5530: Could not create SoundBlaster\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "Could not create SoundBlaster\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_sb16dsp_pcm(chip-&gt;sb, 0, &amp;chip-&gt;sb-&gt;pcm);</div><div class='add'>+	err = snd_sb16dsp_pcm(chip-&gt;sb, 0);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "CS5530: Could not create PCM\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "Could not create PCM\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_sbmixer_new(chip-&gt;sb);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "CS5530: Could not create Mixer\n");</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_cs5530_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "Could not create Mixer\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs5530_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_cs5530_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='del'>-	struct snd_cs5530 *chip = NULL;</div><div class='add'>+	struct snd_cs5530 *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='hunk'>@@ -259,48 +197,32 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='del'>-</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	err = snd_cs5530_create(card, pci, &amp;chip);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_cs5530_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "CS5530");</div><div class='del'>-	strcpy(card-&gt;shortname, "CS5530 Audio");</div><div class='add'>+	strscpy(card-&gt;driver, "CS5530");</div><div class='add'>+	strscpy(card-&gt;shortname, "CS5530 Audio");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx", card-&gt;shortname, chip-&gt;pci_base);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "CS5530_Audio",</div><div class='add'>+static struct pci_driver cs5530_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_cs5530_ids,</div><div class='ctx'> 	.probe = snd_cs5530_probe,</div><div class='del'>-	.remove = __devexit_p(snd_cs5530_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_cs5530_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cs5530_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cs5530_init)</div><div class='del'>-module_exit(alsa_card_cs5530_exit)</div><div class='del'>-</div><div class='add'>+module_pci_driver(cs5530_driver);</div><div class='head'>diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile<br/>index ccc642269b9e..447e628751a2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for cs5535audio</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o</div><div class='del'>-snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o</div><div class='add'>+snd-cs5535audio-$(CONFIG_PM_SLEEP) += cs5535audio_pm.o</div><div class='ctx'> snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='head'>diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c<br/>index afb803708416..0ebf6c02b1ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/cs5535audio.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for audio on multifunction CS5535/6 companion device</div><div class='ctx'>  * Copyright (C) Jaya Kumar</div><div class='ctx'>  *</div><div class='ctx'>  * Based on Jaroslav Kysela and Takashi Iwai's examples.</div><div class='ctx'>  * This work was sponsored by CIS(M) Sdn Bhd.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -26,8 +12,8 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -43,7 +29,7 @@ static char *ac97_quirk;</div><div class='ctx'> module_param(ac97_quirk, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");</div><div class='ctx'> </div><div class='del'>-static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='add'>+static const struct ac97_quirk ac97_quirks[] = {</div><div class='ctx'> #if 0 /* Not yet confirmed if all 5536 boards are HP only */</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = PCI_VENDOR_ID_AMD, </div><div class='hunk'>@@ -57,7 +43,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME);</div><div class='hunk'>@@ -66,7 +52,7 @@ MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_cs5535audio_ids) = {</div><div class='add'>+static const struct pci_device_id snd_cs5535audio_ids[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },</div><div class='ctx'> 	{}</div><div class='hunk'>@@ -84,7 +70,8 @@ static void wait_till_cmd_acked(struct cs5535audio *cs5535au, unsigned long time</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> 	if (!timeout)</div><div class='del'>-		snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev,</div><div class='add'>+			"Failure writing to cs5535 codec\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,</div><div class='hunk'>@@ -109,8 +96,9 @@ static unsigned short snd_cs5535audio_codec_read(struct cs5535audio *cs5535au,</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> 	if (!timeout)</div><div class='del'>-		snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"</div><div class='del'>-					"Last value=0x%x\n", reg, val);</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev,</div><div class='add'>+			"Failure reading codec reg 0x%x, Last value=0x%x\n",</div><div class='add'>+			reg, val);</div><div class='ctx'> </div><div class='ctx'> 	return (unsigned short) val;</div><div class='ctx'> }</div><div class='hunk'>@@ -144,18 +132,19 @@ static unsigned short snd_cs5535audio_ac97_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> 	return snd_cs5535audio_codec_read(cs5535au, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)</div><div class='add'>+static int snd_cs5535audio_mixer(struct cs5535audio *cs5535au)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = cs5535au-&gt;card;</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_cs5535audio_ac97_codec_write,</div><div class='ctx'> 		.read = snd_cs5535audio_ac97_codec_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='hunk'>@@ -167,8 +156,9 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)</div><div class='ctx'> 	/* set any OLPC-specific scaps */</div><div class='ctx'> 	olpc_prequirks(card, &amp;ac97);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;cs5535au-&gt;ac97)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "mixer failed\n");</div><div class='add'>+	err = snd_ac97_mixer(pbus, &amp;ac97, &amp;cs5535au-&gt;ac97);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "mixer failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -176,7 +166,7 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)</div><div class='ctx'> </div><div class='ctx'> 	err = olpc_quirks(card, cs5535au-&gt;ac97);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "olpc quirks failed\n");</div><div class='add'>+		dev_err(card-&gt;dev, "olpc quirks failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -186,30 +176,28 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)</div><div class='ctx'> static void process_bm0_irq(struct cs5535audio *cs5535au)</div><div class='ctx'> {</div><div class='ctx'> 	u8 bm_stat;</div><div class='del'>-	spin_lock(&amp;cs5535au-&gt;reg_lock);</div><div class='del'>-	bm_stat = cs_readb(cs5535au, ACC_BM0_STATUS);</div><div class='del'>-	spin_unlock(&amp;cs5535au-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;cs5535au-&gt;reg_lock) {</div><div class='add'>+		bm_stat = cs_readb(cs5535au, ACC_BM0_STATUS);</div><div class='add'>+	}</div><div class='ctx'> 	if (bm_stat &amp; EOP) {</div><div class='del'>-		struct cs5535audio_dma *dma;</div><div class='del'>-		dma = cs5535au-&gt;playback_substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 		snd_pcm_period_elapsed(cs5535au-&gt;playback_substream);</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR "unexpected bm0 irq src, bm_stat=%x\n",</div><div class='del'>-					bm_stat);</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev,</div><div class='add'>+			"unexpected bm0 irq src, bm_stat=%x\n",</div><div class='add'>+			bm_stat);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void process_bm1_irq(struct cs5535audio *cs5535au)</div><div class='ctx'> {</div><div class='ctx'> 	u8 bm_stat;</div><div class='del'>-	spin_lock(&amp;cs5535au-&gt;reg_lock);</div><div class='del'>-	bm_stat = cs_readb(cs5535au, ACC_BM1_STATUS);</div><div class='del'>-	spin_unlock(&amp;cs5535au-&gt;reg_lock);</div><div class='del'>-	if (bm_stat &amp; EOP) {</div><div class='del'>-		struct cs5535audio_dma *dma;</div><div class='del'>-		dma = cs5535au-&gt;capture_substream-&gt;runtime-&gt;private_data;</div><div class='del'>-		snd_pcm_period_elapsed(cs5535au-&gt;capture_substream);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock, &amp;cs5535au-&gt;reg_lock) {</div><div class='add'>+		bm_stat = cs_readb(cs5535au, ACC_BM1_STATUS);</div><div class='ctx'> 	}</div><div class='add'>+	if (bm_stat &amp; EOP)</div><div class='add'>+		snd_pcm_period_elapsed(cs5535au-&gt;capture_substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -241,8 +229,9 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				process_bm1_irq(cs5535au);</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				snd_printk(KERN_ERR "Unexpected irq src: "</div><div class='del'>-						"0x%x\n", acc_irq_stat);</div><div class='add'>+				dev_err(cs5535au-&gt;card-&gt;dev,</div><div class='add'>+					"Unexpected irq src: 0x%x\n",</div><div class='add'>+					acc_irq_stat);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -250,52 +239,24 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_cs5535audio_free(struct cs5535audio *cs5535au)</div><div class='add'>+static void snd_cs5535audio_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	synchronize_irq(cs5535au-&gt;irq);</div><div class='del'>-	pci_set_power_state(cs5535au-&gt;pci, 3);</div><div class='del'>-</div><div class='del'>-	if (cs5535au-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(cs5535au-&gt;irq, cs5535au);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(cs5535au-&gt;pci);</div><div class='del'>-	pci_disable_device(cs5535au-&gt;pci);</div><div class='del'>-	kfree(cs5535au);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_cs5535audio_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct cs5535audio *cs5535au = device-&gt;device_data;</div><div class='del'>-	return snd_cs5535audio_free(cs5535au);</div><div class='add'>+	olpc_quirks_cleanup();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs5535audio_create(struct snd_card *card,</div><div class='del'>-					    struct pci_dev *pci,</div><div class='del'>-					    struct cs5535audio **rcs5535au)</div><div class='add'>+static int snd_cs5535audio_create(struct snd_card *card,</div><div class='add'>+				  struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct cs5535audio *cs5535au;</div><div class='del'>-</div><div class='add'>+	struct cs5535audio *cs5535au = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_cs5535audio_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rcs5535au = NULL;</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='del'>-		printk(KERN_WARNING "unable to get 32bit dma\n");</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto pcifail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cs5535au = kzalloc(sizeof(*cs5535au), GFP_KERNEL);</div><div class='del'>-	if (cs5535au == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto pcifail;</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+		dev_warn(card-&gt;dev, "unable to get 32bit dma\n");</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;cs5535au-&gt;reg_lock);</div><div class='hunk'>@@ -303,43 +264,27 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,</div><div class='ctx'> 	cs5535au-&gt;pci = pci;</div><div class='ctx'> 	cs5535au-&gt;irq = -1;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "CS5535 Audio")) &lt; 0) {</div><div class='del'>-		kfree(cs5535au);</div><div class='del'>-		goto pcifail;</div><div class='del'>-	}</div><div class='add'>+	err = pcim_request_all_regions(pci, "CS5535 Audio");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	cs5535au-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_cs5535audio_interrupt,</div><div class='del'>-			IRQF_SHARED, "CS5535 Audio", cs5535au)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto sndfail;</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_cs5535audio_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cs5535au-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = cs5535au-&gt;irq;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,</div><div class='del'>-				  cs5535au, &amp;ops)) &lt; 0)</div><div class='del'>-		goto sndfail;</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rcs5535au = cs5535au;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-sndfail: /* leave the device alive, just kill the snd */</div><div class='del'>-	snd_cs5535audio_free(cs5535au);</div><div class='del'>-	return err;</div><div class='del'>-</div><div class='del'>-pcifail:</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,</div><div class='del'>-					   const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_cs5535audio_probe(struct pci_dev *pci,</div><div class='add'>+				   const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -353,72 +298,60 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*cs5535au), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	cs5535au = card-&gt;private_data;</div><div class='add'>+	card-&gt;private_free = snd_cs5535audio_free;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cs5535audio_create(card, pci, &amp;cs5535au)) &lt; 0)</div><div class='del'>-		goto probefail_out;</div><div class='del'>-</div><div class='del'>-	card-&gt;private_data = cs5535au;</div><div class='add'>+	err = snd_cs5535audio_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cs5535audio_mixer(cs5535au)) &lt; 0)</div><div class='del'>-		goto probefail_out;</div><div class='add'>+	err = snd_cs5535audio_mixer(cs5535au);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_cs5535audio_pcm(cs5535au)) &lt; 0)</div><div class='del'>-		goto probefail_out;</div><div class='add'>+	err = snd_cs5535audio_pcm(cs5535au);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, DRIVER_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DRIVER_NAME);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;shortname, "CS5535 Audio");</div><div class='add'>+	strscpy(card-&gt;shortname, "CS5535 Audio");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s %s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, card-&gt;driver,</div><div class='ctx'> 		cs5535au-&gt;port, cs5535au-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto probefail_out;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-probefail_out:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_cs5535audio_probe(struct pci_dev *pci,</div><div class='add'>+				 const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	olpc_quirks_cleanup();</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_cs5535audio_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = DRIVER_NAME,</div><div class='add'>+static struct pci_driver cs5535audio_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_cs5535audio_ids,</div><div class='ctx'> 	.probe = snd_cs5535audio_probe,</div><div class='del'>-	.remove = __devexit_p(snd_cs5535audio_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_cs5535audio_suspend,</div><div class='del'>-	.resume = snd_cs5535audio_resume,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_cs5535audio_pm,</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_cs5535audio_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_cs5535audio_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_cs5535audio_init)</div><div class='del'>-module_exit(alsa_card_cs5535audio_exit)</div><div class='add'>+module_pci_driver(cs5535audio_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaya Kumar");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("CS5535 Audio");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("CS5535 Audio");</div><div class='head'>diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h<br/>index 51966d782a3c..d84620a0c26c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/cs5535audio.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_CS5535AUDIO_H</div><div class='ctx'> #define __SOUND_CS5535AUDIO_H</div><div class='ctx'> </div><div class='hunk'>@@ -66,9 +67,9 @@ struct cs5535audio_dma_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cs5535audio_dma_desc {</div><div class='del'>-	u32 addr;</div><div class='del'>-	u16 size;</div><div class='del'>-	u16 ctlreserved;</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le16 size;</div><div class='add'>+	__le16 ctlreserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cs5535audio_dma {</div><div class='hunk'>@@ -94,16 +95,13 @@ struct cs5535audio {</div><div class='ctx'> 	struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);</div><div class='del'>-int snd_cs5535audio_resume(struct pci_dev *pci);</div><div class='del'>-#endif</div><div class='add'>+extern const struct dev_pm_ops snd_cs5535audio_pm;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OLPC</div><div class='del'>-void __devinit olpc_prequirks(struct snd_card *card,</div><div class='del'>-		struct snd_ac97_template *ac97);</div><div class='del'>-int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);</div><div class='del'>-void __devexit olpc_quirks_cleanup(void);</div><div class='add'>+void olpc_prequirks(struct snd_card *card,</div><div class='add'>+		    struct snd_ac97_template *ac97);</div><div class='add'>+int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);</div><div class='add'>+void olpc_quirks_cleanup(void);</div><div class='ctx'> void olpc_analog_input(struct snd_ac97 *ac97, int on);</div><div class='ctx'> void olpc_mic_bias(struct snd_ac97 *ac97, int on);</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +134,7 @@ static inline void olpc_capture_open(struct snd_ac97 *ac97) { }</div><div class='ctx'> static inline void olpc_capture_close(struct snd_ac97 *ac97) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535audio);</div><div class='add'>+int snd_cs5535audio_pcm(struct cs5535audio *cs5535audio);</div><div class='ctx'> </div><div class='ctx'> #endif /* __SOUND_CS5535AUDIO_H */</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c<br/>index 50da49be9ae5..122170a410d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_olpc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_olpc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_olpc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/cs5535audio_olpc.c</a></div><div class='hunk'>@@ -1,13 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * OLPC XO-1 additional sound features</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright © 2006  Jaya Kumar &lt;jayakumar.lkml@gmail.com&gt;</div><div class='ctx'>  * Copyright © 2007-2008  Andres Salomon &lt;dilinger@debian.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -36,7 +32,8 @@ void olpc_analog_input(struct snd_ac97 *ac97, int on)</div><div class='ctx'> 	err = snd_ac97_update_bits(ac97, AC97_AD_TEST2,</div><div class='ctx'> 			1 &lt;&lt; AC97_AD_HPFD_SHIFT, on &lt;&lt; AC97_AD_HPFD_SHIFT);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "setting High Pass Filter - %d\n", err);</div><div class='add'>+		dev_err(ac97-&gt;bus-&gt;card-&gt;dev,</div><div class='add'>+			"setting High Pass Filter - %d\n", err);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -58,7 +55,7 @@ void olpc_mic_bias(struct snd_ac97 *ac97, int on)</div><div class='ctx'> 	err = snd_ac97_update_bits(ac97, AC97_AD_MISC,</div><div class='ctx'> 			1 &lt;&lt; AC97_AD_VREFD_SHIFT, on &lt;&lt; AC97_AD_VREFD_SHIFT);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "setting MIC Bias - %d\n", err);</div><div class='add'>+		dev_err(ac97-&gt;bus-&gt;card-&gt;dev, "setting MIC Bias - %d\n", err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int olpc_dc_info(struct snd_kcontrol *kctl,</div><div class='hunk'>@@ -114,7 +111,7 @@ static int olpc_mic_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new olpc_cs5535audio_ctls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new olpc_cs5535audio_ctls[] = {</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "DC Mode Enable",</div><div class='hunk'>@@ -133,8 +130,8 @@ static struct snd_kcontrol_new olpc_cs5535audio_ctls[] __devinitdata = {</div><div class='ctx'> },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void __devinit olpc_prequirks(struct snd_card *card,</div><div class='del'>-		struct snd_ac97_template *ac97)</div><div class='add'>+void olpc_prequirks(struct snd_card *card,</div><div class='add'>+		    struct snd_ac97_template *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	if (!machine_is_olpc())</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -144,7 +141,7 @@ void __devinit olpc_prequirks(struct snd_card *card,</div><div class='ctx'> 		ac97-&gt;scaps |= AC97_SCAP_INV_EAPD;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)</div><div class='add'>+int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_id elem;</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -153,7 +150,7 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (gpio_request(OLPC_GPIO_MIC_AC, DRV_NAME)) {</div><div class='del'>-		printk(KERN_ERR DRV_NAME ": unable to allocate MIC GPIO\n");</div><div class='add'>+		dev_err(card-&gt;dev, "unable to allocate MIC GPIO\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	gpio_direction_output(OLPC_GPIO_MIC_AC, 0);</div><div class='hunk'>@@ -161,23 +158,21 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)</div><div class='ctx'> 	/* drop the original AD1888 HPF control */</div><div class='ctx'> 	memset(&amp;elem, 0, sizeof(elem));</div><div class='ctx'> 	elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strncpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));</div><div class='add'>+	strscpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));</div><div class='ctx'> 	snd_ctl_remove_id(card, &amp;elem);</div><div class='ctx'> </div><div class='ctx'> 	/* drop the original V_REFOUT control */</div><div class='ctx'> 	memset(&amp;elem, 0, sizeof(elem));</div><div class='ctx'> 	elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strncpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));</div><div class='add'>+	strscpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));</div><div class='ctx'> 	snd_ctl_remove_id(card, &amp;elem);</div><div class='ctx'> </div><div class='ctx'> 	/* add the OLPC-specific controls */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(olpc_cs5535audio_ctls); i++) {</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(&amp;olpc_cs5535audio_ctls[i],</div><div class='ctx'> 				ac97-&gt;private_data));</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			gpio_free(OLPC_GPIO_MIC_AC);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* turn off the mic by default */</div><div class='hunk'>@@ -185,7 +180,8 @@ int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __devexit olpc_quirks_cleanup(void)</div><div class='add'>+void olpc_quirks_cleanup(void)</div><div class='ctx'> {</div><div class='del'>-	gpio_free(OLPC_GPIO_MIC_AC);</div><div class='add'>+	if (machine_is_olpc())</div><div class='add'>+		gpio_free(OLPC_GPIO_MIC_AC);</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c<br/>index f16bc8aad6ed..48b99a07e3bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_pcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_pcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/cs5535audio_pcm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for audio on multifunction CS5535 companion device</div><div class='ctx'>  * Copyright (C) Jaya Kumar</div><div class='hunk'>@@ -5,20 +6,6 @@</div><div class='ctx'>  * Based on Jaroslav Kysela and Takashi Iwai's examples.</div><div class='ctx'>  * This work was sponsored by CIS(M) Sdn Bhd.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  * todo: add be fmt support, spdif, pm</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -33,7 +20,7 @@</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include "cs5535audio.h"</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs5535audio_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs5535audio_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(</div><div class='ctx'> 				SNDRV_PCM_INFO_MMAP |</div><div class='hunk'>@@ -62,7 +49,7 @@ static struct snd_pcm_hardware snd_cs5535audio_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_cs5535audio_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_cs5535audio_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(</div><div class='ctx'> 				SNDRV_PCM_INFO_MMAP |</div><div class='hunk'>@@ -100,8 +87,9 @@ static int snd_cs5535audio_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_limit_hw_rates(runtime);</div><div class='ctx'> 	cs5535au-&gt;playback_substream = substream;</div><div class='ctx'> 	runtime-&gt;private_data = &amp;(cs5535au-&gt;dmas[CS5535AUDIO_DMA_PLAYBACK]);</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime,</div><div class='del'>-				SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='add'>+					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -122,7 +110,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,</div><div class='ctx'> 					 unsigned int period_bytes)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	u32 addr, desc_addr, jmpprd_addr;</div><div class='add'>+	u32 addr, jmpprd_addr;</div><div class='ctx'> 	struct cs5535audio_dma_desc *lastdesc;</div><div class='ctx'> </div><div class='ctx'> 	if (periods &gt; CS5535AUDIO_MAX_DESCRIPTORS)</div><div class='hunk'>@@ -130,7 +118,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,</div><div class='ctx'> </div><div class='ctx'> 	if (dma-&gt;desc_buf.area == NULL) {</div><div class='ctx'> 		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					snd_dma_pci_data(cs5535au-&gt;pci),</div><div class='add'>+					&amp;cs5535au-&gt;pci-&gt;dev,</div><div class='ctx'> 					CS5535AUDIO_DESC_LIST_SIZE+1,</div><div class='ctx'> 					&amp;dma-&gt;desc_buf) &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -141,33 +129,30 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* the u32 cast is okay because in snd*create we successfully told</div><div class='del'>-   	   pci alloc that we're only 32 bit capable so the uppper will be 0 */</div><div class='add'>+	   pci alloc that we're only 32 bit capable so the upper will be 0 */</div><div class='ctx'> 	addr = (u32) substream-&gt;runtime-&gt;dma_addr;</div><div class='del'>-	desc_addr = (u32) dma-&gt;desc_buf.addr;</div><div class='ctx'> 	for (i = 0; i &lt; periods; i++) {</div><div class='ctx'> 		struct cs5535audio_dma_desc *desc =</div><div class='ctx'> 			&amp;((struct cs5535audio_dma_desc *) dma-&gt;desc_buf.area)[i];</div><div class='ctx'> 		desc-&gt;addr = cpu_to_le32(addr);</div><div class='del'>-		desc-&gt;size = cpu_to_le32(period_bytes);</div><div class='del'>-		desc-&gt;ctlreserved = cpu_to_le32(PRD_EOP);</div><div class='del'>-		desc_addr += sizeof(struct cs5535audio_dma_desc);</div><div class='add'>+		desc-&gt;size = cpu_to_le16(period_bytes);</div><div class='add'>+		desc-&gt;ctlreserved = cpu_to_le16(PRD_EOP);</div><div class='ctx'> 		addr += period_bytes;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* we reserved one dummy descriptor at the end to do the PRD jump */</div><div class='ctx'> 	lastdesc = &amp;((struct cs5535audio_dma_desc *) dma-&gt;desc_buf.area)[periods];</div><div class='ctx'> 	lastdesc-&gt;addr = cpu_to_le32((u32) dma-&gt;desc_buf.addr);</div><div class='ctx'> 	lastdesc-&gt;size = 0;</div><div class='del'>-	lastdesc-&gt;ctlreserved = cpu_to_le32(PRD_JMP);</div><div class='del'>-	jmpprd_addr = cpu_to_le32(lastdesc-&gt;addr +</div><div class='del'>-				  (sizeof(struct cs5535audio_dma_desc)*periods));</div><div class='add'>+	lastdesc-&gt;ctlreserved = cpu_to_le16(PRD_JMP);</div><div class='add'>+	jmpprd_addr = (u32)dma-&gt;desc_buf.addr +</div><div class='add'>+		sizeof(struct cs5535audio_dma_desc) * periods;</div><div class='ctx'> </div><div class='ctx'> 	dma-&gt;substream = substream;</div><div class='ctx'> 	dma-&gt;period_bytes = period_bytes;</div><div class='ctx'> 	dma-&gt;periods = periods;</div><div class='del'>-	spin_lock_irq(&amp;cs5535au-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;cs5535au-&gt;reg_lock);</div><div class='ctx'> 	dma-&gt;ops-&gt;disable_dma(cs5535au);</div><div class='ctx'> 	dma-&gt;ops-&gt;setup_prd(cs5535au, jmpprd_addr);</div><div class='del'>-	spin_unlock_irq(&amp;cs5535au-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -249,10 +234,6 @@ static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct cs5535audio_dma *dma = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	dma-&gt;buf_addr = substream-&gt;runtime-&gt;dma_addr;</div><div class='ctx'> 	dma-&gt;buf_bytes = params_buffer_bytes(hw_params);</div><div class='ctx'> </div><div class='hunk'>@@ -280,7 +261,7 @@ static int snd_cs5535audio_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 		dma-&gt;pcm_open_flag = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	cs5535audio_clear_dma_packets(cs5535au, dma, substream);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_cs5535audio_playback_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -294,9 +275,8 @@ static int snd_cs5535audio_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct cs5535audio *cs5535au = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct cs5535audio_dma *dma = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;cs5535au-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;cs5535au-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 		dma-&gt;ops-&gt;pause_dma(cs5535au);</div><div class='hunk'>@@ -317,12 +297,10 @@ static int snd_cs5535audio_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		dma-&gt;ops-&gt;disable_dma(cs5535au);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		snd_printk(KERN_ERR "unhandled trigger\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev, "unhandled trigger\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;cs5535au-&gt;reg_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_cs5535audio_pcm_pointer(struct snd_pcm_substream</div><div class='hunk'>@@ -335,13 +313,13 @@ static snd_pcm_uframes_t snd_cs5535audio_pcm_pointer(struct snd_pcm_substream</div><div class='ctx'> 	dma = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> 	curdma = dma-&gt;ops-&gt;read_dma_pntr(cs5535au);</div><div class='ctx'> 	if (curdma &lt; dma-&gt;buf_addr) {</div><div class='del'>-		snd_printk(KERN_ERR "curdma=%x &lt; %x bufaddr.\n",</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev, "curdma=%x &lt; %x bufaddr.\n",</div><div class='ctx'> 					curdma, dma-&gt;buf_addr);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	curdma -= dma-&gt;buf_addr;</div><div class='ctx'> 	if (curdma &gt;= dma-&gt;buf_bytes) {</div><div class='del'>-		snd_printk(KERN_ERR "diff=%x &gt;= %x buf_bytes.\n",</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev, "diff=%x &gt;= %x buf_bytes.\n",</div><div class='ctx'> 					curdma, dma-&gt;buf_bytes);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -359,8 +337,9 @@ static int snd_cs5535audio_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_limit_hw_rates(runtime);</div><div class='ctx'> 	cs5535au-&gt;capture_substream = substream;</div><div class='ctx'> 	runtime-&gt;private_data = &amp;(cs5535au-&gt;dmas[CS5535AUDIO_DMA_CAPTURE]);</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime,</div><div class='del'>-					 SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='add'>+					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	olpc_capture_open(cs5535au-&gt;ac97);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -380,10 +359,9 @@ static int snd_cs5535audio_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 				 substream-&gt;runtime-&gt;rate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs5535audio_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs5535audio_playback_ops = {</div><div class='ctx'> 	.open =		snd_cs5535audio_playback_open,</div><div class='ctx'> 	.close =	snd_cs5535audio_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_cs5535audio_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cs5535audio_hw_free,</div><div class='ctx'> 	.prepare =	snd_cs5535audio_playback_prepare,</div><div class='hunk'>@@ -391,10 +369,9 @@ static struct snd_pcm_ops snd_cs5535audio_playback_ops = {</div><div class='ctx'> 	.pointer =	snd_cs5535audio_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_cs5535audio_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_cs5535audio_capture_ops = {</div><div class='ctx'> 	.open =		snd_cs5535audio_capture_open,</div><div class='ctx'> 	.close =	snd_cs5535audio_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_cs5535audio_hw_params,</div><div class='ctx'> 	.hw_free =	snd_cs5535audio_hw_free,</div><div class='ctx'> 	.prepare =	snd_cs5535audio_capture_prepare,</div><div class='hunk'>@@ -402,7 +379,7 @@ static struct snd_pcm_ops snd_cs5535audio_capture_ops = {</div><div class='ctx'> 	.pointer =	snd_cs5535audio_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cs5535audio_dma_ops snd_cs5535audio_playback_dma_ops = {</div><div class='add'>+static const struct cs5535audio_dma_ops snd_cs5535audio_playback_dma_ops = {</div><div class='ctx'>         .type = CS5535AUDIO_DMA_PLAYBACK,</div><div class='ctx'>         .enable_dma = cs5535audio_playback_enable_dma,</div><div class='ctx'>         .disable_dma = cs5535audio_playback_disable_dma,</div><div class='hunk'>@@ -412,7 +389,7 @@ static struct cs5535audio_dma_ops snd_cs5535audio_playback_dma_ops = {</div><div class='ctx'>         .read_dma_pntr = cs5535audio_playback_read_dma_pntr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct cs5535audio_dma_ops snd_cs5535audio_capture_dma_ops = {</div><div class='add'>+static const struct cs5535audio_dma_ops snd_cs5535audio_capture_dma_ops = {</div><div class='ctx'>         .type = CS5535AUDIO_DMA_CAPTURE,</div><div class='ctx'>         .enable_dma = cs5535audio_capture_enable_dma,</div><div class='ctx'>         .disable_dma = cs5535audio_capture_disable_dma,</div><div class='hunk'>@@ -422,7 +399,7 @@ static struct cs5535audio_dma_ops snd_cs5535audio_capture_dma_ops = {</div><div class='ctx'>         .read_dma_pntr = cs5535audio_capture_read_dma_pntr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535au)</div><div class='add'>+int snd_cs5535audio_pcm(struct cs5535audio *cs5535au)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -442,11 +419,11 @@ int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535au)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = cs5535au;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "CS5535 Audio");</div><div class='add'>+	strscpy(pcm-&gt;name, "CS5535 Audio");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					snd_dma_pci_data(cs5535au-&gt;pci),</div><div class='del'>-					64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;cs5535au-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 128*1024);</div><div class='ctx'> 	cs5535au-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c<br/>index a3301cc4ab82..90fb73a9d9b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_pm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/cs5535audio/cs5535audio_pm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/cs5535audio/cs5535audio_pm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/cs5535audio/cs5535audio_pm.c</a></div><div class='hunk'>@@ -1,21 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  * Power management for audio on multifunction CS5535 companion device</div><div class='ctx'>  * Copyright (C) Jaya Kumar</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -55,14 +41,13 @@ static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int __maybe_unused snd_cs5535audio_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cs5535audio *cs5535au = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(cs5535au-&gt;pcm);</div><div class='ctx'> 	snd_ac97_suspend(cs5535au-&gt;ac97);</div><div class='ctx'> 	for (i = 0; i &lt; NUM_CS5535AUDIO_DMAS; i++) {</div><div class='ctx'> 		struct cs5535audio_dma *dma = &amp;cs5535au-&gt;dmas[i];</div><div class='hunk'>@@ -71,39 +56,17 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	}</div><div class='ctx'> 	/* save important regs, then disable aclink in hw */</div><div class='ctx'> 	snd_cs5535audio_stop_hardware(cs5535au);</div><div class='del'>-</div><div class='del'>-	if (pci_save_state(pci)) {</div><div class='del'>-		printk(KERN_ERR "cs5535audio: pci_save_state failed!\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_cs5535audio_resume(struct pci_dev *pci)</div><div class='add'>+static int __maybe_unused snd_cs5535audio_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct cs5535audio *cs5535au = card-&gt;private_data;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	int timeout;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	if (pci_restore_state(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cs5535audio: pci_restore_state failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "cs5535audio: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	/* set LNK_WRM_RST to reset AC link */</div><div class='ctx'> 	cs_writel(cs5535au, ACC_CODEC_CNTL, ACC_CODEC_CNTL_LNK_WRM_RST);</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +79,7 @@ int snd_cs5535audio_resume(struct pci_dev *pci)</div><div class='ctx'> 	} while (--timeout);</div><div class='ctx'> </div><div class='ctx'> 	if (!timeout)</div><div class='del'>-		snd_printk(KERN_ERR "Failure getting AC Link ready\n");</div><div class='add'>+		dev_err(cs5535au-&gt;card-&gt;dev, "Failure getting AC Link ready\n");</div><div class='ctx'> </div><div class='ctx'> 	/* set up rate regs, dma. actual initiation is done in trig */</div><div class='ctx'> 	for (i = 0; i &lt; NUM_CS5535AUDIO_DMAS; i++) {</div><div class='hunk'>@@ -134,3 +97,4 @@ int snd_cs5535audio_resume(struct pci_dev *pci)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SIMPLE_DEV_PM_OPS(snd_cs5535audio_pm, snd_cs5535audio_suspend, snd_cs5535audio_resume);</div><div class='head'>diff --git a/sound/pci/ctxfi/Makefile b/sound/pci/ctxfi/Makefile<br/>index 15075f89e98a..ff2b1cba3a3c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/Makefile</a></div><div class='hunk'>@@ -1,4 +1,5 @@</div><div class='del'>-snd-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-ctxfi-y := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \</div><div class='ctx'> 	ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \</div><div class='ctx'> 	cthw20k2.o cthw20k1.o</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ctxfi/ct20k1reg.h b/sound/pci/ctxfi/ct20k1reg.h<br/>index f2e34e3f27ee..05bb006c0f4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ct20k1reg.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ct20k1reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ct20k1reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ct20k1reg.h</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CT20K1REG_H</div><div class='del'>-#define CT20k1REG_H</div><div class='add'>+#define CT20K1REG_H</div><div class='ctx'> </div><div class='ctx'> /* 20k1 registers */</div><div class='ctx'> #define 	DSPXRAM_START 			0x000000</div><div class='hunk'>@@ -632,5 +629,3 @@</div><div class='ctx'> #define I2SD_R    0x19L</div><div class='ctx'> </div><div class='ctx'> #endif /* CT20K1REG_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/sound/pci/ctxfi/ct20k2reg.h b/sound/pci/ctxfi/ct20k2reg.h<br/>index e0394e3996e8..02f67828eabe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ct20k2reg.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ct20k2reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ct20k2reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ct20k2reg.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _20K2REGISTERS_H_</div><div class='hunk'>@@ -55,6 +52,7 @@</div><div class='ctx'> /* GPIO Registers */</div><div class='ctx'> #define GPIO_DATA           0x1B7020</div><div class='ctx'> #define GPIO_CTRL           0x1B7024</div><div class='add'>+#define GPIO_EXT_DATA       0x1B70A0</div><div class='ctx'> </div><div class='ctx'> /* Virtual memory registers */</div><div class='ctx'> #define VMEM_PTPAL          0x1C6300 /* 0x1C6300 + (16 * Chn) */</div><div class='head'>diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c<br/>index fee35cfc0c7f..bb4658592636 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctamixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctamixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctamixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctamixer.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctamixer.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 21 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctamixer.h"</div><div class='hunk'>@@ -27,16 +23,15 @@</div><div class='ctx'> </div><div class='ctx'> #define BLANK_SLOT		4094</div><div class='ctx'> </div><div class='del'>-static int amixer_master(struct rsc *rsc)</div><div class='add'>+static void amixer_master(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj = 0;</div><div class='del'>-	return rsc-&gt;idx = container_of(rsc, struct amixer, rsc)-&gt;idx[0];</div><div class='add'>+	rsc-&gt;idx = container_of(rsc, struct amixer, rsc)-&gt;idx[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int amixer_next_conj(struct rsc *rsc)</div><div class='add'>+static void amixer_next_conj(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj++;</div><div class='del'>-	return container_of(rsc, struct amixer, rsc)-&gt;idx[rsc-&gt;conj];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amixer_index(const struct rsc *rsc)</div><div class='hunk'>@@ -49,7 +44,7 @@ static int amixer_output_slot(const struct rsc *rsc)</div><div class='ctx'> 	return (amixer_index(rsc) &lt;&lt; 4) + 0x4;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops amixer_basic_rsc_ops = {</div><div class='add'>+static const struct rsc_ops amixer_basic_rsc_ops = {</div><div class='ctx'> 	.master		= amixer_master,</div><div class='ctx'> 	.next_conj	= amixer_next_conj,</div><div class='ctx'> 	.index		= amixer_index,</div><div class='hunk'>@@ -186,7 +181,7 @@ static int amixer_setup(struct amixer *amixer, struct rsc *input,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct amixer_rsc_ops amixer_ops = {</div><div class='add'>+static const struct amixer_rsc_ops amixer_ops = {</div><div class='ctx'> 	.set_input		= amixer_set_input,</div><div class='ctx'> 	.set_invalid_squash	= amixer_set_invalid_squash,</div><div class='ctx'> 	.set_scale		= amixer_set_y,</div><div class='hunk'>@@ -236,7 +231,6 @@ static int get_amixer_rsc(struct amixer_mgr *mgr,</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	struct amixer *amixer;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	*ramixer = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -248,17 +242,18 @@ static int get_amixer_rsc(struct amixer_mgr *mgr,</div><div class='ctx'> 	/* Check whether there are sufficient</div><div class='ctx'> 	 * amixer resources to meet request. */</div><div class='ctx'> 	err = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='del'>-		err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='add'>+			err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		amixer-&gt;idx[i] = idx;</div><div class='add'>+			amixer-&gt;idx[i] = idx;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Can't meet AMIXER resource request!\n");</div><div class='add'>+		dev_err(mgr-&gt;card-&gt;dev,</div><div class='add'>+			"Can't meet AMIXER resource request!\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -271,32 +266,30 @@ static int get_amixer_rsc(struct amixer_mgr *mgr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i--; i &gt;= 0; i--)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, amixer-&gt;idx[i]);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i--; i &gt;= 0; i--)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, amixer-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='ctx'> 	kfree(amixer);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int put_amixer_rsc(struct amixer_mgr *mgr, struct amixer *amixer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; amixer-&gt;rsc.msr; i++)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, amixer-&gt;idx[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; amixer-&gt;rsc.msr; i++)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, amixer-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> 	amixer_rsc_uninit(amixer);</div><div class='ctx'> 	kfree(amixer);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr)</div><div class='add'>+int amixer_mgr_create(struct hw *hw, void **ramixer_mgr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct amixer_mgr *amixer_mgr;</div><div class='hunk'>@@ -314,6 +307,7 @@ int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr)</div><div class='ctx'> </div><div class='ctx'> 	amixer_mgr-&gt;get_amixer = get_amixer_rsc;</div><div class='ctx'> 	amixer_mgr-&gt;put_amixer = put_amixer_rsc;</div><div class='add'>+	amixer_mgr-&gt;card = hw-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	*ramixer_mgr = amixer_mgr;</div><div class='ctx'> </div><div class='hunk'>@@ -324,8 +318,9 @@ error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int amixer_mgr_destroy(struct amixer_mgr *amixer_mgr)</div><div class='add'>+int amixer_mgr_destroy(void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct amixer_mgr *amixer_mgr = ptr;</div><div class='ctx'> 	rsc_mgr_uninit(&amp;amixer_mgr-&gt;mgr);</div><div class='ctx'> 	kfree(amixer_mgr);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -333,16 +328,15 @@ int amixer_mgr_destroy(struct amixer_mgr *amixer_mgr)</div><div class='ctx'> </div><div class='ctx'> /* SUM resource management */</div><div class='ctx'> </div><div class='del'>-static int sum_master(struct rsc *rsc)</div><div class='add'>+static void sum_master(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj = 0;</div><div class='del'>-	return rsc-&gt;idx = container_of(rsc, struct sum, rsc)-&gt;idx[0];</div><div class='add'>+	rsc-&gt;idx = container_of(rsc, struct sum, rsc)-&gt;idx[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sum_next_conj(struct rsc *rsc)</div><div class='add'>+static void sum_next_conj(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj++;</div><div class='del'>-	return container_of(rsc, struct sum, rsc)-&gt;idx[rsc-&gt;conj];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sum_index(const struct rsc *rsc)</div><div class='hunk'>@@ -355,7 +349,7 @@ static int sum_output_slot(const struct rsc *rsc)</div><div class='ctx'> 	return (sum_index(rsc) &lt;&lt; 4) + 0xc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops sum_basic_rsc_ops = {</div><div class='add'>+static const struct rsc_ops sum_basic_rsc_ops = {</div><div class='ctx'> 	.master		= sum_master,</div><div class='ctx'> 	.next_conj	= sum_next_conj,</div><div class='ctx'> 	.index		= sum_index,</div><div class='hunk'>@@ -390,7 +384,6 @@ static int get_sum_rsc(struct sum_mgr *mgr,</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	struct sum *sum;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	*rsum = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -401,17 +394,18 @@ static int get_sum_rsc(struct sum_mgr *mgr,</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether there are sufficient sum resources to meet request. */</div><div class='ctx'> 	err = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='del'>-		err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='add'>+			err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		sum-&gt;idx[i] = idx;</div><div class='add'>+			sum-&gt;idx[i] = idx;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Can't meet SUM resource request!\n");</div><div class='add'>+		dev_err(mgr-&gt;card-&gt;dev,</div><div class='add'>+			"Can't meet SUM resource request!\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -424,32 +418,29 @@ static int get_sum_rsc(struct sum_mgr *mgr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i--; i &gt;= 0; i--)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, sum-&gt;idx[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i--; i &gt;= 0; i--)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, sum-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(sum);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int put_sum_rsc(struct sum_mgr *mgr, struct sum *sum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; sum-&gt;rsc.msr; i++)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, sum-&gt;idx[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; sum-&gt;rsc.msr; i++)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, sum-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> 	sum_rsc_uninit(sum);</div><div class='ctx'> 	kfree(sum);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr)</div><div class='add'>+int sum_mgr_create(struct hw *hw, void **rsum_mgr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct sum_mgr *sum_mgr;</div><div class='hunk'>@@ -467,6 +458,7 @@ int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr)</div><div class='ctx'> </div><div class='ctx'> 	sum_mgr-&gt;get_sum = get_sum_rsc;</div><div class='ctx'> 	sum_mgr-&gt;put_sum = put_sum_rsc;</div><div class='add'>+	sum_mgr-&gt;card = hw-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	*rsum_mgr = sum_mgr;</div><div class='ctx'> </div><div class='hunk'>@@ -477,8 +469,9 @@ error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int sum_mgr_destroy(struct sum_mgr *sum_mgr)</div><div class='add'>+int sum_mgr_destroy(void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct sum_mgr *sum_mgr = ptr;</div><div class='ctx'> 	rsc_mgr_uninit(&amp;sum_mgr-&gt;mgr);</div><div class='ctx'> 	kfree(sum_mgr);</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/ctxfi/ctamixer.h b/sound/pci/ctxfi/ctamixer.h<br/>index cc49e5ab4750..8fc017da6bda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctamixer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctamixer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctamixer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctamixer.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctamixer.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 21 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTAMIXER_H</div><div class='hunk'>@@ -21,6 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "ctresource.h"</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Define the descriptor of a summation node resource */</div><div class='ctx'> struct sum {</div><div class='hunk'>@@ -35,6 +32,7 @@ struct sum_desc {</div><div class='ctx'> </div><div class='ctx'> struct sum_mgr {</div><div class='ctx'> 	struct rsc_mgr mgr;	/* Basic resource manager info */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	spinlock_t mgr_lock;</div><div class='ctx'> </div><div class='ctx'> 	 /* request one sum resource */</div><div class='hunk'>@@ -45,8 +43,8 @@ struct sum_mgr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Constructor and destructor of daio resource manager */</div><div class='del'>-int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr);</div><div class='del'>-int sum_mgr_destroy(struct sum_mgr *sum_mgr);</div><div class='add'>+int sum_mgr_create(struct hw *hw, void **ptr);</div><div class='add'>+int sum_mgr_destroy(void *ptr);</div><div class='ctx'> </div><div class='ctx'> /* Define the descriptor of a amixer resource */</div><div class='ctx'> struct amixer_rsc_ops;</div><div class='hunk'>@@ -56,7 +54,7 @@ struct amixer {</div><div class='ctx'> 	unsigned char idx[8];</div><div class='ctx'> 	struct rsc *input;	/* pointer to a resource acting as source */</div><div class='ctx'> 	struct sum *sum;	/* Put amixer output to this summation node */</div><div class='del'>-	struct amixer_rsc_ops *ops;	/* AMixer specific operations */</div><div class='add'>+	const struct amixer_rsc_ops *ops;	/* AMixer specific operations */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct amixer_rsc_ops {</div><div class='hunk'>@@ -79,6 +77,7 @@ struct amixer_desc {</div><div class='ctx'> </div><div class='ctx'> struct amixer_mgr {</div><div class='ctx'> 	struct rsc_mgr mgr;	/* Basic resource manager info */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	spinlock_t mgr_lock;</div><div class='ctx'> </div><div class='ctx'> 	 /* request one amixer resource */</div><div class='hunk'>@@ -90,7 +89,7 @@ struct amixer_mgr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Constructor and destructor of amixer resource manager */</div><div class='del'>-int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr);</div><div class='del'>-int amixer_mgr_destroy(struct amixer_mgr *amixer_mgr);</div><div class='add'>+int amixer_mgr_create(struct hw *hw, void **ramixer_mgr);</div><div class='add'>+int amixer_mgr_destroy(void *amixer_mgr);</div><div class='ctx'> </div><div class='ctx'> #endif /* CTAMIXER_H */</div><div class='head'>diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c<br/>index 1bff80cde0a2..227d8c8490e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctatc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctatc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctatc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctatc.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File    ctatc.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -18,7 +15,6 @@</div><div class='ctx'> #include "ctatc.h"</div><div class='ctx'> #include "ctpcm.h"</div><div class='ctx'> #include "ctmixer.h"</div><div class='del'>-#include "cthardware.h"</div><div class='ctx'> #include "ctsrc.h"</div><div class='ctx'> #include "ctamixer.h"</div><div class='ctx'> #include "ctdaio.h"</div><div class='hunk'>@@ -29,8 +25,10 @@</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> </div><div class='add'>+#define NUM_ATC_SRCS	6</div><div class='add'>+#define NUM_ATC_PCM		(2 * 4)</div><div class='add'>+</div><div class='ctx'> #define MONO_SUM_SCALE	0x19a8	/* 2^(-0.5) in 14-bit floating format */</div><div class='del'>-#define DAIONUM		7</div><div class='ctx'> #define MAX_MULTI_CHN	8</div><div class='ctx'> </div><div class='ctx'> #define IEC958_DEFAULT_CON ((IEC958_AES0_NONAUDIO \</div><div class='hunk'>@@ -40,7 +38,8 @@</div><div class='ctx'> 			    | (0x10 &lt;&lt; 16) \</div><div class='ctx'> 			    | ((IEC958_AES3_CON_FS_48000) &lt;&lt; 24))</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk __devinitdata subsys_20k1_list[] = {</div><div class='add'>+static const struct snd_pci_quirk subsys_20k1_list[] = {</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0021, "SB046x", CTSB046X),</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0022, "SB055x", CTSB055X),</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X),</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X),</div><div class='hunk'>@@ -50,9 +49,11 @@ static struct snd_pci_quirk __devinitdata subsys_20k1_list[] = {</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk __devinitdata subsys_20k2_list[] = {</div><div class='add'>+static const struct snd_pci_quirk subsys_20k2_list[] = {</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB0760,</div><div class='ctx'> 		      "SB0760", CTSB0760),</div><div class='add'>+	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB1270,</div><div class='add'>+		      "SB1270", CTSB1270),</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08801,</div><div class='ctx'> 		      "SB0880", CTSB0880),</div><div class='ctx'> 	SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08802,</div><div class='hunk'>@@ -62,11 +63,13 @@ static struct snd_pci_quirk __devinitdata subsys_20k2_list[] = {</div><div class='ctx'> 	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000,</div><div class='ctx'> 			   PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "HENDRIX",</div><div class='ctx'> 			   CTHENDRIX),</div><div class='add'>+	SND_PCI_QUIRK(0x160b, 0x0101, "OK0010", CTOK0010),</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char *ct_subsys_name[NUM_CTCARDS] = {</div><div class='ctx'> 	/* 20k1 models */</div><div class='add'>+	[CTSB046X]	= "SB046x",</div><div class='ctx'> 	[CTSB055X]	= "SB055x",</div><div class='ctx'> 	[CTSB073X]	= "SB073x",</div><div class='ctx'> 	[CTUAA]		= "UAA",</div><div class='hunk'>@@ -75,6 +78,8 @@ static const char *ct_subsys_name[NUM_CTCARDS] = {</div><div class='ctx'> 	[CTSB0760]	= "SB076x",</div><div class='ctx'> 	[CTHENDRIX]	= "Hendrix",</div><div class='ctx'> 	[CTSB0880]	= "SB0880",</div><div class='add'>+	[CTSB1270]      = "SB1270",</div><div class='add'>+	[CTOK0010]    = "OK0010",</div><div class='ctx'> 	[CT20K2_UNKNOWN] = "Unknown",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -105,23 +110,20 @@ static struct {</div><div class='ctx'> 			    .public_name = "Mixer"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef int (*create_t)(void *, void **);</div><div class='del'>-typedef int (*destroy_t)(void *);</div><div class='del'>-</div><div class='ctx'> static struct {</div><div class='del'>-	int (*create)(void *hw, void **rmgr);</div><div class='add'>+	int (*create)(struct hw *hw, void **rmgr);</div><div class='ctx'> 	int (*destroy)(void *mgr);</div><div class='ctx'> } rsc_mgr_funcs[NUM_RSCTYP] = {</div><div class='del'>-	[SRC] 		= { .create 	= (create_t)src_mgr_create,</div><div class='del'>-			    .destroy 	= (destroy_t)src_mgr_destroy	},</div><div class='del'>-	[SRCIMP] 	= { .create 	= (create_t)srcimp_mgr_create,</div><div class='del'>-			    .destroy 	= (destroy_t)srcimp_mgr_destroy	},</div><div class='del'>-	[AMIXER]	= { .create	= (create_t)amixer_mgr_create,</div><div class='del'>-			    .destroy	= (destroy_t)amixer_mgr_destroy	},</div><div class='del'>-	[SUM]		= { .create	= (create_t)sum_mgr_create,</div><div class='del'>-			    .destroy	= (destroy_t)sum_mgr_destroy	},</div><div class='del'>-	[DAIO]		= { .create	= (create_t)daio_mgr_create,</div><div class='del'>-			    .destroy	= (destroy_t)daio_mgr_destroy	}</div><div class='add'>+	[SRC] 		= { .create 	= src_mgr_create,</div><div class='add'>+			    .destroy 	= src_mgr_destroy	},</div><div class='add'>+	[SRCIMP] 	= { .create 	= srcimp_mgr_create,</div><div class='add'>+			    .destroy 	= srcimp_mgr_destroy	},</div><div class='add'>+	[AMIXER]	= { .create	= amixer_mgr_create,</div><div class='add'>+			    .destroy	= amixer_mgr_destroy	},</div><div class='add'>+	[SUM]		= { .create	= sum_mgr_create,</div><div class='add'>+			    .destroy	= sum_mgr_destroy	},</div><div class='add'>+	[DAIO]		= { .create	= daio_mgr_create,</div><div class='add'>+			    .destroy	= daio_mgr_destroy	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -170,7 +172,8 @@ static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index)</div><div class='ctx'> 	return atc-&gt;vm-&gt;get_ptp_phys(atc-&gt;vm, index);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int convert_format(snd_pcm_format_t snd_format)</div><div class='add'>+static unsigned int convert_format(snd_pcm_format_t snd_format,</div><div class='add'>+				   struct snd_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	switch (snd_format) {</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_U8:</div><div class='hunk'>@@ -184,7 +187,7 @@ static unsigned int convert_format(snd_pcm_format_t snd_format)</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_FLOAT_LE:</div><div class='ctx'> 		return SRC_SF_F32;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "ctxfi: not recognized snd format is %d \n",</div><div class='add'>+		dev_err(card-&gt;dev, "not recognized snd format is %d\n",</div><div class='ctx'> 			snd_format);</div><div class='ctx'> 		return SRC_SF_S16;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -267,12 +270,13 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 	src = apcm-&gt;src;</div><div class='ctx'> 	src-&gt;ops-&gt;set_pitch(src, pitch);</div><div class='ctx'> 	src-&gt;ops-&gt;set_rom(src, select_rom(pitch));</div><div class='del'>-	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format));</div><div class='add'>+	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format,</div><div class='add'>+					     atc-&gt;card));</div><div class='ctx'> 	src-&gt;ops-&gt;set_pm(src, (src-&gt;ops-&gt;next_interleave(src) != NULL));</div><div class='ctx'> </div><div class='ctx'> 	/* Get AMIXER resource */</div><div class='ctx'> 	n_amixer = (n_amixer &lt; 2) ? 2 : n_amixer;</div><div class='del'>-	apcm-&gt;amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL);</div><div class='add'>+	apcm-&gt;amixers = kcalloc(n_amixer, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!apcm-&gt;amixers) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='hunk'>@@ -296,10 +300,10 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 	src = apcm-&gt;src;</div><div class='ctx'> 	for (i = 0; i &lt; n_amixer; i++) {</div><div class='ctx'> 		amixer = apcm-&gt;amixers[i];</div><div class='del'>-		mutex_lock(&amp;atc-&gt;atc_mutex);</div><div class='del'>-		amixer-&gt;ops-&gt;setup(amixer, &amp;src-&gt;rsc,</div><div class='del'>-					INIT_VOL, atc-&gt;pcm[i+device*2]);</div><div class='del'>-		mutex_unlock(&amp;atc-&gt;atc_mutex);</div><div class='add'>+		scoped_guard(mutex, &amp;atc-&gt;atc_mutex) {</div><div class='add'>+			amixer-&gt;ops-&gt;setup(amixer, &amp;src-&gt;rsc,</div><div class='add'>+					   INIT_VOL, atc-&gt;pcm[i+device*2]);</div><div class='add'>+		}</div><div class='ctx'> 		src = src-&gt;ops-&gt;next_interleave(src);</div><div class='ctx'> 		if (!src)</div><div class='ctx'> 			src = apcm-&gt;src;</div><div class='hunk'>@@ -434,6 +438,13 @@ atc_pcm_playback_position(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	position = src-&gt;ops-&gt;get_ca(src);</div><div class='ctx'> </div><div class='add'>+	if (position &lt; apcm-&gt;vm_block-&gt;addr) {</div><div class='add'>+		dev_dbg(atc-&gt;card-&gt;dev,</div><div class='add'>+			"bad ca - ca=0x%08x, vba=0x%08x, vbs=0x%08x\n",</div><div class='add'>+			position, apcm-&gt;vm_block-&gt;addr, apcm-&gt;vm_block-&gt;size);</div><div class='add'>+		position = apcm-&gt;vm_block-&gt;addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	size = apcm-&gt;vm_block-&gt;size;</div><div class='ctx'> 	max_cisz = src-&gt;multi * src-&gt;rsc.msr;</div><div class='ctx'> 	max_cisz = 128 * (max_cisz &lt; 8 ? max_cisz : 8);</div><div class='hunk'>@@ -459,12 +470,12 @@ static void setup_src_node_conf(struct ct_atc *atc, struct ct_atc_pcm *apcm,</div><div class='ctx'> 				apcm-&gt;substream-&gt;runtime-&gt;rate);</div><div class='ctx'> 	*n_srcc = 0;</div><div class='ctx'> </div><div class='del'>-	if (1 == atc-&gt;msr) {</div><div class='add'>+	if (1 == atc-&gt;msr) { /* FIXME: do we really need SRC here if pitch==1 */</div><div class='ctx'> 		*n_srcc = apcm-&gt;substream-&gt;runtime-&gt;channels;</div><div class='ctx'> 		conf[0].pitch = pitch;</div><div class='ctx'> 		conf[0].mix_msr = conf[0].imp_msr = conf[0].msr = 1;</div><div class='ctx'> 		conf[0].vo = 1;</div><div class='del'>-	} else if (2 == atc-&gt;msr) {</div><div class='add'>+	} else if (2 &lt;= atc-&gt;msr) {</div><div class='ctx'> 		if (0x8000000 &lt; pitch) {</div><div class='ctx'> 			/* Need two-stage SRCs, SRCIMPs and</div><div class='ctx'> 			 * AMIXERs for converting format */</div><div class='hunk'>@@ -533,18 +544,18 @@ atc_pcm_capture_get_resources(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (n_srcc) {</div><div class='del'>-		apcm-&gt;srccs = kzalloc(sizeof(void *)*n_srcc, GFP_KERNEL);</div><div class='add'>+		apcm-&gt;srccs = kcalloc(n_srcc, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 		if (!apcm-&gt;srccs)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (n_amixer) {</div><div class='del'>-		apcm-&gt;amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL);</div><div class='add'>+		apcm-&gt;amixers = kcalloc(n_amixer, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 		if (!apcm-&gt;amixers) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto error1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	apcm-&gt;srcimps = kzalloc(sizeof(void *)*n_srcimp, GFP_KERNEL);</div><div class='add'>+	apcm-&gt;srcimps = kcalloc(n_srcimp, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!apcm-&gt;srcimps) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='hunk'>@@ -732,7 +743,8 @@ static int atc_pcm_capture_start(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> </div><div class='ctx'> 	/*  Set up recording SRC */</div><div class='ctx'> 	src = apcm-&gt;src;</div><div class='del'>-	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format));</div><div class='add'>+	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format,</div><div class='add'>+					     atc-&gt;card));</div><div class='ctx'> 	src-&gt;ops-&gt;set_sa(src, apcm-&gt;vm_block-&gt;addr);</div><div class='ctx'> 	src-&gt;ops-&gt;set_la(src, apcm-&gt;vm_block-&gt;addr + apcm-&gt;vm_block-&gt;size);</div><div class='ctx'> 	src-&gt;ops-&gt;set_ca(src, apcm-&gt;vm_block-&gt;addr);</div><div class='hunk'>@@ -801,13 +813,14 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc,</div><div class='ctx'> 	src = apcm-&gt;src;</div><div class='ctx'> 	src-&gt;ops-&gt;set_pitch(src, pitch);</div><div class='ctx'> 	src-&gt;ops-&gt;set_rom(src, select_rom(pitch));</div><div class='del'>-	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format));</div><div class='add'>+	src-&gt;ops-&gt;set_sf(src, convert_format(apcm-&gt;substream-&gt;runtime-&gt;format,</div><div class='add'>+					     atc-&gt;card));</div><div class='ctx'> 	src-&gt;ops-&gt;set_pm(src, (src-&gt;ops-&gt;next_interleave(src) != NULL));</div><div class='ctx'> 	src-&gt;ops-&gt;set_bp(src, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Get AMIXER resource */</div><div class='ctx'> 	n_amixer = (n_amixer &lt; 2) ? 2 : n_amixer;</div><div class='del'>-	apcm-&gt;amixers = kzalloc(sizeof(void *)*n_amixer, GFP_KERNEL);</div><div class='add'>+	apcm-&gt;amixers = kcalloc(n_amixer, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!apcm-&gt;amixers) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='hunk'>@@ -866,17 +879,16 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;atc-&gt;atc_mutex);</div><div class='add'>+	guard(mutex)(&amp;atc-&gt;atc_mutex);</div><div class='ctx'> 	dao-&gt;ops-&gt;get_spos(dao, &amp;status);</div><div class='ctx'> 	if (((status &gt;&gt; 24) &amp; IEC958_AES3_CON_FS) != iec958_con_fs) {</div><div class='del'>-		status &amp;= ((~IEC958_AES3_CON_FS) &lt;&lt; 24);</div><div class='add'>+		status &amp;= ~(IEC958_AES3_CON_FS &lt;&lt; 24);</div><div class='ctx'> 		status |= (iec958_con_fs &lt;&lt; 24);</div><div class='ctx'> 		dao-&gt;ops-&gt;set_spos(dao, status);</div><div class='ctx'> 		dao-&gt;ops-&gt;commit_write(dao);</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((rate != atc-&gt;pll_rate) &amp;&amp; (32000 != rate))</div><div class='ctx'> 		err = atc_pll_init(atc, rate);</div><div class='del'>-	mutex_unlock(&amp;atc-&gt;atc_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -913,13 +925,13 @@ spdif_passthru_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)</div><div class='ctx'> 			src = apcm-&gt;src;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Connect to SPDIFOO */</div><div class='del'>-	mutex_lock(&amp;atc-&gt;atc_mutex);</div><div class='del'>-	dao = container_of(atc-&gt;daios[SPDIFOO], struct dao, daio);</div><div class='del'>-	amixer = apcm-&gt;amixers[0];</div><div class='del'>-	dao-&gt;ops-&gt;set_left_input(dao, &amp;amixer-&gt;rsc);</div><div class='del'>-	amixer = apcm-&gt;amixers[1];</div><div class='del'>-	dao-&gt;ops-&gt;set_right_input(dao, &amp;amixer-&gt;rsc);</div><div class='del'>-	mutex_unlock(&amp;atc-&gt;atc_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;atc-&gt;atc_mutex) {</div><div class='add'>+		dao = container_of(atc-&gt;daios[SPDIFOO], struct dao, daio);</div><div class='add'>+		amixer = apcm-&gt;amixers[0];</div><div class='add'>+		dao-&gt;ops-&gt;set_left_input(dao, &amp;amixer-&gt;rsc);</div><div class='add'>+		amixer = apcm-&gt;amixers[1];</div><div class='add'>+		dao-&gt;ops-&gt;set_right_input(dao, &amp;amixer-&gt;rsc);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ct_timer_prepare(apcm-&gt;timer);</div><div class='ctx'> </div><div class='hunk'>@@ -970,11 +982,57 @@ static int atc_select_mic_in(struct ct_atc *atc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int atc_have_digit_io_switch(struct ct_atc *atc)</div><div class='add'>+static struct capabilities atc_capabilities(struct ct_atc *atc)</div><div class='add'>+{</div><div class='add'>+	struct hw *hw = atc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return hw-&gt;capabilities(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atc_dedicated_rca_select(struct ct_atc *atc)</div><div class='add'>+{</div><div class='add'>+	struct dao *dao;</div><div class='add'>+	struct ct_mixer *mixer = atc-&gt;mixer;</div><div class='add'>+	struct rsc *rscs[2] = {NULL};</div><div class='add'>+</div><div class='add'>+	dao = container_of(atc-&gt;daios[atc-&gt;rca_state ? RCA : LINEO1],</div><div class='add'>+		struct dao, daio);</div><div class='add'>+	dao-&gt;ops-&gt;clear_left_input(dao);</div><div class='add'>+	dao-&gt;ops-&gt;clear_right_input(dao);</div><div class='add'>+</div><div class='add'>+	mixer-&gt;get_output_ports(mixer, MIX_WAVE_FRONT, &amp;rscs[0], &amp;rscs[1]);</div><div class='add'>+	dao = container_of(atc-&gt;daios[atc-&gt;rca_state ? LINEO1 : RCA],</div><div class='add'>+		struct dao, daio);</div><div class='add'>+	dao-&gt;ops-&gt;set_left_input(dao, rscs[0]);</div><div class='add'>+	dao-&gt;ops-&gt;set_right_input(dao, rscs[1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atc_output_switch_get(struct ct_atc *atc)</div><div class='add'>+{</div><div class='add'>+	struct hw *hw = atc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return hw-&gt;output_switch_get(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atc_output_switch_put(struct ct_atc *atc, int position)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw *hw = atc-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	return hw-&gt;have_digit_io_switch(hw);</div><div class='add'>+	return hw-&gt;output_switch_put(hw, position);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atc_mic_source_switch_get(struct ct_atc *atc)</div><div class='add'>+{</div><div class='add'>+	struct hw *hw = atc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return hw-&gt;mic_source_switch_get(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atc_mic_source_switch_put(struct ct_atc *atc, int position)</div><div class='add'>+{</div><div class='add'>+	struct hw *hw = atc-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return hw-&gt;mic_source_switch_put(hw, position);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atc_select_digit_io(struct ct_atc *atc)</div><div class='hunk'>@@ -1045,6 +1103,16 @@ static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state)</div><div class='ctx'> 	return atc_daio_unmute(atc, state, LINEIM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int atc_mic_unmute(struct ct_atc *atc, unsigned char state)</div><div class='add'>+{</div><div class='add'>+	return atc_daio_unmute(atc, state, MIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int atc_rca_unmute(struct ct_atc *atc, unsigned char state)</div><div class='add'>+{</div><div class='add'>+	return atc_daio_unmute(atc, state, RCA);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int atc_spdif_out_unmute(struct ct_atc *atc, unsigned char state)</div><div class='ctx'> {</div><div class='ctx'> 	return atc_daio_unmute(atc, state, SPDIFOO);</div><div class='hunk'>@@ -1074,7 +1142,7 @@ static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state)</div><div class='ctx'> 	struct rsc *rscs[2] = {NULL};</div><div class='ctx'> 	unsigned int spos = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;atc-&gt;atc_mutex);</div><div class='add'>+	guard(mutex)(&amp;atc-&gt;atc_mutex);</div><div class='ctx'> 	dao = container_of(atc-&gt;daios[SPDIFOO], struct dao, daio);</div><div class='ctx'> 	da_dsc.msr = state ? 1 : atc-&gt;msr;</div><div class='ctx'> 	da_dsc.passthru = state ? 1 : 0;</div><div class='hunk'>@@ -1092,7 +1160,6 @@ static int atc_spdif_out_passthru(struct ct_atc *atc, unsigned char state)</div><div class='ctx'> 	}</div><div class='ctx'> 	dao-&gt;ops-&gt;set_spos(dao, spos);</div><div class='ctx'> 	dao-&gt;ops-&gt;commit_write(dao);</div><div class='del'>-	mutex_unlock(&amp;atc-&gt;atc_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1102,7 +1169,6 @@ static int atc_release_resources(struct ct_atc *atc)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct daio_mgr *daio_mgr = NULL;</div><div class='ctx'> 	struct dao *dao = NULL;</div><div class='del'>-	struct dai *dai = NULL;</div><div class='ctx'> 	struct daio *daio = NULL;</div><div class='ctx'> 	struct sum_mgr *sum_mgr = NULL;</div><div class='ctx'> 	struct src_mgr *src_mgr = NULL;</div><div class='hunk'>@@ -1123,15 +1189,14 @@ static int atc_release_resources(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 	if (atc-&gt;daios) {</div><div class='ctx'> 		daio_mgr = (struct daio_mgr *)atc-&gt;rsc_mgrs[DAIO];</div><div class='del'>-		for (i = 0; i &lt; atc-&gt;n_daio; i++) {</div><div class='add'>+		for (i = 0; i &lt; NUM_DAIOTYP; i++) {</div><div class='ctx'> 			daio = atc-&gt;daios[i];</div><div class='del'>-			if (daio-&gt;type &lt; LINEIM) {</div><div class='add'>+			if (!daio)</div><div class='add'>+				continue;</div><div class='add'>+			if (daio-&gt;output) {</div><div class='ctx'> 				dao = container_of(daio, struct dao, daio);</div><div class='ctx'> 				dao-&gt;ops-&gt;clear_left_input(dao);</div><div class='ctx'> 				dao-&gt;ops-&gt;clear_right_input(dao);</div><div class='del'>-			} else {</div><div class='del'>-				dai = container_of(daio, struct dai, daio);</div><div class='del'>-				/* some thing to do for dai ... */</div><div class='ctx'> 			}</div><div class='ctx'> 			daio_mgr-&gt;put_daio(daio_mgr, daio);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1141,8 +1206,9 @@ static int atc_release_resources(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 	if (atc-&gt;pcm) {</div><div class='ctx'> 		sum_mgr = atc-&gt;rsc_mgrs[SUM];</div><div class='del'>-		for (i = 0; i &lt; atc-&gt;n_pcm; i++)</div><div class='del'>-			sum_mgr-&gt;put_sum(sum_mgr, atc-&gt;pcm[i]);</div><div class='add'>+		for (i = 0; i &lt; NUM_ATC_PCM; i++)</div><div class='add'>+			if (atc-&gt;pcm[i])</div><div class='add'>+				sum_mgr-&gt;put_sum(sum_mgr, atc-&gt;pcm[i]);</div><div class='ctx'> </div><div class='ctx'> 		kfree(atc-&gt;pcm);</div><div class='ctx'> 		atc-&gt;pcm = NULL;</div><div class='hunk'>@@ -1150,8 +1216,9 @@ static int atc_release_resources(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 	if (atc-&gt;srcs) {</div><div class='ctx'> 		src_mgr = atc-&gt;rsc_mgrs[SRC];</div><div class='del'>-		for (i = 0; i &lt; atc-&gt;n_src; i++)</div><div class='del'>-			src_mgr-&gt;put_src(src_mgr, atc-&gt;srcs[i]);</div><div class='add'>+		for (i = 0; i &lt; NUM_ATC_SRCS; i++)</div><div class='add'>+			if (atc-&gt;srcs[i])</div><div class='add'>+				src_mgr-&gt;put_src(src_mgr, atc-&gt;srcs[i]);</div><div class='ctx'> </div><div class='ctx'> 		kfree(atc-&gt;srcs);</div><div class='ctx'> 		atc-&gt;srcs = NULL;</div><div class='hunk'>@@ -1159,7 +1226,9 @@ static int atc_release_resources(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 	if (atc-&gt;srcimps) {</div><div class='ctx'> 		srcimp_mgr = atc-&gt;rsc_mgrs[SRCIMP];</div><div class='del'>-		for (i = 0; i &lt; atc-&gt;n_srcimp; i++) {</div><div class='add'>+		for (i = 0; i &lt; NUM_ATC_SRCS; i++) {</div><div class='add'>+			if (!atc-&gt;srcimps[i])</div><div class='add'>+				continue;</div><div class='ctx'> 			srcimp = atc-&gt;srcimps[i];</div><div class='ctx'> 			srcimp-&gt;ops-&gt;unmap(srcimp);</div><div class='ctx'> 			srcimp_mgr-&gt;put_srcimp(srcimp_mgr, atc-&gt;srcimps[i]);</div><div class='hunk'>@@ -1196,7 +1265,7 @@ static int ct_atc_destroy(struct ct_atc *atc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (atc-&gt;hw)</div><div class='del'>-		destroy_hw_obj((struct hw *)atc-&gt;hw);</div><div class='add'>+		destroy_hw_obj(atc-&gt;hw);</div><div class='ctx'> </div><div class='ctx'> 	/* Destroy device virtual memory manager object */</div><div class='ctx'> 	if (atc-&gt;vm) {</div><div class='hunk'>@@ -1215,7 +1284,7 @@ static int atc_dev_free(struct snd_device *dev)</div><div class='ctx'> 	return ct_atc_destroy(atc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit atc_identify_card(struct ct_atc *atc, unsigned int ssid)</div><div class='add'>+static int atc_identify_card(struct ct_atc *atc, unsigned int ssid)</div><div class='ctx'> {</div><div class='ctx'> 	const struct snd_pci_quirk *p;</div><div class='ctx'> 	const struct snd_pci_quirk *list;</div><div class='hunk'>@@ -1243,9 +1312,9 @@ static int __devinit atc_identify_card(struct ct_atc *atc, unsigned int ssid)</div><div class='ctx'> 	p = snd_pci_quirk_lookup_id(vendor_id, device_id, list);</div><div class='ctx'> 	if (p) {</div><div class='ctx'> 		if (p-&gt;value &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "ctxfi: "</div><div class='del'>-			       "Device %04x:%04x is black-listed\n",</div><div class='del'>-			       vendor_id, device_id);</div><div class='add'>+			dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+				"Device %04x:%04x is on the denylist\n",</div><div class='add'>+				vendor_id, device_id);</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 		}</div><div class='ctx'> 		atc-&gt;model = p-&gt;value;</div><div class='hunk'>@@ -1256,13 +1325,14 @@ static int __devinit atc_identify_card(struct ct_atc *atc, unsigned int ssid)</div><div class='ctx'> 			atc-&gt;model = CT20K2_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> 	atc-&gt;model_name = ct_subsys_name[atc-&gt;model];</div><div class='del'>-	snd_printd("ctxfi: chip %s model %s (%04x:%04x) is found\n",</div><div class='add'>+	dev_info(atc-&gt;card-&gt;dev, "chip %s model %s (%04x:%04x) is found\n",</div><div class='ctx'> 		   atc-&gt;chip_name, atc-&gt;model_name,</div><div class='ctx'> 		   vendor_id, device_id);</div><div class='add'>+	atc-&gt;rca_state = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc)</div><div class='add'>+int ct_atc_create_alsa_devs(struct ct_atc *atc)</div><div class='ctx'> {</div><div class='ctx'> 	enum CTALSADEVS i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1276,8 +1346,8 @@ int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc)</div><div class='ctx'> 		err = alsa_dev_funcs[i].create(atc, i,</div><div class='ctx'> 				alsa_dev_funcs[i].public_name);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "ctxfi: "</div><div class='del'>-			       "Creating alsa device %d failed!\n", i);</div><div class='add'>+			dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+				"Creating alsa device %d failed!\n", i);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1285,7 +1355,7 @@ int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit atc_create_hw_devs(struct ct_atc *atc)</div><div class='add'>+static int atc_create_hw_devs(struct ct_atc *atc)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw *hw;</div><div class='ctx'> 	struct card_conf info = {0};</div><div class='hunk'>@@ -1293,9 +1363,10 @@ static int __devinit atc_create_hw_devs(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 	err = create_hw_obj(atc-&gt;pci, atc-&gt;chip_type, atc-&gt;model, &amp;hw);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "Failed to create hw obj!!!\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev, "Failed to create hw obj!!!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='add'>+	hw-&gt;card = atc-&gt;card;</div><div class='ctx'> 	atc-&gt;hw = hw;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize card hardware. */</div><div class='hunk'>@@ -1312,8 +1383,8 @@ static int __devinit atc_create_hw_devs(struct ct_atc *atc)</div><div class='ctx'> </div><div class='ctx'> 		err = rsc_mgr_funcs[i].create(atc-&gt;hw, &amp;atc-&gt;rsc_mgrs[i]);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "ctxfi: "</div><div class='del'>-			       "Failed to create rsc_mgr %d!!!\n", i);</div><div class='add'>+			dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+				"Failed to create rsc_mgr %d!!!\n", i);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1331,91 +1402,76 @@ static int atc_get_resources(struct ct_atc *atc)</div><div class='ctx'> 	struct srcimp_mgr *srcimp_mgr;</div><div class='ctx'> 	struct sum_desc sum_dsc = {0};</div><div class='ctx'> 	struct sum_mgr *sum_mgr;</div><div class='add'>+	struct capabilities cap;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='del'>-	atc-&gt;daios = kzalloc(sizeof(void *)*(DAIONUM), GFP_KERNEL);</div><div class='add'>+	cap = atc-&gt;capabilities(atc);</div><div class='add'>+</div><div class='add'>+	atc-&gt;daios = kcalloc(NUM_DAIOTYP, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!atc-&gt;daios)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	atc-&gt;srcs = kzalloc(sizeof(void *)*(2*2), GFP_KERNEL);</div><div class='add'>+	atc-&gt;srcs = kcalloc(NUM_ATC_SRCS, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!atc-&gt;srcs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	atc-&gt;srcimps = kzalloc(sizeof(void *)*(2*2), GFP_KERNEL);</div><div class='add'>+	atc-&gt;srcimps = kcalloc(NUM_ATC_SRCS, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!atc-&gt;srcimps)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	atc-&gt;pcm = kzalloc(sizeof(void *)*(2*4), GFP_KERNEL);</div><div class='add'>+	atc-&gt;pcm = kcalloc(NUM_ATC_PCM, sizeof(void *), GFP_KERNEL);</div><div class='ctx'> 	if (!atc-&gt;pcm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	daio_mgr = (struct daio_mgr *)atc-&gt;rsc_mgrs[DAIO];</div><div class='ctx'> 	da_desc.msr = atc-&gt;msr;</div><div class='del'>-	for (i = 0, atc-&gt;n_daio = 0; i &lt; DAIONUM-1; i++) {</div><div class='del'>-		da_desc.type = i;</div><div class='add'>+	for (i = 0; i &lt; NUM_DAIOTYP; i++) {</div><div class='add'>+		if (((i == MIC) &amp;&amp; !cap.dedicated_mic) || ((i == RCA) &amp;&amp; !cap.dedicated_rca))</div><div class='add'>+			continue;</div><div class='add'>+		da_desc.type = (atc-&gt;model != CTSB073X) ? i :</div><div class='add'>+			     ((i == SPDIFIO) ? SPDIFI1 : i);</div><div class='add'>+		da_desc.output = (i &lt; LINEIM) || (i == RCA);</div><div class='ctx'> 		err = daio_mgr-&gt;get_daio(daio_mgr, &amp;da_desc,</div><div class='ctx'> 					(struct daio **)&amp;atc-&gt;daios[i]);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "ctxfi: Failed to get DAIO "</div><div class='del'>-					"resource %d!!!\n", i);</div><div class='add'>+			dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+				"Failed to get DAIO resource %d!!!\n",</div><div class='add'>+				i);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		atc-&gt;n_daio++;</div><div class='ctx'> 	}</div><div class='del'>-	if (atc-&gt;model == CTSB073X)</div><div class='del'>-		da_desc.type = SPDIFI1;</div><div class='del'>-	else</div><div class='del'>-		da_desc.type = SPDIFIO;</div><div class='del'>-	err = daio_mgr-&gt;get_daio(daio_mgr, &amp;da_desc,</div><div class='del'>-				(struct daio **)&amp;atc-&gt;daios[i]);</div><div class='del'>-	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Failed to get S/PDIF-in resource!!!\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	atc-&gt;n_daio++;</div><div class='ctx'> </div><div class='ctx'> 	src_mgr = atc-&gt;rsc_mgrs[SRC];</div><div class='ctx'> 	src_dsc.multi = 1;</div><div class='ctx'> 	src_dsc.msr = atc-&gt;msr;</div><div class='ctx'> 	src_dsc.mode = ARCRW;</div><div class='del'>-	for (i = 0, atc-&gt;n_src = 0; i &lt; (2*2); i++) {</div><div class='add'>+	for (i = 0; i &lt; NUM_ATC_SRCS; i++) {</div><div class='add'>+		if (((i &gt; 3) &amp;&amp; !cap.dedicated_mic))</div><div class='add'>+			continue;</div><div class='ctx'> 		err = src_mgr-&gt;get_src(src_mgr, &amp;src_dsc,</div><div class='ctx'> 					(struct src **)&amp;atc-&gt;srcs[i]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		atc-&gt;n_src++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	srcimp_mgr = atc-&gt;rsc_mgrs[SRCIMP];</div><div class='del'>-	srcimp_dsc.msr = 8; /* SRCIMPs for S/PDIFIn SRT */</div><div class='del'>-	for (i = 0, atc-&gt;n_srcimp = 0; i &lt; (2*1); i++) {</div><div class='add'>+	srcimp_dsc.msr = 8;</div><div class='add'>+	for (i = 0; i &lt; NUM_ATC_SRCS; i++) {</div><div class='add'>+		if (((i &gt; 3) &amp;&amp; !cap.dedicated_mic))</div><div class='add'>+			continue;</div><div class='ctx'> 		err = srcimp_mgr-&gt;get_srcimp(srcimp_mgr, &amp;srcimp_dsc,</div><div class='ctx'> 					(struct srcimp **)&amp;atc-&gt;srcimps[i]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		atc-&gt;n_srcimp++;</div><div class='del'>-	}</div><div class='del'>-	srcimp_dsc.msr = 8; /* SRCIMPs for LINE/MICIn SRT */</div><div class='del'>-	for (i = 0; i &lt; (2*1); i++) {</div><div class='del'>-		err = srcimp_mgr-&gt;get_srcimp(srcimp_mgr, &amp;srcimp_dsc,</div><div class='del'>-				(struct srcimp **)&amp;atc-&gt;srcimps[2*1+i]);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		atc-&gt;n_srcimp++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sum_mgr = atc-&gt;rsc_mgrs[SUM];</div><div class='ctx'> 	sum_dsc.msr = atc-&gt;msr;</div><div class='del'>-	for (i = 0, atc-&gt;n_pcm = 0; i &lt; (2*4); i++) {</div><div class='add'>+	for (i = 0; i &lt; NUM_ATC_PCM; i++) {</div><div class='ctx'> 		err = sum_mgr-&gt;get_sum(sum_mgr, &amp;sum_dsc,</div><div class='ctx'> 					(struct sum **)&amp;atc-&gt;pcm[i]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		atc-&gt;n_pcm++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1468,9 +1524,11 @@ static void atc_connect_resources(struct ct_atc *atc)</div><div class='ctx'> 	struct sum *sum;</div><div class='ctx'> 	struct ct_mixer *mixer;</div><div class='ctx'> 	struct rsc *rscs[2] = {NULL};</div><div class='add'>+	struct capabilities cap;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	mixer = atc-&gt;mixer;</div><div class='add'>+	cap = atc-&gt;capabilities(atc);</div><div class='ctx'> </div><div class='ctx'> 	for (i = MIX_WAVE_FRONT, j = LINEO1; i &lt;= MIX_SPDIF_OUT; i++, j++) {</div><div class='ctx'> 		mixer-&gt;get_output_ports(mixer, i, &amp;rscs[0], &amp;rscs[1]);</div><div class='hunk'>@@ -1479,6 +1537,11 @@ static void atc_connect_resources(struct ct_atc *atc)</div><div class='ctx'> 		dao-&gt;ops-&gt;set_right_input(dao, rscs[1]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cap.dedicated_rca) {</div><div class='add'>+		/* SE-300PCIE has a dedicated DAC for the RCA. */</div><div class='add'>+		atc_dedicated_rca_select(atc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dai = container_of(atc-&gt;daios[LINEIM], struct dai, daio);</div><div class='ctx'> 	atc_connect_dai(atc-&gt;rsc_mgrs[SRC], dai,</div><div class='ctx'> 			(struct src **)&amp;atc-&gt;srcs[2],</div><div class='hunk'>@@ -1488,6 +1551,19 @@ static void atc_connect_resources(struct ct_atc *atc)</div><div class='ctx'> 	src = atc-&gt;srcs[3];</div><div class='ctx'> 	mixer-&gt;set_input_right(mixer, MIX_LINE_IN, &amp;src-&gt;rsc);</div><div class='ctx'> </div><div class='add'>+	if (cap.dedicated_mic) {</div><div class='add'>+		/* Titanium HD has a dedicated ADC for the Mic. */</div><div class='add'>+		/* SE-300PCIE has a 4-channel ADC. */</div><div class='add'>+		dai = container_of(atc-&gt;daios[MIC], struct dai, daio);</div><div class='add'>+		atc_connect_dai(atc-&gt;rsc_mgrs[SRC], dai,</div><div class='add'>+			(struct src **)&amp;atc-&gt;srcs[4],</div><div class='add'>+			(struct srcimp **)&amp;atc-&gt;srcimps[4]);</div><div class='add'>+		src = atc-&gt;srcs[4];</div><div class='add'>+		mixer-&gt;set_input_left(mixer, MIX_MIC_IN, &amp;src-&gt;rsc);</div><div class='add'>+		src = atc-&gt;srcs[5];</div><div class='add'>+		mixer-&gt;set_input_right(mixer, MIX_MIC_IN, &amp;src-&gt;rsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dai = container_of(atc-&gt;daios[SPDIFIO], struct dai, daio);</div><div class='ctx'> 	atc_connect_dai(atc-&gt;rsc_mgrs[SRC], dai,</div><div class='ctx'> 			(struct src **)&amp;atc-&gt;srcs[0],</div><div class='hunk'>@@ -1506,24 +1582,16 @@ static void atc_connect_resources(struct ct_atc *atc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int atc_suspend(struct ct_atc *atc, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int atc_suspend(struct ct_atc *atc)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct hw *hw = atc-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(atc-&gt;card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	for (i = FRONT; i &lt; NUM_PCMS; i++) {</div><div class='del'>-		if (!atc-&gt;pcms[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		snd_pcm_suspend_all(atc-&gt;pcms[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	atc_release_resources(atc);</div><div class='ctx'> </div><div class='del'>-	hw-&gt;suspend(hw, state);</div><div class='add'>+	hw-&gt;suspend(hw);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1568,8 +1636,8 @@ static int atc_resume(struct ct_atc *atc)</div><div class='ctx'> 	/* Do hardware resume. */</div><div class='ctx'> 	err = atc_hw_resume(atc);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+			"pci_enable_device failed, disabling device\n");</div><div class='ctx'> 		snd_card_disconnect(atc-&gt;card);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1584,7 +1652,7 @@ static int atc_resume(struct ct_atc *atc)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct ct_atc atc_preset __devinitdata = {</div><div class='add'>+static const struct ct_atc atc_preset = {</div><div class='ctx'> 	.map_audio_buffer = ct_map_audio_buffer,</div><div class='ctx'> 	.unmap_audio_buffer = ct_unmap_audio_buffer,</div><div class='ctx'> 	.pcm_playback_prepare = atc_pcm_playback_prepare,</div><div class='hunk'>@@ -1606,13 +1674,20 @@ static struct ct_atc atc_preset __devinitdata = {</div><div class='ctx'> 	.line_clfe_unmute = atc_line_clfe_unmute,</div><div class='ctx'> 	.line_rear_unmute = atc_line_rear_unmute,</div><div class='ctx'> 	.line_in_unmute = atc_line_in_unmute,</div><div class='add'>+	.mic_unmute = atc_mic_unmute,</div><div class='add'>+	.rca_unmute = atc_rca_unmute,</div><div class='ctx'> 	.spdif_out_unmute = atc_spdif_out_unmute,</div><div class='ctx'> 	.spdif_in_unmute = atc_spdif_in_unmute,</div><div class='ctx'> 	.spdif_out_get_status = atc_spdif_out_get_status,</div><div class='ctx'> 	.spdif_out_set_status = atc_spdif_out_set_status,</div><div class='ctx'> 	.spdif_out_passthru = atc_spdif_out_passthru,</div><div class='del'>-	.have_digit_io_switch = atc_have_digit_io_switch,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+	.capabilities = atc_capabilities,</div><div class='add'>+	.dedicated_rca_select = atc_dedicated_rca_select,</div><div class='add'>+	.output_switch_get = atc_output_switch_get,</div><div class='add'>+	.output_switch_put = atc_output_switch_put,</div><div class='add'>+	.mic_source_switch_get = atc_mic_source_switch_get,</div><div class='add'>+	.mic_source_switch_put = atc_mic_source_switch_put,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	.suspend = atc_suspend,</div><div class='ctx'> 	.resume = atc_resume,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1622,21 +1697,25 @@ static struct ct_atc atc_preset __devinitdata = {</div><div class='ctx'>  *  ct_atc_create - create and initialize a hardware manager</div><div class='ctx'>  *  @card: corresponding alsa card object</div><div class='ctx'>  *  @pci: corresponding kernel pci device object</div><div class='add'>+ *  @rsr: reference sampling rate</div><div class='add'>+ *  @msr: master sampling rate</div><div class='add'>+ *  @chip_type: CHIPTYP enum values</div><div class='add'>+ *  @ssid: vendor ID (upper 16 bits) and device ID (lower 16 bits)</div><div class='ctx'>  *  @ratc: return created object address in it</div><div class='ctx'>  *</div><div class='ctx'>  *  Creates and initializes a hardware manager.</div><div class='ctx'>  *</div><div class='ctx'>  *  Creates kmallocated ct_atc structure. Initializes hardware.</div><div class='del'>- *  Returns 0 if suceeds, or negative error code if fails.</div><div class='add'>+ *  Returns 0 if succeeds, or negative error code if fails.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='del'>-			    unsigned int rsr, unsigned int msr,</div><div class='del'>-			    int chip_type, unsigned int ssid,</div><div class='del'>-			    struct ct_atc **ratc)</div><div class='add'>+int ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='add'>+		  unsigned int rsr, unsigned int msr,</div><div class='add'>+		  int chip_type, unsigned int ssid,</div><div class='add'>+		  struct ct_atc **ratc)</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_atc *atc;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='add'>+	static const struct snd_device_ops ops = {</div><div class='ctx'> 		.dev_free = atc_dev_free,</div><div class='ctx'> 	};</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1661,7 +1740,7 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='ctx'> 	/* Find card model */</div><div class='ctx'> 	err = atc_identify_card(atc, ssid);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctatc: Card not recognised\n");</div><div class='add'>+		dev_err(card-&gt;dev, "ctatc: Card not recognised\n");</div><div class='ctx'> 		goto error1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1677,7 +1756,7 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 	err = ct_mixer_create(atc, (struct ct_mixer **)&amp;atc-&gt;mixer);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Failed to create mixer obj!!!\n");</div><div class='add'>+		dev_err(card-&gt;dev, "Failed to create mixer obj!!!\n");</div><div class='ctx'> 		goto error1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1690,20 +1769,20 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='ctx'> 	atc_connect_resources(atc);</div><div class='ctx'> </div><div class='ctx'> 	atc-&gt;timer = ct_timer_new(atc);</div><div class='del'>-	if (!atc-&gt;timer)</div><div class='add'>+	if (!atc-&gt;timer) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, atc, &amp;ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto error1;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='ctx'> 	*ratc = atc;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error1:</div><div class='ctx'> 	ct_atc_destroy(atc);</div><div class='del'>-	printk(KERN_ERR "ctxfi: Something wrong!!!\n");</div><div class='add'>+	dev_err(card-&gt;dev, "Something wrong!!!\n");</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h<br/>index 7167c0185d52..ca0a9d5b86d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctatc.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctatc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctatc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctatc.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctatc.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Mar 28 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTATC_H</div><div class='hunk'>@@ -25,6 +21,7 @@</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ctvmem.h"</div><div class='add'>+#include "cthardware.h"</div><div class='ctx'> #include "ctresource.h"</div><div class='ctx'> </div><div class='ctx'> enum CTALSADEVS {		/* Types of alsa devices */</div><div class='hunk'>@@ -85,6 +82,8 @@ struct ct_atc {</div><div class='ctx'> 	const char *chip_name;</div><div class='ctx'> 	const char *model_name;</div><div class='ctx'> </div><div class='add'>+	unsigned char rca_state; /* 0 = dedicated RCA, 1 = 7.1ch Front */</div><div class='add'>+</div><div class='ctx'> 	struct ct_vm *vm; /* device virtual memory manager for this card */</div><div class='ctx'> 	int (*map_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm);</div><div class='ctx'> 	void (*unmap_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm);</div><div class='hunk'>@@ -115,30 +114,33 @@ struct ct_atc {</div><div class='ctx'> 	int (*line_clfe_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='ctx'> 	int (*line_rear_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='ctx'> 	int (*line_in_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='add'>+	int (*mic_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='add'>+	int (*rca_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='ctx'> 	int (*spdif_out_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='ctx'> 	int (*spdif_in_unmute)(struct ct_atc *atc, unsigned char state);</div><div class='ctx'> 	int (*spdif_out_get_status)(struct ct_atc *atc, unsigned int *status);</div><div class='ctx'> 	int (*spdif_out_set_status)(struct ct_atc *atc, unsigned int status);</div><div class='ctx'> 	int (*spdif_out_passthru)(struct ct_atc *atc, unsigned char state);</div><div class='del'>-	int (*have_digit_io_switch)(struct ct_atc *atc);</div><div class='add'>+	struct capabilities (*capabilities)(struct ct_atc *atc);</div><div class='add'>+	void (*dedicated_rca_select)(struct ct_atc *atc);</div><div class='add'>+	int (*output_switch_get)(struct ct_atc *atc);</div><div class='add'>+	int (*output_switch_put)(struct ct_atc *atc, int position);</div><div class='add'>+	int (*mic_source_switch_get)(struct ct_atc *atc);</div><div class='add'>+	int (*mic_source_switch_put)(struct ct_atc *atc, int position);</div><div class='ctx'> </div><div class='ctx'> 	/* Don't touch! Used for internal object. */</div><div class='ctx'> 	void *rsc_mgrs[NUM_RSCTYP]; /* chip resource managers */</div><div class='ctx'> 	void *mixer;		/* internal mixer object */</div><div class='del'>-	void *hw;		/* chip specific hardware access object */</div><div class='add'>+	struct hw *hw;		/* chip specific hardware access object */</div><div class='ctx'> 	void **daios;		/* digital audio io resources */</div><div class='ctx'> 	void **pcm;		/* SUMs for collecting all pcm stream */</div><div class='ctx'> 	void **srcs;		/* Sample Rate Converters for input signal */</div><div class='ctx'> 	void **srcimps;		/* input mappers for SRCs */</div><div class='del'>-	unsigned char n_daio;</div><div class='del'>-	unsigned char n_src;</div><div class='del'>-	unsigned char n_srcimp;</div><div class='del'>-	unsigned char n_pcm;</div><div class='ctx'> </div><div class='ctx'> 	struct ct_timer *timer;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	int (*suspend)(struct ct_atc *atc, pm_message_t state);</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	int (*suspend)(struct ct_atc *atc);</div><div class='ctx'> 	int (*resume)(struct ct_atc *atc);</div><div class='ctx'> #define NUM_PCMS (NUM_CTALSADEVS - 1)</div><div class='ctx'> 	struct snd_pcm *pcms[NUM_PCMS];</div><div class='hunk'>@@ -146,9 +148,9 @@ struct ct_atc {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='del'>-			    unsigned int rsr, unsigned int msr, int chip_type,</div><div class='del'>-			    unsigned int subsysid, struct ct_atc **ratc);</div><div class='del'>-int __devinit ct_atc_create_alsa_devs(struct ct_atc *atc);</div><div class='add'>+int ct_atc_create(struct snd_card *card, struct pci_dev *pci,</div><div class='add'>+		  unsigned int rsr, unsigned int msr, int chip_type,</div><div class='add'>+		  unsigned int subsysid, struct ct_atc **ratc);</div><div class='add'>+int ct_atc_create_alsa_devs(struct ct_atc *atc);</div><div class='ctx'> </div><div class='ctx'> #endif /* CTATC_H */</div><div class='head'>diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c<br/>index af56eb949bde..1c8f8efd836c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctdaio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctdaio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctdaio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctdaio.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctdaio.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 23 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctdaio.h"</div><div class='hunk'>@@ -22,20 +18,7 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DAIO_RESOURCE_NUM	NUM_DAIOTYP</div><div class='del'>-#define DAIO_OUT_MAX		SPDIFOO</div><div class='del'>-</div><div class='del'>-union daio_usage {</div><div class='del'>-	struct {</div><div class='del'>-		unsigned short lineo1:1;</div><div class='del'>-		unsigned short lineo2:1;</div><div class='del'>-		unsigned short lineo3:1;</div><div class='del'>-		unsigned short lineo4:1;</div><div class='del'>-		unsigned short spdifoo:1;</div><div class='del'>-		unsigned short lineim:1;</div><div class='del'>-		unsigned short spdifio:1;</div><div class='del'>-		unsigned short spdifi1:1;</div><div class='del'>-	} bf;</div><div class='add'>+struct daio_usage {</div><div class='ctx'> 	unsigned short data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +27,7 @@ struct daio_rsc_idx {</div><div class='ctx'> 	unsigned short right;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {</div><div class='add'>+static const struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {</div><div class='ctx'> 	[LINEO1] = {.left = 0x00, .right = 0x01},</div><div class='ctx'> 	[LINEO2] = {.left = 0x18, .right = 0x19},</div><div class='ctx'> 	[LINEO3] = {.left = 0x08, .right = 0x09},</div><div class='hunk'>@@ -55,22 +38,24 @@ struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = {</div><div class='ctx'> 	[SPDIFI1] = {.left = 0x95, .right = 0x9d},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {</div><div class='add'>+static const struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {</div><div class='ctx'> 	[LINEO1] = {.left = 0x40, .right = 0x41},</div><div class='ctx'> 	[LINEO2] = {.left = 0x60, .right = 0x61},</div><div class='ctx'> 	[LINEO3] = {.left = 0x50, .right = 0x51},</div><div class='ctx'> 	[LINEO4] = {.left = 0x70, .right = 0x71},</div><div class='ctx'> 	[LINEIM] = {.left = 0x45, .right = 0xc5},</div><div class='add'>+	[MIC]	 = {.left = 0x55, .right = 0xd5},</div><div class='add'>+	[RCA]	 = {.left = 0x30, .right = 0x31},</div><div class='ctx'> 	[SPDIFOO] = {.left = 0x00, .right = 0x01},</div><div class='ctx'> 	[SPDIFIO] = {.left = 0x05, .right = 0x85},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int daio_master(struct rsc *rsc)</div><div class='add'>+static void daio_master(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	/* Actually, this is not the resource index of DAIO.</div><div class='ctx'> 	 * For DAO, it is the input mapper index. And, for DAI,</div><div class='ctx'> 	 * it is the output time-slot index. */</div><div class='del'>-	return rsc-&gt;conj = rsc-&gt;idx;</div><div class='add'>+	rsc-&gt;conj = rsc-&gt;idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int daio_index(const struct rsc *rsc)</div><div class='hunk'>@@ -78,36 +63,36 @@ static int daio_index(const struct rsc *rsc)</div><div class='ctx'> 	return rsc-&gt;conj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int daio_out_next_conj(struct rsc *rsc)</div><div class='add'>+static void daio_out_next_conj(struct rsc *rsc)</div><div class='ctx'> {</div><div class='del'>-	return rsc-&gt;conj += 2;</div><div class='add'>+	rsc-&gt;conj += 2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int daio_in_next_conj_20k1(struct rsc *rsc)</div><div class='add'>+static void daio_in_next_conj_20k1(struct rsc *rsc)</div><div class='ctx'> {</div><div class='del'>-	return rsc-&gt;conj += 0x200;</div><div class='add'>+	rsc-&gt;conj += 0x200;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int daio_in_next_conj_20k2(struct rsc *rsc)</div><div class='add'>+static void daio_in_next_conj_20k2(struct rsc *rsc)</div><div class='ctx'> {</div><div class='del'>-	return rsc-&gt;conj += 0x100;</div><div class='add'>+	rsc-&gt;conj += 0x100;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops daio_out_rsc_ops = {</div><div class='add'>+static const struct rsc_ops daio_out_rsc_ops = {</div><div class='ctx'> 	.master		= daio_master,</div><div class='ctx'> 	.next_conj	= daio_out_next_conj,</div><div class='ctx'> 	.index		= daio_index,</div><div class='ctx'> 	.output_slot	= NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops daio_in_rsc_ops_20k1 = {</div><div class='add'>+static const struct rsc_ops daio_in_rsc_ops_20k1 = {</div><div class='ctx'> 	.master		= daio_master,</div><div class='ctx'> 	.next_conj	= daio_in_next_conj_20k1,</div><div class='ctx'> 	.index		= NULL,</div><div class='ctx'> 	.output_slot	= daio_index,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops daio_in_rsc_ops_20k2 = {</div><div class='add'>+static const struct rsc_ops daio_in_rsc_ops_20k2 = {</div><div class='ctx'> 	.master		= daio_master,</div><div class='ctx'> 	.next_conj	= daio_in_next_conj_20k2,</div><div class='ctx'> 	.index		= NULL,</div><div class='hunk'>@@ -138,6 +123,8 @@ static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw)</div><div class='ctx'> 		case LINEO3:	return 5;</div><div class='ctx'> 		case LINEO4:	return 6;</div><div class='ctx'> 		case LINEIM:	return 4;</div><div class='add'>+		case MIC:	return 5;</div><div class='add'>+		case RCA:	return 3;</div><div class='ctx'> 		default:	return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -149,19 +136,19 @@ static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc);</div><div class='ctx'> </div><div class='ctx'> static int dao_spdif_get_spos(struct dao *dao, unsigned int *spos)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dao-&gt;hw)-&gt;dao_get_spos(dao-&gt;ctrl_blk, spos);</div><div class='add'>+	dao-&gt;hw-&gt;dao_get_spos(dao-&gt;ctrl_blk, spos);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dao_spdif_set_spos(struct dao *dao, unsigned int spos)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dao-&gt;hw)-&gt;dao_set_spos(dao-&gt;ctrl_blk, spos);</div><div class='add'>+	dao-&gt;hw-&gt;dao_set_spos(dao-&gt;ctrl_blk, spos);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dao_commit_write(struct dao *dao)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dao-&gt;hw)-&gt;dao_commit_write(dao-&gt;hw,</div><div class='add'>+	dao-&gt;hw-&gt;dao_commit_write(dao-&gt;hw,</div><div class='ctx'> 		daio_device_index(dao-&gt;daio.type, dao-&gt;hw), dao-&gt;ctrl_blk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -172,10 +159,11 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)</div><div class='ctx'> 	struct daio *daio = &amp;dao-&gt;daio;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	entry = kzalloc((sizeof(*entry) * daio-&gt;rscl.msr), GFP_KERNEL);</div><div class='add'>+	entry = kcalloc(daio-&gt;rscl.msr, sizeof(*entry), GFP_KERNEL);</div><div class='ctx'> 	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dao-&gt;ops-&gt;clear_left_input(dao);</div><div class='ctx'> 	/* Program master and conjugate resources */</div><div class='ctx'> 	input-&gt;ops-&gt;master(input);</div><div class='ctx'> 	daio-&gt;rscl.ops-&gt;master(&amp;daio-&gt;rscl);</div><div class='hunk'>@@ -200,10 +188,11 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)</div><div class='ctx'> 	struct daio *daio = &amp;dao-&gt;daio;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	entry = kzalloc((sizeof(*entry) * daio-&gt;rscr.msr), GFP_KERNEL);</div><div class='add'>+	entry = kcalloc(daio-&gt;rscr.msr, sizeof(*entry), GFP_KERNEL);</div><div class='ctx'> 	if (!entry)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	dao-&gt;ops-&gt;clear_right_input(dao);</div><div class='ctx'> 	/* Program master and conjugate resources */</div><div class='ctx'> 	input-&gt;ops-&gt;master(input);</div><div class='ctx'> 	daio-&gt;rscr.ops-&gt;master(&amp;daio-&gt;rscr);</div><div class='hunk'>@@ -222,55 +211,33 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dao_clear_left_input(struct dao *dao)</div><div class='add'>+static int dao_clear_input(struct dao *dao, unsigned int start, unsigned int end)</div><div class='ctx'> {</div><div class='del'>-	struct imapper *entry;</div><div class='del'>-	struct daio *daio = &amp;dao-&gt;daio;</div><div class='del'>-	int i;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (!dao-&gt;imappers[0])</div><div class='add'>+	if (!dao-&gt;imappers[start])</div><div class='ctx'> 		return 0;</div><div class='del'>-</div><div class='del'>-	entry = dao-&gt;imappers[0];</div><div class='del'>-	dao-&gt;mgr-&gt;imap_delete(dao-&gt;mgr, entry);</div><div class='del'>-	/* Program conjugate resources */</div><div class='del'>-	for (i = 1; i &lt; daio-&gt;rscl.msr; i++) {</div><div class='del'>-		entry = dao-&gt;imappers[i];</div><div class='del'>-		dao-&gt;mgr-&gt;imap_delete(dao-&gt;mgr, entry);</div><div class='add'>+	for (i = start; i &lt; end; i++) {</div><div class='add'>+		dao-&gt;mgr-&gt;imap_delete(dao-&gt;mgr, dao-&gt;imappers[i]);</div><div class='ctx'> 		dao-&gt;imappers[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(dao-&gt;imappers[0]);</div><div class='del'>-	dao-&gt;imappers[0] = NULL;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dao_clear_right_input(struct dao *dao)</div><div class='del'>-{</div><div class='del'>-	struct imapper *entry;</div><div class='del'>-	struct daio *daio = &amp;dao-&gt;daio;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!dao-&gt;imappers[daio-&gt;rscl.msr])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	entry = dao-&gt;imappers[daio-&gt;rscl.msr];</div><div class='del'>-	dao-&gt;mgr-&gt;imap_delete(dao-&gt;mgr, entry);</div><div class='del'>-	/* Program conjugate resources */</div><div class='del'>-	for (i = 1; i &lt; daio-&gt;rscr.msr; i++) {</div><div class='del'>-		entry = dao-&gt;imappers[daio-&gt;rscl.msr + i];</div><div class='del'>-		dao-&gt;mgr-&gt;imap_delete(dao-&gt;mgr, entry);</div><div class='del'>-		dao-&gt;imappers[daio-&gt;rscl.msr + i] = NULL;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	kfree(dao-&gt;imappers[daio-&gt;rscl.msr]);</div><div class='del'>-	dao-&gt;imappers[daio-&gt;rscl.msr] = NULL;</div><div class='add'>+static int dao_clear_left_input(struct dao *dao)</div><div class='add'>+{</div><div class='add'>+	return dao_clear_input(dao, 0, dao-&gt;daio.rscl.msr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int dao_clear_right_input(struct dao *dao)</div><div class='add'>+{</div><div class='add'>+	return dao_clear_input(dao, dao-&gt;daio.rscl.msr,</div><div class='add'>+			dao-&gt;daio.rscl.msr + dao-&gt;daio.rscr.msr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dao_rsc_ops dao_ops = {</div><div class='add'>+static const struct dao_rsc_ops dao_ops = {</div><div class='ctx'> 	.set_spos		= dao_spdif_set_spos,</div><div class='ctx'> 	.commit_write		= dao_commit_write,</div><div class='ctx'> 	.get_spos		= dao_spdif_get_spos,</div><div class='hunk'>@@ -284,16 +251,14 @@ static struct dao_rsc_ops dao_ops = {</div><div class='ctx'> static int dai_set_srt_srcl(struct dai *dai, struct rsc *src)</div><div class='ctx'> {</div><div class='ctx'> 	src-&gt;ops-&gt;master(src);</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_srt_set_srcm(dai-&gt;ctrl_blk,</div><div class='del'>-						src-&gt;ops-&gt;index(src));</div><div class='add'>+	dai-&gt;hw-&gt;dai_srt_set_srcm(dai-&gt;ctrl_blk, src-&gt;ops-&gt;index(src));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dai_set_srt_srcr(struct dai *dai, struct rsc *src)</div><div class='ctx'> {</div><div class='ctx'> 	src-&gt;ops-&gt;master(src);</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_srt_set_srco(dai-&gt;ctrl_blk,</div><div class='del'>-						src-&gt;ops-&gt;index(src));</div><div class='add'>+	dai-&gt;hw-&gt;dai_srt_set_srco(dai-&gt;ctrl_blk, src-&gt;ops-&gt;index(src));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -304,30 +269,30 @@ static int dai_set_srt_msr(struct dai *dai, unsigned int msr)</div><div class='ctx'> 	for (rsr = 0; msr &gt; 1; msr &gt;&gt;= 1)</div><div class='ctx'> 		rsr++;</div><div class='ctx'> </div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_srt_set_rsr(dai-&gt;ctrl_blk, rsr);</div><div class='add'>+	dai-&gt;hw-&gt;dai_srt_set_rsr(dai-&gt;ctrl_blk, rsr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dai_set_enb_src(struct dai *dai, unsigned int enb)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_srt_set_ec(dai-&gt;ctrl_blk, enb);</div><div class='add'>+	dai-&gt;hw-&gt;dai_srt_set_ec(dai-&gt;ctrl_blk, enb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dai_set_enb_srt(struct dai *dai, unsigned int enb)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_srt_set_et(dai-&gt;ctrl_blk, enb);</div><div class='add'>+	dai-&gt;hw-&gt;dai_srt_set_et(dai-&gt;ctrl_blk, enb);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dai_commit_write(struct dai *dai)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_commit_write(dai-&gt;hw,</div><div class='add'>+	dai-&gt;hw-&gt;dai_commit_write(dai-&gt;hw,</div><div class='ctx'> 		daio_device_index(dai-&gt;daio.type, dai-&gt;hw), dai-&gt;ctrl_blk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dai_rsc_ops dai_ops = {</div><div class='add'>+static const struct dai_rsc_ops dai_ops = {</div><div class='ctx'> 	.set_srt_srcl		= dai_set_srt_srcl,</div><div class='ctx'> 	.set_srt_srcr		= dai_set_srt_srcr,</div><div class='ctx'> 	.set_srt_msr		= dai_set_srt_msr,</div><div class='hunk'>@@ -338,12 +303,12 @@ static struct dai_rsc_ops dai_ops = {</div><div class='ctx'> </div><div class='ctx'> static int daio_rsc_init(struct daio *daio,</div><div class='ctx'> 			 const struct daio_desc *desc,</div><div class='del'>-			 void *hw)</div><div class='add'>+			 struct hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int idx_l, idx_r;</div><div class='ctx'> </div><div class='del'>-	switch (((struct hw *)hw)-&gt;chip_type) {</div><div class='add'>+	switch (hw-&gt;chip_type) {</div><div class='ctx'> 	case ATC20K1:</div><div class='ctx'> 		idx_l = idx_20k1[desc-&gt;type].left;</div><div class='ctx'> 		idx_r = idx_20k1[desc-&gt;type].right;</div><div class='hunk'>@@ -364,10 +329,10 @@ static int daio_rsc_init(struct daio *daio,</div><div class='ctx'> 		goto error1;</div><div class='ctx'> </div><div class='ctx'> 	/* Set daio-&gt;rscl/r-&gt;ops to daio specific ones */</div><div class='del'>-	if (desc-&gt;type &lt;= DAIO_OUT_MAX) {</div><div class='add'>+	if (desc-&gt;output) {</div><div class='ctx'> 		daio-&gt;rscl.ops = daio-&gt;rscr.ops = &amp;daio_out_rsc_ops;</div><div class='ctx'> 	} else {</div><div class='del'>-		switch (((struct hw *)hw)-&gt;chip_type) {</div><div class='add'>+		switch (hw-&gt;chip_type) {</div><div class='ctx'> 		case ATC20K1:</div><div class='ctx'> 			daio-&gt;rscl.ops = daio-&gt;rscr.ops = &amp;daio_in_rsc_ops_20k1;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -379,6 +344,7 @@ static int daio_rsc_init(struct daio *daio,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	daio-&gt;type = desc-&gt;type;</div><div class='add'>+	daio-&gt;output = desc-&gt;output;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +373,8 @@ static int dao_rsc_init(struct dao *dao,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	dao-&gt;imappers = kzalloc(sizeof(void *)*desc-&gt;msr*2, GFP_KERNEL);</div><div class='add'>+	dao-&gt;imappers = kzalloc(array3_size(sizeof(void *), desc-&gt;msr, 2),</div><div class='add'>+				GFP_KERNEL);</div><div class='ctx'> 	if (!dao-&gt;imappers) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='hunk'>@@ -424,7 +391,7 @@ static int dao_rsc_init(struct dao *dao,</div><div class='ctx'> 	hw-&gt;daio_mgr_commit_write(hw, mgr-&gt;mgr.ctrl_blk);</div><div class='ctx'> </div><div class='ctx'> 	conf = (desc-&gt;msr &amp; 0x7) | (desc-&gt;passthru &lt;&lt; 3);</div><div class='del'>-	hw-&gt;daio_mgr_dao_init(mgr-&gt;mgr.ctrl_blk,</div><div class='add'>+	hw-&gt;daio_mgr_dao_init(hw, mgr-&gt;mgr.ctrl_blk,</div><div class='ctx'> 			daio_device_index(dao-&gt;daio.type, hw), conf);</div><div class='ctx'> 	hw-&gt;daio_mgr_enb_dao(mgr-&gt;mgr.ctrl_blk,</div><div class='ctx'> 			daio_device_index(dao-&gt;daio.type, hw));</div><div class='hunk'>@@ -452,7 +419,7 @@ static int dao_rsc_uninit(struct dao *dao)</div><div class='ctx'> 		kfree(dao-&gt;imappers);</div><div class='ctx'> 		dao-&gt;imappers = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	((struct hw *)dao-&gt;hw)-&gt;dao_put_ctrl_blk(dao-&gt;ctrl_blk);</div><div class='add'>+	dao-&gt;hw-&gt;dao_put_ctrl_blk(dao-&gt;ctrl_blk);</div><div class='ctx'> 	dao-&gt;hw = dao-&gt;ctrl_blk = NULL;</div><div class='ctx'> 	daio_rsc_uninit(&amp;dao-&gt;daio);</div><div class='ctx'> </div><div class='hunk'>@@ -467,6 +434,7 @@ static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc)</div><div class='ctx'> 	dsc.type = dao-&gt;daio.type;</div><div class='ctx'> 	dsc.msr = desc-&gt;msr;</div><div class='ctx'> 	dsc.passthru = desc-&gt;passthru;</div><div class='add'>+	dsc.output = dao-&gt;daio.output;</div><div class='ctx'> 	dao_rsc_uninit(dao);</div><div class='ctx'> 	return dao_rsc_init(dao, &amp;dsc, mgr);</div><div class='ctx'> }</div><div class='hunk'>@@ -509,7 +477,7 @@ error1:</div><div class='ctx'> </div><div class='ctx'> static int dai_rsc_uninit(struct dai *dai)</div><div class='ctx'> {</div><div class='del'>-	((struct hw *)dai-&gt;hw)-&gt;dai_put_ctrl_blk(dai-&gt;ctrl_blk);</div><div class='add'>+	dai-&gt;hw-&gt;dai_put_ctrl_blk(dai-&gt;ctrl_blk);</div><div class='ctx'> 	dai-&gt;hw = dai-&gt;ctrl_blk = NULL;</div><div class='ctx'> 	daio_rsc_uninit(&amp;dai-&gt;daio);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -517,17 +485,17 @@ static int dai_rsc_uninit(struct dai *dai)</div><div class='ctx'> </div><div class='ctx'> static int daio_mgr_get_rsc(struct rsc_mgr *mgr, enum DAIOTYP type)</div><div class='ctx'> {</div><div class='del'>-	if (((union daio_usage *)mgr-&gt;rscs)-&gt;data &amp; (0x1 &lt;&lt; type))</div><div class='add'>+	if (((struct daio_usage *)mgr-&gt;rscs)-&gt;data &amp; (0x1 &lt;&lt; type))</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	((union daio_usage *)mgr-&gt;rscs)-&gt;data |= (0x1 &lt;&lt; type);</div><div class='add'>+	((struct daio_usage *)mgr-&gt;rscs)-&gt;data |= (0x1 &lt;&lt; type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int daio_mgr_put_rsc(struct rsc_mgr *mgr, enum DAIOTYP type)</div><div class='ctx'> {</div><div class='del'>-	((union daio_usage *)mgr-&gt;rscs)-&gt;data &amp;= ~(0x1 &lt;&lt; type);</div><div class='add'>+	((struct daio_usage *)mgr-&gt;rscs)-&gt;data &amp;= ~(0x1 &lt;&lt; type);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -537,42 +505,43 @@ static int get_daio_rsc(struct daio_mgr *mgr,</div><div class='ctx'> 			struct daio **rdaio)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	struct dai *dai = NULL;</div><div class='del'>-	struct dao *dao = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	*rdaio = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether there are sufficient daio resources to meet request. */</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	err = daio_mgr_get_rsc(&amp;mgr-&gt;mgr, desc-&gt;type);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		err = daio_mgr_get_rsc(&amp;mgr-&gt;mgr, desc-&gt;type);</div><div class='add'>+	}</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "Can't meet DAIO resource request!\n");</div><div class='add'>+		dev_err(mgr-&gt;card-&gt;dev,</div><div class='add'>+			"Can't meet DAIO resource request!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = -ENOMEM;</div><div class='ctx'> 	/* Allocate mem for daio resource */</div><div class='del'>-	if (desc-&gt;type &lt;= DAIO_OUT_MAX) {</div><div class='del'>-		dao = kzalloc(sizeof(*dao), GFP_KERNEL);</div><div class='del'>-		if (!dao) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+	if (desc-&gt;output) {</div><div class='add'>+		struct dao *dao = kzalloc(sizeof(*dao), GFP_KERNEL);</div><div class='add'>+		if (!dao)</div><div class='ctx'> 			goto error;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		err = dao_rsc_init(dao, desc, mgr);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(dao);</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*rdaio = &amp;dao-&gt;daio;</div><div class='ctx'> 	} else {</div><div class='del'>-		dai = kzalloc(sizeof(*dai), GFP_KERNEL);</div><div class='del'>-		if (!dai) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		struct dai *dai = kzalloc(sizeof(*dai), GFP_KERNEL);</div><div class='add'>+		if (!dai)</div><div class='ctx'> 			goto error;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		err = dai_rsc_init(dai, desc, mgr);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(dai);</div><div class='ctx'> 			goto error;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*rdaio = &amp;dai-&gt;daio;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -583,29 +552,22 @@ static int get_daio_rsc(struct daio_mgr *mgr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='del'>-	if (dao)</div><div class='del'>-		kfree(dao);</div><div class='del'>-	else if (dai)</div><div class='del'>-		kfree(dai);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	daio_mgr_put_rsc(&amp;mgr-&gt;mgr, desc-&gt;type);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		daio_mgr_put_rsc(&amp;mgr-&gt;mgr, desc-&gt;type);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int put_daio_rsc(struct daio_mgr *mgr, struct daio *daio)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='ctx'> 	mgr-&gt;daio_disable(mgr, daio);</div><div class='ctx'> 	mgr-&gt;commit_write(mgr);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	daio_mgr_put_rsc(&amp;mgr-&gt;mgr, daio-&gt;type);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		daio_mgr_put_rsc(&amp;mgr-&gt;mgr, daio-&gt;type);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (daio-&gt;type &lt;= DAIO_OUT_MAX) {</div><div class='add'>+	if (daio-&gt;output) {</div><div class='ctx'> 		dao_rsc_uninit(container_of(daio, struct dao, daio));</div><div class='ctx'> 		kfree(container_of(daio, struct dao, daio));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -620,7 +582,7 @@ static int daio_mgr_enb_daio(struct daio_mgr *mgr, struct daio *daio)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw *hw = mgr-&gt;mgr.hw;</div><div class='ctx'> </div><div class='del'>-	if (DAIO_OUT_MAX &gt;= daio-&gt;type) {</div><div class='add'>+	if (daio-&gt;output) {</div><div class='ctx'> 		hw-&gt;daio_mgr_enb_dao(mgr-&gt;mgr.ctrl_blk,</div><div class='ctx'> 				daio_device_index(daio-&gt;type, hw));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -634,7 +596,7 @@ static int daio_mgr_dsb_daio(struct daio_mgr *mgr, struct daio *daio)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw *hw = mgr-&gt;mgr.hw;</div><div class='ctx'> </div><div class='del'>-	if (DAIO_OUT_MAX &gt;= daio-&gt;type) {</div><div class='add'>+	if (daio-&gt;output) {</div><div class='ctx'> 		hw-&gt;daio_mgr_dsb_dao(mgr-&gt;mgr.ctrl_blk,</div><div class='ctx'> 				daio_device_index(daio-&gt;type, hw));</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -659,34 +621,26 @@ static int daio_map_op(void *data, struct imapper *entry)</div><div class='ctx'> </div><div class='ctx'> static int daio_imap_add(struct daio_mgr *mgr, struct imapper *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;imap_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mgr-&gt;imap_lock);</div><div class='ctx'> 	if (!entry-&gt;addr &amp;&amp; mgr-&gt;init_imap_added) {</div><div class='ctx'> 		input_mapper_delete(&amp;mgr-&gt;imappers, mgr-&gt;init_imap,</div><div class='ctx'> 							daio_map_op, mgr);</div><div class='ctx'> 		mgr-&gt;init_imap_added = 0;</div><div class='ctx'> 	}</div><div class='del'>-	err = input_mapper_add(&amp;mgr-&gt;imappers, entry, daio_map_op, mgr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;imap_lock, flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return input_mapper_add(&amp;mgr-&gt;imappers, entry, daio_map_op, mgr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int daio_imap_delete(struct daio_mgr *mgr, struct imapper *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;imap_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mgr-&gt;imap_lock);</div><div class='ctx'> 	err = input_mapper_delete(&amp;mgr-&gt;imappers, entry, daio_map_op, mgr);</div><div class='ctx'> 	if (list_empty(&amp;mgr-&gt;imappers)) {</div><div class='ctx'> 		input_mapper_add(&amp;mgr-&gt;imappers, mgr-&gt;init_imap,</div><div class='ctx'> 							daio_map_op, mgr);</div><div class='ctx'> 		mgr-&gt;init_imap_added = 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;imap_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -699,7 +653,7 @@ static int daio_mgr_commit_write(struct daio_mgr *mgr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)</div><div class='add'>+int daio_mgr_create(struct hw *hw, void **rdaio_mgr)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	struct daio_mgr *daio_mgr;</div><div class='hunk'>@@ -710,7 +664,7 @@ int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)</div><div class='ctx'> 	if (!daio_mgr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = rsc_mgr_init(&amp;daio_mgr-&gt;mgr, DAIO, DAIO_RESOURCE_NUM, hw);</div><div class='add'>+	err = rsc_mgr_init(&amp;daio_mgr-&gt;mgr, DAIO, NUM_DAIOTYP, hw);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error1;</div><div class='ctx'> </div><div class='hunk'>@@ -734,12 +688,13 @@ int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)</div><div class='ctx'> 	daio_mgr-&gt;imap_add = daio_imap_add;</div><div class='ctx'> 	daio_mgr-&gt;imap_delete = daio_imap_delete;</div><div class='ctx'> 	daio_mgr-&gt;commit_write = daio_mgr_commit_write;</div><div class='add'>+	daio_mgr-&gt;card = hw-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		((struct hw *)hw)-&gt;daio_mgr_dsb_dao(daio_mgr-&gt;mgr.ctrl_blk, i);</div><div class='del'>-		((struct hw *)hw)-&gt;daio_mgr_dsb_dai(daio_mgr-&gt;mgr.ctrl_blk, i);</div><div class='add'>+		hw-&gt;daio_mgr_dsb_dao(daio_mgr-&gt;mgr.ctrl_blk, i);</div><div class='add'>+		hw-&gt;daio_mgr_dsb_dai(daio_mgr-&gt;mgr.ctrl_blk, i);</div><div class='ctx'> 	}</div><div class='del'>-	((struct hw *)hw)-&gt;daio_mgr_commit_write(hw, daio_mgr-&gt;mgr.ctrl_blk);</div><div class='add'>+	hw-&gt;daio_mgr_commit_write(hw, daio_mgr-&gt;mgr.ctrl_blk);</div><div class='ctx'> </div><div class='ctx'> 	*rdaio_mgr = daio_mgr;</div><div class='ctx'> </div><div class='hunk'>@@ -752,14 +707,14 @@ error1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int daio_mgr_destroy(struct daio_mgr *daio_mgr)</div><div class='add'>+int daio_mgr_destroy(void *ptr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct daio_mgr *daio_mgr = ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* free daio input mapper list */</div><div class='del'>-	spin_lock_irqsave(&amp;daio_mgr-&gt;imap_lock, flags);</div><div class='del'>-	free_input_mapper_list(&amp;daio_mgr-&gt;imappers);</div><div class='del'>-	spin_unlock_irqrestore(&amp;daio_mgr-&gt;imap_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;daio_mgr-&gt;imap_lock) {</div><div class='add'>+		free_input_mapper_list(&amp;daio_mgr-&gt;imappers);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rsc_mgr_uninit(&amp;daio_mgr-&gt;mgr);</div><div class='ctx'> 	kfree(daio_mgr);</div><div class='head'>diff --git a/sound/pci/ctxfi/ctdaio.h b/sound/pci/ctxfi/ctdaio.h<br/>index 0f52ce571ee8..ff77d55539a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctdaio.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctdaio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctdaio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctdaio.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctdaio.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 23 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTDAIO_H</div><div class='hunk'>@@ -23,6 +19,7 @@</div><div class='ctx'> #include "ctimap.h"</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Define the descriptor of a daio resource */</div><div class='ctx'> enum DAIOTYP {</div><div class='hunk'>@@ -33,6 +30,8 @@ enum DAIOTYP {</div><div class='ctx'> 	SPDIFOO,	/* S/PDIF Out (Flexijack/Optical) */</div><div class='ctx'> 	LINEIM,</div><div class='ctx'> 	SPDIFIO,	/* S/PDIF In (Flexijack/Optical) on the card */</div><div class='add'>+	MIC,		/* Dedicated mic on Titanium HD */</div><div class='add'>+	RCA,		/* Dedicated RCA on SE-300PCIE */</div><div class='ctx'> 	SPDIFI1,	/* S/PDIF In on internal Drive Bay */</div><div class='ctx'> 	NUM_DAIOTYP</div><div class='ctx'> };</div><div class='hunk'>@@ -45,21 +44,22 @@ struct daio {</div><div class='ctx'> 	struct rsc rscl;	/* Basic resource info for left TX/RX */</div><div class='ctx'> 	struct rsc rscr;	/* Basic resource info for right TX/RX */</div><div class='ctx'> 	enum DAIOTYP type;</div><div class='add'>+	unsigned char output;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dao {</div><div class='ctx'> 	struct daio daio;</div><div class='del'>-	struct dao_rsc_ops *ops;	/* DAO specific operations */</div><div class='add'>+	const struct dao_rsc_ops *ops;	/* DAO specific operations */</div><div class='ctx'> 	struct imapper **imappers;</div><div class='ctx'> 	struct daio_mgr *mgr;</div><div class='del'>-	void *hw;</div><div class='add'>+	struct hw *hw;</div><div class='ctx'> 	void *ctrl_blk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dai {</div><div class='ctx'> 	struct daio daio;</div><div class='del'>-	struct dai_rsc_ops *ops;	/* DAI specific operations */</div><div class='del'>-	void *hw;</div><div class='add'>+	const struct dai_rsc_ops *ops;	/* DAI specific operations */</div><div class='add'>+	struct hw *hw;</div><div class='ctx'> 	void *ctrl_blk;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -93,10 +93,12 @@ struct daio_desc {</div><div class='ctx'> 	unsigned int type:4;</div><div class='ctx'> 	unsigned int msr:4;</div><div class='ctx'> 	unsigned int passthru:1;</div><div class='add'>+	unsigned int output:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct daio_mgr {</div><div class='ctx'> 	struct rsc_mgr mgr;	/* Basic resource manager info */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	spinlock_t mgr_lock;</div><div class='ctx'> 	spinlock_t imap_lock;</div><div class='ctx'> 	struct list_head imappers;</div><div class='hunk'>@@ -116,7 +118,7 @@ struct daio_mgr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Constructor and destructor of daio resource manager */</div><div class='del'>-int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr);</div><div class='del'>-int daio_mgr_destroy(struct daio_mgr *daio_mgr);</div><div class='add'>+int daio_mgr_create(struct hw *hw, void **ptr);</div><div class='add'>+int daio_mgr_destroy(void *ptr);</div><div class='ctx'> </div><div class='ctx'> #endif /* CTDAIO_H */</div><div class='head'>diff --git a/sound/pci/ctxfi/cthardware.c b/sound/pci/ctxfi/cthardware.c<br/>index 8e64f4862e85..1d5064486217 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthardware.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthardware.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthardware.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthardware.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthardware.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Jun 26 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "cthardware.h"</div><div class='hunk'>@@ -20,8 +16,8 @@</div><div class='ctx'> #include "cthw20k2.h"</div><div class='ctx'> #include &lt;linux/bug.h&gt;</div><div class='ctx'> </div><div class='del'>-int __devinit create_hw_obj(struct pci_dev *pci, enum CHIPTYP chip_type,</div><div class='del'>-			    enum CTCARDS model, struct hw **rhw)</div><div class='add'>+int create_hw_obj(struct pci_dev *pci, enum CHIPTYP chip_type,</div><div class='add'>+		  enum CTCARDS model, struct hw **rhw)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +65,8 @@ unsigned int get_field(unsigned int data, unsigned int field)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!field);</div><div class='add'>+	if (WARN_ON(!field))</div><div class='add'>+		return 0;</div><div class='ctx'> 	/* @field should always be greater than 0 */</div><div class='ctx'> 	for (i = 0; !(field &amp; (1 &lt;&lt; i)); )</div><div class='ctx'> 		i++;</div><div class='hunk'>@@ -81,7 +78,8 @@ void set_field(unsigned int *data, unsigned int field, unsigned int value)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!field);</div><div class='add'>+	if (WARN_ON(!field))</div><div class='add'>+		return;</div><div class='ctx'> 	/* @field should always be greater than 0 */</div><div class='ctx'> 	for (i = 0; !(field &amp; (1 &lt;&lt; i)); )</div><div class='ctx'> 		i++;</div><div class='head'>diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h<br/>index af55405f5dec..a3051fdd31f6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthardware.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthardware.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthardware.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthardware.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthardware.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTHARDWARE_H</div><div class='hunk'>@@ -20,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> enum CHIPTYP {</div><div class='ctx'> 	ATC20K1,</div><div class='hunk'>@@ -29,8 +26,9 @@ enum CHIPTYP {</div><div class='ctx'> </div><div class='ctx'> enum CTCARDS {</div><div class='ctx'> 	/* 20k1 models */</div><div class='add'>+	CTSB046X,</div><div class='add'>+	CT20K1_MODEL_FIRST = CTSB046X,</div><div class='ctx'> 	CTSB055X,</div><div class='del'>-	CT20K1_MODEL_FIRST = CTSB055X,</div><div class='ctx'> 	CTSB073X,</div><div class='ctx'> 	CTUAA,</div><div class='ctx'> 	CT20K1_UNKNOWN,</div><div class='hunk'>@@ -39,6 +37,8 @@ enum CTCARDS {</div><div class='ctx'> 	CT20K2_MODEL_FIRST = CTSB0760,</div><div class='ctx'> 	CTHENDRIX,</div><div class='ctx'> 	CTSB0880,</div><div class='add'>+	CTSB1270,</div><div class='add'>+	CTOK0010,</div><div class='ctx'> 	CT20K2_UNKNOWN,</div><div class='ctx'> 	NUM_CTCARDS		/* This should always be the last */</div><div class='ctx'> };</div><div class='hunk'>@@ -60,17 +60,29 @@ struct card_conf {</div><div class='ctx'> 	unsigned int msr;	/* master sample rate in rsrs */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct capabilities {</div><div class='add'>+	unsigned int digit_io_switch:1;</div><div class='add'>+	unsigned int dedicated_mic:1;</div><div class='add'>+	unsigned int dedicated_rca:1;</div><div class='add'>+	unsigned int output_switch:1;</div><div class='add'>+	unsigned int mic_source_switch:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct hw {</div><div class='ctx'> 	int (*card_init)(struct hw *hw, struct card_conf *info);</div><div class='ctx'> 	int (*card_stop)(struct hw *hw);</div><div class='ctx'> 	int (*pll_init)(struct hw *hw, unsigned int rsr);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	int (*suspend)(struct hw *hw, pm_message_t state);</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	int (*suspend)(struct hw *hw);</div><div class='ctx'> 	int (*resume)(struct hw *hw, struct card_conf *info);</div><div class='ctx'> #endif</div><div class='ctx'> 	int (*is_adc_source_selected)(struct hw *hw, enum ADCSRC source);</div><div class='ctx'> 	int (*select_adc_source)(struct hw *hw, enum ADCSRC source);</div><div class='del'>-	int (*have_digit_io_switch)(struct hw *hw);</div><div class='add'>+	struct capabilities (*capabilities)(struct hw *hw);</div><div class='add'>+	int (*output_switch_get)(struct hw *hw);</div><div class='add'>+	int (*output_switch_put)(struct hw *hw, int position);</div><div class='add'>+	int (*mic_source_switch_get)(struct hw *hw);</div><div class='add'>+	int (*mic_source_switch_put)(struct hw *hw, int position);</div><div class='ctx'> </div><div class='ctx'> 	/* SRC operations */</div><div class='ctx'> 	int (*src_rsc_get_ctrl_blk)(void **rblk);</div><div class='hunk'>@@ -157,7 +169,7 @@ struct hw {</div><div class='ctx'> 	int (*daio_mgr_dsb_dai)(void *blk, unsigned int idx);</div><div class='ctx'> 	int (*daio_mgr_enb_dao)(void *blk, unsigned int idx);</div><div class='ctx'> 	int (*daio_mgr_dsb_dao)(void *blk, unsigned int idx);</div><div class='del'>-	int (*daio_mgr_dao_init)(void *blk, unsigned int idx,</div><div class='add'>+	int (*daio_mgr_dao_init)(struct hw *hw, void *blk, unsigned int idx,</div><div class='ctx'> 						unsigned int conf);</div><div class='ctx'> 	int (*daio_mgr_set_imaparc)(void *blk, unsigned int slot);</div><div class='ctx'> 	int (*daio_mgr_set_imapnxt)(void *blk, unsigned int next);</div><div class='hunk'>@@ -172,9 +184,10 @@ struct hw {</div><div class='ctx'> 	void *irq_callback_data;</div><div class='ctx'> </div><div class='ctx'> 	struct pci_dev *pci;	/* the pci kernel structure of this card */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	unsigned long io_base;</div><div class='del'>-	unsigned long mem_base;</div><div class='add'>+	void __iomem *mem_base;</div><div class='ctx'> </div><div class='ctx'> 	enum CHIPTYP chip_type;</div><div class='ctx'> 	enum CTCARDS model;</div><div class='head'>diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c<br/>index 0cf400f879f9..ea0a928937b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k1.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthw20k1.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthw20k1.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Jun 24 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -27,12 +23,6 @@</div><div class='ctx'> #include "cthw20k1.h"</div><div class='ctx'> #include "ct20k1reg.h"</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG == 32</div><div class='del'>-#define CT_XFI_DMA_MASK		DMA_BIT_MASK(32) /* 32 bit PTE */</div><div class='del'>-#else</div><div class='del'>-#define CT_XFI_DMA_MASK		DMA_BIT_MASK(64) /* 64 bit PTE */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> struct hw20k1 {</div><div class='ctx'> 	struct hw hw;</div><div class='ctx'> 	spinlock_t reg_20k1_lock;</div><div class='hunk'>@@ -178,7 +168,7 @@ static int src_get_rsc_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int src_put_rsc_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct src_rsc_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -504,7 +494,7 @@ static int src_mgr_get_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int src_mgr_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct src_mgr_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -525,7 +515,7 @@ static int srcimp_mgr_get_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int srcimp_mgr_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct srcimp_mgr_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -712,7 +702,7 @@ static int amixer_rsc_get_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int amixer_rsc_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct amixer_rsc_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -919,7 +909,7 @@ static int dai_get_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int dai_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct dai_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -968,7 +958,7 @@ static int dao_get_ctrl_blk(void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int dao_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct dao_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1041,7 +1031,7 @@ static int daio_mgr_dsb_dao(void *blk, unsigned int idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)</div><div class='add'>+static int daio_mgr_dao_init(struct hw *hw __maybe_unused, void *blk, unsigned int idx, unsigned int conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct daio_mgr_ctrl_blk *ctl = blk;</div><div class='ctx'> </div><div class='hunk'>@@ -1166,7 +1156,7 @@ static int daio_mgr_get_ctrl_blk(struct hw *hw, void **rblk)</div><div class='ctx'> </div><div class='ctx'> static int daio_mgr_put_ctrl_blk(void *blk)</div><div class='ctx'> {</div><div class='del'>-	kfree((struct daio_mgr_ctrl_blk *)blk);</div><div class='add'>+	kfree(blk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1268,7 +1258,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)</div><div class='ctx'> </div><div class='ctx'> 	/* Set up device page table */</div><div class='ctx'> 	if ((~0UL) == info-&gt;vm_pgt_phys) {</div><div class='del'>-		printk(KERN_ERR "Wrong device page table page address!\n");</div><div class='add'>+		dev_err(hw-&gt;card-&gt;dev,</div><div class='add'>+			"Wrong device page table page address!\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1285,7 +1276,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)</div><div class='ctx'> 	hw_write_20kx(hw, PTPALX, ptp_phys_low);</div><div class='ctx'> 	hw_write_20kx(hw, PTPAHX, ptp_phys_high);</div><div class='ctx'> 	hw_write_20kx(hw, TRNCTL, trnctl);</div><div class='del'>-	hw_write_20kx(hw, TRNIS, 0x200c01); /* realy needed? */</div><div class='add'>+	hw_write_20kx(hw, TRNIS, 0x200c01); /* really needed? */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1324,10 +1315,10 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		hw_write_20kx(hw, PLLCTL, pllctl);</div><div class='del'>-		mdelay(40);</div><div class='add'>+		msleep(40);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &gt;= 3) {</div><div class='del'>-		printk(KERN_ALERT "PLL initialization failed!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev, "PLL initialization failed!!!\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1351,7 +1342,7 @@ static int hw_auto_init(struct hw *hw)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!get_field(gctl, GCTL_AID)) {</div><div class='del'>-		printk(KERN_ALERT "Card Auto-init failed!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev, "Card Auto-init failed!!!\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1412,7 +1403,7 @@ static int hw_reset_dac(struct hw *hw)</div><div class='ctx'> 	/* To be effective, need to reset the DAC twice. */</div><div class='ctx'> 	for (i = 0; i &lt; 2;  i++) {</div><div class='ctx'> 		/* set gpio */</div><div class='del'>-		mdelay(100);</div><div class='add'>+		msleep(100);</div><div class='ctx'> 		gpioorg = (u16)hw_read_20kx(hw, GPIO);</div><div class='ctx'> 		gpioorg &amp;= 0xfffd;</div><div class='ctx'> 		hw_write_20kx(hw, GPIO, gpioorg);</div><div class='hunk'>@@ -1777,10 +1768,18 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)</div><div class='ctx'> 		return adc_init_SBx(hw, info-&gt;input, info-&gt;mic20db);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_have_digit_io_switch(struct hw *hw)</div><div class='add'>+static struct capabilities hw_capabilities(struct hw *hw)</div><div class='ctx'> {</div><div class='add'>+	struct capabilities cap;</div><div class='add'>+</div><div class='ctx'> 	/* SB073x and Vista compatible cards have no digit IO switch */</div><div class='del'>-	return !(hw-&gt;model == CTSB073X || hw-&gt;model == CTUAA);</div><div class='add'>+	cap.digit_io_switch = !(hw-&gt;model == CTSB073X || hw-&gt;model == CTUAA);</div><div class='add'>+	cap.dedicated_mic = 0;</div><div class='add'>+	cap.dedicated_rca = 0;</div><div class='add'>+	cap.output_switch = 0;</div><div class='add'>+	cap.mic_source_switch = 0;</div><div class='add'>+</div><div class='add'>+	return cap;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define CTLBITS(a, b, c, d)	(((a) &lt;&lt; 24) | ((b) &lt;&lt; 16) | ((c) &lt;&lt; 8) | (d))</div><div class='hunk'>@@ -1795,7 +1794,7 @@ static int uaa_to_xfi(struct pci_dev *pci)</div><div class='ctx'> 	unsigned int is_uaa;</div><div class='ctx'> 	unsigned int data[4] = {0};</div><div class='ctx'> 	unsigned int io_base;</div><div class='del'>-	void *mem_base;</div><div class='add'>+	void __iomem *mem_base;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	const u32 CTLX = CTLBITS('C', 'T', 'L', 'X');</div><div class='ctx'> 	const u32 CTL_ = CTLBITS('C', 'T', 'L', '-');</div><div class='hunk'>@@ -1896,20 +1895,15 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct pci_dev *pci = hw-&gt;pci;</div><div class='add'>+	const unsigned int dma_bits = BITS_PER_LONG;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Set DMA transfer mask */</div><div class='del'>-	if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "architecture does not support PCI "</div><div class='del'>-				"busmaster DMA with mask 0x%llx\n",</div><div class='del'>-		       CT_XFI_DMA_MASK);</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto error1;</div><div class='del'>-	}</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(dma_bits)))</div><div class='add'>+		dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> </div><div class='ctx'> 	if (!hw-&gt;io_base) {</div><div class='ctx'> 		err = pci_request_regions(pci, "XFi");</div><div class='hunk'>@@ -1923,7 +1917,7 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Switch to X-Fi mode from UAA mode if neeeded */</div><div class='add'>+	/* Switch to X-Fi mode from UAA mode if needed */</div><div class='ctx'> 	if (hw-&gt;model == CTUAA) {</div><div class='ctx'> 		err = uaa_to_xfi(pci);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1933,12 +1927,14 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;irq &lt; 0) {</div><div class='ctx'> 		err = request_irq(pci-&gt;irq, ct_20k1_interrupt, IRQF_SHARED,</div><div class='del'>-				  "ctxfi", hw);</div><div class='add'>+				  KBUILD_MODNAME, hw);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "XFi: Cannot get irq %d\n", pci-&gt;irq);</div><div class='add'>+			dev_err(hw-&gt;card-&gt;dev,</div><div class='add'>+				"XFi: Cannot get irq %d\n", pci-&gt;irq);</div><div class='ctx'> 			goto error2;</div><div class='ctx'> 		}</div><div class='ctx'> 		hw-&gt;irq = pci-&gt;irq;</div><div class='add'>+		hw-&gt;card-&gt;sync_irq = hw-&gt;irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='hunk'>@@ -1964,9 +1960,6 @@ static int hw_card_stop(struct hw *hw)</div><div class='ctx'> 	data = hw_read_20kx(hw, PLLCTL);</div><div class='ctx'> 	hw_write_20kx(hw, PLLCTL, (data &amp; (~(0x0F&lt;&lt;12))));</div><div class='ctx'> </div><div class='del'>-	/* TODO: Disable interrupt and so on... */</div><div class='del'>-	if (hw-&gt;irq &gt;= 0)</div><div class='del'>-		synchronize_irq(hw-&gt;irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1976,11 +1969,8 @@ static int hw_card_shutdown(struct hw *hw)</div><div class='ctx'> 		free_irq(hw-&gt;irq, hw);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;irq	= -1;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;mem_base)</div><div class='del'>-		iounmap((void *)hw-&gt;mem_base);</div><div class='del'>-</div><div class='del'>-	hw-&gt;mem_base = (unsigned long)NULL;</div><div class='add'>+	iounmap(hw-&gt;mem_base);</div><div class='add'>+	hw-&gt;mem_base = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;io_base)</div><div class='ctx'> 		pci_release_regions(hw-&gt;pci);</div><div class='hunk'>@@ -2031,7 +2021,7 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)</div><div class='ctx'> 	hw_write_20kx(hw, GIE, 0);</div><div class='ctx'> 	/* Reset all SRC pending interrupts */</div><div class='ctx'> 	hw_write_20kx(hw, SRCIP, 0);</div><div class='del'>-	mdelay(30);</div><div class='add'>+	msleep(30);</div><div class='ctx'> </div><div class='ctx'> 	/* Detect the card ID and configure GPIO accordingly. */</div><div class='ctx'> 	switch (hw-&gt;model) {</div><div class='hunk'>@@ -2078,8 +2068,8 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int hw_suspend(struct hw *hw, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int hw_suspend(struct hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pci = hw-&gt;pci;</div><div class='ctx'> </div><div class='hunk'>@@ -2090,20 +2080,11 @@ static int hw_suspend(struct hw *hw, pm_message_t state)</div><div class='ctx'> 		pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hw_resume(struct hw *hw, struct card_conf *info)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pci = hw-&gt;pci;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-</div><div class='ctx'> 	/* Re-initialize card hardware. */</div><div class='ctx'> 	return hw_card_init(hw, info);</div><div class='ctx'> }</div><div class='hunk'>@@ -2111,60 +2092,33 @@ static int hw_resume(struct hw *hw, struct card_conf *info)</div><div class='ctx'> </div><div class='ctx'> static u32 hw_read_20kx(struct hw *hw, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u32 value;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock);</div><div class='ctx'> 	outl(reg, hw-&gt;io_base + 0x0);</div><div class='del'>-	value = inl(hw-&gt;io_base + 0x4);</div><div class='del'>-	spin_unlock_irqrestore(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock, flags);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	return inl(hw-&gt;io_base + 0x4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hw_write_20kx(struct hw *hw, u32 reg, u32 data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock);</div><div class='ctx'> 	outl(reg, hw-&gt;io_base + 0x0);</div><div class='ctx'> 	outl(data, hw-&gt;io_base + 0x4);</div><div class='del'>-	spin_unlock_irqrestore(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_20k1_lock, flags);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 hw_read_pci(struct hw *hw, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u32 value;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock);</div><div class='ctx'> 	outl(reg, hw-&gt;io_base + 0x10);</div><div class='del'>-	value = inl(hw-&gt;io_base + 0x14);</div><div class='del'>-	spin_unlock_irqrestore(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock, flags);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	return inl(hw-&gt;io_base + 0x14);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hw_write_pci(struct hw *hw, u32 reg, u32 data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock);</div><div class='ctx'> 	outl(reg, hw-&gt;io_base + 0x10);</div><div class='ctx'> 	outl(data, hw-&gt;io_base + 0x14);</div><div class='del'>-	spin_unlock_irqrestore(</div><div class='del'>-		&amp;container_of(hw, struct hw20k1, hw)-&gt;reg_pci_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw ct20k1_preset __devinitdata = {</div><div class='add'>+static const struct hw ct20k1_preset = {</div><div class='ctx'> 	.irq = -1,</div><div class='ctx'> </div><div class='ctx'> 	.card_init = hw_card_init,</div><div class='hunk'>@@ -2172,8 +2126,8 @@ static struct hw ct20k1_preset __devinitdata = {</div><div class='ctx'> 	.pll_init = hw_pll_init,</div><div class='ctx'> 	.is_adc_source_selected = hw_is_adc_input_selected,</div><div class='ctx'> 	.select_adc_source = hw_adc_input_select,</div><div class='del'>-	.have_digit_io_switch = hw_have_digit_io_switch,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+	.capabilities = hw_capabilities,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	.suspend = hw_suspend,</div><div class='ctx'> 	.resume = hw_resume,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2268,7 +2222,7 @@ static struct hw ct20k1_preset __devinitdata = {</div><div class='ctx'> 	.get_wc = get_wc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit create_20k1_hw_obj(struct hw **rhw)</div><div class='add'>+int create_20k1_hw_obj(struct hw **rhw)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw20k1 *hw20k1;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ctxfi/cthw20k1.h b/sound/pci/ctxfi/cthw20k1.h<br/>index 02f72fb448a6..ffb019abf651 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k1.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k1.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthw20k1.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthw20k1.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTHW20K1_H</div><div class='head'>diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c<br/>index b6b11bfe7574..fac88f5590c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k2.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthw20k2.c</a></div><div class='hunk'>@@ -1,18 +1,14 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthw20k2.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='del'>- * This file contains the implementation of hardware access methord for 20k2.</div><div class='add'>+ * This file contains the implementation of hardware access method for 20k2.</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 14 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -26,18 +22,14 @@</div><div class='ctx'> #include "cthw20k2.h"</div><div class='ctx'> #include "ct20k2reg.h"</div><div class='ctx'> </div><div class='del'>-#if BITS_PER_LONG == 32</div><div class='del'>-#define CT_XFI_DMA_MASK		DMA_BIT_MASK(32) /* 32 bit PTE */</div><div class='del'>-#else</div><div class='del'>-#define CT_XFI_DMA_MASK		DMA_BIT_MASK(64) /* 64 bit PTE */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> struct hw20k2 {</div><div class='ctx'> 	struct hw hw;</div><div class='ctx'> 	/* for i2c */</div><div class='ctx'> 	unsigned char dev_id;</div><div class='ctx'> 	unsigned char addr_size;</div><div class='ctx'> 	unsigned char data_size;</div><div class='add'>+</div><div class='add'>+	int mic_source;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static u32 hw_read_20kx(struct hw *hw, u32 reg);</div><div class='hunk'>@@ -918,7 +910,7 @@ static int dao_commit_write(struct hw *hw, unsigned int idx, void *blk)</div><div class='ctx'> 	struct dao_ctrl_blk *ctl = blk;</div><div class='ctx'> </div><div class='ctx'> 	if (ctl-&gt;dirty.bf.atxcsl) {</div><div class='del'>-		if (idx &lt; 4) {</div><div class='add'>+		if ((idx &lt; 4) &amp;&amp; ((hw-&gt;model != CTOK0010) || (idx &lt; 3))) {</div><div class='ctx'> 			/* S/PDIF SPOSx */</div><div class='ctx'> 			hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_L+0x40*idx,</div><div class='ctx'> 							ctl-&gt;atxcsl);</div><div class='hunk'>@@ -993,13 +985,14 @@ static int daio_mgr_dsb_dao(void *blk, unsigned int idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)</div><div class='add'>+static int daio_mgr_dao_init(struct hw *hw, void *blk, unsigned int idx, unsigned int conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct daio_mgr_ctrl_blk *ctl = blk;</div><div class='ctx'> </div><div class='del'>-	if (idx &lt; 4) {</div><div class='add'>+	/* Port 3 is dedicated to RCA on SE-300PCIE */</div><div class='add'>+	if ((idx &lt; 4) &amp;&amp; ((hw-&gt;model != CTOK0010) || (idx &lt; 3))) {</div><div class='ctx'> 		/* S/PDIF output */</div><div class='del'>-		switch ((conf &amp; 0x7)) {</div><div class='add'>+		switch ((conf &amp; 0xf)) {</div><div class='ctx'> 		case 1:</div><div class='ctx'> 			set_field(&amp;ctl-&gt;txctl[idx], ATXCTL_NUC, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1163,7 +1156,12 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info)</div><div class='ctx'> 		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x01010101);</div><div class='ctx'> 		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);</div><div class='ctx'> 	} else if (2 == info-&gt;msr) {</div><div class='del'>-		hw_write_20kx(hw, AUDIO_IO_MCLK, 0x11111111);</div><div class='add'>+		if (hw-&gt;model != CTSB1270) {</div><div class='add'>+			hw_write_20kx(hw, AUDIO_IO_MCLK, 0x11111111);</div><div class='add'>+		} else {</div><div class='add'>+			/* PCM4220 on Titanium HD is different. */</div><div class='add'>+			hw_write_20kx(hw, AUDIO_IO_MCLK, 0x11011111);</div><div class='add'>+		}</div><div class='ctx'> 		/* Specify all playing 96khz</div><div class='ctx'> 		 * EA [0]	- Enabled</div><div class='ctx'> 		 * RTA [4:5]	- 96kHz</div><div class='hunk'>@@ -1175,13 +1173,25 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info)</div><div class='ctx'> 		 * RTD [28:29]	- 96kHz */</div><div class='ctx'> 		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x11111111);</div><div class='ctx'> 		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);</div><div class='add'>+	} else if ((4 == info-&gt;msr) &amp;&amp; (hw-&gt;model == CTSB1270)) {</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_MCLK, 0x21011111);</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);</div><div class='add'>+	} else if ((4 == info-&gt;msr) &amp;&amp; (hw-&gt;model == CTOK0010)) {</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_MCLK, 0x21212121);</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);</div><div class='add'>+		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: ERROR!!! Invalid sampling rate!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev,</div><div class='add'>+			  "ERROR!!! Invalid sampling rate!!!\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		if (i &lt;= 3) {</div><div class='add'>+		/* Port 3 is configured as I2S on SE-300PCIE */</div><div class='add'>+		if ((i &lt; 4) &amp;&amp; ((hw-&gt;model != CTOK0010) || (i &lt; 3))) {</div><div class='add'>+			/* This comment looks wrong since loop is over 4  */</div><div class='add'>+			/* channels and emu20k2 supports 4 spdif IOs.     */</div><div class='ctx'> 			/* 1st 3 channels are SPDIFs (SB0960) */</div><div class='ctx'> 			if (i == 3)</div><div class='ctx'> 				data = 0x1001001;</div><div class='hunk'>@@ -1206,12 +1216,16 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info)</div><div class='ctx'> </div><div class='ctx'> 			hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_H+(0x40*i), 0x0B);</div><div class='ctx'> 		} else {</div><div class='add'>+			/* Again, loop is over 4 channels not 5. */</div><div class='ctx'> 			/* Next 5 channels are I2S (SB0960) */</div><div class='ctx'> 			data = 0x11;</div><div class='ctx'> 			hw_write_20kx(hw, AUDIO_IO_RX_CTL+(0x40*i), data);</div><div class='ctx'> 			if (2 == info-&gt;msr) {</div><div class='ctx'> 				/* Four channels per sample period */</div><div class='ctx'> 				data |= 0x1000;</div><div class='add'>+			} else if (4 == info-&gt;msr) {</div><div class='add'>+				/* FIXME: check this against the chip spec */</div><div class='add'>+				data |= 0x2000;</div><div class='ctx'> 			}</div><div class='ctx'> 			hw_write_20kx(hw, AUDIO_IO_TX_CTL+(0x40*i), data);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1229,8 +1243,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)</div><div class='ctx'> </div><div class='ctx'> 	/* Set up device page table */</div><div class='ctx'> 	if ((~0UL) == info-&gt;vm_pgt_phys) {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: "</div><div class='del'>-		       "Wrong device page table page address!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev,</div><div class='add'>+			  "Wrong device page table page address!!!\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1299,21 +1313,18 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)</div><div class='ctx'> </div><div class='ctx'> 	pllenb = 0xB;</div><div class='ctx'> 	hw_write_20kx(hw, PLL_ENB, pllenb);</div><div class='del'>-	pllctl = 0x20D00000;</div><div class='del'>-	set_field(&amp;pllctl, PLLCTL_FD, 16 - 4);</div><div class='add'>+	pllctl = 0x20C00000;</div><div class='add'>+	set_field(&amp;pllctl, PLLCTL_B, 0);</div><div class='add'>+	set_field(&amp;pllctl, PLLCTL_FD, 48000 == rsr ? 16 - 4 : 147 - 4);</div><div class='add'>+	set_field(&amp;pllctl, PLLCTL_RD, 48000 == rsr ? 1 - 1 : 10 - 1);</div><div class='ctx'> 	hw_write_20kx(hw, PLL_CTL, pllctl);</div><div class='del'>-	mdelay(40);</div><div class='add'>+	msleep(40);</div><div class='add'>+</div><div class='ctx'> 	pllctl = hw_read_20kx(hw, PLL_CTL);</div><div class='del'>-	set_field(&amp;pllctl, PLLCTL_B, 0);</div><div class='del'>-	if (48000 == rsr) {</div><div class='del'>-		set_field(&amp;pllctl, PLLCTL_FD, 16 - 2);</div><div class='del'>-		set_field(&amp;pllctl, PLLCTL_RD, 1 - 1);</div><div class='del'>-	} else { /* 44100 */</div><div class='del'>-		set_field(&amp;pllctl, PLLCTL_FD, 147 - 2);</div><div class='del'>-		set_field(&amp;pllctl, PLLCTL_RD, 10 - 1);</div><div class='del'>-	}</div><div class='add'>+	set_field(&amp;pllctl, PLLCTL_FD, 48000 == rsr ? 16 - 2 : 147 - 2);</div><div class='ctx'> 	hw_write_20kx(hw, PLL_CTL, pllctl);</div><div class='del'>-	mdelay(40);</div><div class='add'>+	msleep(40);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; 1000; i++) {</div><div class='ctx'> 		pllstat = hw_read_20kx(hw, PLL_STAT);</div><div class='ctx'> 		if (get_field(pllstat, PLLSTAT_PD))</div><div class='hunk'>@@ -1338,7 +1349,8 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i &gt;= 1000) {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: PLL initialization failed!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev,</div><div class='add'>+			  "PLL initialization failed!!!\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1362,7 +1374,7 @@ static int hw_auto_init(struct hw *hw)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!get_field(gctl, GCTL_AID)) {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: Card Auto-init failed!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev, "Card Auto-init failed!!!\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1557,7 +1569,7 @@ static int hw20k2_i2c_write(struct hw *hw, u16 addr, u32 data)</div><div class='ctx'> </div><div class='ctx'> 	hw_write_20kx(hw, I2C_IF_STATUS, i2c_status);</div><div class='ctx'> 	hw20k2_i2c_wait_data_ready(hw);</div><div class='del'>-	/* Dummy write to trigger the write oprtation */</div><div class='add'>+	/* Dummy write to trigger the write operation */</div><div class='ctx'> 	hw_write_20kx(hw, I2C_IF_WDATA, 0);</div><div class='ctx'> 	hw20k2_i2c_wait_data_ready(hw);</div><div class='ctx'> </div><div class='hunk'>@@ -1568,6 +1580,30 @@ static int hw20k2_i2c_write(struct hw *hw, u16 addr, u32 data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hw_dac_stop(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data &amp;= 0xFFFFFFFD;</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+	usleep_range(10000, 11000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_dac_start(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data |= 0x2;</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+	msleep(50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_dac_reset(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	hw_dac_stop(hw);</div><div class='add'>+	hw_dac_start(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_dac_init(struct hw *hw, const struct dac_conf *info)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1575,25 +1611,47 @@ static int hw_dac_init(struct hw *hw, const struct dac_conf *info)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct regs_cs4382 cs_read = {0};</div><div class='ctx'> 	struct regs_cs4382 cs_def = {</div><div class='del'>-				   0x00000001,  /* Mode Control 1 */</div><div class='del'>-				   0x00000000,  /* Mode Control 2 */</div><div class='del'>-				   0x00000084,  /* Mode Control 3 */</div><div class='del'>-				   0x00000000,  /* Filter Control */</div><div class='del'>-				   0x00000000,  /* Invert Control */</div><div class='del'>-				   0x00000024,  /* Mixing Control Pair 1 */</div><div class='del'>-				   0x00000000,  /* Vol Control A1 */</div><div class='del'>-				   0x00000000,  /* Vol Control B1 */</div><div class='del'>-				   0x00000024,  /* Mixing Control Pair 2 */</div><div class='del'>-				   0x00000000,  /* Vol Control A2 */</div><div class='del'>-				   0x00000000,  /* Vol Control B2 */</div><div class='del'>-				   0x00000024,  /* Mixing Control Pair 3 */</div><div class='del'>-				   0x00000000,  /* Vol Control A3 */</div><div class='del'>-				   0x00000000,  /* Vol Control B3 */</div><div class='del'>-				   0x00000024,  /* Mixing Control Pair 4 */</div><div class='del'>-				   0x00000000,  /* Vol Control A4 */</div><div class='del'>-				   0x00000000   /* Vol Control B4 */</div><div class='add'>+		.mode_control_1 = 0x00000001, /* Mode Control 1 */</div><div class='add'>+		.mode_control_2 = 0x00000000, /* Mode Control 2 */</div><div class='add'>+		.mode_control_3 = 0x00000084, /* Mode Control 3 */</div><div class='add'>+		.filter_control = 0x00000000, /* Filter Control */</div><div class='add'>+		.invert_control = 0x00000000, /* Invert Control */</div><div class='add'>+		.mix_control_P1 = 0x00000024, /* Mixing Control Pair 1 */</div><div class='add'>+		.vol_control_A1 = 0x00000000, /* Vol Control A1 */</div><div class='add'>+		.vol_control_B1 = 0x00000000, /* Vol Control B1 */</div><div class='add'>+		.mix_control_P2 = 0x00000024, /* Mixing Control Pair 2 */</div><div class='add'>+		.vol_control_A2 = 0x00000000, /* Vol Control A2 */</div><div class='add'>+		.vol_control_B2 = 0x00000000, /* Vol Control B2 */</div><div class='add'>+		.mix_control_P3 = 0x00000024, /* Mixing Control Pair 3 */</div><div class='add'>+		.vol_control_A3 = 0x00000000, /* Vol Control A3 */</div><div class='add'>+		.vol_control_B3 = 0x00000000, /* Vol Control B3 */</div><div class='add'>+		.mix_control_P4 = 0x00000024, /* Mixing Control Pair 4 */</div><div class='add'>+		.vol_control_A4 = 0x00000000, /* Vol Control A4 */</div><div class='add'>+		.vol_control_B4 = 0x00000000  /* Vol Control B4 */</div><div class='ctx'> 				 };</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;model == CTSB1270) {</div><div class='add'>+		hw_dac_stop(hw);</div><div class='add'>+		data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+		data &amp;= ~0x0600;</div><div class='add'>+		if (1 == info-&gt;msr)</div><div class='add'>+			data |= 0x0000; /* Single Speed Mode 0-50kHz */</div><div class='add'>+		else if (2 == info-&gt;msr)</div><div class='add'>+			data |= 0x0200; /* Double Speed Mode 50-100kHz */</div><div class='add'>+		else</div><div class='add'>+			data |= 0x0600; /* Quad Speed Mode 100-200kHz */</div><div class='add'>+		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+		hw_dac_start(hw);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (hw-&gt;model == CTOK0010) {</div><div class='add'>+		hw_dac_stop(hw);</div><div class='add'>+		data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+		data |= 0x1000;</div><div class='add'>+		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+		hw_dac_start(hw);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set DAC reset bit as output */</div><div class='ctx'> 	data = hw_read_20kx(hw, GPIO_CTRL);</div><div class='ctx'> 	data |= 0x02;</div><div class='hunk'>@@ -1606,22 +1664,8 @@ static int hw_dac_init(struct hw *hw, const struct dac_conf *info)</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		/* Reset DAC twice just in-case the chip</div><div class='ctx'> 		 * didn't initialized properly */</div><div class='del'>-		data = hw_read_20kx(hw, GPIO_DATA);</div><div class='del'>-		/* GPIO data bit 1 */</div><div class='del'>-		data &amp;= 0xFFFFFFFD;</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		data |= 0x2;</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		mdelay(50);</div><div class='del'>-</div><div class='del'>-		/* Reset the 2nd time */</div><div class='del'>-		data &amp;= 0xFFFFFFFD;</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		data |= 0x2;</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		mdelay(50);</div><div class='add'>+		hw_dac_reset(hw);</div><div class='add'>+		hw_dac_reset(hw);</div><div class='ctx'> </div><div class='ctx'> 		if (hw20k2_i2c_read(hw, CS4382_MC1,  &amp;cs_read.mode_control_1))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -1725,7 +1769,13 @@ End:</div><div class='ctx'> static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='del'>-</div><div class='add'>+	if ((hw-&gt;model == CTSB1270) || (hw-&gt;model == CTOK0010)) {</div><div class='add'>+		/* Titanium HD has two ADC chips, one for line in and one */</div><div class='add'>+		/* for MIC. Also, SE-300PCIE has a single ADC chip that */</div><div class='add'>+		/* simultaneously supports 4-channel input. We don't need */</div><div class='add'>+		/* to switch the ADC input. */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='ctx'> 	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ADC_MICIN:</div><div class='hunk'>@@ -1740,31 +1790,49 @@ static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MIC_BOOST_0DB 0xCF</div><div class='add'>+#define MIC_BOOST_STEPS_PER_DB 2</div><div class='add'>+</div><div class='add'>+static void hw_wm8775_input_select(struct hw *hw, u8 input, s8 gain_in_db)</div><div class='add'>+{</div><div class='add'>+	u32 adcmc, gain;</div><div class='add'>+</div><div class='add'>+	if (input &gt; 3)</div><div class='add'>+		input = 3;</div><div class='add'>+</div><div class='add'>+	adcmc = ((u32)1 &lt;&lt; input) | 0x100; /* Link L+R gain... */</div><div class='add'>+</div><div class='add'>+	hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, adcmc),</div><div class='add'>+				MAKE_WM8775_DATA(adcmc));</div><div class='add'>+</div><div class='add'>+	if (gain_in_db &lt; -103)</div><div class='add'>+		gain_in_db = -103;</div><div class='add'>+	if (gain_in_db &gt; 24)</div><div class='add'>+		gain_in_db = 24;</div><div class='add'>+</div><div class='add'>+	gain = gain_in_db * MIC_BOOST_STEPS_PER_DB + MIC_BOOST_0DB;</div><div class='add'>+</div><div class='add'>+	hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, gain),</div><div class='add'>+				MAKE_WM8775_DATA(gain));</div><div class='add'>+	/* ...so there should be no need for the following. */</div><div class='add'>+	hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, gain),</div><div class='add'>+				MAKE_WM8775_DATA(gain));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='del'>-</div><div class='ctx'> 	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case ADC_MICIN:</div><div class='ctx'> 		data |= (0x1 &lt;&lt; 14);</div><div class='ctx'> 		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),</div><div class='del'>-				MAKE_WM8775_DATA(0x101)); /* Mic-in */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),</div><div class='del'>-				MAKE_WM8775_DATA(0xE7)); /* +12dB boost */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),</div><div class='del'>-				MAKE_WM8775_DATA(0xE7)); /* +12dB boost */</div><div class='add'>+		hw_wm8775_input_select(hw, 0, 20); /* Mic, 20dB */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ADC_LINEIN:</div><div class='ctx'> 		data &amp;= ~(0x1 &lt;&lt; 14);</div><div class='ctx'> 		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x102),</div><div class='del'>-				MAKE_WM8775_DATA(0x102)); /* Line-in */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xCF),</div><div class='del'>-				MAKE_WM8775_DATA(0xCF)); /* No boost */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xCF),</div><div class='del'>-				MAKE_WM8775_DATA(0xCF)); /* No boost */</div><div class='add'>+		hw_wm8775_input_select(hw, 1, 0); /* Line-in, 0dB */</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1773,92 +1841,202 @@ static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void hw_adc_stop(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	/* Reset the ADC (reset is active low). */</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data &amp;= ~(0x1 &lt;&lt; 15);</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+	usleep_range(10000, 11000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_adc_start(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	/* Return the ADC to normal operation. */</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data |= (0x1 &lt;&lt; 15);</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+	msleep(50);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_adc_reset(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	hw_adc_stop(hw);</div><div class='add'>+	hw_adc_start(hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_adc_init(struct hw *hw, const struct adc_conf *info)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	u32 mux = 2, data, ctl;</div><div class='add'>+	u32 data, ctl;</div><div class='ctx'> </div><div class='ctx'> 	/*  Set ADC reset bit as output */</div><div class='ctx'> 	data = hw_read_20kx(hw, GPIO_CTRL);</div><div class='ctx'> 	data |= (0x1 &lt;&lt; 15);</div><div class='ctx'> 	hw_write_20kx(hw, GPIO_CTRL, data);</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;model == CTOK0010) {</div><div class='add'>+		/* Manual ADC setup for SE-300PCIE is not needed. */</div><div class='add'>+		hw_adc_reset(hw);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Initialize I2C */</div><div class='ctx'> 	err = hw20k2_i2c_init(hw, 0x1A, 1, 1);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: Failure to acquire I2C!!!\n");</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev, "Failure to acquire I2C!!!\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Make ADC in normal operation */</div><div class='del'>-	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='del'>-	data &amp;= ~(0x1 &lt;&lt; 15);</div><div class='del'>-	mdelay(10);</div><div class='del'>-	data |= (0x1 &lt;&lt; 15);</div><div class='del'>-	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-	mdelay(50);</div><div class='add'>+	hw_adc_stop(hw);</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;model == CTSB1270) {</div><div class='add'>+		/* Set up the PCM4220 ADC on Titanium HD */</div><div class='add'>+		data &amp;= ~0x0C;</div><div class='add'>+		if (1 == info-&gt;msr)</div><div class='add'>+			data |= 0x00; /* Single Speed Mode 32-50kHz */</div><div class='add'>+		else if (2 == info-&gt;msr)</div><div class='add'>+			data |= 0x08; /* Double Speed Mode 50-108kHz */</div><div class='add'>+		else</div><div class='add'>+			data |= 0x04; /* Quad Speed Mode 108kHz-216kHz */</div><div class='add'>+		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_adc_start(hw);</div><div class='add'>+</div><div class='add'>+	/* I2C write to register offset 0x0B to set ADC LRCLK polarity */</div><div class='add'>+	/* invert bit, interface format to I2S, word length to 24-bit, */</div><div class='add'>+	/* enable ADC high pass filter. Fixes bug 5323?		*/</div><div class='add'>+	hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_IC, 0x26),</div><div class='add'>+			 MAKE_WM8775_DATA(0x26));</div><div class='ctx'> </div><div class='ctx'> 	/* Set the master mode (256fs) */</div><div class='ctx'> 	if (1 == info-&gt;msr) {</div><div class='add'>+		/* slave mode, 128x oversampling 256fs */</div><div class='ctx'> 		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x02),</div><div class='ctx'> 						MAKE_WM8775_DATA(0x02));</div><div class='del'>-	} else if (2 == info-&gt;msr) {</div><div class='add'>+	} else if ((2 == info-&gt;msr) || (4 == info-&gt;msr)) {</div><div class='add'>+		/* slave mode, 64x oversampling, 256fs */</div><div class='ctx'> 		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A),</div><div class='ctx'> 						MAKE_WM8775_DATA(0x0A));</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: Invalid master sampling "</div><div class='del'>-				  "rate (msr %d)!!!\n", info-&gt;msr);</div><div class='add'>+		dev_alert(hw-&gt;card-&gt;dev,</div><div class='add'>+			  "Invalid master sampling rate (msr %d)!!!\n",</div><div class='add'>+			  info-&gt;msr);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Configure GPIO bit 14 change to line-in/mic-in */</div><div class='del'>-	ctl = hw_read_20kx(hw, GPIO_CTRL);</div><div class='del'>-	ctl |= 0x1 &lt;&lt; 14;</div><div class='del'>-	hw_write_20kx(hw, GPIO_CTRL, ctl);</div><div class='del'>-</div><div class='del'>-	/* Check using Mic-in or Line-in */</div><div class='del'>-	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='del'>-</div><div class='del'>-	if (mux == 1) {</div><div class='del'>-		/* Configures GPIO data to select Mic-in */</div><div class='del'>-		data |= 0x1 &lt;&lt; 14;</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),</div><div class='del'>-				MAKE_WM8775_DATA(0x101)); /* Mic-in */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),</div><div class='del'>-				MAKE_WM8775_DATA(0xE7)); /* +12dB boost */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),</div><div class='del'>-				MAKE_WM8775_DATA(0xE7)); /* +12dB boost */</div><div class='del'>-	} else if (mux == 2) {</div><div class='del'>-		/* Configures GPIO data to select Line-in */</div><div class='del'>-		data &amp;= ~(0x1 &lt;&lt; 14);</div><div class='del'>-		hw_write_20kx(hw, GPIO_DATA, data);</div><div class='del'>-</div><div class='del'>-		/* Setup ADC */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x102),</div><div class='del'>-				MAKE_WM8775_DATA(0x102)); /* Line-in */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xCF),</div><div class='del'>-				MAKE_WM8775_DATA(0xCF)); /* No boost */</div><div class='del'>-		hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xCF),</div><div class='del'>-				MAKE_WM8775_DATA(0xCF)); /* No boost */</div><div class='add'>+	if (hw-&gt;model != CTSB1270) {</div><div class='add'>+		/* Configure GPIO bit 14 change to line-in/mic-in */</div><div class='add'>+		ctl = hw_read_20kx(hw, GPIO_CTRL);</div><div class='add'>+		ctl |= 0x1 &lt;&lt; 14;</div><div class='add'>+		hw_write_20kx(hw, GPIO_CTRL, ctl);</div><div class='add'>+		hw_adc_input_select(hw, ADC_LINEIN);</div><div class='ctx'> 	} else {</div><div class='del'>-		printk(KERN_ALERT "ctxfi: ERROR!!! Invalid input mux!!!\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto error;</div><div class='add'>+		hw_wm8775_input_select(hw, 0, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='ctx'> error:</div><div class='ctx'> 	hw20k2_i2c_uninit(hw);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_have_digit_io_switch(struct hw *hw)</div><div class='add'>+static struct capabilities hw_capabilities(struct hw *hw)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct capabilities cap;</div><div class='add'>+</div><div class='add'>+	cap.digit_io_switch = 0;</div><div class='add'>+	cap.dedicated_mic = (hw-&gt;model == CTSB1270) || (hw-&gt;model == CTOK0010);</div><div class='add'>+	cap.dedicated_rca = hw-&gt;model == CTOK0010;</div><div class='add'>+	cap.output_switch = hw-&gt;model == CTSB1270;</div><div class='add'>+	cap.mic_source_switch = hw-&gt;model == CTSB1270;</div><div class='add'>+</div><div class='add'>+	return cap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_output_switch_get(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	u32 data = hw_read_20kx(hw, GPIO_EXT_DATA);</div><div class='add'>+</div><div class='add'>+	switch (data &amp; 0x30) {</div><div class='add'>+	case 0x00:</div><div class='add'>+	     return 0;</div><div class='add'>+	case 0x10:</div><div class='add'>+	     return 1;</div><div class='add'>+	case 0x20:</div><div class='add'>+	     return 2;</div><div class='add'>+	default:</div><div class='add'>+	     return 3;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_output_switch_put(struct hw *hw, int position)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	if (position == hw_output_switch_get(hw))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Mute line and headphones (intended for anti-pop). */</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data |= (0x03 &lt;&lt; 11);</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_EXT_DATA) &amp; ~0x30;</div><div class='add'>+	switch (position) {</div><div class='add'>+	case 0:</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		data |= 0x10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		data |= 0x20;</div><div class='add'>+	}</div><div class='add'>+	hw_write_20kx(hw, GPIO_EXT_DATA, data);</div><div class='add'>+</div><div class='add'>+	/* Unmute line and headphones. */</div><div class='add'>+	data = hw_read_20kx(hw, GPIO_DATA);</div><div class='add'>+	data &amp;= ~(0x03 &lt;&lt; 11);</div><div class='add'>+	hw_write_20kx(hw, GPIO_DATA, data);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_mic_source_switch_get(struct hw *hw)</div><div class='add'>+{</div><div class='add'>+	struct hw20k2 *hw20k2 = (struct hw20k2 *)hw;</div><div class='add'>+</div><div class='add'>+	return hw20k2-&gt;mic_source;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_mic_source_switch_put(struct hw *hw, int position)</div><div class='add'>+{</div><div class='add'>+	struct hw20k2 *hw20k2 = (struct hw20k2 *)hw;</div><div class='add'>+</div><div class='add'>+	if (position == hw20k2-&gt;mic_source)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (position) {</div><div class='add'>+	case 0:</div><div class='add'>+		hw_wm8775_input_select(hw, 0, 0); /* Mic, 0dB */</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		hw_wm8775_input_select(hw, 1, 0); /* FP Mic, 0dB */</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		hw_wm8775_input_select(hw, 3, 0); /* Aux Ext, 0dB */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw20k2-&gt;mic_source = position;</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t ct_20k2_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -1882,19 +2060,15 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct pci_dev *pci = hw-&gt;pci;</div><div class='ctx'> 	unsigned int gctl;</div><div class='add'>+	const unsigned int dma_bits = BITS_PER_LONG;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Set DMA transfer mask */</div><div class='del'>-	if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: architecture does not support PCI "</div><div class='del'>-		"busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK);</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto error1;</div><div class='del'>-	}</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(dma_bits)))</div><div class='add'>+		dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> </div><div class='ctx'> 	if (!hw-&gt;io_base) {</div><div class='ctx'> 		err = pci_request_regions(pci, "XFi");</div><div class='hunk'>@@ -1902,8 +2076,8 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> 			goto error1;</div><div class='ctx'> </div><div class='ctx'> 		hw-&gt;io_base = pci_resource_start(hw-&gt;pci, 2);</div><div class='del'>-		hw-&gt;mem_base = (unsigned long)ioremap(hw-&gt;io_base,</div><div class='del'>-					pci_resource_len(hw-&gt;pci, 2));</div><div class='add'>+		hw-&gt;mem_base = ioremap(hw-&gt;io_base,</div><div class='add'>+				       pci_resource_len(hw-&gt;pci, 2));</div><div class='ctx'> 		if (!hw-&gt;mem_base) {</div><div class='ctx'> 			err = -ENOENT;</div><div class='ctx'> 			goto error2;</div><div class='hunk'>@@ -1917,12 +2091,14 @@ static int hw_card_start(struct hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;irq &lt; 0) {</div><div class='ctx'> 		err = request_irq(pci-&gt;irq, ct_20k2_interrupt, IRQF_SHARED,</div><div class='del'>-				  "ctxfi", hw);</div><div class='add'>+				  KBUILD_MODNAME, hw);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "XFi: Cannot get irq %d\n", pci-&gt;irq);</div><div class='add'>+			dev_err(hw-&gt;card-&gt;dev,</div><div class='add'>+				"XFi: Cannot get irq %d\n", pci-&gt;irq);</div><div class='ctx'> 			goto error2;</div><div class='ctx'> 		}</div><div class='ctx'> 		hw-&gt;irq = pci-&gt;irq;</div><div class='add'>+		hw-&gt;card-&gt;sync_irq = hw-&gt;irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='hunk'>@@ -1961,11 +2137,8 @@ static int hw_card_shutdown(struct hw *hw)</div><div class='ctx'> 		free_irq(hw-&gt;irq, hw);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;irq	= -1;</div><div class='del'>-</div><div class='del'>-	if (hw-&gt;mem_base)</div><div class='del'>-		iounmap((void *)hw-&gt;mem_base);</div><div class='del'>-</div><div class='del'>-	hw-&gt;mem_base = (unsigned long)NULL;</div><div class='add'>+	iounmap(hw-&gt;mem_base);</div><div class='add'>+	hw-&gt;mem_base = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (hw-&gt;io_base)</div><div class='ctx'> 		pci_release_regions(hw-&gt;pci);</div><div class='hunk'>@@ -2015,13 +2188,18 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)</div><div class='ctx'> 	/* Reset all SRC pending interrupts */</div><div class='ctx'> 	hw_write_20kx(hw, SRC_IP, 0);</div><div class='ctx'> </div><div class='del'>-	/* TODO: detect the card ID and configure GPIO accordingly. */</div><div class='del'>-	/* Configures GPIO (0xD802 0x98028) */</div><div class='del'>-	/*hw_write_20kx(hw, GPIO_CTRL, 0x7F07);*/</div><div class='del'>-	/* Configures GPIO (SB0880) */</div><div class='del'>-	/*hw_write_20kx(hw, GPIO_CTRL, 0xFF07);*/</div><div class='del'>-	hw_write_20kx(hw, GPIO_CTRL, 0xD802);</div><div class='del'>-</div><div class='add'>+	if (hw-&gt;model == CTSB1270) {</div><div class='add'>+		hw_write_20kx(hw, GPIO_CTRL, 0x9E5F);</div><div class='add'>+	} else if (hw-&gt;model == CTOK0010) {</div><div class='add'>+		hw_write_20kx(hw, GPIO_CTRL, 0x9902);</div><div class='add'>+	} else {</div><div class='add'>+		/* TODO: detect the card ID and configure GPIO accordingly. */</div><div class='add'>+		/* Configures GPIO (0xD802 0x98028) */</div><div class='add'>+		/*hw_write_20kx(hw, GPIO_CTRL, 0x7F07);*/</div><div class='add'>+		/* Configures GPIO (SB0880) */</div><div class='add'>+		/*hw_write_20kx(hw, GPIO_CTRL, 0xFF07);*/</div><div class='add'>+		hw_write_20kx(hw, GPIO_CTRL, 0xD802);</div><div class='add'>+	}</div><div class='ctx'> 	/* Enable audio ring */</div><div class='ctx'> 	hw_write_20kx(hw, MIXER_AR_ENABLE, 0x01);</div><div class='ctx'> </div><div class='hunk'>@@ -2054,27 +2232,15 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int hw_suspend(struct hw *hw, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int hw_suspend(struct hw *hw)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pci = hw-&gt;pci;</div><div class='del'>-</div><div class='ctx'> 	hw_card_stop(hw);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hw_resume(struct hw *hw, struct card_conf *info)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pci = hw-&gt;pci;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-</div><div class='ctx'> 	/* Re-initialize card hardware. */</div><div class='ctx'> 	return hw_card_init(hw, info);</div><div class='ctx'> }</div><div class='hunk'>@@ -2082,15 +2248,15 @@ static int hw_resume(struct hw *hw, struct card_conf *info)</div><div class='ctx'> </div><div class='ctx'> static u32 hw_read_20kx(struct hw *hw, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	return readl((void *)(hw-&gt;mem_base + reg));</div><div class='add'>+	return readl(hw-&gt;mem_base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hw_write_20kx(struct hw *hw, u32 reg, u32 data)</div><div class='ctx'> {</div><div class='del'>-	writel(data, (void *)(hw-&gt;mem_base + reg));</div><div class='add'>+	writel(data, hw-&gt;mem_base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct hw ct20k2_preset __devinitdata = {</div><div class='add'>+static const struct hw ct20k2_preset = {</div><div class='ctx'> 	.irq = -1,</div><div class='ctx'> </div><div class='ctx'> 	.card_init = hw_card_init,</div><div class='hunk'>@@ -2098,8 +2264,12 @@ static struct hw ct20k2_preset __devinitdata = {</div><div class='ctx'> 	.pll_init = hw_pll_init,</div><div class='ctx'> 	.is_adc_source_selected = hw_is_adc_input_selected,</div><div class='ctx'> 	.select_adc_source = hw_adc_input_select,</div><div class='del'>-	.have_digit_io_switch = hw_have_digit_io_switch,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+	.capabilities = hw_capabilities,</div><div class='add'>+	.output_switch_get = hw_output_switch_get,</div><div class='add'>+	.output_switch_put = hw_output_switch_put,</div><div class='add'>+	.mic_source_switch_get = hw_mic_source_switch_get,</div><div class='add'>+	.mic_source_switch_put = hw_mic_source_switch_put,</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	.suspend = hw_suspend,</div><div class='ctx'> 	.resume = hw_resume,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2194,7 +2364,7 @@ static struct hw ct20k2_preset __devinitdata = {</div><div class='ctx'> 	.get_wc = get_wc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit create_20k2_hw_obj(struct hw **rhw)</div><div class='add'>+int create_20k2_hw_obj(struct hw **rhw)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw20k2 *hw20k2;</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ctxfi/cthw20k2.h b/sound/pci/ctxfi/cthw20k2.h<br/>index d2b7daab6815..6993a3d5277a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k2.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cthw20k2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cthw20k2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cthw20k2.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	cthw20k2.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTHW20K2_H</div><div class='head'>diff --git a/sound/pci/ctxfi/ctimap.c b/sound/pci/ctxfi/ctimap.c<br/>index 0b73368a4df6..d5a53d2f5f15 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctimap.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctimap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctimap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctimap.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctimap.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 23 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctimap.h"</div><div class='head'>diff --git a/sound/pci/ctxfi/ctimap.h b/sound/pci/ctxfi/ctimap.h<br/>index 53ccf9be8b68..49b1bb831410 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctimap.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctimap.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctimap.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctimap.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctimap.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 23 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTIMAP_H</div><div class='head'>diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c<br/>index 15c1e7271ea8..fc9fde284fb3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctmixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctmixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctmixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctmixer.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctmixer.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 28 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -86,9 +82,7 @@ enum CTALSA_MIXER_CTL {</div><div class='ctx'> 	MIXER_LINEIN_C_S,</div><div class='ctx'> 	MIXER_MIC_C_S,</div><div class='ctx'> 	MIXER_SPDIFI_C_S,</div><div class='del'>-	MIXER_LINEIN_P_S,</div><div class='ctx'> 	MIXER_SPDIFO_P_S,</div><div class='del'>-	MIXER_SPDIFI_P_S,</div><div class='ctx'> 	MIXER_WAVEF_P_S,</div><div class='ctx'> 	MIXER_WAVER_P_S,</div><div class='ctx'> 	MIXER_WAVEC_P_S,</div><div class='hunk'>@@ -137,11 +131,11 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_LINEIN_P] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "Line-in Playback Volume",</div><div class='add'>+		.name = "Line Playback Volume",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_LINEIN_C] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "Line-in Capture Volume",</div><div class='add'>+		.name = "Line Capture Volume",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_MIC_P] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='hunk'>@@ -153,15 +147,15 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_SPDIFI_P] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-in Playback Volume",</div><div class='add'>+		.name = "IEC958 Playback Volume",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_SPDIFI_C] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-in Capture Volume",</div><div class='add'>+		.name = "IEC958 Capture Volume",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_SPDIFO_P] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-out Playback Volume",</div><div class='add'>+		.name = "Digital Playback Volume",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_WAVEF_P] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='hunk'>@@ -179,14 +173,13 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='ctx'> 		.name = "Surround Playback Volume",</div><div class='ctx'> 	},</div><div class='del'>-</div><div class='ctx'> 	[MIXER_PCM_C_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='ctx'> 		.name = "PCM Capture Switch",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_LINEIN_C_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "Line-in Capture Switch",</div><div class='add'>+		.name = "Line Capture Switch",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_MIC_C_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='hunk'>@@ -194,19 +187,11 @@ ct_kcontrol_init_table[NUM_CTALSA_MIXERS] = {</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_SPDIFI_C_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-in Capture Switch",</div><div class='del'>-	},</div><div class='del'>-	[MIXER_LINEIN_P_S] = {</div><div class='del'>-		.ctl = 1,</div><div class='del'>-		.name = "Line-in Playback Switch",</div><div class='add'>+		.name = "IEC958 Capture Switch",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_SPDIFO_P_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-out Playback Switch",</div><div class='del'>-	},</div><div class='del'>-	[MIXER_SPDIFI_P_S] = {</div><div class='del'>-		.ctl = 1,</div><div class='del'>-		.name = "S/PDIF-in Playback Switch",</div><div class='add'>+		.name = "Digital Playback Switch",</div><div class='ctx'> 	},</div><div class='ctx'> 	[MIXER_WAVEF_P_S] = {</div><div class='ctx'> 		.ctl = 1,</div><div class='hunk'>@@ -236,6 +221,8 @@ ct_mixer_recording_select(struct ct_mixer *mixer, enum CT_AMIXER_CTL type);</div><div class='ctx'> static void</div><div class='ctx'> ct_mixer_recording_unselect(struct ct_mixer *mixer, enum CT_AMIXER_CTL type);</div><div class='ctx'> </div><div class='add'>+/* FIXME: this static looks like it would fail if more than one card was */</div><div class='add'>+/* installed. */</div><div class='ctx'> static struct snd_kcontrol *kctls[2] = {NULL};</div><div class='ctx'> </div><div class='ctx'> static enum CT_AMIXER_CTL get_amixer_index(enum CTALSA_MIXER_CTL alsa_index)</div><div class='hunk'>@@ -420,6 +407,77 @@ static struct snd_kcontrol_new vol_ctl = {</div><div class='ctx'> 	.tlv		= { .p =  ct_vol_db_scale },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int output_switch_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	static const char *const names[3] = {</div><div class='add'>+	  "FP Headphones", "Headphones", "Speakers"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(info, 1, 3, names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int output_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = atc-&gt;output_switch_get(atc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int output_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	if (ucontrol-&gt;value.enumerated.item[0] &gt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return atc-&gt;output_switch_put(atc, ucontrol-&gt;value.enumerated.item[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new output_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Analog Output Playback Enum",</div><div class='add'>+	.info = output_switch_info,</div><div class='add'>+	.get = output_switch_get,</div><div class='add'>+	.put = output_switch_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mic_source_switch_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	static const char *const names[3] = {</div><div class='add'>+	  "Mic", "FP Mic", "Aux"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(info, 1, 3, names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mic_source_switch_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = atc-&gt;mic_source_switch_get(atc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mic_source_switch_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	if (ucontrol-&gt;value.enumerated.item[0] &gt; 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return atc-&gt;mic_source_switch_put(atc,</div><div class='add'>+					ucontrol-&gt;value.enumerated.item[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new mic_source_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Mic Source Capture Enum",</div><div class='add'>+	.info = mic_source_switch_info,</div><div class='add'>+	.get = mic_source_switch_get,</div><div class='add'>+	.put = mic_source_switch_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> do_line_mic_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type)</div><div class='ctx'> {</div><div class='hunk'>@@ -465,6 +523,7 @@ do_digit_io_switch(struct ct_atc *atc, int state)</div><div class='ctx'> static void do_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type, int state)</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_mixer *mixer = atc-&gt;mixer;</div><div class='add'>+	struct capabilities cap = atc-&gt;capabilities(atc);</div><div class='ctx'> </div><div class='ctx'> 	/* Do changes in mixer. */</div><div class='ctx'> 	if ((SWH_CAPTURE_START &lt;= type) &amp;&amp; (SWH_CAPTURE_END &gt;= type)) {</div><div class='hunk'>@@ -477,22 +536,33 @@ static void do_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type, int state)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Do changes out of mixer. */</div><div class='del'>-	if (state &amp;&amp; (MIXER_LINEIN_C_S == type || MIXER_MIC_C_S == type))</div><div class='del'>-		do_line_mic_switch(atc, type);</div><div class='del'>-	else if (MIXER_WAVEF_P_S == type)</div><div class='del'>-		atc-&gt;line_front_unmute(atc, state);</div><div class='add'>+	if (!cap.dedicated_mic &amp;&amp;</div><div class='add'>+	    (MIXER_LINEIN_C_S == type || MIXER_MIC_C_S == type)) {</div><div class='add'>+		if (state)</div><div class='add'>+			do_line_mic_switch(atc, type);</div><div class='add'>+		atc-&gt;line_in_unmute(atc, state);</div><div class='add'>+	} else if (cap.dedicated_mic &amp;&amp; (MIXER_LINEIN_C_S == type))</div><div class='add'>+		atc-&gt;line_in_unmute(atc, state);</div><div class='add'>+	else if (cap.dedicated_mic &amp;&amp; (MIXER_MIC_C_S == type))</div><div class='add'>+		atc-&gt;mic_unmute(atc, state);</div><div class='add'>+	else if (MIXER_SPDIFI_C_S == type)</div><div class='add'>+		atc-&gt;spdif_in_unmute(atc, state);</div><div class='add'>+	else if (MIXER_WAVEF_P_S == type) {</div><div class='add'>+		if (cap.dedicated_rca) {</div><div class='add'>+			atc-&gt;rca_unmute(atc, atc-&gt;rca_state ? 0 : state);</div><div class='add'>+			atc-&gt;line_front_unmute(atc, atc-&gt;rca_state ? state : 0);</div><div class='add'>+		} else {</div><div class='add'>+			atc-&gt;line_front_unmute(atc, state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	else if (MIXER_WAVES_P_S == type)</div><div class='ctx'> 		atc-&gt;line_surround_unmute(atc, state);</div><div class='ctx'> 	else if (MIXER_WAVEC_P_S == type)</div><div class='ctx'> 		atc-&gt;line_clfe_unmute(atc, state);</div><div class='ctx'> 	else if (MIXER_WAVER_P_S == type)</div><div class='ctx'> 		atc-&gt;line_rear_unmute(atc, state);</div><div class='del'>-	else if (MIXER_LINEIN_P_S == type)</div><div class='del'>-		atc-&gt;line_in_unmute(atc, state);</div><div class='ctx'> 	else if (MIXER_SPDIFO_P_S == type)</div><div class='ctx'> 		atc-&gt;spdif_out_unmute(atc, state);</div><div class='del'>-	else if (MIXER_SPDIFI_P_S == type)</div><div class='del'>-		atc-&gt;spdif_in_unmute(atc, state);</div><div class='ctx'> 	else if (MIXER_DIGITAL_IO_S == type)</div><div class='ctx'> 		do_digit_io_switch(atc, state);</div><div class='ctx'> </div><div class='hunk'>@@ -548,6 +618,57 @@ static struct snd_kcontrol_new swh_ctl = {</div><div class='ctx'> 	.put		= ct_alsa_mix_switch_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int dedicated_rca_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *info)</div><div class='add'>+{</div><div class='add'>+	static const char *const names[2] = {</div><div class='add'>+	  "RCA", "Front"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(info, 1, 2, names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dedicated_rca_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = atc-&gt;rca_state;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dedicated_rca_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int rca_state = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned char state;</div><div class='add'>+</div><div class='add'>+	if (rca_state &gt; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (rca_state == atc-&gt;rca_state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	state = get_switch_state(atc-&gt;mixer, MIXER_WAVEF_P_S);</div><div class='add'>+	do_switch(atc, MIXER_WAVEF_P_S, 0);</div><div class='add'>+</div><div class='add'>+	atc-&gt;rca_state = rca_state;</div><div class='add'>+	atc-&gt;dedicated_rca_select(atc);</div><div class='add'>+</div><div class='add'>+	do_switch(atc, MIXER_WAVEF_P_S, state);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new rca_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Analog Playback Route",</div><div class='add'>+	.info = dedicated_rca_info,</div><div class='add'>+	.get = dedicated_rca_get,</div><div class='add'>+	.put = dedicated_rca_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int ct_spdif_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='hunk'>@@ -566,19 +687,6 @@ static int ct_spdif_get_mask(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ct_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.iec958.status[0] = (status &gt;&gt; 0) &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[1] = (status &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[2] = (status &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[3] = (status &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ct_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='hunk'>@@ -586,6 +694,10 @@ static int ct_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> </div><div class='ctx'> 	atc-&gt;spdif_out_get_status(atc, &amp;status);</div><div class='add'>+</div><div class='add'>+	if (status == 0)</div><div class='add'>+		status = SNDRV_PCM_DEFAULT_CON_SPDIF;</div><div class='add'>+</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = (status &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (status &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (status &gt;&gt; 16) &amp; 0xff;</div><div class='hunk'>@@ -629,7 +741,7 @@ static struct snd_kcontrol_new iec958_default_ctl = {</div><div class='ctx'> 	.name		= SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),</div><div class='ctx'> 	.count		= 1,</div><div class='ctx'> 	.info		= ct_spdif_info,</div><div class='del'>-	.get		= ct_spdif_default_get,</div><div class='add'>+	.get		= ct_spdif_get,</div><div class='ctx'> 	.put		= ct_spdif_put,</div><div class='ctx'> 	.private_value	= MIXER_IEC958_DEFAULT</div><div class='ctx'> };</div><div class='hunk'>@@ -680,6 +792,7 @@ static int ct_mixer_kcontrols_create(struct ct_mixer *mixer)</div><div class='ctx'> {</div><div class='ctx'> 	enum CTALSA_MIXER_CTL type;</div><div class='ctx'> 	struct ct_atc *atc = mixer-&gt;atc;</div><div class='add'>+	struct capabilities cap = atc-&gt;capabilities(atc);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Create snd kcontrol instances on demand */</div><div class='hunk'>@@ -693,8 +806,8 @@ static int ct_mixer_kcontrols_create(struct ct_mixer *mixer)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ct_kcontrol_init_table[MIXER_DIGITAL_IO_S].ctl =</div><div class='del'>-					atc-&gt;have_digit_io_switch(atc);</div><div class='add'>+	ct_kcontrol_init_table[MIXER_DIGITAL_IO_S].ctl = cap.digit_io_switch;</div><div class='add'>+</div><div class='ctx'> 	for (type = SWH_MIXER_START; type &lt;= SWH_MIXER_END; type++) {</div><div class='ctx'> 		if (ct_kcontrol_init_table[type].ctl) {</div><div class='ctx'> 			swh_ctl.name = ct_kcontrol_init_table[type].name;</div><div class='hunk'>@@ -717,7 +830,28 @@ static int ct_mixer_kcontrols_create(struct ct_mixer *mixer)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	atc-&gt;line_front_unmute(atc, 1);</div><div class='add'>+	if (cap.output_switch) {</div><div class='add'>+		err = ct_mixer_kcontrol_new(mixer, &amp;output_ctl);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap.mic_source_switch) {</div><div class='add'>+		err = ct_mixer_kcontrol_new(mixer, &amp;mic_source_ctl);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cap.dedicated_rca) {</div><div class='add'>+		err = ct_mixer_kcontrol_new(mixer, &amp;rca_ctl);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		atc-&gt;line_front_unmute(atc, 0);</div><div class='add'>+		atc-&gt;rca_unmute(atc, 1);</div><div class='add'>+	} else {</div><div class='add'>+		atc-&gt;line_front_unmute(atc, 1);</div><div class='add'>+	}</div><div class='ctx'> 	set_switch_state(mixer, MIXER_WAVEF_P_S, 1);</div><div class='ctx'> 	atc-&gt;line_surround_unmute(atc, 0);</div><div class='ctx'> 	set_switch_state(mixer, MIXER_WAVES_P_S, 0);</div><div class='hunk'>@@ -728,13 +862,12 @@ static int ct_mixer_kcontrols_create(struct ct_mixer *mixer)</div><div class='ctx'> 	atc-&gt;spdif_out_unmute(atc, 0);</div><div class='ctx'> 	set_switch_state(mixer, MIXER_SPDIFO_P_S, 0);</div><div class='ctx'> 	atc-&gt;line_in_unmute(atc, 0);</div><div class='del'>-	set_switch_state(mixer, MIXER_LINEIN_P_S, 0);</div><div class='add'>+	if (cap.dedicated_mic)</div><div class='add'>+		atc-&gt;mic_unmute(atc, 0);</div><div class='ctx'> 	atc-&gt;spdif_in_unmute(atc, 0);</div><div class='del'>-	set_switch_state(mixer, MIXER_SPDIFI_P_S, 0);</div><div class='del'>-</div><div class='del'>-	set_switch_state(mixer, MIXER_PCM_C_S, 1);</div><div class='del'>-	set_switch_state(mixer, MIXER_LINEIN_C_S, 1);</div><div class='del'>-	set_switch_state(mixer, MIXER_SPDIFI_C_S, 1);</div><div class='add'>+	set_switch_state(mixer, MIXER_PCM_C_S, 0);</div><div class='add'>+	set_switch_state(mixer, MIXER_LINEIN_C_S, 0);</div><div class='add'>+	set_switch_state(mixer, MIXER_SPDIFI_C_S, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -784,8 +917,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer)</div><div class='ctx'> 	for (i = 0; i &lt; (NUM_CT_SUMS * CHN_NUM); i++) {</div><div class='ctx'> 		err = sum_mgr-&gt;get_sum(sum_mgr, &amp;sum_desc, &amp;sum);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "ctxfi:Failed to get sum resources for "</div><div class='del'>-					  "front output!\n");</div><div class='add'>+			dev_err(mixer-&gt;atc-&gt;card-&gt;dev,</div><div class='add'>+				"Failed to get sum resources for front output!\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		mixer-&gt;sums[i] = sum;</div><div class='hunk'>@@ -799,8 +932,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer)</div><div class='ctx'> 	for (i = 0; i &lt; (NUM_CT_AMIXERS * CHN_NUM); i++) {</div><div class='ctx'> 		err = amixer_mgr-&gt;get_amixer(amixer_mgr, &amp;am_desc, &amp;amixer);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			printk(KERN_ERR "ctxfi:Failed to get amixer resources "</div><div class='del'>-			       "for mixer obj!\n");</div><div class='add'>+			dev_err(mixer-&gt;atc-&gt;card-&gt;dev,</div><div class='add'>+				"Failed to get amixer resources for mixer obj!\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		mixer-&gt;amixers[i] = amixer;</div><div class='hunk'>@@ -840,13 +973,14 @@ static int ct_mixer_get_mem(struct ct_mixer **rmixer)</div><div class='ctx'> 	if (!mixer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mixer-&gt;amixers = kzalloc(sizeof(void *)*(NUM_CT_AMIXERS*CHN_NUM),</div><div class='add'>+	mixer-&gt;amixers = kcalloc(NUM_CT_AMIXERS * CHN_NUM, sizeof(void *),</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='ctx'> 	if (!mixer-&gt;amixers) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error1;</div><div class='ctx'> 	}</div><div class='del'>-	mixer-&gt;sums = kzalloc(sizeof(void *)*(NUM_CT_SUMS*CHN_NUM), GFP_KERNEL);</div><div class='add'>+	mixer-&gt;sums = kcalloc(NUM_CT_SUMS * CHN_NUM, sizeof(void *),</div><div class='add'>+			      GFP_KERNEL);</div><div class='ctx'> 	if (!mixer-&gt;sums) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error2;</div><div class='hunk'>@@ -867,17 +1001,18 @@ static int ct_mixer_topology_build(struct ct_mixer *mixer)</div><div class='ctx'> 	struct sum *sum;</div><div class='ctx'> 	struct amixer *amix_d, *amix_s;</div><div class='ctx'> 	enum CT_AMIXER_CTL i, j;</div><div class='add'>+	enum CT_SUM_CTL k;</div><div class='ctx'> </div><div class='ctx'> 	/* Build topology from destination to source */</div><div class='ctx'> </div><div class='ctx'> 	/* Set up Master mixer */</div><div class='del'>-	for (i = AMIXER_MASTER_F, j = SUM_IN_F;</div><div class='del'>-					i &lt;= AMIXER_MASTER_S; i++, j++) {</div><div class='add'>+	for (i = AMIXER_MASTER_F, k = SUM_IN_F;</div><div class='add'>+					i &lt;= AMIXER_MASTER_S; i++, k++) {</div><div class='ctx'> 		amix_d = mixer-&gt;amixers[i*CHN_NUM];</div><div class='del'>-		sum = mixer-&gt;sums[j*CHN_NUM];</div><div class='add'>+		sum = mixer-&gt;sums[k*CHN_NUM];</div><div class='ctx'> 		amix_d-&gt;ops-&gt;setup(amix_d, &amp;sum-&gt;rsc, INIT_VOL, NULL);</div><div class='ctx'> 		amix_d = mixer-&gt;amixers[i*CHN_NUM+1];</div><div class='del'>-		sum = mixer-&gt;sums[j*CHN_NUM+1];</div><div class='add'>+		sum = mixer-&gt;sums[k*CHN_NUM+1];</div><div class='ctx'> 		amix_d-&gt;ops-&gt;setup(amix_d, &amp;sum-&gt;rsc, INIT_VOL, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -901,12 +1036,12 @@ static int ct_mixer_topology_build(struct ct_mixer *mixer)</div><div class='ctx'> 	amix_d-&gt;ops-&gt;setup(amix_d, &amp;amix_s-&gt;rsc, INIT_VOL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Set up PCM-in mixer */</div><div class='del'>-	for (i = AMIXER_PCM_F, j = SUM_IN_F; i &lt;= AMIXER_PCM_S; i++, j++) {</div><div class='add'>+	for (i = AMIXER_PCM_F, k = SUM_IN_F; i &lt;= AMIXER_PCM_S; i++, k++) {</div><div class='ctx'> 		amix_d = mixer-&gt;amixers[i*CHN_NUM];</div><div class='del'>-		sum = mixer-&gt;sums[j*CHN_NUM];</div><div class='add'>+		sum = mixer-&gt;sums[k*CHN_NUM];</div><div class='ctx'> 		amix_d-&gt;ops-&gt;setup(amix_d, NULL, INIT_VOL, sum);</div><div class='ctx'> 		amix_d = mixer-&gt;amixers[i*CHN_NUM+1];</div><div class='del'>-		sum = mixer-&gt;sums[j*CHN_NUM+1];</div><div class='add'>+		sum = mixer-&gt;sums[k*CHN_NUM+1];</div><div class='ctx'> 		amix_d-&gt;ops-&gt;setup(amix_d, NULL, INIT_VOL, sum);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1048,7 +1183,7 @@ mixer_set_input_right(struct ct_mixer *mixer,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int mixer_resume(struct ct_mixer *mixer)</div><div class='ctx'> {</div><div class='ctx'> 	int i, state;</div><div class='hunk'>@@ -1118,7 +1253,7 @@ int ct_mixer_create(struct ct_atc *atc, struct ct_mixer **rmixer)</div><div class='ctx'> 	mixer-&gt;get_output_ports = mixer_get_output_ports;</div><div class='ctx'> 	mixer-&gt;set_input_left = mixer_set_input_left;</div><div class='ctx'> 	mixer-&gt;set_input_right = mixer_set_input_right;</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	mixer-&gt;resume = mixer_resume;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1151,7 +1286,7 @@ int ct_alsa_mix_create(struct ct_atc *atc,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(atc-&gt;card-&gt;mixername, device_name);</div><div class='add'>+	strscpy(atc-&gt;card-&gt;mixername, device_name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/ctxfi/ctmixer.h b/sound/pci/ctxfi/ctmixer.h<br/>index b009e989e77d..e812f6c93b41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctmixer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctmixer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctmixer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctmixer.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctmixer.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Mar 28 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTMIXER_H</div><div class='hunk'>@@ -56,7 +52,7 @@ struct ct_mixer {</div><div class='ctx'> 			      enum MIXER_PORT_T type, struct rsc *rsc);</div><div class='ctx'> 	int (*set_input_right)(struct ct_mixer *mixer,</div><div class='ctx'> 			       enum MIXER_PORT_T type, struct rsc *rsc);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	int (*resume)(struct ct_mixer *mixer);</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c<br/>index 85ab43e89212..81dfc6a76b18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctpcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctpcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctpcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctpcm.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctpcm.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Apr 2 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctpcm.h"</div><div class='hunk'>@@ -21,7 +17,7 @@</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Hardware descriptions for playback */</div><div class='del'>-static struct snd_pcm_hardware ct_pcm_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware ct_pcm_playback_hw = {</div><div class='ctx'> 	.info			= (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -46,7 +42,7 @@ static struct snd_pcm_hardware ct_pcm_playback_hw = {</div><div class='ctx'> 	.fifo_size		= 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware ct_spdif_passthru_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware ct_spdif_passthru_playback_hw = {</div><div class='ctx'> 	.info			= (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -69,7 +65,7 @@ static struct snd_pcm_hardware ct_spdif_passthru_playback_hw = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Hardware descriptions for capture */</div><div class='del'>-static struct snd_pcm_hardware ct_pcm_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware ct_pcm_capture_hw = {</div><div class='ctx'> 	.info			= (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				   SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				   SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -129,8 +125,6 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	apcm-&gt;substream = substream;</div><div class='ctx'> 	apcm-&gt;interrupt = ct_atc_pcm_interrupt;</div><div class='del'>-	runtime-&gt;private_data = apcm;</div><div class='del'>-	runtime-&gt;private_free = ct_atc_pcm_free_substream;</div><div class='ctx'> 	if (IEC958 == substream-&gt;pcm-&gt;device) {</div><div class='ctx'> 		runtime-&gt;hw = ct_spdif_passthru_playback_hw;</div><div class='ctx'> 		atc-&gt;spdif_out_passthru(atc, 1);</div><div class='hunk'>@@ -142,23 +136,28 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='ctx'> 					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(apcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='add'>+</div><div class='ctx'> 	err = snd_pcm_hw_constraint_minmax(runtime,</div><div class='ctx'> 					   SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 					   1024, UINT_MAX);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(apcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='ctx'> </div><div class='ctx'> 	apcm-&gt;timer = ct_timer_instance_new(atc-&gt;timer, apcm);</div><div class='del'>-	if (!apcm-&gt;timer)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!apcm-&gt;timer) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_pcm;</div><div class='add'>+	}</div><div class='add'>+	runtime-&gt;private_data = apcm;</div><div class='add'>+	runtime-&gt;private_free = ct_atc_pcm_free_substream;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_pcm:</div><div class='add'>+	kfree(apcm);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ct_pcm_playback_close(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -179,15 +178,10 @@ static int ct_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_atc *atc = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ct_atc_pcm *apcm = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='ctx'> 	/* clear previous resources */</div><div class='ctx'> 	atc-&gt;pcm_release_resources(atc, apcm);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ct_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -197,8 +191,7 @@ static int ct_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	/* clear previous resources */</div><div class='ctx'> 	atc-&gt;pcm_release_resources(atc, apcm);</div><div class='del'>-	/* Free snd-allocated pages */</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -215,7 +208,8 @@ static int ct_pcm_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		err = atc-&gt;pcm_playback_prepare(atc, apcm);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Preparing pcm playback failed!!!\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+			"Preparing pcm playback failed!!!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -278,30 +272,33 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	apcm-&gt;started = 0;</div><div class='ctx'> 	apcm-&gt;substream = substream;</div><div class='ctx'> 	apcm-&gt;interrupt = ct_atc_pcm_interrupt;</div><div class='del'>-	runtime-&gt;private_data = apcm;</div><div class='del'>-	runtime-&gt;private_free = ct_atc_pcm_free_substream;</div><div class='ctx'> 	runtime-&gt;hw = ct_pcm_capture_hw;</div><div class='ctx'> 	runtime-&gt;hw.rate_max = atc-&gt;rsr * atc-&gt;msr;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='ctx'> 					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(apcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='add'>+</div><div class='ctx'> 	err = snd_pcm_hw_constraint_minmax(runtime,</div><div class='ctx'> 					   SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 					   1024, UINT_MAX);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(apcm);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_pcm;</div><div class='ctx'> </div><div class='ctx'> 	apcm-&gt;timer = ct_timer_instance_new(atc-&gt;timer, apcm);</div><div class='del'>-	if (!apcm-&gt;timer)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!apcm-&gt;timer) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_pcm;</div><div class='add'>+	}</div><div class='add'>+	runtime-&gt;private_data = apcm;</div><div class='add'>+	runtime-&gt;private_free = ct_atc_pcm_free_substream;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+free_pcm:</div><div class='add'>+	kfree(apcm);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ct_pcm_capture_close(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -320,7 +317,8 @@ static int ct_pcm_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	err = atc-&gt;pcm_capture_prepare(atc, apcm);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Preparing pcm capture failed!!!\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+			"Preparing pcm capture failed!!!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -366,29 +364,49 @@ ct_pcm_capture_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* PCM operators for playback */</div><div class='del'>-static struct snd_pcm_ops ct_pcm_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops ct_pcm_playback_ops = {</div><div class='ctx'> 	.open	 	= ct_pcm_playback_open,</div><div class='ctx'> 	.close		= ct_pcm_playback_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params	= ct_pcm_hw_params,</div><div class='ctx'> 	.hw_free	= ct_pcm_hw_free,</div><div class='ctx'> 	.prepare	= ct_pcm_playback_prepare,</div><div class='ctx'> 	.trigger	= ct_pcm_playback_trigger,</div><div class='ctx'> 	.pointer	= ct_pcm_playback_pointer,</div><div class='del'>-	.page		= snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* PCM operators for capture */</div><div class='del'>-static struct snd_pcm_ops ct_pcm_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops ct_pcm_capture_ops = {</div><div class='ctx'> 	.open	 	= ct_pcm_capture_open,</div><div class='ctx'> 	.close		= ct_pcm_capture_close,</div><div class='del'>-	.ioctl		= snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params	= ct_pcm_hw_params,</div><div class='ctx'> 	.hw_free	= ct_pcm_hw_free,</div><div class='ctx'> 	.prepare	= ct_pcm_capture_prepare,</div><div class='ctx'> 	.trigger	= ct_pcm_capture_trigger,</div><div class='ctx'> 	.pointer	= ct_pcm_capture_pointer,</div><div class='del'>-	.page		= snd_pcm_sgbuf_ops_page,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem surround_map[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem clfe_map[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem side_map[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_SL, SNDRV_CHMAP_SR } },</div><div class='add'>+	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Create ALSA pcm device */</div><div class='hunk'>@@ -397,22 +415,25 @@ int ct_alsa_pcm_create(struct ct_atc *atc,</div><div class='ctx'> 		       const char *device_name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='add'>+	const struct snd_pcm_chmap_elem *map;</div><div class='add'>+	int chs;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int playback_count, capture_count;</div><div class='ctx'> </div><div class='del'>-	playback_count = (IEC958 == device) ? 1 : 8;</div><div class='add'>+	playback_count = (IEC958 == device) ? 1 : 256;</div><div class='ctx'> 	capture_count = (FRONT == device) ? 1 : 0;</div><div class='ctx'> 	err = snd_pcm_new(atc-&gt;card, "ctxfi", device,</div><div class='ctx'> 			  playback_count, capture_count, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: snd_pcm_new failed!! Err=%d\n", err);</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev, "snd_pcm_new failed!! Err=%d\n",</div><div class='add'>+			err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = atc;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='del'>-	strlcpy(pcm-&gt;name, device_name, sizeof(pcm-&gt;name));</div><div class='add'>+	strscpy(pcm-&gt;name, device_name, sizeof(pcm-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;ct_pcm_playback_ops);</div><div class='ctx'> </div><div class='hunk'>@@ -420,10 +441,34 @@ int ct_alsa_pcm_create(struct ct_atc *atc,</div><div class='ctx'> 		snd_pcm_set_ops(pcm,</div><div class='ctx'> 				SNDRV_PCM_STREAM_CAPTURE, &amp;ct_pcm_capture_ops);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='del'>-			snd_dma_pci_data(atc-&gt;pci), 128*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+				       &amp;atc-&gt;pci-&gt;dev, 128*1024, 128*1024);</div><div class='add'>+</div><div class='add'>+	chs = 2;</div><div class='add'>+	switch (device) {</div><div class='add'>+	case FRONT:</div><div class='add'>+		chs = 8;</div><div class='add'>+		map = snd_pcm_std_chmaps;</div><div class='add'>+		break;</div><div class='add'>+	case SURROUND:</div><div class='add'>+		map = surround_map;</div><div class='add'>+		break;</div><div class='add'>+	case CLFE:</div><div class='add'>+		map = clfe_map;</div><div class='add'>+		break;</div><div class='add'>+	case SIDE:</div><div class='add'>+		map = side_map;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		map = snd_pcm_std_chmaps;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, chs,</div><div class='add'>+				     0, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	atc-&gt;pcms[device] = pcm;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ctxfi/ctpcm.h b/sound/pci/ctxfi/ctpcm.h<br/>index 178da0dca647..8b39bdd262b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctpcm.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctpcm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctpcm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctpcm.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctpcm.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	Mar 28 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTPCM_H</div><div class='head'>diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c<br/>index 7dfaf67344d4..be1d3e61309c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctresource.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctresource.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctresource.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctresource.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctresource.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -12,7 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 15 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctresource.h"</div><div class='hunk'>@@ -96,7 +92,7 @@ int mgr_put_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int idx)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char offset_in_audio_slot_block[NUM_RSCTYP] = {</div><div class='add'>+static const unsigned char offset_in_audio_slot_block[NUM_RSCTYP] = {</div><div class='ctx'> 	/* SRC channel is at Audio Ring slot 1 every 16 slots. */</div><div class='ctx'> 	[SRC]		= 0x1,</div><div class='ctx'> 	[AMIXER]	= 0x4,</div><div class='hunk'>@@ -113,28 +109,28 @@ static int audio_ring_slot(const struct rsc *rsc)</div><div class='ctx'>     return (rsc-&gt;conj &lt;&lt; 4) + offset_in_audio_slot_block[rsc-&gt;type];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsc_next_conj(struct rsc *rsc)</div><div class='add'>+static void rsc_next_conj(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	for (i = 0; (i &lt; 8) &amp;&amp; (!(rsc-&gt;msr &amp; (0x1 &lt;&lt; i))); )</div><div class='ctx'> 		i++;</div><div class='ctx'> 	rsc-&gt;conj += (AUDIO_SLOT_BLOCK_NUM &gt;&gt; i);</div><div class='del'>-	return rsc-&gt;conj;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rsc_master(struct rsc *rsc)</div><div class='add'>+static void rsc_master(struct rsc *rsc)</div><div class='ctx'> {</div><div class='del'>-	return rsc-&gt;conj = rsc-&gt;idx;</div><div class='add'>+	rsc-&gt;conj = rsc-&gt;idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops rsc_generic_ops = {</div><div class='add'>+static const struct rsc_ops rsc_generic_ops = {</div><div class='ctx'> 	.index		= rsc_index,</div><div class='ctx'> 	.output_slot	= audio_ring_slot,</div><div class='ctx'> 	.master		= rsc_master,</div><div class='ctx'> 	.next_conj	= rsc_next_conj,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw)</div><div class='add'>+int</div><div class='add'>+rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, struct hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -151,25 +147,24 @@ int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw)</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case SRC:</div><div class='del'>-		err = ((struct hw *)hw)-&gt;src_rsc_get_ctrl_blk(&amp;rsc-&gt;ctrl_blk);</div><div class='add'>+		err = hw-&gt;src_rsc_get_ctrl_blk(&amp;rsc-&gt;ctrl_blk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case AMIXER:</div><div class='del'>-		err = ((struct hw *)hw)-&gt;</div><div class='del'>-				amixer_rsc_get_ctrl_blk(&amp;rsc-&gt;ctrl_blk);</div><div class='add'>+		err = hw-&gt;amixer_rsc_get_ctrl_blk(&amp;rsc-&gt;ctrl_blk);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SRCIMP:</div><div class='ctx'> 	case SUM:</div><div class='ctx'> 	case DAIO:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ctxfi: Invalid resource type value %d!\n", type);</div><div class='add'>+		dev_err(((struct hw *)hw)-&gt;card-&gt;dev,</div><div class='add'>+			"Invalid resource type value %d!\n", type);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ctxfi: Failed to get resource control block!\n");</div><div class='add'>+		dev_err(((struct hw *)hw)-&gt;card-&gt;dev,</div><div class='add'>+			"Failed to get resource control block!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -181,19 +176,18 @@ int rsc_uninit(struct rsc *rsc)</div><div class='ctx'> 	if ((NULL != rsc-&gt;hw) &amp;&amp; (NULL != rsc-&gt;ctrl_blk)) {</div><div class='ctx'> 		switch (rsc-&gt;type) {</div><div class='ctx'> 		case SRC:</div><div class='del'>-			((struct hw *)rsc-&gt;hw)-&gt;</div><div class='del'>-				src_rsc_put_ctrl_blk(rsc-&gt;ctrl_blk);</div><div class='add'>+			rsc-&gt;hw-&gt;src_rsc_put_ctrl_blk(rsc-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AMIXER:</div><div class='del'>-			((struct hw *)rsc-&gt;hw)-&gt;</div><div class='del'>-				amixer_rsc_put_ctrl_blk(rsc-&gt;ctrl_blk);</div><div class='add'>+			rsc-&gt;hw-&gt;amixer_rsc_put_ctrl_blk(rsc-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SUM:</div><div class='ctx'> 		case DAIO:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_ERR "ctxfi: "</div><div class='del'>-			       "Invalid resource type value %d!\n", rsc-&gt;type);</div><div class='add'>+			dev_err(((struct hw *)rsc-&gt;hw)-&gt;card-&gt;dev,</div><div class='add'>+				"Invalid resource type value %d!\n",</div><div class='add'>+				rsc-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -208,14 +202,13 @@ int rsc_uninit(struct rsc *rsc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type,</div><div class='del'>-		 unsigned int amount, void *hw_obj)</div><div class='add'>+		 unsigned int amount, struct hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	struct hw *hw = hw_obj;</div><div class='ctx'> </div><div class='ctx'> 	mgr-&gt;type = NUM_RSCTYP;</div><div class='ctx'> </div><div class='del'>-	mgr-&gt;rscs = kzalloc(((amount + 8 - 1) / 8), GFP_KERNEL);</div><div class='add'>+	mgr-&gt;rscs = kzalloc(DIV_ROUND_UP(amount, 8), GFP_KERNEL);</div><div class='ctx'> 	if (!mgr-&gt;rscs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -235,15 +228,15 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type,</div><div class='ctx'> 	case SUM:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ctxfi: Invalid resource type value %d!\n", type);</div><div class='add'>+		dev_err(hw-&gt;card-&gt;dev,</div><div class='add'>+			"Invalid resource type value %d!\n", type);</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR</div><div class='del'>-		       "ctxfi: Failed to get manager control block!\n");</div><div class='add'>+		dev_err(hw-&gt;card-&gt;dev,</div><div class='add'>+			"Failed to get manager control block!\n");</div><div class='ctx'> 		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -260,34 +253,29 @@ error:</div><div class='ctx'> </div><div class='ctx'> int rsc_mgr_uninit(struct rsc_mgr *mgr)</div><div class='ctx'> {</div><div class='del'>-	if (NULL != mgr-&gt;rscs) {</div><div class='del'>-		kfree(mgr-&gt;rscs);</div><div class='del'>-		mgr-&gt;rscs = NULL;</div><div class='del'>-	}</div><div class='add'>+	kfree(mgr-&gt;rscs);</div><div class='add'>+	mgr-&gt;rscs = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if ((NULL != mgr-&gt;hw) &amp;&amp; (NULL != mgr-&gt;ctrl_blk)) {</div><div class='ctx'> 		switch (mgr-&gt;type) {</div><div class='ctx'> 		case SRC:</div><div class='del'>-			((struct hw *)mgr-&gt;hw)-&gt;</div><div class='del'>-				src_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='add'>+			mgr-&gt;hw-&gt;src_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SRCIMP:</div><div class='del'>-			((struct hw *)mgr-&gt;hw)-&gt;</div><div class='del'>-				srcimp_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='add'>+			mgr-&gt;hw-&gt;srcimp_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AMIXER:</div><div class='del'>-			((struct hw *)mgr-&gt;hw)-&gt;</div><div class='del'>-				amixer_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='add'>+			mgr-&gt;hw-&gt;amixer_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DAIO:</div><div class='del'>-			((struct hw *)mgr-&gt;hw)-&gt;</div><div class='del'>-				daio_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='add'>+			mgr-&gt;hw-&gt;daio_mgr_put_ctrl_blk(mgr-&gt;ctrl_blk);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case SUM:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			printk(KERN_ERR "ctxfi: "</div><div class='del'>-			       "Invalid resource type value %d!\n", mgr-&gt;type);</div><div class='add'>+			dev_err(((struct hw *)mgr-&gt;hw)-&gt;card-&gt;dev,</div><div class='add'>+				"Invalid resource type value %d!\n",</div><div class='add'>+				mgr-&gt;type);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ctxfi/ctresource.h b/sound/pci/ctxfi/ctresource.h<br/>index 0838c2e84f8b..58553bda44f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctresource.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctresource.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctresource.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctresource.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctresource.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTRESOURCE_H</div><div class='hunk'>@@ -38,19 +34,20 @@ struct rsc {</div><div class='ctx'> 	u32 conj:12;	/* Current conjugate index */</div><div class='ctx'> 	u32 msr:4;	/* The Master Sample Rate a resource working on */</div><div class='ctx'> 	void *ctrl_blk;	/* Chip specific control info block for a resource */</div><div class='del'>-	void *hw;	/* Chip specific object for hardware access means */</div><div class='del'>-	struct rsc_ops *ops;	/* Generic resource operations */</div><div class='add'>+	struct hw *hw;	/* Chip specific object for hardware access means */</div><div class='add'>+	const struct rsc_ops *ops;	/* Generic resource operations */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct rsc_ops {</div><div class='del'>-	int (*master)(struct rsc *rsc);	/* Move to master resource */</div><div class='del'>-	int (*next_conj)(struct rsc *rsc); /* Move to next conjugate resource */</div><div class='add'>+	void (*master)(struct rsc *rsc); /* Move to master resource */</div><div class='add'>+	void (*next_conj)(struct rsc *rsc); /* Move to next conjugate resource */</div><div class='ctx'> 	int (*index)(const struct rsc *rsc); /* Return the index of resource */</div><div class='ctx'> 	/* Return the output slot number */</div><div class='ctx'> 	int (*output_slot)(const struct rsc *rsc);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw);</div><div class='add'>+int</div><div class='add'>+rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, struct hw *hw);</div><div class='ctx'> int rsc_uninit(struct rsc *rsc);</div><div class='ctx'> </div><div class='ctx'> struct rsc_mgr {</div><div class='hunk'>@@ -59,12 +56,12 @@ struct rsc_mgr {</div><div class='ctx'> 	unsigned int avail; /* The amount of currently available resources */</div><div class='ctx'> 	unsigned char *rscs; /* The bit-map for resource allocation */</div><div class='ctx'> 	void *ctrl_blk; /* Chip specific control info block */</div><div class='del'>-	void *hw; /* Chip specific object for hardware access */</div><div class='add'>+	struct hw *hw; /* Chip specific object for hardware access */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Resource management is based on bit-map mechanism */</div><div class='ctx'> int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type,</div><div class='del'>-		 unsigned int amount, void *hw);</div><div class='add'>+		 unsigned int amount, struct hw *hw);</div><div class='ctx'> int rsc_mgr_uninit(struct rsc_mgr *mgr);</div><div class='ctx'> int mgr_get_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int *ridx);</div><div class='ctx'> int mgr_put_resource(struct rsc_mgr *mgr, unsigned int n, unsigned int idx);</div><div class='head'>diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c<br/>index c749fa720889..46afc9604c08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctsrc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctsrc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctsrc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctsrc.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctsrc.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,14 +10,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctsrc.h"</div><div class='ctx'> #include "cthardware.h"</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#define SRC_RESOURCE_NUM	64</div><div class='add'>+#define SRC_RESOURCE_NUM	256</div><div class='ctx'> #define SRCIMP_RESOURCE_NUM	256</div><div class='ctx'> </div><div class='ctx'> static unsigned int conj_mask;</div><div class='hunk'>@@ -335,7 +331,7 @@ static int src_default_config_arcrw(struct src *src)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct src_rsc_ops src_rsc_ops = {</div><div class='add'>+static const struct src_rsc_ops src_rsc_ops = {</div><div class='ctx'> 	.set_state		= src_set_state,</div><div class='ctx'> 	.set_bm			= src_set_bm,</div><div class='ctx'> 	.set_sf			= src_set_sf,</div><div class='hunk'>@@ -418,26 +414,25 @@ get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc)</div><div class='ctx'> 	unsigned int idx = SRC_RESOURCE_NUM;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct src *src;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	*rsrc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether there are sufficient src resources to meet request. */</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	if (MEMRD == desc-&gt;mode)</div><div class='del'>-		err = mgr_get_resource(&amp;mgr-&gt;mgr, desc-&gt;multi, &amp;idx);</div><div class='del'>-	else</div><div class='del'>-		err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		if (MEMRD == desc-&gt;mode)</div><div class='add'>+			err = mgr_get_resource(&amp;mgr-&gt;mgr, desc-&gt;multi, &amp;idx);</div><div class='add'>+		else</div><div class='add'>+			err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='add'>+	}</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Can't meet SRC resource request!\n");</div><div class='add'>+		dev_err(mgr-&gt;card-&gt;dev,</div><div class='add'>+			"Can't meet SRC resource request!\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate mem for master src resource */</div><div class='ctx'> 	if (MEMRD == desc-&gt;mode)</div><div class='del'>-		src = kzalloc(sizeof(*src)*desc-&gt;multi, GFP_KERNEL);</div><div class='add'>+		src = kcalloc(desc-&gt;multi, sizeof(*src), GFP_KERNEL);</div><div class='ctx'> 	else</div><div class='ctx'> 		src = kzalloc(sizeof(*src), GFP_KERNEL);</div><div class='ctx'> </div><div class='hunk'>@@ -457,29 +452,25 @@ get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc)</div><div class='ctx'> error2:</div><div class='ctx'> 	kfree(src);</div><div class='ctx'> error1:</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	if (MEMRD == desc-&gt;mode)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, desc-&gt;multi, idx);</div><div class='del'>-	else</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, idx);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		if (MEMRD == desc-&gt;mode)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, desc-&gt;multi, idx);</div><div class='add'>+		else</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, idx);</div><div class='add'>+	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int put_src_rsc(struct src_mgr *mgr, struct src *src)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	src-&gt;rsc.ops-&gt;master(&amp;src-&gt;rsc);</div><div class='del'>-	if (MEMRD == src-&gt;mode)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, src-&gt;multi,</div><div class='del'>-				 src-&gt;rsc.ops-&gt;index(&amp;src-&gt;rsc));</div><div class='del'>-	else</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, src-&gt;rsc.ops-&gt;index(&amp;src-&gt;rsc));</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		src-&gt;rsc.ops-&gt;master(&amp;src-&gt;rsc);</div><div class='add'>+		if (MEMRD == src-&gt;mode)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, src-&gt;multi,</div><div class='add'>+					 src-&gt;rsc.ops-&gt;index(&amp;src-&gt;rsc));</div><div class='add'>+		else</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, src-&gt;rsc.ops-&gt;index(&amp;src-&gt;rsc));</div><div class='add'>+	}</div><div class='ctx'> 	src_rsc_uninit(src, mgr);</div><div class='ctx'> 	kfree(src);</div><div class='ctx'> </div><div class='hunk'>@@ -543,7 +534,7 @@ static int src_mgr_commit_write(struct src_mgr *mgr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr)</div><div class='add'>+int src_mgr_create(struct hw *hw, void **rsrc_mgr)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	struct src_mgr *src_mgr;</div><div class='hunk'>@@ -558,7 +549,7 @@ int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr)</div><div class='ctx'> 		goto error1;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;src_mgr-&gt;mgr_lock);</div><div class='del'>-	conj_mask = ((struct hw *)hw)-&gt;src_dirty_conj_mask();</div><div class='add'>+	conj_mask = hw-&gt;src_dirty_conj_mask();</div><div class='ctx'> </div><div class='ctx'> 	src_mgr-&gt;get_src = get_src_rsc;</div><div class='ctx'> 	src_mgr-&gt;put_src = put_src_rsc;</div><div class='hunk'>@@ -566,12 +557,13 @@ int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr)</div><div class='ctx'> 	src_mgr-&gt;src_enable = src_enable;</div><div class='ctx'> 	src_mgr-&gt;src_disable = src_disable;</div><div class='ctx'> 	src_mgr-&gt;commit_write = src_mgr_commit_write;</div><div class='add'>+	src_mgr-&gt;card = hw-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all SRC resources. */</div><div class='ctx'> 	for (i = 0; i &lt; 256; i++)</div><div class='del'>-		((struct hw *)hw)-&gt;src_mgr_dsb_src(src_mgr-&gt;mgr.ctrl_blk, i);</div><div class='add'>+		hw-&gt;src_mgr_dsb_src(src_mgr-&gt;mgr.ctrl_blk, i);</div><div class='ctx'> </div><div class='del'>-	((struct hw *)hw)-&gt;src_mgr_commit_write(hw, src_mgr-&gt;mgr.ctrl_blk);</div><div class='add'>+	hw-&gt;src_mgr_commit_write(hw, src_mgr-&gt;mgr.ctrl_blk);</div><div class='ctx'> </div><div class='ctx'> 	*rsrc_mgr = src_mgr;</div><div class='ctx'> </div><div class='hunk'>@@ -582,8 +574,9 @@ error1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int src_mgr_destroy(struct src_mgr *src_mgr)</div><div class='add'>+int src_mgr_destroy(void *ptr)</div><div class='ctx'> {</div><div class='add'>+	struct src_mgr *src_mgr = ptr;</div><div class='ctx'> 	rsc_mgr_uninit(&amp;src_mgr-&gt;mgr);</div><div class='ctx'> 	kfree(src_mgr);</div><div class='ctx'> </div><div class='hunk'>@@ -592,16 +585,15 @@ int src_mgr_destroy(struct src_mgr *src_mgr)</div><div class='ctx'> </div><div class='ctx'> /* SRCIMP resource manager operations */</div><div class='ctx'> </div><div class='del'>-static int srcimp_master(struct rsc *rsc)</div><div class='add'>+static void srcimp_master(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj = 0;</div><div class='del'>-	return rsc-&gt;idx = container_of(rsc, struct srcimp, rsc)-&gt;idx[0];</div><div class='add'>+	rsc-&gt;idx = container_of(rsc, struct srcimp, rsc)-&gt;idx[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int srcimp_next_conj(struct rsc *rsc)</div><div class='add'>+static void srcimp_next_conj(struct rsc *rsc)</div><div class='ctx'> {</div><div class='ctx'> 	rsc-&gt;conj++;</div><div class='del'>-	return container_of(rsc, struct srcimp, rsc)-&gt;idx[rsc-&gt;conj];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int srcimp_index(const struct rsc *rsc)</div><div class='hunk'>@@ -609,7 +601,7 @@ static int srcimp_index(const struct rsc *rsc)</div><div class='ctx'> 	return container_of(rsc, struct srcimp, rsc)-&gt;idx[rsc-&gt;conj];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct rsc_ops srcimp_basic_rsc_ops = {</div><div class='add'>+static const struct rsc_ops srcimp_basic_rsc_ops = {</div><div class='ctx'> 	.master		= srcimp_master,</div><div class='ctx'> 	.next_conj	= srcimp_next_conj,</div><div class='ctx'> 	.index		= srcimp_index,</div><div class='hunk'>@@ -660,7 +652,7 @@ static int srcimp_unmap(struct srcimp *srcimp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct srcimp_rsc_ops srcimp_ops = {</div><div class='add'>+static const struct srcimp_rsc_ops srcimp_ops = {</div><div class='ctx'> 	.map = srcimp_map,</div><div class='ctx'> 	.unmap = srcimp_unmap</div><div class='ctx'> };</div><div class='hunk'>@@ -677,7 +669,7 @@ static int srcimp_rsc_init(struct srcimp *srcimp,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Reserve memory for imapper nodes */</div><div class='del'>-	srcimp-&gt;imappers = kzalloc(sizeof(struct imapper)*desc-&gt;msr,</div><div class='add'>+	srcimp-&gt;imappers = kcalloc(desc-&gt;msr, sizeof(struct imapper),</div><div class='ctx'> 				   GFP_KERNEL);</div><div class='ctx'> 	if (!srcimp-&gt;imappers) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -700,10 +692,8 @@ error1:</div><div class='ctx'> </div><div class='ctx'> static int srcimp_rsc_uninit(struct srcimp *srcimp)</div><div class='ctx'> {</div><div class='del'>-	if (NULL != srcimp-&gt;imappers) {</div><div class='del'>-		kfree(srcimp-&gt;imappers);</div><div class='del'>-		srcimp-&gt;imappers = NULL;</div><div class='del'>-	}</div><div class='add'>+	kfree(srcimp-&gt;imappers);</div><div class='add'>+	srcimp-&gt;imappers = NULL;</div><div class='ctx'> 	srcimp-&gt;ops = NULL;</div><div class='ctx'> 	srcimp-&gt;mgr = NULL;</div><div class='ctx'> 	rsc_uninit(&amp;srcimp-&gt;rsc);</div><div class='hunk'>@@ -718,7 +708,6 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,</div><div class='ctx'> 	int err, i;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	struct srcimp *srcimp;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	*rsrcimp = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -729,17 +718,18 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether there are sufficient SRCIMP resources. */</div><div class='ctx'> 	err = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='del'>-		err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; desc-&gt;msr; i++) {</div><div class='add'>+			err = mgr_get_resource(&amp;mgr-&gt;mgr, 1, &amp;idx);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='del'>-		srcimp-&gt;idx[i] = idx;</div><div class='add'>+			srcimp-&gt;idx[i] = idx;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Can't meet SRCIMP resource request!\n");</div><div class='add'>+		dev_err(mgr-&gt;card-&gt;dev,</div><div class='add'>+			"Can't meet SRCIMP resource request!\n");</div><div class='ctx'> 		goto error1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -752,25 +742,22 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error1:</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i--; i &gt;= 0; i--)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, srcimp-&gt;idx[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i--; i &gt;= 0; i--)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, srcimp-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> 	kfree(srcimp);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int put_srcimp_rsc(struct srcimp_mgr *mgr, struct srcimp *srcimp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;mgr_lock, flags);</div><div class='del'>-	for (i = 0; i &lt; srcimp-&gt;rsc.msr; i++)</div><div class='del'>-		mgr_put_resource(&amp;mgr-&gt;mgr, 1, srcimp-&gt;idx[i]);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;mgr_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;mgr-&gt;mgr_lock) {</div><div class='add'>+		for (i = 0; i &lt; srcimp-&gt;rsc.msr; i++)</div><div class='add'>+			mgr_put_resource(&amp;mgr-&gt;mgr, 1, srcimp-&gt;idx[i]);</div><div class='add'>+	}</div><div class='ctx'> 	srcimp_rsc_uninit(srcimp);</div><div class='ctx'> 	kfree(srcimp);</div><div class='ctx'> </div><div class='hunk'>@@ -793,39 +780,31 @@ static int srcimp_map_op(void *data, struct imapper *entry)</div><div class='ctx'> </div><div class='ctx'> static int srcimp_imap_add(struct srcimp_mgr *mgr, struct imapper *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;imap_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mgr-&gt;imap_lock);</div><div class='ctx'> 	if ((0 == entry-&gt;addr) &amp;&amp; (mgr-&gt;init_imap_added)) {</div><div class='ctx'> 		input_mapper_delete(&amp;mgr-&gt;imappers,</div><div class='ctx'> 				    mgr-&gt;init_imap, srcimp_map_op, mgr);</div><div class='ctx'> 		mgr-&gt;init_imap_added = 0;</div><div class='ctx'> 	}</div><div class='del'>-	err = input_mapper_add(&amp;mgr-&gt;imappers, entry, srcimp_map_op, mgr);</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;imap_lock, flags);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return input_mapper_add(&amp;mgr-&gt;imappers, entry, srcimp_map_op, mgr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int srcimp_imap_delete(struct srcimp_mgr *mgr, struct imapper *entry)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;mgr-&gt;imap_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;mgr-&gt;imap_lock);</div><div class='ctx'> 	err = input_mapper_delete(&amp;mgr-&gt;imappers, entry, srcimp_map_op, mgr);</div><div class='ctx'> 	if (list_empty(&amp;mgr-&gt;imappers)) {</div><div class='ctx'> 		input_mapper_add(&amp;mgr-&gt;imappers, mgr-&gt;init_imap,</div><div class='ctx'> 				 srcimp_map_op, mgr);</div><div class='ctx'> 		mgr-&gt;init_imap_added = 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mgr-&gt;imap_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrcimp_mgr)</div><div class='add'>+int srcimp_mgr_create(struct hw *hw, void **rsrcimp_mgr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct srcimp_mgr *srcimp_mgr;</div><div class='hunk'>@@ -857,6 +836,7 @@ int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrcimp_mgr)</div><div class='ctx'> 	srcimp_mgr-&gt;put_srcimp = put_srcimp_rsc;</div><div class='ctx'> 	srcimp_mgr-&gt;imap_add = srcimp_imap_add;</div><div class='ctx'> 	srcimp_mgr-&gt;imap_delete = srcimp_imap_delete;</div><div class='add'>+	srcimp_mgr-&gt;card = hw-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	*rsrcimp_mgr = srcimp_mgr;</div><div class='ctx'> </div><div class='hunk'>@@ -869,14 +849,14 @@ error1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int srcimp_mgr_destroy(struct srcimp_mgr *srcimp_mgr)</div><div class='add'>+int srcimp_mgr_destroy(void *ptr)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct srcimp_mgr *srcimp_mgr = ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* free src input mapper list */</div><div class='del'>-	spin_lock_irqsave(&amp;srcimp_mgr-&gt;imap_lock, flags);</div><div class='del'>-	free_input_mapper_list(&amp;srcimp_mgr-&gt;imappers);</div><div class='del'>-	spin_unlock_irqrestore(&amp;srcimp_mgr-&gt;imap_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;srcimp_mgr-&gt;imap_lock) {</div><div class='add'>+		free_input_mapper_list(&amp;srcimp_mgr-&gt;imappers);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rsc_mgr_uninit(&amp;srcimp_mgr-&gt;mgr);</div><div class='ctx'> 	kfree(srcimp_mgr);</div><div class='head'>diff --git a/sound/pci/ctxfi/ctsrc.h b/sound/pci/ctxfi/ctsrc.h<br/>index 259366aabcac..e6366cc6a7ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctsrc.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctsrc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctsrc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctsrc.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File	ctsrc.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -13,7 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * @Author	Liu Chun</div><div class='ctx'>  * @Date 	May 13 2008</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CTSRC_H</div><div class='hunk'>@@ -23,6 +19,7 @@</div><div class='ctx'> #include "ctimap.h"</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define SRC_STATE_OFF	0x0</div><div class='ctx'> #define SRC_STATE_INIT	0x4</div><div class='hunk'>@@ -47,7 +44,7 @@ struct src_rsc_ops;</div><div class='ctx'> struct src {</div><div class='ctx'> 	struct rsc rsc; /* Basic resource info */</div><div class='ctx'> 	struct src *intlv; /* Pointer to next interleaved SRC in a series */</div><div class='del'>-	struct src_rsc_ops *ops; /* SRC specific operations */</div><div class='add'>+	const struct src_rsc_ops *ops; /* SRC specific operations */</div><div class='ctx'> 	/* Number of contiguous srcs for interleaved usage */</div><div class='ctx'> 	unsigned char multi;</div><div class='ctx'> 	unsigned char mode; /* Working mode of this SRC resource */</div><div class='hunk'>@@ -85,6 +82,7 @@ struct src_desc {</div><div class='ctx'> /* Define src manager object */</div><div class='ctx'> struct src_mgr {</div><div class='ctx'> 	struct rsc_mgr mgr;	/* Basic resource manager info */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	spinlock_t mgr_lock;</div><div class='ctx'> </div><div class='ctx'> 	 /* request src resource */</div><div class='hunk'>@@ -108,7 +106,7 @@ struct srcimp {</div><div class='ctx'> 	struct imapper *imappers;</div><div class='ctx'> 	unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */</div><div class='ctx'> 	struct srcimp_mgr *mgr;</div><div class='del'>-	struct srcimp_rsc_ops *ops;</div><div class='add'>+	const struct srcimp_rsc_ops *ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct srcimp_rsc_ops {</div><div class='hunk'>@@ -123,6 +121,7 @@ struct srcimp_desc {</div><div class='ctx'> </div><div class='ctx'> struct srcimp_mgr {</div><div class='ctx'> 	struct rsc_mgr mgr;	/* Basic resource manager info */</div><div class='add'>+	struct snd_card *card;	/* pointer to this card */</div><div class='ctx'> 	spinlock_t mgr_lock;</div><div class='ctx'> 	spinlock_t imap_lock;</div><div class='ctx'> 	struct list_head imappers;</div><div class='hunk'>@@ -140,10 +139,10 @@ struct srcimp_mgr {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Constructor and destructor of SRC resource manager */</div><div class='del'>-int src_mgr_create(void *hw, struct src_mgr **rsrc_mgr);</div><div class='del'>-int src_mgr_destroy(struct src_mgr *src_mgr);</div><div class='add'>+int src_mgr_create(struct hw *hw, void **ptr);</div><div class='add'>+int src_mgr_destroy(void *ptr);</div><div class='ctx'> /* Constructor and destructor of SRCIMP resource manager */</div><div class='del'>-int srcimp_mgr_create(void *hw, struct srcimp_mgr **rsrc_mgr);</div><div class='del'>-int srcimp_mgr_destroy(struct srcimp_mgr *srcimp_mgr);</div><div class='add'>+int srcimp_mgr_create(struct hw *hw, void **ptr);</div><div class='add'>+int srcimp_mgr_destroy(void *ptr);</div><div class='ctx'> </div><div class='ctx'> #endif /* CTSRC_H */</div><div class='head'>diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c<br/>index 93b0aedc36d4..609b10320ff7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cttimer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cttimer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cttimer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cttimer.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * PCM timer handling on ctxfi</div><div class='del'>- *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -15,9 +12,9 @@</div><div class='ctx'> #include "cthardware.h"</div><div class='ctx'> #include "cttimer.h"</div><div class='ctx'> </div><div class='del'>-static int use_system_timer;</div><div class='del'>-MODULE_PARM_DESC(use_system_timer, "Foce to use system-timer");</div><div class='del'>-module_param(use_system_timer, bool, S_IRUGO);</div><div class='add'>+static bool use_system_timer;</div><div class='add'>+MODULE_PARM_DESC(use_system_timer, "Force to use system-timer");</div><div class='add'>+module_param(use_system_timer, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> struct ct_timer_ops {</div><div class='ctx'> 	void (*init)(struct ct_timer_instance *);</div><div class='hunk'>@@ -49,7 +46,7 @@ struct ct_timer {</div><div class='ctx'> 	spinlock_t lock;		/* global timer lock (for xfitimer) */</div><div class='ctx'> 	spinlock_t list_lock;		/* lock for instance list */</div><div class='ctx'> 	struct ct_atc *atc;</div><div class='del'>-	struct ct_timer_ops *ops;</div><div class='add'>+	const struct ct_timer_ops *ops;</div><div class='ctx'> 	struct list_head instance_head;</div><div class='ctx'> 	struct list_head running_head;</div><div class='ctx'> 	unsigned int wc;		/* current wallclock */</div><div class='hunk'>@@ -63,15 +60,14 @@ struct ct_timer {</div><div class='ctx'>  * system-timer-based updates</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void ct_systimer_callback(unsigned long data)</div><div class='add'>+static void ct_systimer_callback(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ct_timer_instance *ti = (struct ct_timer_instance *)data;</div><div class='add'>+	struct ct_timer_instance *ti = timer_container_of(ti, t, timer);</div><div class='ctx'> 	struct snd_pcm_substream *substream = ti-&gt;substream;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct ct_atc_pcm *apcm = ti-&gt;apcm;</div><div class='ctx'> 	unsigned int period_size = runtime-&gt;period_size;</div><div class='ctx'> 	unsigned int buffer_size = runtime-&gt;buffer_size;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int position, dist, interval;</div><div class='ctx'> </div><div class='ctx'> 	position = substream-&gt;ops-&gt;pointer(substream);</div><div class='hunk'>@@ -85,50 +81,43 @@ static void ct_systimer_callback(unsigned long data)</div><div class='ctx'> 	 * at 8kHz in 8-bit format or at 88kHz in 24-bit format. */</div><div class='ctx'> 	interval = ((period_size - (position % period_size))</div><div class='ctx'> 		   * HZ + (runtime-&gt;rate - 1)) / runtime-&gt;rate + HZ * 5 / 1000;</div><div class='del'>-	spin_lock_irqsave(&amp;ti-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ti-&gt;lock);</div><div class='ctx'> 	if (ti-&gt;running)</div><div class='ctx'> 		mod_timer(&amp;ti-&gt;timer, jiffies + interval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ti-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_systimer_init(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='del'>-	setup_timer(&amp;ti-&gt;timer, ct_systimer_callback,</div><div class='del'>-		    (unsigned long)ti);</div><div class='add'>+	timer_setup(&amp;ti-&gt;timer, ct_systimer_callback, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_systimer_start(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = ti-&gt;substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ti-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ti-&gt;lock);</div><div class='ctx'> 	ti-&gt;running = 1;</div><div class='ctx'> 	mod_timer(&amp;ti-&gt;timer,</div><div class='ctx'> 		  jiffies + (runtime-&gt;period_size * HZ +</div><div class='ctx'> 			     (runtime-&gt;rate - 1)) / runtime-&gt;rate);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ti-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_systimer_stop(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;ti-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ti-&gt;lock);</div><div class='ctx'> 	ti-&gt;running = 0;</div><div class='del'>-	del_timer(&amp;ti-&gt;timer);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ti-&gt;lock, flags);</div><div class='add'>+	timer_delete(&amp;ti-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_systimer_prepare(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='ctx'> 	ct_systimer_stop(ti);</div><div class='del'>-	try_to_del_timer_sync(&amp;ti-&gt;timer);</div><div class='add'>+	timer_delete_sync_try(&amp;ti-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ct_systimer_free	ct_systimer_prepare</div><div class='ctx'> </div><div class='del'>-static struct ct_timer_ops ct_systimer_ops = {</div><div class='add'>+static const struct ct_timer_ops ct_systimer_ops = {</div><div class='ctx'> 	.init = ct_systimer_init,</div><div class='ctx'> 	.free_instance = ct_systimer_free,</div><div class='ctx'> 	.prepare = ct_systimer_prepare,</div><div class='hunk'>@@ -233,25 +222,22 @@ static int ct_xfitimer_reprogram(struct ct_timer *atimer, int can_update)</div><div class='ctx'> static void ct_xfitimer_check_period(struct ct_timer *atimer)</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_timer_instance *ti;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;atimer-&gt;list_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;atimer-&gt;list_lock);</div><div class='ctx'> 	list_for_each_entry(ti, &amp;atimer-&gt;instance_head, instance_list) {</div><div class='ctx'> 		if (ti-&gt;running &amp;&amp; ti-&gt;need_update) {</div><div class='ctx'> 			ti-&gt;need_update = 0;</div><div class='ctx'> 			ti-&gt;apcm-&gt;interrupt(ti-&gt;apcm);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;atimer-&gt;list_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Handle timer-interrupt */</div><div class='ctx'> static void ct_xfitimer_callback(struct ct_timer *atimer)</div><div class='ctx'> {</div><div class='ctx'> 	int update;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;atimer-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;atimer-&gt;lock);</div><div class='ctx'> 	atimer-&gt;irq_handling = 1;</div><div class='ctx'> 	do {</div><div class='ctx'> 		update = ct_xfitimer_reprogram(atimer, 1);</div><div class='hunk'>@@ -261,7 +247,6 @@ static void ct_xfitimer_callback(struct ct_timer *atimer)</div><div class='ctx'> 		spin_lock(&amp;atimer-&gt;lock);</div><div class='ctx'> 	} while (atimer-&gt;reprogram);</div><div class='ctx'> 	atimer-&gt;irq_handling = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;atimer-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_xfitimer_prepare(struct ct_timer_instance *ti)</div><div class='hunk'>@@ -275,45 +260,39 @@ static void ct_xfitimer_prepare(struct ct_timer_instance *ti)</div><div class='ctx'> /* start/stop the timer */</div><div class='ctx'> static void ct_xfitimer_update(struct ct_timer *atimer)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;atimer-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;atimer-&gt;lock);</div><div class='ctx'> 	if (atimer-&gt;irq_handling) {</div><div class='ctx'> 		/* reached from IRQ handler; let it handle later */</div><div class='ctx'> 		atimer-&gt;reprogram = 1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;atimer-&gt;lock, flags);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ct_xfitimer_irq_stop(atimer);</div><div class='ctx'> 	ct_xfitimer_reprogram(atimer, 0);</div><div class='del'>-	spin_unlock_irqrestore(&amp;atimer-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_xfitimer_start(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_timer *atimer = ti-&gt;timer_base;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;atimer-&gt;lock, flags);</div><div class='del'>-	if (list_empty(&amp;ti-&gt;running_list))</div><div class='del'>-		atimer-&gt;wc = ct_xfitimer_get_wc(atimer);</div><div class='del'>-	ti-&gt;running = 1;</div><div class='del'>-	ti-&gt;need_update = 0;</div><div class='del'>-	list_add(&amp;ti-&gt;running_list, &amp;atimer-&gt;running_head);</div><div class='del'>-	spin_unlock_irqrestore(&amp;atimer-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;atimer-&gt;lock) {</div><div class='add'>+		if (list_empty(&amp;ti-&gt;running_list))</div><div class='add'>+			atimer-&gt;wc = ct_xfitimer_get_wc(atimer);</div><div class='add'>+		ti-&gt;running = 1;</div><div class='add'>+		ti-&gt;need_update = 0;</div><div class='add'>+		list_add(&amp;ti-&gt;running_list, &amp;atimer-&gt;running_head);</div><div class='add'>+	}</div><div class='ctx'> 	ct_xfitimer_update(atimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ct_xfitimer_stop(struct ct_timer_instance *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct ct_timer *atimer = ti-&gt;timer_base;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;atimer-&gt;lock, flags);</div><div class='del'>-	list_del_init(&amp;ti-&gt;running_list);</div><div class='del'>-	ti-&gt;running = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;atimer-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;atimer-&gt;lock) {</div><div class='add'>+		list_del_init(&amp;ti-&gt;running_list);</div><div class='add'>+		ti-&gt;running = 0;</div><div class='add'>+	}</div><div class='ctx'> 	ct_xfitimer_update(atimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +301,7 @@ static void ct_xfitimer_free_global(struct ct_timer *atimer)</div><div class='ctx'> 	ct_xfitimer_irq_stop(atimer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ct_timer_ops ct_xfitimer_ops = {</div><div class='add'>+static const struct ct_timer_ops ct_xfitimer_ops = {</div><div class='ctx'> 	.prepare = ct_xfitimer_prepare,</div><div class='ctx'> 	.start = ct_xfitimer_start,</div><div class='ctx'> 	.stop = ct_xfitimer_stop,</div><div class='hunk'>@@ -351,9 +330,9 @@ ct_timer_instance_new(struct ct_timer *atimer, struct ct_atc_pcm *apcm)</div><div class='ctx'> 	if (atimer-&gt;ops-&gt;init)</div><div class='ctx'> 		atimer-&gt;ops-&gt;init(ti);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;atimer-&gt;list_lock);</div><div class='del'>-	list_add(&amp;ti-&gt;instance_list, &amp;atimer-&gt;instance_head);</div><div class='del'>-	spin_unlock_irq(&amp;atimer-&gt;list_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;atimer-&gt;list_lock) {</div><div class='add'>+		list_add(&amp;ti-&gt;instance_list, &amp;atimer-&gt;instance_head);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return ti;</div><div class='ctx'> }</div><div class='hunk'>@@ -386,9 +365,9 @@ void ct_timer_instance_free(struct ct_timer_instance *ti)</div><div class='ctx'> 	if (atimer-&gt;ops-&gt;free_instance)</div><div class='ctx'> 		atimer-&gt;ops-&gt;free_instance(ti);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;atimer-&gt;list_lock);</div><div class='del'>-	list_del(&amp;ti-&gt;instance_list);</div><div class='del'>-	spin_unlock_irq(&amp;atimer-&gt;list_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;atimer-&gt;list_lock) {</div><div class='add'>+		list_del(&amp;ti-&gt;instance_list);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(ti);</div><div class='ctx'> }</div><div class='hunk'>@@ -421,12 +400,12 @@ struct ct_timer *ct_timer_new(struct ct_atc *atc)</div><div class='ctx'> 	atimer-&gt;atc = atc;</div><div class='ctx'> 	hw = atc-&gt;hw;</div><div class='ctx'> 	if (!use_system_timer &amp;&amp; hw-&gt;set_timer_irq) {</div><div class='del'>-		snd_printd(KERN_INFO "ctxfi: Use xfi-native timer\n");</div><div class='add'>+		dev_info(atc-&gt;card-&gt;dev, "Use xfi-native timer\n");</div><div class='ctx'> 		atimer-&gt;ops = &amp;ct_xfitimer_ops;</div><div class='ctx'> 		hw-&gt;irq_callback_data = atimer;</div><div class='ctx'> 		hw-&gt;irq_callback = ct_timer_interrupt;</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printd(KERN_INFO "ctxfi: Use system timer\n");</div><div class='add'>+		dev_info(atc-&gt;card-&gt;dev, "Use system timer\n");</div><div class='ctx'> 		atimer-&gt;ops = &amp;ct_systimer_ops;</div><div class='ctx'> 	}</div><div class='ctx'> 	return atimer;</div><div class='head'>diff --git a/sound/pci/ctxfi/cttimer.h b/sound/pci/ctxfi/cttimer.h<br/>index 979348229291..9c5cb403b646 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cttimer.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/cttimer.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/cttimer.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/cttimer.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Timer handling</div><div class='ctx'>  */</div><div class='head'>diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c<br/>index 65da6e466f80..823d6e240a07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctvmem.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctvmem.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctvmem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctvmem.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File    ctvmem.c</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -16,6 +13,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ctvmem.h"</div><div class='add'>+#include "ctatc.h"</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -29,39 +27,37 @@</div><div class='ctx'>  * @size must be page aligned.</div><div class='ctx'>  * */</div><div class='ctx'> static struct ct_vm_block *</div><div class='del'>-get_vm_block(struct ct_vm *vm, unsigned int size)</div><div class='add'>+get_vm_block(struct ct_vm *vm, unsigned int size, struct ct_atc *atc)</div><div class='ctx'> {</div><div class='del'>-	struct ct_vm_block *block = NULL, *entry;</div><div class='add'>+	struct ct_vm_block *block, *entry;</div><div class='ctx'> 	struct list_head *pos;</div><div class='ctx'> </div><div class='ctx'> 	size = CT_PAGE_ALIGN(size);</div><div class='ctx'> 	if (size &gt; vm-&gt;size) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Fail! No sufficient device virtural "</div><div class='del'>-				  "memory space available!\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+			"Fail! No sufficient device virtual memory space available!\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;vm-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;vm-&gt;lock);</div><div class='ctx'> 	list_for_each(pos, &amp;vm-&gt;unused) {</div><div class='ctx'> 		entry = list_entry(pos, struct ct_vm_block, list);</div><div class='ctx'> 		if (entry-&gt;size &gt;= size)</div><div class='ctx'> 			break; /* found a block that is big enough */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pos == &amp;vm-&gt;unused)</div><div class='del'>-		goto out;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;size == size) {</div><div class='ctx'> 		/* Move the vm node from unused list to used list directly */</div><div class='del'>-		list_del(&amp;entry-&gt;list);</div><div class='del'>-		list_add(&amp;entry-&gt;list, &amp;vm-&gt;used);</div><div class='add'>+		list_move(&amp;entry-&gt;list, &amp;vm-&gt;used);</div><div class='ctx'> 		vm-&gt;size -= size;</div><div class='del'>-		block = entry;</div><div class='del'>-		goto out;</div><div class='add'>+		return entry;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	block = kzalloc(sizeof(*block), GFP_KERNEL);</div><div class='ctx'> 	if (!block)</div><div class='del'>-		goto out;</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	block-&gt;addr = entry-&gt;addr;</div><div class='ctx'> 	block-&gt;size = size;</div><div class='hunk'>@@ -70,8 +66,6 @@ get_vm_block(struct ct_vm *vm, unsigned int size)</div><div class='ctx'> 	entry-&gt;size -= size;</div><div class='ctx'> 	vm-&gt;size -= size;</div><div class='ctx'> </div><div class='del'>- out:</div><div class='del'>-	mutex_unlock(&amp;vm-&gt;lock);</div><div class='ctx'> 	return block;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -82,7 +76,7 @@ static void put_vm_block(struct ct_vm *vm, struct ct_vm_block *block)</div><div class='ctx'> </div><div class='ctx'> 	block-&gt;size = CT_PAGE_ALIGN(block-&gt;size);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;vm-&gt;lock);</div><div class='add'>+	guard(mutex)(&amp;vm-&gt;lock);</div><div class='ctx'> 	list_del(&amp;block-&gt;list);</div><div class='ctx'> 	vm-&gt;size += block-&gt;size;</div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +113,6 @@ static void put_vm_block(struct ct_vm *vm, struct ct_vm_block *block)</div><div class='ctx'> 		pos = pre;</div><div class='ctx'> 		pre = pos-&gt;prev;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;vm-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Map host addr (kmalloced/vmalloced) to device logical addr. */</div><div class='hunk'>@@ -130,11 +123,12 @@ ct_vm_map(struct ct_vm *vm, struct snd_pcm_substream *substream, int size)</div><div class='ctx'> 	unsigned int pte_start;</div><div class='ctx'> 	unsigned i, pages;</div><div class='ctx'> 	unsigned long *ptp;</div><div class='add'>+	struct ct_atc *atc = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	block = get_vm_block(vm, size);</div><div class='add'>+	block = get_vm_block(vm, size, atc);</div><div class='ctx'> 	if (block == NULL) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: No virtual memory block that is big "</div><div class='del'>-				  "enough to allocate!\n");</div><div class='add'>+		dev_err(atc-&gt;card-&gt;dev,</div><div class='add'>+			"No virtual memory block that is big enough to allocate!\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -165,11 +159,7 @@ static void ct_vm_unmap(struct ct_vm *vm, struct ct_vm_block *block)</div><div class='ctx'> static dma_addr_t</div><div class='ctx'> ct_get_ptp_phys(struct ct_vm *vm, int index)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t addr;</div><div class='del'>-</div><div class='del'>-	addr = (index &gt;= CT_PTP_NUM) ? ~0UL : vm-&gt;ptp[index].addr;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='add'>+	return (index &gt;= CT_PTP_NUM) ? ~0UL : vm-&gt;ptp[index].addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)</div><div class='hunk'>@@ -189,7 +179,7 @@ int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)</div><div class='ctx'> 	/* Allocate page table pages */</div><div class='ctx'> 	for (i = 0; i &lt; CT_PTP_NUM; i++) {</div><div class='ctx'> 		err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					  snd_dma_pci_data(pci),</div><div class='add'>+					  &amp;pci-&gt;dev,</div><div class='ctx'> 					  PAGE_SIZE, &amp;vm-&gt;ptp[i]);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/sound/pci/ctxfi/ctvmem.h b/sound/pci/ctxfi/ctvmem.h<br/>index b23adfca4de6..da54cbcdb0be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctvmem.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/ctvmem.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/ctvmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/ctvmem.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='del'>-/**</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='ctx'>  *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='del'>- *</div><div class='ctx'>  * @File    ctvmem.h</div><div class='ctx'>  *</div><div class='ctx'>  * @Brief</div><div class='hunk'>@@ -18,7 +15,7 @@</div><div class='ctx'> #ifndef CTVMEM_H</div><div class='ctx'> #define CTVMEM_H</div><div class='ctx'> </div><div class='del'>-#define CT_PTP_NUM	1	/* num of device page table pages */</div><div class='add'>+#define CT_PTP_NUM	4	/* num of device page table pages */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='head'>diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c<br/>index f42e7e1a1074..d8dd84d41c87 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/xfi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ctxfi/xfi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ctxfi/xfi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ctxfi/xfi.c</a></div><div class='hunk'>@@ -1,17 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * xfi linux driver.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008, Creative Technology Ltd. All Rights Reserved.</div><div class='del'>- *</div><div class='del'>- * This source file is released under GPL v2 license (no other versions).</div><div class='del'>- * See the COPYING file included in the main directory of this source</div><div class='del'>- * distribution for the license terms and conditions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/pci_ids.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include "ctatc.h"</div><div class='hunk'>@@ -20,18 +18,17 @@</div><div class='ctx'> MODULE_AUTHOR("Creative Technology Ltd");</div><div class='ctx'> MODULE_DESCRIPTION("X-Fi driver version 1.03");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative Labs, Sound Blaster X-Fi}");</div><div class='ctx'> </div><div class='ctx'> static unsigned int reference_rate = 48000;</div><div class='ctx'> static unsigned int multiple = 2;</div><div class='ctx'> MODULE_PARM_DESC(reference_rate, "Reference rate (default=48000)");</div><div class='del'>-module_param(reference_rate, uint, S_IRUGO);</div><div class='add'>+module_param(reference_rate, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(multiple, "Rate multiplier (default=2)");</div><div class='del'>-module_param(multiple, uint, S_IRUGO);</div><div class='add'>+module_param(multiple, uint, 0444);</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> static unsigned int subsystem[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -43,7 +40,7 @@ MODULE_PARM_DESC(enable, "Enable Creative X-Fi driver");</div><div class='ctx'> module_param_array(subsystem, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(subsystem, "Override subsystem ID for Creative X-Fi driver");</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(ct_pci_dev_ids) = {</div><div class='add'>+static const struct pci_device_id ct_pci_dev_ids[] = {</div><div class='ctx'> 	/* only X-Fi is supported, so... */</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_20K1),</div><div class='ctx'> 	  .driver_data = ATC20K1,</div><div class='hunk'>@@ -55,7 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(ct_pci_dev_ids) = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ct_pci_dev_ids);</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='hunk'>@@ -70,21 +67,23 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 		dev++;</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+			   0, &amp;card);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if ((reference_rate != 48000) &amp;&amp; (reference_rate != 44100)) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Invalid reference_rate value %u!!!\n",</div><div class='del'>-		       reference_rate);</div><div class='del'>-		printk(KERN_ERR "ctxfi: The valid values for reference_rate "</div><div class='del'>-		       "are 48000 and 44100, Value 48000 is assumed.\n");</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"Invalid reference_rate value %u!!!\n",</div><div class='add'>+			reference_rate);</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n");</div><div class='ctx'> 		reference_rate = 48000;</div><div class='ctx'> 	}</div><div class='del'>-	if ((multiple != 1) &amp;&amp; (multiple != 2)) {</div><div class='del'>-		printk(KERN_ERR "ctxfi: Invalid multiple value %u!!!\n",</div><div class='del'>-		       multiple);</div><div class='del'>-		printk(KERN_ERR "ctxfi: The valid values for multiple are "</div><div class='del'>-		       "1 and 2, Value 2 is assumed.\n");</div><div class='add'>+	if ((multiple != 1) &amp;&amp; (multiple != 2) &amp;&amp; (multiple != 4)) {</div><div class='add'>+		dev_err(card-&gt;dev, "Invalid multiple value %u!!!\n",</div><div class='add'>+			multiple);</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n");</div><div class='ctx'> 		multiple = 2;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = ct_atc_create(card, pci, reference_rate, multiple,</div><div class='hunk'>@@ -99,8 +98,8 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "SB-XFi");</div><div class='del'>-	strcpy(card-&gt;shortname, "Creative X-Fi");</div><div class='add'>+	strscpy(card-&gt;driver, "SB-XFi");</div><div class='add'>+	strscpy(card-&gt;shortname, "Creative X-Fi");</div><div class='ctx'> 	snprintf(card-&gt;longname, sizeof(card-&gt;longname), "%s %s %s",</div><div class='ctx'> 		 card-&gt;shortname, atc-&gt;chip_name, atc-&gt;model_name);</div><div class='ctx'> </div><div class='hunk'>@@ -118,50 +117,42 @@ error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit ct_card_remove(struct pci_dev *pci)</div><div class='add'>+static void ct_card_remove(struct pci_dev *pci)</div><div class='ctx'> {</div><div class='ctx'> 	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ct_card_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int ct_card_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct ct_atc *atc = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	return atc-&gt;suspend(atc, state);</div><div class='add'>+	return atc-&gt;suspend(atc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ct_card_resume(struct pci_dev *pci)</div><div class='add'>+static int ct_card_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct ct_atc *atc = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	return atc-&gt;resume(atc);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(ct_card_pm, ct_card_suspend, ct_card_resume);</div><div class='add'>+#define CT_CARD_PM_OPS	&amp;ct_card_pm</div><div class='add'>+#else</div><div class='add'>+#define CT_CARD_PM_OPS	NULL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ct_driver = {</div><div class='del'>-	.name = "SB-XFi",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = ct_pci_dev_ids,</div><div class='ctx'> 	.probe = ct_card_probe,</div><div class='del'>-	.remove = __devexit_p(ct_card_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = ct_card_suspend,</div><div class='del'>-	.resume = ct_card_resume,</div><div class='del'>-#endif</div><div class='add'>+	.remove = ct_card_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = CT_CARD_PM_OPS,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init ct_card_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;ct_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ct_card_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;ct_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ct_card_init)</div><div class='del'>-module_exit(ct_card_exit)</div><div class='add'>+module_pci_driver(ct_driver);</div><div class='head'>diff --git a/sound/pci/echoaudio/Makefile b/sound/pci/echoaudio/Makefile<br/>index 1361de77e0cd..96667641c7cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/Makefile</a></div><div class='hunk'>@@ -1,22 +1,23 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA Echoaudio soundcard drivers</div><div class='ctx'> # Copyright (c) 2003 by Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-darla20-objs := darla20.o</div><div class='del'>-snd-gina20-objs := gina20.o</div><div class='del'>-snd-layla20-objs := layla20.o</div><div class='del'>-snd-darla24-objs := darla24.o</div><div class='del'>-snd-gina24-objs := gina24.o</div><div class='del'>-snd-layla24-objs := layla24.o</div><div class='del'>-snd-mona-objs := mona.o</div><div class='del'>-snd-mia-objs := mia.o</div><div class='del'>-snd-echo3g-objs := echo3g.o</div><div class='del'>-snd-indigo-objs := indigo.o</div><div class='del'>-snd-indigoio-objs := indigoio.o</div><div class='del'>-snd-indigodj-objs := indigodj.o</div><div class='del'>-snd-indigoiox-objs := indigoiox.o</div><div class='del'>-snd-indigodjx-objs := indigodjx.o</div><div class='add'>+snd-darla20-y := darla20.o</div><div class='add'>+snd-gina20-y := gina20.o</div><div class='add'>+snd-layla20-y := layla20.o</div><div class='add'>+snd-darla24-y := darla24.o</div><div class='add'>+snd-gina24-y := gina24.o</div><div class='add'>+snd-layla24-y := layla24.o</div><div class='add'>+snd-mona-y := mona.o</div><div class='add'>+snd-mia-y := mia.o</div><div class='add'>+snd-echo3g-y := echo3g.o</div><div class='add'>+snd-indigo-y := indigo.o</div><div class='add'>+snd-indigoio-y := indigoio.o</div><div class='add'>+snd-indigodj-y := indigodj.o</div><div class='add'>+snd-indigoiox-y := indigoiox.o</div><div class='add'>+snd-indigodjx-y := indigodjx.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_SND_DARLA20) += snd-darla20.o</div><div class='ctx'> obj-$(CONFIG_SND_GINA20) += snd-gina20.o</div><div class='head'>diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c<br/>index fe7ad64dccd7..e295c71c7a39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla20.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla20.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla20.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/darla20.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHOGALS_FAMILY</div><div class='hunk'>@@ -40,9 +28,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -51,8 +40,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/darla20_dsp.fw");</div><div class='hunk'>@@ -63,12 +51,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "darla20_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0010, 0, 0, 0},	/* DSP 56301 Darla20 rev.0 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/darla20_dsp.c b/sound/pci/echoaudio/darla20_dsp.c<br/>index 20c7cbc89bb3..0356efad7528 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla20_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla20_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla20_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/darla20_dsp.c</a></div><div class='hunk'>@@ -33,31 +33,32 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Darla20\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != DARLA20))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw: could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_DARLA20_DSP;</div><div class='ctx'> 	chip-&gt;spdif_status = GD_SPDIF_STATUS_UNDEF;</div><div class='ctx'> 	chip-&gt;clock_state = GD_CLOCK_UNDEF;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c<br/>index d1fd34b1a8e3..ae816e78f599 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla24.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla24.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla24.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/darla24.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHOGALS_FAMILY</div><div class='hunk'>@@ -44,9 +32,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -55,8 +44,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/darla24_dsp.fw");</div><div class='hunk'>@@ -67,13 +55,13 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "darla24_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0040, 0, 0, 0},	/* DSP 56301 Darla24 rev.0 */</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0041, 0, 0, 0},	/* DSP 56301 Darla24 rev.1 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/darla24_dsp.c b/sound/pci/echoaudio/darla24_dsp.c<br/>index 6da6663e9176..b96300772aee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla24_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/darla24_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/darla24_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/darla24_dsp.c</a></div><div class='hunk'>@@ -33,30 +33,31 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Darla24\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != DARLA24))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw: could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_DARLA24_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL |</div><div class='ctx'> 		ECHO_CLOCK_BIT_ESYNC;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -128,15 +129,17 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		clock = GD24_8000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: Error, invalid sample rate %d\n",</div><div class='del'>-			rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: Error, invalid sample rate %d\n",</div><div class='add'>+			rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_sample_rate: %d clock %d\n", rate, clock);</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='ctx'> </div><div class='ctx'> 	/* Override the sample rate if this card is set to Echo sync. */</div><div class='head'>diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c<br/>index 1dffdc54416d..3d37bb4030ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echo3g.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echo3g.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echo3g.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echo3g.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHO3G_FAMILY</div><div class='hunk'>@@ -51,9 +39,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -63,8 +52,7 @@</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -81,12 +69,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "3g_asic.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0100, 0, 0, 0},	/* Echo 3G */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/echo3g_dsp.c b/sound/pci/echoaudio/echo3g_dsp.c<br/>index 3cdc2ee2d1dd..9e1f2cad0909 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echo3g_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echo3g_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echo3g_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echo3g_dsp.c</a></div><div class='hunk'>@@ -46,12 +46,13 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	local_irq_enable();</div><div class='del'>-	DE_INIT(("init_hw() - Echo3G\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != ECHO3G))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -59,8 +60,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 		cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2);</div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='del'>-	chip-&gt;has_midi = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='add'>+	chip-&gt;has_midi = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_ECHO3G_DSP;</div><div class='ctx'> </div><div class='ctx'> 	/* Load the DSP code and the ASIC on the PCI card and get</div><div class='hunk'>@@ -78,8 +79,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 		chip-&gt;px_analog_in = chip-&gt;bx_analog_in = 14;</div><div class='ctx'> 		chip-&gt;px_digital_in = chip-&gt;bx_digital_in = 16;</div><div class='ctx'> 		chip-&gt;px_num = chip-&gt;bx_num = 24;</div><div class='del'>-		chip-&gt;has_phantom_power = TRUE;</div><div class='del'>-		chip-&gt;hasnt_input_nominal_level = TRUE;</div><div class='add'>+		chip-&gt;has_phantom_power = true;</div><div class='add'>+		chip-&gt;hasnt_input_nominal_level = true;</div><div class='ctx'> 	} else if (err == E3G_LAYLA3G_BOX_TYPE) {</div><div class='ctx'> 		chip-&gt;input_clock_types =	ECHO_CLOCK_BIT_INTERNAL |</div><div class='ctx'> 						ECHO_CLOCK_BIT_SPDIF |</div><div class='hunk'>@@ -98,7 +99,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 				ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |</div><div class='ctx'> 				ECHOCAPS_HAS_DIGITAL_MODE_ADAT;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -107,10 +107,10 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;digital_mode = DIGITAL_MODE_SPDIF_RCA;</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='del'>-	chip-&gt;non_audio_spdif = FALSE;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='del'>-	chip-&gt;phantom_power = FALSE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='add'>+	chip-&gt;non_audio_spdif = false;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='add'>+	chip-&gt;phantom_power = false;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c<br/>index 20763dd03fa0..f2c8602a1ad7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio.c</a></div><div class='hunk'>@@ -1,30 +1,21 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='add'>+ *  Copyright (C) 2020 Mark Hills &lt;mark@xwax.org&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Giuliano Pochini &lt;pochini@shiny.it&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("Echoaudio " ECHOCARD_NAME " soundcards driver");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Echoaudio," ECHOCARD_NAME "}}");</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_echo_ids);</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " ECHOCARD_NAME " soundcard.");</div><div class='hunk'>@@ -33,7 +24,7 @@ MODULE_PARM_DESC(id, "ID string for " ECHOCARD_NAME " soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable " ECHOCARD_NAME " soundcard.");</div><div class='ctx'> </div><div class='del'>-static unsigned int channels_list[10] = {1, 2, 4, 6, 8, 10, 12, 14, 16, 999999};</div><div class='add'>+static const unsigned int channels_list[10] = {1, 2, 4, 6, 8, 10, 12, 14, 16, 999999};</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_output_gain, -12800, 100, 1);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -44,53 +35,45 @@ static int get_firmware(const struct firmware **fw_entry,</div><div class='ctx'> 	int err;</div><div class='ctx'> 	char name[30];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	if (chip-&gt;fw_cache[fw_index]) {</div><div class='del'>-		DE_ACT(("firmware requested: %s is cached\n", card_fw[fw_index].data));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"firmware requested: %s is cached\n",</div><div class='add'>+			card_fw[fw_index].data);</div><div class='ctx'> 		*fw_entry = chip-&gt;fw_cache[fw_index];</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("firmware requested: %s\n", card_fw[fw_index].data));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"firmware requested: %s\n", card_fw[fw_index].data);</div><div class='ctx'> 	snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data);</div><div class='del'>-	err = request_firmware(fw_entry, name, pci_device(chip));</div><div class='add'>+	err = request_firmware(fw_entry, name, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "get_firmware(): Firmware not available (%d)\n", err);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"get_firmware(): Firmware not available (%d)\n", err);</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;fw_cache[fw_index] = *fw_entry;</div><div class='del'>-#endif</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void free_firmware(const struct firmware *fw_entry)</div><div class='add'>+static void free_firmware(const struct firmware *fw_entry,</div><div class='add'>+			  struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	DE_ACT(("firmware not released (kept in cache)\n"));</div><div class='del'>-#else</div><div class='del'>-	release_firmware(fw_entry);</div><div class='del'>-	DE_ACT(("firmware released\n"));</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "firmware not released (kept in cache)\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static void free_firmware_cache(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8 ; i++)</div><div class='ctx'> 		if (chip-&gt;fw_cache[i]) {</div><div class='ctx'> 			release_firmware(chip-&gt;fw_cache[i]);</div><div class='del'>-			DE_ACT(("release_firmware(%d)\n", i));</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "release_firmware(%d)\n", i);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-	DE_ACT(("firmware_cache released\n"));</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -252,13 +235,19 @@ static int hw_rule_sample_rate(struct snd_pcm_hw_params *params,</div><div class='ctx'> 						      SNDRV_PCM_HW_PARAM_RATE);</div><div class='ctx'> 	struct echoaudio *chip = rule-&gt;private;</div><div class='ctx'> 	struct snd_interval fixed;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;can_set_rate) {</div><div class='add'>+	if (chip-&gt;can_set_rate) {</div><div class='add'>+		err = 0;</div><div class='add'>+	} else {</div><div class='ctx'> 		snd_interval_any(&amp;fixed);</div><div class='ctx'> 		fixed.min = fixed.max = chip-&gt;sample_rate;</div><div class='del'>-		return snd_interval_refine(rate, &amp;fixed);</div><div class='add'>+		err = snd_interval_refine(rate, &amp;fixed);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +272,7 @@ static int pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> 	/* Set up hw capabilities and contraints */</div><div class='ctx'> 	memcpy(&amp;pipe-&gt;hw, &amp;pcm_hardware_skel, sizeof(struct snd_pcm_hardware));</div><div class='del'>-	DE_HWP(("max_channels=%d\n", max_channels));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "max_channels=%d\n", max_channels);</div><div class='ctx'> 	pipe-&gt;constr.list = channels_list;</div><div class='ctx'> 	pipe-&gt;constr.mask = 0;</div><div class='ctx'> 	for (i = 0; channels_list[i] &lt;= max_channels; i++);</div><div class='hunk'>@@ -301,42 +290,57 @@ static int pcm_open(struct snd_pcm_substream *substream,</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='ctx'> </div><div class='ctx'> 	/* Only mono and any even number of channels are allowed */</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='del'>-					      SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-					      &amp;pipe-&gt;constr)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_list(runtime, 0,</div><div class='add'>+					 SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+					 &amp;pipe-&gt;constr);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* All periods should have the same size */</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime,</div><div class='del'>-						 SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='add'>+					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* The hw accesses memory in chunks 32 frames long and they should be</div><div class='ctx'> 	32-bytes-aligned. It's not a requirement, but it seems that IRQs are</div><div class='ctx'> 	generated with a resolution of 32 frames. Thus we need the following */</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='del'>-					      SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='del'>-					      32)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='add'>+					 SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 32);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='del'>-					      SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='del'>-					      32)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0,</div><div class='add'>+					 SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 32);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-					hw_rule_sample_rate, chip,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_RATE, -1)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+				  hw_rule_sample_rate, chip,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_RATE, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Finally allocate a page for the scatter-gather list */</div><div class='del'>-	if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-				       snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-				       PAGE_SIZE, &amp;pipe-&gt;sgpage)) &lt; 0) {</div><div class='del'>-		DE_HWP(("s-g list allocation failed\n"));</div><div class='add'>+	/* Allocate a page for the scatter-gather list */</div><div class='add'>+	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				  &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				  PAGE_SIZE, &amp;pipe-&gt;sgpage);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "s-g list allocation failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/*</div><div class='add'>+	 * Sole ownership required to set the rate</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "pcm_open opencount=%d can_set_rate=%d, rate_set=%d",</div><div class='add'>+		chip-&gt;opencount, chip-&gt;can_set_rate, chip-&gt;rate_set);</div><div class='add'>+</div><div class='add'>+	chip-&gt;opencount++;</div><div class='add'>+	if (chip-&gt;opencount &gt; 1 &amp;&amp; chip-&gt;rate_set)</div><div class='add'>+		chip-&gt;can_set_rate = 0;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -347,26 +351,23 @@ static int pcm_analog_in_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("pcm_analog_in_open\n"));</div><div class='del'>-	if ((err = pcm_open(substream, num_analog_busses_in(chip) -</div><div class='del'>-			    substream-&gt;number)) &lt; 0)</div><div class='add'>+	err = pcm_open(substream,</div><div class='add'>+		       num_analog_busses_in(chip) - substream-&gt;number);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				       hw_rule_capture_channels_by_format, NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT, -1)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_capture_channels_by_format, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				       hw_rule_capture_format_by_channels, NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS, -1)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+				  hw_rule_capture_format_by_channels, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	atomic_inc(&amp;chip-&gt;opencount);</div><div class='del'>-	if (atomic_read(&amp;chip-&gt;opencount) &gt; 1 &amp;&amp; chip-&gt;rate_set)</div><div class='del'>-		chip-&gt;can_set_rate=0;</div><div class='del'>-	DE_HWP(("pcm_analog_in_open  cs=%d  oc=%d  r=%d\n",</div><div class='del'>-		chip-&gt;can_set_rate, atomic_read(&amp;chip-&gt;opencount),</div><div class='del'>-		chip-&gt;sample_rate));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -382,27 +383,24 @@ static int pcm_analog_out_open(struct snd_pcm_substream *substream)</div><div class='ctx'> #else</div><div class='ctx'> 	max_channels = num_analog_busses_out(chip);</div><div class='ctx'> #endif</div><div class='del'>-	DE_ACT(("pcm_analog_out_open\n"));</div><div class='del'>-	if ((err = pcm_open(substream, max_channels - substream-&gt;number)) &lt; 0)</div><div class='add'>+	err = pcm_open(substream, max_channels - substream-&gt;number);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				       hw_rule_playback_channels_by_format,</div><div class='del'>-				       NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT, -1)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_playback_channels_by_format,</div><div class='add'>+				  NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				       hw_rule_playback_format_by_channels,</div><div class='del'>-				       NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS, -1)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+				  hw_rule_playback_format_by_channels,</div><div class='add'>+				  NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	atomic_inc(&amp;chip-&gt;opencount);</div><div class='del'>-	if (atomic_read(&amp;chip-&gt;opencount) &gt; 1 &amp;&amp; chip-&gt;rate_set)</div><div class='del'>-		chip-&gt;can_set_rate=0;</div><div class='del'>-	DE_HWP(("pcm_analog_out_open  cs=%d  oc=%d  r=%d\n",</div><div class='del'>-		chip-&gt;can_set_rate, atomic_read(&amp;chip-&gt;opencount),</div><div class='del'>-		chip-&gt;sample_rate));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -415,9 +413,8 @@ static int pcm_digital_in_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int err, max_channels;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("pcm_digital_in_open\n"));</div><div class='ctx'> 	max_channels = num_digital_busses_in(chip) - substream-&gt;number;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mode_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> 	if (chip-&gt;digital_mode == DIGITAL_MODE_ADAT)</div><div class='ctx'> 		err = pcm_open(substream, max_channels);</div><div class='ctx'> 	else	/* If the card has ADAT, subtract the 6 channels</div><div class='hunk'>@@ -426,26 +423,22 @@ static int pcm_digital_in_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		err = pcm_open(substream, max_channels - ECHOCARD_HAS_ADAT);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto din_exit;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				       hw_rule_capture_channels_by_format, NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT, -1)) &lt; 0)</div><div class='del'>-		goto din_exit;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				       hw_rule_capture_format_by_channels, NULL,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS, -1)) &lt; 0)</div><div class='del'>-		goto din_exit;</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;chip-&gt;opencount);</div><div class='del'>-	if (atomic_read(&amp;chip-&gt;opencount) &gt; 1 &amp;&amp; chip-&gt;rate_set)</div><div class='del'>-		chip-&gt;can_set_rate=0;</div><div class='del'>-</div><div class='del'>-din_exit:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mode_mutex);</div><div class='del'>-	return err;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_capture_channels_by_format, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+				  hw_rule_capture_format_by_channels, NULL,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS, -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -457,9 +450,8 @@ static int pcm_digital_out_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int err, max_channels;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("pcm_digital_out_open\n"));</div><div class='ctx'> 	max_channels = num_digital_busses_out(chip) - substream-&gt;number;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;mode_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> 	if (chip-&gt;digital_mode == DIGITAL_MODE_ADAT)</div><div class='ctx'> 		err = pcm_open(substream, max_channels);</div><div class='ctx'> 	else	/* If the card has ADAT, subtract the 6 channels</div><div class='hunk'>@@ -468,26 +460,24 @@ static int pcm_digital_out_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 		err = pcm_open(substream, max_channels - ECHOCARD_HAS_ADAT);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto dout_exit;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				       hw_rule_playback_channels_by_format,</div><div class='del'>-				       NULL, SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				       -1)) &lt; 0)</div><div class='del'>-		goto dout_exit;</div><div class='del'>-	if ((err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='del'>-				       SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='del'>-				       hw_rule_playback_format_by_channels,</div><div class='del'>-				       NULL, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='del'>-				       -1)) &lt; 0)</div><div class='del'>-		goto dout_exit;</div><div class='del'>-	atomic_inc(&amp;chip-&gt;opencount);</div><div class='del'>-	if (atomic_read(&amp;chip-&gt;opencount) &gt; 1 &amp;&amp; chip-&gt;rate_set)</div><div class='del'>-		chip-&gt;can_set_rate=0;</div><div class='del'>-dout_exit:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mode_mutex);</div><div class='del'>-	return err;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  hw_rule_playback_channels_by_format,</div><div class='add'>+				  NULL, SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+				  -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcm_hw_rule_add(substream-&gt;runtime, 0,</div><div class='add'>+				  SNDRV_PCM_HW_PARAM_FORMAT,</div><div class='add'>+				  hw_rule_playback_format_by_channels,</div><div class='add'>+				  NULL, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+				  -1);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* !ECHOCARD_HAS_VMIXER */</div><div class='hunk'>@@ -499,23 +489,27 @@ dout_exit:</div><div class='ctx'> static int pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct echoaudio *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int oc;</div><div class='ctx'> </div><div class='ctx'> 	/* Nothing to do here. Audio is already off and pipe will be</div><div class='ctx'> 	 * freed by its callback</div><div class='ctx'> 	 */</div><div class='del'>-	DE_ACT(("pcm_close\n"));</div><div class='ctx'> </div><div class='del'>-	atomic_dec(&amp;chip-&gt;opencount);</div><div class='del'>-	oc = atomic_read(&amp;chip-&gt;opencount);</div><div class='del'>-	DE_ACT(("pcm_close  oc=%d  cs=%d  rs=%d\n", oc,</div><div class='del'>-		chip-&gt;can_set_rate, chip-&gt;rate_set));</div><div class='del'>-	if (oc &lt; 2)</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "pcm_open opencount=%d can_set_rate=%d, rate_set=%d",</div><div class='add'>+		chip-&gt;opencount, chip-&gt;can_set_rate, chip-&gt;rate_set);</div><div class='add'>+</div><div class='add'>+	chip-&gt;opencount--;</div><div class='add'>+</div><div class='add'>+	switch (chip-&gt;opencount) {</div><div class='add'>+	case 1:</div><div class='ctx'> 		chip-&gt;can_set_rate = 1;</div><div class='del'>-	if (oc == 0)</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 0:</div><div class='ctx'> 		chip-&gt;rate_set = 0;</div><div class='del'>-	DE_ACT(("pcm_close2 oc=%d  cs=%d  rs=%d\n", oc,</div><div class='del'>-		chip-&gt;can_set_rate,chip-&gt;rate_set));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -537,37 +531,27 @@ static int init_engine(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* Sets up che hardware. If it's already initialized, reset and</div><div class='ctx'> 	 * redo with the new parameters</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	if (pipe-&gt;index &gt;= 0) {</div><div class='del'>-		DE_HWP(("hwp_ie free(%d)\n", pipe-&gt;index));</div><div class='del'>-		err = free_pipes(chip, pipe);</div><div class='del'>-		snd_BUG_ON(err);</div><div class='del'>-		chip-&gt;substream[pipe-&gt;index] = NULL;</div><div class='del'>-	}</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;lock) {</div><div class='add'>+		if (pipe-&gt;index &gt;= 0) {</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "hwp_ie free(%d)\n", pipe-&gt;index);</div><div class='add'>+			err = free_pipes(chip, pipe);</div><div class='add'>+			snd_BUG_ON(err);</div><div class='add'>+			chip-&gt;substream[pipe-&gt;index] = NULL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	err = allocate_pipes(chip, pipe, pipe_index, interleave);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		DE_ACT((KERN_NOTICE "allocate_pipes(%d) err=%d\n",</div><div class='del'>-			pipe_index, err));</div><div class='del'>-		return err;</div><div class='add'>+		err = allocate_pipes(chip, pipe, pipe_index, interleave);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "allocate_pipes(%d) err=%d\n",</div><div class='add'>+				pipe_index, err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	DE_ACT((KERN_NOTICE "allocate_pipes()=%d\n", pipe_index));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "allocate_pipes()=%d\n", pipe_index);</div><div class='ctx'> </div><div class='del'>-	DE_HWP(("pcm_hw_params (bufsize=%dB periods=%d persize=%dB)\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"pcm_hw_params (bufsize=%dB periods=%d persize=%dB)\n",</div><div class='ctx'> 		params_buffer_bytes(hw_params), params_periods(hw_params),</div><div class='del'>-		params_period_bytes(hw_params)));</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "malloc_pages err=%d\n", err);</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		free_pipes(chip, pipe);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		pipe-&gt;index = -1;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+		params_period_bytes(hw_params));</div><div class='ctx'> </div><div class='ctx'> 	sglist_init(chip, pipe);</div><div class='ctx'> 	edge = PAGE_SIZE;</div><div class='hunk'>@@ -603,16 +587,14 @@ static int init_engine(struct snd_pcm_substream *substream,</div><div class='ctx'> 	/* This stuff is used by the irq handler, so it must be</div><div class='ctx'> 	 * initialized before chip-&gt;substream</div><div class='ctx'> 	 */</div><div class='del'>-	chip-&gt;last_period[pipe_index] = 0;</div><div class='add'>+	pipe-&gt;last_period = 0;</div><div class='ctx'> 	pipe-&gt;last_counter = 0;</div><div class='ctx'> 	pipe-&gt;position = 0;</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	chip-&gt;substream[pipe_index] = substream;</div><div class='ctx'> 	chip-&gt;rate_set = 1;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	set_sample_rate(chip, hw_params-&gt;rate_num / hw_params-&gt;rate_den);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	DE_HWP(("pcm_hw_params ok\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -674,17 +656,14 @@ static int pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	pipe = (struct audiopipe *) substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (pipe-&gt;index &gt;= 0) {</div><div class='del'>-		DE_HWP(("pcm_hw_free(%d)\n", pipe-&gt;index));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "pcm_hw_free(%d)\n", pipe-&gt;index);</div><div class='ctx'> 		free_pipes(chip, pipe);</div><div class='ctx'> 		chip-&gt;substream[pipe-&gt;index] = NULL;</div><div class='ctx'> 		pipe-&gt;index = -1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	DE_HWP(("pcm_hw_freed\n"));</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -697,8 +676,8 @@ static int pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct audioformat format;</div><div class='ctx'> 	int pipe_index = ((struct audiopipe *)runtime-&gt;private_data)-&gt;index;</div><div class='ctx'> </div><div class='del'>-	DE_HWP(("Prepare rate=%d format=%d channels=%d\n",</div><div class='del'>-		runtime-&gt;rate, runtime-&gt;format, runtime-&gt;channels));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Prepare rate=%d format=%d channels=%d\n",</div><div class='add'>+		runtime-&gt;rate, runtime-&gt;format, runtime-&gt;channels);</div><div class='ctx'> 	format.interleave = runtime-&gt;channels;</div><div class='ctx'> 	format.data_are_bigendian = 0;</div><div class='ctx'> 	format.mono_to_stereo = 0;</div><div class='hunk'>@@ -714,20 +693,32 @@ static int pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_S32_BE:</div><div class='ctx'> 		format.data_are_bigendian = 1;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_FORMAT_S32_LE:</div><div class='ctx'> 		format.bits_per_sample = 32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_HWP(("Prepare error: unsupported format %d\n",</div><div class='del'>-			runtime-&gt;format));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Prepare error: unsupported format %d\n",</div><div class='add'>+			runtime-&gt;format);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(pipe_index &gt;= px_num(chip)))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We passed checks we can do independently; now take</div><div class='add'>+	 * exclusive control</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(!is_pipe_allocated(chip, pipe_index)))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	set_audio_format(chip, pipe_index, &amp;format);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,8 +727,7 @@ static int pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct echoaudio *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct audiopipe *pipe = runtime-&gt;private_data;</div><div class='add'>+	struct audiopipe *pipe;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	u32 channelmask = 0;</div><div class='ctx'> 	struct snd_pcm_substream *s;</div><div class='hunk'>@@ -751,22 +741,21 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		DE_ACT(("pcm_trigger resume\n"));</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		DE_ACT(("pcm_trigger start\n"));</div><div class='ctx'> 		for (i = 0; i &lt; DSP_MAXPIPES; i++) {</div><div class='ctx'> 			if (channelmask &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 				pipe = chip-&gt;substream[i]-&gt;runtime-&gt;private_data;</div><div class='ctx'> 				switch (pipe-&gt;state) {</div><div class='ctx'> 				case PIPE_STATE_STOPPED:</div><div class='del'>-					chip-&gt;last_period[i] = 0;</div><div class='add'>+					pipe-&gt;last_period = 0;</div><div class='ctx'> 					pipe-&gt;last_counter = 0;</div><div class='ctx'> 					pipe-&gt;position = 0;</div><div class='ctx'> 					*pipe-&gt;dma_counter = 0;</div><div class='add'>+					fallthrough;</div><div class='ctx'> 				case PIPE_STATE_PAUSED:</div><div class='ctx'> 					pipe-&gt;state = PIPE_STATE_STARTED;</div><div class='ctx'> 					break;</div><div class='hunk'>@@ -779,9 +768,7 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 				      chip-&gt;pipe_cyclic_mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		DE_ACT(("pcm_trigger suspend\n"));</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		DE_ACT(("pcm_trigger stop\n"));</div><div class='ctx'> 		for (i = 0; i &lt; DSP_MAXPIPES; i++) {</div><div class='ctx'> 			if (channelmask &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 				pipe = chip-&gt;substream[i]-&gt;runtime-&gt;private_data;</div><div class='hunk'>@@ -791,7 +778,6 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		err = stop_transport(chip, channelmask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		DE_ACT(("pcm_trigger pause\n"));</div><div class='ctx'> 		for (i = 0; i &lt; DSP_MAXPIPES; i++) {</div><div class='ctx'> 			if (channelmask &amp; (1 &lt;&lt; i)) {</div><div class='ctx'> 				pipe = chip-&gt;substream[i]-&gt;runtime-&gt;private_data;</div><div class='hunk'>@@ -803,7 +789,6 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -813,70 +798,69 @@ static snd_pcm_uframes_t pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct audiopipe *pipe = runtime-&gt;private_data;</div><div class='del'>-	size_t cnt, bufsize, pos;</div><div class='add'>+	u32 counter, step;</div><div class='ctx'> </div><div class='del'>-	cnt = le32_to_cpu(*pipe-&gt;dma_counter);</div><div class='del'>-	pipe-&gt;position += cnt - pipe-&gt;last_counter;</div><div class='del'>-	pipe-&gt;last_counter = cnt;</div><div class='del'>-	bufsize = substream-&gt;runtime-&gt;buffer_size;</div><div class='del'>-	pos = bytes_to_frames(substream-&gt;runtime, pipe-&gt;position);</div><div class='add'>+	/*</div><div class='add'>+	 * IRQ handling runs concurrently. Do not share tracking of</div><div class='add'>+	 * counter with it, which would race or require locking</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='del'>-	while (pos &gt;= bufsize) {</div><div class='del'>-		pipe-&gt;position -= frames_to_bytes(substream-&gt;runtime, bufsize);</div><div class='del'>-		pos -= bufsize;</div><div class='del'>-	}</div><div class='del'>-	return pos;</div><div class='add'>+	counter = le32_to_cpu(*pipe-&gt;dma_counter);  /* presumed atomic */</div><div class='add'>+</div><div class='add'>+	step = counter - pipe-&gt;last_counter;  /* handles wrapping */</div><div class='add'>+	pipe-&gt;last_counter = counter;</div><div class='add'>+</div><div class='add'>+	/* counter doesn't neccessarily wrap on a multiple of</div><div class='add'>+	 * buffer_size, so can't derive the position; must</div><div class='add'>+	 * accumulate */</div><div class='add'>+</div><div class='add'>+	pipe-&gt;position += step;</div><div class='add'>+	pipe-&gt;position %= frames_to_bytes(runtime, runtime-&gt;buffer_size); /* wrap */</div><div class='add'>+</div><div class='add'>+	return bytes_to_frames(runtime, pipe-&gt;position);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* pcm *_ops structures */</div><div class='del'>-static struct snd_pcm_ops analog_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops analog_playback_ops = {</div><div class='ctx'> 	.open = pcm_analog_out_open,</div><div class='ctx'> 	.close = pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = pcm_analog_out_hw_params,</div><div class='ctx'> 	.hw_free = pcm_hw_free,</div><div class='ctx'> 	.prepare = pcm_prepare,</div><div class='ctx'> 	.trigger = pcm_trigger,</div><div class='ctx'> 	.pointer = pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_ops analog_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops analog_capture_ops = {</div><div class='ctx'> 	.open = pcm_analog_in_open,</div><div class='ctx'> 	.close = pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = pcm_analog_in_hw_params,</div><div class='ctx'> 	.hw_free = pcm_hw_free,</div><div class='ctx'> 	.prepare = pcm_prepare,</div><div class='ctx'> 	.trigger = pcm_trigger,</div><div class='ctx'> 	.pointer = pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> #ifndef ECHOCARD_HAS_VMIXER</div><div class='del'>-static struct snd_pcm_ops digital_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops digital_playback_ops = {</div><div class='ctx'> 	.open = pcm_digital_out_open,</div><div class='ctx'> 	.close = pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = pcm_digital_out_hw_params,</div><div class='ctx'> 	.hw_free = pcm_hw_free,</div><div class='ctx'> 	.prepare = pcm_prepare,</div><div class='ctx'> 	.trigger = pcm_trigger,</div><div class='ctx'> 	.pointer = pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> #endif /* !ECHOCARD_HAS_VMIXER */</div><div class='del'>-static struct snd_pcm_ops digital_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops digital_capture_ops = {</div><div class='ctx'> 	.open = pcm_digital_in_open,</div><div class='ctx'> 	.close = pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params = pcm_digital_in_hw_params,</div><div class='ctx'> 	.hw_free = pcm_hw_free,</div><div class='ctx'> 	.prepare = pcm_prepare,</div><div class='ctx'> 	.trigger = pcm_trigger,</div><div class='ctx'> 	.pointer = pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> #endif /* ECHOCARD_HAS_DIGITAL_IO */</div><div class='ctx'> </div><div class='hunk'>@@ -885,27 +869,23 @@ static struct snd_pcm_ops digital_capture_ops = {</div><div class='ctx'> /* Preallocate memory only for the first substream because it's the most</div><div class='ctx'>  * used one</div><div class='ctx'>  */</div><div class='del'>-static int snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)</div><div class='add'>+static void snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *ss;</div><div class='del'>-	int stream, err;</div><div class='add'>+	int stream;</div><div class='ctx'> </div><div class='ctx'> 	for (stream = 0; stream &lt; 2; stream++)</div><div class='del'>-		for (ss = pcm-&gt;streams[stream].substream; ss; ss = ss-&gt;next) {</div><div class='del'>-			err = snd_pcm_lib_preallocate_pages(ss, SNDRV_DMA_TYPE_DEV_SG,</div><div class='del'>-							    dev,</div><div class='del'>-							    ss-&gt;number ? 0 : 128&lt;&lt;10,</div><div class='del'>-							    256&lt;&lt;10);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	return 0;</div><div class='add'>+		for (ss = pcm-&gt;streams[stream].substream; ss; ss = ss-&gt;next)</div><div class='add'>+			snd_pcm_set_managed_buffer(ss, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+						   dev,</div><div class='add'>+						   ss-&gt;number ? 0 : 128&lt;&lt;10,</div><div class='add'>+						   256&lt;&lt;10);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*&lt;--snd_echo_probe() */</div><div class='del'>-static int __devinit snd_echo_new_pcm(struct echoaudio *chip)</div><div class='add'>+static int snd_echo_new_pcm(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -918,30 +898,28 @@ static int __devinit snd_echo_new_pcm(struct echoaudio *chip)</div><div class='ctx'> 	separated */</div><div class='ctx'> </div><div class='ctx'> 	/* PCM#0 Virtual outputs and analog inputs */</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "PCM", 0, num_pipes_out(chip),</div><div class='del'>-				num_analog_busses_in(chip), &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "PCM", 0, num_pipes_out(chip),</div><div class='add'>+			  num_analog_busses_in(chip), &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;analog_pcm = pcm;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;analog_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;analog_capture_ops);</div><div class='del'>-	if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip-&gt;pci))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	DE_INIT(("Analog PCM ok\n"));</div><div class='add'>+	snd_echo_preallocate_pages(pcm, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> 	/* PCM#1 Digital inputs, no outputs */</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "Digital PCM", 1, 0,</div><div class='del'>-			       num_digital_busses_in(chip), &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "Digital PCM", 1, 0,</div><div class='add'>+			  num_digital_busses_in(chip), &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;digital_pcm = pcm;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;digital_capture_ops);</div><div class='del'>-	if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip-&gt;pci))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	DE_INIT(("Digital PCM ok\n"));</div><div class='add'>+	snd_echo_preallocate_pages(pcm, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> #endif /* ECHOCARD_HAS_DIGITAL_IO */</div><div class='ctx'> </div><div class='ctx'> #else /* ECHOCARD_HAS_VMIXER */</div><div class='hunk'>@@ -952,33 +930,31 @@ static int __devinit snd_echo_new_pcm(struct echoaudio *chip)</div><div class='ctx'> 	register two PCM devices: */</div><div class='ctx'> </div><div class='ctx'> 	/* PCM#0 Analog i/o */</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "Analog PCM", 0,</div><div class='del'>-			       num_analog_busses_out(chip),</div><div class='del'>-			       num_analog_busses_in(chip), &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "Analog PCM", 0,</div><div class='add'>+			  num_analog_busses_out(chip),</div><div class='add'>+			  num_analog_busses_in(chip), &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;analog_pcm = pcm;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;analog_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;analog_capture_ops);</div><div class='del'>-	if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip-&gt;pci))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	DE_INIT(("Analog PCM ok\n"));</div><div class='add'>+	snd_echo_preallocate_pages(pcm, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> 	/* PCM#1 Digital i/o */</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "Digital PCM", 1,</div><div class='del'>-			       num_digital_busses_out(chip),</div><div class='del'>-			       num_digital_busses_in(chip), &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "Digital PCM", 1,</div><div class='add'>+			  num_digital_busses_out(chip),</div><div class='add'>+			  num_digital_busses_in(chip), &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	chip-&gt;digital_pcm = pcm;</div><div class='del'>-	strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+	strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;digital_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;digital_capture_ops);</div><div class='del'>-	if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip-&gt;pci))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	DE_INIT(("Digital PCM ok\n"));</div><div class='add'>+	snd_echo_preallocate_pages(pcm, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> #endif /* ECHOCARD_HAS_DIGITAL_IO */</div><div class='ctx'> </div><div class='ctx'> #endif /* ECHOCARD_HAS_VMIXER */</div><div class='hunk'>@@ -1029,7 +1005,7 @@ static int snd_echo_output_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	changed = 0;</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	for (c = 0; c &lt; num_busses_out(chip); c++) {</div><div class='ctx'> 		gain = ucontrol-&gt;value.integer.value[c];</div><div class='ctx'> 		/* Ignore out of range values */</div><div class='hunk'>@@ -1042,13 +1018,12 @@ static int snd_echo_output_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		update_output_line_level(chip);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_LINE_OUT_GAIN</div><div class='ctx'> /* On the Mia this one controls the line-out volume */</div><div class='del'>-static struct snd_kcontrol_new snd_echo_line_output_gain __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_line_output_gain = {</div><div class='ctx'> 	.name = "Line Playback Volume",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='hunk'>@@ -1059,7 +1034,7 @@ static struct snd_kcontrol_new snd_echo_line_output_gain __devinitdata = {</div><div class='ctx'> 	.tlv = {.p = db_scale_output_gain},</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='del'>-static struct snd_kcontrol_new snd_echo_pcm_output_gain __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_pcm_output_gain = {</div><div class='ctx'> 	.name = "PCM Playback Volume",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='hunk'>@@ -1110,7 +1085,7 @@ static int snd_echo_input_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	changed = 0;</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	for (c = 0; c &lt; num_analog_busses_in(chip); c++) {</div><div class='ctx'> 		gain = ucontrol-&gt;value.integer.value[c];</div><div class='ctx'> 		/* Ignore out of range values */</div><div class='hunk'>@@ -1123,13 +1098,12 @@ static int snd_echo_input_gain_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		update_input_line_level(chip);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_input_gain, -2500, 50, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_line_input_gain __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_line_input_gain = {</div><div class='ctx'> 	.name = "Line Capture Volume",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='hunk'>@@ -1179,7 +1153,7 @@ static int snd_echo_output_nominal_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	changed = 0;</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	for (c = 0; c &lt; num_analog_busses_out(chip); c++) {</div><div class='ctx'> 		if (chip-&gt;nominal_level[c] != ucontrol-&gt;value.integer.value[c]) {</div><div class='ctx'> 			set_nominal_level(chip, c,</div><div class='hunk'>@@ -1189,11 +1163,10 @@ static int snd_echo_output_nominal_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		update_output_line_level(chip);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_output_nominal_level __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_output_nominal_level = {</div><div class='ctx'> 	.name = "Line Playback Switch (-10dBV)",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.info = snd_echo_output_nominal_info,</div><div class='hunk'>@@ -1242,7 +1215,7 @@ static int snd_echo_input_nominal_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	changed = 0;</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	for (c = 0; c &lt; num_analog_busses_in(chip); c++) {</div><div class='ctx'> 		if (chip-&gt;nominal_level[bx_analog_in(chip) + c] !=</div><div class='ctx'> 		    ucontrol-&gt;value.integer.value[c]) {</div><div class='hunk'>@@ -1255,11 +1228,10 @@ static int snd_echo_input_nominal_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		update_output_line_level(chip);	/* "Output" is not a mistake</div><div class='ctx'> 						 * here.</div><div class='ctx'> 						 */</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_intput_nominal_level __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_intput_nominal_level = {</div><div class='ctx'> 	.name = "Line Capture Switch (-10dBV)",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.info = snd_echo_input_nominal_info,</div><div class='hunk'>@@ -1277,27 +1249,24 @@ static struct snd_kcontrol_new snd_echo_intput_nominal_level __devinitdata = {</div><div class='ctx'> static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='del'>-</div><div class='del'>-	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = ECHOGAIN_MINOUT;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = ECHOGAIN_MAXOUT;</div><div class='del'>-	uinfo-&gt;dimen.d[0] = num_busses_out(chip);</div><div class='del'>-	uinfo-&gt;dimen.d[1] = num_busses_in(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_echo_mixer_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			      struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='add'>+	struct echoaudio *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int out = ucontrol-&gt;id.index / num_busses_in(chip);</div><div class='add'>+	unsigned int in = ucontrol-&gt;id.index % num_busses_in(chip);</div><div class='ctx'> </div><div class='del'>-	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] =</div><div class='del'>-		chip-&gt;monitor_gain[ucontrol-&gt;id.index / num_busses_in(chip)]</div><div class='del'>-			[ucontrol-&gt;id.index % num_busses_in(chip)];</div><div class='add'>+	if (out &gt;= ECHO_MAXAUDIOOUTPUTS || in &gt;= ECHO_MAXAUDIOINPUTS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = chip-&gt;monitor_gain[out][in];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1306,26 +1275,27 @@ static int snd_echo_mixer_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct echoaudio *chip;</div><div class='ctx'> 	int changed,  gain;</div><div class='del'>-	short out, in;</div><div class='add'>+	unsigned int out, in;</div><div class='ctx'> </div><div class='ctx'> 	changed = 0;</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	out = ucontrol-&gt;id.index / num_busses_in(chip);</div><div class='ctx'> 	in = ucontrol-&gt;id.index % num_busses_in(chip);</div><div class='add'>+	if (out &gt;= ECHO_MAXAUDIOOUTPUTS || in &gt;= ECHO_MAXAUDIOINPUTS)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	gain = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (gain &lt; ECHOGAIN_MINOUT || gain &gt; ECHOGAIN_MAXOUT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (chip-&gt;monitor_gain[out][in] != gain) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		set_monitor_gain(chip, out, in, gain);</div><div class='ctx'> 		update_output_line_level(chip);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_monitor_mixer __devinitdata = {</div><div class='add'>+static struct snd_kcontrol_new snd_echo_monitor_mixer = {</div><div class='ctx'> 	.name = "Monitor Mixer Volume",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='hunk'>@@ -1345,15 +1315,10 @@ static struct snd_kcontrol_new snd_echo_monitor_mixer __devinitdata = {</div><div class='ctx'> static int snd_echo_vmixer_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='del'>-</div><div class='del'>-	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = ECHOGAIN_MINOUT;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = ECHOGAIN_MAXOUT;</div><div class='del'>-	uinfo-&gt;dimen.d[0] = num_busses_out(chip);</div><div class='del'>-	uinfo-&gt;dimen.d[1] = num_pipes_out(chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1384,16 +1349,15 @@ static int snd_echo_vmixer_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (gain &lt; ECHOGAIN_MINOUT || gain &gt; ECHOGAIN_MAXOUT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (chip-&gt;vmixer_gain[out][vch] != ucontrol-&gt;value.integer.value[0]) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		set_vmixer_gain(chip, out, vch, ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> 		update_vmixer_level(chip);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_vmixer __devinitdata = {</div><div class='add'>+static struct snd_kcontrol_new snd_echo_vmixer = {</div><div class='ctx'> 	.name = "VMixer Volume",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='hunk'>@@ -1413,21 +1377,14 @@ static struct snd_kcontrol_new snd_echo_vmixer __devinitdata = {</div><div class='ctx'> static int snd_echo_digital_mode_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *names[4] = {</div><div class='add'>+	static const char * const names[4] = {</div><div class='ctx'> 		"S/PDIF Coaxial", "S/PDIF Optical", "ADAT Optical",</div><div class='ctx'> 		"S/PDIF Cdrom"</div><div class='ctx'> 	};</div><div class='ctx'> 	struct echoaudio *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = chip-&gt;num_digital_modes;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= chip-&gt;num_digital_modes)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = chip-&gt;num_digital_modes - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, names[</div><div class='del'>-			chip-&gt;digital_mode_list[uinfo-&gt;value.enumerated.item]]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, chip-&gt;num_digital_modes, names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_echo_digital_mode_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1464,12 +1421,12 @@ static int snd_echo_digital_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (dmode != chip-&gt;digital_mode) {</div><div class='ctx'> 		/* mode_mutex is required to make this operation atomic wrt</div><div class='ctx'> 		pcm_digital_*_open() and set_input_clock() functions. */</div><div class='del'>-		mutex_lock(&amp;chip-&gt;mode_mutex);</div><div class='add'>+		guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> </div><div class='ctx'> 		/* Do not allow the user to change the digital mode when a pcm</div><div class='ctx'> 		device is open because it also changes the number of channels</div><div class='ctx'> 		and the allowed sample rates */</div><div class='del'>-		if (atomic_read(&amp;chip-&gt;opencount)) {</div><div class='add'>+		if (chip-&gt;opencount) {</div><div class='ctx'> 			changed = -EAGAIN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			changed = set_digital_mode(chip, dmode);</div><div class='hunk'>@@ -1478,17 +1435,17 @@ static int snd_echo_digital_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				snd_ctl_notify(chip-&gt;card,</div><div class='ctx'> 					       SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='ctx'> 					       &amp;chip-&gt;clock_src_ctl-&gt;id);</div><div class='del'>-				DE_ACT(("SDM() =%d\n", changed));</div><div class='add'>+				dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+					"SDM() =%d\n", changed);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (changed &gt;= 0)</div><div class='ctx'> 				changed = 1;	/* No errors */</div><div class='ctx'> 		}</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_digital_mode_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_digital_mode_switch = {</div><div class='ctx'> 	.name = "Digital mode Switch",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.info = snd_echo_digital_mode_info,</div><div class='hunk'>@@ -1506,16 +1463,9 @@ static struct snd_kcontrol_new snd_echo_digital_mode_switch __devinitdata = {</div><div class='ctx'> static int snd_echo_spdif_mode_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				    struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *names[2] = {"Consumer", "Professional"};</div><div class='add'>+	static const char * const names[2] = {"Consumer", "Professional"};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       names[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_echo_spdif_mode_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1537,15 +1487,14 @@ static int snd_echo_spdif_mode_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	mode = !!ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 	if (mode != chip-&gt;professional_spdif) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		set_professional_spdif(chip, mode);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_spdif_mode_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_spdif_mode_switch = {</div><div class='ctx'> 	.name = "S/PDIF mode Switch",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.info = snd_echo_spdif_mode_info,</div><div class='hunk'>@@ -1563,21 +1512,14 @@ static struct snd_kcontrol_new snd_echo_spdif_mode_switch __devinitdata = {</div><div class='ctx'> static int snd_echo_clock_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *names[8] = {</div><div class='add'>+	static const char * const names[8] = {</div><div class='ctx'> 		"Internal", "Word", "Super", "S/PDIF", "ADAT", "ESync",</div><div class='ctx'> 		"ESync96", "MTC"</div><div class='ctx'> 	};</div><div class='ctx'> 	struct echoaudio *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = chip-&gt;num_clock_sources;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= chip-&gt;num_clock_sources)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = chip-&gt;num_clock_sources - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, names[</div><div class='del'>-			chip-&gt;clock_source_list[uinfo-&gt;value.enumerated.item]]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, chip-&gt;num_clock_sources, names);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_echo_clock_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1610,21 +1552,21 @@ static int snd_echo_clock_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	dclock = chip-&gt;clock_source_list[eclock];</div><div class='ctx'> 	if (chip-&gt;input_clock != dclock) {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;mode_mutex);</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		if ((changed = set_input_clock(chip, dclock)) == 0)</div><div class='add'>+		guard(mutex)(&amp;chip-&gt;mode_mutex);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='add'>+		changed = set_input_clock(chip, dclock);</div><div class='add'>+		if (!changed)</div><div class='ctx'> 			changed = 1;	/* no errors */</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;mode_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &lt; 0)</div><div class='del'>-		DE_ACT(("seticlk val%d err 0x%x\n", dclock, changed));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"seticlk val%d err 0x%x\n", dclock, changed);</div><div class='ctx'> </div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_clock_source_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_clock_source_switch = {</div><div class='ctx'> 	.name = "Sample Clock Source",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.info = snd_echo_clock_source_info,</div><div class='hunk'>@@ -1658,16 +1600,15 @@ static int snd_echo_phantom_power_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	power = !!ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (chip-&gt;phantom_power != power) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		changed = set_phantom_power(chip, power);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		if (changed == 0)</div><div class='ctx'> 			changed = 1;	/* no errors */</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_phantom_power_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_phantom_power_switch = {</div><div class='ctx'> 	.name = "Phantom power Switch",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.info = snd_echo_phantom_power_info,</div><div class='hunk'>@@ -1701,16 +1642,15 @@ static int snd_echo_automute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> </div><div class='ctx'> 	automute = !!ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (chip-&gt;digital_in_automute != automute) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		changed = set_input_auto_mute(chip, automute);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		if (changed == 0)</div><div class='ctx'> 			changed = 1;	/* no errors */</div><div class='ctx'> 	}</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_automute_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_automute_switch = {</div><div class='ctx'> 	.name = "Digital Capture Switch (automute)",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.info = snd_echo_automute_info,</div><div class='hunk'>@@ -1731,13 +1671,12 @@ static int snd_echo_vumeters_switch_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct echoaudio *chip;</div><div class='ctx'> </div><div class='ctx'> 	chip = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 	set_meters_on(chip, ucontrol-&gt;value.integer.value[0]);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_vumeters_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_vumeters_switch = {</div><div class='ctx'> 	.name = "VU-meters Switch",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_WRITE,</div><div class='hunk'>@@ -1751,20 +1690,10 @@ static struct snd_kcontrol_new snd_echo_vumeters_switch __devinitdata = {</div><div class='ctx'> static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='del'>-</div><div class='del'>-	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 96;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = ECHOGAIN_MINOUT;</div><div class='ctx'> 	uinfo-&gt;value.integer.max = 0;</div><div class='del'>-#ifdef ECHOCARD_HAS_VMIXER</div><div class='del'>-	uinfo-&gt;dimen.d[0] = 3;	/* Out, In, Virt */</div><div class='del'>-#else</div><div class='del'>-	uinfo-&gt;dimen.d[0] = 2;	/* Out, In */</div><div class='del'>-#endif</div><div class='del'>-	uinfo-&gt;dimen.d[1] = 16;	/* 16 channels */</div><div class='del'>-	uinfo-&gt;dimen.d[2] = 2;	/* 0=level, 1=peak */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1778,7 +1707,7 @@ static int snd_echo_vumeters_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_vumeters __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_vumeters = {</div><div class='ctx'> 	.name = "VU-meters",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ |</div><div class='hunk'>@@ -1795,9 +1724,6 @@ static struct snd_kcontrol_new snd_echo_vumeters __devinitdata = {</div><div class='ctx'> static int snd_echo_channels_info_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='del'>-</div><div class='del'>-	chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 6;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='hunk'>@@ -1834,7 +1760,7 @@ static int snd_echo_channels_info_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_echo_channels_info __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_echo_channels_info = {</div><div class='ctx'> 	.name = "Channels info",</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_HWDEP,</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='hunk'>@@ -1846,14 +1772,43 @@ static struct snd_kcontrol_new snd_echo_channels_info __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='del'>-	IRQ Handler</div><div class='add'>+	IRQ Handling</div><div class='ctx'> ******************************************************************************/</div><div class='add'>+/* Check if a period has elapsed since last interrupt</div><div class='add'>+ *</div><div class='add'>+ * Don't make any updates to state; PCM core handles this with the</div><div class='add'>+ * correct locks.</div><div class='add'>+ *</div><div class='add'>+ * \return true if a period has elapsed, otherwise false</div><div class='add'>+ */</div><div class='add'>+static bool period_has_elapsed(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct audiopipe *pipe = runtime-&gt;private_data;</div><div class='add'>+	u32 counter, step;</div><div class='add'>+	size_t period_bytes;</div><div class='add'>+</div><div class='add'>+	if (pipe-&gt;state != PIPE_STATE_STARTED)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	period_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='add'>+</div><div class='add'>+	counter = le32_to_cpu(*pipe-&gt;dma_counter);  /* presumed atomic */</div><div class='add'>+</div><div class='add'>+	step = counter - pipe-&gt;last_period;  /* handles wrapping */</div><div class='add'>+	step -= step % period_bytes;  /* acknowledge whole periods only */</div><div class='add'>+</div><div class='add'>+	if (step == 0)</div><div class='add'>+		return false;  /* haven't advanced a whole period yet */</div><div class='add'>+</div><div class='add'>+	pipe-&gt;last_period += step;  /* used exclusively by us */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct echoaudio *chip = dev_id;</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	int period, ss, st;</div><div class='add'>+	int ss, st;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;chip-&gt;lock);</div><div class='ctx'> 	st = service_irq(chip);</div><div class='hunk'>@@ -1864,17 +1819,13 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	/* The hardware doesn't tell us which substream caused the irq,</div><div class='ctx'> 	thus we have to check all running substreams. */</div><div class='ctx'> 	for (ss = 0; ss &lt; DSP_MAXPIPES; ss++) {</div><div class='add'>+		struct snd_pcm_substream *substream;</div><div class='add'>+</div><div class='ctx'> 		substream = chip-&gt;substream[ss];</div><div class='del'>-		if (substream &amp;&amp; ((struct audiopipe *)substream-&gt;runtime-&gt;</div><div class='del'>-				private_data)-&gt;state == PIPE_STATE_STARTED) {</div><div class='del'>-			period = pcm_pointer(substream) /</div><div class='del'>-				substream-&gt;runtime-&gt;period_size;</div><div class='del'>-			if (period != chip-&gt;last_period[ss]) {</div><div class='del'>-				chip-&gt;last_period[ss] = period;</div><div class='del'>-				spin_unlock(&amp;chip-&gt;lock);</div><div class='del'>-				snd_pcm_period_elapsed(substream);</div><div class='del'>-				spin_lock(&amp;chip-&gt;lock);</div><div class='del'>-			}</div><div class='add'>+		if (substream &amp;&amp; period_has_elapsed(substream)) {</div><div class='add'>+			spin_unlock(&amp;chip-&gt;lock);</div><div class='add'>+			snd_pcm_period_elapsed(substream);</div><div class='add'>+			spin_lock(&amp;chip-&gt;lock);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;chip-&gt;lock);</div><div class='hunk'>@@ -1882,7 +1833,7 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)</div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	if (st &gt; 0 &amp;&amp; chip-&gt;midi_in) {</div><div class='ctx'> 		snd_rawmidi_receive(chip-&gt;midi_in, chip-&gt;midi_buffer, st);</div><div class='del'>-		DE_MID(("rawmidi_iread=%d\n", st));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "rawmidi_iread=%d\n", st);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -1895,157 +1846,102 @@ static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	Module construction / destruction</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int snd_echo_free(struct echoaudio *chip)</div><div class='add'>+static void snd_echo_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	DE_INIT(("Stop DSP...\n"));</div><div class='add'>+	struct echoaudio *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;comm_page)</div><div class='ctx'> 		rest_in_peace(chip);</div><div class='del'>-	DE_INIT(("Stopped.\n"));</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;comm_page)</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;commpage_dma_buf);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;dsp_registers)</div><div class='del'>-		iounmap(chip-&gt;dsp_registers);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;iores)</div><div class='del'>-		release_and_free_resource(chip-&gt;iores);</div><div class='del'>-</div><div class='del'>-	DE_INIT(("MMIO freed.\n"));</div><div class='del'>-</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='ctx'> 	/* release chip data */</div><div class='ctx'> 	free_firmware_cache(chip);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	DE_INIT(("Chip freed.\n"));</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int snd_echo_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct echoaudio *chip = device-&gt;device_data;</div><div class='del'>-</div><div class='del'>-	DE_INIT(("snd_echo_dev_free()...\n"));</div><div class='del'>-	return snd_echo_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* &lt;--snd_echo_probe() */</div><div class='del'>-static __devinit int snd_echo_create(struct snd_card *card,</div><div class='del'>-				     struct pci_dev *pci,</div><div class='del'>-				     struct echoaudio **rchip)</div><div class='add'>+static int snd_echo_create(struct snd_card *card,</div><div class='add'>+			   struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip;</div><div class='add'>+	struct echoaudio *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	size_t sz;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_echo_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='ctx'> 	pci_write_config_byte(pci, PCI_LATENCY_TIMER, 0xC0);</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate chip if needed */</div><div class='del'>-	if (!*rchip) {</div><div class='del'>-		chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-		if (!chip) {</div><div class='del'>-			pci_disable_device(pci);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		DE_INIT(("chip=%p\n", chip));</div><div class='del'>-		spin_lock_init(&amp;chip-&gt;lock);</div><div class='del'>-		chip-&gt;card = card;</div><div class='del'>-		chip-&gt;pci = pci;</div><div class='del'>-		chip-&gt;irq = -1;</div><div class='del'>-		atomic_set(&amp;chip-&gt;opencount, 0);</div><div class='del'>-		mutex_init(&amp;chip-&gt;mode_mutex);</div><div class='del'>-		chip-&gt;can_set_rate = 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* If this was called from the resume function, chip is</div><div class='del'>-		 * already allocated and it contains current card settings.</div><div class='del'>-		 */</div><div class='del'>-		chip = *rchip;</div><div class='del'>-	}</div><div class='add'>+	spin_lock_init(&amp;chip-&gt;lock);</div><div class='add'>+	chip-&gt;card = card;</div><div class='add'>+	chip-&gt;pci = pci;</div><div class='add'>+	chip-&gt;irq = -1;</div><div class='add'>+	chip-&gt;opencount = 0;</div><div class='add'>+	mutex_init(&amp;chip-&gt;mode_mutex);</div><div class='add'>+	chip-&gt;can_set_rate = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* PCI resource allocation */</div><div class='add'>+	err = pcim_request_all_regions(pci, ECHOCARD_NAME);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	chip-&gt;dsp_registers_phys = pci_resource_start(pci, 0);</div><div class='ctx'> 	sz = pci_resource_len(pci, 0);</div><div class='ctx'> 	if (sz &gt; PAGE_SIZE)</div><div class='ctx'> 		sz = PAGE_SIZE;		/* We map only the required part */</div><div class='ctx'> </div><div class='del'>-	if ((chip-&gt;iores = request_mem_region(chip-&gt;dsp_registers_phys, sz,</div><div class='del'>-					      ECHOCARD_NAME)) == NULL) {</div><div class='del'>-		snd_echo_free(chip);</div><div class='del'>-		snd_printk(KERN_ERR "cannot get memory region\n");</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	chip-&gt;dsp_registers = devm_ioremap(&amp;pci-&gt;dev, chip-&gt;dsp_registers_phys, sz);</div><div class='add'>+	if (!chip-&gt;dsp_registers) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "ioremap failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;dsp_registers = (volatile u32 __iomem *)</div><div class='del'>-		ioremap_nocache(chip-&gt;dsp_registers_phys, sz);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_echo_interrupt, IRQF_SHARED,</div><div class='del'>-			ECHOCARD_NAME, chip)) {</div><div class='del'>-		snd_echo_free(chip);</div><div class='del'>-		snd_printk(KERN_ERR "cannot grab irq\n");</div><div class='add'>+			KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "cannot grab irq\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	DE_INIT(("pci=%p irq=%d subdev=%04x Init hardware...\n",</div><div class='del'>-		 chip-&gt;pci, chip-&gt;irq, chip-&gt;pci-&gt;subsystem_device));</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	dev_dbg(card-&gt;dev, "pci=%p irq=%d subdev=%04x Init hardware...\n",</div><div class='add'>+		chip-&gt;pci, chip-&gt;irq, chip-&gt;pci-&gt;subsystem_device);</div><div class='add'>+</div><div class='add'>+	card-&gt;private_free = snd_echo_free;</div><div class='ctx'> </div><div class='ctx'> 	/* Create the DSP comm page - this is the area of memory used for most</div><div class='ctx'> 	of the communication with the DSP, which accesses it via bus mastering */</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-				sizeof(struct comm_page),</div><div class='del'>-				&amp;chip-&gt;commpage_dma_buf) &lt; 0) {</div><div class='del'>-		snd_echo_free(chip);</div><div class='del'>-		snd_printk(KERN_ERR "cannot allocate the comm page\n");</div><div class='add'>+	chip-&gt;commpage_dma_buf =</div><div class='add'>+		snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				     sizeof(struct comm_page));</div><div class='add'>+	if (!chip-&gt;commpage_dma_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;comm_page_phys = chip-&gt;commpage_dma_buf.addr;</div><div class='del'>-	chip-&gt;comm_page = (struct comm_page *)chip-&gt;commpage_dma_buf.area;</div><div class='add'>+	chip-&gt;comm_page_phys = chip-&gt;commpage_dma_buf-&gt;addr;</div><div class='add'>+	chip-&gt;comm_page = (struct comm_page *)chip-&gt;commpage_dma_buf-&gt;area;</div><div class='ctx'> </div><div class='ctx'> 	err = init_hw(chip, chip-&gt;pci-&gt;device, chip-&gt;pci-&gt;subsystem_device);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='ctx'> 		err = set_mixer_defaults(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		DE_INIT(("init_hw err=%d\n", err));</div><div class='del'>-		snd_echo_free(chip);</div><div class='add'>+		dev_err(card-&gt;dev, "init_hw err=%d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	DE_INIT(("Card init OK\n"));</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_echo_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	*rchip = chip;</div><div class='del'>-	/* Init done ! */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* constructor */</div><div class='del'>-static int __devinit snd_echo_probe(struct pci_dev *pci,</div><div class='del'>-				    const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_echo_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct echoaudio *chip;</div><div class='ctx'> 	char *dsp;</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -2054,22 +1950,18 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("Echoaudio driver starting...\n"));</div><div class='del'>-	i = 0;</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	chip = NULL;	/* Tells snd_echo_create to allocate chip */</div><div class='del'>-	if ((err = snd_echo_create(card, pci, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_echo_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "Echo_" ECHOCARD_NAME);</div><div class='del'>-	strcpy(card-&gt;shortname, chip-&gt;card_name);</div><div class='add'>+	strscpy(card-&gt;driver, "Echo_" ECHOCARD_NAME);</div><div class='add'>+	strscpy(card-&gt;shortname, chip-&gt;card_name);</div><div class='ctx'> </div><div class='ctx'> 	dsp = "56301";</div><div class='ctx'> 	if (pci_id-&gt;device == 0x3410)</div><div class='hunk'>@@ -2079,17 +1971,17 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,</div><div class='ctx'> 		card-&gt;shortname, pci_id-&gt;subdevice &amp; 0x000f, dsp,</div><div class='ctx'> 		chip-&gt;dsp_registers_phys, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_echo_new_pcm(chip)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "new pcm error %d\n", err);</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_echo_new_pcm(chip);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "new pcm error %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	if (chip-&gt;has_midi) {	/* Some Mia's do not have midi */</div><div class='del'>-		if ((err = snd_echo_midi_create(card, chip)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "new midi error %d\n", err);</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		err = snd_echo_midi_create(card, chip);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "new midi error %d\n", err);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2097,172 +1989,170 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_VMIXER</div><div class='ctx'> 	snd_echo_vmixer.count = num_pipes_out(chip) * num_busses_out(chip);</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vmixer, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vmixer, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #ifdef ECHOCARD_HAS_LINE_OUT_GAIN</div><div class='ctx'> 	err = snd_ctl_add(chip-&gt;card,</div><div class='ctx'> 			  snd_ctl_new1(&amp;snd_echo_line_output_gain, chip));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> #else /* ECHOCARD_HAS_VMIXER */</div><div class='ctx'> 	err = snd_ctl_add(chip-&gt;card,</div><div class='ctx'> 			  snd_ctl_new1(&amp;snd_echo_pcm_output_gain, chip));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+		return err;</div><div class='ctx'> #endif /* ECHOCARD_HAS_VMIXER */</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_INPUT_GAIN</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_line_input_gain, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_line_input_gain, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_INPUT_NOMINAL_LEVEL</div><div class='del'>-	if (!chip-&gt;hasnt_input_nominal_level)</div><div class='del'>-		if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_intput_nominal_level, chip))) &lt; 0)</div><div class='del'>-			goto ctl_error;</div><div class='add'>+	if (!chip-&gt;hasnt_input_nominal_level) {</div><div class='add'>+		err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_intput_nominal_level, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_OUTPUT_NOMINAL_LEVEL</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_output_nominal_level, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_output_nominal_level, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vumeters_switch, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vumeters_switch, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vumeters, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_vumeters, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MONITOR</div><div class='ctx'> 	snd_echo_monitor_mixer.count = num_busses_in(chip) * num_busses_out(chip);</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_monitor_mixer, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_monitor_mixer, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_IN_AUTOMUTE</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_automute_switch, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_automute_switch, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_channels_info, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_channels_info, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_MODE_SWITCH</div><div class='ctx'> 	/* Creates a list of available digital modes */</div><div class='ctx'> 	chip-&gt;num_digital_modes = 0;</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='add'>+	for (int i = 0; i &lt; 6; i++)</div><div class='ctx'> 		if (chip-&gt;digital_modes &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			chip-&gt;digital_mode_list[chip-&gt;num_digital_modes++] = i;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_digital_mode_switch, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_digital_mode_switch, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif /* ECHOCARD_HAS_DIGITAL_MODE_SWITCH */</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_EXTERNAL_CLOCK</div><div class='ctx'> 	/* Creates a list of available clock sources */</div><div class='ctx'> 	chip-&gt;num_clock_sources = 0;</div><div class='del'>-	for (i = 0; i &lt; 10; i++)</div><div class='add'>+	for (int i = 0; i &lt; 10; i++)</div><div class='ctx'> 		if (chip-&gt;input_clock_types &amp; (1 &lt;&lt; i))</div><div class='ctx'> 			chip-&gt;clock_source_list[chip-&gt;num_clock_sources++] = i;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;num_clock_sources &gt; 1) {</div><div class='ctx'> 		chip-&gt;clock_src_ctl = snd_ctl_new1(&amp;snd_echo_clock_source_switch, chip);</div><div class='del'>-		if ((err = snd_ctl_add(chip-&gt;card, chip-&gt;clock_src_ctl)) &lt; 0)</div><div class='del'>-			goto ctl_error;</div><div class='add'>+		err = snd_ctl_add(chip-&gt;card, chip-&gt;clock_src_ctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* ECHOCARD_HAS_EXTERNAL_CLOCK */</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_DIGITAL_IO</div><div class='del'>-	if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_spdif_mode_switch, chip))) &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='add'>+	err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_spdif_mode_switch, chip));</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_PHANTOM_POWER</div><div class='del'>-	if (chip-&gt;has_phantom_power)</div><div class='del'>-		if ((err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_phantom_power_switch, chip))) &lt; 0)</div><div class='del'>-			goto ctl_error;</div><div class='add'>+	if (chip-&gt;has_phantom_power) {</div><div class='add'>+		err = snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_echo_phantom_power_switch, chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto ctl_error;</div><div class='del'>-	snd_printk(KERN_INFO "Card registered: %s\n", card-&gt;longname);</div><div class='add'>+		return err;</div><div class='add'>+	dev_info(card-&gt;dev, "Card registered: %s\n", card-&gt;longname);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, chip);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-ctl_error:</div><div class='del'>-	snd_printk(KERN_ERR "new control error %d\n", err);</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_echo_probe(struct pci_dev *pci,</div><div class='add'>+			  const struct pci_device_id *pci_id)</div><div class='add'>+{</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_echo_probe(pci, pci_id));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PM)</div><div class='del'>-</div><div class='del'>-static int snd_echo_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_echo_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip = pci_get_drvdata(pci);</div><div class='del'>-</div><div class='del'>-	DE_INIT(("suspend start\n"));</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;analog_pcm);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;digital_pcm);</div><div class='add'>+	struct echoaudio *chip = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	/* This call can sleep */</div><div class='ctx'> 	if (chip-&gt;midi_out)</div><div class='ctx'> 		snd_echo_midi_output_trigger(chip-&gt;midi_out, 0);</div><div class='ctx'> #endif</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	if (wait_handshake(chip)) {</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		return -EIO;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;lock) {</div><div class='add'>+		if (wait_handshake(chip))</div><div class='add'>+			return -EIO;</div><div class='add'>+		clear_handshake(chip);</div><div class='add'>+		if (send_vector(chip, DSP_VC_GO_COMATOSE) &lt; 0)</div><div class='add'>+			return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	clear_handshake(chip);</div><div class='del'>-	if (send_vector(chip, DSP_VC_GO_COMATOSE) &lt; 0) {</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;dsp_code = NULL;</div><div class='ctx'> 	free_irq(chip-&gt;irq, chip);</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-</div><div class='del'>-	DE_INIT(("suspend done\n"));</div><div class='add'>+	chip-&gt;card-&gt;sync_irq = -1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int snd_echo_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_echo_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip = pci_get_drvdata(pci);</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+	struct echoaudio *chip = dev_get_drvdata(dev);</div><div class='ctx'> 	struct comm_page *commpage, *commpage_bak;</div><div class='ctx'> 	u32 pipe_alloc_mask;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("resume start\n"));</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);</div><div class='add'>+	commpage = chip-&gt;comm_page;</div><div class='add'>+	commpage_bak = kmemdup(commpage, sizeof(*commpage), GFP_KERNEL);</div><div class='ctx'> 	if (commpage_bak == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	commpage = chip-&gt;comm_page;</div><div class='del'>-	memcpy(commpage_bak, commpage, sizeof(struct comm_page));</div><div class='ctx'> </div><div class='ctx'> 	err = init_hw(chip, chip-&gt;pci-&gt;device, chip-&gt;pci-&gt;subsystem_device);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		kfree(commpage_bak);</div><div class='del'>-		DE_INIT(("resume init_hw err=%d\n", err));</div><div class='del'>-		snd_echo_free(chip);</div><div class='add'>+		dev_err(dev, "resume init_hw err=%d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	DE_INIT(("resume init OK\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Temporarily set chip-&gt;pipe_alloc_mask=0 otherwise</div><div class='ctx'> 	 * restore_dsp_settings() fails.</div><div class='hunk'>@@ -2275,7 +2165,6 @@ static int snd_echo_resume(struct pci_dev *pci)</div><div class='ctx'> 		kfree(commpage_bak);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	DE_INIT(("resume restore OK\n"));</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;commpage-&gt;audio_format, &amp;commpage_bak-&gt;audio_format,</div><div class='ctx'> 		sizeof(commpage-&gt;audio_format));</div><div class='hunk'>@@ -2286,73 +2175,38 @@ static int snd_echo_resume(struct pci_dev *pci)</div><div class='ctx'> 	kfree(commpage_bak);</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_echo_interrupt, IRQF_SHARED,</div><div class='del'>-			ECHOCARD_NAME, chip)) {</div><div class='del'>-		snd_echo_free(chip);</div><div class='del'>-		snd_printk(KERN_ERR "cannot grab irq\n");</div><div class='add'>+			KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "cannot grab irq\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	DE_INIT(("resume irq=%d\n", chip-&gt;irq));</div><div class='add'>+	chip-&gt;card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	dev_dbg(dev, "resume irq=%d\n", chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	if (chip-&gt;midi_input_enabled)</div><div class='del'>-		enable_midi_input(chip, TRUE);</div><div class='add'>+		enable_midi_input(chip, true);</div><div class='ctx'> 	if (chip-&gt;midi_out)</div><div class='ctx'> 		snd_echo_midi_output_trigger(chip-&gt;midi_out, 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("resume done\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __devexit snd_echo_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	struct echoaudio *chip;</div><div class='del'>-</div><div class='del'>-	chip = pci_get_drvdata(pci);</div><div class='del'>-	if (chip)</div><div class='del'>-		snd_card_free(chip-&gt;card);</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_echo_pm, snd_echo_suspend, snd_echo_resume);</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'> 	Everything starts and ends here</div><div class='ctx'> ******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /* pci_driver definition */</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "Echoaudio " ECHOCARD_NAME,</div><div class='add'>+static struct pci_driver echo_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_echo_ids,</div><div class='ctx'> 	.probe = snd_echo_probe,</div><div class='del'>-	.remove = __devexit_p(snd_echo_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_echo_suspend,</div><div class='del'>-	.resume = snd_echo_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_echo_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* initialization of the module */</div><div class='del'>-static int __init alsa_card_echo_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* clean up the module */</div><div class='del'>-static void __exit alsa_card_echo_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_echo_init)</div><div class='del'>-module_exit(alsa_card_echo_exit)</div><div class='add'>+module_pci_driver(echo_driver);</div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h<br/>index 1df974dcb5f4..511f2fcc0fb9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio.h</a></div><div class='hunk'>@@ -153,9 +153,6 @@</div><div class='ctx'> #define _ECHOAUDIO_H_</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define TRUE 1</div><div class='del'>-#define FALSE 0</div><div class='del'>-</div><div class='ctx'> #include "echoaudio_dsp.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -295,41 +292,18 @@</div><div class='ctx'> #define PIPE_STATE_PENDING	3	/* Pipe has pending start */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Debug initialization */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define DE_INIT(x) snd_printk x</div><div class='del'>-#else</div><div class='del'>-#define DE_INIT(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Debug hw_params callbacks */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define DE_HWP(x) snd_printk x</div><div class='del'>-#else</div><div class='del'>-#define DE_HWP(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Debug normal activity (open, start, stop...) */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define DE_ACT(x) snd_printk x</div><div class='del'>-#else</div><div class='del'>-#define DE_ACT(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Debug midi activity */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define DE_MID(x) snd_printk x</div><div class='del'>-#else</div><div class='del'>-#define DE_MID(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> struct audiopipe {</div><div class='del'>-	volatile u32 *dma_counter;	/* Commpage register that contains</div><div class='add'>+	volatile __le32 *dma_counter;	/* Commpage register that contains</div><div class='ctx'> 					 * the current dma position</div><div class='ctx'> 					 * (lower 32 bits only)</div><div class='ctx'> 					 */</div><div class='del'>-	u32 last_counter;		/* The last position, which is used</div><div class='add'>+	u32 last_period;                /* Counter position last time a</div><div class='add'>+					 * period elapsed</div><div class='add'>+					 */</div><div class='add'>+	u32 last_counter;		/* Used exclusively by pcm_pointer</div><div class='add'>+					 * under PCM core locks.</div><div class='add'>+					 * The last position, which is used</div><div class='ctx'> 					 * to compute...</div><div class='ctx'> 					 */</div><div class='ctx'> 	u32 position;			/* ...the number of bytes tranferred</div><div class='hunk'>@@ -363,11 +337,10 @@ struct audioformat {</div><div class='ctx'> struct echoaudio {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> 	struct snd_pcm_substream *substream[DSP_MAXPIPES];</div><div class='del'>-	int last_period[DSP_MAXPIPES];</div><div class='ctx'> 	struct mutex mode_mutex;</div><div class='ctx'> 	u16 num_digital_modes, digital_mode_list[6];</div><div class='ctx'> 	u16 num_clock_sources, clock_source_list[10];</div><div class='del'>-	atomic_t opencount;</div><div class='add'>+	unsigned int opencount;  /* protected by mode_mutex */</div><div class='ctx'> 	struct snd_kcontrol *clock_src_ctl;</div><div class='ctx'> 	struct snd_pcm *analog_pcm, *digital_pcm;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -375,7 +348,7 @@ struct echoaudio {</div><div class='ctx'> 	struct pci_dev *pci;</div><div class='ctx'> 	unsigned long dsp_registers_phys;</div><div class='ctx'> 	struct resource *iores;</div><div class='del'>-	struct snd_dma_buffer commpage_dma_buf;</div><div class='add'>+	struct snd_dma_buffer *commpage_dma_buf;</div><div class='ctx'> 	int irq;</div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='hunk'>@@ -384,8 +357,8 @@ struct echoaudio {</div><div class='ctx'> 	struct timer_list timer;</div><div class='ctx'> 	char tinuse;				/* Timer in use */</div><div class='ctx'> 	char midi_full;				/* MIDI output buffer is full */</div><div class='del'>-	char can_set_rate;</div><div class='del'>-	char rate_set;</div><div class='add'>+	char can_set_rate;                      /* protected by mode_mutex */</div><div class='add'>+	char rate_set;                          /* protected by mode_mutex */</div><div class='ctx'> </div><div class='ctx'> 	/* This stuff is used mainly by the lowlevel code */</div><div class='ctx'> 	struct comm_page *comm_page;	/* Virtual address of the memory</div><div class='hunk'>@@ -406,8 +379,8 @@ struct echoaudio {</div><div class='ctx'> 					 */</div><div class='ctx'> 	u8 output_clock;		/* Layla20 only */</div><div class='ctx'> 	char meters_enabled;		/* VU-meters status */</div><div class='del'>-	char asic_loaded;		/* Set TRUE when ASIC loaded */</div><div class='del'>-	char bad_board;			/* Set TRUE if DSP won't load */</div><div class='add'>+	char asic_loaded;		/* Set true when ASIC loaded */</div><div class='add'>+	char bad_board;			/* Set true if DSP won't load */</div><div class='ctx'> 	char professional_spdif;	/* 0 = consumer; 1 = professional */</div><div class='ctx'> 	char non_audio_spdif;		/* 3G - only */</div><div class='ctx'> 	char digital_in_automute;	/* Gina24, Layla24, Mona - only */</div><div class='hunk'>@@ -446,12 +419,10 @@ struct echoaudio {</div><div class='ctx'> 	short asic_code;		/* Current ASIC code */</div><div class='ctx'> 	u32 comm_page_phys;			/* Physical address of the</div><div class='ctx'> 						 * memory seen by DSP */</div><div class='del'>-	volatile u32 __iomem *dsp_registers;	/* DSP's register base */</div><div class='add'>+	u32 __iomem *dsp_registers;		/* DSP's register base */</div><div class='ctx'> 	u32 active_mask;			/* Chs. active mask or</div><div class='ctx'> 						 * punks out */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	const struct firmware *fw_cache[8];	/* Cached firmwares */</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> 	u16 mtc_state;				/* State for MIDI input parsing state machine */</div><div class='hunk'>@@ -468,15 +439,16 @@ static int wait_handshake(struct echoaudio *chip);</div><div class='ctx'> static int send_vector(struct echoaudio *chip, u32 command);</div><div class='ctx'> static int get_firmware(const struct firmware **fw_entry,</div><div class='ctx'> 			struct echoaudio *chip, const short fw_index);</div><div class='del'>-static void free_firmware(const struct firmware *fw_entry);</div><div class='add'>+static void free_firmware(const struct firmware *fw_entry,</div><div class='add'>+			  struct echoaudio *chip);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='ctx'> static int enable_midi_input(struct echoaudio *chip, char enable);</div><div class='ctx'> static void snd_echo_midi_output_trigger(</div><div class='ctx'> 			struct snd_rawmidi_substream *substream, int up);</div><div class='ctx'> static int midi_service_irq(struct echoaudio *chip);</div><div class='del'>-static int __devinit snd_echo_midi_create(struct snd_card *card,</div><div class='del'>-					  struct echoaudio *chip);</div><div class='add'>+static int snd_echo_midi_create(struct snd_card *card,</div><div class='add'>+				struct echoaudio *chip);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -589,10 +561,4 @@ static inline int monitor_index(const struct echoaudio *chip, int out, int in)</div><div class='ctx'> 	return out * num_busses_in(chip) + in;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifndef pci_device</div><div class='del'>-#define pci_device(chip) (&amp;chip-&gt;pci-&gt;dev)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif /* _ECHOAUDIO_H_ */</div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c<br/>index 658db44ef746..c9ee98ea3c71 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_3g.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_3g.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_3g.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio_3g.c</a></div><div class='hunk'>@@ -41,7 +41,7 @@ static int check_asic_status(struct echoaudio *chip)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;ext_box_status = cpu_to_le32(E3G_ASIC_NOT_LOADED);</div><div class='del'>-	chip-&gt;asic_loaded = FALSE;</div><div class='add'>+	chip-&gt;asic_loaded = false;</div><div class='ctx'> 	clear_handshake(chip);</div><div class='ctx'> 	send_vector(chip, DSP_VC_TEST_ASIC);</div><div class='ctx'> </div><div class='hunk'>@@ -51,11 +51,11 @@ static int check_asic_status(struct echoaudio *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	box_status = le32_to_cpu(chip-&gt;comm_page-&gt;ext_box_status);</div><div class='del'>-	DE_INIT(("box_status=%x\n", box_status));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "box_status=%x\n", box_status);</div><div class='ctx'> 	if (box_status == E3G_ASIC_NOT_LOADED)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	return box_status &amp; E3G_BOX_TYPE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -73,23 +73,26 @@ register. write_control_reg sends the new control register value to the DSP. */</div><div class='ctx'> static int write_control_reg(struct echoaudio *chip, u32 ctl, u32 frq,</div><div class='ctx'> 			     char force)</div><div class='ctx'> {</div><div class='add'>+	__le32 ctl_reg, frq_reg;</div><div class='add'>+</div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("WriteControlReg: Setting 0x%x, 0x%x\n", ctl, frq));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"WriteControlReg: Setting 0x%x, 0x%x\n", ctl, frq);</div><div class='ctx'> </div><div class='del'>-	ctl = cpu_to_le32(ctl);</div><div class='del'>-	frq = cpu_to_le32(frq);</div><div class='add'>+	ctl_reg = cpu_to_le32(ctl);</div><div class='add'>+	frq_reg = cpu_to_le32(frq);</div><div class='ctx'> </div><div class='del'>-	if (ctl != chip-&gt;comm_page-&gt;control_register ||</div><div class='del'>-	    frq != chip-&gt;comm_page-&gt;e3g_frq_register || force) {</div><div class='del'>-		chip-&gt;comm_page-&gt;e3g_frq_register = frq;</div><div class='del'>-		chip-&gt;comm_page-&gt;control_register = ctl;</div><div class='add'>+	if (ctl_reg != chip-&gt;comm_page-&gt;control_register ||</div><div class='add'>+	    frq_reg != chip-&gt;comm_page-&gt;e3g_frq_register || force) {</div><div class='add'>+		chip-&gt;comm_page-&gt;e3g_frq_register = frq_reg;</div><div class='add'>+		chip-&gt;comm_page-&gt;control_register = ctl_reg;</div><div class='ctx'> 		clear_handshake(chip);</div><div class='ctx'> 		return send_vector(chip, DSP_VC_WRITE_CONTROL_REG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("WriteControlReg: not written, no change\n"));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "WriteControlReg: not written, no change\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +119,7 @@ static int set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	 * updated by the DSP comm object. */</div><div class='ctx'> 	if (err &gt;= 0 &amp;&amp; previous_mode != mode &amp;&amp;</div><div class='ctx'> 	    (previous_mode == DIGITAL_MODE_ADAT || mode == DIGITAL_MODE_ADAT)) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		for (o = 0; o &lt; num_busses_out(chip); o++)</div><div class='ctx'> 			for (i = 0; i &lt; num_busses_in(chip); i++)</div><div class='ctx'> 				set_monitor_gain(chip, o, i,</div><div class='hunk'>@@ -131,7 +134,6 @@ static int set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 		for (o = 0; o &lt; num_busses_out(chip); o++)</div><div class='ctx'> 			set_output_gain(chip, o, chip-&gt;output_gain[o]);</div><div class='ctx'> 		update_output_line_level(chip);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -242,7 +244,7 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	 * 48 kHz, internal clock, S/PDIF RCA mode */</div><div class='ctx'> 	if (box_type &gt;= 0) {</div><div class='ctx'> 		err = write_control_reg(chip, E3G_48KHZ,</div><div class='del'>-					E3G_FREQ_REG_DEFAULT, TRUE);</div><div class='add'>+					E3G_FREQ_REG_DEFAULT, true);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -258,8 +260,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	/* Only set the clock for internal mode. */</div><div class='ctx'> 	if (chip-&gt;input_clock != ECHO_CLOCK_INTERNAL) {</div><div class='del'>-		DE_ACT(("set_sample_rate: Cannot set sample rate - "</div><div class='del'>-			"clock not set to CLK_CLOCKININTERNAL\n"));</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");</div><div class='ctx'> 		/* Save the rate anyhow */</div><div class='ctx'> 		chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='hunk'>@@ -271,7 +273,6 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		       chip-&gt;digital_mode == DIGITAL_MODE_ADAT))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	clock = 0;</div><div class='ctx'> 	control_reg = le32_to_cpu(chip-&gt;comm_page-&gt;control_register);</div><div class='ctx'> 	control_reg &amp;= E3G_CLOCK_CLEAR_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +314,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);	/* ignored by the DSP */</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='del'>-	DE_ACT(("SetSampleRate: %d clock %x\n", rate, control_reg));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"SetSampleRate: %d clock %x\n", rate, control_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the DSP about it - DSP reads both control reg &amp; freq reg */</div><div class='ctx'> 	return write_control_reg(chip, control_reg, frq_reg, 0);</div><div class='hunk'>@@ -326,7 +328,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> {</div><div class='ctx'> 	u32 control_reg, clocks_from_dsp;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_input_clock:\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Mask off the clock select bits */</div><div class='ctx'> 	control_reg = le32_to_cpu(chip-&gt;comm_page-&gt;control_register) &amp;</div><div class='hunk'>@@ -335,13 +336,11 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> </div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='del'>-		DE_ACT(("Set Echo3G clock to INTERNAL\n"));</div><div class='ctx'> 		chip-&gt;input_clock = ECHO_CLOCK_INTERNAL;</div><div class='ctx'> 		return set_sample_rate(chip, chip-&gt;sample_rate);</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='ctx'> 		if (chip-&gt;digital_mode == DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		DE_ACT(("Set Echo3G clock to SPDIF\n"));</div><div class='ctx'> 		control_reg |= E3G_SPDIF_CLOCK;</div><div class='ctx'> 		if (clocks_from_dsp &amp; E3G_CLOCK_DETECT_BIT_SPDIF96)</div><div class='ctx'> 			control_reg |= E3G_DOUBLE_SPEED_MODE;</div><div class='hunk'>@@ -351,12 +350,10 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 	case ECHO_CLOCK_ADAT:</div><div class='ctx'> 		if (chip-&gt;digital_mode != DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		DE_ACT(("Set Echo3G clock to ADAT\n"));</div><div class='ctx'> 		control_reg |= E3G_ADAT_CLOCK;</div><div class='ctx'> 		control_reg &amp;= ~E3G_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_WORD:</div><div class='del'>-		DE_ACT(("Set Echo3G clock to WORD\n"));</div><div class='ctx'> 		control_reg |= E3G_WORD_CLOCK;</div><div class='ctx'> 		if (clocks_from_dsp &amp; E3G_CLOCK_DETECT_BIT_WORD96)</div><div class='ctx'> 			control_reg |= E3G_DOUBLE_SPEED_MODE;</div><div class='hunk'>@@ -364,7 +361,8 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 			control_reg &amp;= ~E3G_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Input clock 0x%x not supported for Echo3G\n", clock));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Input clock 0x%x not supported for Echo3G\n", clock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -380,23 +378,24 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	int err, incompatible_clock;</div><div class='ctx'> </div><div class='ctx'> 	/* Set clock to "internal" if it's not compatible with the new mode */</div><div class='del'>-	incompatible_clock = FALSE;</div><div class='add'>+	incompatible_clock = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_OPTICAL:</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_RCA:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_ADAT)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DIGITAL_MODE_ADAT:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_SPDIF)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Digital mode not supported: %d\n", mode));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Digital mode not supported: %d\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (incompatible_clock) {</div><div class='ctx'> 		chip-&gt;sample_rate = 48000;</div><div class='hunk'>@@ -422,11 +421,10 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = write_control_reg(chip, control_reg, get_frq_reg(chip), 1);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;digital_mode = mode;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_digital_mode(%d)\n", chip-&gt;digital_mode));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_digital_mode(%d)\n", chip-&gt;digital_mode);</div><div class='ctx'> 	return incompatible_clock;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c<br/>index 64417a733220..2a40091d472c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio_dsp.c</a></div><div class='hunk'>@@ -53,7 +53,7 @@ static int wait_handshake(struct echoaudio *chip)</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_ERR "wait_handshake(): Timeout waiting for DSP\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "wait_handshake(): Timeout waiting for DSP\n");</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,7 +80,7 @@ static int send_vector(struct echoaudio *chip, u32 command)</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_ACT((KERN_ERR "timeout on send_vector\n"));</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "timeout on send_vector\n");</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -103,8 +103,8 @@ static int write_dsp(struct echoaudio *chip, u32 data)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;bad_board = TRUE;		/* Set TRUE until DSP re-loaded */</div><div class='del'>-	DE_ACT((KERN_ERR "write_dsp: Set bad_board to TRUE\n"));</div><div class='add'>+	chip-&gt;bad_board = true;		/* Set true until DSP re-loaded */</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "write_dsp: Set bad_board to true\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -126,8 +126,8 @@ static int read_dsp(struct echoaudio *chip, u32 *data)</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;bad_board = TRUE;		/* Set TRUE until DSP re-loaded */</div><div class='del'>-	DE_INIT((KERN_ERR "read_dsp: Set bad_board to TRUE\n"));</div><div class='add'>+	chip-&gt;bad_board = true;		/* Set true until DSP re-loaded */</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "read_dsp: Set bad_board to true\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,12 +149,14 @@ static int read_sn(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 5; i++) {</div><div class='ctx'> 		if (read_dsp(chip, &amp;sn[i])) {</div><div class='del'>-			snd_printk(KERN_ERR "Failed to read serial number\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Failed to read serial number\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	DE_INIT(("Read serial number %08x %08x %08x %08x %08x\n",</div><div class='del'>-		 sn[0], sn[1], sn[2], sn[3], sn[4]));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"Read serial number %08x %08x %08x %08x %08x\n",</div><div class='add'>+		 sn[0], sn[1], sn[2], sn[3], sn[4]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -164,7 +166,7 @@ static int read_sn(struct echoaudio *chip)</div><div class='ctx'> /* This card has no ASIC, just return ok */</div><div class='ctx'> static inline int check_asic_status(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -184,7 +186,7 @@ static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic)</div><div class='ctx'> </div><div class='ctx'> 	err = get_firmware(&amp;fw, chip, asic);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "Firmware not found !\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "Firmware not found !\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -204,13 +206,12 @@ static int load_asic_generic(struct echoaudio *chip, u32 cmd, short asic)</div><div class='ctx'> 			goto la_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("ASIC loaded\n"));</div><div class='del'>-	free_firmware(fw);</div><div class='add'>+	free_firmware(fw, chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> la_error:</div><div class='del'>-	DE_INIT(("failed on write_dsp\n"));</div><div class='del'>-	free_firmware(fw);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "failed on write_dsp\n");</div><div class='add'>+	free_firmware(fw, chip);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -240,14 +241,15 @@ static int install_resident_loader(struct echoaudio *chip)</div><div class='ctx'> 	loader is already installed, host flag 5 will be on. */</div><div class='ctx'> 	status = get_dsp_register(chip, CHI32_STATUS_REG);</div><div class='ctx'> 	if (status &amp; CHI32_STATUS_REG_HF5) {</div><div class='del'>-		DE_INIT(("Resident loader already installed; status is 0x%x\n",</div><div class='del'>-			 status));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Resident loader already installed; status is 0x%x\n",</div><div class='add'>+			 status);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = get_firmware(&amp;fw, chip, FW_361_LOADER);</div><div class='ctx'> 	if (i &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "Firmware not found !\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "Firmware not found !\n");</div><div class='ctx'> 		return i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -282,12 +284,14 @@ static int install_resident_loader(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* Write the count to the DSP */</div><div class='ctx'> 	if (write_dsp(chip, words)) {</div><div class='del'>-		DE_INIT(("install_resident_loader: Failed to write word count!\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"install_resident_loader: Failed to write word count!\n");</div><div class='ctx'> 		goto irl_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Write the DSP address */</div><div class='ctx'> 	if (write_dsp(chip, address)) {</div><div class='del'>-		DE_INIT(("install_resident_loader: Failed to write DSP address!\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"install_resident_loader: Failed to write DSP address!\n");</div><div class='ctx'> 		goto irl_error;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Write out this block of code to the DSP */</div><div class='hunk'>@@ -296,7 +300,8 @@ static int install_resident_loader(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> 		data = ((u32)code[index] &lt;&lt; 16) + code[index + 1];</div><div class='ctx'> 		if (write_dsp(chip, data)) {</div><div class='del'>-			DE_INIT(("install_resident_loader: Failed to write DSP code\n"));</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"install_resident_loader: Failed to write DSP code\n");</div><div class='ctx'> 			goto irl_error;</div><div class='ctx'> 		}</div><div class='ctx'> 		index += 2;</div><div class='hunk'>@@ -311,16 +316,16 @@ static int install_resident_loader(struct echoaudio *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == 200) {</div><div class='del'>-		DE_INIT(("Resident loader failed to set HF5\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Resident loader failed to set HF5\n");</div><div class='ctx'> 		goto irl_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("Resident loader successfully installed\n"));</div><div class='del'>-	free_firmware(fw);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Resident loader successfully installed\n");</div><div class='add'>+	free_firmware(fw, chip);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> irl_error:</div><div class='del'>-	free_firmware(fw);</div><div class='add'>+	free_firmware(fw, chip);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -333,24 +338,26 @@ static int load_dsp(struct echoaudio *chip, u16 *code)</div><div class='ctx'> 	int index, words, i;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;dsp_code == code) {</div><div class='del'>-		DE_INIT(("DSP is already loaded!\n"));</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "DSP is already loaded!\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;bad_board = TRUE;		/* Set TRUE until DSP loaded */</div><div class='add'>+	chip-&gt;bad_board = true;		/* Set true until DSP loaded */</div><div class='ctx'> 	chip-&gt;dsp_code = NULL;		/* Current DSP code not loaded */</div><div class='del'>-	chip-&gt;asic_loaded = FALSE;	/* Loading the DSP code will reset the ASIC */</div><div class='add'>+	chip-&gt;asic_loaded = false;	/* Loading the DSP code will reset the ASIC */</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("load_dsp: Set bad_board to TRUE\n"));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "load_dsp: Set bad_board to true\n");</div><div class='ctx'> </div><div class='ctx'> 	/* If this board requires a resident loader, install it. */</div><div class='ctx'> #ifdef DSP_56361</div><div class='del'>-	if ((i = install_resident_loader(chip)) &lt; 0)</div><div class='add'>+	i = install_resident_loader(chip);</div><div class='add'>+	if (i &lt; 0)</div><div class='ctx'> 		return i;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Send software reset command */</div><div class='ctx'> 	if (send_vector(chip, DSP_VC_RESET) &lt; 0) {</div><div class='del'>-		DE_INIT(("LoadDsp: send_vector DSP_VC_RESET failed, Critical Failure\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"LoadDsp: send_vector DSP_VC_RESET failed, Critical Failure\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Delay 10us */</div><div class='hunk'>@@ -365,7 +372,8 @@ static int load_dsp(struct echoaudio *chip, u16 *code)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i == 1000) {</div><div class='del'>-		DE_INIT(("load_dsp: Timeout waiting for CHI32_STATUS_REG_HF3\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"load_dsp: Timeout waiting for CHI32_STATUS_REG_HF3\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -402,29 +410,34 @@ static int load_dsp(struct echoaudio *chip, u16 *code)</div><div class='ctx'> 		index += 2;</div><div class='ctx'> </div><div class='ctx'> 		if (write_dsp(chip, words) &lt; 0) {</div><div class='del'>-			DE_INIT(("load_dsp: failed to write number of DSP words\n"));</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"load_dsp: failed to write number of DSP words\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (write_dsp(chip, address) &lt; 0) {</div><div class='del'>-			DE_INIT(("load_dsp: failed to write DSP address\n"));</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"load_dsp: failed to write DSP address\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (write_dsp(chip, mem_type) &lt; 0) {</div><div class='del'>-			DE_INIT(("load_dsp: failed to write DSP memory type\n"));</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"load_dsp: failed to write DSP memory type\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Code */</div><div class='ctx'> 		for (i = 0; i &lt; words; i++, index+=2) {</div><div class='ctx'> 			data = ((u32)code[index] &lt;&lt; 16) + code[index + 1];</div><div class='ctx'> 			if (write_dsp(chip, data) &lt; 0) {</div><div class='del'>-				DE_INIT(("load_dsp: failed to write DSP data\n"));</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"load_dsp: failed to write DSP data\n");</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (write_dsp(chip, 0) &lt; 0) {	/* We're done!!! */</div><div class='del'>-		DE_INIT(("load_dsp: Failed to write final zero\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"load_dsp: Failed to write final zero\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -437,12 +450,14 @@ static int load_dsp(struct echoaudio *chip, u16 *code)</div><div class='ctx'> 					 get_dsp_register(chip, CHI32_CONTROL_REG) &amp; ~0x1b00);</div><div class='ctx'> </div><div class='ctx'> 			if (write_dsp(chip, DSP_FNC_SET_COMMPAGE_ADDR) &lt; 0) {</div><div class='del'>-				DE_INIT(("load_dsp: Failed to write DSP_FNC_SET_COMMPAGE_ADDR\n"));</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"load_dsp: Failed to write DSP_FNC_SET_COMMPAGE_ADDR\n");</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (write_dsp(chip, chip-&gt;comm_page_phys) &lt; 0) {</div><div class='del'>-				DE_INIT(("load_dsp: Failed to write comm page address\n"));</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"load_dsp: Failed to write comm page address\n");</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -451,19 +466,20 @@ static int load_dsp(struct echoaudio *chip, u16 *code)</div><div class='ctx'> 			We don't actually use the serial number but we have to</div><div class='ctx'> 			get it as part of the DSP init voodoo. */</div><div class='ctx'> 			if (read_sn(chip) &lt; 0) {</div><div class='del'>-				DE_INIT(("load_dsp: Failed to read serial number\n"));</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"load_dsp: Failed to read serial number\n");</div><div class='ctx'> 				return -EIO;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			chip-&gt;dsp_code = code;		/* Show which DSP code loaded */</div><div class='del'>-			chip-&gt;bad_board = FALSE;	/* DSP OK */</div><div class='del'>-			DE_INIT(("load_dsp: OK!\n"));</div><div class='add'>+			chip-&gt;bad_board = false;	/* DSP OK */</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		udelay(100);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("load_dsp: DSP load timed out waiting for HF4\n"));</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"load_dsp: DSP load timed out waiting for HF4\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -475,12 +491,13 @@ static int load_firmware(struct echoaudio *chip)</div><div class='ctx'> 	const struct firmware *fw;</div><div class='ctx'> 	int box_type, err;</div><div class='ctx'> </div><div class='del'>-	if (snd_BUG_ON(!chip-&gt;dsp_code_to_load || !chip-&gt;comm_page))</div><div class='add'>+	if (snd_BUG_ON(!chip-&gt;comm_page))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	/* See if the ASIC is present and working - only if the DSP is already loaded */</div><div class='ctx'> 	if (chip-&gt;dsp_code) {</div><div class='del'>-		if ((box_type = check_asic_status(chip)) &gt;= 0)</div><div class='add'>+		box_type = check_asic_status(chip);</div><div class='add'>+		if (box_type &gt;= 0)</div><div class='ctx'> 			return box_type;</div><div class='ctx'> 		/* ASIC check failed; force the DSP to reload */</div><div class='ctx'> 		chip-&gt;dsp_code = NULL;</div><div class='hunk'>@@ -490,11 +507,12 @@ static int load_firmware(struct echoaudio *chip)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	err = load_dsp(chip, (u16 *)fw-&gt;data);</div><div class='del'>-	free_firmware(fw);</div><div class='add'>+	free_firmware(fw, chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((box_type = load_asic(chip)) &lt; 0)</div><div class='add'>+	box_type = load_asic(chip);</div><div class='add'>+	if (box_type &lt; 0)</div><div class='ctx'> 		return box_type;	/* error */</div><div class='ctx'> </div><div class='ctx'> 	return box_type;</div><div class='hunk'>@@ -620,36 +638,30 @@ This function assumes there are no more than 16 in/out busses or pipes</div><div class='ctx'> Meters is an array [3][16][2] of long. */</div><div class='ctx'> static void get_audio_meters(struct echoaudio *chip, long *meters)</div><div class='ctx'> {</div><div class='del'>-	int i, m, n;</div><div class='add'>+	unsigned int i, m, n;</div><div class='ctx'> </div><div class='del'>-	m = 0;</div><div class='del'>-	n = 0;</div><div class='del'>-	for (i = 0; i &lt; num_busses_out(chip); i++, m++) {</div><div class='add'>+	for (i = 0 ; i &lt; 96; i++)</div><div class='add'>+		meters[i] = 0;</div><div class='add'>+</div><div class='add'>+	for (m = 0, n = 0, i = 0; i &lt; num_busses_out(chip); i++, m++) {</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;vu_meter[m];</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;peak_meter[m];</div><div class='ctx'> 	}</div><div class='del'>-	for (; n &lt; 32; n++)</div><div class='del'>-		meters[n] = 0;</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_ECHO3G</div><div class='ctx'> 	m = E3G_MAX_OUTPUTS;	/* Skip unused meters */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; num_busses_in(chip); i++, m++) {</div><div class='add'>+	for (n = 32, i = 0; i &lt; num_busses_in(chip); i++, m++) {</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;vu_meter[m];</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;peak_meter[m];</div><div class='ctx'> 	}</div><div class='del'>-	for (; n &lt; 64; n++)</div><div class='del'>-		meters[n] = 0;</div><div class='del'>-</div><div class='ctx'> #ifdef ECHOCARD_HAS_VMIXER</div><div class='del'>-	for (i = 0; i &lt; num_pipes_out(chip); i++, m++) {</div><div class='add'>+	for (n = 64, i = 0; i &lt; num_pipes_out(chip); i++, m++) {</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;vu_meter[m];</div><div class='ctx'> 		meters[n++] = chip-&gt;comm_page-&gt;peak_meter[m];</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	for (; n &lt; 96; n++)</div><div class='del'>-		meters[n] = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -657,15 +669,15 @@ static void get_audio_meters(struct echoaudio *chip, long *meters)</div><div class='ctx'> static int restore_dsp_rettings(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, o, err;</div><div class='del'>-	DE_INIT(("restore_dsp_settings\n"));</div><div class='ctx'> </div><div class='del'>-	if ((err = check_asic_status(chip)) &lt; 0)</div><div class='add'>+	err = check_asic_status(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Gina20/Darla20 only. Should be harmless for other cards. */</div><div class='ctx'> 	chip-&gt;comm_page-&gt;gd_clock_state = GD_CLOCK_UNDEF;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;gd_spdif_status = GD_SPDIF_STATUS_UNDEF;</div><div class='del'>-	chip-&gt;comm_page-&gt;handshake = 0xffffffff;</div><div class='add'>+	chip-&gt;comm_page-&gt;handshake = cpu_to_le32(0xffffffff);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore output busses */</div><div class='ctx'> 	for (i = 0; i &lt; num_busses_out(chip); i++) {</div><div class='hunk'>@@ -754,7 +766,6 @@ static int restore_dsp_rettings(struct echoaudio *chip)</div><div class='ctx'> 	if (send_vector(chip, DSP_VC_UPDATE_FLAGS) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("restore_dsp_rettings done\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -834,7 +845,8 @@ static void set_audio_format(struct echoaudio *chip, u16 pipe_index,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	DE_ACT(("set_audio_format[%d] = %x\n", pipe_index, dsp_format));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		 "set_audio_format[%d] = %x\n", pipe_index, dsp_format);</div><div class='ctx'> 	chip-&gt;comm_page-&gt;audio_format[pipe_index] = cpu_to_le16(dsp_format);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -847,7 +859,6 @@ Same thing for pause_ and stop_ -trasport below. */</div><div class='ctx'> static int start_transport(struct echoaudio *chip, u32 channel_mask,</div><div class='ctx'> 			   u32 cyclic_mask)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("start_transport %x\n", channel_mask));</div><div class='ctx'> </div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -865,7 +876,7 @@ static int start_transport(struct echoaudio *chip, u32 channel_mask,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("start_transport: No pipes to start!\n"));</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "start_transport: No pipes to start!\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -873,7 +884,6 @@ static int start_transport(struct echoaudio *chip, u32 channel_mask,</div><div class='ctx'> </div><div class='ctx'> static int pause_transport(struct echoaudio *chip, u32 channel_mask)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("pause_transport %x\n", channel_mask));</div><div class='ctx'> </div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -892,7 +902,7 @@ static int pause_transport(struct echoaudio *chip, u32 channel_mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("pause_transport: No pipes to stop!\n"));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "pause_transport: No pipes to stop!\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -900,7 +910,6 @@ static int pause_transport(struct echoaudio *chip, u32 channel_mask)</div><div class='ctx'> </div><div class='ctx'> static int stop_transport(struct echoaudio *chip, u32 channel_mask)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("stop_transport %x\n", channel_mask));</div><div class='ctx'> </div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -919,7 +928,7 @@ static int stop_transport(struct echoaudio *chip, u32 channel_mask)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("stop_transport: No pipes to stop!\n"));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "stop_transport: No pipes to stop!\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -936,15 +945,14 @@ static inline int is_pipe_allocated(struct echoaudio *chip, u16 pipe_index)</div><div class='ctx'> stopped and unallocated. */</div><div class='ctx'> static int rest_in_peace(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("rest_in_peace() open=%x\n", chip-&gt;pipe_alloc_mask));</div><div class='ctx'> </div><div class='ctx'> 	/* Stops all active pipes (just to be sure) */</div><div class='ctx'> 	stop_transport(chip, chip-&gt;active_mask);</div><div class='ctx'> </div><div class='del'>-	set_meters_on(chip, FALSE);</div><div class='add'>+	set_meters_on(chip, false);</div><div class='ctx'> </div><div class='ctx'> #ifdef ECHOCARD_HAS_MIDI</div><div class='del'>-	enable_midi_input(chip, FALSE);</div><div class='add'>+	enable_midi_input(chip, false);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* Go to sleep */</div><div class='hunk'>@@ -964,21 +972,22 @@ static int init_dsp_comm_page(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	/* Check if the compiler added extra padding inside the structure */</div><div class='ctx'> 	if (offsetof(struct comm_page, midi_output) != 0xbe0) {</div><div class='del'>-		DE_INIT(("init_dsp_comm_page() - Invalid struct comm_page structure\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_dsp_comm_page() - Invalid struct comm_page structure\n");</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init all the basic stuff */</div><div class='ctx'> 	chip-&gt;card_name = ECHOCARD_NAME;</div><div class='del'>-	chip-&gt;bad_board = TRUE;	/* Set TRUE until DSP loaded */</div><div class='add'>+	chip-&gt;bad_board = true;	/* Set true until DSP loaded */</div><div class='ctx'> 	chip-&gt;dsp_code = NULL;	/* Current DSP code not loaded */</div><div class='del'>-	chip-&gt;asic_loaded = FALSE;</div><div class='add'>+	chip-&gt;asic_loaded = false;</div><div class='ctx'> 	memset(chip-&gt;comm_page, 0, sizeof(struct comm_page));</div><div class='ctx'> </div><div class='ctx'> 	/* Init the comm page */</div><div class='ctx'> 	chip-&gt;comm_page-&gt;comm_size =</div><div class='ctx'> 		cpu_to_le32(sizeof(struct comm_page));</div><div class='del'>-	chip-&gt;comm_page-&gt;handshake = 0xffffffff;</div><div class='add'>+	chip-&gt;comm_page-&gt;handshake = cpu_to_le32(0xffffffff);</div><div class='ctx'> 	chip-&gt;comm_page-&gt;midi_out_free_count =</div><div class='ctx'> 		cpu_to_le32(DSP_MIDI_OUT_FIFO_SIZE);</div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(44100);</div><div class='hunk'>@@ -998,7 +1007,6 @@ static int init_dsp_comm_page(struct echoaudio *chip)</div><div class='ctx'>  */</div><div class='ctx'> static int init_line_levels(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-	DE_INIT(("init_line_levels\n"));</div><div class='ctx'> 	memset(chip-&gt;output_gain, ECHOGAIN_MUTED, sizeof(chip-&gt;output_gain));</div><div class='ctx'> 	memset(chip-&gt;input_gain, ECHOGAIN_MUTED, sizeof(chip-&gt;input_gain));</div><div class='ctx'> 	memset(chip-&gt;monitor_gain, ECHOGAIN_MUTED, sizeof(chip-&gt;monitor_gain));</div><div class='hunk'>@@ -1048,26 +1056,25 @@ static int allocate_pipes(struct echoaudio *chip, struct audiopipe *pipe,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 channel_mask;</div><div class='del'>-	char is_cyclic;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("allocate_pipes: ch=%d int=%d\n", pipe_index, interleave));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"allocate_pipes: ch=%d int=%d\n", pipe_index, interleave);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;bad_board)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	is_cyclic = 1;	/* This driver uses cyclic buffers only */</div><div class='del'>-</div><div class='ctx'> 	for (channel_mask = i = 0; i &lt; interleave; i++)</div><div class='ctx'> 		channel_mask |= 1 &lt;&lt; (pipe_index + i);</div><div class='ctx'> 	if (chip-&gt;pipe_alloc_mask &amp; channel_mask) {</div><div class='del'>-		DE_ACT(("allocate_pipes: channel already open\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"allocate_pipes: channel already open\n");</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;position[pipe_index] = 0;</div><div class='ctx'> 	chip-&gt;pipe_alloc_mask |= channel_mask;</div><div class='del'>-	if (is_cyclic)</div><div class='del'>-		chip-&gt;pipe_cyclic_mask |= channel_mask;</div><div class='add'>+	/* This driver uses cyclic buffers only */</div><div class='add'>+	chip-&gt;pipe_cyclic_mask |= channel_mask;</div><div class='ctx'> 	pipe-&gt;index = pipe_index;</div><div class='ctx'> 	pipe-&gt;interleave = interleave;</div><div class='ctx'> 	pipe-&gt;state = PIPE_STATE_STOPPED;</div><div class='hunk'>@@ -1075,9 +1082,8 @@ static int allocate_pipes(struct echoaudio *chip, struct audiopipe *pipe,</div><div class='ctx'> 	/* The counter register is where the DSP writes the 32 bit DMA</div><div class='ctx'> 	position for a pipe.  The DSP is constantly updating this value as</div><div class='ctx'> 	it moves data. The DMA counter is in units of bytes, not samples. */</div><div class='del'>-	pipe-&gt;dma_counter = &amp;chip-&gt;comm_page-&gt;position[pipe_index];</div><div class='add'>+	pipe-&gt;dma_counter = (__le32 *)&amp;chip-&gt;comm_page-&gt;position[pipe_index];</div><div class='ctx'> 	*pipe-&gt;dma_counter = 0;</div><div class='del'>-	DE_ACT(("allocate_pipes: ok\n"));</div><div class='ctx'> 	return pipe_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1088,7 +1094,6 @@ static int free_pipes(struct echoaudio *chip, struct audiopipe *pipe)</div><div class='ctx'> 	u32 channel_mask;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("free_pipes: Pipe %d\n", pipe-&gt;index));</div><div class='ctx'> 	if (snd_BUG_ON(!is_pipe_allocated(chip, pipe-&gt;index)))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (snd_BUG_ON(pipe-&gt;state != PIPE_STATE_STOPPED))</div><div class='hunk'>@@ -1130,7 +1135,7 @@ static int sglist_add_mapping(struct echoaudio *chip, struct audiopipe *pipe,</div><div class='ctx'> 		list[head].size = cpu_to_le32(length);</div><div class='ctx'> 		pipe-&gt;sglist_head++;</div><div class='ctx'> 	} else {</div><div class='del'>-		DE_ACT(("SGlist: too many fragments\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "SGlist: too many fragments\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio_dsp.h b/sound/pci/echoaudio/echoaudio_dsp.h<br/>index cb7d75a0a503..aa9129519795 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_dsp.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_dsp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_dsp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio_dsp.h</a></div><div class='hunk'>@@ -627,8 +627,8 @@ sg_entry struct is read by the DSP, so all values must be little-endian. */</div><div class='ctx'> #define MAX_SGLIST_ENTRIES 512</div><div class='ctx'> </div><div class='ctx'> struct sg_entry {</div><div class='del'>-	u32 addr;</div><div class='del'>-	u32 size;</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -643,18 +643,18 @@ struct sg_entry {</div><div class='ctx'>  ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> struct comm_page {		/*				Base	Length*/</div><div class='del'>-	u32 comm_size;		/* size of this object		0x000	4 */</div><div class='del'>-	u32 flags;		/* See Appendix A below		0x004	4 */</div><div class='del'>-	u32 unused;		/* Unused entry			0x008	4 */</div><div class='del'>-	u32 sample_rate;	/* Card sample rate in Hz	0x00c	4 */</div><div class='del'>-	u32 handshake;		/* DSP command handshake	0x010	4 */</div><div class='del'>-	u32 cmd_start;		/* Chs. to start mask		0x014	4 */</div><div class='del'>-	u32 cmd_stop;		/* Chs. to stop mask		0x018	4 */</div><div class='del'>-	u32 cmd_reset;		/* Chs. to reset mask		0x01c	4 */</div><div class='del'>-	u16 audio_format[DSP_MAXPIPES];	/* Chs. audio format	0x020	32*2 */</div><div class='add'>+	__le32 comm_size;	/* size of this object		0x000	4 */</div><div class='add'>+	__le32 flags;		/* See Appendix A below		0x004	4 */</div><div class='add'>+	__le32 unused;		/* Unused entry			0x008	4 */</div><div class='add'>+	__le32 sample_rate;	/* Card sample rate in Hz	0x00c	4 */</div><div class='add'>+	__le32 handshake;	/* DSP command handshake	0x010	4 */</div><div class='add'>+	__le32 cmd_start;	/* Chs. to start mask		0x014	4 */</div><div class='add'>+	__le32 cmd_stop;	/* Chs. to stop mask		0x018	4 */</div><div class='add'>+	__le32 cmd_reset;	/* Chs. to reset mask		0x01c	4 */</div><div class='add'>+	__le16 audio_format[DSP_MAXPIPES];	/* Chs. audio format	0x020	32*2 */</div><div class='ctx'> 	struct sg_entry sglist_addr[DSP_MAXPIPES];</div><div class='ctx'> 				/* Chs. Physical sglist addrs	0x060	32*8 */</div><div class='del'>-	u32 position[DSP_MAXPIPES];</div><div class='add'>+	__le32 position[DSP_MAXPIPES];</div><div class='ctx'> 				/* Positions for ea. ch.	0x160	32*4 */</div><div class='ctx'> 	s8 vu_meter[DSP_MAXPIPES];</div><div class='ctx'> 				/* VU meters			0x1e0	32*1 */</div><div class='hunk'>@@ -666,28 +666,28 @@ struct comm_page {		/*				Base	Length*/</div><div class='ctx'> 				/* Input gain			0x230	16*1 */</div><div class='ctx'> 	s8 monitors[MONITOR_ARRAY_SIZE];</div><div class='ctx'> 				/* Monitor map			0x240	0x180 */</div><div class='del'>-	u32 play_coeff[MAX_PLAY_TAPS];</div><div class='add'>+	__le32 play_coeff[MAX_PLAY_TAPS];</div><div class='ctx'> 			/* Gina/Darla play filters - obsolete	0x3c0	168*4 */</div><div class='del'>-	u32 rec_coeff[MAX_REC_TAPS];</div><div class='add'>+	__le32 rec_coeff[MAX_REC_TAPS];</div><div class='ctx'> 			/* Gina/Darla record filters - obsolete	0x660	192*4 */</div><div class='del'>-	u16 midi_input[MIDI_IN_BUFFER_SIZE];</div><div class='add'>+	__le16 midi_input[MIDI_IN_BUFFER_SIZE];</div><div class='ctx'> 			/* MIDI input data transfer buffer	0x960	256*2 */</div><div class='ctx'> 	u8 gd_clock_state;	/* Chg Gina/Darla clock state	0xb60	1 */</div><div class='ctx'> 	u8 gd_spdif_status;	/* Chg. Gina/Darla S/PDIF state	0xb61	1 */</div><div class='ctx'> 	u8 gd_resampler_state;	/* Should always be 3		0xb62	1 */</div><div class='ctx'> 	u8 filler2;		/*				0xb63	1 */</div><div class='del'>-	u32 nominal_level_mask;	/* -10 level enable mask	0xb64	4 */</div><div class='del'>-	u16 input_clock;	/* Chg. Input clock state	0xb68	2 */</div><div class='del'>-	u16 output_clock;	/* Chg. Output clock state	0xb6a	2 */</div><div class='del'>-	u32 status_clocks;	/* Current Input clock state	0xb6c	4 */</div><div class='del'>-	u32 ext_box_status;	/* External box status		0xb70	4 */</div><div class='del'>-	u32 cmd_add_buffer;	/* Pipes to add (obsolete)	0xb74	4 */</div><div class='del'>-	u32 midi_out_free_count;</div><div class='add'>+	__le32 nominal_level_mask;	/* -10 level enable mask	0xb64	4 */</div><div class='add'>+	__le16 input_clock;	/* Chg. Input clock state	0xb68	2 */</div><div class='add'>+	__le16 output_clock;	/* Chg. Output clock state	0xb6a	2 */</div><div class='add'>+	__le32 status_clocks;	/* Current Input clock state	0xb6c	4 */</div><div class='add'>+	__le32 ext_box_status;	/* External box status		0xb70	4 */</div><div class='add'>+	__le32 cmd_add_buffer;	/* Pipes to add (obsolete)	0xb74	4 */</div><div class='add'>+	__le32 midi_out_free_count;</div><div class='ctx'> 			/* # of bytes free in MIDI output FIFO	0xb78	4 */</div><div class='del'>-	u32 unused2;		/* Cyclic pipes			0xb7c	4 */</div><div class='del'>-	u32 control_register;</div><div class='add'>+	__le32 unused2;		/* Cyclic pipes			0xb7c	4 */</div><div class='add'>+	__le32 control_register;</div><div class='ctx'> 			/* Mona, Gina24, Layla24, 3G ctrl reg	0xb80	4 */</div><div class='del'>-	u32 e3g_frq_register;	/* 3G frequency register	0xb84	4 */</div><div class='add'>+	__le32 e3g_frq_register;	/* 3G frequency register	0xb84	4 */</div><div class='ctx'> 	u8 filler[24];		/* filler			0xb88	24*1 */</div><div class='ctx'> 	s8 vmixer[VMIXER_ARRAY_SIZE];</div><div class='ctx'> 				/* Vmixer levels		0xba0	64*1 */</div><div class='head'>diff --git a/sound/pci/echoaudio/echoaudio_gml.c b/sound/pci/echoaudio/echoaudio_gml.c<br/>index afa273330e8a..248983fa2959 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_gml.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/echoaudio_gml.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/echoaudio_gml.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/echoaudio_gml.c</a></div><div class='hunk'>@@ -46,8 +46,9 @@ static int check_asic_status(struct echoaudio *chip)</div><div class='ctx'> 	/* The DSP will return a value to indicate whether or not the</div><div class='ctx'> 	   ASIC is currently loaded */</div><div class='ctx'> 	if (read_dsp(chip, &amp;asic_status) &lt; 0) {</div><div class='del'>-		DE_INIT(("check_asic_status: failed on read_dsp\n"));</div><div class='del'>-		chip-&gt;asic_loaded = FALSE;</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"check_asic_status: failed on read_dsp\n");</div><div class='add'>+		chip-&gt;asic_loaded = false;</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -62,20 +63,22 @@ the control register.  write_control_reg sends the new control register</div><div class='ctx'> value to the DSP. */</div><div class='ctx'> static int write_control_reg(struct echoaudio *chip, u32 value, char force)</div><div class='ctx'> {</div><div class='add'>+	__le32 reg_value;</div><div class='add'>+</div><div class='ctx'> 	/* Handle the digital input auto-mute */</div><div class='ctx'> 	if (chip-&gt;digital_in_automute)</div><div class='ctx'> 		value |= GML_DIGITAL_IN_AUTO_MUTE;</div><div class='ctx'> 	else</div><div class='ctx'> 		value &amp;= ~GML_DIGITAL_IN_AUTO_MUTE;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("write_control_reg: 0x%x\n", value));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "write_control_reg: 0x%x\n", value);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the control register */</div><div class='del'>-	value = cpu_to_le32(value);</div><div class='del'>-	if (value != chip-&gt;comm_page-&gt;control_register || force) {</div><div class='add'>+	reg_value = cpu_to_le32(value);</div><div class='add'>+	if (reg_value != chip-&gt;comm_page-&gt;control_register || force) {</div><div class='ctx'> 		if (wait_handshake(chip))</div><div class='ctx'> 			return -EIO;</div><div class='del'>-		chip-&gt;comm_page-&gt;control_register = value;</div><div class='add'>+		chip-&gt;comm_page-&gt;control_register = reg_value;</div><div class='ctx'> 		clear_handshake(chip);</div><div class='ctx'> 		return send_vector(chip, DSP_VC_WRITE_CONTROL_REG);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -91,7 +94,7 @@ If the auto-mute is disabled, the digital inputs are enabled regardless of</div><div class='ctx'> what the input clock is set or what is connected. */</div><div class='ctx'> static int set_input_auto_mute(struct echoaudio *chip, int automute)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_input_auto_mute %d\n", automute));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_input_auto_mute %d\n", automute);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;digital_in_automute = automute;</div><div class='ctx'> </div><div class='hunk'>@@ -191,10 +194,11 @@ static int set_professional_spdif(struct echoaudio *chip, char prof)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = write_control_reg(chip, control_reg, FALSE)))</div><div class='add'>+	err = write_control_reg(chip, control_reg, false);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;professional_spdif = prof;</div><div class='del'>-	DE_ACT(("set_professional_spdif to %s\n",</div><div class='del'>-		prof ? "Professional" : "Consumer"));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_professional_spdif to %s\n",</div><div class='add'>+		prof ? "Professional" : "Consumer");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c<br/>index 050e54aa693f..4f864ddc9530 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina20.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina20.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina20.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/gina20.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHOGALS_FAMILY</div><div class='hunk'>@@ -23,7 +11,7 @@</div><div class='ctx'> #define ECHOCARD_HAS_INPUT_GAIN</div><div class='ctx'> #define ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> #define ECHOCARD_HAS_EXTERNAL_CLOCK</div><div class='del'>-#define ECHOCARD_HAS_ADAT	FALSE</div><div class='add'>+#define ECHOCARD_HAS_ADAT	false</div><div class='ctx'> </div><div class='ctx'> /* Pipe indexes */</div><div class='ctx'> #define PX_ANALOG_OUT	0	/* 8 */</div><div class='hunk'>@@ -44,9 +32,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -55,8 +44,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/gina20_dsp.fw");</div><div class='hunk'>@@ -67,12 +55,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "gina20_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0020, 0, 0, 0},	/* DSP 56301 Gina20 rev.0 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/gina20_dsp.c b/sound/pci/echoaudio/gina20_dsp.c<br/>index d1615a0579d1..c93939850357 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina20_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina20_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina20_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/gina20_dsp.c</a></div><div class='hunk'>@@ -37,32 +37,33 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Gina20\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != GINA20))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_GINA20_DSP;</div><div class='ctx'> 	chip-&gt;spdif_status = GD_SPDIF_STATUS_UNDEF;</div><div class='ctx'> 	chip-&gt;clock_state = GD_CLOCK_UNDEF;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL |</div><div class='ctx'> 		ECHO_CLOCK_BIT_SPDIF;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +71,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> </div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +150,6 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_input_clock:\n"));</div><div class='ctx'> </div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='hunk'>@@ -158,7 +158,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 		chip-&gt;spdif_status = GD_SPDIF_STATUS_UNDEF;</div><div class='ctx'> 		set_sample_rate(chip, chip-&gt;sample_rate);</div><div class='ctx'> 		chip-&gt;input_clock = clock;</div><div class='del'>-		DE_ACT(("Set Gina clock to INTERNAL\n"));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='ctx'> 		chip-&gt;comm_page-&gt;gd_clock_state = GD_CLOCK_SPDIFIN;</div><div class='hunk'>@@ -166,7 +165,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 		clear_handshake(chip);</div><div class='ctx'> 		send_vector(chip, DSP_VC_SET_GD_AUDIO_STATE);</div><div class='ctx'> 		chip-&gt;clock_state = GD_CLOCK_SPDIFIN;</div><div class='del'>-		DE_ACT(("Set Gina20 clock to SPDIF\n"));</div><div class='ctx'> 		chip-&gt;input_clock = clock;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -208,7 +206,6 @@ static int update_flags(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> static int set_professional_spdif(struct echoaudio *chip, char prof)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_professional_spdif %d\n", prof));</div><div class='ctx'> 	if (prof)</div><div class='ctx'> 		chip-&gt;comm_page-&gt;flags |=</div><div class='ctx'> 			cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);</div><div class='head'>diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c<br/>index 5748fc6d29d6..eff69e83ca0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina24.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina24.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina24.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/gina24.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHO24_FAMILY</div><div class='hunk'>@@ -50,9 +38,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -61,8 +50,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -85,7 +73,7 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "gina24_361_asic.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0050, 0, 0, 0},	/* DSP 56301 Gina24 rev.0 */</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0051, 0, 0, 0},	/* DSP 56301 Gina24 rev.1 */</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0050, 0, 0, 0},	/* DSP 56361 Gina24 rev.0 */</div><div class='hunk'>@@ -93,7 +81,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/gina24_dsp.c b/sound/pci/echoaudio/gina24_dsp.c<br/>index 98f7cfa81b5f..78fbac9f3eac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina24_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/gina24_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/gina24_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/gina24_dsp.c</a></div><div class='hunk'>@@ -41,18 +41,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Gina24\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != GINA24))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;input_clock_types =</div><div class='ctx'> 		ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |</div><div class='ctx'> 		ECHO_CLOCK_BIT_ESYNC | ECHO_CLOCK_BIT_ESYNC96 |</div><div class='hunk'>@@ -74,11 +75,11 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 			ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_CDROM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -87,8 +88,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;digital_mode = DIGITAL_MODE_SPDIF_RCA;</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='del'>-	chip-&gt;digital_in_automute = TRUE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='add'>+	chip-&gt;digital_in_automute = true;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -153,9 +154,8 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	   48 kHz, internal clock, S/PDIF RCA mode */</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		control_reg = GML_CONVERTER_ENABLE | GML_48KHZ;</div><div class='del'>-		err = write_control_reg(chip, control_reg, TRUE);</div><div class='add'>+		err = write_control_reg(chip, control_reg, true);</div><div class='ctx'> 	}</div><div class='del'>-	DE_INIT(("load_asic() done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -171,8 +171,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	/* Only set the clock for internal mode. */</div><div class='ctx'> 	if (chip-&gt;input_clock != ECHO_CLOCK_INTERNAL) {</div><div class='del'>-		DE_ACT(("set_sample_rate: Cannot set sample rate - "</div><div class='del'>-			"clock not set to CLK_CLOCKININTERNAL\n"));</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");</div><div class='ctx'> 		/* Save the rate anyhow */</div><div class='ctx'> 		chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='hunk'>@@ -217,7 +217,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		clock = GML_8KHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: %d invalid!\n", rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d invalid!\n", rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -225,9 +226,9 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);	/* ignored by the DSP */</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='del'>-	DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_sample_rate: %d clock %d\n", rate, clock);</div><div class='ctx'> </div><div class='del'>-	return write_control_reg(chip, control_reg, FALSE);</div><div class='add'>+	return write_control_reg(chip, control_reg, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +237,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> {</div><div class='ctx'> 	u32 control_reg, clocks_from_dsp;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_input_clock:\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Mask off the clock select bits */</div><div class='ctx'> 	control_reg = le32_to_cpu(chip-&gt;comm_page-&gt;control_register) &amp;</div><div class='hunk'>@@ -245,13 +245,11 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> </div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='del'>-		DE_ACT(("Set Gina24 clock to INTERNAL\n"));</div><div class='ctx'> 		chip-&gt;input_clock = ECHO_CLOCK_INTERNAL;</div><div class='ctx'> 		return set_sample_rate(chip, chip-&gt;sample_rate);</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='ctx'> 		if (chip-&gt;digital_mode == DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		DE_ACT(("Set Gina24 clock to SPDIF\n"));</div><div class='ctx'> 		control_reg |= GML_SPDIF_CLOCK;</div><div class='ctx'> 		if (clocks_from_dsp &amp; GML_CLOCK_DETECT_BIT_SPDIF96)</div><div class='ctx'> 			control_reg |= GML_DOUBLE_SPEED_MODE;</div><div class='hunk'>@@ -261,26 +259,24 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 	case ECHO_CLOCK_ADAT:</div><div class='ctx'> 		if (chip-&gt;digital_mode != DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='del'>-		DE_ACT(("Set Gina24 clock to ADAT\n"));</div><div class='ctx'> 		control_reg |= GML_ADAT_CLOCK;</div><div class='ctx'> 		control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_ESYNC:</div><div class='del'>-		DE_ACT(("Set Gina24 clock to ESYNC\n"));</div><div class='ctx'> 		control_reg |= GML_ESYNC_CLOCK;</div><div class='ctx'> 		control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_ESYNC96:</div><div class='del'>-		DE_ACT(("Set Gina24 clock to ESYNC96\n"));</div><div class='ctx'> 		control_reg |= GML_ESYNC_CLOCK | GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Input clock 0x%x not supported for Gina24\n", clock));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Input clock 0x%x not supported for Gina24\n", clock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;input_clock = clock;</div><div class='del'>-	return write_control_reg(chip, control_reg, TRUE);</div><div class='add'>+	return write_control_reg(chip, control_reg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -291,24 +287,25 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	int err, incompatible_clock;</div><div class='ctx'> </div><div class='ctx'> 	/* Set clock to "internal" if it's not compatible with the new mode */</div><div class='del'>-	incompatible_clock = FALSE;</div><div class='add'>+	incompatible_clock = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_OPTICAL:</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_CDROM:</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_RCA:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_ADAT)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DIGITAL_MODE_ADAT:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_SPDIF)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Digital mode not supported: %d\n", mode));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Digital mode not supported: %d\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (incompatible_clock) {	/* Switch to 48KHz, internal */</div><div class='ctx'> 		chip-&gt;sample_rate = 48000;</div><div class='hunk'>@@ -338,12 +335,12 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = write_control_reg(chip, control_reg, TRUE);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	err = write_control_reg(chip, control_reg, true);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;digital_mode = mode;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_digital_mode to %d\n", chip-&gt;digital_mode));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_digital_mode to %d\n", chip-&gt;digital_mode);</div><div class='ctx'> 	return incompatible_clock;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c<br/>index 4ae5e35cb5f1..a9f2efc58f6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigo.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INDIGO_FAMILY</div><div class='hunk'>@@ -42,9 +30,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -53,8 +42,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -68,12 +56,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "indigo_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0090, 0, 0, 0},	/* Indigo */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/indigo_dsp.c b/sound/pci/echoaudio/indigo_dsp.c<br/>index 5e85f14fe5a8..16eb082df56a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigo_dsp.c</a></div><div class='hunk'>@@ -38,29 +38,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Indigo\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != INDIGO))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_INDIGO_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +110,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		control_reg = MIA_32000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: %d invalid!\n", rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d invalid!\n", rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +149,8 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,</div><div class='ctx'> 	index = output * num_pipes_out(chip) + pipe;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;vmixer[index] = gain;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/indigo_express_dsp.c b/sound/pci/echoaudio/indigo_express_dsp.c<br/>index 2e4ab3e34a74..ceda2d7046ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo_express_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigo_express_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigo_express_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigo_express_dsp.c</a></div><div class='hunk'>@@ -61,7 +61,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	control_reg |= clock;</div><div class='ctx'> 	if (control_reg != old_control_reg) {</div><div class='del'>-		DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d clock %d\n", rate, clock);</div><div class='ctx'> 		chip-&gt;comm_page-&gt;control_register = cpu_to_le32(control_reg);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='ctx'> 		clear_handshake(chip);</div><div class='hunk'>@@ -89,7 +90,8 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,</div><div class='ctx'> 	index = output * num_pipes_out(chip) + pipe;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;vmixer[index] = gain;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c<br/>index 3550715bab1c..14e9769ceba1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodj.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodj.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodj.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigodj.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INDIGO_FAMILY</div><div class='hunk'>@@ -42,9 +30,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -53,8 +42,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -68,12 +56,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "indigo_dj_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0},	/* Indigo DJ*/</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/indigodj_dsp.c b/sound/pci/echoaudio/indigodj_dsp.c<br/>index 68f3c8ccc1bf..17a1d888d0b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodj_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodj_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodj_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigodj_dsp.c</a></div><div class='hunk'>@@ -38,29 +38,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Indigo DJ\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != INDIGO_DJ))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_INDIGO_DJ_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -109,7 +110,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		control_reg = MIA_32000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: %d invalid!\n", rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d invalid!\n", rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -147,7 +149,8 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,</div><div class='ctx'> 	index = output * num_pipes_out(chip) + pipe;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;vmixer[index] = gain;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c<br/>index 19b191fd0120..a14a7dc8c87d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodjx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodjx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodjx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigodjx.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2009 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INDIGO_FAMILY</div><div class='hunk'>@@ -42,7 +30,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -54,7 +42,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -68,12 +56,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "indigo_djx_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0},	/* Indigo DJx*/</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/indigodjx_dsp.c b/sound/pci/echoaudio/indigodjx_dsp.c<br/>index bb9632c752a9..5fbd4a3a3083 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodjx_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigodjx_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigodjx_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigodjx_dsp.c</a></div><div class='hunk'>@@ -35,31 +35,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Indigo DJx\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != INDIGO_DJX))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	err = init_dsp_comm_page(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_INDIGO_DJX_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='ctx'> 	err = load_firmware(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c<br/>index a9fcedf317a4..97e024450d19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoio.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigoio.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INDIGO_FAMILY</div><div class='hunk'>@@ -43,9 +31,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -54,8 +43,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -69,12 +57,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "indigo_io_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0},	/* Indigo IO*/</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/indigoio_dsp.c b/sound/pci/echoaudio/indigoio_dsp.c<br/>index beb9a5b69892..791787aa0744 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoio_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoio_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoio_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigoio_dsp.c</a></div><div class='hunk'>@@ -38,29 +38,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Indigo IO\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != INDIGO_IO))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_INDIGO_IO_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -118,7 +119,8 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,</div><div class='ctx'> 	index = output * num_pipes_out(chip) + pipe;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;vmixer[index] = gain;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c<br/>index bcdfac63212c..a017c966b4dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoiox.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoiox.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoiox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigoiox.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2009 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define INDIGO_FAMILY</div><div class='hunk'>@@ -43,7 +31,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -55,7 +43,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -69,12 +57,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "indigo_iox_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0},	/* Indigo IOx */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/indigoiox_dsp.c b/sound/pci/echoaudio/indigoiox_dsp.c<br/>index 394c6e76bcbc..1ae394ea7c7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoiox_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/indigoiox_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/indigoiox_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/indigoiox_dsp.c</a></div><div class='hunk'>@@ -35,31 +35,30 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Indigo IOx\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != INDIGO_IOX))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	err = init_dsp_comm_page(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_INDIGO_IOX_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL;</div><div class='ctx'> </div><div class='ctx'> 	err = load_firmware(chip);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c<br/>index d3a98c5dac86..7e38bc9c025d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla20.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla20.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla20.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/layla20.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHOGALS_FAMILY</div><div class='hunk'>@@ -26,7 +14,7 @@</div><div class='ctx'> #define ECHOCARD_HAS_SUPER_INTERLEAVE</div><div class='ctx'> #define ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> #define ECHOCARD_HAS_EXTERNAL_CLOCK</div><div class='del'>-#define ECHOCARD_HAS_ADAT	FALSE</div><div class='add'>+#define ECHOCARD_HAS_ADAT	false</div><div class='ctx'> #define ECHOCARD_HAS_OUTPUT_CLOCK_SWITCH</div><div class='ctx'> #define ECHOCARD_HAS_MIDI</div><div class='ctx'> </div><div class='hunk'>@@ -49,9 +37,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -61,8 +50,7 @@</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/layla20_dsp.fw");</div><div class='hunk'>@@ -76,13 +64,13 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "layla20_asic.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0030, 0, 0, 0},	/* DSP 56301 Layla20 rev.0 */</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0031, 0, 0, 0},	/* DSP 56301 Layla20 rev.1 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/layla20_dsp.c b/sound/pci/echoaudio/layla20_dsp.c<br/>index 53ce94605044..5fb5c4a4598b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla20_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla20_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla20_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/layla20_dsp.c</a></div><div class='hunk'>@@ -40,19 +40,20 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Layla20\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != LAYLA20))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='del'>-	chip-&gt;has_midi = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='add'>+	chip-&gt;has_midi = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_LAYLA20_DSP;</div><div class='ctx'> 	chip-&gt;input_clock_types =</div><div class='ctx'> 		ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |</div><div class='hunk'>@@ -60,11 +61,11 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 	chip-&gt;output_clock_types =</div><div class='ctx'> 		ECHO_CLOCK_BIT_WORD | ECHO_CLOCK_BIT_SUPER;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -72,7 +73,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> </div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,20 +115,21 @@ static int check_asic_status(struct echoaudio *chip)</div><div class='ctx'> 	u32 asic_status;</div><div class='ctx'> 	int goodcnt, i;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;asic_loaded = FALSE;</div><div class='add'>+	chip-&gt;asic_loaded = false;</div><div class='ctx'> 	for (i = goodcnt = 0; i &lt; 5; i++) {</div><div class='ctx'> 		send_vector(chip, DSP_VC_TEST_ASIC);</div><div class='ctx'> </div><div class='ctx'> 		/* The DSP will return a value to indicate whether or not</div><div class='ctx'> 		   the ASIC is currently loaded */</div><div class='ctx'> 		if (read_dsp(chip, &amp;asic_status) &lt; 0) {</div><div class='del'>-			DE_ACT(("check_asic_status: failed on read_dsp\n"));</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"check_asic_status: failed on read_dsp\n");</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (asic_status == ASIC_ALREADY_LOADED) {</div><div class='ctx'> 			if (++goodcnt == 3) {</div><div class='del'>-				chip-&gt;asic_loaded = TRUE;</div><div class='add'>+				chip-&gt;asic_loaded = true;</div><div class='ctx'> 				return 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -164,8 +166,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 	/* Only set the clock for internal mode. Do not return failure,</div><div class='ctx'> 	   simply treat it as a non-event. */</div><div class='ctx'> 	if (chip-&gt;input_clock != ECHO_CLOCK_INTERNAL) {</div><div class='del'>-		DE_ACT(("set_sample_rate: Cannot set sample rate - "</div><div class='del'>-			"clock not set to CLK_CLOCKININTERNAL\n"));</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");</div><div class='ctx'> 		chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -174,7 +176,7 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_sample_rate(%d)\n", rate));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_sample_rate(%d)\n", rate);</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 	clear_handshake(chip);</div><div class='hunk'>@@ -188,29 +190,25 @@ static int set_input_clock(struct echoaudio *chip, u16 clock_source)</div><div class='ctx'> 	u16 clock;</div><div class='ctx'> 	u32 rate;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_input_clock:\n"));</div><div class='ctx'> 	rate = 0;</div><div class='ctx'> 	switch (clock_source) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='del'>-		DE_ACT(("Set Layla20 clock to INTERNAL\n"));</div><div class='ctx'> 		rate = chip-&gt;sample_rate;</div><div class='ctx'> 		clock = LAYLA20_CLOCK_INTERNAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='del'>-		DE_ACT(("Set Layla20 clock to SPDIF\n"));</div><div class='ctx'> 		clock = LAYLA20_CLOCK_SPDIF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_WORD:</div><div class='del'>-		DE_ACT(("Set Layla20 clock to WORD\n"));</div><div class='ctx'> 		clock = LAYLA20_CLOCK_WORD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_SUPER:</div><div class='del'>-		DE_ACT(("Set Layla20 clock to SUPER\n"));</div><div class='ctx'> 		clock = LAYLA20_CLOCK_SUPER;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Input clock 0x%x not supported for Layla24\n",</div><div class='del'>-			clock_source));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Input clock 0x%x not supported for Layla24\n",</div><div class='add'>+			clock_source);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;input_clock = clock_source;</div><div class='hunk'>@@ -229,7 +227,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock_source)</div><div class='ctx'> </div><div class='ctx'> static int set_output_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_output_clock: %d\n", clock));</div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_SUPER:</div><div class='ctx'> 		clock = LAYLA20_OUTPUT_CLOCK_SUPER;</div><div class='hunk'>@@ -238,7 +235,7 @@ static int set_output_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 		clock = LAYLA20_OUTPUT_CLOCK_WORD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_output_clock wrong clock\n"));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "set_output_clock wrong clock\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +280,6 @@ static int update_flags(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> static int set_professional_spdif(struct echoaudio *chip, char prof)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_professional_spdif %d\n", prof));</div><div class='ctx'> 	if (prof)</div><div class='ctx'> 		chip-&gt;comm_page-&gt;flags |=</div><div class='ctx'> 			cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);</div><div class='head'>diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c<br/>index 2a1dca6dce17..95c52210fb65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla24.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla24.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla24.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/layla24.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHO24_FAMILY</div><div class='hunk'>@@ -51,9 +39,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -63,8 +52,7 @@</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -87,12 +75,12 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "layla24_2S_asic.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0060, 0, 0, 0},	/* DSP 56361 Layla24 rev.0 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/layla24_dsp.c b/sound/pci/echoaudio/layla24_dsp.c<br/>index 8c041647f285..decfccb1e803 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla24_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/layla24_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/layla24_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/layla24_dsp.c</a></div><div class='hunk'>@@ -40,19 +40,20 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Layla24\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != LAYLA24))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='del'>-	chip-&gt;has_midi = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='add'>+	chip-&gt;has_midi = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_LAYLA24_DSP;</div><div class='ctx'> 	chip-&gt;input_clock_types =</div><div class='ctx'> 		ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |</div><div class='hunk'>@@ -62,14 +63,15 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 		ECHOCAPS_HAS_DIGITAL_MODE_SPDIF_OPTICAL |</div><div class='ctx'> 		ECHOCAPS_HAS_DIGITAL_MODE_ADAT;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_line_levels(chip)) &lt; 0)</div><div class='add'>+	err = init_line_levels(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -78,8 +80,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;digital_mode = DIGITAL_MODE_SPDIF_RCA;</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='del'>-	chip-&gt;digital_in_automute = TRUE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='add'>+	chip-&gt;digital_in_automute = true;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -117,7 +119,6 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	if (chip-&gt;asic_loaded)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("load_asic\n"));</div><div class='ctx'> </div><div class='ctx'> 	/* Give the DSP a few milliseconds to settle down */</div><div class='ctx'> 	mdelay(10);</div><div class='hunk'>@@ -137,7 +138,7 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	err = load_asic_generic(chip, DSP_FNC_LOAD_LAYLA24_EXTERNAL_ASIC,</div><div class='ctx'> 				FW_LAYLA24_2S_ASIC);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return FALSE;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Now give the external ASIC a little time to set up */</div><div class='ctx'> 	mdelay(10);</div><div class='hunk'>@@ -149,9 +150,8 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	   48 kHz, internal clock, S/PDIF RCA mode */</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		err = write_control_reg(chip, GML_CONVERTER_ENABLE | GML_48KHZ,</div><div class='del'>-					TRUE);</div><div class='add'>+					true);</div><div class='ctx'> 	</div><div class='del'>-	DE_INIT(("load_asic() done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,8 +167,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	/* Only set the clock for internal mode. */</div><div class='ctx'> 	if (chip-&gt;input_clock != ECHO_CLOCK_INTERNAL) {</div><div class='del'>-		DE_ACT(("set_sample_rate: Cannot set sample rate - "</div><div class='del'>-			"clock not set to CLK_CLOCKININTERNAL\n"));</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");</div><div class='ctx'> 		/* Save the rate anyhow */</div><div class='ctx'> 		chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='hunk'>@@ -241,9 +241,10 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);	/* ignored by the DSP ? */</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='del'>-	DE_ACT(("set_sample_rate: %d clock %d\n", rate, control_reg));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_sample_rate: %d clock %d\n", rate, control_reg);</div><div class='ctx'> </div><div class='del'>-	return write_control_reg(chip, control_reg, FALSE);</div><div class='add'>+	return write_control_reg(chip, control_reg, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -260,7 +261,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 	/* Pick the new clock */</div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='del'>-		DE_ACT(("Set Layla24 clock to INTERNAL\n"));</div><div class='ctx'> 		chip-&gt;input_clock = ECHO_CLOCK_INTERNAL;</div><div class='ctx'> 		return set_sample_rate(chip, chip-&gt;sample_rate);</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='hunk'>@@ -269,7 +269,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 		control_reg |= GML_SPDIF_CLOCK;</div><div class='ctx'> 		/* Layla24 doesn't support 96KHz S/PDIF */</div><div class='ctx'> 		control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='del'>-		DE_ACT(("Set Layla24 clock to SPDIF\n"));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_WORD:</div><div class='ctx'> 		control_reg |= GML_WORD_CLOCK;</div><div class='hunk'>@@ -277,22 +276,21 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 			control_reg |= GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		else</div><div class='ctx'> 			control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='del'>-		DE_ACT(("Set Layla24 clock to WORD\n"));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_ADAT:</div><div class='ctx'> 		if (chip-&gt;digital_mode != DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		control_reg |= GML_ADAT_CLOCK;</div><div class='ctx'> 		control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='del'>-		DE_ACT(("Set Layla24 clock to ADAT\n"));</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Input clock 0x%x not supported for Layla24\n", clock));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Input clock 0x%x not supported for Layla24\n", clock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;input_clock = clock;</div><div class='del'>-	return write_control_reg(chip, control_reg, TRUE);</div><div class='add'>+	return write_control_reg(chip, control_reg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -339,36 +337,36 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	short asic;</div><div class='ctx'> </div><div class='ctx'> 	/* Set clock to "internal" if it's not compatible with the new mode */</div><div class='del'>-	incompatible_clock = FALSE;</div><div class='add'>+	incompatible_clock = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_OPTICAL:</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_RCA:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_ADAT)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		asic = FW_LAYLA24_2S_ASIC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DIGITAL_MODE_ADAT:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_SPDIF)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		asic = FW_LAYLA24_2A_ASIC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Digital mode not supported: %d\n", mode));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Digital mode not supported: %d\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (incompatible_clock) {	/* Switch to 48KHz, internal */</div><div class='ctx'> 		chip-&gt;sample_rate = 48000;</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		set_input_clock(chip, ECHO_CLOCK_INTERNAL);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* switch_asic() can sleep */</div><div class='ctx'> 	if (switch_asic(chip, asic) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Tweak the control register */</div><div class='ctx'> 	control_reg = le32_to_cpu(chip-&gt;comm_page-&gt;control_register);</div><div class='hunk'>@@ -387,12 +385,11 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = write_control_reg(chip, control_reg, TRUE);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	err = write_control_reg(chip, control_reg, true);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;digital_mode = mode;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_digital_mode to %d\n", mode));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_digital_mode to %d\n", mode);</div><div class='ctx'> 	return incompatible_clock;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c<br/>index 9cdf14cfdd74..a2d4b0003b57 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mia.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mia.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mia.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/mia.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHO24_FAMILY</div><div class='hunk'>@@ -26,7 +14,7 @@</div><div class='ctx'> #define ECHOCARD_HAS_VMIXER</div><div class='ctx'> #define ECHOCARD_HAS_DIGITAL_IO</div><div class='ctx'> #define ECHOCARD_HAS_EXTERNAL_CLOCK</div><div class='del'>-#define ECHOCARD_HAS_ADAT	FALSE</div><div class='add'>+#define ECHOCARD_HAS_ADAT	false</div><div class='ctx'> #define ECHOCARD_HAS_STEREO_BIG_ENDIAN32</div><div class='ctx'> #define ECHOCARD_HAS_MIDI</div><div class='ctx'> #define ECHOCARD_HAS_LINE_OUT_GAIN</div><div class='hunk'>@@ -50,9 +38,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -62,8 +51,7 @@</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -77,13 +65,13 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "mia_dsp.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0080, 0, 0, 0},	/* DSP 56361 Mia rev.0 */</div><div class='ctx'> 	{0x1057, 0x3410, 0xECC0, 0x0081, 0, 0, 0},	/* DSP 56361 Mia rev.1 */</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c<br/>index 6ebfa6e7ab9e..8a4dffc68889 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mia_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mia_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mia_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/mia_dsp.c</a></div><div class='hunk'>@@ -41,32 +41,33 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Mia\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != MIA))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;dsp_code_to_load = FW_MIA_DSP;</div><div class='ctx'> 	/* Since this card has no ASIC, mark it as loaded so everything</div><div class='ctx'> 	   works OK */</div><div class='del'>-	chip-&gt;asic_loaded = TRUE;</div><div class='add'>+	chip-&gt;asic_loaded = true;</div><div class='ctx'> 	if ((subdevice_id &amp; 0x0000f) == MIA_MIDI_REV)</div><div class='del'>-		chip-&gt;has_midi = TRUE;</div><div class='add'>+		chip-&gt;has_midi = true;</div><div class='ctx'> 	chip-&gt;input_clock_types = ECHO_CLOCK_BIT_INTERNAL |</div><div class='ctx'> 		ECHO_CLOCK_BIT_SPDIF;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -126,7 +127,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		control_reg = MIA_32000;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: %d invalid!\n", rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d invalid!\n", rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +155,7 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_input_clock(%d)\n", clock));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_input_clock(%d)\n", clock);</div><div class='ctx'> 	if (snd_BUG_ON(clock != ECHO_CLOCK_INTERNAL &amp;&amp;</div><div class='ctx'> 		       clock != ECHO_CLOCK_SPDIF))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -181,7 +183,8 @@ static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe,</div><div class='ctx'> 	index = output * num_pipes_out(chip) + pipe;</div><div class='ctx'> 	chip-&gt;comm_page-&gt;vmixer[index] = gain;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +214,7 @@ static int update_flags(struct echoaudio *chip)</div><div class='ctx'> </div><div class='ctx'> static int set_professional_spdif(struct echoaudio *chip, char prof)</div><div class='ctx'> {</div><div class='del'>-	DE_ACT(("set_professional_spdif %d\n", prof));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_professional_spdif %d\n", prof);</div><div class='ctx'> 	if (prof)</div><div class='ctx'> 		chip-&gt;comm_page-&gt;flags |=</div><div class='ctx'> 			cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF);</div><div class='head'>diff --git a/sound/pci/echoaudio/midi.c b/sound/pci/echoaudio/midi.c<br/>index a953d142cb4b..dd5212644844 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/midi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/midi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/midi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/midi.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> /* Start and stop Midi input */</div><div class='ctx'> static int enable_midi_input(struct echoaudio *chip, char enable)</div><div class='ctx'> {</div><div class='del'>-	DE_MID(("enable_midi_input(%d)\n", enable));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "enable_midi_input(%d)\n", enable);</div><div class='ctx'> </div><div class='ctx'> 	if (wait_handshake(chip))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -74,7 +74,7 @@ static int write_midi(struct echoaudio *chip, u8 *data, int bytes)</div><div class='ctx'> 	chip-&gt;comm_page-&gt;midi_out_free_count = 0;</div><div class='ctx'> 	clear_handshake(chip);</div><div class='ctx'> 	send_vector(chip, DSP_VC_MIDI_WRITE);</div><div class='del'>-	DE_MID(("write_midi: %d\n", bytes));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "write_midi: %d\n", bytes);</div><div class='ctx'> 	return bytes;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -124,7 +124,6 @@ static int midi_service_irq(struct echoaudio *chip)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the MIDI data from the comm page */</div><div class='del'>-	i = 1;</div><div class='ctx'> 	received = 0;</div><div class='ctx'> 	for (i = 1; i &lt;= count; i++) {</div><div class='ctx'> 		/* Get the MIDI byte */</div><div class='hunk'>@@ -157,7 +156,6 @@ static int snd_echo_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;midi_in = substream;</div><div class='del'>-	DE_MID(("rawmidi_iopen\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -169,9 +167,8 @@ static void snd_echo_midi_input_trigger(struct snd_rawmidi_substream *substream,</div><div class='ctx'> 	struct echoaudio *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (up != chip-&gt;midi_input_enabled) {</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+		guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> 		enable_midi_input(chip, up);</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		chip-&gt;midi_input_enabled = up;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -183,7 +180,6 @@ static int snd_echo_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;midi_in = NULL;</div><div class='del'>-	DE_MID(("rawmidi_iclose\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -196,42 +192,40 @@ static int snd_echo_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	chip-&gt;tinuse = 0;</div><div class='ctx'> 	chip-&gt;midi_full = 0;</div><div class='ctx'> 	chip-&gt;midi_out = substream;</div><div class='del'>-	DE_MID(("rawmidi_oopen\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void snd_echo_midi_output_write(unsigned long data)</div><div class='add'>+static void snd_echo_midi_output_write(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct echoaudio *chip = (struct echoaudio *)data;</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	struct echoaudio *chip = timer_container_of(chip, t, timer);</div><div class='ctx'> 	int bytes, sent, time;</div><div class='ctx'> 	unsigned char buf[MIDI_OUT_BUFFER_SIZE - 1];</div><div class='ctx'> </div><div class='del'>-	DE_MID(("snd_echo_midi_output_write\n"));</div><div class='ctx'> 	/* No interrupts are involved: we have to check at regular intervals</div><div class='ctx'> 	if the card's output buffer has room for new data. */</div><div class='del'>-	sent = bytes = 0;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	sent = 0;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;lock);</div><div class='ctx'> 	chip-&gt;midi_full = 0;</div><div class='ctx'> 	if (!snd_rawmidi_transmit_empty(chip-&gt;midi_out)) {</div><div class='ctx'> 		bytes = snd_rawmidi_transmit_peek(chip-&gt;midi_out, buf,</div><div class='ctx'> 						  MIDI_OUT_BUFFER_SIZE - 1);</div><div class='del'>-		DE_MID(("Try to send %d bytes...\n", bytes));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Try to send %d bytes...\n", bytes);</div><div class='ctx'> 		sent = write_midi(chip, buf, bytes);</div><div class='ctx'> 		if (sent &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "write_midi() error %d\n", sent);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"write_midi() error %d\n", sent);</div><div class='ctx'> 			/* retry later */</div><div class='ctx'> 			sent = 9000;</div><div class='ctx'> 			chip-&gt;midi_full = 1;</div><div class='ctx'> 		} else if (sent &gt; 0) {</div><div class='del'>-			DE_MID(("%d bytes sent\n", sent));</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "%d bytes sent\n", sent);</div><div class='ctx'> 			snd_rawmidi_transmit_ack(chip-&gt;midi_out, sent);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Buffer is full. DSP's internal buffer is 64 (128 ?)</div><div class='ctx'> 			bytes long. Let's wait until half of them are sent */</div><div class='del'>-			DE_MID(("Full\n"));</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "Full\n");</div><div class='ctx'> 			sent = 32;</div><div class='ctx'> 			chip-&gt;midi_full = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -243,9 +237,9 @@ static void snd_echo_midi_output_write(unsigned long data)</div><div class='ctx'> 		   sent */</div><div class='ctx'> 		time = (sent &lt;&lt; 3) / 25 + 1;	/* 8/25=0.32ms to send a byte */</div><div class='ctx'> 		mod_timer(&amp;chip-&gt;timer, jiffies + (time * HZ + 999) / 1000);</div><div class='del'>-		DE_MID(("Timer armed(%d)\n", ((time * HZ + 999) / 1000)));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Timer armed(%d)\n", ((time * HZ + 999) / 1000));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -254,29 +248,32 @@ static void snd_echo_midi_output_trigger(struct snd_rawmidi_substream *substream</div><div class='ctx'> 					 int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct echoaudio *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	DE_MID(("snd_echo_midi_output_trigger(%d)\n", up));</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='del'>-	if (up) {</div><div class='del'>-		if (!chip-&gt;tinuse) {</div><div class='del'>-			init_timer(&amp;chip-&gt;timer);</div><div class='del'>-			chip-&gt;timer.function = snd_echo_midi_output_write;</div><div class='del'>-			chip-&gt;timer.data = (unsigned long)chip;</div><div class='del'>-			chip-&gt;tinuse = 1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (chip-&gt;tinuse) {</div><div class='del'>-			chip-&gt;tinuse = 0;</div><div class='del'>-			spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='del'>-			del_timer_sync(&amp;chip-&gt;timer);</div><div class='del'>-			DE_MID(("Timer removed\n"));</div><div class='del'>-			return;</div><div class='add'>+	bool remove_timer = false;</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "snd_echo_midi_output_trigger(%d)\n", up);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;lock) {</div><div class='add'>+		if (up) {</div><div class='add'>+			if (!chip-&gt;tinuse) {</div><div class='add'>+				timer_setup(&amp;chip-&gt;timer, snd_echo_midi_output_write,</div><div class='add'>+					    0);</div><div class='add'>+				chip-&gt;tinuse = 1;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (chip-&gt;tinuse) {</div><div class='add'>+				chip-&gt;tinuse = 0;</div><div class='add'>+				remove_timer = true;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (remove_timer) {</div><div class='add'>+		timer_delete_sync(&amp;chip-&gt;timer);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Timer removed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (up &amp;&amp; !chip-&gt;midi_full)</div><div class='del'>-		snd_echo_midi_output_write((unsigned long)chip);</div><div class='add'>+		snd_echo_midi_output_write(&amp;chip-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -286,19 +283,18 @@ static int snd_echo_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	struct echoaudio *chip = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;midi_out = NULL;</div><div class='del'>-	DE_MID(("rawmidi_oclose\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_echo_midi_input = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_echo_midi_input = {</div><div class='ctx'> 	.open = snd_echo_midi_input_open,</div><div class='ctx'> 	.close = snd_echo_midi_input_close,</div><div class='ctx'> 	.trigger = snd_echo_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_echo_midi_output = {</div><div class='add'>+static const struct snd_rawmidi_ops snd_echo_midi_output = {</div><div class='ctx'> 	.open = snd_echo_midi_output_open,</div><div class='ctx'> 	.close = snd_echo_midi_output_close,</div><div class='ctx'> 	.trigger = snd_echo_midi_output_trigger,</div><div class='hunk'>@@ -307,16 +303,16 @@ static struct snd_rawmidi_ops snd_echo_midi_output = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* &lt;--snd_echo_probe() */</div><div class='del'>-static int __devinit snd_echo_midi_create(struct snd_card *card,</div><div class='del'>-					  struct echoaudio *chip)</div><div class='add'>+static int snd_echo_midi_create(struct snd_card *card,</div><div class='add'>+				struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_rawmidi_new(card, card-&gt;shortname, 0, 1, 1,</div><div class='del'>-				   &amp;chip-&gt;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(card, card-&gt;shortname, 0, 1, 1, &amp;chip-&gt;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	strcpy(chip-&gt;rmidi-&gt;name, card-&gt;shortname);</div><div class='add'>+	strscpy(chip-&gt;rmidi-&gt;name, card-&gt;shortname);</div><div class='ctx'> 	chip-&gt;rmidi-&gt;private_data = chip;</div><div class='ctx'> </div><div class='ctx'> 	snd_rawmidi_set_ops(chip-&gt;rmidi, SNDRV_RAWMIDI_STREAM_INPUT,</div><div class='hunk'>@@ -326,6 +322,5 @@ static int __devinit snd_echo_midi_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='ctx'> 		SNDRV_RAWMIDI_INFO_INPUT | SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='del'>-	DE_INIT(("MIDI ok\n"));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c<br/>index 1047be405ebe..1b45a2b5066f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mona.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mona.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mona.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/mona.c</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  ALSA driver for Echoaudio soundcards.</div><div class='ctx'>  *  Copyright (C) 2003-2004 Giuliano Pochini &lt;pochini@shiny.it&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define ECHO24_FAMILY</div><div class='hunk'>@@ -48,9 +36,10 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -59,8 +48,7 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> #include "echoaudio.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_FIRMWARE("ea/loader_dsp.fw");</div><div class='hunk'>@@ -92,7 +80,7 @@ static const struct firmware card_fw[] = {</div><div class='ctx'> 	{0, "mona_2_asic.fw"}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='add'>+static const struct pci_device_id snd_echo_ids[] = {</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0070, 0, 0, 0},	/* DSP 56301 Mona rev.0 */</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0071, 0, 0, 0},	/* DSP 56301 Mona rev.1 */</div><div class='ctx'> 	{0x1057, 0x1801, 0xECC0, 0x0072, 0, 0, 0},	/* DSP 56301 Mona rev.2 */</div><div class='hunk'>@@ -102,7 +90,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='add'>+static const struct snd_pcm_hardware pcm_hardware_skel = {</div><div class='ctx'> 	.info = SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 		SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 		SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='head'>diff --git a/sound/pci/echoaudio/mona_dsp.c b/sound/pci/echoaudio/mona_dsp.c<br/>index 6e6a7eb555b8..9bb6a174745c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mona_dsp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/echoaudio/mona_dsp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/echoaudio/mona_dsp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/echoaudio/mona_dsp.c</a></div><div class='hunk'>@@ -41,18 +41,19 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw() - Mona\n"));</div><div class='ctx'> 	if (snd_BUG_ON((subdevice_id &amp; 0xfff0) != MONA))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if ((err = init_dsp_comm_page(chip))) {</div><div class='del'>-		DE_INIT(("init_hw - could not initialize DSP comm page\n"));</div><div class='add'>+	err = init_dsp_comm_page(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"init_hw - could not initialize DSP comm page\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_id = device_id;</div><div class='ctx'> 	chip-&gt;subdevice_id = subdevice_id;</div><div class='del'>-	chip-&gt;bad_board = TRUE;</div><div class='add'>+	chip-&gt;bad_board = true;</div><div class='ctx'> 	chip-&gt;input_clock_types =</div><div class='ctx'> 		ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF |</div><div class='ctx'> 		ECHO_CLOCK_BIT_WORD | ECHO_CLOCK_BIT_ADAT;</div><div class='hunk'>@@ -67,11 +68,11 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;dsp_code_to_load = FW_MONA_301_DSP;</div><div class='ctx'> </div><div class='del'>-	if ((err = load_firmware(chip)) &lt; 0)</div><div class='add'>+	err = load_firmware(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;bad_board = FALSE;</div><div class='add'>+	chip-&gt;bad_board = false;</div><div class='ctx'> </div><div class='del'>-	DE_INIT(("init_hw done\n"));</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,8 +81,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id)</div><div class='ctx'> static int set_mixer_defaults(struct echoaudio *chip)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;digital_mode = DIGITAL_MODE_SPDIF_RCA;</div><div class='del'>-	chip-&gt;professional_spdif = FALSE;</div><div class='del'>-	chip-&gt;digital_in_automute = TRUE;</div><div class='add'>+	chip-&gt;professional_spdif = false;</div><div class='add'>+	chip-&gt;digital_in_automute = true;</div><div class='ctx'> 	return init_line_levels(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,7 +150,7 @@ static int load_asic(struct echoaudio *chip)</div><div class='ctx'> 	   48 kHz, internal clock, S/PDIF RCA mode */</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		control_reg = GML_CONVERTER_ENABLE | GML_48KHZ;</div><div class='del'>-		err = write_control_reg(chip, control_reg, TRUE);</div><div class='add'>+		err = write_control_reg(chip, control_reg, true);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -202,8 +203,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	/* Only set the clock for internal mode. */</div><div class='ctx'> 	if (chip-&gt;input_clock != ECHO_CLOCK_INTERNAL) {</div><div class='del'>-		DE_ACT(("set_sample_rate: Cannot set sample rate - "</div><div class='del'>-			"clock not set to CLK_CLOCKININTERNAL\n"));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Cannot set sample rate - clock not set to CLK_CLOCKININTERNAL\n");</div><div class='ctx'> 		/* Save the rate anyhow */</div><div class='ctx'> 		chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);</div><div class='ctx'> 		chip-&gt;sample_rate = rate;</div><div class='hunk'>@@ -279,7 +280,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> 		clock = GML_8KHZ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("set_sample_rate: %d invalid!\n", rate));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"set_sample_rate: %d invalid!\n", rate);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -287,7 +289,8 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;comm_page-&gt;sample_rate = cpu_to_le32(rate);	/* ignored by the DSP */</div><div class='ctx'> 	chip-&gt;sample_rate = rate;</div><div class='del'>-	DE_ACT(("set_sample_rate: %d clock %d\n", rate, clock));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_sample_rate: %d clock %d\n", rate, clock);</div><div class='ctx'> </div><div class='ctx'> 	return write_control_reg(chip, control_reg, force_write);</div><div class='ctx'> }</div><div class='hunk'>@@ -299,12 +302,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 	u32 control_reg, clocks_from_dsp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_input_clock:\n"));</div><div class='del'>-</div><div class='del'>-	/* Prevent two simultaneous calls to switch_asic() */</div><div class='del'>-	if (atomic_read(&amp;chip-&gt;opencount))</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='ctx'> 	/* Mask off the clock select bits */</div><div class='ctx'> 	control_reg = le32_to_cpu(chip-&gt;comm_page-&gt;control_register) &amp;</div><div class='ctx'> 		GML_CLOCK_CLEAR_MASK;</div><div class='hunk'>@@ -312,7 +309,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> </div><div class='ctx'> 	switch (clock) {</div><div class='ctx'> 	case ECHO_CLOCK_INTERNAL:</div><div class='del'>-		DE_ACT(("Set Mona clock to INTERNAL\n"));</div><div class='ctx'> 		chip-&gt;input_clock = ECHO_CLOCK_INTERNAL;</div><div class='ctx'> 		return set_sample_rate(chip, chip-&gt;sample_rate);</div><div class='ctx'> 	case ECHO_CLOCK_SPDIF:</div><div class='hunk'>@@ -324,7 +320,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 		spin_lock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		DE_ACT(("Set Mona clock to SPDIF\n"));</div><div class='ctx'> 		control_reg |= GML_SPDIF_CLOCK;</div><div class='ctx'> 		if (clocks_from_dsp &amp; GML_CLOCK_DETECT_BIT_SPDIF96)</div><div class='ctx'> 			control_reg |= GML_DOUBLE_SPEED_MODE;</div><div class='hunk'>@@ -332,7 +327,6 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 			control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_WORD:</div><div class='del'>-		DE_ACT(("Set Mona clock to WORD\n"));</div><div class='ctx'> 		spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='ctx'> 		err = switch_asic(chip, clocks_from_dsp &amp;</div><div class='ctx'> 				  GML_CLOCK_DETECT_BIT_WORD96);</div><div class='hunk'>@@ -346,19 +340,20 @@ static int set_input_clock(struct echoaudio *chip, u16 clock)</div><div class='ctx'> 			control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ECHO_CLOCK_ADAT:</div><div class='del'>-		DE_ACT(("Set Mona clock to ADAT\n"));</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Set Mona clock to ADAT\n");</div><div class='ctx'> 		if (chip-&gt;digital_mode != DIGITAL_MODE_ADAT)</div><div class='ctx'> 			return -EAGAIN;</div><div class='ctx'> 		control_reg |= GML_ADAT_CLOCK;</div><div class='ctx'> 		control_reg &amp;= ~GML_DOUBLE_SPEED_MODE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Input clock 0x%x not supported for Mona\n", clock));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Input clock 0x%x not supported for Mona\n", clock);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;input_clock = clock;</div><div class='del'>-	return write_control_reg(chip, control_reg, TRUE);</div><div class='add'>+	return write_control_reg(chip, control_reg, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -369,23 +364,24 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 	int err, incompatible_clock;</div><div class='ctx'> </div><div class='ctx'> 	/* Set clock to "internal" if it's not compatible with the new mode */</div><div class='del'>-	incompatible_clock = FALSE;</div><div class='add'>+	incompatible_clock = false;</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_OPTICAL:</div><div class='ctx'> 	case DIGITAL_MODE_SPDIF_RCA:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_ADAT)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case DIGITAL_MODE_ADAT:</div><div class='ctx'> 		if (chip-&gt;input_clock == ECHO_CLOCK_SPDIF)</div><div class='del'>-			incompatible_clock = TRUE;</div><div class='add'>+			incompatible_clock = true;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		DE_ACT(("Digital mode not supported: %d\n", mode));</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Digital mode not supported: %d\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (incompatible_clock) {	/* Switch to 48KHz, internal */</div><div class='ctx'> 		chip-&gt;sample_rate = 48000;</div><div class='hunk'>@@ -416,12 +412,11 @@ static int dsp_set_digital_mode(struct echoaudio *chip, u8 mode)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = write_control_reg(chip, control_reg, FALSE);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;lock);</div><div class='add'>+	err = write_control_reg(chip, control_reg, false);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	chip-&gt;digital_mode = mode;</div><div class='ctx'> </div><div class='del'>-	DE_ACT(("set_digital_mode to %d\n", mode));</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set_digital_mode to %d\n", mode);</div><div class='ctx'> 	return incompatible_clock;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile<br/>index fc5591e7777e..1f325abcb3ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/Makefile</a></div><div class='hunk'>@@ -1,13 +1,15 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-emu10k1-objs := emu10k1.o emu10k1_main.o \</div><div class='add'>+snd-emu10k1-y := emu10k1.o emu10k1_main.o \</div><div class='ctx'> 		    irq.o memory.o voice.o emumpu401.o emupcm.o io.o \</div><div class='del'>-		    emuproc.o emumixer.o emufx.o timer.o p16v.o</div><div class='del'>-snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o</div><div class='del'>-snd-emu10k1x-objs := emu10k1x.o</div><div class='add'>+		    emumixer.o emufx.o timer.o p16v.o</div><div class='add'>+snd-emu10k1-$(CONFIG_SND_PROC_FS) += emuproc.o</div><div class='add'>+snd-emu10k1-synth-y := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o</div><div class='add'>+snd-emu10k1x-y := emu10k1x.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c<br/>index aff8387c45cf..548e7d049901 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1.c</a></div><div class='hunk'>@@ -1,32 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  The driver for the EMU10K1 (SB Live!) based soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='del'>- *      Added support for Audigy 2 Value.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- * </div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='hunk'>@@ -34,25 +17,22 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("EMU10K1");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS},"</div><div class='del'>-	       "{Creative Labs,SB Audigy}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) &amp;&amp; defined(CONFIG_SND_SEQUENCER_MODULE))</div><div class='add'>+#if IS_ENABLED(CONFIG_SND_SEQUENCER)</div><div class='ctx'> #define ENABLE_SYNTH</div><div class='ctx'> #include &lt;sound/emu10k1_synth.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> static int extin[SNDRV_CARDS];</div><div class='ctx'> static int extout[SNDRV_CARDS];</div><div class='ctx'> static int seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};</div><div class='ctx'> static int max_synth_voices[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 64};</div><div class='ctx'> static int max_buffer_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 128};</div><div class='del'>-static int enable_ir[SNDRV_CARDS];</div><div class='add'>+static bool enable_ir[SNDRV_CARDS];</div><div class='ctx'> static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */</div><div class='del'>-static uint delay_pcm_irq[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for the EMU10K1 soundcard.");</div><div class='hunk'>@@ -74,33 +54,20 @@ module_param_array(enable_ir, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable_ir, "Enable IR.");</div><div class='ctx'> module_param_array(subsystem, uint, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(subsystem, "Force card subsystem model.");</div><div class='del'>-module_param_array(delay_pcm_irq, uint, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(delay_pcm_irq, "Delay PCM interrupt by specified number of samples (default 0).");</div><div class='ctx'> /*</div><div class='ctx'>  * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -&gt; Audigy2 Value  Model:SB0400</div><div class='ctx'>  */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = {</div><div class='add'>+static const struct pci_device_id snd_emu10k1_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CREATIVE, 0x0002), 0 },	/* EMU10K1 */</div><div class='ctx'> 	{ PCI_VDEVICE(CREATIVE, 0x0004), 1 },	/* Audigy */</div><div class='ctx'> 	{ PCI_VDEVICE(CREATIVE, 0x0008), 1 },	/* Audigy 2 Value SB0400 */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Audigy 2 Value notes:</div><div class='del'>- * A_IOCFG Input (GPIO)</div><div class='del'>- * 0x400  = Front analog jack plugged in. (Green socket)</div><div class='del'>- * 0x1000 = Read analog jack plugged in. (Black socket)</div><div class='del'>- * 0x2000 = Center/LFE analog jack plugged in. (Orange socket)</div><div class='del'>- * A_IOCFG Output (GPIO)</div><div class='del'>- * 0x60 = Sound out of front Left.</div><div class='del'>- * Win sets it to 0xXX61</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,</div><div class='del'>-					    const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_card_emu10k1_probe(struct pci_dev *pci,</div><div class='add'>+				  const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -117,63 +84,78 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*emu), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	emu = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	if (max_buffer_size[dev] &lt; 32)</div><div class='ctx'> 		max_buffer_size[dev] = 32;</div><div class='ctx'> 	else if (max_buffer_size[dev] &gt; 1024)</div><div class='ctx'> 		max_buffer_size[dev] = 1024;</div><div class='del'>-	if ((err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],</div><div class='del'>-				      (long)max_buffer_size[dev] * 1024 * 1024,</div><div class='del'>-				      enable_ir[dev], subsystem[dev],</div><div class='del'>-				      &amp;emu)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	card-&gt;private_data = emu;</div><div class='del'>-	emu-&gt;delay_pcm_irq = delay_pcm_irq[dev] &amp; 0x1f;</div><div class='del'>-	if ((err = snd_emu10k1_pcm(emu, 0, NULL)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],</div><div class='add'>+				 (long)max_buffer_size[dev] * 1024 * 1024,</div><div class='add'>+				 enable_ir[dev], subsystem[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_emu10k1_pcm(emu, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;ac97_chip) {</div><div class='add'>+		err = snd_emu10k1_pcm_mic(emu, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	err = snd_emu10k1_pcm_efx(emu, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	/* This stores the periods table. */</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* P16V */	</div><div class='del'>-		if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-					       1024, &amp;emu-&gt;p16v_buffer)) &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+		emu-&gt;p16v_buffer =</div><div class='add'>+			snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV, 1024);</div><div class='add'>+		if (!emu-&gt;p16v_buffer)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1_mixer(emu, 0, 3)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_emu10k1_mixer(emu, 0, 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_emu10k1_timer(emu, 0)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_emu10k1_timer(emu, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_emu10k1_pcm_multi(emu, 3);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* P16V */</div><div class='del'>-		if ((err = snd_p16v_pcm(emu, 4, NULL)) &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+		err = snd_p16v_pcm(emu, 4);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;audigy) {</div><div class='del'>-		if ((err = snd_emu10k1_audigy_midi(emu)) &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+		err = snd_emu10k1_audigy_midi(emu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((err = snd_emu10k1_midi(emu)) &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+		err = snd_emu10k1_midi(emu);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_emu10k1_fx8010_new(emu, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> #ifdef ENABLE_SYNTH</div><div class='ctx'> 	if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,</div><div class='ctx'> 			       sizeof(struct snd_emu10k1_synth_arg), &amp;wave) &lt; 0 ||</div><div class='ctx'> 	    wave == NULL) {</div><div class='del'>-		snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n");</div><div class='add'>+		dev_warn(emu-&gt;card-&gt;dev,</div><div class='add'>+			 "can't initialize Emu10k1 wavetable synth\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct snd_emu10k1_synth_arg *arg;</div><div class='ctx'> 		arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);</div><div class='del'>-		strcpy(wave-&gt;name, "Emu-10k1 Synth");</div><div class='add'>+		strscpy(wave-&gt;name, "Emu-10k1 Synth");</div><div class='ctx'> 		arg-&gt;hwptr = emu;</div><div class='ctx'> 		arg-&gt;index = 1;</div><div class='ctx'> 		arg-&gt;seq_ports = seq_ports[dev];</div><div class='hunk'>@@ -181,44 +163,34 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'>  </div><div class='del'>-	strcpy(card-&gt;driver, emu-&gt;card_capabilities-&gt;driver);</div><div class='del'>-	strcpy(card-&gt;shortname, emu-&gt;card_capabilities-&gt;name);</div><div class='add'>+	strscpy(card-&gt;driver, emu-&gt;card_capabilities-&gt;driver,</div><div class='add'>+		sizeof(card-&gt;driver));</div><div class='add'>+	strscpy(card-&gt;shortname, emu-&gt;card_capabilities-&gt;name,</div><div class='add'>+		sizeof(card-&gt;shortname));</div><div class='ctx'> 	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='ctx'> 		 "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",</div><div class='ctx'> 		 card-&gt;shortname, emu-&gt;revision, emu-&gt;serial, emu-&gt;port, emu-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int snd_emu10k1_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_emu10k1 *emu = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(emu-&gt;pcm);</div><div class='del'>-	snd_pcm_suspend_all(emu-&gt;pcm_mic);</div><div class='del'>-	snd_pcm_suspend_all(emu-&gt;pcm_efx);</div><div class='del'>-	snd_pcm_suspend_all(emu-&gt;pcm_multi);</div><div class='del'>-	snd_pcm_suspend_all(emu-&gt;pcm_p16v);</div><div class='add'>+	emu-&gt;suspend = 1;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;emu-&gt;emu1010.work);</div><div class='ctx'> </div><div class='ctx'> 	snd_ac97_suspend(emu-&gt;ac97);</div><div class='ctx'> </div><div class='hunk'>@@ -228,28 +200,14 @@ static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 		snd_p16v_suspend(emu);</div><div class='ctx'> </div><div class='ctx'> 	snd_emu10k1_done(emu);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_emu10k1_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_emu10k1 *emu = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "emu10k1: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_emu10k1_resume_init(emu);</div><div class='ctx'> 	snd_emu10k1_efx_resume(emu);</div><div class='ctx'> 	snd_ac97_resume(emu-&gt;ac97);</div><div class='hunk'>@@ -258,31 +216,26 @@ static int snd_emu10k1_resume(struct pci_dev *pci)</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca0151_chip)</div><div class='ctx'> 		snd_p16v_resume(emu);</div><div class='ctx'> </div><div class='add'>+	emu-&gt;suspend = 0;</div><div class='add'>+</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "EMU10K1_Audigy",</div><div class='add'>+static SIMPLE_DEV_PM_OPS(snd_emu10k1_pm, snd_emu10k1_suspend, snd_emu10k1_resume);</div><div class='add'>+#define SND_EMU10K1_PM_OPS	&amp;snd_emu10k1_pm</div><div class='add'>+#else</div><div class='add'>+#define SND_EMU10K1_PM_OPS	NULL</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static struct pci_driver emu10k1_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_emu10k1_ids,</div><div class='ctx'> 	.probe = snd_card_emu10k1_probe,</div><div class='del'>-	.remove = __devexit_p(snd_card_emu10k1_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_emu10k1_suspend,</div><div class='del'>-	.resume = snd_emu10k1_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = SND_EMU10K1_PM_OPS,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_emu10k1_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_emu10k1_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_emu10k1_init)</div><div class='del'>-module_exit(alsa_card_emu10k1_exit)</div><div class='add'>+module_pci_driver(emu10k1_driver);</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c<br/>index 7ef949d99a50..ef26e4d3e2a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_callback.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_callback.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_callback.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1_callback.c</a></div><div class='hunk'>@@ -1,23 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  synth callback routines for Emu10k1</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "emu10k1_synth_local.h"</div><div class='ctx'> #include &lt;sound/asoundef.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -45,9 +33,9 @@ static void release_voice(struct snd_emux_voice *vp);</div><div class='ctx'> static void update_voice(struct snd_emux_voice *vp, int update);</div><div class='ctx'> static void terminate_voice(struct snd_emux_voice *vp);</div><div class='ctx'> static void free_voice(struct snd_emux_voice *vp);</div><div class='del'>-static void set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);</div><div class='del'>-static void set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);</div><div class='del'>-static void set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);</div><div class='add'>+static u32 make_fmmod(struct snd_emux_voice *vp);</div><div class='add'>+static u32 make_fm2frq2(struct snd_emux_voice *vp);</div><div class='add'>+static int get_pitch_shift(struct snd_emux *emu);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Ensure a value is between two points</div><div class='hunk'>@@ -60,7 +48,7 @@ static void set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);</div><div class='ctx'> /*</div><div class='ctx'>  * set up operators</div><div class='ctx'>  */</div><div class='del'>-static struct snd_emux_operators emu10k1_ops = {</div><div class='add'>+static const struct snd_emux_operators emu10k1_ops = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='ctx'> 	.get_voice =	get_voice,</div><div class='ctx'> 	.prepare =	start_voice,</div><div class='hunk'>@@ -71,6 +59,7 @@ static struct snd_emux_operators emu10k1_ops = {</div><div class='ctx'> 	.free_voice =	free_voice,</div><div class='ctx'> 	.sample_new =	snd_emu10k1_sample_new,</div><div class='ctx'> 	.sample_free =	snd_emu10k1_sample_free,</div><div class='add'>+	.get_pitch_shift = get_pitch_shift,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void</div><div class='hunk'>@@ -84,6 +73,8 @@ snd_emu10k1_ops_setup(struct snd_emux *emux)</div><div class='ctx'>  * get more voice for pcm</div><div class='ctx'>  *</div><div class='ctx'>  * terminate most inactive voice and give it as a pcm voice.</div><div class='add'>+ *</div><div class='add'>+ * voice_lock is already held.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='ctx'> snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)</div><div class='hunk'>@@ -91,20 +82,19 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)</div><div class='ctx'> 	struct snd_emux *emu;</div><div class='ctx'> 	struct snd_emux_voice *vp;</div><div class='ctx'> 	struct best_voice best[V_END];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	emu = hw-&gt;synth;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;voice_lock, flags);</div><div class='ctx'> 	lookup_voices(emu, hw, best, 1); /* no OFF voices */</div><div class='ctx'> 	for (i = 0; i &lt; V_END; i++) {</div><div class='ctx'> 		if (best[i].voice &gt;= 0) {</div><div class='ctx'> 			int ch;</div><div class='ctx'> 			vp = &amp;emu-&gt;voices[best[i].voice];</div><div class='del'>-			if ((ch = vp-&gt;ch) &lt; 0) {</div><div class='add'>+			ch = vp-&gt;ch;</div><div class='add'>+			if (ch &lt; 0) {</div><div class='ctx'> 				/*</div><div class='del'>-				printk(KERN_WARNING</div><div class='add'>+				dev_warn(emu-&gt;card-&gt;dev,</div><div class='ctx'> 				       "synth_get_voice: ch &lt; 0 (%d) ??", i);</div><div class='ctx'> 				*/</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -112,11 +102,9 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)</div><div class='ctx'> 			vp-&gt;emu-&gt;num_voices--;</div><div class='ctx'> 			vp-&gt;ch = -1;</div><div class='ctx'> 			vp-&gt;state = SNDRV_EMUX_ST_OFF;</div><div class='del'>-			spin_unlock_irqrestore(&amp;emu-&gt;voice_lock, flags);</div><div class='ctx'> 			return ch;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;voice_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* not found */</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -129,14 +117,13 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)</div><div class='ctx'> static void</div><div class='ctx'> release_voice(struct snd_emux_voice *vp)</div><div class='ctx'> {</div><div class='del'>-	int dcysusv;</div><div class='ctx'> 	struct snd_emu10k1 *hw;</div><div class='ctx'> 	</div><div class='ctx'> 	hw = vp-&gt;hw;</div><div class='del'>-	dcysusv = 0x8000 | (unsigned char)vp-&gt;reg.parm.modrelease;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSM, vp-&gt;ch, dcysusv);</div><div class='del'>-	dcysusv = 0x8000 | (unsigned char)vp-&gt;reg.parm.volrelease | DCYSUSV_CHANNELENABLE_MASK;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSV, vp-&gt;ch, dcysusv);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(hw, vp-&gt;ch,</div><div class='add'>+		DCYSUSM, (unsigned char)vp-&gt;reg.parm.modrelease | DCYSUSM_PHASE1_MASK,</div><div class='add'>+		DCYSUSV, (unsigned char)vp-&gt;reg.parm.volrelease | DCYSUSV_PHASE1_MASK | DCYSUSV_CHANNELENABLE_MASK,</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +138,13 @@ terminate_voice(struct snd_emux_voice *vp)</div><div class='ctx'> 	if (snd_BUG_ON(!vp))</div><div class='ctx'> 		return;</div><div class='ctx'> 	hw = vp-&gt;hw;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSV, vp-&gt;ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(hw, vp-&gt;ch,</div><div class='add'>+		DCYSUSV, 0,</div><div class='add'>+		VTFT, VTFT_FILTERTARGET_MASK,</div><div class='add'>+		CVCF, CVCF_CURRENTFILTER_MASK,</div><div class='add'>+		PTRX, 0,</div><div class='add'>+		CPF, 0,</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> 	if (vp-&gt;block) {</div><div class='ctx'> 		struct snd_emu10k1_memblk *emem;</div><div class='ctx'> 		emem = (struct snd_emu10k1_memblk *)vp-&gt;block;</div><div class='hunk'>@@ -174,11 +167,6 @@ free_voice(struct snd_emux_voice *vp)</div><div class='ctx'> 	/* Problem apparent on plug, unplug then plug */</div><div class='ctx'> 	/* on the Audigy 2 ZS Notebook. */</div><div class='ctx'> 	if (hw &amp;&amp; (vp-&gt;ch &gt;= 0)) {</div><div class='del'>-		snd_emu10k1_ptr_write(hw, IFATN, vp-&gt;ch, 0xff00);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, DCYSUSV, vp-&gt;ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);</div><div class='del'>-		// snd_emu10k1_ptr_write(hw, DCYSUSV, vp-&gt;ch, 0);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, VTFT, vp-&gt;ch, 0xffff);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, CVCF, vp-&gt;ch, 0xffff);</div><div class='ctx'> 		snd_emu10k1_voice_free(hw, &amp;hw-&gt;voices[vp-&gt;ch]);</div><div class='ctx'> 		vp-&gt;emu-&gt;num_voices--;</div><div class='ctx'> 		vp-&gt;ch = -1;</div><div class='hunk'>@@ -204,13 +192,13 @@ update_voice(struct snd_emux_voice *vp, int update)</div><div class='ctx'> 		snd_emu10k1_ptr_write(hw, PTRX_FXSENDAMOUNT_B, vp-&gt;ch, vp-&gt;aaux);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (update &amp; SNDRV_EMUX_UPDATE_FMMOD)</div><div class='del'>-		set_fmmod(hw, vp);</div><div class='add'>+		snd_emu10k1_ptr_write(hw, FMMOD, vp-&gt;ch, make_fmmod(vp));</div><div class='ctx'> 	if (update &amp; SNDRV_EMUX_UPDATE_TREMFREQ)</div><div class='ctx'> 		snd_emu10k1_ptr_write(hw, TREMFRQ, vp-&gt;ch, vp-&gt;reg.parm.tremfrq);</div><div class='ctx'> 	if (update &amp; SNDRV_EMUX_UPDATE_FM2FRQ2)</div><div class='del'>-		set_fm2frq2(hw, vp);</div><div class='add'>+		snd_emu10k1_ptr_write(hw, FM2FRQ2, vp-&gt;ch, make_fm2frq2(vp));</div><div class='ctx'> 	if (update &amp; SNDRV_EMUX_UPDATE_Q)</div><div class='del'>-		set_filterQ(hw, vp);</div><div class='add'>+		snd_emu10k1_ptr_write(hw, CCCA_RESONANCE, vp-&gt;ch, vp-&gt;reg.parm.filterQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +215,7 @@ lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw,</div><div class='ctx'> 	int  i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; V_END; i++) {</div><div class='del'>-		best[i].time = (unsigned int)-1; /* XXX MAX_?INT really */;</div><div class='add'>+		best[i].time = (unsigned int)-1; /* XXX MAX_?INT really */</div><div class='ctx'> 		best[i].voice = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +255,7 @@ lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw,</div><div class='ctx'> 		/* check if sample is finished playing (non-looping only) */</div><div class='ctx'> 		if (bp != best + V_OFF &amp;&amp; bp != best + V_FREE &amp;&amp;</div><div class='ctx'> 		    (vp-&gt;reg.sample_mode &amp; SNDRV_SFNT_SAMPLE_SINGLESHOT)) {</div><div class='del'>-			val = snd_emu10k1_ptr_read(hw, CCCA_CURRADDR, vp-&gt;ch);</div><div class='add'>+			val = snd_emu10k1_ptr_read(hw, CCCA_CURRADDR, vp-&gt;ch) - 64 + 3;</div><div class='ctx'> 			if (val &gt;= vp-&gt;reg.loopstart)</div><div class='ctx'> 				bp = best + V_OFF;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -301,7 +289,7 @@ get_voice(struct snd_emux *emu, struct snd_emux_port *port)</div><div class='ctx'> 			if (vp-&gt;ch &lt; 0) {</div><div class='ctx'> 				/* allocate a voice */</div><div class='ctx'> 				struct snd_emu10k1_voice *hwvoice;</div><div class='del'>-				if (snd_emu10k1_voice_alloc(hw, EMU10K1_SYNTH, 1, &amp;hwvoice) &lt; 0 || hwvoice == NULL)</div><div class='add'>+				if (snd_emu10k1_voice_alloc(hw, EMU10K1_SYNTH, 1, 1, NULL, &amp;hwvoice) &lt; 0)</div><div class='ctx'> 					continue;</div><div class='ctx'> 				vp-&gt;ch = hwvoice-&gt;number;</div><div class='ctx'> 				emu-&gt;num_voices++;</div><div class='hunk'>@@ -322,6 +310,8 @@ start_voice(struct snd_emux_voice *vp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int temp;</div><div class='ctx'> 	int ch;</div><div class='add'>+	bool w_16;</div><div class='add'>+	u32 psst, dsl, map, ccca, vtarget;</div><div class='ctx'> 	unsigned int addr, mapped_offset;</div><div class='ctx'> 	struct snd_midi_channel *chan;</div><div class='ctx'> 	struct snd_emu10k1 *hw;</div><div class='hunk'>@@ -332,16 +322,17 @@ start_voice(struct snd_emux_voice *vp)</div><div class='ctx'> 	if (snd_BUG_ON(ch &lt; 0))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	chan = vp-&gt;chan;</div><div class='add'>+	w_16 = !(vp-&gt;reg.sample_mode &amp; SNDRV_SFNT_SAMPLE_8BITS);</div><div class='ctx'> </div><div class='ctx'> 	emem = (struct snd_emu10k1_memblk *)vp-&gt;block;</div><div class='ctx'> 	if (emem == NULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	emem-&gt;map_locked++;</div><div class='ctx'> 	if (snd_emu10k1_memblk_map(hw, emem) &lt; 0) {</div><div class='del'>-		/* printk(KERN_ERR "emu: cannot map!\n"); */</div><div class='add'>+		/* dev_err(hw-&gt;card-&gt;devK, "emu: cannot map!\n"); */</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	mapped_offset = snd_emu10k1_memblk_offset(emem) &gt;&gt; 1;</div><div class='add'>+	mapped_offset = snd_emu10k1_memblk_offset(emem) &gt;&gt; w_16;</div><div class='ctx'> 	vp-&gt;reg.start += mapped_offset;</div><div class='ctx'> 	vp-&gt;reg.end += mapped_offset;</div><div class='ctx'> 	vp-&gt;reg.loopstart += mapped_offset;</div><div class='hunk'>@@ -359,114 +350,98 @@ start_voice(struct snd_emux_voice *vp)</div><div class='ctx'> 		snd_emu10k1_ptr_write(hw, FXRT, ch, temp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* channel to be silent and idle */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0x0000);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, VTFT, ch, 0x0000FFFF);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CVCF, ch, 0x0000FFFF);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, PTRX, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CPF, ch, 0);</div><div class='del'>-</div><div class='del'>-	/* set pitch offset */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, IP, vp-&gt;ch, vp-&gt;apitch);</div><div class='del'>-</div><div class='del'>-	/* set envelope parameters */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, ENVVAL, ch, vp-&gt;reg.parm.moddelay);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, ATKHLDM, ch, vp-&gt;reg.parm.modatkhld);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSM, ch, vp-&gt;reg.parm.moddcysus);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, ENVVOL, ch, vp-&gt;reg.parm.voldelay);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, ATKHLDV, ch, vp-&gt;reg.parm.volatkhld);</div><div class='del'>-	/* decay/sustain parameter for volume envelope is used</div><div class='del'>-	   for triggerg the voice */</div><div class='del'>-</div><div class='del'>-	/* cutoff and volume */</div><div class='del'>-	temp = (unsigned int)vp-&gt;acutoff &lt;&lt; 8 | (unsigned char)vp-&gt;avol;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, IFATN, vp-&gt;ch, temp);</div><div class='del'>-</div><div class='del'>-	/* modulation envelope heights */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, PEFE, ch, vp-&gt;reg.parm.pefe);</div><div class='del'>-</div><div class='del'>-	/* lfo1/2 delay */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, LFOVAL1, ch, vp-&gt;reg.parm.lfo1delay);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, LFOVAL2, ch, vp-&gt;reg.parm.lfo2delay);</div><div class='del'>-</div><div class='del'>-	/* lfo1 pitch &amp; cutoff shift */</div><div class='del'>-	set_fmmod(hw, vp);</div><div class='del'>-	/* lfo1 volume &amp; freq */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, TREMFRQ, vp-&gt;ch, vp-&gt;reg.parm.tremfrq);</div><div class='del'>-	/* lfo2 pitch &amp; freq */</div><div class='del'>-	set_fm2frq2(hw, vp);</div><div class='del'>-</div><div class='del'>-	/* reverb and loop start (reverb 8bit, MSB) */</div><div class='ctx'> 	temp = vp-&gt;reg.parm.reverb;</div><div class='ctx'> 	temp += (int)vp-&gt;chan-&gt;control[MIDI_CTL_E1_REVERB_DEPTH] * 9 / 10;</div><div class='ctx'> 	LIMITMAX(temp, 255);</div><div class='ctx'> 	addr = vp-&gt;reg.loopstart;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, PSST, vp-&gt;ch, (temp &lt;&lt; 24) | addr);</div><div class='add'>+	psst = (temp &lt;&lt; 24) | addr;</div><div class='ctx'> </div><div class='del'>-	/* chorus &amp; loop end (chorus 8bit, MSB) */</div><div class='ctx'> 	addr = vp-&gt;reg.loopend;</div><div class='ctx'> 	temp = vp-&gt;reg.parm.chorus;</div><div class='ctx'> 	temp += (int)chan-&gt;control[MIDI_CTL_E3_CHORUS_DEPTH] * 9 / 10;</div><div class='ctx'> 	LIMITMAX(temp, 255);</div><div class='del'>-	temp = (temp &lt;&lt;24) | addr;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DSL, ch, temp);</div><div class='add'>+	dsl = (temp &lt;&lt; 24) | addr;</div><div class='ctx'> </div><div class='del'>-	/* clear filter delay memory */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, Z1, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, Z2, ch, 0);</div><div class='del'>-</div><div class='del'>-	/* invalidate maps */</div><div class='del'>-	temp = (hw-&gt;silent_page.addr &lt;&lt; 1) | MAP_PTI_MASK;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, MAPA, ch, temp);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, MAPB, ch, temp);</div><div class='del'>-#if 0</div><div class='del'>-	/* cache */</div><div class='del'>-	{</div><div class='del'>-		unsigned int val, sample;</div><div class='del'>-		val = 32;</div><div class='del'>-		if (vp-&gt;reg.sample_mode &amp; SNDRV_SFNT_SAMPLE_8BITS)</div><div class='del'>-			sample = 0x80808080;</div><div class='del'>-		else {</div><div class='del'>-			sample = 0;</div><div class='del'>-			val *= 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* cache */</div><div class='del'>-		snd_emu10k1_ptr_write(hw, CCR, ch, 0x1c &lt;&lt; 16);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, CDE, ch, sample);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, CDF, ch, sample);</div><div class='del'>-</div><div class='del'>-		/* invalidate maps */</div><div class='del'>-		temp = ((unsigned int)hw-&gt;silent_page.addr &lt;&lt; 1) | MAP_PTI_MASK;</div><div class='del'>-		snd_emu10k1_ptr_write(hw, MAPA, ch, temp);</div><div class='del'>-		snd_emu10k1_ptr_write(hw, MAPB, ch, temp);</div><div class='del'>-		</div><div class='del'>-		/* fill cache */</div><div class='del'>-		val -= 4;</div><div class='del'>-		val &lt;&lt;= 25;</div><div class='del'>-		val |= 0x1c &lt;&lt; 16;</div><div class='del'>-		snd_emu10k1_ptr_write(hw, CCR, ch, val);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	map = (hw-&gt;silent_page.addr &lt;&lt; hw-&gt;address_mode) | (hw-&gt;address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);</div><div class='ctx'> </div><div class='del'>-	/* Q &amp; current address (Q 4bit value, MSB) */</div><div class='del'>-	addr = vp-&gt;reg.start;</div><div class='add'>+	addr = vp-&gt;reg.start + 64 - 3;</div><div class='ctx'> 	temp = vp-&gt;reg.parm.filterQ;</div><div class='del'>-	temp = (temp&lt;&lt;28) | addr;</div><div class='add'>+	ccca = (temp &lt;&lt; 28) | addr;</div><div class='ctx'> 	if (vp-&gt;apitch &lt; 0xe400)</div><div class='del'>-		temp |= CCCA_INTERPROM_0;</div><div class='add'>+		ccca |= CCCA_INTERPROM_0;</div><div class='ctx'> 	else {</div><div class='ctx'> 		unsigned int shift = (vp-&gt;apitch - 0xe000) &gt;&gt; 10;</div><div class='del'>-		temp |= shift &lt;&lt; 25;</div><div class='add'>+		ccca |= shift &lt;&lt; 25;</div><div class='ctx'> 	}</div><div class='del'>-	if (vp-&gt;reg.sample_mode &amp; SNDRV_SFNT_SAMPLE_8BITS)</div><div class='del'>-		temp |= CCCA_8BITSELECT;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CCCA, ch, temp);</div><div class='del'>-</div><div class='del'>-	/* reset volume */</div><div class='del'>-	temp = (unsigned int)vp-&gt;vtarget &lt;&lt; 16;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, VTFT, ch, temp | vp-&gt;ftarget);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CVCF, ch, temp | 0xff00);</div><div class='add'>+	if (!w_16)</div><div class='add'>+		ccca |= CCCA_8BITSELECT;</div><div class='add'>+</div><div class='add'>+	vtarget = (unsigned int)vp-&gt;vtarget &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(hw, ch,</div><div class='add'>+		/* channel to be silent and idle */</div><div class='add'>+		DCYSUSV, 0,</div><div class='add'>+		VTFT, VTFT_FILTERTARGET_MASK,</div><div class='add'>+		CVCF, CVCF_CURRENTFILTER_MASK,</div><div class='add'>+		PTRX, 0,</div><div class='add'>+		CPF, 0,</div><div class='add'>+</div><div class='add'>+		/* set pitch offset */</div><div class='add'>+		IP, vp-&gt;apitch,</div><div class='add'>+</div><div class='add'>+		/* set envelope parameters */</div><div class='add'>+		ENVVAL, vp-&gt;reg.parm.moddelay,</div><div class='add'>+		ATKHLDM, vp-&gt;reg.parm.modatkhld,</div><div class='add'>+		DCYSUSM, vp-&gt;reg.parm.moddcysus,</div><div class='add'>+		ENVVOL, vp-&gt;reg.parm.voldelay,</div><div class='add'>+		ATKHLDV, vp-&gt;reg.parm.volatkhld,</div><div class='add'>+		/* decay/sustain parameter for volume envelope is used</div><div class='add'>+		   for triggerg the voice */</div><div class='add'>+</div><div class='add'>+		/* cutoff and volume */</div><div class='add'>+		IFATN, (unsigned int)vp-&gt;acutoff &lt;&lt; 8 | (unsigned char)vp-&gt;avol,</div><div class='add'>+</div><div class='add'>+		/* modulation envelope heights */</div><div class='add'>+		PEFE, vp-&gt;reg.parm.pefe,</div><div class='add'>+</div><div class='add'>+		/* lfo1/2 delay */</div><div class='add'>+		LFOVAL1, vp-&gt;reg.parm.lfo1delay,</div><div class='add'>+		LFOVAL2, vp-&gt;reg.parm.lfo2delay,</div><div class='add'>+</div><div class='add'>+		/* lfo1 pitch &amp; cutoff shift */</div><div class='add'>+		FMMOD, make_fmmod(vp),</div><div class='add'>+		/* lfo1 volume &amp; freq */</div><div class='add'>+		TREMFRQ, vp-&gt;reg.parm.tremfrq,</div><div class='add'>+		/* lfo2 pitch &amp; freq */</div><div class='add'>+		FM2FRQ2, make_fm2frq2(vp),</div><div class='add'>+</div><div class='add'>+		/* reverb and loop start (reverb 8bit, MSB) */</div><div class='add'>+		PSST, psst,</div><div class='add'>+</div><div class='add'>+		/* chorus &amp; loop end (chorus 8bit, MSB) */</div><div class='add'>+		DSL, dsl,</div><div class='add'>+</div><div class='add'>+		/* clear filter delay memory */</div><div class='add'>+		Z1, 0,</div><div class='add'>+		Z2, 0,</div><div class='add'>+</div><div class='add'>+		/* invalidate maps */</div><div class='add'>+		MAPA, map,</div><div class='add'>+		MAPB, map,</div><div class='add'>+</div><div class='add'>+		/* Q &amp; current address (Q 4bit value, MSB) */</div><div class='add'>+		CCCA, ccca,</div><div class='add'>+</div><div class='add'>+		/* cache */</div><div class='add'>+		CCR, REG_VAL_PUT(CCR_CACHEINVALIDSIZE, 64),</div><div class='add'>+</div><div class='add'>+		/* reset volume */</div><div class='add'>+		VTFT, vtarget | vp-&gt;ftarget,</div><div class='add'>+		CVCF, vtarget | CVCF_CURRENTFILTER_MASK,</div><div class='add'>+</div><div class='add'>+		REGLIST_END);</div><div class='add'>+</div><div class='add'>+	hw-&gt;voices[ch].dirty = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -476,7 +451,7 @@ start_voice(struct snd_emux_voice *vp)</div><div class='ctx'> static void</div><div class='ctx'> trigger_voice(struct snd_emux_voice *vp)</div><div class='ctx'> {</div><div class='del'>-	unsigned int temp, ptarget;</div><div class='add'>+	unsigned int ptarget;</div><div class='ctx'> 	struct snd_emu10k1 *hw;</div><div class='ctx'> 	struct snd_emu10k1_memblk *emem;</div><div class='ctx'> 	</div><div class='hunk'>@@ -491,24 +466,25 @@ trigger_voice(struct snd_emux_voice *vp)</div><div class='ctx'> #else</div><div class='ctx'> 	ptarget = IP_TO_CP(vp-&gt;apitch);</div><div class='ctx'> #endif</div><div class='del'>-	/* set pitch target and pan (volume) */</div><div class='del'>-	temp = ptarget | (vp-&gt;apan &lt;&lt; 8) | vp-&gt;aaux;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, PTRX, vp-&gt;ch, temp);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(hw, vp-&gt;ch,</div><div class='add'>+		/* set pitch target and pan (volume) */</div><div class='add'>+		PTRX, ptarget | (vp-&gt;apan &lt;&lt; 8) | vp-&gt;aaux,</div><div class='add'>+</div><div class='add'>+		/* current pitch and fractional address */</div><div class='add'>+		CPF, ptarget,</div><div class='ctx'> </div><div class='del'>-	/* pitch target */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CPF, vp-&gt;ch, ptarget);</div><div class='add'>+		/* enable envelope engine */</div><div class='add'>+		DCYSUSV, vp-&gt;reg.parm.voldcysus | DCYSUSV_CHANNELENABLE_MASK,</div><div class='ctx'> </div><div class='del'>-	/* trigger voice */</div><div class='del'>-	snd_emu10k1_ptr_write(hw, DCYSUSV, vp-&gt;ch, vp-&gt;reg.parm.voldcysus|DCYSUSV_CHANNELENABLE_MASK);</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define MOD_SENSE 18</div><div class='ctx'> </div><div class='del'>-/* set lfo1 modulation height and cutoff */</div><div class='del'>-static void</div><div class='del'>-set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)</div><div class='add'>+/* calculate lfo1 modulation height and cutoff register */</div><div class='add'>+static u32</div><div class='add'>+make_fmmod(struct snd_emux_voice *vp)</div><div class='ctx'> {</div><div class='del'>-	unsigned short fmmod;</div><div class='ctx'> 	short pitch;</div><div class='ctx'> 	unsigned char cutoff;</div><div class='ctx'> 	int modulation;</div><div class='hunk'>@@ -518,15 +494,13 @@ set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)</div><div class='ctx'> 	modulation = vp-&gt;chan-&gt;gm_modulation + vp-&gt;chan-&gt;midi_pressure;</div><div class='ctx'> 	pitch += (MOD_SENSE * modulation) / 1200;</div><div class='ctx'> 	LIMITVALUE(pitch, -128, 127);</div><div class='del'>-	fmmod = ((unsigned char)pitch&lt;&lt;8) | cutoff;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, FMMOD, vp-&gt;ch, fmmod);</div><div class='add'>+	return ((unsigned char)pitch &lt;&lt; 8) | cutoff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* set lfo2 pitch &amp; frequency */</div><div class='del'>-static void</div><div class='del'>-set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)</div><div class='add'>+/* calculate set lfo2 pitch &amp; frequency register */</div><div class='add'>+static u32</div><div class='add'>+make_fm2frq2(struct snd_emux_voice *vp)</div><div class='ctx'> {</div><div class='del'>-	unsigned short fm2frq2;</div><div class='ctx'> 	short pitch;</div><div class='ctx'> 	unsigned char freq;</div><div class='ctx'> 	int modulation;</div><div class='hunk'>@@ -536,16 +510,13 @@ set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)</div><div class='ctx'> 	modulation = vp-&gt;chan-&gt;gm_modulation + vp-&gt;chan-&gt;midi_pressure;</div><div class='ctx'> 	pitch += (MOD_SENSE * modulation) / 1200;</div><div class='ctx'> 	LIMITVALUE(pitch, -128, 127);</div><div class='del'>-	fm2frq2 = ((unsigned char)pitch&lt;&lt;8) | freq;</div><div class='del'>-	snd_emu10k1_ptr_write(hw, FM2FRQ2, vp-&gt;ch, fm2frq2);</div><div class='add'>+	return ((unsigned char)pitch &lt;&lt; 8) | freq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* set filterQ */</div><div class='del'>-static void</div><div class='del'>-set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)</div><div class='add'>+static int get_pitch_shift(struct snd_emux *emu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int val;</div><div class='del'>-	val = snd_emu10k1_ptr_read(hw, CCCA, vp-&gt;ch) &amp; ~CCCA_RESONANCE;</div><div class='del'>-	val |= (vp-&gt;reg.parm.filterQ &lt;&lt; 28);</div><div class='del'>-	snd_emu10k1_ptr_write(hw, CCCA, vp-&gt;ch, val);</div><div class='add'>+	struct snd_emu10k1 *hw = emu-&gt;hw;</div><div class='add'>+</div><div class='add'>+	return (hw-&gt;card_capabilities-&gt;emu_model &amp;&amp;</div><div class='add'>+			hw-&gt;emu1010.word_clock == 44100) ? 0 : -501;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c<br/>index 66c7fb3ced3e..b2fe2d164ba8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_main.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1_main.c</a></div><div class='hunk'>@@ -1,41 +1,19 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for control of EMU10K1 chips</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='del'>- *      Added support for Audigy 2 Value.</div><div class='del'>- *  	Added EMU 1010 support.</div><div class='del'>- *  	General bug fixes and enhancements.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='hunk'>@@ -71,50 +49,53 @@ MODULE_FIRMWARE(EMU1010_NOTEBOOK_FILENAME);</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch)</div><div class='ctx'> {</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IP, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, VTFT, ch, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CVCF, ch, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PTRX, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CPF, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCR, ch, 0);</div><div class='del'>-</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PSST, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DSL, ch, 0x10);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCCA, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, Z1, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, Z2, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXRT, ch, 0x32100000);</div><div class='del'>-</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ATKHLDM, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DCYSUSM, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IFATN, ch, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PEFE, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FMMOD, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TREMFRQ, ch, 24);	/* 1 Hz */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FM2FRQ2, ch, 24);	/* 1 Hz */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TEMPENV, ch, 0);</div><div class='del'>-</div><div class='del'>-	/*** these are last so OFF prevents writing ***/</div><div class='del'>-	snd_emu10k1_ptr_write(emu, LFOVAL2, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, LFOVAL1, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ATKHLDV, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ENVVOL, ch, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ENVVAL, ch, 0);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, ch,</div><div class='add'>+		DCYSUSV, 0,</div><div class='add'>+		VTFT, VTFT_FILTERTARGET_MASK,</div><div class='add'>+		CVCF, CVCF_CURRENTFILTER_MASK,</div><div class='add'>+		PTRX, 0,</div><div class='add'>+		CPF, 0,</div><div class='add'>+		CCR, 0,</div><div class='add'>+</div><div class='add'>+		PSST, 0,</div><div class='add'>+		DSL, 0x10,</div><div class='add'>+		CCCA, 0,</div><div class='add'>+		Z1, 0,</div><div class='add'>+		Z2, 0,</div><div class='add'>+		FXRT, 0x32100000,</div><div class='add'>+</div><div class='add'>+		// The rest is meaningless as long as DCYSUSV_CHANNELENABLE_MASK is zero</div><div class='add'>+		DCYSUSM, 0,</div><div class='add'>+		ATKHLDV, 0,</div><div class='add'>+		ATKHLDM, 0,</div><div class='add'>+		IP, 0,</div><div class='add'>+		IFATN, IFATN_FILTERCUTOFF_MASK | IFATN_ATTENUATION_MASK,</div><div class='add'>+		PEFE, 0,</div><div class='add'>+		FMMOD, 0,</div><div class='add'>+		TREMFRQ, 24,	/* 1 Hz */</div><div class='add'>+		FM2FRQ2, 24,	/* 1 Hz */</div><div class='add'>+		LFOVAL2, 0,</div><div class='add'>+		LFOVAL1, 0,</div><div class='add'>+		ENVVOL, 0,</div><div class='add'>+		ENVVAL, 0,</div><div class='add'>+</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> </div><div class='ctx'> 	/* Audigy extra stuffs */</div><div class='ctx'> 	if (emu-&gt;audigy) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, 0x4c, ch, 0); /* ?? */</div><div class='del'>-		snd_emu10k1_ptr_write(emu, 0x4d, ch, 0); /* ?? */</div><div class='del'>-		snd_emu10k1_ptr_write(emu, 0x4e, ch, 0); /* ?? */</div><div class='del'>-		snd_emu10k1_ptr_write(emu, 0x4f, ch, 0); /* ?? */</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT1, ch, 0x03020100);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT2, ch, 0x3f3f3f3f);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, ch, 0);</div><div class='add'>+		snd_emu10k1_ptr_write_multiple(emu, ch,</div><div class='add'>+			A_CSBA, 0,</div><div class='add'>+			A_CSDC, 0,</div><div class='add'>+			A_CSFE, 0,</div><div class='add'>+			A_CSHG, 0,</div><div class='add'>+			A_FXRT1, 0x03020100,</div><div class='add'>+			A_FXRT2, 0x07060504,</div><div class='add'>+			A_SENDAMOUNTS, 0,</div><div class='add'>+			REGLIST_END);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int spi_dac_init[] = {</div><div class='add'>+static const unsigned int spi_dac_init[] = {</div><div class='ctx'> 		0x00ff,</div><div class='ctx'> 		0x02ff,</div><div class='ctx'> 		0x0400,</div><div class='hunk'>@@ -138,7 +119,7 @@ static unsigned int spi_dac_init[] = {</div><div class='ctx'> 		0x1400,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int i2c_adc_init[][2] = {</div><div class='add'>+static const unsigned int i2c_adc_init[][2] = {</div><div class='ctx'> 	{ 0x17, 0x00 }, /* Reset */</div><div class='ctx'> 	{ 0x07, 0x00 }, /* Timeout */</div><div class='ctx'> 	{ 0x0b, 0x22 },  /* Interface control */</div><div class='hunk'>@@ -154,7 +135,7 @@ static unsigned int i2c_adc_init[][2] = {</div><div class='ctx'> 	{ 0x15, ADC_MUX_2 },  /* ADC Mixer control. Mic for A2ZS Notebook */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='add'>+static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int silent_page;</div><div class='ctx'> 	int ch;</div><div class='hunk'>@@ -164,20 +145,26 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 	outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK |</div><div class='ctx'> 		HCFG_MUTEBUTTONENABLE, emu-&gt;port + HCFG);</div><div class='ctx'> </div><div class='del'>-	/* reset recording buffers */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MICBA, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXBS, 0, ADCBS_BUFSIZE_NONE);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXBA, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ADCBS, 0, ADCBS_BUFSIZE_NONE);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ADCBA, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* disable channel interrupt */</div><div class='ctx'> 	outl(0, emu-&gt;port + INTE);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CLIEL, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CLIEH, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);</div><div class='add'>+</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+		/* reset recording buffers */</div><div class='add'>+		MICBS, ADCBS_BUFSIZE_NONE,</div><div class='add'>+		MICBA, 0,</div><div class='add'>+		FXBS, ADCBS_BUFSIZE_NONE,</div><div class='add'>+		FXBA, 0,</div><div class='add'>+		ADCBS, ADCBS_BUFSIZE_NONE,</div><div class='add'>+		ADCBA, 0,</div><div class='add'>+</div><div class='add'>+		/* disable channel interrupt */</div><div class='add'>+		CLIEL, 0,</div><div class='add'>+		CLIEH, 0,</div><div class='add'>+</div><div class='add'>+		/* disable stop on loop end */</div><div class='add'>+		SOLEL, 0,</div><div class='add'>+		SOLEH, 0,</div><div class='add'>+</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;audigy) {</div><div class='ctx'> 		/* set SPDIF bypass mode */</div><div class='hunk'>@@ -191,17 +178,17 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 	for (ch = 0; ch &lt; NUM_G; ch++)</div><div class='ctx'> 		snd_emu10k1_voice_init(emu, ch);</div><div class='ctx'> </div><div class='del'>-	snd_emu10k1_ptr_write(emu, SPCS0, 0, emu-&gt;spdif_bits[0]);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SPCS1, 0, emu-&gt;spdif_bits[1]);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SPCS2, 0, emu-&gt;spdif_bits[2]);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+		SPCS0, emu-&gt;spdif_bits[0],</div><div class='add'>+		SPCS1, emu-&gt;spdif_bits[1],</div><div class='add'>+		SPCS2, emu-&gt;spdif_bits[2],</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> </div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* audigy2 */</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+	} else if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* audigy2 */</div><div class='ctx'> 		/* Hacks for Alice3 to work independent of haP16V driver */</div><div class='ctx'> 		/* Setup SRCMulti_I2S SamplingRate */</div><div class='del'>-		tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);</div><div class='del'>-		tmp &amp;= 0xfffff1ff;</div><div class='del'>-		tmp |= (0x2&lt;&lt;9);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);</div><div class='add'>+		snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, 0, A_I2S_CAPTURE_96000);</div><div class='ctx'> </div><div class='ctx'> 		/* Setup SRCSel (Enable Spdif,I2S SRCMulti) */</div><div class='ctx'> 		snd_emu10k1_ptr20_write(emu, SRCSel, 0, 0x14);</div><div class='hunk'>@@ -213,32 +200,26 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 		outl(0x0201, emu-&gt;port + HCFG2);</div><div class='ctx'> 		/* Set playback routing. */</div><div class='ctx'> 		snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);</div><div class='del'>-	}</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;ca0108_chip) { /* audigy2 Value */</div><div class='add'>+	} else if (emu-&gt;card_capabilities-&gt;ca0108_chip) { /* audigy2 Value */</div><div class='ctx'> 		/* Hacks for Alice3 to work independent of haP16V driver */</div><div class='del'>-		snd_printk(KERN_INFO "Audigy2 value: Special config.\n");</div><div class='add'>+		dev_info(emu-&gt;card-&gt;dev, "Audigy2 value: Special config.\n");</div><div class='ctx'> 		/* Setup SRCMulti_I2S SamplingRate */</div><div class='del'>-		tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);</div><div class='del'>-		tmp &amp;= 0xfffff1ff;</div><div class='del'>-		tmp |= (0x2&lt;&lt;9);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);</div><div class='add'>+		snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, 0, A_I2S_CAPTURE_96000);</div><div class='ctx'> </div><div class='ctx'> 		/* Setup SRCSel (Enable Spdif,I2S SRCMulti) */</div><div class='del'>-		outl(0x600000, emu-&gt;port + 0x20);</div><div class='del'>-		outl(0x14, emu-&gt;port + 0x24);</div><div class='add'>+		snd_emu10k1_ptr20_write(emu, P17V_SRCSel, 0, 0x14);</div><div class='ctx'> </div><div class='ctx'> 		/* Setup SRCMulti Input Audio Enable */</div><div class='del'>-		outl(0x7b0000, emu-&gt;port + 0x20);</div><div class='del'>-		outl(0xFF000000, emu-&gt;port + 0x24);</div><div class='add'>+		snd_emu10k1_ptr20_write(emu, P17V_MIXER_I2S_ENABLE, 0, 0xFF000000);</div><div class='ctx'> </div><div class='ctx'> 		/* Setup SPDIF Out Audio Enable */</div><div class='ctx'> 		/* The Audigy 2 Value has a separate SPDIF out,</div><div class='ctx'> 		 * so no need for a mixer switch</div><div class='ctx'> 		 */</div><div class='del'>-		outl(0x7a0000, emu-&gt;port + 0x20);</div><div class='del'>-		outl(0xFF000000, emu-&gt;port + 0x24);</div><div class='del'>-		tmp = inl(emu-&gt;port + A_IOCFG) &amp; ~0x8; /* Clear bit 3 */</div><div class='del'>-		outl(tmp, emu-&gt;port + A_IOCFG);</div><div class='add'>+		snd_emu10k1_ptr20_write(emu, P17V_MIXER_SPDIF_ENABLE, 0, 0xFF000000);</div><div class='add'>+</div><div class='add'>+		tmp = inw(emu-&gt;port + A_IOCFG) &amp; ~0x8; /* Clear bit 3 */</div><div class='add'>+		outw(tmp, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;spi_dac) { /* Audigy 2 ZS Notebook with DAC Wolfson WM8768/WM8568 */</div><div class='ctx'> 		int size, n;</div><div class='hunk'>@@ -258,15 +239,15 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 		 * GPIO6: Unknown</div><div class='ctx'> 		 * GPIO7: Unknown</div><div class='ctx'> 		 */</div><div class='del'>-		outl(0x76, emu-&gt;port + A_IOCFG); /* Windows uses 0x3f76 */</div><div class='add'>+		outw(0x76, emu-&gt;port + A_IOCFG); /* Windows uses 0x3f76 */</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;i2c_adc) { /* Audigy 2 ZS Notebook with ADC Wolfson WM8775 */</div><div class='ctx'> 		int size, n;</div><div class='ctx'> </div><div class='ctx'> 		snd_emu10k1_ptr20_write(emu, P17V_I2S_SRC_SEL, 0, 0x2020205f);</div><div class='del'>-		tmp = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-		outl(tmp | 0x4, emu-&gt;port + A_IOCFG);  /* Set bit 2 for mic input */</div><div class='del'>-		tmp = inl(emu-&gt;port + A_IOCFG);</div><div class='add'>+		tmp = inw(emu-&gt;port + A_IOCFG);</div><div class='add'>+		outw(tmp | 0x4, emu-&gt;port + A_IOCFG);  /* Set bit 2 for mic input */</div><div class='add'>+		tmp = inw(emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		size = ARRAY_SIZE(i2c_adc_init);</div><div class='ctx'> 		for (n = 0; n &lt; size; n++)</div><div class='ctx'> 			snd_emu10k1_i2c_write(emu, i2c_adc_init[n][0], i2c_adc_init[n][1]);</div><div class='hunk'>@@ -279,9 +260,9 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> </div><div class='ctx'> 	snd_emu10k1_ptr_write(emu, PTB, 0, emu-&gt;ptb_pages.addr);</div><div class='ctx'> 	snd_emu10k1_ptr_write(emu, TCB, 0, 0);	/* taken from original driver */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TCBS, 0, 4);	/* taken from original driver */</div><div class='add'>+	snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_256K);	/* taken from original driver */</div><div class='ctx'> </div><div class='del'>-	silent_page = (emu-&gt;silent_page.addr &lt;&lt; 1) | MAP_PTI_MASK;</div><div class='add'>+	silent_page = (emu-&gt;silent_page.addr &lt;&lt; emu-&gt;address_mode) | (emu-&gt;address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);</div><div class='ctx'> 	for (ch = 0; ch &lt; NUM_G; ch++) {</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, MAPA, ch, silent_page);</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, MAPB, ch, silent_page);</div><div class='hunk'>@@ -322,12 +303,12 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 		} else if (emu-&gt;card_capabilities-&gt;i2c_adc) {</div><div class='ctx'> 			;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */</div><div class='ctx'> 		} else if (emu-&gt;audigy) {</div><div class='del'>-			unsigned int reg = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-			outl(reg | A_IOCFG_GPOUT2, emu-&gt;port + A_IOCFG);</div><div class='add'>+			u16 reg = inw(emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(reg | A_IOCFG_GPOUT2, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 			udelay(500);</div><div class='del'>-			outl(reg | A_IOCFG_GPOUT1 | A_IOCFG_GPOUT2, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(reg | A_IOCFG_GPOUT1 | A_IOCFG_GPOUT2, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 			udelay(100);</div><div class='del'>-			outl(reg, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(reg, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			unsigned int reg = inl(emu-&gt;port + HCFG);</div><div class='ctx'> 			outl(reg | HCFG_GPOUT2, emu-&gt;port + HCFG);</div><div class='hunk'>@@ -343,8 +324,13 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)</div><div class='ctx'> 	} else if (emu-&gt;card_capabilities-&gt;i2c_adc) {</div><div class='ctx'> 		;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */</div><div class='ctx'> 	} else if (emu-&gt;audigy) {	/* enable analog output */</div><div class='del'>-		unsigned int reg = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-		outl(reg | A_IOCFG_GPOUT0, emu-&gt;port + A_IOCFG);</div><div class='add'>+		u16 reg = inw(emu-&gt;port + A_IOCFG);</div><div class='add'>+		outw(reg | A_IOCFG_GPOUT0, emu-&gt;port + A_IOCFG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (emu-&gt;address_mode == 0) {</div><div class='add'>+		/* use 16M in 4G */</div><div class='add'>+		outl(inl(emu-&gt;port + HCFG) | HCFG_EXPANDED_MEM, emu-&gt;port + HCFG);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -363,19 +349,19 @@ static void snd_emu10k1_audio_enable(struct snd_emu10k1 *emu)</div><div class='ctx'> 	} else if (emu-&gt;card_capabilities-&gt;i2c_adc) {</div><div class='ctx'> 		;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */</div><div class='ctx'> 	} else if (emu-&gt;audigy) {</div><div class='del'>-		outl(inl(emu-&gt;port + A_IOCFG) &amp; ~0x44, emu-&gt;port + A_IOCFG);</div><div class='add'>+		outw(inw(emu-&gt;port + A_IOCFG) &amp; ~0x44, emu-&gt;port + A_IOCFG);</div><div class='ctx'> </div><div class='ctx'> 		if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* audigy2 */</div><div class='ctx'> 			/* Unmute Analog now.  Set GPO6 to 1 for Apollo.</div><div class='ctx'> 			 * This has to be done after init ALice3 I2SOut beyond 48KHz.</div><div class='ctx'> 			 * So, sequence is important. */</div><div class='del'>-			outl(inl(emu-&gt;port + A_IOCFG) | 0x0040, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(inw(emu-&gt;port + A_IOCFG) | 0x0040, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		} else if (emu-&gt;card_capabilities-&gt;ca0108_chip) { /* audigy2 value */</div><div class='ctx'> 			/* Unmute Analog now. */</div><div class='del'>-			outl(inl(emu-&gt;port + A_IOCFG) | 0x0060, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(inw(emu-&gt;port + A_IOCFG) | 0x0060, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Disable routing from AC97 line out to Front speakers */</div><div class='del'>-			outl(inl(emu-&gt;port + A_IOCFG) | 0x0080, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(inw(emu-&gt;port + A_IOCFG) | 0x0080, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -397,7 +383,10 @@ static void snd_emu10k1_audio_enable(struct snd_emu10k1 *emu)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='add'>+		snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE | INTE_A_GPIOENABLE);</div><div class='add'>+	else</div><div class='add'>+		snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_emu10k1_done(struct snd_emu10k1 *emu)</div><div class='hunk'>@@ -407,41 +396,48 @@ int snd_emu10k1_done(struct snd_emu10k1 *emu)</div><div class='ctx'> 	outl(0, emu-&gt;port + INTE);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 *  Shutdown the chip</div><div class='add'>+	 *  Shutdown the voices</div><div class='ctx'> 	 */</div><div class='del'>-	for (ch = 0; ch &lt; NUM_G; ch++)</div><div class='del'>-		snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);</div><div class='ctx'> 	for (ch = 0; ch &lt; NUM_G; ch++) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, VTFT, ch, 0);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CVCF, ch, 0);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, PTRX, ch, 0);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CPF, ch, 0);</div><div class='add'>+		snd_emu10k1_ptr_write_multiple(emu, ch,</div><div class='add'>+			DCYSUSV, 0,</div><div class='add'>+			VTFT, 0,</div><div class='add'>+			CVCF, 0,</div><div class='add'>+			PTRX, 0,</div><div class='add'>+			CPF, 0,</div><div class='add'>+			REGLIST_END);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* reset recording buffers */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MICBS, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MICBA, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXBS, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXBA, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FXWC, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ADCBS, 0, ADCBS_BUFSIZE_NONE);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ADCBA, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_16K);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TCB, 0, 0);</div><div class='add'>+	// stop the DSP</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, A_DBG, 0, A_DBG_SINGLE_STEP);</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, DBG, 0, EMU10K1_DBG_SINGLE_STEP);</div><div class='ctx'> </div><div class='del'>-	/* disable channel interrupt */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CLIEL, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CLIEH, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+		/* reset recording buffers */</div><div class='add'>+		MICBS, 0,</div><div class='add'>+		MICBA, 0,</div><div class='add'>+		FXBS, 0,</div><div class='add'>+		FXBA, 0,</div><div class='add'>+		FXWC, 0,</div><div class='add'>+		ADCBS, ADCBS_BUFSIZE_NONE,</div><div class='add'>+		ADCBA, 0,</div><div class='add'>+		TCBS, TCBS_BUFFSIZE_16K,</div><div class='add'>+		TCB, 0,</div><div class='add'>+</div><div class='add'>+		/* disable channel interrupt */</div><div class='add'>+		CLIEL, 0,</div><div class='add'>+		CLIEH, 0,</div><div class='add'>+		SOLEL, 0,</div><div class='add'>+		SOLEH, 0,</div><div class='add'>+</div><div class='add'>+		PTB, 0,</div><div class='add'>+</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> </div><div class='ctx'> 	/* disable audio and lock cache */</div><div class='ctx'> 	outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE, emu-&gt;port + HCFG);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PTB, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -632,7 +628,7 @@ static int snd_emu10k1_ecard_init(struct snd_emu10k1 *emu)</div><div class='ctx'> static int snd_emu10k1_cardbus_init(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long special_port;</div><div class='del'>-	unsigned int value;</div><div class='add'>+	__always_unused unsigned int value;</div><div class='ctx'> </div><div class='ctx'> 	/* Special initialisation routine</div><div class='ctx'> 	 * before the rest of the IO-Ports become active.</div><div class='hunk'>@@ -656,144 +652,148 @@ static int snd_emu10k1_cardbus_init(struct snd_emu10k1 *emu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filename)</div><div class='add'>+/* firmware file names, per model, init-fw and dock-fw (optional) */</div><div class='add'>+static const char * const firmware_names[5][2] = {</div><div class='add'>+	[EMU_MODEL_EMU1010] = {</div><div class='add'>+		HANA_FILENAME, DOCK_FILENAME</div><div class='add'>+	},</div><div class='add'>+	[EMU_MODEL_EMU1010B] = {</div><div class='add'>+		EMU1010B_FILENAME, MICRO_DOCK_FILENAME</div><div class='add'>+	},</div><div class='add'>+	[EMU_MODEL_EMU1616] = {</div><div class='add'>+		EMU1010_NOTEBOOK_FILENAME, MICRO_DOCK_FILENAME</div><div class='add'>+	},</div><div class='add'>+	[EMU_MODEL_EMU0404] = {</div><div class='add'>+		EMU0404_FILENAME, NULL</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, int dock,</div><div class='add'>+				     const struct firmware **fw)</div><div class='ctx'> {</div><div class='add'>+	const char *filename;</div><div class='ctx'> 	int err;</div><div class='del'>-	int n, i;</div><div class='del'>-	int reg;</div><div class='del'>-	int value;</div><div class='del'>-	unsigned int write_post;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	const struct firmware *fw_entry;</div><div class='del'>-</div><div class='del'>-	err = request_firmware(&amp;fw_entry, filename, &amp;emu-&gt;pci-&gt;dev);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		snd_printk(KERN_ERR "firmware: %s not found. Err = %d\n", filename, err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_INFO "firmware size = 0x%zx\n", fw_entry-&gt;size);</div><div class='ctx'> </div><div class='del'>-	/* The FPGA is a Xilinx Spartan IIE XC2S50E */</div><div class='del'>-	/* GPIO7 -&gt; FPGA PGMN</div><div class='del'>-	 * GPIO6 -&gt; FPGA CCLK</div><div class='del'>-	 * GPIO5 -&gt; FPGA DIN</div><div class='del'>-	 * FPGA CONFIG OFF -&gt; FPGA PGMN</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(0x00, emu-&gt;port + A_IOCFG); /* Set PGMN low for 1uS. */</div><div class='del'>-	write_post = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-	udelay(100);</div><div class='del'>-	outl(0x80, emu-&gt;port + A_IOCFG); /* Leave bit 7 set during netlist setup. */</div><div class='del'>-	write_post = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-	udelay(100); /* Allow FPGA memory to clean */</div><div class='del'>-	for (n = 0; n &lt; fw_entry-&gt;size; n++) {</div><div class='del'>-		value = fw_entry-&gt;data[n];</div><div class='del'>-		for (i = 0; i &lt; 8; i++) {</div><div class='del'>-			reg = 0x80;</div><div class='del'>-			if (value &amp; 0x1)</div><div class='del'>-				reg = reg | 0x20;</div><div class='del'>-			value = value &gt;&gt; 1;</div><div class='del'>-			outl(reg, emu-&gt;port + A_IOCFG);</div><div class='del'>-			write_post = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-			outl(reg | 0x40, emu-&gt;port + A_IOCFG);</div><div class='del'>-			write_post = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-		}</div><div class='add'>+	if (!*fw) {</div><div class='add'>+		filename = firmware_names[emu-&gt;card_capabilities-&gt;emu_model][dock];</div><div class='add'>+		if (!filename)</div><div class='add'>+			return 0;</div><div class='add'>+		err = request_firmware(fw, filename, &amp;emu-&gt;pci-&gt;dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='del'>-	/* After programming, set GPIO bit 4 high again. */</div><div class='del'>-	outl(0x10, emu-&gt;port + A_IOCFG);</div><div class='del'>-	write_post = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> </div><div class='del'>-	release_firmware(fw_entry);</div><div class='add'>+	snd_emu1010_load_firmware_entry(emu, dock, *fw);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emu1010_firmware_thread(void *data)</div><div class='add'>+static void snd_emu1010_load_dock_firmware(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = data;</div><div class='del'>-	u32 tmp, tmp2, reg;</div><div class='add'>+	u32 tmp, tmp2;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	for (;;) {</div><div class='del'>-		/* Delay to allow Audio Dock to settle */</div><div class='del'>-		msleep_interruptible(1000);</div><div class='del'>-		if (kthread_should_stop())</div><div class='del'>-			break;</div><div class='del'>-		snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &amp;tmp); /* IRQ Status */</div><div class='del'>-		snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;reg); /* OPTIONS: Which cards are attached to the EMU */</div><div class='del'>-		if (reg &amp; EMU_HANA_OPTION_DOCK_OFFLINE) {</div><div class='del'>-			/* Audio Dock attached */</div><div class='del'>-			/* Return to Audio Dock programming mode */</div><div class='del'>-			snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);</div><div class='del'>-			if (emu-&gt;card_capabilities-&gt;emu_model ==</div><div class='del'>-			    EMU_MODEL_EMU1010) {</div><div class='del'>-				err = snd_emu1010_load_firmware(emu, DOCK_FILENAME);</div><div class='del'>-				if (err != 0)</div><div class='del'>-					continue;</div><div class='del'>-			} else if (emu-&gt;card_capabilities-&gt;emu_model ==</div><div class='del'>-				   EMU_MODEL_EMU1010B) {</div><div class='del'>-				err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);</div><div class='del'>-				if (err != 0)</div><div class='del'>-					continue;</div><div class='del'>-			} else if (emu-&gt;card_capabilities-&gt;emu_model ==</div><div class='del'>-				   EMU_MODEL_EMU1616) {</div><div class='del'>-				err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);</div><div class='del'>-				if (err != 0)</div><div class='del'>-					continue;</div><div class='del'>-			}</div><div class='add'>+	// The docking events clearly arrive prematurely - while the</div><div class='add'>+	// Dock's FPGA seems to be successfully programmed, the Dock</div><div class='add'>+	// fails to initialize subsequently if we don't give it some</div><div class='add'>+	// time to "warm up" here.</div><div class='add'>+	msleep(200);</div><div class='ctx'> </div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);</div><div class='del'>-			snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &amp;reg);</div><div class='del'>-			snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n", reg);</div><div class='del'>-			/* ID, should read &amp; 0x7f = 0x55 when FPGA programmed. */</div><div class='del'>-			snd_emu1010_fpga_read(emu, EMU_HANA_ID, &amp;reg);</div><div class='del'>-			snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);</div><div class='del'>-			if ((reg &amp; 0x1f) != 0x15) {</div><div class='del'>-				/* FPGA failed to be programmed */</div><div class='del'>-				snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n", reg);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");</div><div class='del'>-			snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &amp;tmp);</div><div class='del'>-			snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &amp;tmp2);</div><div class='del'>-			snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",</div><div class='del'>-				   tmp, tmp2);</div><div class='del'>-			/* Sync clocking between 1010 and Dock */</div><div class='del'>-			/* Allow DLL to settle */</div><div class='del'>-			msleep(10);</div><div class='del'>-			/* Unmute all. Default is muted after a firmware load */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);</div><div class='del'>-		}</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Loading Audio Dock Firmware\n");</div><div class='add'>+	err = snd_emu1010_load_firmware(emu, 1, &amp;emu-&gt;dock_fw);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &amp;tmp);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", tmp);</div><div class='add'>+	if ((tmp &amp; 0x1f) != 0x15) {</div><div class='add'>+		/* FPGA failed to be programmed */</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"emu1010: Loading Audio Dock Firmware failed, reg = 0x%x\n",</div><div class='add'>+			tmp);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: firmware thread stopping\n");</div><div class='del'>-	return 0;</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Audio Dock Firmware loaded\n");</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &amp;tmp);</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &amp;tmp2);</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "Audio Dock ver: %u.%u\n", tmp, tmp2);</div><div class='add'>+</div><div class='add'>+	/* Allow DLL to settle, to sync clocking between 1010 and Dock */</div><div class='add'>+	msleep(10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emu1010_dock_event(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;reg); /* OPTIONS: Which cards are attached to the EMU */</div><div class='add'>+	if (reg &amp; EMU_HANA_OPTION_DOCK_OFFLINE) {</div><div class='add'>+		/* Audio Dock attached */</div><div class='add'>+		snd_emu1010_load_dock_firmware(emu);</div><div class='add'>+		/* Unmute all. Default is muted after a firmware load */</div><div class='add'>+		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);</div><div class='add'>+	} else if (!(reg &amp; EMU_HANA_OPTION_DOCK_ONLINE)) {</div><div class='add'>+		/* Audio Dock removed */</div><div class='add'>+		dev_info(emu-&gt;card-&gt;dev, "emu1010: Audio Dock detached\n");</div><div class='add'>+		/* The hardware auto-mutes all, so we unmute again */</div><div class='add'>+		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emu1010_clock_event(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	struct snd_ctl_elem_id id;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;emu-&gt;reg_lock) {</div><div class='add'>+		// This is the only thing that can actually happen.</div><div class='add'>+		emu-&gt;emu1010.clock_source = emu-&gt;emu1010.clock_fallback;</div><div class='add'>+		emu-&gt;emu1010.wclock = 1 - emu-&gt;emu1010.clock_source;</div><div class='add'>+		snd_emu1010_update_clock(emu);</div><div class='add'>+	}</div><div class='add'>+	snd_ctl_build_ioff(&amp;id, emu-&gt;ctl_clock_source, 0);</div><div class='add'>+	snd_ctl_notify(emu-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emu1010_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu;</div><div class='add'>+	u32 sts;</div><div class='add'>+</div><div class='add'>+	emu = container_of(work, struct snd_emu10k1, emu1010.work);</div><div class='add'>+	if (emu-&gt;card-&gt;shutdown)</div><div class='add'>+		return;</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	if (emu-&gt;suspend)</div><div class='add'>+		return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &amp;sts);</div><div class='add'>+</div><div class='add'>+	// The distinction of the IRQ status bits is unreliable,</div><div class='add'>+	// so we dispatch later based on option card status.</div><div class='add'>+	if (sts &amp; (EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST))</div><div class='add'>+		emu1010_dock_event(emu);</div><div class='add'>+</div><div class='add'>+	if (sts &amp; EMU_HANA_IRQ_WCLK_CHANGED)</div><div class='add'>+		emu1010_clock_event(emu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void emu1010_interrupt(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	// We get an interrupt on each GPIO input pin change, but we</div><div class='add'>+	// care only about the ones triggered by the dedicated pin.</div><div class='add'>+	u16 sts = inw(emu-&gt;port + A_GPIO);</div><div class='add'>+	u16 bit = emu-&gt;card_capabilities-&gt;ca0108_chip ? 0x2000 : 0x8000;</div><div class='add'>+	if (!(sts &amp; bit))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;emu-&gt;emu1010.work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * EMU-1010 - details found out from this driver, official MS Win drivers,</div><div class='del'>- * testing the card:</div><div class='del'>- *</div><div class='del'>- * Audigy2 (aka Alice2):</div><div class='del'>- * ---------------------</div><div class='del'>- * 	* communication over PCI</div><div class='del'>- * 	* conversion of 32-bit data coming over EMU32 links from HANA FPGA</div><div class='del'>- *	  to 2 x 16-bit, using internal DSP instructions</div><div class='del'>- * 	* slave mode, clock supplied by HANA</div><div class='del'>- * 	* linked to HANA using:</div><div class='del'>- * 		32 x 32-bit serial EMU32 output channels</div><div class='del'>- * 		16 x EMU32 input channels</div><div class='del'>- * 		(?) x I2S I/O channels (?)</div><div class='del'>- *</div><div class='del'>- * FPGA (aka HANA):</div><div class='del'>- * ---------------</div><div class='del'>- * 	* provides all (?) physical inputs and outputs of the card</div><div class='del'>- * 		(ADC, DAC, SPDIF I/O, ADAT I/O, etc.)</div><div class='del'>- * 	* provides clock signal for the card and Alice2</div><div class='del'>- * 	* two crystals - for 44.1kHz and 48kHz multiples</div><div class='del'>- * 	* provides internal routing of signal sources to signal destinations</div><div class='del'>- * 	* inputs/outputs to Alice2 - see above</div><div class='del'>- *</div><div class='ctx'>  * Current status of the driver:</div><div class='ctx'>  * ----------------------------</div><div class='ctx'>  * 	* only 44.1/48kHz supported (the MS Win driver supports up to 192 kHz)</div><div class='hunk'>@@ -803,75 +803,21 @@ static int emu1010_firmware_thread(void *data)</div><div class='ctx'>  */</div><div class='ctx'> static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='ctx'> 	u32 tmp, tmp2, reg;</div><div class='ctx'> 	int err;</div><div class='del'>-	const char *filename = NULL;</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Special config.\n");</div><div class='del'>-	/* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Lock Sound Memory Cache, Lock Tank Memory Cache,</div><div class='del'>-	 * Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0005a00c, emu-&gt;port + HCFG);</div><div class='del'>-	/* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Lock Tank Memory Cache,</div><div class='del'>-	 * Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0005a004, emu-&gt;port + HCFG);</div><div class='del'>-	/* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0005a000, emu-&gt;port + HCFG);</div><div class='del'>-	/* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0005a000, emu-&gt;port + HCFG);</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Special config.\n");</div><div class='ctx'> </div><div class='del'>-	/* Disable 48Volt power to Audio Dock */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0);</div><div class='add'>+	/* Mute, and disable audio and lock cache, just in case.</div><div class='add'>+	 * Proper init follows in snd_emu10k1_init(). */</div><div class='add'>+	outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK, emu-&gt;port + HCFG);</div><div class='ctx'> </div><div class='del'>-	/* ID, should read &amp; 0x7f = 0x55. (Bit 7 is the IRQ bit) */</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &amp;reg);</div><div class='del'>-	snd_printdd("reg1 = 0x%x\n", reg);</div><div class='del'>-	if ((reg &amp; 0x3f) == 0x15) {</div><div class='del'>-		/* FPGA netlist already present so clear it */</div><div class='del'>-		/* Return to programming mode */</div><div class='add'>+	guard(snd_emu1010_fpga_lock)(emu);</div><div class='ctx'> </div><div class='del'>-		snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);</div><div class='del'>-	}</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &amp;reg);</div><div class='del'>-	snd_printdd("reg2 = 0x%x\n", reg);</div><div class='del'>-	if ((reg &amp; 0x3f) == 0x15) {</div><div class='del'>-		/* FPGA failed to return to programming mode */</div><div class='del'>-		snd_printk(KERN_INFO "emu1010: FPGA failed to return to programming mode\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: EMU_HANA_ID = 0x%x\n", reg);</div><div class='del'>-	switch (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='del'>-	case EMU_MODEL_EMU1010:</div><div class='del'>-		filename = HANA_FILENAME;</div><div class='del'>-		break;</div><div class='del'>-	case EMU_MODEL_EMU1010B:</div><div class='del'>-		filename = EMU1010B_FILENAME;</div><div class='del'>-		break;</div><div class='del'>-	case EMU_MODEL_EMU1616:</div><div class='del'>-		filename = EMU1010_NOTEBOOK_FILENAME;</div><div class='del'>-		break;</div><div class='del'>-	case EMU_MODEL_EMU0404:</div><div class='del'>-		filename = EMU0404_FILENAME;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filename = NULL;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: filename %s testing\n", filename);</div><div class='del'>-	err = snd_emu1010_load_firmware(emu, filename);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		snd_printk(</div><div class='del'>-			KERN_INFO "emu1010: Loading Firmware file %s failed\n",</div><div class='del'>-			filename);</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Loading Hana Firmware\n");</div><div class='add'>+	err = snd_emu1010_load_firmware(emu, 0, &amp;emu-&gt;firmware);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_info(emu-&gt;card-&gt;dev, "emu1010: Loading Firmware failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -879,360 +825,68 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)</div><div class='ctx'> 	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &amp;reg);</div><div class='ctx'> 	if ((reg &amp; 0x3f) != 0x15) {</div><div class='ctx'> 		/* FPGA failed to be programmed */</div><div class='del'>-		snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n", reg);</div><div class='add'>+		dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+			 "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n",</div><div class='add'>+			 reg);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Hana Firmware loaded\n");</div><div class='ctx'> 	snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &amp;tmp);</div><div class='ctx'> 	snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &amp;tmp2);</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Hana version: %u.%u\n", tmp, tmp2);</div><div class='ctx'> 	/* Enable 48Volt power to Audio Dock */</div><div class='ctx'> 	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);</div><div class='ctx'> </div><div class='ctx'> 	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;reg);</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;reg);</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &amp;tmp);</div><div class='del'>-	/* Optical -&gt; ADAT I/O  */</div><div class='del'>-	/* 0 : SPDIF</div><div class='del'>-	 * 1 : ADAT</div><div class='del'>-	 */</div><div class='del'>-	emu-&gt;emu1010.optical_in = 1; /* IN_ADAT */</div><div class='del'>-	emu-&gt;emu1010.optical_out = 1; /* IN_ADAT */</div><div class='del'>-	tmp = 0;</div><div class='del'>-	tmp = (emu-&gt;emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |</div><div class='del'>-		(emu-&gt;emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev, "emu1010: Card options = 0x%x\n", reg);</div><div class='add'>+	if (reg &amp; EMU_HANA_OPTION_DOCK_OFFLINE)</div><div class='add'>+		snd_emu1010_load_dock_firmware(emu);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;no_adat) {</div><div class='add'>+		emu-&gt;emu1010.optical_in = 0; /* IN_SPDIF */</div><div class='add'>+		emu-&gt;emu1010.optical_out = 0; /* OUT_SPDIF */</div><div class='add'>+	} else {</div><div class='add'>+		/* Optical -&gt; ADAT I/O  */</div><div class='add'>+		emu-&gt;emu1010.optical_in = 1; /* IN_ADAT */</div><div class='add'>+		emu-&gt;emu1010.optical_out = 1; /* OUT_ADAT */</div><div class='add'>+	}</div><div class='add'>+	tmp = (emu-&gt;emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |</div><div class='add'>+		(emu-&gt;emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);</div><div class='ctx'> 	snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &amp;tmp);</div><div class='ctx'> 	/* Set no attenuation on Audio Dock pads. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00);</div><div class='ctx'> 	emu-&gt;emu1010.adc_pads = 0x00;</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &amp;tmp);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, emu-&gt;emu1010.adc_pads);</div><div class='ctx'> 	/* Unmute Audio dock DACs, Headphone source DAC-4. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &amp;tmp);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, EMU_HANA_DOCK_PHONES_192_DAC4);</div><div class='ctx'> 	/* DAC PADs. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f);</div><div class='del'>-	emu-&gt;emu1010.dac_pads = 0x0f;</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &amp;tmp);</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &amp;tmp);</div><div class='add'>+	emu-&gt;emu1010.dac_pads = EMU_HANA_DOCK_DAC_PAD1 | EMU_HANA_DOCK_DAC_PAD2 |</div><div class='add'>+				EMU_HANA_DOCK_DAC_PAD3 | EMU_HANA_DOCK_DAC_PAD4;</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, emu-&gt;emu1010.dac_pads);</div><div class='ctx'> 	/* SPDIF Format. Set Consumer mode, 24bit, copy enable */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, EMU_HANA_SPDIF_MODE_RX_INVALID);</div><div class='ctx'> 	/* MIDI routing */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);</div><div class='del'>-	/* Unknown. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);</div><div class='del'>-	/* IRQ Enable: Alll on */</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */</div><div class='del'>-	/* IRQ Enable: All off */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, EMU_HANA_MIDI_INA_FROM_HAMOA | EMU_HANA_MIDI_INB_FROM_DOCK2);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, EMU_HANA_MIDI_OUT_DOCK2 | EMU_HANA_MIDI_OUT_SYNC2);</div><div class='ctx'> </div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;reg);</div><div class='del'>-	snd_printk(KERN_INFO "emu1010: Card options3 = 0x%x\n", reg);</div><div class='add'>+	emu-&gt;gpio_interrupt = emu1010_interrupt;</div><div class='add'>+	// Note: The Audigy INTE is set later</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE,</div><div class='add'>+			       EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST | EMU_HANA_IRQ_WCLK_CHANGED);</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &amp;reg);  // Clear pending IRQs</div><div class='add'>+</div><div class='add'>+	emu-&gt;emu1010.clock_source = 1;  /* 48000 */</div><div class='add'>+	emu-&gt;emu1010.clock_fallback = 1;  /* 48000 */</div><div class='ctx'> 	/* Default WCLK set to 48kHz. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K);</div><div class='ctx'> 	/* Word Clock source, Internal 48kHz x1 */</div><div class='add'>+	emu-&gt;emu1010.wclock = EMU_HANA_WCLOCK_INT_48K;</div><div class='ctx'> 	snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);</div><div class='ctx'> 	/* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */</div><div class='del'>-	/* Audio Dock LEDs. */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* For 96kHz */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT2);</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-	/* For 192kHz */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_RIGHT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT3);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT3);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_6, EMU_SRC_HAMOA_ADC_LEFT4);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_7, EMU_SRC_HAMOA_ADC_RIGHT4);</div><div class='del'>-#endif</div><div class='del'>-#if 1</div><div class='del'>-	/* For 48kHz */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_0, EMU_SRC_DOCK_MIC_A1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_1, EMU_SRC_DOCK_MIC_B1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_4, EMU_SRC_DOCK_ADC1_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_5, EMU_SRC_DOCK_ADC1_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_6, EMU_SRC_DOCK_ADC2_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_7, EMU_SRC_DOCK_ADC2_RIGHT1);</div><div class='del'>-	/* Pavel Hofman - setting defaults for 8 more capture channels</div><div class='del'>-	 * Defaults only, users will set their own values anyways, let's</div><div class='del'>-	 * just copy/paste.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_8, EMU_SRC_DOCK_MIC_A1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_9, EMU_SRC_DOCK_MIC_B1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_A, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_B, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_ADC1_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_ADC1_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_E, EMU_SRC_DOCK_ADC2_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_F, EMU_SRC_DOCK_ADC2_RIGHT1);</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-	/* Original */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_4, EMU_SRC_HANA_ADAT);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_5, EMU_SRC_HANA_ADAT + 1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_6, EMU_SRC_HANA_ADAT + 2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_7, EMU_SRC_HANA_ADAT + 3);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_8, EMU_SRC_HANA_ADAT + 4);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_9, EMU_SRC_HANA_ADAT + 5);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_A, EMU_SRC_HANA_ADAT + 6);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_B, EMU_SRC_HANA_ADAT + 7);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_MIC_A1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_MIC_B1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_E, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE2_EMU32_F, EMU_SRC_HAMOA_ADC_LEFT2);</div><div class='del'>-#endif</div><div class='del'>-	for (i = 0; i &lt; 0x20; i++) {</div><div class='del'>-		/* AudioDock Elink &lt;- Silence */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu, 0x0100 + i, EMU_SRC_SILENCE);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		/* Hana SPDIF Out &lt;- Silence */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu, 0x0200 + i, EMU_SRC_SILENCE);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		/* Hamoa DAC &lt;- Silence */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu, 0x0300 + i, EMU_SRC_SILENCE);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		/* Hana ADAT Out &lt;- Silence */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu, EMU_DST_HANA_ADAT + i, EMU_SRC_SILENCE);</div><div class='del'>-	}</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S0_LEFT, EMU_SRC_DOCK_ADC1_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S0_RIGHT, EMU_SRC_DOCK_ADC1_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S1_LEFT, EMU_SRC_DOCK_ADC2_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S1_RIGHT, EMU_SRC_DOCK_ADC2_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01); /* Unmute all */</div><div class='del'>-</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;tmp);</div><div class='del'>-</div><div class='del'>-	/* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Lock Sound Memory Cache, Lock Tank Memory Cache,</div><div class='del'>-	 * Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0000a000, emu-&gt;port + HCFG);</div><div class='del'>-	/* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,</div><div class='del'>-	 * Lock Sound Memory Cache, Lock Tank Memory Cache,</div><div class='del'>-	 * Un-Mute all codecs.</div><div class='del'>-	 */</div><div class='del'>-	outl(0x0000a001, emu-&gt;port + HCFG);</div><div class='del'>-</div><div class='del'>-	/* Initial boot complete. Now patches */</div><div class='del'>-</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &amp;tmp);</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */</div><div class='del'>-	snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &amp;tmp);</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */</div><div class='del'>-</div><div class='del'>-	/* Start Micro/Audio Dock firmware loader thread */</div><div class='del'>-	if (!emu-&gt;emu1010.firmware_thread) {</div><div class='del'>-		emu-&gt;emu1010.firmware_thread =</div><div class='del'>-			kthread_create(emu1010_firmware_thread, emu,</div><div class='del'>-				       "emu1010_firmware");</div><div class='del'>-		wake_up_process(emu-&gt;emu1010.firmware_thread);</div><div class='del'>-	}</div><div class='add'>+	snd_emu1010_update_clock(emu);</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32B + 2); /* ALICE2 bus 0xa2 */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32B + 3); /* ALICE2 bus 0xa3 */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 2); /* ALICE2 bus 0xb2 */</div><div class='del'>-	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-		EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 3); /* ALICE2 bus 0xb3 */</div><div class='del'>-#endif</div><div class='del'>-	/* Default outputs */</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616) {</div><div class='del'>-		/* 1616(M) cardbus default outputs */</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[0] = 17;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[1] = 18;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);</div><div class='del'>-		emu-&gt;emu1010.output_source[2] = 19;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);</div><div class='del'>-		emu-&gt;emu1010.output_source[3] = 20;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);</div><div class='del'>-		emu-&gt;emu1010.output_source[4] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);</div><div class='del'>-		emu-&gt;emu1010.output_source[5] = 22;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_MANA_DAC_LEFT, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[16] = 17;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_MANA_DAC_RIGHT, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[17] = 18;</div><div class='del'>-	} else {</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[0] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[1] = 22;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);</div><div class='del'>-		emu-&gt;emu1010.output_source[2] = 23;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);</div><div class='del'>-		emu-&gt;emu1010.output_source[3] = 24;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);</div><div class='del'>-		emu-&gt;emu1010.output_source[4] = 25;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);</div><div class='del'>-		emu-&gt;emu1010.output_source[5] = 26;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC4_LEFT1, EMU_SRC_ALICE_EMU32A + 6);</div><div class='del'>-		emu-&gt;emu1010.output_source[6] = 27;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_DAC4_RIGHT1, EMU_SRC_ALICE_EMU32A + 7);</div><div class='del'>-		emu-&gt;emu1010.output_source[7] = 28;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_PHONES_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[8] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_PHONES_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[9] = 22;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[10] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_DOCK_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[11] = 22;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[12] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[13] = 22;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[14] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[15] = 22;</div><div class='del'>-		/* ALICE2 bus 0xa0 */</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT, EMU_SRC_ALICE_EMU32A + 0);</div><div class='del'>-		emu-&gt;emu1010.output_source[16] = 21;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 1, EMU_SRC_ALICE_EMU32A + 1);</div><div class='del'>-		emu-&gt;emu1010.output_source[17] = 22;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 2, EMU_SRC_ALICE_EMU32A + 2);</div><div class='del'>-		emu-&gt;emu1010.output_source[18] = 23;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 3, EMU_SRC_ALICE_EMU32A + 3);</div><div class='del'>-		emu-&gt;emu1010.output_source[19] = 24;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 4, EMU_SRC_ALICE_EMU32A + 4);</div><div class='del'>-		emu-&gt;emu1010.output_source[20] = 25;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 5, EMU_SRC_ALICE_EMU32A + 5);</div><div class='del'>-		emu-&gt;emu1010.output_source[21] = 26;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 6, EMU_SRC_ALICE_EMU32A + 6);</div><div class='del'>-		emu-&gt;emu1010.output_source[22] = 27;</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			EMU_DST_HANA_ADAT + 7, EMU_SRC_ALICE_EMU32A + 7);</div><div class='del'>-		emu-&gt;emu1010.output_source[23] = 28;</div><div class='del'>-	}</div><div class='del'>-	/* TEMP: Select SPDIF in/out */</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); */ /* Output spdif */</div><div class='del'>-</div><div class='del'>-	/* TEMP: Select 48kHz SPDIF out */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */</div><div class='del'>-	/* Word Clock source, Internal 48kHz x1 */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */</div><div class='del'>-	emu-&gt;emu1010.internal_clock = 1; /* 48000 */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12); /* Set LEDs on Audio Dock */</div><div class='del'>-	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, 0x7, 0x0); */ /* Mute all */</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, 0x7, 0x1); */ /* Unmute all */</div><div class='del'>-	/* snd_emu1010_fpga_write(emu, 0xe, 0x12); */ /* Set LEDs on Audio Dock */</div><div class='add'>+	// The routes are all set to EMU_SRC_SILENCE due to the reset,</div><div class='add'>+	// so it is safe to simply enable the outputs.</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1240,13 +894,15 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)</div><div class='ctx'>  *  Create the EMU10K1 instance</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int alloc_pm_buffer(struct snd_emu10k1 *emu);</div><div class='ctx'> static void free_pm_buffer(struct snd_emu10k1 *emu);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_free(struct snd_emu10k1 *emu)</div><div class='add'>+static void snd_emu10k1_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct snd_emu10k1 *emu = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	if (emu-&gt;port) {	/* avoid access to already used hardware */</div><div class='ctx'> 		snd_emu10k1_fx8010_tram_setup(emu, 0);</div><div class='ctx'> 		snd_emu10k1_done(emu);</div><div class='hunk'>@@ -1254,45 +910,41 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1010) {</div><div class='ctx'> 		/* Disable 48Volt power to Audio Dock */</div><div class='del'>-		snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0);</div><div class='del'>-	}</div><div class='del'>-	if (emu-&gt;emu1010.firmware_thread)</div><div class='del'>-		kthread_stop(emu-&gt;emu1010.firmware_thread);</div><div class='del'>-	if (emu-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(emu-&gt;irq, emu);</div><div class='del'>-	/* remove reserved page */</div><div class='del'>-	if (emu-&gt;reserved_page) {</div><div class='del'>-		snd_emu10k1_synth_free(emu,</div><div class='del'>-			(struct snd_util_memblk *)emu-&gt;reserved_page);</div><div class='del'>-		emu-&gt;reserved_page = NULL;</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_DOCK_PWR, 0);</div><div class='ctx'> 	}</div><div class='del'>-	if (emu-&gt;memhdr)</div><div class='del'>-		snd_util_memhdr_free(emu-&gt;memhdr);</div><div class='add'>+	cancel_work_sync(&amp;emu-&gt;emu1010.work);</div><div class='add'>+	mutex_destroy(&amp;emu-&gt;emu1010.lock);</div><div class='add'>+	release_firmware(emu-&gt;firmware);</div><div class='add'>+	release_firmware(emu-&gt;dock_fw);</div><div class='add'>+	snd_util_memhdr_free(emu-&gt;memhdr);</div><div class='ctx'> 	if (emu-&gt;silent_page.area)</div><div class='ctx'> 		snd_dma_free_pages(&amp;emu-&gt;silent_page);</div><div class='ctx'> 	if (emu-&gt;ptb_pages.area)</div><div class='ctx'> 		snd_dma_free_pages(&amp;emu-&gt;ptb_pages);</div><div class='ctx'> 	vfree(emu-&gt;page_ptr_table);</div><div class='ctx'> 	vfree(emu-&gt;page_addr_table);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	free_pm_buffer(emu);</div><div class='ctx'> #endif</div><div class='del'>-	if (emu-&gt;port)</div><div class='del'>-		pci_release_regions(emu-&gt;pci);</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;ca0151_chip) /* P16V */</div><div class='del'>-		snd_p16v_free(emu);</div><div class='del'>-	pci_disable_device(emu-&gt;pci);</div><div class='del'>-	kfree(emu);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_emu10k1 *emu = device-&gt;device_data;</div><div class='del'>-	return snd_emu10k1_free(emu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='add'>+static const struct snd_emu_chip_details emu_chip_details[] = {</div><div class='add'>+	/* Audigy 5/Rx SB1550 */</div><div class='add'>+	/* Tested by michael@gernoth.net 28 Mar 2015 */</div><div class='add'>+	/* DSP: CA10300-IAT LF</div><div class='add'>+	 * DAC: Cirrus Logic CS4382-KQZ</div><div class='add'>+	 * ADC: Philips 1361T</div><div class='add'>+	 * AC97: Sigmatel STAC9750</div><div class='add'>+	 * CA0151: None</div><div class='add'>+	 */</div><div class='add'>+	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10241102,</div><div class='add'>+	 .driver = "Audigy2", .name = "SB Audigy 5/Rx [SB1550]",</div><div class='add'>+	 .id = "Audigy2",</div><div class='add'>+	 .emu10k2_chip = 1,</div><div class='add'>+	 .ca0108_chip = 1,</div><div class='add'>+	 .spk71 = 1,</div><div class='add'>+	 .adc_1361t = 1,  /* 24 bit capture instead of 16bit */</div><div class='add'>+	 .ac97_chip = 1},</div><div class='ctx'> 	/* Audigy4 (Not PRO) SB0610 */</div><div class='ctx'> 	/* Tested by James@superbug.co.uk 4th April 2006 */</div><div class='ctx'> 	/* A_IOCFG bits</div><div class='hunk'>@@ -1349,6 +1001,15 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 * AC97: STAC9750</div><div class='ctx'> 	 * CA0151: None</div><div class='ctx'> 	 */</div><div class='add'>+	/*</div><div class='add'>+	 * A_IOCFG Input (GPIO)</div><div class='add'>+	 * 0x400  = Front analog jack plugged in. (Green socket)</div><div class='add'>+	 * 0x1000 = Rear analog jack plugged in. (Black socket)</div><div class='add'>+	 * 0x2000 = Center/LFE analog jack plugged in. (Orange socket)</div><div class='add'>+	 * A_IOCFG Output (GPIO)</div><div class='add'>+	 * 0x60 = Sound out of front Left.</div><div class='add'>+	 * Win sets it to 0xXX61</div><div class='add'>+	 */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,</div><div class='ctx'> 	 .driver = "Audigy2", .name = "SB Audigy 2 Value [SB0400]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='hunk'>@@ -1389,7 +1050,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 *</div><div class='ctx'> 	 */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,</div><div class='del'>-	 .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",</div><div class='add'>+	 .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0108_chip = 1,</div><div class='hunk'>@@ -1397,9 +1058,12 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .spi_dac = 1,</div><div class='ctx'> 	 .i2c_adc = 1,</div><div class='ctx'> 	 .spk71 = 1} ,</div><div class='add'>+	/* This is MAEM8950 "Mana" */</div><div class='add'>+	/* Attach MicroDock[M] to make it an E-MU 1616[m]. */</div><div class='add'>+	/* Does NOT support sync daughter card (obviously). */</div><div class='ctx'> 	/* Tested by James@superbug.co.uk 4th Nov 2007. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,</div><div class='del'>-	 .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]",</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 02 CardBus [MAEM8950]",</div><div class='ctx'> 	 .id = "EMU1010",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0108_chip = 1,</div><div class='hunk'>@@ -1407,40 +1071,75 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .spk71 = 1 ,</div><div class='ctx'> 	 .emu_model = EMU_MODEL_EMU1616},</div><div class='ctx'> 	/* Tested by James@superbug.co.uk 4th Nov 2007. */</div><div class='del'>-	/* This is MAEM8960, 0202 is MAEM 8980 */</div><div class='add'>+	/* This is MAEM8960 "Hana3", 0202 is MAEM8980 */</div><div class='add'>+	/* Attach 0202 daughter card to make it an E-MU 1212m, OR a</div><div class='add'>+	 * MicroDock[M] to make it an E-MU 1616[m]. */</div><div class='add'>+	/* Does NOT support sync daughter card. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,</div><div class='del'>-	 .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]",</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 1010b PCI [MAEM8960]",</div><div class='ctx'> 	 .id = "EMU1010",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0108_chip = 1,</div><div class='ctx'> 	 .spk71 = 1,</div><div class='ctx'> 	 .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */</div><div class='add'>+	/* Tested by Maxim Kachur &lt;mcdebugger@duganet.ru&gt; 17th Oct 2012. */</div><div class='add'>+	/* This is MAEM8986, 0202 is MAEM8980 */</div><div class='add'>+	/* Attach 0202 daughter card to make it an E-MU 1212m, OR a</div><div class='add'>+	 * MicroDockM to make it an E-MU 1616m. The non-m</div><div class='add'>+	 * version was never sold with this card, but should</div><div class='add'>+	 * still work. */</div><div class='add'>+	/* Does NOT support sync daughter card. */</div><div class='add'>+	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102,</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 1010 PCIe [MAEM8986]",</div><div class='add'>+	 .id = "EMU1010",</div><div class='add'>+	 .emu10k2_chip = 1,</div><div class='add'>+	 .ca0108_chip = 1,</div><div class='add'>+	 .spk71 = 1,</div><div class='add'>+	 .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 PCIe */</div><div class='ctx'> 	/* Tested by James@superbug.co.uk 8th July 2005. */</div><div class='del'>-	/* This is MAEM8810, 0202 is MAEM8820 */</div><div class='add'>+	/* This is MAEM8810 "Hana", 0202 is MAEM8820 "Hamoa" */</div><div class='add'>+	/* Attach 0202 daughter card to make it an E-MU 1212m, OR an</div><div class='add'>+	 * AudioDock[M] to make it an E-MU 1820[m]. */</div><div class='add'>+	/* Supports sync daughter card. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,</div><div class='del'>-	 .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]",</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 1010 [MAEM8810]",</div><div class='ctx'> 	 .id = "EMU1010",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0102_chip = 1,</div><div class='ctx'> 	 .spk71 = 1,</div><div class='ctx'> 	 .emu_model = EMU_MODEL_EMU1010}, /* EMU 1010 old revision */</div><div class='del'>-	/* EMU0404b */</div><div class='add'>+	/* This is MAEM8852 "HanaLiteLite" */</div><div class='add'>+	/* Supports sync daughter card. */</div><div class='add'>+	/* Tested by oswald.buddenhagen@gmx.de Mar 2023. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,</div><div class='del'>-	 .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]",</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 0404b PCI [MAEM8852]",</div><div class='ctx'> 	 .id = "EMU0404",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0108_chip = 1,</div><div class='del'>-	 .spk71 = 1,</div><div class='add'>+	 .spk20 = 1,</div><div class='add'>+	 .no_adat = 1,</div><div class='ctx'> 	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 new revision */</div><div class='add'>+	/* This is MAEM8850 "HanaLite" */</div><div class='add'>+	/* Supports sync daughter card. */</div><div class='ctx'> 	/* Tested by James@superbug.co.uk 20-3-2007. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,</div><div class='del'>-	 .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]",</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 0404 [MAEM8850]",</div><div class='ctx'> 	 .id = "EMU0404",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0102_chip = 1,</div><div class='del'>-	 .spk71 = 1,</div><div class='add'>+	 .spk20 = 1,</div><div class='add'>+	 .no_adat = 1,</div><div class='ctx'> 	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */</div><div class='del'>-	/* Note that all E-mu cards require kernel 2.6 or newer. */</div><div class='add'>+	/* EMU0404 PCIe */</div><div class='add'>+	/* Does NOT support sync daughter card. */</div><div class='add'>+	{.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,</div><div class='add'>+	 .driver = "Audigy2", .name = "E-MU 0404 PCIe [MAEM8984]",</div><div class='add'>+	 .id = "EMU0404",</div><div class='add'>+	 .emu10k2_chip = 1,</div><div class='add'>+	 .ca0108_chip = 1,</div><div class='add'>+	 .spk20 = 1,</div><div class='add'>+	 .no_adat = 1,</div><div class='add'>+	 .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0008,</div><div class='ctx'> 	 .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='hunk'>@@ -1471,6 +1170,18 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .spdif_bug = 1,</div><div class='ctx'> 	 .invert_shared_spdif = 1,	/* digital/analog switch swapped */</div><div class='ctx'> 	 .ac97_chip = 1} ,</div><div class='add'>+	/* 0x20051102 also has SB0350 written on it, treated as Audigy 2 ZS by</div><div class='add'>+	   Creative's Windows driver */</div><div class='add'>+	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20051102,</div><div class='add'>+	 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350a]",</div><div class='add'>+	 .id = "Audigy2",</div><div class='add'>+	 .emu10k2_chip = 1,</div><div class='add'>+	 .ca0102_chip = 1,</div><div class='add'>+	 .ca0151_chip = 1,</div><div class='add'>+	 .spk71 = 1,</div><div class='add'>+	 .spdif_bug = 1,</div><div class='add'>+	 .invert_shared_spdif = 1,	/* digital/analog switch swapped */</div><div class='add'>+	 .ac97_chip = 1} ,</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,</div><div class='ctx'> 	 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='hunk'>@@ -1509,8 +1220,10 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .spdif_bug = 1,</div><div class='ctx'> 	 .adc_1361t = 1,  /* 24 bit capture instead of 16bit */</div><div class='ctx'> 	 .ac97_chip = 1} ,</div><div class='add'>+	/* Audigy 2 Platinum EX */</div><div class='add'>+	/* Win driver sets A_IOCFG output to 0x1c00 */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,</div><div class='del'>-	 .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",</div><div class='add'>+	 .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='ctx'> 	 .emu10k2_chip = 1,</div><div class='ctx'> 	 .ca0102_chip = 1,</div><div class='hunk'>@@ -1529,6 +1242,8 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .spdif_bug = 1,</div><div class='ctx'> 	 .invert_shared_spdif = 1,	/* digital/analog switch swapped */</div><div class='ctx'> 	 .ac97_chip = 1} ,</div><div class='add'>+	/* Audigy 2 Platinum */</div><div class='add'>+	/* Win driver sets A_IOCFG output to 0xa00 */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,</div><div class='ctx'> 	 .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",</div><div class='ctx'> 	 .id = "Audigy2",</div><div class='hunk'>@@ -1634,6 +1349,9 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .emu10k1_chip = 1,</div><div class='ctx'> 	 .ac97_chip = 1,</div><div class='ctx'> 	 .sblive51 = 1} ,</div><div class='add'>+	/* SB Live! Platinum */</div><div class='add'>+	/* Win driver sets A_IOCFG output to 0 */</div><div class='add'>+	/* Tested by Jonathan Dowland &lt;jon@dow.land&gt; Apr 2023. */</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,</div><div class='ctx'> 	 .driver = "EMU10K1", .name = "SB Live! Platinum [CT4760P]",</div><div class='ctx'> 	 .id = "Live",</div><div class='hunk'>@@ -1683,7 +1401,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	 .ac97_chip = 1,</div><div class='ctx'> 	 .sblive51 = 1} ,</div><div class='ctx'> 	{.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,</div><div class='del'>-	 .driver = "EMU10K1", .name = "E-mu APS [PC545]",</div><div class='add'>+	 .driver = "EMU10K1", .name = "E-MU APS [PC545]",</div><div class='ctx'> 	 .id = "APS",</div><div class='ctx'> 	 .emu10k1_chip = 1,</div><div class='ctx'> 	 .ecard = 1} ,</div><div class='hunk'>@@ -1708,36 +1426,57 @@ static struct snd_emu_chip_details emu_chip_details[] = {</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='add'>+/*</div><div class='add'>+ * The chip (at least the Audigy 2 CA0102 chip, but most likely others, too)</div><div class='add'>+ * has a problem that from time to time it likes to do few DMA reads a bit</div><div class='add'>+ * beyond its normal allocation and gets very confused if these reads get</div><div class='add'>+ * blocked by a IOMMU.</div><div class='add'>+ *</div><div class='add'>+ * This behaviour has been observed for the first (reserved) page</div><div class='add'>+ * (for which it happens multiple times at every playback), often for various</div><div class='add'>+ * synth pages and sometimes for PCM playback buffers and the page table</div><div class='add'>+ * memory itself.</div><div class='add'>+ *</div><div class='add'>+ * As a workaround let's widen these DMA allocations by an extra page if we</div><div class='add'>+ * detect that the device is behind a non-passthrough IOMMU.</div><div class='add'>+ */</div><div class='add'>+static void snd_emu10k1_detect_iommu(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	struct iommu_domain *domain;</div><div class='add'>+</div><div class='add'>+	emu-&gt;iommu_workaround = false;</div><div class='add'>+</div><div class='add'>+	domain = iommu_get_domain_for_dev(emu-&gt;card-&gt;dev);</div><div class='add'>+	if (!domain || domain-&gt;type == IOMMU_DOMAIN_IDENTITY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_notice(emu-&gt;card-&gt;dev,</div><div class='add'>+		   "non-passthrough IOMMU detected, widening DMA allocations");</div><div class='add'>+	emu-&gt;iommu_workaround = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 		       struct pci_dev *pci,</div><div class='ctx'> 		       unsigned short extin_mask,</div><div class='ctx'> 		       unsigned short extout_mask,</div><div class='ctx'> 		       long max_cache_bytes,</div><div class='ctx'> 		       int enable_ir,</div><div class='del'>-		       uint subsystem,</div><div class='del'>-		       struct snd_emu10k1 **remu)</div><div class='add'>+		       uint subsystem)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu;</div><div class='add'>+	struct snd_emu10k1 *emu = card-&gt;private_data;</div><div class='ctx'> 	int idx, err;</div><div class='ctx'> 	int is_audigy;</div><div class='add'>+	size_t page_table_size;</div><div class='add'>+	__le32 *pgtbl;</div><div class='ctx'> 	unsigned int silent_page;</div><div class='ctx'> 	const struct snd_emu_chip_details *c;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_emu10k1_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*remu = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	emu = kzalloc(sizeof(*emu), GFP_KERNEL);</div><div class='del'>-	if (emu == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	card-&gt;private_free = snd_emu10k1_free;</div><div class='ctx'> 	emu-&gt;card = card;</div><div class='ctx'> 	spin_lock_init(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;emu-&gt;emu_lock);</div><div class='hunk'>@@ -1753,11 +1492,15 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 	emu-&gt;irq = -1;</div><div class='ctx'> 	emu-&gt;synth = NULL;</div><div class='ctx'> 	emu-&gt;get_synth_voice = NULL;</div><div class='add'>+	INIT_WORK(&amp;emu-&gt;emu1010.work, emu1010_work);</div><div class='add'>+	mutex_init(&amp;emu-&gt;emu1010.lock);</div><div class='ctx'> 	/* read revision &amp; serial */</div><div class='ctx'> 	emu-&gt;revision = pci-&gt;revision;</div><div class='ctx'> 	pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &amp;emu-&gt;serial);</div><div class='ctx'> 	pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &amp;emu-&gt;model);</div><div class='del'>-	snd_printdd("vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n", pci-&gt;vendor, pci-&gt;device, emu-&gt;serial, emu-&gt;model);</div><div class='add'>+	dev_dbg(card-&gt;dev,</div><div class='add'>+		"vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n",</div><div class='add'>+		pci-&gt;vendor, pci-&gt;device, emu-&gt;serial, emu-&gt;model);</div><div class='ctx'> </div><div class='ctx'> 	for (c = emu_chip_details; c-&gt;vendor; c++) {</div><div class='ctx'> 		if (c-&gt;vendor == pci-&gt;vendor &amp;&amp; c-&gt;device == pci-&gt;device) {</div><div class='hunk'>@@ -1776,51 +1519,38 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (c-&gt;vendor == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "emu10k1: Card not recognised\n");</div><div class='del'>-		kfree(emu);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+		dev_err(card-&gt;dev, "emu10k1: Card not recognised\n");</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	emu-&gt;card_capabilities = c;</div><div class='ctx'> 	if (c-&gt;subsystem &amp;&amp; !subsystem)</div><div class='del'>-		snd_printdd("Sound card name = %s\n", c-&gt;name);</div><div class='add'>+		dev_dbg(card-&gt;dev, "Sound card name = %s\n", c-&gt;name);</div><div class='ctx'> 	else if (subsystem)</div><div class='del'>-		snd_printdd("Sound card name = %s, "</div><div class='add'>+		dev_dbg(card-&gt;dev, "Sound card name = %s, "</div><div class='ctx'> 			"vendor = 0x%x, device = 0x%x, subsystem = 0x%x. "</div><div class='ctx'> 			"Forced to subsystem = 0x%x\n",	c-&gt;name,</div><div class='ctx'> 			pci-&gt;vendor, pci-&gt;device, emu-&gt;serial, c-&gt;subsystem);</div><div class='ctx'> 	else</div><div class='del'>-		snd_printdd("Sound card name = %s, "</div><div class='add'>+		dev_dbg(card-&gt;dev, "Sound card name = %s, "</div><div class='ctx'> 			"vendor = 0x%x, device = 0x%x, subsystem = 0x%x.\n",</div><div class='ctx'> 			c-&gt;name, pci-&gt;vendor, pci-&gt;device,</div><div class='ctx'> 			emu-&gt;serial);</div><div class='ctx'> </div><div class='del'>-	if (!*card-&gt;id &amp;&amp; c-&gt;id) {</div><div class='del'>-		int i, n = 0;</div><div class='del'>-		strlcpy(card-&gt;id, c-&gt;id, sizeof(card-&gt;id));</div><div class='del'>-		for (;;) {</div><div class='del'>-			for (i = 0; i &lt; snd_ecards_limit; i++) {</div><div class='del'>-				if (snd_cards[i] &amp;&amp; !strcmp(snd_cards[i]-&gt;id, card-&gt;id))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (i &gt;= snd_ecards_limit)</div><div class='del'>-				break;</div><div class='del'>-			n++;</div><div class='del'>-			if (n &gt;= SNDRV_CARDS)</div><div class='del'>-				break;</div><div class='del'>-			snprintf(card-&gt;id, sizeof(card-&gt;id), "%s_%d", c-&gt;id, n);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!*card-&gt;id &amp;&amp; c-&gt;id)</div><div class='add'>+		strscpy(card-&gt;id, c-&gt;id, sizeof(card-&gt;id));</div><div class='ctx'> </div><div class='ctx'> 	is_audigy = emu-&gt;audigy = c-&gt;emu10k2_chip;</div><div class='ctx'> </div><div class='add'>+	snd_emu10k1_detect_iommu(emu);</div><div class='add'>+</div><div class='add'>+	/* set addressing mode */</div><div class='add'>+	emu-&gt;address_mode = is_audigy ? 0 : 1;</div><div class='ctx'> 	/* set the DMA transfer mask */</div><div class='del'>-	emu-&gt;dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;</div><div class='del'>-	if (pci_set_dma_mask(pci, emu-&gt;dma_mask) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, emu-&gt;dma_mask) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu-&gt;dma_mask);</div><div class='del'>-		kfree(emu);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	emu-&gt;dma_mask = emu-&gt;address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK;</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, emu-&gt;dma_mask) &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support PCI busmaster DMA with mask 0x%lx\n",</div><div class='add'>+			emu-&gt;dma_mask);</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (is_audigy)</div><div class='hunk'>@@ -1828,49 +1558,51 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 	else</div><div class='ctx'> 		emu-&gt;gpr_base = FXGPREGBASE;</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pci, "EMU10K1");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(emu);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "EMU10K1");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	emu-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'> </div><div class='ctx'> 	emu-&gt;max_cache_pages = max_cache_bytes &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				32 * 1024, &amp;emu-&gt;ptb_pages) &lt; 0) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	emu-&gt;page_ptr_table = vmalloc(emu-&gt;max_cache_pages * sizeof(void *));</div><div class='del'>-	emu-&gt;page_addr_table = vmalloc(emu-&gt;max_cache_pages *</div><div class='del'>-				       sizeof(unsigned long));</div><div class='del'>-	if (emu-&gt;page_ptr_table == NULL || emu-&gt;page_addr_table == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	page_table_size = sizeof(u32) * (emu-&gt;address_mode ? MAXPAGES1 :</div><div class='add'>+					 MAXPAGES0);</div><div class='add'>+	if (snd_emu10k1_alloc_pages_maybe_wider(emu, page_table_size,</div><div class='add'>+						&amp;emu-&gt;ptb_pages) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev_dbg(card-&gt;dev, "page table address range is %.8lx:%.8lx\n",</div><div class='add'>+		(unsigned long)emu-&gt;ptb_pages.addr,</div><div class='add'>+		(unsigned long)(emu-&gt;ptb_pages.addr + emu-&gt;ptb_pages.bytes));</div><div class='add'>+</div><div class='add'>+	emu-&gt;page_ptr_table = vmalloc(array_size(sizeof(void *),</div><div class='add'>+						 emu-&gt;max_cache_pages));</div><div class='add'>+	emu-&gt;page_addr_table = vmalloc(array_size(sizeof(unsigned long),</div><div class='add'>+						  emu-&gt;max_cache_pages));</div><div class='add'>+	if (!emu-&gt;page_ptr_table || !emu-&gt;page_addr_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (snd_emu10k1_alloc_pages_maybe_wider(emu, EMUPAGESIZE,</div><div class='add'>+						&amp;emu-&gt;silent_page) &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	dev_dbg(card-&gt;dev, "silent page range is %.8lx:%.8lx\n",</div><div class='add'>+		(unsigned long)emu-&gt;silent_page.addr,</div><div class='add'>+		(unsigned long)(emu-&gt;silent_page.addr +</div><div class='add'>+				emu-&gt;silent_page.bytes));</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				EMUPAGESIZE, &amp;emu-&gt;silent_page) &lt; 0) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='ctx'> 	emu-&gt;memhdr = snd_util_memhdr_new(emu-&gt;max_cache_pages * PAGE_SIZE);</div><div class='del'>-	if (emu-&gt;memhdr == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	if (!emu-&gt;memhdr)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	emu-&gt;memhdr-&gt;block_extra_size = sizeof(struct snd_emu10k1_memblk) -</div><div class='ctx'> 		sizeof(struct snd_util_memblk);</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='del'>-	emu-&gt;fx8010.fxbus_mask = 0x303f;</div><div class='add'>+	// The masks are not used for Audigy.</div><div class='add'>+	// FIXME: these should come from the card_capabilites table.</div><div class='ctx'> 	if (extin_mask == 0)</div><div class='del'>-		extin_mask = 0x3fcf;</div><div class='add'>+		extin_mask = 0x3fcf;  // EXTIN_*</div><div class='ctx'> 	if (extout_mask == 0)</div><div class='del'>-		extout_mask = 0x7fff;</div><div class='add'>+		extout_mask = 0x7fff;  // EXTOUT_*</div><div class='ctx'> 	emu-&gt;fx8010.extin_mask = extin_mask;</div><div class='ctx'> 	emu-&gt;fx8010.extout_mask = extout_mask;</div><div class='ctx'> 	emu-&gt;enable_ir = enable_ir;</div><div class='hunk'>@@ -1878,18 +1610,16 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca_cardbus_chip) {</div><div class='ctx'> 		err = snd_emu10k1_cardbus_init(emu);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ecard) {</div><div class='ctx'> 		err = snd_emu10k1_ecard_init(emu);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			goto error;</div><div class='add'>+			return err;</div><div class='ctx'> 	} else if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='ctx'> 		err = snd_emu10k1_emu1010_init(emu);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_emu10k1_free(emu);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* 5.1: Enable the additional AC97 Slots. If the emu10k1 version</div><div class='ctx'> 			does not support this, it shouldn't do any harm */</div><div class='hunk'>@@ -1903,12 +1633,11 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 	emu-&gt;fx8010.etram_pages.bytes = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* irq handler must be registered after I/O ports are activated */</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_emu10k1_interrupt, IRQF_SHARED,</div><div class='del'>-			"EMU10K1", emu)) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_emu10k1_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, emu))</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	emu-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = emu-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Init to 0x02109204 :</div><div class='hunk'>@@ -1930,57 +1659,40 @@ int __devinit snd_emu10k1_create(struct snd_card *card,</div><div class='ctx'> 		SPCS_GENERATIONSTATUS | 0x00001200 |</div><div class='ctx'> 		0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT;</div><div class='ctx'> </div><div class='del'>-	emu-&gt;reserved_page = (struct snd_emu10k1_memblk *)</div><div class='del'>-		snd_emu10k1_synth_alloc(emu, 4096);</div><div class='del'>-	if (emu-&gt;reserved_page)</div><div class='del'>-		emu-&gt;reserved_page-&gt;map_locked = 1;</div><div class='del'>-</div><div class='ctx'> 	/* Clear silent pages and set up pointers */</div><div class='del'>-	memset(emu-&gt;silent_page.area, 0, PAGE_SIZE);</div><div class='del'>-	silent_page = emu-&gt;silent_page.addr &lt;&lt; 1;</div><div class='del'>-	for (idx = 0; idx &lt; MAXPAGES; idx++)</div><div class='del'>-		((u32 *)emu-&gt;ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx);</div><div class='add'>+	memset(emu-&gt;silent_page.area, 0, emu-&gt;silent_page.bytes);</div><div class='add'>+	silent_page = emu-&gt;silent_page.addr &lt;&lt; emu-&gt;address_mode;</div><div class='add'>+	pgtbl = (__le32 *)emu-&gt;ptb_pages.area;</div><div class='add'>+	for (idx = 0; idx &lt; (emu-&gt;address_mode ? MAXPAGES1 : MAXPAGES0); idx++)</div><div class='add'>+		pgtbl[idx] = cpu_to_le32(silent_page | idx);</div><div class='ctx'> </div><div class='ctx'> 	/* set up voice indices */</div><div class='del'>-	for (idx = 0; idx &lt; NUM_G; idx++) {</div><div class='del'>-		emu-&gt;voices[idx].emu = emu;</div><div class='add'>+	for (idx = 0; idx &lt; NUM_G; idx++)</div><div class='ctx'> 		emu-&gt;voices[idx].number = idx;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = snd_emu10k1_init(emu, enable_ir, 0);</div><div class='add'>+	err = snd_emu10k1_init(emu, enable_ir);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+		return err;</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	err = alloc_pm_buffer(emu);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/*  Initialize the effect engine */</div><div class='ctx'> 	err = snd_emu10k1_init_efx(emu);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='add'>+		return err;</div><div class='ctx'> 	snd_emu10k1_audio_enable(emu);</div><div class='ctx'> </div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+#ifdef CONFIG_SND_PROC_FS</div><div class='ctx'> 	snd_emu10k1_proc_init(emu);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-	*remu = emu;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_emu10k1_free(emu);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static unsigned char saved_regs[] = {</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static const unsigned char saved_regs[] = {</div><div class='ctx'> 	CPF, PTRX, CVCF, VTFT, Z1, Z2, PSST, DSL, CCCA, CCR, CLP,</div><div class='ctx'> 	FXRT, MAPA, MAPB, ENVVOL, ATKHLDV, DCYSUSV, LFOVAL1, ENVVAL,</div><div class='ctx'> 	ATKHLDM, DCYSUSM, LFOVAL2, IP, IFATN, PEFE, FMMOD, TREMFRQ, FM2FRQ2,</div><div class='hunk'>@@ -1989,20 +1701,20 @@ static unsigned char saved_regs[] = {</div><div class='ctx'> 	SPBYPASS, AC97SLOT, CDSRCS, GPSRCS, ZVSRCS, MICIDX, ADCIDX, FXIDX,</div><div class='ctx'> 	0xff /* end */</div><div class='ctx'> };</div><div class='del'>-static unsigned char saved_regs_audigy[] = {</div><div class='del'>-	A_ADCIDX, A_MICIDX, A_FXWC1, A_FXWC2, A_SAMPLE_RATE,</div><div class='add'>+static const unsigned char saved_regs_audigy[] = {</div><div class='add'>+	A_ADCIDX, A_MICIDX, A_FXWC1, A_FXWC2, A_EHC,</div><div class='ctx'> 	A_FXRT2, A_SENDAMOUNTS, A_FXRT1,</div><div class='ctx'> 	0xff /* end */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='add'>+static int alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int size;</div><div class='ctx'> </div><div class='ctx'> 	size = ARRAY_SIZE(saved_regs);</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='ctx'> 		size += ARRAY_SIZE(saved_regs_audigy);</div><div class='del'>-	emu-&gt;saved_ptr = vmalloc(4 * NUM_G * size);</div><div class='add'>+	emu-&gt;saved_ptr = vmalloc(array3_size(4, NUM_G, size));</div><div class='ctx'> 	if (!emu-&gt;saved_ptr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	if (snd_emu10k1_efx_alloc_pm_buffer(emu) &lt; 0)</div><div class='hunk'>@@ -2024,7 +1736,7 @@ static void free_pm_buffer(struct snd_emu10k1 *emu)</div><div class='ctx'> void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned char *reg;</div><div class='add'>+	const unsigned char *reg;</div><div class='ctx'> 	unsigned int *val;</div><div class='ctx'> </div><div class='ctx'> 	val = emu-&gt;saved_ptr;</div><div class='hunk'>@@ -2037,7 +1749,7 @@ void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu)</div><div class='ctx'> 				*val = snd_emu10k1_ptr_read(emu, *reg, i);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='del'>-		emu-&gt;saved_a_iocfg = inl(emu-&gt;port + A_IOCFG);</div><div class='add'>+		emu-&gt;saved_a_iocfg = inw(emu-&gt;port + A_IOCFG);</div><div class='ctx'> 	emu-&gt;saved_hcfg = inl(emu-&gt;port + HCFG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2051,20 +1763,20 @@ void snd_emu10k1_resume_init(struct snd_emu10k1 *emu)</div><div class='ctx'> 		snd_emu10k1_emu1010_init(emu);</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);</div><div class='del'>-	snd_emu10k1_init(emu, emu-&gt;enable_ir, 1);</div><div class='add'>+	snd_emu10k1_init(emu, emu-&gt;enable_ir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned char *reg;</div><div class='add'>+	const unsigned char *reg;</div><div class='ctx'> 	unsigned int *val;</div><div class='ctx'> </div><div class='ctx'> 	snd_emu10k1_audio_enable(emu);</div><div class='ctx'> </div><div class='ctx'> 	/* resore for spdif */</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='del'>-		outl(emu-&gt;saved_a_iocfg, emu-&gt;port + A_IOCFG);</div><div class='add'>+		outw(emu-&gt;saved_a_iocfg, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 	outl(emu-&gt;saved_hcfg, emu-&gt;port + HCFG);</div><div class='ctx'> </div><div class='ctx'> 	val = emu-&gt;saved_ptr;</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c<br/>index e10f027bde03..806b4f95cad1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_patch.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_patch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_patch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1_patch.c</a></div><div class='hunk'>@@ -1,21 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Patch transfer callback for Emu10k1</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Takashi iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> /*</div><div class='ctx'>  * All the code for loading in a patch.  There is very little that is</div><div class='hunk'>@@ -29,7 +16,7 @@</div><div class='ctx'> #define BLANK_LOOP_START	4</div><div class='ctx'> #define BLANK_LOOP_END		8</div><div class='ctx'> #define BLANK_LOOP_SIZE		12</div><div class='del'>-#define BLANK_HEAD_SIZE		32</div><div class='add'>+#define BLANK_HEAD_SIZE		3</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * allocate a sample block and copy data from userspace</div><div class='hunk'>@@ -39,60 +26,81 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,</div><div class='ctx'> 		       struct snd_util_memhdr *hdr,</div><div class='ctx'> 		       const void __user *data, long count)</div><div class='ctx'> {</div><div class='add'>+	u8 fill;</div><div class='add'>+	u32 xor;</div><div class='add'>+	int shift;</div><div class='ctx'> 	int offset;</div><div class='del'>-	int truesize, size, loopsize, blocksize;</div><div class='del'>-	int loopend, sampleend;</div><div class='del'>-	unsigned int start_addr;</div><div class='add'>+	int truesize, size, blocksize;</div><div class='add'>+	int loop_start, loop_end, loop_size, data_end, unroll;</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> </div><div class='ctx'> 	emu = rec-&gt;hw;</div><div class='ctx'> 	if (snd_BUG_ON(!sp || !hdr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (sp-&gt;v.size == 0) {</div><div class='del'>-		snd_printd("emu: rom font for sample %d\n", sp-&gt;v.sample);</div><div class='del'>-		return 0;</div><div class='add'>+	if (sp-&gt;v.mode_flags &amp; (SNDRV_SFNT_SAMPLE_BIDIR_LOOP | SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) {</div><div class='add'>+		/* should instead return -ENOTSUPP; but compatibility */</div><div class='add'>+		dev_warn(emu-&gt;card-&gt;dev,</div><div class='add'>+			 "Emu10k1 wavetable patch %d with unsupported loop feature\n",</div><div class='add'>+			 sp-&gt;v.sample);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* recalculate address offset */</div><div class='del'>-	sp-&gt;v.end -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.loopstart -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.loopend -= sp-&gt;v.start;</div><div class='del'>-	sp-&gt;v.start = 0;</div><div class='del'>-</div><div class='del'>-	/* some samples have invalid data.  the addresses are corrected in voice info */</div><div class='del'>-	sampleend = sp-&gt;v.end;</div><div class='del'>-	if (sampleend &gt; sp-&gt;v.size)</div><div class='del'>-		sampleend = sp-&gt;v.size;</div><div class='del'>-	loopend = sp-&gt;v.loopend;</div><div class='del'>-	if (loopend &gt; sampleend)</div><div class='del'>-		loopend = sampleend;</div><div class='del'>-</div><div class='del'>-	/* be sure loop points start &lt; end */</div><div class='del'>-	if (sp-&gt;v.loopstart &gt;= sp-&gt;v.loopend) {</div><div class='del'>-		int tmp = sp-&gt;v.loopstart;</div><div class='del'>-		sp-&gt;v.loopstart = sp-&gt;v.loopend;</div><div class='del'>-		sp-&gt;v.loopend = tmp;</div><div class='add'>+	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS) {</div><div class='add'>+		shift = 0;</div><div class='add'>+		fill = 0x80;</div><div class='add'>+		xor = (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_UNSIGNED) ? 0 : 0x80808080;</div><div class='add'>+	} else {</div><div class='add'>+		shift = 1;</div><div class='add'>+		fill = 0;</div><div class='add'>+		xor = (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_UNSIGNED) ? 0x80008000 : 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* compute true data size to be loaded */</div><div class='ctx'> 	truesize = sp-&gt;v.size + BLANK_HEAD_SIZE;</div><div class='del'>-	loopsize = 0;</div><div class='del'>-#if 0 /* not supported */</div><div class='del'>-	if (sp-&gt;v.mode_flags &amp; (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP))</div><div class='del'>-		loopsize = sp-&gt;v.loopend - sp-&gt;v.loopstart;</div><div class='del'>-	truesize += loopsize;</div><div class='del'>-#endif</div><div class='del'>-	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_NO_BLANK)</div><div class='add'>+	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_NO_BLANK) {</div><div class='ctx'> 		truesize += BLANK_LOOP_SIZE;</div><div class='add'>+		/* if no blank loop is attached in the sample, add it */</div><div class='add'>+		if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_SINGLESHOT) {</div><div class='add'>+			sp-&gt;v.loopstart = sp-&gt;v.end + BLANK_LOOP_START;</div><div class='add'>+			sp-&gt;v.loopend = sp-&gt;v.end + BLANK_LOOP_END;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	loop_start = sp-&gt;v.loopstart;</div><div class='add'>+	loop_end = sp-&gt;v.loopend;</div><div class='add'>+	loop_size = loop_end - loop_start;</div><div class='add'>+	if (!loop_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	data_end = sp-&gt;v.end;</div><div class='add'>+</div><div class='add'>+	/* recalculate offset */</div><div class='add'>+	sp-&gt;v.start += BLANK_HEAD_SIZE;</div><div class='add'>+	sp-&gt;v.end += BLANK_HEAD_SIZE;</div><div class='add'>+	sp-&gt;v.loopstart += BLANK_HEAD_SIZE;</div><div class='add'>+	sp-&gt;v.loopend += BLANK_HEAD_SIZE;</div><div class='add'>+</div><div class='add'>+	// Automatic pre-filling of the cache does not work in the presence</div><div class='add'>+	// of loops (*), and we don't want to fill it manually, as that is</div><div class='add'>+	// fiddly and slow. So we unroll the loop until the loop end is</div><div class='add'>+	// beyond the cache size.</div><div class='add'>+	// (*) Strictly speaking, a single iteration is supported (that's</div><div class='add'>+	// how it works when the playback engine runs), but handling this</div><div class='add'>+	// special case is not worth it.</div><div class='add'>+	unroll = 0;</div><div class='add'>+	while (sp-&gt;v.loopend &lt; 64) {</div><div class='add'>+		truesize += loop_size;</div><div class='add'>+		sp-&gt;v.loopstart += loop_size;</div><div class='add'>+		sp-&gt;v.loopend += loop_size;</div><div class='add'>+		sp-&gt;v.end += loop_size;</div><div class='add'>+		unroll++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* try to allocate a memory block */</div><div class='del'>-	blocksize = truesize;</div><div class='del'>-	if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS))</div><div class='del'>-		blocksize *= 2;</div><div class='add'>+	blocksize = truesize &lt;&lt; shift;</div><div class='ctx'> 	sp-&gt;block = snd_emu10k1_synth_alloc(emu, blocksize);</div><div class='ctx'> 	if (sp-&gt;block == NULL) {</div><div class='del'>-		snd_printd("emu10k1: synth malloc failed (size=%d)\n", blocksize);</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+			"synth malloc failed (size=%d)\n", blocksize);</div><div class='ctx'> 		/* not ENOMEM (for compatibility with OSS) */</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -101,110 +109,43 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,</div><div class='ctx'> </div><div class='ctx'> 	/* write blank samples at head */</div><div class='ctx'> 	offset = 0;</div><div class='del'>-	size = BLANK_HEAD_SIZE;</div><div class='del'>-	if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS))</div><div class='del'>-		size *= 2;</div><div class='del'>-	if (offset + size &gt; blocksize)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	snd_emu10k1_synth_bzero(emu, sp-&gt;block, offset, size);</div><div class='add'>+	size = BLANK_HEAD_SIZE &lt;&lt; shift;</div><div class='add'>+	snd_emu10k1_synth_memset(emu, sp-&gt;block, offset, size, fill);</div><div class='ctx'> 	offset += size;</div><div class='ctx'> </div><div class='del'>-	/* copy start-&gt;loopend */</div><div class='del'>-	size = loopend;</div><div class='del'>-	if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS))</div><div class='del'>-		size *= 2;</div><div class='del'>-	if (offset + size &gt; blocksize)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (snd_emu10k1_synth_copy_from_user(emu, sp-&gt;block, offset, data, size)) {</div><div class='del'>-		snd_emu10k1_synth_free(emu, sp-&gt;block);</div><div class='del'>-		sp-&gt;block = NULL;</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-	offset += size;</div><div class='del'>-	data += size;</div><div class='del'>-</div><div class='del'>-#if 0 /* not suppported yet */</div><div class='del'>-	/* handle reverse (or bidirectional) loop */</div><div class='del'>-	if (sp-&gt;v.mode_flags &amp; (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) {</div><div class='del'>-		/* copy loop in reverse */</div><div class='del'>-		if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS)) {</div><div class='del'>-			int woffset;</div><div class='del'>-			unsigned short *wblock = (unsigned short*)block;</div><div class='del'>-			woffset = offset / 2;</div><div class='del'>-			if (offset + loopsize * 2 &gt; blocksize)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			for (i = 0; i &lt; loopsize; i++)</div><div class='del'>-				wblock[woffset + i] = wblock[woffset - i -1];</div><div class='del'>-			offset += loopsize * 2;</div><div class='del'>-		} else {</div><div class='del'>-			if (offset + loopsize &gt; blocksize)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			for (i = 0; i &lt; loopsize; i++)</div><div class='del'>-				block[offset + i] = block[offset - i -1];</div><div class='del'>-			offset += loopsize;</div><div class='add'>+	/* copy provided samples */</div><div class='add'>+	if (unroll &amp;&amp; loop_end &lt;= data_end) {</div><div class='add'>+		size = loop_end &lt;&lt; shift;</div><div class='add'>+		if (snd_emu10k1_synth_copy_from_user(emu, sp-&gt;block, offset, data, size, xor))</div><div class='add'>+			goto faulty;</div><div class='add'>+		offset += size;</div><div class='add'>+</div><div class='add'>+		data += loop_start &lt;&lt; shift;</div><div class='add'>+		while (--unroll &gt; 0) {</div><div class='add'>+			size = loop_size &lt;&lt; shift;</div><div class='add'>+			if (snd_emu10k1_synth_copy_from_user(emu, sp-&gt;block, offset, data, size, xor))</div><div class='add'>+				goto faulty;</div><div class='add'>+			offset += size;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* modify loop pointers */</div><div class='del'>-		if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_BIDIR_LOOP) {</div><div class='del'>-			sp-&gt;v.loopend += loopsize;</div><div class='del'>-		} else {</div><div class='del'>-			sp-&gt;v.loopstart += loopsize;</div><div class='del'>-			sp-&gt;v.loopend += loopsize;</div><div class='del'>-		}</div><div class='del'>-		/* add sample pointer */</div><div class='del'>-		sp-&gt;v.end += loopsize;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* loopend -&gt; sample end */</div><div class='del'>-	size = sp-&gt;v.size - loopend;</div><div class='del'>-	if (size &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS))</div><div class='del'>-		size *= 2;</div><div class='del'>-	if (snd_emu10k1_synth_copy_from_user(emu, sp-&gt;block, offset, data, size)) {</div><div class='del'>-		snd_emu10k1_synth_free(emu, sp-&gt;block);</div><div class='del'>-		sp-&gt;block = NULL;</div><div class='del'>-		return -EFAULT;</div><div class='add'>+		size = (data_end - loop_start) &lt;&lt; shift;</div><div class='add'>+	} else {</div><div class='add'>+		size = data_end &lt;&lt; shift;</div><div class='ctx'> 	}</div><div class='add'>+	if (snd_emu10k1_synth_copy_from_user(emu, sp-&gt;block, offset, data, size, xor))</div><div class='add'>+		goto faulty;</div><div class='ctx'> 	offset += size;</div><div class='ctx'> </div><div class='ctx'> 	/* clear rest of samples (if any) */</div><div class='ctx'> 	if (offset &lt; blocksize)</div><div class='del'>-		snd_emu10k1_synth_bzero(emu, sp-&gt;block, offset, blocksize - offset);</div><div class='del'>-</div><div class='del'>-	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_NO_BLANK) {</div><div class='del'>-		/* if no blank loop is attached in the sample, add it */</div><div class='del'>-		if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_SINGLESHOT) {</div><div class='del'>-			sp-&gt;v.loopstart = sp-&gt;v.end + BLANK_LOOP_START;</div><div class='del'>-			sp-&gt;v.loopend = sp-&gt;v.end + BLANK_LOOP_END;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0 /* not supported yet */</div><div class='del'>-	if (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_UNSIGNED) {</div><div class='del'>-		/* unsigned -&gt; signed */</div><div class='del'>-		if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS)) {</div><div class='del'>-			unsigned short *wblock = (unsigned short*)block;</div><div class='del'>-			for (i = 0; i &lt; truesize; i++)</div><div class='del'>-				wblock[i] ^= 0x8000;</div><div class='del'>-		} else {</div><div class='del'>-			for (i = 0; i &lt; truesize; i++)</div><div class='del'>-				block[i] ^= 0x80;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* recalculate offset */</div><div class='del'>-	start_addr = BLANK_HEAD_SIZE * 2;</div><div class='del'>-	if (! (sp-&gt;v.mode_flags &amp; SNDRV_SFNT_SAMPLE_8BITS))</div><div class='del'>-		start_addr &gt;&gt;= 1;</div><div class='del'>-	sp-&gt;v.start += start_addr;</div><div class='del'>-	sp-&gt;v.end += start_addr;</div><div class='del'>-	sp-&gt;v.loopstart += start_addr;</div><div class='del'>-	sp-&gt;v.loopend += start_addr;</div><div class='add'>+		snd_emu10k1_synth_memset(emu, sp-&gt;block, offset, blocksize - offset, fill);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+faulty:</div><div class='add'>+	snd_emu10k1_synth_free(emu, sp-&gt;block);</div><div class='add'>+	sp-&gt;block = NULL;</div><div class='add'>+	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c<br/>index ad7b71491fc4..662d20eb9689 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_synth.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_synth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_synth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1_synth.c</a></div><div class='hunk'>@@ -1,25 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (C) 2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  Routines for control of EMU10K1 WaveTable synth</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "emu10k1_synth_local.h"</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Takashi Iwai");</div><div class='ctx'> MODULE_DESCRIPTION("Routines for control of EMU10K1 WaveTable synth");</div><div class='hunk'>@@ -28,12 +16,12 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /*</div><div class='ctx'>  * create a new hardware dependent device for Emu10k1</div><div class='ctx'>  */</div><div class='del'>-static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_emu10k1_synth_probe(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_emux *emux;</div><div class='ctx'> 	struct snd_emu10k1 *hw;</div><div class='ctx'> 	struct snd_emu10k1_synth_arg *arg;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);</div><div class='ctx'> 	if (arg == NULL)</div><div class='hunk'>@@ -54,7 +42,6 @@ static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)</div><div class='ctx'> 	emux-&gt;hw = hw;</div><div class='ctx'> 	emux-&gt;max_voices = arg-&gt;max_voices;</div><div class='ctx'> 	emux-&gt;num_ports = arg-&gt;seq_ports;</div><div class='del'>-	emux-&gt;pitch_shift = -501;</div><div class='ctx'> 	emux-&gt;memhdr = hw-&gt;memhdr;</div><div class='ctx'> 	/* maximum two ports */</div><div class='ctx'> 	emux-&gt;midi_ports = arg-&gt;seq_ports &lt; 2 ? arg-&gt;seq_ports : 2;</div><div class='hunk'>@@ -68,21 +55,20 @@ static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;hw-&gt;voice_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;hw-&gt;voice_lock);</div><div class='ctx'> 	hw-&gt;synth = emux;</div><div class='ctx'> 	hw-&gt;get_synth_voice = snd_emu10k1_synth_get_voice;</div><div class='del'>-	spin_unlock_irqrestore(&amp;hw-&gt;voice_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;driver_data = emux;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)</div><div class='add'>+static int snd_emu10k1_synth_remove(struct device *_dev)</div><div class='ctx'> {</div><div class='add'>+	struct snd_seq_device *dev = to_seq_dev(_dev);</div><div class='ctx'> 	struct snd_emux *emux;</div><div class='ctx'> 	struct snd_emu10k1 *hw;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;driver_data == NULL)</div><div class='ctx'> 		return 0; /* not registered actually */</div><div class='hunk'>@@ -90,10 +76,10 @@ static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)</div><div class='ctx'> 	emux = dev-&gt;driver_data;</div><div class='ctx'> </div><div class='ctx'> 	hw = emux-&gt;hw;</div><div class='del'>-	spin_lock_irqsave(&amp;hw-&gt;voice_lock, flags);</div><div class='del'>-	hw-&gt;synth = NULL;</div><div class='del'>-	hw-&gt;get_synth_voice = NULL;</div><div class='del'>-	spin_unlock_irqrestore(&amp;hw-&gt;voice_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;hw-&gt;voice_lock) {</div><div class='add'>+		hw-&gt;synth = NULL;</div><div class='add'>+		hw-&gt;get_synth_voice = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_emux_free(emux);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -103,21 +89,14 @@ static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)</div><div class='ctx'>  *  INIT part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __init alsa_emu10k1_synth_init(void)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	static struct snd_seq_dev_ops ops = {</div><div class='del'>-		snd_emu10k1_synth_new_device,</div><div class='del'>-		snd_emu10k1_synth_delete_device,</div><div class='del'>-	};</div><div class='del'>-	return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &amp;ops,</div><div class='del'>-					      sizeof(struct snd_emu10k1_synth_arg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_emu10k1_synth_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_emu10k1_synth_init)</div><div class='del'>-module_exit(alsa_emu10k1_synth_exit)</div><div class='add'>+static struct snd_seq_driver emu10k1_synth_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.probe = snd_emu10k1_synth_probe,</div><div class='add'>+		.remove = snd_emu10k1_synth_remove,</div><div class='add'>+	},</div><div class='add'>+	.id = SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,</div><div class='add'>+	.argsize = sizeof(struct snd_emu10k1_synth_arg),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_snd_seq_driver(emu10k1_synth_driver);</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1_synth_local.h b/sound/pci/emu10k1/emu10k1_synth_local.h<br/>index 25f328ff639f..11373695344b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_synth_local.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1_synth_local.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1_synth_local.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1_synth_local.h</a></div><div class='hunk'>@@ -1,23 +1,10 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __EMU10K1_SYNTH_LOCAL_H</div><div class='ctx'> #define __EMU10K1_SYNTH_LOCAL_H</div><div class='ctx'> /*</div><div class='ctx'>  *  Local defininitons for Emu10k1 wavetable</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='head'>diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c<br/>index df47f738098d..9607a0f7174b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1x.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emu10k1x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emu10k1x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emu10k1x.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='ctx'>  *  Driver EMU10K1X chips</div><div class='hunk'>@@ -13,28 +14,14 @@</div><div class='ctx'>  *  Chips (SB0200 model):</div><div class='ctx'>  *    - EMU10K1X-DBQ</div><div class='ctx'>  *    - STAC 9708T</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -45,12 +32,11 @@</div><div class='ctx'> MODULE_AUTHOR("Francisco Moraes &lt;fmoraes@nc.rr.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("EMU10K1X");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Dell Creative Labs,SB Live!}");</div><div class='ctx'> </div><div class='ctx'> // module parameters (see "Module Parameters")</div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for the EMU10K1X soundcard.");</div><div class='hunk'>@@ -114,7 +100,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");</div><div class='ctx'> 						 */</div><div class='ctx'> #define PLAYBACK_LIST_SIZE	0x01		/* Size of list in bytes &lt;&lt; 16. E.g. 8 periods -&gt; 0x00380000  */</div><div class='ctx'> #define PLAYBACK_LIST_PTR	0x02		/* Pointer to the current period being played */</div><div class='del'>-#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA addresss */</div><div class='add'>+#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA address */</div><div class='ctx'> #define PLAYBACK_PERIOD_SIZE	0x05		/* Playback period size */</div><div class='ctx'> #define PLAYBACK_POINTER	0x06		/* Playback period pointer. Sample currently in DAC */</div><div class='ctx'> #define PLAYBACK_UNKNOWN1       0x07</div><div class='hunk'>@@ -180,7 +166,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");</div><div class='ctx'> </div><div class='ctx'> /* From 0x50 - 0x5f, last samples captured */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * The hardware has 3 channels for playback and 1 for capture.</div><div class='ctx'>  *  - channel 0 is the front channel</div><div class='ctx'>  *  - channel 1 is the rear channel</div><div class='hunk'>@@ -231,7 +217,6 @@ struct emu10k1x {</div><div class='ctx'> 	struct pci_dev *pci;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long port;</div><div class='del'>-	struct resource *res_port;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='ctx'> 	unsigned char revision;		/* chip revision */</div><div class='hunk'>@@ -248,13 +233,13 @@ struct emu10k1x {</div><div class='ctx'> 	struct emu10k1x_voice capture_voice;</div><div class='ctx'> 	u32 spdif_bits[3]; // SPDIF out setup</div><div class='ctx'> </div><div class='del'>-	struct snd_dma_buffer dma_buffer;</div><div class='add'>+	struct snd_dma_buffer *dma_buffer;</div><div class='ctx'> </div><div class='ctx'> 	struct emu10k1x_midi midi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1x_playback_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | </div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -273,7 +258,7 @@ static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1x_capture_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | </div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -296,16 +281,13 @@ static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,</div><div class='ctx'> 					  unsigned int reg, </div><div class='ctx'> 					  unsigned int chn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int regptr, val;</div><div class='add'>+	unsigned int regptr;</div><div class='ctx'>   </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-	val = inl(emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	return inl(emu-&gt;port + DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, </div><div class='hunk'>@@ -314,45 +296,36 @@ static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,</div><div class='ctx'> 				   unsigned int data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int regptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outl(regptr, emu-&gt;port + PTR);</div><div class='ctx'> 	outl(data, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int intr_enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	intr_enable = inl(emu-&gt;port + INTE) | intrenb;</div><div class='ctx'> 	outl(intr_enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int intr_enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	intr_enable = inl(emu-&gt;port + INTE) &amp; ~intrenb;</div><div class='ctx'> 	outl(intr_enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_gpio_write(struct emu10k1x *emu, unsigned int value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outl(value, emu-&gt;port + GPIO);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_pcm_free_substream(struct snd_pcm_runtime *runtime)</div><div class='hunk'>@@ -364,12 +337,14 @@ static void snd_emu10k1x_pcm_interrupt(struct emu10k1x *emu, struct emu10k1x_voi</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x_pcm *epcm;</div><div class='ctx'> </div><div class='del'>-	if ((epcm = voice-&gt;epcm) == NULL)</div><div class='add'>+	epcm = voice-&gt;epcm;</div><div class='add'>+	if (!epcm)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (epcm-&gt;substream == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> #if 0</div><div class='del'>-	snd_printk(KERN_INFO "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",</div><div class='add'>+	dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+		 "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",</div><div class='ctx'> 		   epcm-&gt;substream-&gt;ops-&gt;pointer(epcm-&gt;substream),</div><div class='ctx'> 		   snd_pcm_lib_period_bytes(epcm-&gt;substream),</div><div class='ctx'> 		   snd_pcm_lib_buffer_bytes(epcm-&gt;substream));</div><div class='hunk'>@@ -385,10 +360,11 @@ static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0) {</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='hunk'>@@ -424,8 +400,7 @@ static int snd_emu10k1x_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		epcm-&gt;voice-&gt;epcm = epcm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* hw_free callback */</div><div class='hunk'>@@ -445,7 +420,7 @@ static int snd_emu10k1x_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 		epcm-&gt;voice = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* prepare callback */</div><div class='hunk'>@@ -455,7 +430,7 @@ static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct emu10k1x_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	int voice = epcm-&gt;voice-&gt;number;</div><div class='del'>-	u32 *table_base = (u32 *)(emu-&gt;dma_buffer.area+1024*voice);</div><div class='add'>+	u32 *table_base = (u32 *)(emu-&gt;dma_buffer-&gt;area+1024*voice);</div><div class='ctx'> 	u32 period_size_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	</div><div class='hunk'>@@ -464,7 +439,7 @@ static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		*table_base++=period_size_bytes&lt;&lt;16;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu-&gt;dma_buffer.addr+1024*voice);</div><div class='add'>+	snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu-&gt;dma_buffer-&gt;addr+1024*voice);</div><div class='ctx'> 	snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_SIZE, voice, (runtime-&gt;periods - 1) &lt;&lt; 19);</div><div class='ctx'> 	snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_PTR, voice, 0);</div><div class='ctx'> 	snd_emu10k1x_ptr_write(emu, PLAYBACK_POINTER, voice, 0);</div><div class='hunk'>@@ -487,7 +462,11 @@ static int snd_emu10k1x_pcm_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int channel = epcm-&gt;voice-&gt;number;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-//	snd_printk(KERN_INFO "trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n", (int)emu, cmd, (int)substream-&gt;ops-&gt;pointer(substream));</div><div class='add'>+	/*</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n",</div><div class='add'>+		(int)emu, cmd, (int)substream-&gt;ops-&gt;pointer(substream));</div><div class='add'>+	*/</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -543,10 +522,9 @@ snd_emu10k1x_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operators */</div><div class='del'>-static struct snd_pcm_ops snd_emu10k1x_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1x_playback_ops = {</div><div class='ctx'> 	.open =        snd_emu10k1x_playback_open,</div><div class='ctx'> 	.close =       snd_emu10k1x_playback_close,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =   snd_emu10k1x_pcm_hw_params,</div><div class='ctx'> 	.hw_free =     snd_emu10k1x_pcm_hw_free,</div><div class='ctx'> 	.prepare =     snd_emu10k1x_pcm_prepare,</div><div class='hunk'>@@ -562,10 +540,12 @@ static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='del'>-                return err;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) &lt; 0)</div><div class='del'>-                return err;</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='ctx'> 	if (epcm == NULL)</div><div class='hunk'>@@ -603,8 +583,7 @@ static int snd_emu10k1x_pcm_hw_params_capture(struct snd_pcm_substream *substrea</div><div class='ctx'> 		epcm-&gt;voice-&gt;use = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* hw_free callback */</div><div class='hunk'>@@ -624,7 +603,7 @@ static int snd_emu10k1x_pcm_hw_free_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 		epcm-&gt;voice = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* prepare capture callback */</div><div class='hunk'>@@ -689,10 +668,9 @@ snd_emu10k1x_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1x_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1x_capture_ops = {</div><div class='ctx'> 	.open =        snd_emu10k1x_pcm_open_capture,</div><div class='ctx'> 	.close =       snd_emu10k1x_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =   snd_emu10k1x_pcm_hw_params_capture,</div><div class='ctx'> 	.hw_free =     snd_emu10k1x_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_emu10k1x_pcm_prepare_capture,</div><div class='hunk'>@@ -704,26 +682,20 @@ static unsigned short snd_emu10k1x_ac97_read(struct snd_ac97 *ac97,</div><div class='ctx'> 					     unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short val;</div><div class='ctx'>   </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='del'>-	val = inw(emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	return inw(emu-&gt;port + AC97DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_ac97_write(struct snd_ac97 *ac97,</div><div class='ctx'> 				    unsigned short reg, unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'>   </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='ctx'> 	outw(val, emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1x_ac97(struct emu10k1x *chip)</div><div class='hunk'>@@ -731,12 +703,13 @@ static int snd_emu10k1x_ac97(struct emu10k1x *chip)</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_emu10k1x_ac97_write,</div><div class='ctx'> 		.read = snd_emu10k1x_ac97_read,</div><div class='ctx'> 	};</div><div class='ctx'>   </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pbus-&gt;no_vra = 1; /* we don't need VRA */</div><div class='ctx'> </div><div class='hunk'>@@ -746,37 +719,15 @@ static int snd_emu10k1x_ac97(struct emu10k1x *chip)</div><div class='ctx'> 	return snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1x_free(struct emu10k1x *chip)</div><div class='add'>+static void snd_emu10k1x_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct emu10k1x *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0);</div><div class='ctx'> 	// disable interrupts</div><div class='ctx'> 	outl(0, chip-&gt;port + INTE);</div><div class='ctx'> 	// disable audio</div><div class='ctx'> 	outl(HCFG_LOCKSOUNDCACHE, chip-&gt;port + HCFG);</div><div class='del'>-</div><div class='del'>-	/* release the irq */</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-</div><div class='del'>-	// release the i/o port</div><div class='del'>-	release_and_free_resource(chip-&gt;res_port);</div><div class='del'>-</div><div class='del'>-	// release the DMA</div><div class='del'>-	if (chip-&gt;dma_buffer.area) {</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;dma_buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	// release the data</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_emu10k1x_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct emu10k1x *chip = device-&gt;device_data;</div><div class='del'>-	return snd_emu10k1x_free(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -826,22 +777,34 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	// acknowledge the interrupt if necessary</div><div class='ctx'> 	outl(status, chip-&gt;port + IPR);</div><div class='ctx'> </div><div class='del'>-	// snd_printk(KERN_INFO "interrupt %08x\n", status);</div><div class='add'>+	/* dev_dbg(chip-&gt;card-&gt;dev, "interrupt %08x\n", status); */</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)</div><div class='add'>+static const struct snd_pcm_chmap_elem surround_map[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_chmap_elem clfe_map[] = {</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_FC, SNDRV_CHMAP_LFE } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_emu10k1x_pcm(struct emu10k1x *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='add'>+	const struct snd_pcm_chmap_elem *map = NULL;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int capture = 0;</div><div class='ctx'>   </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	if (device == 0)</div><div class='ctx'> 		capture = 1;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "emu10k1x", device, 1, capture, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "emu10k1x", device, 1, capture, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'>   </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='hunk'>@@ -860,53 +823,41 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	switch(device) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		strcpy(pcm-&gt;name, "EMU10K1X Front");</div><div class='add'>+		strscpy(pcm-&gt;name, "EMU10K1X Front");</div><div class='add'>+		map = snd_pcm_std_chmaps;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		strcpy(pcm-&gt;name, "EMU10K1X Rear");</div><div class='add'>+		strscpy(pcm-&gt;name, "EMU10K1X Rear");</div><div class='add'>+		map = surround_map;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 2:</div><div class='del'>-		strcpy(pcm-&gt;name, "EMU10K1X Center/LFE");</div><div class='add'>+		strscpy(pcm-&gt;name, "EMU10K1X Center/LFE");</div><div class='add'>+		map = clfe_map;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	emu-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(emu-&gt;pci), </div><div class='del'>-					      32*1024, 32*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;emu-&gt;pci-&gt;dev, 32*1024, 32*1024);</div><div class='ctx'>   </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-  </div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, map, 2,</div><div class='add'>+				     1 &lt;&lt; 2, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_create(struct snd_card *card,</div><div class='del'>-					 struct pci_dev *pci,</div><div class='del'>-					 struct emu10k1x **rchip)</div><div class='add'>+static int snd_emu10k1x_create(struct snd_card *card,</div><div class='add'>+			       struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct emu10k1x *chip;</div><div class='add'>+	struct emu10k1x *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int ch;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_emu10k1x_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "error to set 28bit mask DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "error to set 28bit mask DMA\n");</div><div class='add'>+		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;card = card;</div><div class='hunk'>@@ -916,34 +867,31 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;emu_lock);</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;voice_lock);</div><div class='ctx'>   </div><div class='add'>+	err = pcim_request_all_regions(pci, "EMU10K1X");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	chip-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-	if ((chip-&gt;res_port = request_region(chip-&gt;port, 8,</div><div class='del'>-					     "EMU10K1X")) == NULL) { </div><div class='del'>-		snd_printk(KERN_ERR "emu10k1x: cannot allocate the port 0x%lx\n", chip-&gt;port);</div><div class='del'>-		snd_emu10k1x_free(chip);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_emu10k1x_interrupt,</div><div class='del'>-			IRQF_SHARED, "EMU10K1X", chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci-&gt;irq);</div><div class='del'>-		snd_emu10k1x_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_emu10k1x_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "cannot grab irq %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_emu10k1x_free;</div><div class='ctx'>   </div><div class='del'>-	if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-			       4 * 1024, &amp;chip-&gt;dma_buffer) &lt; 0) {</div><div class='del'>-		snd_emu10k1x_free(chip);</div><div class='add'>+	chip-&gt;dma_buffer = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+						4 * 1024);</div><div class='add'>+	if (!chip-&gt;dma_buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	/* read revision &amp; serial */</div><div class='ctx'> 	chip-&gt;revision = pci-&gt;revision;</div><div class='ctx'> 	pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &amp;chip-&gt;serial);</div><div class='ctx'> 	pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &amp;chip-&gt;model);</div><div class='del'>-	snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip-&gt;model,</div><div class='add'>+	dev_info(card-&gt;dev, "Model %04x Rev %08x Serial %08x\n", chip-&gt;model,</div><div class='ctx'> 		   chip-&gt;revision, chip-&gt;serial);</div><div class='ctx'> </div><div class='ctx'> 	outl(0, chip-&gt;port + INTE);	</div><div class='hunk'>@@ -992,12 +940,6 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip-&gt;port+HCFG);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,</div><div class='del'>-				  chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_emu10k1x_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1006,14 +948,12 @@ static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu = entry-&gt;private_data;</div><div class='ctx'> 	unsigned long value,value1,value2;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer, "Registers:\n\n");</div><div class='ctx'> 	for(i = 0; i &lt; 0x20; i+=4) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 		value = inl(emu-&gt;port + i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		snd_iprintf(buffer, "Register %02X: %08lX\n", i, value);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_iprintf(buffer, "\nRegisters\n\n");</div><div class='hunk'>@@ -1040,22 +980,16 @@ static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,</div><div class='ctx'> 		if (sscanf(line, "%x %x %x", &amp;reg, &amp;channel_id, &amp;val) != 3)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (reg &lt; 0x49 &amp;&amp; val &lt;= 0xffffffff &amp;&amp; channel_id &lt;= 2)</div><div class='add'>+		if (reg &lt; 0x49 &amp;&amp; channel_id &lt;= 2)</div><div class='ctx'> 			snd_emu10k1x_ptr_write(emu, reg, channel_id, val);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)</div><div class='add'>+static int snd_emu10k1x_proc_init(struct emu10k1x *emu)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	</div><div class='del'>-	if(! snd_card_proc_new(emu-&gt;card, "emu10k1x_regs", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu10k1x_proc_reg_read);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu10k1x_proc_reg_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;private_data = emu;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "emu10k1x_regs", emu,</div><div class='add'>+			     snd_emu10k1x_proc_reg_read,</div><div class='add'>+			     snd_emu10k1x_proc_reg_write);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1076,7 +1010,6 @@ static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int val;</div><div class='del'>-	int change = 0;</div><div class='ctx'> </div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0] ;</div><div class='ctx'> </div><div class='hunk'>@@ -1091,10 +1024,10 @@ static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x1003F);</div><div class='ctx'> 		snd_emu10k1x_gpio_write(emu, 0x1080);</div><div class='ctx'> 	}</div><div class='del'>-	return change;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1x_shared_spdif __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1x_shared_spdif =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Analog/Digital Output Jack",</div><div class='hunk'>@@ -1153,7 +1086,7 @@ static int snd_emu10k1x_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1163,7 +1096,7 @@ static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =</div><div class='ctx'> 	.get =          snd_emu10k1x_spdif_get_mask</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1x_spdif_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1x_spdif_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='hunk'>@@ -1173,23 +1106,29 @@ static struct snd_kcontrol_new snd_emu10k1x_spdif_control =</div><div class='ctx'> 	.put =          snd_emu10k1x_spdif_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_mixer(struct emu10k1x *emu)</div><div class='add'>+static int snd_emu10k1x_mixer(struct emu10k1x *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = emu-&gt;card;</div><div class='ctx'> </div><div class='del'>-	if ((kctl = snd_ctl_new1(&amp;snd_emu10k1x_spdif_mask_control, emu)) == NULL)</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_emu10k1x_spdif_mask_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((kctl = snd_ctl_new1(&amp;snd_emu10k1x_shared_spdif, emu)) == NULL)</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_emu10k1x_shared_spdif, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((kctl = snd_ctl_new1(&amp;snd_emu10k1x_spdif_control, emu)) == NULL)</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_emu10k1x_spdif_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1227,7 +1166,9 @@ static void mpu401_clear_rx(struct emu10k1x *emu, struct emu10k1x_midi *mpu)</div><div class='ctx'> 		mpu401_read_data(emu, mpu);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (timeout &lt;= 0)</div><div class='del'>-		snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"cmd: clear rx timeout (status = 0x%x)\n",</div><div class='add'>+			mpu401_read_stat(emu, mpu));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,28 +1186,28 @@ static void do_emu10k1x_midi_interrupt(struct emu10k1x *emu,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;input_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; mpu401_input_avail(emu, midi)) {</div><div class='del'>-		if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)) {</div><div class='del'>-			mpu401_clear_rx(emu, midi);</div><div class='del'>-		} else {</div><div class='del'>-			byte = mpu401_read_data(emu, midi);</div><div class='del'>-			if (midi-&gt;substream_input)</div><div class='del'>-				snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;input_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; mpu401_input_avail(emu, midi)) {</div><div class='add'>+			if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)) {</div><div class='add'>+				mpu401_clear_rx(emu, midi);</div><div class='add'>+			} else {</div><div class='add'>+				byte = mpu401_read_data(emu, midi);</div><div class='add'>+				if (midi-&gt;substream_input)</div><div class='add'>+					snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;input_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;output_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; mpu401_output_ready(emu, midi)) {</div><div class='del'>-		if (midi-&gt;substream_output &amp;&amp;</div><div class='del'>-		    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='del'>-			mpu401_write_data(emu, midi, byte);</div><div class='del'>-		} else {</div><div class='del'>-			snd_emu10k1x_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;output_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; mpu401_output_ready(emu, midi)) {</div><div class='add'>+			if (midi-&gt;substream_output &amp;&amp;</div><div class='add'>+			    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='add'>+				mpu401_write_data(emu, midi, byte);</div><div class='add'>+			} else {</div><div class='add'>+				snd_emu10k1x_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;output_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int status)</div><div class='hunk'>@@ -1277,31 +1218,31 @@ static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int statu</div><div class='ctx'> static int snd_emu10k1x_midi_cmd(struct emu10k1x * emu,</div><div class='ctx'> 				  struct emu10k1x_midi *midi, unsigned char cmd, int ack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int timeout, ok;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;input_lock, flags);</div><div class='del'>-	mpu401_write_data(emu, midi, 0x00);</div><div class='del'>-	/* mpu401_clear_rx(emu, midi); */</div><div class='del'>-</div><div class='del'>-	mpu401_write_cmd(emu, midi, cmd);</div><div class='del'>-	if (ack) {</div><div class='del'>-		ok = 0;</div><div class='del'>-		timeout = 10000;</div><div class='del'>-		while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='del'>-			if (mpu401_input_avail(emu, midi)) {</div><div class='del'>-				if (mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='del'>-					ok = 1;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;input_lock) {</div><div class='add'>+		mpu401_write_data(emu, midi, 0x00);</div><div class='add'>+		/* mpu401_clear_rx(emu, midi); */</div><div class='add'>+</div><div class='add'>+		mpu401_write_cmd(emu, midi, cmd);</div><div class='add'>+		if (ack) {</div><div class='add'>+			ok = 0;</div><div class='add'>+			timeout = 10000;</div><div class='add'>+			while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='add'>+				if (mpu401_input_avail(emu, midi)) {</div><div class='add'>+					if (mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+						ok = 1;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		if (!ok &amp;&amp; mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+			if (!ok &amp;&amp; mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+				ok = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			ok = 1;</div><div class='del'>-	} else {</div><div class='del'>-		ok = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;midi-&gt;input_lock, flags);</div><div class='ctx'> 	if (!ok) {</div><div class='del'>-		snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",</div><div class='ctx'> 			   cmd, emu-&gt;port,</div><div class='ctx'> 			   mpu401_read_stat(emu, midi),</div><div class='ctx'> 			   mpu401_read_data(emu, midi));</div><div class='hunk'>@@ -1314,100 +1255,78 @@ static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu;</div><div class='ctx'> 	struct emu10k1x_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= EMU10K1X_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= EMU10K1X_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error_out:</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu;</div><div class='ctx'> 	struct emu10k1x_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error_out:</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu;</div><div class='ctx'> 	struct emu10k1x_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	snd_emu10k1x_intr_disable(emu, midi-&gt;rx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~EMU10K1X_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = NULL;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		snd_emu10k1x_intr_disable(emu, midi-&gt;rx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~EMU10K1X_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu;</div><div class='ctx'> 	struct emu10k1x_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	snd_emu10k1x_intr_disable(emu, midi-&gt;tx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~EMU10K1X_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = NULL;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;midi-&gt;open_lock) {</div><div class='add'>+		snd_emu10k1x_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~EMU10K1X_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='hunk'>@@ -1428,7 +1347,6 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x *emu;</div><div class='ctx'> 	struct emu10k1x_midi *midi = substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='hunk'>@@ -1439,22 +1357,21 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst</div><div class='ctx'> 		unsigned char byte;</div><div class='ctx'> 	</div><div class='ctx'> 		/* try to send some amount of bytes here before interrupts */</div><div class='del'>-		spin_lock_irqsave(&amp;midi-&gt;output_lock, flags);</div><div class='del'>-		while (max &gt; 0) {</div><div class='del'>-			if (mpu401_output_ready(emu, midi)) {</div><div class='del'>-				if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT) ||</div><div class='del'>-				    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='del'>-					/* no more data */</div><div class='del'>-					spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='del'>-					return;</div><div class='add'>+		scoped_guard(spinlock_irqsave, &amp;midi-&gt;output_lock) {</div><div class='add'>+			while (max &gt; 0) {</div><div class='add'>+				if (mpu401_output_ready(emu, midi)) {</div><div class='add'>+					if (!(midi-&gt;midi_mode &amp; EMU10K1X_MIDI_MODE_OUTPUT) ||</div><div class='add'>+					    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='add'>+						/* no more data */</div><div class='add'>+						return;</div><div class='add'>+					}</div><div class='add'>+					mpu401_write_data(emu, midi, byte);</div><div class='add'>+					max--;</div><div class='add'>+				} else {</div><div class='add'>+					break;</div><div class='ctx'> 				}</div><div class='del'>-				mpu401_write_data(emu, midi, byte);</div><div class='del'>-				max--;</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='ctx'> 		snd_emu10k1x_intr_enable(emu, midi-&gt;tx_enable);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_emu10k1x_intr_disable(emu, midi-&gt;tx_enable);</div><div class='hunk'>@@ -1465,14 +1382,14 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_emu10k1x_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_emu10k1x_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_emu10k1x_midi_output_open,</div><div class='ctx'> 	.close =	snd_emu10k1x_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_emu10k1x_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_emu10k1x_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_emu10k1x_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_emu10k1x_midi_input_open,</div><div class='ctx'> 	.close =	snd_emu10k1x_midi_input_close,</div><div class='hunk'>@@ -1486,19 +1403,21 @@ static void snd_emu10k1x_midi_free(struct snd_rawmidi *rmidi)</div><div class='ctx'> 	midi-&gt;rmidi = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,</div><div class='del'>-					struct emu10k1x_midi *midi, int device, char *name)</div><div class='add'>+static int emu10k1x_midi_init(struct emu10k1x *emu,</div><div class='add'>+			      struct emu10k1x_midi *midi, int device,</div><div class='add'>+			      char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_rawmidi_new(emu-&gt;card, name, device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(emu-&gt;card, name, device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	midi-&gt;emu = emu;</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;open_lock);</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;input_lock);</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;output_lock);</div><div class='del'>-	strcpy(rmidi-&gt;name, name);</div><div class='add'>+	strscpy(rmidi-&gt;name, name);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_emu10k1x_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_emu10k1x_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='hunk'>@@ -1510,12 +1429,13 @@ static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)</div><div class='add'>+static int snd_emu10k1x_midi(struct emu10k1x *emu)</div><div class='ctx'> {</div><div class='ctx'> 	struct emu10k1x_midi *midi = &amp;emu-&gt;midi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)")) &lt; 0)</div><div class='add'>+	err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;tx_enable = INTE_MIDITXENABLE;</div><div class='hunk'>@@ -1527,8 +1447,8 @@ static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_emu10k1x_probe(struct pci_dev *pci,</div><div class='add'>+				const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -1542,94 +1462,72 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1x_create(card, pci, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1x_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_emu10k1x_pcm(chip, 1, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_pcm(chip, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_emu10k1x_pcm(chip, 2, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_pcm(chip, 2);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1x_ac97(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_ac97(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1x_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_emu10k1x_midi(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_emu10k1x_midi(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_emu10k1x_proc_init(chip);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "EMU10K1X");</div><div class='del'>-	strcpy(card-&gt;shortname, "Dell Sound Blaster Live!");</div><div class='add'>+	strscpy(card-&gt;driver, "EMU10K1X");</div><div class='add'>+	strscpy(card-&gt;shortname, "Dell Sound Blaster Live!");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;port, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_emu10k1x_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_emu10k1x_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // PCI IDs</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = {</div><div class='add'>+static const struct pci_device_id snd_emu10k1x_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CREATIVE, 0x0006), 0 },	/* Dell OEM version (EMU10K1) */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);</div><div class='ctx'> </div><div class='ctx'> // pci_driver definition</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "EMU10K1X",</div><div class='add'>+static struct pci_driver emu10k1x_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_emu10k1x_ids,</div><div class='ctx'> 	.probe = snd_emu10k1x_probe,</div><div class='del'>-	.remove = __devexit_p(snd_emu10k1x_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-// initialization of the module</div><div class='del'>-static int __init alsa_card_emu10k1x_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// clean up the module</div><div class='del'>-static void __exit alsa_card_emu10k1x_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_emu10k1x_init)</div><div class='del'>-module_exit(alsa_card_emu10k1x_exit)</div><div class='add'>+module_pci_driver(emu10k1x_driver);</div><div class='head'>diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c<br/>index 7a9401462c1c..37af7bf76347 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emufx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emufx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emufx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emufx.c</a></div><div class='hunk'>@@ -1,41 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for effect processor FX8010</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='del'>- *  	Added EMU 1010 support.</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for effect processor FX8010</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/nospec.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -59,26 +41,45 @@ MODULE_PARM_DESC(high_res_gpr_volume, "GPR mixer controls use 31-bit range.");</div><div class='ctx'>  *  Tables</div><div class='ctx'>  */ </div><div class='ctx'> </div><div class='del'>-static char *fxbuses[16] = {</div><div class='add'>+// Playback channel labels; corresponds with the public FXBUS_* defines.</div><div class='add'>+// Unlike the tables below, this is not determined by the hardware.</div><div class='add'>+const char * const snd_emu10k1_fxbus[32] = {</div><div class='ctx'> 	/* 0x00 */ "PCM Left",</div><div class='ctx'> 	/* 0x01 */ "PCM Right",</div><div class='del'>-	/* 0x02 */ "PCM Surround Left",</div><div class='del'>-	/* 0x03 */ "PCM Surround Right",</div><div class='add'>+	/* 0x02 */ "PCM Rear Left",</div><div class='add'>+	/* 0x03 */ "PCM Rear Right",</div><div class='ctx'> 	/* 0x04 */ "MIDI Left",</div><div class='ctx'> 	/* 0x05 */ "MIDI Right",</div><div class='del'>-	/* 0x06 */ "Center",</div><div class='del'>-	/* 0x07 */ "LFE",</div><div class='del'>-	/* 0x08 */ NULL,</div><div class='del'>-	/* 0x09 */ NULL,</div><div class='add'>+	/* 0x06 */ "PCM Center",</div><div class='add'>+	/* 0x07 */ "PCM LFE",</div><div class='add'>+	/* 0x08 */ "PCM Front Left",</div><div class='add'>+	/* 0x09 */ "PCM Front Right",</div><div class='ctx'> 	/* 0x0a */ NULL,</div><div class='ctx'> 	/* 0x0b */ NULL,</div><div class='ctx'> 	/* 0x0c */ "MIDI Reverb",</div><div class='ctx'> 	/* 0x0d */ "MIDI Chorus",</div><div class='del'>-	/* 0x0e */ NULL,</div><div class='del'>-	/* 0x0f */ NULL</div><div class='add'>+	/* 0x0e */ "PCM Side Left",</div><div class='add'>+	/* 0x0f */ "PCM Side Right",</div><div class='add'>+	/* 0x10 */ NULL,</div><div class='add'>+	/* 0x11 */ NULL,</div><div class='add'>+	/* 0x12 */ NULL,</div><div class='add'>+	/* 0x13 */ NULL,</div><div class='add'>+	/* 0x14 */ "Passthrough Left",</div><div class='add'>+	/* 0x15 */ "Passthrough Right",</div><div class='add'>+	/* 0x16 */ NULL,</div><div class='add'>+	/* 0x17 */ NULL,</div><div class='add'>+	/* 0x18 */ NULL,</div><div class='add'>+	/* 0x19 */ NULL,</div><div class='add'>+	/* 0x1a */ NULL,</div><div class='add'>+	/* 0x1b */ NULL,</div><div class='add'>+	/* 0x1c */ NULL,</div><div class='add'>+	/* 0x1d */ NULL,</div><div class='add'>+	/* 0x1e */ NULL,</div><div class='add'>+	/* 0x1f */ NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *creative_ins[16] = {</div><div class='add'>+// Physical inputs; corresponds with the public EXTIN_* defines.</div><div class='add'>+const char * const snd_emu10k1_sblive_ins[16] = {</div><div class='ctx'> 	/* 0x00 */ "AC97 Left",</div><div class='ctx'> 	/* 0x01 */ "AC97 Right",</div><div class='ctx'> 	/* 0x02 */ "TTL IEC958 Left",</div><div class='hunk'>@@ -97,7 +98,8 @@ static char *creative_ins[16] = {</div><div class='ctx'> 	/* 0x0f */ NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *audigy_ins[16] = {</div><div class='add'>+// Physical inputs; corresponds with the public A_EXTIN_* defines.</div><div class='add'>+const char * const snd_emu10k1_audigy_ins[16] = {</div><div class='ctx'> 	/* 0x00 */ "AC97 Left",</div><div class='ctx'> 	/* 0x01 */ "AC97 Right",</div><div class='ctx'> 	/* 0x02 */ "Audigy CD Left",</div><div class='hunk'>@@ -116,7 +118,8 @@ static char *audigy_ins[16] = {</div><div class='ctx'> 	/* 0x0f */ NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *creative_outs[32] = {</div><div class='add'>+// Physical outputs; corresponds with the public EXTOUT_* defines.</div><div class='add'>+const char * const snd_emu10k1_sblive_outs[32] = {</div><div class='ctx'> 	/* 0x00 */ "AC97 Left",</div><div class='ctx'> 	/* 0x01 */ "AC97 Right",</div><div class='ctx'> 	/* 0x02 */ "Optical IEC958 Left",</div><div class='hunk'>@@ -133,6 +136,7 @@ static char *creative_outs[32] = {</div><div class='ctx'> 	/* 0x0d */ "AC97 Surround Left",</div><div class='ctx'> 	/* 0x0e */ "AC97 Surround Right",</div><div class='ctx'> 	/* 0x0f */ NULL,</div><div class='add'>+	// This is actually the FXBUS2 range; SB Live! 5.1 only.</div><div class='ctx'> 	/* 0x10 */ NULL,</div><div class='ctx'> 	/* 0x11 */ "Analog Center",</div><div class='ctx'> 	/* 0x12 */ "Analog LFE",</div><div class='hunk'>@@ -151,7 +155,8 @@ static char *creative_outs[32] = {</div><div class='ctx'> 	/* 0x1f */ NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *audigy_outs[32] = {</div><div class='add'>+// Physical outputs; corresponds with the public A_EXTOUT_* defines.</div><div class='add'>+const char * const snd_emu10k1_audigy_outs[32] = {</div><div class='ctx'> 	/* 0x00 */ "Digital Front Left",</div><div class='ctx'> 	/* 0x01 */ "Digital Front Right",</div><div class='ctx'> 	/* 0x02 */ "Digital Center",</div><div class='hunk'>@@ -170,7 +175,7 @@ static char *audigy_outs[32] = {</div><div class='ctx'> 	/* 0x0f */ "Rear Right",</div><div class='ctx'> 	/* 0x10 */ "AC97 Front Left",</div><div class='ctx'> 	/* 0x11 */ "AC97 Front Right",</div><div class='del'>-	/* 0x12 */ "ADC Caputre Left",</div><div class='add'>+	/* 0x12 */ "ADC Capture Left",</div><div class='ctx'> 	/* 0x13 */ "ADC Capture Right",</div><div class='ctx'> 	/* 0x14 */ NULL,</div><div class='ctx'> 	/* 0x15 */ NULL,</div><div class='hunk'>@@ -186,6 +191,18 @@ static char *audigy_outs[32] = {</div><div class='ctx'> 	/* 0x1f */ NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+// On the SB Live! 5.1, FXBUS2[1] and FXBUS2[2] are occupied by EXTOUT_ACENTER</div><div class='add'>+// and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.</div><div class='add'>+//</div><div class='add'>+// Since only 14 of the 16 EXTINs are used, this is not a big problem.</div><div class='add'>+// We route AC97 to FX capture 14 and 15, SPDIF_CD to FX capture 0 and 3,</div><div class='add'>+// and the rest of the EXTINs to the corresponding FX capture channel.</div><div class='add'>+// Multitrack recorders will still see the center/LFE output signal</div><div class='add'>+// on the second and third "input" channel.</div><div class='add'>+const s8 snd_emu10k1_sblive51_fxbus2_map[16] = {</div><div class='add'>+	2, -1, -1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const u32 bass_table[41][5] = {</div><div class='ctx'> 	{ 0x3e4f844f, 0x84ed4cc3, 0x3cc69927, 0x7b03553a, 0xc4da8486 },</div><div class='ctx'> 	{ 0x3e69a17a, 0x84c280fb, 0x3cd77cd4, 0x7b2f2a6f, 0xc4b08d1d },</div><div class='hunk'>@@ -303,26 +320,14 @@ static const u32 db_table[101] = {</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);</div><div class='ctx'> static const DECLARE_TLV_DB_LINEAR(snd_emu10k1_db_linear, TLV_DB_GAIN_MUTE, 0);</div><div class='ctx'> </div><div class='add'>+/* EMU10K1 bass/treble db gain */</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(snd_emu10k1_bass_treble_db_scale, -1200, 60, 0);</div><div class='add'>+</div><div class='ctx'> static const u32 onoff_table[2] = {</div><div class='ctx'> 	0x00000000, 0x00000001</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static inline mm_segment_t snd_enter_user(void)</div><div class='del'>-{</div><div class='del'>-	mm_segment_t fs = get_fs();</div><div class='del'>-	set_fs(get_ds());</div><div class='del'>-	return fs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void snd_leave_user(mm_segment_t fs)</div><div class='del'>-{</div><div class='del'>-	set_fs(fs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *   controls</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -343,16 +348,12 @@ static int snd_emu10k1_gpr_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_gpr_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_fx8010_ctl *ctl =</div><div class='ctx'> 		(struct snd_emu10k1_fx8010_ctl *) kcontrol-&gt;private_value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (i = 0; i &lt; ctl-&gt;vcount; i++)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = ctl-&gt;value[i];</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -361,12 +362,10 @@ static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_fx8010_ctl *ctl =</div><div class='ctx'> 		(struct snd_emu10k1_fx8010_ctl *) kcontrol-&gt;private_value;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int nval, val;</div><div class='add'>+	int nval, val;</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (i = 0; i &lt; ctl-&gt;vcount; i++) {</div><div class='ctx'> 		nval = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 		if (nval &lt; ctl-&gt;min)</div><div class='hunk'>@@ -380,9 +379,16 @@ static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 		case EMU10K1_GPR_TRANSLATION_NONE:</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + ctl-&gt;gpr[i], 0, val);</div><div class='ctx'> 			break;</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_NEGATE:</div><div class='add'>+			snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + ctl-&gt;gpr[i], 0, ~val);</div><div class='add'>+			break;</div><div class='ctx'> 		case EMU10K1_GPR_TRANSLATION_TABLE100:</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + ctl-&gt;gpr[i], 0, db_table[val]);</div><div class='ctx'> 			break;</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_NEG_TABLE100:</div><div class='add'>+			snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + ctl-&gt;gpr[i], 0,</div><div class='add'>+					      val == 100 ? 0x80000000 : -(int)db_table[val]);</div><div class='add'>+			break;</div><div class='ctx'> 		case EMU10K1_GPR_TRANSLATION_BASS:</div><div class='ctx'> 			if ((ctl-&gt;count % 5) != 0 || (ctl-&gt;count / 5) != ctl-&gt;vcount) {</div><div class='ctx'> 				change = -EIO;</div><div class='hunk'>@@ -405,7 +411,6 @@ static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'>       __error:</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -433,19 +438,13 @@ int snd_emu10k1_fx8010_register_irq_handler(struct snd_emu10k1 *emu,</div><div class='ctx'> 					    snd_fx8010_irq_handler_t *handler,</div><div class='ctx'> 					    unsigned char gpr_running,</div><div class='ctx'> 					    void *private_data,</div><div class='del'>-					    struct snd_emu10k1_fx8010_irq **r_irq)</div><div class='add'>+					    struct snd_emu10k1_fx8010_irq *irq)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1_fx8010_irq *irq;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	irq = kmalloc(sizeof(*irq), GFP_ATOMIC);</div><div class='del'>-	if (irq == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> 	irq-&gt;handler = handler;</div><div class='ctx'> 	irq-&gt;gpr_running = gpr_running;</div><div class='ctx'> 	irq-&gt;private_data = private_data;</div><div class='ctx'> 	irq-&gt;next = NULL;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;fx8010.irq_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;fx8010.irq_lock);</div><div class='ctx'> 	if (emu-&gt;fx8010.irq_handlers == NULL) {</div><div class='ctx'> 		emu-&gt;fx8010.irq_handlers = irq;</div><div class='ctx'> 		emu-&gt;dsp_interrupt = snd_emu10k1_fx8010_interrupt;</div><div class='hunk'>@@ -454,9 +453,6 @@ int snd_emu10k1_fx8010_register_irq_handler(struct snd_emu10k1 *emu,</div><div class='ctx'> 		irq-&gt;next = emu-&gt;fx8010.irq_handlers;</div><div class='ctx'> 		emu-&gt;fx8010.irq_handlers = irq;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;fx8010.irq_lock, flags);</div><div class='del'>-	if (r_irq)</div><div class='del'>-		*r_irq = irq;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -464,10 +460,10 @@ int snd_emu10k1_fx8010_unregister_irq_handler(struct snd_emu10k1 *emu,</div><div class='ctx'> 					      struct snd_emu10k1_fx8010_irq *irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1_fx8010_irq *tmp;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;fx8010.irq_lock, flags);</div><div class='del'>-	if ((tmp = emu-&gt;fx8010.irq_handlers) == irq) {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;fx8010.irq_lock);</div><div class='add'>+	tmp = emu-&gt;fx8010.irq_handlers;</div><div class='add'>+	if (tmp == irq) {</div><div class='ctx'> 		emu-&gt;fx8010.irq_handlers = tmp-&gt;next;</div><div class='ctx'> 		if (emu-&gt;fx8010.irq_handlers == NULL) {</div><div class='ctx'> 			snd_emu10k1_intr_disable(emu, INTE_FXDSPENABLE);</div><div class='hunk'>@@ -479,8 +475,6 @@ int snd_emu10k1_fx8010_unregister_irq_handler(struct snd_emu10k1 *emu,</div><div class='ctx'> 		if (tmp)</div><div class='ctx'> 			tmp-&gt;next = tmp-&gt;next-&gt;next;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;fx8010.irq_lock, flags);</div><div class='del'>-	kfree(irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -495,7 +489,7 @@ static void snd_emu10k1_write_op(struct snd_emu10k1_fx8010_code *icode,</div><div class='ctx'> 	u_int32_t *code;</div><div class='ctx'> 	if (snd_BUG_ON(*ptr &gt;= 512))</div><div class='ctx'> 		return;</div><div class='del'>-	code = (u_int32_t __force *)icode-&gt;code + (*ptr) * 2;</div><div class='add'>+	code = icode-&gt;code + (*ptr) * 2;</div><div class='ctx'> 	set_bit(*ptr, icode-&gt;code_valid);</div><div class='ctx'> 	code[0] = ((x &amp; 0x3ff) &lt;&lt; 10) | (y &amp; 0x3ff);</div><div class='ctx'> 	code[1] = ((op &amp; 0x0f) &lt;&lt; 20) | ((r &amp; 0x3ff) &lt;&lt; 10) | (a &amp; 0x3ff);</div><div class='hunk'>@@ -512,7 +506,7 @@ static void snd_emu10k1_audigy_write_op(struct snd_emu10k1_fx8010_code *icode,</div><div class='ctx'> 	u_int32_t *code;</div><div class='ctx'> 	if (snd_BUG_ON(*ptr &gt;= 1024))</div><div class='ctx'> 		return;</div><div class='del'>-	code = (u_int32_t __force *)icode-&gt;code + (*ptr) * 2;</div><div class='add'>+	code = icode-&gt;code + (*ptr) * 2;</div><div class='ctx'> 	set_bit(*ptr, icode-&gt;code_valid);</div><div class='ctx'> 	code[0] = ((x &amp; 0x7ff) &lt;&lt; 12) | (y &amp; 0x7ff);</div><div class='ctx'> 	code[1] = ((op &amp; 0x0f) &lt;&lt; 24) | ((r &amp; 0x7ff) &lt;&lt; 12) | (a &amp; 0x7ff);</div><div class='hunk'>@@ -535,7 +529,8 @@ unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_gpr_poke(struct snd_emu10k1 *emu,</div><div class='del'>-				struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	int gpr;</div><div class='ctx'> 	u32 val;</div><div class='hunk'>@@ -543,7 +538,9 @@ static int snd_emu10k1_gpr_poke(struct snd_emu10k1 *emu,</div><div class='ctx'> 	for (gpr = 0; gpr &lt; (emu-&gt;audigy ? 0x200 : 0x100); gpr++) {</div><div class='ctx'> 		if (!test_bit(gpr, icode-&gt;gpr_valid))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (get_user(val, &amp;icode-&gt;gpr_map[gpr]))</div><div class='add'>+		if (in_kernel)</div><div class='add'>+			val = icode-&gt;gpr_map[gpr];</div><div class='add'>+		else if (get_user(val, (__user u32 *)&amp;icode-&gt;gpr_map[gpr]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + gpr, 0, val);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -559,14 +556,15 @@ static int snd_emu10k1_gpr_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 	for (gpr = 0; gpr &lt; (emu-&gt;audigy ? 0x200 : 0x100); gpr++) {</div><div class='ctx'> 		set_bit(gpr, icode-&gt;gpr_valid);</div><div class='ctx'> 		val = snd_emu10k1_ptr_read(emu, emu-&gt;gpr_base + gpr, 0);</div><div class='del'>-		if (put_user(val, &amp;icode-&gt;gpr_map[gpr]))</div><div class='add'>+		if (put_user(val, (__user u32 *)&amp;icode-&gt;gpr_map[gpr]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_tram_poke(struct snd_emu10k1 *emu,</div><div class='del'>-				 struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				 struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				 bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	int tram;</div><div class='ctx'> 	u32 addr, val;</div><div class='hunk'>@@ -574,9 +572,14 @@ static int snd_emu10k1_tram_poke(struct snd_emu10k1 *emu,</div><div class='ctx'> 	for (tram = 0; tram &lt; (emu-&gt;audigy ? 0x100 : 0xa0); tram++) {</div><div class='ctx'> 		if (!test_bit(tram, icode-&gt;tram_valid))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (get_user(val, &amp;icode-&gt;tram_data_map[tram]) ||</div><div class='del'>-		    get_user(addr, &amp;icode-&gt;tram_addr_map[tram]))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (in_kernel) {</div><div class='add'>+			val = icode-&gt;tram_data_map[tram];</div><div class='add'>+			addr = icode-&gt;tram_addr_map[tram];</div><div class='add'>+		} else {</div><div class='add'>+			if (get_user(val, (__user __u32 *)&amp;icode-&gt;tram_data_map[tram]) ||</div><div class='add'>+			    get_user(addr, (__user __u32 *)&amp;icode-&gt;tram_addr_map[tram]))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, TANKMEMDATAREGBASE + tram, 0, val);</div><div class='ctx'> 		if (!emu-&gt;audigy) {</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + tram, 0, addr);</div><div class='hunk'>@@ -604,24 +607,30 @@ static int snd_emu10k1_tram_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 			addr = snd_emu10k1_ptr_read(emu, TANKMEMADDRREGBASE + tram, 0) &gt;&gt; 12;</div><div class='ctx'> 			addr |= snd_emu10k1_ptr_read(emu, A_TANKMEMCTLREGBASE + tram, 0) &lt;&lt; 20;</div><div class='ctx'> 		}</div><div class='del'>-		if (put_user(val, &amp;icode-&gt;tram_data_map[tram]) ||</div><div class='del'>-		    put_user(addr, &amp;icode-&gt;tram_addr_map[tram]))</div><div class='add'>+		if (put_user(val, (__user u32 *)&amp;icode-&gt;tram_data_map[tram]) ||</div><div class='add'>+		    put_user(addr, (__user u32 *)&amp;icode-&gt;tram_addr_map[tram]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_code_poke(struct snd_emu10k1 *emu,</div><div class='del'>-				 struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				 struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				 bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pc, lo, hi;</div><div class='ctx'> </div><div class='ctx'> 	for (pc = 0; pc &lt; (emu-&gt;audigy ? 2*1024 : 2*512); pc += 2) {</div><div class='ctx'> 		if (!test_bit(pc / 2, icode-&gt;code_valid))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (get_user(lo, &amp;icode-&gt;code[pc + 0]) ||</div><div class='del'>-		    get_user(hi, &amp;icode-&gt;code[pc + 1]))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (in_kernel) {</div><div class='add'>+			lo = icode-&gt;code[pc + 0];</div><div class='add'>+			hi = icode-&gt;code[pc + 1];</div><div class='add'>+		} else {</div><div class='add'>+			if (get_user(lo, (__user u32 *)&amp;icode-&gt;code[pc + 0]) ||</div><div class='add'>+			    get_user(hi, (__user u32 *)&amp;icode-&gt;code[pc + 1]))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> 		snd_emu10k1_efx_write(emu, pc + 0, lo);</div><div class='ctx'> 		snd_emu10k1_efx_write(emu, pc + 1, hi);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -636,25 +645,29 @@ static int snd_emu10k1_code_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 	memset(icode-&gt;code_valid, 0, sizeof(icode-&gt;code_valid));</div><div class='ctx'> 	for (pc = 0; pc &lt; (emu-&gt;audigy ? 2*1024 : 2*512); pc += 2) {</div><div class='ctx'> 		set_bit(pc / 2, icode-&gt;code_valid);</div><div class='del'>-		if (put_user(snd_emu10k1_efx_read(emu, pc + 0), &amp;icode-&gt;code[pc + 0]))</div><div class='add'>+		if (put_user(snd_emu10k1_efx_read(emu, pc + 0),</div><div class='add'>+			     (__user u32 *)&amp;icode-&gt;code[pc + 0]))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (put_user(snd_emu10k1_efx_read(emu, pc + 1), &amp;icode-&gt;code[pc + 1]))</div><div class='add'>+		if (put_user(snd_emu10k1_efx_read(emu, pc + 1),</div><div class='add'>+			     (__user u32 *)&amp;icode-&gt;code[pc + 1]))</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct snd_emu10k1_fx8010_ctl *</div><div class='del'>-snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, struct snd_ctl_elem_id *id)</div><div class='add'>+snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu,</div><div class='add'>+			 struct emu10k1_ctl_elem_id *_id)</div><div class='ctx'> {</div><div class='add'>+	struct snd_ctl_elem_id *id = (struct snd_ctl_elem_id *)_id;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_ctl *ctl;</div><div class='ctx'> 	struct snd_kcontrol *kcontrol;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(ctl, &amp;emu-&gt;fx8010.gpr_ctl, list) {</div><div class='ctx'> 		kcontrol = ctl-&gt;kcontrol;</div><div class='ctx'> 		if (kcontrol-&gt;id.iface == id-&gt;iface &amp;&amp;</div><div class='del'>-		    !strcmp(kcontrol-&gt;id.name, id-&gt;name) &amp;&amp;</div><div class='del'>-		    kcontrol-&gt;id.index == id-&gt;index)</div><div class='add'>+		    kcontrol-&gt;id.index == id-&gt;index &amp;&amp;</div><div class='add'>+		    !strcmp(kcontrol-&gt;id.name, id-&gt;name))</div><div class='ctx'> 			return ctl;</div><div class='ctx'> 	}</div><div class='ctx'> 	return NULL;</div><div class='hunk'>@@ -662,14 +675,16 @@ snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, struct snd_ctl_elem_id *id)</div><div class='ctx'> </div><div class='ctx'> #define MAX_TLV_SIZE	256</div><div class='ctx'> </div><div class='del'>-static unsigned int *copy_tlv(const unsigned int __user *_tlv)</div><div class='add'>+static unsigned int *copy_tlv(const unsigned int __user *_tlv, bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int data[2];</div><div class='ctx'> 	unsigned int *tlv;</div><div class='ctx'> </div><div class='ctx'> 	if (!_tlv)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	if (copy_from_user(data, _tlv, sizeof(data)))</div><div class='add'>+	if (in_kernel)</div><div class='add'>+		memcpy(data, (__force void *)_tlv, sizeof(data));</div><div class='add'>+	else if (copy_from_user(data, _tlv, sizeof(data)))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (data[1] &gt;= MAX_TLV_SIZE)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -677,7 +692,9 @@ static unsigned int *copy_tlv(const unsigned int __user *_tlv)</div><div class='ctx'> 	if (!tlv)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	memcpy(tlv, data, sizeof(data));</div><div class='del'>-	if (copy_from_user(tlv + 2, _tlv + 2, data[1])) {</div><div class='add'>+	if (in_kernel) {</div><div class='add'>+		memcpy(tlv + 2, (__force void *)(_tlv + 2),  data[1]);</div><div class='add'>+	} else if (copy_from_user(tlv + 2, _tlv + 2, data[1])) {</div><div class='ctx'> 		kfree(tlv);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -685,48 +702,77 @@ static unsigned int *copy_tlv(const unsigned int __user *_tlv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int copy_gctl(struct snd_emu10k1 *emu,</div><div class='del'>-		     struct snd_emu10k1_fx8010_control_gpr *gctl,</div><div class='del'>-		     struct snd_emu10k1_fx8010_control_gpr __user *_gctl,</div><div class='del'>-		     int idx)</div><div class='add'>+		     struct snd_emu10k1_fx8010_control_gpr *dst,</div><div class='add'>+		     struct snd_emu10k1_fx8010_control_gpr *src,</div><div class='add'>+		     int idx, bool in_kernel)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1_fx8010_control_old_gpr __user *octl;</div><div class='add'>+	struct snd_emu10k1_fx8010_control_gpr __user *_src;</div><div class='add'>+	struct snd_emu10k1_fx8010_control_old_gpr *octl;</div><div class='add'>+	struct snd_emu10k1_fx8010_control_old_gpr __user *_octl;</div><div class='add'>+</div><div class='add'>+	_src = (struct snd_emu10k1_fx8010_control_gpr __user *)src;</div><div class='add'>+	if (emu-&gt;support_tlv) {</div><div class='add'>+		if (in_kernel)</div><div class='add'>+			*dst = src[idx];</div><div class='add'>+		else if (copy_from_user(dst, &amp;_src[idx], sizeof(*src)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (emu-&gt;support_tlv)</div><div class='del'>-		return copy_from_user(gctl, &amp;_gctl[idx], sizeof(*gctl));</div><div class='del'>-	octl = (struct snd_emu10k1_fx8010_control_old_gpr __user *)_gctl;</div><div class='del'>-	if (copy_from_user(gctl, &amp;octl[idx], sizeof(*octl)))</div><div class='add'>+	octl = (struct snd_emu10k1_fx8010_control_old_gpr *)src;</div><div class='add'>+	_octl = (struct snd_emu10k1_fx8010_control_old_gpr __user *)octl;</div><div class='add'>+	if (in_kernel)</div><div class='add'>+		memcpy(dst, &amp;octl[idx], sizeof(*octl));</div><div class='add'>+	else if (copy_from_user(dst, &amp;_octl[idx], sizeof(*octl)))</div><div class='ctx'> 		return -EFAULT;</div><div class='del'>-	gctl-&gt;tlv = NULL;</div><div class='add'>+	dst-&gt;tlv = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int copy_gctl_to_user(struct snd_emu10k1 *emu,</div><div class='del'>-		     struct snd_emu10k1_fx8010_control_gpr __user *_gctl,</div><div class='del'>-		     struct snd_emu10k1_fx8010_control_gpr *gctl,</div><div class='add'>+		     struct snd_emu10k1_fx8010_control_gpr *dst,</div><div class='add'>+		     struct snd_emu10k1_fx8010_control_gpr *src,</div><div class='ctx'> 		     int idx)</div><div class='ctx'> {</div><div class='add'>+	struct snd_emu10k1_fx8010_control_gpr __user *_dst;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_control_old_gpr __user *octl;</div><div class='ctx'> </div><div class='add'>+	_dst = (struct snd_emu10k1_fx8010_control_gpr __user *)dst;</div><div class='ctx'> 	if (emu-&gt;support_tlv)</div><div class='del'>-		return copy_to_user(&amp;_gctl[idx], gctl, sizeof(*gctl));</div><div class='add'>+		return copy_to_user(&amp;_dst[idx], src, sizeof(*src));</div><div class='ctx'> 	</div><div class='del'>-	octl = (struct snd_emu10k1_fx8010_control_old_gpr __user *)_gctl;</div><div class='del'>-	return copy_to_user(&amp;octl[idx], gctl, sizeof(*octl));</div><div class='add'>+	octl = (struct snd_emu10k1_fx8010_control_old_gpr __user *)dst;</div><div class='add'>+	return copy_to_user(&amp;octl[idx], src, sizeof(*octl));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int copy_ctl_elem_id(const struct emu10k1_ctl_elem_id *list, int i,</div><div class='add'>+			    struct emu10k1_ctl_elem_id *ret, bool in_kernel)</div><div class='add'>+{</div><div class='add'>+	struct emu10k1_ctl_elem_id __user *_id =</div><div class='add'>+		(struct emu10k1_ctl_elem_id __user *)&amp;list[i];</div><div class='add'>+</div><div class='add'>+	if (in_kernel)</div><div class='add'>+		*ret = list[i];</div><div class='add'>+	else if (copy_from_user(ret, _id, sizeof(*ret)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu,</div><div class='del'>-				       struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				       struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				       bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct snd_ctl_elem_id __user *_id;</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='add'>+	struct emu10k1_ctl_elem_id id;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_control_gpr *gctl;</div><div class='add'>+	struct snd_ctl_elem_id *gctl_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	for (i = 0, _id = icode-&gt;gpr_del_controls;</div><div class='del'>-	     i &lt; icode-&gt;gpr_del_control_count; i++, _id++) {</div><div class='del'>-	     	if (copy_from_user(&amp;id, _id, sizeof(id)))</div><div class='del'>-	     		return -EFAULT;</div><div class='add'>+	for (i = 0; i &lt; icode-&gt;gpr_del_control_count; i++) {</div><div class='add'>+		err = copy_ctl_elem_id(icode-&gt;gpr_del_controls, i, &amp;id,</div><div class='add'>+				       in_kernel);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		if (snd_emu10k1_look_for_ctl(emu, &amp;id) == NULL)</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -735,28 +781,56 @@ static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	err = 0;</div><div class='ctx'> 	for (i = 0; i &lt; icode-&gt;gpr_add_control_count; i++) {</div><div class='del'>-		if (copy_gctl(emu, gctl, icode-&gt;gpr_add_controls, i)) {</div><div class='add'>+		if (copy_gctl(emu, gctl, icode-&gt;gpr_add_controls, i,</div><div class='add'>+			      in_kernel)) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (snd_emu10k1_look_for_ctl(emu, &amp;gctl-&gt;id))</div><div class='ctx'> 			continue;</div><div class='del'>-		down_read(&amp;emu-&gt;card-&gt;controls_rwsem);</div><div class='del'>-		if (snd_ctl_find_id(emu-&gt;card, &amp;gctl-&gt;id) != NULL) {</div><div class='del'>-			up_read(&amp;emu-&gt;card-&gt;controls_rwsem);</div><div class='add'>+		gctl_id = (struct snd_ctl_elem_id *)&amp;gctl-&gt;id;</div><div class='add'>+		if (snd_ctl_find_id(emu-&gt;card, gctl_id)) {</div><div class='ctx'> 			err = -EEXIST;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='del'>-		up_read(&amp;emu-&gt;card-&gt;controls_rwsem);</div><div class='del'>-		if (gctl-&gt;id.iface != SNDRV_CTL_ELEM_IFACE_MIXER &amp;&amp;</div><div class='del'>-		    gctl-&gt;id.iface != SNDRV_CTL_ELEM_IFACE_PCM) {</div><div class='add'>+		if (gctl_id-&gt;iface != SNDRV_CTL_ELEM_IFACE_MIXER &amp;&amp;</div><div class='add'>+		    gctl_id-&gt;iface != SNDRV_CTL_ELEM_IFACE_PCM) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto __error;</div><div class='add'>+		}</div><div class='add'>+		switch (gctl-&gt;translation) {</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_NONE:</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_NEGATE:</div><div class='add'>+			break;</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_TABLE100:</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_NEG_TABLE100:</div><div class='add'>+			if (gctl-&gt;min != 0 || gctl-&gt;max != 100) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto __error;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_BASS:</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_TREBLE:</div><div class='add'>+			if (gctl-&gt;min != 0 || gctl-&gt;max != 40) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto __error;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case EMU10K1_GPR_TRANSLATION_ONOFF:</div><div class='add'>+			if (gctl-&gt;min != 0 || gctl-&gt;max != 1) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto __error;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; icode-&gt;gpr_list_control_count; i++) {</div><div class='ctx'> 	     	/* FIXME: we need to check the WRITE access */</div><div class='del'>-		if (copy_gctl(emu, gctl, icode-&gt;gpr_list_controls, i)) {</div><div class='add'>+		if (copy_gctl(emu, gctl, icode-&gt;gpr_list_controls, i,</div><div class='add'>+			      in_kernel)) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -774,15 +848,16 @@ static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl)</div><div class='ctx'> 	kctl-&gt;private_value = 0;</div><div class='ctx'> 	list_del(&amp;ctl-&gt;list);</div><div class='ctx'> 	kfree(ctl);</div><div class='del'>-	if (kctl-&gt;tlv.p)</div><div class='del'>-		kfree(kctl-&gt;tlv.p);</div><div class='add'>+	kfree(kctl-&gt;tlv.p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,</div><div class='del'>-				    struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				    struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				    bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, j;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_control_gpr *gctl;</div><div class='add'>+	struct snd_ctl_elem_id *gctl_id;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_ctl *ctl, *nctl;</div><div class='ctx'> 	struct snd_kcontrol_new knew;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -798,28 +873,30 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; icode-&gt;gpr_add_control_count; i++) {</div><div class='del'>-		if (copy_gctl(emu, gctl, icode-&gt;gpr_add_controls, i)) {</div><div class='add'>+		if (copy_gctl(emu, gctl, icode-&gt;gpr_add_controls, i,</div><div class='add'>+			      in_kernel)) {</div><div class='ctx'> 			err = -EFAULT;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='del'>-		if (gctl-&gt;id.iface != SNDRV_CTL_ELEM_IFACE_MIXER &amp;&amp;</div><div class='del'>-		    gctl-&gt;id.iface != SNDRV_CTL_ELEM_IFACE_PCM) {</div><div class='add'>+		gctl_id = (struct snd_ctl_elem_id *)&amp;gctl-&gt;id;</div><div class='add'>+		if (gctl_id-&gt;iface != SNDRV_CTL_ELEM_IFACE_MIXER &amp;&amp;</div><div class='add'>+		    gctl_id-&gt;iface != SNDRV_CTL_ELEM_IFACE_PCM) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='del'>-		if (! gctl-&gt;id.name[0]) {</div><div class='add'>+		if (!*gctl_id-&gt;name) {</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto __error;</div><div class='ctx'> 		}</div><div class='ctx'> 		ctl = snd_emu10k1_look_for_ctl(emu, &amp;gctl-&gt;id);</div><div class='ctx'> 		memset(&amp;knew, 0, sizeof(knew));</div><div class='del'>-		knew.iface = gctl-&gt;id.iface;</div><div class='del'>-		knew.name = gctl-&gt;id.name;</div><div class='del'>-		knew.index = gctl-&gt;id.index;</div><div class='del'>-		knew.device = gctl-&gt;id.device;</div><div class='del'>-		knew.subdevice = gctl-&gt;id.subdevice;</div><div class='add'>+		knew.iface = gctl_id-&gt;iface;</div><div class='add'>+		knew.name = gctl_id-&gt;name;</div><div class='add'>+		knew.index = gctl_id-&gt;index;</div><div class='add'>+		knew.device = gctl_id-&gt;device;</div><div class='add'>+		knew.subdevice = gctl_id-&gt;subdevice;</div><div class='ctx'> 		knew.info = snd_emu10k1_gpr_ctl_info;</div><div class='del'>-		knew.tlv.p = copy_tlv(gctl-&gt;tlv);</div><div class='add'>+		knew.tlv.p = copy_tlv((const unsigned int __user *)gctl-&gt;tlv, in_kernel);</div><div class='ctx'> 		if (knew.tlv.p)</div><div class='ctx'> 			knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 				SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='hunk'>@@ -845,7 +922,9 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> 			}</div><div class='ctx'> 			knew.private_value = (unsigned long)ctl;</div><div class='ctx'> 			*ctl = *nctl;</div><div class='del'>-			if ((err = snd_ctl_add(emu-&gt;card, kctl = snd_ctl_new1(&amp;knew, emu))) &lt; 0) {</div><div class='add'>+			kctl = snd_ctl_new1(&amp;knew, emu);</div><div class='add'>+			err = snd_ctl_add(emu-&gt;card, kctl);</div><div class='add'>+			if (err &lt; 0) {</div><div class='ctx'> 				kfree(ctl);</div><div class='ctx'> 				kfree(knew.tlv.p);</div><div class='ctx'> 				goto __error;</div><div class='hunk'>@@ -871,23 +950,23 @@ static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_del_controls(struct snd_emu10k1 *emu,</div><div class='del'>-				    struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				    struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				    bool in_kernel)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='del'>-	struct snd_ctl_elem_id __user *_id;</div><div class='add'>+	struct emu10k1_ctl_elem_id id;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_ctl *ctl;</div><div class='ctx'> 	struct snd_card *card = emu-&gt;card;</div><div class='add'>+	int err;</div><div class='ctx'> 	</div><div class='del'>-	for (i = 0, _id = icode-&gt;gpr_del_controls;</div><div class='del'>-	     i &lt; icode-&gt;gpr_del_control_count; i++, _id++) {</div><div class='del'>-	     	if (copy_from_user(&amp;id, _id, sizeof(id)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		down_write(&amp;card-&gt;controls_rwsem);</div><div class='add'>+	for (i = 0; i &lt; icode-&gt;gpr_del_control_count; i++) {</div><div class='add'>+		err = copy_ctl_elem_id(icode-&gt;gpr_del_controls, i, &amp;id,</div><div class='add'>+				       in_kernel);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		ctl = snd_emu10k1_look_for_ctl(emu, &amp;id);</div><div class='ctx'> 		if (ctl)</div><div class='ctx'> 			snd_ctl_remove(card, ctl-&gt;kcontrol);</div><div class='del'>-		up_write(&amp;card-&gt;controls_rwsem);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -911,8 +990,8 @@ static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> 		    i &lt; icode-&gt;gpr_list_control_count) {</div><div class='ctx'> 			memset(gctl, 0, sizeof(*gctl));</div><div class='ctx'> 			id = &amp;ctl-&gt;kcontrol-&gt;id;</div><div class='del'>-			gctl-&gt;id.iface = id-&gt;iface;</div><div class='del'>-			strlcpy(gctl-&gt;id.name, id-&gt;name, sizeof(gctl-&gt;id.name));</div><div class='add'>+			gctl-&gt;id.iface = (__force int)id-&gt;iface;</div><div class='add'>+			strscpy(gctl-&gt;id.name, id-&gt;name, sizeof(gctl-&gt;id.name));</div><div class='ctx'> 			gctl-&gt;id.index = id-&gt;index;</div><div class='ctx'> 			gctl-&gt;id.device = id-&gt;device;</div><div class='ctx'> 			gctl-&gt;id.subdevice = id-&gt;subdevice;</div><div class='hunk'>@@ -939,14 +1018,16 @@ static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_icode_poke(struct snd_emu10k1 *emu,</div><div class='del'>-				  struct snd_emu10k1_fx8010_code *icode)</div><div class='add'>+				  struct snd_emu10k1_fx8010_code *icode,</div><div class='add'>+				  bool in_kernel)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	if ((err = snd_emu10k1_verify_controls(emu, icode)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='del'>-	strlcpy(emu-&gt;fx8010.name, icode-&gt;name, sizeof(emu-&gt;fx8010.name));</div><div class='add'>+	guard(mutex)(&amp;emu-&gt;fx8010.lock);</div><div class='add'>+	err = snd_emu10k1_verify_controls(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	strscpy(emu-&gt;fx8010.name, icode-&gt;name, sizeof(emu-&gt;fx8010.name));</div><div class='ctx'> 	/* stop FX processor - this may be dangerous, but it's better to miss</div><div class='ctx'> 	   some samples than generate wrong ones - [jk] */</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='hunk'>@@ -954,20 +1035,27 @@ static int snd_emu10k1_icode_poke(struct snd_emu10k1 *emu,</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg | EMU10K1_DBG_SINGLE_STEP);</div><div class='ctx'> 	/* ok, do the main job */</div><div class='del'>-	if ((err = snd_emu10k1_del_controls(emu, icode)) &lt; 0 ||</div><div class='del'>-	    (err = snd_emu10k1_gpr_poke(emu, icode)) &lt; 0 ||</div><div class='del'>-	    (err = snd_emu10k1_tram_poke(emu, icode)) &lt; 0 ||</div><div class='del'>-	    (err = snd_emu10k1_code_poke(emu, icode)) &lt; 0 ||</div><div class='del'>-	    (err = snd_emu10k1_add_controls(emu, icode)) &lt; 0)</div><div class='del'>-		goto __error;</div><div class='add'>+	err = snd_emu10k1_del_controls(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_emu10k1_gpr_poke(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_emu10k1_tram_poke(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_emu10k1_code_poke(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = snd_emu10k1_add_controls(emu, icode, in_kernel);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	/* start FX processor when the DSP code is updated */</div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, A_DBG, 0, emu-&gt;fx8010.dbg);</div><div class='ctx'> 	else</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg);</div><div class='del'>-      __error:</div><div class='del'>-	mutex_unlock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu,</div><div class='hunk'>@@ -975,8 +1063,8 @@ static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	strlcpy(icode-&gt;name, emu-&gt;fx8010.name, sizeof(icode-&gt;name));</div><div class='add'>+	guard(mutex)(&amp;emu-&gt;fx8010.lock);</div><div class='add'>+	strscpy(icode-&gt;name, emu-&gt;fx8010.name, sizeof(icode-&gt;name));</div><div class='ctx'> 	/* ok, do the main job */</div><div class='ctx'> 	err = snd_emu10k1_gpr_peek(emu, icode);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='hunk'>@@ -985,7 +1073,6 @@ static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 		err = snd_emu10k1_code_peek(emu, icode);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='ctx'> 		err = snd_emu10k1_list_controls(emu, icode);</div><div class='del'>-	mutex_unlock(&amp;emu-&gt;fx8010.lock);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -993,28 +1080,25 @@ static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu,</div><div class='ctx'> 				 struct snd_emu10k1_fx8010_pcm_rec *ipcm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm *pcm;</div><div class='ctx'> </div><div class='ctx'> 	if (ipcm-&gt;substream &gt;= EMU10K1_FX8010_PCM_COUNT)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	ipcm-&gt;substream = array_index_nospec(ipcm-&gt;substream,</div><div class='add'>+					     EMU10K1_FX8010_PCM_COUNT);</div><div class='ctx'> 	if (ipcm-&gt;channels &gt; 32)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	pcm = &amp;emu-&gt;fx8010.pcm[ipcm-&gt;substream];</div><div class='del'>-	mutex_lock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='del'>-	if (pcm-&gt;opened) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto __error;</div><div class='del'>-	}</div><div class='add'>+	guard(mutex)(&amp;emu-&gt;fx8010.lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='add'>+	if (pcm-&gt;opened)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	if (ipcm-&gt;channels == 0) {	/* remove */</div><div class='ctx'> 		pcm-&gt;valid = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* FIXME: we need to add universal code to the PCM transfer routine */</div><div class='del'>-		if (ipcm-&gt;channels != 2) {</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto __error;</div><div class='del'>-		}</div><div class='add'>+		if (ipcm-&gt;channels != 2)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		pcm-&gt;valid = 1;</div><div class='ctx'> 		pcm-&gt;opened = 0;</div><div class='ctx'> 		pcm-&gt;channels = ipcm-&gt;channels;</div><div class='hunk'>@@ -1029,24 +1113,22 @@ static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu,</div><div class='ctx'> 		for (i = 0; i &lt; pcm-&gt;channels; i++)</div><div class='ctx'> 			pcm-&gt;etram[i] = ipcm-&gt;etram[i];</div><div class='ctx'> 	}</div><div class='del'>-      __error:</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='del'>-	mutex_unlock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 				 struct snd_emu10k1_fx8010_pcm_rec *ipcm)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm *pcm;</div><div class='ctx'> </div><div class='ctx'> 	if (ipcm-&gt;substream &gt;= EMU10K1_FX8010_PCM_COUNT)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	ipcm-&gt;substream = array_index_nospec(ipcm-&gt;substream,</div><div class='add'>+					     EMU10K1_FX8010_PCM_COUNT);</div><div class='ctx'> 	pcm = &amp;emu-&gt;fx8010.pcm[ipcm-&gt;substream];</div><div class='del'>-	mutex_lock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(mutex)(&amp;emu-&gt;fx8010.lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	ipcm-&gt;channels = pcm-&gt;channels;</div><div class='ctx'> 	ipcm-&gt;tram_start = pcm-&gt;tram_start;</div><div class='ctx'> 	ipcm-&gt;buffer_size = pcm-&gt;buffer_size;</div><div class='hunk'>@@ -1060,9 +1142,7 @@ static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> 		ipcm-&gt;etram[i] = pcm-&gt;etram[i];</div><div class='ctx'> 	ipcm-&gt;res1 = ipcm-&gt;res2 = 0;</div><div class='ctx'> 	ipcm-&gt;pad = 0;</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='del'>-	mutex_unlock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define SND_EMU10K1_GPR_CONTROLS	44</div><div class='hunk'>@@ -1070,55 +1150,63 @@ static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu,</div><div class='ctx'> #define SND_EMU10K1_PLAYBACK_CHANNELS	8</div><div class='ctx'> #define SND_EMU10K1_CAPTURE_CHANNELS	4</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='del'>-snd_emu10k1_init_mono_control(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='del'>-			      const char *name, int gpr, int defval)</div><div class='add'>+#define HR_VAL(v) ((v) * 0x80000000LL / 100 - 1)</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+snd_emu10k1_init_mono_control2(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='add'>+			       const char *name, int gpr, int defval, int defval_hr)</div><div class='ctx'> {</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, name);</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, name);</div><div class='ctx'> 	ctl-&gt;vcount = ctl-&gt;count = 1;</div><div class='del'>-	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='ctx'> 	if (high_res_gpr_volume) {</div><div class='del'>-		ctl-&gt;min = 0;</div><div class='add'>+		ctl-&gt;min = -1;</div><div class='ctx'> 		ctl-&gt;max = 0x7fffffff;</div><div class='ctx'> 		ctl-&gt;tlv = snd_emu10k1_db_linear;</div><div class='del'>-		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NONE;</div><div class='add'>+		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NEGATE;</div><div class='add'>+		defval = defval_hr;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ctl-&gt;min = 0;</div><div class='ctx'> 		ctl-&gt;max = 100;</div><div class='ctx'> 		ctl-&gt;tlv = snd_emu10k1_db_scale1;</div><div class='del'>-		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_TABLE100;</div><div class='add'>+		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100;</div><div class='ctx'> 	}</div><div class='add'>+	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='ctx'> }</div><div class='add'>+#define snd_emu10k1_init_mono_control(ctl, name, gpr, defval) \</div><div class='add'>+	snd_emu10k1_init_mono_control2(ctl, name, gpr, defval, HR_VAL(defval))</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='del'>-snd_emu10k1_init_stereo_control(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='del'>-				const char *name, int gpr, int defval)</div><div class='add'>+static void</div><div class='add'>+snd_emu10k1_init_stereo_control2(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='add'>+				 const char *name, int gpr, int defval, int defval_hr)</div><div class='ctx'> {</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, name);</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, name);</div><div class='ctx'> 	ctl-&gt;vcount = ctl-&gt;count = 2;</div><div class='del'>-	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='del'>-	ctl-&gt;gpr[1] = gpr + 1; ctl-&gt;value[1] = defval;</div><div class='ctx'> 	if (high_res_gpr_volume) {</div><div class='del'>-		ctl-&gt;min = 0;</div><div class='add'>+		ctl-&gt;min = -1;</div><div class='ctx'> 		ctl-&gt;max = 0x7fffffff;</div><div class='ctx'> 		ctl-&gt;tlv = snd_emu10k1_db_linear;</div><div class='del'>-		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NONE;</div><div class='add'>+		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NEGATE;</div><div class='add'>+		defval = defval_hr;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ctl-&gt;min = 0;</div><div class='ctx'> 		ctl-&gt;max = 100;</div><div class='ctx'> 		ctl-&gt;tlv = snd_emu10k1_db_scale1;</div><div class='del'>-		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_TABLE100;</div><div class='add'>+		ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100;</div><div class='ctx'> 	}</div><div class='add'>+	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='add'>+	ctl-&gt;gpr[1] = gpr + 1; ctl-&gt;value[1] = defval;</div><div class='ctx'> }</div><div class='add'>+#define snd_emu10k1_init_stereo_control(ctl, name, gpr, defval) \</div><div class='add'>+	snd_emu10k1_init_stereo_control2(ctl, name, gpr, defval, HR_VAL(defval))</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_emu10k1_init_mono_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='ctx'> 				    const char *name, int gpr, int defval)</div><div class='ctx'> {</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, name);</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, name);</div><div class='ctx'> 	ctl-&gt;vcount = ctl-&gt;count = 1;</div><div class='ctx'> 	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='ctx'> 	ctl-&gt;min = 0;</div><div class='hunk'>@@ -1126,12 +1214,12 @@ snd_emu10k1_init_mono_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='ctx'> 	ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_ONOFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit</div><div class='add'>+static void</div><div class='ctx'> snd_emu10k1_init_stereo_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl,</div><div class='ctx'> 				      const char *name, int gpr, int defval)</div><div class='ctx'> {</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, name);</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, name);</div><div class='ctx'> 	ctl-&gt;vcount = ctl-&gt;count = 2;</div><div class='ctx'> 	ctl-&gt;gpr[0] = gpr + 0; ctl-&gt;value[0] = defval;</div><div class='ctx'> 	ctl-&gt;gpr[1] = gpr + 1; ctl-&gt;value[1] = defval;</div><div class='hunk'>@@ -1141,111 +1229,121 @@ snd_emu10k1_init_stereo_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Used for emu1010 - conversion from 32-bit capture inputs from HANA</div><div class='del'>- * to 2 x 16-bit registers in audigy - their values are read via DMA.</div><div class='add'>+ * Used for emu1010 - conversion from 32-bit capture inputs from the FPGA</div><div class='add'>+ * to 2 x 16-bit registers in Audigy - their values are read via DMA.</div><div class='ctx'>  * Conversion is performed by Audigy DSP instructions of FX8010.</div><div class='ctx'>  */</div><div class='del'>-static int snd_emu10k1_audigy_dsp_convert_32_to_2x16(</div><div class='add'>+static void snd_emu10k1_audigy_dsp_convert_32_to_2x16(</div><div class='ctx'> 				struct snd_emu10k1_fx8010_code *icode,</div><div class='ctx'> 				u32 *ptr, int tmp, int bit_shifter16,</div><div class='ctx'> 				int reg_in, int reg_out)</div><div class='ctx'> {</div><div class='del'>-	A_OP(icode, ptr, iACC3, A_GPR(tmp + 1), reg_in, A_C_00000000, A_C_00000000);</div><div class='del'>-	A_OP(icode, ptr, iANDXOR, A_GPR(tmp), A_GPR(tmp + 1), A_GPR(bit_shifter16 - 1), A_C_00000000);</div><div class='del'>-	A_OP(icode, ptr, iTSTNEG, A_GPR(tmp + 2), A_GPR(tmp), A_C_80000000, A_GPR(bit_shifter16 - 2));</div><div class='del'>-	A_OP(icode, ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_C_80000000, A_C_00000000);</div><div class='del'>-	A_OP(icode, ptr, iANDXOR, A_GPR(tmp), A_GPR(tmp), A_GPR(bit_shifter16 - 3), A_C_00000000);</div><div class='del'>-	A_OP(icode, ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A_GPR(tmp), A_C_00010000);</div><div class='del'>-	A_OP(icode, ptr, iANDXOR, reg_out, A_GPR(tmp), A_C_ffffffff, A_GPR(tmp + 2));</div><div class='del'>-	A_OP(icode, ptr, iACC3, reg_out + 1, A_GPR(tmp + 1), A_C_00000000, A_C_00000000);</div><div class='del'>-	return 1;</div><div class='add'>+	// This leaves the low word in place, which is fine,</div><div class='add'>+	// as the low bits are completely ignored subsequently.</div><div class='add'>+	// reg_out[1] = reg_in</div><div class='add'>+	A_OP(icode, ptr, iACC3, reg_out + 1, reg_in, A_C_00000000, A_C_00000000);</div><div class='add'>+	// It is fine to read reg_in multiple times.</div><div class='add'>+	// tmp = reg_in &lt;&lt; 15</div><div class='add'>+	A_OP(icode, ptr, iMACINT1, A_GPR(tmp), A_C_00000000, reg_in, A_GPR(bit_shifter16));</div><div class='add'>+	// Left-shift once more. This is a separate step, as the</div><div class='add'>+	// signed multiplication would clobber the MSB.</div><div class='add'>+	// reg_out[0] = tmp + ((tmp &lt;&lt; 31) &gt;&gt; 31)</div><div class='add'>+	A_OP(icode, ptr, iMAC3, reg_out, A_GPR(tmp), A_GPR(tmp), A_C_80000000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ENUM_GPR(name, size) name, name ## _dummy = name + (size) - 1</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * initial DSP configuration for Audigy</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)</div><div class='add'>+static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='del'>-	int err, i, z, gpr, nctl;</div><div class='del'>-	int bit_shifter16;</div><div class='del'>-	const int playback = 10;</div><div class='del'>-	const int capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2); /* we reserve 10 voices */</div><div class='del'>-	const int stereo_mix = capture + 2;</div><div class='del'>-	const int tmp = 0x88;</div><div class='del'>-	u32 ptr;</div><div class='add'>+	int err, z, nctl;</div><div class='add'>+	enum {</div><div class='add'>+		ENUM_GPR(playback, SND_EMU10K1_PLAYBACK_CHANNELS),</div><div class='add'>+		ENUM_GPR(stereo_mix, 2),</div><div class='add'>+		ENUM_GPR(capture, 2),</div><div class='add'>+		ENUM_GPR(bit_shifter16, 1),</div><div class='add'>+		// The fixed allocation of these breaks the pattern, but why not.</div><div class='add'>+		// Splitting these into left/right is questionable, as it will break</div><div class='add'>+		// down for center/lfe. But it works for stereo/quadro, so whatever.</div><div class='add'>+		ENUM_GPR(bass_gpr, 2 * 5),  // two sides, five coefficients</div><div class='add'>+		ENUM_GPR(treble_gpr, 2 * 5),</div><div class='add'>+		ENUM_GPR(bass_tmp, SND_EMU10K1_PLAYBACK_CHANNELS * 4),  // four delay stages</div><div class='add'>+		ENUM_GPR(treble_tmp, SND_EMU10K1_PLAYBACK_CHANNELS * 4),</div><div class='add'>+		ENUM_GPR(tmp, 3),</div><div class='add'>+		num_static_gprs</div><div class='add'>+	};</div><div class='add'>+	int gpr = num_static_gprs;</div><div class='add'>+	u32 ptr, ptr_skip;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_code *icode = NULL;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_control_gpr *controls = NULL, *ctl;</div><div class='ctx'> 	u32 *gpr_map;</div><div class='del'>-	mm_segment_t seg;</div><div class='del'>-</div><div class='del'>-	if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||</div><div class='del'>-	    (icode-&gt;gpr_map = (u_int32_t __user *)</div><div class='del'>-	     kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t),</div><div class='del'>-		     GFP_KERNEL)) == NULL ||</div><div class='del'>-	    (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,</div><div class='del'>-				sizeof(*controls), GFP_KERNEL)) == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='del'>-	gpr_map = (u32 __force *)icode-&gt;gpr_map;</div><div class='add'>+</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	icode = kzalloc(sizeof(*icode), GFP_KERNEL);</div><div class='add'>+	if (!icode)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	icode-&gt;gpr_map = kcalloc(512 + 256 + 256 + 2 * 1024,</div><div class='add'>+				 sizeof(u_int32_t), GFP_KERNEL);</div><div class='add'>+	if (!icode-&gt;gpr_map)</div><div class='add'>+		goto __err_gpr;</div><div class='add'>+	controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,</div><div class='add'>+			   sizeof(*controls), GFP_KERNEL);</div><div class='add'>+	if (!controls)</div><div class='add'>+		goto __err_ctrls;</div><div class='add'>+</div><div class='add'>+	gpr_map = icode-&gt;gpr_map;</div><div class='ctx'> </div><div class='ctx'> 	icode-&gt;tram_data_map = icode-&gt;gpr_map + 512;</div><div class='ctx'> 	icode-&gt;tram_addr_map = icode-&gt;tram_data_map + 256;</div><div class='ctx'> 	icode-&gt;code = icode-&gt;tram_addr_map + 256;</div><div class='ctx'> </div><div class='ctx'> 	/* clear free GPRs */</div><div class='del'>-	for (i = 0; i &lt; 512; i++)</div><div class='del'>-		set_bit(i, icode-&gt;gpr_valid);</div><div class='add'>+	memset(icode-&gt;gpr_valid, 0xff, 512 / 8);</div><div class='ctx'> 		</div><div class='ctx'> 	/* clear TRAM data &amp; address lines */</div><div class='del'>-	for (i = 0; i &lt; 256; i++)</div><div class='del'>-		set_bit(i, icode-&gt;tram_valid);</div><div class='add'>+	memset(icode-&gt;tram_valid, 0xff, 256 / 8);</div><div class='ctx'> </div><div class='del'>-	strcpy(icode-&gt;name, "Audigy DSP code for ALSA");</div><div class='add'>+	strscpy(icode-&gt;name, "Audigy DSP code for ALSA");</div><div class='ctx'> 	ptr = 0;</div><div class='ctx'> 	nctl = 0;</div><div class='del'>-	gpr = stereo_mix + 10;</div><div class='del'>-	gpr_map[gpr++] = 0x00007fff;</div><div class='del'>-	gpr_map[gpr++] = 0x00008000;</div><div class='del'>-	gpr_map[gpr++] = 0x0000ffff;</div><div class='del'>-	bit_shifter16 = gpr;</div><div class='del'>-</div><div class='del'>-	/* stop FX processor */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, A_DBG, 0, (emu-&gt;fx8010.dbg = 0) | A_DBG_SINGLE_STEP);</div><div class='add'>+	gpr_map[bit_shifter16] = 0x00008000;</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='ctx'> 	/* PCM front Playback Volume (independent from stereo mix)</div><div class='del'>-	 * playback = 0 + ( gpr * FXBUS_PCM_LEFT_FRONT &gt;&gt; 31)</div><div class='del'>-	 * where gpr contains attenuation from corresponding mixer control</div><div class='add'>+	 * playback = -gpr * FXBUS_PCM_LEFT_FRONT &gt;&gt; 31</div><div class='add'>+	 * where gpr contains negated attenuation from corresponding mixer control</div><div class='ctx'> 	 * (snd_emu10k1_init_stereo_control)</div><div class='ctx'> 	 */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "PCM Front Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> </div><div class='ctx'> 	/* PCM Surround Playback (independent from stereo mix) */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "PCM Surround Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> 	</div><div class='ctx'> 	/* PCM Side Playback (independent from stereo mix) */</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;spk71) {</div><div class='del'>-		A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE));</div><div class='del'>-		A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE));</div><div class='add'>+		A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE));</div><div class='add'>+		A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE));</div><div class='ctx'> 		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "PCM Side Playback Volume", gpr, 100);</div><div class='ctx'> 		gpr += 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* PCM Center Playback (independent from stereo mix) */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER));</div><div class='ctx'> 	snd_emu10k1_init_mono_control(&amp;controls[nctl++], "PCM Center Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr++;</div><div class='ctx'> </div><div class='ctx'> 	/* PCM LFE Playback (independent from stereo mix) */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE));</div><div class='ctx'> 	snd_emu10k1_init_mono_control(&amp;controls[nctl++], "PCM LFE Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr++;</div><div class='ctx'> 	</div><div class='hunk'>@@ -1253,159 +1351,174 @@ static int __devinit _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 	 * Stereo Mix</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* Wave (PCM) Playback Volume (will be renamed later) */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Wave Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Synth Playback */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Synth Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Wave (PCM) Capture */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "PCM Capture Volume", gpr, 0);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Synth Capture */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Synth Capture Volume", gpr, 0);</div><div class='ctx'> 	gpr += 2;</div><div class='del'>-      </div><div class='add'>+</div><div class='add'>+	// We need to double the volume, as we configure the voices for half volume,</div><div class='add'>+	// which is necessary for bit-identical reproduction.</div><div class='add'>+	{ static_assert(stereo_mix == playback + SND_EMU10K1_PLAYBACK_CHANNELS); }</div><div class='add'>+	for (z = 0; z &lt; SND_EMU10K1_PLAYBACK_CHANNELS + 2; z++)</div><div class='add'>+		A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + z), A_GPR(playback + z), A_GPR(playback + z), A_C_00000000);</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * inputs</div><div class='ctx'> 	 */</div><div class='ctx'> #define A_ADD_VOLUME_IN(var,vol,input) \</div><div class='del'>-A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'> </div><div class='del'>-	/* emu1212 DSP 0 and DSP 1 Capture */</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+		/* EMU1010 DSP 0 and DSP 1 Capture */</div><div class='add'>+		// The 24 MSB hold the actual value. We implicitly discard the 16 LSB.</div><div class='ctx'> 		if (emu-&gt;card_capabilities-&gt;ca0108_chip) {</div><div class='del'>-			/* Note:JCD:No longer bit shift lower 16bits to upper 16bits of 32bit value. */</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x0), A_C_00000001);</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_GPR(tmp));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x1), A_C_00000001);</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr), A_GPR(tmp));</div><div class='add'>+			// For unclear reasons, the EMU32IN cannot be the Y operand!</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A3_EMU32IN(0x0), A_GPR(gpr));</div><div class='add'>+			// A3_EMU32IN(0) is delayed by one sample, so all other A3_EMU32IN channels</div><div class='add'>+			// need to be delayed as well; we use an auxiliary register for that.</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1));</div><div class='add'>+			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr+2), A3_EMU32IN(0x1), A_C_00000000, A_C_00000000);</div><div class='ctx'> 		} else {</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_P16VIN(0x0));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_P16VIN(0x1));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_P16VIN(0x0), A_GPR(gpr));</div><div class='add'>+			// A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels</div><div class='add'>+			// need to be delayed as well; we use an auxiliary register for that.</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1));</div><div class='add'>+			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr+2), A_P16VIN(0x1), A_C_00000000, A_C_00000000);</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "EMU Capture Volume", gpr, 0);</div><div class='del'>-		gpr += 2;</div><div class='del'>-	}</div><div class='del'>-	/* AC'97 Playback Volume - used only for mic (renamed later) */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "AMic Playback Volume", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* AC'97 Capture Volume - used only for mic */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AC97_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AC97_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Mic Capture Volume", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+		gpr_map[gpr + 2] = 0x00000000;</div><div class='add'>+		gpr += 3;</div><div class='add'>+	} else {</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;ac97_chip) {</div><div class='add'>+			/* AC'97 Playback Volume - used only for mic (renamed later) */</div><div class='add'>+			A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);</div><div class='add'>+			A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);</div><div class='add'>+			snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "AMic Playback Volume", gpr, 0);</div><div class='add'>+			gpr += 2;</div><div class='add'>+			/* AC'97 Capture Volume - used only for mic */</div><div class='add'>+			A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AC97_L);</div><div class='add'>+			A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AC97_R);</div><div class='add'>+			snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Mic Capture Volume", gpr, 0);</div><div class='add'>+			gpr += 2;</div><div class='add'>+</div><div class='add'>+			/* mic capture buffer */</div><div class='add'>+			A_OP(icode, &amp;ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), A_C_40000000, A_EXTIN(A_EXTIN_AC97_R));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* mic capture buffer */	</div><div class='del'>-	A_OP(icode, &amp;ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), 0xcd, A_EXTIN(A_EXTIN_AC97_R));</div><div class='add'>+		/* Audigy CD Playback Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Audigy CD Playback Volume" : "CD Playback Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+		/* Audigy CD Capture Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);</div><div class='add'>+		A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Audigy CD Capture Volume" : "CD Capture Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='ctx'> </div><div class='del'>-	/* Audigy CD Playback Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Audigy CD Playback Volume" : "CD Playback Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* Audigy CD Capture Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Audigy CD Capture Volume" : "CD Capture Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+		/* Optical SPDIF Playback Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_OPT_SPDIF_L);</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_OPT_SPDIF_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",PLAYBACK,VOLUME), gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+		/* Optical SPDIF Capture Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_OPT_SPDIF_L);</div><div class='add'>+		A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_OPT_SPDIF_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",CAPTURE,VOLUME), gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='ctx'> </div><div class='del'>- 	/* Optical SPDIF Playback Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_OPT_SPDIF_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_OPT_SPDIF_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",PLAYBACK,VOLUME), gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* Optical SPDIF Capture Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_OPT_SPDIF_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_OPT_SPDIF_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",CAPTURE,VOLUME), gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+		/* Line2 Playback Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Line2 Playback Volume" : "Line Playback Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+		/* Line2 Capture Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);</div><div class='add'>+		A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Line2 Capture Volume" : "Line Capture Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='ctx'> </div><div class='del'>-	/* Line2 Playback Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Line2 Playback Volume" : "Line Playback Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* Line2 Capture Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Line2 Capture Volume" : "Line Capture Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-        </div><div class='del'>-	/* Philips ADC Playback Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_ADC_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Analog Mix Playback Volume", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* Philips ADC Capture Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_ADC_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_ADC_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Analog Mix Capture Volume", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+		/* Philips ADC Playback Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_ADC_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Analog Mix Playback Volume", gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+		/* Philips ADC Capture Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_ADC_L);</div><div class='add'>+		A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_ADC_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Analog Mix Capture Volume", gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='ctx'> </div><div class='del'>-	/* Aux2 Playback Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);</div><div class='del'>-	A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Aux2 Playback Volume" : "Aux Playback Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	/* Aux2 Capture Volume */</div><div class='del'>-	A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);</div><div class='del'>-	A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);</div><div class='del'>-	snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='del'>-					emu-&gt;card_capabilities-&gt;ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",</div><div class='del'>-					gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+		/* Aux2 Playback Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);</div><div class='add'>+		A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Aux2 Playback Volume" : "Aux Playback Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+		/* Aux2 Capture Volume */</div><div class='add'>+		A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);</div><div class='add'>+		A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);</div><div class='add'>+		snd_emu10k1_init_stereo_control(&amp;controls[nctl++],</div><div class='add'>+						emu-&gt;card_capabilities-&gt;ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",</div><div class='add'>+						gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+	}</div><div class='ctx'> 	</div><div class='ctx'> 	/* Stereo Mix Front Playback Volume */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Front Playback Volume", gpr, 100);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> 	</div><div class='ctx'> 	/* Stereo Mix Surround Playback */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='ctx'> 	snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Surround Playback Volume", gpr, 0);</div><div class='ctx'> 	gpr += 2;</div><div class='ctx'> </div><div class='ctx'> 	/* Stereo Mix Center Playback */</div><div class='ctx'> 	/* Center = sub = Left/2 + Right/2 */</div><div class='del'>-	A_OP(icode, &amp;ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), 0xcd, A_GPR(stereo_mix+1));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp));</div><div class='add'>+	A_OP(icode, &amp;ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), A_C_40000000, A_GPR(stereo_mix+1));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp));</div><div class='ctx'> 	snd_emu10k1_init_mono_control(&amp;controls[nctl++], "Center Playback Volume", gpr, 0);</div><div class='ctx'> 	gpr++;</div><div class='ctx'> </div><div class='ctx'> 	/* Stereo Mix LFE Playback */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp));</div><div class='add'>+	A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp));</div><div class='ctx'> 	snd_emu10k1_init_mono_control(&amp;controls[nctl++], "LFE Playback Volume", gpr, 0);</div><div class='ctx'> 	gpr++;</div><div class='ctx'> 	</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;spk71) {</div><div class='ctx'> 		/* Stereo Mix Side Playback */</div><div class='del'>-		A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='del'>-		A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='add'>+		A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix));</div><div class='add'>+		A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1));</div><div class='ctx'> 		snd_emu10k1_init_stereo_control(&amp;controls[nctl++], "Side Playback Volume", gpr, 0);</div><div class='ctx'> 		gpr += 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1430,21 +1543,9 @@ A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Process tone control</div><div class='ctx'> 	 */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), A_GPR(playback + 0), A_C_00000000, A_C_00000000); /* left */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), A_GPR(playback + 1), A_C_00000000, A_C_00000000); /* right */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2), A_GPR(playback + 2), A_C_00000000, A_C_00000000); /* rear left */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 3), A_GPR(playback + 3), A_C_00000000, A_C_00000000); /* rear right */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), A_GPR(playback + 4), A_C_00000000, A_C_00000000); /* center */</div><div class='del'>-	A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), A_GPR(playback + 5), A_C_00000000, A_C_00000000); /* LFE */</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;spk71) {</div><div class='del'>-		A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 6), A_GPR(playback + 6), A_C_00000000, A_C_00000000); /* side left */</div><div class='del'>-		A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 7), A_GPR(playback + 7), A_C_00000000, A_C_00000000); /* side right */</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='ctx'> 	ctl = &amp;controls[nctl + 0];</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, "Tone Control - Bass");</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, "Tone Control - Bass");</div><div class='ctx'> 	ctl-&gt;vcount = 2;</div><div class='ctx'> 	ctl-&gt;count = 10;</div><div class='ctx'> 	ctl-&gt;min = 0;</div><div class='hunk'>@@ -1452,44 +1553,47 @@ A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'> 	ctl-&gt;value[0] = ctl-&gt;value[1] = 20;</div><div class='ctx'> 	ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_BASS;</div><div class='ctx'> 	ctl = &amp;controls[nctl + 1];</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, "Tone Control - Treble");</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, "Tone Control - Treble");</div><div class='ctx'> 	ctl-&gt;vcount = 2;</div><div class='ctx'> 	ctl-&gt;count = 10;</div><div class='ctx'> 	ctl-&gt;min = 0;</div><div class='ctx'> 	ctl-&gt;max = 40;</div><div class='ctx'> 	ctl-&gt;value[0] = ctl-&gt;value[1] = 20;</div><div class='ctx'> 	ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_TREBLE;</div><div class='del'>-</div><div class='del'>-#define BASS_GPR	0x8c</div><div class='del'>-#define TREBLE_GPR	0x96</div><div class='del'>-</div><div class='ctx'> 	for (z = 0; z &lt; 5; z++) {</div><div class='ctx'> 		int j;</div><div class='ctx'> 		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			controls[nctl + 0].gpr[z * 2 + j] = BASS_GPR + z * 2 + j;</div><div class='del'>-			controls[nctl + 1].gpr[z * 2 + j] = TREBLE_GPR + z * 2 + j;</div><div class='add'>+			controls[nctl + 0].gpr[z * 2 + j] = bass_gpr + z * 2 + j;</div><div class='add'>+			controls[nctl + 1].gpr[z * 2 + j] = treble_gpr + z * 2 + j;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	nctl += 2;</div><div class='add'>+</div><div class='add'>+	A_OP(icode, &amp;ptr, iACC3, A_C_00000000, A_GPR(gpr), A_C_00000000, A_C_00000000);</div><div class='add'>+	snd_emu10k1_init_mono_onoff_control(controls + nctl++, "Tone Control - Switch", gpr, 0);</div><div class='add'>+	gpr++;</div><div class='add'>+	A_OP(icode, &amp;ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_CC_REG_ZERO, A_GPR(gpr));</div><div class='add'>+	ptr_skip = ptr;</div><div class='ctx'> 	for (z = 0; z &lt; 4; z++) {		/* front/rear/center-lfe/side */</div><div class='ctx'> 		int j, k, l, d;</div><div class='ctx'> 		for (j = 0; j &lt; 2; j++) {	/* left/right */</div><div class='del'>-			k = 0xb0 + (z * 8) + (j * 4);</div><div class='del'>-			l = 0xe0 + (z * 8) + (j * 4);</div><div class='del'>-			d = playback + SND_EMU10K1_PLAYBACK_CHANNELS + z * 2 + j;</div><div class='del'>-</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(d), A_GPR(BASS_GPR + 0 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k+1), A_GPR(k), A_GPR(k+1), A_GPR(BASS_GPR + 4 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k), A_GPR(d), A_GPR(k), A_GPR(BASS_GPR + 2 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k+3), A_GPR(k+2), A_GPR(k+3), A_GPR(BASS_GPR + 8 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(k+2), A_GPR_ACCU, A_GPR(k+2), A_GPR(BASS_GPR + 6 + j));</div><div class='add'>+			k = bass_tmp + (z * 8) + (j * 4);</div><div class='add'>+			l = treble_tmp + (z * 8) + (j * 4);</div><div class='add'>+			d = playback + z * 2 + j;</div><div class='add'>+</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(d), A_GPR(bass_gpr + 0 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k+1), A_GPR(k), A_GPR(k+1), A_GPR(bass_gpr + 4 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k), A_GPR(d), A_GPR(k), A_GPR(bass_gpr + 2 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(k+3), A_GPR(k+2), A_GPR(k+3), A_GPR(bass_gpr + 8 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC0, A_GPR(k+2), A_GPR_ACCU, A_GPR(k+2), A_GPR(bass_gpr + 6 + j));</div><div class='ctx'> 			A_OP(icode, &amp;ptr, iACC3, A_GPR(k+2), A_GPR(k+2), A_GPR(k+2), A_C_00000000);</div><div class='ctx'> </div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(k+2), A_GPR(TREBLE_GPR + 0 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l+1), A_GPR(l), A_GPR(l+1), A_GPR(TREBLE_GPR + 4 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l), A_GPR(k+2), A_GPR(l), A_GPR(TREBLE_GPR + 2 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l+3), A_GPR(l+2), A_GPR(l+3), A_GPR(TREBLE_GPR + 8 + j));</div><div class='del'>-			A_OP(icode, &amp;ptr, iMAC0, A_GPR(l+2), A_GPR_ACCU, A_GPR(l+2), A_GPR(TREBLE_GPR + 6 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(k+2), A_GPR(treble_gpr + 0 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l+1), A_GPR(l), A_GPR(l+1), A_GPR(treble_gpr + 4 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l), A_GPR(k+2), A_GPR(l), A_GPR(treble_gpr + 2 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMACMV, A_GPR(l+3), A_GPR(l+2), A_GPR(l+3), A_GPR(treble_gpr + 8 + j));</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC0, A_GPR(l+2), A_GPR_ACCU, A_GPR(l+2), A_GPR(treble_gpr + 6 + j));</div><div class='ctx'> 			A_OP(icode, &amp;ptr, iMACINT0, A_GPR(l+2), A_C_00000000, A_GPR(l+2), A_C_00000010);</div><div class='ctx'> </div><div class='ctx'> 			A_OP(icode, &amp;ptr, iACC3, A_GPR(d), A_GPR(l+2), A_C_00000000, A_C_00000000);</div><div class='hunk'>@@ -1498,206 +1602,109 @@ A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	nctl += 2;</div><div class='del'>-</div><div class='del'>-#undef BASS_GPR</div><div class='del'>-#undef TREBLE_GPR</div><div class='del'>-</div><div class='del'>-	for (z = 0; z &lt; 8; z++) {</div><div class='del'>-		A_SWITCH(icode, &amp;ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, gpr + 0);</div><div class='del'>-		A_SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + 0);</div><div class='del'>-		A_SWITCH(icode, &amp;ptr, tmp + 1, playback + z, tmp + 1);</div><div class='del'>-		A_OP(icode, &amp;ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);</div><div class='del'>-	}</div><div class='del'>-	snd_emu10k1_init_stereo_onoff_control(controls + nctl++, "Tone Control - Switch", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='add'>+	gpr_map[gpr++] = ptr - ptr_skip;</div><div class='ctx'> </div><div class='ctx'> 	/* Master volume (will be renamed later) */</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='del'>-	A_OP(icode, &amp;ptr, iMAC0, A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS));</div><div class='add'>+	for (z = 0; z &lt; 8; z++)</div><div class='add'>+		A_OP(icode, &amp;ptr, iMAC1, A_GPR(playback+z), A_C_00000000, A_GPR(gpr), A_GPR(playback+z));</div><div class='ctx'> 	snd_emu10k1_init_mono_control(&amp;controls[nctl++], "Wave Master Playback Volume", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-</div><div class='del'>-	/* analog speakers */</div><div class='del'>-	A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;spk71)</div><div class='del'>-		A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-</div><div class='del'>-	/* headphone */</div><div class='del'>-	A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='add'>+	gpr++;</div><div class='ctx'> </div><div class='del'>-	/* digital outputs */</div><div class='del'>-	/* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='ctx'> 		/* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */</div><div class='del'>-		snd_printk(KERN_INFO "EMU outputs on\n");</div><div class='add'>+		dev_info(emu-&gt;card-&gt;dev, "EMU outputs on\n");</div><div class='ctx'> 		for (z = 0; z &lt; 8; z++) {</div><div class='ctx'> 			if (emu-&gt;card_capabilities-&gt;ca0108_chip) {</div><div class='del'>-				A_OP(icode, &amp;ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + z), A_C_00000000, A_C_00000000);</div><div class='ctx'> 			} else {</div><div class='del'>-				A_OP(icode, &amp;ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + z), A_C_00000000, A_C_00000000);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='add'>+	} else {</div><div class='add'>+		/* analog speakers */</div><div class='add'>+		A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback);</div><div class='add'>+		A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2);</div><div class='add'>+		A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4);</div><div class='add'>+		A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5);</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;spk71)</div><div class='add'>+			A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6);</div><div class='ctx'> </div><div class='del'>-	/* IEC958 Optical Raw Playback Switch */ </div><div class='del'>-	gpr_map[gpr++] = 0;</div><div class='del'>-	gpr_map[gpr++] = 0x1008;</div><div class='del'>-	gpr_map[gpr++] = 0xffff0000;</div><div class='del'>-	for (z = 0; z &lt; 2; z++) {</div><div class='del'>-		A_OP(icode, &amp;ptr, iMAC0, A_GPR(tmp + 2), A_FXBUS(FXBUS_PT_LEFT + z), A_C_00000000, A_C_00000000);</div><div class='del'>-		A_OP(icode, &amp;ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_GPR(gpr - 2), A_C_00000001);</div><div class='del'>-		A_OP(icode, &amp;ptr, iACC3, A_GPR(tmp + 2), A_C_00000000, A_C_00010000, A_GPR(tmp + 2));</div><div class='del'>-		A_OP(icode, &amp;ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_GPR(gpr - 1), A_C_00000000);</div><div class='del'>-		A_SWITCH(icode, &amp;ptr, tmp + 0, tmp + 2, gpr + z);</div><div class='del'>-		A_SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + z);</div><div class='del'>-		A_SWITCH(icode, &amp;ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);</div><div class='del'>-		if ((z==1) &amp;&amp; (emu-&gt;card_capabilities-&gt;spdif_bug)) {</div><div class='del'>-			/* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */</div><div class='del'>-			snd_printk(KERN_INFO "Installing spdif_bug patch: %s\n", emu-&gt;card_capabilities-&gt;name);</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);</div><div class='del'>-		} else {</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);</div><div class='add'>+		/* headphone */</div><div class='add'>+		A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback);</div><div class='add'>+</div><div class='add'>+		/* IEC958 Optical Raw Playback Switch */</div><div class='add'>+		gpr_map[gpr++] = 0;</div><div class='add'>+		gpr_map[gpr++] = 0x1008;</div><div class='add'>+		gpr_map[gpr++] = 0xffff0000;</div><div class='add'>+		for (z = 0; z &lt; 2; z++) {</div><div class='add'>+			A_OP(icode, &amp;ptr, iMAC0, A_GPR(tmp + 2), A_FXBUS(FXBUS_PT_LEFT + z), A_C_00000000, A_C_00000000);</div><div class='add'>+			A_OP(icode, &amp;ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_GPR(gpr - 2), A_C_00000001);</div><div class='add'>+			A_OP(icode, &amp;ptr, iACC3, A_GPR(tmp + 2), A_C_00000000, A_C_00010000, A_GPR(tmp + 2));</div><div class='add'>+			A_OP(icode, &amp;ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_GPR(gpr - 1), A_C_00000000);</div><div class='add'>+			A_SWITCH(icode, &amp;ptr, tmp + 0, tmp + 2, gpr + z);</div><div class='add'>+			A_SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + z);</div><div class='add'>+			A_SWITCH(icode, &amp;ptr, tmp + 1, playback + z, tmp + 1);</div><div class='add'>+			if ((z==1) &amp;&amp; (emu-&gt;card_capabilities-&gt;spdif_bug)) {</div><div class='add'>+				/* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */</div><div class='add'>+				dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+					 "Installing spdif_bug patch: %s\n",</div><div class='add'>+					 emu-&gt;card_capabilities-&gt;name);</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);</div><div class='add'>+			} else {</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		snd_emu10k1_init_stereo_onoff_control(controls + nctl++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);</div><div class='add'>+		gpr += 2;</div><div class='add'>+</div><div class='add'>+		A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2);</div><div class='add'>+		A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4);</div><div class='add'>+		A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5);</div><div class='ctx'> 	}</div><div class='del'>-	snd_emu10k1_init_stereo_onoff_control(controls + nctl++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-	</div><div class='del'>-	A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='del'>-	A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='ctx'> </div><div class='ctx'> 	/* ADC buffer */</div><div class='ctx'> #ifdef EMU10K1_CAPTURE_DIGITAL_OUT</div><div class='del'>-	A_PUT_STEREO_OUTPUT(A_EXTOUT_ADC_CAP_L, A_EXTOUT_ADC_CAP_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);</div><div class='add'>+	A_PUT_STEREO_OUTPUT(A_EXTOUT_ADC_CAP_L, A_EXTOUT_ADC_CAP_R, playback);</div><div class='ctx'> #else</div><div class='ctx'> 	A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_L, capture);</div><div class='ctx'> 	A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_R, capture+1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+		/* Capture 16 channels of S32_LE sound. */</div><div class='ctx'> 		if (emu-&gt;card_capabilities-&gt;ca0108_chip) {</div><div class='del'>-			snd_printk(KERN_INFO "EMU2 inputs on\n");</div><div class='del'>-			for (z = 0; z &lt; 0x10; z++) {</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev, "EMU2 inputs on\n");</div><div class='add'>+			/* Note that the Tina[2] DSPs have 16 more EMU32 inputs which we don't use. */</div><div class='add'>+</div><div class='add'>+			snd_emu10k1_audigy_dsp_convert_32_to_2x16(</div><div class='add'>+				icode, &amp;ptr, tmp, bit_shifter16, A3_EMU32IN(0), A_FXBUS2(0));</div><div class='add'>+			// A3_EMU32IN(0) is delayed by one sample, so all other A3_EMU32IN channels</div><div class='add'>+			// need to be delayed as well; we use an auxiliary register for that.</div><div class='add'>+			for (z = 1; z &lt; 0x10; z++) {</div><div class='ctx'> 				snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, </div><div class='ctx'> 									bit_shifter16,</div><div class='del'>-									A3_EMU32IN(z),</div><div class='add'>+									A_GPR(gpr),</div><div class='ctx'> 									A_FXBUS2(z*2) );</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr), A3_EMU32IN(z), A_C_00000000, A_C_00000000);</div><div class='add'>+				gpr_map[gpr++] = 0x00000000;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_printk(KERN_INFO "EMU inputs on\n");</div><div class='del'>-			/* Capture 16 (originally 8) channels of S32_LE sound */</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev, "EMU inputs on\n");</div><div class='add'>+			/* Note that the Alice2 DSPs have 6 I2S inputs which we don't use. */</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			printk(KERN_DEBUG "emufx.c: gpr=0x%x, tmp=0x%x\n",</div><div class='add'>+			dev_dbg(emu-&gt;card-&gt;dev, "emufx.c: gpr=0x%x, tmp=0x%x\n",</div><div class='ctx'> 			       gpr, tmp);</div><div class='ctx'> 			*/</div><div class='del'>-			/* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */</div><div class='del'>-			/* A_P16VIN(0) is delayed by one sample,</div><div class='del'>-			 * so all other A_P16VIN channels will need to also be delayed</div><div class='del'>-			 */</div><div class='del'>-			/* Left ADC in. 1 of 2 */</div><div class='ctx'> 			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_P16VIN(0x0), A_FXBUS2(0) );</div><div class='del'>-			/* Right ADC in 1 of 2 */</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			/* Delaying by one sample: instead of copying the input</div><div class='del'>-			 * value A_P16VIN to output A_FXBUS2 as in the first channel,</div><div class='del'>-			 * we use an auxiliary register, delaying the value by one</div><div class='del'>-			 * sample</div><div class='del'>-			 */</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(2) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x1), A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(4) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x2), A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(6) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x3), A_C_00000000, A_C_00000000);</div><div class='del'>-			/* For 96kHz mode */</div><div class='del'>-			/* Left ADC in. 2 of 2 */</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0x8) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x4), A_C_00000000, A_C_00000000);</div><div class='del'>-			/* Right ADC in 2 of 2 */</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xa) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x5), A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xc) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x6), A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xe) );</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x7), A_C_00000000, A_C_00000000);</div><div class='del'>-			/* Pavel Hofman - we still have voices, A_FXBUS2s, and</div><div class='del'>-			 * A_P16VINs available -</div><div class='del'>-			 * let's add 8 more capture channels - total of 16</div><div class='del'>-			 */</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x10));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x8),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x12));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x9),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x14));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xa),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x16));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xb),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x18));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xc),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x1a));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xd),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x1c));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xe),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='del'>-			gpr_map[gpr++] = 0x00000000;</div><div class='del'>-			snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &amp;ptr, tmp,</div><div class='del'>-								  bit_shifter16,</div><div class='del'>-								  A_GPR(gpr - 1),</div><div class='del'>-								  A_FXBUS2(0x1e));</div><div class='del'>-			A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xf),</div><div class='del'>-			     A_C_00000000, A_C_00000000);</div><div class='add'>+			/* A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels</div><div class='add'>+			 * will need to also be delayed; we use an auxiliary register for that. */</div><div class='add'>+			for (z = 1; z &lt; 0x10; z++) {</div><div class='add'>+				snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &amp;ptr, tmp, bit_shifter16, A_GPR(gpr), A_FXBUS2(z * 2) );</div><div class='add'>+				A_OP(icode, &amp;ptr, iACC3, A_GPR(gpr), A_P16VIN(z), A_C_00000000, A_C_00000000);</div><div class='add'>+				gpr_map[gpr++] = 0x00000000;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -1721,29 +1728,28 @@ A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'> 	 * ok, set up done..</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	if (gpr &gt; tmp) {</div><div class='add'>+	if (gpr &gt; 512) {</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* clear remaining instruction memory */</div><div class='ctx'> 	while (ptr &lt; 0x400)</div><div class='ctx'> 		A_OP(icode, &amp;ptr, 0x0f, 0xc0, 0xc0, 0xcf, 0xc0);</div><div class='ctx'> </div><div class='del'>-	seg = snd_enter_user();</div><div class='ctx'> 	icode-&gt;gpr_add_control_count = nctl;</div><div class='del'>-	icode-&gt;gpr_add_controls = (struct snd_emu10k1_fx8010_control_gpr __user *)controls;</div><div class='add'>+	icode-&gt;gpr_add_controls = controls;</div><div class='ctx'> 	emu-&gt;support_tlv = 1; /* support TLV */</div><div class='del'>-	err = snd_emu10k1_icode_poke(emu, icode);</div><div class='add'>+	err = snd_emu10k1_icode_poke(emu, icode, true);</div><div class='ctx'> 	emu-&gt;support_tlv = 0; /* clear again */</div><div class='del'>-	snd_leave_user(seg);</div><div class='ctx'> </div><div class='del'>- __err:</div><div class='add'>+__err:</div><div class='ctx'> 	kfree(controls);</div><div class='del'>-	if (icode != NULL) {</div><div class='del'>-		kfree((void __force *)icode-&gt;gpr_map);</div><div class='del'>-		kfree(icode);</div><div class='del'>-	}</div><div class='add'>+__err_ctrls:</div><div class='add'>+	kfree(icode-&gt;gpr_map);</div><div class='add'>+__err_gpr:</div><div class='add'>+	kfree(icode);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1752,30 +1758,14 @@ A_OP(icode, &amp;ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))</div><div class='ctx'>  * initial DSP configuration for Emu10k1</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* when volume = max, then copy only to avoid volume modification */</div><div class='del'>-/* with iMAC0 (negative values) */</div><div class='del'>-static void __devinit _volume(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)</div><div class='del'>-{</div><div class='del'>-	OP(icode, ptr, iMAC0, dst, C_00000000, src, vol);</div><div class='del'>-	OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);</div><div class='del'>-	OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000001);</div><div class='del'>-	OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000);</div><div class='del'>-}</div><div class='del'>-static void __devinit _volume_add(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)</div><div class='add'>+/* Volumes are in the [-2^31, 0] range, zero being mute. */</div><div class='add'>+static void _volume(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)</div><div class='ctx'> {</div><div class='del'>-	OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);</div><div class='del'>-	OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002);</div><div class='del'>-	OP(icode, ptr, iMACINT0, dst, dst, src, C_00000001);</div><div class='del'>-	OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001);</div><div class='del'>-	OP(icode, ptr, iMAC0, dst, dst, src, vol);</div><div class='add'>+	OP(icode, ptr, iMAC1, dst, C_00000000, src, vol);</div><div class='ctx'> }</div><div class='del'>-static void __devinit _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)</div><div class='add'>+static void _volume_add(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)</div><div class='ctx'> {</div><div class='del'>-	OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);</div><div class='del'>-	OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002);</div><div class='del'>-	OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000);</div><div class='del'>-	OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001);</div><div class='del'>-	OP(icode, ptr, iMAC0, dst, C_00000000, src, vol);</div><div class='add'>+	OP(icode, ptr, iMAC1, dst, dst, src, vol);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define VOLUME(icode, ptr, dst, src, vol) \</div><div class='hunk'>@@ -1787,7 +1777,7 @@ static void __devinit _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *pt</div><div class='ctx'> #define VOLUME_ADDIN(icode, ptr, dst, src, vol) \</div><div class='ctx'> 		_volume_add(icode, ptr, GPR(dst), EXTIN(src), GPR(vol))</div><div class='ctx'> #define VOLUME_OUT(icode, ptr, dst, src, vol) \</div><div class='del'>-		_volume_out(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol))</div><div class='add'>+		_volume(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol))</div><div class='ctx'> #define _SWITCH(icode, ptr, dst, src, sw) \</div><div class='ctx'> 	OP((icode), ptr, iMACINT0, dst, C_00000000, src, sw);</div><div class='ctx'> #define SWITCH(icode, ptr, dst, src, sw) \</div><div class='hunk'>@@ -1800,70 +1790,72 @@ static void __devinit _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *pt</div><div class='ctx'> 		_SWITCH_NEG(icode, ptr, GPR(dst), GPR(src))</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='add'>+static int _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i, z, gpr, tmp, playback, capture;</div><div class='del'>-	u32 ptr;</div><div class='add'>+	u32 ptr, ptr_skip;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_code *icode;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm_rec *ipcm = NULL;</div><div class='ctx'> 	struct snd_emu10k1_fx8010_control_gpr *controls = NULL, *ctl;</div><div class='ctx'> 	u32 *gpr_map;</div><div class='del'>-	mm_segment_t seg;</div><div class='ctx'> </div><div class='del'>-	if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if ((icode-&gt;gpr_map = (u_int32_t __user *)</div><div class='del'>-	     kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t),</div><div class='del'>-		     GFP_KERNEL)) == NULL ||</div><div class='del'>-            (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,</div><div class='del'>-				sizeof(struct snd_emu10k1_fx8010_control_gpr),</div><div class='del'>-				GFP_KERNEL)) == NULL ||</div><div class='del'>-	    (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto __err;</div><div class='del'>-	}</div><div class='del'>-	gpr_map = (u32 __force *)icode-&gt;gpr_map;</div><div class='add'>+	err = -ENOMEM;</div><div class='add'>+	icode = kzalloc(sizeof(*icode), GFP_KERNEL);</div><div class='add'>+	if (!icode)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	icode-&gt;gpr_map = kcalloc(256 + 160 + 160 + 2 * 512,</div><div class='add'>+				 sizeof(u_int32_t), GFP_KERNEL);</div><div class='add'>+	if (!icode-&gt;gpr_map)</div><div class='add'>+		goto __err_gpr;</div><div class='add'>+</div><div class='add'>+	controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,</div><div class='add'>+			   sizeof(struct snd_emu10k1_fx8010_control_gpr),</div><div class='add'>+			   GFP_KERNEL);</div><div class='add'>+	if (!controls)</div><div class='add'>+		goto __err_ctrls;</div><div class='add'>+</div><div class='add'>+	ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL);</div><div class='add'>+	if (!ipcm)</div><div class='add'>+		goto __err_ipcm;</div><div class='add'>+</div><div class='add'>+	gpr_map = icode-&gt;gpr_map;</div><div class='ctx'> </div><div class='ctx'> 	icode-&gt;tram_data_map = icode-&gt;gpr_map + 256;</div><div class='ctx'> 	icode-&gt;tram_addr_map = icode-&gt;tram_data_map + 160;</div><div class='ctx'> 	icode-&gt;code = icode-&gt;tram_addr_map + 160;</div><div class='ctx'> 	</div><div class='ctx'> 	/* clear free GPRs */</div><div class='del'>-	for (i = 0; i &lt; 256; i++)</div><div class='del'>-		set_bit(i, icode-&gt;gpr_valid);</div><div class='add'>+	memset(icode-&gt;gpr_valid, 0xff, 256 / 8);</div><div class='ctx'> </div><div class='ctx'> 	/* clear TRAM data &amp; address lines */</div><div class='del'>-	for (i = 0; i &lt; 160; i++)</div><div class='del'>-		set_bit(i, icode-&gt;tram_valid);</div><div class='add'>+	memset(icode-&gt;tram_valid, 0xff, 160 / 8);</div><div class='ctx'> </div><div class='del'>-	strcpy(icode-&gt;name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela");</div><div class='add'>+	strscpy(icode-&gt;name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela");</div><div class='ctx'> 	ptr = 0; i = 0;</div><div class='ctx'> 	/* we have 12 inputs */</div><div class='ctx'> 	playback = SND_EMU10K1_INPUTS;</div><div class='ctx'> 	/* we have 6 playback channels and tone control doubles */</div><div class='del'>-	capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2);</div><div class='add'>+	capture = playback + SND_EMU10K1_PLAYBACK_CHANNELS;</div><div class='ctx'> 	gpr = capture + SND_EMU10K1_CAPTURE_CHANNELS;</div><div class='ctx'> 	tmp = 0x88;	/* we need 4 temporary GPR */</div><div class='ctx'> 	/* from 0x8c to 0xff is the area for tone control */</div><div class='ctx'> </div><div class='del'>-	/* stop FX processor */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DBG, 0, (emu-&gt;fx8010.dbg = 0) | EMU10K1_DBG_SINGLE_STEP);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Process FX Buses</div><div class='ctx'> 	 */</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(0), C_00000000, FXBUS(FXBUS_PCM_LEFT), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(1), C_00000000, FXBUS(FXBUS_PCM_RIGHT), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(2), C_00000000, FXBUS(FXBUS_MIDI_LEFT), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(3), C_00000000, FXBUS(FXBUS_MIDI_RIGHT), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(4), C_00000000, FXBUS(FXBUS_PCM_LEFT_REAR), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(5), C_00000000, FXBUS(FXBUS_PCM_RIGHT_REAR), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(6), C_00000000, FXBUS(FXBUS_PCM_CENTER), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000004);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(0), C_00000000, FXBUS(FXBUS_PCM_LEFT), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(1), C_00000000, FXBUS(FXBUS_PCM_RIGHT), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(2), C_00000000, FXBUS(FXBUS_MIDI_LEFT), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(3), C_00000000, FXBUS(FXBUS_MIDI_RIGHT), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(4), C_00000000, FXBUS(FXBUS_PCM_LEFT_REAR), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(5), C_00000000, FXBUS(FXBUS_PCM_RIGHT_REAR), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(6), C_00000000, FXBUS(FXBUS_PCM_CENTER), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000008);</div><div class='ctx'> 	OP(icode, &amp;ptr, iMACINT0, GPR(8), C_00000000, C_00000000, C_00000000);	/* S/PDIF left */</div><div class='ctx'> 	OP(icode, &amp;ptr, iMACINT0, GPR(9), C_00000000, C_00000000, C_00000000);	/* S/PDIF right */</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000004);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000004);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000008);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000008);</div><div class='ctx'> </div><div class='ctx'> 	/* Raw S/PDIF PCM */</div><div class='ctx'> 	ipcm-&gt;substream = 0;</div><div class='hunk'>@@ -1957,7 +1949,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 	</div><div class='ctx'> 	/* Wave Center/LFE Playback Volume */</div><div class='ctx'> 	OP(icode, &amp;ptr, iACC3, GPR(tmp + 0), FXBUS(FXBUS_PCM_LEFT), FXBUS(FXBUS_PCM_RIGHT), C_00000000);</div><div class='del'>-	OP(icode, &amp;ptr, iMACINT0, GPR(tmp + 0), C_00000000, GPR(tmp + 0), C_00000002);</div><div class='add'>+	OP(icode, &amp;ptr, iMACINT0, GPR(tmp + 0), C_00000000, GPR(tmp + 0), C_00000004);</div><div class='ctx'> 	VOLUME(icode, &amp;ptr, playback + 4, tmp + 0, gpr);</div><div class='ctx'> 	snd_emu10k1_init_mono_control(controls + i++, "Wave Center Playback Volume", gpr++, 0);</div><div class='ctx'> 	VOLUME(icode, &amp;ptr, playback + 5, tmp + 0, gpr);</div><div class='hunk'>@@ -2148,30 +2140,25 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Process tone control</div><div class='ctx'> 	 */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), GPR(playback + 0), C_00000000, C_00000000); /* left */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), GPR(playback + 1), C_00000000, C_00000000); /* right */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2), GPR(playback + 2), C_00000000, C_00000000); /* rear left */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 3), GPR(playback + 3), C_00000000, C_00000000); /* rear right */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), GPR(playback + 4), C_00000000, C_00000000); /* center */</div><div class='del'>-	OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), GPR(playback + 5), C_00000000, C_00000000); /* LFE */</div><div class='del'>-</div><div class='ctx'> 	ctl = &amp;controls[i + 0];</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, "Tone Control - Bass");</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, "Tone Control - Bass");</div><div class='ctx'> 	ctl-&gt;vcount = 2;</div><div class='ctx'> 	ctl-&gt;count = 10;</div><div class='ctx'> 	ctl-&gt;min = 0;</div><div class='ctx'> 	ctl-&gt;max = 40;</div><div class='ctx'> 	ctl-&gt;value[0] = ctl-&gt;value[1] = 20;</div><div class='add'>+	ctl-&gt;tlv = snd_emu10k1_bass_treble_db_scale;</div><div class='ctx'> 	ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_BASS;</div><div class='ctx'> 	ctl = &amp;controls[i + 1];</div><div class='del'>-	ctl-&gt;id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(ctl-&gt;id.name, "Tone Control - Treble");</div><div class='add'>+	ctl-&gt;id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	strscpy(ctl-&gt;id.name, "Tone Control - Treble");</div><div class='ctx'> 	ctl-&gt;vcount = 2;</div><div class='ctx'> 	ctl-&gt;count = 10;</div><div class='ctx'> 	ctl-&gt;min = 0;</div><div class='ctx'> 	ctl-&gt;max = 40;</div><div class='ctx'> 	ctl-&gt;value[0] = ctl-&gt;value[1] = 20;</div><div class='add'>+	ctl-&gt;tlv = snd_emu10k1_bass_treble_db_scale;</div><div class='ctx'> 	ctl-&gt;translation = EMU10K1_GPR_TRANSLATION_TREBLE;</div><div class='ctx'> </div><div class='ctx'> #define BASS_GPR	0x8c</div><div class='hunk'>@@ -2184,12 +2171,19 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 			controls[i + 1].gpr[z * 2 + j] = TREBLE_GPR + z * 2 + j;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	i += 2;</div><div class='add'>+</div><div class='add'>+	OP(icode, &amp;ptr, iACC3, C_00000000, GPR(gpr), C_00000000, C_00000000);</div><div class='add'>+	snd_emu10k1_init_mono_onoff_control(controls + i++, "Tone Control - Switch", gpr, 0);</div><div class='add'>+	gpr++;</div><div class='add'>+	OP(icode, &amp;ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_ZERO, GPR(gpr));</div><div class='add'>+	ptr_skip = ptr;</div><div class='ctx'> 	for (z = 0; z &lt; 3; z++) {		/* front/rear/center-lfe */</div><div class='ctx'> 		int j, k, l, d;</div><div class='ctx'> 		for (j = 0; j &lt; 2; j++) {	/* left/right */</div><div class='ctx'> 			k = 0xa0 + (z * 8) + (j * 4);</div><div class='ctx'> 			l = 0xd0 + (z * 8) + (j * 4);</div><div class='del'>-			d = playback + SND_EMU10K1_PLAYBACK_CHANNELS + z * 2 + j;</div><div class='add'>+			d = playback + z * 2 + j;</div><div class='ctx'> </div><div class='ctx'> 			OP(icode, &amp;ptr, iMAC0, C_00000000, C_00000000, GPR(d), GPR(BASS_GPR + 0 + j));</div><div class='ctx'> 			OP(icode, &amp;ptr, iMACMV, GPR(k+1), GPR(k), GPR(k+1), GPR(BASS_GPR + 4 + j));</div><div class='hunk'>@@ -2211,20 +2205,11 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	i += 2;</div><div class='add'>+	gpr_map[gpr++] = ptr - ptr_skip;</div><div class='ctx'> </div><div class='ctx'> #undef BASS_GPR</div><div class='ctx'> #undef TREBLE_GPR</div><div class='ctx'> </div><div class='del'>-	for (z = 0; z &lt; 6; z++) {</div><div class='del'>-		SWITCH(icode, &amp;ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, gpr + 0);</div><div class='del'>-		SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + 0);</div><div class='del'>-		SWITCH(icode, &amp;ptr, tmp + 1, playback + z, tmp + 1);</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), GPR(tmp + 0), GPR(tmp + 1), C_00000000);</div><div class='del'>-	}</div><div class='del'>-	snd_emu10k1_init_stereo_onoff_control(controls + i++, "Tone Control - Switch", gpr, 0);</div><div class='del'>-	gpr += 2;</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Process outputs</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2232,7 +2217,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 		/* AC'97 Playback Volume */</div><div class='ctx'> </div><div class='ctx'> 		for (z = 0; z &lt; 2; z++)</div><div class='del'>-			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), C_00000000, C_00000000);</div><div class='add'>+			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_L + z), GPR(playback + z), C_00000000, C_00000000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;fx8010.extout_mask &amp; ((1&lt;&lt;EXTOUT_TOSLINK_L)|(1&lt;&lt;EXTOUT_TOSLINK_R))) {</div><div class='hunk'>@@ -2241,7 +2226,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 		for (z = 0; z &lt; 2; z++) {</div><div class='ctx'> 			SWITCH(icode, &amp;ptr, tmp + 0, 8 + z, gpr + z);</div><div class='ctx'> 			SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + z);</div><div class='del'>-			SWITCH(icode, &amp;ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);</div><div class='add'>+			SWITCH(icode, &amp;ptr, tmp + 1, playback + z, tmp + 1);</div><div class='ctx'> 			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_TOSLINK_L + z), GPR(tmp + 0), GPR(tmp + 1), C_00000000);</div><div class='ctx'> #ifdef EMU10K1_CAPTURE_DIGITAL_OUT</div><div class='ctx'> 	 		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ADC_CAP_L + z), GPR(tmp + 0), GPR(tmp + 1), C_00000000);</div><div class='hunk'>@@ -2256,9 +2241,9 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 		/* Headphone Playback Volume */</div><div class='ctx'> </div><div class='ctx'> 		for (z = 0; z &lt; 2; z++) {</div><div class='del'>-			SWITCH(icode, &amp;ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4 + z, gpr + 2 + z);</div><div class='add'>+			SWITCH(icode, &amp;ptr, tmp + 0, playback + 4 + z, gpr + 2 + z);</div><div class='ctx'> 			SWITCH_NEG(icode, &amp;ptr, tmp + 1, gpr + 2 + z);</div><div class='del'>-			SWITCH(icode, &amp;ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);</div><div class='add'>+			SWITCH(icode, &amp;ptr, tmp + 1, playback + z, tmp + 1);</div><div class='ctx'> 			OP(icode, &amp;ptr, iACC3, GPR(tmp + 0), GPR(tmp + 0), GPR(tmp + 1), C_00000000);</div><div class='ctx'> 			VOLUME_OUT(icode, &amp;ptr, EXTOUT_HEADPHONE_L + z, tmp + 0, gpr + z);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2275,29 +2260,29 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 	</div><div class='ctx'> 	if (emu-&gt;fx8010.extout_mask &amp; ((1&lt;&lt;EXTOUT_REAR_L)|(1&lt;&lt;EXTOUT_REAR_R)))</div><div class='ctx'> 		for (z = 0; z &lt; 2; z++)</div><div class='del'>-			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_REAR_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2 + z), C_00000000, C_00000000);</div><div class='add'>+			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_REAR_L + z), GPR(playback + 2 + z), C_00000000, C_00000000);</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;fx8010.extout_mask &amp; ((1&lt;&lt;EXTOUT_AC97_REAR_L)|(1&lt;&lt;EXTOUT_AC97_REAR_R)))</div><div class='ctx'> 		for (z = 0; z &lt; 2; z++)</div><div class='del'>-			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_REAR_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2 + z), C_00000000, C_00000000);</div><div class='add'>+			OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_REAR_L + z), GPR(playback + 2 + z), C_00000000, C_00000000);</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;fx8010.extout_mask &amp; (1&lt;&lt;EXTOUT_AC97_CENTER)) {</div><div class='ctx'> #ifndef EMU10K1_CENTER_LFE_FROM_FRONT</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), C_00000000, C_00000000);</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + 4), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + 4), C_00000000, C_00000000);</div><div class='ctx'> #else</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), C_00000000, C_00000000);</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + 0), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + 0), C_00000000, C_00000000);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;fx8010.extout_mask &amp; (1&lt;&lt;EXTOUT_AC97_LFE)) {</div><div class='ctx'> #ifndef EMU10K1_CENTER_LFE_FROM_FRONT</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), C_00000000, C_00000000);</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + 5), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + 5), C_00000000, C_00000000);</div><div class='ctx'> #else</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), C_00000000, C_00000000);</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + 1), C_00000000, C_00000000);</div><div class='add'>+		OP(icode, &amp;ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + 1), C_00000000, C_00000000);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> 	</div><div class='hunk'>@@ -2311,21 +2296,11 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> </div><div class='ctx'> 	/* EFX capture - capture the 16 EXTINS */</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;sblive51) {</div><div class='del'>-		/* On the Live! 5.1, FXBUS2(1) and FXBUS(2) are shared with EXTOUT_ACENTER</div><div class='del'>-		 * and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.</div><div class='del'>-		 *</div><div class='del'>-		 * Since only 14 of the 16 EXTINs are used, this is not a big problem.  </div><div class='del'>-		 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture </div><div class='del'>-		 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture </div><div class='del'>-		 * channel.  Multitrack recorders will still see the center/lfe output signal </div><div class='del'>-		 * on the second and third channels.</div><div class='del'>-		 */</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, FXBUS2(14), C_00000000, C_00000000, EXTIN(0));</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, FXBUS2(15), C_00000000, C_00000000, EXTIN(1));</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, FXBUS2(0), C_00000000, C_00000000, EXTIN(2));</div><div class='del'>-		OP(icode, &amp;ptr, iACC3, FXBUS2(3), C_00000000, C_00000000, EXTIN(3));</div><div class='del'>-		for (z = 4; z &lt; 14; z++)</div><div class='del'>-			OP(icode, &amp;ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));</div><div class='add'>+		for (z = 0; z &lt; 16; z++) {</div><div class='add'>+			s8 c = snd_emu10k1_sblive51_fxbus2_map[z];</div><div class='add'>+			if (c != -1)</div><div class='add'>+				OP(icode, &amp;ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(c));</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		for (z = 0; z &lt; 16; z++)</div><div class='ctx'> 			OP(icode, &amp;ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));</div><div class='hunk'>@@ -2347,28 +2322,28 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> 	while (ptr &lt; 0x200)</div><div class='ctx'> 		OP(icode, &amp;ptr, iACC3, C_00000000, C_00000000, C_00000000, C_00000000);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1_fx8010_tram_setup(emu, ipcm-&gt;buffer_size)) &lt; 0)</div><div class='add'>+	err = snd_emu10k1_fx8010_tram_setup(emu, ipcm-&gt;buffer_size);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __err;</div><div class='del'>-	seg = snd_enter_user();</div><div class='ctx'> 	icode-&gt;gpr_add_control_count = i;</div><div class='del'>-	icode-&gt;gpr_add_controls = (struct snd_emu10k1_fx8010_control_gpr __user *)controls;</div><div class='add'>+	icode-&gt;gpr_add_controls = controls;</div><div class='ctx'> 	emu-&gt;support_tlv = 1; /* support TLV */</div><div class='del'>-	err = snd_emu10k1_icode_poke(emu, icode);</div><div class='add'>+	err = snd_emu10k1_icode_poke(emu, icode, true);</div><div class='ctx'> 	emu-&gt;support_tlv = 0; /* clear again */</div><div class='del'>-	snd_leave_user(seg);</div><div class='ctx'> 	if (err &gt;= 0)</div><div class='ctx'> 		err = snd_emu10k1_ipcm_poke(emu, ipcm);</div><div class='del'>-      __err:</div><div class='add'>+__err:</div><div class='ctx'> 	kfree(ipcm);</div><div class='add'>+__err_ipcm:</div><div class='ctx'> 	kfree(controls);</div><div class='del'>-	if (icode != NULL) {</div><div class='del'>-		kfree((void __force *)icode-&gt;gpr_map);</div><div class='del'>-		kfree(icode);</div><div class='del'>-	}</div><div class='add'>+__err_ctrls:</div><div class='add'>+	kfree(icode-&gt;gpr_map);</div><div class='add'>+__err_gpr:</div><div class='add'>+	kfree(icode);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='add'>+int snd_emu10k1_init_efx(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	spin_lock_init(&amp;emu-&gt;fx8010.irq_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;emu-&gt;fx8010.gpr_ctl);</div><div class='hunk'>@@ -2421,11 +2396,11 @@ int snd_emu10k1_fx8010_tram_setup(struct snd_emu10k1 *emu, u32 size)</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((emu-&gt;fx8010.etram_pages.bytes / 2) == size)</div><div class='ctx'> 		return 0;</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;emu_lock);</div><div class='del'>-	outl(HCFG_LOCKTANKCACHE_MASK | inl(emu-&gt;port + HCFG), emu-&gt;port + HCFG);</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;emu_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;emu-&gt;emu_lock) {</div><div class='add'>+		outl(HCFG_LOCKTANKCACHE_MASK | inl(emu-&gt;port + HCFG), emu-&gt;port + HCFG);</div><div class='add'>+	}</div><div class='ctx'> 	snd_emu10k1_ptr_write(emu, TCB, 0, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TCBS, 0, 0);</div><div class='add'>+	snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_16K);</div><div class='ctx'> 	if (emu-&gt;fx8010.etram_pages.area != NULL) {</div><div class='ctx'> 		snd_dma_free_pages(&amp;emu-&gt;fx8010.etram_pages);</div><div class='ctx'> 		emu-&gt;fx8010.etram_pages.area = NULL;</div><div class='hunk'>@@ -2433,15 +2408,15 @@ int snd_emu10k1_fx8010_tram_setup(struct snd_emu10k1 *emu, u32 size)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (size &gt; 0) {</div><div class='del'>-		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu-&gt;pci),</div><div class='add'>+		if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &amp;emu-&gt;pci-&gt;dev,</div><div class='ctx'> 					size * 2, &amp;emu-&gt;fx8010.etram_pages) &lt; 0)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		memset(emu-&gt;fx8010.etram_pages.area, 0, size * 2);</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, TCB, 0, emu-&gt;fx8010.etram_pages.addr);</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, TCBS, 0, size_reg);</div><div class='del'>-		spin_lock_irq(&amp;emu-&gt;emu_lock);</div><div class='del'>-		outl(inl(emu-&gt;port + HCFG) &amp; ~HCFG_LOCKTANKCACHE_MASK, emu-&gt;port + HCFG);</div><div class='del'>-		spin_unlock_irq(&amp;emu-&gt;emu_lock);</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;emu-&gt;emu_lock) {</div><div class='add'>+			outl(inl(emu-&gt;port + HCFG) &amp; ~HCFG_LOCKTANKCACHE_MASK, emu-&gt;port + HCFG);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2452,7 +2427,7 @@ static int snd_emu10k1_fx8010_open(struct snd_hwdep * hw, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void copy_string(char *dst, char *src, char *null, int idx)</div><div class='add'>+static void copy_string(char *dst, const char *src, const char *null, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	if (src == NULL)</div><div class='ctx'> 		sprintf(dst, "%s %02X", null, idx);</div><div class='hunk'>@@ -2463,20 +2438,19 @@ static void copy_string(char *dst, char *src, char *null, int idx)</div><div class='ctx'> static void snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu,</div><div class='ctx'> 				   struct snd_emu10k1_fx8010_info *info)</div><div class='ctx'> {</div><div class='del'>-	char **fxbus, **extin, **extout;</div><div class='del'>-	unsigned short fxbus_mask, extin_mask, extout_mask;</div><div class='add'>+	const char * const *fxbus, * const *extin, * const *extout;</div><div class='add'>+	unsigned short extin_mask, extout_mask;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;internal_tram_size = emu-&gt;fx8010.itram_size;</div><div class='ctx'> 	info-&gt;external_tram_size = emu-&gt;fx8010.etram_pages.bytes / 2;</div><div class='del'>-	fxbus = fxbuses;</div><div class='del'>-	extin = emu-&gt;audigy ? audigy_ins : creative_ins;</div><div class='del'>-	extout = emu-&gt;audigy ? audigy_outs : creative_outs;</div><div class='del'>-	fxbus_mask = emu-&gt;fx8010.fxbus_mask;</div><div class='del'>-	extin_mask = emu-&gt;fx8010.extin_mask;</div><div class='del'>-	extout_mask = emu-&gt;fx8010.extout_mask;</div><div class='add'>+	fxbus = snd_emu10k1_fxbus;</div><div class='add'>+	extin = emu-&gt;audigy ? snd_emu10k1_audigy_ins : snd_emu10k1_sblive_ins;</div><div class='add'>+	extout = emu-&gt;audigy ? snd_emu10k1_audigy_outs : snd_emu10k1_sblive_outs;</div><div class='add'>+	extin_mask = emu-&gt;audigy ? ~0 : emu-&gt;fx8010.extin_mask;</div><div class='add'>+	extout_mask = emu-&gt;audigy ? ~0 : emu-&gt;fx8010.extout_mask;</div><div class='ctx'> 	for (res = 0; res &lt; 16; res++, fxbus++, extin++, extout++) {</div><div class='del'>-		copy_string(info-&gt;fxbus_names[res], fxbus_mask &amp; (1 &lt;&lt; res) ? *fxbus : NULL, "FXBUS", res);</div><div class='add'>+		copy_string(info-&gt;fxbus_names[res], *fxbus, "FXBUS", res);</div><div class='ctx'> 		copy_string(info-&gt;extin_names[res], extin_mask &amp; (1 &lt;&lt; res) ? *extin : NULL, "Unused", res);</div><div class='ctx'> 		copy_string(info-&gt;extout_names[res], extout_mask &amp; (1 &lt;&lt; res) ? *extout : NULL, "Unused", res);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2500,7 +2474,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un</div><div class='ctx'> 		emu-&gt;support_tlv = 1;</div><div class='ctx'> 		return put_user(SNDRV_EMU10K1_VERSION, (int __user *)argp);</div><div class='ctx'> 	case SNDRV_EMU10K1_IOCTL_INFO:</div><div class='del'>-		info = kmalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+		info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='ctx'> 		if (!info)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		snd_emu10k1_fx8010_info(emu, info);</div><div class='hunk'>@@ -2517,7 +2491,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un</div><div class='ctx'> 		icode = memdup_user(argp, sizeof(*icode));</div><div class='ctx'> 		if (IS_ERR(icode))</div><div class='ctx'> 			return PTR_ERR(icode);</div><div class='del'>-		res = snd_emu10k1_icode_poke(emu, icode);</div><div class='add'>+		res = snd_emu10k1_icode_poke(emu, icode, false);</div><div class='ctx'> 		kfree(icode);</div><div class='ctx'> 		return res;</div><div class='ctx'> 	case SNDRV_EMU10K1_IOCTL_CODE_PEEK:</div><div class='hunk'>@@ -2554,9 +2528,9 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		if (get_user(addr, (unsigned int __user *)argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		mutex_lock(&amp;emu-&gt;fx8010.lock);</div><div class='del'>-		res = snd_emu10k1_fx8010_tram_setup(emu, addr);</div><div class='del'>-		mutex_unlock(&amp;emu-&gt;fx8010.lock);</div><div class='add'>+		scoped_guard(mutex, &amp;emu-&gt;fx8010.lock) {</div><div class='add'>+			res = snd_emu10k1_fx8010_tram_setup(emu, addr);</div><div class='add'>+		}</div><div class='ctx'> 		return res;</div><div class='ctx'> 	case SNDRV_EMU10K1_IOCTL_STOP:</div><div class='ctx'> 		if (!capable(CAP_SYS_ADMIN))</div><div class='hunk'>@@ -2592,17 +2566,19 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		if (get_user(addr, (unsigned int __user *)argp))</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (addr &gt; 0x1ff)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		if (emu-&gt;audigy)</div><div class='del'>-			snd_emu10k1_ptr_write(emu, A_DBG, 0, emu-&gt;fx8010.dbg |= A_DBG_SINGLE_STEP | addr);</div><div class='del'>-		else</div><div class='del'>-			snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP | addr);</div><div class='del'>-		udelay(10);</div><div class='del'>-		if (emu-&gt;audigy)</div><div class='del'>-			snd_emu10k1_ptr_write(emu, A_DBG, 0, emu-&gt;fx8010.dbg |= A_DBG_SINGLE_STEP | A_DBG_STEP_ADDR | addr);</div><div class='del'>-		else</div><div class='del'>-			snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP | EMU10K1_DBG_STEP | addr);</div><div class='add'>+		if (emu-&gt;audigy) {</div><div class='add'>+			if (addr &gt; A_DBG_STEP_ADDR)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			snd_emu10k1_ptr_write(emu, A_DBG, 0, emu-&gt;fx8010.dbg |= A_DBG_SINGLE_STEP);</div><div class='add'>+			udelay(10);</div><div class='add'>+			snd_emu10k1_ptr_write(emu, A_DBG, 0, emu-&gt;fx8010.dbg | A_DBG_STEP | addr);</div><div class='add'>+		} else {</div><div class='add'>+			if (addr &gt; EMU10K1_DBG_SINGLE_STEP_ADDR)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP);</div><div class='add'>+			udelay(10);</div><div class='add'>+			snd_emu10k1_ptr_write(emu, DBG, 0, emu-&gt;fx8010.dbg | EMU10K1_DBG_STEP | addr);</div><div class='add'>+		}</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	case SNDRV_EMU10K1_IOCTL_DBG_READ:</div><div class='ctx'> 		if (emu-&gt;audigy)</div><div class='hunk'>@@ -2621,42 +2597,39 @@ static int snd_emu10k1_fx8010_release(struct snd_hwdep * hw, struct file *file)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct snd_hwdep ** rhwdep)</div><div class='add'>+int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_hwdep *hw;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if (rhwdep)</div><div class='del'>-		*rhwdep = NULL;</div><div class='del'>-	if ((err = snd_hwdep_new(emu-&gt;card, "FX8010", device, &amp;hw)) &lt; 0)</div><div class='add'>+	err = snd_hwdep_new(emu-&gt;card, "FX8010", device, &amp;hw);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	strcpy(hw-&gt;name, "EMU10K1 (FX8010)");</div><div class='add'>+	strscpy(hw-&gt;name, "EMU10K1 (FX8010)");</div><div class='ctx'> 	hw-&gt;iface = SNDRV_HWDEP_IFACE_EMU10K1;</div><div class='ctx'> 	hw-&gt;ops.open = snd_emu10k1_fx8010_open;</div><div class='ctx'> 	hw-&gt;ops.ioctl = snd_emu10k1_fx8010_ioctl;</div><div class='ctx'> 	hw-&gt;ops.release = snd_emu10k1_fx8010_release;</div><div class='ctx'> 	hw-&gt;private_data = emu;</div><div class='del'>-	if (rhwdep)</div><div class='del'>-		*rhwdep = hw;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-int __devinit snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+int snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int len;</div><div class='ctx'> </div><div class='ctx'> 	len = emu-&gt;audigy ? 0x200 : 0x100;</div><div class='del'>-	emu-&gt;saved_gpr = kmalloc(len * 4, GFP_KERNEL);</div><div class='add'>+	emu-&gt;saved_gpr = kmalloc_array(len, 4, GFP_KERNEL);</div><div class='ctx'> 	if (! emu-&gt;saved_gpr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	len = emu-&gt;audigy ? 0x100 : 0xa0;</div><div class='del'>-	emu-&gt;tram_val_saved = kmalloc(len * 4, GFP_KERNEL);</div><div class='del'>-	emu-&gt;tram_addr_saved = kmalloc(len * 4, GFP_KERNEL);</div><div class='add'>+	emu-&gt;tram_val_saved = kmalloc_array(len, 4, GFP_KERNEL);</div><div class='add'>+	emu-&gt;tram_addr_saved = kmalloc_array(len, 4, GFP_KERNEL);</div><div class='ctx'> 	if (! emu-&gt;tram_val_saved || ! emu-&gt;tram_addr_saved)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	len = emu-&gt;audigy ? 2 * 1024 : 2 * 512;</div><div class='del'>-	emu-&gt;saved_icode = vmalloc(len * 4);</div><div class='add'>+	emu-&gt;saved_icode = vmalloc(array_size(len, 4));</div><div class='ctx'> 	if (! emu-&gt;saved_icode)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c<br/>index 05afe06e353a..f4906ab30c02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emumixer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emumixer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emumixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emumixer.c</a></div><div class='hunk'>@@ -1,37 +1,18 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='ctx'>  *                   Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ *                   Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for control of EMU10K1 chips / mixer routines</div><div class='del'>- *  Multichannel PCM support Copyright (c) Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='del'>- *  	Added EMU 1010 support.</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips / mixer routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -43,6 +24,24 @@</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(snd_audigy_db_scale2, -10350, 50, 1); /* WM8775 gain scale */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+static int add_ctls(struct snd_emu10k1 *emu, const struct snd_kcontrol_new *tpl,</div><div class='add'>+		    const char * const *ctls, unsigned nctls)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new kctl = *tpl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (unsigned i = 0; i &lt; nctls; i++) {</div><div class='add'>+		kctl.name = ctls[i];</div><div class='add'>+		kctl.private_value = i;</div><div class='add'>+		err = snd_ctl_add(emu-&gt;card, snd_ctl_new1(&amp;kctl, emu));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> static int snd_emu10k1_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_IEC958;</div><div class='hunk'>@@ -55,17 +54,14 @@ static int snd_emu10k1_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Limit: emu-&gt;spdif_bits */</div><div class='ctx'> 	if (idx &gt;= 3)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = (emu-&gt;spdif_bits[idx] &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (emu-&gt;spdif_bits[idx] &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (emu-&gt;spdif_bits[idx] &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = (emu-&gt;spdif_bits[idx] &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -79,292 +75,354 @@ static int snd_emu10k1_spdif_get_mask(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PAIR_PS(base, one, two, sfx) base " " one sfx, base " " two sfx</div><div class='add'>+#define LR_PS(base, sfx) PAIR_PS(base, "Left", "Right", sfx)</div><div class='add'>+</div><div class='add'>+#define ADAT_PS(pfx, sfx) \</div><div class='add'>+	pfx "ADAT 0" sfx, pfx "ADAT 1" sfx, pfx "ADAT 2" sfx, pfx "ADAT 3" sfx, \</div><div class='add'>+	pfx "ADAT 4" sfx, pfx "ADAT 5" sfx, pfx "ADAT 6" sfx, pfx "ADAT 7" sfx</div><div class='add'>+</div><div class='add'>+#define PAIR_REGS(base, one, two) \</div><div class='add'>+	base ## one ## 1, \</div><div class='add'>+	base ## two ## 1</div><div class='add'>+</div><div class='add'>+#define LR_REGS(base) PAIR_REGS(base, _LEFT, _RIGHT)</div><div class='add'>+</div><div class='add'>+#define ADAT_REGS(base) \</div><div class='add'>+	base+0, base+1, base+2, base+3, base+4, base+5, base+6, base+7</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>- * Items labels in enum mixer controls assigning source data to</div><div class='del'>- * each destination</div><div class='add'>+ * List of data sources available for each destination</div><div class='ctx'>  */</div><div class='del'>-static char *emu1010_src_texts[] = { </div><div class='del'>-	"Silence",</div><div class='del'>-	"Dock Mic A",</div><div class='del'>-	"Dock Mic B",</div><div class='del'>-	"Dock ADC1 Left",</div><div class='del'>-	"Dock ADC1 Right",</div><div class='del'>-	"Dock ADC2 Left",</div><div class='del'>-	"Dock ADC2 Right",</div><div class='del'>-	"Dock ADC3 Left",</div><div class='del'>-	"Dock ADC3 Right",</div><div class='del'>-	"0202 ADC Left",</div><div class='del'>-	"0202 ADC Right",</div><div class='del'>-	"0202 SPDIF Left",</div><div class='del'>-	"0202 SPDIF Right",</div><div class='del'>-	"ADAT 0",</div><div class='del'>-	"ADAT 1",</div><div class='del'>-	"ADAT 2",</div><div class='del'>-	"ADAT 3",</div><div class='del'>-	"ADAT 4",</div><div class='del'>-	"ADAT 5",</div><div class='del'>-	"ADAT 6",</div><div class='del'>-	"ADAT 7",</div><div class='del'>-	"DSP 0",</div><div class='del'>-	"DSP 1",</div><div class='del'>-	"DSP 2",</div><div class='del'>-	"DSP 3",</div><div class='del'>-	"DSP 4",</div><div class='del'>-	"DSP 5",</div><div class='del'>-	"DSP 6",</div><div class='del'>-	"DSP 7",</div><div class='del'>-	"DSP 8",</div><div class='del'>-	"DSP 9",</div><div class='del'>-	"DSP 10",</div><div class='del'>-	"DSP 11",</div><div class='del'>-	"DSP 12",</div><div class='del'>-	"DSP 13",</div><div class='del'>-	"DSP 14",</div><div class='del'>-	"DSP 15",</div><div class='del'>-	"DSP 16",</div><div class='del'>-	"DSP 17",</div><div class='del'>-	"DSP 18",</div><div class='del'>-	"DSP 19",</div><div class='del'>-	"DSP 20",</div><div class='del'>-	"DSP 21",</div><div class='del'>-	"DSP 22",</div><div class='del'>-	"DSP 23",</div><div class='del'>-	"DSP 24",</div><div class='del'>-	"DSP 25",</div><div class='del'>-	"DSP 26",</div><div class='del'>-	"DSP 27",</div><div class='del'>-	"DSP 28",</div><div class='del'>-	"DSP 29",</div><div class='del'>-	"DSP 30",</div><div class='del'>-	"DSP 31",</div><div class='add'>+</div><div class='add'>+#define DSP_TEXTS \</div><div class='add'>+	"DSP 0", "DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", \</div><div class='add'>+	"DSP 8", "DSP 9", "DSP 10", "DSP 11", "DSP 12", "DSP 13", "DSP 14", "DSP 15", \</div><div class='add'>+	"DSP 16", "DSP 17", "DSP 18", "DSP 19", "DSP 20", "DSP 21", "DSP 22", "DSP 23", \</div><div class='add'>+	"DSP 24", "DSP 25", "DSP 26", "DSP 27", "DSP 28", "DSP 29", "DSP 30", "DSP 31"</div><div class='add'>+</div><div class='add'>+#define PAIR_TEXTS(base, one, two) PAIR_PS(base, one, two, "")</div><div class='add'>+#define LR_TEXTS(base) LR_PS(base, "")</div><div class='add'>+#define ADAT_TEXTS(pfx) ADAT_PS(pfx, "")</div><div class='add'>+</div><div class='add'>+#define EMU32_SRC_REGS \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+1, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+2, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+3, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+5, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+6, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+7, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+8, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+9, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xa, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xb, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xc, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xd, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xe, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0xf, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+1, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+2, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+3, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+4, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+5, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+6, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+7, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+8, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+9, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xa, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xb, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xc, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xd, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xe, \</div><div class='add'>+	EMU_SRC_ALICE_EMU32B+0xf</div><div class='add'>+</div><div class='add'>+/* 1010 rev1 */</div><div class='add'>+</div><div class='add'>+#define EMU1010_COMMON_TEXTS \</div><div class='add'>+	"Silence", \</div><div class='add'>+	PAIR_TEXTS("Dock Mic", "A", "B"), \</div><div class='add'>+	LR_TEXTS("Dock ADC1"), \</div><div class='add'>+	LR_TEXTS("Dock ADC2"), \</div><div class='add'>+	LR_TEXTS("Dock ADC3"), \</div><div class='add'>+	LR_TEXTS("0202 ADC"), \</div><div class='add'>+	LR_TEXTS("1010 SPDIF"), \</div><div class='add'>+	ADAT_TEXTS("1010 ")</div><div class='add'>+</div><div class='add'>+static const char * const emu1010_src_texts[] = {</div><div class='add'>+	EMU1010_COMMON_TEXTS,</div><div class='add'>+	DSP_TEXTS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010_src_regs[] = {</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC1),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC2),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC3),</div><div class='add'>+	LR_REGS(EMU_SRC_HAMOA_ADC),</div><div class='add'>+	LR_REGS(EMU_SRC_HANA_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_SRC_HANA_ADAT),</div><div class='add'>+	EMU32_SRC_REGS,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_src_regs) == ARRAY_SIZE(emu1010_src_texts));</div><div class='add'>+</div><div class='add'>+/* 1010 rev2 */</div><div class='add'>+</div><div class='add'>+#define EMU1010b_COMMON_TEXTS \</div><div class='add'>+	"Silence", \</div><div class='add'>+	PAIR_TEXTS("Dock Mic", "A", "B"), \</div><div class='add'>+	LR_TEXTS("Dock ADC1"), \</div><div class='add'>+	LR_TEXTS("Dock ADC2"), \</div><div class='add'>+	LR_TEXTS("0202 ADC"), \</div><div class='add'>+	LR_TEXTS("Dock SPDIF"), \</div><div class='add'>+	LR_TEXTS("1010 SPDIF"), \</div><div class='add'>+	ADAT_TEXTS("Dock "), \</div><div class='add'>+	ADAT_TEXTS("1010 ")</div><div class='add'>+</div><div class='add'>+static const char * const emu1010b_src_texts[] = {</div><div class='add'>+	EMU1010b_COMMON_TEXTS,</div><div class='add'>+	DSP_TEXTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const unsigned short emu1010b_src_regs[] = {</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC1),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC2),</div><div class='add'>+	LR_REGS(EMU_SRC_HAMOA_ADC),</div><div class='add'>+	LR_REGS(EMU_SRC_MDOCK_SPDIF),</div><div class='add'>+	LR_REGS(EMU_SRC_HANA_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_SRC_MDOCK_ADAT),</div><div class='add'>+	ADAT_REGS(EMU_SRC_HANA_ADAT),</div><div class='add'>+	EMU32_SRC_REGS,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010b_src_regs) == ARRAY_SIZE(emu1010b_src_texts));</div><div class='add'>+</div><div class='ctx'> /* 1616(m) cardbus */</div><div class='ctx'> </div><div class='del'>-static char *emu1616_src_texts[] = {</div><div class='del'>-	"Silence",</div><div class='del'>-	"Dock Mic A",</div><div class='del'>-	"Dock Mic B",</div><div class='del'>-	"Dock ADC1 Left",</div><div class='del'>-	"Dock ADC1 Right",</div><div class='del'>-	"Dock ADC2 Left",</div><div class='del'>-	"Dock ADC2 Right",</div><div class='del'>-	"Dock SPDIF Left",</div><div class='del'>-	"Dock SPDIF Right",</div><div class='del'>-	"ADAT 0",</div><div class='del'>-	"ADAT 1",</div><div class='del'>-	"ADAT 2",</div><div class='del'>-	"ADAT 3",</div><div class='del'>-	"ADAT 4",</div><div class='del'>-	"ADAT 5",</div><div class='del'>-	"ADAT 6",</div><div class='del'>-	"ADAT 7",</div><div class='del'>-	"DSP 0",</div><div class='del'>-	"DSP 1",</div><div class='del'>-	"DSP 2",</div><div class='del'>-	"DSP 3",</div><div class='del'>-	"DSP 4",</div><div class='del'>-	"DSP 5",</div><div class='del'>-	"DSP 6",</div><div class='del'>-	"DSP 7",</div><div class='del'>-	"DSP 8",</div><div class='del'>-	"DSP 9",</div><div class='del'>-	"DSP 10",</div><div class='del'>-	"DSP 11",</div><div class='del'>-	"DSP 12",</div><div class='del'>-	"DSP 13",</div><div class='del'>-	"DSP 14",</div><div class='del'>-	"DSP 15",</div><div class='del'>-	"DSP 16",</div><div class='del'>-	"DSP 17",</div><div class='del'>-	"DSP 18",</div><div class='del'>-	"DSP 19",</div><div class='del'>-	"DSP 20",</div><div class='del'>-	"DSP 21",</div><div class='del'>-	"DSP 22",</div><div class='del'>-	"DSP 23",</div><div class='del'>-	"DSP 24",</div><div class='del'>-	"DSP 25",</div><div class='del'>-	"DSP 26",</div><div class='del'>-	"DSP 27",</div><div class='del'>-	"DSP 28",</div><div class='del'>-	"DSP 29",</div><div class='del'>-	"DSP 30",</div><div class='del'>-	"DSP 31",</div><div class='add'>+#define EMU1616_COMMON_TEXTS \</div><div class='add'>+	"Silence", \</div><div class='add'>+	PAIR_TEXTS("Mic", "A", "B"), \</div><div class='add'>+	LR_TEXTS("ADC1"), \</div><div class='add'>+	LR_TEXTS("ADC2"), \</div><div class='add'>+	LR_TEXTS("SPDIF"), \</div><div class='add'>+	ADAT_TEXTS("")</div><div class='add'>+</div><div class='add'>+static const char * const emu1616_src_texts[] = {</div><div class='add'>+	EMU1616_COMMON_TEXTS,</div><div class='add'>+	DSP_TEXTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const unsigned short emu1616_src_regs[] = {</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC1),</div><div class='add'>+	LR_REGS(EMU_SRC_DOCK_ADC2),</div><div class='add'>+	LR_REGS(EMU_SRC_MDOCK_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_SRC_MDOCK_ADAT),</div><div class='add'>+	EMU32_SRC_REGS,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1616_src_regs) == ARRAY_SIZE(emu1616_src_texts));</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * List of data sources available for each destination</div><div class='del'>- */</div><div class='del'>-static unsigned int emu1010_src_regs[] = {</div><div class='del'>-	EMU_SRC_SILENCE,/* 0 */</div><div class='del'>-	EMU_SRC_DOCK_MIC_A1, /* 1 */</div><div class='del'>-	EMU_SRC_DOCK_MIC_B1, /* 2 */</div><div class='del'>-	EMU_SRC_DOCK_ADC1_LEFT1, /* 3 */</div><div class='del'>-	EMU_SRC_DOCK_ADC1_RIGHT1, /* 4 */</div><div class='del'>-	EMU_SRC_DOCK_ADC2_LEFT1, /* 5 */</div><div class='del'>-	EMU_SRC_DOCK_ADC2_RIGHT1, /* 6 */</div><div class='del'>-	EMU_SRC_DOCK_ADC3_LEFT1, /* 7 */</div><div class='del'>-	EMU_SRC_DOCK_ADC3_RIGHT1, /* 8 */</div><div class='del'>-	EMU_SRC_HAMOA_ADC_LEFT1, /* 9 */</div><div class='del'>-	EMU_SRC_HAMOA_ADC_RIGHT1, /* 10 */</div><div class='del'>-	EMU_SRC_HANA_SPDIF_LEFT1, /* 11 */</div><div class='del'>-	EMU_SRC_HANA_SPDIF_RIGHT1, /* 12 */</div><div class='del'>-	EMU_SRC_HANA_ADAT, /* 13 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+1, /* 14 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+2, /* 15 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+3, /* 16 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+4, /* 17 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+5, /* 18 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+6, /* 19 */</div><div class='del'>-	EMU_SRC_HANA_ADAT+7, /* 20 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A, /* 21 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+1, /* 22 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+2, /* 23 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+3, /* 24 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+4, /* 25 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+5, /* 26 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+6, /* 27 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+7, /* 28 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+8, /* 29 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+9, /* 30 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xa, /* 31 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xb, /* 32 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xc, /* 33 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xd, /* 34 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xe, /* 35 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xf, /* 36 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B, /* 37 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+1, /* 38 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+2, /* 39 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+3, /* 40 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+4, /* 41 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+5, /* 42 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+6, /* 43 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+7, /* 44 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+8, /* 45 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+9, /* 46 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xa, /* 47 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xb, /* 48 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xc, /* 49 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xd, /* 50 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xe, /* 51 */</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xf, /* 52 */</div><div class='add'>+/* 0404 rev1 &amp; rev2 */</div><div class='add'>+</div><div class='add'>+#define EMU0404_COMMON_TEXTS \</div><div class='add'>+	"Silence", \</div><div class='add'>+	LR_TEXTS("ADC"), \</div><div class='add'>+	LR_TEXTS("SPDIF")</div><div class='add'>+</div><div class='add'>+static const char * const emu0404_src_texts[] = {</div><div class='add'>+	EMU0404_COMMON_TEXTS,</div><div class='add'>+	DSP_TEXTS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* 1616(m) cardbus */</div><div class='del'>-static unsigned int emu1616_src_regs[] = {</div><div class='add'>+static const unsigned short emu0404_src_regs[] = {</div><div class='ctx'> 	EMU_SRC_SILENCE,</div><div class='del'>-	EMU_SRC_DOCK_MIC_A1,</div><div class='del'>-	EMU_SRC_DOCK_MIC_B1,</div><div class='del'>-	EMU_SRC_DOCK_ADC1_LEFT1,</div><div class='del'>-	EMU_SRC_DOCK_ADC1_RIGHT1,</div><div class='del'>-	EMU_SRC_DOCK_ADC2_LEFT1,</div><div class='del'>-	EMU_SRC_DOCK_ADC2_RIGHT1,</div><div class='del'>-	EMU_SRC_MDOCK_SPDIF_LEFT1,</div><div class='del'>-	EMU_SRC_MDOCK_SPDIF_RIGHT1,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+1,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+2,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+3,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+4,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+5,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+6,</div><div class='del'>-	EMU_SRC_MDOCK_ADAT+7,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+1,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+2,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+3,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+4,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+5,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+6,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+7,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+8,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+9,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xa,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xb,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xc,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xd,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xe,</div><div class='del'>-	EMU_SRC_ALICE_EMU32A+0xf,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+1,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+2,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+3,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+4,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+5,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+6,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+7,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+8,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+9,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xa,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xb,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xc,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xd,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xe,</div><div class='del'>-	EMU_SRC_ALICE_EMU32B+0xf,</div><div class='add'>+	LR_REGS(EMU_SRC_HAMOA_ADC),</div><div class='add'>+	LR_REGS(EMU_SRC_HANA_SPDIF),</div><div class='add'>+	EMU32_SRC_REGS,</div><div class='ctx'> };</div><div class='add'>+static_assert(ARRAY_SIZE(emu0404_src_regs) == ARRAY_SIZE(emu0404_src_texts));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Data destinations - physical EMU outputs.</div><div class='ctx'>  * Each destination has an enum mixer control to choose a data source</div><div class='ctx'>  */</div><div class='del'>-static unsigned int emu1010_output_dst[] = {</div><div class='del'>-	EMU_DST_DOCK_DAC1_LEFT1, /* 0 */</div><div class='del'>-	EMU_DST_DOCK_DAC1_RIGHT1, /* 1 */</div><div class='del'>-	EMU_DST_DOCK_DAC2_LEFT1, /* 2 */</div><div class='del'>-	EMU_DST_DOCK_DAC2_RIGHT1, /* 3 */</div><div class='del'>-	EMU_DST_DOCK_DAC3_LEFT1, /* 4 */</div><div class='del'>-	EMU_DST_DOCK_DAC3_RIGHT1, /* 5 */</div><div class='del'>-	EMU_DST_DOCK_DAC4_LEFT1, /* 6 */</div><div class='del'>-	EMU_DST_DOCK_DAC4_RIGHT1, /* 7 */</div><div class='del'>-	EMU_DST_DOCK_PHONES_LEFT1, /* 8 */</div><div class='del'>-	EMU_DST_DOCK_PHONES_RIGHT1, /* 9 */</div><div class='del'>-	EMU_DST_DOCK_SPDIF_LEFT1, /* 10 */</div><div class='del'>-	EMU_DST_DOCK_SPDIF_RIGHT1, /* 11 */</div><div class='del'>-	EMU_DST_HANA_SPDIF_LEFT1, /* 12 */</div><div class='del'>-	EMU_DST_HANA_SPDIF_RIGHT1, /* 13 */</div><div class='del'>-	EMU_DST_HAMOA_DAC_LEFT1, /* 14 */</div><div class='del'>-	EMU_DST_HAMOA_DAC_RIGHT1, /* 15 */</div><div class='del'>-	EMU_DST_HANA_ADAT, /* 16 */</div><div class='del'>-	EMU_DST_HANA_ADAT+1, /* 17 */</div><div class='del'>-	EMU_DST_HANA_ADAT+2, /* 18 */</div><div class='del'>-	EMU_DST_HANA_ADAT+3, /* 19 */</div><div class='del'>-	EMU_DST_HANA_ADAT+4, /* 20 */</div><div class='del'>-	EMU_DST_HANA_ADAT+5, /* 21 */</div><div class='del'>-	EMU_DST_HANA_ADAT+6, /* 22 */</div><div class='del'>-	EMU_DST_HANA_ADAT+7, /* 23 */</div><div class='add'>+</div><div class='add'>+#define LR_CTLS(base) LR_PS(base, " Playback Enum")</div><div class='add'>+#define ADAT_CTLS(pfx) ADAT_PS(pfx, " Playback Enum")</div><div class='add'>+</div><div class='add'>+/* 1010 rev1 */</div><div class='add'>+</div><div class='add'>+static const char * const emu1010_output_texts[] = {</div><div class='add'>+	LR_CTLS("Dock DAC1"),</div><div class='add'>+	LR_CTLS("Dock DAC2"),</div><div class='add'>+	LR_CTLS("Dock DAC3"),</div><div class='add'>+	LR_CTLS("Dock DAC4"),</div><div class='add'>+	LR_CTLS("Dock Phones"),</div><div class='add'>+	LR_CTLS("Dock SPDIF"),</div><div class='add'>+	LR_CTLS("0202 DAC"),</div><div class='add'>+	LR_CTLS("1010 SPDIF"),</div><div class='add'>+	ADAT_CTLS("1010 "),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_output_texts) &lt;= NUM_OUTPUT_DESTS);</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010_output_dst[] = {</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC1),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC2),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC3),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC4),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_PHONES),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_SPDIF),</div><div class='add'>+	LR_REGS(EMU_DST_HAMOA_DAC),</div><div class='add'>+	LR_REGS(EMU_DST_HANA_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_DST_HANA_ADAT),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_output_dst) == ARRAY_SIZE(emu1010_output_texts));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010_output_dflt[] = {</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_output_dflt) == ARRAY_SIZE(emu1010_output_dst));</div><div class='add'>+</div><div class='add'>+/* 1010 rev2 */</div><div class='add'>+</div><div class='add'>+static const char * const snd_emu1010b_output_texts[] = {</div><div class='add'>+	LR_CTLS("Dock DAC1"),</div><div class='add'>+	LR_CTLS("Dock DAC2"),</div><div class='add'>+	LR_CTLS("Dock DAC3"),</div><div class='add'>+	LR_CTLS("Dock SPDIF"),</div><div class='add'>+	ADAT_CTLS("Dock "),</div><div class='add'>+	LR_CTLS("0202 DAC"),</div><div class='add'>+	LR_CTLS("1010 SPDIF"),</div><div class='add'>+	ADAT_CTLS("1010 "),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(snd_emu1010b_output_texts) &lt;= NUM_OUTPUT_DESTS);</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010b_output_dst[] = {</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC1),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC2),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC3),</div><div class='add'>+	LR_REGS(EMU_DST_MDOCK_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_DST_MDOCK_ADAT),</div><div class='add'>+	LR_REGS(EMU_DST_HAMOA_DAC),</div><div class='add'>+	LR_REGS(EMU_DST_HANA_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_DST_HANA_ADAT),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010b_output_dst) == ARRAY_SIZE(snd_emu1010b_output_texts));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010b_output_dflt[] = {</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 1616(m) cardbus */</div><div class='del'>-static unsigned int emu1616_output_dst[] = {</div><div class='del'>-	EMU_DST_DOCK_DAC1_LEFT1,</div><div class='del'>-	EMU_DST_DOCK_DAC1_RIGHT1,</div><div class='del'>-	EMU_DST_DOCK_DAC2_LEFT1,</div><div class='del'>-	EMU_DST_DOCK_DAC2_RIGHT1,</div><div class='del'>-	EMU_DST_DOCK_DAC3_LEFT1,</div><div class='del'>-	EMU_DST_DOCK_DAC3_RIGHT1,</div><div class='del'>-	EMU_DST_MDOCK_SPDIF_LEFT1,</div><div class='del'>-	EMU_DST_MDOCK_SPDIF_RIGHT1,</div><div class='del'>-	EMU_DST_MDOCK_ADAT,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+1,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+2,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+3,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+4,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+5,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+6,</div><div class='del'>-	EMU_DST_MDOCK_ADAT+7,</div><div class='del'>-	EMU_DST_MANA_DAC_LEFT,</div><div class='del'>-	EMU_DST_MANA_DAC_RIGHT,</div><div class='add'>+</div><div class='add'>+static const char * const snd_emu1616_output_texts[] = {</div><div class='add'>+	LR_CTLS("Dock DAC1"),</div><div class='add'>+	LR_CTLS("Dock DAC2"),</div><div class='add'>+	LR_CTLS("Dock DAC3"),</div><div class='add'>+	LR_CTLS("Dock SPDIF"),</div><div class='add'>+	ADAT_CTLS("Dock "),</div><div class='add'>+	LR_CTLS("Mana DAC"),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(snd_emu1616_output_texts) &lt;= NUM_OUTPUT_DESTS);</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1616_output_dst[] = {</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC1),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC2),</div><div class='add'>+	LR_REGS(EMU_DST_DOCK_DAC3),</div><div class='add'>+	LR_REGS(EMU_DST_MDOCK_SPDIF),</div><div class='add'>+	ADAT_REGS(EMU_DST_MDOCK_ADAT),</div><div class='add'>+	EMU_DST_MANA_DAC_LEFT, EMU_DST_MANA_DAC_RIGHT,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1616_output_dst) == ARRAY_SIZE(snd_emu1616_output_texts));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1616_output_dflt[] = {</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1616_output_dflt) == ARRAY_SIZE(emu1616_output_dst));</div><div class='add'>+</div><div class='add'>+/* 0404 rev1 &amp; rev2 */</div><div class='add'>+</div><div class='add'>+static const char * const snd_emu0404_output_texts[] = {</div><div class='add'>+	LR_CTLS("DAC"),</div><div class='add'>+	LR_CTLS("SPDIF"),</div><div class='ctx'> };</div><div class='add'>+static_assert(ARRAY_SIZE(snd_emu0404_output_texts) &lt;= NUM_OUTPUT_DESTS);</div><div class='add'>+</div><div class='add'>+static const unsigned short emu0404_output_dst[] = {</div><div class='add'>+	LR_REGS(EMU_DST_HAMOA_DAC),</div><div class='add'>+	LR_REGS(EMU_DST_HANA_SPDIF),</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu0404_output_dst) == ARRAY_SIZE(snd_emu0404_output_texts));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu0404_output_dflt[] = {</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+	EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu0404_output_dflt) == ARRAY_SIZE(emu0404_output_dst));</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Data destinations - HANA outputs going to Alice2 (audigy) for</div><div class='add'>+ * Data destinations - FPGA outputs going to Alice2 (Audigy) for</div><div class='ctx'>  *   capture (EMU32 + I2S links)</div><div class='ctx'>  * Each destination has an enum mixer control to choose a data source</div><div class='ctx'>  */</div><div class='del'>-static unsigned int emu1010_input_dst[] = {</div><div class='add'>+</div><div class='add'>+static const char * const emu1010_input_texts[] = {</div><div class='add'>+	"DSP 0 Capture Enum",</div><div class='add'>+	"DSP 1 Capture Enum",</div><div class='add'>+	"DSP 2 Capture Enum",</div><div class='add'>+	"DSP 3 Capture Enum",</div><div class='add'>+	"DSP 4 Capture Enum",</div><div class='add'>+	"DSP 5 Capture Enum",</div><div class='add'>+	"DSP 6 Capture Enum",</div><div class='add'>+	"DSP 7 Capture Enum",</div><div class='add'>+	"DSP 8 Capture Enum",</div><div class='add'>+	"DSP 9 Capture Enum",</div><div class='add'>+	"DSP A Capture Enum",</div><div class='add'>+	"DSP B Capture Enum",</div><div class='add'>+	"DSP C Capture Enum",</div><div class='add'>+	"DSP D Capture Enum",</div><div class='add'>+	"DSP E Capture Enum",</div><div class='add'>+	"DSP F Capture Enum",</div><div class='add'>+	/* These exist only on rev1 EMU1010 cards. */</div><div class='add'>+	"DSP 10 Capture Enum",</div><div class='add'>+	"DSP 11 Capture Enum",</div><div class='add'>+	"DSP 12 Capture Enum",</div><div class='add'>+	"DSP 13 Capture Enum",</div><div class='add'>+	"DSP 14 Capture Enum",</div><div class='add'>+	"DSP 15 Capture Enum",</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_input_texts) &lt;= NUM_INPUT_DESTS);</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010_input_dst[] = {</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_0,</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_1,</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_2,</div><div class='hunk'>@@ -381,6 +439,7 @@ static unsigned int emu1010_input_dst[] = {</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_D,</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_E,</div><div class='ctx'> 	EMU_DST_ALICE2_EMU32_F,</div><div class='add'>+	/* These exist only on rev1 EMU1010 cards. */</div><div class='ctx'> 	EMU_DST_ALICE_I2S0_LEFT,</div><div class='ctx'> 	EMU_DST_ALICE_I2S0_RIGHT,</div><div class='ctx'> 	EMU_DST_ALICE_I2S1_LEFT,</div><div class='hunk'>@@ -388,41 +447,199 @@ static unsigned int emu1010_input_dst[] = {</div><div class='ctx'> 	EMU_DST_ALICE_I2S2_LEFT,</div><div class='ctx'> 	EMU_DST_ALICE_I2S2_RIGHT,</div><div class='ctx'> };</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_input_dst) == ARRAY_SIZE(emu1010_input_texts));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu1010_input_dflt[] = {</div><div class='add'>+	EMU_SRC_DOCK_MIC_A1,</div><div class='add'>+	EMU_SRC_DOCK_MIC_B1,</div><div class='add'>+	EMU_SRC_HAMOA_ADC_LEFT1,</div><div class='add'>+	EMU_SRC_HAMOA_ADC_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC1_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC1_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_RIGHT1,</div><div class='add'>+	/* Pavel Hofman - setting defaults for all capture channels.</div><div class='add'>+	 * Defaults only, users will set their own values anyways, let's</div><div class='add'>+	 * just copy/paste. */</div><div class='add'>+	EMU_SRC_DOCK_MIC_A1,</div><div class='add'>+	EMU_SRC_DOCK_MIC_B1,</div><div class='add'>+	EMU_SRC_HAMOA_ADC_LEFT1,</div><div class='add'>+	EMU_SRC_HAMOA_ADC_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC1_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC1_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_RIGHT1,</div><div class='add'>+</div><div class='add'>+	EMU_SRC_DOCK_ADC1_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC1_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC2_RIGHT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC3_LEFT1,</div><div class='add'>+	EMU_SRC_DOCK_ADC3_RIGHT1,</div><div class='add'>+};</div><div class='add'>+static_assert(ARRAY_SIZE(emu1010_input_dflt) == ARRAY_SIZE(emu1010_input_dst));</div><div class='add'>+</div><div class='add'>+static const unsigned short emu0404_input_dflt[] = {</div><div class='add'>+	EMU_SRC_HAMOA_ADC_LEFT1,</div><div class='add'>+	EMU_SRC_HAMOA_ADC_RIGHT1,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_HANA_SPDIF_LEFT1,</div><div class='add'>+	EMU_SRC_HANA_SPDIF_RIGHT1,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+	EMU_SRC_SILENCE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_emu1010_routing_info {</div><div class='add'>+	const char * const *src_texts;</div><div class='add'>+	const char * const *out_texts;</div><div class='add'>+	const unsigned short *src_regs;</div><div class='add'>+	const unsigned short *out_regs;</div><div class='add'>+	const unsigned short *in_regs;</div><div class='add'>+	const unsigned short *out_dflts;</div><div class='add'>+	const unsigned short *in_dflts;</div><div class='add'>+	unsigned n_srcs;</div><div class='add'>+	unsigned n_outs;</div><div class='add'>+	unsigned n_ins;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_emu1010_routing_info emu1010_routing_info[] = {</div><div class='add'>+	{</div><div class='add'>+		/* rev1 1010 */</div><div class='add'>+		.src_regs = emu1010_src_regs,</div><div class='add'>+		.src_texts = emu1010_src_texts,</div><div class='add'>+		.n_srcs = ARRAY_SIZE(emu1010_src_texts),</div><div class='add'>+</div><div class='add'>+		.out_dflts = emu1010_output_dflt,</div><div class='add'>+		.out_regs = emu1010_output_dst,</div><div class='add'>+		.out_texts = emu1010_output_texts,</div><div class='add'>+		.n_outs = ARRAY_SIZE(emu1010_output_dst),</div><div class='add'>+</div><div class='add'>+		.in_dflts = emu1010_input_dflt,</div><div class='add'>+		.in_regs = emu1010_input_dst,</div><div class='add'>+		.n_ins = ARRAY_SIZE(emu1010_input_dst),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* rev2 1010 */</div><div class='add'>+		.src_regs = emu1010b_src_regs,</div><div class='add'>+		.src_texts = emu1010b_src_texts,</div><div class='add'>+		.n_srcs = ARRAY_SIZE(emu1010b_src_texts),</div><div class='add'>+</div><div class='add'>+		.out_dflts = emu1010b_output_dflt,</div><div class='add'>+		.out_regs = emu1010b_output_dst,</div><div class='add'>+		.out_texts = snd_emu1010b_output_texts,</div><div class='add'>+		.n_outs = ARRAY_SIZE(emu1010b_output_dst),</div><div class='add'>+</div><div class='add'>+		.in_dflts = emu1010_input_dflt,</div><div class='add'>+		.in_regs = emu1010_input_dst,</div><div class='add'>+		.n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* 1616(m) cardbus */</div><div class='add'>+		.src_regs = emu1616_src_regs,</div><div class='add'>+		.src_texts = emu1616_src_texts,</div><div class='add'>+		.n_srcs = ARRAY_SIZE(emu1616_src_texts),</div><div class='add'>+</div><div class='add'>+		.out_dflts = emu1616_output_dflt,</div><div class='add'>+		.out_regs = emu1616_output_dst,</div><div class='add'>+		.out_texts = snd_emu1616_output_texts,</div><div class='add'>+		.n_outs = ARRAY_SIZE(emu1616_output_dst),</div><div class='add'>+</div><div class='add'>+		.in_dflts = emu1010_input_dflt,</div><div class='add'>+		.in_regs = emu1010_input_dst,</div><div class='add'>+		.n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* 0404 */</div><div class='add'>+		.src_regs = emu0404_src_regs,</div><div class='add'>+		.src_texts = emu0404_src_texts,</div><div class='add'>+		.n_srcs = ARRAY_SIZE(emu0404_src_texts),</div><div class='add'>+</div><div class='add'>+		.out_dflts = emu0404_output_dflt,</div><div class='add'>+		.out_regs = emu0404_output_dst,</div><div class='add'>+		.out_texts = snd_emu0404_output_texts,</div><div class='add'>+		.n_outs = ARRAY_SIZE(emu0404_output_dflt),</div><div class='add'>+</div><div class='add'>+		.in_dflts = emu0404_input_dflt,</div><div class='add'>+		.in_regs = emu1010_input_dst,</div><div class='add'>+		.n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static unsigned emu1010_idx(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	return emu-&gt;card_capabilities-&gt;emu_model - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu1010_output_source_apply(struct snd_emu10k1 *emu,</div><div class='add'>+					    int channel, int src)</div><div class='add'>+{</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='add'>+		emu_ri-&gt;out_regs[channel], emu_ri-&gt;src_regs[src]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu1010_input_source_apply(struct snd_emu10k1 *emu,</div><div class='add'>+					   int channel, int src)</div><div class='add'>+{</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='add'>+		emu_ri-&gt;in_regs[channel], emu_ri-&gt;src_regs[src]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu1010_apply_sources(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+</div><div class='add'>+	for (unsigned i = 0; i &lt; emu_ri-&gt;n_outs; i++)</div><div class='add'>+		snd_emu1010_output_source_apply(</div><div class='add'>+			emu, i, emu-&gt;emu1010.output_source[i]);</div><div class='add'>+	for (unsigned i = 0; i &lt; emu_ri-&gt;n_ins; i++)</div><div class='add'>+		snd_emu1010_input_source_apply(</div><div class='add'>+			emu, i, emu-&gt;emu1010.input_source[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 emu1010_map_source(const struct snd_emu1010_routing_info *emu_ri,</div><div class='add'>+			     unsigned val)</div><div class='add'>+{</div><div class='add'>+	for (unsigned i = 0; i &lt; emu_ri-&gt;n_srcs; i++)</div><div class='add'>+		if (val == emu_ri-&gt;src_regs[i])</div><div class='add'>+			return i;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int snd_emu1010_input_output_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 						struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	char **items;</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616) {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 49;</div><div class='del'>-		items = emu1616_src_texts;</div><div class='del'>-	} else {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 53;</div><div class='del'>-		items = emu1010_src_texts;</div><div class='del'>-	}</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       items[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, emu_ri-&gt;n_srcs, emu_ri-&gt;src_texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu1010_output_source_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                  struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int channel;</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+	unsigned channel = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	channel = (kcontrol-&gt;private_value) &amp; 0xff;</div><div class='del'>-	/* Limit: emu1010_output_dst, emu-&gt;emu1010.output_source */</div><div class='del'>-	if (channel &gt;= 24 ||</div><div class='del'>-	    (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616 &amp;&amp;</div><div class='del'>-	     channel &gt;= 18))</div><div class='add'>+	if (channel &gt;= emu_ri-&gt;n_outs)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.output_source[channel];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -432,41 +649,42 @@ static int snd_emu1010_output_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                  struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned int channel;</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+	unsigned val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned channel = kcontrol-&gt;private_value;</div><div class='add'>+	int change;</div><div class='ctx'> </div><div class='del'>-	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (val &gt;= 53 ||</div><div class='del'>-	    (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616 &amp;&amp;</div><div class='del'>-	     val &gt;= 49))</div><div class='add'>+	if (val &gt;= emu_ri-&gt;n_srcs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	channel = (kcontrol-&gt;private_value) &amp; 0xff;</div><div class='del'>-	/* Limit: emu1010_output_dst, emu-&gt;emu1010.output_source */</div><div class='del'>-	if (channel &gt;= 24 ||</div><div class='del'>-	    (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616 &amp;&amp;</div><div class='del'>-	     channel &gt;= 18))</div><div class='add'>+	if (channel &gt;= emu_ri-&gt;n_outs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (emu-&gt;emu1010.output_source[channel] == val)</div><div class='del'>-		return 0;</div><div class='del'>-	emu-&gt;emu1010.output_source[channel] = val;</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616)</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			emu1616_output_dst[channel], emu1616_src_regs[val]);</div><div class='del'>-	else</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			emu1010_output_dst[channel], emu1010_src_regs[val]);</div><div class='del'>-	return 1;</div><div class='add'>+	change = (emu-&gt;emu1010.output_source[channel] != val);</div><div class='add'>+	if (change) {</div><div class='add'>+		emu-&gt;emu1010.output_source[channel] = val;</div><div class='add'>+		guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+		snd_emu1010_output_source_apply(emu, channel, val);</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct snd_kcontrol_new emu1010_output_source_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info = snd_emu1010_input_output_source_info,</div><div class='add'>+	.get = snd_emu1010_output_source_get,</div><div class='add'>+	.put = snd_emu1010_output_source_put</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int snd_emu1010_input_source_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                  struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int channel;</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+	unsigned channel = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	channel = (kcontrol-&gt;private_value) &amp; 0xff;</div><div class='del'>-	/* Limit: emu1010_input_dst, emu-&gt;emu1010.input_source */</div><div class='del'>-	if (channel &gt;= 22)</div><div class='add'>+	if (channel &gt;= emu_ri-&gt;n_ins)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.input_source[channel];</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -476,134 +694,70 @@ static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                  struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int val;</div><div class='del'>-	unsigned int channel;</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+	unsigned val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	unsigned channel = kcontrol-&gt;private_value;</div><div class='add'>+	int change;</div><div class='ctx'> </div><div class='del'>-	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (val &gt;= 53 ||</div><div class='del'>-	    (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616 &amp;&amp;</div><div class='del'>-	     val &gt;= 49))</div><div class='add'>+	if (val &gt;= emu_ri-&gt;n_srcs)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	channel = (kcontrol-&gt;private_value) &amp; 0xff;</div><div class='del'>-	/* Limit: emu1010_input_dst, emu-&gt;emu1010.input_source */</div><div class='del'>-	if (channel &gt;= 22)</div><div class='add'>+	if (channel &gt;= emu_ri-&gt;n_ins)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (emu-&gt;emu1010.input_source[channel] == val)</div><div class='del'>-		return 0;</div><div class='del'>-	emu-&gt;emu1010.input_source[channel] = val;</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616)</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			emu1010_input_dst[channel], emu1616_src_regs[val]);</div><div class='del'>-	else</div><div class='del'>-		snd_emu1010_fpga_link_dst_src_write(emu,</div><div class='del'>-			emu1010_input_dst[channel], emu1010_src_regs[val]);</div><div class='del'>-	return 1;</div><div class='add'>+	change = (emu-&gt;emu1010.input_source[channel] != val);</div><div class='add'>+	if (change) {</div><div class='add'>+		emu-&gt;emu1010.input_source[channel] = val;</div><div class='add'>+		guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+		snd_emu1010_input_source_apply(emu, channel, val);</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define EMU1010_SOURCE_OUTPUT(xname,chid) \</div><div class='del'>-{								\</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,		\</div><div class='del'>-	.info =  snd_emu1010_input_output_source_info,		\</div><div class='del'>-	.get =   snd_emu1010_output_source_get,			\</div><div class='del'>-	.put =   snd_emu1010_output_source_put,			\</div><div class='del'>-	.private_value = chid					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Enum", 6),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Enum", 7),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Enum", 8),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Enum", 9),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 0xa),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 0xb),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Enum", 0xc),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Enum", 0xd),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Enum", 0xe),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Enum", 0xf),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Enum", 0x10),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Enum", 0x11),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Enum", 0x12),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Enum", 0x13),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Enum", 0x14),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Enum", 0x15),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Enum", 0x16),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Enum", 0x17),</div><div class='add'>+static const struct snd_kcontrol_new emu1010_input_source_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info = snd_emu1010_input_output_source_info,</div><div class='add'>+	.get = snd_emu1010_input_source_get,</div><div class='add'>+	.put = snd_emu1010_input_source_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int add_emu1010_source_mixers(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+		&amp;emu1010_routing_info[emu1010_idx(emu)];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-/* 1616(m) cardbus */</div><div class='del'>-static struct snd_kcontrol_new snd_emu1616_output_enum_ctls[] __devinitdata = {</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 6),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 7),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 0 Playback Enum", 8),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 1 Playback Enum", 9),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 2 Playback Enum", 0xa),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 3 Playback Enum", 0xb),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 4 Playback Enum", 0xc),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 5 Playback Enum", 0xd),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 6 Playback Enum", 0xe),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Dock ADAT 7 Playback Enum", 0xf),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Mana DAC Left Playback Enum", 0x10),</div><div class='del'>-	EMU1010_SOURCE_OUTPUT("Mana DAC Right Playback Enum", 0x11),</div><div class='del'>-};</div><div class='add'>+	err = add_ctls(emu, &amp;emu1010_output_source_ctl,</div><div class='add'>+		       emu_ri-&gt;out_texts, emu_ri-&gt;n_outs);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = add_ctls(emu, &amp;emu1010_input_source_ctl,</div><div class='add'>+		       emu1010_input_texts, emu_ri-&gt;n_ins);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define EMU1010_SOURCE_INPUT(xname,chid) \</div><div class='del'>-{								\</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,		\</div><div class='del'>-	.info =  snd_emu1010_input_output_source_info,		\</div><div class='del'>-	.get =   snd_emu1010_input_source_get,			\</div><div class='del'>-	.put =   snd_emu1010_input_source_put,			\</div><div class='del'>-	.private_value = chid					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] __devinitdata = {</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 0 Capture Enum", 0),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 1 Capture Enum", 1),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 2 Capture Enum", 2),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 3 Capture Enum", 3),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 4 Capture Enum", 4),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 5 Capture Enum", 5),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 6 Capture Enum", 6),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 7 Capture Enum", 7),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 8 Capture Enum", 8),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 9 Capture Enum", 9),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP A Capture Enum", 0xa),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP B Capture Enum", 0xb),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP C Capture Enum", 0xc),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP D Capture Enum", 0xd),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP E Capture Enum", 0xe),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP F Capture Enum", 0xf),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 10 Capture Enum", 0x10),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 11 Capture Enum", 0x11),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 12 Capture Enum", 0x12),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 13 Capture Enum", 0x13),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 14 Capture Enum", 0x14),</div><div class='del'>-	EMU1010_SOURCE_INPUT("DSP 15 Capture Enum", 0x15),</div><div class='add'>+static const char * const snd_emu1010_adc_pads[] = {</div><div class='add'>+	"ADC1 14dB PAD 0202 Capture Switch",</div><div class='add'>+	"ADC1 14dB PAD Audio Dock Capture Switch",</div><div class='add'>+	"ADC2 14dB PAD Audio Dock Capture Switch",</div><div class='add'>+	"ADC3 14dB PAD Audio Dock Capture Switch",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+static const unsigned short snd_emu1010_adc_pad_regs[] = {</div><div class='add'>+	EMU_HANA_0202_ADC_PAD1,</div><div class='add'>+	EMU_HANA_DOCK_ADC_PAD1,</div><div class='add'>+	EMU_HANA_DOCK_ADC_PAD2,</div><div class='add'>+	EMU_HANA_DOCK_ADC_PAD3,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define snd_emu1010_adc_pads_info	snd_ctl_boolean_mono_info</div><div class='ctx'> </div><div class='ctx'> static int snd_emu1010_adc_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int mask = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int mask = snd_emu1010_adc_pad_regs[kcontrol-&gt;private_value];</div><div class='add'>+</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (emu-&gt;emu1010.adc_pads &amp; mask) ? 1 : 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -611,39 +765,48 @@ static int snd_emu1010_adc_pads_get(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> static int snd_emu1010_adc_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int mask = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int mask = snd_emu1010_adc_pad_regs[kcontrol-&gt;private_value];</div><div class='ctx'> 	unsigned int val, cache;</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	cache = emu-&gt;emu1010.adc_pads;</div><div class='ctx'> 	if (val == 1) </div><div class='ctx'> 		cache = cache | mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		cache = cache &amp; ~mask;</div><div class='del'>-	if (cache != emu-&gt;emu1010.adc_pads) {</div><div class='del'>-		snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, cache );</div><div class='add'>+	change = (cache != emu-&gt;emu1010.adc_pads);</div><div class='add'>+	if (change) {</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_ADC_PADS, cache );</div><div class='ctx'> 	        emu-&gt;emu1010.adc_pads = cache;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct snd_kcontrol_new emu1010_adc_pads_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info = snd_emu1010_adc_pads_info,</div><div class='add'>+	.get = snd_emu1010_adc_pads_get,</div><div class='add'>+	.put = snd_emu1010_adc_pads_put</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define EMU1010_ADC_PADS(xname,chid) \</div><div class='del'>-{								\</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,		\</div><div class='del'>-	.info =  snd_emu1010_adc_pads_info,			\</div><div class='del'>-	.get =   snd_emu1010_adc_pads_get,			\</div><div class='del'>-	.put =   snd_emu1010_adc_pads_put,			\</div><div class='del'>-	.private_value = chid					\</div><div class='del'>-}</div><div class='add'>+static const char * const snd_emu1010_dac_pads[] = {</div><div class='add'>+	"DAC1 0202 14dB PAD Playback Switch",</div><div class='add'>+	"DAC1 Audio Dock 14dB PAD Playback Switch",</div><div class='add'>+	"DAC2 Audio Dock 14dB PAD Playback Switch",</div><div class='add'>+	"DAC3 Audio Dock 14dB PAD Playback Switch",</div><div class='add'>+	"DAC4 Audio Dock 14dB PAD Playback Switch",</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu1010_adc_pads[] __devinitdata = {</div><div class='del'>-	EMU1010_ADC_PADS("ADC1 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD1),</div><div class='del'>-	EMU1010_ADC_PADS("ADC2 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD2),</div><div class='del'>-	EMU1010_ADC_PADS("ADC3 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD3),</div><div class='del'>-	EMU1010_ADC_PADS("ADC1 14dB PAD 0202 Capture Switch", EMU_HANA_0202_ADC_PAD1),</div><div class='add'>+static const unsigned short snd_emu1010_dac_regs[] = {</div><div class='add'>+	EMU_HANA_0202_DAC_PAD1,</div><div class='add'>+	EMU_HANA_DOCK_DAC_PAD1,</div><div class='add'>+	EMU_HANA_DOCK_DAC_PAD2,</div><div class='add'>+	EMU_HANA_DOCK_DAC_PAD3,</div><div class='add'>+	EMU_HANA_DOCK_DAC_PAD4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define snd_emu1010_dac_pads_info	snd_ctl_boolean_mono_info</div><div class='hunk'>@@ -651,7 +814,8 @@ static struct snd_kcontrol_new snd_emu1010_adc_pads[] __devinitdata = {</div><div class='ctx'> static int snd_emu1010_dac_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int mask = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int mask = snd_emu1010_dac_regs[kcontrol-&gt;private_value];</div><div class='add'>+</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (emu-&gt;emu1010.dac_pads &amp; mask) ? 1 : 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -659,192 +823,355 @@ static int snd_emu1010_dac_pads_get(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> static int snd_emu1010_dac_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int mask = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int mask = snd_emu1010_dac_regs[kcontrol-&gt;private_value];</div><div class='ctx'> 	unsigned int val, cache;</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	cache = emu-&gt;emu1010.dac_pads;</div><div class='ctx'> 	if (val == 1) </div><div class='ctx'> 		cache = cache | mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		cache = cache &amp; ~mask;</div><div class='del'>-	if (cache != emu-&gt;emu1010.dac_pads) {</div><div class='del'>-		snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, cache );</div><div class='add'>+	change = (cache != emu-&gt;emu1010.dac_pads);</div><div class='add'>+	if (change) {</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_DAC_PADS, cache );</div><div class='ctx'> 	        emu-&gt;emu1010.dac_pads = cache;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new emu1010_dac_pads_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.info = snd_emu1010_dac_pads_info,</div><div class='add'>+	.get = snd_emu1010_dac_pads_get,</div><div class='add'>+	.put = snd_emu1010_dac_pads_put</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+struct snd_emu1010_pads_info {</div><div class='add'>+	const char * const *adc_ctls, * const *dac_ctls;</div><div class='add'>+	unsigned n_adc_ctls, n_dac_ctls;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_emu1010_pads_info emu1010_pads_info[] = {</div><div class='add'>+	{</div><div class='add'>+		/* rev1 1010 */</div><div class='add'>+		.adc_ctls = snd_emu1010_adc_pads,</div><div class='add'>+		.n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads),</div><div class='add'>+		.dac_ctls = snd_emu1010_dac_pads,</div><div class='add'>+		.n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* rev2 1010 */</div><div class='add'>+		.adc_ctls = snd_emu1010_adc_pads,</div><div class='add'>+		.n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads) - 1,</div><div class='add'>+		.dac_ctls = snd_emu1010_dac_pads,</div><div class='add'>+		.n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* 1616(m) cardbus */</div><div class='add'>+		.adc_ctls = snd_emu1010_adc_pads + 1,</div><div class='add'>+		.n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads) - 2,</div><div class='add'>+		.dac_ctls = snd_emu1010_dac_pads + 1,</div><div class='add'>+		.n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads) - 2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* 0404 */</div><div class='add'>+		.adc_ctls = NULL,</div><div class='add'>+		.n_adc_ctls = 0,</div><div class='add'>+		.dac_ctls = NULL,</div><div class='add'>+		.n_dac_ctls = 0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const emu1010_clock_texts[] = {</div><div class='add'>+	"44100", "48000", "SPDIF", "ADAT", "Dock", "BNC"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 emu1010_clock_vals[] = {</div><div class='add'>+	EMU_HANA_WCLOCK_INT_44_1K,</div><div class='add'>+	EMU_HANA_WCLOCK_INT_48K,</div><div class='add'>+	EMU_HANA_WCLOCK_HANA_SPDIF_IN,</div><div class='add'>+	EMU_HANA_WCLOCK_HANA_ADAT_IN,</div><div class='add'>+	EMU_HANA_WCLOCK_2ND_HANA,</div><div class='add'>+	EMU_HANA_WCLOCK_SYNC_BNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const emu0404_clock_texts[] = {</div><div class='add'>+	"44100", "48000", "SPDIF", "BNC"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 emu0404_clock_vals[] = {</div><div class='add'>+	EMU_HANA_WCLOCK_INT_44_1K,</div><div class='add'>+	EMU_HANA_WCLOCK_INT_48K,</div><div class='add'>+	EMU_HANA_WCLOCK_HANA_SPDIF_IN,</div><div class='add'>+	EMU_HANA_WCLOCK_SYNC_BNC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_emu1010_clock_info {</div><div class='add'>+	const char * const *texts;</div><div class='add'>+	const u8 *vals;</div><div class='add'>+	unsigned num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_emu1010_clock_info emu1010_clock_info[] = {</div><div class='add'>+	{</div><div class='add'>+		// rev1 1010</div><div class='add'>+		.texts = emu1010_clock_texts,</div><div class='add'>+		.vals = emu1010_clock_vals,</div><div class='add'>+		.num = ARRAY_SIZE(emu1010_clock_vals),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		// rev2 1010</div><div class='add'>+		.texts = emu1010_clock_texts,</div><div class='add'>+		.vals = emu1010_clock_vals,</div><div class='add'>+		.num = ARRAY_SIZE(emu1010_clock_vals) - 1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		// 1616(m) CardBus</div><div class='add'>+		.texts = emu1010_clock_texts,</div><div class='add'>+		// TODO: determine what is actually available.</div><div class='add'>+		// Pedantically, *every* source comes from the 2nd FPGA, as the</div><div class='add'>+		// card itself has no own (digital) audio ports. The user manual</div><div class='add'>+		// claims that ADAT and S/PDIF clock sources are separate, which</div><div class='add'>+		// can mean two things: either E-MU mapped the dock's sources to</div><div class='add'>+		// the primary ones, or they determine the meaning of the "Dock"</div><div class='add'>+		// source depending on how the ports are actually configured</div><div class='add'>+		// (which the 2nd FPGA must be doing anyway).</div><div class='add'>+		.vals = emu1010_clock_vals,</div><div class='add'>+		.num = ARRAY_SIZE(emu1010_clock_vals),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		// 0404</div><div class='add'>+		.texts = emu0404_clock_texts,</div><div class='add'>+		.vals = emu0404_clock_vals,</div><div class='add'>+		.num = ARRAY_SIZE(emu0404_clock_vals),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_clock_source_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+					  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	const struct snd_emu1010_clock_info *emu_ci =</div><div class='add'>+		&amp;emu1010_clock_info[emu1010_idx(emu)];</div><div class='add'>+		</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, emu_ci-&gt;num, emu_ci-&gt;texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_clock_source_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.clock_source;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_emu1010_clock_source_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	const struct snd_emu1010_clock_info *emu_ci =</div><div class='add'>+		&amp;emu1010_clock_info[emu1010_idx(emu)];</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='add'>+	val = ucontrol-&gt;value.enumerated.item[0] ;</div><div class='add'>+	if (val &gt;= emu_ci-&gt;num)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;emu-&gt;reg_lock) {</div><div class='add'>+		if (emu-&gt;emu1010.clock_source == val)</div><div class='add'>+			return 0;</div><div class='add'>+		emu-&gt;emu1010.clock_source = val;</div><div class='add'>+		emu-&gt;emu1010.wclock = emu_ci-&gt;vals[val];</div><div class='add'>+		snd_emu1010_update_clock(emu);</div><div class='add'>+</div><div class='add'>+		snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE);</div><div class='add'>+		snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, emu-&gt;emu1010.wclock);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-#define EMU1010_DAC_PADS(xname,chid) \</div><div class='del'>-{								\</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,		\</div><div class='del'>-	.info =  snd_emu1010_dac_pads_info,			\</div><div class='del'>-	.get =   snd_emu1010_dac_pads_get,			\</div><div class='del'>-	.put =   snd_emu1010_dac_pads_put,			\</div><div class='del'>-	.private_value = chid					\</div><div class='add'>+	msleep(10);  // Allow DLL to settle</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu1010_dac_pads[] __devinitdata = {</div><div class='del'>-	EMU1010_DAC_PADS("DAC1 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD1),</div><div class='del'>-	EMU1010_DAC_PADS("DAC2 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD2),</div><div class='del'>-	EMU1010_DAC_PADS("DAC3 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD3),</div><div class='del'>-	EMU1010_DAC_PADS("DAC4 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD4),</div><div class='del'>-	EMU1010_DAC_PADS("DAC1 0202 14dB PAD Playback Switch", EMU_HANA_0202_DAC_PAD1),</div><div class='add'>+static const struct snd_kcontrol_new snd_emu1010_clock_source =</div><div class='add'>+{</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Clock Source",</div><div class='add'>+	.count = 1,</div><div class='add'>+	.info = snd_emu1010_clock_source_info,</div><div class='add'>+	.get = snd_emu1010_clock_source_get,</div><div class='add'>+	.put = snd_emu1010_clock_source_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int snd_emu1010_internal_clock_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+static int snd_emu1010_clock_fallback_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = {</div><div class='del'>-		"44100", "48000", "SPDIF", "ADAT"</div><div class='add'>+	static const char * const texts[2] = {</div><div class='add'>+		"44100", "48000"</div><div class='ctx'> 	};</div><div class='del'>-		</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_clock_fallback_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+					  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.clock_fallback;</div><div class='ctx'> 	return 0;</div><div class='del'>-	</div><div class='del'>-	</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu1010_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+static int snd_emu1010_clock_fallback_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+					  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	int change;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	change = (emu-&gt;emu1010.clock_fallback != val);</div><div class='add'>+	if (change) {</div><div class='add'>+		emu-&gt;emu1010.clock_fallback = val;</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_DEFCLOCK, 1 - val);</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new snd_emu1010_clock_fallback =</div><div class='add'>+{</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name = "Clock Fallback",</div><div class='add'>+	.count = 1,</div><div class='add'>+	.info = snd_emu1010_clock_fallback_info,</div><div class='add'>+	.get = snd_emu1010_clock_fallback_get,</div><div class='add'>+	.put = snd_emu1010_clock_fallback_put</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_optical_out_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+					  struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	static const char * const texts[2] = {</div><div class='add'>+		"SPDIF", "ADAT"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_optical_out_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.internal_clock;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.optical_out;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+static int snd_emu1010_optical_out_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int val;</div><div class='add'>+	u32 tmp;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	val = ucontrol-&gt;value.enumerated.item[0] ;</div><div class='del'>-	/* Limit: uinfo-&gt;value.enumerated.items = 4; */</div><div class='del'>-	if (val &gt;= 4)</div><div class='add'>+	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	/* Limit: uinfo-&gt;value.enumerated.items = 2; */</div><div class='add'>+	if (val &gt;= 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	change = (emu-&gt;emu1010.internal_clock != val);</div><div class='add'>+	change = (emu-&gt;emu1010.optical_out != val);</div><div class='ctx'> 	if (change) {</div><div class='del'>-		emu-&gt;emu1010.internal_clock = val;</div><div class='del'>-		switch (val) {</div><div class='del'>-		case 0:</div><div class='del'>-			/* 44100 */</div><div class='del'>-			/* Mute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );</div><div class='del'>-			/* Default fallback clock 48kHz */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_44_1K );</div><div class='del'>-			/* Word Clock source, Internal 44.1kHz x1 */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,</div><div class='del'>-			EMU_HANA_WCLOCK_INT_44_1K | EMU_HANA_WCLOCK_1X );</div><div class='del'>-			/* Set LEDs on Audio Dock */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,</div><div class='del'>-				EMU_HANA_DOCK_LEDS_2_44K | EMU_HANA_DOCK_LEDS_2_LOCK );</div><div class='del'>-			/* Allow DLL to settle */</div><div class='del'>-			msleep(10);</div><div class='del'>-			/* Unmute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			/* 48000 */</div><div class='del'>-			/* Mute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );</div><div class='del'>-			/* Default fallback clock 48kHz */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );</div><div class='del'>-			/* Word Clock source, Internal 48kHz x1 */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,</div><div class='del'>-				EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_1X );</div><div class='del'>-			/* Set LEDs on Audio Dock */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,</div><div class='del'>-				EMU_HANA_DOCK_LEDS_2_48K | EMU_HANA_DOCK_LEDS_2_LOCK );</div><div class='del'>-			/* Allow DLL to settle */</div><div class='del'>-			msleep(10);</div><div class='del'>-			/* Unmute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case 2: /* Take clock from S/PDIF IN */</div><div class='del'>-			/* Mute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );</div><div class='del'>-			/* Default fallback clock 48kHz */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );</div><div class='del'>-			/* Word Clock source, sync to S/PDIF input */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,</div><div class='del'>-				EMU_HANA_WCLOCK_HANA_SPDIF_IN | EMU_HANA_WCLOCK_1X );</div><div class='del'>-			/* Set LEDs on Audio Dock */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,</div><div class='del'>-				EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );</div><div class='del'>-			/* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */	</div><div class='del'>-			/* Allow DLL to settle */</div><div class='del'>-			msleep(10);</div><div class='del'>-			/* Unmute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		case 3: 			</div><div class='del'>-			/* Take clock from ADAT IN */</div><div class='del'>-			/* Mute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );</div><div class='del'>-			/* Default fallback clock 48kHz */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );</div><div class='del'>-			/* Word Clock source, sync to ADAT input */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,</div><div class='del'>-				EMU_HANA_WCLOCK_HANA_ADAT_IN | EMU_HANA_WCLOCK_1X );</div><div class='del'>-			/* Set LEDs on Audio Dock */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );</div><div class='del'>-			/* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */	</div><div class='del'>-			/* Allow DLL to settle */</div><div class='del'>-			msleep(10);</div><div class='del'>-			/*   Unmute all */</div><div class='del'>-			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );</div><div class='del'>-			 </div><div class='del'>-			</div><div class='del'>-			break;		</div><div class='del'>-		}</div><div class='add'>+		emu-&gt;emu1010.optical_out = val;</div><div class='add'>+		tmp = (emu-&gt;emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |</div><div class='add'>+			(emu-&gt;emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_OPTICAL_TYPE, tmp);</div><div class='ctx'> 	}</div><div class='del'>-        return change;</div><div class='add'>+	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu1010_internal_clock =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu1010_optical_out = {</div><div class='add'>+	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='add'>+	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.name =         "Optical Output Mode",</div><div class='add'>+	.count =	1,</div><div class='add'>+	.info =         snd_emu1010_optical_out_info,</div><div class='add'>+	.get =          snd_emu1010_optical_out_get,</div><div class='add'>+	.put =          snd_emu1010_optical_out_put</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_optical_in_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='add'>+	static const char * const texts[2] = {</div><div class='add'>+		"SPDIF", "ADAT"</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_optical_in_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = emu-&gt;emu1010.optical_in;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu1010_optical_in_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+					struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int val;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int change = 0;</div><div class='add'>+</div><div class='add'>+	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	/* Limit: uinfo-&gt;value.enumerated.items = 2; */</div><div class='add'>+	if (val &gt;= 2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	change = (emu-&gt;emu1010.optical_in != val);</div><div class='add'>+	if (change) {</div><div class='add'>+		emu-&gt;emu1010.optical_in = val;</div><div class='add'>+		tmp = (emu-&gt;emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |</div><div class='add'>+			(emu-&gt;emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);</div><div class='add'>+		snd_emu1010_fpga_write_lock(emu, EMU_HANA_OPTICAL_TYPE, tmp);</div><div class='add'>+	}</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new snd_emu1010_optical_in = {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name =         "Clock Internal Rate",</div><div class='add'>+	.name =         "Optical Input Mode",</div><div class='ctx'> 	.count =	1,</div><div class='del'>-	.info =         snd_emu1010_internal_clock_info,</div><div class='del'>-	.get =          snd_emu1010_internal_clock_get,</div><div class='del'>-	.put =          snd_emu1010_internal_clock_put</div><div class='add'>+	.info =         snd_emu1010_optical_in_info,</div><div class='add'>+	.get =          snd_emu1010_optical_in_get,</div><div class='add'>+	.put =          snd_emu1010_optical_in_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int snd_audigy_i2c_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> #if 0</div><div class='del'>-	static char *texts[4] = {</div><div class='add'>+	static const char * const texts[4] = {</div><div class='ctx'> 		"Unknown1", "Unknown2", "Mic", "Line"</div><div class='ctx'> 	};</div><div class='ctx'> #endif</div><div class='del'>-	static char *texts[2] = {</div><div class='add'>+	static const char * const texts[2] = {</div><div class='ctx'> 		"Mic", "Line"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_audigy_i2c_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -862,9 +1189,8 @@ static int snd_audigy_i2c_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int source_id;</div><div class='ctx'> 	unsigned int ngain, ogain;</div><div class='del'>-	u32 gpio;</div><div class='add'>+	u16 gpio;</div><div class='ctx'> 	int change = 0;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u32 source;</div><div class='ctx'> 	/* If the capture source has changed,</div><div class='ctx'> 	 * update the capture volume from the cached value</div><div class='hunk'>@@ -878,13 +1204,13 @@ static int snd_audigy_i2c_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = (emu-&gt;i2c_capture_source != source_id);</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		snd_emu10k1_i2c_write(emu, ADC_MUX, 0); /* Mute input */</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		gpio = inl(emu-&gt;port + A_IOCFG);</div><div class='del'>-		if (source_id==0)</div><div class='del'>-			outl(gpio | 0x4, emu-&gt;port + A_IOCFG);</div><div class='del'>-		else</div><div class='del'>-			outl(gpio &amp; ~0x4, emu-&gt;port + A_IOCFG);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;emu-&gt;emu_lock) {</div><div class='add'>+			gpio = inw(emu-&gt;port + A_IOCFG);</div><div class='add'>+			if (source_id == 0)</div><div class='add'>+				outw(gpio | 0x4, emu-&gt;port + A_IOCFG);</div><div class='add'>+			else</div><div class='add'>+				outw(gpio &amp; ~0x4, emu-&gt;port + A_IOCFG);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ngain = emu-&gt;i2c_capture_volume[source_id][0]; /* Left */</div><div class='ctx'> 		ogain = emu-&gt;i2c_capture_volume[emu-&gt;i2c_capture_source][0]; /* Left */</div><div class='hunk'>@@ -902,7 +1228,7 @@ static int snd_audigy_i2c_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>         return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_audigy_i2c_capture_source =</div><div class='add'>+static const struct snd_kcontrol_new snd_audigy_i2c_capture_source =</div><div class='ctx'> {</div><div class='ctx'> 		.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name =		"Capture Source",</div><div class='hunk'>@@ -943,7 +1269,7 @@ static int snd_audigy_i2c_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int ogain;</div><div class='del'>-	unsigned int ngain;</div><div class='add'>+	unsigned int ngain0, ngain1;</div><div class='ctx'> 	unsigned int source_id;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -952,60 +1278,51 @@ static int snd_audigy_i2c_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>         /*        capture_source: uinfo-&gt;value.enumerated.items = 2 */</div><div class='ctx'> 	if (source_id &gt;= 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	ngain0 = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	ngain1 = ucontrol-&gt;value.integer.value[1];</div><div class='add'>+	if (ngain0 &gt; 0xff)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (ngain1 &gt; 0xff)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	ogain = emu-&gt;i2c_capture_volume[source_id][0]; /* Left */</div><div class='del'>-	ngain = ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	if (ngain &gt; 0xff)</div><div class='del'>-		return 0;</div><div class='del'>-	if (ogain != ngain) {</div><div class='add'>+	if (ogain != ngain0) {</div><div class='ctx'> 		if (emu-&gt;i2c_capture_source == source_id)</div><div class='del'>-			snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) &amp; 0xff) );</div><div class='del'>-		emu-&gt;i2c_capture_volume[source_id][0] = ngain;</div><div class='add'>+			snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ngain0);</div><div class='add'>+		emu-&gt;i2c_capture_volume[source_id][0] = ngain0;</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	ogain = emu-&gt;i2c_capture_volume[source_id][1]; /* Right */</div><div class='del'>-	ngain = ucontrol-&gt;value.integer.value[1];</div><div class='del'>-	if (ngain &gt; 0xff)</div><div class='del'>-		return 0;</div><div class='del'>-	if (ogain != ngain) {</div><div class='add'>+	if (ogain != ngain1) {</div><div class='ctx'> 		if (emu-&gt;i2c_capture_source == source_id)</div><div class='del'>-			snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) &amp; 0xff));</div><div class='del'>-		emu-&gt;i2c_capture_volume[source_id][1] = ngain;</div><div class='add'>+			snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ngain1);</div><div class='add'>+		emu-&gt;i2c_capture_volume[source_id][1] = ngain1;</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define I2C_VOLUME(xname,chid) \</div><div class='del'>-{								\</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,	\</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |		\</div><div class='del'>-	          SNDRV_CTL_ELEM_ACCESS_TLV_READ,		\</div><div class='del'>-	.info =  snd_audigy_i2c_volume_info,			\</div><div class='del'>-	.get =   snd_audigy_i2c_volume_get,			\</div><div class='del'>-	.put =   snd_audigy_i2c_volume_put,			\</div><div class='del'>-	.tlv = { .p = snd_audigy_db_scale2 },			\</div><div class='del'>-	.private_value = chid					\</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+static const struct snd_kcontrol_new i2c_volume_ctl = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+	          SNDRV_CTL_ELEM_ACCESS_TLV_READ,</div><div class='add'>+	.info = snd_audigy_i2c_volume_info,</div><div class='add'>+	.get = snd_audigy_i2c_volume_get,</div><div class='add'>+	.put = snd_audigy_i2c_volume_put,</div><div class='add'>+	.tlv = { .p = snd_audigy_db_scale2 }</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_audigy_i2c_volume_ctls[] __devinitdata = {</div><div class='del'>-	I2C_VOLUME("Mic Capture Volume", 0),</div><div class='del'>-	I2C_VOLUME("Line Capture Volume", 0)</div><div class='add'>+static const char * const snd_audigy_i2c_volume_ctls[] = {</div><div class='add'>+	"Mic Capture Volume",</div><div class='add'>+	"Line Capture Volume",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='ctx'> static int snd_audigy_spdif_output_rate_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = {"44100", "48000", "96000"};</div><div class='add'>+	static const char * const texts[] = {"44100", "48000", "96000"};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_audigy_spdif_output_rate_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1013,10 +1330,7 @@ static int snd_audigy_spdif_output_rate_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int tmp;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);</div><div class='ctx'> 	switch (tmp &amp; A_SPDIF_RATE_MASK) {</div><div class='ctx'> 	case A_SPDIF_44100:</div><div class='hunk'>@@ -1031,7 +1345,6 @@ static int snd_audigy_spdif_output_rate_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	default:</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = 1;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +1354,6 @@ static int snd_audigy_spdif_output_rate_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned int reg, val, tmp;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	switch(ucontrol-&gt;value.enumerated.item[0]) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -1059,17 +1371,17 @@ static int snd_audigy_spdif_output_rate_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	reg = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);</div><div class='ctx'> 	tmp = reg &amp; ~A_SPDIF_RATE_MASK;</div><div class='ctx'> 	tmp |= val;</div><div class='del'>-	if ((change = (tmp != reg)))</div><div class='add'>+	change = (tmp != reg);</div><div class='add'>+	if (change)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_audigy_spdif_output_rate =</div><div class='add'>+static const struct snd_kcontrol_new snd_audigy_spdif_output_rate =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -1088,7 +1400,6 @@ static int snd_emu10k1_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='ctx'> 	int change;</div><div class='ctx'> 	unsigned int val;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Limit: emu-&gt;spdif_bits */</div><div class='ctx'> 	if (idx &gt;= 3)</div><div class='hunk'>@@ -1097,17 +1408,15 @@ static int snd_emu10k1_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='ctx'> 	      (ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	change = val != emu-&gt;spdif_bits[idx];</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, SPCS0 + idx, 0, val);</div><div class='ctx'> 		emu-&gt;spdif_bits[idx] = val;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1117,7 +1426,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =</div><div class='ctx'> 	.get =          snd_emu10k1_spdif_get_mask</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_spdif_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_spdif_control =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),</div><div class='hunk'>@@ -1131,10 +1440,10 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_control =</div><div class='ctx'> static void update_emu10k1_fxrt(struct snd_emu10k1 *emu, int voice, unsigned char *route)</div><div class='ctx'> {</div><div class='ctx'> 	if (emu-&gt;audigy) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT1, voice,</div><div class='del'>-				      snd_emu10k1_compose_audigy_fxrt1(route));</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT2, voice,</div><div class='del'>-				      snd_emu10k1_compose_audigy_fxrt2(route));</div><div class='add'>+		snd_emu10k1_ptr_write_multiple(emu, voice,</div><div class='add'>+			A_FXRT1, snd_emu10k1_compose_audigy_fxrt1(route),</div><div class='add'>+			A_FXRT2, snd_emu10k1_compose_audigy_fxrt2(route),</div><div class='add'>+			REGLIST_END);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, FXRT, voice,</div><div class='ctx'> 				      snd_emu10k1_compose_send_routing(route));</div><div class='hunk'>@@ -1148,11 +1457,8 @@ static void update_emu10k1_send_volume(struct snd_emu10k1 *emu, int voice, unsig</div><div class='ctx'> 	snd_emu10k1_ptr_write(emu, PSST_FXSENDAMOUNT_C, voice, volume[2]);</div><div class='ctx'> 	snd_emu10k1_ptr_write(emu, DSL_FXSENDAMOUNT_D, voice, volume[3]);</div><div class='ctx'> 	if (emu-&gt;audigy) {</div><div class='del'>-		unsigned int val = ((unsigned int)volume[4] &lt;&lt; 24) |</div><div class='del'>-			((unsigned int)volume[5] &lt;&lt; 16) |</div><div class='del'>-			((unsigned int)volume[6] &lt;&lt; 8) |</div><div class='del'>-			(unsigned int)volume[7];</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice, val);</div><div class='add'>+		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice,</div><div class='add'>+				      snd_emu10k1_compose_audigy_sendamounts(volume));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1171,7 +1477,6 @@ static int snd_emu10k1_send_routing_info(struct snd_kcontrol *kcontrol, struct s</div><div class='ctx'> static int snd_emu10k1_send_routing_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                         struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='hunk'>@@ -1179,19 +1484,16 @@ static int snd_emu10k1_send_routing_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> 	int mask = emu-&gt;audigy ? 0x3f : 0x0f;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (voice = 0; voice &lt; 3; voice++)</div><div class='ctx'> 		for (idx = 0; idx &lt; num_efx; idx++)</div><div class='ctx'> 			ucontrol-&gt;value.integer.value[(voice * num_efx) + idx] = </div><div class='ctx'> 				mix-&gt;send_routing[voice][idx] &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                         struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='hunk'>@@ -1199,7 +1501,7 @@ static int snd_emu10k1_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> 	int mask = emu-&gt;audigy ? 0x3f : 0x0f;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (voice = 0; voice &lt; 3; voice++)</div><div class='ctx'> 		for (idx = 0; idx &lt; num_efx; idx++) {</div><div class='ctx'> 			val = ucontrol-&gt;value.integer.value[(voice * num_efx) + idx] &amp; mask;</div><div class='hunk'>@@ -1208,22 +1510,21 @@ static int snd_emu10k1_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				change = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}	</div><div class='del'>-	if (change &amp;&amp; mix-&gt;epcm) {</div><div class='del'>-		if (mix-&gt;epcm-&gt;voices[0] &amp;&amp; mix-&gt;epcm-&gt;voices[1]) {</div><div class='add'>+	if (change &amp;&amp; mix-&gt;epcm &amp;&amp; mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+		if (!mix-&gt;epcm-&gt;voices[0]-&gt;last) {</div><div class='ctx'> 			update_emu10k1_fxrt(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number,</div><div class='ctx'> 					    &amp;mix-&gt;send_routing[1][0]);</div><div class='del'>-			update_emu10k1_fxrt(emu, mix-&gt;epcm-&gt;voices[1]-&gt;number,</div><div class='add'>+			update_emu10k1_fxrt(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number + 1,</div><div class='ctx'> 					    &amp;mix-&gt;send_routing[2][0]);</div><div class='del'>-		} else if (mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+		} else {</div><div class='ctx'> 			update_emu10k1_fxrt(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number,</div><div class='ctx'> 					    &amp;mix-&gt;send_routing[0][0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_send_routing_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_send_routing_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1247,31 +1548,27 @@ static int snd_emu10k1_send_volume_info(struct snd_kcontrol *kcontrol, struct sn</div><div class='ctx'> static int snd_emu10k1_send_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                        struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (idx = 0; idx &lt; 3*num_efx; idx++)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] = mix-&gt;send_volume[idx/num_efx][idx%num_efx];</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_send_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                        struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	int change = 0, idx, val;</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; 3*num_efx; idx++) {</div><div class='ctx'> 		val = ucontrol-&gt;value.integer.value[idx] &amp; 255;</div><div class='ctx'> 		if (mix-&gt;send_volume[idx/num_efx][idx%num_efx] != val) {</div><div class='hunk'>@@ -1279,22 +1576,21 @@ static int snd_emu10k1_send_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (change &amp;&amp; mix-&gt;epcm) {</div><div class='del'>-		if (mix-&gt;epcm-&gt;voices[0] &amp;&amp; mix-&gt;epcm-&gt;voices[1]) {</div><div class='add'>+	if (change &amp;&amp; mix-&gt;epcm &amp;&amp; mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+		if (!mix-&gt;epcm-&gt;voices[0]-&gt;last) {</div><div class='ctx'> 			update_emu10k1_send_volume(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number,</div><div class='ctx'> 						   &amp;mix-&gt;send_volume[1][0]);</div><div class='del'>-			update_emu10k1_send_volume(emu, mix-&gt;epcm-&gt;voices[1]-&gt;number,</div><div class='add'>+			update_emu10k1_send_volume(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number + 1,</div><div class='ctx'> 						   &amp;mix-&gt;send_volume[2][0]);</div><div class='del'>-		} else if (mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+		} else {</div><div class='ctx'> 			update_emu10k1_send_volume(emu, mix-&gt;epcm-&gt;voices[0]-&gt;number,</div><div class='ctx'> 						   &amp;mix-&gt;send_volume[0][0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_send_volume_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_send_volume_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1310,7 +1606,7 @@ static int snd_emu10k1_attn_info(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 3;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = 0xffff;</div><div class='add'>+	uinfo-&gt;value.integer.max = 0x1fffd;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1320,46 +1616,42 @@ static int snd_emu10k1_attn_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (idx = 0; idx &lt; 3; idx++)</div><div class='del'>-		ucontrol-&gt;value.integer.value[idx] = mix-&gt;attn[idx];</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+		ucontrol-&gt;value.integer.value[idx] = mix-&gt;attn[idx] * 0xffffU / 0x8000U;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_attn_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	int change = 0, idx, val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; 3; idx++) {</div><div class='del'>-		val = ucontrol-&gt;value.integer.value[idx] &amp; 0xffff;</div><div class='add'>+		unsigned uval = ucontrol-&gt;value.integer.value[idx] &amp; 0x1ffff;</div><div class='add'>+		val = uval * 0x8000U / 0xffffU;</div><div class='ctx'> 		if (mix-&gt;attn[idx] != val) {</div><div class='ctx'> 			mix-&gt;attn[idx] = val;</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (change &amp;&amp; mix-&gt;epcm) {</div><div class='del'>-		if (mix-&gt;epcm-&gt;voices[0] &amp;&amp; mix-&gt;epcm-&gt;voices[1]) {</div><div class='add'>+	if (change &amp;&amp; mix-&gt;epcm &amp;&amp; mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+		if (!mix-&gt;epcm-&gt;voices[0]-&gt;last) {</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix-&gt;epcm-&gt;voices[0]-&gt;number, mix-&gt;attn[1]);</div><div class='del'>-			snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix-&gt;epcm-&gt;voices[1]-&gt;number, mix-&gt;attn[2]);</div><div class='del'>-		} else if (mix-&gt;epcm-&gt;voices[0]) {</div><div class='add'>+			snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix-&gt;epcm-&gt;voices[0]-&gt;number + 1, mix-&gt;attn[2]);</div><div class='add'>+		} else {</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix-&gt;epcm-&gt;voices[0]-&gt;number, mix-&gt;attn[0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_attn_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_attn_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1385,7 +1677,6 @@ static int snd_emu10k1_efx_send_routing_info(struct snd_kcontrol *kcontrol, stru</div><div class='ctx'> static int snd_emu10k1_efx_send_routing_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                         struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='hunk'>@@ -1393,18 +1684,15 @@ static int snd_emu10k1_efx_send_routing_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> 	int mask = emu-&gt;audigy ? 0x3f : 0x0f;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (idx = 0; idx &lt; num_efx; idx++)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] = </div><div class='ctx'> 			mix-&gt;send_routing[0][idx] &amp; mask;</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_efx_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                         struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int ch = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix = &amp;emu-&gt;efx_pcm_mixer[ch];</div><div class='hunk'>@@ -1412,7 +1700,7 @@ static int snd_emu10k1_efx_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> 	int mask = emu-&gt;audigy ? 0x3f : 0x0f;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; num_efx; idx++) {</div><div class='ctx'> 		val = ucontrol-&gt;value.integer.value[idx] &amp; mask;</div><div class='ctx'> 		if (mix-&gt;send_routing[0][idx] != val) {</div><div class='hunk'>@@ -1427,11 +1715,10 @@ static int snd_emu10k1_efx_send_routing_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					&amp;mix-&gt;send_routing[0][0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_efx_send_routing_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_efx_send_routing_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1455,31 +1742,27 @@ static int snd_emu10k1_efx_send_volume_info(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> static int snd_emu10k1_efx_send_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                        struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	for (idx = 0; idx &lt; num_efx; idx++)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] = mix-&gt;send_volume[0][idx];</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_efx_send_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                        struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int ch = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix = &amp;emu-&gt;efx_pcm_mixer[ch];</div><div class='ctx'> 	int change = 0, idx, val;</div><div class='ctx'> 	int num_efx = emu-&gt;audigy ? 8 : 4;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; num_efx; idx++) {</div><div class='ctx'> 		val = ucontrol-&gt;value.integer.value[idx] &amp; 255;</div><div class='ctx'> 		if (mix-&gt;send_volume[0][idx] != val) {</div><div class='hunk'>@@ -1493,12 +1776,11 @@ static int snd_emu10k1_efx_send_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 						   &amp;mix-&gt;send_volume[0][0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_efx_send_volume_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_efx_send_volume_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1514,7 +1796,7 @@ static int snd_emu10k1_efx_attn_info(struct snd_kcontrol *kcontrol, struct snd_c</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='ctx'> 	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = 0xffff;</div><div class='add'>+	uinfo-&gt;value.integer.max = 0x1fffd;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1524,25 +1806,23 @@ static int snd_emu10k1_efx_attn_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix =</div><div class='ctx'> 		&amp;emu-&gt;efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = mix-&gt;attn[0];</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = mix-&gt;attn[0] * 0xffffU / 0x8000U;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_efx_attn_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int ch = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix = &amp;emu-&gt;efx_pcm_mixer[ch];</div><div class='ctx'> 	int change = 0, val;</div><div class='add'>+	unsigned uval;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-	val = ucontrol-&gt;value.integer.value[0] &amp; 0xffff;</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='add'>+	uval = ucontrol-&gt;value.integer.value[0] &amp; 0x1ffff;</div><div class='add'>+	val = uval * 0x8000U / 0xffffU;</div><div class='ctx'> 	if (mix-&gt;attn[0] != val) {</div><div class='ctx'> 		mix-&gt;attn[0] = val;</div><div class='ctx'> 		change = 1;</div><div class='hunk'>@@ -1552,11 +1832,10 @@ static int snd_emu10k1_efx_attn_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix-&gt;epcm-&gt;voices[ch]-&gt;number, mix-&gt;attn[0]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_efx_attn_control =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_efx_attn_control =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,</div><div class='ctx'> 	.iface =        SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1575,7 +1854,7 @@ static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = inl(emu-&gt;port + A_IOCFG) &amp; A_IOCFG_GPOUT0 ? 1 : 0;</div><div class='add'>+		ucontrol-&gt;value.integer.value[0] = inw(emu-&gt;port + A_IOCFG) &amp; A_IOCFG_GPOUT0 ? 1 : 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[0] = inl(emu-&gt;port + HCFG) &amp; HCFG_GPOUT0 ? 1 : 0;</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;invert_shared_spdif)</div><div class='hunk'>@@ -1588,7 +1867,6 @@ static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int reg, val, sw;</div><div class='ctx'> 	int change = 0;</div><div class='hunk'>@@ -1596,17 +1874,17 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	sw = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;invert_shared_spdif)</div><div class='ctx'> 		sw = !sw;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if ( emu-&gt;card_capabilities-&gt;i2c_adc) {</div><div class='ctx'> 		/* Do nothing for Audigy 2 ZS Notebook */</div><div class='ctx'> 	} else if (emu-&gt;audigy) {</div><div class='del'>-		reg = inl(emu-&gt;port + A_IOCFG);</div><div class='add'>+		reg = inw(emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		val = sw ? A_IOCFG_GPOUT0 : 0;</div><div class='ctx'> 		change = (reg &amp; A_IOCFG_GPOUT0) != val;</div><div class='ctx'> 		if (change) {</div><div class='ctx'> 			reg &amp;= ~A_IOCFG_GPOUT0;</div><div class='ctx'> 			reg |= val;</div><div class='del'>-			outl(reg | val, emu-&gt;port + A_IOCFG);</div><div class='add'>+			outw(reg | val, emu-&gt;port + A_IOCFG);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	reg = inl(emu-&gt;port + HCFG);</div><div class='hunk'>@@ -1617,11 +1895,10 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		reg |= val;</div><div class='ctx'> 		outl(reg | val, emu-&gt;port + HCFG);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_shared_spdif __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_shared_spdif =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"SB Live Analog/Digital Output Jack",</div><div class='hunk'>@@ -1630,7 +1907,7 @@ static struct snd_kcontrol_new snd_emu10k1_shared_spdif __devinitdata =</div><div class='ctx'> 	.put =		snd_emu10k1_shared_spdif_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_audigy_shared_spdif __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_audigy_shared_spdif =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Audigy Analog/Digital Output Jack",</div><div class='hunk'>@@ -1668,10 +1945,10 @@ static int snd_audigy_capture_boost_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return snd_ac97_update(emu-&gt;ac97, AC97_REC_GAIN, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_audigy_capture_boost __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_audigy_capture_boost =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name =		"Analog Capture Boost",</div><div class='add'>+	.name =		"Mic Extra Boost",</div><div class='ctx'> 	.info =		snd_audigy_capture_boost_info,</div><div class='ctx'> 	.get =		snd_audigy_capture_boost_get,</div><div class='ctx'> 	.put =		snd_audigy_capture_boost_put</div><div class='hunk'>@@ -1692,45 +1969,34 @@ static int remove_ctl(struct snd_card *card, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ctl_elem_id id;</div><div class='ctx'> 	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	strcpy(id.name, name);</div><div class='add'>+	strscpy(id.name, name);</div><div class='ctx'> 	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='ctx'> 	return snd_ctl_remove_id(card, &amp;id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol *ctl_find(struct snd_card *card, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct snd_ctl_elem_id sid;</div><div class='del'>-	memset(&amp;sid, 0, sizeof(sid));</div><div class='del'>-	strcpy(sid.name, name);</div><div class='del'>-	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	return snd_ctl_find_id(card, &amp;sid);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int rename_ctl(struct snd_card *card, const char *src, const char *dst)</div><div class='ctx'> {</div><div class='del'>-	struct snd_kcontrol *kctl = ctl_find(card, src);</div><div class='add'>+	struct snd_kcontrol *kctl = snd_ctl_find_id_mixer(card, src);</div><div class='ctx'> 	if (kctl) {</div><div class='del'>-		strcpy(kctl-&gt;id.name, dst);</div><div class='add'>+		snd_ctl_rename(card, kctl, dst);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='del'>-				int pcm_device, int multi_device)</div><div class='add'>+int snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='add'>+		      int pcm_device, int multi_device)</div><div class='ctx'> {</div><div class='del'>-	int err, pcm;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	struct snd_card *card = emu-&gt;card;</div><div class='del'>-	char **c;</div><div class='del'>-	static char *emu10k1_remove_ctls[] = {</div><div class='add'>+	const char * const *c;</div><div class='add'>+	static const char * const emu10k1_remove_ctls[] = {</div><div class='ctx'> 		/* no AC97 mono, surround, center/lfe */</div><div class='ctx'> 		"Master Mono Playback Switch",</div><div class='ctx'> 		"Master Mono Playback Volume",</div><div class='ctx'> 		"PCM Out Path &amp; Mute",</div><div class='ctx'> 		"Mono Output Select",</div><div class='del'>-		"Front Playback Switch",</div><div class='del'>-		"Front Playback Volume",</div><div class='ctx'> 		"Surround Playback Switch",</div><div class='ctx'> 		"Surround Playback Volume",</div><div class='ctx'> 		"Center Playback Switch",</div><div class='hunk'>@@ -1739,20 +2005,18 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"LFE Playback Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *emu10k1_rename_ctls[] = {</div><div class='add'>+	static const char * const emu10k1_rename_ctls[] = {</div><div class='ctx'> 		"Surround Digital Playback Volume", "Surround Playback Volume",</div><div class='ctx'> 		"Center Digital Playback Volume", "Center Playback Volume",</div><div class='ctx'> 		"LFE Digital Playback Volume", "LFE Playback Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_remove_ctls[] = {</div><div class='add'>+	static const char * const audigy_remove_ctls[] = {</div><div class='ctx'> 		/* Master/PCM controls on ac97 of Audigy has no effect */</div><div class='ctx'> 		/* On the Audigy2 the AC97 playback is piped into</div><div class='ctx'> 		 * the Philips ADC for 24bit capture */</div><div class='ctx'> 		"PCM Playback Switch",</div><div class='ctx'> 		"PCM Playback Volume",</div><div class='del'>-		"Master Mono Playback Switch",</div><div class='del'>-		"Master Mono Playback Volume",</div><div class='ctx'> 		"Master Playback Switch",</div><div class='ctx'> 		"Master Playback Volume",</div><div class='ctx'> 		"PCM Out Path &amp; Mute",</div><div class='hunk'>@@ -1762,21 +2026,29 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"Capture Switch",</div><div class='ctx'> 		"Capture Volume",</div><div class='ctx'> 		"Mic Select",</div><div class='add'>+		"Headphone Playback Switch",</div><div class='add'>+		"Headphone Playback Volume",</div><div class='add'>+		"3D Control - Center",</div><div class='add'>+		"3D Control - Depth",</div><div class='add'>+		"3D Control - Switch",</div><div class='ctx'> 		"Video Playback Switch",</div><div class='ctx'> 		"Video Playback Volume",</div><div class='ctx'> 		"Mic Playback Switch",</div><div class='ctx'> 		"Mic Playback Volume",</div><div class='add'>+		"External Amplifier",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_rename_ctls[] = {</div><div class='add'>+	static const char * const audigy_rename_ctls[] = {</div><div class='ctx'> 		/* use conventional names */</div><div class='ctx'> 		"Wave Playback Volume", "PCM Playback Volume",</div><div class='ctx'> 		/* "Wave Capture Volume", "PCM Capture Volume", */</div><div class='ctx'> 		"Wave Master Playback Volume", "Master Playback Volume",</div><div class='ctx'> 		"AMic Playback Volume", "Mic Playback Volume",</div><div class='add'>+		"Master Mono Playback Switch", "Phone Output Playback Switch",</div><div class='add'>+		"Master Mono Playback Volume", "Phone Output Playback Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_rename_ctls_i2c_adc[] = {</div><div class='add'>+	static const char * const audigy_rename_ctls_i2c_adc[] = {</div><div class='ctx'> 		//"Analog Mix Capture Volume","OLD Analog Mix Capture Volume",</div><div class='ctx'> 		"Line Capture Volume", "Analog Mix Capture Volume",</div><div class='ctx'> 		"Wave Playback Volume", "OLD PCM Playback Volume",</div><div class='hunk'>@@ -1785,7 +2057,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"CD Capture Volume", "IEC958 Optical Capture Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_remove_ctls_i2c_adc[] = {</div><div class='add'>+	static const char * const audigy_remove_ctls_i2c_adc[] = {</div><div class='ctx'> 		/* On the Audigy2 ZS Notebook</div><div class='ctx'> 		 * Capture via WM8775  */</div><div class='ctx'> 		"Mic Capture Volume",</div><div class='hunk'>@@ -1794,13 +2066,11 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"IEC958 Optical Capture Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_remove_ctls_1361t_adc[] = {</div><div class='add'>+	static const char * const audigy_remove_ctls_1361t_adc[] = {</div><div class='ctx'> 		/* On the Audigy2 the AC97 playback is piped into</div><div class='ctx'> 		 * the Philips ADC for 24bit capture */</div><div class='ctx'> 		"PCM Playback Switch",</div><div class='ctx'> 		"PCM Playback Volume",</div><div class='del'>-		"Master Mono Playback Switch",</div><div class='del'>-		"Master Mono Playback Volume",</div><div class='ctx'> 		"Capture Source",</div><div class='ctx'> 		"Capture Switch",</div><div class='ctx'> 		"Capture Volume",</div><div class='hunk'>@@ -1814,7 +2084,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"Line2 Capture Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='del'>-	static char *audigy_rename_ctls_1361t_adc[] = {</div><div class='add'>+	static const char * const audigy_rename_ctls_1361t_adc[] = {</div><div class='ctx'> 		"Master Playback Switch", "Master Capture Switch",</div><div class='ctx'> 		"Master Playback Volume", "Master Capture Volume",</div><div class='ctx'> 		"Wave Master Playback Volume", "Master Playback Volume",</div><div class='hunk'>@@ -1832,19 +2102,21 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		"Aux Playback Volume", "Aux Capture Volume",</div><div class='ctx'> 		"Video Playback Switch", "Video Capture Switch",</div><div class='ctx'> 		"Video Playback Volume", "Video Capture Volume",</div><div class='del'>-</div><div class='add'>+		"Master Mono Playback Switch", "Phone Output Playback Switch",</div><div class='add'>+		"Master Mono Playback Volume", "Phone Output Playback Volume",</div><div class='ctx'> 		NULL</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ac97_chip) {</div><div class='ctx'> 		struct snd_ac97_bus *pbus;</div><div class='ctx'> 		struct snd_ac97_template ac97;</div><div class='del'>-		static struct snd_ac97_bus_ops ops = {</div><div class='add'>+		static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 			.write = snd_emu10k1_ac97_write,</div><div class='ctx'> 			.read = snd_emu10k1_ac97_read,</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-		if ((err = snd_ac97_bus(emu-&gt;card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+		err = snd_ac97_bus(emu-&gt;card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		pbus-&gt;no_vra = 1; /* we don't need VRA */</div><div class='ctx'> 		</div><div class='hunk'>@@ -1852,11 +2124,14 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 		ac97.private_data = emu;</div><div class='ctx'> 		ac97.private_free = snd_emu10k1_mixer_free_ac97;</div><div class='ctx'> 		ac97.scaps = AC97_SCAP_NO_SPDIF;</div><div class='del'>-		if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;emu-&gt;ac97)) &lt; 0) {</div><div class='add'>+		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;emu-&gt;ac97);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			if (emu-&gt;card_capabilities-&gt;ac97_chip == 1)</div><div class='ctx'> 				return err;</div><div class='del'>-			snd_printd(KERN_INFO "emu10k1: AC97 is optional on this board\n");</div><div class='del'>-			snd_printd(KERN_INFO"          Proceeding without ac97 mixers...\n");</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+				 "AC97 is optional on this board\n");</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+				 "Proceeding without ac97 mixers...\n");</div><div class='ctx'> 			snd_device_free(emu-&gt;card, pbus);</div><div class='ctx'> 			goto no_ac97; /* FIXME: get rid of ugly gotos.. */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1865,6 +2140,9 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 			snd_ac97_write_cache(emu-&gt;ac97, AC97_MASTER, 0x0000);</div><div class='ctx'> 			/* set capture source to mic */</div><div class='ctx'> 			snd_ac97_write_cache(emu-&gt;ac97, AC97_REC_SEL, 0x0000);</div><div class='add'>+			/* set mono output (TAD) to mic */</div><div class='add'>+			snd_ac97_update_bits(emu-&gt;ac97, AC97_GENERAL_PURPOSE,</div><div class='add'>+				0x0200, 0x0200);</div><div class='ctx'> 			if (emu-&gt;card_capabilities-&gt;adc_1361t)</div><div class='ctx'> 				c = audigy_remove_ctls_1361t_adc;</div><div class='ctx'> 			else </div><div class='hunk'>@@ -1879,6 +2157,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 				emu-&gt;rear_ac97 = 1;</div><div class='ctx'> 				snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);</div><div class='ctx'> 				snd_ac97_write_cache(emu-&gt;ac97, AC97_HEADPHONE, 0x0202);</div><div class='add'>+				remove_ctl(card,"Front Playback Volume");</div><div class='add'>+				remove_ctl(card,"Front Playback Switch");</div><div class='ctx'> 			}</div><div class='ctx'> 			/* remove unused AC97 controls */</div><div class='ctx'> 			snd_ac97_write_cache(emu-&gt;ac97, AC97_SURROUND_MASTER, 0x0202);</div><div class='hunk'>@@ -1894,11 +2174,11 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 	} else {</div><div class='ctx'> 	no_ac97:</div><div class='ctx'> 		if (emu-&gt;card_capabilities-&gt;ecard)</div><div class='del'>-			strcpy(emu-&gt;card-&gt;mixername, "EMU APS");</div><div class='add'>+			strscpy(emu-&gt;card-&gt;mixername, "EMU APS");</div><div class='ctx'> 		else if (emu-&gt;audigy)</div><div class='del'>-			strcpy(emu-&gt;card-&gt;mixername, "SB Audigy");</div><div class='add'>+			strscpy(emu-&gt;card-&gt;mixername, "SB Audigy");</div><div class='ctx'> 		else</div><div class='del'>-			strcpy(emu-&gt;card-&gt;mixername, "Emu10k1");</div><div class='add'>+			strscpy(emu-&gt;card-&gt;mixername, "Emu10k1");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;audigy)</div><div class='hunk'>@@ -1913,217 +2193,176 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,</div><div class='ctx'> 	for (; *c; c += 2)</div><div class='ctx'> 		rename_ctl(card, c[0], c[1]);</div><div class='ctx'> </div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */</div><div class='add'>+		remove_ctl(card, "Center Playback Volume");</div><div class='add'>+		remove_ctl(card, "LFE Playback Volume");</div><div class='add'>+		remove_ctl(card, "Wave Center Playback Volume");</div><div class='add'>+		remove_ctl(card, "Wave LFE Playback Volume");</div><div class='add'>+	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;subsystem == 0x20071102) {  /* Audigy 4 Pro */</div><div class='ctx'> 		rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");</div><div class='ctx'> 		rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");</div><div class='ctx'> 		rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume");</div><div class='ctx'> 		rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume");</div><div class='del'>-		remove_ctl(card, "Headphone Playback Switch");</div><div class='del'>-		remove_ctl(card, "Headphone Playback Volume");</div><div class='del'>-		remove_ctl(card, "3D Control - Center");</div><div class='del'>-		remove_ctl(card, "3D Control - Depth");</div><div class='del'>-		remove_ctl(card, "3D Control - Switch");</div><div class='ctx'> 	}</div><div class='del'>-	if ((kctl = emu-&gt;ctl_send_routing = snd_ctl_new1(&amp;snd_emu10k1_send_routing_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_send_routing = snd_ctl_new1(&amp;snd_emu10k1_send_routing_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = pcm_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((kctl = emu-&gt;ctl_send_volume = snd_ctl_new1(&amp;snd_emu10k1_send_volume_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_send_volume = snd_ctl_new1(&amp;snd_emu10k1_send_volume_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = pcm_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((kctl = emu-&gt;ctl_attn = snd_ctl_new1(&amp;snd_emu10k1_attn_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_attn = snd_ctl_new1(&amp;snd_emu10k1_attn_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = pcm_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if ((kctl = emu-&gt;ctl_efx_send_routing = snd_ctl_new1(&amp;snd_emu10k1_efx_send_routing_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_efx_send_routing = snd_ctl_new1(&amp;snd_emu10k1_efx_send_routing_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = multi_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	</div><div class='del'>-	if ((kctl = emu-&gt;ctl_efx_send_volume = snd_ctl_new1(&amp;snd_emu10k1_efx_send_volume_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_efx_send_volume = snd_ctl_new1(&amp;snd_emu10k1_efx_send_volume_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = multi_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	</div><div class='del'>-	if ((kctl = emu-&gt;ctl_efx_attn = snd_ctl_new1(&amp;snd_emu10k1_efx_attn_control, emu)) == NULL)</div><div class='add'>+	kctl = emu-&gt;ctl_efx_attn = snd_ctl_new1(&amp;snd_emu10k1_efx_attn_control, emu);</div><div class='add'>+	if (!kctl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	kctl-&gt;id.device = multi_device;</div><div class='del'>-	if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+	err = snd_ctl_add(card, kctl);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* initialize the routing and volume table for each pcm playback stream */</div><div class='del'>-	for (pcm = 0; pcm &lt; 32; pcm++) {</div><div class='del'>-		struct snd_emu10k1_pcm_mixer *mix;</div><div class='del'>-		int v;</div><div class='del'>-		</div><div class='del'>-		mix = &amp;emu-&gt;pcm_mixer[pcm];</div><div class='del'>-		mix-&gt;epcm = NULL;</div><div class='del'>-</div><div class='del'>-		for (v = 0; v &lt; 4; v++)</div><div class='del'>-			mix-&gt;send_routing[0][v] = </div><div class='del'>-				mix-&gt;send_routing[1][v] = </div><div class='del'>-				mix-&gt;send_routing[2][v] = v;</div><div class='del'>-		</div><div class='del'>-		memset(&amp;mix-&gt;send_volume, 0, sizeof(mix-&gt;send_volume));</div><div class='del'>-		mix-&gt;send_volume[0][0] = mix-&gt;send_volume[0][1] =</div><div class='del'>-		mix-&gt;send_volume[1][0] = mix-&gt;send_volume[2][1] = 255;</div><div class='del'>-		</div><div class='del'>-		mix-&gt;attn[0] = mix-&gt;attn[1] = mix-&gt;attn[2] = 0xffff;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* initialize the routing and volume table for the multichannel playback stream */</div><div class='del'>-	for (pcm = 0; pcm &lt; NUM_EFX_PLAYBACK; pcm++) {</div><div class='del'>-		struct snd_emu10k1_pcm_mixer *mix;</div><div class='del'>-		int v;</div><div class='del'>-		</div><div class='del'>-		mix = &amp;emu-&gt;efx_pcm_mixer[pcm];</div><div class='del'>-		mix-&gt;epcm = NULL;</div><div class='del'>-</div><div class='del'>-		mix-&gt;send_routing[0][0] = pcm;</div><div class='del'>-		mix-&gt;send_routing[0][1] = (pcm == 0) ? 1 : 0;</div><div class='del'>-		for (v = 0; v &lt; 2; v++)</div><div class='del'>-			mix-&gt;send_routing[0][2+v] = 13+v;</div><div class='del'>-		if (emu-&gt;audigy)</div><div class='del'>-			for (v = 0; v &lt; 4; v++)</div><div class='del'>-				mix-&gt;send_routing[0][4+v] = 60+v;</div><div class='del'>-		</div><div class='del'>-		memset(&amp;mix-&gt;send_volume, 0, sizeof(mix-&gt;send_volume));</div><div class='del'>-		mix-&gt;send_volume[0][0]  = 255;</div><div class='del'>-		</div><div class='del'>-		mix-&gt;attn[0] = 0xffff;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (! emu-&gt;card_capabilities-&gt;ecard) { /* FIXME: APS has these controls? */</div><div class='add'>+	if (!emu-&gt;card_capabilities-&gt;ecard &amp;&amp; !emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='ctx'> 		/* sb live! and audigy */</div><div class='del'>-		if ((kctl = snd_ctl_new1(&amp;snd_emu10k1_spdif_mask_control, emu)) == NULL)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_emu10k1_spdif_mask_control, emu);</div><div class='add'>+		if (!kctl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		if (!emu-&gt;audigy)</div><div class='ctx'> 			kctl-&gt;id.device = emu-&gt;pcm_efx-&gt;device;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		if ((kctl = snd_ctl_new1(&amp;snd_emu10k1_spdif_control, emu)) == NULL)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_emu10k1_spdif_control, emu);</div><div class='add'>+		if (!kctl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		if (!emu-&gt;audigy)</div><div class='ctx'> 			kctl-&gt;id.device = emu-&gt;pcm_efx-&gt;device;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='ctx'> 		;  /* Disable the snd_audigy_spdif_shared_spdif */</div><div class='ctx'> 	} else if (emu-&gt;audigy) {</div><div class='del'>-		if ((kctl = snd_ctl_new1(&amp;snd_audigy_shared_spdif, emu)) == NULL)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_audigy_shared_spdif, emu);</div><div class='add'>+		if (!kctl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> #if 0</div><div class='del'>-		if ((kctl = snd_ctl_new1(&amp;snd_audigy_spdif_output_rate, emu)) == NULL)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_audigy_spdif_output_rate, emu);</div><div class='add'>+		if (!kctl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (! emu-&gt;card_capabilities-&gt;ecard) {</div><div class='ctx'> 		/* sb live! */</div><div class='del'>-		if ((kctl = snd_ctl_new1(&amp;snd_emu10k1_shared_spdif, emu)) == NULL)</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_emu10k1_shared_spdif, emu);</div><div class='add'>+		if (!kctl)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)))</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca0151_chip) { /* P16V */</div><div class='del'>-		if ((err = snd_p16v_mixer(emu)))</div><div class='add'>+		err = snd_p16v_mixer(emu);</div><div class='add'>+		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616) {</div><div class='del'>-		/* 1616(m) cardbus */</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1616_output_enum_ctls); i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1616_output_enum_ctls[i],</div><div class='del'>-					     emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_input_enum_ctls[i],</div><div class='del'>-					     emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_adc_pads) - 2; i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_adc_pads[i], emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_dac_pads) - 2; i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_dac_pads[i], emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+		unsigned i, emu_idx = emu1010_idx(emu);</div><div class='add'>+		const struct snd_emu1010_routing_info *emu_ri =</div><div class='add'>+			&amp;emu1010_routing_info[emu_idx];</div><div class='add'>+		const struct snd_emu1010_pads_info *emu_pi = &amp;emu1010_pads_info[emu_idx];</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; emu_ri-&gt;n_ins; i++)</div><div class='add'>+			emu-&gt;emu1010.input_source[i] =</div><div class='add'>+				emu1010_map_source(emu_ri, emu_ri-&gt;in_dflts[i]);</div><div class='add'>+		for (i = 0; i &lt; emu_ri-&gt;n_outs; i++)</div><div class='add'>+			emu-&gt;emu1010.output_source[i] =</div><div class='add'>+				emu1010_map_source(emu_ri, emu_ri-&gt;out_dflts[i]);</div><div class='add'>+		scoped_guard(snd_emu1010_fpga_lock, emu) {</div><div class='add'>+			snd_emu1010_apply_sources(emu);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		kctl = emu-&gt;ctl_clock_source = snd_ctl_new1(&amp;snd_emu1010_clock_source, emu);</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		err = snd_ctl_add(card,</div><div class='del'>-			snd_ctl_new1(&amp;snd_emu1010_internal_clock, emu));</div><div class='add'>+			snd_ctl_new1(&amp;snd_emu1010_clock_fallback, emu));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-	} else if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='del'>-		/* all other e-mu cards for now */</div><div class='del'>-		int i;</div><div class='add'>+		err = add_ctls(emu, &amp;emu1010_adc_pads_ctl,</div><div class='add'>+			       emu_pi-&gt;adc_ctls, emu_pi-&gt;n_adc_ctls);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		err = add_ctls(emu, &amp;emu1010_dac_pads_ctl,</div><div class='add'>+			       emu_pi-&gt;dac_ctls, emu_pi-&gt;n_dac_ctls);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_output_enum_ctls); i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_output_enum_ctls[i],</div><div class='del'>-					     emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {</div><div class='del'>-			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_input_enum_ctls[i],</div><div class='del'>-					     emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_adc_pads); i++) {</div><div class='add'>+		if (!emu-&gt;card_capabilities-&gt;no_adat) {</div><div class='ctx'> 			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_adc_pads[i], emu));</div><div class='add'>+				snd_ctl_new1(&amp;snd_emu1010_optical_out, emu));</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_emu1010_dac_pads); i++) {</div><div class='ctx'> 			err = snd_ctl_add(card,</div><div class='del'>-				snd_ctl_new1(&amp;snd_emu1010_dac_pads[i], emu));</div><div class='add'>+				snd_ctl_new1(&amp;snd_emu1010_optical_in, emu));</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='del'>-		err = snd_ctl_add(card,</div><div class='del'>-			snd_ctl_new1(&amp;snd_emu1010_internal_clock, emu));</div><div class='add'>+</div><div class='add'>+		err = add_emu1010_source_mixers(emu);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ( emu-&gt;card_capabilities-&gt;i2c_adc) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_audigy_i2c_capture_source, emu));</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(snd_audigy_i2c_volume_ctls); i++) {</div><div class='del'>-			err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_audigy_i2c_volume_ctls[i], emu));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='add'>+		err = add_ctls(emu, &amp;i2c_volume_ctl,</div><div class='add'>+			       snd_audigy_i2c_volume_ctls,</div><div class='add'>+			       ARRAY_SIZE(snd_audigy_i2c_volume_ctls));</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 		</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ac97_chip &amp;&amp; emu-&gt;audigy) {</div><div class='head'>diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c<br/>index bab564824efe..c102a3599225 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emumpu401.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emumpu401.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emumpu401.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emumpu401.c</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Routines for control of EMU10K1 MPU-401 in UART mode</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -64,7 +49,9 @@ static void mpu401_clear_rx(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mp</div><div class='ctx'> 		mpu401_read_data(emu, mpu);</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (timeout &lt;= 0)</div><div class='del'>-		snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"cmd: clear rx timeout (status = 0x%x)\n",</div><div class='add'>+			mpu401_read_stat(emu, mpu));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -81,28 +68,28 @@ static void do_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, struct snd_emu10k</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;input_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; mpu401_input_avail(emu, midi)) {</div><div class='del'>-		if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)) {</div><div class='del'>-			mpu401_clear_rx(emu, midi);</div><div class='del'>-		} else {</div><div class='del'>-			byte = mpu401_read_data(emu, midi);</div><div class='del'>-			if (midi-&gt;substream_input)</div><div class='del'>-				snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;input_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_rx) &amp;&amp; mpu401_input_avail(emu, midi)) {</div><div class='add'>+			if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)) {</div><div class='add'>+				mpu401_clear_rx(emu, midi);</div><div class='add'>+			} else {</div><div class='add'>+				byte = mpu401_read_data(emu, midi);</div><div class='add'>+				if (midi-&gt;substream_input)</div><div class='add'>+					snd_rawmidi_receive(midi-&gt;substream_input, &amp;byte, 1);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;input_lock);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;midi-&gt;output_lock);</div><div class='del'>-	if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; mpu401_output_ready(emu, midi)) {</div><div class='del'>-		if (midi-&gt;substream_output &amp;&amp;</div><div class='del'>-		    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='del'>-			mpu401_write_data(emu, midi, byte);</div><div class='del'>-		} else {</div><div class='del'>-			snd_emu10k1_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+	scoped_guard(spinlock, &amp;midi-&gt;output_lock) {</div><div class='add'>+		if ((status &amp; midi-&gt;ipr_tx) &amp;&amp; mpu401_output_ready(emu, midi)) {</div><div class='add'>+			if (midi-&gt;substream_output &amp;&amp;</div><div class='add'>+			    snd_rawmidi_transmit(midi-&gt;substream_output, &amp;byte, 1) == 1) {</div><div class='add'>+				mpu401_write_data(emu, midi, byte);</div><div class='add'>+			} else {</div><div class='add'>+				snd_emu10k1_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;midi-&gt;output_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, unsigned int status)</div><div class='hunk'>@@ -117,31 +104,31 @@ static void snd_emu10k1_midi_interrupt2(struct snd_emu10k1 *emu, unsigned int st</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int timeout, ok;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;input_lock, flags);</div><div class='del'>-	mpu401_write_data(emu, midi, 0x00);</div><div class='del'>-	/* mpu401_clear_rx(emu, midi); */</div><div class='del'>-</div><div class='del'>-	mpu401_write_cmd(emu, midi, cmd);</div><div class='del'>-	if (ack) {</div><div class='del'>-		ok = 0;</div><div class='del'>-		timeout = 10000;</div><div class='del'>-		while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='del'>-			if (mpu401_input_avail(emu, midi)) {</div><div class='del'>-				if (mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='del'>-					ok = 1;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;midi-&gt;input_lock) {</div><div class='add'>+		mpu401_write_data(emu, midi, 0x00);</div><div class='add'>+		/* mpu401_clear_rx(emu, midi); */</div><div class='add'>+</div><div class='add'>+		mpu401_write_cmd(emu, midi, cmd);</div><div class='add'>+		if (ack) {</div><div class='add'>+			ok = 0;</div><div class='add'>+			timeout = 10000;</div><div class='add'>+			while (!ok &amp;&amp; timeout-- &gt; 0) {</div><div class='add'>+				if (mpu401_input_avail(emu, midi)) {</div><div class='add'>+					if (mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+						ok = 1;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		if (!ok &amp;&amp; mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+			if (!ok &amp;&amp; mpu401_read_data(emu, midi) == MPU401_ACK)</div><div class='add'>+				ok = 1;</div><div class='add'>+		} else {</div><div class='ctx'> 			ok = 1;</div><div class='del'>-	} else {</div><div class='del'>-		ok = 1;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;midi-&gt;input_lock, flags);</div><div class='ctx'> 	if (!ok) {</div><div class='del'>-		snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",</div><div class='ctx'> 			   cmd, emu-&gt;port,</div><div class='ctx'> 			   mpu401_read_stat(emu, midi),</div><div class='ctx'> 			   mpu401_read_data(emu, midi));</div><div class='hunk'>@@ -154,100 +141,78 @@ static int snd_emu10k1_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= EMU10K1_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= EMU10K1_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error_out:</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	midi-&gt;midi_mode |= EMU10K1_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = substream;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='del'>-			goto error_out;</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;midi-&gt;open_lock) {</div><div class='add'>+		midi-&gt;midi_mode |= EMU10K1_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = substream;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='add'>+	if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))</div><div class='add'>+		return -EIO;</div><div class='add'>+	if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-error_out:</div><div class='del'>-	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	snd_emu10k1_intr_disable(emu, midi-&gt;rx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~EMU10K1_MIDI_MODE_INPUT;</div><div class='del'>-	midi-&gt;substream_input = NULL;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;midi-&gt;open_lock) {</div><div class='add'>+		snd_emu10k1_intr_disable(emu, midi-&gt;rx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~EMU10K1_MIDI_MODE_INPUT;</div><div class='add'>+		midi-&gt;substream_input = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_midi_output_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	spin_lock_irqsave(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-	snd_emu10k1_intr_disable(emu, midi-&gt;tx_enable);</div><div class='del'>-	midi-&gt;midi_mode &amp;= ~EMU10K1_MIDI_MODE_OUTPUT;</div><div class='del'>-	midi-&gt;substream_output = NULL;</div><div class='del'>-	if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='del'>-		err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;open_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;midi-&gt;open_lock) {</div><div class='add'>+		snd_emu10k1_intr_disable(emu, midi-&gt;tx_enable);</div><div class='add'>+		midi-&gt;midi_mode &amp;= ~EMU10K1_MIDI_MODE_OUTPUT;</div><div class='add'>+		midi-&gt;substream_output = NULL;</div><div class='add'>+		if (midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_INPUT)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return err;</div><div class='add'>+	return snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='hunk'>@@ -268,7 +233,6 @@ static void snd_emu10k1_midi_output_trigger(struct snd_rawmidi_substream *substr</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = midi-&gt;emu;</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='hunk'>@@ -279,22 +243,21 @@ static void snd_emu10k1_midi_output_trigger(struct snd_rawmidi_substream *substr</div><div class='ctx'> 		unsigned char byte;</div><div class='ctx'> 	</div><div class='ctx'> 		/* try to send some amount of bytes here before interrupts */</div><div class='del'>-		spin_lock_irqsave(&amp;midi-&gt;output_lock, flags);</div><div class='del'>-		while (max &gt; 0) {</div><div class='del'>-			if (mpu401_output_ready(emu, midi)) {</div><div class='del'>-				if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT) ||</div><div class='del'>-				    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='del'>-					/* no more data */</div><div class='del'>-					spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='del'>-					return;</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;midi-&gt;output_lock) {</div><div class='add'>+			while (max &gt; 0) {</div><div class='add'>+				if (mpu401_output_ready(emu, midi)) {</div><div class='add'>+					if (!(midi-&gt;midi_mode &amp; EMU10K1_MIDI_MODE_OUTPUT) ||</div><div class='add'>+					    snd_rawmidi_transmit(substream, &amp;byte, 1) != 1) {</div><div class='add'>+						/* no more data */</div><div class='add'>+						return;</div><div class='add'>+					}</div><div class='add'>+					mpu401_write_data(emu, midi, byte);</div><div class='add'>+					max--;</div><div class='add'>+				} else {</div><div class='add'>+					break;</div><div class='ctx'> 				}</div><div class='del'>-				mpu401_write_data(emu, midi, byte);</div><div class='del'>-				max--;</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;midi-&gt;output_lock, flags);</div><div class='ctx'> 		snd_emu10k1_intr_enable(emu, midi-&gt;tx_enable);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_emu10k1_intr_disable(emu, midi-&gt;tx_enable);</div><div class='hunk'>@@ -305,14 +268,14 @@ static void snd_emu10k1_midi_output_trigger(struct snd_rawmidi_substream *substr</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_emu10k1_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_emu10k1_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_emu10k1_midi_output_open,</div><div class='ctx'> 	.close =	snd_emu10k1_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_emu10k1_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_emu10k1_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_emu10k1_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_emu10k1_midi_input_open,</div><div class='ctx'> 	.close =	snd_emu10k1_midi_input_close,</div><div class='hunk'>@@ -326,18 +289,19 @@ static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi)</div><div class='ctx'> 	midi-&gt;rmidi = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit emu10k1_midi_init(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, int device, char *name)</div><div class='add'>+static int emu10k1_midi_init(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, int device, char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_rawmidi_new(emu-&gt;card, name, device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(emu-&gt;card, name, device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	midi-&gt;emu = emu;</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;open_lock);</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;input_lock);</div><div class='ctx'> 	spin_lock_init(&amp;midi-&gt;output_lock);</div><div class='del'>-	strcpy(rmidi-&gt;name, name);</div><div class='add'>+	strscpy(rmidi-&gt;name, name);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_emu10k1_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_emu10k1_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='hunk'>@@ -349,12 +313,13 @@ static int __devinit emu10k1_midi_init(struct snd_emu10k1 *emu, struct snd_emu10</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_midi(struct snd_emu10k1 *emu)</div><div class='add'>+int snd_emu10k1_midi(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1_midi *midi = &amp;emu-&gt;midi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)")) &lt; 0)</div><div class='add'>+	err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;tx_enable = INTE_MIDITXENABLE;</div><div class='hunk'>@@ -366,13 +331,14 @@ int __devinit snd_emu10k1_midi(struct snd_emu10k1 *emu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_audigy_midi(struct snd_emu10k1 *emu)</div><div class='add'>+int snd_emu10k1_audigy_midi(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1_midi *midi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	midi = &amp;emu-&gt;midi;</div><div class='del'>-	if ((err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)")) &lt; 0)</div><div class='add'>+	err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;tx_enable = INTE_MIDITXENABLE;</div><div class='hunk'>@@ -383,7 +349,8 @@ int __devinit snd_emu10k1_audigy_midi(struct snd_emu10k1 *emu)</div><div class='ctx'> 	midi-&gt;interrupt = snd_emu10k1_midi_interrupt;</div><div class='ctx'> </div><div class='ctx'> 	midi = &amp;emu-&gt;midi2;</div><div class='del'>-	if ((err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2")) &lt; 0)</div><div class='add'>+	err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	midi-&gt;tx_enable = INTE_A_MIDITXENABLE2;</div><div class='head'>diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c<br/>index 622bace148e3..071c75ba81fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emupcm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emupcm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emupcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emupcm.c</a></div><div class='hunk'>@@ -1,29 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *                   Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for control of EMU10K1 chips / PCM routines</div><div class='del'>- *  Multichannel PCM support Copyright (c) Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips / PCM routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -39,12 +22,14 @@ static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> </div><div class='del'>-	if ((epcm = voice-&gt;epcm) == NULL)</div><div class='add'>+	epcm = voice-&gt;epcm;</div><div class='add'>+	if (!epcm)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (epcm-&gt;substream == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",</div><div class='ctx'> 			epcm-&gt;substream-&gt;runtime-&gt;hw-&gt;pointer(emu, epcm-&gt;substream),</div><div class='ctx'> 			snd_pcm_lib_period_bytes(epcm-&gt;substream),</div><div class='ctx'> 			snd_pcm_lib_buffer_bytes(epcm-&gt;substream));</div><div class='hunk'>@@ -88,82 +73,64 @@ static void snd_emu10k1_pcm_efx_interrupt(struct snd_emu10k1 *emu,</div><div class='ctx'> 	snd_pcm_period_elapsed(emu-&gt;pcm_capture_efx_substream);</div><div class='ctx'> }	 </div><div class='ctx'> </div><div class='del'>-static snd_pcm_uframes_t snd_emu10k1_efx_playback_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+static void snd_emu10k1_pcm_free_voices(struct snd_emu10k1_pcm *epcm)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	unsigned int ptr;</div><div class='del'>-</div><div class='del'>-	if (!epcm-&gt;running)</div><div class='del'>-		return 0;</div><div class='del'>-	ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm-&gt;voices[0]-&gt;number) &amp; 0x00ffffff;</div><div class='del'>-	ptr += runtime-&gt;buffer_size;</div><div class='del'>-	ptr -= epcm-&gt;ccca_start_addr;</div><div class='del'>-	ptr %= runtime-&gt;buffer_size;</div><div class='del'>-</div><div class='del'>-	return ptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voices)</div><div class='del'>-{</div><div class='del'>-	int err, i;</div><div class='del'>-</div><div class='del'>-	if (epcm-&gt;voices[1] != NULL &amp;&amp; voices &lt; 2) {</div><div class='del'>-		snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[1]);</div><div class='del'>-		epcm-&gt;voices[1] = NULL;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; voices; i++) {</div><div class='del'>-		if (epcm-&gt;voices[i] == NULL)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == voices)</div><div class='del'>-		return 0; /* already allocated */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(epcm-&gt;voices); i++) {</div><div class='add'>+	for (unsigned i = 0; i &lt; ARRAY_SIZE(epcm-&gt;voices); i++) {</div><div class='ctx'> 		if (epcm-&gt;voices[i]) {</div><div class='ctx'> 			snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[i]);</div><div class='ctx'> 			epcm-&gt;voices[i] = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm *epcm,</div><div class='add'>+					 int type, int count, int channels)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	snd_emu10k1_pcm_free_voices(epcm);</div><div class='add'>+</div><div class='ctx'> 	err = snd_emu10k1_voice_alloc(epcm-&gt;emu,</div><div class='del'>-				      epcm-&gt;type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,</div><div class='del'>-				      voices,</div><div class='del'>-				      &amp;epcm-&gt;voices[0]);</div><div class='del'>-	</div><div class='add'>+				      type, count, channels,</div><div class='add'>+				      epcm, &amp;epcm-&gt;voices[0]);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	epcm-&gt;voices[0]-&gt;epcm = epcm;</div><div class='del'>-	if (voices &gt; 1) {</div><div class='del'>-		for (i = 1; i &lt; voices; i++) {</div><div class='del'>-			epcm-&gt;voices[i] = &amp;epcm-&gt;emu-&gt;voices[epcm-&gt;voices[0]-&gt;number + i];</div><div class='del'>-			epcm-&gt;voices[i]-&gt;epcm = epcm;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (epcm-&gt;extra == NULL) {</div><div class='add'>+		// The hardware supports only (half-)loop interrupts, so to support an</div><div class='add'>+		// arbitrary number of periods per buffer, we use an extra voice with a</div><div class='add'>+		// period-sized loop as the interrupt source. Additionally, the interrupt</div><div class='add'>+		// timing of the hardware is "suboptimal" and needs some compensation.</div><div class='ctx'> 		err = snd_emu10k1_voice_alloc(epcm-&gt;emu,</div><div class='del'>-					      epcm-&gt;type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,</div><div class='del'>-					      1,</div><div class='del'>-					      &amp;epcm-&gt;extra);</div><div class='add'>+					      type + 1, 1, 1,</div><div class='add'>+					      epcm, &amp;epcm-&gt;extra);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='ctx'> 			/*</div><div class='del'>-			printk(KERN_DEBUG "pcm_channel_alloc: "</div><div class='add'>+			dev_dbg(emu-&gt;card-&gt;dev, "pcm_channel_alloc: "</div><div class='ctx'> 			       "failed extra: voices=%d, frame=%d\n",</div><div class='ctx'> 			       voices, frame);</div><div class='ctx'> 			*/</div><div class='del'>-			for (i = 0; i &lt; voices; i++) {</div><div class='del'>-				snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[i]);</div><div class='del'>-				epcm-&gt;voices[i] = NULL;</div><div class='del'>-			}</div><div class='add'>+			snd_emu10k1_pcm_free_voices(epcm);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='del'>-		epcm-&gt;extra-&gt;epcm = epcm;</div><div class='ctx'> 		epcm-&gt;extra-&gt;interrupt = snd_emu10k1_pcm_interrupt;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int capture_period_sizes[31] = {</div><div class='add'>+// Primes 2-7 and 2^n multiples thereof, up to 16.</div><div class='add'>+static const unsigned int efx_capture_channels[] = {</div><div class='add'>+	1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_efx_capture_channels = {</div><div class='add'>+	.count = ARRAY_SIZE(efx_capture_channels),</div><div class='add'>+	.list = efx_capture_channels,</div><div class='add'>+	.mask = 0</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const unsigned int capture_buffer_sizes[31] = {</div><div class='ctx'> 	384,	448,	512,	640,</div><div class='ctx'> 	384*2,	448*2,	512*2,	640*2,</div><div class='ctx'> 	384*4,	448*4,	512*4,	640*4,</div><div class='hunk'>@@ -174,19 +141,9 @@ static unsigned int capture_period_sizes[31] = {</div><div class='ctx'> 	384*128,448*128,512*128</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_capture_period_sizes = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_capture_buffer_sizes = {</div><div class='ctx'> 	.count = 31,</div><div class='del'>-	.list = capture_period_sizes,</div><div class='del'>-	.mask = 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int capture_rates[8] = {</div><div class='del'>-	8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_capture_rates = {</div><div class='del'>-	.count = 8,</div><div class='del'>-	.list = capture_rates,</div><div class='add'>+	.list = capture_buffer_sizes,</div><div class='ctx'> 	.mask = 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -212,7 +169,7 @@ static unsigned int snd_emu10k1_audigy_capture_rate_reg(unsigned int rate)</div><div class='ctx'> 	switch (rate) {</div><div class='ctx'> 	case 8000:	return A_ADCCR_SAMPLERATE_8;</div><div class='ctx'> 	case 11025:	return A_ADCCR_SAMPLERATE_11;</div><div class='del'>-	case 12000:	return A_ADCCR_SAMPLERATE_12; /* really supported? */</div><div class='add'>+	case 12000:	return A_ADCCR_SAMPLERATE_12;</div><div class='ctx'> 	case 16000:	return ADCCR_SAMPLERATE_16;</div><div class='ctx'> 	case 22050:	return ADCCR_SAMPLERATE_22;</div><div class='ctx'> 	case 24000:	return ADCCR_SAMPLERATE_24;</div><div class='hunk'>@@ -225,6 +182,33 @@ static unsigned int snd_emu10k1_audigy_capture_rate_reg(unsigned int rate)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void snd_emu10k1_constrain_capture_rates(struct snd_emu10k1 *emu,</div><div class='add'>+						struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model &amp;&amp;</div><div class='add'>+	    emu-&gt;emu1010.word_clock == 44100) {</div><div class='add'>+		runtime-&gt;hw.rates = SNDRV_PCM_RATE_11025 | \</div><div class='add'>+				    SNDRV_PCM_RATE_22050 | \</div><div class='add'>+				    SNDRV_PCM_RATE_44100;</div><div class='add'>+		runtime-&gt;hw.rate_min = 11025;</div><div class='add'>+		runtime-&gt;hw.rate_max = 44100;</div><div class='add'>+	} else if (emu-&gt;audigy) {</div><div class='add'>+		runtime-&gt;hw.rates = SNDRV_PCM_RATE_8000_48000 |</div><div class='add'>+				    SNDRV_PCM_RATE_12000 |</div><div class='add'>+				    SNDRV_PCM_RATE_24000;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu1010_constrain_efx_rate(struct snd_emu10k1 *emu,</div><div class='add'>+					   struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int rate;</div><div class='add'>+</div><div class='add'>+	rate = emu-&gt;emu1010.word_clock;</div><div class='add'>+	runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = rate;</div><div class='add'>+	runtime-&gt;hw.rates = snd_pcm_rate_to_rate_bit(rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static unsigned int emu10k1_calc_pitch_target(unsigned int rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int pitch_target;</div><div class='hunk'>@@ -261,147 +245,104 @@ static unsigned int emu10k1_select_interprom(unsigned int pitch_target)</div><div class='ctx'> 		return CCCA_INTERPROM_2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * calculate cache invalidate size </div><div class='del'>- *</div><div class='del'>- * stereo: channel is stereo</div><div class='del'>- * w_16: using 16bit samples</div><div class='del'>- *</div><div class='del'>- * returns: cache invalidate size in samples</div><div class='del'>- */</div><div class='del'>-static inline int emu10k1_ccis(int stereo, int w_16)</div><div class='add'>+static u16 emu10k1_send_target_from_amount(u8 amount)</div><div class='ctx'> {</div><div class='del'>-	if (w_16) {</div><div class='del'>-		return stereo ? 24 : 26;</div><div class='del'>-	} else {</div><div class='del'>-		return stereo ? 24*2 : 26*2;</div><div class='del'>-	}</div><div class='add'>+	static const u8 shifts[8] = { 4, 4, 5, 6, 7, 8, 9, 10 };</div><div class='add'>+	static const u16 offsets[8] = { 0, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000 };</div><div class='add'>+	u8 exp;</div><div class='add'>+</div><div class='add'>+	if (amount == 0xff)</div><div class='add'>+		return 0xffff;</div><div class='add'>+	exp = amount &gt;&gt; 5;</div><div class='add'>+	return ((amount &amp; 0x1f) &lt;&lt; shifts[exp]) + offsets[exp];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu,</div><div class='del'>-				       int master, int extra,</div><div class='ctx'> 				       struct snd_emu10k1_voice *evoice,</div><div class='add'>+				       bool w_16, bool stereo,</div><div class='ctx'> 				       unsigned int start_addr,</div><div class='ctx'> 				       unsigned int end_addr,</div><div class='del'>-				       struct snd_emu10k1_pcm_mixer *mix)</div><div class='add'>+				       const unsigned char *send_routing,</div><div class='add'>+				       const unsigned char *send_amount)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream = evoice-&gt;epcm-&gt;substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned int silent_page, tmp;</div><div class='del'>-	int voice, stereo, w_16;</div><div class='del'>-	unsigned char attn, send_amount[8];</div><div class='del'>-	unsigned char send_routing[8];</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int pitch_target;</div><div class='del'>-	unsigned int ccis;</div><div class='add'>+	unsigned int silent_page;</div><div class='add'>+	int voice;</div><div class='ctx'> </div><div class='ctx'> 	voice = evoice-&gt;number;</div><div class='del'>-	stereo = runtime-&gt;channels == 2;</div><div class='del'>-	w_16 = snd_pcm_format_width(runtime-&gt;format) == 16;</div><div class='ctx'> </div><div class='del'>-	if (!extra &amp;&amp; stereo) {</div><div class='del'>-		start_addr &gt;&gt;= 1;</div><div class='del'>-		end_addr &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-	if (w_16) {</div><div class='del'>-		start_addr &gt;&gt;= 1;</div><div class='del'>-		end_addr &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* volume parameters */</div><div class='del'>-	if (extra) {</div><div class='del'>-		attn = 0;</div><div class='del'>-		memset(send_routing, 0, sizeof(send_routing));</div><div class='del'>-		send_routing[0] = 0;</div><div class='del'>-		send_routing[1] = 1;</div><div class='del'>-		send_routing[2] = 2;</div><div class='del'>-		send_routing[3] = 3;</div><div class='del'>-		memset(send_amount, 0, sizeof(send_amount));</div><div class='add'>+	silent_page = ((unsigned int)emu-&gt;silent_page.addr &lt;&lt; emu-&gt;address_mode) |</div><div class='add'>+		      (emu-&gt;address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, voice,</div><div class='add'>+		// Not really necessary for the slave, but it doesn't hurt</div><div class='add'>+		CPF, stereo ? CPF_STEREO_MASK : 0,</div><div class='add'>+		// Assumption that PT is already 0 so no harm overwriting</div><div class='add'>+		PTRX, (send_amount[0] &lt;&lt; 8) | send_amount[1],</div><div class='add'>+		// Stereo slaves don't need to have the addresses set, but it doesn't hurt</div><div class='add'>+		DSL, end_addr | (send_amount[3] &lt;&lt; 24),</div><div class='add'>+		PSST, start_addr | (send_amount[2] &lt;&lt; 24),</div><div class='add'>+		CCCA, emu10k1_select_interprom(evoice-&gt;epcm-&gt;pitch_target) |</div><div class='add'>+		      (w_16 ? 0 : CCCA_8BITSELECT),</div><div class='add'>+		// Clear filter delay memory</div><div class='add'>+		Z1, 0,</div><div class='add'>+		Z2, 0,</div><div class='add'>+		// Invalidate maps</div><div class='add'>+		MAPA, silent_page,</div><div class='add'>+		MAPB, silent_page,</div><div class='add'>+		// Disable filter (in conjunction with CCCA_RESONANCE == 0)</div><div class='add'>+		VTFT, VTFT_FILTERTARGET_MASK,</div><div class='add'>+		CVCF, CVCF_CURRENTFILTER_MASK,</div><div class='add'>+		REGLIST_END);</div><div class='add'>+	// Setup routing</div><div class='add'>+	if (emu-&gt;audigy) {</div><div class='add'>+		snd_emu10k1_ptr_write_multiple(emu, voice,</div><div class='add'>+			A_FXRT1, snd_emu10k1_compose_audigy_fxrt1(send_routing),</div><div class='add'>+			A_FXRT2, snd_emu10k1_compose_audigy_fxrt2(send_routing),</div><div class='add'>+			A_SENDAMOUNTS, snd_emu10k1_compose_audigy_sendamounts(send_amount),</div><div class='add'>+			REGLIST_END);</div><div class='add'>+		for (int i = 0; i &lt; 4; i++) {</div><div class='add'>+			u32 aml = emu10k1_send_target_from_amount(send_amount[2 * i]);</div><div class='add'>+			u32 amh = emu10k1_send_target_from_amount(send_amount[2 * i + 1]);</div><div class='add'>+			snd_emu10k1_ptr_write(emu, A_CSBA + i, voice, (amh &lt;&lt; 16) | aml);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		/* mono, left, right (master voice = left) */</div><div class='del'>-		tmp = stereo ? (master ? 1 : 2) : 0;</div><div class='del'>-		memcpy(send_routing, &amp;mix-&gt;send_routing[tmp][0], 8);</div><div class='del'>-		memcpy(send_amount, &amp;mix-&gt;send_volume[tmp][0], 8);</div><div class='add'>+		snd_emu10k1_ptr_write(emu, FXRT, voice,</div><div class='add'>+				      snd_emu10k1_compose_send_routing(send_routing));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ccis = emu10k1_ccis(stereo, w_16);</div><div class='del'>-	</div><div class='del'>-	if (master) {</div><div class='del'>-		evoice-&gt;epcm-&gt;ccca_start_addr = start_addr + ccis;</div><div class='del'>-		if (extra) {</div><div class='del'>-			start_addr += ccis;</div><div class='del'>-			end_addr += ccis + emu-&gt;delay_pcm_irq;</div><div class='del'>-		}</div><div class='del'>-		if (stereo &amp;&amp; !extra) {</div><div class='del'>-			snd_emu10k1_ptr_write(emu, CPF, voice, CPF_STEREO_MASK);</div><div class='del'>-			snd_emu10k1_ptr_write(emu, CPF, (voice + 1), CPF_STEREO_MASK);</div><div class='del'>-		} else {</div><div class='del'>-			snd_emu10k1_ptr_write(emu, CPF, voice, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	emu-&gt;voices[voice].dirty = 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* setup routing */</div><div class='del'>-	if (emu-&gt;audigy) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT1, voice,</div><div class='del'>-				      snd_emu10k1_compose_audigy_fxrt1(send_routing));</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_FXRT2, voice,</div><div class='del'>-				      snd_emu10k1_compose_audigy_fxrt2(send_routing));</div><div class='del'>-		snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice,</div><div class='del'>-				      ((unsigned int)send_amount[4] &lt;&lt; 24) |</div><div class='del'>-				      ((unsigned int)send_amount[5] &lt;&lt; 16) |</div><div class='del'>-				      ((unsigned int)send_amount[6] &lt;&lt; 8) |</div><div class='del'>-				      (unsigned int)send_amount[7]);</div><div class='del'>-	} else</div><div class='del'>-		snd_emu10k1_ptr_write(emu, FXRT, voice,</div><div class='del'>-				      snd_emu10k1_compose_send_routing(send_routing));</div><div class='del'>-	/* Stop CA */</div><div class='del'>-	/* Assumption that PT is already 0 so no harm overwriting */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PTRX, voice, (send_amount[0] &lt;&lt; 8) | send_amount[1]);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DSL, voice, end_addr | (send_amount[3] &lt;&lt; 24));</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PSST, voice,</div><div class='del'>-			(start_addr + (extra ? emu-&gt;delay_pcm_irq : 0)) |</div><div class='del'>-			(send_amount[2] &lt;&lt; 24));</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='del'>-		pitch_target = PITCH_48000; /* Disable interpolators on emu1010 card */</div><div class='del'>-	else </div><div class='del'>-		pitch_target = emu10k1_calc_pitch_target(runtime-&gt;rate);</div><div class='del'>-	if (extra)</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CCCA, voice, start_addr |</div><div class='del'>-			      emu10k1_select_interprom(pitch_target) |</div><div class='del'>-			      (w_16 ? 0 : CCCA_8BITSELECT));</div><div class='del'>-	else</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CCCA, voice, (start_addr + ccis) |</div><div class='del'>-			      emu10k1_select_interprom(pitch_target) |</div><div class='del'>-			      (w_16 ? 0 : CCCA_8BITSELECT));</div><div class='del'>-	/* Clear filter delay memory */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, Z1, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, Z2, voice, 0);</div><div class='del'>-	/* invalidate maps */</div><div class='del'>-	silent_page = ((unsigned int)emu-&gt;silent_page.addr &lt;&lt; 1) | MAP_PTI_MASK;</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MAPA, voice, silent_page);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, MAPB, voice, silent_page);</div><div class='del'>-	/* modulation envelope */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ATKHLDM, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DCYSUSM, voice, 0x007f);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, LFOVAL1, voice, 0x8000);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, LFOVAL2, voice, 0x8000);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FMMOD, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, TREMFRQ, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, FM2FRQ2, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ENVVAL, voice, 0x8000);</div><div class='del'>-	/* volume envelope */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ATKHLDV, voice, 0x7f7f);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, ENVVOL, voice, 0x0000);</div><div class='del'>-	/* filter envelope */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PEFE_FILTERAMOUNT, voice, 0x7f);</div><div class='del'>-	/* pitch envelope */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PEFE_PITCHAMOUNT, voice, 0);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='add'>+static void snd_emu10k1_pcm_init_voices(struct snd_emu10k1 *emu,</div><div class='add'>+					struct snd_emu10k1_voice *evoice,</div><div class='add'>+					bool w_16, bool stereo,</div><div class='add'>+					unsigned int start_addr,</div><div class='add'>+					unsigned int end_addr,</div><div class='add'>+					struct snd_emu10k1_pcm_mixer *mix)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='add'>+	snd_emu10k1_pcm_init_voice(emu, evoice, w_16, stereo,</div><div class='add'>+				   start_addr, end_addr,</div><div class='add'>+				   &amp;mix-&gt;send_routing[stereo][0],</div><div class='add'>+				   &amp;mix-&gt;send_volume[stereo][0]);</div><div class='add'>+	if (stereo)</div><div class='add'>+		snd_emu10k1_pcm_init_voice(emu, evoice + 1, w_16, true,</div><div class='add'>+					   start_addr, end_addr,</div><div class='add'>+					   &amp;mix-&gt;send_routing[2][0],</div><div class='add'>+					   &amp;mix-&gt;send_volume[2][0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_pcm_init_extra_voice(struct snd_emu10k1 *emu,</div><div class='add'>+					     struct snd_emu10k1_voice *evoice,</div><div class='add'>+					     bool w_16,</div><div class='add'>+					     unsigned int start_addr,</div><div class='add'>+					     unsigned int end_addr)</div><div class='add'>+{</div><div class='add'>+	static const unsigned char send_routing[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };</div><div class='add'>+	static const unsigned char send_amount[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };</div><div class='add'>+</div><div class='add'>+	snd_emu10k1_pcm_init_voice(emu, evoice, w_16, false,</div><div class='add'>+				   start_addr, end_addr,</div><div class='add'>+				   send_routing, send_amount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -410,12 +351,31 @@ static int snd_emu10k1_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='add'>+	size_t alloc_size;</div><div class='add'>+	int type, channels, count;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params))) &lt; 0)</div><div class='add'>+	if (epcm-&gt;type == PLAYBACK_EMUVOICE) {</div><div class='add'>+		type = EMU10K1_PCM;</div><div class='add'>+		channels = 1;</div><div class='add'>+		count = params_channels(hw_params);</div><div class='add'>+	} else {</div><div class='add'>+		type = EMU10K1_EFX;</div><div class='add'>+		channels = params_channels(hw_params);</div><div class='add'>+		count = 1;</div><div class='add'>+	}</div><div class='add'>+	err = snd_emu10k1_pcm_channel_alloc(epcm, type, count, channels);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='add'>+</div><div class='add'>+	alloc_size = params_buffer_bytes(hw_params);</div><div class='add'>+	if (emu-&gt;iommu_workaround)</div><div class='add'>+		alloc_size += EMUPAGESIZE;</div><div class='add'>+	err = snd_pcm_lib_malloc_pages(substream, alloc_size);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	if (emu-&gt;iommu_workaround &amp;&amp; runtime-&gt;dma_bytes &gt;= EMUPAGESIZE)</div><div class='add'>+		runtime-&gt;dma_bytes -= EMUPAGESIZE;</div><div class='ctx'> 	if (err &gt; 0) {	/* change */</div><div class='ctx'> 		int mapped;</div><div class='ctx'> 		if (epcm-&gt;memblk != NULL)</div><div class='hunk'>@@ -445,43 +405,7 @@ static int snd_emu10k1_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;extra);</div><div class='ctx'> 		epcm-&gt;extra = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (epcm-&gt;voices[1]) {</div><div class='del'>-		snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[1]);</div><div class='del'>-		epcm-&gt;voices[1] = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (epcm-&gt;voices[0]) {</div><div class='del'>-		snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[0]);</div><div class='del'>-		epcm-&gt;voices[0] = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (epcm-&gt;memblk) {</div><div class='del'>-		snd_emu10k1_free_pages(emu, epcm-&gt;memblk);</div><div class='del'>-		epcm-&gt;memblk = NULL;</div><div class='del'>-		epcm-&gt;start_addr = 0;</div><div class='del'>-	}</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_emu10k1_efx_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (runtime-&gt;private_data == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	epcm = runtime-&gt;private_data;</div><div class='del'>-	if (epcm-&gt;extra) {</div><div class='del'>-		snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;extra);</div><div class='del'>-		epcm-&gt;extra = NULL;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; NUM_EFX_PLAYBACK; i++) {</div><div class='del'>-		if (epcm-&gt;voices[i]) {</div><div class='del'>-			snd_emu10k1_voice_free(epcm-&gt;emu, epcm-&gt;voices[i]);</div><div class='del'>-			epcm-&gt;voices[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	snd_emu10k1_pcm_free_voices(epcm);</div><div class='ctx'> 	if (epcm-&gt;memblk) {</div><div class='ctx'> 		snd_emu10k1_free_pages(emu, epcm-&gt;memblk);</div><div class='ctx'> 		epcm-&gt;memblk = NULL;</div><div class='hunk'>@@ -496,26 +420,28 @@ static int snd_emu10k1_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='add'>+	bool w_16 = snd_pcm_format_width(runtime-&gt;format) == 16;</div><div class='add'>+	bool stereo = runtime-&gt;channels == 2;</div><div class='ctx'> 	unsigned int start_addr, end_addr;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+</div><div class='add'>+	rate = runtime-&gt;rate;</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model &amp;&amp;</div><div class='add'>+	    emu-&gt;emu1010.word_clock == 44100)</div><div class='add'>+		rate = rate * 480 / 441;</div><div class='add'>+	epcm-&gt;pitch_target = emu10k1_calc_pitch_target(rate);</div><div class='add'>+</div><div class='add'>+	start_addr = epcm-&gt;start_addr &gt;&gt; w_16;</div><div class='add'>+	end_addr = start_addr + runtime-&gt;period_size;</div><div class='add'>+	snd_emu10k1_pcm_init_extra_voice(emu, epcm-&gt;extra, w_16,</div><div class='add'>+					 start_addr, end_addr);</div><div class='add'>+	start_addr &gt;&gt;= stereo;</div><div class='add'>+	epcm-&gt;ccca_start_addr = start_addr;</div><div class='add'>+	end_addr = start_addr + runtime-&gt;buffer_size;</div><div class='add'>+	snd_emu10k1_pcm_init_voices(emu, epcm-&gt;voices[0], w_16, stereo,</div><div class='add'>+				    start_addr, end_addr,</div><div class='add'>+				    &amp;emu-&gt;pcm_mixer[substream-&gt;number]);</div><div class='ctx'> </div><div class='del'>-	start_addr = epcm-&gt;start_addr;</div><div class='del'>-	end_addr = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	if (runtime-&gt;channels == 2) {</div><div class='del'>-		start_addr &gt;&gt;= 1;</div><div class='del'>-		end_addr &gt;&gt;= 1;</div><div class='del'>-	}</div><div class='del'>-	end_addr += start_addr;</div><div class='del'>-	snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm-&gt;extra,</div><div class='del'>-				   start_addr, end_addr, NULL);</div><div class='del'>-	start_addr = epcm-&gt;start_addr;</div><div class='del'>-	end_addr = epcm-&gt;start_addr + snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	snd_emu10k1_pcm_init_voice(emu, 1, 0, epcm-&gt;voices[0],</div><div class='del'>-				   start_addr, end_addr,</div><div class='del'>-				   &amp;emu-&gt;pcm_mixer[substream-&gt;number]);</div><div class='del'>-	if (epcm-&gt;voices[1])</div><div class='del'>-		snd_emu10k1_pcm_init_voice(emu, 0, 0, epcm-&gt;voices[1],</div><div class='del'>-					   start_addr, end_addr,</div><div class='del'>-					   &amp;emu-&gt;pcm_mixer[substream-&gt;number]);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -524,38 +450,32 @@ static int snd_emu10k1_efx_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	unsigned int start_addr, end_addr;</div><div class='del'>-	unsigned int channel_size;</div><div class='del'>-	int i;</div><div class='add'>+	unsigned int start_addr;</div><div class='add'>+	unsigned int extra_size, channel_size;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	start_addr = epcm-&gt;start_addr;</div><div class='del'>-	end_addr = epcm-&gt;start_addr + snd_pcm_lib_buffer_bytes(substream);</div><div class='add'>+	epcm-&gt;pitch_target = PITCH_48000;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * the kX driver leaves some space between voices</div><div class='del'>-	 */</div><div class='del'>-	channel_size = ( end_addr - start_addr ) / NUM_EFX_PLAYBACK;</div><div class='del'>-</div><div class='del'>-	snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm-&gt;extra,</div><div class='del'>-				   start_addr, start_addr + (channel_size / 2), NULL);</div><div class='del'>-</div><div class='del'>-	/* only difference with the master voice is we use it for the pointer */</div><div class='del'>-	snd_emu10k1_pcm_init_voice(emu, 1, 0, epcm-&gt;voices[0],</div><div class='del'>-				   start_addr, start_addr + channel_size,</div><div class='del'>-				   &amp;emu-&gt;efx_pcm_mixer[0]);</div><div class='del'>-</div><div class='del'>-	start_addr += channel_size;</div><div class='del'>-	for (i = 1; i &lt; NUM_EFX_PLAYBACK; i++) {</div><div class='del'>-		snd_emu10k1_pcm_init_voice(emu, 0, 0, epcm-&gt;voices[i],</div><div class='del'>-					   start_addr, start_addr + channel_size,</div><div class='del'>-					   &amp;emu-&gt;efx_pcm_mixer[i]);</div><div class='add'>+	start_addr = epcm-&gt;start_addr &gt;&gt; 1;  // 16-bit voices</div><div class='add'>+</div><div class='add'>+	extra_size = runtime-&gt;period_size;</div><div class='add'>+	channel_size = runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='add'>+	snd_emu10k1_pcm_init_extra_voice(emu, epcm-&gt;extra, true,</div><div class='add'>+					 start_addr, start_addr + extra_size);</div><div class='add'>+</div><div class='add'>+	epcm-&gt;ccca_start_addr = start_addr;</div><div class='add'>+	for (i = 0; i &lt; runtime-&gt;channels; i++) {</div><div class='add'>+		snd_emu10k1_pcm_init_voices(emu, epcm-&gt;voices[i], true, false,</div><div class='add'>+					    start_addr, start_addr + channel_size,</div><div class='add'>+					    &amp;emu-&gt;efx_pcm_mixer[i]);</div><div class='ctx'> 		start_addr += channel_size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1_efx_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1_efx_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_NONINTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -565,27 +485,15 @@ static struct snd_pcm_hardware snd_emu10k1_efx_playback =</div><div class='ctx'> 	.rates =		SNDRV_PCM_RATE_48000,</div><div class='ctx'> 	.rate_min =		48000,</div><div class='ctx'> 	.rate_max =		48000,</div><div class='del'>-	.channels_min =		NUM_EFX_PLAYBACK,</div><div class='add'>+	.channels_min =		1,</div><div class='ctx'> 	.channels_max =		NUM_EFX_PLAYBACK,</div><div class='del'>-	.buffer_bytes_max =	(64*1024),</div><div class='del'>-	.period_bytes_min =	64,</div><div class='del'>-	.period_bytes_max =	(64*1024),</div><div class='add'>+	.buffer_bytes_max =	(128*1024),</div><div class='add'>+	.period_bytes_max =	(128*1024),</div><div class='ctx'> 	.periods_min =		2,</div><div class='del'>-	.periods_max =		2,</div><div class='add'>+	.periods_max =		1024,</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_emu10k1_capture_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-					 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_emu10k1_capture_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -600,9 +508,17 @@ static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, ADCCR, 0, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAPTURE_EFX:</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+			// The upper 32 16-bit capture voices, two for each of the 16 32-bit channels.</div><div class='add'>+			// The lower voices are occupied by A_EXTOUT_*_CAP*.</div><div class='add'>+			epcm-&gt;capture_cr_val = 0;</div><div class='add'>+			epcm-&gt;capture_cr_val2 = 0xffffffff &gt;&gt; (32 - runtime-&gt;channels * 2);</div><div class='add'>+		}</div><div class='ctx'> 		if (emu-&gt;audigy) {</div><div class='del'>-			snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);</div><div class='del'>-			snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);</div><div class='add'>+			snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+				A_FXWC1, 0,</div><div class='add'>+				A_FXWC2, 0,</div><div class='add'>+				REGLIST_END);</div><div class='ctx'> 		} else</div><div class='ctx'> 			snd_emu10k1_ptr_write(emu, FXWC, 0, 0);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -613,7 +529,7 @@ static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	epcm-&gt;capture_bufsize = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	epcm-&gt;capture_bs_val = 0;</div><div class='ctx'> 	for (idx = 0; idx &lt; 31; idx++) {</div><div class='del'>-		if (capture_period_sizes[idx] == epcm-&gt;capture_bufsize) {</div><div class='add'>+		if (capture_buffer_sizes[idx] == epcm-&gt;capture_bufsize) {</div><div class='ctx'> 			epcm-&gt;capture_bs_val = idx + 1;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -623,132 +539,181 @@ static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		epcm-&gt;capture_bs_val++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (epcm-&gt;type == CAPTURE_AC97ADC) {</div><div class='add'>+		unsigned rate = runtime-&gt;rate;</div><div class='add'>+		if (!(runtime-&gt;hw.rates &amp; SNDRV_PCM_RATE_48000))</div><div class='add'>+			rate = rate * 480 / 441;</div><div class='add'>+</div><div class='ctx'> 		epcm-&gt;capture_cr_val = emu-&gt;audigy ? A_ADCCR_LCHANENABLE : ADCCR_LCHANENABLE;</div><div class='ctx'> 		if (runtime-&gt;channels &gt; 1)</div><div class='ctx'> 			epcm-&gt;capture_cr_val |= emu-&gt;audigy ? A_ADCCR_RCHANENABLE : ADCCR_RCHANENABLE;</div><div class='ctx'> 		epcm-&gt;capture_cr_val |= emu-&gt;audigy ?</div><div class='del'>-			snd_emu10k1_audigy_capture_rate_reg(runtime-&gt;rate) :</div><div class='del'>-			snd_emu10k1_capture_rate_reg(runtime-&gt;rate);</div><div class='add'>+			snd_emu10k1_audigy_capture_rate_reg(rate) :</div><div class='add'>+			snd_emu10k1_capture_rate_reg(rate);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_emu10k1_playback_invalidate_cache(struct snd_emu10k1 *emu, int extra, struct snd_emu10k1_voice *evoice)</div><div class='add'>+static void snd_emu10k1_playback_fill_cache(struct snd_emu10k1 *emu,</div><div class='add'>+					    unsigned voice,</div><div class='add'>+					    u32 sample, bool stereo)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	unsigned int voice, stereo, i, ccis, cra = 64, cs, sample;</div><div class='add'>+	u32 ccr;</div><div class='ctx'> </div><div class='del'>-	if (evoice == NULL)</div><div class='del'>-		return;</div><div class='del'>-	runtime = evoice-&gt;epcm-&gt;substream-&gt;runtime;</div><div class='del'>-	voice = evoice-&gt;number;</div><div class='del'>-	stereo = (!extra &amp;&amp; runtime-&gt;channels == 2);</div><div class='del'>-	sample = snd_pcm_format_width(runtime-&gt;format) == 16 ? 0 : 0x80808080;</div><div class='del'>-	ccis = emu10k1_ccis(stereo, sample == 0);</div><div class='del'>-	/* set cs to 2 * number of cache registers beside the invalidated */</div><div class='del'>-	cs = (sample == 0) ? (32-ccis) : (64-ccis+1) &gt;&gt; 1;</div><div class='del'>-	if (cs &gt; 16) cs = 16;</div><div class='del'>-	for (i = 0; i &lt; cs; i++) {</div><div class='add'>+	// We assume that the cache is resting at this point (i.e.,</div><div class='add'>+	// CCR_CACHEINVALIDSIZE is very small).</div><div class='add'>+</div><div class='add'>+	// Clear leading frames. For simplicitly, this does too much,</div><div class='add'>+	// except for 16-bit stereo. And the interpolator will actually</div><div class='add'>+	// access them at all only when we're pitch-shifting.</div><div class='add'>+	for (int i = 0; i &lt; 3; i++)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, CD0 + i, voice, sample);</div><div class='del'>-		if (stereo) {</div><div class='del'>-			snd_emu10k1_ptr_write(emu, CD0 + i, voice + 1, sample);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* reset cache */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCR_READADDRESS, voice, cra);</div><div class='add'>+</div><div class='add'>+	// Fill cache</div><div class='add'>+	ccr = (64 - 3) &lt;&lt; REG_SHIFT(CCR_CACHEINVALIDSIZE);</div><div class='ctx'> 	if (stereo) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice + 1, 0);</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CCR_READADDRESS, voice + 1, cra);</div><div class='add'>+		// The engine goes haywire if CCR_READADDRESS is out of sync</div><div class='add'>+		snd_emu10k1_ptr_write(emu, CCR, voice + 1, ccr);</div><div class='ctx'> 	}</div><div class='del'>-	/* fill cache */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice, ccis);</div><div class='del'>-	if (stereo) {</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice+1, ccis);</div><div class='add'>+	snd_emu10k1_ptr_write(emu, CCR, voice, ccr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_playback_prepare_voices(struct snd_emu10k1 *emu,</div><div class='add'>+						struct snd_emu10k1_pcm *epcm,</div><div class='add'>+						bool w_16, bool stereo,</div><div class='add'>+						int channels)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *substream = epcm-&gt;substream;</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned eloop_start = epcm-&gt;start_addr &gt;&gt; w_16;</div><div class='add'>+	unsigned loop_start = eloop_start &gt;&gt; stereo;</div><div class='add'>+	unsigned eloop_size = runtime-&gt;period_size;</div><div class='add'>+	unsigned loop_size = runtime-&gt;buffer_size;</div><div class='add'>+	u32 sample = w_16 ? 0 : 0x80808080;</div><div class='add'>+</div><div class='add'>+	// To make the playback actually start at the 1st frame,</div><div class='add'>+	// we need to compensate for two circumstances:</div><div class='add'>+	// - The actual position is delayed by the cache size (64 frames)</div><div class='add'>+	// - The interpolator is centered around the 4th frame</div><div class='add'>+	loop_start += (epcm-&gt;resume_pos + 64 - 3) % loop_size;</div><div class='add'>+	for (int i = 0; i &lt; channels; i++) {</div><div class='add'>+		unsigned voice = epcm-&gt;voices[i]-&gt;number;</div><div class='add'>+		snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, voice, loop_start);</div><div class='add'>+		loop_start += loop_size;</div><div class='add'>+		snd_emu10k1_playback_fill_cache(emu, voice, sample, stereo);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	// The interrupt is triggered when CCCA_CURRADDR (CA) wraps around,</div><div class='add'>+	// which is ahead of the actual playback position, so the interrupt</div><div class='add'>+	// source needs to be delayed.</div><div class='add'>+	//</div><div class='add'>+	// In principle, this wouldn't need to be the cache's entire size - in</div><div class='add'>+	// practice, CCR_CACHEINVALIDSIZE (CIS) &gt; `fetch threshold` has never</div><div class='add'>+	// been observed, and assuming 40 _bytes_ should be safe.</div><div class='add'>+	//</div><div class='add'>+	// The cache fills are somewhat random, which makes it impossible to</div><div class='add'>+	// align them with the interrupts. This makes a non-delayed interrupt</div><div class='add'>+	// source not practical, as the interrupt handler would have to wait</div><div class='add'>+	// for (CA - CIS) &gt;= period_boundary for every channel in the stream.</div><div class='add'>+	//</div><div class='add'>+	// This is why all other (open) drivers for these chips use timer-based</div><div class='add'>+	// interrupts.</div><div class='add'>+	//</div><div class='add'>+	eloop_start += (epcm-&gt;resume_pos + eloop_size - 3) % eloop_size;</div><div class='add'>+	snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, epcm-&gt;extra-&gt;number, eloop_start);</div><div class='add'>+</div><div class='add'>+	// It takes a moment until the cache fills complete,</div><div class='add'>+	// but the unmuting takes long enough for that.</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_emu10k1_playback_prepare_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice,</div><div class='del'>-					       int master, int extra,</div><div class='del'>-					       struct snd_emu10k1_pcm_mixer *mix)</div><div class='add'>+static void snd_emu10k1_playback_commit_volume(struct snd_emu10k1 *emu,</div><div class='add'>+					       struct snd_emu10k1_voice *evoice,</div><div class='add'>+					       unsigned int vattn)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	unsigned int attn, vattn;</div><div class='del'>-	unsigned int voice, tmp;</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, evoice-&gt;number,</div><div class='add'>+		VTFT, vattn | VTFT_FILTERTARGET_MASK,</div><div class='add'>+		CVCF, vattn | CVCF_CURRENTFILTER_MASK,</div><div class='add'>+		REGLIST_END);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (evoice == NULL)	/* skip second voice for mono */</div><div class='del'>-		return;</div><div class='del'>-	substream = evoice-&gt;epcm-&gt;substream;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	voice = evoice-&gt;number;</div><div class='add'>+static void snd_emu10k1_playback_unmute_voice(struct snd_emu10k1 *emu,</div><div class='add'>+					      struct snd_emu10k1_voice *evoice,</div><div class='add'>+					      bool stereo, bool master,</div><div class='add'>+					      struct snd_emu10k1_pcm_mixer *mix)</div><div class='add'>+{</div><div class='add'>+	unsigned int vattn;</div><div class='add'>+	unsigned int tmp;</div><div class='ctx'> </div><div class='del'>-	attn = extra ? 0 : 0x00ff;</div><div class='del'>-	tmp = runtime-&gt;channels == 2 ? (master ? 1 : 2) : 0;</div><div class='del'>-	vattn = mix != NULL ? (mix-&gt;attn[tmp] &lt;&lt; 16) : 0;</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IFATN, voice, attn);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, VTFT, voice, vattn | 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CVCF, voice, vattn | 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, DCYSUSV, voice, 0x7f7f);</div><div class='del'>-	snd_emu10k1_voice_clear_loop_stop(emu, voice);</div><div class='add'>+	tmp = stereo ? (master ? 1 : 2) : 0;</div><div class='add'>+	vattn = mix-&gt;attn[tmp] &lt;&lt; 16;</div><div class='add'>+	snd_emu10k1_playback_commit_volume(emu, evoice, vattn);</div><div class='ctx'> }	</div><div class='ctx'> </div><div class='del'>-static void snd_emu10k1_playback_trigger_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice, int master, int extra)</div><div class='add'>+static void snd_emu10k1_playback_unmute_voices(struct snd_emu10k1 *emu,</div><div class='add'>+					       struct snd_emu10k1_voice *evoice,</div><div class='add'>+					       bool stereo,</div><div class='add'>+					       struct snd_emu10k1_pcm_mixer *mix)</div><div class='ctx'> {</div><div class='del'>-	struct snd_pcm_substream *substream;</div><div class='del'>-	struct snd_pcm_runtime *runtime;</div><div class='del'>-	unsigned int voice, pitch, pitch_target;</div><div class='add'>+	snd_emu10k1_playback_unmute_voice(emu, evoice, stereo, true, mix);</div><div class='add'>+	if (stereo)</div><div class='add'>+		snd_emu10k1_playback_unmute_voice(emu, evoice + 1, true, false, mix);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (evoice == NULL)	/* skip second voice for mono */</div><div class='del'>-		return;</div><div class='del'>-	substream = evoice-&gt;epcm-&gt;substream;</div><div class='del'>-	runtime = substream-&gt;runtime;</div><div class='del'>-	voice = evoice-&gt;number;</div><div class='add'>+static void snd_emu10k1_playback_mute_voice(struct snd_emu10k1 *emu,</div><div class='add'>+					    struct snd_emu10k1_voice *evoice)</div><div class='add'>+{</div><div class='add'>+	snd_emu10k1_playback_commit_volume(emu, evoice, 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	pitch = snd_emu10k1_rate_to_pitch(runtime-&gt;rate) &gt;&gt; 8;</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='del'>-		pitch_target = PITCH_48000; /* Disable interpolators on emu1010 card */</div><div class='del'>-	else </div><div class='del'>-		pitch_target = emu10k1_calc_pitch_target(runtime-&gt;rate);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PTRX_PITCHTARGET, voice, pitch_target);</div><div class='del'>-	if (master || evoice-&gt;epcm-&gt;type == PLAYBACK_EFX)</div><div class='del'>-		snd_emu10k1_ptr_write(emu, CPF_CURRENTPITCH, voice, pitch_target);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IP, voice, pitch);</div><div class='del'>-	if (extra)</div><div class='del'>-		snd_emu10k1_voice_intr_enable(emu, voice);</div><div class='add'>+static void snd_emu10k1_playback_mute_voices(struct snd_emu10k1 *emu,</div><div class='add'>+					     struct snd_emu10k1_voice *evoice,</div><div class='add'>+					     bool stereo)</div><div class='add'>+{</div><div class='add'>+	snd_emu10k1_playback_mute_voice(emu, evoice);</div><div class='add'>+	if (stereo)</div><div class='add'>+		snd_emu10k1_playback_mute_voice(emu, evoice + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_playback_commit_pitch(struct snd_emu10k1 *emu,</div><div class='add'>+					      u32 voice, u32 pitch_target)</div><div class='add'>+{</div><div class='add'>+	u32 ptrx = snd_emu10k1_ptr_read(emu, PTRX, voice);</div><div class='add'>+	u32 cpf = snd_emu10k1_ptr_read(emu, CPF, voice);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, voice,</div><div class='add'>+		PTRX, (ptrx &amp; ~PTRX_PITCHTARGET_MASK) | pitch_target,</div><div class='add'>+		CPF, (cpf &amp; ~(CPF_CURRENTPITCH_MASK | CPF_FRACADDRESS_MASK)) | pitch_target,</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice)</div><div class='add'>+static void snd_emu10k1_playback_trigger_voice(struct snd_emu10k1 *emu,</div><div class='add'>+					       struct snd_emu10k1_voice *evoice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int voice;</div><div class='ctx'> </div><div class='del'>-	if (evoice == NULL)</div><div class='del'>-		return;</div><div class='ctx'> 	voice = evoice-&gt;number;</div><div class='del'>-	snd_emu10k1_voice_intr_disable(emu, voice);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, PTRX_PITCHTARGET, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CPF_CURRENTPITCH, voice, 0);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IFATN, voice, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, IP, voice, 0);</div><div class='add'>+	snd_emu10k1_playback_commit_pitch(emu, voice, evoice-&gt;epcm-&gt;pitch_target &lt;&lt; 16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void snd_emu10k1_playback_mangle_extra(struct snd_emu10k1 *emu,</div><div class='del'>-		struct snd_emu10k1_pcm *epcm,</div><div class='del'>-		struct snd_pcm_substream *substream,</div><div class='del'>-		struct snd_pcm_runtime *runtime)</div><div class='add'>+static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu,</div><div class='add'>+					    struct snd_emu10k1_voice *evoice)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ptr, period_pos;</div><div class='add'>+	unsigned int voice;</div><div class='ctx'> </div><div class='del'>-	/* try to sychronize the current position for the interrupt</div><div class='del'>-	   source voice */</div><div class='del'>-	period_pos = runtime-&gt;status-&gt;hw_ptr - runtime-&gt;hw_ptr_interrupt;</div><div class='del'>-	period_pos %= runtime-&gt;period_size;</div><div class='del'>-	ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm-&gt;extra-&gt;number);</div><div class='del'>-	ptr &amp;= ~0x00ffffff;</div><div class='del'>-	ptr |= epcm-&gt;ccca_start_addr + period_pos;</div><div class='del'>-	snd_emu10k1_ptr_write(emu, CCCA, epcm-&gt;extra-&gt;number, ptr);</div><div class='add'>+	voice = evoice-&gt;number;</div><div class='add'>+	snd_emu10k1_playback_commit_pitch(emu, voice, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_playback_set_running(struct snd_emu10k1 *emu,</div><div class='add'>+					     struct snd_emu10k1_pcm *epcm)</div><div class='add'>+{</div><div class='add'>+	epcm-&gt;running = 1;</div><div class='add'>+	snd_emu10k1_voice_intr_enable(emu, epcm-&gt;extra-&gt;number);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_playback_set_stopped(struct snd_emu10k1 *emu,</div><div class='add'>+					      struct snd_emu10k1_pcm *epcm)</div><div class='add'>+{</div><div class='add'>+	snd_emu10k1_voice_intr_disable(emu, epcm-&gt;extra-&gt;number);</div><div class='add'>+	epcm-&gt;running = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -758,45 +723,39 @@ static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix;</div><div class='del'>-	int result = 0;</div><div class='add'>+	bool w_16 = snd_pcm_format_width(runtime-&gt;format) == 16;</div><div class='add'>+	bool stereo = runtime-&gt;channels == 2;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n",</div><div class='ctx'> 	       (int)emu, cmd, substream-&gt;ops-&gt;pointer(substream))</div><div class='ctx'> 	*/</div><div class='del'>-	spin_lock(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		snd_emu10k1_playback_invalidate_cache(emu, 1, epcm-&gt;extra);	/* do we need this? */</div><div class='del'>-		snd_emu10k1_playback_invalidate_cache(emu, 0, epcm-&gt;voices[0]);</div><div class='del'>-		/* follow thru */</div><div class='add'>+		snd_emu10k1_playback_prepare_voices(emu, epcm, w_16, stereo, 1);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		if (cmd == SNDRV_PCM_TRIGGER_PAUSE_RELEASE)</div><div class='del'>-			snd_emu10k1_playback_mangle_extra(emu, epcm, substream, runtime);</div><div class='ctx'> 		mix = &amp;emu-&gt;pcm_mixer[substream-&gt;number];</div><div class='del'>-		snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;voices[0], 1, 0, mix);</div><div class='del'>-		snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;voices[1], 0, 0, mix);</div><div class='del'>-		snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;extra, 1, 1, NULL);</div><div class='del'>-		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;voices[0], 1, 0);</div><div class='del'>-		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;voices[1], 0, 0);</div><div class='del'>-		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;extra, 1, 1);</div><div class='del'>-		epcm-&gt;running = 1;</div><div class='add'>+		snd_emu10k1_playback_unmute_voices(emu, epcm-&gt;voices[0], stereo, mix);</div><div class='add'>+		snd_emu10k1_playback_set_running(emu, epcm);</div><div class='add'>+		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;voices[0]);</div><div class='add'>+		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;extra);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		epcm-&gt;running = 0;</div><div class='ctx'> 		snd_emu10k1_playback_stop_voice(emu, epcm-&gt;voices[0]);</div><div class='del'>-		snd_emu10k1_playback_stop_voice(emu, epcm-&gt;voices[1]);</div><div class='ctx'> 		snd_emu10k1_playback_stop_voice(emu, epcm-&gt;extra);</div><div class='add'>+		snd_emu10k1_playback_set_stopped(emu, epcm);</div><div class='add'>+		snd_emu10k1_playback_mute_voices(emu, epcm-&gt;voices[0], stereo);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;emu-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -805,9 +764,8 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -815,7 +773,7 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		outl(epcm-&gt;capture_ipr, emu-&gt;port + IPR);</div><div class='ctx'> 		snd_emu10k1_intr_enable(emu, epcm-&gt;capture_inte);</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "adccr = 0x%x, adcbs = 0x%x\n",</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "adccr = 0x%x, adcbs = 0x%x\n",</div><div class='ctx'> 		       epcm-&gt;adccr, epcm-&gt;adcbs);</div><div class='ctx'> 		*/</div><div class='ctx'> 		switch (epcm-&gt;type) {</div><div class='hunk'>@@ -824,9 +782,14 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CAPTURE_EFX:</div><div class='ctx'> 			if (emu-&gt;audigy) {</div><div class='del'>-				snd_emu10k1_ptr_write(emu, A_FXWC1, 0, epcm-&gt;capture_cr_val);</div><div class='del'>-				snd_emu10k1_ptr_write(emu, A_FXWC2, 0, epcm-&gt;capture_cr_val2);</div><div class='del'>-				snd_printdd("cr_val=0x%x, cr_val2=0x%x\n", epcm-&gt;capture_cr_val, epcm-&gt;capture_cr_val2);</div><div class='add'>+				snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+					A_FXWC1, epcm-&gt;capture_cr_val,</div><div class='add'>+					A_FXWC2, epcm-&gt;capture_cr_val2,</div><div class='add'>+					REGLIST_END);</div><div class='add'>+				dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+					"cr_val=0x%x, cr_val2=0x%x\n",</div><div class='add'>+					epcm-&gt;capture_cr_val,</div><div class='add'>+					epcm-&gt;capture_cr_val2);</div><div class='ctx'> 			} else</div><div class='ctx'> 				snd_emu10k1_ptr_write(emu, FXWC, 0, epcm-&gt;capture_cr_val);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -849,8 +812,10 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			break;</div><div class='ctx'> 		case CAPTURE_EFX:</div><div class='ctx'> 			if (emu-&gt;audigy) {</div><div class='del'>-				snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);</div><div class='del'>-				snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);</div><div class='add'>+				snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+					A_FXWC1, 0,</div><div class='add'>+					A_FXWC2, 0,</div><div class='add'>+					REGLIST_END);</div><div class='ctx'> 			} else</div><div class='ctx'> 				snd_emu10k1_ptr_write(emu, FXWC, 0, 0);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -859,10 +824,9 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;emu-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -870,26 +834,29 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	unsigned int ptr;</div><div class='add'>+	int ptr;</div><div class='ctx'> </div><div class='ctx'> 	if (!epcm-&gt;running)</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='ctx'> 	ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm-&gt;voices[0]-&gt;number) &amp; 0x00ffffff;</div><div class='del'>-#if 0	/* Perex's code */</div><div class='del'>-	ptr += runtime-&gt;buffer_size;</div><div class='ctx'> 	ptr -= epcm-&gt;ccca_start_addr;</div><div class='del'>-	ptr %= runtime-&gt;buffer_size;</div><div class='del'>-#else	/* EMU10K1 Open Source code from Creative */</div><div class='del'>-	if (ptr &lt; epcm-&gt;ccca_start_addr)</div><div class='del'>-		ptr += runtime-&gt;buffer_size - epcm-&gt;ccca_start_addr;</div><div class='del'>-	else {</div><div class='del'>-		ptr -= epcm-&gt;ccca_start_addr;</div><div class='del'>-		if (ptr &gt;= runtime-&gt;buffer_size)</div><div class='del'>-			ptr -= runtime-&gt;buffer_size;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	// This is the size of the whole cache minus the interpolator read-ahead,</div><div class='add'>+	// which leads us to the actual playback position.</div><div class='add'>+	//</div><div class='add'>+	// The cache is constantly kept mostly filled, so in principle we could</div><div class='add'>+	// return a more advanced position representing how far the hardware has</div><div class='add'>+	// already read the buffer, and set runtime-&gt;delay accordingly. However,</div><div class='add'>+	// this would be slightly different for every channel (and remarkably slow</div><div class='add'>+	// to obtain), so only a fixed worst-case value would be practical.</div><div class='add'>+	//</div><div class='add'>+	ptr -= 64 - 3;</div><div class='add'>+	if (ptr &lt; 0)</div><div class='add'>+		ptr += runtime-&gt;buffer_size;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 	       "ptr = 0x%lx, buffer_size = 0x%lx, period_size = 0x%lx\n",</div><div class='ctx'> 	       (long)ptr, (long)runtime-&gt;buffer_size,</div><div class='ctx'> 	       (long)runtime-&gt;period_size);</div><div class='hunk'>@@ -897,6 +864,49 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u64 snd_emu10k1_efx_playback_voice_mask(struct snd_emu10k1_pcm *epcm,</div><div class='add'>+					       int channels)</div><div class='add'>+{</div><div class='add'>+	u64 mask = 0;</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; channels; i++) {</div><div class='add'>+		int voice = epcm-&gt;voices[i]-&gt;number;</div><div class='add'>+		mask |= 1ULL &lt;&lt; voice;</div><div class='add'>+	}</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_efx_playback_freeze_voices(struct snd_emu10k1 *emu,</div><div class='add'>+						   struct snd_emu10k1_pcm *epcm,</div><div class='add'>+						   int channels)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; channels; i++) {</div><div class='add'>+		int voice = epcm-&gt;voices[i]-&gt;number;</div><div class='add'>+		snd_emu10k1_ptr_write(emu, CPF_STOP, voice, 1);</div><div class='add'>+		snd_emu10k1_playback_commit_pitch(emu, voice, PITCH_48000 &lt;&lt; 16);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_efx_playback_unmute_voices(struct snd_emu10k1 *emu,</div><div class='add'>+						   struct snd_emu10k1_pcm *epcm,</div><div class='add'>+						   int channels)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; channels; i++)</div><div class='add'>+		snd_emu10k1_playback_unmute_voice(emu, epcm-&gt;voices[i], false, true,</div><div class='add'>+						  &amp;emu-&gt;efx_pcm_mixer[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_efx_playback_stop_voices(struct snd_emu10k1 *emu,</div><div class='add'>+						 struct snd_emu10k1_pcm *epcm,</div><div class='add'>+						 int channels)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; channels; i++)</div><div class='add'>+		snd_emu10k1_playback_stop_voice(emu, epcm-&gt;voices[i]);</div><div class='add'>+	snd_emu10k1_playback_set_stopped(emu, epcm);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i &lt; channels; i++)</div><div class='add'>+		snd_emu10k1_playback_mute_voice(emu, epcm-&gt;voices[i]);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				        int cmd)</div><div class='hunk'>@@ -904,47 +914,60 @@ static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	int i;</div><div class='add'>+	u64 mask;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		/* prepare voices */</div><div class='del'>-		for (i = 0; i &lt; NUM_EFX_PLAYBACK; i++) {	</div><div class='del'>-			snd_emu10k1_playback_invalidate_cache(emu, 0, epcm-&gt;voices[i]);</div><div class='del'>-		}</div><div class='del'>-		snd_emu10k1_playback_invalidate_cache(emu, 1, epcm-&gt;extra);</div><div class='del'>-</div><div class='del'>-		/* follow thru */</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;extra, 1, 1, NULL);</div><div class='del'>-		snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;voices[0], 0, 0,</div><div class='del'>-						   &amp;emu-&gt;efx_pcm_mixer[0]);</div><div class='del'>-		for (i = 1; i &lt; NUM_EFX_PLAYBACK; i++)</div><div class='del'>-			snd_emu10k1_playback_prepare_voice(emu, epcm-&gt;voices[i], 0, 0,</div><div class='del'>-							   &amp;emu-&gt;efx_pcm_mixer[i]);</div><div class='del'>-		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;voices[0], 0, 0);</div><div class='del'>-		snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;extra, 1, 1);</div><div class='del'>-		for (i = 1; i &lt; NUM_EFX_PLAYBACK; i++)</div><div class='del'>-			snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;voices[i], 0, 0);</div><div class='del'>-		epcm-&gt;running = 1;</div><div class='add'>+		mask = snd_emu10k1_efx_playback_voice_mask(</div><div class='add'>+				epcm, runtime-&gt;channels);</div><div class='add'>+		for (int i = 0; i &lt; 10; i++) {</div><div class='add'>+			// Note that the freeze is not interruptible, so we make no</div><div class='add'>+			// effort to reset the bits outside the error handling here.</div><div class='add'>+			snd_emu10k1_voice_set_loop_stop_multiple(emu, mask);</div><div class='add'>+			snd_emu10k1_efx_playback_freeze_voices(</div><div class='add'>+					emu, epcm, runtime-&gt;channels);</div><div class='add'>+			snd_emu10k1_playback_prepare_voices(</div><div class='add'>+					emu, epcm, true, false, runtime-&gt;channels);</div><div class='add'>+</div><div class='add'>+			// It might seem to make more sense to unmute the voices only after</div><div class='add'>+			// they have been started, to potentially avoid torturing the speakers</div><div class='add'>+			// if something goes wrong. However, we cannot unmute atomically,</div><div class='add'>+			// which means that we'd get some mild artifacts in the regular case.</div><div class='add'>+			snd_emu10k1_efx_playback_unmute_voices(emu, epcm, runtime-&gt;channels);</div><div class='add'>+</div><div class='add'>+			snd_emu10k1_playback_set_running(emu, epcm);</div><div class='add'>+			result = snd_emu10k1_voice_clear_loop_stop_multiple_atomic(emu, mask);</div><div class='add'>+			if (result == 0) {</div><div class='add'>+				// The extra voice is allowed to lag a bit</div><div class='add'>+				snd_emu10k1_playback_trigger_voice(emu, epcm-&gt;extra);</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			snd_emu10k1_efx_playback_stop_voices(</div><div class='add'>+					emu, epcm, runtime-&gt;channels);</div><div class='add'>+</div><div class='add'>+			if (result != -EAGAIN)</div><div class='add'>+				break;</div><div class='add'>+			// The sync start can legitimately fail due to NMIs, etc.</div><div class='add'>+		}</div><div class='add'>+		snd_emu10k1_voice_clear_loop_stop_multiple(emu, mask);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-		epcm-&gt;running = 0;</div><div class='del'>-		for (i = 0; i &lt; NUM_EFX_PLAYBACK; i++) {	</div><div class='del'>-			snd_emu10k1_playback_stop_voice(emu, epcm-&gt;voices[i]);</div><div class='del'>-		}</div><div class='ctx'> 		snd_emu10k1_playback_stop_voice(emu, epcm-&gt;extra);</div><div class='add'>+		snd_emu10k1_efx_playback_stop_voices(</div><div class='add'>+				emu, epcm, runtime-&gt;channels);</div><div class='add'>+</div><div class='add'>+		epcm-&gt;resume_pos = snd_emu10k1_playback_pointer(substream);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -970,7 +993,7 @@ static snd_pcm_uframes_t snd_emu10k1_capture_pointer(struct snd_pcm_substream *s</div><div class='ctx'>  *  Playback support device description</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -983,9 +1006,8 @@ static struct snd_pcm_hardware snd_emu10k1_playback =</div><div class='ctx'> 	.channels_min =		1,</div><div class='ctx'> 	.channels_max =		2,</div><div class='ctx'> 	.buffer_bytes_max =	(128*1024),</div><div class='del'>-	.period_bytes_min =	64,</div><div class='ctx'> 	.period_bytes_max =	(128*1024),</div><div class='del'>-	.periods_min =		1,</div><div class='add'>+	.periods_min =		2,</div><div class='ctx'> 	.periods_max =		1024,</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='hunk'>@@ -994,14 +1016,14 @@ static struct snd_pcm_hardware snd_emu10k1_playback =</div><div class='ctx'>  *  Capture support device description</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='ctx'> 	.formats =		SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-	.rates =		SNDRV_PCM_RATE_8000_48000,</div><div class='add'>+	.rates =		SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_24000,</div><div class='ctx'> 	.rate_min =		8000,</div><div class='ctx'> 	.rate_max =		48000,</div><div class='ctx'> 	.channels_min =		1,</div><div class='hunk'>@@ -1014,20 +1036,18 @@ static struct snd_pcm_hardware snd_emu10k1_capture =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1_capture_efx =</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1_capture_efx =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID),</div><div class='ctx'> 	.formats =		SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-	.rates =		SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | </div><div class='del'>-				 SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | </div><div class='del'>-				 SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,</div><div class='del'>-	.rate_min =		44100,</div><div class='del'>-	.rate_max =		192000,</div><div class='del'>-	.channels_min =		8,</div><div class='del'>-	.channels_max =		8,</div><div class='add'>+	.rates =		SNDRV_PCM_RATE_48000,</div><div class='add'>+	.rate_min =		48000,</div><div class='add'>+	.rate_max =		48000,</div><div class='add'>+	.channels_min =		1,</div><div class='add'>+	.channels_max =		16,</div><div class='ctx'> 	.buffer_bytes_max =	(64*1024),</div><div class='ctx'> 	.period_bytes_min =	384,</div><div class='ctx'> 	.period_bytes_max =	(64*1024),</div><div class='hunk'>@@ -1088,13 +1108,29 @@ static int snd_emu10k1_efx_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_emu10k1_playback_set_constraints(struct snd_pcm_runtime *runtime)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	// The buffer size must be a multiple of the period size, to avoid a</div><div class='add'>+	// mismatch between the extra voice and the regular voices.</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	// The hardware is typically the cache's size of 64 frames ahead.</div><div class='add'>+	// Leave enough time for actually filling up the buffer.</div><div class='add'>+	err = snd_pcm_hw_constraint_minmax(</div><div class='add'>+			runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 128, UINT_MAX);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int i;</div><div class='add'>+	int i, j, err;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='ctx'> 	if (epcm == NULL)</div><div class='hunk'>@@ -1103,18 +1139,24 @@ static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	epcm-&gt;type = PLAYBACK_EFX;</div><div class='ctx'> 	epcm-&gt;substream = substream;</div><div class='ctx'> 	</div><div class='del'>-	emu-&gt;pcm_playback_efx_substream = substream;</div><div class='del'>-</div><div class='ctx'> 	runtime-&gt;private_data = epcm;</div><div class='ctx'> 	runtime-&gt;private_free = snd_emu10k1_pcm_free_substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_efx_playback;</div><div class='del'>-	</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='add'>+		snd_emu1010_constrain_efx_rate(emu, runtime);</div><div class='add'>+	err = snd_emu10k1_playback_set_constraints(runtime);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(epcm);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; NUM_EFX_PLAYBACK; i++) {</div><div class='ctx'> 		mix = &amp;emu-&gt;efx_pcm_mixer[i];</div><div class='del'>-		mix-&gt;send_routing[0][0] = i;</div><div class='add'>+		for (j = 0; j &lt; 8; j++)</div><div class='add'>+			mix-&gt;send_routing[0][j] = i + j;</div><div class='ctx'> 		memset(&amp;mix-&gt;send_volume, 0, sizeof(mix-&gt;send_volume));</div><div class='ctx'> 		mix-&gt;send_volume[0][0] = 255;</div><div class='del'>-		mix-&gt;attn[0] = 0xffff;</div><div class='add'>+		mix-&gt;attn[0] = 0x8000;</div><div class='ctx'> 		mix-&gt;epcm = epcm;</div><div class='ctx'> 		snd_emu10k1_pcm_efx_mixer_notify(emu, i, 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1127,7 +1169,7 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	struct snd_emu10k1_pcm_mixer *mix;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	int i, err;</div><div class='add'>+	int i, err, sample_rate;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='ctx'> 	if (epcm == NULL)</div><div class='hunk'>@@ -1138,21 +1180,27 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;private_data = epcm;</div><div class='ctx'> 	runtime-&gt;private_free = snd_emu10k1_pcm_free_substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_playback;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0) {</div><div class='add'>+	err = snd_emu10k1_playback_set_constraints(runtime);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		kfree(epcm);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) &lt; 0) {</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='add'>+		sample_rate = emu-&gt;emu1010.word_clock;</div><div class='add'>+	else</div><div class='add'>+		sample_rate = 48000;</div><div class='add'>+	err = snd_pcm_hw_rule_noresample(runtime, sample_rate);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		kfree(epcm);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	mix = &amp;emu-&gt;pcm_mixer[substream-&gt;number];</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		mix-&gt;send_routing[0][i] = mix-&gt;send_routing[1][i] = mix-&gt;send_routing[2][i] = i;</div><div class='ctx'> 	memset(&amp;mix-&gt;send_volume, 0, sizeof(mix-&gt;send_volume));</div><div class='ctx'> 	mix-&gt;send_volume[0][0] = mix-&gt;send_volume[0][1] =</div><div class='ctx'> 	mix-&gt;send_volume[1][0] = mix-&gt;send_volume[2][1] = 255;</div><div class='del'>-	mix-&gt;attn[0] = mix-&gt;attn[1] = mix-&gt;attn[2] = 0xffff;</div><div class='add'>+	mix-&gt;attn[0] = mix-&gt;attn[1] = mix-&gt;attn[2] = 0x8000;</div><div class='ctx'> 	mix-&gt;epcm = epcm;</div><div class='ctx'> 	snd_emu10k1_pcm_mixer_notify(emu, substream-&gt;number, 1);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1188,10 +1236,11 @@ static int snd_emu10k1_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;private_data = epcm;</div><div class='ctx'> 	runtime-&gt;private_free = snd_emu10k1_pcm_free_substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_capture;</div><div class='add'>+	snd_emu10k1_constrain_capture_rates(emu, runtime);</div><div class='add'>+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='add'>+				   &amp;hw_constraints_capture_buffer_sizes);</div><div class='ctx'> 	emu-&gt;capture_interrupt = snd_emu10k1_pcm_ac97adc_interrupt;</div><div class='ctx'> 	emu-&gt;pcm_capture_substream = substream;</div><div class='del'>-	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &amp;hw_constraints_capture_period_sizes);</div><div class='del'>-	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &amp;hw_constraints_capture_rates);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1226,10 +1275,10 @@ static int snd_emu10k1_capture_mic_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_capture;</div><div class='ctx'> 	runtime-&gt;hw.rates = SNDRV_PCM_RATE_8000;</div><div class='ctx'> 	runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 8000;</div><div class='del'>-	runtime-&gt;hw.channels_min = 1;</div><div class='add'>+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='add'>+				   &amp;hw_constraints_capture_buffer_sizes);</div><div class='ctx'> 	emu-&gt;capture_mic_interrupt = snd_emu10k1_pcm_ac97mic_interrupt;</div><div class='ctx'> 	emu-&gt;pcm_capture_mic_substream = substream;</div><div class='del'>-	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &amp;hw_constraints_capture_period_sizes);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1237,7 +1286,7 @@ static int snd_emu10k1_capture_mic_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	emu-&gt;capture_interrupt = NULL;</div><div class='add'>+	emu-&gt;capture_mic_interrupt = NULL;</div><div class='ctx'> 	emu-&gt;pcm_capture_mic_substream = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1248,7 +1297,7 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int nefx = emu-&gt;audigy ? 64 : 32;</div><div class='del'>-	int idx;</div><div class='add'>+	int idx, err;</div><div class='ctx'> </div><div class='ctx'> 	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='ctx'> 	if (epcm == NULL)</div><div class='hunk'>@@ -1264,66 +1313,30 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_data = epcm;</div><div class='ctx'> 	substream-&gt;runtime-&gt;private_free = snd_emu10k1_pcm_free_substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_capture_efx;</div><div class='del'>-	runtime-&gt;hw.rates = SNDRV_PCM_RATE_48000;</div><div class='del'>-	runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 48000;</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='del'>-		/*  Nb. of channels has been increased to 16 */</div><div class='del'>-		/* TODO</div><div class='del'>-		 * SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE</div><div class='del'>-		 * SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |</div><div class='del'>-		 * SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |</div><div class='del'>-		 * SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000</div><div class='del'>-		 * rate_min = 44100,</div><div class='del'>-		 * rate_max = 192000,</div><div class='del'>-		 * channels_min = 16,</div><div class='del'>-		 * channels_max = 16,</div><div class='del'>-		 * Need to add mixer control to fix sample rate</div><div class='del'>-		 *                 </div><div class='add'>+		snd_emu1010_constrain_efx_rate(emu, runtime);</div><div class='add'>+		/*</div><div class='ctx'> 		 * There are 32 mono channels of 16bits each.</div><div class='del'>-		 * 24bit Audio uses 2x channels over 16bit</div><div class='del'>-		 * 96kHz uses 2x channels over 48kHz</div><div class='del'>-		 * 192kHz uses 4x channels over 48kHz</div><div class='del'>-		 * So, for 48kHz 24bit, one has 16 channels</div><div class='del'>-		 * for 96kHz 24bit, one has 8 channels</div><div class='del'>-		 * for 192kHz 24bit, one has 4 channels</div><div class='del'>-		 *</div><div class='add'>+		 * 24bit Audio uses 2x channels over 16bit,</div><div class='add'>+		 * 96kHz uses 2x channels over 48kHz,</div><div class='add'>+		 * 192kHz uses 4x channels over 48kHz.</div><div class='add'>+		 * So, for 48kHz 24bit, one has 16 channels,</div><div class='add'>+		 * for 96kHz 24bit, one has 8 channels,</div><div class='add'>+		 * for 192kHz 24bit, one has 4 channels.</div><div class='add'>+		 * 1010rev2 and 1616(m) cards have double that,</div><div class='add'>+		 * but we don't exceed 16 channels anyway.</div><div class='ctx'> 		 */</div><div class='del'>-#if 1</div><div class='del'>-		switch (emu-&gt;emu1010.internal_clock) {</div><div class='del'>-		case 0:</div><div class='del'>-			/* For 44.1kHz */</div><div class='del'>-			runtime-&gt;hw.rates = SNDRV_PCM_RATE_44100;</div><div class='del'>-			runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 44100;</div><div class='del'>-			runtime-&gt;hw.channels_min =</div><div class='del'>-				runtime-&gt;hw.channels_max = 16;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			/* For 48kHz */</div><div class='del'>-			runtime-&gt;hw.rates = SNDRV_PCM_RATE_48000;</div><div class='del'>-			runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 48000;</div><div class='del'>-			runtime-&gt;hw.channels_min =</div><div class='del'>-				runtime-&gt;hw.channels_max = 16;</div><div class='del'>-			break;</div><div class='del'>-		};</div><div class='del'>-#endif</div><div class='ctx'> #if 0</div><div class='ctx'> 		/* For 96kHz */</div><div class='del'>-		runtime-&gt;hw.rates = SNDRV_PCM_RATE_96000;</div><div class='del'>-		runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 96000;</div><div class='ctx'> 		runtime-&gt;hw.channels_min = runtime-&gt;hw.channels_max = 4;</div><div class='ctx'> #endif</div><div class='ctx'> #if 0</div><div class='ctx'> 		/* For 192kHz */</div><div class='del'>-		runtime-&gt;hw.rates = SNDRV_PCM_RATE_192000;</div><div class='del'>-		runtime-&gt;hw.rate_min = runtime-&gt;hw.rate_max = 192000;</div><div class='ctx'> 		runtime-&gt;hw.channels_min = runtime-&gt;hw.channels_max = 2;</div><div class='ctx'> #endif</div><div class='ctx'> 		runtime-&gt;hw.formats = SNDRV_PCM_FMTBIT_S32_LE;</div><div class='del'>-		/* efx_voices_mask[0] is expected to be zero</div><div class='del'>- 		 * efx_voices_mask[1] is expected to have 32bits set</div><div class='del'>-		 */</div><div class='ctx'> 	} else {</div><div class='add'>+		guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 		runtime-&gt;hw.channels_min = runtime-&gt;hw.channels_max = 0;</div><div class='ctx'> 		for (idx = 0; idx &lt; nefx; idx++) {</div><div class='ctx'> 			if (emu-&gt;efx_voices_mask[idx/32] &amp; (1 &lt;&lt; (idx%32))) {</div><div class='hunk'>@@ -1331,13 +1344,19 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				runtime-&gt;hw.channels_max++;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		epcm-&gt;capture_cr_val = emu-&gt;efx_voices_mask[0];</div><div class='add'>+		epcm-&gt;capture_cr_val2 = emu-&gt;efx_voices_mask[1];</div><div class='add'>+	}</div><div class='add'>+	err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='add'>+					 &amp;hw_constraints_efx_capture_channels);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		kfree(epcm);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='del'>-	epcm-&gt;capture_cr_val = emu-&gt;efx_voices_mask[0];</div><div class='del'>-	epcm-&gt;capture_cr_val2 = emu-&gt;efx_voices_mask[1];</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='add'>+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='add'>+				   &amp;hw_constraints_capture_buffer_sizes);</div><div class='ctx'> 	emu-&gt;capture_efx_interrupt = snd_emu10k1_pcm_efx_interrupt;</div><div class='ctx'> 	emu-&gt;pcm_capture_efx_substream = substream;</div><div class='del'>-	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &amp;hw_constraints_capture_period_sizes);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1345,57 +1364,48 @@ static int snd_emu10k1_capture_efx_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	emu-&gt;capture_interrupt = NULL;</div><div class='add'>+	emu-&gt;capture_efx_interrupt = NULL;</div><div class='ctx'> 	emu-&gt;pcm_capture_efx_substream = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_playback_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_playback_open,</div><div class='ctx'> 	.close =		snd_emu10k1_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_emu10k1_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_emu10k1_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_playback_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_playback_trigger,</div><div class='ctx'> 	.pointer =		snd_emu10k1_playback_pointer,</div><div class='del'>-	.page =			snd_pcm_sgbuf_ops_page,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_capture_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_capture_open,</div><div class='ctx'> 	.close =		snd_emu10k1_capture_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_emu10k1_capture_hw_params,</div><div class='del'>-	.hw_free =		snd_emu10k1_capture_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_capture_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_capture_trigger,</div><div class='ctx'> 	.pointer =		snd_emu10k1_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* EFX playback */</div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_efx_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_efx_playback_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_efx_playback_open,</div><div class='ctx'> 	.close =		snd_emu10k1_efx_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =		snd_emu10k1_playback_hw_params,</div><div class='del'>-	.hw_free =		snd_emu10k1_efx_playback_hw_free,</div><div class='add'>+	.hw_free =		snd_emu10k1_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_efx_playback_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_efx_playback_trigger,</div><div class='del'>-	.pointer =		snd_emu10k1_efx_playback_pointer,</div><div class='del'>-	.page =			snd_pcm_sgbuf_ops_page,</div><div class='add'>+	.pointer =		snd_emu10k1_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_pcm(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "emu10k1", device, 32, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "emu10k1", device, 32, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='hunk'>@@ -1405,32 +1415,30 @@ int __devinit snd_emu10k1_pcm(struct snd_emu10k1 * emu, int device, struct snd_p</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='del'>-	strcpy(pcm-&gt;name, "ADC Capture/Standard PCM Playback");</div><div class='add'>+	strscpy(pcm-&gt;name, "ADC Capture/Standard PCM Playback");</div><div class='ctx'> 	emu-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='add'>+	/* playback substream can't use managed buffers due to alignment */</div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream-&gt;next)</div><div class='del'>-		if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu-&gt;pci), 64*1024, 64*1024)) &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+					      &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream-&gt;next)</div><div class='del'>-		snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu-&gt;pci), 64*1024, 64*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;emu-&gt;pci-&gt;dev, 64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_pcm_multi(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "emu10k1", device, 1, 0, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "emu10k1", device, 1, 0, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='hunk'>@@ -1439,40 +1447,33 @@ int __devinit snd_emu10k1_pcm_multi(struct snd_emu10k1 * emu, int device, struct</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='del'>-	strcpy(pcm-&gt;name, "Multichannel Playback");</div><div class='add'>+	strscpy(pcm-&gt;name, "Multichannel Playback");</div><div class='ctx'> 	emu-&gt;pcm_multi = pcm;</div><div class='ctx'> </div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream-&gt;next)</div><div class='del'>-		if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu-&gt;pci), 64*1024, 64*1024)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+		snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+					      &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					      64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_capture_mic_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_capture_mic_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_capture_mic_open,</div><div class='ctx'> 	.close =		snd_emu10k1_capture_mic_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_emu10k1_capture_hw_params,</div><div class='del'>-	.hw_free =		snd_emu10k1_capture_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_capture_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_capture_trigger,</div><div class='ctx'> 	.pointer =		snd_emu10k1_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_pcm_mic(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_emu10k1_pcm_mic(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "emu10k1 mic", device, 0, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "emu10k1 mic", device, 0, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='hunk'>@@ -1480,13 +1481,12 @@ int __devinit snd_emu10k1_pcm_mic(struct snd_emu10k1 * emu, int device, struct s</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_emu10k1_capture_mic_ops);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "Mic Capture");</div><div class='add'>+	strscpy(pcm-&gt;name, "Mic Capture");</div><div class='ctx'> 	emu-&gt;pcm_mic = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu-&gt;pci), 64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1507,10 +1507,8 @@ static int snd_emu10k1_pcm_efx_voices_mask_get(struct snd_kcontrol *kcontrol, st</div><div class='ctx'> 	int nefx = emu-&gt;audigy ? 64 : 32;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; nefx; idx++)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] = (emu-&gt;efx_voices_mask[idx / 32] &amp; (1 &lt;&lt; (idx % 32))) ? 1 : 0;</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1519,7 +1517,6 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(struct snd_kcontrol *kcontrol, st</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int nval[2], bits;</div><div class='ctx'> 	int nefx = emu-&gt;audigy ? 64 : 32;</div><div class='del'>-	int nefxb = emu-&gt;audigy ? 7 : 6;</div><div class='ctx'> 	int change, idx;</div><div class='ctx'> 	</div><div class='ctx'> 	nval[0] = nval[1] = 0;</div><div class='hunk'>@@ -1528,24 +1525,19 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(struct snd_kcontrol *kcontrol, st</div><div class='ctx'> 			nval[idx / 32] |= 1 &lt;&lt; (idx % 32);</div><div class='ctx'> 			bits++;</div><div class='ctx'> 		}</div><div class='del'>-		</div><div class='del'>-	for (idx = 0; idx &lt; nefxb; idx++)</div><div class='del'>-		if (1 &lt;&lt; idx == bits)</div><div class='del'>-			break;</div><div class='del'>-	</div><div class='del'>-	if (idx &gt;= nefxb)</div><div class='add'>+</div><div class='add'>+	if (bits == 9 || bits == 11 || bits == 13 || bits == 15 || bits &gt; 16)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	change = (nval[0] != emu-&gt;efx_voices_mask[0]) ||</div><div class='ctx'> 		(nval[1] != emu-&gt;efx_voices_mask[1]);</div><div class='ctx'> 	emu-&gt;efx_voices_mask[0] = nval[0];</div><div class='ctx'> 	emu-&gt;efx_voices_mask[1] = nval[1];</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = {</div><div class='add'>+static const struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name = "Captured FX8010 Outputs",</div><div class='ctx'> 	.info = snd_emu10k1_pcm_efx_voices_mask_info,</div><div class='hunk'>@@ -1553,12 +1545,9 @@ static struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = {</div><div class='ctx'> 	.put = snd_emu10k1_pcm_efx_voices_mask_put</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_capture_efx_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_capture_efx_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_capture_efx_open,</div><div class='ctx'> 	.close =		snd_emu10k1_capture_efx_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_emu10k1_capture_hw_params,</div><div class='del'>-	.hw_free =		snd_emu10k1_capture_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_capture_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_capture_trigger,</div><div class='ctx'> 	.pointer =		snd_emu10k1_capture_pointer,</div><div class='hunk'>@@ -1583,7 +1572,8 @@ static void snd_emu10k1_fx8010_playback_tram_poke1(unsigned short *dst_left,</div><div class='ctx'> 						   unsigned int tram_shift)</div><div class='ctx'> {</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "tram_poke1: dst_left = 0x%p, dst_right = 0x%p, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"tram_poke1: dst_left = 0x%p, dst_right = 0x%p, "</div><div class='ctx'> 	       "src = 0x%p, count = 0x%x\n",</div><div class='ctx'> 	       dst_left, dst_right, src, count);</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -1634,14 +1624,8 @@ static int snd_emu10k1_fx8010_playback_transfer(struct snd_pcm_substream *substr</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm *pcm = &amp;emu-&gt;fx8010.pcm[substream-&gt;number];</div><div class='ctx'> </div><div class='del'>-	snd_pcm_indirect_playback_transfer(substream, &amp;pcm-&gt;pcm_rec, fx8010_pb_trans_copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_emu10k1_fx8010_playback_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-						 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+	return snd_pcm_indirect_playback_transfer(substream, &amp;pcm-&gt;pcm_rec,</div><div class='add'>+						  fx8010_pb_trans_copy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_fx8010_playback_hw_free(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1652,7 +1636,6 @@ static int snd_emu10k1_fx8010_playback_hw_free(struct snd_pcm_substream *substre</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pcm-&gt;channels; i++)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm-&gt;etram[i], 0, 0);</div><div class='del'>-	snd_pcm_lib_free_pages(substream);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1664,7 +1647,7 @@ static int snd_emu10k1_fx8010_playback_prepare(struct snd_pcm_substream *substre</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "prepare: etram_pages = 0x%p, dma_area = 0x%x, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "prepare: etram_pages = 0x%p, dma_area = 0x%x, "</div><div class='ctx'> 	       "buffer_size = 0x%x (0x%x)\n",</div><div class='ctx'> 	       emu-&gt;fx8010.etram_pages, runtime-&gt;dma_area,</div><div class='ctx'> 	       runtime-&gt;buffer_size, runtime-&gt;buffer_size &lt;&lt; 2);</div><div class='hunk'>@@ -1674,12 +1657,14 @@ static int snd_emu10k1_fx8010_playback_prepare(struct snd_pcm_substream *substre</div><div class='ctx'> 	pcm-&gt;pcm_rec.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	pcm-&gt;tram_pos = INITIAL_TRAM_POS(pcm-&gt;buffer_size);</div><div class='ctx'> 	pcm-&gt;tram_shift = 0;</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_running, 0, 0);	/* reset */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_trigger, 0, 0);	/* reset */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_size, 0, runtime-&gt;buffer_size);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_ptr, 0, 0);		/* reset ptr number */</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_count, 0, runtime-&gt;period_size);</div><div class='del'>-	snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_tmpcount, 0, runtime-&gt;period_size);</div><div class='add'>+	snd_emu10k1_ptr_write_multiple(emu, 0,</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_running, 0,	/* reset */</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_trigger, 0,	/* reset */</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_size, runtime-&gt;buffer_size,</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_ptr, 0,	/* reset ptr number */</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_count, runtime-&gt;period_size,</div><div class='add'>+		emu-&gt;gpr_base + pcm-&gt;gpr_tmpcount, runtime-&gt;period_size,</div><div class='add'>+		REGLIST_END);</div><div class='ctx'> 	for (i = 0; i &lt; pcm-&gt;channels; i++)</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm-&gt;etram[i], 0, (TANKMEMADDRREG_READ|TANKMEMADDRREG_ALIGN) + i * (runtime-&gt;buffer_size / pcm-&gt;channels));</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1689,9 +1674,9 @@ static int snd_emu10k1_fx8010_playback_trigger(struct snd_pcm_substream *substre</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm *pcm = &amp;emu-&gt;fx8010.pcm[substream-&gt;number];</div><div class='del'>-	int result = 0;</div><div class='add'>+	int result;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		/* follow thru */</div><div class='hunk'>@@ -1711,25 +1696,22 @@ static int snd_emu10k1_fx8010_playback_trigger(struct snd_pcm_substream *substre</div><div class='ctx'> #endif</div><div class='ctx'> 		result = snd_emu10k1_fx8010_register_irq_handler(emu, snd_emu10k1_fx8010_playback_irq, pcm-&gt;gpr_running, substream, &amp;pcm-&gt;irq);</div><div class='ctx'> 		if (result &lt; 0)</div><div class='del'>-			goto __err;</div><div class='add'>+			return result;</div><div class='ctx'> 		snd_emu10k1_fx8010_playback_transfer(substream);	/* roll the ball */</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_trigger, 0, 1);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		snd_emu10k1_fx8010_unregister_irq_handler(emu, pcm-&gt;irq); pcm-&gt;irq = NULL;</div><div class='add'>+		snd_emu10k1_fx8010_unregister_irq_handler(emu, &amp;pcm-&gt;irq);</div><div class='ctx'> 		snd_emu10k1_ptr_write(emu, emu-&gt;gpr_base + pcm-&gt;gpr_trigger, 0, 0);</div><div class='ctx'> 		pcm-&gt;tram_pos = INITIAL_TRAM_POS(pcm-&gt;buffer_size);</div><div class='ctx'> 		pcm-&gt;tram_shift = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		result = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-      __err:</div><div class='del'>-	spin_unlock(&amp;emu-&gt;reg_lock);</div><div class='del'>-	return result;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_emu10k1_fx8010_playback_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1744,11 +1726,12 @@ static snd_pcm_uframes_t snd_emu10k1_fx8010_playback_pointer(struct snd_pcm_subs</div><div class='ctx'> 	return snd_pcm_indirect_playback_pointer(substream, &amp;pcm-&gt;pcm_rec, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_emu10k1_fx8010_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_emu10k1_fx8010_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_RESUME |</div><div class='del'>-				 /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE),</div><div class='add'>+				 /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE |</div><div class='add'>+				 SNDRV_PCM_INFO_SYNC_APPLPTR),</div><div class='ctx'> 	.formats =		SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,</div><div class='ctx'> 	.rates =		SNDRV_PCM_RATE_48000,</div><div class='ctx'> 	.rate_min =		48000,</div><div class='hunk'>@@ -1772,13 +1755,10 @@ static int snd_emu10k1_fx8010_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;hw = snd_emu10k1_fx8010_playback;</div><div class='ctx'> 	runtime-&gt;hw.channels_min = runtime-&gt;hw.channels_max = pcm-&gt;channels;</div><div class='ctx'> 	runtime-&gt;hw.period_bytes_max = (pcm-&gt;buffer_size * 2) / 2;</div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='del'>-	if (pcm-&gt;valid == 0) {</div><div class='del'>-		spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='add'>+	if (pcm-&gt;valid == 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> 	pcm-&gt;opened = 1;</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1787,17 +1767,14 @@ static int snd_emu10k1_fx8010_playback_close(struct snd_pcm_substream *substream</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_emu10k1_fx8010_pcm *pcm = &amp;emu-&gt;fx8010.pcm[substream-&gt;number];</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;emu-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	pcm-&gt;opened = 0;</div><div class='del'>-	spin_unlock_irq(&amp;emu-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {</div><div class='ctx'> 	.open =			snd_emu10k1_fx8010_playback_open,</div><div class='ctx'> 	.close =		snd_emu10k1_fx8010_playback_close,</div><div class='del'>-	.ioctl =		snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =		snd_emu10k1_fx8010_playback_hw_params,</div><div class='ctx'> 	.hw_free =		snd_emu10k1_fx8010_playback_hw_free,</div><div class='ctx'> 	.prepare =		snd_emu10k1_fx8010_playback_prepare,</div><div class='ctx'> 	.trigger =		snd_emu10k1_fx8010_playback_trigger,</div><div class='hunk'>@@ -1805,61 +1782,55 @@ static struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {</div><div class='ctx'> 	.ack =			snd_emu10k1_fx8010_playback_transfer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_pcm_efx(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)</div><div class='add'>+int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "emu10k1 efx", device, 8, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "emu10k1 efx", device, emu-&gt;audigy ? 0 : 8, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_emu10k1_fx8010_playback_ops);</div><div class='add'>+	if (!emu-&gt;audigy)</div><div class='add'>+		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_emu10k1_fx8010_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_emu10k1_capture_efx_ops);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "Multichannel Capture/PT Playback");</div><div class='add'>+	if (emu-&gt;audigy)</div><div class='add'>+		strscpy(pcm-&gt;name, "Multichannel Capture");</div><div class='add'>+	else</div><div class='add'>+		strscpy(pcm-&gt;name, "Multichannel Capture/PT Playback");</div><div class='ctx'> 	emu-&gt;pcm_efx = pcm;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> </div><div class='del'>-	/* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs </div><div class='del'>-	 * to these</div><div class='del'>-	 */	</div><div class='del'>-	</div><div class='del'>-	/* emu-&gt;efx_voices_mask[0] = FXWC_DEFAULTROUTE_C | FXWC_DEFAULTROUTE_A; */</div><div class='del'>-	if (emu-&gt;audigy) {</div><div class='del'>-		emu-&gt;efx_voices_mask[0] = 0;</div><div class='del'>-		if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='del'>-			/* Pavel Hofman - 32 voices will be used for</div><div class='del'>-			 * capture (write mode) -</div><div class='del'>-			 * each bit = corresponding voice</div><div class='del'>-			 */</div><div class='del'>-			emu-&gt;efx_voices_mask[1] = 0xffffffff;</div><div class='del'>-		else</div><div class='add'>+	if (!emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+		// On Sound Blasters, the DSP code copies the EXTINs to FXBUS2.</div><div class='add'>+		// The mask determines which of these and the EXTOUTs the multi-</div><div class='add'>+		// channel capture actually records (the channel order is fixed).</div><div class='add'>+		if (emu-&gt;audigy) {</div><div class='add'>+			emu-&gt;efx_voices_mask[0] = 0;</div><div class='ctx'> 			emu-&gt;efx_voices_mask[1] = 0xffff;</div><div class='add'>+		} else {</div><div class='add'>+			emu-&gt;efx_voices_mask[0] = 0xffff0000;</div><div class='add'>+			emu-&gt;efx_voices_mask[1] = 0;</div><div class='add'>+		}</div><div class='add'>+		kctl = snd_ctl_new1(&amp;snd_emu10k1_pcm_efx_voices_mask, emu);</div><div class='add'>+		if (!kctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		kctl-&gt;id.device = device;</div><div class='add'>+		err = snd_ctl_add(emu-&gt;card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	} else {</div><div class='del'>-		emu-&gt;efx_voices_mask[0] = 0xffff0000;</div><div class='del'>-		emu-&gt;efx_voices_mask[1] = 0;</div><div class='add'>+		// On E-MU cards, the DSP code copies the P16VINs/EMU32INs to</div><div class='add'>+		// FXBUS2. These are already selected &amp; routed by the FPGA,</div><div class='add'>+		// so there is no need to apply additional masking.</div><div class='ctx'> 	}</div><div class='del'>-	/* For emu1010, the control has to set 32 upper bits (voices)</div><div class='del'>-	 * out of the 64 bits (voices) to true for the 16-channels capture</div><div class='del'>-	 * to work correctly. Correct A_FXWC2 initial value (0xffffffff)</div><div class='del'>-	 * is already defined but the snd_emu10k1_pcm_efx_voices_mask</div><div class='del'>-	 * control can override this register's value.</div><div class='del'>-	 */</div><div class='del'>-	kctl = snd_ctl_new1(&amp;snd_emu10k1_pcm_efx_voices_mask, emu);</div><div class='del'>-	if (!kctl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	kctl-&gt;id.device = device;</div><div class='del'>-	snd_ctl_add(emu-&gt;card, kctl);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu-&gt;pci), 64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+				       64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c<br/>index bc38dd4d071f..f6186b5be049 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emuproc.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/emuproc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/emuproc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/emuproc.c</a></div><div class='hunk'>@@ -1,50 +1,31 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *                   Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for control of EMU10K1 chips / proc interface routines</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='del'>- *  	Added EMU 1010 support.</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips / proc interface routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='ctx'> #include "p16v.h"</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,</div><div class='ctx'> 					  struct snd_info_buffer *buffer,</div><div class='ctx'> 					  char *title,</div><div class='ctx'> 					  int status_reg,</div><div class='ctx'> 					  int rate_reg)</div><div class='ctx'> {</div><div class='del'>-	static char *clkaccy[4] = { "1000ppm", "50ppm", "variable", "unknown" };</div><div class='del'>-	static int samplerate[16] = { 44100, 1, 48000, 32000, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };</div><div class='del'>-	static char *channel[16] = { "unspec", "left", "right", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15" };</div><div class='del'>-	static char *emphasis[8] = { "none", "50/15 usec 2 channel", "2", "3", "4", "5", "6", "7" };</div><div class='add'>+	static const char * const clkaccy[4] = { "1000ppm", "50ppm", "variable", "unknown" };</div><div class='add'>+	static const int samplerate[16] = { 44100, 1, 48000, 32000, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };</div><div class='add'>+	static const char * const channel[16] = { "unspec", "left", "right", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15" };</div><div class='add'>+	static const char * const emphasis[8] = { "none", "50/15 usec 2 channel", "2", "3", "4", "5", "6", "7" };</div><div class='ctx'> 	unsigned int status, rate = 0;</div><div class='ctx'> 	</div><div class='ctx'> 	status = snd_emu10k1_ptr_read(emu, status_reg, 0);</div><div class='hunk'>@@ -52,9 +33,9 @@ static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,</div><div class='ctx'> 	snd_iprintf(buffer, "\n%s\n", title);</div><div class='ctx'> </div><div class='ctx'> 	if (status != 0xffffffff) {</div><div class='del'>-		snd_iprintf(buffer, "Professional Mode     : %s\n", (status &amp; SPCS_PROFESSIONAL) ? "yes" : "no");</div><div class='del'>-		snd_iprintf(buffer, "Not Audio Data        : %s\n", (status &amp; SPCS_NOTAUDIODATA) ? "yes" : "no");</div><div class='del'>-		snd_iprintf(buffer, "Copyright             : %s\n", (status &amp; SPCS_COPYRIGHT) ? "yes" : "no");</div><div class='add'>+		snd_iprintf(buffer, "Professional Mode     : %s\n", str_yes_no(status &amp; SPCS_PROFESSIONAL));</div><div class='add'>+		snd_iprintf(buffer, "Not Audio Data        : %s\n", str_yes_no(status &amp; SPCS_NOTAUDIODATA));</div><div class='add'>+		snd_iprintf(buffer, "Copyright             : %s\n", str_yes_no(status &amp; SPCS_COPYRIGHT));</div><div class='ctx'> 		snd_iprintf(buffer, "Emphasis              : %s\n", emphasis[(status &amp; SPCS_EMPHASISMASK) &gt;&gt; 3]);</div><div class='ctx'> 		snd_iprintf(buffer, "Mode                  : %i\n", (status &amp; SPCS_MODEMASK) &gt;&gt; 6);</div><div class='ctx'> 		snd_iprintf(buffer, "Category Code         : 0x%x\n", (status &amp; SPCS_CATEGORYCODEMASK) &gt;&gt; 8);</div><div class='hunk'>@@ -66,9 +47,9 @@ static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,</div><div class='ctx'> </div><div class='ctx'> 		if (rate_reg &gt; 0) {</div><div class='ctx'> 			rate = snd_emu10k1_ptr_read(emu, rate_reg, 0);</div><div class='del'>-			snd_iprintf(buffer, "S/PDIF Valid          : %s\n", rate &amp; SRCS_SPDIFVALID ? "on" : "off");</div><div class='del'>-			snd_iprintf(buffer, "S/PDIF Locked         : %s\n", rate &amp; SRCS_SPDIFLOCKED ? "on" : "off");</div><div class='del'>-			snd_iprintf(buffer, "Rate Locked           : %s\n", rate &amp; SRCS_RATELOCKED ? "on" : "off");</div><div class='add'>+			snd_iprintf(buffer, "S/PDIF Valid          : %s\n", str_on_off(rate &amp; SRCS_SPDIFVALID));</div><div class='add'>+			snd_iprintf(buffer, "S/PDIF Locked         : %s\n", str_on_off(rate &amp; SRCS_SPDIFLOCKED));</div><div class='add'>+			snd_iprintf(buffer, "Rate Locked           : %s\n", str_on_off(rate &amp; SRCS_RATELOCKED));</div><div class='ctx'> 			/* From ((Rate * 48000 ) / 262144); */</div><div class='ctx'> 			snd_iprintf(buffer, "Estimated Sample Rate : %d\n", ((rate &amp; 0xFFFFF ) * 375) &gt;&gt; 11); </div><div class='ctx'> 		}</div><div class='hunk'>@@ -81,158 +62,100 @@ static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,</div><div class='ctx'> static void snd_emu10k1_proc_read(struct snd_info_entry *entry, </div><div class='ctx'> 				  struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME - output names are in emufx.c too */</div><div class='del'>-	static char *creative_outs[32] = {</div><div class='del'>-		/* 00 */ "AC97 Left",</div><div class='del'>-		/* 01 */ "AC97 Right",</div><div class='del'>-		/* 02 */ "Optical IEC958 Left",</div><div class='del'>-		/* 03 */ "Optical IEC958 Right",</div><div class='del'>-		/* 04 */ "Center",</div><div class='del'>-		/* 05 */ "LFE",</div><div class='del'>-		/* 06 */ "Headphone Left",</div><div class='del'>-		/* 07 */ "Headphone Right",</div><div class='del'>-		/* 08 */ "Surround Left",</div><div class='del'>-		/* 09 */ "Surround Right",</div><div class='del'>-		/* 10 */ "PCM Capture Left",</div><div class='del'>-		/* 11 */ "PCM Capture Right",</div><div class='del'>-		/* 12 */ "MIC Capture",</div><div class='del'>-		/* 13 */ "AC97 Surround Left",</div><div class='del'>-		/* 14 */ "AC97 Surround Right",</div><div class='del'>-		/* 15 */ "???",</div><div class='del'>-		/* 16 */ "???",</div><div class='del'>-		/* 17 */ "Analog Center",</div><div class='del'>-		/* 18 */ "Analog LFE",</div><div class='del'>-		/* 19 */ "???",</div><div class='del'>-		/* 20 */ "???",</div><div class='del'>-		/* 21 */ "???",</div><div class='del'>-		/* 22 */ "???",</div><div class='del'>-		/* 23 */ "???",</div><div class='del'>-		/* 24 */ "???",</div><div class='del'>-		/* 25 */ "???",</div><div class='del'>-		/* 26 */ "???",</div><div class='del'>-		/* 27 */ "???",</div><div class='del'>-		/* 28 */ "???",</div><div class='del'>-		/* 29 */ "???",</div><div class='del'>-		/* 30 */ "???",</div><div class='del'>-		/* 31 */ "???"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	static char *audigy_outs[64] = {</div><div class='del'>-		/* 00 */ "Digital Front Left",</div><div class='del'>-		/* 01 */ "Digital Front Right",</div><div class='del'>-		/* 02 */ "Digital Center",</div><div class='del'>-		/* 03 */ "Digital LEF",</div><div class='del'>-		/* 04 */ "Headphone Left",</div><div class='del'>-		/* 05 */ "Headphone Right",</div><div class='del'>-		/* 06 */ "Digital Rear Left",</div><div class='del'>-		/* 07 */ "Digital Rear Right",</div><div class='del'>-		/* 08 */ "Front Left",</div><div class='del'>-		/* 09 */ "Front Right",</div><div class='del'>-		/* 10 */ "Center",</div><div class='del'>-		/* 11 */ "LFE",</div><div class='del'>-		/* 12 */ "???",</div><div class='del'>-		/* 13 */ "???",</div><div class='del'>-		/* 14 */ "Rear Left",</div><div class='del'>-		/* 15 */ "Rear Right",</div><div class='del'>-		/* 16 */ "AC97 Front Left",</div><div class='del'>-		/* 17 */ "AC97 Front Right",</div><div class='del'>-		/* 18 */ "ADC Caputre Left",</div><div class='del'>-		/* 19 */ "ADC Capture Right",</div><div class='del'>-		/* 20 */ "???",</div><div class='del'>-		/* 21 */ "???",</div><div class='del'>-		/* 22 */ "???",</div><div class='del'>-		/* 23 */ "???",</div><div class='del'>-		/* 24 */ "???",</div><div class='del'>-		/* 25 */ "???",</div><div class='del'>-		/* 26 */ "???",</div><div class='del'>-		/* 27 */ "???",</div><div class='del'>-		/* 28 */ "???",</div><div class='del'>-		/* 29 */ "???",</div><div class='del'>-		/* 30 */ "???",</div><div class='del'>-		/* 31 */ "???",</div><div class='del'>-		/* 32 */ "FXBUS2_0",</div><div class='del'>-		/* 33 */ "FXBUS2_1",</div><div class='del'>-		/* 34 */ "FXBUS2_2",</div><div class='del'>-		/* 35 */ "FXBUS2_3",</div><div class='del'>-		/* 36 */ "FXBUS2_4",</div><div class='del'>-		/* 37 */ "FXBUS2_5",</div><div class='del'>-		/* 38 */ "FXBUS2_6",</div><div class='del'>-		/* 39 */ "FXBUS2_7",</div><div class='del'>-		/* 40 */ "FXBUS2_8",</div><div class='del'>-		/* 41 */ "FXBUS2_9",</div><div class='del'>-		/* 42 */ "FXBUS2_10",</div><div class='del'>-		/* 43 */ "FXBUS2_11",</div><div class='del'>-		/* 44 */ "FXBUS2_12",</div><div class='del'>-		/* 45 */ "FXBUS2_13",</div><div class='del'>-		/* 46 */ "FXBUS2_14",</div><div class='del'>-		/* 47 */ "FXBUS2_15",</div><div class='del'>-		/* 48 */ "FXBUS2_16",</div><div class='del'>-		/* 49 */ "FXBUS2_17",</div><div class='del'>-		/* 50 */ "FXBUS2_18",</div><div class='del'>-		/* 51 */ "FXBUS2_19",</div><div class='del'>-		/* 52 */ "FXBUS2_20",</div><div class='del'>-		/* 53 */ "FXBUS2_21",</div><div class='del'>-		/* 54 */ "FXBUS2_22",</div><div class='del'>-		/* 55 */ "FXBUS2_23",</div><div class='del'>-		/* 56 */ "FXBUS2_24",</div><div class='del'>-		/* 57 */ "FXBUS2_25",</div><div class='del'>-		/* 58 */ "FXBUS2_26",</div><div class='del'>-		/* 59 */ "FXBUS2_27",</div><div class='del'>-		/* 60 */ "FXBUS2_28",</div><div class='del'>-		/* 61 */ "FXBUS2_29",</div><div class='del'>-		/* 62 */ "FXBUS2_30",</div><div class='del'>-		/* 63 */ "FXBUS2_31"</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='del'>-	unsigned int val, val1;</div><div class='del'>-	int nefx = emu-&gt;audigy ? 64 : 32;</div><div class='del'>-	char **outputs = emu-&gt;audigy ? audigy_outs : creative_outs;</div><div class='add'>+	const char * const *inputs = emu-&gt;audigy ?</div><div class='add'>+		snd_emu10k1_audigy_ins : snd_emu10k1_sblive_ins;</div><div class='add'>+	const char * const *outputs = emu-&gt;audigy ?</div><div class='add'>+		snd_emu10k1_audigy_outs : snd_emu10k1_sblive_outs;</div><div class='add'>+	unsigned short extin_mask = emu-&gt;audigy ? ~0 : emu-&gt;fx8010.extin_mask;</div><div class='add'>+	unsigned short extout_mask = emu-&gt;audigy ? ~0 : emu-&gt;fx8010.extout_mask;</div><div class='add'>+	unsigned int val, val1, ptrx, psst, dsl, snda;</div><div class='add'>+	int nefx = emu-&gt;audigy ? 32 : 16;</div><div class='ctx'> 	int idx;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_iprintf(buffer, "EMU10K1\n\n");</div><div class='ctx'> 	snd_iprintf(buffer, "Card                  : %s\n",</div><div class='del'>-		    emu-&gt;audigy ? "Audigy" : (emu-&gt;card_capabilities-&gt;ecard ? "EMU APS" : "Creative"));</div><div class='add'>+		    emu-&gt;card_capabilities-&gt;emu_model ? "E-MU D.A.S." :</div><div class='add'>+		    emu-&gt;card_capabilities-&gt;ecard ? "E-MU A.P.S." :</div><div class='add'>+		    emu-&gt;audigy ? "SB Audigy" : "SB Live!");</div><div class='ctx'> 	snd_iprintf(buffer, "Internal TRAM (words) : 0x%x\n", emu-&gt;fx8010.itram_size);</div><div class='ctx'> 	snd_iprintf(buffer, "External TRAM (words) : 0x%x\n", (int)emu-&gt;fx8010.etram_pages.bytes / 2);</div><div class='del'>-	snd_iprintf(buffer, "\n");</div><div class='del'>-	snd_iprintf(buffer, "Effect Send Routing   :\n");</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "\nEffect Send Routing &amp; Amounts:\n");</div><div class='ctx'> 	for (idx = 0; idx &lt; NUM_G; idx++) {</div><div class='del'>-		val = emu-&gt;audigy ?</div><div class='del'>-			snd_emu10k1_ptr_read(emu, A_FXRT1, idx) :</div><div class='del'>-			snd_emu10k1_ptr_read(emu, FXRT, idx);</div><div class='del'>-		val1 = emu-&gt;audigy ?</div><div class='del'>-			snd_emu10k1_ptr_read(emu, A_FXRT2, idx) :</div><div class='del'>-			0;</div><div class='add'>+		ptrx = snd_emu10k1_ptr_read(emu, PTRX, idx);</div><div class='add'>+		psst = snd_emu10k1_ptr_read(emu, PSST, idx);</div><div class='add'>+		dsl = snd_emu10k1_ptr_read(emu, DSL, idx);</div><div class='ctx'> 		if (emu-&gt;audigy) {</div><div class='del'>-			snd_iprintf(buffer, "Ch%i: A=%i, B=%i, C=%i, D=%i, ",</div><div class='add'>+			val = snd_emu10k1_ptr_read(emu, A_FXRT1, idx);</div><div class='add'>+			val1 = snd_emu10k1_ptr_read(emu, A_FXRT2, idx);</div><div class='add'>+			snda = snd_emu10k1_ptr_read(emu, A_SENDAMOUNTS, idx);</div><div class='add'>+			snd_iprintf(buffer, "Ch%-2i: A=%2i:%02x, B=%2i:%02x, C=%2i:%02x, D=%2i:%02x, ",</div><div class='ctx'> 				idx,</div><div class='del'>-				val &amp; 0x3f,</div><div class='del'>-				(val &gt;&gt; 8) &amp; 0x3f,</div><div class='del'>-				(val &gt;&gt; 16) &amp; 0x3f,</div><div class='del'>-				(val &gt;&gt; 24) &amp; 0x3f);</div><div class='del'>-			snd_iprintf(buffer, "E=%i, F=%i, G=%i, H=%i\n",</div><div class='del'>-				val1 &amp; 0x3f,</div><div class='del'>-				(val1 &gt;&gt; 8) &amp; 0x3f,</div><div class='del'>-				(val1 &gt;&gt; 16) &amp; 0x3f,</div><div class='del'>-				(val1 &gt;&gt; 24) &amp; 0x3f);</div><div class='add'>+				val &amp; 0x3f, REG_VAL_GET(PTRX_FXSENDAMOUNT_A, ptrx),</div><div class='add'>+				(val &gt;&gt; 8) &amp; 0x3f, REG_VAL_GET(PTRX_FXSENDAMOUNT_B, ptrx),</div><div class='add'>+				(val &gt;&gt; 16) &amp; 0x3f, REG_VAL_GET(PSST_FXSENDAMOUNT_C, psst),</div><div class='add'>+				(val &gt;&gt; 24) &amp; 0x3f, REG_VAL_GET(DSL_FXSENDAMOUNT_D, dsl));</div><div class='add'>+			snd_iprintf(buffer, "E=%2i:%02x, F=%2i:%02x, G=%2i:%02x, H=%2i:%02x\n",</div><div class='add'>+				val1 &amp; 0x3f, (snda &gt;&gt; 24) &amp; 0xff,</div><div class='add'>+				(val1 &gt;&gt; 8) &amp; 0x3f, (snda &gt;&gt; 16) &amp; 0xff,</div><div class='add'>+				(val1 &gt;&gt; 16) &amp; 0x3f, (snda &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+				(val1 &gt;&gt; 24) &amp; 0x3f, snda &amp; 0xff);</div><div class='ctx'> 		} else {</div><div class='del'>-			snd_iprintf(buffer, "Ch%i: A=%i, B=%i, C=%i, D=%i\n",</div><div class='add'>+			val = snd_emu10k1_ptr_read(emu, FXRT, idx);</div><div class='add'>+			snd_iprintf(buffer, "Ch%-2i: A=%2i:%02x, B=%2i:%02x, C=%2i:%02x, D=%2i:%02x\n",</div><div class='ctx'> 				idx,</div><div class='del'>-				(val &gt;&gt; 16) &amp; 0x0f,</div><div class='del'>-				(val &gt;&gt; 20) &amp; 0x0f,</div><div class='del'>-				(val &gt;&gt; 24) &amp; 0x0f,</div><div class='del'>-				(val &gt;&gt; 28) &amp; 0x0f);</div><div class='add'>+				(val &gt;&gt; 16) &amp; 0x0f, REG_VAL_GET(PTRX_FXSENDAMOUNT_A, ptrx),</div><div class='add'>+				(val &gt;&gt; 20) &amp; 0x0f, REG_VAL_GET(PTRX_FXSENDAMOUNT_B, ptrx),</div><div class='add'>+				(val &gt;&gt; 24) &amp; 0x0f, REG_VAL_GET(PSST_FXSENDAMOUNT_C, psst),</div><div class='add'>+				(val &gt;&gt; 28) &amp; 0x0f, REG_VAL_GET(DSL_FXSENDAMOUNT_D, dsl));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_iprintf(buffer, "\nCaptured FX Outputs   :\n");</div><div class='del'>-	for (idx = 0; idx &lt; nefx; idx++) {</div><div class='del'>-		if (emu-&gt;efx_voices_mask[idx/32] &amp; (1 &lt;&lt; (idx%32)))</div><div class='del'>-			snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);</div><div class='add'>+	snd_iprintf(buffer, "\nEffect Send Targets:\n");</div><div class='add'>+	// Audigy actually has 64, but we don't use them all.</div><div class='add'>+	for (idx = 0; idx &lt; 32; idx++) {</div><div class='add'>+		const char *c = snd_emu10k1_fxbus[idx];</div><div class='add'>+		if (c)</div><div class='add'>+			snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, c);</div><div class='add'>+	}</div><div class='add'>+	if (!emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='add'>+		snd_iprintf(buffer, "\nOutput Channels:\n");</div><div class='add'>+		for (idx = 0; idx &lt; 32; idx++)</div><div class='add'>+			if (outputs[idx] &amp;&amp; (extout_mask &amp; (1 &lt;&lt; idx)))</div><div class='add'>+				snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, outputs[idx]);</div><div class='add'>+		snd_iprintf(buffer, "\nInput Channels:\n");</div><div class='add'>+		for (idx = 0; idx &lt; 16; idx++)</div><div class='add'>+			if (inputs[idx] &amp;&amp; (extin_mask &amp; (1 &lt;&lt; idx)))</div><div class='add'>+				snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, inputs[idx]);</div><div class='add'>+		snd_iprintf(buffer, "\nMultichannel Capture Sources:\n");</div><div class='add'>+		for (idx = 0; idx &lt; nefx; idx++)</div><div class='add'>+			if (emu-&gt;efx_voices_mask[0] &amp; (1 &lt;&lt; idx))</div><div class='add'>+				snd_iprintf(buffer, "  Channel %02i [Output: %s]\n",</div><div class='add'>+					    idx, outputs[idx] ? outputs[idx] : "???");</div><div class='add'>+		if (emu-&gt;audigy) {</div><div class='add'>+			for (idx = 0; idx &lt; 32; idx++)</div><div class='add'>+				if (emu-&gt;efx_voices_mask[1] &amp; (1 &lt;&lt; idx))</div><div class='add'>+					snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",</div><div class='add'>+						    idx + 32, inputs[idx] ? inputs[idx] : "???");</div><div class='add'>+		} else {</div><div class='add'>+			for (idx = 0; idx &lt; 16; idx++) {</div><div class='add'>+				if (emu-&gt;efx_voices_mask[0] &amp; ((1 &lt;&lt; 16) &lt;&lt; idx)) {</div><div class='add'>+					if (emu-&gt;card_capabilities-&gt;sblive51) {</div><div class='add'>+						s8 c = snd_emu10k1_sblive51_fxbus2_map[idx];</div><div class='add'>+						if (c == -1)</div><div class='add'>+							snd_iprintf(buffer, "  Channel %02i [Output: %s]\n",</div><div class='add'>+								    idx + 16, outputs[idx + 16]);</div><div class='add'>+						else</div><div class='add'>+							snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",</div><div class='add'>+								    idx + 16, inputs[c]);</div><div class='add'>+					} else {</div><div class='add'>+						snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",</div><div class='add'>+							    idx + 16, inputs[idx] ? inputs[idx] : "???");</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_iprintf(buffer, "\nAll FX Outputs        :\n");</div><div class='del'>-	for (idx = 0; idx &lt; (emu-&gt;audigy ? 64 : 32); idx++)</div><div class='del'>-		snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry, </div><div class='hunk'>@@ -241,36 +164,42 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	u32 value;</div><div class='ctx'> 	u32 value2;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 rate;</div><div class='ctx'> </div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		snd_emu1010_fpga_read(emu, 0x38, &amp;value);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		if ((value &amp; 0x1) == 0) {</div><div class='del'>-			spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-			snd_emu1010_fpga_read(emu, 0x2a, &amp;value);</div><div class='del'>-			snd_emu1010_fpga_read(emu, 0x2b, &amp;value2);</div><div class='del'>-			spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-			rate = 0x1770000 / (((value &lt;&lt; 5) | value2)+1);	</div><div class='del'>-			snd_iprintf(buffer, "ADAT Locked : %u\n", rate);</div><div class='del'>-		} else {</div><div class='del'>-			snd_iprintf(buffer, "ADAT Unlocked\n");</div><div class='del'>-		}</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		snd_emu1010_fpga_read(emu, 0x20, &amp;value);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		if ((value &amp; 0x4) == 0) {</div><div class='del'>-			spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-			snd_emu1010_fpga_read(emu, 0x28, &amp;value);</div><div class='del'>-			snd_emu1010_fpga_read(emu, 0x29, &amp;value2);</div><div class='del'>-			spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-			rate = 0x1770000 / (((value &lt;&lt; 5) | value2)+1);	</div><div class='del'>-			snd_iprintf(buffer, "SPDIF Locked : %d\n", rate);</div><div class='del'>-		} else {</div><div class='del'>-			snd_iprintf(buffer, "SPDIF Unlocked\n");</div><div class='add'>+		guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+</div><div class='add'>+		// This represents the S/PDIF lock status on 0404b, which is</div><div class='add'>+		// kinda weird and unhelpful, because monitoring it via IRQ is</div><div class='add'>+		// impractical (one gets an IRQ flood as long as it is desynced).</div><div class='add'>+		snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &amp;value);</div><div class='add'>+		snd_iprintf(buffer, "Lock status 1: %#x\n", value &amp; 0x10);</div><div class='add'>+</div><div class='add'>+		// Bit 0x1 in LO being 0 is supposedly for ADAT lock.</div><div class='add'>+		// The registers are always all zero on 0404b.</div><div class='add'>+		snd_emu1010_fpga_read(emu, EMU_HANA_LOCK_STS_LO, &amp;value);</div><div class='add'>+		snd_emu1010_fpga_read(emu, EMU_HANA_LOCK_STS_HI, &amp;value2);</div><div class='add'>+		snd_iprintf(buffer, "Lock status 2: %#x %#x\n", value, value2);</div><div class='add'>+</div><div class='add'>+		snd_iprintf(buffer, "S/PDIF rate: %dHz\n",</div><div class='add'>+			    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_HANA_SPDIF_IN));</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;emu_model != EMU_MODEL_EMU0404) {</div><div class='add'>+			snd_iprintf(buffer, "ADAT rate: %dHz\n",</div><div class='add'>+				    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_HANA_ADAT_IN));</div><div class='add'>+			snd_iprintf(buffer, "Dock rate: %dHz\n",</div><div class='add'>+				    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_2ND_HANA));</div><div class='ctx'> 		}</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU0404 ||</div><div class='add'>+		    emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1010)</div><div class='add'>+			snd_iprintf(buffer, "BNC rate: %dHz\n",</div><div class='add'>+				    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_SYNC_BNC));</div><div class='add'>+</div><div class='add'>+		snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &amp;value);</div><div class='add'>+		if (value &amp; EMU_HANA_SPDIF_MODE_RX_INVALID)</div><div class='add'>+			snd_iprintf(buffer, "\nS/PDIF input invalid\n");</div><div class='add'>+		else</div><div class='add'>+			snd_iprintf(buffer, "\nS/PDIF mode: %s%s\n",</div><div class='add'>+				    value &amp; EMU_HANA_SPDIF_MODE_RX_PRO ? "professional" : "consumer",</div><div class='add'>+				    value &amp; EMU_HANA_SPDIF_MODE_RX_NOCOPY ? ", no copy" : "");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);</div><div class='ctx'> 		snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);</div><div class='hunk'>@@ -278,7 +207,7 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,</div><div class='ctx'> #if 0</div><div class='ctx'> 	val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);</div><div class='ctx'> 	snd_iprintf(buffer, "\nZoomed Video\n");</div><div class='del'>-	snd_iprintf(buffer, "Rate Locked           : %s\n", val &amp; SRCS_RATELOCKED ? "on" : "off");</div><div class='add'>+	snd_iprintf(buffer, "Rate Locked           : %s\n", str_on_off(val &amp; SRCS_RATELOCKED));</div><div class='ctx'> 	snd_iprintf(buffer, "Estimated Sample Rate : 0x%x\n", val &amp; SRCS_ESTSAMPLERATE);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -286,11 +215,10 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,</div><div class='ctx'> static void snd_emu10k1_proc_rates_read(struct snd_info_entry *entry, </div><div class='ctx'> 				  struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	static int samplerate[8] = { 44100, 48000, 96000, 192000, 4, 5, 6, 7 };</div><div class='add'>+	static const int samplerate[8] = { 44100, 48000, 96000, 192000, 4, 5, 6, 7 };</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	unsigned int val, tmp, n;</div><div class='ctx'> 	val = snd_emu10k1_ptr20_read(emu, CAPTURE_RATE_STATUS, 0);</div><div class='del'>-	tmp = (val &gt;&gt; 16) &amp; 0x8;</div><div class='ctx'> 	for (n = 0; n &lt; 4; n++) {</div><div class='ctx'> 		tmp = val &gt;&gt; (16 + (n*4));</div><div class='ctx'> 		if (tmp &amp; 0x8) snd_iprintf(buffer, "Channel %d: Rate=%d\n", n, samplerate[tmp &amp; 0x7]);</div><div class='hunk'>@@ -298,37 +226,148 @@ static void snd_emu10k1_proc_rates_read(struct snd_info_entry *entry,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry, </div><div class='add'>+struct emu10k1_reg_entry {</div><div class='add'>+	unsigned short base, size;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct emu10k1_reg_entry sblive_reg_entries[] = {</div><div class='add'>+	{    0, 0x10, "FXBUS" },</div><div class='add'>+	{ 0x10, 0x10, "EXTIN" },</div><div class='add'>+	{ 0x20, 0x10, "EXTOUT" },</div><div class='add'>+	{ 0x30, 0x10, "FXBUS2" },</div><div class='add'>+	{ 0x40, 0x20, NULL },  // Constants</div><div class='add'>+	{ 0x100, 0x100, "GPR" },</div><div class='add'>+	{ 0x200, 0x80, "ITRAM_DATA" },</div><div class='add'>+	{ 0x280, 0x20, "ETRAM_DATA" },</div><div class='add'>+	{ 0x300, 0x80, "ITRAM_ADDR" },</div><div class='add'>+	{ 0x380, 0x20, "ETRAM_ADDR" },</div><div class='add'>+	{ 0x400, 0, NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct emu10k1_reg_entry audigy_reg_entries[] = {</div><div class='add'>+	{    0, 0x40, "FXBUS" },</div><div class='add'>+	{ 0x40, 0x10, "EXTIN" },</div><div class='add'>+	{ 0x50, 0x10, "P16VIN" },</div><div class='add'>+	{ 0x60, 0x20, "EXTOUT" },</div><div class='add'>+	{ 0x80, 0x20, "FXBUS2" },</div><div class='add'>+	{ 0xa0, 0x10, "EMU32OUTH" },</div><div class='add'>+	{ 0xb0, 0x10, "EMU32OUTL" },</div><div class='add'>+	{ 0xc0, 0x20, NULL },  // Constants</div><div class='add'>+	// This can't be quite right - overlap.</div><div class='add'>+	//{ 0x100, 0xc0, "ITRAM_CTL" },</div><div class='add'>+	//{ 0x1c0, 0x40, "ETRAM_CTL" },</div><div class='add'>+	{ 0x160, 0x20, "A3_EMU32IN" },</div><div class='add'>+	{ 0x1e0, 0x20, "A3_EMU32OUT" },</div><div class='add'>+	{ 0x200, 0xc0, "ITRAM_DATA" },</div><div class='add'>+	{ 0x2c0, 0x40, "ETRAM_DATA" },</div><div class='add'>+	{ 0x300, 0xc0, "ITRAM_ADDR" },</div><div class='add'>+	{ 0x3c0, 0x40, "ETRAM_ADDR" },</div><div class='add'>+	{ 0x400, 0x200, "GPR" },</div><div class='add'>+	{ 0x600, 0, NULL }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const emu10k1_const_entries[] = {</div><div class='add'>+	"C_00000000",</div><div class='add'>+	"C_00000001",</div><div class='add'>+	"C_00000002",</div><div class='add'>+	"C_00000003",</div><div class='add'>+	"C_00000004",</div><div class='add'>+	"C_00000008",</div><div class='add'>+	"C_00000010",</div><div class='add'>+	"C_00000020",</div><div class='add'>+	"C_00000100",</div><div class='add'>+	"C_00010000",</div><div class='add'>+	"C_00000800",</div><div class='add'>+	"C_10000000",</div><div class='add'>+	"C_20000000",</div><div class='add'>+	"C_40000000",</div><div class='add'>+	"C_80000000",</div><div class='add'>+	"C_7fffffff",</div><div class='add'>+	"C_ffffffff",</div><div class='add'>+	"C_fffffffe",</div><div class='add'>+	"C_c0000000",</div><div class='add'>+	"C_4f1bbcdc",</div><div class='add'>+	"C_5a7ef9db",</div><div class='add'>+	"C_00100000",</div><div class='add'>+	"GPR_ACCU",</div><div class='add'>+	"GPR_COND",</div><div class='add'>+	"GPR_NOISE0",</div><div class='add'>+	"GPR_NOISE1",</div><div class='add'>+	"GPR_IRQ",</div><div class='add'>+	"GPR_DBAC",</div><div class='add'>+	"GPR_DBACE",</div><div class='add'>+	"???",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int disasm_emu10k1_reg(char *buffer,</div><div class='add'>+			      const struct emu10k1_reg_entry *entries,</div><div class='add'>+			      unsigned reg, const char *pfx)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; ; i++) {</div><div class='add'>+		unsigned base = entries[i].base;</div><div class='add'>+		unsigned size = entries[i].size;</div><div class='add'>+		if (!size)</div><div class='add'>+			return sprintf(buffer, "%s0x%03x", pfx, reg);</div><div class='add'>+		if (reg &gt;= base &amp;&amp; reg &lt; base + size) {</div><div class='add'>+			const char *name = entries[i].name;</div><div class='add'>+			reg -= base;</div><div class='add'>+			if (name)</div><div class='add'>+				return sprintf(buffer, "%s%s(%u)", pfx, name, reg);</div><div class='add'>+			return sprintf(buffer, "%s%s", pfx, emu10k1_const_entries[reg]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int disasm_sblive_reg(char *buffer, unsigned reg, const char *pfx)</div><div class='add'>+{</div><div class='add'>+	return disasm_emu10k1_reg(buffer, sblive_reg_entries, reg, pfx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int disasm_audigy_reg(char *buffer, unsigned reg, const char *pfx)</div><div class='add'>+{</div><div class='add'>+	return disasm_emu10k1_reg(buffer, audigy_reg_entries, reg, pfx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry,</div><div class='ctx'> 				        struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pc;</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='add'>+	static const char * const insns[16] = {</div><div class='add'>+		"MAC0", "MAC1", "MAC2", "MAC3", "MACINT0", "MACINT1", "ACC3", "MACMV",</div><div class='add'>+		"ANDXOR", "TSTNEG", "LIMITGE", "LIMITLT", "LOG", "EXP", "INTERP", "SKIP",</div><div class='add'>+	};</div><div class='add'>+	static const char spaces[] = "                              ";</div><div class='add'>+	const int nspaces = sizeof(spaces) - 1;</div><div class='ctx'> </div><div class='ctx'> 	snd_iprintf(buffer, "FX8010 Instruction List '%s'\n", emu-&gt;fx8010.name);</div><div class='ctx'> 	snd_iprintf(buffer, "  Code dump      :\n");</div><div class='ctx'> 	for (pc = 0; pc &lt; (emu-&gt;audigy ? 1024 : 512); pc++) {</div><div class='ctx'> 		u32 low, high;</div><div class='add'>+		int len;</div><div class='add'>+		char buf[100];</div><div class='add'>+		char *bufp = buf;</div><div class='ctx'> 			</div><div class='ctx'> 		low = snd_emu10k1_efx_read(emu, pc * 2);</div><div class='ctx'> 		high = snd_emu10k1_efx_read(emu, pc * 2 + 1);</div><div class='del'>-		if (emu-&gt;audigy)</div><div class='del'>-			snd_iprintf(buffer, "    OP(0x%02x, 0x%03x, 0x%03x, 0x%03x, 0x%03x) /* 0x%04x: 0x%08x%08x */\n",</div><div class='del'>-				    (high &gt;&gt; 24) &amp; 0x0f,</div><div class='del'>-				    (high &gt;&gt; 12) &amp; 0x7ff,</div><div class='del'>-				    (high &gt;&gt; 0) &amp; 0x7ff,</div><div class='del'>-				    (low &gt;&gt; 12) &amp; 0x7ff,</div><div class='del'>-				    (low &gt;&gt; 0) &amp; 0x7ff,</div><div class='del'>-				    pc,</div><div class='del'>-				    high, low);</div><div class='del'>-		else</div><div class='del'>-			snd_iprintf(buffer, "    OP(0x%02x, 0x%03x, 0x%03x, 0x%03x, 0x%03x) /* 0x%04x: 0x%08x%08x */\n",</div><div class='del'>-				    (high &gt;&gt; 20) &amp; 0x0f,</div><div class='del'>-				    (high &gt;&gt; 10) &amp; 0x3ff,</div><div class='del'>-				    (high &gt;&gt; 0) &amp; 0x3ff,</div><div class='del'>-				    (low &gt;&gt; 10) &amp; 0x3ff,</div><div class='del'>-				    (low &gt;&gt; 0) &amp; 0x3ff,</div><div class='del'>-				    pc,</div><div class='del'>-				    high, low);</div><div class='add'>+		if (emu-&gt;audigy) {</div><div class='add'>+			bufp += sprintf(bufp, "    %-7s  ", insns[(high &gt;&gt; 24) &amp; 0x0f]);</div><div class='add'>+			bufp += disasm_audigy_reg(bufp, (high &gt;&gt; 12) &amp; 0x7ff, "");</div><div class='add'>+			bufp += disasm_audigy_reg(bufp, (high &gt;&gt; 0) &amp; 0x7ff, ", ");</div><div class='add'>+			bufp += disasm_audigy_reg(bufp, (low &gt;&gt; 12) &amp; 0x7ff, ", ");</div><div class='add'>+			bufp += disasm_audigy_reg(bufp, (low &gt;&gt; 0) &amp; 0x7ff, ", ");</div><div class='add'>+		} else {</div><div class='add'>+			bufp += sprintf(bufp, "    %-7s  ", insns[(high &gt;&gt; 20) &amp; 0x0f]);</div><div class='add'>+			bufp += disasm_sblive_reg(bufp, (high &gt;&gt; 10) &amp; 0x3ff, "");</div><div class='add'>+			bufp += disasm_sblive_reg(bufp, (high &gt;&gt; 0) &amp; 0x3ff, ", ");</div><div class='add'>+			bufp += disasm_sblive_reg(bufp, (low &gt;&gt; 10) &amp; 0x3ff, ", ");</div><div class='add'>+			bufp += disasm_sblive_reg(bufp, (low &gt;&gt; 0) &amp; 0x3ff, ", ");</div><div class='add'>+		}</div><div class='add'>+		len = (int)(ptrdiff_t)(bufp - buf);</div><div class='add'>+		snd_iprintf(buffer, "%s %s /* 0x%04x: 0x%08x%08x */\n",</div><div class='add'>+			    buf, &amp;spaces[nspaces - clamp(65 - len, 0, nspaces)],</div><div class='add'>+			    pc, high, low);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -390,35 +429,78 @@ static void snd_emu10k1_proc_voices_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	struct snd_emu10k1_voice *voice;</div><div class='ctx'> 	int idx;</div><div class='del'>-	</div><div class='del'>-	snd_iprintf(buffer, "ch\tuse\tpcm\tefx\tsynth\tmidi\n");</div><div class='add'>+	static const char * const types[] = {</div><div class='add'>+		"Unused", "EFX", "EFX IRQ", "PCM", "PCM IRQ", "Synth"</div><div class='add'>+	};</div><div class='add'>+	static_assert(ARRAY_SIZE(types) == EMU10K1_NUM_TYPES);</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "ch\tdirty\tlast\tuse\n");</div><div class='ctx'> 	for (idx = 0; idx &lt; NUM_G; idx++) {</div><div class='ctx'> 		voice = &amp;emu-&gt;voices[idx];</div><div class='del'>-		snd_iprintf(buffer, "%i\t%i\t%i\t%i\t%i\t%i\n",</div><div class='add'>+		snd_iprintf(buffer, "%i\t%u\t%u\t%s\n",</div><div class='ctx'> 			idx,</div><div class='del'>-			voice-&gt;use,</div><div class='del'>-			voice-&gt;pcm,</div><div class='del'>-			voice-&gt;efx,</div><div class='del'>-			voice-&gt;synth,</div><div class='del'>-			voice-&gt;midi);</div><div class='add'>+			voice-&gt;dirty,</div><div class='add'>+			voice-&gt;last,</div><div class='add'>+			types[voice-&gt;use]);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='add'>+</div><div class='add'>+static void snd_emu_proc_emu1010_link_read(struct snd_emu10k1 *emu,</div><div class='add'>+					   struct snd_info_buffer *buffer,</div><div class='add'>+					   u32 dst)</div><div class='add'>+{</div><div class='add'>+	u32 src = snd_emu1010_fpga_link_dst_src_read(emu, dst);</div><div class='add'>+	snd_iprintf(buffer, "%04x: %04x\n", dst, src);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,</div><div class='ctx'> 				     struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	u32 value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='add'>+</div><div class='add'>+	guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+</div><div class='ctx'> 	snd_iprintf(buffer, "EMU1010 Registers:\n\n");</div><div class='ctx'> </div><div class='ctx'> 	for(i = 0; i &lt; 0x40; i+=1) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		snd_emu1010_fpga_read(emu, i, &amp;value);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value &gt;&gt; 8) &amp; 0x7f);</div><div class='add'>+		snd_iprintf(buffer, "%02x: %02x\n", i, value);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snd_iprintf(buffer, "\nEMU1010 Routes:\n\n");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++)  // To Alice2/Tina[2] via EMU32</div><div class='add'>+		snd_emu_proc_emu1010_link_read(emu, buffer, i);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model != EMU_MODEL_EMU0404)</div><div class='add'>+		for (i = 0; i &lt; 32; i++)  // To Dock via EDI</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x100 + i);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model != EMU_MODEL_EMU1616)</div><div class='add'>+		for (i = 0; i &lt; 8; i++)  // To Hamoa/local</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x200 + i);</div><div class='add'>+	for (i = 0; i &lt; 8; i++)  // To Hamoa/Mana/local</div><div class='add'>+		snd_emu_proc_emu1010_link_read(emu, buffer, 0x300 + i);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1616) {</div><div class='add'>+		for (i = 0; i &lt; 16; i++)  // To Tina2 via EMU32</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x400 + i);</div><div class='add'>+	} else if (emu-&gt;card_capabilities-&gt;emu_model != EMU_MODEL_EMU0404) {</div><div class='add'>+		for (i = 0; i &lt; 8; i++)  // To Hana ADAT</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x400 + i);</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;emu_model == EMU_MODEL_EMU1010B) {</div><div class='add'>+			for (i = 0; i &lt; 16; i++)  // To Tina via EMU32</div><div class='add'>+				snd_emu_proc_emu1010_link_read(emu, buffer, 0x500 + i);</div><div class='add'>+		} else {</div><div class='add'>+			// To Alice2 via I2S</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x500);</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x501);</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x600);</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x601);</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x700);</div><div class='add'>+			snd_emu_proc_emu1010_link_read(emu, buffer, 0x701);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -427,13 +509,10 @@ static void snd_emu_proc_io_reg_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	unsigned long value;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	snd_iprintf(buffer, "IO Registers:\n\n");</div><div class='ctx'> 	for(i = 0; i &lt; 0x40; i+=4) {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		value = inl(emu-&gt;port + i);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		snd_iprintf(buffer, "%02X: %08lX\n", i, value);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -442,16 +521,13 @@ static void snd_emu_proc_io_reg_write(struct snd_info_entry *entry,</div><div class='ctx'>                                       struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	char line[64];</div><div class='ctx'> 	u32 reg, val;</div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		if (sscanf(line, "%x %x", &amp;reg, &amp;val) != 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (reg &lt; 0x40 &amp;&amp; val &lt;= 0xffffffff) {</div><div class='del'>-			spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 			outl(val, emu-&gt;port + (reg &amp; 0xfffffffc));</div><div class='del'>-			spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -461,16 +537,13 @@ static unsigned int snd_ptr_read(struct snd_emu10k1 * emu,</div><div class='ctx'> 				 unsigned int reg,</div><div class='ctx'> 				 unsigned int chn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int regptr, val;</div><div class='add'>+	unsigned int regptr;</div><div class='ctx'> </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outl(regptr, emu-&gt;port + iobase + PTR);</div><div class='del'>-	val = inl(emu-&gt;port + iobase + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	return inl(emu-&gt;port + iobase + DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ptr_write(struct snd_emu10k1 *emu,</div><div class='hunk'>@@ -480,14 +553,12 @@ static void snd_ptr_write(struct snd_emu10k1 *emu,</div><div class='ctx'> 			  unsigned int data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int regptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irq)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outl(regptr, emu-&gt;port + iobase + PTR);</div><div class='ctx'> 	outl(data, emu-&gt;port + iobase + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -505,10 +576,7 @@ static void snd_emu_proc_ptr_reg_read(struct snd_info_entry *entry,</div><div class='ctx'> 	for(i = offset; i &lt; offset+length; i++) {</div><div class='ctx'> 		snd_iprintf(buffer, "%02X: ",i);</div><div class='ctx'> 		for (j = 0; j &lt; voices; j++) {</div><div class='del'>-			if(iobase == 0)</div><div class='del'>-                		value = snd_ptr_read(emu, 0, i, j);</div><div class='del'>-			else</div><div class='del'>-                		value = snd_ptr_read(emu, 0x20, i, j);</div><div class='add'>+			value = snd_ptr_read(emu, iobase, i, j);</div><div class='ctx'> 			snd_iprintf(buffer, "%08lX ", value);</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_iprintf(buffer, "\n");</div><div class='hunk'>@@ -516,7 +584,8 @@ static void snd_emu_proc_ptr_reg_read(struct snd_info_entry *entry,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,</div><div class='del'>-				       struct snd_info_buffer *buffer, int iobase)</div><div class='add'>+				       struct snd_info_buffer *buffer,</div><div class='add'>+				       int iobase, int length, int voices)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='ctx'> 	char line[64];</div><div class='hunk'>@@ -524,7 +593,7 @@ static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,</div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		if (sscanf(line, "%x %x %x", &amp;reg, &amp;channel_id, &amp;val) != 3)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (reg &lt; 0xa0 &amp;&amp; val &lt;= 0xffffffff &amp;&amp; channel_id &lt;= 3)</div><div class='add'>+		if (reg &lt; length &amp;&amp; channel_id &lt; voices)</div><div class='ctx'> 			snd_ptr_write(emu, iobase, reg, channel_id, val);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -532,13 +601,15 @@ static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,</div><div class='ctx'> static void snd_emu_proc_ptr_reg_write00(struct snd_info_entry *entry,</div><div class='ctx'> 					 struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	snd_emu_proc_ptr_reg_write(entry, buffer, 0);</div><div class='add'>+	snd_emu_proc_ptr_reg_write(entry, buffer, 0, 0x80, 64);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_emu_proc_ptr_reg_write20(struct snd_info_entry *entry,</div><div class='ctx'> 					 struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='del'>-	snd_emu_proc_ptr_reg_write(entry, buffer, 0x20);</div><div class='add'>+	struct snd_emu10k1 *emu = entry-&gt;private_data;</div><div class='add'>+	snd_emu_proc_ptr_reg_write(entry, buffer, 0x20,</div><div class='add'>+				   emu-&gt;card_capabilities-&gt;ca0108_chip ? 0xa0 : 0x80, 4);</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='ctx'> </div><div class='hunk'>@@ -573,99 +644,83 @@ static void snd_emu_proc_ptr_reg_read20c(struct snd_info_entry *entry,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct snd_info_entry_ops snd_emu10k1_proc_ops_fx8010 = {</div><div class='add'>+static const struct snd_info_entry_ops snd_emu10k1_proc_ops_fx8010 = {</div><div class='ctx'> 	.read = snd_emu10k1_fx8010_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)</div><div class='add'>+int snd_emu10k1_proc_init(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_info_entry *entry;</div><div class='ctx'> #ifdef CONFIG_SND_DEBUG</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;emu_model) {</div><div class='del'>-		if (! snd_card_proc_new(emu-&gt;card, "emu1010_regs", &amp;entry)) </div><div class='del'>-			snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);</div><div class='del'>-	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "io_regs", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_io_reg_write;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='add'>+		snd_card_ro_proc_new(emu-&gt;card, "emu1010_regs",</div><div class='add'>+				     emu, snd_emu_proc_emu1010_reg_read);</div><div class='ctx'> 	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "ptr_regs00a", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00a);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_ptr_reg_write00;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "ptr_regs00b", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read00b);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_ptr_reg_write00;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "ptr_regs20a", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20a);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_ptr_reg_write20;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "ptr_regs20b", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20b);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_ptr_reg_write20;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "ptr_regs20c", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu_proc_ptr_reg_read20c);</div><div class='del'>-		entry-&gt;c.text.write = snd_emu_proc_ptr_reg_write20;</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "io_regs", emu,</div><div class='add'>+			     snd_emu_proc_io_reg_read,</div><div class='add'>+			     snd_emu_proc_io_reg_write);</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "ptr_regs00a", emu,</div><div class='add'>+			     snd_emu_proc_ptr_reg_read00a,</div><div class='add'>+			     snd_emu_proc_ptr_reg_write00);</div><div class='add'>+	snd_card_rw_proc_new(emu-&gt;card, "ptr_regs00b", emu,</div><div class='add'>+			     snd_emu_proc_ptr_reg_read00b,</div><div class='add'>+			     snd_emu_proc_ptr_reg_write00);</div><div class='add'>+	if (!emu-&gt;card_capabilities-&gt;emu_model &amp;&amp;</div><div class='add'>+	    (emu-&gt;card_capabilities-&gt;ca0151_chip || emu-&gt;card_capabilities-&gt;ca0108_chip)) {</div><div class='add'>+		snd_card_rw_proc_new(emu-&gt;card, "ptr_regs20a", emu,</div><div class='add'>+				     snd_emu_proc_ptr_reg_read20a,</div><div class='add'>+				     snd_emu_proc_ptr_reg_write20);</div><div class='add'>+		snd_card_rw_proc_new(emu-&gt;card, "ptr_regs20b", emu,</div><div class='add'>+				     snd_emu_proc_ptr_reg_read20b,</div><div class='add'>+				     snd_emu_proc_ptr_reg_write20);</div><div class='add'>+		if (emu-&gt;card_capabilities-&gt;ca0108_chip)</div><div class='add'>+			snd_card_rw_proc_new(emu-&gt;card, "ptr_regs20c", emu,</div><div class='add'>+					     snd_emu_proc_ptr_reg_read20c,</div><div class='add'>+					     snd_emu_proc_ptr_reg_write20);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "emu10k1", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "emu10k1", emu, snd_emu10k1_proc_read);</div><div class='ctx'> </div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;emu10k2_chip) {</div><div class='del'>-		if (! snd_card_proc_new(emu-&gt;card, "spdif-in", &amp;entry))</div><div class='del'>-			snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_spdif_read);</div><div class='del'>-	}</div><div class='del'>-	if (emu-&gt;card_capabilities-&gt;ca0151_chip) {</div><div class='del'>-		if (! snd_card_proc_new(emu-&gt;card, "capture-rates", &amp;entry))</div><div class='del'>-			snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_rates_read);</div><div class='del'>-	}</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu10k2_chip)</div><div class='add'>+		snd_card_ro_proc_new(emu-&gt;card, "spdif-in", emu,</div><div class='add'>+				     snd_emu10k1_proc_spdif_read);</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;ca0151_chip)</div><div class='add'>+		snd_card_ro_proc_new(emu-&gt;card, "capture-rates", emu,</div><div class='add'>+				     snd_emu10k1_proc_rates_read);</div><div class='ctx'> </div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "voices", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_voices_read);</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "voices", emu,</div><div class='add'>+			     snd_emu10k1_proc_voices_read);</div><div class='ctx'> </div><div class='ctx'> 	if (! snd_card_proc_new(emu-&gt;card, "fx8010_gpr", &amp;entry)) {</div><div class='ctx'> 		entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='ctx'> 		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;</div><div class='add'>+		entry-&gt;mode = S_IFREG | 0444 /*| S_IWUSR*/;</div><div class='ctx'> 		entry-&gt;size = emu-&gt;audigy ? A_TOTAL_SIZE_GPR : TOTAL_SIZE_GPR;</div><div class='ctx'> 		entry-&gt;c.ops = &amp;snd_emu10k1_proc_ops_fx8010;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! snd_card_proc_new(emu-&gt;card, "fx8010_tram_data", &amp;entry)) {</div><div class='ctx'> 		entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='ctx'> 		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;</div><div class='add'>+		entry-&gt;mode = S_IFREG | 0444 /*| S_IWUSR*/;</div><div class='ctx'> 		entry-&gt;size = emu-&gt;audigy ? A_TOTAL_SIZE_TANKMEM_DATA : TOTAL_SIZE_TANKMEM_DATA ;</div><div class='ctx'> 		entry-&gt;c.ops = &amp;snd_emu10k1_proc_ops_fx8010;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! snd_card_proc_new(emu-&gt;card, "fx8010_tram_addr", &amp;entry)) {</div><div class='ctx'> 		entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='ctx'> 		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;</div><div class='add'>+		entry-&gt;mode = S_IFREG | 0444 /*| S_IWUSR*/;</div><div class='ctx'> 		entry-&gt;size = emu-&gt;audigy ? A_TOTAL_SIZE_TANKMEM_ADDR : TOTAL_SIZE_TANKMEM_ADDR ;</div><div class='ctx'> 		entry-&gt;c.ops = &amp;snd_emu10k1_proc_ops_fx8010;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! snd_card_proc_new(emu-&gt;card, "fx8010_code", &amp;entry)) {</div><div class='ctx'> 		entry-&gt;content = SNDRV_INFO_CONTENT_DATA;</div><div class='ctx'> 		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;</div><div class='add'>+		entry-&gt;mode = S_IFREG | 0444 /*| S_IWUSR*/;</div><div class='ctx'> 		entry-&gt;size = emu-&gt;audigy ? A_TOTAL_SIZE_CODE : TOTAL_SIZE_CODE;</div><div class='ctx'> 		entry-&gt;c.ops = &amp;snd_emu10k1_proc_ops_fx8010;</div><div class='ctx'> 	}</div><div class='del'>-	if (! snd_card_proc_new(emu-&gt;card, "fx8010_acode", &amp;entry)) {</div><div class='del'>-		entry-&gt;content = SNDRV_INFO_CONTENT_TEXT;</div><div class='del'>-		entry-&gt;private_data = emu;</div><div class='del'>-		entry-&gt;mode = S_IFREG | S_IRUGO /*| S_IWUSR*/;</div><div class='del'>-		entry-&gt;c.text.read = snd_emu10k1_proc_acode_read;</div><div class='del'>-	}</div><div class='add'>+	snd_card_ro_proc_new(emu-&gt;card, "fx8010_acode", emu,</div><div class='add'>+			     snd_emu10k1_proc_acode_read);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='head'>diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c<br/>index 5ef7080e14d0..9c897c3e8c28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/io.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/io.c</a></div><div class='hunk'>@@ -1,63 +1,56 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='add'>+ *                   Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='add'>+ *                   James Courtier-Dutton &lt;James@superbug.co.uk&gt;</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='del'>- *  Routines for control of EMU10K1 chips</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include "p17v.h"</div><div class='ctx'> </div><div class='add'>+static inline bool check_ptr_reg(struct snd_emu10k1 *emu, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!emu))</div><div class='add'>+		return false;</div><div class='add'>+	if (snd_BUG_ON(reg &amp; (emu-&gt;audigy ? (0xffff0000 &amp; ~A_PTR_ADDRESS_MASK)</div><div class='add'>+					  : (0xffff0000 &amp; ~PTR_ADDRESS_MASK))))</div><div class='add'>+		return false;</div><div class='add'>+	if (snd_BUG_ON(reg &amp; 0x0000ffff &amp; ~PTR_CHANNELNUM_MASK))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int regptr, val;</div><div class='ctx'> 	unsigned int mask;</div><div class='ctx'> </div><div class='del'>-	mask = emu-&gt;audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;</div><div class='del'>-	regptr = ((reg &lt;&lt; 16) &amp; mask) | (chn &amp; PTR_CHANNELNUM_MASK);</div><div class='add'>+	regptr = (reg &lt;&lt; 16) | chn;</div><div class='add'>+	if (!check_ptr_reg(emu, regptr))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;emu_lock) {</div><div class='add'>+		outl(regptr, emu-&gt;port + PTR);</div><div class='add'>+		val = inl(emu-&gt;port + DATA);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (reg &amp; 0xff000000) {</div><div class='ctx'> 		unsigned char size, offset;</div><div class='ctx'> 		</div><div class='ctx'> 		size = (reg &gt;&gt; 24) &amp; 0x3f;</div><div class='ctx'> 		offset = (reg &gt;&gt; 16) &amp; 0x1f;</div><div class='del'>-		mask = ((1 &lt;&lt; size) - 1) &lt;&lt; offset;</div><div class='add'>+		mask = (1 &lt;&lt; size) - 1;</div><div class='ctx'> 		</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-		val = inl(emu-&gt;port + DATA);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		</div><div class='del'>-		return (val &amp; mask) &gt;&gt; offset;</div><div class='add'>+		return (val &gt;&gt; offset) &amp; mask;</div><div class='ctx'> 	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-		outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-		val = inl(emu-&gt;port + DATA);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		return val;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -67,54 +60,74 @@ EXPORT_SYMBOL(snd_emu10k1_ptr_read);</div><div class='ctx'> void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int regptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int mask;</div><div class='ctx'> </div><div class='del'>-	if (!emu) {</div><div class='del'>-		snd_printk(KERN_ERR "ptr_write: emu is null!\n");</div><div class='del'>-		dump_stack();</div><div class='add'>+	regptr = (reg &lt;&lt; 16) | chn;</div><div class='add'>+	if (!check_ptr_reg(emu, regptr))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-	mask = emu-&gt;audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;</div><div class='del'>-	regptr = ((reg &lt;&lt; 16) &amp; mask) | (chn &amp; PTR_CHANNELNUM_MASK);</div><div class='ctx'> </div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (reg &amp; 0xff000000) {</div><div class='ctx'> 		unsigned char size, offset;</div><div class='ctx'> </div><div class='ctx'> 		size = (reg &gt;&gt; 24) &amp; 0x3f;</div><div class='ctx'> 		offset = (reg &gt;&gt; 16) &amp; 0x1f;</div><div class='del'>-		mask = ((1 &lt;&lt; size) - 1) &lt;&lt; offset;</div><div class='del'>-		data = (data &lt;&lt; offset) &amp; mask;</div><div class='add'>+		mask = (1 &lt;&lt; size) - 1;</div><div class='add'>+		if (snd_BUG_ON(data &amp; ~mask))</div><div class='add'>+			return;</div><div class='add'>+		mask &lt;&lt;= offset;</div><div class='add'>+		data &lt;&lt;= offset;</div><div class='ctx'> </div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		outl(regptr, emu-&gt;port + PTR);</div><div class='ctx'> 		data |= inl(emu-&gt;port + DATA) &amp; ~mask;</div><div class='del'>-		outl(data, emu-&gt;port + DATA);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);		</div><div class='ctx'> 	} else {</div><div class='del'>-		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 		outl(regptr, emu-&gt;port + PTR);</div><div class='del'>-		outl(data, emu-&gt;port + DATA);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> 	}</div><div class='add'>+	outl(data, emu-&gt;port + DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(snd_emu10k1_ptr_write);</div><div class='ctx'> </div><div class='add'>+void snd_emu10k1_ptr_write_multiple(struct snd_emu10k1 *emu, unsigned int chn, ...)</div><div class='add'>+{</div><div class='add'>+	va_list va;</div><div class='add'>+	u32 addr_mask;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!emu))</div><div class='add'>+		return;</div><div class='add'>+	if (snd_BUG_ON(chn &amp; ~PTR_CHANNELNUM_MASK))</div><div class='add'>+		return;</div><div class='add'>+	addr_mask = ~((emu-&gt;audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	va_start(va, chn);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	for (;;) {</div><div class='add'>+		u32 data;</div><div class='add'>+		u32 reg = va_arg(va, u32);</div><div class='add'>+		if (reg == REGLIST_END)</div><div class='add'>+			break;</div><div class='add'>+		data = va_arg(va, u32);</div><div class='add'>+		if (snd_BUG_ON(reg &amp; addr_mask))  // Only raw registers supported here</div><div class='add'>+			continue;</div><div class='add'>+		outl((reg &lt;&lt; 16) | chn, emu-&gt;port + PTR);</div><div class='add'>+		outl(data, emu-&gt;port + DATA);</div><div class='add'>+	}</div><div class='add'>+	va_end(va);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL(snd_emu10k1_ptr_write_multiple);</div><div class='add'>+</div><div class='ctx'> unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, </div><div class='ctx'> 					  unsigned int reg, </div><div class='ctx'> 					  unsigned int chn)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int regptr, val;</div><div class='add'>+	unsigned int regptr;</div><div class='ctx'>   </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(regptr, emu-&gt;port + 0x20 + PTR);</div><div class='del'>-	val = inl(emu-&gt;port + 0x20 + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(regptr, emu-&gt;port + PTR2);</div><div class='add'>+	return inl(emu-&gt;port + DATA2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, </div><div class='hunk'>@@ -123,14 +136,12 @@ void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu,</div><div class='ctx'> 				   unsigned int data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int regptr;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	regptr = (reg &lt;&lt; 16) | chn;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(regptr, emu-&gt;port + 0x20 + PTR);</div><div class='del'>-	outl(data, emu-&gt;port + 0x20 + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(regptr, emu-&gt;port + PTR2);</div><div class='add'>+	outl(data, emu-&gt;port + DATA2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,</div><div class='hunk'>@@ -139,22 +150,19 @@ int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,</div><div class='ctx'> 	unsigned int reset, set;</div><div class='ctx'> 	unsigned int reg, tmp;</div><div class='ctx'> 	int n, result;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* This function is not re-entrant, so protect against it. */</div><div class='del'>-	spin_lock(&amp;emu-&gt;spi_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;spi_lock);</div><div class='ctx'> 	if (emu-&gt;card_capabilities-&gt;ca0108_chip)</div><div class='del'>-		reg = 0x3c; /* PTR20, reg 0x3c */</div><div class='add'>+		reg = P17V_SPI;</div><div class='ctx'> 	else {</div><div class='ctx'> 		/* For other chip types the SPI register</div><div class='ctx'> 		 * is currently unknown. */</div><div class='del'>-		err = 1;</div><div class='del'>-		goto spi_write_exit;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (data &gt; 0xffff) {</div><div class='ctx'> 		/* Only 16bit values allowed */</div><div class='del'>-		err = 1;</div><div class='del'>-		goto spi_write_exit;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tmp = snd_emu10k1_ptr20_read(emu, reg, 0);</div><div class='hunk'>@@ -175,15 +183,11 @@ int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (result) {</div><div class='ctx'> 		/* Timed out */</div><div class='del'>-		err = 1;</div><div class='del'>-		goto spi_write_exit;</div><div class='add'>+		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);</div><div class='ctx'> 	tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* Write post */</div><div class='del'>-	err = 0;</div><div class='del'>-spi_write_exit:</div><div class='del'>-	spin_unlock(&amp;emu-&gt;spi_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The ADC does not support i2c read, so only write is implemented */</div><div class='hunk'>@@ -195,15 +199,14 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,</div><div class='ctx'> 	int timeout = 0;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	int retry;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if ((reg &gt; 0x7f) || (value &gt; 0x1ff)) {</div><div class='del'>-		snd_printk(KERN_ERR "i2c_write: invalid values.\n");</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "i2c_write: invalid values.\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* This function is not re-entrant, so protect against it. */</div><div class='del'>-	spin_lock(&amp;emu-&gt;i2c_lock);</div><div class='add'>+	guard(spinlock)(&amp;emu-&gt;i2c_lock);</div><div class='ctx'> </div><div class='ctx'> 	tmp = reg &lt;&lt; 25 | value &lt;&lt; 16;</div><div class='ctx'> </div><div class='hunk'>@@ -226,7 +229,7 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='ctx'> 			if (timeout &gt; 1000) {</div><div class='del'>-                		snd_printk(KERN_WARNING</div><div class='add'>+				dev_warn(emu-&gt;card-&gt;dev,</div><div class='ctx'> 					   "emu10k1:I2C:timeout status=0x%x\n",</div><div class='ctx'> 					   status);</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -238,98 +241,242 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (retry == 10) {</div><div class='del'>-		snd_printk(KERN_ERR "Writing to ADC failed!\n");</div><div class='del'>-		snd_printk(KERN_ERR "status=0x%x, reg=%d, value=%d\n",</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "Writing to ADC failed!\n");</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "status=0x%x, reg=%d, value=%d\n",</div><div class='ctx'> 			status, reg, value);</div><div class='ctx'> 		/* dump_stack(); */</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'>     </div><div class='del'>-	spin_unlock(&amp;emu-&gt;i2c_lock);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value)</div><div class='add'>+static void snd_emu1010_fpga_write_locked(struct snd_emu10k1 *emu, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (reg &gt; 0x3f)</div><div class='del'>-		return 1;</div><div class='add'>+	if (snd_BUG_ON(reg &gt; 0x3f))</div><div class='add'>+		return;</div><div class='ctx'> 	reg += 0x40; /* 0x40 upwards are registers. */</div><div class='del'>-	if (value &gt; 0x3f) /* 0 to 0x3f are values */</div><div class='del'>-		return 1;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(reg, emu-&gt;port + A_IOCFG);</div><div class='add'>+	if (snd_BUG_ON(value &gt; 0x3f)) /* 0 to 0x3f are values */</div><div class='add'>+		return;</div><div class='add'>+	outw(reg, emu-&gt;port + A_GPIO);</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	outl(reg | 0x80, emu-&gt;port + A_IOCFG);  /* High bit clocks the value into the fpga. */</div><div class='add'>+	outw(reg | 0x80, emu-&gt;port + A_GPIO);  /* High bit clocks the value into the fpga. */</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	outl(value, emu-&gt;port + A_IOCFG);</div><div class='add'>+	outw(value, emu-&gt;port + A_GPIO);</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	outl(value | 0x80 , emu-&gt;port + A_IOCFG);  /* High bit clocks the value into the fpga. */</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	outw(value | 0x80 , emu-&gt;port + A_GPIO);  /* High bit clocks the value into the fpga. */</div><div class='add'>+	udelay(10);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+void snd_emu1010_fpga_write(struct snd_emu10k1 *emu, u32 reg, u32 value)</div><div class='add'>+{</div><div class='add'>+	if (snd_BUG_ON(!mutex_is_locked(&amp;emu-&gt;emu1010.lock)))</div><div class='add'>+		return;</div><div class='add'>+	snd_emu1010_fpga_write_locked(emu, reg, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value)</div><div class='add'>+void snd_emu1010_fpga_write_lock(struct snd_emu10k1 *emu, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	if (reg &gt; 0x3f)</div><div class='del'>-		return 1;</div><div class='add'>+	guard(snd_emu1010_fpga_lock)(emu);</div><div class='add'>+	snd_emu1010_fpga_write_locked(emu, reg, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_emu1010_fpga_read(struct snd_emu10k1 *emu, u32 reg, u32 *value)</div><div class='add'>+{</div><div class='add'>+	// The higest input pin is used as the designated interrupt trigger,</div><div class='add'>+	// so it needs to be masked out.</div><div class='add'>+	// But note that any other input pin change will also cause an IRQ,</div><div class='add'>+	// so using this function often causes an IRQ as a side effect.</div><div class='add'>+	u32 mask = emu-&gt;card_capabilities-&gt;ca0108_chip ? 0x1f : 0x7f;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(!mutex_is_locked(&amp;emu-&gt;emu1010.lock)))</div><div class='add'>+		return;</div><div class='add'>+	if (snd_BUG_ON(reg &gt; 0x3f))</div><div class='add'>+		return;</div><div class='ctx'> 	reg += 0x40; /* 0x40 upwards are registers. */</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	outl(reg, emu-&gt;port + A_IOCFG);</div><div class='add'>+	outw(reg, emu-&gt;port + A_GPIO);</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	outl(reg | 0x80, emu-&gt;port + A_IOCFG);  /* High bit clocks the value into the fpga. */</div><div class='add'>+	outw(reg | 0x80, emu-&gt;port + A_GPIO);  /* High bit clocks the value into the fpga. */</div><div class='ctx'> 	udelay(10);</div><div class='del'>-	*value = ((inl(emu-&gt;port + A_IOCFG) &gt;&gt; 8) &amp; 0x7f);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	*value = ((inw(emu-&gt;port + A_GPIO) &gt;&gt; 8) &amp; mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Each Destination has one and only one Source,</div><div class='ctx'>  * but one Source can feed any number of Destinations simultaneously.</div><div class='ctx'>  */</div><div class='del'>-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src)</div><div class='add'>+void snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 *emu, u32 dst, u32 src)</div><div class='ctx'> {</div><div class='del'>-	snd_emu1010_fpga_write(emu, 0x00, ((dst &gt;&gt; 8) &amp; 0x3f) );</div><div class='del'>-	snd_emu1010_fpga_write(emu, 0x01, (dst &amp; 0x3f) );</div><div class='del'>-	snd_emu1010_fpga_write(emu, 0x02, ((src &gt;&gt; 8) &amp; 0x3f) );</div><div class='del'>-	snd_emu1010_fpga_write(emu, 0x03, (src &amp; 0x3f) );</div><div class='add'>+	if (snd_BUG_ON(dst &amp; ~0x71f))</div><div class='add'>+		return;</div><div class='add'>+	if (snd_BUG_ON(src &amp; ~0x71f))</div><div class='add'>+		return;</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DESTHI, dst &gt;&gt; 8);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DESTLO, dst &amp; 0x1f);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_SRCHI, src &gt;&gt; 8);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_SRCLO, src &amp; 0x1f);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+u32 snd_emu1010_fpga_link_dst_src_read(struct snd_emu10k1 *emu, u32 dst)</div><div class='add'>+{</div><div class='add'>+	u32 hi, lo;</div><div class='add'>+</div><div class='add'>+	if (snd_BUG_ON(dst &amp; ~0x71f))</div><div class='add'>+		return 0;</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DESTHI, dst &gt;&gt; 8);</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DESTLO, dst &amp; 0x1f);</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_SRCHI, &amp;hi);</div><div class='add'>+	snd_emu1010_fpga_read(emu, EMU_HANA_SRCLO, &amp;lo);</div><div class='add'>+	return (hi &lt;&lt; 8) | lo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_emu1010_get_raw_rate(struct snd_emu10k1 *emu, u8 src)</div><div class='add'>+{</div><div class='add'>+	u32 reg_lo, reg_hi, value, value2;</div><div class='add'>+</div><div class='add'>+	switch (src) {</div><div class='add'>+	case EMU_HANA_WCLOCK_HANA_SPDIF_IN:</div><div class='add'>+		snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &amp;value);</div><div class='add'>+		if (value &amp; EMU_HANA_SPDIF_MODE_RX_INVALID)</div><div class='add'>+			return 0;</div><div class='add'>+		reg_lo = EMU_HANA_WC_SPDIF_LO;</div><div class='add'>+		reg_hi = EMU_HANA_WC_SPDIF_HI;</div><div class='add'>+		break;</div><div class='add'>+	case EMU_HANA_WCLOCK_HANA_ADAT_IN:</div><div class='add'>+		reg_lo = EMU_HANA_WC_ADAT_LO;</div><div class='add'>+		reg_hi = EMU_HANA_WC_ADAT_HI;</div><div class='add'>+		break;</div><div class='add'>+	case EMU_HANA_WCLOCK_SYNC_BNC:</div><div class='add'>+		reg_lo = EMU_HANA_WC_BNC_LO;</div><div class='add'>+		reg_hi = EMU_HANA_WC_BNC_HI;</div><div class='add'>+		break;</div><div class='add'>+	case EMU_HANA_WCLOCK_2ND_HANA:</div><div class='add'>+		reg_lo = EMU_HANA2_WC_SPDIF_LO;</div><div class='add'>+		reg_hi = EMU_HANA2_WC_SPDIF_HI;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	snd_emu1010_fpga_read(emu, reg_hi, &amp;value);</div><div class='add'>+	snd_emu1010_fpga_read(emu, reg_lo, &amp;value2);</div><div class='add'>+	// FIXME: The /4 is valid for 0404b, but contradicts all other info.</div><div class='add'>+	return 0x1770000 / 4 / (((value &lt;&lt; 5) | value2) + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_emu1010_update_clock(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	int clock;</div><div class='add'>+	u32 leds;</div><div class='add'>+</div><div class='add'>+	switch (emu-&gt;emu1010.wclock) {</div><div class='add'>+	case EMU_HANA_WCLOCK_INT_44_1K | EMU_HANA_WCLOCK_1X:</div><div class='add'>+		clock = 44100;</div><div class='add'>+		leds = EMU_HANA_DOCK_LEDS_2_44K;</div><div class='add'>+		break;</div><div class='add'>+	case EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_1X:</div><div class='add'>+		clock = 48000;</div><div class='add'>+		leds = EMU_HANA_DOCK_LEDS_2_48K;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		clock = snd_emu1010_get_raw_rate(</div><div class='add'>+				emu, emu-&gt;emu1010.wclock &amp; EMU_HANA_WCLOCK_SRC_MASK);</div><div class='add'>+		// The raw rate reading is rather coarse (it cannot accurately</div><div class='add'>+		// represent 44.1 kHz) and fluctuates slightly. Luckily, the</div><div class='add'>+		// clock comes from digital inputs, which use standardized rates.</div><div class='add'>+		// So we round to the closest standard rate and ignore discrepancies.</div><div class='add'>+		if (clock &lt; 46000) {</div><div class='add'>+			clock = 44100;</div><div class='add'>+			leds = EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_44K;</div><div class='add'>+		} else {</div><div class='add'>+			clock = 48000;</div><div class='add'>+			leds = EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_48K;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	emu-&gt;emu1010.word_clock = clock;</div><div class='add'>+</div><div class='add'>+	// FIXME: this should probably represent the AND of all currently</div><div class='add'>+	// used sources' lock status. But we don't know how to get that ...</div><div class='add'>+	leds |= EMU_HANA_DOCK_LEDS_2_LOCK;</div><div class='add'>+</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, leds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, int dock,</div><div class='add'>+				     const struct firmware *fw_entry)</div><div class='add'>+{</div><div class='add'>+	__always_unused u16 write_post;</div><div class='add'>+</div><div class='add'>+	// On E-MU 1010 rev1 the FPGA is a Xilinx Spartan IIE XC2S50E.</div><div class='add'>+	// On E-MU 0404b it is a Xilinx Spartan III XC3S50.</div><div class='add'>+	// The wiring is as follows:</div><div class='add'>+	// GPO7 -&gt; FPGA input &amp; 1K resistor -&gt; FPGA /PGMN &lt;- FPGA output</div><div class='add'>+	//   In normal operation, the active low reset line is held up by</div><div class='add'>+	//   an FPGA output, while the GPO pin performs its duty as control</div><div class='add'>+	//   register access strobe signal. Writing the respective bit to</div><div class='add'>+	//   EMU_HANA_FPGA_CONFIG puts the FPGA output into high-Z mode, at</div><div class='add'>+	//   which point the GPO pin can control the reset line through the</div><div class='add'>+	//   resistor.</div><div class='add'>+	// GPO6 -&gt; FPGA CCLK &amp; FPGA input</div><div class='add'>+	// GPO5 -&gt; FPGA DIN (dual function)</div><div class='add'>+</div><div class='add'>+	// If the FPGA is already programmed, return it to programming mode</div><div class='add'>+	snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,</div><div class='add'>+			       dock ? EMU_HANA_FPGA_CONFIG_AUDIODOCK :</div><div class='add'>+				      EMU_HANA_FPGA_CONFIG_HANA);</div><div class='add'>+</div><div class='add'>+	// Assert reset line for 100uS</div><div class='add'>+	outw(0x00, emu-&gt;port + A_GPIO);</div><div class='add'>+	write_post = inw(emu-&gt;port + A_GPIO);</div><div class='add'>+	udelay(100);</div><div class='add'>+	outw(0x80, emu-&gt;port + A_GPIO);</div><div class='add'>+	write_post = inw(emu-&gt;port + A_GPIO);</div><div class='add'>+	udelay(100);  // Allow FPGA memory to clean</div><div class='add'>+</div><div class='add'>+	// Upload the netlist. Keep reset line high!</div><div class='add'>+	for (int n = 0; n &lt; fw_entry-&gt;size; n++) {</div><div class='add'>+		u8 value = fw_entry-&gt;data[n];</div><div class='add'>+		for (int i = 0; i &lt; 8; i++) {</div><div class='add'>+			u16 reg = 0x80;</div><div class='add'>+			if (value &amp; 1)</div><div class='add'>+				reg |= 0x20;</div><div class='add'>+			value &gt;&gt;= 1;</div><div class='add'>+			outw(reg, emu-&gt;port + A_GPIO);</div><div class='add'>+			write_post = inw(emu-&gt;port + A_GPIO);</div><div class='add'>+			outw(reg | 0x40, emu-&gt;port + A_GPIO);</div><div class='add'>+			write_post = inw(emu-&gt;port + A_GPIO);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	// After programming, set GPIO bit 4 high again.</div><div class='add'>+	// This appears to be a config word that the rev1 Hana</div><div class='add'>+	// firmware reads; weird things happen without this.</div><div class='add'>+	outw(0x10, emu-&gt;port + A_GPIO);</div><div class='add'>+	write_post = inw(emu-&gt;port + A_GPIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	enable = inl(emu-&gt;port + INTE) | intrenb;</div><div class='ctx'> 	outl(enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	enable = inl(emu-&gt;port + INTE) &amp; ~intrenb;</div><div class='ctx'> 	outl(enable, emu-&gt;port + INTE);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(CLIEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		val = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -340,16 +487,13 @@ void snd_emu10k1_voice_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenu</div><div class='ctx'> 		val |= 1 &lt;&lt; voicenum;</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(val, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(CLIEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		val = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -360,15 +504,11 @@ void snd_emu10k1_voice_intr_disable(struct snd_emu10k1 *emu, unsigned int voicen</div><div class='ctx'> 		val &amp;= ~(1 &lt;&lt; voicenum);</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(val, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(CLIPH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		voicenum = 1 &lt;&lt; (voicenum - 32);</div><div class='hunk'>@@ -377,16 +517,13 @@ void snd_emu10k1_voice_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> 		voicenum = 1 &lt;&lt; voicenum;</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(voicenum, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_half_loop_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(HLIEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		val = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -397,16 +534,13 @@ void snd_emu10k1_voice_half_loop_intr_enable(struct snd_emu10k1 *emu, unsigned i</div><div class='ctx'> 		val |= 1 &lt;&lt; voicenum;</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(val, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_half_loop_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(HLIEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		val = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -417,15 +551,11 @@ void snd_emu10k1_voice_half_loop_intr_disable(struct snd_emu10k1 *emu, unsigned</div><div class='ctx'> 		val &amp;= ~(1 &lt;&lt; voicenum);</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(val, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_half_loop_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(HLIPH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		voicenum = 1 &lt;&lt; (voicenum - 32);</div><div class='hunk'>@@ -434,16 +564,14 @@ void snd_emu10k1_voice_half_loop_intr_ack(struct snd_emu10k1 *emu, unsigned int</div><div class='ctx'> 		voicenum = 1 &lt;&lt; voicenum;</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(voicenum, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if 0</div><div class='ctx'> void snd_emu10k1_voice_set_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int sol;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		sol = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -454,16 +582,13 @@ void snd_emu10k1_voice_set_loop_stop(struct snd_emu10k1 *emu, unsigned int voice</div><div class='ctx'> 		sol |= 1 &lt;&lt; voicenum;</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(sol, emu-&gt;port + DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_voice_clear_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int sol;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	/* voice interrupt */</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	if (voicenum &gt;= 32) {</div><div class='ctx'> 		outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='ctx'> 		sol = inl(emu-&gt;port + DATA);</div><div class='hunk'>@@ -474,7 +599,83 @@ void snd_emu10k1_voice_clear_loop_stop(struct snd_emu10k1 *emu, unsigned int voi</div><div class='ctx'> 		sol &amp;= ~(1 &lt;&lt; voicenum);</div><div class='ctx'> 	}</div><div class='ctx'> 	outl(sol, emu-&gt;port + DATA);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void snd_emu10k1_voice_set_loop_stop_multiple(struct snd_emu10k1 *emu, u64 voices)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(SOLEL &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	outl(inl(emu-&gt;port + DATA) | (u32)voices, emu-&gt;port + DATA);</div><div class='add'>+	outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	outl(inl(emu-&gt;port + DATA) | (u32)(voices &gt;&gt; 32), emu-&gt;port + DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_emu10k1_voice_clear_loop_stop_multiple(struct snd_emu10k1 *emu, u64 voices)</div><div class='add'>+{</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='add'>+	outl(SOLEL &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	outl(inl(emu-&gt;port + DATA) &amp; (u32)~voices, emu-&gt;port + DATA);</div><div class='add'>+	outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	outl(inl(emu-&gt;port + DATA) &amp; (u32)(~voices &gt;&gt; 32), emu-&gt;port + DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_emu10k1_voice_clear_loop_stop_multiple_atomic(struct snd_emu10k1 *emu, u64 voices)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 soll, solh;</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+</div><div class='add'>+	outl(SOLEL &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	soll = inl(emu-&gt;port + DATA);</div><div class='add'>+	outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+	solh = inl(emu-&gt;port + DATA);</div><div class='add'>+</div><div class='add'>+	soll &amp;= (u32)~voices;</div><div class='add'>+	solh &amp;= (u32)(~voices &gt;&gt; 32);</div><div class='add'>+</div><div class='add'>+	for (int tries = 0; tries &lt; 1000; tries++) {</div><div class='add'>+		const u32 quart = 1U &lt;&lt; (REG_SIZE(WC_CURRENTCHANNEL) - 2);</div><div class='add'>+		// First we wait for the third quarter of the sample cycle ...</div><div class='add'>+		u32 wc = inl(emu-&gt;port + WC);</div><div class='add'>+		u32 cc = REG_VAL_GET(WC_CURRENTCHANNEL, wc);</div><div class='add'>+		if (cc &gt;= quart * 2 &amp;&amp; cc &lt; quart * 3) {</div><div class='add'>+			// ... and release the low voices, while the high ones are serviced.</div><div class='add'>+			outl(SOLEL &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+			outl(soll, emu-&gt;port + DATA);</div><div class='add'>+			// Then we wait for the first quarter of the next sample cycle ...</div><div class='add'>+			for (; tries &lt; 1000; tries++) {</div><div class='add'>+				cc = REG_VAL_GET(WC_CURRENTCHANNEL, inl(emu-&gt;port + WC));</div><div class='add'>+				if (cc &lt; quart)</div><div class='add'>+					goto good;</div><div class='add'>+				// We will block for 10+ us with interrupts disabled. This is</div><div class='add'>+				// not nice at all, but necessary for reasonable reliability.</div><div class='add'>+				udelay(1);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		good:</div><div class='add'>+			// ... and release the high voices, while the low ones are serviced.</div><div class='add'>+			outl(SOLEH &lt;&lt; 16, emu-&gt;port + PTR);</div><div class='add'>+			outl(solh, emu-&gt;port + DATA);</div><div class='add'>+			// Finally we verify that nothing interfered in fact.</div><div class='add'>+			if (REG_VAL_GET(WC_SAMPLECOUNTER, inl(emu-&gt;port + WC)) ==</div><div class='add'>+			    ((REG_VAL_GET(WC_SAMPLECOUNTER, wc) + 1) &amp; REG_MASK0(WC_SAMPLECOUNTER))) {</div><div class='add'>+				ret = 0;</div><div class='add'>+			} else {</div><div class='add'>+				ret = -EAGAIN;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		// Don't block for too long</div><div class='add'>+		spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+		udelay(1);</div><div class='add'>+		spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait)</div><div class='hunk'>@@ -499,84 +700,17 @@ void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait)</div><div class='ctx'> unsigned short snd_emu10k1_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned short val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='del'>-	val = inw(emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-	return val;</div><div class='add'>+	return inw(emu-&gt;port + AC97DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void snd_emu10k1_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short data)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = ac97-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	outb(reg, emu-&gt;port + AC97ADDRESS);</div><div class='ctx'> 	outw(data, emu-&gt;port + AC97DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  convert rate to pitch</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-unsigned int snd_emu10k1_rate_to_pitch(unsigned int rate)</div><div class='del'>-{</div><div class='del'>-	static u32 logMagTable[128] = {</div><div class='del'>-		0x00000, 0x02dfc, 0x05b9e, 0x088e6, 0x0b5d6, 0x0e26f, 0x10eb3, 0x13aa2,</div><div class='del'>-		0x1663f, 0x1918a, 0x1bc84, 0x1e72e, 0x2118b, 0x23b9a, 0x2655d, 0x28ed5,</div><div class='del'>-		0x2b803, 0x2e0e8, 0x30985, 0x331db, 0x359eb, 0x381b6, 0x3a93d, 0x3d081,</div><div class='del'>-		0x3f782, 0x41e42, 0x444c1, 0x46b01, 0x49101, 0x4b6c4, 0x4dc49, 0x50191,</div><div class='del'>-		0x5269e, 0x54b6f, 0x57006, 0x59463, 0x5b888, 0x5dc74, 0x60029, 0x623a7,</div><div class='del'>-		0x646ee, 0x66a00, 0x68cdd, 0x6af86, 0x6d1fa, 0x6f43c, 0x7164b, 0x73829,</div><div class='del'>-		0x759d4, 0x77b4f, 0x79c9a, 0x7bdb5, 0x7dea1, 0x7ff5e, 0x81fed, 0x8404e,</div><div class='del'>-		0x86082, 0x88089, 0x8a064, 0x8c014, 0x8df98, 0x8fef1, 0x91e20, 0x93d26,</div><div class='del'>-		0x95c01, 0x97ab4, 0x9993e, 0x9b79f, 0x9d5d9, 0x9f3ec, 0xa11d8, 0xa2f9d,</div><div class='del'>-		0xa4d3c, 0xa6ab5, 0xa8808, 0xaa537, 0xac241, 0xadf26, 0xafbe7, 0xb1885,</div><div class='del'>-		0xb3500, 0xb5157, 0xb6d8c, 0xb899f, 0xba58f, 0xbc15e, 0xbdd0c, 0xbf899,</div><div class='del'>-		0xc1404, 0xc2f50, 0xc4a7b, 0xc6587, 0xc8073, 0xc9b3f, 0xcb5ed, 0xcd07c,</div><div class='del'>-		0xceaec, 0xd053f, 0xd1f73, 0xd398a, 0xd5384, 0xd6d60, 0xd8720, 0xda0c3,</div><div class='del'>-		0xdba4a, 0xdd3b4, 0xded03, 0xe0636, 0xe1f4e, 0xe384a, 0xe512c, 0xe69f3,</div><div class='del'>-		0xe829f, 0xe9b31, 0xeb3a9, 0xecc08, 0xee44c, 0xefc78, 0xf148a, 0xf2c83,</div><div class='del'>-		0xf4463, 0xf5c2a, 0xf73da, 0xf8b71, 0xfa2f0, 0xfba57, 0xfd1a7, 0xfe8df</div><div class='del'>-	};</div><div class='del'>-	static char logSlopeTable[128] = {</div><div class='del'>-		0x5c, 0x5c, 0x5b, 0x5a, 0x5a, 0x59, 0x58, 0x58,</div><div class='del'>-		0x57, 0x56, 0x56, 0x55, 0x55, 0x54, 0x53, 0x53,</div><div class='del'>-		0x52, 0x52, 0x51, 0x51, 0x50, 0x50, 0x4f, 0x4f,</div><div class='del'>-		0x4e, 0x4d, 0x4d, 0x4d, 0x4c, 0x4c, 0x4b, 0x4b,</div><div class='del'>-		0x4a, 0x4a, 0x49, 0x49, 0x48, 0x48, 0x47, 0x47,</div><div class='del'>-		0x47, 0x46, 0x46, 0x45, 0x45, 0x45, 0x44, 0x44,</div><div class='del'>-		0x43, 0x43, 0x43, 0x42, 0x42, 0x42, 0x41, 0x41,</div><div class='del'>-		0x41, 0x40, 0x40, 0x40, 0x3f, 0x3f, 0x3f, 0x3e,</div><div class='del'>-		0x3e, 0x3e, 0x3d, 0x3d, 0x3d, 0x3c, 0x3c, 0x3c,</div><div class='del'>-		0x3b, 0x3b, 0x3b, 0x3b, 0x3a, 0x3a, 0x3a, 0x39,</div><div class='del'>-		0x39, 0x39, 0x39, 0x38, 0x38, 0x38, 0x38, 0x37,</div><div class='del'>-		0x37, 0x37, 0x37, 0x36, 0x36, 0x36, 0x36, 0x35,</div><div class='del'>-		0x35, 0x35, 0x35, 0x34, 0x34, 0x34, 0x34, 0x34,</div><div class='del'>-		0x33, 0x33, 0x33, 0x33, 0x32, 0x32, 0x32, 0x32,</div><div class='del'>-		0x32, 0x31, 0x31, 0x31, 0x31, 0x31, 0x30, 0x30,</div><div class='del'>-		0x30, 0x30, 0x30, 0x2f, 0x2f, 0x2f, 0x2f, 0x2f</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (rate == 0)</div><div class='del'>-		return 0;	/* Bail out if no leading "1" */</div><div class='del'>-	rate *= 11185;		/* Scale 48000 to 0x20002380 */</div><div class='del'>-	for (i = 31; i &gt; 0; i--) {</div><div class='del'>-		if (rate &amp; 0x80000000) {	/* Detect leading "1" */</div><div class='del'>-			return (((unsigned int) (i - 15) &lt;&lt; 20) +</div><div class='del'>-			       logMagTable[0x7f &amp; (rate &gt;&gt; 24)] +</div><div class='del'>-					(0x7f &amp; (rate &gt;&gt; 17)) *</div><div class='del'>-					logSlopeTable[0x7f &amp; (rate &gt;&gt; 24)]);</div><div class='del'>-		}</div><div class='del'>-		rate &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;		/* Should never reach this point */</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c<br/>index 30bfed6f8339..71aa90b9cc88 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/irq.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/irq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/irq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/irq.c</a></div><div class='hunk'>@@ -1,28 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                   Creative Labs, Inc.</div><div class='ctx'>  *  Routines for IRQ control of EMU10K1 chips</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -32,20 +12,24 @@</div><div class='ctx'> irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = dev_id;</div><div class='del'>-	unsigned int status, status2, orig_status, orig_status2;</div><div class='add'>+	unsigned int status, orig_status;</div><div class='ctx'> 	int handled = 0;</div><div class='ctx'> 	int timeout = 0;</div><div class='ctx'> </div><div class='del'>-	while (((status = inl(emu-&gt;port + IPR)) != 0) &amp;&amp; (timeout &lt; 1000)) {</div><div class='del'>-		timeout++;</div><div class='del'>-		orig_status = status;</div><div class='add'>+	while ((status = inl(emu-&gt;port + IPR)) != 0) {</div><div class='ctx'> 		handled = 1;</div><div class='ctx'> 		if ((status &amp; 0xffffffff) == 0xffffffff) {</div><div class='del'>-			snd_printk(KERN_INFO "snd-emu10k1: Suspected sound card removal\n");</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev,</div><div class='add'>+				 "Suspected sound card removal\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (++timeout == 1000) {</div><div class='add'>+			dev_info(emu-&gt;card-&gt;dev, "emu10k1 irq routine failure\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		orig_status = status;</div><div class='ctx'> 		if (status &amp; IPR_PCIERROR) {</div><div class='del'>-			snd_printk(KERN_ERR "interrupt: PCI error\n");</div><div class='add'>+			dev_err(emu-&gt;card-&gt;dev, "interrupt: PCI error\n");</div><div class='ctx'> 			snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);</div><div class='ctx'> 			status &amp;= ~IPR_PCIERROR;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -57,12 +41,13 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			status &amp;= ~(IPR_VOLINCR|IPR_VOLDECR|IPR_MUTE);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (status &amp; IPR_CHANNELLOOP) {</div><div class='add'>+			struct snd_emu10k1_voice *pvoice;</div><div class='ctx'> 			int voice;</div><div class='ctx'> 			int voice_max = status &amp; IPR_CHANNELNUMBERMASK;</div><div class='ctx'> 			u32 val;</div><div class='del'>-			struct snd_emu10k1_voice *pvoice = emu-&gt;voices;</div><div class='ctx'> </div><div class='ctx'> 			val = snd_emu10k1_ptr_read(emu, CLIPL, 0);</div><div class='add'>+			pvoice = emu-&gt;voices;</div><div class='ctx'> 			for (voice = 0; voice &lt;= voice_max; voice++) {</div><div class='ctx'> 				if (voice == 0x20)</div><div class='ctx'> 					val = snd_emu10k1_ptr_read(emu, CLIPH, 0);</div><div class='hunk'>@@ -78,6 +63,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				pvoice++;</div><div class='ctx'> 			}</div><div class='ctx'> 			val = snd_emu10k1_ptr_read(emu, HLIPL, 0);</div><div class='add'>+			pvoice = emu-&gt;voices;</div><div class='ctx'> 			for (voice = 0; voice &lt;= voice_max; voice++) {</div><div class='ctx'> 				if (voice == 0x20)</div><div class='ctx'> 					val = snd_emu10k1_ptr_read(emu, HLIPH, 0);</div><div class='hunk'>@@ -92,9 +78,8 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				val &gt;&gt;= 1;</div><div class='ctx'> 				pvoice++;</div><div class='ctx'> 			}</div><div class='del'>-			status &amp;= ~IPR_CHANNELLOOP;</div><div class='add'>+			status &amp;= ~(IPR_CHANNELLOOP | IPR_CHANNELNUMBERMASK);</div><div class='ctx'> 		}</div><div class='del'>-		status &amp;= ~IPR_CHANNELNUMBERMASK;</div><div class='ctx'> 		if (status &amp; (IPR_ADCBUFFULL|IPR_ADCBUFHALFFULL)) {</div><div class='ctx'> 			if (emu-&gt;capture_interrupt)</div><div class='ctx'> 				emu-&gt;capture_interrupt(emu, status);</div><div class='hunk'>@@ -152,57 +137,26 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			status &amp;= ~IPR_FXDSP;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (status &amp; IPR_P16V) {</div><div class='del'>-			while ((status2 = inl(emu-&gt;port + IPR2)) != 0) {</div><div class='del'>-				u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */</div><div class='del'>-				struct snd_emu10k1_voice *pvoice = &amp;(emu-&gt;p16v_voices[0]);</div><div class='del'>-				struct snd_emu10k1_voice *cvoice = &amp;(emu-&gt;p16v_capture_voice);</div><div class='del'>-</div><div class='del'>-				//printk(KERN_INFO "status2=0x%x\n", status2);</div><div class='del'>-				orig_status2 = status2;</div><div class='del'>-				if(status2 &amp; mask) {</div><div class='del'>-					if(pvoice-&gt;use) {</div><div class='del'>-						snd_pcm_period_elapsed(pvoice-&gt;epcm-&gt;substream);</div><div class='del'>-					} else { </div><div class='del'>-						snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice-&gt;use);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				if(status2 &amp; 0x110000) {</div><div class='del'>-					//printk(KERN_INFO "capture int found\n");</div><div class='del'>-					if(cvoice-&gt;use) {</div><div class='del'>-						//printk(KERN_INFO "capture period_elapsed\n");</div><div class='del'>-						snd_pcm_period_elapsed(cvoice-&gt;epcm-&gt;substream);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				outl(orig_status2, emu-&gt;port + IPR2); /* ack all */</div><div class='del'>-			}</div><div class='add'>+			if (emu-&gt;p16v_interrupt)</div><div class='add'>+				emu-&gt;p16v_interrupt(emu);</div><div class='add'>+			else</div><div class='add'>+				outl(0, emu-&gt;port + INTE2);</div><div class='ctx'> 			status &amp;= ~IPR_P16V;</div><div class='ctx'> 		}</div><div class='add'>+		if (status &amp; IPR_A_GPIO) {</div><div class='add'>+			if (emu-&gt;gpio_interrupt)</div><div class='add'>+				emu-&gt;gpio_interrupt(emu);</div><div class='add'>+			else</div><div class='add'>+				snd_emu10k1_intr_disable(emu, INTE_A_GPIOENABLE);</div><div class='add'>+			status &amp;= ~IPR_A_GPIO;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (status) {</div><div class='del'>-			unsigned int bits;</div><div class='del'>-			snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);</div><div class='del'>-			//make sure any interrupts we don't handle are disabled:</div><div class='del'>-			bits = INTE_FXDSPENABLE |</div><div class='del'>-				INTE_PCIERRORENABLE |</div><div class='del'>-				INTE_VOLINCRENABLE |</div><div class='del'>-				INTE_VOLDECRENABLE |</div><div class='del'>-				INTE_MUTEENABLE |</div><div class='del'>-				INTE_MICBUFENABLE |</div><div class='del'>-				INTE_ADCBUFENABLE |</div><div class='del'>-				INTE_EFXBUFENABLE |</div><div class='del'>-				INTE_GPSPDIFENABLE |</div><div class='del'>-				INTE_CDSPDIFENABLE |</div><div class='del'>-				INTE_INTERVALTIMERENB |</div><div class='del'>-				INTE_MIDITXENABLE |</div><div class='del'>-				INTE_MIDIRXENABLE;</div><div class='del'>-			if (emu-&gt;audigy)</div><div class='del'>-				bits |= INTE_A_MIDITXENABLE2 | INTE_A_MIDIRXENABLE2;</div><div class='del'>-			snd_emu10k1_intr_disable(emu, bits);</div><div class='add'>+			dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+				"unhandled interrupt: 0x%08x\n", status);</div><div class='ctx'> 		}</div><div class='ctx'> 		outl(orig_status, emu-&gt;port + IPR); /* ack all */</div><div class='ctx'> 	}</div><div class='del'>-	if (timeout == 1000)</div><div class='del'>-		snd_printk(KERN_INFO "emu10k1 irq routine failure\n");</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='head'>diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c<br/>index 957a311514c8..be889a4ccf9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/memory.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/memory.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/memory.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/memory.c</a></div><div class='hunk'>@@ -1,30 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *  Copyright (c) by Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  EMU10K1 memory page allocation (PTB area)</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='hunk'>@@ -33,17 +19,20 @@</div><div class='ctx'>  * aligned pages in others</div><div class='ctx'>  */</div><div class='ctx'> #define __set_ptb_entry(emu,page,addr) \</div><div class='del'>-	(((u32 *)(emu)-&gt;ptb_pages.area)[page] = cpu_to_le32(((addr) &lt;&lt; 1) | (page)))</div><div class='add'>+	(((__le32 *)(emu)-&gt;ptb_pages.area)[page] = \</div><div class='add'>+	 cpu_to_le32(((addr) &lt;&lt; (emu-&gt;address_mode)) | (page)))</div><div class='add'>+#define __get_ptb_entry(emu, page) \</div><div class='add'>+	(le32_to_cpu(((__le32 *)(emu)-&gt;ptb_pages.area)[page]))</div><div class='ctx'> </div><div class='ctx'> #define UNIT_PAGES		(PAGE_SIZE / EMUPAGESIZE)</div><div class='del'>-#define MAX_ALIGN_PAGES		(MAXPAGES / UNIT_PAGES)</div><div class='add'>+#define MAX_ALIGN_PAGES0		(MAXPAGES0 / UNIT_PAGES)</div><div class='add'>+#define MAX_ALIGN_PAGES1		(MAXPAGES1 / UNIT_PAGES)</div><div class='ctx'> /* get aligned page from offset address */</div><div class='ctx'> #define get_aligned_page(offset)	((offset) &gt;&gt; PAGE_SHIFT)</div><div class='ctx'> /* get offset address from aligned page */</div><div class='ctx'> #define aligned_page_offset(page)	((page) &lt;&lt; PAGE_SHIFT)</div><div class='ctx'> </div><div class='del'>-#if PAGE_SIZE == 4096</div><div class='del'>-/* page size == EMUPAGESIZE */</div><div class='add'>+#if PAGE_SIZE == EMUPAGESIZE &amp;&amp; !IS_ENABLED(CONFIG_DYNAMIC_DEBUG)</div><div class='ctx'> /* fill PTB entrie(s) corresponding to page with addr */</div><div class='ctx'> #define set_ptb_entry(emu,page,addr)	__set_ptb_entry(emu,page,addr)</div><div class='ctx'> /* fill PTB entrie(s) corresponding to page with silence pointer */</div><div class='hunk'>@@ -56,6 +45,8 @@ static inline void set_ptb_entry(struct snd_emu10k1 *emu, int page, dma_addr_t a</div><div class='ctx'> 	page *= UNIT_PAGES;</div><div class='ctx'> 	for (i = 0; i &lt; UNIT_PAGES; i++, page++) {</div><div class='ctx'> 		__set_ptb_entry(emu, page, addr);</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "mapped page %d to entry %.8x\n", page,</div><div class='add'>+			(unsigned int)__get_ptb_entry(emu, page));</div><div class='ctx'> 		addr += EMUPAGESIZE;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -63,9 +54,12 @@ static inline void set_silent_ptb(struct snd_emu10k1 *emu, int page)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	page *= UNIT_PAGES;</div><div class='del'>-	for (i = 0; i &lt; UNIT_PAGES; i++, page++)</div><div class='add'>+	for (i = 0; i &lt; UNIT_PAGES; i++, page++) {</div><div class='ctx'> 		/* do not increment ptr */</div><div class='ctx'> 		__set_ptb_entry(emu, page, emu-&gt;silent_page.addr);</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "mapped silent page %d to entry %.8x\n",</div><div class='add'>+			page, (unsigned int)__get_ptb_entry(emu, page));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> #endif /* PAGE_SIZE */</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +94,7 @@ static void emu10k1_memblk_init(struct snd_emu10k1_memblk *blk)</div><div class='ctx'>  */</div><div class='ctx'> static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct list_head **nextp)</div><div class='ctx'> {</div><div class='del'>-	int page = 0, found_page = -ENOMEM;</div><div class='add'>+	int page = 1, found_page = -ENOMEM;</div><div class='ctx'> 	int max_size = npages;</div><div class='ctx'> 	int size;</div><div class='ctx'> 	struct list_head *candidate = &amp;emu-&gt;mapped_link_head;</div><div class='hunk'>@@ -123,7 +117,7 @@ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct lis</div><div class='ctx'> 		}</div><div class='ctx'> 		page = blk-&gt;mapped_page + blk-&gt;pages;</div><div class='ctx'> 	}</div><div class='del'>-	size = MAX_ALIGN_PAGES - page;</div><div class='add'>+	size = (emu-&gt;address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0) - page;</div><div class='ctx'> 	if (size &gt;= max_size) {</div><div class='ctx'> 		*nextp = pos;</div><div class='ctx'> 		return page;</div><div class='hunk'>@@ -145,6 +139,10 @@ static int map_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)</div><div class='ctx'> 	page = search_empty_map_area(emu, blk-&gt;pages, &amp;next);</div><div class='ctx'> 	if (page &lt; 0) /* not found */</div><div class='ctx'> 		return page;</div><div class='add'>+	if (page == 0) {</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev, "trying to map zero (reserved) page\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	/* insert this block in the proper position of mapped list */</div><div class='ctx'> 	list_add_tail(&amp;blk-&gt;mapped_link, next);</div><div class='ctx'> 	/* append this as a newest block in order list */</div><div class='hunk'>@@ -171,16 +169,20 @@ static int unmap_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)</div><div class='ctx'> 	struct snd_emu10k1_memblk *q;</div><div class='ctx'> </div><div class='ctx'> 	/* calculate the expected size of empty region */</div><div class='del'>-	if ((p = blk-&gt;mapped_link.prev) != &amp;emu-&gt;mapped_link_head) {</div><div class='add'>+	p = blk-&gt;mapped_link.prev;</div><div class='add'>+	if (p != &amp;emu-&gt;mapped_link_head) {</div><div class='ctx'> 		q = get_emu10k1_memblk(p, mapped_link);</div><div class='ctx'> 		start_page = q-&gt;mapped_page + q-&gt;pages;</div><div class='del'>-	} else</div><div class='del'>-		start_page = 0;</div><div class='del'>-	if ((p = blk-&gt;mapped_link.next) != &amp;emu-&gt;mapped_link_head) {</div><div class='add'>+	} else {</div><div class='add'>+		start_page = 1;</div><div class='add'>+	}</div><div class='add'>+	p = blk-&gt;mapped_link.next;</div><div class='add'>+	if (p != &amp;emu-&gt;mapped_link_head) {</div><div class='ctx'> 		q = get_emu10k1_memblk(p, mapped_link);</div><div class='ctx'> 		end_page = q-&gt;mapped_page;</div><div class='del'>-	} else</div><div class='del'>-		end_page = MAX_ALIGN_PAGES;</div><div class='add'>+	} else {</div><div class='add'>+		end_page = (emu-&gt;address_mode ? MAX_ALIGN_PAGES1 : MAX_ALIGN_PAGES0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* remove links */</div><div class='ctx'> 	list_del(&amp;blk-&gt;mapped_link);</div><div class='hunk'>@@ -235,11 +237,13 @@ __found_pages:</div><div class='ctx'> static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)</div><div class='ctx'> {</div><div class='ctx'> 	if (addr &amp; ~emu-&gt;dma_mask) {</div><div class='del'>-		snd_printk(KERN_ERR "max memory size is 0x%lx (addr = 0x%lx)!!\n", emu-&gt;dma_mask, (unsigned long)addr);</div><div class='add'>+		dev_err_ratelimited(emu-&gt;card-&gt;dev,</div><div class='add'>+			"max memory size is 0x%lx (addr = 0x%lx)!!\n",</div><div class='add'>+			emu-&gt;dma_mask, (unsigned long)addr);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (addr &amp; (EMUPAGESIZE-1)) {</div><div class='del'>-		snd_printk(KERN_ERR "page is not aligned\n");</div><div class='add'>+		dev_err_ratelimited(emu-&gt;card-&gt;dev, "page is not aligned\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -248,7 +252,7 @@ static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)</div><div class='ctx'> /*</div><div class='ctx'>  * map the given memory block on PTB.</div><div class='ctx'>  * if the block is already mapped, update the link order.</div><div class='del'>- * if no empty pages are found, tries to release unsed memory blocks</div><div class='add'>+ * if no empty pages are found, tries to release unused memory blocks</div><div class='ctx'>  * and retry the mapping.</div><div class='ctx'>  */</div><div class='ctx'> int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)</div><div class='hunk'>@@ -257,17 +261,16 @@ int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *b</div><div class='ctx'> 	int size;</div><div class='ctx'> 	struct list_head *p, *nextp;</div><div class='ctx'> 	struct snd_emu10k1_memblk *deleted;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;memblk_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;memblk_lock);</div><div class='ctx'> 	if (blk-&gt;mapped_page &gt;= 0) {</div><div class='ctx'> 		/* update order link */</div><div class='del'>-		list_del(&amp;blk-&gt;mapped_order_link);</div><div class='del'>-		list_add_tail(&amp;blk-&gt;mapped_order_link, &amp;emu-&gt;mapped_order_link_head);</div><div class='del'>-		spin_unlock_irqrestore(&amp;emu-&gt;memblk_lock, flags);</div><div class='add'>+		list_move_tail(&amp;blk-&gt;mapped_order_link,</div><div class='add'>+			       &amp;emu-&gt;mapped_order_link_head);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = map_memblk(emu, blk)) &lt; 0) {</div><div class='add'>+	err = map_memblk(emu, blk);</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		/* no enough page - try to unmap some blocks */</div><div class='ctx'> 		/* starting from the oldest block */</div><div class='ctx'> 		p = emu-&gt;mapped_order_link_head.next;</div><div class='hunk'>@@ -284,7 +287,6 @@ int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *b</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;memblk_lock, flags);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -304,31 +306,30 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst</div><div class='ctx'> 	if (snd_BUG_ON(!emu))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	if (snd_BUG_ON(runtime-&gt;dma_bytes &lt;= 0 ||</div><div class='del'>-		       runtime-&gt;dma_bytes &gt;= MAXPAGES * EMUPAGESIZE))</div><div class='add'>+		       runtime-&gt;dma_bytes &gt;= (emu-&gt;address_mode ? MAXPAGES1 : MAXPAGES0) * EMUPAGESIZE))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	hdr = emu-&gt;memhdr;</div><div class='ctx'> 	if (snd_BUG_ON(!hdr))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	idx = runtime-&gt;period_size &gt;= runtime-&gt;buffer_size ?</div><div class='del'>-					(emu-&gt;delay_pcm_irq * 2) : 0;</div><div class='del'>-	mutex_lock(&amp;hdr-&gt;block_mutex);</div><div class='del'>-	blk = search_empty(emu, runtime-&gt;dma_bytes + idx);</div><div class='del'>-	if (blk == NULL) {</div><div class='del'>-		mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	guard(mutex)(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	blk = search_empty(emu, runtime-&gt;dma_bytes);</div><div class='add'>+	if (blk == NULL)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	/* fill buffer addresses but pointers are not stored so that</div><div class='del'>-	 * snd_free_pci_page() is not called in in synth_free()</div><div class='add'>+	 * snd_free_pci_page() is not called in synth_free()</div><div class='ctx'> 	 */</div><div class='ctx'> 	idx = 0;</div><div class='ctx'> 	for (page = blk-&gt;first_page; page &lt;= blk-&gt;last_page; page++, idx++) {</div><div class='ctx'> 		unsigned long ofs = idx &lt;&lt; PAGE_SHIFT;</div><div class='ctx'> 		dma_addr_t addr;</div><div class='del'>-		addr = snd_pcm_sgbuf_get_addr(substream, ofs);</div><div class='add'>+		if (ofs &gt;= runtime-&gt;dma_bytes)</div><div class='add'>+			addr = emu-&gt;silent_page.addr;</div><div class='add'>+		else</div><div class='add'>+			addr = snd_pcm_sgbuf_get_addr(substream, ofs);</div><div class='ctx'> 		if (! is_valid_page(emu, addr)) {</div><div class='del'>-			printk(KERN_ERR "emu: failure page = %d\n", idx);</div><div class='del'>-			mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='add'>+			dev_err_ratelimited(emu-&gt;card-&gt;dev,</div><div class='add'>+				"emu: failure page = %d\n", idx);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		emu-&gt;page_addr_table[page] = addr;</div><div class='hunk'>@@ -340,10 +341,8 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst</div><div class='ctx'> 	err = snd_emu10k1_memblk_map(emu, blk);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		__snd_util_mem_free(hdr, (struct snd_util_memblk *)blk);</div><div class='del'>-		mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='ctx'> 	return (struct snd_util_memblk *)blk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -358,6 +357,33 @@ int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, struct snd_util_memblk *blk)</div><div class='ctx'> 	return snd_emu10k1_synth_free(emu, blk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * allocate DMA pages, widening the allocation if necessary</div><div class='add'>+ *</div><div class='add'>+ * See the comment above snd_emu10k1_detect_iommu() in emu10k1_main.c why</div><div class='add'>+ * this might be needed.</div><div class='add'>+ *</div><div class='add'>+ * If you modify this function check whether __synth_free_pages() also needs</div><div class='add'>+ * changes.</div><div class='add'>+ */</div><div class='add'>+int snd_emu10k1_alloc_pages_maybe_wider(struct snd_emu10k1 *emu, size_t size,</div><div class='add'>+					struct snd_dma_buffer *dmab)</div><div class='add'>+{</div><div class='add'>+	if (emu-&gt;iommu_workaround) {</div><div class='add'>+		size_t npages = DIV_ROUND_UP(size, PAGE_SIZE);</div><div class='add'>+		size_t size_real = npages * PAGE_SIZE;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * The device has been observed to accesses up to 256 extra</div><div class='add'>+		 * bytes, but use 1k to be safe.</div><div class='add'>+		 */</div><div class='add'>+		if (size_real &lt; size + 1024)</div><div class='add'>+			size += PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				   &amp;emu-&gt;pci-&gt;dev, size, dmab);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * memory allocation using multiple pages (for synth)</div><div class='hunk'>@@ -373,19 +399,15 @@ snd_emu10k1_synth_alloc(struct snd_emu10k1 *hw, unsigned int size)</div><div class='ctx'> 	struct snd_emu10k1_memblk *blk;</div><div class='ctx'> 	struct snd_util_memhdr *hdr = hw-&gt;memhdr; </div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	guard(mutex)(&amp;hdr-&gt;block_mutex);</div><div class='ctx'> 	blk = (struct snd_emu10k1_memblk *)__snd_util_mem_alloc(hdr, size);</div><div class='del'>-	if (blk == NULL) {</div><div class='del'>-		mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	if (blk == NULL)</div><div class='ctx'> 		return NULL;</div><div class='del'>-	}</div><div class='ctx'> 	if (synth_alloc_pages(hw, blk)) {</div><div class='ctx'> 		__snd_util_mem_free(hdr, (struct snd_util_memblk *)blk);</div><div class='del'>-		mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_emu10k1_memblk_map(hw, blk);</div><div class='del'>-	mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='ctx'> 	return (struct snd_util_memblk *)blk;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -399,16 +421,14 @@ snd_emu10k1_synth_free(struct snd_emu10k1 *emu, struct snd_util_memblk *memblk)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_util_memhdr *hdr = emu-&gt;memhdr; </div><div class='ctx'> 	struct snd_emu10k1_memblk *blk = (struct snd_emu10k1_memblk *)memblk;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;hdr-&gt;block_mutex);</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;memblk_lock, flags);</div><div class='del'>-	if (blk-&gt;mapped_page &gt;= 0)</div><div class='del'>-		unmap_memblk(emu, blk);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;memblk_lock, flags);</div><div class='add'>+	guard(mutex)(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;emu-&gt;memblk_lock) {</div><div class='add'>+		if (blk-&gt;mapped_page &gt;= 0)</div><div class='add'>+			unmap_memblk(emu, blk);</div><div class='add'>+	}</div><div class='ctx'> 	synth_free_pages(emu, blk);</div><div class='del'>-	 __snd_util_mem_free(hdr, memblk);</div><div class='del'>-	mutex_unlock(&amp;hdr-&gt;block_mutex);</div><div class='add'>+	__snd_util_mem_free(hdr, memblk);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -423,13 +443,15 @@ static void get_single_page_range(struct snd_util_memhdr *hdr,</div><div class='ctx'> 	struct snd_emu10k1_memblk *q;</div><div class='ctx'> 	int first_page, last_page;</div><div class='ctx'> 	first_page = blk-&gt;first_page;</div><div class='del'>-	if ((p = blk-&gt;mem.list.prev) != &amp;hdr-&gt;block) {</div><div class='add'>+	p = blk-&gt;mem.list.prev;</div><div class='add'>+	if (p != &amp;hdr-&gt;block) {</div><div class='ctx'> 		q = get_emu10k1_memblk(p, mem.list);</div><div class='ctx'> 		if (q-&gt;last_page == first_page)</div><div class='ctx'> 			first_page++;  /* first page was already allocated */</div><div class='ctx'> 	}</div><div class='ctx'> 	last_page = blk-&gt;last_page;</div><div class='del'>-	if ((p = blk-&gt;mem.list.next) != &amp;hdr-&gt;block) {</div><div class='add'>+	p = blk-&gt;mem.list.next;</div><div class='add'>+	if (p != &amp;hdr-&gt;block) {</div><div class='ctx'> 		q = get_emu10k1_memblk(p, mem.list);</div><div class='ctx'> 		if (q-&gt;first_page == last_page)</div><div class='ctx'> 			last_page--; /* last page was already allocated */</div><div class='hunk'>@@ -442,10 +464,27 @@ static void get_single_page_range(struct snd_util_memhdr *hdr,</div><div class='ctx'> static void __synth_free_pages(struct snd_emu10k1 *emu, int first_page,</div><div class='ctx'> 			       int last_page)</div><div class='ctx'> {</div><div class='add'>+	struct snd_dma_buffer dmab;</div><div class='ctx'> 	int page;</div><div class='ctx'> </div><div class='add'>+	dmab.dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='add'>+	dmab.dev.dev = &amp;emu-&gt;pci-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	for (page = first_page; page &lt;= last_page; page++) {</div><div class='del'>-		free_page((unsigned long)emu-&gt;page_ptr_table[page]);</div><div class='add'>+		if (emu-&gt;page_ptr_table[page] == NULL)</div><div class='add'>+			continue;</div><div class='add'>+		dmab.area = emu-&gt;page_ptr_table[page];</div><div class='add'>+		dmab.addr = emu-&gt;page_addr_table[page];</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * please keep me in sync with logic in</div><div class='add'>+		 * snd_emu10k1_alloc_pages_maybe_wider()</div><div class='add'>+		 */</div><div class='add'>+		dmab.bytes = PAGE_SIZE;</div><div class='add'>+		if (emu-&gt;iommu_workaround)</div><div class='add'>+			dmab.bytes *= 2;</div><div class='add'>+</div><div class='add'>+		snd_dma_free_pages(&amp;dmab);</div><div class='ctx'> 		emu-&gt;page_addr_table[page] = 0;</div><div class='ctx'> 		emu-&gt;page_ptr_table[page] = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -457,30 +496,30 @@ static void __synth_free_pages(struct snd_emu10k1 *emu, int first_page,</div><div class='ctx'> static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)</div><div class='ctx'> {</div><div class='ctx'> 	int page, first_page, last_page;</div><div class='add'>+	struct snd_dma_buffer dmab;</div><div class='ctx'> </div><div class='ctx'> 	emu10k1_memblk_init(blk);</div><div class='ctx'> 	get_single_page_range(emu-&gt;memhdr, blk, &amp;first_page, &amp;last_page);</div><div class='ctx'> 	/* allocate kernel pages */</div><div class='ctx'> 	for (page = first_page; page &lt;= last_page; page++) {</div><div class='del'>-		/* first try to allocate from &lt;4GB zone */</div><div class='del'>-		struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 |</div><div class='del'>-					    __GFP_NOWARN);</div><div class='del'>-		if (!p || (page_to_pfn(p) &amp; ~(emu-&gt;dma_mask &gt;&gt; PAGE_SHIFT))) {</div><div class='del'>-			if (p)</div><div class='del'>-				__free_page(p);</div><div class='del'>-			/* try to allocate from &lt;16MB zone */</div><div class='del'>-			p = alloc_page(GFP_ATOMIC | GFP_DMA |</div><div class='del'>-				       __GFP_NORETRY | /* no OOM-killer */</div><div class='del'>-				       __GFP_NOWARN);</div><div class='del'>-		}</div><div class='del'>-		if (!p) {</div><div class='del'>-			__synth_free_pages(emu, first_page, page - 1);</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+		if (snd_emu10k1_alloc_pages_maybe_wider(emu, PAGE_SIZE,</div><div class='add'>+							&amp;dmab) &lt; 0)</div><div class='add'>+			goto __fail;</div><div class='add'>+		if (!is_valid_page(emu, dmab.addr)) {</div><div class='add'>+			snd_dma_free_pages(&amp;dmab);</div><div class='add'>+			goto __fail;</div><div class='ctx'> 		}</div><div class='del'>-		emu-&gt;page_addr_table[page] = page_to_phys(p);</div><div class='del'>-		emu-&gt;page_ptr_table[page] = page_address(p);</div><div class='add'>+		emu-&gt;page_addr_table[page] = dmab.addr;</div><div class='add'>+		emu-&gt;page_ptr_table[page] = dmab.area;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+__fail:</div><div class='add'>+	/* release allocated pages */</div><div class='add'>+	last_page = page - 1;</div><div class='add'>+	__synth_free_pages(emu, first_page, last_page);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -503,7 +542,8 @@ static inline void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	ptr = emu-&gt;page_ptr_table[page];</div><div class='ctx'> 	if (! ptr) {</div><div class='del'>-		printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page);</div><div class='add'>+		dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+			"access to NULL ptr: page = %d\n", page);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	ptr += offset &amp; (PAGE_SIZE - 1);</div><div class='hunk'>@@ -511,15 +551,18 @@ static inline void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * bzero(blk + offset, size)</div><div class='add'>+ * memset(blk + offset, value, size)</div><div class='ctx'>  */</div><div class='del'>-int snd_emu10k1_synth_bzero(struct snd_emu10k1 *emu, struct snd_util_memblk *blk,</div><div class='del'>-			    int offset, int size)</div><div class='add'>+int snd_emu10k1_synth_memset(struct snd_emu10k1 *emu, struct snd_util_memblk *blk,</div><div class='add'>+			     int offset, int size, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	int page, nextofs, end_offset, temp, temp1;</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> 	struct snd_emu10k1_memblk *p = (struct snd_emu10k1_memblk *)blk;</div><div class='ctx'> </div><div class='add'>+	if (snd_BUG_ON(offset + size &gt; p-&gt;mem.size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	offset += blk-&gt;offset &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	end_offset = offset + size;</div><div class='ctx'> 	page = get_aligned_page(offset);</div><div class='hunk'>@@ -531,25 +574,55 @@ int snd_emu10k1_synth_bzero(struct snd_emu10k1 *emu, struct snd_util_memblk *blk</div><div class='ctx'> 			temp = temp1;</div><div class='ctx'> 		ptr = offset_ptr(emu, page + p-&gt;first_page, offset);</div><div class='ctx'> 		if (ptr)</div><div class='del'>-			memset(ptr, 0, temp);</div><div class='add'>+			memset(ptr, value, temp);</div><div class='ctx'> 		offset = nextofs;</div><div class='ctx'> 		page++;</div><div class='ctx'> 	} while (offset &lt; end_offset);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-EXPORT_SYMBOL(snd_emu10k1_synth_bzero);</div><div class='add'>+EXPORT_SYMBOL(snd_emu10k1_synth_memset);</div><div class='add'>+</div><div class='add'>+// Note that the value is assumed to be suitably repetitive.</div><div class='add'>+static void xor_range(void *ptr, int size, u32 value)</div><div class='add'>+{</div><div class='add'>+	if ((long)ptr &amp; 1) {</div><div class='add'>+		*(u8 *)ptr ^= (u8)value;</div><div class='add'>+		ptr++;</div><div class='add'>+		size--;</div><div class='add'>+	}</div><div class='add'>+	if (size &gt; 1 &amp;&amp; ((long)ptr &amp; 2)) {</div><div class='add'>+		*(u16 *)ptr ^= (u16)value;</div><div class='add'>+		ptr += 2;</div><div class='add'>+		size -= 2;</div><div class='add'>+	}</div><div class='add'>+	while (size &gt; 3) {</div><div class='add'>+		*(u32 *)ptr ^= value;</div><div class='add'>+		ptr += 4;</div><div class='add'>+		size -= 4;</div><div class='add'>+	}</div><div class='add'>+	if (size &gt; 1) {</div><div class='add'>+		*(u16 *)ptr ^= (u16)value;</div><div class='add'>+		ptr += 2;</div><div class='add'>+		size -= 2;</div><div class='add'>+	}</div><div class='add'>+	if (size &gt; 0)</div><div class='add'>+		*(u8 *)ptr ^= (u8)value;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * copy_from_user(blk + offset, data, size)</div><div class='add'>+ * copy_from_user(blk + offset, data, size) ^ xor</div><div class='ctx'>  */</div><div class='ctx'> int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, struct snd_util_memblk *blk,</div><div class='del'>-				     int offset, const char __user *data, int size)</div><div class='add'>+				     int offset, const char __user *data, int size, u32 xor)</div><div class='ctx'> {</div><div class='ctx'> 	int page, nextofs, end_offset, temp, temp1;</div><div class='ctx'> 	void *ptr;</div><div class='ctx'> 	struct snd_emu10k1_memblk *p = (struct snd_emu10k1_memblk *)blk;</div><div class='ctx'> </div><div class='add'>+	if (snd_BUG_ON(offset + size &gt; p-&gt;mem.size))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	offset += blk-&gt;offset &amp; (PAGE_SIZE - 1);</div><div class='ctx'> 	end_offset = offset + size;</div><div class='ctx'> 	page = get_aligned_page(offset);</div><div class='hunk'>@@ -560,8 +633,12 @@ int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, struct snd_util_me</div><div class='ctx'> 		if (temp1 &lt; temp)</div><div class='ctx'> 			temp = temp1;</div><div class='ctx'> 		ptr = offset_ptr(emu, page + p-&gt;first_page, offset);</div><div class='del'>-		if (ptr &amp;&amp; copy_from_user(ptr, data, temp))</div><div class='del'>-			return -EFAULT;</div><div class='add'>+		if (ptr) {</div><div class='add'>+			if (copy_from_user(ptr, data, temp))</div><div class='add'>+				return -EFAULT;</div><div class='add'>+			if (xor)</div><div class='add'>+				xor_range(ptr, temp, xor);</div><div class='add'>+		}</div><div class='ctx'> 		offset = nextofs;</div><div class='ctx'> 		data += temp;</div><div class='ctx'> 		page++;</div><div class='head'>diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c<br/>index 61b8ab39800f..b74128e61254 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p16v.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p16v.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p16v.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/p16v.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver p16v chips</div><div class='hunk'>@@ -69,23 +70,8 @@</div><div class='ctx'>  *    ADC: Philips 1361T (Stereo 24bit)</div><div class='ctx'>  *    DAC: CS4382-K (8-channel, 24bit, 192Khz)</div><div class='ctx'>  *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -122,7 +108,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'>  /* hardware definition */</div><div class='del'>-static struct snd_pcm_hardware snd_p16v_playback_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_p16v_playback_hw = {</div><div class='ctx'> 	.info =			SNDRV_PCM_INFO_MMAP | </div><div class='ctx'> 				SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -143,7 +129,7 @@ static struct snd_pcm_hardware snd_p16v_playback_hw = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_p16v_capture_hw = {</div><div class='add'>+static const struct snd_pcm_hardware snd_p16v_capture_hw = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -163,103 +149,49 @@ static struct snd_pcm_hardware snd_p16v_capture_hw = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void snd_p16v_pcm_free_substream(struct snd_pcm_runtime *runtime)</div><div class='del'>-{</div><div class='del'>-	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-  </div><div class='del'>-	if (epcm) {</div><div class='del'>-        	/* snd_printk(KERN_DEBUG "epcm free: %p\n", epcm); */</div><div class='del'>-		kfree(epcm);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* open_playback callback */</div><div class='ctx'> static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substream, int channel_id)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-        struct snd_emu10k1_voice *channel = &amp;(emu-&gt;p16v_voices[channel_id]);</div><div class='del'>-	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='del'>-        /* snd_printk(KERN_DEBUG "epcm kcalloc: %p\n", epcm); */</div><div class='del'>-</div><div class='del'>-	if (epcm == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	epcm-&gt;emu = emu;</div><div class='del'>-	epcm-&gt;substream = substream;</div><div class='ctx'> 	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "epcm device=%d, channel_id=%d\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "epcm device=%d, channel_id=%d\n",</div><div class='ctx'> 		   substream-&gt;pcm-&gt;device, channel_id);</div><div class='ctx'> 	*/</div><div class='del'>-	runtime-&gt;private_data = epcm;</div><div class='del'>-	runtime-&gt;private_free = snd_p16v_pcm_free_substream;</div><div class='ctx'>   </div><div class='ctx'> 	runtime-&gt;hw = snd_p16v_playback_hw;</div><div class='ctx'> </div><div class='del'>-        channel-&gt;emu = emu;</div><div class='del'>-        channel-&gt;number = channel_id;</div><div class='del'>-</div><div class='del'>-        channel-&gt;use=1;</div><div class='ctx'> #if 0 /* debug */</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 		   "p16v: open channel_id=%d, channel=%p, use=0x%x\n",</div><div class='ctx'> 		   channel_id, channel, channel-&gt;use);</div><div class='del'>-	printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='ctx'> 	       channel_id, chip, channel);</div><div class='ctx'> #endif /* debug */</div><div class='ctx'> 	/* channel-&gt;interrupt = snd_p16v_pcm_channel_interrupt; */</div><div class='del'>-	channel-&gt;epcm = epcm;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> </div><div class='del'>-	runtime-&gt;sync.id32[0] = substream-&gt;pcm-&gt;card-&gt;number;</div><div class='del'>-	runtime-&gt;sync.id32[1] = 'P';</div><div class='del'>-	runtime-&gt;sync.id32[2] = 16;</div><div class='del'>-	runtime-&gt;sync.id32[3] = 'V';</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /* open_capture callback */</div><div class='ctx'> static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream, int channel_id)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct snd_emu10k1_voice *channel = &amp;(emu-&gt;p16v_capture_voice);</div><div class='del'>-	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);</div><div class='del'>-	/* snd_printk(KERN_DEBUG "epcm kcalloc: %p\n", epcm); */</div><div class='del'>-</div><div class='del'>-	if (epcm == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	epcm-&gt;emu = emu;</div><div class='del'>-	epcm-&gt;substream = substream;</div><div class='ctx'> 	/*</div><div class='del'>-	snd_printk(KERN_DEBUG "epcm device=%d, channel_id=%d\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "epcm device=%d, channel_id=%d\n",</div><div class='ctx'> 		   substream-&gt;pcm-&gt;device, channel_id);</div><div class='ctx'> 	*/</div><div class='del'>-	runtime-&gt;private_data = epcm;</div><div class='del'>-	runtime-&gt;private_free = snd_p16v_pcm_free_substream;</div><div class='ctx'>   </div><div class='ctx'> 	runtime-&gt;hw = snd_p16v_capture_hw;</div><div class='ctx'> </div><div class='del'>-	channel-&gt;emu = emu;</div><div class='del'>-	channel-&gt;number = channel_id;</div><div class='del'>-</div><div class='del'>-	channel-&gt;use=1;</div><div class='del'>-#if 0 /* debug */</div><div class='del'>-	snd_printk(KERN_DEBUG</div><div class='del'>-		   "p16v: open channel_id=%d, channel=%p, use=0x%x\n",</div><div class='del'>-		   channel_id, channel, channel-&gt;use);</div><div class='del'>-	printk(KERN_DEBUG "open:channel_id=%d, chip=%p, channel=%p\n",</div><div class='del'>-	       channel_id, chip, channel);</div><div class='del'>-#endif /* debug */</div><div class='del'>-	/* channel-&gt;interrupt = snd_p16v_pcm_channel_interrupt; */</div><div class='del'>-	channel-&gt;epcm = epcm;</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -269,22 +201,12 @@ static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream</div><div class='ctx'> /* close callback */</div><div class='ctx'> static int snd_p16v_pcm_close_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-	//struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	//struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	emu-&gt;p16v_voices[substream-&gt;pcm-&gt;device - emu-&gt;p16v_device_offset].use = 0;</div><div class='del'>-	/* FIXME: maybe zero others */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* close callback */</div><div class='ctx'> static int snd_p16v_pcm_close_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='del'>-	//struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	//struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='del'>-	emu-&gt;p16v_capture_voice.use = 0;</div><div class='del'>-	/* FIXME: maybe zero others */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -299,82 +221,63 @@ static int snd_p16v_pcm_open_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return snd_p16v_pcm_open_capture_channel(substream, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* hw_params callback */</div><div class='del'>-static int snd_p16v_pcm_hw_params_playback(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	result = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_params callback */</div><div class='del'>-static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream,</div><div class='del'>-				      struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	result = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-	result = snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hw_free callback */</div><div class='del'>-static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream)</div><div class='add'>+static int snd_p16v_pcm_ioctl_playback(struct snd_pcm_substream *substream,</div><div class='add'>+				       unsigned int cmd, void *arg)</div><div class='ctx'> {</div><div class='del'>-	int result;</div><div class='del'>-	result = snd_pcm_lib_free_pages(substream);</div><div class='del'>-	return result;</div><div class='add'>+	if (cmd == SNDRV_PCM_IOCTL1_SYNC_ID) {</div><div class='add'>+		static const unsigned char id[4] = { 'P', '1', '6', 'V' };</div><div class='add'>+		snd_pcm_set_sync_per_card(substream, arg, id, 4);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return snd_pcm_lib_ioctl(substream, cmd, arg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* prepare playback callback */</div><div class='ctx'> static int snd_p16v_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int channel = substream-&gt;pcm-&gt;device - emu-&gt;p16v_device_offset;</div><div class='del'>-	u32 *table_base = (u32 *)(emu-&gt;p16v_buffer.area+(8*16*channel));</div><div class='add'>+	u32 *table_base = (u32 *)(emu-&gt;p16v_buffer-&gt;area+(8*16*channel));</div><div class='ctx'> 	u32 period_size_bytes = frames_to_bytes(runtime, runtime-&gt;period_size);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> 	</div><div class='ctx'> #if 0 /* debug */</div><div class='del'>-	snd_printk(KERN_DEBUG "prepare:channel_number=%d, rate=%d, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"prepare:channel_number=%d, rate=%d, "</div><div class='ctx'> 		   "format=0x%x, channels=%d, buffer_size=%ld, "</div><div class='ctx'> 		   "period_size=%ld, periods=%u, frames_to_bytes=%d\n",</div><div class='ctx'> 		   channel, runtime-&gt;rate, runtime-&gt;format, runtime-&gt;channels,</div><div class='ctx'> 		   runtime-&gt;buffer_size, runtime-&gt;period_size,</div><div class='ctx'> 		   runtime-&gt;periods, frames_to_bytes(runtime, 1));</div><div class='del'>-	snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, table_base=%p\n",</div><div class='ctx'> 		   runtime-&gt;dma_addr, runtime-&gt;dma_area, table_base);</div><div class='del'>-	snd_printk(KERN_DEBUG "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='del'>-		   emu-&gt;p16v_buffer.addr, emu-&gt;p16v_buffer.area,</div><div class='del'>-		   emu-&gt;p16v_buffer.bytes);</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev,</div><div class='add'>+		"dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",</div><div class='add'>+		   emu-&gt;p16v_buffer-&gt;addr, emu-&gt;p16v_buffer-&gt;area,</div><div class='add'>+		   emu-&gt;p16v_buffer-&gt;bytes);</div><div class='ctx'> #endif /* debug */</div><div class='ctx'> 	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);</div><div class='add'>+	tmp &amp;= ~(A_SPDIF_RATE_MASK | A_EHC_SRC48_MASK);</div><div class='ctx'>         switch (runtime-&gt;rate) {</div><div class='ctx'> 	case 44100:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0xe0e0) | 0x8080);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,</div><div class='add'>+				tmp | A_SPDIF_44100 | A_EHC_SRC48_44);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 96000:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0xe0e0) | 0x4040);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,</div><div class='add'>+				tmp | A_SPDIF_96000 | A_EHC_SRC48_96);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 192000:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0xe0e0) | 0x2020);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,</div><div class='add'>+				tmp | A_SPDIF_192000 | A_EHC_SRC48_192);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 48000:</div><div class='ctx'> 	default:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0xe0e0) | 0x0000);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,</div><div class='add'>+				tmp | A_SPDIF_48000 | A_EHC_SRC48_BYPASS);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* FIXME: Check emu-&gt;buffer.size before actually writing to it. */</div><div class='hunk'>@@ -383,15 +286,15 @@ static int snd_p16v_pcm_prepare_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> 		table_base[(i*2)+1]=period_size_bytes&lt;&lt;16;</div><div class='ctx'> 	}</div><div class='ctx'>  </div><div class='del'>-	snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_ADDR, channel, emu-&gt;p16v_buffer.addr+(8*16*channel));</div><div class='add'>+	snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_ADDR, channel, emu-&gt;p16v_buffer-&gt;addr+(8*16*channel));</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_SIZE, channel, (runtime-&gt;periods - 1) &lt;&lt; 19);</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_PTR, channel, 0);</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, PLAYBACK_DMA_ADDR, channel, runtime-&gt;dma_addr);</div><div class='ctx'> 	//snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, frames_to_bytes(runtime, runtime-&gt;period_size)&lt;&lt;16); // buffer size in bytes</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, 0); // buffer size in bytes</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, PLAYBACK_POINTER, channel, 0);</div><div class='del'>-	snd_emu10k1_ptr20_write(emu, 0x07, channel, 0x0);</div><div class='del'>-	snd_emu10k1_ptr20_write(emu, 0x08, channel, 0);</div><div class='add'>+	snd_emu10k1_ptr20_write(emu, PLAYBACK_FIFO_END_ADDRESS, channel, 0);</div><div class='add'>+	snd_emu10k1_ptr20_write(emu, PLAYBACK_FIFO_POINTER, channel, 0);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -402,34 +305,32 @@ static int snd_p16v_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int channel = substream-&gt;pcm-&gt;device - emu-&gt;p16v_device_offset;</div><div class='del'>-	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "prepare capture:channel_number=%d, rate=%d, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "prepare capture:channel_number=%d, rate=%d, "</div><div class='ctx'> 	       "format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, "</div><div class='ctx'> 	       "frames_to_bytes=%d\n",</div><div class='ctx'> 	       channel, runtime-&gt;rate, runtime-&gt;format, runtime-&gt;channels,</div><div class='ctx'> 	       runtime-&gt;buffer_size, runtime-&gt;period_size,</div><div class='ctx'> 	       frames_to_bytes(runtime, 1));</div><div class='ctx'> 	*/</div><div class='del'>-	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);</div><div class='ctx'>         switch (runtime-&gt;rate) {</div><div class='ctx'> 	case 44100:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0x0e00) | 0x0800);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_44100);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 96000:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0x0e00) | 0x0400);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_96000);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 192000:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0x0e00) | 0x0200);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_192000);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	case 48000:</div><div class='ctx'> 	default:</div><div class='del'>-	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp &amp; ~0x0e00) | 0x0000);</div><div class='add'>+	  snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_48000);</div><div class='ctx'> 	  break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* FIXME: Check emu-&gt;buffer.size before actually writing to it. */</div><div class='del'>-	snd_emu10k1_ptr20_write(emu, 0x13, channel, 0);</div><div class='add'>+	snd_emu10k1_ptr20_write(emu, CAPTURE_FIFO_POINTER, channel, 0);</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, CAPTURE_DMA_ADDR, channel, runtime-&gt;dma_addr);</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime-&gt;buffer_size) &lt;&lt; 16); // buffer size in bytes</div><div class='ctx'> 	snd_emu10k1_ptr20_write(emu, CAPTURE_POINTER, channel, 0);</div><div class='hunk'>@@ -441,24 +342,56 @@ static int snd_p16v_pcm_prepare_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static void snd_p16v_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int enable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	enable = inl(emu-&gt;port + INTE2) | intrenb;</div><div class='ctx'> 	outl(enable, emu-&gt;port + INTE2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_p16v_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int disable;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;emu_lock);</div><div class='ctx'> 	disable = inl(emu-&gt;port + INTE2) &amp; (~intrenb);</div><div class='ctx'> 	outl(disable, emu-&gt;port + INTE2);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;emu_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_p16v_interrupt(struct snd_emu10k1 *emu)</div><div class='add'>+{</div><div class='add'>+	unsigned int status;</div><div class='add'>+</div><div class='add'>+	while ((status = inl(emu-&gt;port + IPR2)) != 0) {</div><div class='add'>+		u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */</div><div class='add'>+</div><div class='add'>+		/* dev_dbg(emu-&gt;card-&gt;dev, "p16v status=0x%x\n", status); */</div><div class='add'>+		if (status &amp; mask) {</div><div class='add'>+			struct snd_pcm_substream *substream =</div><div class='add'>+					emu-&gt;pcm_p16v-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream;</div><div class='add'>+			struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+			if (runtime &amp;&amp; runtime-&gt;private_data) {</div><div class='add'>+				snd_pcm_period_elapsed(substream);</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(emu-&gt;card-&gt;dev,</div><div class='add'>+					"p16v: status: 0x%08x, mask=0x%08x\n",</div><div class='add'>+					status, mask);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; 0x110000) {</div><div class='add'>+			struct snd_pcm_substream *substream =</div><div class='add'>+					emu-&gt;pcm_p16v-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream;</div><div class='add'>+			struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+			/* dev_info(emu-&gt;card-&gt;dev, "capture int found\n"); */</div><div class='add'>+			if (runtime &amp;&amp; runtime-&gt;private_data) {</div><div class='add'>+				/* dev_info(emu-&gt;card-&gt;dev, "capture period_elapsed\n"); */</div><div class='add'>+				snd_pcm_period_elapsed(substream);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		outl(status, emu-&gt;port + IPR2); /* ack all */</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* trigger_playback callback */</div><div class='hunk'>@@ -467,7 +400,6 @@ static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm;</div><div class='ctx'> 	int channel;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'>         struct snd_pcm_substream *s;</div><div class='hunk'>@@ -489,15 +421,14 @@ static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,</div><div class='ctx'> 		    s-&gt;stream != SNDRV_PCM_STREAM_PLAYBACK)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		runtime = s-&gt;runtime;</div><div class='del'>-		epcm = runtime-&gt;private_data;</div><div class='ctx'> 		channel = substream-&gt;pcm-&gt;device-emu-&gt;p16v_device_offset;</div><div class='del'>-		/* snd_printk(KERN_DEBUG "p16v channel=%d\n", channel); */</div><div class='del'>-		epcm-&gt;running = running;</div><div class='add'>+		/* dev_dbg(emu-&gt;card-&gt;dev, "p16v channel=%d\n", channel); */</div><div class='add'>+		runtime-&gt;private_data = (void *)(ptrdiff_t)running;</div><div class='ctx'> 		basic |= (0x1&lt;&lt;channel);</div><div class='ctx'> 		inte |= (INTE2_PLAYBACK_CH_0_LOOP&lt;&lt;channel);</div><div class='ctx'>                 snd_pcm_trigger_done(s, substream);</div><div class='ctx'>         }</div><div class='del'>-	/* snd_printk(KERN_DEBUG "basic=0x%x, inte=0x%x\n", basic, inte); */</div><div class='add'>+	/* dev_dbg(emu-&gt;card-&gt;dev, "basic=0x%x, inte=0x%x\n", basic, inte); */</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -521,7 +452,6 @@ static int snd_p16v_pcm_trigger_capture(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	int channel = 0;</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	u32 inte = INTE2_CAPTURE_CH_0_LOOP | INTE2_CAPTURE_CH_0_HALF_LOOP;</div><div class='hunk'>@@ -530,13 +460,13 @@ static int snd_p16v_pcm_trigger_capture(struct snd_pcm_substream *substream,</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		snd_p16v_intr_enable(emu, inte);</div><div class='ctx'> 		snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0)|(0x100&lt;&lt;channel));</div><div class='del'>-		epcm-&gt;running = 1;</div><div class='add'>+		runtime-&gt;private_data = (void *)1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 		snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0) &amp; ~(0x100&lt;&lt;channel));</div><div class='ctx'> 		snd_p16v_intr_disable(emu, inte);</div><div class='ctx'> 		//snd_emu10k1_ptr20_write(emu, EXTENDED_INT_MASK, 0, snd_emu10k1_ptr20_read(emu, EXTENDED_INT_MASK, 0) &amp; ~(0x110000&lt;&lt;channel));</div><div class='del'>-		epcm-&gt;running = 0;</div><div class='add'>+		runtime-&gt;private_data = NULL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		result = -EINVAL;</div><div class='hunk'>@@ -551,10 +481,10 @@ snd_p16v_pcm_pointer_playback(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;</div><div class='ctx'> 	int channel = substream-&gt;pcm-&gt;device - emu-&gt;p16v_device_offset;</div><div class='del'>-	if (!epcm-&gt;running)</div><div class='add'>+</div><div class='add'>+	if (!runtime-&gt;private_data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ptr3 = snd_emu10k1_ptr20_read(emu, PLAYBACK_LIST_PTR, channel);</div><div class='hunk'>@@ -576,11 +506,10 @@ snd_p16v_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	struct snd_emu10k1_pcm *epcm = runtime-&gt;private_data;</div><div class='ctx'> 	snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;</div><div class='ctx'> 	int channel = 0;</div><div class='ctx'> </div><div class='del'>-	if (!epcm-&gt;running)</div><div class='add'>+	if (!runtime-&gt;private_data)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ptr1 = snd_emu10k1_ptr20_read(emu, CAPTURE_POINTER, channel);</div><div class='hunk'>@@ -588,10 +517,10 @@ snd_p16v_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ptr=ptr2;</div><div class='ctx'> 	if (ptr &gt;= runtime-&gt;buffer_size) {</div><div class='ctx'> 		ptr -= runtime-&gt;buffer_size;</div><div class='del'>-		printk(KERN_WARNING "buffer capture limited!\n");</div><div class='add'>+		dev_warn(emu-&gt;card-&gt;dev, "buffer capture limited!\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "</div><div class='add'>+	dev_dbg(emu-&gt;card-&gt;dev, "ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, "</div><div class='ctx'> 	       "buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n",</div><div class='ctx'> 	       ptr1, ptr2, ptr, (int)runtime-&gt;buffer_size,</div><div class='ctx'> 	       (int)runtime-&gt;period_size, (int)runtime-&gt;frame_bits,</div><div class='hunk'>@@ -601,55 +530,35 @@ snd_p16v_pcm_pointer_capture(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* operators */</div><div class='del'>-static struct snd_pcm_ops snd_p16v_playback_front_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_p16v_playback_front_ops = {</div><div class='ctx'> 	.open =        snd_p16v_pcm_open_playback_front,</div><div class='ctx'> 	.close =       snd_p16v_pcm_close_playback,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_p16v_pcm_hw_params_playback,</div><div class='del'>-	.hw_free =     snd_p16v_pcm_hw_free_playback,</div><div class='add'>+	.ioctl =       snd_p16v_pcm_ioctl_playback,</div><div class='ctx'> 	.prepare =     snd_p16v_pcm_prepare_playback,</div><div class='ctx'> 	.trigger =     snd_p16v_pcm_trigger_playback,</div><div class='ctx'> 	.pointer =     snd_p16v_pcm_pointer_playback,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_p16v_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_p16v_capture_ops = {</div><div class='ctx'> 	.open =        snd_p16v_pcm_open_capture,</div><div class='ctx'> 	.close =       snd_p16v_pcm_close_capture,</div><div class='del'>-	.ioctl =       snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =   snd_p16v_pcm_hw_params_capture,</div><div class='del'>-	.hw_free =     snd_p16v_pcm_hw_free_capture,</div><div class='ctx'> 	.prepare =     snd_p16v_pcm_prepare_capture,</div><div class='ctx'> 	.trigger =     snd_p16v_pcm_trigger_capture,</div><div class='ctx'> 	.pointer =     snd_p16v_pcm_pointer_capture,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-int snd_p16v_free(struct snd_emu10k1 *chip)</div><div class='del'>-{</div><div class='del'>-	// release the data</div><div class='del'>-	if (chip-&gt;p16v_buffer.area) {</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;p16v_buffer);</div><div class='del'>-		/*</div><div class='del'>-		snd_printk(KERN_DEBUG "period lables free: %p\n",</div><div class='del'>-			   &amp;chip-&gt;p16v_buffer);</div><div class='del'>-		*/</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)</div><div class='add'>+int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	int err;</div><div class='ctx'>         int capture=1;</div><div class='ctx'>   </div><div class='del'>-	/* snd_printk(KERN_DEBUG "snd_p16v_pcm called. device=%d\n", device); */</div><div class='add'>+	/* dev_dbg(emu-&gt;card-&gt;dev, "snd_p16v_pcm called. device=%d\n", device); */</div><div class='ctx'> 	emu-&gt;p16v_device_offset = device;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_new(emu-&gt;card, "p16v", device, 1, capture, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(emu-&gt;card, "p16v", device, 1, capture, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'>   </div><div class='ctx'> 	pcm-&gt;private_data = emu;</div><div class='hunk'>@@ -660,19 +569,19 @@ int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm *</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> 	pcm-&gt;dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;</div><div class='del'>-	strcpy(pcm-&gt;name, "p16v");</div><div class='add'>+	strscpy(pcm-&gt;name, "p16v");</div><div class='ctx'> 	emu-&gt;pcm_p16v = pcm;</div><div class='add'>+	emu-&gt;p16v_interrupt = snd_p16v_interrupt;</div><div class='ctx'> </div><div class='ctx'> 	for(substream = pcm-&gt;streams[SNDRV_PCM_STREAM_PLAYBACK].substream; </div><div class='ctx'> 	    substream; </div><div class='ctx'> 	    substream = substream-&gt;next) {</div><div class='del'>-		if ((err = snd_pcm_lib_preallocate_pages(substream, </div><div class='del'>-							 SNDRV_DMA_TYPE_DEV, </div><div class='del'>-							 snd_dma_pci_data(emu-&gt;pci), </div><div class='del'>-							 ((65536 - 64) * 8), ((65536 - 64) * 8))) &lt; 0) </div><div class='del'>-			return err;</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					   (65536 - 64) * 8,</div><div class='add'>+					   (65536 - 64) * 8);</div><div class='ctx'> 		/*</div><div class='del'>-		snd_printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 			   "preallocate playback substream: err=%d\n", err);</div><div class='ctx'> 		*/</div><div class='ctx'> 	}</div><div class='hunk'>@@ -680,20 +589,15 @@ int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm *</div><div class='ctx'> 	for (substream = pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream; </div><div class='ctx'> 	      substream; </div><div class='ctx'> 	      substream = substream-&gt;next) {</div><div class='del'>- 		if ((err = snd_pcm_lib_preallocate_pages(substream, </div><div class='del'>-	                                           SNDRV_DMA_TYPE_DEV, </div><div class='del'>-	                                           snd_dma_pci_data(emu-&gt;pci), </div><div class='del'>-	                                           65536 - 64, 65536 - 64)) &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;emu-&gt;pci-&gt;dev,</div><div class='add'>+					   65536 - 64, 65536 - 64);</div><div class='ctx'> 		/*</div><div class='del'>-		snd_printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev,</div><div class='ctx'> 			   "preallocate capture substream: err=%d\n", err);</div><div class='ctx'> 		*/</div><div class='ctx'> 	}</div><div class='ctx'>   </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-  </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -754,18 +658,12 @@ static int snd_p16v_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_p16v_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[8] = {</div><div class='add'>+	static const char * const texts[8] = {</div><div class='ctx'> 		"SPDIF", "I2S", "SRC48", "SRCMulti_SPDIF", "SRCMulti_I2S",</div><div class='ctx'> 		"CDIF", "FX", "AC97"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 7)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 7;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 8, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_p16v_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -802,15 +700,9 @@ static int snd_p16v_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_p16v_capture_channel_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = { "0", "1", "2", "3",  };</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 3)</div><div class='del'>-                uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	static const char * const texts[4] = { "0", "1", "2", "3", };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_p16v_capture_channel_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -854,7 +746,7 @@ static const DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);</div><div class='ctx'> 	.private_value = ((xreg) | ((xhl) &lt;&lt; 8)) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new p16v_mixer_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new p16v_mixer_controls[] = {</div><div class='ctx'> 	P16V_VOL("HD Analog Front Playback Volume", PLAYBACK_VOLUME_MIXER9, 0),</div><div class='ctx'> 	P16V_VOL("HD Analog Rear Playback Volume", PLAYBACK_VOLUME_MIXER10, 1),</div><div class='ctx'> 	P16V_VOL("HD Analog Center/LFE Playback Volume", PLAYBACK_VOLUME_MIXER9, 1),</div><div class='hunk'>@@ -880,26 +772,26 @@ static struct snd_kcontrol_new p16v_mixer_controls[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-int __devinit snd_p16v_mixer(struct snd_emu10k1 *emu)</div><div class='add'>+int snd_p16v_mixer(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err;</div><div class='ctx'>         struct snd_card *card = emu-&gt;card;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(p16v_mixer_controls); i++) {</div><div class='del'>-		if ((err = snd_ctl_add(card, snd_ctl_new1(&amp;p16v_mixer_controls[i],</div><div class='del'>-							  emu))) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, snd_ctl_new1(&amp;p16v_mixer_controls[i], emu));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> </div><div class='ctx'> #define NUM_CHS	1	/* up to 4, but only first channel is used */</div><div class='ctx'> </div><div class='del'>-int __devinit snd_p16v_alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='add'>+int snd_p16v_alloc_pm_buffer(struct snd_emu10k1 *emu)</div><div class='ctx'> {</div><div class='del'>-	emu-&gt;p16v_saved = vmalloc(NUM_CHS * 4 * 0x80);</div><div class='add'>+	emu-&gt;p16v_saved = vmalloc(array_size(NUM_CHS * 4, 0x80));</div><div class='ctx'> 	if (! emu-&gt;p16v_saved)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h<br/>index 153214940336..95ab8071751b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p16v.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p16v.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p16v.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/p16v.h</a></div><div class='hunk'>@@ -1,92 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver p16v chips</div><div class='del'>- *  Version: 0.21</div><div class='ctx'>  *</div><div class='del'>- *  FEATURES currently supported:</div><div class='del'>- *    Output fixed at S32_LE, 2 channel to hw:0,0</div><div class='del'>- *    Rates: 44.1, 48, 96, 192.</div><div class='del'>- *</div><div class='del'>- *  Changelog:</div><div class='del'>- *  0.8</div><div class='del'>- *    Use separate card based buffer for periods table.</div><div class='del'>- *  0.9</div><div class='del'>- *    Use 2 channel output streams instead of 8 channel.</div><div class='del'>- *       (8 channel output streams might be good for ASIO type output)</div><div class='del'>- *    Corrected speaker output, so Front -&gt; Front etc.</div><div class='del'>- *  0.10</div><div class='del'>- *    Fixed missed interrupts.</div><div class='del'>- *  0.11</div><div class='del'>- *    Add Sound card model number and names.</div><div class='del'>- *    Add Analog volume controls.</div><div class='del'>- *  0.12</div><div class='del'>- *    Corrected playback interrupts. Now interrupt per period, instead of half period.</div><div class='del'>- *  0.13</div><div class='del'>- *    Use single trigger for multichannel.</div><div class='del'>- *  0.14</div><div class='del'>- *    Mic capture now works at fixed: S32_LE, 96000Hz, Stereo.</div><div class='del'>- *  0.15</div><div class='del'>- *    Force buffer_size / period_size == INTEGER.</div><div class='del'>- *  0.16</div><div class='del'>- *    Update p16v.c to work with changed alsa api.</div><div class='del'>- *  0.17</div><div class='del'>- *    Update p16v.c to work with changed alsa api. Removed boot_devs.</div><div class='del'>- *  0.18</div><div class='del'>- *    Merging with snd-emu10k1 driver.</div><div class='del'>- *  0.19</div><div class='del'>- *    One stereo channel at 24bit now works.</div><div class='del'>- *  0.20</div><div class='del'>- *    Added better register defines.</div><div class='del'>- *  0.21</div><div class='del'>- *    Split from p16v.c</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    Some stability problems when unloading the snd-p16v kernel module.</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    SPDIF out.</div><div class='del'>- *    Find out how to change capture sample rates. E.g. To record SPDIF at 48000Hz.</div><div class='del'>- *    Currently capture fixed at 48000Hz.</div><div class='del'>- *</div><div class='del'>- *    --</div><div class='del'>- *  GENERAL INFO:</div><div class='del'>- *    Model: SB0240</div><div class='del'>- *    P16V Chip: CA0151-DBS</div><div class='del'>- *    Audigy 2 Chip: CA0102-IAT</div><div class='del'>- *    AC97 Codec: STAC 9721</div><div class='del'>- *    ADC: Philips 1361T (Stereo 24bit)</div><div class='del'>- *    DAC: CS4382-K (8-channel, 24bit, 192Khz)</div><div class='del'>- *</div><div class='del'>- *  This code was initally based on code from ALSA's emu10k1x.c which is:</div><div class='add'>+ *  This code was initially based on code from ALSA's emu10k1x.c which is:</div><div class='ctx'>  *  Copyright (c) by Francisco Moraes &lt;fmoraes@nc.rr.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /********************************************************************************************************/</div><div class='del'>-/* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and DATA2 registers                     */</div><div class='add'>+/* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and DATA2 registers              */</div><div class='ctx'> /********************************************************************************************************/</div><div class='ctx'>                                                                                                                            </div><div class='ctx'> /* The sample rate of the SPDIF outputs is set by modifying a register in the EMU10K2 PTR register A_SPDIF_SAMPLERATE.</div><div class='ctx'>  * The sample rate is also controlled by the same registers that control the rate of the EMU10K2 sample rate converters.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Initally all registers from 0x00 to 0x3f have zero contents. */</div><div class='add'>+/* Initially all registers from 0x00 to 0x3f have zero contents. */</div><div class='ctx'> #define PLAYBACK_LIST_ADDR	0x00		/* Base DMA address of a list of pointers to each period/size */</div><div class='ctx'> 						/* One list entry: 4 bytes for DMA address, </div><div class='ctx'> 						 * 4 bytes for period_size &lt;&lt; 16.</div><div class='hunk'>@@ -96,7 +25,7 @@</div><div class='ctx'> #define PLAYBACK_LIST_SIZE	0x01		/* Size of list in bytes &lt;&lt; 16. E.g. 8 periods -&gt; 0x00380000  */</div><div class='ctx'> #define PLAYBACK_LIST_PTR	0x02		/* Pointer to the current period being played */</div><div class='ctx'> #define PLAYBACK_UNKNOWN3	0x03		/* Not used */</div><div class='del'>-#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA addresss */</div><div class='add'>+#define PLAYBACK_DMA_ADDR	0x04		/* Playback DMA address */</div><div class='ctx'> #define PLAYBACK_PERIOD_SIZE	0x05		/* Playback period size. win2000 uses 0x04000000 */</div><div class='ctx'> #define PLAYBACK_POINTER	0x06		/* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */</div><div class='ctx'> #define PLAYBACK_FIFO_END_ADDRESS	0x07		/* Playback FIFO end address */</div><div class='head'>diff --git a/sound/pci/emu10k1/p17v.h b/sound/pci/emu10k1/p17v.h<br/>index 4ef5f68a9cd0..ee4f4ab4b79c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p17v.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/p17v.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/p17v.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/p17v.h</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver p17v chips</div><div class='del'>- *  Version: 0.01</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************/</div><div class='del'>-/* Audigy2Value Tina (P17V) pointer-offset register set,</div><div class='del'>- * accessed through the PTR20 and DATA24 registers  */</div><div class='add'>+/* Audigy2Value Tina (P17V) pointer-offset register set,                      */</div><div class='add'>+/* accessed through the PTR2 and DATA2 registers                              */</div><div class='ctx'> /******************************************************************************/</div><div class='ctx'> </div><div class='ctx'> /* 00 - 07: Not used */</div><div class='head'>diff --git a/sound/pci/emu10k1/timer.c b/sound/pci/emu10k1/timer.c<br/>index 72321e946ccc..1231ae2bf931 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/timer.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/timer.c</a></div><div class='hunk'>@@ -1,28 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='ctx'>  *                   Clemens Ladisch &lt;clemens@ladisch.de&gt;</div><div class='del'>- *  Routines for control of EMU10K1 chips</div><div class='del'>- *</div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='hunk'>@@ -32,50 +14,60 @@</div><div class='ctx'> static int snd_emu10k1_timer_start(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int delay;</div><div class='ctx'> </div><div class='ctx'> 	emu = snd_timer_chip(timer);</div><div class='ctx'> 	delay = timer-&gt;sticks - 1;</div><div class='ctx'> 	if (delay &lt; 5 ) /* minimum time is 5 ticks */</div><div class='ctx'> 		delay = 5;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	snd_emu10k1_intr_enable(emu, INTE_INTERVALTIMERENB);</div><div class='ctx'> 	outw(delay &amp; TIMER_RATE_MASK, emu-&gt;port + TIMER);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_emu10k1_timer_stop(struct snd_timer *timer)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1 *emu;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	emu = snd_timer_chip(timer);</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	snd_emu10k1_intr_disable(emu, INTE_INTERVALTIMERENB);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;reg_lock, flags);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned long snd_emu10k1_timer_c_resolution(struct snd_timer *timer)</div><div class='add'>+{</div><div class='add'>+	struct snd_emu10k1 *emu = snd_timer_chip(timer);</div><div class='add'>+</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model &amp;&amp;</div><div class='add'>+	    emu-&gt;emu1010.word_clock == 44100)</div><div class='add'>+		return 22676;  // 1 sample @ 44.1 kHz = 22.675736...us</div><div class='add'>+	else</div><div class='add'>+		return 20833;  // 1 sample @ 48 kHz = 20.833...us</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_emu10k1_timer_precise_resolution(struct snd_timer *timer,</div><div class='ctx'> 					       unsigned long *num, unsigned long *den)</div><div class='ctx'> {</div><div class='add'>+	struct snd_emu10k1 *emu = snd_timer_chip(timer);</div><div class='add'>+</div><div class='ctx'> 	*num = 1;</div><div class='del'>-	*den = 48000;</div><div class='add'>+	if (emu-&gt;card_capabilities-&gt;emu_model)</div><div class='add'>+		*den = emu-&gt;emu1010.word_clock;</div><div class='add'>+	else</div><div class='add'>+		*den = 48000;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_timer_hardware snd_emu10k1_timer_hw = {</div><div class='add'>+static const struct snd_timer_hardware snd_emu10k1_timer_hw = {</div><div class='ctx'> 	.flags = SNDRV_TIMER_HW_AUTO,</div><div class='del'>-	.resolution = 20833, /* 1 sample @ 48KHZ = 20.833...us */</div><div class='ctx'> 	.ticks = 1024,</div><div class='ctx'> 	.start = snd_emu10k1_timer_start,</div><div class='ctx'> 	.stop = snd_emu10k1_timer_stop,</div><div class='add'>+	.c_resolution = snd_emu10k1_timer_c_resolution,</div><div class='ctx'> 	.precise_resolution = snd_emu10k1_timer_precise_resolution,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int __devinit snd_emu10k1_timer(struct snd_emu10k1 *emu, int device)</div><div class='add'>+int snd_emu10k1_timer(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_timer *timer = NULL;</div><div class='ctx'> 	struct snd_timer_id tid;</div><div class='hunk'>@@ -86,8 +78,9 @@ int __devinit snd_emu10k1_timer(struct snd_emu10k1 *emu, int device)</div><div class='ctx'> 	tid.card = emu-&gt;card-&gt;number;</div><div class='ctx'> 	tid.device = device;</div><div class='ctx'> 	tid.subdevice = 0;</div><div class='del'>-	if ((err = snd_timer_new(emu-&gt;card, "EMU10K1", &amp;tid, &amp;timer)) &gt;= 0) {</div><div class='del'>-		strcpy(timer-&gt;name, "EMU10K1 timer");</div><div class='add'>+	err = snd_timer_new(emu-&gt;card, "EMU10K1", &amp;tid, &amp;timer);</div><div class='add'>+	if (err &gt;= 0) {</div><div class='add'>+		strscpy(timer-&gt;name, "EMU10K1 timer");</div><div class='ctx'> 		timer-&gt;private_data = emu;</div><div class='ctx'> 		timer-&gt;hw = snd_emu10k1_timer_hw;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/sound/pci/emu10k1/tina2.h b/sound/pci/emu10k1/tina2.h<br/>index f2d8eb6c89e1..e3fcb290271c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/tina2.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/tina2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/tina2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/tina2.h</a></div><div class='hunk'>@@ -1,22 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by James Courtier-Dutton &lt;James@superbug.demon.co.uk&gt;</div><div class='ctx'>  *  Driver tina2 chips</div><div class='del'>- *  Version: 0.1</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /********************************************************************************************************/</div><div class='head'>diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c<br/>index 20b8da250bd0..7fe1d1727768 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/voice.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/emu10k1/voice.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/emu10k1/voice.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/emu10k1/voice.c</a></div><div class='hunk'>@@ -1,34 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *                   Creative Labs, Inc.</div><div class='ctx'>  *                   Lee Revell &lt;rlrevell@joe-job.com&gt;</div><div class='del'>- *  Routines for control of EMU10K1 chips - voice manager</div><div class='del'>- *</div><div class='del'>- *  Rewrote voice allocator for multichannel support - rlrevell 12/2004</div><div class='del'>- * </div><div class='del'>- *  BUGS:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *  TODO:</div><div class='del'>- *    --</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='add'>+ *                   Oswald Buddenhagen &lt;oswald.buddenhagen@gmx.de&gt;</div><div class='add'>+ *                   Creative Labs, Inc.</div><div class='ctx'>  *</div><div class='add'>+ *  Routines for control of EMU10K1 chips - voice manager</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/emu10k1.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -36,112 +17,101 @@</div><div class='ctx'>  * allocator uses a round robin scheme.  The next free voice is tracked in </div><div class='ctx'>  * the card record and each allocation begins where the last left off.  The </div><div class='ctx'>  * hardware requires stereo interleaved voices be aligned to an even/odd </div><div class='del'>- * boundary.  For multichannel voice allocation we ensure than the block of </div><div class='del'>- * voices does not cross the 32 voice boundary.  This simplifies the </div><div class='del'>- * multichannel support and ensures we can use a single write to the </div><div class='del'>- * (set|clear)_loop_stop registers.  Otherwise (for example) the voices would </div><div class='del'>- * get out of sync when pausing/resuming a stream.</div><div class='add'>+ * boundary.</div><div class='ctx'>  *							--rlrevell</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,</div><div class='del'>-		       struct snd_emu10k1_voice **rvoice)</div><div class='add'>+		       struct snd_emu10k1_pcm *epcm, struct snd_emu10k1_voice **rvoice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_emu10k1_voice *voice;</div><div class='del'>-	int i, j, k, first_voice, last_voice, skip;</div><div class='add'>+	int i, j, k, skip;</div><div class='ctx'> </div><div class='del'>-	*rvoice = NULL;</div><div class='del'>-	first_voice = last_voice = 0;</div><div class='del'>-	for (i = emu-&gt;next_free_voice, j = 0; j &lt; NUM_G ; i += number, j += number) {</div><div class='add'>+	for (i = emu-&gt;next_free_voice, j = 0; j &lt; NUM_G; i = (i + skip) % NUM_G, j += skip) {</div><div class='ctx'> 		/*</div><div class='del'>-		printk(KERN_DEBUG "i %d j %d next free %d!\n",</div><div class='add'>+		dev_dbg(emu-&gt;card-&gt;dev, "i %d j %d next free %d!\n",</div><div class='ctx'> 		       i, j, emu-&gt;next_free_voice);</div><div class='ctx'> 		*/</div><div class='del'>-		i %= NUM_G;</div><div class='ctx'> </div><div class='ctx'> 		/* stereo voices must be even/odd */</div><div class='del'>-		if ((number == 2) &amp;&amp; (i % 2)) {</div><div class='del'>-			i++;</div><div class='add'>+		if ((number &gt; 1) &amp;&amp; (i % 2)) {</div><div class='add'>+			skip = 1;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-			</div><div class='del'>-		skip = 0;</div><div class='add'>+</div><div class='ctx'> 		for (k = 0; k &lt; number; k++) {</div><div class='del'>-			voice = &amp;emu-&gt;voices[(i+k) % NUM_G];</div><div class='add'>+			voice = &amp;emu-&gt;voices[i + k];</div><div class='ctx'> 			if (voice-&gt;use) {</div><div class='del'>-				skip = 1;</div><div class='del'>-				break;</div><div class='add'>+				skip = k + 1;</div><div class='add'>+				goto next;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (!skip) {</div><div class='del'>-			/* printk(KERN_DEBUG "allocated voice %d\n", i); */</div><div class='del'>-			first_voice = i;</div><div class='del'>-			last_voice = (i + number) % NUM_G;</div><div class='del'>-			emu-&gt;next_free_voice = last_voice;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (first_voice == last_voice)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; number; i++) {</div><div class='del'>-		voice = &amp;emu-&gt;voices[(first_voice + i) % NUM_G];</div><div class='del'>-		/*</div><div class='del'>-		printk(kERN_DEBUG "voice alloc - %i, %i of %i\n",</div><div class='del'>-		       voice-&gt;number, idx-first_voice+1, number);</div><div class='del'>-		*/</div><div class='del'>-		voice-&gt;use = 1;</div><div class='del'>-		switch (type) {</div><div class='del'>-		case EMU10K1_PCM:</div><div class='del'>-			voice-&gt;pcm = 1;</div><div class='del'>-			break;</div><div class='del'>-		case EMU10K1_SYNTH:</div><div class='del'>-			voice-&gt;synth = 1;</div><div class='del'>-			break;</div><div class='del'>-		case EMU10K1_MIDI:</div><div class='del'>-			voice-&gt;midi = 1;</div><div class='del'>-			break;</div><div class='del'>-		case EMU10K1_EFX:</div><div class='del'>-			voice-&gt;efx = 1;</div><div class='del'>-			break;</div><div class='add'>+</div><div class='add'>+		for (k = 0; k &lt; number; k++) {</div><div class='add'>+			voice = &amp;emu-&gt;voices[i + k];</div><div class='add'>+			voice-&gt;use = type;</div><div class='add'>+			voice-&gt;epcm = epcm;</div><div class='add'>+			/* dev_dbg(emu-&gt;card-&gt;dev, "allocated voice %d\n", i + k); */</div><div class='ctx'> 		}</div><div class='add'>+		voice-&gt;last = 1;</div><div class='add'>+</div><div class='add'>+		*rvoice = &amp;emu-&gt;voices[i];</div><div class='add'>+		emu-&gt;next_free_voice = (i + number) % NUM_G;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	next: ;</div><div class='ctx'> 	}</div><div class='del'>-	*rvoice = &amp;emu-&gt;voices[first_voice];</div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOMEM;  // -EBUSY would have been better</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void voice_free(struct snd_emu10k1 *emu,</div><div class='add'>+		       struct snd_emu10k1_voice *pvoice)</div><div class='add'>+{</div><div class='add'>+	if (pvoice-&gt;dirty)</div><div class='add'>+		snd_emu10k1_voice_init(emu, pvoice-&gt;number);</div><div class='add'>+	pvoice-&gt;interrupt = NULL;</div><div class='add'>+	pvoice-&gt;use = pvoice-&gt;dirty = pvoice-&gt;last = 0;</div><div class='add'>+	pvoice-&gt;epcm = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,</div><div class='del'>-			    struct snd_emu10k1_voice **rvoice)</div><div class='add'>+int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int count, int channels,</div><div class='add'>+			    struct snd_emu10k1_pcm *epcm, struct snd_emu10k1_voice **rvoice)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int result;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!rvoice))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	if (snd_BUG_ON(!number))</div><div class='add'>+	if (snd_BUG_ON(!count))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (snd_BUG_ON(!channels))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;voice_lock, flags);</div><div class='del'>-	for (;;) {</div><div class='del'>-		result = voice_alloc(emu, type, number, rvoice);</div><div class='del'>-		if (result == 0 || type == EMU10K1_SYNTH || type == EMU10K1_MIDI)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* free a voice from synth */</div><div class='del'>-		if (emu-&gt;get_synth_voice) {</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;voice_lock);</div><div class='add'>+	for (int got = 0; got &lt; channels; ) {</div><div class='add'>+		result = voice_alloc(emu, type, count, epcm, &amp;rvoice[got]);</div><div class='add'>+		if (result == 0) {</div><div class='add'>+			got++;</div><div class='add'>+			/*</div><div class='add'>+			dev_dbg(emu-&gt;card-&gt;dev, "voice alloc - %i, %i of %i\n",</div><div class='add'>+			        rvoice[got - 1]-&gt;number, got, want);</div><div class='add'>+			*/</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (type != EMU10K1_SYNTH &amp;&amp; emu-&gt;get_synth_voice) {</div><div class='add'>+			/* free a voice from synth */</div><div class='ctx'> 			result = emu-&gt;get_synth_voice(emu);</div><div class='ctx'> 			if (result &gt;= 0) {</div><div class='del'>-				struct snd_emu10k1_voice *pvoice = &amp;emu-&gt;voices[result];</div><div class='del'>-				pvoice-&gt;interrupt = NULL;</div><div class='del'>-				pvoice-&gt;use = pvoice-&gt;pcm = pvoice-&gt;synth = pvoice-&gt;midi = pvoice-&gt;efx = 0;</div><div class='del'>-				pvoice-&gt;epcm = NULL;</div><div class='add'>+				voice_free(emu, &amp;emu-&gt;voices[result]);</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (result &lt; 0)</div><div class='del'>-			break;</div><div class='add'>+		for (int i = 0; i &lt; got; i++) {</div><div class='add'>+			for (int j = 0; j &lt; count; j++)</div><div class='add'>+				voice_free(emu, rvoice[i] + j);</div><div class='add'>+			rvoice[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;voice_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='hunk'>@@ -151,16 +121,15 @@ EXPORT_SYMBOL(snd_emu10k1_voice_alloc);</div><div class='ctx'> int snd_emu10k1_voice_free(struct snd_emu10k1 *emu,</div><div class='ctx'> 			   struct snd_emu10k1_voice *pvoice)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='add'>+	int last;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!pvoice))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	spin_lock_irqsave(&amp;emu-&gt;voice_lock, flags);</div><div class='del'>-	pvoice-&gt;interrupt = NULL;</div><div class='del'>-	pvoice-&gt;use = pvoice-&gt;pcm = pvoice-&gt;synth = pvoice-&gt;midi = pvoice-&gt;efx = 0;</div><div class='del'>-	pvoice-&gt;epcm = NULL;</div><div class='del'>-	snd_emu10k1_voice_init(emu, pvoice-&gt;number);</div><div class='del'>-	spin_unlock_irqrestore(&amp;emu-&gt;voice_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;emu-&gt;voice_lock);</div><div class='add'>+	do {</div><div class='add'>+		last = pvoice-&gt;last;</div><div class='add'>+		voice_free(emu, pvoice++);</div><div class='add'>+	} while (!last);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c<br/>index 537cfba829a5..657056a59175 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ens1370.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ens1370.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ens1370.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ens1370.c</a></div><div class='hunk'>@@ -1,39 +1,25 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for Ensoniq ES1370/ES1371 AudioPCI soundcard</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;,</div><div class='ctx'>  *		     Thomas Sailer &lt;sailer@ife.ee.ethz.ch&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Power-Management-Code ( CONFIG_PM )</div><div class='ctx'>  * for ens1371 only ( FIXME )</div><div class='ctx'>  * derived from cs4281.c, atiixp.c and via82xx.c</div><div class='del'>- * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ </div><div class='add'>+ * using https://www.kernel.org/doc/html/latest/sound/kernel-api/writing-an-alsa-driver.html</div><div class='ctx'>  * by Kurt J. Bosch</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -55,8 +41,10 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> #define DRIVER_NAME "ENS1370"</div><div class='add'>+#define CHIP_NAME "ES1370" /* it can be ENS but just to keep compatibility... */</div><div class='ctx'> #else</div><div class='ctx'> #define DRIVER_NAME "ENS1371"</div><div class='add'>+#define CHIP_NAME "ES1371"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -64,31 +52,23 @@ MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;, Thomas Sailer &lt;sailer@ife.ee.et</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> MODULE_DESCRIPTION("Ensoniq AudioPCI ES1370");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI-97 ES1370},"</div><div class='del'>-	        "{Creative Labs,SB PCI64/128 (ES1370)}}");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CHIP1371</div><div class='ctx'> MODULE_DESCRIPTION("Ensoniq/Creative AudioPCI ES1371+");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Ensoniq,AudioPCI ES1371/73},"</div><div class='del'>-		"{Ensoniq,AudioPCI ES1373},"</div><div class='del'>-		"{Creative Labs,Ectiva EV1938},"</div><div class='del'>-		"{Creative Labs,SB PCI64/128 (ES1371/73)},"</div><div class='del'>-		"{Creative Labs,Vibra PCI128},"</div><div class='del'>-		"{Ectiva,EV1938}}");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_JOYSTICK</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> #ifdef CHIP1371</div><div class='ctx'> static int joystick_port[SNDRV_CARDS];</div><div class='ctx'> #else</div><div class='del'>-static int joystick[SNDRV_CARDS];</div><div class='add'>+static bool joystick[SNDRV_CARDS];</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CHIP1371</div><div class='hunk'>@@ -104,7 +84,7 @@ module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable Ensoniq AudioPCI soundcard.");</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> #ifdef CHIP1371</div><div class='del'>-module_param_array(joystick_port, int, NULL, 0444);</div><div class='add'>+module_param_hw_array(joystick_port, int, ioport, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick_port, "Joystick port address.");</div><div class='ctx'> #else</div><div class='ctx'> module_param_array(joystick, bool, NULL, 0444);</div><div class='hunk'>@@ -229,6 +209,7 @@ MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");</div><div class='ctx'> #define ES_REG_1371_CODEC 0x14	/* W/R: Codec Read/Write register address */</div><div class='ctx'> #define   ES_1371_CODEC_RDY	   (1&lt;&lt;31)	/* codec ready */</div><div class='ctx'> #define   ES_1371_CODEC_WIP	   (1&lt;&lt;30)	/* codec register access in progress */</div><div class='add'>+#define   EV_1938_CODEC_MAGIC	   (1&lt;&lt;26)</div><div class='ctx'> #define   ES_1371_CODEC_PIRD	   (1&lt;&lt;23)	/* codec read/write select register */</div><div class='ctx'> #define   ES_1371_CODEC_WRITE(a,d) ((((a)&amp;0x7f)&lt;&lt;16)|(((d)&amp;0xffff)&lt;&lt;0))</div><div class='ctx'> #define   ES_1371_CODEC_READS(a)   ((((a)&amp;0x7f)&lt;&lt;16)|ES_1371_CODEC_PIRD)</div><div class='hunk'>@@ -433,7 +414,7 @@ struct ensoniq {</div><div class='ctx'> 	unsigned int spdif_stream;</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	struct snd_dma_buffer dma_bug;</div><div class='add'>+	struct snd_dma_buffer *dma_bug;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='hunk'>@@ -443,7 +424,7 @@ struct ensoniq {</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_audiopci_ids) = {</div><div class='add'>+static const struct pci_device_id snd_audiopci_ids[] = {</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	{ PCI_VDEVICE(ENSONIQ, 0x5000), 0, },	/* ES1370 */</div><div class='ctx'> #endif</div><div class='hunk'>@@ -464,41 +445,41 @@ MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);</div><div class='ctx'> #define POLL_COUNT	0xa000</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-static unsigned int snd_es1370_fixed_rates[] =</div><div class='add'>+static const unsigned int snd_es1370_fixed_rates[] =</div><div class='ctx'> 	{5512, 11025, 22050, 44100};</div><div class='del'>-static struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = {</div><div class='ctx'> 	.count = 4, </div><div class='ctx'> 	.list = snd_es1370_fixed_rates,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='del'>-static struct snd_ratnum es1370_clock = {</div><div class='add'>+static const struct snd_ratnum es1370_clock = {</div><div class='ctx'> 	.num = ES_1370_SRCLOCK,</div><div class='ctx'> 	.den_min = 29, </div><div class='ctx'> 	.den_max = 353,</div><div class='ctx'> 	.den_step = 1,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums snd_es1370_hw_constraints_clock = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums snd_es1370_hw_constraints_clock = {</div><div class='ctx'> 	.nrats = 1,</div><div class='ctx'> 	.rats = &amp;es1370_clock,</div><div class='ctx'> };</div><div class='ctx'> #else</div><div class='del'>-static struct snd_ratden es1371_dac_clock = {</div><div class='add'>+static const struct snd_ratden es1371_dac_clock = {</div><div class='ctx'> 	.num_min = 3000 * (1 &lt;&lt; 15),</div><div class='ctx'> 	.num_max = 48000 * (1 &lt;&lt; 15),</div><div class='ctx'> 	.num_step = 3000,</div><div class='ctx'> 	.den = 1 &lt;&lt; 15,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_hw_constraint_ratdens snd_es1371_hw_constraints_dac_clock = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratdens snd_es1371_hw_constraints_dac_clock = {</div><div class='ctx'> 	.nrats = 1,</div><div class='ctx'> 	.rats = &amp;es1371_dac_clock,</div><div class='ctx'> };</div><div class='del'>-static struct snd_ratnum es1371_adc_clock = {</div><div class='add'>+static const struct snd_ratnum es1371_adc_clock = {</div><div class='ctx'> 	.num = 48000 &lt;&lt; 15,</div><div class='ctx'> 	.den_min = 32768, </div><div class='ctx'> 	.den_max = 393216,</div><div class='ctx'> 	.den_step = 1,</div><div class='ctx'> };</div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums snd_es1371_hw_constraints_adc_clock = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums snd_es1371_hw_constraints_adc_clock = {</div><div class='ctx'> 	.nrats = 1,</div><div class='ctx'> 	.rats = &amp;es1371_adc_clock,</div><div class='ctx'> };</div><div class='hunk'>@@ -522,7 +503,7 @@ static unsigned int snd_es1371_wait_src_ready(struct ensoniq * ensoniq)</div><div class='ctx'> 			return r;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "wait src ready timeout 0x%lx [0x%x]\n",</div><div class='add'>+	dev_err(ensoniq-&gt;card-&gt;dev, "wait src ready timeout 0x%lx [0x%x]\n",</div><div class='ctx'> 		   ES_REG(ensoniq, 1371_SMPRATE), r);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -584,7 +565,7 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,</div><div class='ctx'> 	unsigned long end_time = jiffies + HZ / 10;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG</div><div class='add'>+	dev_dbg(ensoniq-&gt;card-&gt;dev,</div><div class='ctx'> 	       "CODEC WRITE: reg = 0x%x, val = 0x%x (0x%x), creg = 0x%x\n",</div><div class='ctx'> 	       reg, val, ES_1370_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1370_CODEC));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -595,7 +576,7 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,</div><div class='ctx'> 		}</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after(end_time, jiffies));</div><div class='del'>-	snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n",</div><div class='add'>+	dev_err(ensoniq-&gt;card-&gt;dev, "codec write timeout, status = 0x%x\n",</div><div class='ctx'> 		   inl(ES_REG(ensoniq, STATUS)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -603,13 +584,19 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1371</div><div class='ctx'> </div><div class='add'>+static inline bool is_ev1938(struct ensoniq *ensoniq)</div><div class='add'>+{</div><div class='add'>+	return ensoniq-&gt;pci-&gt;device == 0x8938;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void snd_es1371_codec_write(struct snd_ac97 *ac97,</div><div class='ctx'> 				   unsigned short reg, unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = ac97-&gt;private_data;</div><div class='del'>-	unsigned int t, x;</div><div class='add'>+	unsigned int t, x, flag;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ensoniq-&gt;src_mutex);</div><div class='add'>+	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;</div><div class='add'>+	guard(mutex)(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 	for (t = 0; t &lt; POLL_COUNT; t++) {</div><div class='ctx'> 		if (!(inl(ES_REG(ensoniq, 1371_CODEC)) &amp; ES_1371_CODEC_WIP)) {</div><div class='ctx'> 			/* save the current state for latter */</div><div class='hunk'>@@ -630,16 +617,15 @@ static void snd_es1371_codec_write(struct snd_ac97 *ac97,</div><div class='ctx'> 				    0x00010000)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));</div><div class='add'>+			outl(ES_1371_CODEC_WRITE(reg, val) | flag,</div><div class='add'>+			     ES_REG(ensoniq, 1371_CODEC));</div><div class='ctx'> 			/* restore SRC reg */</div><div class='ctx'> 			snd_es1371_wait_src_ready(ensoniq);</div><div class='ctx'> 			outl(x, ES_REG(ensoniq, 1371_SMPRATE));</div><div class='del'>-			mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='del'>-	snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n",</div><div class='add'>+	dev_err(ensoniq-&gt;card-&gt;dev, "codec write timeout at 0x%lx [0x%x]\n",</div><div class='ctx'> 		   ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -647,8 +633,9 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> 					    unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = ac97-&gt;private_data;</div><div class='del'>-	unsigned int t, x, fail = 0;</div><div class='add'>+	unsigned int t, x, flag, fail = 0;</div><div class='ctx'> </div><div class='add'>+	flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;</div><div class='ctx'>       __again:</div><div class='ctx'> 	mutex_lock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 	for (t = 0; t &lt; POLL_COUNT; t++) {</div><div class='hunk'>@@ -671,7 +658,8 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> 				    0x00010000)</div><div class='ctx'> 					break;</div><div class='ctx'> 			}</div><div class='del'>-			outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));</div><div class='add'>+			outl(ES_1371_CODEC_READS(reg) | flag,</div><div class='add'>+			     ES_REG(ensoniq, 1371_CODEC));</div><div class='ctx'> 			/* restore SRC reg */</div><div class='ctx'> 			snd_es1371_wait_src_ready(ensoniq);</div><div class='ctx'> 			outl(x, ES_REG(ensoniq, 1371_SMPRATE));</div><div class='hunk'>@@ -682,15 +670,21 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> 			}</div><div class='ctx'> 			/* now wait for the stinkin' data (RDY) */</div><div class='ctx'> 			for (t = 0; t &lt; POLL_COUNT; t++) {</div><div class='del'>-				if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) &amp; ES_1371_CODEC_RDY) {</div><div class='add'>+				x = inl(ES_REG(ensoniq, 1371_CODEC));</div><div class='add'>+				if (x &amp; ES_1371_CODEC_RDY) {</div><div class='add'>+					if (is_ev1938(ensoniq)) {</div><div class='add'>+						for (t = 0; t &lt; 100; t++)</div><div class='add'>+							inl(ES_REG(ensoniq, CONTROL));</div><div class='add'>+						x = inl(ES_REG(ensoniq, 1371_CODEC));</div><div class='add'>+					}</div><div class='ctx'> 					mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 					return ES_1371_CODEC_READ(x);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 			if (++fail &gt; 10) {</div><div class='del'>-				snd_printk(KERN_ERR "codec read timeout (final) "</div><div class='del'>-					   "at 0x%lx, reg = 0x%x [0x%x]\n",</div><div class='add'>+				dev_err(ensoniq-&gt;card-&gt;dev,</div><div class='add'>+					"codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n",</div><div class='ctx'> 					   ES_REG(ensoniq, 1371_CODEC), reg,</div><div class='ctx'> 					   inl(ES_REG(ensoniq, 1371_CODEC)));</div><div class='ctx'> 				return 0;</div><div class='hunk'>@@ -699,7 +693,7 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='del'>-	snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n",</div><div class='add'>+	dev_err(ensoniq-&gt;card-&gt;dev, "codec read timeout at 0x%lx [0x%x]\n",</div><div class='ctx'> 		   ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC)));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -715,15 +709,14 @@ static void snd_es1371_codec_wait(struct snd_ac97 *ac97)</div><div class='ctx'> </div><div class='ctx'> static void snd_es1371_adc_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned int n, truncm, freq, result;</div><div class='add'>+	unsigned int n, truncm, freq;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ensoniq-&gt;src_mutex);</div><div class='add'>+	guard(mutex)(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 	n = rate / 3000;</div><div class='ctx'> 	if ((1 &lt;&lt; n) &amp; ((1 &lt;&lt; 15) | (1 &lt;&lt; 13) | (1 &lt;&lt; 11) | (1 &lt;&lt; 9)))</div><div class='ctx'> 		n--;</div><div class='ctx'> 	truncm = (21 * n - 1) | 1;</div><div class='ctx'> 	freq = ((48000UL &lt;&lt; 15) / rate) * n;</div><div class='del'>-	result = (48000UL &lt;&lt; 15) / (freq / n);</div><div class='ctx'> 	if (rate &gt;= 24000) {</div><div class='ctx'> 		if (truncm &gt; 239)</div><div class='ctx'> 			truncm = 239;</div><div class='hunk'>@@ -742,15 +735,14 @@ static void snd_es1371_adc_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> 	snd_es1371_src_write(ensoniq, ES_SMPREG_ADC + ES_SMPREG_VFREQ_FRAC, freq &amp; 0x7fff);</div><div class='ctx'> 	snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC, n &lt;&lt; 8);</div><div class='ctx'> 	snd_es1371_src_write(ensoniq, ES_SMPREG_VOL_ADC + 1, n &lt;&lt; 8);</div><div class='del'>-	mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_es1371_dac1_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int freq, r;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ensoniq-&gt;src_mutex);</div><div class='del'>-	freq = ((rate &lt;&lt; 15) + 1500) / 3000;</div><div class='add'>+	guard(mutex)(&amp;ensoniq-&gt;src_mutex);</div><div class='add'>+	freq = DIV_ROUND_CLOSEST(rate &lt;&lt; 15, 3000);</div><div class='ctx'> 	r = (snd_es1371_wait_src_ready(ensoniq) &amp; (ES_1371_SRC_DISABLE |</div><div class='ctx'> 						   ES_1371_DIS_P2 | ES_1371_DIS_R1)) |</div><div class='ctx'> 		ES_1371_DIS_P1;</div><div class='hunk'>@@ -763,15 +755,14 @@ static void snd_es1371_dac1_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> 	r = (snd_es1371_wait_src_ready(ensoniq) &amp; (ES_1371_SRC_DISABLE |</div><div class='ctx'> 						   ES_1371_DIS_P2 | ES_1371_DIS_R1));</div><div class='ctx'> 	outl(r, ES_REG(ensoniq, 1371_SMPRATE));</div><div class='del'>-	mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_es1371_dac2_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int freq, r;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ensoniq-&gt;src_mutex);</div><div class='del'>-	freq = ((rate &lt;&lt; 15) + 1500) / 3000;</div><div class='add'>+	guard(mutex)(&amp;ensoniq-&gt;src_mutex);</div><div class='add'>+	freq = DIV_ROUND_CLOSEST(rate &lt;&lt; 15, 3000);</div><div class='ctx'> 	r = (snd_es1371_wait_src_ready(ensoniq) &amp; (ES_1371_SRC_DISABLE |</div><div class='ctx'> 						   ES_1371_DIS_P1 | ES_1371_DIS_R1)) |</div><div class='ctx'> 		ES_1371_DIS_P2;</div><div class='hunk'>@@ -785,7 +776,6 @@ static void snd_es1371_dac2_rate(struct ensoniq * ensoniq, unsigned int rate)</div><div class='ctx'> 	r = (snd_es1371_wait_src_ready(ensoniq) &amp; (ES_1371_SRC_DISABLE |</div><div class='ctx'> 						   ES_1371_DIS_P1 | ES_1371_DIS_R1));</div><div class='ctx'> 	outl(r, ES_REG(ensoniq, 1371_SMPRATE));</div><div class='del'>-	mutex_unlock(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif /* CHIP1371 */</div><div class='hunk'>@@ -809,13 +799,13 @@ static int snd_ensoniq_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 			} else if (s == ensoniq-&gt;capture_substream)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-		if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH)</div><div class='del'>-			ensoniq-&gt;sctrl |= what;</div><div class='del'>-		else</div><div class='del'>-			ensoniq-&gt;sctrl &amp;= ~what;</div><div class='del'>-		outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-		spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+			if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH)</div><div class='add'>+				ensoniq-&gt;sctrl |= what;</div><div class='add'>+			else</div><div class='add'>+				ensoniq-&gt;sctrl &amp;= ~what;</div><div class='add'>+			outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -835,13 +825,13 @@ static int snd_ensoniq_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 				snd_pcm_trigger_done(s, substream);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-		if (cmd == SNDRV_PCM_TRIGGER_START)</div><div class='del'>-			ensoniq-&gt;ctrl |= what;</div><div class='del'>-		else</div><div class='del'>-			ensoniq-&gt;ctrl &amp;= ~what;</div><div class='del'>-		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-		spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+			if (cmd == SNDRV_PCM_TRIGGER_START)</div><div class='add'>+				ensoniq-&gt;ctrl |= what;</div><div class='add'>+			else</div><div class='add'>+				ensoniq-&gt;ctrl &amp;= ~what;</div><div class='add'>+			outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -854,17 +844,6 @@ static int snd_ensoniq_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'>  *  PCM part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_ensoniq_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ensoniq_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_ensoniq_playback1_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -877,36 +856,36 @@ static int snd_ensoniq_playback1_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		mode |= 0x02;</div><div class='ctx'> 	if (runtime-&gt;channels &gt; 1)</div><div class='ctx'> 		mode |= 0x01;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	ensoniq-&gt;ctrl &amp;= ~ES_DAC1_EN;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		ensoniq-&gt;ctrl &amp;= ~ES_DAC1_EN;</div><div class='ctx'> #ifdef CHIP1371</div><div class='del'>-	/* 48k doesn't need SRC (it breaks AC3-passthru) */</div><div class='del'>-	if (runtime-&gt;rate == 48000)</div><div class='del'>-		ensoniq-&gt;ctrl |= ES_1373_BYPASS_P1;</div><div class='del'>-	else</div><div class='del'>-		ensoniq-&gt;ctrl &amp;= ~ES_1373_BYPASS_P1;</div><div class='add'>+		/* 48k doesn't need SRC (it breaks AC3-passthru) */</div><div class='add'>+		if (runtime-&gt;rate == 48000)</div><div class='add'>+			ensoniq-&gt;ctrl |= ES_1373_BYPASS_P1;</div><div class='add'>+		else</div><div class='add'>+			ensoniq-&gt;ctrl &amp;= ~ES_1373_BYPASS_P1;</div><div class='ctx'> #endif</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='del'>-	outl(runtime-&gt;dma_addr, ES_REG(ensoniq, DAC1_FRAME));</div><div class='del'>-	outl((ensoniq-&gt;p1_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, DAC1_SIZE));</div><div class='del'>-	ensoniq-&gt;sctrl &amp;= ~(ES_P1_LOOP_SEL | ES_P1_PAUSE | ES_P1_SCT_RLD | ES_P1_MODEM);</div><div class='del'>-	ensoniq-&gt;sctrl |= ES_P1_INT_EN | ES_P1_MODEO(mode);</div><div class='del'>-	outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-	outl((ensoniq-&gt;p1_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='del'>-	     ES_REG(ensoniq, DAC1_COUNT));</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+		outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='add'>+		outl(runtime-&gt;dma_addr, ES_REG(ensoniq, DAC1_FRAME));</div><div class='add'>+		outl((ensoniq-&gt;p1_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, DAC1_SIZE));</div><div class='add'>+		ensoniq-&gt;sctrl &amp;= ~(ES_P1_LOOP_SEL | ES_P1_PAUSE | ES_P1_SCT_RLD | ES_P1_MODEM);</div><div class='add'>+		ensoniq-&gt;sctrl |= ES_P1_INT_EN | ES_P1_MODEO(mode);</div><div class='add'>+		outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+		outl((ensoniq-&gt;p1_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='add'>+		     ES_REG(ensoniq, DAC1_COUNT));</div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	ensoniq-&gt;ctrl &amp;= ~ES_1370_WTSRSELM;</div><div class='del'>-	switch (runtime-&gt;rate) {</div><div class='del'>-	case 5512: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(0); break;</div><div class='del'>-	case 11025: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(1); break;</div><div class='del'>-	case 22050: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(2); break;</div><div class='del'>-	case 44100: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(3); break;</div><div class='del'>-	default: snd_BUG();</div><div class='del'>-	}</div><div class='add'>+		ensoniq-&gt;ctrl &amp;= ~ES_1370_WTSRSELM;</div><div class='add'>+		switch (runtime-&gt;rate) {</div><div class='add'>+		case 5512: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(0); break;</div><div class='add'>+		case 11025: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(1); break;</div><div class='add'>+		case 22050: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(2); break;</div><div class='add'>+		case 44100: ensoniq-&gt;ctrl |= ES_1370_WTSRSEL(3); break;</div><div class='add'>+		default: snd_BUG();</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+	}</div><div class='ctx'> #ifndef CHIP1370</div><div class='ctx'> 	snd_es1371_dac1_rate(ensoniq, runtime-&gt;rate);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -925,28 +904,28 @@ static int snd_ensoniq_playback2_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		mode |= 0x02;</div><div class='ctx'> 	if (runtime-&gt;channels &gt; 1)</div><div class='ctx'> 		mode |= 0x01;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	ensoniq-&gt;ctrl &amp;= ~ES_DAC2_EN;</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='del'>-	outl(runtime-&gt;dma_addr, ES_REG(ensoniq, DAC2_FRAME));</div><div class='del'>-	outl((ensoniq-&gt;p2_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, DAC2_SIZE));</div><div class='del'>-	ensoniq-&gt;sctrl &amp;= ~(ES_P2_LOOP_SEL | ES_P2_PAUSE | ES_P2_DAC_SEN |</div><div class='del'>-			    ES_P2_END_INCM | ES_P2_ST_INCM | ES_P2_MODEM);</div><div class='del'>-	ensoniq-&gt;sctrl |= ES_P2_INT_EN | ES_P2_MODEO(mode) |</div><div class='del'>-			  ES_P2_END_INCO(mode &amp; 2 ? 2 : 1) | ES_P2_ST_INCO(0);</div><div class='del'>-	outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-	outl((ensoniq-&gt;p2_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='del'>-	     ES_REG(ensoniq, DAC2_COUNT));</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		ensoniq-&gt;ctrl &amp;= ~ES_DAC2_EN;</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+		outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='add'>+		outl(runtime-&gt;dma_addr, ES_REG(ensoniq, DAC2_FRAME));</div><div class='add'>+		outl((ensoniq-&gt;p2_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, DAC2_SIZE));</div><div class='add'>+		ensoniq-&gt;sctrl &amp;= ~(ES_P2_LOOP_SEL | ES_P2_PAUSE | ES_P2_DAC_SEN |</div><div class='add'>+				    ES_P2_END_INCM | ES_P2_ST_INCM | ES_P2_MODEM);</div><div class='add'>+		ensoniq-&gt;sctrl |= ES_P2_INT_EN | ES_P2_MODEO(mode) |</div><div class='add'>+			ES_P2_END_INCO(mode &amp; 2 ? 2 : 1) | ES_P2_ST_INCO(0);</div><div class='add'>+		outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+		outl((ensoniq-&gt;p2_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='add'>+		     ES_REG(ensoniq, DAC2_COUNT));</div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	if (!(ensoniq-&gt;u.es1370.pclkdiv_lock &amp; ES_MODE_CAPTURE)) {</div><div class='del'>-		ensoniq-&gt;ctrl &amp;= ~ES_1370_PCLKDIVM;</div><div class='del'>-		ensoniq-&gt;ctrl |= ES_1370_PCLKDIVO(ES_1370_SRTODIV(runtime-&gt;rate));</div><div class='del'>-		ensoniq-&gt;u.es1370.pclkdiv_lock |= ES_MODE_PLAY2;</div><div class='del'>-	}</div><div class='add'>+		if (!(ensoniq-&gt;u.es1370.pclkdiv_lock &amp; ES_MODE_CAPTURE)) {</div><div class='add'>+			ensoniq-&gt;ctrl &amp;= ~ES_1370_PCLKDIVM;</div><div class='add'>+			ensoniq-&gt;ctrl |= ES_1370_PCLKDIVO(ES_1370_SRTODIV(runtime-&gt;rate));</div><div class='add'>+			ensoniq-&gt;u.es1370.pclkdiv_lock |= ES_MODE_PLAY2;</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+	}</div><div class='ctx'> #ifndef CHIP1370</div><div class='ctx'> 	snd_es1371_dac2_rate(ensoniq, runtime-&gt;rate);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -965,26 +944,26 @@ static int snd_ensoniq_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		mode |= 0x02;</div><div class='ctx'> 	if (runtime-&gt;channels &gt; 1)</div><div class='ctx'> 		mode |= 0x01;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	ensoniq-&gt;ctrl &amp;= ~ES_ADC_EN;</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));</div><div class='del'>-	outl(runtime-&gt;dma_addr, ES_REG(ensoniq, ADC_FRAME));</div><div class='del'>-	outl((ensoniq-&gt;c_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, ADC_SIZE));</div><div class='del'>-	ensoniq-&gt;sctrl &amp;= ~(ES_R1_LOOP_SEL | ES_R1_MODEM);</div><div class='del'>-	ensoniq-&gt;sctrl |= ES_R1_INT_EN | ES_R1_MODEO(mode);</div><div class='del'>-	outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-	outl((ensoniq-&gt;c_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='del'>-	     ES_REG(ensoniq, ADC_COUNT));</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		ensoniq-&gt;ctrl &amp;= ~ES_ADC_EN;</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+		outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));</div><div class='add'>+		outl(runtime-&gt;dma_addr, ES_REG(ensoniq, ADC_FRAME));</div><div class='add'>+		outl((ensoniq-&gt;c_dma_size &gt;&gt; 2) - 1, ES_REG(ensoniq, ADC_SIZE));</div><div class='add'>+		ensoniq-&gt;sctrl &amp;= ~(ES_R1_LOOP_SEL | ES_R1_MODEM);</div><div class='add'>+		ensoniq-&gt;sctrl |= ES_R1_INT_EN | ES_R1_MODEO(mode);</div><div class='add'>+		outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+		outl((ensoniq-&gt;c_period_size &gt;&gt; snd_ensoniq_sample_shift[mode]) - 1,</div><div class='add'>+		     ES_REG(ensoniq, ADC_COUNT));</div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	if (!(ensoniq-&gt;u.es1370.pclkdiv_lock &amp; ES_MODE_PLAY2)) {</div><div class='del'>-		ensoniq-&gt;ctrl &amp;= ~ES_1370_PCLKDIVM;</div><div class='del'>-		ensoniq-&gt;ctrl |= ES_1370_PCLKDIVO(ES_1370_SRTODIV(runtime-&gt;rate));</div><div class='del'>-		ensoniq-&gt;u.es1370.pclkdiv_lock |= ES_MODE_CAPTURE;</div><div class='del'>-	}</div><div class='add'>+		if (!(ensoniq-&gt;u.es1370.pclkdiv_lock &amp; ES_MODE_PLAY2)) {</div><div class='add'>+			ensoniq-&gt;ctrl &amp;= ~ES_1370_PCLKDIVM;</div><div class='add'>+			ensoniq-&gt;ctrl |= ES_1370_PCLKDIVO(ES_1370_SRTODIV(runtime-&gt;rate));</div><div class='add'>+			ensoniq-&gt;u.es1370.pclkdiv_lock |= ES_MODE_CAPTURE;</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='del'>-	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='add'>+	}</div><div class='ctx'> #ifndef CHIP1370</div><div class='ctx'> 	snd_es1371_adc_rate(ensoniq, runtime-&gt;rate);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -996,16 +975,14 @@ static snd_pcm_uframes_t snd_ensoniq_playback1_pointer(struct snd_pcm_substream</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	size_t ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (inl(ES_REG(ensoniq, CONTROL)) &amp; ES_DAC1_EN) {</div><div class='ctx'> 		outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='ctx'> 		ptr = ES_REG_FCURR_COUNTI(inl(ES_REG(ensoniq, DAC1_SIZE)));</div><div class='del'>-		ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+		return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	} else {</div><div class='del'>-		ptr = 0;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ensoniq_playback2_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1013,16 +990,14 @@ static snd_pcm_uframes_t snd_ensoniq_playback2_pointer(struct snd_pcm_substream</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	size_t ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (inl(ES_REG(ensoniq, CONTROL)) &amp; ES_DAC2_EN) {</div><div class='ctx'> 		outl(ES_MEM_PAGEO(ES_PAGE_DAC), ES_REG(ensoniq, MEM_PAGE));</div><div class='ctx'> 		ptr = ES_REG_FCURR_COUNTI(inl(ES_REG(ensoniq, DAC2_SIZE)));</div><div class='del'>-		ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+		return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	} else {</div><div class='del'>-		ptr = 0;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ensoniq_capture_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1030,19 +1005,17 @@ static snd_pcm_uframes_t snd_ensoniq_capture_pointer(struct snd_pcm_substream *s</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	size_t ptr;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (inl(ES_REG(ensoniq, CONTROL)) &amp; ES_ADC_EN) {</div><div class='ctx'> 		outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));</div><div class='ctx'> 		ptr = ES_REG_FCURR_COUNTI(inl(ES_REG(ensoniq, ADC_SIZE)));</div><div class='del'>-		ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+		return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	} else {</div><div class='del'>-		ptr = 0;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ensoniq_playback1 =</div><div class='add'>+static const struct snd_pcm_hardware snd_ensoniq_playback1 =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1069,7 +1042,7 @@ static struct snd_pcm_hardware snd_ensoniq_playback1 =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ensoniq_playback2 =</div><div class='add'>+static const struct snd_pcm_hardware snd_ensoniq_playback2 =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1089,7 +1062,7 @@ static struct snd_pcm_hardware snd_ensoniq_playback2 =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_ensoniq_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_ensoniq_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1117,10 +1090,10 @@ static int snd_ensoniq_playback1_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ensoniq-&gt;playback1_substream = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_ensoniq_playback1;</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	if (ensoniq-&gt;spdif &amp;&amp; ensoniq-&gt;playback2_substream == NULL)</div><div class='del'>-		ensoniq-&gt;spdif_stream = ensoniq-&gt;spdif_default;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		if (ensoniq-&gt;spdif &amp;&amp; ensoniq-&gt;playback2_substream == NULL)</div><div class='add'>+			ensoniq-&gt;spdif_stream = ensoniq-&gt;spdif_default;</div><div class='add'>+	}</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='ctx'> 				   &amp;snd_es1370_hw_constraints_rates);</div><div class='hunk'>@@ -1140,10 +1113,10 @@ static int snd_ensoniq_playback2_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ensoniq-&gt;playback2_substream = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_ensoniq_playback2;</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	if (ensoniq-&gt;spdif &amp;&amp; ensoniq-&gt;playback1_substream == NULL)</div><div class='del'>-		ensoniq-&gt;spdif_stream = ensoniq-&gt;spdif_default;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		if (ensoniq-&gt;spdif &amp;&amp; ensoniq-&gt;playback1_substream == NULL)</div><div class='add'>+			ensoniq-&gt;spdif_stream = ensoniq-&gt;spdif_default;</div><div class='add'>+	}</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	snd_pcm_hw_constraint_ratnums(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='ctx'> 				      &amp;snd_es1370_hw_constraints_clock);</div><div class='hunk'>@@ -1187,12 +1160,11 @@ static int snd_ensoniq_playback2_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	ensoniq-&gt;playback2_substream = NULL;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	ensoniq-&gt;u.es1370.pclkdiv_lock &amp;= ~ES_MODE_PLAY2;</div><div class='ctx'> #endif</div><div class='ctx'> 	ensoniq-&gt;mode &amp;= ~ES_MODE_PLAY2;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1201,61 +1173,52 @@ static int snd_ensoniq_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	ensoniq-&gt;capture_substream = NULL;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	ensoniq-&gt;u.es1370.pclkdiv_lock &amp;= ~ES_MODE_CAPTURE;</div><div class='ctx'> #endif</div><div class='ctx'> 	ensoniq-&gt;mode &amp;= ~ES_MODE_CAPTURE;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ensoniq_playback1_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ensoniq_playback1_ops = {</div><div class='ctx'> 	.open =		snd_ensoniq_playback1_open,</div><div class='ctx'> 	.close =	snd_ensoniq_playback1_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ensoniq_hw_params,</div><div class='del'>-	.hw_free =	snd_ensoniq_hw_free,</div><div class='ctx'> 	.prepare =	snd_ensoniq_playback1_prepare,</div><div class='ctx'> 	.trigger =	snd_ensoniq_trigger,</div><div class='ctx'> 	.pointer =	snd_ensoniq_playback1_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ensoniq_playback2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ensoniq_playback2_ops = {</div><div class='ctx'> 	.open =		snd_ensoniq_playback2_open,</div><div class='ctx'> 	.close =	snd_ensoniq_playback2_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ensoniq_hw_params,</div><div class='del'>-	.hw_free =	snd_ensoniq_hw_free,</div><div class='ctx'> 	.prepare =	snd_ensoniq_playback2_prepare,</div><div class='ctx'> 	.trigger =	snd_ensoniq_trigger,</div><div class='ctx'> 	.pointer =	snd_ensoniq_playback2_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ensoniq_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ensoniq_capture_ops = {</div><div class='ctx'> 	.open =		snd_ensoniq_capture_open,</div><div class='ctx'> 	.close =	snd_ensoniq_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ensoniq_hw_params,</div><div class='del'>-	.hw_free =	snd_ensoniq_hw_free,</div><div class='ctx'> 	.prepare =	snd_ensoniq_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_ensoniq_trigger,</div><div class='ctx'> 	.pointer =	snd_ensoniq_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,</div><div class='del'>-				     struct snd_pcm ** rpcm)</div><div class='add'>+static const struct snd_pcm_chmap_elem surround_map[] = {</div><div class='add'>+	{ .channels = 1,</div><div class='add'>+	  .map = { SNDRV_CHMAP_MONO } },</div><div class='add'>+	{ .channels = 2,</div><div class='add'>+	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int snd_ensoniq_pcm(struct ensoniq *ensoniq, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	err = snd_pcm_new(ensoniq-&gt;card, "ES1370/1", device, 1, 1, &amp;pcm);</div><div class='del'>-#else</div><div class='del'>-	err = snd_pcm_new(ensoniq-&gt;card, "ES1371/1", device, 1, 1, &amp;pcm);</div><div class='del'>-#endif</div><div class='add'>+	err = snd_pcm_new(ensoniq-&gt;card, CHIP_NAME "/1", device, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1268,34 +1231,28 @@ static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ensoniq;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	strcpy(pcm-&gt;name, "ES1370 DAC2/ADC");</div><div class='del'>-#else</div><div class='del'>-	strcpy(pcm-&gt;name, "ES1371 DAC2/ADC");</div><div class='del'>-#endif</div><div class='add'>+	strscpy(pcm-&gt;name, CHIP_NAME " DAC2/ADC");</div><div class='ctx'> 	ensoniq-&gt;pcm1 = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ensoniq-&gt;pci), 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ensoniq-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	return 0;</div><div class='add'>+#ifdef CHIP1370</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     surround_map, 2, 0, NULL);</div><div class='add'>+#else</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_std_chmaps, 2, 0, NULL);</div><div class='add'>+#endif</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_pcm2(struct ensoniq * ensoniq, int device,</div><div class='del'>-				      struct snd_pcm ** rpcm)</div><div class='add'>+static int snd_ensoniq_pcm2(struct ensoniq *ensoniq, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	err = snd_pcm_new(ensoniq-&gt;card, "ES1370/2", device, 1, 0, &amp;pcm);</div><div class='del'>-#else</div><div class='del'>-	err = snd_pcm_new(ensoniq-&gt;card, "ES1371/2", device, 1, 0, &amp;pcm);</div><div class='del'>-#endif</div><div class='add'>+	err = snd_pcm_new(ensoniq-&gt;card, CHIP_NAME "/2", device, 1, 0, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1306,19 +1263,20 @@ static int __devinit snd_ensoniq_pcm2(struct ensoniq * ensoniq, int device,</div><div class='ctx'> #endif</div><div class='ctx'> 	pcm-&gt;private_data = ensoniq;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	strcpy(pcm-&gt;name, "ES1370 DAC1");</div><div class='del'>-#else</div><div class='del'>-	strcpy(pcm-&gt;name, "ES1371 DAC1");</div><div class='del'>-#endif</div><div class='add'>+	strscpy(pcm-&gt;name, CHIP_NAME " DAC1");</div><div class='ctx'> 	ensoniq-&gt;pcm2 = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ensoniq-&gt;pci), 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ensoniq-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	return 0;</div><div class='add'>+#ifdef CHIP1370</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_std_chmaps, 2, 0, NULL);</div><div class='add'>+#else</div><div class='add'>+	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     surround_map, 2, 0, NULL);</div><div class='add'>+#endif</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1341,12 +1299,12 @@ static int snd_ens1373_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'>                                          struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = (ensoniq-&gt;spdif_default &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (ensoniq-&gt;spdif_default &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (ensoniq-&gt;spdif_default &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = (ensoniq-&gt;spdif_default &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1361,13 +1319,12 @@ static int snd_ens1373_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	change = ensoniq-&gt;spdif_default != val;</div><div class='ctx'> 	ensoniq-&gt;spdif_default = val;</div><div class='ctx'> 	if (change &amp;&amp; ensoniq-&gt;playback1_substream == NULL &amp;&amp;</div><div class='ctx'> 	    ensoniq-&gt;playback2_substream == NULL)</div><div class='ctx'> 		outl(val, ES_REG(ensoniq, CHANNEL_STATUS));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1385,12 +1342,12 @@ static int snd_ens1373_spdif_stream_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[0] = (ensoniq-&gt;spdif_stream &gt;&gt; 0) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[1] = (ensoniq-&gt;spdif_stream &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[2] = (ensoniq-&gt;spdif_stream &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	ucontrol-&gt;value.iec958.status[3] = (ensoniq-&gt;spdif_stream &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1405,13 +1362,12 @@ static int snd_ens1373_spdif_stream_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='ctx'> 	      ((u32)ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	change = ensoniq-&gt;spdif_stream != val;</div><div class='ctx'> 	ensoniq-&gt;spdif_stream = val;</div><div class='ctx'> 	if (change &amp;&amp; (ensoniq-&gt;playback1_substream != NULL ||</div><div class='ctx'> 		       ensoniq-&gt;playback2_substream != NULL))</div><div class='ctx'> 		outl(val, ES_REG(ensoniq, CHANNEL_STATUS));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1426,9 +1382,8 @@ static int snd_es1371_spdif_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = ensoniq-&gt;ctrl &amp; ES_1373_SPDIF_THRU ? 1 : 0;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1441,7 +1396,7 @@ static int snd_es1371_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	</div><div class='ctx'> 	nval1 = ucontrol-&gt;value.integer.value[0] ? ES_1373_SPDIF_THRU : 0;</div><div class='ctx'> 	nval2 = ucontrol-&gt;value.integer.value[0] ? ES_1373_SPDIF_EN : 0;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	change = (ensoniq-&gt;ctrl &amp; ES_1373_SPDIF_THRU) != nval1;</div><div class='ctx'> 	ensoniq-&gt;ctrl &amp;= ~ES_1373_SPDIF_THRU;</div><div class='ctx'> 	ensoniq-&gt;ctrl |= nval1;</div><div class='hunk'>@@ -1449,13 +1404,12 @@ static int snd_es1371_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	ensoniq-&gt;cssr |= nval2;</div><div class='ctx'> 	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='ctx'> 	outl(ensoniq-&gt;cssr, ES_REG(ensoniq, STATUS));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* spdif controls */</div><div class='del'>-static struct snd_kcontrol_new snd_es1371_mixer_spdif[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es1371_mixer_spdif[] = {</div><div class='ctx'> 	ES1371_SPDIF(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH)),</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1489,12 +1443,11 @@ static int snd_es1373_rear_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int val = 0;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if ((ensoniq-&gt;cssr &amp; (ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|</div><div class='ctx'> 			      ES_1373_REAR_BIT24)) == ES_1373_REAR_BIT26)</div><div class='ctx'> 	    	val = 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1507,17 +1460,16 @@ static int snd_es1373_rear_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	</div><div class='ctx'> 	nval1 = ucontrol-&gt;value.integer.value[0] ?</div><div class='ctx'> 		ES_1373_REAR_BIT26 : (ES_1373_REAR_BIT27|ES_1373_REAR_BIT24);</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	change = (ensoniq-&gt;cssr &amp; (ES_1373_REAR_BIT27|</div><div class='ctx'> 				   ES_1373_REAR_BIT26|ES_1373_REAR_BIT24)) != nval1;</div><div class='ctx'> 	ensoniq-&gt;cssr &amp;= ~(ES_1373_REAR_BIT27|ES_1373_REAR_BIT26|ES_1373_REAR_BIT24);</div><div class='ctx'> 	ensoniq-&gt;cssr |= nval1;</div><div class='ctx'> 	outl(ensoniq-&gt;cssr, ES_REG(ensoniq, STATUS));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ens1373_rear __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ens1373_rear =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"AC97 2ch-&gt;4ch Copy Switch",</div><div class='hunk'>@@ -1534,11 +1486,10 @@ static int snd_es1373_line_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int val = 0;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	if ((ensoniq-&gt;ctrl &amp; ES_1371_GPIO_OUTM) &gt;= 4)</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	if (ensoniq-&gt;ctrl &amp; ES_1371_GPIO_OUT(4))</div><div class='ctx'> 	    	val = 1;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1549,7 +1500,7 @@ static int snd_es1373_line_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int changed;</div><div class='ctx'> 	unsigned int ctrl;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ctrl = ensoniq-&gt;ctrl;</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		ensoniq-&gt;ctrl |= ES_1371_GPIO_OUT(4);	/* switch line-in -&gt; rear out */</div><div class='hunk'>@@ -1558,11 +1509,10 @@ static int snd_es1373_line_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	changed = (ctrl != ensoniq-&gt;ctrl);</div><div class='ctx'> 	if (changed)</div><div class='ctx'> 		outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ens1373_line __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ens1373_line =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name =		"Line In-&gt;Rear Out Switch",</div><div class='hunk'>@@ -1584,7 +1534,7 @@ struct es1371_quirk {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int es1371_quirk_lookup(struct ensoniq *ensoniq,</div><div class='del'>-				struct es1371_quirk *list)</div><div class='add'>+			       const struct es1371_quirk *list)</div><div class='ctx'> {</div><div class='ctx'> 	while (list-&gt;vid != (unsigned short)PCI_ANY_ID) {</div><div class='ctx'> 		if (ensoniq-&gt;pci-&gt;vendor == list-&gt;vid &amp;&amp;</div><div class='hunk'>@@ -1596,7 +1546,7 @@ static int es1371_quirk_lookup(struct ensoniq *ensoniq,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct es1371_quirk es1371_spdif_present[] __devinitdata = {</div><div class='add'>+static const struct es1371_quirk es1371_spdif_present[] = {</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_C },</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_D },</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_E },</div><div class='hunk'>@@ -1605,26 +1555,27 @@ static struct es1371_quirk es1371_spdif_present[] __devinitdata = {</div><div class='ctx'> 	{ .vid = PCI_ANY_ID, .did = PCI_ANY_ID }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk ens1373_line_quirk[] __devinitdata = {</div><div class='add'>+static const struct snd_pci_quirk ens1373_line_quirk[] = {</div><div class='ctx'> 	SND_PCI_QUIRK_ID(0x1274, 0x2000), /* GA-7DXR */</div><div class='ctx'> 	SND_PCI_QUIRK_ID(0x1458, 0xa000), /* GA-8IEXP */</div><div class='ctx'> 	{ } /* end */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,</div><div class='del'>-					    int has_spdif, int has_line)</div><div class='add'>+static int snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,</div><div class='add'>+				  int has_spdif, int has_line)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = ensoniq-&gt;card;</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_es1371_codec_write,</div><div class='ctx'> 		.read = snd_es1371_codec_read,</div><div class='ctx'> 		.wait = snd_es1371_codec_wait,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='hunk'>@@ -1632,7 +1583,8 @@ static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,</div><div class='ctx'> 	ac97.private_free = snd_ensoniq_mixer_free_ac97;</div><div class='ctx'> 	ac97.pci = ensoniq-&gt;pci;</div><div class='ctx'> 	ac97.scaps = AC97_SCAP_AUDIO;</div><div class='del'>-	if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;ensoniq-&gt;u.es1371.ac97)) &lt; 0)</div><div class='add'>+	err = snd_ac97_mixer(pbus, &amp;ac97, &amp;ensoniq-&gt;u.es1371.ac97);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (has_spdif &gt; 0 ||</div><div class='ctx'> 	    (!has_spdif &amp;&amp; es1371_quirk_lookup(ensoniq, es1371_spdif_present))) {</div><div class='hunk'>@@ -1692,9 +1644,8 @@ static int snd_ensoniq_control_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct ensoniq *ensoniq = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int mask = kcontrol-&gt;private_value;</div><div class='ctx'> 	</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = ensoniq-&gt;ctrl &amp; mask ? 1 : 0;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1707,12 +1658,11 @@ static int snd_ensoniq_control_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change;</div><div class='ctx'> 	</div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] ? mask : 0;</div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	change = (ensoniq-&gt;ctrl &amp; mask) != nval;</div><div class='ctx'> 	ensoniq-&gt;ctrl &amp;= ~mask;</div><div class='ctx'> 	ensoniq-&gt;ctrl |= nval;</div><div class='ctx'> 	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1720,7 +1670,7 @@ static int snd_ensoniq_control_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>  * ENS1370 mixer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es1370_controls[2] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es1370_controls[2] = {</div><div class='ctx'> ENSONIQ_CONTROL("PCM 0 Output also on Line-In Jack", ES_1370_XCTL0),</div><div class='ctx'> ENSONIQ_CONTROL("Mic +5V bias", ES_1370_XCTL1)</div><div class='ctx'> };</div><div class='hunk'>@@ -1733,7 +1683,7 @@ static void snd_ensoniq_mixer_free_ak4531(struct snd_ak4531 *ak4531)</div><div class='ctx'> 	ensoniq-&gt;u.es1370.ak4531 = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_1370_mixer(struct ensoniq * ensoniq)</div><div class='add'>+static int snd_ensoniq_1370_mixer(struct ensoniq *ensoniq)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = ensoniq-&gt;card;</div><div class='ctx'> 	struct snd_ak4531 ak4531;</div><div class='hunk'>@@ -1752,7 +1702,8 @@ static int __devinit snd_ensoniq_1370_mixer(struct ensoniq * ensoniq)</div><div class='ctx'> 	ak4531.write = snd_es1370_codec_write;</div><div class='ctx'> 	ak4531.private_data = ensoniq;</div><div class='ctx'> 	ak4531.private_free = snd_ensoniq_mixer_free_ak4531;</div><div class='del'>-	if ((err = snd_ak4531_mixer(card, &amp;ak4531, &amp;ensoniq-&gt;u.es1370.ak4531)) &lt; 0)</div><div class='add'>+	err = snd_ak4531_mixer(card, &amp;ak4531, &amp;ensoniq-&gt;u.es1370.ak4531);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	for (idx = 0; idx &lt; ES1370_CONTROLS; idx++) {</div><div class='ctx'> 		err = snd_ctl_add(card, snd_ctl_new1(&amp;snd_es1370_controls[idx], ensoniq));</div><div class='hunk'>@@ -1767,7 +1718,7 @@ static int __devinit snd_ensoniq_1370_mixer(struct ensoniq * ensoniq)</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1371</div><div class='del'>-static int __devinit snd_ensoniq_get_joystick_port(int dev)</div><div class='add'>+static int snd_ensoniq_get_joystick_port(struct ensoniq *ensoniq, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	switch (joystick_port[dev]) {</div><div class='ctx'> 	case 0: /* disabled */</div><div class='hunk'>@@ -1779,23 +1730,24 @@ static int __devinit snd_ensoniq_get_joystick_port(int dev)</div><div class='ctx'> 		return joystick_port[dev];</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		printk(KERN_ERR "ens1371: invalid joystick port %#x", joystick_port[dev]);</div><div class='add'>+		dev_err(ensoniq-&gt;card-&gt;dev,</div><div class='add'>+			"invalid joystick port %#x", joystick_port[dev]);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-static inline int snd_ensoniq_get_joystick_port(int dev)</div><div class='add'>+static int snd_ensoniq_get_joystick_port(struct ensoniq *ensoniq, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	return joystick[dev] ? 0x200 : 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)</div><div class='add'>+static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> 	int io_port;</div><div class='ctx'> </div><div class='del'>-	io_port = snd_ensoniq_get_joystick_port(dev);</div><div class='add'>+	io_port = snd_ensoniq_get_joystick_port(ensoniq, dev);</div><div class='ctx'> </div><div class='ctx'> 	switch (io_port) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -1806,14 +1758,16 @@ static int __devinit snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int de</div><div class='ctx'> 			if (request_region(io_port, 8, "ens137x: gameport"))</div><div class='ctx'> 				break;</div><div class='ctx'> 		if (io_port &gt; 0x218) {</div><div class='del'>-			printk(KERN_WARNING "ens137x: no gameport ports available\n");</div><div class='add'>+			dev_warn(ensoniq-&gt;card-&gt;dev,</div><div class='add'>+				 "no gameport ports available\n");</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		if (!request_region(io_port, 8, "ens137x: gameport")) {</div><div class='del'>-			printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n",</div><div class='add'>+			dev_warn(ensoniq-&gt;card-&gt;dev,</div><div class='add'>+				 "gameport io port %#x in use\n",</div><div class='ctx'> 			       io_port);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1822,7 +1776,8 @@ static int __devinit snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int de</div><div class='ctx'> </div><div class='ctx'> 	ensoniq-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "ens137x: cannot allocate memory for gameport\n");</div><div class='add'>+		dev_err(ensoniq-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		release_region(io_port, 8);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1870,41 +1825,35 @@ static void snd_ensoniq_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = entry-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	snd_iprintf(buffer, "Ensoniq AudioPCI ES1370\n\n");</div><div class='del'>-#else</div><div class='del'>-	snd_iprintf(buffer, "Ensoniq AudioPCI ES1371\n\n");</div><div class='del'>-#endif</div><div class='add'>+	snd_iprintf(buffer, "Ensoniq AudioPCI " CHIP_NAME "\n\n");</div><div class='ctx'> 	snd_iprintf(buffer, "Joystick enable  : %s\n",</div><div class='del'>-		    ensoniq-&gt;ctrl &amp; ES_JYSTK_EN ? "on" : "off");</div><div class='add'>+		    str_on_off(ensoniq-&gt;ctrl &amp; ES_JYSTK_EN));</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	snd_iprintf(buffer, "MIC +5V bias     : %s\n",</div><div class='del'>-		    ensoniq-&gt;ctrl &amp; ES_1370_XCTL1 ? "on" : "off");</div><div class='add'>+		    str_on_off(ensoniq-&gt;ctrl &amp; ES_1370_XCTL1));</div><div class='ctx'> 	snd_iprintf(buffer, "Line In to AOUT  : %s\n",</div><div class='del'>-		    ensoniq-&gt;ctrl &amp; ES_1370_XCTL0 ? "on" : "off");</div><div class='add'>+		    str_on_off(ensoniq-&gt;ctrl &amp; ES_1370_XCTL0));</div><div class='ctx'> #else</div><div class='ctx'> 	snd_iprintf(buffer, "Joystick port    : 0x%x\n",</div><div class='ctx'> 		    (ES_1371_JOY_ASELI(ensoniq-&gt;ctrl) * 8) + 0x200);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ensoniq_proc_init(struct ensoniq * ensoniq)</div><div class='add'>+static void snd_ensoniq_proc_init(struct ensoniq *ensoniq)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(ensoniq-&gt;card, "audiopci", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ensoniq, snd_ensoniq_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(ensoniq-&gt;card, "audiopci", ensoniq,</div><div class='add'>+			     snd_ensoniq_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> </div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_ensoniq_free(struct ensoniq *ensoniq)</div><div class='add'>+static void snd_ensoniq_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct ensoniq *ensoniq = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	snd_ensoniq_free_gameport(ensoniq);</div><div class='del'>-	if (ensoniq-&gt;irq &lt; 0)</div><div class='del'>-		goto __hw_end;</div><div class='ctx'> #ifdef CHIP1370</div><div class='ctx'> 	outl(ES_1370_SERR_DISABLE, ES_REG(ensoniq, CONTROL));	/* switch everything off */</div><div class='ctx'> 	outl(0, ES_REG(ensoniq, SERIAL));	/* clear serial interface */</div><div class='hunk'>@@ -1912,30 +1861,10 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq)</div><div class='ctx'> 	outl(0, ES_REG(ensoniq, CONTROL));	/* switch everything off */</div><div class='ctx'> 	outl(0, ES_REG(ensoniq, SERIAL));	/* clear serial interface */</div><div class='ctx'> #endif</div><div class='del'>-	if (ensoniq-&gt;irq &gt;= 0)</div><div class='del'>-		synchronize_irq(ensoniq-&gt;irq);</div><div class='del'>-	pci_set_power_state(ensoniq-&gt;pci, 3);</div><div class='del'>-      __hw_end:</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	if (ensoniq-&gt;dma_bug.area)</div><div class='del'>-		snd_dma_free_pages(&amp;ensoniq-&gt;dma_bug);</div><div class='del'>-#endif</div><div class='del'>-	if (ensoniq-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(ensoniq-&gt;irq, ensoniq);</div><div class='del'>-	pci_release_regions(ensoniq-&gt;pci);</div><div class='del'>-	pci_disable_device(ensoniq-&gt;pci);</div><div class='del'>-	kfree(ensoniq);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ensoniq_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct ensoniq *ensoniq = device-&gt;device_data;</div><div class='del'>-	return snd_ensoniq_free(ensoniq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1371</div><div class='del'>-static struct snd_pci_quirk es1371_amplifier_hack[] __devinitdata = {</div><div class='add'>+static const struct snd_pci_quirk es1371_amplifier_hack[] = {</div><div class='ctx'> 	SND_PCI_QUIRK_ID(0x107b, 0x2150),	/* Gateway Solo 2150 */</div><div class='ctx'> 	SND_PCI_QUIRK_ID(0x13bd, 0x100c),	/* EV1938 on Mebius PC-MJ100V */</div><div class='ctx'> 	SND_PCI_QUIRK_ID(0x1102, 0x5938),	/* Targa Xtender300 */</div><div class='hunk'>@@ -1943,7 +1872,7 @@ static struct snd_pci_quirk es1371_amplifier_hack[] __devinitdata = {</div><div class='ctx'> 	{ } /* end */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct es1371_quirk es1371_ac97_reset_hack[] = {</div><div class='add'>+static const struct es1371_quirk es1371_ac97_reset_hack[] = {</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_C },</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_D },</div><div class='ctx'> 	{ .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev = CT5880REV_CT5880_E },</div><div class='hunk'>@@ -1965,7 +1894,7 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq)</div><div class='ctx'> 	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='ctx'> 	outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='ctx'> 	outl(ES_MEM_PAGEO(ES_PAGE_ADC), ES_REG(ensoniq, MEM_PAGE));</div><div class='del'>-	outl(ensoniq-&gt;dma_bug.addr, ES_REG(ensoniq, PHANTOM_FRAME));</div><div class='add'>+	outl(ensoniq-&gt;dma_bug-&gt;addr, ES_REG(ensoniq, PHANTOM_FRAME));</div><div class='ctx'> 	outl(0, ES_REG(ensoniq, PHANTOM_COUNT));</div><div class='ctx'> #else</div><div class='ctx'> 	outl(ensoniq-&gt;ctrl, ES_REG(ensoniq, CONTROL));</div><div class='hunk'>@@ -2014,20 +1943,15 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq)</div><div class='ctx'> 	outb(ensoniq-&gt;uartc = 0x00, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 	outb(0x00, ES_REG(ensoniq, UART_RES));</div><div class='ctx'> 	outl(ensoniq-&gt;cssr, ES_REG(ensoniq, STATUS));</div><div class='del'>-	synchronize_irq(ensoniq-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_ensoniq_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_ensoniq_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct ensoniq *ensoniq = card-&gt;private_data;</div><div class='ctx'> 	</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(ensoniq-&gt;pcm1);</div><div class='del'>-	snd_pcm_suspend_all(ensoniq-&gt;pcm2);</div><div class='del'>-	</div><div class='ctx'> #ifdef CHIP1371	</div><div class='ctx'> 	snd_ac97_suspend(ensoniq-&gt;u.es1371.ac97);</div><div class='ctx'> #else</div><div class='hunk'>@@ -2040,28 +1964,14 @@ static int snd_ensoniq_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> 	snd_ak4531_suspend(ensoniq-&gt;u.es1370.ak4531);</div><div class='ctx'> #endif	</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ensoniq_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_ensoniq_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct ensoniq *ensoniq = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR DRIVER_NAME ": pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_ensoniq_chip_init(ensoniq);</div><div class='ctx'> </div><div class='ctx'> #ifdef CHIP1371	</div><div class='hunk'>@@ -2072,52 +1982,39 @@ static int snd_ensoniq_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_ensoniq_pm, snd_ensoniq_suspend, snd_ensoniq_resume);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_create(struct snd_card *card,</div><div class='del'>-				     struct pci_dev *pci,</div><div class='del'>-				     struct ensoniq ** rensoniq)</div><div class='add'>+static int snd_ensoniq_create(struct snd_card *card,</div><div class='add'>+			      struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct ensoniq *ensoniq;</div><div class='add'>+	struct ensoniq *ensoniq = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_ensoniq_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rensoniq = NULL;</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL);</div><div class='del'>-	if (ensoniq == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	mutex_init(&amp;ensoniq-&gt;src_mutex);</div><div class='ctx'> 	ensoniq-&gt;card = card;</div><div class='ctx'> 	ensoniq-&gt;pci = pci;</div><div class='ctx'> 	ensoniq-&gt;irq = -1;</div><div class='del'>-	if ((err = pci_request_regions(pci, "Ensoniq AudioPCI")) &lt; 0) {</div><div class='del'>-		kfree(ensoniq);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "Ensoniq AudioPCI");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	ensoniq-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_audiopci_interrupt, IRQF_SHARED,</div><div class='del'>-			"Ensoniq AudioPCI", ensoniq)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_ensoniq_free(ensoniq);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_audiopci_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, ensoniq)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	ensoniq-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = ensoniq-&gt;irq;</div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				16, &amp;ensoniq-&gt;dma_bug) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to allocate space for phantom area - dma_bug\n");</div><div class='del'>-		snd_ensoniq_free(ensoniq);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='add'>+	ensoniq-&gt;dma_bug =</div><div class='add'>+		snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV, 16);</div><div class='add'>+	if (!ensoniq-&gt;dma_bug)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> #endif</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	ensoniq-&gt;rev = pci-&gt;revision;</div><div class='hunk'>@@ -2140,18 +2037,10 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,</div><div class='ctx'> 		ensoniq-&gt;cssr |= ES_1371_ST_AC97_RST;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	card-&gt;private_free = snd_ensoniq_free;</div><div class='ctx'> 	snd_ensoniq_chip_init(ensoniq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_ensoniq_free(ensoniq);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	snd_ensoniq_proc_init(ensoniq);</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rensoniq = ensoniq;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2167,19 +2056,19 @@ static void snd_ensoniq_midi_interrupt(struct ensoniq * ensoniq)</div><div class='ctx'> 	if (rmidi == NULL)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* do Rx at first */</div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	mask = ensoniq-&gt;uartm &amp; ES_MODE_INPUT ? ES_RXRDY : 0;</div><div class='del'>-	while (mask) {</div><div class='del'>-		status = inb(ES_REG(ensoniq, UART_STATUS));</div><div class='del'>-		if ((status &amp; mask) == 0)</div><div class='del'>-			break;</div><div class='del'>-		byte = inb(ES_REG(ensoniq, UART_DATA));</div><div class='del'>-		snd_rawmidi_receive(ensoniq-&gt;midi_input, &amp;byte, 1);</div><div class='add'>+	scoped_guard(spinlock, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		mask = ensoniq-&gt;uartm &amp; ES_MODE_INPUT ? ES_RXRDY : 0;</div><div class='add'>+		while (mask) {</div><div class='add'>+			status = inb(ES_REG(ensoniq, UART_STATUS));</div><div class='add'>+			if ((status &amp; mask) == 0)</div><div class='add'>+				break;</div><div class='add'>+			byte = inb(ES_REG(ensoniq, UART_DATA));</div><div class='add'>+			snd_rawmidi_receive(ensoniq-&gt;midi_input, &amp;byte, 1);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* do Tx at second */</div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	mask = ensoniq-&gt;uartm &amp; ES_MODE_OUTPUT ? ES_TXRDY : 0;</div><div class='ctx'> 	while (mask) {</div><div class='ctx'> 		status = inb(ES_REG(ensoniq, UART_STATUS));</div><div class='hunk'>@@ -2193,14 +2082,13 @@ static void snd_ensoniq_midi_interrupt(struct ensoniq * ensoniq)</div><div class='ctx'> 			outb(byte, ES_REG(ensoniq, UART_DATA));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ensoniq_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ensoniq-&gt;uartm |= ES_MODE_INPUT;</div><div class='ctx'> 	ensoniq-&gt;midi_input = substream;</div><div class='ctx'> 	if (!(ensoniq-&gt;uartm &amp; ES_MODE_OUTPUT)) {</div><div class='hunk'>@@ -2208,7 +2096,6 @@ static int snd_ensoniq_midi_input_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		outb(ensoniq-&gt;uartc = 0, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		outl(ensoniq-&gt;ctrl |= ES_UART_EN, ES_REG(ensoniq, CONTROL));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2216,7 +2103,7 @@ static int snd_ensoniq_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (!(ensoniq-&gt;uartm &amp; ES_MODE_OUTPUT)) {</div><div class='ctx'> 		outb(ensoniq-&gt;uartc = 0, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		outl(ensoniq-&gt;ctrl &amp;= ~ES_UART_EN, ES_REG(ensoniq, CONTROL));</div><div class='hunk'>@@ -2225,7 +2112,6 @@ static int snd_ensoniq_midi_input_close(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 	}</div><div class='ctx'> 	ensoniq-&gt;midi_input = NULL;</div><div class='ctx'> 	ensoniq-&gt;uartm &amp;= ~ES_MODE_INPUT;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2233,7 +2119,7 @@ static int snd_ensoniq_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	ensoniq-&gt;uartm |= ES_MODE_OUTPUT;</div><div class='ctx'> 	ensoniq-&gt;midi_output = substream;</div><div class='ctx'> 	if (!(ensoniq-&gt;uartm &amp; ES_MODE_INPUT)) {</div><div class='hunk'>@@ -2241,7 +2127,6 @@ static int snd_ensoniq_midi_output_open(struct snd_rawmidi_substream *substream)</div><div class='ctx'> 		outb(ensoniq-&gt;uartc = 0, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		outl(ensoniq-&gt;ctrl |= ES_UART_EN, ES_REG(ensoniq, CONTROL));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2249,7 +2134,7 @@ static int snd_ensoniq_midi_output_close(struct snd_rawmidi_substream *substream</div><div class='ctx'> {</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (!(ensoniq-&gt;uartm &amp; ES_MODE_INPUT)) {</div><div class='ctx'> 		outb(ensoniq-&gt;uartc = 0, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		outl(ensoniq-&gt;ctrl &amp;= ~ES_UART_EN, ES_REG(ensoniq, CONTROL));</div><div class='hunk'>@@ -2258,17 +2143,15 @@ static int snd_ensoniq_midi_output_close(struct snd_rawmidi_substream *substream</div><div class='ctx'> 	}</div><div class='ctx'> 	ensoniq-&gt;midi_output = NULL;</div><div class='ctx'> 	ensoniq-&gt;uartm &amp;= ~ES_MODE_OUTPUT;</div><div class='del'>-	spin_unlock_irq(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ensoniq_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ensoniq-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if ((ensoniq-&gt;uartc &amp; ES_RXINTEN) == 0) {</div><div class='ctx'> 			/* empty input FIFO */</div><div class='hunk'>@@ -2283,16 +2166,14 @@ static void snd_ensoniq_midi_input_trigger(struct snd_rawmidi_substream *substre</div><div class='ctx'> 			outb(ensoniq-&gt;uartc, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ensoniq-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_ensoniq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	struct ensoniq *ensoniq = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> 	unsigned char byte;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ensoniq-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ensoniq-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		if (ES_TXINTENI(ensoniq-&gt;uartc) == 0) {</div><div class='ctx'> 			ensoniq-&gt;uartc |= ES_TXINTENO(1);</div><div class='hunk'>@@ -2313,46 +2194,37 @@ static void snd_ensoniq_midi_output_trigger(struct snd_rawmidi_substream *substr</div><div class='ctx'> 			outb(ensoniq-&gt;uartc, ES_REG(ensoniq, UART_CONTROL));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ensoniq-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_ensoniq_midi_output =</div><div class='add'>+static const struct snd_rawmidi_ops snd_ensoniq_midi_output =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_ensoniq_midi_output_open,</div><div class='ctx'> 	.close =	snd_ensoniq_midi_output_close,</div><div class='ctx'> 	.trigger =	snd_ensoniq_midi_output_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops snd_ensoniq_midi_input =</div><div class='add'>+static const struct snd_rawmidi_ops snd_ensoniq_midi_input =</div><div class='ctx'> {</div><div class='ctx'> 	.open =		snd_ensoniq_midi_input_open,</div><div class='ctx'> 	.close =	snd_ensoniq_midi_input_close,</div><div class='ctx'> 	.trigger =	snd_ensoniq_midi_input_trigger,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ensoniq_midi(struct ensoniq * ensoniq, int device,</div><div class='del'>-				      struct snd_rawmidi **rrawmidi)</div><div class='add'>+static int snd_ensoniq_midi(struct ensoniq *ensoniq, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = NULL;</div><div class='del'>-	if ((err = snd_rawmidi_new(ensoniq-&gt;card, "ES1370/1", device, 1, 1, &amp;rmidi)) &lt; 0)</div><div class='add'>+	err = snd_rawmidi_new(ensoniq-&gt;card, "ES1370/1", device, 1, 1, &amp;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-#ifdef CHIP1370</div><div class='del'>-	strcpy(rmidi-&gt;name, "ES1370");</div><div class='del'>-#else</div><div class='del'>-	strcpy(rmidi-&gt;name, "ES1371");</div><div class='del'>-#endif</div><div class='add'>+	strscpy(rmidi-&gt;name, CHIP_NAME);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &amp;snd_ensoniq_midi_output);</div><div class='ctx'> 	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &amp;snd_ensoniq_midi_input);</div><div class='ctx'> 	rmidi-&gt;info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT |</div><div class='ctx'> 		SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='ctx'> 	rmidi-&gt;private_data = ensoniq;</div><div class='ctx'> 	ensoniq-&gt;rmidi = rmidi;</div><div class='del'>-	if (rrawmidi)</div><div class='del'>-		*rrawmidi = rmidi;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2372,17 +2244,17 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (!(status &amp; ES_INTR))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ensoniq-&gt;reg_lock);</div><div class='del'>-	sctrl = ensoniq-&gt;sctrl;</div><div class='del'>-	if (status &amp; ES_DAC1)</div><div class='del'>-		sctrl &amp;= ~ES_P1_INT_EN;</div><div class='del'>-	if (status &amp; ES_DAC2)</div><div class='del'>-		sctrl &amp;= ~ES_P2_INT_EN;</div><div class='del'>-	if (status &amp; ES_ADC)</div><div class='del'>-		sctrl &amp;= ~ES_R1_INT_EN;</div><div class='del'>-	outl(sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-	outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='del'>-	spin_unlock(&amp;ensoniq-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock, &amp;ensoniq-&gt;reg_lock) {</div><div class='add'>+		sctrl = ensoniq-&gt;sctrl;</div><div class='add'>+		if (status &amp; ES_DAC1)</div><div class='add'>+			sctrl &amp;= ~ES_P1_INT_EN;</div><div class='add'>+		if (status &amp; ES_DAC2)</div><div class='add'>+			sctrl &amp;= ~ES_P2_INT_EN;</div><div class='add'>+		if (status &amp; ES_ADC)</div><div class='add'>+			sctrl &amp;= ~ES_R1_INT_EN;</div><div class='add'>+		outl(sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+		outl(ensoniq-&gt;sctrl, ES_REG(ensoniq, SERIAL));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; ES_UART)</div><div class='ctx'> 		snd_ensoniq_midi_interrupt(ensoniq);</div><div class='hunk'>@@ -2395,13 +2267,13 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_audiopci_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_audiopci_probe(struct pci_dev *pci,</div><div class='add'>+				const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct ensoniq *ensoniq;</div><div class='del'>-	int err, pcm_devs[2];</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -2410,89 +2282,69 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*ensoniq), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	ensoniq = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ensoniq_create(card, pci, &amp;ensoniq)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = ensoniq;</div><div class='ctx'> </div><div class='del'>-	pcm_devs[0] = 0; pcm_devs[1] = 1;</div><div class='ctx'> #ifdef CHIP1370</div><div class='del'>-	if ((err = snd_ensoniq_1370_mixer(ensoniq)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_1370_mixer(ensoniq);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef CHIP1371</div><div class='del'>-	if ((err = snd_ensoniq_1371_mixer(ensoniq, spdif[dev], lineio[dev])) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_1371_mixer(ensoniq, spdif[dev], lineio[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> #endif</div><div class='del'>-	if ((err = snd_ensoniq_pcm(ensoniq, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_pcm(ensoniq, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_ensoniq_pcm2(ensoniq, 1, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_pcm2(ensoniq, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_ensoniq_midi(ensoniq, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ensoniq_midi(ensoniq, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	snd_ensoniq_create_gameport(ensoniq, dev);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, DRIVER_NAME);</div><div class='add'>+	strscpy(card-&gt;driver, DRIVER_NAME);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;shortname, "Ensoniq AudioPCI");</div><div class='add'>+	strscpy(card-&gt;shortname, "Ensoniq AudioPCI");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s %s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		card-&gt;driver,</div><div class='ctx'> 		ensoniq-&gt;port,</div><div class='ctx'> 		ensoniq-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_audiopci_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_audiopci_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_audiopci_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = DRIVER_NAME,</div><div class='add'>+static struct pci_driver ens137x_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_audiopci_ids,</div><div class='ctx'> 	.probe = snd_audiopci_probe,</div><div class='del'>-	.remove = __devexit_p(snd_audiopci_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_ensoniq_suspend,</div><div class='del'>-	.resume = snd_ensoniq_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_ensoniq_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> 	</div><div class='del'>-static int __init alsa_card_ens137x_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_ens137x_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ens137x_init)</div><div class='del'>-module_exit(alsa_card_ens137x_exit)</div><div class='add'>+module_pci_driver(ens137x_driver);</div><div class='head'>diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c<br/>index 553b75217259..280125eff362 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/es1938.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/es1938.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/es1938.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/es1938.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for ESS Solo-1 (ES1938, ES1946, ES1969) soundcard</div><div class='ctx'>  *  Copyright (c) by Jaromir Koutek &lt;miri@punknet.cz&gt;,</div><div class='hunk'>@@ -10,22 +11,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  TODO:</div><div class='ctx'>  *    Rewrite better spinlocks</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -52,9 +37,10 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -63,23 +49,17 @@</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Jaromir Koutek &lt;miri@punknet.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ESS Solo-1");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ESS,ES1938},"</div><div class='del'>-                "{ESS,ES1946},"</div><div class='del'>-                "{ESS,ES1969},"</div><div class='del'>-		"{TerraTec,128i PCI}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_JOYSTICK 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for ESS Solo-1 soundcard.");</div><div class='hunk'>@@ -236,14 +216,12 @@ struct es1938 {</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> 	struct gameport *gameport;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	unsigned char saved_regs[SAVED_REG_SIZE];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_es1938_ids) = {</div><div class='add'>+static const struct pci_device_id snd_es1938_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ESS, 0x1969), 0, },   /* Solo-1 */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -254,20 +232,15 @@ MODULE_DEVICE_TABLE(pci, snd_es1938_ids);</div><div class='ctx'> #define WRITE_LOOP_TIMEOUT	0x10000</div><div class='ctx'> #define GET_LOOP_TIMEOUT	0x01000</div><div class='ctx'> </div><div class='del'>-#undef REG_DEBUG</div><div class='ctx'> /* -----------------------------------------------------------------</div><div class='ctx'>  * Write to a mixer register</div><div class='ctx'>  * -----------------------------------------------------------------*/</div><div class='ctx'> static void snd_es1938_mixer_write(struct es1938 *chip, unsigned char reg, unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	outb(reg, SLSB_REG(chip, MIXERADDR));</div><div class='ctx'> 	outb(val, SLSB_REG(chip, MIXERDATA));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Mixer reg %02x set to %02x\n", reg, val);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x set to %02x\n", reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------</div><div class='hunk'>@@ -276,14 +249,11 @@ static void snd_es1938_mixer_write(struct es1938 *chip, unsigned char reg, unsig</div><div class='ctx'> static int snd_es1938_mixer_read(struct es1938 *chip, unsigned char reg)</div><div class='ctx'> {</div><div class='ctx'> 	int data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	outb(reg, SLSB_REG(chip, MIXERADDR));</div><div class='ctx'> 	data = inb(SLSB_REG(chip, MIXERDATA));</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Mixer reg %02x now is %02x\n", reg, data);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer reg %02x now is %02x\n", reg, data);</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -293,21 +263,19 @@ static int snd_es1938_mixer_read(struct es1938 *chip, unsigned char reg)</div><div class='ctx'> static int snd_es1938_mixer_bits(struct es1938 *chip, unsigned char reg,</div><div class='ctx'> 				 unsigned char mask, unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char old, new, oval;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;mixer_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	outb(reg, SLSB_REG(chip, MIXERADDR));</div><div class='ctx'> 	old = inb(SLSB_REG(chip, MIXERDATA));</div><div class='ctx'> 	oval = old &amp; mask;</div><div class='ctx'> 	if (val != oval) {</div><div class='ctx'> 		new = (old &amp; ~mask) | (val &amp; mask);</div><div class='ctx'> 		outb(new, SLSB_REG(chip, MIXERDATA));</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-		snd_printk(KERN_DEBUG "Mixer reg %02x was %02x, set to %02x\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Mixer reg %02x was %02x, set to %02x\n",</div><div class='ctx'> 			   reg, old, new);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;mixer_lock, flags);</div><div class='ctx'> 	return oval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,12 +287,14 @@ static void snd_es1938_write_cmd(struct es1938 *chip, unsigned char cmd)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned char v;</div><div class='ctx'> 	for (i = 0; i &lt; WRITE_LOOP_TIMEOUT; i++) {</div><div class='del'>-		if (!(v = inb(SLSB_REG(chip, READSTATUS)) &amp; 0x80)) {</div><div class='add'>+		v = inb(SLSB_REG(chip, READSTATUS));</div><div class='add'>+		if (!(v &amp; 0x80)) {</div><div class='ctx'> 			outb(cmd, SLSB_REG(chip, WRITEDATA));</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_ERR "snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v);</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"snd_es1938_write_cmd timeout (0x02%x/0x02%x)\n", cmd, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------</div><div class='hunk'>@@ -334,10 +304,12 @@ static int snd_es1938_get_byte(struct es1938 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned char v;</div><div class='del'>-	for (i = GET_LOOP_TIMEOUT; i; i--)</div><div class='del'>-		if ((v = inb(SLSB_REG(chip, STATUS))) &amp; 0x80)</div><div class='add'>+	for (i = GET_LOOP_TIMEOUT; i; i--) {</div><div class='add'>+		v = inb(SLSB_REG(chip, STATUS));</div><div class='add'>+		if (v &amp; 0x80)</div><div class='ctx'> 			return inb(SLSB_REG(chip, READDATA));</div><div class='del'>-	snd_printk(KERN_ERR "get_byte timeout: status 0x02%x\n", v);</div><div class='add'>+	}</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "get_byte timeout: status 0x02%x\n", v);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -346,14 +318,10 @@ static int snd_es1938_get_byte(struct es1938 *chip)</div><div class='ctx'>  * -----------------------------------------------------------------*/</div><div class='ctx'> static void snd_es1938_write(struct es1938 *chip, unsigned char reg, unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, reg);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, val);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Reg %02x set to %02x\n", reg, val);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x set to %02x\n", reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* -----------------------------------------------------------------</div><div class='hunk'>@@ -362,15 +330,12 @@ static void snd_es1938_write(struct es1938 *chip, unsigned char reg, unsigned ch</div><div class='ctx'> static unsigned char snd_es1938_read(struct es1938 *chip, unsigned char reg)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, ESS_CMD_READREG);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, reg);</div><div class='ctx'> 	val = snd_es1938_get_byte(chip);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "Reg %02x now is %02x\n", reg, val);</div><div class='del'>-#endif</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x now is %02x\n", reg, val);</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -380,9 +345,9 @@ static unsigned char snd_es1938_read(struct es1938 *chip, unsigned char reg)</div><div class='ctx'> static int snd_es1938_bits(struct es1938 *chip, unsigned char reg, unsigned char mask,</div><div class='ctx'> 			   unsigned char val)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char old, new, oval;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, ESS_CMD_READREG);</div><div class='ctx'> 	snd_es1938_write_cmd(chip, reg);</div><div class='ctx'> 	old = snd_es1938_get_byte(chip);</div><div class='hunk'>@@ -391,12 +356,9 @@ static int snd_es1938_bits(struct es1938 *chip, unsigned char reg, unsigned char</div><div class='ctx'> 		snd_es1938_write_cmd(chip, reg);</div><div class='ctx'> 		new = (old &amp; ~mask) | (val &amp; mask);</div><div class='ctx'> 		snd_es1938_write_cmd(chip, new);</div><div class='del'>-#ifdef REG_DEBUG</div><div class='del'>-		snd_printk(KERN_DEBUG "Reg %02x was %02x, set to %02x\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "Reg %02x was %02x, set to %02x\n",</div><div class='ctx'> 			   reg, old, new);</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	return oval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -416,7 +378,7 @@ static void snd_es1938_reset(struct es1938 *chip)</div><div class='ctx'> 				goto __next;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "ESS Solo-1 reset failed\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "ESS Solo-1 reset failed\n");</div><div class='ctx'> </div><div class='ctx'>      __next:</div><div class='ctx'> 	snd_es1938_write_cmd(chip, ESS_CMD_ENABLEEXT);</div><div class='hunk'>@@ -448,7 +410,7 @@ static void snd_es1938_reset_fifo(struct es1938 *chip)</div><div class='ctx'> 	outb(0, SLSB_REG(chip, RESET));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_ratnum clocks[2] = {</div><div class='add'>+static const struct snd_ratnum clocks[2] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.num = 793800,</div><div class='ctx'> 		.den_min = 1,</div><div class='hunk'>@@ -463,7 +425,7 @@ static struct snd_ratnum clocks[2] = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {</div><div class='ctx'> 	.nrats = 2,</div><div class='ctx'> 	.rats = clocks,</div><div class='ctx'> };</div><div class='hunk'>@@ -851,52 +813,30 @@ static snd_pcm_uframes_t snd_es1938_playback_pointer(struct snd_pcm_substream *s</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,</div><div class='del'>-				   int channel,</div><div class='del'>-				   snd_pcm_uframes_t pos,</div><div class='del'>-				   void __user *dst,</div><div class='del'>-				   snd_pcm_uframes_t count)</div><div class='add'>+				   int channel, unsigned long pos,</div><div class='add'>+				   struct iov_iter *dst, unsigned long count)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct es1938 *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	pos &lt;&lt;= chip-&gt;dma1_shift;</div><div class='del'>-	count &lt;&lt;= chip-&gt;dma1_shift;</div><div class='add'>+</div><div class='ctx'> 	if (snd_BUG_ON(pos + count &gt; chip-&gt;dma1_size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	if (pos + count &lt; chip-&gt;dma1_size) {</div><div class='del'>-		if (copy_to_user(dst, runtime-&gt;dma_area + pos + 1, count))</div><div class='add'>+		if (copy_to_iter(runtime-&gt;dma_area + pos + 1, count, dst) != count)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (copy_to_user(dst, runtime-&gt;dma_area + pos + 1, count - 1))</div><div class='add'>+		if (copy_to_iter(runtime-&gt;dma_area + pos + 1, count - 1, dst) != count - 1)</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		if (put_user(runtime-&gt;dma_area[0], ((unsigned char __user *)dst) + count - 1))</div><div class='add'>+		if (copy_to_iter(runtime-&gt;dma_area, 1, dst) != 1)</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * buffer management</div><div class='del'>- */</div><div class='del'>-static int snd_es1938_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_hw_params *hw_params)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_es1938_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* ----------------------------------------------------------------------</div><div class='ctx'>  * Audio1 Capture (ADC)</div><div class='ctx'>  * ----------------------------------------------------------------------*/</div><div class='del'>-static struct snd_pcm_hardware snd_es1938_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_es1938_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				SNDRV_PCM_INFO_BLOCK_TRANSFER),</div><div class='hunk'>@@ -918,7 +858,7 @@ static struct snd_pcm_hardware snd_es1938_capture =</div><div class='ctx'> /* -----------------------------------------------------------------------</div><div class='ctx'>  * Audio2 Playback (DAC)</div><div class='ctx'>  * -----------------------------------------------------------------------*/</div><div class='del'>-static struct snd_pcm_hardware snd_es1938_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_es1938_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1004,45 +944,40 @@ static int snd_es1938_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1938_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1938_playback_ops = {</div><div class='ctx'> 	.open =		snd_es1938_playback_open,</div><div class='ctx'> 	.close =	snd_es1938_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_es1938_pcm_hw_params,</div><div class='del'>-	.hw_free =	snd_es1938_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_es1938_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_es1938_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_es1938_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1938_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1938_capture_ops = {</div><div class='ctx'> 	.open =		snd_es1938_capture_open,</div><div class='ctx'> 	.close =	snd_es1938_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_es1938_pcm_hw_params,</div><div class='del'>-	.hw_free =	snd_es1938_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_es1938_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_es1938_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_es1938_capture_pointer,</div><div class='ctx'> 	.copy =		snd_es1938_capture_copy,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1938_new_pcm(struct es1938 *chip, int device)</div><div class='add'>+static int snd_es1938_new_pcm(struct es1938 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "es-1938-1946", device, 2, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "es-1938-1946", device, 2, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_es1938_playback_ops);</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_es1938_capture_ops);</div><div class='ctx'> 	</div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ESS Solo-1");</div><div class='add'>+	strscpy(pcm-&gt;name, "ESS Solo-1");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci), 64*1024, 64*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, 64*1024, 64*1024);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1056,18 +991,12 @@ static int __devinit snd_es1938_new_pcm(struct es1938 *chip, int device)</div><div class='ctx'> static int snd_es1938_info_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			       struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[8] = {</div><div class='add'>+	static const char * const texts[8] = {</div><div class='ctx'> 		"Mic", "Mic Master", "CD", "AOUT",</div><div class='ctx'> 		"Mic1", "Mix", "Line", "Master"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 7)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 7;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 8, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_es1938_get_mux(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1321,39 +1250,34 @@ static int snd_es1938_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int db_scale_master[] = {</div><div class='del'>-	TLV_DB_RANGE_HEAD(2),</div><div class='add'>+static const DECLARE_TLV_DB_RANGE(db_scale_master,</div><div class='ctx'> 	0, 54, TLV_DB_SCALE_ITEM(-3600, 50, 1),</div><div class='ctx'> 	54, 63, TLV_DB_SCALE_ITEM(-900, 100, 0),</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='del'>-static unsigned int db_scale_audio1[] = {</div><div class='del'>-	TLV_DB_RANGE_HEAD(2),</div><div class='add'>+static const DECLARE_TLV_DB_RANGE(db_scale_audio1,</div><div class='ctx'> 	0, 8, TLV_DB_SCALE_ITEM(-3300, 300, 1),</div><div class='ctx'> 	8, 15, TLV_DB_SCALE_ITEM(-900, 150, 0),</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='del'>-static unsigned int db_scale_audio2[] = {</div><div class='del'>-	TLV_DB_RANGE_HEAD(2),</div><div class='add'>+static const DECLARE_TLV_DB_RANGE(db_scale_audio2,</div><div class='ctx'> 	0, 8, TLV_DB_SCALE_ITEM(-3450, 300, 1),</div><div class='ctx'> 	8, 15, TLV_DB_SCALE_ITEM(-1050, 150, 0),</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='del'>-static unsigned int db_scale_mic[] = {</div><div class='del'>-	TLV_DB_RANGE_HEAD(2),</div><div class='add'>+static const DECLARE_TLV_DB_RANGE(db_scale_mic,</div><div class='ctx'> 	0, 8, TLV_DB_SCALE_ITEM(-2400, 300, 1),</div><div class='ctx'> 	8, 15, TLV_DB_SCALE_ITEM(0, 150, 0),</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='del'>-static unsigned int db_scale_line[] = {</div><div class='del'>-	TLV_DB_RANGE_HEAD(2),</div><div class='add'>+static const DECLARE_TLV_DB_RANGE(db_scale_line,</div><div class='ctx'> 	0, 8, TLV_DB_SCALE_ITEM(-3150, 300, 1),</div><div class='ctx'> 	8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0),</div><div class='del'>-};</div><div class='add'>+);</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_es1938_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_es1938_controls[] = {</div><div class='ctx'> ES1938_DOUBLE_TLV("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0,</div><div class='ctx'> 		  db_scale_master),</div><div class='ctx'> ES1938_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),</div><div class='hunk'>@@ -1461,12 +1385,11 @@ static void snd_es1938_chip_init(struct es1938 *chip)</div><div class='ctx'> 	outb(0, SLDM_REG(chip, DMACLEAR));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * PM support</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char saved_regs[SAVED_REG_SIZE+1] = {</div><div class='add'>+static const unsigned char saved_regs[SAVED_REG_SIZE+1] = {</div><div class='ctx'> 	0x14, 0x1a, 0x1c, 0x3a, 0x3c, 0x3e, 0x36, 0x38,</div><div class='ctx'> 	0x50, 0x52, 0x60, 0x61, 0x62, 0x63, 0x64, 0x68,</div><div class='ctx'> 	0x69, 0x6a, 0x6b, 0x6d, 0x6e, 0x6f, 0x7c, 0x7d,</div><div class='hunk'>@@ -1474,14 +1397,14 @@ static unsigned char saved_regs[SAVED_REG_SIZE+1] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int es1938_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int es1938_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct es1938 *chip = card-&gt;private_data;</div><div class='del'>-	unsigned char *s, *d;</div><div class='add'>+	const unsigned char *s;</div><div class='add'>+	unsigned char *d;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> </div><div class='ctx'> 	/* save mixer-related registers */</div><div class='ctx'> 	for (s = saved_regs, d = chip-&gt;saved_regs; *s; s++, d++)</div><div class='hunk'>@@ -1491,36 +1414,28 @@ static int es1938_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0) {</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='ctx'> 		chip-&gt;irq = -1;</div><div class='add'>+		card-&gt;sync_irq = -1;</div><div class='ctx'> 	}</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int es1938_resume(struct pci_dev *pci)</div><div class='add'>+static int es1938_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct es1938 *chip = card-&gt;private_data;</div><div class='del'>-	unsigned char *s, *d;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "es1938: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	const unsigned char *s;</div><div class='add'>+	unsigned char *d;</div><div class='ctx'> </div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_es1938_interrupt,</div><div class='del'>-			IRQF_SHARED, "ES1938", chip)) {</div><div class='del'>-		printk(KERN_ERR "es1938: unable to grab IRQ %d, "</div><div class='del'>-		       "disabling device\n", pci-&gt;irq);</div><div class='add'>+			IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(dev, "unable to grab IRQ %d, disabling device\n",</div><div class='add'>+			pci-&gt;irq);</div><div class='ctx'> 		snd_card_disconnect(card);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> 	snd_es1938_chip_init(chip);</div><div class='ctx'> </div><div class='ctx'> 	/* restore mixer-related registers */</div><div class='hunk'>@@ -1534,16 +1449,18 @@ static int es1938_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(es1938_pm, es1938_suspend, es1938_resume);</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-static int __devinit snd_es1938_create_gameport(struct es1938 *chip)</div><div class='add'>+static int snd_es1938_create_gameport(struct es1938 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "es1938: cannot allocate memory for gameport\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1569,8 +1486,10 @@ static inline int snd_es1938_create_gameport(struct es1938 *chip) { return -ENOS</div><div class='ctx'> static inline void snd_es1938_free_gameport(struct es1938 *chip) { }</div><div class='ctx'> #endif /* SUPPORT_JOYSTICK */</div><div class='ctx'> </div><div class='del'>-static int snd_es1938_free(struct es1938 *chip)</div><div class='add'>+static void snd_es1938_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct es1938 *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	/* disable irqs */</div><div class='ctx'> 	outb(0x00, SLIO_REG(chip, IRQCONTROL));</div><div class='ctx'> 	if (chip-&gt;rmidi)</div><div class='hunk'>@@ -1580,85 +1499,54 @@ static int snd_es1938_free(struct es1938 *chip)</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_es1938_dev_free(struct snd_device *device)</div><div class='add'>+static int snd_es1938_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct es1938 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_es1938_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_es1938_create(struct snd_card *card,</div><div class='del'>-				    struct pci_dev * pci,</div><div class='del'>-				    struct es1938 ** rchip)</div><div class='del'>-{</div><div class='del'>-	struct es1938 *chip;</div><div class='add'>+	struct es1938 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_es1938_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'>         /* check, if we can restrict PCI DMA transfers to 24 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(24))) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 24bit PCI busmaster DMA\n");</div><div class='ctx'>                 return -ENXIO;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;mixer_lock);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='del'>-	if ((err = pci_request_regions(pci, "ESS Solo-1")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ESS Solo-1");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	chip-&gt;io_port = pci_resource_start(pci, 0);</div><div class='ctx'> 	chip-&gt;sb_port = pci_resource_start(pci, 1);</div><div class='ctx'> 	chip-&gt;vc_port = pci_resource_start(pci, 2);</div><div class='ctx'> 	chip-&gt;mpu_port = pci_resource_start(pci, 3);</div><div class='ctx'> 	chip-&gt;game_port = pci_resource_start(pci, 4);</div><div class='add'>+	/* still use non-managed irq handler as it's re-acquired at PM resume */</div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_es1938_interrupt, IRQF_SHARED,</div><div class='del'>-			"ES1938", chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_es1938_free(chip);</div><div class='add'>+			KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-#ifdef ES1938_DDEBUG</div><div class='del'>-	snd_printk(KERN_DEBUG "create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_es1938_free;</div><div class='add'>+	dev_dbg(card-&gt;dev,</div><div class='add'>+		"create: io: 0x%lx, sb: 0x%lx, vc: 0x%lx, mpu: 0x%lx, game: 0x%lx\n",</div><div class='ctx'> 		   chip-&gt;io_port, chip-&gt;sb_port, chip-&gt;vc_port, chip-&gt;mpu_port, chip-&gt;game_port);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;ddma_port = chip-&gt;vc_port + 0x00;		/* fix from Thomas Sailer */</div><div class='ctx'> </div><div class='ctx'> 	snd_es1938_chip_init(chip);</div><div class='del'>-</div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_es1938_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1668,26 +1556,28 @@ static int __devinit snd_es1938_create(struct snd_card *card,</div><div class='ctx'> static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct es1938 *chip = dev_id;</div><div class='del'>-	unsigned char status, audiostatus;</div><div class='add'>+	unsigned char status;</div><div class='add'>+	__always_unused unsigned char audiostatus;</div><div class='ctx'> 	int handled = 0;</div><div class='ctx'> </div><div class='ctx'> 	status = inb(SLIO_REG(chip, IRQCONTROL));</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "Es1938debug - interrupt status: =0x%x\n", status);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"Es1938debug - interrupt status: =0x%x\n", status);</div><div class='ctx'> #endif</div><div class='ctx'> 	</div><div class='ctx'> 	/* AUDIO 1 */</div><div class='ctx'> 	if (status &amp; 0x10) {</div><div class='ctx'> #if 0</div><div class='del'>-                printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 1 interrupt\n");</div><div class='del'>-		printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n",</div><div class='ctx'> 		       inw(SLDM_REG(chip, DMACOUNT)));</div><div class='del'>-		printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n",</div><div class='ctx'> 		       inl(SLDM_REG(chip, DMAADDR)));</div><div class='del'>-		printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n",</div><div class='ctx'> 		       inl(SLDM_REG(chip, DMASTATUS)));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1703,12 +1593,12 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	/* AUDIO 2 */</div><div class='ctx'> 	if (status &amp; 0x20) {</div><div class='ctx'> #if 0</div><div class='del'>-                printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 2 interrupt\n");</div><div class='del'>-		printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n",</div><div class='ctx'> 		       inw(SLIO_REG(chip, AUDIO2DMACOUNT)));</div><div class='del'>-		printk(KERN_DEBUG</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		       "Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n",</div><div class='ctx'> 		       inl(SLIO_REG(chip, AUDIO2DMAADDR)));</div><div class='ctx'> </div><div class='hunk'>@@ -1752,7 +1642,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> #define ES1938_DMA_SIZE 64</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1938_mixer(struct es1938 *chip)</div><div class='add'>+static int snd_es1938_mixer(struct es1938 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	unsigned int idx;</div><div class='hunk'>@@ -1760,7 +1650,7 @@ static int __devinit snd_es1938_mixer(struct es1938 *chip)</div><div class='ctx'> </div><div class='ctx'> 	card = chip-&gt;card;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;mixername, "ESS Solo-1");</div><div class='add'>+	strscpy(card-&gt;mixername, "ESS Solo-1");</div><div class='ctx'> </div><div class='ctx'> 	for (idx = 0; idx &lt; ARRAY_SIZE(snd_es1938_controls); idx++) {</div><div class='ctx'> 		struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -1783,15 +1673,16 @@ static int __devinit snd_es1938_mixer(struct es1938 *chip)</div><div class='ctx'> 				kctl-&gt;private_free = snd_es1938_hwv_free;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-		if ((err = snd_ctl_add(card, kctl)) &lt; 0)</div><div class='add'>+		err = snd_ctl_add(card, kctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'>        </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1938_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_es1938_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -1806,57 +1697,53 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	for (idx = 0; idx &lt; 5; idx++) {</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; 5; idx++)</div><div class='ctx'> 		if (pci_resource_start(pci, idx) == 0 ||</div><div class='del'>-		    !(pci_resource_flags(pci, idx) &amp; IORESOURCE_IO)) {</div><div class='del'>-		    	snd_card_free(card);</div><div class='del'>-		    	return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_es1938_create(card, pci, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+		    !(pci_resource_flags(pci, idx) &amp; IORESOURCE_IO))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = snd_es1938_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ES1938");</div><div class='del'>-	strcpy(card-&gt;shortname, "ESS ES1938 (Solo-1)");</div><div class='add'>+	strscpy(card-&gt;driver, "ES1938");</div><div class='add'>+	strscpy(card-&gt;shortname, "ESS ES1938 (Solo-1)");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s rev %i, irq %i",</div><div class='ctx'> 		card-&gt;shortname,</div><div class='ctx'> 		chip-&gt;revision,</div><div class='ctx'> 		chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_es1938_new_pcm(chip, 0)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_es1938_new_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_es1938_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_es1938_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	if (snd_opl3_create(card,</div><div class='ctx'> 			    SLSB_REG(chip, FMLOWADDR),</div><div class='ctx'> 			    SLSB_REG(chip, FMHIGHADDR),</div><div class='ctx'> 			    OPL3_HW_OPL3, 1, &amp;opl3) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "es1938: OPL3 not detected at 0x%lx\n",</div><div class='add'>+		dev_err(card-&gt;dev, "OPL3 not detected at 0x%lx\n",</div><div class='ctx'> 			   SLSB_REG(chip, FMLOWADDR));</div><div class='ctx'> 	} else {</div><div class='del'>-	        if ((err = snd_opl3_timer_new(opl3, 0, 1)) &lt; 0) {</div><div class='del'>-	                snd_card_free(card);</div><div class='add'>+		err = snd_opl3_timer_new(opl3, 0, 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 	                return err;</div><div class='del'>-		}</div><div class='del'>-	        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-	                snd_card_free(card);</div><div class='add'>+		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 	                return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-				chip-&gt;mpu_port, MPU401_INFO_INTEGRATED,</div><div class='del'>-				chip-&gt;irq, 0, &amp;chip-&gt;rmidi) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "es1938: unable to initialize MPU-401\n");</div><div class='add'>+				chip-&gt;mpu_port,</div><div class='add'>+				MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,</div><div class='add'>+				-1, &amp;chip-&gt;rmidi) &lt; 0) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to initialize MPU-401\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		// this line is vital for MIDI interrupt handling on ess-solo1</div><div class='ctx'> 		// andreas@flying-snail.de</div><div class='hunk'>@@ -1865,42 +1752,28 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,</div><div class='ctx'> </div><div class='ctx'> 	snd_es1938_create_gameport(chip);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_es1938_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_es1938_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_es1938_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ESS ES1938 (Solo-1)",</div><div class='add'>+static struct pci_driver es1938_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_es1938_ids,</div><div class='ctx'> 	.probe = snd_es1938_probe,</div><div class='del'>-	.remove = __devexit_p(snd_es1938_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = es1938_suspend,</div><div class='del'>-	.resume = es1938_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;es1938_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_es1938_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_es1938_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_es1938_init)</div><div class='del'>-module_exit(alsa_card_es1938_exit)</div><div class='add'>+module_pci_driver(es1938_driver);</div><div class='head'>diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c<br/>index 23a58f0d6cb9..51aee2c4d461 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/es1968.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/es1968.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/es1968.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/es1968.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  Driver for ESS Maestro 1/2/2E Sound Card (started 21.8.99)</div><div class='ctx'>  *  Copyright (c) by Matze Braun &lt;MatzeBraun@gmx.de&gt;.</div><div class='hunk'>@@ -10,21 +11,6 @@</div><div class='ctx'>  *  TODO:</div><div class='ctx'>  *   Perhaps Synth</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  *  Notes from Zach Brown about the driver code</div><div class='ctx'>  *</div><div class='ctx'>  *  Hardware Description</div><div class='hunk'>@@ -94,7 +80,7 @@</div><div class='ctx'>  *	places.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -102,7 +88,7 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/gameport.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/input.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -112,23 +98,23 @@</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_SND_ES1968_RADIO</div><div class='add'>+#include &lt;media/drv-intf/tea575x.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define CARD_NAME "ESS Maestro1/2"</div><div class='ctx'> #define DRIVER_NAME "ES1968"</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("ESS Maestro");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ESS,Maestro 2e},"</div><div class='del'>-		"{ESS,Maestro 2},"</div><div class='del'>-		"{ESS,Maestro 1},"</div><div class='del'>-		"{TerraTec,DMX}}");</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) &amp;&amp; defined(CONFIG_GAMEPORT_MODULE))</div><div class='add'>+#if IS_REACHABLE(CONFIG_GAMEPORT)</div><div class='ctx'> #define SUPPORT_JOYSTICK 1</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 1-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> static int total_bufsize[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1024 };</div><div class='ctx'> static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };</div><div class='ctx'> static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };</div><div class='hunk'>@@ -136,8 +122,9 @@ static int clock[SNDRV_CARDS];</div><div class='ctx'> static int use_pm[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};</div><div class='ctx'> static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};</div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='del'>-static int joystick[SNDRV_CARDS];</div><div class='add'>+static bool joystick[SNDRV_CARDS];</div><div class='ctx'> #endif</div><div class='add'>+static int radio_nr[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");</div><div class='hunk'>@@ -161,6 +148,9 @@ MODULE_PARM_DESC(enable_mpu, "Enable MPU401.  (0 = off, 1 = on, 2 = auto)");</div><div class='ctx'> module_param_array(joystick, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(joystick, "Enable joystick.");</div><div class='ctx'> #endif</div><div class='add'>+module_param_array(radio_nr, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(radio_nr, "Radio device numbers");</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #define NR_APUS			64</div><div class='hunk'>@@ -220,7 +210,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");</div><div class='ctx'> #define	RINGB_EN_2CODEC		0x0020</div><div class='ctx'> #define RINGB_SING_BIT_DUAL	0x0040</div><div class='ctx'> </div><div class='del'>-/* ****Port Adresses**** */</div><div class='add'>+/* ****Port Addresses**** */</div><div class='ctx'> </div><div class='ctx'> /*   Write &amp; Read */</div><div class='ctx'> #define ESM_INDEX		0x02</div><div class='hunk'>@@ -483,9 +473,7 @@ struct esschan {</div><div class='ctx'> 	/* linked list */</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	u16 wc_map[4];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct es1968 {</div><div class='hunk'>@@ -536,9 +524,7 @@ struct es1968 {</div><div class='ctx'> 	struct list_head substream_list;</div><div class='ctx'> 	spinlock_t substream_lock;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	u16 apu_map[NR_APUS][NR_APU_REGS];</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> 	struct gameport *gameport;</div><div class='hunk'>@@ -550,14 +536,19 @@ struct es1968 {</div><div class='ctx'> #else</div><div class='ctx'> 	struct snd_kcontrol *master_switch; /* for h/w volume control */</div><div class='ctx'> 	struct snd_kcontrol *master_volume;</div><div class='del'>-	spinlock_t ac97_lock;</div><div class='del'>-	struct tasklet_struct hwvol_tq;</div><div class='add'>+#endif</div><div class='add'>+	struct work_struct hwvol_work;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_ES1968_RADIO</div><div class='add'>+	struct v4l2_device v4l2_dev;</div><div class='add'>+	struct snd_tea575x tea;</div><div class='add'>+	unsigned int tea575x_tuner;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_es1968_ids) = {</div><div class='add'>+static const struct pci_device_id snd_es1968_ids[] = {</div><div class='ctx'> 	/* Maestro 1 */</div><div class='ctx'>         { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO &lt;&lt; 8, 0xffff00, TYPE_MAESTRO },</div><div class='ctx'> 	/* Maestro 2 */</div><div class='hunk'>@@ -583,10 +574,8 @@ static void __maestro_write(struct es1968 *chip, u16 reg, u16 data)</div><div class='ctx'> </div><div class='ctx'> static inline void maestro_write(struct es1968 *chip, u16 reg, u16 data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	__maestro_write(chip, reg, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* no spinlock */</div><div class='hunk'>@@ -601,12 +590,8 @@ static u16 __maestro_read(struct es1968 *chip, u16 reg)</div><div class='ctx'> </div><div class='ctx'> static inline u16 maestro_read(struct es1968 *chip, u16 reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 result;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	result = __maestro_read(chip, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return result;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	return __maestro_read(chip, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Wait for the codec bus to be free */</div><div class='hunk'>@@ -619,7 +604,7 @@ static int snd_es1968_ac97_wait(struct es1968 *chip)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("es1968: ac97 timeout\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "ac97 timeout\n");</div><div class='ctx'> 	return 1; /* timeout */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -631,45 +616,30 @@ static int snd_es1968_ac97_wait_poll(struct es1968 *chip)</div><div class='ctx'> 		if (!(inb(chip-&gt;io_port + ESM_AC97_INDEX) &amp; 1))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("es1968: ac97 timeout\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "ac97 timeout\n");</div><div class='ctx'> 	return 1; /* timeout */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_es1968_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct es1968 *chip = ac97-&gt;private_data;</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_ac97_wait(chip);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the bus */</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;ac97_lock, flags);</div><div class='del'>-#endif</div><div class='ctx'> 	outw(val, chip-&gt;io_port + ESM_AC97_DATA);</div><div class='ctx'> 	/*msleep(1);*/</div><div class='ctx'> 	outb(reg, chip-&gt;io_port + ESM_AC97_INDEX);</div><div class='ctx'> 	/*msleep(1);*/</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;ac97_lock, flags);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned short snd_es1968_ac97_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	u16 data = 0;</div><div class='ctx'> 	struct es1968 *chip = ac97-&gt;private_data;</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_ac97_wait(chip);</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;ac97_lock, flags);</div><div class='del'>-#endif</div><div class='ctx'> 	outb(reg | 0x80, chip-&gt;io_port + ESM_AC97_INDEX);</div><div class='ctx'> 	/*msleep(1);*/</div><div class='ctx'> </div><div class='hunk'>@@ -677,9 +647,6 @@ static unsigned short snd_es1968_ac97_read(struct snd_ac97 *ac97, unsigned short</div><div class='ctx'> 		data = inw(chip-&gt;io_port + ESM_AC97_DATA);</div><div class='ctx'> 		/*msleep(1);*/</div><div class='ctx'> 	}</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;ac97_lock, flags);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='hunk'>@@ -692,7 +659,7 @@ static void apu_index_set(struct es1968 *chip, u16 index)</div><div class='ctx'> 	for (i = 0; i &lt; 1000; i++)</div><div class='ctx'> 		if (__maestro_read(chip, IDR1_CRAM_POINTER) == index)</div><div class='ctx'> 			return;</div><div class='del'>-	snd_printd("es1968: APU register select failed. (Timeout)\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "APU register select failed. (Timeout)\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* no spinlock */</div><div class='hunk'>@@ -704,7 +671,7 @@ static void apu_data_set(struct es1968 *chip, u16 data)</div><div class='ctx'> 			return;</div><div class='ctx'> 		__maestro_write(chip, IDR0_DATA_PORT, data);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd("es1968: APU register set probably failed (Timeout)!\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "APU register set probably failed (Timeout)!\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* no spinlock */</div><div class='hunk'>@@ -712,9 +679,7 @@ static void __apu_set_register(struct es1968 *chip, u16 channel, u8 reg, u16 dat</div><div class='ctx'> {</div><div class='ctx'> 	if (snd_BUG_ON(channel &gt;= NR_APUS))</div><div class='ctx'> 		return;</div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	chip-&gt;apu_map[channel][reg] = data;</div><div class='del'>-#endif</div><div class='ctx'> 	reg |= (channel &lt;&lt; 4);</div><div class='ctx'> 	apu_index_set(chip, reg);</div><div class='ctx'> 	apu_data_set(chip, data);</div><div class='hunk'>@@ -722,10 +687,8 @@ static void __apu_set_register(struct es1968 *chip, u16 channel, u8 reg, u16 dat</div><div class='ctx'> </div><div class='ctx'> static void apu_set_register(struct es1968 *chip, u16 channel, u8 reg, u16 data)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	__apu_set_register(chip, channel, reg, data);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 __apu_get_register(struct es1968 *chip, u16 channel, u8 reg)</div><div class='hunk'>@@ -739,62 +702,40 @@ static u16 __apu_get_register(struct es1968 *chip, u16 channel, u8 reg)</div><div class='ctx'> </div><div class='ctx'> static u16 apu_get_register(struct es1968 *chip, u16 channel, u8 reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 v;</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	v = __apu_get_register(chip, channel, reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	return v;</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	return __apu_get_register(chip, channel, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0 /* ASSP is not supported */</div><div class='ctx'> </div><div class='ctx'> static void assp_set_register(struct es1968 *chip, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave),(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	outl(reg, chip-&gt;io_port + ASSP_INDEX);</div><div class='ctx'> 	outl(value, chip-&gt;io_port + ASSP_DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 assp_get_register(struct es1968 *chip, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u32 value;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	outl(reg, chip-&gt;io_port + ASSP_INDEX);</div><div class='del'>-	value = inl(chip-&gt;io_port + ASSP_DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	return inl(chip-&gt;io_port + ASSP_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void wave_set_register(struct es1968 *chip, u16 reg, u16 value)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	outw(reg, chip-&gt;io_port + WC_INDEX);</div><div class='ctx'> 	outw(value, chip-&gt;io_port + WC_DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 wave_get_register(struct es1968 *chip, u16 reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 value;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	outw(reg, chip-&gt;io_port + WC_INDEX);</div><div class='del'>-	value = inw(chip-&gt;io_port + WC_DATA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	return inw(chip-&gt;io_port + WC_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* *******************</div><div class='hunk'>@@ -953,7 +894,7 @@ static inline void snd_es1968_trigger_apu(struct es1968 *esm, int apu, int mode)</div><div class='ctx'> </div><div class='ctx'> static void snd_es1968_pcm_start(struct es1968 *chip, struct esschan *es)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	__apu_set_register(chip, es-&gt;apu[0], 5, es-&gt;base[0]);</div><div class='ctx'> 	snd_es1968_trigger_apu(chip, es-&gt;apu[0], es-&gt;apu_mode[0]);</div><div class='ctx'> 	if (es-&gt;mode == ESM_MODE_CAPTURE) {</div><div class='hunk'>@@ -968,19 +909,17 @@ static void snd_es1968_pcm_start(struct es1968 *chip, struct esschan *es)</div><div class='ctx'> 			snd_es1968_trigger_apu(chip, es-&gt;apu[3], es-&gt;apu_mode[3]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_es1968_pcm_stop(struct es1968 *chip, struct esschan *es)</div><div class='ctx'> {</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	snd_es1968_trigger_apu(chip, es-&gt;apu[0], 0);</div><div class='ctx'> 	snd_es1968_trigger_apu(chip, es-&gt;apu[1], 0);</div><div class='ctx'> 	if (es-&gt;mode == ESM_MODE_CAPTURE) {</div><div class='ctx'> 		snd_es1968_trigger_apu(chip, es-&gt;apu[2], 0);</div><div class='ctx'> 		snd_es1968_trigger_apu(chip, es-&gt;apu[3], 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* set the wavecache control reg */</div><div class='hunk'>@@ -999,9 +938,7 @@ static void snd_es1968_program_wavecache(struct es1968 *chip, struct esschan *es</div><div class='ctx'> 	/* set the wavecache control reg */</div><div class='ctx'> 	wave_set_register(chip, es-&gt;apu[channel] &lt;&lt; 3, tmpval);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	es-&gt;wc_map[channel] = tmpval;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1012,7 +949,6 @@ static void snd_es1968_playback_setup(struct es1968 *chip, struct esschan *es,</div><div class='ctx'> 	int high_apu = 0;</div><div class='ctx'> 	int channel, apu;</div><div class='ctx'> 	int i, size;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	u32 freq;</div><div class='ctx'> </div><div class='ctx'> 	size = es-&gt;dma_size &gt;&gt; es-&gt;wav_shift;</div><div class='hunk'>@@ -1082,12 +1018,12 @@ static void snd_es1968_playback_setup(struct es1968 *chip, struct esschan *es,</div><div class='ctx'> 			apu_set_register(chip, apu, 10, 0x8F08);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	/* clear WP interrupts */</div><div class='del'>-	outw(1, chip-&gt;io_port + 0x04);</div><div class='del'>-	/* enable WP ints */</div><div class='del'>-	outw(inw(chip-&gt;io_port + ESM_PORT_HOST_IRQ) | ESM_HIRQ_DSIE, chip-&gt;io_port + ESM_PORT_HOST_IRQ);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		/* clear WP interrupts */</div><div class='add'>+		outw(1, chip-&gt;io_port + 0x04);</div><div class='add'>+		/* enable WP ints */</div><div class='add'>+		outw(inw(chip-&gt;io_port + ESM_PORT_HOST_IRQ) | ESM_HIRQ_DSIE, chip-&gt;io_port + ESM_PORT_HOST_IRQ);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	freq = runtime-&gt;rate;</div><div class='ctx'> 	/* set frequency */</div><div class='hunk'>@@ -1158,7 +1094,6 @@ static void snd_es1968_capture_setup(struct es1968 *chip, struct esschan *es,</div><div class='ctx'> {</div><div class='ctx'> 	int size;</div><div class='ctx'> 	u32 freq;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	size = es-&gt;dma_size &gt;&gt; es-&gt;wav_shift;</div><div class='ctx'> </div><div class='hunk'>@@ -1210,12 +1145,11 @@ static void snd_es1968_capture_setup(struct es1968 *chip, struct esschan *es,</div><div class='ctx'> 	snd_es1968_apu_set_freq(chip, es-&gt;apu[2], freq);</div><div class='ctx'> 	snd_es1968_apu_set_freq(chip, es-&gt;apu[3], freq);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	/* clear WP interrupts */</div><div class='ctx'> 	outw(1, chip-&gt;io_port + 0x04);</div><div class='ctx'> 	/* enable WP ints */</div><div class='ctx'> 	outw(inw(chip-&gt;io_port + ESM_PORT_HOST_IRQ) | ESM_HIRQ_DSIE, chip-&gt;io_port + ESM_PORT_HOST_IRQ);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*******************</div><div class='hunk'>@@ -1259,7 +1193,7 @@ static int snd_es1968_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	struct es1968 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct esschan *es = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;substream_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;substream_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -1280,7 +1214,6 @@ static int snd_es1968_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 		snd_es1968_bob_dec(chip);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;substream_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1295,7 +1228,7 @@ static snd_pcm_uframes_t snd_es1968_pcm_pointer(struct snd_pcm_substream *substr</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, ptr % es-&gt;dma_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es1968_playback = {</div><div class='add'>+static const struct snd_pcm_hardware snd_es1968_playback = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='ctx'>                		         SNDRV_PCM_INFO_MMAP_VALID |</div><div class='ctx'> 				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='hunk'>@@ -1316,7 +1249,7 @@ static struct snd_pcm_hardware snd_es1968_playback = {</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_es1968_capture = {</div><div class='add'>+static const struct snd_pcm_hardware snd_es1968_capture = {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_NONINTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -1349,12 +1282,11 @@ static int calc_available_memory_size(struct es1968 *chip)</div><div class='ctx'> 	int max_size = 0;</div><div class='ctx'> 	struct esm_memory *buf;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;memory_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	list_for_each_entry(buf, &amp;chip-&gt;buf_list, list) {</div><div class='ctx'> 		if (buf-&gt;empty &amp;&amp; buf-&gt;buf.bytes &gt; max_size)</div><div class='ctx'> 			max_size = buf-&gt;buf.bytes;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	if (max_size &gt;= 128*1024)</div><div class='ctx'> 		max_size = 127*1024;</div><div class='ctx'> 	return max_size;</div><div class='hunk'>@@ -1366,21 +1298,18 @@ static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size)</div><div class='ctx'> 	struct esm_memory *buf;</div><div class='ctx'> </div><div class='ctx'> 	size = ALIGN(size, ESM_MEM_ALIGN);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;memory_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	list_for_each_entry(buf, &amp;chip-&gt;buf_list, list) {</div><div class='ctx'> 		if (buf-&gt;empty &amp;&amp; buf-&gt;buf.bytes &gt;= size)</div><div class='ctx'> 			goto __found;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'> __found:</div><div class='ctx'> 	if (buf-&gt;buf.bytes &gt; size) {</div><div class='ctx'> 		struct esm_memory *chunk = kmalloc(sizeof(*chunk), GFP_KERNEL);</div><div class='del'>-		if (chunk == NULL) {</div><div class='del'>-			mutex_unlock(&amp;chip-&gt;memory_mutex);</div><div class='add'>+		if (chunk == NULL)</div><div class='ctx'> 			return NULL;</div><div class='del'>-		}</div><div class='ctx'> 		chunk-&gt;buf = buf-&gt;buf;</div><div class='ctx'> 		chunk-&gt;buf.bytes -= size;</div><div class='ctx'> 		chunk-&gt;buf.area += size;</div><div class='hunk'>@@ -1390,7 +1319,6 @@ __found:</div><div class='ctx'> 		list_add(&amp;chunk-&gt;list, &amp;buf-&gt;list);</div><div class='ctx'> 	}</div><div class='ctx'> 	buf-&gt;empty = 0;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1399,7 +1327,7 @@ static void snd_es1968_free_memory(struct es1968 *chip, struct esm_memory *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct esm_memory *chunk;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;memory_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> 	buf-&gt;empty = 1;</div><div class='ctx'> 	if (buf-&gt;list.prev != &amp;chip-&gt;buf_list) {</div><div class='ctx'> 		chunk = list_entry(buf-&gt;list.prev, struct esm_memory, list);</div><div class='hunk'>@@ -1418,7 +1346,6 @@ static void snd_es1968_free_memory(struct es1968 *chip, struct esm_memory *buf)</div><div class='ctx'> 			kfree(chunk);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;memory_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_es1968_free_dmabuf(struct es1968 *chip)</div><div class='hunk'>@@ -1427,7 +1354,7 @@ static void snd_es1968_free_dmabuf(struct es1968 *chip)</div><div class='ctx'> </div><div class='ctx'> 	if (! chip-&gt;dma.area)</div><div class='ctx'> 		return;</div><div class='del'>-	snd_dma_reserve_buf(&amp;chip-&gt;dma, snd_dma_pci_buf_id(chip-&gt;pci));</div><div class='add'>+	snd_dma_free_pages(&amp;chip-&gt;dma);</div><div class='ctx'> 	while ((p = chip-&gt;buf_list.next) != &amp;chip-&gt;buf_list) {</div><div class='ctx'> 		struct esm_memory *chunk = list_entry(p, struct esm_memory, list);</div><div class='ctx'> 		list_del(p);</div><div class='hunk'>@@ -1435,28 +1362,25 @@ static void snd_es1968_free_dmabuf(struct es1968 *chip)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_es1968_init_dmabuf(struct es1968 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct esm_memory *chunk;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;dma.dev.type = SNDRV_DMA_TYPE_DEV;</div><div class='del'>-	chip-&gt;dma.dev.dev = snd_dma_pci_data(chip-&gt;pci);</div><div class='del'>-	if (! snd_dma_get_reserved_buf(&amp;chip-&gt;dma, snd_dma_pci_buf_id(chip-&gt;pci))) {</div><div class='del'>-		err = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						   snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-						   chip-&gt;total_bufsize, &amp;chip-&gt;dma);</div><div class='del'>-		if (err &lt; 0 || ! chip-&gt;dma.area) {</div><div class='del'>-			snd_printk(KERN_ERR "es1968: can't allocate dma pages for size %d\n",</div><div class='del'>-				   chip-&gt;total_bufsize);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		if ((chip-&gt;dma.addr + chip-&gt;dma.bytes - 1) &amp; ~((1 &lt;&lt; 28) - 1)) {</div><div class='del'>-			snd_dma_free_pages(&amp;chip-&gt;dma);</div><div class='del'>-			snd_printk(KERN_ERR "es1968: DMA buffer beyond 256MB.\n");</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+	err = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					   &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+					   chip-&gt;total_bufsize, &amp;chip-&gt;dma);</div><div class='add'>+	if (err &lt; 0 || ! chip-&gt;dma.area) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"can't allocate dma pages for size %d\n",</div><div class='add'>+			   chip-&gt;total_bufsize);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	if ((chip-&gt;dma.addr + chip-&gt;dma.bytes - 1) &amp; ~((1 &lt;&lt; 28) - 1)) {</div><div class='add'>+		snd_dma_free_pages(&amp;chip-&gt;dma);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "DMA buffer beyond 256MB.\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;chip-&gt;buf_list);</div><div class='hunk'>@@ -1496,7 +1420,8 @@ static int snd_es1968_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	}</div><div class='ctx'> 	chan-&gt;memory = snd_es1968_new_memory(chip, size);</div><div class='ctx'> 	if (chan-&gt;memory == NULL) {</div><div class='del'>-		// snd_printd("cannot allocate dma buffer: size = %d\n", size);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate dma buffer: size = %d\n", size);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_pcm_set_runtime_buffer(substream, &amp;chan-&gt;memory-&gt;buf);</div><div class='hunk'>@@ -1582,9 +1507,8 @@ static int snd_es1968_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;hw.buffer_bytes_max = runtime-&gt;hw.period_bytes_max =</div><div class='ctx'> 		calc_available_memory_size(chip);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;substream_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;substream_lock);</div><div class='ctx'> 	list_add(&amp;es-&gt;list, &amp;chip-&gt;substream_list);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;substream_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1594,7 +1518,7 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	struct es1968 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct esschan *es;</div><div class='del'>-	int apu1, apu2;</div><div class='add'>+	int err, apu1, apu2;</div><div class='ctx'> </div><div class='ctx'> 	apu1 = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_CAPTURE);</div><div class='ctx'> 	if (apu1 &lt; 0)</div><div class='hunk'>@@ -1625,7 +1549,8 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	es-&gt;mode = ESM_MODE_CAPTURE;</div><div class='ctx'> </div><div class='ctx'> 	/* get mixbuffer */</div><div class='del'>-	if ((es-&gt;mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE)) == NULL) {</div><div class='add'>+	es-&gt;mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE);</div><div class='add'>+	if (!es-&gt;mixbuf) {</div><div class='ctx'> 		snd_es1968_free_apu_pair(chip, apu1);</div><div class='ctx'> 		snd_es1968_free_apu_pair(chip, apu2);</div><div class='ctx'> 		kfree(es);</div><div class='hunk'>@@ -1637,11 +1562,12 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;hw = snd_es1968_capture;</div><div class='ctx'> 	runtime-&gt;hw.buffer_bytes_max = runtime-&gt;hw.period_bytes_max =</div><div class='ctx'> 		calc_available_memory_size(chip) - 1024; /* keep MIXBUF size */</div><div class='del'>-	snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES);</div><div class='add'>+	err = snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;substream_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;substream_lock);</div><div class='ctx'> 	list_add(&amp;es-&gt;list, &amp;chip-&gt;substream_list);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;substream_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1654,9 +1580,9 @@ static int snd_es1968_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;private_data == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	es = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;substream_lock);</div><div class='del'>-	list_del(&amp;es-&gt;list);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;substream_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;substream_lock) {</div><div class='add'>+		list_del(&amp;es-&gt;list);</div><div class='add'>+	}</div><div class='ctx'> 	snd_es1968_free_apu_pair(chip, es-&gt;apu[0]);</div><div class='ctx'> 	kfree(es);</div><div class='ctx'> </div><div class='hunk'>@@ -1671,9 +1597,9 @@ static int snd_es1968_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	if (substream-&gt;runtime-&gt;private_data == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	es = substream-&gt;runtime-&gt;private_data;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;substream_lock);</div><div class='del'>-	list_del(&amp;es-&gt;list);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;substream_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;substream_lock) {</div><div class='add'>+		list_del(&amp;es-&gt;list);</div><div class='add'>+	}</div><div class='ctx'> 	snd_es1968_free_memory(chip, es-&gt;mixbuf);</div><div class='ctx'> 	snd_es1968_free_apu_pair(chip, es-&gt;apu[0]);</div><div class='ctx'> 	snd_es1968_free_apu_pair(chip, es-&gt;apu[2]);</div><div class='hunk'>@@ -1682,10 +1608,9 @@ static int snd_es1968_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1968_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1968_playback_ops = {</div><div class='ctx'> 	.open =		snd_es1968_playback_open,</div><div class='ctx'> 	.close =	snd_es1968_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_es1968_hw_params,</div><div class='ctx'> 	.hw_free =	snd_es1968_hw_free,</div><div class='ctx'> 	.prepare =	snd_es1968_pcm_prepare,</div><div class='hunk'>@@ -1693,10 +1618,9 @@ static struct snd_pcm_ops snd_es1968_playback_ops = {</div><div class='ctx'> 	.pointer =	snd_es1968_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_es1968_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_es1968_capture_ops = {</div><div class='ctx'> 	.open =		snd_es1968_capture_open,</div><div class='ctx'> 	.close =	snd_es1968_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_es1968_hw_params,</div><div class='ctx'> 	.hw_free =	snd_es1968_hw_free,</div><div class='ctx'> 	.prepare =	snd_es1968_pcm_prepare,</div><div class='hunk'>@@ -1710,23 +1634,28 @@ static struct snd_pcm_ops snd_es1968_capture_ops = {</div><div class='ctx'>  */</div><div class='ctx'> #define CLOCK_MEASURE_BUFSIZE	16768	/* enough large for a single shot */</div><div class='ctx'> </div><div class='del'>-static void __devinit es1968_measure_clock(struct es1968 *chip)</div><div class='add'>+static void es1968_measure_clock(struct es1968 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, apu;</div><div class='ctx'> 	unsigned int pa, offset, t;</div><div class='ctx'> 	struct esm_memory *memory;</div><div class='del'>-	struct timeval start_time, stop_time;</div><div class='add'>+	ktime_t start_time, stop_time;</div><div class='add'>+	ktime_t diff;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;clock == 0)</div><div class='ctx'> 		chip-&gt;clock = 48000; /* default clock value */</div><div class='ctx'> </div><div class='ctx'> 	/* search 2 APUs (although one apu is enough) */</div><div class='del'>-	if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Hmm, cannot find empty APU pair!?\n");</div><div class='add'>+	apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY);</div><div class='add'>+	if (apu &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Hmm, cannot find empty APU pair!?\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot allocate dma buffer - using default clock %d\n", chip-&gt;clock);</div><div class='add'>+	memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE);</div><div class='add'>+	if (!memory) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "cannot allocate dma buffer - using default clock %d\n",</div><div class='add'>+			 chip-&gt;clock);</div><div class='ctx'> 		snd_es1968_free_apu_pair(chip, apu);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1751,43 +1680,39 @@ static void __devinit es1968_measure_clock(struct es1968 *chip)</div><div class='ctx'> 	apu_set_register(chip, apu, 9, 0xD000);</div><div class='ctx'> 	apu_set_register(chip, apu, 10, 0x8F08);</div><div class='ctx'> 	apu_set_register(chip, apu, 11, 0x0000);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	outw(1, chip-&gt;io_port + 0x04); /* clear WP interrupts */</div><div class='del'>-	outw(inw(chip-&gt;io_port + ESM_PORT_HOST_IRQ) | ESM_HIRQ_DSIE, chip-&gt;io_port + ESM_PORT_HOST_IRQ); /* enable WP ints */</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		outw(1, chip-&gt;io_port + 0x04); /* clear WP interrupts */</div><div class='add'>+		outw(inw(chip-&gt;io_port + ESM_PORT_HOST_IRQ) | ESM_HIRQ_DSIE, chip-&gt;io_port + ESM_PORT_HOST_IRQ); /* enable WP ints */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_apu_set_freq(chip, apu, ((unsigned int)48000 &lt;&lt; 16) / chip-&gt;clock); /* 48000 Hz */</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;in_measurement = 1;</div><div class='ctx'> 	chip-&gt;measure_apu = apu;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	snd_es1968_bob_inc(chip, ESM_BOB_FREQ);</div><div class='del'>-	__apu_set_register(chip, apu, 5, pa &amp; 0xffff);</div><div class='del'>-	snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR);</div><div class='del'>-	do_gettimeofday(&amp;start_time);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		snd_es1968_bob_inc(chip, ESM_BOB_FREQ);</div><div class='add'>+		__apu_set_register(chip, apu, 5, pa &amp; 0xffff);</div><div class='add'>+		snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR);</div><div class='add'>+		start_time = ktime_get();</div><div class='add'>+	}</div><div class='ctx'> 	msleep(50);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	offset = __apu_get_register(chip, apu, 5);</div><div class='del'>-	do_gettimeofday(&amp;stop_time);</div><div class='del'>-	snd_es1968_trigger_apu(chip, apu, 0); /* stop */</div><div class='del'>-	snd_es1968_bob_dec(chip);</div><div class='del'>-	chip-&gt;in_measurement = 0;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		offset = __apu_get_register(chip, apu, 5);</div><div class='add'>+		stop_time = ktime_get();</div><div class='add'>+		snd_es1968_trigger_apu(chip, apu, 0); /* stop */</div><div class='add'>+		snd_es1968_bob_dec(chip);</div><div class='add'>+		chip-&gt;in_measurement = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* check the current position */</div><div class='ctx'> 	offset -= (pa &amp; 0xffff);</div><div class='ctx'> 	offset &amp;= 0xfffe;</div><div class='ctx'> 	offset += chip-&gt;measure_count * (CLOCK_MEASURE_BUFSIZE/2);</div><div class='ctx'> </div><div class='del'>-	t = stop_time.tv_sec - start_time.tv_sec;</div><div class='del'>-	t *= 1000000;</div><div class='del'>-	if (stop_time.tv_usec &lt; start_time.tv_usec)</div><div class='del'>-		t -= start_time.tv_usec - stop_time.tv_usec;</div><div class='del'>-	else</div><div class='del'>-		t += stop_time.tv_usec - start_time.tv_usec;</div><div class='add'>+	diff = ktime_sub(stop_time, start_time);</div><div class='add'>+	t = ktime_to_us(diff);</div><div class='ctx'> 	if (t == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "?? calculation error..\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "?? calculation error..\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		offset *= 1000;</div><div class='ctx'> 		offset = (offset / t) * 1000 + ((offset % t) * 1000) / t;</div><div class='hunk'>@@ -1795,7 +1720,7 @@ static void __devinit es1968_measure_clock(struct es1968 *chip)</div><div class='ctx'> 			if (offset &gt;= 40000 &amp;&amp; offset &lt;= 50000)</div><div class='ctx'> 				chip-&gt;clock = (chip-&gt;clock * offset) / 48000;</div><div class='ctx'> 		}</div><div class='del'>-		printk(KERN_INFO "es1968: clocking to %d\n", chip-&gt;clock);</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "clocking to %d\n", chip-&gt;clock);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_es1968_free_memory(chip, memory);</div><div class='ctx'> 	snd_es1968_free_apu_pair(chip, apu);</div><div class='hunk'>@@ -1812,14 +1737,15 @@ static void snd_es1968_pcm_free(struct snd_pcm *pcm)</div><div class='ctx'> 	esm-&gt;pcm = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_es1968_pcm(struct es1968 *chip, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* get DMA buffer */</div><div class='del'>-	if ((err = snd_es1968_init_dmabuf(chip)) &lt; 0)</div><div class='add'>+	err = snd_es1968_init_dmabuf(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* set PCMBAR */</div><div class='hunk'>@@ -1828,9 +1754,10 @@ snd_es1968_pcm(struct es1968 *chip, int device)</div><div class='ctx'> 	wave_set_register(chip, 0x01FE, chip-&gt;dma.addr &gt;&gt; 12);</div><div class='ctx'> 	wave_set_register(chip, 0x01FF, chip-&gt;dma.addr &gt;&gt; 12);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "ESS Maestro", device,</div><div class='del'>-			       chip-&gt;playback_streams,</div><div class='del'>-			       chip-&gt;capture_streams, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "ESS Maestro", device,</div><div class='add'>+			  chip-&gt;playback_streams,</div><div class='add'>+			  chip-&gt;capture_streams, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='hunk'>@@ -1841,7 +1768,7 @@ snd_es1968_pcm(struct es1968 *chip, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='ctx'> </div><div class='del'>-	strcpy(pcm-&gt;name, "ESS Maestro");</div><div class='add'>+	strscpy(pcm-&gt;name, "ESS Maestro");</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='hunk'>@@ -1896,13 +1823,10 @@ static void snd_es1968_update_pcm(struct es1968 *chip, struct esschan *es)</div><div class='ctx'>    (without wrap around) in response to volume button presses and then</div><div class='ctx'>    generating an interrupt. The pair of counters is stored in bits 1-3 and 5-7</div><div class='ctx'>    of a byte wide register. The meaning of bits 0 and 4 is unknown. */</div><div class='del'>-static void es1968_update_hw_volume(unsigned long private_data)</div><div class='add'>+static void es1968_update_hw_volume(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct es1968 *chip = (struct es1968 *) private_data;</div><div class='add'>+	struct es1968 *chip = container_of(work, struct es1968, hwvol_work);</div><div class='ctx'> 	int x, val;</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	unsigned long flags;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Figure out which volume control button was pushed,</div><div class='ctx'> 	   based on differences from the default register</div><div class='hunk'>@@ -1921,18 +1845,11 @@ static void es1968_update_hw_volume(unsigned long private_data)</div><div class='ctx'> 	if (! chip-&gt;master_switch || ! chip-&gt;master_volume)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;ac97_lock, flags);</div><div class='del'>-	val = chip-&gt;ac97-&gt;regs[AC97_MASTER];</div><div class='add'>+	val = snd_ac97_read(chip-&gt;ac97, AC97_MASTER);</div><div class='ctx'> 	switch (x) {</div><div class='ctx'> 	case 0x88:</div><div class='ctx'> 		/* mute */</div><div class='ctx'> 		val ^= 0x8000;</div><div class='del'>-		chip-&gt;ac97-&gt;regs[AC97_MASTER] = val;</div><div class='del'>-		outw(val, chip-&gt;io_port + ESM_AC97_DATA);</div><div class='del'>-		outb(AC97_MASTER, chip-&gt;io_port + ESM_AC97_INDEX);</div><div class='del'>-		snd_ctl_notify(chip-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;chip-&gt;master_switch-&gt;id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0xaa:</div><div class='ctx'> 		/* volume up */</div><div class='hunk'>@@ -1940,11 +1857,6 @@ static void es1968_update_hw_volume(unsigned long private_data)</div><div class='ctx'> 			val--;</div><div class='ctx'> 		if ((val &amp; 0x7f00) &gt; 0)</div><div class='ctx'> 			val -= 0x0100;</div><div class='del'>-		chip-&gt;ac97-&gt;regs[AC97_MASTER] = val;</div><div class='del'>-		outw(val, chip-&gt;io_port + ESM_AC97_DATA);</div><div class='del'>-		outb(AC97_MASTER, chip-&gt;io_port + ESM_AC97_INDEX);</div><div class='del'>-		snd_ctl_notify(chip-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;chip-&gt;master_volume-&gt;id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 0x66:</div><div class='ctx'> 		/* volume down */</div><div class='hunk'>@@ -1952,14 +1864,11 @@ static void es1968_update_hw_volume(unsigned long private_data)</div><div class='ctx'> 			val++;</div><div class='ctx'> 		if ((val &amp; 0x7f00) &lt; 0x1f00)</div><div class='ctx'> 			val += 0x0100;</div><div class='del'>-		chip-&gt;ac97-&gt;regs[AC97_MASTER] = val;</div><div class='del'>-		outw(val, chip-&gt;io_port + ESM_AC97_DATA);</div><div class='del'>-		outb(AC97_MASTER, chip-&gt;io_port + ESM_AC97_INDEX);</div><div class='del'>-		snd_ctl_notify(chip-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;chip-&gt;master_volume-&gt;id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;ac97_lock, flags);</div><div class='add'>+	if (snd_ac97_update(chip-&gt;ac97, AC97_MASTER, val))</div><div class='add'>+		snd_ctl_notify(chip-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='add'>+			       &amp;chip-&gt;master_volume-&gt;id);</div><div class='ctx'> #else</div><div class='ctx'> 	if (!chip-&gt;input_dev)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -1999,17 +1908,14 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct es1968 *chip = dev_id;</div><div class='ctx'> 	u32 event;</div><div class='ctx'> </div><div class='del'>-	if (!(event = inb(chip-&gt;io_port + 0x1A)))</div><div class='add'>+	event = inb(chip-&gt;io_port + 0x1A);</div><div class='add'>+	if (!event)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	outw(inw(chip-&gt;io_port + 4) &amp; 1, chip-&gt;io_port + 4);</div><div class='ctx'> </div><div class='ctx'> 	if (event &amp; ESM_HWVOL_IRQ)</div><div class='del'>-#ifdef CONFIG_SND_ES1968_INPUT</div><div class='del'>-		es1968_update_hw_volume((unsigned long)chip);</div><div class='del'>-#else</div><div class='del'>-		tasklet_schedule(&amp;chip-&gt;hwvol_tq); /* we'll do this later */</div><div class='del'>-#endif</div><div class='add'>+		schedule_work(&amp;chip-&gt;hwvol_work);</div><div class='ctx'> </div><div class='ctx'> 	/* else ack 'em all, i imagine */</div><div class='ctx'> 	outb(0xFF, chip-&gt;io_port + 0x1A);</div><div class='hunk'>@@ -2020,15 +1926,15 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	if (event &amp; ESM_SOUND_IRQ) {</div><div class='ctx'> 		struct esschan *es;</div><div class='del'>-		spin_lock(&amp;chip-&gt;substream_lock);</div><div class='del'>-		list_for_each_entry(es, &amp;chip-&gt;substream_list, list) {</div><div class='del'>-			if (es-&gt;running) {</div><div class='del'>-				snd_es1968_update_pcm(chip, es);</div><div class='del'>-				if (es-&gt;fmt &amp; ESS_FMT_STEREO)</div><div class='del'>-					snd_es1968_suppress_jitter(chip, es);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;substream_lock) {</div><div class='add'>+			list_for_each_entry(es, &amp;chip-&gt;substream_list, list) {</div><div class='add'>+				if (es-&gt;running) {</div><div class='add'>+					snd_es1968_update_pcm(chip, es);</div><div class='add'>+					if (es-&gt;fmt &amp; ESS_FMT_STEREO)</div><div class='add'>+						snd_es1968_suppress_jitter(chip, es);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_unlock(&amp;chip-&gt;substream_lock);</div><div class='ctx'> 		if (chip-&gt;in_measurement) {</div><div class='ctx'> 			unsigned int curp = __apu_get_register(chip, chip-&gt;measure_apu, 5);</div><div class='ctx'> 			if (curp &lt; chip-&gt;measure_lastpos)</div><div class='hunk'>@@ -2044,39 +1950,34 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)</div><div class='ctx'>  *  Mixer stuff</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_es1968_mixer(struct es1968 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	struct snd_ctl_elem_id elem_id;</div><div class='del'>-#endif</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_es1968_ac97_write,</div><div class='ctx'> 		.read = snd_es1968_ac97_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, NULL, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	pbus-&gt;no_vra = 1; /* ES1968 doesn't need VRA */</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='del'>-	if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97)) &lt; 0)</div><div class='add'>+	err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> #ifndef CONFIG_SND_ES1968_INPUT</div><div class='ctx'> 	/* attach master switch / volumes for h/w volume control */</div><div class='del'>-	memset(&amp;elem_id, 0, sizeof(elem_id));</div><div class='del'>-	elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(elem_id.name, "Master Playback Switch");</div><div class='del'>-	chip-&gt;master_switch = snd_ctl_find_id(chip-&gt;card, &amp;elem_id);</div><div class='del'>-	memset(&amp;elem_id, 0, sizeof(elem_id));</div><div class='del'>-	elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	strcpy(elem_id.name, "Master Playback Volume");</div><div class='del'>-	chip-&gt;master_volume = snd_ctl_find_id(chip-&gt;card, &amp;elem_id);</div><div class='add'>+	chip-&gt;master_switch = snd_ctl_find_id_mixer(chip-&gt;card,</div><div class='add'>+						    "Master Playback Switch");</div><div class='add'>+	chip-&gt;master_volume = snd_ctl_find_id_mixer(chip-&gt;card,</div><div class='add'>+						    "Master Playback Volume");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2137,7 +2038,7 @@ static void snd_es1968_ac97_reset(struct es1968 *chip)</div><div class='ctx'> 	outw(inw(ioaddr + 0x3c) &amp; 0xfffc, ioaddr + 0x3c);</div><div class='ctx'> </div><div class='ctx'> #if 0				/* the loop here needs to be much better if we want it.. */</div><div class='del'>-	snd_printk(KERN_INFO "trying software reset\n");</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev, "trying software reset\n");</div><div class='ctx'> 	/* try and do a software reset */</div><div class='ctx'> 	outb(0x80 | 0x7c, ioaddr + 0x30);</div><div class='ctx'> 	for (w = 0;; w++) {</div><div class='hunk'>@@ -2319,7 +2220,7 @@ static void snd_es1968_chip_init(struct es1968 *chip)</div><div class='ctx'> 	outb(0x88, iobase+0x1f);</div><div class='ctx'> </div><div class='ctx'> 	/* it appears some maestros (dell 7500) only work if these are set,</div><div class='del'>-	   regardless of wether we use the assp or not. */</div><div class='add'>+	   regardless of whether we use the assp or not. */</div><div class='ctx'> </div><div class='ctx'> 	outb(0, iobase + ASSP_CONTROL_B);</div><div class='ctx'> 	outb(3, iobase + ASSP_CONTROL_A);	/* M: Reserved bits... */</div><div class='hunk'>@@ -2405,50 +2306,34 @@ static void snd_es1968_start_irq(struct es1968 *chip)</div><div class='ctx'> 	outw(w, chip-&gt;io_port + ESM_PORT_HOST_IRQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * PM support</div><div class='ctx'>  */</div><div class='del'>-static int es1968_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int es1968_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct es1968 *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (! chip-&gt;do_pm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;in_suspend = 1;</div><div class='add'>+	cancel_work_sync(&amp;chip-&gt;hwvol_work);</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='ctx'> 	snd_ac97_suspend(chip-&gt;ac97);</div><div class='ctx'> 	snd_es1968_bob_stop(chip);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int es1968_resume(struct pci_dev *pci)</div><div class='add'>+static int es1968_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct es1968 *chip = card-&gt;private_data;</div><div class='ctx'> 	struct esschan *es;</div><div class='ctx'> </div><div class='ctx'> 	if (! chip-&gt;do_pm)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* restore all our config */</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "es1968: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_es1968_chip_init(chip);</div><div class='ctx'> </div><div class='ctx'> 	/* need to restore the base pointers.. */ </div><div class='hunk'>@@ -2481,11 +2366,12 @@ static int es1968_resume(struct pci_dev *pci)</div><div class='ctx'> 	chip-&gt;in_suspend = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);</div><div class='ctx'> </div><div class='ctx'> #ifdef SUPPORT_JOYSTICK</div><div class='ctx'> #define JOYSTICK_ADDR	0x200</div><div class='del'>-static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)</div><div class='add'>+static int snd_es1968_create_gameport(struct es1968 *chip, int dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gameport *gp;</div><div class='ctx'> 	struct resource *r;</div><div class='hunk'>@@ -2494,14 +2380,15 @@ static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)</div><div class='ctx'> 	if (!joystick[dev])</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	r = request_region(JOYSTICK_ADDR, 8, "ES1968 gameport");</div><div class='add'>+	r = devm_request_region(&amp;chip-&gt;pci-&gt;dev, JOYSTICK_ADDR, 8,</div><div class='add'>+				"ES1968 gameport");</div><div class='ctx'> 	if (!r)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;gameport = gp = gameport_allocate_port();</div><div class='ctx'> 	if (!gp) {</div><div class='del'>-		printk(KERN_ERR "es1968: cannot allocate memory for gameport\n");</div><div class='del'>-		release_and_free_resource(r);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"cannot allocate memory for gameport\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2512,7 +2399,6 @@ static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)</div><div class='ctx'> 	gameport_set_phys(gp, "pci%s/gameport0", pci_name(chip-&gt;pci));</div><div class='ctx'> 	gameport_set_dev_parent(gp, &amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> 	gp-&gt;io = JOYSTICK_ADDR;</div><div class='del'>-	gameport_set_port_data(gp, r);</div><div class='ctx'> </div><div class='ctx'> 	gameport_register_port(gp);</div><div class='ctx'> </div><div class='hunk'>@@ -2522,12 +2408,8 @@ static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)</div><div class='ctx'> static void snd_es1968_free_gameport(struct es1968 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	if (chip-&gt;gameport) {</div><div class='del'>-		struct resource *r = gameport_get_port_data(chip-&gt;gameport);</div><div class='del'>-</div><div class='ctx'> 		gameport_unregister_port(chip-&gt;gameport);</div><div class='ctx'> 		chip-&gt;gameport = NULL;</div><div class='del'>-</div><div class='del'>-		release_and_free_resource(r);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='hunk'>@@ -2536,12 +2418,12 @@ static inline void snd_es1968_free_gameport(struct es1968 *chip) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_ES1968_INPUT</div><div class='del'>-static int __devinit snd_es1968_input_register(struct es1968 *chip)</div><div class='add'>+static int snd_es1968_input_register(struct es1968 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct input_dev *input_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	input_dev = input_allocate_device();</div><div class='add'>+	input_dev = devm_input_allocate_device(&amp;chip-&gt;pci-&gt;dev);</div><div class='ctx'> 	if (!input_dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2561,43 +2443,108 @@ static int __devinit snd_es1968_input_register(struct es1968 *chip)</div><div class='ctx'> 	__set_bit(KEY_VOLUMEUP, input_dev-&gt;keybit);</div><div class='ctx'> </div><div class='ctx'> 	err = input_register_device(input_dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		input_free_device(input_dev);</div><div class='add'>+	if (err)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;input_dev = input_dev;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_SND_ES1968_INPUT */</div><div class='ctx'> </div><div class='del'>-static int snd_es1968_free(struct es1968 *chip)</div><div class='add'>+#ifdef CONFIG_SND_ES1968_RADIO</div><div class='add'>+#define GPIO_DATA	0x60</div><div class='add'>+#define IO_MASK		4      /* mask      register offset from GPIO_DATA</div><div class='add'>+				bits 1=unmask write to given bit */</div><div class='add'>+#define IO_DIR		8      /* direction register offset from GPIO_DATA</div><div class='add'>+				bits 0/1=read/write direction */</div><div class='add'>+</div><div class='add'>+/* GPIO to TEA575x maps */</div><div class='add'>+struct snd_es1968_tea575x_gpio {</div><div class='add'>+	u8 data, clk, wren, most;</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_es1968_tea575x_gpio snd_es1968_tea575x_gpios[] = {</div><div class='add'>+	{ .data = 6, .clk = 7, .wren = 8, .most = 9, .name = "SF64-PCE2" },</div><div class='add'>+	{ .data = 7, .clk = 8, .wren = 6, .most = 10, .name = "M56VAP" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define get_tea575x_gpio(chip) \</div><div class='add'>+	(&amp;snd_es1968_tea575x_gpios[(chip)-&gt;tea575x_tuner])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void snd_es1968_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	if (chip-&gt;input_dev)</div><div class='del'>-		input_unregister_device(chip-&gt;input_dev);</div><div class='add'>+	struct es1968 *chip = tea-&gt;private_data;</div><div class='add'>+	struct snd_es1968_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='add'>+	u16 val = 0;</div><div class='add'>+</div><div class='add'>+	val |= (pins &amp; TEA575X_DATA) ? (1 &lt;&lt; gpio.data) : 0;</div><div class='add'>+	val |= (pins &amp; TEA575X_CLK)  ? (1 &lt;&lt; gpio.clk)  : 0;</div><div class='add'>+	val |= (pins &amp; TEA575X_WREN) ? (1 &lt;&lt; gpio.wren) : 0;</div><div class='add'>+</div><div class='add'>+	outw(val, chip-&gt;io_port + GPIO_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea)</div><div class='add'>+{</div><div class='add'>+	struct es1968 *chip = tea-&gt;private_data;</div><div class='add'>+	struct snd_es1968_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='add'>+	u16 val = inw(chip-&gt;io_port + GPIO_DATA);</div><div class='add'>+	u8 ret = 0;</div><div class='add'>+</div><div class='add'>+	if (val &amp; (1 &lt;&lt; gpio.data))</div><div class='add'>+		ret |= TEA575X_DATA;</div><div class='add'>+	if (val &amp; (1 &lt;&lt; gpio.most))</div><div class='add'>+		ret |= TEA575X_MOST;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output)</div><div class='add'>+{</div><div class='add'>+	struct es1968 *chip = tea-&gt;private_data;</div><div class='add'>+	unsigned long io = chip-&gt;io_port + GPIO_DATA;</div><div class='add'>+	u16 odir = inw(io + IO_DIR);</div><div class='add'>+	struct snd_es1968_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='add'>+</div><div class='add'>+	if (output) {</div><div class='add'>+		outw(~((1 &lt;&lt; gpio.data) | (1 &lt;&lt; gpio.clk) | (1 &lt;&lt; gpio.wren)),</div><div class='add'>+			io + IO_MASK);</div><div class='add'>+		outw(odir | (1 &lt;&lt; gpio.data) | (1 &lt;&lt; gpio.clk) | (1 &lt;&lt; gpio.wren),</div><div class='add'>+			io + IO_DIR);</div><div class='add'>+	} else {</div><div class='add'>+		outw(~((1 &lt;&lt; gpio.clk) | (1 &lt;&lt; gpio.wren) | (1 &lt;&lt; gpio.data) | (1 &lt;&lt; gpio.most)),</div><div class='add'>+			io + IO_MASK);</div><div class='add'>+		outw((odir &amp; ~((1 &lt;&lt; gpio.data) | (1 &lt;&lt; gpio.most)))</div><div class='add'>+			| (1 &lt;&lt; gpio.clk) | (1 &lt;&lt; gpio.wren), io + IO_DIR);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_tea575x_ops snd_es1968_tea_ops = {</div><div class='add'>+	.set_pins = snd_es1968_tea575x_set_pins,</div><div class='add'>+	.get_pins = snd_es1968_tea575x_get_pins,</div><div class='add'>+	.set_direction = snd_es1968_tea575x_set_direction,</div><div class='add'>+};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static void snd_es1968_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct es1968 *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;chip-&gt;hwvol_work);</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;io_port) {</div><div class='del'>-		if (chip-&gt;irq &gt;= 0)</div><div class='del'>-			synchronize_irq(chip-&gt;irq);</div><div class='ctx'> 		outw(1, chip-&gt;io_port + 0x04); /* clear WP interrupts */</div><div class='ctx'> 		outw(0, chip-&gt;io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	snd_es1968_free_gameport(chip);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+#ifdef CONFIG_SND_ES1968_RADIO</div><div class='add'>+	snd_tea575x_exit(&amp;chip-&gt;tea);</div><div class='add'>+	v4l2_device_unregister(&amp;chip-&gt;v4l2_dev);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-static int snd_es1968_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct es1968 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_es1968_free(chip);</div><div class='add'>+	snd_es1968_free_gameport(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ess_device_list {</div><div class='hunk'>@@ -2605,53 +2552,44 @@ struct ess_device_list {</div><div class='ctx'> 	unsigned short vendor;	/* subsystem vendor id */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ess_device_list pm_whitelist[] __devinitdata = {</div><div class='add'>+static const struct ess_device_list pm_allowlist[] = {</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x0e11 },	/* Compaq Armada */</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x1028 },</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x103c },</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x1179 },</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x14c0 },	/* HP omnibook 4150 */</div><div class='ctx'> 	{ TYPE_MAESTRO2E, 0x1558 },</div><div class='add'>+	{ TYPE_MAESTRO2E, 0x125d },	/* a PCI card, e.g. Terratec DMX */</div><div class='add'>+	{ TYPE_MAESTRO2, 0x125d },	/* a PCI card, e.g. SF64-PCE2 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ess_device_list mpu_blacklist[] __devinitdata = {</div><div class='add'>+static const struct ess_device_list mpu_denylist[] = {</div><div class='ctx'> 	{ TYPE_MAESTRO2, 0x125d },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_es1968_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci,</div><div class='del'>-				       int total_bufsize,</div><div class='del'>-				       int play_streams,</div><div class='del'>-				       int capt_streams,</div><div class='del'>-				       int chip_type,</div><div class='del'>-				       int do_pm,</div><div class='del'>-				       struct es1968 **chip_ret)</div><div class='del'>-{</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_es1968_dev_free,</div><div class='del'>-	};</div><div class='del'>-	struct es1968 *chip;</div><div class='add'>+static int snd_es1968_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci,</div><div class='add'>+			     int total_bufsize,</div><div class='add'>+			     int play_streams,</div><div class='add'>+			     int capt_streams,</div><div class='add'>+			     int chip_type,</div><div class='add'>+			     int do_pm,</div><div class='add'>+			     int radio_nr)</div><div class='add'>+{</div><div class='add'>+	struct es1968 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	*chip_ret = NULL;</div><div class='del'>-</div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* check, if we can restrict PCI DMA transfers to 28 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(28))) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 28bit PCI busmaster DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (! chip) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Set Vars */</div><div class='ctx'> 	chip-&gt;type = chip_type;</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='hunk'>@@ -2659,10 +2597,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;chip-&gt;buf_list);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;chip-&gt;substream_list);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;memory_mutex);</div><div class='del'>-#ifndef CONFIG_SND_ES1968_INPUT</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;ac97_lock);</div><div class='del'>-	tasklet_init(&amp;chip-&gt;hwvol_tq, es1968_update_hw_volume, (unsigned long)chip);</div><div class='del'>-#endif</div><div class='add'>+	INIT_WORK(&amp;chip-&gt;hwvol_work, es1968_update_hw_volume);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='hunk'>@@ -2670,19 +2605,18 @@ static int __devinit snd_es1968_create(struct snd_card *card,</div><div class='ctx'> 	chip-&gt;playback_streams = play_streams;</div><div class='ctx'> 	chip-&gt;capture_streams = capt_streams;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "ESS Maestro")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ESS Maestro");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	chip-&gt;io_port = pci_resource_start(pci, 0);</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_es1968_interrupt, IRQF_SHARED,</div><div class='del'>-			"ESS Maestro", chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_es1968_free(chip);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_es1968_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_es1968_free;</div><div class='ctx'> 	        </div><div class='ctx'> 	/* Clear Maestro_map */</div><div class='ctx'> 	for (i = 0; i &lt; 32; i++)</div><div class='hunk'>@@ -2696,19 +2630,19 @@ static int __devinit snd_es1968_create(struct snd_card *card,</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='ctx'> 	if (do_pm &gt; 1) {</div><div class='del'>-		/* disable power-management if not on the whitelist */</div><div class='add'>+		/* disable power-management if not on the allowlist */</div><div class='ctx'> 		unsigned short vend;</div><div class='ctx'> 		pci_read_config_word(chip-&gt;pci, PCI_SUBSYSTEM_VENDOR_ID, &amp;vend);</div><div class='del'>-		for (i = 0; i &lt; (int)ARRAY_SIZE(pm_whitelist); i++) {</div><div class='del'>-			if (chip-&gt;type == pm_whitelist[i].type &amp;&amp;</div><div class='del'>-			    vend == pm_whitelist[i].vendor) {</div><div class='add'>+		for (i = 0; i &lt; (int)ARRAY_SIZE(pm_allowlist); i++) {</div><div class='add'>+			if (chip-&gt;type == pm_allowlist[i].type &amp;&amp;</div><div class='add'>+			    vend == pm_allowlist[i].vendor) {</div><div class='ctx'> 				do_pm = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 		if (do_pm &gt; 1) {</div><div class='ctx'> 			/* not matched; disabling pm */</div><div class='del'>-			printk(KERN_INFO "es1968: not attempting power management.\n");</div><div class='add'>+			dev_info(card-&gt;dev, "not attempting power management.\n");</div><div class='ctx'> 			do_pm = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2716,23 +2650,37 @@ static int __devinit snd_es1968_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_chip_init(chip);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_es1968_free(chip);</div><div class='add'>+#ifdef CONFIG_SND_ES1968_RADIO</div><div class='add'>+	/* don't play with GPIOs on laptops */</div><div class='add'>+	if (chip-&gt;pci-&gt;subsystem_vendor != 0x125d)</div><div class='add'>+		return 0;</div><div class='add'>+	err = v4l2_device_register(&amp;pci-&gt;dev, &amp;chip-&gt;v4l2_dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip-&gt;tea.v4l2_dev = &amp;chip-&gt;v4l2_dev;</div><div class='add'>+	chip-&gt;tea.private_data = chip;</div><div class='add'>+	chip-&gt;tea.radio_nr = radio_nr;</div><div class='add'>+	chip-&gt;tea.ops = &amp;snd_es1968_tea_ops;</div><div class='add'>+	sprintf(chip-&gt;tea.bus_info, "PCI:%s", pci_name(pci));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(snd_es1968_tea575x_gpios); i++) {</div><div class='add'>+		chip-&gt;tea575x_tuner = i;</div><div class='add'>+		if (!snd_tea575x_init(&amp;chip-&gt;tea, THIS_MODULE)) {</div><div class='add'>+			dev_info(card-&gt;dev, "detected TEA575x radio type %s\n",</div><div class='add'>+				   get_tea575x_gpio(chip)-&gt;name);</div><div class='add'>+			strscpy(chip-&gt;tea.card, get_tea575x_gpio(chip)-&gt;name,</div><div class='add'>+				sizeof(chip-&gt;tea.card));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*chip_ret = chip;</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static int __devinit snd_es1968_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_es1968_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -2747,70 +2695,69 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'>                 </div><div class='ctx'> 	if (total_bufsize[dev] &lt; 128)</div><div class='ctx'> 		total_bufsize[dev] = 128;</div><div class='ctx'> 	if (total_bufsize[dev] &gt; 4096)</div><div class='ctx'> 		total_bufsize[dev] = 4096;</div><div class='del'>-	if ((err = snd_es1968_create(card, pci,</div><div class='del'>-				     total_bufsize[dev] * 1024, /* in bytes */</div><div class='del'>-				     pcm_substreams_p[dev], </div><div class='del'>-				     pcm_substreams_c[dev],</div><div class='del'>-				     pci_id-&gt;driver_data,</div><div class='del'>-				     use_pm[dev],</div><div class='del'>-				     &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_es1968_create(card, pci,</div><div class='add'>+				total_bufsize[dev] * 1024, /* in bytes */</div><div class='add'>+				pcm_substreams_p[dev],</div><div class='add'>+				pcm_substreams_c[dev],</div><div class='add'>+				pci_id-&gt;driver_data,</div><div class='add'>+				use_pm[dev],</div><div class='add'>+				radio_nr[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;type) {</div><div class='ctx'> 	case TYPE_MAESTRO2E:</div><div class='del'>-		strcpy(card-&gt;driver, "ES1978");</div><div class='del'>-		strcpy(card-&gt;shortname, "ESS ES1978 (Maestro 2E)");</div><div class='add'>+		strscpy(card-&gt;driver, "ES1978");</div><div class='add'>+		strscpy(card-&gt;shortname, "ESS ES1978 (Maestro 2E)");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TYPE_MAESTRO2:</div><div class='del'>-		strcpy(card-&gt;driver, "ES1968");</div><div class='del'>-		strcpy(card-&gt;shortname, "ESS ES1968 (Maestro 2)");</div><div class='add'>+		strscpy(card-&gt;driver, "ES1968");</div><div class='add'>+		strscpy(card-&gt;shortname, "ESS ES1968 (Maestro 2)");</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TYPE_MAESTRO:</div><div class='del'>-		strcpy(card-&gt;driver, "ESM1");</div><div class='del'>-		strcpy(card-&gt;shortname, "ESS Maestro 1");</div><div class='add'>+		strscpy(card-&gt;driver, "ESM1");</div><div class='add'>+		strscpy(card-&gt;shortname, "ESS Maestro 1");</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_es1968_pcm(chip, 0)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_es1968_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_es1968_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_es1968_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (enable_mpu[dev] == 2) {</div><div class='del'>-		/* check the black list */</div><div class='add'>+		/* check the deny list */</div><div class='ctx'> 		unsigned short vend;</div><div class='ctx'> 		pci_read_config_word(chip-&gt;pci, PCI_SUBSYSTEM_VENDOR_ID, &amp;vend);</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(mpu_blacklist); i++) {</div><div class='del'>-			if (chip-&gt;type == mpu_blacklist[i].type &amp;&amp;</div><div class='del'>-			    vend == mpu_blacklist[i].vendor) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(mpu_denylist); i++) {</div><div class='add'>+			if (chip-&gt;type == mpu_denylist[i].type &amp;&amp;</div><div class='add'>+			    vend == mpu_denylist[i].vendor) {</div><div class='ctx'> 				enable_mpu[dev] = 0;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enable_mpu[dev]) {</div><div class='del'>-		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='del'>-					       chip-&gt;io_port + ESM_MPU401_PORT,</div><div class='del'>-					       MPU401_INFO_INTEGRATED,</div><div class='del'>-					       chip-&gt;irq, 0, &amp;chip-&gt;rmidi)) &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");</div><div class='del'>-		}</div><div class='add'>+		err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,</div><div class='add'>+					  chip-&gt;io_port + ESM_MPU401_PORT,</div><div class='add'>+					  MPU401_INFO_INTEGRATED |</div><div class='add'>+					  MPU401_INFO_IRQ_HOOK,</div><div class='add'>+					  -1, &amp;chip-&gt;rmidi);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			dev_warn(card-&gt;dev, "skipping MPU-401 MIDI support..\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_create_gameport(chip, dev);</div><div class='hunk'>@@ -2818,8 +2765,8 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,</div><div class='ctx'> #ifdef CONFIG_SND_ES1968_INPUT</div><div class='ctx'> 	err = snd_es1968_input_register(chip);</div><div class='ctx'> 	if (err)</div><div class='del'>-		snd_printk(KERN_WARNING "Input device registration "</div><div class='del'>-			"failed with error %i", err);</div><div class='add'>+		dev_warn(card-&gt;dev,</div><div class='add'>+			 "Input device registration failed with error %i", err);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	snd_es1968_start_irq(chip);</div><div class='hunk'>@@ -2831,41 +2778,27 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;io_port, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_es1968_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_es1968_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_es1968_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ES1968 (ESS Maestro)",</div><div class='add'>+static struct pci_driver es1968_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_es1968_ids,</div><div class='ctx'> 	.probe = snd_es1968_probe,</div><div class='del'>-	.remove = __devexit_p(snd_es1968_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = es1968_suspend,</div><div class='del'>-	.resume = es1968_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;es1968_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_es1968_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_es1968_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_es1968_init)</div><div class='del'>-module_exit(alsa_card_es1968_exit)</div><div class='add'>+module_pci_driver(es1968_driver);</div><div class='head'>diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c<br/>index e1baad74ea4b..4ca992449ea3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/fm801.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/fm801.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/fm801.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/fm801.c</a></div><div class='hunk'>@@ -1,31 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *  The driver for the ForteMedia FM801 based soundcards</div><div class='ctx'>  *  Copyright (c) by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *  Support FM only card by Andy Shevchenko &lt;andy@smile.org.ua&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='hunk'>@@ -34,31 +19,27 @@</div><div class='ctx'> #include &lt;sound/opl3.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='del'>-#include &lt;sound/tea575x-tuner.h&gt;</div><div class='del'>-#define TEA575X_RADIO 1</div><div class='add'>+#include &lt;media/drv-intf/tea575x.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ForteMedia FM801");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{ForteMedia,FM801},"</div><div class='del'>-		"{Genius,SoundMaker Live 5.1}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card */</div><div class='ctx'> /*</div><div class='ctx'>  *  Enable TEA575x tuner</div><div class='ctx'>  *    1 = MediaForte 256-PCS</div><div class='del'>- *    2 = MediaForte 256-PCPR</div><div class='add'>+ *    2 = MediaForte 256-PCP</div><div class='ctx'>  *    3 = MediaForte 64-PCR</div><div class='ctx'>  *   16 = setup tuner only (this is additional bit), i.e. SF64-PCR FM card</div><div class='ctx'>  *  High 16-bits are video (radio) device number + 1</div><div class='ctx'>  */</div><div class='ctx'> static int tea575x_tuner[SNDRV_CARDS];</div><div class='add'>+static int radio_nr[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for the FM801 soundcard.");</div><div class='hunk'>@@ -67,8 +48,12 @@ MODULE_PARM_DESC(id, "ID string for the FM801 soundcard.");</div><div class='ctx'> module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");</div><div class='ctx'> module_param_array(tea575x_tuner, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=SF256-PCPR, 3=SF64-PCR, +16=tuner-only).");</div><div class='add'>+MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (0 = auto, 1 = SF256-PCS, 2=SF256-PCP, 3=SF64-PCR, 8=disable, +16=tuner-only).");</div><div class='add'>+module_param_array(radio_nr, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(radio_nr, "Radio device numbers");</div><div class='add'>+</div><div class='ctx'> </div><div class='add'>+#define TUNER_DISABLED		(1&lt;&lt;3)</div><div class='ctx'> #define TUNER_ONLY		(1&lt;&lt;4)</div><div class='ctx'> #define TUNER_TYPE_MASK		(~TUNER_ONLY &amp; 0xFFFF)</div><div class='ctx'> </div><div class='hunk'>@@ -76,7 +61,10 @@ MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=S</div><div class='ctx'>  *  Direct registers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define FM801_REG(chip, reg)	(chip-&gt;port + FM801_##reg)</div><div class='add'>+#define fm801_writew(chip,reg,value)	outw((value), chip-&gt;port + FM801_##reg)</div><div class='add'>+#define fm801_readw(chip,reg)		inw(chip-&gt;port + FM801_##reg)</div><div class='add'>+</div><div class='add'>+#define fm801_writel(chip,reg,value)	outl((value), chip-&gt;port + FM801_##reg)</div><div class='ctx'> </div><div class='ctx'> #define FM801_PCM_VOL		0x00	/* PCM Output Volume */</div><div class='ctx'> #define FM801_FM_VOL		0x02	/* FM Output Volume */</div><div class='hunk'>@@ -152,21 +140,55 @@ MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=S</div><div class='ctx'> #define FM801_GPIO_GS3		(1&lt;&lt;15)</div><div class='ctx'> #define FM801_GPIO_GS(x)	(1&lt;&lt;(12+(x)))</div><div class='ctx'> 	</div><div class='del'>-/*</div><div class='del'>-</div><div class='add'>+/**</div><div class='add'>+ * struct fm801 - describes FM801 chip</div><div class='add'>+ * @dev:		device for this chio</div><div class='add'>+ * @irq:		irq number</div><div class='add'>+ * @port:		I/O port number</div><div class='add'>+ * @multichannel:	multichannel support</div><div class='add'>+ * @secondary:		secondary codec</div><div class='add'>+ * @secondary_addr:	address of the secondary codec</div><div class='add'>+ * @tea575x_tuner:	tuner access method &amp; flags</div><div class='add'>+ * @ply_ctrl:		playback control</div><div class='add'>+ * @cap_ctrl:		capture control</div><div class='add'>+ * @ply_buffer:		playback buffer</div><div class='add'>+ * @ply_buf:		playback buffer index</div><div class='add'>+ * @ply_count:		playback buffer count</div><div class='add'>+ * @ply_size:		playback buffer size</div><div class='add'>+ * @ply_pos:		playback position</div><div class='add'>+ * @cap_buffer:		capture buffer</div><div class='add'>+ * @cap_buf:		capture buffer index</div><div class='add'>+ * @cap_count:		capture buffer count</div><div class='add'>+ * @cap_size:		capture buffer size</div><div class='add'>+ * @cap_pos:		capture position</div><div class='add'>+ * @ac97_bus:		ac97 bus handle</div><div class='add'>+ * @ac97:		ac97 handle</div><div class='add'>+ * @ac97_sec:		ac97 secondary handle</div><div class='add'>+ * @card:		ALSA card</div><div class='add'>+ * @pcm:		PCM devices</div><div class='add'>+ * @rmidi:		rmidi device</div><div class='add'>+ * @playback_substream:	substream for playback</div><div class='add'>+ * @capture_substream:	substream for capture</div><div class='add'>+ * @p_dma_size:		playback DMA size</div><div class='add'>+ * @c_dma_size:		capture DMA size</div><div class='add'>+ * @reg_lock:		lock</div><div class='add'>+ * @proc_entry:		/proc entry</div><div class='add'>+ * @v4l2_dev:		v4l2 device</div><div class='add'>+ * @tea:		tea575a structure</div><div class='add'>+ * @saved_regs:		context saved during suspend</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> struct fm801 {</div><div class='add'>+	struct device *dev;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	unsigned long port;	/* I/O port number */</div><div class='del'>-	unsigned int multichannel: 1,	/* multichannel support */</div><div class='del'>-		     secondary: 1;	/* secondary codec */</div><div class='del'>-	unsigned char secondary_addr;	/* address of the secondary codec */</div><div class='del'>-	unsigned int tea575x_tuner;	/* tuner access method &amp; flags */</div><div class='add'>+	unsigned long port;</div><div class='add'>+	unsigned int multichannel: 1,</div><div class='add'>+		     secondary: 1;</div><div class='add'>+	unsigned char secondary_addr;</div><div class='add'>+	unsigned int tea575x_tuner;</div><div class='ctx'> </div><div class='del'>-	unsigned short ply_ctrl; /* playback control */</div><div class='del'>-	unsigned short cap_ctrl; /* capture control */</div><div class='add'>+	unsigned short ply_ctrl;</div><div class='add'>+	unsigned short cap_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long ply_buffer;</div><div class='ctx'> 	unsigned int ply_buf;</div><div class='hunk'>@@ -184,7 +206,6 @@ struct fm801 {</div><div class='ctx'> 	struct snd_ac97 *ac97;</div><div class='ctx'> 	struct snd_ac97 *ac97_sec;</div><div class='ctx'> </div><div class='del'>-	struct pci_dev *pci;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	struct snd_rawmidi *rmidi;</div><div class='hunk'>@@ -196,16 +217,29 @@ struct fm801 {</div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='ctx'> 	struct snd_info_entry *proc_entry;</div><div class='ctx'> </div><div class='del'>-#ifdef TEA575X_RADIO</div><div class='add'>+#ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='add'>+	struct v4l2_device v4l2_dev;</div><div class='ctx'> 	struct snd_tea575x tea;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> 	u16 saved_regs[0x20];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_fm801_ids) = {</div><div class='add'>+/*</div><div class='add'>+ * IO accessors</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static inline void fm801_iowrite16(struct fm801 *chip, unsigned short offset, u16 value)</div><div class='add'>+{</div><div class='add'>+	outw(value, chip-&gt;port + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 fm801_ioread16(struct fm801 *chip, unsigned short offset)</div><div class='add'>+{</div><div class='add'>+	return inw(chip-&gt;port + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id snd_fm801_ids[] = {</div><div class='ctx'> 	{ 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO &lt;&lt; 8, 0xffff00, 0, },   /* FM801 */</div><div class='ctx'> 	{ 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO &lt;&lt; 8, 0xffff00, 0, },   /* Gallant Odyssey Sound 4 */</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -217,20 +251,42 @@ MODULE_DEVICE_TABLE(pci, snd_fm801_ids);</div><div class='ctx'>  *  common I/O routines</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+static bool fm801_ac97_is_ready(struct fm801 *chip, unsigned int iterations)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; iterations; idx++) {</div><div class='add'>+		if (!(fm801_readw(chip, AC97_CMD) &amp; FM801_AC97_BUSY))</div><div class='add'>+			return true;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool fm801_ac97_is_valid(struct fm801 *chip, unsigned int iterations)</div><div class='add'>+{</div><div class='add'>+	unsigned int idx;</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; iterations; idx++) {</div><div class='add'>+		if (fm801_readw(chip, AC97_CMD) &amp; FM801_AC97_VALID)</div><div class='add'>+			return true;</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_fm801_update_bits(struct fm801 *chip, unsigned short reg,</div><div class='ctx'> 				 unsigned short mask, unsigned short value)</div><div class='ctx'> {</div><div class='ctx'> 	int change;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned short old, new;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	old = inw(chip-&gt;port + reg);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	old = fm801_ioread16(chip, reg);</div><div class='ctx'> 	new = (old &amp; ~mask) | value;</div><div class='ctx'> 	change = old != new;</div><div class='ctx'> 	if (change)</div><div class='del'>-		outw(new, chip-&gt;port + reg);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='add'>+		fm801_iowrite16(chip, reg, new);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -239,92 +295,73 @@ static void snd_fm801_codec_write(struct snd_ac97 *ac97,</div><div class='ctx'> 				  unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = ac97-&gt;private_data;</div><div class='del'>-	int idx;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Wait until the codec interface is not ready..</div><div class='ctx'> 	 */</div><div class='del'>-	for (idx = 0; idx &lt; 100; idx++) {</div><div class='del'>-		if (!(inw(FM801_REG(chip, AC97_CMD)) &amp; FM801_AC97_BUSY))</div><div class='del'>-			goto ok1;</div><div class='del'>-		udelay(10);</div><div class='add'>+	if (!fm801_ac97_is_ready(chip, 100)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AC'97 interface is busy (1)\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 interface is busy (1)\n");</div><div class='del'>-	return;</div><div class='ctx'> </div><div class='del'>- ok1:</div><div class='ctx'> 	/* write data and address */</div><div class='del'>-	outw(val, FM801_REG(chip, AC97_DATA));</div><div class='del'>-	outw(reg | (ac97-&gt;addr &lt;&lt; FM801_AC97_ADDR_SHIFT), FM801_REG(chip, AC97_CMD));</div><div class='add'>+	fm801_writew(chip, AC97_DATA, val);</div><div class='add'>+	fm801_writew(chip, AC97_CMD, reg | (ac97-&gt;addr &lt;&lt; FM801_AC97_ADDR_SHIFT));</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Wait until the write command is not completed..</div><div class='del'>-         */</div><div class='del'>-	for (idx = 0; idx &lt; 1000; idx++) {</div><div class='del'>-		if (!(inw(FM801_REG(chip, AC97_CMD)) &amp; FM801_AC97_BUSY))</div><div class='del'>-			return;</div><div class='del'>-		udelay(10);</div><div class='del'>-	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97-&gt;num);</div><div class='add'>+	 */</div><div class='add'>+	if (!fm801_ac97_is_ready(chip, 1000))</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AC'97 interface #%d is busy (2)\n",</div><div class='add'>+		ac97-&gt;num);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned short snd_fm801_codec_read(struct snd_ac97 *ac97, unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = ac97-&gt;private_data;</div><div class='del'>-	int idx;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 *  Wait until the codec interface is not ready..</div><div class='ctx'> 	 */</div><div class='del'>-	for (idx = 0; idx &lt; 100; idx++) {</div><div class='del'>-		if (!(inw(FM801_REG(chip, AC97_CMD)) &amp; FM801_AC97_BUSY))</div><div class='del'>-			goto ok1;</div><div class='del'>-		udelay(10);</div><div class='add'>+	if (!fm801_ac97_is_ready(chip, 100)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AC'97 interface is busy (1)\n");</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 interface is busy (1)\n");</div><div class='del'>-	return 0;</div><div class='ctx'> </div><div class='del'>- ok1:</div><div class='ctx'> 	/* read command */</div><div class='del'>-	outw(reg | (ac97-&gt;addr &lt;&lt; FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ,</div><div class='del'>-	     FM801_REG(chip, AC97_CMD));</div><div class='del'>-	for (idx = 0; idx &lt; 100; idx++) {</div><div class='del'>-		if (!(inw(FM801_REG(chip, AC97_CMD)) &amp; FM801_AC97_BUSY))</div><div class='del'>-			goto ok2;</div><div class='del'>-		udelay(10);</div><div class='add'>+	fm801_writew(chip, AC97_CMD,</div><div class='add'>+		     reg | (ac97-&gt;addr &lt;&lt; FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ);</div><div class='add'>+	if (!fm801_ac97_is_ready(chip, 100)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "AC'97 interface #%d is busy (2)\n",</div><div class='add'>+			ac97-&gt;num);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 interface #%d is busy (2)\n", ac97-&gt;num);</div><div class='del'>-	return 0;</div><div class='ctx'> </div><div class='del'>- ok2:</div><div class='del'>-	for (idx = 0; idx &lt; 1000; idx++) {</div><div class='del'>-		if (inw(FM801_REG(chip, AC97_CMD)) &amp; FM801_AC97_VALID)</div><div class='del'>-			goto ok3;</div><div class='del'>-		udelay(10);</div><div class='add'>+	if (!fm801_ac97_is_valid(chip, 1000)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"AC'97 interface #%d is not valid (2)\n", ac97-&gt;num);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 interface #%d is not valid (2)\n", ac97-&gt;num);</div><div class='del'>-	return 0;</div><div class='ctx'> </div><div class='del'>- ok3:</div><div class='del'>-	return inw(FM801_REG(chip, AC97_DATA));</div><div class='add'>+	return fm801_readw(chip, AC97_DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = {</div><div class='add'>+static const unsigned int rates[] = {</div><div class='ctx'>   5500,  8000,  9600, 11025,</div><div class='ctx'>   16000, 19200, 22050, 32000,</div><div class='ctx'>   38400, 44100, 48000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int channels[] = {</div><div class='add'>+static const unsigned int channels[] = {</div><div class='ctx'>   2, 4, 6</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels = {</div><div class='ctx'> 	.count = ARRAY_SIZE(channels),</div><div class='ctx'> 	.list = channels,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -354,7 +391,7 @@ static int snd_fm801_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		chip-&gt;ply_ctrl &amp;= ~(FM801_BUF1_LAST |</div><div class='hunk'>@@ -375,12 +412,10 @@ static int snd_fm801_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		chip-&gt;ply_ctrl &amp;= ~FM801_PAUSE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	outw(chip-&gt;ply_ctrl, FM801_REG(chip, PLY_CTRL));</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	fm801_writew(chip, PLY_CTRL, chip-&gt;ply_ctrl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,7 +424,7 @@ static int snd_fm801_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		chip-&gt;cap_ctrl &amp;= ~(FM801_BUF1_LAST |</div><div class='hunk'>@@ -410,26 +445,13 @@ static int snd_fm801_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		chip-&gt;cap_ctrl &amp;= ~FM801_PAUSE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	outw(chip-&gt;cap_ctrl, FM801_REG(chip, CAP_CTRL));</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	fm801_writew(chip, CAP_CTRL, chip-&gt;cap_ctrl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_fm801_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			       struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_fm801_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int snd_fm801_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -437,7 +459,7 @@ static int snd_fm801_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;ply_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	chip-&gt;ply_count = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;ply_ctrl &amp;= ~(FM801_START | FM801_16BIT |</div><div class='ctx'> 			     FM801_STEREO | FM801_RATE_MASK |</div><div class='ctx'> 			     FM801_CHANNELS_MASK);</div><div class='hunk'>@@ -452,13 +474,13 @@ static int snd_fm801_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;ply_ctrl |= snd_fm801_rate_bits(runtime-&gt;rate) &lt;&lt; FM801_RATE_SHIFT;</div><div class='ctx'> 	chip-&gt;ply_buf = 0;</div><div class='del'>-	outw(chip-&gt;ply_ctrl, FM801_REG(chip, PLY_CTRL));</div><div class='del'>-	outw(chip-&gt;ply_count - 1, FM801_REG(chip, PLY_COUNT));</div><div class='add'>+	fm801_writew(chip, PLY_CTRL, chip-&gt;ply_ctrl);</div><div class='add'>+	fm801_writew(chip, PLY_COUNT, chip-&gt;ply_count - 1);</div><div class='ctx'> 	chip-&gt;ply_buffer = runtime-&gt;dma_addr;</div><div class='ctx'> 	chip-&gt;ply_pos = 0;</div><div class='del'>-	outl(chip-&gt;ply_buffer, FM801_REG(chip, PLY_BUF1));</div><div class='del'>-	outl(chip-&gt;ply_buffer + (chip-&gt;ply_count % chip-&gt;ply_size), FM801_REG(chip, PLY_BUF2));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	fm801_writel(chip, PLY_BUF1, chip-&gt;ply_buffer);</div><div class='add'>+	fm801_writel(chip, PLY_BUF2,</div><div class='add'>+		     chip-&gt;ply_buffer + (chip-&gt;ply_count % chip-&gt;ply_size));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -469,7 +491,7 @@ static int snd_fm801_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;cap_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='ctx'> 	chip-&gt;cap_count = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;cap_ctrl &amp;= ~(FM801_START | FM801_16BIT |</div><div class='ctx'> 			     FM801_STEREO | FM801_RATE_MASK);</div><div class='ctx'> 	if (snd_pcm_format_width(runtime-&gt;format) == 16)</div><div class='hunk'>@@ -478,13 +500,13 @@ static int snd_fm801_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		chip-&gt;cap_ctrl |= FM801_STEREO;</div><div class='ctx'> 	chip-&gt;cap_ctrl |= snd_fm801_rate_bits(runtime-&gt;rate) &lt;&lt; FM801_RATE_SHIFT;</div><div class='ctx'> 	chip-&gt;cap_buf = 0;</div><div class='del'>-	outw(chip-&gt;cap_ctrl, FM801_REG(chip, CAP_CTRL));</div><div class='del'>-	outw(chip-&gt;cap_count - 1, FM801_REG(chip, CAP_COUNT));</div><div class='add'>+	fm801_writew(chip, CAP_CTRL, chip-&gt;cap_ctrl);</div><div class='add'>+	fm801_writew(chip, CAP_COUNT, chip-&gt;cap_count - 1);</div><div class='ctx'> 	chip-&gt;cap_buffer = runtime-&gt;dma_addr;</div><div class='ctx'> 	chip-&gt;cap_pos = 0;</div><div class='del'>-	outl(chip-&gt;cap_buffer, FM801_REG(chip, CAP_BUF1));</div><div class='del'>-	outl(chip-&gt;cap_buffer + (chip-&gt;cap_count % chip-&gt;cap_size), FM801_REG(chip, CAP_BUF2));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	fm801_writel(chip, CAP_BUF1, chip-&gt;cap_buffer);</div><div class='add'>+	fm801_writel(chip, CAP_BUF2,</div><div class='add'>+		     chip-&gt;cap_buffer + (chip-&gt;cap_count % chip-&gt;cap_size));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -495,13 +517,12 @@ static snd_pcm_uframes_t snd_fm801_playback_pointer(struct snd_pcm_substream *su</div><div class='ctx'> </div><div class='ctx'> 	if (!(chip-&gt;ply_ctrl &amp; FM801_START))</div><div class='ctx'> 		return 0;</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	ptr = chip-&gt;ply_pos + (chip-&gt;ply_count - 1) - inw(FM801_REG(chip, PLY_COUNT));</div><div class='del'>-	if (inw(FM801_REG(chip, IRQ_STATUS)) &amp; FM801_IRQ_PLAYBACK) {</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	ptr = chip-&gt;ply_pos + (chip-&gt;ply_count - 1) - fm801_readw(chip, PLY_COUNT);</div><div class='add'>+	if (fm801_readw(chip, IRQ_STATUS) &amp; FM801_IRQ_PLAYBACK) {</div><div class='ctx'> 		ptr += chip-&gt;ply_count;</div><div class='ctx'> 		ptr %= chip-&gt;ply_size;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -512,13 +533,12 @@ static snd_pcm_uframes_t snd_fm801_capture_pointer(struct snd_pcm_substream *sub</div><div class='ctx'> </div><div class='ctx'> 	if (!(chip-&gt;cap_ctrl &amp; FM801_START))</div><div class='ctx'> 		return 0;</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	ptr = chip-&gt;cap_pos + (chip-&gt;cap_count - 1) - inw(FM801_REG(chip, CAP_COUNT));</div><div class='del'>-	if (inw(FM801_REG(chip, IRQ_STATUS)) &amp; FM801_IRQ_CAPTURE) {</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	ptr = chip-&gt;cap_pos + (chip-&gt;cap_count - 1) - fm801_readw(chip, CAP_COUNT);</div><div class='add'>+	if (fm801_readw(chip, IRQ_STATUS) &amp; FM801_IRQ_CAPTURE) {</div><div class='ctx'> 		ptr += chip-&gt;cap_count;</div><div class='ctx'> 		ptr %= chip-&gt;cap_size;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -528,49 +548,50 @@ static irqreturn_t snd_fm801_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned short status;</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='del'>-	status = inw(FM801_REG(chip, IRQ_STATUS));</div><div class='add'>+	status = fm801_readw(chip, IRQ_STATUS);</div><div class='ctx'> 	status &amp;= FM801_IRQ_PLAYBACK|FM801_IRQ_CAPTURE|FM801_IRQ_MPU|FM801_IRQ_VOLUME;</div><div class='ctx'> 	if (! status)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	/* ack first */</div><div class='del'>-	outw(status, FM801_REG(chip, IRQ_STATUS));</div><div class='add'>+	fm801_writew(chip, IRQ_STATUS, status);</div><div class='ctx'> 	if (chip-&gt;pcm &amp;&amp; (status &amp; FM801_IRQ_PLAYBACK) &amp;&amp; chip-&gt;playback_substream) {</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		chip-&gt;ply_buf++;</div><div class='del'>-		chip-&gt;ply_pos += chip-&gt;ply_count;</div><div class='del'>-		chip-&gt;ply_pos %= chip-&gt;ply_size;</div><div class='del'>-		tmp = chip-&gt;ply_pos + chip-&gt;ply_count;</div><div class='del'>-		tmp %= chip-&gt;ply_size;</div><div class='del'>-		outl(chip-&gt;ply_buffer + tmp,</div><div class='del'>-				(chip-&gt;ply_buf &amp; 1) ?</div><div class='del'>-					FM801_REG(chip, PLY_BUF1) :</div><div class='del'>-					FM801_REG(chip, PLY_BUF2));</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			chip-&gt;ply_buf++;</div><div class='add'>+			chip-&gt;ply_pos += chip-&gt;ply_count;</div><div class='add'>+			chip-&gt;ply_pos %= chip-&gt;ply_size;</div><div class='add'>+			tmp = chip-&gt;ply_pos + chip-&gt;ply_count;</div><div class='add'>+			tmp %= chip-&gt;ply_size;</div><div class='add'>+			if (chip-&gt;ply_buf &amp; 1)</div><div class='add'>+				fm801_writel(chip, PLY_BUF1, chip-&gt;ply_buffer + tmp);</div><div class='add'>+			else</div><div class='add'>+				fm801_writel(chip, PLY_BUF2, chip-&gt;ply_buffer + tmp);</div><div class='add'>+		}</div><div class='ctx'> 		snd_pcm_period_elapsed(chip-&gt;playback_substream);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;pcm &amp;&amp; (status &amp; FM801_IRQ_CAPTURE) &amp;&amp; chip-&gt;capture_substream) {</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		chip-&gt;cap_buf++;</div><div class='del'>-		chip-&gt;cap_pos += chip-&gt;cap_count;</div><div class='del'>-		chip-&gt;cap_pos %= chip-&gt;cap_size;</div><div class='del'>-		tmp = chip-&gt;cap_pos + chip-&gt;cap_count;</div><div class='del'>-		tmp %= chip-&gt;cap_size;</div><div class='del'>-		outl(chip-&gt;cap_buffer + tmp,</div><div class='del'>-				(chip-&gt;cap_buf &amp; 1) ?</div><div class='del'>-					FM801_REG(chip, CAP_BUF1) :</div><div class='del'>-					FM801_REG(chip, CAP_BUF2));</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;chip-&gt;reg_lock) {</div><div class='add'>+			chip-&gt;cap_buf++;</div><div class='add'>+			chip-&gt;cap_pos += chip-&gt;cap_count;</div><div class='add'>+			chip-&gt;cap_pos %= chip-&gt;cap_size;</div><div class='add'>+			tmp = chip-&gt;cap_pos + chip-&gt;cap_count;</div><div class='add'>+			tmp %= chip-&gt;cap_size;</div><div class='add'>+			if (chip-&gt;cap_buf &amp; 1)</div><div class='add'>+				fm801_writel(chip, CAP_BUF1, chip-&gt;cap_buffer + tmp);</div><div class='add'>+			else</div><div class='add'>+				fm801_writel(chip, CAP_BUF2, chip-&gt;cap_buffer + tmp);</div><div class='add'>+		}</div><div class='ctx'> 		snd_pcm_period_elapsed(chip-&gt;capture_substream);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (chip-&gt;rmidi &amp;&amp; (status &amp; FM801_IRQ_MPU))</div><div class='ctx'> 		snd_mpu401_uart_interrupt(irq, chip-&gt;rmidi-&gt;private_data);</div><div class='del'>-	if (status &amp; FM801_IRQ_VOLUME)</div><div class='del'>-		;/* TODO */</div><div class='add'>+	if (status &amp; FM801_IRQ_VOLUME) {</div><div class='add'>+		/* TODO */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_fm801_playback =</div><div class='add'>+static const struct snd_pcm_hardware snd_fm801_playback =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -590,7 +611,7 @@ static struct snd_pcm_hardware snd_fm801_playback =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_fm801_capture =</div><div class='add'>+static const struct snd_pcm_hardware snd_fm801_capture =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -626,7 +647,8 @@ static int snd_fm801_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 					   SNDRV_PCM_HW_PARAM_CHANNELS,</div><div class='ctx'> 					   &amp;hw_constraints_channels);</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -641,7 +663,8 @@ static int snd_fm801_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	runtime-&gt;hw = snd_fm801_capture;</div><div class='ctx'> 	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,</div><div class='ctx'> 				   &amp;hw_constraints_rates);</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -662,36 +685,30 @@ static int snd_fm801_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_fm801_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_fm801_playback_ops = {</div><div class='ctx'> 	.open =		snd_fm801_playback_open,</div><div class='ctx'> 	.close =	snd_fm801_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_fm801_hw_params,</div><div class='del'>-	.hw_free =	snd_fm801_hw_free,</div><div class='ctx'> 	.prepare =	snd_fm801_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_fm801_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_fm801_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_fm801_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_fm801_capture_ops = {</div><div class='ctx'> 	.open =		snd_fm801_capture_open,</div><div class='ctx'> 	.close =	snd_fm801_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_fm801_hw_params,</div><div class='del'>-	.hw_free =	snd_fm801_hw_free,</div><div class='ctx'> 	.prepare =	snd_fm801_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_fm801_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_fm801_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pcm ** rpcm)</div><div class='add'>+static int snd_fm801_pcm(struct fm801 *chip, int device)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(chip-&gt;dev);</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='del'>-	if ((err = snd_pcm_new(chip-&gt;card, "FM801", device, 1, 1, &amp;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "FM801", device, 1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_fm801_playback_ops);</div><div class='hunk'>@@ -699,326 +716,113 @@ static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pc</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "FM801");</div><div class='add'>+	strscpy(pcm-&gt;name, "FM801");</div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      chip-&gt;multichannel ? 128*1024 : 64*1024, 128*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &amp;pdev-&gt;dev,</div><div class='add'>+				       chip-&gt;multichannel ? 128*1024 : 64*1024, 128*1024);</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+				     snd_pcm_alt_chmaps,</div><div class='add'>+				     chip-&gt;multichannel ? 6 : 2, 0,</div><div class='add'>+				     NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  TEA5757 radio</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef TEA575X_RADIO</div><div class='del'>-</div><div class='del'>-/* 256PCS GPIO numbers */</div><div class='del'>-#define TEA_256PCS_DATA			1</div><div class='del'>-#define TEA_256PCS_WRITE_ENABLE		2	/* inverted */</div><div class='del'>-#define TEA_256PCS_BUS_CLOCK		3</div><div class='add'>+#ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='ctx'> </div><div class='del'>-static void snd_fm801_tea575x_256pcs_write(struct snd_tea575x *tea, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	int i = 25;</div><div class='add'>+/* GPIO to TEA575x maps */</div><div class='add'>+struct snd_fm801_tea575x_gpio {</div><div class='add'>+	u8 data, clk, wren, most;</div><div class='add'>+	char *name;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	/* use GPIO lines and set write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_256PCS_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK);</div><div class='del'>-	/* all of lines are in the write direction */</div><div class='del'>-	/* clear data and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_256PCS_DATA) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCS_DATA) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK) |</div><div class='del'>-		 FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE));</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	while (i--) {</div><div class='del'>-		if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-			reg |= FM801_GPIO_GP(TEA_256PCS_DATA);</div><div class='del'>-		else</div><div class='del'>-			reg &amp;= ~FM801_GPIO_GP(TEA_256PCS_DATA);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='add'>+static const struct snd_fm801_tea575x_gpio snd_fm801_tea575x_gpios[] = {</div><div class='add'>+	{ .data = 1, .clk = 3, .wren = 2, .most = 0, .name = "SF256-PCS" },</div><div class='add'>+	{ .data = 1, .clk = 0, .wren = 2, .most = 3, .name = "SF256-PCP" },</div><div class='add'>+	{ .data = 2, .clk = 0, .wren = 1, .most = 3, .name = "SF64-PCR" },</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	/* and reset the write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCS_DATA);</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='add'>+#define get_tea575x_gpio(chip) \</div><div class='add'>+	(&amp;snd_fm801_tea575x_gpios[((chip)-&gt;tea575x_tuner &amp; TUNER_TYPE_MASK) - 1])</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_fm801_tea575x_256pcs_read(struct snd_tea575x *tea)</div><div class='add'>+static void snd_fm801_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	unsigned int val = 0;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	/* use GPIO lines, set data direction to input */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_256PCS_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK) |</div><div class='del'>-	       FM801_GPIO_GD(TEA_256PCS_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCS_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE);</div><div class='del'>-	/* all of lines are in the write direction, except data */</div><div class='del'>-	/* clear data, write enable and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 24; i++) {</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		val &lt;&lt;= 1;</div><div class='del'>-		if (inw(FM801_REG(chip, GPIO_CTRL)) &amp; FM801_GPIO_GP(TEA_256PCS_DATA))</div><div class='del'>-			val |= 1;</div><div class='del'>-	}</div><div class='add'>+	unsigned short reg = fm801_readw(chip, GPIO_CTRL);</div><div class='add'>+	struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	reg &amp;= ~(FM801_GPIO_GP(gpio.data) |</div><div class='add'>+		 FM801_GPIO_GP(gpio.clk) |</div><div class='add'>+		 FM801_GPIO_GP(gpio.wren));</div><div class='ctx'> </div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='add'>+	reg |= (pins &amp; TEA575X_DATA) ? FM801_GPIO_GP(gpio.data) : 0;</div><div class='add'>+	reg |= (pins &amp; TEA575X_CLK)  ? FM801_GPIO_GP(gpio.clk) : 0;</div><div class='add'>+	/* WRITE_ENABLE is inverted */</div><div class='add'>+	reg |= (pins &amp; TEA575X_WREN) ? 0 : FM801_GPIO_GP(gpio.wren);</div><div class='ctx'> </div><div class='del'>-/* 256PCPR GPIO numbers */</div><div class='del'>-#define TEA_256PCPR_BUS_CLOCK		0</div><div class='del'>-#define TEA_256PCPR_DATA		1</div><div class='del'>-#define TEA_256PCPR_WRITE_ENABLE	2	/* inverted */</div><div class='del'>-</div><div class='del'>-static void snd_fm801_tea575x_256pcpr_write(struct snd_tea575x *tea, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	int i = 25;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	/* use GPIO lines and set write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK);</div><div class='del'>-	/* all of lines are in the write direction */</div><div class='del'>-	/* clear data and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_256PCPR_DATA) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCPR_DATA) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK) |</div><div class='del'>-		 FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE));</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	while (i--) {</div><div class='del'>-		if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-			reg |= FM801_GPIO_GP(TEA_256PCPR_DATA);</div><div class='del'>-		else</div><div class='del'>-			reg &amp;= ~FM801_GPIO_GP(TEA_256PCPR_DATA);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and reset the write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCPR_DATA);</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	fm801_writew(chip, GPIO_CTRL, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int snd_fm801_tea575x_256pcpr_read(struct snd_tea575x *tea)</div><div class='add'>+static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	unsigned int val = 0;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	/* use GPIO lines, set data direction to input */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK) |</div><div class='del'>-	       FM801_GPIO_GD(TEA_256PCPR_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCPR_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE);</div><div class='del'>-	/* all of lines are in the write direction, except data */</div><div class='del'>-	/* clear data, write enable and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 24; i++) {</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		val &lt;&lt;= 1;</div><div class='del'>-		if (inw(FM801_REG(chip, GPIO_CTRL)) &amp; FM801_GPIO_GP(TEA_256PCPR_DATA))</div><div class='del'>-			val |= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='add'>+	unsigned short reg = fm801_readw(chip, GPIO_CTRL);</div><div class='add'>+	struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='add'>+	u8 ret;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	if (reg &amp; FM801_GPIO_GP(gpio.data))</div><div class='add'>+		ret |= TEA575X_DATA;</div><div class='add'>+	if (reg &amp; FM801_GPIO_GP(gpio.most))</div><div class='add'>+		ret |= TEA575X_MOST;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* 64PCR GPIO numbers */</div><div class='del'>-#define TEA_64PCR_BUS_CLOCK		0</div><div class='del'>-#define TEA_64PCR_WRITE_ENABLE		1	/* inverted */</div><div class='del'>-#define TEA_64PCR_DATA			2</div><div class='del'>-</div><div class='del'>-static void snd_fm801_tea575x_64pcr_write(struct snd_tea575x *tea, unsigned int val)</div><div class='add'>+static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)</div><div class='ctx'> {</div><div class='ctx'> 	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	int i = 25;</div><div class='add'>+	unsigned short reg = fm801_readw(chip, GPIO_CTRL);</div><div class='add'>+	struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='ctx'> 	/* use GPIO lines and set write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_64PCR_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK);</div><div class='del'>-	/* all of lines are in the write direction */</div><div class='del'>-	/* clear data and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_64PCR_DATA) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_64PCR_DATA) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK) |</div><div class='del'>-		 FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE));</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	while (i--) {</div><div class='del'>-		if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-			reg |= FM801_GPIO_GP(TEA_64PCR_DATA);</div><div class='del'>-		else</div><div class='del'>-			reg &amp;= ~FM801_GPIO_GP(TEA_64PCR_DATA);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and reset the write enable bit */</div><div class='del'>-	reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_64PCR_DATA);</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int snd_fm801_tea575x_64pcr_read(struct snd_tea575x *tea)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-	unsigned int val = 0;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	/* use GPIO lines, set data direction to input */</div><div class='del'>-	reg |= FM801_GPIO_GS(TEA_64PCR_DATA) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) |</div><div class='del'>-	       FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK) |</div><div class='del'>-	       FM801_GPIO_GD(TEA_64PCR_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_64PCR_DATA) |</div><div class='del'>-	       FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);</div><div class='del'>-	/* all of lines are in the write direction, except data */</div><div class='del'>-	/* clear data, write enable and clock lines */</div><div class='del'>-	reg &amp;= ~(FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) |</div><div class='del'>-	         FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) |</div><div class='del'>-	         FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 24; i++) {</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);</div><div class='del'>-		outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-		udelay(1);</div><div class='del'>-		val &lt;&lt;= 1;</div><div class='del'>-		if (inw(FM801_REG(chip, GPIO_CTRL)) &amp; FM801_GPIO_GP(TEA_64PCR_DATA))</div><div class='del'>-			val |= 1;</div><div class='add'>+	reg |= FM801_GPIO_GS(gpio.data) |</div><div class='add'>+	       FM801_GPIO_GS(gpio.wren) |</div><div class='add'>+	       FM801_GPIO_GS(gpio.clk) |</div><div class='add'>+	       FM801_GPIO_GS(gpio.most);</div><div class='add'>+	if (output) {</div><div class='add'>+		/* all of lines are in the write direction */</div><div class='add'>+		/* clear data and clock lines */</div><div class='add'>+		reg &amp;= ~(FM801_GPIO_GD(gpio.data) |</div><div class='add'>+			 FM801_GPIO_GD(gpio.wren) |</div><div class='add'>+			 FM801_GPIO_GD(gpio.clk) |</div><div class='add'>+			 FM801_GPIO_GP(gpio.data) |</div><div class='add'>+			 FM801_GPIO_GP(gpio.clk) |</div><div class='add'>+			 FM801_GPIO_GP(gpio.wren));</div><div class='add'>+	} else {</div><div class='add'>+		/* use GPIO lines, set data direction to input */</div><div class='add'>+		reg |= FM801_GPIO_GD(gpio.data) |</div><div class='add'>+		       FM801_GPIO_GD(gpio.most) |</div><div class='add'>+		       FM801_GPIO_GP(gpio.data) |</div><div class='add'>+		       FM801_GPIO_GP(gpio.most) |</div><div class='add'>+		       FM801_GPIO_GP(gpio.wren);</div><div class='add'>+		/* all of lines are in the write direction, except data */</div><div class='add'>+		/* clear data, write enable and clock lines */</div><div class='add'>+		reg &amp;= ~(FM801_GPIO_GD(gpio.wren) |</div><div class='add'>+			 FM801_GPIO_GD(gpio.clk) |</div><div class='add'>+			 FM801_GPIO_GP(gpio.clk));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='add'>+	fm801_writew(chip, GPIO_CTRL, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_fm801_tea575x_64pcr_mute(struct snd_tea575x *tea,</div><div class='del'>-					  unsigned int mute)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = tea-&gt;private_data;</div><div class='del'>-	unsigned short reg;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	reg = inw(FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	if (mute)</div><div class='del'>-		/* 0xf800 (mute) */</div><div class='del'>-		reg &amp;= ~FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);</div><div class='del'>-	else</div><div class='del'>-		/* 0xf802 (unmute) */</div><div class='del'>-		reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);</div><div class='del'>-	outw(reg, FM801_REG(chip, GPIO_CTRL));</div><div class='del'>-	udelay(1);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_tea575x_ops snd_fm801_tea_ops[3] = {</div><div class='del'>-	{</div><div class='del'>-		/* 1 = MediaForte 256-PCS */</div><div class='del'>-		.write = snd_fm801_tea575x_256pcs_write,</div><div class='del'>-		.read = snd_fm801_tea575x_256pcs_read,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* 2 = MediaForte 256-PCPR */</div><div class='del'>-		.write = snd_fm801_tea575x_256pcpr_write,</div><div class='del'>-		.read = snd_fm801_tea575x_256pcpr_read,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* 3 = MediaForte 64-PCR */</div><div class='del'>-		.write = snd_fm801_tea575x_64pcr_write,</div><div class='del'>-		.read = snd_fm801_tea575x_64pcr_read,</div><div class='del'>-		.mute = snd_fm801_tea575x_64pcr_mute,</div><div class='del'>-	}</div><div class='add'>+static const struct snd_tea575x_ops snd_fm801_tea_ops = {</div><div class='add'>+	.set_pins = snd_fm801_tea575x_set_pins,</div><div class='add'>+	.get_pins = snd_fm801_tea575x_get_pins,</div><div class='add'>+	.set_direction = snd_fm801_tea575x_set_direction,</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1051,10 +855,11 @@ static int snd_fm801_get_single(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int shift = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	long *value = ucontrol-&gt;value.integer.value;</div><div class='ctx'> </div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = (inw(chip-&gt;port + reg) &gt;&gt; shift) &amp; mask;</div><div class='add'>+	value[0] = (fm801_ioread16(chip, reg) &gt;&gt; shift) &amp; mask;</div><div class='ctx'> 	if (invert)</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='add'>+		value[0] = mask - value[0];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1107,14 +912,14 @@ static int snd_fm801_get_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int shift_right = (kcontrol-&gt;private_value &gt;&gt; 12) &amp; 0x0f;</div><div class='ctx'> 	int mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	long *value = ucontrol-&gt;value.integer.value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = (inw(chip-&gt;port + reg) &gt;&gt; shift_left) &amp; mask;</div><div class='del'>-	ucontrol-&gt;value.integer.value[1] = (inw(chip-&gt;port + reg) &gt;&gt; shift_right) &amp; mask;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	value[0] = (fm801_ioread16(chip, reg) &gt;&gt; shift_left) &amp; mask;</div><div class='add'>+	value[1] = (fm801_ioread16(chip, reg) &gt;&gt; shift_right) &amp; mask;</div><div class='ctx'> 	if (invert) {</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = mask - ucontrol-&gt;value.integer.value[0];</div><div class='del'>-		ucontrol-&gt;value.integer.value[1] = mask - ucontrol-&gt;value.integer.value[1];</div><div class='add'>+		value[0] = mask - value[0];</div><div class='add'>+		value[1] = mask - value[1];</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1144,17 +949,11 @@ static int snd_fm801_put_double(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_fm801_info_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[5] = {</div><div class='add'>+	static const char * const texts[5] = {</div><div class='ctx'> 		"AC97 Primary", "FM", "I2S", "PCM", "AC97 Secondary"</div><div class='ctx'> 	};</div><div class='ctx'>  </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 4;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_fm801_get_mux(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1163,7 +962,7 @@ static int snd_fm801_get_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct fm801 *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         unsigned short val;</div><div class='ctx'>  </div><div class='del'>-	val = inw(FM801_REG(chip, REC_SRC)) &amp; 7;</div><div class='add'>+	val = fm801_readw(chip, REC_SRC) &amp; 7;</div><div class='ctx'> 	if (val &gt; 4)</div><div class='ctx'> 		val = 4;</div><div class='ctx'>         ucontrol-&gt;value.enumerated.item[0] = val;</div><div class='hunk'>@@ -1176,7 +975,8 @@ static int snd_fm801_put_mux(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct fm801 *chip = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         unsigned short val;</div><div class='ctx'>  </div><div class='del'>-        if ((val = ucontrol-&gt;value.enumerated.item[0]) &gt; 4)</div><div class='add'>+	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='add'>+	if (val &gt; 4)</div><div class='ctx'>                 return -EINVAL;</div><div class='ctx'> 	return snd_fm801_update_bits(chip, FM801_REC_SRC, 7, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -1185,7 +985,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_dsp, -3450, 150, 0);</div><div class='ctx'> </div><div class='ctx'> #define FM801_CONTROLS ARRAY_SIZE(snd_fm801_controls)</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_fm801_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_fm801_controls[] = {</div><div class='ctx'> FM801_DOUBLE_TLV("Wave Playback Volume", FM801_PCM_VOL, 0, 8, 31, 1,</div><div class='ctx'> 		 db_scale_dsp),</div><div class='ctx'> FM801_SINGLE("Wave Playback Switch", FM801_PCM_VOL, 15, 1, 1),</div><div class='hunk'>@@ -1206,7 +1006,7 @@ FM801_SINGLE("FM Playback Switch", FM801_FM_VOL, 15, 1, 1),</div><div class='ctx'> </div><div class='ctx'> #define FM801_CONTROLS_MULTI ARRAY_SIZE(snd_fm801_controls_multi)</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_fm801_controls_multi[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_fm801_controls_multi[] = {</div><div class='ctx'> FM801_SINGLE("AC97 2ch-&gt;4ch Copy Switch", FM801_CODEC_CTRL, 7, 1, 0),</div><div class='ctx'> FM801_SINGLE("AC97 18-bit Switch", FM801_CODEC_CTRL, 10, 1, 0),</div><div class='ctx'> FM801_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), FM801_I2S_MODE, 8, 1, 0),</div><div class='hunk'>@@ -1215,52 +1015,45 @@ FM801_SINGLE(SNDRV_CTL_NAME_IEC958("Raw Data ",CAPTURE,SWITCH), FM801_I2S_MODE,</div><div class='ctx'> FM801_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), FM801_GEN_CTRL, 2, 1, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void snd_fm801_mixer_free_ac97_bus(struct snd_ac97_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = bus-&gt;private_data;</div><div class='del'>-	chip-&gt;ac97_bus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_fm801_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip = ac97-&gt;private_data;</div><div class='del'>-	if (ac97-&gt;num == 0) {</div><div class='del'>-		chip-&gt;ac97 = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		chip-&gt;ac97_sec = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_fm801_mixer(struct fm801 *chip)</div><div class='add'>+static int snd_fm801_mixer(struct fm801 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 		.write = snd_fm801_codec_write,</div><div class='ctx'> 		.read = snd_fm801_codec_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;chip-&gt;ac97_bus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip-&gt;ac97_bus-&gt;private_free = snd_fm801_mixer_free_ac97_bus;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='del'>-	ac97.private_free = snd_fm801_mixer_free_ac97;</div><div class='del'>-	if ((err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97)) &lt; 0)</div><div class='add'>+	err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	if (chip-&gt;secondary) {</div><div class='ctx'> 		ac97.num = 1;</div><div class='ctx'> 		ac97.addr = chip-&gt;secondary_addr;</div><div class='del'>-		if ((err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97_sec)) &lt; 0)</div><div class='add'>+		err = snd_ac97_mixer(chip-&gt;ac97_bus, &amp;ac97, &amp;chip-&gt;ac97_sec);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; FM801_CONTROLS; i++) {</div><div class='add'>+		err = snd_ctl_add(chip-&gt;card,</div><div class='add'>+			snd_ctl_new1(&amp;snd_fm801_controls[i], chip));</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	for (i = 0; i &lt; FM801_CONTROLS; i++)</div><div class='del'>-		snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_fm801_controls[i], chip));</div><div class='ctx'> 	if (chip-&gt;multichannel) {</div><div class='del'>-		for (i = 0; i &lt; FM801_CONTROLS_MULTI; i++)</div><div class='del'>-			snd_ctl_add(chip-&gt;card, snd_ctl_new1(&amp;snd_fm801_controls_multi[i], chip));</div><div class='add'>+		for (i = 0; i &lt; FM801_CONTROLS_MULTI; i++) {</div><div class='add'>+			err = snd_ctl_add(chip-&gt;card,</div><div class='add'>+				snd_ctl_new1(&amp;snd_fm801_controls_multi[i], chip));</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1274,38 +1067,32 @@ static int wait_for_codec(struct fm801 *chip, unsigned int codec_id,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long timeout = jiffies + waits;</div><div class='ctx'> </div><div class='del'>-	outw(FM801_AC97_READ | (codec_id &lt;&lt; FM801_AC97_ADDR_SHIFT) | reg,</div><div class='del'>-	     FM801_REG(chip, AC97_CMD));</div><div class='add'>+	fm801_writew(chip, AC97_CMD,</div><div class='add'>+		     reg | (codec_id &lt;&lt; FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ);</div><div class='ctx'> 	udelay(5);</div><div class='ctx'> 	do {</div><div class='del'>-		if ((inw(FM801_REG(chip, AC97_CMD)) &amp; (FM801_AC97_VALID|FM801_AC97_BUSY))</div><div class='del'>-		    == FM801_AC97_VALID)</div><div class='add'>+		if ((fm801_readw(chip, AC97_CMD) &amp;</div><div class='add'>+		     (FM801_AC97_VALID | FM801_AC97_BUSY)) == FM801_AC97_VALID)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after(timeout, jiffies));</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_fm801_chip_init(struct fm801 *chip, int resume)</div><div class='add'>+static int reset_codec(struct fm801 *chip)</div><div class='ctx'> {</div><div class='del'>-	unsigned short cmdw;</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;tea575x_tuner &amp; TUNER_ONLY)</div><div class='del'>-		goto __ac97_ok;</div><div class='del'>-</div><div class='ctx'> 	/* codec cold reset + AC'97 warm reset */</div><div class='del'>-	outw((1&lt;&lt;5) | (1&lt;&lt;6), FM801_REG(chip, CODEC_CTRL));</div><div class='del'>-	inw(FM801_REG(chip, CODEC_CTRL)); /* flush posting data */</div><div class='add'>+	fm801_writew(chip, CODEC_CTRL, (1 &lt;&lt; 5) | (1 &lt;&lt; 6));</div><div class='add'>+	fm801_readw(chip, CODEC_CTRL); /* flush posting data */</div><div class='ctx'> 	udelay(100);</div><div class='del'>-	outw(0, FM801_REG(chip, CODEC_CTRL));</div><div class='add'>+	fm801_writew(chip, CODEC_CTRL, 0);</div><div class='ctx'> </div><div class='del'>-	if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) &lt; 0)</div><div class='del'>-		if (!resume) {</div><div class='del'>-			snd_printk(KERN_INFO "Primary AC'97 codec not found, "</div><div class='del'>-					    "assume SF64-PCR (tuner-only)\n");</div><div class='del'>-			chip-&gt;tea575x_tuner = 3 | TUNER_ONLY;</div><div class='del'>-			goto __ac97_ok;</div><div class='del'>-		}</div><div class='add'>+	return wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_fm801_chip_multichannel_init(struct fm801 *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned short cmdw;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;multichannel) {</div><div class='ctx'> 		if (chip-&gt;secondary_addr) {</div><div class='hunk'>@@ -1318,7 +1105,7 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)</div><div class='ctx'> 			for (i = 3; i &gt; 0; i--) {</div><div class='ctx'> 				if (!wait_for_codec(chip, i, AC97_VENDOR_ID1,</div><div class='ctx'> 						     msecs_to_jiffies(50))) {</div><div class='del'>-					cmdw = inw(FM801_REG(chip, AC97_DATA));</div><div class='add'>+					cmdw = fm801_readw(chip, AC97_DATA);</div><div class='ctx'> 					if (cmdw != 0xffff &amp;&amp; cmdw != 0) {</div><div class='ctx'> 						chip-&gt;secondary = 1;</div><div class='ctx'> 						chip-&gt;secondary_addr = i;</div><div class='hunk'>@@ -1332,142 +1119,144 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)</div><div class='ctx'> 		/* cause timeout problems */</div><div class='ctx'> 		wait_for_codec(chip, 0, AC97_VENDOR_ID1, msecs_to_jiffies(750));</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-      __ac97_ok:</div><div class='add'>+static void snd_fm801_chip_init(struct fm801 *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned short cmdw;</div><div class='ctx'> </div><div class='ctx'> 	/* init volume */</div><div class='del'>-	outw(0x0808, FM801_REG(chip, PCM_VOL));</div><div class='del'>-	outw(0x9f1f, FM801_REG(chip, FM_VOL));</div><div class='del'>-	outw(0x8808, FM801_REG(chip, I2S_VOL));</div><div class='add'>+	fm801_writew(chip, PCM_VOL, 0x0808);</div><div class='add'>+	fm801_writew(chip, FM_VOL, 0x9f1f);</div><div class='add'>+	fm801_writew(chip, I2S_VOL, 0x8808);</div><div class='ctx'> </div><div class='ctx'> 	/* I2S control - I2S mode */</div><div class='del'>-	outw(0x0003, FM801_REG(chip, I2S_MODE));</div><div class='add'>+	fm801_writew(chip, I2S_MODE, 0x0003);</div><div class='ctx'> </div><div class='ctx'> 	/* interrupt setup */</div><div class='del'>-	cmdw = inw(FM801_REG(chip, IRQ_MASK));</div><div class='add'>+	cmdw = fm801_readw(chip, IRQ_MASK);</div><div class='ctx'> 	if (chip-&gt;irq &lt; 0)</div><div class='ctx'> 		cmdw |= 0x00c3;		/* mask everything, no PCM nor MPU */</div><div class='ctx'> 	else</div><div class='ctx'> 		cmdw &amp;= ~0x0083;	/* unmask MPU, PLAYBACK &amp; CAPTURE */</div><div class='del'>-	outw(cmdw, FM801_REG(chip, IRQ_MASK));</div><div class='add'>+	fm801_writew(chip, IRQ_MASK, cmdw);</div><div class='ctx'> </div><div class='ctx'> 	/* interrupt clear */</div><div class='del'>-	outw(FM801_IRQ_PLAYBACK|FM801_IRQ_CAPTURE|FM801_IRQ_MPU, FM801_REG(chip, IRQ_STATUS));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	fm801_writew(chip, IRQ_STATUS,</div><div class='add'>+		     FM801_IRQ_PLAYBACK | FM801_IRQ_CAPTURE | FM801_IRQ_MPU);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int snd_fm801_free(struct fm801 *chip)</div><div class='add'>+static void snd_fm801_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct fm801 *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned short cmdw;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq &lt; 0)</div><div class='del'>-		goto __end_hw;</div><div class='del'>-</div><div class='ctx'> 	/* interrupt setup - mask everything */</div><div class='del'>-	cmdw = inw(FM801_REG(chip, IRQ_MASK));</div><div class='add'>+	cmdw = fm801_readw(chip, IRQ_MASK);</div><div class='ctx'> 	cmdw |= 0x00c3;</div><div class='del'>-	outw(cmdw, FM801_REG(chip, IRQ_MASK));</div><div class='add'>+	fm801_writew(chip, IRQ_MASK, cmdw);</div><div class='ctx'> </div><div class='del'>-      __end_hw:</div><div class='del'>-#ifdef TEA575X_RADIO</div><div class='del'>-	snd_tea575x_exit(&amp;chip-&gt;tea);</div><div class='add'>+#ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='add'>+	if (!(chip-&gt;tea575x_tuner &amp; TUNER_DISABLED)) {</div><div class='add'>+		snd_tea575x_exit(&amp;chip-&gt;tea);</div><div class='add'>+		v4l2_device_unregister(&amp;chip-&gt;v4l2_dev);</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_fm801_dev_free(struct snd_device *device)</div><div class='add'>+static int snd_fm801_create(struct snd_card *card,</div><div class='add'>+			    struct pci_dev *pci,</div><div class='add'>+			    int tea575x_tuner,</div><div class='add'>+			    int radio_nr)</div><div class='ctx'> {</div><div class='del'>-	struct fm801 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_fm801_free(chip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_fm801_create(struct snd_card *card,</div><div class='del'>-				      struct pci_dev * pci,</div><div class='del'>-				      int tea575x_tuner,</div><div class='del'>-				      struct fm801 ** rchip)</div><div class='del'>-{</div><div class='del'>-	struct fm801 *chip;</div><div class='add'>+	struct fm801 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_fm801_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	*rchip = NULL;</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='del'>-	chip-&gt;pci = pci;</div><div class='add'>+	chip-&gt;dev = &amp;pci-&gt;dev;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> 	chip-&gt;tea575x_tuner = tea575x_tuner;</div><div class='del'>-	if ((err = pci_request_regions(pci, "FM801")) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "FM801");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	chip-&gt;port = pci_resource_start(pci, 0);</div><div class='del'>-	if ((tea575x_tuner &amp; TUNER_ONLY) == 0) {</div><div class='del'>-		if (request_irq(pci-&gt;irq, snd_fm801_interrupt, IRQF_SHARED,</div><div class='del'>-				"FM801", chip)) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip-&gt;irq);</div><div class='del'>-			snd_fm801_free(chip);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-		chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-		pci_set_master(pci);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (pci-&gt;revision &gt;= 0xb1)	/* FM801-AU */</div><div class='ctx'> 		chip-&gt;multichannel = 1;</div><div class='ctx'> </div><div class='del'>-	snd_fm801_chip_init(chip, 0);</div><div class='del'>-	/* init might set tuner access method */</div><div class='del'>-	tea575x_tuner = chip-&gt;tea575x_tuner;</div><div class='add'>+	if (!(chip-&gt;tea575x_tuner &amp; TUNER_ONLY)) {</div><div class='add'>+		if (reset_codec(chip) &lt; 0) {</div><div class='add'>+			dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+				 "Primary AC'97 codec not found, assume SF64-PCR (tuner-only)\n");</div><div class='add'>+			chip-&gt;tea575x_tuner = 3 | TUNER_ONLY;</div><div class='add'>+		} else {</div><div class='add'>+			snd_fm801_chip_multichannel_init(chip);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;irq &gt;= 0 &amp;&amp; (tea575x_tuner &amp; TUNER_ONLY)) {</div><div class='del'>-		pci_clear_master(pci);</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-		chip-&gt;irq = -1;</div><div class='add'>+	if ((chip-&gt;tea575x_tuner &amp; TUNER_ONLY) == 0) {</div><div class='add'>+		if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_fm801_interrupt,</div><div class='add'>+				IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+			dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+		card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+		pci_set_master(pci);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_fm801_free(chip);</div><div class='add'>+	card-&gt;private_free = snd_fm801_free;</div><div class='add'>+	snd_fm801_chip_init(chip);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='add'>+	err = v4l2_device_register(&amp;pci-&gt;dev, &amp;chip-&gt;v4l2_dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+	chip-&gt;tea.v4l2_dev = &amp;chip-&gt;v4l2_dev;</div><div class='add'>+	chip-&gt;tea.radio_nr = radio_nr;</div><div class='add'>+	chip-&gt;tea.private_data = chip;</div><div class='add'>+	chip-&gt;tea.ops = &amp;snd_fm801_tea_ops;</div><div class='add'>+	sprintf(chip-&gt;tea.bus_info, "PCI:%s", pci_name(pci));</div><div class='add'>+	if ((chip-&gt;tea575x_tuner &amp; TUNER_TYPE_MASK) &gt; 0 &amp;&amp;</div><div class='add'>+	    (chip-&gt;tea575x_tuner &amp; TUNER_TYPE_MASK) &lt; 4) {</div><div class='add'>+		if (snd_tea575x_init(&amp;chip-&gt;tea, THIS_MODULE)) {</div><div class='add'>+			dev_err(card-&gt;dev, "TEA575x radio not found\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	} else if ((chip-&gt;tea575x_tuner &amp; TUNER_TYPE_MASK) == 0) {</div><div class='add'>+		unsigned int tuner_only = chip-&gt;tea575x_tuner &amp; TUNER_ONLY;</div><div class='add'>+</div><div class='add'>+		/* autodetect tuner connection */</div><div class='add'>+		for (tea575x_tuner = 1; tea575x_tuner &lt;= 3; tea575x_tuner++) {</div><div class='add'>+			chip-&gt;tea575x_tuner = tea575x_tuner;</div><div class='add'>+			if (!snd_tea575x_init(&amp;chip-&gt;tea, THIS_MODULE)) {</div><div class='add'>+				dev_info(card-&gt;dev,</div><div class='add'>+					 "detected TEA575x radio type %s\n",</div><div class='add'>+					   get_tea575x_gpio(chip)-&gt;name);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (tea575x_tuner == 4) {</div><div class='add'>+			dev_err(card-&gt;dev, "TEA575x radio not found\n");</div><div class='add'>+			chip-&gt;tea575x_tuner = TUNER_DISABLED;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-#ifdef TEA575X_RADIO</div><div class='del'>-	if ((tea575x_tuner &amp; TUNER_TYPE_MASK) &gt; 0 &amp;&amp;</div><div class='del'>-	    (tea575x_tuner &amp; TUNER_TYPE_MASK) &lt; 4) {</div><div class='del'>-		chip-&gt;tea.dev_nr = tea575x_tuner &gt;&gt; 16;</div><div class='del'>-		chip-&gt;tea.card = card;</div><div class='del'>-		chip-&gt;tea.freq_fixup = 10700;</div><div class='del'>-		chip-&gt;tea.private_data = chip;</div><div class='del'>-		chip-&gt;tea.ops = &amp;snd_fm801_tea_ops[(tea575x_tuner &amp; TUNER_TYPE_MASK) - 1];</div><div class='del'>-		snd_tea575x_init(&amp;chip-&gt;tea);</div><div class='add'>+		chip-&gt;tea575x_tuner |= tuner_only;</div><div class='add'>+	}</div><div class='add'>+	if (!(chip-&gt;tea575x_tuner &amp; TUNER_DISABLED)) {</div><div class='add'>+		strscpy(chip-&gt;tea.card, get_tea575x_gpio(chip)-&gt;name,</div><div class='add'>+			sizeof(chip-&gt;tea.card));</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_card_fm801_probe(struct pci_dev *pci,</div><div class='del'>-					  const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_card_fm801_probe(struct pci_dev *pci,</div><div class='add'>+				  const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='hunk'>@@ -1482,17 +1271,17 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+	err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "FM801");</div><div class='del'>-	strcpy(card-&gt;shortname, "ForteMedia FM801-");</div><div class='add'>+	strscpy(card-&gt;driver, "FM801");</div><div class='add'>+	strscpy(card-&gt;shortname, "ForteMedia FM801-");</div><div class='ctx'> 	strcat(card-&gt;shortname, chip-&gt;multichannel ? "AU" : "AS");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;port, chip-&gt;irq);</div><div class='hunk'>@@ -1500,123 +1289,108 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,</div><div class='ctx'> 	if (chip-&gt;tea575x_tuner &amp; TUNER_ONLY)</div><div class='ctx'> 		goto __fm801_tuner_only;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_fm801_pcm(chip, 0, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_fm801_pcm(chip, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_fm801_mixer(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_fm801_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,</div><div class='del'>-				       FM801_REG(chip, MPU401_DATA),</div><div class='del'>-				       MPU401_INFO_INTEGRATED,</div><div class='del'>-				       chip-&gt;irq, 0, &amp;chip-&gt;rmidi)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,</div><div class='add'>+				  chip-&gt;port + FM801_MPU401_DATA,</div><div class='add'>+				  MPU401_INFO_INTEGRATED |</div><div class='add'>+				  MPU401_INFO_IRQ_HOOK,</div><div class='add'>+				  -1, &amp;chip-&gt;rmidi);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_opl3_create(card, FM801_REG(chip, OPL3_BANK0),</div><div class='del'>-				   FM801_REG(chip, OPL3_BANK1),</div><div class='del'>-				   OPL3_HW_OPL3_FM801, 1, &amp;opl3)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3_create(card, chip-&gt;port + FM801_OPL3_BANK0,</div><div class='add'>+			      chip-&gt;port + FM801_OPL3_BANK1,</div><div class='add'>+			      OPL3_HW_OPL3_FM801, 1, &amp;opl3);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'>       __fm801_tuner_only:</div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_card_fm801_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_card_fm801_probe(struct pci_dev *pci,</div><div class='add'>+				const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_card_fm801_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static unsigned char saved_regs[] = {</div><div class='add'>+static const unsigned char saved_regs[] = {</div><div class='ctx'> 	FM801_PCM_VOL, FM801_I2S_VOL, FM801_FM_VOL, FM801_REC_SRC,</div><div class='ctx'> 	FM801_PLY_CTRL, FM801_PLY_COUNT, FM801_PLY_BUF1, FM801_PLY_BUF2,</div><div class='ctx'> 	FM801_CAP_CTRL, FM801_CAP_COUNT, FM801_CAP_BUF1, FM801_CAP_BUF2,</div><div class='ctx'> 	FM801_CODEC_CTRL, FM801_I2S_MODE, FM801_VOLUME, FM801_GEN_CTRL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int snd_fm801_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int snd_fm801_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct fm801 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	snd_pcm_suspend_all(chip-&gt;pcm);</div><div class='del'>-	snd_ac97_suspend(chip-&gt;ac97);</div><div class='del'>-	snd_ac97_suspend(chip-&gt;ac97_sec);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(saved_regs); i++)</div><div class='del'>-		chip-&gt;saved_regs[i] = inw(chip-&gt;port + saved_regs[i]);</div><div class='del'>-	/* FIXME: tea575x suspend */</div><div class='add'>+		chip-&gt;saved_regs[i] = fm801_ioread16(chip, saved_regs[i]);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;tea575x_tuner &amp; TUNER_ONLY) {</div><div class='add'>+		/* FIXME: tea575x suspend */</div><div class='add'>+	} else {</div><div class='add'>+		snd_ac97_suspend(chip-&gt;ac97);</div><div class='add'>+		snd_ac97_suspend(chip-&gt;ac97_sec);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_fm801_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_fm801_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct fm801 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "fm801: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='add'>+	if (chip-&gt;tea575x_tuner &amp; TUNER_ONLY) {</div><div class='add'>+		snd_fm801_chip_init(chip);</div><div class='add'>+	} else {</div><div class='add'>+		reset_codec(chip);</div><div class='add'>+		snd_fm801_chip_multichannel_init(chip);</div><div class='add'>+		snd_fm801_chip_init(chip);</div><div class='add'>+		snd_ac97_resume(chip-&gt;ac97);</div><div class='add'>+		snd_ac97_resume(chip-&gt;ac97_sec);</div><div class='ctx'> 	}</div><div class='del'>-	pci_set_master(pci);</div><div class='ctx'> </div><div class='del'>-	snd_fm801_chip_init(chip, 1);</div><div class='del'>-	snd_ac97_resume(chip-&gt;ac97);</div><div class='del'>-	snd_ac97_resume(chip-&gt;ac97_sec);</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(saved_regs); i++)</div><div class='del'>-		outw(chip-&gt;saved_regs[i], chip-&gt;port + saved_regs[i]);</div><div class='add'>+		fm801_iowrite16(chip, saved_regs[i], chip-&gt;saved_regs[i]);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_FM801_TEA575X_BOOL</div><div class='add'>+	if (!(chip-&gt;tea575x_tuner &amp; TUNER_DISABLED))</div><div class='add'>+		snd_tea575x_set_freq(&amp;chip-&gt;tea);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "FM801",</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(snd_fm801_pm, snd_fm801_suspend, snd_fm801_resume);</div><div class='add'>+</div><div class='add'>+static struct pci_driver fm801_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_fm801_ids,</div><div class='ctx'> 	.probe = snd_card_fm801_probe,</div><div class='del'>-	.remove = __devexit_p(snd_card_fm801_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_fm801_suspend,</div><div class='del'>-	.resume = snd_fm801_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;snd_fm801_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_fm801_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_fm801_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_fm801_init)</div><div class='del'>-module_exit(alsa_card_fm801_exit)</div><div class='add'>+module_pci_driver(fm801_driver);</div><div class='head'>diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig<br/>deleted file mode 100644<br/>index 0ea5cc60ac78..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/Kconfig?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-menuconfig SND_HDA_INTEL</div><div class='del'>-	tristate "Intel HD Audio"</div><div class='del'>-	select SND_PCM</div><div class='del'>-	select SND_VMASTER</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include support for Intel "High Definition</div><div class='del'>-	  Audio" (Azalia) and its compatible devices.</div><div class='del'>-</div><div class='del'>-	  This option enables the HD-audio controller.  Don't forget</div><div class='del'>-	  to choose the appropriate codec options below.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module</div><div class='del'>-	  will be called snd-hda-intel.</div><div class='del'>-</div><div class='del'>-if SND_HDA_INTEL</div><div class='del'>-</div><div class='del'>-config SND_HDA_HWDEP</div><div class='del'>-	bool "Build hwdep interface for HD-audio driver"</div><div class='del'>-	select SND_HWDEP</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to build a hwdep interface for HD-audio driver.</div><div class='del'>-	  This interface can be used for out-of-band communication</div><div class='del'>-	  with codecs for debugging purposes.</div><div class='del'>-</div><div class='del'>-config SND_HDA_RECONFIG</div><div class='del'>-	bool "Allow dynamic codec reconfiguration (EXPERIMENTAL)"</div><div class='del'>-	depends on SND_HDA_HWDEP &amp;&amp; EXPERIMENTAL</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable the HD-audio codec re-configuration feature.</div><div class='del'>-	  This adds the sysfs interfaces to allow user to clear the whole</div><div class='del'>-	  codec configuration, change the codec setup, add extra verbs,</div><div class='del'>-	  and re-configure the codec dynamically.</div><div class='del'>-</div><div class='del'>-config SND_HDA_INPUT_BEEP</div><div class='del'>-	bool "Support digital beep via input layer"</div><div class='del'>-	depends on INPUT=y || INPUT=SND_HDA_INTEL</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to build a digital beep interface for HD-audio</div><div class='del'>-	  driver. This interface is used to generate digital beeps.</div><div class='del'>-</div><div class='del'>-config SND_HDA_INPUT_BEEP_MODE</div><div class='del'>-	int "Digital beep registration mode (0=off, 1=on, 2=mute sw on/off)"</div><div class='del'>-	depends on SND_HDA_INPUT_BEEP=y</div><div class='del'>-	default "1"</div><div class='del'>-	range 0 2</div><div class='del'>-	help</div><div class='del'>-	  Set 0 to disable the digital beep interface for HD-audio by default.</div><div class='del'>-	  Set 1 to always enable the digital beep interface for HD-audio by</div><div class='del'>-	  default. Set 2 to control the beep device registration to input</div><div class='del'>-	  layer using a "Beep Switch" in mixer applications.</div><div class='del'>-</div><div class='del'>-config SND_HDA_INPUT_JACK</div><div class='del'>-	bool "Support jack plugging notification via input layer"</div><div class='del'>-	depends on INPUT=y || INPUT=SND</div><div class='del'>-	select SND_JACK</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable the jack plugging notification via</div><div class='del'>-	  input layer.</div><div class='del'>-</div><div class='del'>-config SND_HDA_PATCH_LOADER</div><div class='del'>-	bool "Support initialization patch loading for HD-audio"</div><div class='del'>-	depends on EXPERIMENTAL</div><div class='del'>-	select FW_LOADER</div><div class='del'>-	select SND_HDA_HWDEP</div><div class='del'>-	select SND_HDA_RECONFIG</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to allow the HD-audio driver to load a pseudo</div><div class='del'>-	  firmware file ("patch") for overriding the BIOS setup at</div><div class='del'>-	  start up.  The "patch" file can be specified via patch module</div><div class='del'>-	  option, such as patch=hda-init.</div><div class='del'>-</div><div class='del'>-	  This option turns on hwdep and reconfig features automatically.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_REALTEK</div><div class='del'>-	bool "Build Realtek HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Realtek HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as ALC880.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-realtek.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_ANALOG</div><div class='del'>-	bool "Build Analog Device HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Analog Device HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as AD1986A.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-analog.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_SIGMATEL</div><div class='del'>-	bool "Build IDT/Sigmatel HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include IDT (Sigmatel) HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as STAC9200.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-idt.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_VIA</div><div class='del'>-	bool "Build VIA HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include VIA HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as VT1708.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-via.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_HDMI</div><div class='del'>-	bool "Build HDMI/DisplayPort HD-audio codec support"</div><div class='del'>-	select SND_DYNAMIC_MINORS</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include HDMI and DisplayPort HD-audio codec</div><div class='del'>-	  support in snd-hda-intel driver.  This includes all AMD/ATI,</div><div class='del'>-	  Intel and Nvidia HDMI/DisplayPort codecs.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-hdmi.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_CIRRUS</div><div class='del'>-	bool "Build Cirrus Logic codec support"</div><div class='del'>-	depends on SND_HDA_INTEL</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Cirrus Logic codec support in</div><div class='del'>-	  snd-hda-intel driver, such as CS4206.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-cirrus.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_CONEXANT</div><div class='del'>-	bool "Build Conexant HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Conexant HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as CX20549.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-conexant.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_CA0110</div><div class='del'>-	bool "Build Creative CA0110-IBG codec support"</div><div class='del'>-	depends on SND_HDA_INTEL</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Creative CA0110-IBG codec support in</div><div class='del'>-	  snd-hda-intel driver, found on some Creative X-Fi cards.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-ca0110.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_CMEDIA</div><div class='del'>-	bool "Build C-Media HD-audio codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include C-Media HD-audio codec support in</div><div class='del'>-	  snd-hda-intel driver, such as CMI9880.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-cmedia.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_CODEC_SI3054</div><div class='del'>-	bool "Build Silicon Labs 3054 HD-modem codec support"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to include Silicon Labs 3054 HD-modem codec</div><div class='del'>-	  (and compatibles) support in snd-hda-intel driver.</div><div class='del'>-</div><div class='del'>-	  When the HD-audio driver is built as a module, the codec</div><div class='del'>-	  support code is also built as another module,</div><div class='del'>-	  snd-hda-codec-si3054.</div><div class='del'>-	  This module is automatically loaded at probing.</div><div class='del'>-</div><div class='del'>-config SND_HDA_GENERIC</div><div class='del'>-	bool "Enable generic HD-audio codec parser"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable the generic HD-audio codec parser</div><div class='del'>-	  in snd-hda-intel driver.</div><div class='del'>-</div><div class='del'>-config SND_HDA_POWER_SAVE</div><div class='del'>-	bool "Aggressive power-saving on HD-audio"</div><div class='del'>-	help</div><div class='del'>-	  Say Y here to enable more aggressive power-saving mode on</div><div class='del'>-	  HD-audio driver.  The power-saving timeout can be configured</div><div class='del'>-	  via power_save option or over sysfs on-the-fly.</div><div class='del'>-</div><div class='del'>-config SND_HDA_POWER_SAVE_DEFAULT</div><div class='del'>-	int "Default time-out for HD-audio power-save mode"</div><div class='del'>-	depends on SND_HDA_POWER_SAVE</div><div class='del'>-	default 0</div><div class='del'>-	help</div><div class='del'>-	  The default time-out value in seconds for HD-audio automatic</div><div class='del'>-	  power-save mode.  0 means to disable the power-save mode.</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile<br/>deleted file mode 100644<br/>index 17ef3658f34b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-snd-hda-intel-objs := hda_intel.o</div><div class='del'>-</div><div class='del'>-snd-hda-codec-y := hda_codec.o</div><div class='del'>-snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o</div><div class='del'>-snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o</div><div class='del'>-snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o</div><div class='del'>-snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o</div><div class='del'>-</div><div class='del'>-snd-hda-codec-realtek-objs :=	patch_realtek.o</div><div class='del'>-snd-hda-codec-cmedia-objs :=	patch_cmedia.o</div><div class='del'>-snd-hda-codec-analog-objs :=	patch_analog.o</div><div class='del'>-snd-hda-codec-idt-objs :=	patch_sigmatel.o</div><div class='del'>-snd-hda-codec-si3054-objs :=	patch_si3054.o</div><div class='del'>-snd-hda-codec-cirrus-objs :=	patch_cirrus.o</div><div class='del'>-snd-hda-codec-ca0110-objs :=	patch_ca0110.o</div><div class='del'>-snd-hda-codec-conexant-objs :=	patch_conexant.o</div><div class='del'>-snd-hda-codec-via-objs :=	patch_via.o</div><div class='del'>-snd-hda-codec-hdmi-objs :=	patch_hdmi.o hda_eld.o</div><div class='del'>-</div><div class='del'>-# common driver</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o</div><div class='del'>-</div><div class='del'>-# codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans)</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_REALTEK</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-realtek.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_CMEDIA</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cmedia.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_ANALOG</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-analog.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_SIGMATEL</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-idt.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_SI3054</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-si3054.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_CIRRUS</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cirrus.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_CA0110</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-ca0110.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_CONEXANT</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-conexant.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_VIA</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-via.o</div><div class='del'>-endif</div><div class='del'>-ifdef CONFIG_SND_HDA_CODEC_HDMI</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-hdmi.o</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# this must be the last entry after codec drivers;</div><div class='del'>-# otherwise the codec patches won't be hooked before the PCI probe</div><div class='del'>-# when built in kernel</div><div class='del'>-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o</div><div class='head'>diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c<br/>deleted file mode 100644<br/>index 29714c818b53..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_beep.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_beep.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,267 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Digital Beep Input Interface for HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Author: Matthew Ranostay &lt;mranostay@embeddedalley.com&gt;</div><div class='del'>- * Copyright (c) 2008 Embedded Alley Solutions Inc</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/input.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DIGBEEP_HZ_STEP = 46875,	/* 46.875 Hz */</div><div class='del'>-	DIGBEEP_HZ_MIN = 93750,		/* 93.750 Hz */</div><div class='del'>-	DIGBEEP_HZ_MAX = 12000000,	/* 12 KHz */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void snd_hda_generate_beep(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep =</div><div class='del'>-		container_of(work, struct hda_beep, beep_work);</div><div class='del'>-	struct hda_codec *codec = beep-&gt;codec;</div><div class='del'>-</div><div class='del'>-	if (!beep-&gt;enabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* generate tone */</div><div class='del'>-	snd_hda_codec_write(codec, beep-&gt;nid, 0,</div><div class='del'>-			AC_VERB_SET_BEEP_CONTROL, beep-&gt;tone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (non-standard) Linear beep tone calculation for IDT/STAC codecs </div><div class='del'>- *</div><div class='del'>- * The tone frequency of beep generator on IDT/STAC codecs is</div><div class='del'>- * defined from the 8bit tone parameter, in Hz,</div><div class='del'>- *    freq = 48000 * (257 - tone) / 1024</div><div class='del'>- * that is from 12kHz to 93.75Hz in steps of 46.875 Hz</div><div class='del'>- */</div><div class='del'>-static int beep_linear_tone(struct hda_beep *beep, int hz)</div><div class='del'>-{</div><div class='del'>-	if (hz &lt;= 0)</div><div class='del'>-		return 0;</div><div class='del'>-	hz *= 1000; /* fixed point */</div><div class='del'>-	hz = hz - DIGBEEP_HZ_MIN</div><div class='del'>-		+ DIGBEEP_HZ_STEP / 2; /* round to nearest step */</div><div class='del'>-	if (hz &lt; 0)</div><div class='del'>-		hz = 0; /* turn off PC beep*/</div><div class='del'>-	else if (hz &gt;= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN))</div><div class='del'>-		hz = 1; /* max frequency */</div><div class='del'>-	else {</div><div class='del'>-		hz /= DIGBEEP_HZ_STEP;</div><div class='del'>-		hz = 255 - hz;</div><div class='del'>-	}</div><div class='del'>-	return hz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HD-audio standard beep tone parameter calculation</div><div class='del'>- *</div><div class='del'>- * The tone frequency in Hz is calculated as</div><div class='del'>- *   freq = 48000 / (tone * 4)</div><div class='del'>- * from 47Hz to 12kHz</div><div class='del'>- */</div><div class='del'>-static int beep_standard_tone(struct hda_beep *beep, int hz)</div><div class='del'>-{</div><div class='del'>-	if (hz &lt;= 0)</div><div class='del'>-		return 0; /* disabled */</div><div class='del'>-	hz = 12000 / hz;</div><div class='del'>-	if (hz &gt; 0xff)</div><div class='del'>-		return 0xff;</div><div class='del'>-	if (hz &lt;= 0)</div><div class='del'>-		return 1;</div><div class='del'>-	return hz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,</div><div class='del'>-				unsigned int code, int hz)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep = input_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	switch (code) {</div><div class='del'>-	case SND_BELL:</div><div class='del'>-		if (hz)</div><div class='del'>-			hz = 1000;</div><div class='del'>-	case SND_TONE:</div><div class='del'>-		if (beep-&gt;linear_tone)</div><div class='del'>-			beep-&gt;tone = beep_linear_tone(beep, hz);</div><div class='del'>-		else</div><div class='del'>-			beep-&gt;tone = beep_standard_tone(beep, hz);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* schedule beep event */</div><div class='del'>-	schedule_work(&amp;beep-&gt;beep_work);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_hda_do_detach(struct hda_beep *beep)</div><div class='del'>-{</div><div class='del'>-	input_unregister_device(beep-&gt;dev);</div><div class='del'>-	beep-&gt;dev = NULL;</div><div class='del'>-	cancel_work_sync(&amp;beep-&gt;beep_work);</div><div class='del'>-	/* turn off beep for sure */</div><div class='del'>-	snd_hda_codec_write(beep-&gt;codec, beep-&gt;nid, 0,</div><div class='del'>-				  AC_VERB_SET_BEEP_CONTROL, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_do_attach(struct hda_beep *beep)</div><div class='del'>-{</div><div class='del'>-	struct input_dev *input_dev;</div><div class='del'>-	struct hda_codec *codec = beep-&gt;codec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	input_dev = input_allocate_device();</div><div class='del'>-	if (!input_dev) {</div><div class='del'>-		printk(KERN_INFO "hda_beep: unable to allocate input device\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* setup digital beep device */</div><div class='del'>-	input_dev-&gt;name = "HDA Digital PCBeep";</div><div class='del'>-	input_dev-&gt;phys = beep-&gt;phys;</div><div class='del'>-	input_dev-&gt;id.bustype = BUS_PCI;</div><div class='del'>-</div><div class='del'>-	input_dev-&gt;id.vendor = codec-&gt;vendor_id &gt;&gt; 16;</div><div class='del'>-	input_dev-&gt;id.product = codec-&gt;vendor_id &amp; 0xffff;</div><div class='del'>-	input_dev-&gt;id.version = 0x01;</div><div class='del'>-</div><div class='del'>-	input_dev-&gt;evbit[0] = BIT_MASK(EV_SND);</div><div class='del'>-	input_dev-&gt;sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);</div><div class='del'>-	input_dev-&gt;event = snd_hda_beep_event;</div><div class='del'>-	input_dev-&gt;dev.parent = &amp;codec-&gt;bus-&gt;pci-&gt;dev;</div><div class='del'>-	input_set_drvdata(input_dev, beep);</div><div class='del'>-</div><div class='del'>-	err = input_register_device(input_dev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		input_free_device(input_dev);</div><div class='del'>-		printk(KERN_INFO "hda_beep: unable to register input device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	beep-&gt;dev = input_dev;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_hda_do_register(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep =</div><div class='del'>-		container_of(work, struct hda_beep, register_work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;beep-&gt;mutex);</div><div class='del'>-	if (beep-&gt;enabled &amp;&amp; !beep-&gt;dev)</div><div class='del'>-		snd_hda_do_attach(beep);</div><div class='del'>-	mutex_unlock(&amp;beep-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void snd_hda_do_unregister(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep =</div><div class='del'>-		container_of(work, struct hda_beep, unregister_work.work);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;beep-&gt;mutex);</div><div class='del'>-	if (!beep-&gt;enabled &amp;&amp; beep-&gt;dev)</div><div class='del'>-		snd_hda_do_detach(beep);</div><div class='del'>-	mutex_unlock(&amp;beep-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep = codec-&gt;beep;</div><div class='del'>-	enable = !!enable;</div><div class='del'>-	if (beep == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	if (beep-&gt;enabled != enable) {</div><div class='del'>-		beep-&gt;enabled = enable;</div><div class='del'>-		if (!enable) {</div><div class='del'>-			/* turn off beep */</div><div class='del'>-			snd_hda_codec_write(beep-&gt;codec, beep-&gt;nid, 0,</div><div class='del'>-						  AC_VERB_SET_BEEP_CONTROL, 0);</div><div class='del'>-		}</div><div class='del'>-		if (beep-&gt;mode == HDA_BEEP_MODE_SWREG) {</div><div class='del'>-			if (enable) {</div><div class='del'>-				cancel_delayed_work(&amp;beep-&gt;unregister_work);</div><div class='del'>-				schedule_work(&amp;beep-&gt;register_work);</div><div class='del'>-			} else {</div><div class='del'>-				schedule_delayed_work(&amp;beep-&gt;unregister_work,</div><div class='del'>-									   HZ);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_enable_beep_device);</div><div class='del'>-</div><div class='del'>-int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep;</div><div class='del'>-</div><div class='del'>-	if (!snd_hda_get_bool_hint(codec, "beep"))</div><div class='del'>-		return 0; /* disabled explicitly by hints */</div><div class='del'>-	if (codec-&gt;beep_mode == HDA_BEEP_MODE_OFF)</div><div class='del'>-		return 0; /* disabled by module option */</div><div class='del'>-</div><div class='del'>-	beep = kzalloc(sizeof(*beep), GFP_KERNEL);</div><div class='del'>-	if (beep == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	snprintf(beep-&gt;phys, sizeof(beep-&gt;phys),</div><div class='del'>-		"card%d/codec#%d/beep0", codec-&gt;bus-&gt;card-&gt;number, codec-&gt;addr);</div><div class='del'>-	/* enable linear scale */</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-		AC_VERB_SET_DIGI_CONVERT_2, 0x01);</div><div class='del'>-</div><div class='del'>-	beep-&gt;nid = nid;</div><div class='del'>-	beep-&gt;codec = codec;</div><div class='del'>-	beep-&gt;mode = codec-&gt;beep_mode;</div><div class='del'>-	codec-&gt;beep = beep;</div><div class='del'>-</div><div class='del'>-	INIT_WORK(&amp;beep-&gt;register_work, &amp;snd_hda_do_register);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;beep-&gt;unregister_work, &amp;snd_hda_do_unregister);</div><div class='del'>-	INIT_WORK(&amp;beep-&gt;beep_work, &amp;snd_hda_generate_beep);</div><div class='del'>-	mutex_init(&amp;beep-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (beep-&gt;mode == HDA_BEEP_MODE_ON) {</div><div class='del'>-		int err = snd_hda_do_attach(beep);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			kfree(beep);</div><div class='del'>-			codec-&gt;beep = NULL;</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_attach_beep_device);</div><div class='del'>-</div><div class='del'>-void snd_hda_detach_beep_device(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_beep *beep = codec-&gt;beep;</div><div class='del'>-	if (beep) {</div><div class='del'>-		cancel_work_sync(&amp;beep-&gt;register_work);</div><div class='del'>-		cancel_delayed_work(&amp;beep-&gt;unregister_work);</div><div class='del'>-		if (beep-&gt;dev)</div><div class='del'>-			snd_hda_do_detach(beep);</div><div class='del'>-		codec-&gt;beep = NULL;</div><div class='del'>-		kfree(beep);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device);</div><div class='head'>diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h<br/>deleted file mode 100644<br/>index f1de1bac042c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_beep.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_beep.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Digital Beep Input Interface for HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Author: Matthew Ranostay &lt;mranostay@embeddedalley.com&gt;</div><div class='del'>- * Copyright (c) 2008 Embedded Alley Solutions Inc</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SOUND_HDA_BEEP_H</div><div class='del'>-#define __SOUND_HDA_BEEP_H</div><div class='del'>-</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-</div><div class='del'>-#define HDA_BEEP_MODE_OFF	0</div><div class='del'>-#define HDA_BEEP_MODE_ON	1</div><div class='del'>-#define HDA_BEEP_MODE_SWREG	2</div><div class='del'>-</div><div class='del'>-/* beep information */</div><div class='del'>-struct hda_beep {</div><div class='del'>-	struct input_dev *dev;</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	unsigned int mode;</div><div class='del'>-	char phys[32];</div><div class='del'>-	int tone;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	unsigned int enabled:1;</div><div class='del'>-	unsigned int request_enable:1;</div><div class='del'>-	unsigned int linear_tone:1;	/* linear tone for IDT/STAC codec */</div><div class='del'>-	struct work_struct register_work; /* registration work */</div><div class='del'>-	struct delayed_work unregister_work; /* unregistration work */</div><div class='del'>-	struct work_struct beep_work; /* scheduled task for beep event */</div><div class='del'>-	struct mutex mutex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);</div><div class='del'>-int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);</div><div class='del'>-void snd_hda_detach_beep_device(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-#define snd_hda_attach_beep_device(...)		0</div><div class='del'>-#define snd_hda_detach_beep_device(...)</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='head'>diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c<br/>deleted file mode 100644<br/>index 644e3f14f8ca..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_codec.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_codec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4949 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include &lt;sound/asoundef.h&gt;</div><div class='del'>-#include &lt;sound/tlv.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-#include &lt;sound/hda_hwdep.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vendor / preset table</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct hda_vendor_id {</div><div class='del'>-	unsigned int id;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* codec vendor labels */</div><div class='del'>-static struct hda_vendor_id hda_vendor_ids[] = {</div><div class='del'>-	{ 0x1002, "ATI" },</div><div class='del'>-	{ 0x1013, "Cirrus Logic" },</div><div class='del'>-	{ 0x1057, "Motorola" },</div><div class='del'>-	{ 0x1095, "Silicon Image" },</div><div class='del'>-	{ 0x10de, "Nvidia" },</div><div class='del'>-	{ 0x10ec, "Realtek" },</div><div class='del'>-	{ 0x1102, "Creative" },</div><div class='del'>-	{ 0x1106, "VIA" },</div><div class='del'>-	{ 0x111d, "IDT" },</div><div class='del'>-	{ 0x11c1, "LSI" },</div><div class='del'>-	{ 0x11d4, "Analog Devices" },</div><div class='del'>-	{ 0x13f6, "C-Media" },</div><div class='del'>-	{ 0x14f1, "Conexant" },</div><div class='del'>-	{ 0x17e8, "Chrontel" },</div><div class='del'>-	{ 0x1854, "LG" },</div><div class='del'>-	{ 0x1aec, "Wolfson Microelectronics" },</div><div class='del'>-	{ 0x434d, "C-Media" },</div><div class='del'>-	{ 0x8086, "Intel" },</div><div class='del'>-	{ 0x8384, "SigmaTel" },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DEFINE_MUTEX(preset_mutex);</div><div class='del'>-static LIST_HEAD(hda_preset_tables);</div><div class='del'>-</div><div class='del'>-int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;preset_mutex);</div><div class='del'>-	list_add_tail(&amp;preset-&gt;list, &amp;hda_preset_tables);</div><div class='del'>-	mutex_unlock(&amp;preset_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_add_codec_preset);</div><div class='del'>-</div><div class='del'>-int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;preset_mutex);</div><div class='del'>-	list_del(&amp;preset-&gt;list);</div><div class='del'>-	mutex_unlock(&amp;preset_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static void hda_power_work(struct work_struct *work);</div><div class='del'>-static void hda_keep_power_on(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-static inline void hda_keep_power_on(struct hda_codec *codec) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_get_jack_location - Give a location string of the jack</div><div class='del'>- * @cfg: pin default config value</div><div class='del'>- *</div><div class='del'>- * Parse the pin default config value and returns the string of the</div><div class='del'>- * jack location, e.g. "Rear", "Front", etc.</div><div class='del'>- */</div><div class='del'>-const char *snd_hda_get_jack_location(u32 cfg)</div><div class='del'>-{</div><div class='del'>-	static char *bases[7] = {</div><div class='del'>-		"N/A", "Rear", "Front", "Left", "Right", "Top", "Bottom",</div><div class='del'>-	};</div><div class='del'>-	static unsigned char specials_idx[] = {</div><div class='del'>-		0x07, 0x08,</div><div class='del'>-		0x17, 0x18, 0x19,</div><div class='del'>-		0x37, 0x38</div><div class='del'>-	};</div><div class='del'>-	static char *specials[] = {</div><div class='del'>-		"Rear Panel", "Drive Bar",</div><div class='del'>-		"Riser", "HDMI", "ATAPI",</div><div class='del'>-		"Mobile-In", "Mobile-Out"</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-	cfg = (cfg &amp; AC_DEFCFG_LOCATION) &gt;&gt; AC_DEFCFG_LOCATION_SHIFT;</div><div class='del'>-	if ((cfg &amp; 0x0f) &lt; 7)</div><div class='del'>-		return bases[cfg &amp; 0x0f];</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(specials_idx); i++) {</div><div class='del'>-		if (cfg == specials_idx[i])</div><div class='del'>-			return specials[i];</div><div class='del'>-	}</div><div class='del'>-	return "UNKNOWN";</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_jack_location);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_get_jack_connectivity - Give a connectivity string of the jack</div><div class='del'>- * @cfg: pin default config value</div><div class='del'>- *</div><div class='del'>- * Parse the pin default config value and returns the string of the</div><div class='del'>- * jack connectivity, i.e. external or internal connection.</div><div class='del'>- */</div><div class='del'>-const char *snd_hda_get_jack_connectivity(u32 cfg)</div><div class='del'>-{</div><div class='del'>-	static char *jack_locations[4] = { "Ext", "Int", "Sep", "Oth" };</div><div class='del'>-</div><div class='del'>-	return jack_locations[(cfg &gt;&gt; (AC_DEFCFG_LOCATION_SHIFT + 4)) &amp; 3];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_jack_connectivity);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_get_jack_type - Give a type string of the jack</div><div class='del'>- * @cfg: pin default config value</div><div class='del'>- *</div><div class='del'>- * Parse the pin default config value and returns the string of the</div><div class='del'>- * jack type, i.e. the purpose of the jack, such as Line-Out or CD.</div><div class='del'>- */</div><div class='del'>-const char *snd_hda_get_jack_type(u32 cfg)</div><div class='del'>-{</div><div class='del'>-	static char *jack_types[16] = {</div><div class='del'>-		"Line Out", "Speaker", "HP Out", "CD",</div><div class='del'>-		"SPDIF Out", "Digital Out", "Modem Line", "Modem Hand",</div><div class='del'>-		"Line In", "Aux", "Mic", "Telephony",</div><div class='del'>-		"SPDIF In", "Digitial In", "Reserved", "Other"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	return jack_types[(cfg &amp; AC_DEFCFG_DEVICE)</div><div class='del'>-				&gt;&gt; AC_DEFCFG_DEVICE_SHIFT];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_jack_type);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compose a 32bit command word to be sent to the HD-audio controller</div><div class='del'>- */</div><div class='del'>-static inline unsigned int</div><div class='del'>-make_codec_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,</div><div class='del'>-	       unsigned int verb, unsigned int parm)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	if ((codec-&gt;addr &amp; ~0xf) || (direct &amp; ~1) || (nid &amp; ~0x7f) ||</div><div class='del'>-	    (verb &amp; ~0xfff) || (parm &amp; ~0xffff)) {</div><div class='del'>-		printk(KERN_ERR "hda-codec: out of range cmd %x:%x:%x:%x:%x\n",</div><div class='del'>-		       codec-&gt;addr, direct, nid, verb, parm);</div><div class='del'>-		return ~0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = (u32)codec-&gt;addr &lt;&lt; 28;</div><div class='del'>-	val |= (u32)direct &lt;&lt; 27;</div><div class='del'>-	val |= (u32)nid &lt;&lt; 20;</div><div class='del'>-	val |= verb &lt;&lt; 8;</div><div class='del'>-	val |= parm;</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Send and receive a verb</div><div class='del'>- */</div><div class='del'>-static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd,</div><div class='del'>-			   unsigned int *res)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus = codec-&gt;bus;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (cmd == ~0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (res)</div><div class='del'>-		*res = -1;</div><div class='del'>- again:</div><div class='del'>-	snd_hda_power_up(codec);</div><div class='del'>-	mutex_lock(&amp;bus-&gt;cmd_mutex);</div><div class='del'>-	err = bus-&gt;ops.command(bus, cmd);</div><div class='del'>-	if (!err &amp;&amp; res)</div><div class='del'>-		*res = bus-&gt;ops.get_response(bus, codec-&gt;addr);</div><div class='del'>-	mutex_unlock(&amp;bus-&gt;cmd_mutex);</div><div class='del'>-	snd_hda_power_down(codec);</div><div class='del'>-	if (res &amp;&amp; *res == -1 &amp;&amp; bus-&gt;rirb_error) {</div><div class='del'>-		if (bus-&gt;response_reset) {</div><div class='del'>-			snd_printd("hda_codec: resetting BUS due to "</div><div class='del'>-				   "fatal communication error\n");</div><div class='del'>-			bus-&gt;ops.bus_reset(bus);</div><div class='del'>-		}</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-	/* clear reset-flag when the communication gets recovered */</div><div class='del'>-	if (!err)</div><div class='del'>-		bus-&gt;response_reset = 0;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_read - send a command and get the response</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to send the command</div><div class='del'>- * @direct: direct flag</div><div class='del'>- * @verb: the verb to send</div><div class='del'>- * @parm: the parameter for the verb</div><div class='del'>- *</div><div class='del'>- * Send a single command and read the corresponding response.</div><div class='del'>- *</div><div class='del'>- * Returns the obtained response value, or -1 for an error.</div><div class='del'>- */</div><div class='del'>-unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				int direct,</div><div class='del'>-				unsigned int verb, unsigned int parm)</div><div class='del'>-{</div><div class='del'>-	unsigned cmd = make_codec_cmd(codec, nid, direct, verb, parm);</div><div class='del'>-	unsigned int res;</div><div class='del'>-	codec_exec_verb(codec, cmd, &amp;res);</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_read);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_write - send a single command without waiting for response</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to send the command</div><div class='del'>- * @direct: direct flag</div><div class='del'>- * @verb: the verb to send</div><div class='del'>- * @parm: the parameter for the verb</div><div class='del'>- *</div><div class='del'>- * Send a single command without waiting for response.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,</div><div class='del'>-			 unsigned int verb, unsigned int parm)</div><div class='del'>-{</div><div class='del'>-	unsigned int cmd = make_codec_cmd(codec, nid, direct, verb, parm);</div><div class='del'>-	unsigned int res;</div><div class='del'>-	return codec_exec_verb(codec, cmd,</div><div class='del'>-			       codec-&gt;bus-&gt;sync_write ? &amp;res : NULL);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_write);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_sequence_write - sequence writes</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @seq: VERB array to send</div><div class='del'>- *</div><div class='del'>- * Send the commands sequentially from the given array.</div><div class='del'>- * The array must be terminated with NID=0.</div><div class='del'>- */</div><div class='del'>-void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq)</div><div class='del'>-{</div><div class='del'>-	for (; seq-&gt;nid; seq++)</div><div class='del'>-		snd_hda_codec_write(codec, seq-&gt;nid, 0, seq-&gt;verb, seq-&gt;param);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_sequence_write);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_get_sub_nodes - get the range of sub nodes</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to parse</div><div class='del'>- * @start_id: the pointer to store the start NID</div><div class='del'>- *</div><div class='del'>- * Parse the NID and store the start NID of its sub-nodes.</div><div class='del'>- * Returns the number of sub-nodes.</div><div class='del'>- */</div><div class='del'>-int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			  hda_nid_t *start_id)</div><div class='del'>-{</div><div class='del'>-	unsigned int parm;</div><div class='del'>-</div><div class='del'>-	parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);</div><div class='del'>-	if (parm == -1)</div><div class='del'>-		return 0;</div><div class='del'>-	*start_id = (parm &gt;&gt; 16) &amp; 0x7fff;</div><div class='del'>-	return (int)(parm &amp; 0x7fff);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_sub_nodes);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_get_connections - get connection list</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to parse</div><div class='del'>- * @conn_list: connection list array</div><div class='del'>- * @max_conns: max. number of connections to store</div><div class='del'>- *</div><div class='del'>- * Parses the connection list of the given widget and stores the list</div><div class='del'>- * of NIDs.</div><div class='del'>- *</div><div class='del'>- * Returns the number of connections, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			    hda_nid_t *conn_list, int max_conns)</div><div class='del'>-{</div><div class='del'>-	unsigned int parm;</div><div class='del'>-	int i, conn_len, conns;</div><div class='del'>-	unsigned int shift, num_elems, mask;</div><div class='del'>-	unsigned int wcaps;</div><div class='del'>-	hda_nid_t prev_nid;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!conn_list || max_conns &lt;= 0))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	wcaps = get_wcaps(codec, nid);</div><div class='del'>-	if (!(wcaps &amp; AC_WCAP_CONN_LIST) &amp;&amp;</div><div class='del'>-	    get_wcaps_type(wcaps) != AC_WID_VOL_KNB) {</div><div class='del'>-		snd_printk(KERN_WARNING "hda_codec: "</div><div class='del'>-			   "connection list not available for 0x%x\n", nid);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parm = snd_hda_param_read(codec, nid, AC_PAR_CONNLIST_LEN);</div><div class='del'>-	if (parm &amp; AC_CLIST_LONG) {</div><div class='del'>-		/* long form */</div><div class='del'>-		shift = 16;</div><div class='del'>-		num_elems = 2;</div><div class='del'>-	} else {</div><div class='del'>-		/* short form */</div><div class='del'>-		shift = 8;</div><div class='del'>-		num_elems = 4;</div><div class='del'>-	}</div><div class='del'>-	conn_len = parm &amp; AC_CLIST_LENGTH;</div><div class='del'>-	mask = (1 &lt;&lt; (shift-1)) - 1;</div><div class='del'>-</div><div class='del'>-	if (!conn_len)</div><div class='del'>-		return 0; /* no connection */</div><div class='del'>-</div><div class='del'>-	if (conn_len == 1) {</div><div class='del'>-		/* single connection */</div><div class='del'>-		parm = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					  AC_VERB_GET_CONNECT_LIST, 0);</div><div class='del'>-		if (parm == -1 &amp;&amp; codec-&gt;bus-&gt;rirb_error)</div><div class='del'>-			return -EIO;</div><div class='del'>-		conn_list[0] = parm &amp; mask;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* multi connection */</div><div class='del'>-	conns = 0;</div><div class='del'>-	prev_nid = 0;</div><div class='del'>-	for (i = 0; i &lt; conn_len; i++) {</div><div class='del'>-		int range_val;</div><div class='del'>-		hda_nid_t val, n;</div><div class='del'>-</div><div class='del'>-		if (i % num_elems == 0) {</div><div class='del'>-			parm = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						  AC_VERB_GET_CONNECT_LIST, i);</div><div class='del'>-			if (parm == -1 &amp;&amp; codec-&gt;bus-&gt;rirb_error)</div><div class='del'>-				return -EIO;</div><div class='del'>-		}</div><div class='del'>-		range_val = !!(parm &amp; (1 &lt;&lt; (shift-1))); /* ranges */</div><div class='del'>-		val = parm &amp; mask;</div><div class='del'>-		if (val == 0) {</div><div class='del'>-			snd_printk(KERN_WARNING "hda_codec: "</div><div class='del'>-				   "invalid CONNECT_LIST verb %x[%i]:%x\n",</div><div class='del'>-				    nid, i, parm);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		parm &gt;&gt;= shift;</div><div class='del'>-		if (range_val) {</div><div class='del'>-			/* ranges between the previous and this one */</div><div class='del'>-			if (!prev_nid || prev_nid &gt;= val) {</div><div class='del'>-				snd_printk(KERN_WARNING "hda_codec: "</div><div class='del'>-					   "invalid dep_range_val %x:%x\n",</div><div class='del'>-					   prev_nid, val);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			for (n = prev_nid + 1; n &lt;= val; n++) {</div><div class='del'>-				if (conns &gt;= max_conns) {</div><div class='del'>-					snd_printk(KERN_ERR "hda_codec: "</div><div class='del'>-						   "Too many connections %d for NID 0x%x\n",</div><div class='del'>-						   conns, nid);</div><div class='del'>-					return -EINVAL;</div><div class='del'>-				}</div><div class='del'>-				conn_list[conns++] = n;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (conns &gt;= max_conns) {</div><div class='del'>-				snd_printk(KERN_ERR "hda_codec: "</div><div class='del'>-					   "Too many connections %d for NID 0x%x\n",</div><div class='del'>-					   conns, nid);</div><div class='del'>-				return -EINVAL;</div><div class='del'>-			}</div><div class='del'>-			conn_list[conns++] = val;</div><div class='del'>-		}</div><div class='del'>-		prev_nid = val;</div><div class='del'>-	}</div><div class='del'>-	return conns;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_connections);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_queue_unsol_event - add an unsolicited event to queue</div><div class='del'>- * @bus: the BUS</div><div class='del'>- * @res: unsolicited event (lower 32bit of RIRB entry)</div><div class='del'>- * @res_ex: codec addr and flags (upper 32bit or RIRB entry)</div><div class='del'>- *</div><div class='del'>- * Adds the given event to the queue.  The events are processed in</div><div class='del'>- * the workqueue asynchronously.  Call this function in the interrupt</div><div class='del'>- * hanlder when RIRB receives an unsolicited event.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus_unsolicited *unsol;</div><div class='del'>-	unsigned int wp;</div><div class='del'>-</div><div class='del'>-	unsol = bus-&gt;unsol;</div><div class='del'>-	if (!unsol)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	wp = (unsol-&gt;wp + 1) % HDA_UNSOL_QUEUE_SIZE;</div><div class='del'>-	unsol-&gt;wp = wp;</div><div class='del'>-</div><div class='del'>-	wp &lt;&lt;= 1;</div><div class='del'>-	unsol-&gt;queue[wp] = res;</div><div class='del'>-	unsol-&gt;queue[wp + 1] = res_ex;</div><div class='del'>-</div><div class='del'>-	queue_work(bus-&gt;workq, &amp;unsol-&gt;work);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_queue_unsol_event);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * process queued unsolicited events</div><div class='del'>- */</div><div class='del'>-static void process_unsol_events(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus_unsolicited *unsol =</div><div class='del'>-		container_of(work, struct hda_bus_unsolicited, work);</div><div class='del'>-	struct hda_bus *bus = unsol-&gt;bus;</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	unsigned int rp, caddr, res;</div><div class='del'>-</div><div class='del'>-	while (unsol-&gt;rp != unsol-&gt;wp) {</div><div class='del'>-		rp = (unsol-&gt;rp + 1) % HDA_UNSOL_QUEUE_SIZE;</div><div class='del'>-		unsol-&gt;rp = rp;</div><div class='del'>-		rp &lt;&lt;= 1;</div><div class='del'>-		res = unsol-&gt;queue[rp];</div><div class='del'>-		caddr = unsol-&gt;queue[rp + 1];</div><div class='del'>-		if (!(caddr &amp; (1 &lt;&lt; 4))) /* no unsolicited event? */</div><div class='del'>-			continue;</div><div class='del'>-		codec = bus-&gt;caddr_tbl[caddr &amp; 0x0f];</div><div class='del'>-		if (codec &amp;&amp; codec-&gt;patch_ops.unsol_event)</div><div class='del'>-			codec-&gt;patch_ops.unsol_event(codec, res);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize unsolicited queue</div><div class='del'>- */</div><div class='del'>-static int init_unsol_queue(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus_unsolicited *unsol;</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;unsol) /* already initialized */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);</div><div class='del'>-	if (!unsol) {</div><div class='del'>-		snd_printk(KERN_ERR "hda_codec: "</div><div class='del'>-			   "can't allocate unsolicited queue\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	INIT_WORK(&amp;unsol-&gt;work, process_unsol_events);</div><div class='del'>-	unsol-&gt;bus = bus;</div><div class='del'>-	bus-&gt;unsol = unsol;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * destructor</div><div class='del'>- */</div><div class='del'>-static void snd_hda_codec_free(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-static int snd_hda_bus_free(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec, *n;</div><div class='del'>-</div><div class='del'>-	if (!bus)</div><div class='del'>-		return 0;</div><div class='del'>-	if (bus-&gt;workq)</div><div class='del'>-		flush_workqueue(bus-&gt;workq);</div><div class='del'>-	if (bus-&gt;unsol)</div><div class='del'>-		kfree(bus-&gt;unsol);</div><div class='del'>-	list_for_each_entry_safe(codec, n, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		snd_hda_codec_free(codec);</div><div class='del'>-	}</div><div class='del'>-	if (bus-&gt;ops.private_free)</div><div class='del'>-		bus-&gt;ops.private_free(bus);</div><div class='del'>-	if (bus-&gt;workq)</div><div class='del'>-		destroy_workqueue(bus-&gt;workq);</div><div class='del'>-	kfree(bus);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_bus_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus = device-&gt;device_data;</div><div class='del'>-	bus-&gt;shutdown = 1;</div><div class='del'>-	return snd_hda_bus_free(bus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_HWDEP</div><div class='del'>-static int snd_hda_bus_dev_register(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus = device-&gt;device_data;</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		snd_hda_hwdep_add_sysfs(codec);</div><div class='del'>-		snd_hda_hwdep_add_power_sysfs(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define snd_hda_bus_dev_register	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_bus_new - create a HDA bus</div><div class='del'>- * @card: the card entry</div><div class='del'>- * @temp: the template for hda_bus information</div><div class='del'>- * @busp: the pointer to store the created bus instance</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,</div><div class='del'>-			      const struct hda_bus_template *temp,</div><div class='del'>-			      struct hda_bus **busp)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus;</div><div class='del'>-	int err;</div><div class='del'>-	static struct snd_device_ops dev_ops = {</div><div class='del'>-		.dev_register = snd_hda_bus_dev_register,</div><div class='del'>-		.dev_free = snd_hda_bus_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!temp))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (snd_BUG_ON(!temp-&gt;ops.command || !temp-&gt;ops.get_response))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (busp)</div><div class='del'>-		*busp = NULL;</div><div class='del'>-</div><div class='del'>-	bus = kzalloc(sizeof(*bus), GFP_KERNEL);</div><div class='del'>-	if (bus == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't allocate struct hda_bus\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bus-&gt;card = card;</div><div class='del'>-	bus-&gt;private_data = temp-&gt;private_data;</div><div class='del'>-	bus-&gt;pci = temp-&gt;pci;</div><div class='del'>-	bus-&gt;modelname = temp-&gt;modelname;</div><div class='del'>-	bus-&gt;power_save = temp-&gt;power_save;</div><div class='del'>-	bus-&gt;ops = temp-&gt;ops;</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;bus-&gt;cmd_mutex);</div><div class='del'>-	mutex_init(&amp;bus-&gt;prepare_mutex);</div><div class='del'>-	INIT_LIST_HEAD(&amp;bus-&gt;codec_list);</div><div class='del'>-</div><div class='del'>-	snprintf(bus-&gt;workq_name, sizeof(bus-&gt;workq_name),</div><div class='del'>-		 "hd-audio%d", card-&gt;number);</div><div class='del'>-	bus-&gt;workq = create_singlethread_workqueue(bus-&gt;workq_name);</div><div class='del'>-	if (!bus-&gt;workq) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot create workqueue %s\n",</div><div class='del'>-			   bus-&gt;workq_name);</div><div class='del'>-		kfree(bus);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_BUS, bus, &amp;dev_ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_hda_bus_free(bus);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	if (busp)</div><div class='del'>-		*busp = bus;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_bus_new);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_GENERIC</div><div class='del'>-#define is_generic_config(codec) \</div><div class='del'>-	(codec-&gt;modelname &amp;&amp; !strcmp(codec-&gt;modelname, "generic"))</div><div class='del'>-#else</div><div class='del'>-#define is_generic_config(codec)	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-#define HDA_MODREQ_MAX_COUNT	2	/* two request_modules()'s */</div><div class='del'>-#else</div><div class='del'>-#define HDA_MODREQ_MAX_COUNT	0	/* all presets are statically linked */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * find a matching codec preset</div><div class='del'>- */</div><div class='del'>-static const struct hda_codec_preset *</div><div class='del'>-find_codec_preset(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec_preset_list *tbl;</div><div class='del'>-	const struct hda_codec_preset *preset;</div><div class='del'>-	int mod_requested = 0;</div><div class='del'>-</div><div class='del'>-	if (is_generic_config(codec))</div><div class='del'>-		return NULL; /* use the generic parser */</div><div class='del'>-</div><div class='del'>- again:</div><div class='del'>-	mutex_lock(&amp;preset_mutex);</div><div class='del'>-	list_for_each_entry(tbl, &amp;hda_preset_tables, list) {</div><div class='del'>-		if (!try_module_get(tbl-&gt;owner)) {</div><div class='del'>-			snd_printk(KERN_ERR "hda_codec: cannot module_get\n");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		for (preset = tbl-&gt;preset; preset-&gt;id; preset++) {</div><div class='del'>-			u32 mask = preset-&gt;mask;</div><div class='del'>-			if (preset-&gt;afg &amp;&amp; preset-&gt;afg != codec-&gt;afg)</div><div class='del'>-				continue;</div><div class='del'>-			if (preset-&gt;mfg &amp;&amp; preset-&gt;mfg != codec-&gt;mfg)</div><div class='del'>-				continue;</div><div class='del'>-			if (!mask)</div><div class='del'>-				mask = ~0;</div><div class='del'>-			if (preset-&gt;id == (codec-&gt;vendor_id &amp; mask) &amp;&amp;</div><div class='del'>-			    (!preset-&gt;rev ||</div><div class='del'>-			     preset-&gt;rev == codec-&gt;revision_id)) {</div><div class='del'>-				mutex_unlock(&amp;preset_mutex);</div><div class='del'>-				codec-&gt;owner = tbl-&gt;owner;</div><div class='del'>-				return preset;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		module_put(tbl-&gt;owner);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;preset_mutex);</div><div class='del'>-</div><div class='del'>-	if (mod_requested &lt; HDA_MODREQ_MAX_COUNT) {</div><div class='del'>-		char name[32];</div><div class='del'>-		if (!mod_requested)</div><div class='del'>-			snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",</div><div class='del'>-				 codec-&gt;vendor_id);</div><div class='del'>-		else</div><div class='del'>-			snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",</div><div class='del'>-				 (codec-&gt;vendor_id &gt;&gt; 16) &amp; 0xffff);</div><div class='del'>-		request_module(name);</div><div class='del'>-		mod_requested++;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get_codec_name - store the codec name</div><div class='del'>- */</div><div class='del'>-static int get_codec_name(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	const struct hda_vendor_id *c;</div><div class='del'>-	const char *vendor = NULL;</div><div class='del'>-	u16 vendor_id = codec-&gt;vendor_id &gt;&gt; 16;</div><div class='del'>-	char tmp[16];</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_name)</div><div class='del'>-		goto get_chip_name;</div><div class='del'>-</div><div class='del'>-	for (c = hda_vendor_ids; c-&gt;id; c++) {</div><div class='del'>-		if (c-&gt;id == vendor_id) {</div><div class='del'>-			vendor = c-&gt;name;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!vendor) {</div><div class='del'>-		sprintf(tmp, "Generic %04x", vendor_id);</div><div class='del'>-		vendor = tmp;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;vendor_name = kstrdup(vendor, GFP_KERNEL);</div><div class='del'>-	if (!codec-&gt;vendor_name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>- get_chip_name:</div><div class='del'>-	if (codec-&gt;chip_name)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;preset &amp;&amp; codec-&gt;preset-&gt;name)</div><div class='del'>-		codec-&gt;chip_name = kstrdup(codec-&gt;preset-&gt;name, GFP_KERNEL);</div><div class='del'>-	else {</div><div class='del'>-		sprintf(tmp, "ID %x", codec-&gt;vendor_id &amp; 0xffff);</div><div class='del'>-		codec-&gt;chip_name = kstrdup(tmp, GFP_KERNEL);</div><div class='del'>-	}</div><div class='del'>-	if (!codec-&gt;chip_name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * look for an AFG and MFG nodes</div><div class='del'>- */</div><div class='del'>-static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i, total_nodes, function_id;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	total_nodes = snd_hda_get_sub_nodes(codec, AC_NODE_ROOT, &amp;nid);</div><div class='del'>-	for (i = 0; i &lt; total_nodes; i++, nid++) {</div><div class='del'>-		function_id = snd_hda_param_read(codec, nid,</div><div class='del'>-						AC_PAR_FUNCTION_TYPE);</div><div class='del'>-		switch (function_id &amp; 0xff) {</div><div class='del'>-		case AC_GRP_AUDIO_FUNCTION:</div><div class='del'>-			codec-&gt;afg = nid;</div><div class='del'>-			codec-&gt;afg_function_id = function_id &amp; 0xff;</div><div class='del'>-			codec-&gt;afg_unsol = (function_id &gt;&gt; 8) &amp; 1;</div><div class='del'>-			break;</div><div class='del'>-		case AC_GRP_MODEM_FUNCTION:</div><div class='del'>-			codec-&gt;mfg = nid;</div><div class='del'>-			codec-&gt;mfg_function_id = function_id &amp; 0xff;</div><div class='del'>-			codec-&gt;mfg_unsol = (function_id &gt;&gt; 8) &amp; 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read widget caps for each widget and store in cache</div><div class='del'>- */</div><div class='del'>-static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_nodes = snd_hda_get_sub_nodes(codec, fg_node,</div><div class='del'>-						 &amp;codec-&gt;start_nid);</div><div class='del'>-	codec-&gt;wcaps = kmalloc(codec-&gt;num_nodes * 4, GFP_KERNEL);</div><div class='del'>-	if (!codec-&gt;wcaps)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	nid = codec-&gt;start_nid;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_nodes; i++, nid++)</div><div class='del'>-		codec-&gt;wcaps[i] = snd_hda_param_read(codec, nid,</div><div class='del'>-						     AC_PAR_AUDIO_WIDGET_CAP);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read all pin default configurations and save codec-&gt;init_pins */</div><div class='del'>-static int read_pin_defaults(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid = codec-&gt;start_nid;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='del'>-		struct hda_pincfg *pin;</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='del'>-		unsigned int wid_type = get_wcaps_type(wcaps);</div><div class='del'>-		if (wid_type != AC_WID_PIN)</div><div class='del'>-			continue;</div><div class='del'>-		pin = snd_array_new(&amp;codec-&gt;init_pins);</div><div class='del'>-		if (!pin)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		pin-&gt;nid = nid;</div><div class='del'>-		pin-&gt;cfg = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					      AC_VERB_GET_CONFIG_DEFAULT, 0);</div><div class='del'>-		pin-&gt;ctrl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					       AC_VERB_GET_PIN_WIDGET_CONTROL,</div><div class='del'>-					       0);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* look up the given pin config list and return the item matching with NID */</div><div class='del'>-static struct hda_pincfg *look_up_pincfg(struct hda_codec *codec,</div><div class='del'>-					 struct snd_array *array,</div><div class='del'>-					 hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; array-&gt;used; i++) {</div><div class='del'>-		struct hda_pincfg *pin = snd_array_elem(array, i);</div><div class='del'>-		if (pin-&gt;nid == nid)</div><div class='del'>-			return pin;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write a config value for the given NID */</div><div class='del'>-static void set_pincfg(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-		       unsigned int cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0 + i,</div><div class='del'>-				    cfg &amp; 0xff);</div><div class='del'>-		cfg &gt;&gt;= 8;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set the current pin config value for the given NID.</div><div class='del'>- * the value is cached, and read via snd_hda_codec_get_pincfg()</div><div class='del'>- */</div><div class='del'>-int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,</div><div class='del'>-		       hda_nid_t nid, unsigned int cfg)</div><div class='del'>-{</div><div class='del'>-	struct hda_pincfg *pin;</div><div class='del'>-	unsigned int oldcfg;</div><div class='del'>-</div><div class='del'>-	if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	oldcfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	pin = look_up_pincfg(codec, list, nid);</div><div class='del'>-	if (!pin) {</div><div class='del'>-		pin = snd_array_new(list);</div><div class='del'>-		if (!pin)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		pin-&gt;nid = nid;</div><div class='del'>-	}</div><div class='del'>-	pin-&gt;cfg = cfg;</div><div class='del'>-</div><div class='del'>-	/* change only when needed; e.g. if the pincfg is already present</div><div class='del'>-	 * in user_pins[], don't write it</div><div class='del'>-	 */</div><div class='del'>-	cfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	if (oldcfg != cfg)</div><div class='del'>-		set_pincfg(codec, nid, cfg);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_set_pincfg - Override a pin default configuration</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to set the pin config</div><div class='del'>- * @cfg: the pin default config value</div><div class='del'>- *</div><div class='del'>- * Override a pin default configuration value in the cache.</div><div class='del'>- * This value can be read by snd_hda_codec_get_pincfg() in a higher</div><div class='del'>- * priority than the real hardware value.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_set_pincfg(struct hda_codec *codec,</div><div class='del'>-			     hda_nid_t nid, unsigned int cfg)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_pincfg(codec, &amp;codec-&gt;driver_pins, nid, cfg);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_set_pincfg);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_get_pincfg - Obtain a pin-default configuration</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to get the pin config</div><div class='del'>- *</div><div class='del'>- * Get the current pin config value of the given pin NID.</div><div class='del'>- * If the pincfg value is cached or overridden via sysfs or driver,</div><div class='del'>- * returns the cached value.</div><div class='del'>- */</div><div class='del'>-unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_pincfg *pin;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_HWDEP</div><div class='del'>-	pin = look_up_pincfg(codec, &amp;codec-&gt;user_pins, nid);</div><div class='del'>-	if (pin)</div><div class='del'>-		return pin-&gt;cfg;</div><div class='del'>-#endif</div><div class='del'>-	pin = look_up_pincfg(codec, &amp;codec-&gt;driver_pins, nid);</div><div class='del'>-	if (pin)</div><div class='del'>-		return pin-&gt;cfg;</div><div class='del'>-	pin = look_up_pincfg(codec, &amp;codec-&gt;init_pins, nid);</div><div class='del'>-	if (pin)</div><div class='del'>-		return pin-&gt;cfg;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_get_pincfg);</div><div class='del'>-</div><div class='del'>-/* restore all current pin configs */</div><div class='del'>-static void restore_pincfgs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;init_pins.used; i++) {</div><div class='del'>-		struct hda_pincfg *pin = snd_array_elem(&amp;codec-&gt;init_pins, i);</div><div class='del'>-		set_pincfg(codec, pin-&gt;nid,</div><div class='del'>-			   snd_hda_codec_get_pincfg(codec, pin-&gt;nid));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_shutup_pins - Shut up all pins</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- *</div><div class='del'>- * Clear all pin controls to shup up before suspend for avoiding click noise.</div><div class='del'>- * The controls aren't cached so that they can be resumed properly.</div><div class='del'>- */</div><div class='del'>-void snd_hda_shutup_pins(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	/* don't shut up pins when unloading the driver; otherwise it breaks</div><div class='del'>-	 * the default pin setup at the next load of the driver</div><div class='del'>-	 */</div><div class='del'>-	if (codec-&gt;bus-&gt;shutdown)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;init_pins.used; i++) {</div><div class='del'>-		struct hda_pincfg *pin = snd_array_elem(&amp;codec-&gt;init_pins, i);</div><div class='del'>-		/* use read here for syncing after issuing each verb */</div><div class='del'>-		snd_hda_codec_read(codec, pin-&gt;nid, 0,</div><div class='del'>-				   AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;pins_shutup = 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_shutup_pins);</div><div class='del'>-</div><div class='del'>-/* Restore the pin controls cleared previously via snd_hda_shutup_pins() */</div><div class='del'>-static void restore_shutup_pins(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	if (!codec-&gt;pins_shutup)</div><div class='del'>-		return;</div><div class='del'>-	if (codec-&gt;bus-&gt;shutdown)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;init_pins.used; i++) {</div><div class='del'>-		struct hda_pincfg *pin = snd_array_elem(&amp;codec-&gt;init_pins, i);</div><div class='del'>-		snd_hda_codec_write(codec, pin-&gt;nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    pin-&gt;ctrl);</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;pins_shutup = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_hda_cache(struct hda_cache_rec *cache,</div><div class='del'>-			   unsigned int record_size);</div><div class='del'>-static void free_hda_cache(struct hda_cache_rec *cache);</div><div class='del'>-</div><div class='del'>-/* restore the initial pin cfgs and release all pincfg lists */</div><div class='del'>-static void restore_init_pincfgs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* first free driver_pins and user_pins, then call restore_pincfg</div><div class='del'>-	 * so that only the values in init_pins are restored</div><div class='del'>-	 */</div><div class='del'>-	snd_array_free(&amp;codec-&gt;driver_pins);</div><div class='del'>-#ifdef CONFIG_SND_HDA_HWDEP</div><div class='del'>-	snd_array_free(&amp;codec-&gt;user_pins);</div><div class='del'>-#endif</div><div class='del'>-	restore_pincfgs(codec);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;init_pins);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * audio-converter setup caches</div><div class='del'>- */</div><div class='del'>-struct hda_cvt_setup {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	u8 stream_tag;</div><div class='del'>-	u8 channel_id;</div><div class='del'>-	u16 format_id;</div><div class='del'>-	unsigned char active;	/* cvt is currently used */</div><div class='del'>-	unsigned char dirty;	/* setups should be cleared */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* get or create a cache entry for the given audio converter NID */</div><div class='del'>-static struct hda_cvt_setup *</div><div class='del'>-get_hda_cvt_setup(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_cvt_setup *p;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;cvt_setups.used; i++) {</div><div class='del'>-		p = snd_array_elem(&amp;codec-&gt;cvt_setups, i);</div><div class='del'>-		if (p-&gt;nid == nid)</div><div class='del'>-			return p;</div><div class='del'>-	}</div><div class='del'>-	p = snd_array_new(&amp;codec-&gt;cvt_setups);</div><div class='del'>-	if (p)</div><div class='del'>-		p-&gt;nid = nid;</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * codec destructor</div><div class='del'>- */</div><div class='del'>-static void snd_hda_codec_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if (!codec)</div><div class='del'>-		return;</div><div class='del'>-	restore_init_pincfgs(codec);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	cancel_delayed_work(&amp;codec-&gt;power_work);</div><div class='del'>-	flush_workqueue(codec-&gt;bus-&gt;workq);</div><div class='del'>-#endif</div><div class='del'>-	list_del(&amp;codec-&gt;list);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;mixers);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;nids);</div><div class='del'>-	codec-&gt;bus-&gt;caddr_tbl[codec-&gt;addr] = NULL;</div><div class='del'>-	if (codec-&gt;patch_ops.free)</div><div class='del'>-		codec-&gt;patch_ops.free(codec);</div><div class='del'>-	module_put(codec-&gt;owner);</div><div class='del'>-	free_hda_cache(&amp;codec-&gt;amp_cache);</div><div class='del'>-	free_hda_cache(&amp;codec-&gt;cmd_cache);</div><div class='del'>-	kfree(codec-&gt;vendor_name);</div><div class='del'>-	kfree(codec-&gt;chip_name);</div><div class='del'>-	kfree(codec-&gt;modelname);</div><div class='del'>-	kfree(codec-&gt;wcaps);</div><div class='del'>-	kfree(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,</div><div class='del'>-				unsigned int power_state);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_new - create a HDA codec</div><div class='del'>- * @bus: the bus to assign</div><div class='del'>- * @codec_addr: the codec address</div><div class='del'>- * @codecp: the pointer to store the generated codec</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,</div><div class='del'>-				unsigned int codec_addr,</div><div class='del'>-				struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	char component[31];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!bus))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (snd_BUG_ON(codec_addr &gt; HDA_MAX_CODEC_ADDRESS))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;caddr_tbl[codec_addr]) {</div><div class='del'>-		snd_printk(KERN_ERR "hda_codec: "</div><div class='del'>-			   "address 0x%x is already occupied\n", codec_addr);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec = kzalloc(sizeof(*codec), GFP_KERNEL);</div><div class='del'>-	if (codec == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "can't allocate struct hda_codec\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;bus = bus;</div><div class='del'>-	codec-&gt;addr = codec_addr;</div><div class='del'>-	mutex_init(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	mutex_init(&amp;codec-&gt;control_mutex);</div><div class='del'>-	init_hda_cache(&amp;codec-&gt;amp_cache, sizeof(struct hda_amp_info));</div><div class='del'>-	init_hda_cache(&amp;codec-&gt;cmd_cache, sizeof(struct hda_cache_head));</div><div class='del'>-	snd_array_init(&amp;codec-&gt;mixers, sizeof(struct hda_nid_item), 32);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;nids, sizeof(struct hda_nid_item), 32);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;init_pins, sizeof(struct hda_pincfg), 16);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;driver_pins, sizeof(struct hda_pincfg), 16);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;cvt_setups, sizeof(struct hda_cvt_setup), 8);</div><div class='del'>-	if (codec-&gt;bus-&gt;modelname) {</div><div class='del'>-		codec-&gt;modelname = kstrdup(codec-&gt;bus-&gt;modelname, GFP_KERNEL);</div><div class='del'>-		if (!codec-&gt;modelname) {</div><div class='del'>-			snd_hda_codec_free(codec);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	INIT_DELAYED_WORK(&amp;codec-&gt;power_work, hda_power_work);</div><div class='del'>-	/* snd_hda_codec_new() marks the codec as power-up, and leave it as is.</div><div class='del'>-	 * the caller has to power down appropriatley after initialization</div><div class='del'>-	 * phase.</div><div class='del'>-	 */</div><div class='del'>-	hda_keep_power_on(codec);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;codec-&gt;list, &amp;bus-&gt;codec_list);</div><div class='del'>-	bus-&gt;caddr_tbl[codec_addr] = codec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,</div><div class='del'>-					      AC_PAR_VENDOR_ID);</div><div class='del'>-	if (codec-&gt;vendor_id == -1)</div><div class='del'>-		/* read again, hopefully the access method was corrected</div><div class='del'>-		 * in the last read...</div><div class='del'>-		 */</div><div class='del'>-		codec-&gt;vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,</div><div class='del'>-						      AC_PAR_VENDOR_ID);</div><div class='del'>-	codec-&gt;subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT,</div><div class='del'>-						 AC_PAR_SUBSYSTEM_ID);</div><div class='del'>-	codec-&gt;revision_id = snd_hda_param_read(codec, AC_NODE_ROOT,</div><div class='del'>-						AC_PAR_REV_ID);</div><div class='del'>-</div><div class='del'>-	setup_fg_nodes(codec);</div><div class='del'>-	if (!codec-&gt;afg &amp;&amp; !codec-&gt;mfg) {</div><div class='del'>-		snd_printdd("hda_codec: no AFG or MFG node found\n");</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = read_widget_caps(codec, codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "hda_codec: cannot malloc\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	err = read_pin_defaults(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (!codec-&gt;subsystem_id) {</div><div class='del'>-		hda_nid_t nid = codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg;</div><div class='del'>-		codec-&gt;subsystem_id =</div><div class='del'>-			snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					   AC_VERB_GET_SUBSYSTEM_ID, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* power-up all before initialization */</div><div class='del'>-	hda_set_power_state(codec,</div><div class='del'>-			    codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg,</div><div class='del'>-			    AC_PWRST_D0);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_proc_new(codec);</div><div class='del'>-</div><div class='del'>-	snd_hda_create_hwdep(codec);</div><div class='del'>-</div><div class='del'>-	sprintf(component, "HDA:%08x,%08x,%08x", codec-&gt;vendor_id,</div><div class='del'>-		codec-&gt;subsystem_id, codec-&gt;revision_id);</div><div class='del'>-	snd_component_add(codec-&gt;bus-&gt;card, component);</div><div class='del'>-</div><div class='del'>-	if (codecp)</div><div class='del'>-		*codecp = codec;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_hda_codec_free(codec);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_new);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_configure - (Re-)configure the HD-audio codec</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- *</div><div class='del'>- * Start parsing of the given codec tree and (re-)initialize the whole</div><div class='del'>- * patch instance.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_configure(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	codec-&gt;preset = find_codec_preset(codec);</div><div class='del'>-	if (!codec-&gt;vendor_name || !codec-&gt;chip_name) {</div><div class='del'>-		err = get_codec_name(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_generic_config(codec)) {</div><div class='del'>-		err = snd_hda_parse_generic_codec(codec);</div><div class='del'>-		goto patched;</div><div class='del'>-	}</div><div class='del'>-	if (codec-&gt;preset &amp;&amp; codec-&gt;preset-&gt;patch) {</div><div class='del'>-		err = codec-&gt;preset-&gt;patch(codec);</div><div class='del'>-		goto patched;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* call the default parser */</div><div class='del'>-	err = snd_hda_parse_generic_codec(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		printk(KERN_ERR "hda-codec: No codec parser is available\n");</div><div class='del'>-</div><div class='del'>- patched:</div><div class='del'>-	if (!err &amp;&amp; codec-&gt;patch_ops.unsol_event)</div><div class='del'>-		err = init_unsol_queue(codec-&gt;bus);</div><div class='del'>-	/* audio codec should override the mixer name */</div><div class='del'>-	if (!err &amp;&amp; (codec-&gt;afg || !*codec-&gt;bus-&gt;card-&gt;mixername))</div><div class='del'>-		snprintf(codec-&gt;bus-&gt;card-&gt;mixername,</div><div class='del'>-			 sizeof(codec-&gt;bus-&gt;card-&gt;mixername),</div><div class='del'>-			 "%s %s", codec-&gt;vendor_name, codec-&gt;chip_name);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_configure);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_setup_stream - set up the codec for streaming</div><div class='del'>- * @codec: the CODEC to set up</div><div class='del'>- * @nid: the NID to set up</div><div class='del'>- * @stream_tag: stream tag to pass, it's between 0x1 and 0xf.</div><div class='del'>- * @channel_id: channel id to pass, zero based.</div><div class='del'>- * @format: stream format.</div><div class='del'>- */</div><div class='del'>-void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				u32 stream_tag,</div><div class='del'>-				int channel_id, int format)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *c;</div><div class='del'>-	struct hda_cvt_setup *p;</div><div class='del'>-	unsigned int oldval, newval;</div><div class='del'>-	int type;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!nid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	snd_printdd("hda_codec_setup_stream: "</div><div class='del'>-		    "NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",</div><div class='del'>-		    nid, stream_tag, channel_id, format);</div><div class='del'>-	p = get_hda_cvt_setup(codec, nid);</div><div class='del'>-	if (!p)</div><div class='del'>-		return;</div><div class='del'>-	/* update the stream-id if changed */</div><div class='del'>-	if (p-&gt;stream_tag != stream_tag || p-&gt;channel_id != channel_id) {</div><div class='del'>-		oldval = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONV, 0);</div><div class='del'>-		newval = (stream_tag &lt;&lt; 4) | channel_id;</div><div class='del'>-		if (oldval != newval)</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-					    AC_VERB_SET_CHANNEL_STREAMID,</div><div class='del'>-					    newval);</div><div class='del'>-		p-&gt;stream_tag = stream_tag;</div><div class='del'>-		p-&gt;channel_id = channel_id;</div><div class='del'>-	}</div><div class='del'>-	/* update the format-id if changed */</div><div class='del'>-	if (p-&gt;format_id != format) {</div><div class='del'>-		oldval = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					    AC_VERB_GET_STREAM_FORMAT, 0);</div><div class='del'>-		if (oldval != format) {</div><div class='del'>-			msleep(1);</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-					    AC_VERB_SET_STREAM_FORMAT,</div><div class='del'>-					    format);</div><div class='del'>-		}</div><div class='del'>-		p-&gt;format_id = format;</div><div class='del'>-	}</div><div class='del'>-	p-&gt;active = 1;</div><div class='del'>-	p-&gt;dirty = 0;</div><div class='del'>-</div><div class='del'>-	/* make other inactive cvts with the same stream-tag dirty */</div><div class='del'>-	type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='del'>-	list_for_each_entry(c, &amp;codec-&gt;bus-&gt;codec_list, list) {</div><div class='del'>-		for (i = 0; i &lt; c-&gt;cvt_setups.used; i++) {</div><div class='del'>-			p = snd_array_elem(&amp;c-&gt;cvt_setups, i);</div><div class='del'>-			if (!p-&gt;active &amp;&amp; p-&gt;stream_tag == stream_tag &amp;&amp;</div><div class='del'>-			    get_wcaps_type(get_wcaps(codec, p-&gt;nid)) == type)</div><div class='del'>-				p-&gt;dirty = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);</div><div class='del'>-</div><div class='del'>-static void really_cleanup_stream(struct hda_codec *codec,</div><div class='del'>-				  struct hda_cvt_setup *q);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * __snd_hda_codec_cleanup_stream - clean up the codec for closing</div><div class='del'>- * @codec: the CODEC to clean up</div><div class='del'>- * @nid: the NID to clean up</div><div class='del'>- * @do_now: really clean up the stream instead of clearing the active flag</div><div class='del'>- */</div><div class='del'>-void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				    int do_now)</div><div class='del'>-{</div><div class='del'>-	struct hda_cvt_setup *p;</div><div class='del'>-</div><div class='del'>-	if (!nid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;no_sticky_stream)</div><div class='del'>-		do_now = 1;</div><div class='del'>-</div><div class='del'>-	snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid);</div><div class='del'>-	p = get_hda_cvt_setup(codec, nid);</div><div class='del'>-	if (p) {</div><div class='del'>-		/* here we just clear the active flag when do_now isn't set;</div><div class='del'>-		 * actual clean-ups will be done later in</div><div class='del'>-		 * purify_inactive_streams() called from snd_hda_codec_prpapre()</div><div class='del'>-		 */</div><div class='del'>-		if (do_now)</div><div class='del'>-			really_cleanup_stream(codec, p);</div><div class='del'>-		else</div><div class='del'>-			p-&gt;active = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(__snd_hda_codec_cleanup_stream);</div><div class='del'>-</div><div class='del'>-static void really_cleanup_stream(struct hda_codec *codec,</div><div class='del'>-				  struct hda_cvt_setup *q)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid = q-&gt;nid;</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);</div><div class='del'>-	memset(q, 0, sizeof(*q));</div><div class='del'>-	q-&gt;nid = nid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clean up the all conflicting obsolete streams */</div><div class='del'>-static void purify_inactive_streams(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *c;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(c, &amp;codec-&gt;bus-&gt;codec_list, list) {</div><div class='del'>-		for (i = 0; i &lt; c-&gt;cvt_setups.used; i++) {</div><div class='del'>-			struct hda_cvt_setup *p;</div><div class='del'>-			p = snd_array_elem(&amp;c-&gt;cvt_setups, i);</div><div class='del'>-			if (p-&gt;dirty)</div><div class='del'>-				really_cleanup_stream(c, p);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clean up all streams; called from suspend */</div><div class='del'>-static void hda_cleanup_all_streams(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;cvt_setups.used; i++) {</div><div class='del'>-		struct hda_cvt_setup *p = snd_array_elem(&amp;codec-&gt;cvt_setups, i);</div><div class='del'>-		if (p-&gt;stream_tag)</div><div class='del'>-			really_cleanup_stream(codec, p);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * amp access functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* FIXME: more better hash key? */</div><div class='del'>-#define HDA_HASH_KEY(nid, dir, idx) (u32)((nid) + ((idx) &lt;&lt; 16) + ((dir) &lt;&lt; 24))</div><div class='del'>-#define HDA_HASH_PINCAP_KEY(nid) (u32)((nid) + (0x02 &lt;&lt; 24))</div><div class='del'>-#define HDA_HASH_PARPCM_KEY(nid) (u32)((nid) + (0x03 &lt;&lt; 24))</div><div class='del'>-#define HDA_HASH_PARSTR_KEY(nid) (u32)((nid) + (0x04 &lt;&lt; 24))</div><div class='del'>-#define INFO_AMP_CAPS	(1&lt;&lt;0)</div><div class='del'>-#define INFO_AMP_VOL(ch)	(1 &lt;&lt; (1 + (ch)))</div><div class='del'>-</div><div class='del'>-/* initialize the hash table */</div><div class='del'>-static void /*__devinit*/ init_hda_cache(struct hda_cache_rec *cache,</div><div class='del'>-				     unsigned int record_size)</div><div class='del'>-{</div><div class='del'>-	memset(cache, 0, sizeof(*cache));</div><div class='del'>-	memset(cache-&gt;hash, 0xff, sizeof(cache-&gt;hash));</div><div class='del'>-	snd_array_init(&amp;cache-&gt;buf, record_size, 64);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_hda_cache(struct hda_cache_rec *cache)</div><div class='del'>-{</div><div class='del'>-	snd_array_free(&amp;cache-&gt;buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* query the hash.  allocate an entry if not found. */</div><div class='del'>-static struct hda_cache_head  *get_hash(struct hda_cache_rec *cache, u32 key)</div><div class='del'>-{</div><div class='del'>-	u16 idx = key % (u16)ARRAY_SIZE(cache-&gt;hash);</div><div class='del'>-	u16 cur = cache-&gt;hash[idx];</div><div class='del'>-	struct hda_cache_head *info;</div><div class='del'>-</div><div class='del'>-	while (cur != 0xffff) {</div><div class='del'>-		info = snd_array_elem(&amp;cache-&gt;buf, cur);</div><div class='del'>-		if (info-&gt;key == key)</div><div class='del'>-			return info;</div><div class='del'>-		cur = info-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* query the hash.  allocate an entry if not found. */</div><div class='del'>-static struct hda_cache_head  *get_alloc_hash(struct hda_cache_rec *cache,</div><div class='del'>-					      u32 key)</div><div class='del'>-{</div><div class='del'>-	struct hda_cache_head *info = get_hash(cache, key);</div><div class='del'>-	if (!info) {</div><div class='del'>-		u16 idx, cur;</div><div class='del'>-		/* add a new hash entry */</div><div class='del'>-		info = snd_array_new(&amp;cache-&gt;buf);</div><div class='del'>-		if (!info)</div><div class='del'>-			return NULL;</div><div class='del'>-		cur = snd_array_index(&amp;cache-&gt;buf, info);</div><div class='del'>-		info-&gt;key = key;</div><div class='del'>-		info-&gt;val = 0;</div><div class='del'>-		idx = key % (u16)ARRAY_SIZE(cache-&gt;hash);</div><div class='del'>-		info-&gt;next = cache-&gt;hash[idx];</div><div class='del'>-		cache-&gt;hash[idx] = cur;</div><div class='del'>-	}</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* query and allocate an amp hash entry */</div><div class='del'>-static inline struct hda_amp_info *</div><div class='del'>-get_alloc_amp_hash(struct hda_codec *codec, u32 key)</div><div class='del'>-{</div><div class='del'>-	return (struct hda_amp_info *)get_alloc_hash(&amp;codec-&gt;amp_cache, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_amp_caps - query AMP capabilities</div><div class='del'>- * @codec: the HD-auio codec</div><div class='del'>- * @nid: the NID to query</div><div class='del'>- * @direction: either #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- *</div><div class='del'>- * Query AMP capabilities for the given widget and direction.</div><div class='del'>- * Returns the obtained capability bits.</div><div class='del'>- *</div><div class='del'>- * When cap bits have been already read, this doesn't read again but</div><div class='del'>- * returns the cached value.</div><div class='del'>- */</div><div class='del'>-u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *info;</div><div class='del'>-</div><div class='del'>-	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));</div><div class='del'>-	if (!info)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!(info-&gt;head.val &amp; INFO_AMP_CAPS)) {</div><div class='del'>-		if (!(get_wcaps(codec, nid) &amp; AC_WCAP_AMP_OVRD))</div><div class='del'>-			nid = codec-&gt;afg;</div><div class='del'>-		info-&gt;amp_caps = snd_hda_param_read(codec, nid,</div><div class='del'>-						    direction == HDA_OUTPUT ?</div><div class='del'>-						    AC_PAR_AMP_OUT_CAP :</div><div class='del'>-						    AC_PAR_AMP_IN_CAP);</div><div class='del'>-		if (info-&gt;amp_caps)</div><div class='del'>-			info-&gt;head.val |= INFO_AMP_CAPS;</div><div class='del'>-	}</div><div class='del'>-	return info-&gt;amp_caps;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(query_amp_caps);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_override_amp_caps - Override the AMP capabilities</div><div class='del'>- * @codec: the CODEC to clean up</div><div class='del'>- * @nid: the NID to clean up</div><div class='del'>- * @direction: either #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- * @caps: the capability bits to set</div><div class='del'>- *</div><div class='del'>- * Override the cached AMP caps bits value by the given one.</div><div class='del'>- * This function is useful if the driver needs to adjust the AMP ranges,</div><div class='del'>- * e.g. limit to 0dB, etc.</div><div class='del'>- *</div><div class='del'>- * Returns zero if successful or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='del'>-			      unsigned int caps)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *info;</div><div class='del'>-</div><div class='del'>-	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, dir, 0));</div><div class='del'>-	if (!info)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	info-&gt;amp_caps = caps;</div><div class='del'>-	info-&gt;head.val |= INFO_AMP_CAPS;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_override_amp_caps);</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-query_caps_hash(struct hda_codec *codec, hda_nid_t nid, u32 key,</div><div class='del'>-		unsigned int (*func)(struct hda_codec *, hda_nid_t))</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *info;</div><div class='del'>-</div><div class='del'>-	info = get_alloc_amp_hash(codec, key);</div><div class='del'>-	if (!info)</div><div class='del'>-		return 0;</div><div class='del'>-	if (!info-&gt;head.val) {</div><div class='del'>-		info-&gt;head.val |= INFO_AMP_CAPS;</div><div class='del'>-		info-&gt;amp_caps = func(codec, nid);</div><div class='del'>-	}</div><div class='del'>-	return info-&gt;amp_caps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int read_pin_cap(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_query_pin_caps - Query PIN capabilities</div><div class='del'>- * @codec: the HD-auio codec</div><div class='del'>- * @nid: the NID to query</div><div class='del'>- *</div><div class='del'>- * Query PIN capabilities for the given widget.</div><div class='del'>- * Returns the obtained capability bits.</div><div class='del'>- *</div><div class='del'>- * When cap bits have been already read, this doesn't read again but</div><div class='del'>- * returns the cached value.</div><div class='del'>- */</div><div class='del'>-u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return query_caps_hash(codec, nid, HDA_HASH_PINCAP_KEY(nid),</div><div class='del'>-			       read_pin_cap);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_pin_sense - execute pin sense measurement</div><div class='del'>- * @codec: the CODEC to sense</div><div class='del'>- * @nid: the pin NID to sense</div><div class='del'>- *</div><div class='del'>- * Execute necessary pin sense measurement and return its Presence Detect,</div><div class='del'>- * Impedance, ELD Valid etc. status bits.</div><div class='del'>- */</div><div class='del'>-u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	u32 pincap;</div><div class='del'>-</div><div class='del'>-	if (!codec-&gt;no_trigger_sense) {</div><div class='del'>-		pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-		if (pincap &amp; AC_PINCAP_TRIG_REQ) /* need trigger? */</div><div class='del'>-			snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					AC_VERB_SET_PIN_SENSE, 0);</div><div class='del'>-	}</div><div class='del'>-	return snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				  AC_VERB_GET_PIN_SENSE, 0);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_pin_sense);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_jack_detect - query pin Presence Detect status</div><div class='del'>- * @codec: the CODEC to sense</div><div class='del'>- * @nid: the pin NID to sense</div><div class='del'>- *</div><div class='del'>- * Query and return the pin's Presence Detect status.</div><div class='del'>- */</div><div class='del'>-int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	u32 sense = snd_hda_pin_sense(codec, nid);</div><div class='del'>-	return !!(sense &amp; AC_PINSENSE_PRESENCE);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_jack_detect);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * read the current volume to info</div><div class='del'>- * if the cache exists, read the cache value.</div><div class='del'>- */</div><div class='del'>-static unsigned int get_vol_mute(struct hda_codec *codec,</div><div class='del'>-				 struct hda_amp_info *info, hda_nid_t nid,</div><div class='del'>-				 int ch, int direction, int index)</div><div class='del'>-{</div><div class='del'>-	u32 val, parm;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;head.val &amp; INFO_AMP_VOL(ch))</div><div class='del'>-		return info-&gt;vol[ch];</div><div class='del'>-</div><div class='del'>-	parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;</div><div class='del'>-	parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;</div><div class='del'>-	parm |= index;</div><div class='del'>-	val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				 AC_VERB_GET_AMP_GAIN_MUTE, parm);</div><div class='del'>-	info-&gt;vol[ch] = val &amp; 0xff;</div><div class='del'>-	info-&gt;head.val |= INFO_AMP_VOL(ch);</div><div class='del'>-	return info-&gt;vol[ch];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write the current volume in info to the h/w and update the cache</div><div class='del'>- */</div><div class='del'>-static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,</div><div class='del'>-			 hda_nid_t nid, int ch, int direction, int index,</div><div class='del'>-			 int val)</div><div class='del'>-{</div><div class='del'>-	u32 parm;</div><div class='del'>-</div><div class='del'>-	parm = ch ? AC_AMP_SET_RIGHT : AC_AMP_SET_LEFT;</div><div class='del'>-	parm |= direction == HDA_OUTPUT ? AC_AMP_SET_OUTPUT : AC_AMP_SET_INPUT;</div><div class='del'>-	parm |= index &lt;&lt; AC_AMP_SET_INDEX_SHIFT;</div><div class='del'>-	parm |= val;</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);</div><div class='del'>-	info-&gt;vol[ch] = val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_amp_read - Read AMP value</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: NID to read the AMP value</div><div class='del'>- * @ch: channel (left=0 or right=1)</div><div class='del'>- * @direction: #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- * @index: the index value (only for input direction)</div><div class='del'>- *</div><div class='del'>- * Read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='del'>-			   int direction, int index)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *info;</div><div class='del'>-	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));</div><div class='del'>-	if (!info)</div><div class='del'>-		return 0;</div><div class='del'>-	return get_vol_mute(codec, info, nid, ch, direction, index);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_read);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_amp_update - update the AMP value</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: NID to read the AMP value</div><div class='del'>- * @ch: channel (left=0 or right=1)</div><div class='del'>- * @direction: #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- * @idx: the index value (only for input direction)</div><div class='del'>- * @mask: bit mask to set</div><div class='del'>- * @val: the bits value to set</div><div class='del'>- *</div><div class='del'>- * Update the AMP value with a bit mask.</div><div class='del'>- * Returns 0 if the value is unchanged, 1 if changed.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,</div><div class='del'>-			     int direction, int idx, int mask, int val)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *info;</div><div class='del'>-</div><div class='del'>-	info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));</div><div class='del'>-	if (!info)</div><div class='del'>-		return 0;</div><div class='del'>-	if (snd_BUG_ON(mask &amp; ~0xff))</div><div class='del'>-		mask &amp;= 0xff;</div><div class='del'>-	val &amp;= mask;</div><div class='del'>-	val |= get_vol_mute(codec, info, nid, ch, direction, idx) &amp; ~mask;</div><div class='del'>-	if (info-&gt;vol[ch] == val)</div><div class='del'>-		return 0;</div><div class='del'>-	put_vol_mute(codec, info, nid, ch, direction, idx, val);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_update);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_amp_stereo - update the AMP stereo values</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: NID to read the AMP value</div><div class='del'>- * @direction: #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- * @idx: the index value (only for input direction)</div><div class='del'>- * @mask: bit mask to set</div><div class='del'>- * @val: the bits value to set</div><div class='del'>- *</div><div class='del'>- * Update the AMP values like snd_hda_codec_amp_update(), but for a</div><div class='del'>- * stereo widget with the same mask and value.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			     int direction, int idx, int mask, int val)</div><div class='del'>-{</div><div class='del'>-	int ch, ret = 0;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(mask &amp; ~0xff))</div><div class='del'>-		mask &amp;= 0xff;</div><div class='del'>-	for (ch = 0; ch &lt; 2; ch++)</div><div class='del'>-		ret |= snd_hda_codec_amp_update(codec, nid, ch, direction,</div><div class='del'>-						idx, mask, val);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_amp_stereo);</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_resume_amp - Resume all AMP commands from the cache</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Resume the all amp commands from the cache.</div><div class='del'>- */</div><div class='del'>-void snd_hda_codec_resume_amp(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_info *buffer = codec-&gt;amp_cache.buf.list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;amp_cache.buf.used; i++, buffer++) {</div><div class='del'>-		u32 key = buffer-&gt;head.key;</div><div class='del'>-		hda_nid_t nid;</div><div class='del'>-		unsigned int idx, dir, ch;</div><div class='del'>-		if (!key)</div><div class='del'>-			continue;</div><div class='del'>-		nid = key &amp; 0xff;</div><div class='del'>-		idx = (key &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-		dir = (key &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-		for (ch = 0; ch &lt; 2; ch++) {</div><div class='del'>-			if (!(buffer-&gt;head.val &amp; INFO_AMP_VOL(ch)))</div><div class='del'>-				continue;</div><div class='del'>-			put_vol_mute(codec, buffer, nid, ch, dir, idx,</div><div class='del'>-				     buffer-&gt;vol[ch]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_resume_amp);</div><div class='del'>-#endif /* SND_HDA_NEEDS_RESUME */</div><div class='del'>-</div><div class='del'>-static u32 get_amp_max_value(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='del'>-			     unsigned int ofs)</div><div class='del'>-{</div><div class='del'>-	u32 caps = query_amp_caps(codec, nid, dir);</div><div class='del'>-	/* get num steps */</div><div class='del'>-	caps = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	if (ofs &lt; caps)</div><div class='del'>-		caps -= ofs;</div><div class='del'>-	return caps;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_volume_info - Info callback for a standard AMP mixer</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	u16 nid = get_amp_nid(kcontrol);</div><div class='del'>-	u8 chs = get_amp_channels(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='del'>-	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='del'>-	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = get_amp_max_value(codec, nid, dir, ofs);</div><div class='del'>-	if (!uinfo-&gt;value.integer.max) {</div><div class='del'>-		printk(KERN_WARNING "hda_codec: "</div><div class='del'>-		       "num_steps = 0 for NID=0x%x (ctl = %s)\n", nid,</div><div class='del'>-		       kcontrol-&gt;id.name);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_info);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline unsigned int</div><div class='del'>-read_amp_value(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-	       int ch, int dir, int idx, unsigned int ofs)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	val = snd_hda_codec_amp_read(codec, nid, ch, dir, idx);</div><div class='del'>-	val &amp;= HDA_AMP_VOLMASK;</div><div class='del'>-	if (val &gt;= ofs)</div><div class='del'>-		val -= ofs;</div><div class='del'>-	else</div><div class='del'>-		val = 0;</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-update_amp_value(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-		 int ch, int dir, int idx, unsigned int ofs,</div><div class='del'>-		 unsigned int val)</div><div class='del'>-{</div><div class='del'>-	unsigned int maxval;</div><div class='del'>-</div><div class='del'>-	if (val &gt; 0)</div><div class='del'>-		val += ofs;</div><div class='del'>-	/* ofs = 0: raw max value */</div><div class='del'>-	maxval = get_amp_max_value(codec, nid, dir, 0);</div><div class='del'>-	if (val &gt; maxval)</div><div class='del'>-		val = maxval;</div><div class='del'>-	return snd_hda_codec_amp_update(codec, nid, ch, dir, idx,</div><div class='del'>-					HDA_AMP_VOLMASK, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_volume_get - Get callback for a standard AMP mixer volume</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='del'>-	int chs = get_amp_channels(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	int idx = get_amp_index(kcontrol);</div><div class='del'>-	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	if (chs &amp; 1)</div><div class='del'>-		*valp++ = read_amp_value(codec, nid, 0, dir, idx, ofs);</div><div class='del'>-	if (chs &amp; 2)</div><div class='del'>-		*valp = read_amp_value(codec, nid, 1, dir, idx, ofs);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_volume_put - Put callback for a standard AMP mixer volume</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='del'>-	int chs = get_amp_channels(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	int idx = get_amp_index(kcontrol);</div><div class='del'>-	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change = 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_power_up(codec);</div><div class='del'>-	if (chs &amp; 1) {</div><div class='del'>-		change = update_amp_value(codec, nid, 0, dir, idx, ofs, *valp);</div><div class='del'>-		valp++;</div><div class='del'>-	}</div><div class='del'>-	if (chs &amp; 2)</div><div class='del'>-		change |= update_amp_value(codec, nid, 1, dir, idx, ofs, *valp);</div><div class='del'>-	snd_hda_power_down(codec);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_volume_put);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_volume_put - TLV callback for a standard AMP mixer volume</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='del'>-			  unsigned int size, unsigned int __user *_tlv)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	unsigned int ofs = get_amp_offset(kcontrol);</div><div class='del'>-	bool min_mute = get_amp_min_mute(kcontrol);</div><div class='del'>-	u32 caps, val1, val2;</div><div class='del'>-</div><div class='del'>-	if (size &lt; 4 * sizeof(unsigned int))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	caps = query_amp_caps(codec, nid, dir);</div><div class='del'>-	val2 = (caps &amp; AC_AMPCAP_STEP_SIZE) &gt;&gt; AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='del'>-	val2 = (val2 + 1) * 25;</div><div class='del'>-	val1 = -((caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT);</div><div class='del'>-	val1 += ofs;</div><div class='del'>-	val1 = ((int)val1) * ((int)val2);</div><div class='del'>-	if (min_mute)</div><div class='del'>-		val2 |= TLV_DB_SCALE_MUTE;</div><div class='del'>-	if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (put_user(2 * sizeof(unsigned int), _tlv + 1))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (put_user(val1, _tlv + 2))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	if (put_user(val2, _tlv + 3))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_tlv);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_set_vmaster_tlv - Set TLV for a virtual master control</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: NID of a reference widget</div><div class='del'>- * @dir: #HDA_INPUT or #HDA_OUTPUT</div><div class='del'>- * @tlv: TLV data to be stored, at least 4 elements</div><div class='del'>- *</div><div class='del'>- * Set (static) TLV data for a virtual master volume using the AMP caps</div><div class='del'>- * obtained from the reference NID.</div><div class='del'>- * The volume range is recalculated as if the max volume is 0dB.</div><div class='del'>- */</div><div class='del'>-void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,</div><div class='del'>-			     unsigned int *tlv)</div><div class='del'>-{</div><div class='del'>-	u32 caps;</div><div class='del'>-	int nums, step;</div><div class='del'>-</div><div class='del'>-	caps = query_amp_caps(codec, nid, dir);</div><div class='del'>-	nums = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	step = (caps &amp; AC_AMPCAP_STEP_SIZE) &gt;&gt; AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='del'>-	step = (step + 1) * 25;</div><div class='del'>-	tlv[0] = SNDRV_CTL_TLVT_DB_SCALE;</div><div class='del'>-	tlv[1] = 2 * sizeof(unsigned int);</div><div class='del'>-	tlv[2] = -nums * step;</div><div class='del'>-	tlv[3] = step;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_set_vmaster_tlv);</div><div class='del'>-</div><div class='del'>-/* find a mixer control element with the given name */</div><div class='del'>-static struct snd_kcontrol *</div><div class='del'>-_snd_hda_find_mixer_ctl(struct hda_codec *codec,</div><div class='del'>-			const char *name, int idx)</div><div class='del'>-{</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='del'>-	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	id.index = idx;</div><div class='del'>-	if (snd_BUG_ON(strlen(name) &gt;= sizeof(id.name)))</div><div class='del'>-		return NULL;</div><div class='del'>-	strcpy(id.name, name);</div><div class='del'>-	return snd_ctl_find_id(codec-&gt;bus-&gt;card, &amp;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_find_mixer_ctl - Find a mixer control element with the given name</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @name: ctl id name string</div><div class='del'>- *</div><div class='del'>- * Get the control element with the given id string and IFACE_MIXER.</div><div class='del'>- */</div><div class='del'>-struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,</div><div class='del'>-					    const char *name)</div><div class='del'>-{</div><div class='del'>-	return _snd_hda_find_mixer_ctl(codec, name, 0);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_ctl_add - Add a control element and assign to the codec</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: corresponding NID (optional)</div><div class='del'>- * @kctl: the control element to assign</div><div class='del'>- *</div><div class='del'>- * Add the given control element to an array inside the codec instance.</div><div class='del'>- * All control elements belonging to a codec are supposed to be added</div><div class='del'>- * by this function so that a proper clean-up works at the free or</div><div class='del'>- * reconfiguration time.</div><div class='del'>- *</div><div class='del'>- * If non-zero @nid is passed, the NID is assigned to the control element.</div><div class='del'>- * The assignment is shown in the codec proc file.</div><div class='del'>- *</div><div class='del'>- * snd_hda_ctl_add() checks the control subdev id field whether</div><div class='del'>- * #HDA_SUBDEV_NID_FLAG bit is set.  If set (and @nid is zero), the lower</div><div class='del'>- * bits value is taken as the NID to assign. The #HDA_NID_ITEM_AMP bit</div><div class='del'>- * specifies if kctl-&gt;private_value is a HDA amplifier value.</div><div class='del'>- */</div><div class='del'>-int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-		    struct snd_kcontrol *kctl)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	unsigned short flags = 0;</div><div class='del'>-	struct hda_nid_item *item;</div><div class='del'>-</div><div class='del'>-	if (kctl-&gt;id.subdevice &amp; HDA_SUBDEV_AMP_FLAG) {</div><div class='del'>-		flags |= HDA_NID_ITEM_AMP;</div><div class='del'>-		if (nid == 0)</div><div class='del'>-			nid = get_amp_nid_(kctl-&gt;private_value);</div><div class='del'>-	}</div><div class='del'>-	if ((kctl-&gt;id.subdevice &amp; HDA_SUBDEV_NID_FLAG) != 0 &amp;&amp; nid == 0)</div><div class='del'>-		nid = kctl-&gt;id.subdevice &amp; 0xffff;</div><div class='del'>-	if (kctl-&gt;id.subdevice &amp; (HDA_SUBDEV_NID_FLAG|HDA_SUBDEV_AMP_FLAG))</div><div class='del'>-		kctl-&gt;id.subdevice = 0;</div><div class='del'>-	err = snd_ctl_add(codec-&gt;bus-&gt;card, kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	item = snd_array_new(&amp;codec-&gt;mixers);</div><div class='del'>-	if (!item)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	item-&gt;kctl = kctl;</div><div class='del'>-	item-&gt;nid = nid;</div><div class='del'>-	item-&gt;flags = flags;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_ctl_add);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_add_nid - Assign a NID to a control element</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: corresponding NID (optional)</div><div class='del'>- * @kctl: the control element to assign</div><div class='del'>- * @index: index to kctl</div><div class='del'>- *</div><div class='del'>- * Add the given control element to an array inside the codec instance.</div><div class='del'>- * This function is used when #snd_hda_ctl_add cannot be used for 1:1</div><div class='del'>- * NID:KCTL mapping - for example "Capture Source" selector.</div><div class='del'>- */</div><div class='del'>-int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,</div><div class='del'>-		    unsigned int index, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_nid_item *item;</div><div class='del'>-</div><div class='del'>-	if (nid &gt; 0) {</div><div class='del'>-		item = snd_array_new(&amp;codec-&gt;nids);</div><div class='del'>-		if (!item)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		item-&gt;kctl = kctl;</div><div class='del'>-		item-&gt;index = index;</div><div class='del'>-		item-&gt;nid = nid;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_ERR "hda-codec: no NID for mapping control %s:%d:%d\n",</div><div class='del'>-	       kctl-&gt;id.name, kctl-&gt;id.index, index);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_add_nid);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_ctls_clear - Clear all controls assigned to the given codec</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- */</div><div class='del'>-void snd_hda_ctls_clear(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct hda_nid_item *items = codec-&gt;mixers.list;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;mixers.used; i++)</div><div class='del'>-		snd_ctl_remove(codec-&gt;bus-&gt;card, items[i].kctl);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;mixers);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;nids);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pseudo device locking</div><div class='del'>- * toggle card-&gt;shutdown to allow/disallow the device access (as a hack)</div><div class='del'>- */</div><div class='del'>-static int hda_lock_devices(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	if (card-&gt;shutdown) {</div><div class='del'>-		spin_unlock(&amp;card-&gt;files_lock);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;shutdown = 1;</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hda_unlock_devices(struct snd_card *card)</div><div class='del'>-{</div><div class='del'>-	spin_lock(&amp;card-&gt;files_lock);</div><div class='del'>-	card-&gt;shutdown = 0;</div><div class='del'>-	spin_unlock(&amp;card-&gt;files_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_reset - Clear all objects assigned to the codec</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- *</div><div class='del'>- * This frees the all PCM and control elements assigned to the codec, and</div><div class='del'>- * clears the caches and restores the pin default configurations.</div><div class='del'>- *</div><div class='del'>- * When a device is being used, it returns -EBSY.  If successfully freed,</div><div class='del'>- * returns zero.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_reset(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = codec-&gt;bus-&gt;card;</div><div class='del'>-	int i, pcm;</div><div class='del'>-</div><div class='del'>-	if (hda_lock_devices(card) &lt; 0)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	/* check whether the codec isn't used by any mixer or PCM streams */</div><div class='del'>-	if (!list_empty(&amp;card-&gt;ctl_files)) {</div><div class='del'>-		hda_unlock_devices(card);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	for (pcm = 0; pcm &lt; codec-&gt;num_pcms; pcm++) {</div><div class='del'>-		struct hda_pcm *cpcm = &amp;codec-&gt;pcm_info[pcm];</div><div class='del'>-		if (!cpcm-&gt;pcm)</div><div class='del'>-			continue;</div><div class='del'>-		if (cpcm-&gt;pcm-&gt;streams[0].substream_opened ||</div><div class='del'>-		    cpcm-&gt;pcm-&gt;streams[1].substream_opened) {</div><div class='del'>-			hda_unlock_devices(card);</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK, let it free */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	cancel_delayed_work(&amp;codec-&gt;power_work);</div><div class='del'>-	flush_workqueue(codec-&gt;bus-&gt;workq);</div><div class='del'>-#endif</div><div class='del'>-	snd_hda_ctls_clear(codec);</div><div class='del'>-	/* relase PCMs */</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_pcms; i++) {</div><div class='del'>-		if (codec-&gt;pcm_info[i].pcm) {</div><div class='del'>-			snd_device_free(card, codec-&gt;pcm_info[i].pcm);</div><div class='del'>-			clear_bit(codec-&gt;pcm_info[i].device,</div><div class='del'>-				  codec-&gt;bus-&gt;pcm_dev_bits);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (codec-&gt;patch_ops.free)</div><div class='del'>-		codec-&gt;patch_ops.free(codec);</div><div class='del'>-	codec-&gt;proc_widget_hook = NULL;</div><div class='del'>-	codec-&gt;spec = NULL;</div><div class='del'>-	free_hda_cache(&amp;codec-&gt;amp_cache);</div><div class='del'>-	free_hda_cache(&amp;codec-&gt;cmd_cache);</div><div class='del'>-	init_hda_cache(&amp;codec-&gt;amp_cache, sizeof(struct hda_amp_info));</div><div class='del'>-	init_hda_cache(&amp;codec-&gt;cmd_cache, sizeof(struct hda_cache_head));</div><div class='del'>-	/* free only driver_pins so that init_pins + user_pins are restored */</div><div class='del'>-	snd_array_free(&amp;codec-&gt;driver_pins);</div><div class='del'>-	restore_pincfgs(codec);</div><div class='del'>-	codec-&gt;num_pcms = 0;</div><div class='del'>-	codec-&gt;pcm_info = NULL;</div><div class='del'>-	codec-&gt;preset = NULL;</div><div class='del'>-	memset(&amp;codec-&gt;patch_ops, 0, sizeof(codec-&gt;patch_ops));</div><div class='del'>-	codec-&gt;slave_dig_outs = NULL;</div><div class='del'>-	codec-&gt;spdif_status_reset = 0;</div><div class='del'>-	module_put(codec-&gt;owner);</div><div class='del'>-	codec-&gt;owner = NULL;</div><div class='del'>-</div><div class='del'>-	/* allow device access again */</div><div class='del'>-	hda_unlock_devices(card);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_add_vmaster - create a virtual master control and add slaves</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @name: vmaster control name</div><div class='del'>- * @tlv: TLV data (optional)</div><div class='del'>- * @slaves: slave control names (optional)</div><div class='del'>- *</div><div class='del'>- * Create a virtual master control with the given name.  The TLV data</div><div class='del'>- * must be either NULL or a valid data.</div><div class='del'>- *</div><div class='del'>- * @slaves is a NULL-terminated array of strings, each of which is a</div><div class='del'>- * slave control name.  All controls with these names are assigned to</div><div class='del'>- * the new virtual master control.</div><div class='del'>- *</div><div class='del'>- * This function returns zero if successful or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_add_vmaster(struct hda_codec *codec, char *name,</div><div class='del'>-			unsigned int *tlv, const char **slaves)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	const char **s;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (s = slaves; *s &amp;&amp; !snd_hda_find_mixer_ctl(codec, *s); s++)</div><div class='del'>-		;</div><div class='del'>-	if (!*s) {</div><div class='del'>-		snd_printdd("No slave found for %s\n", name);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	kctl = snd_ctl_make_virtual_master(name, tlv);</div><div class='del'>-	if (!kctl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (s = slaves; *s; s++) {</div><div class='del'>-		struct snd_kcontrol *sctl;</div><div class='del'>-		int i = 0;</div><div class='del'>-		for (;;) {</div><div class='del'>-			sctl = _snd_hda_find_mixer_ctl(codec, *s, i);</div><div class='del'>-			if (!sctl) {</div><div class='del'>-				if (!i)</div><div class='del'>-					snd_printdd("Cannot find slave %s, "</div><div class='del'>-						    "skipped\n", *s);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			err = snd_ctl_add_slave(kctl, sctl);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_add_vmaster);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_switch_info - Info callback for a standard AMP mixer switch</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	int chs = get_amp_channels(kcontrol);</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='del'>-	uinfo-&gt;count = chs == 3 ? 2 : 1;</div><div class='del'>-	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_info);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_switch_get - Get callback for a standard AMP mixer switch</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='del'>-	int chs = get_amp_channels(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	int idx = get_amp_index(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	if (chs &amp; 1)</div><div class='del'>-		*valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) &amp;</div><div class='del'>-			   HDA_AMP_MUTE) ? 0 : 1;</div><div class='del'>-	if (chs &amp; 2)</div><div class='del'>-		*valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) &amp;</div><div class='del'>-			 HDA_AMP_MUTE) ? 0 : 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_switch_put - Put callback for a standard AMP mixer switch</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_COMPOSE_AMP_VAL*() or related macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = get_amp_nid(kcontrol);</div><div class='del'>-	int chs = get_amp_channels(kcontrol);</div><div class='del'>-	int dir = get_amp_direction(kcontrol);</div><div class='del'>-	int idx = get_amp_index(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change = 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_power_up(codec);</div><div class='del'>-	if (chs &amp; 1) {</div><div class='del'>-		change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,</div><div class='del'>-						  HDA_AMP_MUTE,</div><div class='del'>-						  *valp ? 0 : HDA_AMP_MUTE);</div><div class='del'>-		valp++;</div><div class='del'>-	}</div><div class='del'>-	if (chs &amp; 2)</div><div class='del'>-		change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,</div><div class='del'>-						   HDA_AMP_MUTE,</div><div class='del'>-						   *valp ? 0 : HDA_AMP_MUTE);</div><div class='del'>-	hda_call_check_power_status(codec, nid);</div><div class='del'>-	snd_hda_power_down(codec);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_amp_switch_put_beep - Put callback for a beep AMP switch</div><div class='del'>- *</div><div class='del'>- * This function calls snd_hda_enable_beep_device(), which behaves differently</div><div class='del'>- * depending on beep_mode option.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,</div><div class='del'>-				      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	snd_hda_enable_beep_device(codec, *valp);</div><div class='del'>-	return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);</div><div class='del'>-#endif /* CONFIG_SND_HDA_INPUT_BEEP */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * bound volume controls</div><div class='del'>- *</div><div class='del'>- * bind multiple volumes (# indices, from 0)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AMP_VAL_IDX_SHIFT	19</div><div class='del'>-#define AMP_VAL_IDX_MASK	(0x0f&lt;&lt;19)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_switch_get - Get callback for a bound volume control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_MUTE*() macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long pval;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	pval = kcontrol-&gt;private_value;</div><div class='del'>-	kcontrol-&gt;private_value = pval &amp; ~AMP_VAL_IDX_MASK; /* index 0 */</div><div class='del'>-	err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);</div><div class='del'>-	kcontrol-&gt;private_value = pval;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_switch_put - Put callback for a bound volume control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_MUTE*() macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned long pval;</div><div class='del'>-	int i, indices, err = 0, change = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	pval = kcontrol-&gt;private_value;</div><div class='del'>-	indices = (pval &amp; AMP_VAL_IDX_MASK) &gt;&gt; AMP_VAL_IDX_SHIFT;</div><div class='del'>-	for (i = 0; i &lt; indices; i++) {</div><div class='del'>-		kcontrol-&gt;private_value = (pval &amp; ~AMP_VAL_IDX_MASK) |</div><div class='del'>-			(i &lt;&lt; AMP_VAL_IDX_SHIFT);</div><div class='del'>-		err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		change |= err;</div><div class='del'>-	}</div><div class='del'>-	kcontrol-&gt;private_value = pval;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err &lt; 0 ? err : change;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_ctls_info - Info callback for a generic bound control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_bind_ctls *c;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	c = (struct hda_bind_ctls *)kcontrol-&gt;private_value;</div><div class='del'>-	kcontrol-&gt;private_value = *c-&gt;values;</div><div class='del'>-	err = c-&gt;ops-&gt;info(kcontrol, uinfo);</div><div class='del'>-	kcontrol-&gt;private_value = (long)c;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_ctls_get - Get callback for a generic bound control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_bind_ctls *c;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	c = (struct hda_bind_ctls *)kcontrol-&gt;private_value;</div><div class='del'>-	kcontrol-&gt;private_value = *c-&gt;values;</div><div class='del'>-	err = c-&gt;ops-&gt;get(kcontrol, ucontrol);</div><div class='del'>-	kcontrol-&gt;private_value = (long)c;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_ctls_put - Put callback for a generic bound control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_VOL() or HDA_BIND_SW() macros.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_bind_ctls *c;</div><div class='del'>-	unsigned long *vals;</div><div class='del'>-	int err = 0, change = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	c = (struct hda_bind_ctls *)kcontrol-&gt;private_value;</div><div class='del'>-	for (vals = c-&gt;values; *vals; vals++) {</div><div class='del'>-		kcontrol-&gt;private_value = *vals;</div><div class='del'>-		err = c-&gt;ops-&gt;put(kcontrol, ucontrol);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-		change |= err;</div><div class='del'>-	}</div><div class='del'>-	kcontrol-&gt;private_value = (long)c;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err &lt; 0 ? err : change;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_mixer_bind_tlv - TLV callback for a generic bound control</div><div class='del'>- *</div><div class='del'>- * The control element is supposed to have the private_value field</div><div class='del'>- * set up via HDA_BIND_VOL() macro.</div><div class='del'>- */</div><div class='del'>-int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='del'>-			   unsigned int size, unsigned int __user *tlv)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_bind_ctls *c;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	c = (struct hda_bind_ctls *)kcontrol-&gt;private_value;</div><div class='del'>-	kcontrol-&gt;private_value = *c-&gt;values;</div><div class='del'>-	err = c-&gt;ops-&gt;tlv(kcontrol, op_flag, size, tlv);</div><div class='del'>-	kcontrol-&gt;private_value = (long)c;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv);</div><div class='del'>-</div><div class='del'>-struct hda_ctl_ops snd_hda_bind_vol = {</div><div class='del'>-	.info = snd_hda_mixer_amp_volume_info,</div><div class='del'>-	.get = snd_hda_mixer_amp_volume_get,</div><div class='del'>-	.put = snd_hda_mixer_amp_volume_put,</div><div class='del'>-	.tlv = snd_hda_mixer_amp_tlv</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_bind_vol);</div><div class='del'>-</div><div class='del'>-struct hda_ctl_ops snd_hda_bind_sw = {</div><div class='del'>-	.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-	.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-	.put = snd_hda_mixer_amp_switch_put,</div><div class='del'>-	.tlv = snd_hda_mixer_amp_tlv</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_bind_sw);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPDIF out controls</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_mask_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_IEC958;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_cmask_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	ucontrol-&gt;value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |</div><div class='del'>-					   IEC958_AES0_NONAUDIO |</div><div class='del'>-					   IEC958_AES0_CON_EMPHASIS_5015 |</div><div class='del'>-					   IEC958_AES0_CON_NOT_COPYRIGHT;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[1] = IEC958_AES1_CON_CATEGORY |</div><div class='del'>-					   IEC958_AES1_CON_ORIGINAL;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_pmask_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	ucontrol-&gt;value.iec958.status[0] = IEC958_AES0_PROFESSIONAL |</div><div class='del'>-					   IEC958_AES0_NONAUDIO |</div><div class='del'>-					   IEC958_AES0_PRO_EMPHASIS_5015;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.iec958.status[0] = codec-&gt;spdif_status &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[1] = (codec-&gt;spdif_status &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[2] = (codec-&gt;spdif_status &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[3] = (codec-&gt;spdif_status &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* convert from SPDIF status bits to HDA SPDIF bits</div><div class='del'>- * bit 0 (DigEn) is always set zero (to be filled later)</div><div class='del'>- */</div><div class='del'>-static unsigned short convert_from_spdif_status(unsigned int sbits)</div><div class='del'>-{</div><div class='del'>-	unsigned short val = 0;</div><div class='del'>-</div><div class='del'>-	if (sbits &amp; IEC958_AES0_PROFESSIONAL)</div><div class='del'>-		val |= AC_DIG1_PROFESSIONAL;</div><div class='del'>-	if (sbits &amp; IEC958_AES0_NONAUDIO)</div><div class='del'>-		val |= AC_DIG1_NONAUDIO;</div><div class='del'>-	if (sbits &amp; IEC958_AES0_PROFESSIONAL) {</div><div class='del'>-		if ((sbits &amp; IEC958_AES0_PRO_EMPHASIS) ==</div><div class='del'>-		    IEC958_AES0_PRO_EMPHASIS_5015)</div><div class='del'>-			val |= AC_DIG1_EMPHASIS;</div><div class='del'>-	} else {</div><div class='del'>-		if ((sbits &amp; IEC958_AES0_CON_EMPHASIS) ==</div><div class='del'>-		    IEC958_AES0_CON_EMPHASIS_5015)</div><div class='del'>-			val |= AC_DIG1_EMPHASIS;</div><div class='del'>-		if (!(sbits &amp; IEC958_AES0_CON_NOT_COPYRIGHT))</div><div class='del'>-			val |= AC_DIG1_COPYRIGHT;</div><div class='del'>-		if (sbits &amp; (IEC958_AES1_CON_ORIGINAL &lt;&lt; 8))</div><div class='del'>-			val |= AC_DIG1_LEVEL;</div><div class='del'>-		val |= sbits &amp; (IEC958_AES1_CON_CATEGORY &lt;&lt; 8);</div><div class='del'>-	}</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* convert to SPDIF status bits from HDA SPDIF bits</div><div class='del'>- */</div><div class='del'>-static unsigned int convert_to_spdif_status(unsigned short val)</div><div class='del'>-{</div><div class='del'>-	unsigned int sbits = 0;</div><div class='del'>-</div><div class='del'>-	if (val &amp; AC_DIG1_NONAUDIO)</div><div class='del'>-		sbits |= IEC958_AES0_NONAUDIO;</div><div class='del'>-	if (val &amp; AC_DIG1_PROFESSIONAL)</div><div class='del'>-		sbits |= IEC958_AES0_PROFESSIONAL;</div><div class='del'>-	if (sbits &amp; IEC958_AES0_PROFESSIONAL) {</div><div class='del'>-		if (sbits &amp; AC_DIG1_EMPHASIS)</div><div class='del'>-			sbits |= IEC958_AES0_PRO_EMPHASIS_5015;</div><div class='del'>-	} else {</div><div class='del'>-		if (val &amp; AC_DIG1_EMPHASIS)</div><div class='del'>-			sbits |= IEC958_AES0_CON_EMPHASIS_5015;</div><div class='del'>-		if (!(val &amp; AC_DIG1_COPYRIGHT))</div><div class='del'>-			sbits |= IEC958_AES0_CON_NOT_COPYRIGHT;</div><div class='del'>-		if (val &amp; AC_DIG1_LEVEL)</div><div class='del'>-			sbits |= (IEC958_AES1_CON_ORIGINAL &lt;&lt; 8);</div><div class='del'>-		sbits |= val &amp; (0x7f &lt;&lt; 8);</div><div class='del'>-	}</div><div class='del'>-	return sbits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set digital convert verbs both for the given NID and its slaves */</div><div class='del'>-static void set_dig_out(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			int verb, int val)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t *d;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0, verb, val);</div><div class='del'>-	d = codec-&gt;slave_dig_outs;</div><div class='del'>-	if (!d)</div><div class='del'>-		return;</div><div class='del'>-	for (; *d; d++)</div><div class='del'>-		snd_hda_codec_write_cache(codec, *d, 0, verb, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				       int dig1, int dig2)</div><div class='del'>-{</div><div class='del'>-	if (dig1 != -1)</div><div class='del'>-		set_dig_out(codec, nid, AC_VERB_SET_DIGI_CONVERT_1, dig1);</div><div class='del'>-	if (dig2 != -1)</div><div class='del'>-		set_dig_out(codec, nid, AC_VERB_SET_DIGI_CONVERT_2, dig2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned short val;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	codec-&gt;spdif_status = ucontrol-&gt;value.iec958.status[0] |</div><div class='del'>-		((unsigned int)ucontrol-&gt;value.iec958.status[1] &lt;&lt; 8) |</div><div class='del'>-		((unsigned int)ucontrol-&gt;value.iec958.status[2] &lt;&lt; 16) |</div><div class='del'>-		((unsigned int)ucontrol-&gt;value.iec958.status[3] &lt;&lt; 24);</div><div class='del'>-	val = convert_from_spdif_status(codec-&gt;spdif_status);</div><div class='del'>-	val |= codec-&gt;spdif_ctls &amp; 1;</div><div class='del'>-	change = codec-&gt;spdif_ctls != val;</div><div class='del'>-	codec-&gt;spdif_ctls = val;</div><div class='del'>-</div><div class='del'>-	if (change)</div><div class='del'>-		set_dig_out_convert(codec, nid, val &amp; 0xff, (val &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define snd_hda_spdif_out_switch_info	snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-					struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned short val;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	val = codec-&gt;spdif_ctls &amp; ~AC_DIG1_ENABLE;</div><div class='del'>-	if (ucontrol-&gt;value.integer.value[0])</div><div class='del'>-		val |= AC_DIG1_ENABLE;</div><div class='del'>-	change = codec-&gt;spdif_ctls != val;</div><div class='del'>-	if (change) {</div><div class='del'>-		codec-&gt;spdif_ctls = val;</div><div class='del'>-		set_dig_out_convert(codec, nid, val &amp; 0xff, -1);</div><div class='del'>-		/* unmute amp switch (if any) */</div><div class='del'>-		if ((get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP) &amp;&amp;</div><div class='del'>-		    (val &amp; AC_DIG1_ENABLE))</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-						 HDA_AMP_MUTE, 0);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new dig_mixes[] = {</div><div class='del'>-	{</div><div class='del'>-		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK),</div><div class='del'>-		.info = snd_hda_spdif_mask_info,</div><div class='del'>-		.get = snd_hda_spdif_cmask_get,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK),</div><div class='del'>-		.info = snd_hda_spdif_mask_info,</div><div class='del'>-		.get = snd_hda_spdif_pmask_get,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),</div><div class='del'>-		.info = snd_hda_spdif_mask_info,</div><div class='del'>-		.get = snd_hda_spdif_default_get,</div><div class='del'>-		.put = snd_hda_spdif_default_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),</div><div class='del'>-		.info = snd_hda_spdif_out_switch_info,</div><div class='del'>-		.get = snd_hda_spdif_out_switch_get,</div><div class='del'>-		.put = snd_hda_spdif_out_switch_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SPDIF_MAX_IDX	4	/* 4 instances should be enough to probe */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_create_spdif_out_ctls - create Output SPDIF-related controls</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: audio out widget NID</div><div class='del'>- *</div><div class='del'>- * Creates controls related with the SPDIF output.</div><div class='del'>- * Called from each patch supporting the SPDIF out.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	struct snd_kcontrol_new *dig_mix;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; SPDIF_MAX_IDX; idx++) {</div><div class='del'>-		if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Playback Switch",</div><div class='del'>-					     idx))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (idx &gt;= SPDIF_MAX_IDX) {</div><div class='del'>-		printk(KERN_ERR "hda_codec: too many IEC958 outputs\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	for (dig_mix = dig_mixes; dig_mix-&gt;name; dig_mix++) {</div><div class='del'>-		kctl = snd_ctl_new1(dig_mix, codec);</div><div class='del'>-		if (!kctl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		kctl-&gt;id.index = idx;</div><div class='del'>-		kctl-&gt;private_value = nid;</div><div class='del'>-		err = snd_hda_ctl_add(codec, nid, kctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;spdif_ctls =</div><div class='del'>-		snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				   AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='del'>-	codec-&gt;spdif_status = convert_to_spdif_status(codec-&gt;spdif_ctls);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_out_ctls);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPDIF sharing with analog output</div><div class='del'>- */</div><div class='del'>-static int spdif_share_sw_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = mout-&gt;share_spdif;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int spdif_share_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_multi_out *mout = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	mout-&gt;share_spdif = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new spdif_share_sw = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name = "IEC958 Default PCM Playback Switch",</div><div class='del'>-	.info = snd_ctl_boolean_mono_info,</div><div class='del'>-	.get = spdif_share_sw_get,</div><div class='del'>-	.put = spdif_share_sw_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_create_spdif_share_sw - create Default PCM switch</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @mout: multi-out instance</div><div class='del'>- */</div><div class='del'>-int snd_hda_create_spdif_share_sw(struct hda_codec *codec,</div><div class='del'>-				  struct hda_multi_out *mout)</div><div class='del'>-{</div><div class='del'>-	if (!mout-&gt;dig_out_nid)</div><div class='del'>-		return 0;</div><div class='del'>-	/* ATTENTION: here mout is passed as private_data, instead of codec */</div><div class='del'>-	return snd_hda_ctl_add(codec, mout-&gt;dig_out_nid,</div><div class='del'>-			      snd_ctl_new1(&amp;spdif_share_sw, mout));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_share_sw);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPDIF input</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define snd_hda_spdif_in_switch_info	snd_hda_spdif_out_switch_info</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_in_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				       struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = codec-&gt;spdif_in_enable;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				       struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int val = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	change = codec-&gt;spdif_in_enable != val;</div><div class='del'>-	if (change) {</div><div class='del'>-		codec-&gt;spdif_in_enable = val;</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_DIGI_CONVERT_1, val);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				       struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned short val;</div><div class='del'>-	unsigned int sbits;</div><div class='del'>-</div><div class='del'>-	val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0);</div><div class='del'>-	sbits = convert_to_spdif_status(val);</div><div class='del'>-	ucontrol-&gt;value.iec958.status[0] = sbits;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[1] = sbits &gt;&gt; 8;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[2] = sbits &gt;&gt; 16;</div><div class='del'>-	ucontrol-&gt;value.iec958.status[3] = sbits &gt;&gt; 24;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new dig_in_ctls[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),</div><div class='del'>-		.info = snd_hda_spdif_in_switch_info,</div><div class='del'>-		.get = snd_hda_spdif_in_switch_get,</div><div class='del'>-		.put = snd_hda_spdif_in_switch_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT),</div><div class='del'>-		.info = snd_hda_spdif_mask_info,</div><div class='del'>-		.get = snd_hda_spdif_in_status_get,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_create_spdif_in_ctls - create Input SPDIF-related controls</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: audio in widget NID</div><div class='del'>- *</div><div class='del'>- * Creates controls related with the SPDIF input.</div><div class='del'>- * Called from each patch supporting the SPDIF in.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	struct snd_kcontrol_new *dig_mix;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; SPDIF_MAX_IDX; idx++) {</div><div class='del'>-		if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Capture Switch",</div><div class='del'>-					     idx))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (idx &gt;= SPDIF_MAX_IDX) {</div><div class='del'>-		printk(KERN_ERR "hda_codec: too many IEC958 inputs\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	for (dig_mix = dig_in_ctls; dig_mix-&gt;name; dig_mix++) {</div><div class='del'>-		kctl = snd_ctl_new1(dig_mix, codec);</div><div class='del'>-		if (!kctl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		kctl-&gt;private_value = nid;</div><div class='del'>-		err = snd_hda_ctl_add(codec, nid, kctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;spdif_in_enable =</div><div class='del'>-		snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				   AC_VERB_GET_DIGI_CONVERT_1, 0) &amp;</div><div class='del'>-		AC_DIG1_ENABLE;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_create_spdif_in_ctls);</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-/*</div><div class='del'>- * command cache</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* build a 32bit cache key with the widget id and the command parameter */</div><div class='del'>-#define build_cmd_cache_key(nid, verb)	((verb &lt;&lt; 8) | nid)</div><div class='del'>-#define get_cmd_cache_nid(key)		((key) &amp; 0xff)</div><div class='del'>-#define get_cmd_cache_cmd(key)		(((key) &gt;&gt; 8) &amp; 0xffff)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_write_cache - send a single command with caching</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to send the command</div><div class='del'>- * @direct: direct flag</div><div class='del'>- * @verb: the verb to send</div><div class='del'>- * @parm: the parameter for the verb</div><div class='del'>- *</div><div class='del'>- * Send a single command without waiting for response.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			      int direct, unsigned int verb, unsigned int parm)</div><div class='del'>-{</div><div class='del'>-	int err = snd_hda_codec_write(codec, nid, direct, verb, parm);</div><div class='del'>-	struct hda_cache_head *c;</div><div class='del'>-	u32 key;</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	/* parm may contain the verb stuff for get/set amp */</div><div class='del'>-	verb = verb | (parm &gt;&gt; 8);</div><div class='del'>-	parm &amp;= 0xff;</div><div class='del'>-	key = build_cmd_cache_key(nid, verb);</div><div class='del'>-	mutex_lock(&amp;codec-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	c = get_alloc_hash(&amp;codec-&gt;cmd_cache, key);</div><div class='del'>-	if (c)</div><div class='del'>-		c-&gt;val = parm;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_write_cache);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_update_cache - check cache and write the cmd only when needed</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to send the command</div><div class='del'>- * @direct: direct flag</div><div class='del'>- * @verb: the verb to send</div><div class='del'>- * @parm: the parameter for the verb</div><div class='del'>- *</div><div class='del'>- * This function works like snd_hda_codec_write_cache(), but it doesn't send</div><div class='del'>- * command if the parameter is already identical with the cached value.</div><div class='del'>- * If not, it sends the command and refreshes the cache.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_update_cache(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			       int direct, unsigned int verb, unsigned int parm)</div><div class='del'>-{</div><div class='del'>-	struct hda_cache_head *c;</div><div class='del'>-	u32 key;</div><div class='del'>-</div><div class='del'>-	/* parm may contain the verb stuff for get/set amp */</div><div class='del'>-	verb = verb | (parm &gt;&gt; 8);</div><div class='del'>-	parm &amp;= 0xff;</div><div class='del'>-	key = build_cmd_cache_key(nid, verb);</div><div class='del'>-	mutex_lock(&amp;codec-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	c = get_hash(&amp;codec-&gt;cmd_cache, key);</div><div class='del'>-	if (c &amp;&amp; c-&gt;val == parm) {</div><div class='del'>-		mutex_unlock(&amp;codec-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	return snd_hda_codec_write_cache(codec, nid, direct, verb, parm);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_update_cache);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_codec_resume_cache - Resume the all commands from the cache</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Execute all verbs recorded in the command caches to resume.</div><div class='del'>- */</div><div class='del'>-void snd_hda_codec_resume_cache(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_cache_head *buffer = codec-&gt;cmd_cache.buf.list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;cmd_cache.buf.used; i++, buffer++) {</div><div class='del'>-		u32 key = buffer-&gt;key;</div><div class='del'>-		if (!key)</div><div class='del'>-			continue;</div><div class='del'>-		snd_hda_codec_write(codec, get_cmd_cache_nid(key), 0,</div><div class='del'>-				    get_cmd_cache_cmd(key), buffer-&gt;val);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_resume_cache);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_sequence_write_cache - sequence writes with caching</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @seq: VERB array to send</div><div class='del'>- *</div><div class='del'>- * Send the commands sequentially from the given array.</div><div class='del'>- * Thte commands are recorded on cache for power-save and resume.</div><div class='del'>- * The array must be terminated with NID=0.</div><div class='del'>- */</div><div class='del'>-void snd_hda_sequence_write_cache(struct hda_codec *codec,</div><div class='del'>-				  const struct hda_verb *seq)</div><div class='del'>-{</div><div class='del'>-	for (; seq-&gt;nid; seq++)</div><div class='del'>-		snd_hda_codec_write_cache(codec, seq-&gt;nid, 0, seq-&gt;verb,</div><div class='del'>-					  seq-&gt;param);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_sequence_write_cache);</div><div class='del'>-#endif /* SND_HDA_NEEDS_RESUME */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set power state of the codec</div><div class='del'>- */</div><div class='del'>-static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,</div><div class='del'>-				unsigned int power_state)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* this delay seems necessary to avoid click noise at power-down */</div><div class='del'>-	if (power_state == AC_PWRST_D3)</div><div class='del'>-		msleep(100);</div><div class='del'>-	snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-			    power_state);</div><div class='del'>-	/* partial workaround for "azx_get_response timeout" */</div><div class='del'>-	if (power_state == AC_PWRST_D0 &amp;&amp;</div><div class='del'>-	    (codec-&gt;vendor_id &amp; 0xffff0000) == 0x14f10000)</div><div class='del'>-		msleep(10);</div><div class='del'>-</div><div class='del'>-	nid = codec-&gt;start_nid;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='del'>-		if (wcaps &amp; AC_WCAP_POWER) {</div><div class='del'>-			unsigned int wid_type = get_wcaps_type(wcaps);</div><div class='del'>-			if (power_state == AC_PWRST_D3 &amp;&amp;</div><div class='del'>-			    wid_type == AC_WID_PIN) {</div><div class='del'>-				unsigned int pincap;</div><div class='del'>-				/*</div><div class='del'>-				 * don't power down the widget if it controls</div><div class='del'>-				 * eapd and EAPD_BTLENABLE is set.</div><div class='del'>-				 */</div><div class='del'>-				pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-				if (pincap &amp; AC_PINCAP_EAPD) {</div><div class='del'>-					int eapd = snd_hda_codec_read(codec,</div><div class='del'>-						nid, 0,</div><div class='del'>-						AC_VERB_GET_EAPD_BTLENABLE, 0);</div><div class='del'>-					eapd &amp;= 0x02;</div><div class='del'>-					if (eapd)</div><div class='del'>-						continue;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    power_state);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (power_state == AC_PWRST_D0) {</div><div class='del'>-		unsigned long end_time;</div><div class='del'>-		int state;</div><div class='del'>-		/* wait until the codec reachs to D0 */</div><div class='del'>-		end_time = jiffies + msecs_to_jiffies(500);</div><div class='del'>-		do {</div><div class='del'>-			state = snd_hda_codec_read(codec, fg, 0,</div><div class='del'>-						   AC_VERB_GET_POWER_STATE, 0);</div><div class='del'>-			if (state == power_state)</div><div class='del'>-				break;</div><div class='del'>-			msleep(1);</div><div class='del'>-		} while (time_after_eq(end_time, jiffies));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_HWDEP</div><div class='del'>-/* execute additional init verbs */</div><div class='del'>-static void hda_exec_init_verbs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;init_verbs.list)</div><div class='del'>-		snd_hda_sequence_write(codec, codec-&gt;init_verbs.list);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void hda_exec_init_verbs(struct hda_codec *codec) {}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-/*</div><div class='del'>- * call suspend and power-down; used both from PM and power-save</div><div class='del'>- */</div><div class='del'>-static void hda_call_codec_suspend(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;patch_ops.suspend)</div><div class='del'>-		codec-&gt;patch_ops.suspend(codec, PMSG_SUSPEND);</div><div class='del'>-	hda_cleanup_all_streams(codec);</div><div class='del'>-	hda_set_power_state(codec,</div><div class='del'>-			    codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg,</div><div class='del'>-			    AC_PWRST_D3);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	snd_hda_update_power_acct(codec);</div><div class='del'>-	cancel_delayed_work(&amp;codec-&gt;power_work);</div><div class='del'>-	codec-&gt;power_on = 0;</div><div class='del'>-	codec-&gt;power_transition = 0;</div><div class='del'>-	codec-&gt;power_jiffies = jiffies;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * kick up codec; used both from PM and power-save</div><div class='del'>- */</div><div class='del'>-static void hda_call_codec_resume(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	hda_set_power_state(codec,</div><div class='del'>-			    codec-&gt;afg ? codec-&gt;afg : codec-&gt;mfg,</div><div class='del'>-			    AC_PWRST_D0);</div><div class='del'>-	restore_pincfgs(codec); /* restore all current pin configs */</div><div class='del'>-	restore_shutup_pins(codec);</div><div class='del'>-	hda_exec_init_verbs(codec);</div><div class='del'>-	if (codec-&gt;patch_ops.resume)</div><div class='del'>-		codec-&gt;patch_ops.resume(codec);</div><div class='del'>-	else {</div><div class='del'>-		if (codec-&gt;patch_ops.init)</div><div class='del'>-			codec-&gt;patch_ops.init(codec);</div><div class='del'>-		snd_hda_codec_resume_amp(codec);</div><div class='del'>-		snd_hda_codec_resume_cache(codec);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif /* SND_HDA_NEEDS_RESUME */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_build_controls - build mixer controls</div><div class='del'>- * @bus: the BUS</div><div class='del'>- *</div><div class='del'>- * Creates mixer controls for each codec included in the bus.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, otherwise a negative error code.</div><div class='del'>- */</div><div class='del'>-int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		int err = snd_hda_codec_build_controls(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "hda_codec: cannot build controls "</div><div class='del'>-			       "for #%d (error %d)\n", codec-&gt;addr, err);</div><div class='del'>-			err = snd_hda_codec_reset(codec);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				printk(KERN_ERR</div><div class='del'>-				       "hda_codec: cannot revert codec\n");</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_build_controls);</div><div class='del'>-</div><div class='del'>-int snd_hda_codec_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-	hda_exec_init_verbs(codec);</div><div class='del'>-	/* continue to initialize... */</div><div class='del'>-	if (codec-&gt;patch_ops.init)</div><div class='del'>-		err = codec-&gt;patch_ops.init(codec);</div><div class='del'>-	if (!err &amp;&amp; codec-&gt;patch_ops.build_controls)</div><div class='del'>-		err = codec-&gt;patch_ops.build_controls(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * stream formats</div><div class='del'>- */</div><div class='del'>-struct hda_rate_tbl {</div><div class='del'>-	unsigned int hz;</div><div class='del'>-	unsigned int alsa_bits;</div><div class='del'>-	unsigned int hda_fmt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* rate = base * mult / div */</div><div class='del'>-#define HDA_RATE(base, mult, div) \</div><div class='del'>-	(AC_FMT_BASE_##base##K | (((mult) - 1) &lt;&lt; AC_FMT_MULT_SHIFT) | \</div><div class='del'>-	 (((div) - 1) &lt;&lt; AC_FMT_DIV_SHIFT))</div><div class='del'>-</div><div class='del'>-static struct hda_rate_tbl rate_bits[] = {</div><div class='del'>-	/* rate in Hz, ALSA rate bitmask, HDA format value */</div><div class='del'>-</div><div class='del'>-	/* autodetected value used in snd_hda_query_supported_pcm */</div><div class='del'>-	{ 8000, SNDRV_PCM_RATE_8000, HDA_RATE(48, 1, 6) },</div><div class='del'>-	{ 11025, SNDRV_PCM_RATE_11025, HDA_RATE(44, 1, 4) },</div><div class='del'>-	{ 16000, SNDRV_PCM_RATE_16000, HDA_RATE(48, 1, 3) },</div><div class='del'>-	{ 22050, SNDRV_PCM_RATE_22050, HDA_RATE(44, 1, 2) },</div><div class='del'>-	{ 32000, SNDRV_PCM_RATE_32000, HDA_RATE(48, 2, 3) },</div><div class='del'>-	{ 44100, SNDRV_PCM_RATE_44100, HDA_RATE(44, 1, 1) },</div><div class='del'>-	{ 48000, SNDRV_PCM_RATE_48000, HDA_RATE(48, 1, 1) },</div><div class='del'>-	{ 88200, SNDRV_PCM_RATE_88200, HDA_RATE(44, 2, 1) },</div><div class='del'>-	{ 96000, SNDRV_PCM_RATE_96000, HDA_RATE(48, 2, 1) },</div><div class='del'>-	{ 176400, SNDRV_PCM_RATE_176400, HDA_RATE(44, 4, 1) },</div><div class='del'>-	{ 192000, SNDRV_PCM_RATE_192000, HDA_RATE(48, 4, 1) },</div><div class='del'>-#define AC_PAR_PCM_RATE_BITS	11</div><div class='del'>-	/* up to bits 10, 384kHZ isn't supported properly */</div><div class='del'>-</div><div class='del'>-	/* not autodetected value */</div><div class='del'>-	{ 9600, SNDRV_PCM_RATE_KNOT, HDA_RATE(48, 1, 5) },</div><div class='del'>-</div><div class='del'>-	{ 0 } /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_calc_stream_format - calculate format bitset</div><div class='del'>- * @rate: the sample rate</div><div class='del'>- * @channels: the number of channels</div><div class='del'>- * @format: the PCM format (SNDRV_PCM_FORMAT_XXX)</div><div class='del'>- * @maxbps: the max. bps</div><div class='del'>- *</div><div class='del'>- * Calculate the format bitset from the given rate, channels and th PCM format.</div><div class='del'>- *</div><div class='del'>- * Return zero if invalid.</div><div class='del'>- */</div><div class='del'>-unsigned int snd_hda_calc_stream_format(unsigned int rate,</div><div class='del'>-					unsigned int channels,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					unsigned int maxbps,</div><div class='del'>-					unsigned short spdif_ctls)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int val = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; rate_bits[i].hz; i++)</div><div class='del'>-		if (rate_bits[i].hz == rate) {</div><div class='del'>-			val = rate_bits[i].hda_fmt;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	if (!rate_bits[i].hz) {</div><div class='del'>-		snd_printdd("invalid rate %d\n", rate);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (channels == 0 || channels &gt; 8) {</div><div class='del'>-		snd_printdd("invalid channels %d\n", channels);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	val |= channels - 1;</div><div class='del'>-</div><div class='del'>-	switch (snd_pcm_format_width(format)) {</div><div class='del'>-	case 8:</div><div class='del'>-		val |= AC_FMT_BITS_8;</div><div class='del'>-		break;</div><div class='del'>-	case 16:</div><div class='del'>-		val |= AC_FMT_BITS_16;</div><div class='del'>-		break;</div><div class='del'>-	case 20:</div><div class='del'>-	case 24:</div><div class='del'>-	case 32:</div><div class='del'>-		if (maxbps &gt;= 32 || format == SNDRV_PCM_FORMAT_FLOAT_LE)</div><div class='del'>-			val |= AC_FMT_BITS_32;</div><div class='del'>-		else if (maxbps &gt;= 24)</div><div class='del'>-			val |= AC_FMT_BITS_24;</div><div class='del'>-		else</div><div class='del'>-			val |= AC_FMT_BITS_20;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		snd_printdd("invalid format width %d\n",</div><div class='del'>-			    snd_pcm_format_width(format));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spdif_ctls &amp; AC_DIG1_NONAUDIO)</div><div class='del'>-		val |= AC_FMT_TYPE_NON_PCM;</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_calc_stream_format);</div><div class='del'>-</div><div class='del'>-static unsigned int get_pcm_param(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int val = 0;</div><div class='del'>-	if (nid != codec-&gt;afg &amp;&amp;</div><div class='del'>-	    (get_wcaps(codec, nid) &amp; AC_WCAP_FORMAT_OVRD))</div><div class='del'>-		val = snd_hda_param_read(codec, nid, AC_PAR_PCM);</div><div class='del'>-	if (!val || val == -1)</div><div class='del'>-		val = snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_PCM);</div><div class='del'>-	if (!val || val == -1)</div><div class='del'>-		return 0;</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int query_pcm_param(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return query_caps_hash(codec, nid, HDA_HASH_PARPCM_KEY(nid),</div><div class='del'>-			       get_pcm_param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int get_stream_param(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int streams = snd_hda_param_read(codec, nid, AC_PAR_STREAM);</div><div class='del'>-	if (!streams || streams == -1)</div><div class='del'>-		streams = snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_STREAM);</div><div class='del'>-	if (!streams || streams == -1)</div><div class='del'>-		return 0;</div><div class='del'>-	return streams;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int query_stream_param(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return query_caps_hash(codec, nid, HDA_HASH_PARSTR_KEY(nid),</div><div class='del'>-			       get_stream_param);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_query_supported_pcm - query the supported PCM rates and formats</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @nid: NID to query</div><div class='del'>- * @ratesp: the pointer to store the detected rate bitflags</div><div class='del'>- * @formatsp: the pointer to store the detected formats</div><div class='del'>- * @bpsp: the pointer to store the detected format widths</div><div class='del'>- *</div><div class='del'>- * Queries the supported PCM rates and formats.  The NULL @ratesp, @formatsp</div><div class='del'>- * or @bsps argument is ignored.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, otherwise a negative error code.</div><div class='del'>- */</div><div class='del'>-static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				u32 *ratesp, u64 *formatsp, unsigned int *bpsp)</div><div class='del'>-{</div><div class='del'>-	unsigned int i, val, wcaps;</div><div class='del'>-</div><div class='del'>-	wcaps = get_wcaps(codec, nid);</div><div class='del'>-	val = query_pcm_param(codec, nid);</div><div class='del'>-</div><div class='del'>-	if (ratesp) {</div><div class='del'>-		u32 rates = 0;</div><div class='del'>-		for (i = 0; i &lt; AC_PAR_PCM_RATE_BITS; i++) {</div><div class='del'>-			if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-				rates |= rate_bits[i].alsa_bits;</div><div class='del'>-		}</div><div class='del'>-		if (rates == 0) {</div><div class='del'>-			snd_printk(KERN_ERR "hda_codec: rates == 0 "</div><div class='del'>-				   "(nid=0x%x, val=0x%x, ovrd=%i)\n",</div><div class='del'>-					nid, val,</div><div class='del'>-					(wcaps &amp; AC_WCAP_FORMAT_OVRD) ? 1 : 0);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		*ratesp = rates;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (formatsp || bpsp) {</div><div class='del'>-		u64 formats = 0;</div><div class='del'>-		unsigned int streams, bps;</div><div class='del'>-</div><div class='del'>-		streams = query_stream_param(codec, nid);</div><div class='del'>-		if (!streams)</div><div class='del'>-			return -EIO;</div><div class='del'>-</div><div class='del'>-		bps = 0;</div><div class='del'>-		if (streams &amp; AC_SUPFMT_PCM) {</div><div class='del'>-			if (val &amp; AC_SUPPCM_BITS_8) {</div><div class='del'>-				formats |= SNDRV_PCM_FMTBIT_U8;</div><div class='del'>-				bps = 8;</div><div class='del'>-			}</div><div class='del'>-			if (val &amp; AC_SUPPCM_BITS_16) {</div><div class='del'>-				formats |= SNDRV_PCM_FMTBIT_S16_LE;</div><div class='del'>-				bps = 16;</div><div class='del'>-			}</div><div class='del'>-			if (wcaps &amp; AC_WCAP_DIGITAL) {</div><div class='del'>-				if (val &amp; AC_SUPPCM_BITS_32)</div><div class='del'>-					formats |= SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;</div><div class='del'>-				if (val &amp; (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24))</div><div class='del'>-					formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='del'>-				if (val &amp; AC_SUPPCM_BITS_24)</div><div class='del'>-					bps = 24;</div><div class='del'>-				else if (val &amp; AC_SUPPCM_BITS_20)</div><div class='del'>-					bps = 20;</div><div class='del'>-			} else if (val &amp; (AC_SUPPCM_BITS_20|AC_SUPPCM_BITS_24|</div><div class='del'>-					  AC_SUPPCM_BITS_32)) {</div><div class='del'>-				formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='del'>-				if (val &amp; AC_SUPPCM_BITS_32)</div><div class='del'>-					bps = 32;</div><div class='del'>-				else if (val &amp; AC_SUPPCM_BITS_24)</div><div class='del'>-					bps = 24;</div><div class='del'>-				else if (val &amp; AC_SUPPCM_BITS_20)</div><div class='del'>-					bps = 20;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (streams &amp; AC_SUPFMT_FLOAT32) {</div><div class='del'>-			formats |= SNDRV_PCM_FMTBIT_FLOAT_LE;</div><div class='del'>-			if (!bps)</div><div class='del'>-				bps = 32;</div><div class='del'>-		}</div><div class='del'>-		if (streams == AC_SUPFMT_AC3) {</div><div class='del'>-			/* should be exclusive */</div><div class='del'>-			/* temporary hack: we have still no proper support</div><div class='del'>-			 * for the direct AC3 stream...</div><div class='del'>-			 */</div><div class='del'>-			formats |= SNDRV_PCM_FMTBIT_U8;</div><div class='del'>-			bps = 8;</div><div class='del'>-		}</div><div class='del'>-		if (formats == 0) {</div><div class='del'>-			snd_printk(KERN_ERR "hda_codec: formats == 0 "</div><div class='del'>-				   "(nid=0x%x, val=0x%x, ovrd=%i, "</div><div class='del'>-				   "streams=0x%x)\n",</div><div class='del'>-					nid, val,</div><div class='del'>-					(wcaps &amp; AC_WCAP_FORMAT_OVRD) ? 1 : 0,</div><div class='del'>-					streams);</div><div class='del'>-			return -EIO;</div><div class='del'>-		}</div><div class='del'>-		if (formatsp)</div><div class='del'>-			*formatsp = formats;</div><div class='del'>-		if (bpsp)</div><div class='del'>-			*bpsp = bps;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_is_supported_format - Check the validity of the format</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @nid: NID to check</div><div class='del'>- * @format: the HD-audio format value to check</div><div class='del'>- *</div><div class='del'>- * Check whether the given node supports the format value.</div><div class='del'>- *</div><div class='del'>- * Returns 1 if supported, 0 if not.</div><div class='del'>- */</div><div class='del'>-int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				unsigned int format)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int val = 0, rate, stream;</div><div class='del'>-</div><div class='del'>-	val = query_pcm_param(codec, nid);</div><div class='del'>-	if (!val)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rate = format &amp; 0xff00;</div><div class='del'>-	for (i = 0; i &lt; AC_PAR_PCM_RATE_BITS; i++)</div><div class='del'>-		if (rate_bits[i].hda_fmt == rate) {</div><div class='del'>-			if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-				break;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	if (i &gt;= AC_PAR_PCM_RATE_BITS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	stream = query_stream_param(codec, nid);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (stream &amp; AC_SUPFMT_PCM) {</div><div class='del'>-		switch (format &amp; 0xf0) {</div><div class='del'>-		case 0x00:</div><div class='del'>-			if (!(val &amp; AC_SUPPCM_BITS_8))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case 0x10:</div><div class='del'>-			if (!(val &amp; AC_SUPPCM_BITS_16))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case 0x20:</div><div class='del'>-			if (!(val &amp; AC_SUPPCM_BITS_20))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case 0x30:</div><div class='del'>-			if (!(val &amp; AC_SUPPCM_BITS_24))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		case 0x40:</div><div class='del'>-			if (!(val &amp; AC_SUPPCM_BITS_32))</div><div class='del'>-				return 0;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: check for float32 and AC3? */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_is_supported_format);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM stuff</div><div class='del'>- */</div><div class='del'>-static int hda_pcm_default_open_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hda_pcm_default_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   unsigned int stream_tag,</div><div class='del'>-				   unsigned int format,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hda_pcm_default_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_pcm_default_values(struct hda_codec *codec,</div><div class='del'>-				  struct hda_pcm_stream *info)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* query support PCM information from the given NID */</div><div class='del'>-	if (info-&gt;nid &amp;&amp; (!info-&gt;rates || !info-&gt;formats)) {</div><div class='del'>-		err = snd_hda_query_supported_pcm(codec, info-&gt;nid,</div><div class='del'>-				info-&gt;rates ? NULL : &amp;info-&gt;rates,</div><div class='del'>-				info-&gt;formats ? NULL : &amp;info-&gt;formats,</div><div class='del'>-				info-&gt;maxbps ? NULL : &amp;info-&gt;maxbps);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;ops.open == NULL)</div><div class='del'>-		info-&gt;ops.open = hda_pcm_default_open_close;</div><div class='del'>-	if (info-&gt;ops.close == NULL)</div><div class='del'>-		info-&gt;ops.close = hda_pcm_default_open_close;</div><div class='del'>-	if (info-&gt;ops.prepare == NULL) {</div><div class='del'>-		if (snd_BUG_ON(!info-&gt;nid))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		info-&gt;ops.prepare = hda_pcm_default_prepare;</div><div class='del'>-	}</div><div class='del'>-	if (info-&gt;ops.cleanup == NULL) {</div><div class='del'>-		if (snd_BUG_ON(!info-&gt;nid))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		info-&gt;ops.cleanup = hda_pcm_default_cleanup;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * codec prepare/cleanup entries</div><div class='del'>- */</div><div class='del'>-int snd_hda_codec_prepare(struct hda_codec *codec,</div><div class='del'>-			  struct hda_pcm_stream *hinfo,</div><div class='del'>-			  unsigned int stream,</div><div class='del'>-			  unsigned int format,</div><div class='del'>-			  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	mutex_lock(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='del'>-	ret = hinfo-&gt;ops.prepare(hinfo, codec, stream, format, substream);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		purify_inactive_streams(codec);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_prepare);</div><div class='del'>-</div><div class='del'>-void snd_hda_codec_cleanup(struct hda_codec *codec,</div><div class='del'>-			   struct hda_pcm_stream *hinfo,</div><div class='del'>-			   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='del'>-	hinfo-&gt;ops.cleanup(hinfo, codec, substream);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;bus-&gt;prepare_mutex);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup);</div><div class='del'>-</div><div class='del'>-/* global */</div><div class='del'>-const char *snd_hda_pcm_type_name[HDA_PCM_NTYPES] = {</div><div class='del'>-	"Audio", "SPDIF", "HDMI", "Modem"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get the empty PCM device number to assign</div><div class='del'>- *</div><div class='del'>- * note the max device number is limited by HDA_MAX_PCMS, currently 10</div><div class='del'>- */</div><div class='del'>-static int get_empty_pcm_device(struct hda_bus *bus, int type)</div><div class='del'>-{</div><div class='del'>-	/* audio device indices; not linear to keep compatibility */</div><div class='del'>-	static int audio_idx[HDA_PCM_NTYPES][5] = {</div><div class='del'>-		[HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },</div><div class='del'>-		[HDA_PCM_TYPE_SPDIF] = { 1, -1 },</div><div class='del'>-		[HDA_PCM_TYPE_HDMI]  = { 3, 7, 8, 9, -1 },</div><div class='del'>-		[HDA_PCM_TYPE_MODEM] = { 6, -1 },</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (type &gt;= HDA_PCM_NTYPES) {</div><div class='del'>-		snd_printk(KERN_WARNING "Invalid PCM type %d\n", type);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; audio_idx[type][i] &gt;= 0 ; i++)</div><div class='del'>-		if (!test_and_set_bit(audio_idx[type][i], bus-&gt;pcm_dev_bits))</div><div class='del'>-			return audio_idx[type][i];</div><div class='del'>-</div><div class='del'>-	snd_printk(KERN_WARNING "Too many %s devices\n",</div><div class='del'>-		snd_hda_pcm_type_name[type]);</div><div class='del'>-	return -EAGAIN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * attach a new PCM stream</div><div class='del'>- */</div><div class='del'>-static int snd_hda_attach_pcm(struct hda_codec *codec, struct hda_pcm *pcm)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus = codec-&gt;bus;</div><div class='del'>-	struct hda_pcm_stream *info;</div><div class='del'>-	int stream, err;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!pcm-&gt;name))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	for (stream = 0; stream &lt; 2; stream++) {</div><div class='del'>-		info = &amp;pcm-&gt;stream[stream];</div><div class='del'>-		if (info-&gt;substreams) {</div><div class='del'>-			err = set_pcm_default_values(codec, info);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return bus-&gt;ops.attach_pcm(bus, codec, pcm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* assign all PCMs of the given codec */</div><div class='del'>-int snd_hda_codec_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int pcm;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!codec-&gt;num_pcms) {</div><div class='del'>-		if (!codec-&gt;patch_ops.build_pcms)</div><div class='del'>-			return 0;</div><div class='del'>-		err = codec-&gt;patch_ops.build_pcms(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			printk(KERN_ERR "hda_codec: cannot build PCMs"</div><div class='del'>-			       "for #%d (error %d)\n", codec-&gt;addr, err);</div><div class='del'>-			err = snd_hda_codec_reset(codec);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				printk(KERN_ERR</div><div class='del'>-				       "hda_codec: cannot revert codec\n");</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (pcm = 0; pcm &lt; codec-&gt;num_pcms; pcm++) {</div><div class='del'>-		struct hda_pcm *cpcm = &amp;codec-&gt;pcm_info[pcm];</div><div class='del'>-		int dev;</div><div class='del'>-</div><div class='del'>-		if (!cpcm-&gt;stream[0].substreams &amp;&amp; !cpcm-&gt;stream[1].substreams)</div><div class='del'>-			continue; /* no substreams assigned */</div><div class='del'>-</div><div class='del'>-		if (!cpcm-&gt;pcm) {</div><div class='del'>-			dev = get_empty_pcm_device(codec-&gt;bus, cpcm-&gt;pcm_type);</div><div class='del'>-			if (dev &lt; 0)</div><div class='del'>-				continue; /* no fatal error */</div><div class='del'>-			cpcm-&gt;device = dev;</div><div class='del'>-			err = snd_hda_attach_pcm(codec, cpcm);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				printk(KERN_ERR "hda_codec: cannot attach "</div><div class='del'>-				       "PCM stream %d for codec #%d\n",</div><div class='del'>-				       dev, codec-&gt;addr);</div><div class='del'>-				continue; /* no fatal error */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_build_pcms - build PCM information</div><div class='del'>- * @bus: the BUS</div><div class='del'>- *</div><div class='del'>- * Create PCM information for each codec included in the bus.</div><div class='del'>- *</div><div class='del'>- * The build_pcms codec patch is requested to set up codec-&gt;num_pcms and</div><div class='del'>- * codec-&gt;pcm_info properly.  The array is referred by the top-level driver</div><div class='del'>- * to create its PCM instances.</div><div class='del'>- * The allocated codec-&gt;pcm_info should be released in codec-&gt;patch_ops.free</div><div class='del'>- * callback.</div><div class='del'>- *</div><div class='del'>- * At least, substreams, channels_min and channels_max must be filled for</div><div class='del'>- * each stream.  substreams = 0 indicates that the stream doesn't exist.</div><div class='del'>- * When rates and/or formats are zero, the supported values are queried</div><div class='del'>- * from the given nid.  The nid is used also by the default ops.prepare</div><div class='del'>- * and ops.cleanup callbacks.</div><div class='del'>- *</div><div class='del'>- * The driver needs to call ops.open in its open callback.  Similarly,</div><div class='del'>- * ops.close is supposed to be called in the close callback.</div><div class='del'>- * ops.prepare should be called in the prepare or hw_params callback</div><div class='del'>- * with the proper parameters for set up.</div><div class='del'>- * ops.cleanup should be called in hw_free for clean up of streams.</div><div class='del'>- *</div><div class='del'>- * This function returns 0 if successfull, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int __devinit snd_hda_build_pcms(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		int err = snd_hda_codec_build_pcms(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_build_pcms);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_check_board_config - compare the current codec with the config table</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @num_configs: number of config enums</div><div class='del'>- * @models: array of model name strings</div><div class='del'>- * @tbl: configuration table, terminated by null entries</div><div class='del'>- *</div><div class='del'>- * Compares the modelname or PCI subsystem id of the current codec with the</div><div class='del'>- * given configuration table.  If a matching entry is found, returns its</div><div class='del'>- * config value (supposed to be 0 or positive).</div><div class='del'>- *</div><div class='del'>- * If no entries are matching, the function returns a negative value.</div><div class='del'>- */</div><div class='del'>-int snd_hda_check_board_config(struct hda_codec *codec,</div><div class='del'>-			       int num_configs, const char **models,</div><div class='del'>-			       const struct snd_pci_quirk *tbl)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;modelname &amp;&amp; models) {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; num_configs; i++) {</div><div class='del'>-			if (models[i] &amp;&amp;</div><div class='del'>-			    !strcmp(codec-&gt;modelname, models[i])) {</div><div class='del'>-				snd_printd(KERN_INFO "hda_codec: model '%s' is "</div><div class='del'>-					   "selected\n", models[i]);</div><div class='del'>-				return i;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!codec-&gt;bus-&gt;pci || !tbl)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	tbl = snd_pci_quirk_lookup(codec-&gt;bus-&gt;pci, tbl);</div><div class='del'>-	if (!tbl)</div><div class='del'>-		return -1;</div><div class='del'>-	if (tbl-&gt;value &gt;= 0 &amp;&amp; tbl-&gt;value &lt; num_configs) {</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-		char tmp[10];</div><div class='del'>-		const char *model = NULL;</div><div class='del'>-		if (models)</div><div class='del'>-			model = models[tbl-&gt;value];</div><div class='del'>-		if (!model) {</div><div class='del'>-			sprintf(tmp, "#%d", tbl-&gt;value);</div><div class='del'>-			model = tmp;</div><div class='del'>-		}</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: model '%s' is selected "</div><div class='del'>-			    "for config %x:%x (%s)\n",</div><div class='del'>-			    model, tbl-&gt;subvendor, tbl-&gt;subdevice,</div><div class='del'>-			    (tbl-&gt;name ? tbl-&gt;name : "Unknown device"));</div><div class='del'>-#endif</div><div class='del'>-		return tbl-&gt;value;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_check_board_config);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_check_board_codec_sid_config - compare the current codec</div><div class='del'>-					subsystem ID with the</div><div class='del'>-					config table</div><div class='del'>-</div><div class='del'>-	   This is important for Gateway notebooks with SB450 HDA Audio</div><div class='del'>-	   where the vendor ID of the PCI device is:</div><div class='del'>-		ATI Technologies Inc SB450 HDA Audio [1002:437b]</div><div class='del'>-	   and the vendor/subvendor are found only at the codec.</div><div class='del'>-</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @num_configs: number of config enums</div><div class='del'>- * @models: array of model name strings</div><div class='del'>- * @tbl: configuration table, terminated by null entries</div><div class='del'>- *</div><div class='del'>- * Compares the modelname or PCI subsystem id of the current codec with the</div><div class='del'>- * given configuration table.  If a matching entry is found, returns its</div><div class='del'>- * config value (supposed to be 0 or positive).</div><div class='del'>- *</div><div class='del'>- * If no entries are matching, the function returns a negative value.</div><div class='del'>- */</div><div class='del'>-int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,</div><div class='del'>-			       int num_configs, const char **models,</div><div class='del'>-			       const struct snd_pci_quirk *tbl)</div><div class='del'>-{</div><div class='del'>-	const struct snd_pci_quirk *q;</div><div class='del'>-</div><div class='del'>-	/* Search for codec ID */</div><div class='del'>-	for (q = tbl; q-&gt;subvendor; q++) {</div><div class='del'>-		unsigned long vendorid = (q-&gt;subdevice) | (q-&gt;subvendor &lt;&lt; 16);</div><div class='del'>-</div><div class='del'>-		if (vendorid == codec-&gt;subsystem_id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!q-&gt;subvendor)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	tbl = q;</div><div class='del'>-</div><div class='del'>-	if (tbl-&gt;value &gt;= 0 &amp;&amp; tbl-&gt;value &lt; num_configs) {</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-		char tmp[10];</div><div class='del'>-		const char *model = NULL;</div><div class='del'>-		if (models)</div><div class='del'>-			model = models[tbl-&gt;value];</div><div class='del'>-		if (!model) {</div><div class='del'>-			sprintf(tmp, "#%d", tbl-&gt;value);</div><div class='del'>-			model = tmp;</div><div class='del'>-		}</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: model '%s' is selected "</div><div class='del'>-			    "for config %x:%x (%s)\n",</div><div class='del'>-			    model, tbl-&gt;subvendor, tbl-&gt;subdevice,</div><div class='del'>-			    (tbl-&gt;name ? tbl-&gt;name : "Unknown device"));</div><div class='del'>-#endif</div><div class='del'>-		return tbl-&gt;value;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_check_board_codec_sid_config);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_add_new_ctls - create controls from the array</div><div class='del'>- * @codec: the HDA codec</div><div class='del'>- * @knew: the array of struct snd_kcontrol_new</div><div class='del'>- *</div><div class='del'>- * This helper function creates and add new controls in the given array.</div><div class='del'>- * The array must be terminated with an empty entry as terminator.</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful, or a negative error code.</div><div class='del'>- */</div><div class='del'>-int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (; knew-&gt;name; knew++) {</div><div class='del'>-		struct snd_kcontrol *kctl;</div><div class='del'>-		if (knew-&gt;iface == -1)	/* skip this codec private value */</div><div class='del'>-			continue;</div><div class='del'>-		kctl = snd_ctl_new1(knew, codec);</div><div class='del'>-		if (!kctl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			if (!codec-&gt;addr)</div><div class='del'>-				return err;</div><div class='del'>-			kctl = snd_ctl_new1(knew, codec);</div><div class='del'>-			if (!kctl)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			kctl-&gt;id.device = codec-&gt;addr;</div><div class='del'>-			err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_add_new_ctls);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,</div><div class='del'>-				unsigned int power_state);</div><div class='del'>-</div><div class='del'>-static void hda_power_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec =</div><div class='del'>-		container_of(work, struct hda_codec, power_work.work);</div><div class='del'>-	struct hda_bus *bus = codec-&gt;bus;</div><div class='del'>-</div><div class='del'>-	if (!codec-&gt;power_on || codec-&gt;power_count) {</div><div class='del'>-		codec-&gt;power_transition = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hda_call_codec_suspend(codec);</div><div class='del'>-	if (bus-&gt;ops.pm_notify)</div><div class='del'>-		bus-&gt;ops.pm_notify(bus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hda_keep_power_on(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	codec-&gt;power_count++;</div><div class='del'>-	codec-&gt;power_on = 1;</div><div class='del'>-	codec-&gt;power_jiffies = jiffies;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* update the power on/off account with the current jiffies */</div><div class='del'>-void snd_hda_update_power_acct(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned long delta = jiffies - codec-&gt;power_jiffies;</div><div class='del'>-	if (codec-&gt;power_on)</div><div class='del'>-		codec-&gt;power_on_acct += delta;</div><div class='del'>-	else</div><div class='del'>-		codec-&gt;power_off_acct += delta;</div><div class='del'>-	codec-&gt;power_jiffies += delta;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_power_up - Power-up the codec</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Increment the power-up counter and power up the hardware really when</div><div class='del'>- * not turned on yet.</div><div class='del'>- */</div><div class='del'>-void snd_hda_power_up(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus *bus = codec-&gt;bus;</div><div class='del'>-</div><div class='del'>-	codec-&gt;power_count++;</div><div class='del'>-	if (codec-&gt;power_on || codec-&gt;power_transition)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	snd_hda_update_power_acct(codec);</div><div class='del'>-	codec-&gt;power_on = 1;</div><div class='del'>-	codec-&gt;power_jiffies = jiffies;</div><div class='del'>-	if (bus-&gt;ops.pm_notify)</div><div class='del'>-		bus-&gt;ops.pm_notify(bus);</div><div class='del'>-	hda_call_codec_resume(codec);</div><div class='del'>-	cancel_delayed_work(&amp;codec-&gt;power_work);</div><div class='del'>-	codec-&gt;power_transition = 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_power_up);</div><div class='del'>-</div><div class='del'>-#define power_save(codec)	\</div><div class='del'>-	((codec)-&gt;bus-&gt;power_save ? *(codec)-&gt;bus-&gt;power_save : 0)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_power_down - Power-down the codec</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Decrement the power-up counter and schedules the power-off work if</div><div class='del'>- * the counter rearches to zero.</div><div class='del'>- */</div><div class='del'>-void snd_hda_power_down(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	--codec-&gt;power_count;</div><div class='del'>-	if (!codec-&gt;power_on || codec-&gt;power_count || codec-&gt;power_transition)</div><div class='del'>-		return;</div><div class='del'>-	if (power_save(codec)) {</div><div class='del'>-		codec-&gt;power_transition = 1; /* avoid reentrance */</div><div class='del'>-		queue_delayed_work(codec-&gt;bus-&gt;workq, &amp;codec-&gt;power_work,</div><div class='del'>-				msecs_to_jiffies(power_save(codec) * 1000));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_power_down);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_check_amp_list_power - Check the amp list and update the power</div><div class='del'>- * @codec: HD-audio codec</div><div class='del'>- * @check: the object containing an AMP list and the status</div><div class='del'>- * @nid: NID to check / update</div><div class='del'>- *</div><div class='del'>- * Check whether the given NID is in the amp list.  If it's in the list,</div><div class='del'>- * check the current AMP status, and update the the power-status according</div><div class='del'>- * to the mute status.</div><div class='del'>- *</div><div class='del'>- * This function is supposed to be set or called from the check_power_status</div><div class='del'>- * patch ops.</div><div class='del'>- */</div><div class='del'>-int snd_hda_check_amp_list_power(struct hda_codec *codec,</div><div class='del'>-				 struct hda_loopback_check *check,</div><div class='del'>-				 hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_amp_list *p;</div><div class='del'>-	int ch, v;</div><div class='del'>-</div><div class='del'>-	if (!check-&gt;amplist)</div><div class='del'>-		return 0;</div><div class='del'>-	for (p = check-&gt;amplist; p-&gt;nid; p++) {</div><div class='del'>-		if (p-&gt;nid == nid)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (!p-&gt;nid)</div><div class='del'>-		return 0; /* nothing changed */</div><div class='del'>-</div><div class='del'>-	for (p = check-&gt;amplist; p-&gt;nid; p++) {</div><div class='del'>-		for (ch = 0; ch &lt; 2; ch++) {</div><div class='del'>-			v = snd_hda_codec_amp_read(codec, p-&gt;nid, ch, p-&gt;dir,</div><div class='del'>-						   p-&gt;idx);</div><div class='del'>-			if (!(v &amp; HDA_AMP_MUTE) &amp;&amp; v &gt; 0) {</div><div class='del'>-				if (!check-&gt;power_on) {</div><div class='del'>-					check-&gt;power_on = 1;</div><div class='del'>-					snd_hda_power_up(codec);</div><div class='del'>-				}</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (check-&gt;power_on) {</div><div class='del'>-		check-&gt;power_on = 0;</div><div class='del'>-		snd_hda_power_down(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_check_amp_list_power);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Channel mode helper</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_ch_mode_info - Info callback helper for the channel mode enum</div><div class='del'>- */</div><div class='del'>-int snd_hda_ch_mode_info(struct hda_codec *codec,</div><div class='del'>-			 struct snd_ctl_elem_info *uinfo,</div><div class='del'>-			 const struct hda_channel_mode *chmode,</div><div class='del'>-			 int num_chmodes)</div><div class='del'>-{</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = num_chmodes;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= num_chmodes)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = num_chmodes - 1;</div><div class='del'>-	sprintf(uinfo-&gt;value.enumerated.name, "%dch",</div><div class='del'>-		chmode[uinfo-&gt;value.enumerated.item].channels);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_info);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_ch_mode_get - Get callback helper for the channel mode enum</div><div class='del'>- */</div><div class='del'>-int snd_hda_ch_mode_get(struct hda_codec *codec,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			const struct hda_channel_mode *chmode,</div><div class='del'>-			int num_chmodes,</div><div class='del'>-			int max_channels)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_chmodes; i++) {</div><div class='del'>-		if (max_channels == chmode[i].channels) {</div><div class='del'>-			ucontrol-&gt;value.enumerated.item[0] = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_get);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_ch_mode_put - Put callback helper for the channel mode enum</div><div class='del'>- */</div><div class='del'>-int snd_hda_ch_mode_put(struct hda_codec *codec,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			const struct hda_channel_mode *chmode,</div><div class='del'>-			int num_chmodes,</div><div class='del'>-			int *max_channelsp)</div><div class='del'>-{</div><div class='del'>-	unsigned int mode;</div><div class='del'>-</div><div class='del'>-	mode = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (mode &gt;= num_chmodes)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (*max_channelsp == chmode[mode].channels)</div><div class='del'>-		return 0;</div><div class='del'>-	/* change the current channel setting */</div><div class='del'>-	*max_channelsp = chmode[mode].channels;</div><div class='del'>-	if (chmode[mode].sequence)</div><div class='del'>-		snd_hda_sequence_write_cache(codec, chmode[mode].sequence);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_ch_mode_put);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX helper</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_input_mux_info_info - Info callback helper for the input-mux enum</div><div class='del'>- */</div><div class='del'>-int snd_hda_input_mux_info(const struct hda_input_mux *imux,</div><div class='del'>-			   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	unsigned int index;</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = imux-&gt;num_items;</div><div class='del'>-	if (!imux-&gt;num_items)</div><div class='del'>-		return 0;</div><div class='del'>-	index = uinfo-&gt;value.enumerated.item;</div><div class='del'>-	if (index &gt;= imux-&gt;num_items)</div><div class='del'>-		index = imux-&gt;num_items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, imux-&gt;items[index].label);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_input_mux_info);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_input_mux_info_put - Put callback helper for the input-mux enum</div><div class='del'>- */</div><div class='del'>-int snd_hda_input_mux_put(struct hda_codec *codec,</div><div class='del'>-			  const struct hda_input_mux *imux,</div><div class='del'>-			  struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-			  hda_nid_t nid,</div><div class='del'>-			  unsigned int *cur_val)</div><div class='del'>-{</div><div class='del'>-	unsigned int idx;</div><div class='del'>-</div><div class='del'>-	if (!imux-&gt;num_items)</div><div class='del'>-		return 0;</div><div class='del'>-	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (idx &gt;= imux-&gt;num_items)</div><div class='del'>-		idx = imux-&gt;num_items - 1;</div><div class='del'>-	if (*cur_val == idx)</div><div class='del'>-		return 0;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-				  imux-&gt;items[idx].index);</div><div class='del'>-	*cur_val = idx;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_input_mux_put);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Multi-channel / digital-out PCM helper functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* setup SPDIF output stream */</div><div class='del'>-static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				 unsigned int stream_tag, unsigned int format)</div><div class='del'>-{</div><div class='del'>-	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */</div><div class='del'>-	if (codec-&gt;spdif_status_reset &amp;&amp; (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE))</div><div class='del'>-		set_dig_out_convert(codec, nid,</div><div class='del'>-				    codec-&gt;spdif_ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff,</div><div class='del'>-				    -1);</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);</div><div class='del'>-	if (codec-&gt;slave_dig_outs) {</div><div class='del'>-		hda_nid_t *d;</div><div class='del'>-		for (d = codec-&gt;slave_dig_outs; *d; d++)</div><div class='del'>-			snd_hda_codec_setup_stream(codec, *d, stream_tag, 0,</div><div class='del'>-						   format);</div><div class='del'>-	}</div><div class='del'>-	/* turn on again (if needed) */</div><div class='del'>-	if (codec-&gt;spdif_status_reset &amp;&amp; (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE))</div><div class='del'>-		set_dig_out_convert(codec, nid,</div><div class='del'>-				    codec-&gt;spdif_ctls &amp; 0xff, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, nid);</div><div class='del'>-	if (codec-&gt;slave_dig_outs) {</div><div class='del'>-		hda_nid_t *d;</div><div class='del'>-		for (d = codec-&gt;slave_dig_outs; *d; d++)</div><div class='del'>-			snd_hda_codec_cleanup_stream(codec, *d);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_bus_reboot_notify - call the reboot notifier of each codec</div><div class='del'>- * @bus: HD-audio bus</div><div class='del'>- */</div><div class='del'>-void snd_hda_bus_reboot_notify(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	if (!bus)</div><div class='del'>-		return;</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-		if (!codec-&gt;power_on)</div><div class='del'>-			continue;</div><div class='del'>-#endif</div><div class='del'>-		if (codec-&gt;patch_ops.reboot_notify)</div><div class='del'>-			codec-&gt;patch_ops.reboot_notify(codec);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_bus_reboot_notify);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_dig_open - open the digital out in the exclusive mode</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_dig_open(struct hda_codec *codec,</div><div class='del'>-			       struct hda_multi_out *mout)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	if (mout-&gt;dig_out_used == HDA_DIG_ANALOG_DUP)</div><div class='del'>-		/* already opened as analog dup; reset it once */</div><div class='del'>-		cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='del'>-	mout-&gt;dig_out_used = HDA_DIG_EXCLUSIVE;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_open);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_dig_prepare - prepare the digital out stream</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,</div><div class='del'>-				  struct hda_multi_out *mout,</div><div class='del'>-				  unsigned int stream_tag,</div><div class='del'>-				  unsigned int format,</div><div class='del'>-				  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	setup_dig_out_stream(codec, mout-&gt;dig_out_nid, stream_tag, format);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_prepare);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_dig_cleanup - clean-up the digital out stream</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec,</div><div class='del'>-				  struct hda_multi_out *mout)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_cleanup);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_dig_close - release the digital out stream</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_dig_close(struct hda_codec *codec,</div><div class='del'>-				struct hda_multi_out *mout)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	mout-&gt;dig_out_used = 0;</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_dig_close);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_analog_open - open analog outputs</div><div class='del'>- *</div><div class='del'>- * Open analog outputs and set up the hw-constraints.</div><div class='del'>- * If the digital outputs can be opened as slave, open the digital</div><div class='del'>- * outputs, too.</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_analog_open(struct hda_codec *codec,</div><div class='del'>-				  struct hda_multi_out *mout,</div><div class='del'>-				  struct snd_pcm_substream *substream,</div><div class='del'>-				  struct hda_pcm_stream *hinfo)</div><div class='del'>-{</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	runtime-&gt;hw.channels_max = mout-&gt;max_channels;</div><div class='del'>-	if (mout-&gt;dig_out_nid) {</div><div class='del'>-		if (!mout-&gt;analog_rates) {</div><div class='del'>-			mout-&gt;analog_rates = hinfo-&gt;rates;</div><div class='del'>-			mout-&gt;analog_formats = hinfo-&gt;formats;</div><div class='del'>-			mout-&gt;analog_maxbps = hinfo-&gt;maxbps;</div><div class='del'>-		} else {</div><div class='del'>-			runtime-&gt;hw.rates = mout-&gt;analog_rates;</div><div class='del'>-			runtime-&gt;hw.formats = mout-&gt;analog_formats;</div><div class='del'>-			hinfo-&gt;maxbps = mout-&gt;analog_maxbps;</div><div class='del'>-		}</div><div class='del'>-		if (!mout-&gt;spdif_rates) {</div><div class='del'>-			snd_hda_query_supported_pcm(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						    &amp;mout-&gt;spdif_rates,</div><div class='del'>-						    &amp;mout-&gt;spdif_formats,</div><div class='del'>-						    &amp;mout-&gt;spdif_maxbps);</div><div class='del'>-		}</div><div class='del'>-		mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-		if (mout-&gt;share_spdif) {</div><div class='del'>-			if ((runtime-&gt;hw.rates &amp; mout-&gt;spdif_rates) &amp;&amp;</div><div class='del'>-			    (runtime-&gt;hw.formats &amp; mout-&gt;spdif_formats)) {</div><div class='del'>-				runtime-&gt;hw.rates &amp;= mout-&gt;spdif_rates;</div><div class='del'>-				runtime-&gt;hw.formats &amp;= mout-&gt;spdif_formats;</div><div class='del'>-				if (mout-&gt;spdif_maxbps &lt; hinfo-&gt;maxbps)</div><div class='del'>-					hinfo-&gt;maxbps = mout-&gt;spdif_maxbps;</div><div class='del'>-			} else {</div><div class='del'>-				mout-&gt;share_spdif = 0;</div><div class='del'>-				/* FIXME: need notify? */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_hw_constraint_step(substream-&gt;runtime, 0,</div><div class='del'>-					  SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_open);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_analog_prepare - Preapre the analog outputs.</div><div class='del'>- *</div><div class='del'>- * Set up the i/o for analog out.</div><div class='del'>- * When the digital out is available, copy the front out to digital out, too.</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,</div><div class='del'>-				     struct hda_multi_out *mout,</div><div class='del'>-				     unsigned int stream_tag,</div><div class='del'>-				     unsigned int format,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='del'>-	int chs = substream-&gt;runtime-&gt;channels;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	if (mout-&gt;dig_out_nid &amp;&amp; mout-&gt;share_spdif &amp;&amp;</div><div class='del'>-	    mout-&gt;dig_out_used != HDA_DIG_EXCLUSIVE) {</div><div class='del'>-		if (chs == 2 &amp;&amp;</div><div class='del'>-		    snd_hda_is_supported_format(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						format) &amp;&amp;</div><div class='del'>-		    !(codec-&gt;spdif_status &amp; IEC958_AES0_NONAUDIO)) {</div><div class='del'>-			mout-&gt;dig_out_used = HDA_DIG_ANALOG_DUP;</div><div class='del'>-			setup_dig_out_stream(codec, mout-&gt;dig_out_nid,</div><div class='del'>-					     stream_tag, format);</div><div class='del'>-		} else {</div><div class='del'>-			mout-&gt;dig_out_used = 0;</div><div class='del'>-			cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-</div><div class='del'>-	/* front */</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag,</div><div class='del'>-				   0, format);</div><div class='del'>-	if (!mout-&gt;no_share_stream &amp;&amp;</div><div class='del'>-	    mout-&gt;hp_nid &amp;&amp; mout-&gt;hp_nid != nids[HDA_FRONT])</div><div class='del'>-		/* headphone out will just decode front left/right (stereo) */</div><div class='del'>-		snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid, stream_tag,</div><div class='del'>-					   0, format);</div><div class='del'>-	/* extra outputs copied from front */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++)</div><div class='del'>-		if (!mout-&gt;no_share_stream &amp;&amp; mout-&gt;extra_out_nid[i])</div><div class='del'>-			snd_hda_codec_setup_stream(codec,</div><div class='del'>-						   mout-&gt;extra_out_nid[i],</div><div class='del'>-						   stream_tag, 0, format);</div><div class='del'>-</div><div class='del'>-	/* surrounds */</div><div class='del'>-	for (i = 1; i &lt; mout-&gt;num_dacs; i++) {</div><div class='del'>-		if (chs &gt;= (i + 1) * 2) /* independent out */</div><div class='del'>-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='del'>-						   i * 2, format);</div><div class='del'>-		else if (!mout-&gt;no_share_stream) /* copy front */</div><div class='del'>-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='del'>-						   0, format);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_prepare);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_multi_out_analog_cleanup - clean up the setting for analog out</div><div class='del'>- */</div><div class='del'>-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,</div><div class='del'>-				     struct hda_multi_out *mout)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; mout-&gt;num_dacs; i++)</div><div class='del'>-		snd_hda_codec_cleanup_stream(codec, nids[i]);</div><div class='del'>-	if (mout-&gt;hp_nid)</div><div class='del'>-		snd_hda_codec_cleanup_stream(codec, mout-&gt;hp_nid);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++)</div><div class='del'>-		if (mout-&gt;extra_out_nid[i])</div><div class='del'>-			snd_hda_codec_cleanup_stream(codec,</div><div class='del'>-						     mout-&gt;extra_out_nid[i]);</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	if (mout-&gt;dig_out_nid &amp;&amp; mout-&gt;dig_out_used == HDA_DIG_ANALOG_DUP) {</div><div class='del'>-		cleanup_dig_out_stream(codec, mout-&gt;dig_out_nid);</div><div class='del'>-		mout-&gt;dig_out_used = 0;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_cleanup);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Helper for automatic pin configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)</div><div class='del'>-{</div><div class='del'>-	for (; *list; list++)</div><div class='del'>-		if (*list == nid)</div><div class='del'>-			return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sort an associated group of pins according to their sequence numbers.</div><div class='del'>- */</div><div class='del'>-static void sort_pins_by_sequence(hda_nid_t *pins, short *sequences,</div><div class='del'>-				  int num_pins)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	short seq;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_pins; i++) {</div><div class='del'>-		for (j = i + 1; j &lt; num_pins; j++) {</div><div class='del'>-			if (sequences[i] &gt; sequences[j]) {</div><div class='del'>-				seq = sequences[i];</div><div class='del'>-				sequences[i] = sequences[j];</div><div class='del'>-				sequences[j] = seq;</div><div class='del'>-				nid = pins[i];</div><div class='del'>-				pins[i] = pins[j];</div><div class='del'>-				pins[j] = nid;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* add the found input-pin to the cfg-&gt;inputs[] table */</div><div class='del'>-static void add_auto_cfg_input_pin(struct auto_pin_cfg *cfg, hda_nid_t nid,</div><div class='del'>-				   int type)</div><div class='del'>-{</div><div class='del'>-	if (cfg-&gt;num_inputs &lt; AUTO_CFG_MAX_INS) {</div><div class='del'>-		cfg-&gt;inputs[cfg-&gt;num_inputs].pin = nid;</div><div class='del'>-		cfg-&gt;inputs[cfg-&gt;num_inputs].type = type;</div><div class='del'>-		cfg-&gt;num_inputs++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sort inputs in the order of AUTO_PIN_* type */</div><div class='del'>-static void sort_autocfg_input_pins(struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		for (j = i + 1; j &lt; cfg-&gt;num_inputs; j++) {</div><div class='del'>-			if (cfg-&gt;inputs[i].type &gt; cfg-&gt;inputs[j].type) {</div><div class='del'>-				struct auto_pin_cfg_item tmp;</div><div class='del'>-				tmp = cfg-&gt;inputs[i];</div><div class='del'>-				cfg-&gt;inputs[i] = cfg-&gt;inputs[j];</div><div class='del'>-				cfg-&gt;inputs[j] = tmp;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parse all pin widgets and store the useful pin nids to cfg</div><div class='del'>- *</div><div class='del'>- * The number of line-outs or any primary output is stored in line_outs,</div><div class='del'>- * and the corresponding output pins are assigned to line_out_pins[],</div><div class='del'>- * in the order of front, rear, CLFE, side, ...</div><div class='del'>- *</div><div class='del'>- * If more extra outputs (speaker and headphone) are found, the pins are</div><div class='del'>- * assisnged to hp_pins[] and speaker_pins[], respectively.  If no line-out jack</div><div class='del'>- * is detected, one of speaker of HP pins is assigned as the primary</div><div class='del'>- * output, i.e. to line_out_pins[0].  So, line_outs is always positive</div><div class='del'>- * if any analog output exists.</div><div class='del'>- *</div><div class='del'>- * The analog input pins are assigned to inputs array.</div><div class='del'>- * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,</div><div class='del'>- * respectively.</div><div class='del'>- */</div><div class='del'>-int snd_hda_parse_pin_def_config(struct hda_codec *codec,</div><div class='del'>-				 struct auto_pin_cfg *cfg,</div><div class='del'>-				 hda_nid_t *ignore_nids)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid, end_nid;</div><div class='del'>-	short seq, assoc_line_out, assoc_speaker;</div><div class='del'>-	short sequences_line_out[ARRAY_SIZE(cfg-&gt;line_out_pins)];</div><div class='del'>-	short sequences_speaker[ARRAY_SIZE(cfg-&gt;speaker_pins)];</div><div class='del'>-	short sequences_hp[ARRAY_SIZE(cfg-&gt;hp_pins)];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(cfg, 0, sizeof(*cfg));</div><div class='del'>-</div><div class='del'>-	memset(sequences_line_out, 0, sizeof(sequences_line_out));</div><div class='del'>-	memset(sequences_speaker, 0, sizeof(sequences_speaker));</div><div class='del'>-	memset(sequences_hp, 0, sizeof(sequences_hp));</div><div class='del'>-	assoc_line_out = assoc_speaker = 0;</div><div class='del'>-</div><div class='del'>-	end_nid = codec-&gt;start_nid + codec-&gt;num_nodes;</div><div class='del'>-	for (nid = codec-&gt;start_nid; nid &lt; end_nid; nid++) {</div><div class='del'>-		unsigned int wid_caps = get_wcaps(codec, nid);</div><div class='del'>-		unsigned int wid_type = get_wcaps_type(wid_caps);</div><div class='del'>-		unsigned int def_conf;</div><div class='del'>-		short assoc, loc;</div><div class='del'>-</div><div class='del'>-		/* read all default configuration for pin complex */</div><div class='del'>-		if (wid_type != AC_WID_PIN)</div><div class='del'>-			continue;</div><div class='del'>-		/* ignore the given nids (e.g. pc-beep returns error) */</div><div class='del'>-		if (ignore_nids &amp;&amp; is_in_nid_list(nid, ignore_nids))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)</div><div class='del'>-			continue;</div><div class='del'>-		loc = get_defcfg_location(def_conf);</div><div class='del'>-		switch (get_defcfg_device(def_conf)) {</div><div class='del'>-		case AC_JACK_LINE_OUT:</div><div class='del'>-			seq = get_defcfg_sequence(def_conf);</div><div class='del'>-			assoc = get_defcfg_association(def_conf);</div><div class='del'>-</div><div class='del'>-			if (!(wid_caps &amp; AC_WCAP_STEREO))</div><div class='del'>-				if (!cfg-&gt;mono_out_pin)</div><div class='del'>-					cfg-&gt;mono_out_pin = nid;</div><div class='del'>-			if (!assoc)</div><div class='del'>-				continue;</div><div class='del'>-			if (!assoc_line_out)</div><div class='del'>-				assoc_line_out = assoc;</div><div class='del'>-			else if (assoc_line_out != assoc)</div><div class='del'>-				continue;</div><div class='del'>-			if (cfg-&gt;line_outs &gt;= ARRAY_SIZE(cfg-&gt;line_out_pins))</div><div class='del'>-				continue;</div><div class='del'>-			cfg-&gt;line_out_pins[cfg-&gt;line_outs] = nid;</div><div class='del'>-			sequences_line_out[cfg-&gt;line_outs] = seq;</div><div class='del'>-			cfg-&gt;line_outs++;</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_SPEAKER:</div><div class='del'>-			seq = get_defcfg_sequence(def_conf);</div><div class='del'>-			assoc = get_defcfg_association(def_conf);</div><div class='del'>-			if (!assoc)</div><div class='del'>-				continue;</div><div class='del'>-			if (!assoc_speaker)</div><div class='del'>-				assoc_speaker = assoc;</div><div class='del'>-			else if (assoc_speaker != assoc)</div><div class='del'>-				continue;</div><div class='del'>-			if (cfg-&gt;speaker_outs &gt;= ARRAY_SIZE(cfg-&gt;speaker_pins))</div><div class='del'>-				continue;</div><div class='del'>-			cfg-&gt;speaker_pins[cfg-&gt;speaker_outs] = nid;</div><div class='del'>-			sequences_speaker[cfg-&gt;speaker_outs] = seq;</div><div class='del'>-			cfg-&gt;speaker_outs++;</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_HP_OUT:</div><div class='del'>-			seq = get_defcfg_sequence(def_conf);</div><div class='del'>-			assoc = get_defcfg_association(def_conf);</div><div class='del'>-			if (cfg-&gt;hp_outs &gt;= ARRAY_SIZE(cfg-&gt;hp_pins))</div><div class='del'>-				continue;</div><div class='del'>-			cfg-&gt;hp_pins[cfg-&gt;hp_outs] = nid;</div><div class='del'>-			sequences_hp[cfg-&gt;hp_outs] = (assoc &lt;&lt; 4) | seq;</div><div class='del'>-			cfg-&gt;hp_outs++;</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_MIC_IN:</div><div class='del'>-			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_MIC);</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_LINE_IN:</div><div class='del'>-			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_LINE_IN);</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_CD:</div><div class='del'>-			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_CD);</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_AUX:</div><div class='del'>-			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_AUX);</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_SPDIF_OUT:</div><div class='del'>-		case AC_JACK_DIG_OTHER_OUT:</div><div class='del'>-			if (cfg-&gt;dig_outs &gt;= ARRAY_SIZE(cfg-&gt;dig_out_pins))</div><div class='del'>-				continue;</div><div class='del'>-			cfg-&gt;dig_out_pins[cfg-&gt;dig_outs] = nid;</div><div class='del'>-			cfg-&gt;dig_out_type[cfg-&gt;dig_outs] =</div><div class='del'>-				(loc == AC_JACK_LOC_HDMI) ?</div><div class='del'>-				HDA_PCM_TYPE_HDMI : HDA_PCM_TYPE_SPDIF;</div><div class='del'>-			cfg-&gt;dig_outs++;</div><div class='del'>-			break;</div><div class='del'>-		case AC_JACK_SPDIF_IN:</div><div class='del'>-		case AC_JACK_DIG_OTHER_IN:</div><div class='del'>-			cfg-&gt;dig_in_pin = nid;</div><div class='del'>-			if (loc == AC_JACK_LOC_HDMI)</div><div class='del'>-				cfg-&gt;dig_in_type = HDA_PCM_TYPE_HDMI;</div><div class='del'>-			else</div><div class='del'>-				cfg-&gt;dig_in_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIX-UP:</div><div class='del'>-	 * If no line-out is defined but multiple HPs are found,</div><div class='del'>-	 * some of them might be the real line-outs.</div><div class='del'>-	 */</div><div class='del'>-	if (!cfg-&gt;line_outs &amp;&amp; cfg-&gt;hp_outs &gt; 1) {</div><div class='del'>-		int i = 0;</div><div class='del'>-		while (i &lt; cfg-&gt;hp_outs) {</div><div class='del'>-			/* The real HPs should have the sequence 0x0f */</div><div class='del'>-			if ((sequences_hp[i] &amp; 0x0f) == 0x0f) {</div><div class='del'>-				i++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* Move it to the line-out table */</div><div class='del'>-			cfg-&gt;line_out_pins[cfg-&gt;line_outs] = cfg-&gt;hp_pins[i];</div><div class='del'>-			sequences_line_out[cfg-&gt;line_outs] = sequences_hp[i];</div><div class='del'>-			cfg-&gt;line_outs++;</div><div class='del'>-			cfg-&gt;hp_outs--;</div><div class='del'>-			memmove(cfg-&gt;hp_pins + i, cfg-&gt;hp_pins + i + 1,</div><div class='del'>-				sizeof(cfg-&gt;hp_pins[0]) * (cfg-&gt;hp_outs - i));</div><div class='del'>-			memmove(sequences_hp + i, sequences_hp + i + 1,</div><div class='del'>-				sizeof(sequences_hp[0]) * (cfg-&gt;hp_outs - i));</div><div class='del'>-		}</div><div class='del'>-		memset(cfg-&gt;hp_pins + cfg-&gt;hp_outs, 0,</div><div class='del'>-		       sizeof(hda_nid_t) * (AUTO_CFG_MAX_OUTS - cfg-&gt;hp_outs));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sort by sequence */</div><div class='del'>-	sort_pins_by_sequence(cfg-&gt;line_out_pins, sequences_line_out,</div><div class='del'>-			      cfg-&gt;line_outs);</div><div class='del'>-	sort_pins_by_sequence(cfg-&gt;speaker_pins, sequences_speaker,</div><div class='del'>-			      cfg-&gt;speaker_outs);</div><div class='del'>-	sort_pins_by_sequence(cfg-&gt;hp_pins, sequences_hp,</div><div class='del'>-			      cfg-&gt;hp_outs);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIX-UP: if no line-outs are detected, try to use speaker or HP pin</div><div class='del'>-	 * as a primary output</div><div class='del'>-	 */</div><div class='del'>-	if (!cfg-&gt;line_outs) {</div><div class='del'>-		if (cfg-&gt;speaker_outs) {</div><div class='del'>-			cfg-&gt;line_outs = cfg-&gt;speaker_outs;</div><div class='del'>-			memcpy(cfg-&gt;line_out_pins, cfg-&gt;speaker_pins,</div><div class='del'>-			       sizeof(cfg-&gt;speaker_pins));</div><div class='del'>-			cfg-&gt;speaker_outs = 0;</div><div class='del'>-			memset(cfg-&gt;speaker_pins, 0, sizeof(cfg-&gt;speaker_pins));</div><div class='del'>-			cfg-&gt;line_out_type = AUTO_PIN_SPEAKER_OUT;</div><div class='del'>-		} else if (cfg-&gt;hp_outs) {</div><div class='del'>-			cfg-&gt;line_outs = cfg-&gt;hp_outs;</div><div class='del'>-			memcpy(cfg-&gt;line_out_pins, cfg-&gt;hp_pins,</div><div class='del'>-			       sizeof(cfg-&gt;hp_pins));</div><div class='del'>-			cfg-&gt;hp_outs = 0;</div><div class='del'>-			memset(cfg-&gt;hp_pins, 0, sizeof(cfg-&gt;hp_pins));</div><div class='del'>-			cfg-&gt;line_out_type = AUTO_PIN_HP_OUT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reorder the surround channels</div><div class='del'>-	 * ALSA sequence is front/surr/clfe/side</div><div class='del'>-	 * HDA sequence is:</div><div class='del'>-	 *    4-ch: front/surr  =&gt;  OK as it is</div><div class='del'>-	 *    6-ch: front/clfe/surr</div><div class='del'>-	 *    8-ch: front/clfe/rear/side|fc</div><div class='del'>-	 */</div><div class='del'>-	switch (cfg-&gt;line_outs) {</div><div class='del'>-	case 3:</div><div class='del'>-	case 4:</div><div class='del'>-		nid = cfg-&gt;line_out_pins[1];</div><div class='del'>-		cfg-&gt;line_out_pins[1] = cfg-&gt;line_out_pins[2];</div><div class='del'>-		cfg-&gt;line_out_pins[2] = nid;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sort_autocfg_input_pins(cfg);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * debug prints of the parsed results</div><div class='del'>-	 */</div><div class='del'>-	snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='del'>-		   cfg-&gt;line_outs, cfg-&gt;line_out_pins[0], cfg-&gt;line_out_pins[1],</div><div class='del'>-		   cfg-&gt;line_out_pins[2], cfg-&gt;line_out_pins[3],</div><div class='del'>-		   cfg-&gt;line_out_pins[4]);</div><div class='del'>-	snd_printd("   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='del'>-		   cfg-&gt;speaker_outs, cfg-&gt;speaker_pins[0],</div><div class='del'>-		   cfg-&gt;speaker_pins[1], cfg-&gt;speaker_pins[2],</div><div class='del'>-		   cfg-&gt;speaker_pins[3], cfg-&gt;speaker_pins[4]);</div><div class='del'>-	snd_printd("   hp_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='del'>-		   cfg-&gt;hp_outs, cfg-&gt;hp_pins[0],</div><div class='del'>-		   cfg-&gt;hp_pins[1], cfg-&gt;hp_pins[2],</div><div class='del'>-		   cfg-&gt;hp_pins[3], cfg-&gt;hp_pins[4]);</div><div class='del'>-	snd_printd("   mono: mono_out=0x%x\n", cfg-&gt;mono_out_pin);</div><div class='del'>-	if (cfg-&gt;dig_outs)</div><div class='del'>-		snd_printd("   dig-out=0x%x/0x%x\n",</div><div class='del'>-			   cfg-&gt;dig_out_pins[0], cfg-&gt;dig_out_pins[1]);</div><div class='del'>-	snd_printd("   inputs:");</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		snd_printdd(" %s=0x%x",</div><div class='del'>-			    hda_get_autocfg_input_label(codec, cfg, i),</div><div class='del'>-			    cfg-&gt;inputs[i].pin);</div><div class='del'>-	}</div><div class='del'>-	snd_printd("\n");</div><div class='del'>-	if (cfg-&gt;dig_in_pin)</div><div class='del'>-		snd_printd("   dig-in=0x%x\n", cfg-&gt;dig_in_pin);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_parse_pin_def_config);</div><div class='del'>-</div><div class='del'>-int snd_hda_get_input_pin_attr(unsigned int def_conf)</div><div class='del'>-{</div><div class='del'>-	unsigned int loc = get_defcfg_location(def_conf);</div><div class='del'>-	unsigned int conn = get_defcfg_connect(def_conf);</div><div class='del'>-	if (conn == AC_JACK_PORT_NONE)</div><div class='del'>-		return INPUT_PIN_ATTR_UNUSED;</div><div class='del'>-	/* Windows may claim the internal mic to be BOTH, too */</div><div class='del'>-	if (conn == AC_JACK_PORT_FIXED || conn == AC_JACK_PORT_BOTH)</div><div class='del'>-		return INPUT_PIN_ATTR_INT;</div><div class='del'>-	if ((loc &amp; 0x30) == AC_JACK_LOC_INTERNAL)</div><div class='del'>-		return INPUT_PIN_ATTR_INT;</div><div class='del'>-	if ((loc &amp; 0x30) == AC_JACK_LOC_SEPARATE)</div><div class='del'>-		return INPUT_PIN_ATTR_DOCK;</div><div class='del'>-	if (loc == AC_JACK_LOC_REAR)</div><div class='del'>-		return INPUT_PIN_ATTR_REAR;</div><div class='del'>-	if (loc == AC_JACK_LOC_FRONT)</div><div class='del'>-		return INPUT_PIN_ATTR_FRONT;</div><div class='del'>-	return INPUT_PIN_ATTR_NORMAL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_input_pin_attr);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hda_get_input_pin_label - Give a label for the given input pin</div><div class='del'>- *</div><div class='del'>- * When check_location is true, the function checks the pin location</div><div class='del'>- * for mic and line-in pins, and set an appropriate prefix like "Front",</div><div class='del'>- * "Rear", "Internal".</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-					int check_location)</div><div class='del'>-{</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-	static const char *mic_names[] = {</div><div class='del'>-		"Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",</div><div class='del'>-	};</div><div class='del'>-	int attr;</div><div class='del'>-</div><div class='del'>-	def_conf = snd_hda_codec_get_pincfg(codec, pin);</div><div class='del'>-</div><div class='del'>-	switch (get_defcfg_device(def_conf)) {</div><div class='del'>-	case AC_JACK_MIC_IN:</div><div class='del'>-		if (!check_location)</div><div class='del'>-			return "Mic";</div><div class='del'>-		attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='del'>-		if (!attr)</div><div class='del'>-			return "None";</div><div class='del'>-		return mic_names[attr - 1];</div><div class='del'>-	case AC_JACK_LINE_IN:</div><div class='del'>-		if (!check_location)</div><div class='del'>-			return "Line";</div><div class='del'>-		attr = snd_hda_get_input_pin_attr(def_conf);</div><div class='del'>-		if (!attr)</div><div class='del'>-			return "None";</div><div class='del'>-		if (attr == INPUT_PIN_ATTR_DOCK)</div><div class='del'>-			return "Dock Line";</div><div class='del'>-		return "Line";</div><div class='del'>-	case AC_JACK_AUX:</div><div class='del'>-		return "Aux";</div><div class='del'>-	case AC_JACK_CD:</div><div class='del'>-		return "CD";</div><div class='del'>-	case AC_JACK_SPDIF_IN:</div><div class='del'>-		return "SPDIF In";</div><div class='del'>-	case AC_JACK_DIG_OTHER_IN:</div><div class='del'>-		return "Digital In";</div><div class='del'>-	default:</div><div class='del'>-		return "Misc";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(hda_get_input_pin_label);</div><div class='del'>-</div><div class='del'>-/* Check whether the location prefix needs to be added to the label.</div><div class='del'>- * If all mic-jacks are in the same location (e.g. rear panel), we don't</div><div class='del'>- * have to put "Front" prefix to each label.  In such a case, returns false.</div><div class='del'>- */</div><div class='del'>-static int check_mic_location_need(struct hda_codec *codec,</div><div class='del'>-				   const struct auto_pin_cfg *cfg,</div><div class='del'>-				   int input)</div><div class='del'>-{</div><div class='del'>-	unsigned int defc;</div><div class='del'>-	int i, attr, attr2;</div><div class='del'>-</div><div class='del'>-	defc = snd_hda_codec_get_pincfg(codec, cfg-&gt;inputs[input].pin);</div><div class='del'>-	attr = snd_hda_get_input_pin_attr(defc);</div><div class='del'>-	/* for internal or docking mics, we need locations */</div><div class='del'>-	if (attr &lt;= INPUT_PIN_ATTR_NORMAL)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	attr = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		defc = snd_hda_codec_get_pincfg(codec, cfg-&gt;inputs[i].pin);</div><div class='del'>-		attr2 = snd_hda_get_input_pin_attr(defc);</div><div class='del'>-		if (attr2 &gt;= INPUT_PIN_ATTR_NORMAL) {</div><div class='del'>-			if (attr &amp;&amp; attr != attr2)</div><div class='del'>-				return 1; /* different locations found */</div><div class='del'>-			attr = attr2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * hda_get_autocfg_input_label - Get a label for the given input</div><div class='del'>- *</div><div class='del'>- * Get a label for the given input pin defined by the autocfg item.</div><div class='del'>- * Unlike hda_get_input_pin_label(), this function checks all inputs</div><div class='del'>- * defined in autocfg and avoids the redundant mic/line prefix as much as</div><div class='del'>- * possible.</div><div class='del'>- */</div><div class='del'>-const char *hda_get_autocfg_input_label(struct hda_codec *codec,</div><div class='del'>-					const struct auto_pin_cfg *cfg,</div><div class='del'>-					int input)</div><div class='del'>-{</div><div class='del'>-	int type = cfg-&gt;inputs[input].type;</div><div class='del'>-	int has_multiple_pins = 0;</div><div class='del'>-</div><div class='del'>-	if ((input &gt; 0 &amp;&amp; cfg-&gt;inputs[input - 1].type == type) ||</div><div class='del'>-	    (input &lt; cfg-&gt;num_inputs - 1 &amp;&amp; cfg-&gt;inputs[input + 1].type == type))</div><div class='del'>-		has_multiple_pins = 1;</div><div class='del'>-	if (has_multiple_pins &amp;&amp; type == AUTO_PIN_MIC)</div><div class='del'>-		has_multiple_pins &amp;= check_mic_location_need(codec, cfg, input);</div><div class='del'>-	return hda_get_input_pin_label(codec, cfg-&gt;inputs[input].pin,</div><div class='del'>-				       has_multiple_pins);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(hda_get_autocfg_input_label);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_add_imux_item - Add an item to input_mux</div><div class='del'>- *</div><div class='del'>- * When the same label is used already in the existing items, the number</div><div class='del'>- * suffix is appended to the label.  This label index number is stored</div><div class='del'>- * to type_idx when non-NULL pointer is given.</div><div class='del'>- */</div><div class='del'>-int snd_hda_add_imux_item(struct hda_input_mux *imux, const char *label,</div><div class='del'>-			  int index, int *type_idx)</div><div class='del'>-{</div><div class='del'>-	int i, label_idx = 0;</div><div class='del'>-	if (imux-&gt;num_items &gt;= HDA_MAX_NUM_INPUTS) {</div><div class='del'>-		snd_printd(KERN_ERR "hda_codec: Too many imux items!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='del'>-		if (!strncmp(label, imux-&gt;items[i].label, strlen(label)))</div><div class='del'>-			label_idx++;</div><div class='del'>-	}</div><div class='del'>-	if (type_idx)</div><div class='del'>-		*type_idx = label_idx;</div><div class='del'>-	if (label_idx &gt; 0)</div><div class='del'>-		snprintf(imux-&gt;items[imux-&gt;num_items].label,</div><div class='del'>-			 sizeof(imux-&gt;items[imux-&gt;num_items].label),</div><div class='del'>-			 "%s %d", label, label_idx);</div><div class='del'>-	else</div><div class='del'>-		strlcpy(imux-&gt;items[imux-&gt;num_items].label, label,</div><div class='del'>-			sizeof(imux-&gt;items[imux-&gt;num_items].label));</div><div class='del'>-	imux-&gt;items[imux-&gt;num_items].index = index;</div><div class='del'>-	imux-&gt;num_items++;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_add_imux_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/*</div><div class='del'>- * power management</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_suspend - suspend the codecs</div><div class='del'>- * @bus: the HDA bus</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful.</div><div class='del'>- */</div><div class='del'>-int snd_hda_suspend(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-		if (!codec-&gt;power_on)</div><div class='del'>-			continue;</div><div class='del'>-#endif</div><div class='del'>-		hda_call_codec_suspend(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_suspend);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_hda_resume - resume the codecs</div><div class='del'>- * @bus: the HDA bus</div><div class='del'>- *</div><div class='del'>- * Returns 0 if successful.</div><div class='del'>- *</div><div class='del'>- * This fucntion is defined only when POWER_SAVE isn't set.</div><div class='del'>- * In the power-save mode, the codec is resumed dynamically.</div><div class='del'>- */</div><div class='del'>-int snd_hda_resume(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		if (snd_hda_codec_needs_resume(codec))</div><div class='del'>-			hda_call_codec_resume(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_resume);</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic arrays</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_array_new - get a new element from the given array</div><div class='del'>- * @array: the array object</div><div class='del'>- *</div><div class='del'>- * Get a new element from the given array.  If it exceeds the</div><div class='del'>- * pre-allocated array size, re-allocate the array.</div><div class='del'>- *</div><div class='del'>- * Returns NULL if allocation failed.</div><div class='del'>- */</div><div class='del'>-void *snd_array_new(struct snd_array *array)</div><div class='del'>-{</div><div class='del'>-	if (array-&gt;used &gt;= array-&gt;alloced) {</div><div class='del'>-		int num = array-&gt;alloced + array-&gt;alloc_align;</div><div class='del'>-		void *nlist;</div><div class='del'>-		if (snd_BUG_ON(num &gt;= 4096))</div><div class='del'>-			return NULL;</div><div class='del'>-		nlist = kcalloc(num + 1, array-&gt;elem_size, GFP_KERNEL);</div><div class='del'>-		if (!nlist)</div><div class='del'>-			return NULL;</div><div class='del'>-		if (array-&gt;list) {</div><div class='del'>-			memcpy(nlist, array-&gt;list,</div><div class='del'>-			       array-&gt;elem_size * array-&gt;alloced);</div><div class='del'>-			kfree(array-&gt;list);</div><div class='del'>-		}</div><div class='del'>-		array-&gt;list = nlist;</div><div class='del'>-		array-&gt;alloced = num;</div><div class='del'>-	}</div><div class='del'>-	return snd_array_elem(array, array-&gt;used++);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_array_new);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_array_free - free the given array elements</div><div class='del'>- * @array: the array object</div><div class='del'>- */</div><div class='del'>-void snd_array_free(struct snd_array *array)</div><div class='del'>-{</div><div class='del'>-	kfree(array-&gt;list);</div><div class='del'>-	array-&gt;used = 0;</div><div class='del'>-	array-&gt;alloced = 0;</div><div class='del'>-	array-&gt;list = NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_array_free);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_print_pcm_rates - Print the supported PCM rates to the string buffer</div><div class='del'>- * @pcm: PCM caps bits</div><div class='del'>- * @buf: the string buffer to write</div><div class='del'>- * @buflen: the max buffer length</div><div class='del'>- *</div><div class='del'>- * used by hda_proc.c and hda_eld.c</div><div class='del'>- */</div><div class='del'>-void snd_print_pcm_rates(int pcm, char *buf, int buflen)</div><div class='del'>-{</div><div class='del'>-	static unsigned int rates[] = {</div><div class='del'>-		8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,</div><div class='del'>-		96000, 176400, 192000, 384000</div><div class='del'>-	};</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; ARRAY_SIZE(rates); i++)</div><div class='del'>-		if (pcm &amp; (1 &lt;&lt; i))</div><div class='del'>-			j += snprintf(buf + j, buflen - j,  " %d", rates[i]);</div><div class='del'>-</div><div class='del'>-	buf[j] = '\0'; /* necessary when j == 0 */</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_print_pcm_rates);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer</div><div class='del'>- * @pcm: PCM caps bits</div><div class='del'>- * @buf: the string buffer to write</div><div class='del'>- * @buflen: the max buffer length</div><div class='del'>- *</div><div class='del'>- * used by hda_proc.c and hda_eld.c</div><div class='del'>- */</div><div class='del'>-void snd_print_pcm_bits(int pcm, char *buf, int buflen)</div><div class='del'>-{</div><div class='del'>-	static unsigned int bits[] = { 8, 16, 20, 24, 32 };</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; ARRAY_SIZE(bits); i++)</div><div class='del'>-		if (pcm &amp; (AC_SUPPCM_BITS_8 &lt;&lt; i))</div><div class='del'>-			j += snprintf(buf + j, buflen - j,  " %d", bits[i]);</div><div class='del'>-</div><div class='del'>-	buf[j] = '\0'; /* necessary when j == 0 */</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_print_pcm_bits);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("HDA codec core");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h<br/>deleted file mode 100644<br/>index fdf8d44f8b6b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_codec.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_codec.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1048 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the Free</div><div class='del'>- *  Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- *  any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- *  more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along with</div><div class='del'>- *  this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __SOUND_HDA_CODEC_H</div><div class='del'>-#define __SOUND_HDA_CODEC_H</div><div class='del'>-</div><div class='del'>-#include &lt;sound/info.h&gt;</div><div class='del'>-#include &lt;sound/control.h&gt;</div><div class='del'>-#include &lt;sound/pcm.h&gt;</div><div class='del'>-#include &lt;sound/hwdep.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_PM) || defined(CONFIG_SND_HDA_POWER_SAVE)</div><div class='del'>-#define SND_HDA_NEEDS_RESUME	/* resume control code is required */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nodes</div><div class='del'>- */</div><div class='del'>-#define	AC_NODE_ROOT		0x00</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * function group types</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	AC_GRP_AUDIO_FUNCTION = 0x01,</div><div class='del'>-	AC_GRP_MODEM_FUNCTION = 0x02,</div><div class='del'>-};</div><div class='del'>-	</div><div class='del'>-/*</div><div class='del'>- * widget types</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	AC_WID_AUD_OUT,		/* Audio Out */</div><div class='del'>-	AC_WID_AUD_IN,		/* Audio In */</div><div class='del'>-	AC_WID_AUD_MIX,		/* Audio Mixer */</div><div class='del'>-	AC_WID_AUD_SEL,		/* Audio Selector */</div><div class='del'>-	AC_WID_PIN,		/* Pin Complex */</div><div class='del'>-	AC_WID_POWER,		/* Power */</div><div class='del'>-	AC_WID_VOL_KNB,		/* Volume Knob */</div><div class='del'>-	AC_WID_BEEP,		/* Beep Generator */</div><div class='del'>-	AC_WID_VENDOR = 0x0f	/* Vendor specific */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GET verbs</div><div class='del'>- */</div><div class='del'>-#define AC_VERB_GET_STREAM_FORMAT		0x0a00</div><div class='del'>-#define AC_VERB_GET_AMP_GAIN_MUTE		0x0b00</div><div class='del'>-#define AC_VERB_GET_PROC_COEF			0x0c00</div><div class='del'>-#define AC_VERB_GET_COEF_INDEX			0x0d00</div><div class='del'>-#define AC_VERB_PARAMETERS			0x0f00</div><div class='del'>-#define AC_VERB_GET_CONNECT_SEL			0x0f01</div><div class='del'>-#define AC_VERB_GET_CONNECT_LIST		0x0f02</div><div class='del'>-#define AC_VERB_GET_PROC_STATE			0x0f03</div><div class='del'>-#define AC_VERB_GET_SDI_SELECT			0x0f04</div><div class='del'>-#define AC_VERB_GET_POWER_STATE			0x0f05</div><div class='del'>-#define AC_VERB_GET_CONV			0x0f06</div><div class='del'>-#define AC_VERB_GET_PIN_WIDGET_CONTROL		0x0f07</div><div class='del'>-#define AC_VERB_GET_UNSOLICITED_RESPONSE	0x0f08</div><div class='del'>-#define AC_VERB_GET_PIN_SENSE			0x0f09</div><div class='del'>-#define AC_VERB_GET_BEEP_CONTROL		0x0f0a</div><div class='del'>-#define AC_VERB_GET_EAPD_BTLENABLE		0x0f0c</div><div class='del'>-#define AC_VERB_GET_DIGI_CONVERT_1		0x0f0d</div><div class='del'>-#define AC_VERB_GET_DIGI_CONVERT_2		0x0f0e /* unused */</div><div class='del'>-#define AC_VERB_GET_VOLUME_KNOB_CONTROL		0x0f0f</div><div class='del'>-/* f10-f1a: GPIO */</div><div class='del'>-#define AC_VERB_GET_GPIO_DATA			0x0f15</div><div class='del'>-#define AC_VERB_GET_GPIO_MASK			0x0f16</div><div class='del'>-#define AC_VERB_GET_GPIO_DIRECTION		0x0f17</div><div class='del'>-#define AC_VERB_GET_GPIO_WAKE_MASK		0x0f18</div><div class='del'>-#define AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK	0x0f19</div><div class='del'>-#define AC_VERB_GET_GPIO_STICKY_MASK		0x0f1a</div><div class='del'>-#define AC_VERB_GET_CONFIG_DEFAULT		0x0f1c</div><div class='del'>-/* f20: AFG/MFG */</div><div class='del'>-#define AC_VERB_GET_SUBSYSTEM_ID		0x0f20</div><div class='del'>-#define AC_VERB_GET_CVT_CHAN_COUNT		0x0f2d</div><div class='del'>-#define AC_VERB_GET_HDMI_DIP_SIZE		0x0f2e</div><div class='del'>-#define AC_VERB_GET_HDMI_ELDD			0x0f2f</div><div class='del'>-#define AC_VERB_GET_HDMI_DIP_INDEX		0x0f30</div><div class='del'>-#define AC_VERB_GET_HDMI_DIP_DATA		0x0f31</div><div class='del'>-#define AC_VERB_GET_HDMI_DIP_XMIT		0x0f32</div><div class='del'>-#define AC_VERB_GET_HDMI_CP_CTRL		0x0f33</div><div class='del'>-#define AC_VERB_GET_HDMI_CHAN_SLOT		0x0f34</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SET verbs</div><div class='del'>- */</div><div class='del'>-#define AC_VERB_SET_STREAM_FORMAT		0x200</div><div class='del'>-#define AC_VERB_SET_AMP_GAIN_MUTE		0x300</div><div class='del'>-#define AC_VERB_SET_PROC_COEF			0x400</div><div class='del'>-#define AC_VERB_SET_COEF_INDEX			0x500</div><div class='del'>-#define AC_VERB_SET_CONNECT_SEL			0x701</div><div class='del'>-#define AC_VERB_SET_PROC_STATE			0x703</div><div class='del'>-#define AC_VERB_SET_SDI_SELECT			0x704</div><div class='del'>-#define AC_VERB_SET_POWER_STATE			0x705</div><div class='del'>-#define AC_VERB_SET_CHANNEL_STREAMID		0x706</div><div class='del'>-#define AC_VERB_SET_PIN_WIDGET_CONTROL		0x707</div><div class='del'>-#define AC_VERB_SET_UNSOLICITED_ENABLE		0x708</div><div class='del'>-#define AC_VERB_SET_PIN_SENSE			0x709</div><div class='del'>-#define AC_VERB_SET_BEEP_CONTROL		0x70a</div><div class='del'>-#define AC_VERB_SET_EAPD_BTLENABLE		0x70c</div><div class='del'>-#define AC_VERB_SET_DIGI_CONVERT_1		0x70d</div><div class='del'>-#define AC_VERB_SET_DIGI_CONVERT_2		0x70e</div><div class='del'>-#define AC_VERB_SET_VOLUME_KNOB_CONTROL		0x70f</div><div class='del'>-#define AC_VERB_SET_GPIO_DATA			0x715</div><div class='del'>-#define AC_VERB_SET_GPIO_MASK			0x716</div><div class='del'>-#define AC_VERB_SET_GPIO_DIRECTION		0x717</div><div class='del'>-#define AC_VERB_SET_GPIO_WAKE_MASK		0x718</div><div class='del'>-#define AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK	0x719</div><div class='del'>-#define AC_VERB_SET_GPIO_STICKY_MASK		0x71a</div><div class='del'>-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0	0x71c</div><div class='del'>-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1	0x71d</div><div class='del'>-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2	0x71e</div><div class='del'>-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_3	0x71f</div><div class='del'>-#define AC_VERB_SET_EAPD				0x788</div><div class='del'>-#define AC_VERB_SET_CODEC_RESET			0x7ff</div><div class='del'>-#define AC_VERB_SET_CVT_CHAN_COUNT		0x72d</div><div class='del'>-#define AC_VERB_SET_HDMI_DIP_INDEX		0x730</div><div class='del'>-#define AC_VERB_SET_HDMI_DIP_DATA		0x731</div><div class='del'>-#define AC_VERB_SET_HDMI_DIP_XMIT		0x732</div><div class='del'>-#define AC_VERB_SET_HDMI_CP_CTRL		0x733</div><div class='del'>-#define AC_VERB_SET_HDMI_CHAN_SLOT		0x734</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parameter IDs</div><div class='del'>- */</div><div class='del'>-#define AC_PAR_VENDOR_ID		0x00</div><div class='del'>-#define AC_PAR_SUBSYSTEM_ID		0x01</div><div class='del'>-#define AC_PAR_REV_ID			0x02</div><div class='del'>-#define AC_PAR_NODE_COUNT		0x04</div><div class='del'>-#define AC_PAR_FUNCTION_TYPE		0x05</div><div class='del'>-#define AC_PAR_AUDIO_FG_CAP		0x08</div><div class='del'>-#define AC_PAR_AUDIO_WIDGET_CAP		0x09</div><div class='del'>-#define AC_PAR_PCM			0x0a</div><div class='del'>-#define AC_PAR_STREAM			0x0b</div><div class='del'>-#define AC_PAR_PIN_CAP			0x0c</div><div class='del'>-#define AC_PAR_AMP_IN_CAP		0x0d</div><div class='del'>-#define AC_PAR_CONNLIST_LEN		0x0e</div><div class='del'>-#define AC_PAR_POWER_STATE		0x0f</div><div class='del'>-#define AC_PAR_PROC_CAP			0x10</div><div class='del'>-#define AC_PAR_GPIO_CAP			0x11</div><div class='del'>-#define AC_PAR_AMP_OUT_CAP		0x12</div><div class='del'>-#define AC_PAR_VOL_KNB_CAP		0x13</div><div class='del'>-#define AC_PAR_HDMI_LPCM_CAP		0x20</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AC_VERB_PARAMETERS results (32bit)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Function Group Type */</div><div class='del'>-#define AC_FGT_TYPE			(0xff&lt;&lt;0)</div><div class='del'>-#define AC_FGT_TYPE_SHIFT		0</div><div class='del'>-#define AC_FGT_UNSOL_CAP		(1&lt;&lt;8)</div><div class='del'>-</div><div class='del'>-/* Audio Function Group Capabilities */</div><div class='del'>-#define AC_AFG_OUT_DELAY		(0xf&lt;&lt;0)</div><div class='del'>-#define AC_AFG_IN_DELAY			(0xf&lt;&lt;8)</div><div class='del'>-#define AC_AFG_BEEP_GEN			(1&lt;&lt;16)</div><div class='del'>-</div><div class='del'>-/* Audio Widget Capabilities */</div><div class='del'>-#define AC_WCAP_STEREO			(1&lt;&lt;0)	/* stereo I/O */</div><div class='del'>-#define AC_WCAP_IN_AMP			(1&lt;&lt;1)	/* AMP-in present */</div><div class='del'>-#define AC_WCAP_OUT_AMP			(1&lt;&lt;2)	/* AMP-out present */</div><div class='del'>-#define AC_WCAP_AMP_OVRD		(1&lt;&lt;3)	/* AMP-parameter override */</div><div class='del'>-#define AC_WCAP_FORMAT_OVRD		(1&lt;&lt;4)	/* format override */</div><div class='del'>-#define AC_WCAP_STRIPE			(1&lt;&lt;5)	/* stripe */</div><div class='del'>-#define AC_WCAP_PROC_WID		(1&lt;&lt;6)	/* Proc Widget */</div><div class='del'>-#define AC_WCAP_UNSOL_CAP		(1&lt;&lt;7)	/* Unsol capable */</div><div class='del'>-#define AC_WCAP_CONN_LIST		(1&lt;&lt;8)	/* connection list */</div><div class='del'>-#define AC_WCAP_DIGITAL			(1&lt;&lt;9)	/* digital I/O */</div><div class='del'>-#define AC_WCAP_POWER			(1&lt;&lt;10)	/* power control */</div><div class='del'>-#define AC_WCAP_LR_SWAP			(1&lt;&lt;11)	/* L/R swap */</div><div class='del'>-#define AC_WCAP_CP_CAPS			(1&lt;&lt;12) /* content protection */</div><div class='del'>-#define AC_WCAP_CHAN_CNT_EXT		(7&lt;&lt;13)	/* channel count ext */</div><div class='del'>-#define AC_WCAP_DELAY			(0xf&lt;&lt;16)</div><div class='del'>-#define AC_WCAP_DELAY_SHIFT		16</div><div class='del'>-#define AC_WCAP_TYPE			(0xf&lt;&lt;20)</div><div class='del'>-#define AC_WCAP_TYPE_SHIFT		20</div><div class='del'>-</div><div class='del'>-/* supported PCM rates and bits */</div><div class='del'>-#define AC_SUPPCM_RATES			(0xfff &lt;&lt; 0)</div><div class='del'>-#define AC_SUPPCM_BITS_8		(1&lt;&lt;16)</div><div class='del'>-#define AC_SUPPCM_BITS_16		(1&lt;&lt;17)</div><div class='del'>-#define AC_SUPPCM_BITS_20		(1&lt;&lt;18)</div><div class='del'>-#define AC_SUPPCM_BITS_24		(1&lt;&lt;19)</div><div class='del'>-#define AC_SUPPCM_BITS_32		(1&lt;&lt;20)</div><div class='del'>-</div><div class='del'>-/* supported PCM stream format */</div><div class='del'>-#define AC_SUPFMT_PCM			(1&lt;&lt;0)</div><div class='del'>-#define AC_SUPFMT_FLOAT32		(1&lt;&lt;1)</div><div class='del'>-#define AC_SUPFMT_AC3			(1&lt;&lt;2)</div><div class='del'>-</div><div class='del'>-/* GP I/O count */</div><div class='del'>-#define AC_GPIO_IO_COUNT		(0xff&lt;&lt;0)</div><div class='del'>-#define AC_GPIO_O_COUNT			(0xff&lt;&lt;8)</div><div class='del'>-#define AC_GPIO_O_COUNT_SHIFT		8</div><div class='del'>-#define AC_GPIO_I_COUNT			(0xff&lt;&lt;16)</div><div class='del'>-#define AC_GPIO_I_COUNT_SHIFT		16</div><div class='del'>-#define AC_GPIO_UNSOLICITED		(1&lt;&lt;30)</div><div class='del'>-#define AC_GPIO_WAKE			(1&lt;&lt;31)</div><div class='del'>-</div><div class='del'>-/* Converter stream, channel */</div><div class='del'>-#define AC_CONV_CHANNEL			(0xf&lt;&lt;0)</div><div class='del'>-#define AC_CONV_STREAM			(0xf&lt;&lt;4)</div><div class='del'>-#define AC_CONV_STREAM_SHIFT		4</div><div class='del'>-</div><div class='del'>-/* Input converter SDI select */</div><div class='del'>-#define AC_SDI_SELECT			(0xf&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-/* stream format id */</div><div class='del'>-#define AC_FMT_CHAN_SHIFT		0</div><div class='del'>-#define AC_FMT_CHAN_MASK		(0x0f &lt;&lt; 0)</div><div class='del'>-#define AC_FMT_BITS_SHIFT		4</div><div class='del'>-#define AC_FMT_BITS_MASK		(7 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_BITS_8			(0 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_BITS_16			(1 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_BITS_20			(2 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_BITS_24			(3 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_BITS_32			(4 &lt;&lt; 4)</div><div class='del'>-#define AC_FMT_DIV_SHIFT		8</div><div class='del'>-#define AC_FMT_DIV_MASK			(7 &lt;&lt; 8)</div><div class='del'>-#define AC_FMT_MULT_SHIFT		11</div><div class='del'>-#define AC_FMT_MULT_MASK		(7 &lt;&lt; 11)</div><div class='del'>-#define AC_FMT_BASE_SHIFT		14</div><div class='del'>-#define AC_FMT_BASE_48K			(0 &lt;&lt; 14)</div><div class='del'>-#define AC_FMT_BASE_44K			(1 &lt;&lt; 14)</div><div class='del'>-#define AC_FMT_TYPE_SHIFT		15</div><div class='del'>-#define AC_FMT_TYPE_PCM			(0 &lt;&lt; 15)</div><div class='del'>-#define AC_FMT_TYPE_NON_PCM		(1 &lt;&lt; 15)</div><div class='del'>-</div><div class='del'>-/* Unsolicited response control */</div><div class='del'>-#define AC_UNSOL_TAG			(0x3f&lt;&lt;0)</div><div class='del'>-#define AC_UNSOL_ENABLED		(1&lt;&lt;7)</div><div class='del'>-#define AC_USRSP_EN			AC_UNSOL_ENABLED</div><div class='del'>-</div><div class='del'>-/* Unsolicited responses */</div><div class='del'>-#define AC_UNSOL_RES_TAG		(0x3f&lt;&lt;26)</div><div class='del'>-#define AC_UNSOL_RES_TAG_SHIFT		26</div><div class='del'>-#define AC_UNSOL_RES_SUBTAG		(0x1f&lt;&lt;21)</div><div class='del'>-#define AC_UNSOL_RES_SUBTAG_SHIFT	21</div><div class='del'>-#define AC_UNSOL_RES_ELDV		(1&lt;&lt;1)	/* ELD Data valid (for HDMI) */</div><div class='del'>-#define AC_UNSOL_RES_PD			(1&lt;&lt;0)	/* pinsense detect */</div><div class='del'>-#define AC_UNSOL_RES_CP_STATE		(1&lt;&lt;1)	/* content protection */</div><div class='del'>-#define AC_UNSOL_RES_CP_READY		(1&lt;&lt;0)	/* content protection */</div><div class='del'>-</div><div class='del'>-/* Pin widget capabilies */</div><div class='del'>-#define AC_PINCAP_IMP_SENSE		(1&lt;&lt;0)	/* impedance sense capable */</div><div class='del'>-#define AC_PINCAP_TRIG_REQ		(1&lt;&lt;1)	/* trigger required */</div><div class='del'>-#define AC_PINCAP_PRES_DETECT		(1&lt;&lt;2)	/* presence detect capable */</div><div class='del'>-#define AC_PINCAP_HP_DRV		(1&lt;&lt;3)	/* headphone drive capable */</div><div class='del'>-#define AC_PINCAP_OUT			(1&lt;&lt;4)	/* output capable */</div><div class='del'>-#define AC_PINCAP_IN			(1&lt;&lt;5)	/* input capable */</div><div class='del'>-#define AC_PINCAP_BALANCE		(1&lt;&lt;6)	/* balanced I/O capable */</div><div class='del'>-/* Note: This LR_SWAP pincap is defined in the Realtek ALC883 specification,</div><div class='del'>- *       but is marked reserved in the Intel HDA specification.</div><div class='del'>- */</div><div class='del'>-#define AC_PINCAP_LR_SWAP		(1&lt;&lt;7)	/* L/R swap */</div><div class='del'>-/* Note: The same bit as LR_SWAP is newly defined as HDMI capability</div><div class='del'>- *       in HD-audio specification</div><div class='del'>- */</div><div class='del'>-#define AC_PINCAP_HDMI			(1&lt;&lt;7)	/* HDMI pin */</div><div class='del'>-#define AC_PINCAP_DP			(1&lt;&lt;24)	/* DisplayPort pin, can</div><div class='del'>-						 * coexist with AC_PINCAP_HDMI</div><div class='del'>-						 */</div><div class='del'>-#define AC_PINCAP_VREF			(0x37&lt;&lt;8)</div><div class='del'>-#define AC_PINCAP_VREF_SHIFT		8</div><div class='del'>-#define AC_PINCAP_EAPD			(1&lt;&lt;16)	/* EAPD capable */</div><div class='del'>-#define AC_PINCAP_HBR			(1&lt;&lt;27)	/* High Bit Rate */</div><div class='del'>-/* Vref status (used in pin cap) */</div><div class='del'>-#define AC_PINCAP_VREF_HIZ		(1&lt;&lt;0)	/* Hi-Z */</div><div class='del'>-#define AC_PINCAP_VREF_50		(1&lt;&lt;1)	/* 50% */</div><div class='del'>-#define AC_PINCAP_VREF_GRD		(1&lt;&lt;2)	/* ground */</div><div class='del'>-#define AC_PINCAP_VREF_80		(1&lt;&lt;4)	/* 80% */</div><div class='del'>-#define AC_PINCAP_VREF_100		(1&lt;&lt;5)	/* 100% */</div><div class='del'>-</div><div class='del'>-/* Amplifier capabilities */</div><div class='del'>-#define AC_AMPCAP_OFFSET		(0x7f&lt;&lt;0)  /* 0dB offset */</div><div class='del'>-#define AC_AMPCAP_OFFSET_SHIFT		0</div><div class='del'>-#define AC_AMPCAP_NUM_STEPS		(0x7f&lt;&lt;8)  /* number of steps */</div><div class='del'>-#define AC_AMPCAP_NUM_STEPS_SHIFT	8</div><div class='del'>-#define AC_AMPCAP_STEP_SIZE		(0x7f&lt;&lt;16) /* step size 0-32dB</div><div class='del'>-						    * in 0.25dB</div><div class='del'>-						    */</div><div class='del'>-#define AC_AMPCAP_STEP_SIZE_SHIFT	16</div><div class='del'>-#define AC_AMPCAP_MUTE			(1&lt;&lt;31)    /* mute capable */</div><div class='del'>-#define AC_AMPCAP_MUTE_SHIFT		31</div><div class='del'>-</div><div class='del'>-/* Connection list */</div><div class='del'>-#define AC_CLIST_LENGTH			(0x7f&lt;&lt;0)</div><div class='del'>-#define AC_CLIST_LONG			(1&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-/* Supported power status */</div><div class='del'>-#define AC_PWRST_D0SUP			(1&lt;&lt;0)</div><div class='del'>-#define AC_PWRST_D1SUP			(1&lt;&lt;1)</div><div class='del'>-#define AC_PWRST_D2SUP			(1&lt;&lt;2)</div><div class='del'>-#define AC_PWRST_D3SUP			(1&lt;&lt;3)</div><div class='del'>-#define AC_PWRST_D3COLDSUP		(1&lt;&lt;4)</div><div class='del'>-#define AC_PWRST_S3D3COLDSUP		(1&lt;&lt;29)</div><div class='del'>-#define AC_PWRST_CLKSTOP		(1&lt;&lt;30)</div><div class='del'>-#define AC_PWRST_EPSS			(1U&lt;&lt;31)</div><div class='del'>-</div><div class='del'>-/* Power state values */</div><div class='del'>-#define AC_PWRST_SETTING		(0xf&lt;&lt;0)</div><div class='del'>-#define AC_PWRST_ACTUAL			(0xf&lt;&lt;4)</div><div class='del'>-#define AC_PWRST_ACTUAL_SHIFT		4</div><div class='del'>-#define AC_PWRST_D0			0x00</div><div class='del'>-#define AC_PWRST_D1			0x01</div><div class='del'>-#define AC_PWRST_D2			0x02</div><div class='del'>-#define AC_PWRST_D3			0x03</div><div class='del'>-</div><div class='del'>-/* Processing capabilies */</div><div class='del'>-#define AC_PCAP_BENIGN			(1&lt;&lt;0)</div><div class='del'>-#define AC_PCAP_NUM_COEF		(0xff&lt;&lt;8)</div><div class='del'>-#define AC_PCAP_NUM_COEF_SHIFT		8</div><div class='del'>-</div><div class='del'>-/* Volume knobs capabilities */</div><div class='del'>-#define AC_KNBCAP_NUM_STEPS		(0x7f&lt;&lt;0)</div><div class='del'>-#define AC_KNBCAP_DELTA			(1&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-/* HDMI LPCM capabilities */</div><div class='del'>-#define AC_LPCMCAP_48K_CP_CHNS		(0x0f&lt;&lt;0) /* max channels w/ CP-on */	</div><div class='del'>-#define AC_LPCMCAP_48K_NO_CHNS		(0x0f&lt;&lt;4) /* max channels w/o CP-on */</div><div class='del'>-#define AC_LPCMCAP_48K_20BIT		(1&lt;&lt;8)	/* 20b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_48K_24BIT		(1&lt;&lt;9)	/* 24b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_96K_CP_CHNS		(0x0f&lt;&lt;10) /* max channels w/ CP-on */	</div><div class='del'>-#define AC_LPCMCAP_96K_NO_CHNS		(0x0f&lt;&lt;14) /* max channels w/o CP-on */</div><div class='del'>-#define AC_LPCMCAP_96K_20BIT		(1&lt;&lt;18)	/* 20b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_96K_24BIT		(1&lt;&lt;19)	/* 24b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_192K_CP_CHNS		(0x0f&lt;&lt;20) /* max channels w/ CP-on */	</div><div class='del'>-#define AC_LPCMCAP_192K_NO_CHNS		(0x0f&lt;&lt;24) /* max channels w/o CP-on */</div><div class='del'>-#define AC_LPCMCAP_192K_20BIT		(1&lt;&lt;28)	/* 20b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_192K_24BIT		(1&lt;&lt;29)	/* 24b bitrate supported */</div><div class='del'>-#define AC_LPCMCAP_44K			(1&lt;&lt;30)	/* 44.1kHz support */</div><div class='del'>-#define AC_LPCMCAP_44K_MS		(1&lt;&lt;31)	/* 44.1kHz-multiplies support */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Control Parameters</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Amp gain/mute */</div><div class='del'>-#define AC_AMP_MUTE			(1&lt;&lt;7)</div><div class='del'>-#define AC_AMP_GAIN			(0x7f)</div><div class='del'>-#define AC_AMP_GET_INDEX		(0xf&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define AC_AMP_GET_LEFT			(1&lt;&lt;13)</div><div class='del'>-#define AC_AMP_GET_RIGHT		(0&lt;&lt;13)</div><div class='del'>-#define AC_AMP_GET_OUTPUT		(1&lt;&lt;15)</div><div class='del'>-#define AC_AMP_GET_INPUT		(0&lt;&lt;15)</div><div class='del'>-</div><div class='del'>-#define AC_AMP_SET_INDEX		(0xf&lt;&lt;8)</div><div class='del'>-#define AC_AMP_SET_INDEX_SHIFT		8</div><div class='del'>-#define AC_AMP_SET_RIGHT		(1&lt;&lt;12)</div><div class='del'>-#define AC_AMP_SET_LEFT			(1&lt;&lt;13)</div><div class='del'>-#define AC_AMP_SET_INPUT		(1&lt;&lt;14)</div><div class='del'>-#define AC_AMP_SET_OUTPUT		(1&lt;&lt;15)</div><div class='del'>-</div><div class='del'>-/* DIGITAL1 bits */</div><div class='del'>-#define AC_DIG1_ENABLE			(1&lt;&lt;0)</div><div class='del'>-#define AC_DIG1_V			(1&lt;&lt;1)</div><div class='del'>-#define AC_DIG1_VCFG			(1&lt;&lt;2)</div><div class='del'>-#define AC_DIG1_EMPHASIS		(1&lt;&lt;3)</div><div class='del'>-#define AC_DIG1_COPYRIGHT		(1&lt;&lt;4)</div><div class='del'>-#define AC_DIG1_NONAUDIO		(1&lt;&lt;5)</div><div class='del'>-#define AC_DIG1_PROFESSIONAL		(1&lt;&lt;6)</div><div class='del'>-#define AC_DIG1_LEVEL			(1&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-/* DIGITAL2 bits */</div><div class='del'>-#define AC_DIG2_CC			(0x7f&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-/* Pin widget control - 8bit */</div><div class='del'>-#define AC_PINCTL_EPT			(0x3&lt;&lt;0)</div><div class='del'>-#define AC_PINCTL_EPT_NATIVE		0</div><div class='del'>-#define AC_PINCTL_EPT_HBR		3</div><div class='del'>-#define AC_PINCTL_VREFEN		(0x7&lt;&lt;0)</div><div class='del'>-#define AC_PINCTL_VREF_HIZ		0	/* Hi-Z */</div><div class='del'>-#define AC_PINCTL_VREF_50		1	/* 50% */</div><div class='del'>-#define AC_PINCTL_VREF_GRD		2	/* ground */</div><div class='del'>-#define AC_PINCTL_VREF_80		4	/* 80% */</div><div class='del'>-#define AC_PINCTL_VREF_100		5	/* 100% */</div><div class='del'>-#define AC_PINCTL_IN_EN			(1&lt;&lt;5)</div><div class='del'>-#define AC_PINCTL_OUT_EN		(1&lt;&lt;6)</div><div class='del'>-#define AC_PINCTL_HP_EN			(1&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-/* Pin sense - 32bit */</div><div class='del'>-#define AC_PINSENSE_IMPEDANCE_MASK	(0x7fffffff)</div><div class='del'>-#define AC_PINSENSE_PRESENCE		(1&lt;&lt;31)</div><div class='del'>-#define AC_PINSENSE_ELDV		(1&lt;&lt;30)	/* ELD valid (HDMI) */</div><div class='del'>-</div><div class='del'>-/* EAPD/BTL enable - 32bit */</div><div class='del'>-#define AC_EAPDBTL_BALANCED		(1&lt;&lt;0)</div><div class='del'>-#define AC_EAPDBTL_EAPD			(1&lt;&lt;1)</div><div class='del'>-#define AC_EAPDBTL_LR_SWAP		(1&lt;&lt;2)</div><div class='del'>-</div><div class='del'>-/* HDMI ELD data */</div><div class='del'>-#define AC_ELDD_ELD_VALID		(1&lt;&lt;31)</div><div class='del'>-#define AC_ELDD_ELD_DATA		0xff</div><div class='del'>-</div><div class='del'>-/* HDMI DIP size */</div><div class='del'>-#define AC_DIPSIZE_ELD_BUF		(1&lt;&lt;3) /* ELD buf size of packet size */</div><div class='del'>-#define AC_DIPSIZE_PACK_IDX		(0x07&lt;&lt;0) /* packet index */</div><div class='del'>-</div><div class='del'>-/* HDMI DIP index */</div><div class='del'>-#define AC_DIPIDX_PACK_IDX		(0x07&lt;&lt;5) /* packet idnex */</div><div class='del'>-#define AC_DIPIDX_BYTE_IDX		(0x1f&lt;&lt;0) /* byte index */</div><div class='del'>-</div><div class='del'>-/* HDMI DIP xmit (transmit) control */</div><div class='del'>-#define AC_DIPXMIT_MASK			(0x3&lt;&lt;6)</div><div class='del'>-#define AC_DIPXMIT_DISABLE		(0x0&lt;&lt;6) /* disable xmit */</div><div class='del'>-#define AC_DIPXMIT_ONCE			(0x2&lt;&lt;6) /* xmit once then disable */</div><div class='del'>-#define AC_DIPXMIT_BEST			(0x3&lt;&lt;6) /* best effort */</div><div class='del'>-</div><div class='del'>-/* HDMI content protection (CP) control */</div><div class='del'>-#define AC_CPCTRL_CES			(1&lt;&lt;9) /* current encryption state */</div><div class='del'>-#define AC_CPCTRL_READY			(1&lt;&lt;8) /* ready bit */</div><div class='del'>-#define AC_CPCTRL_SUBTAG		(0x1f&lt;&lt;3) /* subtag for unsol-resp */</div><div class='del'>-#define AC_CPCTRL_STATE			(3&lt;&lt;0) /* current CP request state */</div><div class='del'>-</div><div class='del'>-/* Converter channel &lt;-&gt; HDMI slot mapping */</div><div class='del'>-#define AC_CVTMAP_HDMI_SLOT		(0xf&lt;&lt;0) /* HDMI slot number */</div><div class='del'>-#define AC_CVTMAP_CHAN			(0xf&lt;&lt;4) /* converter channel number */</div><div class='del'>-</div><div class='del'>-/* configuration default - 32bit */</div><div class='del'>-#define AC_DEFCFG_SEQUENCE		(0xf&lt;&lt;0)</div><div class='del'>-#define AC_DEFCFG_DEF_ASSOC		(0xf&lt;&lt;4)</div><div class='del'>-#define AC_DEFCFG_ASSOC_SHIFT		4</div><div class='del'>-#define AC_DEFCFG_MISC			(0xf&lt;&lt;8)</div><div class='del'>-#define AC_DEFCFG_MISC_SHIFT		8</div><div class='del'>-#define AC_DEFCFG_MISC_NO_PRESENCE	(1&lt;&lt;0)</div><div class='del'>-#define AC_DEFCFG_COLOR			(0xf&lt;&lt;12)</div><div class='del'>-#define AC_DEFCFG_COLOR_SHIFT		12</div><div class='del'>-#define AC_DEFCFG_CONN_TYPE		(0xf&lt;&lt;16)</div><div class='del'>-#define AC_DEFCFG_CONN_TYPE_SHIFT	16</div><div class='del'>-#define AC_DEFCFG_DEVICE		(0xf&lt;&lt;20)</div><div class='del'>-#define AC_DEFCFG_DEVICE_SHIFT		20</div><div class='del'>-#define AC_DEFCFG_LOCATION		(0x3f&lt;&lt;24)</div><div class='del'>-#define AC_DEFCFG_LOCATION_SHIFT	24</div><div class='del'>-#define AC_DEFCFG_PORT_CONN		(0x3&lt;&lt;30)</div><div class='del'>-#define AC_DEFCFG_PORT_CONN_SHIFT	30</div><div class='del'>-</div><div class='del'>-/* device device types (0x0-0xf) */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_LINE_OUT,</div><div class='del'>-	AC_JACK_SPEAKER,</div><div class='del'>-	AC_JACK_HP_OUT,</div><div class='del'>-	AC_JACK_CD,</div><div class='del'>-	AC_JACK_SPDIF_OUT,</div><div class='del'>-	AC_JACK_DIG_OTHER_OUT,</div><div class='del'>-	AC_JACK_MODEM_LINE_SIDE,</div><div class='del'>-	AC_JACK_MODEM_HAND_SIDE,</div><div class='del'>-	AC_JACK_LINE_IN,</div><div class='del'>-	AC_JACK_AUX,</div><div class='del'>-	AC_JACK_MIC_IN,</div><div class='del'>-	AC_JACK_TELEPHONY,</div><div class='del'>-	AC_JACK_SPDIF_IN,</div><div class='del'>-	AC_JACK_DIG_OTHER_IN,</div><div class='del'>-	AC_JACK_OTHER = 0xf,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jack connection types (0x0-0xf) */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_CONN_UNKNOWN,</div><div class='del'>-	AC_JACK_CONN_1_8,</div><div class='del'>-	AC_JACK_CONN_1_4,</div><div class='del'>-	AC_JACK_CONN_ATAPI,</div><div class='del'>-	AC_JACK_CONN_RCA,</div><div class='del'>-	AC_JACK_CONN_OPTICAL,</div><div class='del'>-	AC_JACK_CONN_OTHER_DIGITAL,</div><div class='del'>-	AC_JACK_CONN_OTHER_ANALOG,</div><div class='del'>-	AC_JACK_CONN_DIN,</div><div class='del'>-	AC_JACK_CONN_XLR,</div><div class='del'>-	AC_JACK_CONN_RJ11,</div><div class='del'>-	AC_JACK_CONN_COMB,</div><div class='del'>-	AC_JACK_CONN_OTHER = 0xf,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jack colors (0x0-0xf) */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_COLOR_UNKNOWN,</div><div class='del'>-	AC_JACK_COLOR_BLACK,</div><div class='del'>-	AC_JACK_COLOR_GREY,</div><div class='del'>-	AC_JACK_COLOR_BLUE,</div><div class='del'>-	AC_JACK_COLOR_GREEN,</div><div class='del'>-	AC_JACK_COLOR_RED,</div><div class='del'>-	AC_JACK_COLOR_ORANGE,</div><div class='del'>-	AC_JACK_COLOR_YELLOW,</div><div class='del'>-	AC_JACK_COLOR_PURPLE,</div><div class='del'>-	AC_JACK_COLOR_PINK,</div><div class='del'>-	AC_JACK_COLOR_WHITE = 0xe,</div><div class='del'>-	AC_JACK_COLOR_OTHER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Jack location (0x0-0x3f) */</div><div class='del'>-/* common case */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_LOC_NONE,</div><div class='del'>-	AC_JACK_LOC_REAR,</div><div class='del'>-	AC_JACK_LOC_FRONT,</div><div class='del'>-	AC_JACK_LOC_LEFT,</div><div class='del'>-	AC_JACK_LOC_RIGHT,</div><div class='del'>-	AC_JACK_LOC_TOP,</div><div class='del'>-	AC_JACK_LOC_BOTTOM,</div><div class='del'>-};</div><div class='del'>-/* bits 4-5 */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_LOC_EXTERNAL = 0x00,</div><div class='del'>-	AC_JACK_LOC_INTERNAL = 0x10,</div><div class='del'>-	AC_JACK_LOC_SEPARATE = 0x20,</div><div class='del'>-	AC_JACK_LOC_OTHER    = 0x30,</div><div class='del'>-};</div><div class='del'>-enum {</div><div class='del'>-	/* external on primary chasis */</div><div class='del'>-	AC_JACK_LOC_REAR_PANEL = 0x07,</div><div class='del'>-	AC_JACK_LOC_DRIVE_BAY,</div><div class='del'>-	/* internal */</div><div class='del'>-	AC_JACK_LOC_RISER = 0x17,</div><div class='del'>-	AC_JACK_LOC_HDMI,</div><div class='del'>-	AC_JACK_LOC_ATAPI,</div><div class='del'>-	/* others */</div><div class='del'>-	AC_JACK_LOC_MOBILE_IN = 0x37,</div><div class='del'>-	AC_JACK_LOC_MOBILE_OUT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Port connectivity (0-3) */</div><div class='del'>-enum {</div><div class='del'>-	AC_JACK_PORT_COMPLEX,</div><div class='del'>-	AC_JACK_PORT_NONE,</div><div class='del'>-	AC_JACK_PORT_FIXED,</div><div class='del'>-	AC_JACK_PORT_BOTH,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* max. connections to a widget */</div><div class='del'>-#define HDA_MAX_CONNECTIONS	32</div><div class='del'>-</div><div class='del'>-/* max. codec address */</div><div class='del'>-#define HDA_MAX_CODEC_ADDRESS	0x0f</div><div class='del'>-</div><div class='del'>-/* max number of PCM devics per card */</div><div class='del'>-#define HDA_MAX_PCMS		10</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic arrays</div><div class='del'>- */</div><div class='del'>-struct snd_array {</div><div class='del'>-	unsigned int used;</div><div class='del'>-	unsigned int alloced;</div><div class='del'>-	unsigned int elem_size;</div><div class='del'>-	unsigned int alloc_align;</div><div class='del'>-	void *list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void *snd_array_new(struct snd_array *array);</div><div class='del'>-void snd_array_free(struct snd_array *array);</div><div class='del'>-static inline void snd_array_init(struct snd_array *array, unsigned int size,</div><div class='del'>-				  unsigned int align)</div><div class='del'>-{</div><div class='del'>-	array-&gt;elem_size = size;</div><div class='del'>-	array-&gt;alloc_align = align;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *snd_array_elem(struct snd_array *array, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	return array-&gt;list + idx * array-&gt;elem_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)</div><div class='del'>-{</div><div class='del'>-	return (unsigned long)(ptr - array-&gt;list) / array-&gt;elem_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Structures</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct hda_bus;</div><div class='del'>-struct hda_beep;</div><div class='del'>-struct hda_codec;</div><div class='del'>-struct hda_pcm;</div><div class='del'>-struct hda_pcm_stream;</div><div class='del'>-struct hda_bus_unsolicited;</div><div class='del'>-</div><div class='del'>-/* NID type */</div><div class='del'>-typedef u16 hda_nid_t;</div><div class='del'>-</div><div class='del'>-/* bus operators */</div><div class='del'>-struct hda_bus_ops {</div><div class='del'>-	/* send a single command */</div><div class='del'>-	int (*command)(struct hda_bus *bus, unsigned int cmd);</div><div class='del'>-	/* get a response from the last command */</div><div class='del'>-	unsigned int (*get_response)(struct hda_bus *bus, unsigned int addr);</div><div class='del'>-	/* free the private data */</div><div class='del'>-	void (*private_free)(struct hda_bus *);</div><div class='del'>-	/* attach a PCM stream */</div><div class='del'>-	int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec,</div><div class='del'>-			  struct hda_pcm *pcm);</div><div class='del'>-	/* reset bus for retry verb */</div><div class='del'>-	void (*bus_reset)(struct hda_bus *bus);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	/* notify power-up/down from codec to controller */</div><div class='del'>-	void (*pm_notify)(struct hda_bus *bus);</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* template to pass to the bus constructor */</div><div class='del'>-struct hda_bus_template {</div><div class='del'>-	void *private_data;</div><div class='del'>-	struct pci_dev *pci;</div><div class='del'>-	const char *modelname;</div><div class='del'>-	int *power_save;</div><div class='del'>-	struct hda_bus_ops ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * codec bus</div><div class='del'>- *</div><div class='del'>- * each controller needs to creata a hda_bus to assign the accessor.</div><div class='del'>- * A hda_bus contains several codecs in the list codec_list.</div><div class='del'>- */</div><div class='del'>-struct hda_bus {</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-</div><div class='del'>-	/* copied from template */</div><div class='del'>-	void *private_data;</div><div class='del'>-	struct pci_dev *pci;</div><div class='del'>-	const char *modelname;</div><div class='del'>-	int *power_save;</div><div class='del'>-	struct hda_bus_ops ops;</div><div class='del'>-</div><div class='del'>-	/* codec linked list */</div><div class='del'>-	struct list_head codec_list;</div><div class='del'>-	/* link caddr -&gt; codec */</div><div class='del'>-	struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1];</div><div class='del'>-</div><div class='del'>-	struct mutex cmd_mutex;</div><div class='del'>-	struct mutex prepare_mutex;</div><div class='del'>-</div><div class='del'>-	/* unsolicited event queue */</div><div class='del'>-	struct hda_bus_unsolicited *unsol;</div><div class='del'>-	char workq_name[16];</div><div class='del'>-	struct workqueue_struct *workq;	/* common workqueue for codecs */</div><div class='del'>-</div><div class='del'>-	/* assigned PCMs */</div><div class='del'>-	DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);</div><div class='del'>-</div><div class='del'>-	/* misc op flags */</div><div class='del'>-	unsigned int needs_damn_long_delay :1;</div><div class='del'>-	unsigned int allow_bus_reset:1;	/* allow bus reset at fatal error */</div><div class='del'>-	unsigned int sync_write:1;	/* sync after verb write */</div><div class='del'>-	/* status for codec/controller */</div><div class='del'>-	unsigned int shutdown :1;	/* being unloaded */</div><div class='del'>-	unsigned int rirb_error:1;	/* error in codec communication */</div><div class='del'>-	unsigned int response_reset:1;	/* controller was reset */</div><div class='del'>-	unsigned int in_reset:1;	/* during reset operation */</div><div class='del'>-	unsigned int power_keep_link_on:1; /* don't power off HDA link */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * codec preset</div><div class='del'>- *</div><div class='del'>- * Known codecs have the patch to build and set up the controls/PCMs</div><div class='del'>- * better than the generic parser.</div><div class='del'>- */</div><div class='del'>-struct hda_codec_preset {</div><div class='del'>-	unsigned int id;</div><div class='del'>-	unsigned int mask;</div><div class='del'>-	unsigned int subs;</div><div class='del'>-	unsigned int subs_mask;</div><div class='del'>-	unsigned int rev;</div><div class='del'>-	hda_nid_t afg, mfg;</div><div class='del'>-	const char *name;</div><div class='del'>-	int (*patch)(struct hda_codec *codec);</div><div class='del'>-};</div><div class='del'>-	</div><div class='del'>-struct hda_codec_preset_list {</div><div class='del'>-	const struct hda_codec_preset *preset;</div><div class='del'>-	struct module *owner;</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* initial hook */</div><div class='del'>-int snd_hda_add_codec_preset(struct hda_codec_preset_list *preset);</div><div class='del'>-int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset);</div><div class='del'>-</div><div class='del'>-/* ops set by the preset patch */</div><div class='del'>-struct hda_codec_ops {</div><div class='del'>-	int (*build_controls)(struct hda_codec *codec);</div><div class='del'>-	int (*build_pcms)(struct hda_codec *codec);</div><div class='del'>-	int (*init)(struct hda_codec *codec);</div><div class='del'>-	void (*free)(struct hda_codec *codec);</div><div class='del'>-	void (*unsol_event)(struct hda_codec *codec, unsigned int res);</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	int (*suspend)(struct hda_codec *codec, pm_message_t state);</div><div class='del'>-	int (*resume)(struct hda_codec *codec);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-#endif</div><div class='del'>-	void (*reboot_notify)(struct hda_codec *codec);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* record for amp information cache */</div><div class='del'>-struct hda_cache_head {</div><div class='del'>-	u32 key;		/* hash key */</div><div class='del'>-	u16 val;		/* assigned value */</div><div class='del'>-	u16 next;		/* next link; -1 = terminal */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hda_amp_info {</div><div class='del'>-	struct hda_cache_head head;</div><div class='del'>-	u32 amp_caps;		/* amp capabilities */</div><div class='del'>-	u16 vol[2];		/* current volume &amp; mute */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hda_cache_rec {</div><div class='del'>-	u16 hash[64];			/* hash table for index */</div><div class='del'>-	struct snd_array buf;		/* record entries */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* PCM callbacks */</div><div class='del'>-struct hda_pcm_ops {</div><div class='del'>-	int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,</div><div class='del'>-		    struct snd_pcm_substream *substream);</div><div class='del'>-	int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,</div><div class='del'>-		     struct snd_pcm_substream *substream);</div><div class='del'>-	int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,</div><div class='del'>-		       unsigned int stream_tag, unsigned int format,</div><div class='del'>-		       struct snd_pcm_substream *substream);</div><div class='del'>-	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,</div><div class='del'>-		       struct snd_pcm_substream *substream);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* PCM information for each substream */</div><div class='del'>-struct hda_pcm_stream {</div><div class='del'>-	unsigned int substreams;	/* number of substreams, 0 = not exist*/</div><div class='del'>-	unsigned int channels_min;	/* min. number of channels */</div><div class='del'>-	unsigned int channels_max;	/* max. number of channels */</div><div class='del'>-	hda_nid_t nid;	/* default NID to query rates/formats/bps, or set up */</div><div class='del'>-	u32 rates;	/* supported rates */</div><div class='del'>-	u64 formats;	/* supported formats (SNDRV_PCM_FMTBIT_) */</div><div class='del'>-	unsigned int maxbps;	/* supported max. bit per sample */</div><div class='del'>-	struct hda_pcm_ops ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* PCM types */</div><div class='del'>-enum {</div><div class='del'>-	HDA_PCM_TYPE_AUDIO,</div><div class='del'>-	HDA_PCM_TYPE_SPDIF,</div><div class='del'>-	HDA_PCM_TYPE_HDMI,</div><div class='del'>-	HDA_PCM_TYPE_MODEM,</div><div class='del'>-	HDA_PCM_NTYPES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* for PCM creation */</div><div class='del'>-struct hda_pcm {</div><div class='del'>-	char *name;</div><div class='del'>-	struct hda_pcm_stream stream[2];</div><div class='del'>-	unsigned int pcm_type;	/* HDA_PCM_TYPE_XXX */</div><div class='del'>-	int device;		/* device number to assign */</div><div class='del'>-	struct snd_pcm *pcm;	/* assigned PCM instance */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* codec information */</div><div class='del'>-struct hda_codec {</div><div class='del'>-	struct hda_bus *bus;</div><div class='del'>-	unsigned int addr;	/* codec addr*/</div><div class='del'>-	struct list_head list;	/* list point */</div><div class='del'>-</div><div class='del'>-	hda_nid_t afg;	/* AFG node id */</div><div class='del'>-	hda_nid_t mfg;	/* MFG node id */</div><div class='del'>-</div><div class='del'>-	/* ids */</div><div class='del'>-	u8 afg_function_id;</div><div class='del'>-	u8 mfg_function_id;</div><div class='del'>-	u8 afg_unsol;</div><div class='del'>-	u8 mfg_unsol;</div><div class='del'>-	u32 vendor_id;</div><div class='del'>-	u32 subsystem_id;</div><div class='del'>-	u32 revision_id;</div><div class='del'>-</div><div class='del'>-	/* detected preset */</div><div class='del'>-	const struct hda_codec_preset *preset;</div><div class='del'>-	struct module *owner;</div><div class='del'>-	const char *vendor_name;	/* codec vendor name */</div><div class='del'>-	const char *chip_name;		/* codec chip name */</div><div class='del'>-	const char *modelname;	/* model name for preset */</div><div class='del'>-</div><div class='del'>-	/* set by patch */</div><div class='del'>-	struct hda_codec_ops patch_ops;</div><div class='del'>-</div><div class='del'>-	/* PCM to create, set by patch_ops.build_pcms callback */</div><div class='del'>-	unsigned int num_pcms;</div><div class='del'>-	struct hda_pcm *pcm_info;</div><div class='del'>-</div><div class='del'>-	/* codec specific info */</div><div class='del'>-	void *spec;</div><div class='del'>-</div><div class='del'>-	/* beep device */</div><div class='del'>-	struct hda_beep *beep;</div><div class='del'>-	unsigned int beep_mode;</div><div class='del'>-</div><div class='del'>-	/* widget capabilities cache */</div><div class='del'>-	unsigned int num_nodes;</div><div class='del'>-	hda_nid_t start_nid;</div><div class='del'>-	u32 *wcaps;</div><div class='del'>-</div><div class='del'>-	struct snd_array mixers;	/* list of assigned mixer elements */</div><div class='del'>-	struct snd_array nids;		/* list of mapped mixer elements */</div><div class='del'>-</div><div class='del'>-	struct hda_cache_rec amp_cache;	/* cache for amp access */</div><div class='del'>-	struct hda_cache_rec cmd_cache;	/* cache for other commands */</div><div class='del'>-</div><div class='del'>-	struct mutex spdif_mutex;</div><div class='del'>-	struct mutex control_mutex;</div><div class='del'>-	unsigned int spdif_status;	/* IEC958 status bits */</div><div class='del'>-	unsigned short spdif_ctls;	/* SPDIF control bits */</div><div class='del'>-	unsigned int spdif_in_enable;	/* SPDIF input enable? */</div><div class='del'>-	hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */</div><div class='del'>-	struct snd_array init_pins;	/* initial (BIOS) pin configurations */</div><div class='del'>-	struct snd_array driver_pins;	/* pin configs set by codec parser */</div><div class='del'>-	struct snd_array cvt_setups;	/* audio convert setups */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_HWDEP</div><div class='del'>-	struct snd_hwdep *hwdep;	/* assigned hwdep device */</div><div class='del'>-	struct snd_array init_verbs;	/* additional init verbs */</div><div class='del'>-	struct snd_array hints;		/* additional hints */</div><div class='del'>-	struct snd_array user_pins;	/* default pin configs to override */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* misc flags */</div><div class='del'>-	unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each</div><div class='del'>-					     * status change</div><div class='del'>-					     * (e.g. Realtek codecs)</div><div class='del'>-					     */</div><div class='del'>-	unsigned int pin_amp_workaround:1; /* pin out-amp takes index</div><div class='del'>-					    * (e.g. Conexant codecs)</div><div class='del'>-					    */</div><div class='del'>-	unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */</div><div class='del'>-	unsigned int pins_shutup:1;	/* pins are shut up */</div><div class='del'>-	unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	unsigned int power_on :1;	/* current (global) power-state */</div><div class='del'>-	unsigned int power_transition :1; /* power-state in transition */</div><div class='del'>-	int power_count;	/* current (global) power refcount */</div><div class='del'>-	struct delayed_work power_work; /* delayed task for powerdown */</div><div class='del'>-	unsigned long power_on_acct;</div><div class='del'>-	unsigned long power_off_acct;</div><div class='del'>-	unsigned long power_jiffies;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* codec-specific additional proc output */</div><div class='del'>-	void (*proc_widget_hook)(struct snd_info_buffer *buffer,</div><div class='del'>-				 struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* direction */</div><div class='del'>-enum {</div><div class='del'>-	HDA_INPUT, HDA_OUTPUT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * constructors</div><div class='del'>- */</div><div class='del'>-int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,</div><div class='del'>-		    struct hda_bus **busp);</div><div class='del'>-int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,</div><div class='del'>-		      struct hda_codec **codecp);</div><div class='del'>-int snd_hda_codec_configure(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * low level functions</div><div class='del'>- */</div><div class='del'>-unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				int direct,</div><div class='del'>-				unsigned int verb, unsigned int parm);</div><div class='del'>-int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,</div><div class='del'>-			unsigned int verb, unsigned int parm);</div><div class='del'>-#define snd_hda_param_read(codec, nid, param) \</div><div class='del'>-	snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)</div><div class='del'>-int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			  hda_nid_t *start_id);</div><div class='del'>-int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			    hda_nid_t *conn_list, int max_conns);</div><div class='del'>-</div><div class='del'>-struct hda_verb {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	u32 verb;</div><div class='del'>-	u32 param;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void snd_hda_sequence_write(struct hda_codec *codec,</div><div class='del'>-			    const struct hda_verb *seq);</div><div class='del'>-</div><div class='del'>-/* unsolicited event */</div><div class='del'>-int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex);</div><div class='del'>-</div><div class='del'>-/* cached write */</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			      int direct, unsigned int verb, unsigned int parm);</div><div class='del'>-void snd_hda_sequence_write_cache(struct hda_codec *codec,</div><div class='del'>-				  const struct hda_verb *seq);</div><div class='del'>-int snd_hda_codec_update_cache(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			      int direct, unsigned int verb, unsigned int parm);</div><div class='del'>-void snd_hda_codec_resume_cache(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-#define snd_hda_codec_write_cache	snd_hda_codec_write</div><div class='del'>-#define snd_hda_codec_update_cache	snd_hda_codec_write</div><div class='del'>-#define snd_hda_sequence_write_cache	snd_hda_sequence_write</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* the struct for codec-&gt;pin_configs */</div><div class='del'>-struct hda_pincfg {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	unsigned char ctrl;	/* current pin control value */</div><div class='del'>-	unsigned char pad;	/* reserved */</div><div class='del'>-	unsigned int cfg;	/* default configuration */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-int snd_hda_codec_set_pincfg(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			     unsigned int cfg);</div><div class='del'>-int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,</div><div class='del'>-		       hda_nid_t nid, unsigned int cfg); /* for hwdep */</div><div class='del'>-void snd_hda_shutup_pins(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Mixer</div><div class='del'>- */</div><div class='del'>-int snd_hda_build_controls(struct hda_bus *bus);</div><div class='del'>-int snd_hda_codec_build_controls(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM</div><div class='del'>- */</div><div class='del'>-int snd_hda_build_pcms(struct hda_bus *bus);</div><div class='del'>-int snd_hda_codec_build_pcms(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-int snd_hda_codec_prepare(struct hda_codec *codec,</div><div class='del'>-			  struct hda_pcm_stream *hinfo,</div><div class='del'>-			  unsigned int stream,</div><div class='del'>-			  unsigned int format,</div><div class='del'>-			  struct snd_pcm_substream *substream);</div><div class='del'>-void snd_hda_codec_cleanup(struct hda_codec *codec,</div><div class='del'>-			   struct hda_pcm_stream *hinfo,</div><div class='del'>-			   struct snd_pcm_substream *substream);</div><div class='del'>-</div><div class='del'>-void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				u32 stream_tag,</div><div class='del'>-				int channel_id, int format);</div><div class='del'>-void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				    int do_now);</div><div class='del'>-#define snd_hda_codec_cleanup_stream(codec, nid) \</div><div class='del'>-	__snd_hda_codec_cleanup_stream(codec, nid, 0)</div><div class='del'>-unsigned int snd_hda_calc_stream_format(unsigned int rate,</div><div class='del'>-					unsigned int channels,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					unsigned int maxbps,</div><div class='del'>-					unsigned short spdif_ctls);</div><div class='del'>-int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				unsigned int format);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Misc</div><div class='del'>- */</div><div class='del'>-void snd_hda_get_codec_name(struct hda_codec *codec, char *name, int namelen);</div><div class='del'>-void snd_hda_bus_reboot_notify(struct hda_bus *bus);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * power management</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-int snd_hda_suspend(struct hda_bus *bus);</div><div class='del'>-int snd_hda_resume(struct hda_bus *bus);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static inline</div><div class='del'>-int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;patch_ops.check_power_status)</div><div class='del'>-		return codec-&gt;patch_ops.check_power_status(codec, nid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else	</div><div class='del'>-#define hda_call_check_power_status(codec, nid)		0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * get widget information</div><div class='del'>- */</div><div class='del'>-const char *snd_hda_get_jack_connectivity(u32 cfg);</div><div class='del'>-const char *snd_hda_get_jack_type(u32 cfg);</div><div class='del'>-const char *snd_hda_get_jack_location(u32 cfg);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * power saving</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-void snd_hda_power_up(struct hda_codec *codec);</div><div class='del'>-void snd_hda_power_down(struct hda_codec *codec);</div><div class='del'>-#define snd_hda_codec_needs_resume(codec) codec-&gt;power_count</div><div class='del'>-void snd_hda_update_power_acct(struct hda_codec *codec);</div><div class='del'>-#else</div><div class='del'>-static inline void snd_hda_power_up(struct hda_codec *codec) {}</div><div class='del'>-static inline void snd_hda_power_down(struct hda_codec *codec) {}</div><div class='del'>-#define snd_hda_codec_needs_resume(codec) 1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='del'>-/*</div><div class='del'>- * patch firmware</div><div class='del'>- */</div><div class='del'>-int snd_hda_load_patch(struct hda_bus *bus, const char *patch);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Codec modularization</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Export symbols only for communication with codec drivers;</div><div class='del'>- * When built in kernel, all HD-audio drivers are supposed to be statically</div><div class='del'>- * linked to the kernel.  Thus, the symbols don't have to (or shouldn't) be</div><div class='del'>- * exported unless it's built as a module.</div><div class='del'>- */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-#define EXPORT_SYMBOL_HDA(sym) EXPORT_SYMBOL_GPL(sym)</div><div class='del'>-#else</div><div class='del'>-#define EXPORT_SYMBOL_HDA(sym)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* __SOUND_HDA_CODEC_H */</div><div class='head'>diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c<br/>deleted file mode 100644<br/>index cb0c23a6b473..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_eld.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_eld.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,641 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Generic routines and proc interface for ELD(EDID Like Data) information</div><div class='del'>- *</div><div class='del'>- * Copyright(c) 2008 Intel Corporation.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * 		Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-enum eld_versions {</div><div class='del'>-	ELD_VER_CEA_861D	= 2,</div><div class='del'>-	ELD_VER_PARTIAL		= 31,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum cea_edid_versions {</div><div class='del'>-	CEA_EDID_VER_NONE	= 0,</div><div class='del'>-	CEA_EDID_VER_CEA861	= 1,</div><div class='del'>-	CEA_EDID_VER_CEA861A	= 2,</div><div class='del'>-	CEA_EDID_VER_CEA861BCD	= 3,</div><div class='del'>-	CEA_EDID_VER_RESERVED	= 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *cea_speaker_allocation_names[] = {</div><div class='del'>-	/*  0 */ "FL/FR",</div><div class='del'>-	/*  1 */ "LFE",</div><div class='del'>-	/*  2 */ "FC",</div><div class='del'>-	/*  3 */ "RL/RR",</div><div class='del'>-	/*  4 */ "RC",</div><div class='del'>-	/*  5 */ "FLC/FRC",</div><div class='del'>-	/*  6 */ "RLC/RRC",</div><div class='del'>-	/*  7 */ "FLW/FRW",</div><div class='del'>-	/*  8 */ "FLH/FRH",</div><div class='del'>-	/*  9 */ "TC",</div><div class='del'>-	/* 10 */ "FCH",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *eld_connection_type_names[4] = {</div><div class='del'>-	"HDMI",</div><div class='del'>-	"DisplayPort",</div><div class='del'>-	"2-reserved",</div><div class='del'>-	"3-reserved"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum cea_audio_coding_types {</div><div class='del'>-	AUDIO_CODING_TYPE_REF_STREAM_HEADER	=  0,</div><div class='del'>-	AUDIO_CODING_TYPE_LPCM			=  1,</div><div class='del'>-	AUDIO_CODING_TYPE_AC3			=  2,</div><div class='del'>-	AUDIO_CODING_TYPE_MPEG1			=  3,</div><div class='del'>-	AUDIO_CODING_TYPE_MP3			=  4,</div><div class='del'>-	AUDIO_CODING_TYPE_MPEG2			=  5,</div><div class='del'>-	AUDIO_CODING_TYPE_AACLC			=  6,</div><div class='del'>-	AUDIO_CODING_TYPE_DTS			=  7,</div><div class='del'>-	AUDIO_CODING_TYPE_ATRAC			=  8,</div><div class='del'>-	AUDIO_CODING_TYPE_SACD			=  9,</div><div class='del'>-	AUDIO_CODING_TYPE_EAC3			= 10,</div><div class='del'>-	AUDIO_CODING_TYPE_DTS_HD		= 11,</div><div class='del'>-	AUDIO_CODING_TYPE_MLP			= 12,</div><div class='del'>-	AUDIO_CODING_TYPE_DST			= 13,</div><div class='del'>-	AUDIO_CODING_TYPE_WMAPRO		= 14,</div><div class='del'>-	AUDIO_CODING_TYPE_REF_CXT		= 15,</div><div class='del'>-	/* also include valid xtypes below */</div><div class='del'>-	AUDIO_CODING_TYPE_HE_AAC		= 15,</div><div class='del'>-	AUDIO_CODING_TYPE_HE_AAC2		= 16,</div><div class='del'>-	AUDIO_CODING_TYPE_MPEG_SURROUND		= 17,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum cea_audio_coding_xtypes {</div><div class='del'>-	AUDIO_CODING_XTYPE_HE_REF_CT		= 0,</div><div class='del'>-	AUDIO_CODING_XTYPE_HE_AAC		= 1,</div><div class='del'>-	AUDIO_CODING_XTYPE_HE_AAC2		= 2,</div><div class='del'>-	AUDIO_CODING_XTYPE_MPEG_SURROUND	= 3,</div><div class='del'>-	AUDIO_CODING_XTYPE_FIRST_RESERVED	= 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *cea_audio_coding_type_names[] = {</div><div class='del'>-	/*  0 */ "undefined",</div><div class='del'>-	/*  1 */ "LPCM",</div><div class='del'>-	/*  2 */ "AC-3",</div><div class='del'>-	/*  3 */ "MPEG1",</div><div class='del'>-	/*  4 */ "MP3",</div><div class='del'>-	/*  5 */ "MPEG2",</div><div class='del'>-	/*  6 */ "AAC-LC",</div><div class='del'>-	/*  7 */ "DTS",</div><div class='del'>-	/*  8 */ "ATRAC",</div><div class='del'>-	/*  9 */ "DSD (One Bit Audio)",</div><div class='del'>-	/* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)",</div><div class='del'>-	/* 11 */ "DTS-HD",</div><div class='del'>-	/* 12 */ "MLP (Dolby TrueHD)",</div><div class='del'>-	/* 13 */ "DST",</div><div class='del'>-	/* 14 */ "WMAPro",</div><div class='del'>-	/* 15 */ "HE-AAC",</div><div class='del'>-	/* 16 */ "HE-AACv2",</div><div class='del'>-	/* 17 */ "MPEG Surround",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The following two lists are shared between</div><div class='del'>- * 	- HDMI audio InfoFrame (source to sink)</div><div class='del'>- * 	- CEA E-EDID Extension (sink to source)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SS1:SS0 index =&gt; sample size</div><div class='del'>- */</div><div class='del'>-static int cea_sample_sizes[4] = {</div><div class='del'>-	0,	 		/* 0: Refer to Stream Header */</div><div class='del'>-	AC_SUPPCM_BITS_16,	/* 1: 16 bits */</div><div class='del'>-	AC_SUPPCM_BITS_20,	/* 2: 20 bits */</div><div class='del'>-	AC_SUPPCM_BITS_24,	/* 3: 24 bits */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SF2:SF1:SF0 index =&gt; sampling frequency</div><div class='del'>- */</div><div class='del'>-static int cea_sampling_frequencies[8] = {</div><div class='del'>-	0,			/* 0: Refer to Stream Header */</div><div class='del'>-	SNDRV_PCM_RATE_32000,	/* 1:  32000Hz */</div><div class='del'>-	SNDRV_PCM_RATE_44100,	/* 2:  44100Hz */</div><div class='del'>-	SNDRV_PCM_RATE_48000,	/* 3:  48000Hz */</div><div class='del'>-	SNDRV_PCM_RATE_88200,	/* 4:  88200Hz */</div><div class='del'>-	SNDRV_PCM_RATE_96000,	/* 5:  96000Hz */</div><div class='del'>-	SNDRV_PCM_RATE_176400,	/* 6: 176400Hz */</div><div class='del'>-	SNDRV_PCM_RATE_192000,	/* 7: 192000Hz */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char hdmi_get_eld_byte(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-					int byte_index)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					AC_VERB_GET_HDMI_ELDD, byte_index);</div><div class='del'>-</div><div class='del'>-#ifdef BE_PARANOID</div><div class='del'>-	printk(KERN_INFO "HDMI: ELD data byte %d: 0x%x\n", byte_index, val);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if ((val &amp; AC_ELDD_ELD_VALID) == 0) {</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: invalid ELD data byte %d\n",</div><div class='del'>-								byte_index);</div><div class='del'>-		val = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return val &amp; AC_ELDD_ELD_DATA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define GRAB_BITS(buf, byte, lowbit, bits) 		\</div><div class='del'>-({							\</div><div class='del'>-	BUILD_BUG_ON(lowbit &gt; 7);			\</div><div class='del'>-	BUILD_BUG_ON(bits &gt; 8);				\</div><div class='del'>-	BUILD_BUG_ON(bits &lt;= 0);			\</div><div class='del'>-							\</div><div class='del'>-	(buf[byte] &gt;&gt; (lowbit)) &amp; ((1 &lt;&lt; (bits)) - 1);	\</div><div class='del'>-})</div><div class='del'>-</div><div class='del'>-static void hdmi_update_short_audio_desc(struct cea_sad *a,</div><div class='del'>-					 const unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	val = GRAB_BITS(buf, 1, 0, 7);</div><div class='del'>-	a-&gt;rates = 0;</div><div class='del'>-	for (i = 0; i &lt; 7; i++)</div><div class='del'>-		if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-			a-&gt;rates |= cea_sampling_frequencies[i + 1];</div><div class='del'>-</div><div class='del'>-	a-&gt;channels = GRAB_BITS(buf, 0, 0, 3);</div><div class='del'>-	a-&gt;channels++;</div><div class='del'>-</div><div class='del'>-	a-&gt;format = GRAB_BITS(buf, 0, 3, 4);</div><div class='del'>-	switch (a-&gt;format) {</div><div class='del'>-	case AUDIO_CODING_TYPE_REF_STREAM_HEADER:</div><div class='del'>-		snd_printd(KERN_INFO</div><div class='del'>-				"HDMI: audio coding type 0 not expected\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_LPCM:</div><div class='del'>-		val = GRAB_BITS(buf, 2, 0, 3);</div><div class='del'>-		a-&gt;sample_bits = 0;</div><div class='del'>-		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			if (val &amp; (1 &lt;&lt; i))</div><div class='del'>-				a-&gt;sample_bits |= cea_sample_sizes[i + 1];</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_AC3:</div><div class='del'>-	case AUDIO_CODING_TYPE_MPEG1:</div><div class='del'>-	case AUDIO_CODING_TYPE_MP3:</div><div class='del'>-	case AUDIO_CODING_TYPE_MPEG2:</div><div class='del'>-	case AUDIO_CODING_TYPE_AACLC:</div><div class='del'>-	case AUDIO_CODING_TYPE_DTS:</div><div class='del'>-	case AUDIO_CODING_TYPE_ATRAC:</div><div class='del'>-		a-&gt;max_bitrate = GRAB_BITS(buf, 2, 0, 8);</div><div class='del'>-		a-&gt;max_bitrate *= 8000;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_SACD:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_EAC3:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_DTS_HD:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_MLP:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_DST:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_WMAPRO:</div><div class='del'>-		a-&gt;profile = GRAB_BITS(buf, 2, 0, 3);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AUDIO_CODING_TYPE_REF_CXT:</div><div class='del'>-		a-&gt;format = GRAB_BITS(buf, 2, 3, 5);</div><div class='del'>-		if (a-&gt;format == AUDIO_CODING_XTYPE_HE_REF_CT ||</div><div class='del'>-		    a-&gt;format &gt;= AUDIO_CODING_XTYPE_FIRST_RESERVED) {</div><div class='del'>-			snd_printd(KERN_INFO</div><div class='del'>-				"HDMI: audio coding xtype %d not expected\n",</div><div class='del'>-				a-&gt;format);</div><div class='del'>-			a-&gt;format = 0;</div><div class='del'>-		} else</div><div class='del'>-			a-&gt;format += AUDIO_CODING_TYPE_HE_AAC -</div><div class='del'>-				     AUDIO_CODING_XTYPE_HE_AAC;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Be careful, ELD buf could be totally rubbish!</div><div class='del'>- */</div><div class='del'>-static int hdmi_update_eld(struct hdmi_eld *e,</div><div class='del'>-			   const unsigned char *buf, int size)</div><div class='del'>-{</div><div class='del'>-	int mnl;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	e-&gt;eld_ver = GRAB_BITS(buf, 0, 3, 5);</div><div class='del'>-	if (e-&gt;eld_ver != ELD_VER_CEA_861D &amp;&amp;</div><div class='del'>-	    e-&gt;eld_ver != ELD_VER_PARTIAL) {</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: Unknown ELD version %d\n",</div><div class='del'>-								e-&gt;eld_ver);</div><div class='del'>-		goto out_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e-&gt;eld_size = size;</div><div class='del'>-	e-&gt;baseline_len = GRAB_BITS(buf, 2, 0, 8);</div><div class='del'>-	mnl		= GRAB_BITS(buf, 4, 0, 5);</div><div class='del'>-	e-&gt;cea_edid_ver	= GRAB_BITS(buf, 4, 5, 3);</div><div class='del'>-</div><div class='del'>-	e-&gt;support_hdcp	= GRAB_BITS(buf, 5, 0, 1);</div><div class='del'>-	e-&gt;support_ai	= GRAB_BITS(buf, 5, 1, 1);</div><div class='del'>-	e-&gt;conn_type	= GRAB_BITS(buf, 5, 2, 2);</div><div class='del'>-	e-&gt;sad_count	= GRAB_BITS(buf, 5, 4, 4);</div><div class='del'>-</div><div class='del'>-	e-&gt;aud_synch_delay = GRAB_BITS(buf, 6, 0, 8) * 2;</div><div class='del'>-	e-&gt;spk_alloc	= GRAB_BITS(buf, 7, 0, 7);</div><div class='del'>-</div><div class='del'>-	e-&gt;port_id	  = get_unaligned_le64(buf + 8);</div><div class='del'>-</div><div class='del'>-	/* not specified, but the spec's tendency is little endian */</div><div class='del'>-	e-&gt;manufacture_id = get_unaligned_le16(buf + 16);</div><div class='del'>-	e-&gt;product_id	  = get_unaligned_le16(buf + 18);</div><div class='del'>-</div><div class='del'>-	if (mnl &gt; ELD_MAX_MNL) {</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: MNL is reserved value %d\n", mnl);</div><div class='del'>-		goto out_fail;</div><div class='del'>-	} else if (ELD_FIXED_BYTES + mnl &gt; size) {</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);</div><div class='del'>-		goto out_fail;</div><div class='del'>-	} else</div><div class='del'>-		strlcpy(e-&gt;monitor_name, buf + ELD_FIXED_BYTES, mnl);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; e-&gt;sad_count; i++) {</div><div class='del'>-		if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) &gt; size) {</div><div class='del'>-			snd_printd(KERN_INFO "HDMI: out of range SAD %d\n", i);</div><div class='del'>-			goto out_fail;</div><div class='del'>-		}</div><div class='del'>-		hdmi_update_short_audio_desc(e-&gt;sad + i,</div><div class='del'>-					buf + ELD_FIXED_BYTES + mnl + 3 * i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_fail:</div><div class='del'>-	e-&gt;eld_ver = 0;</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hdmi_eld_valid(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int eldv;</div><div class='del'>-	int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_pin_sense(codec, nid);</div><div class='del'>-	eldv    = (present &amp; AC_PINSENSE_ELDV);</div><div class='del'>-	present = (present &amp; AC_PINSENSE_PRESENCE);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-	printk(KERN_INFO "HDMI: sink_present = %d, eld_valid = %d\n",</div><div class='del'>-			!!present, !!eldv);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return eldv &amp;&amp; present;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,</div><div class='del'>-						 AC_DIPSIZE_ELD_BUF);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int snd_hdmi_get_eld(struct hdmi_eld *eld,</div><div class='del'>-		     struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int ret;</div><div class='del'>-	int size;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-</div><div class='del'>-	if (!hdmi_eld_valid(codec, nid))</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	size = snd_hdmi_get_eld_size(codec, nid);</div><div class='del'>-	if (size == 0) {</div><div class='del'>-		/* wfg: workaround for ASUS P5E-VM HDMI board */</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: ELD buf size is 0, force 128\n");</div><div class='del'>-		size = 128;</div><div class='del'>-	}</div><div class='del'>-	if (size &lt; ELD_FIXED_BYTES || size &gt; PAGE_SIZE) {</div><div class='del'>-		snd_printd(KERN_INFO "HDMI: invalid ELD buf size %d\n", size);</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf = kmalloc(size, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		buf[i] = hdmi_get_eld_byte(codec, nid, i);</div><div class='del'>-</div><div class='del'>-	ret = hdmi_update_eld(eld, buf, size);</div><div class='del'>-</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_show_short_audio_desc(struct cea_sad *a)</div><div class='del'>-{</div><div class='del'>-	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];</div><div class='del'>-	char buf2[8 + SND_PRINT_BITS_ADVISED_BUFSIZE] = ", bits =";</div><div class='del'>-</div><div class='del'>-	if (!a-&gt;format)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	snd_print_pcm_rates(a-&gt;rates, buf, sizeof(buf));</div><div class='del'>-</div><div class='del'>-	if (a-&gt;format == AUDIO_CODING_TYPE_LPCM)</div><div class='del'>-		snd_print_pcm_bits(a-&gt;sample_bits, buf2 + 8, sizeof(buf2 - 8));</div><div class='del'>-	else if (a-&gt;max_bitrate)</div><div class='del'>-		snprintf(buf2, sizeof(buf2),</div><div class='del'>-				", max bitrate = %d", a-&gt;max_bitrate);</div><div class='del'>-	else</div><div class='del'>-		buf2[0] = '\0';</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "HDMI: supports coding type %s:"</div><div class='del'>-			" channels = %d, rates =%s%s\n",</div><div class='del'>-			cea_audio_coding_type_names[a-&gt;format],</div><div class='del'>-			a-&gt;channels,</div><div class='del'>-			buf,</div><div class='del'>-			buf2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	for (i = 0, j = 0; i &lt; ARRAY_SIZE(cea_speaker_allocation_names); i++) {</div><div class='del'>-		if (spk_alloc &amp; (1 &lt;&lt; i))</div><div class='del'>-			j += snprintf(buf + j, buflen - j,  " %s",</div><div class='del'>-					cea_speaker_allocation_names[i]);</div><div class='del'>-	}</div><div class='del'>-	buf[j] = '\0';	/* necessary when j == 0 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_hdmi_show_eld(struct hdmi_eld *e)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "HDMI: detected monitor %s at connection type %s\n",</div><div class='del'>-			e-&gt;monitor_name,</div><div class='del'>-			eld_connection_type_names[e-&gt;conn_type]);</div><div class='del'>-</div><div class='del'>-	if (e-&gt;spk_alloc) {</div><div class='del'>-		char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='del'>-		snd_print_channel_allocation(e-&gt;spk_alloc, buf, sizeof(buf));</div><div class='del'>-		printk(KERN_INFO "HDMI: available speakers:%s\n", buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; e-&gt;sad_count; i++)</div><div class='del'>-		hdmi_show_short_audio_desc(e-&gt;sad + i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-</div><div class='del'>-static void hdmi_print_sad_info(int i, struct cea_sad *a,</div><div class='del'>-				struct snd_info_buffer *buffer)</div><div class='del'>-{</div><div class='del'>-	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];</div><div class='del'>-</div><div class='del'>-	snd_iprintf(buffer, "sad%d_coding_type\t[0x%x] %s\n",</div><div class='del'>-			i, a-&gt;format, cea_audio_coding_type_names[a-&gt;format]);</div><div class='del'>-	snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a-&gt;channels);</div><div class='del'>-</div><div class='del'>-	snd_print_pcm_rates(a-&gt;rates, buf, sizeof(buf));</div><div class='del'>-	snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a-&gt;rates, buf);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;format == AUDIO_CODING_TYPE_LPCM) {</div><div class='del'>-		snd_print_pcm_bits(a-&gt;sample_bits, buf, sizeof(buf));</div><div class='del'>-		snd_iprintf(buffer, "sad%d_bits\t\t[0x%x]%s\n",</div><div class='del'>-							i, a-&gt;sample_bits, buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;max_bitrate)</div><div class='del'>-		snd_iprintf(buffer, "sad%d_max_bitrate\t%d\n",</div><div class='del'>-							i, a-&gt;max_bitrate);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;profile)</div><div class='del'>-		snd_iprintf(buffer, "sad%d_profile\t\t%d\n", i, a-&gt;profile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_print_eld_info(struct snd_info_entry *entry,</div><div class='del'>-				struct snd_info_buffer *buffer)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_eld *e = entry-&gt;private_data;</div><div class='del'>-	char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='del'>-	int i;</div><div class='del'>-	static char *eld_versoin_names[32] = {</div><div class='del'>-		"reserved",</div><div class='del'>-		"reserved",</div><div class='del'>-		"CEA-861D or below",</div><div class='del'>-		[3 ... 30] = "reserved",</div><div class='del'>-		[31] = "partial"</div><div class='del'>-	};</div><div class='del'>-	static char *cea_edid_version_names[8] = {</div><div class='del'>-		"no CEA EDID Timing Extension block present",</div><div class='del'>-		"CEA-861",</div><div class='del'>-		"CEA-861-A",</div><div class='del'>-		"CEA-861-B, C or D",</div><div class='del'>-		[4 ... 7] = "reserved"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	snd_iprintf(buffer, "monitor_present\t\t%d\n", e-&gt;monitor_present);</div><div class='del'>-	snd_iprintf(buffer, "eld_valid\t\t%d\n", e-&gt;eld_valid);</div><div class='del'>-	snd_iprintf(buffer, "monitor_name\t\t%s\n", e-&gt;monitor_name);</div><div class='del'>-	snd_iprintf(buffer, "connection_type\t\t%s\n",</div><div class='del'>-				eld_connection_type_names[e-&gt;conn_type]);</div><div class='del'>-	snd_iprintf(buffer, "eld_version\t\t[0x%x] %s\n", e-&gt;eld_ver,</div><div class='del'>-					eld_versoin_names[e-&gt;eld_ver]);</div><div class='del'>-	snd_iprintf(buffer, "edid_version\t\t[0x%x] %s\n", e-&gt;cea_edid_ver,</div><div class='del'>-				cea_edid_version_names[e-&gt;cea_edid_ver]);</div><div class='del'>-	snd_iprintf(buffer, "manufacture_id\t\t0x%x\n", e-&gt;manufacture_id);</div><div class='del'>-	snd_iprintf(buffer, "product_id\t\t0x%x\n", e-&gt;product_id);</div><div class='del'>-	snd_iprintf(buffer, "port_id\t\t\t0x%llx\n", (long long)e-&gt;port_id);</div><div class='del'>-	snd_iprintf(buffer, "support_hdcp\t\t%d\n", e-&gt;support_hdcp);</div><div class='del'>-	snd_iprintf(buffer, "support_ai\t\t%d\n", e-&gt;support_ai);</div><div class='del'>-	snd_iprintf(buffer, "audio_sync_delay\t%d\n", e-&gt;aud_synch_delay);</div><div class='del'>-</div><div class='del'>-	snd_print_channel_allocation(e-&gt;spk_alloc, buf, sizeof(buf));</div><div class='del'>-	snd_iprintf(buffer, "speakers\t\t[0x%x]%s\n", e-&gt;spk_alloc, buf);</div><div class='del'>-</div><div class='del'>-	snd_iprintf(buffer, "sad_count\t\t%d\n", e-&gt;sad_count);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; e-&gt;sad_count; i++)</div><div class='del'>-		hdmi_print_sad_info(i, e-&gt;sad + i, buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_write_eld_info(struct snd_info_entry *entry,</div><div class='del'>-				struct snd_info_buffer *buffer)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_eld *e = entry-&gt;private_data;</div><div class='del'>-	char line[64];</div><div class='del'>-	char name[64];</div><div class='del'>-	char *sname;</div><div class='del'>-	long long val;</div><div class='del'>-	unsigned int n;</div><div class='del'>-</div><div class='del'>-	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='del'>-		if (sscanf(line, "%s %llx", name, &amp;val) != 2)</div><div class='del'>-			continue;</div><div class='del'>-		/*</div><div class='del'>-		 * We don't allow modification to these fields:</div><div class='del'>-		 * 	monitor_name manufacture_id product_id</div><div class='del'>-		 * 	eld_version edid_version</div><div class='del'>-		 */</div><div class='del'>-		if (!strcmp(name, "monitor_present"))</div><div class='del'>-			e-&gt;monitor_present = val;</div><div class='del'>-		else if (!strcmp(name, "eld_valid"))</div><div class='del'>-			e-&gt;eld_valid = val;</div><div class='del'>-		else if (!strcmp(name, "connection_type"))</div><div class='del'>-			e-&gt;conn_type = val;</div><div class='del'>-		else if (!strcmp(name, "port_id"))</div><div class='del'>-			e-&gt;port_id = val;</div><div class='del'>-		else if (!strcmp(name, "support_hdcp"))</div><div class='del'>-			e-&gt;support_hdcp = val;</div><div class='del'>-		else if (!strcmp(name, "support_ai"))</div><div class='del'>-			e-&gt;support_ai = val;</div><div class='del'>-		else if (!strcmp(name, "audio_sync_delay"))</div><div class='del'>-			e-&gt;aud_synch_delay = val;</div><div class='del'>-		else if (!strcmp(name, "speakers"))</div><div class='del'>-			e-&gt;spk_alloc = val;</div><div class='del'>-		else if (!strcmp(name, "sad_count"))</div><div class='del'>-			e-&gt;sad_count = val;</div><div class='del'>-		else if (!strncmp(name, "sad", 3)) {</div><div class='del'>-			sname = name + 4;</div><div class='del'>-			n = name[3] - '0';</div><div class='del'>-			if (name[4] &gt;= '0' &amp;&amp; name[4] &lt;= '9') {</div><div class='del'>-				sname++;</div><div class='del'>-				n = 10 * n + name[4] - '0';</div><div class='del'>-			}</div><div class='del'>-			if (n &gt;= ELD_MAX_SAD)</div><div class='del'>-				continue;</div><div class='del'>-			if (!strcmp(sname, "_coding_type"))</div><div class='del'>-				e-&gt;sad[n].format = val;</div><div class='del'>-			else if (!strcmp(sname, "_channels"))</div><div class='del'>-				e-&gt;sad[n].channels = val;</div><div class='del'>-			else if (!strcmp(sname, "_rates"))</div><div class='del'>-				e-&gt;sad[n].rates = val;</div><div class='del'>-			else if (!strcmp(sname, "_bits"))</div><div class='del'>-				e-&gt;sad[n].sample_bits = val;</div><div class='del'>-			else if (!strcmp(sname, "_max_bitrate"))</div><div class='del'>-				e-&gt;sad[n].max_bitrate = val;</div><div class='del'>-			else if (!strcmp(sname, "_profile"))</div><div class='del'>-				e-&gt;sad[n].profile = val;</div><div class='del'>-			if (n &gt;= e-&gt;sad_count)</div><div class='del'>-				e-&gt;sad_count = n + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,</div><div class='del'>-			 int index)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "eld#%d.%d", codec-&gt;addr, index);</div><div class='del'>-	err = snd_card_proc_new(codec-&gt;bus-&gt;card, name, &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	snd_info_set_text_ops(entry, eld, hdmi_print_eld_info);</div><div class='del'>-	entry-&gt;c.text.write = hdmi_write_eld_info;</div><div class='del'>-	entry-&gt;mode |= S_IWUSR;</div><div class='del'>-	eld-&gt;proc_entry = entry;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)</div><div class='del'>-{</div><div class='del'>-	if (!codec-&gt;bus-&gt;shutdown &amp;&amp; eld-&gt;proc_entry) {</div><div class='del'>-		snd_device_free(codec-&gt;bus-&gt;card, eld-&gt;proc_entry);</div><div class='del'>-		eld-&gt;proc_entry = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-/* update PCM info based on ELD */</div><div class='del'>-void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,</div><div class='del'>-			      struct hda_pcm_stream *codec_pars)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	pcm-&gt;rates = 0;</div><div class='del'>-	pcm-&gt;formats = 0;</div><div class='del'>-	pcm-&gt;maxbps = 0;</div><div class='del'>-	pcm-&gt;channels_min = -1;</div><div class='del'>-	pcm-&gt;channels_max = 0;</div><div class='del'>-	for (i = 0; i &lt; eld-&gt;sad_count; i++) {</div><div class='del'>-		struct cea_sad *a = &amp;eld-&gt;sad[i];</div><div class='del'>-		pcm-&gt;rates |= a-&gt;rates;</div><div class='del'>-		if (a-&gt;channels &lt; pcm-&gt;channels_min)</div><div class='del'>-			pcm-&gt;channels_min = a-&gt;channels;</div><div class='del'>-		if (a-&gt;channels &gt; pcm-&gt;channels_max)</div><div class='del'>-			pcm-&gt;channels_max = a-&gt;channels;</div><div class='del'>-		if (a-&gt;format == AUDIO_CODING_TYPE_LPCM) {</div><div class='del'>-			if (a-&gt;sample_bits &amp; AC_SUPPCM_BITS_16) {</div><div class='del'>-				pcm-&gt;formats |= SNDRV_PCM_FMTBIT_S16_LE;</div><div class='del'>-				if (pcm-&gt;maxbps &lt; 16)</div><div class='del'>-					pcm-&gt;maxbps = 16;</div><div class='del'>-			}</div><div class='del'>-			if (a-&gt;sample_bits &amp; AC_SUPPCM_BITS_20) {</div><div class='del'>-				pcm-&gt;formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='del'>-				if (pcm-&gt;maxbps &lt; 20)</div><div class='del'>-					pcm-&gt;maxbps = 20;</div><div class='del'>-			}</div><div class='del'>-			if (a-&gt;sample_bits &amp; AC_SUPPCM_BITS_24) {</div><div class='del'>-				pcm-&gt;formats |= SNDRV_PCM_FMTBIT_S32_LE;</div><div class='del'>-				if (pcm-&gt;maxbps &lt; 24)</div><div class='del'>-					pcm-&gt;maxbps = 24;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!codec_pars)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* restrict the parameters by the values the codec provides */</div><div class='del'>-	pcm-&gt;rates &amp;= codec_pars-&gt;rates;</div><div class='del'>-	pcm-&gt;formats &amp;= codec_pars-&gt;formats;</div><div class='del'>-	pcm-&gt;channels_min = max(pcm-&gt;channels_min, codec_pars-&gt;channels_min);</div><div class='del'>-	pcm-&gt;channels_max = min(pcm-&gt;channels_max, codec_pars-&gt;channels_max);</div><div class='del'>-	pcm-&gt;maxbps = min(pcm-&gt;maxbps, codec_pars-&gt;maxbps);</div><div class='del'>-}</div><div class='head'>diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c<br/>deleted file mode 100644<br/>index fb0582f8d725..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_generic.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_generic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1083 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * Generic widget tree parser</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-/* widget node for parsing */</div><div class='del'>-struct hda_gnode {</div><div class='del'>-	hda_nid_t nid;		/* NID of this widget */</div><div class='del'>-	unsigned short nconns;	/* number of input connections */</div><div class='del'>-	hda_nid_t *conn_list;</div><div class='del'>-	hda_nid_t slist[2];	/* temporay list */</div><div class='del'>-	unsigned int wid_caps;	/* widget capabilities */</div><div class='del'>-	unsigned char type;	/* widget type */</div><div class='del'>-	unsigned char pin_ctl;	/* pin controls */</div><div class='del'>-	unsigned char checked;	/* the flag indicates that the node is already parsed */</div><div class='del'>-	unsigned int pin_caps;	/* pin widget capabilities */</div><div class='del'>-	unsigned int def_cfg;	/* default configuration */</div><div class='del'>-	unsigned int amp_out_caps;	/* AMP out capabilities */</div><div class='del'>-	unsigned int amp_in_caps;	/* AMP in capabilities */</div><div class='del'>-	struct list_head list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* patch-specific record */</div><div class='del'>-</div><div class='del'>-#define MAX_PCM_VOLS	2</div><div class='del'>-struct pcm_vol {</div><div class='del'>-	struct hda_gnode *node;	/* Node for PCM volume */</div><div class='del'>-	unsigned int index;	/* connection of PCM volume */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hda_gspec {</div><div class='del'>-	struct hda_gnode *dac_node[2];	/* DAC node */</div><div class='del'>-	struct hda_gnode *out_pin_node[2];	/* Output pin (Line-Out) node */</div><div class='del'>-	struct pcm_vol pcm_vol[MAX_PCM_VOLS];	/* PCM volumes */</div><div class='del'>-	unsigned int pcm_vol_nodes;	/* number of PCM volumes */</div><div class='del'>-</div><div class='del'>-	struct hda_gnode *adc_node;	/* ADC node */</div><div class='del'>-	struct hda_gnode *cap_vol_node;	/* Node for capture volume */</div><div class='del'>-	unsigned int cur_cap_src;	/* current capture source */</div><div class='del'>-	struct hda_input_mux input_mux;</div><div class='del'>-</div><div class='del'>-	unsigned int def_amp_in_caps;</div><div class='del'>-	unsigned int def_amp_out_caps;</div><div class='del'>-</div><div class='del'>-	struct hda_pcm pcm_rec;		/* PCM information */</div><div class='del'>-</div><div class='del'>-	struct list_head nid_list;	/* list of widgets */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define MAX_LOOPBACK_AMPS	7</div><div class='del'>-	struct hda_loopback_check loopback;</div><div class='del'>-	int num_loopbacks;</div><div class='del'>-	struct hda_amp_list loopback_list[MAX_LOOPBACK_AMPS + 1];</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * retrieve the default device type from the default config value</div><div class='del'>- */</div><div class='del'>-#define defcfg_type(node) (((node)-&gt;def_cfg &amp; AC_DEFCFG_DEVICE) &gt;&gt; \</div><div class='del'>-			   AC_DEFCFG_DEVICE_SHIFT)</div><div class='del'>-#define defcfg_location(node) (((node)-&gt;def_cfg &amp; AC_DEFCFG_LOCATION) &gt;&gt; \</div><div class='del'>-			       AC_DEFCFG_LOCATION_SHIFT)</div><div class='del'>-#define defcfg_port_conn(node) (((node)-&gt;def_cfg &amp; AC_DEFCFG_PORT_CONN) &gt;&gt; \</div><div class='del'>-				AC_DEFCFG_PORT_CONN_SHIFT)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * destructor</div><div class='del'>- */</div><div class='del'>-static void snd_hda_generic_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *node, *n;</div><div class='del'>-</div><div class='del'>-	if (! spec)</div><div class='del'>-		return;</div><div class='del'>-	/* free all widgets */</div><div class='del'>-	list_for_each_entry_safe(node, n, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		if (node-&gt;conn_list != node-&gt;slist)</div><div class='del'>-			kfree(node-&gt;conn_list);</div><div class='del'>-		kfree(node);</div><div class='del'>-	}</div><div class='del'>-	kfree(spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * add a new widget node and read its attributes</div><div class='del'>- */</div><div class='del'>-static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-	int nconns;</div><div class='del'>-	hda_nid_t conn_list[HDA_MAX_CONNECTIONS];</div><div class='del'>-</div><div class='del'>-	node = kzalloc(sizeof(*node), GFP_KERNEL);</div><div class='del'>-	if (node == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	node-&gt;nid = nid;</div><div class='del'>-	node-&gt;wid_caps = get_wcaps(codec, nid);</div><div class='del'>-	node-&gt;type = get_wcaps_type(node-&gt;wid_caps);</div><div class='del'>-	if (node-&gt;wid_caps &amp; AC_WCAP_CONN_LIST) {</div><div class='del'>-		nconns = snd_hda_get_connections(codec, nid, conn_list,</div><div class='del'>-						 HDA_MAX_CONNECTIONS);</div><div class='del'>-		if (nconns &lt; 0) {</div><div class='del'>-			kfree(node);</div><div class='del'>-			return nconns;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		nconns = 0;</div><div class='del'>-	}</div><div class='del'>-	if (nconns &lt;= ARRAY_SIZE(node-&gt;slist))</div><div class='del'>-		node-&gt;conn_list = node-&gt;slist;</div><div class='del'>-	else {</div><div class='del'>-		node-&gt;conn_list = kmalloc(sizeof(hda_nid_t) * nconns,</div><div class='del'>-					  GFP_KERNEL);</div><div class='del'>-		if (! node-&gt;conn_list) {</div><div class='del'>-			snd_printk(KERN_ERR "hda-generic: cannot malloc\n");</div><div class='del'>-			kfree(node);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	memcpy(node-&gt;conn_list, conn_list, nconns * sizeof(hda_nid_t));</div><div class='del'>-	node-&gt;nconns = nconns;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;type == AC_WID_PIN) {</div><div class='del'>-		node-&gt;pin_caps = snd_hda_query_pin_caps(codec, node-&gt;nid);</div><div class='del'>-		node-&gt;pin_ctl = snd_hda_codec_read(codec, node-&gt;nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		node-&gt;def_cfg = snd_hda_codec_get_pincfg(codec, node-&gt;nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (node-&gt;wid_caps &amp; AC_WCAP_OUT_AMP) {</div><div class='del'>-		if (node-&gt;wid_caps &amp; AC_WCAP_AMP_OVRD)</div><div class='del'>-			node-&gt;amp_out_caps = snd_hda_param_read(codec, node-&gt;nid, AC_PAR_AMP_OUT_CAP);</div><div class='del'>-		if (! node-&gt;amp_out_caps)</div><div class='del'>-			node-&gt;amp_out_caps = spec-&gt;def_amp_out_caps;</div><div class='del'>-	}</div><div class='del'>-	if (node-&gt;wid_caps &amp; AC_WCAP_IN_AMP) {</div><div class='del'>-		if (node-&gt;wid_caps &amp; AC_WCAP_AMP_OVRD)</div><div class='del'>-			node-&gt;amp_in_caps = snd_hda_param_read(codec, node-&gt;nid, AC_PAR_AMP_IN_CAP);</div><div class='del'>-		if (! node-&gt;amp_in_caps)</div><div class='del'>-			node-&gt;amp_in_caps = spec-&gt;def_amp_in_caps;</div><div class='del'>-	}</div><div class='del'>-	list_add_tail(&amp;node-&gt;list, &amp;spec-&gt;nid_list);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * build the AFG subtree</div><div class='del'>- */</div><div class='del'>-static int build_afg_tree(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	int i, nodes, err;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!spec))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spec-&gt;def_amp_out_caps = snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_AMP_OUT_CAP);</div><div class='del'>-	spec-&gt;def_amp_in_caps = snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_AMP_IN_CAP);</div><div class='del'>-</div><div class='del'>-	nodes = snd_hda_get_sub_nodes(codec, codec-&gt;afg, &amp;nid);</div><div class='del'>-	if (! nid || nodes &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "Invalid AFG subtree\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* parse all nodes belonging to the AFG */</div><div class='del'>-	for (i = 0; i &lt; nodes; i++, nid++) {</div><div class='del'>-		if ((err = add_new_node(codec, spec, nid)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * look for the node record for the given NID</div><div class='del'>- */</div><div class='del'>-/* FIXME: should avoid the braindead linear search */</div><div class='del'>-static struct hda_gnode *hda_get_node(struct hda_gspec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(node, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		if (node-&gt;nid == nid)</div><div class='del'>-			return node;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unmute (and set max vol) the output amplifier</div><div class='del'>- */</div><div class='del'>-static int unmute_output(struct hda_codec *codec, struct hda_gnode *node)</div><div class='del'>-{</div><div class='del'>-	unsigned int val, ofs;</div><div class='del'>-	snd_printdd("UNMUTE OUT: NID=0x%x\n", node-&gt;nid);</div><div class='del'>-	val = (node-&gt;amp_out_caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	ofs = (node-&gt;amp_out_caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT;</div><div class='del'>-	if (val &gt;= ofs)</div><div class='del'>-		val -= ofs;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, node-&gt;nid, HDA_OUTPUT, 0, 0xff, val);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * unmute (and set max vol) the input amplifier</div><div class='del'>- */</div><div class='del'>-static int unmute_input(struct hda_codec *codec, struct hda_gnode *node, unsigned int index)</div><div class='del'>-{</div><div class='del'>-	unsigned int val, ofs;</div><div class='del'>-	snd_printdd("UNMUTE IN: NID=0x%x IDX=0x%x\n", node-&gt;nid, index);</div><div class='del'>-	val = (node-&gt;amp_in_caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	ofs = (node-&gt;amp_in_caps &amp; AC_AMPCAP_OFFSET) &gt;&gt; AC_AMPCAP_OFFSET_SHIFT;</div><div class='del'>-	if (val &gt;= ofs)</div><div class='del'>-		val -= ofs;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, node-&gt;nid, HDA_INPUT, index, 0xff, val);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * select the input connection of the given node.</div><div class='del'>- */</div><div class='del'>-static int select_input_connection(struct hda_codec *codec, struct hda_gnode *node,</div><div class='del'>-				   unsigned int index)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("CONNECT: NID=0x%x IDX=0x%x\n", node-&gt;nid, index);</div><div class='del'>-	return snd_hda_codec_write_cache(codec, node-&gt;nid, 0,</div><div class='del'>-					 AC_VERB_SET_CONNECT_SEL, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * clear checked flag of each node in the node list</div><div class='del'>- */</div><div class='del'>-static void clear_check_flags(struct hda_gspec *spec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(node, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		node-&gt;checked = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse the output path recursively until reach to an audio output widget</div><div class='del'>- *</div><div class='del'>- * returns 0 if not found, 1 if found, or a negative error code.</div><div class='del'>- */</div><div class='del'>-static int parse_output_path(struct hda_codec *codec, struct hda_gspec *spec,</div><div class='del'>-			     struct hda_gnode *node, int dac_idx)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-	struct hda_gnode *child;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;checked)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	node-&gt;checked = 1;</div><div class='del'>-	if (node-&gt;type == AC_WID_AUD_OUT) {</div><div class='del'>-		if (node-&gt;wid_caps &amp; AC_WCAP_DIGITAL) {</div><div class='del'>-			snd_printdd("Skip Digital OUT node %x\n", node-&gt;nid);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		snd_printdd("AUD_OUT found %x\n", node-&gt;nid);</div><div class='del'>-		if (spec-&gt;dac_node[dac_idx]) {</div><div class='del'>-			/* already DAC node is assigned, just unmute &amp; connect */</div><div class='del'>-			return node == spec-&gt;dac_node[dac_idx];</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;dac_node[dac_idx] = node;</div><div class='del'>-		if ((node-&gt;wid_caps &amp; AC_WCAP_OUT_AMP) &amp;&amp;</div><div class='del'>-		    spec-&gt;pcm_vol_nodes &lt; MAX_PCM_VOLS) {</div><div class='del'>-			spec-&gt;pcm_vol[spec-&gt;pcm_vol_nodes].node = node;</div><div class='del'>-			spec-&gt;pcm_vol[spec-&gt;pcm_vol_nodes].index = 0;</div><div class='del'>-			spec-&gt;pcm_vol_nodes++;</div><div class='del'>-		}</div><div class='del'>-		return 1; /* found */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; node-&gt;nconns; i++) {</div><div class='del'>-		child = hda_get_node(spec, node-&gt;conn_list[i]);</div><div class='del'>-		if (! child)</div><div class='del'>-			continue;</div><div class='del'>-		err = parse_output_path(codec, spec, child, dac_idx);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		else if (err &gt; 0) {</div><div class='del'>-			/* found one,</div><div class='del'>-			 * select the path, unmute both input and output</div><div class='del'>-			 */</div><div class='del'>-			if (node-&gt;nconns &gt; 1)</div><div class='del'>-				select_input_connection(codec, node, i);</div><div class='del'>-			unmute_input(codec, node, i);</div><div class='del'>-			unmute_output(codec, node);</div><div class='del'>-			if (spec-&gt;dac_node[dac_idx] &amp;&amp;</div><div class='del'>-			    spec-&gt;pcm_vol_nodes &lt; MAX_PCM_VOLS &amp;&amp;</div><div class='del'>-			    !(spec-&gt;dac_node[dac_idx]-&gt;wid_caps &amp;</div><div class='del'>-			      AC_WCAP_OUT_AMP)) {</div><div class='del'>-				if ((node-&gt;wid_caps &amp; AC_WCAP_IN_AMP) ||</div><div class='del'>-				    (node-&gt;wid_caps &amp; AC_WCAP_OUT_AMP)) {</div><div class='del'>-					int n = spec-&gt;pcm_vol_nodes;</div><div class='del'>-					spec-&gt;pcm_vol[n].node = node;</div><div class='del'>-					spec-&gt;pcm_vol[n].index = i;</div><div class='del'>-					spec-&gt;pcm_vol_nodes++;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Look for the output PIN widget with the given jack type</div><div class='del'>- * and parse the output path to that PIN.</div><div class='del'>- *</div><div class='del'>- * Returns the PIN node when the path to DAC is established.</div><div class='del'>- */</div><div class='del'>-static struct hda_gnode *parse_output_jack(struct hda_codec *codec,</div><div class='del'>-					   struct hda_gspec *spec,</div><div class='del'>-					   int jack_type)</div><div class='del'>-{</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(node, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		if (node-&gt;type != AC_WID_PIN)</div><div class='del'>-			continue;</div><div class='del'>-		/* output capable? */</div><div class='del'>-		if (! (node-&gt;pin_caps &amp; AC_PINCAP_OUT))</div><div class='del'>-			continue;</div><div class='del'>-		if (defcfg_port_conn(node) == AC_JACK_PORT_NONE)</div><div class='del'>-			continue; /* unconnected */</div><div class='del'>-		if (jack_type &gt;= 0) {</div><div class='del'>-			if (jack_type != defcfg_type(node))</div><div class='del'>-				continue;</div><div class='del'>-			if (node-&gt;wid_caps &amp; AC_WCAP_DIGITAL)</div><div class='del'>-				continue; /* skip SPDIF */</div><div class='del'>-		} else {</div><div class='del'>-			/* output as default? */</div><div class='del'>-			if (! (node-&gt;pin_ctl &amp; AC_PINCTL_OUT_EN))</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-		clear_check_flags(spec);</div><div class='del'>-		err = parse_output_path(codec, spec, node, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		if (! err &amp;&amp; spec-&gt;out_pin_node[0]) {</div><div class='del'>-			err = parse_output_path(codec, spec, node, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return NULL;</div><div class='del'>-		}</div><div class='del'>-		if (err &gt; 0) {</div><div class='del'>-			/* unmute the PIN output */</div><div class='del'>-			unmute_output(codec, node);</div><div class='del'>-			/* set PIN-Out enable */</div><div class='del'>-			snd_hda_codec_write_cache(codec, node-&gt;nid, 0,</div><div class='del'>-					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					    AC_PINCTL_OUT_EN |</div><div class='del'>-					    ((node-&gt;pin_caps &amp; AC_PINCAP_HP_DRV) ?</div><div class='del'>-					     AC_PINCTL_HP_EN : 0));</div><div class='del'>-			return node;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse outputs</div><div class='del'>- */</div><div class='del'>-static int parse_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Look for the output PIN widget</div><div class='del'>-	 */</div><div class='del'>-	/* first, look for the line-out pin */</div><div class='del'>-	node = parse_output_jack(codec, spec, AC_JACK_LINE_OUT);</div><div class='del'>-	if (node) /* found, remember the PIN node */</div><div class='del'>-		spec-&gt;out_pin_node[0] = node;</div><div class='del'>-	else {</div><div class='del'>-		/* if no line-out is found, try speaker out */</div><div class='del'>-		node = parse_output_jack(codec, spec, AC_JACK_SPEAKER);</div><div class='del'>-		if (node)</div><div class='del'>-			spec-&gt;out_pin_node[0] = node;</div><div class='del'>-	}</div><div class='del'>-	/* look for the HP-out pin */</div><div class='del'>-	node = parse_output_jack(codec, spec, AC_JACK_HP_OUT);</div><div class='del'>-	if (node) {</div><div class='del'>-		if (! spec-&gt;out_pin_node[0])</div><div class='del'>-			spec-&gt;out_pin_node[0] = node;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;out_pin_node[1] = node;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (! spec-&gt;out_pin_node[0]) {</div><div class='del'>-		/* no line-out or HP pins found,</div><div class='del'>-		 * then choose for the first output pin</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;out_pin_node[0] = parse_output_jack(codec, spec, -1);</div><div class='del'>-		if (! spec-&gt;out_pin_node[0])</div><div class='del'>-			snd_printd("hda_generic: no proper output path found\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* control callbacks */</div><div class='del'>-static int capture_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(&amp;spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int capture_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_cap_src;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int capture_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_put(codec, &amp;spec-&gt;input_mux, ucontrol,</div><div class='del'>-				     spec-&gt;adc_node-&gt;nid, &amp;spec-&gt;cur_cap_src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * return the string name of the given input PIN widget</div><div class='del'>- */</div><div class='del'>-static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)</div><div class='del'>-{</div><div class='del'>-	unsigned int location = defcfg_location(node);</div><div class='del'>-	switch (defcfg_type(node)) {</div><div class='del'>-	case AC_JACK_LINE_IN:</div><div class='del'>-		if ((location &amp; 0x0f) == AC_JACK_LOC_FRONT)</div><div class='del'>-			return "Front Line";</div><div class='del'>-		return "Line";</div><div class='del'>-	case AC_JACK_CD:</div><div class='del'>-#if 0</div><div class='del'>-		if (pinctl)</div><div class='del'>-			*pinctl |= AC_PINCTL_VREF_GRD;</div><div class='del'>-#endif</div><div class='del'>-		return "CD";</div><div class='del'>-	case AC_JACK_AUX:</div><div class='del'>-		if ((location &amp; 0x0f) == AC_JACK_LOC_FRONT)</div><div class='del'>-			return "Front Aux";</div><div class='del'>-		return "Aux";</div><div class='del'>-	case AC_JACK_MIC_IN:</div><div class='del'>-		if (pinctl &amp;&amp;</div><div class='del'>-		    (node-&gt;pin_caps &amp;</div><div class='del'>-		     (AC_PINCAP_VREF_80 &lt;&lt; AC_PINCAP_VREF_SHIFT)))</div><div class='del'>-			*pinctl |= AC_PINCTL_VREF_80;</div><div class='del'>-		if ((location &amp; 0x0f) == AC_JACK_LOC_FRONT)</div><div class='del'>-			return "Front Mic";</div><div class='del'>-		return "Mic";</div><div class='del'>-	case AC_JACK_SPDIF_IN:</div><div class='del'>-		return "SPDIF";</div><div class='del'>-	case AC_JACK_DIG_OTHER_IN:</div><div class='del'>-		return "Digital";</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse the nodes recursively until reach to the input PIN</div><div class='del'>- *</div><div class='del'>- * returns 0 if not found, 1 if found, or a negative error code.</div><div class='del'>- */</div><div class='del'>-static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,</div><div class='del'>-			       struct hda_gnode *node, int idx)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-	unsigned int pinctl;</div><div class='del'>-	const char *type;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;checked)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	node-&gt;checked = 1;</div><div class='del'>-	if (node-&gt;type != AC_WID_PIN) {</div><div class='del'>-		for (i = 0; i &lt; node-&gt;nconns; i++) {</div><div class='del'>-			struct hda_gnode *child;</div><div class='del'>-			child = hda_get_node(spec, node-&gt;conn_list[i]);</div><div class='del'>-			if (! child)</div><div class='del'>-				continue;</div><div class='del'>-			err = parse_adc_sub_nodes(codec, spec, child, idx);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			if (err &gt; 0) {</div><div class='del'>-				/* found one,</div><div class='del'>-				 * select the path, unmute both input and output</div><div class='del'>-				 */</div><div class='del'>-				if (node-&gt;nconns &gt; 1)</div><div class='del'>-					select_input_connection(codec, node, i);</div><div class='del'>-				unmute_input(codec, node, i);</div><div class='del'>-				unmute_output(codec, node);</div><div class='del'>-				return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* input capable? */</div><div class='del'>-	if (! (node-&gt;pin_caps &amp; AC_PINCAP_IN))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (defcfg_port_conn(node) == AC_JACK_PORT_NONE)</div><div class='del'>-		return 0; /* unconnected */</div><div class='del'>-</div><div class='del'>-	if (node-&gt;wid_caps &amp; AC_WCAP_DIGITAL)</div><div class='del'>-		return 0; /* skip SPDIF */</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;input_mux.num_items &gt;= HDA_MAX_NUM_INPUTS) {</div><div class='del'>-		snd_printk(KERN_ERR "hda_generic: Too many items for capture\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pinctl = AC_PINCTL_IN_EN;</div><div class='del'>-	/* create a proper capture source label */</div><div class='del'>-	type = get_input_type(node, &amp;pinctl);</div><div class='del'>-	if (! type) {</div><div class='del'>-		/* input as default? */</div><div class='del'>-		if (! (node-&gt;pin_ctl &amp; AC_PINCTL_IN_EN))</div><div class='del'>-			return 0;</div><div class='del'>-		type = "Input";</div><div class='del'>-	}</div><div class='del'>-	snd_hda_add_imux_item(&amp;spec-&gt;input_mux, type, idx, NULL);</div><div class='del'>-</div><div class='del'>-	/* unmute the PIN external input */</div><div class='del'>-	unmute_input(codec, node, 0); /* index = 0? */</div><div class='del'>-	/* set PIN-In enable */</div><div class='del'>-	snd_hda_codec_write_cache(codec, node-&gt;nid, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);</div><div class='del'>-</div><div class='del'>-	return 1; /* found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse input</div><div class='del'>- */</div><div class='del'>-static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	snd_printdd("AUD_IN = %x\n", adc_node-&gt;nid);</div><div class='del'>-	clear_check_flags(spec);</div><div class='del'>-</div><div class='del'>-	// awk added - fixed no recording due to muted widget</div><div class='del'>-	unmute_input(codec, adc_node, 0);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * check each connection of the ADC</div><div class='del'>-	 * if it reaches to a proper input PIN, add the path as the</div><div class='del'>-	 * input path.</div><div class='del'>-	 */</div><div class='del'>-	/* first, check the direct connections to PIN widgets */</div><div class='del'>-	for (i = 0; i &lt; adc_node-&gt;nconns; i++) {</div><div class='del'>-		node = hda_get_node(spec, adc_node-&gt;conn_list[i]);</div><div class='del'>-		if (node &amp;&amp; node-&gt;type == AC_WID_PIN) {</div><div class='del'>-			err = parse_adc_sub_nodes(codec, spec, node, i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* ... then check the rests, more complicated connections */</div><div class='del'>-	for (i = 0; i &lt; adc_node-&gt;nconns; i++) {</div><div class='del'>-		node = hda_get_node(spec, adc_node-&gt;conn_list[i]);</div><div class='del'>-		if (node &amp;&amp; node-&gt;type != AC_WID_PIN) {</div><div class='del'>-			err = parse_adc_sub_nodes(codec, spec, node, i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (! spec-&gt;input_mux.num_items)</div><div class='del'>-		return 0; /* no input path found... */</div><div class='del'>-</div><div class='del'>-	snd_printdd("[Capture Source] NID=0x%x, #SRC=%d\n", adc_node-&gt;nid, spec-&gt;input_mux.num_items);</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;input_mux.num_items; i++)</div><div class='del'>-		snd_printdd("  [%s] IDX=0x%x\n", spec-&gt;input_mux.items[i].label,</div><div class='del'>-			    spec-&gt;input_mux.items[i].index);</div><div class='del'>-</div><div class='del'>-	spec-&gt;adc_node = adc_node;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse input</div><div class='del'>- */</div><div class='del'>-static int parse_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * At first we look for an audio input widget.</div><div class='del'>-	 * If it reaches to certain input PINs, we take it as the</div><div class='del'>-	 * input path.</div><div class='del'>-	 */</div><div class='del'>-	list_for_each_entry(node, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		if (node-&gt;wid_caps &amp; AC_WCAP_DIGITAL)</div><div class='del'>-			continue; /* skip SPDIF */</div><div class='del'>-		if (node-&gt;type == AC_WID_AUD_IN) {</div><div class='del'>-			err = parse_input_path(codec, node);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			else if (err &gt; 0)</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_printd("hda_generic: no proper input path found\n");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static void add_input_loopback(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			       int dir, int idx)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_amp_list *p;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;num_loopbacks &gt;= MAX_LOOPBACK_AMPS) {</div><div class='del'>-		snd_printk(KERN_ERR "hda_generic: Too many loopback ctls\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	p = &amp;spec-&gt;loopback_list[spec-&gt;num_loopbacks++];</div><div class='del'>-	p-&gt;nid = nid;</div><div class='del'>-	p-&gt;dir = dir;</div><div class='del'>-	p-&gt;idx = idx;</div><div class='del'>-	spec-&gt;loopback.amplist = spec-&gt;loopback_list;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define add_input_loopback(codec,nid,dir,idx)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * create mixer controls if possible</div><div class='del'>- */</div><div class='del'>-static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,</div><div class='del'>-			unsigned int index, const char *type,</div><div class='del'>-			const char *dir_sfx, int is_loopback)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	int err;</div><div class='del'>-	int created = 0;</div><div class='del'>-	struct snd_kcontrol_new knew;</div><div class='del'>-</div><div class='del'>-	if (type)</div><div class='del'>-		sprintf(name, "%s %s Switch", type, dir_sfx);</div><div class='del'>-	else</div><div class='del'>-		sprintf(name, "%s Switch", dir_sfx);</div><div class='del'>-	if ((node-&gt;wid_caps &amp; AC_WCAP_IN_AMP) &amp;&amp;</div><div class='del'>-	    (node-&gt;amp_in_caps &amp; AC_AMPCAP_MUTE)) {</div><div class='del'>-		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node-&gt;nid, index, HDA_INPUT);</div><div class='del'>-		if (is_loopback)</div><div class='del'>-			add_input_loopback(codec, node-&gt;nid, HDA_INPUT, index);</div><div class='del'>-		snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node-&gt;nid, index);</div><div class='del'>-		err = snd_hda_ctl_add(codec, node-&gt;nid,</div><div class='del'>-					snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		created = 1;</div><div class='del'>-	} else if ((node-&gt;wid_caps &amp; AC_WCAP_OUT_AMP) &amp;&amp;</div><div class='del'>-		   (node-&gt;amp_out_caps &amp; AC_AMPCAP_MUTE)) {</div><div class='del'>-		knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node-&gt;nid, 0, HDA_OUTPUT);</div><div class='del'>-		if (is_loopback)</div><div class='del'>-			add_input_loopback(codec, node-&gt;nid, HDA_OUTPUT, 0);</div><div class='del'>-		snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node-&gt;nid);</div><div class='del'>-		err = snd_hda_ctl_add(codec, node-&gt;nid,</div><div class='del'>-					snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		created = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (type)</div><div class='del'>-		sprintf(name, "%s %s Volume", type, dir_sfx);</div><div class='del'>-	else</div><div class='del'>-		sprintf(name, "%s Volume", dir_sfx);</div><div class='del'>-	if ((node-&gt;wid_caps &amp; AC_WCAP_IN_AMP) &amp;&amp;</div><div class='del'>-	    (node-&gt;amp_in_caps &amp; AC_AMPCAP_NUM_STEPS)) {</div><div class='del'>-		knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node-&gt;nid, index, HDA_INPUT);</div><div class='del'>-		snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node-&gt;nid, index);</div><div class='del'>-		err = snd_hda_ctl_add(codec, node-&gt;nid,</div><div class='del'>-					snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		created = 1;</div><div class='del'>-	} else if ((node-&gt;wid_caps &amp; AC_WCAP_OUT_AMP) &amp;&amp;</div><div class='del'>-		   (node-&gt;amp_out_caps &amp; AC_AMPCAP_NUM_STEPS)) {</div><div class='del'>-		knew = (struct snd_kcontrol_new)HDA_CODEC_VOLUME(name, node-&gt;nid, 0, HDA_OUTPUT);</div><div class='del'>-		snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node-&gt;nid);</div><div class='del'>-		err = snd_hda_ctl_add(codec, node-&gt;nid,</div><div class='del'>-					snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		created = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return created;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * check whether the controls with the given name and direction suffix already exist</div><div class='del'>- */</div><div class='del'>-static int check_existing_control(struct hda_codec *codec, const char *type, const char *dir)</div><div class='del'>-{</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='del'>-	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	sprintf(id.name, "%s %s Volume", type, dir);</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	if (snd_ctl_find_id(codec-&gt;bus-&gt;card, &amp;id))</div><div class='del'>-		return 1;</div><div class='del'>-	sprintf(id.name, "%s %s Switch", type, dir);</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	if (snd_ctl_find_id(codec-&gt;bus-&gt;card, &amp;id))</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * build output mixer controls</div><div class='del'>- */</div><div class='del'>-static int create_output_mixers(struct hda_codec *codec, const char **names)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;pcm_vol_nodes; i++) {</div><div class='del'>-		err = create_mixer(codec, spec-&gt;pcm_vol[i].node,</div><div class='del'>-				   spec-&gt;pcm_vol[i].index,</div><div class='del'>-				   names[i], "Playback", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int build_output_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	static const char *types_speaker[] = { "Speaker", "Headphone" };</div><div class='del'>-	static const char *types_line[] = { "Front", "Headphone" };</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;pcm_vol_nodes) {</div><div class='del'>-	case 1:</div><div class='del'>-		return create_mixer(codec, spec-&gt;pcm_vol[0].node,</div><div class='del'>-				    spec-&gt;pcm_vol[0].index,</div><div class='del'>-				    "Master", "Playback", 0);</div><div class='del'>-	case 2:</div><div class='del'>-		if (defcfg_type(spec-&gt;out_pin_node[0]) == AC_JACK_SPEAKER)</div><div class='del'>-			return create_output_mixers(codec, types_speaker);</div><div class='del'>-		else</div><div class='del'>-			return create_output_mixers(codec, types_line);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create capture volume/switch */</div><div class='del'>-static int build_input_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *adc_node = spec-&gt;adc_node;</div><div class='del'>-	int i, err;</div><div class='del'>-	static struct snd_kcontrol_new cap_sel = {</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = capture_source_info,</div><div class='del'>-		.get = capture_source_get,</div><div class='del'>-		.put = capture_source_put,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	if (! adc_node || ! spec-&gt;input_mux.num_items)</div><div class='del'>-		return 0; /* not found */</div><div class='del'>-</div><div class='del'>-	spec-&gt;cur_cap_src = 0;</div><div class='del'>-	select_input_connection(codec, adc_node,</div><div class='del'>-				spec-&gt;input_mux.items[0].index);</div><div class='del'>-</div><div class='del'>-	/* create capture volume and switch controls if the ADC has an amp */</div><div class='del'>-	/* do we have only a single item? */</div><div class='del'>-	if (spec-&gt;input_mux.num_items == 1) {</div><div class='del'>-		err = create_mixer(codec, adc_node,</div><div class='del'>-				   spec-&gt;input_mux.items[0].index,</div><div class='del'>-				   NULL, "Capture", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create input MUX if multiple sources are available */</div><div class='del'>-	err = snd_hda_ctl_add(codec, spec-&gt;adc_node-&gt;nid,</div><div class='del'>-			      snd_ctl_new1(&amp;cap_sel, codec));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* no volume control? */</div><div class='del'>-	if (! (adc_node-&gt;wid_caps &amp; AC_WCAP_IN_AMP) ||</div><div class='del'>-	    ! (adc_node-&gt;amp_in_caps &amp; AC_AMPCAP_NUM_STEPS))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;input_mux.num_items; i++) {</div><div class='del'>-		struct snd_kcontrol_new knew;</div><div class='del'>-		char name[32];</div><div class='del'>-		sprintf(name, "%s Capture Volume",</div><div class='del'>-			spec-&gt;input_mux.items[i].label);</div><div class='del'>-		knew = (struct snd_kcontrol_new)</div><div class='del'>-			HDA_CODEC_VOLUME(name, adc_node-&gt;nid,</div><div class='del'>-					 spec-&gt;input_mux.items[i].index,</div><div class='del'>-					 HDA_INPUT);</div><div class='del'>-		err = snd_hda_ctl_add(codec, adc_node-&gt;nid,</div><div class='del'>-					snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse the nodes recursively until reach to the output PIN.</div><div class='del'>- *</div><div class='del'>- * returns 0 - if not found,</div><div class='del'>- *         1 - if found, but no mixer is created</div><div class='del'>- *         2 - if found and mixer was already created, (just skip)</div><div class='del'>- *         a negative error code</div><div class='del'>- */</div><div class='del'>-static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,</div><div class='del'>-			       struct hda_gnode *node, struct hda_gnode *dest_node,</div><div class='del'>-			       const char *type)</div><div class='del'>-{</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (node-&gt;checked)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	node-&gt;checked = 1;</div><div class='del'>-	if (node == dest_node) {</div><div class='del'>-		/* loopback connection found */</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; node-&gt;nconns; i++) {</div><div class='del'>-		struct hda_gnode *child = hda_get_node(spec, node-&gt;conn_list[i]);</div><div class='del'>-		if (! child)</div><div class='del'>-			continue;</div><div class='del'>-		err = parse_loopback_path(codec, spec, child, dest_node, type);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		else if (err &gt;= 1) {</div><div class='del'>-			if (err == 1) {</div><div class='del'>-				err = create_mixer(codec, node, i, type,</div><div class='del'>-						   "Playback", 1);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-				if (err &gt; 0)</div><div class='del'>-					return 2; /* ok, created */</div><div class='del'>-				/* not created, maybe in the lower path */</div><div class='del'>-				err = 1;</div><div class='del'>-			}</div><div class='del'>-			/* connect and unmute */</div><div class='del'>-			if (node-&gt;nconns &gt; 1)</div><div class='del'>-				select_input_connection(codec, node, i);</div><div class='del'>-			unmute_input(codec, node, i);</div><div class='del'>-			unmute_output(codec, node);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse the tree and build the loopback controls</div><div class='del'>- */</div><div class='del'>-static int build_loopback_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_gnode *node;</div><div class='del'>-	int err;</div><div class='del'>-	const char *type;</div><div class='del'>-</div><div class='del'>-	if (! spec-&gt;out_pin_node[0])</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(node, &amp;spec-&gt;nid_list, list) {</div><div class='del'>-		if (node-&gt;type != AC_WID_PIN)</div><div class='del'>-			continue;</div><div class='del'>-		/* input capable? */</div><div class='del'>-		if (! (node-&gt;pin_caps &amp; AC_PINCAP_IN))</div><div class='del'>-			return 0;</div><div class='del'>-		type = get_input_type(node, NULL);</div><div class='del'>-		if (type) {</div><div class='del'>-			if (check_existing_control(codec, type, "Playback"))</div><div class='del'>-				continue;</div><div class='del'>-			clear_check_flags(spec);</div><div class='del'>-			err = parse_loopback_path(codec, spec,</div><div class='del'>-						  spec-&gt;out_pin_node[0],</div><div class='del'>-						  node, type);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			if (! err)</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * build mixer controls</div><div class='del'>- */</div><div class='del'>-static int build_generic_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = build_input_controls(codec)) &lt; 0 ||</div><div class='del'>-	    (err = build_output_controls(codec)) &lt; 0 ||</div><div class='del'>-	    (err = build_loopback_controls(codec)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream generic_pcm_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int generic_pcm2_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				struct hda_codec *codec,</div><div class='del'>-				unsigned int stream_tag,</div><div class='del'>-				unsigned int format,</div><div class='del'>-				struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, hinfo-&gt;nid, stream_tag, 0, format);</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;dac_node[1]-&gt;nid,</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int generic_pcm2_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				struct hda_codec *codec,</div><div class='del'>-				struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, hinfo-&gt;nid);</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;dac_node[1]-&gt;nid);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int build_generic_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = &amp;spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	if (! spec-&gt;dac_node[0] &amp;&amp; ! spec-&gt;adc_node) {</div><div class='del'>-		snd_printd("hda_generic: no PCM found\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "HDA Generic";</div><div class='del'>-	if (spec-&gt;dac_node[0]) {</div><div class='del'>-		info-&gt;stream[0] = generic_pcm_playback;</div><div class='del'>-		info-&gt;stream[0].nid = spec-&gt;dac_node[0]-&gt;nid;</div><div class='del'>-		if (spec-&gt;dac_node[1]) {</div><div class='del'>-			info-&gt;stream[0].ops.prepare = generic_pcm2_prepare;</div><div class='del'>-			info-&gt;stream[0].ops.cleanup = generic_pcm2_cleanup;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;adc_node) {</div><div class='del'>-		info-&gt;stream[1] = generic_pcm_playback;</div><div class='del'>-		info-&gt;stream[1].nid = spec-&gt;adc_node-&gt;nid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int generic_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;loopback, nid);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_ops generic_patch_ops = {</div><div class='del'>-	.build_controls = build_generic_controls,</div><div class='del'>-	.build_pcms = build_generic_pcms,</div><div class='del'>-	.free = snd_hda_generic_free,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.check_power_status = generic_check_power_status,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the generic parser</div><div class='del'>- */</div><div class='del'>-int snd_hda_parse_generic_codec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hda_gspec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if(!codec-&gt;afg)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL) {</div><div class='del'>-		printk(KERN_ERR "hda_generic: can't allocate spec\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	INIT_LIST_HEAD(&amp;spec-&gt;nid_list);</div><div class='del'>-</div><div class='del'>-	if ((err = build_afg_tree(codec)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if ((err = parse_input(codec)) &lt; 0 ||</div><div class='del'>-	    (err = parse_output(codec)) &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = generic_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_hda_generic_free(codec);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(snd_hda_parse_generic_codec);</div><div class='head'>diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c<br/>deleted file mode 100644<br/>index bf3ced51e0f8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_hwdep.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_hwdep.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,818 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * HWDEP Interface for HD-audio codec</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2007 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/compat.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include &lt;sound/hda_hwdep.h&gt;</div><div class='del'>-#include &lt;sound/minors.h&gt;</div><div class='del'>-</div><div class='del'>-/* hint string pair */</div><div class='del'>-struct hda_hint {</div><div class='del'>-	const char *key;</div><div class='del'>-	const char *val;	/* contained in the same alloc as key */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * write/read an out-of-bound verb</div><div class='del'>- */</div><div class='del'>-static int verb_write_ioctl(struct hda_codec *codec,</div><div class='del'>-			    struct hda_verb_ioctl __user *arg)</div><div class='del'>-{</div><div class='del'>-	u32 verb, res;</div><div class='del'>-</div><div class='del'>-	if (get_user(verb, &amp;arg-&gt;verb))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	res = snd_hda_codec_read(codec, verb &gt;&gt; 24, 0,</div><div class='del'>-				 (verb &gt;&gt; 8) &amp; 0xffff, verb &amp; 0xff);</div><div class='del'>-	if (put_user(res, &amp;arg-&gt;res))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_wcap_ioctl(struct hda_codec *codec,</div><div class='del'>-			  struct hda_verb_ioctl __user *arg)</div><div class='del'>-{</div><div class='del'>-	u32 verb, res;</div><div class='del'>-	</div><div class='del'>-	if (get_user(verb, &amp;arg-&gt;verb))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	res = get_wcaps(codec, verb &gt;&gt; 24);</div><div class='del'>-	if (put_user(res, &amp;arg-&gt;res))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int hda_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,</div><div class='del'>-			   unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = hw-&gt;private_data;</div><div class='del'>-	void __user *argp = (void __user *)arg;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case HDA_IOCTL_PVERSION:</div><div class='del'>-		return put_user(HDA_HWDEP_VERSION, (int __user *)argp);</div><div class='del'>-	case HDA_IOCTL_VERB_WRITE:</div><div class='del'>-		return verb_write_ioctl(codec, argp);</div><div class='del'>-	case HDA_IOCTL_GET_WCAP:</div><div class='del'>-		return get_wcap_ioctl(codec, argp);</div><div class='del'>-	}</div><div class='del'>-	return -ENOIOCTLCMD;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-static int hda_hwdep_ioctl_compat(struct snd_hwdep *hw, struct file *file,</div><div class='del'>-				  unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	return hda_hwdep_ioctl(hw, file, cmd, (unsigned long)compat_ptr(arg));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)</div><div class='del'>-{</div><div class='del'>-#ifndef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-	if (!capable(CAP_SYS_RAWIO))</div><div class='del'>-		return -EACCES;</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void clear_hwdep_elements(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* clear init verbs */</div><div class='del'>-	snd_array_free(&amp;codec-&gt;init_verbs);</div><div class='del'>-	/* clear hints */</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;hints.used; i++) {</div><div class='del'>-		struct hda_hint *hint = snd_array_elem(&amp;codec-&gt;hints, i);</div><div class='del'>-		kfree(hint-&gt;key); /* we don't need to free hint-&gt;val */</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;codec-&gt;hints);</div><div class='del'>-	snd_array_free(&amp;codec-&gt;user_pins);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hwdep_free(struct snd_hwdep *hwdep)</div><div class='del'>-{</div><div class='del'>-	clear_hwdep_elements(hwdep-&gt;private_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	char hwname[16];</div><div class='del'>-	struct snd_hwdep *hwdep;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sprintf(hwname, "HDA Codec %d", codec-&gt;addr);</div><div class='del'>-	err = snd_hwdep_new(codec-&gt;bus-&gt;card, hwname, codec-&gt;addr, &amp;hwdep);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	codec-&gt;hwdep = hwdep;</div><div class='del'>-	sprintf(hwdep-&gt;name, "HDA Codec %d", codec-&gt;addr);</div><div class='del'>-	hwdep-&gt;iface = SNDRV_HWDEP_IFACE_HDA;</div><div class='del'>-	hwdep-&gt;private_data = codec;</div><div class='del'>-	hwdep-&gt;private_free = hwdep_free;</div><div class='del'>-	hwdep-&gt;exclusive = 1;</div><div class='del'>-</div><div class='del'>-	hwdep-&gt;ops.open = hda_hwdep_open;</div><div class='del'>-	hwdep-&gt;ops.ioctl = hda_hwdep_ioctl;</div><div class='del'>-#ifdef CONFIG_COMPAT</div><div class='del'>-	hwdep-&gt;ops.ioctl_compat = hda_hwdep_ioctl_compat;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;codec-&gt;init_verbs, sizeof(struct hda_verb), 32);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;hints, sizeof(struct hda_hint), 32);</div><div class='del'>-	snd_array_init(&amp;codec-&gt;user_pins, sizeof(struct hda_pincfg), 16);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static ssize_t power_on_acct_show(struct device *dev,</div><div class='del'>-				  struct device_attribute *attr,</div><div class='del'>-				  char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	snd_hda_update_power_acct(codec);</div><div class='del'>-	return sprintf(buf, "%u\n", jiffies_to_msecs(codec-&gt;power_on_acct));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t power_off_acct_show(struct device *dev,</div><div class='del'>-				   struct device_attribute *attr,</div><div class='del'>-				   char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	snd_hda_update_power_acct(codec);</div><div class='del'>-	return sprintf(buf, "%u\n", jiffies_to_msecs(codec-&gt;power_off_acct));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct device_attribute power_attrs[] = {</div><div class='del'>-	__ATTR_RO(power_on_acct),</div><div class='del'>-	__ATTR_RO(power_off_acct),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = codec-&gt;hwdep;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(power_attrs); i++)</div><div class='del'>-		snd_add_device_sysfs_file(SNDRV_DEVICE_TYPE_HWDEP, hwdep-&gt;card,</div><div class='del'>-					  hwdep-&gt;device, &amp;power_attrs[i]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_SND_HDA_POWER_SAVE */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_RECONFIG</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * sysfs interface</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int clear_codec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_codec_reset(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "The codec is being used, can't free.\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	clear_hwdep_elements(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int reconfig_codec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	snd_hda_power_up(codec);</div><div class='del'>-	snd_printk(KERN_INFO "hda-codec: reconfiguring\n");</div><div class='del'>-	err = snd_hda_codec_reset(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR</div><div class='del'>-			   "The codec is being used, can't reconfigure.\n");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	err = snd_hda_codec_configure(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	/* rebuild PCMs */</div><div class='del'>-	err = snd_hda_codec_build_pcms(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	/* rebuild mixers */</div><div class='del'>-	err = snd_hda_codec_build_controls(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-	err = snd_card_register(codec-&gt;bus-&gt;card);</div><div class='del'>- error:</div><div class='del'>-	snd_hda_power_down(codec);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * allocate a string at most len chars, and remove the trailing EOL</div><div class='del'>- */</div><div class='del'>-static char *kstrndup_noeol(const char *src, size_t len)</div><div class='del'>-{</div><div class='del'>-	char *s = kstrndup(src, len, GFP_KERNEL);</div><div class='del'>-	char *p;</div><div class='del'>-	if (!s)</div><div class='del'>-		return NULL;</div><div class='del'>-	p = strchr(s, '\n');</div><div class='del'>-	if (p)</div><div class='del'>-		*p = 0;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CODEC_INFO_SHOW(type)					\</div><div class='del'>-static ssize_t type##_show(struct device *dev,			\</div><div class='del'>-			   struct device_attribute *attr,	\</div><div class='del'>-			   char *buf)				\</div><div class='del'>-{								\</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);		\</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;		\</div><div class='del'>-	return sprintf(buf, "0x%x\n", codec-&gt;type);		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CODEC_INFO_STR_SHOW(type)				\</div><div class='del'>-static ssize_t type##_show(struct device *dev,			\</div><div class='del'>-			     struct device_attribute *attr,	\</div><div class='del'>-					char *buf)		\</div><div class='del'>-{								\</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);		\</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;		\</div><div class='del'>-	return sprintf(buf, "%s\n",				\</div><div class='del'>-		       codec-&gt;type ? codec-&gt;type : "");		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CODEC_INFO_SHOW(vendor_id);</div><div class='del'>-CODEC_INFO_SHOW(subsystem_id);</div><div class='del'>-CODEC_INFO_SHOW(revision_id);</div><div class='del'>-CODEC_INFO_SHOW(afg);</div><div class='del'>-CODEC_INFO_SHOW(mfg);</div><div class='del'>-CODEC_INFO_STR_SHOW(vendor_name);</div><div class='del'>-CODEC_INFO_STR_SHOW(chip_name);</div><div class='del'>-CODEC_INFO_STR_SHOW(modelname);</div><div class='del'>-</div><div class='del'>-#define CODEC_INFO_STORE(type)					\</div><div class='del'>-static ssize_t type##_store(struct device *dev,			\</div><div class='del'>-			    struct device_attribute *attr,	\</div><div class='del'>-			    const char *buf, size_t count)	\</div><div class='del'>-{								\</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);		\</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;		\</div><div class='del'>-	unsigned long val;					\</div><div class='del'>-	int err = strict_strtoul(buf, 0, &amp;val);			\</div><div class='del'>-	if (err &lt; 0)						\</div><div class='del'>-		return err;					\</div><div class='del'>-	codec-&gt;type = val;					\</div><div class='del'>-	return count;						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CODEC_INFO_STR_STORE(type)				\</div><div class='del'>-static ssize_t type##_store(struct device *dev,			\</div><div class='del'>-			    struct device_attribute *attr,	\</div><div class='del'>-			    const char *buf, size_t count)	\</div><div class='del'>-{								\</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);		\</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;		\</div><div class='del'>-	char *s = kstrndup_noeol(buf, 64);			\</div><div class='del'>-	if (!s)							\</div><div class='del'>-		return -ENOMEM;					\</div><div class='del'>-	kfree(codec-&gt;type);					\</div><div class='del'>-	codec-&gt;type = s;					\</div><div class='del'>-	return count;						\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CODEC_INFO_STORE(vendor_id);</div><div class='del'>-CODEC_INFO_STORE(subsystem_id);</div><div class='del'>-CODEC_INFO_STORE(revision_id);</div><div class='del'>-CODEC_INFO_STR_STORE(vendor_name);</div><div class='del'>-CODEC_INFO_STR_STORE(chip_name);</div><div class='del'>-CODEC_INFO_STR_STORE(modelname);</div><div class='del'>-</div><div class='del'>-#define CODEC_ACTION_STORE(type)				\</div><div class='del'>-static ssize_t type##_store(struct device *dev,			\</div><div class='del'>-			    struct device_attribute *attr,	\</div><div class='del'>-			    const char *buf, size_t count)	\</div><div class='del'>-{								\</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);		\</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;		\</div><div class='del'>-	int err = 0;						\</div><div class='del'>-	if (*buf)						\</div><div class='del'>-		err = type##_codec(codec);			\</div><div class='del'>-	return err &lt; 0 ? err : count;				\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CODEC_ACTION_STORE(reconfig);</div><div class='del'>-CODEC_ACTION_STORE(clear);</div><div class='del'>-</div><div class='del'>-static ssize_t init_verbs_show(struct device *dev,</div><div class='del'>-			       struct device_attribute *attr,</div><div class='del'>-			       char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	int i, len = 0;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;init_verbs.used; i++) {</div><div class='del'>-		struct hda_verb *v = snd_array_elem(&amp;codec-&gt;init_verbs, i);</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='del'>-				"0x%02x 0x%03x 0x%04x\n",</div><div class='del'>-				v-&gt;nid, v-&gt;verb, v-&gt;param);</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int parse_init_verbs(struct hda_codec *codec, const char *buf)</div><div class='del'>-{</div><div class='del'>-	struct hda_verb *v;</div><div class='del'>-	int nid, verb, param;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%i %i %i", &amp;nid, &amp;verb, &amp;param) != 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!nid || !verb)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	v = snd_array_new(&amp;codec-&gt;init_verbs);</div><div class='del'>-	if (!v)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	v-&gt;nid = nid;</div><div class='del'>-	v-&gt;verb = verb;</div><div class='del'>-	v-&gt;param = param;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t init_verbs_store(struct device *dev,</div><div class='del'>-				struct device_attribute *attr,</div><div class='del'>-				const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	int err = parse_init_verbs(codec, buf);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t hints_show(struct device *dev,</div><div class='del'>-			  struct device_attribute *attr,</div><div class='del'>-			  char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	int i, len = 0;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;hints.used; i++) {</div><div class='del'>-		struct hda_hint *hint = snd_array_elem(&amp;codec-&gt;hints, i);</div><div class='del'>-		len += snprintf(buf + len, PAGE_SIZE - len,</div><div class='del'>-				"%s = %s\n", hint-&gt;key, hint-&gt;val);</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_hint *get_hint(struct hda_codec *codec, const char *key)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;hints.used; i++) {</div><div class='del'>-		struct hda_hint *hint = snd_array_elem(&amp;codec-&gt;hints, i);</div><div class='del'>-		if (!strcmp(hint-&gt;key, key))</div><div class='del'>-			return hint;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void remove_trail_spaces(char *str)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	if (!*str)</div><div class='del'>-		return;</div><div class='del'>-	p = str + strlen(str) - 1;</div><div class='del'>-	for (; isspace(*p); p--) {</div><div class='del'>-		*p = 0;</div><div class='del'>-		if (p == str)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_HINTS	1024</div><div class='del'>-</div><div class='del'>-static int parse_hints(struct hda_codec *codec, const char *buf)</div><div class='del'>-{</div><div class='del'>-	char *key, *val;</div><div class='del'>-	struct hda_hint *hint;</div><div class='del'>-</div><div class='del'>-	buf = skip_spaces(buf);</div><div class='del'>-	if (!*buf || *buf == '#' || *buf == '\n')</div><div class='del'>-		return 0;</div><div class='del'>-	if (*buf == '=')</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	key = kstrndup_noeol(buf, 1024);</div><div class='del'>-	if (!key)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	/* extract key and val */</div><div class='del'>-	val = strchr(key, '=');</div><div class='del'>-	if (!val) {</div><div class='del'>-		kfree(key);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	*val++ = 0;</div><div class='del'>-	val = skip_spaces(val);</div><div class='del'>-	remove_trail_spaces(key);</div><div class='del'>-	remove_trail_spaces(val);</div><div class='del'>-	hint = get_hint(codec, key);</div><div class='del'>-	if (hint) {</div><div class='del'>-		/* replace */</div><div class='del'>-		kfree(hint-&gt;key);</div><div class='del'>-		hint-&gt;key = key;</div><div class='del'>-		hint-&gt;val = val;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* allocate a new hint entry */</div><div class='del'>-	if (codec-&gt;hints.used &gt;= MAX_HINTS)</div><div class='del'>-		hint = NULL;</div><div class='del'>-	else</div><div class='del'>-		hint = snd_array_new(&amp;codec-&gt;hints);</div><div class='del'>-	if (!hint) {</div><div class='del'>-		kfree(key);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	hint-&gt;key = key;</div><div class='del'>-	hint-&gt;val = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t hints_store(struct device *dev,</div><div class='del'>-			   struct device_attribute *attr,</div><div class='del'>-			   const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	int err = parse_hints(codec, buf);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t pin_configs_show(struct hda_codec *codec,</div><div class='del'>-				struct snd_array *list,</div><div class='del'>-				char *buf)</div><div class='del'>-{</div><div class='del'>-	int i, len = 0;</div><div class='del'>-	for (i = 0; i &lt; list-&gt;used; i++) {</div><div class='del'>-		struct hda_pincfg *pin = snd_array_elem(list, i);</div><div class='del'>-		len += sprintf(buf + len, "0x%02x 0x%08x\n",</div><div class='del'>-			       pin-&gt;nid, pin-&gt;cfg);</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t init_pin_configs_show(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr,</div><div class='del'>-				     char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	return pin_configs_show(codec, &amp;codec-&gt;init_pins, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t user_pin_configs_show(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr,</div><div class='del'>-				     char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	return pin_configs_show(codec, &amp;codec-&gt;user_pins, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t driver_pin_configs_show(struct device *dev,</div><div class='del'>-				       struct device_attribute *attr,</div><div class='del'>-				       char *buf)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	return pin_configs_show(codec, &amp;codec-&gt;driver_pins, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_PIN_CONFIGS		32</div><div class='del'>-</div><div class='del'>-static int parse_user_pin_configs(struct hda_codec *codec, const char *buf)</div><div class='del'>-{</div><div class='del'>-	int nid, cfg;</div><div class='del'>-</div><div class='del'>-	if (sscanf(buf, "%i %i", &amp;nid, &amp;cfg) != 2)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!nid)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	return snd_hda_add_pincfg(codec, &amp;codec-&gt;user_pins, nid, cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t user_pin_configs_store(struct device *dev,</div><div class='del'>-				      struct device_attribute *attr,</div><div class='del'>-				      const char *buf, size_t count)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = dev_get_drvdata(dev);</div><div class='del'>-	struct hda_codec *codec = hwdep-&gt;private_data;</div><div class='del'>-	int err = parse_user_pin_configs(codec, buf);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CODEC_ATTR_RW(type) \</div><div class='del'>-	__ATTR(type, 0644, type##_show, type##_store)</div><div class='del'>-#define CODEC_ATTR_RO(type) \</div><div class='del'>-	__ATTR_RO(type)</div><div class='del'>-#define CODEC_ATTR_WO(type) \</div><div class='del'>-	__ATTR(type, 0200, NULL, type##_store)</div><div class='del'>-</div><div class='del'>-static struct device_attribute codec_attrs[] = {</div><div class='del'>-	CODEC_ATTR_RW(vendor_id),</div><div class='del'>-	CODEC_ATTR_RW(subsystem_id),</div><div class='del'>-	CODEC_ATTR_RW(revision_id),</div><div class='del'>-	CODEC_ATTR_RO(afg),</div><div class='del'>-	CODEC_ATTR_RO(mfg),</div><div class='del'>-	CODEC_ATTR_RW(vendor_name),</div><div class='del'>-	CODEC_ATTR_RW(chip_name),</div><div class='del'>-	CODEC_ATTR_RW(modelname),</div><div class='del'>-	CODEC_ATTR_RW(init_verbs),</div><div class='del'>-	CODEC_ATTR_RW(hints),</div><div class='del'>-	CODEC_ATTR_RO(init_pin_configs),</div><div class='del'>-	CODEC_ATTR_RW(user_pin_configs),</div><div class='del'>-	CODEC_ATTR_RO(driver_pin_configs),</div><div class='del'>-	CODEC_ATTR_WO(reconfig),</div><div class='del'>-	CODEC_ATTR_WO(clear),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * create sysfs files on hwdep directory</div><div class='del'>- */</div><div class='del'>-int snd_hda_hwdep_add_sysfs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct snd_hwdep *hwdep = codec-&gt;hwdep;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(codec_attrs); i++)</div><div class='del'>-		snd_add_device_sysfs_file(SNDRV_DEVICE_TYPE_HWDEP, hwdep-&gt;card,</div><div class='del'>-					  hwdep-&gt;device, &amp;codec_attrs[i]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Look for hint string</div><div class='del'>- */</div><div class='del'>-const char *snd_hda_get_hint(struct hda_codec *codec, const char *key)</div><div class='del'>-{</div><div class='del'>-	struct hda_hint *hint = get_hint(codec, key);</div><div class='del'>-	return hint ? hint-&gt;val : NULL;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_hint);</div><div class='del'>-</div><div class='del'>-int snd_hda_get_bool_hint(struct hda_codec *codec, const char *key)</div><div class='del'>-{</div><div class='del'>-	const char *p = snd_hda_get_hint(codec, key);</div><div class='del'>-	if (!p || !*p)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	switch (toupper(*p)) {</div><div class='del'>-	case 'T': /* true */</div><div class='del'>-	case 'Y': /* yes */</div><div class='del'>-	case '1':</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_get_bool_hint);</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SND_HDA_RECONFIG */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='del'>-</div><div class='del'>-/* parser mode */</div><div class='del'>-enum {</div><div class='del'>-	LINE_MODE_NONE,</div><div class='del'>-	LINE_MODE_CODEC,</div><div class='del'>-	LINE_MODE_MODEL,</div><div class='del'>-	LINE_MODE_PINCFG,</div><div class='del'>-	LINE_MODE_VERB,</div><div class='del'>-	LINE_MODE_HINT,</div><div class='del'>-	LINE_MODE_VENDOR_ID,</div><div class='del'>-	LINE_MODE_SUBSYSTEM_ID,</div><div class='del'>-	LINE_MODE_REVISION_ID,</div><div class='del'>-	LINE_MODE_CHIP_NAME,</div><div class='del'>-	NUM_LINE_MODES,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int strmatch(const char *a, const char *b)</div><div class='del'>-{</div><div class='del'>-	return strnicmp(a, b, strlen(b)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the contents after the line "[codec]"</div><div class='del'>- * accept only the line with three numbers, and assign the current codec</div><div class='del'>- */</div><div class='del'>-static void parse_codec_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-			     struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	unsigned int vendorid, subid, caddr;</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	*codecp = NULL;</div><div class='del'>-	if (sscanf(buf, "%i %i %i", &amp;vendorid, &amp;subid, &amp;caddr) == 3) {</div><div class='del'>-		list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-			if (codec-&gt;vendor_id == vendorid &amp;&amp;</div><div class='del'>-			    codec-&gt;subsystem_id == subid &amp;&amp;</div><div class='del'>-			    codec-&gt;addr == caddr) {</div><div class='del'>-				*codecp = codec;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the contents after the other command tags, [pincfg], [verb],</div><div class='del'>- * [vendor_id], [subsystem_id], [revision_id], [chip_name], [hint] and [model]</div><div class='del'>- * just pass to the sysfs helper (only when any codec was specified)</div><div class='del'>- */</div><div class='del'>-static void parse_pincfg_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-			      struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	parse_user_pin_configs(*codecp, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_verb_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-			    struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	parse_init_verbs(*codecp, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_hint_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-			    struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	parse_hints(*codecp, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_model_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-			     struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	kfree((*codecp)-&gt;modelname);</div><div class='del'>-	(*codecp)-&gt;modelname = kstrdup(buf, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_chip_name_mode(char *buf, struct hda_bus *bus,</div><div class='del'>-				 struct hda_codec **codecp)</div><div class='del'>-{</div><div class='del'>-	kfree((*codecp)-&gt;chip_name);</div><div class='del'>-	(*codecp)-&gt;chip_name = kstrdup(buf, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEFINE_PARSE_ID_MODE(name) \</div><div class='del'>-static void parse_##name##_mode(char *buf, struct hda_bus *bus, \</div><div class='del'>-				 struct hda_codec **codecp) \</div><div class='del'>-{ \</div><div class='del'>-	unsigned long val; \</div><div class='del'>-	if (!strict_strtoul(buf, 0, &amp;val)) \</div><div class='del'>-		(*codecp)-&gt;name = val; \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEFINE_PARSE_ID_MODE(vendor_id);</div><div class='del'>-DEFINE_PARSE_ID_MODE(subsystem_id);</div><div class='del'>-DEFINE_PARSE_ID_MODE(revision_id);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hda_patch_item {</div><div class='del'>-	const char *tag;</div><div class='del'>-	void (*parser)(char *buf, struct hda_bus *bus, struct hda_codec **retc);</div><div class='del'>-	int need_codec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_patch_item patch_items[NUM_LINE_MODES] = {</div><div class='del'>-	[LINE_MODE_CODEC] = { "[codec]", parse_codec_mode, 0 },</div><div class='del'>-	[LINE_MODE_MODEL] = { "[model]", parse_model_mode, 1 },</div><div class='del'>-	[LINE_MODE_VERB] = { "[verb]", parse_verb_mode, 1 },</div><div class='del'>-	[LINE_MODE_PINCFG] = { "[pincfg]", parse_pincfg_mode, 1 },</div><div class='del'>-	[LINE_MODE_HINT] = { "[hint]", parse_hint_mode, 1 },</div><div class='del'>-	[LINE_MODE_VENDOR_ID] = { "[vendor_id]", parse_vendor_id_mode, 1 },</div><div class='del'>-	[LINE_MODE_SUBSYSTEM_ID] = { "[subsystem_id]", parse_subsystem_id_mode, 1 },</div><div class='del'>-	[LINE_MODE_REVISION_ID] = { "[revision_id]", parse_revision_id_mode, 1 },</div><div class='del'>-	[LINE_MODE_CHIP_NAME] = { "[chip_name]", parse_chip_name_mode, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* check the line starting with '[' -- change the parser mode accodingly */</div><div class='del'>-static int parse_line_mode(char *buf, struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(patch_items); i++) {</div><div class='del'>-		if (!patch_items[i].tag)</div><div class='del'>-			continue;</div><div class='del'>-		if (strmatch(buf, patch_items[i].tag))</div><div class='del'>-			return i;</div><div class='del'>-	}</div><div class='del'>-	return LINE_MODE_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* copy one line from the buffer in fw, and update the fields in fw</div><div class='del'>- * return zero if it reaches to the end of the buffer, or non-zero</div><div class='del'>- * if successfully copied a line</div><div class='del'>- *</div><div class='del'>- * the spaces at the beginning and the end of the line are stripped</div><div class='del'>- */</div><div class='del'>-static int get_line_from_fw(char *buf, int size, struct firmware *fw)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-	const char *p = fw-&gt;data;</div><div class='del'>-	while (isspace(*p) &amp;&amp; fw-&gt;size) {</div><div class='del'>-		p++;</div><div class='del'>-		fw-&gt;size--;</div><div class='del'>-	}</div><div class='del'>-	if (!fw-&gt;size)</div><div class='del'>-		return 0;</div><div class='del'>-	if (size &lt; fw-&gt;size)</div><div class='del'>-		size = fw-&gt;size;</div><div class='del'>-</div><div class='del'>-	for (len = 0; len &lt; fw-&gt;size; len++) {</div><div class='del'>-		if (!*p)</div><div class='del'>-			break;</div><div class='del'>-		if (*p == '\n') {</div><div class='del'>-			p++;</div><div class='del'>-			len++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (len &lt; size)</div><div class='del'>-			*buf++ = *p++;</div><div class='del'>-	}</div><div class='del'>-	*buf = 0;</div><div class='del'>-	fw-&gt;size -= len;</div><div class='del'>-	fw-&gt;data = p;</div><div class='del'>-	remove_trail_spaces(buf);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * load a "patch" firmware file and parse it</div><div class='del'>- */</div><div class='del'>-int snd_hda_load_patch(struct hda_bus *bus, const char *patch)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	struct firmware tmp;</div><div class='del'>-	char buf[128];</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	int line_mode;</div><div class='del'>-	struct device *dev = bus-&gt;card-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (snd_BUG_ON(!dev))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	err = request_firmware(&amp;fw, patch, dev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "hda-codec: Cannot load the patch '%s'\n",</div><div class='del'>-		       patch);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp = *fw;</div><div class='del'>-	line_mode = LINE_MODE_NONE;</div><div class='del'>-	codec = NULL;</div><div class='del'>-	while (get_line_from_fw(buf, sizeof(buf) - 1, &amp;tmp)) {</div><div class='del'>-		if (!*buf || *buf == '#' || *buf == '\n')</div><div class='del'>-			continue;</div><div class='del'>-		if (*buf == '[')</div><div class='del'>-			line_mode = parse_line_mode(buf, bus);</div><div class='del'>-		else if (patch_items[line_mode].parser &amp;&amp;</div><div class='del'>-			 (codec || !patch_items[line_mode].need_codec))</div><div class='del'>-			patch_items[line_mode].parser(buf, bus, &amp;codec);</div><div class='del'>-	}</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_HDA(snd_hda_load_patch);</div><div class='del'>-#endif /* CONFIG_SND_HDA_PATCH_LOADER */</div><div class='head'>diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c<br/>deleted file mode 100644<br/>index 21aa9b0e28f6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/hda_intel.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/hda_intel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2843 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  hda_intel.c - Implementation of primary alsa driver code base</div><div class='del'>- *                for Intel HD Audio.</div><div class='del'>- *</div><div class='del'>- *  Copyright(c) 2004 Intel Corporation. All rights reserved.</div><div class='del'>- *</div><div class='del'>- *  Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *                     PeiSen Hou &lt;pshou@realtek.com.tw&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the Free</div><div class='del'>- *  Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- *  any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>- *  more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along with</div><div class='del'>- *  this program; if not, write to the Free Software Foundation, Inc., 59</div><div class='del'>- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- *  CONTACTS:</div><div class='del'>- *</div><div class='del'>- *  Matt Jared		matt.jared@intel.com</div><div class='del'>- *  Andy Kopp		andy.kopp@intel.com</div><div class='del'>- *  Dan Kogan		dan.d.kogan@intel.com</div><div class='del'>- *</div><div class='del'>- *  CHANGES:</div><div class='del'>- *</div><div class='del'>- *  2004.12.01	Major rewrite by tiwai, merged the work of pshou</div><div class='del'>- * </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/reboot.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/initval.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='del'>-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='del'>-static char *model[SNDRV_CARDS];</div><div class='del'>-static int position_fix[SNDRV_CARDS];</div><div class='del'>-static int bdl_pos_adj[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};</div><div class='del'>-static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};</div><div class='del'>-static int probe_only[SNDRV_CARDS];</div><div class='del'>-static int single_cmd;</div><div class='del'>-static int enable_msi = -1;</div><div class='del'>-#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='del'>-static char *patch[SNDRV_CARDS];</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-static int beep_mode[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] =</div><div class='del'>-					CONFIG_SND_HDA_INPUT_BEEP_MODE};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-module_param_array(index, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");</div><div class='del'>-module_param_array(id, charp, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");</div><div class='del'>-module_param_array(enable, bool, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");</div><div class='del'>-module_param_array(model, charp, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(model, "Use the given board model.");</div><div class='del'>-module_param_array(position_fix, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(position_fix, "DMA pointer read method."</div><div class='del'>-		 "(0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO).");</div><div class='del'>-module_param_array(bdl_pos_adj, int, NULL, 0644);</div><div class='del'>-MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset.");</div><div class='del'>-module_param_array(probe_mask, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");</div><div class='del'>-module_param_array(probe_only, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(probe_only, "Only probing and no codec initialization.");</div><div class='del'>-module_param(single_cmd, bool, 0444);</div><div class='del'>-MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "</div><div class='del'>-		 "(for debugging only).");</div><div class='del'>-module_param(enable_msi, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");</div><div class='del'>-#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='del'>-module_param_array(patch, charp, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(patch, "Patch file for Intel HD audio interface.");</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-module_param_array(beep_mode, int, NULL, 0444);</div><div class='del'>-MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "</div><div class='del'>-			    "(0=off, 1=on, 2=mute switch on/off) (default=1).");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;</div><div class='del'>-module_param(power_save, int, 0644);</div><div class='del'>-MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "</div><div class='del'>-		 "(in second, 0 = disable).");</div><div class='del'>-</div><div class='del'>-/* reset the HD-audio controller in power save mode.</div><div class='del'>- * this may give more power-saving, but will take longer time to</div><div class='del'>- * wake up.</div><div class='del'>- */</div><div class='del'>-static int power_save_controller = 1;</div><div class='del'>-module_param(power_save_controller, bool, 0644);</div><div class='del'>-MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"</div><div class='del'>-			 "{Intel, ICH6M},"</div><div class='del'>-			 "{Intel, ICH7},"</div><div class='del'>-			 "{Intel, ESB2},"</div><div class='del'>-			 "{Intel, ICH8},"</div><div class='del'>-			 "{Intel, ICH9},"</div><div class='del'>-			 "{Intel, ICH10},"</div><div class='del'>-			 "{Intel, PCH},"</div><div class='del'>-			 "{Intel, CPT},"</div><div class='del'>-			 "{Intel, PBG},"</div><div class='del'>-			 "{Intel, SCH},"</div><div class='del'>-			 "{ATI, SB450},"</div><div class='del'>-			 "{ATI, SB600},"</div><div class='del'>-			 "{ATI, RS600},"</div><div class='del'>-			 "{ATI, RS690},"</div><div class='del'>-			 "{ATI, RS780},"</div><div class='del'>-			 "{ATI, R600},"</div><div class='del'>-			 "{ATI, RV630},"</div><div class='del'>-			 "{ATI, RV610},"</div><div class='del'>-			 "{ATI, RV670},"</div><div class='del'>-			 "{ATI, RV635},"</div><div class='del'>-			 "{ATI, RV620},"</div><div class='del'>-			 "{ATI, RV770},"</div><div class='del'>-			 "{VIA, VT8251},"</div><div class='del'>-			 "{VIA, VT8237A},"</div><div class='del'>-			 "{SiS, SIS966},"</div><div class='del'>-			 "{ULI, M5461}}");</div><div class='del'>-MODULE_DESCRIPTION("Intel HDA driver");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_VERBOSE_PRINTK</div><div class='del'>-#define SFX	/* nop */</div><div class='del'>-#else</div><div class='del'>-#define SFX	"hda-intel: "</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * registers</div><div class='del'>- */</div><div class='del'>-#define ICH6_REG_GCAP			0x00</div><div class='del'>-#define   ICH6_GCAP_64OK	(1 &lt;&lt; 0)   /* 64bit address support */</div><div class='del'>-#define   ICH6_GCAP_NSDO	(3 &lt;&lt; 1)   /* # of serial data out signals */</div><div class='del'>-#define   ICH6_GCAP_BSS		(31 &lt;&lt; 3)  /* # of bidirectional streams */</div><div class='del'>-#define   ICH6_GCAP_ISS		(15 &lt;&lt; 8)  /* # of input streams */</div><div class='del'>-#define   ICH6_GCAP_OSS		(15 &lt;&lt; 12) /* # of output streams */</div><div class='del'>-#define ICH6_REG_VMIN			0x02</div><div class='del'>-#define ICH6_REG_VMAJ			0x03</div><div class='del'>-#define ICH6_REG_OUTPAY			0x04</div><div class='del'>-#define ICH6_REG_INPAY			0x06</div><div class='del'>-#define ICH6_REG_GCTL			0x08</div><div class='del'>-#define   ICH6_GCTL_RESET	(1 &lt;&lt; 0)   /* controller reset */</div><div class='del'>-#define   ICH6_GCTL_FCNTRL	(1 &lt;&lt; 1)   /* flush control */</div><div class='del'>-#define   ICH6_GCTL_UNSOL	(1 &lt;&lt; 8)   /* accept unsol. response enable */</div><div class='del'>-#define ICH6_REG_WAKEEN			0x0c</div><div class='del'>-#define ICH6_REG_STATESTS		0x0e</div><div class='del'>-#define ICH6_REG_GSTS			0x10</div><div class='del'>-#define   ICH6_GSTS_FSTS	(1 &lt;&lt; 1)   /* flush status */</div><div class='del'>-#define ICH6_REG_INTCTL			0x20</div><div class='del'>-#define ICH6_REG_INTSTS			0x24</div><div class='del'>-#define ICH6_REG_WALLCLK		0x30	/* 24Mhz source */</div><div class='del'>-#define ICH6_REG_SYNC			0x34	</div><div class='del'>-#define ICH6_REG_CORBLBASE		0x40</div><div class='del'>-#define ICH6_REG_CORBUBASE		0x44</div><div class='del'>-#define ICH6_REG_CORBWP			0x48</div><div class='del'>-#define ICH6_REG_CORBRP			0x4a</div><div class='del'>-#define   ICH6_CORBRP_RST	(1 &lt;&lt; 15)  /* read pointer reset */</div><div class='del'>-#define ICH6_REG_CORBCTL		0x4c</div><div class='del'>-#define   ICH6_CORBCTL_RUN	(1 &lt;&lt; 1)   /* enable DMA */</div><div class='del'>-#define   ICH6_CORBCTL_CMEIE	(1 &lt;&lt; 0)   /* enable memory error irq */</div><div class='del'>-#define ICH6_REG_CORBSTS		0x4d</div><div class='del'>-#define   ICH6_CORBSTS_CMEI	(1 &lt;&lt; 0)   /* memory error indication */</div><div class='del'>-#define ICH6_REG_CORBSIZE		0x4e</div><div class='del'>-</div><div class='del'>-#define ICH6_REG_RIRBLBASE		0x50</div><div class='del'>-#define ICH6_REG_RIRBUBASE		0x54</div><div class='del'>-#define ICH6_REG_RIRBWP			0x58</div><div class='del'>-#define   ICH6_RIRBWP_RST	(1 &lt;&lt; 15)  /* write pointer reset */</div><div class='del'>-#define ICH6_REG_RINTCNT		0x5a</div><div class='del'>-#define ICH6_REG_RIRBCTL		0x5c</div><div class='del'>-#define   ICH6_RBCTL_IRQ_EN	(1 &lt;&lt; 0)   /* enable IRQ */</div><div class='del'>-#define   ICH6_RBCTL_DMA_EN	(1 &lt;&lt; 1)   /* enable DMA */</div><div class='del'>-#define   ICH6_RBCTL_OVERRUN_EN	(1 &lt;&lt; 2)   /* enable overrun irq */</div><div class='del'>-#define ICH6_REG_RIRBSTS		0x5d</div><div class='del'>-#define   ICH6_RBSTS_IRQ	(1 &lt;&lt; 0)   /* response irq */</div><div class='del'>-#define   ICH6_RBSTS_OVERRUN	(1 &lt;&lt; 2)   /* overrun irq */</div><div class='del'>-#define ICH6_REG_RIRBSIZE		0x5e</div><div class='del'>-</div><div class='del'>-#define ICH6_REG_IC			0x60</div><div class='del'>-#define ICH6_REG_IR			0x64</div><div class='del'>-#define ICH6_REG_IRS			0x68</div><div class='del'>-#define   ICH6_IRS_VALID	(1&lt;&lt;1)</div><div class='del'>-#define   ICH6_IRS_BUSY		(1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define ICH6_REG_DPLBASE		0x70</div><div class='del'>-#define ICH6_REG_DPUBASE		0x74</div><div class='del'>-#define   ICH6_DPLBASE_ENABLE	0x1	/* Enable position buffer */</div><div class='del'>-</div><div class='del'>-/* SD offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */</div><div class='del'>-enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };</div><div class='del'>-</div><div class='del'>-/* stream register offsets from stream base */</div><div class='del'>-#define ICH6_REG_SD_CTL			0x00</div><div class='del'>-#define ICH6_REG_SD_STS			0x03</div><div class='del'>-#define ICH6_REG_SD_LPIB		0x04</div><div class='del'>-#define ICH6_REG_SD_CBL			0x08</div><div class='del'>-#define ICH6_REG_SD_LVI			0x0c</div><div class='del'>-#define ICH6_REG_SD_FIFOW		0x0e</div><div class='del'>-#define ICH6_REG_SD_FIFOSIZE		0x10</div><div class='del'>-#define ICH6_REG_SD_FORMAT		0x12</div><div class='del'>-#define ICH6_REG_SD_BDLPL		0x18</div><div class='del'>-#define ICH6_REG_SD_BDLPU		0x1c</div><div class='del'>-</div><div class='del'>-/* PCI space */</div><div class='del'>-#define ICH6_PCIREG_TCSEL	0x44</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * other constants</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* max number of SDs */</div><div class='del'>-/* ICH, ATI and VIA have 4 playback and 4 capture */</div><div class='del'>-#define ICH6_NUM_CAPTURE	4</div><div class='del'>-#define ICH6_NUM_PLAYBACK	4</div><div class='del'>-</div><div class='del'>-/* ULI has 6 playback and 5 capture */</div><div class='del'>-#define ULI_NUM_CAPTURE		5</div><div class='del'>-#define ULI_NUM_PLAYBACK	6</div><div class='del'>-</div><div class='del'>-/* ATI HDMI has 1 playback and 0 capture */</div><div class='del'>-#define ATIHDMI_NUM_CAPTURE	0</div><div class='del'>-#define ATIHDMI_NUM_PLAYBACK	1</div><div class='del'>-</div><div class='del'>-/* TERA has 4 playback and 3 capture */</div><div class='del'>-#define TERA_NUM_CAPTURE	3</div><div class='del'>-#define TERA_NUM_PLAYBACK	4</div><div class='del'>-</div><div class='del'>-/* this number is statically defined for simplicity */</div><div class='del'>-#define MAX_AZX_DEV		16</div><div class='del'>-</div><div class='del'>-/* max number of fragments - we may use more if allocating more pages for BDL */</div><div class='del'>-#define BDL_SIZE		4096</div><div class='del'>-#define AZX_MAX_BDL_ENTRIES	(BDL_SIZE / 16)</div><div class='del'>-#define AZX_MAX_FRAG		32</div><div class='del'>-/* max buffer size - no h/w limit, you can increase as you like */</div><div class='del'>-#define AZX_MAX_BUF_SIZE	(1024*1024*1024)</div><div class='del'>-</div><div class='del'>-/* RIRB int mask: overrun[2], response[0] */</div><div class='del'>-#define RIRB_INT_RESPONSE	0x01</div><div class='del'>-#define RIRB_INT_OVERRUN	0x04</div><div class='del'>-#define RIRB_INT_MASK		0x05</div><div class='del'>-</div><div class='del'>-/* STATESTS int mask: S3,SD2,SD1,SD0 */</div><div class='del'>-#define AZX_MAX_CODECS		8</div><div class='del'>-#define AZX_DEFAULT_CODECS	4</div><div class='del'>-#define STATESTS_INT_MASK	((1 &lt;&lt; AZX_MAX_CODECS) - 1)</div><div class='del'>-</div><div class='del'>-/* SD_CTL bits */</div><div class='del'>-#define SD_CTL_STREAM_RESET	0x01	/* stream reset bit */</div><div class='del'>-#define SD_CTL_DMA_START	0x02	/* stream DMA start bit */</div><div class='del'>-#define SD_CTL_STRIPE		(3 &lt;&lt; 16)	/* stripe control */</div><div class='del'>-#define SD_CTL_TRAFFIC_PRIO	(1 &lt;&lt; 18)	/* traffic priority */</div><div class='del'>-#define SD_CTL_DIR		(1 &lt;&lt; 19)	/* bi-directional stream */</div><div class='del'>-#define SD_CTL_STREAM_TAG_MASK	(0xf &lt;&lt; 20)</div><div class='del'>-#define SD_CTL_STREAM_TAG_SHIFT	20</div><div class='del'>-</div><div class='del'>-/* SD_CTL and SD_STS */</div><div class='del'>-#define SD_INT_DESC_ERR		0x10	/* descriptor error interrupt */</div><div class='del'>-#define SD_INT_FIFO_ERR		0x08	/* FIFO error interrupt */</div><div class='del'>-#define SD_INT_COMPLETE		0x04	/* completion interrupt */</div><div class='del'>-#define SD_INT_MASK		(SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\</div><div class='del'>-				 SD_INT_COMPLETE)</div><div class='del'>-</div><div class='del'>-/* SD_STS */</div><div class='del'>-#define SD_STS_FIFO_READY	0x20	/* FIFO ready */</div><div class='del'>-</div><div class='del'>-/* INTCTL and INTSTS */</div><div class='del'>-#define ICH6_INT_ALL_STREAM	0xff	   /* all stream interrupts */</div><div class='del'>-#define ICH6_INT_CTRL_EN	0x40000000 /* controller interrupt enable bit */</div><div class='del'>-#define ICH6_INT_GLOBAL_EN	0x80000000 /* global interrupt enable bit */</div><div class='del'>-</div><div class='del'>-/* below are so far hardcoded - should read registers in future */</div><div class='del'>-#define ICH6_MAX_CORB_ENTRIES	256</div><div class='del'>-#define ICH6_MAX_RIRB_ENTRIES	256</div><div class='del'>-</div><div class='del'>-/* position fix mode */</div><div class='del'>-enum {</div><div class='del'>-	POS_FIX_AUTO,</div><div class='del'>-	POS_FIX_LPIB,</div><div class='del'>-	POS_FIX_POSBUF,</div><div class='del'>-	POS_FIX_VIACOMBO,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Defines for ATI HD Audio support in SB450 south bridge */</div><div class='del'>-#define ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR   0x42</div><div class='del'>-#define ATI_SB450_HDAUDIO_ENABLE_SNOOP      0x02</div><div class='del'>-</div><div class='del'>-/* Defines for Nvidia HDA support */</div><div class='del'>-#define NVIDIA_HDA_TRANSREG_ADDR      0x4e</div><div class='del'>-#define NVIDIA_HDA_ENABLE_COHBITS     0x0f</div><div class='del'>-#define NVIDIA_HDA_ISTRM_COH          0x4d</div><div class='del'>-#define NVIDIA_HDA_OSTRM_COH          0x4c</div><div class='del'>-#define NVIDIA_HDA_ENABLE_COHBIT      0x01</div><div class='del'>-</div><div class='del'>-/* Defines for Intel SCH HDA snoop control */</div><div class='del'>-#define INTEL_SCH_HDA_DEVC      0x78</div><div class='del'>-#define INTEL_SCH_HDA_DEVC_NOSNOOP       (0x1&lt;&lt;11)</div><div class='del'>-</div><div class='del'>-/* Define IN stream 0 FIFO size offset in VIA controller */</div><div class='del'>-#define VIA_IN_STREAM0_FIFO_SIZE_OFFSET	0x90</div><div class='del'>-/* Define VIA HD Audio Device ID*/</div><div class='del'>-#define VIA_HDAC_DEVICE_ID		0x3288</div><div class='del'>-</div><div class='del'>-/* HD Audio class code */</div><div class='del'>-#define PCI_CLASS_MULTIMEDIA_HD_AUDIO	0x0403</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct azx_dev {</div><div class='del'>-	struct snd_dma_buffer bdl; /* BDL buffer */</div><div class='del'>-	u32 *posbuf;		/* position buffer pointer */</div><div class='del'>-</div><div class='del'>-	unsigned int bufsize;	/* size of the play buffer in bytes */</div><div class='del'>-	unsigned int period_bytes; /* size of the period in bytes */</div><div class='del'>-	unsigned int frags;	/* number for period in the play buffer */</div><div class='del'>-	unsigned int fifo_size;	/* FIFO size */</div><div class='del'>-	unsigned long start_wallclk;	/* start + minimum wallclk */</div><div class='del'>-	unsigned long period_wallclk;	/* wallclk for period */</div><div class='del'>-</div><div class='del'>-	void __iomem *sd_addr;	/* stream descriptor pointer */</div><div class='del'>-</div><div class='del'>-	u32 sd_int_sta_mask;	/* stream int status mask */</div><div class='del'>-</div><div class='del'>-	/* pcm support */</div><div class='del'>-	struct snd_pcm_substream *substream;	/* assigned substream,</div><div class='del'>-						 * set in PCM open</div><div class='del'>-						 */</div><div class='del'>-	unsigned int format_val;	/* format value to be set in the</div><div class='del'>-					 * controller and the codec</div><div class='del'>-					 */</div><div class='del'>-	unsigned char stream_tag;	/* assigned stream */</div><div class='del'>-	unsigned char index;		/* stream index */</div><div class='del'>-	int device;			/* last device number assigned to */</div><div class='del'>-</div><div class='del'>-	unsigned int opened :1;</div><div class='del'>-	unsigned int running :1;</div><div class='del'>-	unsigned int irq_pending :1;</div><div class='del'>-	/*</div><div class='del'>-	 * For VIA:</div><div class='del'>-	 *  A flag to ensure DMA position is 0</div><div class='del'>-	 *  when link position is not greater than FIFO size</div><div class='del'>-	 */</div><div class='del'>-	unsigned int insufficient :1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORB/RIRB */</div><div class='del'>-struct azx_rb {</div><div class='del'>-	u32 *buf;		/* CORB/RIRB buffer</div><div class='del'>-				 * Each CORB entry is 4byte, RIRB is 8byte</div><div class='del'>-				 */</div><div class='del'>-	dma_addr_t addr;	/* physical address of CORB/RIRB buffer */</div><div class='del'>-	/* for RIRB */</div><div class='del'>-	unsigned short rp, wp;	/* read/write pointers */</div><div class='del'>-	int cmds[AZX_MAX_CODECS];	/* number of pending requests */</div><div class='del'>-	u32 res[AZX_MAX_CODECS];	/* last read value */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct azx {</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct pci_dev *pci;</div><div class='del'>-	int dev_index;</div><div class='del'>-</div><div class='del'>-	/* chip type specific */</div><div class='del'>-	int driver_type;</div><div class='del'>-	int playback_streams;</div><div class='del'>-	int playback_index_offset;</div><div class='del'>-	int capture_streams;</div><div class='del'>-	int capture_index_offset;</div><div class='del'>-	int num_streams;</div><div class='del'>-</div><div class='del'>-	/* pci resources */</div><div class='del'>-	unsigned long addr;</div><div class='del'>-	void __iomem *remap_addr;</div><div class='del'>-	int irq;</div><div class='del'>-</div><div class='del'>-	/* locks */</div><div class='del'>-	spinlock_t reg_lock;</div><div class='del'>-	struct mutex open_mutex;</div><div class='del'>-</div><div class='del'>-	/* streams (x num_streams) */</div><div class='del'>-	struct azx_dev *azx_dev;</div><div class='del'>-</div><div class='del'>-	/* PCM */</div><div class='del'>-	struct snd_pcm *pcm[HDA_MAX_PCMS];</div><div class='del'>-</div><div class='del'>-	/* HD codec */</div><div class='del'>-	unsigned short codec_mask;</div><div class='del'>-	int  codec_probe_mask; /* copied from probe_mask option */</div><div class='del'>-	struct hda_bus *bus;</div><div class='del'>-	unsigned int beep_mode;</div><div class='del'>-</div><div class='del'>-	/* CORB/RIRB */</div><div class='del'>-	struct azx_rb corb;</div><div class='del'>-	struct azx_rb rirb;</div><div class='del'>-</div><div class='del'>-	/* CORB/RIRB and position buffers */</div><div class='del'>-	struct snd_dma_buffer rb;</div><div class='del'>-	struct snd_dma_buffer posbuf;</div><div class='del'>-</div><div class='del'>-	/* flags */</div><div class='del'>-	int position_fix[2]; /* for both playback/capture streams */</div><div class='del'>-	int poll_count;</div><div class='del'>-	unsigned int running :1;</div><div class='del'>-	unsigned int initialized :1;</div><div class='del'>-	unsigned int single_cmd :1;</div><div class='del'>-	unsigned int polling_mode :1;</div><div class='del'>-	unsigned int msi :1;</div><div class='del'>-	unsigned int irq_pending_warned :1;</div><div class='del'>-	unsigned int probing :1; /* codec probing phase */</div><div class='del'>-</div><div class='del'>-	/* for debugging */</div><div class='del'>-	unsigned int last_cmd[AZX_MAX_CODECS];</div><div class='del'>-</div><div class='del'>-	/* for pending irqs */</div><div class='del'>-	struct work_struct irq_pending_work;</div><div class='del'>-</div><div class='del'>-	/* reboot notifier (for mysterious hangup problem at power-down) */</div><div class='del'>-	struct notifier_block reboot_notifier;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* driver types */</div><div class='del'>-enum {</div><div class='del'>-	AZX_DRIVER_ICH,</div><div class='del'>-	AZX_DRIVER_PCH,</div><div class='del'>-	AZX_DRIVER_SCH,</div><div class='del'>-	AZX_DRIVER_ATI,</div><div class='del'>-	AZX_DRIVER_ATIHDMI,</div><div class='del'>-	AZX_DRIVER_VIA,</div><div class='del'>-	AZX_DRIVER_SIS,</div><div class='del'>-	AZX_DRIVER_ULI,</div><div class='del'>-	AZX_DRIVER_NVIDIA,</div><div class='del'>-	AZX_DRIVER_TERA,</div><div class='del'>-	AZX_DRIVER_CTX,</div><div class='del'>-	AZX_DRIVER_GENERIC,</div><div class='del'>-	AZX_NUM_DRIVERS, /* keep this as last entry */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *driver_short_names[] __devinitdata = {</div><div class='del'>-	[AZX_DRIVER_ICH] = "HDA Intel",</div><div class='del'>-	[AZX_DRIVER_PCH] = "HDA Intel PCH",</div><div class='del'>-	[AZX_DRIVER_SCH] = "HDA Intel MID",</div><div class='del'>-	[AZX_DRIVER_ATI] = "HDA ATI SB",</div><div class='del'>-	[AZX_DRIVER_ATIHDMI] = "HDA ATI HDMI",</div><div class='del'>-	[AZX_DRIVER_VIA] = "HDA VIA VT82xx",</div><div class='del'>-	[AZX_DRIVER_SIS] = "HDA SIS966",</div><div class='del'>-	[AZX_DRIVER_ULI] = "HDA ULI M5461",</div><div class='del'>-	[AZX_DRIVER_NVIDIA] = "HDA NVidia",</div><div class='del'>-	[AZX_DRIVER_TERA] = "HDA Teradici", </div><div class='del'>-	[AZX_DRIVER_CTX] = "HDA Creative", </div><div class='del'>-	[AZX_DRIVER_GENERIC] = "HD-Audio Generic",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * macros for easy use</div><div class='del'>- */</div><div class='del'>-#define azx_writel(chip,reg,value) \</div><div class='del'>-	writel(value, (chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_readl(chip,reg) \</div><div class='del'>-	readl((chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_writew(chip,reg,value) \</div><div class='del'>-	writew(value, (chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_readw(chip,reg) \</div><div class='del'>-	readw((chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_writeb(chip,reg,value) \</div><div class='del'>-	writeb(value, (chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_readb(chip,reg) \</div><div class='del'>-	readb((chip)-&gt;remap_addr + ICH6_REG_##reg)</div><div class='del'>-</div><div class='del'>-#define azx_sd_writel(dev,reg,value) \</div><div class='del'>-	writel(value, (dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_sd_readl(dev,reg) \</div><div class='del'>-	readl((dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_sd_writew(dev,reg,value) \</div><div class='del'>-	writew(value, (dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_sd_readw(dev,reg) \</div><div class='del'>-	readw((dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_sd_writeb(dev,reg,value) \</div><div class='del'>-	writeb(value, (dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-#define azx_sd_readb(dev,reg) \</div><div class='del'>-	readb((dev)-&gt;sd_addr + ICH6_REG_##reg)</div><div class='del'>-</div><div class='del'>-/* for pcm support */</div><div class='del'>-#define get_azx_dev(substream) (substream-&gt;runtime-&gt;private_data)</div><div class='del'>-</div><div class='del'>-static int azx_acquire_irq(struct azx *chip, int do_disconnect);</div><div class='del'>-static int azx_send_cmd(struct hda_bus *bus, unsigned int val);</div><div class='del'>-/*</div><div class='del'>- * Interface for HD codec</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CORB / RIRB interface</div><div class='del'>- */</div><div class='del'>-static int azx_alloc_cmd_io(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* single page (at least 4096 bytes) must suffice for both ringbuffes */</div><div class='del'>-	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-				  snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-				  PAGE_SIZE, &amp;chip-&gt;rb);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "cannot allocate CORB/RIRB\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void azx_init_cmd_io(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	/* CORB set up */</div><div class='del'>-	chip-&gt;corb.addr = chip-&gt;rb.addr;</div><div class='del'>-	chip-&gt;corb.buf = (u32 *)chip-&gt;rb.area;</div><div class='del'>-	azx_writel(chip, CORBLBASE, (u32)chip-&gt;corb.addr);</div><div class='del'>-	azx_writel(chip, CORBUBASE, upper_32_bits(chip-&gt;corb.addr));</div><div class='del'>-</div><div class='del'>-	/* set the corb size to 256 entries (ULI requires explicitly) */</div><div class='del'>-	azx_writeb(chip, CORBSIZE, 0x02);</div><div class='del'>-	/* set the corb write pointer to 0 */</div><div class='del'>-	azx_writew(chip, CORBWP, 0);</div><div class='del'>-	/* reset the corb hw read pointer */</div><div class='del'>-	azx_writew(chip, CORBRP, ICH6_CORBRP_RST);</div><div class='del'>-	/* enable corb dma */</div><div class='del'>-	azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN);</div><div class='del'>-</div><div class='del'>-	/* RIRB set up */</div><div class='del'>-	chip-&gt;rirb.addr = chip-&gt;rb.addr + 2048;</div><div class='del'>-	chip-&gt;rirb.buf = (u32 *)(chip-&gt;rb.area + 2048);</div><div class='del'>-	chip-&gt;rirb.wp = chip-&gt;rirb.rp = 0;</div><div class='del'>-	memset(chip-&gt;rirb.cmds, 0, sizeof(chip-&gt;rirb.cmds));</div><div class='del'>-	azx_writel(chip, RIRBLBASE, (u32)chip-&gt;rirb.addr);</div><div class='del'>-	azx_writel(chip, RIRBUBASE, upper_32_bits(chip-&gt;rirb.addr));</div><div class='del'>-</div><div class='del'>-	/* set the rirb size to 256 entries (ULI requires explicitly) */</div><div class='del'>-	azx_writeb(chip, RIRBSIZE, 0x02);</div><div class='del'>-	/* reset the rirb hw write pointer */</div><div class='del'>-	azx_writew(chip, RIRBWP, ICH6_RIRBWP_RST);</div><div class='del'>-	/* set N=1, get RIRB response interrupt for new entry */</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_CTX)</div><div class='del'>-		azx_writew(chip, RINTCNT, 0xc0);</div><div class='del'>-	else</div><div class='del'>-		azx_writew(chip, RINTCNT, 1);</div><div class='del'>-	/* enable rirb dma and response irq */</div><div class='del'>-	azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void azx_free_cmd_io(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	/* disable ringbuffer DMAs */</div><div class='del'>-	azx_writeb(chip, RIRBCTL, 0);</div><div class='del'>-	azx_writeb(chip, CORBCTL, 0);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int azx_command_addr(u32 cmd)</div><div class='del'>-{</div><div class='del'>-	unsigned int addr = cmd &gt;&gt; 28;</div><div class='del'>-</div><div class='del'>-	if (addr &gt;= AZX_MAX_CODECS) {</div><div class='del'>-		snd_BUG();</div><div class='del'>-		addr = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int azx_response_addr(u32 res)</div><div class='del'>-{</div><div class='del'>-	unsigned int addr = res &amp; 0xf;</div><div class='del'>-</div><div class='del'>-	if (addr &gt;= AZX_MAX_CODECS) {</div><div class='del'>-		snd_BUG();</div><div class='del'>-		addr = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* send a command */</div><div class='del'>-static int azx_corb_send_cmd(struct hda_bus *bus, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	unsigned int addr = azx_command_addr(val);</div><div class='del'>-	unsigned int wp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	/* add command to corb */</div><div class='del'>-	wp = azx_readb(chip, CORBWP);</div><div class='del'>-	wp++;</div><div class='del'>-	wp %= ICH6_MAX_CORB_ENTRIES;</div><div class='del'>-</div><div class='del'>-	chip-&gt;rirb.cmds[addr]++;</div><div class='del'>-	chip-&gt;corb.buf[wp] = cpu_to_le32(val);</div><div class='del'>-	azx_writel(chip, CORBWP, wp);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ICH6_RIRB_EX_UNSOL_EV	(1&lt;&lt;4)</div><div class='del'>-</div><div class='del'>-/* retrieve RIRB entry - called from interrupt handler */</div><div class='del'>-static void azx_update_rirb(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	unsigned int rp, wp;</div><div class='del'>-	unsigned int addr;</div><div class='del'>-	u32 res, res_ex;</div><div class='del'>-</div><div class='del'>-	wp = azx_readb(chip, RIRBWP);</div><div class='del'>-	if (wp == chip-&gt;rirb.wp)</div><div class='del'>-		return;</div><div class='del'>-	chip-&gt;rirb.wp = wp;</div><div class='del'>-</div><div class='del'>-	while (chip-&gt;rirb.rp != wp) {</div><div class='del'>-		chip-&gt;rirb.rp++;</div><div class='del'>-		chip-&gt;rirb.rp %= ICH6_MAX_RIRB_ENTRIES;</div><div class='del'>-</div><div class='del'>-		rp = chip-&gt;rirb.rp &lt;&lt; 1; /* an RIRB entry is 8-bytes */</div><div class='del'>-		res_ex = le32_to_cpu(chip-&gt;rirb.buf[rp + 1]);</div><div class='del'>-		res = le32_to_cpu(chip-&gt;rirb.buf[rp]);</div><div class='del'>-		addr = azx_response_addr(res_ex);</div><div class='del'>-		if (res_ex &amp; ICH6_RIRB_EX_UNSOL_EV)</div><div class='del'>-			snd_hda_queue_unsol_event(chip-&gt;bus, res, res_ex);</div><div class='del'>-		else if (chip-&gt;rirb.cmds[addr]) {</div><div class='del'>-			chip-&gt;rirb.res[addr] = res;</div><div class='del'>-			smp_wmb();</div><div class='del'>-			chip-&gt;rirb.cmds[addr]--;</div><div class='del'>-		} else</div><div class='del'>-			snd_printk(KERN_ERR SFX "spurious response %#x:%#x, "</div><div class='del'>-				   "last cmd=%#08x\n",</div><div class='del'>-				   res, res_ex,</div><div class='del'>-				   chip-&gt;last_cmd[addr]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* receive a response */</div><div class='del'>-static unsigned int azx_rirb_get_response(struct hda_bus *bus,</div><div class='del'>-					  unsigned int addr)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-	int do_poll = 0;</div><div class='del'>-</div><div class='del'>- again:</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(1000);</div><div class='del'>-	for (;;) {</div><div class='del'>-		if (chip-&gt;polling_mode || do_poll) {</div><div class='del'>-			spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-			azx_update_rirb(chip);</div><div class='del'>-			spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-		}</div><div class='del'>-		if (!chip-&gt;rirb.cmds[addr]) {</div><div class='del'>-			smp_rmb();</div><div class='del'>-			bus-&gt;rirb_error = 0;</div><div class='del'>-</div><div class='del'>-			if (!do_poll)</div><div class='del'>-				chip-&gt;poll_count = 0;</div><div class='del'>-			return chip-&gt;rirb.res[addr]; /* the last value */</div><div class='del'>-		}</div><div class='del'>-		if (time_after(jiffies, timeout))</div><div class='del'>-			break;</div><div class='del'>-		if (bus-&gt;needs_damn_long_delay)</div><div class='del'>-			msleep(2); /* temporary workaround */</div><div class='del'>-		else {</div><div class='del'>-			udelay(10);</div><div class='del'>-			cond_resched();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!chip-&gt;polling_mode &amp;&amp; chip-&gt;poll_count &lt; 2) {</div><div class='del'>-		snd_printdd(SFX "azx_get_response timeout, "</div><div class='del'>-			   "polling the codec once: last cmd=0x%08x\n",</div><div class='del'>-			   chip-&gt;last_cmd[addr]);</div><div class='del'>-		do_poll = 1;</div><div class='del'>-		chip-&gt;poll_count++;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!chip-&gt;polling_mode) {</div><div class='del'>-		snd_printk(KERN_WARNING SFX "azx_get_response timeout, "</div><div class='del'>-			   "switching to polling mode: last cmd=0x%08x\n",</div><div class='del'>-			   chip-&gt;last_cmd[addr]);</div><div class='del'>-		chip-&gt;polling_mode = 1;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;msi) {</div><div class='del'>-		snd_printk(KERN_WARNING SFX "No response from codec, "</div><div class='del'>-			   "disabling MSI: last cmd=0x%08x\n",</div><div class='del'>-			   chip-&gt;last_cmd[addr]);</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-		chip-&gt;irq = -1;</div><div class='del'>-		pci_disable_msi(chip-&gt;pci);</div><div class='del'>-		chip-&gt;msi = 0;</div><div class='del'>-		if (azx_acquire_irq(chip, 1) &lt; 0) {</div><div class='del'>-			bus-&gt;rirb_error = 1;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;probing) {</div><div class='del'>-		/* If this critical timeout happens during the codec probing</div><div class='del'>-		 * phase, this is likely an access to a non-existing codec</div><div class='del'>-		 * slot.  Better to return an error and reset the system.</div><div class='del'>-		 */</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* a fatal communication error; need either to reset or to fallback</div><div class='del'>-	 * to the single_cmd mode</div><div class='del'>-	 */</div><div class='del'>-	bus-&gt;rirb_error = 1;</div><div class='del'>-	if (bus-&gt;allow_bus_reset &amp;&amp; !bus-&gt;response_reset &amp;&amp; !bus-&gt;in_reset) {</div><div class='del'>-		bus-&gt;response_reset = 1;</div><div class='del'>-		return -1; /* give a chance to retry */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, "</div><div class='del'>-		   "switching to single_cmd mode: last cmd=0x%08x\n",</div><div class='del'>-		   chip-&gt;last_cmd[addr]);</div><div class='del'>-	chip-&gt;single_cmd = 1;</div><div class='del'>-	bus-&gt;response_reset = 0;</div><div class='del'>-	/* release CORB/RIRB */</div><div class='del'>-	azx_free_cmd_io(chip);</div><div class='del'>-	/* disable unsolicited responses */</div><div class='del'>-	azx_writel(chip, GCTL, azx_readl(chip, GCTL) &amp; ~ICH6_GCTL_UNSOL);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Use the single immediate command instead of CORB/RIRB for simplicity</div><div class='del'>- *</div><div class='del'>- * Note: according to Intel, this is not preferred use.  The command was</div><div class='del'>- *       intended for the BIOS only, and may get confused with unsolicited</div><div class='del'>- *       responses.  So, we shouldn't use it for normal operation from the</div><div class='del'>- *       driver.</div><div class='del'>- *       I left the codes, however, for debugging/testing purposes.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* receive a response */</div><div class='del'>-static int azx_single_wait_for_response(struct azx *chip, unsigned int addr)</div><div class='del'>-{</div><div class='del'>-	int timeout = 50;</div><div class='del'>-</div><div class='del'>-	while (timeout--) {</div><div class='del'>-		/* check IRV busy bit */</div><div class='del'>-		if (azx_readw(chip, IRS) &amp; ICH6_IRS_VALID) {</div><div class='del'>-			/* reuse rirb.res as the response return value */</div><div class='del'>-			chip-&gt;rirb.res[addr] = azx_readl(chip, IR);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (printk_ratelimit())</div><div class='del'>-		snd_printd(SFX "get_response timeout: IRS=0x%x\n",</div><div class='del'>-			   azx_readw(chip, IRS));</div><div class='del'>-	chip-&gt;rirb.res[addr] = -1;</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* send a command */</div><div class='del'>-static int azx_single_send_cmd(struct hda_bus *bus, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	unsigned int addr = azx_command_addr(val);</div><div class='del'>-	int timeout = 50;</div><div class='del'>-</div><div class='del'>-	bus-&gt;rirb_error = 0;</div><div class='del'>-	while (timeout--) {</div><div class='del'>-		/* check ICB busy bit */</div><div class='del'>-		if (!((azx_readw(chip, IRS) &amp; ICH6_IRS_BUSY))) {</div><div class='del'>-			/* Clear IRV valid bit */</div><div class='del'>-			azx_writew(chip, IRS, azx_readw(chip, IRS) |</div><div class='del'>-				   ICH6_IRS_VALID);</div><div class='del'>-			azx_writel(chip, IC, val);</div><div class='del'>-			azx_writew(chip, IRS, azx_readw(chip, IRS) |</div><div class='del'>-				   ICH6_IRS_BUSY);</div><div class='del'>-			return azx_single_wait_for_response(chip, addr);</div><div class='del'>-		}</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (printk_ratelimit())</div><div class='del'>-		snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n",</div><div class='del'>-			   azx_readw(chip, IRS), val);</div><div class='del'>-	return -EIO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* receive a response */</div><div class='del'>-static unsigned int azx_single_get_response(struct hda_bus *bus,</div><div class='del'>-					    unsigned int addr)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	return chip-&gt;rirb.res[addr];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The below are the main callbacks from hda_codec.</div><div class='del'>- *</div><div class='del'>- * They are just the skeleton to call sub-callbacks according to the</div><div class='del'>- * current setting of chip-&gt;single_cmd.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* send a command */</div><div class='del'>-static int azx_send_cmd(struct hda_bus *bus, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	chip-&gt;last_cmd[azx_command_addr(val)] = val;</div><div class='del'>-	if (chip-&gt;single_cmd)</div><div class='del'>-		return azx_single_send_cmd(bus, val);</div><div class='del'>-	else</div><div class='del'>-		return azx_corb_send_cmd(bus, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get a response */</div><div class='del'>-static unsigned int azx_get_response(struct hda_bus *bus,</div><div class='del'>-				     unsigned int addr)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	if (chip-&gt;single_cmd)</div><div class='del'>-		return azx_single_get_response(bus, addr);</div><div class='del'>-	else</div><div class='del'>-		return azx_rirb_get_response(bus, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static void azx_power_notify(struct hda_bus *bus);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* reset codec link */</div><div class='del'>-static int azx_reset(struct azx *chip, int full_reset)</div><div class='del'>-{</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	if (!full_reset)</div><div class='del'>-		goto __skip;</div><div class='del'>-</div><div class='del'>-	/* clear STATESTS */</div><div class='del'>-	azx_writeb(chip, STATESTS, STATESTS_INT_MASK);</div><div class='del'>-</div><div class='del'>-	/* reset controller */</div><div class='del'>-	azx_writel(chip, GCTL, azx_readl(chip, GCTL) &amp; ~ICH6_GCTL_RESET);</div><div class='del'>-</div><div class='del'>-	count = 50;</div><div class='del'>-	while (azx_readb(chip, GCTL) &amp;&amp; --count)</div><div class='del'>-		msleep(1);</div><div class='del'>-</div><div class='del'>-	/* delay for &gt;= 100us for codec PLL to settle per spec</div><div class='del'>-	 * Rev 0.9 section 5.5.1</div><div class='del'>-	 */</div><div class='del'>-	msleep(1);</div><div class='del'>-</div><div class='del'>-	/* Bring controller out of reset */</div><div class='del'>-	azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | ICH6_GCTL_RESET);</div><div class='del'>-</div><div class='del'>-	count = 50;</div><div class='del'>-	while (!azx_readb(chip, GCTL) &amp;&amp; --count)</div><div class='del'>-		msleep(1);</div><div class='del'>-</div><div class='del'>-	/* Brent Chartrand said to wait &gt;= 540us for codecs to initialize */</div><div class='del'>-	msleep(1);</div><div class='del'>-</div><div class='del'>-      __skip:</div><div class='del'>-	/* check to see if controller is ready */</div><div class='del'>-	if (!azx_readb(chip, GCTL)) {</div><div class='del'>-		snd_printd(SFX "azx_reset: controller not ready!\n");</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Accept unsolicited responses */</div><div class='del'>-	if (!chip-&gt;single_cmd)</div><div class='del'>-		azx_writel(chip, GCTL, azx_readl(chip, GCTL) |</div><div class='del'>-			   ICH6_GCTL_UNSOL);</div><div class='del'>-</div><div class='del'>-	/* detect codecs */</div><div class='del'>-	if (!chip-&gt;codec_mask) {</div><div class='del'>-		chip-&gt;codec_mask = azx_readw(chip, STATESTS);</div><div class='del'>-		snd_printdd(SFX "codec_mask = 0x%x\n", chip-&gt;codec_mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lowlevel interface</div><div class='del'>- */  </div><div class='del'>-</div><div class='del'>-/* enable interrupts */</div><div class='del'>-static void azx_int_enable(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	/* enable controller CIE and GIE */</div><div class='del'>-	azx_writel(chip, INTCTL, azx_readl(chip, INTCTL) |</div><div class='del'>-		   ICH6_INT_CTRL_EN | ICH6_INT_GLOBAL_EN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* disable interrupts */</div><div class='del'>-static void azx_int_disable(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* disable interrupts in stream descriptor */</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-		struct azx_dev *azx_dev = &amp;chip-&gt;azx_dev[i];</div><div class='del'>-		azx_sd_writeb(azx_dev, SD_CTL,</div><div class='del'>-			      azx_sd_readb(azx_dev, SD_CTL) &amp; ~SD_INT_MASK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable SIE for all streams */</div><div class='del'>-	azx_writeb(chip, INTCTL, 0);</div><div class='del'>-</div><div class='del'>-	/* disable controller CIE and GIE */</div><div class='del'>-	azx_writel(chip, INTCTL, azx_readl(chip, INTCTL) &amp;</div><div class='del'>-		   ~(ICH6_INT_CTRL_EN | ICH6_INT_GLOBAL_EN));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clear interrupts */</div><div class='del'>-static void azx_int_clear(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* clear stream status */</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-		struct azx_dev *azx_dev = &amp;chip-&gt;azx_dev[i];</div><div class='del'>-		azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* clear STATESTS */</div><div class='del'>-	azx_writeb(chip, STATESTS, STATESTS_INT_MASK);</div><div class='del'>-</div><div class='del'>-	/* clear rirb status */</div><div class='del'>-	azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);</div><div class='del'>-</div><div class='del'>-	/* clear int status */</div><div class='del'>-	azx_writel(chip, INTSTS, ICH6_INT_CTRL_EN | ICH6_INT_ALL_STREAM);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* start a stream */</div><div class='del'>-static void azx_stream_start(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Before stream start, initialize parameter</div><div class='del'>-	 */</div><div class='del'>-	azx_dev-&gt;insufficient = 1;</div><div class='del'>-</div><div class='del'>-	/* enable SIE */</div><div class='del'>-	azx_writel(chip, INTCTL,</div><div class='del'>-		   azx_readl(chip, INTCTL) | (1 &lt;&lt; azx_dev-&gt;index));</div><div class='del'>-	/* set DMA start and interrupt mask */</div><div class='del'>-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |</div><div class='del'>-		      SD_CTL_DMA_START | SD_INT_MASK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stop DMA */</div><div class='del'>-static void azx_stream_clear(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &amp;</div><div class='del'>-		      ~(SD_CTL_DMA_START | SD_INT_MASK));</div><div class='del'>-	azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stop a stream */</div><div class='del'>-static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	azx_stream_clear(chip, azx_dev);</div><div class='del'>-	/* disable SIE */</div><div class='del'>-	azx_writel(chip, INTCTL,</div><div class='del'>-		   azx_readl(chip, INTCTL) &amp; ~(1 &lt;&lt; azx_dev-&gt;index));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reset and start the controller registers</div><div class='del'>- */</div><div class='del'>-static void azx_init_chip(struct azx *chip, int full_reset)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;initialized)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* reset controller */</div><div class='del'>-	azx_reset(chip, full_reset);</div><div class='del'>-</div><div class='del'>-	/* initialize interrupts */</div><div class='del'>-	azx_int_clear(chip);</div><div class='del'>-	azx_int_enable(chip);</div><div class='del'>-</div><div class='del'>-	/* initialize the codec command I/O */</div><div class='del'>-	if (!chip-&gt;single_cmd)</div><div class='del'>-		azx_init_cmd_io(chip);</div><div class='del'>-</div><div class='del'>-	/* program the position buffer */</div><div class='del'>-	azx_writel(chip, DPLBASE, (u32)chip-&gt;posbuf.addr);</div><div class='del'>-	azx_writel(chip, DPUBASE, upper_32_bits(chip-&gt;posbuf.addr));</div><div class='del'>-</div><div class='del'>-	chip-&gt;initialized = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize the PCI registers</div><div class='del'>- */</div><div class='del'>-/* update bits in a PCI register byte */</div><div class='del'>-static void update_pci_byte(struct pci_dev *pci, unsigned int reg,</div><div class='del'>-			    unsigned char mask, unsigned char val)</div><div class='del'>-{</div><div class='del'>-	unsigned char data;</div><div class='del'>-</div><div class='del'>-	pci_read_config_byte(pci, reg, &amp;data);</div><div class='del'>-	data &amp;= ~mask;</div><div class='del'>-	data |= (val &amp; mask);</div><div class='del'>-	pci_write_config_byte(pci, reg, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void azx_init_pci(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	unsigned short snoop;</div><div class='del'>-</div><div class='del'>-	/* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)</div><div class='del'>-	 * TCSEL == Traffic Class Select Register, which sets PCI express QOS</div><div class='del'>-	 * Ensuring these bits are 0 clears playback static on some HD Audio</div><div class='del'>-	 * codecs</div><div class='del'>-	 */</div><div class='del'>-	update_pci_byte(chip-&gt;pci, ICH6_PCIREG_TCSEL, 0x07, 0);</div><div class='del'>-</div><div class='del'>-	switch (chip-&gt;driver_type) {</div><div class='del'>-	case AZX_DRIVER_ATI:</div><div class='del'>-		/* For ATI SB450 azalia HD audio, we need to enable snoop */</div><div class='del'>-		update_pci_byte(chip-&gt;pci,</div><div class='del'>-				ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, </div><div class='del'>-				0x07, ATI_SB450_HDAUDIO_ENABLE_SNOOP);</div><div class='del'>-		break;</div><div class='del'>-	case AZX_DRIVER_NVIDIA:</div><div class='del'>-		/* For NVIDIA HDA, enable snoop */</div><div class='del'>-		update_pci_byte(chip-&gt;pci,</div><div class='del'>-				NVIDIA_HDA_TRANSREG_ADDR,</div><div class='del'>-				0x0f, NVIDIA_HDA_ENABLE_COHBITS);</div><div class='del'>-		update_pci_byte(chip-&gt;pci,</div><div class='del'>-				NVIDIA_HDA_ISTRM_COH,</div><div class='del'>-				0x01, NVIDIA_HDA_ENABLE_COHBIT);</div><div class='del'>-		update_pci_byte(chip-&gt;pci,</div><div class='del'>-				NVIDIA_HDA_OSTRM_COH,</div><div class='del'>-				0x01, NVIDIA_HDA_ENABLE_COHBIT);</div><div class='del'>-		break;</div><div class='del'>-	case AZX_DRIVER_SCH:</div><div class='del'>-	case AZX_DRIVER_PCH:</div><div class='del'>-		pci_read_config_word(chip-&gt;pci, INTEL_SCH_HDA_DEVC, &amp;snoop);</div><div class='del'>-		if (snoop &amp; INTEL_SCH_HDA_DEVC_NOSNOOP) {</div><div class='del'>-			pci_write_config_word(chip-&gt;pci, INTEL_SCH_HDA_DEVC,</div><div class='del'>-				snoop &amp; (~INTEL_SCH_HDA_DEVC_NOSNOOP));</div><div class='del'>-			pci_read_config_word(chip-&gt;pci,</div><div class='del'>-				INTEL_SCH_HDA_DEVC, &amp;snoop);</div><div class='del'>-			snd_printdd(SFX "HDA snoop disabled, enabling ... %s\n",</div><div class='del'>-				(snoop &amp; INTEL_SCH_HDA_DEVC_NOSNOOP)</div><div class='del'>-				? "Failed" : "OK");</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * interrupt handler</div><div class='del'>- */</div><div class='del'>-static irqreturn_t azx_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = dev_id;</div><div class='del'>-	struct azx_dev *azx_dev;</div><div class='del'>-	u32 status;</div><div class='del'>-	u8 sd_status;</div><div class='del'>-	int i, ok;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	status = azx_readl(chip, INTSTS);</div><div class='del'>-	if (status == 0) {</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-		azx_dev = &amp;chip-&gt;azx_dev[i];</div><div class='del'>-		if (status &amp; azx_dev-&gt;sd_int_sta_mask) {</div><div class='del'>-			sd_status = azx_sd_readb(azx_dev, SD_STS);</div><div class='del'>-			azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);</div><div class='del'>-			if (!azx_dev-&gt;substream || !azx_dev-&gt;running ||</div><div class='del'>-			    !(sd_status &amp; SD_INT_COMPLETE))</div><div class='del'>-				continue;</div><div class='del'>-			/* check whether this IRQ is really acceptable */</div><div class='del'>-			ok = azx_position_ok(chip, azx_dev);</div><div class='del'>-			if (ok == 1) {</div><div class='del'>-				azx_dev-&gt;irq_pending = 0;</div><div class='del'>-				spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-				snd_pcm_period_elapsed(azx_dev-&gt;substream);</div><div class='del'>-				spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-			} else if (ok == 0 &amp;&amp; chip-&gt;bus &amp;&amp; chip-&gt;bus-&gt;workq) {</div><div class='del'>-				/* bogus IRQ, process it later */</div><div class='del'>-				azx_dev-&gt;irq_pending = 1;</div><div class='del'>-				queue_work(chip-&gt;bus-&gt;workq,</div><div class='del'>-					   &amp;chip-&gt;irq_pending_work);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* clear rirb int */</div><div class='del'>-	status = azx_readb(chip, RIRBSTS);</div><div class='del'>-	if (status &amp; RIRB_INT_MASK) {</div><div class='del'>-		if (status &amp; RIRB_INT_RESPONSE) {</div><div class='del'>-			if (chip-&gt;driver_type == AZX_DRIVER_CTX)</div><div class='del'>-				udelay(80);</div><div class='del'>-			azx_update_rirb(chip);</div><div class='del'>-		}</div><div class='del'>-		azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* clear state status int */</div><div class='del'>-	if (azx_readb(chip, STATESTS) &amp; 0x04)</div><div class='del'>-		azx_writeb(chip, STATESTS, 0x04);</div><div class='del'>-#endif</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set up a BDL entry</div><div class='del'>- */</div><div class='del'>-static int setup_bdle(struct snd_pcm_substream *substream,</div><div class='del'>-		      struct azx_dev *azx_dev, u32 **bdlp,</div><div class='del'>-		      int ofs, int size, int with_ioc)</div><div class='del'>-{</div><div class='del'>-	u32 *bdl = *bdlp;</div><div class='del'>-</div><div class='del'>-	while (size &gt; 0) {</div><div class='del'>-		dma_addr_t addr;</div><div class='del'>-		int chunk;</div><div class='del'>-</div><div class='del'>-		if (azx_dev-&gt;frags &gt;= AZX_MAX_BDL_ENTRIES)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		addr = snd_pcm_sgbuf_get_addr(substream, ofs);</div><div class='del'>-		/* program the address field of the BDL entry */</div><div class='del'>-		bdl[0] = cpu_to_le32((u32)addr);</div><div class='del'>-		bdl[1] = cpu_to_le32(upper_32_bits(addr));</div><div class='del'>-		/* program the size field of the BDL entry */</div><div class='del'>-		chunk = snd_pcm_sgbuf_get_chunk_size(substream, ofs, size);</div><div class='del'>-		bdl[2] = cpu_to_le32(chunk);</div><div class='del'>-		/* program the IOC to enable interrupt</div><div class='del'>-		 * only when the whole fragment is processed</div><div class='del'>-		 */</div><div class='del'>-		size -= chunk;</div><div class='del'>-		bdl[3] = (size || !with_ioc) ? 0 : cpu_to_le32(0x01);</div><div class='del'>-		bdl += 4;</div><div class='del'>-		azx_dev-&gt;frags++;</div><div class='del'>-		ofs += chunk;</div><div class='del'>-	}</div><div class='del'>-	*bdlp = bdl;</div><div class='del'>-	return ofs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set up BDL entries</div><div class='del'>- */</div><div class='del'>-static int azx_setup_periods(struct azx *chip,</div><div class='del'>-			     struct snd_pcm_substream *substream,</div><div class='del'>-			     struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	u32 *bdl;</div><div class='del'>-	int i, ofs, periods, period_bytes;</div><div class='del'>-	int pos_adj;</div><div class='del'>-</div><div class='del'>-	/* reset BDL address */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPL, 0);</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPU, 0);</div><div class='del'>-</div><div class='del'>-	period_bytes = azx_dev-&gt;period_bytes;</div><div class='del'>-	periods = azx_dev-&gt;bufsize / period_bytes;</div><div class='del'>-</div><div class='del'>-	/* program the initial BDL entries */</div><div class='del'>-	bdl = (u32 *)azx_dev-&gt;bdl.area;</div><div class='del'>-	ofs = 0;</div><div class='del'>-	azx_dev-&gt;frags = 0;</div><div class='del'>-	pos_adj = bdl_pos_adj[chip-&gt;dev_index];</div><div class='del'>-	if (pos_adj &gt; 0) {</div><div class='del'>-		struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-		int pos_align = pos_adj;</div><div class='del'>-		pos_adj = (pos_adj * runtime-&gt;rate + 47999) / 48000;</div><div class='del'>-		if (!pos_adj)</div><div class='del'>-			pos_adj = pos_align;</div><div class='del'>-		else</div><div class='del'>-			pos_adj = ((pos_adj + pos_align - 1) / pos_align) *</div><div class='del'>-				pos_align;</div><div class='del'>-		pos_adj = frames_to_bytes(runtime, pos_adj);</div><div class='del'>-		if (pos_adj &gt;= period_bytes) {</div><div class='del'>-			snd_printk(KERN_WARNING SFX "Too big adjustment %d\n",</div><div class='del'>-				   bdl_pos_adj[chip-&gt;dev_index]);</div><div class='del'>-			pos_adj = 0;</div><div class='del'>-		} else {</div><div class='del'>-			ofs = setup_bdle(substream, azx_dev,</div><div class='del'>-					 &amp;bdl, ofs, pos_adj, 1);</div><div class='del'>-			if (ofs &lt; 0)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		pos_adj = 0;</div><div class='del'>-	for (i = 0; i &lt; periods; i++) {</div><div class='del'>-		if (i == periods - 1 &amp;&amp; pos_adj)</div><div class='del'>-			ofs = setup_bdle(substream, azx_dev, &amp;bdl, ofs,</div><div class='del'>-					 period_bytes - pos_adj, 0);</div><div class='del'>-		else</div><div class='del'>-			ofs = setup_bdle(substream, azx_dev, &amp;bdl, ofs,</div><div class='del'>-					 period_bytes, 1);</div><div class='del'>-		if (ofs &lt; 0)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	snd_printk(KERN_ERR SFX "Too many BDL entries: buffer=%d, period=%d\n",</div><div class='del'>-		   azx_dev-&gt;bufsize, period_bytes);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* reset stream */</div><div class='del'>-static void azx_stream_reset(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	unsigned char val;</div><div class='del'>-	int timeout;</div><div class='del'>-</div><div class='del'>-	azx_stream_clear(chip, azx_dev);</div><div class='del'>-</div><div class='del'>-	azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |</div><div class='del'>-		      SD_CTL_STREAM_RESET);</div><div class='del'>-	udelay(3);</div><div class='del'>-	timeout = 300;</div><div class='del'>-	while (!((val = azx_sd_readb(azx_dev, SD_CTL)) &amp; SD_CTL_STREAM_RESET) &amp;&amp;</div><div class='del'>-	       --timeout)</div><div class='del'>-		;</div><div class='del'>-	val &amp;= ~SD_CTL_STREAM_RESET;</div><div class='del'>-	azx_sd_writeb(azx_dev, SD_CTL, val);</div><div class='del'>-	udelay(3);</div><div class='del'>-</div><div class='del'>-	timeout = 300;</div><div class='del'>-	/* waiting for hardware to report that the stream is out of reset */</div><div class='del'>-	while (((val = azx_sd_readb(azx_dev, SD_CTL)) &amp; SD_CTL_STREAM_RESET) &amp;&amp;</div><div class='del'>-	       --timeout)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	/* reset first position - may not be synced with hw at this time */</div><div class='del'>-	*azx_dev-&gt;posbuf = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set up the SD for streaming</div><div class='del'>- */</div><div class='del'>-static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	/* make sure the run bit is zero for SD */</div><div class='del'>-	azx_stream_clear(chip, azx_dev);</div><div class='del'>-	/* program the stream_tag */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_CTL,</div><div class='del'>-		      (azx_sd_readl(azx_dev, SD_CTL) &amp; ~SD_CTL_STREAM_TAG_MASK)|</div><div class='del'>-		      (azx_dev-&gt;stream_tag &lt;&lt; SD_CTL_STREAM_TAG_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* program the length of samples in cyclic buffer */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_CBL, azx_dev-&gt;bufsize);</div><div class='del'>-</div><div class='del'>-	/* program the stream format */</div><div class='del'>-	/* this value needs to be the same as the one programmed */</div><div class='del'>-	azx_sd_writew(azx_dev, SD_FORMAT, azx_dev-&gt;format_val);</div><div class='del'>-</div><div class='del'>-	/* program the stream LVI (last valid index) of the BDL */</div><div class='del'>-	azx_sd_writew(azx_dev, SD_LVI, azx_dev-&gt;frags - 1);</div><div class='del'>-</div><div class='del'>-	/* program the BDL address */</div><div class='del'>-	/* lower BDL address */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPL, (u32)azx_dev-&gt;bdl.addr);</div><div class='del'>-	/* upper BDL address */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPU, upper_32_bits(azx_dev-&gt;bdl.addr));</div><div class='del'>-</div><div class='del'>-	/* enable the position buffer */</div><div class='del'>-	if (chip-&gt;position_fix[0] != POS_FIX_LPIB ||</div><div class='del'>-	    chip-&gt;position_fix[1] != POS_FIX_LPIB) {</div><div class='del'>-		if (!(azx_readl(chip, DPLBASE) &amp; ICH6_DPLBASE_ENABLE))</div><div class='del'>-			azx_writel(chip, DPLBASE,</div><div class='del'>-				(u32)chip-&gt;posbuf.addr | ICH6_DPLBASE_ENABLE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the interrupt enable bits in the descriptor control register */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_CTL,</div><div class='del'>-		      azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Probe the given codec address</div><div class='del'>- */</div><div class='del'>-static int probe_codec(struct azx *chip, int addr)</div><div class='del'>-{</div><div class='del'>-	unsigned int cmd = (addr &lt;&lt; 28) | (AC_NODE_ROOT &lt;&lt; 20) |</div><div class='del'>-		(AC_VERB_PARAMETERS &lt;&lt; 8) | AC_PAR_VENDOR_ID;</div><div class='del'>-	unsigned int res;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	chip-&gt;probing = 1;</div><div class='del'>-	azx_send_cmd(chip-&gt;bus, cmd);</div><div class='del'>-	res = azx_get_response(chip-&gt;bus, addr);</div><div class='del'>-	chip-&gt;probing = 0;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;bus-&gt;cmd_mutex);</div><div class='del'>-	if (res == -1)</div><div class='del'>-		return -EIO;</div><div class='del'>-	snd_printdd(SFX "codec #%d probed OK\n", addr);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,</div><div class='del'>-				 struct hda_pcm *cpcm);</div><div class='del'>-static void azx_stop_chip(struct azx *chip);</div><div class='del'>-</div><div class='del'>-static void azx_bus_reset(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	bus-&gt;in_reset = 1;</div><div class='del'>-	azx_stop_chip(chip);</div><div class='del'>-	azx_init_chip(chip, 1);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	if (chip-&gt;initialized) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; HDA_MAX_PCMS; i++)</div><div class='del'>-			snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='del'>-		snd_hda_suspend(chip-&gt;bus);</div><div class='del'>-		snd_hda_resume(chip-&gt;bus);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	bus-&gt;in_reset = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Codec initialization</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */</div><div class='del'>-static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] __devinitdata = {</div><div class='del'>-	[AZX_DRIVER_NVIDIA] = 8,</div><div class='del'>-	[AZX_DRIVER_TERA] = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit azx_codec_create(struct azx *chip, const char *model)</div><div class='del'>-{</div><div class='del'>-	struct hda_bus_template bus_temp;</div><div class='del'>-	int c, codecs, err;</div><div class='del'>-	int max_slots;</div><div class='del'>-</div><div class='del'>-	memset(&amp;bus_temp, 0, sizeof(bus_temp));</div><div class='del'>-	bus_temp.private_data = chip;</div><div class='del'>-	bus_temp.modelname = model;</div><div class='del'>-	bus_temp.pci = chip-&gt;pci;</div><div class='del'>-	bus_temp.ops.command = azx_send_cmd;</div><div class='del'>-	bus_temp.ops.get_response = azx_get_response;</div><div class='del'>-	bus_temp.ops.attach_pcm = azx_attach_pcm_stream;</div><div class='del'>-	bus_temp.ops.bus_reset = azx_bus_reset;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	bus_temp.power_save = &amp;power_save;</div><div class='del'>-	bus_temp.ops.pm_notify = azx_power_notify;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = snd_hda_bus_new(chip-&gt;card, &amp;bus_temp, &amp;chip-&gt;bus);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_NVIDIA)</div><div class='del'>-		chip-&gt;bus-&gt;needs_damn_long_delay = 1;</div><div class='del'>-</div><div class='del'>-	codecs = 0;</div><div class='del'>-	max_slots = azx_max_codecs[chip-&gt;driver_type];</div><div class='del'>-	if (!max_slots)</div><div class='del'>-		max_slots = AZX_DEFAULT_CODECS;</div><div class='del'>-</div><div class='del'>-	/* First try to probe all given codec slots */</div><div class='del'>-	for (c = 0; c &lt; max_slots; c++) {</div><div class='del'>-		if ((chip-&gt;codec_mask &amp; (1 &lt;&lt; c)) &amp; chip-&gt;codec_probe_mask) {</div><div class='del'>-			if (probe_codec(chip, c) &lt; 0) {</div><div class='del'>-				/* Some BIOSen give you wrong codec addresses</div><div class='del'>-				 * that don't exist</div><div class='del'>-				 */</div><div class='del'>-				snd_printk(KERN_WARNING SFX</div><div class='del'>-					   "Codec #%d probe error; "</div><div class='del'>-					   "disabling it...\n", c);</div><div class='del'>-				chip-&gt;codec_mask &amp;= ~(1 &lt;&lt; c);</div><div class='del'>-				/* More badly, accessing to a non-existing</div><div class='del'>-				 * codec often screws up the controller chip,</div><div class='del'>-				 * and disturbs the further communications.</div><div class='del'>-				 * Thus if an error occurs during probing,</div><div class='del'>-				 * better to reset the controller chip to</div><div class='del'>-				 * get back to the sanity state.</div><div class='del'>-				 */</div><div class='del'>-				azx_stop_chip(chip);</div><div class='del'>-				azx_init_chip(chip, 1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Then create codec instances */</div><div class='del'>-	for (c = 0; c &lt; max_slots; c++) {</div><div class='del'>-		if ((chip-&gt;codec_mask &amp; (1 &lt;&lt; c)) &amp; chip-&gt;codec_probe_mask) {</div><div class='del'>-			struct hda_codec *codec;</div><div class='del'>-			err = snd_hda_codec_new(chip-&gt;bus, c, &amp;codec);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-			codec-&gt;beep_mode = chip-&gt;beep_mode;</div><div class='del'>-			codecs++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!codecs) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "no codecs initialized\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* configure each codec instance */</div><div class='del'>-static int __devinit azx_codec_configure(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	list_for_each_entry(codec, &amp;chip-&gt;bus-&gt;codec_list, list) {</div><div class='del'>-		snd_hda_codec_configure(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM support</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* assign a stream for the PCM */</div><div class='del'>-static inline struct azx_dev *</div><div class='del'>-azx_assign_device(struct azx *chip, struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	int dev, i, nums;</div><div class='del'>-	struct azx_dev *res = NULL;</div><div class='del'>-</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='del'>-		dev = chip-&gt;playback_index_offset;</div><div class='del'>-		nums = chip-&gt;playback_streams;</div><div class='del'>-	} else {</div><div class='del'>-		dev = chip-&gt;capture_index_offset;</div><div class='del'>-		nums = chip-&gt;capture_streams;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; nums; i++, dev++)</div><div class='del'>-		if (!chip-&gt;azx_dev[dev].opened) {</div><div class='del'>-			res = &amp;chip-&gt;azx_dev[dev];</div><div class='del'>-			if (res-&gt;device == substream-&gt;pcm-&gt;device)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	if (res) {</div><div class='del'>-		res-&gt;opened = 1;</div><div class='del'>-		res-&gt;device = substream-&gt;pcm-&gt;device;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* release the assigned stream */</div><div class='del'>-static inline void azx_release_device(struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	azx_dev-&gt;opened = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_hardware azx_pcm_hw = {</div><div class='del'>-	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='del'>-				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='del'>-				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='del'>-				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='del'>-				 /* No full-resume yet implemented */</div><div class='del'>-				 /* SNDRV_PCM_INFO_RESUME |*/</div><div class='del'>-				 SNDRV_PCM_INFO_PAUSE |</div><div class='del'>-				 SNDRV_PCM_INFO_SYNC_START),</div><div class='del'>-	.formats =		SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-	.rates =		SNDRV_PCM_RATE_48000,</div><div class='del'>-	.rate_min =		48000,</div><div class='del'>-	.rate_max =		48000,</div><div class='del'>-	.channels_min =		2,</div><div class='del'>-	.channels_max =		2,</div><div class='del'>-	.buffer_bytes_max =	AZX_MAX_BUF_SIZE,</div><div class='del'>-	.period_bytes_min =	128,</div><div class='del'>-	.period_bytes_max =	AZX_MAX_BUF_SIZE / 2,</div><div class='del'>-	.periods_min =		2,</div><div class='del'>-	.periods_max =		AZX_MAX_FRAG,</div><div class='del'>-	.fifo_size =		0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct azx_pcm {</div><div class='del'>-	struct azx *chip;</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	struct hda_pcm_stream *hinfo[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int azx_pcm_open(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct hda_pcm_stream *hinfo = apcm-&gt;hinfo[substream-&gt;stream];</div><div class='del'>-	struct azx *chip = apcm-&gt;chip;</div><div class='del'>-	struct azx_dev *azx_dev;</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	azx_dev = azx_assign_device(chip, substream);</div><div class='del'>-	if (azx_dev == NULL) {</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	runtime-&gt;hw = azx_pcm_hw;</div><div class='del'>-	runtime-&gt;hw.channels_min = hinfo-&gt;channels_min;</div><div class='del'>-	runtime-&gt;hw.channels_max = hinfo-&gt;channels_max;</div><div class='del'>-	runtime-&gt;hw.formats = hinfo-&gt;formats;</div><div class='del'>-	runtime-&gt;hw.rates = hinfo-&gt;rates;</div><div class='del'>-	snd_pcm_limit_hw_rates(runtime);</div><div class='del'>-	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='del'>-	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='del'>-				   128);</div><div class='del'>-	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='del'>-				   128);</div><div class='del'>-	snd_hda_power_up(apcm-&gt;codec);</div><div class='del'>-	err = hinfo-&gt;ops.open(hinfo, apcm-&gt;codec, substream);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		azx_release_device(azx_dev);</div><div class='del'>-		snd_hda_power_down(apcm-&gt;codec);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	snd_pcm_limit_hw_rates(runtime);</div><div class='del'>-	/* sanity check */</div><div class='del'>-	if (snd_BUG_ON(!runtime-&gt;hw.channels_min) ||</div><div class='del'>-	    snd_BUG_ON(!runtime-&gt;hw.channels_max) ||</div><div class='del'>-	    snd_BUG_ON(!runtime-&gt;hw.formats) ||</div><div class='del'>-	    snd_BUG_ON(!runtime-&gt;hw.rates)) {</div><div class='del'>-		azx_release_device(azx_dev);</div><div class='del'>-		hinfo-&gt;ops.close(hinfo, apcm-&gt;codec, substream);</div><div class='del'>-		snd_hda_power_down(apcm-&gt;codec);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	azx_dev-&gt;substream = substream;</div><div class='del'>-	azx_dev-&gt;running = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='del'>-	runtime-&gt;private_data = azx_dev;</div><div class='del'>-	snd_pcm_set_sync(substream);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_pcm_close(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct hda_pcm_stream *hinfo = apcm-&gt;hinfo[substream-&gt;stream];</div><div class='del'>-	struct azx *chip = apcm-&gt;chip;</div><div class='del'>-	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	azx_dev-&gt;substream = NULL;</div><div class='del'>-	azx_dev-&gt;running = 0;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	azx_release_device(azx_dev);</div><div class='del'>-	hinfo-&gt;ops.close(hinfo, apcm-&gt;codec, substream);</div><div class='del'>-	snd_hda_power_down(apcm-&gt;codec);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;open_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-			     struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='del'>-</div><div class='del'>-	azx_dev-&gt;bufsize = 0;</div><div class='del'>-	azx_dev-&gt;period_bytes = 0;</div><div class='del'>-	azx_dev-&gt;format_val = 0;</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-					params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='del'>-	struct hda_pcm_stream *hinfo = apcm-&gt;hinfo[substream-&gt;stream];</div><div class='del'>-</div><div class='del'>-	/* reset BDL address */</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPL, 0);</div><div class='del'>-	azx_sd_writel(azx_dev, SD_BDLPU, 0);</div><div class='del'>-	azx_sd_writel(azx_dev, SD_CTL, 0);</div><div class='del'>-	azx_dev-&gt;bufsize = 0;</div><div class='del'>-	azx_dev-&gt;period_bytes = 0;</div><div class='del'>-	azx_dev-&gt;format_val = 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup(apcm-&gt;codec, hinfo, substream);</div><div class='del'>-</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct azx *chip = apcm-&gt;chip;</div><div class='del'>-	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='del'>-	struct hda_pcm_stream *hinfo = apcm-&gt;hinfo[substream-&gt;stream];</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	unsigned int bufsize, period_bytes, format_val, stream_tag;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	azx_stream_reset(chip, azx_dev);</div><div class='del'>-	format_val = snd_hda_calc_stream_format(runtime-&gt;rate,</div><div class='del'>-						runtime-&gt;channels,</div><div class='del'>-						runtime-&gt;format,</div><div class='del'>-						hinfo-&gt;maxbps,</div><div class='del'>-						apcm-&gt;codec-&gt;spdif_ctls);</div><div class='del'>-	if (!format_val) {</div><div class='del'>-		snd_printk(KERN_ERR SFX</div><div class='del'>-			   "invalid format_val, rate=%d, ch=%d, format=%d\n",</div><div class='del'>-			   runtime-&gt;rate, runtime-&gt;channels, runtime-&gt;format);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bufsize = snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='del'>-</div><div class='del'>-	snd_printdd(SFX "azx_pcm_prepare: bufsize=0x%x, format=0x%x\n",</div><div class='del'>-		    bufsize, format_val);</div><div class='del'>-</div><div class='del'>-	if (bufsize != azx_dev-&gt;bufsize ||</div><div class='del'>-	    period_bytes != azx_dev-&gt;period_bytes ||</div><div class='del'>-	    format_val != azx_dev-&gt;format_val) {</div><div class='del'>-		azx_dev-&gt;bufsize = bufsize;</div><div class='del'>-		azx_dev-&gt;period_bytes = period_bytes;</div><div class='del'>-		azx_dev-&gt;format_val = format_val;</div><div class='del'>-		err = azx_setup_periods(chip, substream, azx_dev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* wallclk has 24Mhz clock source */</div><div class='del'>-	azx_dev-&gt;period_wallclk = (((runtime-&gt;period_size * 24000) /</div><div class='del'>-						runtime-&gt;rate) * 1000);</div><div class='del'>-	azx_setup_controller(chip, azx_dev);</div><div class='del'>-	if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK)</div><div class='del'>-		azx_dev-&gt;fifo_size = azx_sd_readw(azx_dev, SD_FIFOSIZE) + 1;</div><div class='del'>-	else</div><div class='del'>-		azx_dev-&gt;fifo_size = 0;</div><div class='del'>-</div><div class='del'>-	stream_tag = azx_dev-&gt;stream_tag;</div><div class='del'>-	/* CA-IBG chips need the playback stream starting from 1 */</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_CTX &amp;&amp;</div><div class='del'>-	    stream_tag &gt; chip-&gt;capture_streams)</div><div class='del'>-		stream_tag -= chip-&gt;capture_streams;</div><div class='del'>-	return snd_hda_codec_prepare(apcm-&gt;codec, hinfo, stream_tag,</div><div class='del'>-				     azx_dev-&gt;format_val, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct azx *chip = apcm-&gt;chip;</div><div class='del'>-	struct azx_dev *azx_dev;</div><div class='del'>-	struct snd_pcm_substream *s;</div><div class='del'>-	int rstart = 0, start, nsync = 0, sbits = 0;</div><div class='del'>-	int nwait, timeout;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SNDRV_PCM_TRIGGER_START:</div><div class='del'>-		rstart = 1;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='del'>-		start = 1;</div><div class='del'>-		break;</div><div class='del'>-	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='del'>-	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-	case SNDRV_PCM_TRIGGER_STOP:</div><div class='del'>-		start = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-		if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='del'>-			continue;</div><div class='del'>-		azx_dev = get_azx_dev(s);</div><div class='del'>-		sbits |= 1 &lt;&lt; azx_dev-&gt;index;</div><div class='del'>-		nsync++;</div><div class='del'>-		snd_pcm_trigger_done(s, substream);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (nsync &gt; 1) {</div><div class='del'>-		/* first, set SYNC bits of corresponding streams */</div><div class='del'>-		azx_writel(chip, SYNC, azx_readl(chip, SYNC) | sbits);</div><div class='del'>-	}</div><div class='del'>-	snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-		if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='del'>-			continue;</div><div class='del'>-		azx_dev = get_azx_dev(s);</div><div class='del'>-		if (start) {</div><div class='del'>-			azx_dev-&gt;start_wallclk = azx_readl(chip, WALLCLK);</div><div class='del'>-			if (!rstart)</div><div class='del'>-				azx_dev-&gt;start_wallclk -=</div><div class='del'>-						azx_dev-&gt;period_wallclk;</div><div class='del'>-			azx_stream_start(chip, azx_dev);</div><div class='del'>-		} else {</div><div class='del'>-			azx_stream_stop(chip, azx_dev);</div><div class='del'>-		}</div><div class='del'>-		azx_dev-&gt;running = start;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (start) {</div><div class='del'>-		if (nsync == 1)</div><div class='del'>-			return 0;</div><div class='del'>-		/* wait until all FIFOs get ready */</div><div class='del'>-		for (timeout = 5000; timeout; timeout--) {</div><div class='del'>-			nwait = 0;</div><div class='del'>-			snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-				if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='del'>-					continue;</div><div class='del'>-				azx_dev = get_azx_dev(s);</div><div class='del'>-				if (!(azx_sd_readb(azx_dev, SD_STS) &amp;</div><div class='del'>-				      SD_STS_FIFO_READY))</div><div class='del'>-					nwait++;</div><div class='del'>-			}</div><div class='del'>-			if (!nwait)</div><div class='del'>-				break;</div><div class='del'>-			cpu_relax();</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* wait until all RUN bits are cleared */</div><div class='del'>-		for (timeout = 5000; timeout; timeout--) {</div><div class='del'>-			nwait = 0;</div><div class='del'>-			snd_pcm_group_for_each_entry(s, substream) {</div><div class='del'>-				if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='del'>-					continue;</div><div class='del'>-				azx_dev = get_azx_dev(s);</div><div class='del'>-				if (azx_sd_readb(azx_dev, SD_CTL) &amp;</div><div class='del'>-				    SD_CTL_DMA_START)</div><div class='del'>-					nwait++;</div><div class='del'>-			}</div><div class='del'>-			if (!nwait)</div><div class='del'>-				break;</div><div class='del'>-			cpu_relax();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nsync &gt; 1) {</div><div class='del'>-		spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		/* reset SYNC bits */</div><div class='del'>-		azx_writel(chip, SYNC, azx_readl(chip, SYNC) &amp; ~sbits);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the current DMA position with correction on VIA chips */</div><div class='del'>-static unsigned int azx_via_get_position(struct azx *chip,</div><div class='del'>-					 struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int link_pos, mini_pos, bound_pos;</div><div class='del'>-	unsigned int mod_link_pos, mod_dma_pos, mod_mini_pos;</div><div class='del'>-	unsigned int fifo_size;</div><div class='del'>-</div><div class='del'>-	link_pos = azx_sd_readl(azx_dev, SD_LPIB);</div><div class='del'>-	if (azx_dev-&gt;index &gt;= 4) {</div><div class='del'>-		/* Playback, no problem using link position */</div><div class='del'>-		return link_pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Capture */</div><div class='del'>-	/* For new chipset,</div><div class='del'>-	 * use mod to get the DMA position just like old chipset</div><div class='del'>-	 */</div><div class='del'>-	mod_dma_pos = le32_to_cpu(*azx_dev-&gt;posbuf);</div><div class='del'>-	mod_dma_pos %= azx_dev-&gt;period_bytes;</div><div class='del'>-</div><div class='del'>-	/* azx_dev-&gt;fifo_size can't get FIFO size of in stream.</div><div class='del'>-	 * Get from base address + offset.</div><div class='del'>-	 */</div><div class='del'>-	fifo_size = readw(chip-&gt;remap_addr + VIA_IN_STREAM0_FIFO_SIZE_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (azx_dev-&gt;insufficient) {</div><div class='del'>-		/* Link position never gather than FIFO size */</div><div class='del'>-		if (link_pos &lt;= fifo_size)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		azx_dev-&gt;insufficient = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (link_pos &lt;= fifo_size)</div><div class='del'>-		mini_pos = azx_dev-&gt;bufsize + link_pos - fifo_size;</div><div class='del'>-	else</div><div class='del'>-		mini_pos = link_pos - fifo_size;</div><div class='del'>-</div><div class='del'>-	/* Find nearest previous boudary */</div><div class='del'>-	mod_mini_pos = mini_pos % azx_dev-&gt;period_bytes;</div><div class='del'>-	mod_link_pos = link_pos % azx_dev-&gt;period_bytes;</div><div class='del'>-	if (mod_link_pos &gt;= fifo_size)</div><div class='del'>-		bound_pos = link_pos - mod_link_pos;</div><div class='del'>-	else if (mod_dma_pos &gt;= mod_mini_pos)</div><div class='del'>-		bound_pos = mini_pos - mod_mini_pos;</div><div class='del'>-	else {</div><div class='del'>-		bound_pos = mini_pos - mod_mini_pos + azx_dev-&gt;period_bytes;</div><div class='del'>-		if (bound_pos &gt;= azx_dev-&gt;bufsize)</div><div class='del'>-			bound_pos = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate real DMA position we want */</div><div class='del'>-	return bound_pos + mod_dma_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int azx_get_position(struct azx *chip,</div><div class='del'>-				     struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	unsigned int pos;</div><div class='del'>-	int stream = azx_dev-&gt;substream-&gt;stream;</div><div class='del'>-</div><div class='del'>-	switch (chip-&gt;position_fix[stream]) {</div><div class='del'>-	case POS_FIX_LPIB:</div><div class='del'>-		/* read LPIB */</div><div class='del'>-		pos = azx_sd_readl(azx_dev, SD_LPIB);</div><div class='del'>-		break;</div><div class='del'>-	case POS_FIX_VIACOMBO:</div><div class='del'>-		pos = azx_via_get_position(chip, azx_dev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* use the position buffer */</div><div class='del'>-		pos = le32_to_cpu(*azx_dev-&gt;posbuf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pos &gt;= azx_dev-&gt;bufsize)</div><div class='del'>-		pos = 0;</div><div class='del'>-	return pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);</div><div class='del'>-	struct azx *chip = apcm-&gt;chip;</div><div class='del'>-	struct azx_dev *azx_dev = get_azx_dev(substream);</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime,</div><div class='del'>-			       azx_get_position(chip, azx_dev));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Check whether the current DMA position is acceptable for updating</div><div class='del'>- * periods.  Returns non-zero if it's OK.</div><div class='del'>- *</div><div class='del'>- * Many HD-audio controllers appear pretty inaccurate about</div><div class='del'>- * the update-IRQ timing.  The IRQ is issued before actually the</div><div class='del'>- * data is processed.  So, we need to process it afterwords in a</div><div class='del'>- * workqueue.</div><div class='del'>- */</div><div class='del'>-static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)</div><div class='del'>-{</div><div class='del'>-	u32 wallclk;</div><div class='del'>-	unsigned int pos;</div><div class='del'>-	int stream;</div><div class='del'>-</div><div class='del'>-	wallclk = azx_readl(chip, WALLCLK) - azx_dev-&gt;start_wallclk;</div><div class='del'>-	if (wallclk &lt; (azx_dev-&gt;period_wallclk * 2) / 3)</div><div class='del'>-		return -1;	/* bogus (too early) interrupt */</div><div class='del'>-</div><div class='del'>-	stream = azx_dev-&gt;substream-&gt;stream;</div><div class='del'>-	pos = azx_get_position(chip, azx_dev);</div><div class='del'>-	if (chip-&gt;position_fix[stream] == POS_FIX_AUTO) {</div><div class='del'>-		if (!pos) {</div><div class='del'>-			printk(KERN_WARNING</div><div class='del'>-			       "hda-intel: Invalid position buffer, "</div><div class='del'>-			       "using LPIB read method instead.\n");</div><div class='del'>-			chip-&gt;position_fix[stream] = POS_FIX_LPIB;</div><div class='del'>-			pos = azx_get_position(chip, azx_dev);</div><div class='del'>-		} else</div><div class='del'>-			chip-&gt;position_fix[stream] = POS_FIX_POSBUF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (WARN_ONCE(!azx_dev-&gt;period_bytes,</div><div class='del'>-		      "hda-intel: zero azx_dev-&gt;period_bytes"))</div><div class='del'>-		return -1; /* this shouldn't happen! */</div><div class='del'>-	if (wallclk &lt; (azx_dev-&gt;period_wallclk * 5) / 4 &amp;&amp;</div><div class='del'>-	    pos % azx_dev-&gt;period_bytes &gt; azx_dev-&gt;period_bytes / 2)</div><div class='del'>-		/* NG - it's below the first next period boundary */</div><div class='del'>-		return bdl_pos_adj[chip-&gt;dev_index] ? 0 : -1;</div><div class='del'>-	azx_dev-&gt;start_wallclk += wallclk;</div><div class='del'>-	return 1; /* OK, it's fine */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The work for pending PCM period updates.</div><div class='del'>- */</div><div class='del'>-static void azx_irq_pending_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = container_of(work, struct azx, irq_pending_work);</div><div class='del'>-	int i, pending, ok;</div><div class='del'>-</div><div class='del'>-	if (!chip-&gt;irq_pending_warned) {</div><div class='del'>-		printk(KERN_WARNING</div><div class='del'>-		       "hda-intel: IRQ timing workaround is activated "</div><div class='del'>-		       "for card #%d. Suggest a bigger bdl_pos_adj.\n",</div><div class='del'>-		       chip-&gt;card-&gt;number);</div><div class='del'>-		chip-&gt;irq_pending_warned = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		pending = 0;</div><div class='del'>-		spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-		for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-			struct azx_dev *azx_dev = &amp;chip-&gt;azx_dev[i];</div><div class='del'>-			if (!azx_dev-&gt;irq_pending ||</div><div class='del'>-			    !azx_dev-&gt;substream ||</div><div class='del'>-			    !azx_dev-&gt;running)</div><div class='del'>-				continue;</div><div class='del'>-			ok = azx_position_ok(chip, azx_dev);</div><div class='del'>-			if (ok &gt; 0) {</div><div class='del'>-				azx_dev-&gt;irq_pending = 0;</div><div class='del'>-				spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-				snd_pcm_period_elapsed(azx_dev-&gt;substream);</div><div class='del'>-				spin_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-			} else if (ok &lt; 0) {</div><div class='del'>-				pending = 0;	/* too early */</div><div class='del'>-			} else</div><div class='del'>-				pending++;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (!pending)</div><div class='del'>-			return;</div><div class='del'>-		msleep(1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clear irq_pending flags and assure no on-going workq */</div><div class='del'>-static void azx_clear_irq_pending(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++)</div><div class='del'>-		chip-&gt;azx_dev[i].irq_pending = 0;</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_pcm_ops azx_pcm_ops = {</div><div class='del'>-	.open = azx_pcm_open,</div><div class='del'>-	.close = azx_pcm_close,</div><div class='del'>-	.ioctl = snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params = azx_pcm_hw_params,</div><div class='del'>-	.hw_free = azx_pcm_hw_free,</div><div class='del'>-	.prepare = azx_pcm_prepare,</div><div class='del'>-	.trigger = azx_pcm_trigger,</div><div class='del'>-	.pointer = azx_pcm_pointer,</div><div class='del'>-	.page = snd_pcm_sgbuf_ops_page,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void azx_pcm_free(struct snd_pcm *pcm)</div><div class='del'>-{</div><div class='del'>-	struct azx_pcm *apcm = pcm-&gt;private_data;</div><div class='del'>-	if (apcm) {</div><div class='del'>-		apcm-&gt;chip-&gt;pcm[pcm-&gt;device] = NULL;</div><div class='del'>-		kfree(apcm);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,</div><div class='del'>-		      struct hda_pcm *cpcm)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	struct snd_pcm *pcm;</div><div class='del'>-	struct azx_pcm *apcm;</div><div class='del'>-	int pcm_dev = cpcm-&gt;device;</div><div class='del'>-	int s, err;</div><div class='del'>-</div><div class='del'>-	if (pcm_dev &gt;= HDA_MAX_PCMS) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",</div><div class='del'>-			   pcm_dev);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;pcm[pcm_dev]) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "PCM %d already exists\n", pcm_dev);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	err = snd_pcm_new(chip-&gt;card, cpcm-&gt;name, pcm_dev,</div><div class='del'>-			  cpcm-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].substreams,</div><div class='del'>-			  cpcm-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams,</div><div class='del'>-			  &amp;pcm);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	strlcpy(pcm-&gt;name, cpcm-&gt;name, sizeof(pcm-&gt;name));</div><div class='del'>-	apcm = kzalloc(sizeof(*apcm), GFP_KERNEL);</div><div class='del'>-	if (apcm == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	apcm-&gt;chip = chip;</div><div class='del'>-	apcm-&gt;codec = codec;</div><div class='del'>-	pcm-&gt;private_data = apcm;</div><div class='del'>-	pcm-&gt;private_free = azx_pcm_free;</div><div class='del'>-	if (cpcm-&gt;pcm_type == HDA_PCM_TYPE_MODEM)</div><div class='del'>-		pcm-&gt;dev_class = SNDRV_PCM_CLASS_MODEM;</div><div class='del'>-	chip-&gt;pcm[pcm_dev] = pcm;</div><div class='del'>-	cpcm-&gt;pcm = pcm;</div><div class='del'>-	for (s = 0; s &lt; 2; s++) {</div><div class='del'>-		apcm-&gt;hinfo[s] = &amp;cpcm-&gt;stream[s];</div><div class='del'>-		if (cpcm-&gt;stream[s].substreams)</div><div class='del'>-			snd_pcm_set_ops(pcm, s, &amp;azx_pcm_ops);</div><div class='del'>-	}</div><div class='del'>-	/* buffer pre-allocation */</div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      1024 * 64, 32 * 1024 * 1024);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mixer creation - all stuff is implemented in hda module</div><div class='del'>- */</div><div class='del'>-static int __devinit azx_mixer_create(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_build_controls(chip-&gt;bus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize SD streams</div><div class='del'>- */</div><div class='del'>-static int __devinit azx_init_stream(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* initialize each stream (aka device)</div><div class='del'>-	 * assign the starting bdl address to each stream (device)</div><div class='del'>-	 * and initialize</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-		struct azx_dev *azx_dev = &amp;chip-&gt;azx_dev[i];</div><div class='del'>-		azx_dev-&gt;posbuf = (u32 __iomem *)(chip-&gt;posbuf.area + i * 8);</div><div class='del'>-		/* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */</div><div class='del'>-		azx_dev-&gt;sd_addr = chip-&gt;remap_addr + (0x20 * i + 0x80);</div><div class='del'>-		/* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */</div><div class='del'>-		azx_dev-&gt;sd_int_sta_mask = 1 &lt;&lt; i;</div><div class='del'>-		/* stream tag: must be non-zero and unique */</div><div class='del'>-		azx_dev-&gt;index = i;</div><div class='del'>-		azx_dev-&gt;stream_tag = i + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_acquire_irq(struct azx *chip, int do_disconnect)</div><div class='del'>-{</div><div class='del'>-	if (request_irq(chip-&gt;pci-&gt;irq, azx_interrupt,</div><div class='del'>-			chip-&gt;msi ? 0 : IRQF_SHARED,</div><div class='del'>-			"hda_intel", chip)) {</div><div class='del'>-		printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "</div><div class='del'>-		       "disabling device\n", chip-&gt;pci-&gt;irq);</div><div class='del'>-		if (do_disconnect)</div><div class='del'>-			snd_card_disconnect(chip-&gt;card);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;irq = chip-&gt;pci-&gt;irq;</div><div class='del'>-	pci_intx(chip-&gt;pci, !chip-&gt;msi);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void azx_stop_chip(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	if (!chip-&gt;initialized)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* disable interrupts */</div><div class='del'>-	azx_int_disable(chip);</div><div class='del'>-	azx_int_clear(chip);</div><div class='del'>-</div><div class='del'>-	/* disable CORB/RIRB */</div><div class='del'>-	azx_free_cmd_io(chip);</div><div class='del'>-</div><div class='del'>-	/* disable position buffer */</div><div class='del'>-	azx_writel(chip, DPLBASE, 0);</div><div class='del'>-	azx_writel(chip, DPUBASE, 0);</div><div class='del'>-</div><div class='del'>-	chip-&gt;initialized = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-/* power-up/down the controller */</div><div class='del'>-static void azx_power_notify(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = bus-&gt;private_data;</div><div class='del'>-	struct hda_codec *c;</div><div class='del'>-	int power_on = 0;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(c, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		if (c-&gt;power_on) {</div><div class='del'>-			power_on = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (power_on)</div><div class='del'>-		azx_init_chip(chip, 1);</div><div class='del'>-	else if (chip-&gt;running &amp;&amp; power_save_controller &amp;&amp;</div><div class='del'>-		 !bus-&gt;power_keep_link_on)</div><div class='del'>-		azx_stop_chip(chip);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_SND_HDA_POWER_SAVE */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/*</div><div class='del'>- * power management</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int snd_hda_codecs_inuse(struct hda_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-</div><div class='del'>-	list_for_each_entry(codec, &amp;bus-&gt;codec_list, list) {</div><div class='del'>-		if (snd_hda_codec_needs_resume(codec))</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='del'>-	struct azx *chip = card-&gt;private_data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	azx_clear_irq_pending(chip);</div><div class='del'>-	for (i = 0; i &lt; HDA_MAX_PCMS; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='del'>-	if (chip-&gt;initialized)</div><div class='del'>-		snd_hda_suspend(chip-&gt;bus);</div><div class='del'>-	azx_stop_chip(chip);</div><div class='del'>-	if (chip-&gt;irq &gt;= 0) {</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-		chip-&gt;irq = -1;</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;msi)</div><div class='del'>-		pci_disable_msi(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_resume(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='del'>-	struct azx *chip = card-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "hda-intel: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-	if (chip-&gt;msi)</div><div class='del'>-		if (pci_enable_msi(pci) &lt; 0)</div><div class='del'>-			chip-&gt;msi = 0;</div><div class='del'>-	if (azx_acquire_irq(chip, 1) &lt; 0)</div><div class='del'>-		return -EIO;</div><div class='del'>-	azx_init_pci(chip);</div><div class='del'>-</div><div class='del'>-	if (snd_hda_codecs_inuse(chip-&gt;bus))</div><div class='del'>-		azx_init_chip(chip, 1);</div><div class='del'>-</div><div class='del'>-	snd_hda_resume(chip-&gt;bus);</div><div class='del'>-	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * reboot notifier for hang-up problem at power-down</div><div class='del'>- */</div><div class='del'>-static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip = container_of(nb, struct azx, reboot_notifier);</div><div class='del'>-	snd_hda_bus_reboot_notify(chip-&gt;bus);</div><div class='del'>-	azx_stop_chip(chip);</div><div class='del'>-	return NOTIFY_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void azx_notifier_register(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	chip-&gt;reboot_notifier.notifier_call = azx_halt;</div><div class='del'>-	register_reboot_notifier(&amp;chip-&gt;reboot_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void azx_notifier_unregister(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;reboot_notifier.notifier_call)</div><div class='del'>-		unregister_reboot_notifier(&amp;chip-&gt;reboot_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * destructor</div><div class='del'>- */</div><div class='del'>-static int azx_free(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	azx_notifier_unregister(chip);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;initialized) {</div><div class='del'>-		azx_clear_irq_pending(chip);</div><div class='del'>-		for (i = 0; i &lt; chip-&gt;num_streams; i++)</div><div class='del'>-			azx_stream_stop(chip, &amp;chip-&gt;azx_dev[i]);</div><div class='del'>-		azx_stop_chip(chip);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, (void*)chip);</div><div class='del'>-	if (chip-&gt;msi)</div><div class='del'>-		pci_disable_msi(chip-&gt;pci);</div><div class='del'>-	if (chip-&gt;remap_addr)</div><div class='del'>-		iounmap(chip-&gt;remap_addr);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;azx_dev) {</div><div class='del'>-		for (i = 0; i &lt; chip-&gt;num_streams; i++)</div><div class='del'>-			if (chip-&gt;azx_dev[i].bdl.area)</div><div class='del'>-				snd_dma_free_pages(&amp;chip-&gt;azx_dev[i].bdl);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;rb.area)</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;rb);</div><div class='del'>-	if (chip-&gt;posbuf.area)</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;posbuf);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip-&gt;azx_dev);</div><div class='del'>-	kfree(chip);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int azx_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	return azx_free(device-&gt;device_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * white/black-listing for position_fix</div><div class='del'>- */</div><div class='del'>-static struct snd_pci_quirk position_fix_list[] __devinitdata = {</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __devinit check_position_fix(struct azx *chip, int fix)</div><div class='del'>-{</div><div class='del'>-	const struct snd_pci_quirk *q;</div><div class='del'>-</div><div class='del'>-	switch (fix) {</div><div class='del'>-	case POS_FIX_LPIB:</div><div class='del'>-	case POS_FIX_POSBUF:</div><div class='del'>-	case POS_FIX_VIACOMBO:</div><div class='del'>-		return fix;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q = snd_pci_quirk_lookup(chip-&gt;pci, position_fix_list);</div><div class='del'>-	if (q) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "hda_intel: position_fix set to %d "</div><div class='del'>-		       "for device %04x:%04x\n",</div><div class='del'>-		       q-&gt;value, q-&gt;subvendor, q-&gt;subdevice);</div><div class='del'>-		return q-&gt;value;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check VIA/ATI HD Audio Controller exist */</div><div class='del'>-	switch (chip-&gt;driver_type) {</div><div class='del'>-	case AZX_DRIVER_VIA:</div><div class='del'>-	case AZX_DRIVER_ATI:</div><div class='del'>-		/* Use link position directly, avoid any transfer problem. */</div><div class='del'>-		return POS_FIX_VIACOMBO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return POS_FIX_AUTO;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * black-lists for probe_mask</div><div class='del'>- */</div><div class='del'>-static struct snd_pci_quirk probe_mask_list[] __devinitdata = {</div><div class='del'>-	/* Thinkpad often breaks the controller communication when accessing</div><div class='del'>-	 * to the non-working (or non-existing) modem codec slot.</div><div class='del'>-	 */</div><div class='del'>-	SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01),</div><div class='del'>-	/* broken BIOS */</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x20ac, "Dell Studio Desktop", 0x01),</div><div class='del'>-	/* including bogus ALC268 in slot#2 that conflicts with ALC888 */</div><div class='del'>-	SND_PCI_QUIRK(0x17c0, 0x4085, "Medion MD96630", 0x01),</div><div class='del'>-	/* forced codec slots */</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1262, "ASUS W5Fm", 0x103),</div><div class='del'>-	SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AZX_FORCE_CODEC_MASK	0x100</div><div class='del'>-</div><div class='del'>-static void __devinit check_probe_mask(struct azx *chip, int dev)</div><div class='del'>-{</div><div class='del'>-	const struct snd_pci_quirk *q;</div><div class='del'>-</div><div class='del'>-	chip-&gt;codec_probe_mask = probe_mask[dev];</div><div class='del'>-	if (chip-&gt;codec_probe_mask == -1) {</div><div class='del'>-		q = snd_pci_quirk_lookup(chip-&gt;pci, probe_mask_list);</div><div class='del'>-		if (q) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_intel: probe_mask set to 0x%x "</div><div class='del'>-			       "for device %04x:%04x\n",</div><div class='del'>-			       q-&gt;value, q-&gt;subvendor, q-&gt;subdevice);</div><div class='del'>-			chip-&gt;codec_probe_mask = q-&gt;value;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check forced option */</div><div class='del'>-	if (chip-&gt;codec_probe_mask != -1 &amp;&amp;</div><div class='del'>-	    (chip-&gt;codec_probe_mask &amp; AZX_FORCE_CODEC_MASK)) {</div><div class='del'>-		chip-&gt;codec_mask = chip-&gt;codec_probe_mask &amp; 0xff;</div><div class='del'>-		printk(KERN_INFO "hda_intel: codec_mask forced to 0x%x\n",</div><div class='del'>-		       chip-&gt;codec_mask);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * white/black-list for enable_msi</div><div class='del'>- */</div><div class='del'>-static struct snd_pci_quirk msi_black_list[] __devinitdata = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */</div><div class='del'>-	SND_PCI_QUIRK(0x1849, 0x0888, "ASRock", 0), /* Athlon64 X2 + nvidia */</div><div class='del'>-	SND_PCI_QUIRK(0xa0a0, 0x0575, "Aopen MZ915-M", 0), /* ICH6 */</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __devinit check_msi(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-	const struct snd_pci_quirk *q;</div><div class='del'>-</div><div class='del'>-	if (enable_msi &gt;= 0) {</div><div class='del'>-		chip-&gt;msi = !!enable_msi;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;msi = 1;	/* enable MSI as default */</div><div class='del'>-	q = snd_pci_quirk_lookup(chip-&gt;pci, msi_black_list);</div><div class='del'>-	if (q) {</div><div class='del'>-		printk(KERN_INFO</div><div class='del'>-		       "hda_intel: msi for device %04x:%04x set to %d\n",</div><div class='del'>-		       q-&gt;subvendor, q-&gt;subdevice, q-&gt;value);</div><div class='del'>-		chip-&gt;msi = q-&gt;value;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* NVidia chipsets seem to cause troubles with MSI */</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_NVIDIA) {</div><div class='del'>-		printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");</div><div class='del'>-		chip-&gt;msi = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * constructor</div><div class='del'>- */</div><div class='del'>-static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,</div><div class='del'>-				int dev, int driver_type,</div><div class='del'>-				struct azx **rchip)</div><div class='del'>-{</div><div class='del'>-	struct azx *chip;</div><div class='del'>-	int i, err;</div><div class='del'>-	unsigned short gcap;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = azx_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='del'>-</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (!chip) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "cannot allocate chip\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='del'>-	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='del'>-	chip-&gt;card = card;</div><div class='del'>-	chip-&gt;pci = pci;</div><div class='del'>-	chip-&gt;irq = -1;</div><div class='del'>-	chip-&gt;driver_type = driver_type;</div><div class='del'>-	check_msi(chip);</div><div class='del'>-	chip-&gt;dev_index = dev;</div><div class='del'>-	INIT_WORK(&amp;chip-&gt;irq_pending_work, azx_irq_pending_work);</div><div class='del'>-</div><div class='del'>-	chip-&gt;position_fix[0] = chip-&gt;position_fix[1] =</div><div class='del'>-		check_position_fix(chip, position_fix[dev]);</div><div class='del'>-	check_probe_mask(chip, dev);</div><div class='del'>-</div><div class='del'>-	chip-&gt;single_cmd = single_cmd;</div><div class='del'>-</div><div class='del'>-	if (bdl_pos_adj[dev] &lt; 0) {</div><div class='del'>-		switch (chip-&gt;driver_type) {</div><div class='del'>-		case AZX_DRIVER_ICH:</div><div class='del'>-		case AZX_DRIVER_PCH:</div><div class='del'>-			bdl_pos_adj[dev] = 1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			bdl_pos_adj[dev] = 32;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if BITS_PER_LONG != 64</div><div class='del'>-	/* Fix up base address on ULI M5461 */</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_ULI) {</div><div class='del'>-		u16 tmp3;</div><div class='del'>-		pci_read_config_word(pci, 0x40, &amp;tmp3);</div><div class='del'>-		pci_write_config_word(pci, 0x40, tmp3 | 0x10);</div><div class='del'>-		pci_write_config_dword(pci, PCI_BASE_ADDRESS_1, 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = pci_request_regions(pci, "ICH HD audio");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	chip-&gt;addr = pci_resource_start(pci, 0);</div><div class='del'>-	chip-&gt;remap_addr = pci_ioremap_bar(pci, 0);</div><div class='del'>-	if (chip-&gt;remap_addr == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "ioremap error\n");</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;msi)</div><div class='del'>-		if (pci_enable_msi(pci) &lt; 0)</div><div class='del'>-			chip-&gt;msi = 0;</div><div class='del'>-</div><div class='del'>-	if (azx_acquire_irq(chip, 0) &lt; 0) {</div><div class='del'>-		err = -EBUSY;</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-	gcap = azx_readw(chip, GCAP);</div><div class='del'>-	snd_printdd(SFX "chipset global capabilities = 0x%x\n", gcap);</div><div class='del'>-</div><div class='del'>-	/* disable SB600 64bit support for safety */</div><div class='del'>-	if ((chip-&gt;driver_type == AZX_DRIVER_ATI) ||</div><div class='del'>-	    (chip-&gt;driver_type == AZX_DRIVER_ATIHDMI)) {</div><div class='del'>-		struct pci_dev *p_smbus;</div><div class='del'>-		p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,</div><div class='del'>-					 PCI_DEVICE_ID_ATI_SBX00_SMBUS,</div><div class='del'>-					 NULL);</div><div class='del'>-		if (p_smbus) {</div><div class='del'>-			if (p_smbus-&gt;revision &lt; 0x30)</div><div class='del'>-				gcap &amp;= ~ICH6_GCAP_64OK;</div><div class='del'>-			pci_dev_put(p_smbus);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable 64bit DMA address for Teradici */</div><div class='del'>-	/* it does not work with device 6549:1200 subsys e4a2:040b */</div><div class='del'>-	if (chip-&gt;driver_type == AZX_DRIVER_TERA)</div><div class='del'>-		gcap &amp;= ~ICH6_GCAP_64OK;</div><div class='del'>-</div><div class='del'>-	/* allow 64bit DMA address if supported by H/W */</div><div class='del'>-	if ((gcap &amp; ICH6_GCAP_64OK) &amp;&amp; !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))</div><div class='del'>-		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64));</div><div class='del'>-	else {</div><div class='del'>-		pci_set_dma_mask(pci, DMA_BIT_MASK(32));</div><div class='del'>-		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read number of streams from GCAP register instead of using</div><div class='del'>-	 * hardcoded value</div><div class='del'>-	 */</div><div class='del'>-	chip-&gt;capture_streams = (gcap &gt;&gt; 8) &amp; 0x0f;</div><div class='del'>-	chip-&gt;playback_streams = (gcap &gt;&gt; 12) &amp; 0x0f;</div><div class='del'>-	if (!chip-&gt;playback_streams &amp;&amp; !chip-&gt;capture_streams) {</div><div class='del'>-		/* gcap didn't give any info, switching to old method */</div><div class='del'>-</div><div class='del'>-		switch (chip-&gt;driver_type) {</div><div class='del'>-		case AZX_DRIVER_ULI:</div><div class='del'>-			chip-&gt;playback_streams = ULI_NUM_PLAYBACK;</div><div class='del'>-			chip-&gt;capture_streams = ULI_NUM_CAPTURE;</div><div class='del'>-			break;</div><div class='del'>-		case AZX_DRIVER_ATIHDMI:</div><div class='del'>-			chip-&gt;playback_streams = ATIHDMI_NUM_PLAYBACK;</div><div class='del'>-			chip-&gt;capture_streams = ATIHDMI_NUM_CAPTURE;</div><div class='del'>-			break;</div><div class='del'>-		case AZX_DRIVER_GENERIC:</div><div class='del'>-		default:</div><div class='del'>-			chip-&gt;playback_streams = ICH6_NUM_PLAYBACK;</div><div class='del'>-			chip-&gt;capture_streams = ICH6_NUM_CAPTURE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;capture_index_offset = 0;</div><div class='del'>-	chip-&gt;playback_index_offset = chip-&gt;capture_streams;</div><div class='del'>-	chip-&gt;num_streams = chip-&gt;playback_streams + chip-&gt;capture_streams;</div><div class='del'>-	chip-&gt;azx_dev = kcalloc(chip-&gt;num_streams, sizeof(*chip-&gt;azx_dev),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!chip-&gt;azx_dev) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "cannot malloc azx_dev\n");</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;num_streams; i++) {</div><div class='del'>-		/* allocate memory for the BDL for each stream */</div><div class='del'>-		err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					  snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					  BDL_SIZE, &amp;chip-&gt;azx_dev[i].bdl);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR SFX "cannot allocate BDL\n");</div><div class='del'>-			goto errout;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* allocate memory for the position buffer */</div><div class='del'>-	err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,</div><div class='del'>-				  snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-				  chip-&gt;num_streams * 8, &amp;chip-&gt;posbuf);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-	/* allocate CORB/RIRB */</div><div class='del'>-	err = azx_alloc_cmd_io(chip);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto errout;</div><div class='del'>-</div><div class='del'>-	/* initialize streams */</div><div class='del'>-	azx_init_stream(chip);</div><div class='del'>-</div><div class='del'>-	/* initialize chip */</div><div class='del'>-	azx_init_pci(chip);</div><div class='del'>-	azx_init_chip(chip, (probe_only[dev] &amp; 2) == 0);</div><div class='del'>-</div><div class='del'>-	/* codec detection */</div><div class='del'>-	if (!chip-&gt;codec_mask) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "no codecs found!\n");</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt;0) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "Error creating device [card]!\n");</div><div class='del'>-		goto errout;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(card-&gt;driver, "HDA-Intel");</div><div class='del'>-	strlcpy(card-&gt;shortname, driver_short_names[chip-&gt;driver_type],</div><div class='del'>-		sizeof(card-&gt;shortname));</div><div class='del'>-	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='del'>-		 "%s at 0x%lx irq %i",</div><div class='del'>-		 card-&gt;shortname, chip-&gt;addr, chip-&gt;irq);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- errout:</div><div class='del'>-	azx_free(chip);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void power_down_all_codecs(struct azx *chip)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	/* The codecs were powered up in snd_hda_codec_new().</div><div class='del'>-	 * Now all initialization done, so turn them down if possible</div><div class='del'>-	 */</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	list_for_each_entry(codec, &amp;chip-&gt;bus-&gt;codec_list, list) {</div><div class='del'>-		snd_hda_power_down(codec);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit azx_probe(struct pci_dev *pci,</div><div class='del'>-			       const struct pci_device_id *pci_id)</div><div class='del'>-{</div><div class='del'>-	static int dev;</div><div class='del'>-	struct snd_card *card;</div><div class='del'>-	struct azx *chip;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (dev &gt;= SNDRV_CARDS)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	if (!enable[dev]) {</div><div class='del'>-		dev++;</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "Error creating card!\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set this here since it's referred in snd_hda_load_patch() */</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	err = azx_create(card, pci, dev, pci_id-&gt;driver_data, &amp;chip);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-	chip-&gt;beep_mode = beep_mode[dev];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* create codec instances */</div><div class='del'>-	err = azx_codec_create(chip, model[dev]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-#ifdef CONFIG_SND_HDA_PATCH_LOADER</div><div class='del'>-	if (patch[dev]) {</div><div class='del'>-		snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n",</div><div class='del'>-			   patch[dev]);</div><div class='del'>-		err = snd_hda_load_patch(chip-&gt;bus, patch[dev]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	if ((probe_only[dev] &amp; 1) == 0) {</div><div class='del'>-		err = azx_codec_configure(chip);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create PCM streams */</div><div class='del'>-	err = snd_hda_build_pcms(chip-&gt;bus);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* create mixer controls */</div><div class='del'>-	err = azx_mixer_create(chip);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pci, card);</div><div class='del'>-	chip-&gt;running = 1;</div><div class='del'>-	power_down_all_codecs(chip);</div><div class='del'>-	azx_notifier_register(chip);</div><div class='del'>-</div><div class='del'>-	dev++;</div><div class='del'>-	return err;</div><div class='del'>-out_free:</div><div class='del'>-	snd_card_free(card);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit azx_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* PCI IDs */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {</div><div class='del'>-	/* CPT */</div><div class='del'>-	{ PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },</div><div class='del'>-	/* PBG */</div><div class='del'>-	{ PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },</div><div class='del'>-	/* SCH */</div><div class='del'>-	{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },</div><div class='del'>-	/* Generic Intel */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),</div><div class='del'>-	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='del'>-	  .class_mask = 0xffffff,</div><div class='del'>-	  .driver_data = AZX_DRIVER_ICH },</div><div class='del'>-	/* ATI SB 450/600 */</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x437b), .driver_data = AZX_DRIVER_ATI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x4383), .driver_data = AZX_DRIVER_ATI },</div><div class='del'>-	/* ATI HDMI */</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0x970f), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa18), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa20), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa28), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa30), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa38), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa40), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	{ PCI_DEVICE(0x1002, 0xaa48), .driver_data = AZX_DRIVER_ATIHDMI },</div><div class='del'>-	/* VIA VT8251/VT8237A */</div><div class='del'>-	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },</div><div class='del'>-	/* SIS966 */</div><div class='del'>-	{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },</div><div class='del'>-	/* ULI M5461 */</div><div class='del'>-	{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },</div><div class='del'>-	/* NVIDIA MCP */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),</div><div class='del'>-	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='del'>-	  .class_mask = 0xffffff,</div><div class='del'>-	  .driver_data = AZX_DRIVER_NVIDIA },</div><div class='del'>-	/* Teradici */</div><div class='del'>-	{ PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },</div><div class='del'>-	/* Creative X-Fi (CA0110-IBG) */</div><div class='del'>-#if !defined(CONFIG_SND_CTXFI) &amp;&amp; !defined(CONFIG_SND_CTXFI_MODULE)</div><div class='del'>-	/* the following entry conflicts with snd-ctxfi driver,</div><div class='del'>-	 * as ctxfi driver mutates from HD-audio to native mode with</div><div class='del'>-	 * a special command sequence.</div><div class='del'>-	 */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID),</div><div class='del'>-	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='del'>-	  .class_mask = 0xffffff,</div><div class='del'>-	  .driver_data = AZX_DRIVER_CTX },</div><div class='del'>-#else</div><div class='del'>-	/* this entry seems still valid -- i.e. without emu20kx chip */</div><div class='del'>-	{ PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_CTX },</div><div class='del'>-#endif</div><div class='del'>-	/* Vortex86MX */</div><div class='del'>-	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },</div><div class='del'>-	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),</div><div class='del'>-	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='del'>-	  .class_mask = 0xffffff,</div><div class='del'>-	  .driver_data = AZX_DRIVER_GENERIC },</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_ANY_ID),</div><div class='del'>-	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO &lt;&lt; 8,</div><div class='del'>-	  .class_mask = 0xffffff,</div><div class='del'>-	  .driver_data = AZX_DRIVER_GENERIC },</div><div class='del'>-	{ 0, }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, azx_ids);</div><div class='del'>-</div><div class='del'>-/* pci_driver definition */</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "HDA Intel",</div><div class='del'>-	.id_table = azx_ids,</div><div class='del'>-	.probe = azx_probe,</div><div class='del'>-	.remove = __devexit_p(azx_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = azx_suspend,</div><div class='del'>-	.resume = azx_resume,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init alsa_card_azx_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_azx_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_azx_init)</div><div class='del'>-module_exit(alsa_card_azx_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c<br/>deleted file mode 100644<br/>index f7ff3f7ccb8e..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_analog.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_analog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4820 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * HD audio interface patch for AD1882, AD1884, AD1981HD, AD1983, AD1984,</div><div class='del'>- *   AD1986A, AD1988</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005-2007 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-</div><div class='del'>-struct ad198x_spec {</div><div class='del'>-	struct snd_kcontrol_new *mixers[5];</div><div class='del'>-	int num_mixers;</div><div class='del'>-	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */</div><div class='del'>-	const struct hda_verb *init_verbs[5];	/* initialization verbs</div><div class='del'>-						 * don't forget NULL termination!</div><div class='del'>-						 */</div><div class='del'>-	unsigned int num_init_verbs;</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_multi_out multiout;	/* playback set-up</div><div class='del'>-					 * max_channels, dacs must be set</div><div class='del'>-					 * dig_out_nid and hp_nid are optional</div><div class='del'>-					 */</div><div class='del'>-	unsigned int cur_eapd;</div><div class='del'>-	unsigned int need_dac_fix;</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	unsigned int num_adc_nids;</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t dig_in_nid;		/* digital-in NID; optional */</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	hda_nid_t *capsrc_nids;</div><div class='del'>-	unsigned int cur_mux[3];</div><div class='del'>-</div><div class='del'>-	/* channel model */</div><div class='del'>-	const struct hda_channel_mode *channel_mode;</div><div class='del'>-	int num_channel_mode;</div><div class='del'>-</div><div class='del'>-	/* PCM information */</div><div class='del'>-	struct hda_pcm pcm_rec[3];	/* used in alc_build_pcms() */</div><div class='del'>-</div><div class='del'>-	unsigned int spdif_route;</div><div class='del'>-</div><div class='del'>-	/* dynamic controls, init_verbs and input_mux */</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct snd_array kctls;</div><div class='del'>-	struct hda_input_mux private_imux;</div><div class='del'>-	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-</div><div class='del'>-	unsigned int jack_present: 1;</div><div class='del'>-	unsigned int inv_jack_detect: 1;/* inverted jack-detection */</div><div class='del'>-	unsigned int inv_eapd: 1;	/* inverted EAPD implementation */</div><div class='del'>-	unsigned int analog_beep: 1;	/* analog beep input present */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	struct hda_loopback_check loopback;</div><div class='del'>-#endif</div><div class='del'>-	/* for virtual master */</div><div class='del'>-	hda_nid_t vmaster_nid;</div><div class='del'>-	const char **slave_vols;</div><div class='del'>-	const char **slave_sws;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX handling (common part)</div><div class='del'>- */</div><div class='del'>-static int ad198x_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;input_mux, ucontrol,</div><div class='del'>-				     spec-&gt;capsrc_nids[adc_idx],</div><div class='del'>-				     &amp;spec-&gt;cur_mux[adc_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization (common callbacks)</div><div class='del'>- */</div><div class='del'>-static int ad198x_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_init_verbs; i++)</div><div class='del'>-		snd_hda_sequence_write(codec, spec-&gt;init_verbs[i]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *ad_slave_vols[] = {</div><div class='del'>-	"Front Playback Volume",</div><div class='del'>-	"Surround Playback Volume",</div><div class='del'>-	"Center Playback Volume",</div><div class='del'>-	"LFE Playback Volume",</div><div class='del'>-	"Side Playback Volume",</div><div class='del'>-	"Headphone Playback Volume",</div><div class='del'>-	"Mono Playback Volume",</div><div class='del'>-	"Speaker Playback Volume",</div><div class='del'>-	"IEC958 Playback Volume",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad_slave_sws[] = {</div><div class='del'>-	"Front Playback Switch",</div><div class='del'>-	"Surround Playback Switch",</div><div class='del'>-	"Center Playback Switch",</div><div class='del'>-	"LFE Playback Switch",</div><div class='del'>-	"Side Playback Switch",</div><div class='del'>-	"Headphone Playback Switch",</div><div class='del'>-	"Mono Playback Switch",</div><div class='del'>-	"Speaker Playback Switch",</div><div class='del'>-	"IEC958 Playback Switch",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ad198x_free_kctls(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-/* additional beep mixers; the actual parameters are overwritten at build */</div><div class='del'>-static struct snd_kcontrol_new ad_beep_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad_beep2_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Beep Playback Volume", 0, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_BEEP("Digital Beep Playback Switch", 0, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) \</div><div class='del'>-	((spec)-&gt;beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */</div><div class='del'>-#else</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) /* NOP */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int ad198x_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-						    &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	} </div><div class='del'>-	if (spec-&gt;dig_in_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create beep controls if needed */</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-	if (spec-&gt;beep_amp) {</div><div class='del'>-		struct snd_kcontrol_new *knew;</div><div class='del'>-		knew = spec-&gt;analog_beep ? ad_beep2_mixer : ad_beep_mixer;</div><div class='del'>-		for ( ; knew-&gt;name; knew++) {</div><div class='del'>-			struct snd_kcontrol *kctl;</div><div class='del'>-			kctl = snd_ctl_new1(knew, codec);</div><div class='del'>-			if (!kctl)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			kctl-&gt;private_value = spec-&gt;beep_amp;</div><div class='del'>-			err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* if we have no master control, let's create it */</div><div class='del'>-	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {</div><div class='del'>-		unsigned int vmaster_tlv[4];</div><div class='del'>-		snd_hda_set_vmaster_tlv(codec, spec-&gt;vmaster_nid,</div><div class='del'>-					HDA_OUTPUT, vmaster_tlv);</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='del'>-					  vmaster_tlv,</div><div class='del'>-					  (spec-&gt;slave_vols ?</div><div class='del'>-					   spec-&gt;slave_vols : ad_slave_vols));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='del'>-					  NULL,</div><div class='del'>-					  (spec-&gt;slave_sws ?</div><div class='del'>-					   spec-&gt;slave_sws : ad_slave_sws));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ad198x_free_kctls(codec); /* no longer needed */</div><div class='del'>-</div><div class='del'>-	/* assign Capture Source enums to NID */</div><div class='del'>-	kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");</div><div class='del'>-	if (!kctl)</div><div class='del'>-		kctl = snd_hda_find_mixer_ctl(codec, "Input Source");</div><div class='del'>-	for (i = 0; kctl &amp;&amp; i &lt; kctl-&gt;count; i++) {</div><div class='del'>-		err = snd_hda_add_nid(codec, kctl, i, spec-&gt;capsrc_nids[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign IEC958 enums to NID */</div><div class='del'>-	kctl = snd_hda_find_mixer_ctl(codec,</div><div class='del'>-			SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source");</div><div class='del'>-	if (kctl) {</div><div class='del'>-		err = snd_hda_add_nid(codec, kctl, 0,</div><div class='del'>-				      spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int ad198x_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;loopback, nid);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog playback callbacks</div><div class='del'>- */</div><div class='del'>-static int ad198x_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-						format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int ad198x_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   unsigned int stream_tag,</div><div class='del'>-					   unsigned int format,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-					     format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int ad198x_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;adc_nids[substream-&gt;number]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream ad198x_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 6, /* changed later */</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = ad198x_playback_pcm_open,</div><div class='del'>-		.prepare = ad198x_playback_pcm_prepare,</div><div class='del'>-		.cleanup = ad198x_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ad198x_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = ad198x_capture_pcm_prepare,</div><div class='del'>-		.cleanup = ad198x_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ad198x_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = ad198x_dig_playback_pcm_open,</div><div class='del'>-		.close = ad198x_dig_playback_pcm_close,</div><div class='del'>-		.prepare = ad198x_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = ad198x_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ad198x_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad198x_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "AD198x Analog";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec-&gt;multiout.max_channels;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dac_nids[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_analog_capture;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec-&gt;num_adc_nids;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adc_nids[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		info++;</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info-&gt;name = "AD198x Digital";</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		if (spec-&gt;dig_in_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_digital_capture;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void ad198x_shutup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	snd_hda_shutup_pins(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad198x_free_kctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list) {</div><div class='del'>-		struct snd_kcontrol_new *kctl = spec-&gt;kctls.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;kctls.used; i++)</div><div class='del'>-			kfree(kctl[i].name);</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;spec-&gt;kctls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,</div><div class='del'>-				hda_nid_t hp)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-			    !spec-&gt;inv_eapd ? 0x00 : 0x02);</div><div class='del'>-	snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-			    !spec-&gt;inv_eapd ? 0x00 : 0x02);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad198x_power_eapd(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* We currently only handle front, HP */</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x11d41882:</div><div class='del'>-	case 0x11d4882a:</div><div class='del'>-	case 0x11d41884:</div><div class='del'>-	case 0x11d41984:</div><div class='del'>-	case 0x11d41883:</div><div class='del'>-	case 0x11d4184a:</div><div class='del'>-	case 0x11d4194a:</div><div class='del'>-	case 0x11d4194b:</div><div class='del'>-		ad198x_power_eapd_write(codec, 0x12, 0x11);</div><div class='del'>-		break;</div><div class='del'>-	case 0x11d41981:</div><div class='del'>-	case 0x11d41983:</div><div class='del'>-		ad198x_power_eapd_write(codec, 0x05, 0x06);</div><div class='del'>-		break;</div><div class='del'>-	case 0x11d41986:</div><div class='del'>-		ad198x_power_eapd_write(codec, 0x1b, 0x1a);</div><div class='del'>-		break;</div><div class='del'>-	case 0x11d41988:</div><div class='del'>-	case 0x11d4198b:</div><div class='del'>-	case 0x11d4989a:</div><div class='del'>-	case 0x11d4989b:</div><div class='del'>-		ad198x_power_eapd_write(codec, 0x29, 0x22);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad198x_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (!spec)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ad198x_shutup(codec);</div><div class='del'>-	ad198x_free_kctls(codec);</div><div class='del'>-	kfree(spec);</div><div class='del'>-	snd_hda_detach_beep_device(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	ad198x_shutup(codec);</div><div class='del'>-	ad198x_power_eapd(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops ad198x_patch_ops = {</div><div class='del'>-	.build_controls = ad198x_build_controls,</div><div class='del'>-	.build_pcms = ad198x_build_pcms,</div><div class='del'>-	.init = ad198x_init,</div><div class='del'>-	.free = ad198x_free,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.check_power_status = ad198x_check_power_status,</div><div class='del'>-#endif</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	.suspend = ad198x_suspend,</div><div class='del'>-#endif</div><div class='del'>-	.reboot_notify = ad198x_shutup,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EAPD control</div><div class='del'>- * the private value = nid</div><div class='del'>- */</div><div class='del'>-#define ad198x_eapd_info	snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;inv_eapd)</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = ! spec-&gt;cur_eapd;</div><div class='del'>-	else</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = spec-&gt;cur_eapd;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	unsigned int eapd;</div><div class='del'>-	eapd = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	if (spec-&gt;inv_eapd)</div><div class='del'>-		eapd = !eapd;</div><div class='del'>-	if (eapd == spec-&gt;cur_eapd)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;cur_eapd = eapd;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid,</div><div class='del'>-				  0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-				  eapd ? 0x02 : 0x00);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			       struct snd_ctl_elem_info *uinfo);</div><div class='del'>-static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1986A specific</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AD1986A_SPDIF_OUT	0x02</div><div class='del'>-#define AD1986A_FRONT_DAC	0x03</div><div class='del'>-#define AD1986A_SURR_DAC	0x04</div><div class='del'>-#define AD1986A_CLFE_DAC	0x05</div><div class='del'>-#define AD1986A_ADC		0x06</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1986a_dac_nids[3] = {</div><div class='del'>-	AD1986A_FRONT_DAC, AD1986A_SURR_DAC, AD1986A_CLFE_DAC</div><div class='del'>-};</div><div class='del'>-static hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC };</div><div class='del'>-static hda_nid_t ad1986a_capsrc_nids[1] = { 0x12 };</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1986a_capture_source = {</div><div class='del'>-	.num_items = 7,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "CD", 0x1 },</div><div class='del'>-		{ "Aux", 0x3 },</div><div class='del'>-		{ "Line", 0x4 },</div><div class='del'>-		{ "Mix", 0x5 },</div><div class='del'>-		{ "Mono", 0x6 },</div><div class='del'>-		{ "Phone", 0x7 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls ad1986a_bind_pcm_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls ad1986a_bind_pcm_sw = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mixers</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new ad1986a_mixers[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * bind volumes/mutes of 3 DACs as a single PCM control for simplicity</div><div class='del'>-	 */</div><div class='del'>-	HDA_BIND_VOL("PCM Playback Volume", &amp;ad1986a_bind_pcm_vol),</div><div class='del'>-	HDA_BIND_SW("PCM Playback Switch", &amp;ad1986a_bind_pcm_sw),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x1d, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x1d, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x1d, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x1d, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* additional mixers for 3stack mode */</div><div class='del'>-static struct snd_kcontrol_new ad1986a_3st_mixers[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = ad198x_ch_mode_info,</div><div class='del'>-		.get = ad198x_ch_mode_get,</div><div class='del'>-		.put = ad198x_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* laptop model - 2ch only */</div><div class='del'>-static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };</div><div class='del'>-</div><div class='del'>-/* master controls both pins 0x1a and 0x1b */</div><div class='del'>-static struct hda_bind_ctls ad1986a_laptop_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls ad1986a_laptop_master_sw = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;ad1986a_laptop_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;ad1986a_laptop_master_sw),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	/* </div><div class='del'>-	   HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),</div><div class='del'>-	   HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* laptop-eapd model - 2ch only */</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x4 },</div><div class='del'>-		{ "Mix", 0x5 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1986a_automic_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Mix", 0x5 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1986a_laptop_master_mixers[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;ad1986a_laptop_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;ad1986a_laptop_master_sw),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "External Amplifier",</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,</div><div class='del'>-		.info = ad198x_eapd_info,</div><div class='del'>-		.get = ad198x_eapd_get,</div><div class='del'>-		.put = ad198x_eapd_put,</div><div class='del'>-		.private_value = 0x1b, /* port-D */</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1986a_laptop_intmic_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* re-connect the mic boost input according to the jack sensing */</div><div class='del'>-static void ad1986a_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x1f);</div><div class='del'>-	/* 0 = 0x1f, 2 = 0x1d, 4 = mixed */</div><div class='del'>-	snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-			    present ? 0 : 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AD1986A_MIC_EVENT		0x36</div><div class='del'>-</div><div class='del'>-static void ad1986a_automic_unsol_event(struct hda_codec *codec,</div><div class='del'>-					    unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != AD1986A_MIC_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	ad1986a_automic(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1986a_automic_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1986a_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* laptop-automute - 2ch only */</div><div class='del'>-</div><div class='del'>-static void ad1986a_update_hp(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;jack_present)</div><div class='del'>-		mute = HDA_AMP_MUTE; /* mute internal speaker */</div><div class='del'>-	else</div><div class='del'>-		/* unmute internal speaker if necessary */</div><div class='del'>-		mute = snd_hda_codec_amp_read(codec, 0x1a, 0, HDA_OUTPUT, 0);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1986a_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x1a);</div><div class='del'>-	if (spec-&gt;inv_jack_detect)</div><div class='del'>-		spec-&gt;jack_present = !spec-&gt;jack_present;</div><div class='del'>-	ad1986a_update_hp(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AD1986A_HP_EVENT		0x37</div><div class='del'>-</div><div class='del'>-static void ad1986a_hp_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != AD1986A_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	ad1986a_hp_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1986a_hp_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1986a_hp_automute(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bind hp and internal speaker mute (with plug check) */</div><div class='del'>-static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,</div><div class='del'>-					  HDA_AMP_MUTE,</div><div class='del'>-					  valp[0] ? 0 : HDA_AMP_MUTE);</div><div class='del'>-	change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,</div><div class='del'>-					   HDA_AMP_MUTE,</div><div class='del'>-					   valp[1] ? 0 : HDA_AMP_MUTE);</div><div class='del'>-	if (change)</div><div class='del'>-		ad1986a_update_hp(codec);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;ad1986a_laptop_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = ad1986a_hp_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1986a_init_verbs[] = {</div><div class='del'>-	/* Front, Surround, CLFE DAC; mute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Downmix - off */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* HP, Line-Out, Surround, CLFE selectors */</div><div class='del'>-	{0x0a, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Mono selector */</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Mic selector: Mic 1/2 pin */</div><div class='del'>-	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Line-in selector: Line-in */</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Mic 1/2 swap */</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Record selector: mic */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Mic, Phone, CD, Aux, Line-In amp; mute as default */</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* PC beep */</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* HP, Line-Out, Surround, CLFE, Mono pins; mute as default */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* HP Pin */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='del'>-	/* Front, Surround, CLFE Pins */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* Mono Pin */</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* Mic Pin */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* Line, Aux, CD, Beep-In Pin */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1986a_ch2_init[] = {</div><div class='del'>-	/* Surround out -&gt; Line In */</div><div class='del'>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>- 	/* Line-in selectors */</div><div class='del'>-	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x1 },</div><div class='del'>-	/* CLFE -&gt; Mic in */</div><div class='del'>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* Mic selector, mix C/LFE (backmic) and Mic (frontmic) */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1986a_ch4_init[] = {</div><div class='del'>-	/* Surround out -&gt; Surround */</div><div class='del'>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	/* CLFE -&gt; Mic in */</div><div class='del'>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1986a_ch6_init[] = {</div><div class='del'>-	/* Surround out -&gt; Surround out */</div><div class='del'>-	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	/* CLFE -&gt; CLFE */</div><div class='del'>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode ad1986a_modes[3] = {</div><div class='del'>-	{ 2, ad1986a_ch2_init },</div><div class='del'>-	{ 4, ad1986a_ch4_init },</div><div class='del'>-	{ 6, ad1986a_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* eapd initialization */</div><div class='del'>-static struct hda_verb ad1986a_eapd_init_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1986a_automic_verbs[] = {</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	/*{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},*/</div><div class='del'>-	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x1f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_MIC_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Ultra initialization */</div><div class='del'>-static struct hda_verb ad1986a_ultra_init[] = {</div><div class='del'>-	/* eapd initialization */</div><div class='del'>-	{ 0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 },</div><div class='del'>-	/* CLFE -&gt; Mic in */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2 },</div><div class='del'>-	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	{ 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* pin sensing on HP jack */</div><div class='del'>-static struct hda_verb ad1986a_hp_init_verbs[] = {</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ad1986a_samsung_p50_unsol_event(struct hda_codec *codec,</div><div class='del'>-					    unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case AD1986A_HP_EVENT:</div><div class='del'>-		ad1986a_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_MIC_EVENT:</div><div class='del'>-		ad1986a_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1986a_samsung_p50_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1986a_hp_automute(codec);</div><div class='del'>-	ad1986a_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* models */</div><div class='del'>-enum {</div><div class='del'>-	AD1986A_6STACK,</div><div class='del'>-	AD1986A_3STACK,</div><div class='del'>-	AD1986A_LAPTOP,</div><div class='del'>-	AD1986A_LAPTOP_EAPD,</div><div class='del'>-	AD1986A_LAPTOP_AUTOMUTE,</div><div class='del'>-	AD1986A_ULTRA,</div><div class='del'>-	AD1986A_SAMSUNG,</div><div class='del'>-	AD1986A_SAMSUNG_P50,</div><div class='del'>-	AD1986A_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad1986a_models[AD1986A_MODELS] = {</div><div class='del'>-	[AD1986A_6STACK]	= "6stack",</div><div class='del'>-	[AD1986A_3STACK]	= "3stack",</div><div class='del'>-	[AD1986A_LAPTOP]	= "laptop",</div><div class='del'>-	[AD1986A_LAPTOP_EAPD]	= "laptop-eapd",</div><div class='del'>-	[AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute",</div><div class='del'>-	[AD1986A_ULTRA]		= "ultra",</div><div class='del'>-	[AD1986A_SAMSUNG]	= "samsung",</div><div class='del'>-	[AD1986A_SAMSUNG_P50]	= "samsung-p50",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk ad1986a_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11f7, "ASUS U5A", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1213, "ASUS A6J", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1263, "ASUS U5F", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1297, "ASUS Z62F", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS V1j", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1302, "ASUS W3j", AD1986A_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS VX1", AD1986A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8J", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x817f, "ASUS P5", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x818f, "ASUS P5", AD1986A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS P5", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS M2N", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8234, "ASUS M2N", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba Satellite L40-10Q", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung P50", AD1986A_SAMSUNG_P50),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),</div><div class='del'>-	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1986a_loopbacks[] = {</div><div class='del'>-	{ 0x13, HDA_OUTPUT, 0 }, /* Mic */</div><div class='del'>-	{ 0x14, HDA_OUTPUT, 0 }, /* Phone */</div><div class='del'>-	{ 0x15, HDA_OUTPUT, 0 }, /* CD */</div><div class='del'>-	{ 0x16, HDA_OUTPUT, 0 }, /* Aux */</div><div class='del'>-	{ 0x17, HDA_OUTPUT, 0 }, /* Line */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int is_jack_available(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	return get_defcfg_connect(conf) != AC_JACK_PORT_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_ad1986a(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x19);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 6;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1986a_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1986A_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = ad1986a_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1986a_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;ad1986a_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = ad1986a_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1986a_init_verbs;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1986a_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x1b;</div><div class='del'>-	spec-&gt;inv_eapd = 1; /* AD1986A has the inverted EAPD implementation */</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	/* override some parameters */</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1986A_MODELS,</div><div class='del'>-						  ad1986a_models,</div><div class='del'>-						  ad1986a_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1986A_3STACK:</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[1] = ad1986a_3st_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_ch2_init;</div><div class='del'>-		spec-&gt;channel_mode = ad1986a_modes;</div><div class='del'>-		spec-&gt;num_channel_mode = ARRAY_SIZE(ad1986a_modes);</div><div class='del'>-		spec-&gt;need_dac_fix = 1;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_LAPTOP:</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_laptop_mixers;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_LAPTOP_EAPD:</div><div class='del'>-		spec-&gt;num_mixers = 3;</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_laptop_master_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = ad1986a_laptop_eapd_mixers;</div><div class='del'>-		spec-&gt;mixers[2] = ad1986a_laptop_intmic_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_eapd_init_verbs;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		if (!is_jack_available(codec, 0x25))</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1986a_laptop_eapd_capture_source;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_SAMSUNG:</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_laptop_master_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = ad1986a_laptop_eapd_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 3;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_eapd_init_verbs;</div><div class='del'>-		spec-&gt;init_verbs[2] = ad1986a_automic_verbs;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		if (!is_jack_available(codec, 0x25))</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1986a_automic_capture_source;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1986a_automic_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1986a_automic_init;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_SAMSUNG_P50:</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_automute_master_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = ad1986a_laptop_eapd_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 4;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_eapd_init_verbs;</div><div class='del'>-		spec-&gt;init_verbs[2] = ad1986a_automic_verbs;</div><div class='del'>-		spec-&gt;init_verbs[3] = ad1986a_hp_init_verbs;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		if (!is_jack_available(codec, 0x25))</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1986a_automic_capture_source;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1986a_samsung_p50_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1986a_samsung_p50_init;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_LAPTOP_AUTOMUTE:</div><div class='del'>-		spec-&gt;num_mixers = 3;</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_automute_master_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = ad1986a_laptop_eapd_mixers;</div><div class='del'>-		spec-&gt;mixers[2] = ad1986a_laptop_intmic_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 3;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_eapd_init_verbs;</div><div class='del'>-		spec-&gt;init_verbs[2] = ad1986a_hp_init_verbs;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		if (!is_jack_available(codec, 0x25))</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1986a_laptop_eapd_capture_source;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1986a_hp_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1986a_hp_init;</div><div class='del'>-		/* Lenovo N100 seems to report the reversed bit</div><div class='del'>-		 * for HP jack-sensing</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;inv_jack_detect = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AD1986A_ULTRA:</div><div class='del'>-		spec-&gt;mixers[0] = ad1986a_laptop_eapd_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1986a_ultra_init;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1986a_laptop_dac_nids;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* AD1986A has a hardware problem that it can't share a stream</div><div class='del'>-	 * with multiple output pins.  The copy of front to surrounds</div><div class='del'>-	 * causes noisy or silent outputs at a certain timing, e.g.</div><div class='del'>-	 * changing the volume.</div><div class='del'>-	 * So, let's disable the shared stream.</div><div class='del'>-	 */</div><div class='del'>-	spec-&gt;multiout.no_share_stream = 1;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1983 specific</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AD1983_SPDIF_OUT	0x02</div><div class='del'>-#define AD1983_DAC		0x03</div><div class='del'>-#define AD1983_ADC		0x04</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };</div><div class='del'>-static hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC };</div><div class='del'>-static hda_nid_t ad1983_capsrc_nids[1] = { 0x15 };</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1983_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "Mix", 0x2 },</div><div class='del'>-		{ "Mix Mono", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPDIF playback route</div><div class='del'>- */</div><div class='del'>-static int ad1983_spdif_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	static char *texts[] = { "PCM", "ADC" };</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 1)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1983_spdif_route_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;spdif_route;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (ucontrol-&gt;value.enumerated.item[0] &gt; 1)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (spec-&gt;spdif_route != ucontrol-&gt;value.enumerated.item[0]) {</div><div class='del'>-		spec-&gt;spdif_route = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-		snd_hda_codec_write_cache(codec, spec-&gt;multiout.dig_out_nid, 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  spec-&gt;spdif_route);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1983_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1983_init_verbs[] = {</div><div class='del'>-	/* Front, HP, Mono; mute as default */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Beep, PCM, Mic, Line-In: mute */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Front, HP selectors; from Mix */</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x06, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* Mono selector; from Mix */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	/* Mic selector; Mic */</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Line-in selector: Line-in */</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Mic boost: 0dB */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* Record selector: mic */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Front Pin */</div><div class='del'>-	{0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* HP Pin */</div><div class='del'>-	{0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='del'>-	/* Mono Pin */</div><div class='del'>-	{0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* Mic Pin */</div><div class='del'>-	{0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* Line Pin */</div><div class='del'>-	{0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1983_loopbacks[] = {</div><div class='del'>-	{ 0x12, HDA_OUTPUT, 0 }, /* Mic */</div><div class='del'>-	{ 0x13, HDA_OUTPUT, 0 }, /* Line */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int patch_ad1983(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(ad1983_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1983_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1983_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = ad1983_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1983_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;ad1983_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = ad1983_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1983_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1983_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x05;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1981 HD specific</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AD1981_SPDIF_OUT	0x02</div><div class='del'>-#define AD1981_DAC		0x03</div><div class='del'>-#define AD1981_ADC		0x04</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };</div><div class='del'>-static hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC };</div><div class='del'>-static hda_nid_t ad1981_capsrc_nids[1] = { 0x15 };</div><div class='del'>-</div><div class='del'>-/* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */</div><div class='del'>-static struct hda_input_mux ad1981_capture_source = {</div><div class='del'>-	.num_items = 7,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "Mix", 0x2 },</div><div class='del'>-		{ "Mix Mono", 0x3 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-		{ "Mic", 0x6 },</div><div class='del'>-		{ "Aux", 0x7 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1981_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Aux Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Aux Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* identical with AD1983 */</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1981_init_verbs[] = {</div><div class='del'>-	/* Front, HP, Mono; mute as default */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Beep, PCM, Front Mic, Line, Rear Mic, Aux, CD-In: mute */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Front, HP selectors; from Mix */</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x06, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* Mono selector; from Mix */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	/* Mic Mixer; select Front Mic */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* Mic boost: 0dB */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Record selector: Front mic */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Front Pin */</div><div class='del'>-	{0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* HP Pin */</div><div class='del'>-	{0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='del'>-	/* Mono Pin */</div><div class='del'>-	{0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* Front &amp; Rear Mic Pins */</div><div class='del'>-	{0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* Line Pin */</div><div class='del'>-	{0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* Digital Beep */</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Line-Out as Input: disabled */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1981_loopbacks[] = {</div><div class='del'>-	{ 0x12, HDA_OUTPUT, 0 }, /* Front Mic */</div><div class='del'>-	{ 0x13, HDA_OUTPUT, 0 }, /* Line */</div><div class='del'>-	{ 0x1b, HDA_OUTPUT, 0 }, /* Aux */</div><div class='del'>-	{ 0x1c, HDA_OUTPUT, 0 }, /* Mic */</div><div class='del'>-	{ 0x1d, HDA_OUTPUT, 0 }, /* CD */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Patch for HP nx6320</div><div class='del'>- *</div><div class='del'>- * nx6320 uses EAPD in the reverse way - EAPD-on means the internal</div><div class='del'>- * speaker output enabled _and_ mute-LED off.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define AD1981_HP_EVENT		0x37</div><div class='del'>-#define AD1981_MIC_EVENT	0x38</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1981_hp_init_verbs[] = {</div><div class='del'>-	{0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, /* default off */</div><div class='del'>-	/* pin sensing on HP and Mic jacks */</div><div class='del'>-	{0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},</div><div class='del'>-	{0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD (+ mute HP) as a master switch */</div><div class='del'>-static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (! ad198x_eapd_put(kcontrol, ucontrol))</div><div class='del'>-		return 0;</div><div class='del'>-	/* change speaker pin appropriately */</div><div class='del'>-	snd_hda_codec_write(codec, 0x05, 0,</div><div class='del'>-			    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    spec-&gt;cur_eapd ? PIN_OUT : 0);</div><div class='del'>-	/* toggle HP mute appropriately */</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x06, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE,</div><div class='del'>-				 spec-&gt;cur_eapd ? 0 : HDA_AMP_MUTE);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bind volumes of both NID 0x05 and 0x06 */</div><div class='del'>-static struct hda_bind_ctls ad1981_hp_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x06, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void ad1981_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x06);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x05, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in and mic jack appropriately */</div><div class='del'>-static void ad1981_hp_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	static struct hda_verb mic_jack_on[] = {</div><div class='del'>-		{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-		{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb mic_jack_off[] = {</div><div class='del'>-		{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-		{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x08);</div><div class='del'>-	if (present)</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_on);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void ad1981_hp_unsol_event(struct hda_codec *codec,</div><div class='del'>-				  unsigned int res)</div><div class='del'>-{</div><div class='del'>-	res &gt;&gt;= 26;</div><div class='del'>-	switch (res) {</div><div class='del'>-	case AD1981_HP_EVENT:</div><div class='del'>-		ad1981_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case AD1981_MIC_EVENT:</div><div class='del'>-		ad1981_hp_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1981_hp_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Docking-Station", 0x1 },</div><div class='del'>-		{ "Mix", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1981_hp_mixers[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;ad1981_hp_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x05,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = ad198x_eapd_info,</div><div class='del'>-		.get = ad198x_eapd_get,</div><div class='del'>-		.put = ad1981_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x05,</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: analog mic/line loopback doesn't work with my tests...</div><div class='del'>-	 *        (although recording is OK)</div><div class='del'>-	 */</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Docking-Station Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Docking-Station Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	/* FIXME: does this laptop have analog CD connection? */</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-#endif</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x18, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int ad1981_hp_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1981_hp_automute(codec);</div><div class='del'>-	ad1981_hp_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* configuration for Toshiba Laptops */</div><div class='del'>-static struct hda_verb ad1981_toshiba_init_verbs[] = {</div><div class='del'>-	{0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x01 }, /* default on */</div><div class='del'>-	/* pin sensing on HP and Mic jacks */</div><div class='del'>-	{0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},</div><div class='del'>-	{0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1981_toshiba_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Amp Volume", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Amp Switch", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* configuration for Lenovo Thinkpad T60 */</div><div class='del'>-static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* identical with AD1983 */</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1981_thinkpad_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Mix", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* models */</div><div class='del'>-enum {</div><div class='del'>-	AD1981_BASIC,</div><div class='del'>-	AD1981_HP,</div><div class='del'>-	AD1981_THINKPAD,</div><div class='del'>-	AD1981_TOSHIBA,</div><div class='del'>-	AD1981_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad1981_models[AD1981_MODELS] = {</div><div class='del'>-	[AD1981_HP]		= "hp",</div><div class='del'>-	[AD1981_THINKPAD]	= "thinkpad",</div><div class='del'>-	[AD1981_BASIC]		= "basic",</div><div class='del'>-	[AD1981_TOSHIBA]	= "toshiba"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk ad1981_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x1014, 0x05b7, "Lenovo Z60m", AD1981_THINKPAD),</div><div class='del'>-	/* All HP models */</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x103c, "HP nx", AD1981_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),</div><div class='del'>-	/* Lenovo Thinkpad T60/X60/Z6xx */</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1981_THINKPAD),</div><div class='del'>-	/* HP nx6320 (reversed SSID, H/W bug) */</div><div class='del'>-	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_HP),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ad1981(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(ad1981_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1981_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1981_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = ad1981_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1981_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;ad1981_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = ad1981_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1981_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1981_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x05;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	/* override some parameters */</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1981_MODELS,</div><div class='del'>-						  ad1981_models,</div><div class='del'>-						  ad1981_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1981_HP:</div><div class='del'>-		spec-&gt;mixers[0] = ad1981_hp_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1981_hp_init_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1981_hp_capture_source;</div><div class='del'>-</div><div class='del'>-		codec-&gt;patch_ops.init = ad1981_hp_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1981_hp_unsol_event;</div><div class='del'>-		/* set the upper-limit for mixer amp to 0dB for avoiding the</div><div class='del'>-		 * possible damage by overloading</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	case AD1981_THINKPAD:</div><div class='del'>-		spec-&gt;mixers[0] = ad1981_thinkpad_mixers;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1981_thinkpad_capture_source;</div><div class='del'>-		/* set the upper-limit for mixer amp to 0dB for avoiding the</div><div class='del'>-		 * possible damage by overloading</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	case AD1981_TOSHIBA:</div><div class='del'>-		spec-&gt;mixers[0] = ad1981_hp_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = ad1981_toshiba_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = ad1981_toshiba_init_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1981_hp_capture_source;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1981_hp_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1981_hp_unsol_event;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1988</div><div class='del'>- *</div><div class='del'>- * Output pins and routes</div><div class='del'>- *</div><div class='del'>- *        Pin               Mix     Sel     DAC (*)</div><div class='del'>- * port-A 0x11 (mute/hp) &lt;- 0x22 &lt;- 0x37 &lt;- 03/04/06</div><div class='del'>- * port-B 0x14 (mute/hp) &lt;- 0x2b &lt;- 0x30 &lt;- 03/04/06</div><div class='del'>- * port-C 0x15 (mute)    &lt;- 0x2c &lt;- 0x31 &lt;- 05/0a</div><div class='del'>- * port-D 0x12 (mute/hp) &lt;- 0x29         &lt;- 04</div><div class='del'>- * port-E 0x17 (mute/hp) &lt;- 0x26 &lt;- 0x32 &lt;- 05/0a</div><div class='del'>- * port-F 0x16 (mute)    &lt;- 0x2a         &lt;- 06</div><div class='del'>- * port-G 0x24 (mute)    &lt;- 0x27         &lt;- 05</div><div class='del'>- * port-H 0x25 (mute)    &lt;- 0x28         &lt;- 0a</div><div class='del'>- * mono   0x13 (mute/amp)&lt;- 0x1e &lt;- 0x36 &lt;- 03/04/06</div><div class='del'>- *</div><div class='del'>- * DAC0 = 03h, DAC1 = 04h, DAC2 = 05h, DAC3 = 06h, DAC4 = 0ah</div><div class='del'>- * (*) DAC2/3/4 are swapped to DAC3/4/2 on AD198A rev.2 due to a h/w bug.</div><div class='del'>- *</div><div class='del'>- * Input pins and routes</div><div class='del'>- *</div><div class='del'>- *        pin     boost   mix input # / adc input #</div><div class='del'>- * port-A 0x11 -&gt; 0x38 -&gt; mix 2, ADC 0</div><div class='del'>- * port-B 0x14 -&gt; 0x39 -&gt; mix 0, ADC 1</div><div class='del'>- * port-C 0x15 -&gt; 0x3a -&gt; 33:0 - mix 1, ADC 2</div><div class='del'>- * port-D 0x12 -&gt; 0x3d -&gt; mix 3, ADC 8</div><div class='del'>- * port-E 0x17 -&gt; 0x3c -&gt; 34:0 - mix 4, ADC 4</div><div class='del'>- * port-F 0x16 -&gt; 0x3b -&gt; mix 5, ADC 3</div><div class='del'>- * port-G 0x24 -&gt; N/A  -&gt; 33:1 - mix 1, 34:1 - mix 4, ADC 6</div><div class='del'>- * port-H 0x25 -&gt; N/A  -&gt; 33:2 - mix 1, 34:2 - mix 4, ADC 7</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * DAC assignment</div><div class='del'>- *   6stack - front/surr/CLFE/side/opt DACs - 04/06/05/0a/03</div><div class='del'>- *   3stack - front/surr/CLFE/opt DACs - 04/05/0a/03</div><div class='del'>- *</div><div class='del'>- * Inputs of Analog Mix (0x20)</div><div class='del'>- *   0:Port-B (front mic)</div><div class='del'>- *   1:Port-C/G/H (line-in)</div><div class='del'>- *   2:Port-A</div><div class='del'>- *   3:Port-D (line-in/2)</div><div class='del'>- *   4:Port-E/G/H (mic-in)</div><div class='del'>- *   5:Port-F (mic2-in)</div><div class='del'>- *   6:CD</div><div class='del'>- *   7:Beep</div><div class='del'>- *</div><div class='del'>- * ADC selection</div><div class='del'>- *   0:Port-A</div><div class='del'>- *   1:Port-B (front mic-in)</div><div class='del'>- *   2:Port-C (line-in)</div><div class='del'>- *   3:Port-F (mic2-in)</div><div class='del'>- *   4:Port-E (mic-in)</div><div class='del'>- *   5:CD</div><div class='del'>- *   6:Port-G</div><div class='del'>- *   7:Port-H</div><div class='del'>- *   8:Port-D (line-in/2)</div><div class='del'>- *   9:Mix</div><div class='del'>- *</div><div class='del'>- * Proposed pin assignments by the datasheet</div><div class='del'>- *</div><div class='del'>- * 6-stack</div><div class='del'>- * Port-A front headphone</div><div class='del'>- *      B front mic-in</div><div class='del'>- *      C rear line-in</div><div class='del'>- *      D rear front-out</div><div class='del'>- *      E rear mic-in</div><div class='del'>- *      F rear surround</div><div class='del'>- *      G rear CLFE</div><div class='del'>- *      H rear side</div><div class='del'>- *</div><div class='del'>- * 3-stack</div><div class='del'>- * Port-A front headphone</div><div class='del'>- *      B front mic</div><div class='del'>- *      C rear line-in/surround</div><div class='del'>- *      D rear front-out</div><div class='del'>- *      E rear mic-in/CLFE</div><div class='del'>- *</div><div class='del'>- * laptop</div><div class='del'>- * Port-A headphone</div><div class='del'>- *      B mic-in</div><div class='del'>- *      C docking station</div><div class='del'>- *      D internal speaker (with EAPD)</div><div class='del'>- *      E/F quad mic array</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* models */</div><div class='del'>-enum {</div><div class='del'>-	AD1988_6STACK,</div><div class='del'>-	AD1988_6STACK_DIG,</div><div class='del'>-	AD1988_3STACK,</div><div class='del'>-	AD1988_3STACK_DIG,</div><div class='del'>-	AD1988_LAPTOP,</div><div class='del'>-	AD1988_LAPTOP_DIG,</div><div class='del'>-	AD1988_AUTO,</div><div class='del'>-	AD1988_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* reivision id to check workarounds */</div><div class='del'>-#define AD1988A_REV2		0x100200</div><div class='del'>-</div><div class='del'>-#define is_rev2(codec) \</div><div class='del'>-	((codec)-&gt;vendor_id == 0x11d41988 &amp;&amp; \</div><div class='del'>-	 (codec)-&gt;revision_id == AD1988A_REV2)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * mixers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_6stack_dac_nids[4] = {</div><div class='del'>-	0x04, 0x06, 0x05, 0x0a</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_3stack_dac_nids[3] = {</div><div class='del'>-	0x04, 0x05, 0x0a</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* for AD1988A revision-2, DAC2-4 are swapped */</div><div class='del'>-static hda_nid_t ad1988_6stack_dac_nids_rev2[4] = {</div><div class='del'>-	0x04, 0x05, 0x0a, 0x06</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = {</div><div class='del'>-	0x04, 0x0a, 0x06</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_adc_nids[3] = {</div><div class='del'>-	0x08, 0x09, 0x0f</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_capsrc_nids[3] = {</div><div class='del'>-	0x0c, 0x0d, 0x0e</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AD1988_SPDIF_OUT		0x02</div><div class='del'>-#define AD1988_SPDIF_OUT_HDMI	0x0b</div><div class='del'>-#define AD1988_SPDIF_IN		0x07</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1989b_slave_dig_outs[] = {</div><div class='del'>-	AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1988_6stack_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x1 },	/* port-B */</div><div class='del'>-		{ "Line", 0x2 },	/* port-C */</div><div class='del'>-		{ "Mic", 0x4 },		/* port-E */</div><div class='del'>-		{ "CD", 0x5 },</div><div class='del'>-		{ "Mix", 0x9 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1988_laptop_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic/Line", 0x1 },	/* port-B */</div><div class='del'>-		{ "CD", 0x5 },</div><div class='del'>-		{ "Mix", 0x9 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			       struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_info(codec, uinfo, spec-&gt;channel_mode,</div><div class='del'>-				    spec-&gt;num_channel_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_get(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				   spec-&gt;num_channel_mode, spec-&gt;multiout.max_channels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err = snd_hda_ch_mode_put(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				      spec-&gt;num_channel_mode,</div><div class='del'>-				      &amp;spec-&gt;multiout.max_channels);</div><div class='del'>-	if (err &gt;= 0 &amp;&amp; spec-&gt;need_dac_fix)</div><div class='del'>-		spec-&gt;multiout.num_dacs = spec-&gt;multiout.max_channels / 2;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 6-stack mode */</div><div class='del'>-static struct snd_kcontrol_new ad1988_6stack_mixers1[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0a, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x2a, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x27, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x27, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x28, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 3-stack mode */</div><div class='del'>-static struct snd_kcontrol_new ad1988_3stack_mixers1[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x2c, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x26, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x26, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = ad198x_ch_mode_info,</div><div class='del'>-		.get = ad198x_ch_mode_get,</div><div class='del'>-		.put = ad198x_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* laptop mode */</div><div class='del'>-static struct snd_kcontrol_new ad1988_laptop_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x29, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x39, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "External Amplifier",</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x12,</div><div class='del'>-		.info = ad198x_eapd_info,</div><div class='del'>-		.get = ad198x_eapd_get,</div><div class='del'>-		.put = ad198x_eapd_put,</div><div class='del'>-		.private_value = 0x12, /* port-D */</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* capture */</div><div class='del'>-static struct snd_kcontrol_new ad1988_capture_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x0e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x0e, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 3,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad1988_spdif_playback_source_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-					     struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	static char *texts[] = {</div><div class='del'>-		"PCM", "ADC1", "ADC2", "ADC3"</div><div class='del'>-	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-					    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int sel;</div><div class='del'>-</div><div class='del'>-	sel = snd_hda_codec_read(codec, 0x1d, 0, AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-				 AC_AMP_GET_INPUT);</div><div class='del'>-	if (!(sel &amp; 0x80))</div><div class='del'>-		ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='del'>-	else {</div><div class='del'>-		sel = snd_hda_codec_read(codec, 0x0b, 0,</div><div class='del'>-					 AC_VERB_GET_CONNECT_SEL, 0);</div><div class='del'>-		if (sel &lt; 3)</div><div class='del'>-			sel++;</div><div class='del'>-		else</div><div class='del'>-			sel = 0;</div><div class='del'>-		ucontrol-&gt;value.enumerated.item[0] = sel;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int val, sel;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	val = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (val &gt; 3)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (!val) {</div><div class='del'>-		sel = snd_hda_codec_read(codec, 0x1d, 0,</div><div class='del'>-					 AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-					 AC_AMP_GET_INPUT);</div><div class='del'>-		change = sel &amp; 0x80;</div><div class='del'>-		if (change) {</div><div class='del'>-			snd_hda_codec_write_cache(codec, 0x1d, 0,</div><div class='del'>-						  AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						  AMP_IN_UNMUTE(0));</div><div class='del'>-			snd_hda_codec_write_cache(codec, 0x1d, 0,</div><div class='del'>-						  AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						  AMP_IN_MUTE(1));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		sel = snd_hda_codec_read(codec, 0x1d, 0,</div><div class='del'>-					 AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-					 AC_AMP_GET_INPUT | 0x01);</div><div class='del'>-		change = sel &amp; 0x80;</div><div class='del'>-		if (change) {</div><div class='del'>-			snd_hda_codec_write_cache(codec, 0x1d, 0,</div><div class='del'>-						  AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						  AMP_IN_MUTE(0));</div><div class='del'>-			snd_hda_codec_write_cache(codec, 0x1d, 0,</div><div class='del'>-						  AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						  AMP_IN_UNMUTE(1));</div><div class='del'>-		}</div><div class='del'>-		sel = snd_hda_codec_read(codec, 0x0b, 0,</div><div class='del'>-					 AC_VERB_GET_CONNECT_SEL, 0) + 1;</div><div class='del'>-		change |= sel != val;</div><div class='del'>-		if (change)</div><div class='del'>-			snd_hda_codec_write_cache(codec, 0x0b, 0,</div><div class='del'>-						  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-						  val - 1);</div><div class='del'>-	}</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "IEC958 Playback Source",</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,</div><div class='del'>-		.info = ad1988_spdif_playback_source_info,</div><div class='del'>-		.get = ad1988_spdif_playback_source_get,</div><div class='del'>-		.put = ad1988_spdif_playback_source_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1988_spdif_in_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Capture Volume", 0x1c, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1989_spdif_out_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("HDMI Playback Volume", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * for 6-stack (+dig)</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1988_6stack_init_verbs[] = {</div><div class='del'>-	/* Front, Surround, CLFE, side DAC; unmute as default */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-A front headphon path */</div><div class='del'>-	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Port-D line-out path */</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Port-F surround path */</div><div class='del'>-	{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Port-G CLFE path */</div><div class='del'>-	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Port-H side path */</div><div class='del'>-	{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Mono out path */</div><div class='del'>-	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */</div><div class='del'>-	/* Port-B front mic-in path */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Port-C line-in path */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Port-E mic-in path */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x34, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Analog CD Input */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_capture_init_verbs[] = {</div><div class='del'>-	/* mute analog mix */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* select ADCs - front-mic */</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_spdif_init_verbs[] = {</div><div class='del'>-	/* SPDIF out sel */</div><div class='del'>-	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1 */</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* SPDIF out pin */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_spdif_in_init_verbs[] = {</div><div class='del'>-	/* unmute SPDIF input pin */</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* AD1989 has no ADC -&gt; SPDIF route */</div><div class='del'>-static struct hda_verb ad1989_spdif_init_verbs[] = {</div><div class='del'>-	/* SPDIF-1 out pin */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	/* SPDIF-2/HDMI out pin */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * verbs for 3stack (+dig)</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1988_3stack_ch2_init[] = {</div><div class='del'>-	/* set port-C to line-in */</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	/* set port-E to mic-in */</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_3stack_ch6_init[] = {</div><div class='del'>-	/* set port-C to surround out */</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	/* set port-E to CLFE out */</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode ad1988_3stack_modes[2] = {</div><div class='del'>-	{ 2, ad1988_3stack_ch2_init },</div><div class='del'>-	{ 6, ad1988_3stack_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_3stack_init_verbs[] = {</div><div class='del'>-	/* Front, Surround, CLFE, side DAC; unmute as default */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-A front headphon path */</div><div class='del'>-	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Port-D line-out path */</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Mono out path */</div><div class='del'>-	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */</div><div class='del'>-	/* Port-B front mic-in path */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Port-C line-in/surround path - 6ch mode as default */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x31, AC_VERB_SET_CONNECT_SEL, 0x0}, /* output sel: DAC 0x05 */</div><div class='del'>-	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* Port-E mic-in/CLFE path - 6ch mode as default */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x32, AC_VERB_SET_CONNECT_SEL, 0x1}, /* output sel: DAC 0x0a */</div><div class='del'>-	{0x34, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* mute analog mix */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* select ADCs - front-mic */</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * verbs for laptop mode (+dig)</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1988_laptop_hp_on[] = {</div><div class='del'>-	/* unmute port-A and mute port-D */</div><div class='del'>-	{ 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-static struct hda_verb ad1988_laptop_hp_off[] = {</div><div class='del'>-	/* mute port-A and unmute port-D */</div><div class='del'>-	{ 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AD1988_HP_EVENT	0x01</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1988_laptop_init_verbs[] = {</div><div class='del'>-	/* Front, Surround, CLFE, side DAC; unmute as default */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-A front headphon path */</div><div class='del'>-	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* unsolicited event for pin-sense */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1988_HP_EVENT },</div><div class='del'>-	/* Port-D line-out path + EAPD */</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x00}, /* EAPD-off */</div><div class='del'>-	/* Mono out path */</div><div class='del'>-	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */</div><div class='del'>-	/* Port-B mic-in path */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Port-C docking station - try to output */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* mute analog mix */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* select ADCs - mic */</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != AD1988_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	if (snd_hda_jack_detect(codec, 0x11))</div><div class='del'>-		snd_hda_sequence_write(codec, ad1988_laptop_hp_on);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_sequence_write(codec, ad1988_laptop_hp_off);</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1988_loopbacks[] = {</div><div class='del'>-	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 1 }, /* Line */</div><div class='del'>-	{ 0x20, HDA_INPUT, 4 }, /* Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 6 }, /* CD */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Automatic parse of I/O pins from the BIOS configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	AD_CTL_WIDGET_VOL,</div><div class='del'>-	AD_CTL_WIDGET_MUTE,</div><div class='del'>-	AD_CTL_BIND_MUTE,</div><div class='del'>-};</div><div class='del'>-static struct snd_kcontrol_new ad1988_control_templates[] = {</div><div class='del'>-	HDA_CODEC_VOLUME(NULL, 0, 0, 0),</div><div class='del'>-	HDA_CODEC_MUTE(NULL, 0, 0, 0),</div><div class='del'>-	HDA_BIND_MUTE(NULL, 0, 0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* add dynamic controls */</div><div class='del'>-static int add_control(struct ad198x_spec *spec, int type, const char *name,</div><div class='del'>-		       unsigned long val)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;kctls, sizeof(*knew), 32);</div><div class='del'>-	knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	*knew = ad1988_control_templates[type];</div><div class='del'>-	knew-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (! knew-&gt;name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (get_amp_nid_(val))</div><div class='del'>-		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-	knew-&gt;private_value = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AD1988_PIN_CD_NID		0x18</div><div class='del'>-#define AD1988_PIN_BEEP_NID		0x10</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_mixer_nids[8] = {</div><div class='del'>-	/* A     B     C     D     E     F     G     H */</div><div class='del'>-	0x22, 0x2b, 0x2c, 0x29, 0x26, 0x2a, 0x27, 0x28</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t idx_to_dac[8] = {</div><div class='del'>-		/* A     B     C     D     E     F     G     H */</div><div class='del'>-		0x04, 0x06, 0x05, 0x04, 0x0a, 0x06, 0x05, 0x0a</div><div class='del'>-	};</div><div class='del'>-	static hda_nid_t idx_to_dac_rev2[8] = {</div><div class='del'>-		/* A     B     C     D     E     F     G     H */</div><div class='del'>-		0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06</div><div class='del'>-	};</div><div class='del'>-	if (is_rev2(codec))</div><div class='del'>-		return idx_to_dac_rev2[idx];</div><div class='del'>-	else</div><div class='del'>-		return idx_to_dac[idx];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1988_boost_nids[8] = {</div><div class='del'>-	0x38, 0x39, 0x3a, 0x3d, 0x3c, 0x3b, 0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad1988_pin_idx(hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t ad1988_io_pins[8] = {</div><div class='del'>-		0x11, 0x14, 0x15, 0x12, 0x17, 0x16, 0x24, 0x25</div><div class='del'>-	};</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ad1988_io_pins); i++)</div><div class='del'>-		if (ad1988_io_pins[i] == nid)</div><div class='del'>-			return i;</div><div class='del'>-	return 0; /* should be -1 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1988_pin_to_loopback_idx(hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	static int loopback_idx[8] = {</div><div class='del'>-		2, 0, 1, 3, 4, 5, 1, 4</div><div class='del'>-	};</div><div class='del'>-	switch (nid) {</div><div class='del'>-	case AD1988_PIN_CD_NID:</div><div class='del'>-		return 6;</div><div class='del'>-	default:</div><div class='del'>-		return loopback_idx[ad1988_pin_idx(nid)];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1988_pin_to_adc_idx(hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	static int adc_idx[8] = {</div><div class='del'>-		0, 1, 2, 8, 4, 3, 6, 7</div><div class='del'>-	};</div><div class='del'>-	switch (nid) {</div><div class='del'>-	case AD1988_PIN_CD_NID:</div><div class='del'>-		return 5;</div><div class='del'>-	default:</div><div class='del'>-		return adc_idx[ad1988_pin_idx(nid)];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int ad1988_auto_fill_dac_nids(struct hda_codec *codec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, idx;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	/* check the pins hardwired to audio widget */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		idx = ad1988_pin_idx(cfg-&gt;line_out_pins[i]);</div><div class='del'>-		spec-&gt;multiout.dac_nids[i] = ad1988_idx_to_dac(codec, idx);</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int ad1988_auto_create_multi_out_ctls(struct ad198x_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		hda_nid_t dac = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-		if (! dac)</div><div class='del'>-			continue;</div><div class='del'>-		nid = ad1988_mixer_nids[ad1988_pin_idx(cfg-&gt;line_out_pins[i])];</div><div class='del'>-		if (i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = add_control(spec, AD_CTL_WIDGET_VOL,</div><div class='del'>-					  "Center Playback Volume",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(dac, 1, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_control(spec, AD_CTL_WIDGET_VOL,</div><div class='del'>-					  "LFE Playback Volume",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(dac, 2, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_control(spec, AD_CTL_BIND_MUTE,</div><div class='del'>-					  "Center Playback Switch",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_control(spec, AD_CTL_BIND_MUTE,</div><div class='del'>-					  "LFE Playback Switch",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = add_control(spec, AD_CTL_WIDGET_VOL, name,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = add_control(spec, AD_CTL_BIND_MUTE, name,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for speaker and HP outputs */</div><div class='del'>-static int ad1988_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-					const char *pfx)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, idx, err;</div><div class='del'>-	char name[32];</div><div class='del'>-</div><div class='del'>-	if (! pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	idx = ad1988_pin_idx(pin);</div><div class='del'>-	nid = ad1988_idx_to_dac(codec, idx);</div><div class='del'>-	/* check whether the corresponding DAC was already taken */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t pin = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		hda_nid_t dac = ad1988_idx_to_dac(codec, ad1988_pin_idx(pin));</div><div class='del'>-		if (dac == nid)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i &gt;= spec-&gt;autocfg.line_outs) {</div><div class='del'>-		/* specify the DAC as the extra output */</div><div class='del'>-		if (!spec-&gt;multiout.hp_nid)</div><div class='del'>-			spec-&gt;multiout.hp_nid = nid;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.extra_out_nid[0] = nid;</div><div class='del'>-		/* control HP volume/switch on the output mixer amp */</div><div class='del'>-		sprintf(name, "%s Playback Volume", pfx);</div><div class='del'>-		err = add_control(spec, AD_CTL_WIDGET_VOL, name,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	nid = ad1988_mixer_nids[idx];</div><div class='del'>-	sprintf(name, "%s Playback Switch", pfx);</div><div class='del'>-	if ((err = add_control(spec, AD_CTL_BIND_MUTE, name,</div><div class='del'>-			       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create input playback/capture controls for the given pin */</div><div class='del'>-static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,</div><div class='del'>-			    const char *ctlname, int ctlidx, int boost)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	int err, idx;</div><div class='del'>-</div><div class='del'>-	sprintf(name, "%s Playback Volume", ctlname);</div><div class='del'>-	idx = ad1988_pin_to_loopback_idx(pin);</div><div class='del'>-	if ((err = add_control(spec, AD_CTL_WIDGET_VOL, name,</div><div class='del'>-			       HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	sprintf(name, "%s Playback Switch", ctlname);</div><div class='del'>-	if ((err = add_control(spec, AD_CTL_WIDGET_MUTE, name,</div><div class='del'>-			       HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (boost) {</div><div class='del'>-		hda_nid_t bnid;</div><div class='del'>-		idx = ad1988_pin_idx(pin);</div><div class='del'>-		bnid = ad1988_boost_nids[idx];</div><div class='del'>-		if (bnid) {</div><div class='del'>-			sprintf(name, "%s Boost", ctlname);</div><div class='del'>-			return add_control(spec, AD_CTL_WIDGET_VOL, name,</div><div class='del'>-					   HDA_COMPOSE_AMP_VAL(bnid, 3, idx, HDA_OUTPUT));</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int ad1988_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux;</div><div class='del'>-	int i, err, type, type_idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		const char *label;</div><div class='del'>-		type = cfg-&gt;inputs[i].type;</div><div class='del'>-		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-		snd_hda_add_imux_item(imux, label,</div><div class='del'>-				      ad1988_pin_to_adc_idx(cfg-&gt;inputs[i].pin),</div><div class='del'>-				      &amp;type_idx);</div><div class='del'>-		err = new_analog_input(spec, cfg-&gt;inputs[i].pin,</div><div class='del'>-				       label, type_idx,</div><div class='del'>-				       type == AUTO_PIN_MIC);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	snd_hda_add_imux_item(imux, "Mix", 9, NULL);</div><div class='del'>-</div><div class='del'>-	if ((err = add_control(spec, AD_CTL_WIDGET_VOL,</div><div class='del'>-			       "Analog Mix Playback Volume",</div><div class='del'>-			       HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if ((err = add_control(spec, AD_CTL_WIDGET_MUTE,</div><div class='del'>-			       "Analog Mix Playback Switch",</div><div class='del'>-			       HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1988_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type,</div><div class='del'>-					      int dac_idx)</div><div class='del'>-{</div><div class='del'>-	/* set as output */</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='del'>-	switch (nid) {</div><div class='del'>-	case 0x11: /* port-A - DAC 04 */</div><div class='del'>-		snd_hda_codec_write(codec, 0x37, 0, AC_VERB_SET_CONNECT_SEL, 0x01);</div><div class='del'>-		break;</div><div class='del'>-	case 0x14: /* port-B - DAC 06 */</div><div class='del'>-		snd_hda_codec_write(codec, 0x30, 0, AC_VERB_SET_CONNECT_SEL, 0x02);</div><div class='del'>-		break;</div><div class='del'>-	case 0x15: /* port-C - DAC 05 */</div><div class='del'>-		snd_hda_codec_write(codec, 0x31, 0, AC_VERB_SET_CONNECT_SEL, 0x00);</div><div class='del'>-		break;</div><div class='del'>-	case 0x17: /* port-E - DAC 0a */</div><div class='del'>-		snd_hda_codec_write(codec, 0x32, 0, AC_VERB_SET_CONNECT_SEL, 0x01);</div><div class='del'>-		break;</div><div class='del'>-	case 0x13: /* mono - DAC 04 */</div><div class='del'>-		snd_hda_codec_write(codec, 0x36, 0, AC_VERB_SET_CONNECT_SEL, 0x01);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1988_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		ad1988_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1988_auto_init_extra_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	pin = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (pin) /* connect to front */</div><div class='del'>-		ad1988_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);</div><div class='del'>-	pin = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (pin) /* connect to front */</div><div class='del'>-		ad1988_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ad1988_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, idx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		switch (nid) {</div><div class='del'>-		case 0x15: /* port-C */</div><div class='del'>-			snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		case 0x17: /* port-E */</div><div class='del'>-			snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_CONNECT_SEL, 0x0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    i == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN);</div><div class='del'>-		if (nid != AD1988_PIN_CD_NID)</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-					    AMP_OUT_MUTE);</div><div class='del'>-		idx = ad1988_pin_idx(nid);</div><div class='del'>-		if (ad1988_boost_nids[idx])</div><div class='del'>-			snd_hda_codec_write(codec, ad1988_boost_nids[idx], 0,</div><div class='del'>-					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-					    AMP_OUT_ZERO);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the BIOS configuration and set up the alc_spec */</div><div class='del'>-/* return 1 if successful, 0 if the proper config is not found, or a negative error code */</div><div class='del'>-static int ad1988_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if ((err = ad1988_auto_fill_dac_nids(codec, &amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (! spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-	if ((err = ad1988_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg)) &lt; 0 ||</div><div class='del'>-	    (err = ad1988_auto_create_extra_out(codec,</div><div class='del'>-						spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-						"Speaker")) &lt; 0 ||</div><div class='del'>-	    (err = ad1988_auto_create_extra_out(codec, spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-						"Headphone")) &lt; 0 ||</div><div class='del'>-	    (err = ad1988_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = AD1988_SPDIF_OUT;</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = AD1988_SPDIF_IN;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_init_verbs++] = ad1988_6stack_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static int ad1988_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1988_auto_init_multi_out(codec);</div><div class='del'>-	ad1988_auto_init_extra_out(codec);</div><div class='del'>-	ad1988_auto_init_analog_input(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *ad1988_models[AD1988_MODEL_LAST] = {</div><div class='del'>-	[AD1988_6STACK]		= "6stack",</div><div class='del'>-	[AD1988_6STACK_DIG]	= "6stack-dig",</div><div class='del'>-	[AD1988_3STACK]		= "3stack",</div><div class='del'>-	[AD1988_3STACK_DIG]	= "3stack-dig",</div><div class='del'>-	[AD1988_LAPTOP]		= "laptop",</div><div class='del'>-	[AD1988_LAPTOP_DIG]	= "laptop-dig",</div><div class='del'>-	[AD1988_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk ad1988_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ad1988(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	if (is_rev2(codec))</div><div class='del'>-		snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST,</div><div class='del'>-						  ad1988_models, ad1988_cfg_tbl);</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = AD1988_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == AD1988_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = ad1988_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			ad198x_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (! err) {</div><div class='del'>-			printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 6-stack mode...\n");</div><div class='del'>-			board_config = AD1988_6STACK;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1988_6STACK:</div><div class='del'>-	case AD1988_6STACK_DIG:</div><div class='del'>-		spec-&gt;multiout.max_channels = 8;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 4;</div><div class='del'>-		if (is_rev2(codec))</div><div class='del'>-			spec-&gt;multiout.dac_nids = ad1988_6stack_dac_nids_rev2;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.dac_nids = ad1988_6stack_dac_nids;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1988_6stack_capture_source;</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		if (is_rev2(codec))</div><div class='del'>-			spec-&gt;mixers[0] = ad1988_6stack_mixers1_rev2;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;mixers[0] = ad1988_6stack_mixers1;</div><div class='del'>-		spec-&gt;mixers[1] = ad1988_6stack_mixers2;</div><div class='del'>-		spec-&gt;num_init_verbs = 1;</div><div class='del'>-		spec-&gt;init_verbs[0] = ad1988_6stack_init_verbs;</div><div class='del'>-		if (board_config == AD1988_6STACK_DIG) {</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = AD1988_SPDIF_OUT;</div><div class='del'>-			spec-&gt;dig_in_nid = AD1988_SPDIF_IN;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case AD1988_3STACK:</div><div class='del'>-	case AD1988_3STACK_DIG:</div><div class='del'>-		spec-&gt;multiout.max_channels = 6;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 3;</div><div class='del'>-		if (is_rev2(codec))</div><div class='del'>-			spec-&gt;multiout.dac_nids = ad1988_3stack_dac_nids_rev2;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.dac_nids = ad1988_3stack_dac_nids;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1988_6stack_capture_source;</div><div class='del'>-		spec-&gt;channel_mode = ad1988_3stack_modes;</div><div class='del'>-		spec-&gt;num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes);</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		if (is_rev2(codec))</div><div class='del'>-			spec-&gt;mixers[0] = ad1988_3stack_mixers1_rev2;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;mixers[0] = ad1988_3stack_mixers1;</div><div class='del'>-		spec-&gt;mixers[1] = ad1988_3stack_mixers2;</div><div class='del'>-		spec-&gt;num_init_verbs = 1;</div><div class='del'>-		spec-&gt;init_verbs[0] = ad1988_3stack_init_verbs;</div><div class='del'>-		if (board_config == AD1988_3STACK_DIG)</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = AD1988_SPDIF_OUT;</div><div class='del'>-		break;</div><div class='del'>-	case AD1988_LAPTOP:</div><div class='del'>-	case AD1988_LAPTOP_DIG:</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		spec-&gt;multiout.dac_nids = ad1988_3stack_dac_nids;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1988_laptop_capture_source;</div><div class='del'>-		spec-&gt;num_mixers = 1;</div><div class='del'>-		spec-&gt;mixers[0] = ad1988_laptop_mixers;</div><div class='del'>-		spec-&gt;inv_eapd = 1; /* inverted EAPD */</div><div class='del'>-		spec-&gt;num_init_verbs = 1;</div><div class='del'>-		spec-&gt;init_verbs[0] = ad1988_laptop_init_verbs;</div><div class='del'>-		if (board_config == AD1988_LAPTOP_DIG)</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = AD1988_SPDIF_OUT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(ad1988_adc_nids);</div><div class='del'>-	spec-&gt;adc_nids = ad1988_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1988_capsrc_nids;</div><div class='del'>-	spec-&gt;mixers[spec-&gt;num_mixers++] = ad1988_capture_mixers;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_init_verbs++] = ad1988_capture_init_verbs;</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		if (codec-&gt;vendor_id &gt;= 0x11d4989a) {</div><div class='del'>-			spec-&gt;mixers[spec-&gt;num_mixers++] =</div><div class='del'>-				ad1989_spdif_out_mixers;</div><div class='del'>-			spec-&gt;init_verbs[spec-&gt;num_init_verbs++] =</div><div class='del'>-				ad1989_spdif_init_verbs;</div><div class='del'>-			codec-&gt;slave_dig_outs = ad1989b_slave_dig_outs;</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;mixers[spec-&gt;num_mixers++] =</div><div class='del'>-				ad1988_spdif_out_mixers;</div><div class='del'>-			spec-&gt;init_verbs[spec-&gt;num_init_verbs++] =</div><div class='del'>-				ad1988_spdif_init_verbs;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in_nid &amp;&amp; codec-&gt;vendor_id &lt; 0x11d4989a) {</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = ad1988_spdif_in_mixers;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs++] =</div><div class='del'>-			ad1988_spdif_in_init_verbs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1988_AUTO:</div><div class='del'>-		codec-&gt;patch_ops.init = ad1988_auto_init;</div><div class='del'>-		break;</div><div class='del'>-	case AD1988_LAPTOP:</div><div class='del'>-	case AD1988_LAPTOP_DIG:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1988_laptop_unsol_event;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1988_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x04;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1884 / AD1984</div><div class='del'>- *</div><div class='del'>- * port-B - front line/mic-in</div><div class='del'>- * port-E - aux in/out</div><div class='del'>- * port-F - aux in/out</div><div class='del'>- * port-C - rear line/mic-in</div><div class='del'>- * port-D - rear line/hp-out</div><div class='del'>- * port-A - front line/hp-out</div><div class='del'>- *</div><div class='del'>- * AD1984 = AD1884 + two digital mic-ins</div><div class='del'>- *</div><div class='del'>- * FIXME:</div><div class='del'>- * For simplicity, we share the single DAC for both HP and line-outs</div><div class='del'>- * right now.  The inidividual playbacks could be easily implemented,</div><div class='del'>- * but no build-up framework is given, so far.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1884_dac_nids[1] = {</div><div class='del'>-	0x04,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1884_adc_nids[2] = {</div><div class='del'>-	0x08, 0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1884_capsrc_nids[2] = {</div><div class='del'>-	0x0c, 0x0d,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AD1884_SPDIF_OUT	0x02</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1884_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "CD", 0x2 },</div><div class='del'>-		{ "Mix", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1884_base_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	/* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* SPDIF controls */</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		/* identical with ad1983 */</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1984_dmic_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x05, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Digital Mic Capture Switch", 0x05, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Digital Mic Capture Volume", 1, 0x06, 0x0,</div><div class='del'>-			     HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Digital Mic Capture Switch", 1, 0x06, 0x0,</div><div class='del'>-			   HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1884_init_verbs[] = {</div><div class='del'>-	/* DACs; mute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Port-A (HP) mixer */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-A pin */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* HP selector - select DAC2 */</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Port-D (Line-out) mixer */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-D pin */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mono-out mixer */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Mono-out pin */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mono selector */</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Port-B (front mic) pin */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Port-C (rear mic) pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Analog mixer; mute as default */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */</div><div class='del'>-	/* SPDIF output selector */</div><div class='del'>-	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1884_loopbacks[] = {</div><div class='del'>-	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 1 }, /* Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 2 }, /* CD */</div><div class='del'>-	{ 0x20, HDA_INPUT, 4 }, /* Docking */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const char *ad1884_slave_vols[] = {</div><div class='del'>-	"PCM Playback Volume",</div><div class='del'>-	"Mic Playback Volume",</div><div class='del'>-	"Mono Playback Volume",</div><div class='del'>-	"Front Mic Playback Volume",</div><div class='del'>-	"Mic Playback Volume",</div><div class='del'>-	"CD Playback Volume",</div><div class='del'>-	"Internal Mic Playback Volume",</div><div class='del'>-	"Docking Mic Playback Volume",</div><div class='del'>-	/* "Beep Playback Volume", */</div><div class='del'>-	"IEC958 Playback Volume",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ad1884(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(ad1884_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1884_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1884_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(ad1884_adc_nids);</div><div class='del'>-	spec-&gt;adc_nids = ad1884_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1884_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;ad1884_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = ad1884_base_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1884_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1884_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x04;</div><div class='del'>-	/* we need to cover all playback volumes */</div><div class='del'>-	spec-&gt;slave_vols = ad1884_slave_vols;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lenovo Thinkpad T61/X61</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux ad1984_thinkpad_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x1 },</div><div class='del'>-		{ "Mix", 0x3 },</div><div class='del'>-		{ "Docking-Station", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Dell Precision T3400</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux ad1984_dell_desktop_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Line-In", 0x1 },</div><div class='del'>-		{ "Mix", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	/* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Docking Mic Playback Volume", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Docking Mic Playback Switch", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Docking Mic Boost", 0x25, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* SPDIF controls */</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		/* identical with ad1983 */</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* additional verbs */</div><div class='del'>-static struct hda_verb ad1984_thinkpad_init_verbs[] = {</div><div class='del'>-	/* Port-E (docking station mic) pin */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* docking mic boost */</div><div class='del'>-	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Analog PC Beeper - allow firmware/ACPI beeps */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3) | 0x1a},</div><div class='del'>-	/* Analog mixer - docking mic; mute as default */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* enable EAPD bit */</div><div class='del'>-	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Dell Precision T3400</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line-In Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line-In Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line-In Boost", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Digial MIC ADC NID 0x05 + 0x06 */</div><div class='del'>-static int ad1984_pcm_dmic_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   unsigned int stream_tag,</div><div class='del'>-				   unsigned int format,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_setup_stream(codec, 0x05 + substream-&gt;number,</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ad1984_pcm_dmic_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, 0x05 + substream-&gt;number);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ad1984_pcm_dmic_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x05,</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = ad1984_pcm_dmic_prepare,</div><div class='del'>-		.cleanup = ad1984_pcm_dmic_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ad1984_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = ad198x_build_pcms(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	info = spec-&gt;pcm_rec + codec-&gt;num_pcms;</div><div class='del'>-	codec-&gt;num_pcms++;</div><div class='del'>-	info-&gt;name = "AD1984 Digital Mic";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ad1984_pcm_dmic_capture;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* models */</div><div class='del'>-enum {</div><div class='del'>-	AD1984_BASIC,</div><div class='del'>-	AD1984_THINKPAD,</div><div class='del'>-	AD1984_DELL_DESKTOP,</div><div class='del'>-	AD1984_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad1984_models[AD1984_MODELS] = {</div><div class='del'>-	[AD1984_BASIC]		= "basic",</div><div class='del'>-	[AD1984_THINKPAD]	= "thinkpad",</div><div class='del'>-	[AD1984_DELL_DESKTOP]	= "dell_desktop",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk ad1984_cfg_tbl[] = {</div><div class='del'>-	/* Lenovo Thinkpad T61/X61 */</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ad1984(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int board_config, err;</div><div class='del'>-</div><div class='del'>-	err = patch_ad1884(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	spec = codec-&gt;spec;</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1984_MODELS,</div><div class='del'>-						  ad1984_models, ad1984_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1984_BASIC:</div><div class='del'>-		/* additional digital mics */</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = ad1984_dmic_mixers;</div><div class='del'>-		codec-&gt;patch_ops.build_pcms = ad1984_build_pcms;</div><div class='del'>-		break;</div><div class='del'>-	case AD1984_THINKPAD:</div><div class='del'>-		if (codec-&gt;subsystem_id == 0x17aa20fb) {</div><div class='del'>-			/* Thinpad X300 does not have the ability to do SPDIF,</div><div class='del'>-			   or attach to docking station to use SPDIF */</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		} else</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = AD1884_SPDIF_OUT;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1984_thinkpad_capture_source;</div><div class='del'>-		spec-&gt;mixers[0] = ad1984_thinkpad_mixers;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs++] = ad1984_thinkpad_init_verbs;</div><div class='del'>-		spec-&gt;analog_beep = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AD1984_DELL_DESKTOP:</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1984_dell_desktop_capture_source;</div><div class='del'>-		spec-&gt;mixers[0] = ad1984_dell_desktop_mixers;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1883 / AD1884A / AD1984A / AD1984B</div><div class='del'>- *</div><div class='del'>- * port-B (0x14) - front mic-in</div><div class='del'>- * port-E (0x1c) - rear mic-in</div><div class='del'>- * port-F (0x16) - CD / ext out</div><div class='del'>- * port-C (0x15) - rear line-in</div><div class='del'>- * port-D (0x12) - rear line-out</div><div class='del'>- * port-A (0x11) - front hp-out</div><div class='del'>- *</div><div class='del'>- * AD1984A = AD1884A + digital-mic</div><div class='del'>- * AD1883 = equivalent with AD1984A</div><div class='del'>- * AD1984B = AD1984A + extra SPDIF-out</div><div class='del'>- *</div><div class='del'>- * FIXME:</div><div class='del'>- * We share the single DAC for both HP and line-outs (see AD1884/1984).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1884a_dac_nids[1] = {</div><div class='del'>-	0x03,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ad1884a_adc_nids	ad1884_adc_nids</div><div class='del'>-#define ad1884a_capsrc_nids	ad1884_capsrc_nids</div><div class='del'>-</div><div class='del'>-#define AD1884A_SPDIF_OUT	0x02</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1884a_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Mic", 0x4 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "CD", 0x2 },</div><div class='del'>-		{ "Mix", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1884a_base_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* SPDIF controls */</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		/* identical with ad1983 */</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1884a_init_verbs[] = {</div><div class='del'>-	/* DACs; unmute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	/* Port-A (HP) mixer - route only from analog mixer */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-A pin */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Port-D (Line-out) mixer - route only from analog mixer */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-D pin */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mono-out mixer - route only from analog mixer */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Mono-out pin */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Port-B (front mic) pin */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Port-C (rear line-in) pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Port-E (rear mic) pin */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* no boost */</div><div class='del'>-	/* Port-F (CD) pin */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Analog mixer; mute as default */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, /* aux */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* capture sources */</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* SPDIF output amp */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1884a_loopbacks[] = {</div><div class='del'>-	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 1 }, /* Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 2 }, /* CD */</div><div class='del'>-	{ 0x20, HDA_INPUT, 4 }, /* Docking */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Laptop model</div><div class='del'>- *</div><div class='del'>- * Port A: Headphone jack</div><div class='del'>- * Port B: MIC jack</div><div class='del'>- * Port C: Internal MIC</div><div class='del'>- * Port D: Dock Line Out (if enabled)</div><div class='del'>- * Port E: Dock Line In (if enabled)</div><div class='del'>- * Port F: Internal speakers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	int ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='del'>-	int mute = (!ucontrol-&gt;value.integer.value[0] &amp;&amp;</div><div class='del'>-		    !ucontrol-&gt;value.integer.value[1]);</div><div class='del'>-	/* toggle GPIO1 according to the mute state */</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='del'>-			    mute ? 0x02 : 0x0);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = ad1884a_mobile_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_MUTE("Dock Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	/*HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = ad1884a_mobile_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Capture Volume", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void ad1884a_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x11);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-			    present ? 0x00 : 0x02);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* switch to external mic if plugged */</div><div class='del'>-static void ad1884a_hp_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x14);</div><div class='del'>-	snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-			    present ? 0 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AD1884A_HP_EVENT		0x37</div><div class='del'>-#define AD1884A_MIC_EVENT		0x36</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void ad1884a_hp_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case AD1884A_HP_EVENT:</div><div class='del'>-		ad1884a_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case AD1884A_MIC_EVENT:</div><div class='del'>-		ad1884a_hp_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int ad1884a_hp_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1884a_hp_automute(codec);</div><div class='del'>-	ad1884a_hp_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP or docking HP is plugged */</div><div class='del'>-static void ad1884a_laptop_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x11);</div><div class='del'>-	if (!present)</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x12);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-			    present ? 0x00 : 0x02);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* switch to external mic if plugged */</div><div class='del'>-static void ad1884a_laptop_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int idx;</div><div class='del'>-</div><div class='del'>-	if (snd_hda_jack_detect(codec, 0x14))</div><div class='del'>-		idx = 0;</div><div class='del'>-	else if (snd_hda_jack_detect(codec, 0x1c))</div><div class='del'>-		idx = 4;</div><div class='del'>-	else</div><div class='del'>-		idx = 1;</div><div class='del'>-	snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void ad1884a_laptop_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case AD1884A_HP_EVENT:</div><div class='del'>-		ad1884a_laptop_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case AD1884A_MIC_EVENT:</div><div class='del'>-		ad1884a_laptop_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int ad1884a_laptop_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1884a_laptop_automute(codec);</div><div class='del'>-	ad1884a_laptop_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional verbs for laptop model */</div><div class='del'>-static struct hda_verb ad1884a_laptop_verbs[] = {</div><div class='del'>-	/* Port-A (HP) pin - always unmuted */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-F (int speaker) mixer - route only from analog mixer */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-F (int speaker) pin */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* required for compaq 6530s/6531s speaker output */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Port-C pin - internal mic-in */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */</div><div class='del'>-	/* Port-D (docking line-out) pin - default unmuted */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* analog mix */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* unsolicited event for pin-sense */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},</div><div class='del'>-	{0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},</div><div class='del'>-	/* allow to touch GPIO1 (for mute control) */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1884a_mobile_verbs[] = {</div><div class='del'>-	/* DACs; unmute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	/* Port-A (HP) mixer - route only from analog mixer */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-A pin */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Port-A (HP) pin - always unmuted */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-B (mic jack) pin */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */</div><div class='del'>-	/* Port-C (int mic) pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */</div><div class='del'>-	/* Port-F (int speaker) mixer - route only from analog mixer */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-F pin */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Analog mixer; mute as default */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* capture sources */</div><div class='del'>-	/* {0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, */ /* set via unsol */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* unsolicited event for pin-sense */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},</div><div class='del'>-	/* allow to touch GPIO1 (for mute control) */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Thinkpad X300</div><div class='del'>- * 0x11 - HP</div><div class='del'>- * 0x12 - speaker</div><div class='del'>- * 0x14 - mic-in</div><div class='del'>- * 0x17 - built-in mic</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1984a_thinkpad_verbs[] = {</div><div class='del'>-	/* HP unmute */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* analog mix */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* turn on EAPD */</div><div class='del'>-	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='del'>-	/* unsolicited event for pin-sense */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},</div><div class='del'>-	/* internal mic - dmic */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* set magic COEFs for dmic */</div><div class='del'>-	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},</div><div class='del'>-	{0x01, AC_VERB_SET_PROC_COEF, 0x08},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux ad1984a_thinkpad_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x5 },</div><div class='del'>-		{ "Mix", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void ad1984a_thinkpad_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x11);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x12, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void ad1984a_thinkpad_unsol_event(struct hda_codec *codec,</div><div class='del'>-					 unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != AD1884A_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	ad1984a_thinkpad_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int ad1984a_thinkpad_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1984a_thinkpad_automute(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HP Touchsmart</div><div class='del'>- * port-A (0x11)      - front hp-out</div><div class='del'>- * port-B (0x14)      - unused</div><div class='del'>- * port-C (0x15)      - unused</div><div class='del'>- * port-D (0x12)      - rear line out</div><div class='del'>- * port-E (0x1c)      - front mic-in</div><div class='del'>- * port-F (0x16)      - Internal speakers</div><div class='del'>- * digital-mic (0x17) - Internal mic</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1984a_touchsmart_verbs[] = {</div><div class='del'>-	/* DACs; unmute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */</div><div class='del'>-	/* Port-A (HP) mixer - route only from analog mixer */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-A pin */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Port-A (HP) pin - always unmuted */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Port-E (int speaker) mixer - route only from analog mixer */</div><div class='del'>-	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, 0x03},</div><div class='del'>-	/* Port-E pin */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	/* Port-F (int speaker) mixer - route only from analog mixer */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-F pin */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Analog mixer; mute as default */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* capture sources */</div><div class='del'>-	/* {0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, */ /* set via unsol */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* unsolicited event for pin-sense */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},</div><div class='del'>-	/* allow to touch GPIO1 (for mute control) */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */</div><div class='del'>-	/* internal mic - dmic */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* set magic COEFs for dmic */</div><div class='del'>-	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},</div><div class='del'>-	{0x01, AC_VERB_SET_PROC_COEF, 0x08},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-/*	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = ad1884a_mobile_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* switch to external mic if plugged */</div><div class='del'>-static void ad1984a_touchsmart_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if (snd_hda_jack_detect(codec, 0x1c))</div><div class='del'>-		snd_hda_codec_write(codec, 0x0c, 0,</div><div class='del'>-				     AC_VERB_SET_CONNECT_SEL, 0x4);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_codec_write(codec, 0x0c, 0,</div><div class='del'>-				     AC_VERB_SET_CONNECT_SEL, 0x5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void ad1984a_touchsmart_unsol_event(struct hda_codec *codec,</div><div class='del'>-	unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case AD1884A_HP_EVENT:</div><div class='del'>-		ad1884a_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case AD1884A_MIC_EVENT:</div><div class='del'>-		ad1984a_touchsmart_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int ad1984a_touchsmart_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	ad198x_init(codec);</div><div class='del'>-	ad1884a_hp_automute(codec);</div><div class='del'>-	ad1984a_touchsmart_automic(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	AD1884A_DESKTOP,</div><div class='del'>-	AD1884A_LAPTOP,</div><div class='del'>-	AD1884A_MOBILE,</div><div class='del'>-	AD1884A_THINKPAD,</div><div class='del'>-	AD1984A_TOUCHSMART,</div><div class='del'>-	AD1884A_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad1884a_models[AD1884A_MODELS] = {</div><div class='del'>-	[AD1884A_DESKTOP]	= "desktop",</div><div class='del'>-	[AD1884A_LAPTOP]	= "laptop",</div><div class='del'>-	[AD1884A_MOBILE]	= "mobile",</div><div class='del'>-	[AD1884A_THINKPAD]	= "thinkpad",</div><div class='del'>-	[AD1984A_TOUCHSMART]	= "touchsmart",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk ad1884a_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30d0, "HP laptop", AD1884A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x7010, "HP laptop", AD1884A_MOBILE),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a82, "Touchsmart", AD1984A_TOUCHSMART),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_ad1884a(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(ad1884a_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1884a_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1884A_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(ad1884a_adc_nids);</div><div class='del'>-	spec-&gt;adc_nids = ad1884a_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1884a_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;ad1884a_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = ad1884a_base_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1884a_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1884a_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	/* override some parameters */</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS,</div><div class='del'>-						  ad1884a_models,</div><div class='del'>-						  ad1884a_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case AD1884A_LAPTOP:</div><div class='del'>-		spec-&gt;mixers[0] = ad1884a_laptop_mixers;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs++] = ad1884a_laptop_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1884a_laptop_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1884a_laptop_init;</div><div class='del'>-		/* set the upper-limit for mixer amp to 0dB for avoiding the</div><div class='del'>-		 * possible damage by overloading</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	case AD1884A_MOBILE:</div><div class='del'>-		spec-&gt;mixers[0] = ad1884a_mobile_mixers;</div><div class='del'>-		spec-&gt;init_verbs[0] = ad1884a_mobile_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1884a_hp_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1884a_hp_init;</div><div class='del'>-		/* set the upper-limit for mixer amp to 0dB for avoiding the</div><div class='del'>-		 * possible damage by overloading</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	case AD1884A_THINKPAD:</div><div class='del'>-		spec-&gt;mixers[0] = ad1984a_thinkpad_mixers;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs++] =</div><div class='del'>-			ad1984a_thinkpad_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1984a_thinkpad_capture_source;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1984a_thinkpad_init;</div><div class='del'>-		break;</div><div class='del'>-	case AD1984A_TOUCHSMART:</div><div class='del'>-		spec-&gt;mixers[0] = ad1984a_touchsmart_mixers;</div><div class='del'>-		spec-&gt;init_verbs[0] = ad1984a_touchsmart_verbs;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = ad1984a_touchsmart_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = ad1984a_touchsmart_init;</div><div class='del'>-		/* set the upper-limit for mixer amp to 0dB for avoiding the</div><div class='del'>-		 * possible damage by overloading</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * AD1882 / AD1882A</div><div class='del'>- *</div><div class='del'>- * port-A - front hp-out</div><div class='del'>- * port-B - front mic-in</div><div class='del'>- * port-C - rear line-in, shared surr-out (3stack)</div><div class='del'>- * port-D - rear line-out</div><div class='del'>- * port-E - rear mic-in, shared clfe-out (3stack)</div><div class='del'>- * port-F - rear surr-out (6stack)</div><div class='del'>- * port-G - rear clfe-out (6stack)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1882_dac_nids[3] = {</div><div class='del'>-	0x04, 0x03, 0x05</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1882_adc_nids[2] = {</div><div class='del'>-	0x08, 0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t ad1882_capsrc_nids[2] = {</div><div class='del'>-	0x0c, 0x0d,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define AD1882_SPDIF_OUT	0x02</div><div class='del'>-</div><div class='del'>-/* list: 0x11, 0x39, 0x3a, 0x18, 0x3c, 0x3b, 0x12, 0x20 */</div><div class='del'>-static struct hda_input_mux ad1882_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Mic", 0x4 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x3 },</div><div class='del'>-		{ "Mix", 0x7 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* list: 0x11, 0x39, 0x3a, 0x3c, 0x18, 0x1f, 0x12, 0x20 */</div><div class='del'>-static struct hda_input_mux ad1882a_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Mic", 0x4},</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "Digital Mic", 0x06 },</div><div class='del'>-		{ "Mix", 0x7 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1882_base_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line-In Boost", 0x3a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = ad198x_mux_enum_info,</div><div class='del'>-		.get = ad198x_mux_enum_get,</div><div class='del'>-		.put = ad198x_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* SPDIF controls */</div><div class='del'>-	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",</div><div class='del'>-		/* identical with ad1983 */</div><div class='del'>-		.info = ad1983_spdif_route_info,</div><div class='del'>-		.get = ad1983_spdif_route_get,</div><div class='del'>-		.put = ad1983_spdif_route_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1882_loopback_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1882a_loopback_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Mic Boost", 0x1f, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1882_3stack_mixers[] = {</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x17, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x17, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = ad198x_ch_mode_info,</div><div class='del'>-		.get = ad198x_ch_mode_get,</div><div class='del'>-		.put = ad198x_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new ad1882_6stack_mixers[] = {</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x24, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x24, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1882_ch2_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1882_ch4_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb ad1882_ch6_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode ad1882_modes[3] = {</div><div class='del'>-	{ 2, ad1882_ch2_init },</div><div class='del'>-	{ 4, ad1882_ch4_init },</div><div class='del'>-	{ 6, ad1882_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb ad1882_init_verbs[] = {</div><div class='del'>-	/* DACs; mute as default */</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Port-A (HP) mixer */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-A pin */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* HP selector - select DAC2 */</div><div class='del'>-	{0x37, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Port-D (Line-out) mixer */</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Port-D pin */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mono-out mixer */</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Mono-out pin */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Port-B (front mic) pin */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */</div><div class='del'>-	/* Port-C (line-in) pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */</div><div class='del'>-	/* Port-C mixer - mute as input */</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Port-E (mic-in) pin */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */</div><div class='del'>-	/* Port-E mixer - mute as input */</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Port-F (surround) */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Port-G (CLFE) */</div><div class='del'>-	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Analog mixer; mute as default */</div><div class='del'>-	/* list: 0x39, 0x3a, 0x11, 0x12, 0x3c, 0x3b, 0x18, 0x1a */</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* Analog Mix output amp */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */</div><div class='del'>-	/* SPDIF output selector */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list ad1882_loopbacks[] = {</div><div class='del'>-	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 1 }, /* Mic */</div><div class='del'>-	{ 0x20, HDA_INPUT, 4 }, /* Line */</div><div class='del'>-	{ 0x20, HDA_INPUT, 6 }, /* CD */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* models */</div><div class='del'>-enum {</div><div class='del'>-	AD1882_3STACK,</div><div class='del'>-	AD1882_6STACK,</div><div class='del'>-	AD1882_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *ad1882_models[AD1986A_MODELS] = {</div><div class='del'>-	[AD1882_3STACK]		= "3stack",</div><div class='del'>-	[AD1882_6STACK]		= "6stack",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int patch_ad1882(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ad198x_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x10);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		ad198x_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 6;</div><div class='del'>-	spec-&gt;multiout.num_dacs = 3;</div><div class='del'>-	spec-&gt;multiout.dac_nids = ad1882_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = AD1882_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(ad1882_adc_nids);</div><div class='del'>-	spec-&gt;adc_nids = ad1882_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = ad1882_capsrc_nids;</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11d41882)</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1882_capture_source;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;input_mux = &amp;ad1882a_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 2;</div><div class='del'>-	spec-&gt;mixers[0] = ad1882_base_mixers;</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11d41882)</div><div class='del'>-		spec-&gt;mixers[1] = ad1882_loopback_mixers;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;mixers[1] = ad1882a_loopback_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = ad1882_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = ad1882_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	spec-&gt;vmaster_nid = 0x04;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ad198x_patch_ops;</div><div class='del'>-</div><div class='del'>-	/* override some parameters */</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, AD1882_MODELS,</div><div class='del'>-						  ad1882_models, NULL);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	default:</div><div class='del'>-	case AD1882_3STACK:</div><div class='del'>-		spec-&gt;num_mixers = 3;</div><div class='del'>-		spec-&gt;mixers[2] = ad1882_3stack_mixers;</div><div class='del'>-		spec-&gt;channel_mode = ad1882_modes;</div><div class='del'>-		spec-&gt;num_channel_mode = ARRAY_SIZE(ad1882_modes);</div><div class='del'>-		spec-&gt;need_dac_fix = 1;</div><div class='del'>-		spec-&gt;multiout.max_channels = 2;</div><div class='del'>-		spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-		break;</div><div class='del'>-	case AD1882_6STACK:</div><div class='del'>-		spec-&gt;num_mixers = 3;</div><div class='del'>-		spec-&gt;mixers[2] = ad1882_6stack_mixers;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;no_sticky_stream = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_analog[] = {</div><div class='del'>-	{ .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a },</div><div class='del'>-	{ .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 },</div><div class='del'>-	{ .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a },</div><div class='del'>-	{ .id = 0x11d41884, .name = "AD1884", .patch = patch_ad1884 },</div><div class='del'>-	{ .id = 0x11d4194a, .name = "AD1984A", .patch = patch_ad1884a },</div><div class='del'>-	{ .id = 0x11d4194b, .name = "AD1984B", .patch = patch_ad1884a },</div><div class='del'>-	{ .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },</div><div class='del'>-	{ .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 },</div><div class='del'>-	{ .id = 0x11d41984, .name = "AD1984", .patch = patch_ad1984 },</div><div class='del'>-	{ .id = 0x11d41986, .name = "AD1986A", .patch = patch_ad1986a },</div><div class='del'>-	{ .id = 0x11d41988, .name = "AD1988", .patch = patch_ad1988 },</div><div class='del'>-	{ .id = 0x11d4198b, .name = "AD1988B", .patch = patch_ad1988 },</div><div class='del'>-	{ .id = 0x11d4882a, .name = "AD1882A", .patch = patch_ad1882 },</div><div class='del'>-	{ .id = 0x11d4989a, .name = "AD1989A", .patch = patch_ad1988 },</div><div class='del'>-	{ .id = 0x11d4989b, .name = "AD1989B", .patch = patch_ad1988 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:11d4*");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Analog Devices HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list analog_list = {</div><div class='del'>-	.preset = snd_hda_preset_analog,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_analog_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;analog_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_analog_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;analog_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_analog_init)</div><div class='del'>-module_exit(patch_analog_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c<br/>deleted file mode 100644<br/>index 46c8bf48c31f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_ca0110.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_ca0110.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,572 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * HD audio interface patch for Creative X-Fi CA0110-IBG chip</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2008 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct ca0110_spec {</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	hda_nid_t out_pins[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	hda_nid_t dacs[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	hda_nid_t hp_dac;</div><div class='del'>-	hda_nid_t input_pins[AUTO_PIN_LAST];</div><div class='del'>-	hda_nid_t adcs[AUTO_PIN_LAST];</div><div class='del'>-	hda_nid_t dig_out;</div><div class='del'>-	hda_nid_t dig_in;</div><div class='del'>-	unsigned int num_inputs;</div><div class='del'>-	const char *input_labels[AUTO_PIN_LAST];</div><div class='del'>-	struct hda_pcm pcm_rec[2];	/* PCM information */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM callbacks</div><div class='del'>- */</div><div class='del'>-static int ca0110_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-						stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int ca0110_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   unsigned int stream_tag,</div><div class='del'>-					   unsigned int format,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-					     format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int ca0110_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adcs[substream-&gt;number],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;adcs[substream-&gt;number]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *dirstr[2] = { "Playback", "Capture" };</div><div class='del'>-</div><div class='del'>-static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx,</div><div class='del'>-		       int chan, int dir)</div><div class='del'>-{</div><div class='del'>-	char namestr[44];</div><div class='del'>-	int type = dir ? HDA_INPUT : HDA_OUTPUT;</div><div class='del'>-	struct snd_kcontrol_new knew =</div><div class='del'>-		HDA_CODEC_MUTE_MONO(namestr, nid, chan, 0, type);</div><div class='del'>-	sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);</div><div class='del'>-	return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx,</div><div class='del'>-		       int chan, int dir)</div><div class='del'>-{</div><div class='del'>-	char namestr[44];</div><div class='del'>-	int type = dir ? HDA_INPUT : HDA_OUTPUT;</div><div class='del'>-	struct snd_kcontrol_new knew =</div><div class='del'>-		HDA_CODEC_VOLUME_MONO(namestr, nid, chan, 0, type);</div><div class='del'>-	sprintf(namestr, "%s %s Volume", pfx, dirstr[dir]);</div><div class='del'>-	return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&amp;knew, codec));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define add_out_switch(codec, nid, pfx)	_add_switch(codec, nid, pfx, 3, 0)</div><div class='del'>-#define add_out_volume(codec, nid, pfx)	_add_volume(codec, nid, pfx, 3, 0)</div><div class='del'>-#define add_in_switch(codec, nid, pfx)	_add_switch(codec, nid, pfx, 3, 1)</div><div class='del'>-#define add_in_volume(codec, nid, pfx)	_add_volume(codec, nid, pfx, 3, 1)</div><div class='del'>-#define add_mono_switch(codec, nid, pfx, chan) \</div><div class='del'>-	_add_switch(codec, nid, pfx, chan, 0)</div><div class='del'>-#define add_mono_volume(codec, nid, pfx, chan) \</div><div class='del'>-	_add_volume(codec, nid, pfx, chan, 0)</div><div class='del'>-</div><div class='del'>-static int ca0110_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	static char *prefix[AUTO_CFG_MAX_OUTS] = {</div><div class='del'>-		"Front", "Surround", NULL, "Side", "Multi"</div><div class='del'>-	};</div><div class='del'>-	hda_nid_t mutenid;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++) {</div><div class='del'>-		if (get_wcaps(codec, spec-&gt;out_pins[i]) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-			mutenid = spec-&gt;out_pins[i];</div><div class='del'>-		else</div><div class='del'>-			mutenid = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-		if (!prefix[i]) {</div><div class='del'>-			err = add_mono_switch(codec, mutenid,</div><div class='del'>-					      "Center", 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_mono_switch(codec, mutenid,</div><div class='del'>-					      "LFE", 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_mono_volume(codec, spec-&gt;multiout.dac_nids[i],</div><div class='del'>-					      "Center", 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_mono_volume(codec, spec-&gt;multiout.dac_nids[i],</div><div class='del'>-					      "LFE", 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			err = add_out_switch(codec, mutenid,</div><div class='del'>-					     prefix[i]);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_out_volume(codec, spec-&gt;multiout.dac_nids[i],</div><div class='del'>-					 prefix[i]);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (cfg-&gt;hp_outs) {</div><div class='del'>-		if (get_wcaps(codec, cfg-&gt;hp_pins[0]) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-			mutenid = cfg-&gt;hp_pins[0];</div><div class='del'>-		else</div><div class='del'>-			mutenid = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-</div><div class='del'>-		err = add_out_switch(codec, mutenid, "Headphone");</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (spec-&gt;hp_dac) {</div><div class='del'>-			err = add_out_volume(codec, spec-&gt;hp_dac, "Headphone");</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_inputs; i++) {</div><div class='del'>-		const char *label = spec-&gt;input_labels[i];</div><div class='del'>-		if (get_wcaps(codec, spec-&gt;input_pins[i]) &amp; AC_WCAP_IN_AMP)</div><div class='del'>-			mutenid = spec-&gt;input_pins[i];</div><div class='del'>-		else</div><div class='del'>-			mutenid = spec-&gt;adcs[i];</div><div class='del'>-		err = add_in_switch(codec, mutenid, label);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = add_in_volume(codec, spec-&gt;adcs[i], label);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dig_out) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;dig_out);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec, &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = add_in_volume(codec, spec-&gt;dig_in, "IEC958");</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream ca0110_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = ca0110_playback_pcm_open,</div><div class='del'>-		.prepare = ca0110_playback_pcm_prepare,</div><div class='del'>-		.cleanup = ca0110_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ca0110_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = ca0110_capture_pcm_prepare,</div><div class='del'>-		.cleanup = ca0110_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ca0110_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = ca0110_dig_playback_pcm_open,</div><div class='del'>-		.close = ca0110_dig_playback_pcm_close,</div><div class='del'>-		.prepare = ca0110_dig_playback_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream ca0110_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ca0110_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-	codec-&gt;num_pcms = 0;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "CA0110 Analog";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = ca0110_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dacs[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='del'>-		spec-&gt;multiout.max_channels;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = ca0110_pcm_analog_capture;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec-&gt;num_inputs;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adcs[0];</div><div class='del'>-	codec-&gt;num_pcms++;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;dig_out &amp;&amp; !spec-&gt;dig_in)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	info++;</div><div class='del'>-	info-&gt;name = "CA0110 Digital";</div><div class='del'>-	info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-	if (spec-&gt;dig_out) {</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-			ca0110_pcm_digital_playback;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dig_out;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in) {</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-			ca0110_pcm_digital_capture;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;num_pcms++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_output(struct hda_codec *codec, hda_nid_t pin, hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	if (pin) {</div><div class='del'>-		snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);</div><div class='del'>-		if (get_wcaps(codec, pin) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-			snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-					    AMP_OUT_UNMUTE);</div><div class='del'>-	}</div><div class='del'>-	if (dac)</div><div class='del'>-		snd_hda_codec_write(codec, dac, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_input(struct hda_codec *codec, hda_nid_t pin, hda_nid_t adc)</div><div class='del'>-{</div><div class='del'>-	if (pin) {</div><div class='del'>-		snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80);</div><div class='del'>-		if (get_wcaps(codec, pin) &amp; AC_WCAP_IN_AMP)</div><div class='del'>-			snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-					    AMP_IN_UNMUTE(0));</div><div class='del'>-	}</div><div class='del'>-	if (adc)</div><div class='del'>-		snd_hda_codec_write(codec, adc, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    AMP_IN_UNMUTE(0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++)</div><div class='del'>-		init_output(codec, spec-&gt;out_pins[i],</div><div class='del'>-			    spec-&gt;multiout.dac_nids[i]);</div><div class='del'>-	init_output(codec, cfg-&gt;hp_pins[0], spec-&gt;hp_dac);</div><div class='del'>-	init_output(codec, cfg-&gt;dig_out_pins[0], spec-&gt;dig_out);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_inputs; i++)</div><div class='del'>-		init_input(codec, spec-&gt;input_pins[i], spec-&gt;adcs[i]);</div><div class='del'>-	init_input(codec, cfg-&gt;dig_in_pin, spec-&gt;dig_in);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ca0110_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops ca0110_patch_ops = {</div><div class='del'>-	.build_controls = ca0110_build_controls,</div><div class='del'>-	.build_pcms = ca0110_build_pcms,</div><div class='del'>-	.init = ca0110_init,</div><div class='del'>-	.free = ca0110_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void parse_line_outs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, n;</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	n = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		if (!def_conf)</div><div class='del'>-			continue; /* invalid pin */</div><div class='del'>-		if (snd_hda_get_connections(codec, nid, &amp;spec-&gt;dacs[i], 1) != 1)</div><div class='del'>-			continue;</div><div class='del'>-		spec-&gt;out_pins[n++] = nid;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dacs;</div><div class='del'>-	spec-&gt;multiout.num_dacs = n;</div><div class='del'>-	spec-&gt;multiout.max_channels = n * 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-	hda_nid_t nid, dac;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;hp_outs)</div><div class='del'>-		return;</div><div class='del'>-	nid = cfg-&gt;hp_pins[0];</div><div class='del'>-	def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	if (!def_conf) {</div><div class='del'>-		cfg-&gt;hp_outs = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (snd_hda_get_connections(codec, nid, &amp;dac, 1) != 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='del'>-		if (dac == spec-&gt;dacs[i])</div><div class='del'>-			break;</div><div class='del'>-	if (i &gt;= cfg-&gt;line_outs) {</div><div class='del'>-		spec-&gt;hp_dac = dac;</div><div class='del'>-		spec-&gt;multiout.hp_nid = dac;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid, pin;</div><div class='del'>-	int n, i, j;</div><div class='del'>-</div><div class='del'>-	n = 0;</div><div class='del'>-	nid = codec-&gt;start_nid;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='del'>-		unsigned int type = get_wcaps_type(wcaps);</div><div class='del'>-		if (type != AC_WID_AUD_IN)</div><div class='del'>-			continue;</div><div class='del'>-		if (snd_hda_get_connections(codec, nid, &amp;pin, 1) != 1)</div><div class='del'>-			continue;</div><div class='del'>-		if (pin == cfg-&gt;dig_in_pin) {</div><div class='del'>-			spec-&gt;dig_in = nid;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		for (j = 0; j &lt; cfg-&gt;num_inputs; j++)</div><div class='del'>-			if (cfg-&gt;inputs[j].pin == pin)</div><div class='del'>-				break;</div><div class='del'>-		if (j &gt;= cfg-&gt;num_inputs)</div><div class='del'>-			continue;</div><div class='del'>-		spec-&gt;input_pins[n] = pin;</div><div class='del'>-		spec-&gt;input_labels[n] = hda_get_input_pin_label(codec, pin, 1);</div><div class='del'>-		spec-&gt;adcs[n] = nid;</div><div class='del'>-		n++;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;num_inputs = n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void parse_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;dig_outs &amp;&amp;</div><div class='del'>-	    snd_hda_get_connections(codec, cfg-&gt;dig_out_pins[0],</div><div class='del'>-				    &amp;spec-&gt;dig_out, 1) == 1)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = spec-&gt;dig_out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ca0110_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	parse_line_outs(codec);</div><div class='del'>-	parse_hp_out(codec);</div><div class='del'>-	parse_digital(codec);</div><div class='del'>-	parse_input(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int patch_ca0110(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct ca0110_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;bus-&gt;needs_damn_long_delay = 1;</div><div class='del'>-</div><div class='del'>-	err = ca0110_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = ca0110_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-	codec-&gt;spec = NULL;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_ca0110[] = {</div><div class='del'>-	{ .id = 0x1102000a, .name = "CA0110-IBG", .patch = patch_ca0110 },</div><div class='del'>-	{ .id = 0x1102000b, .name = "CA0110-IBG", .patch = patch_ca0110 },</div><div class='del'>-	{ .id = 0x1102000d, .name = "SB0880 X-Fi", .patch = patch_ca0110 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1102000a");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1102000b");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1102000d");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Creative CA0110-IBG HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list ca0110_list = {</div><div class='del'>-	.preset = snd_hda_preset_ca0110,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_ca0110_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;ca0110_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_ca0110_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;ca0110_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_ca0110_init)</div><div class='del'>-module_exit(patch_ca0110_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c<br/>deleted file mode 100644<br/>index 460fb2ef7e39..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_cirrus.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_cirrus.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1311 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * HD audio interface patch for Cirrus Logic CS420x chip</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2009 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct cs_spec {</div><div class='del'>-	int board_config;</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	struct snd_kcontrol *vmaster_sw;</div><div class='del'>-	struct snd_kcontrol *vmaster_vol;</div><div class='del'>-</div><div class='del'>-	hda_nid_t dac_nid[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	hda_nid_t slave_dig_outs[2];</div><div class='del'>-</div><div class='del'>-	unsigned int input_idx[AUTO_PIN_LAST];</div><div class='del'>-	unsigned int capsrc_idx[AUTO_PIN_LAST];</div><div class='del'>-	hda_nid_t adc_nid[AUTO_PIN_LAST];</div><div class='del'>-	unsigned int adc_idx[AUTO_PIN_LAST];</div><div class='del'>-	unsigned int num_inputs;</div><div class='del'>-	unsigned int cur_input;</div><div class='del'>-	unsigned int automic_idx;</div><div class='del'>-	hda_nid_t cur_adc;</div><div class='del'>-	unsigned int cur_adc_stream_tag;</div><div class='del'>-	unsigned int cur_adc_format;</div><div class='del'>-	hda_nid_t dig_in;</div><div class='del'>-</div><div class='del'>-	struct hda_bind_ctls *capture_bind[2];</div><div class='del'>-</div><div class='del'>-	unsigned int gpio_mask;</div><div class='del'>-	unsigned int gpio_dir;</div><div class='del'>-	unsigned int gpio_data;</div><div class='del'>-</div><div class='del'>-	struct hda_pcm pcm_rec[2];	/* PCM information */</div><div class='del'>-</div><div class='del'>-	unsigned int hp_detect:1;</div><div class='del'>-	unsigned int mic_detect:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* available models */</div><div class='del'>-enum {</div><div class='del'>-	CS420X_MBP53,</div><div class='del'>-	CS420X_MBP55,</div><div class='del'>-	CS420X_IMAC27,</div><div class='del'>-	CS420X_AUTO,</div><div class='del'>-	CS420X_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Vendor-specific processing widget */</div><div class='del'>-#define CS420X_VENDOR_NID	0x11</div><div class='del'>-#define CS_DIG_OUT1_PIN_NID	0x10</div><div class='del'>-#define CS_DIG_OUT2_PIN_NID	0x15</div><div class='del'>-#define CS_DMIC1_PIN_NID	0x12</div><div class='del'>-#define CS_DMIC2_PIN_NID	0x0e</div><div class='del'>-</div><div class='del'>-/* coef indices */</div><div class='del'>-#define IDX_SPDIF_STAT		0x0000</div><div class='del'>-#define IDX_SPDIF_CTL		0x0001</div><div class='del'>-#define IDX_ADC_CFG		0x0002</div><div class='del'>-/* SZC bitmask, 4 modes below:</div><div class='del'>- * 0 = immediate,</div><div class='del'>- * 1 = digital immediate, analog zero-cross</div><div class='del'>- * 2 = digtail &amp; analog soft-ramp</div><div class='del'>- * 3 = digital soft-ramp, analog zero-cross</div><div class='del'>- */</div><div class='del'>-#define   CS_COEF_ADC_SZC_MASK		(3 &lt;&lt; 0)</div><div class='del'>-#define   CS_COEF_ADC_MIC_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for mic */</div><div class='del'>-#define   CS_COEF_ADC_LI_SZC_MODE	(3 &lt;&lt; 0) /* SZC setup for line-in */</div><div class='del'>-/* PGA mode: 0 = differential, 1 = signle-ended */</div><div class='del'>-#define   CS_COEF_ADC_MIC_PGA_MODE	(1 &lt;&lt; 5) /* PGA setup for mic */</div><div class='del'>-#define   CS_COEF_ADC_LI_PGA_MODE	(1 &lt;&lt; 6) /* PGA setup for line-in */</div><div class='del'>-#define IDX_DAC_CFG		0x0003</div><div class='del'>-/* SZC bitmask, 4 modes below:</div><div class='del'>- * 0 = Immediate</div><div class='del'>- * 1 = zero-cross</div><div class='del'>- * 2 = soft-ramp</div><div class='del'>- * 3 = soft-ramp on zero-cross</div><div class='del'>- */</div><div class='del'>-#define   CS_COEF_DAC_HP_SZC_MODE	(3 &lt;&lt; 0) /* nid 0x02 */</div><div class='del'>-#define   CS_COEF_DAC_LO_SZC_MODE	(3 &lt;&lt; 2) /* nid 0x03 */</div><div class='del'>-#define   CS_COEF_DAC_SPK_SZC_MODE	(3 &lt;&lt; 4) /* nid 0x04 */</div><div class='del'>-</div><div class='del'>-#define IDX_BEEP_CFG		0x0004</div><div class='del'>-/* 0x0008 - test reg key */</div><div class='del'>-/* 0x0009 - 0x0014 -&gt; 12 test regs */</div><div class='del'>-/* 0x0015 - visibility reg */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int cs_vendor_coef_get(struct hda_codec *codec, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, CS420X_VENDOR_NID, 0,</div><div class='del'>-			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='del'>-	return snd_hda_codec_read(codec, CS420X_VENDOR_NID, 0,</div><div class='del'>-				  AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void cs_vendor_coef_set(struct hda_codec *codec, unsigned int idx,</div><div class='del'>-				      unsigned int coef)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, CS420X_VENDOR_NID, 0,</div><div class='del'>-			    AC_VERB_SET_COEF_INDEX, idx);</div><div class='del'>-	snd_hda_codec_write(codec, CS420X_VENDOR_NID, 0,</div><div class='del'>-			    AC_VERB_SET_PROC_COEF, coef);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define HP_EVENT	1</div><div class='del'>-#define MIC_EVENT	2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PCM callbacks</div><div class='del'>- */</div><div class='del'>-static int cs_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				struct hda_codec *codec,</div><div class='del'>-				struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   unsigned int stream_tag,</div><div class='del'>-				   unsigned int format,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-						stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int cs_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-				     struct hda_codec *codec,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-					     format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int cs_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				  struct hda_codec *codec,</div><div class='del'>-				  unsigned int stream_tag,</div><div class='del'>-				  unsigned int format,</div><div class='del'>-				  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;cur_adc = spec-&gt;adc_nid[spec-&gt;cur_input];</div><div class='del'>-	spec-&gt;cur_adc_stream_tag = stream_tag;</div><div class='del'>-	spec-&gt;cur_adc_format = format;</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;cur_adc, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				  struct hda_codec *codec,</div><div class='del'>-				  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc);</div><div class='del'>-	spec-&gt;cur_adc = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream cs_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = cs_playback_pcm_open,</div><div class='del'>-		.prepare = cs_playback_pcm_prepare,</div><div class='del'>-		.cleanup = cs_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cs_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = cs_capture_pcm_prepare,</div><div class='del'>-		.cleanup = cs_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cs_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = cs_dig_playback_pcm_open,</div><div class='del'>-		.close = cs_dig_playback_pcm_close,</div><div class='del'>-		.prepare = cs_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = cs_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cs_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cs_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-	codec-&gt;num_pcms = 0;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "Cirrus Analog";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = cs_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;dac_nid[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='del'>-		spec-&gt;multiout.max_channels;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = cs_pcm_analog_capture;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid =</div><div class='del'>-		spec-&gt;adc_nid[spec-&gt;cur_input];</div><div class='del'>-	codec-&gt;num_pcms++;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;multiout.dig_out_nid &amp;&amp; !spec-&gt;dig_in)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	info++;</div><div class='del'>-	info-&gt;name = "Cirrus Digital";</div><div class='del'>-	info-&gt;pcm_type = spec-&gt;autocfg.dig_out_type[0];</div><div class='del'>-	if (!info-&gt;pcm_type)</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-			cs_pcm_digital_playback;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-			spec-&gt;multiout.dig_out_nid;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in) {</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-			cs_pcm_digital_capture;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;num_pcms++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * parse codec topology</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t get_dac(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-	if (snd_hda_get_connections(codec, pin, &amp;dac, 1) != 1)</div><div class='del'>-		return 0;</div><div class='del'>-	return dac;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_ext_mic(struct hda_codec *codec, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t pin = cfg-&gt;inputs[idx].pin;</div><div class='del'>-	unsigned int val = snd_hda_query_pin_caps(codec, pin);</div><div class='del'>-	if (!(val &amp; AC_PINCAP_PRES_DETECT))</div><div class='del'>-		return 0;</div><div class='del'>-	val = snd_hda_codec_get_pincfg(codec, pin);</div><div class='del'>-	return (snd_hda_get_input_pin_attr(val) != INPUT_PIN_ATTR_INT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-			 unsigned int *idxp)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	nid = codec-&gt;start_nid;</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_nodes; i++, nid++) {</div><div class='del'>-		hda_nid_t pins[2];</div><div class='del'>-		unsigned int type;</div><div class='del'>-		int j, nums;</div><div class='del'>-		type = (get_wcaps(codec, nid) &amp; AC_WCAP_TYPE)</div><div class='del'>-			&gt;&gt; AC_WCAP_TYPE_SHIFT;</div><div class='del'>-		if (type != AC_WID_AUD_IN)</div><div class='del'>-			continue;</div><div class='del'>-		nums = snd_hda_get_connections(codec, nid, pins,</div><div class='del'>-					       ARRAY_SIZE(pins));</div><div class='del'>-		if (nums &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 0; j &lt; nums; j++) {</div><div class='del'>-			if (pins[j] == pin) {</div><div class='del'>-				*idxp = j;</div><div class='del'>-				return nid;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_active_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	val = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	return (get_defcfg_connect(val) != AC_JACK_PORT_NONE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int parse_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, extra_nids;</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		dac = get_dac(codec, cfg-&gt;line_out_pins[i]);</div><div class='del'>-		if (!dac)</div><div class='del'>-			break;</div><div class='del'>-		spec-&gt;dac_nid[i] = dac;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.num_dacs = i;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nid;</div><div class='del'>-	spec-&gt;multiout.max_channels = i * 2;</div><div class='del'>-</div><div class='del'>-	/* add HP and speakers */</div><div class='del'>-	extra_nids = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		dac = get_dac(codec, cfg-&gt;hp_pins[i]);</div><div class='del'>-		if (!dac)</div><div class='del'>-			break;</div><div class='del'>-		if (!i)</div><div class='del'>-			spec-&gt;multiout.hp_nid = dac;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.extra_out_nid[extra_nids++] = dac;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='del'>-		dac = get_dac(codec, cfg-&gt;speaker_pins[i]);</div><div class='del'>-		if (!dac)</div><div class='del'>-			break;</div><div class='del'>-		spec-&gt;multiout.extra_out_nid[extra_nids++] = dac;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='del'>-		cfg-&gt;speaker_outs = cfg-&gt;line_outs;</div><div class='del'>-		memcpy(cfg-&gt;speaker_pins, cfg-&gt;line_out_pins,</div><div class='del'>-		       sizeof(cfg-&gt;speaker_pins));</div><div class='del'>-		cfg-&gt;line_outs = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int parse_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t pin = cfg-&gt;inputs[i].pin;</div><div class='del'>-		spec-&gt;input_idx[spec-&gt;num_inputs] = i;</div><div class='del'>-		spec-&gt;capsrc_idx[i] = spec-&gt;num_inputs++;</div><div class='del'>-		spec-&gt;cur_input = i;</div><div class='del'>-		spec-&gt;adc_nid[i] = get_adc(codec, pin, &amp;spec-&gt;adc_idx[i]);</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;num_inputs)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check whether the automatic mic switch is available */</div><div class='del'>-	if (spec-&gt;num_inputs == 2 &amp;&amp;</div><div class='del'>-	    cfg-&gt;inputs[0].type == AUTO_PIN_MIC &amp;&amp;</div><div class='del'>-	    cfg-&gt;inputs[1].type == AUTO_PIN_MIC) {</div><div class='del'>-		if (is_ext_mic(codec, cfg-&gt;inputs[0].pin)) {</div><div class='del'>-			if (!is_ext_mic(codec, cfg-&gt;inputs[1].pin)) {</div><div class='del'>-				spec-&gt;mic_detect = 1;</div><div class='del'>-				spec-&gt;automic_idx = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (is_ext_mic(codec, cfg-&gt;inputs[1].pin)) {</div><div class='del'>-				spec-&gt;mic_detect = 1;</div><div class='del'>-				spec-&gt;automic_idx = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int parse_digital_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;dig_outs)</div><div class='del'>-		return 0;</div><div class='del'>-	if (snd_hda_get_connections(codec, cfg-&gt;dig_out_pins[0], &amp;nid, 1) &lt; 1)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = nid;</div><div class='del'>-	spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	if (cfg-&gt;dig_outs &gt; 1 &amp;&amp;</div><div class='del'>-	    snd_hda_get_connections(codec, cfg-&gt;dig_out_pins[1], &amp;nid, 1) &gt; 0) {</div><div class='del'>-		spec-&gt;slave_dig_outs[0] = nid;</div><div class='del'>-		codec-&gt;slave_dig_outs = spec-&gt;slave_dig_outs;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int parse_digital_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in = get_adc(codec, cfg-&gt;dig_in_pin, &amp;idx);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * create mixer controls</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *dir_sfx[2] = { "Playback", "Capture" };</div><div class='del'>-</div><div class='del'>-static int add_mute(struct hda_codec *codec, const char *name, int index,</div><div class='del'>-		    unsigned int pval, int dir, struct snd_kcontrol **kctlp)</div><div class='del'>-{</div><div class='del'>-	char tmp[44];</div><div class='del'>-	struct snd_kcontrol_new knew =</div><div class='del'>-		HDA_CODEC_MUTE_IDX(tmp, index, 0, 0, HDA_OUTPUT);</div><div class='del'>-	knew.private_value = pval;</div><div class='del'>-	snprintf(tmp, sizeof(tmp), "%s %s Switch", name, dir_sfx[dir]);</div><div class='del'>-	*kctlp = snd_ctl_new1(&amp;knew, codec);</div><div class='del'>-	(*kctlp)-&gt;id.subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-	return snd_hda_ctl_add(codec, 0, *kctlp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_volume(struct hda_codec *codec, const char *name,</div><div class='del'>-		      int index, unsigned int pval, int dir,</div><div class='del'>-		      struct snd_kcontrol **kctlp)</div><div class='del'>-{</div><div class='del'>-	char tmp[32];</div><div class='del'>-	struct snd_kcontrol_new knew =</div><div class='del'>-		HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT);</div><div class='del'>-	knew.private_value = pval;</div><div class='del'>-	snprintf(tmp, sizeof(tmp), "%s %s Volume", name, dir_sfx[dir]);</div><div class='del'>-	*kctlp = snd_ctl_new1(&amp;knew, codec);</div><div class='del'>-	(*kctlp)-&gt;id.subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-	return snd_hda_ctl_add(codec, 0, *kctlp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void fix_volume_caps(struct hda_codec *codec, hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	unsigned int caps;</div><div class='del'>-</div><div class='del'>-	/* set the upper-limit for mixer amp to 0dB */</div><div class='del'>-	caps = query_amp_caps(codec, dac, HDA_OUTPUT);</div><div class='del'>-	caps &amp;= ~(0x7f &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT);</div><div class='del'>-	caps |= ((caps &gt;&gt; AC_AMPCAP_OFFSET_SHIFT) &amp; 0x7f)</div><div class='del'>-		&lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	snd_hda_override_amp_caps(codec, dac, HDA_OUTPUT, caps);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_vmaster(struct hda_codec *codec, hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int tlv[4];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_sw =</div><div class='del'>-		snd_ctl_make_virtual_master("Master Playback Switch", NULL);</div><div class='del'>-	err = snd_hda_ctl_add(codec, dac, spec-&gt;vmaster_sw);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	snd_hda_set_vmaster_tlv(codec, dac, HDA_OUTPUT, tlv);</div><div class='del'>-	spec-&gt;vmaster_vol =</div><div class='del'>-		snd_ctl_make_virtual_master("Master Playback Volume", tlv);</div><div class='del'>-	err = snd_hda_ctl_add(codec, dac, spec-&gt;vmaster_vol);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,</div><div class='del'>-		      int num_ctls, int type)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	const char *name;</div><div class='del'>-	int err, index;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	static char *speakers[] = {</div><div class='del'>-		"Front Speaker", "Surround Speaker", "Bass Speaker"</div><div class='del'>-	};</div><div class='del'>-	static char *line_outs[] = {</div><div class='del'>-		"Front Line-Out", "Surround Line-Out", "Bass Line-Out"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	fix_volume_caps(codec, dac);</div><div class='del'>-	if (!spec-&gt;vmaster_sw) {</div><div class='del'>-		err = add_vmaster(codec, dac);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	index = 0;</div><div class='del'>-	switch (type) {</div><div class='del'>-	case AUTO_PIN_HP_OUT:</div><div class='del'>-		name = "Headphone";</div><div class='del'>-		index = idx;</div><div class='del'>-		break;</div><div class='del'>-	case AUTO_PIN_SPEAKER_OUT:</div><div class='del'>-		if (num_ctls &gt; 1)</div><div class='del'>-			name = speakers[idx];</div><div class='del'>-		else</div><div class='del'>-			name = "Speaker";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (num_ctls &gt; 1)</div><div class='del'>-			name = line_outs[idx];</div><div class='del'>-		else</div><div class='del'>-			name = "Line-Out";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = add_mute(codec, name, index,</div><div class='del'>-		       HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &amp;kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = snd_ctl_add_slave(spec-&gt;vmaster_sw, kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = add_volume(codec, name, index,</div><div class='del'>-			 HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &amp;kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = snd_ctl_add_slave(spec-&gt;vmaster_vol, kctl);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}		</div><div class='del'>-</div><div class='del'>-static int build_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		err = add_output(codec, get_dac(codec, cfg-&gt;line_out_pins[i]),</div><div class='del'>-				 i, cfg-&gt;line_outs, cfg-&gt;line_out_type);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		err = add_output(codec, get_dac(codec, cfg-&gt;hp_pins[i]),</div><div class='del'>-				 i, cfg-&gt;hp_outs, AUTO_PIN_HP_OUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='del'>-		err = add_output(codec, get_dac(codec, cfg-&gt;speaker_pins[i]),</div><div class='del'>-				 i, cfg-&gt;speaker_outs, AUTO_PIN_SPEAKER_OUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cs_capture_ctls[] = {</div><div class='del'>-	HDA_BIND_SW("Capture Switch", 0),</div><div class='del'>-	HDA_BIND_VOL("Capture Volume", 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int change_cur_input(struct hda_codec *codec, unsigned int idx,</div><div class='del'>-			    int force)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	</div><div class='del'>-	if (spec-&gt;cur_input == idx &amp;&amp; !force)</div><div class='del'>-		return 0;</div><div class='del'>-	if (spec-&gt;cur_adc &amp;&amp; spec-&gt;cur_adc != spec-&gt;adc_nid[idx]) {</div><div class='del'>-		/* stream is running, let's swap the current ADC */</div><div class='del'>-		__snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc, 1);</div><div class='del'>-		spec-&gt;cur_adc = spec-&gt;adc_nid[idx];</div><div class='del'>-		snd_hda_codec_setup_stream(codec, spec-&gt;cur_adc,</div><div class='del'>-					   spec-&gt;cur_adc_stream_tag, 0,</div><div class='del'>-					   spec-&gt;cur_adc_format);</div><div class='del'>-	}</div><div class='del'>-	snd_hda_codec_write(codec, spec-&gt;cur_adc, 0,</div><div class='del'>-			    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-			    spec-&gt;adc_idx[idx]);</div><div class='del'>-	spec-&gt;cur_input = idx;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_capture_source_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int idx;</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = spec-&gt;num_inputs;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= spec-&gt;num_inputs)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = spec-&gt;num_inputs - 1;</div><div class='del'>-	idx = spec-&gt;input_idx[uinfo-&gt;value.enumerated.item];</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       hda_get_input_pin_label(codec, cfg-&gt;inputs[idx].pin, 1));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_capture_source_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;capsrc_idx[spec-&gt;cur_input];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_capture_source_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= spec-&gt;num_inputs)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	idx = spec-&gt;input_idx[idx];</div><div class='del'>-	return change_cur_input(codec, idx, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cs_capture_source = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name = "Capture Source",</div><div class='del'>-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,</div><div class='del'>-	.info = cs_capture_source_info,</div><div class='del'>-	.get = cs_capture_source_get,</div><div class='del'>-	.put = cs_capture_source_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,</div><div class='del'>-					       struct hda_ctl_ops *ops)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_bind_ctls *bind;</div><div class='del'>-	int i, n;</div><div class='del'>-</div><div class='del'>-	bind = kzalloc(sizeof(*bind) + sizeof(long) * (spec-&gt;num_inputs + 1),</div><div class='del'>-		       GFP_KERNEL);</div><div class='del'>-	if (!bind)</div><div class='del'>-		return NULL;</div><div class='del'>-	bind-&gt;ops = ops;</div><div class='del'>-	n = 0;</div><div class='del'>-	for (i = 0; i &lt; AUTO_PIN_LAST; i++) {</div><div class='del'>-		if (!spec-&gt;adc_nid[i])</div><div class='del'>-			continue;</div><div class='del'>-		bind-&gt;values[n++] =</div><div class='del'>-			HDA_COMPOSE_AMP_VAL(spec-&gt;adc_nid[i], 3,</div><div class='del'>-					    spec-&gt;adc_idx[i], HDA_INPUT);</div><div class='del'>-	}</div><div class='del'>-	return bind;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add a (input-boost) volume control to the given input pin */</div><div class='del'>-static int add_input_volume_control(struct hda_codec *codec,</div><div class='del'>-				    struct auto_pin_cfg *cfg,</div><div class='del'>-				    int item)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t pin = cfg-&gt;inputs[item].pin;</div><div class='del'>-	u32 caps;</div><div class='del'>-	const char *label;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-		</div><div class='del'>-	if (!(get_wcaps(codec, pin) &amp; AC_WCAP_IN_AMP))</div><div class='del'>-		return 0;</div><div class='del'>-	caps = query_amp_caps(codec, pin, HDA_INPUT);</div><div class='del'>-	caps = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	if (caps &lt;= 1)</div><div class='del'>-		return 0;</div><div class='del'>-	label = hda_get_autocfg_input_label(codec, cfg, item);</div><div class='del'>-	return add_volume(codec, label, 0,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_INPUT), 1, &amp;kctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int build_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;num_inputs)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* make bind-capture */</div><div class='del'>-	spec-&gt;capture_bind[0] = make_bind_capture(codec, &amp;snd_hda_bind_sw);</div><div class='del'>-	spec-&gt;capture_bind[1] = make_bind_capture(codec, &amp;snd_hda_bind_vol);</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct snd_kcontrol *kctl;</div><div class='del'>-		int n;</div><div class='del'>-		if (!spec-&gt;capture_bind[i])</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		kctl = snd_ctl_new1(&amp;cs_capture_ctls[i], codec);</div><div class='del'>-		if (!kctl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		kctl-&gt;private_value = (long)spec-&gt;capture_bind[i];</div><div class='del'>-		err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		for (n = 0; n &lt; AUTO_PIN_LAST; n++) {</div><div class='del'>-			if (!spec-&gt;adc_nid[n])</div><div class='del'>-				continue;</div><div class='del'>-			err = snd_hda_add_nid(codec, kctl, 0, spec-&gt;adc_nid[n]);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (spec-&gt;num_inputs &gt; 1 &amp;&amp; !spec-&gt;mic_detect) {</div><div class='del'>-		err = snd_hda_ctl_add(codec, 0,</div><div class='del'>-				      snd_ctl_new1(&amp;cs_capture_source, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_inputs; i++) {</div><div class='del'>-		err = add_input_volume_control(codec, &amp;spec-&gt;autocfg, i);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int build_digital_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;multiout.dig_out_nid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;multiout.dig_out_nid);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = snd_hda_create_spdif_share_sw(codec, &amp;spec-&gt;multiout);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int build_digital_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;dig_in)</div><div class='del'>-		return snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * auto-mute and auto-mic switching</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void cs_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int caps, hp_present;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	hp_present = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;hp_pins[i];</div><div class='del'>-		caps = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-		if (!(caps &amp; AC_PINCAP_PRES_DETECT))</div><div class='del'>-			continue;</div><div class='del'>-		hp_present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-		if (hp_present)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;speaker_pins[i];</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    hp_present ? 0 : PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;board_config == CS420X_MBP53 ||</div><div class='del'>-	    spec-&gt;board_config == CS420X_MBP55 ||</div><div class='del'>-	    spec-&gt;board_config == CS420X_IMAC27) {</div><div class='del'>-		unsigned int gpio = hp_present ? 0x02 : 0x08;</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0,</div><div class='del'>-				    AC_VERB_SET_GPIO_DATA, gpio);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cs_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	unsigned int present;</div><div class='del'>-	</div><div class='del'>-	nid = cfg-&gt;inputs[spec-&gt;automic_idx].pin;</div><div class='del'>-	present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-	if (present)</div><div class='del'>-		change_cur_input(codec, spec-&gt;automic_idx, 0);</div><div class='del'>-	else</div><div class='del'>-		change_cur_input(codec, !spec-&gt;automic_idx, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void init_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* mute first */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;multiout.dac_nids[i], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='del'>-	if (spec-&gt;multiout.hp_nid)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;multiout.hp_nid, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;multiout.extra_out_nid); i++) {</div><div class='del'>-		if (!spec-&gt;multiout.extra_out_nid[i])</div><div class='del'>-			break;</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;multiout.extra_out_nid[i], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set appropriate pin controls */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;line_out_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;hp_pins[i];</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);</div><div class='del'>-		if (!cfg-&gt;speaker_outs)</div><div class='del'>-			continue;</div><div class='del'>-		if (get_wcaps(codec, nid) &amp; AC_WCAP_UNSOL_CAP) {</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-					    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-					    AC_USRSP_EN | HP_EVENT);</div><div class='del'>-			spec-&gt;hp_detect = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++)</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;speaker_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	if (spec-&gt;hp_detect)</div><div class='del'>-		cs_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void init_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int coef;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		unsigned int ctl;</div><div class='del'>-		hda_nid_t pin = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (!spec-&gt;adc_nid[i])</div><div class='del'>-			continue;</div><div class='del'>-		/* set appropriate pin control and mute first */</div><div class='del'>-		ctl = PIN_IN;</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC) {</div><div class='del'>-			unsigned int caps = snd_hda_query_pin_caps(codec, pin);</div><div class='del'>-			caps &gt;&gt;= AC_PINCAP_VREF_SHIFT;</div><div class='del'>-			if (caps &amp; AC_PINCAP_VREF_80)</div><div class='del'>-				ctl = PIN_VREF80;</div><div class='del'>-		}</div><div class='del'>-		snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, ctl);</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;adc_nid[i], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    AMP_IN_MUTE(spec-&gt;adc_idx[i]));</div><div class='del'>-		if (spec-&gt;mic_detect &amp;&amp; spec-&gt;automic_idx == i)</div><div class='del'>-			snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-					    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-					    AC_USRSP_EN | MIC_EVENT);</div><div class='del'>-	}</div><div class='del'>-	change_cur_input(codec, spec-&gt;cur_input, 1);</div><div class='del'>-	if (spec-&gt;mic_detect)</div><div class='del'>-		cs_automic(codec);</div><div class='del'>-</div><div class='del'>-	coef = 0x000a; /* ADC1/2 - Digital and Analog Soft Ramp */</div><div class='del'>-	if (is_active_pin(codec, CS_DMIC2_PIN_NID))</div><div class='del'>-		coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */</div><div class='del'>-	if (is_active_pin(codec, CS_DMIC1_PIN_NID))</div><div class='del'>-		coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 </div><div class='del'>-				 * No effect if SPDIF_OUT2 is selected in </div><div class='del'>-				 * IDX_SPDIF_CTL.</div><div class='del'>-				  */</div><div class='del'>-	cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb cs_coef_init_verbs[] = {</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_STATE, 1},</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF,</div><div class='del'>-	 (0x002a /* DAC1/2/3 SZCMode Soft Ramp */</div><div class='del'>-	  | 0x0040 /* Mute DACs on FIFO error */</div><div class='del'>-	  | 0x1000 /* Enable DACs High Pass Filter */</div><div class='del'>-	  | 0x0400 /* Disable Coefficient Auto increment */</div><div class='del'>-	  )},</div><div class='del'>-	/* Beep */</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */</div><div class='del'>-</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Errata: CS4207 rev C0/C1/C2 Silicon</div><div class='del'>- *</div><div class='del'>- * http://www.cirrus.com/en/pubs/errata/ER880C3.pdf</div><div class='del'>- *</div><div class='del'>- * 6. At high temperature (TA &gt; +85°C), the digital supply current (IVD)</div><div class='del'>- * may be excessive (up to an additional 200 μA), which is most easily</div><div class='del'>- * observed while the part is being held in reset (RESET# active low).</div><div class='del'>- *</div><div class='del'>- * Root Cause: At initial powerup of the device, the logic that drives</div><div class='del'>- * the clock and write enable to the S/PDIF SRC RAMs is not properly</div><div class='del'>- * initialized.</div><div class='del'>- * Certain random patterns will cause a steady leakage current in those</div><div class='del'>- * RAM cells. The issue will resolve once the SRCs are used (turned on).</div><div class='del'>- *</div><div class='del'>- * Workaround: The following verb sequence briefly turns on the S/PDIF SRC</div><div class='del'>- * blocks, which will alleviate the issue.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb cs_errata_init_verbs[] = {</div><div class='del'>-	{0x01, AC_VERB_SET_POWER_STATE, 0x00}, /* AFG: D0 */</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */</div><div class='del'>-</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0008},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x9999},</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0017},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0xa412},</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0001},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x0009},</div><div class='del'>-</div><div class='del'>-	{0x07, AC_VERB_SET_POWER_STATE, 0x00}, /* S/PDIF Rx: D0 */</div><div class='del'>-	{0x08, AC_VERB_SET_POWER_STATE, 0x00}, /* S/PDIF Tx: D0 */</div><div class='del'>-</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0017},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x2412},</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0008},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x0000},</div><div class='del'>-	{0x11, AC_VERB_SET_COEF_INDEX, 0x0001},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_COEF, 0x0008},</div><div class='del'>-	{0x11, AC_VERB_SET_PROC_STATE, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x07, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Rx: D3 */</div><div class='del'>-	{0x08, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Tx: D3 */</div><div class='del'>-	/*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */</div><div class='del'>-</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SPDIF setup */</div><div class='del'>-static void init_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int coef;</div><div class='del'>-</div><div class='del'>-	coef = 0x0002; /* SRC_MUTE soft-mute on SPDIF (if no lock) */</div><div class='del'>-	coef |= 0x0008; /* Replace with mute on error */</div><div class='del'>-	if (is_active_pin(codec, CS_DIG_OUT2_PIN_NID))</div><div class='del'>-		coef |= 0x4000; /* RX to TX1 or TX2 Loopthru / SPDIF2</div><div class='del'>-				 * SPDIF_OUT2 is shared with GPIO1 and</div><div class='del'>-				 * DMIC_SDA2.</div><div class='del'>-				 */</div><div class='del'>-	cs_vendor_coef_set(codec, IDX_SPDIF_CTL, coef);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	/* init_verb sequence for C0/C1/C2 errata*/</div><div class='del'>-	snd_hda_sequence_write(codec, cs_errata_init_verbs);</div><div class='del'>-</div><div class='del'>-	snd_hda_sequence_write(codec, cs_coef_init_verbs);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;gpio_mask) {</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,</div><div class='del'>-				    spec-&gt;gpio_mask);</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION,</div><div class='del'>-				    spec-&gt;gpio_dir);</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,</div><div class='del'>-				    spec-&gt;gpio_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_output(codec);</div><div class='del'>-	init_input(codec);</div><div class='del'>-	init_digital(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cs_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = build_output(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = build_input(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = build_digital_output(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = build_digital_input(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return cs_init(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cs_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	kfree(spec-&gt;capture_bind[0]);</div><div class='del'>-	kfree(spec-&gt;capture_bind[1]);</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cs_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch ((res &gt;&gt; 26) &amp; 0x7f) {</div><div class='del'>-	case HP_EVENT:</div><div class='del'>-		cs_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case MIC_EVENT:</div><div class='del'>-		cs_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops cs_patch_ops = {</div><div class='del'>-	.build_controls = cs_build_controls,</div><div class='del'>-	.build_pcms = cs_build_pcms,</div><div class='del'>-	.init = cs_init,</div><div class='del'>-	.free = cs_free,</div><div class='del'>-	.unsol_event = cs_unsol_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cs_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = parse_output(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = parse_input(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = parse_digital_output(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = parse_digital_input(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *cs420x_models[CS420X_MODELS] = {</div><div class='del'>-	[CS420X_MBP53] = "mbp53",</div><div class='del'>-	[CS420X_MBP55] = "mbp55",</div><div class='del'>-	[CS420X_IMAC27] = "imac27",</div><div class='del'>-	[CS420X_AUTO] = "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cs420x_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),</div><div class='del'>-	SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),</div><div class='del'>-	SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cs_pincfg {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	u32 val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cs_pincfg mbp53_pincfgs[] = {</div><div class='del'>-	{ 0x09, 0x012b4050 },</div><div class='del'>-	{ 0x0a, 0x90100141 },</div><div class='del'>-	{ 0x0b, 0x90100140 },</div><div class='del'>-	{ 0x0c, 0x018b3020 },</div><div class='del'>-	{ 0x0d, 0x90a00110 },</div><div class='del'>-	{ 0x0e, 0x400000f0 },</div><div class='del'>-	{ 0x0f, 0x01cbe030 },</div><div class='del'>-	{ 0x10, 0x014be060 },</div><div class='del'>-	{ 0x12, 0x400000f0 },</div><div class='del'>-	{ 0x15, 0x400000f0 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cs_pincfg mbp55_pincfgs[] = {</div><div class='del'>-	{ 0x09, 0x012b4030 },</div><div class='del'>-	{ 0x0a, 0x90100121 },</div><div class='del'>-	{ 0x0b, 0x90100120 },</div><div class='del'>-	{ 0x0c, 0x400000f0 },</div><div class='del'>-	{ 0x0d, 0x90a00110 },</div><div class='del'>-	{ 0x0e, 0x400000f0 },</div><div class='del'>-	{ 0x0f, 0x400000f0 },</div><div class='del'>-	{ 0x10, 0x014be040 },</div><div class='del'>-	{ 0x12, 0x400000f0 },</div><div class='del'>-	{ 0x15, 0x400000f0 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cs_pincfg imac27_pincfgs[] = {</div><div class='del'>-	{ 0x09, 0x012b4050 },</div><div class='del'>-	{ 0x0a, 0x90100140 },</div><div class='del'>-	{ 0x0b, 0x90100142 },</div><div class='del'>-	{ 0x0c, 0x018b3020 },</div><div class='del'>-	{ 0x0d, 0x90a00110 },</div><div class='del'>-	{ 0x0e, 0x400000f0 },</div><div class='del'>-	{ 0x0f, 0x01cbe030 },</div><div class='del'>-	{ 0x10, 0x014be060 },</div><div class='del'>-	{ 0x12, 0x01ab9070 },</div><div class='del'>-	{ 0x15, 0x400000f0 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {</div><div class='del'>-	[CS420X_MBP53] = mbp53_pincfgs,</div><div class='del'>-	[CS420X_MBP55] = mbp55_pincfgs,</div><div class='del'>-	[CS420X_IMAC27] = imac27_pincfgs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void fix_pincfg(struct hda_codec *codec, int model)</div><div class='del'>-{</div><div class='del'>-	const struct cs_pincfg *cfg = cs_pincfgs[model];</div><div class='del'>-	if (!cfg)</div><div class='del'>-		return;</div><div class='del'>-	for (; cfg-&gt;nid; cfg++)</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, cfg-&gt;nid, cfg-&gt;val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int patch_cs420x(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cs_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;board_config =</div><div class='del'>-		snd_hda_check_board_config(codec, CS420X_MODELS,</div><div class='del'>-					   cs420x_models, cs420x_cfg_tbl);</div><div class='del'>-	if (spec-&gt;board_config &gt;= 0)</div><div class='del'>-		fix_pincfg(codec, spec-&gt;board_config);</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;board_config) {</div><div class='del'>-	case CS420X_IMAC27:</div><div class='del'>-	case CS420X_MBP53:</div><div class='del'>-	case CS420X_MBP55:</div><div class='del'>-		/* GPIO1 = headphones */</div><div class='del'>-		/* GPIO3 = speakers */</div><div class='del'>-		spec-&gt;gpio_mask = 0x0a;</div><div class='del'>-		spec-&gt;gpio_dir = 0x0a;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = cs_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = cs_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-	codec-&gt;spec = NULL;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_cirrus[] = {</div><div class='del'>-	{ .id = 0x10134206, .name = "CS4206", .patch = patch_cs420x },</div><div class='del'>-	{ .id = 0x10134207, .name = "CS4207", .patch = patch_cs420x },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10134206");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10134207");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Cirrus Logic HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list cirrus_list = {</div><div class='del'>-	.preset = snd_hda_preset_cirrus,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_cirrus_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;cirrus_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_cirrus_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;cirrus_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_cirrus_init)</div><div class='del'>-module_exit(patch_cirrus_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c<br/>deleted file mode 100644<br/>index ff60908f4554..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_cmedia.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_cmedia.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,776 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * HD audio interface patch for C-Media CMI9880</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#define NUM_PINS	11</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* board config type */</div><div class='del'>-enum {</div><div class='del'>-	CMI_MINIMAL,	/* back 3-jack */</div><div class='del'>-	CMI_MIN_FP,	/* back 3-jack + front-panel 2-jack */</div><div class='del'>-	CMI_FULL,	/* back 6-jack + front-panel 2-jack */</div><div class='del'>-	CMI_FULL_DIG,	/* back 6-jack + front-panel 2-jack + digital I/O */</div><div class='del'>-	CMI_ALLOUT,	/* back 5-jack + front-panel 2-jack + digital out */</div><div class='del'>-	CMI_AUTO,	/* let driver guess it */</div><div class='del'>-	CMI_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cmi_spec {</div><div class='del'>-	int board_config;</div><div class='del'>-	unsigned int no_line_in: 1;	/* no line-in (5-jack) */</div><div class='del'>-	unsigned int front_panel: 1;	/* has front-panel 2-jack */</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	hda_nid_t dac_nids[AUTO_CFG_MAX_OUTS];	/* NID for each DAC */</div><div class='del'>-	int num_dacs;</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t dig_in_nid;</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	unsigned int cur_mux[2];</div><div class='del'>-</div><div class='del'>-	/* channel mode */</div><div class='del'>-	int num_channel_modes;</div><div class='del'>-	const struct hda_channel_mode *channel_modes;</div><div class='del'>-</div><div class='del'>-	struct hda_pcm pcm_rec[2];	/* PCM information */</div><div class='del'>-</div><div class='del'>-	/* pin default configuration */</div><div class='del'>-	hda_nid_t pin_nid[NUM_PINS];</div><div class='del'>-	unsigned int def_conf[NUM_PINS];</div><div class='del'>-	unsigned int pin_def_confs;</div><div class='del'>-</div><div class='del'>-	/* multichannel pins */</div><div class='del'>-	struct hda_verb multi_init[9];	/* 2 verbs for each pin + terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX</div><div class='del'>- */</div><div class='del'>-static int cmi_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;input_mux, ucontrol,</div><div class='del'>-				     spec-&gt;adc_nids[adc_idx], &amp;spec-&gt;cur_mux[adc_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * shared line-in, mic for surrounds</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* 3-stack / 2 channel */</div><div class='del'>-static struct hda_verb cmi9880_ch2_init[] = {</div><div class='del'>-	/* set line-in PIN for input */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	/* set mic PIN for input, also enable vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* route front PCM (DAC1) to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 3-stack / 6 channel */</div><div class='del'>-static struct hda_verb cmi9880_ch6_init[] = {</div><div class='del'>-	/* set line-in PIN for output */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	/* set mic PIN for output */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	/* route front PCM (DAC1) to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 3-stack+front / 8 channel */</div><div class='del'>-static struct hda_verb cmi9880_ch8_init[] = {</div><div class='del'>-	/* set line-in PIN for output */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	/* set mic PIN for output */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	/* route rear-surround PCM (DAC4) to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x03 },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode cmi9880_channel_modes[3] = {</div><div class='del'>-	{ 2, cmi9880_ch2_init },</div><div class='del'>-	{ 6, cmi9880_ch6_init },</div><div class='del'>-	{ 8, cmi9880_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cmi_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_info(codec, uinfo, spec-&gt;channel_modes,</div><div class='del'>-				    spec-&gt;num_channel_modes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_get(codec, ucontrol, spec-&gt;channel_modes,</div><div class='del'>-				   spec-&gt;num_channel_modes, spec-&gt;multiout.max_channels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_put(codec, ucontrol, spec-&gt;channel_modes,</div><div class='del'>-				   spec-&gt;num_channel_modes, &amp;spec-&gt;multiout.max_channels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new cmi9880_basic_mixer[] = {</div><div class='del'>-	/* CMI9880 has no playback volumes! */</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), /* front */</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Side Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = cmi_mux_enum_info,</div><div class='del'>-		.get = cmi_mux_enum_get,</div><div class='del'>-		.put = cmi_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x08, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0x23, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Beep Playback Switch", 0x23, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * shared I/O pins</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = cmi_ch_mode_info,</div><div class='del'>-		.get = cmi_ch_mode_get,</div><div class='del'>-		.put = cmi_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* AUD-in selections:</div><div class='del'>- * 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x1f 0x20</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux cmi9880_basic_mux = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x5 },</div><div class='del'>-		{ "Rear Mic", 0x2 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "CD", 0x7 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cmi9880_no_line_mux = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x5 },</div><div class='del'>-		{ "Rear Mic", 0x2 },</div><div class='del'>-		{ "CD", 0x7 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* front, rear, clfe, rear_surr */</div><div class='del'>-static hda_nid_t cmi9880_dac_nids[4] = {</div><div class='del'>-	0x03, 0x04, 0x05, 0x06</div><div class='del'>-};</div><div class='del'>-/* ADC0, ADC1 */</div><div class='del'>-static hda_nid_t cmi9880_adc_nids[2] = {</div><div class='del'>-	0x08, 0x09</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CMI_DIG_OUT_NID	0x07</div><div class='del'>-#define CMI_DIG_IN_NID	0x0a</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_verb cmi9880_basic_init[] = {</div><div class='del'>-	/* port-D for line out (rear panel) */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-A for surround (rear panel) */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	/* port-C for line-in (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	/* route front mic to ADC1/2 */</div><div class='del'>-	{ 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },</div><div class='del'>-	{ 0x09, AC_VERB_SET_CONNECT_SEL, 0x05 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cmi9880_allout_init[] = {</div><div class='del'>-	/* port-D for line out (rear panel) */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-A for side (rear panel) */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	/* port-C for surround (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	/* route front mic to ADC1/2 */</div><div class='del'>-	{ 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },</div><div class='del'>-	{ 0x09, AC_VERB_SET_CONNECT_SEL, 0x05 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static int cmi9880_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_add_new_ctls(codec, cmi9880_basic_mixer);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (spec-&gt;channel_modes) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, cmi9880_ch_mode_mixer);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-						    &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign Capture Source enums to NID */</div><div class='del'>-	kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");</div><div class='del'>-	for (i = 0; kctl &amp;&amp; i &lt; kctl-&gt;count; i++) {</div><div class='del'>-		err = snd_hda_add_nid(codec, kctl, i, spec-&gt;adc_nids[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill in the multi_dac_nids table, which will decide</div><div class='del'>-   which audio widget to use for each channel */</div><div class='del'>-static int cmi9880_fill_multi_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int assigned[4];</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	/* clear the table, only one c-media dac assumed here */</div><div class='del'>-	memset(spec-&gt;dac_nids, 0, sizeof(spec-&gt;dac_nids));</div><div class='del'>-	memset(assigned, 0, sizeof(assigned));</div><div class='del'>-	/* check the pins we found */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		/* nid 0x0b~0x0e is hardwired to audio widget 0x3~0x6 */</div><div class='del'>-		if (nid &gt;= 0x0b &amp;&amp; nid &lt;= 0x0e) {</div><div class='del'>-			spec-&gt;dac_nids[i] = (nid - 0x0b) + 0x03;</div><div class='del'>-			assigned[nid - 0x0b] = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* left pin can be connect to any audio widget */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid &lt;= 0x0e)</div><div class='del'>-			continue;</div><div class='del'>-		/* search for an empty channel */</div><div class='del'>-		for (j = 0; j &lt; cfg-&gt;line_outs; j++) {</div><div class='del'>-			if (! assigned[j]) {</div><div class='del'>-				spec-&gt;dac_nids[i] = j + 0x03;</div><div class='del'>-				assigned[j] = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;num_dacs = cfg-&gt;line_outs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create multi_init table, which is used for multichannel initialization */</div><div class='del'>-static int cmi9880_fill_multi_init(struct hda_codec *codec, const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, j, k, len;</div><div class='del'>-</div><div class='del'>-	/* clear the table, only one c-media dac assumed here */</div><div class='del'>-	memset(spec-&gt;multi_init, 0, sizeof(spec-&gt;multi_init));</div><div class='del'>-	for (j = 0, i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		hda_nid_t conn[4];</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		/* set as output */</div><div class='del'>-		spec-&gt;multi_init[j].nid = nid;</div><div class='del'>-		spec-&gt;multi_init[j].verb = AC_VERB_SET_PIN_WIDGET_CONTROL;</div><div class='del'>-		spec-&gt;multi_init[j].param = PIN_OUT;</div><div class='del'>-		j++;</div><div class='del'>-		if (nid &gt; 0x0e) {</div><div class='del'>-			/* set connection */</div><div class='del'>-			spec-&gt;multi_init[j].nid = nid;</div><div class='del'>-			spec-&gt;multi_init[j].verb = AC_VERB_SET_CONNECT_SEL;</div><div class='del'>-			spec-&gt;multi_init[j].param = 0;</div><div class='del'>-			/* find the index in connect list */</div><div class='del'>-			len = snd_hda_get_connections(codec, nid, conn, 4);</div><div class='del'>-			for (k = 0; k &lt; len; k++)</div><div class='del'>-				if (conn[k] == spec-&gt;dac_nids[i]) {</div><div class='del'>-					spec-&gt;multi_init[j].param = k;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;board_config == CMI_ALLOUT)</div><div class='del'>-		snd_hda_sequence_write(codec, cmi9880_allout_init);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_sequence_write(codec, cmi9880_basic_init);</div><div class='del'>-	if (spec-&gt;board_config == CMI_AUTO)</div><div class='del'>-		snd_hda_sequence_write(codec, spec-&gt;multi_init);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog playback callbacks</div><div class='del'>- */</div><div class='del'>-static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				     struct hda_codec *codec,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					unsigned int stream_tag,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-						format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int cmi9880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					  struct hda_codec *codec,</div><div class='del'>-					  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					    struct hda_codec *codec,</div><div class='del'>-					    unsigned int stream_tag,</div><div class='del'>-					    unsigned int format,</div><div class='del'>-					    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout, stream_tag,</div><div class='del'>-					     format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int cmi9880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;adc_nids[substream-&gt;number]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream cmi9880_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x03, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = cmi9880_playback_pcm_open,</div><div class='del'>-		.prepare = cmi9880_playback_pcm_prepare,</div><div class='del'>-		.cleanup = cmi9880_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cmi9880_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x08, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = cmi9880_capture_pcm_prepare,</div><div class='del'>-		.cleanup = cmi9880_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cmi9880_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in cmi9880_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = cmi9880_dig_playback_pcm_open,</div><div class='del'>-		.close = cmi9880_dig_playback_pcm_close,</div><div class='del'>-		.prepare = cmi9880_dig_playback_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cmi9880_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in cmi9880_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cmi9880_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "CMI9880";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = cmi9880_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = cmi9880_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid || spec-&gt;dig_in_nid) {</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info++;</div><div class='del'>-		info-&gt;name = "CMI9880 Digital";</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-		if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = cmi9880_pcm_digital_playback;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;dig_in_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = cmi9880_pcm_digital_capture;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cmi9880_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *cmi9880_models[CMI_MODELS] = {</div><div class='del'>-	[CMI_MINIMAL]	= "minimal",</div><div class='del'>-	[CMI_MIN_FP]	= "min_fp",</div><div class='del'>-	[CMI_FULL]	= "full",</div><div class='del'>-	[CMI_FULL_DIG]	= "full_dig",</div><div class='del'>-	[CMI_ALLOUT]	= "allout",</div><div class='del'>-	[CMI_AUTO]	= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cmi9880_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", CMI_FULL_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x002b, "LG LS75", CMI_MINIMAL),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x0032, "LG", CMI_FULL_DIG),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops cmi9880_patch_ops = {</div><div class='del'>-	.build_controls = cmi9880_build_controls,</div><div class='del'>-	.build_pcms = cmi9880_build_pcms,</div><div class='del'>-	.init = cmi9880_init,</div><div class='del'>-	.free = cmi9880_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_cmi9880(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct cmi_spec *spec;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, CMI_MODELS,</div><div class='del'>-							cmi9880_models,</div><div class='del'>-							cmi9880_cfg_tbl);</div><div class='del'>-	if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-		spec-&gt;board_config = CMI_AUTO; /* try everything */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* copy default DAC NIDs */</div><div class='del'>-	memcpy(spec-&gt;dac_nids, cmi9880_dac_nids, sizeof(spec-&gt;dac_nids));</div><div class='del'>-	spec-&gt;num_dacs = 4;</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;board_config) {</div><div class='del'>-	case CMI_MINIMAL:</div><div class='del'>-	case CMI_MIN_FP:</div><div class='del'>-		spec-&gt;channel_modes = cmi9880_channel_modes;</div><div class='del'>-		if (spec-&gt;board_config == CMI_MINIMAL)</div><div class='del'>-			spec-&gt;num_channel_modes = 2;</div><div class='del'>-		else {</div><div class='del'>-			spec-&gt;front_panel = 1;</div><div class='del'>-			spec-&gt;num_channel_modes = 3;</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;multiout.max_channels = cmi9880_channel_modes[0].channels;</div><div class='del'>-		spec-&gt;input_mux = &amp;cmi9880_basic_mux;</div><div class='del'>-		break;</div><div class='del'>-	case CMI_FULL:</div><div class='del'>-	case CMI_FULL_DIG:</div><div class='del'>-		spec-&gt;front_panel = 1;</div><div class='del'>-		spec-&gt;multiout.max_channels = 8;</div><div class='del'>-		spec-&gt;input_mux = &amp;cmi9880_basic_mux;</div><div class='del'>-		if (spec-&gt;board_config == CMI_FULL_DIG) {</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = CMI_DIG_OUT_NID;</div><div class='del'>-			spec-&gt;dig_in_nid = CMI_DIG_IN_NID;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CMI_ALLOUT:</div><div class='del'>-		spec-&gt;front_panel = 1;</div><div class='del'>-		spec-&gt;multiout.max_channels = 8;</div><div class='del'>-		spec-&gt;no_line_in = 1;</div><div class='del'>-		spec-&gt;input_mux = &amp;cmi9880_no_line_mux;</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = CMI_DIG_OUT_NID;</div><div class='del'>-		break;</div><div class='del'>-	case CMI_AUTO:</div><div class='del'>-		{</div><div class='del'>-		unsigned int port_e, port_f, port_g, port_h;</div><div class='del'>-		unsigned int port_spdifi, port_spdifo;</div><div class='del'>-		struct auto_pin_cfg cfg;</div><div class='del'>-</div><div class='del'>-		/* collect pin default configuration */</div><div class='del'>-		port_e = snd_hda_codec_get_pincfg(codec, 0x0f);</div><div class='del'>-		port_f = snd_hda_codec_get_pincfg(codec, 0x10);</div><div class='del'>-		spec-&gt;front_panel = 1;</div><div class='del'>-		if (get_defcfg_connect(port_e) == AC_JACK_PORT_NONE ||</div><div class='del'>-		    get_defcfg_connect(port_f) == AC_JACK_PORT_NONE) {</div><div class='del'>-			port_g = snd_hda_codec_get_pincfg(codec, 0x1f);</div><div class='del'>-			port_h = snd_hda_codec_get_pincfg(codec, 0x20);</div><div class='del'>-			spec-&gt;channel_modes = cmi9880_channel_modes;</div><div class='del'>-			/* no front panel */</div><div class='del'>-			if (get_defcfg_connect(port_g) == AC_JACK_PORT_NONE ||</div><div class='del'>-			    get_defcfg_connect(port_h) == AC_JACK_PORT_NONE) {</div><div class='del'>-				/* no optional rear panel */</div><div class='del'>-				spec-&gt;board_config = CMI_MINIMAL;</div><div class='del'>-				spec-&gt;front_panel = 0;</div><div class='del'>-				spec-&gt;num_channel_modes = 2;</div><div class='del'>-			} else {</div><div class='del'>-				spec-&gt;board_config = CMI_MIN_FP;</div><div class='del'>-				spec-&gt;num_channel_modes = 3;</div><div class='del'>-			}</div><div class='del'>-			spec-&gt;input_mux = &amp;cmi9880_basic_mux;</div><div class='del'>-			spec-&gt;multiout.max_channels = cmi9880_channel_modes[0].channels;</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;input_mux = &amp;cmi9880_basic_mux;</div><div class='del'>-			port_spdifi = snd_hda_codec_get_pincfg(codec, 0x13);</div><div class='del'>-			port_spdifo = snd_hda_codec_get_pincfg(codec, 0x12);</div><div class='del'>-			if (get_defcfg_connect(port_spdifo) != AC_JACK_PORT_NONE)</div><div class='del'>-				spec-&gt;multiout.dig_out_nid = CMI_DIG_OUT_NID;</div><div class='del'>-			if (get_defcfg_connect(port_spdifi) != AC_JACK_PORT_NONE)</div><div class='del'>-				spec-&gt;dig_in_nid = CMI_DIG_IN_NID;</div><div class='del'>-			spec-&gt;multiout.max_channels = 8;</div><div class='del'>-		}</div><div class='del'>-		snd_hda_parse_pin_def_config(codec, &amp;cfg, NULL);</div><div class='del'>-		if (cfg.line_outs) {</div><div class='del'>-			spec-&gt;multiout.max_channels = cfg.line_outs * 2;</div><div class='del'>-			cmi9880_fill_multi_dac_nids(codec, &amp;cfg);</div><div class='del'>-			cmi9880_fill_multi_init(codec, &amp;cfg);</div><div class='del'>-		} else</div><div class='del'>-			snd_printd("patch_cmedia: cannot detect association in defcfg\n");</div><div class='del'>-		break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = spec-&gt;num_dacs;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;adc_nids = cmi9880_adc_nids;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = cmi9880_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_cmedia[] = {</div><div class='del'>-	{ .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 },</div><div class='del'>- 	{ .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:13f69880");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:434d4980");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("C-Media HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list cmedia_list = {</div><div class='del'>-	.preset = snd_hda_preset_cmedia,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_cmedia_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;cmedia_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_cmedia_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;cmedia_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_cmedia_init)</div><div class='del'>-module_exit(patch_cmedia_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c<br/>deleted file mode 100644<br/>index 6361f752b5f3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_conexant.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_conexant.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3937 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * HD audio interface patch for Conexant HDA audio codec</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2006 Pototskiy Akex &lt;alex.pototskiy@gmail.com&gt;</div><div class='del'>- * 		      Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- * 		      Tobin Davis  &lt;tdavis@dsl-only.net&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/jack.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-</div><div class='del'>-#define CXT_PIN_DIR_IN              0x00</div><div class='del'>-#define CXT_PIN_DIR_OUT             0x01</div><div class='del'>-#define CXT_PIN_DIR_INOUT           0x02</div><div class='del'>-#define CXT_PIN_DIR_IN_NOMICBIAS    0x03</div><div class='del'>-#define CXT_PIN_DIR_INOUT_NOMICBIAS 0x04</div><div class='del'>-</div><div class='del'>-#define CONEXANT_HP_EVENT	0x37</div><div class='del'>-#define CONEXANT_MIC_EVENT	0x38</div><div class='del'>-</div><div class='del'>-/* Conexant 5051 specific */</div><div class='del'>-</div><div class='del'>-#define CXT5051_SPDIF_OUT	0x12</div><div class='del'>-#define CXT5051_PORTB_EVENT	0x38</div><div class='del'>-#define CXT5051_PORTC_EVENT	0x39</div><div class='del'>-</div><div class='del'>-#define AUTO_MIC_PORTB		(1 &lt;&lt; 1)</div><div class='del'>-#define AUTO_MIC_PORTC		(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-struct conexant_jack {</div><div class='del'>-</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int type;</div><div class='del'>-	struct snd_jack *jack;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pin_dac_pair {</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-	int type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct conexant_spec {</div><div class='del'>-</div><div class='del'>-	struct snd_kcontrol_new *mixers[5];</div><div class='del'>-	int num_mixers;</div><div class='del'>-	hda_nid_t vmaster_nid;</div><div class='del'>-</div><div class='del'>-	const struct hda_verb *init_verbs[5];	/* initialization verbs</div><div class='del'>-						 * don't forget NULL</div><div class='del'>-						 * termination!</div><div class='del'>-						 */</div><div class='del'>-	unsigned int num_init_verbs;</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_multi_out multiout;	/* playback set-up</div><div class='del'>-					 * max_channels, dacs must be set</div><div class='del'>-					 * dig_out_nid and hp_nid are optional</div><div class='del'>-					 */</div><div class='del'>-	unsigned int cur_eapd;</div><div class='del'>-	unsigned int hp_present;</div><div class='del'>-	unsigned int auto_mic;</div><div class='del'>-	int auto_mic_ext;		/* autocfg.inputs[] index for ext mic */</div><div class='del'>-	unsigned int need_dac_fix;</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	unsigned int num_adc_nids;</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t dig_in_nid;		/* digital-in NID; optional */</div><div class='del'>-</div><div class='del'>-	unsigned int cur_adc_idx;</div><div class='del'>-	hda_nid_t cur_adc;</div><div class='del'>-	unsigned int cur_adc_stream_tag;</div><div class='del'>-	unsigned int cur_adc_format;</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	hda_nid_t *capsrc_nids;</div><div class='del'>-	unsigned int cur_mux[3];</div><div class='del'>-</div><div class='del'>-	/* channel model */</div><div class='del'>-	const struct hda_channel_mode *channel_mode;</div><div class='del'>-	int num_channel_mode;</div><div class='del'>-</div><div class='del'>-	/* PCM information */</div><div class='del'>-	struct hda_pcm pcm_rec[2];	/* used in build_pcms() */</div><div class='del'>-</div><div class='del'>-	unsigned int spdif_route;</div><div class='del'>-</div><div class='del'>-	/* jack detection */</div><div class='del'>-	struct snd_array jacks;</div><div class='del'>-</div><div class='del'>-	/* dynamic controls, init_verbs and input_mux */</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct hda_input_mux private_imux;</div><div class='del'>-	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	struct pin_dac_pair dac_info[8];</div><div class='del'>-	int dac_info_filled;</div><div class='del'>-</div><div class='del'>-	unsigned int port_d_mode;</div><div class='del'>-	unsigned int auto_mute:1;	/* used in auto-parser */</div><div class='del'>-	unsigned int dell_automute:1;</div><div class='del'>-	unsigned int dell_vostro:1;</div><div class='del'>-	unsigned int ideapad:1;</div><div class='del'>-	unsigned int thinkpad:1;</div><div class='del'>-	unsigned int hp_laptop:1;</div><div class='del'>-</div><div class='del'>-	unsigned int ext_mic_present;</div><div class='del'>-	unsigned int recording;</div><div class='del'>-	void (*capture_prepare)(struct hda_codec *codec);</div><div class='del'>-	void (*capture_cleanup)(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-	/* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors)</div><div class='del'>-	 * through the microphone jack.</div><div class='del'>-	 * When the user enables this through a mixer switch, both internal and</div><div class='del'>-	 * external microphones are disabled. Gain is fixed at 0dB. In this mode,</div><div class='del'>-	 * we also allow the bias to be configured through a separate mixer</div><div class='del'>-	 * control. */</div><div class='del'>-	unsigned int dc_enable;</div><div class='del'>-	unsigned int dc_input_bias; /* offset into cxt5066_olpc_dc_bias */</div><div class='del'>-	unsigned int mic_boost; /* offset into cxt5066_analog_mic_boost */</div><div class='del'>-</div><div class='del'>-	unsigned int beep_amp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 unsigned int stream_tag,</div><div class='del'>-					 unsigned int format,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-						stream_tag,</div><div class='del'>-						format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int conexant_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					  struct hda_codec *codec,</div><div class='del'>-					  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 unsigned int stream_tag,</div><div class='del'>-					 unsigned int format,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-					     stream_tag,</div><div class='del'>-					     format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int conexant_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;capture_prepare)</div><div class='del'>-		spec-&gt;capture_prepare(codec);</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;adc_nids[substream-&gt;number]);</div><div class='del'>-	if (spec-&gt;capture_cleanup)</div><div class='del'>-		spec-&gt;capture_cleanup(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream conexant_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = conexant_playback_pcm_open,</div><div class='del'>-		.prepare = conexant_playback_pcm_prepare,</div><div class='del'>-		.cleanup = conexant_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream conexant_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = conexant_capture_pcm_prepare,</div><div class='del'>-		.cleanup = conexant_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream conexant_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = conexant_dig_playback_pcm_open,</div><div class='del'>-		.close = conexant_dig_playback_pcm_close,</div><div class='del'>-		.prepare = conexant_dig_playback_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream conexant_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cx5051_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;cur_adc = spec-&gt;adc_nids[spec-&gt;cur_adc_idx];</div><div class='del'>-	spec-&gt;cur_adc_stream_tag = stream_tag;</div><div class='del'>-	spec-&gt;cur_adc_format = format;</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;cur_adc, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx5051_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc);</div><div class='del'>-	spec-&gt;cur_adc = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream cx5051_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = cx5051_capture_pcm_prepare,</div><div class='del'>-		.cleanup = cx5051_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int conexant_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "CONEXANT Analog";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = conexant_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='del'>-		spec-&gt;multiout.max_channels;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-		spec-&gt;multiout.dac_nids[0];</div><div class='del'>-	if (codec-&gt;vendor_id == 0x14f15051)</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-			cx5051_pcm_analog_capture;</div><div class='del'>-	else</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-			conexant_pcm_analog_capture;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec-&gt;num_adc_nids;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adc_nids[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		info++;</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info-&gt;name = "Conexant Digital";</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-			conexant_pcm_digital_playback;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-			spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		if (spec-&gt;dig_in_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-				conexant_pcm_digital_capture;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid =</div><div class='del'>-				spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-	       			  struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;input_mux, ucontrol,</div><div class='del'>-				     spec-&gt;capsrc_nids[adc_idx],</div><div class='del'>-				     &amp;spec-&gt;cur_mux[adc_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-static void conexant_free_jack_priv(struct snd_jack *jack)</div><div class='del'>-{</div><div class='del'>-	struct conexant_jack *jacks = jack-&gt;private_data;</div><div class='del'>-	jacks-&gt;nid = 0;</div><div class='del'>-	jacks-&gt;jack = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_add_jack(struct hda_codec *codec,</div><div class='del'>-		hda_nid_t nid, int type)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	struct conexant_jack *jack;</div><div class='del'>-	const char *name;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = codec-&gt;spec;</div><div class='del'>-	snd_array_init(&amp;spec-&gt;jacks, sizeof(*jack), 32);</div><div class='del'>-	jack = snd_array_new(&amp;spec-&gt;jacks);</div><div class='del'>-	name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;</div><div class='del'>-</div><div class='del'>-	if (!jack)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	jack-&gt;nid = nid;</div><div class='del'>-	jack-&gt;type = type;</div><div class='del'>-</div><div class='del'>-	err = snd_jack_new(codec-&gt;bus-&gt;card, name, type, &amp;jack-&gt;jack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	jack-&gt;jack-&gt;private_data = jack;</div><div class='del'>-	jack-&gt;jack-&gt;private_free = conexant_free_jack_priv;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct conexant_jack *jacks = spec-&gt;jacks.list;</div><div class='del'>-</div><div class='del'>-	if (jacks) {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;jacks.used; i++) {</div><div class='del'>-			if (jacks-&gt;nid == nid) {</div><div class='del'>-				unsigned int present;</div><div class='del'>-				present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-</div><div class='del'>-				present = (present) ? jacks-&gt;type : 0 ;</div><div class='del'>-</div><div class='del'>-				snd_jack_report(jacks-&gt;jack,</div><div class='del'>-						present);</div><div class='del'>-			}</div><div class='del'>-			jacks++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_init_jacks(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_init_verbs; i++) {</div><div class='del'>-		const struct hda_verb *hv;</div><div class='del'>-</div><div class='del'>-		hv = spec-&gt;init_verbs[i];</div><div class='del'>-		while (hv-&gt;nid) {</div><div class='del'>-			int err = 0;</div><div class='del'>-			switch (hv-&gt;param ^ AC_USRSP_EN) {</div><div class='del'>-			case CONEXANT_HP_EVENT:</div><div class='del'>-				err = conexant_add_jack(codec, hv-&gt;nid,</div><div class='del'>-						SND_JACK_HEADPHONE);</div><div class='del'>-				conexant_report_jack(codec, hv-&gt;nid);</div><div class='del'>-				break;</div><div class='del'>-			case CXT5051_PORTC_EVENT:</div><div class='del'>-			case CONEXANT_MIC_EVENT:</div><div class='del'>-				err = conexant_add_jack(codec, hv-&gt;nid,</div><div class='del'>-						SND_JACK_MICROPHONE);</div><div class='del'>-				conexant_report_jack(codec, hv-&gt;nid);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			++hv;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int conexant_init_jacks(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int conexant_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_init_verbs; i++)</div><div class='del'>-		snd_hda_sequence_write(codec, spec-&gt;init_verbs[i]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void conexant_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;jacks.list) {</div><div class='del'>-		struct conexant_jack *jacks = spec-&gt;jacks.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;jacks.used; i++, jacks++) {</div><div class='del'>-			if (jacks-&gt;jack)</div><div class='del'>-				snd_device_free(codec-&gt;bus-&gt;card, jacks-&gt;jack);</div><div class='del'>-		}</div><div class='del'>-		snd_array_free(&amp;spec-&gt;jacks);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	snd_hda_detach_beep_device(codec);</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt_capture_mixers[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = conexant_mux_enum_info,</div><div class='del'>-		.get = conexant_mux_enum_get,</div><div class='del'>-		.put = conexant_mux_enum_put</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-/* additional beep mixers; the actual parameters are overwritten at build */</div><div class='del'>-static struct snd_kcontrol_new cxt_beep_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static const char *slave_vols[] = {</div><div class='del'>-	"Headphone Playback Volume",</div><div class='del'>-	"Speaker Playback Volume",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *slave_sws[] = {</div><div class='del'>-	"Headphone Playback Switch",</div><div class='del'>-	"Speaker Playback Switch",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int conexant_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec,</div><div class='del'>-						    spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-						    &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	} </div><div class='del'>-	if (spec-&gt;dig_in_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec,spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if we have no master control, let's create it */</div><div class='del'>-	if (spec-&gt;vmaster_nid &amp;&amp;</div><div class='del'>-	    !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {</div><div class='del'>-		unsigned int vmaster_tlv[4];</div><div class='del'>-		snd_hda_set_vmaster_tlv(codec, spec-&gt;vmaster_nid,</div><div class='del'>-					HDA_OUTPUT, vmaster_tlv);</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='del'>-					  vmaster_tlv, slave_vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;vmaster_nid &amp;&amp;</div><div class='del'>-	    !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='del'>-					  NULL, slave_sws);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;input_mux) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, cxt_capture_mixers);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-	/* create beep controls if needed */</div><div class='del'>-	if (spec-&gt;beep_amp) {</div><div class='del'>-		struct snd_kcontrol_new *knew;</div><div class='del'>-		for (knew = cxt_beep_mixer; knew-&gt;name; knew++) {</div><div class='del'>-			struct snd_kcontrol *kctl;</div><div class='del'>-			kctl = snd_ctl_new1(knew, codec);</div><div class='del'>-			if (!kctl)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			kctl-&gt;private_value = spec-&gt;beep_amp;</div><div class='del'>-			err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int conexant_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	snd_hda_shutup_pins(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops conexant_patch_ops = {</div><div class='del'>-	.build_controls = conexant_build_controls,</div><div class='del'>-	.build_pcms = conexant_build_pcms,</div><div class='del'>-	.init = conexant_init,</div><div class='del'>-	.free = conexant_free,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.suspend = conexant_suspend,</div><div class='del'>-#endif</div><div class='del'>-	.reboot_notify = snd_hda_shutup_pins,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) \</div><div class='del'>-	((spec)-&gt;beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir))</div><div class='del'>-#else</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) /* NOP */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EAPD control</div><div class='del'>- * the private value = nid | (invert &lt;&lt; 8)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define cxt_eapd_info		snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int cxt_eapd_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int invert = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='del'>-	if (invert)</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = !spec-&gt;cur_eapd;</div><div class='del'>-	else</div><div class='del'>-		ucontrol-&gt;value.integer.value[0] = spec-&gt;cur_eapd;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt_eapd_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int invert = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	unsigned int eapd;</div><div class='del'>-</div><div class='del'>-	eapd = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	if (invert)</div><div class='del'>-		eapd = !eapd;</div><div class='del'>-	if (eapd == spec-&gt;cur_eapd)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	spec-&gt;cur_eapd = eapd;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid,</div><div class='del'>-				  0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-				  eapd ? 0x02 : 0x00);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* controls for test mode */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-</div><div class='del'>-#define CXT_EAPD_SWITCH(xname, nid, mask) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .info = cxt_eapd_info, \</div><div class='del'>-	  .get = cxt_eapd_get, \</div><div class='del'>-	  .put = cxt_eapd_put, \</div><div class='del'>-	  .private_value = nid | (mask&lt;&lt;16) }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int conexant_ch_mode_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_info(codec, uinfo, spec-&gt;channel_mode,</div><div class='del'>-				    spec-&gt;num_channel_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_ch_mode_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_get(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				   spec-&gt;num_channel_mode,</div><div class='del'>-				   spec-&gt;multiout.max_channels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int conexant_ch_mode_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err = snd_hda_ch_mode_put(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				      spec-&gt;num_channel_mode,</div><div class='del'>-				      &amp;spec-&gt;multiout.max_channels);</div><div class='del'>-	if (err &gt;= 0 &amp;&amp; spec-&gt;need_dac_fix)</div><div class='del'>-		spec-&gt;multiout.num_dacs = spec-&gt;multiout.max_channels / 2;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CXT_PIN_MODE(xname, nid, dir) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .info = conexant_ch_mode_info, \</div><div class='del'>-	  .get = conexant_ch_mode_get, \</div><div class='del'>-	  .put = conexant_ch_mode_put, \</div><div class='del'>-	  .private_value = nid | (dir&lt;&lt;16) }</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='del'>-/* Conexant 5045 specific */</div><div class='del'>-</div><div class='del'>-static hda_nid_t cxt5045_dac_nids[1] = { 0x19 };</div><div class='del'>-static hda_nid_t cxt5045_adc_nids[1] = { 0x1a };</div><div class='del'>-static hda_nid_t cxt5045_capsrc_nids[1] = { 0x1a };</div><div class='del'>-#define CXT5045_SPDIF_OUT	0x18</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode cxt5045_modes[1] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cxt5045_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "IntMic", 0x1 },</div><div class='del'>-		{ "ExtMic", 0x2 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cxt5045_capture_source_benq = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "IntMic", 0x1 },</div><div class='del'>-		{ "ExtMic", 0x2 },</div><div class='del'>-		{ "LineIn", 0x3 },</div><div class='del'>-		{ "CD",     0x4 },</div><div class='del'>-		{ "Mixer",  0x0 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cxt5045_capture_source_hp530 = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "ExtMic", 0x1 },</div><div class='del'>-		{ "IntMic", 0x2 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD (+ mute HP) as a master switch */</div><div class='del'>-static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int bits;</div><div class='del'>-</div><div class='del'>-	if (!cxt_eapd_put(kcontrol, ucontrol))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* toggle internal speakers mute depending of presence of</div><div class='del'>-	 * the headphone jack</div><div class='del'>-	 */</div><div class='del'>-	bits = (!spec-&gt;hp_present &amp;&amp; spec-&gt;cur_eapd) ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-</div><div class='del'>-	bits = spec-&gt;cur_eapd ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x11, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bind volumes of both NID 0x10 and 0x11 */</div><div class='del'>-static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in and mic jack appropriately */</div><div class='del'>-static void cxt5045_hp_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	static struct hda_verb mic_jack_on[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-		{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb mic_jack_off[] = {</div><div class='del'>-		{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},</div><div class='del'>-		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x12);</div><div class='del'>-	if (present)</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_on);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void cxt5045_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int bits;</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_present = snd_hda_jack_detect(codec, 0x11);</div><div class='del'>-</div><div class='del'>-	bits = (spec-&gt;hp_present || !spec-&gt;cur_eapd) ? HDA_AMP_MUTE : 0; </div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void cxt5045_hp_unsol_event(struct hda_codec *codec,</div><div class='del'>-				   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	res &gt;&gt;= 26;</div><div class='del'>-	switch (res) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5045_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5045_hp_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5045_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;cxt5045_hp_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = cxt_eapd_info,</div><div class='del'>-		.get = cxt_eapd_get,</div><div class='del'>-		.put = cxt5045_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x10,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5045_benq_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("CD Capture Volume", 0x1a, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Capture Switch", 0x1a, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Capture Volume", 0x1a, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line In Capture Switch", 0x1a, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Playback Volume", 0x17, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line In Playback Switch", 0x17, 0x3, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer Capture Volume", 0x1a, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer Capture Switch", 0x1a, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;cxt5045_hp_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = cxt_eapd_info,</div><div class='del'>-		.get = cxt_eapd_get,</div><div class='del'>-		.put = cxt5045_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x10,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5045_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL,0x1},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{ 0x13, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2 }, /* default on */ </div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5045_benq_init_verbs[] = {</div><div class='del'>-	/* Int Mic, Mic */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },</div><div class='del'>-	/* Line In,HP, Amp  */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x10, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5045_hp_sense_init_verbs[] = {</div><div class='del'>-	/* pin sensing on HP jack */</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5045_mic_sense_init_verbs[] = {</div><div class='del'>-	/* pin sensing on HP jack */</div><div class='del'>-	{0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-/* Test configuration for debugging, modelled after the ALC260 test</div><div class='del'>- * configuration.</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux cxt5045_test_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "MIXER", 0x0 },</div><div class='del'>-		{ "MIC1 pin", 0x1 },</div><div class='del'>-		{ "LINE1 pin", 0x2 },</div><div class='del'>-		{ "HP-OUT pin", 0x3 },</div><div class='del'>-		{ "CD pin", 0x4 },</div><div class='del'>-        },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5045_test_mixer[] = {</div><div class='del'>-</div><div class='del'>-	/* Output controls */</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x10, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Node 11 Playback Volume", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Node 11 Playback Switch", 0x11, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Node 12 Playback Volume", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Node 12 Playback Switch", 0x12, 0x0, HDA_OUTPUT),</div><div class='del'>-	</div><div class='del'>-	/* Modes for retasking pin widgets */</div><div class='del'>-	CXT_PIN_MODE("HP-OUT pin mode", 0x11, CXT_PIN_DIR_INOUT),</div><div class='del'>-	CXT_PIN_MODE("LINE1 pin mode", 0x12, CXT_PIN_DIR_INOUT),</div><div class='del'>-</div><div class='del'>-	/* EAPD Switch Control */</div><div class='del'>-	CXT_EAPD_SWITCH("External Amplifier", 0x10, 0x0),</div><div class='del'>-</div><div class='del'>-	/* Loopback mixer controls */</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer-1 Volume", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer-1 Switch", 0x17, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer-2 Volume", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer-2 Switch", 0x17, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer-3 Volume", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer-3 Switch", 0x17, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer-4 Volume", 0x17, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer-4 Switch", 0x17, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mixer-5 Volume", 0x17, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mixer-5 Switch", 0x17, 0x4, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.info = conexant_mux_enum_info,</div><div class='del'>-		.get = conexant_mux_enum_get,</div><div class='del'>-		.put = conexant_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	/* Audio input controls */</div><div class='del'>-	HDA_CODEC_VOLUME("Input-1 Volume", 0x1a, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input-1 Switch", 0x1a, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Input-2 Volume", 0x1a, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input-2 Switch", 0x1a, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Input-3 Volume", 0x1a, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input-3 Switch", 0x1a, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Input-4 Volume", 0x1a, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input-4 Switch", 0x1a, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Input-5 Volume", 0x1a, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input-5 Switch", 0x1a, 0x4, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5045_test_init_verbs[] = {</div><div class='del'>-	/* Set connections */</div><div class='del'>-	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	{ 0x11, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	{ 0x12, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	/* Enable retasking pins as output, initially without power amp */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* Disable digital (SPDIF) pins initially, but users can enable</div><div class='del'>-	 * them via a mixer switch.  In the case of SPDIF-out, this initverb</div><div class='del'>-	 * payload also sets the generation to 0, output to be in "consumer"</div><div class='del'>-	 * PCM format, copyright asserted, no pre-emphasis and no validity</div><div class='del'>-	 * control.</div><div class='del'>-	 */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute retasking pin widget output buffers since the default</div><div class='del'>-	 * state appears to be output.  As the pin mode is changed by the</div><div class='del'>-	 * user the pin mode control will take care of enabling the pin's</div><div class='del'>-	 * input/output buffers as needed.</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Set ADC connection select to match default mixer setting (mic1</div><div class='del'>-	 * pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* Mixer pin */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* Mic1 pin */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* Line pin */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* HP pin */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int cxt5045_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	conexant_init(codec);</div><div class='del'>-	cxt5045_hp_automute(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CXT5045_LAPTOP_HPSENSE,</div><div class='del'>-	CXT5045_LAPTOP_MICSENSE,</div><div class='del'>-	CXT5045_LAPTOP_HPMICSENSE,</div><div class='del'>-	CXT5045_BENQ,</div><div class='del'>-	CXT5045_LAPTOP_HP530,</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	CXT5045_TEST,</div><div class='del'>-#endif</div><div class='del'>-	CXT5045_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cxt5045_models[CXT5045_MODELS] = {</div><div class='del'>-	[CXT5045_LAPTOP_HPSENSE]	= "laptop-hpsense",</div><div class='del'>-	[CXT5045_LAPTOP_MICSENSE]	= "laptop-micsense",</div><div class='del'>-	[CXT5045_LAPTOP_HPMICSENSE]	= "laptop-hpmicsense",</div><div class='del'>-	[CXT5045_BENQ]			= "benq",</div><div class='del'>-	[CXT5045_LAPTOP_HP530]		= "laptop-hp530",</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[CXT5045_TEST]		= "test",</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cxt5045_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",</div><div class='del'>-			   CXT5045_LAPTOP_HPSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P105", CXT5045_LAPTOP_MICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x10cb, "Fujitsu Si3515", CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x110e, "Fujitsu V5505",</div><div class='del'>-		      CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1509, 0x1e40, "FIC", CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1509, 0x2f05, "FIC", CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x1509, 0x2f06, "FIC", CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1631, 0xff00, 0xc100, "Packard Bell",</div><div class='del'>-			   CXT5045_LAPTOP_HPMICSENSE),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_cxt5045(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	codec-&gt;pin_amp_workaround = 1;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(cxt5045_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = cxt5045_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = CXT5045_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = cxt5045_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = cxt5045_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;cxt5045_capture_source;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = cxt5045_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = cxt5045_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-	spec-&gt;num_channel_mode = ARRAY_SIZE(cxt5045_modes);</div><div class='del'>-	spec-&gt;channel_mode = cxt5045_modes;</div><div class='del'>-</div><div class='del'>-	set_beep_amp(spec, 0x16, 0, 1);</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = conexant_patch_ops;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,</div><div class='del'>-						  cxt5045_models,</div><div class='del'>-						  cxt5045_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case CXT5045_LAPTOP_HPSENSE:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5045_hp_unsol_event;</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_capture_source;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = cxt5045_hp_sense_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_mixers;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5045_init;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5045_LAPTOP_MICSENSE:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5045_hp_unsol_event;</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_capture_source;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = cxt5045_mic_sense_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_mixers;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5045_init;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	case CXT5045_LAPTOP_HPMICSENSE:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5045_hp_unsol_event;</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_capture_source;</div><div class='del'>-		spec-&gt;num_init_verbs = 3;</div><div class='del'>-		spec-&gt;init_verbs[1] = cxt5045_hp_sense_init_verbs;</div><div class='del'>-		spec-&gt;init_verbs[2] = cxt5045_mic_sense_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_mixers;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5045_init;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5045_BENQ:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5045_hp_unsol_event;</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_capture_source_benq;</div><div class='del'>-		spec-&gt;num_init_verbs = 1;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5045_benq_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_mixers;</div><div class='del'>-		spec-&gt;mixers[1] = cxt5045_benq_mixers;</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5045_init;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5045_LAPTOP_HP530:</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5045_hp_unsol_event;</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_capture_source_hp530;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = cxt5045_hp_sense_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_mixers_hp530;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5045_init;</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	case CXT5045_TEST:</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5045_test_capture_source;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5045_test_mixer;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5045_test_init_verbs;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-#endif	</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;subsystem_id &gt;&gt; 16) {</div><div class='del'>-	case 0x103c:</div><div class='del'>-	case 0x1631:</div><div class='del'>-	case 0x1734:</div><div class='del'>-	case 0x17aa:</div><div class='del'>-		/* HP, Packard Bell, Fujitsu-Siemens &amp; Lenovo laptops have</div><div class='del'>-		 * really bad sound over 0dB on NID 0x17. Fix max PCM level to</div><div class='del'>-		 * 0 dB (originally it has 0x2b steps with 0dB offset 0x14)</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,</div><div class='del'>-					  (0x14 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x14 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;beep_amp)</div><div class='del'>-		snd_hda_attach_beep_device(codec, spec-&gt;beep_amp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Conexant 5047 specific */</div><div class='del'>-#define CXT5047_SPDIF_OUT	0x11</div><div class='del'>-</div><div class='del'>-static hda_nid_t cxt5047_dac_nids[1] = { 0x10 }; /* 0x1c */</div><div class='del'>-static hda_nid_t cxt5047_adc_nids[1] = { 0x12 };</div><div class='del'>-static hda_nid_t cxt5047_capsrc_nids[1] = { 0x1a };</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode cxt5047_modes[1] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cxt5047_toshiba_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "ExtMic", 0x2 },</div><div class='del'>-		{ "Line-In", 0x1 },</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD (+ mute HP) as a master switch */</div><div class='del'>-static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int bits;</div><div class='del'>-</div><div class='del'>-	if (!cxt_eapd_put(kcontrol, ucontrol))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* toggle internal speakers mute depending of presence of</div><div class='del'>-	 * the headphone jack</div><div class='del'>-	 */</div><div class='del'>-	bits = (!spec-&gt;hp_present &amp;&amp; spec-&gt;cur_eapd) ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	/* NOTE: Conexat codec needs the index for *OUTPUT* amp of</div><div class='del'>-	 * pin widgets unlike other codecs.  In this case, we need to</div><div class='del'>-	 * set index 0x01 for the volume from the mixer amp 0x19.</div><div class='del'>-	 */</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	bits = spec-&gt;cur_eapd ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void cxt5047_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int bits;</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_present = snd_hda_jack_detect(codec, 0x13);</div><div class='del'>-</div><div class='del'>-	bits = (spec-&gt;hp_present || !spec-&gt;cur_eapd) ? HDA_AMP_MUTE : 0;</div><div class='del'>-	/* See the note in cxt5047_hp_master_sw_put */</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0x01,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in and mic jack appropriately */</div><div class='del'>-static void cxt5047_hp_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	static struct hda_verb mic_jack_on[] = {</div><div class='del'>-		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb mic_jack_off[] = {</div><div class='del'>-		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	if (present)</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_on);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_sequence_write(codec, mic_jack_off);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void cxt5047_hp_unsol_event(struct hda_codec *codec,</div><div class='del'>-				  unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5047_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5047_hp_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5047_base_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x19, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x19, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = cxt_eapd_info,</div><div class='del'>-		.get = cxt_eapd_get,</div><div class='del'>-		.put = cxt5047_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x13,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = {</div><div class='del'>-	/* See the note in cxt5047_hp_master_sw_put */</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x01, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5047_hp_only_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x13, 0x00, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5047_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic, Built-in Mic */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },</div><div class='del'>-	/* HP, Speaker  */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x0}, /* mixer(0x19) */</div><div class='del'>-	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mixer(0x19) */</div><div class='del'>-	/* Record selector: Mic */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL,0x03},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-	 AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},</div><div class='del'>-	{0x1A, AC_VERB_SET_CONNECT_SEL,0x02},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x00},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-	 AC_AMP_SET_OUTPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x03},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x0 },</div><div class='del'>-	/* Enable unsolicited events */</div><div class='del'>-	{0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* configuration for Toshiba Laptops */</div><div class='del'>-static struct hda_verb cxt5047_toshiba_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0}, /* default off */</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Test configuration for debugging, modelled after the ALC260 test</div><div class='del'>- * configuration.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-static struct hda_input_mux cxt5047_test_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "LINE1 pin", 0x0 },</div><div class='del'>-		{ "MIC1 pin", 0x1 },</div><div class='del'>-		{ "MIC2 pin", 0x2 },</div><div class='del'>-		{ "CD pin", 0x3 },</div><div class='del'>-        },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5047_test_mixer[] = {</div><div class='del'>-</div><div class='del'>-	/* Output only controls */</div><div class='del'>-	HDA_CODEC_VOLUME("OutAmp-1 Volume", 0x10, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("OutAmp-1 Switch", 0x10,0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("OutAmp-2 Volume", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("OutAmp-2 Switch", 0x1c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("HeadPhone Playback Volume", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("HeadPhone Playback Switch", 0x13, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line1-Out Playback Volume", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line1-Out Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line2-Out Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line2-Out Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	/* Modes for retasking pin widgets */</div><div class='del'>-	CXT_PIN_MODE("LINE1 pin mode", 0x14, CXT_PIN_DIR_INOUT),</div><div class='del'>-	CXT_PIN_MODE("MIC1 pin mode", 0x15, CXT_PIN_DIR_INOUT),</div><div class='del'>-</div><div class='del'>-	/* EAPD Switch Control */</div><div class='del'>-	CXT_EAPD_SWITCH("External Amplifier", 0x13, 0x0),</div><div class='del'>-</div><div class='del'>-	/* Loopback mixer controls */</div><div class='del'>-	HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x12, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("MIC1 Playback Switch", 0x12, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x12, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("MIC2 Playback Switch", 0x12, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LINE Playback Volume", 0x12, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("LINE Playback Switch", 0x12, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x12, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x12, 0x04, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Capture-1 Volume", 0x19, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture-1 Switch", 0x19, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture-2 Volume", 0x19, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture-2 Switch", 0x19, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture-3 Volume", 0x19, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture-3 Switch", 0x19, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture-4 Volume", 0x19, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture-4 Switch", 0x19, 0x3, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.info = conexant_mux_enum_info,</div><div class='del'>-		.get = conexant_mux_enum_get,</div><div class='del'>-		.put = conexant_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Volume", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5047_test_init_verbs[] = {</div><div class='del'>-	/* Enable retasking pins as output, initially without power amp */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* Disable digital (SPDIF) pins initially, but users can enable</div><div class='del'>-	 * them via a mixer switch.  In the case of SPDIF-out, this initverb</div><div class='del'>-	 * payload also sets the generation to 0, output to be in "consumer"</div><div class='del'>-	 * PCM format, copyright asserted, no pre-emphasis and no validity</div><div class='del'>-	 * control.</div><div class='del'>-	 */</div><div class='del'>-	{0x18, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Ensure mic1, mic2, line1 pin widgets take input from the </div><div class='del'>-	 * OUT1 sum bus when acting as an output.</div><div class='del'>-	 */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute retasking pin widget output buffers since the default</div><div class='del'>-	 * state appears to be output.  As the pin mode is changed by the</div><div class='del'>-	 * user the pin mode control will take care of enabling the pin's</div><div class='del'>-	 * input/output buffers as needed.</div><div class='del'>-	 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Set ADC connection select to match default mixer setting (mic1</div><div class='del'>-	 * pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int cxt5047_hp_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	conexant_init(codec);</div><div class='del'>-	cxt5047_hp_automute(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CXT5047_LAPTOP,		/* Laptops w/o EAPD support */</div><div class='del'>-	CXT5047_LAPTOP_HP,	/* Some HP laptops */</div><div class='del'>-	CXT5047_LAPTOP_EAPD,	/* Laptops with EAPD support */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	CXT5047_TEST,</div><div class='del'>-#endif</div><div class='del'>-	CXT5047_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cxt5047_models[CXT5047_MODELS] = {</div><div class='del'>-	[CXT5047_LAPTOP]	= "laptop",</div><div class='del'>-	[CXT5047_LAPTOP_HP]	= "laptop-hp",</div><div class='del'>-	[CXT5047_LAPTOP_EAPD]	= "laptop-eapd",</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[CXT5047_TEST]		= "test",</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cxt5047_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",</div><div class='del'>-			   CXT5047_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba P100", CXT5047_LAPTOP_EAPD),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_cxt5047(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	codec-&gt;pin_amp_workaround = 1;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(cxt5047_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = cxt5047_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = CXT5047_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = cxt5047_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = cxt5047_capsrc_nids;</div><div class='del'>-	spec-&gt;num_mixers = 1;</div><div class='del'>-	spec-&gt;mixers[0] = cxt5047_base_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = cxt5047_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-	spec-&gt;num_channel_mode = ARRAY_SIZE(cxt5047_modes),</div><div class='del'>-	spec-&gt;channel_mode = cxt5047_modes,</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = conexant_patch_ops;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,</div><div class='del'>-						  cxt5047_models,</div><div class='del'>-						  cxt5047_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case CXT5047_LAPTOP:</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[1] = cxt5047_hp_spk_mixers;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5047_hp_unsol_event;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5047_LAPTOP_HP:</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[1] = cxt5047_hp_only_mixers;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5047_hp_unsol_event;</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5047_hp_init;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5047_LAPTOP_EAPD:</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5047_toshiba_capture_source;</div><div class='del'>-		spec-&gt;num_mixers = 2;</div><div class='del'>-		spec-&gt;mixers[1] = cxt5047_hp_spk_mixers;</div><div class='del'>-		spec-&gt;num_init_verbs = 2;</div><div class='del'>-		spec-&gt;init_verbs[1] = cxt5047_toshiba_init_verbs;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5047_hp_unsol_event;</div><div class='del'>-		break;</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	case CXT5047_TEST:</div><div class='del'>-		spec-&gt;input_mux = &amp;cxt5047_test_capture_source;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5047_test_mixer;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5047_test_init_verbs;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5047_hp_unsol_event;</div><div class='del'>-#endif	</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;vmaster_nid = 0x13;</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;subsystem_id &gt;&gt; 16) {</div><div class='del'>-	case 0x103c:</div><div class='del'>-		/* HP laptops have really bad sound over 0 dB on NID 0x10.</div><div class='del'>-		 * Fix max PCM level to 0 dB (originally it has 0x1e steps</div><div class='del'>-		 * with 0 dB offset 0x17)</div><div class='del'>-		 */</div><div class='del'>-		snd_hda_override_amp_caps(codec, 0x10, HDA_INPUT,</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x05 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Conexant 5051 specific */</div><div class='del'>-static hda_nid_t cxt5051_dac_nids[1] = { 0x10 };</div><div class='del'>-static hda_nid_t cxt5051_adc_nids[2] = { 0x14, 0x15 };</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode cxt5051_modes[1] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cxt5051_update_speaker(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int pinctl;</div><div class='del'>-	/* headphone pin */</div><div class='del'>-	pinctl = (spec-&gt;hp_present &amp;&amp; spec-&gt;cur_eapd) ? PIN_HP : 0;</div><div class='del'>-	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    pinctl);</div><div class='del'>-	/* speaker pin */</div><div class='del'>-	pinctl = (!spec-&gt;hp_present &amp;&amp; spec-&gt;cur_eapd) ? PIN_OUT : 0;</div><div class='del'>-	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    pinctl);</div><div class='del'>-	/* on ideapad there is an aditional speaker (subwoofer) to mute */</div><div class='del'>-	if (spec-&gt;ideapad)</div><div class='del'>-		snd_hda_codec_write(codec, 0x1b, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    pinctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD (+ mute HP) as a master switch */</div><div class='del'>-static int cxt5051_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	if (!cxt_eapd_put(kcontrol, ucontrol))</div><div class='del'>-		return 0;</div><div class='del'>-	cxt5051_update_speaker(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in and mic jack appropriately */</div><div class='del'>-static void cxt5051_portb_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	if (!(spec-&gt;auto_mic &amp; AUTO_MIC_PORTB))</div><div class='del'>-		return;</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x17);</div><div class='del'>-	snd_hda_codec_write(codec, 0x14, 0,</div><div class='del'>-			    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-			    present ? 0x01 : 0x00);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* switch the current ADC according to the jack state */</div><div class='del'>-static void cxt5051_portc_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int present;</div><div class='del'>-	hda_nid_t new_adc;</div><div class='del'>-</div><div class='del'>-	if (!(spec-&gt;auto_mic &amp; AUTO_MIC_PORTC))</div><div class='del'>-		return;</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x18);</div><div class='del'>-	if (present)</div><div class='del'>-		spec-&gt;cur_adc_idx = 1;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;cur_adc_idx = 0;</div><div class='del'>-	new_adc = spec-&gt;adc_nids[spec-&gt;cur_adc_idx];</div><div class='del'>-	if (spec-&gt;cur_adc &amp;&amp; spec-&gt;cur_adc != new_adc) {</div><div class='del'>-		/* stream is running, let's swap the current ADC */</div><div class='del'>-		__snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc, 1);</div><div class='del'>-		spec-&gt;cur_adc = new_adc;</div><div class='del'>-		snd_hda_codec_setup_stream(codec, new_adc,</div><div class='del'>-					   spec-&gt;cur_adc_stream_tag, 0,</div><div class='del'>-					   spec-&gt;cur_adc_format);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void cxt5051_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_present = snd_hda_jack_detect(codec, 0x16);</div><div class='del'>-	cxt5051_update_speaker(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void cxt5051_hp_unsol_event(struct hda_codec *codec,</div><div class='del'>-				   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	int nid = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; 20;</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5051_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_PORTB_EVENT:</div><div class='del'>-		cxt5051_portb_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_PORTC_EVENT:</div><div class='del'>-		cxt5051_portc_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	conexant_report_jack(codec, nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_playback_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = cxt_eapd_info,</div><div class='del'>-		.get = cxt_eapd_get,</div><div class='del'>-		.put = cxt5051_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x1a,</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_capture_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Docking Mic Volume", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Docking Mic Switch", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_hp_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("External Mic Volume", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("External Mic Switch", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_f700_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5051_toshiba_mixers[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5051_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	/* SPK  */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* DAC1 */	</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */ </div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0},</div><div class='del'>-	/* SPK  */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	/* SPK  */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Docking HP */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* needed for W500 Advanced Mini Dock 250410 */</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5051_f700_init_verbs[] = {</div><div class='del'>-	/* Line in, Mic */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0},</div><div class='del'>-	/* SPK  */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Record selector: Int mic */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cxt5051_init_mic_port(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				 unsigned int event)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-			    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-			    AC_USRSP_EN | event);</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-	conexant_add_jack(codec, nid, SND_JACK_MICROPHONE);</div><div class='del'>-	conexant_report_jack(codec, nid);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5051_ideapad_init_verbs[] = {</div><div class='del'>-	/* Subwoofer */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int cxt5051_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	conexant_init(codec);</div><div class='del'>-	conexant_init_jacks(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;auto_mic &amp; AUTO_MIC_PORTB)</div><div class='del'>-		cxt5051_init_mic_port(codec, 0x17, CXT5051_PORTB_EVENT);</div><div class='del'>-	if (spec-&gt;auto_mic &amp; AUTO_MIC_PORTC)</div><div class='del'>-		cxt5051_init_mic_port(codec, 0x18, CXT5051_PORTC_EVENT);</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;patch_ops.unsol_event) {</div><div class='del'>-		cxt5051_hp_automute(codec);</div><div class='del'>-		cxt5051_portb_automic(codec);</div><div class='del'>-		cxt5051_portc_automic(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CXT5051_LAPTOP,	 /* Laptops w/ EAPD support */</div><div class='del'>-	CXT5051_HP,	/* no docking */</div><div class='del'>-	CXT5051_HP_DV6736,	/* HP without mic switch */</div><div class='del'>-	CXT5051_LENOVO_X200,	/* Lenovo X200 laptop, also used for Advanced Mini Dock 250410 */</div><div class='del'>-	CXT5051_F700,       /* HP Compaq Presario F700 */</div><div class='del'>-	CXT5051_TOSHIBA,	/* Toshiba M300 &amp; co */</div><div class='del'>-	CXT5051_IDEAPAD,	/* Lenovo IdeaPad Y430 */</div><div class='del'>-	CXT5051_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cxt5051_models[CXT5051_MODELS] = {</div><div class='del'>-	[CXT5051_LAPTOP]	= "laptop",</div><div class='del'>-	[CXT5051_HP]		= "hp",</div><div class='del'>-	[CXT5051_HP_DV6736]	= "hp-dv6736",</div><div class='del'>-	[CXT5051_LENOVO_X200]	= "lenovo-x200",</div><div class='del'>-	[CXT5051_F700]          = "hp-700",</div><div class='del'>-	[CXT5051_TOSHIBA]	= "toshiba",</div><div class='del'>-	[CXT5051_IDEAPAD]	= "ideapad",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cxt5051_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba M30x", CXT5051_TOSHIBA),</div><div class='del'>-	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",</div><div class='del'>-		      CXT5051_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo IdeaPad", CXT5051_IDEAPAD),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_cxt5051(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	codec-&gt;pin_amp_workaround = 1;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = conexant_patch_ops;</div><div class='del'>-	codec-&gt;patch_ops.init = cxt5051_init;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(cxt5051_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = cxt5051_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = CXT5051_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1; /* not 2; via auto-mic switch */</div><div class='del'>-	spec-&gt;adc_nids = cxt5051_adc_nids;</div><div class='del'>-	spec-&gt;num_mixers = 2;</div><div class='del'>-	spec-&gt;mixers[0] = cxt5051_capture_mixers;</div><div class='del'>-	spec-&gt;mixers[1] = cxt5051_playback_mixers;</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = cxt5051_init_verbs;</div><div class='del'>-	spec-&gt;spdif_route = 0;</div><div class='del'>-	spec-&gt;num_channel_mode = ARRAY_SIZE(cxt5051_modes);</div><div class='del'>-	spec-&gt;channel_mode = cxt5051_modes;</div><div class='del'>-	spec-&gt;cur_adc = 0;</div><div class='del'>-	spec-&gt;cur_adc_idx = 0;</div><div class='del'>-</div><div class='del'>-	set_beep_amp(spec, 0x13, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = cxt5051_hp_unsol_event;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,</div><div class='del'>-						  cxt5051_models,</div><div class='del'>-						  cxt5051_cfg_tbl);</div><div class='del'>-	spec-&gt;auto_mic = AUTO_MIC_PORTB | AUTO_MIC_PORTC;</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	case CXT5051_HP:</div><div class='del'>-		spec-&gt;mixers[0] = cxt5051_hp_mixers;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_HP_DV6736:</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5051_hp_dv6736_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5051_hp_dv6736_mixers;</div><div class='del'>-		spec-&gt;auto_mic = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_LENOVO_X200:</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5051_lenovo_x200_init_verbs;</div><div class='del'>-		/* Thinkpad X301 does not have S/PDIF wired and no ability</div><div class='del'>-		   to use a docking station. */</div><div class='del'>-		if (codec-&gt;subsystem_id == 0x17aa211f)</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_F700:</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5051_f700_init_verbs;</div><div class='del'>-		spec-&gt;mixers[0] = cxt5051_f700_mixers;</div><div class='del'>-		spec-&gt;auto_mic = 0;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_TOSHIBA:</div><div class='del'>-		spec-&gt;mixers[0] = cxt5051_toshiba_mixers;</div><div class='del'>-		spec-&gt;auto_mic = AUTO_MIC_PORTB;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5051_IDEAPAD:</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs++] =</div><div class='del'>-			cxt5051_ideapad_init_verbs;</div><div class='del'>-		spec-&gt;ideapad = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;beep_amp)</div><div class='del'>-		snd_hda_attach_beep_device(codec, spec-&gt;beep_amp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Conexant 5066 specific */</div><div class='del'>-</div><div class='del'>-static hda_nid_t cxt5066_dac_nids[1] = { 0x10 };</div><div class='del'>-static hda_nid_t cxt5066_adc_nids[3] = { 0x14, 0x15, 0x16 };</div><div class='del'>-static hda_nid_t cxt5066_capsrc_nids[1] = { 0x17 };</div><div class='del'>-#define CXT5066_SPDIF_OUT	0x21</div><div class='del'>-</div><div class='del'>-/* OLPC's microphone port is DC coupled for use with external sensors,</div><div class='del'>- * therefore we use a 50% mic bias in order to center the input signal with</div><div class='del'>- * the DC input range of the codec. */</div><div class='del'>-#define CXT5066_OLPC_EXT_MIC_BIAS PIN_VREF50</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode cxt5066_modes[1] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cxt5066_update_speaker(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int pinctl;</div><div class='del'>-</div><div class='del'>-	snd_printdd("CXT5066: update speaker, hp_present=%d\n",</div><div class='del'>-		spec-&gt;hp_present);</div><div class='del'>-</div><div class='del'>-	/* Port A (HP) */</div><div class='del'>-	pinctl = ((spec-&gt;hp_present &amp; 1) &amp;&amp; spec-&gt;cur_eapd) ? PIN_HP : 0;</div><div class='del'>-	snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			pinctl);</div><div class='del'>-</div><div class='del'>-	/* Port D (HP/LO) */</div><div class='del'>-	pinctl = ((spec-&gt;hp_present &amp; 2) &amp;&amp; spec-&gt;cur_eapd)</div><div class='del'>-		? spec-&gt;port_d_mode : 0;</div><div class='del'>-	/* Mute if Port A is connected on Thinkpad */</div><div class='del'>-	if (spec-&gt;thinkpad &amp;&amp; (spec-&gt;hp_present &amp; 1))</div><div class='del'>-		pinctl = 0;</div><div class='del'>-	snd_hda_codec_write(codec, 0x1c, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			pinctl);</div><div class='del'>-</div><div class='del'>-	/* CLASS_D AMP */</div><div class='del'>-	pinctl = (!spec-&gt;hp_present &amp;&amp; spec-&gt;cur_eapd) ? PIN_OUT : 0;</div><div class='del'>-	snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			pinctl);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dell_automute) {</div><div class='del'>-		/* DELL AIO Port Rule: PortA &gt; PortD &gt; IntSpk */</div><div class='del'>-		pinctl = (!(spec-&gt;hp_present &amp; 1) &amp;&amp; spec-&gt;cur_eapd)</div><div class='del'>-			? PIN_OUT : 0;</div><div class='del'>-		snd_hda_codec_write(codec, 0x1c, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD (+ mute HP) as a master switch */</div><div class='del'>-static int cxt5066_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	if (!cxt_eapd_put(kcontrol, ucontrol))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	cxt5066_update_speaker(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct hda_input_mux cxt5066_olpc_dc_bias = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Off", PIN_IN },</div><div class='del'>-		{ "50%", PIN_VREF50 },</div><div class='del'>-		{ "80%", PIN_VREF80 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int cxt5066_set_olpc_dc_bias(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	/* Even though port F is the DC input, the bias is controlled on port B.</div><div class='del'>-	 * we also leave that port as an active input (but unselected) in DC mode</div><div class='del'>-	 * just in case that is necessary to make the bias setting take effect. */</div><div class='del'>-	return snd_hda_codec_write_cache(codec, 0x1a, 0,</div><div class='del'>-		AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-		cxt5066_olpc_dc_bias.items[spec-&gt;dc_input_bias].index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* OLPC defers mic widget control until when capture is started because the</div><div class='del'>- * microphone LED comes on as soon as these settings are put in place. if we</div><div class='del'>- * did this before recording, it would give the false indication that recording</div><div class='del'>- * is happening when it is not. */</div><div class='del'>-static void cxt5066_olpc_select_mic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (!spec-&gt;recording)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dc_enable) {</div><div class='del'>-		/* in DC mode we ignore presence detection and just use the jack</div><div class='del'>-		 * through our special DC port */</div><div class='del'>-		const struct hda_verb enable_dc_mode[] = {</div><div class='del'>-			/* disble internal mic, port C */</div><div class='del'>-			{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-			/* enable DC capture, port F */</div><div class='del'>-			{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-			{},</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		snd_hda_sequence_write(codec, enable_dc_mode);</div><div class='del'>-		/* port B input disabled (and bias set) through the following call */</div><div class='del'>-		cxt5066_set_olpc_dc_bias(codec);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable DC (port F) */</div><div class='del'>-	snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-</div><div class='del'>-	/* external mic, port B */</div><div class='del'>-	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-		spec-&gt;ext_mic_present ? CXT5066_OLPC_EXT_MIC_BIAS : 0);</div><div class='del'>-</div><div class='del'>-	/* internal mic, port C */</div><div class='del'>-	snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-		spec-&gt;ext_mic_present ? 0 : PIN_VREF80);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in and mic jack appropriately */</div><div class='del'>-static void cxt5066_olpc_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dc_enable) /* don't do presence detection in DC mode */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_codec_read(codec, 0x1a, 0,</div><div class='del'>-				     AC_VERB_GET_PIN_SENSE, 0) &amp; 0x80000000;</div><div class='del'>-	if (present)</div><div class='del'>-		snd_printdd("CXT5066: external microphone detected\n");</div><div class='del'>-	else</div><div class='del'>-		snd_printdd("CXT5066: external microphone absent\n");</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-		present ? 0 : 1);</div><div class='del'>-	spec-&gt;ext_mic_present = !!present;</div><div class='del'>-</div><div class='del'>-	cxt5066_olpc_select_mic(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in digital mic and mic jack appropriately */</div><div class='del'>-static void cxt5066_vostro_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	struct hda_verb ext_mic_present[] = {</div><div class='del'>-		/* enable external mic, port B */</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-</div><div class='del'>-		/* switch to external mic input */</div><div class='del'>-		{0x17, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-		/* disable internal digital mic */</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb ext_mic_absent[] = {</div><div class='del'>-		/* enable internal mic, port C */</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-		/* switch to internal mic input */</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 2},</div><div class='del'>-</div><div class='del'>-		/* disable external mic, port B */</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x1a);</div><div class='del'>-	if (present) {</div><div class='del'>-		snd_printdd("CXT5066: external microphone detected\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_present);</div><div class='del'>-	} else {</div><div class='del'>-		snd_printdd("CXT5066: external microphone absent\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_absent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in digital mic and mic jack appropriately */</div><div class='del'>-static void cxt5066_ideapad_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	struct hda_verb ext_mic_present[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb ext_mic_absent[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 2},</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	if (present) {</div><div class='del'>-		snd_printdd("CXT5066: external microphone detected\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_present);</div><div class='del'>-	} else {</div><div class='del'>-		snd_printdd("CXT5066: external microphone absent\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_absent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in digital mic and mic jack appropriately */</div><div class='del'>-static void cxt5066_hp_laptop_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	snd_printdd("CXT5066: external microphone present=%d\n", present);</div><div class='del'>-	snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-			    present ? 1 : 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* toggle input of built-in digital mic and mic jack appropriately</div><div class='del'>-   order is: external mic -&gt; dock mic -&gt; interal mic */</div><div class='del'>-static void cxt5066_thinkpad_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int ext_present, dock_present;</div><div class='del'>-</div><div class='del'>-	static struct hda_verb ext_mic_present[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-		{0x17, AC_VERB_SET_CONNECT_SEL, 1},</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb dock_mic_present[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-		{0x17, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-	static struct hda_verb ext_mic_absent[] = {</div><div class='del'>-		{0x14, AC_VERB_SET_CONNECT_SEL, 2},</div><div class='del'>-		{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ext_present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	dock_present = snd_hda_jack_detect(codec, 0x1a);</div><div class='del'>-	if (ext_present) {</div><div class='del'>-		snd_printdd("CXT5066: external microphone detected\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_present);</div><div class='del'>-	} else if (dock_present) {</div><div class='del'>-		snd_printdd("CXT5066: dock microphone detected\n");</div><div class='del'>-		snd_hda_sequence_write(codec, dock_mic_present);</div><div class='del'>-	} else {</div><div class='del'>-		snd_printdd("CXT5066: external microphone absent\n");</div><div class='del'>-		snd_hda_sequence_write(codec, ext_mic_absent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void cxt5066_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int portA, portD;</div><div class='del'>-</div><div class='del'>-	/* Port A */</div><div class='del'>-	portA = snd_hda_jack_detect(codec, 0x19);</div><div class='del'>-</div><div class='del'>-	/* Port D */</div><div class='del'>-	portD = snd_hda_jack_detect(codec, 0x1c);</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_present = !!(portA);</div><div class='del'>-	spec-&gt;hp_present |= portD ? 2 : 0;</div><div class='del'>-	snd_printdd("CXT5066: hp automute portA=%x portD=%x present=%d\n",</div><div class='del'>-		portA, portD, spec-&gt;hp_present);</div><div class='del'>-	cxt5066_update_speaker(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_printdd("CXT5066: unsol event %x (%x)\n", res, res &gt;&gt; 26);</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		/* ignore mic events in DC mode; we're always using the jack */</div><div class='del'>-		if (!spec-&gt;dc_enable)</div><div class='del'>-			cxt5066_olpc_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void cxt5066_vostro_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("CXT5066_vostro: unsol event %x (%x)\n", res, res &gt;&gt; 26);</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5066_vostro_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void cxt5066_ideapad_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("CXT5066_ideapad: unsol event %x (%x)\n", res, res &gt;&gt; 26);</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5066_ideapad_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void cxt5066_hp_laptop_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("CXT5066_hp_laptop: unsol event %x (%x)\n", res, res &gt;&gt; 26);</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5066_hp_laptop_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void cxt5066_thinkpad_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	snd_printdd("CXT5066_thinkpad: unsol event %x (%x)\n", res, res &gt;&gt; 26);</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cxt5066_thinkpad_automic(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct hda_input_mux cxt5066_analog_mic_boost = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "0dB",  0 },</div><div class='del'>-		{ "10dB", 1 },</div><div class='del'>-		{ "20dB", 2 },</div><div class='del'>-		{ "30dB", 3 },</div><div class='del'>-		{ "40dB", 4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cxt5066_set_mic_boost(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x17, 0,</div><div class='del'>-		AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-		AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT | AC_AMP_SET_OUTPUT |</div><div class='del'>-			cxt5066_analog_mic_boost.items[spec-&gt;mic_boost].index);</div><div class='del'>-	if (spec-&gt;ideapad || spec-&gt;thinkpad) {</div><div class='del'>-		/* adjust the internal mic as well...it is not through 0x17 */</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x23, 0,</div><div class='del'>-			AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-			AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT | AC_AMP_SET_INPUT |</div><div class='del'>-				cxt5066_analog_mic_boost.</div><div class='del'>-					items[spec-&gt;mic_boost].index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_mic_boost_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-					   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_input_mux_info(&amp;cxt5066_analog_mic_boost, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_mic_boost_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-					  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;mic_boost;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct hda_input_mux *imux = &amp;cxt5066_analog_mic_boost;</div><div class='del'>-	unsigned int idx;</div><div class='del'>-	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (idx &gt;= imux-&gt;num_items)</div><div class='del'>-		idx = imux-&gt;num_items - 1;</div><div class='del'>-</div><div class='del'>-	spec-&gt;mic_boost = idx;</div><div class='del'>-	if (!spec-&gt;dc_enable)</div><div class='del'>-		cxt5066_set_mic_boost(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cxt5066_enable_dc(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	const struct hda_verb enable_dc_mode[] = {</div><div class='del'>-		/* disable gain */</div><div class='del'>-		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-		/* switch to DC input */</div><div class='del'>-		{0x17, AC_VERB_SET_CONNECT_SEL, 3},</div><div class='del'>-		{}</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* configure as input source */</div><div class='del'>-	snd_hda_sequence_write(codec, enable_dc_mode);</div><div class='del'>-	cxt5066_olpc_select_mic(codec); /* also sets configured bias */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cxt5066_disable_dc(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* reconfigure input source */</div><div class='del'>-	cxt5066_set_mic_boost(codec);</div><div class='del'>-	/* automic also selects the right mic if we're recording */</div><div class='del'>-	cxt5066_olpc_automic(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_dc_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = spec-&gt;dc_enable;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_dc_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int dc_enable = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-</div><div class='del'>-	if (dc_enable == spec-&gt;dc_enable)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;dc_enable = dc_enable;</div><div class='del'>-	if (dc_enable)</div><div class='del'>-		cxt5066_enable_dc(codec);</div><div class='del'>-	else</div><div class='del'>-		cxt5066_disable_dc(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_dc_bias_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-					   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_input_mux_info(&amp;cxt5066_olpc_dc_bias, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_dc_bias_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-					  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;dc_input_bias;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_dc_bias_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct hda_input_mux *imux = &amp;cxt5066_analog_mic_boost;</div><div class='del'>-	unsigned int idx;</div><div class='del'>-</div><div class='del'>-	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (idx &gt;= imux-&gt;num_items)</div><div class='del'>-		idx = imux-&gt;num_items - 1;</div><div class='del'>-</div><div class='del'>-	spec-&gt;dc_input_bias = idx;</div><div class='del'>-	if (spec-&gt;dc_enable)</div><div class='del'>-		cxt5066_set_olpc_dc_bias(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cxt5066_olpc_capture_prepare(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	/* mark as recording and configure the microphone widget so that the</div><div class='del'>-	 * recording LED comes on. */</div><div class='del'>-	spec-&gt;recording = 1;</div><div class='del'>-	cxt5066_olpc_select_mic(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cxt5066_olpc_capture_cleanup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct hda_verb disable_mics[] = {</div><div class='del'>-		/* disable external mic, port B */</div><div class='del'>-		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-		/* disble internal mic, port C */</div><div class='del'>-		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-		/* disable DC capture, port F */</div><div class='del'>-		{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-		{},</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	snd_hda_sequence_write(codec, disable_mics);</div><div class='del'>-	spec-&gt;recording = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux cxt5066_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic B", 0 },</div><div class='del'>-		{ "Mic C", 1 },</div><div class='del'>-		{ "Mic E", 2 },</div><div class='del'>-		{ "Mic F", 3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls cxt5066_bind_capture_vol_others = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 2, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls cxt5066_bind_capture_sw_others = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 2, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5066_mixer_master[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Volume",</div><div class='del'>-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='del'>-				  SNDRV_CTL_ELEM_ACCESS_TLV_READ |</div><div class='del'>-				  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_volume_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_volume_get,</div><div class='del'>-		.put = snd_hda_mixer_amp_volume_put,</div><div class='del'>-		.tlv = { .c = snd_hda_mixer_amp_tlv },</div><div class='del'>-		/* offset by 28 volume steps to limit minimum gain to -46dB */</div><div class='del'>-		.private_value =</div><div class='del'>-			HDA_COMPOSE_AMP_VAL_OFS(0x10, 3, 0, HDA_OUTPUT, 28),</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5066_mixer_olpc_dc[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "DC Mode Enable Switch",</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,</div><div class='del'>-		.get = cxt5066_olpc_dc_get,</div><div class='del'>-		.put = cxt5066_olpc_dc_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "DC Input Bias Enum",</div><div class='del'>-		.info = cxt5066_olpc_dc_bias_enum_info,</div><div class='del'>-		.get = cxt5066_olpc_dc_bias_enum_get,</div><div class='del'>-		.put = cxt5066_olpc_dc_bias_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5066_mixers[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.info = cxt_eapd_info,</div><div class='del'>-		.get = cxt_eapd_get,</div><div class='del'>-		.put = cxt5066_hp_master_sw_put,</div><div class='del'>-		.private_value = 0x1d,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Analog Mic Boost Capture Enum",</div><div class='del'>-		.info = cxt5066_mic_boost_mux_enum_info,</div><div class='del'>-		.get = cxt5066_mic_boost_mux_enum_get,</div><div class='del'>-		.put = cxt5066_mic_boost_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-	HDA_BIND_VOL("Capture Volume", &amp;cxt5066_bind_capture_vol_others),</div><div class='del'>-	HDA_BIND_SW("Capture Switch", &amp;cxt5066_bind_capture_sw_others),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Int Mic Boost Capture Enum",</div><div class='del'>-		.info = cxt5066_mic_boost_mux_enum_info,</div><div class='del'>-		.get = cxt5066_mic_boost_mux_enum_get,</div><div class='del'>-		.put = cxt5066_mic_boost_mux_enum_put,</div><div class='del'>-		.private_value = 0x23 | 0x100,</div><div class='del'>-	},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs[] = {</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port E */</div><div class='del'>-</div><div class='del'>-	/* Speakers  */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Node 14 connections: 0x17 0x18 0x23 0x24 0x27 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* no digital microphone support yet */</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Audio input selector */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x3},</div><div class='del'>-</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-</div><div class='del'>-	/* not handling these yet */</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x1d, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x20, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{0x22, AC_VERB_SET_UNSOLICITED_ENABLE, 0},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_olpc[] = {</div><div class='del'>-	/* Port A: headphones */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* Port B: external microphone */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port C: internal microphone */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port D: unused */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port E: unused, but has primary EAPD */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-</div><div class='del'>-	/* Port F: external DC input through microphone port */</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port G: internal speakers */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* DAC2: unused */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-</div><div class='del'>-	/* Disable digital microphone port */</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Audio input selectors */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x3},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-</div><div class='del'>-	/* Disable SPDIF */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited events for Port A and B */</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_vostro[] = {</div><div class='del'>-	/* Port A: headphones */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* Port B: external microphone */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port C: unused */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port D: unused */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port E: unused, but has primary EAPD */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-</div><div class='del'>-	/* Port F: unused */</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port G: internal speakers */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* DAC2: unused */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-</div><div class='del'>-	/* Digital microphone port */</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	/* Audio input selectors */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x3},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-</div><div class='del'>-	/* Disable SPDIF */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited events for Port A and B */</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_ideapad[] = {</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port E */</div><div class='del'>-</div><div class='del'>-	/* Speakers  */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* HP, Amp  */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Node 14 connections: 0x17 0x18 0x23 0x24 0x27 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 2},	/* default to internal mic */</div><div class='del'>-</div><div class='del'>-	/* Audio input selector */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x2},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 1},	/* route ext mic */</div><div class='del'>-</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* internal microphone */</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */</div><div class='del'>-</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_thinkpad[] = {</div><div class='del'>-	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port E */</div><div class='del'>-</div><div class='del'>-	/* Port G: internal speakers  */</div><div class='del'>-	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* Port A: HP, Amp  */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* Port B: Mic Dock */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port C: Mic */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-</div><div class='del'>-	/* Port D: HP Dock, Amp */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x1c, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */</div><div class='del'>-</div><div class='del'>-	/* DAC1 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Node 14 connections: 0x17 0x18 0x23 0x24 0x27 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2) | 0x50},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 2},	/* default to internal mic */</div><div class='del'>-</div><div class='del'>-	/* Audio input selector */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x2},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 1},	/* route ext mic */</div><div class='del'>-</div><div class='del'>-	/* SPDIF route: PCM */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* internal microphone */</div><div class='del'>-	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */</div><div class='del'>-</div><div class='del'>-	/* EAPD */</div><div class='del'>-	{0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited events for Port A, B, C and D */</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_portd_lo[] = {</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb cxt5066_init_verbs_hp_laptop[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* initialize jack-sensing, too */</div><div class='del'>-static int cxt5066_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_printdd("CXT5066: init\n");</div><div class='del'>-	conexant_init(codec);</div><div class='del'>-	if (codec-&gt;patch_ops.unsol_event) {</div><div class='del'>-		cxt5066_hp_automute(codec);</div><div class='del'>-		if (spec-&gt;dell_vostro)</div><div class='del'>-			cxt5066_vostro_automic(codec);</div><div class='del'>-		else if (spec-&gt;ideapad)</div><div class='del'>-			cxt5066_ideapad_automic(codec);</div><div class='del'>-		else if (spec-&gt;thinkpad)</div><div class='del'>-			cxt5066_thinkpad_automic(codec);</div><div class='del'>-		else if (spec-&gt;hp_laptop)</div><div class='del'>-			cxt5066_hp_laptop_automic(codec);</div><div class='del'>-	}</div><div class='del'>-	cxt5066_set_mic_boost(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxt5066_olpc_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_printdd("CXT5066: init\n");</div><div class='del'>-	conexant_init(codec);</div><div class='del'>-	cxt5066_hp_automute(codec);</div><div class='del'>-	if (!spec-&gt;dc_enable) {</div><div class='del'>-		cxt5066_set_mic_boost(codec);</div><div class='del'>-		cxt5066_olpc_automic(codec);</div><div class='del'>-	} else {</div><div class='del'>-		cxt5066_enable_dc(codec);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CXT5066_LAPTOP,		/* Laptops w/ EAPD support */</div><div class='del'>-	CXT5066_DELL_LAPTOP,	/* Dell Laptop */</div><div class='del'>-	CXT5066_OLPC_XO_1_5,	/* OLPC XO 1.5 */</div><div class='del'>-	CXT5066_DELL_VOSTRO,	/* Dell Vostro 1015i */</div><div class='del'>-	CXT5066_IDEAPAD,	/* Lenovo IdeaPad U150 */</div><div class='del'>-	CXT5066_THINKPAD,	/* Lenovo ThinkPad T410s, others? */</div><div class='del'>-	CXT5066_HP_LAPTOP,      /* HP Laptop */</div><div class='del'>-	CXT5066_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *cxt5066_models[CXT5066_MODELS] = {</div><div class='del'>-	[CXT5066_LAPTOP]	= "laptop",</div><div class='del'>-	[CXT5066_DELL_LAPTOP]	= "dell-laptop",</div><div class='del'>-	[CXT5066_OLPC_XO_1_5]	= "olpc-xo-1_5",</div><div class='del'>-	[CXT5066_DELL_VOSTRO]	= "dell-vostro",</div><div class='del'>-	[CXT5066_IDEAPAD]	= "ideapad",</div><div class='del'>-	[CXT5066_THINKPAD]	= "thinkpad",</div><div class='del'>-	[CXT5066_HP_LAPTOP]	= "hp-laptop",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk cxt5066_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",</div><div class='del'>-		      CXT5066_DELL_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),</div><div class='del'>-	SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",</div><div class='del'>-		      CXT5066_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),</div><div class='del'>- 	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),</div><div class='del'>- 	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G series", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x390a, "Lenovo S10-3t", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G series (AMD)", CXT5066_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_cxt5066(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = conexant_patch_ops;</div><div class='del'>-	codec-&gt;patch_ops.init = conexant_init;</div><div class='del'>-</div><div class='del'>-	spec-&gt;dell_automute = 0;</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = ARRAY_SIZE(cxt5066_dac_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = cxt5066_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = CXT5066_SPDIF_OUT;</div><div class='del'>-	spec-&gt;num_adc_nids = 1;</div><div class='del'>-	spec-&gt;adc_nids = cxt5066_adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = cxt5066_capsrc_nids;</div><div class='del'>-	spec-&gt;input_mux = &amp;cxt5066_capture_source;</div><div class='del'>-</div><div class='del'>-	spec-&gt;port_d_mode = PIN_HP;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_init_verbs = 1;</div><div class='del'>-	spec-&gt;init_verbs[0] = cxt5066_init_verbs;</div><div class='del'>-	spec-&gt;num_channel_mode = ARRAY_SIZE(cxt5066_modes);</div><div class='del'>-	spec-&gt;channel_mode = cxt5066_modes;</div><div class='del'>-	spec-&gt;cur_adc = 0;</div><div class='del'>-	spec-&gt;cur_adc_idx = 0;</div><div class='del'>-</div><div class='del'>-	set_beep_amp(spec, 0x13, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, CXT5066_MODELS,</div><div class='del'>-						  cxt5066_models, cxt5066_cfg_tbl);</div><div class='del'>-	switch (board_config) {</div><div class='del'>-	default:</div><div class='del'>-	case CXT5066_LAPTOP:</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5066_DELL_LAPTOP:</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-</div><div class='del'>-		spec-&gt;port_d_mode = PIN_OUT;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs] = cxt5066_init_verbs_portd_lo;</div><div class='del'>-		spec-&gt;num_init_verbs++;</div><div class='del'>-		spec-&gt;dell_automute = 1;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5066_HP_LAPTOP:</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5066_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5066_hp_laptop_event;</div><div class='del'>-		spec-&gt;init_verbs[spec-&gt;num_init_verbs] =</div><div class='del'>-			cxt5066_init_verbs_hp_laptop;</div><div class='del'>-		spec-&gt;num_init_verbs++;</div><div class='del'>-		spec-&gt;hp_laptop = 1;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		/* no S/PDIF out */</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-		/* input source automatically selected */</div><div class='del'>-		spec-&gt;input_mux = NULL;</div><div class='del'>-		spec-&gt;port_d_mode = 0;</div><div class='del'>-		spec-&gt;mic_boost = 3; /* default 30dB gain */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CXT5066_OLPC_XO_1_5:</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5066_olpc_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5066_olpc_unsol_event;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5066_init_verbs_olpc;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master_olpc;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_olpc_dc;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		spec-&gt;port_d_mode = 0;</div><div class='del'>-		spec-&gt;mic_boost = 3; /* default 30dB gain */</div><div class='del'>-</div><div class='del'>-		/* no S/PDIF out */</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-</div><div class='del'>-		/* input source automatically selected */</div><div class='del'>-		spec-&gt;input_mux = NULL;</div><div class='del'>-</div><div class='del'>-		/* our capture hooks which allow us to turn on the microphone LED</div><div class='del'>-		 * at the right time */</div><div class='del'>-		spec-&gt;capture_prepare = cxt5066_olpc_capture_prepare;</div><div class='del'>-		spec-&gt;capture_cleanup = cxt5066_olpc_capture_cleanup;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5066_DELL_VOSTRO:</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5066_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5066_vostro_event;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5066_init_verbs_vostro;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master_olpc;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_vostro_mixers;</div><div class='del'>-		spec-&gt;port_d_mode = 0;</div><div class='del'>-		spec-&gt;dell_vostro = 1;</div><div class='del'>-		spec-&gt;mic_boost = 3; /* default 30dB gain */</div><div class='del'>-</div><div class='del'>-		/* no S/PDIF out */</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-</div><div class='del'>-		/* input source automatically selected */</div><div class='del'>-		spec-&gt;input_mux = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5066_IDEAPAD:</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5066_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5066_ideapad_event;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5066_init_verbs_ideapad;</div><div class='del'>-		spec-&gt;port_d_mode = 0;</div><div class='del'>-		spec-&gt;ideapad = 1;</div><div class='del'>-		spec-&gt;mic_boost = 2;	/* default 20dB gain */</div><div class='del'>-</div><div class='del'>-		/* no S/PDIF out */</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-</div><div class='del'>-		/* input source automatically selected */</div><div class='del'>-		spec-&gt;input_mux = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case CXT5066_THINKPAD:</div><div class='del'>-		codec-&gt;patch_ops.init = cxt5066_init;</div><div class='del'>-		codec-&gt;patch_ops.unsol_event = cxt5066_thinkpad_event;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixer_master;</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = cxt5066_mixers;</div><div class='del'>-		spec-&gt;init_verbs[0] = cxt5066_init_verbs_thinkpad;</div><div class='del'>-		spec-&gt;thinkpad = 1;</div><div class='del'>-		spec-&gt;port_d_mode = PIN_OUT;</div><div class='del'>-		spec-&gt;mic_boost = 2;	/* default 20dB gain */</div><div class='del'>-</div><div class='del'>-		/* no S/PDIF out */</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0;</div><div class='del'>-</div><div class='del'>-		/* input source automatically selected */</div><div class='del'>-		spec-&gt;input_mux = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;beep_amp)</div><div class='del'>-		snd_hda_attach_beep_device(codec, spec-&gt;beep_amp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Automatic parser for CX20641 &amp; co</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t cx_auto_adc_nids[] = { 0x14 };</div><div class='del'>-</div><div class='del'>-/* get the connection index of @nid in the widget @mux */</div><div class='del'>-static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,</div><div class='del'>-				hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t conn[HDA_MAX_NUM_INPUTS];</div><div class='del'>-	int i, nums;</div><div class='del'>-</div><div class='del'>-	nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));</div><div class='del'>-	for (i = 0; i &lt; nums; i++)</div><div class='del'>-		if (conn[i] == nid)</div><div class='del'>-			return i;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get an unassigned DAC from the given list.</div><div class='del'>- * Return the nid if found and reduce the DAC list, or return zero if</div><div class='del'>- * not found</div><div class='del'>- */</div><div class='del'>-static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-				    hda_nid_t *dacs, int *num_dacs)</div><div class='del'>-{</div><div class='del'>-	int i, nums = *num_dacs;</div><div class='del'>-	hda_nid_t ret = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nums; i++) {</div><div class='del'>-		if (get_connection_index(codec, pin, dacs[i]) &gt;= 0) {</div><div class='del'>-			ret = dacs[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!ret)</div><div class='del'>-		return 0;</div><div class='del'>-	if (--nums &gt; 0)</div><div class='del'>-		memmove(dacs, dacs + 1, nums * sizeof(hda_nid_t));</div><div class='del'>-	*num_dacs = nums;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_AUTO_DACS	5</div><div class='del'>-</div><div class='del'>-/* fill analog DAC list from the widget tree */</div><div class='del'>-static int fill_cx_auto_dacs(struct hda_codec *codec, hda_nid_t *dacs)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid, end_nid;</div><div class='del'>-	int nums = 0;</div><div class='del'>-</div><div class='del'>-	end_nid = codec-&gt;start_nid + codec-&gt;num_nodes;</div><div class='del'>-	for (nid = codec-&gt;start_nid; nid &lt; end_nid; nid++) {</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='del'>-		unsigned int type = get_wcaps_type(wcaps);</div><div class='del'>-		if (type == AC_WID_AUD_OUT &amp;&amp; !(wcaps &amp; AC_WCAP_DIGITAL)) {</div><div class='del'>-			dacs[nums++] = nid;</div><div class='del'>-			if (nums &gt;= MAX_AUTO_DACS)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return nums;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill pin_dac_pair list from the pin and dac list */</div><div class='del'>-static int fill_dacs_for_pins(struct hda_codec *codec, hda_nid_t *pins,</div><div class='del'>-			      int num_pins, hda_nid_t *dacs, int *rest,</div><div class='del'>-			      struct pin_dac_pair *filled, int type)</div><div class='del'>-{</div><div class='del'>-	int i, nums;</div><div class='del'>-</div><div class='del'>-	nums = 0;</div><div class='del'>-	for (i = 0; i &lt; num_pins; i++) {</div><div class='del'>-		filled[nums].pin = pins[i];</div><div class='del'>-		filled[nums].type = type;</div><div class='del'>-		filled[nums].dac = get_unassigned_dac(codec, pins[i], dacs, rest);</div><div class='del'>-		nums++;</div><div class='del'>-	}</div><div class='del'>-	return nums;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse analog output paths */</div><div class='del'>-static void cx_auto_parse_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t dacs[MAX_AUTO_DACS];</div><div class='del'>-	int i, j, nums, rest;</div><div class='del'>-</div><div class='del'>-	rest = fill_cx_auto_dacs(codec, dacs);</div><div class='del'>-	/* parse all analog output pins */</div><div class='del'>-	nums = fill_dacs_for_pins(codec, cfg-&gt;line_out_pins, cfg-&gt;line_outs,</div><div class='del'>-				  dacs, &amp;rest, spec-&gt;dac_info,</div><div class='del'>-				  AUTO_PIN_LINE_OUT);</div><div class='del'>-	nums += fill_dacs_for_pins(codec, cfg-&gt;hp_pins, cfg-&gt;hp_outs,</div><div class='del'>-				  dacs, &amp;rest, spec-&gt;dac_info + nums,</div><div class='del'>-				  AUTO_PIN_HP_OUT);</div><div class='del'>-	nums += fill_dacs_for_pins(codec, cfg-&gt;speaker_pins, cfg-&gt;speaker_outs,</div><div class='del'>-				  dacs, &amp;rest, spec-&gt;dac_info + nums,</div><div class='del'>-				  AUTO_PIN_SPEAKER_OUT);</div><div class='del'>-	spec-&gt;dac_info_filled = nums;</div><div class='del'>-	/* fill multiout struct */</div><div class='del'>-	for (i = 0; i &lt; nums; i++) {</div><div class='del'>-		hda_nid_t dac = spec-&gt;dac_info[i].dac;</div><div class='del'>-		if (!dac)</div><div class='del'>-			continue;</div><div class='del'>-		switch (spec-&gt;dac_info[i].type) {</div><div class='del'>-		case AUTO_PIN_LINE_OUT:</div><div class='del'>-			spec-&gt;private_dac_nids[spec-&gt;multiout.num_dacs] = dac;</div><div class='del'>-			spec-&gt;multiout.num_dacs++;</div><div class='del'>-			break;</div><div class='del'>-		case AUTO_PIN_HP_OUT:</div><div class='del'>-		case AUTO_PIN_SPEAKER_OUT:</div><div class='del'>-			if (!spec-&gt;multiout.hp_nid) {</div><div class='del'>-				spec-&gt;multiout.hp_nid = dac;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			for (j = 0; j &lt; ARRAY_SIZE(spec-&gt;multiout.extra_out_nid); j++)</div><div class='del'>-				if (!spec-&gt;multiout.extra_out_nid[j]) {</div><div class='del'>-					spec-&gt;multiout.extra_out_nid[j] = dac;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	spec-&gt;multiout.max_channels = nums * 2;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;hp_outs &gt; 0)</div><div class='del'>-		spec-&gt;auto_mute = 1;</div><div class='del'>-	spec-&gt;vmaster_nid = spec-&gt;private_dac_nids[0];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* auto-mute/unmute speaker and line outs according to headphone jack */</div><div class='del'>-static void cx_auto_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, present;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;auto_mute)</div><div class='del'>-		return;</div><div class='del'>-	present = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		if (snd_hda_jack_detect(codec, cfg-&gt;hp_pins[i])) {</div><div class='del'>-			present = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;line_out_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    present ? 0 : PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;speaker_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    present ? 0 : PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* automatic switch internal and external mic */</div><div class='del'>-static void cx_auto_automic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux;</div><div class='del'>-	int ext_idx = spec-&gt;auto_mic_ext;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;auto_mic)</div><div class='del'>-		return;</div><div class='del'>-	if (snd_hda_jack_detect(codec, cfg-&gt;inputs[ext_idx].pin)) {</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;adc_nids[0], 0,</div><div class='del'>-				    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-				    imux-&gt;items[ext_idx].index);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;adc_nids[0], 0,</div><div class='del'>-				    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-				    imux-&gt;items[!ext_idx].index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	int nid = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; 20;</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case CONEXANT_HP_EVENT:</div><div class='del'>-		cx_auto_hp_automute(codec);</div><div class='del'>-		conexant_report_jack(codec, nid);</div><div class='del'>-		break;</div><div class='del'>-	case CONEXANT_MIC_EVENT:</div><div class='del'>-		cx_auto_automic(codec);</div><div class='del'>-		conexant_report_jack(codec, nid);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return true if it's an internal-mic pin */</div><div class='del'>-static int is_int_mic(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin);</div><div class='del'>-	return get_defcfg_device(def_conf) == AC_JACK_MIC_IN &amp;&amp;</div><div class='del'>-		snd_hda_get_input_pin_attr(def_conf) == INPUT_PIN_ATTR_INT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return true if it's an external-mic pin */</div><div class='del'>-static int is_ext_mic(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin);</div><div class='del'>-	return get_defcfg_device(def_conf) == AC_JACK_MIC_IN &amp;&amp;</div><div class='del'>-		snd_hda_get_input_pin_attr(def_conf) &gt;= INPUT_PIN_ATTR_NORMAL &amp;&amp;</div><div class='del'>-		(snd_hda_query_pin_caps(codec, pin) &amp; AC_PINCAP_PRES_DETECT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check whether the pin config is suitable for auto-mic switching;</div><div class='del'>- * auto-mic is enabled only when one int-mic and one-ext mic exist</div><div class='del'>- */</div><div class='del'>-static void cx_auto_check_auto_mic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-</div><div class='del'>-	if (is_ext_mic(codec, cfg-&gt;inputs[0].pin) &amp;&amp;</div><div class='del'>-	    is_int_mic(codec, cfg-&gt;inputs[1].pin)) {</div><div class='del'>-		spec-&gt;auto_mic = 1;</div><div class='del'>-		spec-&gt;auto_mic_ext = 1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (is_int_mic(codec, cfg-&gt;inputs[1].pin) &amp;&amp;</div><div class='del'>-	    is_ext_mic(codec, cfg-&gt;inputs[0].pin)) {</div><div class='del'>-		spec-&gt;auto_mic = 1;</div><div class='del'>-		spec-&gt;auto_mic_ext = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_parse_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	struct hda_input_mux *imux;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	imux = &amp;spec-&gt;private_imux;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		int idx = get_connection_index(codec, spec-&gt;adc_nids[0],</div><div class='del'>-					       cfg-&gt;inputs[i].pin);</div><div class='del'>-		if (idx &gt;= 0) {</div><div class='del'>-			const char *label;</div><div class='del'>-			label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-			snd_hda_add_imux_item(imux, label, idx, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (imux-&gt;num_items == 2 &amp;&amp; cfg-&gt;num_inputs == 2)</div><div class='del'>-		cx_auto_check_auto_mic(codec);</div><div class='del'>-	if (imux-&gt;num_items &gt; 1 &amp;&amp; !spec-&gt;auto_mic)</div><div class='del'>-		spec-&gt;input_mux = imux;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get digital-input audio widget corresponding to the given pin */</div><div class='del'>-static hda_nid_t cx_auto_get_dig_in(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid, end_nid;</div><div class='del'>-</div><div class='del'>-	end_nid = codec-&gt;start_nid + codec-&gt;num_nodes;</div><div class='del'>-	for (nid = codec-&gt;start_nid; nid &lt; end_nid; nid++) {</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, nid);</div><div class='del'>-		unsigned int type = get_wcaps_type(wcaps);</div><div class='del'>-		if (type == AC_WID_AUD_IN &amp;&amp; (wcaps &amp; AC_WCAP_DIGITAL)) {</div><div class='del'>-			if (get_connection_index(codec, nid, pin) &gt;= 0)</div><div class='del'>-				return nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_parse_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;dig_outs &amp;&amp;</div><div class='del'>-	    snd_hda_get_connections(codec, cfg-&gt;dig_out_pins[0], &amp;nid, 1) == 1)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = nid;</div><div class='del'>-	if (cfg-&gt;dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = cx_auto_get_dig_in(codec, cfg-&gt;dig_in_pin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-static void cx_auto_parse_beep(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid, end_nid;</div><div class='del'>-</div><div class='del'>-	end_nid = codec-&gt;start_nid + codec-&gt;num_nodes;</div><div class='del'>-	for (nid = codec-&gt;start_nid; nid &lt; end_nid; nid++)</div><div class='del'>-		if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP) {</div><div class='del'>-			set_beep_amp(spec, nid, 0, HDA_OUTPUT);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define cx_auto_parse_beep(codec)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int cx_auto_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	cx_auto_parse_output(codec);</div><div class='del'>-	cx_auto_parse_input(codec);</div><div class='del'>-	cx_auto_parse_digital(codec);</div><div class='del'>-	cx_auto_parse_beep(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_turn_on_eapd(struct hda_codec *codec, int num_pins,</div><div class='del'>-				 hda_nid_t *pins)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; num_pins; i++) {</div><div class='del'>-		if (snd_hda_query_pin_caps(codec, pins[i]) &amp; AC_PINCAP_EAPD)</div><div class='del'>-			snd_hda_codec_write(codec, pins[i], 0,</div><div class='del'>-					    AC_VERB_SET_EAPD_BTLENABLE, 0x02);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void select_connection(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-			      hda_nid_t src)</div><div class='del'>-{</div><div class='del'>-	int idx = get_connection_index(codec, pin, src);</div><div class='del'>-	if (idx &gt;= 0)</div><div class='del'>-		snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-				    AC_VERB_SET_CONNECT_SEL, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_init_output(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;multiout.dac_nids[i], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++)</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;hp_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);</div><div class='del'>-	if (spec-&gt;auto_mute) {</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-			snd_hda_codec_write(codec, cfg-&gt;hp_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				    AC_USRSP_EN | CONEXANT_HP_EVENT);</div><div class='del'>-		}</div><div class='del'>-		cx_auto_hp_automute(codec);</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='del'>-			snd_hda_codec_write(codec, cfg-&gt;line_out_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;speaker_outs; i++)</div><div class='del'>-			snd_hda_codec_write(codec, cfg-&gt;speaker_pins[i], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;dac_info_filled; i++) {</div><div class='del'>-		nid = spec-&gt;dac_info[i].dac;</div><div class='del'>-		if (!nid)</div><div class='del'>-			nid = spec-&gt;multiout.dac_nids[0];</div><div class='del'>-		select_connection(codec, spec-&gt;dac_info[i].pin, nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* turn on EAPD */</div><div class='del'>-	cx_auto_turn_on_eapd(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins);</div><div class='del'>-	cx_auto_turn_on_eapd(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins);</div><div class='del'>-	cx_auto_turn_on_eapd(codec, cfg-&gt;speaker_outs, cfg-&gt;speaker_pins);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_init_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_adc_nids; i++)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;adc_nids[i], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		unsigned int type;</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC)</div><div class='del'>-			type = PIN_VREF80;</div><div class='del'>-		else</div><div class='del'>-			type = PIN_IN;</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;inputs[i].pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;auto_mic) {</div><div class='del'>-		int ext_idx = spec-&gt;auto_mic_ext;</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;inputs[ext_idx].pin, 0,</div><div class='del'>-				    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				    AC_USRSP_EN | CONEXANT_MIC_EVENT);</div><div class='del'>-		cx_auto_automic(codec);</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;num_adc_nids; i++) {</div><div class='del'>-			snd_hda_codec_write(codec, spec-&gt;adc_nids[i], 0,</div><div class='del'>-					    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					    spec-&gt;private_imux.items[0].index);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cx_auto_init_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid)</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;dig_out_pins[0], 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	if (spec-&gt;dig_in_nid)</div><div class='del'>-		snd_hda_codec_write(codec, cfg-&gt;dig_in_pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/*snd_hda_sequence_write(codec, cx_auto_init_verbs);*/</div><div class='del'>-	cx_auto_init_output(codec);</div><div class='del'>-	cx_auto_init_input(codec);</div><div class='del'>-	cx_auto_init_digital(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx_auto_add_volume(struct hda_codec *codec, const char *basename,</div><div class='del'>-			      const char *dir, int cidx,</div><div class='del'>-			      hda_nid_t nid, int hda_dir)</div><div class='del'>-{</div><div class='del'>-	static char name[32];</div><div class='del'>-	static struct snd_kcontrol_new knew[] = {</div><div class='del'>-		HDA_CODEC_VOLUME(name, 0, 0, 0),</div><div class='del'>-		HDA_CODEC_MUTE(name, 0, 0, 0),</div><div class='del'>-	};</div><div class='del'>-	static char *sfx[2] = { "Volume", "Switch" };</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct snd_kcontrol *kctl;</div><div class='del'>-		knew[i].private_value = HDA_COMPOSE_AMP_VAL(nid, 3, 0, hda_dir);</div><div class='del'>-		knew[i].subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-		knew[i].index = cidx;</div><div class='del'>-		snprintf(name, sizeof(name), "%s%s %s", basename, dir, sfx[i]);</div><div class='del'>-		kctl = snd_ctl_new1(&amp;knew[i], codec);</div><div class='del'>-		if (!kctl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		err = snd_hda_ctl_add(codec, nid, kctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (!(query_amp_caps(codec, nid, hda_dir) &amp; AC_AMPCAP_MUTE))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define cx_auto_add_pb_volume(codec, nid, str, idx)			\</div><div class='del'>-	cx_auto_add_volume(codec, str, " Playback", idx, nid, HDA_OUTPUT)</div><div class='del'>-</div><div class='del'>-static int cx_auto_build_output_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, err;</div><div class='del'>-	int num_line = 0, num_hp = 0, num_spk = 0;</div><div class='del'>-	static const char *texts[3] = { "Front", "Surround", "CLFE" };</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dac_info_filled == 1)</div><div class='del'>-		return cx_auto_add_pb_volume(codec, spec-&gt;dac_info[0].dac,</div><div class='del'>-					     "Master", 0);</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;dac_info_filled; i++) {</div><div class='del'>-		const char *label;</div><div class='del'>-		int idx, type;</div><div class='del'>-		if (!spec-&gt;dac_info[i].dac)</div><div class='del'>-			continue;</div><div class='del'>-		type = spec-&gt;dac_info[i].type;</div><div class='del'>-		if (type == AUTO_PIN_LINE_OUT)</div><div class='del'>-			type = spec-&gt;autocfg.line_out_type;</div><div class='del'>-		switch (type) {</div><div class='del'>-		case AUTO_PIN_LINE_OUT:</div><div class='del'>-		default:</div><div class='del'>-			label = texts[num_line++];</div><div class='del'>-			idx = 0;</div><div class='del'>-			break;</div><div class='del'>-		case AUTO_PIN_HP_OUT:</div><div class='del'>-			label = "Headphone";</div><div class='del'>-			idx = num_hp++;</div><div class='del'>-			break;</div><div class='del'>-		case AUTO_PIN_SPEAKER_OUT:</div><div class='del'>-			label = "Speaker";</div><div class='del'>-			idx = num_spk++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		err = cx_auto_add_pb_volume(codec, spec-&gt;dac_info[i].dac,</div><div class='del'>-					    label, idx);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx_auto_build_input_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	static const char *prev_label;</div><div class='del'>-	int i, err, cidx;</div><div class='del'>-</div><div class='del'>-	err = cx_auto_add_volume(codec, "Capture", "", 0, spec-&gt;adc_nids[0],</div><div class='del'>-				 HDA_INPUT);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	prev_label = NULL;</div><div class='del'>-	cidx = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		const char *label;</div><div class='del'>-		if (!(get_wcaps(codec, nid) &amp; AC_WCAP_IN_AMP))</div><div class='del'>-			continue;</div><div class='del'>-		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-		if (label == prev_label)</div><div class='del'>-			cidx++;</div><div class='del'>-		else</div><div class='del'>-			cidx = 0;</div><div class='del'>-		prev_label = label;</div><div class='del'>-		err = cx_auto_add_volume(codec, label, " Capture", cidx,</div><div class='del'>-					 nid, HDA_INPUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cx_auto_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = cx_auto_build_output_controls(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = cx_auto_build_input_controls(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return conexant_build_controls(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops cx_auto_patch_ops = {</div><div class='del'>-	.build_controls = cx_auto_build_controls,</div><div class='del'>-	.build_pcms = conexant_build_pcms,</div><div class='del'>-	.init = cx_auto_init,</div><div class='del'>-	.free = conexant_free,</div><div class='del'>-	.unsol_event = cx_auto_unsol_event,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.suspend = conexant_suspend,</div><div class='del'>-#endif</div><div class='del'>-	.reboot_notify = snd_hda_shutup_pins,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_conexant_auto(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct conexant_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;adc_nids = cx_auto_adc_nids;</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(cx_auto_adc_nids);</div><div class='del'>-	spec-&gt;capsrc_nids = spec-&gt;adc_nids;</div><div class='del'>-	err = cx_auto_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(codec-&gt;spec);</div><div class='del'>-		codec-&gt;spec = NULL;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;patch_ops = cx_auto_patch_ops;</div><div class='del'>-	if (spec-&gt;beep_amp)</div><div class='del'>-		snd_hda_attach_beep_device(codec, spec-&gt;beep_amp);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_conexant[] = {</div><div class='del'>-	{ .id = 0x14f15045, .name = "CX20549 (Venice)",</div><div class='del'>-	  .patch = patch_cxt5045 },</div><div class='del'>-	{ .id = 0x14f15047, .name = "CX20551 (Waikiki)",</div><div class='del'>-	  .patch = patch_cxt5047 },</div><div class='del'>-	{ .id = 0x14f15051, .name = "CX20561 (Hermosa)",</div><div class='del'>-	  .patch = patch_cxt5051 },</div><div class='del'>-	{ .id = 0x14f15066, .name = "CX20582 (Pebble)",</div><div class='del'>-	  .patch = patch_cxt5066 },</div><div class='del'>-	{ .id = 0x14f15067, .name = "CX20583 (Pebble HSF)",</div><div class='del'>-	  .patch = patch_cxt5066 },</div><div class='del'>-	{ .id = 0x14f15068, .name = "CX20584",</div><div class='del'>-	  .patch = patch_cxt5066 },</div><div class='del'>-	{ .id = 0x14f15069, .name = "CX20585",</div><div class='del'>-	  .patch = patch_cxt5066 },</div><div class='del'>-	{ .id = 0x14f15097, .name = "CX20631",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f15098, .name = "CX20632",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150a1, .name = "CX20641",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150a2, .name = "CX20642",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150ab, .name = "CX20651",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150ac, .name = "CX20652",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150b8, .name = "CX20664",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{ .id = 0x14f150b9, .name = "CX20665",</div><div class='del'>-	  .patch = patch_conexant_auto },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15045");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15047");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15051");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15066");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15067");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15068");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15069");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15097");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f15098");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150a1");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150a2");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150ab");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150ac");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150b8");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:14f150b9");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Conexant HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list conexant_list = {</div><div class='del'>-	.preset = snd_hda_preset_conexant,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_conexant_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;conexant_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_conexant_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;conexant_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_conexant_init)</div><div class='del'>-module_exit(patch_conexant_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c<br/>deleted file mode 100644<br/>index d3e49aa5b9ec..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_hdmi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_hdmi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1639 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  patch_hdmi.c - routines for HDMI/DisplayPort codecs</div><div class='del'>- *</div><div class='del'>- *  Copyright(c) 2008-2010 Intel Corporation. All rights reserved.</div><div class='del'>- *  Copyright (c) 2006 ATI Technologies Inc.</div><div class='del'>- *  Copyright (c) 2008 NVIDIA Corp.  All rights reserved.</div><div class='del'>- *  Copyright (c) 2008 Wei Ni &lt;wni@nvidia.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Authors:</div><div class='del'>- *			Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Maintained by:</div><div class='del'>- *			Wu Fengguang &lt;wfg@linux.intel.com&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License as published by the Free</div><div class='del'>- *  Software Foundation; either version 2 of the License, or (at your option)</div><div class='del'>- *  any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful, but</div><div class='del'>- *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY</div><div class='del'>- *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software Foundation,</div><div class='del'>- *  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The HDMI/DisplayPort configuration can be highly dynamic. A graphics device</div><div class='del'>- * could support two independent pipes, each of them can be connected to one or</div><div class='del'>- * more ports (DVI, HDMI or DisplayPort).</div><div class='del'>- *</div><div class='del'>- * The HDA correspondence of pipes/ports are converter/pin nodes.</div><div class='del'>- */</div><div class='del'>-#define MAX_HDMI_CVTS	3</div><div class='del'>-#define MAX_HDMI_PINS	3</div><div class='del'>-</div><div class='del'>-struct hdmi_spec {</div><div class='del'>-	int num_cvts;</div><div class='del'>-	int num_pins;</div><div class='del'>-	hda_nid_t cvt[MAX_HDMI_CVTS+1];  /* audio sources */</div><div class='del'>-	hda_nid_t pin[MAX_HDMI_PINS+1];  /* audio sinks */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * source connection for each pin</div><div class='del'>-	 */</div><div class='del'>-	hda_nid_t pin_cvt[MAX_HDMI_PINS+1];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HDMI sink attached to each pin</div><div class='del'>-	 */</div><div class='del'>-	struct hdmi_eld sink_eld[MAX_HDMI_PINS];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * export one pcm per pipe</div><div class='del'>-	 */</div><div class='del'>-	struct hda_pcm	pcm_rec[MAX_HDMI_CVTS];</div><div class='del'>-	struct hda_pcm_stream codec_pcm_pars[MAX_HDMI_CVTS];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ati/nvhdmi specific</div><div class='del'>-	 */</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	struct hda_pcm_stream *pcm_playback;</div><div class='del'>-</div><div class='del'>-	/* misc flags */</div><div class='del'>-	/* PD bit indicates only the update, not the current state */</div><div class='del'>-	unsigned int old_pin_detect:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hdmi_audio_infoframe {</div><div class='del'>-	u8 type; /* 0x84 */</div><div class='del'>-	u8 ver;  /* 0x01 */</div><div class='del'>-	u8 len;  /* 0x0a */</div><div class='del'>-</div><div class='del'>-	u8 checksum;</div><div class='del'>-</div><div class='del'>-	u8 CC02_CT47;	/* CC in bits 0:2, CT in 4:7 */</div><div class='del'>-	u8 SS01_SF24;</div><div class='del'>-	u8 CXT04;</div><div class='del'>-	u8 CA;</div><div class='del'>-	u8 LFEPBL01_LSV36_DM_INH7;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dp_audio_infoframe {</div><div class='del'>-	u8 type; /* 0x84 */</div><div class='del'>-	u8 len;  /* 0x1b */</div><div class='del'>-	u8 ver;  /* 0x11 &lt;&lt; 2 */</div><div class='del'>-</div><div class='del'>-	u8 CC02_CT47;	/* match with HDMI infoframe from this on */</div><div class='del'>-	u8 SS01_SF24;</div><div class='del'>-	u8 CXT04;</div><div class='del'>-	u8 CA;</div><div class='del'>-	u8 LFEPBL01_LSV36_DM_INH7;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CEA speaker placement:</div><div class='del'>- *</div><div class='del'>- *        FLH       FCH        FRH</div><div class='del'>- *  FLW    FL  FLC   FC   FRC   FR   FRW</div><div class='del'>- *</div><div class='del'>- *                                  LFE</div><div class='del'>- *                     TC</div><div class='del'>- *</div><div class='del'>- *          RL  RLC   RC   RRC   RR</div><div class='del'>- *</div><div class='del'>- * The Left/Right Surround channel _notions_ LS/RS in SMPTE 320M corresponds to</div><div class='del'>- * CEA RL/RR; The SMPTE channel _assignment_ C/LFE is swapped to CEA LFE/FC.</div><div class='del'>- */</div><div class='del'>-enum cea_speaker_placement {</div><div class='del'>-	FL  = (1 &lt;&lt;  0),	/* Front Left           */</div><div class='del'>-	FC  = (1 &lt;&lt;  1),	/* Front Center         */</div><div class='del'>-	FR  = (1 &lt;&lt;  2),	/* Front Right          */</div><div class='del'>-	FLC = (1 &lt;&lt;  3),	/* Front Left Center    */</div><div class='del'>-	FRC = (1 &lt;&lt;  4),	/* Front Right Center   */</div><div class='del'>-	RL  = (1 &lt;&lt;  5),	/* Rear Left            */</div><div class='del'>-	RC  = (1 &lt;&lt;  6),	/* Rear Center          */</div><div class='del'>-	RR  = (1 &lt;&lt;  7),	/* Rear Right           */</div><div class='del'>-	RLC = (1 &lt;&lt;  8),	/* Rear Left Center     */</div><div class='del'>-	RRC = (1 &lt;&lt;  9),	/* Rear Right Center    */</div><div class='del'>-	LFE = (1 &lt;&lt; 10),	/* Low Frequency Effect */</div><div class='del'>-	FLW = (1 &lt;&lt; 11),	/* Front Left Wide      */</div><div class='del'>-	FRW = (1 &lt;&lt; 12),	/* Front Right Wide     */</div><div class='del'>-	FLH = (1 &lt;&lt; 13),	/* Front Left High      */</div><div class='del'>-	FCH = (1 &lt;&lt; 14),	/* Front Center High    */</div><div class='del'>-	FRH = (1 &lt;&lt; 15),	/* Front Right High     */</div><div class='del'>-	TC  = (1 &lt;&lt; 16),	/* Top Center           */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ELD SA bits in the CEA Speaker Allocation data block</div><div class='del'>- */</div><div class='del'>-static int eld_speaker_allocation_bits[] = {</div><div class='del'>-	[0] = FL | FR,</div><div class='del'>-	[1] = LFE,</div><div class='del'>-	[2] = FC,</div><div class='del'>-	[3] = RL | RR,</div><div class='del'>-	[4] = RC,</div><div class='del'>-	[5] = FLC | FRC,</div><div class='del'>-	[6] = RLC | RRC,</div><div class='del'>-	/* the following are not defined in ELD yet */</div><div class='del'>-	[7] = FLW | FRW,</div><div class='del'>-	[8] = FLH | FRH,</div><div class='del'>-	[9] = TC,</div><div class='del'>-	[10] = FCH,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct cea_channel_speaker_allocation {</div><div class='del'>-	int ca_index;</div><div class='del'>-	int speakers[8];</div><div class='del'>-</div><div class='del'>-	/* derived values, just for convenience */</div><div class='del'>-	int channels;</div><div class='del'>-	int spk_mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALSA sequence is:</div><div class='del'>- *</div><div class='del'>- *       surround40   surround41   surround50   surround51   surround71</div><div class='del'>- * ch0   front left   =            =            =            =</div><div class='del'>- * ch1   front right  =            =            =            =</div><div class='del'>- * ch2   rear left    =            =            =            =</div><div class='del'>- * ch3   rear right   =            =            =            =</div><div class='del'>- * ch4                LFE          center       center       center</div><div class='del'>- * ch5                                          LFE          LFE</div><div class='del'>- * ch6                                                       side left</div><div class='del'>- * ch7                                                       side right</div><div class='del'>- *</div><div class='del'>- * surround71 = {FL, FR, RLC, RRC, FC, LFE, RL, RR}</div><div class='del'>- */</div><div class='del'>-static int hdmi_channel_mapping[0x32][8] = {</div><div class='del'>-	/* stereo */</div><div class='del'>-	[0x00] = { 0x00, 0x11, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='del'>-	/* 2.1 */</div><div class='del'>-	[0x01] = { 0x00, 0x11, 0x22, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='del'>-	/* Dolby Surround */</div><div class='del'>-	[0x02] = { 0x00, 0x11, 0x23, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7 },</div><div class='del'>-	/* surround40 */</div><div class='del'>-	[0x08] = { 0x00, 0x11, 0x24, 0x35, 0xf3, 0xf2, 0xf6, 0xf7 },</div><div class='del'>-	/* 4ch */</div><div class='del'>-	[0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 },</div><div class='del'>-	/* surround41 */</div><div class='del'>-	[0x09] = { 0x00, 0x11, 0x24, 0x35, 0x42, 0xf3, 0xf6, 0xf7 },</div><div class='del'>-	/* surround50 */</div><div class='del'>-	[0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 },</div><div class='del'>-	/* surround51 */</div><div class='del'>-	[0x0b] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0x52, 0xf6, 0xf7 },</div><div class='del'>-	/* 7.1 */</div><div class='del'>-	[0x13] = { 0x00, 0x11, 0x26, 0x37, 0x43, 0x52, 0x64, 0x75 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is an ordered list!</div><div class='del'>- *</div><div class='del'>- * The preceding ones have better chances to be selected by</div><div class='del'>- * hdmi_channel_allocation().</div><div class='del'>- */</div><div class='del'>-static struct cea_channel_speaker_allocation channel_allocations[] = {</div><div class='del'>-/*			  channel:   7     6    5    4    3     2    1    0  */</div><div class='del'>-{ .ca_index = 0x00,  .speakers = {   0,    0,   0,   0,   0,    0,  FR,  FL } },</div><div class='del'>-				 /* 2.1 */</div><div class='del'>-{ .ca_index = 0x01,  .speakers = {   0,    0,   0,   0,   0,  LFE,  FR,  FL } },</div><div class='del'>-				 /* Dolby Surround */</div><div class='del'>-{ .ca_index = 0x02,  .speakers = {   0,    0,   0,   0,  FC,    0,  FR,  FL } },</div><div class='del'>-				 /* surround40 */</div><div class='del'>-{ .ca_index = 0x08,  .speakers = {   0,    0,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-				 /* surround41 */</div><div class='del'>-{ .ca_index = 0x09,  .speakers = {   0,    0,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-				 /* surround50 */</div><div class='del'>-{ .ca_index = 0x0a,  .speakers = {   0,    0,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-				 /* surround51 */</div><div class='del'>-{ .ca_index = 0x0b,  .speakers = {   0,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-				 /* 6.1 */</div><div class='del'>-{ .ca_index = 0x0f,  .speakers = {   0,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-				 /* surround71 */</div><div class='del'>-{ .ca_index = 0x13,  .speakers = { RRC,  RLC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-</div><div class='del'>-{ .ca_index = 0x03,  .speakers = {   0,    0,   0,   0,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x04,  .speakers = {   0,    0,   0,  RC,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x05,  .speakers = {   0,    0,   0,  RC,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x06,  .speakers = {   0,    0,   0,  RC,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x07,  .speakers = {   0,    0,   0,  RC,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x0c,  .speakers = {   0,   RC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x0d,  .speakers = {   0,   RC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x0e,  .speakers = {   0,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x10,  .speakers = { RRC,  RLC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x11,  .speakers = { RRC,  RLC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x12,  .speakers = { RRC,  RLC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x14,  .speakers = { FRC,  FLC,   0,   0,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x15,  .speakers = { FRC,  FLC,   0,   0,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x16,  .speakers = { FRC,  FLC,   0,   0,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x17,  .speakers = { FRC,  FLC,   0,   0,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x18,  .speakers = { FRC,  FLC,   0,  RC,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x19,  .speakers = { FRC,  FLC,   0,  RC,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1a,  .speakers = { FRC,  FLC,   0,  RC,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1b,  .speakers = { FRC,  FLC,   0,  RC,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1c,  .speakers = { FRC,  FLC,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1d,  .speakers = { FRC,  FLC,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1e,  .speakers = { FRC,  FLC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x1f,  .speakers = { FRC,  FLC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x20,  .speakers = {   0,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x21,  .speakers = {   0,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x22,  .speakers = {  TC,    0,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x23,  .speakers = {  TC,    0,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x24,  .speakers = { FRH,  FLH,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x25,  .speakers = { FRH,  FLH,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x26,  .speakers = { FRW,  FLW,  RR,  RL,   0,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x27,  .speakers = { FRW,  FLW,  RR,  RL,   0,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x28,  .speakers = {  TC,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x29,  .speakers = {  TC,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2a,  .speakers = { FCH,   RC,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2b,  .speakers = { FCH,   RC,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2c,  .speakers = {  TC,  FCH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2d,  .speakers = {  TC,  FCH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2e,  .speakers = { FRH,  FLH,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x2f,  .speakers = { FRH,  FLH,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x30,  .speakers = { FRW,  FLW,  RR,  RL,  FC,    0,  FR,  FL } },</div><div class='del'>-{ .ca_index = 0x31,  .speakers = { FRW,  FLW,  RR,  RL,  FC,  LFE,  FR,  FL } },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HDMI routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int hda_node_index(hda_nid_t *nids, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; nids[i]; i++)</div><div class='del'>-		if (nids[i] == nid)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	snd_printk(KERN_WARNING "HDMI: nid %d not registered\n", nid);</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_get_show_eld(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-			      struct hdmi_eld *eld)</div><div class='del'>-{</div><div class='del'>-	if (!snd_hdmi_get_eld(eld, codec, pin_nid))</div><div class='del'>-		snd_hdmi_show_eld(eld);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef BE_PARANOID</div><div class='del'>-static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-				int *packet_index, int *byte_index)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	val = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-				 AC_VERB_GET_HDMI_DIP_INDEX, 0);</div><div class='del'>-</div><div class='del'>-	*packet_index = val &gt;&gt; 5;</div><div class='del'>-	*byte_index = val &amp; 0x1f;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-				int packet_index, int byte_index)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	val = (packet_index &lt;&lt; 5) | (byte_index &amp; 0x1f);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-				unsigned char val)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_enable_output(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-	/* Unmute */</div><div class='del'>-	if (get_wcaps(codec, pin_nid) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-		snd_hda_codec_write(codec, pin_nid, 0,</div><div class='del'>-				AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);</div><div class='del'>-	/* Enable pin out */</div><div class='del'>-	snd_hda_codec_write(codec, pin_nid, 0,</div><div class='del'>-			    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	return 1 + snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					AC_VERB_GET_CVT_CHAN_COUNT, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_set_channel_count(struct hda_codec *codec,</div><div class='del'>-				   hda_nid_t nid, int chs)</div><div class='del'>-{</div><div class='del'>-	if (chs != hdmi_get_channel_count(codec, nid))</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Channel mapping routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compute derived values in channel_allocations[].</div><div class='del'>- */</div><div class='del'>-static void init_channel_allocations(void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	struct cea_channel_speaker_allocation *p;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='del'>-		p = channel_allocations + i;</div><div class='del'>-		p-&gt;channels = 0;</div><div class='del'>-		p-&gt;spk_mask = 0;</div><div class='del'>-		for (j = 0; j &lt; ARRAY_SIZE(p-&gt;speakers); j++)</div><div class='del'>-			if (p-&gt;speakers[j]) {</div><div class='del'>-				p-&gt;channels++;</div><div class='del'>-				p-&gt;spk_mask |= p-&gt;speakers[j];</div><div class='del'>-			}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The transformation takes two steps:</div><div class='del'>- *</div><div class='del'>- *	eld-&gt;spk_alloc =&gt; (eld_speaker_allocation_bits[]) =&gt; spk_mask</div><div class='del'>- *	      spk_mask =&gt; (channel_allocations[])         =&gt; ai-&gt;CA</div><div class='del'>- *</div><div class='del'>- * TODO: it could select the wrong CA from multiple candidates.</div><div class='del'>-*/</div><div class='del'>-static int hdmi_channel_allocation(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				   int channels)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hdmi_eld *eld;</div><div class='del'>-	int i;</div><div class='del'>-	int ca = 0;</div><div class='del'>-	int spk_mask = 0;</div><div class='del'>-	char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * CA defaults to 0 for basic stereo audio</div><div class='del'>-	 */</div><div class='del'>-	if (channels &lt;= 2)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	i = hda_node_index(spec-&gt;pin_cvt, nid);</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	eld = &amp;spec-&gt;sink_eld[i];</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HDMI sink's ELD info cannot always be retrieved for now, e.g.</div><div class='del'>-	 * in console or for audio devices. Assume the highest speakers</div><div class='del'>-	 * configuration, to _not_ prohibit multi-channel audio playback.</div><div class='del'>-	 */</div><div class='del'>-	if (!eld-&gt;spk_alloc)</div><div class='del'>-		eld-&gt;spk_alloc = 0xffff;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * expand ELD's speaker allocation mask</div><div class='del'>-	 *</div><div class='del'>-	 * ELD tells the speaker mask in a compact(paired) form,</div><div class='del'>-	 * expand ELD's notions to match the ones used by Audio InfoFrame.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(eld_speaker_allocation_bits); i++) {</div><div class='del'>-		if (eld-&gt;spk_alloc &amp; (1 &lt;&lt; i))</div><div class='del'>-			spk_mask |= eld_speaker_allocation_bits[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* search for the first working match in the CA table */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(channel_allocations); i++) {</div><div class='del'>-		if (channels == channel_allocations[i].channels &amp;&amp;</div><div class='del'>-		    (spk_mask &amp; channel_allocations[i].spk_mask) ==</div><div class='del'>-				channel_allocations[i].spk_mask) {</div><div class='del'>-			ca = channel_allocations[i].ca_index;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_print_channel_allocation(eld-&gt;spk_alloc, buf, sizeof(buf));</div><div class='del'>-	snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",</div><div class='del'>-		    ca, channels, buf);</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_debug_channel_mapping(struct hda_codec *codec,</div><div class='del'>-				       hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-	int i;</div><div class='del'>-	int slot;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		slot = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-						AC_VERB_GET_HDMI_CHAN_SLOT, i);</div><div class='del'>-		printk(KERN_DEBUG "HDMI: ASP channel %d =&gt; slot %d\n",</div><div class='del'>-						slot &gt;&gt; 4, slot &amp; 0xf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hdmi_setup_channel_mapping(struct hda_codec *codec,</div><div class='del'>-				       hda_nid_t pin_nid,</div><div class='del'>-				       int ca)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (hdmi_channel_mapping[ca][1] == 0) {</div><div class='del'>-		for (i = 0; i &lt; channel_allocations[ca].channels; i++)</div><div class='del'>-			hdmi_channel_mapping[ca][i] = i | (i &lt;&lt; 4);</div><div class='del'>-		for (; i &lt; 8; i++)</div><div class='del'>-			hdmi_channel_mapping[ca][i] = 0xf | (i &lt;&lt; 4);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		err = snd_hda_codec_write(codec, pin_nid, 0,</div><div class='del'>-					  AC_VERB_SET_HDMI_CHAN_SLOT,</div><div class='del'>-					  hdmi_channel_mapping[ca][i]);</div><div class='del'>-		if (err) {</div><div class='del'>-			snd_printdd(KERN_NOTICE</div><div class='del'>-				    "HDMI: channel mapping failed\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdmi_debug_channel_mapping(codec, pin_nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Audio InfoFrame routines</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Enable Audio InfoFrame Transmission</div><div class='del'>- */</div><div class='del'>-static void hdmi_start_infoframe_trans(struct hda_codec *codec,</div><div class='del'>-				       hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='del'>-	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,</div><div class='del'>-						AC_DIPXMIT_BEST);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Disable Audio InfoFrame Transmission</div><div class='del'>- */</div><div class='del'>-static void hdmi_stop_infoframe_trans(struct hda_codec *codec,</div><div class='del'>-				      hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='del'>-	snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,</div><div class='del'>-						AC_DIPXMIT_DISABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_debug_dip_size(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-	int i;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	size = snd_hdmi_get_eld_size(codec, pin_nid);</div><div class='del'>-	printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		size = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-						AC_VERB_GET_HDMI_DIP_SIZE, i);</div><div class='del'>-		printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_clear_dip_buffers(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-#ifdef BE_PARANOID</div><div class='del'>-	int i, j;</div><div class='del'>-	int size;</div><div class='del'>-	int pi, bi;</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		size = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-						AC_VERB_GET_HDMI_DIP_SIZE, i);</div><div class='del'>-		if (size == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		hdmi_set_dip_index(codec, pin_nid, i, 0x0);</div><div class='del'>-		for (j = 1; j &lt; 1000; j++) {</div><div class='del'>-			hdmi_write_dip_byte(codec, pin_nid, 0x0);</div><div class='del'>-			hdmi_get_dip_index(codec, pin_nid, &amp;pi, &amp;bi);</div><div class='del'>-			if (pi != i)</div><div class='del'>-				snd_printd(KERN_INFO "dip index %d: %d != %d\n",</div><div class='del'>-						bi, pi, i);</div><div class='del'>-			if (bi == 0) /* byte index wrapped around */</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		snd_printd(KERN_INFO</div><div class='del'>-			"HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",</div><div class='del'>-			i, size, j);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *hdmi_ai)</div><div class='del'>-{</div><div class='del'>-	u8 *bytes = (u8 *)hdmi_ai;</div><div class='del'>-	u8 sum = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	hdmi_ai-&gt;checksum = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof(*hdmi_ai); i++)</div><div class='del'>-		sum += bytes[i];</div><div class='del'>-</div><div class='del'>-	hdmi_ai-&gt;checksum = -sum;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_fill_audio_infoframe(struct hda_codec *codec,</div><div class='del'>-				      hda_nid_t pin_nid,</div><div class='del'>-				      u8 *dip, int size)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	hdmi_debug_dip_size(codec, pin_nid);</div><div class='del'>-	hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */</div><div class='del'>-</div><div class='del'>-	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='del'>-	for (i = 0; i &lt; size; i++)</div><div class='del'>-		hdmi_write_dip_byte(codec, pin_nid, dip[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-				    u8 *dip, int size)</div><div class='del'>-{</div><div class='del'>-	u8 val;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (snd_hda_codec_read(codec, pin_nid, 0, AC_VERB_GET_HDMI_DIP_XMIT, 0)</div><div class='del'>-							    != AC_DIPXMIT_BEST)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);</div><div class='del'>-	for (i = 0; i &lt; size; i++) {</div><div class='del'>-		val = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-					 AC_VERB_GET_HDMI_DIP_DATA, 0);</div><div class='del'>-		if (val != dip[i])</div><div class='del'>-			return false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin_nid;</div><div class='del'>-	int channels = substream-&gt;runtime-&gt;channels;</div><div class='del'>-	int ca;</div><div class='del'>-	int i;</div><div class='del'>-	u8 ai[max(sizeof(struct hdmi_audio_infoframe),</div><div class='del'>-		  sizeof(struct dp_audio_infoframe))];</div><div class='del'>-</div><div class='del'>-	ca = hdmi_channel_allocation(codec, nid, channels);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pins; i++) {</div><div class='del'>-		if (spec-&gt;pin_cvt[i] != nid)</div><div class='del'>-			continue;</div><div class='del'>-		if (!spec-&gt;sink_eld[i].monitor_present)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		pin_nid = spec-&gt;pin[i];</div><div class='del'>-</div><div class='del'>-		memset(ai, 0, sizeof(ai));</div><div class='del'>-		if (spec-&gt;sink_eld[i].conn_type == 0) { /* HDMI */</div><div class='del'>-			struct hdmi_audio_infoframe *hdmi_ai;</div><div class='del'>-</div><div class='del'>-			hdmi_ai = (struct hdmi_audio_infoframe *)ai;</div><div class='del'>-			hdmi_ai-&gt;type		= 0x84;</div><div class='del'>-			hdmi_ai-&gt;ver		= 0x01;</div><div class='del'>-			hdmi_ai-&gt;len		= 0x0a;</div><div class='del'>-			hdmi_ai-&gt;CC02_CT47	= channels - 1;</div><div class='del'>-			hdmi_checksum_audio_infoframe(hdmi_ai);</div><div class='del'>-		} else if (spec-&gt;sink_eld[i].conn_type == 1) { /* DisplayPort */</div><div class='del'>-			struct dp_audio_infoframe *dp_ai;</div><div class='del'>-</div><div class='del'>-			dp_ai = (struct dp_audio_infoframe *)ai;</div><div class='del'>-			dp_ai-&gt;type		= 0x84;</div><div class='del'>-			dp_ai-&gt;len		= 0x1b;</div><div class='del'>-			dp_ai-&gt;ver		= 0x11 &lt;&lt; 2;</div><div class='del'>-			dp_ai-&gt;CC02_CT47	= channels - 1;</div><div class='del'>-		} else {</div><div class='del'>-			snd_printd("HDMI: unknown connection type at pin %d\n",</div><div class='del'>-				   pin_nid);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * sizeof(ai) is used instead of sizeof(*hdmi_ai) or</div><div class='del'>-		 * sizeof(*dp_ai) to avoid partial match/update problems when</div><div class='del'>-		 * the user switches between HDMI/DP monitors.</div><div class='del'>-		 */</div><div class='del'>-		if (!hdmi_infoframe_uptodate(codec, pin_nid, ai, sizeof(ai))) {</div><div class='del'>-			snd_printdd("hdmi_setup_audio_infoframe: "</div><div class='del'>-				    "cvt=%d pin=%d channels=%d\n",</div><div class='del'>-				    nid, pin_nid,</div><div class='del'>-				    channels);</div><div class='del'>-			hdmi_setup_channel_mapping(codec, pin_nid, ca);</div><div class='del'>-			hdmi_stop_infoframe_trans(codec, pin_nid);</div><div class='del'>-			hdmi_fill_audio_infoframe(codec, pin_nid,</div><div class='del'>-						  ai, sizeof(ai));</div><div class='del'>-			hdmi_start_infoframe_trans(codec, pin_nid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unsolicited events</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-			       struct hdmi_eld *eld);</div><div class='del'>-</div><div class='del'>-static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int tag = res &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='del'>-	int pind = !!(res &amp; AC_UNSOL_RES_PD);</div><div class='del'>-	int eldv = !!(res &amp; AC_UNSOL_RES_ELDV);</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-		"HDMI hot plug event: Pin=%d Presence_Detect=%d ELD_Valid=%d\n",</div><div class='del'>-		tag, pind, eldv);</div><div class='del'>-</div><div class='del'>-	index = hda_node_index(spec-&gt;pin, tag);</div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;old_pin_detect) {</div><div class='del'>-		if (pind)</div><div class='del'>-			hdmi_present_sense(codec, tag, &amp;spec-&gt;sink_eld[index]);</div><div class='del'>-		pind = spec-&gt;sink_eld[index].monitor_present;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;sink_eld[index].monitor_present = pind;</div><div class='del'>-	spec-&gt;sink_eld[index].eld_valid = eldv;</div><div class='del'>-</div><div class='del'>-	if (pind &amp;&amp; eldv) {</div><div class='del'>-		hdmi_get_show_eld(codec, spec-&gt;pin[index],</div><div class='del'>-				  &amp;spec-&gt;sink_eld[index]);</div><div class='del'>-		/* TODO: do real things about ELD */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	int tag = res &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='del'>-	int subtag = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; AC_UNSOL_RES_SUBTAG_SHIFT;</div><div class='del'>-	int cp_state = !!(res &amp; AC_UNSOL_RES_CP_STATE);</div><div class='del'>-	int cp_ready = !!(res &amp; AC_UNSOL_RES_CP_READY);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO</div><div class='del'>-		"HDMI CP event: PIN=%d SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",</div><div class='del'>-		tag,</div><div class='del'>-		subtag,</div><div class='del'>-		cp_state,</div><div class='del'>-		cp_ready);</div><div class='del'>-</div><div class='del'>-	/* TODO */</div><div class='del'>-	if (cp_state)</div><div class='del'>-		;</div><div class='del'>-	if (cp_ready)</div><div class='del'>-		;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int tag = res &gt;&gt; AC_UNSOL_RES_TAG_SHIFT;</div><div class='del'>-	int subtag = (res &amp; AC_UNSOL_RES_SUBTAG) &gt;&gt; AC_UNSOL_RES_SUBTAG_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (hda_node_index(spec-&gt;pin, tag) &lt; 0) {</div><div class='del'>-		snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (subtag == 0)</div><div class='del'>-		hdmi_intrinsic_event(codec, res);</div><div class='del'>-	else</div><div class='del'>-		hdmi_non_intrinsic_event(codec, res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Callbacks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* HBR should be Non-PCM, 8 channels */</div><div class='del'>-#define is_hbr_format(format) \</div><div class='del'>-	((format &amp; AC_FMT_TYPE_NON_PCM) &amp;&amp; (format &amp; AC_FMT_CHAN_MASK) == 7)</div><div class='del'>-</div><div class='del'>-static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			      u32 stream_tag, int format)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int pinctl;</div><div class='del'>-	int new_pinctl = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pins; i++) {</div><div class='del'>-		if (spec-&gt;pin_cvt[i] != nid)</div><div class='del'>-			continue;</div><div class='del'>-		if (!(snd_hda_query_pin_caps(codec, spec-&gt;pin[i]) &amp; AC_PINCAP_HBR))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		pinctl = snd_hda_codec_read(codec, spec-&gt;pin[i], 0,</div><div class='del'>-					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-</div><div class='del'>-		new_pinctl = pinctl &amp; ~AC_PINCTL_EPT;</div><div class='del'>-		if (is_hbr_format(format))</div><div class='del'>-			new_pinctl |= AC_PINCTL_EPT_HBR;</div><div class='del'>-		else</div><div class='del'>-			new_pinctl |= AC_PINCTL_EPT_NATIVE;</div><div class='del'>-</div><div class='del'>-		snd_printdd("hdmi_setup_stream: "</div><div class='del'>-			    "NID=0x%x, %spinctl=0x%x\n",</div><div class='del'>-			    spec-&gt;pin[i],</div><div class='del'>-			    pinctl == new_pinctl ? "" : "new-",</div><div class='del'>-			    new_pinctl);</div><div class='del'>-</div><div class='del'>-		if (pinctl != new_pinctl)</div><div class='del'>-			snd_hda_codec_write(codec, spec-&gt;pin[i], 0,</div><div class='del'>-					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					    new_pinctl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_hbr_format(format) &amp;&amp; !new_pinctl) {</div><div class='del'>-		snd_printdd("hdmi_setup_stream: HBR is not supported\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HDA PCM callbacks</div><div class='del'>- */</div><div class='del'>-static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-			 struct hda_codec *codec,</div><div class='del'>-			 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hdmi_eld *eld;</div><div class='del'>-	struct hda_pcm_stream *codec_pars;</div><div class='del'>-	unsigned int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; spec-&gt;num_cvts; idx++)</div><div class='del'>-		if (hinfo-&gt;nid == spec-&gt;cvt[idx])</div><div class='del'>-			break;</div><div class='del'>-	if (snd_BUG_ON(idx &gt;= spec-&gt;num_cvts) ||</div><div class='del'>-	    snd_BUG_ON(idx &gt;= spec-&gt;num_pins))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* save the PCM info the codec provides */</div><div class='del'>-	codec_pars = &amp;spec-&gt;codec_pcm_pars[idx];</div><div class='del'>-	if (!codec_pars-&gt;rates)</div><div class='del'>-		*codec_pars = *hinfo;</div><div class='del'>-</div><div class='del'>-	eld = &amp;spec-&gt;sink_eld[idx];</div><div class='del'>-	if (eld-&gt;sad_count &gt; 0) {</div><div class='del'>-		hdmi_eld_update_pcm_info(eld, hinfo, codec_pars);</div><div class='del'>-		if (hinfo-&gt;channels_min &gt; hinfo-&gt;channels_max ||</div><div class='del'>-		    !hinfo-&gt;rates || !hinfo-&gt;formats)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	} else {</div><div class='del'>-		/* fallback to the codec default */</div><div class='del'>-		hinfo-&gt;channels_min = codec_pars-&gt;channels_min;</div><div class='del'>-		hinfo-&gt;channels_max = codec_pars-&gt;channels_max;</div><div class='del'>-		hinfo-&gt;rates = codec_pars-&gt;rates;</div><div class='del'>-		hinfo-&gt;formats = codec_pars-&gt;formats;</div><div class='del'>-		hinfo-&gt;maxbps = codec_pars-&gt;maxbps;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HDA/HDMI auto parsing</div><div class='del'>- */</div><div class='del'>-static int hdmi_read_pin_conn(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t conn_list[HDA_MAX_CONNECTIONS];</div><div class='del'>-	int conn_len, curr;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	if (!(get_wcaps(codec, pin_nid) &amp; AC_WCAP_CONN_LIST)) {</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			   "HDMI: pin %d wcaps %#x "</div><div class='del'>-			   "does not support connection list\n",</div><div class='del'>-			   pin_nid, get_wcaps(codec, pin_nid));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	conn_len = snd_hda_get_connections(codec, pin_nid, conn_list,</div><div class='del'>-					   HDA_MAX_CONNECTIONS);</div><div class='del'>-	if (conn_len &gt; 1)</div><div class='del'>-		curr = snd_hda_codec_read(codec, pin_nid, 0,</div><div class='del'>-					  AC_VERB_GET_CONNECT_SEL, 0);</div><div class='del'>-	else</div><div class='del'>-		curr = 0;</div><div class='del'>-</div><div class='del'>-	index = hda_node_index(spec-&gt;pin, pin_nid);</div><div class='del'>-	if (index &lt; 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spec-&gt;pin_cvt[index] = conn_list[curr];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,</div><div class='del'>-			       struct hdmi_eld *eld)</div><div class='del'>-{</div><div class='del'>-	int present = snd_hda_pin_sense(codec, pin_nid);</div><div class='del'>-</div><div class='del'>-	eld-&gt;monitor_present	= !!(present &amp; AC_PINSENSE_PRESENCE);</div><div class='del'>-	eld-&gt;eld_valid		= !!(present &amp; AC_PINSENSE_ELDV);</div><div class='del'>-</div><div class='del'>-	if (present &amp; AC_PINSENSE_ELDV)</div><div class='del'>-		hdmi_get_show_eld(codec, pin_nid, eld);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;num_pins &gt;= MAX_HDMI_PINS) {</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			   "HDMI: no space for pin %d\n", pin_nid);</div><div class='del'>-		return -E2BIG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdmi_present_sense(codec, pin_nid, &amp;spec-&gt;sink_eld[spec-&gt;num_pins]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;pin[spec-&gt;num_pins] = pin_nid;</div><div class='del'>-	spec-&gt;num_pins++;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * It is assumed that converter nodes come first in the node list and</div><div class='del'>-	 * hence have been registered and usable now.</div><div class='del'>-	 */</div><div class='del'>-	return hdmi_read_pin_conn(codec, pin_nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;num_cvts &gt;= MAX_HDMI_CVTS) {</div><div class='del'>-		snd_printk(KERN_WARNING</div><div class='del'>-			   "HDMI: no space for converter %d\n", nid);</div><div class='del'>-		return -E2BIG;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;cvt[spec-&gt;num_cvts] = nid;</div><div class='del'>-	spec-&gt;num_cvts++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hdmi_parse_codec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, nodes;</div><div class='del'>-</div><div class='del'>-	nodes = snd_hda_get_sub_nodes(codec, codec-&gt;afg, &amp;nid);</div><div class='del'>-	if (!nid || nodes &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING "HDMI: failed to get afg sub nodes\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nodes; i++, nid++) {</div><div class='del'>-		unsigned int caps;</div><div class='del'>-		unsigned int type;</div><div class='del'>-</div><div class='del'>-		caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);</div><div class='del'>-		type = get_wcaps_type(caps);</div><div class='del'>-</div><div class='del'>-		if (!(caps &amp; AC_WCAP_DIGITAL))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		switch (type) {</div><div class='del'>-		case AC_WID_AUD_OUT:</div><div class='del'>-			hdmi_add_cvt(codec, nid);</div><div class='del'>-			break;</div><div class='del'>-		case AC_WID_PIN:</div><div class='del'>-			caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);</div><div class='del'>-			if (!(caps &amp; (AC_PINCAP_HDMI | AC_PINCAP_DP)))</div><div class='del'>-				continue;</div><div class='del'>-			hdmi_add_pin(codec, nid);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event</div><div class='del'>-	 * can be lost and presence sense verb will become inaccurate if the</div><div class='del'>-	 * HDA link is powered off at hot plug or hw initialization time.</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!(snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_POWER_STATE) &amp;</div><div class='del'>-	      AC_PWRST_EPSS))</div><div class='del'>-		codec-&gt;bus-&gt;power_keep_link_on = 1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static char *generic_hdmi_pcm_names[MAX_HDMI_CVTS] = {</div><div class='del'>-	"HDMI 0",</div><div class='del'>-	"HDMI 1",</div><div class='del'>-	"HDMI 2",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * HDMI callbacks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   unsigned int stream_tag,</div><div class='del'>-					   unsigned int format,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	hdmi_set_channel_count(codec, hinfo-&gt;nid,</div><div class='del'>-			       substream-&gt;runtime-&gt;channels);</div><div class='del'>-</div><div class='del'>-	hdmi_setup_audio_infoframe(codec, hinfo-&gt;nid, substream);</div><div class='del'>-</div><div class='del'>-	return hdmi_setup_stream(codec, hinfo-&gt;nid, stream_tag, format);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream generic_hdmi_pcm_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = hdmi_pcm_open,</div><div class='del'>-		.prepare = generic_hdmi_playback_pcm_prepare,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int generic_hdmi_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = spec-&gt;num_cvts;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_pcms; i++, info++) {</div><div class='del'>-		unsigned int chans;</div><div class='del'>-		struct hda_pcm_stream *pstr;</div><div class='del'>-</div><div class='del'>-		chans = get_wcaps(codec, spec-&gt;cvt[i]);</div><div class='del'>-		chans = get_wcaps_channels(chans);</div><div class='del'>-</div><div class='del'>-		info-&gt;name = generic_hdmi_pcm_names[i];</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_HDMI;</div><div class='del'>-		pstr = &amp;info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK];</div><div class='del'>-		if (spec-&gt;pcm_playback)</div><div class='del'>-			*pstr = *spec-&gt;pcm_playback;</div><div class='del'>-		else</div><div class='del'>-			*pstr = generic_hdmi_pcm_playback;</div><div class='del'>-		pstr-&gt;nid = spec-&gt;cvt[i];</div><div class='del'>-		if (pstr-&gt;channels_max &lt;= 2 &amp;&amp; chans &amp;&amp; chans &lt;= 16)</div><div class='del'>-			pstr-&gt;channels_max = chans;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int generic_hdmi_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; codec-&gt;num_pcms; i++) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;cvt[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int generic_hdmi_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; spec-&gt;pin[i]; i++) {</div><div class='del'>-		hdmi_enable_output(codec, spec-&gt;pin[i]);</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;pin[i], 0,</div><div class='del'>-				    AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				    AC_USRSP_EN | spec-&gt;pin[i]);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void generic_hdmi_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pins; i++)</div><div class='del'>-		snd_hda_eld_proc_free(codec, &amp;spec-&gt;sink_eld[i]);</div><div class='del'>-</div><div class='del'>-	kfree(spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops generic_hdmi_patch_ops = {</div><div class='del'>-	.init			= generic_hdmi_init,</div><div class='del'>-	.free			= generic_hdmi_free,</div><div class='del'>-	.build_pcms		= generic_hdmi_build_pcms,</div><div class='del'>-	.build_controls		= generic_hdmi_build_controls,</div><div class='del'>-	.unsol_event		= hdmi_unsol_event,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_generic_hdmi(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	if (hdmi_parse_codec(codec) &lt; 0) {</div><div class='del'>-		codec-&gt;spec = NULL;</div><div class='del'>-		kfree(spec);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	codec-&gt;patch_ops = generic_hdmi_patch_ops;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pins; i++)</div><div class='del'>-		snd_hda_eld_proc_new(codec, &amp;spec-&gt;sink_eld[i], i);</div><div class='del'>-</div><div class='del'>-	init_channel_allocations();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Nvidia specific implementations</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define Nv_VERB_SET_Channel_Allocation          0xF79</div><div class='del'>-#define Nv_VERB_SET_Info_Frame_Checksum         0xF7A</div><div class='del'>-#define Nv_VERB_SET_Audio_Protection_On         0xF98</div><div class='del'>-#define Nv_VERB_SET_Audio_Protection_Off        0xF99</div><div class='del'>-</div><div class='del'>-#define nvhdmi_master_con_nid_7x	0x04</div><div class='del'>-#define nvhdmi_master_pin_nid_7x	0x05</div><div class='del'>-</div><div class='del'>-static hda_nid_t nvhdmi_con_nids_7x[4] = {</div><div class='del'>-	/*front, rear, clfe, rear_surr */</div><div class='del'>-	0x6, 0x8, 0xa, 0xc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb nvhdmi_basic_init_7x[] = {</div><div class='del'>-	/* set audio protect on */</div><div class='del'>-	{ 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},</div><div class='del'>-	/* enable digital output on pin widget */</div><div class='del'>-	{ 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='del'>-	{ 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='del'>-	{ 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='del'>-	{ 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='del'>-	{ 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef LIMITED_RATE_FMT_SUPPORT</div><div class='del'>-/* support only the safe format and rate */</div><div class='del'>-#define SUPPORTED_RATES		SNDRV_PCM_RATE_48000</div><div class='del'>-#define SUPPORTED_MAXBPS	16</div><div class='del'>-#define SUPPORTED_FORMATS	SNDRV_PCM_FMTBIT_S16_LE</div><div class='del'>-#else</div><div class='del'>-/* support all rates and formats */</div><div class='del'>-#define SUPPORTED_RATES \</div><div class='del'>-	(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\</div><div class='del'>-	SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\</div><div class='del'>-	 SNDRV_PCM_RATE_192000)</div><div class='del'>-#define SUPPORTED_MAXBPS	24</div><div class='del'>-#define SUPPORTED_FORMATS \</div><div class='del'>-	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int nvhdmi_7x_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	snd_hda_sequence_write(codec, nvhdmi_basic_init_7x);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int simple_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int simple_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-				     struct hda_codec *codec,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int simple_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-					     stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nvhdmi_8ch_7x_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x,</div><div class='del'>-			0, AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		/* set the stream id */</div><div class='del'>-		snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,</div><div class='del'>-				AC_VERB_SET_CHANNEL_STREAMID, 0);</div><div class='del'>-		/* set the stream format */</div><div class='del'>-		snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,</div><div class='del'>-				AC_VERB_SET_STREAM_FORMAT, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				     struct hda_codec *codec,</div><div class='del'>-				     unsigned int stream_tag,</div><div class='del'>-				     unsigned int format,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	int chs;</div><div class='del'>-	unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-</div><div class='del'>-	chs = substream-&gt;runtime-&gt;channels;</div><div class='del'>-	chan = chs ? (chs - 1) : 1;</div><div class='del'>-</div><div class='del'>-	switch (chs) {</div><div class='del'>-	default:</div><div class='del'>-	case 0:</div><div class='del'>-	case 2:</div><div class='del'>-		chanmask = 0x00;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		chanmask = 0x08;</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		chanmask = 0x0b;</div><div class='del'>-		break;</div><div class='del'>-	case 8:</div><div class='del'>-		chanmask = 0x13;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;</div><div class='del'>-	dataDCC2 = 0x2;</div><div class='del'>-</div><div class='del'>-	/* set the Audio InforFrame Channel Allocation */</div><div class='del'>-	snd_hda_codec_write(codec, 0x1, 0,</div><div class='del'>-			Nv_VERB_SET_Channel_Allocation, chanmask);</div><div class='del'>-</div><div class='del'>-	/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */</div><div class='del'>-	if (codec-&gt;spdif_status_reset &amp;&amp; (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE))</div><div class='del'>-		snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_master_con_nid_7x,</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-				codec-&gt;spdif_ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* set the stream id */</div><div class='del'>-	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,</div><div class='del'>-			AC_VERB_SET_CHANNEL_STREAMID, (stream_tag &lt;&lt; 4) | 0x0);</div><div class='del'>-</div><div class='del'>-	/* set the stream format */</div><div class='del'>-	snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,</div><div class='del'>-			AC_VERB_SET_STREAM_FORMAT, format);</div><div class='del'>-</div><div class='del'>-	/* turn on again (if needed) */</div><div class='del'>-	/* enable and set the channel status audio/data flag */</div><div class='del'>-	if (codec-&gt;spdif_status_reset &amp;&amp; (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE)) {</div><div class='del'>-		snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_master_con_nid_7x,</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-				codec-&gt;spdif_ctls &amp; 0xff);</div><div class='del'>-		snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_master_con_nid_7x,</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		if (chs == 2)</div><div class='del'>-			channel_id = 0;</div><div class='del'>-		else</div><div class='del'>-			channel_id = i * 2;</div><div class='del'>-</div><div class='del'>-		/* turn off SPDIF once;</div><div class='del'>-		 *otherwise the IEC958 bits won't be updated</div><div class='del'>-		 */</div><div class='del'>-		if (codec-&gt;spdif_status_reset &amp;&amp;</div><div class='del'>-		(codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE))</div><div class='del'>-			snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_con_nids_7x[i],</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-				codec-&gt;spdif_ctls &amp; ~AC_DIG1_ENABLE &amp; 0xff);</div><div class='del'>-		/* set the stream id */</div><div class='del'>-		snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_con_nids_7x[i],</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_CHANNEL_STREAMID,</div><div class='del'>-				(stream_tag &lt;&lt; 4) | channel_id);</div><div class='del'>-		/* set the stream format */</div><div class='del'>-		snd_hda_codec_write(codec,</div><div class='del'>-				nvhdmi_con_nids_7x[i],</div><div class='del'>-				0,</div><div class='del'>-				AC_VERB_SET_STREAM_FORMAT,</div><div class='del'>-				format);</div><div class='del'>-		/* turn on again (if needed) */</div><div class='del'>-		/* enable and set the channel status audio/data flag */</div><div class='del'>-		if (codec-&gt;spdif_status_reset &amp;&amp;</div><div class='del'>-		(codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE)) {</div><div class='del'>-			snd_hda_codec_write(codec,</div><div class='del'>-					nvhdmi_con_nids_7x[i],</div><div class='del'>-					0,</div><div class='del'>-					AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-					codec-&gt;spdif_ctls &amp; 0xff);</div><div class='del'>-			snd_hda_codec_write(codec,</div><div class='del'>-					nvhdmi_con_nids_7x[i],</div><div class='del'>-					0,</div><div class='del'>-					AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set the Audio Info Frame Checksum */</div><div class='del'>-	snd_hda_codec_write(codec, 0x1, 0,</div><div class='del'>-			Nv_VERB_SET_Info_Frame_Checksum,</div><div class='del'>-			(0x71 - chan - chanmask));</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = nvhdmi_master_con_nid_7x,</div><div class='del'>-	.rates = SUPPORTED_RATES,</div><div class='del'>-	.maxbps = SUPPORTED_MAXBPS,</div><div class='del'>-	.formats = SUPPORTED_FORMATS,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = simple_playback_pcm_open,</div><div class='del'>-		.close = nvhdmi_8ch_7x_pcm_close,</div><div class='del'>-		.prepare = nvhdmi_8ch_7x_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = nvhdmi_master_con_nid_7x,</div><div class='del'>-	.rates = SUPPORTED_RATES,</div><div class='del'>-	.maxbps = SUPPORTED_MAXBPS,</div><div class='del'>-	.formats = SUPPORTED_FORMATS,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = simple_playback_pcm_open,</div><div class='del'>-		.close = simple_playback_pcm_close,</div><div class='del'>-		.prepare = simple_playback_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {</div><div class='del'>-	.build_controls = generic_hdmi_build_controls,</div><div class='del'>-	.build_pcms = generic_hdmi_build_pcms,</div><div class='del'>-	.init = nvhdmi_7x_init,</div><div class='del'>-	.free = generic_hdmi_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops nvhdmi_patch_ops_2ch = {</div><div class='del'>-	.build_controls = generic_hdmi_build_controls,</div><div class='del'>-	.build_pcms = generic_hdmi_build_pcms,</div><div class='del'>-	.init = nvhdmi_7x_init,</div><div class='del'>-	.free = generic_hdmi_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_nvhdmi_8ch_89(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec;</div><div class='del'>-	int err = patch_generic_hdmi(codec);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;old_pin_detect = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_nvhdmi_2ch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = 0;  /* no analog */</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = nvhdmi_master_con_nid_7x;</div><div class='del'>-	spec-&gt;old_pin_detect = 1;</div><div class='del'>-	spec-&gt;num_cvts = 1;</div><div class='del'>-	spec-&gt;cvt[0] = nvhdmi_master_con_nid_7x;</div><div class='del'>-	spec-&gt;pcm_playback = &amp;nvhdmi_pcm_playback_2ch;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = nvhdmi_patch_ops_2ch;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec;</div><div class='del'>-	int err = patch_nvhdmi_2ch(codec);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;multiout.max_channels = 8;</div><div class='del'>-	spec-&gt;pcm_playback = &amp;nvhdmi_pcm_playback_8ch_7x;</div><div class='del'>-	codec-&gt;patch_ops = nvhdmi_patch_ops_8ch_7x;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ATI-specific implementations</div><div class='del'>- *</div><div class='del'>- * FIXME: we may omit the whole this and use the generic code once after</div><div class='del'>- * it's confirmed to work.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ATIHDMI_CVT_NID		0x02	/* audio converter */</div><div class='del'>-#define ATIHDMI_PIN_NID		0x03	/* HDMI output pin */</div><div class='del'>-</div><div class='del'>-static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					unsigned int stream_tag,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-	int chans = substream-&gt;runtime-&gt;channels;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	err = simple_playback_pcm_prepare(hinfo, codec, stream_tag, format,</div><div class='del'>-					  substream);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	snd_hda_codec_write(codec, spec-&gt;cvt[0], 0, AC_VERB_SET_CVT_CHAN_COUNT,</div><div class='del'>-			    chans - 1);</div><div class='del'>-	/* FIXME: XXX */</div><div class='del'>-	for (i = 0; i &lt; chans; i++) {</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;cvt[0], 0,</div><div class='del'>-				    AC_VERB_SET_HDMI_CHAN_SLOT,</div><div class='del'>-				    (i &lt;&lt; 4) | i);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream atihdmi_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = ATIHDMI_CVT_NID,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = simple_playback_pcm_open,</div><div class='del'>-		.close = simple_playback_pcm_close,</div><div class='del'>-		.prepare = atihdmi_playback_pcm_prepare</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb atihdmi_basic_init[] = {</div><div class='del'>-	/* enable digital output on pin widget */</div><div class='del'>-	{ 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int atihdmi_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_sequence_write(codec, atihdmi_basic_init);</div><div class='del'>-	/* SI codec requires to unmute the pin */</div><div class='del'>-	if (get_wcaps(codec, spec-&gt;pin[0]) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;pin[0], 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    AMP_OUT_UNMUTE);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops atihdmi_patch_ops = {</div><div class='del'>-	.build_controls = generic_hdmi_build_controls,</div><div class='del'>-	.build_pcms = generic_hdmi_build_pcms,</div><div class='del'>-	.init = atihdmi_init,</div><div class='del'>-	.free = generic_hdmi_free,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int patch_atihdmi(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct hdmi_spec *spec;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = 0;	  /* no analog */</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = ATIHDMI_CVT_NID;</div><div class='del'>-	spec-&gt;num_cvts = 1;</div><div class='del'>-	spec-&gt;cvt[0] = ATIHDMI_CVT_NID;</div><div class='del'>-	spec-&gt;pin[0] = ATIHDMI_PIN_NID;</div><div class='del'>-	spec-&gt;pcm_playback = &amp;atihdmi_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = atihdmi_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_hdmi[] = {</div><div class='del'>-{ .id = 0x1002793c, .name = "RS600 HDMI",	.patch = patch_atihdmi },</div><div class='del'>-{ .id = 0x10027919, .name = "RS600 HDMI",	.patch = patch_atihdmi },</div><div class='del'>-{ .id = 0x1002791a, .name = "RS690/780 HDMI",	.patch = patch_atihdmi },</div><div class='del'>-{ .id = 0x1002aa01, .name = "R6xx HDMI",	.patch = patch_atihdmi },</div><div class='del'>-{ .id = 0x10951390, .name = "SiI1390 HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x10951392, .name = "SiI1392 HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x17e80047, .name = "Chrontel HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x10de0002, .name = "MCP77/78 HDMI",	.patch = patch_nvhdmi_8ch_7x },</div><div class='del'>-{ .id = 0x10de0003, .name = "MCP77/78 HDMI",	.patch = patch_nvhdmi_8ch_7x },</div><div class='del'>-{ .id = 0x10de0005, .name = "MCP77/78 HDMI",	.patch = patch_nvhdmi_8ch_7x },</div><div class='del'>-{ .id = 0x10de0006, .name = "MCP77/78 HDMI",	.patch = patch_nvhdmi_8ch_7x },</div><div class='del'>-{ .id = 0x10de0007, .name = "MCP79/7A HDMI",	.patch = patch_nvhdmi_8ch_7x },</div><div class='del'>-{ .id = 0x10de000a, .name = "GPU 0a HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de000b, .name = "GPU 0b HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de000c, .name = "MCP89 HDMI",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de000d, .name = "GPU 0d HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0010, .name = "GPU 10 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0011, .name = "GPU 11 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0012, .name = "GPU 12 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0013, .name = "GPU 13 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0014, .name = "GPU 14 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0018, .name = "GPU 18 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0019, .name = "GPU 19 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de001a, .name = "GPU 1a HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de001b, .name = "GPU 1b HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de001c, .name = "GPU 1c HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0040, .name = "GPU 40 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0041, .name = "GPU 41 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0042, .name = "GPU 42 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0043, .name = "GPU 43 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0044, .name = "GPU 44 HDMI/DP",	.patch = patch_nvhdmi_8ch_89 },</div><div class='del'>-{ .id = 0x10de0067, .name = "MCP67 HDMI",	.patch = patch_nvhdmi_2ch },</div><div class='del'>-{ .id = 0x10de8001, .name = "MCP73 HDMI",	.patch = patch_nvhdmi_2ch },</div><div class='del'>-{ .id = 0x80860054, .name = "IbexPeak HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x80862801, .name = "Bearlake HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x80862802, .name = "Cantiga HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x80862803, .name = "Eaglelake HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x80862804, .name = "IbexPeak HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x80862805, .name = "CougarPoint HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{ .id = 0x808629fb, .name = "Crestline HDMI",	.patch = patch_generic_hdmi },</div><div class='del'>-{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1002793c");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10027919");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1002791a");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1002aa01");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10951390");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10951392");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0002");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0003");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0005");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0006");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0007");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de000a");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de000b");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de000c");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de000d");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0010");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0011");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0012");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0013");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0014");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0018");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0019");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de001a");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de001b");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de001c");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0040");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0041");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0042");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0043");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0044");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de0067");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10de8001");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:17e80047");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80860054");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80862801");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80862802");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80862803");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80862804");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:80862805");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:808629fb");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("HDMI HD-audio codec");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-intelhdmi");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-nvhdmi");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-atihdmi");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list intel_list = {</div><div class='del'>-	.preset = snd_hda_preset_hdmi,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_hdmi_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;intel_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_hdmi_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;intel_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_hdmi_init)</div><div class='del'>-module_exit(patch_hdmi_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c<br/>deleted file mode 100644<br/>index 5f00589cb791..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_realtek.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_realtek.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19942 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * HD audio interface patch for ALC 260/880/882 codecs</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2004 Kailang Yang &lt;kailang@realtek.com.tw&gt;</div><div class='del'>- *                    PeiSen Hou &lt;pshou@realtek.com.tw&gt;</div><div class='del'>- *                    Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *                    Jonathan Woithe &lt;jwoithe@physics.adelaide.edu.au&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/jack.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-</div><div class='del'>-#define ALC880_FRONT_EVENT		0x01</div><div class='del'>-#define ALC880_DCVOL_EVENT		0x02</div><div class='del'>-#define ALC880_HP_EVENT			0x04</div><div class='del'>-#define ALC880_MIC_EVENT		0x08</div><div class='del'>-</div><div class='del'>-/* ALC880 board config type */</div><div class='del'>-enum {</div><div class='del'>-	ALC880_3ST,</div><div class='del'>-	ALC880_3ST_DIG,</div><div class='del'>-	ALC880_5ST,</div><div class='del'>-	ALC880_5ST_DIG,</div><div class='del'>-	ALC880_W810,</div><div class='del'>-	ALC880_Z71V,</div><div class='del'>-	ALC880_6ST,</div><div class='del'>-	ALC880_6ST_DIG,</div><div class='del'>-	ALC880_F1734,</div><div class='del'>-	ALC880_ASUS,</div><div class='del'>-	ALC880_ASUS_DIG,</div><div class='del'>-	ALC880_ASUS_W1V,</div><div class='del'>-	ALC880_ASUS_DIG2,</div><div class='del'>-	ALC880_FUJITSU,</div><div class='del'>-	ALC880_UNIWILL_DIG,</div><div class='del'>-	ALC880_UNIWILL,</div><div class='del'>-	ALC880_UNIWILL_P53,</div><div class='del'>-	ALC880_CLEVO,</div><div class='del'>-	ALC880_TCL_S700,</div><div class='del'>-	ALC880_LG,</div><div class='del'>-	ALC880_LG_LW,</div><div class='del'>-	ALC880_MEDION_RIM,</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	ALC880_TEST,</div><div class='del'>-#endif</div><div class='del'>-	ALC880_AUTO,</div><div class='del'>-	ALC880_MODEL_LAST /* last tag */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC260 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC260_BASIC,</div><div class='del'>-	ALC260_HP,</div><div class='del'>-	ALC260_HP_DC7600,</div><div class='del'>-	ALC260_HP_3013,</div><div class='del'>-	ALC260_FUJITSU_S702X,</div><div class='del'>-	ALC260_ACER,</div><div class='del'>-	ALC260_WILL,</div><div class='del'>-	ALC260_REPLACER_672V,</div><div class='del'>-	ALC260_FAVORIT100,</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	ALC260_TEST,</div><div class='del'>-#endif</div><div class='del'>-	ALC260_AUTO,</div><div class='del'>-	ALC260_MODEL_LAST /* last tag */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC262 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC262_BASIC,</div><div class='del'>-	ALC262_HIPPO,</div><div class='del'>-	ALC262_HIPPO_1,</div><div class='del'>-	ALC262_FUJITSU,</div><div class='del'>-	ALC262_HP_BPC,</div><div class='del'>-	ALC262_HP_BPC_D7000_WL,</div><div class='del'>-	ALC262_HP_BPC_D7000_WF,</div><div class='del'>-	ALC262_HP_TC_T5735,</div><div class='del'>-	ALC262_HP_RP5700,</div><div class='del'>-	ALC262_BENQ_ED8,</div><div class='del'>-	ALC262_SONY_ASSAMD,</div><div class='del'>-	ALC262_BENQ_T31,</div><div class='del'>-	ALC262_ULTRA,</div><div class='del'>-	ALC262_LENOVO_3000,</div><div class='del'>-	ALC262_NEC,</div><div class='del'>-	ALC262_TOSHIBA_S06,</div><div class='del'>-	ALC262_TOSHIBA_RX1,</div><div class='del'>-	ALC262_TYAN,</div><div class='del'>-	ALC262_AUTO,</div><div class='del'>-	ALC262_MODEL_LAST /* last tag */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC268 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC267_QUANTA_IL1,</div><div class='del'>-	ALC268_3ST,</div><div class='del'>-	ALC268_TOSHIBA,</div><div class='del'>-	ALC268_ACER,</div><div class='del'>-	ALC268_ACER_DMIC,</div><div class='del'>-	ALC268_ACER_ASPIRE_ONE,</div><div class='del'>-	ALC268_DELL,</div><div class='del'>-	ALC268_ZEPTO,</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	ALC268_TEST,</div><div class='del'>-#endif</div><div class='del'>-	ALC268_AUTO,</div><div class='del'>-	ALC268_MODEL_LAST /* last tag */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC269 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC269_BASIC,</div><div class='del'>-	ALC269_QUANTA_FL1,</div><div class='del'>-	ALC269_AMIC,</div><div class='del'>-	ALC269_DMIC,</div><div class='del'>-	ALC269VB_AMIC,</div><div class='del'>-	ALC269VB_DMIC,</div><div class='del'>-	ALC269_FUJITSU,</div><div class='del'>-	ALC269_LIFEBOOK,</div><div class='del'>-	ALC271_ACER,</div><div class='del'>-	ALC269_AUTO,</div><div class='del'>-	ALC269_MODEL_LAST /* last tag */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC861 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC861_3ST,</div><div class='del'>-	ALC660_3ST,</div><div class='del'>-	ALC861_3ST_DIG,</div><div class='del'>-	ALC861_6ST_DIG,</div><div class='del'>-	ALC861_UNIWILL_M31,</div><div class='del'>-	ALC861_TOSHIBA,</div><div class='del'>-	ALC861_ASUS,</div><div class='del'>-	ALC861_ASUS_LAPTOP,</div><div class='del'>-	ALC861_AUTO,</div><div class='del'>-	ALC861_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC861-VD models */</div><div class='del'>-enum {</div><div class='del'>-	ALC660VD_3ST,</div><div class='del'>-	ALC660VD_3ST_DIG,</div><div class='del'>-	ALC660VD_ASUS_V1S,</div><div class='del'>-	ALC861VD_3ST,</div><div class='del'>-	ALC861VD_3ST_DIG,</div><div class='del'>-	ALC861VD_6ST_DIG,</div><div class='del'>-	ALC861VD_LENOVO,</div><div class='del'>-	ALC861VD_DALLAS,</div><div class='del'>-	ALC861VD_HP,</div><div class='del'>-	ALC861VD_AUTO,</div><div class='del'>-	ALC861VD_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC662 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC662_3ST_2ch_DIG,</div><div class='del'>-	ALC662_3ST_6ch_DIG,</div><div class='del'>-	ALC662_3ST_6ch,</div><div class='del'>-	ALC662_5ST_DIG,</div><div class='del'>-	ALC662_LENOVO_101E,</div><div class='del'>-	ALC662_ASUS_EEEPC_P701,</div><div class='del'>-	ALC662_ASUS_EEEPC_EP20,</div><div class='del'>-	ALC663_ASUS_M51VA,</div><div class='del'>-	ALC663_ASUS_G71V,</div><div class='del'>-	ALC663_ASUS_H13,</div><div class='del'>-	ALC663_ASUS_G50V,</div><div class='del'>-	ALC662_ECS,</div><div class='del'>-	ALC663_ASUS_MODE1,</div><div class='del'>-	ALC662_ASUS_MODE2,</div><div class='del'>-	ALC663_ASUS_MODE3,</div><div class='del'>-	ALC663_ASUS_MODE4,</div><div class='del'>-	ALC663_ASUS_MODE5,</div><div class='del'>-	ALC663_ASUS_MODE6,</div><div class='del'>-	ALC663_ASUS_MODE7,</div><div class='del'>-	ALC663_ASUS_MODE8,</div><div class='del'>-	ALC272_DELL,</div><div class='del'>-	ALC272_DELL_ZM1,</div><div class='del'>-	ALC272_SAMSUNG_NC10,</div><div class='del'>-	ALC662_AUTO,</div><div class='del'>-	ALC662_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC882 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC882_3ST_DIG,</div><div class='del'>-	ALC882_6ST_DIG,</div><div class='del'>-	ALC882_ARIMA,</div><div class='del'>-	ALC882_W2JC,</div><div class='del'>-	ALC882_TARGA,</div><div class='del'>-	ALC882_ASUS_A7J,</div><div class='del'>-	ALC882_ASUS_A7M,</div><div class='del'>-	ALC885_MACPRO,</div><div class='del'>-	ALC885_MBA21,</div><div class='del'>-	ALC885_MBP3,</div><div class='del'>-	ALC885_MB5,</div><div class='del'>-	ALC885_MACMINI3,</div><div class='del'>-	ALC885_IMAC24,</div><div class='del'>-	ALC885_IMAC91,</div><div class='del'>-	ALC883_3ST_2ch_DIG,</div><div class='del'>-	ALC883_3ST_6ch_DIG,</div><div class='del'>-	ALC883_3ST_6ch,</div><div class='del'>-	ALC883_6ST_DIG,</div><div class='del'>-	ALC883_TARGA_DIG,</div><div class='del'>-	ALC883_TARGA_2ch_DIG,</div><div class='del'>-	ALC883_TARGA_8ch_DIG,</div><div class='del'>-	ALC883_ACER,</div><div class='del'>-	ALC883_ACER_ASPIRE,</div><div class='del'>-	ALC888_ACER_ASPIRE_4930G,</div><div class='del'>-	ALC888_ACER_ASPIRE_6530G,</div><div class='del'>-	ALC888_ACER_ASPIRE_8930G,</div><div class='del'>-	ALC888_ACER_ASPIRE_7730G,</div><div class='del'>-	ALC883_MEDION,</div><div class='del'>-	ALC883_MEDION_MD2,</div><div class='del'>-	ALC883_MEDION_WIM2160,</div><div class='del'>-	ALC883_LAPTOP_EAPD,</div><div class='del'>-	ALC883_LENOVO_101E_2ch,</div><div class='del'>-	ALC883_LENOVO_NB0763,</div><div class='del'>-	ALC888_LENOVO_MS7195_DIG,</div><div class='del'>-	ALC888_LENOVO_SKY,</div><div class='del'>-	ALC883_HAIER_W66,</div><div class='del'>-	ALC888_3ST_HP,</div><div class='del'>-	ALC888_6ST_DELL,</div><div class='del'>-	ALC883_MITAC,</div><div class='del'>-	ALC883_CLEVO_M540R,</div><div class='del'>-	ALC883_CLEVO_M720,</div><div class='del'>-	ALC883_FUJITSU_PI2515,</div><div class='del'>-	ALC888_FUJITSU_XA3530,</div><div class='del'>-	ALC883_3ST_6ch_INTEL,</div><div class='del'>-	ALC889A_INTEL,</div><div class='del'>-	ALC889_INTEL,</div><div class='del'>-	ALC888_ASUS_M90V,</div><div class='del'>-	ALC888_ASUS_EEE1601,</div><div class='del'>-	ALC889A_MB31,</div><div class='del'>-	ALC1200_ASUS_P5Q,</div><div class='del'>-	ALC883_SONY_VAIO_TT,</div><div class='del'>-	ALC882_AUTO,</div><div class='del'>-	ALC882_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ALC680 models */</div><div class='del'>-enum {</div><div class='del'>-	ALC680_BASE,</div><div class='del'>-	ALC680_AUTO,</div><div class='del'>-	ALC680_MODEL_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* for GPIO Poll */</div><div class='del'>-#define GPIO_MASK	0x03</div><div class='del'>-</div><div class='del'>-/* extra amp-initialization sequence types */</div><div class='del'>-enum {</div><div class='del'>-	ALC_INIT_NONE,</div><div class='del'>-	ALC_INIT_DEFAULT,</div><div class='del'>-	ALC_INIT_GPIO1,</div><div class='del'>-	ALC_INIT_GPIO2,</div><div class='del'>-	ALC_INIT_GPIO3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct alc_mic_route {</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	unsigned char mux_idx;</div><div class='del'>-	unsigned char amix_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct alc_jack {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int type;</div><div class='del'>-	struct snd_jack *jack;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MUX_IDX_UNDEF	((unsigned char)-1)</div><div class='del'>-</div><div class='del'>-struct alc_customize_define {</div><div class='del'>-	unsigned int  sku_cfg;</div><div class='del'>-	unsigned char port_connectivity;</div><div class='del'>-	unsigned char check_sum;</div><div class='del'>-	unsigned char customization;</div><div class='del'>-	unsigned char external_amp;</div><div class='del'>-	unsigned int  enable_pcbeep:1;</div><div class='del'>-	unsigned int  platform_type:1;</div><div class='del'>-	unsigned int  swap:1;</div><div class='del'>-	unsigned int  override:1;</div><div class='del'>-	unsigned int  fixup:1; /* Means that this sku is set by driver, not read from hw */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct alc_spec {</div><div class='del'>-	/* codec parameterization */</div><div class='del'>-	struct snd_kcontrol_new *mixers[5];	/* mixer arrays */</div><div class='del'>-	unsigned int num_mixers;</div><div class='del'>-	struct snd_kcontrol_new *cap_mixer;	/* capture mixer */</div><div class='del'>-	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */</div><div class='del'>-</div><div class='del'>-	const struct hda_verb *init_verbs[10];	/* initialization verbs</div><div class='del'>-						 * don't forget NULL</div><div class='del'>-						 * termination!</div><div class='del'>-						 */</div><div class='del'>-	unsigned int num_init_verbs;</div><div class='del'>-</div><div class='del'>-	char stream_name_analog[32];	/* analog PCM stream */</div><div class='del'>-	struct hda_pcm_stream *stream_analog_playback;</div><div class='del'>-	struct hda_pcm_stream *stream_analog_capture;</div><div class='del'>-	struct hda_pcm_stream *stream_analog_alt_playback;</div><div class='del'>-	struct hda_pcm_stream *stream_analog_alt_capture;</div><div class='del'>-</div><div class='del'>-	char stream_name_digital[32];	/* digital PCM stream */</div><div class='del'>-	struct hda_pcm_stream *stream_digital_playback;</div><div class='del'>-	struct hda_pcm_stream *stream_digital_capture;</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_multi_out multiout;	/* playback set-up</div><div class='del'>-					 * max_channels, dacs must be set</div><div class='del'>-					 * dig_out_nid and hp_nid are optional</div><div class='del'>-					 */</div><div class='del'>-	hda_nid_t alt_dac_nid;</div><div class='del'>-	hda_nid_t slave_dig_outs[3];	/* optional - for auto-parsing */</div><div class='del'>-	int dig_out_type;</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	unsigned int num_adc_nids;</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t *capsrc_nids;</div><div class='del'>-	hda_nid_t dig_in_nid;		/* digital-in NID; optional */</div><div class='del'>-</div><div class='del'>-	/* capture setup for dynamic dual-adc switch */</div><div class='del'>-	unsigned int cur_adc_idx;</div><div class='del'>-	hda_nid_t cur_adc;</div><div class='del'>-	unsigned int cur_adc_stream_tag;</div><div class='del'>-	unsigned int cur_adc_format;</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	unsigned int num_mux_defs;</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	unsigned int cur_mux[3];</div><div class='del'>-	struct alc_mic_route ext_mic;</div><div class='del'>-	struct alc_mic_route int_mic;</div><div class='del'>-</div><div class='del'>-	/* channel model */</div><div class='del'>-	const struct hda_channel_mode *channel_mode;</div><div class='del'>-	int num_channel_mode;</div><div class='del'>-	int need_dac_fix;</div><div class='del'>-	int const_channel_count;</div><div class='del'>-	int ext_channel_count;</div><div class='del'>-</div><div class='del'>-	/* PCM information */</div><div class='del'>-	struct hda_pcm pcm_rec[3];	/* used in alc_build_pcms() */</div><div class='del'>-</div><div class='del'>-	/* jack detection */</div><div class='del'>-	struct snd_array jacks;</div><div class='del'>-</div><div class='del'>-	/* dynamic controls, init_verbs and input_mux */</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct alc_customize_define cdefine;</div><div class='del'>-	struct snd_array kctls;</div><div class='del'>-	struct hda_input_mux private_imux[3];</div><div class='del'>-	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	hda_nid_t private_adc_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-	hda_nid_t private_capsrc_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-</div><div class='del'>-	/* hooks */</div><div class='del'>-	void (*init_hook)(struct hda_codec *codec);</div><div class='del'>-	void (*unsol_event)(struct hda_codec *codec, unsigned int res);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	void (*power_hook)(struct hda_codec *codec);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* for pin sensing */</div><div class='del'>-	unsigned int sense_updated: 1;</div><div class='del'>-	unsigned int jack_present: 1;</div><div class='del'>-	unsigned int master_sw: 1;</div><div class='del'>-	unsigned int auto_mic:1;</div><div class='del'>-</div><div class='del'>-	/* other flags */</div><div class='del'>-	unsigned int no_analog :1; /* digital I/O only */</div><div class='del'>-	unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */</div><div class='del'>-	int init_amp;</div><div class='del'>-	int codec_variant;	/* flag for other variants */</div><div class='del'>-</div><div class='del'>-	/* for virtual master */</div><div class='del'>-	hda_nid_t vmaster_nid;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	struct hda_loopback_check loopback;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* for PLL fix */</div><div class='del'>-	hda_nid_t pll_nid;</div><div class='del'>-	unsigned int pll_coef_idx, pll_coef_bit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration template - to be copied to the spec instance</div><div class='del'>- */</div><div class='del'>-struct alc_config_preset {</div><div class='del'>-	struct snd_kcontrol_new *mixers[5]; /* should be identical size</div><div class='del'>-					     * with spec</div><div class='del'>-					     */</div><div class='del'>-	struct snd_kcontrol_new *cap_mixer; /* capture mixer */</div><div class='del'>-	const struct hda_verb *init_verbs[5];</div><div class='del'>-	unsigned int num_dacs;</div><div class='del'>-	hda_nid_t *dac_nids;</div><div class='del'>-	hda_nid_t dig_out_nid;		/* optional */</div><div class='del'>-	hda_nid_t hp_nid;		/* optional */</div><div class='del'>-	hda_nid_t *slave_dig_outs;</div><div class='del'>-	unsigned int num_adc_nids;</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t *capsrc_nids;</div><div class='del'>-	hda_nid_t dig_in_nid;</div><div class='del'>-	unsigned int num_channel_mode;</div><div class='del'>-	const struct hda_channel_mode *channel_mode;</div><div class='del'>-	int need_dac_fix;</div><div class='del'>-	int const_channel_count;</div><div class='del'>-	unsigned int num_mux_defs;</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	void (*unsol_event)(struct hda_codec *, unsigned int);</div><div class='del'>-	void (*setup)(struct hda_codec *);</div><div class='del'>-	void (*init_hook)(struct hda_codec *);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	struct hda_amp_list *loopbacks;</div><div class='del'>-	void (*power_hook)(struct hda_codec *codec);</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX handling</div><div class='del'>- */</div><div class='del'>-static int alc_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;uinfo-&gt;id);</div><div class='del'>-	if (mux_idx &gt;= spec-&gt;num_mux_defs)</div><div class='del'>-		mux_idx = 0;</div><div class='del'>-	if (!spec-&gt;input_mux[mux_idx].num_items &amp;&amp; mux_idx &gt; 0)</div><div class='del'>-		mux_idx = 0;</div><div class='del'>-	return snd_hda_input_mux_info(&amp;spec-&gt;input_mux[mux_idx], uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct hda_input_mux *imux;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	unsigned int mux_idx;</div><div class='del'>-	hda_nid_t nid = spec-&gt;capsrc_nids ?</div><div class='del'>-		spec-&gt;capsrc_nids[adc_idx] : spec-&gt;adc_nids[adc_idx];</div><div class='del'>-	unsigned int type;</div><div class='del'>-</div><div class='del'>-	mux_idx = adc_idx &gt;= spec-&gt;num_mux_defs ? 0 : adc_idx;</div><div class='del'>-	imux = &amp;spec-&gt;input_mux[mux_idx];</div><div class='del'>-	if (!imux-&gt;num_items &amp;&amp; mux_idx &gt; 0)</div><div class='del'>-		imux = &amp;spec-&gt;input_mux[0];</div><div class='del'>-</div><div class='del'>-	type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='del'>-	if (type == AC_WID_AUD_MIX) {</div><div class='del'>-		/* Matrix-mixer style (e.g. ALC882) */</div><div class='del'>-		unsigned int *cur_val = &amp;spec-&gt;cur_mux[adc_idx];</div><div class='del'>-		unsigned int i, idx;</div><div class='del'>-</div><div class='del'>-		idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-		if (idx &gt;= imux-&gt;num_items)</div><div class='del'>-			idx = imux-&gt;num_items - 1;</div><div class='del'>-		if (*cur_val == idx)</div><div class='del'>-			return 0;</div><div class='del'>-		for (i = 0; i &lt; imux-&gt;num_items; i++) {</div><div class='del'>-			unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,</div><div class='del'>-						 imux-&gt;items[i].index,</div><div class='del'>-						 HDA_AMP_MUTE, v);</div><div class='del'>-		}</div><div class='del'>-		*cur_val = idx;</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* MUX style (e.g. ALC880) */</div><div class='del'>-		return snd_hda_input_mux_put(codec, imux, ucontrol, nid,</div><div class='del'>-					     &amp;spec-&gt;cur_mux[adc_idx]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * channel mode setting</div><div class='del'>- */</div><div class='del'>-static int alc_ch_mode_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_info(codec, uinfo, spec-&gt;channel_mode,</div><div class='del'>-				    spec-&gt;num_channel_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_ch_mode_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_ch_mode_get(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				   spec-&gt;num_channel_mode,</div><div class='del'>-				   spec-&gt;ext_channel_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err = snd_hda_ch_mode_put(codec, ucontrol, spec-&gt;channel_mode,</div><div class='del'>-				      spec-&gt;num_channel_mode,</div><div class='del'>-				      &amp;spec-&gt;ext_channel_count);</div><div class='del'>-	if (err &gt;= 0 &amp;&amp; !spec-&gt;const_channel_count) {</div><div class='del'>-		spec-&gt;multiout.max_channels = spec-&gt;ext_channel_count;</div><div class='del'>-		if (spec-&gt;need_dac_fix)</div><div class='del'>-			spec-&gt;multiout.num_dacs = spec-&gt;multiout.max_channels / 2;</div><div class='del'>-	}</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Control the mode of pin widget settings via the mixer.  "pc" is used</div><div class='del'>- * instead of "%" to avoid consequences of accidently treating the % as</div><div class='del'>- * being part of a format specifier.  Maximum allowed length of a value is</div><div class='del'>- * 63 characters plus NULL terminator.</div><div class='del'>- *</div><div class='del'>- * Note: some retasking pin complexes seem to ignore requests for input</div><div class='del'>- * states other than HiZ (eg: PIN_VREFxx) and revert to HiZ if any of these</div><div class='del'>- * are requested.  Therefore order this list so that this behaviour will not</div><div class='del'>- * cause problems when mixer clients move through the enum sequentially.</div><div class='del'>- * NIDs 0x0f and 0x10 have been observed to have this behaviour as of</div><div class='del'>- * March 2006.</div><div class='del'>- */</div><div class='del'>-static char *alc_pin_mode_names[] = {</div><div class='del'>-	"Mic 50pc bias", "Mic 80pc bias",</div><div class='del'>-	"Line in", "Line out", "Headphone out",</div><div class='del'>-};</div><div class='del'>-static unsigned char alc_pin_mode_values[] = {</div><div class='del'>-	PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP,</div><div class='del'>-};</div><div class='del'>-/* The control can present all 5 options, or it can limit the options based</div><div class='del'>- * in the pin being assumed to be exclusively an input or an output pin.  In</div><div class='del'>- * addition, "input" pins may or may not process the mic bias option</div><div class='del'>- * depending on actual widget capability (NIDs 0x0f and 0x10 don't seem to</div><div class='del'>- * accept requests for bias as of chip versions up to March 2006) and/or</div><div class='del'>- * wiring in the computer.</div><div class='del'>- */</div><div class='del'>-#define ALC_PIN_DIR_IN              0x00</div><div class='del'>-#define ALC_PIN_DIR_OUT             0x01</div><div class='del'>-#define ALC_PIN_DIR_INOUT           0x02</div><div class='del'>-#define ALC_PIN_DIR_IN_NOMICBIAS    0x03</div><div class='del'>-#define ALC_PIN_DIR_INOUT_NOMICBIAS 0x04</div><div class='del'>-</div><div class='del'>-/* Info about the pin modes supported by the different pin direction modes.</div><div class='del'>- * For each direction the minimum and maximum values are given.</div><div class='del'>- */</div><div class='del'>-static signed char alc_pin_mode_dir_info[5][2] = {</div><div class='del'>-	{ 0, 2 },    /* ALC_PIN_DIR_IN */</div><div class='del'>-	{ 3, 4 },    /* ALC_PIN_DIR_OUT */</div><div class='del'>-	{ 0, 4 },    /* ALC_PIN_DIR_INOUT */</div><div class='del'>-	{ 2, 2 },    /* ALC_PIN_DIR_IN_NOMICBIAS */</div><div class='del'>-	{ 2, 4 },    /* ALC_PIN_DIR_INOUT_NOMICBIAS */</div><div class='del'>-};</div><div class='del'>-#define alc_pin_mode_min(_dir) (alc_pin_mode_dir_info[_dir][0])</div><div class='del'>-#define alc_pin_mode_max(_dir) (alc_pin_mode_dir_info[_dir][1])</div><div class='del'>-#define alc_pin_mode_n_items(_dir) \</div><div class='del'>-	(alc_pin_mode_max(_dir)-alc_pin_mode_min(_dir)+1)</div><div class='del'>-</div><div class='del'>-static int alc_pin_mode_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	unsigned int item_num = uinfo-&gt;value.enumerated.item;</div><div class='del'>-	unsigned char dir = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = alc_pin_mode_n_items(dir);</div><div class='del'>-</div><div class='del'>-	if (item_num&lt;alc_pin_mode_min(dir) || item_num&gt;alc_pin_mode_max(dir))</div><div class='del'>-		item_num = alc_pin_mode_min(dir);</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, alc_pin_mode_names[item_num]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_pin_mode_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char dir = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int pinctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						 AC_VERB_GET_PIN_WIDGET_CONTROL,</div><div class='del'>-						 0x00);</div><div class='del'>-</div><div class='del'>-	/* Find enumerated value for current pinctl setting */</div><div class='del'>-	i = alc_pin_mode_min(dir);</div><div class='del'>-	while (i &lt;= alc_pin_mode_max(dir) &amp;&amp; alc_pin_mode_values[i] != pinctl)</div><div class='del'>-		i++;</div><div class='del'>-	*valp = i &lt;= alc_pin_mode_max(dir) ? i: alc_pin_mode_min(dir);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	signed int change;</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char dir = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long val = *ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int pinctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						 AC_VERB_GET_PIN_WIDGET_CONTROL,</div><div class='del'>-						 0x00);</div><div class='del'>-</div><div class='del'>-	if (val &lt; alc_pin_mode_min(dir) || val &gt; alc_pin_mode_max(dir))</div><div class='del'>-		val = alc_pin_mode_min(dir);</div><div class='del'>-</div><div class='del'>-	change = pinctl != alc_pin_mode_values[val];</div><div class='del'>-	if (change) {</div><div class='del'>-		/* Set pin mode to that requested */</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  alc_pin_mode_values[val]);</div><div class='del'>-</div><div class='del'>-		/* Also enable the retasking pin's input/output as required</div><div class='del'>-		 * for the requested pin mode.  Enum values of 2 or less are</div><div class='del'>-		 * input modes.</div><div class='del'>-		 *</div><div class='del'>-		 * Dynamically switching the input/output buffers probably</div><div class='del'>-		 * reduces noise slightly (particularly on input) so we'll</div><div class='del'>-		 * do it.  However, having both input and output buffers</div><div class='del'>-		 * enabled simultaneously doesn't seem to be problematic if</div><div class='del'>-		 * this turns out to be necessary in the future.</div><div class='del'>-		 */</div><div class='del'>-		if (val &lt;= 2) {</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-						 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,</div><div class='del'>-						 HDA_AMP_MUTE, 0);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,</div><div class='del'>-						 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-						 HDA_AMP_MUTE, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC_PIN_MODE(xname, nid, dir) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-	  .info = alc_pin_mode_info, \</div><div class='del'>-	  .get = alc_pin_mode_get, \</div><div class='del'>-	  .put = alc_pin_mode_put, \</div><div class='del'>-	  .private_value = nid | (dir&lt;&lt;16) }</div><div class='del'>-</div><div class='del'>-/* A switch control for ALC260 GPIO pins.  Multiple GPIOs can be ganged</div><div class='del'>- * together using a mask with more than one bit set.  This control is</div><div class='del'>- * currently used only by the ALC260 test model.  At this stage they are not</div><div class='del'>- * needed for any "production" models.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define alc_gpio_data_info	snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int alc_gpio_data_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					      AC_VERB_GET_GPIO_DATA, 0x00);</div><div class='del'>-</div><div class='del'>-	*valp = (val &amp; mask) != 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	signed int change;</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long val = *ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int gpio_data = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						    AC_VERB_GET_GPIO_DATA,</div><div class='del'>-						    0x00);</div><div class='del'>-</div><div class='del'>-	/* Set/unset the masked GPIO bit(s) as needed */</div><div class='del'>-	change = (val == 0 ? 0 : mask) != (gpio_data &amp; mask);</div><div class='del'>-	if (val == 0)</div><div class='del'>-		gpio_data &amp;= ~mask;</div><div class='del'>-	else</div><div class='del'>-		gpio_data |= mask;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-				  AC_VERB_SET_GPIO_DATA, gpio_data);</div><div class='del'>-</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-#define ALC_GPIO_DATA_SWITCH(xname, nid, mask) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-	  .info = alc_gpio_data_info, \</div><div class='del'>-	  .get = alc_gpio_data_get, \</div><div class='del'>-	  .put = alc_gpio_data_put, \</div><div class='del'>-	  .private_value = nid | (mask&lt;&lt;16) }</div><div class='del'>-#endif   /* CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='del'>-/* A switch control to allow the enabling of the digital IO pins on the</div><div class='del'>- * ALC260.  This is incredibly simplistic; the intention of this control is</div><div class='del'>- * to provide something in the test model allowing digital outputs to be</div><div class='del'>- * identified if present.  If models are found which can utilise these</div><div class='del'>- * outputs a more complete mixer control can be devised for those models if</div><div class='del'>- * necessary.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define alc_spdif_ctrl_info	snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					      AC_VERB_GET_DIGI_CONVERT_1, 0x00);</div><div class='del'>-</div><div class='del'>-	*valp = (val &amp; mask) != 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	signed int change;</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long val = *ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int ctrl_data = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						    AC_VERB_GET_DIGI_CONVERT_1,</div><div class='del'>-						    0x00);</div><div class='del'>-</div><div class='del'>-	/* Set/unset the masked control bit(s) as needed */</div><div class='del'>-	change = (val == 0 ? 0 : mask) != (ctrl_data &amp; mask);</div><div class='del'>-	if (val==0)</div><div class='del'>-		ctrl_data &amp;= ~mask;</div><div class='del'>-	else</div><div class='del'>-		ctrl_data |= mask;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-				  ctrl_data);</div><div class='del'>-</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-#define ALC_SPDIF_CTRL_SWITCH(xname, nid, mask) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-	  .info = alc_spdif_ctrl_info, \</div><div class='del'>-	  .get = alc_spdif_ctrl_get, \</div><div class='del'>-	  .put = alc_spdif_ctrl_put, \</div><div class='del'>-	  .private_value = nid | (mask&lt;&lt;16) }</div><div class='del'>-#endif   /* CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='del'>-/* A switch control to allow the enabling EAPD digital outputs on the ALC26x.</div><div class='del'>- * Again, this is only used in the ALC26x test models to help identify when</div><div class='del'>- * the EAPD line must be asserted for features to work.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-#define alc_eapd_ctrl_info	snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int alc_eapd_ctrl_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int val = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					      AC_VERB_GET_EAPD_BTLENABLE, 0x00);</div><div class='del'>-</div><div class='del'>-	*valp = (val &amp; mask) != 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_eapd_ctrl_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	int change;</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xffff;</div><div class='del'>-	unsigned char mask = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	long val = *ucontrol-&gt;value.integer.value;</div><div class='del'>-	unsigned int ctrl_data = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-						    AC_VERB_GET_EAPD_BTLENABLE,</div><div class='del'>-						    0x00);</div><div class='del'>-</div><div class='del'>-	/* Set/unset the masked control bit(s) as needed */</div><div class='del'>-	change = (!val ? 0 : mask) != (ctrl_data &amp; mask);</div><div class='del'>-	if (!val)</div><div class='del'>-		ctrl_data &amp;= ~mask;</div><div class='del'>-	else</div><div class='del'>-		ctrl_data |= mask;</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-				  ctrl_data);</div><div class='del'>-</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC_EAPD_CTRL_SWITCH(xname, nid, mask) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \</div><div class='del'>-	  .subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-	  .info = alc_eapd_ctrl_info, \</div><div class='del'>-	  .get = alc_eapd_ctrl_get, \</div><div class='del'>-	  .put = alc_eapd_ctrl_put, \</div><div class='del'>-	  .private_value = nid | (mask&lt;&lt;16) }</div><div class='del'>-#endif   /* CONFIG_SND_DEBUG */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set up the input pin config (depending on the given auto-pin type)</div><div class='del'>- */</div><div class='del'>-static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			      int auto_pin_type)</div><div class='del'>-{</div><div class='del'>-	unsigned int val = PIN_IN;</div><div class='del'>-</div><div class='del'>-	if (auto_pin_type == AUTO_PIN_MIC) {</div><div class='del'>-		unsigned int pincap;</div><div class='del'>-		unsigned int oldval;</div><div class='del'>-		oldval = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-		pincap = (pincap &amp; AC_PINCAP_VREF) &gt;&gt; AC_PINCAP_VREF_SHIFT;</div><div class='del'>-		/* if the default pin setup is vref50, we give it priority */</div><div class='del'>-		if ((pincap &amp; AC_PINCAP_VREF_80) &amp;&amp; oldval != PIN_VREF50)</div><div class='del'>-			val = PIN_VREF80;</div><div class='del'>-		else if (pincap &amp; AC_PINCAP_VREF_50)</div><div class='del'>-			val = PIN_VREF50;</div><div class='del'>-		else if (pincap &amp; AC_PINCAP_VREF_100)</div><div class='del'>-			val = PIN_VREF100;</div><div class='del'>-		else if (pincap &amp; AC_PINCAP_VREF_GRD)</div><div class='del'>-			val = PIN_VREFGRD;</div><div class='del'>-	}</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_fixup_autocfg_pin_nums(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;line_outs) {</div><div class='del'>-		while (cfg-&gt;line_outs &lt; AUTO_CFG_MAX_OUTS &amp;&amp;</div><div class='del'>-		       cfg-&gt;line_out_pins[cfg-&gt;line_outs])</div><div class='del'>-			cfg-&gt;line_outs++;</div><div class='del'>-	}</div><div class='del'>-	if (!cfg-&gt;speaker_outs) {</div><div class='del'>-		while (cfg-&gt;speaker_outs &lt; AUTO_CFG_MAX_OUTS &amp;&amp;</div><div class='del'>-		       cfg-&gt;speaker_pins[cfg-&gt;speaker_outs])</div><div class='del'>-			cfg-&gt;speaker_outs++;</div><div class='del'>-	}</div><div class='del'>-	if (!cfg-&gt;hp_outs) {</div><div class='del'>-		while (cfg-&gt;hp_outs &lt; AUTO_CFG_MAX_OUTS &amp;&amp;</div><div class='del'>-		       cfg-&gt;hp_pins[cfg-&gt;hp_outs])</div><div class='del'>-			cfg-&gt;hp_outs++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static void add_mixer(struct alc_spec *spec, struct snd_kcontrol_new *mix)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(spec-&gt;num_mixers &gt;= ARRAY_SIZE(spec-&gt;mixers)))</div><div class='del'>-		return;</div><div class='del'>-	spec-&gt;mixers[spec-&gt;num_mixers++] = mix;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void add_verb(struct alc_spec *spec, const struct hda_verb *verb)</div><div class='del'>-{</div><div class='del'>-	if (snd_BUG_ON(spec-&gt;num_init_verbs &gt;= ARRAY_SIZE(spec-&gt;init_verbs)))</div><div class='del'>-		return;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_init_verbs++] = verb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set up from the preset table</div><div class='del'>- */</div><div class='del'>-static void setup_preset(struct hda_codec *codec,</div><div class='del'>-			 const struct alc_config_preset *preset)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(preset-&gt;mixers) &amp;&amp; preset-&gt;mixers[i]; i++)</div><div class='del'>-		add_mixer(spec, preset-&gt;mixers[i]);</div><div class='del'>-	spec-&gt;cap_mixer = preset-&gt;cap_mixer;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(preset-&gt;init_verbs) &amp;&amp; preset-&gt;init_verbs[i];</div><div class='del'>-	     i++)</div><div class='del'>-		add_verb(spec, preset-&gt;init_verbs[i]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;channel_mode = preset-&gt;channel_mode;</div><div class='del'>-	spec-&gt;num_channel_mode = preset-&gt;num_channel_mode;</div><div class='del'>-	spec-&gt;need_dac_fix = preset-&gt;need_dac_fix;</div><div class='del'>-	spec-&gt;const_channel_count = preset-&gt;const_channel_count;</div><div class='del'>-</div><div class='del'>-	if (preset-&gt;const_channel_count)</div><div class='del'>-		spec-&gt;multiout.max_channels = preset-&gt;const_channel_count;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;multiout.max_channels = spec-&gt;channel_mode[0].channels;</div><div class='del'>-	spec-&gt;ext_channel_count = spec-&gt;channel_mode[0].channels;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = preset-&gt;num_dacs;</div><div class='del'>-	spec-&gt;multiout.dac_nids = preset-&gt;dac_nids;</div><div class='del'>-	spec-&gt;multiout.dig_out_nid = preset-&gt;dig_out_nid;</div><div class='del'>-	spec-&gt;multiout.slave_dig_outs = preset-&gt;slave_dig_outs;</div><div class='del'>-	spec-&gt;multiout.hp_nid = preset-&gt;hp_nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = preset-&gt;num_mux_defs;</div><div class='del'>-	if (!spec-&gt;num_mux_defs)</div><div class='del'>-		spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = preset-&gt;input_mux;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_adc_nids = preset-&gt;num_adc_nids;</div><div class='del'>-	spec-&gt;adc_nids = preset-&gt;adc_nids;</div><div class='del'>-	spec-&gt;capsrc_nids = preset-&gt;capsrc_nids;</div><div class='del'>-	spec-&gt;dig_in_nid = preset-&gt;dig_in_nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;unsol_event = preset-&gt;unsol_event;</div><div class='del'>-	spec-&gt;init_hook = preset-&gt;init_hook;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;power_hook = preset-&gt;power_hook;</div><div class='del'>-	spec-&gt;loopback.amplist = preset-&gt;loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (preset-&gt;setup)</div><div class='del'>-		preset-&gt;setup(codec);</div><div class='del'>-</div><div class='del'>-	alc_fixup_autocfg_pin_nums(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Enable GPIO mask and set output */</div><div class='del'>-static struct hda_verb alc_gpio1_init_verbs[] = {</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x01},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc_gpio2_init_verbs[] = {</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x02},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc_gpio3_init_verbs[] = {</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x03},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x03},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fix hardware PLL issue</div><div class='del'>- * On some codecs, the analog PLL gating control must be off while</div><div class='del'>- * the default value is 1.</div><div class='del'>- */</div><div class='del'>-static void alc_fix_pll(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;pll_nid)</div><div class='del'>-		return;</div><div class='del'>-	snd_hda_codec_write(codec, spec-&gt;pll_nid, 0, AC_VERB_SET_COEF_INDEX,</div><div class='del'>-			    spec-&gt;pll_coef_idx);</div><div class='del'>-	val = snd_hda_codec_read(codec, spec-&gt;pll_nid, 0,</div><div class='del'>-				 AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-	snd_hda_codec_write(codec, spec-&gt;pll_nid, 0, AC_VERB_SET_COEF_INDEX,</div><div class='del'>-			    spec-&gt;pll_coef_idx);</div><div class='del'>-	snd_hda_codec_write(codec, spec-&gt;pll_nid, 0, AC_VERB_SET_PROC_COEF,</div><div class='del'>-			    val &amp; ~(1 &lt;&lt; spec-&gt;pll_coef_bit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			     unsigned int coef_idx, unsigned int coef_bit)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;pll_nid = nid;</div><div class='del'>-	spec-&gt;pll_coef_idx = coef_idx;</div><div class='del'>-	spec-&gt;pll_coef_bit = coef_bit;</div><div class='del'>-	alc_fix_pll(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-static void alc_free_jack_priv(struct snd_jack *jack)</div><div class='del'>-{</div><div class='del'>-	struct alc_jack *jacks = jack-&gt;private_data;</div><div class='del'>-	jacks-&gt;nid = 0;</div><div class='del'>-	jacks-&gt;jack = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_add_jack(struct hda_codec *codec,</div><div class='del'>-		hda_nid_t nid, int type)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	struct alc_jack *jack;</div><div class='del'>-	const char *name;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = codec-&gt;spec;</div><div class='del'>-	snd_array_init(&amp;spec-&gt;jacks, sizeof(*jack), 32);</div><div class='del'>-	jack = snd_array_new(&amp;spec-&gt;jacks);</div><div class='del'>-	if (!jack)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	jack-&gt;nid = nid;</div><div class='del'>-	jack-&gt;type = type;</div><div class='del'>-	name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;</div><div class='del'>-</div><div class='del'>-	err = snd_jack_new(codec-&gt;bus-&gt;card, name, type, &amp;jack-&gt;jack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	jack-&gt;jack-&gt;private_data = jack;</div><div class='del'>-	jack-&gt;jack-&gt;private_free = alc_free_jack_priv;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_report_jack(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct alc_jack *jacks = spec-&gt;jacks.list;</div><div class='del'>-</div><div class='del'>-	if (jacks) {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;jacks.used; i++) {</div><div class='del'>-			if (jacks-&gt;nid == nid) {</div><div class='del'>-				unsigned int present;</div><div class='del'>-				present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-</div><div class='del'>-				present = (present) ? jacks-&gt;type : 0;</div><div class='del'>-</div><div class='del'>-				snd_jack_report(jacks-&gt;jack, present);</div><div class='del'>-			}</div><div class='del'>-			jacks++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_init_jacks(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int hp_nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	unsigned int mic_nid = spec-&gt;ext_mic.pin;</div><div class='del'>-</div><div class='del'>-	if (hp_nid) {</div><div class='del'>-		err = alc_add_jack(codec, hp_nid, SND_JACK_HEADPHONE);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		alc_report_jack(codec, hp_nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mic_nid) {</div><div class='del'>-		err = alc_add_jack(codec, mic_nid, SND_JACK_MICROPHONE);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		alc_report_jack(codec, mic_nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void alc_report_jack(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int alc_init_jacks(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void alc_automute_speaker(struct hda_codec *codec, int pinctl)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = 0;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;autocfg.hp_pins); i++) {</div><div class='del'>-		nid = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			break;</div><div class='del'>-		if (snd_hda_jack_detect(codec, nid)) {</div><div class='del'>-			spec-&gt;jack_present = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		alc_report_jack(codec, spec-&gt;autocfg.hp_pins[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mute = spec-&gt;jack_present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	/* Toggle internal speakers muting */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;autocfg.speaker_pins); i++) {</div><div class='del'>-		nid = spec-&gt;autocfg.speaker_pins[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			break;</div><div class='del'>-		if (pinctl) {</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    spec-&gt;jack_present ? 0 : PIN_OUT);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, mute);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_automute_pin(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_speaker(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,</div><div class='del'>-				hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t conn[HDA_MAX_NUM_INPUTS];</div><div class='del'>-	int i, nums;</div><div class='del'>-</div><div class='del'>-	nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));</div><div class='del'>-	for (i = 0; i &lt; nums; i++)</div><div class='del'>-		if (conn[i] == nid)</div><div class='del'>-			return i;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* switch the current ADC according to the jack state */</div><div class='del'>-static void alc_dual_mic_adc_auto_switch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int present;</div><div class='del'>-	hda_nid_t new_adc;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, spec-&gt;ext_mic.pin);</div><div class='del'>-	if (present)</div><div class='del'>-		spec-&gt;cur_adc_idx = 1;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;cur_adc_idx = 0;</div><div class='del'>-	new_adc = spec-&gt;adc_nids[spec-&gt;cur_adc_idx];</div><div class='del'>-	if (spec-&gt;cur_adc &amp;&amp; spec-&gt;cur_adc != new_adc) {</div><div class='del'>-		/* stream is running, let's swap the current ADC */</div><div class='del'>-		__snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc, 1);</div><div class='del'>-		spec-&gt;cur_adc = new_adc;</div><div class='del'>-		snd_hda_codec_setup_stream(codec, new_adc,</div><div class='del'>-					   spec-&gt;cur_adc_stream_tag, 0,</div><div class='del'>-					   spec-&gt;cur_adc_format);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_mic_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct alc_mic_route *dead, *alive;</div><div class='del'>-	unsigned int present, type;</div><div class='del'>-	hda_nid_t cap_nid;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;auto_mic)</div><div class='del'>-		return;</div><div class='del'>-	if (!spec-&gt;int_mic.pin || !spec-&gt;ext_mic.pin)</div><div class='del'>-		return;</div><div class='del'>-	if (snd_BUG_ON(!spec-&gt;adc_nids))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;dual_adc_switch) {</div><div class='del'>-		alc_dual_mic_adc_auto_switch(codec);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cap_nid = spec-&gt;capsrc_nids ? spec-&gt;capsrc_nids[0] : spec-&gt;adc_nids[0];</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, spec-&gt;ext_mic.pin);</div><div class='del'>-	if (present) {</div><div class='del'>-		alive = &amp;spec-&gt;ext_mic;</div><div class='del'>-		dead = &amp;spec-&gt;int_mic;</div><div class='del'>-	} else {</div><div class='del'>-		alive = &amp;spec-&gt;int_mic;</div><div class='del'>-		dead = &amp;spec-&gt;ext_mic;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	type = get_wcaps_type(get_wcaps(codec, cap_nid));</div><div class='del'>-	if (type == AC_WID_AUD_MIX) {</div><div class='del'>-		/* Matrix-mixer style (e.g. ALC882) */</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,</div><div class='del'>-					 alive-&gt;mux_idx,</div><div class='del'>-					 HDA_AMP_MUTE, 0);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,</div><div class='del'>-					 dead-&gt;mux_idx,</div><div class='del'>-					 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-	} else {</div><div class='del'>-		/* MUX style (e.g. ALC880) */</div><div class='del'>-		snd_hda_codec_write_cache(codec, cap_nid, 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  alive-&gt;mux_idx);</div><div class='del'>-	}</div><div class='del'>-	alc_report_jack(codec, spec-&gt;ext_mic.pin);</div><div class='del'>-</div><div class='del'>-	/* FIXME: analog mixer */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0880)</div><div class='del'>-		res &gt;&gt;= 28;</div><div class='del'>-	else</div><div class='del'>-		res &gt;&gt;= 26;</div><div class='del'>-	switch (res) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc_automute_pin(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_pin(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for ALC888 variants */</div><div class='del'>-static void alc888_coef_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 0);</div><div class='del'>-	tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-	if ((tmp &amp; 0xf0) == 0x20)</div><div class='del'>-		/* alc888S-VC */</div><div class='del'>-		snd_hda_codec_read(codec, 0x20, 0,</div><div class='del'>-				   AC_VERB_SET_PROC_COEF, 0x830);</div><div class='del'>-	 else</div><div class='del'>-		 /* alc888-VB */</div><div class='del'>-		 snd_hda_codec_read(codec, 0x20, 0,</div><div class='del'>-				    AC_VERB_SET_PROC_COEF, 0x3030);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc889_coef_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-	tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF, tmp|0x2010);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* turn on/off EAPD control (only if available) */</div><div class='del'>-static void set_eapd(struct hda_codec *codec, hda_nid_t nid, int on)</div><div class='del'>-{</div><div class='del'>-	if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='del'>-		return;</div><div class='del'>-	if (snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD)</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-				    on ? 2 : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_auto_init_amp(struct hda_codec *codec, int type)</div><div class='del'>-{</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ALC_INIT_GPIO1:</div><div class='del'>-		snd_hda_sequence_write(codec, alc_gpio1_init_verbs);</div><div class='del'>-		break;</div><div class='del'>-	case ALC_INIT_GPIO2:</div><div class='del'>-		snd_hda_sequence_write(codec, alc_gpio2_init_verbs);</div><div class='del'>-		break;</div><div class='del'>-	case ALC_INIT_GPIO3:</div><div class='del'>-		snd_hda_sequence_write(codec, alc_gpio3_init_verbs);</div><div class='del'>-		break;</div><div class='del'>-	case ALC_INIT_DEFAULT:</div><div class='del'>-		switch (codec-&gt;vendor_id) {</div><div class='del'>-		case 0x10ec0260:</div><div class='del'>-			set_eapd(codec, 0x0f, 1);</div><div class='del'>-			set_eapd(codec, 0x10, 1);</div><div class='del'>-			break;</div><div class='del'>-		case 0x10ec0262:</div><div class='del'>-		case 0x10ec0267:</div><div class='del'>-		case 0x10ec0268:</div><div class='del'>-		case 0x10ec0269:</div><div class='del'>-		case 0x10ec0270:</div><div class='del'>-		case 0x10ec0272:</div><div class='del'>-		case 0x10ec0660:</div><div class='del'>-		case 0x10ec0662:</div><div class='del'>-		case 0x10ec0663:</div><div class='del'>-		case 0x10ec0862:</div><div class='del'>-		case 0x10ec0889:</div><div class='del'>-			set_eapd(codec, 0x14, 1);</div><div class='del'>-			set_eapd(codec, 0x15, 1);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		switch (codec-&gt;vendor_id) {</div><div class='del'>-		case 0x10ec0260:</div><div class='del'>-			snd_hda_codec_write(codec, 0x1a, 0,</div><div class='del'>-					    AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-			tmp = snd_hda_codec_read(codec, 0x1a, 0,</div><div class='del'>-						 AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-			snd_hda_codec_write(codec, 0x1a, 0,</div><div class='del'>-					    AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-			snd_hda_codec_write(codec, 0x1a, 0,</div><div class='del'>-					    AC_VERB_SET_PROC_COEF,</div><div class='del'>-					    tmp | 0x2010);</div><div class='del'>-			break;</div><div class='del'>-		case 0x10ec0262:</div><div class='del'>-		case 0x10ec0880:</div><div class='del'>-		case 0x10ec0882:</div><div class='del'>-		case 0x10ec0883:</div><div class='del'>-		case 0x10ec0885:</div><div class='del'>-		case 0x10ec0887:</div><div class='del'>-		case 0x10ec0889:</div><div class='del'>-			alc889_coef_init(codec);</div><div class='del'>-			break;</div><div class='del'>-		case 0x10ec0888:</div><div class='del'>-			alc888_coef_init(codec);</div><div class='del'>-			break;</div><div class='del'>-#if 0 /* XXX: This may cause the silent output on speaker on some machines */</div><div class='del'>-		case 0x10ec0267:</div><div class='del'>-		case 0x10ec0268:</div><div class='del'>-			snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-					    AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-			tmp = snd_hda_codec_read(codec, 0x20, 0,</div><div class='del'>-						 AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-			snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-					    AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-			snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-					    AC_VERB_SET_PROC_COEF,</div><div class='del'>-					    tmp | 0x3000);</div><div class='del'>-			break;</div><div class='del'>-#endif /* XXX */</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_init_auto_hp(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;hp_pins[0]) {</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;speaker_pins[0]) {</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-			return;</div><div class='del'>-		memcpy(cfg-&gt;speaker_pins, cfg-&gt;line_out_pins,</div><div class='del'>-		       sizeof(cfg-&gt;speaker_pins));</div><div class='del'>-		cfg-&gt;speaker_outs = cfg-&gt;line_outs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;hp_pins[0]) {</div><div class='del'>-		memcpy(cfg-&gt;hp_pins, cfg-&gt;line_out_pins,</div><div class='del'>-		       sizeof(cfg-&gt;hp_pins));</div><div class='del'>-		cfg-&gt;hp_outs = cfg-&gt;line_outs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",</div><div class='del'>-			    cfg-&gt;hp_pins[i]);</div><div class='del'>-		snd_hda_codec_write_cache(codec, cfg-&gt;hp_pins[i], 0,</div><div class='del'>-				  AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				  AC_USRSP_EN | ALC880_HP_EVENT);</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;unsol_event = alc_sku_unsol_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_init_auto_mic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t fixed, ext;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* there must be only two mic inputs exclusively */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='del'>-		if (cfg-&gt;inputs[i].type &gt;= AUTO_PIN_LINE_IN)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-	fixed = ext = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		unsigned int defcfg;</div><div class='del'>-		defcfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		switch (snd_hda_get_input_pin_attr(defcfg)) {</div><div class='del'>-		case INPUT_PIN_ATTR_INT:</div><div class='del'>-			if (fixed)</div><div class='del'>-				return; /* already occupied */</div><div class='del'>-			fixed = nid;</div><div class='del'>-			break;</div><div class='del'>-		case INPUT_PIN_ATTR_UNUSED:</div><div class='del'>-			return; /* invalid entry */</div><div class='del'>-		default:</div><div class='del'>-			if (ext)</div><div class='del'>-				return; /* already occupied */</div><div class='del'>-			ext = nid;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!ext || !fixed)</div><div class='del'>-		return;</div><div class='del'>-	if (!(get_wcaps(codec, ext) &amp; AC_WCAP_UNSOL_CAP))</div><div class='del'>-		return; /* no unsol support */</div><div class='del'>-	snd_printdd("realtek: Enable auto-mic switch on NID 0x%x/0x%x\n",</div><div class='del'>-		    ext, fixed);</div><div class='del'>-	spec-&gt;ext_mic.pin = ext;</div><div class='del'>-	spec-&gt;int_mic.pin = fixed;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = MUX_IDX_UNDEF; /* set later */</div><div class='del'>-	spec-&gt;int_mic.mux_idx = MUX_IDX_UNDEF; /* set later */</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-	snd_hda_codec_write_cache(codec, spec-&gt;ext_mic.pin, 0,</div><div class='del'>-				  AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				  AC_USRSP_EN | ALC880_MIC_EVENT);</div><div class='del'>-	spec-&gt;unsol_event = alc_sku_unsol_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Could be any non-zero and even value. When used as fixup, tells</div><div class='del'>- * the driver to ignore any present sku defines.</div><div class='del'>- */</div><div class='del'>-#define ALC_FIXUP_SKU_IGNORE (2)</div><div class='del'>-</div><div class='del'>-static int alc_auto_parse_customize_define(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int ass, tmp, i;</div><div class='del'>-	unsigned nid = 0;</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;cdefine.enable_pcbeep = 1; /* assume always enabled */</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;cdefine.fixup) {</div><div class='del'>-		ass = spec-&gt;cdefine.sku_cfg;</div><div class='del'>-		if (ass == ALC_FIXUP_SKU_IGNORE)</div><div class='del'>-			return -1;</div><div class='del'>-		goto do_sku;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ass = codec-&gt;subsystem_id &amp; 0xffff;</div><div class='del'>-	if (ass != codec-&gt;bus-&gt;pci-&gt;subsystem_device &amp;&amp; (ass &amp; 1))</div><div class='del'>-		goto do_sku;</div><div class='del'>-</div><div class='del'>-	nid = 0x1d;</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0260)</div><div class='del'>-		nid = 0x17;</div><div class='del'>-	ass = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-</div><div class='del'>-	if (!(ass &amp; 1)) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: SKU not ready 0x%08x\n",</div><div class='del'>-		       codec-&gt;chip_name, ass);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check sum */</div><div class='del'>-	tmp = 0;</div><div class='del'>-	for (i = 1; i &lt; 16; i++) {</div><div class='del'>-		if ((ass &gt;&gt; i) &amp; 1)</div><div class='del'>-			tmp++;</div><div class='del'>-	}</div><div class='del'>-	if (((ass &gt;&gt; 16) &amp; 0xf) != tmp)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	spec-&gt;cdefine.port_connectivity = ass &gt;&gt; 30;</div><div class='del'>-	spec-&gt;cdefine.enable_pcbeep = (ass &amp; 0x100000) &gt;&gt; 20;</div><div class='del'>-	spec-&gt;cdefine.check_sum = (ass &gt;&gt; 16) &amp; 0xf;</div><div class='del'>-	spec-&gt;cdefine.customization = ass &gt;&gt; 8;</div><div class='del'>-do_sku:</div><div class='del'>-	spec-&gt;cdefine.sku_cfg = ass;</div><div class='del'>-	spec-&gt;cdefine.external_amp = (ass &amp; 0x38) &gt;&gt; 3;</div><div class='del'>-	spec-&gt;cdefine.platform_type = (ass &amp; 0x4) &gt;&gt; 2;</div><div class='del'>-	spec-&gt;cdefine.swap = (ass &amp; 0x2) &gt;&gt; 1;</div><div class='del'>-	spec-&gt;cdefine.override = ass &amp; 0x1;</div><div class='del'>-</div><div class='del'>-	snd_printd("SKU: Nid=0x%x sku_cfg=0x%08x\n",</div><div class='del'>-		   nid, spec-&gt;cdefine.sku_cfg);</div><div class='del'>-	snd_printd("SKU: port_connectivity=0x%x\n",</div><div class='del'>-		   spec-&gt;cdefine.port_connectivity);</div><div class='del'>-	snd_printd("SKU: enable_pcbeep=0x%x\n", spec-&gt;cdefine.enable_pcbeep);</div><div class='del'>-	snd_printd("SKU: check_sum=0x%08x\n", spec-&gt;cdefine.check_sum);</div><div class='del'>-	snd_printd("SKU: customization=0x%08x\n", spec-&gt;cdefine.customization);</div><div class='del'>-	snd_printd("SKU: external_amp=0x%x\n", spec-&gt;cdefine.external_amp);</div><div class='del'>-	snd_printd("SKU: platform_type=0x%x\n", spec-&gt;cdefine.platform_type);</div><div class='del'>-	snd_printd("SKU: swap=0x%x\n", spec-&gt;cdefine.swap);</div><div class='del'>-	snd_printd("SKU: override=0x%x\n", spec-&gt;cdefine.override);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check subsystem ID and set up device-specific initialization;</div><div class='del'>- * return 1 if initialized, 0 if invalid SSID</div><div class='del'>- */</div><div class='del'>-/* 32-bit subsystem ID for BIOS loading in HD Audio codec.</div><div class='del'>- *	31 ~ 16 :	Manufacture ID</div><div class='del'>- *	15 ~ 8	:	SKU ID</div><div class='del'>- *	7  ~ 0	:	Assembly ID</div><div class='del'>- *	port-A --&gt; pin 39/41, port-E --&gt; pin 14/15, port-D --&gt; pin 35/36</div><div class='del'>- */</div><div class='del'>-static int alc_subsystem_id(struct hda_codec *codec,</div><div class='del'>-			    hda_nid_t porta, hda_nid_t porte,</div><div class='del'>-			    hda_nid_t portd, hda_nid_t porti)</div><div class='del'>-{</div><div class='del'>-	unsigned int ass, tmp, i;</div><div class='del'>-	unsigned nid;</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;cdefine.fixup) {</div><div class='del'>-		ass = spec-&gt;cdefine.sku_cfg;</div><div class='del'>-		if (ass == ALC_FIXUP_SKU_IGNORE)</div><div class='del'>-			return 0;</div><div class='del'>-		goto do_sku;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ass = codec-&gt;subsystem_id &amp; 0xffff;</div><div class='del'>-	if ((ass != codec-&gt;bus-&gt;pci-&gt;subsystem_device) &amp;&amp; (ass &amp; 1))</div><div class='del'>-		goto do_sku;</div><div class='del'>-</div><div class='del'>-	/* invalid SSID, check the special NID pin defcfg instead */</div><div class='del'>-	/*</div><div class='del'>-	 * 31~30	: port connectivity</div><div class='del'>-	 * 29~21	: reserve</div><div class='del'>-	 * 20		: PCBEEP input</div><div class='del'>-	 * 19~16	: Check sum (15:1)</div><div class='del'>-	 * 15~1		: Custom</div><div class='del'>-	 * 0		: override</div><div class='del'>-	*/</div><div class='del'>-	nid = 0x1d;</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0260)</div><div class='del'>-		nid = 0x17;</div><div class='del'>-	ass = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	snd_printd("realtek: No valid SSID, "</div><div class='del'>-		   "checking pincfg 0x%08x for NID 0x%x\n",</div><div class='del'>-		   ass, nid);</div><div class='del'>-	if (!(ass &amp; 1))</div><div class='del'>-		return 0;</div><div class='del'>-	if ((ass &gt;&gt; 30) != 1)	/* no physical connection */</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check sum */</div><div class='del'>-	tmp = 0;</div><div class='del'>-	for (i = 1; i &lt; 16; i++) {</div><div class='del'>-		if ((ass &gt;&gt; i) &amp; 1)</div><div class='del'>-			tmp++;</div><div class='del'>-	}</div><div class='del'>-	if (((ass &gt;&gt; 16) &amp; 0xf) != tmp)</div><div class='del'>-		return 0;</div><div class='del'>-do_sku:</div><div class='del'>-	snd_printd("realtek: Enabling init ASM_ID=0x%04x CODEC_ID=%08x\n",</div><div class='del'>-		   ass &amp; 0xffff, codec-&gt;vendor_id);</div><div class='del'>-	/*</div><div class='del'>-	 * 0 : override</div><div class='del'>-	 * 1 :	Swap Jack</div><div class='del'>-	 * 2 : 0 --&gt; Desktop, 1 --&gt; Laptop</div><div class='del'>-	 * 3~5 : External Amplifier control</div><div class='del'>-	 * 7~6 : Reserved</div><div class='del'>-	*/</div><div class='del'>-	tmp = (ass &amp; 0x38) &gt;&gt; 3;	/* external Amp control */</div><div class='del'>-	switch (tmp) {</div><div class='del'>-	case 1:</div><div class='del'>-		spec-&gt;init_amp = ALC_INIT_GPIO1;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		spec-&gt;init_amp = ALC_INIT_GPIO2;</div><div class='del'>-		break;</div><div class='del'>-	case 7:</div><div class='del'>-		spec-&gt;init_amp = ALC_INIT_GPIO3;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* is laptop or Desktop and enable the function "Mute internal speaker</div><div class='del'>-	 * when the external headphone out jack is plugged"</div><div class='del'>-	 */</div><div class='del'>-	if (!(ass &amp; 0x8000))</div><div class='del'>-		return 1;</div><div class='del'>-	/*</div><div class='del'>-	 * 10~8 : Jack location</div><div class='del'>-	 * 12~11: Headphone out -&gt; 00: PortA, 01: PortE, 02: PortD, 03: Resvered</div><div class='del'>-	 * 14~13: Resvered</div><div class='del'>-	 * 15   : 1 --&gt; enable the function "Mute internal speaker</div><div class='del'>-	 *	        when the external headphone out jack is plugged"</div><div class='del'>-	 */</div><div class='del'>-	if (!spec-&gt;autocfg.hp_pins[0]) {</div><div class='del'>-		hda_nid_t nid;</div><div class='del'>-		tmp = (ass &gt;&gt; 11) &amp; 0x3;	/* HP to chassis */</div><div class='del'>-		if (tmp == 0)</div><div class='del'>-			nid = porta;</div><div class='del'>-		else if (tmp == 1)</div><div class='del'>-			nid = porte;</div><div class='del'>-		else if (tmp == 2)</div><div class='del'>-			nid = portd;</div><div class='del'>-		else if (tmp == 3)</div><div class='del'>-			nid = porti;</div><div class='del'>-		else</div><div class='del'>-			return 1;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='del'>-			if (spec-&gt;autocfg.line_out_pins[i] == nid)</div><div class='del'>-				return 1;</div><div class='del'>-		spec-&gt;autocfg.hp_pins[0] = nid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alc_init_auto_hp(codec);</div><div class='del'>-	alc_init_auto_mic(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_ssid_check(struct hda_codec *codec,</div><div class='del'>-			   hda_nid_t porta, hda_nid_t porte,</div><div class='del'>-			   hda_nid_t portd, hda_nid_t porti)</div><div class='del'>-{</div><div class='del'>-	if (!alc_subsystem_id(codec, porta, porte, portd, porti)) {</div><div class='del'>-		struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-		snd_printd("realtek: "</div><div class='del'>-			   "Enable default setup for auto mode as fallback\n");</div><div class='del'>-		spec-&gt;init_amp = ALC_INIT_DEFAULT;</div><div class='del'>-		alc_init_auto_hp(codec);</div><div class='del'>-		alc_init_auto_mic(codec);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fix-up pin default configurations and add default verbs</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct alc_pincfg {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	u32 val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct alc_fixup {</div><div class='del'>-	unsigned int sku;</div><div class='del'>-	const struct alc_pincfg *pins;</div><div class='del'>-	const struct hda_verb *verbs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc_pick_fixup(struct hda_codec *codec,</div><div class='del'>-			   const struct snd_pci_quirk *quirk,</div><div class='del'>-			   const struct alc_fixup *fix,</div><div class='del'>-			   int pre_init)</div><div class='del'>-{</div><div class='del'>-	const struct alc_pincfg *cfg;</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-</div><div class='del'>-	quirk = snd_pci_quirk_lookup(codec-&gt;bus-&gt;pci, quirk);</div><div class='del'>-	if (!quirk)</div><div class='del'>-		return;</div><div class='del'>-	fix += quirk-&gt;value;</div><div class='del'>-	cfg = fix-&gt;pins;</div><div class='del'>-	if (pre_init &amp;&amp; fix-&gt;sku) {</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: Apply sku override for %s\n",</div><div class='del'>-			    codec-&gt;chip_name, quirk-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		spec = codec-&gt;spec;</div><div class='del'>-		spec-&gt;cdefine.sku_cfg = fix-&gt;sku;</div><div class='del'>-		spec-&gt;cdefine.fixup = 1;</div><div class='del'>-	}</div><div class='del'>-	if (pre_init &amp;&amp; cfg) {</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: Apply pincfg for %s\n",</div><div class='del'>-			    codec-&gt;chip_name, quirk-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		for (; cfg-&gt;nid; cfg++)</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, cfg-&gt;nid, cfg-&gt;val);</div><div class='del'>-	}</div><div class='del'>-	if (!pre_init &amp;&amp; fix-&gt;verbs) {</div><div class='del'>-#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-verbs for %s\n",</div><div class='del'>-			    codec-&gt;chip_name, quirk-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		add_verb(codec-&gt;spec, fix-&gt;verbs);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_read_coef_idx(struct hda_codec *codec,</div><div class='del'>-			unsigned int coef_idx)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX,</div><div class='del'>-		    		coef_idx);</div><div class='del'>-	val = snd_hda_codec_read(codec, 0x20, 0,</div><div class='del'>-			 	AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_write_coef_idx(struct hda_codec *codec, unsigned int coef_idx,</div><div class='del'>-							unsigned int coef_val)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX,</div><div class='del'>-			    coef_idx);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF,</div><div class='del'>-			    coef_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set right pin controls for digital I/O */</div><div class='del'>-static void alc_auto_init_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.dig_outs; i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.dig_out_pins[i];</div><div class='del'>-		if (pin) {</div><div class='del'>-			snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					    PIN_OUT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	pin = spec-&gt;autocfg.dig_in_pin;</div><div class='del'>-	if (pin)</div><div class='del'>-		snd_hda_codec_write(codec, pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    PIN_IN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse digital I/Os and set up NIDs in BIOS auto-parse mode */</div><div class='del'>-static void alc_auto_parse_digital(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, err;</div><div class='del'>-	hda_nid_t dig_nid;</div><div class='del'>-</div><div class='del'>-	/* support multiple SPDIFs; the secondary is set up as a slave */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.dig_outs; i++) {</div><div class='del'>-		err = snd_hda_get_connections(codec,</div><div class='del'>-					      spec-&gt;autocfg.dig_out_pins[i],</div><div class='del'>-					      &amp;dig_nid, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		if (!i) {</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = dig_nid;</div><div class='del'>-			spec-&gt;dig_out_type = spec-&gt;autocfg.dig_out_type[0];</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;multiout.slave_dig_outs = spec-&gt;slave_dig_outs;</div><div class='del'>-			if (i &gt;= ARRAY_SIZE(spec-&gt;slave_dig_outs) - 1)</div><div class='del'>-				break;</div><div class='del'>-			spec-&gt;slave_dig_outs[i - 1] = dig_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin) {</div><div class='del'>-		dig_nid = codec-&gt;start_nid;</div><div class='del'>-		for (i = 0; i &lt; codec-&gt;num_nodes; i++, dig_nid++) {</div><div class='del'>-			unsigned int wcaps = get_wcaps(codec, dig_nid);</div><div class='del'>-			if (get_wcaps_type(wcaps) != AC_WID_AUD_IN)</div><div class='del'>-				continue;</div><div class='del'>-			if (!(wcaps &amp; AC_WCAP_DIGITAL))</div><div class='del'>-				continue;</div><div class='del'>-			if (!(wcaps &amp; AC_WCAP_CONN_LIST))</div><div class='del'>-				continue;</div><div class='del'>-			err = get_connection_index(codec, dig_nid,</div><div class='del'>-						   spec-&gt;autocfg.dig_in_pin);</div><div class='del'>-			if (err &gt;= 0) {</div><div class='del'>-				spec-&gt;dig_in_nid = dig_nid;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC888</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_4ST_ch2_intel_init[] = {</div><div class='del'>-/* Mic-in jack as mic in */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-/* Line-in jack as Line in */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-/* Line-Out as Front */</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_4ST_ch4_intel_init[] = {</div><div class='del'>-/* Mic-in jack as mic in */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-/* Line-in jack as Surround */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-/* Line-Out as Front */</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_4ST_ch6_intel_init[] = {</div><div class='del'>-/* Mic-in jack as CLFE */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-/* Line-in jack as Surround */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-/* Line-Out as CLFE (workaround because Mic-in is not loud enough) */</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_4ST_ch8_intel_init[] = {</div><div class='del'>-/* Mic-in jack as CLFE */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-/* Line-in jack as Surround */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-/* Line-Out as Side */</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {</div><div class='del'>-	{ 2, alc888_4ST_ch2_intel_init },</div><div class='del'>-	{ 4, alc888_4ST_ch4_intel_init },</div><div class='del'>-	{ 6, alc888_4ST_ch6_intel_init },</div><div class='del'>-	{ 8, alc888_4ST_ch8_intel_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC888 Fujitsu Siemens Amillo xa3530</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {</div><div class='del'>-/* Front Mic: set to PIN_IN (empty by default) */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-/* Connect Internal HP to Front */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Connect Bass HP to Front */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Connect Line-Out side jack (SPDIF) to Side */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-/* Connect Mic jack to CLFE */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-/* Connect Line-in jack to Surround */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-/* Connect HP out jack to Front */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Enable unsolicited event for HP jack and Line-out jack */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc_automute_amp(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_speaker(codec, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_automute_amp_unsol_event(struct hda_codec *codec,</div><div class='del'>-					 unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0880)</div><div class='del'>-		res &gt;&gt;= 28;</div><div class='del'>-	else</div><div class='del'>-		res &gt;&gt;= 26;</div><div class='del'>-	if (res == ALC880_HP_EVENT)</div><div class='del'>-		alc_automute_amp(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc889_automute_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x17;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[3] = 0x19;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[4] = 0x1a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc889_intel_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc889_coef_init(codec);</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc888_fujitsu_xa3530_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x17; /* line-out */</div><div class='del'>-	spec-&gt;autocfg.hp_pins[1] = 0x1b; /* hp */</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14; /* speaker */</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x15; /* bass */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC888 Acer Aspire 4930G model</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {</div><div class='del'>-/* Front Mic: set to PIN_IN (empty by default) */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-/* Unselect Front Mic by default in input mixer 3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},</div><div class='del'>-/* Enable unsolicited event for HP jack */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-/* Connect Internal HP to front */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Connect HP out to front */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC888 Acer Aspire 6530G model</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_acer_aspire_6530g_verbs[] = {</div><div class='del'>-/* Route to built-in subwoofer as well as speakers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-/* Bias voltage on for external mic port */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN | PIN_VREF80},</div><div class='del'>-/* Front Mic: set to PIN_IN (empty by default) */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-/* Unselect Front Mic by default in input mixer 3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},</div><div class='del'>-/* Enable unsolicited event for HP jack */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-/* Enable speaker output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-/* Enable headphone output */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC889 Acer Aspire 8930G model</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc889_acer_aspire_8930g_verbs[] = {</div><div class='del'>-/* Front Mic: set to PIN_IN (empty by default) */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-/* Unselect Front Mic by default in input mixer 3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},</div><div class='del'>-/* Enable unsolicited event for HP jack */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-/* Connect Internal Front to Front */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Connect Internal Rear to Rear */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-/* Connect Internal CLFE to CLFE */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-/* Connect HP out to Front */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-/* Enable all DACs */</div><div class='del'>-/*  DAC DISABLE/MUTE 1? */</div><div class='del'>-/*  setting bits 1-5 disables DAC nids 0x02-0x06 apparently. Init=0x38 */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x03},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x0000},</div><div class='del'>-/*  DAC DISABLE/MUTE 2? */</div><div class='del'>-/*  some bit here disables the other DACs. Init=0x4900 */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x08},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x0000},</div><div class='del'>-/* DMIC fix</div><div class='del'>- * This laptop has a stereo digital microphone. The mics are only 1cm apart</div><div class='del'>- * which makes the stereo useless. However, either the mic or the ALC889</div><div class='del'>- * makes the signal become a difference/sum signal instead of standard</div><div class='del'>- * stereo, which is annoying. So instead we flip this bit which makes the</div><div class='del'>- * codec replicate the sum signal to both channels, turning it into a</div><div class='del'>- * normal mono mic.</div><div class='del'>- */</div><div class='del'>-/*  DMIC_CONTROL? Init value = 0x0001 */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x0b},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x0003},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc888_2_capture_sources[2] = {</div><div class='del'>-	/* Front mic only available on one ADC */</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Front Mic", 0xb },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 3,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-		},</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {</div><div class='del'>-	/* Interal mic only available on one ADC */</div><div class='del'>-	{</div><div class='del'>-		.num_items = 5,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Ext Mic", 0x0 },</div><div class='del'>-			{ "Line In", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Input Mix", 0xa },</div><div class='del'>-			{ "Int Mic", 0xb },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Ext Mic", 0x0 },</div><div class='del'>-			{ "Line In", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Input Mix", 0xa },</div><div class='del'>-		},</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc889_capture_sources[3] = {</div><div class='del'>-	/* Digital mic only available on first "ADC" */</div><div class='del'>-	{</div><div class='del'>-		.num_items = 5,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Front Mic", 0xb },</div><div class='del'>-			{ "Input Mix", 0xa },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Input Mix", 0xa },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Input Mix", 0xa },</div><div class='del'>-		},</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc888_base_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,</div><div class='del'>-		HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,</div><div class='del'>-		HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc888_acer_aspire_6530g_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x1b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 3-stack model</div><div class='del'>- *</div><div class='del'>- * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)</div><div class='del'>- * Pin assignment: Front = 0x14, Line-In/Surr = 0x1a, Mic/CLFE = 0x18,</div><div class='del'>- *                 F-Mic = 0x1b, HP = 0x19</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_dac_nids[4] = {</div><div class='del'>-	/* front, rear, clfe, rear_surr */</div><div class='del'>-	0x02, 0x05, 0x04, 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_adc_nids[3] = {</div><div class='del'>-	/* ADC0-2 */</div><div class='del'>-	0x07, 0x08, 0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The datasheet says the node 0x07 is connected from inputs,</div><div class='del'>- * but it shows zero connection in the real implementation on some devices.</div><div class='del'>- * Note: this is a 915GAV bug, fixed on 915GLV</div><div class='del'>- */</div><div class='del'>-static hda_nid_t alc880_adc_nids_alt[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x08, 0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ALC880_DIGOUT_NID	0x06</div><div class='del'>-#define ALC880_DIGIN_NID	0x0a</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x3 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* channel source setting (2/6 channel selection for 3-stack) */</div><div class='del'>-/* 2ch mode */</div><div class='del'>-static struct hda_verb alc880_threestack_ch2_init[] = {</div><div class='del'>-	/* set line-in to input, mute it */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	/* set mic-in to input vref 80%, mute it */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 6ch mode */</div><div class='del'>-static struct hda_verb alc880_threestack_ch6_init[] = {</div><div class='del'>-	/* set line-in to output, unmute it */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	/* set mic-in to output, unmute it */</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc880_threestack_modes[2] = {</div><div class='del'>-	{ 2, alc880_threestack_ch2_init },</div><div class='del'>-	{ 6, alc880_threestack_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_three_stack_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static int alc_cap_vol_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(spec-&gt;adc_nids[0], 3, 0,</div><div class='del'>-						      HDA_INPUT);</div><div class='del'>-	err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='del'>-			   unsigned int size, unsigned int __user *tlv)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(spec-&gt;adc_nids[0], 3, 0,</div><div class='del'>-						      HDA_INPUT);</div><div class='del'>-	err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*getput_call_t)(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_value *ucontrol);</div><div class='del'>-</div><div class='del'>-static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol,</div><div class='del'>-				 getput_call_t func)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	kcontrol-&gt;private_value = HDA_COMPOSE_AMP_VAL(spec-&gt;adc_nids[adc_idx],</div><div class='del'>-						      3, 0, HDA_INPUT);</div><div class='del'>-	err = func(kcontrol, ucontrol);</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;control_mutex);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_cap_vol_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	return alc_cap_getput_caller(kcontrol, ucontrol,</div><div class='del'>-				     snd_hda_mixer_amp_volume_get);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_cap_vol_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	return alc_cap_getput_caller(kcontrol, ucontrol,</div><div class='del'>-				     snd_hda_mixer_amp_volume_put);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-#define alc_cap_sw_info		snd_ctl_boolean_stereo_info</div><div class='del'>-</div><div class='del'>-static int alc_cap_sw_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	return alc_cap_getput_caller(kcontrol, ucontrol,</div><div class='del'>-				     snd_hda_mixer_amp_switch_get);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_cap_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	return alc_cap_getput_caller(kcontrol, ucontrol,</div><div class='del'>-				     snd_hda_mixer_amp_switch_put);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define _DEFINE_CAPMIX(num) \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		.name = "Capture Switch", \</div><div class='del'>-		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE, \</div><div class='del'>-		.count = num, \</div><div class='del'>-		.info = alc_cap_sw_info, \</div><div class='del'>-		.get = alc_cap_sw_get, \</div><div class='del'>-		.put = alc_cap_sw_put, \</div><div class='del'>-	}, \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		.name = "Capture Volume", \</div><div class='del'>-		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | \</div><div class='del'>-			   SNDRV_CTL_ELEM_ACCESS_TLV_READ | \</div><div class='del'>-			   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK), \</div><div class='del'>-		.count = num, \</div><div class='del'>-		.info = alc_cap_vol_info, \</div><div class='del'>-		.get = alc_cap_vol_get, \</div><div class='del'>-		.put = alc_cap_vol_put, \</div><div class='del'>-		.tlv = { .c = alc_cap_vol_tlv }, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define _DEFINE_CAPSRC(num) \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		/* .name = "Capture Source", */ \</div><div class='del'>-		.name = "Input Source", \</div><div class='del'>-		.count = num, \</div><div class='del'>-		.info = alc_mux_enum_info, \</div><div class='del'>-		.get = alc_mux_enum_get, \</div><div class='del'>-		.put = alc_mux_enum_put, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define DEFINE_CAPMIX(num) \</div><div class='del'>-static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \</div><div class='del'>-	_DEFINE_CAPMIX(num),				      \</div><div class='del'>-	_DEFINE_CAPSRC(num),				      \</div><div class='del'>-	{ } /* end */					      \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DEFINE_CAPMIX_NOSRC(num) \</div><div class='del'>-static struct snd_kcontrol_new alc_capture_mixer_nosrc ## num[] = { \</div><div class='del'>-	_DEFINE_CAPMIX(num),					    \</div><div class='del'>-	{ } /* end */						    \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* up to three ADCs */</div><div class='del'>-DEFINE_CAPMIX(1);</div><div class='del'>-DEFINE_CAPMIX(2);</div><div class='del'>-DEFINE_CAPMIX(3);</div><div class='del'>-DEFINE_CAPMIX_NOSRC(1);</div><div class='del'>-DEFINE_CAPMIX_NOSRC(2);</div><div class='del'>-DEFINE_CAPMIX_NOSRC(3);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 5-stack model</div><div class='del'>- *</div><div class='del'>- * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0d),</div><div class='del'>- *      Side = 0x02 (0xd)</div><div class='del'>- * Pin assignment: Front = 0x14, Surr = 0x17, CLFE = 0x16</div><div class='del'>- *                 Line-In/Side = 0x1a, Mic = 0x18, F-Mic = 0x1b, HP = 0x19</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* additional mixers to alc880_three_stack_mixer */</div><div class='del'>-static struct snd_kcontrol_new alc880_five_stack_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* channel source setting (6/8 channel selection for 5-stack) */</div><div class='del'>-/* 6ch mode */</div><div class='del'>-static struct hda_verb alc880_fivestack_ch6_init[] = {</div><div class='del'>-	/* set line-in to input, mute it */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 8ch mode */</div><div class='del'>-static struct hda_verb alc880_fivestack_ch8_init[] = {</div><div class='del'>-	/* set line-in to output, unmute it */</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc880_fivestack_modes[2] = {</div><div class='del'>-	{ 6, alc880_fivestack_ch6_init },</div><div class='del'>-	{ 8, alc880_fivestack_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 6-stack model</div><div class='del'>- *</div><div class='del'>- * DAC: Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e),</div><div class='del'>- *      Side = 0x05 (0x0f)</div><div class='del'>- * Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, Side = 0x17,</div><div class='del'>- *   Mic = 0x18, F-Mic = 0x19, Line = 0x1a, HP = 0x1b</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_6st_dac_nids[4] = {</div><div class='del'>-	/* front, rear, clfe, rear_surr */</div><div class='del'>-	0x02, 0x03, 0x04, 0x05</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_6stack_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fixed 8-channels */</div><div class='del'>-static struct hda_channel_mode alc880_sixstack_modes[1] = {</div><div class='del'>-	{ 8, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_six_stack_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 W810 model</div><div class='del'>- *</div><div class='del'>- * W810 has rear IO for:</div><div class='del'>- * Front (DAC 02)</div><div class='del'>- * Surround (DAC 03)</div><div class='del'>- * Center/LFE (DAC 04)</div><div class='del'>- * Digital out (06)</div><div class='del'>- *</div><div class='del'>- * The system also has a pair of internal speakers, and a headphone jack.</div><div class='del'>- * These are both connected to Line2 on the codec, hence to DAC 02.</div><div class='del'>- *</div><div class='del'>- * There is a variable resistor to control the speaker or headphone</div><div class='del'>- * volume. This is a hardware-only device without a software API.</div><div class='del'>- *</div><div class='del'>- * Plugging headphones in will disable the internal speakers. This is</div><div class='del'>- * implemented in hardware, not via the driver using jack sense. In</div><div class='del'>- * a similar fashion, plugging into the rear socket marked "front" will</div><div class='del'>- * disable both the speakers and headphones.</div><div class='del'>- *</div><div class='del'>- * For input, there's a microphone jack, and an "audio in" jack.</div><div class='del'>- * These may not do anything useful with this driver yet, because I</div><div class='del'>- * haven't setup any initialization verbs for these yet...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_w810_dac_nids[3] = {</div><div class='del'>-	/* front, rear/surround, clfe */</div><div class='del'>-	0x02, 0x03, 0x04</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fixed 6 channels */</div><div class='del'>-static struct hda_channel_mode alc880_w810_modes[1] = {</div><div class='del'>-	{ 6, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */</div><div class='del'>-static struct snd_kcontrol_new alc880_w810_base_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Z710V model</div><div class='del'>- *</div><div class='del'>- * DAC: Front = 0x02 (0x0c), HP = 0x03 (0x0d)</div><div class='del'>- * Pin assignment: Front = 0x14, HP = 0x15, Mic = 0x18, Mic2 = 0x19(?),</div><div class='del'>- *                 Line = 0x1a</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_z71v_dac_nids[1] = {</div><div class='del'>-	0x02</div><div class='del'>-};</div><div class='del'>-#define ALC880_Z71V_HP_DAC	0x03</div><div class='del'>-</div><div class='del'>-/* fixed 2 channels */</div><div class='del'>-static struct hda_channel_mode alc880_2_jack_modes[1] = {</div><div class='del'>-	{ 2, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_z71v_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 F1734 model</div><div class='del'>- *</div><div class='del'>- * DAC: HP = 0x02 (0x0c), Front = 0x03 (0x0d)</div><div class='del'>- * Pin assignment: HP = 0x14, Front = 0x15, Mic = 0x18</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc880_f1734_dac_nids[1] = {</div><div class='del'>-	0x03</div><div class='del'>-};</div><div class='del'>-#define ALC880_F1734_HP_DAC	0x02</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_f1734_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_f1734_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 ASUS model</div><div class='del'>- *</div><div class='del'>- * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)</div><div class='del'>- * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,</div><div class='del'>- *  Mic = 0x18, Line = 0x1a</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define alc880_asus_dac_nids	alc880_w810_dac_nids	/* identical with w810 */</div><div class='del'>-#define alc880_asus_modes	alc880_threestack_modes	/* 2/6 channel mode */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_asus_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 ASUS W1V model</div><div class='del'>- *</div><div class='del'>- * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)</div><div class='del'>- * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,</div><div class='del'>- *  Mic = 0x18, Line = 0x1a, Line2 = 0x1b</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* additional mixers to alc880_asus_mixer */</div><div class='del'>-static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* TCL S700 */</div><div class='del'>-static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0B, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0B, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0B, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0B, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Uniwill */</div><div class='del'>-static struct snd_kcontrol_new alc880_uniwill_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_fujitsu_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * virtual master controls</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * slave controls for virtual master</div><div class='del'>- */</div><div class='del'>-static const char *alc_slave_vols[] = {</div><div class='del'>-	"Front Playback Volume",</div><div class='del'>-	"Surround Playback Volume",</div><div class='del'>-	"Center Playback Volume",</div><div class='del'>-	"LFE Playback Volume",</div><div class='del'>-	"Side Playback Volume",</div><div class='del'>-	"Headphone Playback Volume",</div><div class='del'>-	"Speaker Playback Volume",</div><div class='del'>-	"Mono Playback Volume",</div><div class='del'>-	"Line-Out Playback Volume",</div><div class='del'>-	"PCM Playback Volume",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *alc_slave_sws[] = {</div><div class='del'>-	"Front Playback Switch",</div><div class='del'>-	"Surround Playback Switch",</div><div class='del'>-	"Center Playback Switch",</div><div class='del'>-	"LFE Playback Switch",</div><div class='del'>-	"Side Playback Switch",</div><div class='del'>-	"Headphone Playback Switch",</div><div class='del'>-	"Speaker Playback Switch",</div><div class='del'>-	"Mono Playback Switch",</div><div class='del'>-	"IEC958 Playback Switch",</div><div class='del'>-	"Line-Out Playback Switch",</div><div class='del'>-	"PCM Playback Switch",</div><div class='del'>-	NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * build control elements</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define NID_MAPPING		(-1)</div><div class='del'>-</div><div class='del'>-#define SUBDEV_SPEAKER_		(0 &lt;&lt; 6)</div><div class='del'>-#define SUBDEV_HP_		(1 &lt;&lt; 6)</div><div class='del'>-#define SUBDEV_LINE_		(2 &lt;&lt; 6)</div><div class='del'>-#define SUBDEV_SPEAKER(x)	(SUBDEV_SPEAKER_ | ((x) &amp; 0x3f))</div><div class='del'>-#define SUBDEV_HP(x)		(SUBDEV_HP_ | ((x) &amp; 0x3f))</div><div class='del'>-#define SUBDEV_LINE(x)		(SUBDEV_LINE_ | ((x) &amp; 0x3f))</div><div class='del'>-</div><div class='del'>-static void alc_free_kctls(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-/* additional beep mixers; the actual parameters are overwritten at build */</div><div class='del'>-static struct snd_kcontrol_new alc_beep_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int alc_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct snd_kcontrol *kctl = NULL;</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-	int i, j, err;</div><div class='del'>-	unsigned int u;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;cap_mixer) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;cap_mixer);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec,</div><div class='del'>-						    spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (!spec-&gt;no_analog) {</div><div class='del'>-			err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-							    &amp;spec-&gt;multiout);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-	/* create beep controls if needed */</div><div class='del'>-	if (spec-&gt;beep_amp) {</div><div class='del'>-		struct snd_kcontrol_new *knew;</div><div class='del'>-		for (knew = alc_beep_mixer; knew-&gt;name; knew++) {</div><div class='del'>-			struct snd_kcontrol *kctl;</div><div class='del'>-			kctl = snd_ctl_new1(knew, codec);</div><div class='del'>-			if (!kctl)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			kctl-&gt;private_value = spec-&gt;beep_amp;</div><div class='del'>-			err = snd_hda_ctl_add(codec, 0, kctl);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* if we have no master control, let's create it */</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp;</div><div class='del'>-	    !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {</div><div class='del'>-		unsigned int vmaster_tlv[4];</div><div class='del'>-		snd_hda_set_vmaster_tlv(codec, spec-&gt;vmaster_nid,</div><div class='del'>-					HDA_OUTPUT, vmaster_tlv);</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='del'>-					  vmaster_tlv, alc_slave_vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp;</div><div class='del'>-	    !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='del'>-					  NULL, alc_slave_sws);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign Capture Source enums to NID */</div><div class='del'>-	if (spec-&gt;capsrc_nids || spec-&gt;adc_nids) {</div><div class='del'>-		kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");</div><div class='del'>-		if (!kctl)</div><div class='del'>-			kctl = snd_hda_find_mixer_ctl(codec, "Input Source");</div><div class='del'>-		for (i = 0; kctl &amp;&amp; i &lt; kctl-&gt;count; i++) {</div><div class='del'>-			hda_nid_t *nids = spec-&gt;capsrc_nids;</div><div class='del'>-			if (!nids)</div><div class='del'>-				nids = spec-&gt;adc_nids;</div><div class='del'>-			err = snd_hda_add_nid(codec, kctl, i, nids[i]);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;cap_mixer) {</div><div class='del'>-		const char *kname = kctl ? kctl-&gt;id.name : NULL;</div><div class='del'>-		for (knew = spec-&gt;cap_mixer; knew-&gt;name; knew++) {</div><div class='del'>-			if (kname &amp;&amp; strcmp(knew-&gt;name, kname) == 0)</div><div class='del'>-				continue;</div><div class='del'>-			kctl = snd_hda_find_mixer_ctl(codec, knew-&gt;name);</div><div class='del'>-			for (i = 0; kctl &amp;&amp; i &lt; kctl-&gt;count; i++) {</div><div class='del'>-				err = snd_hda_add_nid(codec, kctl, i,</div><div class='del'>-						      spec-&gt;adc_nids[i]);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* other nid-&gt;control mapping */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		for (knew = spec-&gt;mixers[i]; knew-&gt;name; knew++) {</div><div class='del'>-			if (knew-&gt;iface != NID_MAPPING)</div><div class='del'>-				continue;</div><div class='del'>-			kctl = snd_hda_find_mixer_ctl(codec, knew-&gt;name);</div><div class='del'>-			if (kctl == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			u = knew-&gt;subdevice;</div><div class='del'>-			for (j = 0; j &lt; 4; j++, u &gt;&gt;= 8) {</div><div class='del'>-				nid = u &amp; 0x3f;</div><div class='del'>-				if (nid == 0)</div><div class='del'>-					continue;</div><div class='del'>-				switch (u &amp; 0xc0) {</div><div class='del'>-				case SUBDEV_SPEAKER_:</div><div class='del'>-					nid = spec-&gt;autocfg.speaker_pins[nid];</div><div class='del'>-					break;</div><div class='del'>-				case SUBDEV_LINE_:</div><div class='del'>-					nid = spec-&gt;autocfg.line_out_pins[nid];</div><div class='del'>-					break;</div><div class='del'>-				case SUBDEV_HP_:</div><div class='del'>-					nid = spec-&gt;autocfg.hp_pins[nid];</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				err = snd_hda_add_nid(codec, kctl, 0, nid);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-			u = knew-&gt;private_value;</div><div class='del'>-			for (j = 0; j &lt; 4; j++, u &gt;&gt;= 8) {</div><div class='del'>-				nid = u &amp; 0xff;</div><div class='del'>-				if (nid == 0)</div><div class='del'>-					continue;</div><div class='del'>-				err = snd_hda_add_nid(codec, kctl, 0, nid);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alc_free_kctls(codec); /* no longer needed */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialize the codec volumes, etc</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for front</div><div class='del'>-	 * panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0f)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 3-stack pin configuration:</div><div class='del'>- * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_3stack_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * preset connection lists of input pins</div><div class='del'>-	 * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround</div><div class='del'>-	 */</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set pin mode and muting</div><div class='del'>-	 */</div><div class='del'>-	/* set front pin widgets 0x14 for output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mic2 (as headphone out) for HP output */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line2 (as front mic) pin widget for input and vref at 80% */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 5-stack pin configuration:</div><div class='del'>- * front = 0x14, surround = 0x17, clfe = 0x16, mic = 0x18, HP = 0x19,</div><div class='del'>- * line-in/side = 0x1a, f-mic = 0x1b</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_5stack_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * preset connection lists of input pins</div><div class='del'>-	 * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround</div><div class='del'>-	 */</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/side */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set pin mode and muting</div><div class='del'>-	 */</div><div class='del'>-	/* set pin widgets 0x14-0x17 for output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* unmute pins for output (no gain on this amp) */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mic2 (as headphone out) for HP output */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line2 (as front mic) pin widget for input and vref at 80% */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * W810 pin configuration:</div><div class='del'>- * front = 0x14, surround = 0x15, clfe = 0x16, HP = 0x1b</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_w810_init_verbs[] = {</div><div class='del'>-	/* hphone/speaker input selector: front DAC */</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Z71V pin configuration:</div><div class='del'>- * Speaker-out = 0x14, HP = 0x15, Mic = 0x18, Line-in = 0x1a, Mic2 = 0x1b (?)</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_z71v_init_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6-stack pin configuration:</div><div class='del'>- * front = 0x14, surr = 0x15, clfe = 0x16, side = 0x17, mic = 0x18,</div><div class='del'>- * f-mic = 0x19, line = 0x1a, HP = 0x1b</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_6stack_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Uniwill pin configuration:</div><div class='del'>- * HP = 0x14, InternalSpeaker = 0x15, mic = 0x18, internal mic = 0x19,</div><div class='del'>- * line = 0x1a</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_uniwill_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, */</div><div class='del'>-	/* {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-* Uniwill P53</div><div class='del'>-* HP = 0x14, InternalSpeaker = 0x15, mic = 0x19,</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_uniwill_p53_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_DCVOL_EVENT},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_beep_init_verbs[] = {</div><div class='del'>-	{ 0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* auto-toggle front mic */</div><div class='del'>-static void alc880_uniwill_mic_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>- 	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x18);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	alc880_uniwill_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	/* Looks like the unsol event is incompatible with the standard</div><div class='del'>-	 * definition.  4bit tag is placed at 28 bit!</div><div class='del'>-	 */</div><div class='del'>-	switch (res &gt;&gt; 28) {</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc880_uniwill_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		alc_automute_amp_unsol_event(codec, res);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_p53_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_codec_read(codec, 0x21, 0,</div><div class='del'>-				     AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);</div><div class='del'>-	present &amp;= HDA_AMP_VOLMASK;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_VOLMASK, present);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0d, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_VOLMASK, present);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	/* Looks like the unsol event is incompatible with the standard</div><div class='del'>-	 * definition.  4bit tag is placed at 28 bit!</div><div class='del'>-	 */</div><div class='del'>-	if ((res &gt;&gt; 28) == ALC880_DCVOL_EVENT)</div><div class='del'>-		alc880_uniwill_p53_dcvol_automute(codec);</div><div class='del'>-	else</div><div class='del'>-		alc_automute_amp_unsol_event(codec, res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * F1734 pin configuration:</div><div class='del'>- * HP = 0x14, speaker-out = 0x15, mic = 0x18</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_f1734_init_verbs[] = {</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_DCVOL_EVENT},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ASUS pin configuration:</div><div class='del'>- * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc880_pin_asus_init_verbs[] = {</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Enable GPIO mask and set output */</div><div class='del'>-#define alc880_gpio1_init_verbs	alc_gpio1_init_verbs</div><div class='del'>-#define alc880_gpio2_init_verbs	alc_gpio2_init_verbs</div><div class='del'>-#define alc880_gpio3_init_verbs	alc_gpio3_init_verbs</div><div class='del'>-</div><div class='del'>-/* Clevo m520g init */</div><div class='del'>-static struct hda_verb alc880_pin_clevo_init_verbs[] = {</div><div class='del'>-	/* headphone output */</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* line-out */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Line-in */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* CD */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Mic1 (rear panel) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Mic2 (front panel) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* headphone */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-        /* change to EAPD mode */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3060},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {</div><div class='del'>-	/* change to EAPD mode */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3060},</div><div class='del'>-</div><div class='del'>-	/* Headphone output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Front output*/</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-</div><div class='del'>-	/* change to EAPD mode */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3070},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LG m1 express dual</div><div class='del'>- *</div><div class='del'>- * Pin assignment:</div><div class='del'>- *   Rear Line-In/Out (blue): 0x14</div><div class='del'>- *   Build-in Mic-In: 0x15</div><div class='del'>- *   Speaker-out: 0x17</div><div class='del'>- *   HP-Out (green): 0x1b</div><div class='del'>- *   Mic-In/Out (red): 0x19</div><div class='del'>- *   SPDIF-Out: 0x1e</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* To make 5.1 output working (green=Front, blue=Surr, red=CLFE) */</div><div class='del'>-static hda_nid_t alc880_lg_dac_nids[3] = {</div><div class='del'>-	0x05, 0x02, 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* seems analog CD is not working */</div><div class='del'>-static struct hda_input_mux alc880_lg_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x5 },</div><div class='del'>-		{ "Internal Mic", 0x6 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 2,4,6 channel modes */</div><div class='del'>-static struct hda_verb alc880_lg_ch2_init[] = {</div><div class='del'>-	/* set line-in and mic-in to input */</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_lg_ch4_init[] = {</div><div class='del'>-	/* set line-in to out and mic-in to input */</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_lg_ch6_init[] = {</div><div class='del'>-	/* set line-in and mic-in to output */</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc880_lg_ch_modes[3] = {</div><div class='del'>-	{ 2, alc880_lg_ch2_init },</div><div class='del'>-	{ 4, alc880_lg_ch4_init },</div><div class='del'>-	{ 6, alc880_lg_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_lg_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0d, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0d, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_lg_init_verbs[] = {</div><div class='del'>-	/* set capture source to mic-in */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* mute all amp mixer inputs */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* line-in to input */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* built-in mic */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* speaker-out */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* mic-in to input */</div><div class='del'>-	{0x11, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* HP-out */</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* jack sense */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc880_lg_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * LG LW20</div><div class='del'>- *</div><div class='del'>- * Pin assignment:</div><div class='del'>- *   Speaker-out: 0x14</div><div class='del'>- *   Mic-In: 0x18</div><div class='del'>- *   Built-in Mic-In: 0x19</div><div class='del'>- *   Line-In: 0x1b</div><div class='del'>- *   HP-Out: 0x1a</div><div class='del'>- *   SPDIF-Out: 0x1e</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_lg_lw_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x1 },</div><div class='del'>-		{ "Line In", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc880_lg_lw_modes alc880_threestack_modes</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_lg_lw_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_lg_lw_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */</div><div class='del'>-	{0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */</div><div class='del'>-</div><div class='del'>-	/* set capture source to mic-in */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/* speaker-out */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* HP-out */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* mic-in to input */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* built-in mic */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* jack sense */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc880_lg_lw_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_medion_rim_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_medion_rim_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x1 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_medion_rim_init_verbs[] = {</div><div class='del'>-	{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Mic2 (as headphone out) for HP output */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Internal Speaker */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3060},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc880_medion_rim_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	/* toggle EAPD */</div><div class='del'>-	if (spec-&gt;jack_present)</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);</div><div class='del'>-	else</div><div class='del'>-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_medion_rim_unsol_event(struct hda_codec *codec,</div><div class='del'>-					  unsigned int res)</div><div class='del'>-{</div><div class='del'>-	/* Looks like the unsol event is incompatible with the standard</div><div class='del'>-	 * definition.  4bit tag is placed at 28 bit!</div><div class='del'>-	 */</div><div class='del'>-	if ((res &gt;&gt; 28) == ALC880_HP_EVENT)</div><div class='del'>-		alc880_medion_rim_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_medion_rim_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x1b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list alc880_loopbacks[] = {</div><div class='del'>-	{ 0x0b, HDA_INPUT, 0 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_amp_list alc880_lg_loopbacks[] = {</div><div class='del'>-	{ 0x0b, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 6 },</div><div class='del'>-	{ 0x0b, HDA_INPUT, 7 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common callbacks</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int alc_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	alc_fix_pll(codec);</div><div class='del'>-	alc_auto_init_amp(codec, spec-&gt;init_amp);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_init_verbs; i++)</div><div class='del'>-		snd_hda_sequence_write(codec, spec-&gt;init_verbs[i]);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;init_hook)</div><div class='del'>-		spec-&gt;init_hook(codec);</div><div class='del'>-</div><div class='del'>-	hda_call_check_power_status(codec, 0x01);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		spec-&gt;unsol_event(codec, res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int alc_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;loopback, nid);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog playback callbacks</div><div class='del'>- */</div><div class='del'>-static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-						stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   unsigned int stream_tag,</div><div class='del'>-					   unsigned int format,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-					     stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int alc880_alt_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number + 1],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_alt_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec,</div><div class='del'>-				     spec-&gt;adc_nids[substream-&gt;number + 1]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* analog capture with dynamic dual-adc changes */</div><div class='del'>-static int dualmic_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       unsigned int stream_tag,</div><div class='del'>-				       unsigned int format,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;cur_adc = spec-&gt;adc_nids[spec-&gt;cur_adc_idx];</div><div class='del'>-	spec-&gt;cur_adc_stream_tag = stream_tag;</div><div class='del'>-	spec-&gt;cur_adc_format = format;</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;cur_adc, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dualmic_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				       struct hda_codec *codec,</div><div class='del'>-				       struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc);</div><div class='del'>-	spec-&gt;cur_adc = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream dualmic_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0, /* fill later */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = dualmic_capture_pcm_prepare,</div><div class='del'>-		.cleanup = dualmic_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = alc880_playback_pcm_open,</div><div class='del'>-		.prepare = alc880_playback_pcm_prepare,</div><div class='del'>-		.cleanup = alc880_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_analog_alt_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_analog_alt_capture = {</div><div class='del'>-	.substreams = 2, /* can be overridden */</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = alc880_alt_capture_pcm_prepare,</div><div class='del'>-		.cleanup = alc880_alt_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = alc880_dig_playback_pcm_open,</div><div class='del'>-		.close = alc880_dig_playback_pcm_close,</div><div class='del'>-		.prepare = alc880_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = alc880_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc880_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Used by alc_build_pcms to flag that a PCM has no playback stream */</div><div class='del'>-static struct hda_pcm_stream alc_pcm_null_stream = {</div><div class='del'>-	.substreams = 0,</div><div class='del'>-	.channels_min = 0,</div><div class='del'>-	.channels_max = 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int alc_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;no_analog)</div><div class='del'>-		goto skip_analog;</div><div class='del'>-</div><div class='del'>-	snprintf(spec-&gt;stream_name_analog, sizeof(spec-&gt;stream_name_analog),</div><div class='del'>-		 "%s Analog", codec-&gt;chip_name);</div><div class='del'>-	info-&gt;name = spec-&gt;stream_name_analog;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;stream_analog_playback) {</div><div class='del'>-		if (snd_BUG_ON(!spec-&gt;multiout.dac_nids))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec-&gt;stream_analog_playback);</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dac_nids[0];</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;stream_analog_capture) {</div><div class='del'>-		if (snd_BUG_ON(!spec-&gt;adc_nids))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec-&gt;stream_analog_capture);</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adc_nids[0];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;channel_mode) {</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;num_channel_mode; i++) {</div><div class='del'>-			if (spec-&gt;channel_mode[i].channels &gt; info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {</div><div class='del'>-				info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec-&gt;channel_mode[i].channels;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- skip_analog:</div><div class='del'>-	/* SPDIF for stream index #1 */</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid || spec-&gt;dig_in_nid) {</div><div class='del'>-		snprintf(spec-&gt;stream_name_digital,</div><div class='del'>-			 sizeof(spec-&gt;stream_name_digital),</div><div class='del'>-			 "%s Digital", codec-&gt;chip_name);</div><div class='del'>-		codec-&gt;num_pcms = 2;</div><div class='del'>-	        codec-&gt;slave_dig_outs = spec-&gt;multiout.slave_dig_outs;</div><div class='del'>-		info = spec-&gt;pcm_rec + 1;</div><div class='del'>-		info-&gt;name = spec-&gt;stream_name_digital;</div><div class='del'>-		if (spec-&gt;dig_out_type)</div><div class='del'>-			info-&gt;pcm_type = spec-&gt;dig_out_type;</div><div class='del'>-		else</div><div class='del'>-			info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-		if (spec-&gt;multiout.dig_out_nid &amp;&amp;</div><div class='del'>-		    spec-&gt;stream_digital_playback) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec-&gt;stream_digital_playback);</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;dig_in_nid &amp;&amp;</div><div class='del'>-		    spec-&gt;stream_digital_capture) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec-&gt;stream_digital_capture);</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-		/* FIXME: do we need this for all Realtek codec models? */</div><div class='del'>-		codec-&gt;spdif_status_reset = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;no_analog)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* If the use of more than one ADC is requested for the current</div><div class='del'>-	 * model, configure a second analog capture-only PCM.</div><div class='del'>-	 */</div><div class='del'>-	/* Additional Analaog capture for index #2 */</div><div class='del'>-	if ((spec-&gt;alt_dac_nid &amp;&amp; spec-&gt;stream_analog_alt_playback) ||</div><div class='del'>-	    (spec-&gt;num_adc_nids &gt; 1 &amp;&amp; spec-&gt;stream_analog_alt_capture)) {</div><div class='del'>-		codec-&gt;num_pcms = 3;</div><div class='del'>-		info = spec-&gt;pcm_rec + 2;</div><div class='del'>-		info-&gt;name = spec-&gt;stream_name_analog;</div><div class='del'>-		if (spec-&gt;alt_dac_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-				*spec-&gt;stream_analog_alt_playback;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-				spec-&gt;alt_dac_nid;</div><div class='del'>-		} else {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-				alc_pcm_null_stream;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;num_adc_nids &gt; 1) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-				*spec-&gt;stream_analog_alt_capture;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid =</div><div class='del'>-				spec-&gt;adc_nids[1];</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams =</div><div class='del'>-				spec-&gt;num_adc_nids - 1;</div><div class='del'>-		} else {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-				alc_pcm_null_stream;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void alc_shutup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	snd_hda_shutup_pins(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_free_kctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list) {</div><div class='del'>-		struct snd_kcontrol_new *kctl = spec-&gt;kctls.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;kctls.used; i++)</div><div class='del'>-			kfree(kctl[i].name);</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;spec-&gt;kctls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (!spec)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	alc_shutup(codec);</div><div class='del'>-	alc_free_kctls(codec);</div><div class='del'>-	kfree(spec);</div><div class='del'>-	snd_hda_detach_beep_device(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static void alc_power_eapd(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* We currently only handle front, HP */</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x10ec0260:</div><div class='del'>-		set_eapd(codec, 0x0f, 0);</div><div class='del'>-		set_eapd(codec, 0x10, 0);</div><div class='del'>-		break;</div><div class='del'>-	case 0x10ec0262:</div><div class='del'>-	case 0x10ec0267:</div><div class='del'>-	case 0x10ec0268:</div><div class='del'>-	case 0x10ec0269:</div><div class='del'>-	case 0x10ec0270:</div><div class='del'>-	case 0x10ec0272:</div><div class='del'>-	case 0x10ec0660:</div><div class='del'>-	case 0x10ec0662:</div><div class='del'>-	case 0x10ec0663:</div><div class='del'>-	case 0x10ec0862:</div><div class='del'>-	case 0x10ec0889:</div><div class='del'>-		set_eapd(codec, 0x14, 0);</div><div class='del'>-		set_eapd(codec, 0x15, 0);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc_shutup(codec);</div><div class='del'>-	if (spec &amp;&amp; spec-&gt;power_hook)</div><div class='del'>-		spec-&gt;power_hook(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-static int alc_resume(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	codec-&gt;patch_ops.init(codec);</div><div class='del'>-	snd_hda_codec_resume_amp(codec);</div><div class='del'>-	snd_hda_codec_resume_cache(codec);</div><div class='del'>-	hda_call_check_power_status(codec, 0x01);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_ops alc_patch_ops = {</div><div class='del'>-	.build_controls = alc_build_controls,</div><div class='del'>-	.build_pcms = alc_build_pcms,</div><div class='del'>-	.init = alc_init,</div><div class='del'>-	.free = alc_free,</div><div class='del'>-	.unsol_event = alc_unsol_event,</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	.resume = alc_resume,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.suspend = alc_suspend,</div><div class='del'>-	.check_power_status = alc_check_power_status,</div><div class='del'>-#endif</div><div class='del'>-	.reboot_notify = alc_shutup,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* replace the codec chip_name with the given string */</div><div class='del'>-static int alc_codec_rename(struct hda_codec *codec, const char *name)</div><div class='del'>-{</div><div class='del'>-	kfree(codec-&gt;chip_name);</div><div class='del'>-	codec-&gt;chip_name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (!codec-&gt;chip_name) {</div><div class='del'>-		alc_free(codec);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test configuration for debugging</div><div class='del'>- *</div><div class='del'>- * Almost all inputs/outputs are enabled.  I/O pins can be configured via</div><div class='del'>- * enum controls.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-static hda_nid_t alc880_test_dac_nids[4] = {</div><div class='del'>-	0x02, 0x03, 0x04, 0x05</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc880_test_capture_source = {</div><div class='del'>-	.num_items = 7,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "In-1", 0x0 },</div><div class='del'>-		{ "In-2", 0x1 },</div><div class='del'>-		{ "In-3", 0x2 },</div><div class='del'>-		{ "In-4", 0x3 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-		{ "Front", 0x5 },</div><div class='del'>-		{ "Surround", 0x6 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc880_test_modes[4] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-	{ 4, NULL },</div><div class='del'>-	{ 6, NULL },</div><div class='del'>-	{ 8, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_ctl_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	static char *texts[] = {</div><div class='del'>-		"N/A", "Line Out", "HP Out",</div><div class='del'>-		"In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"</div><div class='del'>-	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 8)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 7;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = (hda_nid_t)kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int pin_ctl, item = 0;</div><div class='del'>-</div><div class='del'>-	pin_ctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	if (pin_ctl &amp; AC_PINCTL_OUT_EN) {</div><div class='del'>-		if (pin_ctl &amp; AC_PINCTL_HP_EN)</div><div class='del'>-			item = 2;</div><div class='del'>-		else</div><div class='del'>-			item = 1;</div><div class='del'>-	} else if (pin_ctl &amp; AC_PINCTL_IN_EN) {</div><div class='del'>-		switch (pin_ctl &amp; AC_PINCTL_VREFEN) {</div><div class='del'>-		case AC_PINCTL_VREF_HIZ: item = 3; break;</div><div class='del'>-		case AC_PINCTL_VREF_50:  item = 4; break;</div><div class='del'>-		case AC_PINCTL_VREF_GRD: item = 5; break;</div><div class='del'>-		case AC_PINCTL_VREF_80:  item = 6; break;</div><div class='del'>-		case AC_PINCTL_VREF_100: item = 7; break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = item;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = (hda_nid_t)kcontrol-&gt;private_value;</div><div class='del'>-	static unsigned int ctls[] = {</div><div class='del'>-		0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,</div><div class='del'>-		AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,</div><div class='del'>-		AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,</div><div class='del'>-		AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,</div><div class='del'>-		AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,</div><div class='del'>-		AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,</div><div class='del'>-	};</div><div class='del'>-	unsigned int old_ctl, new_ctl;</div><div class='del'>-</div><div class='del'>-	old_ctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	new_ctl = ctls[ucontrol-&gt;value.enumerated.item[0]];</div><div class='del'>-	if (old_ctl != new_ctl) {</div><div class='del'>-		int val;</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  new_ctl);</div><div class='del'>-		val = ucontrol-&gt;value.enumerated.item[0] &gt;= 3 ?</div><div class='del'>-			HDA_AMP_MUTE : 0;</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, val);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_src_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	static char *texts[] = {</div><div class='del'>-		"Front", "Surround", "CLFE", "Side"</div><div class='del'>-	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 3;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_src_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = (hda_nid_t)kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int sel;</div><div class='del'>-</div><div class='del'>-	sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = sel &amp; 3;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = (hda_nid_t)kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int sel;</div><div class='del'>-</div><div class='del'>-	sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) &amp; 3;</div><div class='del'>-	if (ucontrol-&gt;value.enumerated.item[0] != sel) {</div><div class='del'>-		sel = ucontrol-&gt;value.enumerated.item[0] &amp; 3;</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL, sel);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PIN_CTL_TEST(xname,nid) {			\</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,	\</div><div class='del'>-			.name = xname,		       \</div><div class='del'>-			.subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-			.info = alc_test_pin_ctl_info, \</div><div class='del'>-			.get = alc_test_pin_ctl_get,   \</div><div class='del'>-			.put = alc_test_pin_ctl_put,   \</div><div class='del'>-			.private_value = nid	       \</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-#define PIN_SRC_TEST(xname,nid) {			\</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,	\</div><div class='del'>-			.name = xname,		       \</div><div class='del'>-			.subdevice = HDA_SUBDEV_NID_FLAG | nid, \</div><div class='del'>-			.info = alc_test_pin_src_info, \</div><div class='del'>-			.get = alc_test_pin_src_get,   \</div><div class='del'>-			.put = alc_test_pin_src_put,   \</div><div class='del'>-			.private_value = nid	       \</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc880_test_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("CLFE Playback Switch", 0x0e, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	PIN_CTL_TEST("Front Pin Mode", 0x14),</div><div class='del'>-	PIN_CTL_TEST("Surround Pin Mode", 0x15),</div><div class='del'>-	PIN_CTL_TEST("CLFE Pin Mode", 0x16),</div><div class='del'>-	PIN_CTL_TEST("Side Pin Mode", 0x17),</div><div class='del'>-	PIN_CTL_TEST("In-1 Pin Mode", 0x18),</div><div class='del'>-	PIN_CTL_TEST("In-2 Pin Mode", 0x19),</div><div class='del'>-	PIN_CTL_TEST("In-3 Pin Mode", 0x1a),</div><div class='del'>-	PIN_CTL_TEST("In-4 Pin Mode", 0x1b),</div><div class='del'>-	PIN_SRC_TEST("In-1 Pin Source", 0x18),</div><div class='del'>-	PIN_SRC_TEST("In-2 Pin Source", 0x19),</div><div class='del'>-	PIN_SRC_TEST("In-3 Pin Source", 0x1a),</div><div class='del'>-	PIN_SRC_TEST("In-4 Pin Source", 0x1b),</div><div class='del'>-	HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc880_test_init_verbs[] = {</div><div class='del'>-	/* Unmute inputs of 0x0c - 0x0f */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Vol output for 0x0c-0x0f */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* Set output pins 0x14-0x17 */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Unmute output pins 0x14-0x17 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Set input pins 0x18-0x1c */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Mute input pins 0x18-0x1b */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* ADC set up */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Analog input/passthru */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *alc880_models[ALC880_MODEL_LAST] = {</div><div class='del'>-	[ALC880_3ST]		= "3stack",</div><div class='del'>-	[ALC880_TCL_S700]	= "tcl",</div><div class='del'>-	[ALC880_3ST_DIG]	= "3stack-digout",</div><div class='del'>-	[ALC880_CLEVO]		= "clevo",</div><div class='del'>-	[ALC880_5ST]		= "5stack",</div><div class='del'>-	[ALC880_5ST_DIG]	= "5stack-digout",</div><div class='del'>-	[ALC880_W810]		= "w810",</div><div class='del'>-	[ALC880_Z71V]		= "z71v",</div><div class='del'>-	[ALC880_6ST]		= "6stack",</div><div class='del'>-	[ALC880_6ST_DIG]	= "6stack-digout",</div><div class='del'>-	[ALC880_ASUS]		= "asus",</div><div class='del'>-	[ALC880_ASUS_W1V]	= "asus-w1v",</div><div class='del'>-	[ALC880_ASUS_DIG]	= "asus-dig",</div><div class='del'>-	[ALC880_ASUS_DIG2]	= "asus-dig2",</div><div class='del'>-	[ALC880_UNIWILL_DIG]	= "uniwill",</div><div class='del'>-	[ALC880_UNIWILL_P53]	= "uniwill-p53",</div><div class='del'>-	[ALC880_FUJITSU]	= "fujitsu",</div><div class='del'>-	[ALC880_F1734]		= "F1734",</div><div class='del'>-	[ALC880_LG]		= "lg",</div><div class='del'>-	[ALC880_LG_LW]		= "lg-lw",</div><div class='del'>-	[ALC880_MEDION_RIM]	= "medion",</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC880_TEST]		= "test",</div><div class='del'>-#endif</div><div class='del'>-	[ALC880_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc880_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_W810),</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0xa880, "ECS", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0xa884, "Acer APFV", ALC880_6ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0070, "ULI", ALC880_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0077, "ULI", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0078, "ULI", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0087, "ULI", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a09, "HP", ALC880_5ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x10b3, "ASUS W1V", ALC880_ASUS_W1V),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x10c2, "ASUS W6A", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS Wxx", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1113, "ASUS", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1123, "ASUS", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1173, "ASUS", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1964, "ASUS Z71V", ALC880_Z71V),</div><div class='del'>-	/* SND_PCI_QUIRK(0x1043, 0x1964, "ASUS", ALC880_ASUS_DIG), */</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1973, "ASUS", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x814e, "ASUS P5GD1 w/SPDIF", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST),</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x1043, "ASUS", ALC880_ASUS), /* default ASUS */</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x81a0, "Sony", ALC880_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x81d6, "Sony", ALC880_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x3032, "Gateway", ALC880_5ST),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x3033, "Gateway", ALC880_5ST),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x4039, "Gateway", ALC880_5ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1297, 0xc790, "Shuttle ST20G5", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1458, 0xa102, "Gigabyte K8", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x1150, "MSI", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1509, 0x925d, "FIC P4M", ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x0520, "Clevo m520G", ALC880_CLEVO),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x0660, "Clevo m655n", ALC880_CLEVO),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),</div><div class='del'>-	SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9054, "Uniwlll", ALC880_F1734),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_UNIWILL_P53),</div><div class='del'>-	SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),</div><div class='del'>-	SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_MEDION_RIM),</div><div class='del'>-	SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),</div><div class='del'>-	SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),</div><div class='del'>-	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),</div><div class='del'>-	SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x2668, NULL, ALC880_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xa100, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd400, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd401, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd402, "Intel mobo", ALC880_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe224, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe305, "Intel mobo", ALC880_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe308, "Intel mobo", ALC880_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe400, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe401, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xe402, "Intel mobo", ALC880_5ST_DIG),</div><div class='del'>-	/* default Intel */</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x8086, "Intel mobo", ALC880_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0xa0a0, 0x0560, "AOpen i915GMm-HFS", ALC880_5ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0xe803, 0x1019, NULL, ALC880_6ST_DIG),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC880 codec presets</div><div class='del'>- */</div><div class='del'>-static struct alc_config_preset alc880_presets[] = {</div><div class='del'>-	[ALC880_3ST] = {</div><div class='del'>-		.mixers = { alc880_three_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_3ST_DIG] = {</div><div class='del'>-		.mixers = { alc880_three_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_TCL_S700] = {</div><div class='del'>-		.mixers = { alc880_tcl_s700_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_tcl_S700_init_verbs,</div><div class='del'>-				alc880_gpio2_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.adc_nids = alc880_adc_nids_alt, /* FIXME: correct? */</div><div class='del'>-		.num_adc_nids = 1, /* single ADC */</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),</div><div class='del'>-		.channel_mode = alc880_2_jack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_5ST] = {</div><div class='del'>-		.mixers = { alc880_three_stack_mixer,</div><div class='del'>-			    alc880_five_stack_mixer},</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_5stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),</div><div class='del'>-		.channel_mode = alc880_fivestack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_5ST_DIG] = {</div><div class='del'>-		.mixers = { alc880_three_stack_mixer,</div><div class='del'>-			    alc880_five_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_5stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),</div><div class='del'>-		.channel_mode = alc880_fivestack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_6ST] = {</div><div class='del'>-		.mixers = { alc880_six_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_6stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),</div><div class='del'>-		.dac_nids = alc880_6st_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),</div><div class='del'>-		.channel_mode = alc880_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_6stack_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_6ST_DIG] = {</div><div class='del'>-		.mixers = { alc880_six_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_6stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),</div><div class='del'>-		.dac_nids = alc880_6st_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),</div><div class='del'>-		.channel_mode = alc880_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_6stack_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_W810] = {</div><div class='del'>-		.mixers = { alc880_w810_base_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_w810_init_verbs,</div><div class='del'>-				alc880_gpio2_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_w810_dac_nids),</div><div class='del'>-		.dac_nids = alc880_w810_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_w810_modes),</div><div class='del'>-		.channel_mode = alc880_w810_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_Z71V] = {</div><div class='del'>-		.mixers = { alc880_z71v_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_z71v_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids),</div><div class='del'>-		.dac_nids = alc880_z71v_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),</div><div class='del'>-		.channel_mode = alc880_2_jack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_F1734] = {</div><div class='del'>-		.mixers = { alc880_f1734_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_f1734_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_f1734_dac_nids),</div><div class='del'>-		.dac_nids = alc880_f1734_dac_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),</div><div class='del'>-		.channel_mode = alc880_2_jack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_f1734_capture_source,</div><div class='del'>-		.unsol_event = alc880_uniwill_p53_unsol_event,</div><div class='del'>-		.setup = alc880_uniwill_p53_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_ASUS] = {</div><div class='del'>-		.mixers = { alc880_asus_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_asus_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_asus_modes),</div><div class='del'>-		.channel_mode = alc880_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_ASUS_DIG] = {</div><div class='del'>-		.mixers = { alc880_asus_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_asus_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_asus_modes),</div><div class='del'>-		.channel_mode = alc880_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_ASUS_DIG2] = {</div><div class='del'>-		.mixers = { alc880_asus_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_asus_init_verbs,</div><div class='del'>-				alc880_gpio2_init_verbs }, /* use GPIO2 */</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_asus_modes),</div><div class='del'>-		.channel_mode = alc880_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_ASUS_W1V] = {</div><div class='del'>-		.mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_asus_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_asus_modes),</div><div class='del'>-		.channel_mode = alc880_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_UNIWILL_DIG] = {</div><div class='del'>-		.mixers = { alc880_asus_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_asus_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_asus_modes),</div><div class='del'>-		.channel_mode = alc880_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_UNIWILL] = {</div><div class='del'>-		.mixers = { alc880_uniwill_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_uniwill_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-		.unsol_event = alc880_uniwill_unsol_event,</div><div class='del'>-		.setup = alc880_uniwill_setup,</div><div class='del'>-		.init_hook = alc880_uniwill_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_UNIWILL_P53] = {</div><div class='del'>-		.mixers = { alc880_uniwill_p53_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_uniwill_p53_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),</div><div class='del'>-		.dac_nids = alc880_asus_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_w810_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-		.unsol_event = alc880_uniwill_p53_unsol_event,</div><div class='del'>-		.setup = alc880_uniwill_p53_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_FUJITSU] = {</div><div class='del'>-		.mixers = { alc880_fujitsu_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_uniwill_p53_init_verbs,</div><div class='del'>-	       			alc880_beep_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),</div><div class='del'>-		.channel_mode = alc880_2_jack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-		.unsol_event = alc880_uniwill_p53_unsol_event,</div><div class='del'>-		.setup = alc880_uniwill_p53_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_CLEVO] = {</div><div class='del'>-		.mixers = { alc880_three_stack_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_pin_clevo_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_LG] = {</div><div class='del'>-		.mixers = { alc880_lg_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_lg_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_lg_dac_nids),</div><div class='del'>-		.dac_nids = alc880_lg_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_lg_ch_modes),</div><div class='del'>-		.channel_mode = alc880_lg_ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc880_lg_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc880_lg_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-		.loopbacks = alc880_lg_loopbacks,</div><div class='del'>-#endif</div><div class='del'>-	},</div><div class='del'>-	[ALC880_LG_LW] = {</div><div class='del'>-		.mixers = { alc880_lg_lw_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_lg_lw_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes),</div><div class='del'>-		.channel_mode = alc880_lg_lw_modes,</div><div class='del'>-		.input_mux = &amp;alc880_lg_lw_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc880_lg_lw_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC880_MEDION_RIM] = {</div><div class='del'>-		.mixers = { alc880_medion_rim_mixer },</div><div class='del'>-		.init_verbs = { alc880_volume_init_verbs,</div><div class='del'>-				alc880_medion_rim_init_verbs,</div><div class='del'>-				alc_gpio2_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_dac_nids),</div><div class='del'>-		.dac_nids = alc880_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),</div><div class='del'>-		.channel_mode = alc880_2_jack_modes,</div><div class='del'>-		.input_mux = &amp;alc880_medion_rim_capture_source,</div><div class='del'>-		.unsol_event = alc880_medion_rim_unsol_event,</div><div class='del'>-		.setup = alc880_medion_rim_setup,</div><div class='del'>-		.init_hook = alc880_medion_rim_automute,</div><div class='del'>-	},</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC880_TEST] = {</div><div class='del'>-		.mixers = { alc880_test_mixer },</div><div class='del'>-		.init_verbs = { alc880_test_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc880_test_dac_nids),</div><div class='del'>-		.dac_nids = alc880_test_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_test_modes),</div><div class='del'>-		.channel_mode = alc880_test_modes,</div><div class='del'>-		.input_mux = &amp;alc880_test_capture_source,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Automatic parse of I/O pins from the BIOS configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ALC_CTL_WIDGET_VOL,</div><div class='del'>-	ALC_CTL_WIDGET_MUTE,</div><div class='del'>-	ALC_CTL_BIND_MUTE,</div><div class='del'>-};</div><div class='del'>-static struct snd_kcontrol_new alc880_control_templates[] = {</div><div class='del'>-	HDA_CODEC_VOLUME(NULL, 0, 0, 0),</div><div class='del'>-	HDA_CODEC_MUTE(NULL, 0, 0, 0),</div><div class='del'>-	HDA_BIND_MUTE(NULL, 0, 0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* add dynamic controls */</div><div class='del'>-static int add_control(struct alc_spec *spec, int type, const char *name,</div><div class='del'>-		       int cidx, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;kctls, sizeof(*knew), 32);</div><div class='del'>-	knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	*knew = alc880_control_templates[type];</div><div class='del'>-	knew-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (!knew-&gt;name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	knew-&gt;index = cidx;</div><div class='del'>-	if (get_amp_nid_(val))</div><div class='del'>-		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-	knew-&gt;private_value = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_control_with_pfx(struct alc_spec *spec, int type,</div><div class='del'>-				const char *pfx, const char *dir,</div><div class='del'>-				const char *sfx, int cidx, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);</div><div class='del'>-	return add_control(spec, type, name, cidx, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define add_pb_vol_ctrl(spec, type, pfx, val)			\</div><div class='del'>-	add_control_with_pfx(spec, type, pfx, "Playback", "Volume", 0, val)</div><div class='del'>-#define add_pb_sw_ctrl(spec, type, pfx, val)			\</div><div class='del'>-	add_control_with_pfx(spec, type, pfx, "Playback", "Switch", 0, val)</div><div class='del'>-#define __add_pb_vol_ctrl(spec, type, pfx, cidx, val)			\</div><div class='del'>-	add_control_with_pfx(spec, type, pfx, "Playback", "Volume", cidx, val)</div><div class='del'>-#define __add_pb_sw_ctrl(spec, type, pfx, cidx, val)			\</div><div class='del'>-	add_control_with_pfx(spec, type, pfx, "Playback", "Switch", cidx, val)</div><div class='del'>-</div><div class='del'>-#define alc880_is_fixed_pin(nid)	((nid) &gt;= 0x14 &amp;&amp; (nid) &lt;= 0x17)</div><div class='del'>-#define alc880_fixed_pin_idx(nid)	((nid) - 0x14)</div><div class='del'>-#define alc880_is_multi_pin(nid)	((nid) &gt;= 0x18)</div><div class='del'>-#define alc880_multi_pin_idx(nid)	((nid) - 0x18)</div><div class='del'>-#define alc880_idx_to_dac(nid)		((nid) + 0x02)</div><div class='del'>-#define alc880_dac_to_idx(nid)		((nid) - 0x02)</div><div class='del'>-#define alc880_idx_to_mixer(nid)	((nid) + 0x0c)</div><div class='del'>-#define alc880_idx_to_selector(nid)	((nid) + 0x10)</div><div class='del'>-#define ALC880_PIN_CD_NID		0x1c</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int alc880_auto_fill_dac_nids(struct alc_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int assigned[4];</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	memset(assigned, 0, sizeof(assigned));</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	/* check the pins hardwired to audio widget */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (alc880_is_fixed_pin(nid)) {</div><div class='del'>-			int idx = alc880_fixed_pin_idx(nid);</div><div class='del'>-			spec-&gt;multiout.dac_nids[i] = alc880_idx_to_dac(idx);</div><div class='del'>-			assigned[idx] = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* left pins can be connect to any audio widget */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (alc880_is_fixed_pin(nid))</div><div class='del'>-			continue;</div><div class='del'>-		/* search for an empty channel */</div><div class='del'>-		for (j = 0; j &lt; cfg-&gt;line_outs; j++) {</div><div class='del'>-			if (!assigned[j]) {</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] =</div><div class='del'>-					alc880_idx_to_dac(j);</div><div class='del'>-				assigned[j] = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static const char *chname[4] = {</div><div class='del'>-		"Front", "Surround", NULL /*CLFE*/, "Side"</div><div class='del'>-	};</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		if (!spec-&gt;multiout.dac_nids[i])</div><div class='del'>-			continue;</div><div class='del'>-		nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec-&gt;multiout.dac_nids[i]));</div><div class='del'>-		if (i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 1, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 2, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,</div><div class='del'>-					     "Center",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 1, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,</div><div class='del'>-					     "LFE",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 2, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			const char *pfx;</div><div class='del'>-			if (cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='del'>-			    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-				pfx = "Speaker";</div><div class='del'>-			else</div><div class='del'>-				pfx = chname[i];</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid, 3, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for speaker and HP outputs */</div><div class='del'>-static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,</div><div class='del'>-					const char *pfx)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (alc880_is_fixed_pin(pin)) {</div><div class='del'>-		nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));</div><div class='del'>-		/* specify the DAC as the extra output */</div><div class='del'>-		if (!spec-&gt;multiout.hp_nid)</div><div class='del'>-			spec-&gt;multiout.hp_nid = nid;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.extra_out_nid[0] = nid;</div><div class='del'>-		/* control HP volume/switch on the output mixer amp */</div><div class='del'>-		nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	} else if (alc880_is_multi_pin(pin)) {</div><div class='del'>-		/* set manual connection */</div><div class='del'>-		/* we have only a switch on HP-out PIN */</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create input playback/capture controls for the given pin */</div><div class='del'>-static int new_analog_input(struct alc_spec *spec, hda_nid_t pin,</div><div class='del'>-			    const char *ctlname, int ctlidx,</div><div class='del'>-			    int idx, hda_nid_t mix_nid)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname, ctlidx,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname, ctlidx,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc_is_input_pin(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-	return (pincap &amp; AC_PINCAP_IN) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int alc_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-				      const struct auto_pin_cfg *cfg,</div><div class='del'>-				      hda_nid_t mixer,</div><div class='del'>-				      hda_nid_t cap1, hda_nid_t cap2)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-	int i, err, idx, type, type_idx = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t pin;</div><div class='del'>-		const char *label;</div><div class='del'>-</div><div class='del'>-		pin = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (!alc_is_input_pin(codec, pin))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		type = cfg-&gt;inputs[i].type;</div><div class='del'>-		if (i &gt; 0 &amp;&amp; type == cfg-&gt;inputs[i - 1].type)</div><div class='del'>-			type_idx++;</div><div class='del'>-		else</div><div class='del'>-			type_idx = 0;</div><div class='del'>-		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-		if (mixer) {</div><div class='del'>-			idx = get_connection_index(codec, mixer, pin);</div><div class='del'>-			if (idx &gt;= 0) {</div><div class='del'>-				err = new_analog_input(spec, pin,</div><div class='del'>-						       label, type_idx,</div><div class='del'>-						       idx, mixer);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!cap1)</div><div class='del'>-			continue;</div><div class='del'>-		idx = get_connection_index(codec, cap1, pin);</div><div class='del'>-		if (idx &lt; 0 &amp;&amp; cap2)</div><div class='del'>-			idx = get_connection_index(codec, cap2, pin);</div><div class='del'>-		if (idx &gt;= 0)</div><div class='del'>-			snd_hda_add_imux_item(imux, label, idx, NULL);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc880_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0x0b, 0x08, 0x09);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc_set_pin_output(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			       unsigned int pin_type)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    pin_type);</div><div class='del'>-	/* unmute pin */</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-			    AMP_OUT_UNMUTE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type,</div><div class='del'>-					      int dac_idx)</div><div class='del'>-{</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-	/* need the manual connection? */</div><div class='del'>-	if (alc880_is_multi_pin(nid)) {</div><div class='del'>-		struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-		int idx = alc880_multi_pin_idx(nid);</div><div class='del'>-		snd_hda_codec_write(codec, alc880_idx_to_selector(idx), 0,</div><div class='del'>-				    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-				    alc880_dac_to_idx(spec-&gt;multiout.dac_nids[dac_idx]));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_pin_type(int line_out_type)</div><div class='del'>-{</div><div class='del'>-	if (line_out_type == AUTO_PIN_HP_OUT)</div><div class='del'>-		return PIN_HP;</div><div class='del'>-	else</div><div class='del'>-		return PIN_OUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		alc880_auto_set_output_and_unmute(codec, nid, pin_type, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_auto_init_extra_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	pin = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (pin) /* connect to front */</div><div class='del'>-		alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);</div><div class='del'>-	pin = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (pin) /* connect to front */</div><div class='del'>-		alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (alc_is_input_pin(codec, nid)) {</div><div class='del'>-			alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-			if (nid != ALC880_PIN_CD_NID &amp;&amp;</div><div class='del'>-			    (get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						    AMP_OUT_MUTE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc880_auto_init_input_src(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int c;</div><div class='del'>-</div><div class='del'>-	for (c = 0; c &lt; spec-&gt;num_adc_nids; c++) {</div><div class='del'>-		unsigned int mux_idx;</div><div class='del'>-		const struct hda_input_mux *imux;</div><div class='del'>-		mux_idx = c &gt;= spec-&gt;num_mux_defs ? 0 : c;</div><div class='del'>-		imux = &amp;spec-&gt;input_mux[mux_idx];</div><div class='del'>-		if (!imux-&gt;num_items &amp;&amp; mux_idx &gt; 0)</div><div class='del'>-			imux = &amp;spec-&gt;input_mux[0];</div><div class='del'>-		if (imux)</div><div class='del'>-			snd_hda_codec_write(codec, spec-&gt;adc_nids[c], 0,</div><div class='del'>-					    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					    imux-&gt;items[0].index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the BIOS configuration and set up the alc_spec */</div><div class='del'>-/* return 1 if successful, 0 if the proper config is not found,</div><div class='del'>- * or a negative error code</div><div class='del'>- */</div><div class='del'>-static int alc880_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc880_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc880_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = alc880_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_extra_out(spec,</div><div class='del'>-					   spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-					   "Speaker");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_extra_out(spec, spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-					   "Headphone");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc880_volume_init_verbs);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc880_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc880_auto_init_multi_out(codec);</div><div class='del'>-	alc880_auto_init_extra_out(codec);</div><div class='del'>-	alc880_auto_init_analog_input(codec);</div><div class='del'>-	alc880_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check the ADC/MUX contains all input pins; some ADC/MUX contains only</div><div class='del'>- * one of two digital mic pins, e.g. on ALC272</div><div class='del'>- */</div><div class='del'>-static void fixup_automic_adc(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_adc_nids; i++) {</div><div class='del'>-		hda_nid_t cap = spec-&gt;capsrc_nids ?</div><div class='del'>-			spec-&gt;capsrc_nids[i] : spec-&gt;adc_nids[i];</div><div class='del'>-		int iidx, eidx;</div><div class='del'>-</div><div class='del'>-		iidx = get_connection_index(codec, cap, spec-&gt;int_mic.pin);</div><div class='del'>-		if (iidx &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		eidx = get_connection_index(codec, cap, spec-&gt;ext_mic.pin);</div><div class='del'>-		if (eidx &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		spec-&gt;int_mic.mux_idx = iidx;</div><div class='del'>-		spec-&gt;ext_mic.mux_idx = eidx;</div><div class='del'>-		if (spec-&gt;capsrc_nids)</div><div class='del'>-			spec-&gt;capsrc_nids += i;</div><div class='del'>-		spec-&gt;adc_nids += i;</div><div class='del'>-		spec-&gt;num_adc_nids = 1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	snd_printd(KERN_INFO "hda_codec: %s: "</div><div class='del'>-		   "No ADC/MUX containing both 0x%x and 0x%x pins\n",</div><div class='del'>-		   codec-&gt;chip_name, spec-&gt;int_mic.pin, spec-&gt;ext_mic.pin);</div><div class='del'>-	spec-&gt;auto_mic = 0; /* disable auto-mic to be sure */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* select or unmute the given capsrc route */</div><div class='del'>-static void select_or_unmute_capsrc(struct hda_codec *codec, hda_nid_t cap,</div><div class='del'>-				    int idx)</div><div class='del'>-{</div><div class='del'>-	if (get_wcaps_type(get_wcaps(codec, cap)) == AC_WID_AUD_MIX) {</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, cap, HDA_INPUT, idx,</div><div class='del'>-					 HDA_AMP_MUTE, 0);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write_cache(codec, cap, 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL, idx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set the default connection to that pin */</div><div class='del'>-static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_adc_nids; i++) {</div><div class='del'>-		hda_nid_t cap = spec-&gt;capsrc_nids ?</div><div class='del'>-			spec-&gt;capsrc_nids[i] : spec-&gt;adc_nids[i];</div><div class='del'>-		int idx;</div><div class='del'>-</div><div class='del'>-		idx = get_connection_index(codec, cap, pin);</div><div class='del'>-		if (idx &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		select_or_unmute_capsrc(codec, cap, idx);</div><div class='del'>-		return i; /* return the found index */</div><div class='del'>-	}</div><div class='del'>-	return -1; /* not found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* choose the ADC/MUX containing the input pin and initialize the setup */</div><div class='del'>-static void fixup_single_adc(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* search for the input pin; there must be only one */</div><div class='del'>-	if (cfg-&gt;num_inputs != 1)</div><div class='del'>-		return;</div><div class='del'>-	i = init_capsrc_for_pin(codec, cfg-&gt;inputs[0].pin);</div><div class='del'>-	if (i &gt;= 0) {</div><div class='del'>-		/* use only this ADC */</div><div class='del'>-		if (spec-&gt;capsrc_nids)</div><div class='del'>-			spec-&gt;capsrc_nids += i;</div><div class='del'>-		spec-&gt;adc_nids += i;</div><div class='del'>-		spec-&gt;num_adc_nids = 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize dual adcs */</div><div class='del'>-static void fixup_dual_adc_switch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	init_capsrc_for_pin(codec, spec-&gt;ext_mic.pin);</div><div class='del'>-	init_capsrc_for_pin(codec, spec-&gt;int_mic.pin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_capture_mixer(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	static struct snd_kcontrol_new *caps[2][3] = {</div><div class='del'>-		{ alc_capture_mixer_nosrc1,</div><div class='del'>-		  alc_capture_mixer_nosrc2,</div><div class='del'>-		  alc_capture_mixer_nosrc3 },</div><div class='del'>-		{ alc_capture_mixer1,</div><div class='del'>-		  alc_capture_mixer2,</div><div class='del'>-		  alc_capture_mixer3 },</div><div class='del'>-	};</div><div class='del'>-	if (spec-&gt;num_adc_nids &gt; 0 &amp;&amp; spec-&gt;num_adc_nids &lt;= 3) {</div><div class='del'>-		int mux = 0;</div><div class='del'>-		int num_adcs = spec-&gt;num_adc_nids;</div><div class='del'>-		if (spec-&gt;dual_adc_switch)</div><div class='del'>-			fixup_dual_adc_switch(codec);</div><div class='del'>-		else if (spec-&gt;auto_mic)</div><div class='del'>-			fixup_automic_adc(codec);</div><div class='del'>-		else if (spec-&gt;input_mux) {</div><div class='del'>-			if (spec-&gt;input_mux-&gt;num_items &gt; 1)</div><div class='del'>-				mux = 1;</div><div class='del'>-			else if (spec-&gt;input_mux-&gt;num_items == 1)</div><div class='del'>-				fixup_single_adc(codec);</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;dual_adc_switch)</div><div class='del'>-			num_adcs = 1;</div><div class='del'>-		spec-&gt;cap_mixer = caps[mux][num_adcs - 1];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill adc_nids (and capsrc_nids) containing all active input pins */</div><div class='del'>-static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,</div><div class='del'>-				 int num_nids)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int n;</div><div class='del'>-	hda_nid_t fallback_adc = 0, fallback_cap = 0;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; num_nids; n++) {</div><div class='del'>-		hda_nid_t adc, cap;</div><div class='del'>-		hda_nid_t conn[HDA_MAX_NUM_INPUTS];</div><div class='del'>-		int nconns, i, j;</div><div class='del'>-</div><div class='del'>-		adc = nids[n];</div><div class='del'>-		if (get_wcaps_type(get_wcaps(codec, adc)) != AC_WID_AUD_IN)</div><div class='del'>-			continue;</div><div class='del'>-		cap = adc;</div><div class='del'>-		nconns = snd_hda_get_connections(codec, cap, conn,</div><div class='del'>-						 ARRAY_SIZE(conn));</div><div class='del'>-		if (nconns == 1) {</div><div class='del'>-			cap = conn[0];</div><div class='del'>-			nconns = snd_hda_get_connections(codec, cap, conn,</div><div class='del'>-							 ARRAY_SIZE(conn));</div><div class='del'>-		}</div><div class='del'>-		if (nconns &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-		if (!fallback_adc) {</div><div class='del'>-			fallback_adc = adc;</div><div class='del'>-			fallback_cap = cap;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-			hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-			for (j = 0; j &lt; nconns; j++) {</div><div class='del'>-				if (conn[j] == nid)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (j &gt;= nconns)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (i &gt;= cfg-&gt;num_inputs) {</div><div class='del'>-			int num_adcs = spec-&gt;num_adc_nids;</div><div class='del'>-			spec-&gt;private_adc_nids[num_adcs] = adc;</div><div class='del'>-			spec-&gt;private_capsrc_nids[num_adcs] = cap;</div><div class='del'>-			spec-&gt;num_adc_nids++;</div><div class='del'>-			spec-&gt;adc_nids = spec-&gt;private_adc_nids;</div><div class='del'>-			if (adc != cap)</div><div class='del'>-				spec-&gt;capsrc_nids = spec-&gt;private_capsrc_nids;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;num_adc_nids) {</div><div class='del'>-		printk(KERN_WARNING "hda_codec: %s: no valid ADC found;"</div><div class='del'>-		       " using fallback 0x%x\n",</div><div class='del'>-		       codec-&gt;chip_name, fallback_adc);</div><div class='del'>-		spec-&gt;private_adc_nids[0] = fallback_adc;</div><div class='del'>-		spec-&gt;adc_nids = spec-&gt;private_adc_nids;</div><div class='del'>-		if (fallback_adc != fallback_cap) {</div><div class='del'>-			spec-&gt;private_capsrc_nids[0] = fallback_cap;</div><div class='del'>-			spec-&gt;capsrc_nids = spec-&gt;private_adc_nids;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) \</div><div class='del'>-	((spec)-&gt;beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk beep_white_list[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x83ce, "EeePC", 1),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd613, "Intel", 1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int has_cdefine_beep(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct snd_pci_quirk *q;</div><div class='del'>-	q = snd_pci_quirk_lookup(codec-&gt;bus-&gt;pci, beep_white_list);</div><div class='del'>-	if (q)</div><div class='del'>-		return q-&gt;value;</div><div class='del'>-	return spec-&gt;cdefine.enable_pcbeep;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define set_beep_amp(spec, nid, idx, dir) /* NOP */</div><div class='del'>-#define has_cdefine_beep(codec)		0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * OK, here we have finally the patch for ALC880</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int patch_alc880(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC880_MODEL_LAST,</div><div class='del'>-						  alc880_models,</div><div class='del'>-						  alc880_cfg_tbl);</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC880_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC880_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc880_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using 3-stack mode...\n");</div><div class='del'>-			board_config = ALC880_3ST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		alc_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC880_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc880_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc880_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc880_pcm_analog_capture;</div><div class='del'>-	spec-&gt;stream_analog_alt_capture = &amp;alc880_pcm_analog_alt_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc880_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc880_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		/* check whether NID 0x07 is valid */</div><div class='del'>-		unsigned int wcap = get_wcaps(codec, alc880_adc_nids[0]);</div><div class='del'>-		/* get type */</div><div class='del'>-		wcap = get_wcaps_type(wcap);</div><div class='del'>-		if (wcap != AC_WID_AUD_IN) {</div><div class='del'>-			spec-&gt;adc_nids = alc880_adc_nids_alt;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt);</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;adc_nids = alc880_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc880_adc_nids);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	set_capture_mixer(codec);</div><div class='del'>-	set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x0c;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC880_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc880_auto_init;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc880_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC260 support</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc260_dac_nids[1] = {</div><div class='del'>-	/* front */</div><div class='del'>-	0x02,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc260_adc_nids[1] = {</div><div class='del'>-	/* ADC0 */</div><div class='del'>-	0x04,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc260_adc_nids_alt[1] = {</div><div class='del'>-	/* ADC1 */</div><div class='del'>-	0x05,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* NIDs used when simultaneous access to both ADCs makes sense.  Note that</div><div class='del'>- * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC.</div><div class='del'>- */</div><div class='del'>-static hda_nid_t alc260_dual_adc_nids[2] = {</div><div class='del'>-	/* ADC0, ADC1 */</div><div class='del'>-	0x04, 0x05</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ALC260_DIGOUT_NID	0x03</div><div class='del'>-#define ALC260_DIGIN_NID	0x06</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc260_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack,</div><div class='del'>- * headphone jack and the internal CD lines since these are the only pins at</div><div class='del'>- * which audio can appear.  For flexibility, also allow the option of</div><div class='del'>- * recording the mixer output on the second ADC (ADC0 doesn't have a</div><div class='del'>- * connection to the mixer output).</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux alc260_fujitsu_capture_sources[2] = {</div><div class='del'>-	{</div><div class='del'>-		.num_items = 3,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic/Line", 0x0 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Headphone", 0x2 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic/Line", 0x0 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Headphone", 0x2 },</div><div class='del'>-			{ "Mixer", 0x5 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Acer TravelMate(/Extensa/Aspire) notebooks have similar configuration to</div><div class='del'>- * the Fujitsu S702x, but jacks are marked differently.</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux alc260_acer_capture_sources[2] = {</div><div class='del'>-	{</div><div class='del'>-		.num_items = 4,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Headphone", 0x5 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 5,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Mic", 0x0 },</div><div class='del'>-			{ "Line", 0x2 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Headphone", 0x6 },</div><div class='del'>-			{ "Mixer", 0x5 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Maxdata Favorit 100XS */</div><div class='del'>-static struct hda_input_mux alc260_favorit100_capture_sources[2] = {</div><div class='del'>-	{</div><div class='del'>-		.num_items = 2,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Line/Mic", 0x0 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.num_items = 3,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "Line/Mic", 0x0 },</div><div class='del'>-			{ "CD", 0x4 },</div><div class='del'>-			{ "Mixer", 0x5 },</div><div class='del'>-		},</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is just place-holder, so there's something for alc_build_pcms to look</div><div class='del'>- * at when it calculates the maximum number of channels. ALC260 has no mixer</div><div class='del'>- * element which allows changing the channel mode, so the verb list is</div><div class='del'>- * never used.</div><div class='del'>- */</div><div class='del'>-static struct hda_channel_mode alc260_modes[1] = {</div><div class='del'>-	{ 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Mixer combinations</div><div class='del'>- *</div><div class='del'>- * basic: base_output + input + pc_beep + capture</div><div class='del'>- * HP: base_output + input + capture_alt</div><div class='del'>- * HP_3013: hp_3013 + input + capture</div><div class='del'>- * fujitsu: fujitsu + capture</div><div class='del'>- * acer: acer + capture</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc260_base_output_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc260_input_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* update HP, line and mono out pins according to the master switch */</div><div class='del'>-static void alc260_hp_master_update(struct hda_codec *codec,</div><div class='del'>-				    hda_nid_t hp, hda_nid_t line,</div><div class='del'>-				    hda_nid_t mono)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int val = spec-&gt;master_sw ? PIN_HP : 0;</div><div class='del'>-	/* change HP and line-out pins */</div><div class='del'>-	snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    val);</div><div class='del'>-	snd_hda_codec_write(codec, line, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    val);</div><div class='del'>-	/* mono (speaker) depending on the HP jack sense */</div><div class='del'>-	val = (val &amp;&amp; !spec-&gt;jack_present) ? PIN_OUT : 0;</div><div class='del'>-	snd_hda_codec_write(codec, mono, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc260_hp_master_sw_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	*ucontrol-&gt;value.integer.value = spec-&gt;master_sw;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc260_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int val = !!*ucontrol-&gt;value.integer.value;</div><div class='del'>-	hda_nid_t hp, line, mono;</div><div class='del'>-</div><div class='del'>-	if (val == spec-&gt;master_sw)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;master_sw = val;</div><div class='del'>-	hp = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	line = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	mono = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	alc260_hp_master_update(codec, hp, line, mono);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc260_hp_output_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x11,</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,</div><div class='del'>-		.get = alc260_hp_master_sw_get,</div><div class='del'>-		.put = alc260_hp_master_sw_put,</div><div class='del'>-		.private_value = (0x0f &lt;&lt; 16) | (0x10 &lt;&lt; 8) | 0x11</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0a, 1, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Speaker Playback Switch", 0x0a, 1, 2, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_hp_unsol_verbs[] = {</div><div class='del'>-	{0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc260_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x10);</div><div class='del'>-	alc260_hp_master_update(codec, 0x0f, 0x10, 0x11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_hp_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc260_hp_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_NID_FLAG | 0x11,</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,</div><div class='del'>-		.get = alc260_hp_master_sw_get,</div><div class='del'>-		.put = alc260_hp_master_sw_put,</div><div class='del'>-		.private_value = (0x15 &lt;&lt; 16) | (0x10 &lt;&lt; 8) | 0x11</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Aux-In Playback Volume", 0x07, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Aux-In Playback Switch", 0x07, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc260_dc7600_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x0a, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc260_dc7600_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc260_hp_dc7600_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc260_dc7600_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("LineOut Playback Switch", &amp;alc260_dc7600_bind_switch),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x10, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_hp_3013_unsol_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc260_hp_3013_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	alc260_hp_master_update(codec, 0x15, 0x10, 0x11);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_hp_3013_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc260_hp_3013_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_hp_3012_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int bits = snd_hda_jack_detect(codec, 0x10) ? 0 : PIN_OUT;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    bits);</div><div class='del'>-	snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    bits);</div><div class='del'>-	snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_hp_3012_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc260_hp_3012_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fujitsu S702x series laptops.  ALC260 pin usage: Mic/Line jack = 0x12,</div><div class='del'>- * HP jack = 0x14, CD audio =  0x16, internal speaker = 0x10.</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Headphone Jack Mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x09, 2, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Mixer for Acer TravelMate(/Extensa/Aspire) notebooks.  Note that current</div><div class='del'>- * versions of the ALC260 don't act on requests to enable mic bias from NID</div><div class='del'>- * 0x0f (used to drive the headphone jack in these laptops).  The ALC260</div><div class='del'>- * datasheet doesn't mention this restriction.  At this stage it's not clear</div><div class='del'>- * whether this behaviour is intentional or is a hardware bug in chip</div><div class='del'>- * revisions available in early 2006.  Therefore for now allow the</div><div class='del'>- * "Headphone Jack Mode" control to span all choices, but if it turns out</div><div class='del'>- * that the lack of mic bias for this NID is intentional we could change the</div><div class='del'>- * mode from ALC_PIN_DIR_INOUT to ALC_PIN_DIR_INOUT_NOMICBIAS.</div><div class='del'>- *</div><div class='del'>- * In addition, Acer TravelMate(/Extensa/Aspire) notebooks in early 2006</div><div class='del'>- * don't appear to make the mic bias available from the "line" jack, even</div><div class='del'>- * though the NID used for this jack (0x14) can supply it.  The theory is</div><div class='del'>- * that perhaps Acer have included blocking capacitors between the ALC260</div><div class='del'>- * and the output jack.  If this turns out to be the case for all such</div><div class='del'>- * models the "Line Jack Mode" mode could be changed from ALC_PIN_DIR_INOUT</div><div class='del'>- * to ALC_PIN_DIR_INOUT_NOMICBIAS.</div><div class='del'>- *</div><div class='del'>- * The C20x Tablet series have a mono internal speaker which is controlled</div><div class='del'>- * via the chip's Mono sum widget and pin complex, so include the necessary</div><div class='del'>- * controls for such models.  On models without a "mono speaker" the control</div><div class='del'>- * won't do anything.</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc260_acer_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Headphone Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0a, 1, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Speaker Playback Switch", 0x0a, 1, 2,</div><div class='del'>-			   HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Maxdata Favorit 100XS: one output and one input (0x12) jack</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc260_favorit100_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Output Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line/Mic Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line/Mic Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Line/Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Packard bell V7900  ALC260 pin usage: HP = 0x0f, Mic jack = 0x12,</div><div class='del'>- * Line In jack = 0x14, CD audio =  0x16, pc beep = 0x17.</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc260_will_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Replacer 672V ALC260 pin usage: Mic jack = 0x12,</div><div class='del'>- * Line In jack = 0x14, ATAPI Mic = 0x13, speaker = 0x0f.</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc260_replacer_672v_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),</div><div class='del'>-	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x07, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("ATATI Mic Playback Switch", 0x07, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * initialization verbs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc260_init_verbs[] = {</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	/* Mic2 (front panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	/* LINE-2 is used for line-out in rear */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* select line-out */</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* LINE-OUT pin */</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* enable HP */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* enable Mono */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* mute capture amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* set connection select to line in (default select for this ADC) */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* mute capture amp left and right */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* set connection select to line in (default select for this ADC) */</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* set vol=0 Line-Out mixer amp left and right */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* unmute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* set vol=0 HP mixer amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* unmute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* set vol=0 Mono mixer amp left and right */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* unmute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* unmute LINE-2 out pin */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &amp;</div><div class='del'>-	 * Line In 2 = 0x03</div><div class='del'>-	 */</div><div class='del'>-	/* mute analog inputs */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Amp Indexes: DAC = 0x01 &amp; mixer = 0x00 */</div><div class='del'>-	/* mute Front out path */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* mute Headphone out path */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* mute Mono out path */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0 /* should be identical with alc260_init_verbs? */</div><div class='del'>-static struct hda_verb alc260_hp_init_verbs[] = {</div><div class='del'>-	/* Headphone and output */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	/* mono output */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	/* Mic2 (front panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	/* Line-2 pin widget for output */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	/* unmute amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},</div><div class='del'>-	/* set connection select to line in (default select for this ADC) */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* unmute Line-Out mixer amp left and right (volume = 0) */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* mute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	/* unmute HP mixer amp left and right (volume = 0) */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* mute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	/* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &amp;</div><div class='del'>-	 * Line In 2 = 0x03</div><div class='del'>-	 */</div><div class='del'>-	/* mute analog inputs */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Amp Indexes: DAC = 0x01 &amp; mixer = 0x00 */</div><div class='del'>-	/* Unmute Front out path */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	/* Unmute Headphone out path */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	/* Unmute Mono out path */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_hp_3013_init_verbs[] = {</div><div class='del'>-	/* Line out and output */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* mono output */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* Mic1 (rear panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	/* Mic2 (front panel) pin widget for input and vref at 80% */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	/* Line In pin widget for input */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	/* Headphone pin widget for output */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	/* unmute amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},</div><div class='del'>-	/* set connection select to line in (default select for this ADC) */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* unmute Line-Out mixer amp left and right (volume = 0) */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* mute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	/* unmute HP mixer amp left and right (volume = 0) */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* mute pin widget amp left and right (no gain on this amp) */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	/* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &amp;</div><div class='del'>-	 * Line In 2 = 0x03</div><div class='del'>-	 */</div><div class='del'>-	/* mute analog inputs */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Amp Indexes: DAC = 0x01 &amp; mixer = 0x00 */</div><div class='del'>-	/* Unmute Front out path */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	/* Unmute Headphone out path */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	/* Unmute Mono out path */</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Initialisation sequence for ALC260 as configured in Fujitsu S702x</div><div class='del'>- * laptops.  ALC260 pin usage: Mic/Line jack = 0x12, HP jack = 0x14, CD</div><div class='del'>- * audio = 0x16, internal speaker = 0x10.</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc260_fujitsu_init_verbs[] = {</div><div class='del'>-	/* Disable all GPIOs */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0},</div><div class='del'>-	/* Internal speaker is connected to headphone pin */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Headphone/Line-out jack connects to Line1 pin; make it an output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	/* Mic/Line-in jack is connected to mic1 pin, so make it an input */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Ensure all other unused pins are disabled and muted. */</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Disable digital (SPDIF) pins */</div><div class='del'>-	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Ensure Line1 pin widget takes its input from the OUT1 sum bus</div><div class='del'>-	 * when acting as an output.</div><div class='del'>-	 */</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute Line1 pin widget output buffer since it starts as an output.</div><div class='del'>-	 * If the pin mode is changed by the user the pin mode control will</div><div class='del'>-	 * take care of enabling the pin's input/output buffers as needed.</div><div class='del'>-	 * Therefore there's no need to enable the input buffer at this</div><div class='del'>-	 * stage.</div><div class='del'>-	 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute input buffer of pin widget used for Line-in (no equiv</div><div class='del'>-	 * mixer ctrl)</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Set ADC connection select to match default mixer setting - line</div><div class='del'>-	 * in (on mic1 pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Do the same for the second ADC: mute capture input amp and</div><div class='del'>-	 * set ADC connection to line in (on mic1 pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Initialisation sequence for ALC260 as configured in Acer TravelMate and</div><div class='del'>- * similar laptops (adapted from Fujitsu init verbs).</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc260_acer_init_verbs[] = {</div><div class='del'>-	/* On TravelMate laptops, GPIO 0 enables the internal speaker and</div><div class='del'>-	 * the headphone jack.  Turn this on and rely on the standard mute</div><div class='del'>-	 * methods whenever the user wants to turn these outputs off.</div><div class='del'>-	 */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x01},</div><div class='del'>-	/* Internal speaker/Headphone jack is connected to Line-out pin */</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Internal microphone/Mic jack is connected to Mic1 pin */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	/* Line In jack is connected to Line1 pin */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	/* Some Acers (eg: C20x Tablets) use Mono pin for internal speaker */</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Ensure all other unused pins are disabled and muted. */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Disable digital (SPDIF) pins */</div><div class='del'>-	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum</div><div class='del'>-	 * bus when acting as outputs.</div><div class='del'>-	 */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Unmute Line-out pin widget amp left and right</div><div class='del'>-	 * (no equiv mixer ctrl)</div><div class='del'>-	 */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute mono pin widget amp output (no equiv mixer ctrl) */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute Mic1 and Line1 pin widget input buffers since they start as</div><div class='del'>-	 * inputs. If the pin mode is changed by the user the pin mode control</div><div class='del'>-	 * will take care of enabling the pin's input/output buffers as needed.</div><div class='del'>-	 * Therefore there's no need to enable the input buffer at this</div><div class='del'>-	 * stage.</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Set ADC connection select to match default mixer setting - mic</div><div class='del'>-	 * (on mic1 pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Do similar with the second ADC: mute capture input amp and</div><div class='del'>-	 * set ADC connection to mic to match ALSA's default state.</div><div class='del'>-	 */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Initialisation sequence for Maxdata Favorit 100XS</div><div class='del'>- * (adapted from Acer init verbs).</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc260_favorit100_init_verbs[] = {</div><div class='del'>-	/* GPIO 0 enables the output jack.</div><div class='del'>-	 * Turn this on and rely on the standard mute</div><div class='del'>-	 * methods whenever the user wants to turn these outputs off.</div><div class='del'>-	 */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x01},</div><div class='del'>-	/* Line/Mic input jack is connected to Mic1 pin */</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	/* Ensure all other unused pins are disabled and muted. */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Disable digital (SPDIF) pins */</div><div class='del'>-	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum</div><div class='del'>-	 * bus when acting as outputs.</div><div class='del'>-	 */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Unmute Line-out pin widget amp left and right</div><div class='del'>-	 * (no equiv mixer ctrl)</div><div class='del'>-	 */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute Mic1 and Line1 pin widget input buffers since they start as</div><div class='del'>-	 * inputs. If the pin mode is changed by the user the pin mode control</div><div class='del'>-	 * will take care of enabling the pin's input/output buffers as needed.</div><div class='del'>-	 * Therefore there's no need to enable the input buffer at this</div><div class='del'>-	 * stage.</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Set ADC connection select to match default mixer setting - mic</div><div class='del'>-	 * (on mic1 pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Do similar with the second ADC: mute capture input amp and</div><div class='del'>-	 * set ADC connection to mic to match ALSA's default state.</div><div class='del'>-	 */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_will_verbs[] = {</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x0f, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='del'>-	{0x1a, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x1a, AC_VERB_SET_PROC_COEF, 0x3040},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_replacer_672v_verbs[] = {</div><div class='del'>-	{0x0f, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='del'>-	{0x1a, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x1a, AC_VERB_SET_PROC_COEF, 0x3050},</div><div class='del'>-</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x0f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc260_replacer_672v_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-        unsigned int present;</div><div class='del'>-</div><div class='del'>-	/* speaker --&gt; GPIO Data 0, hp or spdif --&gt; GPIO data 1 */</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x0f);</div><div class='del'>-	if (present) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='del'>-					  AC_VERB_SET_GPIO_DATA, 1);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x0f, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  PIN_HP);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x01, 0,</div><div class='del'>-					  AC_VERB_SET_GPIO_DATA, 0);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x0f, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_replacer_672v_unsol_event(struct hda_codec *codec,</div><div class='del'>-                                       unsigned int res)</div><div class='del'>-{</div><div class='del'>-        if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-                alc260_replacer_672v_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc260_hp_dc7600_verbs[] = {</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Test configuration for debugging, modelled after the ALC880 test</div><div class='del'>- * configuration.</div><div class='del'>- */</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-static hda_nid_t alc260_test_dac_nids[1] = {</div><div class='del'>-	0x02,</div><div class='del'>-};</div><div class='del'>-static hda_nid_t alc260_test_adc_nids[2] = {</div><div class='del'>-	0x04, 0x05,</div><div class='del'>-};</div><div class='del'>-/* For testing the ALC260, each input MUX needs its own definition since</div><div class='del'>- * the signal assignments are different.  This assumes that the first ADC</div><div class='del'>- * is NID 0x04.</div><div class='del'>- */</div><div class='del'>-static struct hda_input_mux alc260_test_capture_sources[2] = {</div><div class='del'>-	{</div><div class='del'>-		.num_items = 7,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "MIC1 pin", 0x0 },</div><div class='del'>-			{ "MIC2 pin", 0x1 },</div><div class='del'>-			{ "LINE1 pin", 0x2 },</div><div class='del'>-			{ "LINE2 pin", 0x3 },</div><div class='del'>-			{ "CD pin", 0x4 },</div><div class='del'>-			{ "LINE-OUT pin", 0x5 },</div><div class='del'>-			{ "HP-OUT pin", 0x6 },</div><div class='del'>-		},</div><div class='del'>-        },</div><div class='del'>-	{</div><div class='del'>-		.num_items = 8,</div><div class='del'>-		.items = {</div><div class='del'>-			{ "MIC1 pin", 0x0 },</div><div class='del'>-			{ "MIC2 pin", 0x1 },</div><div class='del'>-			{ "LINE1 pin", 0x2 },</div><div class='del'>-			{ "LINE2 pin", 0x3 },</div><div class='del'>-			{ "CD pin", 0x4 },</div><div class='del'>-			{ "Mixer", 0x5 },</div><div class='del'>-			{ "LINE-OUT pin", 0x6 },</div><div class='del'>-			{ "HP-OUT pin", 0x7 },</div><div class='del'>-		},</div><div class='del'>-        },</div><div class='del'>-};</div><div class='del'>-static struct snd_kcontrol_new alc260_test_mixer[] = {</div><div class='del'>-	/* Output driver widgets */</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x09, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("LOUT2 Playback Switch", 0x09, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	/* Modes for retasking pin widgets</div><div class='del'>-	 * Note: the ALC260 doesn't seem to act on requests to enable mic</div><div class='del'>-         * bias from NIDs 0x0f and 0x10.  The ALC260 datasheet doesn't</div><div class='del'>-         * mention this restriction.  At this stage it's not clear whether</div><div class='del'>-         * this behaviour is intentional or is a hardware bug in chip</div><div class='del'>-         * revisions available at least up until early 2006.  Therefore for</div><div class='del'>-         * now allow the "HP-OUT" and "LINE-OUT" Mode controls to span all</div><div class='del'>-         * choices, but if it turns out that the lack of mic bias for these</div><div class='del'>-         * NIDs is intentional we could change their modes from</div><div class='del'>-         * ALC_PIN_DIR_INOUT to ALC_PIN_DIR_INOUT_NOMICBIAS.</div><div class='del'>-	 */</div><div class='del'>-	ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("LINE1 pin mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("MIC2 pin mode", 0x13, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("MIC1 pin mode", 0x12, ALC_PIN_DIR_INOUT),</div><div class='del'>-</div><div class='del'>-	/* Loopback mixer controls */</div><div class='del'>-	HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x07, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("MIC1 Playback Switch", 0x07, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x07, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("MIC2 Playback Switch", 0x07, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("LINE1 Playback Switch", 0x07, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LINE2 Playback Volume", 0x07, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x07, 0x7, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	/* Controls for GPIO pins, assuming they are configured as outputs */</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),</div><div class='del'>-</div><div class='del'>-	/* Switches to allow the digital IO pins to be enabled.  The datasheet</div><div class='del'>-	 * is ambigious as to which NID is which; testing on laptops which</div><div class='del'>-	 * make this output available should provide clarification.</div><div class='del'>-	 */</div><div class='del'>-	ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x03, 0x01),</div><div class='del'>-	ALC_SPDIF_CTRL_SWITCH("SPDIF Capture Switch", 0x06, 0x01),</div><div class='del'>-</div><div class='del'>-	/* A switch allowing EAPD to be enabled.  Some laptops seem to use</div><div class='del'>-	 * this output to turn on an external amplifier.</div><div class='del'>-	 */</div><div class='del'>-	ALC_EAPD_CTRL_SWITCH("LINE-OUT EAPD Enable Switch", 0x0f, 0x02),</div><div class='del'>-	ALC_EAPD_CTRL_SWITCH("HP-OUT EAPD Enable Switch", 0x10, 0x02),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-static struct hda_verb alc260_test_init_verbs[] = {</div><div class='del'>-	/* Enable all GPIOs as outputs with an initial value of 0 */</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_DATA, 0x00},</div><div class='del'>-	{0x01, AC_VERB_SET_GPIO_MASK, 0x0f},</div><div class='del'>-</div><div class='del'>-	/* Enable retasking pins as output, initially without power amp */</div><div class='del'>-	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* Disable digital (SPDIF) pins initially, but users can enable</div><div class='del'>-	 * them via a mixer switch.  In the case of SPDIF-out, this initverb</div><div class='del'>-	 * payload also sets the generation to 0, output to be in "consumer"</div><div class='del'>-	 * PCM format, copyright asserted, no pre-emphasis and no validity</div><div class='del'>-	 * control.</div><div class='del'>-	 */</div><div class='del'>-	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},</div><div class='del'>-</div><div class='del'>-	/* Ensure mic1, mic2, line1 and line2 pin widgets take input from the</div><div class='del'>-	 * OUT1 sum bus when acting as an output.</div><div class='del'>-	 */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x0c, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x0e, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Start with output sum widgets muted and their output gains at min */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Unmute retasking pin widget output buffers since the default</div><div class='del'>-	 * state appears to be output.  As the pin mode is changed by the</div><div class='del'>-	 * user the pin mode control will take care of enabling the pin's</div><div class='del'>-	 * input/output buffers as needed.</div><div class='del'>-	 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Also unmute the mono-out pin widget */</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mute capture amp left and right */</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* Set ADC connection select to match default mixer setting (mic1</div><div class='del'>-	 * pin)</div><div class='del'>-	 */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Do the same for the second ADC: mute capture input amp and</div><div class='del'>-	 * set ADC connection to mic1 pin</div><div class='del'>-	 */</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mute all inputs to mixer widget (even unconnected ones) */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define alc260_pcm_analog_playback	alc880_pcm_analog_alt_playback</div><div class='del'>-#define alc260_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-</div><div class='del'>-#define alc260_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc260_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * for BIOS auto-configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,</div><div class='del'>-					const char *pfx, int *vol_bits)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid_vol;</div><div class='del'>-	unsigned long vol_val, sw_val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (nid &gt;= 0x0f &amp;&amp; nid &lt; 0x11) {</div><div class='del'>-		nid_vol = nid - 0x7;</div><div class='del'>-		vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);</div><div class='del'>-		sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='del'>-	} else if (nid == 0x11) {</div><div class='del'>-		nid_vol = nid - 0x7;</div><div class='del'>-		vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT);</div><div class='del'>-		sw_val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);</div><div class='del'>-	} else if (nid &gt;= 0x12 &amp;&amp; nid &lt;= 0x15) {</div><div class='del'>-		nid_vol = 0x08;</div><div class='del'>-		vol_val = HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT);</div><div class='del'>-		sw_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='del'>-	} else</div><div class='del'>-		return 0; /* N/A */</div><div class='del'>-</div><div class='del'>-	if (!(*vol_bits &amp; (1 &lt;&lt; nid_vol))) {</div><div class='del'>-		/* first control for the volume widget */</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, vol_val);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		*vol_bits |= (1 &lt;&lt; nid_vol);</div><div class='del'>-	}</div><div class='del'>-	err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, sw_val);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-	int vols = 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dac_nids[0] = 0x02;</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;line_out_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		const char *pfx;</div><div class='del'>-		if (!cfg-&gt;speaker_pins[0] &amp;&amp; !cfg-&gt;hp_pins[0])</div><div class='del'>-			pfx = "Master";</div><div class='del'>-		else if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-			pfx = "Speaker";</div><div class='del'>-		else</div><div class='del'>-			pfx = "Front";</div><div class='del'>-		err = alc260_add_playback_controls(spec, nid, pfx, &amp;vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;speaker_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		err = alc260_add_playback_controls(spec, nid, "Speaker", &amp;vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;hp_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		err = alc260_add_playback_controls(spec, nid, "Headphone",</div><div class='del'>-						   &amp;vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int alc260_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0x07, 0x04, 0x05);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type,</div><div class='del'>-					      int sel_idx)</div><div class='del'>-{</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-	/* need the manual connection? */</div><div class='del'>-	if (nid &gt;= 0x12) {</div><div class='del'>-		int idx = nid - 0x12;</div><div class='del'>-		snd_hda_codec_write(codec, idx + 0x0b, 0,</div><div class='del'>-				    AC_VERB_SET_CONNECT_SEL, sel_idx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc260_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	nid = spec-&gt;autocfg.line_out_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		alc260_auto_set_output_and_unmute(codec, nid, pin_type, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (nid)</div><div class='del'>-		alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);</div><div class='del'>-</div><div class='del'>-	nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (nid)</div><div class='del'>-		alc260_auto_set_output_and_unmute(codec, nid, PIN_HP, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC260_PIN_CD_NID		0x16</div><div class='del'>-static void alc260_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (nid &gt;= 0x12) {</div><div class='del'>-			alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-			if (nid != ALC260_PIN_CD_NID &amp;&amp;</div><div class='del'>-			    (get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						    AMP_OUT_MUTE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc260_auto_init_input_src	alc880_auto_init_input_src</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc260_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for</div><div class='del'>-	 * front panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	/* mute analog inputs */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x08 - 0x0a)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int alc260_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc260_ignore[] = { 0x17, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc260_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc260_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;kctls.list)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-	err = alc260_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = ALC260_DIGOUT_NID;</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc260_volume_init_verbs);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x10, 0x15, 0x0f, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc260_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc260_auto_init_multi_out(codec);</div><div class='del'>-	alc260_auto_init_analog_input(codec);</div><div class='del'>-	alc260_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list alc260_loopbacks[] = {</div><div class='del'>-	{ 0x07, HDA_INPUT, 0 },</div><div class='del'>-	{ 0x07, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x07, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x07, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x07, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pin config fixes</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	PINFIX_HP_DC5750,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc260_fixups[] = {</div><div class='del'>-	[PINFIX_HP_DC5750] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x11, 0x90130110 }, /* speaker */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc260_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", PINFIX_HP_DC5750),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC260 configurations</div><div class='del'>- */</div><div class='del'>-static const char *alc260_models[ALC260_MODEL_LAST] = {</div><div class='del'>-	[ALC260_BASIC]		= "basic",</div><div class='del'>-	[ALC260_HP]		= "hp",</div><div class='del'>-	[ALC260_HP_3013]	= "hp-3013",</div><div class='del'>-	[ALC260_HP_DC7600]	= "hp-dc7600",</div><div class='del'>-	[ALC260_FUJITSU_S702X]	= "fujitsu",</div><div class='del'>-	[ALC260_ACER]		= "acer",</div><div class='del'>-	[ALC260_WILL]		= "will",</div><div class='del'>-	[ALC260_REPLACER_672V]	= "replacer",</div><div class='del'>-	[ALC260_FAVORIT100]	= "favorit100",</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC260_TEST]		= "test",</div><div class='del'>-#endif</div><div class='del'>-	[ALC260_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc260_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x280a, "HP d5750", ALC260_AUTO), /* no quirk */</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3010, "HP", ALC260_HP_3013),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3011, "HP", ALC260_HP_3013),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3012, "HP", ALC260_HP_DC7600),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3013, "HP", ALC260_HP_3013),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3014, "HP", ALC260_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3015, "HP", ALC260_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3016, "HP", ALC260_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_BASIC),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x81cc, "Sony VAIO", ALC260_BASIC),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x81cd, "Sony VAIO", ALC260_BASIC),</div><div class='del'>-	SND_PCI_QUIRK(0x10cf, 0x1326, "Fujitsu S702X", ALC260_FUJITSU_S702X),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x0729, "CTL U553W", ALC260_BASIC),</div><div class='del'>-	SND_PCI_QUIRK(0x161f, 0x2057, "Replacer 672V", ALC260_REPLACER_672V),</div><div class='del'>-	SND_PCI_QUIRK(0x1631, 0xc017, "PB V7900", ALC260_WILL),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc260_presets[] = {</div><div class='del'>-	[ALC260_BASIC] = {</div><div class='del'>-		.mixers = { alc260_base_output_mixer,</div><div class='del'>-			    alc260_input_mixer },</div><div class='del'>-		.init_verbs = { alc260_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),</div><div class='del'>-		.adc_nids = alc260_dual_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_HP] = {</div><div class='del'>-		.mixers = { alc260_hp_output_mixer,</div><div class='del'>-			    alc260_input_mixer },</div><div class='del'>-		.init_verbs = { alc260_init_verbs,</div><div class='del'>-				alc260_hp_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc260_adc_nids_alt,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-		.unsol_event = alc260_hp_unsol_event,</div><div class='del'>-		.init_hook = alc260_hp_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_HP_DC7600] = {</div><div class='del'>-		.mixers = { alc260_hp_dc7600_mixer,</div><div class='del'>-			    alc260_input_mixer },</div><div class='del'>-		.init_verbs = { alc260_init_verbs,</div><div class='del'>-				alc260_hp_dc7600_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc260_adc_nids_alt,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-		.unsol_event = alc260_hp_3012_unsol_event,</div><div class='del'>-		.init_hook = alc260_hp_3012_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_HP_3013] = {</div><div class='del'>-		.mixers = { alc260_hp_3013_mixer,</div><div class='del'>-			    alc260_input_mixer },</div><div class='del'>-		.init_verbs = { alc260_hp_3013_init_verbs,</div><div class='del'>-				alc260_hp_3013_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc260_adc_nids_alt,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-		.unsol_event = alc260_hp_3013_unsol_event,</div><div class='del'>-		.init_hook = alc260_hp_3013_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_FUJITSU_S702X] = {</div><div class='del'>-		.mixers = { alc260_fujitsu_mixer },</div><div class='del'>-		.init_verbs = { alc260_fujitsu_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),</div><div class='del'>-		.adc_nids = alc260_dual_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.num_mux_defs = ARRAY_SIZE(alc260_fujitsu_capture_sources),</div><div class='del'>-		.input_mux = alc260_fujitsu_capture_sources,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_ACER] = {</div><div class='del'>-		.mixers = { alc260_acer_mixer },</div><div class='del'>-		.init_verbs = { alc260_acer_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),</div><div class='del'>-		.adc_nids = alc260_dual_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.num_mux_defs = ARRAY_SIZE(alc260_acer_capture_sources),</div><div class='del'>-		.input_mux = alc260_acer_capture_sources,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_FAVORIT100] = {</div><div class='del'>-		.mixers = { alc260_favorit100_mixer },</div><div class='del'>-		.init_verbs = { alc260_favorit100_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),</div><div class='del'>-		.adc_nids = alc260_dual_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.num_mux_defs = ARRAY_SIZE(alc260_favorit100_capture_sources),</div><div class='del'>-		.input_mux = alc260_favorit100_capture_sources,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_WILL] = {</div><div class='del'>-		.mixers = { alc260_will_mixer },</div><div class='del'>-		.init_verbs = { alc260_init_verbs, alc260_will_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_adc_nids),</div><div class='del'>-		.adc_nids = alc260_adc_nids,</div><div class='del'>-		.dig_out_nid = ALC260_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC260_REPLACER_672V] = {</div><div class='del'>-		.mixers = { alc260_replacer_672v_mixer },</div><div class='del'>-		.init_verbs = { alc260_init_verbs, alc260_replacer_672v_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_dac_nids),</div><div class='del'>-		.dac_nids = alc260_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_adc_nids),</div><div class='del'>-		.adc_nids = alc260_adc_nids,</div><div class='del'>-		.dig_out_nid = ALC260_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.input_mux = &amp;alc260_capture_source,</div><div class='del'>-		.unsol_event = alc260_replacer_672v_unsol_event,</div><div class='del'>-		.init_hook = alc260_replacer_672v_automute,</div><div class='del'>-	},</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC260_TEST] = {</div><div class='del'>-		.mixers = { alc260_test_mixer },</div><div class='del'>-		.init_verbs = { alc260_test_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc260_test_dac_nids),</div><div class='del'>-		.dac_nids = alc260_test_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc260_test_adc_nids),</div><div class='del'>-		.adc_nids = alc260_test_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc260_modes),</div><div class='del'>-		.channel_mode = alc260_modes,</div><div class='del'>-		.num_mux_defs = ARRAY_SIZE(alc260_test_capture_sources),</div><div class='del'>-		.input_mux = alc260_test_capture_sources,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc260(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC260_MODEL_LAST,</div><div class='del'>-						  alc260_models,</div><div class='del'>-						  alc260_cfg_tbl);</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		snd_printd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			   codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC260_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC260_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 1);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC260_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc260_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC260_BASIC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		alc_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC260_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc260_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc260_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc260_pcm_analog_capture;</div><div class='del'>-	spec-&gt;stream_analog_alt_capture = &amp;alc260_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc260_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc260_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		/* check whether NID 0x04 is valid */</div><div class='del'>-		unsigned int wcap = get_wcaps(codec, 0x04);</div><div class='del'>-		wcap = get_wcaps_type(wcap);</div><div class='del'>-		/* get type */</div><div class='del'>-		if (wcap != AC_WID_AUD_IN || spec-&gt;input_mux-&gt;num_items == 1) {</div><div class='del'>-			spec-&gt;adc_nids = alc260_adc_nids_alt;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc260_adc_nids_alt);</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;adc_nids = alc260_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc260_adc_nids);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	set_capture_mixer(codec);</div><div class='del'>-	set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC260_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 0);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x08;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC260_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc260_auto_init;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc260_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC882/883/885/888/889 support</div><div class='del'>- *</div><div class='del'>- * ALC882 is almost identical with ALC880 but has cleaner and more flexible</div><div class='del'>- * configuration.  Each pin widget can choose any input DACs and a mixer.</div><div class='del'>- * Each ADC is connected from a mixer of all inputs.  This makes possible</div><div class='del'>- * 6-channel independent captures.</div><div class='del'>- *</div><div class='del'>- * In addition, an independent DAC for the multi-playback (not used in this</div><div class='del'>- * driver yet).</div><div class='del'>- */</div><div class='del'>-#define ALC882_DIGOUT_NID	0x06</div><div class='del'>-#define ALC882_DIGIN_NID	0x0a</div><div class='del'>-#define ALC883_DIGOUT_NID	ALC882_DIGOUT_NID</div><div class='del'>-#define ALC883_DIGIN_NID	ALC882_DIGIN_NID</div><div class='del'>-#define ALC1200_DIGOUT_NID	0x10</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc882_ch_modes[1] = {</div><div class='del'>-	{ 8, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DACs */</div><div class='del'>-static hda_nid_t alc882_dac_nids[4] = {</div><div class='del'>-	/* front, rear, clfe, rear_surr */</div><div class='del'>-	0x02, 0x03, 0x04, 0x05</div><div class='del'>-};</div><div class='del'>-#define alc883_dac_nids		alc882_dac_nids</div><div class='del'>-</div><div class='del'>-/* ADCs */</div><div class='del'>-#define alc882_adc_nids		alc880_adc_nids</div><div class='del'>-#define alc882_adc_nids_alt	alc880_adc_nids_alt</div><div class='del'>-#define alc883_adc_nids		alc882_adc_nids_alt</div><div class='del'>-static hda_nid_t alc883_adc_nids_alt[1] = { 0x08 };</div><div class='del'>-static hda_nid_t alc883_adc_nids_rev[2] = { 0x09, 0x08 };</div><div class='del'>-#define alc889_adc_nids		alc880_adc_nids</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc882_capsrc_nids[3] = { 0x24, 0x23, 0x22 };</div><div class='del'>-static hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 };</div><div class='del'>-#define alc883_capsrc_nids	alc882_capsrc_nids_alt</div><div class='del'>-static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };</div><div class='del'>-#define alc889_capsrc_nids	alc882_capsrc_nids</div><div class='del'>-</div><div class='del'>-/* input MUX */</div><div class='del'>-/* FIXME: should be a matrix-type input source selection */</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc882_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc883_capture_source	alc882_capture_source</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc889_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Mic", 0x3 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux mb5_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x7 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux macmini3_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_3stack_6ch_intel = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_lenovo_101e_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_lenovo_nb0763_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Int Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_fujitsu_pi2515_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Int Mic", 0x1 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_lenovo_sky_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc883_asus_eee1601_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc889A_mb31_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		/* Front Mic (0x01) unused */</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		/* Line 2 (0x03) unused */</div><div class='del'>-		/* CD (0x04) unused? */</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc889A_imac91_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x01 },</div><div class='del'>-		{ "Line", 0x2 }, /* Not sure! */</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_channel_mode alc883_3ST_2ch_modes[1] = {</div><div class='del'>-	{ 2, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc882_3ST_ch2_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc882_3ST_ch4_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc882_3ST_ch6_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc882_3ST_6ch_modes[3] = {</div><div class='del'>-	{ 2, alc882_3ST_ch2_init },</div><div class='del'>-	{ 4, alc882_3ST_ch4_init },</div><div class='del'>-	{ 6, alc882_3ST_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc883_3ST_6ch_modes	alc882_3ST_6ch_modes</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch2_clevo_init[] = {</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch4_clevo_init[] = {</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch6_clevo_init[] = {</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc883_3ST_6ch_clevo_modes[3] = {</div><div class='del'>-	{ 2, alc883_3ST_ch2_clevo_init },</div><div class='del'>-	{ 4, alc883_3ST_ch4_clevo_init },</div><div class='del'>-	{ 6, alc883_3ST_ch6_clevo_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc882_sixstack_ch6_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc882_sixstack_ch8_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc882_sixstack_modes[2] = {</div><div class='del'>-	{ 6, alc882_sixstack_ch6_init },</div><div class='del'>-	{ 8, alc882_sixstack_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Macbook Air 2,1 */</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc885_mba21_ch_modes[1] = {</div><div class='del'>-      { 2, NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * macbook pro ALC885 can switch LineIn to LineOut without losing Mic</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc885_mbp_ch2_init[] = {</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc885_mbp_ch4_init[] = {</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc885_mbp_4ch_modes[2] = {</div><div class='del'>-	{ 2, alc885_mbp_ch2_init },</div><div class='del'>-	{ 4, alc885_mbp_ch4_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch</div><div class='del'>- * Speakers/Woofer/HP = Front</div><div class='del'>- * LineIn = Input</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc885_mb5_ch2_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- * Speakers/HP = Front</div><div class='del'>- * Woofer = LFE</div><div class='del'>- * LineIn = Surround</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc885_mb5_ch6_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc885_mb5_6ch_modes[2] = {</div><div class='del'>-	{ 2, alc885_mb5_ch2_init },</div><div class='del'>-	{ 6, alc885_mb5_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc885_macmini3_6ch_modes	alc885_mb5_6ch_modes</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_4ST_ch2_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_4ST_ch4_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_4ST_ch6_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_4ST_ch8_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc883_4ST_8ch_modes[4] = {</div><div class='del'>-	{ 2, alc883_4ST_ch2_init },</div><div class='del'>-	{ 4, alc883_4ST_ch4_init },</div><div class='del'>-	{ 6, alc883_4ST_ch6_init },</div><div class='del'>-	{ 8, alc883_4ST_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch2_intel_init[] = {</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch4_intel_init[] = {</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_3ST_ch6_intel_init[] = {</div><div class='del'>-	{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {</div><div class='del'>-	{ 2, alc883_3ST_ch2_intel_init },</div><div class='del'>-	{ 4, alc883_3ST_ch4_intel_init },</div><div class='del'>-	{ 6, alc883_3ST_ch6_intel_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc889_ch2_intel_init[] = {</div><div class='del'>-	{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc889_ch6_intel_init[] = {</div><div class='del'>-	{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc889_ch8_intel_init[] = {</div><div class='del'>-	{ 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x03 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc889_8ch_intel_modes[3] = {</div><div class='del'>-	{ 2, alc889_ch2_intel_init },</div><div class='del'>-	{ 6, alc889_ch6_intel_init },</div><div class='del'>-	{ 8, alc889_ch8_intel_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_sixstack_ch6_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_sixstack_ch8_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc883_sixstack_modes[2] = {</div><div class='del'>-	{ 6, alc883_sixstack_ch6_init },</div><div class='del'>-	{ 8, alc883_sixstack_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17</div><div class='del'>- *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc882_base_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Macbook Air 2,1 same control for HP and internal Speaker */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_mba21_mixer[] = {</div><div class='del'>-      HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-      HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_OUTPUT),</div><div class='del'>-     { }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_mbp3_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0e, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0e, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_mb5_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0x00, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_macmini3_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LFE Playback Volume", 0x0e, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("LFE Playback Switch", 0x0e, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0f, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_imac91_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc882_w2jc_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc882_targa_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Front=0x14, HP = 0x15, Front = 0x16, ???</div><div class='del'>- *                 Front Mic=0x18, Line In = 0x1a, Line In = 0x1b, CD = 0x1c</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc882_asus_a7j_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mobile Front Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mobile Line Playback Volume", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mobile Line Playback Switch", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc882_chmode_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_base_init_verbs[] = {</div><div class='del'>-	/* Front mixer: unmute input/output amp left and right (volume = 0) */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Rear mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* CLFE mixer */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Side mixer */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Rear Pin: output 1 (0x0d) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* CLFE Pin: output 2 (0x0e) */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* Side Pin: output 3 (0x0f) */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line-2 In: Headphone output (output 0 - 0x0c) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* ADC2: mute amp left and right */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* ADC3: mute amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_adc1_init_verbs[] = {</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* ADC1: mute amp left and right */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_eapd_verbs[] = {</div><div class='del'>-	/* change to EAPD mode */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x3060},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc889_eapd_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc_hp15_unsol_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc885_init_verbs[] = {</div><div class='del'>-	/* Front mixer: unmute input/output amp left and right (volume = 0) */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Rear mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* CLFE mixer */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* Side mixer */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Front HP Pin: output 0 (0x0c) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Rear Pin: output 1 (0x0d) */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* CLFE Pin: output 2 (0x0e) */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* Side Pin: output 3 (0x0f) */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	/* Mixer elements: 0x18, , 0x1a, 0x1b */</div><div class='del'>-	/* Input mixer1 */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* ADC2: mute amp left and right */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	/* ADC3: mute amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc885_init_input_verbs[] = {</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Unmute Selector 24h and set the default input to front mic */</div><div class='del'>-static struct hda_verb alc889_init_input_verbs[] = {</div><div class='del'>-	{0x24, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define alc883_init_verbs	alc882_base_init_verbs</div><div class='del'>-</div><div class='del'>-/* Mac Pro test */</div><div class='del'>-static struct snd_kcontrol_new alc882_macpro_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x18, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	/* FIXME: this looks suspicious...</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Beep Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	*/</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_macpro_init_verbs[] = {</div><div class='del'>-	/* Front mixer: unmute input/output amp left and right (volume = 0) */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Speaker:  output */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x04},</div><div class='del'>-	/* Headphone output (output 0 - 0x0c) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* ADC1: mute amp left and right */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* ADC2: mute amp left and right */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* ADC3: mute amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Macbook 5,1 */</div><div class='del'>-static struct hda_verb alc885_mb5_init_verbs[] = {</div><div class='del'>-	/* DACs */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Front mixer */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Surround mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* LFE mixer */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* HP mixer */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Front Pin (0x0c) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* LFE Pin (0x0e) */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* HP Pin (0x0f) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0x1)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x7)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0x4)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Macmini 3,1 */</div><div class='del'>-static struct hda_verb alc885_macmini3_init_verbs[] = {</div><div class='del'>-	/* DACs */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Front mixer */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Surround mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* LFE mixer */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* HP mixer */</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Front Pin (0x0c) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* LFE Pin (0x0e) */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x01},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* HP Pin (0x0f) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* Line In pin */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc885_mba21_init_verbs[] = {</div><div class='del'>-	/*Internal and HP Speaker Mixer*/</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/*Internal Speaker Pin (0x0c)*/</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) },</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP Pin: output 0 (0x0e) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, (ALC880_HP_EVENT | AC_USRSP_EN)},</div><div class='del'>-	/* Line in (is hp when jack connected)*/</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_VREF_50},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>- };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Macbook Pro rev3 */</div><div class='del'>-static struct hda_verb alc885_mbp3_init_verbs[] = {</div><div class='del'>-	/* Front mixer: unmute input/output amp left and right (volume = 0) */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Rear mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* HP mixer */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP Pin: output 0 (0x0e) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: use output 1 when in LineOut mode */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* ADC1: mute amp left and right */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* ADC2: mute amp left and right */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* ADC3: mute amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* iMac 9,1 */</div><div class='del'>-static struct hda_verb alc885_imac91_init_verbs[] = {</div><div class='del'>-	/* Internal Speaker Pin (0x0c) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) },</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) },</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP Pin: Rear */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, (ALC880_HP_EVENT | AC_USRSP_EN)},</div><div class='del'>-	/* Line in Rear */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_VREF_50},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Rear mixer */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* Line-Out mixer: unmute input/output amp left and right (volume = 0) */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* 0x24 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* 0x23 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* 0x22 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	/* 0x07 [Audio Input] wcaps 0x10011b: Stereo Amp-In */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* 0x08 [Audio Input] wcaps 0x10011b: Stereo Amp-In */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* 0x09 [Audio Input] wcaps 0x10011b: Stereo Amp-In */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* iMac 24 mixer. */</div><div class='del'>-static struct snd_kcontrol_new alc885_imac24_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x0c, 0x00, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* iMac 24 init verbs. */</div><div class='del'>-static struct hda_verb alc885_imac24_init_verbs[] = {</div><div class='del'>-	/* Internal speakers: output 0 (0x0c) */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Internal speakers: output 0 (0x0c) */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Headphone: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* Front Mic: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc885_imac24_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x18;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x1a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc885_mb5_setup	alc885_imac24_setup</div><div class='del'>-#define alc885_macmini3_setup	alc885_imac24_setup</div><div class='del'>-</div><div class='del'>-/* Macbook Air 2,1 */</div><div class='del'>-static void alc885_mba21_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-       struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-       spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-       spec-&gt;autocfg.speaker_pins[0] = 0x18;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alc885_mbp3_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc885_imac91_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x18;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x1a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_targa_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc882_targa_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,</div><div class='del'>-				  spec-&gt;jack_present ? 1 : 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_targa_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x1b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc882_targa_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_asus_a7j_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc882_asus_a7m_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */</div><div class='del'>- 	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)</div><div class='del'>-{</div><div class='del'>-	unsigned int gpiostate, gpiomask, gpiodir;</div><div class='del'>-</div><div class='del'>-	gpiostate = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				       AC_VERB_GET_GPIO_DATA, 0);</div><div class='del'>-</div><div class='del'>-	if (!muted)</div><div class='del'>-		gpiostate |= (1 &lt;&lt; pin);</div><div class='del'>-	else</div><div class='del'>-		gpiostate &amp;= ~(1 &lt;&lt; pin);</div><div class='del'>-</div><div class='del'>-	gpiomask = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				      AC_VERB_GET_GPIO_MASK, 0);</div><div class='del'>-	gpiomask |= (1 &lt;&lt; pin);</div><div class='del'>-</div><div class='del'>-	gpiodir = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				     AC_VERB_GET_GPIO_DIRECTION, 0);</div><div class='del'>-	gpiodir |= (1 &lt;&lt; pin);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0,</div><div class='del'>-			    AC_VERB_SET_GPIO_MASK, gpiomask);</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0,</div><div class='del'>-			    AC_VERB_SET_GPIO_DIRECTION, gpiodir);</div><div class='del'>-</div><div class='del'>-	msleep(1);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0,</div><div class='del'>-			    AC_VERB_SET_GPIO_DATA, gpiostate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set up GPIO at initialization */</div><div class='del'>-static void alc885_macpro_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc882_gpio_mute(codec, 0, 0);</div><div class='del'>-	alc882_gpio_mute(codec, 1, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set up GPIO and update auto-muting at initialization */</div><div class='del'>-static void alc885_imac24_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc885_macpro_init_hook(codec);</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc883_auto_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0f)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 2ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:front) */</div><div class='del'>-static struct hda_verb alc889A_mb31_ch2_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},             /* HP as front */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},    /* Line as input */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},   /* Line off */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 4ch mode (Speaker:front, Subwoofer:CLFE, Line:CLFE, Headphones:front) */</div><div class='del'>-static struct hda_verb alc889A_mb31_ch4_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},             /* HP as front */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},   /* Line as output */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 5ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:rear) */</div><div class='del'>-static struct hda_verb alc889A_mb31_ch5_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},             /* HP as rear */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},    /* Line as input */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},   /* Line off */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* 6ch mode (Speaker:front, Subwoofer:off, Line:CLFE, Headphones:Rear) */</div><div class='del'>-static struct hda_verb alc889A_mb31_ch6_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},             /* HP as front */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},   /* Subwoofer off */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},   /* Line as output */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Line on */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc889A_mb31_6ch_modes[4] = {</div><div class='del'>-	{ 2, alc889A_mb31_ch2_init },</div><div class='del'>-	{ 4, alc889A_mb31_ch4_init },</div><div class='del'>-	{ 5, alc889A_mb31_ch5_init },</div><div class='del'>-	{ 6, alc889A_mb31_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_medion_eapd_verbs[] = {</div><div class='del'>-        /* eanable EAPD on medion laptop */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x3070},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc883_base_mixer	alc882_base_mixer</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_mitac_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_clevo_m720_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc885_8ch_intel_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x1b, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_fivestack_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_targa_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_medion_md2_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_medion_wim2160_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_medion_wim2160_verbs[] = {</div><div class='del'>-	/* Unmute front mixer */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Set speaker pin to front mixer */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Init headphone pin */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc883_medion_wim2160_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1a;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0e, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume",</div><div class='del'>-						0x0d, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0d, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0d, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc889A_mb31_mixer[] = {</div><div class='del'>-	/* Output mixers */</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x00,</div><div class='del'>-		HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x02, HDA_INPUT),</div><div class='del'>-	/* Output switches */</div><div class='del'>-	HDA_CODEC_MUTE("Enable Speaker", 0x14, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Enable Headphones", 0x15, 0x00, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Enable LFE", 0x16, 2, 0x00, HDA_OUTPUT),</div><div class='del'>-	/* Boost mixers */</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),</div><div class='del'>-	/* Input mixers */</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_vaiott_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc883_bind_cap_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc883_bind_cap_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_asus_eee1601_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_asus_eee1601_cap_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Capture Volume", &amp;alc883_bind_cap_vol),</div><div class='del'>-	HDA_BIND_SW("Capture Switch", &amp;alc883_bind_cap_switch),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = alc_mux_enum_info,</div><div class='del'>-		.get = alc_mux_enum_get,</div><div class='del'>-		.put = alc_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc883_chmode_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc883_mitac_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* auto-toggle front mic */</div><div class='del'>-/*</div><div class='del'>-static void alc883_mitac_mic_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned char bits = snd_hda_jack_detect(codec, 0x18) ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_mitac_verbs[] = {</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Subwoofer */</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN}, */</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_clevo_m540r_verbs[] = {</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Int speaker */</div><div class='del'>-	/*{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},*/</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	/*</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_clevo_m720_verbs[] = {</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Int speaker */</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* Subwoofer */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_targa_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-/* Connect Line-Out side jack (SPDIF) to Side */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-/* Connect Mic jack to CLFE */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-/* Connect Line-in jack to Surround */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-/* Connect HP out jack to Front */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_lenovo_101e_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_FRONT_EVENT|AC_USRSP_EN},</div><div class='del'>-        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT|AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_lenovo_nb0763_verbs[] = {</div><div class='del'>-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_lenovo_ms7195_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_FRONT_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT    | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_haier_w66_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_lenovo_sky_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_6st_dell_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_vaiott_verbs[] = {</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc888_3st_hp_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x18;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_3st_hp_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Front: output 0 (0x0c) */</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Rear : output 1 (0x0d) */</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x02},	/* CLFE : output 2 (0x0e) */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_3st_hp_2ch_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 4ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_3st_hp_4ch_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc888_3st_hp_6ch_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x16, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc888_3st_hp_modes[3] = {</div><div class='del'>-	{ 2, alc888_3st_hp_2ch_init },</div><div class='del'>-	{ 4, alc888_3st_hp_4ch_init },</div><div class='del'>-	{ 6, alc888_3st_hp_6ch_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle front-jack and RCA according to the hp-jack state */</div><div class='del'>-static void alc888_lenovo_ms7195_front_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>- 	unsigned int present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle RCA according to the front-jack state */</div><div class='del'>-static void alc888_lenovo_ms7195_rca_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>- 	unsigned int present = snd_hda_jack_detect(codec, 0x14);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_lenovo_ms7195_unsol_event(struct hda_codec *codec,</div><div class='del'>-					     unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc888_lenovo_ms7195_front_automute(codec);</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_FRONT_EVENT)</div><div class='del'>-		alc888_lenovo_ms7195_rca_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_medion_md2_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc883_medion_md2_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-#define alc883_targa_init_hook		alc882_targa_init_hook</div><div class='del'>-#define alc883_targa_unsol_event	alc882_targa_unsol_event</div><div class='del'>-</div><div class='del'>-static void alc883_clevo_m720_mic_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x18);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_clevo_m720_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_clevo_m720_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	alc883_clevo_m720_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_clevo_m720_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc883_clevo_m720_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		alc_automute_amp_unsol_event(codec, res);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc883_2ch_fujitsu_pi2515_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_haier_w66_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int bits = snd_hda_jack_detect(codec, 0x14) ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_lenovo_101e_all_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int bits = snd_hda_jack_detect(codec, 0x1b) ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc883_lenovo_101e_all_automute(codec);</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_FRONT_EVENT)</div><div class='del'>-		alc883_lenovo_101e_ispeaker_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc883_acer_aspire_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc883_acer_eapd_verbs[] = {</div><div class='del'>-	/* HP Pin: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-        /* eanable EAPD on medion laptop */</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x3050},</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_acer_aspire_7730G_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc888_6st_dell_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[3] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc888_lenovo_sky_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[3] = 0x17;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[4] = 0x1a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc883_vaiott_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x17;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_asus_m90v_verbs[] = {</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc883_mode2_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[2] = 0x16;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc888_asus_eee1601_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x0b},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x0838},</div><div class='del'>-	/* enable unsolicited event */</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc883_eee1601_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x1b;</div><div class='del'>-	alc_automute_pin(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc889A_mb31_verbs[] = {</div><div class='del'>-	/* Init rear pin (used as headphone output) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},    /* Apple Headphones */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},           /* Connect to front */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	/* Init line pin (used as output in 4ch and 6ch mode) */</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x02},           /* Connect to CLFE */</div><div class='del'>-	/* Init line 2 pin (used as headphone out by default) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},  /* Use as input */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Mute output */</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Mute speakers according to the headphone jack state */</div><div class='del'>-static void alc889A_mb31_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-</div><div class='del'>-	/* Mute only in 2ch or 4ch mode */</div><div class='del'>-	if (snd_hda_codec_read(codec, 0x15, 0, AC_VERB_GET_CONNECT_SEL, 0)</div><div class='del'>-	    == 0x00) {</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x14,  HDA_OUTPUT, 0,</div><div class='del'>-			HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,</div><div class='del'>-			HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc889A_mb31_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define alc882_loopbacks	alc880_loopbacks</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc882_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc882_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc882_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc882_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc883_slave_dig_outs[] = {</div><div class='del'>-	ALC1200_DIGOUT_NID, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc1200_slave_dig_outs[] = {</div><div class='del'>-	ALC883_DIGOUT_NID, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc882_models[ALC882_MODEL_LAST] = {</div><div class='del'>-	[ALC882_3ST_DIG]	= "3stack-dig",</div><div class='del'>-	[ALC882_6ST_DIG]	= "6stack-dig",</div><div class='del'>-	[ALC882_ARIMA]		= "arima",</div><div class='del'>-	[ALC882_W2JC]		= "w2jc",</div><div class='del'>-	[ALC882_TARGA]		= "targa",</div><div class='del'>-	[ALC882_ASUS_A7J]	= "asus-a7j",</div><div class='del'>-	[ALC882_ASUS_A7M]	= "asus-a7m",</div><div class='del'>-	[ALC885_MACPRO]		= "macpro",</div><div class='del'>-	[ALC885_MB5]		= "mb5",</div><div class='del'>-	[ALC885_MACMINI3]	= "macmini3",</div><div class='del'>-	[ALC885_MBA21]		= "mba21",</div><div class='del'>-	[ALC885_MBP3]		= "mbp3",</div><div class='del'>-	[ALC885_IMAC24]		= "imac24",</div><div class='del'>-	[ALC885_IMAC91]		= "imac91",</div><div class='del'>-	[ALC883_3ST_2ch_DIG]	= "3stack-2ch-dig",</div><div class='del'>-	[ALC883_3ST_6ch_DIG]	= "3stack-6ch-dig",</div><div class='del'>-	[ALC883_3ST_6ch]	= "3stack-6ch",</div><div class='del'>-	[ALC883_6ST_DIG]	= "alc883-6stack-dig",</div><div class='del'>-	[ALC883_TARGA_DIG]	= "targa-dig",</div><div class='del'>-	[ALC883_TARGA_2ch_DIG]	= "targa-2ch-dig",</div><div class='del'>-	[ALC883_TARGA_8ch_DIG]	= "targa-8ch-dig",</div><div class='del'>-	[ALC883_ACER]		= "acer",</div><div class='del'>-	[ALC883_ACER_ASPIRE]	= "acer-aspire",</div><div class='del'>-	[ALC888_ACER_ASPIRE_4930G]	= "acer-aspire-4930g",</div><div class='del'>-	[ALC888_ACER_ASPIRE_6530G]	= "acer-aspire-6530g",</div><div class='del'>-	[ALC888_ACER_ASPIRE_8930G]	= "acer-aspire-8930g",</div><div class='del'>-	[ALC888_ACER_ASPIRE_7730G]	= "acer-aspire-7730g",</div><div class='del'>-	[ALC883_MEDION]		= "medion",</div><div class='del'>-	[ALC883_MEDION_MD2]	= "medion-md2",</div><div class='del'>-	[ALC883_MEDION_WIM2160]	= "medion-wim2160",</div><div class='del'>-	[ALC883_LAPTOP_EAPD]	= "laptop-eapd",</div><div class='del'>-	[ALC883_LENOVO_101E_2ch] = "lenovo-101e",</div><div class='del'>-	[ALC883_LENOVO_NB0763]	= "lenovo-nb0763",</div><div class='del'>-	[ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig",</div><div class='del'>-	[ALC888_LENOVO_SKY] = "lenovo-sky",</div><div class='del'>-	[ALC883_HAIER_W66] 	= "haier-w66",</div><div class='del'>-	[ALC888_3ST_HP]		= "3stack-hp",</div><div class='del'>-	[ALC888_6ST_DELL]	= "6stack-dell",</div><div class='del'>-	[ALC883_MITAC]		= "mitac",</div><div class='del'>-	[ALC883_CLEVO_M540R]	= "clevo-m540r",</div><div class='del'>-	[ALC883_CLEVO_M720]	= "clevo-m720",</div><div class='del'>-	[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",</div><div class='del'>-	[ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",</div><div class='del'>-	[ALC883_3ST_6ch_INTEL]	= "3stack-6ch-intel",</div><div class='del'>-	[ALC889A_INTEL]		= "intel-alc889a",</div><div class='del'>-	[ALC889_INTEL]		= "intel-x58",</div><div class='del'>-	[ALC1200_ASUS_P5Q]	= "asus-p5q",</div><div class='del'>-	[ALC889A_MB31]		= "mb31",</div><div class='del'>-	[ALC883_SONY_VAIO_TT]	= "sony-vaio-tt",</div><div class='del'>-	[ALC882_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc882_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC882_6ST_DIG),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x010a, "Acer Ferrari 5000", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",</div><div class='del'>-		ALC888_ACER_ASPIRE_4930G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",</div><div class='del'>-		ALC888_ACER_ASPIRE_4930G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G",</div><div class='del'>-		ALC888_ACER_ASPIRE_8930G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0146, "Acer Aspire 6935G",</div><div class='del'>-		ALC888_ACER_ASPIRE_8930G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0157, "Acer X3200", ALC882_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0158, "Acer AX1700-U3700A", ALC882_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",</div><div class='del'>-		ALC888_ACER_ASPIRE_6530G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G",</div><div class='del'>-		ALC888_ACER_ASPIRE_6530G),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",</div><div class='del'>-		ALC888_ACER_ASPIRE_7730G),</div><div class='del'>-	/* default Acer -- disabled as it causes more problems.</div><div class='del'>-	 *    model=auto should work fine now</div><div class='del'>-	 */</div><div class='del'>-	/* SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), */</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a66, "HP Acacia", ALC888_3ST_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2a72, "HP Educ.ar", ALC888_3ST_HP),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x060d, "Asus A7J", ALC882_ASUS_A7J),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1243, "Asus A7J", ALC882_ASUS_A7J),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_ASUS_A7M),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_W2JC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC883_SONY_VAIO_TT),</div><div class='del'>-	SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1071, 0x8227, "Mitac 82801H", ALC883_MITAC),</div><div class='del'>-	SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),</div><div class='del'>-	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),</div><div class='del'>-	SND_PCI_QUIRK(0x108e, 0x534d, NULL, ALC883_3ST_6ch),</div><div class='del'>-	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x0349, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x0579, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8  */</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC882_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3729, "MSI S420", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3783, "NEC S970", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3b7f, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3ef9, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3fc1, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3fc3, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3fcc, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x3fdf, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x42cd, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7250, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7260, "MSI 7260", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7267, "MSI", ALC883_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x0571, "Clevo laptop M570U", ALC883_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x0722, "Clevo laptop M720SR", ALC883_CLEVO_M720),</div><div class='del'>-	SND_PCI_QUIRK(0x1558, 0x5409, "Clevo laptop M540R", ALC883_CLEVO_M540R),</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC883_LAPTOP_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),</div><div class='del'>-	/* SND_PCI_QUIRK(0x161f, 0x2054, "Arima W820", ALC882_ARIMA), */</div><div class='del'>-	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1734, 0xfff0, 0x1100, "FSC AMILO Xi/Pi25xx",</div><div class='del'>-		      ALC883_FUJITSU_PI2515),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1734, 0xfff0, 0x1130, "Fujitsu AMILO Xa35xx",</div><div class='del'>-		ALC888_FUJITSU_XA3530),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x101d, "Lenovo Sky", ALC888_LENOVO_SKY),</div><div class='del'>-	SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),</div><div class='del'>-	SND_PCI_QUIRK(0x17c0, 0x4085, "MEDION MD96630", ALC888_LENOVO_MS7195_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),</div><div class='del'>-</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC889_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x0021, "Intel IbexPeak", ALC889A_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0x3b56, "Intel IbexPeak", ALC889A_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC882_6ST_DIG),</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* codec SSID table for Intel Mac */</div><div class='del'>-static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x00a1, "Macbook", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x00a4, "MacbookPro 4,1", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x0c00, "Mac Pro", ALC885_MACPRO),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x1000, "iMac 24", ALC885_IMAC24),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889A_MB31),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_ASUS_A7M),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC885_IMAC91),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC885_MB5),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC885_MB5),</div><div class='del'>-	/* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2,</div><div class='del'>-	 * so apparently no perfect solution yet</div><div class='del'>-	 */</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5),</div><div class='del'>-	SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc882_presets[] = {</div><div class='del'>-	[ALC882_3ST_DIG] = {</div><div class='del'>-		.mixers = { alc882_base_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs,</div><div class='del'>-				alc882_adc1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),</div><div class='del'>-		.channel_mode = alc882_ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_6ST_DIG] = {</div><div class='del'>-		.mixers = { alc882_base_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs,</div><div class='del'>-				alc882_adc1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),</div><div class='del'>-		.channel_mode = alc882_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_ARIMA] = {</div><div class='del'>-		.mixers = { alc882_base_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,</div><div class='del'>-				alc882_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes),</div><div class='del'>-		.channel_mode = alc882_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_W2JC] = {</div><div class='del'>-		.mixers = { alc882_w2jc_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,</div><div class='del'>-				alc882_eapd_verbs, alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-	},</div><div class='del'>-	   [ALC885_MBA21] = {</div><div class='del'>-			.mixers = { alc885_mba21_mixer },</div><div class='del'>-			.init_verbs = { alc885_mba21_init_verbs, alc880_gpio1_init_verbs },</div><div class='del'>-			.num_dacs = 2,</div><div class='del'>-			.dac_nids = alc882_dac_nids,</div><div class='del'>-			.channel_mode = alc885_mba21_ch_modes,</div><div class='del'>-			.num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),</div><div class='del'>-			.input_mux = &amp;alc882_capture_source,</div><div class='del'>-			.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-			.setup = alc885_mba21_setup,</div><div class='del'>-			.init_hook = alc_automute_amp,</div><div class='del'>-       },</div><div class='del'>-	[ALC885_MBP3] = {</div><div class='del'>-		.mixers = { alc885_mbp3_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc885_mbp3_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = 2,</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.hp_nid = 0x04,</div><div class='del'>-		.channel_mode = alc885_mbp_4ch_modes,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc885_mbp_4ch_modes),</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc885_mbp3_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC885_MB5] = {</div><div class='del'>-		.mixers = { alc885_mb5_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc885_mb5_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.channel_mode = alc885_mb5_6ch_modes,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc885_mb5_6ch_modes),</div><div class='del'>-		.input_mux = &amp;mb5_capture_source,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc885_mb5_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC885_MACMINI3] = {</div><div class='del'>-		.mixers = { alc885_macmini3_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc885_macmini3_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.channel_mode = alc885_macmini3_6ch_modes,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc885_macmini3_6ch_modes),</div><div class='del'>-		.input_mux = &amp;macmini3_capture_source,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc885_macmini3_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC885_MACPRO] = {</div><div class='del'>-		.mixers = { alc882_macpro_mixer },</div><div class='del'>-		.init_verbs = { alc882_macpro_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),</div><div class='del'>-		.channel_mode = alc882_ch_modes,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-		.init_hook = alc885_macpro_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC885_IMAC24] = {</div><div class='del'>-		.mixers = { alc885_imac24_mixer },</div><div class='del'>-		.init_verbs = { alc885_imac24_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_ch_modes),</div><div class='del'>-		.channel_mode = alc882_ch_modes,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc885_imac24_setup,</div><div class='del'>-		.init_hook = alc885_imac24_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC885_IMAC91] = {</div><div class='del'>-		.mixers = {alc885_imac91_mixer},</div><div class='del'>-		.init_verbs = { alc885_imac91_init_verbs,</div><div class='del'>-				alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.channel_mode = alc885_mba21_ch_modes,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),</div><div class='del'>-		.input_mux = &amp;alc889A_imac91_capture_source,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC882_DIGIN_NID,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc885_imac91_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_TARGA] = {</div><div class='del'>-		.mixers = { alc882_targa_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,</div><div class='del'>-				alc880_gpio3_init_verbs, alc882_targa_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc882_adc_nids),</div><div class='del'>-		.adc_nids = alc882_adc_nids,</div><div class='del'>-		.capsrc_nids = alc882_capsrc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc882_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-		.unsol_event = alc882_targa_unsol_event,</div><div class='del'>-		.setup = alc882_targa_setup,</div><div class='del'>-		.init_hook = alc882_targa_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_ASUS_A7J] = {</div><div class='del'>-		.mixers = { alc882_asus_a7j_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,</div><div class='del'>-				alc882_asus_a7j_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc882_adc_nids),</div><div class='del'>-		.adc_nids = alc882_adc_nids,</div><div class='del'>-		.capsrc_nids = alc882_capsrc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc882_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc882_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC882_ASUS_A7M] = {</div><div class='del'>-		.mixers = { alc882_asus_a7m_mixer, alc882_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc882_base_init_verbs, alc882_adc1_init_verbs,</div><div class='del'>-				alc882_eapd_verbs, alc880_gpio1_init_verbs,</div><div class='del'>-				alc882_asus_a7m_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc882_dac_nids),</div><div class='del'>-		.dac_nids = alc882_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC882_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),</div><div class='del'>-		.channel_mode = alc880_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc882_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_3ST_2ch_DIG] = {</div><div class='del'>-		.mixers = { alc883_3ST_2ch_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_3ST_6ch_DIG] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_3ST_6ch] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_3ST_6ch_INTEL] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_intel_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.slave_dig_outs = alc883_slave_dig_outs,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_intel_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_intel_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_3stack_6ch_intel,</div><div class='del'>-	},</div><div class='del'>-	[ALC889A_INTEL] = {</div><div class='del'>-		.mixers = { alc885_8ch_intel_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc885_init_verbs, alc885_init_input_verbs,</div><div class='del'>-				alc_hp15_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc889_adc_nids),</div><div class='del'>-		.adc_nids = alc889_adc_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.slave_dig_outs = alc883_slave_dig_outs,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc889_8ch_intel_modes),</div><div class='del'>-		.channel_mode = alc889_8ch_intel_modes,</div><div class='del'>-		.capsrc_nids = alc889_capsrc_nids,</div><div class='del'>-		.input_mux = &amp;alc889_capture_source,</div><div class='del'>-		.setup = alc889_automute_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-	},</div><div class='del'>-	[ALC889_INTEL] = {</div><div class='del'>-		.mixers = { alc885_8ch_intel_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc885_init_verbs, alc889_init_input_verbs,</div><div class='del'>-				alc889_eapd_verbs, alc_hp15_unsol_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc889_adc_nids),</div><div class='del'>-		.adc_nids = alc889_adc_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.slave_dig_outs = alc883_slave_dig_outs,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc889_8ch_intel_modes),</div><div class='del'>-		.channel_mode = alc889_8ch_intel_modes,</div><div class='del'>-		.capsrc_nids = alc889_capsrc_nids,</div><div class='del'>-		.input_mux = &amp;alc889_capture_source,</div><div class='del'>-		.setup = alc889_automute_setup,</div><div class='del'>-		.init_hook = alc889_intel_init_hook,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_6ST_DIG] = {</div><div class='del'>-		.mixers = { alc883_base_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),</div><div class='del'>-		.channel_mode = alc883_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_TARGA_DIG] = {</div><div class='del'>-		.mixers = { alc883_targa_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,</div><div class='del'>-				alc883_targa_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc883_targa_unsol_event,</div><div class='del'>-		.setup = alc882_targa_setup,</div><div class='del'>-		.init_hook = alc882_targa_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_TARGA_2ch_DIG] = {</div><div class='del'>-		.mixers = { alc883_targa_2ch_mixer},</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,</div><div class='del'>-				alc883_targa_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.adc_nids = alc883_adc_nids_alt,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc883_targa_unsol_event,</div><div class='del'>-		.setup = alc882_targa_setup,</div><div class='del'>-		.init_hook = alc882_targa_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_TARGA_8ch_DIG] = {</div><div class='del'>-		.mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer,</div><div class='del'>-			    alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,</div><div class='del'>-				alc883_targa_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),</div><div class='del'>-		.adc_nids = alc883_adc_nids_rev,</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids_rev,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_4ST_8ch_modes),</div><div class='del'>-		.channel_mode = alc883_4ST_8ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc883_targa_unsol_event,</div><div class='del'>-		.setup = alc882_targa_setup,</div><div class='del'>-		.init_hook = alc882_targa_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_ACER] = {</div><div class='del'>-		.mixers = { alc883_base_mixer },</div><div class='del'>-		/* On TravelMate laptops, GPIO 0 enables the internal speaker</div><div class='del'>-		 * and the headphone jack.  Turn this on and rely on the</div><div class='del'>-		 * standard mute methods whenever the user wants to turn</div><div class='del'>-		 * these outputs off.</div><div class='del'>-		 */</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_ACER_ASPIRE] = {</div><div class='del'>-		.mixers = { alc883_acer_aspire_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_acer_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_acer_aspire_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ACER_ASPIRE_4930G] = {</div><div class='del'>-		.mixers = { alc888_base_mixer,</div><div class='del'>-				alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,</div><div class='del'>-				alc888_acer_aspire_4930g_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),</div><div class='del'>-		.adc_nids = alc883_adc_nids_rev,</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids_rev,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.const_channel_count = 6,</div><div class='del'>-		.num_mux_defs =</div><div class='del'>-			ARRAY_SIZE(alc888_2_capture_sources),</div><div class='del'>-		.input_mux = alc888_2_capture_sources,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_acer_aspire_4930g_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ACER_ASPIRE_6530G] = {</div><div class='del'>-		.mixers = { alc888_acer_aspire_6530_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,</div><div class='del'>-				alc888_acer_aspire_6530g_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),</div><div class='del'>-		.adc_nids = alc883_adc_nids_rev,</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids_rev,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.num_mux_defs =</div><div class='del'>-			ARRAY_SIZE(alc888_2_capture_sources),</div><div class='del'>-		.input_mux = alc888_acer_aspire_6530_sources,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_acer_aspire_6530g_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ACER_ASPIRE_8930G] = {</div><div class='del'>-		.mixers = { alc889_acer_aspire_8930g_mixer,</div><div class='del'>-				alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,</div><div class='del'>-				alc889_acer_aspire_8930g_verbs,</div><div class='del'>-				alc889_eapd_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc889_adc_nids),</div><div class='del'>-		.adc_nids = alc889_adc_nids,</div><div class='del'>-		.capsrc_nids = alc889_capsrc_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.const_channel_count = 6,</div><div class='del'>-		.num_mux_defs =</div><div class='del'>-			ARRAY_SIZE(alc889_capture_sources),</div><div class='del'>-		.input_mux = alc889_capture_sources,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc889_acer_aspire_8930g_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-		.power_hook = alc_power_eapd,</div><div class='del'>-#endif</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ACER_ASPIRE_7730G] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer,</div><div class='del'>-				alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,</div><div class='del'>-				alc888_acer_aspire_7730G_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),</div><div class='del'>-		.adc_nids = alc883_adc_nids_rev,</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids_rev,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.const_channel_count = 6,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_acer_aspire_6530g_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_MEDION] = {</div><div class='del'>-		.mixers = { alc883_fivestack_mixer,</div><div class='del'>-			    alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs,</div><div class='del'>-				alc883_medion_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.adc_nids = alc883_adc_nids_alt,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),</div><div class='del'>-		.channel_mode = alc883_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_MEDION_MD2] = {</div><div class='del'>-		.mixers = { alc883_medion_md2_mixer},</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_medion_md2_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_medion_md2_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_MEDION_WIM2160] = {</div><div class='del'>-		.mixers = { alc883_medion_wim2160_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_medion_wim2160_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),</div><div class='del'>-		.adc_nids = alc883_adc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_medion_wim2160_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_LAPTOP_EAPD] = {</div><div class='del'>-		.mixers = { alc883_base_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc882_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_CLEVO_M540R] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_clevo_m540r_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_clevo_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_clevo_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		/* This machine has the hardware HP auto-muting, thus</div><div class='del'>-		 * we need no software mute via unsol event</div><div class='del'>-		 */</div><div class='del'>-	},</div><div class='del'>-	[ALC883_CLEVO_M720] = {</div><div class='del'>-		.mixers = { alc883_clevo_m720_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_clevo_m720_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc883_clevo_m720_unsol_event,</div><div class='del'>-		.setup = alc883_clevo_m720_setup,</div><div class='del'>-		.init_hook = alc883_clevo_m720_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_LENOVO_101E_2ch] = {</div><div class='del'>-		.mixers = { alc883_lenovo_101e_2ch_mixer},</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_lenovo_101e_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.adc_nids = alc883_adc_nids_alt,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_lenovo_101e_capture_source,</div><div class='del'>-		.unsol_event = alc883_lenovo_101e_unsol_event,</div><div class='del'>-		.init_hook = alc883_lenovo_101e_all_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_LENOVO_NB0763] = {</div><div class='del'>-		.mixers = { alc883_lenovo_nb0763_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_lenovo_nb0763_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_lenovo_nb0763_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_medion_md2_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_LENOVO_MS7195_DIG] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_lenovo_ms7195_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc883_lenovo_ms7195_unsol_event,</div><div class='del'>-		.init_hook = alc888_lenovo_ms7195_front_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_HAIER_W66] = {</div><div class='del'>-		.mixers = { alc883_targa_2ch_mixer},</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_haier_w66_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_3ST_HP] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_3st_hp_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc888_3st_hp_modes),</div><div class='del'>-		.channel_mode = alc888_3st_hp_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_3st_hp_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_6ST_DELL] = {</div><div class='del'>-		.mixers = { alc883_base_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),</div><div class='del'>-		.channel_mode = alc883_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_6st_dell_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_MITAC] = {</div><div class='del'>-		.mixers = { alc883_mitac_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_mitac_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_mitac_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_FUJITSU_PI2515] = {</div><div class='del'>-		.mixers = { alc883_2ch_fujitsu_pi2515_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs,</div><div class='del'>-				alc883_2ch_fujitsu_pi2515_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_fujitsu_pi2515_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_2ch_fujitsu_pi2515_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_FUJITSU_XA3530] = {</div><div class='del'>-		.mixers = { alc888_base_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs,</div><div class='del'>-			alc888_fujitsu_xa3530_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),</div><div class='del'>-		.adc_nids = alc883_adc_nids_rev,</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids_rev,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes),</div><div class='del'>-		.channel_mode = alc888_4ST_8ch_intel_modes,</div><div class='del'>-		.num_mux_defs =</div><div class='del'>-			ARRAY_SIZE(alc888_2_capture_sources),</div><div class='del'>-		.input_mux = alc888_2_capture_sources,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_fujitsu_xa3530_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_LENOVO_SKY] = {</div><div class='del'>-		.mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_lenovo_sky_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),</div><div class='del'>-		.channel_mode = alc883_sixstack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_lenovo_sky_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc888_lenovo_sky_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ASUS_M90V] = {</div><div class='del'>-		.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_asus_m90v_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_fujitsu_pi2515_capture_source,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc883_mode2_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC888_ASUS_EEE1601] = {</div><div class='del'>-		.mixers = { alc883_asus_eee1601_mixer },</div><div class='del'>-		.cap_mixer = alc883_asus_eee1601_cap_mixer,</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc888_asus_eee1601_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc883_asus_eee1601_capture_source,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.init_hook = alc883_eee1601_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC1200_ASUS_P5Q] = {</div><div class='del'>-		.mixers = { alc883_base_mixer, alc883_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC1200_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC883_DIGIN_NID,</div><div class='del'>-		.slave_dig_outs = alc1200_slave_dig_outs,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),</div><div class='del'>-		.channel_mode = alc883_sixstack_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC889A_MB31] = {</div><div class='del'>-		.mixers = { alc889A_mb31_mixer, alc883_chmode_mixer},</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc889A_mb31_verbs,</div><div class='del'>-			alc880_gpio1_init_verbs },</div><div class='del'>-		.adc_nids = alc883_adc_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),</div><div class='del'>-		.capsrc_nids = alc883_capsrc_nids,</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.channel_mode = alc889A_mb31_6ch_modes,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc889A_mb31_6ch_modes),</div><div class='del'>-		.input_mux = &amp;alc889A_mb31_capture_source,</div><div class='del'>-		.dig_out_nid = ALC883_DIGOUT_NID,</div><div class='del'>-		.unsol_event = alc889A_mb31_unsol_event,</div><div class='del'>-		.init_hook = alc889A_mb31_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC883_SONY_VAIO_TT] = {</div><div class='del'>-		.mixers = { alc883_vaiott_mixer },</div><div class='del'>-		.init_verbs = { alc883_init_verbs, alc883_vaiott_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc883_dac_nids),</div><div class='del'>-		.dac_nids = alc883_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc883_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc883_vaiott_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pin config fixes</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	PINFIX_ABIT_AW9D_MAX,</div><div class='del'>-	PINFIX_PB_M5210,</div><div class='del'>-	PINFIX_ACER_ASPIRE_7736,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc882_fixups[] = {</div><div class='del'>-	[PINFIX_ABIT_AW9D_MAX] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x15, 0x01080104 }, /* side */</div><div class='del'>-			{ 0x16, 0x01011012 }, /* rear */</div><div class='del'>-			{ 0x17, 0x01016011 }, /* clfe */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	[PINFIX_PB_M5210] = {</div><div class='del'>-		.verbs = (const struct hda_verb[]) {</div><div class='del'>-			{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },</div><div class='del'>-			{}</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	[PINFIX_ACER_ASPIRE_7736] = {</div><div class='del'>-		.sku = ALC_FIXUP_SKU_IGNORE,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc882_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210),</div><div class='del'>-	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc882_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0x0b, 0x23, 0x22);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type,</div><div class='del'>-					      hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	/* set as output */</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-</div><div class='del'>-	if (dac == 0x25)</div><div class='del'>-		idx = 4;</div><div class='del'>-	else if (dac &gt;= 0x02 &amp;&amp; dac &lt;= 0x05)</div><div class='del'>-		idx = dac - 2;</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= HDA_SIDE; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		if (nid)</div><div class='del'>-			alc882_auto_set_output_and_unmute(codec, nid, pin_type,</div><div class='del'>-					spec-&gt;multiout.dac_nids[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin, dac;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;autocfg.hp_pins); i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		if (!pin)</div><div class='del'>-			break;</div><div class='del'>-		dac = spec-&gt;multiout.hp_nid;</div><div class='del'>-		if (!dac)</div><div class='del'>-			dac = spec-&gt;multiout.dac_nids[0]; /* to front */</div><div class='del'>-		alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;autocfg.speaker_pins); i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.speaker_pins[i];</div><div class='del'>-		if (!pin)</div><div class='del'>-			break;</div><div class='del'>-		dac = spec-&gt;multiout.extra_out_nid[0];</div><div class='del'>-		if (!dac)</div><div class='del'>-			dac = spec-&gt;multiout.dac_nids[0]; /* to front */</div><div class='del'>-		alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-		if (get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP)</div><div class='del'>-			snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-					    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-					    AMP_OUT_MUTE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc882_auto_init_input_src(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int c;</div><div class='del'>-</div><div class='del'>-	for (c = 0; c &lt; spec-&gt;num_adc_nids; c++) {</div><div class='del'>-		hda_nid_t conn_list[HDA_MAX_NUM_INPUTS];</div><div class='del'>-		hda_nid_t nid = spec-&gt;capsrc_nids[c];</div><div class='del'>-		unsigned int mux_idx;</div><div class='del'>-		const struct hda_input_mux *imux;</div><div class='del'>-		int conns, mute, idx, item;</div><div class='del'>-</div><div class='del'>-		conns = snd_hda_get_connections(codec, nid, conn_list,</div><div class='del'>-						ARRAY_SIZE(conn_list));</div><div class='del'>-		if (conns &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		mux_idx = c &gt;= spec-&gt;num_mux_defs ? 0 : c;</div><div class='del'>-		imux = &amp;spec-&gt;input_mux[mux_idx];</div><div class='del'>-		if (!imux-&gt;num_items &amp;&amp; mux_idx &gt; 0)</div><div class='del'>-			imux = &amp;spec-&gt;input_mux[0];</div><div class='del'>-		for (idx = 0; idx &lt; conns; idx++) {</div><div class='del'>-			/* if the current connection is the selected one,</div><div class='del'>-			 * unmute it as default - otherwise mute it</div><div class='del'>-			 */</div><div class='del'>-			mute = AMP_IN_MUTE(idx);</div><div class='del'>-			for (item = 0; item &lt; imux-&gt;num_items; item++) {</div><div class='del'>-				if (imux-&gt;items[item].index == idx) {</div><div class='del'>-					if (spec-&gt;cur_mux[c] == item)</div><div class='del'>-						mute = AMP_IN_UNMUTE(idx);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* check if we have a selector or mixer</div><div class='del'>-			 * we could check for the widget type instead, but</div><div class='del'>-			 * just check for Amp-In presence (in case of mixer</div><div class='del'>-			 * without amp-in there is something wrong, this</div><div class='del'>-			 * function shouldn't be used or capsrc nid is wrong)</div><div class='del'>-			 */</div><div class='del'>-			if (get_wcaps(codec, nid) &amp; AC_WCAP_IN_AMP)</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						    mute);</div><div class='del'>-			else if (mute != AMP_IN_MUTE(idx))</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						    AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-						    idx);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add mic boosts if needed */</div><div class='del'>-static int alc_auto_add_mic_boost(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, err;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		if (cfg-&gt;inputs[i].type &gt; AUTO_PIN_MIC)</div><div class='del'>-			break;</div><div class='del'>-		nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (get_wcaps(codec, nid) &amp; AC_WCAP_IN_AMP) {</div><div class='del'>-			char label[32];</div><div class='del'>-			snprintf(label, sizeof(label), "%s Boost",</div><div class='del'>-				 hda_get_autocfg_input_label(codec, cfg, i));</div><div class='del'>-			err = add_control(spec, ALC_CTL_WIDGET_VOL, label, 0,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* almost identical with ALC880 parser... */</div><div class='del'>-static int alc882_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	static hda_nid_t alc882_ignore[] = { 0x1d, 0 };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc882_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = alc880_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_extra_out(spec, spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-					   "Headphone");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc880_auto_create_extra_out(spec,</div><div class='del'>-					   spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-					   "Speaker");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc882_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc883_auto_init_verbs);</div><div class='del'>-	/* if ADC 0x07 is available, initialize it, too */</div><div class='del'>-	if (get_wcaps_type(get_wcaps(codec, 0x07)) == AC_WID_AUD_IN)</div><div class='del'>-		add_verb(spec, alc882_adc1_init_verbs);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 1; /* config found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc882_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc882_auto_init_multi_out(codec);</div><div class='del'>-	alc882_auto_init_hp_out(codec);</div><div class='del'>-	alc882_auto_init_analog_input(codec);</div><div class='del'>-	alc882_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_alc882(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x10ec0882:</div><div class='del'>-	case 0x10ec0885:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* ALC883 and variants */</div><div class='del'>-		alc_fix_pll_init(codec, 0x20, 0x0a, 10);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC882_MODEL_LAST,</div><div class='del'>-						  alc882_models,</div><div class='del'>-						  alc882_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC882_MODEL_LAST)</div><div class='del'>-		board_config = snd_hda_check_board_codec_sid_config(codec,</div><div class='del'>-			ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC882_MODEL_LAST) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC882_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC882_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 1);</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_customize_define(codec);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC882_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc882_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC882_3ST_DIG;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_cdefine_beep(codec)) {</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC882_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc882_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc882_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc882_pcm_analog_capture;</div><div class='del'>-	/* FIXME: setup DAC5 */</div><div class='del'>-	/*spec-&gt;stream_analog_alt_playback = &amp;alc880_pcm_analog_alt_playback;*/</div><div class='del'>-	spec-&gt;stream_analog_alt_capture = &amp;alc880_pcm_analog_alt_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc882_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc882_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		int i, j;</div><div class='del'>-		spec-&gt;num_adc_nids = 0;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(alc882_adc_nids); i++) {</div><div class='del'>-			const struct hda_input_mux *imux = spec-&gt;input_mux;</div><div class='del'>-			hda_nid_t cap;</div><div class='del'>-			hda_nid_t items[16];</div><div class='del'>-			hda_nid_t nid = alc882_adc_nids[i];</div><div class='del'>-			unsigned int wcap = get_wcaps(codec, nid);</div><div class='del'>-			/* get type */</div><div class='del'>-			wcap = get_wcaps_type(wcap);</div><div class='del'>-			if (wcap != AC_WID_AUD_IN)</div><div class='del'>-				continue;</div><div class='del'>-			spec-&gt;private_adc_nids[spec-&gt;num_adc_nids] = nid;</div><div class='del'>-			err = snd_hda_get_connections(codec, nid, &amp;cap, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-			err = snd_hda_get_connections(codec, cap, items,</div><div class='del'>-						      ARRAY_SIZE(items));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				continue;</div><div class='del'>-			for (j = 0; j &lt; imux-&gt;num_items; j++)</div><div class='del'>-				if (imux-&gt;items[j].index &gt;= err)</div><div class='del'>-					break;</div><div class='del'>-			if (j &lt; imux-&gt;num_items)</div><div class='del'>-				continue;</div><div class='del'>-			spec-&gt;private_capsrc_nids[spec-&gt;num_adc_nids] = cap;</div><div class='del'>-			spec-&gt;num_adc_nids++;</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;adc_nids = spec-&gt;private_adc_nids;</div><div class='del'>-		spec-&gt;capsrc_nids = spec-&gt;private_capsrc_nids;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_capture_mixer(codec);</div><div class='del'>-</div><div class='del'>-	if (has_cdefine_beep(codec))</div><div class='del'>-		set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC882_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 0);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x0c;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC882_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc882_auto_init;</div><div class='del'>-</div><div class='del'>-	alc_init_jacks(codec);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc882_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC262 support</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ALC262_DIGOUT_NID	ALC880_DIGOUT_NID</div><div class='del'>-#define ALC262_DIGIN_NID	ALC880_DIGIN_NID</div><div class='del'>-</div><div class='del'>-#define alc262_dac_nids		alc260_dac_nids</div><div class='del'>-#define alc262_adc_nids		alc882_adc_nids</div><div class='del'>-#define alc262_adc_nids_alt	alc882_adc_nids_alt</div><div class='del'>-#define alc262_capsrc_nids	alc882_capsrc_nids</div><div class='del'>-#define alc262_capsrc_nids_alt	alc882_capsrc_nids_alt</div><div class='del'>-</div><div class='del'>-#define alc262_modes		alc260_modes</div><div class='del'>-#define alc262_capture_source	alc882_capture_source</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc262_dmic_adc_nids[1] = {</div><div class='del'>-	/* ADC0 */</div><div class='del'>-	0x09</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc262_dmic_capsrc_nids[1] = { 0x22 };</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_base_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0D, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* update HP, line and mono-out pins according to the master switch */</div><div class='del'>-static void alc262_hp_master_update(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int val = spec-&gt;master_sw;</div><div class='del'>-</div><div class='del'>-	/* HP &amp; line-out */</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x1b, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				  val ? PIN_HP : 0);</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x15, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				  val ? PIN_HP : 0);</div><div class='del'>-	/* mono (speaker) depending on the HP jack sense */</div><div class='del'>-	val = val &amp;&amp; !spec-&gt;jack_present;</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x16, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				  val ? PIN_OUT : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hp_bpc_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	alc262_hp_master_update(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hp_bpc_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC880_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_hp_bpc_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hp_wildwest_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	alc262_hp_master_update(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hp_wildwest_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC880_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_hp_wildwest_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc262_hp_master_sw_get		alc260_hp_master_sw_get</div><div class='del'>-</div><div class='del'>-static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int val = !!*ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	if (val == spec-&gt;master_sw)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;master_sw = val;</div><div class='del'>-	alc262_hp_master_update(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC262_HP_MASTER_SWITCH					\</div><div class='del'>-	{							\</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		\</div><div class='del'>-		.name = "Master Playback Switch",		\</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,		\</div><div class='del'>-		.get = alc262_hp_master_sw_get,			\</div><div class='del'>-		.put = alc262_hp_master_sw_put,			\</div><div class='del'>-	}, \</div><div class='del'>-	{							\</div><div class='del'>-		.iface = NID_MAPPING,				\</div><div class='del'>-		.name = "Master Playback Switch",		\</div><div class='del'>-		.private_value = 0x15 | (0x16 &lt;&lt; 8) | (0x1b &lt;&lt; 16),	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {</div><div class='del'>-	ALC262_HP_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 0x0,</div><div class='del'>-			    HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("AUX IN Playback Volume", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("AUX IN Playback Switch", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {</div><div class='del'>-	ALC262_HP_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 2, 0x0,</div><div class='del'>-			      HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 2, 0x0,</div><div class='del'>-			    HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x1a, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Rear Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Rear Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Rear Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc262_hp_t5735_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_hp_t5735_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_hp_rp5700_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc262_hp_rp5700_capture_source = {</div><div class='del'>-	.num_items = 1,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bind hp and internal speaker mute (with plug check) as master switch */</div><div class='del'>-static void alc262_hippo_master_update(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t hp_nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	hda_nid_t line_nid = spec-&gt;autocfg.line_out_pins[0];</div><div class='del'>-	hda_nid_t speaker_nid = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	/* HP */</div><div class='del'>-	mute = spec-&gt;master_sw ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, hp_nid, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute);</div><div class='del'>-	/* mute internal speaker per jack sense */</div><div class='del'>-	if (spec-&gt;jack_present)</div><div class='del'>-		mute = HDA_AMP_MUTE;</div><div class='del'>-	if (line_nid)</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, line_nid, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, mute);</div><div class='del'>-	if (speaker_nid &amp;&amp; speaker_nid != line_nid)</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, speaker_nid, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, mute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc262_hippo_master_sw_get	alc262_hp_master_sw_get</div><div class='del'>-</div><div class='del'>-static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				      struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int val = !!*ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	if (val == spec-&gt;master_sw)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;master_sw = val;</div><div class='del'>-	alc262_hippo_master_update(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC262_HIPPO_MASTER_SWITCH				\</div><div class='del'>-	{							\</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		\</div><div class='del'>-		.name = "Master Playback Switch",		\</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,		\</div><div class='del'>-		.get = alc262_hippo_master_sw_get,		\</div><div class='del'>-		.put = alc262_hippo_master_sw_put,		\</div><div class='del'>-	},							\</div><div class='del'>-	{							\</div><div class='del'>-		.iface = NID_MAPPING,				\</div><div class='del'>-		.name = "Master Playback Switch",		\</div><div class='del'>-		.subdevice = SUBDEV_HP(0) | (SUBDEV_LINE(0) &lt;&lt; 8) | \</div><div class='del'>-			     (SUBDEV_SPEAKER(0) &lt;&lt; 16), \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_hippo_mixer[] = {</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_hippo1_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc262_hippo_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t hp_nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-</div><div class='del'>-	spec-&gt;jack_present = snd_hda_jack_detect(codec, hp_nid);</div><div class='del'>-	alc262_hippo_master_update(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hippo_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC880_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_hippo_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hippo_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_hippo1_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_sony_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_benq_t31_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_tyan_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Aux Playback Volume", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Aux Playback Switch", 0x0b, 0x06, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_tyan_verbs[] = {</div><div class='del'>-	/* Headphone automute */</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* P11 AUX_IN, white 4-pin connector */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_1, 0xe1},</div><div class='del'>-	{0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_2, 0x93},</div><div class='del'>-	{0x14, AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0x19},</div><div class='del'>-</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc262_tyan_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x15;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define alc262_capture_mixer		alc882_capture_mixer</div><div class='del'>-#define alc262_capture_alt_mixer	alc882_capture_alt_mixer</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc262_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for</div><div class='del'>-	 * front panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0e)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_eapd_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_hippo1_unsol_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_sony_unsol_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},	// Front Mic</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_toshiba_s06_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x09},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc262_toshiba_s06_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x12;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 9;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * nec model</div><div class='del'>- *  0x15 = headphone</div><div class='del'>- *  0x16 = internal speaker</div><div class='del'>- *  0x18 = external mic</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_nec_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 0, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_nec_verbs[] = {</div><div class='del'>-	/* Unmute Speaker */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Headphone */</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-</div><div class='del'>-	/* External mic to headphone */</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* External mic to speaker */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * fujitsu model</div><div class='del'>- *  0x14 = headphone/spdif-out, 0x15 = internal speaker,</div><div class='del'>- *  0x1b = port replicator headphone out</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ALC_HP_EVENT	0x37</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_fujitsu_unsol_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_lenovo_3000_init_verbs[] = {</div><div class='del'>-	/* Front Mic pin: input vref at 50% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc262_fujitsu_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Int Mic", 0x1 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc262_HP_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-		{ "AUX IN", 0x6 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc262_HP_D7000_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x2 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jacks and mute state */</div><div class='del'>-static void alc262_fujitsu_automute(struct hda_codec *codec, int force)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	if (force || !spec-&gt;sense_updated) {</div><div class='del'>-		spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x14) ||</div><div class='del'>-				     snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-		spec-&gt;sense_updated = 1;</div><div class='del'>-	}</div><div class='del'>-	/* unmute internal speaker only if both HPs are unplugged and</div><div class='del'>-	 * master switch is on</div><div class='del'>-	 */</div><div class='del'>-	if (spec-&gt;jack_present)</div><div class='del'>-		mute = HDA_AMP_MUTE;</div><div class='del'>-	else</div><div class='del'>-		mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc262_fujitsu_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_fujitsu_automute(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc262_fujitsu_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc262_fujitsu_automute(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bind volumes of both NID 0x0c and 0x0d */</div><div class='del'>-static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x0d, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc262_lenovo_3000_automute(struct hda_codec *codec, int force)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	if (force || !spec-&gt;sense_updated) {</div><div class='del'>-		spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-		spec-&gt;sense_updated = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;jack_present) {</div><div class='del'>-		/* mute internal speaker */</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-	} else {</div><div class='del'>-		/* unmute internal speaker if necessary */</div><div class='del'>-		mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, mute);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, mute);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc262_lenovo_3000_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_lenovo_3000_automute(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int amp_stereo_mute_update(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				  int dir, int idx, long *valp)</div><div class='del'>-{</div><div class='del'>-	int i, change = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i++, valp++)</div><div class='del'>-		change |= snd_hda_codec_amp_update(codec, nid, i, dir, idx,</div><div class='del'>-						   HDA_AMP_MUTE,</div><div class='del'>-						   *valp ? 0 : HDA_AMP_MUTE);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bind hp and internal speaker mute (with plug check) */</div><div class='del'>-static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	change = amp_stereo_mute_update(codec, 0x14, HDA_OUTPUT, 0, valp);</div><div class='del'>-	change |= amp_stereo_mute_update(codec, 0x1b, HDA_OUTPUT, 0, valp);</div><div class='del'>-	if (change)</div><div class='del'>-		alc262_fujitsu_automute(codec, 0);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc262_fujitsu_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc262_fujitsu_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = NID_MAPPING,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.private_value = 0x1b,</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bind hp and internal speaker mute (with plug check) */</div><div class='del'>-static int alc262_lenovo_3000_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	change = amp_stereo_mute_update(codec, 0x1b, HDA_OUTPUT, 0, valp);</div><div class='del'>-	if (change)</div><div class='del'>-		alc262_lenovo_3000_automute(codec, 0);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc262_fujitsu_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc262_lenovo_3000_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc262_fujitsu_bind_master_vol),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* additional init verbs for Benq laptops */</div><div class='del'>-static struct hda_verb alc262_EAPD_verbs[] = {</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3070},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_benq_t31_EAPD_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x07},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF,  0x3050},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Samsung Q1 Ultra Vista model setup */</div><div class='del'>-static struct snd_kcontrol_new alc262_ultra_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Mic Boost", 0x15, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_ultra_verbs[] = {</div><div class='del'>-	/* output mixer */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	/* speaker */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* HP */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	/* internal mic */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* ADC, choose mic */</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(8)},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc262_ultra_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	mute = 0;</div><div class='del'>-	/* auto-mute only when HP is used as HP */</div><div class='del'>-	if (!spec-&gt;cur_mux[0]) {</div><div class='del'>-		spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-		if (spec-&gt;jack_present)</div><div class='del'>-			mute = HDA_AMP_MUTE;</div><div class='del'>-	}</div><div class='del'>-	/* mute/unmute internal speaker */</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute);</div><div class='del'>-	/* mute/unmute HP */</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute ? 0 : HDA_AMP_MUTE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc262_ultra_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC880_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc262_ultra_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc262_ultra_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Headphone", 0x7 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int alc262_ultra_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = alc_mux_enum_put(kcontrol, ucontrol);</div><div class='del'>-	if (!ret)</div><div class='del'>-		return 0;</div><div class='del'>-	/* reprogram the HP pin as mic or HP according to the input source */</div><div class='del'>-	snd_hda_codec_write_cache(codec, 0x15, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				  spec-&gt;cur_mux[0] ? PIN_VREF80 : PIN_HP);</div><div class='del'>-	alc262_ultra_automute(codec); /* mute/unmute HP */</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.info = alc_mux_enum_info,</div><div class='del'>-		.get = alc_mux_enum_get,</div><div class='del'>-		.put = alc262_ultra_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = NID_MAPPING,</div><div class='del'>-		.name = "Capture Source",</div><div class='del'>-		.private_value = 0x15,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* We use two mixers depending on the output pin; 0x16 is a mono output</div><div class='del'>- * and thus it's bound with a different mixer.</div><div class='del'>- * This function returns which mixer amp should be used.</div><div class='del'>- */</div><div class='del'>-static int alc262_check_volbit(hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (!nid)</div><div class='del'>-		return 0;</div><div class='del'>-	else if (nid == 0x16)</div><div class='del'>-		return 2;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc262_add_out_vol_ctl(struct alc_spec *spec, hda_nid_t nid,</div><div class='del'>-				  const char *pfx, int *vbits, int idx)</div><div class='del'>-{</div><div class='del'>-	unsigned long val;</div><div class='del'>-	int vbit;</div><div class='del'>-</div><div class='del'>-	vbit = alc262_check_volbit(nid);</div><div class='del'>-	if (!vbit)</div><div class='del'>-		return 0;</div><div class='del'>-	if (*vbits &amp; vbit) /* a volume control for this mixer already there */</div><div class='del'>-		return 0;</div><div class='del'>-	*vbits |= vbit;</div><div class='del'>-	if (vbit == 2)</div><div class='del'>-		val = HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT);</div><div class='del'>-	else</div><div class='del'>-		val = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT);</div><div class='del'>-	return __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, idx, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc262_add_out_sw_ctl(struct alc_spec *spec, hda_nid_t nid,</div><div class='del'>-				 const char *pfx, int idx)</div><div class='del'>-{</div><div class='del'>-	unsigned long val;</div><div class='del'>-</div><div class='del'>-	if (!nid)</div><div class='del'>-		return 0;</div><div class='del'>-	if (nid == 0x16)</div><div class='del'>-		val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);</div><div class='del'>-	else</div><div class='del'>-		val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='del'>-	return __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, idx, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	const char *pfx;</div><div class='del'>-	int vbits;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;	/* only use one dac */</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dac_nids[0] = 2;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;speaker_pins[0] &amp;&amp; !cfg-&gt;hp_pins[0])</div><div class='del'>-		pfx = "Master";</div><div class='del'>-	else if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-		pfx = "Speaker";</div><div class='del'>-	else if (cfg-&gt;line_out_type == AUTO_PIN_HP_OUT)</div><div class='del'>-		pfx = "Headphone";</div><div class='del'>-	else</div><div class='del'>-		pfx = "Front";</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		err = alc262_add_out_sw_ctl(spec, cfg-&gt;line_out_pins[i], pfx, i);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='del'>-			err = alc262_add_out_sw_ctl(spec, cfg-&gt;speaker_pins[i],</div><div class='del'>-						    "Speaker", i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT) {</div><div class='del'>-			err = alc262_add_out_sw_ctl(spec, cfg-&gt;hp_pins[i],</div><div class='del'>-						    "Headphone", i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vbits = alc262_check_volbit(cfg-&gt;line_out_pins[0]) |</div><div class='del'>-		alc262_check_volbit(cfg-&gt;speaker_pins[0]) |</div><div class='del'>-		alc262_check_volbit(cfg-&gt;hp_pins[0]);</div><div class='del'>-	if (vbits == 1 || vbits == 2)</div><div class='del'>-		pfx = "Master"; /* only one mixer is used */</div><div class='del'>-	vbits = 0;</div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		err = alc262_add_out_vol_ctl(spec, cfg-&gt;line_out_pins[i], pfx,</div><div class='del'>-					     &amp;vbits, i);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_SPEAKER_OUT) {</div><div class='del'>-			err = alc262_add_out_vol_ctl(spec, cfg-&gt;speaker_pins[i],</div><div class='del'>-						     "Speaker", &amp;vbits, i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-		if (cfg-&gt;line_out_type != AUTO_PIN_HP_OUT) {</div><div class='del'>-			err = alc262_add_out_vol_ctl(spec, cfg-&gt;hp_pins[i],</div><div class='del'>-						     "Headphone", &amp;vbits, i);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc262_auto_create_input_ctls \</div><div class='del'>-	alc882_auto_create_input_ctls</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc262_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for</div><div class='del'>-	 * front panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0f)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_HP_BPC_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for</div><div class='del'>-	 * front panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0e)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 0b, 12 */</div><div class='del'>-	/* Input mixer1: only unmute Mic */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 &lt;&lt; 8))},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x05 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x06 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x07 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x08 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 * Note: PASD motherboards uses the Line In 2 as the input for front</div><div class='del'>-	 * panel mic (mic 2)</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0e)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },	/* HP */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Mono */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* rear MIC */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },	/* Line in */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* Front MIC */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Line out */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },	/* CD in */</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-</div><div class='del'>-	/* {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 }, */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x7023 },</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000 },</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))}, /*rear MIC*/</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))}, /*Line in*/</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 &lt;&lt; 8))}, /*F MIC*/</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 &lt;&lt; 8))}, /*Front*/</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 &lt;&lt; 8))}, /*CD*/</div><div class='del'>-        /* {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 &lt;&lt; 8))},  */</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 &lt;&lt; 8))}, /*HP*/</div><div class='del'>-	/* Input mixer2 */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 &lt;&lt; 8))},</div><div class='del'>-        /* {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 &lt;&lt; 8))}, */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 &lt;&lt; 8))},</div><div class='del'>-	/* Input mixer3 */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 &lt;&lt; 8))},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 &lt;&lt; 8))},</div><div class='del'>-        /* {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x06 &lt;&lt; 8))}, */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x07 &lt;&lt; 8))},</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = {</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },	/* Front Speaker */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* MIC jack */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },	/* Front MIC */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) },</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) },</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },	/* HP  jack */</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Pin config fixes</div><div class='del'>- */</div><div class='del'>-enum {</div><div class='del'>-	PINFIX_FSC_H270,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc262_fixups[] = {</div><div class='del'>-	[PINFIX_FSC_H270] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x14, 0x99130110 }, /* speaker */</div><div class='del'>-			{ 0x15, 0x0221142f }, /* front HP */</div><div class='del'>-			{ 0x1b, 0x0121141f }, /* rear HP */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	[PINFIX_PB_M5210] = {</div><div class='del'>-		.verbs = (const struct hda_verb[]) {</div><div class='del'>-			{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },</div><div class='del'>-			{}</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc262_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", PINFIX_FSC_H270),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define alc262_loopbacks	alc880_loopbacks</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc262_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc262_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc262_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc262_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc262_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc262_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc262_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs) {</div><div class='del'>-		if (spec-&gt;autocfg.dig_outs || spec-&gt;autocfg.dig_in_pin) {</div><div class='del'>-			spec-&gt;multiout.max_channels = 2;</div><div class='del'>-			spec-&gt;no_analog = 1;</div><div class='del'>-			goto dig_only;</div><div class='del'>-		}</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-	}</div><div class='del'>-	err = alc262_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc262_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>- dig_only:</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc262_volume_init_verbs);</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc262_auto_init_multi_out	alc882_auto_init_multi_out</div><div class='del'>-#define alc262_auto_init_hp_out		alc882_auto_init_hp_out</div><div class='del'>-#define alc262_auto_init_analog_input	alc882_auto_init_analog_input</div><div class='del'>-#define alc262_auto_init_input_src	alc882_auto_init_input_src</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static void alc262_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc262_auto_init_multi_out(codec);</div><div class='del'>-	alc262_auto_init_hp_out(codec);</div><div class='del'>-	alc262_auto_init_analog_input(codec);</div><div class='del'>-	alc262_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc262_models[ALC262_MODEL_LAST] = {</div><div class='del'>-	[ALC262_BASIC]		= "basic",</div><div class='del'>-	[ALC262_HIPPO]		= "hippo",</div><div class='del'>-	[ALC262_HIPPO_1]	= "hippo_1",</div><div class='del'>-	[ALC262_FUJITSU]	= "fujitsu",</div><div class='del'>-	[ALC262_HP_BPC]		= "hp-bpc",</div><div class='del'>-	[ALC262_HP_BPC_D7000_WL]= "hp-bpc-d7000",</div><div class='del'>-	[ALC262_HP_TC_T5735]	= "hp-tc-t5735",</div><div class='del'>-	[ALC262_HP_RP5700]	= "hp-rp5700",</div><div class='del'>-	[ALC262_BENQ_ED8]	= "benq",</div><div class='del'>-	[ALC262_BENQ_T31]	= "benq-t31",</div><div class='del'>-	[ALC262_SONY_ASSAMD]	= "sony-assamd",</div><div class='del'>-	[ALC262_TOSHIBA_S06]	= "toshiba-s06",</div><div class='del'>-	[ALC262_TOSHIBA_RX1]	= "toshiba-rx1",</div><div class='del'>-	[ALC262_ULTRA]		= "ultra",</div><div class='del'>-	[ALC262_LENOVO_3000]	= "lenovo-3000",</div><div class='del'>-	[ALC262_NEC]		= "nec",</div><div class='del'>-	[ALC262_TYAN]		= "tyan",</div><div class='del'>-	[ALC262_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc262_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),</div><div class='del'>-	SND_PCI_QUIRK(0x1033, 0x8895, "NEC Versa S9100", ALC262_NEC),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1200, "HP xw series",</div><div class='del'>-			   ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",</div><div class='del'>-			   ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",</div><div class='del'>-			   ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2803, "HP D7000", ALC262_HP_BPC_D7000_WF),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2804, "HP D7000", ALC262_HP_BPC_D7000_WL),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2805, "HP D7000", ALC262_HP_BPC_D7000_WF),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2806, "HP D7000", ALC262_HP_BPC_D7000_WL),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2807, "HP D7000", ALC262_HP_BPC_D7000_WF),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x280c, "HP xw4400", ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3014, "HP xw6400", ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x3015, "HP xw8400", ALC262_HP_BPC),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x302f, "HP Thin Client T5735",</div><div class='del'>-		      ALC262_HP_TC_T5735),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x2817, "HP RP5700", ALC262_HP_RP5700),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9016, "Sony VAIO", ALC262_AUTO), /* dig-only */</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9025, "Sony VAIO Z21MN", ALC262_TOSHIBA_S06),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9035, "Sony VAIO VGN-FW170J", ALC262_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9047, "Sony VAIO Type G", ALC262_AUTO),</div><div class='del'>-#if 0 /* disable the quirk since model=auto works better in recent versions */</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x104d, 0xff00, 0x9000, "Sony VAIO",</div><div class='del'>-			   ALC262_SONY_ASSAMD),</div><div class='del'>-#endif</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",</div><div class='del'>-		      ALC262_TOSHIBA_RX1),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff7b, "Toshiba S06", ALC262_TOSHIBA_S06),</div><div class='del'>-	SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU),</div><div class='del'>-	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),</div><div class='del'>-	SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_TYAN),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",</div><div class='del'>-			   ALC262_ULTRA),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),</div><div class='del'>-	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),</div><div class='del'>-	SND_PCI_QUIRK(0x17ff, 0x058d, "Benq T31-16", ALC262_BENQ_T31),</div><div class='del'>-	SND_PCI_QUIRK(0x17ff, 0x058f, "Benq Hippo", ALC262_HIPPO_1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc262_presets[] = {</div><div class='del'>-	[ALC262_BASIC] = {</div><div class='del'>-		.mixers = { alc262_base_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HIPPO] = {</div><div class='del'>-		.mixers = { alc262_hippo_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc_hp15_unsol_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc262_hippo_unsol_event,</div><div class='del'>-		.setup = alc262_hippo_setup,</div><div class='del'>-		.init_hook = alc262_hippo_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HIPPO_1] = {</div><div class='del'>-		.mixers = { alc262_hippo1_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_hippo1_unsol_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc262_hippo_unsol_event,</div><div class='del'>-		.setup = alc262_hippo1_setup,</div><div class='del'>-		.init_hook = alc262_hippo_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_FUJITSU] = {</div><div class='del'>-		.mixers = { alc262_fujitsu_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,</div><div class='del'>-				alc262_fujitsu_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_fujitsu_capture_source,</div><div class='del'>-		.unsol_event = alc262_fujitsu_unsol_event,</div><div class='del'>-		.init_hook = alc262_fujitsu_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HP_BPC] = {</div><div class='del'>-		.mixers = { alc262_HP_BPC_mixer },</div><div class='del'>-		.init_verbs = { alc262_HP_BPC_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_HP_capture_source,</div><div class='del'>-		.unsol_event = alc262_hp_bpc_unsol_event,</div><div class='del'>-		.init_hook = alc262_hp_bpc_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HP_BPC_D7000_WF] = {</div><div class='del'>-		.mixers = { alc262_HP_BPC_WildWest_mixer },</div><div class='del'>-		.init_verbs = { alc262_HP_BPC_WildWest_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_HP_D7000_capture_source,</div><div class='del'>-		.unsol_event = alc262_hp_wildwest_unsol_event,</div><div class='del'>-		.init_hook = alc262_hp_wildwest_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HP_BPC_D7000_WL] = {</div><div class='del'>-		.mixers = { alc262_HP_BPC_WildWest_mixer,</div><div class='del'>-			    alc262_HP_BPC_WildWest_option_mixer },</div><div class='del'>-		.init_verbs = { alc262_HP_BPC_WildWest_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_HP_D7000_capture_source,</div><div class='del'>-		.unsol_event = alc262_hp_wildwest_unsol_event,</div><div class='del'>-		.init_hook = alc262_hp_wildwest_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HP_TC_T5735] = {</div><div class='del'>-		.mixers = { alc262_hp_t5735_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_hp_t5735_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc262_hp_t5735_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_HP_RP5700] = {</div><div class='del'>-		.mixers = { alc262_hp_rp5700_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_hp_rp5700_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_hp_rp5700_capture_source,</div><div class='del'>-        },</div><div class='del'>-	[ALC262_BENQ_ED8] = {</div><div class='del'>-		.mixers = { alc262_base_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_SONY_ASSAMD] = {</div><div class='del'>-		.mixers = { alc262_sony_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_sony_unsol_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc262_hippo_unsol_event,</div><div class='del'>-		.setup = alc262_hippo_setup,</div><div class='del'>-		.init_hook = alc262_hippo_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_BENQ_T31] = {</div><div class='del'>-		.mixers = { alc262_benq_t31_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_benq_t31_EAPD_verbs,</div><div class='del'>-				alc_hp15_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc262_hippo_unsol_event,</div><div class='del'>-		.setup = alc262_hippo_setup,</div><div class='del'>-		.init_hook = alc262_hippo_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_ULTRA] = {</div><div class='del'>-		.mixers = { alc262_ultra_mixer },</div><div class='del'>-		.cap_mixer = alc262_ultra_capture_mixer,</div><div class='del'>-		.init_verbs = { alc262_ultra_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_ultra_capture_source,</div><div class='del'>-		.adc_nids = alc262_adc_nids, /* ADC0 */</div><div class='del'>-		.capsrc_nids = alc262_capsrc_nids,</div><div class='del'>-		.num_adc_nids = 1, /* single ADC */</div><div class='del'>-		.unsol_event = alc262_ultra_unsol_event,</div><div class='del'>-		.init_hook = alc262_ultra_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_LENOVO_3000] = {</div><div class='del'>-		.mixers = { alc262_lenovo_3000_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,</div><div class='del'>-				alc262_lenovo_3000_unsol_verbs,</div><div class='del'>-				alc262_lenovo_3000_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_fujitsu_capture_source,</div><div class='del'>-		.unsol_event = alc262_lenovo_3000_unsol_event,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_NEC] = {</div><div class='del'>-		.mixers = { alc262_nec_mixer },</div><div class='del'>-		.init_verbs = { alc262_nec_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_TOSHIBA_S06] = {</div><div class='del'>-		.mixers = { alc262_toshiba_s06_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_toshiba_s06_verbs,</div><div class='del'>-							alc262_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.capsrc_nids = alc262_dmic_capsrc_nids,</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.adc_nids = alc262_dmic_adc_nids, /* ADC0 */</div><div class='del'>-		.num_adc_nids = 1, /* single ADC */</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc262_toshiba_s06_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_TOSHIBA_RX1] = {</div><div class='del'>-		.mixers = { alc262_toshiba_rx1_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_toshiba_rx1_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc262_hippo_unsol_event,</div><div class='del'>-		.setup = alc262_hippo_setup,</div><div class='del'>-		.init_hook = alc262_hippo_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC262_TYAN] = {</div><div class='del'>-		.mixers = { alc262_tyan_mixer },</div><div class='del'>-		.init_verbs = { alc262_init_verbs, alc262_tyan_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc262_dac_nids),</div><div class='del'>-		.dac_nids = alc262_dac_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.dig_out_nid = ALC262_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc262_modes),</div><div class='del'>-		.channel_mode = alc262_modes,</div><div class='del'>-		.input_mux = &amp;alc262_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc262_tyan_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc262(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-#if 0</div><div class='del'>-	/* pshou 07/11/05  set a zero PCM sample to DAC when FIFO is</div><div class='del'>-	 * under-run</div><div class='del'>-	 */</div><div class='del'>-	{</div><div class='del'>-	int tmp;</div><div class='del'>-	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-	tmp = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_PROC_COEF, 0);</div><div class='del'>-	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);</div><div class='del'>-	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	alc_auto_parse_customize_define(codec);</div><div class='del'>-</div><div class='del'>-	alc_fix_pll_init(codec, 0x20, 0x0a, 10);</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC262_MODEL_LAST,</div><div class='del'>-						  alc262_models,</div><div class='del'>-						  alc262_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC262_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC262_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc262_fixup_tbl, alc262_fixups, 1);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC262_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc262_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC262_BASIC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp; has_cdefine_beep(codec)) {</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC262_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc262_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc262_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc262_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc262_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc262_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		int i;</div><div class='del'>-		/* check whether the digital-mic has to be supported */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;input_mux-&gt;num_items; i++) {</div><div class='del'>-			if (spec-&gt;input_mux-&gt;items[i].index &gt;= 9)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (i &lt; spec-&gt;input_mux-&gt;num_items) {</div><div class='del'>-			/* use only ADC0 */</div><div class='del'>-			spec-&gt;adc_nids = alc262_dmic_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = 1;</div><div class='del'>-			spec-&gt;capsrc_nids = alc262_dmic_capsrc_nids;</div><div class='del'>-		} else {</div><div class='del'>-			/* all analog inputs */</div><div class='del'>-			/* check whether NID 0x07 is valid */</div><div class='del'>-			unsigned int wcap = get_wcaps(codec, 0x07);</div><div class='del'>-</div><div class='del'>-			/* get type */</div><div class='del'>-			wcap = get_wcaps_type(wcap);</div><div class='del'>-			if (wcap != AC_WID_AUD_IN) {</div><div class='del'>-				spec-&gt;adc_nids = alc262_adc_nids_alt;</div><div class='del'>-				spec-&gt;num_adc_nids =</div><div class='del'>-					ARRAY_SIZE(alc262_adc_nids_alt);</div><div class='del'>-				spec-&gt;capsrc_nids = alc262_capsrc_nids_alt;</div><div class='del'>-			} else {</div><div class='del'>-				spec-&gt;adc_nids = alc262_adc_nids;</div><div class='del'>-				spec-&gt;num_adc_nids =</div><div class='del'>-					ARRAY_SIZE(alc262_adc_nids);</div><div class='del'>-				spec-&gt;capsrc_nids = alc262_capsrc_nids;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;cap_mixer &amp;&amp; !spec-&gt;no_analog)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp; has_cdefine_beep(codec))</div><div class='del'>-		set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC262_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc262_fixup_tbl, alc262_fixups, 0);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x0c;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC262_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc262_auto_init;</div><div class='del'>-</div><div class='del'>-	alc_init_jacks(codec);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc262_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ALC268 channel source setting (2 channel)</div><div class='del'>- */</div><div class='del'>-#define ALC268_DIGOUT_NID	ALC880_DIGOUT_NID</div><div class='del'>-#define alc268_modes		alc260_modes</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc268_dac_nids[2] = {</div><div class='del'>-	/* front, hp */</div><div class='del'>-	0x02, 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc268_adc_nids[2] = {</div><div class='del'>-	/* ADC0-1 */</div><div class='del'>-	0x08, 0x07</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc268_adc_nids_alt[1] = {</div><div class='del'>-	/* ADC0 */</div><div class='del'>-	0x08</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc268_capsrc_nids[2] = { 0x23, 0x24 };</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_base_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_toshiba_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* bind Beep switches of both NID 0x0f and 0x10 */</div><div class='del'>-static struct hda_bind_ctls alc268_bind_beep_sw = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x10, 3, 1, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_beep_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_BIND_SW("Beep Playback Switch", &amp;alc268_bind_beep_sw),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc268_eapd_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Toshiba specific */</div><div class='del'>-static struct hda_verb alc268_toshiba_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Acer specific */</div><div class='del'>-/* bind volumes of both NID 0x02 and 0x03 */</div><div class='del'>-static struct hda_bind_ctls alc268_acer_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc268_acer_automute(struct hda_codec *codec, int force)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int mute;</div><div class='del'>-</div><div class='del'>-	if (force || !spec-&gt;sense_updated) {</div><div class='del'>-		spec-&gt;jack_present = snd_hda_jack_detect(codec, 0x14);</div><div class='del'>-		spec-&gt;sense_updated = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;jack_present)</div><div class='del'>-		mute = HDA_AMP_MUTE; /* mute internal speaker */</div><div class='del'>-	else /* unmute internal speaker if necessary */</div><div class='del'>-		mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, mute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* bind hp and internal speaker mute (with plug check) */</div><div class='del'>-static int alc268_acer_master_sw_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	change = amp_stereo_mute_update(codec, 0x14, HDA_OUTPUT, 0, valp);</div><div class='del'>-	if (change)</div><div class='del'>-		alc268_acer_automute(codec, 0);</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_acer_aspire_one_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc268_acer_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc268_acer_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_acer_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc268_acer_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc268_acer_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_acer_dmic_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc268_acer_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc268_acer_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc268_acer_aspire_one_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x23, AC_VERB_SET_CONNECT_SEL, 0x06},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, 0xa017},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc268_acer_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* internal dmic? */</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-#define alc268_toshiba_unsol_event	alc262_hippo_unsol_event</div><div class='del'>-#define alc268_toshiba_setup		alc262_hippo_setup</div><div class='del'>-#define alc268_toshiba_automute		alc262_hippo_automute</div><div class='del'>-</div><div class='del'>-static void alc268_acer_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) != ALC880_HP_EVENT)</div><div class='del'>-		return;</div><div class='del'>-	alc268_acer_automute(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_acer_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc268_acer_automute(codec, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc268_aspire_one_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_acer_lc_unsol_event(struct hda_codec *codec,</div><div class='del'>-				    unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc268_aspire_one_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_acer_lc_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x12;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 6;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_acer_lc_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc268_aspire_one_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_dell_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc268_dell_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* mute/unmute internal speaker according to the hp jack and mute state */</div><div class='del'>-static void alc268_dell_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc267_quanta_il1_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc267_quanta_il1_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc268_base_init_verbs[] = {</div><div class='del'>-	/* Unmute DAC0-1 and set vol = 0 */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x0c - 0x0e)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	/* set PCBEEP vol = 0, mute connections */</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Selector 23h,24h and set the default input to mic-in */</div><div class='del'>-</div><div class='del'>-	{0x23, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x24, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc268_volume_init_verbs[] = {</div><div class='del'>-	/* set output DAC */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	/* set PCBEEP vol = 0, mute connections */</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_capture_nosrc_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_capture_alt_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	_DEFINE_CAPSRC(1),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc268_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x24, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x24, 0x0, HDA_OUTPUT),</div><div class='del'>-	_DEFINE_CAPSRC(2),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc268_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x3 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc268_acer_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc268_acer_dmic_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x6 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-static struct snd_kcontrol_new alc268_test_mixer[] = {</div><div class='del'>-	/* Volume widgets */</div><div class='del'>-	HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Mono sum Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("LINE-OUT sum Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("HP-OUT sum Playback Switch", 0x10, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("LINE-OUT Playback Switch", 0x14, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("HP-OUT Playback Switch", 0x15, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Mono Playback Switch", 0x16, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("MIC1 Capture Volume", 0x18, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("MIC1 Capture Switch", 0x18, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("MIC2 Capture Volume", 0x19, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("LINE1 Capture Volume", 0x1a, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE("LINE1 Capture Switch", 0x1a, 2, HDA_OUTPUT),</div><div class='del'>-	/* The below appears problematic on some hardwares */</div><div class='del'>-	/*HDA_CODEC_VOLUME("PCBEEP Playback Volume", 0x1d, 0x0, HDA_INPUT),*/</div><div class='del'>-	HDA_CODEC_VOLUME("PCM-IN1 Capture Volume", 0x23, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("PCM-IN1 Capture Switch", 0x23, 2, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("PCM-IN2 Capture Volume", 0x24, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("PCM-IN2 Capture Switch", 0x24, 2, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	/* Modes for retasking pin widgets */</div><div class='del'>-	ALC_PIN_MODE("LINE-OUT pin mode", 0x14, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("HP-OUT pin mode", 0x15, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("MIC1 pin mode", 0x18, ALC_PIN_DIR_INOUT),</div><div class='del'>-	ALC_PIN_MODE("LINE1 pin mode", 0x1a, ALC_PIN_DIR_INOUT),</div><div class='del'>-</div><div class='del'>-	/* Controls for GPIO pins, assuming they are configured as outputs */</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),</div><div class='del'>-	ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),</div><div class='del'>-</div><div class='del'>-	/* Switches to allow the digital SPDIF output pin to be enabled.</div><div class='del'>-	 * The ALC268 does not have an SPDIF input.</div><div class='del'>-	 */</div><div class='del'>-	ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x06, 0x01),</div><div class='del'>-</div><div class='del'>-	/* A switch allowing EAPD to be enabled.  Some laptops seem to use</div><div class='del'>-	 * this output to turn on an external amplifier.</div><div class='del'>-	 */</div><div class='del'>-	ALC_EAPD_CTRL_SWITCH("LINE-OUT EAPD Enable Switch", 0x0f, 0x02),</div><div class='del'>-	ALC_EAPD_CTRL_SWITCH("HP-OUT EAPD Enable Switch", 0x10, 0x02),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* create input playback/capture controls for the given pin */</div><div class='del'>-static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,</div><div class='del'>-				    const char *ctlname, int idx)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	switch (nid) {</div><div class='del'>-	case 0x14:</div><div class='del'>-	case 0x16:</div><div class='del'>-		dac = 0x02;</div><div class='del'>-		break;</div><div class='del'>-	case 0x15:</div><div class='del'>-	case 0x1a: /* ALC259/269 only */</div><div class='del'>-	case 0x1b: /* ALC259/269 only */</div><div class='del'>-	case 0x21: /* ALC269vb has this pin, too */</div><div class='del'>-		dac = 0x03;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		snd_printd(KERN_WARNING "hda_codec: "</div><div class='del'>-			   "ignoring pin 0x%x as unknown\n", nid);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dac_nids[0] != dac &amp;&amp;</div><div class='del'>-	    spec-&gt;multiout.dac_nids[1] != dac) {</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(dac, 3, idx,</div><div class='del'>-						      HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.dac_nids[spec-&gt;multiout.num_dacs++] = dac;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (nid != 0x16)</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));</div><div class='del'>-	else /* mono */</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(nid, 2, idx, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;line_out_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		const char *name;</div><div class='del'>-		if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-			name = "Speaker";</div><div class='del'>-		else</div><div class='del'>-			name = "Front";</div><div class='del'>-		err = alc268_new_analog_output(spec, nid, name, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;speaker_pins[0];</div><div class='del'>-	if (nid == 0x1d) {</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, "Speaker",</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	} else if (nid) {</div><div class='del'>-		err = alc268_new_analog_output(spec, nid, "Speaker", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	nid = cfg-&gt;hp_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		err = alc268_new_analog_output(spec, nid, "Headphone", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;line_out_pins[1] | cfg-&gt;line_out_pins[2];</div><div class='del'>-	if (nid == 0x16) {</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, "Mono",</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int alc268_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0, 0x23, 0x24);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type)</div><div class='del'>-{</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-	if (nid == 0x14 || nid == 0x16)</div><div class='del'>-		idx = 0;</div><div class='del'>-	else</div><div class='del'>-		idx = 1;</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		alc268_auto_set_output_and_unmute(codec, nid, pin_type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		alc268_auto_set_output_and_unmute(codec, pin, PIN_HP);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.speaker_pins[i];</div><div class='del'>-		alc268_auto_set_output_and_unmute(codec, pin, PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;autocfg.mono_out_pin)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;autocfg.mono_out_pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t speaker_nid = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	hda_nid_t hp_nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	hda_nid_t line_nid = spec-&gt;autocfg.line_out_pins[0];</div><div class='del'>-	unsigned int	dac_vol1, dac_vol2;</div><div class='del'>-</div><div class='del'>-	if (line_nid == 0x1d || speaker_nid == 0x1d) {</div><div class='del'>-		snd_hda_codec_write(codec, speaker_nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-		/* mute mixer inputs from 0x1d */</div><div class='del'>-		snd_hda_codec_write(codec, 0x0f, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    AMP_IN_UNMUTE(1));</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    AMP_IN_UNMUTE(1));</div><div class='del'>-	} else {</div><div class='del'>-		/* unmute mixer inputs from 0x1d */</div><div class='del'>-		snd_hda_codec_write(codec, 0x0f, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1));</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0,</div><div class='del'>-				    AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dac_vol1 = dac_vol2 = 0xb000 | 0x40;	/* set max volume  */</div><div class='del'>-	if (line_nid == 0x14)</div><div class='del'>-		dac_vol2 = AMP_OUT_ZERO;</div><div class='del'>-	else if (line_nid == 0x15)</div><div class='del'>-		dac_vol1 = AMP_OUT_ZERO;</div><div class='del'>-	if (hp_nid == 0x14)</div><div class='del'>-		dac_vol2 = AMP_OUT_ZERO;</div><div class='del'>-	else if (hp_nid == 0x15)</div><div class='del'>-		dac_vol1 = AMP_OUT_ZERO;</div><div class='del'>-	if (line_nid != 0x16 || hp_nid != 0x16 ||</div><div class='del'>-	    spec-&gt;autocfg.line_out_pins[1] != 0x16 ||</div><div class='del'>-	    spec-&gt;autocfg.line_out_pins[2] != 0x16)</div><div class='del'>-		dac_vol1 = dac_vol2 = AMP_OUT_ZERO;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x02, 0,</div><div class='del'>-			    AC_VERB_SET_AMP_GAIN_MUTE, dac_vol1);</div><div class='del'>-	snd_hda_codec_write(codec, 0x03, 0,</div><div class='del'>-			    AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc268_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc268_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc268_pcm_analog_alt_capture	alc880_pcm_analog_alt_capture</div><div class='del'>-#define alc268_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc268_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc268_ignore[] = { 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc268_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs) {</div><div class='del'>-		if (spec-&gt;autocfg.dig_outs || spec-&gt;autocfg.dig_in_pin) {</div><div class='del'>-			spec-&gt;multiout.max_channels = 2;</div><div class='del'>-			spec-&gt;no_analog = 1;</div><div class='del'>-			goto dig_only;</div><div class='del'>-		}</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-	}</div><div class='del'>-	err = alc268_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc268_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-</div><div class='del'>- dig_only:</div><div class='del'>-	/* digital only support output */</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp; spec-&gt;autocfg.speaker_pins[0] != 0x1d)</div><div class='del'>-		add_mixer(spec, alc268_beep_mixer);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc268_volume_init_verbs);</div><div class='del'>-	spec-&gt;num_mux_defs = 2;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc268_auto_init_analog_input	alc882_auto_init_analog_input</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static void alc268_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc268_auto_init_multi_out(codec);</div><div class='del'>-	alc268_auto_init_hp_out(codec);</div><div class='del'>-	alc268_auto_init_mono_speaker_out(codec);</div><div class='del'>-	alc268_auto_init_analog_input(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc268_models[ALC268_MODEL_LAST] = {</div><div class='del'>-	[ALC267_QUANTA_IL1]	= "quanta-il1",</div><div class='del'>-	[ALC268_3ST]		= "3stack",</div><div class='del'>-	[ALC268_TOSHIBA]	= "toshiba",</div><div class='del'>-	[ALC268_ACER]		= "acer",</div><div class='del'>-	[ALC268_ACER_DMIC]	= "acer-dmic",</div><div class='del'>-	[ALC268_ACER_ASPIRE_ONE]	= "acer-aspire",</div><div class='del'>-	[ALC268_DELL]		= "dell",</div><div class='del'>-	[ALC268_ZEPTO]		= "zepto",</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC268_TEST]		= "test",</div><div class='del'>-#endif</div><div class='del'>-	[ALC268_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc268_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x011e, "Acer Aspire 5720z", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0126, "Acer", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x012e, "Acer Aspire 5310", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0130, "Acer Extensa 5210", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x0136, "Acer Aspire 5315", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",</div><div class='del'>-						ALC268_ACER_ASPIRE_ONE),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,</div><div class='del'>-			"Dell Inspiron Mini9/Vostro A90", ALC268_DELL),</div><div class='del'>-	/* almost compatible with toshiba but with optional digital outs;</div><div class='del'>-	 * auto-probing seems working fine</div><div class='del'>-	 */</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP TX25xx series",</div><div class='del'>-			   ALC268_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),</div><div class='del'>-	SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Toshiba laptops have no unique PCI SSID but only codec SSID */</div><div class='del'>-static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",</div><div class='del'>-			   ALC268_TOSHIBA),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc268_presets[] = {</div><div class='del'>-	[ALC267_QUANTA_IL1] = {</div><div class='del'>-		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,</div><div class='del'>-			    alc268_capture_nosrc_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc267_quanta_il1_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc267_quanta_il1_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_3ST] = {</div><div class='del'>-		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,</div><div class='del'>-			    alc268_beep_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-                .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-                .adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC268_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_TOSHIBA] = {</div><div class='del'>-		.mixers = { alc268_toshiba_mixer, alc268_capture_alt_mixer,</div><div class='del'>-			    alc268_beep_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_toshiba_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_capture_source,</div><div class='del'>-		.unsol_event = alc268_toshiba_unsol_event,</div><div class='del'>-		.setup = alc268_toshiba_setup,</div><div class='del'>-		.init_hook = alc268_toshiba_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_ACER] = {</div><div class='del'>-		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,</div><div class='del'>-			    alc268_beep_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_acer_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_acer_capture_source,</div><div class='del'>-		.unsol_event = alc268_acer_unsol_event,</div><div class='del'>-		.init_hook = alc268_acer_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_ACER_DMIC] = {</div><div class='del'>-		.mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,</div><div class='del'>-			    alc268_beep_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_acer_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_acer_dmic_capture_source,</div><div class='del'>-		.unsol_event = alc268_acer_unsol_event,</div><div class='del'>-		.init_hook = alc268_acer_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_ACER_ASPIRE_ONE] = {</div><div class='del'>-		.mixers = { alc268_acer_aspire_one_mixer,</div><div class='del'>-			    alc268_beep_mixer,</div><div class='del'>-			    alc268_capture_nosrc_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_acer_aspire_one_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.unsol_event = alc268_acer_lc_unsol_event,</div><div class='del'>-		.setup = alc268_acer_lc_setup,</div><div class='del'>-		.init_hook = alc268_acer_lc_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_DELL] = {</div><div class='del'>-		.mixers = { alc268_dell_mixer, alc268_beep_mixer,</div><div class='del'>-			    alc268_capture_nosrc_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_dell_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x02,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc268_dell_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC268_ZEPTO] = {</div><div class='del'>-		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,</div><div class='del'>-			    alc268_beep_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_toshiba_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC268_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_capture_source,</div><div class='del'>-		.setup = alc268_toshiba_setup,</div><div class='del'>-		.init_hook = alc268_toshiba_automute,</div><div class='del'>-	},</div><div class='del'>-#ifdef CONFIG_SND_DEBUG</div><div class='del'>-	[ALC268_TEST] = {</div><div class='del'>-		.mixers = { alc268_test_mixer, alc268_capture_mixer },</div><div class='del'>-		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,</div><div class='del'>-				alc268_volume_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc268_dac_nids),</div><div class='del'>-		.dac_nids = alc268_dac_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),</div><div class='del'>-		.adc_nids = alc268_adc_nids_alt,</div><div class='del'>-		.capsrc_nids = alc268_capsrc_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dig_out_nid = ALC268_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc268_modes),</div><div class='del'>-		.channel_mode = alc268_modes,</div><div class='del'>-		.input_mux = &amp;alc268_capture_source,</div><div class='del'>-	},</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc268(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int i, has_beep, err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC268_MODEL_LAST,</div><div class='del'>-						  alc268_models,</div><div class='del'>-						  alc268_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC268_MODEL_LAST)</div><div class='del'>-		board_config = snd_hda_check_board_codec_sid_config(codec,</div><div class='del'>-			ALC268_MODEL_LAST, alc268_models, alc268_ssid_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC268_MODEL_LAST) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC268_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC268_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc268_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC268_3ST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC268_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc268_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc268_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc268_pcm_analog_capture;</div><div class='del'>-	spec-&gt;stream_analog_alt_capture = &amp;alc268_pcm_analog_alt_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc268_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	has_beep = 0;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		if (spec-&gt;mixers[i] == alc268_beep_mixer) {</div><div class='del'>-			has_beep = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_beep) {</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-		if (!query_amp_caps(codec, 0x1d, HDA_INPUT))</div><div class='del'>-			/* override the amp caps for beep generator */</div><div class='del'>-			snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,</div><div class='del'>-					  (0x0c &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-					  (0x0c &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-					  (0x07 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-					  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;no_analog &amp;&amp; !spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		/* check whether NID 0x07 is valid */</div><div class='del'>-		unsigned int wcap = get_wcaps(codec, 0x07);</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		spec-&gt;capsrc_nids = alc268_capsrc_nids;</div><div class='del'>-		/* get type */</div><div class='del'>-		wcap = get_wcaps_type(wcap);</div><div class='del'>-		if (spec-&gt;auto_mic ||</div><div class='del'>-		    wcap != AC_WID_AUD_IN || spec-&gt;input_mux-&gt;num_items == 1) {</div><div class='del'>-			spec-&gt;adc_nids = alc268_adc_nids_alt;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt);</div><div class='del'>-			if (spec-&gt;auto_mic)</div><div class='del'>-				fixup_automic_adc(codec);</div><div class='del'>-			if (spec-&gt;auto_mic || spec-&gt;input_mux-&gt;num_items == 1)</div><div class='del'>-				add_mixer(spec, alc268_capture_nosrc_mixer);</div><div class='del'>-			else</div><div class='del'>-				add_mixer(spec, alc268_capture_alt_mixer);</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;adc_nids = alc268_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc268_adc_nids);</div><div class='del'>-			add_mixer(spec, alc268_capture_mixer);</div><div class='del'>-		}</div><div class='del'>-		/* set default input source */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;num_adc_nids; i++)</div><div class='del'>-			snd_hda_codec_write_cache(codec, alc268_capsrc_nids[i],</div><div class='del'>-				0, AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-				i &lt; spec-&gt;num_mux_defs ?</div><div class='del'>-				spec-&gt;input_mux[i].items[0].index :</div><div class='del'>-				spec-&gt;input_mux-&gt;items[0].index);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x02;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC268_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc268_auto_init;</div><div class='del'>-</div><div class='del'>-	alc_init_jacks(codec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ALC269 channel source setting (2 channel)</div><div class='del'>- */</div><div class='del'>-#define ALC269_DIGOUT_NID	ALC880_DIGOUT_NID</div><div class='del'>-</div><div class='del'>-#define alc269_dac_nids		alc260_dac_nids</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc269_adc_nids[1] = {</div><div class='del'>-	/* ADC1 */</div><div class='del'>-	0x08,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc269_capsrc_nids[1] = {</div><div class='del'>-	0x23,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc269vb_adc_nids[1] = {</div><div class='del'>-	/* ADC1 */</div><div class='del'>-	0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc269vb_capsrc_nids[1] = {</div><div class='del'>-	0x22,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc269_adc_candidates[] = {</div><div class='del'>-	0x08, 0x09, 0x07,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc269_modes		alc260_modes</div><div class='del'>-#define alc269_capture_source	alc880_lg_lw_capture_source</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_base_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc268_acer_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc268_acer_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_lifebook_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc268_acer_bind_master_vol),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Master Playback Switch",</div><div class='del'>-		.subdevice = HDA_SUBDEV_AMP_FLAG,</div><div class='del'>-		.info = snd_hda_mixer_amp_switch_info,</div><div class='del'>-		.get = snd_hda_mixer_amp_switch_get,</div><div class='del'>-		.put = alc268_acer_master_sw_put,</div><div class='del'>-		.private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-	},</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x0b, 0x03, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Dock Mic Boost", 0x1b, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_laptop_mixer[] = {</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269vb_laptop_mixer[] = {</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_asus_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x0c, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new alc269_laptop_analog_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269_laptop_digital_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269vb_laptop_analog_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* FSC amilo */</div><div class='del'>-#define alc269_fujitsu_mixer	alc269_laptop_mixer</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269_quanta_fl1_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269_lifebook_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_COEF_INDEX, 0x0c);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_PROC_COEF, 0x680);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_COEF_INDEX, 0x0c);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_PROC_COEF, 0x480);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jacks state */</div><div class='del'>-static void alc269_lifebook_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	/* Check laptop headphone socket */</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-</div><div class='del'>-	/* Check port replicator headphone socket */</div><div class='del'>-	present |= snd_hda_jack_detect(codec, 0x1a);</div><div class='del'>-</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_COEF_INDEX, 0x0c);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_PROC_COEF, 0x680);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_COEF_INDEX, 0x0c);</div><div class='del'>-	snd_hda_codec_write(codec, 0x20, 0,</div><div class='del'>-			AC_VERB_SET_PROC_COEF, 0x480);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_lifebook_mic_autoswitch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present_laptop;</div><div class='del'>-	unsigned int present_dock;</div><div class='del'>-</div><div class='del'>-	present_laptop	= snd_hda_jack_detect(codec, 0x18);</div><div class='del'>-	present_dock	= snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-</div><div class='del'>-	/* Laptop mic port overrides dock mic port, design decision */</div><div class='del'>-	if (present_dock)</div><div class='del'>-		snd_hda_codec_write(codec, 0x23, 0,</div><div class='del'>-				AC_VERB_SET_CONNECT_SEL, 0x3);</div><div class='del'>-	if (present_laptop)</div><div class='del'>-		snd_hda_codec_write(codec, 0x23, 0,</div><div class='del'>-				AC_VERB_SET_CONNECT_SEL, 0x0);</div><div class='del'>-	if (!present_dock &amp;&amp; !present_laptop)</div><div class='del'>-		snd_hda_codec_write(codec, 0x23, 0,</div><div class='del'>-				AC_VERB_SET_CONNECT_SEL, 0x1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_quanta_fl1_unsol_event(struct hda_codec *codec,</div><div class='del'>-				    unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc269_quanta_fl1_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_lifebook_unsol_event(struct hda_codec *codec,</div><div class='del'>-					unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc269_lifebook_speaker_automute(codec);</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_MIC_EVENT)</div><div class='del'>-		alc269_lifebook_mic_autoswitch(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_quanta_fl1_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_quanta_fl1_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc269_quanta_fl1_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_lifebook_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc269_lifebook_speaker_automute(codec);</div><div class='del'>-	alc269_lifebook_mic_autoswitch(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269_laptop_dmic_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x23, AC_VERB_SET_CONNECT_SEL, 0x05},</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269_laptop_amic_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x23, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x701b | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x06},</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269vb_laptop_amic_init_verbs[] = {</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 &lt;&lt; 8))},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc271_acer_dmic_verbs[] = {</div><div class='del'>-	{0x20, AC_VERB_SET_COEF_INDEX, 0x0d},</div><div class='del'>-	{0x20, AC_VERB_SET_PROC_COEF, 0x4000},</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 6},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc269_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	alc_report_jack(codec, nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc269_laptop_unsol_event(struct hda_codec *codec,</div><div class='del'>-				     unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc269_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_laptop_amic_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_laptop_dmic_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x12;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 5;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269vb_laptop_amic_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x21;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x21;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x12;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 6;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc269_laptop_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc269_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc269_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x02 - 0x03)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use Mux-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1d, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x23, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* set EAPD */</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc269vb_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x02 - 0x03)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use Mux-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1d, 0b */</div><div class='del'>-	/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x22, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* set EAPD */</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define alc269_auto_create_multi_out_ctls \</div><div class='del'>-	alc268_auto_create_multi_out_ctls</div><div class='del'>-#define alc269_auto_create_input_ctls \</div><div class='del'>-	alc268_auto_create_input_ctls</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define alc269_loopbacks	alc880_loopbacks</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc269_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc269_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc269_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc269_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc269_44k_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.rates = SNDRV_PCM_RATE_44100, /* fixed rate */</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = alc880_playback_pcm_open,</div><div class='del'>-		.prepare = alc880_playback_pcm_prepare,</div><div class='del'>-		.cleanup = alc880_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc269_44k_pcm_analog_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.rates = SNDRV_PCM_RATE_44100, /* fixed rate */</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int alc269_mic2_for_mute_led(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	switch (codec-&gt;subsystem_id) {</div><div class='del'>-	case 0x103c1586:</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc269_mic2_mute_check_ps(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	/* update mute-LED according to the speaker mute state */</div><div class='del'>-	if (nid == 0x01 || nid == 0x14) {</div><div class='del'>-		int pinval;</div><div class='del'>-		if (snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0) &amp;</div><div class='del'>-		    HDA_AMP_MUTE)</div><div class='del'>-			pinval = 0x24;</div><div class='del'>-		else</div><div class='del'>-			pinval = 0x20;</div><div class='del'>-		/* mic2 vref pin is used for mute LED control */</div><div class='del'>-		snd_hda_codec_update_cache(codec, 0x19, 0,</div><div class='del'>-					   AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					   pinval);</div><div class='del'>-	}</div><div class='del'>-	return alc_check_power_status(codec, nid);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_SND_HDA_POWER_SAVE */</div><div class='del'>-</div><div class='del'>-static int alc275_setup_dual_adc(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id != 0x10ec0275 || !spec-&gt;auto_mic)</div><div class='del'>-		return 0;</div><div class='del'>-	if ((spec-&gt;ext_mic.pin &gt;= 0x18 &amp;&amp; spec-&gt;int_mic.pin &lt;= 0x13) ||</div><div class='del'>-	    (spec-&gt;ext_mic.pin &lt;= 0x12 &amp;&amp; spec-&gt;int_mic.pin &gt;= 0x18)) {</div><div class='del'>-		if (spec-&gt;ext_mic.pin &lt;= 0x12) {</div><div class='del'>-			spec-&gt;private_adc_nids[0] = 0x08;</div><div class='del'>-			spec-&gt;private_adc_nids[1] = 0x11;</div><div class='del'>-			spec-&gt;private_capsrc_nids[0] = 0x23;</div><div class='del'>-			spec-&gt;private_capsrc_nids[1] = 0x22;</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;private_adc_nids[0] = 0x11;</div><div class='del'>-			spec-&gt;private_adc_nids[1] = 0x08;</div><div class='del'>-			spec-&gt;private_capsrc_nids[0] = 0x22;</div><div class='del'>-			spec-&gt;private_capsrc_nids[1] = 0x23;</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;adc_nids = spec-&gt;private_adc_nids;</div><div class='del'>-		spec-&gt;capsrc_nids = spec-&gt;private_capsrc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = 2;</div><div class='del'>-		spec-&gt;dual_adc_switch = 1;</div><div class='del'>-		snd_printdd("realtek: enabling dual ADC switchg (%02x:%02x)\n",</div><div class='del'>-			    spec-&gt;adc_nids[0], spec-&gt;adc_nids[1]);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* different alc269-variants */</div><div class='del'>-enum {</div><div class='del'>-	ALC269_TYPE_NORMAL,</div><div class='del'>-	ALC269_TYPE_ALC259,</div><div class='del'>-	ALC269_TYPE_ALC271X,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc269_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc269_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc269_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = alc269_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (spec-&gt;codec_variant == ALC269_TYPE_NORMAL)</div><div class='del'>-		err = alc269_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	else</div><div class='del'>-		err = alc_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg, 0,</div><div class='del'>-						 0x22, 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_variant != ALC269_TYPE_NORMAL) {</div><div class='del'>-		add_verb(spec, alc269vb_init_verbs);</div><div class='del'>-		alc_ssid_check(codec, 0, 0x1b, 0x14, 0x21);</div><div class='del'>-	} else {</div><div class='del'>-		add_verb(spec, alc269_init_verbs);</div><div class='del'>-		alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (!alc275_setup_dual_adc(codec))</div><div class='del'>-		fillup_priv_adc_nids(codec, alc269_adc_candidates,</div><div class='del'>-				     sizeof(alc269_adc_candidates));</div><div class='del'>-</div><div class='del'>-	/* set default input source */</div><div class='del'>-	if (!spec-&gt;dual_adc_switch)</div><div class='del'>-		select_or_unmute_capsrc(codec, spec-&gt;capsrc_nids[0],</div><div class='del'>-					spec-&gt;input_mux-&gt;items[0].index);</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;cap_mixer &amp;&amp; !spec-&gt;no_analog)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc269_auto_init_multi_out	alc268_auto_init_multi_out</div><div class='del'>-#define alc269_auto_init_hp_out		alc268_auto_init_hp_out</div><div class='del'>-#define alc269_auto_init_analog_input	alc882_auto_init_analog_input</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static void alc269_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc269_auto_init_multi_out(codec);</div><div class='del'>-	alc269_auto_init_hp_out(codec);</div><div class='del'>-	alc269_auto_init_analog_input(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-static void alc269_toggle_power_output(struct hda_codec *codec, int power_up)</div><div class='del'>-{</div><div class='del'>-	int val = alc_read_coef_idx(codec, 0x04);</div><div class='del'>-	if (power_up)</div><div class='del'>-		val |= 1 &lt;&lt; 11;</div><div class='del'>-	else</div><div class='del'>-		val &amp;= ~(1 &lt;&lt; 11);</div><div class='del'>-	alc_write_coef_idx(codec, 0x04, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int alc269_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x017)</div><div class='del'>-		alc269_toggle_power_output(codec, 0);</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x018) {</div><div class='del'>-		alc269_toggle_power_output(codec, 0);</div><div class='del'>-		msleep(150);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alc_shutup(codec);</div><div class='del'>-	if (spec &amp;&amp; spec-&gt;power_hook)</div><div class='del'>-		spec-&gt;power_hook(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_SND_HDA_POWER_SAVE */</div><div class='del'>-</div><div class='del'>-static int alc269_resume(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x018) {</div><div class='del'>-		alc269_toggle_power_output(codec, 0);</div><div class='del'>-		msleep(150);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init(codec);</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x017) {</div><div class='del'>-		alc269_toggle_power_output(codec, 1);</div><div class='del'>-		msleep(200);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x018)</div><div class='del'>-		alc269_toggle_power_output(codec, 1);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_resume_amp(codec);</div><div class='del'>-	snd_hda_codec_resume_cache(codec);</div><div class='del'>-	hda_call_check_power_status(codec, 0x01);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif /* SND_HDA_NEEDS_RESUME */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ALC269_FIXUP_SONY_VAIO,</div><div class='del'>-	ALC269_FIXUP_DELL_M101Z,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc269_fixups[] = {</div><div class='del'>-	[ALC269_FIXUP_SONY_VAIO] = {</div><div class='del'>-		.verbs = (const struct hda_verb[]) {</div><div class='del'>-			{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},</div><div class='del'>-			{}</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	[ALC269_FIXUP_DELL_M101Z] = {</div><div class='del'>-		.verbs = (const struct hda_verb[]) {</div><div class='del'>-			/* Enables internal speaker */</div><div class='del'>-			{0x20, AC_VERB_SET_COEF_INDEX, 13},</div><div class='del'>-			{0x20, AC_VERB_SET_PROC_COEF, 0x4040},</div><div class='del'>-			{}</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc269_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc269_models[ALC269_MODEL_LAST] = {</div><div class='del'>-	[ALC269_BASIC]			= "basic",</div><div class='del'>-	[ALC269_QUANTA_FL1]		= "quanta",</div><div class='del'>-	[ALC269_AMIC]			= "laptop-amic",</div><div class='del'>-	[ALC269_DMIC]			= "laptop-dmic",</div><div class='del'>-	[ALC269_FUJITSU]		= "fujitsu",</div><div class='del'>-	[ALC269_LIFEBOOK]		= "lifebook",</div><div class='del'>-	[ALC269_AUTO]			= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc269_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x047c, "ACER ZGA", ALC271_ACER),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",</div><div class='del'>-		      ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11b3, "ASUS K52DR", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269VB_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1593, "ASUS N51Vn", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",</div><div class='del'>-		      ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101",</div><div class='del'>-		      ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005HA", ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005HA", ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x1778, "Quanta ON1", ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3be9, "Quanta Wistron", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x17ff, 0x059a, "Quanta EL3", ALC269_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(0x17ff, 0x059b, "Quanta JR1", ALC269_DMIC),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc269_presets[] = {</div><div class='del'>-	[ALC269_BASIC] = {</div><div class='del'>-		.mixers = { alc269_base_mixer },</div><div class='del'>-		.init_verbs = { alc269_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.input_mux = &amp;alc269_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC269_QUANTA_FL1] = {</div><div class='del'>-		.mixers = { alc269_quanta_fl1_mixer },</div><div class='del'>-		.init_verbs = { alc269_init_verbs, alc269_quanta_fl1_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.input_mux = &amp;alc269_capture_source,</div><div class='del'>-		.unsol_event = alc269_quanta_fl1_unsol_event,</div><div class='del'>-		.setup = alc269_quanta_fl1_setup,</div><div class='del'>-		.init_hook = alc269_quanta_fl1_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269_AMIC] = {</div><div class='del'>-		.mixers = { alc269_laptop_mixer },</div><div class='del'>-		.cap_mixer = alc269_laptop_analog_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269_init_verbs,</div><div class='del'>-				alc269_laptop_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.unsol_event = alc269_laptop_unsol_event,</div><div class='del'>-		.setup = alc269_laptop_amic_setup,</div><div class='del'>-		.init_hook = alc269_laptop_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269_DMIC] = {</div><div class='del'>-		.mixers = { alc269_laptop_mixer },</div><div class='del'>-		.cap_mixer = alc269_laptop_digital_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269_init_verbs,</div><div class='del'>-				alc269_laptop_dmic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.unsol_event = alc269_laptop_unsol_event,</div><div class='del'>-		.setup = alc269_laptop_dmic_setup,</div><div class='del'>-		.init_hook = alc269_laptop_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269VB_AMIC] = {</div><div class='del'>-		.mixers = { alc269vb_laptop_mixer },</div><div class='del'>-		.cap_mixer = alc269vb_laptop_analog_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269vb_init_verbs,</div><div class='del'>-				alc269vb_laptop_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.unsol_event = alc269_laptop_unsol_event,</div><div class='del'>-		.setup = alc269vb_laptop_amic_setup,</div><div class='del'>-		.init_hook = alc269_laptop_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269VB_DMIC] = {</div><div class='del'>-		.mixers = { alc269vb_laptop_mixer },</div><div class='del'>-		.cap_mixer = alc269vb_laptop_digital_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269vb_init_verbs,</div><div class='del'>-				alc269vb_laptop_dmic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.unsol_event = alc269_laptop_unsol_event,</div><div class='del'>-		.setup = alc269vb_laptop_dmic_setup,</div><div class='del'>-		.init_hook = alc269_laptop_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269_FUJITSU] = {</div><div class='del'>-		.mixers = { alc269_fujitsu_mixer },</div><div class='del'>-		.cap_mixer = alc269_laptop_digital_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269_init_verbs,</div><div class='del'>-				alc269_laptop_dmic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.unsol_event = alc269_laptop_unsol_event,</div><div class='del'>-		.setup = alc269_laptop_dmic_setup,</div><div class='del'>-		.init_hook = alc269_laptop_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC269_LIFEBOOK] = {</div><div class='del'>-		.mixers = { alc269_lifebook_mixer },</div><div class='del'>-		.init_verbs = { alc269_init_verbs, alc269_lifebook_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.input_mux = &amp;alc269_capture_source,</div><div class='del'>-		.unsol_event = alc269_lifebook_unsol_event,</div><div class='del'>-		.init_hook = alc269_lifebook_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC271_ACER] = {</div><div class='del'>-		.mixers = { alc269_asus_mixer },</div><div class='del'>-		.cap_mixer = alc269vb_laptop_digital_capture_mixer,</div><div class='del'>-		.init_verbs = { alc269_init_verbs, alc271_acer_dmic_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc269_dac_nids),</div><div class='del'>-		.dac_nids = alc269_dac_nids,</div><div class='del'>-		.adc_nids = alc262_dmic_adc_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc262_dmic_adc_nids),</div><div class='del'>-		.capsrc_nids = alc262_dmic_capsrc_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc269_modes),</div><div class='del'>-		.channel_mode = alc269_modes,</div><div class='del'>-		.input_mux = &amp;alc269_capture_source,</div><div class='del'>-		.dig_out_nid = ALC880_DIGOUT_NID,</div><div class='del'>-		.unsol_event = alc_sku_unsol_event,</div><div class='del'>-		.setup = alc269vb_laptop_dmic_setup,</div><div class='del'>-		.init_hook = alc_inithook,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int alc269_fill_coef(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) &lt; 0x015) {</div><div class='del'>-		alc_write_coef_idx(codec, 0xf, 0x960b);</div><div class='del'>-		alc_write_coef_idx(codec, 0xe, 0x8817);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x016) {</div><div class='del'>-		alc_write_coef_idx(codec, 0xf, 0x960b);</div><div class='del'>-		alc_write_coef_idx(codec, 0xe, 0x8814);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x017) {</div><div class='del'>-		val = alc_read_coef_idx(codec, 0x04);</div><div class='del'>-		/* Power up output pin */</div><div class='del'>-		alc_write_coef_idx(codec, 0x04, val | (1&lt;&lt;11));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00ff) == 0x018) {</div><div class='del'>-		val = alc_read_coef_idx(codec, 0xd);</div><div class='del'>-		if ((val &amp; 0x0c00) &gt;&gt; 10 != 0x1) {</div><div class='del'>-			/* Capless ramp up clock control */</div><div class='del'>-			alc_write_coef_idx(codec, 0xd, val | 1&lt;&lt;10);</div><div class='del'>-		}</div><div class='del'>-		val = alc_read_coef_idx(codec, 0x17);</div><div class='del'>-		if ((val &amp; 0x01c0) &gt;&gt; 6 != 0x4) {</div><div class='del'>-			/* Class D power on reset */</div><div class='del'>-			alc_write_coef_idx(codec, 0x17, val | 1&lt;&lt;7);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_alc269(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_customize_define(codec);</div><div class='del'>-</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00f0) == 0x0010){</div><div class='del'>-		if (codec-&gt;bus-&gt;pci-&gt;subsystem_vendor == 0x1025 &amp;&amp;</div><div class='del'>-		    spec-&gt;cdefine.platform_type == 1) {</div><div class='del'>-			alc_codec_rename(codec, "ALC271X");</div><div class='del'>-			spec-&gt;codec_variant = ALC269_TYPE_ALC271X;</div><div class='del'>-		} else {</div><div class='del'>-			alc_codec_rename(codec, "ALC259");</div><div class='del'>-			spec-&gt;codec_variant = ALC269_TYPE_ALC259;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		alc_fix_pll_init(codec, 0x20, 0x04, 15);</div><div class='del'>-</div><div class='del'>-	alc269_fill_coef(codec);</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,</div><div class='del'>-						  alc269_models,</div><div class='del'>-						  alc269_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC269_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC269_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 1);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC269_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc269_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC269_BASIC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_cdefine_beep(codec)) {</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC269_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc269_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC269_QUANTA_FL1) {</div><div class='del'>-		/* Due to a hardware problem on Lenovo Ideadpad, we need to</div><div class='del'>-		 * fix the sample rate of analog I/O to 44.1kHz</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;stream_analog_playback = &amp;alc269_44k_pcm_analog_playback;</div><div class='del'>-		spec-&gt;stream_analog_capture = &amp;alc269_44k_pcm_analog_capture;</div><div class='del'>-	} else if (spec-&gt;dual_adc_switch) {</div><div class='del'>-		spec-&gt;stream_analog_playback = &amp;alc269_pcm_analog_playback;</div><div class='del'>-		/* switch ADC dynamically */</div><div class='del'>-		spec-&gt;stream_analog_capture = &amp;dualmic_pcm_analog_capture;</div><div class='del'>-	} else {</div><div class='del'>-		spec-&gt;stream_analog_playback = &amp;alc269_pcm_analog_playback;</div><div class='del'>-		spec-&gt;stream_analog_capture = &amp;alc269_pcm_analog_capture;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc269_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc269_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids) { /* wasn't filled automatically? use default */</div><div class='del'>-		if (spec-&gt;codec_variant != ALC269_TYPE_NORMAL) {</div><div class='del'>-			spec-&gt;adc_nids = alc269_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc269_adc_nids);</div><div class='del'>-			spec-&gt;capsrc_nids = alc269_capsrc_nids;</div><div class='del'>-		} else {</div><div class='del'>-			spec-&gt;adc_nids = alc269vb_adc_nids;</div><div class='del'>-			spec-&gt;num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids);</div><div class='del'>-			spec-&gt;capsrc_nids = alc269vb_capsrc_nids;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;cap_mixer)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-	if (has_cdefine_beep(codec))</div><div class='del'>-		set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC269_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 0);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x02;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	codec-&gt;patch_ops.suspend = alc269_suspend;</div><div class='del'>-#endif</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	codec-&gt;patch_ops.resume = alc269_resume;</div><div class='del'>-#endif</div><div class='del'>-	if (board_config == ALC269_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc269_auto_init;</div><div class='del'>-</div><div class='del'>-	alc_init_jacks(codec);</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc269_loopbacks;</div><div class='del'>-	if (alc269_mic2_for_mute_led(codec))</div><div class='del'>-		codec-&gt;patch_ops.check_power_status = alc269_mic2_mute_check_ps;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  ALC861 channel source setting (2/6 channel selection for 3-stack)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set the path ways for 2 channel output</div><div class='del'>- * need to set the codec line out and mic 1 pin widgets to inputs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861_threestack_ch2_init[] = {</div><div class='del'>-	/* set pin widget 1Ah (line in) for input */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* set pin widget 18h (mic1/2) for input, for mic also enable</div><div class='del'>-	 * the vref</div><div class='del'>-	 */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },</div><div class='del'>-#if 0</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 &lt;&lt; 8)) }, /*line-in*/</div><div class='del'>-#endif</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- * need to set the codec line out and mic 1 pin widgets to outputs</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861_threestack_ch6_init[] = {</div><div class='del'>-	/* set pin widget 1Ah (line in) for output (Back Surround)*/</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* set pin widget 18h (mic1) for output (CLFE)*/</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-</div><div class='del'>-	{ 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },</div><div class='del'>-#if 0</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8)) }, /*line in*/</div><div class='del'>-#endif</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc861_threestack_modes[2] = {</div><div class='del'>-	{ 2, alc861_threestack_ch2_init },</div><div class='del'>-	{ 6, alc861_threestack_ch6_init },</div><div class='del'>-};</div><div class='del'>-/* Set mic1 as input and unmute the mixer */</div><div class='del'>-static struct hda_verb alc861_uniwill_m31_ch2_init[] = {</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-/* Set mic1 as output and mute mixer */</div><div class='del'>-static struct hda_verb alc861_uniwill_m31_ch4_init[] = {</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc861_uniwill_m31_modes[2] = {</div><div class='del'>-	{ 2, alc861_uniwill_m31_ch2_init },</div><div class='del'>-	{ 4, alc861_uniwill_m31_ch4_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Set mic1 and line-in as input and unmute the mixer */</div><div class='del'>-static struct hda_verb alc861_asus_ch2_init[] = {</div><div class='del'>-	/* set pin widget 1Ah (line in) for input */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* set pin widget 18h (mic1/2) for input, for mic also enable</div><div class='del'>-	 * the vref</div><div class='del'>-	 */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c },</div><div class='del'>-#if 0</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 &lt;&lt; 8)) }, /*line-in*/</div><div class='del'>-#endif</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-/* Set mic1 nad line-in as output and mute mixer */</div><div class='del'>-static struct hda_verb alc861_asus_ch6_init[] = {</div><div class='del'>-	/* set pin widget 1Ah (line in) for output (Back Surround)*/</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* { 0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, */</div><div class='del'>-	/* set pin widget 18h (mic1) for output (CLFE)*/</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	{ 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },</div><div class='del'>-#if 0</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 &lt;&lt; 8)) }, /*mic*/</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 &lt;&lt; 8)) }, /*line in*/</div><div class='del'>-#endif</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc861_asus_modes[2] = {</div><div class='del'>-	{ 2, alc861_asus_ch2_init },</div><div class='del'>-	{ 6, alc861_asus_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* patch-ALC861 */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861_base_mixer[] = {</div><div class='del'>-        /* output mixer control */</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-        /*Input mixer control */</div><div class='del'>-	/* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	   HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861_3ST_mixer[] = {</div><div class='del'>-        /* output mixer control */</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	/*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */</div><div class='del'>-</div><div class='del'>-	/* Input mixer control */</div><div class='del'>-	/* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	   HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-                .private_value = ARRAY_SIZE(alc861_threestack_modes),</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861_toshiba_mixer[] = {</div><div class='del'>-        /* output mixer control */</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {</div><div class='del'>-        /* output mixer control */</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	/*HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT), */</div><div class='del'>-</div><div class='del'>-	/* Input mixer control */</div><div class='del'>-	/* HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	   HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT), */</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-                .private_value = ARRAY_SIZE(alc861_uniwill_m31_modes),</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861_asus_mixer[] = {</div><div class='del'>-        /* output mixer control */</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x05, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x05, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Side Playback Switch", 0x04, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	/* Input mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Input Playback Volume", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Input Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x15, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x15, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-                .private_value = ARRAY_SIZE(alc861_asus_modes),</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* additional mixer */</div><div class='del'>-static struct snd_kcontrol_new alc861_asus_laptop_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861_base_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	/* port-A for surround (rear panel) */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x0e, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-C for line-in (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* port-D for Front */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x1f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x20, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* route front mic to ADC1*/</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute DAC0~3 &amp; spdif out*/</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Unmute Mixer 14 (mic) 1c (Line in)*/</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Stereo Mixer 15 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* hp used DAC 3 (Front) */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861_threestack_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	/* port-A for surround (rear panel) */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-C for line-in (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* port-D for Front */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* route front mic to ADC1*/</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Unmute DAC0~3 &amp; spdif out*/</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Unmute Mixer 14 (mic) 1c (Line in)*/</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Stereo Mixer 15 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* hp used DAC 3 (Front) */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861_uniwill_m31_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	/* port-A for surround (rear panel) */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-C for line-in (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* port-D for Front */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	/* this has to be set to VREF80 */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* route front mic to ADC1*/</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Unmute DAC0~3 &amp; spdif out*/</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Unmute Mixer 14 (mic) 1c (Line in)*/</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Stereo Mixer 15 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* hp used DAC 3 (Front) */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861_asus_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	/* port-A for surround (rear panel)</div><div class='del'>-	 * according to codec#0 this is the HP jack</div><div class='del'>-	 */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 }, /* was 0x00 */</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	/* port-B for mic-in (rear panel) with vref */</div><div class='del'>-	{ 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-C for line-in (rear panel) */</div><div class='del'>-	{ 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* port-D for Front */</div><div class='del'>-	{ 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-E for HP out (front panel) */</div><div class='del'>-	/* this has to be set to VREF80 */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* route front PCM to HP */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },</div><div class='del'>-	/* port-F for mic-in (front panel) with vref */</div><div class='del'>-	{ 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },</div><div class='del'>-	/* port-G for CLFE (rear panel) */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* port-H for side (rear panel) */</div><div class='del'>-	{ 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },</div><div class='del'>-	/* CD-in */</div><div class='del'>-	{ 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },</div><div class='del'>-	/* route front mic to ADC1*/</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	/* Unmute DAC0~3 &amp; spdif out*/</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* Unmute Mixer 14 (mic) 1c (Line in)*/</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-        {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Stereo Mixer 15 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c}, /* Output 0~12 step */</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	/* hp used DAC 3 (Front) */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* additional init verbs for ASUS laptops */</div><div class='del'>-static struct hda_verb alc861_asus_laptop_init_verbs[] = {</div><div class='del'>-	{ 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x45 }, /* HP-out */</div><div class='del'>-	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2) }, /* mute line-in */</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861_auto_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	/* {0x08, AC_VERB_SET_CONNECT_SEL, 0x00}, */</div><div class='del'>-	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute DAC0~3 &amp; spdif out*/</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Unmute Mixer 14 (mic) 1c (Line in)*/</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Unmute Stereo Mixer 15 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb00c},</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-</div><div class='del'>-	{0x08, AC_VERB_SET_CONNECT_SEL, 0x00},	/* set Mic 1 */</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861_toshiba_init_verbs[] = {</div><div class='del'>-	{0x0f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc861_toshiba_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present = snd_hda_jack_detect(codec, 0x0f);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x16, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x1a, HDA_INPUT, 3,</div><div class='del'>-				 HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861_toshiba_unsol_event(struct hda_codec *codec,</div><div class='del'>-				       unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc861_toshiba_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc861_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc861_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc861_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc861_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define ALC861_DIGOUT_NID	0x07</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc861_8ch_modes[1] = {</div><div class='del'>-	{ 8, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861_dac_nids[4] = {</div><div class='del'>-	/* front, surround, clfe, side */</div><div class='del'>-	0x03, 0x06, 0x05, 0x04</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc660_dac_nids[3] = {</div><div class='del'>-	/* front, clfe, surround */</div><div class='del'>-	0x03, 0x05, 0x06</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861_adc_nids[1] = {</div><div class='del'>-	/* ADC0-2 */</div><div class='del'>-	0x08,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc861_capture_source = {</div><div class='del'>-	.num_items = 5,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x3 },</div><div class='del'>-		{ "Line", 0x1 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-		{ "Mixer", 0x5 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861_look_for_dac(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t mix, srcs[5];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	if (snd_hda_get_connections(codec, pin, &amp;mix, 1) != 1)</div><div class='del'>-		return 0;</div><div class='del'>-	num = snd_hda_get_connections(codec, mix, srcs, ARRAY_SIZE(srcs));</div><div class='del'>-	if (num &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		unsigned int type;</div><div class='del'>-		type = get_wcaps_type(get_wcaps(codec, srcs[i]));</div><div class='del'>-		if (type != AC_WID_AUD_OUT)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 0; j &lt; spec-&gt;multiout.num_dacs; j++)</div><div class='del'>-			if (spec-&gt;multiout.dac_nids[j] == srcs[i])</div><div class='del'>-				break;</div><div class='del'>-		if (j &gt;= spec-&gt;multiout.num_dacs)</div><div class='del'>-			return srcs[i];</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int alc861_auto_fill_dac_nids(struct hda_codec *codec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid, dac;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		dac = alc861_look_for_dac(codec, nid);</div><div class='del'>-		if (!dac)</div><div class='del'>-			continue;</div><div class='del'>-		spec-&gt;multiout.dac_nids[spec-&gt;multiout.num_dacs++] = dac;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc861_create_out_sw(struct hda_codec *codec, const char *pfx,</div><div class='del'>-				hda_nid_t nid, unsigned int chs)</div><div class='del'>-{</div><div class='del'>-	return add_pb_sw_ctrl(codec-&gt;spec, ALC_CTL_WIDGET_MUTE, pfx,</div><div class='del'>-			   HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc861_auto_create_multi_out_ctls(struct hda_codec *codec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	static const char *chname[4] = {</div><div class='del'>-		"Front", "Surround", NULL /*CLFE*/, "Side"</div><div class='del'>-	};</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_outs == 1) {</div><div class='del'>-		const char *pfx = NULL;</div><div class='del'>-		if (!cfg-&gt;hp_outs)</div><div class='del'>-			pfx = "Master";</div><div class='del'>-		else if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-			pfx = "Speaker";</div><div class='del'>-		if (pfx) {</div><div class='del'>-			nid = spec-&gt;multiout.dac_nids[0];</div><div class='del'>-			return alc861_create_out_sw(codec, pfx, nid, 3);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		if (i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = alc861_create_out_sw(codec, "Center", nid, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = alc861_create_out_sw(codec, "LFE", nid, 2);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			err = alc861_create_out_sw(codec, chname[i], nid, 3);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc861_auto_create_hp_ctls(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if ((pin &gt;= 0x0b &amp;&amp; pin &lt;= 0x10) || pin == 0x1f || pin == 0x20) {</div><div class='del'>-		nid = alc861_look_for_dac(codec, pin);</div><div class='del'>-		if (nid) {</div><div class='del'>-			err = alc861_create_out_sw(codec, "Headphone", nid, 3);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			spec-&gt;multiout.hp_nid = nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int alc861_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0x15, 0x08, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid,</div><div class='del'>-					      int pin_type, hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t mix, srcs[5];</div><div class='del'>-	int i, num;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    pin_type);</div><div class='del'>-	snd_hda_codec_write(codec, dac, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-			    AMP_OUT_UNMUTE);</div><div class='del'>-	if (snd_hda_get_connections(codec, nid, &amp;mix, 1) != 1)</div><div class='del'>-		return;</div><div class='del'>-	num = snd_hda_get_connections(codec, mix, srcs, ARRAY_SIZE(srcs));</div><div class='del'>-	if (num &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		unsigned int mute;</div><div class='del'>-		if (srcs[i] == dac || srcs[i] == 0x15)</div><div class='del'>-			mute = AMP_IN_UNMUTE(i);</div><div class='del'>-		else</div><div class='del'>-			mute = AMP_IN_MUTE(i);</div><div class='del'>-		snd_hda_codec_write(codec, mix, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    mute);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		if (nid)</div><div class='del'>-			alc861_auto_set_output_and_unmute(codec, nid, pin_type,</div><div class='del'>-							  spec-&gt;multiout.dac_nids[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.hp_outs)</div><div class='del'>-		alc861_auto_set_output_and_unmute(codec,</div><div class='del'>-						  spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-						  PIN_HP,</div><div class='del'>-						  spec-&gt;multiout.hp_nid);</div><div class='del'>-	if (spec-&gt;autocfg.speaker_outs)</div><div class='del'>-		alc861_auto_set_output_and_unmute(codec,</div><div class='del'>-						  spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-						  PIN_OUT,</div><div class='del'>-						  spec-&gt;multiout.dac_nids[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (nid &gt;= 0x0c &amp;&amp; nid &lt;= 0x11)</div><div class='del'>-			alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the BIOS configuration and set up the alc_spec */</div><div class='del'>-/* return 1 if successful, 0 if the proper config is not found,</div><div class='del'>- * or a negative error code</div><div class='del'>- */</div><div class='del'>-static int alc861_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc861_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc861_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = alc861_auto_fill_dac_nids(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861_auto_create_multi_out_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861_auto_create_hp_ctls(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc861_auto_init_verbs);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	spec-&gt;adc_nids = alc861_adc_nids;</div><div class='del'>-	spec-&gt;num_adc_nids = ARRAY_SIZE(alc861_adc_nids);</div><div class='del'>-	set_capture_mixer(codec);</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x0e, 0x0f, 0x0b, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc861_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc861_auto_init_multi_out(codec);</div><div class='del'>-	alc861_auto_init_hp_out(codec);</div><div class='del'>-	alc861_auto_init_analog_input(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list alc861_loopbacks[] = {</div><div class='del'>-	{ 0x15, HDA_INPUT, 0 },</div><div class='del'>-	{ 0x15, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x15, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x15, HDA_INPUT, 3 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc861_models[ALC861_MODEL_LAST] = {</div><div class='del'>-	[ALC861_3ST]		= "3stack",</div><div class='del'>-	[ALC660_3ST]		= "3stack-660",</div><div class='del'>-	[ALC861_3ST_DIG]	= "3stack-dig",</div><div class='del'>-	[ALC861_6ST_DIG]	= "6stack-dig",</div><div class='del'>-	[ALC861_UNIWILL_M31]	= "uniwill-m31",</div><div class='del'>-	[ALC861_TOSHIBA]	= "toshiba",</div><div class='del'>-	[ALC861_ASUS]		= "asus",</div><div class='del'>-	[ALC861_ASUS_LAPTOP]	= "asus-laptop",</div><div class='del'>-	[ALC861_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc861_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC861_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1335, "ASUS F2/3", ALC861_ASUS_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1338, "ASUS F2/3", ALC861_ASUS_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1393, "ASUS", ALC861_ASUS),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x13d7, "ASUS A9rp", ALC861_ASUS_LAPTOP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS P1-AH2", ALC861_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba", ALC861_TOSHIBA),</div><div class='del'>-	/* FIXME: the entry below breaks Toshiba A100 (model=auto works!)</div><div class='del'>-	 *        Any other models that need this preset?</div><div class='del'>-	 */</div><div class='del'>-	/* SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba", ALC861_TOSHIBA), */</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7254, "HP dx2200 (MSI MS-7254)", ALC861_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1462, 0x7297, "HP dx2250 (MSI MS-7297)", ALC861_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x2b01, "Uniwill X40AIx", ALC861_UNIWILL_M31),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9072, "Uniwill m31", ALC861_UNIWILL_M31),</div><div class='del'>-	SND_PCI_QUIRK(0x1584, 0x9075, "Airis Praxis N1212", ALC861_ASUS_LAPTOP),</div><div class='del'>-	/* FIXME: the below seems conflict */</div><div class='del'>-	/* SND_PCI_QUIRK(0x1584, 0x9075, "Uniwill", ALC861_UNIWILL_M31), */</div><div class='del'>-	SND_PCI_QUIRK(0x1849, 0x0660, "Asrock 939SLI32", ALC660_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x8086, 0xd600, "Intel", ALC861_3ST),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc861_presets[] = {</div><div class='del'>-	[ALC861_3ST] = {</div><div class='del'>-		.mixers = { alc861_3ST_mixer },</div><div class='del'>-		.init_verbs = { alc861_threestack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),</div><div class='del'>-		.channel_mode = alc861_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_3ST_DIG] = {</div><div class='del'>-		.mixers = { alc861_base_mixer },</div><div class='del'>-		.init_verbs = { alc861_threestack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),</div><div class='del'>-		.channel_mode = alc861_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_6ST_DIG] = {</div><div class='del'>-		.mixers = { alc861_base_mixer },</div><div class='del'>-		.init_verbs = { alc861_base_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_8ch_modes),</div><div class='del'>-		.channel_mode = alc861_8ch_modes,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC660_3ST] = {</div><div class='del'>-		.mixers = { alc861_3ST_mixer },</div><div class='del'>-		.init_verbs = { alc861_threestack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc660_dac_nids),</div><div class='del'>-		.dac_nids = alc660_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_threestack_modes),</div><div class='del'>-		.channel_mode = alc861_threestack_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_UNIWILL_M31] = {</div><div class='del'>-		.mixers = { alc861_uniwill_m31_mixer },</div><div class='del'>-		.init_verbs = { alc861_uniwill_m31_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_uniwill_m31_modes),</div><div class='del'>-		.channel_mode = alc861_uniwill_m31_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_TOSHIBA] = {</div><div class='del'>-		.mixers = { alc861_toshiba_mixer },</div><div class='del'>-		.init_verbs = { alc861_base_init_verbs,</div><div class='del'>-				alc861_toshiba_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-		.unsol_event = alc861_toshiba_unsol_event,</div><div class='del'>-		.init_hook = alc861_toshiba_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_ASUS] = {</div><div class='del'>-		.mixers = { alc861_asus_mixer },</div><div class='del'>-		.init_verbs = { alc861_asus_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861_asus_modes),</div><div class='del'>-		.channel_mode = alc861_asus_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.hp_nid = 0x06,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861_ASUS_LAPTOP] = {</div><div class='del'>-		.mixers = { alc861_toshiba_mixer, alc861_asus_laptop_mixer },</div><div class='del'>-		.init_verbs = { alc861_asus_init_verbs,</div><div class='del'>-				alc861_asus_laptop_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861_dac_nids),</div><div class='del'>-		.dac_nids = alc861_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc883_3ST_2ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc861_adc_nids),</div><div class='del'>-		.adc_nids = alc861_adc_nids,</div><div class='del'>-		.input_mux = &amp;alc861_capture_source,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin config fixes */</div><div class='del'>-enum {</div><div class='del'>-	PINFIX_FSC_AMILO_PI1505,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc861_fixups[] = {</div><div class='del'>-	[PINFIX_FSC_AMILO_PI1505] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x0b, 0x0221101f }, /* HP */</div><div class='del'>-			{ 0x0f, 0x90170310 }, /* speaker */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc861_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc861(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-        board_config = snd_hda_check_board_config(codec, ALC861_MODEL_LAST,</div><div class='del'>-						  alc861_models,</div><div class='del'>-						  alc861_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC861_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 1);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc861_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-		   board_config = ALC861_3ST_DIG;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x23);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		alc_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC861_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc861_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc861_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc861_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc861_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc861_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;cap_mixer)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-	set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x03;</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 0);</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC861_AUTO) {</div><div class='del'>-		spec-&gt;init_hook = alc861_auto_init;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-		spec-&gt;power_hook = alc_power_eapd;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc861_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC861-VD support</div><div class='del'>- *</div><div class='del'>- * Based on ALC882</div><div class='del'>- *</div><div class='del'>- * In addition, an independent DAC</div><div class='del'>- */</div><div class='del'>-#define ALC861VD_DIGOUT_NID	0x06</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861vd_dac_nids[4] = {</div><div class='del'>-	/* front, surr, clfe, side surr */</div><div class='del'>-	0x02, 0x03, 0x04, 0x05</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* dac_nids for ALC660vd are in a different order - according to</div><div class='del'>- * Realtek's driver.</div><div class='del'>- * This should probably result in a different mixer for 6stack models</div><div class='del'>- * of ALC660vd codecs, but for now there is only 3stack mixer</div><div class='del'>- * - and it is the same as in 861vd.</div><div class='del'>- * adc_nids in ALC660vd are (is) the same as in 861vd</div><div class='del'>- */</div><div class='del'>-static hda_nid_t alc660vd_dac_nids[3] = {</div><div class='del'>-	/* front, rear, clfe, rear_surr */</div><div class='del'>-	0x02, 0x04, 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861vd_adc_nids[1] = {</div><div class='del'>-	/* ADC0 */</div><div class='del'>-	0x09,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc861vd_capsrc_nids[1] = { 0x22 };</div><div class='del'>-</div><div class='del'>-/* input MUX */</div><div class='del'>-/* FIXME: should be a matrix-type input source selection */</div><div class='del'>-static struct hda_input_mux alc861vd_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc861vd_dallas_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Ext Mic", 0x0 },</div><div class='del'>-		{ "Int Mic", 0x1 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc861vd_hp_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Front Mic", 0x0 },</div><div class='del'>-		{ "ATAPI Mic", 0x1 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_channel_mode alc861vd_3stack_2ch_modes[1] = {</div><div class='del'>-	{ 2, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861vd_6stack_ch6_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 8ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861vd_6stack_ch8_init[] = {</div><div class='del'>-	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc861vd_6stack_modes[2] = {</div><div class='del'>-	{ 6, alc861vd_6stack_ch6_init },</div><div class='del'>-	{ 8, alc861vd_6stack_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861vd_chmode_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17</div><div class='del'>- *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc861vd_6st_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0,</div><div class='del'>-				HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0,</div><div class='del'>-				HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),</div><div class='del'>-	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Side Playback Volume", 0x05, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861vd_3st_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	/*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Speaker=0x14, HP = 0x15,</div><div class='del'>- *                 Ext Mic=0x18, Int Mic = 0x19, CD = 0x1c, PC Beep = 0x1d</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Speaker=0x14, Line-out = 0x15,</div><div class='del'>- *                 Front Mic=0x18, ATAPI Mic = 0x19,</div><div class='del'>- */</div><div class='del'>-static struct snd_kcontrol_new alc861vd_hp_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861vd_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of</div><div class='del'>-	 * the analog-loopback mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* Capture mixer: unmute Mic, F-Mic, Line, CD inputs */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x02 - 0x05)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* set up input amps for analog loopback */</div><div class='del'>-	/* Amp Indices: DAC = 0, mixer = 1 */</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 3-stack pin configuration:</div><div class='del'>- * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861vd_3stack_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Set pin mode and muting</div><div class='del'>-	 */</div><div class='del'>-	/* set front pin widgets 0x14 for output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line-2 In: Headphone output (output 0 - 0x0c) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6-stack pin configuration:</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc861vd_6stack_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Set pin mode and muting</div><div class='del'>-	 */</div><div class='del'>-	/* set front pin widgets 0x14 for output */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	/* Rear Pin: output 1 (0x0d) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	/* CLFE Pin: output 2 (0x0e) */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_CONNECT_SEL, 0x02},</div><div class='del'>-	/* Side Pin: output 3 (0x0f) */</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x03},</div><div class='del'>-</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line-2 In: Headphone output (output 0 - 0x0c) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861vd_eapd_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc660vd_eapd_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861vd_lenovo_unsol_verbs[] = {</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc861vd_lenovo_mic_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x18);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861vd_lenovo_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x1b;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861vd_lenovo_init_hook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	alc861vd_lenovo_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861vd_lenovo_unsol_event(struct hda_codec *codec,</div><div class='del'>-					unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc861vd_lenovo_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		alc_automute_amp_unsol_event(codec, res);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc861vd_dallas_verbs[] = {</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc861vd_dallas_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define alc861vd_loopbacks	alc880_loopbacks</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc861vd_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc861vd_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc861vd_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc861vd_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {</div><div class='del'>-	[ALC660VD_3ST]		= "3stack-660",</div><div class='del'>-	[ALC660VD_3ST_DIG]	= "3stack-660-digout",</div><div class='del'>-	[ALC660VD_ASUS_V1S]	= "asus-v1s",</div><div class='del'>-	[ALC861VD_3ST]		= "3stack",</div><div class='del'>-	[ALC861VD_3ST_DIG]	= "3stack-digout",</div><div class='del'>-	[ALC861VD_6ST_DIG]	= "6stack-digout",</div><div class='del'>-	[ALC861VD_LENOVO]	= "lenovo",</div><div class='del'>-	[ALC861VD_DALLAS]	= "dallas",</div><div class='del'>-	[ALC861VD_HP]		= "hp",</div><div class='del'>-	[ALC861VD_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc861vd_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),</div><div class='del'>-	/*SND_PCI_QUIRK(0x1043, 0x1339, "Asus G1", ALC660VD_3ST),*/ /* auto */</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1633, "Asus V1Sn", ALC660VD_ASUS_V1S),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS", ALC660VD_3ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO),</div><div class='del'>-	/*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff01, "Toshiba A135", ALC861VD_LENOVO),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff31, "Toshiba L30-149", ALC861VD_DALLAS),</div><div class='del'>-	SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", ALC861VD_LENOVO),</div><div class='del'>-	SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc861vd_presets[] = {</div><div class='del'>-	[ALC660VD_3ST] = {</div><div class='del'>-		.mixers = { alc861vd_3st_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				 alc861vd_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),</div><div class='del'>-		.dac_nids = alc660vd_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC660VD_3ST_DIG] = {</div><div class='del'>-		.mixers = { alc861vd_3st_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				 alc861vd_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),</div><div class='del'>-		.dac_nids = alc660vd_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861VD_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_3ST] = {</div><div class='del'>-		.mixers = { alc861vd_3st_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				 alc861vd_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),</div><div class='del'>-		.dac_nids = alc861vd_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_3ST_DIG] = {</div><div class='del'>-		.mixers = { alc861vd_3st_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-		 		 alc861vd_3stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),</div><div class='del'>-		.dac_nids = alc861vd_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861VD_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_6ST_DIG] = {</div><div class='del'>-		.mixers = { alc861vd_6st_mixer, alc861vd_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				alc861vd_6stack_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),</div><div class='del'>-		.dac_nids = alc861vd_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861VD_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_6stack_modes),</div><div class='del'>-		.channel_mode = alc861vd_6stack_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_LENOVO] = {</div><div class='del'>-		.mixers = { alc861vd_lenovo_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				alc861vd_3stack_init_verbs,</div><div class='del'>-				alc861vd_eapd_verbs,</div><div class='del'>-				alc861vd_lenovo_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),</div><div class='del'>-		.dac_nids = alc660vd_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-		.unsol_event = alc861vd_lenovo_unsol_event,</div><div class='del'>-		.setup = alc861vd_lenovo_setup,</div><div class='del'>-		.init_hook = alc861vd_lenovo_init_hook,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_DALLAS] = {</div><div class='del'>-		.mixers = { alc861vd_dallas_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_dallas_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),</div><div class='del'>-		.dac_nids = alc861vd_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_dallas_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc861vd_dallas_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC861VD_HP] = {</div><div class='del'>-		.mixers = { alc861vd_hp_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_dallas_verbs, alc861vd_eapd_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc861vd_dac_nids),</div><div class='del'>-		.dac_nids = alc861vd_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861VD_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_hp_capture_source,</div><div class='del'>-		.unsol_event = alc_automute_amp_unsol_event,</div><div class='del'>-		.setup = alc861vd_dallas_setup,</div><div class='del'>-		.init_hook = alc_automute_amp,</div><div class='del'>-	},</div><div class='del'>-	[ALC660VD_ASUS_V1S] = {</div><div class='del'>-		.mixers = { alc861vd_lenovo_mixer },</div><div class='del'>-		.init_verbs = { alc861vd_volume_init_verbs,</div><div class='del'>-				alc861vd_3stack_init_verbs,</div><div class='del'>-				alc861vd_eapd_verbs,</div><div class='del'>-				alc861vd_lenovo_unsol_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc660vd_dac_nids),</div><div class='del'>-		.dac_nids = alc660vd_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC861VD_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),</div><div class='del'>-		.channel_mode = alc861vd_3stack_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc861vd_capture_source,</div><div class='del'>-		.unsol_event = alc861vd_lenovo_unsol_event,</div><div class='del'>-		.setup = alc861vd_lenovo_setup,</div><div class='del'>-		.init_hook = alc861vd_lenovo_init_hook,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc861vd_auto_create_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	return alc_auto_create_input_ctls(codec, cfg, 0x15, 0x09, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alc861vd_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-				hda_nid_t nid, int pin_type, int dac_idx)</div><div class='del'>-{</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc861vd_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= HDA_SIDE; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		if (nid)</div><div class='del'>-			alc861vd_auto_set_output_and_unmute(codec, nid,</div><div class='del'>-							    pin_type, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alc861vd_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	pin = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (pin) /* connect to front and use dac 0 */</div><div class='del'>-		alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);</div><div class='del'>-	pin = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (pin)</div><div class='del'>-		alc861vd_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC861VD_PIN_CD_NID		ALC880_PIN_CD_NID</div><div class='del'>-</div><div class='del'>-static void alc861vd_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (alc_is_input_pin(codec, nid)) {</div><div class='del'>-			alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-			if (nid != ALC861VD_PIN_CD_NID &amp;&amp;</div><div class='del'>-			    (get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						AMP_OUT_MUTE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc861vd_auto_init_input_src	alc882_auto_init_input_src</div><div class='del'>-</div><div class='del'>-#define alc861vd_idx_to_mixer_vol(nid)		((nid) + 0x02)</div><div class='del'>-#define alc861vd_idx_to_mixer_switch(nid)	((nid) + 0x0c)</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-/* Based on ALC880 version. But ALC861VD has separate,</div><div class='del'>- * different NIDs for mute/unmute switch and volume control */</div><div class='del'>-static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static const char *chname[4] = {"Front", "Surround", "CLFE", "Side"};</div><div class='del'>-	hda_nid_t nid_v, nid_s;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		if (!spec-&gt;multiout.dac_nids[i])</div><div class='del'>-			continue;</div><div class='del'>-		nid_v = alc861vd_idx_to_mixer_vol(</div><div class='del'>-				alc880_dac_to_idx(</div><div class='del'>-					spec-&gt;multiout.dac_nids[i]));</div><div class='del'>-		nid_s = alc861vd_idx_to_mixer_switch(</div><div class='del'>-				alc880_dac_to_idx(</div><div class='del'>-					spec-&gt;multiout.dac_nids[i]));</div><div class='del'>-</div><div class='del'>-		if (i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_v, 1, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_v, 2, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,</div><div class='del'>-					     "Center",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_s, 1, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,</div><div class='del'>-					     "LFE",</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_s, 2, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			const char *pfx;</div><div class='del'>-			if (cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='del'>-			    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='del'>-				if (!cfg-&gt;hp_pins)</div><div class='del'>-					pfx = "Speaker";</div><div class='del'>-				else</div><div class='del'>-					pfx = "PCM";</div><div class='del'>-			} else</div><div class='del'>-				pfx = chname[i];</div><div class='del'>-			err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_v, 3, 0,</div><div class='del'>-							      HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			if (cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='del'>-			    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-				pfx = "Speaker";</div><div class='del'>-			err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,</div><div class='del'>-					  HDA_COMPOSE_AMP_VAL(nid_s, 3, 2,</div><div class='del'>-							      HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for speaker and HP outputs */</div><div class='del'>-/* Based on ALC880 version. But ALC861VD has separate,</div><div class='del'>- * different NIDs for mute/unmute switch and volume control */</div><div class='del'>-static int alc861vd_auto_create_extra_out(struct alc_spec *spec,</div><div class='del'>-					hda_nid_t pin, const char *pfx)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid_v, nid_s;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (alc880_is_fixed_pin(pin)) {</div><div class='del'>-		nid_v = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));</div><div class='del'>-		/* specify the DAC as the extra output */</div><div class='del'>-		if (!spec-&gt;multiout.hp_nid)</div><div class='del'>-			spec-&gt;multiout.hp_nid = nid_v;</div><div class='del'>-		else</div><div class='del'>-			spec-&gt;multiout.extra_out_nid[0] = nid_v;</div><div class='del'>-		/* control HP volume/switch on the output mixer amp */</div><div class='del'>-		nid_v = alc861vd_idx_to_mixer_vol(</div><div class='del'>-				alc880_fixed_pin_idx(pin));</div><div class='del'>-		nid_s = alc861vd_idx_to_mixer_switch(</div><div class='del'>-				alc880_fixed_pin_idx(pin));</div><div class='del'>-</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid_v, 3, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(nid_s, 3, 2, HDA_INPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	} else if (alc880_is_multi_pin(pin)) {</div><div class='del'>-		/* set manual connection */</div><div class='del'>-		/* we have only a switch on HP-out PIN */</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse the BIOS configuration and set up the alc_spec</div><div class='del'>- * return 1 if successful, 0 if the proper config is not found,</div><div class='del'>- * or a negative error code</div><div class='del'>- * Based on ALC880 version - had to change it to override</div><div class='del'>- * alc880_auto_create_extra_out and alc880_auto_create_multi_out_ctls */</div><div class='del'>-static int alc861vd_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc861vd_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc861vd_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = alc880_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861vd_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861vd_auto_create_extra_out(spec,</div><div class='del'>-					     spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-					     "Speaker");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861vd_auto_create_extra_out(spec,</div><div class='del'>-					     spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-					     "Headphone");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc861vd_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc861vd_volume_init_verbs);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc861vd_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc861vd_auto_init_multi_out(codec);</div><div class='del'>-	alc861vd_auto_init_hp_out(codec);</div><div class='del'>-	alc861vd_auto_init_analog_input(codec);</div><div class='del'>-	alc861vd_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ALC660VD_FIX_ASUS_GPIO1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* reset GPIO1 */</div><div class='del'>-static const struct alc_fixup alc861vd_fixups[] = {</div><div class='del'>-	[ALC660VD_FIX_ASUS_GPIO1] = {</div><div class='del'>-		.verbs = (const struct hda_verb[]) {</div><div class='del'>-			{0x01, AC_VERB_SET_GPIO_MASK, 0x03},</div><div class='del'>-			{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},</div><div class='del'>-			{0x01, AC_VERB_SET_GPIO_DATA, 0x01},</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc861vd_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1339, "ASUS A7-K", ALC660VD_FIX_ASUS_GPIO1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc861vd(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC861VD_MODEL_LAST,</div><div class='del'>-						  alc861vd_models,</div><div class='del'>-						  alc861vd_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC861VD_MODEL_LAST) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC861VD_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861VD_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 1);</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861VD_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc861vd_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC861VD_3ST;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_hda_attach_beep_device(codec, 0x23);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		alc_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC861VD_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc861vd_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0660) {</div><div class='del'>-		/* always turn on EAPD */</div><div class='del'>-		add_verb(spec, alc660vd_eapd_verbs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc861vd_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc861vd_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc861vd_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc861vd_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids) {</div><div class='del'>-		spec-&gt;adc_nids = alc861vd_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;capsrc_nids)</div><div class='del'>-		spec-&gt;capsrc_nids = alc861vd_capsrc_nids;</div><div class='del'>-</div><div class='del'>-	set_capture_mixer(codec);</div><div class='del'>-	set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x02;</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861VD_AUTO)</div><div class='del'>-		alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 0);</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC861VD_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc861vd_auto_init;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc861vd_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC662 support</div><div class='del'>- *</div><div class='del'>- * ALC662 is almost identical with ALC880 but has cleaner and more flexible</div><div class='del'>- * configuration.  Each pin widget can choose any input DACs and a mixer.</div><div class='del'>- * Each ADC is connected from a mixer of all inputs.  This makes possible</div><div class='del'>- * 6-channel independent captures.</div><div class='del'>- *</div><div class='del'>- * In addition, an independent DAC for the multi-playback (not used in this</div><div class='del'>- * driver yet).</div><div class='del'>- */</div><div class='del'>-#define ALC662_DIGOUT_NID	0x06</div><div class='del'>-#define ALC662_DIGIN_NID	0x0a</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc662_dac_nids[4] = {</div><div class='del'>-	/* front, rear, clfe, rear_surr */</div><div class='del'>-	0x02, 0x03, 0x04</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc272_dac_nids[2] = {</div><div class='del'>-	0x02, 0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc662_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x09, 0x08</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc272_adc_nids[1] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x08,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc662_capsrc_nids[2] = { 0x22, 0x23 };</div><div class='del'>-static hda_nid_t alc272_capsrc_nids[1] = { 0x23 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* input MUX */</div><div class='del'>-/* FIXME: should be a matrix-type input source selection */</div><div class='del'>-static struct hda_input_mux alc662_capture_source = {</div><div class='del'>-	.num_items = 4,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-		{ "CD", 0x4 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc662_lenovo_101e_capture_source = {</div><div class='del'>-	.num_items = 2,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_input_mux alc663_capture_source = {</div><div class='del'>-	.num_items = 3,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Mic", 0x0 },</div><div class='del'>-		{ "Front Mic", 0x1 },</div><div class='del'>-		{ "Line", 0x2 },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0 /* set to 1 for testing other input sources below */</div><div class='del'>-static struct hda_input_mux alc272_nc10_capture_source = {</div><div class='del'>-	.num_items = 16,</div><div class='del'>-	.items = {</div><div class='del'>-		{ "Autoselect Mic", 0x0 },</div><div class='del'>-		{ "Internal Mic", 0x1 },</div><div class='del'>-		{ "In-0x02", 0x2 },</div><div class='del'>-		{ "In-0x03", 0x3 },</div><div class='del'>-		{ "In-0x04", 0x4 },</div><div class='del'>-		{ "In-0x05", 0x5 },</div><div class='del'>-		{ "In-0x06", 0x6 },</div><div class='del'>-		{ "In-0x07", 0x7 },</div><div class='del'>-		{ "In-0x08", 0x8 },</div><div class='del'>-		{ "In-0x09", 0x9 },</div><div class='del'>-		{ "In-0x0a", 0x0a },</div><div class='del'>-		{ "In-0x0b", 0x0b },</div><div class='del'>-		{ "In-0x0c", 0x0c },</div><div class='del'>-		{ "In-0x0d", 0x0d },</div><div class='del'>-		{ "In-0x0e", 0x0e },</div><div class='del'>-		{ "In-0x0f", 0x0f },</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_channel_mode alc662_3ST_2ch_modes[1] = {</div><div class='del'>-	{ 2, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc662_3ST_ch2_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc662_3ST_ch6_init[] = {</div><div class='del'>-	{ 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },</div><div class='del'>-	{ 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc662_3ST_6ch_modes[2] = {</div><div class='del'>-	{ 2, alc662_3ST_ch2_init },</div><div class='del'>-	{ 6, alc662_3ST_ch6_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 2ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc662_sixstack_ch6_init[] = {</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 6ch mode</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc662_sixstack_ch8_init[] = {</div><div class='del'>-	{ 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_channel_mode alc662_5stack_modes[2] = {</div><div class='del'>-	{ 2, alc662_sixstack_ch6_init },</div><div class='del'>-	{ 6, alc662_sixstack_ch8_init },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17</div><div class='del'>- *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_base_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x3, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	/*Input mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0xb, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0xb, 0x4, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0xb, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0xb, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0xb, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0xb, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0xb, 0x01, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0xb, 0x01, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Surround Playback Switch", 0x0d, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x0e, 1, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Front Playback Switch", 0x02, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("Speaker Playback Switch", 0x03, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("e-Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x04, 1, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x04, 2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_BIND_MUTE("MuteCtrl Playback Switch", 0x0c, 2, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_one_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_m51va_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_one_bind_switch),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_tree_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_two_hp_m1_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_tree_bind_switch),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("F-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("F-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_four_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_two_hp_m2_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_four_bind_switch),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("F-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("F-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_1bjd_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("F-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("F-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_two_bind_master_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x04, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_two_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_asus_21jd_clfe_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume",</div><div class='del'>-				&amp;alc663_asus_two_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_two_bind_switch),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_asus_15jd_clfe_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Master Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_two_bind_switch),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_g71v_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_g50v_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_mode7_mixer[] = {</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_mode7_8_all_bind_switch),</div><div class='del'>-	HDA_BIND_VOL("Speaker Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Speaker Playback Switch", &amp;alc663_asus_mode7_8_sp_bind_switch),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x1b, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone2 Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("IntMic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("IntMic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc663_mode8_mixer[] = {</div><div class='del'>-	HDA_BIND_SW("Master Playback Switch", &amp;alc663_asus_mode7_8_all_bind_switch),</div><div class='del'>-	HDA_BIND_VOL("Speaker Playback Volume", &amp;alc663_asus_bind_master_vol),</div><div class='del'>-	HDA_BIND_SW("Speaker Playback Switch", &amp;alc663_asus_mode7_8_sp_bind_switch),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x15, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone2 Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_chmode_mixer[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Channel Mode",</div><div class='del'>-		.info = alc_ch_mode_info,</div><div class='del'>-		.get = alc_ch_mode_get,</div><div class='del'>-		.put = alc_ch_mode_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc662_init_verbs[] = {</div><div class='del'>-	/* ADC: mute amp left and right */</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x09, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* Front Pin: output 0 (0x0c) */</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Rear Pin: output 1 (0x0d) */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* CLFE Pin: output 2 (0x0e) */</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	/* Mic (rear) pin: input vref at 80% */</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Front Mic pin: input vref at 80% */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line In pin: input */</div><div class='del'>-	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	/* Line-2 In: Headphone output (output 0 - 0x0c) */</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* CD pin widget for input */</div><div class='del'>-	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	/* FIXME: use matrix-type input source selection */</div><div class='del'>-	/* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */</div><div class='del'>-	/* Input mixer */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* always trun on EAPD */</div><div class='del'>-	{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-	{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_init_verbs[] = {</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc272_init_verbs[] = {</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc662_sue_init_verbs[] = {</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc662_eeepc_sue_init_verbs[] = {</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Set Unsolicited Event*/</div><div class='del'>-static struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_m51va_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_21jd_amic_init_verbs[] = {</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc662_1bjd_amic_init_verbs[] = {</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_15jd_amic_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_two_hp_amic_m1_init_verbs[] = {</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x0},	/* Headphone */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x0},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_two_hp_amic_m2_init_verbs[] = {</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_g71v_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	/* {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */</div><div class='del'>-	/* {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, */ /* Headphone */</div><div class='del'>-</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */</div><div class='del'>-</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_g50v_init_verbs[] = {</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x00},	/* Headphone */</div><div class='del'>-</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc662_ecs_init_verbs[] = {</div><div class='del'>-	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc272_dell_zm1_init_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc272_dell_init_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_mode7_init_verbs[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb alc663_mode8_init_verbs[] = {</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},	/* Headphone */</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},</div><div class='del'>-	{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_auto_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc272_auto_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x14);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_lenovo_101e_all_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>- 	present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_lenovo_101e_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc662_lenovo_101e_all_automute(codec);</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_FRONT_EVENT)</div><div class='del'>-		alc662_lenovo_101e_ispeaker_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unsolicited event for HP jack sensing */</div><div class='del'>-static void alc662_eeepc_unsol_event(struct hda_codec *codec,</div><div class='del'>-				     unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_MIC_EVENT)</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-	else</div><div class='del'>-		alc262_hippo_unsol_event(codec, res);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_eeepc_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	alc262_hippo1_setup(codec);</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_eeepc_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc262_hippo_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_eeepc_ep20_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x1b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc662_eeepc_ep20_inithook	alc262_hippo_master_update</div><div class='del'>-</div><div class='del'>-static void alc663_m51va_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x21);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_21jd_two_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x21);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_15jd_two_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_f5z_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	bits = present ? 0 : PIN_OUT;</div><div class='del'>-	snd_hda_codec_write(codec, 0x14, 0,</div><div class='del'>-			 AC_VERB_SET_PIN_WIDGET_CONTROL, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_two_hp_m1_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present1, present2;</div><div class='del'>-</div><div class='del'>-	present1 = snd_hda_jack_detect(codec, 0x21);</div><div class='del'>-	present2 = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-</div><div class='del'>-	if (present1 || present2) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_two_hp_m2_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present1, present2;</div><div class='del'>-</div><div class='del'>-	present1 = snd_hda_jack_detect(codec, 0x1b);</div><div class='del'>-	present2 = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-</div><div class='del'>-	if (present1 || present2) {</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-					 HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, 0);</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,</div><div class='del'>-					 HDA_AMP_MUTE, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_two_hp_m7_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present1, present2;</div><div class='del'>-</div><div class='del'>-	present1 = snd_hda_codec_read(codec, 0x1b, 0,</div><div class='del'>-			AC_VERB_GET_PIN_SENSE, 0)</div><div class='del'>-			&amp; AC_PINSENSE_PRESENCE;</div><div class='del'>-	present2 = snd_hda_codec_read(codec, 0x21, 0,</div><div class='del'>-			AC_VERB_GET_PIN_SENSE, 0)</div><div class='del'>-			&amp; AC_PINSENSE_PRESENCE;</div><div class='del'>-</div><div class='del'>-	if (present1 || present2) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x17, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x17, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_two_hp_m8_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present1, present2;</div><div class='del'>-</div><div class='del'>-	present1 = snd_hda_codec_read(codec, 0x21, 0,</div><div class='del'>-			AC_VERB_GET_PIN_SENSE, 0)</div><div class='del'>-			&amp; AC_PINSENSE_PRESENCE;</div><div class='del'>-	present2 = snd_hda_codec_read(codec, 0x15, 0,</div><div class='del'>-			AC_VERB_GET_PIN_SENSE, 0)</div><div class='del'>-			&amp; AC_PINSENSE_PRESENCE;</div><div class='del'>-</div><div class='del'>-	if (present1 || present2) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x17, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x14, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0x17, 0,</div><div class='del'>-			AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_m51va_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_m51va_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_m51va_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x12;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 9;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_m51va_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_m51va_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ***************** Mode1 ******************************/</div><div class='del'>-#define alc663_mode1_unsol_event	alc663_m51va_unsol_event</div><div class='del'>-</div><div class='del'>-static void alc663_mode1_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	spec-&gt;ext_mic.pin = 0x18;</div><div class='del'>-	spec-&gt;ext_mic.mux_idx = 0;</div><div class='del'>-	spec-&gt;int_mic.pin = 0x19;</div><div class='del'>-	spec-&gt;int_mic.mux_idx = 1;</div><div class='del'>-	spec-&gt;auto_mic = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode1_inithook		alc663_m51va_inithook</div><div class='del'>-</div><div class='del'>-/* ***************** Mode2 ******************************/</div><div class='del'>-static void alc662_mode2_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc662_f5z_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc662_mode2_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc662_mode2_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc662_f5z_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-/* ***************** Mode3 ******************************/</div><div class='del'>-static void alc663_mode3_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_two_hp_m1_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode3_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode3_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_two_hp_m1_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-/* ***************** Mode4 ******************************/</div><div class='del'>-static void alc663_mode4_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_21jd_two_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode4_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode4_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_21jd_two_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-/* ***************** Mode5 ******************************/</div><div class='del'>-static void alc663_mode5_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_15jd_two_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode5_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode5_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_15jd_two_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-/* ***************** Mode6 ******************************/</div><div class='del'>-static void alc663_mode6_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_two_hp_m2_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode6_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode6_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_two_hp_m2_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ***************** Mode7 ******************************/</div><div class='del'>-static void alc663_mode7_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_two_hp_m7_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode7_setup	alc663_mode1_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode7_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_two_hp_m7_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ***************** Mode8 ******************************/</div><div class='del'>-static void alc663_mode8_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_two_hp_m8_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_mode8_setup	alc663_m51va_setup</div><div class='del'>-</div><div class='del'>-static void alc663_mode8_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_two_hp_m8_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_g71v_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x21);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_g71v_front_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present;</div><div class='del'>-	unsigned char bits;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, 0x15);</div><div class='del'>-	bits = present ? HDA_AMP_MUTE : 0;</div><div class='del'>-	snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,</div><div class='del'>-				 HDA_AMP_MUTE, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_g71v_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_g71v_hp_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_FRONT_EVENT:</div><div class='del'>-		alc663_g71v_front_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_g71v_setup	alc663_m51va_setup</div><div class='del'>-</div><div class='del'>-static void alc663_g71v_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_g71v_front_automute(codec);</div><div class='del'>-	alc663_g71v_hp_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc663_g50v_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	switch (res &gt;&gt; 26) {</div><div class='del'>-	case ALC880_HP_EVENT:</div><div class='del'>-		alc663_m51va_speaker_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	case ALC880_MIC_EVENT:</div><div class='del'>-		alc_mic_automute(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc663_g50v_setup	alc663_m51va_setup</div><div class='del'>-</div><div class='del'>-static void alc663_g50v_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc663_m51va_speaker_automute(codec);</div><div class='del'>-	alc_mic_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc662_ecs_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	ALC262_HIPPO_MASTER_SWITCH,</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("e-Mic/LineIn Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("e-Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("e-Mic/LineIn Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc272_nc10_mixer[] = {</div><div class='del'>-	/* Master Playback automatically created from Speaker and Headphone */</div><div class='del'>-	HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-#define alc662_loopbacks	alc880_loopbacks</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc662_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc662_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc662_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc662_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc662_models[ALC662_MODEL_LAST] = {</div><div class='del'>-	[ALC662_3ST_2ch_DIG]	= "3stack-dig",</div><div class='del'>-	[ALC662_3ST_6ch_DIG]	= "3stack-6ch-dig",</div><div class='del'>-	[ALC662_3ST_6ch]	= "3stack-6ch",</div><div class='del'>-	[ALC662_5ST_DIG]	= "6stack-dig",</div><div class='del'>-	[ALC662_LENOVO_101E]	= "lenovo-101e",</div><div class='del'>-	[ALC662_ASUS_EEEPC_P701] = "eeepc-p701",</div><div class='del'>-	[ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20",</div><div class='del'>-	[ALC662_ECS] = "ecs",</div><div class='del'>-	[ALC663_ASUS_M51VA] = "m51va",</div><div class='del'>-	[ALC663_ASUS_G71V] = "g71v",</div><div class='del'>-	[ALC663_ASUS_H13] = "h13",</div><div class='del'>-	[ALC663_ASUS_G50V] = "g50v",</div><div class='del'>-	[ALC663_ASUS_MODE1] = "asus-mode1",</div><div class='del'>-	[ALC662_ASUS_MODE2] = "asus-mode2",</div><div class='del'>-	[ALC663_ASUS_MODE3] = "asus-mode3",</div><div class='del'>-	[ALC663_ASUS_MODE4] = "asus-mode4",</div><div class='del'>-	[ALC663_ASUS_MODE5] = "asus-mode5",</div><div class='del'>-	[ALC663_ASUS_MODE6] = "asus-mode6",</div><div class='del'>-	[ALC663_ASUS_MODE7] = "asus-mode7",</div><div class='del'>-	[ALC663_ASUS_MODE8] = "asus-mode8",</div><div class='del'>-	[ALC272_DELL]		= "dell",</div><div class='del'>-	[ALC272_DELL_ZM1]	= "dell-zm1",</div><div class='del'>-	[ALC272_SAMSUNG_NC10]	= "samsung-nc10",</div><div class='del'>-	[ALC662_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc662_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x02d6, "DELL", ALC272_DELL),</div><div class='del'>-	SND_PCI_QUIRK(0x1028, 0x02f4, "DELL ZM1", ALC272_DELL_ZM1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1173, "ASUS K73Jn", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11d3, "ASUS NB", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x11f3, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1203, "ASUS NB", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1303, "ASUS G60J", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1333, "ASUS G60Jx", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x13e3, "ASUS N71JA", ALC663_ASUS_MODE7),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1463, "ASUS N71", ALC663_ASUS_MODE7),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G72", ALC663_ASUS_MODE8),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1563, "ASUS N90", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x15d3, "ASUS N50SF F50SF", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS K40C K50C", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1733, "ASUS N81De", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1753, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1793, "ASUS F50GX", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x17b3, "ASUS F70SL", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x17c3, "ASUS UX20", ALC663_ASUS_M51VA),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x17f3, "ASUS X58LE", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1813, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1823, "ASUS NB", ALC663_ASUS_MODE5),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1833, "ASUS NB", ALC663_ASUS_MODE6),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1843, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1853, "ASUS F50Z", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1864, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1876, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M51VA", ALC663_ASUS_M51VA),</div><div class='del'>-	/*SND_PCI_QUIRK(0x1043, 0x1878, "ASUS M50Vr", ALC663_ASUS_MODE1),*/</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1893, "ASUS M50Vm", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1894, "ASUS X55", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x18b3, "ASUS N80Vc", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x18c3, "ASUS VX5", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS N81Te", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x18f3, "ASUS N505Tp", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1903, "ASUS F5GL", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1913, "ASUS NB", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1933, "ASUS F80Q", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1943, "ASUS Vx3V", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1953, "ASUS NB", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71C", ALC663_ASUS_MODE3),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1983, "ASUS N5051A", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x1993, "ASUS N20", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS G50V", ALC663_ASUS_G50V),</div><div class='del'>-	/*SND_PCI_QUIRK(0x1043, 0x19a3, "ASUS NB", ALC663_ASUS_MODE1),*/</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS F7Z", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19c3, "ASUS F5Z/F6x", ALC662_ASUS_MODE2),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19d3, "ASUS NB", ALC663_ASUS_M51VA),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19e3, "ASUS NB", ALC663_ASUS_MODE1),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x19f3, "ASUS NB", ALC663_ASUS_MODE4),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x8290, "ASUS P5GC-MX", ALC662_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x82d1, "ASUS Eeepc EP20", ALC662_ASUS_EEEPC_EP20),</div><div class='del'>-	SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS),</div><div class='del'>-	SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K",</div><div class='del'>-		      ALC662_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB20x", ALC662_AUTO),</div><div class='del'>-	SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10),</div><div class='del'>-	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L",</div><div class='del'>-		      ALC662_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x152d, 0x2304, "Quanta WH1", ALC663_ASUS_H13),</div><div class='del'>-	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK(0x1631, 0xc10c, "PB RS65", ALC663_ASUS_M51VA),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),</div><div class='del'>-	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",</div><div class='del'>-					ALC662_3ST_6ch_DIG),</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",</div><div class='del'>-			   ALC663_ASUS_H13),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc662_presets[] = {</div><div class='del'>-	[ALC662_3ST_2ch_DIG] = {</div><div class='del'>-		.mixers = { alc662_3ST_2ch_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC662_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc662_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_3ST_6ch_DIG] = {</div><div class='del'>-		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC662_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc662_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_3ST_6ch] = {</div><div class='del'>-		.mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_6ch_modes,</div><div class='del'>-		.need_dac_fix = 1,</div><div class='del'>-		.input_mux = &amp;alc662_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_5ST_DIG] = {</div><div class='del'>-		.mixers = { alc662_base_mixer, alc662_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.dig_in_nid = ALC662_DIGIN_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_5stack_modes),</div><div class='del'>-		.channel_mode = alc662_5stack_modes,</div><div class='del'>-		.input_mux = &amp;alc662_capture_source,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_LENOVO_101E] = {</div><div class='del'>-		.mixers = { alc662_lenovo_101e_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc662_sue_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.input_mux = &amp;alc662_lenovo_101e_capture_source,</div><div class='del'>-		.unsol_event = alc662_lenovo_101e_unsol_event,</div><div class='del'>-		.init_hook = alc662_lenovo_101e_all_automute,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_ASUS_EEEPC_P701] = {</div><div class='del'>-		.mixers = { alc662_eeepc_p701_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc662_eeepc_sue_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc662_eeepc_unsol_event,</div><div class='del'>-		.setup = alc662_eeepc_setup,</div><div class='del'>-		.init_hook = alc662_eeepc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_ASUS_EEEPC_EP20] = {</div><div class='del'>-		.mixers = { alc662_eeepc_ep20_mixer,</div><div class='del'>-			    alc662_chmode_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc662_eeepc_ep20_sue_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_6ch_modes,</div><div class='del'>-		.input_mux = &amp;alc662_lenovo_101e_capture_source,</div><div class='del'>-		.unsol_event = alc662_eeepc_unsol_event,</div><div class='del'>-		.setup = alc662_eeepc_ep20_setup,</div><div class='del'>-		.init_hook = alc662_eeepc_ep20_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_ECS] = {</div><div class='del'>-		.mixers = { alc662_ecs_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc662_ecs_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc662_eeepc_unsol_event,</div><div class='del'>-		.setup = alc662_eeepc_setup,</div><div class='del'>-		.init_hook = alc662_eeepc_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_M51VA] = {</div><div class='del'>-		.mixers = { alc663_m51va_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_m51va_unsol_event,</div><div class='del'>-		.setup = alc663_m51va_setup,</div><div class='del'>-		.init_hook = alc663_m51va_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_G71V] = {</div><div class='del'>-		.mixers = { alc663_g71v_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc663_g71v_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_g71v_unsol_event,</div><div class='del'>-		.setup = alc663_g71v_setup,</div><div class='del'>-		.init_hook = alc663_g71v_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_H13] = {</div><div class='del'>-		.mixers = { alc663_m51va_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_m51va_unsol_event,</div><div class='del'>-		.init_hook = alc663_m51va_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_G50V] = {</div><div class='del'>-		.mixers = { alc663_g50v_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc663_g50v_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_6ch_modes,</div><div class='del'>-		.input_mux = &amp;alc663_capture_source,</div><div class='del'>-		.unsol_event = alc663_g50v_unsol_event,</div><div class='del'>-		.setup = alc663_g50v_setup,</div><div class='del'>-		.init_hook = alc663_g50v_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE1] = {</div><div class='del'>-		.mixers = { alc663_m51va_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_21jd_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode1_unsol_event,</div><div class='del'>-		.setup = alc663_mode1_setup,</div><div class='del'>-		.init_hook = alc663_mode1_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC662_ASUS_MODE2] = {</div><div class='del'>-		.mixers = { alc662_1bjd_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc662_1bjd_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc662_mode2_unsol_event,</div><div class='del'>-		.setup = alc662_mode2_setup,</div><div class='del'>-		.init_hook = alc662_mode2_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE3] = {</div><div class='del'>-		.mixers = { alc663_two_hp_m1_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_two_hp_amic_m1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode3_unsol_event,</div><div class='del'>-		.setup = alc663_mode3_setup,</div><div class='del'>-		.init_hook = alc663_mode3_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE4] = {</div><div class='del'>-		.mixers = { alc663_asus_21jd_clfe_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_21jd_amic_init_verbs},</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode4_unsol_event,</div><div class='del'>-		.setup = alc663_mode4_setup,</div><div class='del'>-		.init_hook = alc663_mode4_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE5] = {</div><div class='del'>-		.mixers = { alc663_asus_15jd_clfe_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_15jd_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode5_unsol_event,</div><div class='del'>-		.setup = alc663_mode5_setup,</div><div class='del'>-		.init_hook = alc663_mode5_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE6] = {</div><div class='del'>-		.mixers = { alc663_two_hp_m2_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_two_hp_amic_m2_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode6_unsol_event,</div><div class='del'>-		.setup = alc663_mode6_setup,</div><div class='del'>-		.init_hook = alc663_mode6_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE7] = {</div><div class='del'>-		.mixers = { alc663_mode7_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_mode7_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode7_unsol_event,</div><div class='del'>-		.setup = alc663_mode7_setup,</div><div class='del'>-		.init_hook = alc663_mode7_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC663_ASUS_MODE8] = {</div><div class='del'>-		.mixers = { alc663_mode8_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_mode8_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc662_dac_nids),</div><div class='del'>-		.hp_nid = 0x03,</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC662_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_mode8_unsol_event,</div><div class='del'>-		.setup = alc663_mode8_setup,</div><div class='del'>-		.init_hook = alc663_mode8_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC272_DELL] = {</div><div class='del'>-		.mixers = { alc663_m51va_mixer },</div><div class='del'>-		.cap_mixer = alc272_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc272_dell_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc272_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.adc_nids = alc272_adc_nids,</div><div class='del'>-		.num_adc_nids = ARRAY_SIZE(alc272_adc_nids),</div><div class='del'>-		.capsrc_nids = alc272_capsrc_nids,</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_m51va_unsol_event,</div><div class='del'>-		.setup = alc663_m51va_setup,</div><div class='del'>-		.init_hook = alc663_m51va_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC272_DELL_ZM1] = {</div><div class='del'>-		.mixers = { alc663_m51va_mixer },</div><div class='del'>-		.cap_mixer = alc662_auto_capture_mixer,</div><div class='del'>-		.init_verbs = { alc662_init_verbs, alc272_dell_zm1_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc272_dac_nids),</div><div class='del'>-		.dac_nids = alc662_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.adc_nids = alc662_adc_nids,</div><div class='del'>-		.num_adc_nids = 1,</div><div class='del'>-		.capsrc_nids = alc662_capsrc_nids,</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		.unsol_event = alc663_m51va_unsol_event,</div><div class='del'>-		.setup = alc663_m51va_setup,</div><div class='del'>-		.init_hook = alc663_m51va_inithook,</div><div class='del'>-	},</div><div class='del'>-	[ALC272_SAMSUNG_NC10] = {</div><div class='del'>-		.mixers = { alc272_nc10_mixer },</div><div class='del'>-		.init_verbs = { alc662_init_verbs,</div><div class='del'>-				alc663_21jd_amic_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc272_dac_nids),</div><div class='del'>-		.dac_nids = alc272_dac_nids,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),</div><div class='del'>-		.channel_mode = alc662_3ST_2ch_modes,</div><div class='del'>-		/*.input_mux = &amp;alc272_nc10_capture_source,*/</div><div class='del'>-		.unsol_event = alc663_mode4_unsol_event,</div><div class='del'>-		.setup = alc663_mode4_setup,</div><div class='del'>-		.init_hook = alc663_mode4_inithook,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* convert from MIX nid to DAC */</div><div class='del'>-static inline hda_nid_t alc662_mix_to_dac(hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (nid == 0x0f)</div><div class='del'>-		return 0x02;</div><div class='del'>-	else if (nid &gt;= 0x0c &amp;&amp; nid &lt;= 0x0e)</div><div class='del'>-		return nid - 0x0c + 0x02;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get MIX nid connected to the given pin targeted to DAC */</div><div class='del'>-static hda_nid_t alc662_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-				   hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t mix[4];</div><div class='del'>-	int i, num;</div><div class='del'>-</div><div class='del'>-	num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		if (alc662_mix_to_dac(mix[i]) == dac)</div><div class='del'>-			return mix[i];</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* look for an empty DAC slot */</div><div class='del'>-static hda_nid_t alc662_look_for_dac(struct hda_codec *codec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t srcs[5];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs));</div><div class='del'>-	if (num &lt; 0)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		hda_nid_t nid = alc662_mix_to_dac(srcs[i]);</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		for (j = 0; j &lt; spec-&gt;multiout.num_dacs; j++)</div><div class='del'>-			if (spec-&gt;multiout.dac_nids[j] == nid)</div><div class='del'>-				break;</div><div class='del'>-		if (j &gt;= spec-&gt;multiout.num_dacs)</div><div class='del'>-			return nid;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int alc662_auto_fill_dac_nids(struct hda_codec *codec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		dac = alc662_look_for_dac(codec, cfg-&gt;line_out_pins[i]);</div><div class='del'>-		if (!dac)</div><div class='del'>-			continue;</div><div class='del'>-		spec-&gt;multiout.dac_nids[spec-&gt;multiout.num_dacs++] = dac;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int alc662_add_vol_ctl(struct alc_spec *spec, const char *pfx,</div><div class='del'>-			      hda_nid_t nid, unsigned int chs)</div><div class='del'>-{</div><div class='del'>-	return add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,</div><div class='del'>-			   HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int alc662_add_sw_ctl(struct alc_spec *spec, const char *pfx,</div><div class='del'>-			     hda_nid_t nid, unsigned int chs)</div><div class='del'>-{</div><div class='del'>-	return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,</div><div class='del'>-			   HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_INPUT));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc662_add_stereo_vol(spec, pfx, nid) \</div><div class='del'>-	alc662_add_vol_ctl(spec, pfx, nid, 3)</div><div class='del'>-#define alc662_add_stereo_sw(spec, pfx, nid) \</div><div class='del'>-	alc662_add_sw_ctl(spec, pfx, nid, 3)</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc662_auto_create_multi_out_ctls(struct hda_codec *codec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	static const char *chname[4] = {</div><div class='del'>-		"Front", "Surround", NULL /*CLFE*/, "Side"</div><div class='del'>-	};</div><div class='del'>-	hda_nid_t nid, mix;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		mix = alc662_dac_to_mix(codec, cfg-&gt;line_out_pins[i], nid);</div><div class='del'>-		if (!mix)</div><div class='del'>-			continue;</div><div class='del'>-		if (i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = alc662_add_vol_ctl(spec, "Center", nid, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = alc662_add_vol_ctl(spec, "LFE", nid, 2);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = alc662_add_sw_ctl(spec, "Center", mix, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = alc662_add_sw_ctl(spec, "LFE", mix, 2);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			const char *pfx;</div><div class='del'>-			if (cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='del'>-			    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT) {</div><div class='del'>-				if (cfg-&gt;hp_outs)</div><div class='del'>-					pfx = "Speaker";</div><div class='del'>-				else</div><div class='del'>-					pfx = "PCM";</div><div class='del'>-			} else</div><div class='del'>-				pfx = chname[i];</div><div class='del'>-			err = alc662_add_vol_ctl(spec, pfx, nid, 3);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			if (cfg-&gt;line_outs == 1 &amp;&amp;</div><div class='del'>-			    cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-				pfx = "Speaker";</div><div class='del'>-			err = alc662_add_sw_ctl(spec, pfx, mix, 3);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for speaker and HP outputs */</div><div class='del'>-/* return DAC nid if any new DAC is assigned */</div><div class='del'>-static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-					const char *pfx)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid, mix;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-	nid = alc662_look_for_dac(codec, pin);</div><div class='del'>-	if (!nid) {</div><div class='del'>-		/* the corresponding DAC is already occupied */</div><div class='del'>-		if (!(get_wcaps(codec, pin) &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-			return 0; /* no way */</div><div class='del'>-		/* create a switch only */</div><div class='del'>-		return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,</div><div class='del'>-				   HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mix = alc662_dac_to_mix(codec, pin, nid);</div><div class='del'>-	if (!mix)</div><div class='del'>-		return 0;</div><div class='del'>-	err = alc662_add_vol_ctl(spec, pfx, nid, 3);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc662_add_sw_ctl(spec, pfx, mix, 3);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return nid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-#define alc662_auto_create_input_ctls \</div><div class='del'>-	alc882_auto_create_input_ctls</div><div class='del'>-</div><div class='del'>-static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type,</div><div class='del'>-					      hda_nid_t dac)</div><div class='del'>-{</div><div class='del'>-	int i, num;</div><div class='del'>-	hda_nid_t srcs[HDA_MAX_CONNECTIONS];</div><div class='del'>-</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-	/* need the manual connection? */</div><div class='del'>-	num = snd_hda_get_connections(codec, nid, srcs, ARRAY_SIZE(srcs));</div><div class='del'>-	if (num &lt;= 1)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		if (alc662_mix_to_dac(srcs[i]) != dac)</div><div class='del'>-			continue;</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, i);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= HDA_SIDE; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		if (nid)</div><div class='del'>-			alc662_auto_set_output_and_unmute(codec, nid, pin_type,</div><div class='del'>-					spec-&gt;multiout.dac_nids[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc662_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	pin = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (pin)</div><div class='del'>-		alc662_auto_set_output_and_unmute(codec, pin, PIN_HP,</div><div class='del'>-						  spec-&gt;multiout.hp_nid);</div><div class='del'>-	pin = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (pin)</div><div class='del'>-		alc662_auto_set_output_and_unmute(codec, pin, PIN_OUT,</div><div class='del'>-					spec-&gt;multiout.extra_out_nid[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ALC662_PIN_CD_NID		ALC880_PIN_CD_NID</div><div class='del'>-</div><div class='del'>-static void alc662_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (alc_is_input_pin(codec, nid)) {</div><div class='del'>-			alc_set_input_pin(codec, nid, cfg-&gt;inputs[i].type);</div><div class='del'>-			if (nid != ALC662_PIN_CD_NID &amp;&amp;</div><div class='del'>-			    (get_wcaps(codec, nid) &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-				snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-						    AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-						    AMP_OUT_MUTE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc662_auto_init_input_src	alc882_auto_init_input_src</div><div class='del'>-</div><div class='del'>-static int alc662_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc662_ignore[] = { 0x1d, 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc662_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = alc662_auto_fill_dac_nids(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc662_auto_create_multi_out_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = alc662_auto_create_extra_out(codec,</div><div class='del'>-					   spec-&gt;autocfg.speaker_pins[0],</div><div class='del'>-					   "Speaker");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (err)</div><div class='del'>-		spec-&gt;multiout.extra_out_nid[0] = err;</div><div class='del'>-	err = alc662_auto_create_extra_out(codec, spec-&gt;autocfg.hp_pins[0],</div><div class='del'>-					   "Headphone");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (err)</div><div class='del'>-		spec-&gt;multiout.hp_nid = err;</div><div class='del'>-	err = alc662_auto_create_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_mux_defs = 1;</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc662_init_verbs);</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0272 || codec-&gt;vendor_id == 0x10ec0663 ||</div><div class='del'>-	    codec-&gt;vendor_id == 0x10ec0665 || codec-&gt;vendor_id == 0x10ec0670)</div><div class='del'>-		add_verb(spec, alc663_init_verbs);</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0272)</div><div class='del'>-		add_verb(spec, alc272_init_verbs);</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x10ec0272 || codec-&gt;vendor_id == 0x10ec0663 ||</div><div class='del'>-	    codec-&gt;vendor_id == 0x10ec0665 || codec-&gt;vendor_id == 0x10ec0670)</div><div class='del'>-	    alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0x21);</div><div class='del'>-	else</div><div class='del'>-	    alc_ssid_check(codec, 0x15, 0x1b, 0x14, 0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* additional initialization for auto-configuration model */</div><div class='del'>-static void alc662_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc662_auto_init_multi_out(codec);</div><div class='del'>-	alc662_auto_init_hp_out(codec);</div><div class='del'>-	alc662_auto_init_analog_input(codec);</div><div class='del'>-	alc662_auto_init_input_src(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ALC662_FIXUP_ASPIRE,</div><div class='del'>-	ALC662_FIXUP_IDEAPAD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct alc_fixup alc662_fixups[] = {</div><div class='del'>-	[ALC662_FIXUP_ASPIRE] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x15, 0x99130112 }, /* subwoofer */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-	[ALC662_FIXUP_IDEAPAD] = {</div><div class='del'>-		.pins = (const struct alc_pincfg[]) {</div><div class='del'>-			{ 0x17, 0x99130112 }, /* subwoofer */</div><div class='del'>-			{ }</div><div class='del'>-		}</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc662_fixup_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),</div><div class='del'>-	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int patch_alc662(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int err, board_config;</div><div class='del'>-	int coef;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (!spec)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	alc_auto_parse_customize_define(codec);</div><div class='del'>-</div><div class='del'>-	alc_fix_pll_init(codec, 0x20, 0x04, 15);</div><div class='del'>-</div><div class='del'>-	coef = alc_read_coef_idx(codec, 0);</div><div class='del'>-	if (coef == 0x8020 || coef == 0x8011)</div><div class='del'>-		alc_codec_rename(codec, "ALC661");</div><div class='del'>-	else if (coef &amp; (1 &lt;&lt; 14) &amp;&amp;</div><div class='del'>-		codec-&gt;bus-&gt;pci-&gt;subsystem_vendor == 0x1025 &amp;&amp;</div><div class='del'>-		spec-&gt;cdefine.platform_type == 1)</div><div class='del'>-		alc_codec_rename(codec, "ALC272X");</div><div class='del'>-	else if (coef == 0x4011)</div><div class='del'>-		alc_codec_rename(codec, "ALC656");</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,</div><div class='del'>-						  alc662_models,</div><div class='del'>-			  	                  alc662_cfg_tbl);</div><div class='del'>-	if (board_config &lt; 0) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC662_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC662_AUTO) {</div><div class='del'>-		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 1);</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc662_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC662_3ST_2ch_DIG;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_cdefine_beep(codec)) {</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, 0x1);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC662_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc662_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc662_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc662_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc662_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc662_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids) {</div><div class='del'>-		spec-&gt;adc_nids = alc662_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(alc662_adc_nids);</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;capsrc_nids)</div><div class='del'>-		spec-&gt;capsrc_nids = alc662_capsrc_nids;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;cap_mixer)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-</div><div class='del'>-	if (has_cdefine_beep(codec)) {</div><div class='del'>-		switch (codec-&gt;vendor_id) {</div><div class='del'>-		case 0x10ec0662:</div><div class='del'>-			set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);</div><div class='del'>-			break;</div><div class='del'>-		case 0x10ec0272:</div><div class='del'>-		case 0x10ec0663:</div><div class='del'>-		case 0x10ec0665:</div><div class='del'>-			set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);</div><div class='del'>-			break;</div><div class='del'>-		case 0x10ec0273:</div><div class='del'>-			set_beep_amp(spec, 0x0b, 0x03, HDA_INPUT);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;vmaster_nid = 0x02;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC662_AUTO) {</div><div class='del'>-		spec-&gt;init_hook = alc662_auto_init;</div><div class='del'>-		alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alc_init_jacks(codec);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (!spec-&gt;loopback.amplist)</div><div class='del'>-		spec-&gt;loopback.amplist = alc662_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_alc888(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if ((alc_read_coef_idx(codec, 0) &amp; 0x00f0)==0x0030){</div><div class='del'>-		kfree(codec-&gt;chip_name);</div><div class='del'>-		codec-&gt;chip_name = kstrdup("ALC888-VD", GFP_KERNEL);</div><div class='del'>-		if (!codec-&gt;chip_name) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		return patch_alc662(codec);</div><div class='del'>-	}</div><div class='del'>-	return patch_alc882(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ALC680 support</div><div class='del'>- */</div><div class='del'>-#define ALC680_DIGIN_NID	ALC880_DIGIN_NID</div><div class='del'>-#define ALC680_DIGOUT_NID	ALC880_DIGOUT_NID</div><div class='del'>-#define alc680_modes		alc260_modes</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc680_dac_nids[3] = {</div><div class='del'>-	/* Lout1, Lout2, hp */</div><div class='del'>-	0x02, 0x03, 0x04</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t alc680_adc_nids[3] = {</div><div class='del'>-	/* ADC0-2 */</div><div class='del'>-	/* DMIC, MIC, Line-in*/</div><div class='del'>-	0x07, 0x08, 0x09</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture ADC cgange</div><div class='del'>- */</div><div class='del'>-static void alc680_rec_autoswitch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int pin_found = 0;</div><div class='del'>-	int type_found = AUTO_PIN_LAST;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (!(snd_hda_query_pin_caps(codec, nid) &amp;</div><div class='del'>-		      AC_PINCAP_PRES_DETECT))</div><div class='del'>-			continue;</div><div class='del'>-		if (snd_hda_jack_detect(codec, nid)) {</div><div class='del'>-			if (cfg-&gt;inputs[i].type &lt; type_found) {</div><div class='del'>-				type_found = cfg-&gt;inputs[i].type;</div><div class='del'>-				pin_found = nid;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = 0x07;</div><div class='del'>-	if (pin_found)</div><div class='del'>-		snd_hda_get_connections(codec, pin_found, &amp;nid, 1);</div><div class='del'>-</div><div class='del'>-	if (nid != spec-&gt;cur_adc)</div><div class='del'>-		__snd_hda_codec_cleanup_stream(codec, spec-&gt;cur_adc, 1);</div><div class='del'>-	spec-&gt;cur_adc = nid;</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nid, spec-&gt;cur_adc_stream_tag, 0,</div><div class='del'>-				   spec-&gt;cur_adc_format);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc680_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;cur_adc = 0x07;</div><div class='del'>-	spec-&gt;cur_adc_stream_tag = stream_tag;</div><div class='del'>-	spec-&gt;cur_adc_format = format;</div><div class='del'>-</div><div class='del'>-	alc680_rec_autoswitch(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int alc680_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, 0x07);</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, 0x08);</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, 0x09);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream alc680_pcm_analog_auto_capture = {</div><div class='del'>-	.substreams = 1, /* can be overridden */</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in alc_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = alc680_capture_pcm_prepare,</div><div class='del'>-		.cleanup = alc680_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc680_base_mixer[] = {</div><div class='del'>-	/* output mixer control */</div><div class='del'>-	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x4, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Headphone Playback Switch", 0x16, 0x0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Int Mic Boost", 0x12, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Line In Boost", 0x19, 0, HDA_INPUT),</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc680_bind_cap_vol = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_vol,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x07, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_bind_ctls alc680_bind_cap_switch = {</div><div class='del'>-	.ops = &amp;snd_hda_bind_sw,</div><div class='del'>-	.values = {</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x07, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),</div><div class='del'>-		HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),</div><div class='del'>-		0</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new alc680_master_capture_mixer[] = {</div><div class='del'>-	HDA_BIND_VOL("Capture Volume", &amp;alc680_bind_cap_vol),</div><div class='del'>-	HDA_BIND_SW("Capture Switch", &amp;alc680_bind_cap_switch),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb alc680_init_verbs[] = {</div><div class='del'>-	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-</div><div class='del'>-	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},</div><div class='del'>-	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},</div><div class='del'>-	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},</div><div class='del'>-</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},</div><div class='del'>-</div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT   | AC_USRSP_EN},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT  | AC_USRSP_EN},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT  | AC_USRSP_EN},</div><div class='del'>-</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* toggle speaker-output according to the hp-jack state */</div><div class='del'>-static void alc680_base_setup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	spec-&gt;autocfg.hp_pins[0] = 0x16;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[0] = 0x14;</div><div class='del'>-	spec-&gt;autocfg.speaker_pins[1] = 0x15;</div><div class='del'>-	spec-&gt;autocfg.num_inputs = 2;</div><div class='del'>-	spec-&gt;autocfg.inputs[0].pin = 0x18;</div><div class='del'>-	spec-&gt;autocfg.inputs[0].type = AUTO_PIN_MIC;</div><div class='del'>-	spec-&gt;autocfg.inputs[1].pin = 0x19;</div><div class='del'>-	spec-&gt;autocfg.inputs[1].type = AUTO_PIN_LINE_IN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc680_unsol_event(struct hda_codec *codec,</div><div class='del'>-					   unsigned int res)</div><div class='del'>-{</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_HP_EVENT)</div><div class='del'>-		alc_automute_amp(codec);</div><div class='del'>-	if ((res &gt;&gt; 26) == ALC880_MIC_EVENT)</div><div class='del'>-		alc680_rec_autoswitch(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc680_inithook(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	alc_automute_amp(codec);</div><div class='del'>-	alc680_rec_autoswitch(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create input playback/capture controls for the given pin */</div><div class='del'>-static int alc680_new_analog_output(struct alc_spec *spec, hda_nid_t nid,</div><div class='del'>-				    const char *ctlname, int idx)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t dac;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	switch (nid) {</div><div class='del'>-	case 0x14:</div><div class='del'>-		dac = 0x02;</div><div class='del'>-		break;</div><div class='del'>-	case 0x15:</div><div class='del'>-		dac = 0x03;</div><div class='del'>-		break;</div><div class='del'>-	case 0x16:</div><div class='del'>-		dac = 0x04;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;multiout.dac_nids[0] != dac &amp;&amp;</div><div class='del'>-	    spec-&gt;multiout.dac_nids[1] != dac) {</div><div class='del'>-		err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname,</div><div class='del'>-				  HDA_COMPOSE_AMP_VAL(dac, 3, idx,</div><div class='del'>-						      HDA_OUTPUT));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,</div><div class='del'>-			  HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));</div><div class='del'>-</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.dac_nids[spec-&gt;multiout.num_dacs++] = dac;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int alc680_auto_create_multi_out_ctls(struct alc_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;line_out_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		const char *name;</div><div class='del'>-		if (cfg-&gt;line_out_type == AUTO_PIN_SPEAKER_OUT)</div><div class='del'>-			name = "Speaker";</div><div class='del'>-		else</div><div class='del'>-			name = "Front";</div><div class='del'>-		err = alc680_new_analog_output(spec, nid, name, 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nid = cfg-&gt;speaker_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		err = alc680_new_analog_output(spec, nid, "Speaker", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	nid = cfg-&gt;hp_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		err = alc680_new_analog_output(spec, nid, "Headphone", 0);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc680_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid, int pin_type)</div><div class='del'>-{</div><div class='del'>-	alc_set_pin_output(codec, nid, pin_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc680_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = spec-&gt;autocfg.line_out_pins[0];</div><div class='del'>-	if (nid) {</div><div class='del'>-		int pin_type = get_pin_type(spec-&gt;autocfg.line_out_type);</div><div class='del'>-		alc680_auto_set_output_and_unmute(codec, nid, pin_type);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void alc680_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-</div><div class='del'>-	pin = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-	if (pin)</div><div class='del'>-		alc680_auto_set_output_and_unmute(codec, pin, PIN_HP);</div><div class='del'>-	pin = spec-&gt;autocfg.speaker_pins[0];</div><div class='del'>-	if (pin)</div><div class='del'>-		alc680_auto_set_output_and_unmute(codec, pin, PIN_OUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* pcm configuration: identical with ALC880 */</div><div class='del'>-#define alc680_pcm_analog_playback	alc880_pcm_analog_playback</div><div class='del'>-#define alc680_pcm_analog_capture	alc880_pcm_analog_capture</div><div class='del'>-#define alc680_pcm_analog_alt_capture	alc880_pcm_analog_alt_capture</div><div class='del'>-#define alc680_pcm_digital_playback	alc880_pcm_digital_playback</div><div class='del'>-#define alc680_pcm_digital_capture	alc880_pcm_digital_capture</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * BIOS auto configuration</div><div class='del'>- */</div><div class='del'>-static int alc680_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	static hda_nid_t alc680_ignore[] = { 0 };</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg,</div><div class='del'>-					   alc680_ignore);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs) {</div><div class='del'>-		if (spec-&gt;autocfg.dig_outs || spec-&gt;autocfg.dig_in_pin) {</div><div class='del'>-			spec-&gt;multiout.max_channels = 2;</div><div class='del'>-			spec-&gt;no_analog = 1;</div><div class='del'>-			goto dig_only;</div><div class='del'>-		}</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-	}</div><div class='del'>-	err = alc680_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-</div><div class='del'>- dig_only:</div><div class='del'>-	/* digital only support output */</div><div class='del'>-	alc_auto_parse_digital(codec);</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		add_mixer(spec, spec-&gt;kctls.list);</div><div class='del'>-</div><div class='del'>-	add_verb(spec, alc680_init_verbs);</div><div class='del'>-</div><div class='del'>-	err = alc_auto_add_mic_boost(codec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define alc680_auto_init_analog_input	alc882_auto_init_analog_input</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static void alc680_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec = codec-&gt;spec;</div><div class='del'>-	alc680_auto_init_multi_out(codec);</div><div class='del'>-	alc680_auto_init_hp_out(codec);</div><div class='del'>-	alc680_auto_init_analog_input(codec);</div><div class='del'>-	alc_auto_init_digital(codec);</div><div class='del'>-	if (spec-&gt;unsol_event)</div><div class='del'>-		alc_inithook(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * configuration and preset</div><div class='del'>- */</div><div class='del'>-static const char *alc680_models[ALC680_MODEL_LAST] = {</div><div class='del'>-	[ALC680_BASE]		= "base",</div><div class='del'>-	[ALC680_AUTO]		= "auto",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk alc680_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x1043, 0x12f3, "ASUS NX90", ALC680_BASE),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct alc_config_preset alc680_presets[] = {</div><div class='del'>-	[ALC680_BASE] = {</div><div class='del'>-		.mixers = { alc680_base_mixer },</div><div class='del'>-		.cap_mixer =  alc680_master_capture_mixer,</div><div class='del'>-		.init_verbs = { alc680_init_verbs },</div><div class='del'>-		.num_dacs = ARRAY_SIZE(alc680_dac_nids),</div><div class='del'>-		.dac_nids = alc680_dac_nids,</div><div class='del'>-		.dig_out_nid = ALC680_DIGOUT_NID,</div><div class='del'>-		.num_channel_mode = ARRAY_SIZE(alc680_modes),</div><div class='del'>-		.channel_mode = alc680_modes,</div><div class='del'>-		.unsol_event = alc680_unsol_event,</div><div class='del'>-		.setup = alc680_base_setup,</div><div class='del'>-		.init_hook = alc680_inithook,</div><div class='del'>-</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_alc680(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct alc_spec *spec;</div><div class='del'>-	int board_config;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-</div><div class='del'>-	board_config = snd_hda_check_board_config(codec, ALC680_MODEL_LAST,</div><div class='del'>-						  alc680_models,</div><div class='del'>-						  alc680_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	if (board_config &lt; 0 || board_config &gt;= ALC680_MODEL_LAST) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-		       codec-&gt;chip_name);</div><div class='del'>-		board_config = ALC680_AUTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config == ALC680_AUTO) {</div><div class='del'>-		/* automatic parse from the BIOS config */</div><div class='del'>-		err = alc680_parse_auto_config(codec);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			alc_free(codec);</div><div class='del'>-			return err;</div><div class='del'>-		} else if (!err) {</div><div class='del'>-			printk(KERN_INFO</div><div class='del'>-			       "hda_codec: Cannot set up configuration "</div><div class='del'>-			       "from BIOS.  Using base mode...\n");</div><div class='del'>-			board_config = ALC680_BASE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (board_config != ALC680_AUTO)</div><div class='del'>-		setup_preset(codec, &amp;alc680_presets[board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;alc680_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;alc680_pcm_analog_auto_capture;</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;alc680_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;alc680_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids) {</div><div class='del'>-		spec-&gt;adc_nids = alc680_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(alc680_adc_nids);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;cap_mixer)</div><div class='del'>-		set_capture_mixer(codec);</div><div class='del'>-</div><div class='del'>-	spec-&gt;vmaster_nid = 0x02;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = alc_patch_ops;</div><div class='del'>-	if (board_config == ALC680_AUTO)</div><div class='del'>-		spec-&gt;init_hook = alc680_auto_init;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_realtek[] = {</div><div class='del'>-	{ .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },</div><div class='del'>-	{ .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },</div><div class='del'>-	{ .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },</div><div class='del'>-	{ .id = 0x10ec0268, .name = "ALC268", .patch = patch_alc268 },</div><div class='del'>-	{ .id = 0x10ec0269, .name = "ALC269", .patch = patch_alc269 },</div><div class='del'>-	{ .id = 0x10ec0270, .name = "ALC270", .patch = patch_alc269 },</div><div class='del'>-	{ .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },</div><div class='del'>-	{ .id = 0x10ec0275, .name = "ALC275", .patch = patch_alc269 },</div><div class='del'>-	{ .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",</div><div class='del'>-	  .patch = patch_alc861 },</div><div class='del'>-	{ .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },</div><div class='del'>-	{ .id = 0x10ec0861, .name = "ALC861", .patch = patch_alc861 },</div><div class='del'>-	{ .id = 0x10ec0862, .name = "ALC861-VD", .patch = patch_alc861vd },</div><div class='del'>-	{ .id = 0x10ec0662, .rev = 0x100002, .name = "ALC662 rev2",</div><div class='del'>-	  .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0662, .rev = 0x100101, .name = "ALC662 rev1",</div><div class='del'>-	  .patch = patch_alc662 },</div><div class='del'>-	{ .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 },</div><div class='del'>-	{ .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 },</div><div class='del'>-	{ .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 },</div><div class='del'>-	{ .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 },</div><div class='del'>-	{ .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 },</div><div class='del'>-	{ .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0885, .rev = 0x100101, .name = "ALC889A",</div><div class='del'>-	  .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",</div><div class='del'>-	  .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",</div><div class='del'>-	  .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },</div><div class='del'>-	{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc882 },</div><div class='del'>-	{ .id = 0x10ec0892, .name = "ALC892", .patch = patch_alc662 },</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:10ec*");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Realtek HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list realtek_list = {</div><div class='del'>-	.preset = snd_hda_preset_realtek,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_realtek_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;realtek_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_realtek_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;realtek_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_realtek_init)</div><div class='del'>-module_exit(patch_realtek_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c<br/>deleted file mode 100644<br/>index 93fa59cc60ef..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_sigmatel.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_sigmatel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6431 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * HD audio interface patch for SigmaTel STAC92xx</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2005 Embedded Alley Solutions, Inc.</div><div class='del'>- * Matt Porter &lt;mporter@embeddedalley.com&gt;</div><div class='del'>- *</div><div class='del'>- * Based on patch_cmedia.c and patch_realtek.c</div><div class='del'>- * Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/dmi.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/asoundef.h&gt;</div><div class='del'>-#include &lt;sound/jack.h&gt;</div><div class='del'>-#include &lt;sound/tlv.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-#include "hda_beep.h"</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_VREF_EVENT	= 1,</div><div class='del'>-	STAC_INSERT_EVENT,</div><div class='del'>-	STAC_PWR_EVENT,</div><div class='del'>-	STAC_HP_EVENT,</div><div class='del'>-	STAC_LO_EVENT,</div><div class='del'>-	STAC_MIC_EVENT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_AUTO,</div><div class='del'>-	STAC_REF,</div><div class='del'>-	STAC_9200_OQO,</div><div class='del'>-	STAC_9200_DELL_D21,</div><div class='del'>-	STAC_9200_DELL_D22,</div><div class='del'>-	STAC_9200_DELL_D23,</div><div class='del'>-	STAC_9200_DELL_M21,</div><div class='del'>-	STAC_9200_DELL_M22,</div><div class='del'>-	STAC_9200_DELL_M23,</div><div class='del'>-	STAC_9200_DELL_M24,</div><div class='del'>-	STAC_9200_DELL_M25,</div><div class='del'>-	STAC_9200_DELL_M26,</div><div class='del'>-	STAC_9200_DELL_M27,</div><div class='del'>-	STAC_9200_M4,</div><div class='del'>-	STAC_9200_M4_2,</div><div class='del'>-	STAC_9200_PANASONIC,</div><div class='del'>-	STAC_9200_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_9205_AUTO,</div><div class='del'>-	STAC_9205_REF,</div><div class='del'>-	STAC_9205_DELL_M42,</div><div class='del'>-	STAC_9205_DELL_M43,</div><div class='del'>-	STAC_9205_DELL_M44,</div><div class='del'>-	STAC_9205_EAPD,</div><div class='del'>-	STAC_9205_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_92HD73XX_AUTO,</div><div class='del'>-	STAC_92HD73XX_NO_JD, /* no jack-detection */</div><div class='del'>-	STAC_92HD73XX_REF,</div><div class='del'>-	STAC_92HD73XX_INTEL,</div><div class='del'>-	STAC_DELL_M6_AMIC,</div><div class='del'>-	STAC_DELL_M6_DMIC,</div><div class='del'>-	STAC_DELL_M6_BOTH,</div><div class='del'>-	STAC_DELL_EQ,</div><div class='del'>-	STAC_ALIENWARE_M17X,</div><div class='del'>-	STAC_92HD73XX_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_92HD83XXX_AUTO,</div><div class='del'>-	STAC_92HD83XXX_REF,</div><div class='del'>-	STAC_92HD83XXX_PWR_REF,</div><div class='del'>-	STAC_DELL_S14,</div><div class='del'>-	STAC_92HD83XXX_HP,</div><div class='del'>-	STAC_HP_DV7_4000,</div><div class='del'>-	STAC_92HD83XXX_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_92HD71BXX_AUTO,</div><div class='del'>-	STAC_92HD71BXX_REF,</div><div class='del'>-	STAC_DELL_M4_1,</div><div class='del'>-	STAC_DELL_M4_2,</div><div class='del'>-	STAC_DELL_M4_3,</div><div class='del'>-	STAC_HP_M4,</div><div class='del'>-	STAC_HP_DV4,</div><div class='del'>-	STAC_HP_DV5,</div><div class='del'>-	STAC_HP_HDX,</div><div class='del'>-	STAC_HP_DV4_1222NR,</div><div class='del'>-	STAC_92HD71BXX_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_925x_AUTO,</div><div class='del'>-	STAC_925x_REF,</div><div class='del'>-	STAC_M1,</div><div class='del'>-	STAC_M1_2,</div><div class='del'>-	STAC_M2,</div><div class='del'>-	STAC_M2_2,</div><div class='del'>-	STAC_M3,</div><div class='del'>-	STAC_M5,</div><div class='del'>-	STAC_M6,</div><div class='del'>-	STAC_925x_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_922X_AUTO,</div><div class='del'>-	STAC_D945_REF,</div><div class='del'>-	STAC_D945GTP3,</div><div class='del'>-	STAC_D945GTP5,</div><div class='del'>-	STAC_INTEL_MAC_V1,</div><div class='del'>-	STAC_INTEL_MAC_V2,</div><div class='del'>-	STAC_INTEL_MAC_V3,</div><div class='del'>-	STAC_INTEL_MAC_V4,</div><div class='del'>-	STAC_INTEL_MAC_V5,</div><div class='del'>-	STAC_INTEL_MAC_AUTO, /* This model is selected if no module parameter</div><div class='del'>-			      * is given, one of the above models will be</div><div class='del'>-			      * chosen according to the subsystem id. */</div><div class='del'>-	/* for backward compatibility */</div><div class='del'>-	STAC_MACMINI,</div><div class='del'>-	STAC_MACBOOK,</div><div class='del'>-	STAC_MACBOOK_PRO_V1,</div><div class='del'>-	STAC_MACBOOK_PRO_V2,</div><div class='del'>-	STAC_IMAC_INTEL,</div><div class='del'>-	STAC_IMAC_INTEL_20,</div><div class='del'>-	STAC_ECS_202,</div><div class='del'>-	STAC_922X_DELL_D81,</div><div class='del'>-	STAC_922X_DELL_D82,</div><div class='del'>-	STAC_922X_DELL_M81,</div><div class='del'>-	STAC_922X_DELL_M82,</div><div class='del'>-	STAC_922X_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_927X_AUTO,</div><div class='del'>-	STAC_D965_REF_NO_JD, /* no jack-detection */</div><div class='del'>-	STAC_D965_REF,</div><div class='del'>-	STAC_D965_3ST,</div><div class='del'>-	STAC_D965_5ST,</div><div class='del'>-	STAC_D965_5ST_NO_FP,</div><div class='del'>-	STAC_DELL_3ST,</div><div class='del'>-	STAC_DELL_BIOS,</div><div class='del'>-	STAC_927X_VOLKNOB,</div><div class='del'>-	STAC_927X_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_9872_AUTO,</div><div class='del'>-	STAC_9872_VAIO,</div><div class='del'>-	STAC_9872_MODELS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sigmatel_event {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	unsigned char type;</div><div class='del'>-	unsigned char tag;</div><div class='del'>-	int data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sigmatel_jack {</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int type;</div><div class='del'>-	struct snd_jack *jack;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sigmatel_mic_route {</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	signed char mux_idx;</div><div class='del'>-	signed char dmux_idx;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sigmatel_spec {</div><div class='del'>-	struct snd_kcontrol_new *mixers[4];</div><div class='del'>-	unsigned int num_mixers;</div><div class='del'>-</div><div class='del'>-	int board_config;</div><div class='del'>-	unsigned int eapd_switch: 1;</div><div class='del'>-	unsigned int surr_switch: 1;</div><div class='del'>-	unsigned int alt_switch: 1;</div><div class='del'>-	unsigned int hp_detect: 1;</div><div class='del'>-	unsigned int spdif_mute: 1;</div><div class='del'>-	unsigned int check_volume_offset:1;</div><div class='del'>-	unsigned int auto_mic:1;</div><div class='del'>-	unsigned int linear_tone_beep:1;</div><div class='del'>-</div><div class='del'>-	/* gpio lines */</div><div class='del'>-	unsigned int eapd_mask;</div><div class='del'>-	unsigned int gpio_mask;</div><div class='del'>-	unsigned int gpio_dir;</div><div class='del'>-	unsigned int gpio_data;</div><div class='del'>-	unsigned int gpio_mute;</div><div class='del'>-	unsigned int gpio_led;</div><div class='del'>-	unsigned int gpio_led_polarity;</div><div class='del'>-</div><div class='del'>-	/* stream */</div><div class='del'>-	unsigned int stream_delay;</div><div class='del'>-</div><div class='del'>-	/* analog loopback */</div><div class='del'>-	struct snd_kcontrol_new *aloopback_ctl;</div><div class='del'>-	unsigned char aloopback_mask;</div><div class='del'>-	unsigned char aloopback_shift;</div><div class='del'>-</div><div class='del'>-	/* power management */</div><div class='del'>-	unsigned int num_pwrs;</div><div class='del'>-	unsigned int *pwr_mapping;</div><div class='del'>-	hda_nid_t *pwr_nids;</div><div class='del'>-	hda_nid_t *dac_list;</div><div class='del'>-</div><div class='del'>-	/* jack detection */</div><div class='del'>-	struct snd_array jacks;</div><div class='del'>-</div><div class='del'>-	/* events */</div><div class='del'>-	struct snd_array events;</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_input_mux *mono_mux;</div><div class='del'>-	unsigned int cur_mmux;</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	hda_nid_t dac_nids[5];</div><div class='del'>-	hda_nid_t hp_dacs[5];</div><div class='del'>-	hda_nid_t speaker_dacs[5];</div><div class='del'>-</div><div class='del'>-	int volume_offset;</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	unsigned int num_adcs;</div><div class='del'>-	hda_nid_t *mux_nids;</div><div class='del'>-	unsigned int num_muxes;</div><div class='del'>-	hda_nid_t *dmic_nids;</div><div class='del'>-	unsigned int num_dmics;</div><div class='del'>-	hda_nid_t *dmux_nids;</div><div class='del'>-	unsigned int num_dmuxes;</div><div class='del'>-	hda_nid_t *smux_nids;</div><div class='del'>-	unsigned int num_smuxes;</div><div class='del'>-	unsigned int num_analog_muxes;</div><div class='del'>-</div><div class='del'>-	unsigned long *capvols; /* amp-volume attr: HDA_COMPOSE_AMP_VAL() */</div><div class='del'>-	unsigned long *capsws; /* amp-mute attr: HDA_COMPOSE_AMP_VAL() */</div><div class='del'>-	unsigned int num_caps; /* number of capture volume/switch elements */</div><div class='del'>-</div><div class='del'>-	struct sigmatel_mic_route ext_mic;</div><div class='del'>-	struct sigmatel_mic_route int_mic;</div><div class='del'>-	struct sigmatel_mic_route dock_mic;</div><div class='del'>-</div><div class='del'>-	const char **spdif_labels;</div><div class='del'>-</div><div class='del'>-	hda_nid_t dig_in_nid;</div><div class='del'>-	hda_nid_t mono_nid;</div><div class='del'>-	hda_nid_t anabeep_nid;</div><div class='del'>-	hda_nid_t digbeep_nid;</div><div class='del'>-</div><div class='del'>-	/* pin widgets */</div><div class='del'>-	hda_nid_t *pin_nids;</div><div class='del'>-	unsigned int num_pins;</div><div class='del'>-</div><div class='del'>-	/* codec specific stuff */</div><div class='del'>-	struct hda_verb *init;</div><div class='del'>-	struct snd_kcontrol_new *mixer;</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	struct hda_input_mux *dinput_mux;</div><div class='del'>-	unsigned int cur_dmux[2];</div><div class='del'>-	struct hda_input_mux *input_mux;</div><div class='del'>-	unsigned int cur_mux[3];</div><div class='del'>-	struct hda_input_mux *sinput_mux;</div><div class='del'>-	unsigned int cur_smux[2];</div><div class='del'>-	unsigned int cur_amux;</div><div class='del'>-	hda_nid_t *amp_nids;</div><div class='del'>-	unsigned int powerdown_adcs;</div><div class='del'>-</div><div class='del'>-	/* i/o switches */</div><div class='del'>-	unsigned int io_switch[2];</div><div class='del'>-	unsigned int clfe_swap;</div><div class='del'>-	hda_nid_t line_switch;	/* shared line-in for input and output */</div><div class='del'>-	hda_nid_t mic_switch;	/* shared mic-in for input and output */</div><div class='del'>-	hda_nid_t hp_switch; /* NID of HP as line-out */</div><div class='del'>-	unsigned int aloopback;</div><div class='del'>-</div><div class='del'>-	struct hda_pcm pcm_rec[2];	/* PCM information */</div><div class='del'>-</div><div class='del'>-	/* dynamic controls and input_mux */</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct snd_array kctls;</div><div class='del'>-	struct hda_input_mux private_dimux;</div><div class='del'>-	struct hda_input_mux private_imux;</div><div class='del'>-	struct hda_input_mux private_smux;</div><div class='del'>-	struct hda_input_mux private_mono_mux;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9200_adc_nids[1] = {</div><div class='del'>-        0x03,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9200_mux_nids[1] = {</div><div class='del'>-        0x0c,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9200_dac_nids[1] = {</div><div class='del'>-        0x02,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_pwr_nids[8] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0xd, 0x0e,</div><div class='del'>-	0x0f, 0x10, 0x11</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_slave_dig_outs[2] = {</div><div class='del'>-	0x26, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_adc_nids[2] = {</div><div class='del'>-	0x1a, 0x1b</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD73XX_NUM_DMICS	2</div><div class='del'>-static hda_nid_t stac92hd73xx_dmic_nids[STAC92HD73XX_NUM_DMICS + 1] = {</div><div class='del'>-	0x13, 0x14, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD73_DAC_COUNT 5</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_mux_nids[2] = {</div><div class='del'>-	0x20, 0x21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_dmux_nids[2] = {</div><div class='del'>-	0x20, 0x21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_smux_nids[2] = {</div><div class='del'>-	0x22, 0x23,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD73XX_NUM_CAPS	2</div><div class='del'>-static unsigned long stac92hd73xx_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x20, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-#define stac92hd73xx_capsws	stac92hd73xx_capvols</div><div class='del'>-</div><div class='del'>-#define STAC92HD83_DAC_COUNT 3</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd83xxx_mux_nids[2] = {</div><div class='del'>-	0x17, 0x18,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd83xxx_adc_nids[2] = {</div><div class='del'>-	0x15, 0x16,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd83xxx_pwr_nids[4] = {</div><div class='del'>-	0xa, 0xb, 0xd, 0xe,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = {</div><div class='del'>-	0x1e, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac92hd83xxx_pwr_mapping[4] = {</div><div class='del'>-	0x03, 0x0c, 0x20, 0x40,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD83XXX_NUM_DMICS	 2</div><div class='del'>-static hda_nid_t stac92hd83xxx_dmic_nids[STAC92HD83XXX_NUM_DMICS + 1] = {</div><div class='del'>-	0x11, 0x20, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD83XXX_NUM_CAPS	2</div><div class='del'>-static unsigned long stac92hd83xxx_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-#define stac92hd83xxx_capsws	stac92hd83xxx_capvols</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_pwr_nids[3] = {</div><div class='del'>-	0x0a, 0x0d, 0x0f</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_adc_nids[2] = {</div><div class='del'>-	0x12, 0x13,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_mux_nids[2] = {</div><div class='del'>-	0x1a, 0x1b</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_dmux_nids[2] = {</div><div class='del'>-	0x1c, 0x1d,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_smux_nids[2] = {</div><div class='del'>-	0x24, 0x25,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD71BXX_NUM_DMICS	2</div><div class='del'>-static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {</div><div class='del'>-	0x18, 0x19, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd71bxx_slave_dig_outs[2] = {</div><div class='del'>-	0x22, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD71BXX_NUM_CAPS		2</div><div class='del'>-static unsigned long stac92hd71bxx_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-#define stac92hd71bxx_capsws	stac92hd71bxx_capvols</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac925x_adc_nids[1] = {</div><div class='del'>-        0x03,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac925x_mux_nids[1] = {</div><div class='del'>-        0x0f,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac925x_dac_nids[1] = {</div><div class='del'>-        0x02,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC925X_NUM_DMICS	1</div><div class='del'>-static hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS + 1] = {</div><div class='del'>-	0x15, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac925x_dmux_nids[1] = {</div><div class='del'>-	0x14,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned long stac925x_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-static unsigned long stac925x_capsws[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac922x_adc_nids[2] = {</div><div class='del'>-        0x06, 0x07,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac922x_mux_nids[2] = {</div><div class='del'>-        0x12, 0x13,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC922X_NUM_CAPS	2</div><div class='del'>-static unsigned long stac922x_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_INPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT),</div><div class='del'>-};</div><div class='del'>-#define stac922x_capsws		stac922x_capvols</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_slave_dig_outs[2] = {</div><div class='del'>-	0x1f, 0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_adc_nids[3] = {</div><div class='del'>-        0x07, 0x08, 0x09</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_mux_nids[3] = {</div><div class='del'>-        0x15, 0x16, 0x17</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_smux_nids[1] = {</div><div class='del'>-	0x21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_dac_nids[6] = {</div><div class='del'>-	0x02, 0x03, 0x04, 0x05, 0x06, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_dmux_nids[1] = {</div><div class='del'>-	0x1b,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC927X_NUM_DMICS 2</div><div class='del'>-static hda_nid_t stac927x_dmic_nids[STAC927X_NUM_DMICS + 1] = {</div><div class='del'>-	0x13, 0x14, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC927X_NUM_CAPS	3</div><div class='del'>-static unsigned long stac927x_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x19, 3, 0, HDA_INPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_INPUT),</div><div class='del'>-};</div><div class='del'>-static unsigned long stac927x_capsws[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac927x_spdif_labels[5] = {</div><div class='del'>-	"Digital Playback", "ADAT", "Analog Mux 1",</div><div class='del'>-	"Analog Mux 2", "Analog Mux 3"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9205_adc_nids[2] = {</div><div class='del'>-        0x12, 0x13</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9205_mux_nids[2] = {</div><div class='del'>-        0x19, 0x1a</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9205_dmux_nids[1] = {</div><div class='del'>-	0x1d,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9205_smux_nids[1] = {</div><div class='del'>-	0x21,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC9205_NUM_DMICS	2</div><div class='del'>-static hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS + 1] = {</div><div class='del'>-        0x17, 0x18, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC9205_NUM_CAPS	2</div><div class='del'>-static unsigned long stac9205_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_INPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_INPUT),</div><div class='del'>-};</div><div class='del'>-static unsigned long stac9205_capsws[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x1e, 3, 0, HDA_OUTPUT),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9200_pin_nids[8] = {</div><div class='del'>-	0x08, 0x09, 0x0d, 0x0e, </div><div class='del'>-	0x0f, 0x10, 0x11, 0x12,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac925x_pin_nids[8] = {</div><div class='del'>-	0x07, 0x08, 0x0a, 0x0b, </div><div class='del'>-	0x0c, 0x0d, 0x10, 0x11,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac922x_pin_nids[10] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x10, 0x11, 0x15, 0x1b,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd73xx_pin_nids[13] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x10, 0x11, 0x12, 0x13,</div><div class='del'>-	0x14, 0x22, 0x23</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd83xxx_pin_nids[10] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x10, 0x11, 0x1f, 0x20,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac92hd88xxx_pin_nids[10] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d,</div><div class='del'>-	0x0f, 0x11, 0x1f, 0x20,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC92HD71BXX_NUM_PINS 13</div><div class='del'>-static hda_nid_t stac92hd71bxx_pin_nids_4port[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x00,</div><div class='del'>-	0x00, 0x14, 0x18, 0x19, 0x1e,</div><div class='del'>-	0x1f, 0x20, 0x27</div><div class='del'>-};</div><div class='del'>-static hda_nid_t stac92hd71bxx_pin_nids_6port[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x14, 0x18, 0x19, 0x1e,</div><div class='del'>-	0x1f, 0x20, 0x27</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac927x_pin_nids[14] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x10, 0x11, 0x12, 0x13,</div><div class='del'>-	0x14, 0x21, 0x22, 0x23,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9205_pin_nids[12] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e,</div><div class='del'>-	0x0f, 0x14, 0x16, 0x17, 0x18,</div><div class='del'>-	0x21, 0x22,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stac92xx_dmux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;dinput_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dmux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int dmux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_dmux[dmux_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dmux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int dmux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;dinput_mux, ucontrol,</div><div class='del'>-			spec-&gt;dmux_nids[dmux_idx], &amp;spec-&gt;cur_dmux[dmux_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_smux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;sinput_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_smux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int smux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_smux[smux_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *smux = &amp;spec-&gt;private_smux;</div><div class='del'>-	unsigned int smux_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	int err, val;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_input_mux_put(codec, spec-&gt;sinput_mux, ucontrol,</div><div class='del'>-			spec-&gt;smux_nids[smux_idx], &amp;spec-&gt;cur_smux[smux_idx]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;spdif_mute) {</div><div class='del'>-		if (smux_idx == 0)</div><div class='del'>-			nid = spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		else</div><div class='del'>-			nid = codec-&gt;slave_dig_outs[smux_idx - 1];</div><div class='del'>-		if (spec-&gt;cur_smux[smux_idx] == smux-&gt;num_items - 1)</div><div class='del'>-			val = HDA_AMP_MUTE;</div><div class='del'>-		else</div><div class='del'>-			val = 0;</div><div class='del'>-		/* un/mute SPDIF out */</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,</div><div class='del'>-					 HDA_AMP_MUTE, val);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int stac92xx_vref_set(struct hda_codec *codec,</div><div class='del'>-					hda_nid_t nid, unsigned int new_vref)</div><div class='del'>-{</div><div class='del'>-	int error;</div><div class='del'>-	unsigned int pincfg;</div><div class='del'>-	pincfg = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-</div><div class='del'>-	pincfg &amp;= 0xff;</div><div class='del'>-	pincfg &amp;= ~(AC_PINCTL_VREFEN | AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);</div><div class='del'>-	pincfg |= new_vref;</div><div class='del'>-</div><div class='del'>-	if (new_vref == AC_PINCTL_VREF_HIZ)</div><div class='del'>-		pincfg |= AC_PINCTL_OUT_EN;</div><div class='del'>-	else</div><div class='del'>-		pincfg |= AC_PINCTL_IN_EN;</div><div class='del'>-</div><div class='del'>-	error = snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					AC_VERB_SET_PIN_WIDGET_CONTROL, pincfg);</div><div class='del'>-	if (error &lt; 0)</div><div class='del'>-		return error;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int stac92xx_vref_get(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int vref;</div><div class='del'>-	vref = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-	vref &amp;= AC_PINCTL_VREFEN;</div><div class='del'>-	return vref;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	const struct hda_input_mux *imux = spec-&gt;input_mux;</div><div class='del'>-	unsigned int idx, prev_idx;</div><div class='del'>-</div><div class='del'>-	idx = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	if (idx &gt;= imux-&gt;num_items)</div><div class='del'>-		idx = imux-&gt;num_items - 1;</div><div class='del'>-	prev_idx = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	if (prev_idx == idx)</div><div class='del'>-		return 0;</div><div class='del'>-	if (idx &lt; spec-&gt;num_analog_muxes) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, spec-&gt;mux_nids[adc_idx], 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  imux-&gt;items[idx].index);</div><div class='del'>-		if (prev_idx &gt;= spec-&gt;num_analog_muxes) {</div><div class='del'>-			imux = spec-&gt;dinput_mux;</div><div class='del'>-			/* 0 = analog */</div><div class='del'>-			snd_hda_codec_write_cache(codec,</div><div class='del'>-						  spec-&gt;dmux_nids[adc_idx], 0,</div><div class='del'>-						  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-						  imux-&gt;items[0].index);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		imux = spec-&gt;dinput_mux;</div><div class='del'>-		snd_hda_codec_write_cache(codec, spec-&gt;dmux_nids[adc_idx], 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  imux-&gt;items[idx - 1].index);</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;cur_mux[adc_idx] = idx;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mono_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-	struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;mono_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mono_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-	struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mmux;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_mono_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-	struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;mono_mux, ucontrol,</div><div class='del'>-				     spec-&gt;mono_nid, &amp;spec-&gt;cur_mmux);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define stac92xx_aloopback_info snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int stac92xx_aloopback_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-	struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = !!(spec-&gt;aloopback &amp;</div><div class='del'>-					      (spec-&gt;aloopback_mask &lt;&lt; idx));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_aloopback_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-		struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-	unsigned int dac_mode;</div><div class='del'>-	unsigned int val, idx_val;</div><div class='del'>-</div><div class='del'>-	idx_val = spec-&gt;aloopback_mask &lt;&lt; idx;</div><div class='del'>-	if (ucontrol-&gt;value.integer.value[0])</div><div class='del'>-		val = spec-&gt;aloopback | idx_val;</div><div class='del'>-	else</div><div class='del'>-		val = spec-&gt;aloopback &amp; ~idx_val;</div><div class='del'>-	if (spec-&gt;aloopback == val)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;aloopback = val;</div><div class='del'>-</div><div class='del'>-	/* Only return the bits defined by the shift value of the</div><div class='del'>-	 * first two bytes of the mask</div><div class='del'>-	 */</div><div class='del'>-	dac_mode = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				      kcontrol-&gt;private_value &amp; 0xFFFF, 0x0);</div><div class='del'>-	dac_mode &gt;&gt;= spec-&gt;aloopback_shift;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;aloopback &amp; idx_val) {</div><div class='del'>-		snd_hda_power_up(codec);</div><div class='del'>-		dac_mode |= idx_val;</div><div class='del'>-	} else {</div><div class='del'>-		snd_hda_power_down(codec);</div><div class='del'>-		dac_mode &amp;= ~idx_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-		kcontrol-&gt;private_value &gt;&gt; 16, dac_mode);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac9200_core_init[] = {</div><div class='del'>-	/* set dac0mux for dac converter */</div><div class='del'>-	{ 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac9200_eapd_init[] = {</div><div class='del'>-	/* set dac0mux for dac converter */</div><div class='del'>-	{0x07, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	{0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb dell_eq_core_init[] = {</div><div class='del'>-	/* set master volume to max value without distortion</div><div class='del'>-	 * and direct control */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac92hd73xx_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */</div><div class='del'>-	{ 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac92hd83xxx_core_init[] = {</div><div class='del'>-	/* power state controls amps */</div><div class='del'>-	{ 0x01, AC_VERB_SET_EAPD, 1 &lt;&lt; 2},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac92hd71bxx_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */</div><div class='del'>-	{ 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac92hd71bxx_unmute_core_init[] = {</div><div class='del'>-	/* unmute right and left channels for nodes 0x0f, 0xa, 0x0d */</div><div class='del'>-	{ 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac925x_core_init[] = {</div><div class='del'>-	/* set dac0mux for dac converter */</div><div class='del'>-	{ 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},</div><div class='del'>-	/* mute the master volume */</div><div class='del'>-	{ 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac922x_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */	</div><div class='del'>-	{ 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb d965_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */	</div><div class='del'>-	{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	/* unmute node 0x1b */</div><div class='del'>-	{ 0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* select node 0x03 as DAC */	</div><div class='del'>-	{ 0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb dell_3st_core_init[] = {</div><div class='del'>-	/* don't set delta bit */</div><div class='del'>-	{0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},</div><div class='del'>-	/* unmute node 0x1b */</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},</div><div class='del'>-	/* select node 0x03 as DAC */</div><div class='del'>-	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x01},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac927x_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */	</div><div class='del'>-	{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	/* enable analog pc beep path */</div><div class='del'>-	{ 0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac927x_volknob_core_init[] = {</div><div class='del'>-	/* don't set delta bit */</div><div class='del'>-	{0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},</div><div class='del'>-	/* enable analog pc beep path */</div><div class='del'>-	{0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac9205_core_init[] = {</div><div class='del'>-	/* set master volume and direct control */	</div><div class='del'>-	{ 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},</div><div class='del'>-	/* enable analog pc beep path */</div><div class='del'>-	{ 0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 &lt;&lt; 5},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define STAC_MONO_MUX \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		.name = "Mono Mux", \</div><div class='del'>-		.count = 1, \</div><div class='del'>-		.info = stac92xx_mono_mux_enum_info, \</div><div class='del'>-		.get = stac92xx_mono_mux_enum_get, \</div><div class='del'>-		.put = stac92xx_mono_mux_enum_put, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define STAC_ANALOG_LOOPBACK(verb_read, verb_write, cnt) \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		.name  = "Analog Loopback", \</div><div class='del'>-		.count = cnt, \</div><div class='del'>-		.info  = stac92xx_aloopback_info, \</div><div class='del'>-		.get   = stac92xx_aloopback_get, \</div><div class='del'>-		.put   = stac92xx_aloopback_put, \</div><div class='del'>-		.private_value = verb_read | (verb_write &lt;&lt; 16), \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define DC_BIAS(xname, idx, nid) \</div><div class='del'>-	{ \</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-		.name = xname, \</div><div class='del'>-		.index = idx, \</div><div class='del'>-		.info = stac92xx_dc_bias_info, \</div><div class='del'>-		.get = stac92xx_dc_bias_get, \</div><div class='del'>-		.put = stac92xx_dc_bias_put, \</div><div class='del'>-		.private_value = nid, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac9200_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME_MIN_MUTE("Master Playback Volume", 0xb, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92hd73xx_6ch_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92hd73xx_8ch_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92hd73xx_10ch_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92hd71bxx_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2)</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac925x_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME_MIN_MUTE("Master Playback Volume", 0xe, 0, HDA_OUTPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac9205_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac927x_loopback[] = {</div><div class='del'>-	STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac_dmux_mixer = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name = "Digital Input Source",</div><div class='del'>-	/* count set later */</div><div class='del'>-	.info = stac92xx_dmux_enum_info,</div><div class='del'>-	.get = stac92xx_dmux_enum_get,</div><div class='del'>-	.put = stac92xx_dmux_enum_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac_smux_mixer = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name = "IEC958 Playback Source",</div><div class='del'>-	/* count set later */</div><div class='del'>-	.info = stac92xx_smux_enum_info,</div><div class='del'>-	.get = stac92xx_smux_enum_get,</div><div class='del'>-	.put = stac92xx_smux_enum_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *slave_vols[] = {</div><div class='del'>-	"Front Playback Volume",</div><div class='del'>-	"Surround Playback Volume",</div><div class='del'>-	"Center Playback Volume",</div><div class='del'>-	"LFE Playback Volume",</div><div class='del'>-	"Side Playback Volume",</div><div class='del'>-	"Headphone Playback Volume",</div><div class='del'>-	"Speaker Playback Volume",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *slave_sws[] = {</div><div class='del'>-	"Front Playback Switch",</div><div class='del'>-	"Surround Playback Switch",</div><div class='del'>-	"Center Playback Switch",</div><div class='del'>-	"LFE Playback Switch",</div><div class='del'>-	"Side Playback Switch",</div><div class='del'>-	"Headphone Playback Switch",</div><div class='del'>-	"Speaker Playback Switch",</div><div class='del'>-	"IEC958 Playback Switch",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void stac92xx_free_kctls(struct hda_codec *codec);</div><div class='del'>-static int stac92xx_add_jack(struct hda_codec *codec, hda_nid_t nid, int type);</div><div class='del'>-</div><div class='del'>-static int stac92xx_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;mixer) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixer);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (!spec-&gt;auto_mic &amp;&amp; spec-&gt;num_dmuxes &gt; 0 &amp;&amp;</div><div class='del'>-	    snd_hda_get_bool_hint(codec, "separate_dmux") == 1) {</div><div class='del'>-		stac_dmux_mixer.count = spec-&gt;num_dmuxes;</div><div class='del'>-		err = snd_hda_ctl_add(codec, 0,</div><div class='del'>-				  snd_ctl_new1(&amp;stac_dmux_mixer, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;num_smuxes &gt; 0) {</div><div class='del'>-		int wcaps = get_wcaps(codec, spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		struct hda_input_mux *smux = &amp;spec-&gt;private_smux;</div><div class='del'>-		/* check for mute support on SPDIF out */</div><div class='del'>-		if (wcaps &amp; AC_WCAP_OUT_AMP) {</div><div class='del'>-			snd_hda_add_imux_item(smux, "Off", 0, NULL);</div><div class='del'>-			spec-&gt;spdif_mute = 1;</div><div class='del'>-		}</div><div class='del'>-		stac_smux_mixer.count = spec-&gt;num_smuxes;</div><div class='del'>-		err = snd_hda_ctl_add(codec, 0,</div><div class='del'>-				  snd_ctl_new1(&amp;stac_smux_mixer, codec));</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec, spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-						    &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in_nid &amp;&amp; !(spec-&gt;gpio_dir &amp; 0x01)) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if we have no master control, let's create it */</div><div class='del'>-	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {</div><div class='del'>-		unsigned int vmaster_tlv[4];</div><div class='del'>-		snd_hda_set_vmaster_tlv(codec, spec-&gt;multiout.dac_nids[0],</div><div class='del'>-					HDA_OUTPUT, vmaster_tlv);</div><div class='del'>-		/* correct volume offset */</div><div class='del'>-		vmaster_tlv[2] += vmaster_tlv[3] * spec-&gt;volume_offset;</div><div class='del'>-		/* minimum value is actually mute */</div><div class='del'>-		vmaster_tlv[3] |= TLV_DB_SCALE_MUTE;</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Volume",</div><div class='del'>-					  vmaster_tlv, slave_vols);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {</div><div class='del'>-		err = snd_hda_add_vmaster(codec, "Master Playback Switch",</div><div class='del'>-					  NULL, slave_sws);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;aloopback_ctl &amp;&amp;</div><div class='del'>-	    snd_hda_get_bool_hint(codec, "loopback") == 1) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;aloopback_ctl);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stac92xx_free_kctls(codec); /* no longer needed */</div><div class='del'>-</div><div class='del'>-	/* create jack input elements */</div><div class='del'>-	if (spec-&gt;hp_detect) {</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-			int type = SND_JACK_HEADPHONE;</div><div class='del'>-			nid = cfg-&gt;hp_pins[i];</div><div class='del'>-			/* jack detection */</div><div class='del'>-			if (cfg-&gt;hp_outs == i)</div><div class='del'>-				type |= SND_JACK_LINEOUT;</div><div class='del'>-			err = stac92xx_add_jack(codec, nid, type);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		err = stac92xx_add_jack(codec, cfg-&gt;line_out_pins[i],</div><div class='del'>-					SND_JACK_LINEOUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		err = stac92xx_add_jack(codec, nid, SND_JACK_MICROPHONE);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int ref9200_pin_configs[8] = {</div><div class='del'>-	0x01c47010, 0x01447010, 0x0221401f, 0x01114010,</div><div class='del'>-	0x02a19020, 0x01a19021, 0x90100140, 0x01813122,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int gateway9200_m4_pin_configs[8] = {</div><div class='del'>-	0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,</div><div class='del'>-	0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,</div><div class='del'>-};</div><div class='del'>-static unsigned int gateway9200_m4_2_pin_configs[8] = {</div><div class='del'>-	0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,</div><div class='del'>-	0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9200 pin configs for</div><div class='del'>-    102801A8</div><div class='del'>-    102801DE</div><div class='del'>-    102801E8</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_d21_pin_configs[8] = {</div><div class='del'>-	0x400001f0, 0x400001f1, 0x02214030, 0x01014010, </div><div class='del'>-	0x02a19020, 0x01a19021, 0x90100140, 0x01813122,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-    STAC 9200 pin configs for</div><div class='del'>-    102801C0</div><div class='del'>-    102801C1</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_d22_pin_configs[8] = {</div><div class='del'>-	0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, </div><div class='del'>-	0x01813020, 0x02a19021, 0x90100140, 0x400001f2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-    STAC 9200 pin configs for</div><div class='del'>-    102801C4 (Dell Dimension E310)</div><div class='del'>-    102801C5</div><div class='del'>-    102801C7</div><div class='del'>-    102801D9</div><div class='del'>-    102801DA</div><div class='del'>-    102801E3</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_d23_pin_configs[8] = {</div><div class='del'>-	0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, </div><div class='del'>-	0x01813020, 0x01a19021, 0x90100140, 0x400001f2, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-    STAC 9200-32 pin configs for</div><div class='del'>-    102801B5 (Dell Inspiron 630m)</div><div class='del'>-    102801D8 (Dell Inspiron 640m)</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m21_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x03441340, 0x0321121f, 0x90170310,</div><div class='del'>-	0x408003fb, 0x03a11020, 0x401003fc, 0x403003fd,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-    STAC 9200-32 pin configs for</div><div class='del'>-    102801C2 (Dell Latitude D620)</div><div class='del'>-    102801C8 </div><div class='del'>-    102801CC (Dell Latitude D820)</div><div class='del'>-    102801D4 </div><div class='del'>-    102801D6 </div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m22_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x0144131f, 0x0321121f, 0x90170310, </div><div class='del'>-	0x90a70321, 0x03a11020, 0x401003fb, 0x40f000fc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>-    STAC 9200-32 pin configs for</div><div class='del'>-    102801CE (Dell XPS M1710)</div><div class='del'>-    102801CF (Dell Precision M90)</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m23_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x01441340, 0x0421421f, 0x90170310,</div><div class='del'>-	0x408003fb, 0x04a1102e, 0x90170311, 0x403003fc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9200-32 pin configs for </div><div class='del'>-    102801C9</div><div class='del'>-    102801CA</div><div class='del'>-    102801CB (Dell Latitude 120L)</div><div class='del'>-    102801D3</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m24_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x404003fb, 0x0321121f, 0x90170310, </div><div class='del'>-	0x408003fc, 0x03a11020, 0x401003fd, 0x403003fe, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9200-32 pin configs for</div><div class='del'>-    102801BD (Dell Inspiron E1505n)</div><div class='del'>-    102801EE</div><div class='del'>-    102801EF</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m25_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x01441340, 0x0421121f, 0x90170310, </div><div class='del'>-	0x408003fb, 0x04a11020, 0x401003fc, 0x403003fd,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9200-32 pin configs for</div><div class='del'>-    102801F5 (Dell Inspiron 1501)</div><div class='del'>-    102801F6</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m26_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x404003fb, 0x0421121f, 0x90170310, </div><div class='del'>-	0x408003fc, 0x04a11020, 0x401003fd, 0x403003fe,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9200-32</div><div class='del'>-    102801CD (Dell Inspiron E1705/9400)</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell9200_m27_pin_configs[8] = {</div><div class='del'>-	0x40c003fa, 0x01441340, 0x0421121f, 0x90170310,</div><div class='del'>-	0x90170310, 0x04a11020, 0x90170310, 0x40f003fc,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int oqo9200_pin_configs[8] = {</div><div class='del'>-	0x40c000f0, 0x404000f1, 0x0221121f, 0x02211210,</div><div class='del'>-	0x90170111, 0x90a70120, 0x400000f2, 0x400000f3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {</div><div class='del'>-	[STAC_REF] = ref9200_pin_configs,</div><div class='del'>-	[STAC_9200_OQO] = oqo9200_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_D21] = dell9200_d21_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_D22] = dell9200_d22_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_D23] = dell9200_d23_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M21] = dell9200_m21_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M22] = dell9200_m22_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M23] = dell9200_m23_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M24] = dell9200_m24_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M25] = dell9200_m25_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M26] = dell9200_m26_pin_configs,</div><div class='del'>-	[STAC_9200_DELL_M27] = dell9200_m27_pin_configs,</div><div class='del'>-	[STAC_9200_M4] = gateway9200_m4_pin_configs,</div><div class='del'>-	[STAC_9200_M4_2] = gateway9200_m4_2_pin_configs,</div><div class='del'>-	[STAC_9200_PANASONIC] = ref9200_pin_configs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac9200_models[STAC_9200_MODELS] = {</div><div class='del'>-	[STAC_AUTO] = "auto",</div><div class='del'>-	[STAC_REF] = "ref",</div><div class='del'>-	[STAC_9200_OQO] = "oqo",</div><div class='del'>-	[STAC_9200_DELL_D21] = "dell-d21",</div><div class='del'>-	[STAC_9200_DELL_D22] = "dell-d22",</div><div class='del'>-	[STAC_9200_DELL_D23] = "dell-d23",</div><div class='del'>-	[STAC_9200_DELL_M21] = "dell-m21",</div><div class='del'>-	[STAC_9200_DELL_M22] = "dell-m22",</div><div class='del'>-	[STAC_9200_DELL_M23] = "dell-m23",</div><div class='del'>-	[STAC_9200_DELL_M24] = "dell-m24",</div><div class='del'>-	[STAC_9200_DELL_M25] = "dell-m25",</div><div class='del'>-	[STAC_9200_DELL_M26] = "dell-m26",</div><div class='del'>-	[STAC_9200_DELL_M27] = "dell-m27",</div><div class='del'>-	[STAC_9200_M4] = "gateway-m4",</div><div class='del'>-	[STAC_9200_M4_2] = "gateway-m4-2",</div><div class='del'>-	[STAC_9200_PANASONIC] = "panasonic",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac9200_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_REF),</div><div class='del'>-	/* Dell laptops have BIOS problem */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a8,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01b5,</div><div class='del'>-		      "Dell Inspiron 630m", STAC_9200_DELL_M21),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bd,</div><div class='del'>-		      "Dell Inspiron E1505n", STAC_9200_DELL_M25),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c0,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c1,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c2,</div><div class='del'>-		      "Dell Latitude D620", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c5,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c7,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c8,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c9,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M24),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ca,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M24),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cb,</div><div class='del'>-		      "Dell Latitude 120L", STAC_9200_DELL_M24),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc,</div><div class='del'>-		      "Dell Latitude D820", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cd,</div><div class='del'>-		      "Dell Inspiron E1705/9400", STAC_9200_DELL_M27),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ce,</div><div class='del'>-		      "Dell XPS M1710", STAC_9200_DELL_M23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf,</div><div class='del'>-		      "Dell Precision M90", STAC_9200_DELL_M23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d3,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d4,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d6,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M22),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d8,</div><div class='del'>-		      "Dell Inspiron 640m", STAC_9200_DELL_M21),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d9,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01da,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01de,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e3,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D23),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e8,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_D21),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ee,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M25),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ef,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M25),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f5,</div><div class='del'>-		      "Dell Inspiron 1501", STAC_9200_DELL_M26),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6,</div><div class='del'>-		      "unknown Dell", STAC_9200_DELL_M26),</div><div class='del'>-	/* Panasonic */</div><div class='del'>-	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC),</div><div class='del'>-	/* Gateway machines needs EAPD to be set on resume */</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_M4),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*", STAC_9200_M4_2),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707", STAC_9200_M4_2),</div><div class='del'>-	/* OQO Mobile */</div><div class='del'>-	SND_PCI_QUIRK(0x1106, 0x3288, "OQO Model 2", STAC_9200_OQO),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref925x_pin_configs[8] = {</div><div class='del'>-	0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,</div><div class='del'>-	0x90a70320, 0x02214210, 0x01019020, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM1_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM1_2_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM2_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM2_2_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM3_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x503303f3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM5_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int stac925xM6_pin_configs[8] = {</div><div class='del'>-	0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,</div><div class='del'>-	0x40a000f0, 0x90100210, 0x400003f1, 0x90330320,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {</div><div class='del'>-	[STAC_REF] = ref925x_pin_configs,</div><div class='del'>-	[STAC_M1] = stac925xM1_pin_configs,</div><div class='del'>-	[STAC_M1_2] = stac925xM1_2_pin_configs,</div><div class='del'>-	[STAC_M2] = stac925xM2_pin_configs,</div><div class='del'>-	[STAC_M2_2] = stac925xM2_2_pin_configs,</div><div class='del'>-	[STAC_M3] = stac925xM3_pin_configs,</div><div class='del'>-	[STAC_M5] = stac925xM5_pin_configs,</div><div class='del'>-	[STAC_M6] = stac925xM6_pin_configs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac925x_models[STAC_925x_MODELS] = {</div><div class='del'>-	[STAC_925x_AUTO] = "auto",</div><div class='del'>-	[STAC_REF] = "ref",</div><div class='del'>-	[STAC_M1] = "m1",</div><div class='del'>-	[STAC_M1_2] = "m1-2",</div><div class='del'>-	[STAC_M2] = "m2",</div><div class='del'>-	[STAC_M2_2] = "m2-2",</div><div class='del'>-	[STAC_M3] = "m3",</div><div class='del'>-	[STAC_M5] = "m5",</div><div class='del'>-	[STAC_M6] = "m6",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_M2),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_M5),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_M1),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0681, "Gateway NX860", STAC_M2),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0367, "Gateway MX6453", STAC_M1_2),</div><div class='del'>-	/* Not sure about the brand name for those */</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M1),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0507, "Gateway mobile", STAC_M3),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0281, "Gateway mobile", STAC_M6),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0685, "Gateway mobile", STAC_M2_2),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac925x_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, "DFI LanParty", STAC_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, "DFI LanParty", STAC_REF),</div><div class='del'>-	SND_PCI_QUIRK(0x8384, 0x7632, "Stac9202 Reference Board", STAC_REF),</div><div class='del'>-</div><div class='del'>-	/* Default table for unknown ID */</div><div class='del'>-	SND_PCI_QUIRK(0x1002, 0x437b, "Gateway mobile", STAC_M2_2),</div><div class='del'>-</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref92hd73xx_pin_configs[13] = {</div><div class='del'>-	0x02214030, 0x02a19040, 0x01a19020, 0x02214030,</div><div class='del'>-	0x0181302e, 0x01014010, 0x01014020, 0x01014030,</div><div class='del'>-	0x02319040, 0x90a000f0, 0x90a000f0, 0x01452050,</div><div class='del'>-	0x01452050,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_m6_pin_configs[13] = {</div><div class='del'>-	0x0321101f, 0x4f00000f, 0x4f0000f0, 0x90170110,</div><div class='del'>-	0x03a11020, 0x0321101f, 0x4f0000f0, 0x4f0000f0,</div><div class='del'>-	0x4f0000f0, 0x90a60160, 0x4f0000f0, 0x4f0000f0,</div><div class='del'>-	0x4f0000f0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int alienware_m17x_pin_configs[13] = {</div><div class='del'>-	0x0321101f, 0x0321101f, 0x03a11020, 0x03014020,</div><div class='del'>-	0x90170110, 0x4f0000f0, 0x4f0000f0, 0x4f0000f0,</div><div class='del'>-	0x4f0000f0, 0x90a60160, 0x4f0000f0, 0x4f0000f0,</div><div class='del'>-	0x904601b0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_dg45id_pin_configs[13] = {</div><div class='del'>-	0x02214230, 0x02A19240, 0x01013214, 0x01014210,</div><div class='del'>-	0x01A19250, 0x01011212, 0x01016211</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {</div><div class='del'>-	[STAC_92HD73XX_REF]	= ref92hd73xx_pin_configs,</div><div class='del'>-	[STAC_DELL_M6_AMIC]	= dell_m6_pin_configs,</div><div class='del'>-	[STAC_DELL_M6_DMIC]	= dell_m6_pin_configs,</div><div class='del'>-	[STAC_DELL_M6_BOTH]	= dell_m6_pin_configs,</div><div class='del'>-	[STAC_DELL_EQ]	= dell_m6_pin_configs,</div><div class='del'>-	[STAC_ALIENWARE_M17X]	= alienware_m17x_pin_configs,</div><div class='del'>-	[STAC_92HD73XX_INTEL]	= intel_dg45id_pin_configs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {</div><div class='del'>-	[STAC_92HD73XX_AUTO] = "auto",</div><div class='del'>-	[STAC_92HD73XX_NO_JD] = "no-jd",</div><div class='del'>-	[STAC_92HD73XX_REF] = "ref",</div><div class='del'>-	[STAC_92HD73XX_INTEL] = "intel",</div><div class='del'>-	[STAC_DELL_M6_AMIC] = "dell-m6-amic",</div><div class='del'>-	[STAC_DELL_M6_DMIC] = "dell-m6-dmic",</div><div class='del'>-	[STAC_DELL_M6_BOTH] = "dell-m6",</div><div class='del'>-	[STAC_DELL_EQ] = "dell-eq",</div><div class='del'>-	[STAC_ALIENWARE_M17X] = "alienware",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-				"DFI LanParty", STAC_92HD73XX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-				"DFI LanParty", STAC_92HD73XX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002,</div><div class='del'>-				"Intel DG45ID", STAC_92HD73XX_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003,</div><div class='del'>-				"Intel DG45FC", STAC_92HD73XX_INTEL),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254,</div><div class='del'>-				"Dell Studio 1535", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_BOTH),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_BOTH),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_AMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0272,</div><div class='del'>-				"unknown Dell", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f,</div><div class='del'>-				"Dell Studio 1537", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,</div><div class='del'>-				"Dell Studio 17", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be,</div><div class='del'>-				"Dell Studio 1555", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,</div><div class='del'>-				"Dell Studio 1557", STAC_DELL_M6_DMIC),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,</div><div class='del'>-				"Dell Studio XPS 1645", STAC_DELL_M6_BOTH),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,</div><div class='del'>-				"Dell Studio 1558", STAC_DELL_M6_BOTH),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a1,</div><div class='del'>-		      "Alienware M17x", STAC_ALIENWARE_M17X),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref92hd83xxx_pin_configs[10] = {</div><div class='del'>-	0x02214030, 0x02211010, 0x02a19020, 0x02170130,</div><div class='del'>-	0x01014050, 0x01819040, 0x01014020, 0x90a3014e,</div><div class='del'>-	0x01451160, 0x98560170,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_s14_pin_configs[10] = {</div><div class='del'>-	0x0221403f, 0x0221101f, 0x02a19020, 0x90170110,</div><div class='del'>-	0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a60160,</div><div class='del'>-	0x40f000f0, 0x40f000f0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int hp_dv7_4000_pin_configs[10] = {</div><div class='del'>-	0x03a12050, 0x0321201f, 0x40f000f0, 0x90170110,</div><div class='del'>-	0x40f000f0, 0x40f000f0, 0x90170110, 0xd5a30140,</div><div class='del'>-	0x40f000f0, 0x40f000f0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {</div><div class='del'>-	[STAC_92HD83XXX_REF] = ref92hd83xxx_pin_configs,</div><div class='del'>-	[STAC_92HD83XXX_PWR_REF] = ref92hd83xxx_pin_configs,</div><div class='del'>-	[STAC_DELL_S14] = dell_s14_pin_configs,</div><div class='del'>-	[STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {</div><div class='del'>-	[STAC_92HD83XXX_AUTO] = "auto",</div><div class='del'>-	[STAC_92HD83XXX_REF] = "ref",</div><div class='del'>-	[STAC_92HD83XXX_PWR_REF] = "mic-ref",</div><div class='del'>-	[STAC_DELL_S14] = "dell-s14",</div><div class='del'>-	[STAC_92HD83XXX_HP] = "hp",</div><div class='del'>-	[STAC_HP_DV7_4000] = "hp-dv7-4000",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_92HD83XXX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_92HD83XXX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ba,</div><div class='del'>-		      "unknown Dell", STAC_DELL_S14),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600,</div><div class='del'>-		      "HP", STAC_92HD83XXX_HP),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref92hd71bxx_pin_configs[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x02214030, 0x02a19040, 0x01a19020, 0x01014010,</div><div class='del'>-	0x0181302e, 0x01014010, 0x01019020, 0x90a000f0,</div><div class='del'>-	0x90a000f0, 0x01452050, 0x01452050, 0x00000000,</div><div class='del'>-	0x00000000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_m4_1_pin_configs[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,</div><div class='del'>-	0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,</div><div class='del'>-	0x40f000f0, 0x4f0000f0, 0x4f0000f0, 0x00000000,</div><div class='del'>-	0x00000000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_m4_2_pin_configs[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,</div><div class='del'>-	0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,</div><div class='del'>-	0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,</div><div class='del'>-	0x00000000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_m4_3_pin_configs[STAC92HD71BXX_NUM_PINS] = {</div><div class='del'>-	0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,</div><div class='del'>-	0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0,</div><div class='del'>-	0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,</div><div class='del'>-	0x00000000</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {</div><div class='del'>-	[STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,</div><div class='del'>-	[STAC_DELL_M4_1]	= dell_m4_1_pin_configs,</div><div class='del'>-	[STAC_DELL_M4_2]	= dell_m4_2_pin_configs,</div><div class='del'>-	[STAC_DELL_M4_3]	= dell_m4_3_pin_configs,</div><div class='del'>-	[STAC_HP_M4]		= NULL,</div><div class='del'>-	[STAC_HP_DV4]		= NULL,</div><div class='del'>-	[STAC_HP_DV5]		= NULL,</div><div class='del'>-	[STAC_HP_HDX]           = NULL,</div><div class='del'>-	[STAC_HP_DV4_1222NR]	= NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {</div><div class='del'>-	[STAC_92HD71BXX_AUTO] = "auto",</div><div class='del'>-	[STAC_92HD71BXX_REF] = "ref",</div><div class='del'>-	[STAC_DELL_M4_1] = "dell-m4-1",</div><div class='del'>-	[STAC_DELL_M4_2] = "dell-m4-2",</div><div class='del'>-	[STAC_DELL_M4_3] = "dell-m4-3",</div><div class='del'>-	[STAC_HP_M4] = "hp-m4",</div><div class='del'>-	[STAC_HP_DV4] = "hp-dv4",</div><div class='del'>-	[STAC_HP_DV5] = "hp-dv5",</div><div class='del'>-	[STAC_HP_HDX] = "hp-hdx",</div><div class='del'>-	[STAC_HP_DV4_1222NR] = "hp-dv4-1222nr",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_92HD71BXX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_92HD71BXX_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fb,</div><div class='del'>-		      "HP dv4-1222nr", STAC_HP_DV4_1222NR),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x1720,</div><div class='del'>-			  "HP", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3080,</div><div class='del'>-		      "HP", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x30f0,</div><div class='del'>-		      "HP dv4-7", STAC_HP_DV4),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3600,</div><div class='del'>-		      "HP dv4-7", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3610,</div><div class='del'>-		      "HP HDX", STAC_HP_HDX),  /* HDX18 */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,</div><div class='del'>-		      "HP mini 1000", STAC_HP_M4),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b,</div><div class='del'>-		      "HP HDX", STAC_HP_HDX),  /* HDX16 */</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,</div><div class='del'>-		      "HP dv6", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,</div><div class='del'>-		      "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x363e,</div><div class='del'>-		      "HP DV6", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,</div><div class='del'>-		      "HP", STAC_HP_DV5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0234,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0250,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024f,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x024d,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0251,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0277,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_1),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0263,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_2),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0265,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_2),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0262,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_2),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_2),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa,</div><div class='del'>-				"unknown Dell", STAC_DELL_M4_3),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref922x_pin_configs[10] = {</div><div class='del'>-	0x01014010, 0x01016011, 0x01012012, 0x0221401f,</div><div class='del'>-	0x01813122, 0x01011014, 0x01441030, 0x01c41030,</div><div class='del'>-	0x40000100, 0x40000100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 922X pin configs for</div><div class='del'>-    102801A7</div><div class='del'>-    102801AB</div><div class='del'>-    102801A9</div><div class='del'>-    102801D1</div><div class='del'>-    102801D2</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_922x_d81_pin_configs[10] = {</div><div class='del'>-	0x02214030, 0x01a19021, 0x01111012, 0x01114010,</div><div class='del'>-	0x02a19020, 0x01117011, 0x400001f0, 0x400001f1,</div><div class='del'>-	0x01813122, 0x400001f2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 922X pin configs for</div><div class='del'>-    102801AC</div><div class='del'>-    102801D0</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_922x_d82_pin_configs[10] = {</div><div class='del'>-	0x02214030, 0x01a19021, 0x01111012, 0x01114010,</div><div class='del'>-	0x02a19020, 0x01117011, 0x01451140, 0x400001f0,</div><div class='del'>-	0x01813122, 0x400001f1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 922X pin configs for</div><div class='del'>-    102801BF</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_922x_m81_pin_configs[10] = {</div><div class='del'>-	0x0321101f, 0x01112024, 0x01111222, 0x91174220,</div><div class='del'>-	0x03a11050, 0x01116221, 0x90a70330, 0x01452340, </div><div class='del'>-	0x40C003f1, 0x405003f0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9221 A1 pin configs for</div><div class='del'>-    102801D7 (Dell XPS M1210)</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_922x_m82_pin_configs[10] = {</div><div class='del'>-	0x02211211, 0x408103ff, 0x02a1123e, 0x90100310, </div><div class='del'>-	0x408003f1, 0x0221121f, 0x03451340, 0x40c003f2, </div><div class='del'>-	0x508003f3, 0x405003f4, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int d945gtp3_pin_configs[10] = {</div><div class='del'>-	0x0221401f, 0x01a19022, 0x01813021, 0x01014010,</div><div class='del'>-	0x40000100, 0x40000100, 0x40000100, 0x40000100,</div><div class='del'>-	0x02a19120, 0x40000100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int d945gtp5_pin_configs[10] = {</div><div class='del'>-	0x0221401f, 0x01011012, 0x01813024, 0x01014010,</div><div class='del'>-	0x01a19021, 0x01016011, 0x01452130, 0x40000100,</div><div class='del'>-	0x02a19320, 0x40000100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_mac_v1_pin_configs[10] = {</div><div class='del'>-	0x0121e21f, 0x400000ff, 0x9017e110, 0x400000fd,</div><div class='del'>-	0x400000fe, 0x0181e020, 0x1145e030, 0x11c5e240,</div><div class='del'>-	0x400000fc, 0x400000fb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_mac_v2_pin_configs[10] = {</div><div class='del'>-	0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,</div><div class='del'>-	0x400000fe, 0x0181e020, 0x1145e230, 0x500000fa,</div><div class='del'>-	0x400000fc, 0x400000fb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_mac_v3_pin_configs[10] = {</div><div class='del'>-	0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,</div><div class='del'>-	0x400000fe, 0x0181e020, 0x1145e230, 0x11c5e240,</div><div class='del'>-	0x400000fc, 0x400000fb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_mac_v4_pin_configs[10] = {</div><div class='del'>-	0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,</div><div class='del'>-	0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,</div><div class='del'>-	0x400000fc, 0x400000fb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int intel_mac_v5_pin_configs[10] = {</div><div class='del'>-	0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,</div><div class='del'>-	0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,</div><div class='del'>-	0x400000fc, 0x400000fb,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ecs202_pin_configs[10] = {</div><div class='del'>-	0x0221401f, 0x02a19020, 0x01a19020, 0x01114010,</div><div class='del'>-	0x408000f0, 0x01813022, 0x074510a0, 0x40c400f1,</div><div class='del'>-	0x9037012e, 0x40e000f2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {</div><div class='del'>-	[STAC_D945_REF] = ref922x_pin_configs,</div><div class='del'>-	[STAC_D945GTP3] = d945gtp3_pin_configs,</div><div class='del'>-	[STAC_D945GTP5] = d945gtp5_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_V1] = intel_mac_v1_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_V2] = intel_mac_v2_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_V4] = intel_mac_v4_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_V5] = intel_mac_v5_pin_configs,</div><div class='del'>-	[STAC_INTEL_MAC_AUTO] = intel_mac_v3_pin_configs,</div><div class='del'>-	/* for backward compatibility */</div><div class='del'>-	[STAC_MACMINI] = intel_mac_v3_pin_configs,</div><div class='del'>-	[STAC_MACBOOK] = intel_mac_v5_pin_configs,</div><div class='del'>-	[STAC_MACBOOK_PRO_V1] = intel_mac_v3_pin_configs,</div><div class='del'>-	[STAC_MACBOOK_PRO_V2] = intel_mac_v3_pin_configs,</div><div class='del'>-	[STAC_IMAC_INTEL] = intel_mac_v2_pin_configs,</div><div class='del'>-	[STAC_IMAC_INTEL_20] = intel_mac_v3_pin_configs,</div><div class='del'>-	[STAC_ECS_202] = ecs202_pin_configs,</div><div class='del'>-	[STAC_922X_DELL_D81] = dell_922x_d81_pin_configs,</div><div class='del'>-	[STAC_922X_DELL_D82] = dell_922x_d82_pin_configs,	</div><div class='del'>-	[STAC_922X_DELL_M81] = dell_922x_m81_pin_configs,</div><div class='del'>-	[STAC_922X_DELL_M82] = dell_922x_m82_pin_configs,	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac922x_models[STAC_922X_MODELS] = {</div><div class='del'>-	[STAC_922X_AUTO] = "auto",</div><div class='del'>-	[STAC_D945_REF]	= "ref",</div><div class='del'>-	[STAC_D945GTP5]	= "5stack",</div><div class='del'>-	[STAC_D945GTP3]	= "3stack",</div><div class='del'>-	[STAC_INTEL_MAC_V1] = "intel-mac-v1",</div><div class='del'>-	[STAC_INTEL_MAC_V2] = "intel-mac-v2",</div><div class='del'>-	[STAC_INTEL_MAC_V3] = "intel-mac-v3",</div><div class='del'>-	[STAC_INTEL_MAC_V4] = "intel-mac-v4",</div><div class='del'>-	[STAC_INTEL_MAC_V5] = "intel-mac-v5",</div><div class='del'>-	[STAC_INTEL_MAC_AUTO] = "intel-mac-auto",</div><div class='del'>-	/* for backward compatibility */</div><div class='del'>-	[STAC_MACMINI]	= "macmini",</div><div class='del'>-	[STAC_MACBOOK]	= "macbook",</div><div class='del'>-	[STAC_MACBOOK_PRO_V1]	= "macbook-pro-v1",</div><div class='del'>-	[STAC_MACBOOK_PRO_V2]	= "macbook-pro",</div><div class='del'>-	[STAC_IMAC_INTEL] = "imac-intel",</div><div class='del'>-	[STAC_IMAC_INTEL_20] = "imac-intel-20",</div><div class='del'>-	[STAC_ECS_202] = "ecs202",</div><div class='del'>-	[STAC_922X_DELL_D81] = "dell-d81",</div><div class='del'>-	[STAC_922X_DELL_D82] = "dell-d82",</div><div class='del'>-	[STAC_922X_DELL_M81] = "dell-m81",</div><div class='del'>-	[STAC_922X_DELL_M82] = "dell-m82",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac922x_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_D945_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_D945_REF),</div><div class='del'>-	/* Intel 945G based systems */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0101,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0202,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0606,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0601,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0111,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1115,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1116,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1117,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1118,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x1119,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x8826,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5049,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5055,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5048,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0110,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP3),</div><div class='del'>-	/* Intel D945G 5-stack systems */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0404,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0303,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0013,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP5),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0417,</div><div class='del'>-		      "Intel D945G", STAC_D945GTP5),</div><div class='del'>-	/* Intel 945P based systems */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0b0b,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0112,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0d0d,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0909,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0505,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP3),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0707,</div><div class='del'>-		      "Intel D945P", STAC_D945GTP5),</div><div class='del'>-	/* other intel */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x0204,</div><div class='del'>-		      "Intel D945", STAC_D945_REF),</div><div class='del'>-	/* other systems  */</div><div class='del'>-	/* Apple Intel Mac (Mac Mini, MacBook, MacBook Pro...) */</div><div class='del'>-	SND_PCI_QUIRK(0x8384, 0x7680,</div><div class='del'>-		      "Mac", STAC_INTEL_MAC_AUTO),</div><div class='del'>-	/* Dell systems  */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a9,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ab,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ac,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D82),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bf,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_M81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d0,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D82),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d1,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d2,</div><div class='del'>-		      "unknown Dell", STAC_922X_DELL_D81),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,</div><div class='del'>-		      "Dell XPS M1210", STAC_922X_DELL_M82),</div><div class='del'>-	/* ECS/PC Chips boards */</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x1019, 0xf000, 0x2000,</div><div class='del'>-		      "ECS/PC chips", STAC_ECS_202),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref927x_pin_configs[14] = {</div><div class='del'>-	0x02214020, 0x02a19080, 0x0181304e, 0x01014010,</div><div class='del'>-	0x01a19040, 0x01011012, 0x01016011, 0x0101201f, </div><div class='del'>-	0x183301f0, 0x18a001f0, 0x18a001f0, 0x01442070,</div><div class='del'>-	0x01c42190, 0x40000100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int d965_3st_pin_configs[14] = {</div><div class='del'>-	0x0221401f, 0x02a19120, 0x40000100, 0x01014011,</div><div class='del'>-	0x01a19021, 0x01813024, 0x40000100, 0x40000100,</div><div class='del'>-	0x40000100, 0x40000100, 0x40000100, 0x40000100,</div><div class='del'>-	0x40000100, 0x40000100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int d965_5st_pin_configs[14] = {</div><div class='del'>-	0x02214020, 0x02a19080, 0x0181304e, 0x01014010,</div><div class='del'>-	0x01a19040, 0x01011012, 0x01016011, 0x40000100,</div><div class='del'>-	0x40000100, 0x40000100, 0x40000100, 0x01442070,</div><div class='del'>-	0x40000100, 0x40000100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int d965_5st_no_fp_pin_configs[14] = {</div><div class='del'>-	0x40000100, 0x40000100, 0x0181304e, 0x01014010,</div><div class='del'>-	0x01a19040, 0x01011012, 0x01016011, 0x40000100,</div><div class='del'>-	0x40000100, 0x40000100, 0x40000100, 0x01442070,</div><div class='del'>-	0x40000100, 0x40000100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_3st_pin_configs[14] = {</div><div class='del'>-	0x02211230, 0x02a11220, 0x01a19040, 0x01114210,</div><div class='del'>-	0x01111212, 0x01116211, 0x01813050, 0x01112214,</div><div class='del'>-	0x403003fa, 0x90a60040, 0x90a60040, 0x404003fb,</div><div class='del'>-	0x40c003fc, 0x40000100</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {</div><div class='del'>-	[STAC_D965_REF_NO_JD] = ref927x_pin_configs,</div><div class='del'>-	[STAC_D965_REF]  = ref927x_pin_configs,</div><div class='del'>-	[STAC_D965_3ST]  = d965_3st_pin_configs,</div><div class='del'>-	[STAC_D965_5ST]  = d965_5st_pin_configs,</div><div class='del'>-	[STAC_D965_5ST_NO_FP]  = d965_5st_no_fp_pin_configs,</div><div class='del'>-	[STAC_DELL_3ST]  = dell_3st_pin_configs,</div><div class='del'>-	[STAC_DELL_BIOS] = NULL,</div><div class='del'>-	[STAC_927X_VOLKNOB] = NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac927x_models[STAC_927X_MODELS] = {</div><div class='del'>-	[STAC_927X_AUTO]	= "auto",</div><div class='del'>-	[STAC_D965_REF_NO_JD]	= "ref-no-jd",</div><div class='del'>-	[STAC_D965_REF]		= "ref",</div><div class='del'>-	[STAC_D965_3ST]		= "3stack",</div><div class='del'>-	[STAC_D965_5ST]		= "5stack",</div><div class='del'>-	[STAC_D965_5ST_NO_FP]	= "5stack-no-fp",</div><div class='del'>-	[STAC_DELL_3ST]		= "dell-3stack",</div><div class='del'>-	[STAC_DELL_BIOS]	= "dell-bios",</div><div class='del'>-	[STAC_927X_VOLKNOB]	= "volknob",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac927x_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_D965_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_D965_REF),</div><div class='del'>-	 /* Intel 946 based systems */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x3d01, "Intel D946", STAC_D965_3ST),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xa301, "Intel D946", STAC_D965_3ST),</div><div class='del'>-	/* 965 based 3 stack systems */</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2100,</div><div class='del'>-			   "Intel D965", STAC_D965_3ST),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2000,</div><div class='del'>-			   "Intel D965", STAC_D965_3ST),</div><div class='del'>-	/* Dell 3 stack systems */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01ed, "Dell     ", STAC_DELL_3ST),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f4, "Dell     ", STAC_DELL_3ST),</div><div class='del'>-	/* Dell 3 stack systems with verb table in BIOS */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f7, "Dell XPS M1730", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0227, "Dell Vostro 1400  ", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022e, "Dell     ", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell Inspiron 1525", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0242, "Dell     ", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0243, "Dell     ", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_DELL_BIOS),</div><div class='del'>-	/* 965 based 5 stack systems */</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2300,</div><div class='del'>-			   "Intel D965", STAC_D965_5ST),</div><div class='del'>-	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500,</div><div class='del'>-			   "Intel D965", STAC_D965_5ST),</div><div class='del'>-	/* volume-knob fixes */</div><div class='del'>-	SND_PCI_QUIRK_VENDOR(0x10cf, "FSC", STAC_927X_VOLKNOB),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int ref9205_pin_configs[12] = {</div><div class='del'>-	0x40000100, 0x40000100, 0x01016011, 0x01014010,</div><div class='del'>-	0x01813122, 0x01a19021, 0x01019020, 0x40000100,</div><div class='del'>-	0x90a000f0, 0x90a000f0, 0x01441030, 0x01c41030</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9205 pin configs for</div><div class='del'>-    102801F1</div><div class='del'>-    102801F2</div><div class='del'>-    102801FC</div><div class='del'>-    102801FD</div><div class='del'>-    10280204</div><div class='del'>-    1028021F</div><div class='del'>-    10280228 (Dell Vostro 1500)</div><div class='del'>-    10280229 (Dell Vostro 1700)</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_9205_m42_pin_configs[12] = {</div><div class='del'>-	0x0321101F, 0x03A11020, 0x400003FA, 0x90170310,</div><div class='del'>-	0x400003FB, 0x400003FC, 0x400003FD, 0x40F000F9,</div><div class='del'>-	0x90A60330, 0x400003FF, 0x0144131F, 0x40C003FE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    STAC 9205 pin configs for</div><div class='del'>-    102801F9</div><div class='del'>-    102801FA</div><div class='del'>-    102801FE</div><div class='del'>-    102801FF (Dell Precision M4300)</div><div class='del'>-    10280206</div><div class='del'>-    10280200</div><div class='del'>-    10280201</div><div class='del'>-*/</div><div class='del'>-static unsigned int dell_9205_m43_pin_configs[12] = {</div><div class='del'>-	0x0321101f, 0x03a11020, 0x90a70330, 0x90170310,</div><div class='del'>-	0x400000fe, 0x400000ff, 0x400000fd, 0x40f000f9,</div><div class='del'>-	0x400000fa, 0x400000fc, 0x0144131f, 0x40c003f8,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int dell_9205_m44_pin_configs[12] = {</div><div class='del'>-	0x0421101f, 0x04a11020, 0x400003fa, 0x90170310,</div><div class='del'>-	0x400003fb, 0x400003fc, 0x400003fd, 0x400003f9,</div><div class='del'>-	0x90a60330, 0x400003ff, 0x01441340, 0x40c003fe,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {</div><div class='del'>-	[STAC_9205_REF] = ref9205_pin_configs,</div><div class='del'>-	[STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,</div><div class='del'>-	[STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,</div><div class='del'>-	[STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,</div><div class='del'>-	[STAC_9205_EAPD] = NULL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac9205_models[STAC_9205_MODELS] = {</div><div class='del'>-	[STAC_9205_AUTO] = "auto",</div><div class='del'>-	[STAC_9205_REF] = "ref",</div><div class='del'>-	[STAC_9205_DELL_M42] = "dell-m42",</div><div class='del'>-	[STAC_9205_DELL_M43] = "dell-m43",</div><div class='del'>-	[STAC_9205_DELL_M44] = "dell-m44",</div><div class='del'>-	[STAC_9205_EAPD] = "eapd",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac9205_cfg_tbl[] = {</div><div class='del'>-	/* SigmaTel reference board */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,</div><div class='del'>-		      "DFI LanParty", STAC_9205_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0xfb30,</div><div class='del'>-		      "SigmaTel", STAC_9205_REF),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101,</div><div class='del'>-		      "DFI LanParty", STAC_9205_REF),</div><div class='del'>-	/* Dell */</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,</div><div class='del'>-		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,</div><div class='del'>-		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fa,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fc,</div><div class='del'>-		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,</div><div class='del'>-		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fe,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ff,</div><div class='del'>-		      "Dell Precision M4300", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0204,</div><div class='del'>-		      "unknown Dell", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0206,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,</div><div class='del'>-		      "Dell Precision", STAC_9205_DELL_M43),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021f,</div><div class='del'>-		      "Dell Inspiron", STAC_9205_DELL_M44),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0228,</div><div class='del'>-		      "Dell Vostro 1500", STAC_9205_DELL_M42),</div><div class='del'>-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0229,</div><div class='del'>-		      "Dell Vostro 1700", STAC_9205_DELL_M42),</div><div class='del'>-	/* Gateway */</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0560, "Gateway T6834c", STAC_9205_EAPD),</div><div class='del'>-	SND_PCI_QUIRK(0x107b, 0x0565, "Gateway T1616", STAC_9205_EAPD),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void stac92xx_set_config_regs(struct hda_codec *codec,</div><div class='del'>-				     unsigned int *pincfgs)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (!pincfgs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pins; i++)</div><div class='del'>-		if (spec-&gt;pin_nids[i] &amp;&amp; pincfgs[i])</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, spec-&gt;pin_nids[i],</div><div class='del'>-						 pincfgs[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog playback callbacks</div><div class='del'>- */</div><div class='del'>-static int stac92xx_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (spec-&gt;stream_delay)</div><div class='del'>-		msleep(spec-&gt;stream_delay);</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 unsigned int stream_tag,</div><div class='del'>-					 unsigned int format,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_prepare(codec, &amp;spec-&gt;multiout, stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_analog_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital playback callbacks</div><div class='del'>- */</div><div class='del'>-static int stac92xx_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-					  struct hda_codec *codec,</div><div class='del'>-					  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-					   struct hda_codec *codec,</div><div class='del'>-					   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					 struct hda_codec *codec,</div><div class='del'>-					 unsigned int stream_tag,</div><div class='del'>-					 unsigned int format,</div><div class='del'>-					 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-					     stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture callbacks</div><div class='del'>- */</div><div class='del'>-static int stac92xx_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					unsigned int stream_tag,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = spec-&gt;adc_nids[substream-&gt;number];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;powerdown_adcs) {</div><div class='del'>-		msleep(40);</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-			AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-	}</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = spec-&gt;adc_nids[substream-&gt;number];</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, nid);</div><div class='del'>-	if (spec-&gt;powerdown_adcs)</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-			AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream stac92xx_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in stac92xx_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = stac92xx_dig_playback_pcm_open,</div><div class='del'>-		.close = stac92xx_dig_playback_pcm_close,</div><div class='del'>-		.prepare = stac92xx_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = stac92xx_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream stac92xx_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in stac92xx_build_pcms */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream stac92xx_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x02, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = stac92xx_playback_pcm_open,</div><div class='del'>-		.prepare = stac92xx_playback_pcm_prepare,</div><div class='del'>-		.cleanup = stac92xx_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x06, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = stac92xx_playback_pcm_open,</div><div class='del'>-		.prepare = stac92xx_playback_pcm_prepare,</div><div class='del'>-		.cleanup = stac92xx_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream stac92xx_pcm_analog_capture = {</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID + .substreams is set in stac92xx_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = stac92xx_capture_pcm_prepare,</div><div class='del'>-		.cleanup = stac92xx_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stac92xx_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = "STAC92xx Analog";</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-		spec-&gt;multiout.dac_nids[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adc_nids[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec-&gt;num_adcs;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;alt_switch) {</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info++;</div><div class='del'>-		info-&gt;name = "STAC92xx Analog Alt";</div><div class='del'>-		info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_alt_playback;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid || spec-&gt;dig_in_nid) {</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info++;</div><div class='del'>-		info-&gt;name = "STAC92xx Digital";</div><div class='del'>-		info-&gt;pcm_type = spec-&gt;autocfg.dig_out_type[0];</div><div class='del'>-		if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_digital_playback;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;dig_in_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_digital_capture;</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int stac92xx_get_default_vref(struct hda_codec *codec,</div><div class='del'>-					hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-	pincap = (pincap &amp; AC_PINCAP_VREF) &gt;&gt; AC_PINCAP_VREF_SHIFT;</div><div class='del'>-	if (pincap &amp; AC_PINCAP_VREF_100)</div><div class='del'>-		return AC_PINCTL_VREF_100;</div><div class='del'>-	if (pincap &amp; AC_PINCAP_VREF_80)</div><div class='del'>-		return AC_PINCTL_VREF_80;</div><div class='del'>-	if (pincap &amp; AC_PINCAP_VREF_50)</div><div class='del'>-		return AC_PINCTL_VREF_50;</div><div class='del'>-	if (pincap &amp; AC_PINCAP_VREF_GRD)</div><div class='del'>-		return AC_PINCTL_VREF_GRD;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-				  AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define stac92xx_hp_switch_info		snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int stac92xx_hp_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = !!spec-&gt;hp_switch;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-</div><div class='del'>-static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int nid = kcontrol-&gt;private_value;</div><div class='del'>- </div><div class='del'>-	spec-&gt;hp_switch = ucontrol-&gt;value.integer.value[0] ? nid : 0;</div><div class='del'>-</div><div class='del'>-	/* check to be sure that the ports are upto date with</div><div class='del'>-	 * switch changes</div><div class='del'>-	 */</div><div class='del'>-	stac_issue_unsol_event(codec, nid);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	static char *texts[] = {</div><div class='del'>-		"Mic In", "Line In", "Line Out"</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-</div><div class='del'>-	if (nid == spec-&gt;mic_switch || nid == spec-&gt;line_switch)</div><div class='del'>-		i = 3;</div><div class='del'>-	else</div><div class='del'>-		i = 2;</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = i;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= i)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = i-1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dc_bias_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int vref = stac92xx_vref_get(codec, nid);</div><div class='del'>-</div><div class='del'>-	if (vref == stac92xx_get_default_vref(codec, nid))</div><div class='del'>-		ucontrol-&gt;value.enumerated.item[0] = 0;</div><div class='del'>-	else if (vref == AC_PINCTL_VREF_GRD)</div><div class='del'>-		ucontrol-&gt;value.enumerated.item[0] = 1;</div><div class='del'>-	else if (vref == AC_PINCTL_VREF_HIZ)</div><div class='del'>-		ucontrol-&gt;value.enumerated.item[0] = 2;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	unsigned int new_vref = 0;</div><div class='del'>-	int error;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-</div><div class='del'>-	if (ucontrol-&gt;value.enumerated.item[0] == 0)</div><div class='del'>-		new_vref = stac92xx_get_default_vref(codec, nid);</div><div class='del'>-	else if (ucontrol-&gt;value.enumerated.item[0] == 1)</div><div class='del'>-		new_vref = AC_PINCTL_VREF_GRD;</div><div class='del'>-	else if (ucontrol-&gt;value.enumerated.item[0] == 2)</div><div class='del'>-		new_vref = AC_PINCTL_VREF_HIZ;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (new_vref != stac92xx_vref_get(codec, nid)) {</div><div class='del'>-		error = stac92xx_vref_set(codec, nid, new_vref);</div><div class='del'>-		return error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	static char *texts[2];</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (kcontrol-&gt;private_value == spec-&gt;line_switch)</div><div class='del'>-		texts[0] = "Line In";</div><div class='del'>-	else</div><div class='del'>-		texts[0] = "Mic In";</div><div class='del'>-	texts[1] = "Line Out";</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	int io_idx = (nid == spec-&gt;mic_switch) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;io_switch[io_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	int io_idx = (nid == spec-&gt;mic_switch) ? 1 : 0;</div><div class='del'>-	unsigned short val = !!ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-</div><div class='del'>-	spec-&gt;io_switch[io_idx] = val;</div><div class='del'>-</div><div class='del'>-	if (val)</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);</div><div class='del'>-	else {</div><div class='del'>-		unsigned int pinctl = AC_PINCTL_IN_EN;</div><div class='del'>-		if (io_idx) /* set VREF for mic */</div><div class='del'>-			pinctl |= stac92xx_get_default_vref(codec, nid);</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, nid, pinctl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check the auto-mute again: we need to mute/unmute the speaker</div><div class='del'>-	 * appropriately according to the pin direction</div><div class='del'>-	 */</div><div class='del'>-	if (spec-&gt;hp_detect)</div><div class='del'>-		stac_issue_unsol_event(codec, nid);</div><div class='del'>-</div><div class='del'>-        return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define stac92xx_clfe_switch_info snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int stac92xx_clfe_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-		struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = spec-&gt;clfe_swap;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_clfe_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-		struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	unsigned int val = !!ucontrol-&gt;value.integer.value[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;clfe_swap == val)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;clfe_swap = val;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,</div><div class='del'>-		spec-&gt;clfe_swap ? 0x4 : 0x0);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define STAC_CODEC_HP_SWITCH(xname) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-	  .name = xname, \</div><div class='del'>-	  .index = 0, \</div><div class='del'>-	  .info = stac92xx_hp_switch_info, \</div><div class='del'>-	  .get = stac92xx_hp_switch_get, \</div><div class='del'>-	  .put = stac92xx_hp_switch_put, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define STAC_CODEC_IO_SWITCH(xname, xpval) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-	  .name = xname, \</div><div class='del'>-	  .index = 0, \</div><div class='del'>-          .info = stac92xx_io_switch_info, \</div><div class='del'>-          .get = stac92xx_io_switch_get, \</div><div class='del'>-          .put = stac92xx_io_switch_put, \</div><div class='del'>-          .private_value = xpval, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define STAC_CODEC_CLFE_SWITCH(xname, xpval) \</div><div class='del'>-	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \</div><div class='del'>-	  .name = xname, \</div><div class='del'>-	  .index = 0, \</div><div class='del'>-	  .info = stac92xx_clfe_switch_info, \</div><div class='del'>-	  .get = stac92xx_clfe_switch_get, \</div><div class='del'>-	  .put = stac92xx_clfe_switch_put, \</div><div class='del'>-	  .private_value = xpval, \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STAC_CTL_WIDGET_VOL,</div><div class='del'>-	STAC_CTL_WIDGET_MUTE,</div><div class='del'>-	STAC_CTL_WIDGET_MUTE_BEEP,</div><div class='del'>-	STAC_CTL_WIDGET_MONO_MUX,</div><div class='del'>-	STAC_CTL_WIDGET_HP_SWITCH,</div><div class='del'>-	STAC_CTL_WIDGET_IO_SWITCH,</div><div class='del'>-	STAC_CTL_WIDGET_CLFE_SWITCH,</div><div class='del'>-	STAC_CTL_WIDGET_DC_BIAS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92xx_control_templates[] = {</div><div class='del'>-	HDA_CODEC_VOLUME(NULL, 0, 0, 0),</div><div class='del'>-	HDA_CODEC_MUTE(NULL, 0, 0, 0),</div><div class='del'>-	HDA_CODEC_MUTE_BEEP(NULL, 0, 0, 0),</div><div class='del'>-	STAC_MONO_MUX,</div><div class='del'>-	STAC_CODEC_HP_SWITCH(NULL),</div><div class='del'>-	STAC_CODEC_IO_SWITCH(NULL, 0),</div><div class='del'>-	STAC_CODEC_CLFE_SWITCH(NULL, 0),</div><div class='del'>-	DC_BIAS(NULL, 0, 0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* add dynamic controls */</div><div class='del'>-static struct snd_kcontrol_new *</div><div class='del'>-stac_control_new(struct sigmatel_spec *spec,</div><div class='del'>-		 struct snd_kcontrol_new *ktemp,</div><div class='del'>-		 const char *name,</div><div class='del'>-		 unsigned int subdev)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;kctls, sizeof(*knew), 32);</div><div class='del'>-	knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return NULL;</div><div class='del'>-	*knew = *ktemp;</div><div class='del'>-	knew-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (!knew-&gt;name) {</div><div class='del'>-		/* roolback */</div><div class='del'>-		memset(knew, 0, sizeof(*knew));</div><div class='del'>-		spec-&gt;kctls.alloced--;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	knew-&gt;subdevice = subdev;</div><div class='del'>-	return knew;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_add_control_temp(struct sigmatel_spec *spec,</div><div class='del'>-				     struct snd_kcontrol_new *ktemp,</div><div class='del'>-				     int idx, const char *name,</div><div class='del'>-				     unsigned long val)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew = stac_control_new(spec, ktemp, name,</div><div class='del'>-							 HDA_SUBDEV_AMP_FLAG);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	knew-&gt;index = idx;</div><div class='del'>-	knew-&gt;private_value = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int stac92xx_add_control_idx(struct sigmatel_spec *spec,</div><div class='del'>-					   int type, int idx, const char *name,</div><div class='del'>-					   unsigned long val)</div><div class='del'>-{</div><div class='del'>-	return stac92xx_add_control_temp(spec,</div><div class='del'>-					 &amp;stac92xx_control_templates[type],</div><div class='del'>-					 idx, name, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* add dynamic controls */</div><div class='del'>-static inline int stac92xx_add_control(struct sigmatel_spec *spec, int type,</div><div class='del'>-				       const char *name, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	return stac92xx_add_control_idx(spec, type, 0, name, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac_input_src_temp = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.name = "Input Source",</div><div class='del'>-	.info = stac92xx_mux_enum_info,</div><div class='del'>-	.get = stac92xx_mux_enum_get,</div><div class='del'>-	.put = stac92xx_mux_enum_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline int stac92xx_add_jack_mode_control(struct hda_codec *codec,</div><div class='del'>-						hda_nid_t nid, int idx)</div><div class='del'>-{</div><div class='del'>-	int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	int control = 0;</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	char name[22];</div><div class='del'>-</div><div class='del'>-	if (snd_hda_get_input_pin_attr(def_conf) != INPUT_PIN_ATTR_INT) {</div><div class='del'>-		if (stac92xx_get_default_vref(codec, nid) == AC_PINCTL_VREF_GRD</div><div class='del'>-			&amp;&amp; nid == spec-&gt;line_switch)</div><div class='del'>-			control = STAC_CTL_WIDGET_IO_SWITCH;</div><div class='del'>-		else if (snd_hda_query_pin_caps(codec, nid)</div><div class='del'>-			&amp; (AC_PINCAP_VREF_GRD &lt;&lt; AC_PINCAP_VREF_SHIFT))</div><div class='del'>-			control = STAC_CTL_WIDGET_DC_BIAS;</div><div class='del'>-		else if (nid == spec-&gt;mic_switch)</div><div class='del'>-			control = STAC_CTL_WIDGET_IO_SWITCH;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (control) {</div><div class='del'>-		strcpy(name, hda_get_input_pin_label(codec, nid, 1));</div><div class='del'>-		return stac92xx_add_control(codec-&gt;spec, control,</div><div class='del'>-					strcat(name, " Jack Mode"), nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_add_input_source(struct sigmatel_spec *spec)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;auto_mic)</div><div class='del'>-		return 0; /* no need for input source */</div><div class='del'>-	if (!spec-&gt;num_adcs || imux-&gt;num_items &lt;= 1)</div><div class='del'>-		return 0; /* no need for input source control */</div><div class='del'>-	knew = stac_control_new(spec, &amp;stac_input_src_temp,</div><div class='del'>-				stac_input_src_temp.name, 0);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	knew-&gt;count = spec-&gt;num_adcs;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check whether the line-input can be used as line-out */</div><div class='del'>-static hda_nid_t check_line_out_switch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	unsigned int pincap;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_out_type != AUTO_PIN_LINE_OUT)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_LINE_IN) {</div><div class='del'>-			nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-			pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-			if (pincap &amp; AC_PINCAP_OUT)</div><div class='del'>-				return nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid);</div><div class='del'>-</div><div class='del'>-/* check whether the mic-input can be used as line-out */</div><div class='del'>-static hda_nid_t check_mic_out_switch(struct hda_codec *codec, hda_nid_t *dac)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int def_conf, pincap;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	*dac = 0;</div><div class='del'>-	if (cfg-&gt;line_out_type != AUTO_PIN_LINE_OUT)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (cfg-&gt;inputs[i].type != AUTO_PIN_MIC)</div><div class='del'>-			continue;</div><div class='del'>-		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		/* some laptops have an internal analog microphone</div><div class='del'>-		 * which can't be used as a output */</div><div class='del'>-		if (snd_hda_get_input_pin_attr(def_conf) != INPUT_PIN_ATTR_INT) {</div><div class='del'>-			pincap = snd_hda_query_pin_caps(codec, nid);</div><div class='del'>-			if (pincap &amp; AC_PINCAP_OUT) {</div><div class='del'>-				*dac = get_unassigned_dac(codec, nid);</div><div class='del'>-				if (*dac)</div><div class='del'>-					return nid;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++) {</div><div class='del'>-		if (spec-&gt;multiout.dac_nids[i] == nid)</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_all_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	if (is_in_dac_nids(spec, nid))</div><div class='del'>-		return 1;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++)</div><div class='del'>-		if (spec-&gt;hp_dacs[i] == nid)</div><div class='del'>-			return 1;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++)</div><div class='del'>-		if (spec-&gt;speaker_dacs[i] == nid)</div><div class='del'>-			return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int j, conn_len;</div><div class='del'>-	hda_nid_t conn[HDA_MAX_CONNECTIONS];</div><div class='del'>-	unsigned int wcaps, wtype;</div><div class='del'>-</div><div class='del'>-	conn_len = snd_hda_get_connections(codec, nid, conn,</div><div class='del'>-					   HDA_MAX_CONNECTIONS);</div><div class='del'>-	/* 92HD88: trace back up the link of nids to find the DAC */</div><div class='del'>-	while (conn_len == 1 &amp;&amp; (get_wcaps_type(get_wcaps(codec, conn[0]))</div><div class='del'>-					!= AC_WID_AUD_OUT)) {</div><div class='del'>-		nid = conn[0];</div><div class='del'>-		conn_len = snd_hda_get_connections(codec, nid, conn,</div><div class='del'>-			HDA_MAX_CONNECTIONS);</div><div class='del'>-	}</div><div class='del'>-	for (j = 0; j &lt; conn_len; j++) {</div><div class='del'>-		wcaps = get_wcaps(codec, conn[j]);</div><div class='del'>-		wtype = get_wcaps_type(wcaps);</div><div class='del'>-		/* we check only analog outputs */</div><div class='del'>-		if (wtype != AC_WID_AUD_OUT || (wcaps &amp; AC_WCAP_DIGITAL))</div><div class='del'>-			continue;</div><div class='del'>-		/* if this route has a free DAC, assign it */</div><div class='del'>-		if (!check_all_dac_nids(spec, conn[j])) {</div><div class='del'>-			if (conn_len &gt; 1) {</div><div class='del'>-				/* select this DAC in the pin's input mux */</div><div class='del'>-				snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-						  AC_VERB_SET_CONNECT_SEL, j);</div><div class='del'>-			}</div><div class='del'>-			return conn[j];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* if all DACs are already assigned, connect to the primary DAC */</div><div class='del'>-	if (conn_len &gt; 1) {</div><div class='del'>-		for (j = 0; j &lt; conn_len; j++) {</div><div class='del'>-			if (conn[j] == spec-&gt;multiout.dac_nids[0]) {</div><div class='del'>-				snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-						  AC_VERB_SET_CONNECT_SEL, j);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid);</div><div class='del'>-static int add_spec_extra_dacs(struct sigmatel_spec *spec, hda_nid_t nid);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Fill in the dac_nids table from the parsed pin configuration</div><div class='del'>- * This function only works when every pin in line_out_pins[]</div><div class='del'>- * contains atleast one DAC in its connection list. Some 92xx</div><div class='del'>- * codecs are not connected directly to a DAC, such as the 9200</div><div class='del'>- * and 9202/925x. For those, dac_nids[] must be hard-coded.</div><div class='del'>- */</div><div class='del'>-static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid, dac;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		dac = get_unassigned_dac(codec, nid);</div><div class='del'>-		if (!dac) {</div><div class='del'>-			if (spec-&gt;multiout.num_dacs &gt; 0) {</div><div class='del'>-				/* we have already working output pins,</div><div class='del'>-				 * so let's drop the broken ones again</div><div class='del'>-				 */</div><div class='del'>-				cfg-&gt;line_outs = spec-&gt;multiout.num_dacs;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* error out, no available DAC found */</div><div class='del'>-			snd_printk(KERN_ERR</div><div class='del'>-				   "%s: No available DAC for pin 0x%x\n",</div><div class='del'>-				   __func__, nid);</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-		add_spec_dacs(spec, dac);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;hp_pins[i];</div><div class='del'>-		dac = get_unassigned_dac(codec, nid);</div><div class='del'>-		if (dac) {</div><div class='del'>-			if (!spec-&gt;multiout.hp_nid)</div><div class='del'>-				spec-&gt;multiout.hp_nid = dac;</div><div class='del'>-			else</div><div class='del'>-				add_spec_extra_dacs(spec, dac);</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;hp_dacs[i] = dac;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;speaker_outs; i++) {</div><div class='del'>-		nid = cfg-&gt;speaker_pins[i];</div><div class='del'>-		dac = get_unassigned_dac(codec, nid);</div><div class='del'>-		if (dac)</div><div class='del'>-			add_spec_extra_dacs(spec, dac);</div><div class='del'>-		spec-&gt;speaker_dacs[i] = dac;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* add line-in as output */</div><div class='del'>-	nid = check_line_out_switch(codec);</div><div class='del'>-	if (nid) {</div><div class='del'>-		dac = get_unassigned_dac(codec, nid);</div><div class='del'>-		if (dac) {</div><div class='del'>-			snd_printdd("STAC: Add line-in 0x%x as output %d\n",</div><div class='del'>-				    nid, cfg-&gt;line_outs);</div><div class='del'>-			cfg-&gt;line_out_pins[cfg-&gt;line_outs] = nid;</div><div class='del'>-			cfg-&gt;line_outs++;</div><div class='del'>-			spec-&gt;line_switch = nid;</div><div class='del'>-			add_spec_dacs(spec, dac);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* add mic as output */</div><div class='del'>-	nid = check_mic_out_switch(codec, &amp;dac);</div><div class='del'>-	if (nid &amp;&amp; dac) {</div><div class='del'>-		snd_printdd("STAC: Add mic-in 0x%x as output %d\n",</div><div class='del'>-			    nid, cfg-&gt;line_outs);</div><div class='del'>-		cfg-&gt;line_out_pins[cfg-&gt;line_outs] = nid;</div><div class='del'>-		cfg-&gt;line_outs++;</div><div class='del'>-		spec-&gt;mic_switch = nid;</div><div class='del'>-		add_spec_dacs(spec, dac);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_printd("stac92xx: dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",</div><div class='del'>-		   spec-&gt;multiout.num_dacs,</div><div class='del'>-		   spec-&gt;multiout.dac_nids[0],</div><div class='del'>-		   spec-&gt;multiout.dac_nids[1],</div><div class='del'>-		   spec-&gt;multiout.dac_nids[2],</div><div class='del'>-		   spec-&gt;multiout.dac_nids[3],</div><div class='del'>-		   spec-&gt;multiout.dac_nids[4]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create volume control/switch for the given prefx type */</div><div class='del'>-static int create_controls_idx(struct hda_codec *codec, const char *pfx,</div><div class='del'>-			       int idx, hda_nid_t nid, int chs)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	char name[32];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;check_volume_offset) {</div><div class='del'>-		unsigned int caps, step, nums, db_scale;</div><div class='del'>-		caps = query_amp_caps(codec, nid, HDA_OUTPUT);</div><div class='del'>-		step = (caps &amp; AC_AMPCAP_STEP_SIZE) &gt;&gt;</div><div class='del'>-			AC_AMPCAP_STEP_SIZE_SHIFT;</div><div class='del'>-		step = (step + 1) * 25; /* in .01dB unit */</div><div class='del'>-		nums = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt;</div><div class='del'>-			AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-		db_scale = nums * step;</div><div class='del'>-		/* if dB scale is over -64dB, and finer enough,</div><div class='del'>-		 * let's reduce it to half</div><div class='del'>-		 */</div><div class='del'>-		if (db_scale &gt; 6400 &amp;&amp; nums &gt;= 0x1f)</div><div class='del'>-			spec-&gt;volume_offset = nums / 2;</div><div class='del'>-		spec-&gt;check_volume_offset = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf(name, "%s Playback Volume", pfx);</div><div class='del'>-	err = stac92xx_add_control_idx(spec, STAC_CTL_WIDGET_VOL, idx, name,</div><div class='del'>-		HDA_COMPOSE_AMP_VAL_OFS(nid, chs, 0, HDA_OUTPUT,</div><div class='del'>-					spec-&gt;volume_offset));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	sprintf(name, "%s Playback Switch", pfx);</div><div class='del'>-	err = stac92xx_add_control_idx(spec, STAC_CTL_WIDGET_MUTE, idx, name,</div><div class='del'>-				   HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define create_controls(codec, pfx, nid, chs) \</div><div class='del'>-	create_controls_idx(codec, pfx, 0, nid, chs)</div><div class='del'>-</div><div class='del'>-static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (spec-&gt;multiout.num_dacs &gt; 4) {</div><div class='del'>-		printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-		spec-&gt;multiout.dac_nids[spec-&gt;multiout.num_dacs] = nid;</div><div class='del'>-		spec-&gt;multiout.num_dacs++;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int add_spec_extra_dacs(struct sigmatel_spec *spec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(spec-&gt;multiout.extra_out_nid); i++) {</div><div class='del'>-		if (!spec-&gt;multiout.extra_out_nid[i]) {</div><div class='del'>-			spec-&gt;multiout.extra_out_nid[i] = nid;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "stac92xx: No space for extra DAC 0x%x\n", nid);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Create output controls</div><div class='del'>- * The mixer elements are named depending on the given type (AUTO_PIN_XXX_OUT)</div><div class='del'>- */</div><div class='del'>-static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,</div><div class='del'>-				 const hda_nid_t *pins,</div><div class='del'>-				 const hda_nid_t *dac_nids,</div><div class='del'>-				 int type)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	static const char *chname[4] = {</div><div class='del'>-		"Front", "Surround", NULL /*CLFE*/, "Side"</div><div class='del'>-	};</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i, err;</div><div class='del'>-	unsigned int wid_caps;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_outs &amp;&amp; i &lt; ARRAY_SIZE(chname); i++) {</div><div class='del'>-		if (type == AUTO_PIN_HP_OUT &amp;&amp; !spec-&gt;hp_detect) {</div><div class='del'>-			wid_caps = get_wcaps(codec, pins[i]);</div><div class='del'>-			if (wid_caps &amp; AC_WCAP_UNSOL_CAP)</div><div class='del'>-				spec-&gt;hp_detect = 1;</div><div class='del'>-		}</div><div class='del'>-		nid = dac_nids[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		if (type != AUTO_PIN_HP_OUT &amp;&amp; i == 2) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = create_controls(codec, "Center", nid, 1);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = create_controls(codec, "LFE", nid, 2);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			wid_caps = get_wcaps(codec, nid);</div><div class='del'>-</div><div class='del'>-			if (wid_caps &amp; AC_WCAP_LR_SWAP) {</div><div class='del'>-				err = stac92xx_add_control(spec,</div><div class='del'>-					STAC_CTL_WIDGET_CLFE_SWITCH,</div><div class='del'>-					"Swap Center/LFE Playback Switch", nid);</div><div class='del'>-</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			const char *name;</div><div class='del'>-			int idx;</div><div class='del'>-			switch (type) {</div><div class='del'>-			case AUTO_PIN_HP_OUT:</div><div class='del'>-				name = "Headphone";</div><div class='del'>-				idx = i;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_PIN_SPEAKER_OUT:</div><div class='del'>-				name = "Speaker";</div><div class='del'>-				idx = i;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				name = chname[i];</div><div class='del'>-				idx = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			err = create_controls_idx(codec, name, idx, nid, 3);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_add_capvol_ctls(struct hda_codec *codec, unsigned long vol,</div><div class='del'>-				    unsigned long sw, int idx)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	err = stac92xx_add_control_idx(codec-&gt;spec, STAC_CTL_WIDGET_VOL, idx,</div><div class='del'>-				       "Capture Volume", vol);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = stac92xx_add_control_idx(codec-&gt;spec, STAC_CTL_WIDGET_MUTE, idx,</div><div class='del'>-				       "Capture Switch", sw);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,</div><div class='del'>-					       const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int err;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	err = create_multi_out_ctls(codec, cfg-&gt;line_outs, cfg-&gt;line_out_pins,</div><div class='del'>-				    spec-&gt;multiout.dac_nids,</div><div class='del'>-				    cfg-&gt;line_out_type);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;hp_outs &gt; 1 &amp;&amp; cfg-&gt;line_out_type == AUTO_PIN_LINE_OUT) {</div><div class='del'>-		err = stac92xx_add_control(spec,</div><div class='del'>-			STAC_CTL_WIDGET_HP_SWITCH,</div><div class='del'>-			"Headphone as Line Out Switch",</div><div class='del'>-			cfg-&gt;hp_pins[cfg-&gt;hp_outs - 1]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; cfg-&gt;num_inputs; idx++) {</div><div class='del'>-		if (cfg-&gt;inputs[idx].type &gt; AUTO_PIN_LINE_IN)</div><div class='del'>-			break;</div><div class='del'>-		nid = cfg-&gt;inputs[idx].pin;</div><div class='del'>-		err = stac92xx_add_jack_mode_control(codec, nid, idx);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for Speaker and HP outputs */</div><div class='del'>-static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,</div><div class='del'>-					struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = create_multi_out_ctls(codec, cfg-&gt;hp_outs, cfg-&gt;hp_pins,</div><div class='del'>-				    spec-&gt;hp_dacs, AUTO_PIN_HP_OUT);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = create_multi_out_ctls(codec, cfg-&gt;speaker_outs, cfg-&gt;speaker_pins,</div><div class='del'>-				    spec-&gt;speaker_dacs, AUTO_PIN_SPEAKER_OUT);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* labels for mono mux outputs */</div><div class='del'>-static const char *stac92xx_mono_labels[4] = {</div><div class='del'>-	"DAC0", "DAC1", "Mixer", "DAC2"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* create mono mux for mono out on capable codecs */</div><div class='del'>-static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *mono_mux = &amp;spec-&gt;private_mono_mux;</div><div class='del'>-	int i, num_cons;</div><div class='del'>-	hda_nid_t con_lst[ARRAY_SIZE(stac92xx_mono_labels)];</div><div class='del'>-</div><div class='del'>-	num_cons = snd_hda_get_connections(codec,</div><div class='del'>-				spec-&gt;mono_nid,</div><div class='del'>-				con_lst,</div><div class='del'>-				HDA_MAX_NUM_INPUTS);</div><div class='del'>-	if (num_cons &lt;= 0 || num_cons &gt; ARRAY_SIZE(stac92xx_mono_labels))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_cons; i++)</div><div class='del'>-		snd_hda_add_imux_item(mono_mux, stac92xx_mono_labels[i], i,</div><div class='del'>-				      NULL);</div><div class='del'>-</div><div class='del'>-	return stac92xx_add_control(spec, STAC_CTL_WIDGET_MONO_MUX,</div><div class='del'>-				"Mono Mux", spec-&gt;mono_nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create PC beep volume controls */</div><div class='del'>-static int stac92xx_auto_create_beep_ctls(struct hda_codec *codec,</div><div class='del'>-						hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	u32 caps = query_amp_caps(codec, nid, HDA_OUTPUT);</div><div class='del'>-	int err, type = STAC_CTL_WIDGET_MUTE_BEEP;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;anabeep_nid == nid)</div><div class='del'>-		type = STAC_CTL_WIDGET_MUTE;</div><div class='del'>-</div><div class='del'>-	/* check for mute support for the the amp */</div><div class='del'>-	if ((caps &amp; AC_AMPCAP_MUTE) &gt;&gt; AC_AMPCAP_MUTE_SHIFT) {</div><div class='del'>-		err = stac92xx_add_control(spec, type,</div><div class='del'>-			"Beep Playback Switch",</div><div class='del'>-			HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check to see if there is volume support for the amp */</div><div class='del'>-	if ((caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT) {</div><div class='del'>-		err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL,</div><div class='del'>-			"Beep Playback Volume",</div><div class='del'>-			HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-#define stac92xx_dig_beep_switch_info snd_ctl_boolean_mono_info</div><div class='del'>-</div><div class='del'>-static int stac92xx_dig_beep_switch_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-					struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = codec-&gt;beep-&gt;enabled;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_dig_beep_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-					struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	return snd_hda_enable_beep_device(codec, ucontrol-&gt;value.integer.value[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.info = stac92xx_dig_beep_switch_info,</div><div class='del'>-	.get = stac92xx_dig_beep_switch_get,</div><div class='del'>-	.put = stac92xx_dig_beep_switch_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stac92xx_beep_switch_ctl(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	return stac92xx_add_control_temp(codec-&gt;spec, &amp;stac92xx_dig_beep_ctrl,</div><div class='del'>-					 0, "Beep Playback Switch", 0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int stac92xx_auto_create_mux_input_ctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, j, err = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_muxes; i++) {</div><div class='del'>-		hda_nid_t nid;</div><div class='del'>-		unsigned int wcaps;</div><div class='del'>-		unsigned long val;</div><div class='del'>-</div><div class='del'>-		nid = spec-&gt;mux_nids[i];</div><div class='del'>-		wcaps = get_wcaps(codec, nid);</div><div class='del'>-		if (!(wcaps &amp; AC_WCAP_OUT_AMP))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* check whether already the same control was created as</div><div class='del'>-		 * normal Capture Volume.</div><div class='del'>-		 */</div><div class='del'>-		val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);</div><div class='del'>-		for (j = 0; j &lt; spec-&gt;num_caps; j++) {</div><div class='del'>-			if (spec-&gt;capvols[j] == val)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (j &lt; spec-&gt;num_caps)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		err = stac92xx_add_control_idx(spec, STAC_CTL_WIDGET_VOL, i,</div><div class='del'>-					       "Mux Capture Volume", val);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac92xx_spdif_labels[3] = {</div><div class='del'>-	"Digital Playback", "Analog Mux 1", "Analog Mux 2",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stac92xx_auto_create_spdif_mux_ctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *spdif_mux = &amp;spec-&gt;private_smux;</div><div class='del'>-	const char **labels = spec-&gt;spdif_labels;</div><div class='del'>-	int i, num_cons;</div><div class='del'>-	hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];</div><div class='del'>-</div><div class='del'>-	num_cons = snd_hda_get_connections(codec,</div><div class='del'>-				spec-&gt;smux_nids[0],</div><div class='del'>-				con_lst,</div><div class='del'>-				HDA_MAX_NUM_INPUTS);</div><div class='del'>-	if (num_cons &lt;= 0)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!labels)</div><div class='del'>-		labels = stac92xx_spdif_labels;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_cons; i++)</div><div class='del'>-		snd_hda_add_imux_item(spdif_mux, labels[i], i, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* labels for dmic mux inputs */</div><div class='del'>-static const char *stac92xx_dmic_labels[5] = {</div><div class='del'>-	"Analog Inputs", "Digital Mic 1", "Digital Mic 2",</div><div class='del'>-	"Digital Mic 3", "Digital Mic 4"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,</div><div class='del'>-				hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	hda_nid_t conn[HDA_MAX_NUM_INPUTS];</div><div class='del'>-	int i, nums;</div><div class='del'>-</div><div class='del'>-	nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));</div><div class='del'>-	for (i = 0; i &lt; nums; i++)</div><div class='del'>-		if (conn[i] == nid)</div><div class='del'>-			return i;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create a volume assigned to the given pin (only if supported) */</div><div class='del'>-/* return 1 if the volume control is created */</div><div class='del'>-static int create_elem_capture_vol(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				   const char *label, int idx, int direction)</div><div class='del'>-{</div><div class='del'>-	unsigned int caps, nums;</div><div class='del'>-	char name[32];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (direction == HDA_OUTPUT)</div><div class='del'>-		caps = AC_WCAP_OUT_AMP;</div><div class='del'>-	else</div><div class='del'>-		caps = AC_WCAP_IN_AMP;</div><div class='del'>-	if (!(get_wcaps(codec, nid) &amp; caps))</div><div class='del'>-		return 0;</div><div class='del'>-	caps = query_amp_caps(codec, nid, direction);</div><div class='del'>-	nums = (caps &amp; AC_AMPCAP_NUM_STEPS) &gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT;</div><div class='del'>-	if (!nums)</div><div class='del'>-		return 0;</div><div class='del'>-	snprintf(name, sizeof(name), "%s Capture Volume", label);</div><div class='del'>-	err = stac92xx_add_control_idx(codec-&gt;spec, STAC_CTL_WIDGET_VOL, idx, name,</div><div class='del'>-				       HDA_COMPOSE_AMP_VAL(nid, 3, 0, direction));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins on dmic capable codecs */</div><div class='del'>-static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux;</div><div class='del'>-	struct hda_input_mux *dimux = &amp;spec-&gt;private_dimux;</div><div class='del'>-	int err, i;</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-</div><div class='del'>-	snd_hda_add_imux_item(dimux, stac92xx_dmic_labels[0], 0, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_dmics; i++) {</div><div class='del'>-		hda_nid_t nid;</div><div class='del'>-		int index, type_idx;</div><div class='del'>-		const char *label;</div><div class='del'>-</div><div class='del'>-		nid = spec-&gt;dmic_nids[i];</div><div class='del'>-		if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)</div><div class='del'>-			continue;</div><div class='del'>-		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		index = get_connection_index(codec, spec-&gt;dmux_nids[0], nid);</div><div class='del'>-		if (index &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		label = hda_get_input_pin_label(codec, nid, 1);</div><div class='del'>-		snd_hda_add_imux_item(dimux, label, index, &amp;type_idx);</div><div class='del'>-</div><div class='del'>-		err = create_elem_capture_vol(codec, nid, label, type_idx,</div><div class='del'>-					      HDA_INPUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (!err) {</div><div class='del'>-			err = create_elem_capture_vol(codec, nid, label,</div><div class='del'>-						      type_idx, HDA_OUTPUT);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1) {</div><div class='del'>-			snd_hda_add_imux_item(imux, label, index, NULL);</div><div class='del'>-			spec-&gt;num_analog_muxes++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int check_mic_pin(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			 hda_nid_t *fixed, hda_nid_t *ext, hda_nid_t *dock)</div><div class='del'>-{</div><div class='del'>-	unsigned int cfg;</div><div class='del'>-</div><div class='del'>-	if (!nid)</div><div class='del'>-		return 0;</div><div class='del'>-	cfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	switch (snd_hda_get_input_pin_attr(cfg)) {</div><div class='del'>-	case INPUT_PIN_ATTR_INT:</div><div class='del'>-		if (*fixed)</div><div class='del'>-			return 1; /* already occupied */</div><div class='del'>-		*fixed = nid;</div><div class='del'>-		break;</div><div class='del'>-	case INPUT_PIN_ATTR_UNUSED:</div><div class='del'>-		break;</div><div class='del'>-	case INPUT_PIN_ATTR_DOCK:</div><div class='del'>-		if (*dock)</div><div class='del'>-			return 1; /* already occupied */</div><div class='del'>-		*dock = nid;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (*ext)</div><div class='del'>-			return 1; /* already occupied */</div><div class='del'>-		*ext = nid;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_mic_route(struct hda_codec *codec,</div><div class='del'>-			 struct sigmatel_mic_route *mic,</div><div class='del'>-			 hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mic-&gt;pin = pin;</div><div class='del'>-	if (pin == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		if (pin == cfg-&gt;inputs[i].pin)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i &lt; cfg-&gt;num_inputs &amp;&amp; cfg-&gt;inputs[i].type == AUTO_PIN_MIC) {</div><div class='del'>-		/* analog pin */</div><div class='del'>-		i = get_connection_index(codec, spec-&gt;mux_nids[0], pin);</div><div class='del'>-		if (i &lt; 0)</div><div class='del'>-			return -1;</div><div class='del'>-		mic-&gt;mux_idx = i;</div><div class='del'>-		mic-&gt;dmux_idx = -1;</div><div class='del'>-		if (spec-&gt;dmux_nids)</div><div class='del'>-			mic-&gt;dmux_idx = get_connection_index(codec,</div><div class='del'>-							     spec-&gt;dmux_nids[0],</div><div class='del'>-							     spec-&gt;mux_nids[0]);</div><div class='del'>-	}  else if (spec-&gt;dmux_nids) {</div><div class='del'>-		/* digital pin */</div><div class='del'>-		i = get_connection_index(codec, spec-&gt;dmux_nids[0], pin);</div><div class='del'>-		if (i &lt; 0)</div><div class='del'>-			return -1;</div><div class='del'>-		mic-&gt;dmux_idx = i;</div><div class='del'>-		mic-&gt;mux_idx = -1;</div><div class='del'>-		if (spec-&gt;mux_nids)</div><div class='del'>-			mic-&gt;mux_idx = get_connection_index(codec,</div><div class='del'>-							    spec-&gt;mux_nids[0],</div><div class='del'>-							    spec-&gt;dmux_nids[0]);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return non-zero if the device is for automatic mic switch */</div><div class='del'>-static int stac_check_auto_mic(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t fixed, ext, dock;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		if (cfg-&gt;inputs[i].type &gt;= AUTO_PIN_LINE_IN)</div><div class='del'>-			return 0; /* must be exclusively mics */</div><div class='del'>-	}</div><div class='del'>-	fixed = ext = dock = 0;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++)</div><div class='del'>-		if (check_mic_pin(codec, cfg-&gt;inputs[i].pin,</div><div class='del'>-		    &amp;fixed, &amp;ext, &amp;dock))</div><div class='del'>-			return 0;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_dmics; i++)</div><div class='del'>-		if (check_mic_pin(codec, spec-&gt;dmic_nids[i],</div><div class='del'>-		    &amp;fixed, &amp;ext, &amp;dock))</div><div class='del'>-			return 0;</div><div class='del'>-	if (!fixed &amp;&amp; !ext &amp;&amp; !dock)</div><div class='del'>-		return 0; /* no input to switch */</div><div class='del'>-	if (!(get_wcaps(codec, ext) &amp; AC_WCAP_UNSOL_CAP))</div><div class='del'>-		return 0; /* no unsol support */</div><div class='del'>-	if (set_mic_route(codec, &amp;spec-&gt;ext_mic, ext) ||</div><div class='del'>-	    set_mic_route(codec, &amp;spec-&gt;int_mic, fixed) ||</div><div class='del'>-	    set_mic_route(codec, &amp;spec-&gt;dock_mic, dock))</div><div class='del'>-		return 0; /* something is wrong */</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux;</div><div class='del'>-	int i, j;</div><div class='del'>-	const char *label;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		int index, err, type_idx;</div><div class='del'>-</div><div class='del'>-		index = -1;</div><div class='del'>-		for (j = 0; j &lt; spec-&gt;num_muxes; j++) {</div><div class='del'>-			index = get_connection_index(codec, spec-&gt;mux_nids[j],</div><div class='del'>-						     nid);</div><div class='del'>-			if (index &gt;= 0)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (index &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-		snd_hda_add_imux_item(imux, label, index, &amp;type_idx);</div><div class='del'>-</div><div class='del'>-		err = create_elem_capture_vol(codec, nid,</div><div class='del'>-					      label, type_idx,</div><div class='del'>-					      HDA_INPUT);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;num_analog_muxes = imux-&gt;num_items;</div><div class='del'>-</div><div class='del'>-	if (imux-&gt;num_items) {</div><div class='del'>-		/*</div><div class='del'>-		 * Set the current input for the muxes.</div><div class='del'>-		 * The STAC9221 has two input muxes with identical source</div><div class='del'>-		 * NID lists.  Hopefully this won't get confused.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;num_muxes; i++) {</div><div class='del'>-			snd_hda_codec_write_cache(codec, spec-&gt;mux_nids[i], 0,</div><div class='del'>-						  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-						  imux-&gt;items[0].index);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++) {</div><div class='del'>-		hda_nid_t pin;</div><div class='del'>-		pin = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		if (pin) /* connect to front */</div><div class='del'>-			stac92xx_auto_set_pinctl(codec, pin, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++) {</div><div class='del'>-		hda_nid_t pin;</div><div class='del'>-		pin = spec-&gt;autocfg.speaker_pins[i];</div><div class='del'>-		if (pin) /* connect to front */</div><div class='del'>-			stac92xx_auto_set_pinctl(codec, pin, AC_PINCTL_OUT_EN);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_dual_headphones(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, valid_hps;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT ||</div><div class='del'>-	    spec-&gt;autocfg.hp_outs &lt;= 1)</div><div class='del'>-		return 0;</div><div class='del'>-	valid_hps = 0;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		unsigned int cfg = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		if (get_defcfg_location(cfg) &amp; AC_JACK_LOC_SEPARATE)</div><div class='del'>-			continue;</div><div class='del'>-		valid_hps++;</div><div class='del'>-	}</div><div class='del'>-	return (valid_hps &gt; 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out, hda_nid_t dig_in)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int hp_swap = 0;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_hda_parse_pin_def_config(codec,</div><div class='del'>-						&amp;spec-&gt;autocfg,</div><div class='del'>-						spec-&gt;dmic_nids)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (! spec-&gt;autocfg.line_outs)</div><div class='del'>-		return 0; /* can't find valid pin config */</div><div class='del'>-</div><div class='del'>-	/* If we have no real line-out pin and multiple hp-outs, HPs should</div><div class='del'>-	 * be set up as multi-channel outputs.</div><div class='del'>-	 */</div><div class='del'>-	if (is_dual_headphones(codec)) {</div><div class='del'>-		/* Copy hp_outs to line_outs, backup line_outs in</div><div class='del'>-		 * speaker_outs so that the following routines can handle</div><div class='del'>-		 * HP pins as primary outputs.</div><div class='del'>-		 */</div><div class='del'>-		snd_printdd("stac92xx: Enabling multi-HPs workaround\n");</div><div class='del'>-		memcpy(spec-&gt;autocfg.speaker_pins, spec-&gt;autocfg.line_out_pins,</div><div class='del'>-		       sizeof(spec-&gt;autocfg.line_out_pins));</div><div class='del'>-		spec-&gt;autocfg.speaker_outs = spec-&gt;autocfg.line_outs;</div><div class='del'>-		memcpy(spec-&gt;autocfg.line_out_pins, spec-&gt;autocfg.hp_pins,</div><div class='del'>-		       sizeof(spec-&gt;autocfg.hp_pins));</div><div class='del'>-		spec-&gt;autocfg.line_outs = spec-&gt;autocfg.hp_outs;</div><div class='del'>-		spec-&gt;autocfg.line_out_type = AUTO_PIN_HP_OUT;</div><div class='del'>-		spec-&gt;autocfg.hp_outs = 0;</div><div class='del'>-		hp_swap = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;autocfg.mono_out_pin) {</div><div class='del'>-		int dir = get_wcaps(codec, spec-&gt;autocfg.mono_out_pin) &amp;</div><div class='del'>-			(AC_WCAP_OUT_AMP | AC_WCAP_IN_AMP);</div><div class='del'>-		u32 caps = query_amp_caps(codec,</div><div class='del'>-				spec-&gt;autocfg.mono_out_pin, dir);</div><div class='del'>-		hda_nid_t conn_list[1];</div><div class='del'>-</div><div class='del'>-		/* get the mixer node and then the mono mux if it exists */</div><div class='del'>-		if (snd_hda_get_connections(codec,</div><div class='del'>-				spec-&gt;autocfg.mono_out_pin, conn_list, 1) &amp;&amp;</div><div class='del'>-				snd_hda_get_connections(codec, conn_list[0],</div><div class='del'>-				conn_list, 1) &gt; 0) {</div><div class='del'>-</div><div class='del'>-				int wcaps = get_wcaps(codec, conn_list[0]);</div><div class='del'>-				int wid_type = get_wcaps_type(wcaps);</div><div class='del'>-				/* LR swap check, some stac925x have a mux that</div><div class='del'>- 				 * changes the DACs output path instead of the</div><div class='del'>- 				 * mono-mux path.</div><div class='del'>- 				 */</div><div class='del'>-				if (wid_type == AC_WID_AUD_SEL &amp;&amp;</div><div class='del'>-						!(wcaps &amp; AC_WCAP_LR_SWAP))</div><div class='del'>-					spec-&gt;mono_nid = conn_list[0];</div><div class='del'>-		}</div><div class='del'>-		if (dir) {</div><div class='del'>-			hda_nid_t nid = spec-&gt;autocfg.mono_out_pin;</div><div class='del'>-</div><div class='del'>-			/* most mono outs have a least a mute/unmute switch */</div><div class='del'>-			dir = (dir &amp; AC_WCAP_OUT_AMP) ? HDA_OUTPUT : HDA_INPUT;</div><div class='del'>-			err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE,</div><div class='del'>-				"Mono Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid, 1, 0, dir));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			/* check for volume support for the amp */</div><div class='del'>-			if ((caps &amp; AC_AMPCAP_NUM_STEPS)</div><div class='del'>-					&gt;&gt; AC_AMPCAP_NUM_STEPS_SHIFT) {</div><div class='del'>-				err = stac92xx_add_control(spec,</div><div class='del'>-					STAC_CTL_WIDGET_VOL,</div><div class='del'>-					"Mono Playback Volume",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid, 1, 0, dir));</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, spec-&gt;autocfg.mono_out_pin,</div><div class='del'>-					 AC_PINCTL_OUT_EN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;multiout.num_dacs) {</div><div class='del'>-		err = stac92xx_auto_fill_dac_nids(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = stac92xx_auto_create_multi_out_ctls(codec,</div><div class='del'>-							  &amp;spec-&gt;autocfg);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* setup analog beep controls */</div><div class='del'>-	if (spec-&gt;anabeep_nid &gt; 0) {</div><div class='del'>-		err = stac92xx_auto_create_beep_ctls(codec,</div><div class='del'>-			spec-&gt;anabeep_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* setup digital beep controls and input device */</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_BEEP</div><div class='del'>-	if (spec-&gt;digbeep_nid &gt; 0) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;digbeep_nid;</div><div class='del'>-		unsigned int caps;</div><div class='del'>-</div><div class='del'>-		err = stac92xx_auto_create_beep_ctls(codec, nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_attach_beep_device(codec, nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		if (codec-&gt;beep) {</div><div class='del'>-			/* IDT/STAC codecs have linear beep tone parameter */</div><div class='del'>-			codec-&gt;beep-&gt;linear_tone = spec-&gt;linear_tone_beep;</div><div class='del'>-			/* if no beep switch is available, make its own one */</div><div class='del'>-			caps = query_amp_caps(codec, nid, HDA_OUTPUT);</div><div class='del'>-			if (!(caps &amp; AC_AMPCAP_MUTE)) {</div><div class='del'>-				err = stac92xx_beep_switch_ctl(codec);</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = stac92xx_auto_create_hp_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* All output parsing done, now restore the swapped hp pins */</div><div class='del'>-	if (hp_swap) {</div><div class='del'>-		memcpy(spec-&gt;autocfg.hp_pins, spec-&gt;autocfg.line_out_pins,</div><div class='del'>-		       sizeof(spec-&gt;autocfg.hp_pins));</div><div class='del'>-		spec-&gt;autocfg.hp_outs = spec-&gt;autocfg.line_outs;</div><div class='del'>-		spec-&gt;autocfg.line_out_type = AUTO_PIN_HP_OUT;</div><div class='del'>-		spec-&gt;autocfg.line_outs = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stac_check_auto_mic(codec)) {</div><div class='del'>-		spec-&gt;auto_mic = 1;</div><div class='del'>-		/* only one capture for auto-mic */</div><div class='del'>-		spec-&gt;num_adcs = 1;</div><div class='del'>-		spec-&gt;num_caps = 1;</div><div class='del'>-		spec-&gt;num_muxes = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_caps; i++) {</div><div class='del'>-		err = stac92xx_add_capvol_ctls(codec, spec-&gt;capvols[i],</div><div class='del'>-					       spec-&gt;capsws[i], i);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = stac92xx_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;mono_nid &gt; 0) {</div><div class='del'>-		err = stac92xx_auto_create_mono_output_ctls(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;num_dmics &gt; 0 &amp;&amp; !spec-&gt;dinput_mux)</div><div class='del'>-		if ((err = stac92xx_auto_create_dmic_input_ctls(codec,</div><div class='del'>-						&amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	if (spec-&gt;num_muxes &gt; 0) {</div><div class='del'>-		err = stac92xx_auto_create_mux_input_ctls(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;num_smuxes &gt; 0) {</div><div class='del'>-		err = stac92xx_auto_create_spdif_mux_ctls(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = stac92xx_add_input_source(spec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-	if (spec-&gt;multiout.max_channels &gt; 2)</div><div class='del'>-		spec-&gt;surr_switch = 1;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = dig_out;</div><div class='del'>-	if (dig_in &amp;&amp; spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = dig_in;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux;</div><div class='del'>-	if (!spec-&gt;dinput_mux)</div><div class='del'>-		spec-&gt;dinput_mux = &amp;spec-&gt;private_dimux;</div><div class='del'>-	spec-&gt;sinput_mux = &amp;spec-&gt;private_smux;</div><div class='del'>-	spec-&gt;mono_mux = &amp;spec-&gt;private_mono_mux;</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for HP output */</div><div class='del'>-static int stac9200_auto_create_hp_ctls(struct hda_codec *codec,</div><div class='del'>-					struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin = cfg-&gt;hp_pins[0];</div><div class='del'>-	unsigned int wid_caps;</div><div class='del'>-</div><div class='del'>-	if (! pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	wid_caps = get_wcaps(codec, pin);</div><div class='del'>-	if (wid_caps &amp; AC_WCAP_UNSOL_CAP)</div><div class='del'>-		spec-&gt;hp_detect = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls for LFE output */</div><div class='del'>-static int stac9200_auto_create_lfe_ctls(struct hda_codec *codec,</div><div class='del'>-					struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-	hda_nid_t lfe_pin = 0x0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * search speaker outs and line outs for a mono speaker pin</div><div class='del'>-	 * with an amp.  If one is found, add LFE controls</div><div class='del'>-	 * for it.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs &amp;&amp; lfe_pin == 0x0; i++) {</div><div class='del'>-		hda_nid_t pin = spec-&gt;autocfg.speaker_pins[i];</div><div class='del'>-		unsigned int wcaps = get_wcaps(codec, pin);</div><div class='del'>-		wcaps &amp;= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);</div><div class='del'>-		if (wcaps == AC_WCAP_OUT_AMP)</div><div class='del'>-			/* found a mono speaker with an amp, must be lfe */</div><div class='del'>-			lfe_pin = pin;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if speaker_outs is 0, then speakers may be in line_outs */</div><div class='del'>-	if (lfe_pin == 0 &amp;&amp; spec-&gt;autocfg.speaker_outs == 0) {</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.line_outs &amp;&amp; lfe_pin == 0x0; i++) {</div><div class='del'>-			hda_nid_t pin = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-			unsigned int defcfg;</div><div class='del'>-			defcfg = snd_hda_codec_get_pincfg(codec, pin);</div><div class='del'>-			if (get_defcfg_device(defcfg) == AC_JACK_SPEAKER) {</div><div class='del'>-				unsigned int wcaps = get_wcaps(codec, pin);</div><div class='del'>-				wcaps &amp;= (AC_WCAP_STEREO | AC_WCAP_OUT_AMP);</div><div class='del'>-				if (wcaps == AC_WCAP_OUT_AMP)</div><div class='del'>-					/* found a mono speaker with an amp,</div><div class='del'>-					   must be lfe */</div><div class='del'>-					lfe_pin = pin;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lfe_pin) {</div><div class='del'>-		err = create_controls(codec, "LFE", lfe_pin, 1);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac9200_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if ((err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if ((err = stac92xx_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if ((err = stac9200_auto_create_hp_ctls(codec, &amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if ((err = stac9200_auto_create_lfe_ctls(codec, &amp;spec-&gt;autocfg)) &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;num_muxes &gt; 0) {</div><div class='del'>-		err = stac92xx_auto_create_mux_input_ctls(codec);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = stac92xx_add_input_source(spec);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = 0x05;</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = 0x04;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux;</div><div class='del'>-	spec-&gt;dinput_mux = &amp;spec-&gt;private_dimux;</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Early 2006 Intel Macintoshes with STAC9220X5 codecs seem to have a</div><div class='del'>- * funky external mute control using GPIO pins.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void stac_gpio_set(struct hda_codec *codec, unsigned int mask,</div><div class='del'>-			  unsigned int dir_mask, unsigned int data)</div><div class='del'>-{</div><div class='del'>-	unsigned int gpiostate, gpiomask, gpiodir;</div><div class='del'>-</div><div class='del'>-	gpiostate = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				       AC_VERB_GET_GPIO_DATA, 0);</div><div class='del'>-	gpiostate = (gpiostate &amp; ~dir_mask) | (data &amp; dir_mask);</div><div class='del'>-</div><div class='del'>-	gpiomask = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				      AC_VERB_GET_GPIO_MASK, 0);</div><div class='del'>-	gpiomask |= mask;</div><div class='del'>-</div><div class='del'>-	gpiodir = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				     AC_VERB_GET_GPIO_DIRECTION, 0);</div><div class='del'>-	gpiodir |= dir_mask;</div><div class='del'>-</div><div class='del'>-	/* Configure GPIOx as CMOS */</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0, 0x7e7, 0);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0,</div><div class='del'>-			    AC_VERB_SET_GPIO_MASK, gpiomask);</div><div class='del'>-	snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-			   AC_VERB_SET_GPIO_DIRECTION, gpiodir); /* sync */</div><div class='del'>-</div><div class='del'>-	msleep(1);</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-			   AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-static void stac92xx_free_jack_priv(struct snd_jack *jack)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_jack *jacks = jack-&gt;private_data;</div><div class='del'>-	jacks-&gt;nid = 0;</div><div class='del'>-	jacks-&gt;jack = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int stac92xx_add_jack(struct hda_codec *codec,</div><div class='del'>-		hda_nid_t nid, int type)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_jack *jack;</div><div class='del'>-	int def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	int connectivity = get_defcfg_connect(def_conf);</div><div class='del'>-	char name[32];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (connectivity &amp;&amp; connectivity != AC_JACK_PORT_FIXED)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;jacks, sizeof(*jack), 32);</div><div class='del'>-	jack = snd_array_new(&amp;spec-&gt;jacks);</div><div class='del'>-	if (!jack)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	jack-&gt;nid = nid;</div><div class='del'>-	jack-&gt;type = type;</div><div class='del'>-</div><div class='del'>-	snprintf(name, sizeof(name), "%s at %s %s Jack",</div><div class='del'>-		snd_hda_get_jack_type(def_conf),</div><div class='del'>-		snd_hda_get_jack_connectivity(def_conf),</div><div class='del'>-		snd_hda_get_jack_location(def_conf));</div><div class='del'>-</div><div class='del'>-	err = snd_jack_new(codec-&gt;bus-&gt;card, name, type, &amp;jack-&gt;jack);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		jack-&gt;nid = 0;</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-	jack-&gt;jack-&gt;private_data = jack;</div><div class='del'>-	jack-&gt;jack-&gt;private_free = stac92xx_free_jack_priv;</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,</div><div class='del'>-			  unsigned char type, int data)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_event *event;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;events, sizeof(*event), 32);</div><div class='del'>-	event = snd_array_new(&amp;spec-&gt;events);</div><div class='del'>-	if (!event)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	event-&gt;nid = nid;</div><div class='del'>-	event-&gt;type = type;</div><div class='del'>-	event-&gt;tag = spec-&gt;events.used;</div><div class='del'>-	event-&gt;data = data;</div><div class='del'>-</div><div class='del'>-	return event-&gt;tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sigmatel_event *stac_get_event(struct hda_codec *codec,</div><div class='del'>-					     hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_event *event = spec-&gt;events.list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;events.used; i++, event++) {</div><div class='del'>-		if (event-&gt;nid == nid)</div><div class='del'>-			return event;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sigmatel_event *stac_get_event_from_tag(struct hda_codec *codec,</div><div class='del'>-						      unsigned char tag)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_event *event = spec-&gt;events.list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;events.used; i++, event++) {</div><div class='del'>-		if (event-&gt;tag == tag)</div><div class='del'>-			return event;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check if given nid is a valid pin and no other events are assigned</div><div class='del'>- * to it.  If OK, assign the event, set the unsol flag, and returns 1.</div><div class='del'>- * Otherwise, returns zero.</div><div class='del'>- */</div><div class='del'>-static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-			     unsigned int type)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_event *event;</div><div class='del'>-	int tag;</div><div class='del'>-</div><div class='del'>-	if (!(get_wcaps(codec, nid) &amp; AC_WCAP_UNSOL_CAP))</div><div class='del'>-		return 0;</div><div class='del'>-	event = stac_get_event(codec, nid);</div><div class='del'>-	if (event) {</div><div class='del'>-		if (event-&gt;type != type)</div><div class='del'>-			return 0;</div><div class='del'>-		tag = event-&gt;tag;</div><div class='del'>-	} else {</div><div class='del'>-		tag = stac_add_event(codec-&gt;spec, nid, type, 0);</div><div class='del'>-		if (tag &lt; 0)</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-	snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-				  AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				  AC_USRSP_EN | tag);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++)</div><div class='del'>-		if (cfg-&gt;hp_pins[i] == nid)</div><div class='del'>-			return 1; /* nid is a HP-Out */</div><div class='del'>-</div><div class='del'>-	return 0; /* nid is not a HP-Out */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void stac92xx_power_down(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	/* power down inactive DACs */</div><div class='del'>-	hda_nid_t *dac;</div><div class='del'>-	for (dac = spec-&gt;dac_list; *dac; dac++)</div><div class='del'>-		if (!check_all_dac_nids(spec, *dac))</div><div class='del'>-			snd_hda_codec_write(codec, *dac, 0,</div><div class='del'>-					AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				  int enable);</div><div class='del'>-</div><div class='del'>-static inline int get_int_hint(struct hda_codec *codec, const char *key,</div><div class='del'>-			       int *valp)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	p = snd_hda_get_hint(codec, key);</div><div class='del'>-	if (p) {</div><div class='del'>-		unsigned long val;</div><div class='del'>-		if (!strict_strtoul(p, 0, &amp;val)) {</div><div class='del'>-			*valp = val;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* override some hints from the hwdep entry */</div><div class='del'>-static void stac_store_hints(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int val;</div><div class='del'>-</div><div class='del'>-	val = snd_hda_get_bool_hint(codec, "hp_detect");</div><div class='del'>-	if (val &gt;= 0)</div><div class='del'>-		spec-&gt;hp_detect = val;</div><div class='del'>-	if (get_int_hint(codec, "gpio_mask", &amp;spec-&gt;gpio_mask)) {</div><div class='del'>-		spec-&gt;eapd_mask = spec-&gt;gpio_dir = spec-&gt;gpio_data =</div><div class='del'>-			spec-&gt;gpio_mask;</div><div class='del'>-	}</div><div class='del'>-	if (get_int_hint(codec, "gpio_dir", &amp;spec-&gt;gpio_dir))</div><div class='del'>-		spec-&gt;gpio_mask &amp;= spec-&gt;gpio_mask;</div><div class='del'>-	if (get_int_hint(codec, "gpio_data", &amp;spec-&gt;gpio_data))</div><div class='del'>-		spec-&gt;gpio_dir &amp;= spec-&gt;gpio_mask;</div><div class='del'>-	if (get_int_hint(codec, "eapd_mask", &amp;spec-&gt;eapd_mask))</div><div class='del'>-		spec-&gt;eapd_mask &amp;= spec-&gt;gpio_mask;</div><div class='del'>-	if (get_int_hint(codec, "gpio_mute", &amp;spec-&gt;gpio_mute))</div><div class='del'>-		spec-&gt;gpio_mute &amp;= spec-&gt;gpio_mask;</div><div class='del'>-	val = snd_hda_get_bool_hint(codec, "eapd_switch");</div><div class='del'>-	if (val &gt;= 0)</div><div class='del'>-		spec-&gt;eapd_switch = val;</div><div class='del'>-	get_int_hint(codec, "gpio_led_polarity", &amp;spec-&gt;gpio_led_polarity);</div><div class='del'>-	if (get_int_hint(codec, "gpio_led", &amp;spec-&gt;gpio_led)) {</div><div class='del'>-		spec-&gt;gpio_mask |= spec-&gt;gpio_led;</div><div class='del'>-		spec-&gt;gpio_dir |= spec-&gt;gpio_led;</div><div class='del'>-		if (spec-&gt;gpio_led_polarity)</div><div class='del'>-			spec-&gt;gpio_data |= spec-&gt;gpio_led;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int gpio;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	snd_hda_sequence_write(codec, spec-&gt;init);</div><div class='del'>-</div><div class='del'>-	/* power down adcs initially */</div><div class='del'>-	if (spec-&gt;powerdown_adcs)</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;num_adcs; i++)</div><div class='del'>-			snd_hda_codec_write(codec,</div><div class='del'>-				spec-&gt;adc_nids[i], 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-</div><div class='del'>-	/* override some hints */</div><div class='del'>-	stac_store_hints(codec);</div><div class='del'>-</div><div class='del'>-	/* set up GPIO */</div><div class='del'>-	gpio = spec-&gt;gpio_data;</div><div class='del'>-	/* turn on EAPD statically when spec-&gt;eapd_switch isn't set.</div><div class='del'>-	 * otherwise, unsol event will turn it on/off dynamically</div><div class='del'>-	 */</div><div class='del'>-	if (!spec-&gt;eapd_switch)</div><div class='del'>-		gpio |= spec-&gt;eapd_mask;</div><div class='del'>-	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, gpio);</div><div class='del'>-</div><div class='del'>-	/* set up pins */</div><div class='del'>-	if (spec-&gt;hp_detect) {</div><div class='del'>-		/* Enable unsolicited responses on the HP widget */</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-			hda_nid_t nid = cfg-&gt;hp_pins[i];</div><div class='del'>-			enable_pin_detect(codec, nid, STAC_HP_EVENT);</div><div class='del'>-		}</div><div class='del'>-		if (cfg-&gt;line_out_type == AUTO_PIN_LINE_OUT &amp;&amp;</div><div class='del'>-		    cfg-&gt;speaker_outs &gt; 0) {</div><div class='del'>-			/* enable pin-detect for line-outs as well */</div><div class='del'>-			for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-				hda_nid_t nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-				enable_pin_detect(codec, nid, STAC_LO_EVENT);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* force to enable the first line-out; the others are set up</div><div class='del'>-		 * in unsol_event</div><div class='del'>-		 */</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, spec-&gt;autocfg.line_out_pins[0],</div><div class='del'>-				AC_PINCTL_OUT_EN);</div><div class='del'>-		/* fake event to set up pins */</div><div class='del'>-		if (cfg-&gt;hp_pins[0])</div><div class='del'>-			stac_issue_unsol_event(codec, cfg-&gt;hp_pins[0]);</div><div class='del'>-		else if (cfg-&gt;line_out_pins[0])</div><div class='del'>-			stac_issue_unsol_event(codec, cfg-&gt;line_out_pins[0]);</div><div class='del'>-	} else {</div><div class='del'>-		stac92xx_auto_init_multi_out(codec);</div><div class='del'>-		stac92xx_auto_init_hp_out(codec);</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;hp_outs; i++)</div><div class='del'>-			stac_toggle_power_map(codec, cfg-&gt;hp_pins[i], 1);</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;auto_mic) {</div><div class='del'>-		/* initialize connection to analog input */</div><div class='del'>-		if (spec-&gt;dmux_nids)</div><div class='del'>-			snd_hda_codec_write_cache(codec, spec-&gt;dmux_nids[0], 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL, 0);</div><div class='del'>-		if (enable_pin_detect(codec, spec-&gt;ext_mic.pin, STAC_MIC_EVENT))</div><div class='del'>-			stac_issue_unsol_event(codec, spec-&gt;ext_mic.pin);</div><div class='del'>-		if (enable_pin_detect(codec, spec-&gt;dock_mic.pin,</div><div class='del'>-		    STAC_MIC_EVENT))</div><div class='del'>-			stac_issue_unsol_event(codec, spec-&gt;dock_mic.pin);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		int type = cfg-&gt;inputs[i].type;</div><div class='del'>-		unsigned int pinctl, conf;</div><div class='del'>-		if (type == AUTO_PIN_MIC) {</div><div class='del'>-			/* for mic pins, force to initialize */</div><div class='del'>-			pinctl = stac92xx_get_default_vref(codec, nid);</div><div class='del'>-			pinctl |= AC_PINCTL_IN_EN;</div><div class='del'>-			stac92xx_auto_set_pinctl(codec, nid, pinctl);</div><div class='del'>-		} else {</div><div class='del'>-			pinctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-			/* if PINCTL already set then skip */</div><div class='del'>-			/* Also, if both INPUT and OUTPUT are set,</div><div class='del'>-			 * it must be a BIOS bug; need to override, too</div><div class='del'>-			 */</div><div class='del'>-			if (!(pinctl &amp; AC_PINCTL_IN_EN) ||</div><div class='del'>-			    (pinctl &amp; AC_PINCTL_OUT_EN)) {</div><div class='del'>-				pinctl &amp;= ~AC_PINCTL_OUT_EN;</div><div class='del'>-				pinctl |= AC_PINCTL_IN_EN;</div><div class='del'>-				stac92xx_auto_set_pinctl(codec, nid, pinctl);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {</div><div class='del'>-			if (enable_pin_detect(codec, nid, STAC_INSERT_EVENT))</div><div class='del'>-				stac_issue_unsol_event(codec, nid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_dmics; i++)</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, spec-&gt;dmic_nids[i],</div><div class='del'>-					AC_PINCTL_IN_EN);</div><div class='del'>-	if (cfg-&gt;dig_out_pins[0])</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, cfg-&gt;dig_out_pins[0],</div><div class='del'>-					 AC_PINCTL_OUT_EN);</div><div class='del'>-	if (cfg-&gt;dig_in_pin)</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, cfg-&gt;dig_in_pin,</div><div class='del'>-					 AC_PINCTL_IN_EN);</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_pwrs; i++)  {</div><div class='del'>-		hda_nid_t nid = spec-&gt;pwr_nids[i];</div><div class='del'>-		int pinctl, def_conf;</div><div class='del'>-</div><div class='del'>-		/* power on when no jack detection is available */</div><div class='del'>-		if (!spec-&gt;hp_detect) {</div><div class='del'>-			stac_toggle_power_map(codec, nid, 1);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (is_nid_hp_pin(cfg, nid))</div><div class='del'>-			continue; /* already has an unsol event */</div><div class='del'>-</div><div class='del'>-		pinctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		/* outputs are only ports capable of power management</div><div class='del'>-		 * any attempts on powering down a input port cause the</div><div class='del'>-		 * referenced VREF to act quirky.</div><div class='del'>-		 */</div><div class='del'>-		if (pinctl &amp; AC_PINCTL_IN_EN) {</div><div class='del'>-			stac_toggle_power_map(codec, nid, 1);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-		def_conf = get_defcfg_connect(def_conf);</div><div class='del'>-		/* skip any ports that don't have jacks since presence</div><div class='del'>- 		 * detection is useless */</div><div class='del'>-		if (def_conf != AC_JACK_PORT_COMPLEX) {</div><div class='del'>-			if (def_conf != AC_JACK_PORT_NONE)</div><div class='del'>-				stac_toggle_power_map(codec, nid, 1);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (enable_pin_detect(codec, nid, STAC_PWR_EVENT))</div><div class='del'>-			stac_issue_unsol_event(codec, nid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sync mute LED */</div><div class='del'>-	if (spec-&gt;gpio_led)</div><div class='del'>-		hda_call_check_power_status(codec, 0x01);</div><div class='del'>-	if (spec-&gt;dac_list)</div><div class='del'>-		stac92xx_power_down(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_free_jacks(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_SND_HDA_INPUT_JACK</div><div class='del'>-	/* free jack instances manually when clearing/reconfiguring */</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	if (!codec-&gt;bus-&gt;shutdown &amp;&amp; spec-&gt;jacks.list) {</div><div class='del'>-		struct sigmatel_jack *jacks = spec-&gt;jacks.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;jacks.used; i++, jacks++) {</div><div class='del'>-			if (jacks-&gt;jack)</div><div class='del'>-				snd_device_free(codec-&gt;bus-&gt;card, jacks-&gt;jack);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;spec-&gt;jacks);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_free_kctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list) {</div><div class='del'>-		struct snd_kcontrol_new *kctl = spec-&gt;kctls.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;kctls.used; i++)</div><div class='del'>-			kfree(kctl[i].name);</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;spec-&gt;kctls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_shutup(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_shutup_pins(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;eapd_mask)</div><div class='del'>-		stac_gpio_set(codec, spec-&gt;gpio_mask,</div><div class='del'>-				spec-&gt;gpio_dir, spec-&gt;gpio_data &amp;</div><div class='del'>-				~spec-&gt;eapd_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (! spec)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	stac92xx_shutup(codec);</div><div class='del'>-	stac92xx_free_jacks(codec);</div><div class='del'>-	snd_array_free(&amp;spec-&gt;events);</div><div class='del'>-</div><div class='del'>-	kfree(spec);</div><div class='del'>-	snd_hda_detach_beep_device(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				unsigned int flag)</div><div class='del'>-{</div><div class='del'>-	unsigned int old_ctl, pin_ctl;</div><div class='del'>-</div><div class='del'>-	pin_ctl = snd_hda_codec_read(codec, nid,</div><div class='del'>-			0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);</div><div class='del'>-</div><div class='del'>-	if (pin_ctl &amp; AC_PINCTL_IN_EN) {</div><div class='del'>-		/*</div><div class='del'>-		 * we need to check the current set-up direction of</div><div class='del'>-		 * shared input pins since they can be switched via</div><div class='del'>-		 * "xxx as Output" mixer switch</div><div class='del'>-		 */</div><div class='del'>-		struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-		if (nid == spec-&gt;line_switch || nid == spec-&gt;mic_switch)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_ctl = pin_ctl;</div><div class='del'>-	/* if setting pin direction bits, clear the current</div><div class='del'>-	   direction bits first */</div><div class='del'>-	if (flag &amp; (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN))</div><div class='del'>-		pin_ctl &amp;= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);</div><div class='del'>-	</div><div class='del'>-	pin_ctl |= flag;</div><div class='del'>-	if (old_ctl != pin_ctl)</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  pin_ctl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				  unsigned int flag)</div><div class='del'>-{</div><div class='del'>-	unsigned int pin_ctl = snd_hda_codec_read(codec, nid,</div><div class='del'>-			0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);</div><div class='del'>-	if (pin_ctl &amp; flag)</div><div class='del'>-		snd_hda_codec_write_cache(codec, nid, 0,</div><div class='del'>-					  AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					  pin_ctl &amp; ~flag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (!nid)</div><div class='del'>-		return 0;</div><div class='del'>-	return snd_hda_jack_detect(codec, nid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_line_out_detect(struct hda_codec *codec,</div><div class='del'>-				     int presence)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-		if (presence)</div><div class='del'>-			break;</div><div class='del'>-		presence = get_pin_presence(codec, cfg-&gt;line_out_pins[i]);</div><div class='del'>-		if (presence) {</div><div class='del'>-			unsigned int pinctl;</div><div class='del'>-			pinctl = snd_hda_codec_read(codec,</div><div class='del'>-						    cfg-&gt;line_out_pins[i], 0,</div><div class='del'>-					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-			if (pinctl &amp; AC_PINCTL_IN_EN)</div><div class='del'>-				presence = 0; /* mic- or line-input */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (presence) {</div><div class='del'>-		/* disable speakers */</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;speaker_outs; i++)</div><div class='del'>-			stac92xx_reset_pinctl(codec, cfg-&gt;speaker_pins[i],</div><div class='del'>-						AC_PINCTL_OUT_EN);</div><div class='del'>-		if (spec-&gt;eapd_mask &amp;&amp; spec-&gt;eapd_switch)</div><div class='del'>-			stac_gpio_set(codec, spec-&gt;gpio_mask,</div><div class='del'>-				spec-&gt;gpio_dir, spec-&gt;gpio_data &amp;</div><div class='del'>-				~spec-&gt;eapd_mask);</div><div class='del'>-	} else {</div><div class='del'>-		/* enable speakers */</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;speaker_outs; i++)</div><div class='del'>-			stac92xx_set_pinctl(codec, cfg-&gt;speaker_pins[i],</div><div class='del'>-						AC_PINCTL_OUT_EN);</div><div class='del'>-		if (spec-&gt;eapd_mask &amp;&amp; spec-&gt;eapd_switch)</div><div class='del'>-			stac_gpio_set(codec, spec-&gt;gpio_mask,</div><div class='del'>-				spec-&gt;gpio_dir, spec-&gt;gpio_data |</div><div class='del'>-				spec-&gt;eapd_mask);</div><div class='del'>-	}</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-/* return non-zero if the hp-pin of the given array index isn't</div><div class='del'>- * a jack-detection target</div><div class='del'>- */</div><div class='del'>-static int no_hp_sensing(struct sigmatel_spec *spec, int i)</div><div class='del'>-{</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-</div><div class='del'>-	/* ignore sensing of shared line and mic jacks */</div><div class='del'>-	if (cfg-&gt;hp_pins[i] == spec-&gt;line_switch)</div><div class='del'>-		return 1;</div><div class='del'>-	if (cfg-&gt;hp_pins[i] == spec-&gt;mic_switch)</div><div class='del'>-		return 1;</div><div class='del'>-	/* ignore if the pin is set as line-out */</div><div class='del'>-	if (cfg-&gt;hp_pins[i] == spec-&gt;hp_switch)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_hp_detect(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i, presence;</div><div class='del'>-</div><div class='del'>-	presence = 0;</div><div class='del'>-	if (spec-&gt;gpio_mute)</div><div class='del'>-		presence = !(snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-			AC_VERB_GET_GPIO_DATA, 0) &amp; spec-&gt;gpio_mute);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		if (presence)</div><div class='del'>-			break;</div><div class='del'>-		if (no_hp_sensing(spec, i))</div><div class='del'>-			continue;</div><div class='del'>-		presence = get_pin_presence(codec, cfg-&gt;hp_pins[i]);</div><div class='del'>-		if (presence) {</div><div class='del'>-			unsigned int pinctl;</div><div class='del'>-			pinctl = snd_hda_codec_read(codec, cfg-&gt;hp_pins[i], 0,</div><div class='del'>-					    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-			if (pinctl &amp; AC_PINCTL_IN_EN)</div><div class='del'>-				presence = 0; /* mic- or line-input */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (presence) {</div><div class='del'>-		/* disable lineouts */</div><div class='del'>-		if (spec-&gt;hp_switch)</div><div class='del'>-			stac92xx_reset_pinctl(codec, spec-&gt;hp_switch,</div><div class='del'>-					      AC_PINCTL_OUT_EN);</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='del'>-			stac92xx_reset_pinctl(codec, cfg-&gt;line_out_pins[i],</div><div class='del'>-						AC_PINCTL_OUT_EN);</div><div class='del'>-	} else {</div><div class='del'>-		/* enable lineouts */</div><div class='del'>-		if (spec-&gt;hp_switch)</div><div class='del'>-			stac92xx_set_pinctl(codec, spec-&gt;hp_switch,</div><div class='del'>-					    AC_PINCTL_OUT_EN);</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;line_outs; i++)</div><div class='del'>-			stac92xx_set_pinctl(codec, cfg-&gt;line_out_pins[i],</div><div class='del'>-						AC_PINCTL_OUT_EN);</div><div class='del'>-	}</div><div class='del'>-	stac92xx_line_out_detect(codec, presence);</div><div class='del'>-	/* toggle hp outs */</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;hp_outs; i++) {</div><div class='del'>-		unsigned int val = AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN;</div><div class='del'>-		if (no_hp_sensing(spec, i))</div><div class='del'>-			continue;</div><div class='del'>-		if (presence)</div><div class='del'>-			stac92xx_set_pinctl(codec, cfg-&gt;hp_pins[i], val);</div><div class='del'>-#if 0 /* FIXME */</div><div class='del'>-/* Resetting the pinctl like below may lead to (a sort of) regressions</div><div class='del'>- * on some devices since they use the HP pin actually for line/speaker</div><div class='del'>- * outs although the default pin config shows a different pin (that is</div><div class='del'>- * wrong and useless).</div><div class='del'>- *</div><div class='del'>- * So, it's basically a problem of default pin configs, likely a BIOS issue.</div><div class='del'>- * But, disabling the code below just works around it, and I'm too tired of</div><div class='del'>- * bug reports with such devices... </div><div class='del'>- */</div><div class='del'>-		else</div><div class='del'>-			stac92xx_reset_pinctl(codec, cfg-&gt;hp_pins[i], val);</div><div class='del'>-#endif /* FIXME */</div><div class='del'>-	}</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				  int enable)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int idx, val;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; spec-&gt;num_pwrs; idx++) {</div><div class='del'>-		if (spec-&gt;pwr_nids[idx] == nid)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (idx &gt;= spec-&gt;num_pwrs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* several codecs have two power down bits */</div><div class='del'>-	if (spec-&gt;pwr_mapping)</div><div class='del'>-		idx = spec-&gt;pwr_mapping[idx];</div><div class='del'>-	else</div><div class='del'>-		idx = 1 &lt;&lt; idx;</div><div class='del'>-</div><div class='del'>-	val = snd_hda_codec_read(codec, codec-&gt;afg, 0, 0x0fec, 0x0) &amp; 0xff;</div><div class='del'>-	if (enable)</div><div class='del'>-		val &amp;= ~idx;</div><div class='del'>-	else</div><div class='del'>-		val |= idx;</div><div class='del'>-</div><div class='del'>-	/* power down unused output ports */</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0, 0x7ec, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	stac_toggle_power_map(codec, nid, get_pin_presence(codec, nid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_report_jack(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_jack *jacks = spec-&gt;jacks.list;</div><div class='del'>-</div><div class='del'>-	if (jacks) {</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;jacks.used; i++) {</div><div class='del'>-			if (jacks-&gt;nid == nid) {</div><div class='del'>-				unsigned int pin_ctl =</div><div class='del'>-					snd_hda_codec_read(codec, nid,</div><div class='del'>-					0, AC_VERB_GET_PIN_WIDGET_CONTROL,</div><div class='del'>-					 0x00);</div><div class='del'>-				int type = jacks-&gt;type;</div><div class='del'>-				if (type == (SND_JACK_LINEOUT</div><div class='del'>-						| SND_JACK_HEADPHONE))</div><div class='del'>-					type = (pin_ctl &amp; AC_PINCTL_HP_EN)</div><div class='del'>-					? SND_JACK_HEADPHONE : SND_JACK_LINEOUT;</div><div class='del'>-				snd_jack_report(jacks-&gt;jack,</div><div class='del'>-					get_pin_presence(codec, nid)</div><div class='del'>-					? type : 0);</div><div class='del'>-			}</div><div class='del'>-			jacks++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the pin connection (fixed, none, etc) */</div><div class='del'>-static unsigned int stac_get_defcfg_connect(struct hda_codec *codec, int idx)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int cfg;</div><div class='del'>-</div><div class='del'>-	cfg = snd_hda_codec_get_pincfg(codec, spec-&gt;pin_nids[idx]);</div><div class='del'>-	return get_defcfg_connect(cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92xx_connected_ports(struct hda_codec *codec,</div><div class='del'>-					 hda_nid_t *nids, int num_nids)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int idx, num;</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-</div><div class='del'>-	for (num = 0; num &lt; num_nids; num++) {</div><div class='del'>-		for (idx = 0; idx &lt; spec-&gt;num_pins; idx++)</div><div class='del'>-			if (spec-&gt;pin_nids[idx] == nids[num])</div><div class='del'>-				break;</div><div class='del'>-		if (idx &gt;= spec-&gt;num_pins)</div><div class='del'>-			break;</div><div class='del'>-		def_conf = stac_get_defcfg_connect(codec, idx);</div><div class='del'>-		if (def_conf == AC_JACK_PORT_NONE)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	return num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_mic_detect(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_mic_route *mic;</div><div class='del'>-</div><div class='del'>-	if (get_pin_presence(codec, spec-&gt;ext_mic.pin))</div><div class='del'>-		mic = &amp;spec-&gt;ext_mic;</div><div class='del'>-	else if (get_pin_presence(codec, spec-&gt;dock_mic.pin))</div><div class='del'>-		mic = &amp;spec-&gt;dock_mic;</div><div class='del'>-	else</div><div class='del'>-		mic = &amp;spec-&gt;int_mic;</div><div class='del'>-	if (mic-&gt;dmux_idx &gt;= 0)</div><div class='del'>-		snd_hda_codec_write_cache(codec, spec-&gt;dmux_nids[0], 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  mic-&gt;dmux_idx);</div><div class='del'>-	if (mic-&gt;mux_idx &gt;= 0)</div><div class='del'>-		snd_hda_codec_write_cache(codec, spec-&gt;mux_nids[0], 0,</div><div class='del'>-					  AC_VERB_SET_CONNECT_SEL,</div><div class='del'>-					  mic-&gt;mux_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_event *event = stac_get_event(codec, nid);</div><div class='del'>-	if (!event)</div><div class='del'>-		return;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event(codec, (unsigned)event-&gt;tag &lt;&lt; 26);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct sigmatel_event *event;</div><div class='del'>-	int tag, data;</div><div class='del'>-</div><div class='del'>-	tag = (res &gt;&gt; 26) &amp; 0x7f;</div><div class='del'>-	event = stac_get_event_from_tag(codec, tag);</div><div class='del'>-	if (!event)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case STAC_HP_EVENT:</div><div class='del'>-	case STAC_LO_EVENT:</div><div class='del'>-		stac92xx_hp_detect(codec);</div><div class='del'>-		break;</div><div class='del'>-	case STAC_MIC_EVENT:</div><div class='del'>-		stac92xx_mic_detect(codec);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case STAC_HP_EVENT:</div><div class='del'>-	case STAC_LO_EVENT:</div><div class='del'>-	case STAC_MIC_EVENT:</div><div class='del'>-	case STAC_INSERT_EVENT:</div><div class='del'>-	case STAC_PWR_EVENT:</div><div class='del'>-		if (spec-&gt;num_pwrs &gt; 0)</div><div class='del'>-			stac92xx_pin_sense(codec, event-&gt;nid);</div><div class='del'>-		stac92xx_report_jack(codec, event-&gt;nid);</div><div class='del'>-</div><div class='del'>-		switch (codec-&gt;subsystem_id) {</div><div class='del'>-		case 0x103c308f:</div><div class='del'>-			if (event-&gt;nid == 0xb) {</div><div class='del'>-				int pin = AC_PINCTL_IN_EN;</div><div class='del'>-</div><div class='del'>-				if (get_pin_presence(codec, 0xa)</div><div class='del'>-						&amp;&amp; get_pin_presence(codec, 0xb))</div><div class='del'>-					pin |= AC_PINCTL_VREF_80;</div><div class='del'>-				if (!get_pin_presence(codec, 0xb))</div><div class='del'>-					pin |= AC_PINCTL_VREF_80;</div><div class='del'>-</div><div class='del'>-				/* toggle VREF state based on mic + hp pin</div><div class='del'>-				 * status</div><div class='del'>-				 */</div><div class='del'>-				stac92xx_auto_set_pinctl(codec, 0x0a, pin);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case STAC_VREF_EVENT:</div><div class='del'>-		data = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-					  AC_VERB_GET_GPIO_DATA, 0);</div><div class='del'>-		/* toggle VREF state based on GPIOx status */</div><div class='del'>-		snd_hda_codec_write(codec, codec-&gt;afg, 0, 0x7e0,</div><div class='del'>-				    !!(data &amp; (1 &lt;&lt; event-&gt;data)));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hp_blike_system(u32 subsystem_id);</div><div class='del'>-</div><div class='del'>-static void set_hp_led_gpio(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int gpio;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;gpio_led)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gpio = snd_hda_param_read(codec, codec-&gt;afg, AC_PAR_GPIO_CAP);</div><div class='del'>-	gpio &amp;= AC_GPIO_IO_COUNT;</div><div class='del'>-	if (gpio &gt; 3)</div><div class='del'>-		spec-&gt;gpio_led = 0x08; /* GPIO 3 */</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;gpio_led = 0x01; /* GPIO 0 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This method searches for the mute LED GPIO configuration</div><div class='del'>- * provided as OEM string in SMBIOS. The format of that string</div><div class='del'>- * is HP_Mute_LED_P_G or HP_Mute_LED_P</div><div class='del'>- * where P can be 0 or 1 and defines mute LED GPIO control state (low/high)</div><div class='del'>- * that corresponds to the NOT muted state of the master volume</div><div class='del'>- * and G is the index of the GPIO to use as the mute LED control (0..9)</div><div class='del'>- * If _G portion is missing it is assigned based on the codec ID</div><div class='del'>- *</div><div class='del'>- * So, HP B-series like systems may have HP_Mute_LED_0 (current models)</div><div class='del'>- * or  HP_Mute_LED_0_3 (future models) OEM SMBIOS strings</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * The dv-series laptops don't seem to have the HP_Mute_LED* strings in</div><div class='del'>- * SMBIOS - at least the ones I have seen do not have them - which include</div><div class='del'>- * my own system (HP Pavilion dv6-1110ax) and my cousin's</div><div class='del'>- * HP Pavilion dv9500t CTO.</div><div class='del'>- * Need more information on whether it is true across the entire series.</div><div class='del'>- * -- kunal</div><div class='del'>- */</div><div class='del'>-static int find_mute_led_gpio(struct hda_codec *codec, int default_polarity)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct dmi_device *dev = NULL;</div><div class='del'>-</div><div class='del'>-	if ((codec-&gt;subsystem_id &gt;&gt; 16) == PCI_VENDOR_ID_HP) {</div><div class='del'>-		while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,</div><div class='del'>-								NULL, dev))) {</div><div class='del'>-			if (sscanf(dev-&gt;name, "HP_Mute_LED_%d_%d",</div><div class='del'>-				  &amp;spec-&gt;gpio_led_polarity,</div><div class='del'>-				  &amp;spec-&gt;gpio_led) == 2) {</div><div class='del'>-				spec-&gt;gpio_led = 1 &lt;&lt; spec-&gt;gpio_led;</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			if (sscanf(dev-&gt;name, "HP_Mute_LED_%d",</div><div class='del'>-				  &amp;spec-&gt;gpio_led_polarity) == 1) {</div><div class='del'>-				set_hp_led_gpio(codec);</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Fallback case - if we don't find the DMI strings,</div><div class='del'>-		 * we statically set the GPIO - if not a B-series system.</div><div class='del'>-		 */</div><div class='del'>-		if (!hp_blike_system(codec-&gt;subsystem_id)) {</div><div class='del'>-			set_hp_led_gpio(codec);</div><div class='del'>-			spec-&gt;gpio_led_polarity = default_polarity;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int hp_blike_system(u32 subsystem_id)</div><div class='del'>-{</div><div class='del'>-	switch (subsystem_id) {</div><div class='del'>-	case 0x103c1520:</div><div class='del'>-	case 0x103c1521:</div><div class='del'>-	case 0x103c1523:</div><div class='del'>-	case 0x103c1524:</div><div class='del'>-	case 0x103c1525:</div><div class='del'>-	case 0x103c1722:</div><div class='del'>-	case 0x103c1723:</div><div class='del'>-	case 0x103c1724:</div><div class='del'>-	case 0x103c1725:</div><div class='del'>-	case 0x103c1726:</div><div class='del'>-	case 0x103c1727:</div><div class='del'>-	case 0x103c1728:</div><div class='del'>-	case 0x103c1729:</div><div class='del'>-	case 0x103c172a:</div><div class='del'>-	case 0x103c172b:</div><div class='del'>-	case 0x103c307e:</div><div class='del'>-	case 0x103c307f:</div><div class='del'>-	case 0x103c3080:</div><div class='del'>-	case 0x103c3081:</div><div class='del'>-	case 0x103c7007:</div><div class='del'>-	case 0x103c7008:</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='del'>-static void stac92hd_proc_hook(struct snd_info_buffer *buffer,</div><div class='del'>-			       struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (nid == codec-&gt;afg)</div><div class='del'>-		snd_iprintf(buffer, "Power-Map: 0x%02x\n", </div><div class='del'>-			    snd_hda_codec_read(codec, nid, 0, 0x0fec, 0x0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void analog_loop_proc_hook(struct snd_info_buffer *buffer,</div><div class='del'>-				  struct hda_codec *codec,</div><div class='del'>-				  unsigned int verb)</div><div class='del'>-{</div><div class='del'>-	snd_iprintf(buffer, "Analog Loopback: 0x%02x\n",</div><div class='del'>-		    snd_hda_codec_read(codec, codec-&gt;afg, 0, verb, 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* stac92hd71bxx, stac92hd73xx */</div><div class='del'>-static void stac92hd7x_proc_hook(struct snd_info_buffer *buffer,</div><div class='del'>-				 struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	stac92hd_proc_hook(buffer, codec, nid);</div><div class='del'>-	if (nid == codec-&gt;afg)</div><div class='del'>-		analog_loop_proc_hook(buffer, codec, 0xfa0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac9205_proc_hook(struct snd_info_buffer *buffer,</div><div class='del'>-			       struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (nid == codec-&gt;afg)</div><div class='del'>-		analog_loop_proc_hook(buffer, codec, 0xfe0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void stac927x_proc_hook(struct snd_info_buffer *buffer,</div><div class='del'>-			       struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	if (nid == codec-&gt;afg)</div><div class='del'>-		analog_loop_proc_hook(buffer, codec, 0xfeb);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define stac92hd_proc_hook	NULL</div><div class='del'>-#define stac92hd7x_proc_hook	NULL</div><div class='del'>-#define stac9205_proc_hook	NULL</div><div class='del'>-#define stac927x_proc_hook	NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-static int stac92xx_resume(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	stac92xx_init(codec);</div><div class='del'>-	snd_hda_codec_resume_amp(codec);</div><div class='del'>-	snd_hda_codec_resume_cache(codec);</div><div class='del'>-	/* fake event to set up pins again to override cached values */</div><div class='del'>-	if (spec-&gt;hp_detect) {</div><div class='del'>-		if (spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-			stac_issue_unsol_event(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-		else if (spec-&gt;autocfg.line_out_pins[0])</div><div class='del'>-			stac_issue_unsol_event(codec,</div><div class='del'>-					       spec-&gt;autocfg.line_out_pins[0]);</div><div class='del'>-	}</div><div class='del'>-	/* sync mute LED */</div><div class='del'>-	if (spec-&gt;gpio_led)</div><div class='del'>-		hda_call_check_power_status(codec, 0x01);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * using power check for controlling mute led of HP notebooks</div><div class='del'>- * check for mute state only on Speakers (nid = 0x10)</div><div class='del'>- *</div><div class='del'>- * For this feature CONFIG_SND_HDA_POWER_SAVE is needed, otherwise</div><div class='del'>- * the LED is NOT working properly !</div><div class='del'>- *</div><div class='del'>- * Changed name to reflect that it now works for any designated</div><div class='del'>- * model, not just HP HDX.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int stac92xx_hp_check_power_status(struct hda_codec *codec,</div><div class='del'>-					      hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i, muted = 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;multiout.num_dacs; i++) {</div><div class='del'>-		nid = spec-&gt;multiout.dac_nids[i];</div><div class='del'>-		if (!(snd_hda_codec_amp_read(codec, nid, 0, HDA_OUTPUT, 0) &amp;</div><div class='del'>-		      HDA_AMP_MUTE)) {</div><div class='del'>-			muted = 0; /* something heard */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (muted)</div><div class='del'>-		spec-&gt;gpio_data &amp;= ~spec-&gt;gpio_led; /* orange */</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;gpio_data |= spec-&gt;gpio_led; /* white */</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;gpio_led_polarity) {</div><div class='del'>-		/* LED state is inverted on these systems */</div><div class='del'>-		spec-&gt;gpio_data ^= spec-&gt;gpio_led;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	stac92xx_shutup(codec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct hda_codec_ops stac92xx_patch_ops = {</div><div class='del'>-	.build_controls = stac92xx_build_controls,</div><div class='del'>-	.build_pcms = stac92xx_build_pcms,</div><div class='del'>-	.init = stac92xx_init,</div><div class='del'>-	.free = stac92xx_free,</div><div class='del'>-	.unsol_event = stac92xx_unsol_event,</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	.suspend = stac92xx_suspend,</div><div class='del'>-	.resume = stac92xx_resume,</div><div class='del'>-#endif</div><div class='del'>-	.reboot_notify = stac92xx_shutup,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_stac9200(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac9200_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac9200_pin_nids;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, STAC_9200_MODELS,</div><div class='del'>-							stac9200_models,</div><div class='del'>-							stac9200_cfg_tbl);</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-					 stac9200_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = stac9200_dac_nids;</div><div class='del'>-	spec-&gt;adc_nids = stac9200_adc_nids;</div><div class='del'>-	spec-&gt;mux_nids = stac9200_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = 1;</div><div class='del'>-	spec-&gt;num_dmics = 0;</div><div class='del'>-	spec-&gt;num_adcs = 1;</div><div class='del'>-	spec-&gt;num_pwrs = 0;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;board_config == STAC_9200_M4 ||</div><div class='del'>-	    spec-&gt;board_config == STAC_9200_M4_2 ||</div><div class='del'>-	    spec-&gt;board_config == STAC_9200_OQO)</div><div class='del'>-		spec-&gt;init = stac9200_eapd_init;</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;init = stac9200_core_init;</div><div class='del'>-	spec-&gt;mixer = stac9200_mixer;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;board_config == STAC_9200_PANASONIC) {</div><div class='del'>-		spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x09;</div><div class='del'>-		spec-&gt;gpio_data = 0x00;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = stac9200_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* CF-74 has no headphone detection, and the driver should *NOT*</div><div class='del'>-	 * do detection and HP/speaker toggle because the hardware does it.</div><div class='del'>-	 */</div><div class='del'>-	if (spec-&gt;board_config == STAC_9200_PANASONIC)</div><div class='del'>-		spec-&gt;hp_detect = 0;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac925x(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac925x_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac925x_pin_nids;</div><div class='del'>-</div><div class='del'>-	/* Check first for codec ID */</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_codec_sid_config(codec,</div><div class='del'>-							STAC_925x_MODELS,</div><div class='del'>-							stac925x_models,</div><div class='del'>-							stac925x_codec_id_cfg_tbl);</div><div class='del'>-</div><div class='del'>-	/* Now checks for PCI ID, if codec ID is not found */</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		spec-&gt;board_config = snd_hda_check_board_config(codec,</div><div class='del'>-							STAC_925x_MODELS,</div><div class='del'>-							stac925x_models,</div><div class='del'>-							stac925x_cfg_tbl);</div><div class='del'>- again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-					 stac925x_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = 2;</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = stac925x_dac_nids;</div><div class='del'>-	spec-&gt;adc_nids = stac925x_adc_nids;</div><div class='del'>-	spec-&gt;mux_nids = stac925x_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = 1;</div><div class='del'>-	spec-&gt;num_adcs = 1;</div><div class='del'>-	spec-&gt;num_pwrs = 0;</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x83847632: /* STAC9202  */</div><div class='del'>-	case 0x83847633: /* STAC9202D */</div><div class='del'>-	case 0x83847636: /* STAC9251  */</div><div class='del'>-	case 0x83847637: /* STAC9251D */</div><div class='del'>-		spec-&gt;num_dmics = STAC925X_NUM_DMICS;</div><div class='del'>-		spec-&gt;dmic_nids = stac925x_dmic_nids;</div><div class='del'>-		spec-&gt;num_dmuxes = ARRAY_SIZE(stac925x_dmux_nids);</div><div class='del'>-		spec-&gt;dmux_nids = stac925x_dmux_nids;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		spec-&gt;num_dmics = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init = stac925x_core_init;</div><div class='del'>-	spec-&gt;mixer = stac925x_mixer;</div><div class='del'>-	spec-&gt;num_caps = 1;</div><div class='del'>-	spec-&gt;capvols = stac925x_capvols;</div><div class='del'>-	spec-&gt;capsws = stac925x_capsws;</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x8, 0x7);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_925x_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac92hd73xx(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	hda_nid_t conn[STAC92HD73_DAC_COUNT + 2];</div><div class='del'>-	int err = 0;</div><div class='del'>-	int num_dacs;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 0;</div><div class='del'>-	codec-&gt;slave_dig_outs = stac92hd73xx_slave_dig_outs;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac92hd73xx_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac92hd73xx_pin_nids;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec,</div><div class='del'>-							STAC_92HD73XX_MODELS,</div><div class='del'>-							stac92hd73xx_models,</div><div class='del'>-							stac92hd73xx_cfg_tbl);</div><div class='del'>-	/* check codec subsystem id if not found */</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		spec-&gt;board_config =</div><div class='del'>-			snd_hda_check_board_codec_sid_config(codec,</div><div class='del'>-				STAC_92HD73XX_MODELS, stac92hd73xx_models,</div><div class='del'>-				stac92hd73xx_codec_id_cfg_tbl);</div><div class='del'>-again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-				stac92hd73xx_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	num_dacs = snd_hda_get_connections(codec, 0x0a,</div><div class='del'>-			conn, STAC92HD73_DAC_COUNT + 2) - 1;</div><div class='del'>-</div><div class='del'>-	if (num_dacs &lt; 3 || num_dacs &gt; 5) {</div><div class='del'>-		printk(KERN_WARNING "hda_codec: Could not determine "</div><div class='del'>-		       "number of channels defaulting to DAC count\n");</div><div class='del'>-		num_dacs = STAC92HD73_DAC_COUNT;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;init = stac92hd73xx_core_init;</div><div class='del'>-	switch (num_dacs) {</div><div class='del'>-	case 0x3: /* 6 Channel */</div><div class='del'>-		spec-&gt;aloopback_ctl = stac92hd73xx_6ch_loopback;</div><div class='del'>-		break;</div><div class='del'>-	case 0x4: /* 8 Channel */</div><div class='del'>-		spec-&gt;aloopback_ctl = stac92hd73xx_8ch_loopback;</div><div class='del'>-		break;</div><div class='del'>-	case 0x5: /* 10 Channel */</div><div class='del'>-		spec-&gt;aloopback_ctl = stac92hd73xx_10ch_loopback;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;aloopback_mask = 0x01;</div><div class='del'>-	spec-&gt;aloopback_shift = 8;</div><div class='del'>-</div><div class='del'>-	spec-&gt;digbeep_nid = 0x1c;</div><div class='del'>-	spec-&gt;mux_nids = stac92hd73xx_mux_nids;</div><div class='del'>-	spec-&gt;adc_nids = stac92hd73xx_adc_nids;</div><div class='del'>-	spec-&gt;dmic_nids = stac92hd73xx_dmic_nids;</div><div class='del'>-	spec-&gt;dmux_nids = stac92hd73xx_dmux_nids;</div><div class='del'>-	spec-&gt;smux_nids = stac92hd73xx_smux_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac92hd73xx_mux_nids);</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac92hd73xx_adc_nids);</div><div class='del'>-	spec-&gt;num_dmuxes = ARRAY_SIZE(stac92hd73xx_dmux_nids);</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_caps = STAC92HD73XX_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac92hd73xx_capvols;</div><div class='del'>-	spec-&gt;capsws = stac92hd73xx_capsws;</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;board_config) {</div><div class='del'>-	case STAC_DELL_EQ:</div><div class='del'>-		spec-&gt;init = dell_eq_core_init;</div><div class='del'>-		/* fallthru */</div><div class='del'>-	case STAC_DELL_M6_AMIC:</div><div class='del'>-	case STAC_DELL_M6_DMIC:</div><div class='del'>-	case STAC_DELL_M6_BOTH:</div><div class='del'>-		spec-&gt;num_smuxes = 0;</div><div class='del'>-		spec-&gt;eapd_switch = 0;</div><div class='del'>-</div><div class='del'>-		switch (spec-&gt;board_config) {</div><div class='del'>-		case STAC_DELL_M6_AMIC: /* Analog Mics */</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);</div><div class='del'>-			spec-&gt;num_dmics = 0;</div><div class='del'>-			break;</div><div class='del'>-		case STAC_DELL_M6_DMIC: /* Digital Mics */</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);</div><div class='del'>-			spec-&gt;num_dmics = 1;</div><div class='del'>-			break;</div><div class='del'>-		case STAC_DELL_M6_BOTH: /* Both */</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x0b, 0x90A70170);</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x13, 0x90A60160);</div><div class='del'>-			spec-&gt;num_dmics = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case STAC_ALIENWARE_M17X:</div><div class='del'>-		spec-&gt;num_dmics = STAC92HD73XX_NUM_DMICS;</div><div class='del'>-		spec-&gt;num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);</div><div class='del'>-		spec-&gt;eapd_switch = 0;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		spec-&gt;num_dmics = STAC92HD73XX_NUM_DMICS;</div><div class='del'>-		spec-&gt;num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);</div><div class='del'>-		spec-&gt;eapd_switch = 1;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;board_config != STAC_92HD73XX_REF) {</div><div class='del'>-		/* GPIO0 High = Enable EAPD */</div><div class='del'>-		spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x1;</div><div class='del'>-		spec-&gt;gpio_data = 0x01;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);</div><div class='del'>-	spec-&gt;pwr_nids = stac92hd73xx_pwr_nids;</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x25, 0x27);</div><div class='del'>-</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_92HD73XX_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;board_config == STAC_92HD73XX_NO_JD)</div><div class='del'>-		spec-&gt;hp_detect = 0;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;proc_widget_hook = stac92hd7x_proc_hook;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	if (codec-&gt;vendor_id != 0x111d7605 &amp;&amp;</div><div class='del'>-	    codec-&gt;vendor_id != 0x111d76d1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;subsystem_id) {</div><div class='del'>-	case 0x103c1618:</div><div class='del'>-	case 0x103c1619:</div><div class='del'>-	case 0x103c161a:</div><div class='del'>-	case 0x103c161b:</div><div class='del'>-	case 0x103c161c:</div><div class='del'>-	case 0x103c161d:</div><div class='del'>-	case 0x103c161e:</div><div class='del'>-	case 0x103c161f:</div><div class='del'>-	case 0x103c1620:</div><div class='del'>-	case 0x103c1621:</div><div class='del'>-	case 0x103c1622:</div><div class='del'>-	case 0x103c1623:</div><div class='del'>-</div><div class='del'>-	case 0x103c162a:</div><div class='del'>-	case 0x103c162b:</div><div class='del'>-</div><div class='del'>-	case 0x103c1630:</div><div class='del'>-	case 0x103c1631:</div><div class='del'>-</div><div class='del'>-	case 0x103c1633:</div><div class='del'>-</div><div class='del'>-	case 0x103c1635:</div><div class='del'>-</div><div class='del'>-	case 0x103c164f:</div><div class='del'>-</div><div class='del'>-	case 0x103c1676:</div><div class='del'>-	case 0x103c1677:</div><div class='del'>-	case 0x103c1678:</div><div class='del'>-	case 0x103c1679:</div><div class='del'>-	case 0x103c167a:</div><div class='del'>-	case 0x103c167b:</div><div class='del'>-	case 0x103c167c:</div><div class='del'>-	case 0x103c167d:</div><div class='del'>-	case 0x103c167e:</div><div class='del'>-	case 0x103c167f:</div><div class='del'>-	case 0x103c1680:</div><div class='del'>-	case 0x103c1681:</div><div class='del'>-	case 0x103c1682:</div><div class='del'>-	case 0x103c1683:</div><div class='del'>-	case 0x103c1684:</div><div class='del'>-	case 0x103c1685:</div><div class='del'>-	case 0x103c1686:</div><div class='del'>-	case 0x103c1687:</div><div class='del'>-	case 0x103c1688:</div><div class='del'>-	case 0x103c1689:</div><div class='del'>-	case 0x103c168a:</div><div class='del'>-	case 0x103c168b:</div><div class='del'>-	case 0x103c168c:</div><div class='del'>-	case 0x103c168d:</div><div class='del'>-	case 0x103c168e:</div><div class='del'>-	case 0x103c168f:</div><div class='del'>-	case 0x103c1690:</div><div class='del'>-	case 0x103c1691:</div><div class='del'>-	case 0x103c1692:</div><div class='del'>-</div><div class='del'>-	case 0x103c3587:</div><div class='del'>-	case 0x103c3588:</div><div class='del'>-	case 0x103c3589:</div><div class='del'>-	case 0x103c358a:</div><div class='del'>-</div><div class='del'>-	case 0x103c3667:</div><div class='del'>-	case 0x103c3668:</div><div class='del'>-		/* set BTL amp level to 13.43dB for louder speaker output */</div><div class='del'>-		return snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-						 0x7F4, 0x14);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac92hd83xxx(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];</div><div class='del'>-	int err;</div><div class='del'>-	int num_dacs;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* reset pin power-down; Windows may leave these bits after reboot */</div><div class='del'>-	snd_hda_codec_write_cache(codec, codec-&gt;afg, 0, 0x7EC, 0);</div><div class='del'>-	snd_hda_codec_write_cache(codec, codec-&gt;afg, 0, 0x7ED, 0);</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	codec-&gt;slave_dig_outs = stac92hd83xxx_slave_dig_outs;</div><div class='del'>-	spec-&gt;digbeep_nid = 0x21;</div><div class='del'>-	spec-&gt;dmic_nids = stac92hd83xxx_dmic_nids;</div><div class='del'>-	spec-&gt;dmux_nids = stac92hd83xxx_mux_nids;</div><div class='del'>-	spec-&gt;mux_nids = stac92hd83xxx_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids);</div><div class='del'>-	spec-&gt;adc_nids = stac92hd83xxx_adc_nids;</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);</div><div class='del'>-	spec-&gt;pwr_nids = stac92hd83xxx_pwr_nids;</div><div class='del'>-	spec-&gt;pwr_mapping = stac92hd83xxx_pwr_mapping;</div><div class='del'>-	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;init = stac92hd83xxx_core_init;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac92hd83xxx_pin_nids;</div><div class='del'>-	spec-&gt;num_caps = STAC92HD83XXX_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac92hd83xxx_capvols;</div><div class='del'>-	spec-&gt;capsws = stac92hd83xxx_capsws;</div><div class='del'>-</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec,</div><div class='del'>-							STAC_92HD83XXX_MODELS,</div><div class='del'>-							stac92hd83xxx_models,</div><div class='del'>-							stac92hd83xxx_cfg_tbl);</div><div class='del'>-again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-				stac92hd83xxx_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x111d7666:</div><div class='del'>-	case 0x111d7667:</div><div class='del'>-	case 0x111d7668:</div><div class='del'>-	case 0x111d7669:</div><div class='del'>-	case 0x111d76d1:</div><div class='del'>-	case 0x111d76d9:</div><div class='del'>-		spec-&gt;num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids);</div><div class='del'>-		spec-&gt;pin_nids = stac92hd88xxx_pin_nids;</div><div class='del'>-		spec-&gt;mono_nid = 0;</div><div class='del'>-		spec-&gt;digbeep_nid = 0;</div><div class='del'>-		spec-&gt;num_pwrs = 0;</div><div class='del'>-		break;</div><div class='del'>-	case 0x111d7604:</div><div class='del'>-	case 0x111d76d4:</div><div class='del'>-	case 0x111d7605:</div><div class='del'>-	case 0x111d76d5:</div><div class='del'>-	case 0x111d76e7:</div><div class='del'>-		if (spec-&gt;board_config == STAC_92HD83XXX_PWR_REF)</div><div class='del'>-			break;</div><div class='del'>-		spec-&gt;num_pwrs = 0;</div><div class='del'>-		spec-&gt;num_dmics = stac92xx_connected_ports(codec,</div><div class='del'>-				stac92hd83xxx_dmic_nids,</div><div class='del'>-				STAC92HD83XXX_NUM_DMICS);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	if (find_mute_led_gpio(codec, 0))</div><div class='del'>-		snd_printd("mute LED gpio %d polarity %d\n",</div><div class='del'>-				spec-&gt;gpio_led,</div><div class='del'>-				spec-&gt;gpio_led_polarity);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (spec-&gt;gpio_led) {</div><div class='del'>-		spec-&gt;gpio_mask |= spec-&gt;gpio_led;</div><div class='del'>-		spec-&gt;gpio_dir |= spec-&gt;gpio_led;</div><div class='del'>-		spec-&gt;gpio_data |= spec-&gt;gpio_led;</div><div class='del'>-		/* register check_power_status callback. */</div><div class='del'>-		codec-&gt;patch_ops.check_power_status =</div><div class='del'>-			stac92xx_hp_check_power_status;</div><div class='del'>-	}</div><div class='del'>-#endif	</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x1d, 0);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_92HD83XXX_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* docking output support */</div><div class='del'>-	num_dacs = snd_hda_get_connections(codec, 0xF,</div><div class='del'>-				conn, STAC92HD83_DAC_COUNT + 1) - 1;</div><div class='del'>-	/* skip non-DAC connections */</div><div class='del'>-	while (num_dacs &gt;= 0 &amp;&amp;</div><div class='del'>-			(get_wcaps_type(get_wcaps(codec, conn[num_dacs]))</div><div class='del'>-					!= AC_WID_AUD_OUT))</div><div class='del'>-		num_dacs--;</div><div class='del'>-	/* set port E and F to select the last DAC */</div><div class='del'>-	if (num_dacs &gt;= 0) {</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0xE, 0,</div><div class='del'>-			AC_VERB_SET_CONNECT_SEL, num_dacs);</div><div class='del'>-		snd_hda_codec_write_cache(codec, 0xF, 0,</div><div class='del'>-			AC_VERB_SET_CONNECT_SEL, num_dacs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stac92hd83xxx_set_system_btl_amp(codec);</div><div class='del'>-</div><div class='del'>-	codec-&gt;proc_widget_hook = stac92hd_proc_hook;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac92hd71bxx_connected_smuxes(struct hda_codec *codec,</div><div class='del'>-					  hda_nid_t dig0pin)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	for (idx = 0; idx &lt; spec-&gt;num_pins; idx++)</div><div class='del'>-		if (spec-&gt;pin_nids[idx] == dig0pin)</div><div class='del'>-			break;</div><div class='del'>-	if ((idx + 2) &gt;= spec-&gt;num_pins)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* dig1pin case */</div><div class='del'>-	if (stac_get_defcfg_connect(codec, idx + 1) != AC_JACK_PORT_NONE)</div><div class='del'>-		return 2;</div><div class='del'>-</div><div class='del'>-	/* dig0pin + dig2pin case */</div><div class='del'>-	if (stac_get_defcfg_connect(codec, idx + 2) != AC_JACK_PORT_NONE)</div><div class='del'>-		return 2;</div><div class='del'>-	if (stac_get_defcfg_connect(codec, idx) != AC_JACK_PORT_NONE)</div><div class='del'>-		return 1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* HP dv7 bass switch - GPIO5 */</div><div class='del'>-#define stac_hp_bass_gpio_info	snd_ctl_boolean_mono_info</div><div class='del'>-static int stac_hp_bass_gpio_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = !!(spec-&gt;gpio_data &amp; 0x20);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int stac_hp_bass_gpio_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				 struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int gpio_data;</div><div class='del'>-</div><div class='del'>-	gpio_data = (spec-&gt;gpio_data &amp; ~0x20) |</div><div class='del'>-		(ucontrol-&gt;value.integer.value[0] ? 0x20 : 0);</div><div class='del'>-	if (gpio_data == spec-&gt;gpio_data)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;gpio_data = gpio_data;</div><div class='del'>-	stac_gpio_set(codec, spec-&gt;gpio_mask, spec-&gt;gpio_dir, spec-&gt;gpio_data);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new stac_hp_bass_sw_ctrl = {</div><div class='del'>-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	.info = stac_hp_bass_gpio_info,</div><div class='del'>-	.get = stac_hp_bass_gpio_get,</div><div class='del'>-	.put = stac_hp_bass_gpio_put,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int stac_add_hp_bass_switch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (!stac_control_new(spec, &amp;stac_hp_bass_sw_ctrl,</div><div class='del'>-			      "Bass Speaker Playback Switch", 0))</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spec-&gt;gpio_mask |= 0x20;</div><div class='del'>-	spec-&gt;gpio_dir |= 0x20;</div><div class='del'>-	spec-&gt;gpio_data |= 0x20;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac92hd71bxx(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;</div><div class='del'>-	unsigned int pin_cfg;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 0;</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-	spec-&gt;num_pins = STAC92HD71BXX_NUM_PINS;</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x111d76b6:</div><div class='del'>-	case 0x111d76b7:</div><div class='del'>-		spec-&gt;pin_nids = stac92hd71bxx_pin_nids_4port;</div><div class='del'>-		break;</div><div class='del'>-	case 0x111d7603:</div><div class='del'>-	case 0x111d7608:</div><div class='del'>-		/* On 92HD75Bx 0x27 isn't a pin nid */</div><div class='del'>-		spec-&gt;num_pins--;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	default:</div><div class='del'>-		spec-&gt;pin_nids = stac92hd71bxx_pin_nids_6port;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec,</div><div class='del'>-							STAC_92HD71BXX_MODELS,</div><div class='del'>-							stac92hd71bxx_models,</div><div class='del'>-							stac92hd71bxx_cfg_tbl);</div><div class='del'>-again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-				stac92hd71bxx_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;board_config != STAC_92HD71BXX_REF) {</div><div class='del'>-		/* GPIO0 = EAPD */</div><div class='del'>-		spec-&gt;gpio_mask = 0x01;</div><div class='del'>-		spec-&gt;gpio_dir = 0x01;</div><div class='del'>-		spec-&gt;gpio_data = 0x01;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;dmic_nids = stac92hd71bxx_dmic_nids;</div><div class='del'>-	spec-&gt;dmux_nids = stac92hd71bxx_dmux_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_caps = STAC92HD71BXX_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac92hd71bxx_capvols;</div><div class='del'>-	spec-&gt;capsws = stac92hd71bxx_capsws;</div><div class='del'>-</div><div class='del'>-	switch (codec-&gt;vendor_id) {</div><div class='del'>-	case 0x111d76b6: /* 4 Port without Analog Mixer */</div><div class='del'>-	case 0x111d76b7:</div><div class='del'>-		unmute_init++;</div><div class='del'>-		/* fallthru */</div><div class='del'>-	case 0x111d76b4: /* 6 Port without Analog Mixer */</div><div class='del'>-	case 0x111d76b5:</div><div class='del'>-		spec-&gt;init = stac92hd71bxx_core_init;</div><div class='del'>-		codec-&gt;slave_dig_outs = stac92hd71bxx_slave_dig_outs;</div><div class='del'>-		spec-&gt;num_dmics = stac92xx_connected_ports(codec,</div><div class='del'>-					stac92hd71bxx_dmic_nids,</div><div class='del'>-					STAC92HD71BXX_NUM_DMICS);</div><div class='del'>-		break;</div><div class='del'>-	case 0x111d7608: /* 5 Port with Analog Mixer */</div><div class='del'>-		switch (spec-&gt;board_config) {</div><div class='del'>-		case STAC_HP_M4:</div><div class='del'>-			/* Enable VREF power saving on GPIO1 detect */</div><div class='del'>-			err = stac_add_event(spec, codec-&gt;afg,</div><div class='del'>-					     STAC_VREF_EVENT, 0x02);</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-				AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x02);</div><div class='del'>-			snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-				AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-				AC_USRSP_EN | err);</div><div class='del'>-			spec-&gt;gpio_mask |= 0x02;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if ((codec-&gt;revision_id &amp; 0xf) == 0 ||</div><div class='del'>-		    (codec-&gt;revision_id &amp; 0xf) == 1)</div><div class='del'>-			spec-&gt;stream_delay = 40; /* 40 milliseconds */</div><div class='del'>-</div><div class='del'>-		/* no output amps */</div><div class='del'>-		spec-&gt;num_pwrs = 0;</div><div class='del'>-		/* disable VSW */</div><div class='del'>-		spec-&gt;init = stac92hd71bxx_core_init;</div><div class='del'>-		unmute_init++;</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0f, 0x40f000f0);</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x19, 0x40f000f3);</div><div class='del'>-		stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS - 1] = 0;</div><div class='del'>-		spec-&gt;num_dmics = stac92xx_connected_ports(codec,</div><div class='del'>-					stac92hd71bxx_dmic_nids,</div><div class='del'>-					STAC92HD71BXX_NUM_DMICS - 1);</div><div class='del'>-		break;</div><div class='del'>-	case 0x111d7603: /* 6 Port with Analog Mixer */</div><div class='del'>-		if ((codec-&gt;revision_id &amp; 0xf) == 1)</div><div class='del'>-			spec-&gt;stream_delay = 40; /* 40 milliseconds */</div><div class='del'>-</div><div class='del'>-		/* no output amps */</div><div class='del'>-		spec-&gt;num_pwrs = 0;</div><div class='del'>-		/* fallthru */</div><div class='del'>-	default:</div><div class='del'>-		spec-&gt;init = stac92hd71bxx_core_init;</div><div class='del'>-		codec-&gt;slave_dig_outs = stac92hd71bxx_slave_dig_outs;</div><div class='del'>-		spec-&gt;num_dmics = stac92xx_connected_ports(codec,</div><div class='del'>-					stac92hd71bxx_dmic_nids,</div><div class='del'>-					STAC92HD71BXX_NUM_DMICS);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (get_wcaps(codec, 0xa) &amp; AC_WCAP_IN_AMP)</div><div class='del'>-		snd_hda_sequence_write_cache(codec, unmute_init);</div><div class='del'>-</div><div class='del'>-	/* Some HP machines seem to have unstable codec communications</div><div class='del'>-	 * especially with ATI fglrx driver.  For recovering from the</div><div class='del'>-	 * CORB/RIRB stall, allow the BUS reset and keep always sync</div><div class='del'>-	 */</div><div class='del'>-	if (spec-&gt;board_config == STAC_HP_DV5) {</div><div class='del'>-		codec-&gt;bus-&gt;sync_write = 1;</div><div class='del'>-		codec-&gt;bus-&gt;allow_bus_reset = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;aloopback_ctl = stac92hd71bxx_loopback;</div><div class='del'>-	spec-&gt;aloopback_mask = 0x50;</div><div class='del'>-	spec-&gt;aloopback_shift = 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;powerdown_adcs = 1;</div><div class='del'>-	spec-&gt;digbeep_nid = 0x26;</div><div class='del'>-	spec-&gt;mux_nids = stac92hd71bxx_mux_nids;</div><div class='del'>-	spec-&gt;adc_nids = stac92hd71bxx_adc_nids;</div><div class='del'>-	spec-&gt;smux_nids = stac92hd71bxx_smux_nids;</div><div class='del'>-	spec-&gt;pwr_nids = stac92hd71bxx_pwr_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac92hd71bxx_mux_nids);</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac92hd71bxx_adc_nids);</div><div class='del'>-	spec-&gt;num_dmuxes = ARRAY_SIZE(stac92hd71bxx_dmux_nids);</div><div class='del'>-	spec-&gt;num_smuxes = stac92hd71bxx_connected_smuxes(codec, 0x1e);</div><div class='del'>-</div><div class='del'>-	snd_printdd("Found board config: %d\n", spec-&gt;board_config);</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;board_config) {</div><div class='del'>-	case STAC_HP_M4:</div><div class='del'>-		/* enable internal microphone */</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0e, 0x01813040);</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, 0x0e,</div><div class='del'>-			AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);</div><div class='del'>-		/* fallthru */</div><div class='del'>-	case STAC_DELL_M4_2:</div><div class='del'>-		spec-&gt;num_dmics = 0;</div><div class='del'>-		spec-&gt;num_smuxes = 0;</div><div class='del'>-		spec-&gt;num_dmuxes = 0;</div><div class='del'>-		break;</div><div class='del'>-	case STAC_DELL_M4_1:</div><div class='del'>-	case STAC_DELL_M4_3:</div><div class='del'>-		spec-&gt;num_dmics = 1;</div><div class='del'>-		spec-&gt;num_smuxes = 0;</div><div class='del'>-		spec-&gt;num_dmuxes = 1;</div><div class='del'>-		break;</div><div class='del'>-	case STAC_HP_DV4_1222NR:</div><div class='del'>-		spec-&gt;num_dmics = 1;</div><div class='del'>-		/* I don't know if it needs 1 or 2 smuxes - will wait for</div><div class='del'>-		 * bug reports to fix if needed</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;num_smuxes = 1;</div><div class='del'>-		spec-&gt;num_dmuxes = 1;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	case STAC_HP_DV4:</div><div class='del'>-		spec-&gt;gpio_led = 0x01;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	case STAC_HP_DV5:</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);</div><div class='del'>-		stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN);</div><div class='del'>-		/* HP dv6 gives the headphone pin as a line-out.  Thus we</div><div class='del'>-		 * need to set hp_detect flag here to force to enable HP</div><div class='del'>-		 * detection.</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;hp_detect = 1;</div><div class='del'>-		break;</div><div class='del'>-	case STAC_HP_HDX:</div><div class='del'>-		spec-&gt;num_dmics = 1;</div><div class='del'>-		spec-&gt;num_dmuxes = 1;</div><div class='del'>-		spec-&gt;num_smuxes = 1;</div><div class='del'>-		spec-&gt;gpio_led = 0x08;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (hp_blike_system(codec-&gt;subsystem_id)) {</div><div class='del'>-		pin_cfg = snd_hda_codec_get_pincfg(codec, 0x0f);</div><div class='del'>-		if (get_defcfg_device(pin_cfg) == AC_JACK_LINE_OUT ||</div><div class='del'>-			get_defcfg_device(pin_cfg) == AC_JACK_SPEAKER  ||</div><div class='del'>-			get_defcfg_device(pin_cfg) == AC_JACK_HP_OUT) {</div><div class='del'>-			/* It was changed in the BIOS to just satisfy MS DTM.</div><div class='del'>-			 * Lets turn it back into slaved HP</div><div class='del'>-			 */</div><div class='del'>-			pin_cfg = (pin_cfg &amp; (~AC_DEFCFG_DEVICE))</div><div class='del'>-					| (AC_JACK_HP_OUT &lt;&lt;</div><div class='del'>-						AC_DEFCFG_DEVICE_SHIFT);</div><div class='del'>-			pin_cfg = (pin_cfg &amp; (~(AC_DEFCFG_DEF_ASSOC</div><div class='del'>-							| AC_DEFCFG_SEQUENCE)))</div><div class='del'>-								| 0x1f;</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x0f, pin_cfg);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (find_mute_led_gpio(codec, 1))</div><div class='del'>-		snd_printd("mute LED gpio %d polarity %d\n",</div><div class='del'>-				spec-&gt;gpio_led,</div><div class='del'>-				spec-&gt;gpio_led_polarity);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	if (spec-&gt;gpio_led) {</div><div class='del'>-		spec-&gt;gpio_mask |= spec-&gt;gpio_led;</div><div class='del'>-		spec-&gt;gpio_dir |= spec-&gt;gpio_led;</div><div class='del'>-		spec-&gt;gpio_data |= spec-&gt;gpio_led;</div><div class='del'>-		/* register check_power_status callback. */</div><div class='del'>-		codec-&gt;patch_ops.check_power_status =</div><div class='del'>-			stac92xx_hp_check_power_status;</div><div class='del'>-	}</div><div class='del'>-#endif	</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x21, 0);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_92HD71BXX_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable bass on HP dv7 */</div><div class='del'>-	if (spec-&gt;board_config == STAC_HP_DV4 ||</div><div class='del'>-	    spec-&gt;board_config == STAC_HP_DV5) {</div><div class='del'>-		unsigned int cap;</div><div class='del'>-		cap = snd_hda_param_read(codec, 0x1, AC_PAR_GPIO_CAP);</div><div class='del'>-		cap &amp;= AC_GPIO_IO_COUNT;</div><div class='del'>-		if (cap &gt;= 6)</div><div class='del'>-			stac_add_hp_bass_switch(codec);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;proc_widget_hook = stac92hd7x_proc_hook;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac922x(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac922x_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac922x_pin_nids;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,</div><div class='del'>-							stac922x_models,</div><div class='del'>-							stac922x_cfg_tbl);</div><div class='del'>-	if (spec-&gt;board_config == STAC_INTEL_MAC_AUTO) {</div><div class='del'>-		spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x03;</div><div class='del'>-		spec-&gt;gpio_data = 0x03;</div><div class='del'>-		/* Intel Macs have all same PCI SSID, so we need to check</div><div class='del'>-		 * codec SSID to distinguish the exact models</div><div class='del'>-		 */</div><div class='del'>-		printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n", codec-&gt;subsystem_id);</div><div class='del'>-		switch (codec-&gt;subsystem_id) {</div><div class='del'>-</div><div class='del'>-		case 0x106b0800:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V1;</div><div class='del'>-			break;</div><div class='del'>-		case 0x106b0600:</div><div class='del'>-		case 0x106b0700:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V2;</div><div class='del'>-			break;</div><div class='del'>-		case 0x106b0e00:</div><div class='del'>-		case 0x106b0f00:</div><div class='del'>-		case 0x106b1600:</div><div class='del'>-		case 0x106b1700:</div><div class='del'>-		case 0x106b0200:</div><div class='del'>-		case 0x106b1e00:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V3;</div><div class='del'>-			break;</div><div class='del'>-		case 0x106b1a00:</div><div class='del'>-		case 0x00000100:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V4;</div><div class='del'>-			break;</div><div class='del'>-		case 0x106b0a00:</div><div class='del'>-		case 0x106b2200:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V5;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			spec-&gt;board_config = STAC_INTEL_MAC_V3;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-				stac922x_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;adc_nids = stac922x_adc_nids;</div><div class='del'>-	spec-&gt;mux_nids = stac922x_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac922x_mux_nids);</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac922x_adc_nids);</div><div class='del'>-	spec-&gt;num_dmics = 0;</div><div class='del'>-	spec-&gt;num_pwrs = 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;init = stac922x_core_init;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_caps = STAC922X_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac922x_capvols;</div><div class='del'>-	spec-&gt;capsws = stac922x_capsws;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-	</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x08, 0x09);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_D945_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	/* Fix Mux capture level; max to 2 */</div><div class='del'>-	snd_hda_override_amp_caps(codec, 0x12, HDA_OUTPUT,</div><div class='del'>-				  (0 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-				  (2 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-				  (0x27 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-				  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac927x(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	codec-&gt;slave_dig_outs = stac927x_slave_dig_outs;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac927x_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac927x_pin_nids;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, STAC_927X_MODELS,</div><div class='del'>-							stac927x_models,</div><div class='del'>-							stac927x_cfg_tbl);</div><div class='del'>- again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-				stac927x_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;digbeep_nid = 0x23;</div><div class='del'>-	spec-&gt;adc_nids = stac927x_adc_nids;</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac927x_adc_nids);</div><div class='del'>-	spec-&gt;mux_nids = stac927x_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac927x_mux_nids);</div><div class='del'>-	spec-&gt;smux_nids = stac927x_smux_nids;</div><div class='del'>-	spec-&gt;num_smuxes = ARRAY_SIZE(stac927x_smux_nids);</div><div class='del'>-	spec-&gt;spdif_labels = stac927x_spdif_labels;</div><div class='del'>-	spec-&gt;dac_list = stac927x_dac_nids;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;board_config != STAC_D965_REF) {</div><div class='del'>-		/* GPIO0 High = Enable EAPD */</div><div class='del'>-		spec-&gt;eapd_mask = spec-&gt;gpio_mask = 0x01;</div><div class='del'>-		spec-&gt;gpio_dir = spec-&gt;gpio_data = 0x01;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;board_config) {</div><div class='del'>-	case STAC_D965_3ST:</div><div class='del'>-	case STAC_D965_5ST:</div><div class='del'>-		/* GPIO0 High = Enable EAPD */</div><div class='del'>-		spec-&gt;num_dmics = 0;</div><div class='del'>-		spec-&gt;init = d965_core_init;</div><div class='del'>-		break;</div><div class='del'>-	case STAC_DELL_BIOS:</div><div class='del'>-		switch (codec-&gt;subsystem_id) {</div><div class='del'>-		case 0x10280209:</div><div class='del'>-		case 0x1028022e:</div><div class='del'>-			/* correct the device field to SPDIF out */</div><div class='del'>-			snd_hda_codec_set_pincfg(codec, 0x21, 0x01442070);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		/* configure the analog microphone on some laptops */</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0c, 0x90a79130);</div><div class='del'>-		/* correct the front output jack as a hp out */</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0f, 0x0227011f);</div><div class='del'>-		/* correct the front input jack as a mic */</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x0e, 0x02a79130);</div><div class='del'>-		/* fallthru */</div><div class='del'>-	case STAC_DELL_3ST:</div><div class='del'>-		if (codec-&gt;subsystem_id != 0x1028022f) {</div><div class='del'>-			/* GPIO2 High = Enable EAPD */</div><div class='del'>-			spec-&gt;eapd_mask = spec-&gt;gpio_mask = 0x04;</div><div class='del'>-			spec-&gt;gpio_dir = spec-&gt;gpio_data = 0x04;</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;dmic_nids = stac927x_dmic_nids;</div><div class='del'>-		spec-&gt;num_dmics = STAC927X_NUM_DMICS;</div><div class='del'>-</div><div class='del'>-		spec-&gt;init = dell_3st_core_init;</div><div class='del'>-		spec-&gt;dmux_nids = stac927x_dmux_nids;</div><div class='del'>-		spec-&gt;num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids);</div><div class='del'>-		break;</div><div class='del'>-	case STAC_927X_VOLKNOB:</div><div class='del'>-		spec-&gt;num_dmics = 0;</div><div class='del'>-		spec-&gt;init = stac927x_volknob_core_init;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		spec-&gt;num_dmics = 0;</div><div class='del'>-		spec-&gt;init = stac927x_core_init;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_caps = STAC927X_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac927x_capvols;</div><div class='del'>-	spec-&gt;capsws = stac927x_capsws;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_pwrs = 0;</div><div class='del'>-	spec-&gt;aloopback_ctl = stac927x_loopback;</div><div class='del'>-	spec-&gt;aloopback_mask = 0x40;</div><div class='del'>-	spec-&gt;aloopback_shift = 0;</div><div class='del'>-	spec-&gt;eapd_switch = 1;</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_D965_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;proc_widget_hook = stac927x_proc_hook;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * !!FIXME!!</div><div class='del'>-	 * The STAC927x seem to require fairly long delays for certain</div><div class='del'>-	 * command sequences.  With too short delays (even if the answer</div><div class='del'>-	 * is set to RIRB properly), it results in the silence output</div><div class='del'>-	 * on some hardwares like Dell.</div><div class='del'>-	 *</div><div class='del'>-	 * The below flag enables the longer delay (see get_response</div><div class='del'>-	 * in hda_intel.c).</div><div class='del'>-	 */</div><div class='del'>-	codec-&gt;bus-&gt;needs_damn_long_delay = 1;</div><div class='del'>-</div><div class='del'>-	/* no jack detecion for ref-no-jd model */</div><div class='del'>-	if (spec-&gt;board_config == STAC_D965_REF_NO_JD)</div><div class='del'>-		spec-&gt;hp_detect = 0;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_stac9205(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac9205_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac9205_pin_nids;</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, STAC_9205_MODELS,</div><div class='del'>-							stac9205_models,</div><div class='del'>-							stac9205_cfg_tbl);</div><div class='del'>- again:</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-					 stac9205_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;digbeep_nid = 0x23;</div><div class='del'>-	spec-&gt;adc_nids = stac9205_adc_nids;</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac9205_adc_nids);</div><div class='del'>-	spec-&gt;mux_nids = stac9205_mux_nids;</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac9205_mux_nids);</div><div class='del'>-	spec-&gt;smux_nids = stac9205_smux_nids;</div><div class='del'>-	spec-&gt;num_smuxes = ARRAY_SIZE(stac9205_smux_nids);</div><div class='del'>-	spec-&gt;dmic_nids = stac9205_dmic_nids;</div><div class='del'>-	spec-&gt;num_dmics = STAC9205_NUM_DMICS;</div><div class='del'>-	spec-&gt;dmux_nids = stac9205_dmux_nids;</div><div class='del'>-	spec-&gt;num_dmuxes = ARRAY_SIZE(stac9205_dmux_nids);</div><div class='del'>-	spec-&gt;num_pwrs = 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;init = stac9205_core_init;</div><div class='del'>-	spec-&gt;aloopback_ctl = stac9205_loopback;</div><div class='del'>-</div><div class='del'>-	spec-&gt;num_caps = STAC9205_NUM_CAPS;</div><div class='del'>-	spec-&gt;capvols = stac9205_capvols;</div><div class='del'>-	spec-&gt;capsws = stac9205_capsws;</div><div class='del'>-</div><div class='del'>-	spec-&gt;aloopback_mask = 0x40;</div><div class='del'>-	spec-&gt;aloopback_shift = 0;</div><div class='del'>-	/* Turn on/off EAPD per HP plugging */</div><div class='del'>-	if (spec-&gt;board_config != STAC_9205_EAPD)</div><div class='del'>-		spec-&gt;eapd_switch = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-	</div><div class='del'>-	switch (spec-&gt;board_config){</div><div class='del'>-	case STAC_9205_DELL_M43:</div><div class='del'>-		/* Enable SPDIF in/out */</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x1f, 0x01441030);</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, 0x20, 0x1c410030);</div><div class='del'>-</div><div class='del'>-		/* Enable unsol response for GPIO4/Dock HP connection */</div><div class='del'>-		err = stac_add_event(spec, codec-&gt;afg, STAC_VREF_EVENT, 0x01);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-			AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK, 0x10);</div><div class='del'>-		snd_hda_codec_write_cache(codec, codec-&gt;afg, 0,</div><div class='del'>-					  AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-					  AC_USRSP_EN | err);</div><div class='del'>-</div><div class='del'>-		spec-&gt;gpio_dir = 0x0b;</div><div class='del'>-		spec-&gt;eapd_mask = 0x01;</div><div class='del'>-		spec-&gt;gpio_mask = 0x1b;</div><div class='del'>-		spec-&gt;gpio_mute = 0x10;</div><div class='del'>-		/* GPIO0 High = EAPD, GPIO1 Low = Headphone Mute,</div><div class='del'>-		 * GPIO3 Low = DRM</div><div class='del'>-		 */</div><div class='del'>-		spec-&gt;gpio_data = 0x01;</div><div class='del'>-		break;</div><div class='del'>-	case STAC_9205_REF:</div><div class='del'>-		/* SPDIF-In enabled */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* GPIO0 High = EAPD */</div><div class='del'>-		spec-&gt;eapd_mask = spec-&gt;gpio_mask = spec-&gt;gpio_dir = 0x1;</div><div class='del'>-		spec-&gt;gpio_data = 0x01;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);</div><div class='del'>-	if (!err) {</div><div class='del'>-		if (spec-&gt;board_config &lt; 0) {</div><div class='del'>-			printk(KERN_WARNING "hda_codec: No auto-config is "</div><div class='del'>-			       "available, default to model=ref\n");</div><div class='del'>-			spec-&gt;board_config = STAC_9205_REF;</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;proc_widget_hook = stac9205_proc_hook;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * STAC9872 hack</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static struct hda_verb stac9872_core_init[] = {</div><div class='del'>-	{0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -&gt; 0x9 */</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9872_pin_nids[] = {</div><div class='del'>-	0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,</div><div class='del'>-	0x11, 0x13, 0x14,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9872_adc_nids[] = {</div><div class='del'>-	0x8 /*,0x6*/</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t stac9872_mux_nids[] = {</div><div class='del'>-	0x15</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned long stac9872_capvols[] = {</div><div class='del'>-	HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),</div><div class='del'>-};</div><div class='del'>-#define stac9872_capsws		stac9872_capvols</div><div class='del'>-</div><div class='del'>-static unsigned int stac9872_vaio_pin_configs[9] = {</div><div class='del'>-	0x03211020, 0x411111f0, 0x411111f0, 0x03a15030,</div><div class='del'>-	0x411111f0, 0x90170110, 0x411111f0, 0x411111f0,</div><div class='del'>-	0x90a7013e</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *stac9872_models[STAC_9872_MODELS] = {</div><div class='del'>-	[STAC_9872_AUTO] = "auto",</div><div class='del'>-	[STAC_9872_VAIO] = "vaio",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {</div><div class='del'>-	[STAC_9872_VAIO] = stac9872_vaio_pin_configs,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_pci_quirk stac9872_cfg_tbl[] = {</div><div class='del'>-	SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,</div><div class='del'>-			   "Sony VAIO F/S", STAC_9872_VAIO),</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_stac9872(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct sigmatel_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	codec-&gt;no_trigger_sense = 1;</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;linear_tone_beep = 1;</div><div class='del'>-	spec-&gt;num_pins = ARRAY_SIZE(stac9872_pin_nids);</div><div class='del'>-	spec-&gt;pin_nids = stac9872_pin_nids;</div><div class='del'>-</div><div class='del'>-	spec-&gt;board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,</div><div class='del'>-							stac9872_models,</div><div class='del'>-							stac9872_cfg_tbl);</div><div class='del'>-	if (spec-&gt;board_config &lt; 0)</div><div class='del'>-		snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",</div><div class='del'>-			    codec-&gt;chip_name);</div><div class='del'>-	else</div><div class='del'>-		stac92xx_set_config_regs(codec,</div><div class='del'>-					 stac9872_brd_tbl[spec-&gt;board_config]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;dac_nids;</div><div class='del'>-	spec-&gt;num_adcs = ARRAY_SIZE(stac9872_adc_nids);</div><div class='del'>-	spec-&gt;adc_nids = stac9872_adc_nids;</div><div class='del'>-	spec-&gt;num_muxes = ARRAY_SIZE(stac9872_mux_nids);</div><div class='del'>-	spec-&gt;mux_nids = stac9872_mux_nids;</div><div class='del'>-	spec-&gt;init = stac9872_core_init;</div><div class='del'>-	spec-&gt;num_caps = 1;</div><div class='del'>-	spec-&gt;capvols = stac9872_capvols;</div><div class='del'>-	spec-&gt;capsws = stac9872_capsws;</div><div class='del'>-</div><div class='del'>-	err = stac92xx_parse_auto_config(codec, 0x10, 0x12);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		stac92xx_free(codec);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux;</div><div class='del'>-	codec-&gt;patch_ops = stac92xx_patch_ops;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_sigmatel[] = {</div><div class='del'>- 	{ .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },</div><div class='del'>- 	{ .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847880, .name = "STAC9220 A2", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847681, .name = "STAC9220D/9223D A2", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847682, .name = "STAC9221 A2", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847683, .name = "STAC9221D A2", .patch = patch_stac922x },</div><div class='del'>- 	{ .id = 0x83847618, .name = "STAC9227", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847619, .name = "STAC9227", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847616, .name = "STAC9228", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847617, .name = "STAC9228", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847614, .name = "STAC9229", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847615, .name = "STAC9229", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847620, .name = "STAC9274", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847621, .name = "STAC9274D", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847622, .name = "STAC9273X", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847623, .name = "STAC9273D", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847624, .name = "STAC9272X", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847625, .name = "STAC9272D", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847626, .name = "STAC9271X", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },</div><div class='del'>- 	{ .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },</div><div class='del'>-	{ .id = 0x83847632, .name = "STAC9202",  .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847633, .name = "STAC9202D", .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847634, .name = "STAC9250", .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847635, .name = "STAC9250D", .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847636, .name = "STAC9251", .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847637, .name = "STAC9250D", .patch = patch_stac925x },</div><div class='del'>-	{ .id = 0x83847645, .name = "92HD206X", .patch = patch_stac927x },</div><div class='del'>-	{ .id = 0x83847646, .name = "92HD206D", .patch = patch_stac927x },</div><div class='del'>- 	/* The following does not take into account .id=0x83847661 when subsys =</div><div class='del'>- 	 * 104D0C00 which is STAC9225s. Because of this, some SZ Notebooks are</div><div class='del'>- 	 * currently not fully supported.</div><div class='del'>- 	 */</div><div class='del'>- 	{ .id = 0x83847661, .name = "CXD9872RD/K", .patch = patch_stac9872 },</div><div class='del'>- 	{ .id = 0x83847662, .name = "STAC9872AK", .patch = patch_stac9872 },</div><div class='del'>- 	{ .id = 0x83847664, .name = "CXD9872AKD", .patch = patch_stac9872 },</div><div class='del'>-	{ .id = 0x83847698, .name = "STAC9205", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a0, .name = "STAC9205", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a1, .name = "STAC9205D", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a2, .name = "STAC9204", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a3, .name = "STAC9204D", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a4, .name = "STAC9255", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a5, .name = "STAC9255D", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a6, .name = "STAC9254", .patch = patch_stac9205 },</div><div class='del'>- 	{ .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 },</div><div class='del'>-	{ .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx},</div><div class='del'>-	{ .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d76d4, .name = "92HD83C1C5", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d76d1, .name = "92HD87B1/3", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d76d9, .name = "92HD87B2/4", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7666, .name = "92HD88B3", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7667, .name = "92HD88B1", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7668, .name = "92HD88B2", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7669, .name = "92HD88B4", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx},</div><div class='del'>-	{ .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d7676, .name = "92HD73E1X5", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76b0, .name = "92HD71B8X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b1, .name = "92HD71B8X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b2, .name = "92HD71B7X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b3, .name = "92HD71B7X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b4, .name = "92HD71B6X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b5, .name = "92HD71B6X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b6, .name = "92HD71B5X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76b7, .name = "92HD71B5X", .patch = patch_stac92hd71bxx },</div><div class='del'>-	{ .id = 0x111d76c0, .name = "92HD89C3", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c1, .name = "92HD89C2", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c2, .name = "92HD89C1", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c3, .name = "92HD89B3", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c4, .name = "92HD89B2", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c5, .name = "92HD89B1", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c6, .name = "92HD89E3", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c7, .name = "92HD89E2", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c8, .name = "92HD89E1", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76c9, .name = "92HD89D3", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76ca, .name = "92HD89D2", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76cb, .name = "92HD89D1", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76cc, .name = "92HD89F3", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76cd, .name = "92HD89F2", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76ce, .name = "92HD89F1", .patch = patch_stac92hd73xx },</div><div class='del'>-	{ .id = 0x111d76e0, .name = "92HD91BXX", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{ .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx},</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:8384*");</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:111d*");</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("IDT/Sigmatel HD-audio codec");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list sigmatel_list = {</div><div class='del'>-	.preset = snd_hda_preset_sigmatel,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init patch_sigmatel_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;sigmatel_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_sigmatel_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;sigmatel_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_sigmatel_init)</div><div class='del'>-module_exit(patch_sigmatel_exit)</div><div class='head'>diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c<br/>deleted file mode 100644<br/>index d1c3f8defc48..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/hda/patch_via.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/hda/patch_via.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6058 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Universal Interface for Intel High Definition Audio Codec</div><div class='del'>- *</div><div class='del'>- * HD audio interface patch for VIA VT17xx/VT18xx/VT20xx codec</div><div class='del'>- *</div><div class='del'>- *  (C) 2006-2009 VIA Technology, Inc.</div><div class='del'>- *  (C) 2006-2008 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *  This driver is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This driver is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* * * * * * * * * * * * * * Release History * * * * * * * * * * * * * * * * */</div><div class='del'>-/*									     */</div><div class='del'>-/* 2006-03-03  Lydia Wang  Create the basic patch to support VT1708 codec    */</div><div class='del'>-/* 2006-03-14  Lydia Wang  Modify hard code for some pin widget nid	     */</div><div class='del'>-/* 2006-08-02  Lydia Wang  Add support to VT1709 codec			     */</div><div class='del'>-/* 2006-09-08  Lydia Wang  Fix internal loopback recording source select bug */</div><div class='del'>-/* 2007-09-12  Lydia Wang  Add EAPD enable during driver initialization	     */</div><div class='del'>-/* 2007-09-17  Lydia Wang  Add VT1708B codec support			    */</div><div class='del'>-/* 2007-11-14  Lydia Wang  Add VT1708A codec HP and CD pin connect config    */</div><div class='del'>-/* 2008-02-03  Lydia Wang  Fix Rear channels and Back channels inverse issue */</div><div class='del'>-/* 2008-03-06  Lydia Wang  Add VT1702 codec and VT1708S codec support	     */</div><div class='del'>-/* 2008-04-09  Lydia Wang  Add mute front speaker when HP plugin	     */</div><div class='del'>-/* 2008-04-09  Lydia Wang  Add Independent HP feature			     */</div><div class='del'>-/* 2008-05-28  Lydia Wang  Add second S/PDIF Out support for VT1702	     */</div><div class='del'>-/* 2008-09-15  Logan Li	   Add VT1708S Mic Boost workaround/backdoor	     */</div><div class='del'>-/* 2009-02-16  Logan Li	   Add support for VT1718S			     */</div><div class='del'>-/* 2009-03-13  Logan Li	   Add support for VT1716S			     */</div><div class='del'>-/* 2009-04-14  Lydai Wang  Add support for VT1828S and VT2020		     */</div><div class='del'>-/* 2009-07-08  Lydia Wang  Add support for VT2002P			     */</div><div class='del'>-/* 2009-07-21  Lydia Wang  Add support for VT1812			     */</div><div class='del'>-/* 2009-09-19  Lydia Wang  Add support for VT1818S			     */</div><div class='del'>-/*									     */</div><div class='del'>-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;sound/core.h&gt;</div><div class='del'>-#include &lt;sound/asoundef.h&gt;</div><div class='del'>-#include "hda_codec.h"</div><div class='del'>-#include "hda_local.h"</div><div class='del'>-</div><div class='del'>-#define NID_MAPPING		(-1)</div><div class='del'>-</div><div class='del'>-/* amp values */</div><div class='del'>-#define AMP_VAL_IDX_SHIFT	19</div><div class='del'>-#define AMP_VAL_IDX_MASK	(0x0f&lt;&lt;19)</div><div class='del'>-</div><div class='del'>-/* Pin Widget NID */</div><div class='del'>-#define VT1708_HP_NID		0x13</div><div class='del'>-#define VT1708_DIGOUT_NID	0x14</div><div class='del'>-#define VT1708_DIGIN_NID	0x16</div><div class='del'>-#define VT1708_DIGIN_PIN	0x26</div><div class='del'>-#define VT1708_HP_PIN_NID	0x20</div><div class='del'>-#define VT1708_CD_PIN_NID	0x24</div><div class='del'>-</div><div class='del'>-#define VT1709_HP_DAC_NID	0x28</div><div class='del'>-#define VT1709_DIGOUT_NID	0x13</div><div class='del'>-#define VT1709_DIGIN_NID	0x17</div><div class='del'>-#define VT1709_DIGIN_PIN	0x25</div><div class='del'>-</div><div class='del'>-#define VT1708B_HP_NID		0x25</div><div class='del'>-#define VT1708B_DIGOUT_NID	0x12</div><div class='del'>-#define VT1708B_DIGIN_NID	0x15</div><div class='del'>-#define VT1708B_DIGIN_PIN	0x21</div><div class='del'>-</div><div class='del'>-#define VT1708S_HP_NID		0x25</div><div class='del'>-#define VT1708S_DIGOUT_NID	0x12</div><div class='del'>-</div><div class='del'>-#define VT1702_HP_NID		0x17</div><div class='del'>-#define VT1702_DIGOUT_NID	0x11</div><div class='del'>-</div><div class='del'>-enum VIA_HDA_CODEC {</div><div class='del'>-	UNKNOWN = -1,</div><div class='del'>-	VT1708,</div><div class='del'>-	VT1709_10CH,</div><div class='del'>-	VT1709_6CH,</div><div class='del'>-	VT1708B_8CH,</div><div class='del'>-	VT1708B_4CH,</div><div class='del'>-	VT1708S,</div><div class='del'>-	VT1708BCE,</div><div class='del'>-	VT1702,</div><div class='del'>-	VT1718S,</div><div class='del'>-	VT1716S,</div><div class='del'>-	VT2002P,</div><div class='del'>-	VT1812,</div><div class='del'>-	CODEC_TYPES,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct via_spec {</div><div class='del'>-	/* codec parameterization */</div><div class='del'>-	struct snd_kcontrol_new *mixers[6];</div><div class='del'>-	unsigned int num_mixers;</div><div class='del'>-</div><div class='del'>-	struct hda_verb *init_verbs[5];</div><div class='del'>-	unsigned int num_iverbs;</div><div class='del'>-</div><div class='del'>-	char *stream_name_analog;</div><div class='del'>-	struct hda_pcm_stream *stream_analog_playback;</div><div class='del'>-	struct hda_pcm_stream *stream_analog_capture;</div><div class='del'>-</div><div class='del'>-	char *stream_name_digital;</div><div class='del'>-	struct hda_pcm_stream *stream_digital_playback;</div><div class='del'>-	struct hda_pcm_stream *stream_digital_capture;</div><div class='del'>-</div><div class='del'>-	/* playback */</div><div class='del'>-	struct hda_multi_out multiout;</div><div class='del'>-	hda_nid_t slave_dig_outs[2];</div><div class='del'>-</div><div class='del'>-	/* capture */</div><div class='del'>-	unsigned int num_adc_nids;</div><div class='del'>-	hda_nid_t *adc_nids;</div><div class='del'>-	hda_nid_t mux_nids[3];</div><div class='del'>-	hda_nid_t dig_in_nid;</div><div class='del'>-	hda_nid_t dig_in_pin;</div><div class='del'>-</div><div class='del'>-	/* capture source */</div><div class='del'>-	const struct hda_input_mux *input_mux;</div><div class='del'>-	unsigned int cur_mux[3];</div><div class='del'>-</div><div class='del'>-	/* PCM information */</div><div class='del'>-	struct hda_pcm pcm_rec[3];</div><div class='del'>-</div><div class='del'>-	/* dynamic controls, init_verbs and input_mux */</div><div class='del'>-	struct auto_pin_cfg autocfg;</div><div class='del'>-	struct snd_array kctls;</div><div class='del'>-	struct hda_input_mux private_imux[2];</div><div class='del'>-	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];</div><div class='del'>-</div><div class='del'>-	/* HP mode source */</div><div class='del'>-	const struct hda_input_mux *hp_mux;</div><div class='del'>-	unsigned int hp_independent_mode;</div><div class='del'>-	unsigned int hp_independent_mode_index;</div><div class='del'>-	unsigned int smart51_enabled;</div><div class='del'>-	unsigned int dmic_enabled;</div><div class='del'>-	enum VIA_HDA_CODEC codec_type;</div><div class='del'>-</div><div class='del'>-	/* work to check hp jack state */</div><div class='del'>-	struct hda_codec *codec;</div><div class='del'>-	struct delayed_work vt1708_hp_work;</div><div class='del'>-	int vt1708_jack_detectect;</div><div class='del'>-	int vt1708_hp_present;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	struct hda_loopback_check loopback;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct via_spec * via_new_spec(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-</div><div class='del'>-	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	codec-&gt;spec = spec;</div><div class='del'>-	spec-&gt;codec = codec;</div><div class='del'>-	return spec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	u32 vendor_id = codec-&gt;vendor_id;</div><div class='del'>-	u16 ven_id = vendor_id &gt;&gt; 16;</div><div class='del'>-	u16 dev_id = vendor_id &amp; 0xffff;</div><div class='del'>-	enum VIA_HDA_CODEC codec_type;</div><div class='del'>-</div><div class='del'>-	/* get codec type */</div><div class='del'>-	if (ven_id != 0x1106)</div><div class='del'>-		codec_type = UNKNOWN;</div><div class='del'>-	else if (dev_id &gt;= 0x1708 &amp;&amp; dev_id &lt;= 0x170b)</div><div class='del'>-		codec_type = VT1708;</div><div class='del'>-	else if (dev_id &gt;= 0xe710 &amp;&amp; dev_id &lt;= 0xe713)</div><div class='del'>-		codec_type = VT1709_10CH;</div><div class='del'>-	else if (dev_id &gt;= 0xe714 &amp;&amp; dev_id &lt;= 0xe717)</div><div class='del'>-		codec_type = VT1709_6CH;</div><div class='del'>-	else if (dev_id &gt;= 0xe720 &amp;&amp; dev_id &lt;= 0xe723) {</div><div class='del'>-		codec_type = VT1708B_8CH;</div><div class='del'>-		if (snd_hda_param_read(codec, 0x16, AC_PAR_CONNLIST_LEN) == 0x7)</div><div class='del'>-			codec_type = VT1708BCE;</div><div class='del'>-	} else if (dev_id &gt;= 0xe724 &amp;&amp; dev_id &lt;= 0xe727)</div><div class='del'>-		codec_type = VT1708B_4CH;</div><div class='del'>-	else if ((dev_id &amp; 0xfff) == 0x397</div><div class='del'>-		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='del'>-		codec_type = VT1708S;</div><div class='del'>-	else if ((dev_id &amp; 0xfff) == 0x398</div><div class='del'>-		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='del'>-		codec_type = VT1702;</div><div class='del'>-	else if ((dev_id &amp; 0xfff) == 0x428</div><div class='del'>-		 &amp;&amp; (dev_id &gt;&gt; 12) &lt; 8)</div><div class='del'>-		codec_type = VT1718S;</div><div class='del'>-	else if (dev_id == 0x0433 || dev_id == 0xa721)</div><div class='del'>-		codec_type = VT1716S;</div><div class='del'>-	else if (dev_id == 0x0441 || dev_id == 0x4441)</div><div class='del'>-		codec_type = VT1718S;</div><div class='del'>-	else if (dev_id == 0x0438 || dev_id == 0x4438)</div><div class='del'>-		codec_type = VT2002P;</div><div class='del'>-	else if (dev_id == 0x0448)</div><div class='del'>-		codec_type = VT1812;</div><div class='del'>-	else if (dev_id == 0x0440)</div><div class='del'>-		codec_type = VT1708S;</div><div class='del'>-	else</div><div class='del'>-		codec_type = UNKNOWN;</div><div class='del'>-	return codec_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define VIA_HP_EVENT		0x01</div><div class='del'>-#define VIA_GPIO_EVENT		0x02</div><div class='del'>-#define VIA_JACK_EVENT		0x04</div><div class='del'>-#define VIA_MONO_EVENT		0x08</div><div class='del'>-#define VIA_SPEAKER_EVENT	0x10</div><div class='del'>-#define VIA_BIND_HP_EVENT	0x20</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	VIA_CTL_WIDGET_VOL,</div><div class='del'>-	VIA_CTL_WIDGET_MUTE,</div><div class='del'>-	VIA_CTL_WIDGET_ANALOG_MUTE,</div><div class='del'>-	VIA_CTL_WIDGET_BIND_PIN_MUTE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	AUTO_SEQ_FRONT = 0,</div><div class='del'>-	AUTO_SEQ_SURROUND,</div><div class='del'>-	AUTO_SEQ_CENLFE,</div><div class='del'>-	AUTO_SEQ_SIDE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void analog_low_current_mode(struct hda_codec *codec, int stream_idle);</div><div class='del'>-static void set_jack_power_state(struct hda_codec *codec);</div><div class='del'>-static int is_aa_path_mute(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-static void vt1708_start_hp_work(struct via_spec *spec)</div><div class='del'>-{</div><div class='del'>-	if (spec-&gt;codec_type != VT1708 || spec-&gt;autocfg.hp_pins[0] == 0)</div><div class='del'>-		return;</div><div class='del'>-	snd_hda_codec_write(spec-&gt;codec, 0x1, 0, 0xf81,</div><div class='del'>-			    !spec-&gt;vt1708_jack_detectect);</div><div class='del'>-	if (!delayed_work_pending(&amp;spec-&gt;vt1708_hp_work))</div><div class='del'>-		schedule_delayed_work(&amp;spec-&gt;vt1708_hp_work,</div><div class='del'>-				      msecs_to_jiffies(100));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vt1708_stop_hp_work(struct via_spec *spec)</div><div class='del'>-{</div><div class='del'>-	if (spec-&gt;codec_type != VT1708 || spec-&gt;autocfg.hp_pins[0] == 0)</div><div class='del'>-		return;</div><div class='del'>-	if (snd_hda_get_bool_hint(spec-&gt;codec, "analog_loopback_hp_detect") == 1</div><div class='del'>-	    &amp;&amp; !is_aa_path_mute(spec-&gt;codec))</div><div class='del'>-		return;</div><div class='del'>-	snd_hda_codec_write(spec-&gt;codec, 0x1, 0, 0xf81,</div><div class='del'>-			    !spec-&gt;vt1708_jack_detectect);</div><div class='del'>-	cancel_delayed_work(&amp;spec-&gt;vt1708_hp_work);</div><div class='del'>-	flush_scheduled_work();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int analog_input_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	int change = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-</div><div class='del'>-	set_jack_power_state(codec);</div><div class='del'>-	analog_low_current_mode(snd_kcontrol_chip(kcontrol), -1);</div><div class='del'>-	if (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1) {</div><div class='del'>-		if (is_aa_path_mute(codec))</div><div class='del'>-			vt1708_start_hp_work(codec-&gt;spec);</div><div class='del'>-		else</div><div class='del'>-			vt1708_stop_hp_work(codec-&gt;spec);</div><div class='del'>-	}</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* modify .put = snd_hda_mixer_amp_switch_put */</div><div class='del'>-#define ANALOG_INPUT_MUTE						\</div><div class='del'>-	{		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		\</div><div class='del'>-			.name = NULL,					\</div><div class='del'>-			.index = 0,					\</div><div class='del'>-			.info = snd_hda_mixer_amp_switch_info,		\</div><div class='del'>-			.get = snd_hda_mixer_amp_switch_get,		\</div><div class='del'>-			.put = analog_input_switch_put,			\</div><div class='del'>-			.private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) }</div><div class='del'>-</div><div class='del'>-static void via_hp_bind_automute(struct hda_codec *codec);</div><div class='del'>-</div><div class='del'>-static int bind_pin_switch_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			       struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-	int change = 0;</div><div class='del'>-</div><div class='del'>-	long *valp = ucontrol-&gt;value.integer.value;</div><div class='del'>-	int lmute, rmute;</div><div class='del'>-	if (strstr(kcontrol-&gt;id.name, "Switch") == NULL) {</div><div class='del'>-		snd_printd("Invalid control!\n");</div><div class='del'>-		return change;</div><div class='del'>-	}</div><div class='del'>-	change = snd_hda_mixer_amp_switch_put(kcontrol,</div><div class='del'>-					      ucontrol);</div><div class='del'>-	/* Get mute value */</div><div class='del'>-	lmute = *valp ? 0 : HDA_AMP_MUTE;</div><div class='del'>-	valp++;</div><div class='del'>-	rmute = *valp ? 0 : HDA_AMP_MUTE;</div><div class='del'>-</div><div class='del'>-	/* Set hp pins */</div><div class='del'>-	if (!spec-&gt;hp_independent_mode) {</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++) {</div><div class='del'>-			snd_hda_codec_amp_update(</div><div class='del'>-				codec, spec-&gt;autocfg.hp_pins[i],</div><div class='del'>-				0, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-				lmute);</div><div class='del'>-			snd_hda_codec_amp_update(</div><div class='del'>-				codec, spec-&gt;autocfg.hp_pins[i],</div><div class='del'>-				1, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-				rmute);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!lmute &amp;&amp; !rmute) {</div><div class='del'>-		/* Line Outs */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='del'>-			snd_hda_codec_amp_stereo(</div><div class='del'>-				codec, spec-&gt;autocfg.line_out_pins[i],</div><div class='del'>-				HDA_OUTPUT, 0, HDA_AMP_MUTE, 0);</div><div class='del'>-		/* Speakers */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++)</div><div class='del'>-			snd_hda_codec_amp_stereo(</div><div class='del'>-				codec, spec-&gt;autocfg.speaker_pins[i],</div><div class='del'>-				HDA_OUTPUT, 0, HDA_AMP_MUTE, 0);</div><div class='del'>-		/* unmute */</div><div class='del'>-		via_hp_bind_automute(codec);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		if (lmute) {</div><div class='del'>-			/* Mute all left channels */</div><div class='del'>-			for (i = 1; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='del'>-				snd_hda_codec_amp_update(</div><div class='del'>-					codec,</div><div class='del'>-					spec-&gt;autocfg.line_out_pins[i],</div><div class='del'>-					0, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					lmute);</div><div class='del'>-			for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++)</div><div class='del'>-				snd_hda_codec_amp_update(</div><div class='del'>-					codec,</div><div class='del'>-					spec-&gt;autocfg.speaker_pins[i],</div><div class='del'>-					0, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					lmute);</div><div class='del'>-		}</div><div class='del'>-		if (rmute) {</div><div class='del'>-			/* mute all right channels */</div><div class='del'>-			for (i = 1; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='del'>-				snd_hda_codec_amp_update(</div><div class='del'>-					codec,</div><div class='del'>-					spec-&gt;autocfg.line_out_pins[i],</div><div class='del'>-					1, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					rmute);</div><div class='del'>-			for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++)</div><div class='del'>-				snd_hda_codec_amp_update(</div><div class='del'>-					codec,</div><div class='del'>-					spec-&gt;autocfg.speaker_pins[i],</div><div class='del'>-					1, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					rmute);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BIND_PIN_MUTE							\</div><div class='del'>-	{		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,		\</div><div class='del'>-			.name = NULL,					\</div><div class='del'>-			.index = 0,					\</div><div class='del'>-			.info = snd_hda_mixer_amp_switch_info,		\</div><div class='del'>-			.get = snd_hda_mixer_amp_switch_get,		\</div><div class='del'>-			.put = bind_pin_switch_put,			\</div><div class='del'>-			.private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) }</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new via_control_templates[] = {</div><div class='del'>-	HDA_CODEC_VOLUME(NULL, 0, 0, 0),</div><div class='del'>-	HDA_CODEC_MUTE(NULL, 0, 0, 0),</div><div class='del'>-	ANALOG_INPUT_MUTE,</div><div class='del'>-	BIND_PIN_MUTE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1708_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x15, 0x27</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1709_adc_nids[3] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x14, 0x15, 0x16</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1708B_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x13, 0x14</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1708S_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x13, 0x14</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1702_adc_nids[3] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x12, 0x20, 0x1F</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1718S_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x10, 0x11</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1716S_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x13, 0x14</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt2002P_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x10, 0x11</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static hda_nid_t vt1812_adc_nids[2] = {</div><div class='del'>-	/* ADC1-2 */</div><div class='del'>-	0x10, 0x11</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* add dynamic controls */</div><div class='del'>-static int __via_add_control(struct via_spec *spec, int type, const char *name,</div><div class='del'>-			     int idx, unsigned long val)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;kctls, sizeof(*knew), 32);</div><div class='del'>-	knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	*knew = via_control_templates[type];</div><div class='del'>-	knew-&gt;name = kstrdup(name, GFP_KERNEL);</div><div class='del'>-	if (!knew-&gt;name)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (get_amp_nid_(val))</div><div class='del'>-		knew-&gt;subdevice = HDA_SUBDEV_AMP_FLAG;</div><div class='del'>-	knew-&gt;private_value = val;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define via_add_control(spec, type, name, val) \</div><div class='del'>-	__via_add_control(spec, type, name, 0, val)</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new *via_clone_control(struct via_spec *spec,</div><div class='del'>-						struct snd_kcontrol_new *tmpl)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-</div><div class='del'>-	snd_array_init(&amp;spec-&gt;kctls, sizeof(*knew), 32);</div><div class='del'>-	knew = snd_array_new(&amp;spec-&gt;kctls);</div><div class='del'>-	if (!knew)</div><div class='del'>-		return NULL;</div><div class='del'>-	*knew = *tmpl;</div><div class='del'>-	knew-&gt;name = kstrdup(tmpl-&gt;name, GFP_KERNEL);</div><div class='del'>-	if (!knew-&gt;name)</div><div class='del'>-		return NULL;</div><div class='del'>-	return knew;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_free_kctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list) {</div><div class='del'>-		struct snd_kcontrol_new *kctl = spec-&gt;kctls.list;</div><div class='del'>-		int i;</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;kctls.used; i++)</div><div class='del'>-			kfree(kctl[i].name);</div><div class='del'>-	}</div><div class='del'>-	snd_array_free(&amp;spec-&gt;kctls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create input playback/capture controls for the given pin */</div><div class='del'>-static int via_new_analog_input(struct via_spec *spec, const char *ctlname,</div><div class='del'>-				int type_idx, int idx, int mix_nid)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	sprintf(name, "%s Playback Volume", ctlname);</div><div class='del'>-	err = __via_add_control(spec, VIA_CTL_WIDGET_VOL, name, type_idx,</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	sprintf(name, "%s Playback Switch", ctlname);</div><div class='del'>-	err = __via_add_control(spec, VIA_CTL_WIDGET_ANALOG_MUTE, name, type_idx,</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_auto_set_output_and_unmute(struct hda_codec *codec,</div><div class='del'>-					   hda_nid_t nid, int pin_type,</div><div class='del'>-					   int dac_idx)</div><div class='del'>-{</div><div class='del'>-	/* set as output */</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-			    pin_type);</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-			    AMP_OUT_UNMUTE);</div><div class='del'>-	if (snd_hda_query_pin_caps(codec, nid) &amp; AC_PINCAP_EAPD)</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_EAPD_BTLENABLE, 0x02);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void via_auto_init_multi_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		hda_nid_t nid = spec-&gt;autocfg.line_out_pins[i];</div><div class='del'>-		if (nid)</div><div class='del'>-			via_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_auto_init_hp_out(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t pin;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.hp_outs; i++) {</div><div class='del'>-		pin = spec-&gt;autocfg.hp_pins[i];</div><div class='del'>-		if (pin) /* connect to front */</div><div class='del'>-			via_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin);</div><div class='del'>-</div><div class='del'>-static void via_auto_init_analog_input(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	unsigned int ctl;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (spec-&gt;smart51_enabled &amp;&amp; is_smart51_pins(spec, nid))</div><div class='del'>-			ctl = PIN_OUT;</div><div class='del'>-		else if (i == AUTO_PIN_MIC)</div><div class='del'>-			ctl = PIN_VREF50;</div><div class='del'>-		else</div><div class='del'>-			ctl = PIN_IN;</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, ctl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,</div><div class='del'>-				unsigned int *affected_parm)</div><div class='del'>-{</div><div class='del'>-	unsigned parm;</div><div class='del'>-	unsigned def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	unsigned no_presence = (def_conf &amp; AC_DEFCFG_MISC)</div><div class='del'>-		&gt;&gt; AC_DEFCFG_MISC_SHIFT</div><div class='del'>-		&amp; AC_DEFCFG_MISC_NO_PRESENCE; /* do not support pin sense */</div><div class='del'>-	unsigned present = snd_hda_jack_detect(codec, nid);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	if ((spec-&gt;smart51_enabled &amp;&amp; is_smart51_pins(spec, nid))</div><div class='del'>-	    || ((no_presence || present)</div><div class='del'>-		&amp;&amp; get_defcfg_connect(def_conf) != AC_JACK_PORT_NONE)) {</div><div class='del'>-		*affected_parm = AC_PWRST_D0; /* if it's connected */</div><div class='del'>-		parm = AC_PWRST_D0;</div><div class='del'>-	} else</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_jack_power_state(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int imux_is_smixer;</div><div class='del'>-	unsigned int parm;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_type == VT1702) {</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 1/2/5 (14h/15h/18h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x14, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x15, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x18, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0; /* SW0 = stereo mixer (idx 3) */</div><div class='del'>-		/* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* PW 3/4 (16h/17h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x16, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x17, &amp;parm);</div><div class='del'>-		/* MW0 (1ah), AOW 0/1 (10h/1dh) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    imux_is_smixer ? AC_PWRST_D0 : parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-	} else if (spec-&gt;codec_type == VT1708B_8CH</div><div class='del'>-		   || spec-&gt;codec_type == VT1708B_4CH</div><div class='del'>-		   || spec-&gt;codec_type == VT1708S) {</div><div class='del'>-		/* SW0 (17h) = stereo mixer */</div><div class='del'>-		int is_8ch = spec-&gt;codec_type != VT1708B_4CH;</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00)</div><div class='del'>-			== ((spec-&gt;codec_type == VT1708S)  ? 5 : 0);</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 1/2/5 (1ah/1bh/1eh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x1a, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1b, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1e, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		/* SW0 (17h), AIW 0/1 (13h/14h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* PW0 (19h), SW1 (18h), AOW1 (11h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x19, &amp;parm);</div><div class='del'>-		if (spec-&gt;smart51_enabled)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* PW6 (22h), SW2 (26h), AOW2 (24h) */</div><div class='del'>-		if (is_8ch) {</div><div class='del'>-			parm = AC_PWRST_D3;</div><div class='del'>-			set_pin_power_state(codec, 0x22, &amp;parm);</div><div class='del'>-			if (spec-&gt;smart51_enabled)</div><div class='del'>-				parm = AC_PWRST_D0;</div><div class='del'>-			snd_hda_codec_write(codec, 0x26, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-			snd_hda_codec_write(codec, 0x24, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* PW 3/4/7 (1ch/1dh/23h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		/* force to D0 for internal Speaker */</div><div class='del'>-		set_pin_power_state(codec, 0x1c, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1d, &amp;parm);</div><div class='del'>-		if (is_8ch)</div><div class='del'>-			set_pin_power_state(codec, 0x23, &amp;parm);</div><div class='del'>-		/* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    imux_is_smixer ? AC_PWRST_D0 : parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		if (is_8ch) {</div><div class='del'>-			snd_hda_codec_write(codec, 0x25, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-			snd_hda_codec_write(codec, 0x27, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		}</div><div class='del'>-	}  else if (spec-&gt;codec_type == VT1718S) {</div><div class='del'>-		/* MUX6 (1eh) = stereo mixer */</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 5/6/7 (29h/2ah/2bh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x29, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2a, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2b, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		/* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* PW3 (27h), MW2 (1ah), AOW3 (bh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x27, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* PW2 (26h), AOW2 (ah) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x26, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* PW0/1 (24h/25h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x24, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x25, &amp;parm);</div><div class='del'>-		if (!spec-&gt;hp_independent_mode) /* check for redirected HP */</div><div class='del'>-			set_pin_power_state(codec, 0x28, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		/* MW9 (21h), Mw2 (1ah), AOW0 (8h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    imux_is_smixer ? AC_PWRST_D0 : parm);</div><div class='del'>-		if (spec-&gt;hp_independent_mode) {</div><div class='del'>-			/* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */</div><div class='del'>-			parm = AC_PWRST_D3;</div><div class='del'>-			set_pin_power_state(codec, 0x28, &amp;parm);</div><div class='del'>-			snd_hda_codec_write(codec, 0x1b, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-			snd_hda_codec_write(codec, 0x34, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-			snd_hda_codec_write(codec, 0xc, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		}</div><div class='del'>-	} else if (spec-&gt;codec_type == VT1716S) {</div><div class='del'>-		unsigned int mono_out, present;</div><div class='del'>-		/* SW0 (17h) = stereo mixer */</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00) ==  5;</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 1/2/5 (1ah/1bh/1eh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x1a, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1b, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1e, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		/* SW0 (17h), AIW0(13h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x1e, &amp;parm);</div><div class='del'>-		/* PW11 (22h) */</div><div class='del'>-		if (spec-&gt;dmic_enabled)</div><div class='del'>-			set_pin_power_state(codec, 0x22, &amp;parm);</div><div class='del'>-		else</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x22, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-</div><div class='del'>-		/* SW2(26h), AIW1(14h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* PW0 (19h), SW1 (18h), AOW1 (11h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x19, &amp;parm);</div><div class='del'>-		/* Smart 5.1 PW2(1bh) */</div><div class='del'>-		if (spec-&gt;smart51_enabled)</div><div class='del'>-			set_pin_power_state(codec, 0x1b, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* PW7 (23h), SW3 (27h), AOW3 (25h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x23, &amp;parm);</div><div class='del'>-		/* Smart 5.1 PW1(1ah) */</div><div class='del'>-		if (spec-&gt;smart51_enabled)</div><div class='del'>-			set_pin_power_state(codec, 0x1a, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* Smart 5.1 PW5(1eh) */</div><div class='del'>-		if (spec-&gt;smart51_enabled)</div><div class='del'>-			set_pin_power_state(codec, 0x1e, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* Mono out */</div><div class='del'>-		/* SW4(28h)-&gt;MW1(29h)-&gt; PW12 (2ah)*/</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x1c);</div><div class='del'>-		if (present)</div><div class='del'>-			mono_out = 0;</div><div class='del'>-		else {</div><div class='del'>-			present = snd_hda_jack_detect(codec, 0x1d);</div><div class='del'>-			if (!spec-&gt;hp_independent_mode &amp;&amp; present)</div><div class='del'>-				mono_out = 0;</div><div class='del'>-			else</div><div class='del'>-				mono_out = 1;</div><div class='del'>-		}</div><div class='del'>-		parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;</div><div class='del'>-		snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    parm);</div><div class='del'>-</div><div class='del'>-		/* PW 3/4 (1ch/1dh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x1c, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x1d, &amp;parm);</div><div class='del'>-		/* HP Independent Mode, power on AOW3 */</div><div class='del'>-		if (spec-&gt;hp_independent_mode)</div><div class='del'>-			snd_hda_codec_write(codec, 0x25, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* force to D0 for internal Speaker */</div><div class='del'>-		/* MW0 (16h), AOW0 (10h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    imux_is_smixer ? AC_PWRST_D0 : parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,</div><div class='del'>-				    mono_out ? AC_PWRST_D0 : parm);</div><div class='del'>-	} else if (spec-&gt;codec_type == VT2002P) {</div><div class='del'>-		unsigned int present;</div><div class='del'>-		/* MUX9 (1eh) = stereo mixer */</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 5/6/7 (29h/2ah/2bh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x29, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2a, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2b, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		/* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x1e, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1f, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x11, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* AOW0 (8h)*/</div><div class='del'>-		snd_hda_codec_write(codec, 0x8, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-</div><div class='del'>-		/* PW4 (26h), MW4 (1ch), MUX4(37h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x26, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1c, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x37,</div><div class='del'>-				    0, AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x25, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x19, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x35, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		if (spec-&gt;hp_independent_mode)	{</div><div class='del'>-			snd_hda_codec_write(codec, 0x9, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Class-D */</div><div class='del'>-		/* PW0 (24h), MW0(18h), MUX0(34h) */</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x25);</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x24, &amp;parm);</div><div class='del'>-		if (present) {</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x18, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x34, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x18, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x34, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Mono Out */</div><div class='del'>-		/* PW15 (31h), MW8(17h), MUX8(3bh) */</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x26);</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x31, &amp;parm);</div><div class='del'>-		if (present) {</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x17, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x3b, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x17, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x3b, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* MW9 (21h) */</div><div class='del'>-		if (imux_is_smixer || !is_aa_path_mute(codec))</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x21, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-		else</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x21, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-	} else if (spec-&gt;codec_type == VT1812) {</div><div class='del'>-		unsigned int present;</div><div class='del'>-		/* MUX10 (1eh) = stereo mixer */</div><div class='del'>-		imux_is_smixer = snd_hda_codec_read(</div><div class='del'>-			codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;</div><div class='del'>-		/* inputs */</div><div class='del'>-		/* PW 5/6/7 (29h/2ah/2bh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x29, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2a, &amp;parm);</div><div class='del'>-		set_pin_power_state(codec, 0x2b, &amp;parm);</div><div class='del'>-		if (imux_is_smixer)</div><div class='del'>-			parm = AC_PWRST_D0;</div><div class='del'>-		/* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */</div><div class='del'>-		snd_hda_codec_write(codec, 0x1e, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1f, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x10, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x11, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* outputs */</div><div class='del'>-		/* AOW0 (8h)*/</div><div class='del'>-		snd_hda_codec_write(codec, 0x8, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-</div><div class='del'>-		/* PW4 (28h), MW4 (18h), MUX4(38h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x28, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x18, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x38, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x25, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x15, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x35, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		if (spec-&gt;hp_independent_mode)	{</div><div class='del'>-			snd_hda_codec_write(codec, 0x9, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Internal Speaker */</div><div class='del'>-		/* PW0 (24h), MW0(14h), MUX0(34h) */</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x25);</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x24, &amp;parm);</div><div class='del'>-		if (present) {</div><div class='del'>-			snd_hda_codec_write(codec, 0x14, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D3);</div><div class='del'>-			snd_hda_codec_write(codec, 0x34, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D3);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_write(codec, 0x14, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D0);</div><div class='del'>-			snd_hda_codec_write(codec, 0x34, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D0);</div><div class='del'>-		}</div><div class='del'>-		/* Mono Out */</div><div class='del'>-		/* PW13 (31h), MW13(1ch), MUX13(3ch), MW14(3eh) */</div><div class='del'>-		present = snd_hda_jack_detect(codec, 0x28);</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x31, &amp;parm);</div><div class='del'>-		if (present) {</div><div class='del'>-			snd_hda_codec_write(codec, 0x1c, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D3);</div><div class='del'>-			snd_hda_codec_write(codec, 0x3c, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D3);</div><div class='del'>-			snd_hda_codec_write(codec, 0x3e, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D3);</div><div class='del'>-		} else {</div><div class='del'>-			snd_hda_codec_write(codec, 0x1c, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D0);</div><div class='del'>-			snd_hda_codec_write(codec, 0x3c, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D0);</div><div class='del'>-			snd_hda_codec_write(codec, 0x3e, 0,</div><div class='del'>-					    AC_VERB_SET_POWER_STATE,</div><div class='del'>-					    AC_PWRST_D0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* PW15 (33h), MW15 (1dh), MUX15(3dh) */</div><div class='del'>-		parm = AC_PWRST_D3;</div><div class='del'>-		set_pin_power_state(codec, 0x33, &amp;parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x1d, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-		snd_hda_codec_write(codec, 0x3d, 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, parm);</div><div class='del'>-</div><div class='del'>-		/* MW9 (21h) */</div><div class='del'>-		if (imux_is_smixer || !is_aa_path_mute(codec))</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x21, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-		else</div><div class='del'>-			snd_hda_codec_write(</div><div class='del'>-				codec, 0x21, 0,</div><div class='del'>-				AC_VERB_SET_POWER_STATE, AC_PWRST_D3);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * input MUX handling</div><div class='del'>- */</div><div class='del'>-static int via_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			     struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;input_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = spec-&gt;cur_mux[adc_idx];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;mux_nids[adc_idx])</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	/* switch to D0 beofre change index */</div><div class='del'>-	if (snd_hda_codec_read(codec, spec-&gt;mux_nids[adc_idx], 0,</div><div class='del'>-			       AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;mux_nids[adc_idx], 0,</div><div class='del'>-				    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);</div><div class='del'>-	/* update jack power state */</div><div class='del'>-	set_jack_power_state(codec);</div><div class='del'>-</div><div class='del'>-	return snd_hda_input_mux_put(codec, spec-&gt;input_mux, ucontrol,</div><div class='del'>-				     spec-&gt;mux_nids[adc_idx],</div><div class='del'>-				     &amp;spec-&gt;cur_mux[adc_idx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_independent_hp_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-				   struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_input_mux_info(spec-&gt;hp_mux, uinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_independent_hp_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int pinsel;</div><div class='del'>-</div><div class='del'>-	/* use !! to translate conn sel 2 for VT1718S */</div><div class='del'>-	pinsel = !!snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-				      AC_VERB_GET_CONNECT_SEL,</div><div class='del'>-				      0x00);</div><div class='del'>-	ucontrol-&gt;value.enumerated.item[0] = pinsel;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void activate_ctl(struct hda_codec *codec, const char *name, int active)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol *ctl = snd_hda_find_mixer_ctl(codec, name);</div><div class='del'>-	if (ctl) {</div><div class='del'>-		ctl-&gt;vd[0].access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='del'>-		ctl-&gt;vd[0].access |= active</div><div class='del'>-			? 0 : SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='del'>-		snd_ctl_notify(codec-&gt;bus-&gt;card,</div><div class='del'>-			       SNDRV_CTL_EVENT_MASK_VALUE, &amp;ctl-&gt;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static hda_nid_t side_mute_channel(struct via_spec *spec)</div><div class='del'>-{</div><div class='del'>-	switch (spec-&gt;codec_type) {</div><div class='del'>-	case VT1708:		return 0x1b;</div><div class='del'>-	case VT1709_10CH:	return 0x29;</div><div class='del'>-	case VT1708B_8CH:	/* fall thru */</div><div class='del'>-	case VT1708S:		return 0x27;</div><div class='del'>-	default:		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int update_side_mute_status(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* mute side channel */</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	unsigned int parm = spec-&gt;hp_independent_mode</div><div class='del'>-		? AMP_OUT_MUTE : AMP_OUT_UNMUTE;</div><div class='del'>-	hda_nid_t sw3 = side_mute_channel(spec);</div><div class='del'>-</div><div class='del'>-	if (sw3)</div><div class='del'>-		snd_hda_codec_write(codec, sw3, 0, AC_VERB_SET_AMP_GAIN_MUTE,</div><div class='del'>-				    parm);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_independent_hp_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				  struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid = kcontrol-&gt;private_value;</div><div class='del'>-	unsigned int pinsel = ucontrol-&gt;value.enumerated.item[0];</div><div class='del'>-	/* Get Independent Mode index of headphone pin widget */</div><div class='del'>-	spec-&gt;hp_independent_mode = spec-&gt;hp_independent_mode_index == pinsel</div><div class='del'>-		? 1 : 0;</div><div class='del'>-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, pinsel);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.hp_nid &amp;&amp; spec-&gt;multiout.hp_nid</div><div class='del'>-	    != spec-&gt;multiout.dac_nids[HDA_FRONT])</div><div class='del'>-		snd_hda_codec_setup_stream(codec, spec-&gt;multiout.hp_nid,</div><div class='del'>-					   0, 0, 0);</div><div class='del'>-</div><div class='del'>-	update_side_mute_status(codec);</div><div class='del'>-	/* update HP volume/swtich active state */</div><div class='del'>-	if (spec-&gt;codec_type == VT1708S</div><div class='del'>-	    || spec-&gt;codec_type == VT1702</div><div class='del'>-	    || spec-&gt;codec_type == VT1718S</div><div class='del'>-	    || spec-&gt;codec_type == VT1716S</div><div class='del'>-	    || spec-&gt;codec_type == VT2002P</div><div class='del'>-	    || spec-&gt;codec_type == VT1812) {</div><div class='del'>-		activate_ctl(codec, "Headphone Playback Volume",</div><div class='del'>-			     spec-&gt;hp_independent_mode);</div><div class='del'>-		activate_ctl(codec, "Headphone Playback Switch",</div><div class='del'>-			     spec-&gt;hp_independent_mode);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new via_hp_mixer[2] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Independent HP",</div><div class='del'>-		.info = via_independent_hp_info,</div><div class='del'>-		.get = via_independent_hp_get,</div><div class='del'>-		.put = via_independent_hp_put,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.iface = NID_MAPPING,</div><div class='del'>-		.name = "Independent HP",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int via_hp_build(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int nums;</div><div class='del'>-	hda_nid_t conn[HDA_MAX_CONNECTIONS];</div><div class='del'>-</div><div class='del'>-	switch (spec-&gt;codec_type) {</div><div class='del'>-	case VT1718S:</div><div class='del'>-		nid = 0x34;</div><div class='del'>-		break;</div><div class='del'>-	case VT2002P:</div><div class='del'>-		nid = 0x35;</div><div class='del'>-		break;</div><div class='del'>-	case VT1812:</div><div class='del'>-		nid = 0x3d;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		nid = spec-&gt;autocfg.hp_pins[0];</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nums = snd_hda_get_connections(codec, nid, conn, HDA_MAX_CONNECTIONS);</div><div class='del'>-	if (nums &lt;= 1)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	knew = via_clone_control(spec, &amp;via_hp_mixer[0]);</div><div class='del'>-	if (knew == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	knew-&gt;subdevice = HDA_SUBDEV_NID_FLAG | nid;</div><div class='del'>-	knew-&gt;private_value = nid;</div><div class='del'>-</div><div class='del'>-	knew = via_clone_control(spec, &amp;via_hp_mixer[1]);</div><div class='del'>-	if (knew == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	knew-&gt;subdevice = side_mute_channel(spec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void notify_aa_path_ctls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct snd_ctl_elem_id id;</div><div class='del'>-	const char *labels[] = {"Mic", "Front Mic", "Line"};</div><div class='del'>-</div><div class='del'>-	memset(&amp;id, 0, sizeof(id));</div><div class='del'>-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(labels); i++) {</div><div class='del'>-		sprintf(id.name, "%s Playback Volume", labels[i]);</div><div class='del'>-		snd_ctl_notify(codec-&gt;bus-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mute_aa_path(struct hda_codec *codec, int mute)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t  nid_mixer;</div><div class='del'>-	int start_idx;</div><div class='del'>-	int end_idx;</div><div class='del'>-	int i;</div><div class='del'>-	/* get nid of MW0 and start &amp; end index */</div><div class='del'>-	switch (spec-&gt;codec_type) {</div><div class='del'>-	case VT1708:</div><div class='del'>-		nid_mixer = 0x17;</div><div class='del'>-		start_idx = 2;</div><div class='del'>-		end_idx = 4;</div><div class='del'>-		break;</div><div class='del'>-	case VT1709_10CH:</div><div class='del'>-	case VT1709_6CH:</div><div class='del'>-		nid_mixer = 0x18;</div><div class='del'>-		start_idx = 2;</div><div class='del'>-		end_idx = 4;</div><div class='del'>-		break;</div><div class='del'>-	case VT1708B_8CH:</div><div class='del'>-	case VT1708B_4CH:</div><div class='del'>-	case VT1708S:</div><div class='del'>-	case VT1716S:</div><div class='del'>-		nid_mixer = 0x16;</div><div class='del'>-		start_idx = 2;</div><div class='del'>-		end_idx = 4;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* check AA path's mute status */</div><div class='del'>-	for (i = start_idx; i &lt;= end_idx; i++) {</div><div class='del'>-		int val = mute ? HDA_AMP_MUTE : HDA_AMP_UNMUTE;</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, nid_mixer, HDA_INPUT, i,</div><div class='del'>-					 HDA_AMP_MUTE, val);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		if (pin == cfg-&gt;inputs[i].pin)</div><div class='del'>-			return cfg-&gt;inputs[i].type &lt;= AUTO_PIN_LINE_IN;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_smart51_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_smart51_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int on = 1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		int ctl = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		if (cfg-&gt;inputs[i].type &gt; AUTO_PIN_LINE_IN)</div><div class='del'>-			continue;</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC &amp;&amp;</div><div class='del'>-		    spec-&gt;hp_independent_mode &amp;&amp; spec-&gt;codec_type != VT1718S)</div><div class='del'>-			continue; /* ignore FMic for independent HP */</div><div class='del'>-		if ((ctl &amp; AC_PINCTL_IN_EN) &amp;&amp; !(ctl &amp; AC_PINCTL_OUT_EN))</div><div class='del'>-			on = 0;</div><div class='del'>-	}</div><div class='del'>-	*ucontrol-&gt;value.integer.value = on;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_smart51_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	int out_in = *ucontrol-&gt;value.integer.value</div><div class='del'>-		? AC_PINCTL_OUT_EN : AC_PINCTL_IN_EN;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		hda_nid_t nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		unsigned int parm;</div><div class='del'>-</div><div class='del'>-		if (cfg-&gt;inputs[i].type &gt; AUTO_PIN_LINE_IN)</div><div class='del'>-			continue;</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC &amp;&amp;</div><div class='del'>-		    spec-&gt;hp_independent_mode &amp;&amp; spec-&gt;codec_type != VT1718S)</div><div class='del'>-			continue; /* don't retask FMic for independent HP */</div><div class='del'>-</div><div class='del'>-		parm = snd_hda_codec_read(codec, nid, 0,</div><div class='del'>-					  AC_VERB_GET_PIN_WIDGET_CONTROL, 0);</div><div class='del'>-		parm &amp;= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);</div><div class='del'>-		parm |= out_in;</div><div class='del'>-		snd_hda_codec_write(codec, nid, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-				    parm);</div><div class='del'>-		if (out_in == AC_PINCTL_OUT_EN) {</div><div class='del'>-			mute_aa_path(codec, 1);</div><div class='del'>-			notify_aa_path_ctls(codec);</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;codec_type == VT1718S) {</div><div class='del'>-			snd_hda_codec_amp_stereo(</div><div class='del'>-					codec, nid, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					HDA_AMP_UNMUTE);</div><div class='del'>-		}</div><div class='del'>-		if (cfg-&gt;inputs[i].type == AUTO_PIN_MIC) {</div><div class='del'>-			if (spec-&gt;codec_type == VT1708S</div><div class='del'>-			    || spec-&gt;codec_type == VT1716S) {</div><div class='del'>-				/* input = index 1 (AOW3) */</div><div class='del'>-				snd_hda_codec_write(</div><div class='del'>-					codec, nid, 0,</div><div class='del'>-					AC_VERB_SET_CONNECT_SEL, 1);</div><div class='del'>-				snd_hda_codec_amp_stereo(</div><div class='del'>-					codec, nid, HDA_OUTPUT,</div><div class='del'>-					0, HDA_AMP_MUTE, HDA_AMP_UNMUTE);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	spec-&gt;smart51_enabled = *ucontrol-&gt;value.integer.value;</div><div class='del'>-	set_jack_power_state(codec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new via_smart51_mixer[2] = {</div><div class='del'>-	{</div><div class='del'>-	 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	 .name = "Smart 5.1",</div><div class='del'>-	 .count = 1,</div><div class='del'>-	 .info = via_smart51_info,</div><div class='del'>-	 .get = via_smart51_get,</div><div class='del'>-	 .put = via_smart51_put,</div><div class='del'>-	 },</div><div class='del'>-	{</div><div class='del'>-	 .iface = NID_MAPPING,</div><div class='del'>-	 .name = "Smart 5.1",</div><div class='del'>-	}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int via_smart51_build(struct via_spec *spec)</div><div class='del'>-{</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-	const struct auto_pin_cfg *cfg = &amp;spec-&gt;autocfg;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	knew = via_clone_control(spec, &amp;via_smart51_mixer[0]);</div><div class='del'>-	if (knew == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		nid = cfg-&gt;inputs[i].pin;</div><div class='del'>-		if (cfg-&gt;inputs[i].type &lt;= AUTO_PIN_LINE_IN) {</div><div class='del'>-			knew = via_clone_control(spec, &amp;via_smart51_mixer[1]);</div><div class='del'>-			if (knew == NULL)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			knew-&gt;subdevice = nid;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1708_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x27, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x27, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* check AA path's mute statue */</div><div class='del'>-static int is_aa_path_mute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	int mute = 1;</div><div class='del'>-	hda_nid_t  nid_mixer;</div><div class='del'>-	int start_idx;</div><div class='del'>-	int end_idx;</div><div class='del'>-	int i;</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	/* get nid of MW0 and start &amp; end index */</div><div class='del'>-	switch (spec-&gt;codec_type) {</div><div class='del'>-	case VT1708B_8CH:</div><div class='del'>-	case VT1708B_4CH:</div><div class='del'>-	case VT1708S:</div><div class='del'>-	case VT1716S:</div><div class='del'>-		nid_mixer = 0x16;</div><div class='del'>-		start_idx = 2;</div><div class='del'>-		end_idx = 4;</div><div class='del'>-		break;</div><div class='del'>-	case VT1702:</div><div class='del'>-		nid_mixer = 0x1a;</div><div class='del'>-		start_idx = 1;</div><div class='del'>-		end_idx = 3;</div><div class='del'>-		break;</div><div class='del'>-	case VT1718S:</div><div class='del'>-		nid_mixer = 0x21;</div><div class='del'>-		start_idx = 1;</div><div class='del'>-		end_idx = 3;</div><div class='del'>-		break;</div><div class='del'>-	case VT2002P:</div><div class='del'>-	case VT1812:</div><div class='del'>-		nid_mixer = 0x21;</div><div class='del'>-		start_idx = 0;</div><div class='del'>-		end_idx = 2;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	/* check AA path's mute status */</div><div class='del'>-	for (i = start_idx; i &lt;= end_idx; i++) {</div><div class='del'>-		unsigned int con_list = snd_hda_codec_read(</div><div class='del'>-			codec, nid_mixer, 0, AC_VERB_GET_CONNECT_LIST, i/4*4);</div><div class='del'>-		int shift = 8 * (i % 4);</div><div class='del'>-		hda_nid_t nid_pin = (con_list &amp; (0xff &lt;&lt; shift)) &gt;&gt; shift;</div><div class='del'>-		unsigned int defconf = snd_hda_codec_get_pincfg(codec, nid_pin);</div><div class='del'>-		if (get_defcfg_connect(defconf) == AC_JACK_PORT_COMPLEX) {</div><div class='del'>-			/* check mute status while the pin is connected */</div><div class='del'>-			int mute_l = snd_hda_codec_amp_read(codec, nid_mixer, 0,</div><div class='del'>-							    HDA_INPUT, i) &gt;&gt; 7;</div><div class='del'>-			int mute_r = snd_hda_codec_amp_read(codec, nid_mixer, 1,</div><div class='del'>-							    HDA_INPUT, i) &gt;&gt; 7;</div><div class='del'>-			if (!mute_l || !mute_r) {</div><div class='del'>-				mute = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return mute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* enter/exit analog low-current mode */</div><div class='del'>-static void analog_low_current_mode(struct hda_codec *codec, int stream_idle)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	static int saved_stream_idle = 1; /* saved stream idle status */</div><div class='del'>-	int enable = is_aa_path_mute(codec);</div><div class='del'>-	unsigned int verb = 0;</div><div class='del'>-	unsigned int parm = 0;</div><div class='del'>-</div><div class='del'>-	if (stream_idle == -1)	/* stream status did not change */</div><div class='del'>-		enable = enable &amp;&amp; saved_stream_idle;</div><div class='del'>-	else {</div><div class='del'>-		enable = enable &amp;&amp; stream_idle;</div><div class='del'>-		saved_stream_idle = stream_idle;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* decide low current mode's verb &amp; parameter */</div><div class='del'>-	switch (spec-&gt;codec_type) {</div><div class='del'>-	case VT1708B_8CH:</div><div class='del'>-	case VT1708B_4CH:</div><div class='del'>-		verb = 0xf70;</div><div class='del'>-		parm = enable ? 0x02 : 0x00; /* 0x02: 2/3x, 0x00: 1x */</div><div class='del'>-		break;</div><div class='del'>-	case VT1708S:</div><div class='del'>-	case VT1718S:</div><div class='del'>-	case VT1716S:</div><div class='del'>-		verb = 0xf73;</div><div class='del'>-		parm = enable ? 0x51 : 0xe1; /* 0x51: 4/28x, 0xe1: 1x */</div><div class='del'>-		break;</div><div class='del'>-	case VT1702:</div><div class='del'>-		verb = 0xf73;</div><div class='del'>-		parm = enable ? 0x01 : 0x1d; /* 0x01: 4/40x, 0x1d: 1x */</div><div class='del'>-		break;</div><div class='del'>-	case VT2002P:</div><div class='del'>-	case VT1812:</div><div class='del'>-		verb = 0xf93;</div><div class='del'>-		parm = enable ? 0x00 : 0xe0; /* 0x00: 4/40x, 0xe0: 1x */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;		/* other codecs are not supported */</div><div class='del'>-	}</div><div class='del'>-	/* send verb */</div><div class='del'>-	snd_hda_codec_write(codec, codec-&gt;afg, 0, verb, parm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb vt1708_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers (0x19 - 0x1b)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Setup default input MW0 to PW4 */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int via_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				 struct hda_codec *codec,</div><div class='del'>-				 struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int idle = substream-&gt;pstr-&gt;substream_opened == 1</div><div class='del'>-		&amp;&amp; substream-&gt;ref_count == 0;</div><div class='del'>-	analog_low_current_mode(codec, idle);</div><div class='del'>-	return snd_hda_multi_out_analog_open(codec, &amp;spec-&gt;multiout, substream,</div><div class='del'>-					     hinfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void playback_multi_pcm_prep_0(struct hda_codec *codec,</div><div class='del'>-				      unsigned int stream_tag,</div><div class='del'>-				      unsigned int format,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_multi_out *mout = &amp;spec-&gt;multiout;</div><div class='del'>-	hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='del'>-	int chs = substream-&gt;runtime-&gt;channels;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	if (mout-&gt;dig_out_nid &amp;&amp; mout-&gt;dig_out_used != HDA_DIG_EXCLUSIVE) {</div><div class='del'>-		if (chs == 2 &amp;&amp;</div><div class='del'>-		    snd_hda_is_supported_format(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						format) &amp;&amp;</div><div class='del'>-		    !(codec-&gt;spdif_status &amp; IEC958_AES0_NONAUDIO)) {</div><div class='del'>-			mout-&gt;dig_out_used = HDA_DIG_ANALOG_DUP;</div><div class='del'>-			/* turn off SPDIF once; otherwise the IEC958 bits won't</div><div class='del'>-			 * be updated */</div><div class='del'>-			if (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE)</div><div class='del'>-				snd_hda_codec_write(codec, mout-&gt;dig_out_nid, 0,</div><div class='del'>-						    AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-						    codec-&gt;spdif_ctls &amp;</div><div class='del'>-							~AC_DIG1_ENABLE &amp; 0xff);</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						   stream_tag, 0, format);</div><div class='del'>-			/* turn on again (if needed) */</div><div class='del'>-			if (codec-&gt;spdif_ctls &amp; AC_DIG1_ENABLE)</div><div class='del'>-				snd_hda_codec_write(codec, mout-&gt;dig_out_nid, 0,</div><div class='del'>-						    AC_VERB_SET_DIGI_CONVERT_1,</div><div class='del'>-						    codec-&gt;spdif_ctls &amp; 0xff);</div><div class='del'>-		} else {</div><div class='del'>-			mout-&gt;dig_out_used = 0;</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						   0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-</div><div class='del'>-	/* front */</div><div class='del'>-	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], stream_tag,</div><div class='del'>-				   0, format);</div><div class='del'>-</div><div class='del'>-	if (mout-&gt;hp_nid &amp;&amp; mout-&gt;hp_nid != nids[HDA_FRONT]</div><div class='del'>-	    &amp;&amp; !spec-&gt;hp_independent_mode)</div><div class='del'>-		/* headphone out will just decode front left/right (stereo) */</div><div class='del'>-		snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid, stream_tag,</div><div class='del'>-					   0, format);</div><div class='del'>-</div><div class='del'>-	/* extra outputs copied from front */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++)</div><div class='del'>-		if (mout-&gt;extra_out_nid[i])</div><div class='del'>-			snd_hda_codec_setup_stream(codec,</div><div class='del'>-						   mout-&gt;extra_out_nid[i],</div><div class='del'>-						   stream_tag, 0, format);</div><div class='del'>-</div><div class='del'>-	/* surrounds */</div><div class='del'>-	for (i = 1; i &lt; mout-&gt;num_dacs; i++) {</div><div class='del'>-		if (chs &gt;= (i + 1) * 2) /* independent out */</div><div class='del'>-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='del'>-						   i * 2, format);</div><div class='del'>-		else /* copy front */</div><div class='del'>-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag,</div><div class='del'>-						   0, format);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					  struct hda_codec *codec,</div><div class='del'>-					  unsigned int stream_tag,</div><div class='del'>-					  unsigned int format,</div><div class='del'>-					  struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_multi_out *mout = &amp;spec-&gt;multiout;</div><div class='del'>-	hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='del'>-</div><div class='del'>-	if (substream-&gt;number == 0)</div><div class='del'>-		playback_multi_pcm_prep_0(codec, stream_tag, format,</div><div class='del'>-					  substream);</div><div class='del'>-	else {</div><div class='del'>-		if (mout-&gt;hp_nid &amp;&amp; mout-&gt;hp_nid != nids[HDA_FRONT] &amp;&amp;</div><div class='del'>-		    spec-&gt;hp_independent_mode)</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid,</div><div class='del'>-						   stream_tag, 0, format);</div><div class='del'>-	}</div><div class='del'>-	vt1708_start_hp_work(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				    struct hda_codec *codec,</div><div class='del'>-				    struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_multi_out *mout = &amp;spec-&gt;multiout;</div><div class='del'>-	hda_nid_t *nids = mout-&gt;dac_nids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (substream-&gt;number == 0) {</div><div class='del'>-		for (i = 0; i &lt; mout-&gt;num_dacs; i++)</div><div class='del'>-			snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		if (mout-&gt;hp_nid &amp;&amp; !spec-&gt;hp_independent_mode)</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid,</div><div class='del'>-						   0, 0, 0);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(mout-&gt;extra_out_nid); i++)</div><div class='del'>-			if (mout-&gt;extra_out_nid[i])</div><div class='del'>-				snd_hda_codec_setup_stream(codec,</div><div class='del'>-							mout-&gt;extra_out_nid[i],</div><div class='del'>-							0, 0, 0);</div><div class='del'>-		mutex_lock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-		if (mout-&gt;dig_out_nid &amp;&amp;</div><div class='del'>-		    mout-&gt;dig_out_used == HDA_DIG_ANALOG_DUP) {</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;dig_out_nid,</div><div class='del'>-						   0, 0, 0);</div><div class='del'>-			mout-&gt;dig_out_used = 0;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;codec-&gt;spdif_mutex);</div><div class='del'>-	} else {</div><div class='del'>-		if (mout-&gt;hp_nid &amp;&amp; mout-&gt;hp_nid != nids[HDA_FRONT] &amp;&amp;</div><div class='del'>-		    spec-&gt;hp_independent_mode)</div><div class='del'>-			snd_hda_codec_setup_stream(codec, mout-&gt;hp_nid,</div><div class='del'>-						   0, 0, 0);</div><div class='del'>-	}</div><div class='del'>-	vt1708_stop_hp_work(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Digital out</div><div class='del'>- */</div><div class='del'>-static int via_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,</div><div class='del'>-				     struct hda_codec *codec,</div><div class='del'>-				     struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_open(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-				      struct hda_codec *codec,</div><div class='del'>-				      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_close(codec, &amp;spec-&gt;multiout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					unsigned int stream_tag,</div><div class='del'>-					unsigned int format,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_multi_out_dig_prepare(codec, &amp;spec-&gt;multiout,</div><div class='del'>-					     stream_tag, format, substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-					struct hda_codec *codec,</div><div class='del'>-					struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_multi_out_dig_cleanup(codec, &amp;spec-&gt;multiout);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Analog capture</div><div class='del'>- */</div><div class='del'>-static int via_capture_pcm_prepare(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   unsigned int stream_tag,</div><div class='del'>-				   unsigned int format,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_setup_stream(codec, spec-&gt;adc_nids[substream-&gt;number],</div><div class='del'>-				   stream_tag, 0, format);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,</div><div class='del'>-				   struct hda_codec *codec,</div><div class='del'>-				   struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	snd_hda_codec_cleanup_stream(codec, spec-&gt;adc_nids[substream-&gt;number]);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	/* We got noisy outputs on the right channel on VT1708 when</div><div class='del'>-	 * 24bit samples are used.  Until any workaround is found,</div><div class='del'>-	 * disable the 24bit format, so far.</div><div class='del'>-	 */</div><div class='del'>-	.formats = SNDRV_PCM_FMTBIT_S16_LE,</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x15, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int via_build_controls(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct snd_kcontrol *kctl;</div><div class='del'>-	struct snd_kcontrol_new *knew;</div><div class='del'>-	int err, i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		err = snd_hda_add_new_ctls(codec, spec-&gt;mixers[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_out_ctls(codec,</div><div class='del'>-						    spec-&gt;multiout.dig_out_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		err = snd_hda_create_spdif_share_sw(codec,</div><div class='del'>-						    &amp;spec-&gt;multiout);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		spec-&gt;multiout.share_spdif = 1;</div><div class='del'>-	}</div><div class='del'>-	if (spec-&gt;dig_in_nid) {</div><div class='del'>-		err = snd_hda_create_spdif_in_ctls(codec, spec-&gt;dig_in_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* assign Capture Source enums to NID */</div><div class='del'>-	kctl = snd_hda_find_mixer_ctl(codec, "Input Source");</div><div class='del'>-	for (i = 0; kctl &amp;&amp; i &lt; kctl-&gt;count; i++) {</div><div class='del'>-		err = snd_hda_add_nid(codec, kctl, i, spec-&gt;mux_nids[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* other nid-&gt;control mapping */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_mixers; i++) {</div><div class='del'>-		for (knew = spec-&gt;mixers[i]; knew-&gt;name; knew++) {</div><div class='del'>-			if (knew-&gt;iface != NID_MAPPING)</div><div class='del'>-				continue;</div><div class='del'>-			kctl = snd_hda_find_mixer_ctl(codec, knew-&gt;name);</div><div class='del'>-			if (kctl == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			err = snd_hda_add_nid(codec, kctl, 0,</div><div class='del'>-					      knew-&gt;subdevice);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* init power states */</div><div class='del'>-	set_jack_power_state(codec);</div><div class='del'>-	analog_low_current_mode(codec, 1);</div><div class='del'>-</div><div class='del'>-	via_free_kctls(codec); /* no longer needed */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_build_pcms(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_pcm *info = spec-&gt;pcm_rec;</div><div class='del'>-</div><div class='del'>-	codec-&gt;num_pcms = 1;</div><div class='del'>-	codec-&gt;pcm_info = info;</div><div class='del'>-</div><div class='del'>-	info-&gt;name = spec-&gt;stream_name_analog;</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-		*(spec-&gt;stream_analog_playback);</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-		spec-&gt;multiout.dac_nids[0];</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec-&gt;stream_analog_capture);</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec-&gt;adc_nids[0];</div><div class='del'>-</div><div class='del'>-	info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max =</div><div class='del'>-		spec-&gt;multiout.max_channels;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.dig_out_nid || spec-&gt;dig_in_nid) {</div><div class='del'>-		codec-&gt;num_pcms++;</div><div class='del'>-		info++;</div><div class='del'>-		info-&gt;name = spec-&gt;stream_name_digital;</div><div class='del'>-		info-&gt;pcm_type = HDA_PCM_TYPE_SPDIF;</div><div class='del'>-		if (spec-&gt;multiout.dig_out_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK] =</div><div class='del'>-				*(spec-&gt;stream_digital_playback);</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_PLAYBACK].nid =</div><div class='del'>-				spec-&gt;multiout.dig_out_nid;</div><div class='del'>-		}</div><div class='del'>-		if (spec-&gt;dig_in_nid) {</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE] =</div><div class='del'>-				*(spec-&gt;stream_digital_capture);</div><div class='del'>-			info-&gt;stream[SNDRV_PCM_STREAM_CAPTURE].nid =</div><div class='del'>-				spec-&gt;dig_in_nid;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_free(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (!spec)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	via_free_kctls(codec);</div><div class='del'>-	vt1708_stop_hp_work(spec);</div><div class='del'>-	kfree(codec-&gt;spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute internal speaker if HP is plugged */</div><div class='del'>-static void via_hp_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int present = 0;</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;hp_independent_mode) {</div><div class='del'>-		struct snd_ctl_elem_id id;</div><div class='del'>-		/* auto mute */</div><div class='del'>-		snd_hda_codec_amp_stereo(</div><div class='del'>-			codec, spec-&gt;autocfg.line_out_pins[0], HDA_OUTPUT, 0,</div><div class='del'>-			HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-		/* notify change */</div><div class='del'>-		memset(&amp;id, 0, sizeof(id));</div><div class='del'>-		id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-		strcpy(id.name, "Front Playback Switch");</div><div class='del'>-		snd_ctl_notify(codec-&gt;bus-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute mono out if HP or Line out is plugged */</div><div class='del'>-static void via_mono_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int hp_present, lineout_present;</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_type != VT1716S)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lineout_present = snd_hda_jack_detect(codec,</div><div class='del'>-					      spec-&gt;autocfg.line_out_pins[0]);</div><div class='del'>-</div><div class='del'>-	/* Mute Mono Out if Line Out is plugged */</div><div class='del'>-	if (lineout_present) {</div><div class='del'>-		snd_hda_codec_amp_stereo(</div><div class='del'>-			codec, 0x2A, HDA_OUTPUT, 0, HDA_AMP_MUTE, HDA_AMP_MUTE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hp_present = snd_hda_jack_detect(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;hp_independent_mode)</div><div class='del'>-		snd_hda_codec_amp_stereo(</div><div class='del'>-			codec, 0x2A, HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-			hp_present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void via_gpio_control(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int gpio_data;</div><div class='del'>-	unsigned int vol_counter;</div><div class='del'>-	unsigned int vol;</div><div class='del'>-	unsigned int master_vol;</div><div class='del'>-</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	gpio_data = snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-				       AC_VERB_GET_GPIO_DATA, 0) &amp; 0x03;</div><div class='del'>-</div><div class='del'>-	vol_counter = (snd_hda_codec_read(codec, codec-&gt;afg, 0,</div><div class='del'>-					  0xF84, 0) &amp; 0x3F0000) &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	vol = vol_counter &amp; 0x1F;</div><div class='del'>-	master_vol = snd_hda_codec_read(codec, 0x1A, 0,</div><div class='del'>-					AC_VERB_GET_AMP_GAIN_MUTE,</div><div class='del'>-					AC_AMP_GET_INPUT);</div><div class='del'>-</div><div class='del'>-	if (gpio_data == 0x02) {</div><div class='del'>-		/* unmute line out */</div><div class='del'>-		snd_hda_codec_amp_stereo(codec, spec-&gt;autocfg.line_out_pins[0],</div><div class='del'>-					 HDA_OUTPUT, 0, HDA_AMP_MUTE, 0);</div><div class='del'>-</div><div class='del'>-		if (vol_counter &amp; 0x20) {</div><div class='del'>-			/* decrease volume */</div><div class='del'>-			if (vol &gt; master_vol)</div><div class='del'>-				vol = master_vol;</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, 0x1A, HDA_INPUT,</div><div class='del'>-						 0, HDA_AMP_VOLMASK,</div><div class='del'>-						 master_vol-vol);</div><div class='del'>-		} else {</div><div class='del'>-			/* increase volume */</div><div class='del'>-			snd_hda_codec_amp_stereo(codec, 0x1A, HDA_INPUT, 0,</div><div class='del'>-					 HDA_AMP_VOLMASK,</div><div class='del'>-					 ((master_vol+vol) &gt; 0x2A) ? 0x2A :</div><div class='del'>-					  (master_vol+vol));</div><div class='del'>-		}</div><div class='del'>-	} else if (!(gpio_data &amp; 0x02)) {</div><div class='del'>-		/* mute line out */</div><div class='del'>-		snd_hda_codec_amp_stereo(codec,</div><div class='del'>-					 spec-&gt;autocfg.line_out_pins[0],</div><div class='del'>-					 HDA_OUTPUT, 0, HDA_AMP_MUTE,</div><div class='del'>-					 HDA_AMP_MUTE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute Internal-Speaker if HP is plugged */</div><div class='del'>-static void via_speaker_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	unsigned int hp_present;</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_type != VT2002P &amp;&amp; spec-&gt;codec_type != VT1812)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hp_present = snd_hda_jack_detect(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;hp_independent_mode) {</div><div class='del'>-		struct snd_ctl_elem_id id;</div><div class='del'>-		snd_hda_codec_amp_stereo(</div><div class='del'>-			codec, spec-&gt;autocfg.speaker_pins[0], HDA_OUTPUT, 0,</div><div class='del'>-			HDA_AMP_MUTE, hp_present ? HDA_AMP_MUTE : 0);</div><div class='del'>-		/* notify change */</div><div class='del'>-		memset(&amp;id, 0, sizeof(id));</div><div class='del'>-		id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-		strcpy(id.name, "Speaker Playback Switch");</div><div class='del'>-		snd_ctl_notify(codec-&gt;bus-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE,</div><div class='del'>-			       &amp;id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mute line-out and internal speaker if HP is plugged */</div><div class='del'>-static void via_hp_bind_automute(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	/* use long instead of int below just to avoid an internal compiler</div><div class='del'>-	 * error with gcc 4.0.x</div><div class='del'>-	 */</div><div class='del'>-	unsigned long hp_present, present = 0;</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;autocfg.hp_pins[0] || !spec-&gt;autocfg.line_out_pins[0])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	hp_present = snd_hda_jack_detect(codec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-</div><div class='del'>-	present = snd_hda_jack_detect(codec, spec-&gt;autocfg.line_out_pins[0]);</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;hp_independent_mode) {</div><div class='del'>-		/* Mute Line-Outs */</div><div class='del'>-		for (i = 0; i &lt; spec-&gt;autocfg.line_outs; i++)</div><div class='del'>-			snd_hda_codec_amp_stereo(</div><div class='del'>-				codec, spec-&gt;autocfg.line_out_pins[i],</div><div class='del'>-				HDA_OUTPUT, 0,</div><div class='del'>-				HDA_AMP_MUTE, hp_present ? HDA_AMP_MUTE : 0);</div><div class='del'>-		if (hp_present)</div><div class='del'>-			present = hp_present;</div><div class='del'>-	}</div><div class='del'>-	/* Speakers */</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.speaker_outs; i++)</div><div class='del'>-		snd_hda_codec_amp_stereo(</div><div class='del'>-			codec, spec-&gt;autocfg.speaker_pins[i], HDA_OUTPUT, 0,</div><div class='del'>-			HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* unsolicited event for jack sensing */</div><div class='del'>-static void via_unsol_event(struct hda_codec *codec,</div><div class='del'>-				  unsigned int res)</div><div class='del'>-{</div><div class='del'>-	res &gt;&gt;= 26;</div><div class='del'>-	if (res &amp; VIA_HP_EVENT)</div><div class='del'>-		via_hp_automute(codec);</div><div class='del'>-	if (res &amp; VIA_GPIO_EVENT)</div><div class='del'>-		via_gpio_control(codec);</div><div class='del'>-	if (res &amp; VIA_JACK_EVENT)</div><div class='del'>-		set_jack_power_state(codec);</div><div class='del'>-	if (res &amp; VIA_MONO_EVENT)</div><div class='del'>-		via_mono_automute(codec);</div><div class='del'>-	if (res &amp; VIA_SPEAKER_EVENT)</div><div class='del'>-		via_speaker_automute(codec);</div><div class='del'>-	if (res &amp; VIA_BIND_HP_EVENT)</div><div class='del'>-		via_hp_bind_automute(codec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int via_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_iverbs; i++)</div><div class='del'>-		snd_hda_sequence_write(codec, spec-&gt;init_verbs[i]);</div><div class='del'>-</div><div class='del'>-	spec-&gt;codec_type = get_codec_type(codec);</div><div class='del'>-	if (spec-&gt;codec_type == VT1708BCE)</div><div class='del'>-		spec-&gt;codec_type = VT1708S; /* VT1708BCE &amp; VT1708S are almost</div><div class='del'>-					       same */</div><div class='del'>-	/* Lydia Add for EAPD enable */</div><div class='del'>-	if (!spec-&gt;dig_in_nid) { /* No Digital In connection */</div><div class='del'>-		if (spec-&gt;dig_in_pin) {</div><div class='del'>-			snd_hda_codec_write(codec, spec-&gt;dig_in_pin, 0,</div><div class='del'>-					    AC_VERB_SET_PIN_WIDGET_CONTROL,</div><div class='del'>-					    PIN_OUT);</div><div class='del'>-			snd_hda_codec_write(codec, spec-&gt;dig_in_pin, 0,</div><div class='del'>-					    AC_VERB_SET_EAPD_BTLENABLE, 0x02);</div><div class='del'>-		}</div><div class='del'>-	} else /* enable SPDIF-input pin */</div><div class='del'>-		snd_hda_codec_write(codec, spec-&gt;autocfg.dig_in_pin, 0,</div><div class='del'>-				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN);</div><div class='del'>-</div><div class='del'>-	/* assign slave outs */</div><div class='del'>-	if (spec-&gt;slave_dig_outs[0])</div><div class='del'>-		codec-&gt;slave_dig_outs = spec-&gt;slave_dig_outs;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-static int via_suspend(struct hda_codec *codec, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	vt1708_stop_hp_work(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	return snd_hda_check_amp_list_power(codec, &amp;spec-&gt;loopback, nid);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_ops via_patch_ops = {</div><div class='del'>-	.build_controls = via_build_controls,</div><div class='del'>-	.build_pcms = via_build_pcms,</div><div class='del'>-	.init = via_init,</div><div class='del'>-	.free = via_free,</div><div class='del'>-#ifdef SND_HDA_NEEDS_RESUME</div><div class='del'>-	.suspend = via_suspend,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	.check_power_status = via_check_power_status,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1708_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid) {</div><div class='del'>-			/* config dac list */</div><div class='del'>-			switch (i) {</div><div class='del'>-			case AUTO_SEQ_FRONT:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_CENLFE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x12;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SURROUND:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SIDE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x13;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };</div><div class='del'>-	hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					"Center Playback Volume",</div><div class='del'>-					HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-							    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Center Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "LFE Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-			/* add control to mixer index 0 */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Master Front Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Master Front Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			/* add control to PW3 */</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void create_hp_imux(struct via_spec *spec)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux[1];</div><div class='del'>-	static const char *texts[] = { "OFF", "ON", NULL};</div><div class='del'>-</div><div class='del'>-	/* for hp mode select */</div><div class='del'>-	for (i = 0; texts[i]; i++)</div><div class='del'>-		snd_hda_add_imux_item(imux, texts[i], i, NULL);</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_mux = &amp;spec-&gt;private_imux[1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = VT1708_HP_NID; /* AOW3 */</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-					    const struct auto_pin_cfg *cfg,</div><div class='del'>-					    hda_nid_t cap_nid,</div><div class='del'>-					    hda_nid_t pin_idxs[], int num_idxs)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-	int i, err, idx, type, type_idx = 0;</div><div class='del'>-</div><div class='del'>-	/* for internal loopback recording select */</div><div class='del'>-	for (idx = 0; idx &lt; num_idxs; idx++) {</div><div class='del'>-		if (pin_idxs[idx] == 0xff) {</div><div class='del'>-			snd_hda_add_imux_item(imux, "Stereo Mixer", idx, NULL);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cfg-&gt;num_inputs; i++) {</div><div class='del'>-		const char *label;</div><div class='del'>-		type = cfg-&gt;inputs[i].type;</div><div class='del'>-		for (idx = 0; idx &lt; num_idxs; idx++)</div><div class='del'>-			if (pin_idxs[idx] == cfg-&gt;inputs[i].pin)</div><div class='del'>-				break;</div><div class='del'>-		if (idx &gt;= num_idxs)</div><div class='del'>-			continue;</div><div class='del'>-		if (i &gt; 0 &amp;&amp; type == cfg-&gt;inputs[i - 1].type)</div><div class='del'>-			type_idx++;</div><div class='del'>-		else</div><div class='del'>-			type_idx = 0;</div><div class='del'>-		label = hda_get_autocfg_input_label(codec, cfg, i);</div><div class='del'>-		err = via_new_analog_input(spec, label, type_idx, idx, cap_nid);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-		snd_hda_add_imux_item(imux, label, idx, NULL);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1708_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0xff, 0x24, 0x1d, 0x1e, 0x21 };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x17, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1708_loopbacks[] = {</div><div class='del'>-	{ 0x17, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x17, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x17, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x17, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void vt1708_set_pinconfig_connect(struct hda_codec *codec, hda_nid_t nid)</div><div class='del'>-{</div><div class='del'>-	unsigned int def_conf;</div><div class='del'>-	unsigned char seqassoc;</div><div class='del'>-</div><div class='del'>-	def_conf = snd_hda_codec_get_pincfg(codec, nid);</div><div class='del'>-	seqassoc = (unsigned char) get_defcfg_association(def_conf);</div><div class='del'>-	seqassoc = (seqassoc &lt;&lt; 4) | get_defcfg_sequence(def_conf);</div><div class='del'>-	if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE</div><div class='del'>-	    &amp;&amp; (seqassoc == 0xf0 || seqassoc == 0xff)) {</div><div class='del'>-		def_conf = def_conf &amp; (~(AC_JACK_PORT_BOTH &lt;&lt; 30));</div><div class='del'>-		snd_hda_codec_set_pincfg(codec, nid, def_conf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708_jack_detectect_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_type != VT1708)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;vt1708_jack_detectect =</div><div class='del'>-		!((snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) &gt;&gt; 8) &amp; 0x1);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = spec-&gt;vt1708_jack_detectect;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708_jack_detectect_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-				     struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int change;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;codec_type != VT1708)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;vt1708_jack_detectect = ucontrol-&gt;value.integer.value[0];</div><div class='del'>-	change = (0x1 &amp; (snd_hda_codec_read(codec, 0x1, 0, 0xf84, 0) &gt;&gt; 8))</div><div class='del'>-		== !spec-&gt;vt1708_jack_detectect;</div><div class='del'>-	if (spec-&gt;vt1708_jack_detectect) {</div><div class='del'>-		mute_aa_path(codec, 1);</div><div class='del'>-		notify_aa_path_ctls(codec);</div><div class='del'>-	}</div><div class='del'>-	return change;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new vt1708_jack_detectect[] = {</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Jack Detect",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = snd_ctl_boolean_mono_info,</div><div class='del'>-		.get = vt1708_jack_detectect_get,</div><div class='del'>-		.put = vt1708_jack_detectect_put,</div><div class='del'>-	},</div><div class='del'>-	{} /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vt1708_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Add HP and CD pin config connect bit re-config action */</div><div class='del'>-	vt1708_set_pinconfig_connect(codec, VT1708_HP_PIN_NID);</div><div class='del'>-	vt1708_set_pinconfig_connect(codec, VT1708_CD_PIN_NID);</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1708_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	/* add jack detect on/off control */</div><div class='del'>-	err = snd_hda_add_new_ctls(codec, vt1708_jack_detectect);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = VT1708_DIGOUT_NID;</div><div class='del'>-	spec-&gt;dig_in_pin = VT1708_DIGIN_PIN;</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = VT1708_DIGIN_NID;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708_volume_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* init callback for auto-configuration model -- overriding the default init */</div><div class='del'>-static int via_auto_init(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-</div><div class='del'>-	via_init(codec);</div><div class='del'>-	via_auto_init_multi_out(codec);</div><div class='del'>-	via_auto_init_hp_out(codec);</div><div class='del'>-	via_auto_init_analog_input(codec);</div><div class='del'>-	if (spec-&gt;codec_type == VT2002P || spec-&gt;codec_type == VT1812) {</div><div class='del'>-		via_hp_bind_automute(codec);</div><div class='del'>-	} else {</div><div class='del'>-		via_hp_automute(codec);</div><div class='del'>-		via_speaker_automute(codec);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vt1708_update_hp_jack_state(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = container_of(work, struct via_spec,</div><div class='del'>-					     vt1708_hp_work.work);</div><div class='del'>-	if (spec-&gt;codec_type != VT1708)</div><div class='del'>-		return;</div><div class='del'>-	/* if jack state toggled */</div><div class='del'>-	if (spec-&gt;vt1708_hp_present</div><div class='del'>-	    != snd_hda_jack_detect(spec-&gt;codec, spec-&gt;autocfg.hp_pins[0])) {</div><div class='del'>-		spec-&gt;vt1708_hp_present ^= 1;</div><div class='del'>-		via_hp_automute(spec-&gt;codec);</div><div class='del'>-	}</div><div class='del'>-	vt1708_start_hp_work(spec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_mux_nids(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	hda_nid_t nid, conn[8];</div><div class='del'>-	unsigned int type;</div><div class='del'>-	int i, n;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;num_adc_nids; i++) {</div><div class='del'>-		nid = spec-&gt;adc_nids[i];</div><div class='del'>-		while (nid) {</div><div class='del'>-			type = get_wcaps_type(get_wcaps(codec, nid));</div><div class='del'>-			if (type == AC_WID_PIN)</div><div class='del'>-				break;</div><div class='del'>-			n = snd_hda_get_connections(codec, nid, conn,</div><div class='del'>-						    ARRAY_SIZE(conn));</div><div class='del'>-			if (n &lt;= 0)</div><div class='del'>-				break;</div><div class='del'>-			if (n &gt; 1) {</div><div class='del'>-				spec-&gt;mux_nids[i] = nid;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			nid = conn[0];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_vt1708(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1708_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1708 Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1708_pcm_analog_playback;</div><div class='del'>-	/* disable 32bit format on VT1708 */</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11061708)</div><div class='del'>-		spec-&gt;stream_analog_playback = &amp;vt1708_pcm_analog_s16_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1708_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1708 Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1708_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;vt1708_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1708_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1708_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1708_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1708_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	INIT_DELAYED_WORK(&amp;spec-&gt;vt1708_hp_work, vt1708_update_hp_jack_state);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1709_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x15, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x16, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x16, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1709_uniwill_init_verbs[] = {</div><div class='del'>-	{0x20, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb vt1709_10ch_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: AOW0=0, CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output selector (0x1a, 0x1b, 0x29)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Unmute PW3 and PW4</div><div class='del'>-	 */</div><div class='del'>-	{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Set input of PW4 as MW0 */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1709_10ch_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 10,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1709_6ch_pcm_analog_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 6,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1709_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x14, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1709_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1709_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vt1709_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_outs == 4)  /* 10 channels */</div><div class='del'>-		spec-&gt;multiout.num_dacs = cfg-&gt;line_outs+1; /* AOW0~AOW4 */</div><div class='del'>-	else if (cfg-&gt;line_outs == 3) /* 6 channels */</div><div class='del'>-		spec-&gt;multiout.num_dacs = cfg-&gt;line_outs; /* AOW0~AOW2 */</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_outs == 4) { /* 10 channels */</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-			nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-			if (nid) {</div><div class='del'>-				/* config dac list */</div><div class='del'>-				switch (i) {</div><div class='del'>-				case AUTO_SEQ_FRONT:</div><div class='del'>-					/* AOW0 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-					break;</div><div class='del'>-				case AUTO_SEQ_CENLFE:</div><div class='del'>-					/* AOW2 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x12;</div><div class='del'>-					break;</div><div class='del'>-				case AUTO_SEQ_SURROUND:</div><div class='del'>-					/* AOW3 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-					break;</div><div class='del'>-				case AUTO_SEQ_SIDE:</div><div class='del'>-					/* AOW1 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x27;</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		spec-&gt;multiout.dac_nids[cfg-&gt;line_outs] = 0x28; /* AOW4 */</div><div class='del'>-</div><div class='del'>-	} else if (cfg-&gt;line_outs == 3) { /* 6 channels */</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;line_outs; i++) {</div><div class='del'>-			nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-			if (nid) {</div><div class='del'>-				/* config dac list */</div><div class='del'>-				switch (i) {</div><div class='del'>-				case AUTO_SEQ_FRONT:</div><div class='del'>-					/* AOW0 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-					break;</div><div class='del'>-				case AUTO_SEQ_CENLFE:</div><div class='del'>-					/* AOW2 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x12;</div><div class='del'>-					break;</div><div class='del'>-				case AUTO_SEQ_SURROUND:</div><div class='del'>-					/* AOW1 */</div><div class='del'>-					spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-					break;</div><div class='del'>-				default:</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };</div><div class='del'>-	hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29};</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Center Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "LFE Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-			/* ADD control to mixer index 0 */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Master Front Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Master Front Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			/* add control to PW3 */</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_SURROUND) {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_SIDE) {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1709_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;multiout.num_dacs == 5) /* 10 channels */</div><div class='del'>-		spec-&gt;multiout.hp_nid = VT1709_HP_DAC_NID;</div><div class='del'>-	else if (spec-&gt;multiout.num_dacs == 3) /* 6 channels */</div><div class='del'>-		spec-&gt;multiout.hp_nid = 0;</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1709_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0xff, 0x23, 0x1d, 0x1e, 0x21 };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x18, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1709_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1709_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1709_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1709_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1709_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = VT1709_DIGOUT_NID;</div><div class='del'>-	spec-&gt;dig_in_pin = VT1709_DIGIN_PIN;</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = VT1709_DIGIN_NID;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1709_loopbacks[] = {</div><div class='del'>-	{ 0x18, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x18, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x18, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x18, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int patch_vt1709_10ch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = vt1709_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration.  "</div><div class='del'>-		       "Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1709_10ch_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1709_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1709 Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1709_10ch_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1709_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1709 Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1709_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;vt1709_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1709_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1709_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1709_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb vt1709_6ch_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-2 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: AOW0=0, CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output selector (0x1a, 0x1b, 0x29)</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *  Unmute PW3 and PW4</div><div class='del'>-	 */</div><div class='del'>-	{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Set input of PW4 as MW0 */</div><div class='del'>-	{0x20, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int patch_vt1709_6ch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	err = vt1709_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration.  "</div><div class='del'>-		       "Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1709_6ch_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1709_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1709 Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1709_6ch_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1709_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1709 Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1709_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;vt1709_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1709_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1709_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1709_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1709_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1708B_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-/*</div><div class='del'>- * generic initialization of ADC, input mixers and output mixers</div><div class='del'>- */</div><div class='del'>-static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Setup default input to PW4 */</div><div class='del'>-	{0x1d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* PW10 Input enable */</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Set up output mixers</div><div class='del'>-	 */</div><div class='del'>-	/* set vol=0 to output mixers */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of PW4 to MW0 */</div><div class='del'>-	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* PW10 Input enable */</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1708B_uniwill_init_verbs[] = {</div><div class='del'>-	{0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x22, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int via_pcm_open_close(struct hda_pcm_stream *hinfo,</div><div class='del'>-			      struct hda_codec *codec,</div><div class='del'>-			      struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	int idle = substream-&gt;pstr-&gt;substream_opened == 1</div><div class='del'>-		&amp;&amp; substream-&gt;ref_count == 0;</div><div class='del'>-</div><div class='del'>-	analog_low_current_mode(codec, idle);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 4,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708B_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x13, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708B_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708B_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid) {</div><div class='del'>-			/* config dac list */</div><div class='del'>-			switch (i) {</div><div class='del'>-			case AUTO_SEQ_FRONT:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_CENLFE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x24;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SURROUND:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SIDE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x25;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };</div><div class='del'>-	hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27};</div><div class='del'>-	hda_nid_t nid, nid_vol = 0;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Center Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "LFE Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-			/* add control to mixer index 0 */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Master Front Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Master Front Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			/* add control to PW3 */</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708B_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = VT1708B_HP_NID; /* AOW3 */</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1708B_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0xff, 0x1f, 0x1a, 0x1b, 0x1e };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708B_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708B_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1708B_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708B_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708B_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_outs)</div><div class='del'>-		spec-&gt;multiout.dig_out_nid = VT1708B_DIGOUT_NID;</div><div class='del'>-	spec-&gt;dig_in_pin = VT1708B_DIGIN_PIN;</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin)</div><div class='del'>-		spec-&gt;dig_in_nid = VT1708B_DIGIN_NID;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1708B_loopbacks[] = {</div><div class='del'>-	{ 0x16, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-static int patch_vt1708S(struct hda_codec *codec);</div><div class='del'>-static int patch_vt1708B_8ch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (get_codec_type(codec) == VT1708BCE)</div><div class='del'>-		return patch_vt1708S(codec);</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1708B_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708B_8ch_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708B_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1708B Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1708B_8ch_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1708B_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1708B Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1708B_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;vt1708B_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1708B_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1708B_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1708B_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_vt1708B_4ch(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1708B_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708B_4ch_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708B_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1708B Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1708B_4ch_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1708B_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1708B Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1708B_pcm_digital_playback;</div><div class='del'>-	spec-&gt;stream_digital_capture = &amp;vt1708B_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1708B_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1708B_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1708B_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1708B_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Patch for VT1708S */</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1708S_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x1A, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x1E, 0x0,</div><div class='del'>-			 HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1708S_volume_init_verbs[] = {</div><div class='del'>-	/* Unmute ADC0-1 and set the default input to mic-in */</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the</div><div class='del'>-	 * analog-loopback mixer widget */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of PW4 to MW0 */</div><div class='del'>-	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-	/* PW9, PW10  Output enable */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* Enable Mic Boost Volume backdoor */</div><div class='del'>-	{0x1, 0xf98, 0x1},</div><div class='del'>-	/* don't bybass mixer */</div><div class='del'>-	{0x1, 0xf88, 0xc0},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1708S_uniwill_init_verbs[] = {</div><div class='del'>-	{0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x22, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708S_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 8,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708S_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x13, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1708S_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1708S_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid) {</div><div class='del'>-			/* config dac list */</div><div class='del'>-			switch (i) {</div><div class='del'>-			case AUTO_SEQ_FRONT:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_CENLFE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x24;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SURROUND:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SIDE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x25;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* for Smart 5.1, line/mic inputs double as output pins */</div><div class='del'>-	if (cfg-&gt;line_outs == 1) {</div><div class='del'>-		spec-&gt;multiout.num_dacs = 3;</div><div class='del'>-		spec-&gt;multiout.dac_nids[AUTO_SEQ_SURROUND] = 0x11;</div><div class='del'>-		spec-&gt;multiout.dac_nids[AUTO_SEQ_CENLFE] = 0x24;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1708S_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };</div><div class='del'>-	hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25};</div><div class='del'>-	hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27};</div><div class='del'>-	hda_nid_t nid, nid_vol, nid_mute;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		/* for Smart 5.1, there are always at least six channels */</div><div class='del'>-		if (!nid &amp;&amp; i &gt; AUTO_SEQ_CENLFE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-		nid_mute = nid_mutes[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Center Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_mute,</div><div class='del'>-								  1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "LFE Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_mute,</div><div class='del'>-								  2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-			/* add control to mixer index 0 */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Master Front Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(0x16, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-					      "Master Front Playback Switch",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(0x16, 3, 0,</div><div class='del'>-								  HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			/* Front */</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_mute,</div><div class='del'>-								  3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_mute,</div><div class='del'>-								  3, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = VT1708S_HP_NID; /* AOW3 */</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x25, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1708S_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x1f, 0x1a, 0x1b, 0x1e, 0, 0xff };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill out digital output widgets; one for master and one for slave outputs */</div><div class='del'>-static void fill_dig_outs(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; spec-&gt;autocfg.dig_outs; i++) {</div><div class='del'>-		hda_nid_t nid;</div><div class='del'>-		int conn;</div><div class='del'>-</div><div class='del'>-		nid = spec-&gt;autocfg.dig_out_pins[i];</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		conn = snd_hda_get_connections(codec, nid, &amp;nid, 1);</div><div class='del'>-		if (conn &lt; 1)</div><div class='del'>-			continue;</div><div class='del'>-		if (!spec-&gt;multiout.dig_out_nid)</div><div class='del'>-			spec-&gt;multiout.dig_out_nid = nid;</div><div class='del'>-		else {</div><div class='del'>-			spec-&gt;slave_dig_outs[0] = nid;</div><div class='del'>-			break; /* at most two dig outs */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1708S_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708S_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1708S_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708S_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1708S_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1708S_loopbacks[] = {</div><div class='del'>-	{ 0x16, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void override_mic_boost(struct hda_codec *codec, hda_nid_t pin,</div><div class='del'>-			       int offset, int num_steps, int step_size)</div><div class='del'>-{</div><div class='del'>-	snd_hda_override_amp_caps(codec, pin, HDA_INPUT,</div><div class='del'>-				  (offset &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-				  (num_steps &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-				  (step_size &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-				  (0 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int patch_vt1708S(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1708S_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708S_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1708S_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11060440)</div><div class='del'>-		spec-&gt;stream_name_analog = "VT1818S Analog";</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;stream_name_analog = "VT1708S Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1708S_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1708S_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11060440)</div><div class='del'>-		spec-&gt;stream_name_digital = "VT1818S Digital";</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;stream_name_digital = "VT1708S Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1708S_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1708S_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1708S_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		override_mic_boost(codec, 0x1a, 0, 3, 40);</div><div class='del'>-		override_mic_boost(codec, 0x1e, 0, 3, 40);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1708S_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1708S_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* correct names for VT1708BCE */</div><div class='del'>-	if (get_codec_type(codec) == VT1708BCE)	{</div><div class='del'>-		kfree(codec-&gt;chip_name);</div><div class='del'>-		codec-&gt;chip_name = kstrdup("VT1708BCE", GFP_KERNEL);</div><div class='del'>-		snprintf(codec-&gt;bus-&gt;card-&gt;mixername,</div><div class='del'>-			 sizeof(codec-&gt;bus-&gt;card-&gt;mixername),</div><div class='del'>-			 "%s %s", codec-&gt;vendor_name, codec-&gt;chip_name);</div><div class='del'>-		spec-&gt;stream_name_analog = "VT1708BCE Analog";</div><div class='del'>-		spec-&gt;stream_name_digital = "VT1708BCE Digital";</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Patch for VT1702 */</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1702_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x20, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x1F, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Digital Mic Capture Switch", 0x1F, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Mic Boost Capture Volume", 0x1E, 0x0,</div><div class='del'>-			 HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1702_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1F, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Unmute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: Mic1 = 1, Line = 1, Mic2 = 3 */</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},</div><div class='del'>-	{0x1A, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of PW4 to MW0 */</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* PW6 PW7 Output enable */</div><div class='del'>-	{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x1C, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* mixer enable */</div><div class='del'>-	{0x1, 0xF88, 0x3},</div><div class='del'>-	/* GPIO 0~2 */</div><div class='del'>-	{0x1, 0xF82, 0x3F},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1702_uniwill_init_verbs[] = {</div><div class='del'>-	{0x17, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1702_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1702_pcm_analog_capture = {</div><div class='del'>-	.substreams = 3,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x12, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1702_pcm_digital_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1702_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	if (cfg-&gt;line_out_pins[0]) {</div><div class='del'>-		/* config dac list */</div><div class='del'>-		spec-&gt;multiout.dac_nids[0] = 0x10;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1702_auto_create_line_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;line_out_pins[0])</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* add control to mixer index 0 */</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Master Front Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x1A, 3, 0, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Master Front Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x1A, 3, 0, HDA_INPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Front */</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Front Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Front Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err, i;</div><div class='del'>-	struct hda_input_mux *imux;</div><div class='del'>-	static const char *texts[] = { "ON", "OFF", NULL};</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-	spec-&gt;multiout.hp_nid = 0x1D;</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 0;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x1D, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	imux = &amp;spec-&gt;private_imux[1];</div><div class='del'>-</div><div class='del'>-	/* for hp mode select */</div><div class='del'>-	for (i = 0; texts[i]; i++)</div><div class='del'>-		snd_hda_add_imux_item(imux, texts[i], i, NULL);</div><div class='del'>-</div><div class='del'>-	spec-&gt;hp_mux = &amp;spec-&gt;private_imux[1];</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1702_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x14, 0x15, 0x18, 0xff };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x1a, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1702_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1702_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1702_auto_create_line_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1702_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	/* limit AA path volume to 0 dB */</div><div class='del'>-	snd_hda_override_amp_caps(codec, 0x1A, HDA_INPUT,</div><div class='del'>-				  (0x17 &lt;&lt; AC_AMPCAP_OFFSET_SHIFT) |</div><div class='del'>-				  (0x17 &lt;&lt; AC_AMPCAP_NUM_STEPS_SHIFT) |</div><div class='del'>-				  (0x5 &lt;&lt; AC_AMPCAP_STEP_SIZE_SHIFT) |</div><div class='del'>-				  (1 &lt;&lt; AC_AMPCAP_MUTE_SHIFT));</div><div class='del'>-	err = vt1702_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1702_loopbacks[] = {</div><div class='del'>-	{ 0x1A, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x1A, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x1A, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x1A, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int patch_vt1702(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1702_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1702_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1702_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1702 Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1702_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1702_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1702 Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1702_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1702_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1702_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1702_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1702_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Patch for VT1718S */</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1718S_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x29, 0x0,</div><div class='del'>-			 HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1718S_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of Front HP to MW9 */</div><div class='del'>-	{0x28, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* PW9 PW10 Output enable */</div><div class='del'>-	{0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},</div><div class='del'>-	{0x2e, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},</div><div class='del'>-	/* PW11 Input enable */</div><div class='del'>-	{0x2f, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_IN_EN},</div><div class='del'>-	/* Enable Boost Volume backdoor */</div><div class='del'>-	{0x1, 0xf88, 0x8},</div><div class='del'>-	/* MW0/1/2/3/4: un-mute index 0 (AOWx), mute index 1 (MW9) */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	/* set MUX1 = 2 (AOW4), MUX2 = 1 (AOW3) */</div><div class='del'>-	{0x34, AC_VERB_SET_CONNECT_SEL, 0x2},</div><div class='del'>-	{0x35, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-	/* Unmute MW4's index 0 */</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1718S_uniwill_init_verbs[] = {</div><div class='del'>-	{0x28, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x24, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x25, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x26, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x27, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1718S_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 10,</div><div class='del'>-	.nid = 0x8, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1718S_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1718S_pcm_digital_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1718S_pcm_digital_capture = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1718S_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid) {</div><div class='del'>-			/* config dac list */</div><div class='del'>-			switch (i) {</div><div class='del'>-			case AUTO_SEQ_FRONT:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x8;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_CENLFE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0xa;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SURROUND:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x9;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SIDE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0xb;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1718S_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };</div><div class='del'>-	hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb};</div><div class='del'>-	hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27};</div><div class='del'>-	hda_nid_t nid, nid_vol, nid_mute = 0;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_SIDE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-		nid_mute = nid_mutes[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			/* Center/LFE */</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "Center Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-					      "LFE Playback Volume",</div><div class='del'>-					      HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0,</div><div class='del'>-								  HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-				"Center Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 1, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-				"LFE Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 2, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-			/* Front */</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 3, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 3, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1718S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = 0xc; /* AOW4 */</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0xc, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1718S_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x2c, 0x2b, 0x2a, 0x29, 0, 0xff };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1718S_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1718S_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1718S_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1718S_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1718S_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;autocfg.dig_in_pin &amp;&amp; codec-&gt;vendor_id == 0x11060428)</div><div class='del'>-		spec-&gt;dig_in_nid = 0x13;</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1718S_loopbacks[] = {</div><div class='del'>-	{ 0x21, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int patch_vt1718S(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1718S_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1718S_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1718S_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11060441)</div><div class='del'>-		spec-&gt;stream_name_analog = "VT2020 Analog";</div><div class='del'>-	else if (codec-&gt;vendor_id == 0x11064441)</div><div class='del'>-		spec-&gt;stream_name_analog = "VT1828S Analog";</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;stream_name_analog = "VT1718S Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1718S_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1718S_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11060441)</div><div class='del'>-		spec-&gt;stream_name_digital = "VT2020 Digital";</div><div class='del'>-	else if (codec-&gt;vendor_id == 0x11064441)</div><div class='del'>-		spec-&gt;stream_name_digital = "VT1828S Digital";</div><div class='del'>-	else</div><div class='del'>-		spec-&gt;stream_name_digital = "VT1718S Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1718S_pcm_digital_playback;</div><div class='del'>-	if (codec-&gt;vendor_id == 0x11060428 || codec-&gt;vendor_id == 0x11060441)</div><div class='del'>-		spec-&gt;stream_digital_capture = &amp;vt1718S_pcm_digital_capture;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1718S_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1718S_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='del'>-		override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1718S_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1718S_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Patch for VT1716S */</div><div class='del'>-</div><div class='del'>-static int vt1716s_dmic_info(struct snd_kcontrol *kcontrol,</div><div class='del'>-			    struct snd_ctl_elem_info *uinfo)</div><div class='del'>-{</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.integer.min = 0;</div><div class='del'>-	uinfo-&gt;value.integer.max = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1716s_dmic_get(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	int index = 0;</div><div class='del'>-</div><div class='del'>-	index = snd_hda_codec_read(codec, 0x26, 0,</div><div class='del'>-					       AC_VERB_GET_CONNECT_SEL, 0);</div><div class='del'>-	if (index != -1)</div><div class='del'>-		*ucontrol-&gt;value.integer.value = index;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1716s_dmic_put(struct snd_kcontrol *kcontrol,</div><div class='del'>-			   struct snd_ctl_elem_value *ucontrol)</div><div class='del'>-{</div><div class='del'>-	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int index = *ucontrol-&gt;value.integer.value;</div><div class='del'>-</div><div class='del'>-	snd_hda_codec_write(codec, 0x26, 0,</div><div class='del'>-					       AC_VERB_SET_CONNECT_SEL, index);</div><div class='del'>-	spec-&gt;dmic_enabled = index;</div><div class='del'>-	set_jack_power_state(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1716S_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x14, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x1A, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x1E, 0x0,</div><div class='del'>-			 HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 1,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct snd_kcontrol_new vt1716s_dmic_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-	 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-	 .name = "Digital Mic Capture Switch",</div><div class='del'>-	 .subdevice = HDA_SUBDEV_NID_FLAG | 0x26,</div><div class='del'>-	 .count = 1,</div><div class='del'>-	 .info = vt1716s_dmic_info,</div><div class='del'>-	 .get = vt1716s_dmic_get,</div><div class='del'>-	 .put = vt1716s_dmic_put,</div><div class='del'>-	 },</div><div class='del'>-	{}			/* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* mono-out mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1716S_mono_out_mixer[] = {</div><div class='del'>-	HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT),</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1716S_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* MUX Indices: Stereo Mixer = 5 */</div><div class='del'>-	{0x17, AC_VERB_SET_CONNECT_SEL, 0x5},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of PW4 to MW0 */</div><div class='del'>-	{0x1d, AC_VERB_SET_CONNECT_SEL, 0x0},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of SW1 as MW0 */</div><div class='del'>-	{0x18, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-</div><div class='del'>-	/* Setup default input of SW4 as AOW0 */</div><div class='del'>-	{0x28, AC_VERB_SET_CONNECT_SEL, 0x1},</div><div class='del'>-</div><div class='del'>-	/* PW9 PW10 Output enable */</div><div class='del'>-	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-</div><div class='del'>-	/* Unmute SW1, PW12 */</div><div class='del'>-	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},</div><div class='del'>-	/* PW12 Output enable */</div><div class='del'>-	{0x2a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},</div><div class='del'>-	/* Enable Boost Volume backdoor */</div><div class='del'>-	{0x1, 0xf8a, 0x80},</div><div class='del'>-	/* don't bybass mixer */</div><div class='del'>-	{0x1, 0xf88, 0xc0},</div><div class='del'>-	/* Enable mono output */</div><div class='del'>-	{0x1, 0xf90, 0x08},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1716S_uniwill_init_verbs[] = {</div><div class='del'>-	{0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_MONO_EVENT | VIA_JACK_EVENT},</div><div class='del'>-	{0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1716S_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 6,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1716S_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x13, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1716S_pcm_digital_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1716S_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				      const struct auto_pin_cfg *cfg)</div><div class='del'>-{	int i;</div><div class='del'>-	hda_nid_t nid;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.num_dacs = cfg-&gt;line_outs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-		if (nid) {</div><div class='del'>-			/* config dac list */</div><div class='del'>-			switch (i) {</div><div class='del'>-			case AUTO_SEQ_FRONT:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x10;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_CENLFE:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x25;</div><div class='del'>-				break;</div><div class='del'>-			case AUTO_SEQ_SURROUND:</div><div class='del'>-				spec-&gt;multiout.dac_nids[i] = 0x11;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1716S_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					      const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	char name[32];</div><div class='del'>-	static const char *chname[3] = { "Front", "Surround", "C/LFE" };</div><div class='del'>-	hda_nid_t nid_vols[] = {0x10, 0x11, 0x25};</div><div class='del'>-	hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27};</div><div class='del'>-	hda_nid_t nid, nid_vol, nid_mute;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= AUTO_SEQ_CENLFE; i++) {</div><div class='del'>-		nid = cfg-&gt;line_out_pins[i];</div><div class='del'>-</div><div class='del'>-		if (!nid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		nid_vol = nid_vols[i];</div><div class='del'>-		nid_mute = nid_mutes[i];</div><div class='del'>-</div><div class='del'>-		if (i == AUTO_SEQ_CENLFE) {</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-				"Center Playback Volume",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 1, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-				"LFE Playback Volume",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 2, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-				"Center Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 1, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-				"LFE Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 2, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else if (i == AUTO_SEQ_FRONT) {</div><div class='del'>-</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-				"Master Front Playback Volume",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-				"Master Front Playback Switch",</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(0x16, 3, 0, HDA_INPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 3, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		} else {</div><div class='del'>-			sprintf(name, "%s Playback Volume", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_VOL, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_vol, 3, 0, HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			sprintf(name, "%s Playback Switch", chname[i]);</div><div class='del'>-			err = via_add_control(</div><div class='del'>-				spec, VIA_CTL_WIDGET_MUTE, name,</div><div class='del'>-				HDA_COMPOSE_AMP_VAL(nid_mute, 3, 0,</div><div class='del'>-						    HDA_OUTPUT));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1716S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = 0x25; /* AOW3 */</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x25, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1716S_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x1f, 0x1a, 0x1b, 0x1e, 0, 0xff };</div><div class='del'>-	return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,</div><div class='del'>-						ARRAY_SIZE(pin_idxs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1716S_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1716S_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1716S_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1716S_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1716S_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	via_smart51_build(spec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1716S_loopbacks[] = {</div><div class='del'>-	{ 0x16, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 2 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 3 },</div><div class='del'>-	{ 0x16, HDA_INPUT, 4 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int patch_vt1716S(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1716S_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++]  = vt1716S_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1716S_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1716S Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1716S_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1716S_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1716S Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1716S_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1716S_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1716S_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		override_mic_boost(codec, 0x1a, 0, 3, 40);</div><div class='del'>-		override_mic_boost(codec, 0x1e, 0, 3, 40);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1716S_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;mixers[spec-&gt;num_mixers] = vt1716s_dmic_mixer;</div><div class='del'>-	spec-&gt;num_mixers++;</div><div class='del'>-</div><div class='del'>-	spec-&gt;mixers[spec-&gt;num_mixers++] = vt1716S_mono_out_mixer;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1716S_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for vt2002P */</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt2002P_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME("Front Mic Boost Capture Volume", 0x29, 0x0,</div><div class='del'>-			 HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		/* .name = "Capture Source", */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt2002P_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x8, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x9, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* MUX Indices: Mic = 0 */</div><div class='del'>-	{0x1e, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},</div><div class='del'>-</div><div class='del'>-	/* Enable Boost Volume backdoor */</div><div class='del'>-	{0x1, 0xfb9, 0x24},</div><div class='del'>-</div><div class='del'>-	/* MW0/1/4/8: un-mute index 0 (MUXx), un-mute index 1 (MW9) */</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* set MUX0/1/4/8 = 0 (AOW0) */</div><div class='del'>-	{0x34, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x35, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x37, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x3b, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* set PW0 index=0 (MW0) */</div><div class='del'>-	{0x24, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Enable AOW0 to MW9 */</div><div class='del'>-	{0x1, 0xfb8, 0x88},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt2002P_uniwill_init_verbs[] = {</div><div class='del'>-	{0x25, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},</div><div class='del'>-	{0x26, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},</div><div class='del'>-	{0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt2002P_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x8, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt2002P_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt2002P_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt2002P_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				      const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	if (cfg-&gt;line_out_pins[0])</div><div class='del'>-		spec-&gt;multiout.dac_nids[0] = 0x8;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt2002P_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;line_out_pins[0])</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Line-Out: PortE */</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Master Front Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x8, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_BIND_PIN_MUTE,</div><div class='del'>-			      "Master Front Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x26, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt2002P_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = 0x9;</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(</div><div class='del'>-				      spec-&gt;multiout.hp_nid, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x25, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt2002P_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x2b, 0x2a, 0x29, 0xff };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,</div><div class='del'>-					       ARRAY_SIZE(pin_idxs));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	/* build volume/mute control of loopback */</div><div class='del'>-	err = via_new_analog_input(spec, "Stereo Mixer", 0, 3, 0x21);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* for digital mic select */</div><div class='del'>-	snd_hda_add_imux_item(imux, "Digital Mic", 4, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt2002P_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = vt2002P_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_pins[0])</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt2002P_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt2002P_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt2002P_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt2002P_loopbacks[] = {</div><div class='del'>-	{ 0x21, HDA_INPUT, 0 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 2 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* patch for vt2002P */</div><div class='del'>-static int patch_vt2002P(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt2002P_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++]  = vt2002P_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt2002P_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT2002P Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt2002P_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt2002P_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT2002P Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt2002P_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt2002P_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt2002P_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='del'>-		override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt2002P_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt2002P_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for vt1812 */</div><div class='del'>-</div><div class='del'>-/* capture mixer elements */</div><div class='del'>-static struct snd_kcontrol_new vt1812_capture_mixer[] = {</div><div class='del'>-	HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x11, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Mic Boost Capture Volume", 0x2b, 0x0, HDA_INPUT),</div><div class='del'>-	HDA_CODEC_MUTE("Front Mic Boost Capture Volume", 0x29, 0x0,</div><div class='del'>-		       HDA_INPUT),</div><div class='del'>-	{</div><div class='del'>-		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		/* The multiple "Capture Source" controls confuse alsamixer</div><div class='del'>-		 * So call somewhat different..</div><div class='del'>-		 */</div><div class='del'>-		.name = "Input Source",</div><div class='del'>-		.count = 2,</div><div class='del'>-		.info = via_mux_enum_info,</div><div class='del'>-		.get = via_mux_enum_get,</div><div class='del'>-		.put = via_mux_enum_put,</div><div class='del'>-	},</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1812_volume_init_verbs[] = {</div><div class='del'>-	/*</div><div class='del'>-	 * Unmute ADC0-1 and set the default input to mic-in</div><div class='del'>-	 */</div><div class='del'>-	{0x8, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x9, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Mute input amps (CD, Line In, Mic 1 &amp; Mic 2) of the analog-loopback</div><div class='del'>-	 * mixer widget</div><div class='del'>-	 */</div><div class='del'>-	/* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},</div><div class='del'>-	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},</div><div class='del'>-</div><div class='del'>-	/* MUX Indices: Mic = 0 */</div><div class='del'>-	{0x1e, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x1f, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* PW9 Output enable */</div><div class='del'>-	{0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},</div><div class='del'>-</div><div class='del'>-	/* Enable Boost Volume backdoor */</div><div class='del'>-	{0x1, 0xfb9, 0x24},</div><div class='del'>-</div><div class='del'>-	/* MW0/1/4/13/15: un-mute index 0 (MUXx), un-mute index 1 (MW9) */</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},</div><div class='del'>-	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},</div><div class='del'>-</div><div class='del'>-	/* set MUX0/1/4/13/15 = 0 (AOW0) */</div><div class='del'>-	{0x34, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x35, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x38, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x3c, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-	{0x3d, AC_VERB_SET_CONNECT_SEL, 0},</div><div class='del'>-</div><div class='del'>-	/* Enable AOW0 to MW9 */</div><div class='del'>-	{0x1, 0xfb8, 0xa8},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct hda_verb vt1812_uniwill_init_verbs[] = {</div><div class='del'>-	{0x33, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},</div><div class='del'>-	{0x25, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT },</div><div class='del'>-	{0x28, AC_VERB_SET_UNSOLICITED_ENABLE,</div><div class='del'>-	 AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},</div><div class='del'>-	{0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1812_pcm_analog_playback = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x8, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_playback_pcm_open,</div><div class='del'>-		.prepare = via_playback_multi_pcm_prepare,</div><div class='del'>-		.cleanup = via_playback_multi_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1812_pcm_analog_capture = {</div><div class='del'>-	.substreams = 2,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	.nid = 0x10, /* NID to query formats and rates */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_pcm_open_close,</div><div class='del'>-		.prepare = via_capture_pcm_prepare,</div><div class='del'>-		.cleanup = via_capture_pcm_cleanup,</div><div class='del'>-		.close = via_pcm_open_close,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct hda_pcm_stream vt1812_pcm_digital_playback = {</div><div class='del'>-	.substreams = 1,</div><div class='del'>-	.channels_min = 2,</div><div class='del'>-	.channels_max = 2,</div><div class='del'>-	/* NID is set in via_build_pcms */</div><div class='del'>-	.ops = {</div><div class='del'>-		.open = via_dig_playback_pcm_open,</div><div class='del'>-		.close = via_dig_playback_pcm_close,</div><div class='del'>-		.prepare = via_dig_playback_pcm_prepare,</div><div class='del'>-		.cleanup = via_dig_playback_pcm_cleanup</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-/* fill in the dac_nids table from the parsed pin configuration */</div><div class='del'>-static int vt1812_auto_fill_dac_nids(struct via_spec *spec,</div><div class='del'>-				     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	spec-&gt;multiout.num_dacs = 1;</div><div class='del'>-	spec-&gt;multiout.dac_nids = spec-&gt;private_dac_nids;</div><div class='del'>-	if (cfg-&gt;line_out_pins[0])</div><div class='del'>-		spec-&gt;multiout.dac_nids[0] = 0x8;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* add playback controls from the parsed DAC table */</div><div class='del'>-static int vt1812_auto_create_multi_out_ctls(struct via_spec *spec,</div><div class='del'>-					     const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!cfg-&gt;line_out_pins[0])</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Line-Out: PortE */</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Front Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x8, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_BIND_PIN_MUTE,</div><div class='del'>-			      "Front Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(0x28, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1812_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!pin)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.hp_nid = 0x9;</div><div class='del'>-	spec-&gt;hp_independent_mode_index = 1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_VOL,</div><div class='del'>-			      "Headphone Playback Volume",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(</div><div class='del'>-				      spec-&gt;multiout.hp_nid, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,</div><div class='del'>-			      "Headphone Playback Switch",</div><div class='del'>-			      HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	create_hp_imux(spec);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create playback/capture controls for input pins */</div><div class='del'>-static int vt1812_auto_create_analog_input_ctls(struct hda_codec *codec,</div><div class='del'>-						const struct auto_pin_cfg *cfg)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	struct hda_input_mux *imux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-	static hda_nid_t pin_idxs[] = { 0x2b, 0x2a, 0x29, 0, 0, 0xff };</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,</div><div class='del'>-					       ARRAY_SIZE(pin_idxs));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* build volume/mute control of loopback */</div><div class='del'>-	err = via_new_analog_input(spec, "Stereo Mixer", 0, 5, 0x21);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* for digital mic select */</div><div class='del'>-	snd_hda_add_imux_item(imux, "Digital Mic", 6, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vt1812_parse_auto_config(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec = codec-&gt;spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	err = snd_hda_parse_pin_def_config(codec, &amp;spec-&gt;autocfg, NULL);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-	err = vt1812_auto_fill_dac_nids(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;autocfg.line_outs &amp;&amp; !spec-&gt;autocfg.hp_outs)</div><div class='del'>-		return 0; /* can't find valid BIOS pin config */</div><div class='del'>-</div><div class='del'>-	err = vt1812_auto_create_multi_out_ctls(spec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1812_auto_create_hp_ctls(spec, spec-&gt;autocfg.hp_pins[0]);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	err = vt1812_auto_create_analog_input_ctls(codec, &amp;spec-&gt;autocfg);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	spec-&gt;multiout.max_channels = spec-&gt;multiout.num_dacs * 2;</div><div class='del'>-</div><div class='del'>-	fill_dig_outs(codec);</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;kctls.list)</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers++] = spec-&gt;kctls.list;</div><div class='del'>-</div><div class='del'>-	spec-&gt;input_mux = &amp;spec-&gt;private_imux[0];</div><div class='del'>-</div><div class='del'>-	if (spec-&gt;hp_mux)</div><div class='del'>-		via_hp_build(codec);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-static struct hda_amp_list vt1812_loopbacks[] = {</div><div class='del'>-	{ 0x21, HDA_INPUT, 0 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 1 },</div><div class='del'>-	{ 0x21, HDA_INPUT, 2 },</div><div class='del'>-	{ } /* end */</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* patch for vt1812 */</div><div class='del'>-static int patch_vt1812(struct hda_codec *codec)</div><div class='del'>-{</div><div class='del'>-	struct via_spec *spec;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* create a codec specific record */</div><div class='del'>-	spec = via_new_spec(codec);</div><div class='del'>-	if (spec == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* automatic parse from the BIOS config */</div><div class='del'>-	err = vt1812_parse_auto_config(codec);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		via_free(codec);</div><div class='del'>-		return err;</div><div class='del'>-	} else if (!err) {</div><div class='del'>-		printk(KERN_INFO "hda_codec: Cannot set up configuration "</div><div class='del'>-		       "from BIOS.  Using genenic mode...\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++]  = vt1812_volume_init_verbs;</div><div class='del'>-	spec-&gt;init_verbs[spec-&gt;num_iverbs++] = vt1812_uniwill_init_verbs;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_analog = "VT1812 Analog";</div><div class='del'>-	spec-&gt;stream_analog_playback = &amp;vt1812_pcm_analog_playback;</div><div class='del'>-	spec-&gt;stream_analog_capture = &amp;vt1812_pcm_analog_capture;</div><div class='del'>-</div><div class='del'>-	spec-&gt;stream_name_digital = "VT1812 Digital";</div><div class='del'>-	spec-&gt;stream_digital_playback = &amp;vt1812_pcm_digital_playback;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (!spec-&gt;adc_nids &amp;&amp; spec-&gt;input_mux) {</div><div class='del'>-		spec-&gt;adc_nids = vt1812_adc_nids;</div><div class='del'>-		spec-&gt;num_adc_nids = ARRAY_SIZE(vt1812_adc_nids);</div><div class='del'>-		get_mux_nids(codec);</div><div class='del'>-		override_mic_boost(codec, 0x2b, 0, 3, 40);</div><div class='del'>-		override_mic_boost(codec, 0x29, 0, 3, 40);</div><div class='del'>-		spec-&gt;mixers[spec-&gt;num_mixers] = vt1812_capture_mixer;</div><div class='del'>-		spec-&gt;num_mixers++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops = via_patch_ops;</div><div class='del'>-</div><div class='del'>-	codec-&gt;patch_ops.init = via_auto_init;</div><div class='del'>-	codec-&gt;patch_ops.unsol_event = via_unsol_event;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_SND_HDA_POWER_SAVE</div><div class='del'>-	spec-&gt;loopback.amplist = vt1812_loopbacks;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * patch entries</div><div class='del'>- */</div><div class='del'>-static struct hda_codec_preset snd_hda_preset_via[] = {</div><div class='del'>-	{ .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708},</div><div class='del'>-	{ .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708},</div><div class='del'>-	{ .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708},</div><div class='del'>-	{ .id = 0x1106170b, .name = "VT1708", .patch = patch_vt1708},</div><div class='del'>-	{ .id = 0x1106e710, .name = "VT1709 10-Ch",</div><div class='del'>-	  .patch = patch_vt1709_10ch},</div><div class='del'>-	{ .id = 0x1106e711, .name = "VT1709 10-Ch",</div><div class='del'>-	  .patch = patch_vt1709_10ch},</div><div class='del'>-	{ .id = 0x1106e712, .name = "VT1709 10-Ch",</div><div class='del'>-	  .patch = patch_vt1709_10ch},</div><div class='del'>-	{ .id = 0x1106e713, .name = "VT1709 10-Ch",</div><div class='del'>-	  .patch = patch_vt1709_10ch},</div><div class='del'>-	{ .id = 0x1106e714, .name = "VT1709 6-Ch",</div><div class='del'>-	  .patch = patch_vt1709_6ch},</div><div class='del'>-	{ .id = 0x1106e715, .name = "VT1709 6-Ch",</div><div class='del'>-	  .patch = patch_vt1709_6ch},</div><div class='del'>-	{ .id = 0x1106e716, .name = "VT1709 6-Ch",</div><div class='del'>-	  .patch = patch_vt1709_6ch},</div><div class='del'>-	{ .id = 0x1106e717, .name = "VT1709 6-Ch",</div><div class='del'>-	  .patch = patch_vt1709_6ch},</div><div class='del'>-	{ .id = 0x1106e720, .name = "VT1708B 8-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_8ch},</div><div class='del'>-	{ .id = 0x1106e721, .name = "VT1708B 8-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_8ch},</div><div class='del'>-	{ .id = 0x1106e722, .name = "VT1708B 8-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_8ch},</div><div class='del'>-	{ .id = 0x1106e723, .name = "VT1708B 8-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_8ch},</div><div class='del'>-	{ .id = 0x1106e724, .name = "VT1708B 4-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_4ch},</div><div class='del'>-	{ .id = 0x1106e725, .name = "VT1708B 4-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_4ch},</div><div class='del'>-	{ .id = 0x1106e726, .name = "VT1708B 4-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_4ch},</div><div class='del'>-	{ .id = 0x1106e727, .name = "VT1708B 4-Ch",</div><div class='del'>-	  .patch = patch_vt1708B_4ch},</div><div class='del'>-	{ .id = 0x11060397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11061397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11062397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11063397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11064397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11065397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11066397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11067397, .name = "VT1708S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{ .id = 0x11060398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11061398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11062398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11063398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11064398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11065398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11066398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11067398, .name = "VT1702",</div><div class='del'>-	  .patch = patch_vt1702},</div><div class='del'>-	{ .id = 0x11060428, .name = "VT1718S",</div><div class='del'>-	  .patch = patch_vt1718S},</div><div class='del'>-	{ .id = 0x11064428, .name = "VT1718S",</div><div class='del'>-	  .patch = patch_vt1718S},</div><div class='del'>-	{ .id = 0x11060441, .name = "VT2020",</div><div class='del'>-	  .patch = patch_vt1718S},</div><div class='del'>-	{ .id = 0x11064441, .name = "VT1828S",</div><div class='del'>-	  .patch = patch_vt1718S},</div><div class='del'>-	{ .id = 0x11060433, .name = "VT1716S",</div><div class='del'>-	  .patch = patch_vt1716S},</div><div class='del'>-	{ .id = 0x1106a721, .name = "VT1716S",</div><div class='del'>-	  .patch = patch_vt1716S},</div><div class='del'>-	{ .id = 0x11060438, .name = "VT2002P", .patch = patch_vt2002P},</div><div class='del'>-	{ .id = 0x11064438, .name = "VT2002P", .patch = patch_vt2002P},</div><div class='del'>-	{ .id = 0x11060448, .name = "VT1812", .patch = patch_vt1812},</div><div class='del'>-	{ .id = 0x11060440, .name = "VT1818S",</div><div class='del'>-	  .patch = patch_vt1708S},</div><div class='del'>-	{} /* terminator */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS("snd-hda-codec-id:1106*");</div><div class='del'>-</div><div class='del'>-static struct hda_codec_preset_list via_list = {</div><div class='del'>-	.preset = snd_hda_preset_via,</div><div class='del'>-	.owner = THIS_MODULE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("VIA HD-audio codec");</div><div class='del'>-</div><div class='del'>-static int __init patch_via_init(void)</div><div class='del'>-{</div><div class='del'>-	return snd_hda_add_codec_preset(&amp;via_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit patch_via_exit(void)</div><div class='del'>-{</div><div class='del'>-	snd_hda_delete_codec_preset(&amp;via_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(patch_via_init)</div><div class='del'>-module_exit(patch_via_exit)</div><div class='head'>diff --git a/sound/pci/ice1712/Makefile b/sound/pci/ice1712/Makefile<br/>index f7ce33f00ea5..f406a048374c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/Makefile</a></div><div class='hunk'>@@ -1,11 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-ice17xx-ak4xxx-objs := ak4xxx.o</div><div class='del'>-snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o</div><div class='del'>-snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o</div><div class='add'>+snd-ice17xx-ak4xxx-y := ak4xxx.o</div><div class='add'>+snd-ice1712-y := ice1712.o delta.o hoontech.o ews.o</div><div class='add'>+snd-ice1724-y := ice1724.o amp.o revo.o aureon.o vt1720_mobo.o pontis.o prodigy192.o prodigy_hifi.o juli.o phase.o wtm.o se.o maya44.o quartet.o psc724.o wm8766.o wm8776.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o</div><div class='head'>diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c<br/>index 90d560c3df13..cad33a2f26bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ak4xxx.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ak4xxx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ak4xxx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ak4xxx.c</a></div><div class='hunk'>@@ -1,31 +1,18 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *   AK4524 / AK4528 / AK4529 / AK4355 / AK4381 interface</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> #include "ice1712.h"</div><div class='hunk'>@@ -178,18 +165,6 @@ int snd_ice1712_akm4xxx_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __init alsa_ice1712_akm4xxx_module_init(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-        </div><div class='del'>-static void __exit alsa_ice1712_akm4xxx_module_exit(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-        </div><div class='del'>-module_init(alsa_ice1712_akm4xxx_module_init)</div><div class='del'>-module_exit(alsa_ice1712_akm4xxx_module_exit)</div><div class='del'>-</div><div class='ctx'> EXPORT_SYMBOL(snd_ice1712_akm4xxx_init);</div><div class='ctx'> EXPORT_SYMBOL(snd_ice1712_akm4xxx_free);</div><div class='ctx'> EXPORT_SYMBOL(snd_ice1712_akm4xxx_build_controls);</div><div class='head'>diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c<br/>index e328cfb7620c..a7b496de6ce2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/amp.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/amp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/amp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/amp.c</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -38,7 +23,7 @@ static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val)</div><div class='ctx'> 	snd_vt1724_write_i2c(ice, WM_DEV, cval &gt;&gt; 8, cval &amp; 0xff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_vt1724_amp_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned short wm_inits[] = {</div><div class='ctx'> 		WM_ATTEN_L,	0x0000,	/* 0 db */</div><div class='hunk'>@@ -66,16 +51,19 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	/* we use pins 39 and 41 of the VT1616 for left and right read outputs */</div><div class='del'>-	snd_ac97_write_cache(ice-&gt;ac97, 0x5a, snd_ac97_read(ice-&gt;ac97, 0x5a) &amp; ~0x8000);</div><div class='add'>+	if (ice-&gt;ac97)</div><div class='add'>+		/* we use pins 39 and 41 of the VT1616 for left and right</div><div class='add'>+		read outputs */</div><div class='add'>+		snd_ac97_write_cache(ice-&gt;ac97, 0x5a,</div><div class='add'>+			snd_ac97_read(ice-&gt;ac97, 0x5a) &amp; ~0x8000);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_amp_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_AV710,</div><div class='ctx'> 		.name = "Chaintech AV-710",</div><div class='head'>diff --git a/sound/pci/ice1712/amp.h b/sound/pci/ice1712/amp.h<br/>index bf81d30d9150..bd6323fe38e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/amp.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/amp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/amp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/amp.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_AMP_H</div><div class='ctx'> #define __SOUND_AMP_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define  AMP_AUDIO2000_DEVICE_DESC 	       "{AMP Ltd,AUDIO2000},"\</div><div class='head'>diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c<br/>index 2f6252266a02..b4c9e7d11609 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/aureon.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/aureon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/aureon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/aureon.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  * NOTES:</div><div class='ctx'>  *</div><div class='ctx'>  * - we reuse the struct snd_akm4xxx record for storing the wm8770 codec data.</div><div class='hunk'>@@ -46,7 +32,6 @@</div><div class='ctx'>  *                    on mixer switch and other coll stuff.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -148,7 +133,7 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,</div><div class='ctx'> 	udelay(100);</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * send device address, command and value,</div><div class='del'>-	 * skipping ack cycles inbetween</div><div class='add'>+	 * skipping ack cycles in between</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (j = 0; j &lt; 3; j++) {</div><div class='ctx'> 		switch (j) {</div><div class='hunk'>@@ -203,15 +188,10 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,</div><div class='ctx'> static int aureon_universe_inmux_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	char *texts[3] = {"Internal Aux", "Wavetable", "Rear Line-In"};</div><div class='add'>+	static const char * const texts[3] =</div><div class='add'>+		{"Internal Aux", "Wavetable", "Rear Line-In"};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aureon_universe_inmux_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -378,14 +358,13 @@ static int aureon_ac97_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned short vol;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	vol = aureon_ac97_read(ice, kcontrol-&gt;private_value &amp; 0x7F);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = 0x1F - (vol &amp; 0x1F);</div><div class='ctx'> 	if (kcontrol-&gt;private_value &amp; AUREON_AC97_STEREO)</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[1] = 0x1F - ((vol &gt;&gt; 8) &amp; 0x1F);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -421,12 +400,11 @@ static int aureon_ac97_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = aureon_ac97_read(ice,</div><div class='ctx'> 			kcontrol-&gt;private_value &amp; 0x7F) &amp; 0x8000 ? 0 : 1;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -459,11 +437,10 @@ static int aureon_ac97_micboost_get(struct snd_kcontrol *kcontrol, struct snd_ct</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = aureon_ac97_read(ice, AC97_MIC) &amp; 0x0020 ? 0 : 1;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -662,11 +639,10 @@ static int aureon_ac97_mmute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_OUT_MUX1) &gt;&gt; 1) &amp; 0x01;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -724,9 +700,8 @@ static int wm_pcm_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_MUTE) &amp; 0x10) ? 0 : 1;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -964,11 +939,10 @@ static int wm_pcm_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	val = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) &amp; 0xff;</div><div class='ctx'> 	val = val &gt; PCM_MIN ? (val - PCM_MIN) : 0;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1004,12 +978,11 @@ static int wm_adc_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		val = wm_get(ice, WM_ADC_GAIN + i);</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = ~val&gt;&gt;5 &amp; 0x1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1051,13 +1024,12 @@ static int wm_adc_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	int i, idx;</div><div class='ctx'> 	unsigned short vol;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		idx = WM_ADC_GAIN + i;</div><div class='ctx'> 		vol = wm_get(ice, idx) &amp; 0x1f;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = vol;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1106,20 +1078,10 @@ static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_in</div><div class='ctx'> 	};</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 2;</div><div class='del'>-	if (ice-&gt;eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE) {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 8;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, universe_texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	} else {</div><div class='del'>-		uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-		if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-			uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (ice-&gt;eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE)</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 2, 8, universe_texts);</div><div class='add'>+	else</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 2, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1127,11 +1089,10 @@ static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	val = wm_get(ice, WM_ADC_MUX);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = val &amp; 7;</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[1] = (val &gt;&gt; 4) &amp; 7;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1167,16 +1128,10 @@ static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_</div><div class='ctx'> 		"CD",</div><div class='ctx'> 		"Coax"</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='ctx'> 	if (ice-&gt;eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, prodigy_texts[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 2, prodigy_texts);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name, aureon_texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+		return snd_ctl_enum_info(uinfo, 1, 2, aureon_texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aureon_cs8415_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1392,15 +1347,7 @@ static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_</div><div class='ctx'> {</div><div class='ctx'> 	static const char * const texts[2] = { "128x", "64x"	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aureon_oversampling_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -1433,7 +1380,7 @@ static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl</div><div class='ctx'>  * mixers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new aureon_dac_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='hunk'>@@ -1548,7 +1495,7 @@ static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new wm_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new wm_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "PCM Playback Switch",</div><div class='hunk'>@@ -1614,7 +1561,7 @@ static struct snd_kcontrol_new wm_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new ac97_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new ac97_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "AC97 Playback Switch",</div><div class='hunk'>@@ -1719,7 +1666,7 @@ static struct snd_kcontrol_new ac97_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new universe_ac97_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "AC97 Playback Switch",</div><div class='hunk'>@@ -1851,7 +1798,7 @@ static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new cs8415_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),</div><div class='hunk'>@@ -1896,7 +1843,7 @@ static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit aureon_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int aureon_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, counts;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1936,21 +1883,21 @@ static int __devinit aureon_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 		unsigned char id;</div><div class='ctx'> 		snd_ice1712_save_gpio_status(ice);</div><div class='ctx'> 		id = aureon_cs8415_get(ice, CS8415_ID);</div><div class='add'>+		snd_ice1712_restore_gpio_status(ice);</div><div class='ctx'> 		if (id != 0x41)</div><div class='del'>-			snd_printk(KERN_INFO "No CS8415 chip. Skipping CS8415 controls.\n");</div><div class='del'>-		else if ((id &amp; 0x0F) != 0x01)</div><div class='del'>-			snd_printk(KERN_INFO "Detected unsupported CS8415 rev. (%c)\n", (char)((id &amp; 0x0F) + 'A' - 1));</div><div class='add'>+			dev_info(ice-&gt;card-&gt;dev,</div><div class='add'>+				 "No CS8415 chip. Skipping CS8415 controls.\n");</div><div class='ctx'> 		else {</div><div class='ctx'> 			for (i = 0; i &lt; ARRAY_SIZE(cs8415_controls); i++) {</div><div class='ctx'> 				struct snd_kcontrol *kctl;</div><div class='del'>-				err = snd_ctl_add(ice-&gt;card, (kctl = snd_ctl_new1(&amp;cs8415_controls[i], ice)));</div><div class='del'>-				if (err &lt; 0)</div><div class='del'>-					return err;</div><div class='add'>+				kctl = snd_ctl_new1(&amp;cs8415_controls[i], ice);</div><div class='ctx'> 				if (i &gt; 1)</div><div class='ctx'> 					kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='add'>+				err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='add'>+				if (err &lt; 0)</div><div class='add'>+					return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		snd_ice1712_restore_gpio_status(ice);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2103,7 +2050,7 @@ static int aureon_reset(struct snd_ice1712 *ice)</div><div class='ctx'> /*</div><div class='ctx'>  * suspend/resume</div><div class='ctx'>  */</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int aureon_resume(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct aureon_spec *spec = ice-&gt;spec;</div><div class='hunk'>@@ -2124,7 +2071,7 @@ static int aureon_resume(struct snd_ice1712 *ice)</div><div class='ctx'> /*</div><div class='ctx'>  * initialize the chip</div><div class='ctx'>  */</div><div class='del'>-static int __devinit aureon_init(struct snd_ice1712 *ice)</div><div class='add'>+static int aureon_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct aureon_spec *spec;</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -2143,7 +2090,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		ice-&gt;num_total_adcs = 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* to remeber the register values of CS8415 */</div><div class='add'>+	/* to remember the register values of CS8415 */</div><div class='ctx'> 	ice-&gt;akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);</div><div class='ctx'> 	if (!ice-&gt;akm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2160,7 +2107,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		wm_set_vol(ice, i, spec-&gt;vol[i], spec-&gt;master[i % 2]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	ice-&gt;pm_resume = aureon_resume;</div><div class='ctx'> 	ice-&gt;pm_suspend_enabled = 1;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2174,7 +2121,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * hence the driver needs to sets up it properly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char aureon51_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char aureon51_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x0a,	/* clock 512, spdif-in/ADC, 3DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -2190,7 +2137,7 @@ static unsigned char aureon51_eeprom[] __devinitdata = {</div><div class='ctx'> 	[ICE_EEP2_GPIO_STATE2] = 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char aureon71_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char aureon71_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x0b,	/* clock 512, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -2207,7 +2154,7 @@ static unsigned char aureon71_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> #define prodigy71_eeprom aureon71_eeprom</div><div class='ctx'> </div><div class='del'>-static unsigned char aureon71_universe_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char aureon71_universe_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x2b,	/* clock 512, mpu401, spdif-in/ADC,</div><div class='ctx'> 					 * 4DACs</div><div class='ctx'> 					 */</div><div class='hunk'>@@ -2225,7 +2172,7 @@ static unsigned char aureon71_universe_eeprom[] __devinitdata = {</div><div class='ctx'> 	[ICE_EEP2_GPIO_STATE2] = 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char prodigy71lt_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char prodigy71lt_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x4b,	/* clock 384, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0xfc,	/* vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -2243,7 +2190,7 @@ static unsigned char prodigy71lt_eeprom[] __devinitdata = {</div><div class='ctx'> #define prodigy71xt_eeprom prodigy71lt_eeprom</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_aureon_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_AUREON51_SKY,</div><div class='ctx'> 		.name = "Terratec Aureon 5.1-Sky",</div><div class='head'>diff --git a/sound/pci/ice1712/aureon.h b/sound/pci/ice1712/aureon.h<br/>index c253b8e2c789..de011495e27a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/aureon.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/aureon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/aureon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/aureon.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_AUREON_H</div><div class='ctx'> #define __SOUND_AUREON_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Terratec Aureon cards</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define  AUREON_DEVICE_DESC 	       "{Terratec,Aureon 5.1 Sky},"\</div><div class='head'>diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c<br/>index 712c1710f9a2..e5a9585cba4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/delta.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/delta.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/delta.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/delta.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,24 +6,8 @@</div><div class='ctx'>  *			    Audiophile, Digigram VX442</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -96,6 +81,11 @@ static unsigned char ap_cs8427_codec_select(struct snd_ice1712 *ice)</div><div class='ctx'> 		tmp |= ICE1712_DELTA_AP_CCLK | ICE1712_DELTA_AP_CS_CODEC;</div><div class='ctx'> 		tmp &amp;= ~ICE1712_DELTA_AP_CS_DIGITAL;</div><div class='ctx'> 		break;</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='add'>+		tmp |= ICE1712_DELTA_66E_CCLK | ICE1712_DELTA_66E_CS_CHIP_A |</div><div class='add'>+		       ICE1712_DELTA_66E_CS_CHIP_B;</div><div class='add'>+		tmp &amp;= ~ICE1712_DELTA_66E_CS_CS8427;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_VX442:</div><div class='ctx'> 		tmp |= ICE1712_VX442_CCLK | ICE1712_VX442_CODEC_CHIP_A | ICE1712_VX442_CODEC_CHIP_B;</div><div class='ctx'> 		tmp &amp;= ~ICE1712_VX442_CS_DIGITAL;</div><div class='hunk'>@@ -119,6 +109,9 @@ static void ap_cs8427_codec_deassert(struct snd_ice1712 *ice, unsigned char tmp)</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTA410:</div><div class='ctx'> 		tmp |= ICE1712_DELTA_AP_CS_DIGITAL;</div><div class='ctx'> 		break;</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='add'>+		tmp |= ICE1712_DELTA_66E_CS_CS8427;</div><div class='add'>+		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_VX442:</div><div class='ctx'> 		tmp |= ICE1712_VX442_CS_DIGITAL;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -133,13 +126,12 @@ static int ap_cs8427_sendbytes(struct snd_i2c_device *device, unsigned char *byt</div><div class='ctx'> 	int res = count;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	tmp = ap_cs8427_codec_select(ice);</div><div class='ctx'> 	ap_cs8427_write_byte(ice, (device-&gt;addr &lt;&lt; 1) | 0, tmp); /* address + write mode */</div><div class='ctx'> 	while (count-- &gt; 0)</div><div class='ctx'> 		ap_cs8427_write_byte(ice, *bytes++, tmp);</div><div class='ctx'> 	ap_cs8427_codec_deassert(ice, tmp);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -150,13 +142,12 @@ static int ap_cs8427_readbytes(struct snd_i2c_device *device, unsigned char *byt</div><div class='ctx'> 	int res = count;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	tmp = ap_cs8427_codec_select(ice);</div><div class='ctx'> 	ap_cs8427_write_byte(ice, (device-&gt;addr &lt;&lt; 1) | 1, tmp); /* address + read mode */</div><div class='ctx'> 	while (count-- &gt; 0)</div><div class='ctx'> 		*bytes++ = ap_cs8427_read_byte(ice, tmp);</div><div class='ctx'> 	ap_cs8427_codec_deassert(ice, tmp);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -167,7 +158,7 @@ static int ap_cs8427_probeaddr(struct snd_i2c_bus *bus, unsigned short addr)</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_i2c_ops ap_cs8427_i2c_ops = {</div><div class='add'>+static const struct snd_i2c_ops ap_cs8427_i2c_ops = {</div><div class='ctx'> 	.sendbytes = ap_cs8427_sendbytes,</div><div class='ctx'> 	.readbytes = ap_cs8427_readbytes,</div><div class='ctx'> 	.probeaddr = ap_cs8427_probeaddr,</div><div class='hunk'>@@ -183,7 +174,7 @@ static void snd_ice1712_delta_cs8403_spdif_write(struct snd_ice1712 *ice, unsign</div><div class='ctx'> 	/* send byte to transmitter */</div><div class='ctx'> 	mask1 = ICE1712_DELTA_SPDIF_OUT_STAT_CLOCK;</div><div class='ctx'> 	mask2 = ICE1712_DELTA_SPDIF_OUT_STAT_DATA;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);</div><div class='ctx'> 	for (idx = 7; idx &gt;= 0; idx--) {</div><div class='ctx'> 		tmp &amp;= ~(mask1 | mask2);</div><div class='hunk'>@@ -197,7 +188,6 @@ static void snd_ice1712_delta_cs8403_spdif_write(struct snd_ice1712 *ice, unsign</div><div class='ctx'> 	}</div><div class='ctx'> 	tmp &amp;= ~mask1;</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -212,15 +202,13 @@ static int delta_spdif_default_put(struct snd_ice1712 *ice, struct snd_ctl_elem_</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='ctx'> 	val = snd_cs8403_encode_spdif_bits(&amp;ucontrol-&gt;value.iec958);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	change = ice-&gt;spdif.cs8403_bits != val;</div><div class='del'>-	ice-&gt;spdif.cs8403_bits = val;</div><div class='del'>-	if (change &amp;&amp; ice-&gt;playback_pro_substream == NULL) {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-		snd_ice1712_delta_cs8403_spdif_write(ice, val);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		change = ice-&gt;spdif.cs8403_bits != val;</div><div class='add'>+		ice-&gt;spdif.cs8403_bits = val;</div><div class='add'>+		if (!change || ice-&gt;playback_pro_substream)</div><div class='add'>+			return change;</div><div class='ctx'> 	}</div><div class='add'>+	snd_ice1712_delta_cs8403_spdif_write(ice, val);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -235,15 +223,13 @@ static int delta_spdif_stream_put(struct snd_ice1712 *ice, struct snd_ctl_elem_v</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='ctx'> 	val = snd_cs8403_encode_spdif_bits(&amp;ucontrol-&gt;value.iec958);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	change = ice-&gt;spdif.cs8403_stream_bits != val;</div><div class='del'>-	ice-&gt;spdif.cs8403_stream_bits = val;</div><div class='del'>-	if (change &amp;&amp; ice-&gt;playback_pro_substream != NULL) {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-		snd_ice1712_delta_cs8403_spdif_write(ice, val);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		change = ice-&gt;spdif.cs8403_stream_bits != val;</div><div class='add'>+		ice-&gt;spdif.cs8403_stream_bits = val;</div><div class='add'>+		if (!change || ice-&gt;playback_pro_substream)</div><div class='add'>+			return change;</div><div class='ctx'> 	}</div><div class='add'>+	snd_ice1712_delta_cs8403_spdif_write(ice, val);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,6 +262,20 @@ static void delta1010lt_ak4524_lock(struct snd_akm4xxx *ak, int chip)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * AK4524 on Delta66 rev E to choose the chip address</div><div class='add'>+ */</div><div class='add'>+static void delta66e_ak4524_lock(struct snd_akm4xxx *ak, int chip)</div><div class='add'>+{</div><div class='add'>+	struct snd_ak4xxx_private *priv = (void *)ak-&gt;private_value[0];</div><div class='add'>+	struct snd_ice1712 *ice = ak-&gt;private_data[0];</div><div class='add'>+</div><div class='add'>+	snd_ice1712_save_gpio_status(ice);</div><div class='add'>+	priv-&gt;cs_mask =</div><div class='add'>+	priv-&gt;cs_addr = chip == 0 ? ICE1712_DELTA_66E_CS_CHIP_A :</div><div class='add'>+				    ICE1712_DELTA_66E_CS_CHIP_B;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * AK4528 on VX442 to choose the chip mask</div><div class='ctx'>  */</div><div class='ctx'> static void vx442_ak4524_lock(struct snd_akm4xxx *ak, int chip)</div><div class='hunk'>@@ -299,14 +299,13 @@ static void delta_1010_set_rate_val(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 	if (rate == 0)	/* no hint - S/PDIF input is master, simply return */</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);</div><div class='ctx'> 	tmp2 = tmp &amp; ~ICE1712_DELTA_DFS;</div><div class='ctx'> 	if (rate &gt; 48000)</div><div class='ctx'> 		tmp2 |= ICE1712_DELTA_DFS;</div><div class='ctx'> 	if (tmp != tmp2)</div><div class='ctx'> 		snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp2);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -321,9 +320,9 @@ static void delta_ak4524_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* check before reset ak4524 to avoid unnecessary clicks */</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='del'>-	tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;ice-&gt;gpio_mutex) {</div><div class='add'>+		tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);</div><div class='add'>+	}</div><div class='ctx'> 	tmp2 = tmp &amp; ~ICE1712_DELTA_DFS; </div><div class='ctx'> 	if (rate &gt; 48000)</div><div class='ctx'> 		tmp2 |= ICE1712_DELTA_DFS;</div><div class='hunk'>@@ -332,12 +331,12 @@ static void delta_ak4524_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)</div><div class='ctx'> </div><div class='ctx'> 	/* do it again */</div><div class='ctx'> 	snd_akm4xxx_reset(ak, 1);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='del'>-	tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) &amp; ~ICE1712_DELTA_DFS;</div><div class='del'>-	if (rate &gt; 48000)</div><div class='del'>-		tmp |= ICE1712_DELTA_DFS;</div><div class='del'>-	snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	scoped_guard(mutex, &amp;ice-&gt;gpio_mutex) {</div><div class='add'>+		tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA) &amp; ~ICE1712_DELTA_DFS;</div><div class='add'>+		if (rate &gt; 48000)</div><div class='add'>+			tmp |= ICE1712_DELTA_DFS;</div><div class='add'>+		snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);</div><div class='add'>+	}</div><div class='ctx'> 	snd_akm4xxx_reset(ak, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -372,23 +371,22 @@ static void delta_open_spdif(struct snd_ice1712 *ice, struct snd_pcm_substream *</div><div class='ctx'> /* set up */</div><div class='ctx'> static void delta_setup_spdif(struct snd_ice1712 *ice, int rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-	tmp = ice-&gt;spdif.cs8403_stream_bits;</div><div class='del'>-	if (tmp &amp; 0x01)		/* consumer */</div><div class='del'>-		tmp &amp;= (tmp &amp; 0x01) ? ~0x06 : ~0x18;</div><div class='del'>-	switch (rate) {</div><div class='del'>-	case 32000: tmp |= (tmp &amp; 0x01) ? 0x04 : 0x00; break;</div><div class='del'>-	case 44100: tmp |= (tmp &amp; 0x01) ? 0x00 : 0x10; break;</div><div class='del'>-	case 48000: tmp |= (tmp &amp; 0x01) ? 0x02 : 0x08; break;</div><div class='del'>-	default: tmp |= (tmp &amp; 0x01) ? 0x00 : 0x18; break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		tmp = ice-&gt;spdif.cs8403_stream_bits;</div><div class='add'>+		if (tmp &amp; 0x01)		/* consumer */</div><div class='add'>+			tmp &amp;= (tmp &amp; 0x01) ? ~0x06 : ~0x18;</div><div class='add'>+		switch (rate) {</div><div class='add'>+		case 32000: tmp |= (tmp &amp; 0x01) ? 0x04 : 0x00; break;</div><div class='add'>+		case 44100: tmp |= (tmp &amp; 0x01) ? 0x00 : 0x10; break;</div><div class='add'>+		case 48000: tmp |= (tmp &amp; 0x01) ? 0x02 : 0x08; break;</div><div class='add'>+		default: tmp |= (tmp &amp; 0x01) ? 0x00 : 0x18; break;</div><div class='add'>+		}</div><div class='add'>+		change = ice-&gt;spdif.cs8403_stream_bits != tmp;</div><div class='add'>+		ice-&gt;spdif.cs8403_stream_bits = tmp;</div><div class='ctx'> 	}</div><div class='del'>-	change = ice-&gt;spdif.cs8403_stream_bits != tmp;</div><div class='del'>-	ice-&gt;spdif.cs8403_stream_bits = tmp;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_ctl_notify(ice-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;ice-&gt;spdif.stream_ctl-&gt;id);</div><div class='ctx'> 	snd_ice1712_delta_cs8403_spdif_write(ice, tmp);</div><div class='hunk'>@@ -404,13 +402,14 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_i2c_sendbytes(ice-&gt;cs8427, &amp;reg, 1) != 1)</div><div class='del'>-		snd_printk(KERN_ERR "unable to send register 0x%x byte to CS8427\n", reg);</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+			"unable to send register 0x%x byte to CS8427\n", reg);</div><div class='ctx'> 	snd_i2c_readbytes(ice-&gt;cs8427, &amp;reg, 1);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (reg &amp; CS8427_UNLOCK) ? 1 : 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	(SNDRV_CTL_ELEM_ACCESS_READ),</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -423,7 +422,7 @@ static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devini</div><div class='ctx'>  * initialize the chips on M-Audio cards</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_audiophile __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_audiophile = {</div><div class='ctx'> 	.type = SND_AK4528,</div><div class='ctx'> 	.num_adcs = 2,</div><div class='ctx'> 	.num_dacs = 2,</div><div class='hunk'>@@ -432,7 +431,7 @@ static struct snd_akm4xxx akm_audiophile __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_audiophile_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = ICE1712_DELTA_AP_DOUT,</div><div class='hunk'>@@ -444,7 +443,7 @@ static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_delta410 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_delta410 = {</div><div class='ctx'> 	.type = SND_AK4529,</div><div class='ctx'> 	.num_adcs = 2,</div><div class='ctx'> 	.num_dacs = 8,</div><div class='hunk'>@@ -453,7 +452,7 @@ static struct snd_akm4xxx akm_delta410 __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_delta410_priv = {</div><div class='ctx'> 	.caddr = 0,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = ICE1712_DELTA_AP_DOUT,</div><div class='hunk'>@@ -465,7 +464,7 @@ static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_delta1010lt __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_delta1010lt = {</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='ctx'> 	.num_adcs = 8,</div><div class='ctx'> 	.num_dacs = 8,</div><div class='hunk'>@@ -475,7 +474,7 @@ static struct snd_akm4xxx akm_delta1010lt __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_delta1010lt_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0, /* the default level of the CIF pin from AK4524 */</div><div class='ctx'> 	.data_mask = ICE1712_DELTA_1010LT_DOUT,</div><div class='hunk'>@@ -487,7 +486,30 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_delta44 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_delta66e = {</div><div class='add'>+	.type = SND_AK4524,</div><div class='add'>+	.num_adcs = 4,</div><div class='add'>+	.num_dacs = 4,</div><div class='add'>+	.ops = {</div><div class='add'>+		.lock = delta66e_ak4524_lock,</div><div class='add'>+		.set_rate_val = delta_ak4524_set_rate_val</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ak4xxx_private akm_delta66e_priv = {</div><div class='add'>+	.caddr = 2,</div><div class='add'>+	.cif = 0, /* the default level of the CIF pin from AK4524 */</div><div class='add'>+	.data_mask = ICE1712_DELTA_66E_DOUT,</div><div class='add'>+	.clk_mask = ICE1712_DELTA_66E_CCLK,</div><div class='add'>+	.cs_mask = 0,</div><div class='add'>+	.cs_addr = 0, /* set later */</div><div class='add'>+	.cs_none = 0,</div><div class='add'>+	.add_flags = 0,</div><div class='add'>+	.mask_flags = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static const struct snd_akm4xxx akm_delta44 = {</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='ctx'> 	.num_adcs = 4,</div><div class='ctx'> 	.num_dacs = 4,</div><div class='hunk'>@@ -497,7 +519,7 @@ static struct snd_akm4xxx akm_delta44 __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_delta44_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0, /* the default level of the CIF pin from AK4524 */</div><div class='ctx'> 	.data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA,</div><div class='hunk'>@@ -509,7 +531,7 @@ static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_vx442 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_vx442 = {</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='ctx'> 	.num_adcs = 4,</div><div class='ctx'> 	.num_dacs = 4,</div><div class='hunk'>@@ -519,7 +541,7 @@ static struct snd_akm4xxx akm_vx442 __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_vx442_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = ICE1712_VX442_DOUT,</div><div class='hunk'>@@ -531,10 +553,60 @@ static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int snd_ice1712_delta_resume(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	unsigned char akm_img_bak[AK4XXX_IMAGE_SIZE];</div><div class='add'>+	unsigned char akm_vol_bak[AK4XXX_IMAGE_SIZE];</div><div class='add'>+</div><div class='add'>+	/* init spdif */</div><div class='add'>+	switch (ice-&gt;eeprom.subvendor) {</div><div class='add'>+	case ICE1712_SUBDEVICE_AUDIOPHILE:</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA410:</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA1010E:</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA1010LT:</div><div class='add'>+	case ICE1712_SUBDEVICE_VX442:</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='add'>+		snd_cs8427_init(ice-&gt;i2c, ice-&gt;cs8427);</div><div class='add'>+		break;</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA1010:</div><div class='add'>+	case ICE1712_SUBDEVICE_MEDIASTATION:</div><div class='add'>+		/* nothing */</div><div class='add'>+		break;</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTADIO2496:</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66:</div><div class='add'>+		/* Set spdif defaults */</div><div class='add'>+		snd_ice1712_delta_cs8403_spdif_write(ice, ice-&gt;spdif.cs8403_bits);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* init codec and restore registers */</div><div class='add'>+	if (ice-&gt;akm_codecs) {</div><div class='add'>+		memcpy(akm_img_bak, ice-&gt;akm-&gt;images, sizeof(akm_img_bak));</div><div class='add'>+		memcpy(akm_vol_bak, ice-&gt;akm-&gt;volumes, sizeof(akm_vol_bak));</div><div class='add'>+		snd_akm4xxx_init(ice-&gt;akm);</div><div class='add'>+		memcpy(ice-&gt;akm-&gt;images, akm_img_bak, sizeof(akm_img_bak));</div><div class='add'>+		memcpy(ice-&gt;akm-&gt;volumes, akm_vol_bak, sizeof(akm_vol_bak));</div><div class='add'>+		snd_akm4xxx_reset(ice-&gt;akm, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ice1712_delta_suspend(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	if (ice-&gt;akm_codecs) /* reset &amp; mute codec */</div><div class='add'>+		snd_akm4xxx_reset(ice-&gt;akm, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_akm4xxx *ak;</div><div class='add'>+	unsigned char tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (ice-&gt;eeprom.subvendor == ICE1712_SUBDEVICE_DELTA1010 &amp;&amp;</div><div class='ctx'> 	    ice-&gt;eeprom.gpiodir == 0x7b)</div><div class='hunk'>@@ -571,11 +643,21 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		ice-&gt;num_total_dacs = 4;	/* two AK4324 codecs */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_VX442:</div><div class='del'>-	case ICE1712_SUBDEVICE_DELTA66E:	/* omni not suported yet */</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66E:	/* omni not supported yet */</div><div class='ctx'> 		ice-&gt;num_total_dacs = 4;</div><div class='ctx'> 		ice-&gt;num_total_adcs = 4;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	ice-&gt;pm_resume = snd_ice1712_delta_resume;</div><div class='add'>+	ice-&gt;pm_suspend = snd_ice1712_delta_suspend;</div><div class='add'>+	ice-&gt;pm_suspend_enabled = 1;</div><div class='add'>+#endif</div><div class='add'>+	/* initialize the SPI clock to high */</div><div class='add'>+	tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);</div><div class='add'>+	tmp |= ICE1712_DELTA_AP_CCLK;</div><div class='add'>+	snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);</div><div class='add'>+	udelay(5);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize spdif */</div><div class='ctx'> 	switch (ice-&gt;eeprom.subvendor) {</div><div class='hunk'>@@ -585,13 +667,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTA1010LT:</div><div class='ctx'> 	case ICE1712_SUBDEVICE_VX442:</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='del'>-		if ((err = snd_i2c_bus_create(ice-&gt;card, "ICE1712 GPIO 1", NULL, &amp;ice-&gt;i2c)) &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "unable to create I2C bus\n");</div><div class='add'>+		err = snd_i2c_bus_create(ice-&gt;card, "ICE1712 GPIO 1", NULL, &amp;ice-&gt;i2c);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(ice-&gt;card-&gt;dev, "unable to create I2C bus\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		ice-&gt;i2c-&gt;private_data = ice;</div><div class='ctx'> 		ice-&gt;i2c-&gt;ops = &amp;ap_cs8427_i2c_ops;</div><div class='del'>-		if ((err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR)) &lt; 0)</div><div class='add'>+		err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTA1010:</div><div class='hunk'>@@ -600,7 +684,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTADIO2496:</div><div class='ctx'> 		ice-&gt;gpio.set_pro_rate = delta_1010_set_rate_val;</div><div class='del'>-		/* fall thru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DELTA66:</div><div class='ctx'> 		ice-&gt;spdif.ops.open = delta_open_spdif;</div><div class='ctx'> 		ice-&gt;spdif.ops.setup_rate = delta_setup_spdif;</div><div class='hunk'>@@ -644,9 +728,11 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		err = snd_ice1712_akm4xxx_init(ak, &amp;akm_delta44, &amp;akm_delta44_priv, ice);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_VX442:</div><div class='del'>-	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='ctx'> 		err = snd_ice1712_akm4xxx_init(ak, &amp;akm_vx442, &amp;akm_vx442_priv, ice);</div><div class='ctx'> 		break;</div><div class='add'>+	case ICE1712_SUBDEVICE_DELTA66E:</div><div class='add'>+		err = snd_ice1712_akm4xxx_init(ak, &amp;akm_delta66e, &amp;akm_delta66e_priv, ice);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		snd_BUG();</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -660,19 +746,19 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * additional controls for M-Audio cards</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select =</div><div class='ctx'> ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);</div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select =</div><div class='ctx'> ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0);</div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status =</div><div class='ctx'> ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);</div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select =</div><div class='ctx'> ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);</div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status =</div><div class='ctx'> ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -748,7 +834,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_ice1712_delta_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = ICE1712_SUBDEVICE_DELTA1010,</div><div class='ctx'> 		.name = "M Audio Delta 1010",</div><div class='head'>diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h<br/>index 1a0ac6cd6501..01fcaf7e85b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/delta.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/delta.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/delta.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/delta.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_DELTA_H</div><div class='ctx'> #define __SOUND_DELTA_H</div><div class='ctx'> </div><div class='hunk'>@@ -8,21 +9,6 @@</div><div class='ctx'>  *                          Digigram VX442</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define DELTA_DEVICE_DESC \</div><div class='hunk'>@@ -144,6 +130,17 @@ extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];</div><div class='ctx'> #define ICE1712_DELTA_1010LT_CS_NONE	0x50	/* nothing */</div><div class='ctx'> #define ICE1712_DELTA_1010LT_WORDCLOCK 0x80	/* sample clock source: 0 = Word Clock Input, 1 = S/PDIF Input ??? */</div><div class='ctx'> </div><div class='add'>+/* M-Audio Delta 66 rev. E definitions.</div><div class='add'>+ * Newer revisions of Delta 66 have CS8427 over SPI for</div><div class='add'>+ * S/PDIF transceiver instead of CS8404/CS8414. */</div><div class='add'>+/* 0x01 = DFS */</div><div class='add'>+#define ICE1712_DELTA_66E_CCLK		0x02	/* SPI clock */</div><div class='add'>+#define ICE1712_DELTA_66E_DIN		0x04	/* data input */</div><div class='add'>+#define ICE1712_DELTA_66E_DOUT		0x08	/* data output */</div><div class='add'>+#define ICE1712_DELTA_66E_CS_CS8427	0x10	/* chip select, low = CS8427 */</div><div class='add'>+#define ICE1712_DELTA_66E_CS_CHIP_A	0x20	/* AK4524 #0 */</div><div class='add'>+#define ICE1712_DELTA_66E_CS_CHIP_B	0x40	/* AK4524 #1 */</div><div class='add'>+</div><div class='ctx'> /* Digigram VX442 definitions */</div><div class='ctx'> #define ICE1712_VX442_CCLK		0x02	/* SPI clock */</div><div class='ctx'> #define ICE1712_VX442_DIN		0x04	/* data input */</div><div class='head'>diff --git a/sound/pci/ice1712/envy24ht.h b/sound/pci/ice1712/envy24ht.h<br/>index a0c5e009bb4a..10e79c82f86f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/envy24ht.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/envy24ht.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/envy24ht.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/envy24ht.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_VT1724_H</div><div class='ctx'> #define __SOUND_VT1724_H</div><div class='ctx'> </div><div class='hunk'>@@ -5,21 +6,6 @@</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='hunk'>@@ -66,6 +52,7 @@ enum {</div><div class='ctx'> #define     VT1724_CFG_CLOCK384  0x40	/* 16.9344Mhz, 44.1kHz*384 */</div><div class='ctx'> #define   VT1724_CFG_MPU401	0x20		/* MPU401 UARTs */</div><div class='ctx'> #define   VT1724_CFG_ADC_MASK	0x0c	/* one, two or one and S/PDIF, stereo ADCs */</div><div class='add'>+#define   VT1724_CFG_ADC_NONE	0x0c	/* no ADCs */</div><div class='ctx'> #define   VT1724_CFG_DAC_MASK	0x03	/* one, two, three, four stereo DACs */</div><div class='ctx'> </div><div class='ctx'> #define VT1724_REG_AC97_CFG		0x05	/* byte */</div><div class='head'>diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c<br/>index 6fe35b812040..1dffcb011deb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ews.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ews.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ews.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ews.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,24 +6,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                    2002 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -164,7 +149,8 @@ static int snd_ice1712_ews88mt_chip_select(struct snd_ice1712 *ice, int chip_mas</div><div class='ctx'> </div><div class='ctx'>      __error:</div><div class='ctx'> 	snd_i2c_unlock(ice-&gt;i2c);</div><div class='del'>-	snd_printk(KERN_ERR "AK4524 chip select failed, check cable to the front module\n");</div><div class='add'>+	dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+		"AK4524 chip select failed, check cable to the front module\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -175,7 +161,7 @@ static void ews88mt_ak4524_lock(struct snd_akm4xxx *ak, int chip)</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	/* assert AK4524 CS */</div><div class='ctx'> 	if (snd_ice1712_ews88mt_chip_select(ice, ~(1 &lt;&lt; chip) &amp; 0x0f) &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR "fatal error (ews88mt chip select)\n");</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "fatal error (ews88mt chip select)\n");</div><div class='ctx'> 	snd_ice1712_save_gpio_status(ice);</div><div class='ctx'> 	tmp = ICE1712_EWS88_SERIAL_DATA |</div><div class='ctx'> 		ICE1712_EWS88_SERIAL_CLOCK |</div><div class='hunk'>@@ -274,15 +260,13 @@ static int ews88_spdif_default_put(struct snd_ice1712 *ice, struct snd_ctl_elem_</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='ctx'> 	val = snd_cs8404_encode_spdif_bits(&amp;ucontrol-&gt;value.iec958);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	change = ice-&gt;spdif.cs8403_bits != val;</div><div class='del'>-	ice-&gt;spdif.cs8403_bits = val;</div><div class='del'>-	if (change &amp;&amp; ice-&gt;playback_pro_substream == NULL) {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-		snd_ice1712_ews_cs8404_spdif_write(ice, val);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		change = ice-&gt;spdif.cs8403_bits != val;</div><div class='add'>+		ice-&gt;spdif.cs8403_bits = val;</div><div class='add'>+		if (!change || ice-&gt;playback_pro_substream)</div><div class='add'>+			return change;</div><div class='ctx'> 	}</div><div class='add'>+	snd_ice1712_ews_cs8404_spdif_write(ice, val);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -297,15 +281,13 @@ static int ews88_spdif_stream_put(struct snd_ice1712 *ice, struct snd_ctl_elem_v</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='ctx'> 	val = snd_cs8404_encode_spdif_bits(&amp;ucontrol-&gt;value.iec958);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	change = ice-&gt;spdif.cs8403_stream_bits != val;</div><div class='del'>-	ice-&gt;spdif.cs8403_stream_bits = val;</div><div class='del'>-	if (change &amp;&amp; ice-&gt;playback_pro_substream != NULL) {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-		snd_ice1712_ews_cs8404_spdif_write(ice, val);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		change = ice-&gt;spdif.cs8403_stream_bits != val;</div><div class='add'>+		ice-&gt;spdif.cs8403_stream_bits = val;</div><div class='add'>+		if (!change || ice-&gt;playback_pro_substream)</div><div class='add'>+			return change;</div><div class='ctx'> 	}</div><div class='add'>+	snd_ice1712_ews_cs8404_spdif_write(ice, val);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -319,23 +301,22 @@ static void ews88_open_spdif(struct snd_ice1712 *ice, struct snd_pcm_substream *</div><div class='ctx'> /* set up SPDIF for EWS88MT / EWS88D */</div><div class='ctx'> static void ews88_setup_spdif(struct snd_ice1712 *ice, int rate)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char tmp;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-	tmp = ice-&gt;spdif.cs8403_stream_bits;</div><div class='del'>-	if (tmp &amp; 0x10)		/* consumer */</div><div class='del'>-		tmp &amp;= (tmp &amp; 0x01) ? ~0x06 : ~0x60;</div><div class='del'>-	switch (rate) {</div><div class='del'>-	case 32000: tmp |= (tmp &amp; 0x01) ? 0x02 : 0x00; break;</div><div class='del'>-	case 44100: tmp |= (tmp &amp; 0x01) ? 0x06 : 0x40; break;</div><div class='del'>-	case 48000: tmp |= (tmp &amp; 0x01) ? 0x04 : 0x20; break;</div><div class='del'>-	default: tmp |= (tmp &amp; 0x01) ? 0x06 : 0x40; break;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		tmp = ice-&gt;spdif.cs8403_stream_bits;</div><div class='add'>+		if (tmp &amp; 0x10)		/* consumer */</div><div class='add'>+			tmp &amp;= (tmp &amp; 0x01) ? ~0x06 : ~0x60;</div><div class='add'>+		switch (rate) {</div><div class='add'>+		case 32000: tmp |= (tmp &amp; 0x01) ? 0x02 : 0x00; break;</div><div class='add'>+		case 44100: tmp |= (tmp &amp; 0x01) ? 0x06 : 0x40; break;</div><div class='add'>+		case 48000: tmp |= (tmp &amp; 0x01) ? 0x04 : 0x20; break;</div><div class='add'>+		default: tmp |= (tmp &amp; 0x01) ? 0x06 : 0x40; break;</div><div class='add'>+		}</div><div class='add'>+		change = ice-&gt;spdif.cs8403_stream_bits != tmp;</div><div class='add'>+		ice-&gt;spdif.cs8403_stream_bits = tmp;</div><div class='ctx'> 	}</div><div class='del'>-	change = ice-&gt;spdif.cs8403_stream_bits != tmp;</div><div class='del'>-	ice-&gt;spdif.cs8403_stream_bits = tmp;</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		snd_ctl_notify(ice-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;ice-&gt;spdif.stream_ctl-&gt;id);</div><div class='ctx'> 	snd_ice1712_ews_cs8404_spdif_write(ice, tmp);</div><div class='hunk'>@@ -344,7 +325,7 @@ static void ews88_setup_spdif(struct snd_ice1712 *ice, int rate)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  */</div><div class='del'>-static struct snd_akm4xxx akm_ews88mt __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_ews88mt = {</div><div class='ctx'> 	.num_adcs = 8,</div><div class='ctx'> 	.num_dacs = 8,</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='hunk'>@@ -354,7 +335,7 @@ static struct snd_akm4xxx akm_ews88mt __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_ews88mt_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 1, /* CIF high */</div><div class='ctx'> 	.data_mask = ICE1712_EWS88_SERIAL_DATA,</div><div class='hunk'>@@ -366,7 +347,7 @@ static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_ewx2496 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_ewx2496 = {</div><div class='ctx'> 	.num_adcs = 2,</div><div class='ctx'> 	.num_dacs = 2,</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='hunk'>@@ -375,7 +356,7 @@ static struct snd_akm4xxx akm_ewx2496 __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_ewx2496_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 1, /* CIF high */</div><div class='ctx'> 	.data_mask = ICE1712_EWS88_SERIAL_DATA,</div><div class='hunk'>@@ -387,7 +368,7 @@ static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_6fire __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_6fire = {</div><div class='ctx'> 	.num_adcs = 6,</div><div class='ctx'> 	.num_dacs = 6,</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='hunk'>@@ -396,7 +377,7 @@ static struct snd_akm4xxx akm_6fire __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_6fire_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_6fire_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 1, /* CIF high */</div><div class='ctx'> 	.data_mask = ICE1712_6FIRE_SERIAL_DATA,</div><div class='hunk'>@@ -420,7 +401,7 @@ static struct snd_ak4xxx_private akm_6fire_priv __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_6fire_write_pca(struct snd_ice1712 *ice, unsigned char reg, unsigned char data);</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_akm4xxx *ak;</div><div class='hunk'>@@ -456,8 +437,9 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	ice-&gt;spec = spec;</div><div class='ctx'> </div><div class='ctx'> 	/* create i2c */</div><div class='del'>-	if ((err = snd_i2c_bus_create(ice-&gt;card, "ICE1712 GPIO 1", NULL, &amp;ice-&gt;i2c)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to create I2C bus\n");</div><div class='add'>+	err = snd_i2c_bus_create(ice-&gt;card, "ICE1712 GPIO 1", NULL, &amp;ice-&gt;i2c);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "unable to create I2C bus\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	ice-&gt;i2c-&gt;private_data = ice;</div><div class='hunk'>@@ -470,7 +452,8 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> 					    ICE1712_6FIRE_PCF9554_ADDR,</div><div class='ctx'> 					    &amp;spec-&gt;i2cdevs[EWS_I2C_6FIRE]);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR "PCF9554 initialization failed\n");</div><div class='add'>+			dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+				"PCF9554 initialization failed\n");</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		snd_ice1712_6fire_write_pca(ice, PCF9554_REG_CONFIG, 0x80);</div><div class='hunk'>@@ -496,7 +479,8 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		/* Check if the front module is connected */</div><div class='del'>-		if ((err = snd_ice1712_ews88mt_chip_select(ice, 0x0f)) &lt; 0)</div><div class='add'>+		err = snd_ice1712_ews88mt_chip_select(ice, 0x0f);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_EWS88D:</div><div class='hunk'>@@ -511,12 +495,14 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	/* set up SPDIF interface */</div><div class='ctx'> 	switch (ice-&gt;eeprom.subvendor) {</div><div class='ctx'> 	case ICE1712_SUBDEVICE_EWX2496:</div><div class='del'>-		if ((err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR)) &lt; 0)</div><div class='add'>+		err = snd_ice1712_init_cs8427(ice, CS8427_BASE_ADDR);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		snd_cs8427_reg_write(ice-&gt;cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ICE1712_SUBDEVICE_DMX6FIRE:</div><div class='del'>-		if ((err = snd_ice1712_init_cs8427(ice, ICE1712_6FIRE_CS8427_ADDR)) &lt; 0)</div><div class='add'>+		err = snd_ice1712_init_cs8427(ice, ICE1712_6FIRE_CS8427_ADDR);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		snd_cs8427_reg_write(ice-&gt;cs8427, CS8427_REG_RECVERRMASK, CS8427_UNLOCK | CS8427_CONF | CS8427_BIP | CS8427_PAR);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -576,16 +562,10 @@ static int __devinit snd_ice1712_ews_init(struct snd_ice1712 *ice)</div><div class='ctx'> /* i/o sensitivity - this callback is shared among other devices, too */</div><div class='ctx'> static int snd_ice1712_ewx_io_sense_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo){</div><div class='ctx'> </div><div class='del'>-	static char *texts[2] = {</div><div class='add'>+	static const char * const texts[2] = {</div><div class='ctx'> 		"+4dBu", "-10dBV",</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 2)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_ewx_io_sense_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -616,7 +596,7 @@ static int snd_ice1712_ewx_io_sense_put(struct snd_kcontrol *kcontrol, struct sn</div><div class='ctx'> 	return val != nval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Input Sensitivity Switch",</div><div class='hunk'>@@ -724,7 +704,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st</div><div class='ctx'> 	return ndata != data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Input Sensitivity Switch",</div><div class='ctx'> 	.info = snd_ice1712_ewx_io_sense_info,</div><div class='hunk'>@@ -733,7 +713,7 @@ static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {</div><div class='ctx'> 	.count = 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Output Sensitivity Switch",</div><div class='ctx'> 	.info = snd_ice1712_ewx_io_sense_info,</div><div class='hunk'>@@ -811,7 +791,7 @@ static int snd_ice1712_ews88d_control_put(struct snd_kcontrol *kcontrol, struct</div><div class='ctx'>   .private_value = xshift | (xinvert &lt;&lt; 8),\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_ews88d_controls[] = {</div><div class='ctx'> 	EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */</div><div class='ctx'> 	EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0),</div><div class='ctx'> 	EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0),</div><div class='hunk'>@@ -831,11 +811,16 @@ static int snd_ice1712_6fire_read_pca(struct snd_ice1712 *ice, unsigned char reg</div><div class='ctx'> </div><div class='ctx'> 	snd_i2c_lock(ice-&gt;i2c);</div><div class='ctx'> 	byte = reg;</div><div class='del'>-	snd_i2c_sendbytes(spec-&gt;i2cdevs[EWS_I2C_6FIRE], &amp;byte, 1);</div><div class='add'>+	if (snd_i2c_sendbytes(spec-&gt;i2cdevs[EWS_I2C_6FIRE], &amp;byte, 1) != 1) {</div><div class='add'>+		snd_i2c_unlock(ice-&gt;i2c);</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "cannot send pca\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	byte = 0;</div><div class='ctx'> 	if (snd_i2c_readbytes(spec-&gt;i2cdevs[EWS_I2C_6FIRE], &amp;byte, 1) != 1) {</div><div class='ctx'> 		snd_i2c_unlock(ice-&gt;i2c);</div><div class='del'>-		printk(KERN_ERR "cannot read pca\n");</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "cannot read pca\n");</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_i2c_unlock(ice-&gt;i2c);</div><div class='hunk'>@@ -867,7 +852,8 @@ static int snd_ice1712_6fire_control_get(struct snd_kcontrol *kcontrol, struct s</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='ctx'> 	int data;</div><div class='ctx'> 	</div><div class='del'>-	if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) &lt; 0)</div><div class='add'>+	data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);</div><div class='add'>+	if (data &lt; 0)</div><div class='ctx'> 		return data;</div><div class='ctx'> 	data = (data &gt;&gt; shift) &amp; 1;</div><div class='ctx'> 	if (invert)</div><div class='hunk'>@@ -883,7 +869,8 @@ static int snd_ice1712_6fire_control_put(struct snd_kcontrol *kcontrol, struct s</div><div class='ctx'> 	int invert = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 1;</div><div class='ctx'> 	int data, ndata;</div><div class='ctx'> 	</div><div class='del'>-	if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) &lt; 0)</div><div class='add'>+	data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);</div><div class='add'>+	if (data &lt; 0)</div><div class='ctx'> 		return data;</div><div class='ctx'> 	ndata = data &amp; ~(1 &lt;&lt; shift);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='hunk'>@@ -899,16 +886,10 @@ static int snd_ice1712_6fire_control_put(struct snd_kcontrol *kcontrol, struct s</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_6fire_select_input_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[4] = {</div><div class='add'>+	static const char * const texts[4] = {</div><div class='ctx'> 		"Internal", "Front Input", "Rear Input", "Wave Table"</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 4;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= 4)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 4, texts);</div><div class='ctx'> }</div><div class='ctx'>      </div><div class='ctx'> static int snd_ice1712_6fire_select_input_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -916,7 +897,8 @@ static int snd_ice1712_6fire_select_input_get(struct snd_kcontrol *kcontrol, str</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int data;</div><div class='ctx'> 	</div><div class='del'>-	if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) &lt; 0)</div><div class='add'>+	data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);</div><div class='add'>+	if (data &lt; 0)</div><div class='ctx'> 		return data;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = data &amp; 3;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -927,7 +909,8 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int data, ndata;</div><div class='ctx'> 	</div><div class='del'>-	if ((data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT)) &lt; 0)</div><div class='add'>+	data = snd_ice1712_6fire_read_pca(ice, PCF9554_REG_OUTPUT);</div><div class='add'>+	if (data &lt; 0)</div><div class='ctx'> 		return data;</div><div class='ctx'> 	ndata = data &amp; ~3;</div><div class='ctx'> 	ndata |= (ucontrol-&gt;value.integer.value[0] &amp; 3);</div><div class='hunk'>@@ -948,7 +931,7 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str</div><div class='ctx'>   .private_value = xshift | (xinvert &lt;&lt; 8),\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_6fire_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Analog Input Select",</div><div class='hunk'>@@ -964,7 +947,7 @@ static struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1030,7 +1013,7 @@ static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_ice1712_ews_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = ICE1712_SUBDEVICE_EWX2496,</div><div class='ctx'> 		.name = "TerraTec EWX24/96",</div><div class='head'>diff --git a/sound/pci/ice1712/ews.h b/sound/pci/ice1712/ews.h<br/>index 1c443718af03..aec8dc69a9ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ews.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ews.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ews.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ews.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_EWS_H</div><div class='ctx'> #define __SOUND_EWS_H</div><div class='ctx'> </div><div class='hunk'>@@ -8,21 +9,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                    2002 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define EWS_DEVICE_DESC \</div><div class='head'>diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c<br/>index 6914189073a4..071f94dc7390 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/hoontech.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/hoontech.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/hoontech.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/hoontech.c</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for Hoontech STDSP24</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -40,7 +25,7 @@ struct hoontech_spec {</div><div class='ctx'> 	unsigned short boxconfig[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, unsigned char byte)</div><div class='add'>+static void snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, unsigned char byte)</div><div class='ctx'> {</div><div class='ctx'> 	byte |= ICE1712_STDSP24_CLOCK_BIT;</div><div class='ctx'> 	udelay(100);</div><div class='hunk'>@@ -53,38 +38,38 @@ static void __devinit snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, un</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, byte);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_darear(struct snd_ice1712 *ice, int activate)</div><div class='add'>+static void snd_ice1712_stdsp24_darear(struct snd_ice1712 *ice, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ICE1712_STDSP24_0_DAREAR(spec-&gt;boxbits, activate);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[0]);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_mute(struct snd_ice1712 *ice, int activate)</div><div class='add'>+static void snd_ice1712_stdsp24_mute(struct snd_ice1712 *ice, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ICE1712_STDSP24_3_MUTE(spec-&gt;boxbits, activate);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[3]);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_insel(struct snd_ice1712 *ice, int activate)</div><div class='add'>+static void snd_ice1712_stdsp24_insel(struct snd_ice1712 *ice, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ICE1712_STDSP24_3_INSEL(spec-&gt;boxbits, activate);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[3]);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, int box, int chn, int activate)</div><div class='add'>+static void snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, int box, int chn, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* select box */</div><div class='ctx'> 	ICE1712_STDSP24_0_BOX(spec-&gt;boxbits, box);</div><div class='hunk'>@@ -126,15 +111,13 @@ static void __devinit snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, i</div><div class='ctx'> </div><div class='ctx'> 	ICE1712_STDSP24_2_MIDI1(spec-&gt;boxbits, 0);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[2]);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int box, int master)</div><div class='add'>+static void snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int box, int master)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* select box */</div><div class='ctx'> 	ICE1712_STDSP24_0_BOX(spec-&gt;boxbits, box);</div><div class='hunk'>@@ -154,20 +137,18 @@ static void __devinit snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int</div><div class='ctx'> 	</div><div class='ctx'> 	ICE1712_STDSP24_2_MIDIIN(spec-&gt;boxbits, 1);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[2]);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_stdsp24_midi2(struct snd_ice1712 *ice, int activate)</div><div class='add'>+static void snd_ice1712_stdsp24_midi2(struct snd_ice1712 *ice, int activate)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec = ice-&gt;spec;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ICE1712_STDSP24_3_MIDI2(spec-&gt;boxbits, activate);</div><div class='ctx'> 	snd_ice1712_stdsp24_gpio_write(ice, spec-&gt;boxbits[3]);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)</div><div class='add'>+static int hoontech_init(struct snd_ice1712 *ice, bool staudio)</div><div class='ctx'> {</div><div class='ctx'> 	struct hoontech_spec *spec;</div><div class='ctx'> 	int box, chn;</div><div class='hunk'>@@ -204,7 +185,10 @@ static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	ICE1712_STDSP24_3_INSEL(spec-&gt;boxbits, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* let's go - activate only functions in first box */</div><div class='del'>-	spec-&gt;config = 0;</div><div class='add'>+	if (staudio)</div><div class='add'>+		spec-&gt;config = ICE1712_STDSP24_MUTE;</div><div class='add'>+	else</div><div class='add'>+		spec-&gt;config = 0;</div><div class='ctx'> 			    /* ICE1712_STDSP24_MUTE |</div><div class='ctx'> 			       ICE1712_STDSP24_INSEL |</div><div class='ctx'> 			       ICE1712_STDSP24_DAREAR; */</div><div class='hunk'>@@ -227,9 +211,16 @@ static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)</div><div class='ctx'> 				     ICE1712_STDSP24_BOX_CHN4 |</div><div class='ctx'> 				     ICE1712_STDSP24_BOX_MIDI1 |</div><div class='ctx'> 				     ICE1712_STDSP24_BOX_MIDI2;</div><div class='del'>-	spec-&gt;boxconfig[1] = </div><div class='del'>-	spec-&gt;boxconfig[2] = </div><div class='del'>-	spec-&gt;boxconfig[3] = 0;</div><div class='add'>+	if (staudio) {</div><div class='add'>+		spec-&gt;boxconfig[1] =</div><div class='add'>+		spec-&gt;boxconfig[2] =</div><div class='add'>+		spec-&gt;boxconfig[3] = spec-&gt;boxconfig[0];</div><div class='add'>+	} else {</div><div class='add'>+		spec-&gt;boxconfig[1] =</div><div class='add'>+		spec-&gt;boxconfig[2] =</div><div class='add'>+		spec-&gt;boxconfig[3] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	snd_ice1712_stdsp24_darear(ice,</div><div class='ctx'> 		(spec-&gt;config &amp; ICE1712_STDSP24_DAREAR) ? 1 : 0);</div><div class='ctx'> 	snd_ice1712_stdsp24_mute(ice,</div><div class='hunk'>@@ -249,6 +240,16 @@ static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_ice1712_hoontech_init(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	return hoontech_init(ice, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_ice1712_staudio_init(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	return hoontech_init(ice, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * AK4524 access</div><div class='ctx'>  */</div><div class='hunk'>@@ -267,10 +268,10 @@ static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_value_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	/* Hoontech STDSP24 with modified hardware */</div><div class='del'>-	static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {</div><div class='add'>+	static const struct snd_akm4xxx akm_stdsp24_mv = {</div><div class='ctx'> 		.num_adcs = 2,</div><div class='ctx'> 		.num_dacs = 2,</div><div class='ctx'> 		.type = SND_AK4524,</div><div class='hunk'>@@ -279,7 +280,7 @@ static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	static struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = {</div><div class='add'>+	static const struct snd_ak4xxx_private akm_stdsp24_mv_priv = {</div><div class='ctx'> 		.caddr = 2,</div><div class='ctx'> 		.cif = 1, /* CIF high */</div><div class='ctx'> 		.data_mask = ICE1712_STDSP24_SERIAL_DATA,</div><div class='hunk'>@@ -310,14 +311,10 @@ static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* ak4524 controls */</div><div class='del'>-	err = snd_ice1712_akm4xxx_build_controls(ice);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ice1712_akm4xxx_build_controls(ice);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_ez8_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	ice-&gt;gpio.write_mask = ice-&gt;eeprom.gpiomask;</div><div class='ctx'> 	ice-&gt;gpio.direction = ice-&gt;eeprom.gpiodir;</div><div class='hunk'>@@ -329,7 +326,7 @@ static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = ICE1712_SUBDEVICE_STDSP24,</div><div class='ctx'> 		.name = "Hoontech SoundTrack Audio DSP24",</div><div class='hunk'>@@ -356,5 +353,14 @@ struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {</div><div class='ctx'> 		.model = "ez8",</div><div class='ctx'> 		.chip_init = snd_ice1712_ez8_init,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		/* STAudio ADCIII has the same SSID as Hoontech StA DSP24,</div><div class='add'>+		 * thus identified only via the explicit model option</div><div class='add'>+		 */</div><div class='add'>+		.subvendor = ICE1712_SUBDEVICE_STAUDIO_ADCIII,	/* a dummy id */</div><div class='add'>+		.name = "STAudio ADCIII",</div><div class='add'>+		.model = "staudio",</div><div class='add'>+		.chip_init = snd_ice1712_staudio_init,</div><div class='add'>+	},</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='head'>diff --git a/sound/pci/ice1712/hoontech.h b/sound/pci/ice1712/hoontech.h<br/>index cc1da1e69ad1..89404ceecbe7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/hoontech.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/hoontech.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/hoontech.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/hoontech.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_HOONTECH_H</div><div class='ctx'> #define __SOUND_HOONTECH_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Hoontech STDSP24</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define  HOONTECH_DEVICE_DESC \</div><div class='hunk'>@@ -34,6 +20,7 @@</div><div class='ctx'> #define ICE1712_SUBDEVICE_STDSP24_VALUE		0x00010010	/* A dummy id for Hoontech SoundTrack Audio DSP 24 Value */</div><div class='ctx'> #define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1	0x16141217	/* Hoontech ST Audio DSP24 Media 7.1 */</div><div class='ctx'> #define ICE1712_SUBDEVICE_EVENT_EZ8		0x00010001	/* A dummy id for EZ8 */</div><div class='add'>+#define ICE1712_SUBDEVICE_STAUDIO_ADCIII	0x00010002	/* A dummy id for STAudio ADCIII */</div><div class='ctx'> </div><div class='ctx'> extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[];</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c<br/>index 4fc6d8bc637e..1e39b985bef2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1712.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1712.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1712.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ice1712.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -47,14 +33,13 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='hunk'>@@ -75,19 +60,13 @@</div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("ICEnsemble ICE1712 (Envy24)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{"</div><div class='del'>-	       HOONTECH_DEVICE_DESC</div><div class='del'>-	       DELTA_DEVICE_DESC</div><div class='del'>-	       EWS_DEVICE_DESC</div><div class='del'>-	       "{ICEnsemble,Generic ICE1712},"</div><div class='del'>-	       "{ICEnsemble,Generic Envy24}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */</div><div class='ctx'> static char *model[SNDRV_CARDS];</div><div class='del'>-static int omni[SNDRV_CARDS];				/* Delta44 &amp; 66 Omni I/O support */</div><div class='del'>-static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transciever reset timeout value in msec */</div><div class='add'>+static bool omni[SNDRV_CARDS];				/* Delta44 &amp; 66 Omni I/O support */</div><div class='add'>+static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transceiver reset timeout value in msec */</div><div class='ctx'> static int dxr_enable[SNDRV_CARDS];			/* DXR enable for DMX6FIRE */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -106,7 +85,7 @@ module_param_array(dxr_enable, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE.");</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_ice1712_ids) = {</div><div class='add'>+static const struct pci_device_id snd_ice1712_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 },   /* ICE1712 */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -270,17 +249,16 @@ static int snd_ice1712_digmix_route_ac97_put(struct snd_kcontrol *kcontrol, stru</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned char val, nval;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	val = inb(ICEMT(ice, MONITOR_ROUTECTRL));</div><div class='ctx'> 	nval = val &amp; ~ICE1712_ROUTE_AC97;</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		nval |= ICE1712_ROUTE_AC97;</div><div class='ctx'> 	outb(nval, ICEMT(ice, MONITOR_ROUTECTRL));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return val != nval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Digital Mixer To AC97",</div><div class='ctx'> 	.info = snd_ice1712_digmix_route_ac97_info,</div><div class='hunk'>@@ -388,14 +366,14 @@ static void setup_cs8427(struct snd_ice1712 *ice, int rate)</div><div class='ctx'> /*</div><div class='ctx'>  * create and initialize callbacks for cs8427 interface</div><div class='ctx'>  */</div><div class='del'>-int __devinit snd_ice1712_init_cs8427(struct snd_ice1712 *ice, int addr)</div><div class='add'>+int snd_ice1712_init_cs8427(struct snd_ice1712 *ice, int addr)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = snd_cs8427_create(ice-&gt;i2c, addr,</div><div class='ctx'> 		(ice-&gt;cs8427_timeout * HZ) / 1000, &amp;ice-&gt;cs8427);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "CS8427 initialization failed\n");</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "CS8427 initialization failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	ice-&gt;spdif.ops.open = open_cs8427;</div><div class='hunk'>@@ -468,7 +446,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			u16 pbkstatus;</div><div class='ctx'> 			struct snd_pcm_substream *substream;</div><div class='ctx'> 			pbkstatus = inw(ICEDS(ice, INTSTAT));</div><div class='del'>-			/* printk(KERN_DEBUG "pbkstatus = 0x%x\n", pbkstatus); */</div><div class='add'>+			/* dev_dbg(ice-&gt;card-&gt;dev, "pbkstatus = 0x%x\n", pbkstatus); */</div><div class='ctx'> 			for (idx = 0; idx &lt; 6; idx++) {</div><div class='ctx'> 				if ((pbkstatus &amp; (3 &lt;&lt; (idx * 2))) == 0)</div><div class='ctx'> 					continue;</div><div class='hunk'>@@ -495,21 +473,6 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *  PCM part - misc</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int snd_ice1712_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				 struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_ice1712_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  *  PCM part - consumer I/O</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -520,7 +483,7 @@ static int snd_ice1712_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	tmp = snd_ice1712_read(ice, ICE1712_IREG_PBK_CTRL);</div><div class='ctx'> 	if (cmd == SNDRV_PCM_TRIGGER_START) {</div><div class='ctx'> 		tmp |= 1;</div><div class='hunk'>@@ -534,7 +497,6 @@ static int snd_ice1712_playback_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_PBK_CTRL, tmp);</div><div class='del'>-	spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -545,7 +507,7 @@ static int snd_ice1712_playback_ds_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	tmp = snd_ice1712_ds_read(ice, substream-&gt;number * 2, ICE1712_DSC_CONTROL);</div><div class='ctx'> 	if (cmd == SNDRV_PCM_TRIGGER_START) {</div><div class='ctx'> 		tmp |= 1;</div><div class='hunk'>@@ -559,7 +521,6 @@ static int snd_ice1712_playback_ds_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ice1712_ds_write(ice, substream-&gt;number * 2, ICE1712_DSC_CONTROL, tmp);</div><div class='del'>-	spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -570,7 +531,7 @@ static int snd_ice1712_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	int result = 0;</div><div class='ctx'> 	u8 tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	tmp = snd_ice1712_read(ice, ICE1712_IREG_CAP_CTRL);</div><div class='ctx'> 	if (cmd == SNDRV_PCM_TRIGGER_START) {</div><div class='ctx'> 		tmp |= 1;</div><div class='hunk'>@@ -580,7 +541,6 @@ static int snd_ice1712_capture_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 		result = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_CAP_CTRL, tmp);</div><div class='del'>-	spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -600,7 +560,7 @@ static int snd_ice1712_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	rate = (runtime-&gt;rate * 8192) / 375;</div><div class='ctx'> 	if (rate &gt; 0x000fffff)</div><div class='ctx'> 		rate = 0x000fffff;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	outb(0, ice-&gt;ddma_port + 15);</div><div class='ctx'> 	outb(ICE1712_DMA_MODE_WRITE | ICE1712_DMA_AUTOINIT, ice-&gt;ddma_port + 0x0b);</div><div class='ctx'> 	outl(runtime-&gt;dma_addr, ice-&gt;ddma_port + 0);</div><div class='hunk'>@@ -613,7 +573,6 @@ static int snd_ice1712_playback_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_PBK_COUNT_HI, period_size &gt;&gt; 8);</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_PBK_LEFT, 0);</div><div class='ctx'> 	snd_ice1712_write(ice, ICE1712_IREG_PBK_RIGHT, 0);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -621,10 +580,9 @@ static int snd_ice1712_playback_ds_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='del'>-	u32 period_size, buf_size, rate, tmp, chn;</div><div class='add'>+	u32 period_size, rate, tmp, chn;</div><div class='ctx'> </div><div class='ctx'> 	period_size = snd_pcm_lib_period_bytes(substream) - 1;</div><div class='del'>-	buf_size = snd_pcm_lib_buffer_bytes(substream) - 1;</div><div class='ctx'> 	tmp = 0x0064;</div><div class='ctx'> 	if (snd_pcm_format_width(runtime-&gt;format) == 16)</div><div class='ctx'> 		tmp &amp;= ~0x04;</div><div class='hunk'>@@ -636,7 +594,7 @@ static int snd_ice1712_playback_ds_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ice-&gt;playback_con_active_buf[substream-&gt;number] = 0;</div><div class='ctx'> 	ice-&gt;playback_con_virt_addr[substream-&gt;number] = runtime-&gt;dma_addr;</div><div class='ctx'> 	chn = substream-&gt;number * 2;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	snd_ice1712_ds_write(ice, chn, ICE1712_DSC_ADDR0, runtime-&gt;dma_addr);</div><div class='ctx'> 	snd_ice1712_ds_write(ice, chn, ICE1712_DSC_COUNT0, period_size);</div><div class='ctx'> 	snd_ice1712_ds_write(ice, chn, ICE1712_DSC_ADDR1, runtime-&gt;dma_addr + (runtime-&gt;periods &gt; 1 ? period_size + 1 : 0));</div><div class='hunk'>@@ -648,7 +606,6 @@ static int snd_ice1712_playback_ds_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		snd_ice1712_ds_write(ice, chn + 1, ICE1712_DSC_RATE, rate);</div><div class='ctx'> 		snd_ice1712_ds_write(ice, chn + 1, ICE1712_DSC_VOLUME, 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -666,13 +623,13 @@ static int snd_ice1712_capture_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 		tmp &amp;= ~0x04;</div><div class='ctx'> 	if (runtime-&gt;channels == 2)</div><div class='ctx'> 		tmp &amp;= ~0x02;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	outl(ice-&gt;capture_con_virt_addr = runtime-&gt;dma_addr, ICEREG(ice, CONCAP_ADDR));</div><div class='del'>-	outw(buf_size, ICEREG(ice, CONCAP_COUNT));</div><div class='del'>-	snd_ice1712_write(ice, ICE1712_IREG_CAP_COUNT_HI, period_size &gt;&gt; 8);</div><div class='del'>-	snd_ice1712_write(ice, ICE1712_IREG_CAP_COUNT_LO, period_size &amp; 0xff);</div><div class='del'>-	snd_ice1712_write(ice, ICE1712_IREG_CAP_CTRL, tmp);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		outl(ice-&gt;capture_con_virt_addr = runtime-&gt;dma_addr, ICEREG(ice, CONCAP_ADDR));</div><div class='add'>+		outw(buf_size, ICEREG(ice, CONCAP_COUNT));</div><div class='add'>+		snd_ice1712_write(ice, ICE1712_IREG_CAP_COUNT_HI, period_size &gt;&gt; 8);</div><div class='add'>+		snd_ice1712_write(ice, ICE1712_IREG_CAP_COUNT_LO, period_size &amp; 0xff);</div><div class='add'>+		snd_ice1712_write(ice, ICE1712_IREG_CAP_CTRL, tmp);</div><div class='add'>+	}</div><div class='ctx'> 	snd_ac97_set_rate(ice-&gt;ac97, AC97_PCM_LR_ADC_RATE, runtime-&gt;rate);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -686,9 +643,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pointer(struct snd_pcm_substream *</div><div class='ctx'> 	if (!(snd_ice1712_read(ice, ICE1712_IREG_PBK_CTRL) &amp; 1))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	ptr = runtime-&gt;buffer_size - inw(ice-&gt;ddma_port + 4);</div><div class='add'>+	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr == runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = 0;</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -705,9 +663,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substrea</div><div class='ctx'> 		addr = ICE1712_DSC_ADDR0;</div><div class='ctx'> 	ptr = snd_ice1712_ds_read(ice, substream-&gt;number * 2, addr) -</div><div class='ctx'> 		ice-&gt;playback_con_virt_addr[substream-&gt;number];</div><div class='add'>+	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr == substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = 0;</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -718,9 +677,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *s</div><div class='ctx'> 	if (!(snd_ice1712_read(ice, ICE1712_IREG_CAP_CTRL) &amp; 1))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	ptr = inl(ICEREG(ice, CONCAP_ADDR)) - ice-&gt;capture_con_virt_addr;</div><div class='add'>+	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr == substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = 0;</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct snd_pcm_hardware snd_ice1712_playback = {</div><div class='hunk'>@@ -797,10 +757,9 @@ static int snd_ice1712_playback_ds_open(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;playback_con_substream_ds[substream-&gt;number] = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_ice1712_playback_ds;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	tmp = inw(ICEDS(ice, INTMASK)) &amp; ~(1 &lt;&lt; (substream-&gt;number * 2));</div><div class='ctx'> 	outw(tmp, ICEDS(ice, INTMASK));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -830,10 +789,9 @@ static int snd_ice1712_playback_ds_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	tmp = inw(ICEDS(ice, INTMASK)) | (3 &lt;&lt; (substream-&gt;number * 2));</div><div class='ctx'> 	outw(tmp, ICEDS(ice, INTMASK));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	ice-&gt;playback_con_substream_ds[substream-&gt;number] = NULL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -846,46 +804,35 @@ static int snd_ice1712_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ice1712_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ice1712_playback_ops = {</div><div class='ctx'> 	.open =		snd_ice1712_playback_open,</div><div class='ctx'> 	.close =	snd_ice1712_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ice1712_hw_params,</div><div class='del'>-	.hw_free =	snd_ice1712_hw_free,</div><div class='ctx'> 	.prepare =	snd_ice1712_playback_prepare,</div><div class='ctx'> 	.trigger =	snd_ice1712_playback_trigger,</div><div class='ctx'> 	.pointer =	snd_ice1712_playback_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ice1712_playback_ds_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ice1712_playback_ds_ops = {</div><div class='ctx'> 	.open =		snd_ice1712_playback_ds_open,</div><div class='ctx'> 	.close =	snd_ice1712_playback_ds_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ice1712_hw_params,</div><div class='del'>-	.hw_free =	snd_ice1712_hw_free,</div><div class='ctx'> 	.prepare =	snd_ice1712_playback_ds_prepare,</div><div class='ctx'> 	.trigger =	snd_ice1712_playback_ds_trigger,</div><div class='ctx'> 	.pointer =	snd_ice1712_playback_ds_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ice1712_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ice1712_capture_ops = {</div><div class='ctx'> 	.open =		snd_ice1712_capture_open,</div><div class='ctx'> 	.close =	snd_ice1712_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_ice1712_hw_params,</div><div class='del'>-	.hw_free =	snd_ice1712_hw_free,</div><div class='ctx'> 	.prepare =	snd_ice1712_capture_prepare,</div><div class='ctx'> 	.trigger =	snd_ice1712_capture_trigger,</div><div class='ctx'> 	.pointer =	snd_ice1712_capture_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_pcm(struct snd_ice1712 *ice, int device, struct snd_pcm **rpcm)</div><div class='add'>+static int snd_ice1712_pcm(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	err = snd_pcm_new(ice-&gt;card, "ICE1712 consumer", device, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -895,27 +842,23 @@ static int __devinit snd_ice1712_pcm(struct snd_ice1712 *ice, int device, struct</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ICE1712 consumer");</div><div class='add'>+	strscpy(pcm-&gt;name, "ICE1712 consumer");</div><div class='ctx'> 	ice-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci), 64*1024, 64*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 64*1024, 64*1024);</div><div class='ctx'> </div><div class='del'>-	printk(KERN_WARNING "Consumer PCM code does not work well at the moment --jk\n");</div><div class='add'>+	dev_warn(ice-&gt;card-&gt;dev,</div><div class='add'>+		 "Consumer PCM code does not work well at the moment --jk\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_pcm_ds(struct snd_ice1712 *ice, int device, struct snd_pcm **rpcm)</div><div class='add'>+static int snd_ice1712_pcm_ds(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	err = snd_pcm_new(ice-&gt;card, "ICE1712 consumer (DS)", device, 6, 0, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -924,14 +867,11 @@ static int __devinit snd_ice1712_pcm_ds(struct snd_ice1712 *ice, int device, str</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ICE1712 consumer (DS)");</div><div class='add'>+	strscpy(pcm-&gt;name, "ICE1712 consumer (DS)");</div><div class='ctx'> 	ice-&gt;pcm_ds = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci), 64*1024, 128*1024);</div><div class='del'>-</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 64*1024, 128*1024);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -940,10 +880,10 @@ static int __devinit snd_ice1712_pcm_ds(struct snd_ice1712 *ice, int device, str</div><div class='ctx'>  *  PCM code - professional part (multitrack)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = { 8000, 9600, 11025, 12000, 16000, 22050, 24000,</div><div class='add'>+static const unsigned int rates[] = { 8000, 9600, 11025, 12000, 16000, 22050, 24000,</div><div class='ctx'> 				32000, 44100, 48000, 64000, 88200, 96000 };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -963,14 +903,13 @@ static int snd_ice1712_pro_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		what = ICE1712_PLAYBACK_PAUSE;</div><div class='ctx'> 		snd_pcm_trigger_done(substream, substream);</div><div class='del'>-		spin_lock(&amp;ice-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 		old = inl(ICEMT(ice, PLAYBACK_CONTROL));</div><div class='ctx'> 		if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH)</div><div class='ctx'> 			old |= what;</div><div class='ctx'> 		else</div><div class='ctx'> 			old &amp;= ~what;</div><div class='ctx'> 		outl(old, ICEMT(ice, PLAYBACK_CONTROL));</div><div class='del'>-		spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='hunk'>@@ -989,14 +928,13 @@ static int snd_ice1712_pro_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 				snd_pcm_trigger_done(s, substream);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		spin_lock(&amp;ice-&gt;reg_lock);</div><div class='add'>+		guard(spinlock)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 		old = inl(ICEMT(ice, PLAYBACK_CONTROL));</div><div class='ctx'> 		if (cmd == SNDRV_PCM_TRIGGER_START)</div><div class='ctx'> 			old |= what;</div><div class='ctx'> 		else</div><div class='ctx'> 			old &amp;= ~what;</div><div class='ctx'> 		outl(old, ICEMT(ice, PLAYBACK_CONTROL));</div><div class='del'>-		spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1009,7 +947,6 @@ static int snd_ice1712_pro_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'>  */</div><div class='ctx'> static void snd_ice1712_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, int force)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char val, old;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1034,22 +971,21 @@ static void snd_ice1712_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-	if (inb(ICEMT(ice, PLAYBACK_CONTROL)) &amp; (ICE1712_CAPTURE_START_SHADOW|</div><div class='del'>-						 ICE1712_PLAYBACK_PAUSE|</div><div class='del'>-						 ICE1712_PLAYBACK_START)) {</div><div class='del'>-__out:</div><div class='del'>-		spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (!force &amp;&amp; is_pro_rate_locked(ice))</div><div class='del'>-		goto __out;</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		if (inb(ICEMT(ice, PLAYBACK_CONTROL)) &amp; (ICE1712_CAPTURE_START_SHADOW|</div><div class='add'>+							 ICE1712_PLAYBACK_PAUSE|</div><div class='add'>+							 ICE1712_PLAYBACK_START))</div><div class='add'>+			return;</div><div class='add'>+		if (!force &amp;&amp; is_pro_rate_locked(ice))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-	old = inb(ICEMT(ice, RATE));</div><div class='del'>-	if (!force &amp;&amp; old == val)</div><div class='del'>-		goto __out;</div><div class='del'>-	outb(val, ICEMT(ice, RATE));</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='add'>+		old = inb(ICEMT(ice, RATE));</div><div class='add'>+		if (!force &amp;&amp; old == val)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		ice-&gt;cur_rate = rate;</div><div class='add'>+		outb(val, ICEMT(ice, RATE));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice-&gt;gpio.set_pro_rate)</div><div class='ctx'> 		ice-&gt;gpio.set_pro_rate(ice, rate);</div><div class='hunk'>@@ -1066,11 +1002,10 @@ static int snd_ice1712_playback_pro_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;playback_pro_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	outl(substream-&gt;runtime-&gt;dma_addr, ICEMT(ice, PLAYBACK_ADDR));</div><div class='ctx'> 	outw((ice-&gt;playback_pro_size &gt;&gt; 2) - 1, ICEMT(ice, PLAYBACK_SIZE));</div><div class='ctx'> 	outw((snd_pcm_lib_period_bytes(substream) &gt;&gt; 2) - 1, ICEMT(ice, PLAYBACK_COUNT));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1081,7 +1016,7 @@ static int snd_ice1712_playback_pro_hw_params(struct snd_pcm_substream *substrea</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	snd_ice1712_set_pro_rate(ice, params_rate(hw_params), 0);</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_capture_pro_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1089,11 +1024,10 @@ static int snd_ice1712_capture_pro_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;capture_pro_size = snd_pcm_lib_buffer_bytes(substream);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	outl(substream-&gt;runtime-&gt;dma_addr, ICEMT(ice, CAPTURE_ADDR));</div><div class='ctx'> 	outw((ice-&gt;capture_pro_size &gt;&gt; 2) - 1, ICEMT(ice, CAPTURE_SIZE));</div><div class='ctx'> 	outw((snd_pcm_lib_period_bytes(substream) &gt;&gt; 2) - 1, ICEMT(ice, CAPTURE_COUNT));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1103,7 +1037,7 @@ static int snd_ice1712_capture_pro_hw_params(struct snd_pcm_substream *substream</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	snd_ice1712_set_pro_rate(ice, params_rate(hw_params), 0);</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ice1712_playback_pro_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1114,9 +1048,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pro_pointer(struct snd_pcm_substre</div><div class='ctx'> 	if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) &amp; ICE1712_PLAYBACK_START))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	ptr = ice-&gt;playback_pro_size - (inw(ICEMT(ice, PLAYBACK_SIZE)) &lt;&lt; 2);</div><div class='add'>+	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr == substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = 0;</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1127,9 +1062,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substrea</div><div class='ctx'> 	if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) &amp; ICE1712_CAPTURE_START_SHADOW))</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	ptr = ice-&gt;capture_pro_size - (inw(ICEMT(ice, CAPTURE_SIZE)) &lt;&lt; 2);</div><div class='add'>+	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr == substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = 0;</div><div class='del'>-	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='add'>+	return ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct snd_pcm_hardware snd_ice1712_playback_pro = {</div><div class='hunk'>@@ -1232,35 +1168,29 @@ static int snd_ice1712_capture_pro_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ice1712_playback_pro_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ice1712_playback_pro_ops = {</div><div class='ctx'> 	.open =		snd_ice1712_playback_pro_open,</div><div class='ctx'> 	.close =	snd_ice1712_playback_pro_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_ice1712_playback_pro_hw_params,</div><div class='del'>-	.hw_free =	snd_ice1712_hw_free,</div><div class='ctx'> 	.prepare =	snd_ice1712_playback_pro_prepare,</div><div class='ctx'> 	.trigger =	snd_ice1712_pro_trigger,</div><div class='ctx'> 	.pointer =	snd_ice1712_playback_pro_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_ice1712_capture_pro_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_ice1712_capture_pro_ops = {</div><div class='ctx'> 	.open =		snd_ice1712_capture_pro_open,</div><div class='ctx'> 	.close =	snd_ice1712_capture_pro_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_ice1712_capture_pro_hw_params,</div><div class='del'>-	.hw_free =	snd_ice1712_hw_free,</div><div class='ctx'> 	.prepare =	snd_ice1712_capture_pro_prepare,</div><div class='ctx'> 	.trigger =	snd_ice1712_pro_trigger,</div><div class='ctx'> 	.pointer =	snd_ice1712_capture_pro_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device, struct snd_pcm **rpcm)</div><div class='add'>+static int snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = NULL;</div><div class='ctx'> 	err = snd_pcm_new(ice-&gt;card, "ICE1712 multi", device, 1, 1, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1270,14 +1200,12 @@ static int __devinit snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device,</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ICE1712 multi");</div><div class='add'>+	strscpy(pcm-&gt;name, "ICE1712 multi");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci), 256*1024, 256*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 256*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;pcm_pro = pcm;</div><div class='del'>-	if (rpcm)</div><div class='del'>-		*rpcm = pcm;</div><div class='ctx'> </div><div class='ctx'> 	if (ice-&gt;cs8427) {</div><div class='ctx'> 		/* assign channels to iec958 */</div><div class='hunk'>@@ -1288,10 +1216,7 @@ static int __devinit snd_ice1712_pcm_profi(struct snd_ice1712 *ice, int device,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_ice1712_build_pro_mixer(ice);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ice1712_build_pro_mixer(ice);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1317,12 +1242,11 @@ static int snd_ice1712_pro_mixer_switch_get(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> 	int priv_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id) +</div><div class='ctx'> 		kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		!((ice-&gt;pro_volumes[priv_idx] &gt;&gt; 15) &amp; 1);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] =</div><div class='ctx'> 		!((ice-&gt;pro_volumes[priv_idx] &gt;&gt; 31) &amp; 1);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1335,12 +1259,11 @@ static int snd_ice1712_pro_mixer_switch_put(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> </div><div class='ctx'> 	nval = (ucontrol-&gt;value.integer.value[0] ? 0 : 0x00008000) |</div><div class='ctx'> 	       (ucontrol-&gt;value.integer.value[1] ? 0 : 0x80000000);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	nval |= ice-&gt;pro_volumes[priv_idx] &amp; ~0x80008000;</div><div class='ctx'> 	change = nval != ice-&gt;pro_volumes[priv_idx];</div><div class='ctx'> 	ice-&gt;pro_volumes[priv_idx] = nval;</div><div class='ctx'> 	snd_ice1712_update_volume(ice, priv_idx);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1359,12 +1282,11 @@ static int snd_ice1712_pro_mixer_volume_get(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> 	int priv_idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id) +</div><div class='ctx'> 		kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		(ice-&gt;pro_volumes[priv_idx] &gt;&gt; 0) &amp; 127;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] =</div><div class='ctx'> 		(ice-&gt;pro_volumes[priv_idx] &gt;&gt; 16) &amp; 127;</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1377,18 +1299,17 @@ static int snd_ice1712_pro_mixer_volume_put(struct snd_kcontrol *kcontrol, struc</div><div class='ctx'> </div><div class='ctx'> 	nval = (ucontrol-&gt;value.integer.value[0] &amp; 127) |</div><div class='ctx'> 	       ((ucontrol-&gt;value.integer.value[1] &amp; 127) &lt;&lt; 16);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	nval |= ice-&gt;pro_volumes[priv_idx] &amp; ~0x007f007f;</div><div class='ctx'> 	change = nval != ice-&gt;pro_volumes[priv_idx];</div><div class='ctx'> 	ice-&gt;pro_volumes[priv_idx] = nval;</div><div class='ctx'> 	snd_ice1712_update_volume(ice, priv_idx);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Multi Playback Switch",</div><div class='hunk'>@@ -1412,7 +1333,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "H/W Multi Capture Switch",</div><div class='ctx'> 	.info = snd_ice1712_pro_mixer_switch_info,</div><div class='hunk'>@@ -1421,7 +1342,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinit</div><div class='ctx'> 	.private_value = 10,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = SNDRV_CTL_NAME_IEC958("Multi ", CAPTURE, SWITCH),</div><div class='ctx'> 	.info = snd_ice1712_pro_mixer_switch_info,</div><div class='hunk'>@@ -1431,7 +1352,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitd</div><div class='ctx'> 	.count = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 		   SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='hunk'>@@ -1443,7 +1364,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinit</div><div class='ctx'> 	.tlv = { .p = db_scale_playback }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = SNDRV_CTL_NAME_IEC958("Multi ", CAPTURE, VOLUME),</div><div class='ctx'> 	.info = snd_ice1712_pro_mixer_volume_info,</div><div class='hunk'>@@ -1453,7 +1374,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitd</div><div class='ctx'> 	.count = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_build_pro_mixer(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_build_pro_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card = ice-&gt;card;</div><div class='ctx'> 	unsigned int idx;</div><div class='hunk'>@@ -1512,16 +1433,16 @@ static void snd_ice1712_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='ctx'> 	ice-&gt;ac97 = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err, bus_num = 0;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='del'>-	static struct snd_ac97_bus_ops con_ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops con_ops = {</div><div class='ctx'> 		.write = snd_ice1712_ac97_write,</div><div class='ctx'> 		.read = snd_ice1712_ac97_read,</div><div class='ctx'> 	};</div><div class='del'>-	static struct snd_ac97_bus_ops pro_ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops pro_ops = {</div><div class='ctx'> 		.write = snd_ice1712_pro_ac97_write,</div><div class='ctx'> 		.read = snd_ice1712_pro_ac97_read,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -1535,12 +1456,12 @@ static int __devinit snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> 		ac97.private_free = snd_ice1712_mixer_free_ac97;</div><div class='ctx'> 		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;ice-&gt;ac97);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			printk(KERN_WARNING "ice1712: cannot initialize ac97 for consumer, skipped\n");</div><div class='add'>+			dev_warn(ice-&gt;card-&gt;dev,</div><div class='add'>+				 "cannot initialize ac97 for consumer, skipped\n");</div><div class='ctx'> 		else {</div><div class='del'>-			err = snd_ctl_add(ice-&gt;card, snd_ctl_new1(&amp;snd_ice1712_mixer_digmix_route_ac97, ice));</div><div class='del'>-			if (err &lt; 0)</div><div class='del'>-				return err;</div><div class='del'>-			return 0;</div><div class='add'>+			return snd_ctl_add(ice-&gt;card,</div><div class='add'>+			snd_ctl_new1(&amp;snd_ice1712_mixer_digmix_route_ac97,</div><div class='add'>+				     ice));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1553,7 +1474,8 @@ static int __devinit snd_ice1712_ac97_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> 		ac97.private_free = snd_ice1712_mixer_free_ac97;</div><div class='ctx'> 		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;ice-&gt;ac97);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			printk(KERN_WARNING "ice1712: cannot initialize pro ac97, skipped\n");</div><div class='add'>+			dev_warn(ice-&gt;card-&gt;dev,</div><div class='add'>+				 "cannot initialize pro ac97, skipped\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1611,12 +1533,9 @@ static void snd_ice1712_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, "  GPIO_DIRECTION   : 0x%02x\n", (unsigned)snd_ice1712_read(ice, ICE1712_IREG_GPIO_DIRECTION));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_ice1712_proc_init(struct snd_ice1712 *ice)</div><div class='add'>+static void snd_ice1712_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(ice-&gt;card, "ice1712", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ice, snd_ice1712_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(ice-&gt;card, "ice1712", ice, snd_ice1712_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1640,7 +1559,7 @@ static int snd_ice1712_eeprom_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_eeprom = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.name = "ICE1712 EEPROM",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='hunk'>@@ -1676,7 +1595,7 @@ static int snd_ice1712_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_spdif_default =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),</div><div class='hunk'>@@ -1727,7 +1646,7 @@ static int snd_ice1712_spdif_maskp_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_spdif_maskc =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1736,7 +1655,7 @@ static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =</div><div class='ctx'> 	.get =		snd_ice1712_spdif_maskc_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_spdif_maskp =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1763,7 +1682,7 @@ static int snd_ice1712_spdif_stream_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_spdif_stream =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	(SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='ctx'> 			 SNDRV_CTL_ELEM_ACCESS_INACTIVE),</div><div class='hunk'>@@ -1830,13 +1749,7 @@ static int snd_ice1712_pro_internal_clock_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		"96000",	/* 12: 7 */</div><div class='ctx'> 		"IEC958 Input",	/* 13: -- */</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 14;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 14, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_pro_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1848,7 +1761,7 @@ static int snd_ice1712_pro_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	if (is_spdif_master(ice)) {</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = 13;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1859,7 +1772,6 @@ static int snd_ice1712_pro_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		}</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = val;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1894,7 +1806,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Internal Clock",</div><div class='ctx'> 	.info = snd_ice1712_pro_internal_clock_info,</div><div class='hunk'>@@ -1921,13 +1833,7 @@ static int snd_ice1712_pro_internal_clock_default_info(struct snd_kcontrol *kcon</div><div class='ctx'> 		"96000",	/* 12: 7 */</div><div class='ctx'> 		/* "IEC958 Input",	13: -- */</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 13;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 13, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_pro_internal_clock_default_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1965,7 +1871,7 @@ static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcont</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Internal Clock Default",</div><div class='ctx'> 	.info = snd_ice1712_pro_internal_clock_default_info,</div><div class='hunk'>@@ -1989,14 +1895,13 @@ static int snd_ice1712_pro_rate_locking_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change = 0, nval;</div><div class='ctx'> </div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	change = PRO_RATE_LOCKED != nval;</div><div class='ctx'> 	PRO_RATE_LOCKED = nval;</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_pro_rate_locking = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Rate Locking",</div><div class='ctx'> 	.info = snd_ice1712_pro_rate_locking_info,</div><div class='hunk'>@@ -2020,14 +1925,13 @@ static int snd_ice1712_pro_rate_reset_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change = 0, nval;</div><div class='ctx'> </div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	change = PRO_RATE_RESET != nval;</div><div class='ctx'> 	PRO_RATE_RESET = nval;</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_pro_rate_reset = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Rate Reset",</div><div class='ctx'> 	.info = snd_ice1712_pro_rate_reset_info,</div><div class='hunk'>@@ -2048,15 +1952,8 @@ static int snd_ice1712_pro_route_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		"IEC958 In L", "IEC958 In R", /* 9-10 */</div><div class='ctx'> 		"Digital Mixer", /* 11 - optional */</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items =</div><div class='del'>-		snd_ctl_get_ioffidx(kcontrol, &amp;uinfo-&gt;id) &lt; 2 ? 12 : 11;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	int num_items = snd_ctl_get_ioffidx(kcontrol, &amp;uinfo-&gt;id) &lt; 2 ? 12 : 11;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, num_items, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_ice1712_pro_route_analog_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -2066,10 +1963,10 @@ static int snd_ice1712_pro_route_analog_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int idx = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id);</div><div class='ctx'> 	unsigned int val, cval;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	val = inw(ICEMT(ice, ROUTE_PSDOUT03));</div><div class='del'>-	cval = inl(ICEMT(ice, ROUTE_CAPTURE));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		val = inw(ICEMT(ice, ROUTE_PSDOUT03));</div><div class='add'>+		cval = inl(ICEMT(ice, ROUTE_CAPTURE));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	val &gt;&gt;= ((idx % 2) * 8) + ((idx / 2) * 2);</div><div class='ctx'> 	val &amp;= 3;</div><div class='hunk'>@@ -2103,35 +2000,35 @@ static int snd_ice1712_pro_route_analog_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	else</div><div class='ctx'> 		nval = 0; /* pcm */</div><div class='ctx'> 	shift = ((idx % 2) * 8) + ((idx / 2) * 2);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	val = old_val = inw(ICEMT(ice, ROUTE_PSDOUT03));</div><div class='del'>-	val &amp;= ~(0x03 &lt;&lt; shift);</div><div class='del'>-	val |= nval &lt;&lt; shift;</div><div class='del'>-	change = val != old_val;</div><div class='del'>-	if (change)</div><div class='del'>-		outw(val, ICEMT(ice, ROUTE_PSDOUT03));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		val = old_val = inw(ICEMT(ice, ROUTE_PSDOUT03));</div><div class='add'>+		val &amp;= ~(0x03 &lt;&lt; shift);</div><div class='add'>+		val |= nval &lt;&lt; shift;</div><div class='add'>+		change = val != old_val;</div><div class='add'>+		if (change)</div><div class='add'>+			outw(val, ICEMT(ice, ROUTE_PSDOUT03));</div><div class='add'>+	}</div><div class='ctx'> 	if (nval &lt; 2) /* dig mixer of pcm */</div><div class='ctx'> 		return change;</div><div class='ctx'> </div><div class='ctx'> 	/* update CAPTURE */</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	val = old_val = inl(ICEMT(ice, ROUTE_CAPTURE));</div><div class='del'>-	shift = ((idx / 2) * 8) + ((idx % 2) * 4);</div><div class='del'>-	if (nval == 2) { /* analog in */</div><div class='del'>-		nval = ucontrol-&gt;value.enumerated.item[0] - 1;</div><div class='del'>-		val &amp;= ~(0x07 &lt;&lt; shift);</div><div class='del'>-		val |= nval &lt;&lt; shift;</div><div class='del'>-	} else { /* spdif in */</div><div class='del'>-		nval = (ucontrol-&gt;value.enumerated.item[0] - 9) &lt;&lt; 3;</div><div class='del'>-		val &amp;= ~(0x08 &lt;&lt; shift);</div><div class='del'>-		val |= nval &lt;&lt; shift;</div><div class='del'>-	}</div><div class='del'>-	if (val != old_val) {</div><div class='del'>-		change = 1;</div><div class='del'>-		outl(val, ICEMT(ice, ROUTE_CAPTURE));</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		val = old_val = inl(ICEMT(ice, ROUTE_CAPTURE));</div><div class='add'>+		shift = ((idx / 2) * 8) + ((idx % 2) * 4);</div><div class='add'>+		if (nval == 2) { /* analog in */</div><div class='add'>+			nval = ucontrol-&gt;value.enumerated.item[0] - 1;</div><div class='add'>+			val &amp;= ~(0x07 &lt;&lt; shift);</div><div class='add'>+			val |= nval &lt;&lt; shift;</div><div class='add'>+		} else { /* spdif in */</div><div class='add'>+			nval = (ucontrol-&gt;value.enumerated.item[0] - 9) &lt;&lt; 3;</div><div class='add'>+			val &amp;= ~(0x08 &lt;&lt; shift);</div><div class='add'>+			val |= nval &lt;&lt; shift;</div><div class='add'>+		}</div><div class='add'>+		if (val != old_val) {</div><div class='add'>+			change = 1;</div><div class='add'>+			outl(val, ICEMT(ice, ROUTE_CAPTURE));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2164,7 +2061,7 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val, old_val, nval;</div><div class='ctx'> </div><div class='ctx'> 	/* update SPDOUT */</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	val = old_val = inw(ICEMT(ice, ROUTE_SPDOUT));</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] &gt;= 11)</div><div class='ctx'> 		nval = 1;</div><div class='hunk'>@@ -2190,11 +2087,10 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	change = val != old_val;</div><div class='ctx'> 	if (change)</div><div class='ctx'> 		outw(val, ICEMT(ice, ROUTE_SPDOUT));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "H/W Playback Route",</div><div class='ctx'> 	.info = snd_ice1712_pro_route_info,</div><div class='hunk'>@@ -2202,7 +2098,7 @@ static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata</div><div class='ctx'> 	.put = snd_ice1712_pro_route_analog_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, NONE) "Route",</div><div class='ctx'> 	.info = snd_ice1712_pro_route_info,</div><div class='hunk'>@@ -2237,14 +2133,13 @@ static int snd_ice1712_pro_volume_rate_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	change = inb(ICEMT(ice, MONITOR_RATE)) != ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	outb(ucontrol-&gt;value.integer.value[0], ICEMT(ice, MONITOR_RATE));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Volume Rate",</div><div class='ctx'> 	.info = snd_ice1712_pro_volume_rate_info,</div><div class='hunk'>@@ -2268,16 +2163,15 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; 22; idx++) {</div><div class='ctx'> 		outb(idx, ICEMT(ice, MONITOR_PEAKINDEX));</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] = inb(ICEMT(ice, MONITOR_PEAKDATA));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name = "Multi Track Peak",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='hunk'>@@ -2292,16 +2186,16 @@ static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {</div><div class='ctx'> /*</div><div class='ctx'>  * list of available boards</div><div class='ctx'>  */</div><div class='del'>-static struct snd_ice1712_card_info *card_tables[] __devinitdata = {</div><div class='add'>+static const struct snd_ice1712_card_info *card_tables[] = {</div><div class='ctx'> 	snd_ice1712_hoontech_cards,</div><div class='ctx'> 	snd_ice1712_delta_cards,</div><div class='ctx'> 	snd_ice1712_ews_cards,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char __devinit snd_ice1712_read_i2c(struct snd_ice1712 *ice,</div><div class='del'>-						 unsigned char dev,</div><div class='del'>-						 unsigned char addr)</div><div class='add'>+static unsigned char snd_ice1712_read_i2c(struct snd_ice1712 *ice,</div><div class='add'>+					  unsigned char dev,</div><div class='add'>+					  unsigned char addr)</div><div class='ctx'> {</div><div class='ctx'> 	long t = 0x10000;</div><div class='ctx'> </div><div class='hunk'>@@ -2311,12 +2205,12 @@ static unsigned char __devinit snd_ice1712_read_i2c(struct snd_ice1712 *ice,</div><div class='ctx'> 	return inb(ICEREG(ice, I2C_DATA));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='del'>-					     const char *modelname)</div><div class='add'>+static int snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='add'>+				   const char *modelname)</div><div class='ctx'> {</div><div class='del'>-	int dev = 0xa0;		/* EEPROM device address */</div><div class='add'>+	int dev = ICE_I2C_EEPROM_ADDR;	/* I2C EEPROM device address */</div><div class='ctx'> 	unsigned int i, size;</div><div class='del'>-	struct snd_ice1712_card_info * const *tbl, *c;</div><div class='add'>+	const struct snd_ice1712_card_info * const *tbl, *c;</div><div class='ctx'> </div><div class='ctx'> 	if (!modelname || !*modelname) {</div><div class='ctx'> 		ice-&gt;eeprom.subvendor = 0;</div><div class='hunk'>@@ -2333,7 +2227,8 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='ctx'> 			pci_read_config_word(ice-&gt;pci, PCI_SUBSYSTEM_ID, &amp;device);</div><div class='ctx'> 			ice-&gt;eeprom.subvendor = ((unsigned int)swab16(vendor) &lt;&lt; 16) | swab16(device);</div><div class='ctx'> 			if (ice-&gt;eeprom.subvendor == 0 || ice-&gt;eeprom.subvendor == (unsigned int)-1) {</div><div class='del'>-				printk(KERN_ERR "ice1712: No valid ID is found\n");</div><div class='add'>+				dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+					"No valid ID is found\n");</div><div class='ctx'> 				return -ENXIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2341,21 +2236,22 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='ctx'> 	for (tbl = card_tables; *tbl; tbl++) {</div><div class='ctx'> 		for (c = *tbl; c-&gt;subvendor; c++) {</div><div class='ctx'> 			if (modelname &amp;&amp; c-&gt;model &amp;&amp; !strcmp(modelname, c-&gt;model)) {</div><div class='del'>-				printk(KERN_INFO "ice1712: Using board model %s\n", c-&gt;name);</div><div class='add'>+				dev_info(ice-&gt;card-&gt;dev,</div><div class='add'>+					 "Using board model %s\n", c-&gt;name);</div><div class='ctx'> 				ice-&gt;eeprom.subvendor = c-&gt;subvendor;</div><div class='ctx'> 			} else if (c-&gt;subvendor != ice-&gt;eeprom.subvendor)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			if (!c-&gt;eeprom_size || !c-&gt;eeprom_data)</div><div class='ctx'> 				goto found;</div><div class='ctx'> 			/* if the EEPROM is given by the driver, use it */</div><div class='del'>-			snd_printdd("using the defined eeprom..\n");</div><div class='add'>+			dev_dbg(ice-&gt;card-&gt;dev, "using the defined eeprom..\n");</div><div class='ctx'> 			ice-&gt;eeprom.version = 1;</div><div class='ctx'> 			ice-&gt;eeprom.size = c-&gt;eeprom_size + 6;</div><div class='ctx'> 			memcpy(ice-&gt;eeprom.data, c-&gt;eeprom_data, c-&gt;eeprom_size);</div><div class='ctx'> 			goto read_skipped;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_WARNING "ice1712: No matching model found for ID 0x%x\n",</div><div class='add'>+	dev_warn(ice-&gt;card-&gt;dev, "No matching model found for ID 0x%x\n",</div><div class='ctx'> 	       ice-&gt;eeprom.subvendor);</div><div class='ctx'> </div><div class='ctx'>  found:</div><div class='hunk'>@@ -2363,12 +2259,13 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='ctx'> 	if (ice-&gt;eeprom.size &lt; 6)</div><div class='ctx'> 		ice-&gt;eeprom.size = 32; /* FIXME: any cards without the correct size? */</div><div class='ctx'> 	else if (ice-&gt;eeprom.size &gt; 32) {</div><div class='del'>-		snd_printk(KERN_ERR "invalid EEPROM (size = %i)\n", ice-&gt;eeprom.size);</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+			"invalid EEPROM (size = %i)\n", ice-&gt;eeprom.size);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	ice-&gt;eeprom.version = snd_ice1712_read_i2c(ice, dev, 0x05);</div><div class='ctx'> 	if (ice-&gt;eeprom.version != 1) {</div><div class='del'>-		snd_printk(KERN_ERR "invalid EEPROM version %i\n",</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "invalid EEPROM version %i\n",</div><div class='ctx'> 			   ice-&gt;eeprom.version);</div><div class='ctx'> 		/* return -EIO; */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2386,7 +2283,7 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_chip_init(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_chip_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	outb(ICE1712_RESET | ICE1712_NATIVE, ICEREG(ice, CONTROL));</div><div class='ctx'> 	udelay(200);</div><div class='hunk'>@@ -2403,7 +2300,8 @@ static int __devinit snd_ice1712_chip_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	pci_write_config_byte(ice-&gt;pci, 0x61, ice-&gt;eeprom.data[ICE_EEP1_ACLINK]);</div><div class='ctx'> 	pci_write_config_byte(ice-&gt;pci, 0x62, ice-&gt;eeprom.data[ICE_EEP1_I2SID]);</div><div class='ctx'> 	pci_write_config_byte(ice-&gt;pci, 0x63, ice-&gt;eeprom.data[ICE_EEP1_SPDIF]);</div><div class='del'>-	if (ice-&gt;eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24) {</div><div class='add'>+	if (ice-&gt;eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24 &amp;&amp;</div><div class='add'>+	    ice-&gt;eeprom.subvendor != ICE1712_SUBDEVICE_STAUDIO_ADCIII) {</div><div class='ctx'> 		ice-&gt;gpio.write_mask = ice-&gt;eeprom.gpiomask;</div><div class='ctx'> 		ice-&gt;gpio.direction = ice-&gt;eeprom.gpiodir;</div><div class='ctx'> 		snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,</div><div class='hunk'>@@ -2429,39 +2327,50 @@ static int __devinit snd_ice1712_chip_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		snd_ice1712_write(ice, ICE1712_IREG_CONSUMER_POWERDOWN, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_ice1712_set_pro_rate(ice, 48000, 1);</div><div class='add'>+	/* unmask used interrupts */</div><div class='add'>+	outb(((ice-&gt;eeprom.data[ICE_EEP1_CODEC] &amp; ICE1712_CFG_2xMPU401) == 0 ?</div><div class='add'>+	      ICE1712_IRQ_MPU2 : 0) |</div><div class='add'>+	     ((ice-&gt;eeprom.data[ICE_EEP1_CODEC] &amp; ICE1712_CFG_NO_CON_AC97) ?</div><div class='add'>+	      ICE1712_IRQ_PBKDS | ICE1712_IRQ_CONCAP | ICE1712_IRQ_CONPBK : 0),</div><div class='add'>+	     ICEREG(ice, IRQMASK));</div><div class='add'>+	outb(0x00, ICEMT(ice, IRQ));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int __devinit snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice)</div><div class='add'>+int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(!ice-&gt;pcm_pro))</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_default, ice));</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_default, ice);</div><div class='add'>+	kctl-&gt;id.device = ice-&gt;pcm_pro-&gt;device;</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_maskc, ice);</div><div class='ctx'> 	kctl-&gt;id.device = ice-&gt;pcm_pro-&gt;device;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_maskc, ice));</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_maskp, ice);</div><div class='ctx'> 	kctl-&gt;id.device = ice-&gt;pcm_pro-&gt;device;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_maskp, ice));</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_stream, ice);</div><div class='ctx'> 	kctl-&gt;id.device = ice-&gt;pcm_pro-&gt;device;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_ice1712_spdif_stream, ice));</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	kctl-&gt;id.device = ice-&gt;pcm_pro-&gt;device;</div><div class='ctx'> 	ice-&gt;spdif.stream_ctl = kctl;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_build_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_ice1712_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2497,73 +2406,45 @@ static int __devinit snd_ice1712_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	err = snd_ctl_add(ice-&gt;card, snd_ctl_new1(&amp;snd_ice1712_mixer_pro_volume_rate, ice));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, snd_ctl_new1(&amp;snd_ice1712_mixer_pro_peak, ice));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_add(ice-&gt;card,</div><div class='add'>+			   snd_ctl_new1(&amp;snd_ice1712_mixer_pro_peak, ice));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ice1712_free(struct snd_ice1712 *ice)</div><div class='add'>+static void snd_ice1712_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (!ice-&gt;port)</div><div class='del'>-		goto __hw_end;</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (ice-&gt;card_info &amp;&amp; ice-&gt;card_info-&gt;chip_exit)</div><div class='add'>+		ice-&gt;card_info-&gt;chip_exit(ice);</div><div class='add'>+</div><div class='ctx'> 	/* mask all interrupts */</div><div class='del'>-	outb(0xc0, ICEMT(ice, IRQ));</div><div class='add'>+	outb(ICE1712_MULTI_CAPTURE | ICE1712_MULTI_PLAYBACK, ICEMT(ice, IRQ));</div><div class='ctx'> 	outb(0xff, ICEREG(ice, IRQMASK));</div><div class='del'>-	/* --- */</div><div class='del'>-__hw_end:</div><div class='del'>-	if (ice-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(ice-&gt;irq, ice);</div><div class='ctx'> </div><div class='del'>-	if (ice-&gt;port)</div><div class='del'>-		pci_release_regions(ice-&gt;pci);</div><div class='ctx'> 	snd_ice1712_akm4xxx_free(ice);</div><div class='del'>-	pci_disable_device(ice-&gt;pci);</div><div class='del'>-	kfree(ice-&gt;spec);</div><div class='del'>-	kfree(ice);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_ice1712_dev_free(struct snd_device *device)</div><div class='add'>+static int snd_ice1712_create(struct snd_card *card,</div><div class='add'>+			      struct pci_dev *pci,</div><div class='add'>+			      const char *modelname,</div><div class='add'>+			      int omni,</div><div class='add'>+			      int cs8427_timeout,</div><div class='add'>+			      int dxr_enable)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ice1712 *ice = device-&gt;device_data;</div><div class='del'>-	return snd_ice1712_free(ice);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit snd_ice1712_create(struct snd_card *card,</div><div class='del'>-					struct pci_dev *pci,</div><div class='del'>-					const char *modelname,</div><div class='del'>-					int omni,</div><div class='del'>-					int cs8427_timeout,</div><div class='del'>-					int dxr_enable,</div><div class='del'>-					struct snd_ice1712 **r_ice1712)</div><div class='del'>-{</div><div class='del'>-	struct snd_ice1712 *ice;</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_ice1712_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*r_ice1712 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	/* check, if we can restrict PCI DMA transfers to 28 bits */</div><div class='del'>-	if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0 ||</div><div class='del'>-	    pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	if (dma_set_mask_and_coherent(&amp;pci-&gt;dev, DMA_BIT_MASK(28))) {</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 28bit PCI busmaster DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ice = kzalloc(sizeof(*ice), GFP_KERNEL);</div><div class='del'>-	if (ice == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	ice-&gt;omni = omni ? 1 : 0;</div><div class='ctx'> 	if (cs8427_timeout &lt; 1)</div><div class='ctx'> 		cs8427_timeout = 1;</div><div class='hunk'>@@ -2590,57 +2471,34 @@ static int __devinit snd_ice1712_create(struct snd_card *card,</div><div class='ctx'> 	ice-&gt;pci = pci;</div><div class='ctx'> 	ice-&gt;irq = -1;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='add'>+	/* disable legacy emulation */</div><div class='ctx'> 	pci_write_config_word(ice-&gt;pci, 0x40, 0x807f);</div><div class='ctx'> 	pci_write_config_word(ice-&gt;pci, 0x42, 0x0006);</div><div class='ctx'> 	snd_ice1712_proc_init(ice);</div><div class='del'>-	synchronize_irq(pci-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pci, "ICE1712");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(ice);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ICE1712");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	ice-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'> 	ice-&gt;ddma_port = pci_resource_start(pci, 1);</div><div class='ctx'> 	ice-&gt;dmapath_port = pci_resource_start(pci, 2);</div><div class='ctx'> 	ice-&gt;profi_port = pci_resource_start(pci, 3);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_ice1712_interrupt, IRQF_SHARED,</div><div class='del'>-			"ICE1712", ice)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_ice1712_free(ice);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_ice1712_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, ice)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = ice-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_ice1712_free;</div><div class='ctx'> </div><div class='del'>-	if (snd_ice1712_read_eeprom(ice, modelname) &lt; 0) {</div><div class='del'>-		snd_ice1712_free(ice);</div><div class='add'>+	if (snd_ice1712_read_eeprom(ice, modelname) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (snd_ice1712_chip_init(ice) &lt; 0) {</div><div class='del'>-		snd_ice1712_free(ice);</div><div class='add'>+	if (snd_ice1712_chip_init(ice) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/* unmask used interrupts */</div><div class='del'>-	outb(((ice-&gt;eeprom.data[ICE_EEP1_CODEC] &amp; ICE1712_CFG_2xMPU401) == 0 ?</div><div class='del'>-	      ICE1712_IRQ_MPU2 : 0) |</div><div class='del'>-	     ((ice-&gt;eeprom.data[ICE_EEP1_CODEC] &amp; ICE1712_CFG_NO_CON_AC97) ?</div><div class='del'>-	      ICE1712_IRQ_PBKDS | ICE1712_IRQ_CONCAP | ICE1712_IRQ_CONPBK : 0),</div><div class='del'>-	     ICEREG(ice, IRQMASK));</div><div class='del'>-	outb(0x00, ICEMT(ice, IRQ));</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_ice1712_free(ice);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*r_ice1712 = ice;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2651,16 +2509,16 @@ static int __devinit snd_ice1712_create(struct snd_card *card,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_ice1712_card_info no_matched __devinitdata;</div><div class='add'>+static struct snd_ice1712_card_info no_matched;</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_ice1712_probe(struct pci_dev *pci,</div><div class='del'>-				       const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_ice1712_probe(struct pci_dev *pci,</div><div class='add'>+			     const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ice1712 *ice;</div><div class='ctx'> 	int pcm_dev = 0, err;</div><div class='del'>-	struct snd_ice1712_card_info * const *tbl, *c;</div><div class='add'>+	const struct snd_ice1712_card_info * const *tbl, *c;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -2669,33 +2527,32 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+			   sizeof(*ice), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	ice = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ICE1712");</div><div class='del'>-	strcpy(card-&gt;shortname, "ICEnsemble ICE1712");</div><div class='add'>+	strscpy(card-&gt;driver, "ICE1712");</div><div class='add'>+	strscpy(card-&gt;shortname, "ICEnsemble ICE1712");</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ice1712_create(card, pci, model[dev], omni[dev],</div><div class='del'>-		cs8427_timeout[dev], dxr_enable[dev], &amp;ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+				 cs8427_timeout[dev], dxr_enable[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for (tbl = card_tables; *tbl; tbl++) {</div><div class='ctx'> 		for (c = *tbl; c-&gt;subvendor; c++) {</div><div class='ctx'> 			if (c-&gt;subvendor == ice-&gt;eeprom.subvendor) {</div><div class='del'>-				strcpy(card-&gt;shortname, c-&gt;name);</div><div class='add'>+				strscpy(card-&gt;shortname, c-&gt;name);</div><div class='ctx'> 				if (c-&gt;driver) /* specific driver? */</div><div class='del'>-					strcpy(card-&gt;driver, c-&gt;driver);</div><div class='add'>+					strscpy(card-&gt;driver, c-&gt;driver);</div><div class='ctx'> 				if (c-&gt;chip_init) {</div><div class='ctx'> 					err = c-&gt;chip_init(ice);</div><div class='del'>-					if (err &lt; 0) {</div><div class='del'>-						snd_card_free(card);</div><div class='add'>+					if (err &lt; 0)</div><div class='ctx'> 						return err;</div><div class='del'>-					}</div><div class='ctx'> 				}</div><div class='add'>+				ice-&gt;card_info = c;</div><div class='ctx'> 				goto __found;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2703,59 +2560,46 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,</div><div class='ctx'> 	c = &amp;no_matched;</div><div class='ctx'>  __found:</div><div class='ctx'> </div><div class='del'>-	err = snd_ice1712_pcm_profi(ice, pcm_dev++, NULL);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_ice1712_pcm_profi(ice, pcm_dev++);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice_has_con_ac97(ice)) {</div><div class='del'>-		err = snd_ice1712_pcm(ice, pcm_dev++, NULL);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		err = snd_ice1712_pcm(ice, pcm_dev++);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ice1712_ac97_mixer(ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_ice1712_build_controls(ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;build_controls) {</div><div class='ctx'> 		err = c-&gt;build_controls(ice);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice_has_con_ac97(ice)) {</div><div class='del'>-		err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		err = snd_ice1712_pcm_ds(ice, pcm_dev++);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!c-&gt;no_mpu401) {</div><div class='ctx'> 		err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,</div><div class='ctx'> 			ICEREG(ice, MPU1_CTRL),</div><div class='del'>-			(c-&gt;mpu401_1_info_flags | MPU401_INFO_INTEGRATED),</div><div class='del'>-			ice-&gt;irq, 0, &amp;ice-&gt;rmidi[0]);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+			c-&gt;mpu401_1_info_flags |</div><div class='add'>+			MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,</div><div class='add'>+			-1, &amp;ice-&gt;rmidi[0]);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 		if (c-&gt;mpu401_1_name)</div><div class='del'>-			/*  Prefered name available in card_info */</div><div class='add'>+			/*  Preferred name available in card_info */</div><div class='ctx'> 			snprintf(ice-&gt;rmidi[0]-&gt;name,</div><div class='ctx'> 				 sizeof(ice-&gt;rmidi[0]-&gt;name),</div><div class='ctx'> 				 "%s %d", c-&gt;mpu401_1_name, card-&gt;number);</div><div class='hunk'>@@ -2764,15 +2608,14 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,</div><div class='ctx'> 			/*  2nd port used  */</div><div class='ctx'> 			err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712,</div><div class='ctx'> 				ICEREG(ice, MPU2_CTRL),</div><div class='del'>-				(c-&gt;mpu401_2_info_flags | MPU401_INFO_INTEGRATED),</div><div class='del'>-				ice-&gt;irq, 0, &amp;ice-&gt;rmidi[1]);</div><div class='add'>+				c-&gt;mpu401_2_info_flags |</div><div class='add'>+				MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,</div><div class='add'>+				-1, &amp;ice-&gt;rmidi[1]);</div><div class='ctx'> </div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-			}</div><div class='ctx'> 			if (c-&gt;mpu401_2_name)</div><div class='del'>-				/*  Prefered name available in card_info */</div><div class='add'>+				/*  Preferred name available in card_info */</div><div class='ctx'> 				snprintf(ice-&gt;rmidi[1]-&gt;name,</div><div class='ctx'> 					 sizeof(ice-&gt;rmidi[1]-&gt;name),</div><div class='ctx'> 					 "%s %d", c-&gt;mpu401_2_name,</div><div class='hunk'>@@ -2786,37 +2629,96 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,</div><div class='ctx'> 		card-&gt;shortname, ice-&gt;port, ice-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_ice1712_remove(struct pci_dev *pci)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int snd_ice1712_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='del'>-}</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ICE1712",</div><div class='del'>-	.id_table = snd_ice1712_ids,</div><div class='del'>-	.probe = snd_ice1712_probe,</div><div class='del'>-	.remove = __devexit_p(snd_ice1712_remove),</div><div class='del'>-};</div><div class='add'>+	if (!ice-&gt;pm_suspend_enabled)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_ice1712_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='add'>+</div><div class='add'>+	snd_ac97_suspend(ice-&gt;ac97);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		ice-&gt;pm_saved_is_spdif_master = is_spdif_master(ice);</div><div class='add'>+		ice-&gt;pm_saved_spdif_ctrl = inw(ICEMT(ice, ROUTE_SPDOUT));</div><div class='add'>+		ice-&gt;pm_saved_route = inw(ICEMT(ice, ROUTE_PSDOUT03));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ice-&gt;pm_suspend)</div><div class='add'>+		ice-&gt;pm_suspend(ice);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __exit alsa_card_ice1712_exit(void)</div><div class='add'>+static int snd_ice1712_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='add'>+	int rate;</div><div class='add'>+</div><div class='add'>+	if (!ice-&gt;pm_suspend_enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ice-&gt;cur_rate)</div><div class='add'>+		rate = ice-&gt;cur_rate;</div><div class='add'>+	else</div><div class='add'>+		rate = PRO_RATE_DEFAULT;</div><div class='add'>+</div><div class='add'>+	if (snd_ice1712_chip_init(ice) &lt; 0) {</div><div class='add'>+		snd_card_disconnect(card);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ice-&gt;cur_rate = rate;</div><div class='add'>+</div><div class='add'>+	if (ice-&gt;pm_resume)</div><div class='add'>+		ice-&gt;pm_resume(ice);</div><div class='add'>+</div><div class='add'>+	if (ice-&gt;pm_saved_is_spdif_master) {</div><div class='add'>+		/* switching to external clock via SPDIF */</div><div class='add'>+		scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+			outb(inb(ICEMT(ice, RATE)) | ICE1712_SPDIF_MASTER,</div><div class='add'>+			     ICEMT(ice, RATE));</div><div class='add'>+		}</div><div class='add'>+		snd_ice1712_set_input_clock_source(ice, 1);</div><div class='add'>+	} else {</div><div class='add'>+		/* internal on-card clock */</div><div class='add'>+		snd_ice1712_set_pro_rate(ice, rate, 1);</div><div class='add'>+		snd_ice1712_set_input_clock_source(ice, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	outw(ice-&gt;pm_saved_spdif_ctrl, ICEMT(ice, ROUTE_SPDOUT));</div><div class='add'>+	outw(ice-&gt;pm_saved_route, ICEMT(ice, ROUTE_PSDOUT03));</div><div class='add'>+</div><div class='add'>+	snd_ac97_resume(ice-&gt;ac97);</div><div class='add'>+</div><div class='add'>+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_init(alsa_card_ice1712_init)</div><div class='del'>-module_exit(alsa_card_ice1712_exit)</div><div class='add'>+static SIMPLE_DEV_PM_OPS(snd_ice1712_pm, snd_ice1712_suspend, snd_ice1712_resume);</div><div class='add'>+#define SND_VT1712_PM_OPS	&amp;snd_ice1712_pm</div><div class='add'>+#else</div><div class='add'>+#define SND_VT1712_PM_OPS	NULL</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static struct pci_driver ice1712_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.id_table = snd_ice1712_ids,</div><div class='add'>+	.probe = snd_ice1712_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = SND_VT1712_PM_OPS,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(ice1712_driver);</div><div class='head'>diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h<br/>index 0da778a69ef8..cd02710d8271 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1712.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1712.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1712.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ice1712.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_ICE1712_H</div><div class='ctx'> #define __SOUND_ICE1712_H</div><div class='ctx'> </div><div class='hunk'>@@ -5,23 +6,9 @@</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/rawmidi.h&gt;</div><div class='hunk'>@@ -40,14 +27,17 @@</div><div class='ctx'> #define ICEREG(ice, x) ((ice)-&gt;port + ICE1712_REG_##x)</div><div class='ctx'> </div><div class='ctx'> #define ICE1712_REG_CONTROL		0x00	/* byte */</div><div class='del'>-#define   ICE1712_RESET			0x80	/* reset whole chip */</div><div class='del'>-#define   ICE1712_SERR_LEVEL		0x04	/* SERR# level otherwise edge */</div><div class='add'>+#define   ICE1712_RESET			0x80	/* soft reset whole chip */</div><div class='add'>+#define   ICE1712_SERR_ASSERT_DS_DMA	0x40    /* disabled SERR# assertion for the DS DMA Ch-C irq otherwise enabled */</div><div class='add'>+#define   ICE1712_DOS_VOL		0x10    /* DOS WT/FM volume control */</div><div class='add'>+#define   ICE1712_SERR_LEVEL		0x08	/* SERR# level otherwise edge */</div><div class='add'>+#define   ICE1712_SERR_ASSERT_SB	0x02	/* disabled SERR# assertion for SB irq otherwise enabled */</div><div class='ctx'> #define   ICE1712_NATIVE		0x01	/* native mode otherwise SB */</div><div class='ctx'> #define ICE1712_REG_IRQMASK		0x01	/* byte */</div><div class='del'>-#define   ICE1712_IRQ_MPU1		0x80</div><div class='del'>-#define   ICE1712_IRQ_TIMER		0x40</div><div class='del'>-#define   ICE1712_IRQ_MPU2		0x20</div><div class='del'>-#define   ICE1712_IRQ_PROPCM		0x10</div><div class='add'>+#define   ICE1712_IRQ_MPU1		0x80	/* MIDI irq mask */</div><div class='add'>+#define   ICE1712_IRQ_TIMER		0x40	/* Timer mask */</div><div class='add'>+#define   ICE1712_IRQ_MPU2		0x20	/* Secondary MIDI irq mask */</div><div class='add'>+#define   ICE1712_IRQ_PROPCM		0x10	/* professional multi-track */</div><div class='ctx'> #define   ICE1712_IRQ_FM		0x08	/* FM/MIDI - legacy */</div><div class='ctx'> #define   ICE1712_IRQ_PBKDS		0x04	/* playback DS channels */</div><div class='ctx'> #define   ICE1712_IRQ_CONCAP		0x02	/* consumer capture */</div><div class='hunk'>@@ -214,8 +204,9 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *</div><div class='add'>+ * I2C EEPROM Address</div><div class='ctx'>  */</div><div class='add'>+#define ICE_I2C_EEPROM_ADDR		0xA0</div><div class='ctx'> </div><div class='ctx'> struct snd_ice1712;</div><div class='ctx'> </div><div class='hunk'>@@ -288,6 +279,7 @@ struct snd_ice1712_spdif {</div><div class='ctx'> 	} ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct snd_ice1712_card_info;</div><div class='ctx'> </div><div class='ctx'> struct snd_ice1712 {</div><div class='ctx'> 	unsigned long conp_dma_size;</div><div class='hunk'>@@ -324,6 +316,7 @@ struct snd_ice1712 {</div><div class='ctx'> 	struct snd_info_entry *proc_entry;</div><div class='ctx'> </div><div class='ctx'> 	struct snd_ice1712_eeprom eeprom;</div><div class='add'>+	const struct snd_ice1712_card_info *card_info;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int pro_volumes[20];</div><div class='ctx'> 	unsigned int omni:1;		/* Delta Omni I/O */</div><div class='hunk'>@@ -342,7 +335,7 @@ struct snd_ice1712 {</div><div class='ctx'> </div><div class='ctx'> 	struct mutex open_mutex;</div><div class='ctx'> 	struct snd_pcm_substream *pcm_reserved[4];</div><div class='del'>-	struct snd_pcm_hw_constraint_list *hw_rates; /* card-specific rate constraints */</div><div class='add'>+	const struct snd_pcm_hw_constraint_list *hw_rates; /* card-specific rate constraints */</div><div class='ctx'> </div><div class='ctx'> 	unsigned int akm_codecs;</div><div class='ctx'> 	struct snd_akm4xxx *akm;</div><div class='hunk'>@@ -381,10 +374,10 @@ struct snd_ice1712 {</div><div class='ctx'> 	unsigned char (*set_mclk)(struct snd_ice1712 *ice, unsigned int rate);</div><div class='ctx'> 	int (*set_spdif_clock)(struct snd_ice1712 *ice, int type);</div><div class='ctx'> 	int (*get_spdif_master_type)(struct snd_ice1712 *ice);</div><div class='del'>-	char **ext_clock_names;</div><div class='add'>+	const char * const *ext_clock_names;</div><div class='ctx'> 	int ext_clock_count;</div><div class='ctx'> 	void (*pro_open)(struct snd_ice1712 *, struct snd_pcm_substream *);</div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	int (*pm_suspend)(struct snd_ice1712 *);</div><div class='ctx'> 	int (*pm_resume)(struct snd_ice1712 *);</div><div class='ctx'> 	unsigned int pm_suspend_enabled:1;</div><div class='hunk'>@@ -513,10 +506,11 @@ static inline u8 snd_ice1712_read(struct snd_ice1712 *ice, u8 addr)</div><div class='ctx'> </div><div class='ctx'> struct snd_ice1712_card_info {</div><div class='ctx'> 	unsigned int subvendor;</div><div class='del'>-	char *name;</div><div class='del'>-	char *model;</div><div class='del'>-	char *driver;</div><div class='add'>+	const char *name;</div><div class='add'>+	const char *model;</div><div class='add'>+	const char *driver;</div><div class='ctx'> 	int (*chip_init)(struct snd_ice1712 *);</div><div class='add'>+	void (*chip_exit)(struct snd_ice1712 *);</div><div class='ctx'> 	int (*build_controls)(struct snd_ice1712 *);</div><div class='ctx'> 	unsigned int no_mpu401:1;</div><div class='ctx'> 	unsigned int mpu401_1_info_flags;</div><div class='head'>diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c<br/>index c1498fa5545f..e2dbbbfbca9f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1724.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/ice1724.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/ice1724.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/ice1724.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for VT1724 ICEnsemble ICE1724 / VIA VT1724 (Envy24HT)</div><div class='ctx'>  *                   VIA VT1720 (Envy24PT)</div><div class='hunk'>@@ -5,30 +6,14 @@</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *                    2002 James Stafford &lt;jstafford@ampltd.com&gt;</div><div class='ctx'>  *                    2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -54,33 +39,15 @@</div><div class='ctx'> #include "wtm.h"</div><div class='ctx'> #include "se.h"</div><div class='ctx'> #include "quartet.h"</div><div class='add'>+#include "psc724.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{"</div><div class='del'>-	       REVO_DEVICE_DESC</div><div class='del'>-	       AMP_AUDIO2000_DEVICE_DESC</div><div class='del'>-	       AUREON_DEVICE_DESC</div><div class='del'>-	       VT1720_MOBO_DEVICE_DESC</div><div class='del'>-	       PONTIS_DEVICE_DESC</div><div class='del'>-	       PRODIGY192_DEVICE_DESC</div><div class='del'>-	       PRODIGY_HIFI_DEVICE_DESC</div><div class='del'>-	       JULI_DEVICE_DESC</div><div class='del'>-	       MAYA44_DEVICE_DESC</div><div class='del'>-	       PHASE_DEVICE_DESC</div><div class='del'>-	       WTM_DEVICE_DESC</div><div class='del'>-	       SE_DEVICE_DESC</div><div class='del'>-	       QTET_DEVICE_DESC</div><div class='del'>-		"{VIA,VT1720},"</div><div class='del'>-		"{VIA,VT1724},"</div><div class='del'>-		"{ICEnsemble,Generic ICE1724},"</div><div class='del'>-		"{ICEnsemble,Generic Envy24HT}"</div><div class='del'>-		"{ICEnsemble,Generic Envy24PT}}");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;		/* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;		/* Enable this card */</div><div class='ctx'> static char *model[SNDRV_CARDS];</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='hunk'>@@ -94,7 +61,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Both VT1720 and VT1724 have the same PCI IDs */</div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_vt1724_ids) = {</div><div class='add'>+static const struct pci_device_id snd_vt1724_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='hunk'>@@ -106,7 +73,7 @@ static int PRO_RATE_LOCKED;</div><div class='ctx'> static int PRO_RATE_RESET = 1;</div><div class='ctx'> static unsigned int PRO_RATE_DEFAULT = 44100;</div><div class='ctx'> </div><div class='del'>-static char *ext_clock_names[1] = { "IEC958 In" };</div><div class='add'>+static const char * const ext_clock_names[1] = { "IEC958 In" };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *  Basic I/O</div><div class='hunk'>@@ -146,7 +113,7 @@ static unsigned char snd_vt1724_ac97_ready(struct snd_ice1712 *ice)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		return old_cmd;</div><div class='ctx'> 	}</div><div class='del'>-	snd_printd(KERN_ERR "snd_vt1724_ac97_ready: timeout\n");</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "snd_vt1724_ac97_ready: timeout\n");</div><div class='ctx'> 	return old_cmd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -156,7 +123,7 @@ static int snd_vt1724_ac97_wait_bit(struct snd_ice1712 *ice, unsigned char bit)</div><div class='ctx'> 	for (tm = 0; tm &lt; 0x10000; tm++)</div><div class='ctx'> 		if ((inb(ICEMT1724(ice, AC97_CMD)) &amp; bit) == 0)</div><div class='ctx'> 			return 0;</div><div class='del'>-	snd_printd(KERN_ERR "snd_vt1724_ac97_wait_bit: timeout\n");</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "snd_vt1724_ac97_wait_bit: timeout\n");</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -321,9 +288,8 @@ static void vt1724_enable_midi_irq(struct snd_rawmidi_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = substream-&gt;rmidi-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	enable_midi_irq(ice, flag, enable);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vt1724_midi_output_open(struct snd_rawmidi_substream *s)</div><div class='hunk'>@@ -339,9 +305,8 @@ static int vt1724_midi_output_close(struct snd_rawmidi_substream *s)</div><div class='ctx'> static void vt1724_midi_output_trigger(struct snd_rawmidi_substream *s, int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = s-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		ice-&gt;midi_output = 1;</div><div class='ctx'> 		vt1724_midi_write(ice);</div><div class='hunk'>@@ -349,7 +314,6 @@ static void vt1724_midi_output_trigger(struct snd_rawmidi_substream *s, int up)</div><div class='ctx'> 		ice-&gt;midi_output = 0;</div><div class='ctx'> 		enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void vt1724_midi_output_drain(struct snd_rawmidi_substream *s)</div><div class='hunk'>@@ -367,7 +331,7 @@ static void vt1724_midi_output_drain(struct snd_rawmidi_substream *s)</div><div class='ctx'> 	} while (time_after(timeout, jiffies));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops vt1724_midi_output_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops vt1724_midi_output_ops = {</div><div class='ctx'> 	.open = vt1724_midi_output_open,</div><div class='ctx'> 	.close = vt1724_midi_output_close,</div><div class='ctx'> 	.trigger = vt1724_midi_output_trigger,</div><div class='hunk'>@@ -390,19 +354,17 @@ static int vt1724_midi_input_close(struct snd_rawmidi_substream *s)</div><div class='ctx'> static void vt1724_midi_input_trigger(struct snd_rawmidi_substream *s, int up)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = s-&gt;rmidi-&gt;private_data;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	if (up) {</div><div class='ctx'> 		ice-&gt;midi_input = 1;</div><div class='ctx'> 		vt1724_midi_read(ice);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ice-&gt;midi_input = 0;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_rawmidi_ops vt1724_midi_input_ops = {</div><div class='add'>+static const struct snd_rawmidi_ops vt1724_midi_input_ops = {</div><div class='ctx'> 	.open = vt1724_midi_input_open,</div><div class='ctx'> 	.close = vt1724_midi_input_close,</div><div class='ctx'> 	.trigger = vt1724_midi_input_trigger,</div><div class='hunk'>@@ -427,40 +389,39 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		status &amp;= status_mask;</div><div class='ctx'> 		if (status == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		spin_lock(&amp;ice-&gt;reg_lock);</div><div class='del'>-		if (++timeout &gt; 10) {</div><div class='del'>-			status = inb(ICEREG1724(ice, IRQSTAT));</div><div class='del'>-			printk(KERN_ERR "ice1724: Too long irq loop, "</div><div class='del'>-			       "status = 0x%x\n", status);</div><div class='add'>+		scoped_guard(spinlock, &amp;ice-&gt;reg_lock) {</div><div class='add'>+			if (++timeout &gt; 10) {</div><div class='add'>+				status = inb(ICEREG1724(ice, IRQSTAT));</div><div class='add'>+				dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+					"Too long irq loop, status = 0x%x\n", status);</div><div class='add'>+				if (status &amp; VT1724_IRQ_MPU_TX) {</div><div class='add'>+					dev_err(ice-&gt;card-&gt;dev, "Disabling MPU_TX\n");</div><div class='add'>+					enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);</div><div class='add'>+				}</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			handled = 1;</div><div class='ctx'> 			if (status &amp; VT1724_IRQ_MPU_TX) {</div><div class='del'>-				printk(KERN_ERR "ice1724: Disabling MPU_TX\n");</div><div class='del'>-				enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);</div><div class='add'>+				if (ice-&gt;midi_output)</div><div class='add'>+					vt1724_midi_write(ice);</div><div class='add'>+				else</div><div class='add'>+					enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);</div><div class='add'>+				/* Due to mysterical reasons, MPU_TX is always</div><div class='add'>+				 * generated (and can't be cleared) when a PCM</div><div class='add'>+				 * playback is going.  So let's ignore at the</div><div class='add'>+				 * next loop.</div><div class='add'>+				 */</div><div class='add'>+				status_mask &amp;= ~VT1724_IRQ_MPU_TX;</div><div class='ctx'> 			}</div><div class='del'>-			spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		handled = 1;</div><div class='del'>-		if (status &amp; VT1724_IRQ_MPU_TX) {</div><div class='del'>-			if (ice-&gt;midi_output)</div><div class='del'>-				vt1724_midi_write(ice);</div><div class='del'>-			else</div><div class='del'>-				enable_midi_irq(ice, VT1724_IRQ_MPU_TX, 0);</div><div class='del'>-			/* Due to mysterical reasons, MPU_TX is always</div><div class='del'>-			 * generated (and can't be cleared) when a PCM</div><div class='del'>-			 * playback is going.  So let's ignore at the</div><div class='del'>-			 * next loop.</div><div class='del'>-			 */</div><div class='del'>-			status_mask &amp;= ~VT1724_IRQ_MPU_TX;</div><div class='del'>-		}</div><div class='del'>-		if (status &amp; VT1724_IRQ_MPU_RX) {</div><div class='del'>-			if (ice-&gt;midi_input)</div><div class='del'>-				vt1724_midi_read(ice);</div><div class='del'>-			else</div><div class='del'>-				vt1724_midi_clear_rx(ice);</div><div class='add'>+			if (status &amp; VT1724_IRQ_MPU_RX) {</div><div class='add'>+				if (ice-&gt;midi_input)</div><div class='add'>+					vt1724_midi_read(ice);</div><div class='add'>+				else</div><div class='add'>+					vt1724_midi_clear_rx(ice);</div><div class='add'>+			}</div><div class='add'>+			/* ack MPU irq */</div><div class='add'>+			outb(status, ICEREG1724(ice, IRQSTAT));</div><div class='ctx'> 		}</div><div class='del'>-		/* ack MPU irq */</div><div class='del'>-		outb(status, ICEREG1724(ice, IRQSTAT));</div><div class='del'>-		spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 		if (status &amp; VT1724_IRQ_MTPCM) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * Multi-track PCM</div><div class='hunk'>@@ -514,6 +475,7 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+ out:</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -521,25 +483,25 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id)</div><div class='ctx'>  *  PCM code - professional part (multitrack)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = {</div><div class='add'>+static const unsigned int rates[] = {</div><div class='ctx'> 	8000, 9600, 11025, 12000, 16000, 22050, 24000,</div><div class='ctx'> 	32000, 44100, 48000, 64000, 88200, 96000,</div><div class='ctx'> 	176400, 192000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates_96 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates_96 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates) - 2, /* up to 96000 */</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates_48 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates_48 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates) - 5, /* up to 48000 */</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_rates_192 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_rates_192 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -572,27 +534,27 @@ static int snd_vt1724_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='del'>-		spin_lock(&amp;ice-&gt;reg_lock);</div><div class='del'>-		old = inb(ICEMT1724(ice, DMA_PAUSE));</div><div class='del'>-		if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH)</div><div class='del'>-			old |= what;</div><div class='del'>-		else</div><div class='del'>-			old &amp;= ~what;</div><div class='del'>-		outb(old, ICEMT1724(ice, DMA_PAUSE));</div><div class='del'>-		spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;ice-&gt;reg_lock) {</div><div class='add'>+			old = inb(ICEMT1724(ice, DMA_PAUSE));</div><div class='add'>+			if (cmd == SNDRV_PCM_TRIGGER_PAUSE_PUSH)</div><div class='add'>+				old |= what;</div><div class='add'>+			else</div><div class='add'>+				old &amp;= ~what;</div><div class='add'>+			outb(old, ICEMT1724(ice, DMA_PAUSE));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='del'>-		spin_lock(&amp;ice-&gt;reg_lock);</div><div class='del'>-		old = inb(ICEMT1724(ice, DMA_CONTROL));</div><div class='del'>-		if (cmd == SNDRV_PCM_TRIGGER_START)</div><div class='del'>-			old |= what;</div><div class='del'>-		else</div><div class='del'>-			old &amp;= ~what;</div><div class='del'>-		outb(old, ICEMT1724(ice, DMA_CONTROL));</div><div class='del'>-		spin_unlock(&amp;ice-&gt;reg_lock);</div><div class='add'>+		scoped_guard(spinlock, &amp;ice-&gt;reg_lock) {</div><div class='add'>+			old = inb(ICEMT1724(ice, DMA_CONTROL));</div><div class='add'>+			if (cmd == SNDRV_PCM_TRIGGER_START)</div><div class='add'>+				old |= what;</div><div class='add'>+			else</div><div class='add'>+				old &amp;= ~what;</div><div class='add'>+			outb(old, ICEMT1724(ice, DMA_CONTROL));</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='hunk'>@@ -620,9 +582,7 @@ static const unsigned int stdclock_rate_list[16] = {</div><div class='ctx'> </div><div class='ctx'> static unsigned int stdclock_get_rate(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	unsigned int rate;</div><div class='del'>-	rate = stdclock_rate_list[inb(ICEMT1724(ice, RATE)) &amp; 15];</div><div class='del'>-	return rate;</div><div class='add'>+	return stdclock_rate_list[inb(ICEMT1724(ice, RATE)) &amp; 15];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void stdclock_set_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='hunk'>@@ -660,46 +620,45 @@ static unsigned char stdclock_set_mclk(struct snd_ice1712 *ice,</div><div class='ctx'> static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,</div><div class='ctx'> 				    int force)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned char mclk_change;</div><div class='ctx'> 	unsigned int i, old_rate;</div><div class='add'>+	bool call_set_rate = false;</div><div class='ctx'> </div><div class='ctx'> 	if (rate &gt; ice-&gt;hw_rates-&gt;list[ice-&gt;hw_rates-&gt;count - 1])</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-	if ((inb(ICEMT1724(ice, DMA_CONTROL)) &amp; DMA_STARTS) ||</div><div class='del'>-	    (inb(ICEMT1724(ice, DMA_PAUSE)) &amp; DMA_PAUSES)) {</div><div class='del'>-		/* running? we cannot change the rate now... */</div><div class='del'>-		spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-		return ((rate == ice-&gt;cur_rate) &amp;&amp; !force) ? 0 : -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (!force &amp;&amp; is_pro_rate_locked(ice)) {</div><div class='del'>-		/* comparing required and current rate - makes sense for</div><div class='del'>-		 * internal clock only */</div><div class='del'>-		spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-		return (rate == ice-&gt;cur_rate) ? 0 : -EBUSY;</div><div class='del'>-	}</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		if ((inb(ICEMT1724(ice, DMA_CONTROL)) &amp; DMA_STARTS) ||</div><div class='add'>+		    (inb(ICEMT1724(ice, DMA_PAUSE)) &amp; DMA_PAUSES)) {</div><div class='add'>+			/* running? we cannot change the rate now... */</div><div class='add'>+			return ((rate == ice-&gt;cur_rate) &amp;&amp; !force) ? 0 : -EBUSY;</div><div class='add'>+		}</div><div class='add'>+		if (!force &amp;&amp; is_pro_rate_locked(ice)) {</div><div class='add'>+			/* comparing required and current rate - makes sense for</div><div class='add'>+			 * internal clock only */</div><div class='add'>+			return (rate == ice-&gt;cur_rate) ? 0 : -EBUSY;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (force || !ice-&gt;is_spdif_master(ice)) {</div><div class='del'>-		/* force means the rate was switched by ucontrol, otherwise</div><div class='del'>-		 * setting clock rate for internal clock mode */</div><div class='del'>-		old_rate = ice-&gt;get_rate(ice);</div><div class='del'>-		if (force || (old_rate != rate))</div><div class='del'>-			ice-&gt;set_rate(ice, rate);</div><div class='del'>-		else if (rate == ice-&gt;cur_rate) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-			return 0;</div><div class='add'>+		if (force || !ice-&gt;is_spdif_master(ice)) {</div><div class='add'>+			/* force means the rate was switched by ucontrol, otherwise</div><div class='add'>+			 * setting clock rate for internal clock mode */</div><div class='add'>+			old_rate = ice-&gt;get_rate(ice);</div><div class='add'>+			if (force || (old_rate != rate))</div><div class='add'>+				call_set_rate = true;</div><div class='add'>+			else if (rate == ice-&gt;cur_rate) {</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		ice-&gt;cur_rate = rate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ice-&gt;cur_rate = rate;</div><div class='add'>+	if (call_set_rate)</div><div class='add'>+		ice-&gt;set_rate(ice, rate);</div><div class='ctx'> </div><div class='ctx'> 	/* setting master clock */</div><div class='ctx'> 	mclk_change = ice-&gt;set_mclk(ice, rate);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='del'>-</div><div class='ctx'> 	if (mclk_change &amp;&amp; ice-&gt;gpio.i2s_mclk_changed)</div><div class='ctx'> 		ice-&gt;gpio.i2s_mclk_changed(ice);</div><div class='ctx'> 	if (ice-&gt;gpio.set_pro_rate)</div><div class='hunk'>@@ -716,24 +675,21 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				    struct snd_pcm_hw_params *hw_params)</div><div class='add'>+static int __snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				      struct snd_pcm_hw_params *hw_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='del'>-	int i, chs, err;</div><div class='add'>+	int i, chs;</div><div class='ctx'> </div><div class='ctx'> 	chs = params_channels(hw_params);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;open_mutex);</div><div class='ctx'> 	/* mark surround channels */</div><div class='ctx'> 	if (substream == ice-&gt;playback_pro_substream) {</div><div class='ctx'> 		/* PDMA0 can be multi-channel up to 8 */</div><div class='ctx'> 		chs = chs / 2 - 1;</div><div class='ctx'> 		for (i = 0; i &lt; chs; i++) {</div><div class='ctx'> 			if (ice-&gt;pcm_reserved[i] &amp;&amp;</div><div class='del'>-			    ice-&gt;pcm_reserved[i] != substream) {</div><div class='del'>-				mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='add'>+			    ice-&gt;pcm_reserved[i] != substream)</div><div class='ctx'> 				return -EBUSY;</div><div class='del'>-			}</div><div class='ctx'> 			ice-&gt;pcm_reserved[i] = substream;</div><div class='ctx'> 		}</div><div class='ctx'> 		for (; i &lt; 3; i++) {</div><div class='hunk'>@@ -745,22 +701,30 @@ static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 			/* check individual playback stream */</div><div class='ctx'> 			if (ice-&gt;playback_con_substream_ds[i] == substream) {</div><div class='ctx'> 				if (ice-&gt;pcm_reserved[i] &amp;&amp;</div><div class='del'>-				    ice-&gt;pcm_reserved[i] != substream) {</div><div class='del'>-					mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='add'>+				    ice-&gt;pcm_reserved[i] != substream)</div><div class='ctx'> 					return -EBUSY;</div><div class='del'>-				}</div><div class='ctx'> 				ice-&gt;pcm_reserved[i] = substream;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='ctx'> </div><div class='del'>-	err = snd_vt1724_set_pro_rate(ice, params_rate(hw_params), 0);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_vt1724_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+				    struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='add'>+	scoped_guard(mutex, &amp;ice-&gt;open_mutex) {</div><div class='add'>+		err = __snd_vt1724_pcm_hw_params(substream, hw_params);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return snd_vt1724_set_pro_rate(ice, params_rate(hw_params), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_vt1724_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -768,13 +732,12 @@ static int snd_vt1724_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;open_mutex);</div><div class='ctx'> 	/* unmark surround channels */</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		if (ice-&gt;pcm_reserved[i] == substream)</div><div class='ctx'> 			ice-&gt;pcm_reserved[i] = NULL;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -783,7 +746,7 @@ static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	unsigned int size;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	val = (8 - substream-&gt;runtime-&gt;channels) &gt;&gt; 1;</div><div class='ctx'> 	outb(val, ICEMT1724(ice, BURST));</div><div class='ctx'> </div><div class='hunk'>@@ -798,10 +761,8 @@ static int snd_vt1724_playback_pro_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	outw(size, ICEMT1724(ice, PLAYBACK_COUNT));</div><div class='ctx'> 	outb(size &gt;&gt; 16, ICEMT1724(ice, PLAYBACK_COUNT) + 2);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "pro prepare: ch = %d, addr = 0x%x, "</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "pro prepare: ch = %d, addr = 0x%x, "</div><div class='ctx'> 	       "buffer = 0x%x, period = 0x%x\n",</div><div class='ctx'> 	       substream-&gt;runtime-&gt;channels,</div><div class='ctx'> 	       (unsigned int)substream-&gt;runtime-&gt;dma_addr,</div><div class='hunk'>@@ -821,13 +782,13 @@ static snd_pcm_uframes_t snd_vt1724_playback_pro_pointer(struct snd_pcm_substrea</div><div class='ctx'> #if 0 /* read PLAYBACK_ADDR */</div><div class='ctx'> 	ptr = inl(ICEMT1724(ice, PLAYBACK_ADDR));</div><div class='ctx'> 	if (ptr &lt; substream-&gt;runtime-&gt;dma_addr) {</div><div class='del'>-		snd_printd("ice1724: invalid negative ptr\n");</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev, "invalid negative ptr\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	ptr -= substream-&gt;runtime-&gt;dma_addr;</div><div class='ctx'> 	ptr = bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> 	if (ptr &gt;= substream-&gt;runtime-&gt;buffer_size) {</div><div class='del'>-		snd_printd("ice1724: invalid ptr %d (size=%d)\n",</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev, "invalid ptr %d (size=%d)\n",</div><div class='ctx'> 			   (int)ptr, (int)substream-&gt;runtime-&gt;period_size);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -840,7 +801,7 @@ static snd_pcm_uframes_t snd_vt1724_playback_pro_pointer(struct snd_pcm_substrea</div><div class='ctx'> 	else if (ptr &lt;= substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = substream-&gt;runtime-&gt;buffer_size - ptr;</div><div class='ctx'> 	else {</div><div class='del'>-		snd_printd("ice1724: invalid ptr %d (size=%d)\n",</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev, "invalid ptr %d (size=%d)\n",</div><div class='ctx'> 			   (int)ptr, (int)substream-&gt;runtime-&gt;buffer_size);</div><div class='ctx'> 		ptr = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -853,13 +814,12 @@ static int snd_vt1724_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	const struct vt1724_pcm_reg *reg = substream-&gt;runtime-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	outl(substream-&gt;runtime-&gt;dma_addr, ice-&gt;profi_port + reg-&gt;addr);</div><div class='ctx'> 	outw((snd_pcm_lib_buffer_bytes(substream) &gt;&gt; 2) - 1,</div><div class='ctx'> 	     ice-&gt;profi_port + reg-&gt;size);</div><div class='ctx'> 	outw((snd_pcm_lib_period_bytes(substream) &gt;&gt; 2) - 1,</div><div class='ctx'> 	     ice-&gt;profi_port + reg-&gt;count);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -884,7 +844,7 @@ static snd_pcm_uframes_t snd_vt1724_pcm_pointer(struct snd_pcm_substream *substr</div><div class='ctx'> 	else if (ptr &lt;= substream-&gt;runtime-&gt;buffer_size)</div><div class='ctx'> 		ptr = substream-&gt;runtime-&gt;buffer_size - ptr;</div><div class='ctx'> 	else {</div><div class='del'>-		snd_printd("ice1724: invalid ptr %d (size=%d)\n",</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev, "invalid ptr %d (size=%d)\n",</div><div class='ctx'> 			   (int)ptr, (int)substream-&gt;runtime-&gt;buffer_size);</div><div class='ctx'> 		ptr = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1013,6 +973,25 @@ static int set_rate_constraints(struct snd_ice1712 *ice,</div><div class='ctx'> 					  ice-&gt;hw_rates);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* if the card has the internal rate locked (is_pro_locked), limit runtime</div><div class='add'>+   hw rates to the current internal rate only.</div><div class='add'>+*/</div><div class='add'>+static void constrain_rate_if_locked(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int rate;</div><div class='add'>+	if (is_pro_rate_locked(ice)) {</div><div class='add'>+		rate = ice-&gt;get_rate(ice);</div><div class='add'>+		if (rate &gt;= runtime-&gt;hw.rate_min</div><div class='add'>+		    &amp;&amp; rate &lt;= runtime-&gt;hw.rate_max) {</div><div class='add'>+			runtime-&gt;hw.rate_min = rate;</div><div class='add'>+			runtime-&gt;hw.rate_max = rate;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* multi-channel playback needs alignment 8x32bit regardless of the channels</div><div class='ctx'>  * actually used</div><div class='ctx'>  */</div><div class='hunk'>@@ -1030,22 +1009,23 @@ static int snd_vt1724_playback_pro_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='ctx'> 	snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);</div><div class='ctx'> 	set_rate_constraints(ice, substream);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;open_mutex);</div><div class='del'>-	/* calculate the currently available channels */</div><div class='del'>-	num_indeps = ice-&gt;num_total_dacs / 2 - 1;</div><div class='del'>-	for (chs = 0; chs &lt; num_indeps; chs++) {</div><div class='del'>-		if (ice-&gt;pcm_reserved[chs])</div><div class='del'>-			break;</div><div class='add'>+	scoped_guard(mutex, &amp;ice-&gt;open_mutex) {</div><div class='add'>+		/* calculate the currently available channels */</div><div class='add'>+		num_indeps = ice-&gt;num_total_dacs / 2 - 1;</div><div class='add'>+		for (chs = 0; chs &lt; num_indeps; chs++) {</div><div class='add'>+			if (ice-&gt;pcm_reserved[chs])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		chs = (chs + 1) * 2;</div><div class='add'>+		runtime-&gt;hw.channels_max = chs;</div><div class='add'>+		if (chs &gt; 2) /* channels must be even */</div><div class='add'>+			snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='ctx'> 	}</div><div class='del'>-	chs = (chs + 1) * 2;</div><div class='del'>-	runtime-&gt;hw.channels_max = chs;</div><div class='del'>-	if (chs &gt; 2) /* channels must be even */</div><div class='del'>-		snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, 2);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='add'>+	constrain_rate_if_locked(substream);</div><div class='ctx'> 	if (ice-&gt;pro_open)</div><div class='ctx'> 		ice-&gt;pro_open(ice, substream);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1066,6 +1046,7 @@ static int snd_vt1724_capture_pro_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='add'>+	constrain_rate_if_locked(substream);</div><div class='ctx'> 	if (ice-&gt;pro_open)</div><div class='ctx'> 		ice-&gt;pro_open(ice, substream);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1092,10 +1073,9 @@ static int snd_vt1724_capture_pro_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_vt1724_playback_pro_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vt1724_playback_pro_ops = {</div><div class='ctx'> 	.open =		snd_vt1724_playback_pro_open,</div><div class='ctx'> 	.close =	snd_vt1724_playback_pro_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_vt1724_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_vt1724_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_vt1724_playback_pro_prepare,</div><div class='hunk'>@@ -1103,10 +1083,9 @@ static struct snd_pcm_ops snd_vt1724_playback_pro_ops = {</div><div class='ctx'> 	.pointer =	snd_vt1724_playback_pro_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_vt1724_capture_pro_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vt1724_capture_pro_ops = {</div><div class='ctx'> 	.open =		snd_vt1724_capture_pro_open,</div><div class='ctx'> 	.close =	snd_vt1724_capture_pro_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_vt1724_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_vt1724_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_vt1724_pcm_prepare,</div><div class='hunk'>@@ -1114,25 +1093,31 @@ static struct snd_pcm_ops snd_vt1724_capture_pro_ops = {</div><div class='ctx'> 	.pointer =	snd_vt1724_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_pcm_profi(struct snd_ice1712 *ice, int device)</div><div class='add'>+static int snd_vt1724_pcm_profi(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='del'>-	int err;</div><div class='add'>+	int capt, err;</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_new(ice-&gt;card, "ICE1724", device, 1, 1, &amp;pcm);</div><div class='add'>+	if ((ice-&gt;eeprom.data[ICE_EEP2_SYSCONF] &amp; VT1724_CFG_ADC_MASK) ==</div><div class='add'>+	    VT1724_CFG_ADC_NONE)</div><div class='add'>+		capt = 0;</div><div class='add'>+	else</div><div class='add'>+		capt = 1;</div><div class='add'>+	err = snd_pcm_new(ice-&gt;card, "ICE1724", device, 1, capt, &amp;pcm);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_vt1724_playback_pro_ops);</div><div class='del'>-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;snd_vt1724_capture_pro_ops);</div><div class='add'>+	if (capt)</div><div class='add'>+		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,</div><div class='add'>+			&amp;snd_vt1724_capture_pro_ops);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ICE1724");</div><div class='add'>+	strscpy(pcm-&gt;name, "ICE1724");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci),</div><div class='del'>-					      256*1024, 256*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 256*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;pcm_pro = pcm;</div><div class='ctx'> </div><div class='hunk'>@@ -1163,9 +1148,8 @@ static void update_spdif_bits(struct snd_ice1712 *ice, unsigned int val)</div><div class='ctx'> static void update_spdif_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val, nval;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;ice-&gt;reg_lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	nval = val = inw(ICEMT1724(ice, SPDIF_CTRL));</div><div class='ctx'> 	nval &amp;= ~(7 &lt;&lt; 12);</div><div class='ctx'> 	switch (rate) {</div><div class='hunk'>@@ -1179,7 +1163,6 @@ static void update_spdif_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (val != nval)</div><div class='ctx'> 		update_spdif_bits(ice, nval);</div><div class='del'>-	spin_unlock_irqrestore(&amp;ice-&gt;reg_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_vt1724_playback_spdif_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1208,6 +1191,7 @@ static int snd_vt1724_playback_spdif_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='add'>+	constrain_rate_if_locked(substream);</div><div class='ctx'> 	if (ice-&gt;spdif.ops.open)</div><div class='ctx'> 		ice-&gt;spdif.ops.open(ice, substream);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1244,6 +1228,7 @@ static int snd_vt1724_capture_spdif_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,</div><div class='ctx'> 				   VT1724_BUFFER_ALIGN);</div><div class='add'>+	constrain_rate_if_locked(substream);</div><div class='ctx'> 	if (ice-&gt;spdif.ops.open)</div><div class='ctx'> 		ice-&gt;spdif.ops.open(ice, substream);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1262,10 +1247,9 @@ static int snd_vt1724_capture_spdif_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_vt1724_playback_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vt1724_playback_spdif_ops = {</div><div class='ctx'> 	.open =		snd_vt1724_playback_spdif_open,</div><div class='ctx'> 	.close =	snd_vt1724_playback_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_vt1724_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_vt1724_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_vt1724_playback_spdif_prepare,</div><div class='hunk'>@@ -1273,10 +1257,9 @@ static struct snd_pcm_ops snd_vt1724_playback_spdif_ops = {</div><div class='ctx'> 	.pointer =	snd_vt1724_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_vt1724_capture_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vt1724_capture_spdif_ops = {</div><div class='ctx'> 	.open =		snd_vt1724_capture_spdif_open,</div><div class='ctx'> 	.close =	snd_vt1724_capture_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_vt1724_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_vt1724_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_vt1724_pcm_prepare,</div><div class='hunk'>@@ -1285,7 +1268,7 @@ static struct snd_pcm_ops snd_vt1724_capture_spdif_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)</div><div class='add'>+static int snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='hunk'>@@ -1324,11 +1307,10 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, name);</div><div class='add'>+	strscpy(pcm-&gt;name, name);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci),</div><div class='del'>-					      256*1024, 256*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 256*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;pcm = pcm;</div><div class='ctx'> </div><div class='hunk'>@@ -1366,11 +1348,11 @@ static int snd_vt1724_playback_indep_prepare(struct snd_pcm_substream *substream</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	val = 3 - substream-&gt;number;</div><div class='del'>-	if (inb(ICEMT1724(ice, BURST)) &lt; val)</div><div class='del'>-		outb(val, ICEMT1724(ice, BURST));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		val = 3 - substream-&gt;number;</div><div class='add'>+		if (inb(ICEMT1724(ice, BURST)) &lt; val)</div><div class='add'>+			outb(val, ICEMT1724(ice, BURST));</div><div class='add'>+	}</div><div class='ctx'> 	return snd_vt1724_pcm_prepare(substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1379,13 +1361,11 @@ static int snd_vt1724_playback_indep_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;open_mutex);</div><div class='del'>-	/* already used by PDMA0? */</div><div class='del'>-	if (ice-&gt;pcm_reserved[substream-&gt;number]) {</div><div class='del'>-		mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='del'>-		return -EBUSY; /* FIXME: should handle blocking mode properly */</div><div class='add'>+	scoped_guard(mutex, &amp;ice-&gt;open_mutex) {</div><div class='add'>+		/* already used by PDMA0? */</div><div class='add'>+		if (ice-&gt;pcm_reserved[substream-&gt;number])</div><div class='add'>+			return -EBUSY; /* FIXME: should handle blocking mode properly */</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;open_mutex);</div><div class='ctx'> 	runtime-&gt;private_data = (void *)&amp;vt1724_playback_dma_regs[substream-&gt;number];</div><div class='ctx'> 	ice-&gt;playback_con_substream_ds[substream-&gt;number] = substream;</div><div class='ctx'> 	runtime-&gt;hw = snd_vt1724_2ch_stereo;</div><div class='hunk'>@@ -1407,10 +1387,9 @@ static int snd_vt1724_playback_indep_close(struct snd_pcm_substream *substream)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_vt1724_playback_indep_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_vt1724_playback_indep_ops = {</div><div class='ctx'> 	.open =		snd_vt1724_playback_indep_open,</div><div class='ctx'> 	.close =	snd_vt1724_playback_indep_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_vt1724_pcm_hw_params,</div><div class='ctx'> 	.hw_free =	snd_vt1724_pcm_hw_free,</div><div class='ctx'> 	.prepare =	snd_vt1724_playback_indep_prepare,</div><div class='hunk'>@@ -1419,7 +1398,7 @@ static struct snd_pcm_ops snd_vt1724_playback_indep_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_pcm_indep(struct snd_ice1712 *ice, int device)</div><div class='add'>+static int snd_vt1724_pcm_indep(struct snd_ice1712 *ice, int device)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int play;</div><div class='hunk'>@@ -1438,11 +1417,10 @@ static int __devinit snd_vt1724_pcm_indep(struct snd_ice1712 *ice, int device)</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = ice;</div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, "ICE1724 Surround PCM");</div><div class='add'>+	strscpy(pcm-&gt;name, "ICE1724 Surround PCM");</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(ice-&gt;pci),</div><div class='del'>-					      256*1024, 256*1024);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;ice-&gt;pci-&gt;dev, 256*1024, 256*1024);</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;pcm_ds = pcm;</div><div class='ctx'> </div><div class='hunk'>@@ -1454,14 +1432,14 @@ static int __devinit snd_vt1724_pcm_indep(struct snd_ice1712 *ice, int device)</div><div class='ctx'>  *  Mixer section</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_ac97_mixer(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_vt1724_ac97_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ice-&gt;eeprom.data[ICE_EEP2_ACLINK] &amp; VT1724_CFG_PRO_I2S)) {</div><div class='ctx'> 		struct snd_ac97_bus *pbus;</div><div class='ctx'> 		struct snd_ac97_template ac97;</div><div class='del'>-		static struct snd_ac97_bus_ops ops = {</div><div class='add'>+		static const struct snd_ac97_bus_ops ops = {</div><div class='ctx'> 			.write = snd_vt1724_ac97_write,</div><div class='ctx'> 			.read = snd_vt1724_ac97_read,</div><div class='ctx'> 		};</div><div class='hunk'>@@ -1478,7 +1456,8 @@ static int __devinit snd_vt1724_ac97_mixer(struct snd_ice1712 *ice)</div><div class='ctx'> 		ac97.private_data = ice;</div><div class='ctx'> 		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;ice-&gt;ac97);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='del'>-			printk(KERN_WARNING "ice1712: cannot initialize pro ac97, skipped\n");</div><div class='add'>+			dev_warn(ice-&gt;card-&gt;dev,</div><div class='add'>+				 "cannot initialize pro ac97, skipped\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1540,12 +1519,9 @@ static void snd_vt1724_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 			    idx, inb(ice-&gt;profi_port+idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_vt1724_proc_init(struct snd_ice1712 *ice)</div><div class='add'>+static void snd_vt1724_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (!snd_card_proc_new(ice-&gt;card, "ice1724", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ice, snd_vt1724_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(ice-&gt;card, "ice1724", ice, snd_vt1724_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1569,7 +1545,7 @@ static int snd_vt1724_eeprom_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_eeprom __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_eeprom = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_CARD,</div><div class='ctx'> 	.name = "ICE1724 EEPROM",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='hunk'>@@ -1674,15 +1650,14 @@ static int snd_vt1724_spdif_default_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val, old;</div><div class='ctx'> </div><div class='ctx'> 	val = encode_spdif_bits(&amp;ucontrol-&gt;value.iec958);</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	old = inw(ICEMT1724(ice, SPDIF_CTRL));</div><div class='ctx'> 	if (val != old)</div><div class='ctx'> 		update_spdif_bits(ice, val);</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return val != old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_spdif_default __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_spdif_default =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name =         SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),</div><div class='hunk'>@@ -1714,7 +1689,7 @@ static int snd_vt1724_spdif_maskp_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_spdif_maskc =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1723,7 +1698,7 @@ static struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata =</div><div class='ctx'> 	.get =		snd_vt1724_spdif_maskc_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_spdif_maskp =</div><div class='ctx'> {</div><div class='ctx'> 	.access =	SNDRV_CTL_ELEM_ACCESS_READ,</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='hunk'>@@ -1749,18 +1724,17 @@ static int snd_vt1724_spdif_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned char old, val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	old = val = inb(ICEREG1724(ice, SPDIF_CFG));</div><div class='ctx'> 	val &amp;= ~VT1724_CFG_SPDIF_OUT_EN;</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		val |= VT1724_CFG_SPDIF_OUT_EN;</div><div class='ctx'> 	if (old != val)</div><div class='ctx'> 		outb(val, ICEREG1724(ice, SPDIF_CFG));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return old != val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_spdif_switch =</div><div class='ctx'> {</div><div class='ctx'> 	.iface =	SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	/* FIXME: the following conflict with IEC958 Playback Route */</div><div class='hunk'>@@ -1825,13 +1799,18 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='ctx'> 	uinfo-&gt;count = 1;</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;value.enumerated.items = hw_rates_count + ice-&gt;ext_clock_count;</div><div class='add'>+	/* internal clocks */</div><div class='add'>+	uinfo-&gt;value.enumerated.items = hw_rates_count;</div><div class='add'>+	/* external clocks */</div><div class='add'>+	if (ice-&gt;force_rdma1 ||</div><div class='add'>+	    (ice-&gt;eeprom.data[ICE_EEP2_SPDIF] &amp; VT1724_CFG_SPDIF_IN))</div><div class='add'>+		uinfo-&gt;value.enumerated.items += ice-&gt;ext_clock_count;</div><div class='ctx'> 	/* upper limit - keep at top */</div><div class='ctx'> 	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='ctx'> 		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='ctx'> 	if (uinfo-&gt;value.enumerated.item &gt;= hw_rates_count)</div><div class='ctx'> 		/* ext_clock items */</div><div class='del'>-		strcpy(uinfo-&gt;value.enumerated.name,</div><div class='add'>+		strscpy(uinfo-&gt;value.enumerated.name,</div><div class='ctx'> 				ice-&gt;ext_clock_names[</div><div class='ctx'> 				uinfo-&gt;value.enumerated.item - hw_rates_count]);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1847,7 +1826,7 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int i, rate;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	if (ice-&gt;is_spdif_master(ice)) {</div><div class='ctx'> 		ucontrol-&gt;value.enumerated.item[0] = ice-&gt;hw_rates-&gt;count +</div><div class='ctx'> 			ice-&gt;get_spdif_master_type(ice);</div><div class='hunk'>@@ -1861,7 +1840,6 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1892,29 +1870,31 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int old_rate, new_rate;</div><div class='ctx'> 	unsigned int item = ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 	unsigned int first_ext_clock = ice-&gt;hw_rates-&gt;count;</div><div class='add'>+	bool set_pro_rate = false;</div><div class='ctx'> </div><div class='ctx'> 	if (item &gt;  first_ext_clock + ice-&gt;ext_clock_count - 1)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* if rate = 0 =&gt; external clock */</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	if (ice-&gt;is_spdif_master(ice))</div><div class='del'>-		old_rate = 0;</div><div class='del'>-	else</div><div class='del'>-		old_rate = ice-&gt;get_rate(ice);</div><div class='del'>-	if (item &gt;= first_ext_clock) {</div><div class='del'>-		/* switching to external clock */</div><div class='del'>-		ice-&gt;set_spdif_clock(ice, item - first_ext_clock);</div><div class='del'>-		new_rate = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* internal on-card clock */</div><div class='del'>-		new_rate = ice-&gt;hw_rates-&gt;list[item];</div><div class='del'>-		ice-&gt;pro_rate_default = new_rate;</div><div class='del'>-		spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-		snd_vt1724_set_pro_rate(ice, ice-&gt;pro_rate_default, 1);</div><div class='del'>-		spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		if (ice-&gt;is_spdif_master(ice))</div><div class='add'>+			old_rate = 0;</div><div class='add'>+		else</div><div class='add'>+			old_rate = ice-&gt;get_rate(ice);</div><div class='add'>+		if (item &gt;= first_ext_clock) {</div><div class='add'>+			/* switching to external clock */</div><div class='add'>+			ice-&gt;set_spdif_clock(ice, item - first_ext_clock);</div><div class='add'>+			new_rate = 0;</div><div class='add'>+		} else {</div><div class='add'>+			/* internal on-card clock */</div><div class='add'>+			new_rate = ice-&gt;hw_rates-&gt;list[item];</div><div class='add'>+			ice-&gt;pro_rate_default = new_rate;</div><div class='add'>+			set_pro_rate = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (set_pro_rate)</div><div class='add'>+		snd_vt1724_set_pro_rate(ice, ice-&gt;pro_rate_default, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* the first switch to the ext. clock mode? */</div><div class='ctx'> 	if (old_rate != new_rate &amp;&amp; !new_rate) {</div><div class='hunk'>@@ -1930,7 +1910,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return old_rate != new_rate;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_pro_internal_clock = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Internal Clock",</div><div class='ctx'> 	.info = snd_vt1724_pro_internal_clock_info,</div><div class='hunk'>@@ -1954,14 +1934,13 @@ static int snd_vt1724_pro_rate_locking_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change = 0, nval;</div><div class='ctx'> </div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	change = PRO_RATE_LOCKED != nval;</div><div class='ctx'> 	PRO_RATE_LOCKED = nval;</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_pro_rate_locking = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Rate Locking",</div><div class='ctx'> 	.info = snd_vt1724_pro_rate_locking_info,</div><div class='hunk'>@@ -1985,14 +1964,13 @@ static int snd_vt1724_pro_rate_reset_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change = 0, nval;</div><div class='ctx'> </div><div class='ctx'> 	nval = ucontrol-&gt;value.integer.value[0] ? 1 : 0;</div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	change = PRO_RATE_RESET != nval;</div><div class='ctx'> 	PRO_RATE_RESET = nval;</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_pro_rate_reset = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "Multi Track Rate Reset",</div><div class='ctx'> 	.info = snd_vt1724_pro_rate_reset_info,</div><div class='hunk'>@@ -2007,19 +1985,13 @@ static struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = {</div><div class='ctx'> static int snd_vt1724_pro_route_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				     struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = {</div><div class='add'>+	static const char * const texts[] = {</div><div class='ctx'> 		"PCM Out", /* 0 */</div><div class='ctx'> 		"H/W In 0", "H/W In 1", /* 1-2 */</div><div class='ctx'> 		"IEC958 In L", "IEC958 In R", /* 3-4 */</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 5;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 5, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int analog_route_shift(int idx)</div><div class='hunk'>@@ -2114,7 +2086,7 @@ static int snd_vt1724_pro_route_spdif_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					 digital_route_shift(idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata =</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route =</div><div class='ctx'> {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "H/W Playback Route",</div><div class='hunk'>@@ -2123,7 +2095,7 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata =</div><div class='ctx'> 	.put = snd_vt1724_pro_route_analog_put,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, NONE) "Route",</div><div class='ctx'> 	.info = snd_vt1724_pro_route_info,</div><div class='hunk'>@@ -2149,17 +2121,16 @@ static int snd_vt1724_pro_peak_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	for (idx = 0; idx &lt; 22; idx++) {</div><div class='ctx'> 		outb(idx, ICEMT1724(ice, MONITOR_PEAKINDEX));</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[idx] =</div><div class='ctx'> 			inb(ICEMT1724(ice, MONITOR_PEAKDATA));</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new snd_vt1724_mixer_pro_peak = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_PCM,</div><div class='ctx'> 	.name = "Multi Track Peak",</div><div class='ctx'> 	.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,</div><div class='hunk'>@@ -2168,12 +2139,39 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+  ooAoo cards with no controls</div><div class='add'>+*/</div><div class='add'>+static const unsigned char ooaoo_sq210_eeprom[] = {</div><div class='add'>+	[ICE_EEP2_SYSCONF]     = 0x4c,	/* 49MHz crystal, no mpu401, no ADC,</div><div class='add'>+					   1xDACs */</div><div class='add'>+	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='add'>+	[ICE_EEP2_I2S]         = 0x78,	/* no volume, 96k, 24bit, 192k */</div><div class='add'>+	[ICE_EEP2_SPDIF]       = 0xc1,	/* out-en, out-int, out-ext */</div><div class='add'>+	[ICE_EEP2_GPIO_DIR]    = 0x00,	/* no GPIOs are used */</div><div class='add'>+	[ICE_EEP2_GPIO_DIR1]   = 0x00,</div><div class='add'>+	[ICE_EEP2_GPIO_DIR2]   = 0x00,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK]   = 0xff,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK1]  = 0xff,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK2]  = 0xff,</div><div class='add'>+</div><div class='add'>+	[ICE_EEP2_GPIO_STATE]  = 0x00, /* inputs */</div><div class='add'>+	[ICE_EEP2_GPIO_STATE1] = 0x00, /* all 1, but GPIO_CPLD_RW</div><div class='add'>+					  and GPIO15 always zero */</div><div class='add'>+	[ICE_EEP2_GPIO_STATE2] = 0x00, /* inputs */</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static struct snd_ice1712_card_info no_matched __devinitdata;</div><div class='ctx'> </div><div class='del'>-static struct snd_ice1712_card_info *card_tables[] __devinitdata = {</div><div class='add'>+static const struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "ooAoo SQ210a",</div><div class='add'>+		.model = "sq210a",</div><div class='add'>+		.eeprom_size = sizeof(ooaoo_sq210_eeprom),</div><div class='add'>+		.eeprom_data = ooaoo_sq210_eeprom,</div><div class='add'>+	},</div><div class='add'>+	{ } /* terminator */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct snd_ice1712_card_info *card_tables[] = {</div><div class='ctx'> 	snd_vt1724_revo_cards,</div><div class='ctx'> 	snd_vt1724_amp_cards,</div><div class='ctx'> 	snd_vt1724_aureon_cards,</div><div class='hunk'>@@ -2187,6 +2185,8 @@ static struct snd_ice1712_card_info *card_tables[] __devinitdata = {</div><div class='ctx'> 	snd_vt1724_wtm_cards,</div><div class='ctx'> 	snd_vt1724_se_cards,</div><div class='ctx'> 	snd_vt1724_qtet_cards,</div><div class='add'>+	snd_vt1724_ooaoo_cards,</div><div class='add'>+	snd_vt1724_psc724_cards,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2200,7 +2200,7 @@ static void wait_i2c_busy(struct snd_ice1712 *ice)</div><div class='ctx'> 	while ((inb(ICEREG1724(ice, I2C_CTRL)) &amp; VT1724_I2C_BUSY) &amp;&amp; t--)</div><div class='ctx'> 		;</div><div class='ctx'> 	if (t == -1)</div><div class='del'>-		printk(KERN_ERR "ice1724: i2c busy timeout\n");</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "i2c busy timeout\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice,</div><div class='hunk'>@@ -2208,15 +2208,14 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;i2c_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;i2c_mutex);</div><div class='ctx'> 	wait_i2c_busy(ice);</div><div class='ctx'> 	outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR));</div><div class='ctx'> 	outb(dev &amp; ~VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR));</div><div class='ctx'> 	wait_i2c_busy(ice);</div><div class='ctx'> 	val = inb(ICEREG1724(ice, I2C_DATA));</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;i2c_mutex);</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val);</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "i2c_read: [0x%x,0x%x] = 0x%x\n", dev, addr, val);</div><div class='ctx'> 	*/</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='hunk'>@@ -2224,24 +2223,23 @@ unsigned char snd_vt1724_read_i2c(struct snd_ice1712 *ice,</div><div class='ctx'> void snd_vt1724_write_i2c(struct snd_ice1712 *ice,</div><div class='ctx'> 			  unsigned char dev, unsigned char addr, unsigned char data)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;ice-&gt;i2c_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;i2c_mutex);</div><div class='ctx'> 	wait_i2c_busy(ice);</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data);</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "i2c_write: [0x%x,0x%x] = 0x%x\n", dev, addr, data);</div><div class='ctx'> 	*/</div><div class='ctx'> 	outb(addr, ICEREG1724(ice, I2C_BYTE_ADDR));</div><div class='ctx'> 	outb(data, ICEREG1724(ice, I2C_DATA));</div><div class='ctx'> 	outb(dev | VT1724_I2C_WRITE, ICEREG1724(ice, I2C_DEV_ADDR));</div><div class='ctx'> 	wait_i2c_busy(ice);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;i2c_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,</div><div class='del'>-					    const char *modelname)</div><div class='add'>+static int snd_vt1724_read_eeprom(struct snd_ice1712 *ice,</div><div class='add'>+				  const char *modelname)</div><div class='ctx'> {</div><div class='ctx'> 	const int dev = 0xa0;		/* EEPROM device address */</div><div class='ctx'> 	unsigned int i, size;</div><div class='del'>-	struct snd_ice1712_card_info * const *tbl, *c;</div><div class='add'>+	const struct snd_ice1712_card_info * const *tbl, *c;</div><div class='ctx'> </div><div class='ctx'> 	if (!modelname || !*modelname) {</div><div class='ctx'> 		ice-&gt;eeprom.subvendor = 0;</div><div class='hunk'>@@ -2264,45 +2262,52 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,</div><div class='ctx'> 				((unsigned int)swab16(vendor) &lt;&lt; 16) | swab16(device);</div><div class='ctx'> 			if (ice-&gt;eeprom.subvendor == 0 ||</div><div class='ctx'> 			    ice-&gt;eeprom.subvendor == (unsigned int)-1) {</div><div class='del'>-				printk(KERN_ERR "ice1724: No valid ID is found\n");</div><div class='add'>+				dev_err(ice-&gt;card-&gt;dev,</div><div class='add'>+					"No valid ID is found\n");</div><div class='ctx'> 				return -ENXIO;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	for (tbl = card_tables; *tbl; tbl++) {</div><div class='del'>-		for (c = *tbl; c-&gt;subvendor; c++) {</div><div class='add'>+		for (c = *tbl; c-&gt;name; c++) {</div><div class='ctx'> 			if (modelname &amp;&amp; c-&gt;model &amp;&amp;</div><div class='ctx'> 			    !strcmp(modelname, c-&gt;model)) {</div><div class='del'>-				printk(KERN_INFO "ice1724: Using board model %s\n",</div><div class='add'>+				dev_info(ice-&gt;card-&gt;dev,</div><div class='add'>+					 "Using board model %s\n",</div><div class='ctx'> 				       c-&gt;name);</div><div class='ctx'> 				ice-&gt;eeprom.subvendor = c-&gt;subvendor;</div><div class='ctx'> 			} else if (c-&gt;subvendor != ice-&gt;eeprom.subvendor)</div><div class='ctx'> 				continue;</div><div class='add'>+			ice-&gt;card_info = c;</div><div class='ctx'> 			if (!c-&gt;eeprom_size || !c-&gt;eeprom_data)</div><div class='ctx'> 				goto found;</div><div class='ctx'> 			/* if the EEPROM is given by the driver, use it */</div><div class='del'>-			snd_printdd("using the defined eeprom..\n");</div><div class='add'>+			dev_dbg(ice-&gt;card-&gt;dev, "using the defined eeprom..\n");</div><div class='ctx'> 			ice-&gt;eeprom.version = 2;</div><div class='ctx'> 			ice-&gt;eeprom.size = c-&gt;eeprom_size + 6;</div><div class='ctx'> 			memcpy(ice-&gt;eeprom.data, c-&gt;eeprom_data, c-&gt;eeprom_size);</div><div class='ctx'> 			goto read_skipped;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	printk(KERN_WARNING "ice1724: No matching model found for ID 0x%x\n",</div><div class='add'>+	dev_warn(ice-&gt;card-&gt;dev, "No matching model found for ID 0x%x\n",</div><div class='ctx'> 	       ice-&gt;eeprom.subvendor);</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	/* assume AC97-only card which can suspend without additional code */</div><div class='add'>+	ice-&gt;pm_suspend_enabled = 1;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>  found:</div><div class='ctx'> 	ice-&gt;eeprom.size = snd_vt1724_read_i2c(ice, dev, 0x04);</div><div class='ctx'> 	if (ice-&gt;eeprom.size &lt; 6)</div><div class='ctx'> 		ice-&gt;eeprom.size = 32;</div><div class='ctx'> 	else if (ice-&gt;eeprom.size &gt; 32) {</div><div class='del'>-		printk(KERN_ERR "ice1724: Invalid EEPROM (size = %i)\n",</div><div class='add'>+		dev_err(ice-&gt;card-&gt;dev, "Invalid EEPROM (size = %i)\n",</div><div class='ctx'> 		       ice-&gt;eeprom.size);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	ice-&gt;eeprom.version = snd_vt1724_read_i2c(ice, dev, 0x05);</div><div class='del'>-	if (ice-&gt;eeprom.version != 2)</div><div class='del'>-		printk(KERN_WARNING "ice1724: Invalid EEPROM version %i\n",</div><div class='add'>+	if (ice-&gt;eeprom.version != 1 &amp;&amp; ice-&gt;eeprom.version != 2)</div><div class='add'>+		dev_warn(ice-&gt;card-&gt;dev, "Invalid EEPROM version %i\n",</div><div class='ctx'> 		       ice-&gt;eeprom.version);</div><div class='ctx'> 	size = ice-&gt;eeprom.size - 6;</div><div class='ctx'> 	for (i = 0; i &lt; size; i++)</div><div class='hunk'>@@ -2354,7 +2359,7 @@ static int snd_vt1724_chip_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_kcontrol *kctl;</div><div class='hunk'>@@ -2373,30 +2378,34 @@ static int __devinit snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_default, ice));</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_default, ice);</div><div class='add'>+	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_maskc, ice);</div><div class='ctx'> 	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_maskc, ice));</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_maskp, ice);</div><div class='ctx'> 	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_maskp, ice));</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='ctx'> #if 0 /* use default only */</div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_stream, ice));</div><div class='add'>+	kctl = snd_ctl_new1(&amp;snd_vt1724_spdif_stream, ice);</div><div class='add'>+	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='add'>+	err = snd_ctl_add(ice-&gt;card, kctl);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	kctl-&gt;id.device = ice-&gt;pcm-&gt;device;</div><div class='ctx'> 	ice-&gt;spdif.stream_ctl = kctl;</div><div class='ctx'> #endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_build_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int snd_vt1724_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2424,61 +2433,33 @@ static int __devinit snd_vt1724_build_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_ctl_add(ice-&gt;card, snd_ctl_new1(&amp;snd_vt1724_mixer_pro_peak, ice));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_add(ice-&gt;card,</div><div class='add'>+			   snd_ctl_new1(&amp;snd_vt1724_mixer_pro_peak, ice));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_vt1724_free(struct snd_ice1712 *ice)</div><div class='add'>+static void snd_vt1724_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	if (!ice-&gt;port)</div><div class='del'>-		goto __hw_end;</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='add'>+</div><div class='ctx'> 	/* mask all interrupts */</div><div class='ctx'> 	outb(0xff, ICEMT1724(ice, DMA_INT_MASK));</div><div class='ctx'> 	outb(0xff, ICEREG1724(ice, IRQMASK));</div><div class='del'>-	/* --- */</div><div class='del'>-__hw_end:</div><div class='del'>-	if (ice-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(ice-&gt;irq, ice);</div><div class='del'>-	pci_release_regions(ice-&gt;pci);</div><div class='del'>-	snd_ice1712_akm4xxx_free(ice);</div><div class='del'>-	pci_disable_device(ice-&gt;pci);</div><div class='del'>-	kfree(ice-&gt;spec);</div><div class='del'>-	kfree(ice);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int snd_vt1724_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct snd_ice1712 *ice = device-&gt;device_data;</div><div class='del'>-	return snd_vt1724_free(ice);</div><div class='add'>+	snd_ice1712_akm4xxx_free(ice);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_create(struct snd_card *card,</div><div class='del'>-				       struct pci_dev *pci,</div><div class='del'>-				       const char *modelname,</div><div class='del'>-				       struct snd_ice1712 **r_ice1712)</div><div class='add'>+static int snd_vt1724_create(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci,</div><div class='add'>+			     const char *modelname)</div><div class='ctx'> {</div><div class='del'>-	struct snd_ice1712 *ice;</div><div class='add'>+	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_vt1724_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	*r_ice1712 = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	ice = kzalloc(sizeof(*ice), GFP_KERNEL);</div><div class='del'>-	if (ice == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	ice-&gt;vt1724 = 1;</div><div class='ctx'> 	spin_lock_init(&amp;ice-&gt;reg_lock);</div><div class='ctx'> 	mutex_init(&amp;ice-&gt;gpio_mutex);</div><div class='hunk'>@@ -2495,47 +2476,29 @@ static int __devinit snd_vt1724_create(struct snd_card *card,</div><div class='ctx'> 	ice-&gt;irq = -1;</div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> 	snd_vt1724_proc_init(ice);</div><div class='del'>-	synchronize_irq(pci-&gt;irq);</div><div class='del'>-</div><div class='del'>-	card-&gt;private_data = ice;</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pci, "ICE1724");</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		kfree(ice);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "ICE1724");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	ice-&gt;port = pci_resource_start(pci, 0);</div><div class='ctx'> 	ice-&gt;profi_port = pci_resource_start(pci, 1);</div><div class='ctx'> </div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_vt1724_interrupt,</div><div class='del'>-			IRQF_SHARED, "ICE1724", ice)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_vt1724_free(ice);</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_vt1724_interrupt,</div><div class='add'>+			     IRQF_SHARED, KBUILD_MODNAME, ice)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = ice-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_vt1724_free;</div><div class='ctx'> </div><div class='ctx'> 	snd_vt1724_chip_reset(ice);</div><div class='del'>-	if (snd_vt1724_read_eeprom(ice, modelname) &lt; 0) {</div><div class='del'>-		snd_vt1724_free(ice);</div><div class='add'>+	if (snd_vt1724_read_eeprom(ice, modelname) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (snd_vt1724_chip_init(ice) &lt; 0) {</div><div class='del'>-		snd_vt1724_free(ice);</div><div class='add'>+	if (snd_vt1724_chip_init(ice) &lt; 0)</div><div class='ctx'> 		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ice, &amp;ops);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_vt1724_free(ice);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*r_ice1712 = ice;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2546,14 +2509,14 @@ static int __devinit snd_vt1724_create(struct snd_card *card,</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_vt1724_probe(struct pci_dev *pci,</div><div class='del'>-				      const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_vt1724_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct snd_ice1712 *ice;</div><div class='ctx'> 	int pcm_dev = 0, err;</div><div class='del'>-	struct snd_ice1712_card_info * const *tbl, *c;</div><div class='add'>+	const struct snd_ice1712_card_info *c;</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -2562,41 +2525,34 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*ice), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	ice = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ICE1724");</div><div class='del'>-	strcpy(card-&gt;shortname, "ICEnsemble ICE1724");</div><div class='add'>+	strscpy(card-&gt;driver, "ICE1724");</div><div class='add'>+	strscpy(card-&gt;shortname, "ICEnsemble ICE1724");</div><div class='ctx'> </div><div class='del'>-	err = snd_vt1724_create(card, pci, model[dev], &amp;ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_vt1724_create(card, pci, model[dev]);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* field init before calling chip_init */</div><div class='ctx'> 	ice-&gt;ext_clock_count = 0;</div><div class='ctx'> </div><div class='del'>-	for (tbl = card_tables; *tbl; tbl++) {</div><div class='del'>-		for (c = *tbl; c-&gt;subvendor; c++) {</div><div class='del'>-			if (c-&gt;subvendor == ice-&gt;eeprom.subvendor) {</div><div class='del'>-				strcpy(card-&gt;shortname, c-&gt;name);</div><div class='del'>-				if (c-&gt;driver) /* specific driver? */</div><div class='del'>-					strcpy(card-&gt;driver, c-&gt;driver);</div><div class='del'>-				if (c-&gt;chip_init) {</div><div class='del'>-					err = c-&gt;chip_init(ice);</div><div class='del'>-					if (err &lt; 0) {</div><div class='del'>-						snd_card_free(card);</div><div class='del'>-						return err;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				goto __found;</div><div class='del'>-			}</div><div class='add'>+	c = ice-&gt;card_info;</div><div class='add'>+	if (c) {</div><div class='add'>+		strscpy(card-&gt;shortname, c-&gt;name);</div><div class='add'>+		if (c-&gt;driver) /* specific driver? */</div><div class='add'>+			strscpy(card-&gt;driver, c-&gt;driver);</div><div class='add'>+		if (c-&gt;chip_init) {</div><div class='add'>+			err = c-&gt;chip_init(ice);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	c = &amp;no_matched;</div><div class='del'>-__found:</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	* VT1724 has separate DMAs for the analog and the SPDIF streams while</div><div class='ctx'> 	* ICE1712 has only one for both (mixed up).</div><div class='hunk'>@@ -2627,63 +2583,47 @@ __found:</div><div class='ctx'> 		set_std_hw_rates(ice);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_vt1724_pcm_profi(ice, pcm_dev++);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_vt1724_pcm_spdif(ice, pcm_dev++);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_vt1724_pcm_indep(ice, pcm_dev++);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_vt1724_ac97_mixer(ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	err = snd_vt1724_build_controls(ice);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice-&gt;pcm &amp;&amp; ice-&gt;has_spdif) { /* has SPDIF I/O */</div><div class='ctx'> 		err = snd_vt1724_spdif_build_controls(ice);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;build_controls) {</div><div class='add'>+	if (c &amp;&amp; c-&gt;build_controls) {</div><div class='ctx'> 		err = c-&gt;build_controls(ice);</div><div class='del'>-		if (err &lt; 0) {</div><div class='del'>-			snd_card_free(card);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!c-&gt;no_mpu401) {</div><div class='add'>+	if (!c || !c-&gt;no_mpu401) {</div><div class='ctx'> 		if (ice-&gt;eeprom.data[ICE_EEP2_SYSCONF] &amp; VT1724_CFG_MPU401) {</div><div class='ctx'> 			struct snd_rawmidi *rmidi;</div><div class='ctx'> </div><div class='ctx'> 			err = snd_rawmidi_new(card, "MIDI", 0, 1, 1, &amp;rmidi);</div><div class='del'>-			if (err &lt; 0) {</div><div class='del'>-				snd_card_free(card);</div><div class='add'>+			if (err &lt; 0)</div><div class='ctx'> 				return err;</div><div class='del'>-			}</div><div class='ctx'> 			ice-&gt;rmidi[0] = rmidi;</div><div class='ctx'> 			rmidi-&gt;private_data = ice;</div><div class='del'>-			strcpy(rmidi-&gt;name, "ICE1724 MIDI");</div><div class='add'>+			strscpy(rmidi-&gt;name, "ICE1724 MIDI");</div><div class='ctx'> 			rmidi-&gt;info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |</div><div class='ctx'> 					    SNDRV_RAWMIDI_INFO_INPUT |</div><div class='ctx'> 					    SNDRV_RAWMIDI_INFO_DUPLEX;</div><div class='hunk'>@@ -2705,25 +2645,23 @@ __found:</div><div class='ctx'> 		card-&gt;shortname, ice-&gt;port, ice-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_vt1724_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_vt1724_probe(struct pci_dev *pci,</div><div class='add'>+			    const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_vt1724_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int snd_vt1724_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int snd_vt1724_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!ice-&gt;pm_suspend_enabled)</div><div class='hunk'>@@ -2731,45 +2669,28 @@ static int snd_vt1724_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='ctx'> </div><div class='del'>-	snd_pcm_suspend_all(ice-&gt;pcm);</div><div class='del'>-	snd_pcm_suspend_all(ice-&gt;pcm_pro);</div><div class='del'>-	snd_pcm_suspend_all(ice-&gt;pcm_ds);</div><div class='ctx'> 	snd_ac97_suspend(ice-&gt;ac97);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;ice-&gt;reg_lock);</div><div class='del'>-	ice-&gt;pm_saved_is_spdif_master = ice-&gt;is_spdif_master(ice);</div><div class='del'>-	ice-&gt;pm_saved_spdif_ctrl = inw(ICEMT1724(ice, SPDIF_CTRL));</div><div class='del'>-	ice-&gt;pm_saved_spdif_cfg = inb(ICEREG1724(ice, SPDIF_CFG));</div><div class='del'>-	ice-&gt;pm_saved_route = inl(ICEMT1724(ice, ROUTE_PLAYBACK));</div><div class='del'>-	spin_unlock_irq(&amp;ice-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;ice-&gt;reg_lock) {</div><div class='add'>+		ice-&gt;pm_saved_is_spdif_master = ice-&gt;is_spdif_master(ice);</div><div class='add'>+		ice-&gt;pm_saved_spdif_ctrl = inw(ICEMT1724(ice, SPDIF_CTRL));</div><div class='add'>+		ice-&gt;pm_saved_spdif_cfg = inb(ICEREG1724(ice, SPDIF_CFG));</div><div class='add'>+		ice-&gt;pm_saved_route = inl(ICEMT1724(ice, ROUTE_PLAYBACK));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ice-&gt;pm_suspend)</div><div class='ctx'> 		ice-&gt;pm_suspend(ice);</div><div class='del'>-</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_vt1724_resume(struct pci_dev *pci)</div><div class='add'>+static int snd_vt1724_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct snd_ice1712 *ice = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (!ice-&gt;pm_suspend_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-</div><div class='ctx'> 	snd_vt1724_chip_reset(ice);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_vt1724_chip_init(ice) &lt; 0) {</div><div class='hunk'>@@ -2785,7 +2706,12 @@ static int snd_vt1724_resume(struct pci_dev *pci)</div><div class='ctx'> 		ice-&gt;set_spdif_clock(ice, 0);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* internal on-card clock */</div><div class='del'>-		snd_vt1724_set_pro_rate(ice, ice-&gt;pro_rate_default, 1);</div><div class='add'>+		int rate;</div><div class='add'>+		if (ice-&gt;cur_rate)</div><div class='add'>+			rate = ice-&gt;cur_rate;</div><div class='add'>+		else</div><div class='add'>+			rate = ice-&gt;pro_rate_default;</div><div class='add'>+		snd_vt1724_set_pro_rate(ice, rate, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	update_spdif_bits(ice, ice-&gt;pm_saved_spdif_ctrl);</div><div class='hunk'>@@ -2793,34 +2719,25 @@ static int snd_vt1724_resume(struct pci_dev *pci)</div><div class='ctx'> 	outb(ice-&gt;pm_saved_spdif_cfg, ICEREG1724(ice, SPDIF_CFG));</div><div class='ctx'> 	outl(ice-&gt;pm_saved_route, ICEMT1724(ice, ROUTE_PLAYBACK));</div><div class='ctx'> </div><div class='del'>-	if (ice-&gt;ac97)</div><div class='del'>-		snd_ac97_resume(ice-&gt;ac97);</div><div class='add'>+	snd_ac97_resume(ice-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "ICE1724",</div><div class='add'>+static SIMPLE_DEV_PM_OPS(snd_vt1724_pm, snd_vt1724_suspend, snd_vt1724_resume);</div><div class='add'>+#define SND_VT1724_PM_OPS	&amp;snd_vt1724_pm</div><div class='add'>+#else</div><div class='add'>+#define SND_VT1724_PM_OPS	NULL</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static struct pci_driver vt1724_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_vt1724_ids,</div><div class='ctx'> 	.probe = snd_vt1724_probe,</div><div class='del'>-	.remove = __devexit_p(snd_vt1724_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = snd_vt1724_suspend,</div><div class='del'>-	.resume = snd_vt1724_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = SND_VT1724_PM_OPS,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_ice1724_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_ice1724_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_ice1724_init)</div><div class='del'>-module_exit(alsa_card_ice1724_exit)</div><div class='add'>+module_pci_driver(vt1724_driver);</div><div class='head'>diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c<br/>index 98bc3b7681b5..d679842ae1bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/juli.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/juli.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/juli.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/juli.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,29 +6,13 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *	              2008 Pavel Hofman &lt;dustin@seznam.cz&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -134,19 +119,19 @@ struct juli_spec {</div><div class='ctx'> /*</div><div class='ctx'>  * Initial setup of the conversion array GPIO &lt;-&gt; rate</div><div class='ctx'>  */</div><div class='del'>-static unsigned int juli_rates[] = {</div><div class='add'>+static const unsigned int juli_rates[] = {</div><div class='ctx'> 	16000, 22050, 24000, 32000,</div><div class='ctx'> 	44100, 48000, 64000, 88200,</div><div class='ctx'> 	96000, 176400, 192000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int gpio_vals[] = {</div><div class='add'>+static const unsigned int gpio_vals[] = {</div><div class='ctx'> 	GPIO_RATE_16000, GPIO_RATE_22050, GPIO_RATE_24000, GPIO_RATE_32000,</div><div class='ctx'> 	GPIO_RATE_44100, GPIO_RATE_48000, GPIO_RATE_64000, GPIO_RATE_88200,</div><div class='ctx'> 	GPIO_RATE_96000, GPIO_RATE_176400, GPIO_RATE_192000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list juli_rates_info = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list juli_rates_info = {</div><div class='ctx'> 	.count = ARRAY_SIZE(juli_rates),</div><div class='ctx'> 	.list = juli_rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -245,7 +230,7 @@ static void juli_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)</div><div class='ctx'> 	/* AK5385 first, since it requires cold reset affecting both codecs */</div><div class='ctx'> 	old_gpio = ice-&gt;gpio.get_data(ice);</div><div class='ctx'> 	new_gpio =  (old_gpio &amp; ~GPIO_AK5385A_MASK) | ak5385_pins;</div><div class='del'>-	/* printk(KERN_DEBUG "JULI - ak5385 set_rate_val: new gpio 0x%x\n",</div><div class='add'>+	/* dev_dbg(ice-&gt;card-&gt;dev, "JULI - ak5385 set_rate_val: new gpio 0x%x\n",</div><div class='ctx'> 		new_gpio); */</div><div class='ctx'> 	ice-&gt;gpio.set_data(ice, new_gpio);</div><div class='ctx'> </div><div class='hunk'>@@ -283,7 +268,7 @@ static const struct snd_akm4xxx_dac_channel juli_dac[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_juli_dac __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_juli_dac = {</div><div class='ctx'> 	.type = SND_AK4358,</div><div class='ctx'> 	.num_dacs = 8,	/* DAC1 - analog out</div><div class='ctx'> 			   DAC2 - analog in monitor</div><div class='hunk'>@@ -345,7 +330,7 @@ static int juli_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			new_gpio =  old_gpio &amp;</div><div class='ctx'> 				~((unsigned int) kcontrol-&gt;private_value);</div><div class='ctx'> 	}</div><div class='del'>-	/* printk(KERN_DEBUG</div><div class='add'>+	/* dev_dbg(ice-&gt;card-&gt;dev,</div><div class='ctx'> 		"JULI - mute/unmute: control_value: 0x%x, old_gpio: 0x%x, "</div><div class='ctx'> 		"new_gpio 0x%x\n",</div><div class='ctx'> 		(unsigned int)ucontrol-&gt;value.integer.value[0], old_gpio,</div><div class='hunk'>@@ -358,7 +343,7 @@ static int juli_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new juli_mute_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='hunk'>@@ -412,7 +397,7 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *slave_vols[] __devinitdata = {</div><div class='add'>+static const char * const follower_vols[] = {</div><div class='ctx'> 	PCM_VOLUME,</div><div class='ctx'> 	MONITOR_AN_IN_VOLUME,</div><div class='ctx'> 	MONITOR_DIG_IN_VOLUME,</div><div class='hunk'>@@ -420,34 +405,10 @@ static char *slave_vols[] __devinitdata = {</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __devinitdata</div><div class='add'>+static</div><div class='ctx'> DECLARE_TLV_DB_SCALE(juli_master_db_scale, -6350, 50, 1);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card,</div><div class='del'>-		const char *name)</div><div class='del'>-{</div><div class='del'>-	struct snd_ctl_elem_id sid;</div><div class='del'>-	memset(&amp;sid, 0, sizeof(sid));</div><div class='del'>-	/* FIXME: strcpy is bad. */</div><div class='del'>-	strcpy(sid.name, name);</div><div class='del'>-	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	return snd_ctl_find_id(card, &amp;sid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit add_slaves(struct snd_card *card,</div><div class='del'>-				 struct snd_kcontrol *master, char **list)</div><div class='del'>-{</div><div class='del'>-	for (; *list; list++) {</div><div class='del'>-		struct snd_kcontrol *slave = ctl_find(card, *list);</div><div class='del'>-		/* printk(KERN_DEBUG "add_slaves - %s\n", *list); */</div><div class='del'>-		if (slave) {</div><div class='del'>-			/* printk(KERN_DEBUG "slave %s found\n", *list); */</div><div class='del'>-			snd_ctl_add_slave(master, slave);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit juli_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int juli_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct juli_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -469,24 +430,23 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 					      juli_master_db_scale);</div><div class='ctx'> 	if (!vmaster)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	add_slaves(ice-&gt;card, vmaster, slave_vols);</div><div class='ctx'> 	err = snd_ctl_add(ice-&gt;card, vmaster);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	err = snd_ctl_add_followers(ice-&gt;card, vmaster, follower_vols);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* only capture SPDIF over AK4114 */</div><div class='del'>-	err = snd_ak4114_build(spec-&gt;ak4114, NULL,</div><div class='add'>+	return snd_ak4114_build(spec-&gt;ak4114, NULL,</div><div class='ctx'> 			ice-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * suspend/resume</div><div class='ctx'>  * */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int juli_resume(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_akm4xxx *ak = ice-&gt;akm;</div><div class='hunk'>@@ -494,15 +454,17 @@ static int juli_resume(struct snd_ice1712 *ice)</div><div class='ctx'> 	/* akm4358 un-reset, un-mute */</div><div class='ctx'> 	snd_akm4xxx_reset(ak, 0);</div><div class='ctx'> 	/* reinit ak4114 */</div><div class='del'>-	snd_ak4114_reinit(spec-&gt;ak4114);</div><div class='add'>+	snd_ak4114_resume(spec-&gt;ak4114);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int juli_suspend(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_akm4xxx *ak = ice-&gt;akm;</div><div class='add'>+	struct juli_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	/* akm4358 reset and soft-mute */</div><div class='ctx'> 	snd_akm4xxx_reset(ak, 1);</div><div class='add'>+	snd_ak4114_suspend(spec-&gt;ak4114);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -536,7 +498,7 @@ static void juli_set_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> </div><div class='ctx'> 	old = ice-&gt;gpio.get_data(ice);</div><div class='ctx'> 	new =  (old &amp; ~GPIO_RATE_MASK) | get_gpio_val(rate);</div><div class='del'>-	/* printk(KERN_DEBUG "JULI - set_rate: old %x, new %x\n",</div><div class='add'>+	/* dev_dbg(ice-&gt;card-&gt;dev, "JULI - set_rate: old %x, new %x\n",</div><div class='ctx'> 			old &amp; GPIO_RATE_MASK,</div><div class='ctx'> 			new &amp; GPIO_RATE_MASK); */</div><div class='ctx'> </div><div class='hunk'>@@ -573,13 +535,13 @@ static void juli_ak4114_change(struct ak4114 *ak4114, unsigned char c0,</div><div class='ctx'> 	if (ice-&gt;is_spdif_master(ice) &amp;&amp; c1) {</div><div class='ctx'> 		/* only for SPDIF master mode, rate was changed */</div><div class='ctx'> 		rate = snd_ak4114_external_rate(ak4114);</div><div class='del'>-		/* printk(KERN_DEBUG "ak4114 - input rate changed to %d\n",</div><div class='add'>+		/* dev_dbg(ice-&gt;card-&gt;dev, "ak4114 - input rate changed to %d\n",</div><div class='ctx'> 				rate); */</div><div class='ctx'> 		juli_akm_set_rate_val(ice-&gt;akm, rate);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit juli_init(struct snd_ice1712 *ice)</div><div class='add'>+static int juli_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned char ak4114_init_vals[] = {</div><div class='ctx'> 		/* AK4117_REG_PWRDN */	AK4114_RST | AK4114_PWN |</div><div class='hunk'>@@ -628,7 +590,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (spec-&gt;analog) {</div><div class='del'>-		printk(KERN_INFO "juli@: analog I/O detected\n");</div><div class='add'>+		dev_info(ice-&gt;card-&gt;dev, "juli@: analog I/O detected\n");</div><div class='ctx'> 		ice-&gt;num_total_dacs = 2;</div><div class='ctx'> 		ice-&gt;num_total_adcs = 2;</div><div class='ctx'> </div><div class='hunk'>@@ -652,7 +614,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;spdif.ops.open = juli_spdif_in_open;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	ice-&gt;pm_resume = juli_resume;</div><div class='ctx'> 	ice-&gt;pm_suspend = juli_suspend;</div><div class='ctx'> 	ice-&gt;pm_suspend_enabled = 1;</div><div class='hunk'>@@ -667,7 +629,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * hence the driver needs to sets up it properly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char juli_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char juli_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x2b,	/* clock 512, mpu401, 1xADC, 1xDACs,</div><div class='ctx'> 					   SPDIF in */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='hunk'>@@ -686,7 +648,7 @@ static unsigned char juli_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_juli_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_JULI,</div><div class='ctx'> 		.name = "ESI Juli@",</div><div class='head'>diff --git a/sound/pci/ice1712/juli.h b/sound/pci/ice1712/juli.h<br/>index d9f8534fd92e..9c22d4e73ee3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/juli.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/juli.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/juli.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/juli.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_JULI_H</div><div class='ctx'> #define __SOUND_JULI_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/maya44.c b/sound/pci/ice1712/maya44.c<br/>index 726fd4b92e19..551f478c59c4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/maya44.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/maya44.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/maya44.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/maya44.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,26 +6,10 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2009 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *	Based on the patches by Rainer Zimmermann &lt;mail@lightshed.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/control.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -131,7 +116,7 @@ struct maya_vol_info {</div><div class='ctx'> 	unsigned char mux_bits[2];	/* extra bits for ADC mute */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct maya_vol_info vol_info[WM_NUM_VOLS] = {</div><div class='add'>+static const struct maya_vol_info vol_info[WM_NUM_VOLS] = {</div><div class='ctx'> 	[WM_VOL_HP] = {</div><div class='ctx'> 		.maxval = 80,</div><div class='ctx'> 		.regs = { WM8776_REG_HEADPHONE_L, WM8776_REG_HEADPHONE_R },</div><div class='hunk'>@@ -173,7 +158,7 @@ static int maya_vol_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			 struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int idx = kcontrol-&gt;private_value;</div><div class='del'>-	struct maya_vol_info *vol = &amp;vol_info[idx];</div><div class='add'>+	const struct maya_vol_info *vol = &amp;vol_info[idx];</div><div class='ctx'> </div><div class='ctx'> 	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='ctx'> 	uinfo-&gt;count = 2;</div><div class='hunk'>@@ -190,10 +175,9 @@ static int maya_vol_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		&amp;chip-&gt;wm[snd_ctl_get_ioff(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	unsigned int idx = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = wm-&gt;volumes[idx][0];</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[1] = wm-&gt;volumes[idx][1];</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -204,11 +188,11 @@ static int maya_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_wm8776 *wm =</div><div class='ctx'> 		&amp;chip-&gt;wm[snd_ctl_get_ioff(kcontrol, &amp;ucontrol-&gt;id)];</div><div class='ctx'> 	unsigned int idx = kcontrol-&gt;private_value;</div><div class='del'>-	struct maya_vol_info *vol = &amp;vol_info[idx];</div><div class='add'>+	const struct maya_vol_info *vol = &amp;vol_info[idx];</div><div class='ctx'> 	unsigned int val, data;</div><div class='ctx'> 	int ch, changed = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	for (ch = 0; ch &lt; 2; ch++) {</div><div class='ctx'> 		val = ucontrol-&gt;value.integer.value[ch];</div><div class='ctx'> 		if (val &gt; vol-&gt;maxval)</div><div class='hunk'>@@ -228,7 +212,6 @@ static int maya_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  val ? 0 : vol-&gt;mux_bits[ch]);</div><div class='ctx'> 		wm-&gt;volumes[idx][ch] = val;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -265,7 +248,7 @@ static int maya_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int mask, val;</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	mask = 1 &lt;&lt; idx;</div><div class='ctx'> 	wm-&gt;switch_bits &amp;= ~mask;</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0];</div><div class='hunk'>@@ -275,7 +258,6 @@ static int maya_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	changed = wm8776_write_bits(chip-&gt;ice, wm,</div><div class='ctx'> 				    GET_SW_VAL_REG(kcontrol-&gt;private_value),</div><div class='ctx'> 				    mask, val ? mask : 0);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -330,14 +312,13 @@ static int maya_gpio_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned int val, mask;</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	mask = 1 &lt;&lt; shift;</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (GET_GPIO_VAL_INV(kcontrol-&gt;private_value))</div><div class='ctx'> 		val = !val;</div><div class='ctx'> 	val = val ? mask : 0;</div><div class='ctx'> 	changed = maya_set_gpio_bits(chip-&gt;ice, mask, val);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -358,17 +339,9 @@ static void wm8776_select_input(struct snd_maya44 *chip, int idx, int line)</div><div class='ctx'> static int maya_rec_src_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			     struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = { "Line", "Mic" };</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = ARRAY_SIZE(texts);</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	static const char * const texts[] = { "Line", "Mic" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int maya_rec_src_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -392,11 +365,10 @@ static int maya_rec_src_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int sel = ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 	int changed;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	changed = maya_set_gpio_bits(chip-&gt;ice, 1 &lt;&lt; GPIO_MIC_RELAY,</div><div class='ctx'> 				     sel ? (1 &lt;&lt; GPIO_MIC_RELAY) : 0);</div><div class='ctx'> 	wm8776_select_input(chip, 0, sel ? MAYA_MIC_IN : MAYA_LINE_IN);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -407,20 +379,12 @@ static int maya_rec_src_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int maya_pb_route_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			      struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[] = {</div><div class='add'>+	static const char * const texts[] = {</div><div class='ctx'> 		"PCM Out", /* 0 */</div><div class='ctx'> 		"Input 1", "Input 2", "Input 3", "Input 4"</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = ARRAY_SIZE(texts);</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int maya_pb_route_shift(int idx)</div><div class='hunk'>@@ -455,7 +419,7 @@ static int maya_pb_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>  * controls to be added</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new maya_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new maya_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.name = "Crossmix Playback Volume",</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -545,7 +509,7 @@ static struct snd_kcontrol_new maya_controls[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit maya44_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int maya44_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='hunk'>@@ -562,8 +526,8 @@ static int __devinit maya44_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> /*</div><div class='ctx'>  * initialize a wm8776 chip</div><div class='ctx'>  */</div><div class='del'>-static void __devinit wm8776_init(struct snd_ice1712 *ice,</div><div class='del'>-				  struct snd_wm8776 *wm, unsigned int addr)</div><div class='add'>+static void wm8776_init(struct snd_ice1712 *ice,</div><div class='add'>+			struct snd_wm8776 *wm, unsigned int addr)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned short inits_wm8776[] = {</div><div class='ctx'> 		0x02, 0x100, /* R2: headphone L+R muted + update */</div><div class='hunk'>@@ -666,24 +630,23 @@ static void set_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 		val |= 8;</div><div class='ctx'> 	val |= ratio &lt;&lt; 4;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		wm8776_write_bits(ice, &amp;chip-&gt;wm[i],</div><div class='ctx'> 				  WM8776_REG_MASTER_MODE_CONTROL,</div><div class='ctx'> 				  0x180, val);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * supported sample rates (to override the default one)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned int rates[] = {</div><div class='add'>+static const unsigned int rates[] = {</div><div class='ctx'> 	32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* playback rates: 32..192 kHz */</div><div class='del'>-static struct snd_pcm_hw_constraint_list dac_rates = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list dac_rates = {</div><div class='ctx'> 	.count = ARRAY_SIZE(rates),</div><div class='ctx'> 	.list = rates,</div><div class='ctx'> 	.mask = 0</div><div class='hunk'>@@ -693,14 +656,14 @@ static struct snd_pcm_hw_constraint_list dac_rates = {</div><div class='ctx'> /*</div><div class='ctx'>  * chip addresses on I2C bus</div><div class='ctx'>  */</div><div class='del'>-static unsigned char wm8776_addr[2] __devinitdata = {</div><div class='add'>+static const unsigned char wm8776_addr[2] = {</div><div class='ctx'> 	0x34, 0x36, /* codec 0 &amp; 1 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * initialize the chip</div><div class='ctx'>  */</div><div class='del'>-static int __devinit maya44_init(struct snd_ice1712 *ice)</div><div class='add'>+static int maya44_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct snd_maya44 *chip;</div><div class='hunk'>@@ -743,7 +706,7 @@ static int __devinit maya44_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * hence the driver needs to sets up it properly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char maya44_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char maya44_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x45,</div><div class='ctx'> 		/* clock xin1=49.152MHz, mpu401, 2 stereo ADCs+DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,</div><div class='hunk'>@@ -765,7 +728,7 @@ static unsigned char maya44_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_maya44_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_maya44_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_MAYA44,</div><div class='ctx'> 		.name = "ESI Maya44",</div><div class='head'>diff --git a/sound/pci/ice1712/maya44.h b/sound/pci/ice1712/maya44.h<br/>index eafd03a8f4b5..f5a97d987a6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/maya44.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/maya44.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/maya44.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/maya44.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_MAYA44_H</div><div class='ctx'> #define __SOUND_MAYA44_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c<br/>index de29be8c9657..151b740ce66d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/phase.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/phase.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/phase.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/phase.c</a></div><div class='hunk'>@@ -1,24 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1724 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for Terratec PHASE 22</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2005 Misha Zhilin &lt;misha@epiphan.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* PHASE 22 overview:</div><div class='hunk'>@@ -42,7 +28,6 @@</div><div class='ctx'>  *   Digital receiver: CS8414-CS (supported in this release)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -103,13 +88,13 @@ static const unsigned char wm_vol[256] = {</div><div class='ctx'> #define WM_VOL_MAX	(sizeof(wm_vol) - 1)</div><div class='ctx'> #define WM_VOL_MUTE	0x8000</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_phase22 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_phase22 = {</div><div class='ctx'> 	.type = SND_AK4524,</div><div class='ctx'> 	.num_dacs = 2,</div><div class='ctx'> 	.num_adcs = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_phase22_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_phase22_priv = {</div><div class='ctx'> 	.caddr =	2,</div><div class='ctx'> 	.cif =		1,</div><div class='ctx'> 	.data_mask =	1 &lt;&lt; 4,</div><div class='hunk'>@@ -121,7 +106,7 @@ static struct snd_ak4xxx_private akm_phase22_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags =	0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit phase22_init(struct snd_ice1712 *ice)</div><div class='add'>+static int phase22_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_akm4xxx *ak;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -158,7 +143,7 @@ static int __devinit phase22_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit phase22_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int phase22_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -172,7 +157,7 @@ static int __devinit phase22_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char phase22_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char phase22_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x28,  /* clock 512, mpu 401,</div><div class='ctx'> 					spdif-in/1xADC, 1xDACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='hunk'>@@ -189,7 +174,7 @@ static unsigned char phase22_eeprom[] __devinitdata = {</div><div class='ctx'> 	[ICE_EEP2_GPIO_STATE2] = 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char phase28_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char phase28_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x2b,  /* clock 512, mpu401,</div><div class='ctx'> 					spdif-in/1xADC, 4xDACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='hunk'>@@ -302,10 +287,9 @@ static int wm_pcm_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_MUTE) &amp; 0x10) ?</div><div class='ctx'> 						0 : 1;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -379,7 +363,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit phase28_init(struct snd_ice1712 *ice)</div><div class='add'>+static int phase28_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned short wm_inits_phase28[] = {</div><div class='ctx'> 		/* These come first to reduce init pop noise */</div><div class='hunk'>@@ -653,11 +637,10 @@ static int wm_pcm_vol_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	val = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) &amp; 0xff;</div><div class='ctx'> 	val = val &gt; PCM_MIN ? (val - PCM_MIN) : 0;</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = val;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -722,19 +705,9 @@ static int phase28_deemp_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int phase28_oversampling_info(struct snd_kcontrol *k,</div><div class='ctx'> 					struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "128x", "64x"	};</div><div class='add'>+	static const char * const texts[2] = { "128x", "64x"	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items -</div><div class='del'>-						1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-		texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int phase28_oversampling_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -770,7 +743,7 @@ static int phase28_oversampling_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new phase28_dac_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='hunk'>@@ -885,7 +858,7 @@ static struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new wm_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new wm_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "PCM Playback Switch",</div><div class='hunk'>@@ -919,7 +892,7 @@ static struct snd_kcontrol_new wm_controls[] __devinitdata = {</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit phase28_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int phase28_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, counts;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -943,7 +916,7 @@ static int __devinit phase28_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_phase_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_PHASE22,</div><div class='ctx'> 		.name = "Terratec PHASE 22",</div><div class='head'>diff --git a/sound/pci/ice1712/phase.h b/sound/pci/ice1712/phase.h<br/>index 7fc22d9d442f..c019018e2e19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/phase.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/phase.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/phase.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/phase.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_PHASE_H</div><div class='ctx'> #define __SOUND_PHASE_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Terratec PHASE 22</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2005 Misha Zhilin &lt;misha@epiphan.com&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define PHASE_DEVICE_DESC	"{Terratec,Phase 22},"\</div><div class='head'>diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c<br/>index cdb873f5da50..557473f0d59e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/pontis.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/pontis.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/pontis.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/pontis.c</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for Pontis MS300</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -127,13 +112,12 @@ static int wm_dac_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		val = wm_get(ice, WM_DAC_ATTEN_L + i) &amp; 0xff;</div><div class='ctx'> 		val = val &gt; DAC_MIN ? (val - DAC_MIN) : 0;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = val;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -143,7 +127,7 @@ static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	unsigned short oval, nval;</div><div class='ctx'> 	int i, idx, change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		nval = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 		nval = (nval ? (nval + DAC_MIN) : 0) &amp; 0xff;</div><div class='hunk'>@@ -155,7 +139,6 @@ static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -182,13 +165,12 @@ static int wm_adc_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		val = wm_get(ice, WM_ADC_ATTEN_L + i) &amp; 0xff;</div><div class='ctx'> 		val = val &gt; ADC_MIN ? (val - ADC_MIN) : 0;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = val;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -198,7 +180,7 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	unsigned short ovol, nvol;</div><div class='ctx'> 	int i, idx, change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		nvol = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 		nvol = nvol ? (nvol + ADC_MIN) : 0;</div><div class='hunk'>@@ -209,7 +191,6 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -223,9 +204,8 @@ static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int bit = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_ADC_MUX) &amp; (1 &lt;&lt; bit)) ? 1 : 0;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,7 +216,7 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	unsigned short oval, nval;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	nval = oval = wm_get(ice, WM_ADC_MUX);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		nval |= (1 &lt;&lt; bit);</div><div class='hunk'>@@ -246,7 +226,6 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		wm_put(ice, WM_ADC_MUX, nval);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -259,9 +238,8 @@ static int wm_bypass_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_OUT_MUX) &amp; 0x04) ? 1 : 0;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -271,7 +249,7 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 	unsigned short val, oval;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	val = oval = wm_get(ice, WM_OUT_MUX);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		val |= 0x04;</div><div class='hunk'>@@ -281,7 +259,6 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 		wm_put(ice, WM_OUT_MUX, val);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -294,9 +271,8 @@ static int wm_chswap_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL1) &amp; 0xf0) != 0x90;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -306,7 +282,7 @@ static int wm_chswap_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 	unsigned short val, oval;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	oval = wm_get(ice, WM_DAC_CTRL1);</div><div class='ctx'> 	val = oval &amp; 0x0f;</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='hunk'>@@ -318,7 +294,6 @@ static int wm_chswap_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 		wm_put_nocache(ice, WM_DAC_CTRL1, val);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -418,22 +393,15 @@ static int cs_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_inf</div><div class='ctx'> 		"Optical",	/* RXP1 */</div><div class='ctx'> 		"CD",		/* RXP2 */</div><div class='ctx'> 	};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cs_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = ice-&gt;gpio.saved[0];</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -443,14 +411,13 @@ static int cs_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	if (ucontrol-&gt;value.enumerated.item[0] != ice-&gt;gpio.saved[0]) {</div><div class='ctx'> 		ice-&gt;gpio.saved[0] = ucontrol-&gt;value.enumerated.item[0] &amp; 3;</div><div class='ctx'> 		val = 0x80 | (ice-&gt;gpio.saved[0] &lt;&lt; 3);</div><div class='ctx'> 		spi_write(ice, CS_DEV, 0x04, val);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -470,10 +437,10 @@ static int pontis_gpio_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> static int pontis_gpio_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	/* 4-7 reserved */</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (~ice-&gt;gpio.write_mask &amp; 0xffff) | 0x00f0;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='hunk'>@@ -482,22 +449,22 @@ static int pontis_gpio_mask_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int changed;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	/* 4-7 reserved */</div><div class='ctx'> 	val = (~ucontrol-&gt;value.integer.value[0] &amp; 0xffff) | 0x00f0;</div><div class='ctx'> 	changed = val != ice-&gt;gpio.write_mask;</div><div class='ctx'> 	ice-&gt;gpio.write_mask = val;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pontis_gpio_dir_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	/* 4-7 reserved */</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = ice-&gt;gpio.direction &amp; 0xff0f;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> 	</div><div class='hunk'>@@ -506,23 +473,23 @@ static int pontis_gpio_dir_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int changed;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	/* 4-7 reserved */</div><div class='ctx'> 	val = ucontrol-&gt;value.integer.value[0] &amp; 0xff0f;</div><div class='ctx'> 	changed = (val != ice-&gt;gpio.direction);</div><div class='ctx'> 	ice-&gt;gpio.direction = val;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pontis_gpio_data_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	snd_ice1712_gpio_set_dir(ice, ice-&gt;gpio.direction);</div><div class='ctx'> 	snd_ice1712_gpio_set_mask(ice, ice-&gt;gpio.write_mask);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = snd_ice1712_gpio_read(ice) &amp; 0xffff;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -531,7 +498,8 @@ static int pontis_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int val, nval;</div><div class='ctx'> 	int changed = 0;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	snd_ice1712_gpio_set_dir(ice, ice-&gt;gpio.direction);</div><div class='ctx'> 	snd_ice1712_gpio_set_mask(ice, ice-&gt;gpio.write_mask);</div><div class='ctx'> 	val = snd_ice1712_gpio_read(ice) &amp; 0xffff;</div><div class='hunk'>@@ -540,7 +508,6 @@ static int pontis_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 		snd_ice1712_gpio_write(ice, nval);</div><div class='ctx'> 		changed = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -550,7 +517,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_volume, -6400, 50, 1);</div><div class='ctx'>  * mixers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new pontis_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new pontis_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='hunk'>@@ -641,14 +608,14 @@ static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buf</div><div class='ctx'> 	struct snd_ice1712 *ice = entry-&gt;private_data;</div><div class='ctx'> 	char line[64];</div><div class='ctx'> 	unsigned int reg, val;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		if (sscanf(line, "%x %x", &amp;reg, &amp;val) != 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (reg &lt;= 0x17 &amp;&amp; val &lt;= 0xffff)</div><div class='ctx'> 			wm_put(ice, reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='hunk'>@@ -656,22 +623,17 @@ static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buff</div><div class='ctx'> 	struct snd_ice1712 *ice = entry-&gt;private_data;</div><div class='ctx'> 	int reg, val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (reg = 0; reg &lt;= 0x17; reg++) {</div><div class='ctx'> 		val = wm_get(ice, reg);</div><div class='ctx'> 		snd_iprintf(buffer, "%02x = %04x\n", reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wm_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (! snd_card_proc_new(ice-&gt;card, "wm_codec", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, ice, wm_proc_regs_read);</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.write = wm_proc_regs_write;</div><div class='del'>-	}</div><div class='add'>+	snd_card_rw_proc_new(ice-&gt;card, "wm_codec", ice, wm_proc_regs_read,</div><div class='add'>+			     wm_proc_regs_write);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)</div><div class='hunk'>@@ -679,25 +641,22 @@ static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buff</div><div class='ctx'> 	struct snd_ice1712 *ice = entry-&gt;private_data;</div><div class='ctx'> 	int reg, val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (reg = 0; reg &lt;= 0x26; reg++) {</div><div class='ctx'> 		val = spi_read(ice, CS_DEV, reg);</div><div class='ctx'> 		snd_iprintf(buffer, "%02x = %02x\n", reg, val);</div><div class='ctx'> 	}</div><div class='ctx'> 	val = spi_read(ice, CS_DEV, 0x7f);</div><div class='ctx'> 	snd_iprintf(buffer, "%02x = %02x\n", 0x7f, val);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cs_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (! snd_card_proc_new(ice-&gt;card, "cs_codec", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ice, cs_proc_regs_read);</div><div class='add'>+	snd_card_ro_proc_new(ice-&gt;card, "cs_codec", ice, cs_proc_regs_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit pontis_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int pontis_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -718,7 +677,7 @@ static int __devinit pontis_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> /*</div><div class='ctx'>  * initialize the chip</div><div class='ctx'>  */</div><div class='del'>-static int __devinit pontis_init(struct snd_ice1712 *ice)</div><div class='add'>+static int pontis_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned short wm_inits[] = {</div><div class='ctx'> 		/* These come first to reduce init pop noise */</div><div class='hunk'>@@ -768,7 +727,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	ice-&gt;num_total_dacs = 2;</div><div class='ctx'> 	ice-&gt;num_total_adcs = 2;</div><div class='ctx'> </div><div class='del'>-	/* to remeber the register values */</div><div class='add'>+	/* to remember the register values */</div><div class='ctx'> 	ice-&gt;akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);</div><div class='ctx'> 	if (! ice-&gt;akm)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -805,7 +764,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * hence the driver needs to sets up it properly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char pontis_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char pontis_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x08,	/* clock 256, mpu401, spdif-in/ADC, 1DAC */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0xf8,	/* vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -822,7 +781,7 @@ static unsigned char pontis_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1720_pontis_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1720_SUBDEVICE_PONTIS_MS300,</div><div class='ctx'> 		.name = "Pontis MS300",</div><div class='head'>diff --git a/sound/pci/ice1712/pontis.h b/sound/pci/ice1712/pontis.h<br/>index d0d1378b935c..bba01aeac7f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/pontis.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/pontis.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/pontis.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/pontis.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_PONTIS_H</div><div class='ctx'> #define __SOUND_PONTIS_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Pontis MS300 boards</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define PONTIS_DEVICE_DESC 	       "{Pontis,MS300},"</div><div class='head'>diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c<br/>index e36ddb94c382..cd7db2b65b51 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy192.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy192.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy192.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/prodigy192.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,30 +32,14 @@</div><div class='ctx'>  *		  Experimentally I found out that only a combination of</div><div class='ctx'>  *		  OCKS0=1, OCKS1=1 (128fs, 64fs output) and ice1724 -</div><div class='ctx'>  *		  VT1724_MT_I2S_MCLK_128X=0 (256fs input) yields correct</div><div class='del'>- *		  sampling rate. That means the the FPGA doubles the</div><div class='add'>+ *		  sampling rate. That means that the FPGA doubles the</div><div class='ctx'>  *		  MCK01 rate.</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='ctx'>  *      Copyright (c) 2003 Dimitromanolakis Apostolos &lt;apostol@cs.utoronto.ca&gt;</div><div class='ctx'>  *      Copyright (c) 2004 Kouichi ONO &lt;co2b@ceres.dti.ne.jp&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -99,7 +84,7 @@ static int stac9460_dac_mute(struct snd_ice1712 *ice, int idx,</div><div class='ctx'> 	new = (~mute &lt;&lt; 7 &amp; 0x80) | (old &amp; ~0x80);</div><div class='ctx'> 	change = (new != old);</div><div class='ctx'> 	if (change)</div><div class='del'>-		/*printk ("Volume register 0x%02x: 0x%02x\n", idx, new);*/</div><div class='add'>+		/* dev_dbg(ice-&gt;card-&gt;dev, "Volume register 0x%02x: 0x%02x\n", idx, new);*/</div><div class='ctx'> 		stac9460_put(ice, idx, new);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='hunk'>@@ -125,21 +110,19 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	struct prodigy192_spec *spec = ice-&gt;spec;</div><div class='del'>-	int idx, change;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='ctx'> 	if (kcontrol-&gt;private_value)</div><div class='ctx'> 		idx = STAC946X_MASTER_VOLUME;</div><div class='ctx'> 	else</div><div class='ctx'> 		idx  = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id) + STAC946X_LF_VOLUME;</div><div class='ctx'> 	/* due to possible conflicts with stac9460_set_rate_val, mutexing */</div><div class='del'>-	mutex_lock(&amp;spec-&gt;mute_mutex);</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;mute_mutex);</div><div class='ctx'> 	/*</div><div class='del'>-	printk(KERN_DEBUG "Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,</div><div class='add'>+	dev_dbg(ice-&gt;card-&gt;dev, "Mute put: reg 0x%02x, ctrl value: 0x%02x\n", idx,</div><div class='ctx'> 	       ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> 	*/</div><div class='del'>-	change = stac9460_dac_mute(ice, idx, ucontrol-&gt;value.integer.value[0]);</div><div class='del'>-	mutex_unlock(&amp;spec-&gt;mute_mutex);</div><div class='del'>-	return change;</div><div class='add'>+	return stac9460_dac_mute(ice, idx, ucontrol-&gt;value.integer.value[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -185,14 +168,9 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> 	tmp = stac9460_get(ice, idx);</div><div class='ctx'> 	ovol = 0x7f - (tmp &amp; 0x7f);</div><div class='ctx'> 	change = (ovol != nvol);</div><div class='del'>-	if (change) {</div><div class='del'>-		ovol =  (0x7f - nvol) | (tmp &amp; 0x80);</div><div class='del'>-		/*</div><div class='del'>-		printk(KERN_DEBUG "DAC Volume: reg 0x%02x: 0x%02x\n",</div><div class='del'>-		       idx, ovol);</div><div class='del'>-		*/</div><div class='add'>+	if (change)</div><div class='ctx'> 		stac9460_put(ice, idx, (0x7f - nvol) | (tmp &amp; 0x80));</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,17 +261,9 @@ static int stac9460_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el</div><div class='ctx'> static int stac9460_mic_sw_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	       			struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Line In", "Mic" };</div><div class='del'>-</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='add'>+	static const char * const texts[2] = { "Line In", "Mic" };</div><div class='ctx'> </div><div class='del'>-        return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -344,12 +314,12 @@ static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 		return;</div><div class='ctx'> 	/* change detected, setting master clock, muting first */</div><div class='ctx'> 	/* due to possible conflicts with mute controls - mutexing */</div><div class='del'>-	mutex_lock(&amp;spec-&gt;mute_mutex);</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;mute_mutex);</div><div class='ctx'> 	/* we have to remember current mute status for each DAC */</div><div class='ctx'> 	for (idx = 0; idx &lt; 7 ; ++idx)</div><div class='ctx'> 		changed[idx] = stac9460_dac_mute(ice,</div><div class='ctx'> 				STAC946X_MASTER_VOLUME + idx, 0);</div><div class='del'>-	/*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/</div><div class='add'>+	/*dev_dbg(ice-&gt;card-&gt;dev, "Rate change: %d, new MC: 0x%02x\n", rate, new);*/</div><div class='ctx'> 	stac9460_put(ice, STAC946X_MASTER_CLOCKING, new);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	/* unmuting - only originally unmuted dacs -</div><div class='hunk'>@@ -358,7 +328,6 @@ static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 		if (changed[idx])</div><div class='ctx'> 			stac9460_dac_mute(ice, STAC946X_MASTER_VOLUME + idx, 1);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;spec-&gt;mute_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -369,7 +338,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);</div><div class='ctx'>  * mixers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new stac_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new stac_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='hunk'>@@ -562,15 +531,9 @@ static unsigned char prodigy192_ak4114_read(void *private_data,</div><div class='ctx'> static int ak4114_input_sw_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	       			struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[2] = { "Toslink", "Coax" };</div><div class='add'>+	static const char * const texts[2] = { "Toslink", "Coax" };</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 2;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-        return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -607,7 +570,7 @@ static int ak4114_input_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new ak4114_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new ak4114_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "MIODIO IEC958 Capture Input",</div><div class='hunk'>@@ -666,13 +629,12 @@ static void stac9460_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static void stac9460_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(ice-&gt;card, "stac9460_codec", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ice, stac9460_proc_regs_read);</div><div class='add'>+	snd_card_ro_proc_new(ice-&gt;card, "stac9460_codec", ice,</div><div class='add'>+			     stac9460_proc_regs_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit prodigy192_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int prodigy192_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct prodigy192_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -728,7 +690,7 @@ static int prodigy192_miodio_exists(struct snd_ice1712 *ice)</div><div class='ctx'> /*</div><div class='ctx'>  * initialize the chip</div><div class='ctx'>  */</div><div class='del'>-static int __devinit prodigy192_init(struct snd_ice1712 *ice)</div><div class='add'>+static int prodigy192_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned short stac_inits_prodigy[] = {</div><div class='ctx'> 		STAC946X_RESET, 0,</div><div class='hunk'>@@ -769,13 +731,12 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		/* from this moment if err = 0 then</div><div class='ctx'> 		 * spec-&gt;ak4114 should not be null</div><div class='ctx'> 		 */</div><div class='del'>-		snd_printdd("AK4114 initialized with status %d\n", err);</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev,</div><div class='add'>+			"AK4114 initialized with status %d\n", err);</div><div class='ctx'> 	} else</div><div class='del'>-		snd_printdd("AK4114 not found\n");</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		dev_dbg(ice-&gt;card-&gt;dev, "AK4114 not found\n");</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -784,7 +745,7 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice)</div><div class='ctx'>  * hence the driver needs to sets up it properly.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static unsigned char prodigy71_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char prodigy71_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x6a,	/* 49MHz crystal, mpu401,</div><div class='ctx'> 					 * spdif-in+ 1 stereo ADC,</div><div class='ctx'> 					 * 3 stereo DACs</div><div class='hunk'>@@ -808,7 +769,7 @@ static unsigned char prodigy71_eeprom[] __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_PRODIGY192VE,</div><div class='ctx'> 		.name = "Audiotrak Prodigy 192",</div><div class='head'>diff --git a/sound/pci/ice1712/prodigy192.h b/sound/pci/ice1712/prodigy192.h<br/>index 16a53b459c72..7bfd769ba982 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy192.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy192.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy192.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/prodigy192.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_PRODIGY192_H</div><div class='ctx'> #define __SOUND_PRODIGY192_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c<br/>index 6a9fee3ee78f..eac233093865 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy_hifi.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy_hifi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy_hifi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/prodigy_hifi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,25 +8,9 @@</div><div class='ctx'>  *      Copyright (c) 2007 Julian Scheel &lt;julian@jusst.de&gt;</div><div class='ctx'>  *      Copyright (c) 2007 allank</div><div class='ctx'>  *      Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -283,7 +268,7 @@ static int ak4396_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> 	</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		if (ucontrol-&gt;value.integer.value[i] != spec-&gt;vol[i]) {</div><div class='ctx'> 			spec-&gt;vol[i] = ucontrol-&gt;value.integer.value[i];</div><div class='hunk'>@@ -292,13 +277,13 @@ static int ak4396_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);</div><div class='add'>+static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new prodigy_hd2_controls[] = {</div><div class='ctx'>     {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='hunk'>@@ -307,33 +292,14 @@ static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = {</div><div class='ctx'> 	.info = ak4396_dac_vol_info,</div><div class='ctx'> 	.get = ak4396_dac_vol_get,</div><div class='ctx'> 	.put = ak4396_dac_vol_put,</div><div class='del'>-	.tlv = { .p = db_scale_wm_dac },</div><div class='add'>+	.tlv = { .p = ak4396_db_scale },</div><div class='ctx'>     },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* --------------- */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Logarithmic volume values for WM87*6</div><div class='del'>- * Computed as 20 * Log10(255 / x)</div><div class='del'>- */</div><div class='del'>-static const unsigned char wm_vol[256] = {</div><div class='del'>-	127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,</div><div class='del'>-	23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,</div><div class='del'>-	17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,</div><div class='del'>-	13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,</div><div class='del'>-	11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,</div><div class='del'>-	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,</div><div class='del'>-	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,</div><div class='del'>-	5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3,</div><div class='del'>-	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,</div><div class='del'>-	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define WM_VOL_MAX	(sizeof(wm_vol) - 1)</div><div class='add'>+#define WM_VOL_MAX	255</div><div class='ctx'> #define WM_VOL_MUTE	0x8000</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -409,7 +375,7 @@ static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 	struct prodigy_hifi_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int i, idx, change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		if (ucontrol-&gt;value.integer.value[i] != spec-&gt;vol[2 + i]) {</div><div class='ctx'> 			idx = WM_DAC_ATTEN_L + i;</div><div class='hunk'>@@ -419,7 +385,6 @@ static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -461,7 +426,7 @@ static int wm8766_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> </div><div class='ctx'> 	voices = kcontrol-&gt;private_value &gt;&gt; 8;</div><div class='ctx'> 	ofs = kcontrol-&gt;private_value &amp; 0xff;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; voices; i++) {</div><div class='ctx'> 		if (ucontrol-&gt;value.integer.value[i] != spec-&gt;vol[ofs + i]) {</div><div class='ctx'> 			idx = WM8766_LDA1 + ofs + i;</div><div class='hunk'>@@ -472,7 +437,6 @@ static int wm8766_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -507,7 +471,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct prodigy_hifi_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int ch, change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (ch = 0; ch &lt; 2; ch++) {</div><div class='ctx'> 		if (ucontrol-&gt;value.integer.value[ch] != spec-&gt;master[ch]) {</div><div class='ctx'> 			spec-&gt;master[ch] = ucontrol-&gt;value.integer.value[ch];</div><div class='hunk'>@@ -527,7 +491,6 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);	</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -537,7 +500,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int wm_adc_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char* texts[32] = {</div><div class='add'>+	static const char * const texts[32] = {</div><div class='ctx'> 		"NULL", WM_AIN1, WM_AIN2, WM_AIN1 "+" WM_AIN2,</div><div class='ctx'> 		WM_AIN3, WM_AIN1 "+" WM_AIN3, WM_AIN2 "+" WM_AIN3,</div><div class='ctx'> 		WM_AIN1 "+" WM_AIN2 "+" WM_AIN3,</div><div class='hunk'>@@ -560,14 +523,7 @@ static int wm_adc_mux_enum_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		WM_AIN1 "+" WM_AIN2 "+" WM_AIN3 "+" WM_AIN4 "+" WM_AIN5</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 32;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 31)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 31;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 32, texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int wm_adc_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -575,9 +531,8 @@ static int wm_adc_mux_enum_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = wm_get(ice, WM_ADC_MUX) &amp; 0x1f;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = wm_get(ice, WM_ADC_MUX) &amp; 0x1f;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -588,14 +543,13 @@ static int wm_adc_mux_enum_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short oval, nval;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	oval = wm_get(ice, WM_ADC_MUX);</div><div class='del'>-	nval = (oval &amp; 0xe0) | ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	nval = (oval &amp; 0xe0) | ucontrol-&gt;value.enumerated.item[0];</div><div class='ctx'> 	if (nval != oval) {</div><div class='ctx'> 		wm_put(ice, WM_ADC_MUX, nval);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -626,13 +580,12 @@ static int wm_adc_vol_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		val = wm_get(ice, WM_ADC_ATTEN_L + i) &amp; 0xff;</div><div class='ctx'> 		val = val &gt; ADC_MIN ? (val - ADC_MIN) : 0;</div><div class='ctx'> 		ucontrol-&gt;value.integer.value[i] = val;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -643,7 +596,7 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short ovol, nvol;</div><div class='ctx'> 	int i, idx, change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++) {</div><div class='ctx'> 		nvol = ucontrol-&gt;value.integer.value[i];</div><div class='ctx'> 		nvol = nvol ? (nvol + ADC_MIN) : 0;</div><div class='hunk'>@@ -654,7 +607,6 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 			change = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -669,10 +621,9 @@ static int wm_adc_mux_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int bit = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		(wm_get(ice, WM_ADC_MUX) &amp; (1 &lt;&lt; bit)) ? 1 : 0;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -684,7 +635,7 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short oval, nval;</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	nval = oval = wm_get(ice, WM_ADC_MUX);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		nval |= (1 &lt;&lt; bit);</div><div class='hunk'>@@ -694,7 +645,6 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		wm_put(ice, WM_ADC_MUX, nval);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -708,10 +658,9 @@ static int wm_bypass_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 		(wm_get(ice, WM_OUT_MUX) &amp; 0x04) ? 1 : 0;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -722,7 +671,7 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short val, oval;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	val = oval = wm_get(ice, WM_OUT_MUX);</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='ctx'> 		val |= 0x04;</div><div class='hunk'>@@ -732,7 +681,6 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		wm_put(ice, WM_OUT_MUX, val);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -746,10 +694,9 @@ static int wm_chswap_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] =</div><div class='ctx'> 			(wm_get(ice, WM_DAC_CTRL1) &amp; 0xf0) != 0x90;</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -760,7 +707,7 @@ static int wm_chswap_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	unsigned short val, oval;</div><div class='ctx'> 	int change = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	oval = wm_get(ice, WM_DAC_CTRL1);</div><div class='ctx'> 	val = oval &amp; 0x0f;</div><div class='ctx'> 	if (ucontrol-&gt;value.integer.value[0])</div><div class='hunk'>@@ -772,7 +719,6 @@ static int wm_chswap_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		wm_put_nocache(ice, WM_DAC_CTRL1, val);</div><div class='ctx'> 		change = 1;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -781,7 +727,7 @@ static int wm_chswap_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>  * mixers</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new prodigy_hifi_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new prodigy_hifi_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='hunk'>@@ -904,14 +850,14 @@ static void wm_proc_regs_write(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_ice1712 *ice = entry-&gt;private_data;</div><div class='ctx'> 	char line[64];</div><div class='ctx'> 	unsigned int reg, val;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='ctx'> 		if (sscanf(line, "%x %x", &amp;reg, &amp;val) != 2)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (reg &lt;= 0x17 &amp;&amp; val &lt;= 0xffff)</div><div class='ctx'> 			wm_put(ice, reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wm_proc_regs_read(struct snd_info_entry *entry,</div><div class='hunk'>@@ -920,25 +866,20 @@ static void wm_proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> 	struct snd_ice1712 *ice = entry-&gt;private_data;</div><div class='ctx'> 	int reg, val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	for (reg = 0; reg &lt;= 0x17; reg++) {</div><div class='ctx'> 		val = wm_get(ice, reg);</div><div class='ctx'> 		snd_iprintf(buffer, "%02x = %04x\n", reg, val);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void wm_proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(ice-&gt;card, "wm_codec", &amp;entry)) {</div><div class='del'>-		snd_info_set_text_ops(entry, ice, wm_proc_regs_read);</div><div class='del'>-		entry-&gt;mode |= S_IWUSR;</div><div class='del'>-		entry-&gt;c.text.write = wm_proc_regs_write;</div><div class='del'>-	}</div><div class='add'>+	snd_card_rw_proc_new(ice-&gt;card, "wm_codec", ice, wm_proc_regs_read,</div><div class='add'>+			     wm_proc_regs_write);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit prodigy_hifi_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int prodigy_hifi_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -955,7 +896,7 @@ static int __devinit prodigy_hifi_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit prodigy_hd2_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int prodigy_hd2_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -972,13 +913,32 @@ static int __devinit prodigy_hd2_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void wm8766_init(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	static const unsigned short wm8766_inits[] = {</div><div class='add'>+		WM8766_RESET,	   0x0000,</div><div class='add'>+		WM8766_DAC_CTRL,	0x0120,</div><div class='add'>+		WM8766_INT_CTRL,	0x0022, /* I2S Normal Mode, 24 bit */</div><div class='add'>+		WM8766_DAC_CTRL2,       0x0001,</div><div class='add'>+		WM8766_DAC_CTRL3,       0x0080,</div><div class='add'>+		WM8766_LDA1,	    0x0100,</div><div class='add'>+		WM8766_LDA2,	    0x0100,</div><div class='add'>+		WM8766_LDA3,	    0x0100,</div><div class='add'>+		WM8766_RDA1,	    0x0100,</div><div class='add'>+		WM8766_RDA2,	    0x0100,</div><div class='add'>+		WM8766_RDA3,	    0x0100,</div><div class='add'>+		WM8766_MUTE1,	   0x0000,</div><div class='add'>+		WM8766_MUTE2,	   0x0000,</div><div class='add'>+	};</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * initialize the chip</div><div class='del'>- */</div><div class='del'>-static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8766_inits); i += 2)</div><div class='add'>+		wm8766_spi_write(ice, wm8766_inits[i], wm8766_inits[i + 1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wm8776_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	static unsigned short wm_inits[] = {</div><div class='add'>+	static const unsigned short wm8776_inits[] = {</div><div class='ctx'> 		/* These come first to reduce init pop noise */</div><div class='ctx'> 		WM_ADC_MUX,	0x0003,	/* ADC mute */</div><div class='ctx'> 		/* 0x00c0 replaced by 0x0003 */</div><div class='hunk'>@@ -989,7 +949,75 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		WM_POWERDOWN,	0x0008,	/* All power-up except HP */</div><div class='ctx'> 		WM_RESET,	0x0000,	/* reset */</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short wm_inits2[] = {</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8776_inits); i += 2)</div><div class='add'>+		wm_put(ice, wm8776_inits[i], wm8776_inits[i + 1]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int prodigy_hifi_resume(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	static const unsigned short wm8776_reinit_registers[] = {</div><div class='add'>+		WM_MASTER_CTRL,</div><div class='add'>+		WM_DAC_INT,</div><div class='add'>+		WM_ADC_INT,</div><div class='add'>+		WM_OUT_MUX,</div><div class='add'>+		WM_HP_ATTEN_L,</div><div class='add'>+		WM_HP_ATTEN_R,</div><div class='add'>+		WM_PHASE_SWAP,</div><div class='add'>+		WM_DAC_CTRL2,</div><div class='add'>+		WM_ADC_ATTEN_L,</div><div class='add'>+		WM_ADC_ATTEN_R,</div><div class='add'>+		WM_ALC_CTRL1,</div><div class='add'>+		WM_ALC_CTRL2,</div><div class='add'>+		WM_ALC_CTRL3,</div><div class='add'>+		WM_NOISE_GATE,</div><div class='add'>+		WM_ADC_MUX,</div><div class='add'>+		/* no DAC attenuation here */</div><div class='add'>+	};</div><div class='add'>+	struct prodigy_hifi_spec *spec = ice-&gt;spec;</div><div class='add'>+	int i, ch;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	/* reinitialize WM8776 and re-apply old register values */</div><div class='add'>+	wm8776_init(ice);</div><div class='add'>+	schedule_timeout_uninterruptible(1);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8776_reinit_registers); i++)</div><div class='add'>+		wm_put(ice, wm8776_reinit_registers[i],</div><div class='add'>+		       wm_get(ice, wm8776_reinit_registers[i]));</div><div class='add'>+</div><div class='add'>+	/* reinitialize WM8766 and re-apply volumes for all DACs */</div><div class='add'>+	wm8766_init(ice);</div><div class='add'>+	for (ch = 0; ch &lt; 2; ch++) {</div><div class='add'>+		wm_set_vol(ice, WM_DAC_ATTEN_L + ch,</div><div class='add'>+			   spec-&gt;vol[2 + ch], spec-&gt;master[ch]);</div><div class='add'>+</div><div class='add'>+		wm8766_set_vol(ice, WM8766_LDA1 + ch,</div><div class='add'>+			       spec-&gt;vol[0 + ch], spec-&gt;master[ch]);</div><div class='add'>+</div><div class='add'>+		wm8766_set_vol(ice, WM8766_LDA2 + ch,</div><div class='add'>+			       spec-&gt;vol[4 + ch], spec-&gt;master[ch]);</div><div class='add'>+</div><div class='add'>+		wm8766_set_vol(ice, WM8766_LDA3 + ch,</div><div class='add'>+			       spec-&gt;vol[6 + ch], spec-&gt;master[ch]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* unmute WM8776 DAC */</div><div class='add'>+	wm_put(ice, WM_DAC_MUTE, 0x00);</div><div class='add'>+	wm_put(ice, WM_DAC_CTRL1, 0x90);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * initialize the chip</div><div class='add'>+ */</div><div class='add'>+static int prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	static const unsigned short wm8776_defaults[] = {</div><div class='ctx'> 		WM_MASTER_CTRL,  0x0022, /* 256fs, slave mode */</div><div class='ctx'> 		WM_DAC_INT,	0x0022,	/* I2S, normal polarity, 24bit */</div><div class='ctx'> 		WM_ADC_INT,	0x0022,	/* I2S, normal polarity, 24bit */</div><div class='hunk'>@@ -1017,22 +1045,6 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		WM_DAC_MUTE,	0x0000,	/* DAC unmute */</div><div class='ctx'> 		WM_ADC_MUX,	0x0003,	/* ADC unmute, both CD/Line On */</div><div class='ctx'> 	};</div><div class='del'>-	static unsigned short wm8766_inits[] = {</div><div class='del'>-		WM8766_RESET,	   0x0000,</div><div class='del'>-		WM8766_DAC_CTRL,	0x0120,</div><div class='del'>-		WM8766_INT_CTRL,	0x0022, /* I2S Normal Mode, 24 bit */</div><div class='del'>-		WM8766_DAC_CTRL2,       0x0001,</div><div class='del'>-		WM8766_DAC_CTRL3,       0x0080,</div><div class='del'>-		WM8766_LDA1,	    0x0100,</div><div class='del'>-		WM8766_LDA2,	    0x0100,</div><div class='del'>-		WM8766_LDA3,	    0x0100,</div><div class='del'>-		WM8766_RDA1,	    0x0100,</div><div class='del'>-		WM8766_RDA2,	    0x0100,</div><div class='del'>-		WM8766_RDA3,	    0x0100,</div><div class='del'>-		WM8766_MUTE1,	   0x0000,</div><div class='del'>-		WM8766_MUTE2,	   0x0000,</div><div class='del'>-	};</div><div class='del'>-</div><div class='ctx'> 	struct prodigy_hifi_spec *spec;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1046,7 +1058,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	* don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten</div><div class='ctx'> 	*/</div><div class='ctx'> 	ice-&gt;gpio.saved[0] = 0;</div><div class='del'>-	/* to remeber the register values */</div><div class='add'>+	/* to remember the register values */</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);</div><div class='ctx'> 	if (! ice-&gt;akm)</div><div class='hunk'>@@ -1059,16 +1071,17 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	ice-&gt;spec = spec;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize WM8776 codec */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm_inits); i += 2)</div><div class='del'>-		wm_put(ice, wm_inits[i], wm_inits[i+1]);</div><div class='add'>+	wm8776_init(ice);</div><div class='ctx'> 	schedule_timeout_uninterruptible(1);</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm_inits2); i += 2)</div><div class='del'>-		wm_put(ice, wm_inits2[i], wm_inits2[i+1]);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(wm8776_defaults); i += 2)</div><div class='add'>+		wm_put(ice, wm8776_defaults[i], wm8776_defaults[i + 1]);</div><div class='ctx'> </div><div class='del'>-	/* initialize WM8766 codec */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(wm8766_inits); i += 2)</div><div class='del'>-		wm8766_spi_write(ice, wm8766_inits[i], wm8766_inits[i+1]);</div><div class='add'>+	wm8766_init(ice);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	ice-&gt;pm_resume = &amp;prodigy_hifi_resume;</div><div class='add'>+	ice-&gt;pm_suspend_enabled = 1;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1079,7 +1092,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)</div><div class='ctx'>  */</div><div class='ctx'> static void ak4396_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	static unsigned short ak4396_inits[] = {</div><div class='add'>+	static const unsigned short ak4396_inits[] = {</div><div class='ctx'> 		AK4396_CTRL1,	   0x87,   /* I2S Normal Mode, 24 bit */</div><div class='ctx'> 		AK4396_CTRL2,	   0x02,</div><div class='ctx'> 		AK4396_CTRL3,	   0x00, </div><div class='hunk'>@@ -1099,22 +1112,22 @@ static void ak4396_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		ak4396_write(ice, ak4396_inits[i], ak4396_inits[i+1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int prodigy_hd2_resume(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	/* initialize ak4396 codec and restore previous mixer volumes */</div><div class='ctx'> 	struct prodigy_hifi_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int i;</div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	ak4396_init(ice);</div><div class='ctx'> 	for (i = 0; i &lt; 2; i++)</div><div class='ctx'> 		ak4396_write(ice, AK4396_LCH_ATT + i, spec-&gt;vol[i] &amp; 0xff);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)</div><div class='add'>+static int prodigy_hd2_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct prodigy_hifi_spec *spec;</div><div class='ctx'> </div><div class='hunk'>@@ -1128,7 +1141,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	* don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten</div><div class='ctx'> 	*/</div><div class='ctx'> 	ice-&gt;gpio.saved[0] = 0;</div><div class='del'>-	/* to remeber the register values */</div><div class='add'>+	/* to remember the register values */</div><div class='ctx'> </div><div class='ctx'> 	ice-&gt;akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);</div><div class='ctx'> 	if (! ice-&gt;akm)</div><div class='hunk'>@@ -1140,7 +1153,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	ice-&gt;spec = spec;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> 	ice-&gt;pm_resume = &amp;prodigy_hd2_resume;</div><div class='ctx'> 	ice-&gt;pm_suspend_enabled = 1;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1151,7 +1164,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static unsigned char prodigy71hifi_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char prodigy71hifi_eeprom[] = {</div><div class='ctx'> 	0x4b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	0x80,   /* ACLINK: I2S */</div><div class='ctx'> 	0xfc,   /* I2S: vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -1167,7 +1180,7 @@ static unsigned char prodigy71hifi_eeprom[] __devinitdata = {</div><div class='ctx'> 	0x00,   /* GPIO_STATE2 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char prodigyhd2_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char prodigyhd2_eeprom[] = {</div><div class='ctx'> 	0x4b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	0x80,   /* ACLINK: I2S */</div><div class='ctx'> 	0xfc,   /* I2S: vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -1183,7 +1196,7 @@ static unsigned char prodigyhd2_eeprom[] __devinitdata = {</div><div class='ctx'> 	0x00,   /* GPIO_STATE2 */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char fortissimo4_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char fortissimo4_eeprom[] = {</div><div class='ctx'> 	0x43,   /* SYSCONF: clock 512, ADC, 4DACs */	</div><div class='ctx'> 	0x80,   /* ACLINK: I2S */</div><div class='ctx'> 	0xfc,   /* I2S: vol, 96k, 24bit, 192k */</div><div class='hunk'>@@ -1200,7 +1213,7 @@ static unsigned char fortissimo4_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_prodigy_hifi_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_prodigy_hifi_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_PRODIGY_HIFI,</div><div class='ctx'> 		.name = "Audiotrak Prodigy 7.1 HiFi",</div><div class='head'>diff --git a/sound/pci/ice1712/prodigy_hifi.h b/sound/pci/ice1712/prodigy_hifi.h<br/>index a4415d455d9e..f0e88396de79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy_hifi.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/prodigy_hifi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/prodigy_hifi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/prodigy_hifi.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_PRODIGY_HIFI_H</div><div class='ctx'> #define __SOUND_PRODIGY_HIFI_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for Audiotrak Prodigy Hifi</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define PRODIGY_HIFI_DEVICE_DESC 	       "{Audiotrak,Prodigy 7.1 HIFI},"\</div><div class='head'>diff --git a/sound/pci/ice1712/psc724.c b/sound/pci/ice1712/psc724.c<br/>new file mode 100644<br/>index 000000000000..0818e42c94ca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/psc724.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/psc724.c</a></div><div class='hunk'>@@ -0,0 +1,447 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='add'>+ *</div><div class='add'>+ *   Lowlevel functions for Philips PSC724 Ultimate Edge</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (c) 2012 Ondrej Zary &lt;linux@rainbow-software.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ice1712.h"</div><div class='add'>+#include "envy24ht.h"</div><div class='add'>+#include "psc724.h"</div><div class='add'>+#include "wm8766.h"</div><div class='add'>+#include "wm8776.h"</div><div class='add'>+</div><div class='add'>+struct psc724_spec {</div><div class='add'>+	struct snd_wm8766 wm8766;</div><div class='add'>+	struct snd_wm8776 wm8776;</div><div class='add'>+	bool mute_all, jack_detect;</div><div class='add'>+	struct snd_ice1712 *ice;</div><div class='add'>+	struct delayed_work hp_work;</div><div class='add'>+	bool hp_connected;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/****************************************************************************/</div><div class='add'>+/*  PHILIPS PSC724 ULTIMATE EDGE                                            */</div><div class='add'>+/****************************************************************************/</div><div class='add'>+/*</div><div class='add'>+ *  VT1722 (Envy24GT) - 6 outputs, 4 inputs (only 2 used), 24-bit/96kHz</div><div class='add'>+ *</div><div class='add'>+ *  system configuration ICE_EEP2_SYSCONF=0x42</div><div class='add'>+ *    XIN1 49.152MHz</div><div class='add'>+ *    no MPU401</div><div class='add'>+ *    one stereo ADC, no S/PDIF receiver</div><div class='add'>+ *    three stereo DACs (FRONT, REAR, CENTER+LFE)</div><div class='add'>+ *</div><div class='add'>+ *  AC-Link configuration ICE_EEP2_ACLINK=0x80</div><div class='add'>+ *    use I2S, not AC97</div><div class='add'>+ *</div><div class='add'>+ *  I2S converters feature ICE_EEP2_I2S=0x30</div><div class='add'>+ *    I2S codec has no volume/mute control feature (bug!)</div><div class='add'>+ *    I2S codec does not support 96KHz or 192KHz (bug!)</div><div class='add'>+ *    I2S codec 24bits</div><div class='add'>+ *</div><div class='add'>+ *  S/PDIF configuration ICE_EEP2_SPDIF=0xc1</div><div class='add'>+ *    Enable integrated S/PDIF transmitter</div><div class='add'>+ *    internal S/PDIF out implemented</div><div class='add'>+ *    No S/PDIF input</div><div class='add'>+ *    External S/PDIF out implemented</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * ** connected chips **</div><div class='add'>+ *</div><div class='add'>+ *  WM8776</div><div class='add'>+ *     2-channel DAC used for main output and stereo ADC (with 10-channel MUX)</div><div class='add'>+ *     AIN1: LINE IN, AIN2: CD/VIDEO, AIN3: AUX, AIN4: Front MIC, AIN5: Rear MIC</div><div class='add'>+ *     Controlled by I2C using VT1722 I2C interface:</div><div class='add'>+ *          MODE (pin16) -- GND</div><div class='add'>+ *          CE   (pin17) -- GND  I2C mode (address=0x34)</div><div class='add'>+ *          DI   (pin18) -- SDA  (VT1722 pin70)</div><div class='add'>+ *          CL   (pin19) -- SCLK (VT1722 pin71)</div><div class='add'>+ *</div><div class='add'>+ *  WM8766</div><div class='add'>+ *      6-channel DAC used for rear &amp; center/LFE outputs (only 4 channels used)</div><div class='add'>+ *      Controlled by SPI using VT1722 GPIO pins:</div><div class='add'>+ *          MODE   (pin 1) -- GPIO19 (VT1722 pin99)</div><div class='add'>+ *          ML/I2S (pin11) -- GPIO18 (VT1722 pin98)</div><div class='add'>+ *          MC/IWL (pin12) -- GPIO17 (VT1722 pin97)</div><div class='add'>+ *          MD/DM  (pin13) -- GPIO16 (VT1722 pin96)</div><div class='add'>+ *          MUTE   (pin14) -- GPIO20 (VT1722 pin101)</div><div class='add'>+ *</div><div class='add'>+ *  GPIO14 is used as input for headphone jack detection (1 = connected)</div><div class='add'>+ *  GPIO22 is used as MUTE ALL output, grounding all 6 channels</div><div class='add'>+ *</div><div class='add'>+ * ** output pins and device names **</div><div class='add'>+ *</div><div class='add'>+ *   5.1ch name -- output connector color -- device (-D option)</div><div class='add'>+ *</div><div class='add'>+ *      FRONT 2ch                  -- green  -- plughw:0,0</div><div class='add'>+ *      CENTER(Lch) SUBWOOFER(Rch) -- orange -- plughw:0,2,0</div><div class='add'>+ *      REAR 2ch                   -- black  -- plughw:0,2,1</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* codec access low-level functions */</div><div class='add'>+</div><div class='add'>+#define GPIO_HP_JACK	(1 &lt;&lt; 14)</div><div class='add'>+#define GPIO_MUTE_SUR	(1 &lt;&lt; 20)</div><div class='add'>+#define GPIO_MUTE_ALL	(1 &lt;&lt; 22)</div><div class='add'>+</div><div class='add'>+#define JACK_INTERVAL	1000</div><div class='add'>+</div><div class='add'>+#define PSC724_SPI_DELAY 1</div><div class='add'>+</div><div class='add'>+#define PSC724_SPI_DATA	(1 &lt;&lt; 16)</div><div class='add'>+#define PSC724_SPI_CLK	(1 &lt;&lt; 17)</div><div class='add'>+#define PSC724_SPI_LOAD	(1 &lt;&lt; 18)</div><div class='add'>+#define PSC724_SPI_MASK	(PSC724_SPI_DATA | PSC724_SPI_CLK | PSC724_SPI_LOAD)</div><div class='add'>+</div><div class='add'>+static void psc724_wm8766_write(struct snd_wm8766 *wm, u16 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = container_of(wm, struct psc724_spec, wm8766);</div><div class='add'>+	struct snd_ice1712 *ice = spec-&gt;ice;</div><div class='add'>+	u32 st, bits;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	snd_ice1712_save_gpio_status(ice);</div><div class='add'>+</div><div class='add'>+	st = ((addr &amp; 0x7f) &lt;&lt; 9) | (data &amp; 0x1ff);</div><div class='add'>+	snd_ice1712_gpio_set_dir(ice, ice-&gt;gpio.direction | PSC724_SPI_MASK);</div><div class='add'>+	snd_ice1712_gpio_set_mask(ice, ice-&gt;gpio.write_mask &amp; ~PSC724_SPI_MASK);</div><div class='add'>+	bits = snd_ice1712_gpio_read(ice) &amp; ~PSC724_SPI_MASK;</div><div class='add'>+	snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+		udelay(PSC724_SPI_DELAY);</div><div class='add'>+		bits &amp;= ~PSC724_SPI_CLK;</div><div class='add'>+		/* MSB first */</div><div class='add'>+		st &lt;&lt;= 1;</div><div class='add'>+		if (st &amp; 0x10000)</div><div class='add'>+			bits |= PSC724_SPI_DATA;</div><div class='add'>+		else</div><div class='add'>+			bits &amp;= ~PSC724_SPI_DATA;</div><div class='add'>+		snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+		/* CLOCK high */</div><div class='add'>+		udelay(PSC724_SPI_DELAY);</div><div class='add'>+		bits |= PSC724_SPI_CLK;</div><div class='add'>+		snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+	}</div><div class='add'>+	/* LOAD high */</div><div class='add'>+	udelay(PSC724_SPI_DELAY);</div><div class='add'>+	bits |= PSC724_SPI_LOAD;</div><div class='add'>+	snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+	/* LOAD low, DATA and CLOCK high */</div><div class='add'>+	udelay(PSC724_SPI_DELAY);</div><div class='add'>+	bits |= (PSC724_SPI_DATA | PSC724_SPI_CLK);</div><div class='add'>+	snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+</div><div class='add'>+	snd_ice1712_restore_gpio_status(ice);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psc724_wm8776_write(struct snd_wm8776 *wm, u8 addr, u8 data)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = container_of(wm, struct psc724_spec, wm8776);</div><div class='add'>+</div><div class='add'>+	snd_vt1724_write_i2c(spec-&gt;ice, 0x34, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mute all */</div><div class='add'>+</div><div class='add'>+static void psc724_set_master_switch(struct snd_ice1712 *ice, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned int bits = snd_ice1712_gpio_read(ice);</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;mute_all = !on;</div><div class='add'>+	if (on)</div><div class='add'>+		bits &amp;= ~(GPIO_MUTE_ALL | GPIO_MUTE_SUR);</div><div class='add'>+	else</div><div class='add'>+		bits |= GPIO_MUTE_ALL | GPIO_MUTE_SUR;</div><div class='add'>+	snd_ice1712_gpio_write(ice, bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psc724_get_master_switch(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return !spec-&gt;mute_all;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* jack detection */</div><div class='add'>+</div><div class='add'>+static void psc724_set_jack_state(struct snd_ice1712 *ice, bool hp_connected)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	u16 power = spec-&gt;wm8776.regs[WM8776_REG_PWRDOWN] &amp; ~WM8776_PWR_HPPD;</div><div class='add'>+</div><div class='add'>+	psc724_set_master_switch(ice, !hp_connected);</div><div class='add'>+	if (!hp_connected)</div><div class='add'>+		power |= WM8776_PWR_HPPD;</div><div class='add'>+	snd_wm8776_set_power(&amp;spec-&gt;wm8776, power);</div><div class='add'>+	spec-&gt;hp_connected = hp_connected;</div><div class='add'>+	/* notify about master speaker mute change */</div><div class='add'>+	kctl = snd_ctl_find_id_mixer(ice-&gt;card,</div><div class='add'>+				     "Master Speakers Playback Switch");</div><div class='add'>+	if (kctl)</div><div class='add'>+		snd_ctl_notify(ice-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='add'>+	/* and headphone mute change */</div><div class='add'>+	kctl = snd_ctl_find_id_mixer(ice-&gt;card,</div><div class='add'>+				     spec-&gt;wm8776.ctl[WM8776_CTL_HP_SW].name);</div><div class='add'>+	if (kctl)</div><div class='add'>+		snd_ctl_notify(ice-&gt;card, SNDRV_CTL_EVENT_MASK_VALUE, &amp;kctl-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psc724_update_hp_jack_state(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = container_of(work, struct psc724_spec,</div><div class='add'>+						hp_work.work);</div><div class='add'>+	struct snd_ice1712 *ice = spec-&gt;ice;</div><div class='add'>+	bool hp_connected = snd_ice1712_gpio_read(ice) &amp; GPIO_HP_JACK;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;spec-&gt;hp_work, msecs_to_jiffies(JACK_INTERVAL));</div><div class='add'>+	if (hp_connected == spec-&gt;hp_connected)</div><div class='add'>+		return;</div><div class='add'>+	psc724_set_jack_state(ice, hp_connected);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psc724_set_jack_detection(struct snd_ice1712 *ice, bool on)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (spec-&gt;jack_detect == on)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spec-&gt;jack_detect = on;</div><div class='add'>+	if (on) {</div><div class='add'>+		bool hp_connected = snd_ice1712_gpio_read(ice) &amp; GPIO_HP_JACK;</div><div class='add'>+		psc724_set_jack_state(ice, hp_connected);</div><div class='add'>+		schedule_delayed_work(&amp;spec-&gt;hp_work,</div><div class='add'>+					msecs_to_jiffies(JACK_INTERVAL));</div><div class='add'>+	} else</div><div class='add'>+		cancel_delayed_work_sync(&amp;spec-&gt;hp_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool psc724_get_jack_detection(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	return spec-&gt;jack_detect;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mixer controls */</div><div class='add'>+</div><div class='add'>+struct psc724_control {</div><div class='add'>+	const char *name;</div><div class='add'>+	void (*set)(struct snd_ice1712 *ice, bool on);</div><div class='add'>+	bool (*get)(struct snd_ice1712 *ice);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct psc724_control psc724_cont[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "Master Speakers Playback Switch",</div><div class='add'>+		.set = psc724_set_master_switch,</div><div class='add'>+		.get = psc724_get_master_switch,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "Headphone Jack Detection Playback Switch",</div><div class='add'>+		.set = psc724_set_jack_detection,</div><div class='add'>+		.get = psc724_get_jack_detection,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int psc724_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = psc724_cont[n].get(ice);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int psc724_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	psc724_cont[n].set(ice, ucontrol-&gt;value.integer.value[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *front_volume	= "Front Playback Volume";</div><div class='add'>+static const char *front_switch	= "Front Playback Switch";</div><div class='add'>+static const char *front_zc	= "Front Zero Cross Detect Playback Switch";</div><div class='add'>+static const char *front_izd	= "Front Infinite Zero Detect Playback Switch";</div><div class='add'>+static const char *front_phase	= "Front Phase Invert Playback Switch";</div><div class='add'>+static const char *front_deemph	= "Front Deemphasis Playback Switch";</div><div class='add'>+static const char *ain1_switch	= "Line Capture Switch";</div><div class='add'>+static const char *ain2_switch	= "CD Capture Switch";</div><div class='add'>+static const char *ain3_switch	= "AUX Capture Switch";</div><div class='add'>+static const char *ain4_switch	= "Front Mic Capture Switch";</div><div class='add'>+static const char *ain5_switch	= "Rear Mic Capture Switch";</div><div class='add'>+static const char *rear_volume	= "Surround Playback Volume";</div><div class='add'>+static const char *clfe_volume	= "CLFE Playback Volume";</div><div class='add'>+static const char *rear_switch	= "Surround Playback Switch";</div><div class='add'>+static const char *clfe_switch	= "CLFE Playback Switch";</div><div class='add'>+static const char *rear_phase	= "Surround Phase Invert Playback Switch";</div><div class='add'>+static const char *clfe_phase	= "CLFE Phase Invert Playback Switch";</div><div class='add'>+static const char *rear_deemph	= "Surround Deemphasis Playback Switch";</div><div class='add'>+static const char *clfe_deemph	= "CLFE Deemphasis Playback Switch";</div><div class='add'>+static const char *rear_clfe_izd = "Rear Infinite Zero Detect Playback Switch";</div><div class='add'>+static const char *rear_clfe_zc	= "Rear Zero Cross Detect Playback Switch";</div><div class='add'>+</div><div class='add'>+static int psc724_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new cont;</div><div class='add'>+	struct snd_kcontrol *ctl;</div><div class='add'>+	int err, i;</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_DAC_VOL].name = front_volume;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_DAC_SW].name = front_switch;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_DAC_ZC_SW].name = front_zc;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_AUX_SW].name = NULL;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_DAC_IZD_SW].name = front_izd;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_PHASE_SW].name = front_phase;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_DEEMPH_SW].name = front_deemph;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_INPUT1_SW].name = ain1_switch;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_INPUT2_SW].name = ain2_switch;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_INPUT3_SW].name = ain3_switch;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_INPUT4_SW].name = ain4_switch;</div><div class='add'>+	spec-&gt;wm8776.ctl[WM8776_CTL_INPUT5_SW].name = ain5_switch;</div><div class='add'>+	snd_wm8776_build_controls(&amp;spec-&gt;wm8776);</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH1_VOL].name = rear_volume;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH2_VOL].name = clfe_volume;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH3_VOL].name = NULL;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH1_SW].name = rear_switch;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH2_SW].name = clfe_switch;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_CH3_SW].name = NULL;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_PHASE1_SW].name = rear_phase;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_PHASE2_SW].name = clfe_phase;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_PHASE3_SW].name = NULL;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_DEEMPH1_SW].name = rear_deemph;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_DEEMPH2_SW].name = clfe_deemph;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_DEEMPH3_SW].name = NULL;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_IZD_SW].name = rear_clfe_izd;</div><div class='add'>+	spec-&gt;wm8766.ctl[WM8766_CTL_ZC_SW].name = rear_clfe_zc;</div><div class='add'>+	snd_wm8766_build_controls(&amp;spec-&gt;wm8766);</div><div class='add'>+</div><div class='add'>+	memset(&amp;cont, 0, sizeof(cont));</div><div class='add'>+	cont.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(psc724_cont); i++) {</div><div class='add'>+		cont.private_value = i;</div><div class='add'>+		cont.name = psc724_cont[i].name;</div><div class='add'>+		cont.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+		cont.info = snd_ctl_boolean_mono_info;</div><div class='add'>+		cont.get = psc724_ctl_get;</div><div class='add'>+		cont.put = psc724_ctl_put;</div><div class='add'>+		ctl = snd_ctl_new1(&amp;cont, ice);</div><div class='add'>+		if (!ctl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		err = snd_ctl_add(ice-&gt;card, ctl);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psc724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+	/* restore codec volume settings after rate change (PMCLK stop) */</div><div class='add'>+	snd_wm8776_volume_restore(&amp;spec-&gt;wm8776);</div><div class='add'>+	snd_wm8766_volume_restore(&amp;spec-&gt;wm8766);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* power management */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static int psc724_resume(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	snd_wm8776_resume(&amp;spec-&gt;wm8776);</div><div class='add'>+	snd_wm8766_resume(&amp;spec-&gt;wm8766);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* init */</div><div class='add'>+</div><div class='add'>+static int psc724_init(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec;</div><div class='add'>+</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ice-&gt;spec = spec;</div><div class='add'>+	spec-&gt;ice = ice;</div><div class='add'>+</div><div class='add'>+	ice-&gt;num_total_dacs = 6;</div><div class='add'>+	ice-&gt;num_total_adcs = 2;</div><div class='add'>+	spec-&gt;wm8776.ops.write = psc724_wm8776_write;</div><div class='add'>+	spec-&gt;wm8776.card = ice-&gt;card;</div><div class='add'>+	snd_wm8776_init(&amp;spec-&gt;wm8776);</div><div class='add'>+	spec-&gt;wm8766.ops.write = psc724_wm8766_write;</div><div class='add'>+	spec-&gt;wm8766.card = ice-&gt;card;</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+	ice-&gt;pm_resume = psc724_resume;</div><div class='add'>+	ice-&gt;pm_suspend_enabled = 1;</div><div class='add'>+#endif</div><div class='add'>+	snd_wm8766_init(&amp;spec-&gt;wm8766);</div><div class='add'>+	snd_wm8766_set_if(&amp;spec-&gt;wm8766,</div><div class='add'>+			WM8766_IF_FMT_I2S | WM8766_IF_IWL_24BIT);</div><div class='add'>+	ice-&gt;gpio.set_pro_rate = psc724_set_pro_rate;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;spec-&gt;hp_work, psc724_update_hp_jack_state);</div><div class='add'>+	psc724_set_jack_detection(ice, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void psc724_exit(struct snd_ice1712 *ice)</div><div class='add'>+{</div><div class='add'>+	struct psc724_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;spec-&gt;hp_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PSC724 has buggy EEPROM (no 96&amp;192kHz, all FFh GPIOs), so override it here */</div><div class='add'>+static const unsigned char psc724_eeprom[] = {</div><div class='add'>+	[ICE_EEP2_SYSCONF]	= 0x42,	/* 49.152MHz, 1 ADC, 3 DACs */</div><div class='add'>+	[ICE_EEP2_ACLINK]	= 0x80,	/* I2S */</div><div class='add'>+	[ICE_EEP2_I2S]		= 0xf0,	/* I2S volume, 96kHz, 24bit */</div><div class='add'>+	[ICE_EEP2_SPDIF]	= 0xc1,	/* spdif out-en, out-int, no input */</div><div class='add'>+	/* GPIO outputs */</div><div class='add'>+	[ICE_EEP2_GPIO_DIR2]	= 0x5f, /* MUTE_ALL,WM8766 MUTE/MODE/ML/MC/MD */</div><div class='add'>+	/* GPIO write enable */</div><div class='add'>+	[ICE_EEP2_GPIO_MASK]	= 0xff, /* read-only */</div><div class='add'>+	[ICE_EEP2_GPIO_MASK1]	= 0xff, /* read-only */</div><div class='add'>+	[ICE_EEP2_GPIO_MASK2]	= 0xa0, /* MUTE_ALL,WM8766 MUTE/MODE/ML/MC/MD */</div><div class='add'>+	/* GPIO initial state */</div><div class='add'>+	[ICE_EEP2_GPIO_STATE2]	= 0x20,	/* unmuted, all WM8766 pins low */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_psc724_cards[] = {</div><div class='add'>+	{</div><div class='add'>+		.subvendor = VT1724_SUBDEVICE_PSC724,</div><div class='add'>+		.name = "Philips PSC724 Ultimate Edge",</div><div class='add'>+		.model = "psc724",</div><div class='add'>+		.chip_init = psc724_init,</div><div class='add'>+		.chip_exit = psc724_exit,</div><div class='add'>+		.build_controls = psc724_add_controls,</div><div class='add'>+		.eeprom_size = sizeof(psc724_eeprom),</div><div class='add'>+		.eeprom_data = psc724_eeprom,</div><div class='add'>+	},</div><div class='add'>+	{} /*terminator*/</div><div class='add'>+};</div><div class='head'>diff --git a/sound/pci/ice1712/psc724.h b/sound/pci/ice1712/psc724.h<br/>new file mode 100644<br/>index 000000000000..e6ce335ae87e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/psc724.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/psc724.h</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __SOUND_PSC724_H</div><div class='add'>+#define __SOUND_PSC724_H</div><div class='add'>+</div><div class='add'>+/* ID */</div><div class='add'>+#define PSC724_DEVICE_DESC	\</div><div class='add'>+		"{Philips,PSC724 Ultimate Edge},"</div><div class='add'>+</div><div class='add'>+#define VT1724_SUBDEVICE_PSC724		0xab170619</div><div class='add'>+</div><div class='add'>+/* entry struct */</div><div class='add'>+extern struct snd_ice1712_card_info snd_vt1724_psc724_cards[];</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_PSC724_H */</div><div class='head'>diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c<br/>index 1948632787e6..099601edf1d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/quartet.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/quartet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/quartet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/quartet.c</a></div><div class='hunk'>@@ -1,32 +1,17 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for Infrasonic Quartet</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2009 Pavel Hofman &lt;pavel.hofman@ivitera.com&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/tlv.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -47,7 +32,7 @@ struct qtet_kcontrol_private {</div><div class='ctx'> 	unsigned int bit;</div><div class='ctx'> 	void (*set_register)(struct snd_ice1712 *ice, unsigned int val);</div><div class='ctx'> 	unsigned int (*get_register)(struct snd_ice1712 *ice);</div><div class='del'>-	unsigned char *texts[2];</div><div class='add'>+	const char * const texts[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -63,7 +48,7 @@ enum {</div><div class='ctx'> 	OUT34_MON12,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS",</div><div class='add'>+static const char * const ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS",</div><div class='ctx'> 	"Word Clock 256xFS"};</div><div class='ctx'> </div><div class='ctx'> /* chip address on I2C bus */</div><div class='hunk'>@@ -232,17 +217,17 @@ static char *get_binary(char *buffer, int value)</div><div class='ctx'> /*</div><div class='ctx'>  * Initial setup of the conversion array GPIO &lt;-&gt; rate</div><div class='ctx'>  */</div><div class='del'>-static unsigned int qtet_rates[] = {</div><div class='add'>+static const unsigned int qtet_rates[] = {</div><div class='ctx'> 	44100, 48000, 88200,</div><div class='ctx'> 	96000, 176400, 192000,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int cks_vals[] = {</div><div class='add'>+static const unsigned int cks_vals[] = {</div><div class='ctx'> 	CPLD_CKS_44100HZ, CPLD_CKS_48000HZ, CPLD_CKS_88200HZ,</div><div class='ctx'> 	CPLD_CKS_96000HZ, CPLD_CKS_176400HZ, CPLD_CKS_192000HZ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list qtet_rates_info = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list qtet_rates_info = {</div><div class='ctx'> 	.count = ARRAY_SIZE(qtet_rates),</div><div class='ctx'> 	.list = qtet_rates,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -279,7 +264,7 @@ static void qtet_akm_write(struct snd_akm4xxx *ak, int chip,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(chip &lt; 0 || chip &gt;= 4))</div><div class='ctx'> 		return;</div><div class='del'>-	/*printk(KERN_DEBUG "Writing to AK4620: chip=%d, addr=0x%x,</div><div class='add'>+	/*dev_dbg(ice-&gt;card-&gt;dev, "Writing to AK4620: chip=%d, addr=0x%x,</div><div class='ctx'> 	  data=0x%x\n", chip, addr, data);*/</div><div class='ctx'> 	orig_dir = ice-&gt;gpio.get_dir(ice);</div><div class='ctx'> 	ice-&gt;gpio.set_dir(ice, orig_dir | GPIO_SPI_ALL);</div><div class='hunk'>@@ -387,7 +372,7 @@ static const struct snd_akm4xxx_adc_channel qtet_adc[] = {</div><div class='ctx'> 	AK_CONTROL(PCM_34_CAPTURE_VOLUME, 2),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_qtet_dac __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_qtet_dac = {</div><div class='ctx'> 	.type = SND_AK4620,</div><div class='ctx'> 	.num_dacs = 4,	/* DAC1 - Output 12</div><div class='ctx'> 	*/</div><div class='hunk'>@@ -411,7 +396,7 @@ static void reg_write(struct snd_ice1712 *ice, unsigned int reg,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;ice-&gt;gpio_mutex);</div><div class='add'>+	guard(mutex)(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> 	/* set direction of used GPIOs*/</div><div class='ctx'> 	/* all outputs */</div><div class='ctx'> 	tmp = 0x00ffff;</div><div class='hunk'>@@ -444,7 +429,6 @@ static void reg_write(struct snd_ice1712 *ice, unsigned int reg,</div><div class='ctx'> 	ice-&gt;gpio.set_mask(ice, 0xffffff);</div><div class='ctx'> 	/* outputs only 8-15 */</div><div class='ctx'> 	ice-&gt;gpio.set_dir(ice, 0x00ff00);</div><div class='del'>-	mutex_unlock(&amp;ice-&gt;gpio_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int get_scr(struct snd_ice1712 *ice)</div><div class='hunk'>@@ -485,7 +469,7 @@ static void set_cpld(struct snd_ice1712 *ice, unsigned int val)</div><div class='ctx'> 	reg_write(ice, GPIO_CPLD_CSN, val);</div><div class='ctx'> 	spec-&gt;cpld = val;</div><div class='ctx'> }</div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+</div><div class='ctx'> static void proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> 		struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -502,13 +486,8 @@ static void proc_regs_read(struct snd_info_entry *entry,</div><div class='ctx'> </div><div class='ctx'> static void proc_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	if (!snd_card_proc_new(ice-&gt;card, "quartet", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, ice, proc_regs_read);</div><div class='add'>+	snd_card_ro_proc_new(ice-&gt;card, "quartet", ice, proc_regs_read);</div><div class='ctx'> }</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-static void proc_init(struct snd_ice1712 *ice) {}</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int qtet_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -551,18 +530,9 @@ static int qtet_mute_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int qtet_ain12_enum_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	static char *texts[3] = {"Line In 1/2", "Mic", "Mic + Low-cut"};</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = ARRAY_SIZE(texts);</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-			texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	static const char * const texts[3] =</div><div class='add'>+		{"Line In 1/2", "Mic", "Mic + Low-cut"};</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qtet_ain12_sw_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -595,7 +565,7 @@ static int qtet_ain12_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	unsigned int old, new, tmp, masked_old;</div><div class='del'>-	old = new = get_scr(ice);</div><div class='add'>+	old = get_scr(ice);</div><div class='ctx'> 	masked_old = old &amp; (SCR_AIN12_SEL1 | SCR_AIN12_SEL0);</div><div class='ctx'> 	tmp = ucontrol-&gt;value.integer.value[0];</div><div class='ctx'> 	if (tmp == 2)</div><div class='hunk'>@@ -686,7 +656,7 @@ static int qtet_php_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	.get_register = get_##xreg,\</div><div class='ctx'> 	.texts = {xtext1, xtext2} }</div><div class='ctx'> </div><div class='del'>-static struct qtet_kcontrol_private qtet_privates[] = {</div><div class='add'>+static const struct qtet_kcontrol_private qtet_privates[] = {</div><div class='ctx'> 	PRIV_ENUM2(IN12_SEL, CPLD_IN12_SEL, cpld, "An In 1/2", "An In 3/4"),</div><div class='ctx'> 	PRIV_ENUM2(IN34_SEL, CPLD_IN34_SEL, cpld, "An In 3/4", "IEC958 In"),</div><div class='ctx'> 	PRIV_ENUM2(AIN34_SEL, SCR_AIN34_SEL, scr, "Line In 3/4", "Hi-Z"),</div><div class='hunk'>@@ -704,17 +674,8 @@ static int qtet_enum_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct qtet_kcontrol_private private =</div><div class='ctx'> 		qtet_privates[kcontrol-&gt;private_value];</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = ARRAY_SIZE(private.texts);</div><div class='del'>-</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= uinfo-&gt;value.enumerated.items)</div><div class='del'>-		uinfo-&gt;value.enumerated.item =</div><div class='del'>-			uinfo-&gt;value.enumerated.items - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-			private.texts[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(private.texts),</div><div class='add'>+				 private.texts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int qtet_sw_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -758,7 +719,7 @@ static int qtet_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	.put = qtet_sw_put,\</div><div class='ctx'> 	.private_value = xpriv }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new qtet_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new qtet_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='hunk'>@@ -795,37 +756,16 @@ static struct snd_kcontrol_new qtet_controls[] __devinitdata = {</div><div class='ctx'> 	QTET_CONTROL("Output 3/4 to Monitor 1/2", sw, OUT34_MON12),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *slave_vols[] __devinitdata = {</div><div class='add'>+static const char * const follower_vols[] = {</div><div class='ctx'> 	PCM_12_PLAYBACK_VOLUME,</div><div class='ctx'> 	PCM_34_PLAYBACK_VOLUME,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static __devinitdata</div><div class='add'>+static</div><div class='ctx'> DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1);</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card,</div><div class='del'>-		const char *name)</div><div class='del'>-{</div><div class='del'>-	struct snd_ctl_elem_id sid;</div><div class='del'>-	memset(&amp;sid, 0, sizeof(sid));</div><div class='del'>-	/* FIXME: strcpy is bad. */</div><div class='del'>-	strcpy(sid.name, name);</div><div class='del'>-	sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='del'>-	return snd_ctl_find_id(card, &amp;sid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devinit add_slaves(struct snd_card *card,</div><div class='del'>-		struct snd_kcontrol *master, char **list)</div><div class='del'>-{</div><div class='del'>-	for (; *list; list++) {</div><div class='del'>-		struct snd_kcontrol *slave = ctl_find(card, *list);</div><div class='del'>-		if (slave)</div><div class='del'>-			snd_ctl_add_slave(master, slave);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __devinit qtet_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int qtet_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct qtet_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int err, i;</div><div class='hunk'>@@ -845,16 +785,15 @@ static int __devinit qtet_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 			qtet_master_db_scale);</div><div class='ctx'> 	if (!vmaster)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	add_slaves(ice-&gt;card, vmaster, slave_vols);</div><div class='ctx'> 	err = snd_ctl_add(ice-&gt;card, vmaster);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	/* only capture SPDIF over AK4113 */</div><div class='del'>-	err = snd_ak4113_build(spec-&gt;ak4113,</div><div class='del'>-			ice-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream);</div><div class='add'>+	err = snd_ctl_add_followers(ice-&gt;card, vmaster, follower_vols);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	/* only capture SPDIF over AK4113 */</div><div class='add'>+	return snd_ak4113_build(spec-&gt;ak4113,</div><div class='add'>+			ice-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int qtet_is_spdif_master(struct snd_ice1712 *ice)</div><div class='hunk'>@@ -896,7 +835,7 @@ static void qtet_set_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> 	new =  (get_cpld(ice) &amp; ~CPLD_CKS_MASK) | get_cks_val(rate);</div><div class='ctx'> 	/* switch to internal clock, drop CPLD_SYNC_SEL */</div><div class='ctx'> 	new &amp;= ~CPLD_SYNC_SEL;</div><div class='del'>-	/* printk(KERN_DEBUG "QT - set_rate: old %x, new %x\n",</div><div class='add'>+	/* dev_dbg(ice-&gt;card-&gt;dev, "QT - set_rate: old %x, new %x\n",</div><div class='ctx'> 	   get_cpld(ice), new); */</div><div class='ctx'> 	set_cpld(ice, new);</div><div class='ctx'> }</div><div class='hunk'>@@ -976,7 +915,7 @@ static void qtet_ak4113_change(struct ak4113 *ak4113, unsigned char c0,</div><div class='ctx'> 			c1) {</div><div class='ctx'> 		/* only for SPDIF master mode, rate was changed */</div><div class='ctx'> 		rate = snd_ak4113_external_rate(ak4113);</div><div class='del'>-		/* printk(KERN_DEBUG "ak4113 - input rate changed to %d\n",</div><div class='add'>+		/* dev_dbg(ice-&gt;card-&gt;dev, "ak4113 - input rate changed to %d\n",</div><div class='ctx'> 		   rate); */</div><div class='ctx'> 		qtet_akm_set_rate_val(ice-&gt;akm, rate);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1007,7 +946,7 @@ static void qtet_spdif_in_open(struct snd_ice1712 *ice,</div><div class='ctx'> /*</div><div class='ctx'>  * initialize the chip</div><div class='ctx'>  */</div><div class='del'>-static int __devinit qtet_init(struct snd_ice1712 *ice)</div><div class='add'>+static int qtet_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned char ak4113_init_vals[] = {</div><div class='ctx'> 		/* AK4113_REG_PWRDN */	AK4113_RST | AK4113_PWN |</div><div class='hunk'>@@ -1095,7 +1034,7 @@ static int __devinit qtet_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned char qtet_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char qtet_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x28,	/* clock 256(24MHz), mpu401, 1xADC,</div><div class='ctx'> 					   1xDACs, SPDIF in */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */</div><div class='hunk'>@@ -1116,7 +1055,7 @@ static unsigned char qtet_eeprom[] __devinitdata = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_qtet_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_qtet_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_QTET,</div><div class='ctx'> 		.name = "Infrasonic Quartet",</div><div class='head'>diff --git a/sound/pci/ice1712/quartet.h b/sound/pci/ice1712/quartet.h<br/>index 80809b72439a..a1c2fe27185d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/quartet.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/quartet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/quartet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/quartet.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_QTET_H</div><div class='ctx'> #define __SOUND_QTET_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c<br/>index b508bb360b97..bcf114152dfd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/revo.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/revo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/revo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/revo.c</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble ICE1712 (Envy24)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for M-Audio Audiophile 192, Revolution 7.1 and 5.1</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -36,6 +21,7 @@</div><div class='ctx'> struct revo51_spec {</div><div class='ctx'> 	struct snd_i2c_device *dev;</div><div class='ctx'> 	struct snd_pt2258 *pt2258;</div><div class='add'>+	struct ak4114 *ak4114;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void revo_i2s_mclk_changed(struct snd_ice1712 *ice)</div><div class='hunk'>@@ -235,7 +221,7 @@ static const struct snd_akm4xxx_adc_channel revo51_adc[] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_revo_front __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_revo_front = {</div><div class='ctx'> 	.type = SND_AK4381,</div><div class='ctx'> 	.num_dacs = 2,</div><div class='ctx'> 	.ops = {</div><div class='hunk'>@@ -244,7 +230,7 @@ static struct snd_akm4xxx akm_revo_front __devinitdata = {</div><div class='ctx'> 	.dac_info = revo71_front,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_revo_front_priv = {</div><div class='ctx'> 	.caddr = 1,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = VT1724_REVO_CDOUT,</div><div class='hunk'>@@ -256,7 +242,7 @@ static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_revo_surround __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_revo_surround = {</div><div class='ctx'> 	.type = SND_AK4355,</div><div class='ctx'> 	.idx_offset = 1,</div><div class='ctx'> 	.num_dacs = 6,</div><div class='hunk'>@@ -266,7 +252,7 @@ static struct snd_akm4xxx akm_revo_surround __devinitdata = {</div><div class='ctx'> 	.dac_info = revo71_surround,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_revo_surround_priv = {</div><div class='ctx'> 	.caddr = 3,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = VT1724_REVO_CDOUT,</div><div class='hunk'>@@ -278,7 +264,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_revo51 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_revo51 = {</div><div class='ctx'> 	.type = SND_AK4358,</div><div class='ctx'> 	.num_dacs = 8,</div><div class='ctx'> 	.ops = {</div><div class='hunk'>@@ -287,7 +273,7 @@ static struct snd_akm4xxx akm_revo51 __devinitdata = {</div><div class='ctx'> 	.dac_info = revo51_dac,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_revo51_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = VT1724_REVO_CDOUT,</div><div class='hunk'>@@ -299,13 +285,13 @@ static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_revo51_adc __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_revo51_adc = {</div><div class='ctx'> 	.type = SND_AK5365,</div><div class='ctx'> 	.num_adcs = 2,</div><div class='ctx'> 	.adc_info = revo51_adc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_revo51_adc_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = VT1724_REVO_CDOUT,</div><div class='hunk'>@@ -346,7 +332,7 @@ static const struct snd_akm4xxx_dac_channel ap192_dac[] = {</div><div class='ctx'> 	AK_DAC("PCM Playback Volume", 2)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_akm4xxx akm_ap192 __devinitdata = {</div><div class='add'>+static const struct snd_akm4xxx akm_ap192 = {</div><div class='ctx'> 	.type = SND_AK4358,</div><div class='ctx'> 	.num_dacs = 2,</div><div class='ctx'> 	.ops = {</div><div class='hunk'>@@ -355,14 +341,14 @@ static struct snd_akm4xxx akm_ap192 __devinitdata = {</div><div class='ctx'> 	.dac_info = ap192_dac,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_ak4xxx_private akm_ap192_priv __devinitdata = {</div><div class='add'>+static const struct snd_ak4xxx_private akm_ap192_priv = {</div><div class='ctx'> 	.caddr = 2,</div><div class='ctx'> 	.cif = 0,</div><div class='ctx'> 	.data_mask = VT1724_REVO_CDOUT,</div><div class='ctx'> 	.clk_mask = VT1724_REVO_CCLK,</div><div class='del'>-	.cs_mask = VT1724_REVO_CS0 | VT1724_REVO_CS1,</div><div class='del'>-	.cs_addr = VT1724_REVO_CS1,</div><div class='del'>-	.cs_none = VT1724_REVO_CS0 | VT1724_REVO_CS1,</div><div class='add'>+	.cs_mask = VT1724_REVO_CS0 | VT1724_REVO_CS3,</div><div class='add'>+	.cs_addr = VT1724_REVO_CS3,</div><div class='add'>+	.cs_none = VT1724_REVO_CS0 | VT1724_REVO_CS3,</div><div class='ctx'> 	.add_flags = VT1724_REVO_CCLK, /* high at init */</div><div class='ctx'> 	.mask_flags = 0,</div><div class='ctx'> };</div><div class='hunk'>@@ -373,7 +359,7 @@ static struct snd_ak4xxx_private akm_ap192_priv __devinitdata = {</div><div class='ctx'>  * CCLK (pin 34) -- GPIO1 pin 51 (shared with AK4358)</div><div class='ctx'>  * CSN  (pin 35) -- GPIO7 pin 59</div><div class='ctx'>  */</div><div class='del'>-#define AK4114_ADDR	0x02</div><div class='add'>+#define AK4114_ADDR	0x00</div><div class='ctx'> </div><div class='ctx'> static void write_data(struct snd_ice1712 *ice, unsigned int gpio,</div><div class='ctx'> 		       unsigned int data, int idx)</div><div class='hunk'>@@ -427,7 +413,7 @@ static unsigned int ap192_4wire_start(struct snd_ice1712 *ice)</div><div class='ctx'> 	tmp = snd_ice1712_gpio_read(ice);</div><div class='ctx'> 	tmp |= VT1724_REVO_CCLK; /* high at init */</div><div class='ctx'> 	tmp |= VT1724_REVO_CS0;</div><div class='del'>-	tmp &amp;= ~VT1724_REVO_CS1;</div><div class='add'>+	tmp &amp;= ~VT1724_REVO_CS3;</div><div class='ctx'> 	snd_ice1712_gpio_write(ice, tmp);</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> 	return tmp;</div><div class='hunk'>@@ -435,7 +421,7 @@ static unsigned int ap192_4wire_start(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> static void ap192_4wire_finish(struct snd_ice1712 *ice, unsigned int tmp)</div><div class='ctx'> {</div><div class='del'>-	tmp |= VT1724_REVO_CS1;</div><div class='add'>+	tmp |= VT1724_REVO_CS3;</div><div class='ctx'> 	tmp |= VT1724_REVO_CS0;</div><div class='ctx'> 	snd_ice1712_gpio_write(ice, tmp);</div><div class='ctx'> 	udelay(1);</div><div class='hunk'>@@ -468,35 +454,42 @@ static unsigned char ap192_ak4114_read(void *private_data, unsigned char addr)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit ap192_ak4114_init(struct snd_ice1712 *ice)</div><div class='add'>+static int ap192_ak4114_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	static const unsigned char ak4114_init_vals[] = {</div><div class='del'>-		AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1,</div><div class='add'>+		AK4114_RST | AK4114_PWN | AK4114_OCKS0,</div><div class='ctx'> 		AK4114_DIF_I24I2S,</div><div class='ctx'> 		AK4114_TX1E,</div><div class='del'>-		AK4114_EFH_1024 | AK4114_DIT | AK4114_IPS(1),</div><div class='add'>+		AK4114_EFH_1024 | AK4114_DIT | AK4114_IPS(0),</div><div class='ctx'> 		0,</div><div class='ctx'> 		0</div><div class='ctx'> 	};</div><div class='ctx'> 	static const unsigned char ak4114_init_txcsb[] = {</div><div class='ctx'> 		0x41, 0x02, 0x2c, 0x00, 0x00</div><div class='ctx'> 	};</div><div class='del'>-	struct ak4114 *ak;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	struct revo51_spec *spec;</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ice-&gt;spec = spec;</div><div class='add'>+</div><div class='ctx'> 	err = snd_ak4114_create(ice-&gt;card,</div><div class='ctx'> 				 ap192_ak4114_read,</div><div class='ctx'> 				 ap192_ak4114_write,</div><div class='ctx'> 				 ak4114_init_vals, ak4114_init_txcsb,</div><div class='del'>-				 ice, &amp;ak);</div><div class='add'>+				 ice, &amp;spec-&gt;ak4114);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> 	/* AK4114 in Revo cannot detect external rate correctly.</div><div class='ctx'> 	 * No reason to stop capture stream due to incorrect checks */</div><div class='del'>-	ak-&gt;check_flags = AK4114_CHECK_NO_RATE;</div><div class='add'>+	spec-&gt;ak4114-&gt;check_flags = AK4114_CHECK_NO_RATE;</div><div class='ctx'> </div><div class='del'>-	return 0; /* error ignored; it's no fatal error */</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit revo_init(struct snd_ice1712 *ice)</div><div class='add'>+static int revo_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_akm4xxx *ak;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -563,6 +556,9 @@ static int __devinit revo_init(struct snd_ice1712 *ice)</div><div class='ctx'> 					       ice);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='add'>+		err = ap192_ak4114_init(ice);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 		</div><div class='ctx'> 		/* unmute all codecs */</div><div class='ctx'> 		snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,</div><div class='hunk'>@@ -574,9 +570,9 @@ static int __devinit revo_init(struct snd_ice1712 *ice)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit revo_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int revo_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	struct revo51_spec *spec;</div><div class='add'>+	struct revo51_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (ice-&gt;eeprom.subvendor) {</div><div class='hunk'>@@ -598,7 +594,9 @@ static int __devinit revo_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 		err = snd_ice1712_akm4xxx_build_controls(ice);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='del'>-		err = ap192_ak4114_init(ice);</div><div class='add'>+		/* only capture SPDIF over AK4114 */</div><div class='add'>+		err = snd_ak4114_build(spec-&gt;ak4114, NULL,</div><div class='add'>+		   ice-&gt;pcm-&gt;streams[SNDRV_PCM_STREAM_CAPTURE].substream);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -607,7 +605,7 @@ static int __devinit revo_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_revo_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_REVOLUTION71,</div><div class='ctx'> 		.name = "M Audio Revolution-7.1",</div><div class='head'>diff --git a/sound/pci/ice1712/revo.h b/sound/pci/ice1712/revo.h<br/>index a3ba425911cc..573ae25067e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/revo.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/revo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/revo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/revo.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_REVO_H</div><div class='ctx'> #define __SOUND_REVO_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for M-Audio Revolution 7.1</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2003 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define REVO_DEVICE_DESC \</div><div class='head'>diff --git a/sound/pci/ice1712/se.c b/sound/pci/ice1712/se.c<br/>index 69673b95869d..ffa9d8860a5a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/se.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/se.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/se.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/se.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,24 +6,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2007 Shin-ya Okada  sh_okada(at)d4.dion.ne.jp</div><div class='ctx'>  *                                        (at) -&gt; @</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -114,7 +99,7 @@ struct se_spec {</div><div class='ctx'> /*  WM8740 interface                                                        */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static void __devinit se200pci_WM8740_init(struct snd_ice1712 *ice)</div><div class='add'>+static void se200pci_WM8740_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	/* nothing to do */</div><div class='ctx'> }</div><div class='hunk'>@@ -196,7 +181,7 @@ static void se200pci_WM8766_set_volume(struct snd_ice1712 *ice, int ch,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit se200pci_WM8766_init(struct snd_ice1712 *ice)</div><div class='add'>+static void se200pci_WM8766_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	se200pci_WM8766_write(ice, 0x1f, 0x000); /* RESET ALL */</div><div class='ctx'> 	udelay(10);</div><div class='hunk'>@@ -253,14 +238,14 @@ static void se200pci_WM8776_set_input_volume(struct snd_ice1712 *ice,</div><div class='ctx'> 	se200pci_WM8776_write(ice, 0x0f, vol2 | 0x100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *se200pci_sel[] = {</div><div class='add'>+static const char * const se200pci_sel[] = {</div><div class='ctx'> 	"LINE-IN", "CD-IN", "MIC-IN", "ALL-MIX", NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void se200pci_WM8776_set_input_selector(struct snd_ice1712 *ice,</div><div class='ctx'> 					       unsigned int sel)</div><div class='ctx'> {</div><div class='del'>-	static unsigned char vals[] = {</div><div class='add'>+	static const unsigned char vals[] = {</div><div class='ctx'> 		/* LINE, CD, MIC, ALL, GND */</div><div class='ctx'> 		0x10, 0x04, 0x08, 0x1c, 0x03</div><div class='ctx'> 	};</div><div class='hunk'>@@ -278,7 +263,7 @@ static void se200pci_WM8776_set_afl(struct snd_ice1712 *ice, unsigned int afl)</div><div class='ctx'> 		se200pci_WM8776_write(ice, 0x16, 0x001);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char *se200pci_agc[] = {</div><div class='add'>+static const char * const se200pci_agc[] = {</div><div class='ctx'> 	"Off", "LimiterMode", "ALCMode", NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -300,10 +285,10 @@ static void se200pci_WM8776_set_agc(struct snd_ice1712 *ice, unsigned int agc)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit se200pci_WM8776_init(struct snd_ice1712 *ice)</div><div class='add'>+static void se200pci_WM8776_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	static unsigned short __devinitdata default_values[] = {</div><div class='add'>+	static const unsigned short default_values[] = {</div><div class='ctx'> 		0x100, 0x100, 0x100,</div><div class='ctx'> 		0x100, 0x100, 0x100,</div><div class='ctx'> 		0x000, 0x090, 0x000, 0x000,</div><div class='hunk'>@@ -352,7 +337,7 @@ static void se200pci_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct se200pci_control {</div><div class='del'>-	char *name;</div><div class='add'>+	const char *name;</div><div class='ctx'> 	enum {</div><div class='ctx'> 		WM8766,</div><div class='ctx'> 		WM8776in,</div><div class='hunk'>@@ -363,7 +348,7 @@ struct se200pci_control {</div><div class='ctx'> 	} target;</div><div class='ctx'> 	enum { VOLUME1, VOLUME2, BOOLEAN, ENUM } type;</div><div class='ctx'> 	int ch;</div><div class='del'>-	const char **member;</div><div class='add'>+	const char * const *member;</div><div class='ctx'> 	const char *comment;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +406,7 @@ static const struct se200pci_control se200pci_cont[] = {</div><div class='ctx'> </div><div class='ctx'> static int se200pci_get_enum_count(int n)</div><div class='ctx'> {</div><div class='del'>-	const char **member;</div><div class='add'>+	const char * const *member;</div><div class='ctx'> 	int c;</div><div class='ctx'> </div><div class='ctx'> 	member = se200pci_cont[n].member;</div><div class='hunk'>@@ -453,14 +438,7 @@ static int se200pci_cont_enum_info(struct snd_kcontrol *kc,</div><div class='ctx'> 	c = se200pci_get_enum_count(n);</div><div class='ctx'> 	if (!c)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = c;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt;= c)</div><div class='del'>-		uinfo-&gt;value.enumerated.item = c - 1;</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name,</div><div class='del'>-	       se200pci_cont[n].member[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, c, se200pci_cont[n].member);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int se200pci_cont_volume_get(struct snd_kcontrol *kc,</div><div class='hunk'>@@ -600,7 +578,7 @@ static int se200pci_cont_enum_put(struct snd_kcontrol *kc,</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_gain1, -12750, 50, 1);</div><div class='ctx'> static const DECLARE_TLV_DB_SCALE(db_scale_gain2, -10350, 50, 1);</div><div class='ctx'> </div><div class='del'>-static int __devinit se200pci_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int se200pci_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct snd_kcontrol_new cont;</div><div class='hunk'>@@ -678,7 +656,7 @@ static int __devinit se200pci_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> /*  probe/initialize/setup                                                  */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static int __devinit se_init(struct snd_ice1712 *ice)</div><div class='add'>+static int se_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	struct se_spec *spec;</div><div class='ctx'> </div><div class='hunk'>@@ -706,7 +684,7 @@ static int __devinit se_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit se_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int se_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -723,7 +701,7 @@ static int __devinit se_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> /*  entry point                                                             */</div><div class='ctx'> /****************************************************************************/</div><div class='ctx'> </div><div class='del'>-static unsigned char se200pci_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char se200pci_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]	= 0x4b,	/* 49.152Hz, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]	= 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]		= 0x78,	/* 96k-ok, 24bit, 192k-ok */</div><div class='hunk'>@@ -742,7 +720,7 @@ static unsigned char se200pci_eeprom[] __devinitdata = {</div><div class='ctx'> 	[ICE_EEP2_GPIO_STATE2]	= 0x07, /* WM8766 ML/MC/MD */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char se90pci_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char se90pci_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]	= 0x4b,	/* 49.152Hz, spdif-in/ADC, 4DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]	= 0x80,	/* I2S */</div><div class='ctx'> 	[ICE_EEP2_I2S]		= 0x78,	/* 96k-ok, 24bit, 192k-ok */</div><div class='hunk'>@@ -751,7 +729,7 @@ static unsigned char se90pci_eeprom[] __devinitdata = {</div><div class='ctx'> 	/* ALL GPIO bits are in input mode */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_se_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_se_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_SE200PCI,</div><div class='ctx'> 		.name = "ONKYO SE200PCI",</div><div class='head'>diff --git a/sound/pci/ice1712/se.h b/sound/pci/ice1712/se.h<br/>index 0b0a9dabdcfb..61348ecef1e0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/se.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/se.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/se.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/se.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_SE_H</div><div class='ctx'> #define __SOUND_SE_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/stac946x.h b/sound/pci/ice1712/stac946x.h<br/>index 5b390952d0e4..58f9f17a258a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/stac946x.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/stac946x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/stac946x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/stac946x.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_STAC946X_H</div><div class='ctx'> #define __SOUND_STAC946X_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c<br/>index 4c551e147c08..47470b07197c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/vt1720_mobo.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/vt1720_mobo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/vt1720_mobo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/vt1720_mobo.c</a></div><div class='hunk'>@@ -1,27 +1,12 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for VT1720/VT1724 (Envy24PT/Envy24HT)</div><div class='ctx'>  *</div><div class='ctx'>  *   Lowlevel functions for VT1720-based motherboards</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -32,7 +17,7 @@</div><div class='ctx'> #include "vt1720_mobo.h"</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit k8x800_init(struct snd_ice1712 *ice)</div><div class='add'>+static int k8x800_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	ice-&gt;vt1720 = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +31,7 @@ static int __devinit k8x800_init(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit k8x800_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int k8x800_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	/* FIXME: needs some quirks for VT1616? */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -54,7 +39,7 @@ static int __devinit k8x800_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> </div><div class='ctx'> /* EEPROM image */</div><div class='ctx'> </div><div class='del'>-static unsigned char k8x800_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char k8x800_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x01,	/* clock 256, 1ADC, 2DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x02,	/* ACLINK, packed */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0x00,	/* - */</div><div class='hunk'>@@ -70,7 +55,7 @@ static unsigned char k8x800_eeprom[] __devinitdata = {</div><div class='ctx'> 	[ICE_EEP2_GPIO_STATE2] = 0x00,	/* - */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned char sn25p_eeprom[] __devinitdata = {</div><div class='add'>+static const unsigned char sn25p_eeprom[] = {</div><div class='ctx'> 	[ICE_EEP2_SYSCONF]     = 0x01,	/* clock 256, 1ADC, 2DACs */</div><div class='ctx'> 	[ICE_EEP2_ACLINK]      = 0x02,	/* ACLINK, packed */</div><div class='ctx'> 	[ICE_EEP2_I2S]         = 0x00,	/* - */</div><div class='hunk'>@@ -88,7 +73,7 @@ static unsigned char sn25p_eeprom[] __devinitdata = {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* entry point */</div><div class='del'>-struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1720_mobo_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1720_SUBDEVICE_K8X800,</div><div class='ctx'> 		.name = "Albatron K8X800 Pro II",</div><div class='head'>diff --git a/sound/pci/ice1712/vt1720_mobo.h b/sound/pci/ice1712/vt1720_mobo.h<br/>index 0b1b0ee1bea7..90c77d8270d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/vt1720_mobo.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/vt1720_mobo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/vt1720_mobo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/vt1720_mobo.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> #ifndef __SOUND_VT1720_MOBO_H</div><div class='ctx'> #define __SOUND_VT1720_MOBO_H</div><div class='ctx'> </div><div class='hunk'>@@ -7,21 +8,6 @@</div><div class='ctx'>  *   Lowlevel functions for VT1720-based motherboards</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2004 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='ctx'> #define VT1720_MOBO_DEVICE_DESC        "{Albatron,K8X800 Pro II},"\</div><div class='head'>diff --git a/sound/pci/ice1712/wm8766.c b/sound/pci/ice1712/wm8766.c<br/>new file mode 100644<br/>index 000000000000..fe3e243b3854<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wm8766.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wm8766.c</a></div><div class='hunk'>@@ -0,0 +1,332 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *   ALSA driver for ICEnsemble VT17xx</div><div class='add'>+ *</div><div class='add'>+ *   Lowlevel functions for WM8766 codec</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (c) 2012 Ondrej Zary &lt;linux@rainbow-software.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include "wm8766.h"</div><div class='add'>+</div><div class='add'>+/* low-level access */</div><div class='add'>+</div><div class='add'>+static void snd_wm8766_write(struct snd_wm8766 *wm, u16 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	if (addr &lt; WM8766_REG_COUNT)</div><div class='add'>+		wm-&gt;regs[addr] = data;</div><div class='add'>+	wm-&gt;ops.write(wm, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mixer controls */</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8766_tlv, -12750, 50, 1);</div><div class='add'>+</div><div class='add'>+static const struct snd_wm8766_ctl snd_wm8766_default_ctl[WM8766_CTL_COUNT] = {</div><div class='add'>+	[WM8766_CTL_CH1_VOL] = {</div><div class='add'>+		.name = "Channel 1 Playback Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8766_tlv,</div><div class='add'>+		.reg1 = WM8766_REG_DACL1,</div><div class='add'>+		.reg2 = WM8766_REG_DACR1,</div><div class='add'>+		.mask1 = WM8766_VOL_MASK,</div><div class='add'>+		.mask2 = WM8766_VOL_MASK,</div><div class='add'>+		.max = 0xff,</div><div class='add'>+		.flags = WM8766_FLAG_STEREO | WM8766_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_CH2_VOL] = {</div><div class='add'>+		.name = "Channel 2 Playback Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8766_tlv,</div><div class='add'>+		.reg1 = WM8766_REG_DACL2,</div><div class='add'>+		.reg2 = WM8766_REG_DACR2,</div><div class='add'>+		.mask1 = WM8766_VOL_MASK,</div><div class='add'>+		.mask2 = WM8766_VOL_MASK,</div><div class='add'>+		.max = 0xff,</div><div class='add'>+		.flags = WM8766_FLAG_STEREO | WM8766_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_CH3_VOL] = {</div><div class='add'>+		.name = "Channel 3 Playback Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8766_tlv,</div><div class='add'>+		.reg1 = WM8766_REG_DACL3,</div><div class='add'>+		.reg2 = WM8766_REG_DACR3,</div><div class='add'>+		.mask1 = WM8766_VOL_MASK,</div><div class='add'>+		.mask2 = WM8766_VOL_MASK,</div><div class='add'>+		.max = 0xff,</div><div class='add'>+		.flags = WM8766_FLAG_STEREO | WM8766_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_CH1_SW] = {</div><div class='add'>+		.name = "Channel 1 Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_MUTE1,</div><div class='add'>+		.flags = WM8766_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_CH2_SW] = {</div><div class='add'>+		.name = "Channel 2 Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_MUTE2,</div><div class='add'>+		.flags = WM8766_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_CH3_SW] = {</div><div class='add'>+		.name = "Channel 3 Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_MUTE3,</div><div class='add'>+		.flags = WM8766_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_PHASE1_SW] = {</div><div class='add'>+		.name = "Channel 1 Phase Invert Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_IFCTRL,</div><div class='add'>+		.mask1 = WM8766_PHASE_INVERT1,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_PHASE2_SW] = {</div><div class='add'>+		.name = "Channel 2 Phase Invert Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_IFCTRL,</div><div class='add'>+		.mask1 = WM8766_PHASE_INVERT2,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_PHASE3_SW] = {</div><div class='add'>+		.name = "Channel 3 Phase Invert Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_IFCTRL,</div><div class='add'>+		.mask1 = WM8766_PHASE_INVERT3,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_DEEMPH1_SW] = {</div><div class='add'>+		.name = "Channel 1 Deemphasis Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_DEEMP1,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_DEEMPH2_SW] = {</div><div class='add'>+		.name = "Channel 2 Deemphasis Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_DEEMP2,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_DEEMPH3_SW] = {</div><div class='add'>+		.name = "Channel 3 Deemphasis Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_DEEMP3,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_IZD_SW] = {</div><div class='add'>+		.name = "Infinite Zero Detect Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL1,</div><div class='add'>+		.mask1 = WM8766_DAC_IZD,</div><div class='add'>+	},</div><div class='add'>+	[WM8766_CTL_ZC_SW] = {</div><div class='add'>+		.name = "Zero Cross Detect Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8766_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8766_DAC2_ZCD,</div><div class='add'>+		.flags = WM8766_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* exported functions */</div><div class='add'>+</div><div class='add'>+void snd_wm8766_init(struct snd_wm8766 *wm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	static const u16 default_values[] = {</div><div class='add'>+		0x000, 0x100,</div><div class='add'>+		0x120, 0x000,</div><div class='add'>+		0x000, 0x100, 0x000, 0x100, 0x000,</div><div class='add'>+		0x000, 0x080,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(wm-&gt;ctl, snd_wm8766_default_ctl, sizeof(wm-&gt;ctl));</div><div class='add'>+</div><div class='add'>+	snd_wm8766_write(wm, WM8766_REG_RESET, 0x00); /* reset */</div><div class='add'>+	udelay(10);</div><div class='add'>+	/* load defaults */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(default_values); i++)</div><div class='add'>+		snd_wm8766_write(wm, i, default_values[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8766_resume(struct snd_wm8766 *wm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WM8766_REG_COUNT; i++)</div><div class='add'>+		snd_wm8766_write(wm, i, wm-&gt;regs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac)</div><div class='add'>+{</div><div class='add'>+	u16 val = wm-&gt;regs[WM8766_REG_IFCTRL] &amp; ~WM8766_IF_MASK;</div><div class='add'>+</div><div class='add'>+	dac &amp;= WM8766_IF_MASK;</div><div class='add'>+	snd_wm8766_write(wm, WM8766_REG_IFCTRL, val | dac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8766_volume_restore(struct snd_wm8766 *wm)</div><div class='add'>+{</div><div class='add'>+	u16 val = wm-&gt;regs[WM8766_REG_DACR1];</div><div class='add'>+	/* restore volume after MCLK stopped */</div><div class='add'>+	snd_wm8766_write(wm, WM8766_REG_DACR1, val | WM8766_VOL_UPDATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mixer callbacks */</div><div class='add'>+</div><div class='add'>+static int snd_wm8766_volume_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8766 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO) ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = wm-&gt;ctl[n].min;</div><div class='add'>+	uinfo-&gt;value.integer.max = wm-&gt;ctl[n].max;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8766_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8766 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, wm-&gt;ctl[n].max,</div><div class='add'>+						wm-&gt;ctl[n].enum_names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8766_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8766 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+	u16 val1, val2;</div><div class='add'>+</div><div class='add'>+	if (wm-&gt;ctl[n].get)</div><div class='add'>+		wm-&gt;ctl[n].get(wm, &amp;val1, &amp;val2);</div><div class='add'>+	else {</div><div class='add'>+		val1 = wm-&gt;regs[wm-&gt;ctl[n].reg1] &amp; wm-&gt;ctl[n].mask1;</div><div class='add'>+		val1 &gt;&gt;= __ffs(wm-&gt;ctl[n].mask1);</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO) {</div><div class='add'>+			val2 = wm-&gt;regs[wm-&gt;ctl[n].reg2] &amp; wm-&gt;ctl[n].mask2;</div><div class='add'>+			val2 &gt;&gt;= __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+			if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_VOL_UPDATE)</div><div class='add'>+				val2 &amp;= ~WM8766_VOL_UPDATE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_INVERT) {</div><div class='add'>+		val1 = wm-&gt;ctl[n].max - (val1 - wm-&gt;ctl[n].min);</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO)</div><div class='add'>+			val2 = wm-&gt;ctl[n].max - (val2 - wm-&gt;ctl[n].min);</div><div class='add'>+	}</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = val1;</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO)</div><div class='add'>+		ucontrol-&gt;value.integer.value[1] = val2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8766_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8766 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+	u16 val, regval1, regval2;</div><div class='add'>+</div><div class='add'>+	/* this also works for enum because value is a union */</div><div class='add'>+	regval1 = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	regval2 = ucontrol-&gt;value.integer.value[1];</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_INVERT) {</div><div class='add'>+		regval1 = wm-&gt;ctl[n].max - (regval1 - wm-&gt;ctl[n].min);</div><div class='add'>+		regval2 = wm-&gt;ctl[n].max - (regval2 - wm-&gt;ctl[n].min);</div><div class='add'>+	}</div><div class='add'>+	if (wm-&gt;ctl[n].set)</div><div class='add'>+		wm-&gt;ctl[n].set(wm, regval1, regval2);</div><div class='add'>+	else {</div><div class='add'>+		val = wm-&gt;regs[wm-&gt;ctl[n].reg1] &amp; ~wm-&gt;ctl[n].mask1;</div><div class='add'>+		val |= regval1 &lt;&lt; __ffs(wm-&gt;ctl[n].mask1);</div><div class='add'>+		/* both stereo controls in one register */</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO &amp;&amp;</div><div class='add'>+				wm-&gt;ctl[n].reg1 == wm-&gt;ctl[n].reg2) {</div><div class='add'>+			val &amp;= ~wm-&gt;ctl[n].mask2;</div><div class='add'>+			val |= regval2 &lt;&lt; __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+		}</div><div class='add'>+		snd_wm8766_write(wm, wm-&gt;ctl[n].reg1, val);</div><div class='add'>+		/* stereo controls in different registers */</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_STEREO &amp;&amp;</div><div class='add'>+				wm-&gt;ctl[n].reg1 != wm-&gt;ctl[n].reg2) {</div><div class='add'>+			val = wm-&gt;regs[wm-&gt;ctl[n].reg2] &amp; ~wm-&gt;ctl[n].mask2;</div><div class='add'>+			val |= regval2 &lt;&lt; __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+			if (wm-&gt;ctl[n].flags &amp; WM8766_FLAG_VOL_UPDATE)</div><div class='add'>+				val |= WM8766_VOL_UPDATE;</div><div class='add'>+			snd_wm8766_write(wm, wm-&gt;ctl[n].reg2, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8766_add_control(struct snd_wm8766 *wm, int num)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new cont;</div><div class='add'>+	struct snd_kcontrol *ctl;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cont, 0, sizeof(cont));</div><div class='add'>+	cont.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	cont.private_value = num;</div><div class='add'>+	cont.name = wm-&gt;ctl[num].name;</div><div class='add'>+	cont.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+	if (wm-&gt;ctl[num].flags &amp; WM8766_FLAG_LIM ||</div><div class='add'>+	    wm-&gt;ctl[num].flags &amp; WM8766_FLAG_ALC)</div><div class='add'>+		cont.access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	cont.tlv.p = NULL;</div><div class='add'>+	cont.get = snd_wm8766_ctl_get;</div><div class='add'>+	cont.put = snd_wm8766_ctl_put;</div><div class='add'>+</div><div class='add'>+	switch (wm-&gt;ctl[num].type) {</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='add'>+		cont.info = snd_wm8766_volume_info;</div><div class='add'>+		cont.access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='add'>+		cont.tlv.p = wm-&gt;ctl[num].tlv;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='add'>+		wm-&gt;ctl[num].max = 1;</div><div class='add'>+		if (wm-&gt;ctl[num].flags &amp; WM8766_FLAG_STEREO)</div><div class='add'>+			cont.info = snd_ctl_boolean_stereo_info;</div><div class='add'>+		else</div><div class='add'>+			cont.info = snd_ctl_boolean_mono_info;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='add'>+		cont.info = snd_wm8766_enum_info;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ctl = snd_ctl_new1(&amp;cont, wm);</div><div class='add'>+	if (!ctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	wm-&gt;ctl[num].kctl = ctl;</div><div class='add'>+</div><div class='add'>+	return snd_ctl_add(wm-&gt;card, ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_wm8766_build_controls(struct snd_wm8766 *wm)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WM8766_CTL_COUNT; i++)</div><div class='add'>+		if (wm-&gt;ctl[i].name) {</div><div class='add'>+			err = snd_wm8766_add_control(wm, i);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/pci/ice1712/wm8766.h b/sound/pci/ice1712/wm8766.h<br/>new file mode 100644<br/>index 000000000000..44ab7c72a3d1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wm8766.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wm8766.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef __SOUND_WM8766_H</div><div class='add'>+#define __SOUND_WM8766_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   ALSA driver for ICEnsemble VT17xx</div><div class='add'>+ *</div><div class='add'>+ *   Lowlevel functions for WM8766 codec</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (c) 2012 Ondrej Zary &lt;linux@rainbow-software.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define WM8766_REG_DACL1	0x00</div><div class='add'>+#define WM8766_REG_DACR1	0x01</div><div class='add'>+#define WM8766_VOL_MASK			0x1ff		/* incl. update bit */</div><div class='add'>+#define WM8766_VOL_UPDATE		(1 &lt;&lt; 8)	/* update volume */</div><div class='add'>+#define WM8766_REG_DACCTRL1	0x02</div><div class='add'>+#define WM8766_DAC_MUTEALL		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8766_DAC_DEEMPALL		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC_PDWN			(1 &lt;&lt; 2)</div><div class='add'>+#define WM8766_DAC_ATC			(1 &lt;&lt; 3)</div><div class='add'>+#define WM8766_DAC_IZD			(1 &lt;&lt; 4)</div><div class='add'>+#define WM8766_DAC_PL_MASK		0x1e0</div><div class='add'>+#define WM8766_DAC_PL_LL		(1 &lt;&lt; 5)	/* L chan: L signal */</div><div class='add'>+#define WM8766_DAC_PL_LR		(2 &lt;&lt; 5)	/* L chan: R signal */</div><div class='add'>+#define WM8766_DAC_PL_LB		(3 &lt;&lt; 5)	/* L chan: both */</div><div class='add'>+#define WM8766_DAC_PL_RL		(1 &lt;&lt; 7)	/* R chan: L signal */</div><div class='add'>+#define WM8766_DAC_PL_RR		(2 &lt;&lt; 7)	/* R chan: R signal */</div><div class='add'>+#define WM8766_DAC_PL_RB		(3 &lt;&lt; 7)	/* R chan: both */</div><div class='add'>+#define WM8766_REG_IFCTRL	0x03</div><div class='add'>+#define WM8766_IF_FMT_RIGHTJ		(0 &lt;&lt; 0)</div><div class='add'>+#define WM8766_IF_FMT_LEFTJ		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8766_IF_FMT_I2S		(2 &lt;&lt; 0)</div><div class='add'>+#define WM8766_IF_FMT_DSP		(3 &lt;&lt; 0)</div><div class='add'>+#define WM8766_IF_DSP_LATE		(1 &lt;&lt; 2)	/* in DSP mode */</div><div class='add'>+#define WM8766_IF_LRC_INVERTED		(1 &lt;&lt; 2)	/* in other modes */</div><div class='add'>+#define WM8766_IF_BCLK_INVERTED		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8766_IF_IWL_16BIT		(0 &lt;&lt; 4)</div><div class='add'>+#define WM8766_IF_IWL_20BIT		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8766_IF_IWL_24BIT		(2 &lt;&lt; 4)</div><div class='add'>+#define WM8766_IF_IWL_32BIT		(3 &lt;&lt; 4)</div><div class='add'>+#define WM8766_IF_MASK			0x3f</div><div class='add'>+#define WM8766_PHASE_INVERT1		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8766_PHASE_INVERT2		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8766_PHASE_INVERT3		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8766_REG_DACL2	0x04</div><div class='add'>+#define WM8766_REG_DACR2	0x05</div><div class='add'>+#define WM8766_REG_DACL3	0x06</div><div class='add'>+#define WM8766_REG_DACR3	0x07</div><div class='add'>+#define WM8766_REG_MASTDA	0x08</div><div class='add'>+#define WM8766_REG_DACCTRL2	0x09</div><div class='add'>+#define WM8766_DAC2_ZCD			(1 &lt;&lt; 0)</div><div class='add'>+#define WM8766_DAC2_ZFLAG_ALL		(0 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC2_ZFLAG_1		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC2_ZFLAG_2		(2 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC2_ZFLAG_3		(3 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC2_MUTE1		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8766_DAC2_MUTE2		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8766_DAC2_MUTE3		(1 &lt;&lt; 5)</div><div class='add'>+#define WM8766_DAC2_DEEMP1		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC2_DEEMP2		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8766_DAC2_DEEMP3		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8766_REG_DACCTRL3	0x0a</div><div class='add'>+#define WM8766_DAC3_DACPD1		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8766_DAC3_DACPD2		(1 &lt;&lt; 2)</div><div class='add'>+#define WM8766_DAC3_DACPD3		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8766_DAC3_PWRDNALL		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8766_DAC3_POWER_MASK		0x1e</div><div class='add'>+#define WM8766_DAC3_MASTER		(1 &lt;&lt; 5)</div><div class='add'>+#define WM8766_DAC3_DAC128FS		(0 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_DAC192FS		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_DAC256FS		(2 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_DAC384FS		(3 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_DAC512FS		(4 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_DAC768FS		(5 &lt;&lt; 6)</div><div class='add'>+#define WM8766_DAC3_MSTR_MASK		0x1e0</div><div class='add'>+#define WM8766_REG_MUTE1	0x0c</div><div class='add'>+#define WM8766_MUTE1_MPD		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8766_REG_MUTE2	0x0f</div><div class='add'>+#define WM8766_MUTE2_MPD		(1 &lt;&lt; 5)</div><div class='add'>+#define WM8766_REG_RESET	0x1f</div><div class='add'>+</div><div class='add'>+#define WM8766_REG_COUNT	0x10	/* don't cache the RESET register */</div><div class='add'>+</div><div class='add'>+struct snd_wm8766;</div><div class='add'>+</div><div class='add'>+struct snd_wm8766_ops {</div><div class='add'>+	void (*write)(struct snd_wm8766 *wm, u16 addr, u16 data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_wm8766_ctl_id {</div><div class='add'>+	WM8766_CTL_CH1_VOL,</div><div class='add'>+	WM8766_CTL_CH2_VOL,</div><div class='add'>+	WM8766_CTL_CH3_VOL,</div><div class='add'>+	WM8766_CTL_CH1_SW,</div><div class='add'>+	WM8766_CTL_CH2_SW,</div><div class='add'>+	WM8766_CTL_CH3_SW,</div><div class='add'>+	WM8766_CTL_PHASE1_SW,</div><div class='add'>+	WM8766_CTL_PHASE2_SW,</div><div class='add'>+	WM8766_CTL_PHASE3_SW,</div><div class='add'>+	WM8766_CTL_DEEMPH1_SW,</div><div class='add'>+	WM8766_CTL_DEEMPH2_SW,</div><div class='add'>+	WM8766_CTL_DEEMPH3_SW,</div><div class='add'>+	WM8766_CTL_IZD_SW,</div><div class='add'>+	WM8766_CTL_ZC_SW,</div><div class='add'>+</div><div class='add'>+	WM8766_CTL_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WM8766_ENUM_MAX		16</div><div class='add'>+</div><div class='add'>+#define WM8766_FLAG_STEREO	(1 &lt;&lt; 0)</div><div class='add'>+#define WM8766_FLAG_VOL_UPDATE	(1 &lt;&lt; 1)</div><div class='add'>+#define WM8766_FLAG_INVERT	(1 &lt;&lt; 2)</div><div class='add'>+#define WM8766_FLAG_LIM		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8766_FLAG_ALC		(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+struct snd_wm8766_ctl {</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	const char *name;</div><div class='add'>+	snd_ctl_elem_type_t type;</div><div class='add'>+	const char *const enum_names[WM8766_ENUM_MAX];</div><div class='add'>+	const unsigned int *tlv;</div><div class='add'>+	u16 reg1, reg2, mask1, mask2, min, max, flags;</div><div class='add'>+	void (*set)(struct snd_wm8766 *wm, u16 ch1, u16 ch2);</div><div class='add'>+	void (*get)(struct snd_wm8766 *wm, u16 *ch1, u16 *ch2);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_wm8766_agc_mode { WM8766_AGC_OFF, WM8766_AGC_LIM, WM8766_AGC_ALC };</div><div class='add'>+</div><div class='add'>+struct snd_wm8766 {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_wm8766_ctl ctl[WM8766_CTL_COUNT];</div><div class='add'>+	enum snd_wm8766_agc_mode agc_mode;</div><div class='add'>+	struct snd_wm8766_ops ops;</div><div class='add'>+	u16 regs[WM8766_REG_COUNT];	/* 9-bit registers */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void snd_wm8766_init(struct snd_wm8766 *wm);</div><div class='add'>+void snd_wm8766_resume(struct snd_wm8766 *wm);</div><div class='add'>+void snd_wm8766_set_if(struct snd_wm8766 *wm, u16 dac);</div><div class='add'>+void snd_wm8766_volume_restore(struct snd_wm8766 *wm);</div><div class='add'>+int snd_wm8766_build_controls(struct snd_wm8766 *wm);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_WM8766_H */</div><div class='head'>diff --git a/sound/pci/ice1712/wm8776.c b/sound/pci/ice1712/wm8776.c<br/>new file mode 100644<br/>index 000000000000..493425697bb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wm8776.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wm8776.c</a></div><div class='hunk'>@@ -0,0 +1,601 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *   ALSA driver for ICEnsemble VT17xx</div><div class='add'>+ *</div><div class='add'>+ *   Lowlevel functions for WM8776 codec</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (c) 2012 Ondrej Zary &lt;linux@rainbow-software.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include "wm8776.h"</div><div class='add'>+</div><div class='add'>+/* low-level access */</div><div class='add'>+</div><div class='add'>+static void snd_wm8776_write(struct snd_wm8776 *wm, u16 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	u8 bus_addr = addr &lt;&lt; 1 | data &gt;&gt; 8;	/* addr + 9th data bit */</div><div class='add'>+	u8 bus_data = data &amp; 0xff;		/* remaining 8 data bits */</div><div class='add'>+</div><div class='add'>+	if (addr &lt; WM8776_REG_RESET)</div><div class='add'>+		wm-&gt;regs[addr] = data;</div><div class='add'>+	wm-&gt;ops.write(wm, bus_addr, bus_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* register-level functions */</div><div class='add'>+</div><div class='add'>+static void snd_wm8776_activate_ctl(struct snd_wm8776 *wm,</div><div class='add'>+				    const char *ctl_name,</div><div class='add'>+				    bool active)</div><div class='add'>+{</div><div class='add'>+	struct snd_card *card = wm-&gt;card;</div><div class='add'>+	struct snd_kcontrol *kctl;</div><div class='add'>+	struct snd_kcontrol_volatile *vd;</div><div class='add'>+	unsigned int index_offset;</div><div class='add'>+</div><div class='add'>+	kctl = snd_ctl_find_id_mixer(card, ctl_name);</div><div class='add'>+	if (!kctl)</div><div class='add'>+		return;</div><div class='add'>+	index_offset = snd_ctl_get_ioff(kctl, &amp;kctl-&gt;id);</div><div class='add'>+	vd = &amp;kctl-&gt;vd[index_offset];</div><div class='add'>+	if (active)</div><div class='add'>+		vd-&gt;access &amp;= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	else</div><div class='add'>+		vd-&gt;access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_INFO, &amp;kctl-&gt;id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_wm8776_update_agc_ctl(struct snd_wm8776 *wm)</div><div class='add'>+{</div><div class='add'>+	int i, flags_on = 0, flags_off = 0;</div><div class='add'>+</div><div class='add'>+	switch (wm-&gt;agc_mode) {</div><div class='add'>+	case WM8776_AGC_OFF:</div><div class='add'>+		flags_off = WM8776_FLAG_LIM | WM8776_FLAG_ALC;</div><div class='add'>+		break;</div><div class='add'>+	case WM8776_AGC_LIM:</div><div class='add'>+		flags_off = WM8776_FLAG_ALC;</div><div class='add'>+		flags_on = WM8776_FLAG_LIM;</div><div class='add'>+		break;</div><div class='add'>+	case WM8776_AGC_ALC_R:</div><div class='add'>+	case WM8776_AGC_ALC_L:</div><div class='add'>+	case WM8776_AGC_ALC_STEREO:</div><div class='add'>+		flags_off = WM8776_FLAG_LIM;</div><div class='add'>+		flags_on = WM8776_FLAG_ALC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WM8776_CTL_COUNT; i++)</div><div class='add'>+		if (wm-&gt;ctl[i].flags &amp; flags_off)</div><div class='add'>+			snd_wm8776_activate_ctl(wm, wm-&gt;ctl[i].name, false);</div><div class='add'>+		else if (wm-&gt;ctl[i].flags &amp; flags_on)</div><div class='add'>+			snd_wm8776_activate_ctl(wm, wm-&gt;ctl[i].name, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_wm8776_set_agc(struct snd_wm8776 *wm, u16 agc, u16 nothing)</div><div class='add'>+{</div><div class='add'>+	u16 alc1 = wm-&gt;regs[WM8776_REG_ALCCTRL1] &amp; ~WM8776_ALC1_LCT_MASK;</div><div class='add'>+	u16 alc2 = wm-&gt;regs[WM8776_REG_ALCCTRL2] &amp; ~WM8776_ALC2_LCEN;</div><div class='add'>+</div><div class='add'>+	switch (agc) {</div><div class='add'>+	case 0:	/* Off */</div><div class='add'>+		wm-&gt;agc_mode = WM8776_AGC_OFF;</div><div class='add'>+		break;</div><div class='add'>+	case 1: /* Limiter */</div><div class='add'>+		alc2 |= WM8776_ALC2_LCEN;</div><div class='add'>+		wm-&gt;agc_mode = WM8776_AGC_LIM;</div><div class='add'>+		break;</div><div class='add'>+	case 2: /* ALC Right */</div><div class='add'>+		alc1 |= WM8776_ALC1_LCSEL_ALCR;</div><div class='add'>+		alc2 |= WM8776_ALC2_LCEN;</div><div class='add'>+		wm-&gt;agc_mode = WM8776_AGC_ALC_R;</div><div class='add'>+		break;</div><div class='add'>+	case 3: /* ALC Left */</div><div class='add'>+		alc1 |= WM8776_ALC1_LCSEL_ALCL;</div><div class='add'>+		alc2 |= WM8776_ALC2_LCEN;</div><div class='add'>+		wm-&gt;agc_mode = WM8776_AGC_ALC_L;</div><div class='add'>+		break;</div><div class='add'>+	case 4: /* ALC Stereo */</div><div class='add'>+		alc1 |= WM8776_ALC1_LCSEL_ALCSTEREO;</div><div class='add'>+		alc2 |= WM8776_ALC2_LCEN;</div><div class='add'>+		wm-&gt;agc_mode = WM8776_AGC_ALC_STEREO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	snd_wm8776_write(wm, WM8776_REG_ALCCTRL1, alc1);</div><div class='add'>+	snd_wm8776_write(wm, WM8776_REG_ALCCTRL2, alc2);</div><div class='add'>+	snd_wm8776_update_agc_ctl(wm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void snd_wm8776_get_agc(struct snd_wm8776 *wm, u16 *mode, u16 *nothing)</div><div class='add'>+{</div><div class='add'>+	*mode = wm-&gt;agc_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mixer controls */</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_hp_tlv, -7400, 100, 1);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_dac_tlv, -12750, 50, 1);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_adc_tlv, -10350, 50, 1);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_lct_tlv, -1600, 100, 0);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_maxgain_tlv, 0, 400, 0);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_ngth_tlv, -7800, 600, 0);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_maxatten_lim_tlv, -1200, 100, 0);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(wm8776_maxatten_alc_tlv, -2100, 400, 0);</div><div class='add'>+</div><div class='add'>+static const struct snd_wm8776_ctl snd_wm8776_default_ctl[WM8776_CTL_COUNT] = {</div><div class='add'>+	[WM8776_CTL_DAC_VOL] = {</div><div class='add'>+		.name = "Master Playback Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_dac_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_DACLVOL,</div><div class='add'>+		.reg2 = WM8776_REG_DACRVOL,</div><div class='add'>+		.mask1 = WM8776_DACVOL_MASK,</div><div class='add'>+		.mask2 = WM8776_DACVOL_MASK,</div><div class='add'>+		.max = 0xff,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO | WM8776_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_DAC_SW] = {</div><div class='add'>+		.name = "Master Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_DACCTRL1,</div><div class='add'>+		.reg2 = WM8776_REG_DACCTRL1,</div><div class='add'>+		.mask1 = WM8776_DAC_PL_LL,</div><div class='add'>+		.mask2 = WM8776_DAC_PL_RR,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_DAC_ZC_SW] = {</div><div class='add'>+		.name = "Master Zero Cross Detect Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_DACCTRL1,</div><div class='add'>+		.mask1 = WM8776_DAC_DZCEN,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_HP_VOL] = {</div><div class='add'>+		.name = "Headphone Playback Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_hp_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_HPLVOL,</div><div class='add'>+		.reg2 = WM8776_REG_HPRVOL,</div><div class='add'>+		.mask1 = WM8776_HPVOL_MASK,</div><div class='add'>+		.mask2 = WM8776_HPVOL_MASK,</div><div class='add'>+		.min = 0x2f,</div><div class='add'>+		.max = 0x7f,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO | WM8776_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_HP_SW] = {</div><div class='add'>+		.name = "Headphone Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_PWRDOWN,</div><div class='add'>+		.mask1 = WM8776_PWR_HPPD,</div><div class='add'>+		.flags = WM8776_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_HP_ZC_SW] = {</div><div class='add'>+		.name = "Headphone Zero Cross Detect Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_HPLVOL,</div><div class='add'>+		.reg2 = WM8776_REG_HPRVOL,</div><div class='add'>+		.mask1 = WM8776_VOL_HPZCEN,</div><div class='add'>+		.mask2 = WM8776_VOL_HPZCEN,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_AUX_SW] = {</div><div class='add'>+		.name = "AUX Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_OUTMUX,</div><div class='add'>+		.mask1 = WM8776_OUTMUX_AUX,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_BYPASS_SW] = {</div><div class='add'>+		.name = "Bypass Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_OUTMUX,</div><div class='add'>+		.mask1 = WM8776_OUTMUX_BYPASS,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_DAC_IZD_SW] = {</div><div class='add'>+		.name = "Infinite Zero Detect Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_DACCTRL1,</div><div class='add'>+		.mask1 = WM8776_DAC_IZD,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_PHASE_SW] = {</div><div class='add'>+		.name = "Phase Invert Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_PHASESWAP,</div><div class='add'>+		.reg2 = WM8776_REG_PHASESWAP,</div><div class='add'>+		.mask1 = WM8776_PHASE_INVERTL,</div><div class='add'>+		.mask2 = WM8776_PHASE_INVERTR,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_DEEMPH_SW] = {</div><div class='add'>+		.name = "Deemphasis Playback Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_DACCTRL2,</div><div class='add'>+		.mask1 = WM8776_DAC2_DEEMPH,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ADC_VOL] = {</div><div class='add'>+		.name = "Input Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_adc_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_ADCLVOL,</div><div class='add'>+		.reg2 = WM8776_REG_ADCRVOL,</div><div class='add'>+		.mask1 = WM8776_ADC_GAIN_MASK,</div><div class='add'>+		.mask2 = WM8776_ADC_GAIN_MASK,</div><div class='add'>+		.max = 0xff,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO | WM8776_FLAG_VOL_UPDATE,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ADC_SW] = {</div><div class='add'>+		.name = "Input Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.reg2 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUTEL,</div><div class='add'>+		.mask2 = WM8776_ADC_MUTER,</div><div class='add'>+		.flags = WM8776_FLAG_STEREO | WM8776_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_INPUT1_SW] = {</div><div class='add'>+		.name = "AIN1 Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUX_AIN1,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_INPUT2_SW] = {</div><div class='add'>+		.name = "AIN2 Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUX_AIN2,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_INPUT3_SW] = {</div><div class='add'>+		.name = "AIN3 Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUX_AIN3,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_INPUT4_SW] = {</div><div class='add'>+		.name = "AIN4 Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUX_AIN4,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_INPUT5_SW] = {</div><div class='add'>+		.name = "AIN5 Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_ADCMUX,</div><div class='add'>+		.mask1 = WM8776_ADC_MUX_AIN5,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_AGC_SEL] = {</div><div class='add'>+		.name = "AGC Select Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = { "Off", "Limiter", "ALC Right", "ALC Left",</div><div class='add'>+				"ALC Stereo" },</div><div class='add'>+		.max = 5,	/* .enum_names item count */</div><div class='add'>+		.set = snd_wm8776_set_agc,</div><div class='add'>+		.get = snd_wm8776_get_agc,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_LIM_THR] = {</div><div class='add'>+		.name = "Limiter Threshold Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_lct_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL1,</div><div class='add'>+		.mask1 = WM8776_ALC1_LCT_MASK,</div><div class='add'>+		.max = 15,</div><div class='add'>+		.flags = WM8776_FLAG_LIM,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_LIM_ATK] = {</div><div class='add'>+		.name = "Limiter Attack Time Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = { "0.25 ms", "0.5 ms", "1 ms", "2 ms", "4 ms",</div><div class='add'>+			"8 ms", "16 ms", "32 ms", "64 ms", "128 ms", "256 ms" },</div><div class='add'>+		.max = 11,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL3,</div><div class='add'>+		.mask1 = WM8776_ALC3_ATK_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_LIM,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_LIM_DCY] = {</div><div class='add'>+		.name = "Limiter Decay Time Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = {	"1.2 ms", "2.4 ms", "4.8 ms", "9.6 ms",</div><div class='add'>+			"19.2 ms", "38.4 ms", "76.8 ms", "154 ms", "307 ms",</div><div class='add'>+			"614 ms", "1.23 s" },</div><div class='add'>+		.max = 11,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL3,</div><div class='add'>+		.mask1 = WM8776_ALC3_DCY_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_LIM,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_LIM_TRANWIN] = {</div><div class='add'>+		.name = "Limiter Transient Window Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = {	"0 us", "62.5 us", "125 us", "250 us", "500 us",</div><div class='add'>+			"1 ms", "2 ms", "4 ms" },</div><div class='add'>+		.max = 8,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_LIMITER,</div><div class='add'>+		.mask1 = WM8776_LIM_TRANWIN_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_LIM,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_LIM_MAXATTN] = {</div><div class='add'>+		.name = "Limiter Maximum Attenuation Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_maxatten_lim_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_LIMITER,</div><div class='add'>+		.mask1 = WM8776_LIM_MAXATTEN_MASK,</div><div class='add'>+		.min = 3,</div><div class='add'>+		.max = 12,</div><div class='add'>+		.flags = WM8776_FLAG_LIM | WM8776_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_TGT] = {</div><div class='add'>+		.name = "ALC Target Level Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_lct_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL1,</div><div class='add'>+		.mask1 = WM8776_ALC1_LCT_MASK,</div><div class='add'>+		.max = 15,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_ATK] = {</div><div class='add'>+		.name = "ALC Attack Time Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = { "8.40 ms", "16.8 ms", "33.6 ms", "67.2 ms",</div><div class='add'>+			"134 ms", "269 ms", "538 ms", "1.08 s",	"2.15 s",</div><div class='add'>+			"4.3 s", "8.6 s" },</div><div class='add'>+		.max = 11,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL3,</div><div class='add'>+		.mask1 = WM8776_ALC3_ATK_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_DCY] = {</div><div class='add'>+		.name = "ALC Decay Time Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = {	"33.5 ms", "67.0 ms", "134 ms", "268 ms",</div><div class='add'>+			"536 ms", "1.07 s", "2.14 s", "4.29 s",	"8.58 s",</div><div class='add'>+			"17.2 s", "34.3 s" },</div><div class='add'>+		.max = 11,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL3,</div><div class='add'>+		.mask1 = WM8776_ALC3_DCY_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_MAXGAIN] = {</div><div class='add'>+		.name = "ALC Maximum Gain Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_maxgain_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL1,</div><div class='add'>+		.mask1 = WM8776_ALC1_MAXGAIN_MASK,</div><div class='add'>+		.min = 1,</div><div class='add'>+		.max = 7,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_MAXATTN] = {</div><div class='add'>+		.name = "ALC Maximum Attenuation Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_maxatten_alc_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_LIMITER,</div><div class='add'>+		.mask1 = WM8776_LIM_MAXATTEN_MASK,</div><div class='add'>+		.min = 10,</div><div class='add'>+		.max = 15,</div><div class='add'>+		.flags = WM8776_FLAG_ALC | WM8776_FLAG_INVERT,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_ALC_HLD] = {</div><div class='add'>+		.name = "ALC Hold Time Capture Enum",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_ENUMERATED,</div><div class='add'>+		.enum_names = {	"0 ms", "2.67 ms", "5.33 ms", "10.6 ms",</div><div class='add'>+			"21.3 ms", "42.7 ms", "85.3 ms", "171 ms", "341 ms",</div><div class='add'>+			"683 ms", "1.37 s", "2.73 s", "5.46 s", "10.9 s",</div><div class='add'>+			"21.8 s", "43.7 s" },</div><div class='add'>+		.max = 16,	/* .enum_names item count */</div><div class='add'>+		.reg1 = WM8776_REG_ALCCTRL2,</div><div class='add'>+		.mask1 = WM8776_ALC2_HOLD_MASK,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_NGT_SW] = {</div><div class='add'>+		.name = "Noise Gate Capture Switch",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_BOOLEAN,</div><div class='add'>+		.reg1 = WM8776_REG_NOISEGATE,</div><div class='add'>+		.mask1 = WM8776_NGAT_ENABLE,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+	[WM8776_CTL_NGT_THR] = {</div><div class='add'>+		.name = "Noise Gate Threshold Capture Volume",</div><div class='add'>+		.type = SNDRV_CTL_ELEM_TYPE_INTEGER,</div><div class='add'>+		.tlv = wm8776_ngth_tlv,</div><div class='add'>+		.reg1 = WM8776_REG_NOISEGATE,</div><div class='add'>+		.mask1 = WM8776_NGAT_THR_MASK,</div><div class='add'>+		.max = 7,</div><div class='add'>+		.flags = WM8776_FLAG_ALC,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* exported functions */</div><div class='add'>+</div><div class='add'>+void snd_wm8776_init(struct snd_wm8776 *wm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	static const u16 default_values[] = {</div><div class='add'>+		0x000, 0x100, 0x000,</div><div class='add'>+		0x000, 0x100, 0x000,</div><div class='add'>+		0x000, 0x090, 0x000, 0x000,</div><div class='add'>+		0x022, 0x022, 0x022,</div><div class='add'>+		0x008, 0x0cf, 0x0cf, 0x07b, 0x000,</div><div class='add'>+		0x032, 0x000, 0x0a6, 0x001, 0x001</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(wm-&gt;ctl, snd_wm8776_default_ctl, sizeof(wm-&gt;ctl));</div><div class='add'>+</div><div class='add'>+	snd_wm8776_write(wm, WM8776_REG_RESET, 0x00); /* reset */</div><div class='add'>+	udelay(10);</div><div class='add'>+	/* load defaults */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(default_values); i++)</div><div class='add'>+		snd_wm8776_write(wm, i, default_values[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8776_resume(struct snd_wm8776 *wm)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WM8776_REG_COUNT; i++)</div><div class='add'>+		snd_wm8776_write(wm, i, wm-&gt;regs[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8776_set_power(struct snd_wm8776 *wm, u16 power)</div><div class='add'>+{</div><div class='add'>+	snd_wm8776_write(wm, WM8776_REG_PWRDOWN, power);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void snd_wm8776_volume_restore(struct snd_wm8776 *wm)</div><div class='add'>+{</div><div class='add'>+	u16 val = wm-&gt;regs[WM8776_REG_DACRVOL];</div><div class='add'>+	/* restore volume after MCLK stopped */</div><div class='add'>+	snd_wm8776_write(wm, WM8776_REG_DACRVOL, val | WM8776_VOL_UPDATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mixer callbacks */</div><div class='add'>+</div><div class='add'>+static int snd_wm8776_volume_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				   struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8776 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO) ? 2 : 1;</div><div class='add'>+	uinfo-&gt;value.integer.min = wm-&gt;ctl[n].min;</div><div class='add'>+	uinfo-&gt;value.integer.max = wm-&gt;ctl[n].max;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8776_enum_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8776 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, wm-&gt;ctl[n].max,</div><div class='add'>+						wm-&gt;ctl[n].enum_names);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8776_ctl_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8776 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+	u16 val1, val2;</div><div class='add'>+</div><div class='add'>+	if (wm-&gt;ctl[n].get)</div><div class='add'>+		wm-&gt;ctl[n].get(wm, &amp;val1, &amp;val2);</div><div class='add'>+	else {</div><div class='add'>+		val1 = wm-&gt;regs[wm-&gt;ctl[n].reg1] &amp; wm-&gt;ctl[n].mask1;</div><div class='add'>+		val1 &gt;&gt;= __ffs(wm-&gt;ctl[n].mask1);</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO) {</div><div class='add'>+			val2 = wm-&gt;regs[wm-&gt;ctl[n].reg2] &amp; wm-&gt;ctl[n].mask2;</div><div class='add'>+			val2 &gt;&gt;= __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+			if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_VOL_UPDATE)</div><div class='add'>+				val2 &amp;= ~WM8776_VOL_UPDATE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_INVERT) {</div><div class='add'>+		val1 = wm-&gt;ctl[n].max - (val1 - wm-&gt;ctl[n].min);</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO)</div><div class='add'>+			val2 = wm-&gt;ctl[n].max - (val2 - wm-&gt;ctl[n].min);</div><div class='add'>+	}</div><div class='add'>+	ucontrol-&gt;value.integer.value[0] = val1;</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO)</div><div class='add'>+		ucontrol-&gt;value.integer.value[1] = val2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8776_ctl_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+				  struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct snd_wm8776 *wm = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int n = kcontrol-&gt;private_value;</div><div class='add'>+	u16 val, regval1, regval2;</div><div class='add'>+</div><div class='add'>+	/* this also works for enum because value is a union */</div><div class='add'>+	regval1 = ucontrol-&gt;value.integer.value[0];</div><div class='add'>+	regval2 = ucontrol-&gt;value.integer.value[1];</div><div class='add'>+	if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_INVERT) {</div><div class='add'>+		regval1 = wm-&gt;ctl[n].max - (regval1 - wm-&gt;ctl[n].min);</div><div class='add'>+		regval2 = wm-&gt;ctl[n].max - (regval2 - wm-&gt;ctl[n].min);</div><div class='add'>+	}</div><div class='add'>+	if (wm-&gt;ctl[n].set)</div><div class='add'>+		wm-&gt;ctl[n].set(wm, regval1, regval2);</div><div class='add'>+	else {</div><div class='add'>+		val = wm-&gt;regs[wm-&gt;ctl[n].reg1] &amp; ~wm-&gt;ctl[n].mask1;</div><div class='add'>+		val |= regval1 &lt;&lt; __ffs(wm-&gt;ctl[n].mask1);</div><div class='add'>+		/* both stereo controls in one register */</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO &amp;&amp;</div><div class='add'>+				wm-&gt;ctl[n].reg1 == wm-&gt;ctl[n].reg2) {</div><div class='add'>+			val &amp;= ~wm-&gt;ctl[n].mask2;</div><div class='add'>+			val |= regval2 &lt;&lt; __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+		}</div><div class='add'>+		snd_wm8776_write(wm, wm-&gt;ctl[n].reg1, val);</div><div class='add'>+		/* stereo controls in different registers */</div><div class='add'>+		if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_STEREO &amp;&amp;</div><div class='add'>+				wm-&gt;ctl[n].reg1 != wm-&gt;ctl[n].reg2) {</div><div class='add'>+			val = wm-&gt;regs[wm-&gt;ctl[n].reg2] &amp; ~wm-&gt;ctl[n].mask2;</div><div class='add'>+			val |= regval2 &lt;&lt; __ffs(wm-&gt;ctl[n].mask2);</div><div class='add'>+			if (wm-&gt;ctl[n].flags &amp; WM8776_FLAG_VOL_UPDATE)</div><div class='add'>+				val |= WM8776_VOL_UPDATE;</div><div class='add'>+			snd_wm8776_write(wm, wm-&gt;ctl[n].reg2, val);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_wm8776_add_control(struct snd_wm8776 *wm, int num)</div><div class='add'>+{</div><div class='add'>+	struct snd_kcontrol_new cont;</div><div class='add'>+	struct snd_kcontrol *ctl;</div><div class='add'>+</div><div class='add'>+	memset(&amp;cont, 0, sizeof(cont));</div><div class='add'>+	cont.iface = SNDRV_CTL_ELEM_IFACE_MIXER;</div><div class='add'>+	cont.private_value = num;</div><div class='add'>+	cont.name = wm-&gt;ctl[num].name;</div><div class='add'>+	cont.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;</div><div class='add'>+	if (wm-&gt;ctl[num].flags &amp; WM8776_FLAG_LIM ||</div><div class='add'>+	    wm-&gt;ctl[num].flags &amp; WM8776_FLAG_ALC)</div><div class='add'>+		cont.access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;</div><div class='add'>+	cont.tlv.p = NULL;</div><div class='add'>+	cont.get = snd_wm8776_ctl_get;</div><div class='add'>+	cont.put = snd_wm8776_ctl_put;</div><div class='add'>+</div><div class='add'>+	switch (wm-&gt;ctl[num].type) {</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_INTEGER:</div><div class='add'>+		cont.info = snd_wm8776_volume_info;</div><div class='add'>+		cont.access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;</div><div class='add'>+		cont.tlv.p = wm-&gt;ctl[num].tlv;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_BOOLEAN:</div><div class='add'>+		wm-&gt;ctl[num].max = 1;</div><div class='add'>+		if (wm-&gt;ctl[num].flags &amp; WM8776_FLAG_STEREO)</div><div class='add'>+			cont.info = snd_ctl_boolean_stereo_info;</div><div class='add'>+		else</div><div class='add'>+			cont.info = snd_ctl_boolean_mono_info;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:</div><div class='add'>+		cont.info = snd_wm8776_enum_info;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	ctl = snd_ctl_new1(&amp;cont, wm);</div><div class='add'>+	if (!ctl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return snd_ctl_add(wm-&gt;card, ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int snd_wm8776_build_controls(struct snd_wm8776 *wm)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; WM8776_CTL_COUNT; i++)</div><div class='add'>+		if (wm-&gt;ctl[i].name) {</div><div class='add'>+			err = snd_wm8776_add_control(wm, i);</div><div class='add'>+			if (err &lt; 0)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/pci/ice1712/wm8776.h b/sound/pci/ice1712/wm8776.h<br/>new file mode 100644<br/>index 000000000000..0d49d0c7488a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wm8776.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wm8776.h</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+#ifndef __SOUND_WM8776_H</div><div class='add'>+#define __SOUND_WM8776_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *   ALSA driver for ICEnsemble VT17xx</div><div class='add'>+ *</div><div class='add'>+ *   Lowlevel functions for WM8776 codec</div><div class='add'>+ *</div><div class='add'>+ *	Copyright (c) 2012 Ondrej Zary &lt;linux@rainbow-software.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define WM8776_REG_HPLVOL	0x00</div><div class='add'>+#define WM8776_REG_HPRVOL	0x01</div><div class='add'>+#define WM8776_REG_HPMASTER	0x02</div><div class='add'>+#define WM8776_HPVOL_MASK		0x17f		/* incl. update bit */</div><div class='add'>+#define WM8776_VOL_HPZCEN		(1 &lt;&lt; 7)	/* zero cross detect */</div><div class='add'>+#define WM8776_VOL_UPDATE		(1 &lt;&lt; 8)	/* update volume */</div><div class='add'>+#define WM8776_REG_DACLVOL	0x03</div><div class='add'>+#define WM8776_REG_DACRVOL	0x04</div><div class='add'>+#define WM8776_REG_DACMASTER	0x05</div><div class='add'>+#define WM8776_DACVOL_MASK		0x1ff		/* incl. update bit */</div><div class='add'>+#define WM8776_REG_PHASESWAP	0x06</div><div class='add'>+#define WM8776_PHASE_INVERTL		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_PHASE_INVERTR		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_REG_DACCTRL1	0x07</div><div class='add'>+#define WM8776_DAC_DZCEN		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_DAC_ATC			(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_DAC_IZD			(1 &lt;&lt; 2)</div><div class='add'>+#define WM8776_DAC_TOD			(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_DAC_PL_MASK		0xf0</div><div class='add'>+#define WM8776_DAC_PL_LL		(1 &lt;&lt; 4)	/* L chan: L signal */</div><div class='add'>+#define WM8776_DAC_PL_LR		(2 &lt;&lt; 4)	/* L chan: R signal */</div><div class='add'>+#define WM8776_DAC_PL_LB		(3 &lt;&lt; 4)	/* L chan: both */</div><div class='add'>+#define WM8776_DAC_PL_RL		(1 &lt;&lt; 6)	/* R chan: L signal */</div><div class='add'>+#define WM8776_DAC_PL_RR		(2 &lt;&lt; 6)	/* R chan: R signal */</div><div class='add'>+#define WM8776_DAC_PL_RB		(3 &lt;&lt; 6)	/* R chan: both */</div><div class='add'>+#define WM8776_REG_DACMUTE	0x08</div><div class='add'>+#define WM8776_DACMUTE			(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_REG_DACCTRL2	0x09</div><div class='add'>+#define WM8776_DAC2_DEEMPH		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_DAC2_ZFLAG_DISABLE	(0 &lt;&lt; 1)</div><div class='add'>+#define WM8776_DAC2_ZFLAG_OWN		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_DAC2_ZFLAG_BOTH		(2 &lt;&lt; 1)</div><div class='add'>+#define WM8776_DAC2_ZFLAG_EITHER	(3 &lt;&lt; 1)</div><div class='add'>+#define WM8776_REG_DACIFCTRL	0x0a</div><div class='add'>+#define WM8776_FMT_RIGHTJ		(0 &lt;&lt; 0)</div><div class='add'>+#define WM8776_FMT_LEFTJ		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_FMT_I2S			(2 &lt;&lt; 0)</div><div class='add'>+#define WM8776_FMT_DSP			(3 &lt;&lt; 0)</div><div class='add'>+#define WM8776_FMT_DSP_LATE		(1 &lt;&lt; 2)	/* in DSP mode */</div><div class='add'>+#define WM8776_FMT_LRC_INVERTED		(1 &lt;&lt; 2)	/* in other modes */</div><div class='add'>+#define WM8776_FMT_BCLK_INVERTED	(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_FMT_16BIT		(0 &lt;&lt; 4)</div><div class='add'>+#define WM8776_FMT_20BIT		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8776_FMT_24BIT		(2 &lt;&lt; 4)</div><div class='add'>+#define WM8776_FMT_32BIT		(3 &lt;&lt; 4)</div><div class='add'>+#define WM8776_REG_ADCIFCTRL	0x0b</div><div class='add'>+#define WM8776_FMT_ADCMCLK_INVERTED	(1 &lt;&lt; 6)</div><div class='add'>+#define WM8776_FMT_ADCHPD		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_MSTRCTRL	0x0c</div><div class='add'>+#define WM8776_IF_ADC256FS		(2 &lt;&lt; 0)</div><div class='add'>+#define WM8776_IF_ADC384FS		(3 &lt;&lt; 0)</div><div class='add'>+#define WM8776_IF_ADC512FS		(4 &lt;&lt; 0)</div><div class='add'>+#define WM8776_IF_ADC768FS		(5 &lt;&lt; 0)</div><div class='add'>+#define WM8776_IF_OVERSAMP64		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_IF_DAC128FS		(0 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC192FS		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC256FS		(2 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC384FS		(3 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC512FS		(4 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC768FS		(5 &lt;&lt; 4)</div><div class='add'>+#define WM8776_IF_DAC_MASTER		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8776_IF_ADC_MASTER		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_PWRDOWN	0x0d</div><div class='add'>+#define WM8776_PWR_PDWN			(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_PWR_ADCPD		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_PWR_DACPD		(1 &lt;&lt; 2)</div><div class='add'>+#define WM8776_PWR_HPPD			(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_PWR_AINPD		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8776_REG_ADCLVOL	0x0e</div><div class='add'>+#define WM8776_REG_ADCRVOL	0x0f</div><div class='add'>+#define WM8776_ADC_GAIN_MASK		0xff</div><div class='add'>+#define WM8776_ADC_ZCEN			(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_ALCCTRL1	0x10</div><div class='add'>+#define WM8776_ALC1_LCT_MASK		0x0f	/* 0=-16dB, 1=-15dB..15=-1dB */</div><div class='add'>+#define WM8776_ALC1_MAXGAIN_MASK	0x70	/* 0,1=0dB, 2=+4dB...7=+24dB */</div><div class='add'>+#define WM8776_ALC1_LCSEL_MASK		0x180</div><div class='add'>+#define WM8776_ALC1_LCSEL_LIMITER	(0 &lt;&lt; 7)</div><div class='add'>+#define WM8776_ALC1_LCSEL_ALCR		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8776_ALC1_LCSEL_ALCL		(2 &lt;&lt; 7)</div><div class='add'>+#define WM8776_ALC1_LCSEL_ALCSTEREO	(3 &lt;&lt; 7)</div><div class='add'>+#define WM8776_REG_ALCCTRL2	0x11</div><div class='add'>+#define WM8776_ALC2_HOLD_MASK		0x0f	/*0=0ms, 1=2.67ms, 2=5.33ms.. */</div><div class='add'>+#define WM8776_ALC2_ZCEN		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8776_ALC2_LCEN		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_ALCCTRL3	0x12</div><div class='add'>+#define WM8776_ALC3_ATK_MASK		0x0f</div><div class='add'>+#define WM8776_ALC3_DCY_MASK		0xf0</div><div class='add'>+#define WM8776_ALC3_FDECAY		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_NOISEGATE	0x13</div><div class='add'>+#define WM8776_NGAT_ENABLE		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_NGAT_THR_MASK		0x1c	/*0=-78dB, 1=-72dB...7=-36dB */</div><div class='add'>+#define WM8776_REG_LIMITER	0x14</div><div class='add'>+#define WM8776_LIM_MAXATTEN_MASK	0x0f</div><div class='add'>+#define WM8776_LIM_TRANWIN_MASK		0x70	/*0=0us, 1=62.5us, 2=125us.. */</div><div class='add'>+#define WM8776_REG_ADCMUX	0x15</div><div class='add'>+#define WM8776_ADC_MUX_AIN1		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_ADC_MUX_AIN2		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_ADC_MUX_AIN3		(1 &lt;&lt; 2)</div><div class='add'>+#define WM8776_ADC_MUX_AIN4		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_ADC_MUX_AIN5		(1 &lt;&lt; 4)</div><div class='add'>+#define WM8776_ADC_MUTER		(1 &lt;&lt; 6)</div><div class='add'>+#define WM8776_ADC_MUTEL		(1 &lt;&lt; 7)</div><div class='add'>+#define WM8776_ADC_LRBOTH		(1 &lt;&lt; 8)</div><div class='add'>+#define WM8776_REG_OUTMUX	0x16</div><div class='add'>+#define WM8776_OUTMUX_DAC		(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_OUTMUX_AUX		(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_OUTMUX_BYPASS		(1 &lt;&lt; 2)</div><div class='add'>+#define WM8776_REG_RESET	0x17</div><div class='add'>+</div><div class='add'>+#define WM8776_REG_COUNT	0x17	/* don't cache the RESET register */</div><div class='add'>+</div><div class='add'>+struct snd_wm8776;</div><div class='add'>+</div><div class='add'>+struct snd_wm8776_ops {</div><div class='add'>+	void (*write)(struct snd_wm8776 *wm, u8 addr, u8 data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_wm8776_ctl_id {</div><div class='add'>+	WM8776_CTL_DAC_VOL,</div><div class='add'>+	WM8776_CTL_DAC_SW,</div><div class='add'>+	WM8776_CTL_DAC_ZC_SW,</div><div class='add'>+	WM8776_CTL_HP_VOL,</div><div class='add'>+	WM8776_CTL_HP_SW,</div><div class='add'>+	WM8776_CTL_HP_ZC_SW,</div><div class='add'>+	WM8776_CTL_AUX_SW,</div><div class='add'>+	WM8776_CTL_BYPASS_SW,</div><div class='add'>+	WM8776_CTL_DAC_IZD_SW,</div><div class='add'>+	WM8776_CTL_PHASE_SW,</div><div class='add'>+	WM8776_CTL_DEEMPH_SW,</div><div class='add'>+	WM8776_CTL_ADC_VOL,</div><div class='add'>+	WM8776_CTL_ADC_SW,</div><div class='add'>+	WM8776_CTL_INPUT1_SW,</div><div class='add'>+	WM8776_CTL_INPUT2_SW,</div><div class='add'>+	WM8776_CTL_INPUT3_SW,</div><div class='add'>+	WM8776_CTL_INPUT4_SW,</div><div class='add'>+	WM8776_CTL_INPUT5_SW,</div><div class='add'>+	WM8776_CTL_AGC_SEL,</div><div class='add'>+	WM8776_CTL_LIM_THR,</div><div class='add'>+	WM8776_CTL_LIM_ATK,</div><div class='add'>+	WM8776_CTL_LIM_DCY,</div><div class='add'>+	WM8776_CTL_LIM_TRANWIN,</div><div class='add'>+	WM8776_CTL_LIM_MAXATTN,</div><div class='add'>+	WM8776_CTL_ALC_TGT,</div><div class='add'>+	WM8776_CTL_ALC_ATK,</div><div class='add'>+	WM8776_CTL_ALC_DCY,</div><div class='add'>+	WM8776_CTL_ALC_MAXGAIN,</div><div class='add'>+	WM8776_CTL_ALC_MAXATTN,</div><div class='add'>+	WM8776_CTL_ALC_HLD,</div><div class='add'>+	WM8776_CTL_NGT_SW,</div><div class='add'>+	WM8776_CTL_NGT_THR,</div><div class='add'>+</div><div class='add'>+	WM8776_CTL_COUNT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define WM8776_ENUM_MAX		16</div><div class='add'>+</div><div class='add'>+#define WM8776_FLAG_STEREO	(1 &lt;&lt; 0)</div><div class='add'>+#define WM8776_FLAG_VOL_UPDATE	(1 &lt;&lt; 1)</div><div class='add'>+#define WM8776_FLAG_INVERT	(1 &lt;&lt; 2)</div><div class='add'>+#define WM8776_FLAG_LIM		(1 &lt;&lt; 3)</div><div class='add'>+#define WM8776_FLAG_ALC		(1 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+struct snd_wm8776_ctl {</div><div class='add'>+	const char *name;</div><div class='add'>+	snd_ctl_elem_type_t type;</div><div class='add'>+	const char *const enum_names[WM8776_ENUM_MAX];</div><div class='add'>+	const unsigned int *tlv;</div><div class='add'>+	u16 reg1, reg2, mask1, mask2, min, max, flags;</div><div class='add'>+	void (*set)(struct snd_wm8776 *wm, u16 ch1, u16 ch2);</div><div class='add'>+	void (*get)(struct snd_wm8776 *wm, u16 *ch1, u16 *ch2);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum snd_wm8776_agc_mode {</div><div class='add'>+	WM8776_AGC_OFF,</div><div class='add'>+	WM8776_AGC_LIM,</div><div class='add'>+	WM8776_AGC_ALC_R,</div><div class='add'>+	WM8776_AGC_ALC_L,</div><div class='add'>+	WM8776_AGC_ALC_STEREO</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct snd_wm8776 {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct snd_wm8776_ctl ctl[WM8776_CTL_COUNT];</div><div class='add'>+	enum snd_wm8776_agc_mode agc_mode;</div><div class='add'>+	struct snd_wm8776_ops ops;</div><div class='add'>+	u16 regs[WM8776_REG_COUNT];	/* 9-bit registers */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void snd_wm8776_init(struct snd_wm8776 *wm);</div><div class='add'>+void snd_wm8776_resume(struct snd_wm8776 *wm);</div><div class='add'>+void snd_wm8776_set_power(struct snd_wm8776 *wm, u16 power);</div><div class='add'>+void snd_wm8776_volume_restore(struct snd_wm8776 *wm);</div><div class='add'>+int snd_wm8776_build_controls(struct snd_wm8776 *wm);</div><div class='add'>+</div><div class='add'>+#endif /* __SOUND_WM8776_H */</div><div class='head'>diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c<br/>index e618f789026e..57a79536e7ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wtm.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wtm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wtm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wtm.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *	ALSA driver for ICEnsemble VT1724 (Envy24HT)</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,36 +7,27 @@</div><div class='ctx'>  *		Copyright (c) 2006 Guedez Clement &lt;klem.dev@gmail.com&gt;</div><div class='ctx'>  *		Some functions are taken from the Prodigy192 driver</div><div class='ctx'>  *		source</div><div class='del'>- *</div><div class='del'>- *	This program is free software; you can redistribute it and/or modify</div><div class='del'>- *	it under the terms of the GNU General Public License as published by</div><div class='del'>- *	the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *	(at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *	This program is distributed in the hope that it will be useful,</div><div class='del'>- *	but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- *	GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *	You should have received a copy of the GNU General Public License</div><div class='del'>- *	along with this program; if not, write to the Free Software</div><div class='del'>- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ice1712.h"</div><div class='ctx'> #include "envy24ht.h"</div><div class='ctx'> #include "wtm.h"</div><div class='ctx'> #include "stac946x.h"</div><div class='ctx'> </div><div class='add'>+struct wtm_spec {</div><div class='add'>+	/* rate change needs atomic mute/unmute of all dacs*/</div><div class='add'>+	struct mutex mute_mutex;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	2*ADC 6*DAC no1 ringbuffer r/w on i2c bus</div><div class='hunk'>@@ -69,15 +61,65 @@ static inline unsigned char stac9460_2_get(struct snd_ice1712 *ice, int reg)</div><div class='ctx'> /*</div><div class='ctx'>  *	DAC mute control</div><div class='ctx'>  */</div><div class='add'>+static void stac9460_dac_mute_all(struct snd_ice1712 *ice, unsigned char mute,</div><div class='add'>+				unsigned short int *change_mask)</div><div class='add'>+{</div><div class='add'>+	unsigned char new, old;</div><div class='add'>+	int id, idx, change;</div><div class='add'>+</div><div class='add'>+	/*stac9460 1*/</div><div class='add'>+	for (id = 0; id &lt; 7; id++) {</div><div class='add'>+		if (*change_mask &amp; (0x01 &lt;&lt; id)) {</div><div class='add'>+			if (id == 0)</div><div class='add'>+				idx = STAC946X_MASTER_VOLUME;</div><div class='add'>+			else</div><div class='add'>+				idx = STAC946X_LF_VOLUME - 1 + id;</div><div class='add'>+			old = stac9460_get(ice, idx);</div><div class='add'>+			new = (~mute &lt;&lt; 7 &amp; 0x80) | (old &amp; ~0x80);</div><div class='add'>+			change = (new != old);</div><div class='add'>+			if (change) {</div><div class='add'>+				stac9460_put(ice, idx, new);</div><div class='add'>+				*change_mask = *change_mask | (0x01 &lt;&lt; id);</div><div class='add'>+			} else {</div><div class='add'>+				*change_mask = *change_mask &amp; ~(0x01 &lt;&lt; id);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*stac9460 2*/</div><div class='add'>+	for (id = 0; id &lt; 3; id++) {</div><div class='add'>+		if (*change_mask &amp; (0x01 &lt;&lt; (id + 7))) {</div><div class='add'>+			if (id == 0)</div><div class='add'>+				idx = STAC946X_MASTER_VOLUME;</div><div class='add'>+			else</div><div class='add'>+				idx = STAC946X_LF_VOLUME - 1 + id;</div><div class='add'>+			old = stac9460_2_get(ice, idx);</div><div class='add'>+			new = (~mute &lt;&lt; 7 &amp; 0x80) | (old &amp; ~0x80);</div><div class='add'>+			change = (new != old);</div><div class='add'>+			if (change) {</div><div class='add'>+				stac9460_2_put(ice, idx, new);</div><div class='add'>+				*change_mask = *change_mask | (0x01 &lt;&lt; id);</div><div class='add'>+			} else {</div><div class='add'>+				*change_mask = *change_mask &amp; ~(0x01 &lt;&lt; id);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #define stac9460_dac_mute_info		snd_ctl_boolean_mono_info</div><div class='ctx'> </div><div class='ctx'> static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	struct wtm_spec *spec = ice-&gt;spec;</div><div class='ctx'> 	unsigned char val;</div><div class='ctx'> 	int idx, id;</div><div class='ctx'> </div><div class='add'>+	guard(mutex)(&amp;spec-&gt;mute_mutex);</div><div class='add'>+</div><div class='ctx'> 	if (kcontrol-&gt;private_value) {</div><div class='ctx'> 		idx = STAC946X_MASTER_VOLUME;</div><div class='ctx'> 		id = 0;</div><div class='hunk'>@@ -90,6 +132,7 @@ static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	else</div><div class='ctx'> 		val = stac9460_2_get(ice, idx - 6);</div><div class='ctx'> 	ucontrol-&gt;value.integer.value[0] = (~val &gt;&gt; 7) &amp; 0x1;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -339,8 +382,14 @@ static int stac9460_adc_vol_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> /*</div><div class='ctx'>  * MIC / LINE switch fonction</div><div class='ctx'>  */</div><div class='add'>+static int stac9460_mic_sw_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	static const char * const texts[2] = { "Line In", "Mic" };</div><div class='add'>+</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 2, texts);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define stac9460_mic_sw_info		snd_ctl_boolean_mono_info</div><div class='ctx'> </div><div class='ctx'> static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 				struct snd_ctl_elem_value *ucontrol)</div><div class='hunk'>@@ -354,7 +403,7 @@ static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		val = stac9460_get(ice, STAC946X_GENERAL_PURPOSE);</div><div class='ctx'> 	else</div><div class='ctx'> 		val = stac9460_2_get(ice, STAC946X_GENERAL_PURPOSE);</div><div class='del'>-	ucontrol-&gt;value.integer.value[0] = ~val&gt;&gt;7 &amp; 0x1;</div><div class='add'>+	ucontrol-&gt;value.enumerated.item[0] = (val &gt;&gt; 7) &amp; 0x1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -370,7 +419,7 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		old = stac9460_get(ice, STAC946X_GENERAL_PURPOSE);</div><div class='ctx'> 	else</div><div class='ctx'> 		old = stac9460_2_get(ice, STAC946X_GENERAL_PURPOSE);</div><div class='del'>-	new = (~ucontrol-&gt;value.integer.value[0] &lt;&lt; 7 &amp; 0x80) | (old &amp; ~0x80);</div><div class='add'>+	new = (ucontrol-&gt;value.enumerated.item[0] &lt;&lt; 7 &amp; 0x80) | (old &amp; ~0x80);</div><div class='ctx'> 	change = (new != old);</div><div class='ctx'> 	if (change) {</div><div class='ctx'> 		if (id == 0)</div><div class='hunk'>@@ -381,17 +430,62 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handler for setting correct codec rate - called when rate change is detected</div><div class='add'>+ */</div><div class='add'>+static void stac9460_set_rate_val(struct snd_ice1712 *ice, unsigned int rate)</div><div class='add'>+{</div><div class='add'>+	unsigned char old, new;</div><div class='add'>+	unsigned short int changed;</div><div class='add'>+	struct wtm_spec *spec = ice-&gt;spec;</div><div class='add'>+</div><div class='add'>+	if (rate == 0)  /* no hint - S/PDIF input is master, simply return */</div><div class='add'>+		return;</div><div class='add'>+	else if (rate &lt;= 48000)</div><div class='add'>+		new = 0x08;     /* 256x, base rate mode */</div><div class='add'>+	else if (rate &lt;= 96000)</div><div class='add'>+		new = 0x11;     /* 256x, mid rate mode */</div><div class='add'>+	else</div><div class='add'>+		new = 0x12;     /* 128x, high rate mode */</div><div class='add'>+</div><div class='add'>+	old = stac9460_get(ice, STAC946X_MASTER_CLOCKING);</div><div class='add'>+	if (old == new)</div><div class='add'>+		return;</div><div class='add'>+	/* change detected, setting master clock, muting first */</div><div class='add'>+	/* due to possible conflicts with mute controls - mutexing */</div><div class='add'>+	guard(mutex)(&amp;spec-&gt;mute_mutex);</div><div class='add'>+	/* we have to remember current mute status for each DAC */</div><div class='add'>+	changed = 0xFFFF;</div><div class='add'>+	stac9460_dac_mute_all(ice, 0, &amp;changed);</div><div class='add'>+	/*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/</div><div class='add'>+	stac9460_put(ice, STAC946X_MASTER_CLOCKING, new);</div><div class='add'>+	stac9460_2_put(ice, STAC946X_MASTER_CLOCKING, new);</div><div class='add'>+	udelay(10);</div><div class='add'>+	/* unmuting - only originally unmuted dacs -</div><div class='add'>+	* i.e. those changed when muting */</div><div class='add'>+	stac9460_dac_mute_all(ice, 1, &amp;changed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*Limits value in dB for fader*/</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0);</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Control tabs</div><div class='ctx'>  */</div><div class='del'>-static struct snd_kcontrol_new stac9640_controls[] __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new stac9640_controls[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			    SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='ctx'> 		.name = "Master Playback Switch",</div><div class='ctx'> 		.info = stac9460_dac_mute_info,</div><div class='ctx'> 		.get = stac9460_dac_mute_get,</div><div class='ctx'> 		.put = stac9460_dac_mute_put,</div><div class='del'>-		.private_value = 1</div><div class='add'>+		.private_value = 1,</div><div class='add'>+		.tlv = { .p = db_scale_dac }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -403,7 +497,7 @@ static struct snd_kcontrol_new stac9640_controls[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='del'>-		.name = "MIC/Line switch",</div><div class='add'>+		.name = "MIC/Line Input Enum",</div><div class='ctx'> 		.count = 2,</div><div class='ctx'> 		.info = stac9460_mic_sw_info,</div><div class='ctx'> 		.get = stac9460_mic_sw_get,</div><div class='hunk'>@@ -420,11 +514,15 @@ static struct snd_kcontrol_new stac9640_controls[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			    SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+</div><div class='ctx'> 		.name = "DAC Volume",</div><div class='ctx'> 		.count = 8,</div><div class='ctx'> 		.info = stac9460_dac_vol_info,</div><div class='ctx'> 		.get = stac9460_dac_vol_get,</div><div class='ctx'> 		.put = stac9460_dac_vol_put,</div><div class='add'>+		.tlv = { .p = db_scale_dac }</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='hunk'>@@ -436,19 +534,22 @@ static struct snd_kcontrol_new stac9640_controls[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+		.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+			    SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+</div><div class='ctx'> 		.name = "ADC Volume",</div><div class='ctx'> 		.count = 2,</div><div class='ctx'> 		.info = stac9460_adc_vol_info,</div><div class='ctx'> 		.get = stac9460_adc_vol_get,</div><div class='ctx'> 		.put = stac9460_adc_vol_put,</div><div class='del'>-</div><div class='add'>+		.tlv = { .p = db_scale_adc }</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*INIT*/</div><div class='del'>-static int __devinit wtm_add_controls(struct snd_ice1712 *ice)</div><div class='add'>+static int wtm_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -462,48 +563,60 @@ static int __devinit wtm_add_controls(struct snd_ice1712 *ice)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit wtm_init(struct snd_ice1712 *ice)</div><div class='add'>+static int wtm_init(struct snd_ice1712 *ice)</div><div class='ctx'> {</div><div class='del'>-	static unsigned short stac_inits_prodigy[] = {</div><div class='add'>+	static const unsigned short stac_inits_wtm[] = {</div><div class='ctx'> 		STAC946X_RESET, 0,</div><div class='add'>+		STAC946X_MASTER_CLOCKING, 0x11,</div><div class='ctx'> 		(unsigned short)-1</div><div class='ctx'> 	};</div><div class='del'>-	unsigned short *p;</div><div class='add'>+	const unsigned short *p;</div><div class='add'>+	struct wtm_spec *spec;</div><div class='ctx'> </div><div class='ctx'> 	/*WTM 192M*/</div><div class='ctx'> 	ice-&gt;num_total_dacs = 8;</div><div class='ctx'> 	ice-&gt;num_total_adcs = 4;</div><div class='ctx'> 	ice-&gt;force_rdma1 = 1;</div><div class='ctx'> </div><div class='add'>+	/*init mutex for dac mute conflict*/</div><div class='add'>+	spec = kzalloc(sizeof(*spec), GFP_KERNEL);</div><div class='add'>+	if (!spec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ice-&gt;spec = spec;</div><div class='add'>+	mutex_init(&amp;spec-&gt;mute_mutex);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> 	/*initialize codec*/</div><div class='del'>-	p = stac_inits_prodigy;</div><div class='add'>+	p = stac_inits_wtm;</div><div class='ctx'> 	for (; *p != (unsigned short)-1; p += 2) {</div><div class='ctx'> 		stac9460_put(ice, p[0], p[1]);</div><div class='ctx'> 		stac9460_2_put(ice, p[0], p[1]);</div><div class='ctx'> 	}</div><div class='add'>+	ice-&gt;gpio.set_pro_rate = stac9460_set_rate_val;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static unsigned char wtm_eeprom[] __devinitdata = {</div><div class='del'>-	0x47,	/*SYSCONF: clock 192KHz, 4ADC, 8DAC */</div><div class='del'>-	0x80,	/* ACLINK : I2S */</div><div class='del'>-	0xf8,	/* I2S: vol; 96k, 24bit, 192k */</div><div class='del'>-	0xc1	/*SPDIF: out-en, spidf ext out*/,</div><div class='del'>-	0x9f,	/* GPIO_DIR */</div><div class='del'>-	0xff,	/* GPIO_DIR1 */</div><div class='del'>-	0x7f,	/* GPIO_DIR2 */</div><div class='del'>-	0x9f,	/* GPIO_MASK */</div><div class='del'>-	0xff,	/* GPIO_MASK1 */</div><div class='del'>-	0x7f,	/* GPIO_MASK2 */</div><div class='del'>-	0x16,	/* GPIO_STATE */</div><div class='del'>-	0x80,	/* GPIO_STATE1 */</div><div class='del'>-	0x00,	/* GPIO_STATE2 */</div><div class='add'>+static const unsigned char wtm_eeprom[] = {</div><div class='add'>+	[ICE_EEP2_SYSCONF]      = 0x67, /*SYSCONF: clock 192KHz, mpu401,</div><div class='add'>+							4ADC, 8DAC */</div><div class='add'>+	[ICE_EEP2_ACLINK]       = 0x80, /* ACLINK : I2S */</div><div class='add'>+	[ICE_EEP2_I2S]          = 0xf8, /* I2S: vol; 96k, 24bit, 192k */</div><div class='add'>+	[ICE_EEP2_SPDIF]        = 0xc1, /*SPDIF: out-en, spidf ext out*/</div><div class='add'>+	[ICE_EEP2_GPIO_DIR]     = 0x9f,</div><div class='add'>+	[ICE_EEP2_GPIO_DIR1]    = 0xff,</div><div class='add'>+	[ICE_EEP2_GPIO_DIR2]    = 0x7f,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK]    = 0x9f,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK1]   = 0xff,</div><div class='add'>+	[ICE_EEP2_GPIO_MASK2]   = 0x7f,</div><div class='add'>+	[ICE_EEP2_GPIO_STATE]   = 0x16,</div><div class='add'>+	[ICE_EEP2_GPIO_STATE1]  = 0x80,</div><div class='add'>+	[ICE_EEP2_GPIO_STATE2]  = 0x00,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*entry point*/</div><div class='del'>-struct snd_ice1712_card_info snd_vt1724_wtm_cards[] __devinitdata = {</div><div class='add'>+struct snd_ice1712_card_info snd_vt1724_wtm_cards[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = VT1724_SUBDEVICE_WTM,</div><div class='ctx'> 		.name = "ESI Waveterminal 192M",</div><div class='head'>diff --git a/sound/pci/ice1712/wtm.h b/sound/pci/ice1712/wtm.h<br/>index 423c1a204c0b..1cfcbde15f42 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wtm.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/ice1712/wtm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/ice1712/wtm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/ice1712/wtm.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> #ifndef __SOUND_WTM_H</div><div class='ctx'> #define __SOUND_WTM_H</div><div class='ctx'> </div><div class='head'>diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c<br/>index 400f9ebd243e..3b53c5e63c29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/intel8x0.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/intel8x0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/intel8x0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/intel8x0.c</a></div><div class='hunk'>@@ -1,102 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA driver for Intel ICH (i8x0) chipsets</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2000 Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='ctx'>  *   This code also contains alpha support for SiS 735 chipsets provided</div><div class='ctx'>  *   by Mike Pieper &lt;mptei@users.sourceforge.net&gt;. We have no datasheet</div><div class='ctx'>  *   for SiS735, so the code is not fully functional.</div><div class='ctx'>  *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='ctx'> </div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='del'>-/* for 440MX workaround */</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='del'>-#include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"</div><div class='del'>-		"{Intel,82901AB-ICH0},"</div><div class='del'>-		"{Intel,82801BA-ICH2},"</div><div class='del'>-		"{Intel,82801CA-ICH3},"</div><div class='del'>-		"{Intel,82801DB-ICH4},"</div><div class='del'>-		"{Intel,ICH5},"</div><div class='del'>-		"{Intel,ICH6},"</div><div class='del'>-		"{Intel,ICH7},"</div><div class='del'>-		"{Intel,6300ESB},"</div><div class='del'>-		"{Intel,ESB2},"</div><div class='del'>-		"{Intel,MX440},"</div><div class='del'>-		"{SiS,SI7012},"</div><div class='del'>-		"{NVidia,nForce Audio},"</div><div class='del'>-		"{NVidia,nForce2 Audio},"</div><div class='del'>-		"{NVidia,nForce3 Audio},"</div><div class='del'>-		"{NVidia,MCP04},"</div><div class='del'>-		"{NVidia,MCP501},"</div><div class='del'>-		"{NVidia,CK804},"</div><div class='del'>-		"{NVidia,CK8},"</div><div class='del'>-		"{NVidia,CK8S},"</div><div class='del'>-		"{AMD,AMD768},"</div><div class='del'>-		"{AMD,AMD8111},"</div><div class='del'>-	        "{ALI,M5455}}");</div><div class='ctx'> </div><div class='ctx'> static int index = SNDRV_DEFAULT_IDX1;	/* Index 0-MAX */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='ctx'> static int ac97_clock;</div><div class='ctx'> static char *ac97_quirk;</div><div class='del'>-static int buggy_semaphore;</div><div class='add'>+static bool buggy_semaphore;</div><div class='ctx'> static int buggy_irq = -1; /* auto-check */</div><div class='del'>-static int xbox;</div><div class='add'>+static bool xbox;</div><div class='ctx'> static int spdif_aclink = -1;</div><div class='add'>+static int inside_vm = -1;</div><div class='ctx'> </div><div class='ctx'> module_param(index, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Intel i8x0 soundcard.");</div><div class='ctx'> module_param(id, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(id, "ID string for Intel i8x0 soundcard.");</div><div class='ctx'> module_param(ac97_clock, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = whitelist + auto-detect, 1 = force autodetect).");</div><div class='add'>+MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = allowlist + auto-detect, 1 = force autodetect).");</div><div class='ctx'> module_param(ac97_quirk, charp, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");</div><div class='ctx'> module_param(buggy_semaphore, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(buggy_semaphore, "Enable workaround for hardwares with problematic codec semaphores.");</div><div class='del'>-module_param(buggy_irq, bool, 0444);</div><div class='add'>+module_param(buggy_irq, bint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(buggy_irq, "Enable workaround for buggy interrupts on some motherboards.");</div><div class='ctx'> module_param(xbox, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 codec detection.");</div><div class='ctx'> module_param(spdif_aclink, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");</div><div class='add'>+module_param(inside_vm, bint, 0444);</div><div class='add'>+MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization.");</div><div class='ctx'> </div><div class='ctx'> /* just for backward compatibility */</div><div class='del'>-static int enable;</div><div class='add'>+static bool enable;</div><div class='ctx'> module_param(enable, bool, 0444);</div><div class='ctx'> static int joystick;</div><div class='ctx'> module_param(joystick, int, 0444);</div><div class='hunk'>@@ -117,7 +79,7 @@ enum { \</div><div class='ctx'> 	ICH_REG_##name##_PICB	= base + 0x08,	/* word - position in current buffer */ \</div><div class='ctx'> 	ICH_REG_##name##_PIV	= base + 0x0a,	/* byte - prefetched index value */ \</div><div class='ctx'> 	ICH_REG_##name##_CR	= base + 0x0b,	/* byte - control register */ \</div><div class='del'>-};</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* busmaster blocks */</div><div class='ctx'> DEFINE_REGSET(OFF, 0);		/* offset */</div><div class='hunk'>@@ -346,7 +308,7 @@ enum {</div><div class='ctx'> struct ichdev {</div><div class='ctx'> 	unsigned int ichd;			/* ich device number */</div><div class='ctx'> 	unsigned long reg_offset;		/* offset to bmaddr */</div><div class='del'>-	u32 *bdbar;				/* CPU address (32bit) */</div><div class='add'>+	__le32 *bdbar;				/* CPU address (32bit) */</div><div class='ctx'> 	unsigned int bdbar_addr;		/* PCI bus address (32bit) */</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	unsigned int physbuf;			/* physical address (32bit) */</div><div class='hunk'>@@ -369,7 +331,7 @@ struct ichdev {</div><div class='ctx'> 	unsigned int ali_slot;			/* ALI DMA slot */</div><div class='ctx'> 	struct ac97_pcm *pcm;</div><div class='ctx'> 	int pcm_open_flag;</div><div class='del'>-	unsigned int page_attr_changed: 1;</div><div class='add'>+	unsigned int prepared:1;</div><div class='ctx'> 	unsigned int suspended: 1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -400,6 +362,7 @@ struct intel8x0 {</div><div class='ctx'> 	unsigned buggy_irq: 1;		/* workaround for buggy mobos */</div><div class='ctx'> 	unsigned xbox: 1;		/* workaround for Xbox AC'97 detection */</div><div class='ctx'> 	unsigned buggy_semaphore: 1;	/* workaround for buggy codec semaphore */</div><div class='add'>+	unsigned inside_vm: 1;		/* enable VM optimization */</div><div class='ctx'> </div><div class='ctx'> 	int spdif_idx;	/* SPDIF BAR index; *_SPBAR or -1 if use PCMOUT */</div><div class='ctx'> 	unsigned int sdm_saved;	/* SDM reg value */</div><div class='hunk'>@@ -408,19 +371,19 @@ struct intel8x0 {</div><div class='ctx'> 	struct snd_ac97 *ac97[3];</div><div class='ctx'> 	unsigned int ac97_sdin[3];</div><div class='ctx'> 	unsigned int max_codecs, ncodecs;</div><div class='del'>-	unsigned int *codec_bit;</div><div class='add'>+	const unsigned int *codec_bit;</div><div class='ctx'> 	unsigned int codec_isr_bits;</div><div class='ctx'> 	unsigned int codec_ready_bits;</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='ctx'> 	</div><div class='ctx'> 	u32 bdbars_count;</div><div class='del'>-	struct snd_dma_buffer bdbars;</div><div class='add'>+	struct snd_dma_buffer *bdbars;</div><div class='ctx'> 	u32 int_sta_reg;		/* interrupt status register */</div><div class='ctx'> 	u32 int_sta_mask;		/* interrupt status mask */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0_ids) = {</div><div class='add'>+static const struct pci_device_id snd_intel8x0_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL },	/* 82801AA */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL },	/* 82901AB */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL },	/* 82801BA */</div><div class='hunk'>@@ -534,10 +497,11 @@ static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int code</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	} while (time--);</div><div class='ctx'> </div><div class='del'>-	/* access to some forbidden (non existant) ac97 registers will not</div><div class='add'>+	/* access to some forbidden (non existent) ac97 registers will not</div><div class='ctx'> 	 * reset the semaphore. So even if you don't get the semaphore, still</div><div class='ctx'> 	 * continue the access. We don't need the semaphore anyway. */</div><div class='del'>-	snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",</div><div class='ctx'> 			igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));</div><div class='ctx'> 	iagetword(chip, 0);	/* clear semaphore flag */</div><div class='ctx'> 	/* I don't care about the semaphore */</div><div class='hunk'>@@ -552,7 +516,9 @@ static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,</div><div class='ctx'> 	</div><div class='ctx'> 	if (snd_intel8x0_codec_semaphore(chip, ac97-&gt;num) &lt; 0) {</div><div class='ctx'> 		if (! chip-&gt;in_ac97_init)</div><div class='del'>-			snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_write %d: semaphore is not ready for register 0x%x\n",</div><div class='add'>+				ac97-&gt;num, reg);</div><div class='ctx'> 	}</div><div class='ctx'> 	iaputword(chip, reg + ac97-&gt;num * 0x80, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -566,30 +532,36 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_intel8x0_codec_semaphore(chip, ac97-&gt;num) &lt; 0) {</div><div class='ctx'> 		if (! chip-&gt;in_ac97_init)</div><div class='del'>-			snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_read %d: semaphore is not ready for register 0x%x\n",</div><div class='add'>+				ac97-&gt;num, reg);</div><div class='ctx'> 		res = 0xffff;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		res = iagetword(chip, reg + ac97-&gt;num * 0x80);</div><div class='del'>-		if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) &amp; ICH_RCS) {</div><div class='add'>+		tmp = igetdword(chip, ICHREG(GLOB_STA));</div><div class='add'>+		if (tmp &amp; ICH_RCS) {</div><div class='ctx'> 			/* reset RCS and preserve other R/WC bits */</div><div class='ctx'> 			iputdword(chip, ICHREG(GLOB_STA), tmp &amp;</div><div class='ctx'> 				  ~(chip-&gt;codec_ready_bits | ICH_GSCI));</div><div class='ctx'> 			if (! chip-&gt;in_ac97_init)</div><div class='del'>-				snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"codec_read %d: read timeout for register 0x%x\n",</div><div class='add'>+					ac97-&gt;num, reg);</div><div class='ctx'> 			res = 0xffff;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_intel8x0_codec_read_test(struct intel8x0 *chip,</div><div class='del'>-						   unsigned int codec)</div><div class='add'>+static void snd_intel8x0_codec_read_test(struct intel8x0 *chip,</div><div class='add'>+					 unsigned int codec)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int tmp;</div><div class='ctx'> </div><div class='ctx'> 	if (snd_intel8x0_codec_semaphore(chip, codec) &gt;= 0) {</div><div class='ctx'> 		iagetword(chip, codec * 0x80);</div><div class='del'>-		if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) &amp; ICH_RCS) {</div><div class='add'>+		tmp = igetdword(chip, ICHREG(GLOB_STA));</div><div class='add'>+		if (tmp &amp; ICH_RCS) {</div><div class='ctx'> 			/* reset RCS and preserve other R/WC bits */</div><div class='ctx'> 			iputdword(chip, ICHREG(GLOB_STA), tmp &amp;</div><div class='ctx'> 				  ~(chip-&gt;codec_ready_bits | ICH_GSCI));</div><div class='hunk'>@@ -609,7 +581,7 @@ static int snd_intel8x0_ali_codec_ready(struct intel8x0 *chip, int mask)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (! chip-&gt;in_ac97_init)</div><div class='del'>-		snd_printd(KERN_WARNING "intel8x0: AC97 codec ready timeout.\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "AC97 codec ready timeout.\n");</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -621,7 +593,7 @@ static int snd_intel8x0_ali_codec_semaphore(struct intel8x0 *chip)</div><div class='ctx'> 	while (--time &amp;&amp; (igetdword(chip, ICHREG(ALI_CAS)) &amp; ALI_CAS_SEM_BUSY))</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	if (! time &amp;&amp; ! chip-&gt;in_ac97_init)</div><div class='del'>-		snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "ali_codec_semaphore timeout\n");</div><div class='ctx'> 	return snd_intel8x0_ali_codec_ready(chip, ALI_CSPSR_CODEC_READY);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -664,7 +636,7 @@ static void snd_intel8x0_ali_codec_write(struct snd_ac97 *ac97, unsigned short r</div><div class='ctx'> static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev) </div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='del'>-	u32 *bdbar = ichdev-&gt;bdbar;</div><div class='add'>+	__le32 *bdbar = ichdev-&gt;bdbar;</div><div class='ctx'> 	unsigned long port = ichdev-&gt;reg_offset;</div><div class='ctx'> </div><div class='ctx'> 	iputdword(chip, port + ICH_REG_OFF_BDBAR, ichdev-&gt;bdbar_addr);</div><div class='hunk'>@@ -690,7 +662,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich</div><div class='ctx'> 			bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */</div><div class='ctx'> 						     ichdev-&gt;fragsize &gt;&gt; ichdev-&gt;pos_shift);</div><div class='ctx'> #if 0</div><div class='del'>-			printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "bdbar[%i] = 0x%x [0x%x]\n",</div><div class='ctx'> 			       idx + 0, bdbar[idx + 0], bdbar[idx + 1]);</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='hunk'>@@ -702,8 +674,8 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich</div><div class='ctx'> 	ichdev-&gt;lvi_frag = ICH_REG_LVI_MASK % ichdev-&gt;frags;</div><div class='ctx'> 	ichdev-&gt;position = 0;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "</div><div class='del'>-	       "period_size1 = 0x%x\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",</div><div class='ctx'> 	       ichdev-&gt;lvi_frag, ichdev-&gt;frags, ichdev-&gt;fragsize,</div><div class='ctx'> 	       ichdev-&gt;fragsize1);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -711,25 +683,6 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich</div><div class='ctx'> 	iputbyte(chip, port + ichdev-&gt;roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef __i386__</div><div class='del'>-/*</div><div class='del'>- * Intel 82443MX running a 100MHz processor system bus has a hardware bug,</div><div class='del'>- * which aborts PCI busmaster for audio transfer.  A workaround is to set</div><div class='del'>- * the pages as non-cached.  For details, see the errata in</div><div class='del'>- *	http://download.intel.com/design/chipsets/specupdt/24505108.pdf</div><div class='del'>- */</div><div class='del'>-static void fill_nocache(void *buf, int size, int nocache)</div><div class='del'>-{</div><div class='del'>-	size = (size + PAGE_SIZE - 1) &gt;&gt; PAGE_SHIFT;</div><div class='del'>-	if (nocache)</div><div class='del'>-		set_pages_uc(virt_to_page(buf), size);</div><div class='del'>-	else</div><div class='del'>-		set_pages_wb(virt_to_page(buf), size);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define fill_nocache(buf, size, nocache) do { ; } while (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *  Interrupt handler</div><div class='ctx'>  */</div><div class='hunk'>@@ -737,52 +690,51 @@ static void fill_nocache(void *buf, int size, int nocache)</div><div class='ctx'> static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ichdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long port = ichdev-&gt;reg_offset;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int status, civ, i, step;</div><div class='ctx'> 	int ack = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;reg_lock, flags);</div><div class='del'>-	status = igetbyte(chip, port + ichdev-&gt;roff_sr);</div><div class='del'>-	civ = igetbyte(chip, port + ICH_REG_OFF_CIV);</div><div class='del'>-	if (!(status &amp; ICH_BCIS)) {</div><div class='del'>-		step = 0;</div><div class='del'>-	} else if (civ == ichdev-&gt;civ) {</div><div class='del'>-		// snd_printd("civ same %d\n", civ);</div><div class='del'>-		step = 1;</div><div class='del'>-		ichdev-&gt;civ++;</div><div class='del'>-		ichdev-&gt;civ &amp;= ICH_REG_LVI_MASK;</div><div class='del'>-	} else {</div><div class='del'>-		step = civ - ichdev-&gt;civ;</div><div class='del'>-		if (step &lt; 0)</div><div class='del'>-			step += ICH_REG_LVI_MASK + 1;</div><div class='del'>-		// if (step != 1)</div><div class='del'>-		//	snd_printd("step = %d, %d -&gt; %d\n", step, ichdev-&gt;civ, civ);</div><div class='del'>-		ichdev-&gt;civ = civ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ichdev-&gt;position += step * ichdev-&gt;fragsize1;</div><div class='del'>-	if (! chip-&gt;in_measurement)</div><div class='del'>-		ichdev-&gt;position %= ichdev-&gt;size;</div><div class='del'>-	ichdev-&gt;lvi += step;</div><div class='del'>-	ichdev-&gt;lvi &amp;= ICH_REG_LVI_MASK;</div><div class='del'>-	iputbyte(chip, port + ICH_REG_OFF_LVI, ichdev-&gt;lvi);</div><div class='del'>-	for (i = 0; i &lt; step; i++) {</div><div class='del'>-		ichdev-&gt;lvi_frag++;</div><div class='del'>-		ichdev-&gt;lvi_frag %= ichdev-&gt;frags;</div><div class='del'>-		ichdev-&gt;bdbar[ichdev-&gt;lvi * 2] = cpu_to_le32(ichdev-&gt;physbuf + ichdev-&gt;lvi_frag * ichdev-&gt;fragsize1);</div><div class='add'>+	if (!(ichdev-&gt;prepared || chip-&gt;in_measurement) || ichdev-&gt;suspended)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		status = igetbyte(chip, port + ichdev-&gt;roff_sr);</div><div class='add'>+		civ = igetbyte(chip, port + ICH_REG_OFF_CIV);</div><div class='add'>+		if (!(status &amp; ICH_BCIS)) {</div><div class='add'>+			step = 0;</div><div class='add'>+		} else if (civ == ichdev-&gt;civ) {</div><div class='add'>+			step = 1;</div><div class='add'>+			ichdev-&gt;civ++;</div><div class='add'>+			ichdev-&gt;civ &amp;= ICH_REG_LVI_MASK;</div><div class='add'>+		} else {</div><div class='add'>+			step = civ - ichdev-&gt;civ;</div><div class='add'>+			if (step &lt; 0)</div><div class='add'>+				step += ICH_REG_LVI_MASK + 1;</div><div class='add'>+			ichdev-&gt;civ = civ;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ichdev-&gt;position += step * ichdev-&gt;fragsize1;</div><div class='add'>+		if (! chip-&gt;in_measurement)</div><div class='add'>+			ichdev-&gt;position %= ichdev-&gt;size;</div><div class='add'>+		ichdev-&gt;lvi += step;</div><div class='add'>+		ichdev-&gt;lvi &amp;= ICH_REG_LVI_MASK;</div><div class='add'>+		iputbyte(chip, port + ICH_REG_OFF_LVI, ichdev-&gt;lvi);</div><div class='add'>+		for (i = 0; i &lt; step; i++) {</div><div class='add'>+			ichdev-&gt;lvi_frag++;</div><div class='add'>+			ichdev-&gt;lvi_frag %= ichdev-&gt;frags;</div><div class='add'>+			ichdev-&gt;bdbar[ichdev-&gt;lvi * 2] = cpu_to_le32(ichdev-&gt;physbuf + ichdev-&gt;lvi_frag * ichdev-&gt;fragsize1);</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, "</div><div class='del'>-	       "all = 0x%x, 0x%x\n",</div><div class='del'>-	       ichdev-&gt;lvi * 2, ichdev-&gt;bdbar[ichdev-&gt;lvi * 2],</div><div class='del'>-	       ichdev-&gt;bdbar[ichdev-&gt;lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),</div><div class='del'>-	       inl(port + 4), inb(port + ICH_REG_OFF_CR));</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+				"new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",</div><div class='add'>+				ichdev-&gt;lvi * 2, ichdev-&gt;bdbar[ichdev-&gt;lvi * 2],</div><div class='add'>+				ichdev-&gt;bdbar[ichdev-&gt;lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),</div><div class='add'>+				inl(port + 4), inb(port + ICH_REG_OFF_CR));</div><div class='ctx'> #endif</div><div class='del'>-		if (--ichdev-&gt;ack == 0) {</div><div class='del'>-			ichdev-&gt;ack = ichdev-&gt;ack_reload;</div><div class='del'>-			ack = 1;</div><div class='add'>+			if (--ichdev-&gt;ack == 0) {</div><div class='add'>+				ichdev-&gt;ack = ichdev-&gt;ack_reload;</div><div class='add'>+				ack = 1;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;reg_lock, flags);</div><div class='ctx'> 	if (ack &amp;&amp; ichdev-&gt;substream) {</div><div class='ctx'> 		snd_pcm_period_elapsed(ichdev-&gt;substream);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -837,7 +789,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='ctx'> 		ichdev-&gt;suspended = 0;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 		val = ICH_IOCE | ICH_STARTBM;</div><div class='hunk'>@@ -845,7 +797,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 		ichdev-&gt;suspended = 1;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 		val = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -870,7 +822,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 	struct intel8x0 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ichdev *ichdev = get_ichdev(substream);</div><div class='ctx'> 	unsigned long port = ichdev-&gt;reg_offset;</div><div class='del'>-	static int fiforeg[] = {</div><div class='add'>+	static const int fiforeg[] = {</div><div class='ctx'> 		ICHREG(ALI_FIFOCR1), ICHREG(ALI_FIFOCR2), ICHREG(ALI_FIFOCR3)</div><div class='ctx'> 	};</div><div class='ctx'> 	unsigned int val, fifo;</div><div class='hunk'>@@ -879,7 +831,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='ctx'> 		ichdev-&gt;suspended = 0;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='ctx'> 		if (substream-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='hunk'>@@ -896,7 +848,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='ctx'> 		ichdev-&gt;suspended = 1;</div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_STOP:</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='ctx'> 		/* pause */</div><div class='hunk'>@@ -925,26 +877,13 @@ static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ichdev *ichdev = get_ichdev(substream);</div><div class='del'>-	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int dbl = params_rate(hw_params) &gt; 48000;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;fix_nocache &amp;&amp; ichdev-&gt;page_attr_changed) {</div><div class='del'>-		fill_nocache(runtime-&gt;dma_area, runtime-&gt;dma_bytes, 0); /* clear */</div><div class='del'>-		ichdev-&gt;page_attr_changed = 0;</div><div class='del'>-	}</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-	if (chip-&gt;fix_nocache) {</div><div class='del'>-		if (runtime-&gt;dma_area &amp;&amp; ! ichdev-&gt;page_attr_changed) {</div><div class='del'>-			fill_nocache(runtime-&gt;dma_area, runtime-&gt;dma_bytes, 1);</div><div class='del'>-			ichdev-&gt;page_attr_changed = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	if (ichdev-&gt;pcm_open_flag) {</div><div class='ctx'> 		snd_ac97_pcm_close(ichdev-&gt;pcm);</div><div class='ctx'> 		ichdev-&gt;pcm_open_flag = 0;</div><div class='add'>+		ichdev-&gt;prepared = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = snd_ac97_pcm_open(ichdev-&gt;pcm, params_rate(hw_params),</div><div class='ctx'> 				params_channels(hw_params),</div><div class='hunk'>@@ -961,18 +900,14 @@ static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> </div><div class='ctx'> static int snd_intel8x0_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	struct intel8x0 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ichdev *ichdev = get_ichdev(substream);</div><div class='ctx'> </div><div class='ctx'> 	if (ichdev-&gt;pcm_open_flag) {</div><div class='ctx'> 		snd_ac97_pcm_close(ichdev-&gt;pcm);</div><div class='ctx'> 		ichdev-&gt;pcm_open_flag = 0;</div><div class='add'>+		ichdev-&gt;prepared = 0;</div><div class='ctx'> 	}</div><div class='del'>-	if (chip-&gt;fix_nocache &amp;&amp; ichdev-&gt;page_attr_changed) {</div><div class='del'>-		fill_nocache(substream-&gt;runtime-&gt;dma_area, substream-&gt;runtime-&gt;dma_bytes, 0);</div><div class='del'>-		ichdev-&gt;page_attr_changed = 0;</div><div class='del'>-	}</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_intel8x0_setup_pcm_out(struct intel8x0 *chip,</div><div class='hunk'>@@ -981,7 +916,7 @@ static void snd_intel8x0_setup_pcm_out(struct intel8x0 *chip,</div><div class='ctx'> 	unsigned int cnt;</div><div class='ctx'> 	int dbl = runtime-&gt;rate &gt; 48000;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	switch (chip-&gt;device_type) {</div><div class='ctx'> 	case DEVICE_ALI:</div><div class='ctx'> 		cnt = igetdword(chip, ICHREG(ALI_SCR));</div><div class='hunk'>@@ -1027,7 +962,6 @@ static void snd_intel8x0_setup_pcm_out(struct intel8x0 *chip,</div><div class='ctx'> 		iputdword(chip, ICHREG(GLOB_CNT), cnt);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_intel8x0_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='hunk'>@@ -1045,6 +979,7 @@ static int snd_intel8x0_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 			ichdev-&gt;pos_shift = (runtime-&gt;sample_bits &gt; 16) ? 2 : 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_intel8x0_setup_periods(chip, ichdev);</div><div class='add'>+	ichdev-&gt;prepared = 1;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1056,7 +991,7 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs</div><div class='ctx'> 	int civ, timeout = 10;</div><div class='ctx'> 	unsigned int position;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	do {</div><div class='ctx'> 		civ = igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV);</div><div class='ctx'> 		ptr1 = igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb);</div><div class='hunk'>@@ -1065,8 +1000,18 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs</div><div class='ctx'> 			udelay(10);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='del'>-		if (civ == igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV) &amp;&amp;</div><div class='del'>-		    ptr1 == igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb))</div><div class='add'>+		if (civ != igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* IO read operation is very expensive inside virtual machine</div><div class='add'>+		 * as it is emulated. The probability that subsequent PICB read</div><div class='add'>+		 * will return different result is high enough to loop till</div><div class='add'>+		 * timeout here.</div><div class='add'>+		 * Same CIV is strict enough condition to be sure that PICB</div><div class='add'>+		 * is valid inside VM on emulated card. */</div><div class='add'>+		if (chip-&gt;inside_vm)</div><div class='add'>+			break;</div><div class='add'>+		if (ptr1 == igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb))</div><div class='ctx'> 			break;</div><div class='ctx'> 	} while (timeout--);</div><div class='ctx'> 	ptr = ichdev-&gt;last_pos;</div><div class='hunk'>@@ -1086,13 +1031,12 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	ichdev-&gt;last_pos = ptr;</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	if (ptr &gt;= ichdev-&gt;size)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return bytes_to_frames(substream-&gt;runtime, ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_intel8x0_stream =</div><div class='add'>+static const struct snd_pcm_hardware snd_intel8x0_stream =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -1113,31 +1057,31 @@ static struct snd_pcm_hardware snd_intel8x0_stream =</div><div class='ctx'> 	.fifo_size =		0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int channels4[] = {</div><div class='add'>+static const unsigned int channels4[] = {</div><div class='ctx'> 	2, 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels4 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels4 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(channels4),</div><div class='ctx'> 	.list = channels4,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int channels6[] = {</div><div class='add'>+static const unsigned int channels6[] = {</div><div class='ctx'> 	2, 4, 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels6 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels6 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(channels6),</div><div class='ctx'> 	.list = channels6,</div><div class='ctx'> 	.mask = 0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int channels8[] = {</div><div class='add'>+static const unsigned int channels8[] = {</div><div class='ctx'> 	2, 4, 6, 8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hw_constraint_list hw_constraints_channels8 = {</div><div class='add'>+static const struct snd_pcm_hw_constraint_list hw_constraints_channels8 = {</div><div class='ctx'> 	.count = ARRAY_SIZE(channels8),</div><div class='ctx'> 	.list = channels8,</div><div class='ctx'> 	.mask = 0,</div><div class='hunk'>@@ -1157,7 +1101,8 @@ static int snd_intel8x0_pcm_open(struct snd_pcm_substream *substream, struct ich</div><div class='ctx'> 		runtime-&gt;hw.buffer_bytes_max = 64*1024;</div><div class='ctx'> 		runtime-&gt;hw.period_bytes_max = 64*1024;</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) &lt; 0)</div><div class='add'>+	err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	runtime-&gt;private_data = ichdev;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1287,12 +1232,12 @@ static int snd_intel8x0_ali_ac97spdifout_open(struct snd_pcm_substream *substrea</div><div class='ctx'> 	struct intel8x0 *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	val = igetdword(chip, ICHREG(ALI_INTERFACECR));</div><div class='del'>-	val |= ICH_ALI_IF_AC97SP;</div><div class='del'>-	iputdword(chip, ICHREG(ALI_INTERFACECR), val);</div><div class='del'>-	/* also needs to set ALI_SC_CODEC_SPDF correctly */</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		val = igetdword(chip, ICHREG(ALI_INTERFACECR));</div><div class='add'>+		val |= ICH_ALI_IF_AC97SP;</div><div class='add'>+		iputdword(chip, ICHREG(ALI_INTERFACECR), val);</div><div class='add'>+		/* also needs to set ALI_SC_CODEC_SPDF correctly */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return snd_intel8x0_pcm_open(substream, &amp;chip-&gt;ichd[ALID_AC97SPDIFOUT]);</div><div class='ctx'> }</div><div class='hunk'>@@ -1303,11 +1248,10 @@ static int snd_intel8x0_ali_ac97spdifout_close(struct snd_pcm_substream *substre</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;ichd[ALID_AC97SPDIFOUT].substream = NULL;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	val = igetdword(chip, ICHREG(ALI_INTERFACECR));</div><div class='ctx'> 	val &amp;= ~ICH_ALI_IF_AC97SP;</div><div class='ctx'> 	iputdword(chip, ICHREG(ALI_INTERFACECR), val);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1344,10 +1288,9 @@ static int snd_intel8x0_ali_spdifout_close(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_playback_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_playback_open,</div><div class='ctx'> 	.close =	snd_intel8x0_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1355,10 +1298,9 @@ static struct snd_pcm_ops snd_intel8x0_playback_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_capture_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_capture_open,</div><div class='ctx'> 	.close =	snd_intel8x0_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1366,10 +1308,9 @@ static struct snd_pcm_ops snd_intel8x0_capture_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_mic_open,</div><div class='ctx'> 	.close =	snd_intel8x0_mic_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1377,10 +1318,9 @@ static struct snd_pcm_ops snd_intel8x0_capture_mic_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_mic2_open,</div><div class='ctx'> 	.close =	snd_intel8x0_mic2_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1388,10 +1328,9 @@ static struct snd_pcm_ops snd_intel8x0_capture_mic2_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_capture2_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_capture2_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_capture2_open,</div><div class='ctx'> 	.close =	snd_intel8x0_capture2_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1399,10 +1338,9 @@ static struct snd_pcm_ops snd_intel8x0_capture2_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_spdif_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_spdif_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_spdif_open,</div><div class='ctx'> 	.close =	snd_intel8x0_spdif_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1410,10 +1348,9 @@ static struct snd_pcm_ops snd_intel8x0_spdif_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_playback_open,</div><div class='ctx'> 	.close =	snd_intel8x0_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1421,10 +1358,9 @@ static struct snd_pcm_ops snd_intel8x0_ali_playback_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_capture_open,</div><div class='ctx'> 	.close =	snd_intel8x0_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1432,10 +1368,9 @@ static struct snd_pcm_ops snd_intel8x0_ali_capture_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_mic_open,</div><div class='ctx'> 	.close =	snd_intel8x0_mic_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1443,10 +1378,9 @@ static struct snd_pcm_ops snd_intel8x0_ali_capture_mic_ops = {</div><div class='ctx'> 	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_ali_ac97spdifout_open,</div><div class='ctx'> 	.close =	snd_intel8x0_ali_ac97spdifout_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1458,7 +1392,6 @@ static struct snd_pcm_ops snd_intel8x0_ali_ac97spdifout_ops = {</div><div class='ctx'> static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_ali_spdifin_open,</div><div class='ctx'> 	.close =	snd_intel8x0_ali_spdifin_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1469,7 +1402,6 @@ static struct snd_pcm_ops snd_intel8x0_ali_spdifin_ops = {</div><div class='ctx'> static struct snd_pcm_ops snd_intel8x0_ali_spdifout_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0_ali_spdifout_open,</div><div class='ctx'> 	.close =	snd_intel8x0_ali_spdifout_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='ctx'> 	.hw_params =	snd_intel8x0_hw_params,</div><div class='ctx'> 	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0_pcm_prepare,</div><div class='hunk'>@@ -1480,15 +1412,18 @@ static struct snd_pcm_ops snd_intel8x0_ali_spdifout_ops = {</div><div class='ctx'> </div><div class='ctx'> struct ich_pcm_table {</div><div class='ctx'> 	char *suffix;</div><div class='del'>-	struct snd_pcm_ops *playback_ops;</div><div class='del'>-	struct snd_pcm_ops *capture_ops;</div><div class='add'>+	const struct snd_pcm_ops *playback_ops;</div><div class='add'>+	const struct snd_pcm_ops *capture_ops;</div><div class='ctx'> 	size_t prealloc_size;</div><div class='ctx'> 	size_t prealloc_max_size;</div><div class='ctx'> 	int ac97_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_pcm1(struct intel8x0 *chip, int device,</div><div class='del'>-				       struct ich_pcm_table *rec)</div><div class='add'>+#define intel8x0_dma_type(chip) \</div><div class='add'>+	((chip)-&gt;fix_nocache ? SNDRV_DMA_TYPE_DEV_WC : SNDRV_DMA_TYPE_DEV)</div><div class='add'>+</div><div class='add'>+static int snd_intel8x0_pcm1(struct intel8x0 *chip, int device,</div><div class='add'>+			     const struct ich_pcm_table *rec)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1497,7 +1432,7 @@ static int __devinit snd_intel8x0_pcm1(struct intel8x0 *chip, int device,</div><div class='ctx'> 	if (rec-&gt;suffix)</div><div class='ctx'> 		sprintf(name, "Intel ICH - %s", rec-&gt;suffix);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(name, "Intel ICH");</div><div class='add'>+		strscpy(name, "Intel ICH");</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, name, device,</div><div class='ctx'> 			  rec-&gt;playback_ops ? 1 : 0,</div><div class='ctx'> 			  rec-&gt;capture_ops ? 1 : 0, &amp;pcm);</div><div class='hunk'>@@ -1514,17 +1449,36 @@ static int __devinit snd_intel8x0_pcm1(struct intel8x0 *chip, int device,</div><div class='ctx'> 	if (rec-&gt;suffix)</div><div class='ctx'> 		sprintf(pcm-&gt;name, "%s - %s", chip-&gt;card-&gt;shortname, rec-&gt;suffix);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+		strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	chip-&gt;pcm[device] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      rec-&gt;prealloc_size, rec-&gt;prealloc_max_size);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, intel8x0_dma_type(chip),</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       rec-&gt;prealloc_size, rec-&gt;prealloc_max_size);</div><div class='add'>+</div><div class='add'>+	if (rec-&gt;playback_ops &amp;&amp;</div><div class='add'>+	    rec-&gt;playback_ops-&gt;open == snd_intel8x0_playback_open) {</div><div class='add'>+		struct snd_pcm_chmap *chmap;</div><div class='add'>+		int chs = 2;</div><div class='add'>+		if (chip-&gt;multi8)</div><div class='add'>+			chs = 8;</div><div class='add'>+		else if (chip-&gt;multi6)</div><div class='add'>+			chs = 6;</div><div class='add'>+		else if (chip-&gt;multi4)</div><div class='add'>+			chs = 4;</div><div class='add'>+		err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,</div><div class='add'>+					     snd_pcm_alt_chmaps, chs, 0,</div><div class='add'>+					     &amp;chmap);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		chmap-&gt;channel_mask = SND_PCM_CHMAP_MASK_2468;</div><div class='add'>+		chip-&gt;ac97[0]-&gt;chmaps[SNDRV_PCM_STREAM_PLAYBACK] = chmap;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ich_pcm_table intel_pcms[] __devinitdata = {</div><div class='add'>+static const struct ich_pcm_table intel_pcms[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.playback_ops = &amp;snd_intel8x0_playback_ops,</div><div class='ctx'> 		.capture_ops = &amp;snd_intel8x0_capture_ops,</div><div class='hunk'>@@ -1561,7 +1515,7 @@ static struct ich_pcm_table intel_pcms[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ich_pcm_table nforce_pcms[] __devinitdata = {</div><div class='add'>+static const struct ich_pcm_table nforce_pcms[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.playback_ops = &amp;snd_intel8x0_playback_ops,</div><div class='ctx'> 		.capture_ops = &amp;snd_intel8x0_capture_ops,</div><div class='hunk'>@@ -1584,7 +1538,7 @@ static struct ich_pcm_table nforce_pcms[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ich_pcm_table ali_pcms[] __devinitdata = {</div><div class='add'>+static const struct ich_pcm_table ali_pcms[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.playback_ops = &amp;snd_intel8x0_ali_playback_ops,</div><div class='ctx'> 		.capture_ops = &amp;snd_intel8x0_ali_capture_ops,</div><div class='hunk'>@@ -1616,10 +1570,10 @@ static struct ich_pcm_table ali_pcms[] __devinitdata = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_pcm(struct intel8x0 *chip)</div><div class='add'>+static int snd_intel8x0_pcm(struct intel8x0 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, tblsize, device, err;</div><div class='del'>-	struct ich_pcm_table *tbl, *rec;</div><div class='add'>+	const struct ich_pcm_table *tbl, *rec;</div><div class='ctx'> </div><div class='ctx'> 	switch (chip-&gt;device_type) {</div><div class='ctx'> 	case DEVICE_INTEL_ICH4:</div><div class='hunk'>@@ -1679,7 +1633,7 @@ static void snd_intel8x0_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='ctx'> 	chip-&gt;ac97[ac97-&gt;num] = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ac97_pcm ac97_pcm_defs[] __devinitdata = {</div><div class='add'>+static const struct ac97_pcm ac97_pcm_defs[] = {</div><div class='ctx'> 	/* front PCM */</div><div class='ctx'> 	{</div><div class='ctx'> 		.exclusive = 1,</div><div class='hunk'>@@ -1749,7 +1703,7 @@ static struct ac97_pcm ac97_pcm_defs[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='add'>+static const struct ac97_quirk ac97_quirks[] = {</div><div class='ctx'>         {</div><div class='ctx'> 		.subvendor = 0x0e11,</div><div class='ctx'> 		.subdevice = 0x000e,</div><div class='hunk'>@@ -1866,6 +1820,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = 0x1028,</div><div class='add'>+		.subdevice = 0x0182,</div><div class='add'>+		.name = "Dell Latitude D610",	/* STAC9750/51 */</div><div class='add'>+		.type = AC97_TUNE_HP_ONLY</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.subvendor = 0x1028,</div><div class='ctx'> 		.subdevice = 0x0186,</div><div class='ctx'> 		.name = "Dell Latitude D810", /* cf. Malone #41015 */</div><div class='ctx'> 		.type = AC97_TUNE_HP_MUTE_LED</div><div class='hunk'>@@ -1878,6 +1838,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = 0x1028,</div><div class='add'>+		.subdevice = 0x0189,</div><div class='add'>+		.name = "Dell Inspiron 9300",</div><div class='add'>+		.type = AC97_TUNE_HP_MUTE_LED</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.subvendor = 0x1028,</div><div class='ctx'> 		.subdevice = 0x0191,</div><div class='ctx'> 		.name = "Dell Inspiron 8600",</div><div class='ctx'> 		.type = AC97_TUNE_HP_ONLY</div><div class='hunk'>@@ -2070,6 +2036,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.subvendor = 0x161f,</div><div class='add'>+		.subdevice = 0x202f,</div><div class='add'>+		.name = "Gateway M520",</div><div class='add'>+		.type = AC97_TUNE_INV_EAPD</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.subvendor = 0x161f,</div><div class='ctx'> 		.subdevice = 0x203a,</div><div class='ctx'> 		.name = "Gateway 4525GZ",		/* AD1981B */</div><div class='ctx'> 		.type = AC97_TUNE_INV_EAPD</div><div class='hunk'>@@ -2138,20 +2110,20 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {</div><div class='ctx'> 	{ } /* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='del'>-					const char *quirk_override)</div><div class='add'>+static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='add'>+			      const char *quirk_override)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int i, codecs;</div><div class='ctx'> 	unsigned int glob_sta = 0;</div><div class='del'>-	struct snd_ac97_bus_ops *ops;</div><div class='del'>-	static struct snd_ac97_bus_ops standard_bus_ops = {</div><div class='add'>+	const struct snd_ac97_bus_ops *ops;</div><div class='add'>+	static const struct snd_ac97_bus_ops standard_bus_ops = {</div><div class='ctx'> 		.write = snd_intel8x0_codec_write,</div><div class='ctx'> 		.read = snd_intel8x0_codec_read,</div><div class='ctx'> 	};</div><div class='del'>-	static struct snd_ac97_bus_ops ali_bus_ops = {</div><div class='add'>+	static const struct snd_ac97_bus_ops ali_bus_ops = {</div><div class='ctx'> 		.write = snd_intel8x0_ali_codec_write,</div><div class='ctx'> 		.read = snd_intel8x0_ali_codec_read,</div><div class='ctx'> 	};</div><div class='hunk'>@@ -2168,7 +2140,7 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='ctx'> 		case DEVICE_INTEL_ICH4:</div><div class='ctx'> 			chip-&gt;spdif_idx = ICHD_SPBAR;</div><div class='ctx'> 			break;</div><div class='del'>-		};</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;in_ac97_init = 1;</div><div class='hunk'>@@ -2214,7 +2186,8 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='ctx'> 			udelay(1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, ops, chip, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, ops, chip, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __err;</div><div class='ctx'> 	pbus-&gt;private_free = snd_intel8x0_mixer_free_ac97_bus;</div><div class='ctx'> 	if (ac97_clock &gt;= 8000 &amp;&amp; ac97_clock &lt;= 48000)</div><div class='hunk'>@@ -2230,9 +2203,11 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='ctx'> 	ac97.pci = chip-&gt;pci;</div><div class='ctx'> 	for (i = 0; i &lt; codecs; i++) {</div><div class='ctx'> 		ac97.num = i;</div><div class='del'>-		if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i])) &lt; 0) {</div><div class='add'>+		err = snd_ac97_mixer(pbus, &amp;ac97, &amp;chip-&gt;ac97[i]);</div><div class='add'>+		if (err &lt; 0) {</div><div class='ctx'> 			if (err != -EACCES)</div><div class='del'>-				snd_printk(KERN_ERR "Unable to initialize codec #%d\n", i);</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"Unable to initialize codec #%d\n", i);</div><div class='ctx'> 			if (i == 0)</div><div class='ctx'> 				goto __err;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2270,7 +2245,7 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,</div><div class='ctx'> 			tmp |= chip-&gt;ac97_sdin[0] &lt;&lt; ICH_DI1L_SHIFT;</div><div class='ctx'> 			for (i = 1; i &lt; 4; i++) {</div><div class='ctx'> 				if (pcm-&gt;r[0].codec[i]) {</div><div class='del'>-					tmp |= chip-&gt;ac97_sdin[pcm-&gt;r[0].codec[1]-&gt;num] &lt;&lt; ICH_DI2L_SHIFT;</div><div class='add'>+					tmp |= chip-&gt;ac97_sdin[pcm-&gt;r[0].codec[i]-&gt;num] &lt;&lt; ICH_DI2L_SHIFT;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2335,7 +2310,7 @@ static void do_ali_reset(struct intel8x0 *chip)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SND_AC97_POWER_SAVE</div><div class='del'>-static struct snd_pci_quirk ich_chip_reset_mode[] = {</div><div class='add'>+static const struct snd_pci_quirk ich_chip_reset_mode[] = {</div><div class='ctx'> 	SND_PCI_QUIRK(0x1014, 0x051f, "Thinkpad R32", 1),</div><div class='ctx'> 	{ } /* end */</div><div class='ctx'> };</div><div class='hunk'>@@ -2384,7 +2359,7 @@ static int snd_intel8x0_ich_chip_reset(struct intel8x0 *chip)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n",</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "AC'97 warm reset still in progress? [0x%x]\n",</div><div class='ctx'> 		   igetdword(chip, ICHREG(GLOB_CNT)));</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='hunk'>@@ -2426,7 +2401,8 @@ static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> 		if (! status) {</div><div class='ctx'> 			/* no codec is found */</div><div class='del'>-			snd_printk(KERN_ERR "codec_ready: codec is not ready [0x%x]\n",</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_ready: codec is not ready [0x%x]\n",</div><div class='ctx'> 				   igetdword(chip, ICHREG(GLOB_STA)));</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2490,7 +2466,7 @@ static int snd_intel8x0_ali_chip_init(struct intel8x0 *chip, int probing)</div><div class='ctx'> 			goto __ok;</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 reset failed.\n");</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "AC'97 reset failed.\n");</div><div class='ctx'> 	if (probing)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -2513,11 +2489,13 @@ static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='ctx'> 	if (chip-&gt;device_type != DEVICE_ALI) {</div><div class='del'>-		if ((err = snd_intel8x0_ich_chip_init(chip, probing)) &lt; 0)</div><div class='add'>+		err = snd_intel8x0_ich_chip_init(chip, probing);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		iagetword(chip, 0);	/* clear semaphore flag */</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((err = snd_intel8x0_ali_chip_init(chip, probing)) &lt; 0)</div><div class='add'>+		err = snd_intel8x0_ali_chip_init(chip, probing);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2534,7 +2512,7 @@ static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)</div><div class='ctx'>         		        break;</div><div class='ctx'>                 }</div><div class='ctx'>                 if (timeout == 0)</div><div class='del'>-                        printk(KERN_ERR "intel8x0: reset of registers failed?\n");</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "reset of registers failed?\n");</div><div class='ctx'>         }</div><div class='ctx'> 	/* initialize Buffer Descriptor Lists */</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;bdbars_count; i++)</div><div class='hunk'>@@ -2543,8 +2521,9 @@ static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_intel8x0_free(struct intel8x0 *chip)</div><div class='add'>+static void snd_intel8x0_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct intel8x0 *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;irq &lt; 0)</div><div class='hunk'>@@ -2567,45 +2546,18 @@ static int snd_intel8x0_free(struct intel8x0 *chip)</div><div class='ctx'>       __hw_end:</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;bdbars.area) {</div><div class='del'>-		if (chip-&gt;fix_nocache)</div><div class='del'>-			fill_nocache(chip-&gt;bdbars.area, chip-&gt;bdbars.bytes, 0);</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;bdbars);</div><div class='del'>-	}</div><div class='del'>-	if (chip-&gt;addr)</div><div class='del'>-		pci_iounmap(chip-&gt;pci, chip-&gt;addr);</div><div class='del'>-	if (chip-&gt;bmaddr)</div><div class='del'>-		pci_iounmap(chip-&gt;pci, chip-&gt;bmaddr);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * power management</div><div class='ctx'>  */</div><div class='del'>-static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int intel8x0_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct intel8x0 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;pcm_devs; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='del'>-	/* clear nocache */</div><div class='del'>-	if (chip-&gt;fix_nocache) {</div><div class='del'>-		for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='del'>-			struct ichdev *ichdev = &amp;chip-&gt;ichd[i];</div><div class='del'>-			if (ichdev-&gt;substream &amp;&amp; ichdev-&gt;page_attr_changed) {</div><div class='del'>-				struct snd_pcm_runtime *runtime = ichdev-&gt;substream-&gt;runtime;</div><div class='del'>-				if (runtime-&gt;dma_area)</div><div class='del'>-					fill_nocache(runtime-&gt;dma_area, runtime-&gt;dma_bytes, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;ncodecs; i++)</div><div class='ctx'> 		snd_ac97_suspend(chip-&gt;ac97[i]);</div><div class='ctx'> 	if (chip-&gt;device_type == DEVICE_INTEL_ICH4)</div><div class='hunk'>@@ -2614,41 +2566,28 @@ static int intel8x0_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0) {</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='ctx'> 		chip-&gt;irq = -1;</div><div class='add'>+		card-&gt;sync_irq = -1;</div><div class='ctx'> 	}</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	/* The call below may disable built-in speaker on some laptops</div><div class='del'>-	 * after S2RAM.  So, don't touch it.</div><div class='del'>-	 */</div><div class='del'>-	/* pci_set_power_state(pci, pci_choose_state(pci, state)); */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel8x0_resume(struct pci_dev *pci)</div><div class='add'>+static int intel8x0_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct intel8x0 *chip = card-&gt;private_data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "intel8x0: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='ctx'> 	snd_intel8x0_chip_init(chip, 0);</div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_intel8x0_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;shortname, chip)) {</div><div class='del'>-		printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "</div><div class='del'>-		       "disabling device\n", pci-&gt;irq);</div><div class='add'>+			IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(dev, "unable to grab IRQ %d, disabling device\n",</div><div class='add'>+			pci-&gt;irq);</div><div class='ctx'> 		snd_card_disconnect(card);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	/* re-initialize mixer stuff */</div><div class='ctx'> 	if (chip-&gt;device_type == DEVICE_INTEL_ICH4 &amp;&amp; !spdif_aclink) {</div><div class='hunk'>@@ -2660,25 +2599,9 @@ static int intel8x0_resume(struct pci_dev *pci)</div><div class='ctx'> 			  ICH_PCM_SPDIF_1011);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* refill nocache */</div><div class='del'>-	if (chip-&gt;fix_nocache)</div><div class='del'>-		fill_nocache(chip-&gt;bdbars.area, chip-&gt;bdbars.bytes, 1);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;ncodecs; i++)</div><div class='ctx'> 		snd_ac97_resume(chip-&gt;ac97[i]);</div><div class='ctx'> </div><div class='del'>-	/* refill nocache */</div><div class='del'>-	if (chip-&gt;fix_nocache) {</div><div class='del'>-		for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='del'>-			struct ichdev *ichdev = &amp;chip-&gt;ichd[i];</div><div class='del'>-			if (ichdev-&gt;substream &amp;&amp; ichdev-&gt;page_attr_changed) {</div><div class='del'>-				struct snd_pcm_runtime *runtime = ichdev-&gt;substream-&gt;runtime;</div><div class='del'>-				if (runtime-&gt;dma_area)</div><div class='del'>-					fill_nocache(runtime-&gt;dma_area, runtime-&gt;dma_bytes, 1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* resume status */</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='ctx'> 		struct ichdev *ichdev = &amp;chip-&gt;ichd[i];</div><div class='hunk'>@@ -2696,26 +2619,30 @@ static int intel8x0_resume(struct pci_dev *pci)</div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume);</div><div class='ctx'> </div><div class='ctx'> #define INTEL8X0_TESTBUF_SIZE	32768	/* enough large for one shot */</div><div class='ctx'> </div><div class='del'>-static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)</div><div class='add'>+static void intel8x0_measure_ac97_clock(struct intel8x0 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *subs;</div><div class='ctx'> 	struct ichdev *ichdev;</div><div class='ctx'> 	unsigned long port;</div><div class='ctx'> 	unsigned long pos, pos1, t;</div><div class='ctx'> 	int civ, timeout = 1000, attempt = 1;</div><div class='del'>-	struct timespec start_time, stop_time;</div><div class='add'>+	ktime_t start_time, stop_time;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;ac97_bus-&gt;clock != 48000)</div><div class='ctx'> 		return; /* specified in module option */</div><div class='add'>+	if (chip-&gt;inside_vm &amp;&amp; !ac97_clock)</div><div class='add'>+		return; /* no measurement on VM */</div><div class='ctx'> </div><div class='ctx'>       __again:</div><div class='ctx'> 	subs = chip-&gt;pcm[0]-&gt;streams[0].substream;</div><div class='ctx'> 	if (! subs || subs-&gt;dma_buffer.bytes &lt; INTEL8X0_TESTBUF_SIZE) {</div><div class='del'>-		snd_printk(KERN_WARNING "no playback buffer allocated - aborting measure ac97 clock\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			 "no playback buffer allocated - aborting measure ac97 clock\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	ichdev = &amp;chip-&gt;ichd[ICHD_PCMOUT];</div><div class='hunk'>@@ -2725,61 +2652,63 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* set rate */</div><div class='ctx'> 	if (snd_ac97_set_rate(chip-&gt;ac97[0], AC97_PCM_FRONT_DAC_RATE, 48000) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "cannot set ac97 rate: clock = %d\n", chip-&gt;ac97_bus-&gt;clock);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "cannot set ac97 rate: clock = %d\n",</div><div class='add'>+			chip-&gt;ac97_bus-&gt;clock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	snd_intel8x0_setup_periods(chip, ichdev);</div><div class='ctx'> 	port = ichdev-&gt;reg_offset;</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	chip-&gt;in_measurement = 1;</div><div class='del'>-	/* trigger */</div><div class='del'>-	if (chip-&gt;device_type != DEVICE_ALI)</div><div class='del'>-		iputbyte(chip, port + ICH_REG_OFF_CR, ICH_IOCE | ICH_STARTBM);</div><div class='del'>-	else {</div><div class='del'>-		iputbyte(chip, port + ICH_REG_OFF_CR, ICH_IOCE);</div><div class='del'>-		iputdword(chip, ICHREG(ALI_DMACR), 1 &lt;&lt; ichdev-&gt;ali_slot);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		chip-&gt;in_measurement = 1;</div><div class='add'>+		/* trigger */</div><div class='add'>+		if (chip-&gt;device_type != DEVICE_ALI)</div><div class='add'>+			iputbyte(chip, port + ICH_REG_OFF_CR, ICH_IOCE | ICH_STARTBM);</div><div class='add'>+		else {</div><div class='add'>+			iputbyte(chip, port + ICH_REG_OFF_CR, ICH_IOCE);</div><div class='add'>+			iputdword(chip, ICHREG(ALI_DMACR), 1 &lt;&lt; ichdev-&gt;ali_slot);</div><div class='add'>+		}</div><div class='add'>+		start_time = ktime_get();</div><div class='ctx'> 	}</div><div class='del'>-	do_posix_clock_monotonic_gettime(&amp;start_time);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	msleep(50);</div><div class='del'>-	spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='del'>-	/* check the position */</div><div class='del'>-	do {</div><div class='del'>-		civ = igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV);</div><div class='del'>-		pos1 = igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb);</div><div class='del'>-		if (pos1 == 0) {</div><div class='del'>-			udelay(10);</div><div class='del'>-			continue;</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;chip-&gt;reg_lock) {</div><div class='add'>+		/* check the position */</div><div class='add'>+		do {</div><div class='add'>+			civ = igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV);</div><div class='add'>+			pos1 = igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb);</div><div class='add'>+			if (pos1 == 0) {</div><div class='add'>+				udelay(10);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			if (civ == igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV) &amp;&amp;</div><div class='add'>+			    pos1 == igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb))</div><div class='add'>+				break;</div><div class='add'>+		} while (timeout--);</div><div class='add'>+		if (pos1 == 0) {	/* oops, this value is not reliable */</div><div class='add'>+			pos = 0;</div><div class='add'>+		} else {</div><div class='add'>+			pos = ichdev-&gt;fragsize1;</div><div class='add'>+			pos -= pos1 &lt;&lt; ichdev-&gt;pos_shift;</div><div class='add'>+			pos += ichdev-&gt;position;</div><div class='ctx'> 		}</div><div class='del'>-		if (civ == igetbyte(chip, ichdev-&gt;reg_offset + ICH_REG_OFF_CIV) &amp;&amp;</div><div class='del'>-		    pos1 == igetword(chip, ichdev-&gt;reg_offset + ichdev-&gt;roff_picb))</div><div class='del'>-			break;</div><div class='del'>-	} while (timeout--);</div><div class='del'>-	if (pos1 == 0) {	/* oops, this value is not reliable */</div><div class='del'>-		pos = 0;</div><div class='del'>-	} else {</div><div class='del'>-		pos = ichdev-&gt;fragsize1;</div><div class='del'>-		pos -= pos1 &lt;&lt; ichdev-&gt;pos_shift;</div><div class='del'>-		pos += ichdev-&gt;position;</div><div class='del'>-	}</div><div class='del'>-	chip-&gt;in_measurement = 0;</div><div class='del'>-	do_posix_clock_monotonic_gettime(&amp;stop_time);</div><div class='del'>-	/* stop */</div><div class='del'>-	if (chip-&gt;device_type == DEVICE_ALI) {</div><div class='del'>-		iputdword(chip, ICHREG(ALI_DMACR), 1 &lt;&lt; (ichdev-&gt;ali_slot + 16));</div><div class='del'>-		iputbyte(chip, port + ICH_REG_OFF_CR, 0);</div><div class='del'>-		while (igetbyte(chip, port + ICH_REG_OFF_CR))</div><div class='del'>-			;</div><div class='del'>-	} else {</div><div class='del'>-		iputbyte(chip, port + ICH_REG_OFF_CR, 0);</div><div class='del'>-		while (!(igetbyte(chip, port + ichdev-&gt;roff_sr) &amp; ICH_DCH))</div><div class='del'>-			;</div><div class='add'>+		chip-&gt;in_measurement = 0;</div><div class='add'>+		stop_time = ktime_get();</div><div class='add'>+		/* stop */</div><div class='add'>+		if (chip-&gt;device_type == DEVICE_ALI) {</div><div class='add'>+			iputdword(chip, ICHREG(ALI_DMACR), 1 &lt;&lt; (ichdev-&gt;ali_slot + 16));</div><div class='add'>+			iputbyte(chip, port + ICH_REG_OFF_CR, 0);</div><div class='add'>+			while (igetbyte(chip, port + ICH_REG_OFF_CR))</div><div class='add'>+				;</div><div class='add'>+		} else {</div><div class='add'>+			iputbyte(chip, port + ICH_REG_OFF_CR, 0);</div><div class='add'>+			while (!(igetbyte(chip, port + ichdev-&gt;roff_sr) &amp; ICH_DCH))</div><div class='add'>+				;</div><div class='add'>+		}</div><div class='add'>+		iputbyte(chip, port + ICH_REG_OFF_CR, ICH_RESETREGS);</div><div class='ctx'> 	}</div><div class='del'>-	iputbyte(chip, port + ICH_REG_OFF_CR, ICH_RESETREGS);</div><div class='del'>-	spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (pos == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"measure - unreliable DMA position..\n");</div><div class='ctx'> 	      __retry:</div><div class='ctx'> 		if (attempt &lt; 3) {</div><div class='ctx'> 			msleep(300);</div><div class='hunk'>@@ -2790,19 +2719,18 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pos /= 4;</div><div class='del'>-	t = stop_time.tv_sec - start_time.tv_sec;</div><div class='del'>-	t *= 1000000;</div><div class='del'>-	t += (stop_time.tv_nsec - start_time.tv_nsec) / 1000;</div><div class='del'>-	printk(KERN_INFO "%s: measured %lu usecs (%lu samples)\n", __func__, t, pos);</div><div class='add'>+	t = ktime_us_delta(stop_time, start_time);</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+		 "%s: measured %lu usecs (%lu samples)\n", __func__, t, pos);</div><div class='ctx'> 	if (t == 0) {</div><div class='del'>-		snd_printk(KERN_ERR "intel8x0: ?? calculation error..\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "?? calculation error..\n");</div><div class='ctx'> 		goto __retry;</div><div class='ctx'> 	}</div><div class='ctx'> 	pos *= 1000;</div><div class='ctx'> 	pos = (pos / t) * 1000 + ((pos % t) * 1000) / t;</div><div class='ctx'> 	if (pos &lt; 40000 || pos &gt;= 60000) {</div><div class='ctx'> 		/* abnormal value. hw problem? */</div><div class='del'>-		printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos);</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "measured clock %ld rejected\n", pos);</div><div class='ctx'> 		goto __retry;</div><div class='ctx'> 	} else if (pos &gt; 40500 &amp;&amp; pos &lt; 41500)</div><div class='ctx'> 		/* first exception - 41000Hz reference clock */</div><div class='hunk'>@@ -2814,12 +2742,13 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)</div><div class='ctx'> 		/* not 48000Hz, tuning the clock.. */</div><div class='ctx'> 		chip-&gt;ac97_bus-&gt;clock = (chip-&gt;ac97_bus-&gt;clock * 48000) / pos;</div><div class='ctx'>       __end:</div><div class='del'>-	printk(KERN_INFO "intel8x0: clocking to %d\n", chip-&gt;ac97_bus-&gt;clock);</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev, "clocking to %d\n", chip-&gt;ac97_bus-&gt;clock);</div><div class='ctx'> 	snd_ac97_update_power(chip-&gt;ac97[0], AC97_PCM_FRONT_DAC_RATE, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {</div><div class='add'>+static const struct snd_pci_quirk intel8x0_clock_list[] = {</div><div class='ctx'> 	SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),</div><div class='add'>+	SND_PCI_QUIRK(0x1014, 0x0581, "AD1981B", 48000),</div><div class='ctx'> 	SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),</div><div class='ctx'> 	SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),</div><div class='ctx'> 	SND_PCI_QUIRK(0x1028, 0x01ad, "AD1981B", 48000),</div><div class='hunk'>@@ -2827,7 +2756,7 @@ static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {</div><div class='ctx'> 	{ }	/* terminator */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit intel8x0_in_clock_list(struct intel8x0 *chip)</div><div class='add'>+static int intel8x0_in_clock_list(struct intel8x0 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pci = chip-&gt;pci;</div><div class='ctx'> 	const struct snd_pci_quirk *wl;</div><div class='hunk'>@@ -2835,13 +2764,12 @@ static int __devinit intel8x0_in_clock_list(struct intel8x0 *chip)</div><div class='ctx'> 	wl = snd_pci_quirk_lookup(pci, intel8x0_clock_list);</div><div class='ctx'> 	if (!wl)</div><div class='ctx'> 		return 0;</div><div class='del'>-	printk(KERN_INFO "intel8x0: white list rate for %04x:%04x is %i\n",</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev, "allow list rate for %04x:%04x is %i\n",</div><div class='ctx'> 	       pci-&gt;subsystem_vendor, pci-&gt;subsystem_device, wl-&gt;value);</div><div class='ctx'> 	chip-&gt;ac97_bus-&gt;clock = wl-&gt;value;</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='ctx'> static void snd_intel8x0_proc_read(struct snd_info_entry * entry,</div><div class='ctx'> 				   struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -2876,21 +2804,10 @@ static void snd_intel8x0_proc_read(struct snd_info_entry * entry,</div><div class='ctx'> 			chip-&gt;ac97_sdin[2]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_intel8x0_proc_init(struct intel8x0 * chip)</div><div class='add'>+static void snd_intel8x0_proc_init(struct intel8x0 *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "intel8x0", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_intel8x0_proc_read);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define snd_intel8x0_proc_init(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int snd_intel8x0_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	struct intel8x0 *chip = device-&gt;device_data;</div><div class='del'>-	return snd_intel8x0_free(chip);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "intel8x0", chip,</div><div class='add'>+			     snd_intel8x0_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ich_reg_info {</div><div class='hunk'>@@ -2898,35 +2815,62 @@ struct ich_reg_info {</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static unsigned int ich_codec_bits[3] = {</div><div class='add'>+static const unsigned int ich_codec_bits[3] = {</div><div class='ctx'> 	ICH_PCR, ICH_SCR, ICH_TCR</div><div class='ctx'> };</div><div class='del'>-static unsigned int sis_codec_bits[3] = {</div><div class='add'>+static const unsigned int sis_codec_bits[3] = {</div><div class='ctx'> 	ICH_PCR, ICH_SCR, ICH_SIS_TCR</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='del'>-					 struct pci_dev *pci,</div><div class='del'>-					 unsigned long device_type,</div><div class='del'>-					 struct intel8x0 ** r_intel8x0)</div><div class='add'>+static int snd_intel8x0_inside_vm(struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct intel8x0 *chip;</div><div class='add'>+	int result  = inside_vm;</div><div class='add'>+	char *msg   = NULL;</div><div class='add'>+</div><div class='add'>+	/* check module parameter first (override detection) */</div><div class='add'>+	if (result &gt;= 0) {</div><div class='add'>+		msg = result ? "enable (forced) VM" : "disable (forced) VM";</div><div class='add'>+		goto fini;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check for known (emulated) devices */</div><div class='add'>+	result = 0;</div><div class='add'>+	if (pci-&gt;subsystem_vendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &amp;&amp;</div><div class='add'>+	    pci-&gt;subsystem_device == PCI_SUBDEVICE_ID_QEMU) {</div><div class='add'>+		/* KVM emulated sound, PCI SSID: 1af4:1100 */</div><div class='add'>+		msg = "enable KVM";</div><div class='add'>+		result = 1;</div><div class='add'>+	} else if (pci-&gt;subsystem_vendor == 0x1ab8) {</div><div class='add'>+		/* Parallels VM emulated sound, PCI SSID: 1ab8:xxxx */</div><div class='add'>+		msg = "enable Parallels VM";</div><div class='add'>+		result = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fini:</div><div class='add'>+	if (msg != NULL)</div><div class='add'>+		dev_info(&amp;pci-&gt;dev, "%s optimization\n", msg);</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int snd_intel8x0_init(struct snd_card *card,</div><div class='add'>+			     struct pci_dev *pci,</div><div class='add'>+			     unsigned long device_type)</div><div class='add'>+{</div><div class='add'>+	struct intel8x0 *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int int_sta_masks;</div><div class='ctx'> 	struct ichdev *ichdev;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_intel8x0_dev_free,</div><div class='del'>-	};</div><div class='ctx'> </div><div class='del'>-	static unsigned int bdbars[] = {</div><div class='add'>+	static const unsigned int bdbars[] = {</div><div class='ctx'> 		3, /* DEVICE_INTEL */</div><div class='ctx'> 		6, /* DEVICE_INTEL_ICH4 */</div><div class='ctx'> 		3, /* DEVICE_SIS */</div><div class='ctx'> 		6, /* DEVICE_ALI */</div><div class='ctx'> 		4, /* DEVICE_NFORCE */</div><div class='ctx'> 	};</div><div class='del'>-	static struct ich_reg_info intel_regs[6] = {</div><div class='add'>+	static const struct ich_reg_info intel_regs[6] = {</div><div class='ctx'> 		{ ICH_PIINT, 0 },</div><div class='ctx'> 		{ ICH_POINT, 0x10 },</div><div class='ctx'> 		{ ICH_MCINT, 0x20 },</div><div class='hunk'>@@ -2934,13 +2878,13 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='ctx'> 		{ ICH_P2INT, 0x50 },</div><div class='ctx'> 		{ ICH_SPINT, 0x60 },</div><div class='ctx'> 	};</div><div class='del'>-	static struct ich_reg_info nforce_regs[4] = {</div><div class='add'>+	static const struct ich_reg_info nforce_regs[4] = {</div><div class='ctx'> 		{ ICH_PIINT, 0 },</div><div class='ctx'> 		{ ICH_POINT, 0x10 },</div><div class='ctx'> 		{ ICH_MCINT, 0x20 },</div><div class='ctx'> 		{ ICH_NVSPINT, 0x70 },</div><div class='ctx'> 	};</div><div class='del'>-	static struct ich_reg_info ali_regs[6] = {</div><div class='add'>+	static const struct ich_reg_info ali_regs[6] = {</div><div class='ctx'> 		{ ALI_INT_PCMIN, 0x40 },</div><div class='ctx'> 		{ ALI_INT_PCMOUT, 0x50 },</div><div class='ctx'> 		{ ALI_INT_MICIN, 0x60 },</div><div class='hunk'>@@ -2948,18 +2892,12 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='ctx'> 		{ ALI_INT_SPDIFIN, 0xa0 },</div><div class='ctx'> 		{ ALI_INT_SPDIFOUT, 0xb0 },</div><div class='ctx'> 	};</div><div class='del'>-	struct ich_reg_info *tbl;</div><div class='del'>-</div><div class='del'>-	*r_intel8x0 = NULL;</div><div class='add'>+	const struct ich_reg_info *tbl;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;device_type = device_type;</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='hunk'>@@ -2972,42 +2910,36 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='ctx'> 	if (xbox)</div><div class='ctx'> 		chip-&gt;xbox = 1;</div><div class='ctx'> </div><div class='add'>+	chip-&gt;inside_vm = snd_intel8x0_inside_vm(pci);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Intel 82443MX running a 100MHz processor system bus has a hardware</div><div class='add'>+	 * bug, which aborts PCI busmaster for audio transfer.  A workaround</div><div class='add'>+	 * is to set the pages as non-cached.  For details, see the errata in</div><div class='add'>+	 *     http://download.intel.com/design/chipsets/specupdt/24505108.pdf</div><div class='add'>+	 */</div><div class='ctx'> 	if (pci-&gt;vendor == PCI_VENDOR_ID_INTEL &amp;&amp;</div><div class='ctx'> 	    pci-&gt;device == PCI_DEVICE_ID_INTEL_440MX)</div><div class='ctx'> 		chip-&gt;fix_nocache = 1; /* enable workaround */</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, card-&gt;shortname)) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, card-&gt;shortname);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (device_type == DEVICE_ALI) {</div><div class='ctx'> 		/* ALI5455 has no ac97 region */</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 0, 0);</div><div class='del'>-		goto port_inited;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pci_resource_flags(pci, 2) &amp; IORESOURCE_MEM) /* ICH4 and Nforce */</div><div class='del'>-		chip-&gt;addr = pci_iomap(pci, 2, 0);</div><div class='del'>-	else</div><div class='del'>-		chip-&gt;addr = pci_iomap(pci, 0, 0);</div><div class='del'>-	if (!chip-&gt;addr) {</div><div class='del'>-		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (pci_resource_flags(pci, 3) &amp; IORESOURCE_MEM) /* ICH4 */</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 3, 0);</div><div class='del'>-	else</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 1, 0);</div><div class='del'>-	if (!chip-&gt;bmaddr) {</div><div class='del'>-		snd_printk(KERN_ERR "Controller space ioremap problem\n");</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return -EIO;</div><div class='add'>+		chip-&gt;bmaddr = pcim_iomap(pci, 0, 0);</div><div class='add'>+	} else {</div><div class='add'>+		if (pci_resource_flags(pci, 2) &amp; IORESOURCE_MEM) /* ICH4 and Nforce */</div><div class='add'>+			chip-&gt;addr = pcim_iomap(pci, 2, 0);</div><div class='add'>+		else</div><div class='add'>+			chip-&gt;addr = pcim_iomap(pci, 0, 0);</div><div class='add'>+		if (pci_resource_flags(pci, 3) &amp; IORESOURCE_MEM) /* ICH4 */</div><div class='add'>+			chip-&gt;bmaddr = pcim_iomap(pci, 3, 0);</div><div class='add'>+		else</div><div class='add'>+			chip-&gt;bmaddr = pcim_iomap(pci, 1, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- port_inited:</div><div class='ctx'> 	chip-&gt;bdbars_count = bdbars[device_type];</div><div class='ctx'> </div><div class='ctx'> 	/* initialize offsets */</div><div class='hunk'>@@ -3043,24 +2975,20 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	/* allocate buffer descriptor lists */</div><div class='ctx'> 	/* the start of each lists must be aligned to 8 bytes */</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				chip-&gt;bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,</div><div class='del'>-				&amp;chip-&gt;bdbars) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		snd_printk(KERN_ERR "intel8x0: cannot allocate buffer descriptors\n");</div><div class='add'>+	chip-&gt;bdbars = snd_devm_alloc_pages(&amp;pci-&gt;dev, intel8x0_dma_type(chip),</div><div class='add'>+					    chip-&gt;bdbars_count * sizeof(u32) *</div><div class='add'>+					    ICH_MAX_FRAGS * 2);</div><div class='add'>+	if (!chip-&gt;bdbars)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* tables must be aligned to 8 bytes here, but the kernel pages</div><div class='ctx'> 	   are much bigger, so we don't care (on i386) */</div><div class='del'>-	/* workaround for 440MX */</div><div class='del'>-	if (chip-&gt;fix_nocache)</div><div class='del'>-		fill_nocache(chip-&gt;bdbars.area, chip-&gt;bdbars.bytes, 1);</div><div class='ctx'> 	int_sta_masks = 0;</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='ctx'> 		ichdev = &amp;chip-&gt;ichd[i];</div><div class='del'>-		ichdev-&gt;bdbar = ((u32 *)chip-&gt;bdbars.area) +</div><div class='add'>+		ichdev-&gt;bdbar = ((__le32 *)chip-&gt;bdbars-&gt;area) +</div><div class='ctx'> 			(i * ICH_MAX_FRAGS * 2);</div><div class='del'>-		ichdev-&gt;bdbar_addr = chip-&gt;bdbars.addr +</div><div class='add'>+		ichdev-&gt;bdbar_addr = chip-&gt;bdbars-&gt;addr +</div><div class='ctx'> 			(i * sizeof(u32) * ICH_MAX_FRAGS * 2);</div><div class='ctx'> 		int_sta_masks |= ichdev-&gt;int_sta_mask;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3093,35 +3021,32 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;max_codecs; i++)</div><div class='ctx'> 		chip-&gt;codec_isr_bits |= chip-&gt;codec_bit[i];</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0_chip_init(chip, 1)) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='add'>+	err = snd_intel8x0_chip_init(chip, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* request irq after initializaing int_sta_mask, etc */</div><div class='add'>+	/* NOTE: we don't use devm version here since it's released /</div><div class='add'>+	 * re-acquired in PM callbacks.</div><div class='add'>+	 * It's released explicitly in snd_intel8x0_free(), too.</div><div class='add'>+	 */</div><div class='ctx'> 	if (request_irq(pci-&gt;irq, snd_intel8x0_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='add'>+			IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='add'>+	card-&gt;private_free = snd_intel8x0_free;</div><div class='ctx'> </div><div class='del'>-	*r_intel8x0 = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct shortname_table {</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	const char *s;</div><div class='del'>-} shortnames[] __devinitdata = {</div><div class='add'>+} shortnames[] = {</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801AA_5, "Intel 82801AA-ICH" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801AB_5, "Intel 82901AB-ICH0" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801BA_4, "Intel 82801BA-ICH2" },</div><div class='hunk'>@@ -3147,59 +3072,63 @@ static struct shortname_table {</div><div class='ctx'> 	{ 0, NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pci_quirk spdif_aclink_defaults[] __devinitdata = {</div><div class='add'>+static const struct snd_pci_quirk spdif_aclink_defaults[] = {</div><div class='ctx'> 	SND_PCI_QUIRK(0x147b, 0x1c1a, "ASUS KN8", 1),</div><div class='ctx'> 	{ } /* end */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* look up white/black list for SPDIF over ac-link */</div><div class='del'>-static int __devinit check_default_spdif_aclink(struct pci_dev *pci)</div><div class='add'>+/* look up allow/deny list for SPDIF over ac-link */</div><div class='add'>+static int check_default_spdif_aclink(struct pci_dev *pci)</div><div class='ctx'> {</div><div class='ctx'> 	const struct snd_pci_quirk *w;</div><div class='ctx'> </div><div class='ctx'> 	w = snd_pci_quirk_lookup(pci, spdif_aclink_defaults);</div><div class='ctx'> 	if (w) {</div><div class='ctx'> 		if (w-&gt;value)</div><div class='del'>-			snd_printdd(KERN_INFO "intel8x0: Using SPDIF over "</div><div class='del'>-				    "AC-Link for %s\n", w-&gt;name);</div><div class='add'>+			dev_dbg(&amp;pci-&gt;dev,</div><div class='add'>+				"Using SPDIF over AC-Link for %s\n",</div><div class='add'>+				    snd_pci_quirk_name(w));</div><div class='ctx'> 		else</div><div class='del'>-			snd_printdd(KERN_INFO "intel8x0: Using integrated "</div><div class='del'>-				    "SPDIF DMA for %s\n", w-&gt;name);</div><div class='add'>+			dev_dbg(&amp;pci-&gt;dev,</div><div class='add'>+				"Using integrated SPDIF DMA for %s\n",</div><div class='add'>+				    snd_pci_quirk_name(w));</div><div class='ctx'> 		return w-&gt;value;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_intel8x0_probe(struct pci_dev *pci,</div><div class='add'>+				const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct intel8x0 *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct shortname_table *name;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	if (spdif_aclink &lt; 0)</div><div class='ctx'> 		spdif_aclink = check_default_spdif_aclink(pci);</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ICH");</div><div class='add'>+	strscpy(card-&gt;driver, "ICH");</div><div class='ctx'> 	if (!spdif_aclink) {</div><div class='ctx'> 		switch (pci_id-&gt;driver_data) {</div><div class='ctx'> 		case DEVICE_NFORCE:</div><div class='del'>-			strcpy(card-&gt;driver, "NFORCE");</div><div class='add'>+			strscpy(card-&gt;driver, "NFORCE");</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DEVICE_INTEL_ICH4:</div><div class='del'>-			strcpy(card-&gt;driver, "ICH4");</div><div class='add'>+			strscpy(card-&gt;driver, "ICH4");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;shortname, "Intel ICH");</div><div class='add'>+	strscpy(card-&gt;shortname, "Intel ICH");</div><div class='ctx'> 	for (name = shortnames; name-&gt;id; name++) {</div><div class='ctx'> 		if (pci-&gt;device == name-&gt;id) {</div><div class='del'>-			strcpy(card-&gt;shortname, name-&gt;s);</div><div class='add'>+			strscpy(card-&gt;shortname, name-&gt;s);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3214,21 +3143,16 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,</div><div class='ctx'> 			buggy_irq = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0_create(card, pci, pci_id-&gt;driver_data,</div><div class='del'>-				       &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0_init(card, pci, pci_id-&gt;driver_data);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_intel8x0_pcm(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0_pcm(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	snd_intel8x0_proc_init(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -3245,41 +3169,27 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_intel8x0_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_intel8x0_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_intel8x0_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "Intel ICH",</div><div class='add'>+static struct pci_driver intel8x0_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_intel8x0_ids,</div><div class='ctx'> 	.probe = snd_intel8x0_probe,</div><div class='del'>-	.remove = __devexit_p(snd_intel8x0_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = intel8x0_suspend,</div><div class='del'>-	.resume = intel8x0_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;intel8x0_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init alsa_card_intel8x0_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_intel8x0_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_intel8x0_init)</div><div class='del'>-module_exit(alsa_card_intel8x0_exit)</div><div class='add'>+module_pci_driver(intel8x0_driver);</div><div class='head'>diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c<br/>index 13cec1e5ced9..84e1b7ea34e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/intel8x0m.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/intel8x0m.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/intel8x0m.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/intel8x0m.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   ALSA modem driver for Intel ICH (i8x0) chipsets</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,31 +6,15 @@</div><div class='ctx'>  *</div><div class='ctx'>  *   This is modified (by Sasha Khapyorsky &lt;sashak@alsa-project.org&gt;) version</div><div class='ctx'>  *   of ALSA ICH sound driver intel8x0.c .</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */      </div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='ctx'> #include &lt;sound/ac97_codec.h&gt;</div><div class='hunk'>@@ -40,21 +25,6 @@ MODULE_AUTHOR("Jaroslav Kysela &lt;perex@perex.cz&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; "</div><div class='ctx'> 		   "SiS 7013; NVidia MCP/2/2S/3 modems");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"</div><div class='del'>-		"{Intel,82901AB-ICH0},"</div><div class='del'>-		"{Intel,82801BA-ICH2},"</div><div class='del'>-		"{Intel,82801CA-ICH3},"</div><div class='del'>-		"{Intel,82801DB-ICH4},"</div><div class='del'>-		"{Intel,ICH5},"</div><div class='del'>-		"{Intel,ICH6},"</div><div class='del'>-		"{Intel,ICH7},"</div><div class='del'>-	        "{Intel,MX440},"</div><div class='del'>-		"{SiS,7013},"</div><div class='del'>-		"{NVidia,NForce Modem},"</div><div class='del'>-		"{NVidia,NForce2 Modem},"</div><div class='del'>-		"{NVidia,NForce2s Modem},"</div><div class='del'>-		"{NVidia,NForce3 Modem},"</div><div class='del'>-		"{AMD,AMD768}}");</div><div class='ctx'> </div><div class='ctx'> static int index = -2; /* Exclude the first card */</div><div class='ctx'> static char *id = SNDRV_DEFAULT_STR1;	/* ID for this card */</div><div class='hunk'>@@ -68,7 +38,7 @@ module_param(ac97_clock, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");</div><div class='ctx'> </div><div class='ctx'> /* just for backward compatibility */</div><div class='del'>-static int enable;</div><div class='add'>+static bool enable;</div><div class='ctx'> module_param(enable, bool, 0444);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -87,7 +57,7 @@ enum { \</div><div class='ctx'> 	ICH_REG_##name##_PICB	= base + 0x08,	/* word - position in current buffer */ \</div><div class='ctx'> 	ICH_REG_##name##_PIV	= base + 0x0a,	/* byte - prefetched index value */ \</div><div class='ctx'> 	ICH_REG_##name##_CR	= base + 0x0b,	/* byte - control register */ \</div><div class='del'>-};</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* busmaster blocks */</div><div class='ctx'> DEFINE_REGSET(OFF, 0);		/* offset */</div><div class='hunk'>@@ -168,7 +138,7 @@ enum { ALID_MDMIN, ALID_MDMOUT, ALID_MDMLAST = ALID_MDMOUT };</div><div class='ctx'> struct ichdev {</div><div class='ctx'> 	unsigned int ichd;			/* ich device number */</div><div class='ctx'> 	unsigned long reg_offset;		/* offset to bmaddr */</div><div class='del'>-	u32 *bdbar;				/* CPU address (32bit) */</div><div class='add'>+	__le32 *bdbar;				/* CPU address (32bit) */</div><div class='ctx'> 	unsigned int bdbar_addr;		/* PCI bus address (32bit) */</div><div class='ctx'> 	struct snd_pcm_substream *substream;</div><div class='ctx'> 	unsigned int physbuf;			/* physical address (32bit) */</div><div class='hunk'>@@ -212,14 +182,14 @@ struct intel8x0m {</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t reg_lock;</div><div class='ctx'> 	</div><div class='del'>-	struct snd_dma_buffer bdbars;</div><div class='add'>+	struct snd_dma_buffer *bdbars;</div><div class='ctx'> 	u32 bdbars_count;</div><div class='ctx'> 	u32 int_sta_reg;		/* interrupt status register */</div><div class='ctx'> 	u32 int_sta_mask;		/* interrupt status mask */</div><div class='ctx'> 	unsigned int pcm_pos_shift;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {</div><div class='add'>+static const struct pci_device_id snd_intel8x0m_ids[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL },	/* 82801AA */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL },	/* 82901AB */</div><div class='ctx'> 	{ PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL },	/* 82801BA */</div><div class='hunk'>@@ -235,8 +205,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {</div><div class='ctx'> 	{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */</div><div class='ctx'> 	{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */</div><div class='ctx'> 	{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },	/* AMD8111 */</div><div class='ctx'> #if 0</div><div class='del'>-	{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },	/* AMD8111 */</div><div class='ctx'> 	{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */</div><div class='ctx'> #endif</div><div class='ctx'> 	{ 0, }</div><div class='hunk'>@@ -303,7 +273,7 @@ static inline void iaputword(struct intel8x0m *chip, u32 offset, u16 val)</div><div class='ctx'> /* return the GLOB_STA bit for the corresponding codec */</div><div class='ctx'> static unsigned int get_ich_codec_bit(struct intel8x0m *chip, unsigned int codec)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int codec_bit[3] = {</div><div class='add'>+	static const unsigned int codec_bit[3] = {</div><div class='ctx'> 		ICH_PCR, ICH_SCR, ICH_TCR</div><div class='ctx'> 	};</div><div class='ctx'> 	if (snd_BUG_ON(codec &gt;= 3))</div><div class='hunk'>@@ -331,31 +301,34 @@ static int snd_intel8x0m_codec_semaphore(struct intel8x0m *chip, unsigned int co</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	} while (time--);</div><div class='ctx'> </div><div class='del'>-	/* access to some forbidden (non existant) ac97 registers will not</div><div class='add'>+	/* access to some forbidden (non existent) ac97 registers will not</div><div class='ctx'> 	 * reset the semaphore. So even if you don't get the semaphore, still</div><div class='ctx'> 	 * continue the access. We don't need the semaphore anyway. */</div><div class='del'>-	snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+		"codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",</div><div class='ctx'> 			igetbyte(chip, ICHREG(ACC_SEMA)), igetdword(chip, ICHREG(GLOB_STA)));</div><div class='ctx'> 	iagetword(chip, 0);	/* clear semaphore flag */</div><div class='ctx'> 	/* I don't care about the semaphore */</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='del'>-static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,</div><div class='del'>-				     unsigned short reg,</div><div class='del'>-				     unsigned short val)</div><div class='add'>+static void snd_intel8x0m_codec_write(struct snd_ac97 *ac97,</div><div class='add'>+				      unsigned short reg,</div><div class='add'>+				      unsigned short val)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = ac97-&gt;private_data;</div><div class='ctx'> 	</div><div class='ctx'> 	if (snd_intel8x0m_codec_semaphore(chip, ac97-&gt;num) &lt; 0) {</div><div class='ctx'> 		if (! chip-&gt;in_ac97_init)</div><div class='del'>-			snd_printk(KERN_ERR "codec_write %d: semaphore is not ready for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_write %d: semaphore is not ready for register 0x%x\n",</div><div class='add'>+				ac97-&gt;num, reg);</div><div class='ctx'> 	}</div><div class='ctx'> 	iaputword(chip, reg + ac97-&gt;num * 0x80, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,</div><div class='del'>-					      unsigned short reg)</div><div class='add'>+static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97,</div><div class='add'>+					       unsigned short reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = ac97-&gt;private_data;</div><div class='ctx'> 	unsigned short res;</div><div class='hunk'>@@ -363,16 +336,21 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> </div><div class='ctx'> 	if (snd_intel8x0m_codec_semaphore(chip, ac97-&gt;num) &lt; 0) {</div><div class='ctx'> 		if (! chip-&gt;in_ac97_init)</div><div class='del'>-			snd_printk(KERN_ERR "codec_read %d: semaphore is not ready for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_read %d: semaphore is not ready for register 0x%x\n",</div><div class='add'>+				ac97-&gt;num, reg);</div><div class='ctx'> 		res = 0xffff;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		res = iagetword(chip, reg + ac97-&gt;num * 0x80);</div><div class='del'>-		if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) &amp; ICH_RCS) {</div><div class='add'>+		tmp = igetdword(chip, ICHREG(GLOB_STA));</div><div class='add'>+		if (tmp &amp; ICH_RCS) {</div><div class='ctx'> 			/* reset RCS and preserve other R/WC bits */</div><div class='ctx'> 			iputdword(chip, ICHREG(GLOB_STA),</div><div class='ctx'> 				  tmp &amp; ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));</div><div class='ctx'> 			if (! chip-&gt;in_ac97_init)</div><div class='del'>-				snd_printk(KERN_ERR "codec_read %d: read timeout for register 0x%x\n", ac97-&gt;num, reg);</div><div class='add'>+				dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+					"codec_read %d: read timeout for register 0x%x\n",</div><div class='add'>+					ac97-&gt;num, reg);</div><div class='ctx'> 			res = 0xffff;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -385,10 +363,10 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,</div><div class='ctx'> /*</div><div class='ctx'>  * DMA I/O</div><div class='ctx'>  */</div><div class='del'>-static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev) </div><div class='add'>+static void snd_intel8x0m_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev)</div><div class='ctx'> {</div><div class='ctx'> 	int idx;</div><div class='del'>-	u32 *bdbar = ichdev-&gt;bdbar;</div><div class='add'>+	__le32 *bdbar = ichdev-&gt;bdbar;</div><div class='ctx'> 	unsigned long port = ichdev-&gt;reg_offset;</div><div class='ctx'> </div><div class='ctx'> 	iputdword(chip, port + ICH_REG_OFF_BDBAR, ichdev-&gt;bdbar_addr);</div><div class='hunk'>@@ -412,7 +390,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> 			bdbar[idx + 1] = cpu_to_le32(0x80000000 | /* interrupt on completion */</div><div class='ctx'> 						     ichdev-&gt;fragsize &gt;&gt; chip-&gt;pcm_pos_shift);</div><div class='ctx'> 			/*</div><div class='del'>-			printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "bdbar[%i] = 0x%x [0x%x]\n",</div><div class='ctx'> 			       idx + 0, bdbar[idx + 0], bdbar[idx + 1]);</div><div class='ctx'> 			*/</div><div class='ctx'> 		}</div><div class='hunk'>@@ -424,8 +402,8 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> 	ichdev-&gt;lvi_frag = ICH_REG_LVI_MASK % ichdev-&gt;frags;</div><div class='ctx'> 	ichdev-&gt;position = 0;</div><div class='ctx'> #if 0</div><div class='del'>-	printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "</div><div class='del'>-	       "period_size1 = 0x%x\n",</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",</div><div class='ctx'> 	       ichdev-&gt;lvi_frag, ichdev-&gt;frags, ichdev-&gt;fragsize,</div><div class='ctx'> 	       ichdev-&gt;fragsize1);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -437,7 +415,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'>  *  Interrupt handler</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ichdev)</div><div class='add'>+static inline void snd_intel8x0m_update(struct intel8x0m *chip, struct ichdev *ichdev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long port = ichdev-&gt;reg_offset;</div><div class='ctx'> 	int civ, i, step;</div><div class='hunk'>@@ -445,7 +423,6 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> </div><div class='ctx'> 	civ = igetbyte(chip, port + ICH_REG_OFF_CIV);</div><div class='ctx'> 	if (civ == ichdev-&gt;civ) {</div><div class='del'>-		// snd_printd("civ same %d\n", civ);</div><div class='ctx'> 		step = 1;</div><div class='ctx'> 		ichdev-&gt;civ++;</div><div class='ctx'> 		ichdev-&gt;civ &amp;= ICH_REG_LVI_MASK;</div><div class='hunk'>@@ -453,8 +430,6 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> 		step = civ - ichdev-&gt;civ;</div><div class='ctx'> 		if (step &lt; 0)</div><div class='ctx'> 			step += ICH_REG_LVI_MASK + 1;</div><div class='del'>-		// if (step != 1)</div><div class='del'>-		//	snd_printd("step = %d, %d -&gt; %d\n", step, ichdev-&gt;civ, civ);</div><div class='ctx'> 		ichdev-&gt;civ = civ;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -470,8 +445,8 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> 							     ichdev-&gt;lvi_frag *</div><div class='ctx'> 							     ichdev-&gt;fragsize1);</div><div class='ctx'> #if 0</div><div class='del'>-		printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], "</div><div class='del'>-		       "prefetch = %i, all = 0x%x, 0x%x\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+			"new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",</div><div class='ctx'> 		       ichdev-&gt;lvi * 2, ichdev-&gt;bdbar[ichdev-&gt;lvi * 2],</div><div class='ctx'> 		       ichdev-&gt;bdbar[ichdev-&gt;lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),</div><div class='ctx'> 		       inl(port + 4), inb(port + ICH_REG_OFF_CR));</div><div class='hunk'>@@ -489,35 +464,31 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic</div><div class='ctx'> 	iputbyte(chip, port + ichdev-&gt;roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)</div><div class='add'>+static irqreturn_t snd_intel8x0m_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = dev_id;</div><div class='ctx'> 	struct ichdev *ichdev;</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	status = igetdword(chip, chip-&gt;int_sta_reg);</div><div class='del'>-	if (status == 0xffffffff) { /* we are not yet resumed */</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (status == 0xffffffff) /* we are not yet resumed */</div><div class='ctx'> 		return IRQ_NONE;</div><div class='del'>-	}</div><div class='ctx'> 	if ((status &amp; chip-&gt;int_sta_mask) == 0) {</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			iputdword(chip, chip-&gt;int_sta_reg, status);</div><div class='del'>-		spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='ctx'> 		ichdev = &amp;chip-&gt;ichd[i];</div><div class='ctx'> 		if (status &amp; ichdev-&gt;int_sta_mask)</div><div class='del'>-			snd_intel8x0_update(chip, ichdev);</div><div class='add'>+			snd_intel8x0m_update(chip, ichdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ack them */</div><div class='ctx'> 	iputdword(chip, chip-&gt;int_sta_reg, status &amp; chip-&gt;int_sta_mask);</div><div class='del'>-	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -526,7 +497,7 @@ static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)</div><div class='ctx'>  *  PCM part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+static int snd_intel8x0m_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ichdev *ichdev = get_ichdev(substream);</div><div class='hunk'>@@ -561,18 +532,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,</div><div class='del'>-				  struct snd_pcm_hw_params *hw_params)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_intel8x0_hw_free(struct snd_pcm_substream *substream)</div><div class='del'>-{</div><div class='del'>-	return snd_pcm_lib_free_pages(substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+static snd_pcm_uframes_t snd_intel8x0m_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	struct ichdev *ichdev = get_ichdev(substream);</div><div class='hunk'>@@ -600,11 +560,11 @@ static int snd_intel8x0m_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	ichdev-&gt;fragsize = snd_pcm_lib_period_bytes(substream);</div><div class='ctx'> 	snd_ac97_write(ichdev-&gt;ac97, AC97_LINE1_RATE, runtime-&gt;rate);</div><div class='ctx'> 	snd_ac97_write(ichdev-&gt;ac97, AC97_LINE1_LEVEL, 0);</div><div class='del'>-	snd_intel8x0_setup_periods(chip, ichdev);</div><div class='add'>+	snd_intel8x0m_setup_periods(chip, ichdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_intel8x0m_stream =</div><div class='add'>+static const struct snd_pcm_hardware snd_intel8x0m_stream =</div><div class='ctx'> {</div><div class='ctx'> 	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='hunk'>@@ -628,8 +588,8 @@ static struct snd_pcm_hardware snd_intel8x0m_stream =</div><div class='ctx'> </div><div class='ctx'> static int snd_intel8x0m_pcm_open(struct snd_pcm_substream *substream, struct ichdev *ichdev)</div><div class='ctx'> {</div><div class='del'>-	static unsigned int rates[] = { 8000,  9600, 12000, 16000 };</div><div class='del'>-	static struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='add'>+	static const unsigned int rates[] = { 8000,  9600, 12000, 16000 };</div><div class='add'>+	static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {</div><div class='ctx'> 		.count = ARRAY_SIZE(rates),</div><div class='ctx'> 		.list = rates,</div><div class='ctx'> 		.mask = 0,</div><div class='hunk'>@@ -678,40 +638,34 @@ static int snd_intel8x0m_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0m_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0m_playback_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0m_playback_open,</div><div class='ctx'> 	.close =	snd_intel8x0m_playback_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_intel8x0_hw_params,</div><div class='del'>-	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0m_pcm_prepare,</div><div class='del'>-	.trigger =	snd_intel8x0_pcm_trigger,</div><div class='del'>-	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='add'>+	.trigger =	snd_intel8x0m_pcm_trigger,</div><div class='add'>+	.pointer =	snd_intel8x0m_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_intel8x0m_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_intel8x0m_capture_ops = {</div><div class='ctx'> 	.open =		snd_intel8x0m_capture_open,</div><div class='ctx'> 	.close =	snd_intel8x0m_capture_close,</div><div class='del'>-	.ioctl =	snd_pcm_lib_ioctl,</div><div class='del'>-	.hw_params =	snd_intel8x0_hw_params,</div><div class='del'>-	.hw_free =	snd_intel8x0_hw_free,</div><div class='ctx'> 	.prepare =	snd_intel8x0m_pcm_prepare,</div><div class='del'>-	.trigger =	snd_intel8x0_pcm_trigger,</div><div class='del'>-	.pointer =	snd_intel8x0_pcm_pointer,</div><div class='add'>+	.trigger =	snd_intel8x0m_pcm_trigger,</div><div class='add'>+	.pointer =	snd_intel8x0m_pcm_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> struct ich_pcm_table {</div><div class='ctx'> 	char *suffix;</div><div class='del'>-	struct snd_pcm_ops *playback_ops;</div><div class='del'>-	struct snd_pcm_ops *capture_ops;</div><div class='add'>+	const struct snd_pcm_ops *playback_ops;</div><div class='add'>+	const struct snd_pcm_ops *capture_ops;</div><div class='ctx'> 	size_t prealloc_size;</div><div class='ctx'> 	size_t prealloc_max_size;</div><div class='ctx'> 	int ac97_idx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_pcm1(struct intel8x0m *chip, int device,</div><div class='del'>-				       struct ich_pcm_table *rec)</div><div class='add'>+static int snd_intel8x0m_pcm1(struct intel8x0m *chip, int device,</div><div class='add'>+			      const struct ich_pcm_table *rec)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -720,7 +674,7 @@ static int __devinit snd_intel8x0_pcm1(struct intel8x0m *chip, int device,</div><div class='ctx'> 	if (rec-&gt;suffix)</div><div class='ctx'> 		sprintf(name, "Intel ICH - %s", rec-&gt;suffix);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(name, "Intel ICH");</div><div class='add'>+		strscpy(name, "Intel ICH");</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, name, device,</div><div class='ctx'> 			  rec-&gt;playback_ops ? 1 : 0,</div><div class='ctx'> 			  rec-&gt;capture_ops ? 1 : 0, &amp;pcm);</div><div class='hunk'>@@ -738,18 +692,18 @@ static int __devinit snd_intel8x0_pcm1(struct intel8x0m *chip, int device,</div><div class='ctx'> 	if (rec-&gt;suffix)</div><div class='ctx'> 		sprintf(pcm-&gt;name, "%s - %s", chip-&gt;card-&gt;shortname, rec-&gt;suffix);</div><div class='ctx'> 	else</div><div class='del'>-		strcpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='add'>+		strscpy(pcm-&gt;name, chip-&gt;card-&gt;shortname);</div><div class='ctx'> 	chip-&gt;pcm[device] = pcm;</div><div class='ctx'> </div><div class='del'>-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-					      snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-					      rec-&gt;prealloc_size,</div><div class='del'>-					      rec-&gt;prealloc_max_size);</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       rec-&gt;prealloc_size,</div><div class='add'>+				       rec-&gt;prealloc_max_size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ich_pcm_table intel_pcms[] __devinitdata = {</div><div class='add'>+static const struct ich_pcm_table intel_pcms[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.suffix = "Modem",</div><div class='ctx'> 		.playback_ops = &amp;snd_intel8x0m_playback_ops,</div><div class='hunk'>@@ -759,10 +713,10 @@ static struct ich_pcm_table intel_pcms[] __devinitdata = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)</div><div class='add'>+static int snd_intel8x0m_pcm(struct intel8x0m *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i, tblsize, device, err;</div><div class='del'>-	struct ich_pcm_table *tbl, *rec;</div><div class='add'>+	const struct ich_pcm_table *tbl, *rec;</div><div class='ctx'> </div><div class='ctx'> #if 1</div><div class='ctx'> 	tbl = intel_pcms;</div><div class='hunk'>@@ -791,7 +745,7 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)</div><div class='ctx'> 			if (! chip-&gt;ichd[rec-&gt;ac97_idx].ac97)</div><div class='ctx'> 				continue;</div><div class='ctx'> 		}</div><div class='del'>-		err = snd_intel8x0_pcm1(chip, device, rec);</div><div class='add'>+		err = snd_intel8x0m_pcm1(chip, device, rec);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			return err;</div><div class='ctx'> 		device++;</div><div class='hunk'>@@ -806,51 +760,54 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)</div><div class='ctx'>  *  Mixer part</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void snd_intel8x0_mixer_free_ac97_bus(struct snd_ac97_bus *bus)</div><div class='add'>+static void snd_intel8x0m_mixer_free_ac97_bus(struct snd_ac97_bus *bus)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = bus-&gt;private_data;</div><div class='ctx'> 	chip-&gt;ac97_bus = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void snd_intel8x0_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='add'>+static void snd_intel8x0m_mixer_free_ac97(struct snd_ac97 *ac97)</div><div class='ctx'> {</div><div class='ctx'> 	struct intel8x0m *chip = ac97-&gt;private_data;</div><div class='ctx'> 	chip-&gt;ac97 = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0_mixer(struct intel8x0m *chip, int ac97_clock)</div><div class='add'>+static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_ac97_bus *pbus;</div><div class='ctx'> 	struct snd_ac97_template ac97;</div><div class='ctx'> 	struct snd_ac97 *x97;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int glob_sta = 0;</div><div class='del'>-	static struct snd_ac97_bus_ops ops = {</div><div class='del'>-		.write = snd_intel8x0_codec_write,</div><div class='del'>-		.read = snd_intel8x0_codec_read,</div><div class='add'>+	static const struct snd_ac97_bus_ops ops = {</div><div class='add'>+		.write = snd_intel8x0m_codec_write,</div><div class='add'>+		.read = snd_intel8x0m_codec_read,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;in_ac97_init = 1;</div><div class='ctx'> 	</div><div class='ctx'> 	memset(&amp;ac97, 0, sizeof(ac97));</div><div class='ctx'> 	ac97.private_data = chip;</div><div class='del'>-	ac97.private_free = snd_intel8x0_mixer_free_ac97;</div><div class='add'>+	ac97.private_free = snd_intel8x0m_mixer_free_ac97;</div><div class='ctx'> 	ac97.scaps = AC97_SCAP_SKIP_AUDIO | AC97_SCAP_POWER_SAVE;</div><div class='ctx'> </div><div class='ctx'> 	glob_sta = igetdword(chip, ICHREG(GLOB_STA));</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus)) &lt; 0)</div><div class='add'>+	err = snd_ac97_bus(chip-&gt;card, 0, &amp;ops, chip, &amp;pbus);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto __err;</div><div class='del'>-	pbus-&gt;private_free = snd_intel8x0_mixer_free_ac97_bus;</div><div class='add'>+	pbus-&gt;private_free = snd_intel8x0m_mixer_free_ac97_bus;</div><div class='ctx'> 	if (ac97_clock &gt;= 8000 &amp;&amp; ac97_clock &lt;= 48000)</div><div class='ctx'> 		pbus-&gt;clock = ac97_clock;</div><div class='ctx'> 	chip-&gt;ac97_bus = pbus;</div><div class='ctx'> </div><div class='ctx'> 	ac97.pci = chip-&gt;pci;</div><div class='ctx'> 	ac97.num = glob_sta &amp; ICH_SCR ? 1 : 0;</div><div class='del'>-	if ((err = snd_ac97_mixer(pbus, &amp;ac97, &amp;x97)) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "Unable to initialize codec #%d\n", ac97.num);</div><div class='add'>+	err = snd_ac97_mixer(pbus, &amp;ac97, &amp;x97);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Unable to initialize codec #%d\n", ac97.num);</div><div class='ctx'> 		if (ac97.num == 0)</div><div class='ctx'> 			goto __err;</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -894,13 +851,14 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)</div><div class='ctx'> 	/* finish cold or do warm reset */</div><div class='ctx'> 	cnt |= (cnt &amp; ICH_AC97COLD) == 0 ? ICH_AC97COLD : ICH_AC97WARM;</div><div class='ctx'> 	iputdword(chip, ICHREG(GLOB_CNT), cnt);</div><div class='del'>-	end_time = (jiffies + (HZ / 4)) + 1;</div><div class='add'>+	usleep_range(500, 1000); /* give warm reset some time */</div><div class='add'>+	end_time = jiffies + HZ / 4;</div><div class='ctx'> 	do {</div><div class='ctx'> 		if ((igetdword(chip, ICHREG(GLOB_CNT)) &amp; ICH_AC97WARM) == 0)</div><div class='ctx'> 			goto __ok;</div><div class='ctx'> 		schedule_timeout_uninterruptible(1);</div><div class='ctx'> 	} while (time_after_eq(end_time, jiffies));</div><div class='del'>-	snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n",</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "AC'97 warm reset still in progress? [0x%x]\n",</div><div class='ctx'> 		   igetdword(chip, ICHREG(GLOB_CNT)));</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -920,7 +878,8 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)</div><div class='ctx'> 		} while (time_after_eq(end_time, jiffies));</div><div class='ctx'> 		if (! status) {</div><div class='ctx'> 			/* no codec is found */</div><div class='del'>-			snd_printk(KERN_ERR "codec_ready: codec is not ready [0x%x]\n",</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"codec_ready: codec is not ready [0x%x]\n",</div><div class='ctx'> 				   igetdword(chip, ICHREG(GLOB_STA)));</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -952,19 +911,20 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;device_type == DEVICE_SIS) {</div><div class='del'>-		/* unmute the output on SIS7012 */</div><div class='add'>+		/* unmute the output on SIS7013 */</div><div class='ctx'> 		iputword(chip, 0x4c, igetword(chip, 0x4c) | 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'>       	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)</div><div class='add'>+static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	</div><div class='del'>-	if ((err = snd_intel8x0m_ich_chip_init(chip, probing)) &lt; 0)</div><div class='add'>+	err = snd_intel8x0m_ich_chip_init(chip, probing);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	iagetword(chip, 0);	/* clear semaphore flag */</div><div class='ctx'> </div><div class='hunk'>@@ -980,8 +940,9 @@ static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_intel8x0_free(struct intel8x0m *chip)</div><div class='add'>+static void snd_intel8x0m_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='add'>+	struct intel8x0m *chip = card-&gt;private_data;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;irq &lt; 0)</div><div class='hunk'>@@ -995,73 +956,50 @@ static int snd_intel8x0_free(struct intel8x0m *chip)</div><div class='ctx'>  __hw_end:</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0)</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='del'>-	if (chip-&gt;bdbars.area)</div><div class='del'>-		snd_dma_free_pages(&amp;chip-&gt;bdbars);</div><div class='del'>-	if (chip-&gt;addr)</div><div class='del'>-		pci_iounmap(chip-&gt;pci, chip-&gt;addr);</div><div class='del'>-	if (chip-&gt;bmaddr)</div><div class='del'>-		pci_iounmap(chip-&gt;pci, chip-&gt;bmaddr);</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-	kfree(chip);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='ctx'> /*</div><div class='ctx'>  * power management</div><div class='ctx'>  */</div><div class='del'>-static int intel8x0m_suspend(struct pci_dev *pci, pm_message_t state)</div><div class='add'>+static int intel8x0m_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct intel8x0m *chip = card-&gt;private_data;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);</div><div class='del'>-	for (i = 0; i &lt; chip-&gt;pcm_devs; i++)</div><div class='del'>-		snd_pcm_suspend_all(chip-&gt;pcm[i]);</div><div class='ctx'> 	snd_ac97_suspend(chip-&gt;ac97);</div><div class='ctx'> 	if (chip-&gt;irq &gt;= 0) {</div><div class='ctx'> 		free_irq(chip-&gt;irq, chip);</div><div class='ctx'> 		chip-&gt;irq = -1;</div><div class='add'>+		card-&gt;sync_irq = -1;</div><div class='ctx'> 	}</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-	pci_save_state(pci);</div><div class='del'>-	pci_set_power_state(pci, pci_choose_state(pci, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int intel8x0m_resume(struct pci_dev *pci)</div><div class='add'>+static int intel8x0m_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct snd_card *card = pci_get_drvdata(pci);</div><div class='add'>+	struct pci_dev *pci = to_pci_dev(dev);</div><div class='add'>+	struct snd_card *card = dev_get_drvdata(dev);</div><div class='ctx'> 	struct intel8x0m *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci, PCI_D0);</div><div class='del'>-	pci_restore_state(pci);</div><div class='del'>-	if (pci_enable_device(pci) &lt; 0) {</div><div class='del'>-		printk(KERN_ERR "intel8x0m: pci_enable_device failed, "</div><div class='del'>-		       "disabling device\n");</div><div class='del'>-		snd_card_disconnect(card);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_intel8x0_interrupt,</div><div class='del'>-			IRQF_SHARED, card-&gt;shortname, chip)) {</div><div class='del'>-		printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "</div><div class='del'>-		       "disabling device\n", pci-&gt;irq);</div><div class='add'>+	if (request_irq(pci-&gt;irq, snd_intel8x0m_interrupt,</div><div class='add'>+			IRQF_SHARED, KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(dev, "unable to grab IRQ %d, disabling device\n",</div><div class='add'>+			pci-&gt;irq);</div><div class='ctx'> 		snd_card_disconnect(card);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	snd_intel8x0_chip_init(chip, 0);</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	snd_intel8x0m_chip_init(chip, 0);</div><div class='ctx'> 	snd_ac97_resume(chip-&gt;ac97);</div><div class='ctx'> </div><div class='ctx'> 	snd_power_change_state(card, SNDRV_CTL_POWER_D0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PROC_FS</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(intel8x0m_pm, intel8x0m_suspend, intel8x0m_resume);</div><div class='add'>+</div><div class='ctx'> static void snd_intel8x0m_proc_read(struct snd_info_entry * entry,</div><div class='ctx'> 				   struct snd_info_buffer *buffer)</div><div class='ctx'> {</div><div class='hunk'>@@ -1082,22 +1020,10 @@ static void snd_intel8x0m_proc_read(struct snd_info_entry * entry,</div><div class='ctx'> 			(tmp &amp; (ICH_PCR | ICH_SCR | ICH_TCR)) == 0 ? " none" : "");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_intel8x0m_proc_init(struct intel8x0m * chip)</div><div class='del'>-{</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(chip-&gt;card, "intel8x0m", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, chip, snd_intel8x0m_proc_read);</div><div class='del'>-}</div><div class='del'>-#else /* !CONFIG_PROC_FS */</div><div class='del'>-#define snd_intel8x0m_proc_init(chip)</div><div class='del'>-#endif /* CONFIG_PROC_FS */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int snd_intel8x0_dev_free(struct snd_device *device)</div><div class='add'>+static void snd_intel8x0m_proc_init(struct intel8x0m *chip)</div><div class='ctx'> {</div><div class='del'>-	struct intel8x0m *chip = device-&gt;device_data;</div><div class='del'>-	return snd_intel8x0_free(chip);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "intel8x0m", chip,</div><div class='add'>+			     snd_intel8x0m_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct ich_reg_info {</div><div class='hunk'>@@ -1105,82 +1031,48 @@ struct ich_reg_info {</div><div class='ctx'> 	unsigned int offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0m_create(struct snd_card *card,</div><div class='del'>-					 struct pci_dev *pci,</div><div class='del'>-					 unsigned long device_type,</div><div class='del'>-					 struct intel8x0m ** r_intel8x0)</div><div class='add'>+static int snd_intel8x0m_init(struct snd_card *card,</div><div class='add'>+			      struct pci_dev *pci,</div><div class='add'>+			      unsigned long device_type)</div><div class='ctx'> {</div><div class='del'>-	struct intel8x0m *chip;</div><div class='add'>+	struct intel8x0m *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned int int_sta_masks;</div><div class='ctx'> 	struct ichdev *ichdev;</div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free =	snd_intel8x0_dev_free,</div><div class='del'>-	};</div><div class='del'>-	static struct ich_reg_info intel_regs[2] = {</div><div class='add'>+	static const struct ich_reg_info intel_regs[2] = {</div><div class='ctx'> 		{ ICH_MIINT, 0 },</div><div class='ctx'> 		{ ICH_MOINT, 0x10 },</div><div class='ctx'> 	};</div><div class='del'>-	struct ich_reg_info *tbl;</div><div class='add'>+	const struct ich_reg_info *tbl;</div><div class='ctx'> </div><div class='del'>-	*r_intel8x0 = NULL;</div><div class='del'>-</div><div class='del'>-	if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> 	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	chip-&gt;device_type = device_type;</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, card-&gt;shortname)) &lt; 0) {</div><div class='del'>-		kfree(chip);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, card-&gt;shortname);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (device_type == DEVICE_ALI) {</div><div class='ctx'> 		/* ALI5455 has no ac97 region */</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 0, 0);</div><div class='del'>-		goto port_inited;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pci_resource_flags(pci, 2) &amp; IORESOURCE_MEM) /* ICH4 and Nforce */</div><div class='del'>-		chip-&gt;addr = pci_iomap(pci, 2, 0);</div><div class='del'>-	else</div><div class='del'>-		chip-&gt;addr = pci_iomap(pci, 0, 0);</div><div class='del'>-	if (!chip-&gt;addr) {</div><div class='del'>-		snd_printk(KERN_ERR "AC'97 space ioremap problem\n");</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	if (pci_resource_flags(pci, 3) &amp; IORESOURCE_MEM) /* ICH4 */</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 3, 0);</div><div class='del'>-	else</div><div class='del'>-		chip-&gt;bmaddr = pci_iomap(pci, 1, 0);</div><div class='del'>-	if (!chip-&gt;bmaddr) {</div><div class='del'>-		snd_printk(KERN_ERR "Controller space ioremap problem\n");</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- port_inited:</div><div class='del'>-	if (request_irq(pci-&gt;irq, snd_intel8x0_interrupt, IRQF_SHARED,</div><div class='del'>-			card-&gt;shortname, chip)) {</div><div class='del'>-		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return -EBUSY;</div><div class='add'>+		chip-&gt;bmaddr = pcim_iomap(pci, 0, 0);</div><div class='add'>+	} else {</div><div class='add'>+		if (pci_resource_flags(pci, 2) &amp; IORESOURCE_MEM) /* ICH4 and Nforce */</div><div class='add'>+			chip-&gt;addr = pcim_iomap(pci, 2, 0);</div><div class='add'>+		else</div><div class='add'>+			chip-&gt;addr = pcim_iomap(pci, 0, 0);</div><div class='add'>+		if (pci_resource_flags(pci, 3) &amp; IORESOURCE_MEM) /* ICH4 */</div><div class='add'>+			chip-&gt;bmaddr = pcim_iomap(pci, 3, 0);</div><div class='add'>+		else</div><div class='add'>+			chip-&gt;bmaddr = pcim_iomap(pci, 1, 0);</div><div class='ctx'> 	}</div><div class='del'>-	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-	pci_set_master(pci);</div><div class='del'>-	synchronize_irq(chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize offsets */</div><div class='ctx'> 	chip-&gt;bdbars_count = 2;</div><div class='hunk'>@@ -1207,44 +1099,51 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,</div><div class='ctx'> </div><div class='ctx'> 	/* allocate buffer descriptor lists */</div><div class='ctx'> 	/* the start of each lists must be aligned to 8 bytes */</div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				chip-&gt;bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,</div><div class='del'>-				&amp;chip-&gt;bdbars) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='add'>+	chip-&gt;bdbars = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					    chip-&gt;bdbars_count * sizeof(u32) *</div><div class='add'>+					    ICH_MAX_FRAGS * 2);</div><div class='add'>+	if (!chip-&gt;bdbars)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	/* tables must be aligned to 8 bytes here, but the kernel pages</div><div class='ctx'> 	   are much bigger, so we don't care (on i386) */</div><div class='ctx'> 	int_sta_masks = 0;</div><div class='ctx'> 	for (i = 0; i &lt; chip-&gt;bdbars_count; i++) {</div><div class='ctx'> 		ichdev = &amp;chip-&gt;ichd[i];</div><div class='del'>-		ichdev-&gt;bdbar = ((u32 *)chip-&gt;bdbars.area) + (i * ICH_MAX_FRAGS * 2);</div><div class='del'>-		ichdev-&gt;bdbar_addr = chip-&gt;bdbars.addr + (i * sizeof(u32) * ICH_MAX_FRAGS * 2);</div><div class='add'>+		ichdev-&gt;bdbar = ((__le32 *)chip-&gt;bdbars-&gt;area) + (i * ICH_MAX_FRAGS * 2);</div><div class='add'>+		ichdev-&gt;bdbar_addr = chip-&gt;bdbars-&gt;addr + (i * sizeof(u32) * ICH_MAX_FRAGS * 2);</div><div class='ctx'> 		int_sta_masks |= ichdev-&gt;int_sta_mask;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;int_sta_reg = ICH_REG_GLOB_STA;</div><div class='ctx'> 	chip-&gt;int_sta_mask = int_sta_masks;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0_chip_init(chip, 1)) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	pci_set_master(pci);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops)) &lt; 0) {</div><div class='del'>-		snd_intel8x0_free(chip);</div><div class='add'>+	err = snd_intel8x0m_chip_init(chip, 1);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+</div><div class='add'>+	/* NOTE: we don't use devm version here since it's released /</div><div class='add'>+	 * re-acquired in PM callbacks.</div><div class='add'>+	 * It's released explicitly in snd_intel8x0m_free(), too.</div><div class='add'>+	 */</div><div class='add'>+	if (request_irq(pci-&gt;irq, snd_intel8x0m_interrupt, IRQF_SHARED,</div><div class='add'>+			KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='add'>+	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='add'>+	card-&gt;private_free = snd_intel8x0m_free;</div><div class='ctx'> </div><div class='del'>-	*r_intel8x0 = chip;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct shortname_table {</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	const char *s;</div><div class='del'>-} shortnames[] __devinitdata = {</div><div class='add'>+} shortnames[] = {</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801AA_6, "Intel 82801AA-ICH" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801AB_6, "Intel 82901AB-ICH0" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_INTEL_82801BA_6, "Intel 82801BA-ICH2" },</div><div class='hunk'>@@ -1260,90 +1159,73 @@ static struct shortname_table {</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },</div><div class='ctx'> 	{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },</div><div class='add'>+	{ 0x746e, "AMD AMD8111" },</div><div class='ctx'> #if 0</div><div class='ctx'> 	{ 0x5455, "ALi M5455" },</div><div class='del'>-	{ 0x746d, "AMD AMD8111" },</div><div class='ctx'> #endif</div><div class='ctx'> 	{ 0 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int __snd_intel8x0m_probe(struct pci_dev *pci,</div><div class='add'>+				 const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct intel8x0m *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct shortname_table *name;</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index, id, THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index, id, THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "ICH-MODEM");</div><div class='del'>-	strcpy(card-&gt;shortname, "Intel ICH");</div><div class='add'>+	strscpy(card-&gt;driver, "ICH-MODEM");</div><div class='add'>+	strscpy(card-&gt;shortname, "Intel ICH");</div><div class='ctx'> 	for (name = shortnames; name-&gt;id; name++) {</div><div class='ctx'> 		if (pci-&gt;device == name-&gt;id) {</div><div class='del'>-			strcpy(card-&gt;shortname, name-&gt;s);</div><div class='add'>+			strscpy(card-&gt;shortname, name-&gt;s);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	strcat(card-&gt;shortname," Modem");</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0m_create(card, pci, pci_id-&gt;driver_data, &amp;chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0m_init(card, pci, pci_id-&gt;driver_data);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	card-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_intel8x0_mixer(chip, ac97_clock)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0m_mixer(chip, ac97_clock);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='del'>-	if ((err = snd_intel8x0_pcm(chip)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_intel8x0m_pcm(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	</div><div class='ctx'> 	snd_intel8x0m_proc_init(chip);</div><div class='ctx'> </div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_intel8x0m_remove(struct pci_dev *pci)</div><div class='add'>+static int snd_intel8x0m_probe(struct pci_dev *pci,</div><div class='add'>+			       const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __snd_intel8x0m_probe(pci, pci_id));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "Intel ICH Modem",</div><div class='add'>+static struct pci_driver intel8x0m_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_intel8x0m_ids,</div><div class='ctx'> 	.probe = snd_intel8x0m_probe,</div><div class='del'>-	.remove = __devexit_p(snd_intel8x0m_remove),</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = intel8x0m_suspend,</div><div class='del'>-	.resume = intel8x0m_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;intel8x0m_pm,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int __init alsa_card_intel8x0m_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_intel8x0m_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_intel8x0m_init)</div><div class='del'>-module_exit(alsa_card_intel8x0m_exit)</div><div class='add'>+module_pci_driver(intel8x0m_driver);</div><div class='head'>diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile<br/>index f11ce1b1b3d4..ab0186ffbd58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/korg1212/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/korg1212/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/korg1212/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/korg1212/Makefile</a></div><div class='hunk'>@@ -1,9 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='ctx'> # Makefile for ALSA</div><div class='ctx'> # Copyright (c) 2001 by Jaroslav Kysela &lt;perex@perex.cz&gt;</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-snd-korg1212-objs := korg1212.o</div><div class='add'>+snd-korg1212-y := korg1212.o</div><div class='ctx'> </div><div class='ctx'> # Toplevel Module Dependency</div><div class='ctx'> obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o</div><div class='head'>diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c<br/>index 6d795700be79..d16acf83668a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/korg1212/korg1212.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/korg1212/korg1212.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/korg1212/korg1212.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/korg1212/korg1212.c</a></div><div class='hunk'>@@ -1,22 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /*</div><div class='ctx'>  *   Driver for the Korg 1212 IO PCI card</div><div class='ctx'>  *</div><div class='ctx'>  *	Copyright (c) 2001 Haroldo Gamal &lt;gamal@alternex.com.br&gt;</div><div class='del'>- *</div><div class='del'>- *   This program is free software; you can redistribute it and/or modify</div><div class='del'>- *   it under the terms of the GNU General Public License as published by</div><div class='del'>- *   the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *   (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *   This program is distributed in the hope that it will be useful,</div><div class='del'>- *   but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *   GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *   You should have received a copy of the GNU General Public License</div><div class='del'>- *   along with this program; if not, write to the Free Software</div><div class='del'>- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -25,9 +11,10 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/info.h&gt;</div><div class='hunk'>@@ -36,21 +23,19 @@</div><div class='ctx'> #include &lt;sound/pcm_params.h&gt;</div><div class='ctx'> #include &lt;sound/initval.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='ctx'> // ----------------------------------------------------------------------------</div><div class='ctx'> // Debug Stuff</div><div class='ctx'> // ----------------------------------------------------------------------------</div><div class='ctx'> #define K1212_DEBUG_LEVEL		0</div><div class='ctx'> #if K1212_DEBUG_LEVEL &gt; 0</div><div class='del'>-#define K1212_DEBUG_PRINTK(fmt,args...)	printk(KERN_DEBUG fmt,##args)</div><div class='add'>+#define K1212_DEBUG_PRINTK(fmt, args...) pr_debug(fmt, ##args)</div><div class='ctx'> #else</div><div class='del'>-#define K1212_DEBUG_PRINTK(fmt,...)</div><div class='add'>+#define K1212_DEBUG_PRINTK(fmt, ...)	do { } while (0)</div><div class='ctx'> #endif</div><div class='ctx'> #if K1212_DEBUG_LEVEL &gt; 1</div><div class='del'>-#define K1212_DEBUG_PRINTK_VERBOSE(fmt,args...)	printk(KERN_DEBUG fmt,##args)</div><div class='add'>+#define K1212_DEBUG_PRINTK_VERBOSE(fmt, args...) pr_debug(fmt, ##args)</div><div class='ctx'> #else</div><div class='del'>-#define K1212_DEBUG_PRINTK_VERBOSE(fmt,...)</div><div class='add'>+#define K1212_DEBUG_PRINTK_VERBOSE(fmt, ...)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> // ----------------------------------------------------------------------------</div><div class='hunk'>@@ -196,8 +181,8 @@ enum MonitorModeSelector {</div><div class='ctx'> #define K1212_ADAT_BUF_SIZE	(K1212_ADAT_CHANNELS * 2 * kPlayBufferFrames * kNumBuffers)</div><div class='ctx'> #define K1212_MAX_BUF_SIZE	(K1212_ANALOG_BUF_SIZE + K1212_ADAT_BUF_SIZE)</div><div class='ctx'> </div><div class='del'>-#define k1212MinADCSens     0x7f</div><div class='del'>-#define k1212MaxADCSens     0x00</div><div class='add'>+#define k1212MinADCSens     0x00</div><div class='add'>+#define k1212MaxADCSens     0x7f</div><div class='ctx'> #define k1212MaxVolume      0x7fff</div><div class='ctx'> #define k1212MaxWaveVolume  0xffff</div><div class='ctx'> #define k1212MinVolume      0x0000</div><div class='hunk'>@@ -323,9 +308,6 @@ struct snd_korg1212 {</div><div class='ctx'>         spinlock_t    lock;</div><div class='ctx'> 	struct mutex open_mutex;</div><div class='ctx'> </div><div class='del'>-	struct timer_list timer;	/* timer callback for checking ack of stop request */</div><div class='del'>-	int stop_pending_cnt;		/* counter for stop pending check */</div><div class='del'>-</div><div class='ctx'>         wait_queue_head_t wait;</div><div class='ctx'> </div><div class='ctx'>         unsigned long iomem;</div><div class='hunk'>@@ -335,10 +317,10 @@ struct snd_korg1212 {</div><div class='ctx'>         unsigned long inIRQ;</div><div class='ctx'>         void __iomem *iobase;</div><div class='ctx'> </div><div class='del'>-	struct snd_dma_buffer dma_dsp;</div><div class='del'>-        struct snd_dma_buffer dma_play;</div><div class='del'>-        struct snd_dma_buffer dma_rec;</div><div class='del'>-	struct snd_dma_buffer dma_shared;</div><div class='add'>+	struct snd_dma_buffer *dma_dsp;</div><div class='add'>+	struct snd_dma_buffer *dma_play;</div><div class='add'>+	struct snd_dma_buffer *dma_rec;</div><div class='add'>+	struct snd_dma_buffer *dma_shared;</div><div class='ctx'> </div><div class='ctx'> 	u32 DataBufsSize;</div><div class='ctx'> </div><div class='hunk'>@@ -397,18 +379,17 @@ struct snd_korg1212 {</div><div class='ctx'> 	unsigned long totalerrorcnt; // Total Error Count</div><div class='ctx'> </div><div class='ctx'> 	int dsp_is_loaded;</div><div class='del'>-	int dsp_stop_is_processed;</div><div class='add'>+	int dsp_stop_processing;</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("korg1212");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{{KORG,korg1212}}");</div><div class='ctx'> MODULE_FIRMWARE("korg/k1212.dsp");</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	   /* ID for this card */</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Korg 1212 soundcard.");</div><div class='hunk'>@@ -418,7 +399,7 @@ module_param_array(enable, bool, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard.");</div><div class='ctx'> MODULE_AUTHOR("Haroldo Gamal &lt;gamal@alternex.com.br&gt;");</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_korg1212_ids) = {</div><div class='add'>+static const struct pci_device_id snd_korg1212_ids[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.vendor	   = 0x10b5,</div><div class='ctx'> 		.device	   = 0x906d,</div><div class='hunk'>@@ -430,7 +411,7 @@ static DEFINE_PCI_DEVICE_TABLE(snd_korg1212_ids) = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, snd_korg1212_ids);</div><div class='ctx'> </div><div class='del'>-static char *stateName[] = {</div><div class='add'>+static const char * const stateName[] = {</div><div class='ctx'> 	"Non-existent",</div><div class='ctx'> 	"Uninitialized",</div><div class='ctx'> 	"DSP download in process",</div><div class='hunk'>@@ -444,9 +425,9 @@ static char *stateName[] = {</div><div class='ctx'> 	"Invalid"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *clockSourceTypeName[] = { "ADAT", "S/PDIF", "local" };</div><div class='add'>+static const char * const clockSourceTypeName[] = { "ADAT", "S/PDIF", "local" };</div><div class='ctx'> </div><div class='del'>-static char *clockSourceName[] = {</div><div class='add'>+static const char * const clockSourceName[] = {</div><div class='ctx'> 	"ADAT at 44.1 kHz",</div><div class='ctx'> 	"ADAT at 48 kHz",</div><div class='ctx'> 	"S/PDIF at 44.1 kHz",</div><div class='hunk'>@@ -455,7 +436,7 @@ static char *clockSourceName[] = {</div><div class='ctx'> 	"local clock at 48 kHz"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static char *channelName[] = {</div><div class='add'>+static const char * const channelName[] = {</div><div class='ctx'> 	"ADAT-1",</div><div class='ctx'> 	"ADAT-2",</div><div class='ctx'> 	"ADAT-3",</div><div class='hunk'>@@ -470,7 +451,7 @@ static char *channelName[] = {</div><div class='ctx'> 	"SPDIF-R",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u16 ClockSourceSelector[] = {</div><div class='add'>+static const u16 ClockSourceSelector[] = {</div><div class='ctx'> 	0x8000,   // selects source as ADAT at 44.1 kHz</div><div class='ctx'> 	0x0000,   // selects source as ADAT at 48 kHz</div><div class='ctx'> 	0x8001,   // selects source as S/PDIF at 44.1 kHz</div><div class='hunk'>@@ -581,68 +562,25 @@ static int snd_korg1212_Send1212Command(struct snd_korg1212 *korg1212,</div><div class='ctx'> /* spinlock already held */</div><div class='ctx'> static void snd_korg1212_SendStop(struct snd_korg1212 *korg1212)</div><div class='ctx'> {</div><div class='del'>-	if (! korg1212-&gt;stop_pending_cnt) {</div><div class='del'>-		korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0xffffffff;</div><div class='del'>-		/* program the timer */</div><div class='del'>-		korg1212-&gt;stop_pending_cnt = HZ;</div><div class='del'>-		korg1212-&gt;timer.expires = jiffies + 1;</div><div class='del'>-		add_timer(&amp;korg1212-&gt;timer);</div><div class='del'>-	}</div><div class='add'>+	korg1212-&gt;dsp_stop_processing = 1;</div><div class='add'>+	korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0xffffffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_korg1212_SendStopAndWait(struct snd_korg1212 *korg1212)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-	korg1212-&gt;dsp_stop_is_processed = 0;</div><div class='del'>-	snd_korg1212_SendStop(korg1212);</div><div class='del'>-	spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-	wait_event_timeout(korg1212-&gt;wait, korg1212-&gt;dsp_stop_is_processed, (HZ * 3) / 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* timer callback for checking the ack of stop request */</div><div class='del'>-static void snd_korg1212_timer_func(unsigned long data)</div><div class='del'>-{</div><div class='del'>-        struct snd_korg1212 *korg1212 = (struct snd_korg1212 *) data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-	if (korg1212-&gt;sharedBufferPtr-&gt;cardCommand == 0) {</div><div class='del'>-		/* ack'ed */</div><div class='del'>-		korg1212-&gt;stop_pending_cnt = 0;</div><div class='del'>-		korg1212-&gt;dsp_stop_is_processed = 1;</div><div class='del'>-		wake_up(&amp;korg1212-&gt;wait);</div><div class='del'>-		K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: Stop ack'ed [%s]\n",</div><div class='del'>-					   stateName[korg1212-&gt;cardState]);</div><div class='del'>-	} else {</div><div class='del'>-		if (--korg1212-&gt;stop_pending_cnt &gt; 0) {</div><div class='del'>-			/* reprogram timer */</div><div class='del'>-			korg1212-&gt;timer.expires = jiffies + 1;</div><div class='del'>-			add_timer(&amp;korg1212-&gt;timer);</div><div class='del'>-		} else {</div><div class='del'>-			snd_printd("korg1212_timer_func timeout\n");</div><div class='del'>-			korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0;</div><div class='del'>-			korg1212-&gt;dsp_stop_is_processed = 1;</div><div class='del'>-			wake_up(&amp;korg1212-&gt;wait);</div><div class='del'>-			K1212_DEBUG_PRINTK("K1212_DEBUG: Stop timeout [%s]\n",</div><div class='del'>-					   stateName[korg1212-&gt;cardState]);</div><div class='del'>-		}</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;korg1212-&gt;lock) {</div><div class='add'>+		snd_korg1212_SendStop(korg1212);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	wait_event_timeout(korg1212-&gt;wait, !korg1212-&gt;dsp_stop_processing, HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_TurnOnIdleMonitor(struct snd_korg1212 *korg1212)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='ctx'>         udelay(INTERCOMMAND_DELAY);</div><div class='del'>-	spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;korg1212-&gt;lock);</div><div class='ctx'>         korg1212-&gt;idleMonitorOn = 1;</div><div class='del'>-        rc = snd_korg1212_Send1212Command(korg1212, K1212_DB_SelectPlayMode,</div><div class='del'>-					  K1212_MODE_MonitorOn, 0, 0, 0);</div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-	return rc;</div><div class='add'>+	return snd_korg1212_Send1212Command(korg1212, K1212_DB_SelectPlayMode,</div><div class='add'>+					    K1212_MODE_MonitorOn, 0, 0, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void snd_korg1212_TurnOffIdleMonitor(struct snd_korg1212 *korg1212)</div><div class='hunk'>@@ -662,13 +600,12 @@ static int snd_korg1212_OpenCard(struct snd_korg1212 * korg1212)</div><div class='ctx'> {</div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: OpenCard [%s] %d\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState], korg1212-&gt;opencnt);</div><div class='del'>-	mutex_lock(&amp;korg1212-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;korg1212-&gt;open_mutex);</div><div class='ctx'>         if (korg1212-&gt;opencnt++ == 0) {</div><div class='ctx'> 		snd_korg1212_TurnOffIdleMonitor(korg1212);</div><div class='ctx'> 		snd_korg1212_setCardState(korg1212, K1212_STATE_OPEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;korg1212-&gt;open_mutex);</div><div class='ctx'>         return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -677,11 +614,9 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)</div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: CloseCard [%s] %d\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState], korg1212-&gt;opencnt);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;korg1212-&gt;open_mutex);</div><div class='del'>-	if (--(korg1212-&gt;opencnt)) {</div><div class='del'>-		mutex_unlock(&amp;korg1212-&gt;open_mutex);</div><div class='add'>+	guard(mutex)(&amp;korg1212-&gt;open_mutex);</div><div class='add'>+	if (--(korg1212-&gt;opencnt))</div><div class='ctx'> 		return 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'>         if (korg1212-&gt;cardState == K1212_STATE_SETUP) {</div><div class='ctx'>                 int rc = snd_korg1212_Send1212Command(korg1212, K1212_DB_SelectPlayMode,</div><div class='hunk'>@@ -689,10 +624,8 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			K1212_DEBUG_PRINTK("K1212_DEBUG: CloseCard - RC = %d [%s]\n",</div><div class='ctx'> 					   rc, stateName[korg1212-&gt;cardState]);</div><div class='del'>-		if (rc != K1212_CMDRET_Success) {</div><div class='del'>-			mutex_unlock(&amp;korg1212-&gt;open_mutex);</div><div class='add'>+		if (rc != K1212_CMDRET_Success)</div><div class='ctx'>                         return 0;</div><div class='del'>-		}</div><div class='ctx'>         } else if (korg1212-&gt;cardState &gt; K1212_STATE_SETUP) {</div><div class='ctx'> 		snd_korg1212_SendStopAndWait(korg1212);</div><div class='ctx'>         }</div><div class='hunk'>@@ -702,7 +635,6 @@ static int snd_korg1212_CloseCard(struct snd_korg1212 * korg1212)</div><div class='ctx'>                 snd_korg1212_setCardState(korg1212, K1212_STATE_READY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;korg1212-&gt;open_mutex);</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -830,12 +762,12 @@ static inline int snd_korg1212_use_is_exclusive(struct snd_korg1212 *korg1212)</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_SetRate(struct snd_korg1212 *korg1212, int rate)</div><div class='ctx'> {</div><div class='del'>-        static enum ClockSourceIndex s44[] = {</div><div class='add'>+	static const enum ClockSourceIndex s44[] = {</div><div class='ctx'> 		K1212_CLKIDX_AdatAt44_1K,</div><div class='ctx'> 		K1212_CLKIDX_WordAt44_1K,</div><div class='ctx'> 		K1212_CLKIDX_LocalAt44_1K</div><div class='ctx'> 	};</div><div class='del'>-        static enum ClockSourceIndex s48[] = {</div><div class='add'>+	static const enum ClockSourceIndex s48[] = {</div><div class='ctx'> 		K1212_CLKIDX_AdatAt48K,</div><div class='ctx'> 		K1212_CLKIDX_WordAt48K,</div><div class='ctx'> 		K1212_CLKIDX_LocalAt48K</div><div class='hunk'>@@ -900,7 +832,6 @@ static int snd_korg1212_WriteADCSensitivity(struct snd_korg1212 *korg1212)</div><div class='ctx'>         u16       controlValue;    // this keeps the current value to be written to</div><div class='ctx'>                                    //  the card's eeprom control register.</div><div class='ctx'>         u16       count;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: WriteADCSensivity [%s]\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState]);</div><div class='hunk'>@@ -921,7 +852,7 @@ static int snd_korg1212_WriteADCSensitivity(struct snd_korg1212 *korg1212)</div><div class='ctx'>         } else</div><div class='ctx'>                 monModeSet = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'>         // ----------------------------------------------------------------------------</div><div class='ctx'>         // we are about to send new values to the card, so clear the new values queued</div><div class='hunk'>@@ -1030,8 +961,6 @@ static int snd_korg1212_WriteADCSensitivity(struct snd_korg1212 *korg1212)</div><div class='ctx'> 					   rc, stateName[korg1212-&gt;cardState]);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'>         return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1123,7 +1052,7 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)</div><div class='ctx'>         if (!doorbellValue)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	writel(doorbellValue, korg1212-&gt;inDoorbellPtr);</div><div class='ctx'> </div><div class='hunk'>@@ -1149,11 +1078,13 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: IRQ DMAE count - %ld, %x, [%s].\n",</div><div class='ctx'> 						   korg1212-&gt;irqcount, doorbellValue,</div><div class='ctx'> 						   stateName[korg1212-&gt;cardState]);</div><div class='del'>-			snd_printk(KERN_ERR "korg1212: DMA Error\n");</div><div class='add'>+			dev_err(korg1212-&gt;card-&gt;dev, "korg1212: DMA Error\n");</div><div class='ctx'> 			korg1212-&gt;errorcnt++;</div><div class='ctx'> 			korg1212-&gt;totalerrorcnt++;</div><div class='ctx'> 			korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0;</div><div class='add'>+			korg1212-&gt;dsp_stop_processing = 0;</div><div class='ctx'> 			snd_korg1212_setCardState(korg1212, K1212_STATE_ERRORSTOP);</div><div class='add'>+			wake_up(&amp;korg1212-&gt;wait);</div><div class='ctx'>                         break;</div><div class='ctx'> </div><div class='ctx'>                 // ------------------------------------------------------------------------</div><div class='hunk'>@@ -1165,6 +1096,8 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)</div><div class='ctx'> 						   korg1212-&gt;irqcount, doorbellValue,</div><div class='ctx'> 						   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> 			korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0;</div><div class='add'>+			korg1212-&gt;dsp_stop_processing = 0;</div><div class='add'>+			wake_up(&amp;korg1212-&gt;wait);</div><div class='ctx'>                         break;</div><div class='ctx'> </div><div class='ctx'>                 default:</div><div class='hunk'>@@ -1197,8 +1130,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	korg1212-&gt;inIRQ--;</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1218,8 +1149,8 @@ static int snd_korg1212_downloadDSPCode(struct snd_korg1212 *korg1212)</div><div class='ctx'>         snd_korg1212_setCardState(korg1212, K1212_STATE_DSP_IN_PROCESS);</div><div class='ctx'> </div><div class='ctx'>         rc = snd_korg1212_Send1212Command(korg1212, K1212_DB_StartDSPDownload,</div><div class='del'>-                                     UpperWordSwap(korg1212-&gt;dma_dsp.addr),</div><div class='del'>-                                     0, 0, 0);</div><div class='add'>+					  UpperWordSwap(korg1212-&gt;dma_dsp-&gt;addr),</div><div class='add'>+					  0, 0, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		K1212_DEBUG_PRINTK("K1212_DEBUG: Start DSP Download RC = %d [%s]\n",</div><div class='ctx'> 				   rc, stateName[korg1212-&gt;cardState]);</div><div class='hunk'>@@ -1234,7 +1165,7 @@ static int snd_korg1212_downloadDSPCode(struct snd_korg1212 *korg1212)</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_korg1212_playback_info =</div><div class='add'>+static const struct snd_pcm_hardware snd_korg1212_playback_info =</div><div class='ctx'> {</div><div class='ctx'> 	.info =              (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'>                               SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -1255,7 +1186,7 @@ static struct snd_pcm_hardware snd_korg1212_playback_info =</div><div class='ctx'>         .fifo_size =          0,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_hardware snd_korg1212_capture_info =</div><div class='add'>+static const struct snd_pcm_hardware snd_korg1212_capture_info =</div><div class='ctx'> {</div><div class='ctx'>         .info =              (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'>                               SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -1290,8 +1221,8 @@ static int snd_korg1212_silence(struct snd_korg1212 *korg1212, int pos, int coun</div><div class='ctx'> #if K1212_DEBUG_LEVEL &gt; 0</div><div class='ctx'> 		if ( (void *) dst &lt; (void *) korg1212-&gt;playDataBufsPtr ||</div><div class='ctx'> 		     (void *) dst &gt; (void *) korg1212-&gt;playDataBufsPtr[8].bufferData ) {</div><div class='del'>-			printk(KERN_DEBUG "K1212_DEBUG: snd_korg1212_silence KERNEL EFAULT dst=%p iter=%d\n",</div><div class='del'>-			       dst, i);</div><div class='add'>+			pr_debug("K1212_DEBUG: %s KERNEL EFAULT dst=%p iter=%d\n",</div><div class='add'>+				 __func__, dst, i);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1302,13 +1233,20 @@ static int snd_korg1212_silence(struct snd_korg1212 *korg1212, int pos, int coun</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_korg1212_copy_to(struct snd_korg1212 *korg1212, void __user *dst, int pos, int count, int offset, int size)</div><div class='add'>+static int snd_korg1212_copy_to(struct snd_pcm_substream *substream,</div><div class='add'>+				struct iov_iter *dst, int pos, int count)</div><div class='ctx'> {</div><div class='del'>-	struct KorgAudioFrame * src =  korg1212-&gt;recordDataBufsPtr[0].bufferData + pos;</div><div class='del'>-	int i, rc;</div><div class='del'>-</div><div class='del'>-	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_copy_to pos=%d offset=%d size=%d\n",</div><div class='del'>-				   pos, offset, size);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+        struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct KorgAudioFrame *src;</div><div class='add'>+	int i, size;</div><div class='add'>+</div><div class='add'>+	pos = bytes_to_frames(runtime, pos);</div><div class='add'>+	count = bytes_to_frames(runtime, count);</div><div class='add'>+	size = korg1212-&gt;channels * 2;</div><div class='add'>+	src = korg1212-&gt;recordDataBufsPtr[0].bufferData + pos;</div><div class='add'>+	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_copy_to pos=%d size=%d count=%d\n",</div><div class='add'>+				   pos, size, count);</div><div class='ctx'> 	if (snd_BUG_ON(pos + count &gt; K1212_MAX_SAMPLES))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -1316,29 +1254,34 @@ static int snd_korg1212_copy_to(struct snd_korg1212 *korg1212, void __user *dst,</div><div class='ctx'> #if K1212_DEBUG_LEVEL &gt; 0</div><div class='ctx'> 		if ( (void *) src &lt; (void *) korg1212-&gt;recordDataBufsPtr ||</div><div class='ctx'> 		     (void *) src &gt; (void *) korg1212-&gt;recordDataBufsPtr[8].bufferData ) {</div><div class='del'>-			printk(KERN_DEBUG "K1212_DEBUG: snd_korg1212_copy_to KERNEL EFAULT, src=%p dst=%p iter=%d\n", src, dst, i);</div><div class='add'>+			pr_debug("K1212_DEBUG: %s KERNEL EFAULT, src=%p dst=%p iter=%d\n",</div><div class='add'>+				 __func__, src, dst-&gt;kvec.iov_base, i);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		rc = copy_to_user(dst + offset, src, size);</div><div class='del'>-		if (rc) {</div><div class='del'>-			K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_copy_to USER EFAULT src=%p dst=%p iter=%d\n", src, dst, i);</div><div class='add'>+		if (copy_to_iter(src, size, dst) != size)</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		}</div><div class='ctx'> 		src++;</div><div class='del'>-		dst += size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_korg1212_copy_from(struct snd_korg1212 *korg1212, void __user *src, int pos, int count, int offset, int size)</div><div class='add'>+static int snd_korg1212_copy_from(struct snd_pcm_substream *substream,</div><div class='add'>+				  struct iov_iter *src, int pos, int count)</div><div class='ctx'> {</div><div class='del'>-	struct KorgAudioFrame * dst =  korg1212-&gt;playDataBufsPtr[0].bufferData + pos;</div><div class='del'>-	int i, rc;</div><div class='add'>+        struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct KorgAudioFrame *dst;</div><div class='add'>+	int i, size;</div><div class='ctx'> </div><div class='del'>-	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_copy_from pos=%d offset=%d size=%d count=%d\n",</div><div class='del'>-				   pos, offset, size, count);</div><div class='add'>+	pos = bytes_to_frames(runtime, pos);</div><div class='add'>+	count = bytes_to_frames(runtime, count);</div><div class='add'>+	size = korg1212-&gt;channels * 2;</div><div class='add'>+	dst = korg1212-&gt;playDataBufsPtr[0].bufferData + pos;</div><div class='add'>+</div><div class='add'>+	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: %s pos=%d size=%d count=%d\n",</div><div class='add'>+				   __func__, pos, size, count);</div><div class='ctx'> </div><div class='ctx'> 	if (snd_BUG_ON(pos + count &gt; K1212_MAX_SAMPLES))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1347,17 +1290,14 @@ static int snd_korg1212_copy_from(struct snd_korg1212 *korg1212, void __user *sr</div><div class='ctx'> #if K1212_DEBUG_LEVEL &gt; 0</div><div class='ctx'> 		if ( (void *) dst &lt; (void *) korg1212-&gt;playDataBufsPtr ||</div><div class='ctx'> 		     (void *) dst &gt; (void *) korg1212-&gt;playDataBufsPtr[8].bufferData ) {</div><div class='del'>-			printk(KERN_DEBUG "K1212_DEBUG: snd_korg1212_copy_from KERNEL EFAULT, src=%p dst=%p iter=%d\n", src, dst, i);</div><div class='add'>+			pr_debug("K1212_DEBUG: %s KERNEL EFAULT, src=%p dst=%p iter=%d\n",</div><div class='add'>+				 __func__, src-&gt;kvec.iov_base, dst, i);</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='del'>-		rc = copy_from_user((void*) dst + offset, src, size);</div><div class='del'>-		if (rc) {</div><div class='del'>-			K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_copy_from USER EFAULT src=%p dst=%p iter=%d\n", src, dst, i);</div><div class='add'>+		if (copy_from_iter(dst, size, src) != size)</div><div class='ctx'> 			return -EFAULT;</div><div class='del'>-		}</div><div class='ctx'> 		dst++;</div><div class='del'>-		src += size;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1375,7 +1315,6 @@ static void snd_korg1212_free_pcm(struct snd_pcm *pcm)</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-        unsigned long flags;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'>         struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='hunk'>@@ -1385,26 +1324,25 @@ static int snd_korg1212_playback_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_korg1212_OpenCard(korg1212);</div><div class='ctx'> </div><div class='ctx'>         runtime-&gt;hw = snd_korg1212_playback_info;</div><div class='del'>-	snd_pcm_set_runtime_buffer(substream, &amp;korg1212-&gt;dma_play);</div><div class='del'>-</div><div class='del'>-        spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-        korg1212-&gt;playback_substream = substream;</div><div class='del'>-	korg1212-&gt;playback_pid = current-&gt;pid;</div><div class='del'>-        korg1212-&gt;periodsize = K1212_PERIODS;</div><div class='del'>-	korg1212-&gt;channels = K1212_CHANNELS;</div><div class='del'>-	korg1212-&gt;errorcnt = 0;</div><div class='add'>+	snd_pcm_set_runtime_buffer(substream, korg1212-&gt;dma_play);</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;korg1212-&gt;lock) {</div><div class='add'>+		korg1212-&gt;playback_substream = substream;</div><div class='add'>+		korg1212-&gt;playback_pid = current-&gt;pid;</div><div class='add'>+		korg1212-&gt;periodsize = K1212_PERIODS;</div><div class='add'>+		korg1212-&gt;channels = K1212_CHANNELS;</div><div class='add'>+		korg1212-&gt;errorcnt = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+				     kPlayBufferFrames);</div><div class='ctx'> </div><div class='del'>-        snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, kPlayBufferFrames, kPlayBufferFrames);</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-        unsigned long flags;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'>         struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> </div><div class='hunk'>@@ -1414,25 +1352,22 @@ static int snd_korg1212_capture_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_korg1212_OpenCard(korg1212);</div><div class='ctx'> </div><div class='ctx'>         runtime-&gt;hw = snd_korg1212_capture_info;</div><div class='del'>-	snd_pcm_set_runtime_buffer(substream, &amp;korg1212-&gt;dma_rec);</div><div class='add'>+	snd_pcm_set_runtime_buffer(substream, korg1212-&gt;dma_rec);</div><div class='ctx'> </div><div class='del'>-        spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-        korg1212-&gt;capture_substream = substream;</div><div class='del'>-	korg1212-&gt;capture_pid = current-&gt;pid;</div><div class='del'>-        korg1212-&gt;periodsize = K1212_PERIODS;</div><div class='del'>-	korg1212-&gt;channels = K1212_CHANNELS;</div><div class='del'>-</div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;korg1212-&gt;lock) {</div><div class='add'>+		korg1212-&gt;capture_substream = substream;</div><div class='add'>+		korg1212-&gt;capture_pid = current-&gt;pid;</div><div class='add'>+		korg1212-&gt;periodsize = K1212_PERIODS;</div><div class='add'>+		korg1212-&gt;channels = K1212_CHANNELS;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-        snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='del'>-				     kPlayBufferFrames, kPlayBufferFrames);</div><div class='add'>+	snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+				     kPlayBufferFrames);</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-        unsigned long flags;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_playback_close [%s]\n",</div><div class='hunk'>@@ -1440,13 +1375,11 @@ static int snd_korg1212_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> 	snd_korg1212_silence(korg1212, 0, K1212_MAX_SAMPLES, 0, korg1212-&gt;channels * 2);</div><div class='ctx'> </div><div class='del'>-        spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	korg1212-&gt;playback_pid = -1;</div><div class='del'>-        korg1212-&gt;playback_substream = NULL;</div><div class='del'>-        korg1212-&gt;periodsize = 0;</div><div class='del'>-</div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;korg1212-&gt;lock) {</div><div class='add'>+		korg1212-&gt;playback_pid = -1;</div><div class='add'>+		korg1212-&gt;playback_substream = NULL;</div><div class='add'>+		korg1212-&gt;periodsize = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_korg1212_CloseCard(korg1212);</div><div class='ctx'>         return 0;</div><div class='hunk'>@@ -1454,19 +1387,16 @@ static int snd_korg1212_playback_close(struct snd_pcm_substream *substream)</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_capture_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-        unsigned long flags;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_capture_close [%s]\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-        spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	korg1212-&gt;capture_pid = -1;</div><div class='del'>-        korg1212-&gt;capture_substream = NULL;</div><div class='del'>-        korg1212-&gt;periodsize = 0;</div><div class='del'>-</div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;korg1212-&gt;lock) {</div><div class='add'>+		korg1212-&gt;capture_pid = -1;</div><div class='add'>+		korg1212-&gt;capture_substream = NULL;</div><div class='add'>+		korg1212-&gt;periodsize = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	snd_korg1212_CloseCard(korg1212);</div><div class='ctx'>         return 0;</div><div class='hunk'>@@ -1492,7 +1422,6 @@ static int snd_korg1212_ioctl(struct snd_pcm_substream *substream,</div><div class='ctx'> static int snd_korg1212_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'>                              struct snd_pcm_hw_params *params)</div><div class='ctx'> {</div><div class='del'>-        unsigned long flags;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'>         int err;</div><div class='ctx'> 	pid_t this_pid;</div><div class='hunk'>@@ -1501,7 +1430,7 @@ static int snd_korg1212_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_hw_params [%s]\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-        spin_lock_irqsave(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	guard(spinlock_irqsave)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (substream-&gt;pstr-&gt;stream == SNDRV_PCM_STREAM_PLAYBACK) {</div><div class='ctx'> 		this_pid = korg1212-&gt;playback_pid;</div><div class='hunk'>@@ -1519,28 +1448,31 @@ static int snd_korg1212_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if ((int)params_rate(params) != korg1212-&gt;clkRate) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='ctx'> 			_snd_pcm_hw_param_setempty(params, SNDRV_PCM_HW_PARAM_RATE);</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-        	spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='ctx'> 	        return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-        if ((err = snd_korg1212_SetRate(korg1212, params_rate(params))) &lt; 0) {</div><div class='del'>-                spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='add'>+	err = snd_korg1212_SetRate(korg1212, params_rate(params));</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='del'>-        }</div><div class='ctx'> </div><div class='ctx'> 	korg1212-&gt;channels = params_channels(params);</div><div class='ctx'>         korg1212-&gt;periodsize = K1212_PERIOD_BYTES;</div><div class='ctx'> </div><div class='del'>-        spin_unlock_irqrestore(&amp;korg1212-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int snd_korg1212_sync_stop(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='add'>+</div><div class='add'>+	wait_event_timeout(korg1212-&gt;wait, !korg1212-&gt;dsp_stop_processing, HZ);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int snd_korg1212_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='hunk'>@@ -1549,27 +1481,13 @@ static int snd_korg1212_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_prepare [%s]\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* FIXME: we should wait for ack! */</div><div class='del'>-	if (korg1212-&gt;stop_pending_cnt &gt; 0) {</div><div class='del'>-		K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_prepare - Stop is pending... [%s]\n",</div><div class='del'>-				   stateName[korg1212-&gt;cardState]);</div><div class='del'>-        	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-		/*</div><div class='del'>-		korg1212-&gt;sharedBufferPtr-&gt;cardCommand = 0;</div><div class='del'>-		del_timer(&amp;korg1212-&gt;timer);</div><div class='del'>-		korg1212-&gt;stop_pending_cnt = 0;</div><div class='del'>-		*/</div><div class='del'>-	}</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='add'>+	korg1212-&gt;dsp_stop_processing = 0;</div><div class='ctx'> </div><div class='ctx'>         rc = snd_korg1212_SetupForPlay(korg1212);</div><div class='ctx'> </div><div class='ctx'>         korg1212-&gt;currentBuffer = 0;</div><div class='ctx'> </div><div class='del'>-        spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'> 	return rc ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1582,7 +1500,7 @@ static int snd_korg1212_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 	K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_trigger [%s] cmd=%d\n",</div><div class='ctx'> 			   stateName[korg1212-&gt;cardState], cmd);</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock)(&amp;korg1212-&gt;lock);</div><div class='ctx'>         switch (cmd) {</div><div class='ctx'>                 case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> /*</div><div class='hunk'>@@ -1610,7 +1528,6 @@ static int snd_korg1212_trigger(struct snd_pcm_substream *substream,</div><div class='ctx'> 			rc = 1;</div><div class='ctx'> 			break;</div><div class='ctx'>         }</div><div class='del'>-	spin_unlock(&amp;korg1212-&gt;lock);</div><div class='ctx'>         return rc ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1641,66 +1558,53 @@ static snd_pcm_uframes_t snd_korg1212_capture_pointer(struct snd_pcm_substream *</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_playback_copy(struct snd_pcm_substream *substream,</div><div class='del'>-                        int channel, /* not used (interleaved data) */</div><div class='del'>-                        snd_pcm_uframes_t pos,</div><div class='del'>-                        void __user *src,</div><div class='del'>-                        snd_pcm_uframes_t count)</div><div class='add'>+				      int channel, unsigned long pos,</div><div class='add'>+				      struct iov_iter *src, unsigned long count)</div><div class='ctx'> {</div><div class='del'>-        struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_playback_copy [%s] %ld %ld\n",</div><div class='del'>-				   stateName[korg1212-&gt;cardState], pos, count);</div><div class='del'>- </div><div class='del'>-	return snd_korg1212_copy_from(korg1212, src, pos, count, 0, korg1212-&gt;channels * 2);</div><div class='del'>-</div><div class='add'>+	return snd_korg1212_copy_from(substream, src, pos, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_playback_silence(struct snd_pcm_substream *substream,</div><div class='ctx'>                            int channel, /* not used (interleaved data) */</div><div class='del'>-                           snd_pcm_uframes_t pos,</div><div class='del'>-                           snd_pcm_uframes_t count)</div><div class='add'>+                           unsigned long pos,</div><div class='add'>+                           unsigned long count)</div><div class='ctx'> {</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'>         struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='ctx'> </div><div class='del'>-	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_playback_silence [%s]\n",</div><div class='del'>-				   stateName[korg1212-&gt;cardState]);</div><div class='del'>-</div><div class='del'>-	return snd_korg1212_silence(korg1212, pos, count, 0, korg1212-&gt;channels * 2);</div><div class='add'>+	return snd_korg1212_silence(korg1212, bytes_to_frames(runtime, pos),</div><div class='add'>+				    bytes_to_frames(runtime, count),</div><div class='add'>+				    0, korg1212-&gt;channels * 2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_capture_copy(struct snd_pcm_substream *substream,</div><div class='del'>-                        int channel, /* not used (interleaved data) */</div><div class='del'>-                        snd_pcm_uframes_t pos,</div><div class='del'>-                        void __user *dst,</div><div class='del'>-                        snd_pcm_uframes_t count)</div><div class='add'>+				     int channel, unsigned long pos,</div><div class='add'>+				     struct iov_iter *dst, unsigned long count)</div><div class='ctx'> {</div><div class='del'>-        struct snd_korg1212 *korg1212 = snd_pcm_substream_chip(substream);</div><div class='del'>-</div><div class='del'>-	K1212_DEBUG_PRINTK_VERBOSE("K1212_DEBUG: snd_korg1212_capture_copy [%s] %ld %ld\n",</div><div class='del'>-				   stateName[korg1212-&gt;cardState], pos, count);</div><div class='del'>-</div><div class='del'>-	return snd_korg1212_copy_to(korg1212, dst, pos, count, 0, korg1212-&gt;channels * 2);</div><div class='add'>+	return snd_korg1212_copy_to(substream, dst, pos, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_korg1212_playback_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_korg1212_playback_ops = {</div><div class='ctx'>         .open =		snd_korg1212_playback_open,</div><div class='ctx'>         .close =	snd_korg1212_playback_close,</div><div class='ctx'>         .ioctl =	snd_korg1212_ioctl,</div><div class='ctx'>         .hw_params =	snd_korg1212_hw_params,</div><div class='ctx'>         .prepare =	snd_korg1212_prepare,</div><div class='ctx'>         .trigger =	snd_korg1212_trigger,</div><div class='add'>+	.sync_stop =	snd_korg1212_sync_stop,</div><div class='ctx'>         .pointer =	snd_korg1212_playback_pointer,</div><div class='del'>-        .copy =		snd_korg1212_playback_copy,</div><div class='del'>-        .silence =	snd_korg1212_playback_silence,</div><div class='add'>+	.copy =		snd_korg1212_playback_copy,</div><div class='add'>+	.fill_silence =	snd_korg1212_playback_silence,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops snd_korg1212_capture_ops = {</div><div class='add'>+static const struct snd_pcm_ops snd_korg1212_capture_ops = {</div><div class='ctx'> 	.open =		snd_korg1212_capture_open,</div><div class='ctx'> 	.close =	snd_korg1212_capture_close,</div><div class='ctx'> 	.ioctl =	snd_korg1212_ioctl,</div><div class='ctx'> 	.hw_params =	snd_korg1212_hw_params,</div><div class='ctx'> 	.prepare =	snd_korg1212_prepare,</div><div class='ctx'> 	.trigger =	snd_korg1212_trigger,</div><div class='add'>+	.sync_stop =	snd_korg1212_sync_stop,</div><div class='ctx'> 	.pointer =	snd_korg1212_capture_pointer,</div><div class='ctx'> 	.copy =		snd_korg1212_capture_copy,</div><div class='ctx'> };</div><div class='hunk'>@@ -1723,15 +1627,13 @@ static int snd_korg1212_control_phase_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> 	int i = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'>         u-&gt;value.integer.value[0] = korg1212-&gt;volumePhase[i];</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt;= 8)</div><div class='ctx'>         	u-&gt;value.integer.value[1] = korg1212-&gt;volumePhase[i+1];</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1742,7 +1644,7 @@ static int snd_korg1212_control_phase_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>         int change = 0;</div><div class='ctx'>         int i, val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	i = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='hunk'>@@ -1768,8 +1670,6 @@ static int snd_korg1212_control_phase_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1789,7 +1689,7 @@ static int snd_korg1212_control_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	i = kcontrol-&gt;private_value;</div><div class='ctx'>         u-&gt;value.integer.value[0] = abs(korg1212-&gt;sharedBufferPtr-&gt;volumeData[i]);</div><div class='hunk'>@@ -1797,8 +1697,6 @@ static int snd_korg1212_control_volume_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (i &gt;= 8) </div><div class='ctx'>                 u-&gt;value.integer.value[1] = abs(korg1212-&gt;sharedBufferPtr-&gt;volumeData[i+1]);</div><div class='ctx'> </div><div class='del'>-        spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1810,7 +1708,7 @@ static int snd_korg1212_control_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'>         int i;</div><div class='ctx'> 	int val;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	i = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='hunk'>@@ -1836,22 +1734,15 @@ static int snd_korg1212_control_volume_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_control_route_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					   struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = (kcontrol-&gt;private_value &gt;= 8) ? 2 : 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = kAudioChannels;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; kAudioChannels-1) {</div><div class='del'>-		uinfo-&gt;value.enumerated.item = kAudioChannels-1;</div><div class='del'>-	}</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, channelName[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo,</div><div class='add'>+				 (kcontrol-&gt;private_value &gt;= 8) ? 2 : 1,</div><div class='add'>+				 kAudioChannels, channelName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_control_route_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1860,7 +1751,7 @@ static int snd_korg1212_control_route_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         int i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	i = kcontrol-&gt;private_value;</div><div class='ctx'> 	u-&gt;value.enumerated.item[0] = korg1212-&gt;sharedBufferPtr-&gt;routeData[i];</div><div class='hunk'>@@ -1868,8 +1759,6 @@ static int snd_korg1212_control_route_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	if (i &gt;= 8) </div><div class='ctx'> 		u-&gt;value.enumerated.item[1] = korg1212-&gt;sharedBufferPtr-&gt;routeData[i+1];</div><div class='ctx'> </div><div class='del'>-        spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1879,7 +1768,7 @@ static int snd_korg1212_control_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         int change = 0, i;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	i = kcontrol-&gt;private_value;</div><div class='ctx'> </div><div class='hunk'>@@ -1899,8 +1788,6 @@ static int snd_korg1212_control_route_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1919,13 +1806,11 @@ static int snd_korg1212_control_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'>         u-&gt;value.integer.value[0] = korg1212-&gt;leftADCInSens;</div><div class='ctx'>         u-&gt;value.integer.value[1] = korg1212-&gt;rightADCInSens;</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='ctx'>         return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1935,22 +1820,20 @@ static int snd_korg1212_control_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'>         int change = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (u-&gt;value.integer.value[0] &gt;= k1212MinADCSens &amp;&amp;</div><div class='del'>-	    u-&gt;value.integer.value[0] &lt;= k1212MaxADCSens &amp;&amp;</div><div class='del'>-	    u-&gt;value.integer.value[0] != korg1212-&gt;leftADCInSens) {</div><div class='del'>-                korg1212-&gt;leftADCInSens = u-&gt;value.integer.value[0];</div><div class='del'>-                change = 1;</div><div class='del'>-        }</div><div class='del'>-	if (u-&gt;value.integer.value[1] &gt;= k1212MinADCSens &amp;&amp;</div><div class='del'>-	    u-&gt;value.integer.value[1] &lt;= k1212MaxADCSens &amp;&amp;</div><div class='del'>-	    u-&gt;value.integer.value[1] != korg1212-&gt;rightADCInSens) {</div><div class='del'>-                korg1212-&gt;rightADCInSens = u-&gt;value.integer.value[1];</div><div class='del'>-                change = 1;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	scoped_guard(spinlock_irq, &amp;korg1212-&gt;lock) {</div><div class='add'>+		if (u-&gt;value.integer.value[0] &gt;= k1212MinADCSens &amp;&amp;</div><div class='add'>+		    u-&gt;value.integer.value[0] &lt;= k1212MaxADCSens &amp;&amp;</div><div class='add'>+		    u-&gt;value.integer.value[0] != korg1212-&gt;leftADCInSens) {</div><div class='add'>+			korg1212-&gt;leftADCInSens = u-&gt;value.integer.value[0];</div><div class='add'>+			change = 1;</div><div class='add'>+		}</div><div class='add'>+		if (u-&gt;value.integer.value[1] &gt;= k1212MinADCSens &amp;&amp;</div><div class='add'>+		    u-&gt;value.integer.value[1] &lt;= k1212MaxADCSens &amp;&amp;</div><div class='add'>+		    u-&gt;value.integer.value[1] != korg1212-&gt;rightADCInSens) {</div><div class='add'>+			korg1212-&gt;rightADCInSens = u-&gt;value.integer.value[1];</div><div class='add'>+			change = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>         if (change)</div><div class='ctx'>                 snd_korg1212_WriteADCSensitivity(korg1212);</div><div class='hunk'>@@ -1961,14 +1844,7 @@ static int snd_korg1212_control_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> static int snd_korg1212_control_sync_info(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 					  struct snd_ctl_elem_info *uinfo)</div><div class='ctx'> {</div><div class='del'>-	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;</div><div class='del'>-	uinfo-&gt;count = 1;</div><div class='del'>-	uinfo-&gt;value.enumerated.items = 3;</div><div class='del'>-	if (uinfo-&gt;value.enumerated.item &gt; 2) {</div><div class='del'>-		uinfo-&gt;value.enumerated.item = 2;</div><div class='del'>-	}</div><div class='del'>-	strcpy(uinfo-&gt;value.enumerated.name, clockSourceTypeName[uinfo-&gt;value.enumerated.item]);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_ctl_enum_info(uinfo, 1, 3, clockSourceTypeName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int snd_korg1212_control_sync_get(struct snd_kcontrol *kcontrol,</div><div class='hunk'>@@ -1976,11 +1852,9 @@ static int snd_korg1212_control_sync_get(struct snd_kcontrol *kcontrol,</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_korg1212 *korg1212 = snd_kcontrol_chip(kcontrol);</div><div class='ctx'> </div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	ucontrol-&gt;value.enumerated.item[0] = korg1212-&gt;clkSource;</div><div class='del'>-</div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1992,10 +1866,9 @@ static int snd_korg1212_control_sync_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	int change;</div><div class='ctx'> </div><div class='ctx'> 	val = ucontrol-&gt;value.enumerated.item[0] % 3;</div><div class='del'>-	spin_lock_irq(&amp;korg1212-&gt;lock);</div><div class='add'>+	guard(spinlock_irq)(&amp;korg1212-&gt;lock);</div><div class='ctx'> 	change = val != korg1212-&gt;clkSource;</div><div class='ctx'>         snd_korg1212_SetClockSource(korg1212, val);</div><div class='del'>-	spin_unlock_irq(&amp;korg1212-&gt;lock);</div><div class='ctx'> 	return change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2028,7 +1901,7 @@ static int snd_korg1212_control_sync_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 		.private_value = ord,								\</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new snd_korg1212_controls[] = {</div><div class='add'>+static const struct snd_kcontrol_new snd_korg1212_controls[] = {</div><div class='ctx'>         MON_MIXER(8, "Analog"),</div><div class='ctx'> 	MON_MIXER(10, "SPDIF"), </div><div class='ctx'>         MON_MIXER(0, "ADAT-1"), MON_MIXER(1, "ADAT-2"), MON_MIXER(2, "ADAT-3"), MON_MIXER(3, "ADAT-4"),</div><div class='hunk'>@@ -2064,7 +1937,7 @@ static void snd_korg1212_proc_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, korg1212-&gt;card-&gt;longname);</div><div class='ctx'> 	snd_iprintf(buffer, " (index #%d)\n", korg1212-&gt;card-&gt;number + 1);</div><div class='ctx'> 	snd_iprintf(buffer, "\nGeneral settings\n");</div><div class='del'>-	snd_iprintf(buffer, "    period size: %Zd bytes\n", K1212_PERIOD_BYTES);</div><div class='add'>+	snd_iprintf(buffer, "    period size: %zd bytes\n", K1212_PERIOD_BYTES);</div><div class='ctx'> 	snd_iprintf(buffer, "     clock mode: %s\n", clockSourceName[korg1212-&gt;clkSrcRate] );</div><div class='ctx'> 	snd_iprintf(buffer, "  left ADC Sens: %d\n", korg1212-&gt;leftADCInSens );</div><div class='ctx'> 	snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212-&gt;rightADCInSens );</div><div class='hunk'>@@ -2083,110 +1956,42 @@ static void snd_korg1212_proc_read(struct snd_info_entry *entry,</div><div class='ctx'>         snd_iprintf(buffer, "    Error count: %ld\n", korg1212-&gt;totalerrorcnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __devinit snd_korg1212_proc_init(struct snd_korg1212 *korg1212)</div><div class='add'>+static void snd_korg1212_proc_init(struct snd_korg1212 *korg1212)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-</div><div class='del'>-	if (! snd_card_proc_new(korg1212-&gt;card, "korg1212", &amp;entry))</div><div class='del'>-		snd_info_set_text_ops(entry, korg1212, snd_korg1212_proc_read);</div><div class='add'>+	snd_card_ro_proc_new(korg1212-&gt;card, "korg1212", korg1212,</div><div class='add'>+			     snd_korg1212_proc_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-snd_korg1212_free(struct snd_korg1212 *korg1212)</div><div class='add'>+static void</div><div class='add'>+snd_korg1212_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-        snd_korg1212_TurnOffIdleMonitor(korg1212);</div><div class='del'>-</div><div class='del'>-        if (korg1212-&gt;irq &gt;= 0) {</div><div class='del'>-                snd_korg1212_DisableCardInterrupts(korg1212);</div><div class='del'>-                free_irq(korg1212-&gt;irq, korg1212);</div><div class='del'>-                korg1212-&gt;irq = -1;</div><div class='del'>-        }</div><div class='del'>-        </div><div class='del'>-        if (korg1212-&gt;iobase != NULL) {</div><div class='del'>-                iounmap(korg1212-&gt;iobase);</div><div class='del'>-                korg1212-&gt;iobase = NULL;</div><div class='del'>-        }</div><div class='del'>-        </div><div class='del'>-	pci_release_regions(korg1212-&gt;pci);</div><div class='del'>-</div><div class='del'>-        // ----------------------------------------------------</div><div class='del'>-        // free up memory resources used for the DSP download.</div><div class='del'>-        // ----------------------------------------------------</div><div class='del'>-        if (korg1212-&gt;dma_dsp.area) {</div><div class='del'>-        	snd_dma_free_pages(&amp;korg1212-&gt;dma_dsp);</div><div class='del'>-        	korg1212-&gt;dma_dsp.area = NULL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-#ifndef K1212_LARGEALLOC</div><div class='del'>-</div><div class='del'>-        // ------------------------------------------------------</div><div class='del'>-        // free up memory resources used for the Play/Rec Buffers</div><div class='del'>-        // ------------------------------------------------------</div><div class='del'>-	if (korg1212-&gt;dma_play.area) {</div><div class='del'>-		snd_dma_free_pages(&amp;korg1212-&gt;dma_play);</div><div class='del'>-		korg1212-&gt;dma_play.area = NULL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	if (korg1212-&gt;dma_rec.area) {</div><div class='del'>-		snd_dma_free_pages(&amp;korg1212-&gt;dma_rec);</div><div class='del'>-		korg1212-&gt;dma_rec.area = NULL;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-        // ----------------------------------------------------</div><div class='del'>-        // free up memory resources used for the Shared Buffers</div><div class='del'>-        // ----------------------------------------------------</div><div class='del'>-	if (korg1212-&gt;dma_shared.area) {</div><div class='del'>-		snd_dma_free_pages(&amp;korg1212-&gt;dma_shared);</div><div class='del'>-		korg1212-&gt;dma_shared.area = NULL;</div><div class='del'>-        }</div><div class='del'>-        </div><div class='del'>-	pci_disable_device(korg1212-&gt;pci);</div><div class='del'>-        kfree(korg1212);</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='add'>+	struct snd_korg1212 *korg1212 = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-static int snd_korg1212_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-        struct snd_korg1212 *korg1212 = device-&gt;device_data;</div><div class='del'>-        K1212_DEBUG_PRINTK("K1212_DEBUG: Freeing device\n");</div><div class='del'>-	return snd_korg1212_free(korg1212);</div><div class='add'>+	snd_korg1212_TurnOffIdleMonitor(korg1212);</div><div class='add'>+	snd_korg1212_DisableCardInterrupts(korg1212);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,</div><div class='del'>-                                         struct snd_korg1212 ** rchip)</div><div class='add'>+static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'>         int err, rc;</div><div class='ctx'>         unsigned int i;</div><div class='del'>-	unsigned ioport_size, iomem_size, iomem2_size;</div><div class='del'>-        struct snd_korg1212 * korg1212;</div><div class='add'>+	__maybe_unused unsigned iomem_size;</div><div class='add'>+	__maybe_unused unsigned ioport_size;</div><div class='add'>+	__maybe_unused unsigned iomem2_size;</div><div class='add'>+	struct snd_korg1212 *korg1212 = card-&gt;private_data;</div><div class='ctx'> 	const struct firmware *dsp_code;</div><div class='ctx'> </div><div class='del'>-        static struct snd_device_ops ops = {</div><div class='del'>-                .dev_free = snd_korg1212_dev_free,</div><div class='del'>-        };</div><div class='del'>-</div><div class='del'>-        * rchip = NULL;</div><div class='del'>-        if ((err = pci_enable_device(pci)) &lt; 0)</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> </div><div class='del'>-        korg1212 = kzalloc(sizeof(*korg1212), GFP_KERNEL);</div><div class='del'>-        if (korg1212 == NULL) {</div><div class='del'>-		pci_disable_device(pci);</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	korg1212-&gt;card = card;</div><div class='ctx'> 	korg1212-&gt;pci = pci;</div><div class='ctx'> </div><div class='ctx'>         init_waitqueue_head(&amp;korg1212-&gt;wait);</div><div class='ctx'>         spin_lock_init(&amp;korg1212-&gt;lock);</div><div class='ctx'> 	mutex_init(&amp;korg1212-&gt;open_mutex);</div><div class='del'>-	init_timer(&amp;korg1212-&gt;timer);</div><div class='del'>-	korg1212-&gt;timer.function = snd_korg1212_timer_func;</div><div class='del'>-	korg1212-&gt;timer.data = (unsigned long)korg1212;</div><div class='ctx'> </div><div class='ctx'>         korg1212-&gt;irq = -1;</div><div class='ctx'>         korg1212-&gt;clkSource = K1212_CLKIDX_Local;</div><div class='hunk'>@@ -2208,11 +2013,9 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'>         for (i=0; i&lt;kAudioChannels; i++)</div><div class='ctx'>                 korg1212-&gt;volumePhase[i] = 0;</div><div class='ctx'> </div><div class='del'>-	if ((err = pci_request_regions(pci, "korg1212")) &lt; 0) {</div><div class='del'>-		kfree(korg1212);</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+	err = pcim_request_all_regions(pci, "korg1212");</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'>         korg1212-&gt;iomem = pci_resource_start(korg1212-&gt;pci, 0);</div><div class='ctx'>         korg1212-&gt;ioport = pci_resource_start(korg1212-&gt;pci, 1);</div><div class='hunk'>@@ -2232,24 +2035,22 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'> 		   korg1212-&gt;iomem2, iomem2_size,</div><div class='ctx'> 		   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-        if ((korg1212-&gt;iobase = ioremap(korg1212-&gt;iomem, iomem_size)) == NULL) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: unable to remap memory region 0x%lx-0x%lx\n", korg1212-&gt;iomem,</div><div class='del'>-                           korg1212-&gt;iomem + iomem_size - 1);</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='del'>-                return -EBUSY;</div><div class='del'>-        }</div><div class='add'>+	korg1212-&gt;iobase = pcim_iomap(pci, 0, 0);</div><div class='add'>+	if (!korg1212-&gt;iobase)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-        err = request_irq(pci-&gt;irq, snd_korg1212_interrupt,</div><div class='add'>+	err = devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, snd_korg1212_interrupt,</div><div class='ctx'>                           IRQF_SHARED,</div><div class='del'>-                          "korg1212", korg1212);</div><div class='add'>+                          KBUILD_MODNAME, korg1212);</div><div class='ctx'> </div><div class='ctx'>         if (err) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "korg1212: unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='ctx'>                 return -EBUSY;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         korg1212-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = korg1212-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_korg1212_free;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(korg1212-&gt;pci);</div><div class='ctx'> </div><div class='hunk'>@@ -2288,41 +2089,36 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'>                    korg1212-&gt;idRegPtr,</div><div class='ctx'> 		   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				sizeof(struct KorgSharedBuffer), &amp;korg1212-&gt;dma_shared) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: can not allocate shared buffer memory (%Zd bytes)\n", sizeof(struct KorgSharedBuffer));</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-        }</div><div class='del'>-        korg1212-&gt;sharedBufferPtr = (struct KorgSharedBuffer *)korg1212-&gt;dma_shared.area;</div><div class='del'>-        korg1212-&gt;sharedBufferPhy = korg1212-&gt;dma_shared.addr;</div><div class='add'>+	korg1212-&gt;dma_shared = snd_devm_alloc_pages(&amp;pci-&gt;dev,</div><div class='add'>+						    SNDRV_DMA_TYPE_DEV,</div><div class='add'>+						    sizeof(struct KorgSharedBuffer));</div><div class='add'>+	if (!korg1212-&gt;dma_shared)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	korg1212-&gt;sharedBufferPtr = (struct KorgSharedBuffer *)korg1212-&gt;dma_shared-&gt;area;</div><div class='add'>+	korg1212-&gt;sharedBufferPhy = korg1212-&gt;dma_shared-&gt;addr;</div><div class='ctx'> </div><div class='ctx'>         K1212_DEBUG_PRINTK("K1212_DEBUG: Shared Buffer Area = 0x%p (0x%08lx), %d bytes\n", korg1212-&gt;sharedBufferPtr, korg1212-&gt;sharedBufferPhy, sizeof(struct KorgSharedBuffer));</div><div class='ctx'> </div><div class='ctx'> #ifndef K1212_LARGEALLOC</div><div class='del'>-</div><div class='ctx'>         korg1212-&gt;DataBufsSize = sizeof(struct KorgAudioBuffer) * kNumBuffers;</div><div class='add'>+	korg1212-&gt;dma_play = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+						  korg1212-&gt;DataBufsSize);</div><div class='add'>+	if (!korg1212-&gt;dma_play)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				korg1212-&gt;DataBufsSize, &amp;korg1212-&gt;dma_play) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: can not allocate play data buffer memory (%d bytes)\n", korg1212-&gt;DataBufsSize);</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-        }</div><div class='del'>-	korg1212-&gt;playDataBufsPtr = (struct KorgAudioBuffer *)korg1212-&gt;dma_play.area;</div><div class='del'>-	korg1212-&gt;PlayDataPhy = korg1212-&gt;dma_play.addr;</div><div class='add'>+	korg1212-&gt;playDataBufsPtr = (struct KorgAudioBuffer *)korg1212-&gt;dma_play-&gt;area;</div><div class='add'>+	korg1212-&gt;PlayDataPhy = korg1212-&gt;dma_play-&gt;addr;</div><div class='ctx'> </div><div class='ctx'>         K1212_DEBUG_PRINTK("K1212_DEBUG: Play Data Area = 0x%p (0x%08x), %d bytes\n",</div><div class='ctx'> 		korg1212-&gt;playDataBufsPtr, korg1212-&gt;PlayDataPhy, korg1212-&gt;DataBufsSize);</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				korg1212-&gt;DataBufsSize, &amp;korg1212-&gt;dma_rec) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: can not allocate record data buffer memory (%d bytes)\n", korg1212-&gt;DataBufsSize);</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-        }</div><div class='del'>-        korg1212-&gt;recordDataBufsPtr = (struct KorgAudioBuffer *)korg1212-&gt;dma_rec.area;</div><div class='del'>-        korg1212-&gt;RecDataPhy = korg1212-&gt;dma_rec.addr;</div><div class='add'>+	korg1212-&gt;dma_rec = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+						 korg1212-&gt;DataBufsSize);</div><div class='add'>+	if (!korg1212-&gt;dma_rec)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	korg1212-&gt;recordDataBufsPtr = (struct KorgAudioBuffer *)korg1212-&gt;dma_rec-&gt;area;</div><div class='add'>+	korg1212-&gt;RecDataPhy = korg1212-&gt;dma_rec-&gt;addr;</div><div class='ctx'> </div><div class='ctx'>         K1212_DEBUG_PRINTK("K1212_DEBUG: Record Data Area = 0x%p (0x%08x), %d bytes\n",</div><div class='ctx'> 		korg1212-&gt;recordDataBufsPtr, korg1212-&gt;RecDataPhy, korg1212-&gt;DataBufsSize);</div><div class='hunk'>@@ -2345,25 +2141,22 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'> </div><div class='ctx'> 	err = request_firmware(&amp;dsp_code, "korg/k1212.dsp", &amp;pci-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		release_firmware(dsp_code);</div><div class='del'>-		snd_printk(KERN_ERR "firmware not available\n");</div><div class='del'>-		snd_korg1212_free(korg1212);</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "firmware not available\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),</div><div class='del'>-				dsp_code-&gt;size, &amp;korg1212-&gt;dma_dsp) &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "korg1212: cannot allocate dsp code memory (%zd bytes)\n", dsp_code-&gt;size);</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='add'>+	korg1212-&gt;dma_dsp = snd_devm_alloc_pages(&amp;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+						 dsp_code-&gt;size);</div><div class='add'>+	if (!korg1212-&gt;dma_dsp) {</div><div class='ctx'> 		release_firmware(dsp_code);</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-        }</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'>         K1212_DEBUG_PRINTK("K1212_DEBUG: DSP Code area = 0x%p (0x%08x) %d bytes [%s]\n",</div><div class='del'>-		   korg1212-&gt;dma_dsp.area, korg1212-&gt;dma_dsp.addr, dsp_code-&gt;size,</div><div class='add'>+		   korg1212-&gt;dma_dsp-&gt;area, korg1212-&gt;dma_dsp-&gt;addr, dsp_code-&gt;size,</div><div class='ctx'> 		   stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-	memcpy(korg1212-&gt;dma_dsp.area, dsp_code-&gt;data, dsp_code-&gt;size);</div><div class='add'>+	memcpy(korg1212-&gt;dma_dsp-&gt;area, dsp_code-&gt;data, dsp_code-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 	release_firmware(dsp_code);</div><div class='ctx'> </div><div class='hunk'>@@ -2372,11 +2165,6 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		K1212_DEBUG_PRINTK("K1212_DEBUG: Reboot Card - RC = %d [%s]\n", rc, stateName[korg1212-&gt;cardState]);</div><div class='ctx'> </div><div class='del'>-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &amp;ops)) &lt; 0) {</div><div class='del'>-                snd_korg1212_free(korg1212);</div><div class='del'>-                return err;</div><div class='del'>-        }</div><div class='del'>-        </div><div class='ctx'> 	snd_korg1212_EnableCardInterrupts(korg1212);</div><div class='ctx'> </div><div class='ctx'> 	mdelay(CARD_BOOT_DELAY_IN_MS);</div><div class='hunk'>@@ -2397,12 +2185,13 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'>                korg1212-&gt;RoutingTablePhy, LowerWordSwap(korg1212-&gt;RoutingTablePhy),</div><div class='ctx'>                korg1212-&gt;AdatTimeCodePhy, LowerWordSwap(korg1212-&gt;AdatTimeCodePhy));</div><div class='ctx'> </div><div class='del'>-        if ((err = snd_pcm_new(korg1212-&gt;card, "korg1212", 0, 1, 1, &amp;korg1212-&gt;pcm)) &lt; 0)</div><div class='add'>+	err = snd_pcm_new(korg1212-&gt;card, "korg1212", 0, 1, 1, &amp;korg1212-&gt;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'>                 return err;</div><div class='ctx'> </div><div class='ctx'> 	korg1212-&gt;pcm-&gt;private_data = korg1212;</div><div class='ctx'>         korg1212-&gt;pcm-&gt;private_free = snd_korg1212_free_pcm;</div><div class='del'>-        strcpy(korg1212-&gt;pcm-&gt;name, "korg1212");</div><div class='add'>+        strscpy(korg1212-&gt;pcm-&gt;name, "korg1212");</div><div class='ctx'> </div><div class='ctx'>         snd_pcm_set_ops(korg1212-&gt;pcm, SNDRV_PCM_STREAM_PLAYBACK, &amp;snd_korg1212_playback_ops);</div><div class='ctx'>         </div><div class='hunk'>@@ -2417,19 +2206,15 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         snd_korg1212_proc_init(korg1212);</div><div class='del'>-        </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='ctx'> </div><div class='del'>-        * rchip = korg1212;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Card initialisation</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int __devinit</div><div class='add'>+static int</div><div class='ctx'> snd_korg1212_probe(struct pci_dev *pci,</div><div class='ctx'> 		const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -2445,53 +2230,39 @@ snd_korg1212_probe(struct pci_dev *pci,</div><div class='ctx'> 		dev++;</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*korg1212), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	korg1212 = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-        if ((err = snd_korg1212_create(card, pci, &amp;korg1212)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_korg1212_create(card, pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "korg1212");</div><div class='del'>-	strcpy(card-&gt;shortname, "korg1212");</div><div class='add'>+	strscpy(card-&gt;driver, "korg1212");</div><div class='add'>+	strscpy(card-&gt;shortname, "korg1212");</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, irq %d", card-&gt;shortname,</div><div class='ctx'> 		korg1212-&gt;iomem, korg1212-&gt;irq);</div><div class='ctx'> </div><div class='ctx'>         K1212_DEBUG_PRINTK("K1212_DEBUG: %s\n", card-&gt;longname);</div><div class='ctx'> </div><div class='del'>-	if ((err = snd_card_register(card)) &lt; 0) {</div><div class='del'>-		snd_card_free(card);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto error;</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void __devexit snd_korg1212_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='add'>+ error:</div><div class='add'>+	snd_card_free(card);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name = "korg1212",</div><div class='add'>+static struct pci_driver korg1212_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_korg1212_ids,</div><div class='ctx'> 	.probe = snd_korg1212_probe,</div><div class='del'>-	.remove = __devexit_p(snd_korg1212_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init alsa_card_korg1212_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit alsa_card_korg1212_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(alsa_card_korg1212_init)</div><div class='del'>-module_exit(alsa_card_korg1212_exit)</div><div class='add'>+module_pci_driver(korg1212_driver);</div><div class='head'>diff --git a/sound/pci/lola/Makefile b/sound/pci/lola/Makefile<br/>new file mode 100644<br/>index 000000000000..8fdb5e5a776b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-lola-y := lola.o lola_pcm.o lola_clock.o lola_mixer.o</div><div class='add'>+snd-lola-$(CONFIG_SND_DEBUG) += lola_proc.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SND_LOLA) += snd-lola.o</div><div class='head'>diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c<br/>new file mode 100644<br/>index 000000000000..34a3ba17deb4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola.c</a></div><div class='hunk'>@@ -0,0 +1,714 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/initval.h&gt;</div><div class='add'>+#include "lola.h"</div><div class='add'>+</div><div class='add'>+/* Standard options */</div><div class='add'>+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='add'>+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+</div><div class='add'>+module_param_array(index, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(index, "Index value for Digigram Lola driver.");</div><div class='add'>+module_param_array(id, charp, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(id, "ID string for Digigram Lola driver.");</div><div class='add'>+module_param_array(enable, bool, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(enable, "Enable Digigram Lola driver.");</div><div class='add'>+</div><div class='add'>+/* Lola-specific options */</div><div class='add'>+</div><div class='add'>+/* for instance use always max granularity which is compatible</div><div class='add'>+ * with all sample rates</div><div class='add'>+ */</div><div class='add'>+static int granularity[SNDRV_CARDS] = {</div><div class='add'>+	[0 ... (SNDRV_CARDS - 1)] = LOLA_GRANULARITY_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* below a sample_rate of 16kHz the analogue audio quality is NOT excellent */</div><div class='add'>+static int sample_rate_min[SNDRV_CARDS] = {</div><div class='add'>+	[0 ... (SNDRV_CARDS - 1) ] = 16000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_param_array(granularity, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(granularity, "Granularity value");</div><div class='add'>+module_param_array(sample_rate_min, int, NULL, 0444);</div><div class='add'>+MODULE_PARM_DESC(sample_rate_min, "Minimal sample rate");</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Digigram Lola driver");</div><div class='add'>+MODULE_AUTHOR("Takashi Iwai &lt;tiwai@suse.de&gt;");</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_SND_DEBUG_VERBOSE</div><div class='add'>+static int debug;</div><div class='add'>+module_param(debug, int, 0644);</div><div class='add'>+#define verbose_debug(fmt, args...)			\</div><div class='add'>+	do { if (debug &gt; 1) pr_debug(SFX fmt, ##args); } while (0)</div><div class='add'>+#else</div><div class='add'>+#define verbose_debug(fmt, args...)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * pseudo-codec read/write via CORB/RIRB</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int corb_send_verb(struct lola *chip, unsigned int nid,</div><div class='add'>+			  unsigned int verb, unsigned int data,</div><div class='add'>+			  unsigned int extdata)</div><div class='add'>+{</div><div class='add'>+	int ret = -EIO;</div><div class='add'>+</div><div class='add'>+	chip-&gt;last_cmd_nid = nid;</div><div class='add'>+	chip-&gt;last_verb = verb;</div><div class='add'>+	chip-&gt;last_data = data;</div><div class='add'>+	chip-&gt;last_extdata = extdata;</div><div class='add'>+	data |= (nid &lt;&lt; 20) | (verb &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	guard(spinlock_irqsave)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (chip-&gt;rirb.cmds &lt; LOLA_CORB_ENTRIES - 1) {</div><div class='add'>+		unsigned int wp = chip-&gt;corb.wp + 1;</div><div class='add'>+		wp %= LOLA_CORB_ENTRIES;</div><div class='add'>+		chip-&gt;corb.wp = wp;</div><div class='add'>+		chip-&gt;corb.buf[wp * 2] = cpu_to_le32(data);</div><div class='add'>+		chip-&gt;corb.buf[wp * 2 + 1] = cpu_to_le32(extdata);</div><div class='add'>+		lola_writew(chip, BAR0, CORBWP, wp);</div><div class='add'>+		chip-&gt;rirb.cmds++;</div><div class='add'>+		smp_wmb();</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_queue_unsol_event(struct lola *chip, unsigned int res,</div><div class='add'>+				   unsigned int res_ex)</div><div class='add'>+{</div><div class='add'>+	lola_update_ext_clock_freq(chip, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* retrieve RIRB entry - called from interrupt handler */</div><div class='add'>+static void lola_update_rirb(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int rp, wp;</div><div class='add'>+	u32 res, res_ex;</div><div class='add'>+</div><div class='add'>+	wp = lola_readw(chip, BAR0, RIRBWP);</div><div class='add'>+	if (wp == chip-&gt;rirb.wp)</div><div class='add'>+		return;</div><div class='add'>+	chip-&gt;rirb.wp = wp;</div><div class='add'>+</div><div class='add'>+	while (chip-&gt;rirb.rp != wp) {</div><div class='add'>+		chip-&gt;rirb.rp++;</div><div class='add'>+		chip-&gt;rirb.rp %= LOLA_CORB_ENTRIES;</div><div class='add'>+</div><div class='add'>+		rp = chip-&gt;rirb.rp &lt;&lt; 1; /* an RIRB entry is 8-bytes */</div><div class='add'>+		res_ex = le32_to_cpu(chip-&gt;rirb.buf[rp + 1]);</div><div class='add'>+		res = le32_to_cpu(chip-&gt;rirb.buf[rp]);</div><div class='add'>+		if (res_ex &amp; LOLA_RIRB_EX_UNSOL_EV)</div><div class='add'>+			lola_queue_unsol_event(chip, res, res_ex);</div><div class='add'>+		else if (chip-&gt;rirb.cmds) {</div><div class='add'>+			chip-&gt;res = res;</div><div class='add'>+			chip-&gt;res_ex = res_ex;</div><div class='add'>+			smp_wmb();</div><div class='add'>+			chip-&gt;rirb.cmds--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rirb_get_response(struct lola *chip, unsigned int *val,</div><div class='add'>+			     unsigned int *extval)</div><div class='add'>+{</div><div class='add'>+	unsigned long timeout;</div><div class='add'>+</div><div class='add'>+ again:</div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(1000);</div><div class='add'>+	for (;;) {</div><div class='add'>+		if (chip-&gt;polling_mode) {</div><div class='add'>+			spin_lock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+			lola_update_rirb(chip);</div><div class='add'>+			spin_unlock_irq(&amp;chip-&gt;reg_lock);</div><div class='add'>+		}</div><div class='add'>+		if (!chip-&gt;rirb.cmds) {</div><div class='add'>+			*val = chip-&gt;res;</div><div class='add'>+			if (extval)</div><div class='add'>+				*extval = chip-&gt;res_ex;</div><div class='add'>+			verbose_debug("get_response: %x, %x\n",</div><div class='add'>+				      chip-&gt;res, chip-&gt;res_ex);</div><div class='add'>+			if (chip-&gt;res_ex &amp; LOLA_RIRB_EX_ERROR) {</div><div class='add'>+				dev_warn(chip-&gt;card-&gt;dev, "RIRB ERROR: "</div><div class='add'>+				       "NID=%x, verb=%x, data=%x, ext=%x\n",</div><div class='add'>+				       chip-&gt;last_cmd_nid,</div><div class='add'>+				       chip-&gt;last_verb, chip-&gt;last_data,</div><div class='add'>+				       chip-&gt;last_extdata);</div><div class='add'>+				return -EIO;</div><div class='add'>+			}</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		if (time_after(jiffies, timeout))</div><div class='add'>+			break;</div><div class='add'>+		udelay(20);</div><div class='add'>+		cond_resched();</div><div class='add'>+	}</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "RIRB response error\n");</div><div class='add'>+	if (!chip-&gt;polling_mode) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "switching to polling mode\n");</div><div class='add'>+		chip-&gt;polling_mode = 1;</div><div class='add'>+		goto again;</div><div class='add'>+	}</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aynchronous write of a codec verb with data */</div><div class='add'>+int lola_codec_write(struct lola *chip, unsigned int nid, unsigned int verb,</div><div class='add'>+		     unsigned int data, unsigned int extdata)</div><div class='add'>+{</div><div class='add'>+	verbose_debug("codec_write NID=%x, verb=%x, data=%x, ext=%x\n",</div><div class='add'>+		      nid, verb, data, extdata);</div><div class='add'>+	return corb_send_verb(chip, nid, verb, data, extdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* write a codec verb with data and read the returned status */</div><div class='add'>+int lola_codec_read(struct lola *chip, unsigned int nid, unsigned int verb,</div><div class='add'>+		    unsigned int data, unsigned int extdata,</div><div class='add'>+		    unsigned int *val, unsigned int *extval)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	verbose_debug("codec_read NID=%x, verb=%x, data=%x, ext=%x\n",</div><div class='add'>+		      nid, verb, data, extdata);</div><div class='add'>+	err = corb_send_verb(chip, nid, verb, data, extdata);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = rirb_get_response(chip, val, extval);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* flush all pending codec writes */</div><div class='add'>+int lola_codec_flush(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+	return rirb_get_response(chip, &amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * interrupt handler</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t lola_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = dev_id;</div><div class='add'>+	unsigned int notify_ins, notify_outs, error_ins, error_outs;</div><div class='add'>+	int handled = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	notify_ins = notify_outs = error_ins = error_outs = 0;</div><div class='add'>+	spin_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	for (;;) {</div><div class='add'>+		unsigned int status, in_sts, out_sts;</div><div class='add'>+		unsigned int reg;</div><div class='add'>+</div><div class='add'>+		status = lola_readl(chip, BAR1, DINTSTS);</div><div class='add'>+		if (!status || status == -1)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		in_sts = lola_readl(chip, BAR1, DIINTSTS);</div><div class='add'>+		out_sts = lola_readl(chip, BAR1, DOINTSTS);</div><div class='add'>+</div><div class='add'>+		/* clear Input Interrupts */</div><div class='add'>+		for (i = 0; in_sts &amp;&amp; i &lt; chip-&gt;pcm[CAPT].num_streams; i++) {</div><div class='add'>+			if (!(in_sts &amp; (1 &lt;&lt; i)))</div><div class='add'>+				continue;</div><div class='add'>+			in_sts &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+			reg = lola_dsd_read(chip, i, STS);</div><div class='add'>+			if (reg &amp; LOLA_DSD_STS_DESE) /* error */</div><div class='add'>+				error_ins |= (1 &lt;&lt; i);</div><div class='add'>+			if (reg &amp; LOLA_DSD_STS_BCIS) /* notify */</div><div class='add'>+				notify_ins |= (1 &lt;&lt; i);</div><div class='add'>+			/* clear */</div><div class='add'>+			lola_dsd_write(chip, i, STS, reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* clear Output Interrupts */</div><div class='add'>+		for (i = 0; out_sts &amp;&amp; i &lt; chip-&gt;pcm[PLAY].num_streams; i++) {</div><div class='add'>+			if (!(out_sts &amp; (1 &lt;&lt; i)))</div><div class='add'>+				continue;</div><div class='add'>+			out_sts &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+			reg = lola_dsd_read(chip, i + MAX_STREAM_IN_COUNT, STS);</div><div class='add'>+			if (reg &amp; LOLA_DSD_STS_DESE) /* error */</div><div class='add'>+				error_outs |= (1 &lt;&lt; i);</div><div class='add'>+			if (reg &amp; LOLA_DSD_STS_BCIS) /* notify */</div><div class='add'>+				notify_outs |= (1 &lt;&lt; i);</div><div class='add'>+			lola_dsd_write(chip, i + MAX_STREAM_IN_COUNT, STS, reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; LOLA_DINT_CTRL) {</div><div class='add'>+			unsigned char rbsts; /* ring status is byte access */</div><div class='add'>+			rbsts = lola_readb(chip, BAR0, RIRBSTS);</div><div class='add'>+			rbsts &amp;= LOLA_RIRB_INT_MASK;</div><div class='add'>+			if (rbsts)</div><div class='add'>+				lola_writeb(chip, BAR0, RIRBSTS, rbsts);</div><div class='add'>+			rbsts = lola_readb(chip, BAR0, CORBSTS);</div><div class='add'>+			rbsts &amp;= LOLA_CORB_INT_MASK;</div><div class='add'>+			if (rbsts)</div><div class='add'>+				lola_writeb(chip, BAR0, CORBSTS, rbsts);</div><div class='add'>+</div><div class='add'>+			lola_update_rirb(chip);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; (LOLA_DINT_FIFOERR | LOLA_DINT_MUERR)) {</div><div class='add'>+			/* clear global fifo error interrupt */</div><div class='add'>+			lola_writel(chip, BAR1, DINTSTS,</div><div class='add'>+				    (status &amp; (LOLA_DINT_FIFOERR | LOLA_DINT_MUERR)));</div><div class='add'>+		}</div><div class='add'>+		handled = 1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	lola_pcm_update(chip, &amp;chip-&gt;pcm[CAPT], notify_ins);</div><div class='add'>+	lola_pcm_update(chip, &amp;chip-&gt;pcm[PLAY], notify_outs);</div><div class='add'>+</div><div class='add'>+	return IRQ_RETVAL(handled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * controller</div><div class='add'>+ */</div><div class='add'>+static int reset_controller(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int gctl = lola_readl(chip, BAR0, GCTL);</div><div class='add'>+	unsigned long end_time;</div><div class='add'>+</div><div class='add'>+	if (gctl) {</div><div class='add'>+		/* to be sure */</div><div class='add'>+		lola_writel(chip, BAR1, BOARD_MODE, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;cold_reset = 1;</div><div class='add'>+	lola_writel(chip, BAR0, GCTL, LOLA_GCTL_RESET);</div><div class='add'>+	end_time = jiffies + msecs_to_jiffies(200);</div><div class='add'>+	do {</div><div class='add'>+		msleep(1);</div><div class='add'>+		gctl = lola_readl(chip, BAR0, GCTL);</div><div class='add'>+		if (gctl)</div><div class='add'>+			break;</div><div class='add'>+	} while (time_before(jiffies, end_time));</div><div class='add'>+	if (!gctl) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "cannot reset controller\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_irq_enable(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	/* enalbe all I/O streams */</div><div class='add'>+	val = (1 &lt;&lt; chip-&gt;pcm[PLAY].num_streams) - 1;</div><div class='add'>+	lola_writel(chip, BAR1, DOINTCTL, val);</div><div class='add'>+	val = (1 &lt;&lt; chip-&gt;pcm[CAPT].num_streams) - 1;</div><div class='add'>+	lola_writel(chip, BAR1, DIINTCTL, val);</div><div class='add'>+</div><div class='add'>+	/* enable global irqs */</div><div class='add'>+	val = LOLA_DINT_GLOBAL | LOLA_DINT_CTRL | LOLA_DINT_FIFOERR |</div><div class='add'>+		LOLA_DINT_MUERR;</div><div class='add'>+	lola_writel(chip, BAR1, DINTCTL, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_irq_disable(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	lola_writel(chip, BAR1, DINTCTL, 0);</div><div class='add'>+	lola_writel(chip, BAR1, DIINTCTL, 0);</div><div class='add'>+	lola_writel(chip, BAR1, DOINTCTL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_corb_rirb(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned char tmp;</div><div class='add'>+	unsigned long end_time;</div><div class='add'>+</div><div class='add'>+	chip-&gt;rb = snd_devm_alloc_pages(&amp;chip-&gt;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					PAGE_SIZE);</div><div class='add'>+	if (!chip-&gt;rb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip-&gt;corb.addr = chip-&gt;rb-&gt;addr;</div><div class='add'>+	chip-&gt;corb.buf = (__le32 *)chip-&gt;rb-&gt;area;</div><div class='add'>+	chip-&gt;rirb.addr = chip-&gt;rb-&gt;addr + 2048;</div><div class='add'>+	chip-&gt;rirb.buf = (__le32 *)(chip-&gt;rb-&gt;area + 2048);</div><div class='add'>+</div><div class='add'>+	/* disable ringbuffer DMAs */</div><div class='add'>+	lola_writeb(chip, BAR0, RIRBCTL, 0);</div><div class='add'>+	lola_writeb(chip, BAR0, CORBCTL, 0);</div><div class='add'>+</div><div class='add'>+	end_time = jiffies + msecs_to_jiffies(200);</div><div class='add'>+	do {</div><div class='add'>+		if (!lola_readb(chip, BAR0, RIRBCTL) &amp;&amp;</div><div class='add'>+		    !lola_readb(chip, BAR0, CORBCTL))</div><div class='add'>+			break;</div><div class='add'>+		msleep(1);</div><div class='add'>+	} while (time_before(jiffies, end_time));</div><div class='add'>+</div><div class='add'>+	/* CORB set up */</div><div class='add'>+	lola_writel(chip, BAR0, CORBLBASE, (u32)chip-&gt;corb.addr);</div><div class='add'>+	lola_writel(chip, BAR0, CORBUBASE, upper_32_bits(chip-&gt;corb.addr));</div><div class='add'>+	/* set the corb size to 256 entries */</div><div class='add'>+	lola_writeb(chip, BAR0, CORBSIZE, 0x02);</div><div class='add'>+	/* set the corb write pointer to 0 */</div><div class='add'>+	lola_writew(chip, BAR0, CORBWP, 0);</div><div class='add'>+	/* reset the corb hw read pointer */</div><div class='add'>+	lola_writew(chip, BAR0, CORBRP, LOLA_RBRWP_CLR);</div><div class='add'>+	/* enable corb dma */</div><div class='add'>+	lola_writeb(chip, BAR0, CORBCTL, LOLA_RBCTL_DMA_EN);</div><div class='add'>+	/* clear flags if set */</div><div class='add'>+	tmp = lola_readb(chip, BAR0, CORBSTS) &amp; LOLA_CORB_INT_MASK;</div><div class='add'>+	if (tmp)</div><div class='add'>+		lola_writeb(chip, BAR0, CORBSTS, tmp);</div><div class='add'>+	chip-&gt;corb.wp = 0;</div><div class='add'>+</div><div class='add'>+	/* RIRB set up */</div><div class='add'>+	lola_writel(chip, BAR0, RIRBLBASE, (u32)chip-&gt;rirb.addr);</div><div class='add'>+	lola_writel(chip, BAR0, RIRBUBASE, upper_32_bits(chip-&gt;rirb.addr));</div><div class='add'>+	/* set the rirb size to 256 entries */</div><div class='add'>+	lola_writeb(chip, BAR0, RIRBSIZE, 0x02);</div><div class='add'>+	/* reset the rirb hw write pointer */</div><div class='add'>+	lola_writew(chip, BAR0, RIRBWP, LOLA_RBRWP_CLR);</div><div class='add'>+	/* set N=1, get RIRB response interrupt for new entry */</div><div class='add'>+	lola_writew(chip, BAR0, RINTCNT, 1);</div><div class='add'>+	/* enable rirb dma and response irq */</div><div class='add'>+	lola_writeb(chip, BAR0, RIRBCTL, LOLA_RBCTL_DMA_EN | LOLA_RBCTL_IRQ_EN);</div><div class='add'>+	/* clear flags if set */</div><div class='add'>+	tmp =  lola_readb(chip, BAR0, RIRBSTS) &amp; LOLA_RIRB_INT_MASK;</div><div class='add'>+	if (tmp)</div><div class='add'>+		lola_writeb(chip, BAR0, RIRBSTS, tmp);</div><div class='add'>+	chip-&gt;rirb.rp = chip-&gt;rirb.cmds = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void stop_corb_rirb(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	/* disable ringbuffer DMAs */</div><div class='add'>+	lola_writeb(chip, BAR0, RIRBCTL, 0);</div><div class='add'>+	lola_writeb(chip, BAR0, CORBCTL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_reset_setups(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	/* update the granularity */</div><div class='add'>+	lola_set_granularity(chip, chip-&gt;granularity, true);</div><div class='add'>+	/* update the sample clock */</div><div class='add'>+	lola_set_clock_index(chip, chip-&gt;clock.cur_index);</div><div class='add'>+	/* enable unsolicited events of the clock widget */</div><div class='add'>+	lola_enable_clock_events(chip);</div><div class='add'>+	/* update the analog gains */</div><div class='add'>+	lola_setup_all_analog_gains(chip, CAPT, false); /* input, update */</div><div class='add'>+	/* update SRC configuration if applicable */</div><div class='add'>+	lola_set_src_config(chip, chip-&gt;input_src_mask, false);</div><div class='add'>+	/* update the analog outputs */</div><div class='add'>+	lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_parse_tree(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int nid, err;</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, 0, LOLA_PAR_VENDOR_ID, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read VENDOR_ID\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	val &gt;&gt;= 16;</div><div class='add'>+	if (val != 0x1369) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Unknown codec vendor 0x%x\n", val);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, 1, LOLA_PAR_FUNCTION_TYPE, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read FUNCTION_TYPE\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (val != 1) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Unknown function type %d\n", val);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, 1, LOLA_PAR_SPECIFIC_CAPS, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read SPECCAPS\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;lola_caps = val;</div><div class='add'>+	chip-&gt;pin[CAPT].num_pins = LOLA_AFG_INPUT_PIN_COUNT(chip-&gt;lola_caps);</div><div class='add'>+	chip-&gt;pin[PLAY].num_pins = LOLA_AFG_OUTPUT_PIN_COUNT(chip-&gt;lola_caps);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "speccaps=0x%x, pins in=%d, out=%d\n",</div><div class='add'>+		    chip-&gt;lola_caps,</div><div class='add'>+		    chip-&gt;pin[CAPT].num_pins, chip-&gt;pin[PLAY].num_pins);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;pin[CAPT].num_pins &gt; MAX_AUDIO_INOUT_COUNT ||</div><div class='add'>+	    chip-&gt;pin[PLAY].num_pins &gt; MAX_AUDIO_INOUT_COUNT) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Invalid Lola-spec caps 0x%x\n", val);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nid = 0x02;</div><div class='add'>+	err = lola_init_pcm(chip, CAPT, &amp;nid);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = lola_init_pcm(chip, PLAY, &amp;nid);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_init_pins(chip, CAPT, &amp;nid);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = lola_init_pins(chip, PLAY, &amp;nid);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (LOLA_AFG_CLOCK_WIDGET_PRESENT(chip-&gt;lola_caps)) {</div><div class='add'>+		err = lola_init_clock_widget(chip, nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		nid++;</div><div class='add'>+	}</div><div class='add'>+	if (LOLA_AFG_MIXER_WIDGET_PRESENT(chip-&gt;lola_caps)) {</div><div class='add'>+		err = lola_init_mixer_widget(chip, nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		nid++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable unsolicited events of the clock widget */</div><div class='add'>+	err = lola_enable_clock_events(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* if last ResetController was not a ColdReset, we don't know</div><div class='add'>+	 * the state of the card; initialize here again</div><div class='add'>+	 */</div><div class='add'>+	if (!chip-&gt;cold_reset) {</div><div class='add'>+		lola_reset_setups(chip);</div><div class='add'>+		chip-&gt;cold_reset = 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* set the granularity if it is not the default */</div><div class='add'>+		if (chip-&gt;granularity != LOLA_GRANULARITY_MIN)</div><div class='add'>+			lola_set_granularity(chip, chip-&gt;granularity, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_stop_hw(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	stop_corb_rirb(chip);</div><div class='add'>+	lola_irq_disable(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_free(struct snd_card *card)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;initialized)</div><div class='add'>+		lola_stop_hw(chip);</div><div class='add'>+	lola_free_mixer(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = card-&gt;private_data;</div><div class='add'>+	int err;</div><div class='add'>+	unsigned int dever;</div><div class='add'>+	void __iomem *iomem;</div><div class='add'>+</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mutex_init(&amp;chip-&gt;open_mutex);</div><div class='add'>+	chip-&gt;card = card;</div><div class='add'>+	chip-&gt;pci = pci;</div><div class='add'>+	chip-&gt;irq = -1;</div><div class='add'>+	card-&gt;private_free = lola_free;</div><div class='add'>+</div><div class='add'>+	chip-&gt;granularity = granularity[dev];</div><div class='add'>+	switch (chip-&gt;granularity) {</div><div class='add'>+	case 8:</div><div class='add'>+		chip-&gt;sample_rate_max = 48000;</div><div class='add'>+		break;</div><div class='add'>+	case 16:</div><div class='add'>+		chip-&gt;sample_rate_max = 96000;</div><div class='add'>+		break;</div><div class='add'>+	case 32:</div><div class='add'>+		chip-&gt;sample_rate_max = 192000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			   "Invalid granularity %d, reset to %d\n",</div><div class='add'>+			   chip-&gt;granularity, LOLA_GRANULARITY_MAX);</div><div class='add'>+		chip-&gt;granularity = LOLA_GRANULARITY_MAX;</div><div class='add'>+		chip-&gt;sample_rate_max = 192000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;sample_rate_min = sample_rate_min[dev];</div><div class='add'>+	if (chip-&gt;sample_rate_min &gt; chip-&gt;sample_rate_max) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='add'>+			   "Invalid sample_rate_min %d, reset to 16000\n",</div><div class='add'>+			   chip-&gt;sample_rate_min);</div><div class='add'>+		chip-&gt;sample_rate_min = 16000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iomem = pcim_iomap_region(pci, 0, DRVNAME);</div><div class='add'>+	if (IS_ERR(iomem))</div><div class='add'>+		return PTR_ERR(iomem);</div><div class='add'>+</div><div class='add'>+	chip-&gt;bar[0].remap_addr = iomem;</div><div class='add'>+	chip-&gt;bar[0].addr = pci_resource_start(pci, 0);</div><div class='add'>+</div><div class='add'>+	iomem = pcim_iomap_region(pci, 2, DRVNAME);</div><div class='add'>+	if (IS_ERR(iomem))</div><div class='add'>+		return PTR_ERR(iomem);</div><div class='add'>+</div><div class='add'>+	chip-&gt;bar[1].remap_addr = iomem;</div><div class='add'>+	chip-&gt;bar[1].addr = pci_resource_start(pci, 2);</div><div class='add'>+</div><div class='add'>+	pci_set_master(pci);</div><div class='add'>+</div><div class='add'>+	err = reset_controller(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (devm_request_irq(&amp;pci-&gt;dev, pci-&gt;irq, lola_interrupt, IRQF_SHARED,</div><div class='add'>+			     KBUILD_MODNAME, chip)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;irq = pci-&gt;irq;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+</div><div class='add'>+	dever = lola_readl(chip, BAR1, DEVER);</div><div class='add'>+	chip-&gt;pcm[CAPT].num_streams = (dever &gt;&gt; 0) &amp; 0x3ff;</div><div class='add'>+	chip-&gt;pcm[PLAY].num_streams = (dever &gt;&gt; 10) &amp; 0x3ff;</div><div class='add'>+	chip-&gt;version = (dever &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "streams in=%d, out=%d, version=0x%x\n",</div><div class='add'>+		    chip-&gt;pcm[CAPT].num_streams, chip-&gt;pcm[PLAY].num_streams,</div><div class='add'>+		    chip-&gt;version);</div><div class='add'>+</div><div class='add'>+	/* Test LOLA_BAR1_DEVER */</div><div class='add'>+	if (chip-&gt;pcm[CAPT].num_streams &gt; MAX_STREAM_IN_COUNT ||</div><div class='add'>+	    chip-&gt;pcm[PLAY].num_streams &gt; MAX_STREAM_OUT_COUNT ||</div><div class='add'>+	    (!chip-&gt;pcm[CAPT].num_streams &amp;&amp;</div><div class='add'>+	     !chip-&gt;pcm[PLAY].num_streams)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "invalid DEVER = %x\n", dever);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = setup_corb_rirb(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	strscpy(card-&gt;driver, "Lola");</div><div class='add'>+	strscpy(card-&gt;shortname, "Digigram Lola", sizeof(card-&gt;shortname));</div><div class='add'>+	snprintf(card-&gt;longname, sizeof(card-&gt;longname),</div><div class='add'>+		 "%s at 0x%lx irq %i",</div><div class='add'>+		 card-&gt;shortname, chip-&gt;bar[0].addr, chip-&gt;irq);</div><div class='add'>+	strscpy(card-&gt;mixername, card-&gt;shortname);</div><div class='add'>+</div><div class='add'>+	lola_irq_enable(chip);</div><div class='add'>+</div><div class='add'>+	chip-&gt;initialized = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __lola_probe(struct pci_dev *pci,</div><div class='add'>+			const struct pci_device_id *pci_id)</div><div class='add'>+{</div><div class='add'>+	static int dev;</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct lola *chip;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dev &gt;= SNDRV_CARDS)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	if (!enable[dev]) {</div><div class='add'>+		dev++;</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;pci-&gt;dev, "Error creating card!\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='add'>+</div><div class='add'>+	err = lola_create(card, pci, dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_parse_tree(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_create_pcm(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_create_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	lola_proc_debug_new(chip);</div><div class='add'>+</div><div class='add'>+	err = snd_card_register(card);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pci, card);</div><div class='add'>+	dev++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_probe(struct pci_dev *pci,</div><div class='add'>+		      const struct pci_device_id *pci_id)</div><div class='add'>+{</div><div class='add'>+	return snd_card_free_on_error(&amp;pci-&gt;dev, __lola_probe(pci, pci_id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PCI IDs */</div><div class='add'>+static const struct pci_device_id lola_ids[] = {</div><div class='add'>+	{ PCI_VDEVICE(DIGIGRAM, 0x0001) },</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, lola_ids);</div><div class='add'>+</div><div class='add'>+/* pci_driver definition */</div><div class='add'>+static struct pci_driver lola_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.id_table = lola_ids,</div><div class='add'>+	.probe = lola_probe,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(lola_driver);</div><div class='head'>diff --git a/sound/pci/lola/lola.h b/sound/pci/lola/lola.h<br/>new file mode 100644<br/>index 000000000000..25f72f9e3f9b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola.h</a></div><div class='hunk'>@@ -0,0 +1,511 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _LOLA_H</div><div class='add'>+#define _LOLA_H</div><div class='add'>+</div><div class='add'>+#define DRVNAME	"snd-lola"</div><div class='add'>+#define SFX	DRVNAME ": "</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lola HD Audio Registers BAR0</div><div class='add'>+ */</div><div class='add'>+#define LOLA_BAR0_GCAP		0x00</div><div class='add'>+#define LOLA_BAR0_VMIN		0x02</div><div class='add'>+#define LOLA_BAR0_VMAJ		0x03</div><div class='add'>+#define LOLA_BAR0_OUTPAY	0x04</div><div class='add'>+#define LOLA_BAR0_INPAY		0x06</div><div class='add'>+#define LOLA_BAR0_GCTL		0x08</div><div class='add'>+#define LOLA_BAR0_WAKEEN	0x0c</div><div class='add'>+#define LOLA_BAR0_STATESTS	0x0e</div><div class='add'>+#define LOLA_BAR0_GSTS		0x10</div><div class='add'>+#define LOLA_BAR0_OUTSTRMPAY	0x18</div><div class='add'>+#define LOLA_BAR0_INSTRMPAY	0x1a</div><div class='add'>+#define LOLA_BAR0_INTCTL	0x20</div><div class='add'>+#define LOLA_BAR0_INTSTS	0x24</div><div class='add'>+#define LOLA_BAR0_WALCLK	0x30</div><div class='add'>+#define LOLA_BAR0_SSYNC		0x38</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR0_CORBLBASE	0x40</div><div class='add'>+#define LOLA_BAR0_CORBUBASE	0x44</div><div class='add'>+#define LOLA_BAR0_CORBWP	0x48	/* no ULONG access */</div><div class='add'>+#define LOLA_BAR0_CORBRP	0x4a	/* no ULONG access */</div><div class='add'>+#define LOLA_BAR0_CORBCTL	0x4c	/* no ULONG access */</div><div class='add'>+#define LOLA_BAR0_CORBSTS	0x4d	/* UCHAR access only */</div><div class='add'>+#define LOLA_BAR0_CORBSIZE	0x4e	/* no ULONG access */</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR0_RIRBLBASE	0x50</div><div class='add'>+#define LOLA_BAR0_RIRBUBASE	0x54</div><div class='add'>+#define LOLA_BAR0_RIRBWP	0x58</div><div class='add'>+#define LOLA_BAR0_RINTCNT	0x5a	/* no ULONG access */</div><div class='add'>+#define LOLA_BAR0_RIRBCTL	0x5c</div><div class='add'>+#define LOLA_BAR0_RIRBSTS	0x5d	/* UCHAR access only */</div><div class='add'>+#define LOLA_BAR0_RIRBSIZE	0x5e	/* no ULONG access */</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR0_ICW		0x60</div><div class='add'>+#define LOLA_BAR0_IRR		0x64</div><div class='add'>+#define LOLA_BAR0_ICS		0x68</div><div class='add'>+#define LOLA_BAR0_DPLBASE	0x70</div><div class='add'>+#define LOLA_BAR0_DPUBASE	0x74</div><div class='add'>+</div><div class='add'>+/* stream register offsets from stream base 0x80 */</div><div class='add'>+#define LOLA_BAR0_SD0_OFFSET	0x80</div><div class='add'>+#define LOLA_REG0_SD_CTL	0x00</div><div class='add'>+#define LOLA_REG0_SD_STS	0x03</div><div class='add'>+#define LOLA_REG0_SD_LPIB	0x04</div><div class='add'>+#define LOLA_REG0_SD_CBL	0x08</div><div class='add'>+#define LOLA_REG0_SD_LVI	0x0c</div><div class='add'>+#define LOLA_REG0_SD_FIFOW	0x0e</div><div class='add'>+#define LOLA_REG0_SD_FIFOSIZE	0x10</div><div class='add'>+#define LOLA_REG0_SD_FORMAT	0x12</div><div class='add'>+#define LOLA_REG0_SD_BDLPL	0x18</div><div class='add'>+#define LOLA_REG0_SD_BDLPU	0x1c</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lola Digigram Registers BAR1</div><div class='add'>+ */</div><div class='add'>+#define LOLA_BAR1_FPGAVER	0x00</div><div class='add'>+#define LOLA_BAR1_DEVER		0x04</div><div class='add'>+#define LOLA_BAR1_UCBMV		0x08</div><div class='add'>+#define LOLA_BAR1_JTAG		0x0c</div><div class='add'>+#define LOLA_BAR1_UARTRX	0x10</div><div class='add'>+#define LOLA_BAR1_UARTTX	0x14</div><div class='add'>+#define LOLA_BAR1_UARTCR	0x18</div><div class='add'>+#define LOLA_BAR1_NVRAMVER	0x1c</div><div class='add'>+#define LOLA_BAR1_CTRLSPI	0x20</div><div class='add'>+#define LOLA_BAR1_DSPI		0x24</div><div class='add'>+#define LOLA_BAR1_AISPI		0x28</div><div class='add'>+#define LOLA_BAR1_GRAN		0x2c</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_DINTCTL	0x80</div><div class='add'>+#define LOLA_BAR1_DIINTCTL	0x84</div><div class='add'>+#define LOLA_BAR1_DOINTCTL	0x88</div><div class='add'>+#define LOLA_BAR1_LRC		0x90</div><div class='add'>+#define LOLA_BAR1_DINTSTS	0x94</div><div class='add'>+#define LOLA_BAR1_DIINTSTS	0x98</div><div class='add'>+#define LOLA_BAR1_DOINTSTS	0x9c</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_DSD0_OFFSET	0xa0</div><div class='add'>+#define LOLA_BAR1_DSD_SIZE	0x18</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_DSDnSTS       0x00</div><div class='add'>+#define LOLA_BAR1_DSDnLPIB      0x04</div><div class='add'>+#define LOLA_BAR1_DSDnCTL       0x08</div><div class='add'>+#define LOLA_BAR1_DSDnLVI       0x0c</div><div class='add'>+#define LOLA_BAR1_DSDnBDPL      0x10</div><div class='add'>+#define LOLA_BAR1_DSDnBDPU      0x14</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_SSYNC		0x03e8</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_BOARD_CTRL	0x0f00</div><div class='add'>+#define LOLA_BAR1_BOARD_MODE	0x0f02</div><div class='add'>+</div><div class='add'>+#define LOLA_BAR1_SOURCE_GAIN_ENABLE		0x1000</div><div class='add'>+#define LOLA_BAR1_DEST00_MIX_GAIN_ENABLE	0x1004</div><div class='add'>+#define LOLA_BAR1_DEST31_MIX_GAIN_ENABLE	0x1080</div><div class='add'>+#define LOLA_BAR1_SOURCE00_01_GAIN		0x1084</div><div class='add'>+#define LOLA_BAR1_SOURCE30_31_GAIN		0x10c0</div><div class='add'>+#define LOLA_BAR1_SOURCE_GAIN(src) \</div><div class='add'>+	(LOLA_BAR1_SOURCE00_01_GAIN + (src) * 2)</div><div class='add'>+#define LOLA_BAR1_DEST00_MIX00_01_GAIN		0x10c4</div><div class='add'>+#define LOLA_BAR1_DEST00_MIX30_31_GAIN		0x1100</div><div class='add'>+#define LOLA_BAR1_DEST01_MIX00_01_GAIN		0x1104</div><div class='add'>+#define LOLA_BAR1_DEST01_MIX30_31_GAIN		0x1140</div><div class='add'>+#define LOLA_BAR1_DEST31_MIX00_01_GAIN		0x1884</div><div class='add'>+#define LOLA_BAR1_DEST31_MIX30_31_GAIN		0x18c0</div><div class='add'>+#define LOLA_BAR1_MIX_GAIN(dest, mix) \</div><div class='add'>+	(LOLA_BAR1_DEST00_MIX00_01_GAIN + (dest) * 0x40 + (mix) * 2)</div><div class='add'>+#define LOLA_BAR1_ANALOG_CLIP_IN		0x18c4</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_SOURCE00_01	0x18c8</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_SOURCE30_31	0x1904</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_SOURCE(src) \</div><div class='add'>+	(LOLA_BAR1_PEAKMETERS_SOURCE00_01 + (src) * 2)</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_DEST00_01		0x1908</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_DEST30_31		0x1944</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_DEST(dest) \</div><div class='add'>+	(LOLA_BAR1_PEAKMETERS_DEST00_01 + (dest) * 2)</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_AGC00_01		0x1948</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_AGC14_15		0x1964</div><div class='add'>+#define LOLA_BAR1_PEAKMETERS_AGC(x) \</div><div class='add'>+	(LOLA_BAR1_PEAKMETERS_AGC00_01 + (x) * 2)</div><div class='add'>+</div><div class='add'>+/* GCTL reset bit */</div><div class='add'>+#define LOLA_GCTL_RESET		(1 &lt;&lt; 0)</div><div class='add'>+/* GCTL unsolicited response enable bit */</div><div class='add'>+#define LOLA_GCTL_UREN		(1 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/* CORB/RIRB control, read/write pointer */</div><div class='add'>+#define LOLA_RBCTL_DMA_EN	0x02	/* enable DMA */</div><div class='add'>+#define LOLA_RBCTL_IRQ_EN	0x01	/* enable IRQ */</div><div class='add'>+#define LOLA_RBRWP_CLR		0x8000	/* read/write pointer clear */</div><div class='add'>+</div><div class='add'>+#define LOLA_RIRB_EX_UNSOL_EV	0x40000000</div><div class='add'>+#define LOLA_RIRB_EX_ERROR	0x80000000</div><div class='add'>+</div><div class='add'>+/* CORB int mask: CMEI[0] */</div><div class='add'>+#define LOLA_CORB_INT_CMEI	0x01</div><div class='add'>+#define LOLA_CORB_INT_MASK	LOLA_CORB_INT_CMEI</div><div class='add'>+</div><div class='add'>+/* RIRB int mask: overrun[2], response[0] */</div><div class='add'>+#define LOLA_RIRB_INT_RESPONSE	0x01</div><div class='add'>+#define LOLA_RIRB_INT_OVERRUN	0x04</div><div class='add'>+#define LOLA_RIRB_INT_MASK	(LOLA_RIRB_INT_RESPONSE | LOLA_RIRB_INT_OVERRUN)</div><div class='add'>+</div><div class='add'>+/* DINTCTL and DINTSTS */</div><div class='add'>+#define LOLA_DINT_GLOBAL	0x80000000 /* global interrupt enable bit */</div><div class='add'>+#define LOLA_DINT_CTRL		0x40000000 /* controller interrupt enable bit */</div><div class='add'>+#define LOLA_DINT_FIFOERR	0x20000000 /* global fifo error enable bit */</div><div class='add'>+#define LOLA_DINT_MUERR		0x10000000 /* global microcontroller underrun error */</div><div class='add'>+</div><div class='add'>+/* DSDnCTL bits */</div><div class='add'>+#define LOLA_DSD_CTL_SRST	0x01	/* stream reset bit */</div><div class='add'>+#define LOLA_DSD_CTL_SRUN	0x02	/* stream DMA start bit */</div><div class='add'>+#define LOLA_DSD_CTL_IOCE	0x04	/* interrupt on completion enable */</div><div class='add'>+#define LOLA_DSD_CTL_DEIE	0x10	/* descriptor error interrupt enable */</div><div class='add'>+#define LOLA_DSD_CTL_VLRCV	0x20	/* valid LRCountValue information in bits 8..31 */</div><div class='add'>+#define LOLA_LRC_MASK		0xffffff00</div><div class='add'>+</div><div class='add'>+/* DSDnSTS */</div><div class='add'>+#define LOLA_DSD_STS_BCIS	0x04	/* buffer completion interrupt status */</div><div class='add'>+#define LOLA_DSD_STS_DESE	0x10	/* descriptor error interrupt */</div><div class='add'>+#define LOLA_DSD_STS_FIFORDY	0x20	/* fifo ready */</div><div class='add'>+</div><div class='add'>+#define LOLA_CORB_ENTRIES	256</div><div class='add'>+</div><div class='add'>+#define MAX_STREAM_IN_COUNT	16</div><div class='add'>+#define MAX_STREAM_OUT_COUNT	16</div><div class='add'>+#define MAX_STREAM_COUNT	16</div><div class='add'>+#define MAX_PINS		MAX_STREAM_COUNT</div><div class='add'>+#define MAX_STREAM_BUFFER_COUNT	16</div><div class='add'>+#define MAX_AUDIO_INOUT_COUNT	16</div><div class='add'>+</div><div class='add'>+#define LOLA_CLOCK_TYPE_INTERNAL    0</div><div class='add'>+#define LOLA_CLOCK_TYPE_AES         1</div><div class='add'>+#define LOLA_CLOCK_TYPE_AES_SYNC    2</div><div class='add'>+#define LOLA_CLOCK_TYPE_WORDCLOCK   3</div><div class='add'>+#define LOLA_CLOCK_TYPE_ETHERSOUND  4</div><div class='add'>+#define LOLA_CLOCK_TYPE_VIDEO       5</div><div class='add'>+</div><div class='add'>+#define LOLA_CLOCK_FORMAT_NONE      0</div><div class='add'>+#define LOLA_CLOCK_FORMAT_NTSC      1</div><div class='add'>+#define LOLA_CLOCK_FORMAT_PAL       2</div><div class='add'>+</div><div class='add'>+#define MAX_SAMPLE_CLOCK_COUNT  48</div><div class='add'>+</div><div class='add'>+/* parameters used with mixer widget's mixer capabilities */</div><div class='add'>+#define LOLA_PEAK_METER_CAN_AGC_MASK		1</div><div class='add'>+#define LOLA_PEAK_METER_CAN_ANALOG_CLIP_MASK	2</div><div class='add'>+</div><div class='add'>+struct lola_bar {</div><div class='add'>+	unsigned long addr;</div><div class='add'>+	void __iomem *remap_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CORB/RIRB */</div><div class='add'>+struct lola_rb {</div><div class='add'>+	__le32 *buf;		/* CORB/RIRB buffer, 8 byte per each entry */</div><div class='add'>+	dma_addr_t addr;	/* physical address of CORB/RIRB buffer */</div><div class='add'>+	unsigned short rp, wp;	/* read/write pointers */</div><div class='add'>+	int cmds;		/* number of pending requests */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Pin widget setup */</div><div class='add'>+struct lola_pin {</div><div class='add'>+	unsigned int nid;</div><div class='add'>+	bool is_analog;</div><div class='add'>+	unsigned int amp_mute;</div><div class='add'>+	unsigned int amp_step_size;</div><div class='add'>+	unsigned int amp_num_steps;</div><div class='add'>+	unsigned int amp_offset;</div><div class='add'>+	unsigned int max_level;</div><div class='add'>+	unsigned int config_default_reg;</div><div class='add'>+	unsigned int fixed_gain_list_len;</div><div class='add'>+	unsigned int cur_gain_step;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lola_pin_array {</div><div class='add'>+	unsigned int num_pins;</div><div class='add'>+	unsigned int num_analog_pins;</div><div class='add'>+	struct lola_pin pins[MAX_PINS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Clock widget setup */</div><div class='add'>+struct lola_sample_clock {</div><div class='add'>+	unsigned int type;</div><div class='add'>+	unsigned int format;</div><div class='add'>+	unsigned int freq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lola_clock_widget {</div><div class='add'>+	unsigned int nid;</div><div class='add'>+	unsigned int items;</div><div class='add'>+	unsigned int cur_index;</div><div class='add'>+	unsigned int cur_freq;</div><div class='add'>+	bool cur_valid;</div><div class='add'>+	struct lola_sample_clock sample_clock[MAX_SAMPLE_CLOCK_COUNT];</div><div class='add'>+	unsigned int idx_lookup[MAX_SAMPLE_CLOCK_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LOLA_MIXER_DIM      32</div><div class='add'>+struct lola_mixer_array {</div><div class='add'>+	u32 src_gain_enable;</div><div class='add'>+	u32 dest_mix_gain_enable[LOLA_MIXER_DIM];</div><div class='add'>+	u16 src_gain[LOLA_MIXER_DIM];</div><div class='add'>+	u16 dest_mix_gain[LOLA_MIXER_DIM][LOLA_MIXER_DIM];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mixer widget setup */</div><div class='add'>+struct lola_mixer_widget {</div><div class='add'>+	unsigned int nid;</div><div class='add'>+	unsigned int caps;</div><div class='add'>+	struct lola_mixer_array __iomem *array;</div><div class='add'>+	struct lola_mixer_array *array_saved;</div><div class='add'>+	unsigned int src_stream_outs;</div><div class='add'>+	unsigned int src_phys_ins;</div><div class='add'>+	unsigned int dest_stream_ins;</div><div class='add'>+	unsigned int dest_phys_outs;</div><div class='add'>+	unsigned int src_stream_out_ofs;</div><div class='add'>+	unsigned int dest_phys_out_ofs;</div><div class='add'>+	unsigned int src_mask;</div><div class='add'>+	unsigned int dest_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Audio stream */</div><div class='add'>+struct lola_stream {</div><div class='add'>+	unsigned int nid;	/* audio widget NID */</div><div class='add'>+	unsigned int index;	/* array index */</div><div class='add'>+	unsigned int dsd;	/* DSD index */</div><div class='add'>+	bool can_float;</div><div class='add'>+	struct snd_pcm_substream *substream; /* assigned PCM substream */</div><div class='add'>+	struct lola_stream *master;	/* master stream (for multi-channel) */</div><div class='add'>+</div><div class='add'>+	/* buffer setup */</div><div class='add'>+	unsigned int bufsize;</div><div class='add'>+	unsigned int period_bytes;</div><div class='add'>+	unsigned int frags;</div><div class='add'>+</div><div class='add'>+	/* format + channel setup */</div><div class='add'>+	unsigned int format_verb;</div><div class='add'>+</div><div class='add'>+	/* flags */</div><div class='add'>+	unsigned int opened:1;</div><div class='add'>+	unsigned int prepared:1;</div><div class='add'>+	unsigned int paused:1;</div><div class='add'>+	unsigned int running:1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PLAY	SNDRV_PCM_STREAM_PLAYBACK</div><div class='add'>+#define CAPT	SNDRV_PCM_STREAM_CAPTURE</div><div class='add'>+</div><div class='add'>+struct lola_pcm {</div><div class='add'>+	unsigned int num_streams;</div><div class='add'>+	struct snd_dma_buffer *bdl; /* BDL buffer */</div><div class='add'>+	struct lola_stream streams[MAX_STREAM_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* card instance */</div><div class='add'>+struct lola {</div><div class='add'>+	struct snd_card *card;</div><div class='add'>+	struct pci_dev *pci;</div><div class='add'>+</div><div class='add'>+	/* pci resources */</div><div class='add'>+	struct lola_bar bar[2];</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	/* locks */</div><div class='add'>+	spinlock_t reg_lock;</div><div class='add'>+	struct mutex open_mutex;</div><div class='add'>+</div><div class='add'>+	/* CORB/RIRB */</div><div class='add'>+	struct lola_rb corb;</div><div class='add'>+	struct lola_rb rirb;</div><div class='add'>+	unsigned int res, res_ex;	/* last read values */</div><div class='add'>+	/* last command (for debugging) */</div><div class='add'>+	unsigned int last_cmd_nid, last_verb, last_data, last_extdata;</div><div class='add'>+</div><div class='add'>+	/* CORB/RIRB buffers */</div><div class='add'>+	struct snd_dma_buffer *rb;</div><div class='add'>+</div><div class='add'>+	/* unsolicited events */</div><div class='add'>+	unsigned int last_unsol_res;</div><div class='add'>+</div><div class='add'>+	/* streams */</div><div class='add'>+	struct lola_pcm pcm[2];</div><div class='add'>+</div><div class='add'>+	/* input src */</div><div class='add'>+	unsigned int input_src_caps_mask;</div><div class='add'>+	unsigned int input_src_mask;</div><div class='add'>+</div><div class='add'>+	/* pins */</div><div class='add'>+	struct lola_pin_array pin[2];</div><div class='add'>+</div><div class='add'>+	/* clock */</div><div class='add'>+	struct lola_clock_widget clock;</div><div class='add'>+	int ref_count_rate;</div><div class='add'>+	unsigned int sample_rate;</div><div class='add'>+</div><div class='add'>+	/* mixer */</div><div class='add'>+	struct lola_mixer_widget mixer;</div><div class='add'>+</div><div class='add'>+	/* hw info */</div><div class='add'>+	unsigned int version;</div><div class='add'>+	unsigned int lola_caps;</div><div class='add'>+</div><div class='add'>+	/* parameters */</div><div class='add'>+	unsigned int granularity;</div><div class='add'>+	unsigned int sample_rate_min;</div><div class='add'>+	unsigned int sample_rate_max;</div><div class='add'>+</div><div class='add'>+	/* flags */</div><div class='add'>+	unsigned int initialized:1;</div><div class='add'>+	unsigned int cold_reset:1;</div><div class='add'>+	unsigned int polling_mode:1;</div><div class='add'>+</div><div class='add'>+	/* for debugging */</div><div class='add'>+	unsigned int debug_res;</div><div class='add'>+	unsigned int debug_res_ex;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BAR0	0</div><div class='add'>+#define BAR1	1</div><div class='add'>+</div><div class='add'>+/* Helper macros */</div><div class='add'>+#define lola_readl(chip, idx, name) \</div><div class='add'>+	readl((chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+#define lola_readw(chip, idx, name) \</div><div class='add'>+	readw((chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+#define lola_readb(chip, idx, name) \</div><div class='add'>+	readb((chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+#define lola_writel(chip, idx, name, val) \</div><div class='add'>+	writel((val), (chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+#define lola_writew(chip, idx, name, val) \</div><div class='add'>+	writew((val), (chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+#define lola_writeb(chip, idx, name, val) \</div><div class='add'>+	writeb((val), (chip)-&gt;bar[idx].remap_addr + LOLA_##idx##_##name)</div><div class='add'>+</div><div class='add'>+#define lola_dsd_read(chip, dsd, name) \</div><div class='add'>+	readl((chip)-&gt;bar[BAR1].remap_addr + LOLA_BAR1_DSD0_OFFSET + \</div><div class='add'>+	      (LOLA_BAR1_DSD_SIZE * (dsd)) + LOLA_BAR1_DSDn##name)</div><div class='add'>+#define lola_dsd_write(chip, dsd, name, val) \</div><div class='add'>+	writel((val), (chip)-&gt;bar[BAR1].remap_addr + LOLA_BAR1_DSD0_OFFSET + \</div><div class='add'>+	       (LOLA_BAR1_DSD_SIZE * (dsd)) + LOLA_BAR1_DSDn##name)</div><div class='add'>+</div><div class='add'>+/* GET verbs HDAudio */</div><div class='add'>+#define LOLA_VERB_GET_STREAM_FORMAT		0xa00</div><div class='add'>+#define LOLA_VERB_GET_AMP_GAIN_MUTE		0xb00</div><div class='add'>+#define LOLA_VERB_PARAMETERS			0xf00</div><div class='add'>+#define LOLA_VERB_GET_POWER_STATE		0xf05</div><div class='add'>+#define LOLA_VERB_GET_CONV			0xf06</div><div class='add'>+#define LOLA_VERB_GET_UNSOLICITED_RESPONSE	0xf08</div><div class='add'>+#define LOLA_VERB_GET_DIGI_CONVERT_1		0xf0d</div><div class='add'>+#define LOLA_VERB_GET_CONFIG_DEFAULT		0xf1c</div><div class='add'>+#define LOLA_VERB_GET_SUBSYSTEM_ID		0xf20</div><div class='add'>+/* GET verbs Digigram */</div><div class='add'>+#define LOLA_VERB_GET_FIXED_GAIN		0xfc0</div><div class='add'>+#define LOLA_VERB_GET_GAIN_SELECT		0xfc1</div><div class='add'>+#define LOLA_VERB_GET_MAX_LEVEL			0xfc2</div><div class='add'>+#define LOLA_VERB_GET_CLOCK_LIST		0xfc3</div><div class='add'>+#define LOLA_VERB_GET_CLOCK_SELECT		0xfc4</div><div class='add'>+#define LOLA_VERB_GET_CLOCK_STATUS		0xfc5</div><div class='add'>+</div><div class='add'>+/* SET verbs HDAudio */</div><div class='add'>+#define LOLA_VERB_SET_STREAM_FORMAT		0x200</div><div class='add'>+#define LOLA_VERB_SET_AMP_GAIN_MUTE		0x300</div><div class='add'>+#define LOLA_VERB_SET_POWER_STATE		0x705</div><div class='add'>+#define LOLA_VERB_SET_CHANNEL_STREAMID		0x706</div><div class='add'>+#define LOLA_VERB_SET_UNSOLICITED_ENABLE	0x708</div><div class='add'>+#define LOLA_VERB_SET_DIGI_CONVERT_1		0x70d</div><div class='add'>+/* SET verbs Digigram */</div><div class='add'>+#define LOLA_VERB_SET_GAIN_SELECT		0xf81</div><div class='add'>+#define LOLA_VERB_SET_CLOCK_SELECT		0xf84</div><div class='add'>+#define LOLA_VERB_SET_GRANULARITY_STEPS		0xf86</div><div class='add'>+#define LOLA_VERB_SET_SOURCE_GAIN		0xf87</div><div class='add'>+#define LOLA_VERB_SET_MIX_GAIN			0xf88</div><div class='add'>+#define LOLA_VERB_SET_DESTINATION_GAIN		0xf89</div><div class='add'>+#define LOLA_VERB_SET_SRC			0xf8a</div><div class='add'>+</div><div class='add'>+/* Parameter IDs used with LOLA_VERB_PARAMETERS */</div><div class='add'>+#define LOLA_PAR_VENDOR_ID			0x00</div><div class='add'>+#define LOLA_PAR_FUNCTION_TYPE			0x05</div><div class='add'>+#define LOLA_PAR_AUDIO_WIDGET_CAP		0x09</div><div class='add'>+#define LOLA_PAR_PCM				0x0a</div><div class='add'>+#define LOLA_PAR_STREAM_FORMATS			0x0b</div><div class='add'>+#define LOLA_PAR_PIN_CAP			0x0c</div><div class='add'>+#define LOLA_PAR_AMP_IN_CAP			0x0d</div><div class='add'>+#define LOLA_PAR_CONNLIST_LEN			0x0e</div><div class='add'>+#define LOLA_PAR_POWER_STATE			0x0f</div><div class='add'>+#define LOLA_PAR_GPIO_CAP			0x11</div><div class='add'>+#define LOLA_PAR_AMP_OUT_CAP			0x12</div><div class='add'>+#define LOLA_PAR_SPECIFIC_CAPS			0x80</div><div class='add'>+#define LOLA_PAR_FIXED_GAIN_LIST		0x81</div><div class='add'>+</div><div class='add'>+/* extract results of LOLA_PAR_SPECIFIC_CAPS */</div><div class='add'>+#define LOLA_AFG_MIXER_WIDGET_PRESENT(res)	((res &amp; (1 &lt;&lt; 21)) != 0)</div><div class='add'>+#define LOLA_AFG_CLOCK_WIDGET_PRESENT(res)	((res &amp; (1 &lt;&lt; 20)) != 0)</div><div class='add'>+#define LOLA_AFG_INPUT_PIN_COUNT(res)		((res &gt;&gt; 10) &amp; 0x2ff)</div><div class='add'>+#define LOLA_AFG_OUTPUT_PIN_COUNT(res)		((res) &amp; 0x2ff)</div><div class='add'>+</div><div class='add'>+/* extract results of LOLA_PAR_AMP_IN_CAP / LOLA_PAR_AMP_OUT_CAP */</div><div class='add'>+#define LOLA_AMP_MUTE_CAPABLE(res)		((res &amp; (1 &lt;&lt; 31)) != 0)</div><div class='add'>+#define LOLA_AMP_STEP_SIZE(res)			((res &gt;&gt; 24) &amp; 0x7f)</div><div class='add'>+#define LOLA_AMP_NUM_STEPS(res)			((res &gt;&gt; 12) &amp; 0x3ff)</div><div class='add'>+#define LOLA_AMP_OFFSET(res)			((res) &amp; 0x3ff)</div><div class='add'>+</div><div class='add'>+#define LOLA_GRANULARITY_MIN		8</div><div class='add'>+#define LOLA_GRANULARITY_MAX		32</div><div class='add'>+#define LOLA_GRANULARITY_STEP		8</div><div class='add'>+</div><div class='add'>+/* parameters used with unsolicited command/response */</div><div class='add'>+#define LOLA_UNSOLICITED_TAG_MASK	0x3f</div><div class='add'>+#define LOLA_UNSOLICITED_TAG		0x1a</div><div class='add'>+#define LOLA_UNSOLICITED_ENABLE		0x80</div><div class='add'>+#define LOLA_UNSOL_RESP_TAG_OFFSET	26</div><div class='add'>+</div><div class='add'>+/* count values in the Vendor Specific Mixer Widget's Audio Widget Capabilities */</div><div class='add'>+#define LOLA_MIXER_SRC_INPUT_PLAY_SEPARATION(res)   ((res &gt;&gt; 2) &amp; 0x1f)</div><div class='add'>+#define LOLA_MIXER_DEST_REC_OUTPUT_SEPARATION(res)  ((res &gt;&gt; 7) &amp; 0x1f)</div><div class='add'>+</div><div class='add'>+int lola_codec_write(struct lola *chip, unsigned int nid, unsigned int verb,</div><div class='add'>+		     unsigned int data, unsigned int extdata);</div><div class='add'>+int lola_codec_read(struct lola *chip, unsigned int nid, unsigned int verb,</div><div class='add'>+		    unsigned int data, unsigned int extdata,</div><div class='add'>+		    unsigned int *val, unsigned int *extval);</div><div class='add'>+int lola_codec_flush(struct lola *chip);</div><div class='add'>+#define lola_read_param(chip, nid, param, val) \</div><div class='add'>+	lola_codec_read(chip, nid, LOLA_VERB_PARAMETERS, param, 0, val, NULL)</div><div class='add'>+</div><div class='add'>+/* PCM */</div><div class='add'>+int lola_create_pcm(struct lola *chip);</div><div class='add'>+int lola_init_pcm(struct lola *chip, int dir, int *nidp);</div><div class='add'>+void lola_pcm_update(struct lola *chip, struct lola_pcm *pcm, unsigned int bits);</div><div class='add'>+</div><div class='add'>+/* clock */</div><div class='add'>+int lola_init_clock_widget(struct lola *chip, int nid);</div><div class='add'>+int lola_set_granularity(struct lola *chip, unsigned int val, bool force);</div><div class='add'>+int lola_enable_clock_events(struct lola *chip);</div><div class='add'>+int lola_set_clock_index(struct lola *chip, unsigned int idx);</div><div class='add'>+int lola_set_clock(struct lola *chip, int idx);</div><div class='add'>+int lola_set_sample_rate(struct lola *chip, int rate);</div><div class='add'>+bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val);</div><div class='add'>+unsigned int lola_sample_rate_convert(unsigned int coded);</div><div class='add'>+</div><div class='add'>+/* mixer */</div><div class='add'>+int lola_init_pins(struct lola *chip, int dir, int *nidp);</div><div class='add'>+int lola_init_mixer_widget(struct lola *chip, int nid);</div><div class='add'>+void lola_free_mixer(struct lola *chip);</div><div class='add'>+int lola_create_mixer(struct lola *chip);</div><div class='add'>+int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute);</div><div class='add'>+int lola_set_src_config(struct lola *chip, unsigned int src_mask, bool update);</div><div class='add'>+</div><div class='add'>+/* proc */</div><div class='add'>+#ifdef CONFIG_SND_DEBUG</div><div class='add'>+void lola_proc_debug_new(struct lola *chip);</div><div class='add'>+#else</div><div class='add'>+#define lola_proc_debug_new(chip)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* _LOLA_H */</div><div class='head'>diff --git a/sound/pci/lola/lola_clock.c b/sound/pci/lola/lola_clock.c<br/>new file mode 100644<br/>index 000000000000..2e73fbf335ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola_clock.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola_clock.c</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "lola.h"</div><div class='add'>+</div><div class='add'>+unsigned int lola_sample_rate_convert(unsigned int coded)</div><div class='add'>+{</div><div class='add'>+	unsigned int freq;</div><div class='add'>+</div><div class='add'>+	/* base frequency */</div><div class='add'>+	switch (coded &amp; 0x3) {</div><div class='add'>+	case 0:     freq = 48000; break;</div><div class='add'>+	case 1:     freq = 44100; break;</div><div class='add'>+	case 2:     freq = 32000; break;</div><div class='add'>+	default:    return 0;   /* error */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* multiplier / devisor */</div><div class='add'>+	switch (coded &amp; 0x1c) {</div><div class='add'>+	case (0 &lt;&lt; 2):    break;</div><div class='add'>+	case (4 &lt;&lt; 2):    break;</div><div class='add'>+	case (1 &lt;&lt; 2):    freq *= 2; break;</div><div class='add'>+	case (2 &lt;&lt; 2):    freq *= 4; break;</div><div class='add'>+	case (5 &lt;&lt; 2):    freq /= 2; break;</div><div class='add'>+	case (6 &lt;&lt; 2):    freq /= 4; break;</div><div class='add'>+	default:        return 0;   /* error */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* adjustement */</div><div class='add'>+	switch (coded &amp; 0x60) {</div><div class='add'>+	case (0 &lt;&lt; 5):    break;</div><div class='add'>+	case (1 &lt;&lt; 5):    freq = (freq * 999) / 1000; break;</div><div class='add'>+	case (2 &lt;&lt; 5):    freq = (freq * 1001) / 1000; break;</div><div class='add'>+	default:        return 0;   /* error */</div><div class='add'>+	}</div><div class='add'>+	return freq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Granualrity</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define LOLA_MAXFREQ_AT_GRANULARITY_MIN         48000</div><div class='add'>+#define LOLA_MAXFREQ_AT_GRANULARITY_BELOW_MAX   96000</div><div class='add'>+</div><div class='add'>+static bool check_gran_clock_compatibility(struct lola *chip,</div><div class='add'>+					   unsigned int val,</div><div class='add'>+					   unsigned int freq)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;granularity)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (val &lt; LOLA_GRANULARITY_MIN || val &gt; LOLA_GRANULARITY_MAX ||</div><div class='add'>+	    (val % LOLA_GRANULARITY_STEP) != 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (val == LOLA_GRANULARITY_MIN) {</div><div class='add'>+		if (freq &gt; LOLA_MAXFREQ_AT_GRANULARITY_MIN)</div><div class='add'>+			return false;</div><div class='add'>+	} else if (val &lt; LOLA_GRANULARITY_MAX) {</div><div class='add'>+		if (freq &gt; LOLA_MAXFREQ_AT_GRANULARITY_BELOW_MAX)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_set_granularity(struct lola *chip, unsigned int val, bool force)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!force) {</div><div class='add'>+		if (val == chip-&gt;granularity)</div><div class='add'>+			return 0;</div><div class='add'>+#if 0</div><div class='add'>+		/* change Gran only if there are no streams allocated ! */</div><div class='add'>+		if (chip-&gt;audio_in_alloc_mask || chip-&gt;audio_out_alloc_mask)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+#endif</div><div class='add'>+		if (!check_gran_clock_compatibility(chip, val,</div><div class='add'>+						    chip-&gt;clock.cur_freq))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;granularity = val;</div><div class='add'>+	val /= LOLA_GRANULARITY_STEP;</div><div class='add'>+</div><div class='add'>+	/* audio function group */</div><div class='add'>+	err = lola_codec_write(chip, 1, LOLA_VERB_SET_GRANULARITY_STEPS,</div><div class='add'>+			       val, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	/* this can be a very slow function !!! */</div><div class='add'>+	usleep_range(400 * val, 20000);</div><div class='add'>+	return lola_codec_flush(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Clock widget handling</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int lola_init_clock_widget(struct lola *chip, int nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int i, j, nitems, nb_verbs, idx, idx_list;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read wcaps for 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((val &amp; 0xfff00000) != 0x01f00000) { /* test SubType and Type */</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "No valid clock widget\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;clock.nid = nid;</div><div class='add'>+	chip-&gt;clock.items = val &amp; 0xff;</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "clock_list nid=%x, entries=%d\n", nid,</div><div class='add'>+		    chip-&gt;clock.items);</div><div class='add'>+	if (chip-&gt;clock.items &gt; MAX_SAMPLE_CLOCK_COUNT) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "CLOCK_LIST too big: %d\n",</div><div class='add'>+		       chip-&gt;clock.items);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nitems = chip-&gt;clock.items;</div><div class='add'>+	nb_verbs = DIV_ROUND_UP(nitems, 4);</div><div class='add'>+	idx = 0;</div><div class='add'>+	idx_list = 0;</div><div class='add'>+	for (i = 0; i &lt; nb_verbs; i++) {</div><div class='add'>+		unsigned int res_ex;</div><div class='add'>+		unsigned short items[4];</div><div class='add'>+</div><div class='add'>+		err = lola_codec_read(chip, nid, LOLA_VERB_GET_CLOCK_LIST,</div><div class='add'>+				      idx, 0, &amp;val, &amp;res_ex);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "Can't read CLOCK_LIST\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		items[0] = val &amp; 0xfff;</div><div class='add'>+		items[1] = (val &gt;&gt; 16) &amp; 0xfff;</div><div class='add'>+		items[2] = res_ex &amp; 0xfff;</div><div class='add'>+		items[3] = (res_ex &gt;&gt; 16) &amp; 0xfff;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; 4; j++) {</div><div class='add'>+			unsigned char type = items[j] &gt;&gt; 8;</div><div class='add'>+			unsigned int freq = items[j] &amp; 0xff;</div><div class='add'>+			int format = LOLA_CLOCK_FORMAT_NONE;</div><div class='add'>+			bool add_clock = true;</div><div class='add'>+			if (type == LOLA_CLOCK_TYPE_INTERNAL) {</div><div class='add'>+				freq = lola_sample_rate_convert(freq);</div><div class='add'>+				if (freq &lt; chip-&gt;sample_rate_min)</div><div class='add'>+					add_clock = false;</div><div class='add'>+				else if (freq == 48000) {</div><div class='add'>+					chip-&gt;clock.cur_index = idx_list;</div><div class='add'>+					chip-&gt;clock.cur_freq = 48000;</div><div class='add'>+					chip-&gt;clock.cur_valid = true;</div><div class='add'>+				}</div><div class='add'>+			} else if (type == LOLA_CLOCK_TYPE_VIDEO) {</div><div class='add'>+				freq = lola_sample_rate_convert(freq);</div><div class='add'>+				if (freq &lt; chip-&gt;sample_rate_min)</div><div class='add'>+					add_clock = false;</div><div class='add'>+				/* video clock has a format (0:NTSC, 1:PAL)*/</div><div class='add'>+				if (items[j] &amp; 0x80)</div><div class='add'>+					format = LOLA_CLOCK_FORMAT_NTSC;</div><div class='add'>+				else</div><div class='add'>+					format = LOLA_CLOCK_FORMAT_PAL;</div><div class='add'>+			}</div><div class='add'>+			if (add_clock) {</div><div class='add'>+				struct lola_sample_clock *sc;</div><div class='add'>+				sc = &amp;chip-&gt;clock.sample_clock[idx_list];</div><div class='add'>+				sc-&gt;type = type;</div><div class='add'>+				sc-&gt;format = format;</div><div class='add'>+				sc-&gt;freq = freq;</div><div class='add'>+				/* keep the index used with the board */</div><div class='add'>+				chip-&gt;clock.idx_lookup[idx_list] = idx;</div><div class='add'>+				idx_list++;</div><div class='add'>+			} else {</div><div class='add'>+				chip-&gt;clock.items--;</div><div class='add'>+			}</div><div class='add'>+			if (++idx &gt;= nitems)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* enable unsolicited events of the clock widget */</div><div class='add'>+int lola_enable_clock_events(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	unsigned int res;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lola_codec_read(chip, chip-&gt;clock.nid,</div><div class='add'>+			      LOLA_VERB_SET_UNSOLICITED_ENABLE,</div><div class='add'>+			      LOLA_UNSOLICITED_ENABLE | LOLA_UNSOLICITED_TAG,</div><div class='add'>+			      0, &amp;res, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (res) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "error in enable_clock_events %d\n",</div><div class='add'>+		       res);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_set_clock_index(struct lola *chip, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int res;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lola_codec_read(chip, chip-&gt;clock.nid,</div><div class='add'>+			      LOLA_VERB_SET_CLOCK_SELECT,</div><div class='add'>+			      chip-&gt;clock.idx_lookup[idx],</div><div class='add'>+			      0, &amp;res, NULL);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (res) {</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "error in set_clock %d\n", res);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	unsigned int tag;</div><div class='add'>+</div><div class='add'>+	/* the current EXTERNAL clock information gets updated by interrupt</div><div class='add'>+	 * with an unsolicited response</div><div class='add'>+	 */</div><div class='add'>+	if (!val)</div><div class='add'>+		return false;</div><div class='add'>+	tag = (val &gt;&gt; LOLA_UNSOL_RESP_TAG_OFFSET) &amp; LOLA_UNSOLICITED_TAG_MASK;</div><div class='add'>+	if (tag != LOLA_UNSOLICITED_TAG)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* only for current = external clocks */</div><div class='add'>+	if (chip-&gt;clock.sample_clock[chip-&gt;clock.cur_index].type !=</div><div class='add'>+	    LOLA_CLOCK_TYPE_INTERNAL) {</div><div class='add'>+		chip-&gt;clock.cur_freq = lola_sample_rate_convert(val &amp; 0x7f);</div><div class='add'>+		chip-&gt;clock.cur_valid = (val &amp; 0x100) != 0;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_set_clock(struct lola *chip, int idx)</div><div class='add'>+{</div><div class='add'>+	int freq = 0;</div><div class='add'>+	bool valid = false;</div><div class='add'>+</div><div class='add'>+	if (idx == chip-&gt;clock.cur_index) {</div><div class='add'>+		/* current clock is allowed */</div><div class='add'>+		freq = chip-&gt;clock.cur_freq;</div><div class='add'>+		valid = chip-&gt;clock.cur_valid;</div><div class='add'>+	} else if (chip-&gt;clock.sample_clock[idx].type ==</div><div class='add'>+		   LOLA_CLOCK_TYPE_INTERNAL) {</div><div class='add'>+		/* internal clocks allowed */</div><div class='add'>+		freq = chip-&gt;clock.sample_clock[idx].freq;</div><div class='add'>+		valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!freq || !valid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!check_gran_clock_compatibility(chip, chip-&gt;granularity, freq))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (idx != chip-&gt;clock.cur_index) {</div><div class='add'>+		int err = lola_set_clock_index(chip, idx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		/* update new settings */</div><div class='add'>+		chip-&gt;clock.cur_index = idx;</div><div class='add'>+		chip-&gt;clock.cur_freq = freq;</div><div class='add'>+		chip-&gt;clock.cur_valid = true;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_set_sample_rate(struct lola *chip, int rate)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;clock.cur_freq == rate &amp;&amp; chip-&gt;clock.cur_valid)</div><div class='add'>+		return 0;</div><div class='add'>+	/* search for new dwClockIndex */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;clock.items; i++) {</div><div class='add'>+		if (chip-&gt;clock.sample_clock[i].type == LOLA_CLOCK_TYPE_INTERNAL &amp;&amp;</div><div class='add'>+		    chip-&gt;clock.sample_clock[i].freq == rate)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i &gt;= chip-&gt;clock.items)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return lola_set_clock(chip, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/sound/pci/lola/lola_mixer.c b/sound/pci/lola/lola_mixer.c<br/>new file mode 100644<br/>index 000000000000..9cb26a8a4e1a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola_mixer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola_mixer.c</a></div><div class='hunk'>@@ -0,0 +1,842 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/control.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include &lt;sound/tlv.h&gt;</div><div class='add'>+#include "lola.h"</div><div class='add'>+</div><div class='add'>+static int lola_init_pin(struct lola *chip, struct lola_pin *pin,</div><div class='add'>+			 int dir, int nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pin-&gt;nid = nid;</div><div class='add'>+	err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read wcaps for 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	val &amp;= 0x00f00fff; /* test TYPE and bits 0..11 */</div><div class='add'>+	if (val == 0x00400200)    /* Type = 4, Digital = 1 */</div><div class='add'>+		pin-&gt;is_analog = false;</div><div class='add'>+	else if (val == 0x0040000a &amp;&amp; dir == CAPT) /* Dig=0, InAmp/ovrd */</div><div class='add'>+		pin-&gt;is_analog = true;</div><div class='add'>+	else if (val == 0x0040000c &amp;&amp; dir == PLAY) /* Dig=0, OutAmp/ovrd */</div><div class='add'>+		pin-&gt;is_analog = true;</div><div class='add'>+	else {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Invalid wcaps 0x%x for 0x%x\n", val, nid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* analog parameters only following, so continue in case of Digital pin</div><div class='add'>+	 */</div><div class='add'>+	if (!pin-&gt;is_analog)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dir == PLAY)</div><div class='add'>+		err = lola_read_param(chip, nid, LOLA_PAR_AMP_OUT_CAP, &amp;val);</div><div class='add'>+	else</div><div class='add'>+		err = lola_read_param(chip, nid, LOLA_PAR_AMP_IN_CAP, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read AMP-caps for 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pin-&gt;amp_mute = LOLA_AMP_MUTE_CAPABLE(val);</div><div class='add'>+	pin-&gt;amp_step_size = LOLA_AMP_STEP_SIZE(val);</div><div class='add'>+	pin-&gt;amp_num_steps = LOLA_AMP_NUM_STEPS(val);</div><div class='add'>+	if (pin-&gt;amp_num_steps) {</div><div class='add'>+		/* zero as mute state */</div><div class='add'>+		pin-&gt;amp_num_steps++;</div><div class='add'>+		pin-&gt;amp_step_size++;</div><div class='add'>+	}</div><div class='add'>+	pin-&gt;amp_offset = LOLA_AMP_OFFSET(val);</div><div class='add'>+</div><div class='add'>+	err = lola_codec_read(chip, nid, LOLA_VERB_GET_MAX_LEVEL, 0, 0, &amp;val,</div><div class='add'>+			      NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't get MAX_LEVEL 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	pin-&gt;max_level = val &amp; 0x3ff;   /* 10 bits */</div><div class='add'>+</div><div class='add'>+	pin-&gt;config_default_reg = 0;</div><div class='add'>+	pin-&gt;fixed_gain_list_len = 0;</div><div class='add'>+	pin-&gt;cur_gain_step = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_init_pins(struct lola *chip, int dir, int *nidp)</div><div class='add'>+{</div><div class='add'>+	int i, err, nid;</div><div class='add'>+	nid = *nidp;</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[dir].num_pins; i++, nid++) {</div><div class='add'>+		err = lola_init_pin(chip, &amp;chip-&gt;pin[dir].pins[i], dir, nid);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+		if (chip-&gt;pin[dir].pins[i].is_analog)</div><div class='add'>+			chip-&gt;pin[dir].num_analog_pins++;</div><div class='add'>+	}</div><div class='add'>+	*nidp = nid;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lola_free_mixer(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	vfree(chip-&gt;mixer.array_saved);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_init_mixer_widget(struct lola *chip, int nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read wcaps for 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((val &amp; 0xfff00000) != 0x02f00000) { /* test SubType and Type */</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "No valid mixer widget\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;mixer.nid = nid;</div><div class='add'>+	chip-&gt;mixer.caps = val;</div><div class='add'>+	chip-&gt;mixer.array = (struct lola_mixer_array __iomem *)</div><div class='add'>+		(chip-&gt;bar[BAR1].remap_addr + LOLA_BAR1_SOURCE_GAIN_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* reserve memory to copy mixer data for sleep mode transitions */</div><div class='add'>+	chip-&gt;mixer.array_saved = vmalloc(sizeof(struct lola_mixer_array));</div><div class='add'>+	if (!chip-&gt;mixer.array_saved)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* mixer matrix sources are physical input data and play streams */</div><div class='add'>+	chip-&gt;mixer.src_stream_outs = chip-&gt;pcm[PLAY].num_streams;</div><div class='add'>+	chip-&gt;mixer.src_phys_ins = chip-&gt;pin[CAPT].num_pins;</div><div class='add'>+</div><div class='add'>+	/* mixer matrix destinations are record streams and physical output */</div><div class='add'>+	chip-&gt;mixer.dest_stream_ins = chip-&gt;pcm[CAPT].num_streams;</div><div class='add'>+	chip-&gt;mixer.dest_phys_outs = chip-&gt;pin[PLAY].num_pins;</div><div class='add'>+</div><div class='add'>+	/* mixer matrix may have unused areas between PhysIn and</div><div class='add'>+	 * Play or Record and PhysOut zones</div><div class='add'>+	 */</div><div class='add'>+	chip-&gt;mixer.src_stream_out_ofs = chip-&gt;mixer.src_phys_ins +</div><div class='add'>+		LOLA_MIXER_SRC_INPUT_PLAY_SEPARATION(val);</div><div class='add'>+	chip-&gt;mixer.dest_phys_out_ofs = chip-&gt;mixer.dest_stream_ins +</div><div class='add'>+		LOLA_MIXER_DEST_REC_OUTPUT_SEPARATION(val);</div><div class='add'>+</div><div class='add'>+	/* example : MixerMatrix of LoLa881 (LoLa16161 uses unused zones)</div><div class='add'>+	 * +-+  0-------8------16-------8------16</div><div class='add'>+	 * | |  |       |       |       |       |</div><div class='add'>+	 * |s|  | INPUT |       | INPUT |       |</div><div class='add'>+	 * | |-&gt;|  -&gt;   |unused |  -&gt;   |unused |</div><div class='add'>+	 * |r|  |CAPTURE|       | OUTPUT|       |</div><div class='add'>+	 * | |  |  MIX  |       |  MIX  |       |</div><div class='add'>+	 * |c|  8--------------------------------</div><div class='add'>+	 * | |  |       |       |       |       |</div><div class='add'>+	 * | |  |       |       |       |       |</div><div class='add'>+	 * |g|  |unused |unused |unused |unused |</div><div class='add'>+	 * | |  |       |       |       |       |</div><div class='add'>+	 * |a|  |       |       |       |       |</div><div class='add'>+	 * | |  16-------------------------------</div><div class='add'>+	 * |i|  |       |       |       |       |</div><div class='add'>+	 * | |  | PLAYBK|       | PLAYBK|       |</div><div class='add'>+	 * |n|-&gt;|  -&gt;   |unused |  -&gt;   |unused |</div><div class='add'>+	 * | |  |CAPTURE|       | OUTPUT|       |</div><div class='add'>+	 * | |  |  MIX  |       |  MIX  |       |</div><div class='add'>+	 * |a|  8--------------------------------</div><div class='add'>+	 * |r|  |       |       |       |       |</div><div class='add'>+	 * |r|  |       |       |       |       |</div><div class='add'>+	 * |a|  |unused |unused |unused |unused |</div><div class='add'>+	 * |y|  |       |       |       |       |</div><div class='add'>+	 * | |  |       |       |       |       |</div><div class='add'>+	 * +++  16--|---------------|------------</div><div class='add'>+	 *      +---V---------------V-----------+</div><div class='add'>+	 *      |  dest_mix_gain_enable array   |</div><div class='add'>+	 *      +-------------------------------+</div><div class='add'>+	 */</div><div class='add'>+	/* example : MixerMatrix of LoLa280</div><div class='add'>+	 * +-+  0-------8-2</div><div class='add'>+	 * | |  |       | |</div><div class='add'>+	 * |s|  | INPUT | |     INPUT</div><div class='add'>+	 * |r|-&gt;|  -&gt;   | |      -&gt;</div><div class='add'>+	 * |c|  |CAPTURE| | &lt;-  OUTPUT</div><div class='add'>+	 * | |  |  MIX  | |      MIX</div><div class='add'>+	 * |g|  8----------</div><div class='add'>+	 * |a|  |       | |</div><div class='add'>+	 * |i|  | PLAYBK| |     PLAYBACK</div><div class='add'>+	 * |n|-&gt;|  -&gt;   | |      -&gt;</div><div class='add'>+	 * | |  |CAPTURE| | &lt;-  OUTPUT</div><div class='add'>+	 * |a|  |  MIX  | |      MIX</div><div class='add'>+	 * |r|  8---|----|-</div><div class='add'>+	 * |r|  +---V----V-------------------+</div><div class='add'>+	 * |a|  | dest_mix_gain_enable array |</div><div class='add'>+	 * |y|  +----------------------------+</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;mixer.src_stream_out_ofs &gt; MAX_AUDIO_INOUT_COUNT ||</div><div class='add'>+	    chip-&gt;mixer.dest_phys_out_ofs &gt; MAX_STREAM_IN_COUNT) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Invalid mixer widget size\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;mixer.src_mask = ((1U &lt;&lt; chip-&gt;mixer.src_phys_ins) - 1) |</div><div class='add'>+		(((1U &lt;&lt; chip-&gt;mixer.src_stream_outs) - 1)</div><div class='add'>+		 &lt;&lt; chip-&gt;mixer.src_stream_out_ofs);</div><div class='add'>+	chip-&gt;mixer.dest_mask = ((1U &lt;&lt; chip-&gt;mixer.dest_stream_ins) - 1) |</div><div class='add'>+		(((1U &lt;&lt; chip-&gt;mixer.dest_phys_outs) - 1)</div><div class='add'>+		 &lt;&lt; chip-&gt;mixer.dest_phys_out_ofs);</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Mixer src_mask=%x, dest_mask=%x\n",</div><div class='add'>+		    chip-&gt;mixer.src_mask, chip-&gt;mixer.dest_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_mixer_set_src_gain(struct lola *chip, unsigned int id,</div><div class='add'>+				   unsigned short gain, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned int oldval, val;</div><div class='add'>+</div><div class='add'>+	if (!(chip-&gt;mixer.src_mask &amp; (1 &lt;&lt; id)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	oldval = val = readl(&amp;chip-&gt;mixer.array-&gt;src_gain_enable);</div><div class='add'>+	if (on)</div><div class='add'>+		val |= (1 &lt;&lt; id);</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~(1 &lt;&lt; id);</div><div class='add'>+	/* test if values unchanged */</div><div class='add'>+	if ((val == oldval) &amp;&amp;</div><div class='add'>+	    (gain == readw(&amp;chip-&gt;mixer.array-&gt;src_gain[id])))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"lola_mixer_set_src_gain (id=%d, gain=%d) enable=%x\n",</div><div class='add'>+			id, gain, val);</div><div class='add'>+	writew(gain, &amp;chip-&gt;mixer.array-&gt;src_gain[id]);</div><div class='add'>+	writel(val, &amp;chip-&gt;mixer.array-&gt;src_gain_enable);</div><div class='add'>+	lola_codec_flush(chip);</div><div class='add'>+	/* inform micro-controller about the new source gain */</div><div class='add'>+	return lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+				LOLA_VERB_SET_SOURCE_GAIN, id, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0 /* not used */</div><div class='add'>+static int lola_mixer_set_src_gains(struct lola *chip, unsigned int mask,</div><div class='add'>+				    unsigned short *gains)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if ((chip-&gt;mixer.src_mask &amp; mask) != mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; LOLA_MIXER_DIM; i++) {</div><div class='add'>+		if (mask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			writew(*gains, &amp;chip-&gt;mixer.array-&gt;src_gain[i]);</div><div class='add'>+			gains++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	writel(mask, &amp;chip-&gt;mixer.array-&gt;src_gain_enable);</div><div class='add'>+	lola_codec_flush(chip);</div><div class='add'>+	if (chip-&gt;mixer.caps &amp; LOLA_PEAK_METER_CAN_AGC_MASK) {</div><div class='add'>+		/* update for all srcs at once */</div><div class='add'>+		return lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+					LOLA_VERB_SET_SOURCE_GAIN, 0x80, 0);</div><div class='add'>+	}</div><div class='add'>+	/* update manually */</div><div class='add'>+	for (i = 0; i &lt; LOLA_MIXER_DIM; i++) {</div><div class='add'>+		if (mask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+					 LOLA_VERB_SET_SOURCE_GAIN, i, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* not used */</div><div class='add'>+</div><div class='add'>+static int lola_mixer_set_mapping_gain(struct lola *chip,</div><div class='add'>+				       unsigned int src, unsigned int dest,</div><div class='add'>+				       unsigned short gain, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	if (!(chip-&gt;mixer.src_mask &amp; (1 &lt;&lt; src)) ||</div><div class='add'>+	    !(chip-&gt;mixer.dest_mask &amp; (1 &lt;&lt; dest)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (on)</div><div class='add'>+		writew(gain, &amp;chip-&gt;mixer.array-&gt;dest_mix_gain[dest][src]);</div><div class='add'>+	val = readl(&amp;chip-&gt;mixer.array-&gt;dest_mix_gain_enable[dest]);</div><div class='add'>+	if (on)</div><div class='add'>+		val |= (1 &lt;&lt; src);</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~(1 &lt;&lt; src);</div><div class='add'>+	writel(val, &amp;chip-&gt;mixer.array-&gt;dest_mix_gain_enable[dest]);</div><div class='add'>+	lola_codec_flush(chip);</div><div class='add'>+	return lola_codec_write(chip, chip-&gt;mixer.nid, LOLA_VERB_SET_MIX_GAIN,</div><div class='add'>+				src, dest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0 /* not used */</div><div class='add'>+static int lola_mixer_set_dest_gains(struct lola *chip, unsigned int id,</div><div class='add'>+				     unsigned int mask, unsigned short *gains)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(chip-&gt;mixer.dest_mask &amp; (1 &lt;&lt; id)) ||</div><div class='add'>+	    (chip-&gt;mixer.src_mask &amp; mask) != mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	for (i = 0; i &lt; LOLA_MIXER_DIM; i++) {</div><div class='add'>+		if (mask &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			writew(*gains, &amp;chip-&gt;mixer.array-&gt;dest_mix_gain[id][i]);</div><div class='add'>+			gains++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	writel(mask, &amp;chip-&gt;mixer.array-&gt;dest_mix_gain_enable[id]);</div><div class='add'>+	lola_codec_flush(chip);</div><div class='add'>+	/* update for all dests at once */</div><div class='add'>+	return lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+				LOLA_VERB_SET_DESTINATION_GAIN, id, 0);</div><div class='add'>+}</div><div class='add'>+#endif /* not used */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int set_analog_volume(struct lola *chip, int dir,</div><div class='add'>+			     unsigned int idx, unsigned int val,</div><div class='add'>+			     bool external_call);</div><div class='add'>+</div><div class='add'>+int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute)</div><div class='add'>+{</div><div class='add'>+	struct lola_pin *pin;</div><div class='add'>+	int idx, max_idx;</div><div class='add'>+</div><div class='add'>+	pin = chip-&gt;pin[dir].pins;</div><div class='add'>+	max_idx = chip-&gt;pin[dir].num_pins;</div><div class='add'>+	for (idx = 0; idx &lt; max_idx; idx++) {</div><div class='add'>+		if (pin[idx].is_analog) {</div><div class='add'>+			unsigned int val = mute ? 0 : pin[idx].cur_gain_step;</div><div class='add'>+			/* set volume and do not save the value */</div><div class='add'>+			set_analog_volume(chip, dir, idx, val, false);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return lola_codec_flush(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int set_analog_volume(struct lola *chip, int dir,</div><div class='add'>+			     unsigned int idx, unsigned int val,</div><div class='add'>+			     bool external_call)</div><div class='add'>+{</div><div class='add'>+	struct lola_pin *pin;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= chip-&gt;pin[dir].num_pins)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	pin = &amp;chip-&gt;pin[dir].pins[idx];</div><div class='add'>+	if (!pin-&gt;is_analog || pin-&gt;amp_num_steps &lt;= val)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (external_call &amp;&amp; pin-&gt;cur_gain_step == val)</div><div class='add'>+		return 0;</div><div class='add'>+	if (external_call)</div><div class='add'>+		lola_codec_flush(chip);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev,</div><div class='add'>+		"set_analog_volume (dir=%d idx=%d, volume=%d)\n",</div><div class='add'>+			dir, idx, val);</div><div class='add'>+	err = lola_codec_write(chip, pin-&gt;nid,</div><div class='add'>+			       LOLA_VERB_SET_AMP_GAIN_MUTE, val, 0);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (external_call)</div><div class='add'>+		pin-&gt;cur_gain_step = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_set_src_config(struct lola *chip, unsigned int src_mask, bool update)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int success = 0;</div><div class='add'>+	int n, err;</div><div class='add'>+</div><div class='add'>+	/* SRC can be activated and the dwInputSRCMask is valid? */</div><div class='add'>+	if ((chip-&gt;input_src_caps_mask &amp; src_mask) != src_mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	/* handle all even Inputs - SRC is a stereo setting !!! */</div><div class='add'>+	for (n = 0; n &lt; chip-&gt;pin[CAPT].num_pins; n += 2) {</div><div class='add'>+		unsigned int mask = 3U &lt;&lt; n; /* handle the stereo case */</div><div class='add'>+		unsigned int new_src, src_state;</div><div class='add'>+		if (!(chip-&gt;input_src_caps_mask &amp; mask))</div><div class='add'>+			continue;</div><div class='add'>+		/* if one IO needs SRC, both stereo IO will get SRC */</div><div class='add'>+		new_src = (src_mask &amp; mask) != 0;</div><div class='add'>+		if (update) {</div><div class='add'>+			src_state = (chip-&gt;input_src_mask &amp; mask) != 0;</div><div class='add'>+			if (src_state == new_src)</div><div class='add'>+				continue;   /* nothing to change for this IO */</div><div class='add'>+		}</div><div class='add'>+		err = lola_codec_write(chip, chip-&gt;pcm[CAPT].streams[n].nid,</div><div class='add'>+				       LOLA_VERB_SET_SRC, new_src, 0);</div><div class='add'>+		if (!err)</div><div class='add'>+			success++;</div><div class='add'>+		else</div><div class='add'>+			ret = err;</div><div class='add'>+	}</div><div class='add'>+	if (success)</div><div class='add'>+		ret = lola_codec_flush(chip);</div><div class='add'>+	if (!ret)</div><div class='add'>+		chip-&gt;input_src_mask = src_mask;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+static int init_mixer_values(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* all sample rate converters on */</div><div class='add'>+	lola_set_src_config(chip, (1 &lt;&lt; chip-&gt;pin[CAPT].num_pins) - 1, false);</div><div class='add'>+</div><div class='add'>+	/* clear all mixer matrix settings */</div><div class='add'>+	memset_io(chip-&gt;mixer.array, 0, sizeof(*chip-&gt;mixer.array));</div><div class='add'>+	/* inform firmware about all updated matrix columns - capture part */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.dest_stream_ins; i++)</div><div class='add'>+		lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+				 LOLA_VERB_SET_DESTINATION_GAIN,</div><div class='add'>+				 i, 0);</div><div class='add'>+	/* inform firmware about all updated matrix columns - output part */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.dest_phys_outs; i++)</div><div class='add'>+		lola_codec_write(chip, chip-&gt;mixer.nid,</div><div class='add'>+				 LOLA_VERB_SET_DESTINATION_GAIN,</div><div class='add'>+				 chip-&gt;mixer.dest_phys_out_ofs + i, 0);</div><div class='add'>+</div><div class='add'>+	/* set all digital input source (master) gains to 0dB */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.src_phys_ins; i++)</div><div class='add'>+		lola_mixer_set_src_gain(chip, i, 336, true); /* 0dB */</div><div class='add'>+</div><div class='add'>+	/* set all digital playback source (master) gains to 0dB */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.src_stream_outs; i++)</div><div class='add'>+		lola_mixer_set_src_gain(chip,</div><div class='add'>+					i + chip-&gt;mixer.src_stream_out_ofs,</div><div class='add'>+					336, true); /* 0dB */</div><div class='add'>+	/* set gain value 0dB diagonally in matrix - part INPUT -&gt; CAPTURE */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.dest_stream_ins; i++) {</div><div class='add'>+		int src = i % chip-&gt;mixer.src_phys_ins;</div><div class='add'>+		lola_mixer_set_mapping_gain(chip, src, i, 336, true);</div><div class='add'>+	}</div><div class='add'>+	/* set gain value 0dB diagonally in matrix , part PLAYBACK -&gt; OUTPUT</div><div class='add'>+	 * (LoLa280 : playback channel 0,2,4,6 linked to output channel 0)</div><div class='add'>+	 * (LoLa280 : playback channel 1,3,5,7 linked to output channel 1)</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;mixer.src_stream_outs; i++) {</div><div class='add'>+		int src = chip-&gt;mixer.src_stream_out_ofs + i;</div><div class='add'>+		int dst = chip-&gt;mixer.dest_phys_out_ofs +</div><div class='add'>+			i % chip-&gt;mixer.dest_phys_outs;</div><div class='add'>+		lola_mixer_set_mapping_gain(chip, src, dst, 336, true);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * analog mixer control element</div><div class='add'>+ */</div><div class='add'>+static int lola_analog_vol_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+				struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int dir = kcontrol-&gt;private_value;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = chip-&gt;pin[dir].num_pins;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = chip-&gt;pin[dir].pins[0].amp_num_steps;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_analog_vol_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int dir = kcontrol-&gt;private_value;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[dir].num_pins; i++)</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] =</div><div class='add'>+			chip-&gt;pin[dir].pins[i].cur_gain_step;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_analog_vol_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int dir = kcontrol-&gt;private_value;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[dir].num_pins; i++) {</div><div class='add'>+		err = set_analog_volume(chip, dir, i,</div><div class='add'>+					ucontrol-&gt;value.integer.value[i],</div><div class='add'>+					true);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_analog_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,</div><div class='add'>+			       unsigned int size, unsigned int __user *tlv)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int dir = kcontrol-&gt;private_value;</div><div class='add'>+	unsigned int val1, val2;</div><div class='add'>+	struct lola_pin *pin;</div><div class='add'>+</div><div class='add'>+	if (size &lt; 4 * sizeof(unsigned int))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pin = &amp;chip-&gt;pin[dir].pins[0];</div><div class='add'>+</div><div class='add'>+	val2 = pin-&gt;amp_step_size * 25;</div><div class='add'>+	val1 = -1 * (int)pin-&gt;amp_offset * (int)val2;</div><div class='add'>+#ifdef TLV_DB_SCALE_MUTE</div><div class='add'>+	val2 |= TLV_DB_SCALE_MUTE;</div><div class='add'>+#endif</div><div class='add'>+	if (put_user(SNDRV_CTL_TLVT_DB_SCALE, tlv))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (put_user(2 * sizeof(unsigned int), tlv + 1))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (put_user(val1, tlv + 2))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	if (put_user(val2, tlv + 3))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new lola_analog_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_READ |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK),</div><div class='add'>+	.info = lola_analog_vol_info,</div><div class='add'>+	.get = lola_analog_vol_get,</div><div class='add'>+	.put = lola_analog_vol_put,</div><div class='add'>+	.tlv.c = lola_analog_vol_tlv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_analog_mixer(struct lola *chip, int dir, char *name)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;pin[dir].num_pins)</div><div class='add'>+		return 0;</div><div class='add'>+	/* no analog volumes on digital only adapters */</div><div class='add'>+	if (chip-&gt;pin[dir].num_pins != chip-&gt;pin[dir].num_analog_pins)</div><div class='add'>+		return 0;</div><div class='add'>+	lola_analog_mixer.name = name;</div><div class='add'>+	lola_analog_mixer.private_value = dir;</div><div class='add'>+	return snd_ctl_add(chip-&gt;card,</div><div class='add'>+			   snd_ctl_new1(&amp;lola_analog_mixer, chip));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Hardware sample rate converter on digital input</div><div class='add'>+ */</div><div class='add'>+static int lola_input_src_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;</div><div class='add'>+	uinfo-&gt;count = chip-&gt;pin[CAPT].num_pins;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_input_src_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[CAPT].num_pins; i++)</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] =</div><div class='add'>+			!!(chip-&gt;input_src_mask &amp; (1 &lt;&lt; i));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_input_src_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	int i;</div><div class='add'>+	unsigned int mask;</div><div class='add'>+</div><div class='add'>+	mask = 0;</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[CAPT].num_pins; i++)</div><div class='add'>+		if (ucontrol-&gt;value.integer.value[i])</div><div class='add'>+			mask |= 1 &lt;&lt; i;</div><div class='add'>+	return lola_set_src_config(chip, mask, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_kcontrol_new lola_input_src_mixer = {</div><div class='add'>+	.name = "Digital SRC Capture Switch",</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.info = lola_input_src_info,</div><div class='add'>+	.get = lola_input_src_get,</div><div class='add'>+	.put = lola_input_src_put,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Lola16161 or Lola881 can have Hardware sample rate converters</div><div class='add'>+ * on its digital input pins</div><div class='add'>+ */</div><div class='add'>+static int create_input_src_mixer(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;input_src_caps_mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return snd_ctl_add(chip-&gt;card,</div><div class='add'>+			   snd_ctl_new1(&amp;lola_input_src_mixer, chip));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * src gain mixer</div><div class='add'>+ */</div><div class='add'>+static int lola_src_gain_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = count;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 409;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_src_gain_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int ofs = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int count = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	unsigned int mask, i;</div><div class='add'>+</div><div class='add'>+	mask = readl(&amp;chip-&gt;mixer.array-&gt;src_gain_enable);</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		unsigned int idx = ofs + i;</div><div class='add'>+		unsigned short val;</div><div class='add'>+		if (!(chip-&gt;mixer.src_mask &amp; (1 &lt;&lt; idx)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mask &amp; (1 &lt;&lt; idx))</div><div class='add'>+			val = readw(&amp;chip-&gt;mixer.array-&gt;src_gain[idx]) + 1;</div><div class='add'>+		else</div><div class='add'>+			val = 0;</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] = val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_src_gain_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			     struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int ofs = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int count = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		unsigned int idx = ofs + i;</div><div class='add'>+		unsigned short val = ucontrol-&gt;value.integer.value[i];</div><div class='add'>+		if (val)</div><div class='add'>+			val--;</div><div class='add'>+		err = lola_mixer_set_src_gain(chip, idx, val, !!val);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* raw value: 0 = -84dB, 336 = 0dB, 408=18dB, incremented 1 for mute */</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(lola_src_gain_tlv, -8425, 25, 1);</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new lola_src_gain_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+	.info = lola_src_gain_info,</div><div class='add'>+	.get = lola_src_gain_get,</div><div class='add'>+	.put = lola_src_gain_put,</div><div class='add'>+	.tlv.p = lola_src_gain_tlv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_src_gain_mixer(struct lola *chip,</div><div class='add'>+				 int num, int ofs, char *name)</div><div class='add'>+{</div><div class='add'>+	lola_src_gain_mixer.name = name;</div><div class='add'>+	lola_src_gain_mixer.private_value = ofs + (num &lt;&lt; 8);</div><div class='add'>+	return snd_ctl_add(chip-&gt;card,</div><div class='add'>+			   snd_ctl_new1(&amp;lola_src_gain_mixer, chip));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if 0 /* not used */</div><div class='add'>+/*</div><div class='add'>+ * destination gain (matrix-like) mixer</div><div class='add'>+ */</div><div class='add'>+static int lola_dest_gain_info(struct snd_kcontrol *kcontrol,</div><div class='add'>+			       struct snd_ctl_elem_info *uinfo)</div><div class='add'>+{</div><div class='add'>+	unsigned int src_num = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	uinfo-&gt;type = SNDRV_CTL_ELEM_TYPE_INTEGER;</div><div class='add'>+	uinfo-&gt;count = src_num;</div><div class='add'>+	uinfo-&gt;value.integer.min = 0;</div><div class='add'>+	uinfo-&gt;value.integer.max = 433;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_dest_gain_get(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int src_ofs = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int src_num = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	unsigned int dst_ofs = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	unsigned int dst, mask, i;</div><div class='add'>+</div><div class='add'>+	dst = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id) + dst_ofs;</div><div class='add'>+	mask = readl(&amp;chip-&gt;mixer.array-&gt;dest_mix_gain_enable[dst]);</div><div class='add'>+	for (i = 0; i &lt; src_num; i++) {</div><div class='add'>+		unsigned int src = src_ofs + i;</div><div class='add'>+		unsigned short val;</div><div class='add'>+		if (!(chip-&gt;mixer.src_mask &amp; (1 &lt;&lt; src)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (mask &amp; (1 &lt;&lt; dst))</div><div class='add'>+			val = readw(&amp;chip-&gt;mixer.array-&gt;dest_mix_gain[dst][src]) + 1;</div><div class='add'>+		else</div><div class='add'>+			val = 0;</div><div class='add'>+		ucontrol-&gt;value.integer.value[i] = val;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_dest_gain_put(struct snd_kcontrol *kcontrol,</div><div class='add'>+			      struct snd_ctl_elem_value *ucontrol)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_kcontrol_chip(kcontrol);</div><div class='add'>+	unsigned int src_ofs = kcontrol-&gt;private_value &amp; 0xff;</div><div class='add'>+	unsigned int src_num = (kcontrol-&gt;private_value &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	unsigned int dst_ofs = (kcontrol-&gt;private_value &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	unsigned int dst, mask;</div><div class='add'>+	unsigned short gains[MAX_STREAM_COUNT];</div><div class='add'>+	int i, num;</div><div class='add'>+</div><div class='add'>+	mask = 0;</div><div class='add'>+	num = 0;</div><div class='add'>+	for (i = 0; i &lt; src_num; i++) {</div><div class='add'>+		unsigned short val = ucontrol-&gt;value.integer.value[i];</div><div class='add'>+		if (val) {</div><div class='add'>+			gains[num++] = val - 1;</div><div class='add'>+			mask |= 1 &lt;&lt; i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mask &lt;&lt;= src_ofs;</div><div class='add'>+	dst = snd_ctl_get_ioffidx(kcontrol, &amp;ucontrol-&gt;id) + dst_ofs;</div><div class='add'>+	return lola_mixer_set_dest_gains(chip, dst, mask, gains);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const DECLARE_TLV_DB_SCALE(lola_dest_gain_tlv, -8425, 25, 1);</div><div class='add'>+</div><div class='add'>+static struct snd_kcontrol_new lola_dest_gain_mixer = {</div><div class='add'>+	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='add'>+	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |</div><div class='add'>+		   SNDRV_CTL_ELEM_ACCESS_TLV_READ),</div><div class='add'>+	.info = lola_dest_gain_info,</div><div class='add'>+	.get = lola_dest_gain_get,</div><div class='add'>+	.put = lola_dest_gain_put,</div><div class='add'>+	.tlv.p = lola_dest_gain_tlv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int create_dest_gain_mixer(struct lola *chip,</div><div class='add'>+				  int src_num, int src_ofs,</div><div class='add'>+				  int num, int ofs, char *name)</div><div class='add'>+{</div><div class='add'>+	lola_dest_gain_mixer.count = num;</div><div class='add'>+	lola_dest_gain_mixer.name = name;</div><div class='add'>+	lola_dest_gain_mixer.private_value =</div><div class='add'>+		src_ofs + (src_num &lt;&lt; 8) + (ofs &lt;&lt; 16) + (num &lt;&lt; 24);</div><div class='add'>+	return snd_ctl_add(chip-&gt;card,</div><div class='add'>+			  snd_ctl_new1(&amp;lola_dest_gain_mixer, chip));</div><div class='add'>+}</div><div class='add'>+#endif /* not used */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+int lola_create_mixer(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = create_analog_mixer(chip, PLAY, "Analog Playback Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_analog_mixer(chip, CAPT, "Analog Capture Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_input_src_mixer(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_src_gain_mixer(chip, chip-&gt;mixer.src_phys_ins, 0,</div><div class='add'>+				    "Digital Capture Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_src_gain_mixer(chip, chip-&gt;mixer.src_stream_outs,</div><div class='add'>+				    chip-&gt;mixer.src_stream_out_ofs,</div><div class='add'>+				    "Digital Playback Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+#if 0</div><div class='add'>+/* FIXME: buggy mixer matrix handling */</div><div class='add'>+	err = create_dest_gain_mixer(chip,</div><div class='add'>+				     chip-&gt;mixer.src_phys_ins, 0,</div><div class='add'>+				     chip-&gt;mixer.dest_stream_ins, 0,</div><div class='add'>+				     "Line Capture Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_dest_gain_mixer(chip,</div><div class='add'>+				     chip-&gt;mixer.src_stream_outs,</div><div class='add'>+				     chip-&gt;mixer.src_stream_out_ofs,</div><div class='add'>+				     chip-&gt;mixer.dest_stream_ins, 0,</div><div class='add'>+				     "Stream-Loopback Capture Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_dest_gain_mixer(chip,</div><div class='add'>+				     chip-&gt;mixer.src_phys_ins, 0,</div><div class='add'>+				     chip-&gt;mixer.dest_phys_outs,</div><div class='add'>+				     chip-&gt;mixer.dest_phys_out_ofs,</div><div class='add'>+				     "Line-Loopback Playback Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	err = create_dest_gain_mixer(chip,</div><div class='add'>+				     chip-&gt;mixer.src_stream_outs,</div><div class='add'>+				     chip-&gt;mixer.src_stream_out_ofs,</div><div class='add'>+				     chip-&gt;mixer.dest_phys_outs,</div><div class='add'>+				     chip-&gt;mixer.dest_phys_out_ofs,</div><div class='add'>+				     "Stream Playback Volume");</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+#endif /* FIXME */</div><div class='add'>+	return init_mixer_values(chip);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/pci/lola/lola_pcm.c b/sound/pci/lola/lola_pcm.c<br/>new file mode 100644<br/>index 000000000000..6c046ecd6e08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola_pcm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola_pcm.c</a></div><div class='hunk'>@@ -0,0 +1,681 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "lola.h"</div><div class='add'>+</div><div class='add'>+#define LOLA_MAX_BDL_ENTRIES	8</div><div class='add'>+#define LOLA_MAX_BUF_SIZE	(1024*1024*1024)</div><div class='add'>+#define LOLA_BDL_ENTRY_SIZE	(16 * 16)</div><div class='add'>+</div><div class='add'>+static struct lola_pcm *lola_get_pcm(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	return &amp;chip-&gt;pcm[substream-&gt;stream];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct lola_stream *lola_get_stream(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola_pcm *pcm = lola_get_pcm(substream);</div><div class='add'>+	unsigned int idx = substream-&gt;number;</div><div class='add'>+	return &amp;pcm-&gt;streams[idx];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int lola_get_lrc(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	return lola_readl(chip, BAR1, LRC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int lola_get_tstamp(struct lola *chip, bool quick_no_sync)</div><div class='add'>+{</div><div class='add'>+	unsigned int tstamp = lola_get_lrc(chip) &gt;&gt; 8;</div><div class='add'>+	if (chip-&gt;granularity) {</div><div class='add'>+		unsigned int wait_banks = quick_no_sync ? 0 : 8;</div><div class='add'>+		tstamp += (wait_banks + 1) * chip-&gt;granularity - 1;</div><div class='add'>+		tstamp -= tstamp % chip-&gt;granularity;</div><div class='add'>+	}</div><div class='add'>+	return tstamp &lt;&lt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* clear any pending interrupt status */</div><div class='add'>+static void lola_stream_clear_pending_irq(struct lola *chip,</div><div class='add'>+					  struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = lola_dsd_read(chip, str-&gt;dsd, STS);</div><div class='add'>+	val &amp;= LOLA_DSD_STS_DESE | LOLA_DSD_STS_BCIS;</div><div class='add'>+	if (val)</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, STS, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_stream_start(struct lola *chip, struct lola_stream *str,</div><div class='add'>+			      unsigned int tstamp)</div><div class='add'>+{</div><div class='add'>+	lola_stream_clear_pending_irq(chip, str);</div><div class='add'>+	lola_dsd_write(chip, str-&gt;dsd, CTL,</div><div class='add'>+		       LOLA_DSD_CTL_SRUN |</div><div class='add'>+		       LOLA_DSD_CTL_IOCE |</div><div class='add'>+		       LOLA_DSD_CTL_DEIE |</div><div class='add'>+		       LOLA_DSD_CTL_VLRCV |</div><div class='add'>+		       tstamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_stream_stop(struct lola *chip, struct lola_stream *str,</div><div class='add'>+			     unsigned int tstamp)</div><div class='add'>+{</div><div class='add'>+	lola_dsd_write(chip, str-&gt;dsd, CTL,</div><div class='add'>+		       LOLA_DSD_CTL_IOCE |</div><div class='add'>+		       LOLA_DSD_CTL_DEIE |</div><div class='add'>+		       LOLA_DSD_CTL_VLRCV |</div><div class='add'>+		       tstamp);</div><div class='add'>+	lola_stream_clear_pending_irq(chip, str);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void wait_for_srst_clear(struct lola *chip, struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	unsigned long end_time = jiffies + msecs_to_jiffies(200);</div><div class='add'>+	while (time_before(jiffies, end_time)) {</div><div class='add'>+		unsigned int val;</div><div class='add'>+		val = lola_dsd_read(chip, str-&gt;dsd, CTL);</div><div class='add'>+		if (!(val &amp; LOLA_DSD_CTL_SRST))</div><div class='add'>+			return;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "SRST not clear (stream %d)\n", str-&gt;dsd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_stream_wait_for_fifo(struct lola *chip,</div><div class='add'>+				     struct lola_stream *str,</div><div class='add'>+				     bool ready)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = ready ? LOLA_DSD_STS_FIFORDY : 0;</div><div class='add'>+	unsigned long end_time = jiffies + msecs_to_jiffies(200);</div><div class='add'>+	while (time_before(jiffies, end_time)) {</div><div class='add'>+		unsigned int reg = lola_dsd_read(chip, str-&gt;dsd, STS);</div><div class='add'>+		if ((reg &amp; LOLA_DSD_STS_FIFORDY) == val)</div><div class='add'>+			return 0;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "FIFO not ready (stream %d)\n", str-&gt;dsd);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* sync for FIFO ready/empty for all linked streams;</div><div class='add'>+ * clear paused flag when FIFO gets ready again</div><div class='add'>+ */</div><div class='add'>+static int lola_sync_wait_for_fifo(struct lola *chip,</div><div class='add'>+				   struct snd_pcm_substream *substream,</div><div class='add'>+				   bool ready)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = ready ? LOLA_DSD_STS_FIFORDY : 0;</div><div class='add'>+	unsigned long end_time = jiffies + msecs_to_jiffies(200);</div><div class='add'>+	struct snd_pcm_substream *s;</div><div class='add'>+	int pending = 0;</div><div class='add'>+</div><div class='add'>+	while (time_before(jiffies, end_time)) {</div><div class='add'>+		pending = 0;</div><div class='add'>+		snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+			struct lola_stream *str;</div><div class='add'>+			if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='add'>+				continue;</div><div class='add'>+			str = lola_get_stream(s);</div><div class='add'>+			if (str-&gt;prepared &amp;&amp; str-&gt;paused) {</div><div class='add'>+				unsigned int reg;</div><div class='add'>+				reg = lola_dsd_read(chip, str-&gt;dsd, STS);</div><div class='add'>+				if ((reg &amp; LOLA_DSD_STS_FIFORDY) != val) {</div><div class='add'>+					pending = str-&gt;dsd + 1;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+				if (ready)</div><div class='add'>+					str-&gt;paused = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (!pending)</div><div class='add'>+			return 0;</div><div class='add'>+		msleep(1);</div><div class='add'>+	}</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev, "FIFO not ready (pending %d)\n", pending - 1);</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* finish pause - prepare for a new resume */</div><div class='add'>+static void lola_sync_pause(struct lola *chip,</div><div class='add'>+			    struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm_substream *s;</div><div class='add'>+</div><div class='add'>+	lola_sync_wait_for_fifo(chip, substream, false);</div><div class='add'>+	snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+		struct lola_stream *str;</div><div class='add'>+		if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='add'>+			continue;</div><div class='add'>+		str = lola_get_stream(s);</div><div class='add'>+		if (str-&gt;paused &amp;&amp; str-&gt;prepared)</div><div class='add'>+			lola_dsd_write(chip, str-&gt;dsd, CTL, LOLA_DSD_CTL_SRUN |</div><div class='add'>+				       LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE);</div><div class='add'>+	}</div><div class='add'>+	lola_sync_wait_for_fifo(chip, substream, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_stream_reset(struct lola *chip, struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	if (str-&gt;prepared) {</div><div class='add'>+		if (str-&gt;paused)</div><div class='add'>+			lola_sync_pause(chip, str-&gt;substream);</div><div class='add'>+		str-&gt;prepared = 0;</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, CTL,</div><div class='add'>+			       LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE);</div><div class='add'>+		lola_stream_wait_for_fifo(chip, str, false);</div><div class='add'>+		lola_stream_clear_pending_irq(chip, str);</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, CTL, LOLA_DSD_CTL_SRST);</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, LVI, 0);</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, BDPU, 0);</div><div class='add'>+		lola_dsd_write(chip, str-&gt;dsd, BDPL, 0);</div><div class='add'>+		wait_for_srst_clear(chip, str);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_hardware lola_pcm_hw = {</div><div class='add'>+	.info =			(SNDRV_PCM_INFO_MMAP |</div><div class='add'>+				 SNDRV_PCM_INFO_INTERLEAVED |</div><div class='add'>+				 SNDRV_PCM_INFO_BLOCK_TRANSFER |</div><div class='add'>+				 SNDRV_PCM_INFO_MMAP_VALID |</div><div class='add'>+				 SNDRV_PCM_INFO_PAUSE),</div><div class='add'>+	.formats =		(SNDRV_PCM_FMTBIT_S16_LE |</div><div class='add'>+				 SNDRV_PCM_FMTBIT_S24_LE |</div><div class='add'>+				 SNDRV_PCM_FMTBIT_S32_LE |</div><div class='add'>+				 SNDRV_PCM_FMTBIT_FLOAT_LE),</div><div class='add'>+	.rates =		SNDRV_PCM_RATE_8000_192000,</div><div class='add'>+	.rate_min =		8000,</div><div class='add'>+	.rate_max =		192000,</div><div class='add'>+	.channels_min =		1,</div><div class='add'>+	.channels_max =		2,</div><div class='add'>+	.buffer_bytes_max =	LOLA_MAX_BUF_SIZE,</div><div class='add'>+	.period_bytes_min =	128,</div><div class='add'>+	.period_bytes_max =	LOLA_MAX_BUF_SIZE / 2,</div><div class='add'>+	.periods_min =		2,</div><div class='add'>+	.periods_max =		LOLA_MAX_BDL_ENTRIES,</div><div class='add'>+	.fifo_size =		0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lola_pcm_open(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_pcm *pcm = lola_get_pcm(substream);</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	if (str-&gt;opened)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	str-&gt;substream = substream;</div><div class='add'>+	str-&gt;master = NULL;</div><div class='add'>+	str-&gt;opened = 1;</div><div class='add'>+	runtime-&gt;hw = lola_pcm_hw;</div><div class='add'>+	runtime-&gt;hw.channels_max = pcm-&gt;num_streams - str-&gt;index;</div><div class='add'>+	if (chip-&gt;sample_rate) {</div><div class='add'>+		/* sample rate is locked */</div><div class='add'>+		runtime-&gt;hw.rate_min = chip-&gt;sample_rate;</div><div class='add'>+		runtime-&gt;hw.rate_max = chip-&gt;sample_rate;</div><div class='add'>+	} else {</div><div class='add'>+		runtime-&gt;hw.rate_min = chip-&gt;sample_rate_min;</div><div class='add'>+		runtime-&gt;hw.rate_max = chip-&gt;sample_rate_max;</div><div class='add'>+	}</div><div class='add'>+	chip-&gt;ref_count_rate++;</div><div class='add'>+	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='add'>+	/* period size = multiple of chip-&gt;granularity (8, 16 or 32 frames)*/</div><div class='add'>+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,</div><div class='add'>+				   chip-&gt;granularity);</div><div class='add'>+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,</div><div class='add'>+				   chip-&gt;granularity);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_cleanup_slave_streams(struct lola_pcm *pcm,</div><div class='add'>+				       struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	for (i = str-&gt;index + 1; i &lt; pcm-&gt;num_streams; i++) {</div><div class='add'>+		struct lola_stream *s = &amp;pcm-&gt;streams[i];</div><div class='add'>+		if (s-&gt;master != str)</div><div class='add'>+			break;</div><div class='add'>+		s-&gt;master = NULL;</div><div class='add'>+		s-&gt;opened = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_pcm_close(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	if (str-&gt;substream == substream) {</div><div class='add'>+		str-&gt;substream = NULL;</div><div class='add'>+		str-&gt;opened = 0;</div><div class='add'>+	}</div><div class='add'>+	if (--chip-&gt;ref_count_rate == 0) {</div><div class='add'>+		/* release sample rate */</div><div class='add'>+		chip-&gt;sample_rate = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='add'>+			      struct snd_pcm_hw_params *hw_params)</div><div class='add'>+{</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+</div><div class='add'>+	str-&gt;bufsize = 0;</div><div class='add'>+	str-&gt;period_bytes = 0;</div><div class='add'>+	str-&gt;format_verb = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_pcm *pcm = lola_get_pcm(substream);</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;open_mutex);</div><div class='add'>+	lola_stream_reset(chip, str);</div><div class='add'>+	lola_cleanup_slave_streams(pcm, str);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set up a BDL entry</div><div class='add'>+ */</div><div class='add'>+static int setup_bdle(struct snd_pcm_substream *substream,</div><div class='add'>+		      struct lola_stream *str, __le32 **bdlp,</div><div class='add'>+		      int ofs, int size)</div><div class='add'>+{</div><div class='add'>+	__le32 *bdl = *bdlp;</div><div class='add'>+</div><div class='add'>+	while (size &gt; 0) {</div><div class='add'>+		dma_addr_t addr;</div><div class='add'>+		int chunk;</div><div class='add'>+</div><div class='add'>+		if (str-&gt;frags &gt;= LOLA_MAX_BDL_ENTRIES)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		addr = snd_pcm_sgbuf_get_addr(substream, ofs);</div><div class='add'>+		/* program the address field of the BDL entry */</div><div class='add'>+		bdl[0] = cpu_to_le32((u32)addr);</div><div class='add'>+		bdl[1] = cpu_to_le32(upper_32_bits(addr));</div><div class='add'>+		/* program the size field of the BDL entry */</div><div class='add'>+		chunk = snd_pcm_sgbuf_get_chunk_size(substream, ofs, size);</div><div class='add'>+		bdl[2] = cpu_to_le32(chunk);</div><div class='add'>+		/* program the IOC to enable interrupt</div><div class='add'>+		 * only when the whole fragment is processed</div><div class='add'>+		 */</div><div class='add'>+		size -= chunk;</div><div class='add'>+		bdl[3] = size ? 0 : cpu_to_le32(0x01);</div><div class='add'>+		bdl += 4;</div><div class='add'>+		str-&gt;frags++;</div><div class='add'>+		ofs += chunk;</div><div class='add'>+	}</div><div class='add'>+	*bdlp = bdl;</div><div class='add'>+	return ofs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set up BDL entries</div><div class='add'>+ */</div><div class='add'>+static int lola_setup_periods(struct lola *chip, struct lola_pcm *pcm,</div><div class='add'>+			      struct snd_pcm_substream *substream,</div><div class='add'>+			      struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	__le32 *bdl;</div><div class='add'>+	int i, ofs, periods, period_bytes;</div><div class='add'>+</div><div class='add'>+	period_bytes = str-&gt;period_bytes;</div><div class='add'>+	periods = str-&gt;bufsize / period_bytes;</div><div class='add'>+</div><div class='add'>+	/* program the initial BDL entries */</div><div class='add'>+	bdl = (__le32 *)(pcm-&gt;bdl-&gt;area + LOLA_BDL_ENTRY_SIZE * str-&gt;index);</div><div class='add'>+	ofs = 0;</div><div class='add'>+	str-&gt;frags = 0;</div><div class='add'>+	for (i = 0; i &lt; periods; i++) {</div><div class='add'>+		ofs = setup_bdle(substream, str, &amp;bdl, ofs, period_bytes);</div><div class='add'>+		if (ofs &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ error:</div><div class='add'>+	dev_err(chip-&gt;card-&gt;dev, "Too many BDL entries: buffer=%d, period=%d\n",</div><div class='add'>+		   str-&gt;bufsize, period_bytes);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int lola_get_format_verb(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	unsigned int verb;</div><div class='add'>+</div><div class='add'>+	switch (substream-&gt;runtime-&gt;format) {</div><div class='add'>+	case SNDRV_PCM_FORMAT_S16_LE:</div><div class='add'>+		verb = 0x00000000;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_FORMAT_S24_LE:</div><div class='add'>+		verb = 0x00000200;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_FORMAT_S32_LE:</div><div class='add'>+		verb = 0x00000300;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_FORMAT_FLOAT_LE:</div><div class='add'>+		verb = 0x00001300;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	verb |= substream-&gt;runtime-&gt;channels;</div><div class='add'>+	return verb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_set_stream_config(struct lola *chip,</div><div class='add'>+				  struct lola_stream *str,</div><div class='add'>+				  int channels)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+	unsigned int verb, val;</div><div class='add'>+</div><div class='add'>+	/* set format info for all channels</div><div class='add'>+	 * (with only one command for the first channel)</div><div class='add'>+	 */</div><div class='add'>+	err = lola_codec_read(chip, str-&gt;nid, LOLA_VERB_SET_STREAM_FORMAT,</div><div class='add'>+			      str-&gt;format_verb, 0, &amp;val, NULL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Cannot set stream format 0x%x\n",</div><div class='add'>+		       str-&gt;format_verb);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update stream - channel config */</div><div class='add'>+	for (i = 0; i &lt; channels; i++) {</div><div class='add'>+		verb = (str-&gt;index &lt;&lt; 6) | i;</div><div class='add'>+		err = lola_codec_read(chip, str[i].nid,</div><div class='add'>+				      LOLA_VERB_SET_CHANNEL_STREAMID, 0, verb,</div><div class='add'>+				      &amp;val, NULL);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Cannot set stream channel %d\n", i);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * set up the SD for streaming</div><div class='add'>+ */</div><div class='add'>+static int lola_setup_controller(struct lola *chip, struct lola_pcm *pcm,</div><div class='add'>+				 struct lola_stream *str)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t bdl;</div><div class='add'>+</div><div class='add'>+	if (str-&gt;prepared)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* set up BDL */</div><div class='add'>+	bdl = pcm-&gt;bdl-&gt;addr + LOLA_BDL_ENTRY_SIZE * str-&gt;index;</div><div class='add'>+	lola_dsd_write(chip, str-&gt;dsd, BDPL, (u32)bdl);</div><div class='add'>+	lola_dsd_write(chip, str-&gt;dsd, BDPU, upper_32_bits(bdl));</div><div class='add'>+	/* program the stream LVI (last valid index) of the BDL */</div><div class='add'>+	lola_dsd_write(chip, str-&gt;dsd, LVI, str-&gt;frags - 1);</div><div class='add'>+	lola_stream_clear_pending_irq(chip, str);</div><div class='add'>+</div><div class='add'>+ 	lola_dsd_write(chip, str-&gt;dsd, CTL,</div><div class='add'>+		       LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE | LOLA_DSD_CTL_SRUN);</div><div class='add'>+</div><div class='add'>+	str-&gt;prepared = 1;</div><div class='add'>+</div><div class='add'>+	return lola_stream_wait_for_fifo(chip, str, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_pcm *pcm = lola_get_pcm(substream);</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='add'>+	unsigned int bufsize, period_bytes, format_verb;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	scoped_guard(mutex, &amp;chip-&gt;open_mutex) {</div><div class='add'>+		lola_stream_reset(chip, str);</div><div class='add'>+		lola_cleanup_slave_streams(pcm, str);</div><div class='add'>+		if (str-&gt;index + runtime-&gt;channels &gt; pcm-&gt;num_streams)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		for (i = 1; i &lt; runtime-&gt;channels; i++) {</div><div class='add'>+			str[i].master = str;</div><div class='add'>+			str[i].opened = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bufsize = snd_pcm_lib_buffer_bytes(substream);</div><div class='add'>+	period_bytes = snd_pcm_lib_period_bytes(substream);</div><div class='add'>+	format_verb = lola_get_format_verb(substream);</div><div class='add'>+</div><div class='add'>+	str-&gt;bufsize = bufsize;</div><div class='add'>+	str-&gt;period_bytes = period_bytes;</div><div class='add'>+	str-&gt;format_verb = format_verb;</div><div class='add'>+</div><div class='add'>+	err = lola_setup_periods(chip, pcm, substream, str);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_set_sample_rate(chip, runtime-&gt;rate);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	chip-&gt;sample_rate = runtime-&gt;rate;	/* sample rate gets locked */</div><div class='add'>+</div><div class='add'>+	err = lola_set_stream_config(chip, str, runtime-&gt;channels);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = lola_setup_controller(chip, pcm, str);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		lola_stream_reset(chip, str);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lola_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_stream *str;</div><div class='add'>+	struct snd_pcm_substream *s;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	unsigned int tstamp;</div><div class='add'>+	bool sync_streams;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SNDRV_PCM_TRIGGER_START:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_RESUME:</div><div class='add'>+		start = 1;</div><div class='add'>+		break;</div><div class='add'>+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_SUSPEND:</div><div class='add'>+	case SNDRV_PCM_TRIGGER_STOP:</div><div class='add'>+		start = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * sample correct synchronization is only needed starting several</div><div class='add'>+	 * streams. On stop or if only one stream do as quick as possible</div><div class='add'>+	 */</div><div class='add'>+	sync_streams = (start &amp;&amp; snd_pcm_stream_linked(substream));</div><div class='add'>+	tstamp = lola_get_tstamp(chip, !sync_streams);</div><div class='add'>+	guard(spinlock)(&amp;chip-&gt;reg_lock);</div><div class='add'>+	snd_pcm_group_for_each_entry(s, substream) {</div><div class='add'>+		if (s-&gt;pcm-&gt;card != substream-&gt;pcm-&gt;card)</div><div class='add'>+			continue;</div><div class='add'>+		str = lola_get_stream(s);</div><div class='add'>+		if (start)</div><div class='add'>+			lola_stream_start(chip, str, tstamp);</div><div class='add'>+		else</div><div class='add'>+			lola_stream_stop(chip, str, tstamp);</div><div class='add'>+		str-&gt;running = start;</div><div class='add'>+		str-&gt;paused = !start;</div><div class='add'>+		snd_pcm_trigger_done(s, substream);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static snd_pcm_uframes_t lola_pcm_pointer(struct snd_pcm_substream *substream)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = snd_pcm_substream_chip(substream);</div><div class='add'>+	struct lola_stream *str = lola_get_stream(substream);</div><div class='add'>+	unsigned int pos = lola_dsd_read(chip, str-&gt;dsd, LPIB);</div><div class='add'>+</div><div class='add'>+	if (pos &gt;= str-&gt;bufsize)</div><div class='add'>+		pos = 0;</div><div class='add'>+	return bytes_to_frames(substream-&gt;runtime, pos);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lola_pcm_update(struct lola *chip, struct lola_pcm *pcm, unsigned int bits)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u8 num_streams = min_t(u8, pcm-&gt;num_streams, ARRAY_SIZE(pcm-&gt;streams));</div><div class='add'>+</div><div class='add'>+	for (i = 0; bits &amp;&amp; i &lt; num_streams; i++) {</div><div class='add'>+		if (bits &amp; (1 &lt;&lt; i)) {</div><div class='add'>+			struct lola_stream *str = &amp;pcm-&gt;streams[i];</div><div class='add'>+			if (str-&gt;substream &amp;&amp; str-&gt;running)</div><div class='add'>+				snd_pcm_period_elapsed(str-&gt;substream);</div><div class='add'>+			bits &amp;= ~(1 &lt;&lt; i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct snd_pcm_ops lola_pcm_ops = {</div><div class='add'>+	.open = lola_pcm_open,</div><div class='add'>+	.close = lola_pcm_close,</div><div class='add'>+	.hw_params = lola_pcm_hw_params,</div><div class='add'>+	.hw_free = lola_pcm_hw_free,</div><div class='add'>+	.prepare = lola_pcm_prepare,</div><div class='add'>+	.trigger = lola_pcm_trigger,</div><div class='add'>+	.pointer = lola_pcm_pointer,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int lola_create_pcm(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	struct snd_pcm *pcm;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		chip-&gt;pcm[i].bdl =</div><div class='add'>+			snd_devm_alloc_pages(&amp;chip-&gt;pci-&gt;dev, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+					     PAGE_SIZE);</div><div class='add'>+		if (!chip-&gt;pcm[i].bdl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = snd_pcm_new(chip-&gt;card, "Digigram Lola", 0,</div><div class='add'>+			  chip-&gt;pcm[SNDRV_PCM_STREAM_PLAYBACK].num_streams,</div><div class='add'>+			  chip-&gt;pcm[SNDRV_PCM_STREAM_CAPTURE].num_streams,</div><div class='add'>+			  &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	strscpy(pcm-&gt;name, "Digigram Lola", sizeof(pcm-&gt;name));</div><div class='add'>+	pcm-&gt;private_data = chip;</div><div class='add'>+	for (i = 0; i &lt; 2; i++) {</div><div class='add'>+		if (chip-&gt;pcm[i].num_streams)</div><div class='add'>+			snd_pcm_set_ops(pcm, i, &amp;lola_pcm_ops);</div><div class='add'>+	}</div><div class='add'>+	/* buffer pre-allocation */</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev,</div><div class='add'>+				       1024 * 64, 32 * 1024 * 1024);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int lola_init_stream(struct lola *chip, struct lola_stream *str,</div><div class='add'>+			    int idx, int nid, int dir)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	str-&gt;nid = nid;</div><div class='add'>+	str-&gt;index = idx;</div><div class='add'>+	str-&gt;dsd = idx;</div><div class='add'>+	if (dir == PLAY)</div><div class='add'>+		str-&gt;dsd += MAX_STREAM_IN_COUNT;</div><div class='add'>+	err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read wcaps for 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (dir == PLAY) {</div><div class='add'>+		/* test TYPE and bits 0..11 (no test bit9 : Digital = 0/1) */</div><div class='add'>+		if ((val &amp; 0x00f00dff) != 0x00000010) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Invalid wcaps 0x%x for 0x%x\n",</div><div class='add'>+			       val, nid);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* test TYPE and bits 0..11 (no test bit9 : Digital = 0/1)</div><div class='add'>+		 * (bug : ignore bit8: Conn list = 0/1)</div><div class='add'>+		 */</div><div class='add'>+		if ((val &amp; 0x00f00cff) != 0x00100010) {</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+				"Invalid wcaps 0x%x for 0x%x\n",</div><div class='add'>+			       val, nid);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		/* test bit9:DIGITAL and bit12:SRC_PRESENT*/</div><div class='add'>+		if ((val &amp; 0x00001200) == 0x00001200)</div><div class='add'>+			chip-&gt;input_src_caps_mask |= (1 &lt;&lt; idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = lola_read_param(chip, nid, LOLA_PAR_STREAM_FORMATS, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Can't read FORMATS 0x%x\n", nid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	val &amp;= 3;</div><div class='add'>+	if (val == 3)</div><div class='add'>+		str-&gt;can_float = true;</div><div class='add'>+	if (!(val &amp; 1)) {</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev,</div><div class='add'>+			"Invalid formats 0x%x for 0x%x", val, nid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lola_init_pcm(struct lola *chip, int dir, int *nidp)</div><div class='add'>+{</div><div class='add'>+	struct lola_pcm *pcm = &amp;chip-&gt;pcm[dir];</div><div class='add'>+	int i, nid, err;</div><div class='add'>+</div><div class='add'>+	nid = *nidp;</div><div class='add'>+	for (i = 0; i &lt; pcm-&gt;num_streams; i++, nid++) {</div><div class='add'>+		err = lola_init_stream(chip, &amp;pcm-&gt;streams[i], i, nid, dir);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	*nidp = nid;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/sound/pci/lola/lola_proc.c b/sound/pci/lola/lola_proc.c<br/>new file mode 100644<br/>index 000000000000..a166672e22cb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lola/lola_proc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lola/lola_proc.c</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ *  Support for Digigram Lola PCI-e boards</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (c) 2011 Takashi Iwai &lt;tiwai@suse.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;sound/core.h&gt;</div><div class='add'>+#include &lt;sound/info.h&gt;</div><div class='add'>+#include &lt;sound/pcm.h&gt;</div><div class='add'>+#include "lola.h"</div><div class='add'>+</div><div class='add'>+static void print_audio_widget(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct lola *chip, int nid, const char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Node 0x%02x %s wcaps 0x%x\n", nid, name, val);</div><div class='add'>+	lola_read_param(chip, nid, LOLA_PAR_STREAM_FORMATS, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "  Formats: 0x%x\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_pin_widget(struct snd_info_buffer *buffer,</div><div class='add'>+			     struct lola *chip, int nid, unsigned int ampcap,</div><div class='add'>+			     const char *name)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Node 0x%02x %s wcaps 0x%x\n", nid, name, val);</div><div class='add'>+	if (val == 0x00400200)</div><div class='add'>+		return;</div><div class='add'>+	lola_read_param(chip, nid, ampcap, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "  Amp-Caps: 0x%x\n", val);</div><div class='add'>+	snd_iprintf(buffer, "    mute=%d, step-size=%d, steps=%d, ofs=%d\n",</div><div class='add'>+		    LOLA_AMP_MUTE_CAPABLE(val),</div><div class='add'>+		    LOLA_AMP_STEP_SIZE(val),</div><div class='add'>+		    LOLA_AMP_NUM_STEPS(val),</div><div class='add'>+		    LOLA_AMP_OFFSET(val));</div><div class='add'>+	lola_codec_read(chip, nid, LOLA_VERB_GET_MAX_LEVEL, 0, 0, &amp;val, NULL);</div><div class='add'>+	snd_iprintf(buffer, "  Max-level: 0x%x\n", val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_clock_widget(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct lola *chip, int nid)</div><div class='add'>+{</div><div class='add'>+	int i, j, num_clocks;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Node 0x%02x [Clock] wcaps 0x%x\n", nid, val);</div><div class='add'>+	num_clocks = val &amp; 0xff;</div><div class='add'>+	for (i = 0; i &lt; num_clocks; i += 4) {</div><div class='add'>+		unsigned int res_ex;</div><div class='add'>+		unsigned short items[4];</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='add'>+		lola_codec_read(chip, nid, LOLA_VERB_GET_CLOCK_LIST,</div><div class='add'>+				i, 0, &amp;val, &amp;res_ex);</div><div class='add'>+		items[0] = val &amp; 0xfff;</div><div class='add'>+		items[1] = (val &gt;&gt; 16) &amp; 0xfff;</div><div class='add'>+		items[2] = res_ex &amp; 0xfff;</div><div class='add'>+		items[3] = (res_ex &gt;&gt; 16) &amp; 0xfff;</div><div class='add'>+		for (j = 0; j &lt; 4; j++) {</div><div class='add'>+			unsigned char type = items[j] &gt;&gt; 8;</div><div class='add'>+			unsigned int freq = items[j] &amp; 0xff;</div><div class='add'>+			if (i + j &gt;= num_clocks)</div><div class='add'>+				break;</div><div class='add'>+			if (type == LOLA_CLOCK_TYPE_INTERNAL) {</div><div class='add'>+				name = "Internal";</div><div class='add'>+				freq = lola_sample_rate_convert(freq);</div><div class='add'>+			} else if (type == LOLA_CLOCK_TYPE_VIDEO) {</div><div class='add'>+				name = "Video";</div><div class='add'>+				freq = lola_sample_rate_convert(freq);</div><div class='add'>+			} else {</div><div class='add'>+				name = "Other";</div><div class='add'>+			}</div><div class='add'>+			snd_iprintf(buffer, "  Clock %d: Type %d:%s, freq=%d\n",</div><div class='add'>+				    i + j, type, name, freq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void print_mixer_widget(struct snd_info_buffer *buffer,</div><div class='add'>+			       struct lola *chip, int nid)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Node 0x%02x [Mixer] wcaps 0x%x\n", nid, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_proc_codec_read(struct snd_info_entry *entry,</div><div class='add'>+				 struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = entry-&gt;private_data;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int i, nid;</div><div class='add'>+</div><div class='add'>+	lola_read_param(chip, 0, LOLA_PAR_VENDOR_ID, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Vendor: 0x%08x\n", val);</div><div class='add'>+	lola_read_param(chip, 1, LOLA_PAR_FUNCTION_TYPE, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Function Type: %d\n", val);</div><div class='add'>+	lola_read_param(chip, 1, LOLA_PAR_SPECIFIC_CAPS, &amp;val);</div><div class='add'>+	snd_iprintf(buffer, "Specific-Caps: 0x%08x\n", val);</div><div class='add'>+	snd_iprintf(buffer, "  Pins-In %d, Pins-Out %d\n",</div><div class='add'>+		    chip-&gt;pin[CAPT].num_pins, chip-&gt;pin[PLAY].num_pins);</div><div class='add'>+	nid = 2;</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pcm[CAPT].num_streams; i++, nid++)</div><div class='add'>+		print_audio_widget(buffer, chip, nid, "[Audio-In]");</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pcm[PLAY].num_streams; i++, nid++)</div><div class='add'>+		print_audio_widget(buffer, chip, nid, "[Audio-Out]");</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[CAPT].num_pins; i++, nid++)</div><div class='add'>+		print_pin_widget(buffer, chip, nid, LOLA_PAR_AMP_IN_CAP,</div><div class='add'>+				 "[Pin-In]");</div><div class='add'>+	for (i = 0; i &lt; chip-&gt;pin[PLAY].num_pins; i++, nid++)</div><div class='add'>+		print_pin_widget(buffer, chip, nid, LOLA_PAR_AMP_OUT_CAP,</div><div class='add'>+				 "[Pin-Out]");</div><div class='add'>+	if (LOLA_AFG_CLOCK_WIDGET_PRESENT(chip-&gt;lola_caps)) {</div><div class='add'>+		print_clock_widget(buffer, chip, nid);</div><div class='add'>+		nid++;</div><div class='add'>+	}</div><div class='add'>+	if (LOLA_AFG_MIXER_WIDGET_PRESENT(chip-&gt;lola_caps)) {</div><div class='add'>+		print_mixer_widget(buffer, chip, nid);</div><div class='add'>+		nid++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* direct codec access for debugging */</div><div class='add'>+static void lola_proc_codec_rw_write(struct snd_info_entry *entry,</div><div class='add'>+				     struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = entry-&gt;private_data;</div><div class='add'>+	char line[64];</div><div class='add'>+	unsigned int id, verb, data, extdata;</div><div class='add'>+	while (!snd_info_get_line(buffer, line, sizeof(line))) {</div><div class='add'>+		if (sscanf(line, "%u %u %u %u", &amp;id, &amp;verb, &amp;data, &amp;extdata) != 4)</div><div class='add'>+			continue;</div><div class='add'>+		lola_codec_read(chip, id, verb, data, extdata,</div><div class='add'>+				&amp;chip-&gt;debug_res,</div><div class='add'>+				&amp;chip-&gt;debug_res_ex);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lola_proc_codec_rw_read(struct snd_info_entry *entry,</div><div class='add'>+				    struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = entry-&gt;private_data;</div><div class='add'>+	snd_iprintf(buffer, "0x%x 0x%x\n", chip-&gt;debug_res, chip-&gt;debug_res_ex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * dump some registers</div><div class='add'>+ */</div><div class='add'>+static void lola_proc_regs_read(struct snd_info_entry *entry,</div><div class='add'>+				struct snd_info_buffer *buffer)</div><div class='add'>+{</div><div class='add'>+	struct lola *chip = entry-&gt;private_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 0x40; i += 4) {</div><div class='add'>+		snd_iprintf(buffer, "BAR0 %02x: %08x\n", i,</div><div class='add'>+			    readl(chip-&gt;bar[BAR0].remap_addr + i));</div><div class='add'>+	}</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='add'>+	for (i = 0; i &lt; 0x30; i += 4) {</div><div class='add'>+		snd_iprintf(buffer, "BAR1 %02x: %08x\n", i,</div><div class='add'>+			    readl(chip-&gt;bar[BAR1].remap_addr + i));</div><div class='add'>+	}</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='add'>+	for (i = 0x80; i &lt; 0xa0; i += 4) {</div><div class='add'>+		snd_iprintf(buffer, "BAR1 %02x: %08x\n", i,</div><div class='add'>+			    readl(chip-&gt;bar[BAR1].remap_addr + i));</div><div class='add'>+	}</div><div class='add'>+	snd_iprintf(buffer, "\n");</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x STS  %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, STS));</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x LPIB %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, LPIB));</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x CTL  %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, CTL));</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x LVIL %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, LVI));</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x BDPL %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, BDPL));</div><div class='add'>+		snd_iprintf(buffer, "DSD %02x BDPU %08x\n", i,</div><div class='add'>+			    lola_dsd_read(chip, i, BDPU));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lola_proc_debug_new(struct lola *chip)</div><div class='add'>+{</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "codec", chip, lola_proc_codec_read);</div><div class='add'>+	snd_card_rw_proc_new(chip-&gt;card, "codec_rw", chip,</div><div class='add'>+			     lola_proc_codec_rw_read,</div><div class='add'>+			     lola_proc_codec_rw_write);</div><div class='add'>+	snd_card_ro_proc_new(chip-&gt;card, "regs", chip, lola_proc_regs_read);</div><div class='add'>+}</div><div class='head'>diff --git a/sound/pci/lx6464es/Makefile b/sound/pci/lx6464es/Makefile<br/>index eb04a6c73d8b..2b3047c7a388 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/Makefile?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lx6464es/Makefile</a></div><div class='hunk'>@@ -1,2 +1,3 @@</div><div class='del'>-snd-lx6464es-objs := lx6464es.o lx_core.o</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+snd-lx6464es-y := lx6464es.o lx_core.o</div><div class='ctx'> obj-$(CONFIG_SND_LX6464ES) += snd-lx6464es.o</div><div class='head'>diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c<br/>index ef9af3f4ace2..96df00db51d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx6464es.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx6464es.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx6464es.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lx6464es/lx6464es.c</a></div><div class='hunk'>@@ -1,25 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* -*- linux-c -*- *</div><div class='ctx'>  *</div><div class='ctx'>  * ALSA driver for the digigram lx6464es interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2008, 2009 Tim Blechmann &lt;tim@klingt.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -37,12 +21,10 @@</div><div class='ctx'> MODULE_AUTHOR("Tim Blechmann");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("digigram lx6464es");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("{digigram lx6464es{}}");</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;</div><div class='ctx'> static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;</div><div class='del'>-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='add'>+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;</div><div class='ctx'> </div><div class='ctx'> module_param_array(index, int, NULL, 0444);</div><div class='ctx'> MODULE_PARM_DESC(index, "Index value for Digigram LX6464ES interface.");</div><div class='hunk'>@@ -56,15 +38,23 @@ static const char card_name[] = "LX6464ES";</div><div class='ctx'> </div><div class='ctx'> #define PCI_DEVICE_ID_PLX_LX6464ES		PCI_DEVICE_ID_PLX_9056</div><div class='ctx'> </div><div class='del'>-static DEFINE_PCI_DEVICE_TABLE(snd_lx6464es_ids) = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),</div><div class='del'>-	  .subvendor = PCI_VENDOR_ID_DIGIGRAM,</div><div class='del'>-	  .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM</div><div class='add'>+static const struct pci_device_id snd_lx6464es_ids[] = {</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,</div><div class='add'>+			 PCI_VENDOR_ID_DIGIGRAM,</div><div class='add'>+			 PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM),</div><div class='ctx'> 	},			/* LX6464ES */</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),</div><div class='del'>-	  .subvendor = PCI_VENDOR_ID_DIGIGRAM,</div><div class='del'>-	  .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,</div><div class='add'>+			 PCI_VENDOR_ID_DIGIGRAM,</div><div class='add'>+			 PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM),</div><div class='ctx'> 	},			/* LX6464ES-CAE */</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,</div><div class='add'>+			 PCI_VENDOR_ID_DIGIGRAM,</div><div class='add'>+			 PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ESE_SERIAL_SUBSYSTEM),</div><div class='add'>+	},			/* LX6464ESe */</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,</div><div class='add'>+			 PCI_VENDOR_ID_DIGIGRAM,</div><div class='add'>+			 PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ESE_CAE_SERIAL_SUBSYSTEM),</div><div class='add'>+	},			/* LX6464ESe-CAE */</div><div class='ctx'> 	{ 0, },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +67,7 @@ MODULE_DEVICE_TABLE(pci, snd_lx6464es_ids);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* alsa callbacks */</div><div class='del'>-static struct snd_pcm_hardware lx_caps = {</div><div class='add'>+static const struct snd_pcm_hardware lx_caps = {</div><div class='ctx'> 	.info             = (SNDRV_PCM_INFO_MMAP |</div><div class='ctx'> 			     SNDRV_PCM_INFO_INTERLEAVED |</div><div class='ctx'> 			     SNDRV_PCM_INFO_MMAP_VALID |</div><div class='hunk'>@@ -112,16 +102,16 @@ static int lx_hardware_open(struct lx6464es *chip,</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_uframes_t period_size = runtime-&gt;period_size;</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "allocating pipe for %d channels\n", channels);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "allocating pipe for %d channels\n", channels);</div><div class='ctx'> 	err = lx_pipe_allocate(chip, 0, is_capture, channels);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "allocating pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, LXP "allocating pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = lx_set_granularity(chip, period_size);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "setting granularity to %ld failed\n",</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "setting granularity to %ld failed\n",</div><div class='ctx'> 			   period_size);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -136,24 +126,24 @@ static int lx_hardware_start(struct lx6464es *chip,</div><div class='ctx'> 	struct snd_pcm_runtime *runtime = substream-&gt;runtime;</div><div class='ctx'> 	int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "setting stream format\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "setting stream format\n");</div><div class='ctx'> 	err = lx_stream_set_format(chip, runtime, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "setting stream format failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "setting stream format failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "starting pipe\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "starting pipe\n");</div><div class='ctx'> 	err = lx_pipe_start(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "starting pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "starting pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "waiting for pipe to start\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "waiting for pipe to start\n");</div><div class='ctx'> 	err = lx_pipe_wait_for_start(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "waiting for pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "waiting for pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -167,24 +157,24 @@ static int lx_hardware_stop(struct lx6464es *chip,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "pausing pipe\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "pausing pipe\n");</div><div class='ctx'> 	err = lx_pipe_pause(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "pausing pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "pausing pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "waiting for pipe to become idle\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "waiting for pipe to become idle\n");</div><div class='ctx'> 	err = lx_pipe_wait_for_idle(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "waiting for pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "waiting for pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "stopping pipe\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "stopping pipe\n");</div><div class='ctx'> 	err = lx_pipe_stop(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(LXP "stopping pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "stopping pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -198,10 +188,10 @@ static int lx_hardware_close(struct lx6464es *chip,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "releasing pipe\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "releasing pipe\n");</div><div class='ctx'> 	err = lx_pipe_release(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(LXP "releasing pipe failed\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "releasing pipe failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -216,8 +206,8 @@ static int lx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int board_rate;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_pcm_open\n");</div><div class='del'>-	mutex_lock(&amp;chip-&gt;setup_mutex);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_open\n");</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;setup_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* copy the struct snd_pcm_hardware struct */</div><div class='ctx'> 	runtime-&gt;hw = lx_caps;</div><div class='hunk'>@@ -227,19 +217,19 @@ static int lx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	err = snd_pcm_hw_constraint_integer(runtime,</div><div class='ctx'> 					    SNDRV_PCM_HW_PARAM_PERIODS);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING LXP "could not constrain periods\n");</div><div class='del'>-		goto exit;</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "could not constrain periods\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* the clock rate cannot be changed */</div><div class='ctx'> 	board_rate = chip-&gt;board_sample_rate;</div><div class='del'>-	err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE,</div><div class='del'>-					   board_rate, board_rate);</div><div class='add'>+	err = snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_RATE,</div><div class='add'>+					   board_rate);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING LXP "could not constrain periods\n");</div><div class='del'>-		goto exit;</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "could not constrain periods\n");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* constrain period size */</div><div class='hunk'>@@ -248,9 +238,9 @@ static int lx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 					   MICROBLAZE_IBL_MIN,</div><div class='ctx'> 					   MICROBLAZE_IBL_MAX);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING LXP</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev,</div><div class='ctx'> 			   "could not constrain period size\n");</div><div class='del'>-		goto exit;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	snd_pcm_hw_constraint_step(runtime, 0,</div><div class='hunk'>@@ -259,19 +249,16 @@ static int lx_pcm_open(struct snd_pcm_substream *substream)</div><div class='ctx'> 	snd_pcm_set_sync(substream);</div><div class='ctx'> 	err = 0;</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='ctx'> 	runtime-&gt;private_data = chip;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;setup_mutex);</div><div class='del'>-	snd_printdd("&lt;-lx_pcm_open, %d\n", err);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "&lt;-lx_pcm_open, %d\n", err);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lx_pcm_close(struct snd_pcm_substream *substream)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	snd_printdd("-&gt;lx_pcm_close\n");</div><div class='del'>-	return err;</div><div class='add'>+	dev_dbg(substream-&gt;pcm-&gt;card-&gt;dev, "-&gt;lx_pcm_close\n");</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static snd_pcm_uframes_t lx_pcm_stream_pointer(struct snd_pcm_substream</div><div class='hunk'>@@ -279,19 +266,17 @@ static snd_pcm_uframes_t lx_pcm_stream_pointer(struct snd_pcm_substream</div><div class='ctx'> {</div><div class='ctx'> 	struct lx6464es *chip = snd_pcm_substream_chip(substream);</div><div class='ctx'> 	snd_pcm_uframes_t pos;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='ctx'> 	struct lx_stream *lx_stream = is_capture ? &amp;chip-&gt;capture_stream :</div><div class='ctx'> 		&amp;chip-&gt;playback_stream;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_pcm_stream_pointer\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_stream_pointer\n");</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	pos = lx_stream-&gt;frame_pos * substream-&gt;runtime-&gt;period_size;</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	snd_printdd(LXP "stream_pointer at %ld\n", pos);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "stream_pointer at %ld\n", pos);</div><div class='ctx'> 	return pos;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -301,39 +286,39 @@ static int lx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	const int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_pcm_prepare\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_prepare\n");</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;setup_mutex);</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;setup_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;hardware_running[is_capture]) {</div><div class='ctx'> 		err = lx_hardware_stop(chip, substream);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR LXP "failed to stop hardware. "</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "failed to stop hardware. "</div><div class='ctx'> 				   "Error code %d\n", err);</div><div class='del'>-			goto exit;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = lx_hardware_close(chip, substream);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR LXP "failed to close hardware. "</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "failed to close hardware. "</div><div class='ctx'> 				   "Error code %d\n", err);</div><div class='del'>-			goto exit;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "opening hardware\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "opening hardware\n");</div><div class='ctx'> 	err = lx_hardware_open(chip, substream);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "failed to open hardware. "</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "failed to open hardware. "</div><div class='ctx'> 			   "Error code %d\n", err);</div><div class='del'>-		goto exit;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = lx_hardware_start(chip, substream);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "failed to start hardware. "</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "failed to start hardware. "</div><div class='ctx'> 			   "Error code %d\n", err);</div><div class='del'>-		goto exit;</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;hardware_running[is_capture] = 1;</div><div class='hunk'>@@ -343,8 +328,6 @@ static int lx_pcm_prepare(struct snd_pcm_substream *substream)</div><div class='ctx'> 			chip-&gt;board_sample_rate = substream-&gt;runtime-&gt;rate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;setup_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -352,23 +335,17 @@ static int lx_pcm_hw_params(struct snd_pcm_substream *substream,</div><div class='ctx'> 			    struct snd_pcm_hw_params *hw_params, int is_capture)</div><div class='ctx'> {</div><div class='ctx'> 	struct lx6464es *chip = snd_pcm_substream_chip(substream);</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	snd_printdd("-&gt;lx_pcm_hw_params\n");</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;setup_mutex);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_hw_params\n");</div><div class='ctx'> </div><div class='del'>-	/* set dma buffer */</div><div class='del'>-	err = snd_pcm_lib_malloc_pages(substream,</div><div class='del'>-				       params_buffer_bytes(hw_params));</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;setup_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (is_capture)</div><div class='ctx'> 		chip-&gt;capture_stream.stream = substream;</div><div class='ctx'> 	else</div><div class='ctx'> 		chip-&gt;playback_stream.stream = substream;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;setup_mutex);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lx_pcm_hw_params_playback(struct snd_pcm_substream *substream,</div><div class='hunk'>@@ -389,43 +366,39 @@ static int lx_pcm_hw_free(struct snd_pcm_substream *substream)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int is_capture = (substream-&gt;stream == SNDRV_PCM_STREAM_CAPTURE);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_pcm_hw_free\n");</div><div class='del'>-	mutex_lock(&amp;chip-&gt;setup_mutex);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_hw_free\n");</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;setup_mutex);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;hardware_running[is_capture]) {</div><div class='ctx'> 		err = lx_hardware_stop(chip, substream);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR LXP "failed to stop hardware. "</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "failed to stop hardware. "</div><div class='ctx'> 				   "Error code %d\n", err);</div><div class='del'>-			goto exit;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = lx_hardware_close(chip, substream);</div><div class='ctx'> 		if (err &lt; 0) {</div><div class='del'>-			snd_printk(KERN_ERR LXP "failed to close hardware. "</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "failed to close hardware. "</div><div class='ctx'> 				   "Error code %d\n", err);</div><div class='del'>-			goto exit;</div><div class='add'>+			return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		chip-&gt;hardware_running[is_capture] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_free_pages(substream);</div><div class='del'>-</div><div class='ctx'> 	if (is_capture)</div><div class='del'>-		chip-&gt;capture_stream.stream = 0;</div><div class='add'>+		chip-&gt;capture_stream.stream = NULL;</div><div class='ctx'> 	else</div><div class='del'>-		chip-&gt;playback_stream.stream = 0;</div><div class='add'>+		chip-&gt;playback_stream.stream = NULL;</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;setup_mutex);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)</div><div class='ctx'> {</div><div class='ctx'> 	struct snd_pcm_substream *substream = lx_stream-&gt;stream;</div><div class='del'>-	const int is_capture = lx_stream-&gt;is_capture;</div><div class='add'>+	const unsigned int is_capture = lx_stream-&gt;is_capture;</div><div class='ctx'> </div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -446,25 +419,25 @@ static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)</div><div class='ctx'> </div><div class='ctx'> 		err = lx_buffer_ask(chip, 0, is_capture, &amp;needed, &amp;freed,</div><div class='ctx'> 				    size_array);</div><div class='del'>-		snd_printdd(LXP "starting: needed %d, freed %d\n",</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "starting: needed %d, freed %d\n",</div><div class='ctx'> 			    needed, freed);</div><div class='ctx'> </div><div class='ctx'> 		err = lx_buffer_give(chip, 0, is_capture, period_bytes,</div><div class='ctx'> 				     lower_32_bits(buf), upper_32_bits(buf),</div><div class='ctx'> 				     &amp;buffer_index);</div><div class='ctx'> </div><div class='del'>-		snd_printdd(LXP "starting: buffer index %x on %p (%d bytes)\n",</div><div class='del'>-			    buffer_index, (void *)buf, period_bytes);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "starting: buffer index %x on 0x%lx (%d bytes)\n",</div><div class='add'>+			    buffer_index, (unsigned long)buf, period_bytes);</div><div class='ctx'> 		buf += period_bytes;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = lx_buffer_ask(chip, 0, is_capture, &amp;needed, &amp;freed, size_array);</div><div class='del'>-	snd_printdd(LXP "starting: needed %d, freed %d\n", needed, freed);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "starting: needed %d, freed %d\n", needed, freed);</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "starting: starting stream\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "starting: starting stream\n");</div><div class='ctx'> 	err = lx_stream_start(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR LXP "couldn't start stream\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "couldn't start stream\n");</div><div class='ctx'> 	else</div><div class='ctx'> 		lx_stream-&gt;status = LX_STREAM_STATUS_RUNNING;</div><div class='ctx'> </div><div class='hunk'>@@ -473,20 +446,20 @@ static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)</div><div class='ctx'> </div><div class='ctx'> static void lx_trigger_stop(struct lx6464es *chip, struct lx_stream *lx_stream)</div><div class='ctx'> {</div><div class='del'>-	const int is_capture = lx_stream-&gt;is_capture;</div><div class='add'>+	const unsigned int is_capture = lx_stream-&gt;is_capture;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "stopping: stopping stream\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "stopping: stopping stream\n");</div><div class='ctx'> 	err = lx_stream_stop(chip, 0, is_capture);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		snd_printk(KERN_ERR LXP "couldn't stop stream\n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "couldn't stop stream\n");</div><div class='ctx'> 	else</div><div class='ctx'> 		lx_stream-&gt;status = LX_STREAM_STATUS_FREE;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lx_trigger_tasklet_dispatch_stream(struct lx6464es *chip,</div><div class='del'>-					       struct lx_stream *lx_stream)</div><div class='add'>+static void lx_trigger_dispatch_stream(struct lx6464es *chip,</div><div class='add'>+				       struct lx_stream *lx_stream)</div><div class='ctx'> {</div><div class='ctx'> 	switch (lx_stream-&gt;status) {</div><div class='ctx'> 	case LX_STREAM_STATUS_SCHEDULE_RUN:</div><div class='hunk'>@@ -502,24 +475,10 @@ static void lx_trigger_tasklet_dispatch_stream(struct lx6464es *chip,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lx_trigger_tasklet(unsigned long data)</div><div class='del'>-{</div><div class='del'>-	struct lx6464es *chip = (struct lx6464es *)data;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	snd_printdd("-&gt;lx_trigger_tasklet\n");</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;chip-&gt;lock, flags);</div><div class='del'>-	lx_trigger_tasklet_dispatch_stream(chip, &amp;chip-&gt;capture_stream);</div><div class='del'>-	lx_trigger_tasklet_dispatch_stream(chip, &amp;chip-&gt;playback_stream);</div><div class='del'>-	spin_unlock_irqrestore(&amp;chip-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int lx_pcm_trigger_dispatch(struct lx6464es *chip,</div><div class='ctx'> 				   struct lx_stream *lx_stream, int cmd)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='add'>+	guard(mutex)(&amp;chip-&gt;lock);</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SNDRV_PCM_TRIGGER_START:</div><div class='ctx'> 		lx_stream-&gt;status = LX_STREAM_STATUS_SCHEDULE_RUN;</div><div class='hunk'>@@ -530,13 +489,13 @@ static int lx_pcm_trigger_dispatch(struct lx6464es *chip,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto exit;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	tasklet_schedule(&amp;chip-&gt;trigger_tasklet);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='del'>-	return err;</div><div class='add'>+	lx_trigger_dispatch_stream(chip, &amp;chip-&gt;capture_stream);</div><div class='add'>+	lx_trigger_dispatch_stream(chip, &amp;chip-&gt;playback_stream);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -547,43 +506,25 @@ static int lx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)</div><div class='ctx'> 	struct lx_stream *stream = is_capture ? &amp;chip-&gt;capture_stream :</div><div class='ctx'> 		&amp;chip-&gt;playback_stream;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_pcm_trigger\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_pcm_trigger\n");</div><div class='ctx'> </div><div class='ctx'> 	return lx_pcm_trigger_dispatch(chip, stream, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int snd_lx6464es_free(struct lx6464es *chip)</div><div class='add'>+static void snd_lx6464es_free(struct snd_card *card)</div><div class='ctx'> {</div><div class='del'>-	snd_printdd("-&gt;snd_lx6464es_free\n");</div><div class='add'>+	struct lx6464es *chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='ctx'> 	lx_irq_disable(chip);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;irq &gt;= 0)</div><div class='del'>-		free_irq(chip-&gt;irq, chip);</div><div class='del'>-</div><div class='del'>-	iounmap(chip-&gt;port_dsp_bar);</div><div class='del'>-	ioport_unmap(chip-&gt;port_plx_remapped);</div><div class='del'>-</div><div class='del'>-	pci_release_regions(chip-&gt;pci);</div><div class='del'>-	pci_disable_device(chip-&gt;pci);</div><div class='del'>-</div><div class='del'>-	kfree(chip);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int snd_lx6464es_dev_free(struct snd_device *device)</div><div class='del'>-{</div><div class='del'>-	return snd_lx6464es_free(device-&gt;device_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* reset the dsp during initialization */</div><div class='del'>-static int __devinit lx_init_xilinx_reset(struct lx6464es *chip)</div><div class='add'>+static int lx_init_xilinx_reset(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 plx_reg = lx_plx_reg_read(chip, ePLX_CHIPSC);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_init_xilinx_reset\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_init_xilinx_reset\n");</div><div class='ctx'> </div><div class='ctx'> 	/* activate reset of xilinx */</div><div class='ctx'> 	plx_reg &amp;= ~CHIPSC_RESET_XILINX;</div><div class='hunk'>@@ -603,8 +544,8 @@ static int __devinit lx_init_xilinx_reset(struct lx6464es *chip)</div><div class='ctx'> 		msleep(10);</div><div class='ctx'> 		reg_mbox3 = lx_plx_reg_read(chip, ePLX_MBOX3);</div><div class='ctx'> 		if (reg_mbox3) {</div><div class='del'>-			snd_printd(LXP "xilinx reset done\n");</div><div class='del'>-			snd_printdd(LXP "xilinx took %d loops\n", i);</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "xilinx reset done\n");</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "xilinx took %d loops\n", i);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -620,11 +561,11 @@ static int __devinit lx_init_xilinx_reset(struct lx6464es *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit lx_init_xilinx_test(struct lx6464es *chip)</div><div class='add'>+static int lx_init_xilinx_test(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_init_xilinx_test\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_init_xilinx_test\n");</div><div class='ctx'> </div><div class='ctx'> 	/* TEST if we have access to Xilinx/MicroBlaze */</div><div class='ctx'> 	lx_dsp_reg_write(chip, eReg_CSM, 0);</div><div class='hunk'>@@ -632,25 +573,25 @@ static int __devinit lx_init_xilinx_test(struct lx6464es *chip)</div><div class='ctx'> 	reg = lx_dsp_reg_read(chip, eReg_CSM);</div><div class='ctx'> </div><div class='ctx'> 	if (reg) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "Problem: Reg_CSM %x.\n", reg);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "Problem: Reg_CSM %x.\n", reg);</div><div class='ctx'> </div><div class='ctx'> 		/* PCI9056_SPACE0_REMAP */</div><div class='ctx'> 		lx_plx_reg_write(chip, ePLX_PCICR, 1);</div><div class='ctx'> </div><div class='ctx'> 		reg = lx_dsp_reg_read(chip, eReg_CSM);</div><div class='ctx'> 		if (reg) {</div><div class='del'>-			snd_printk(KERN_ERR LXP "Error: Reg_CSM %x.\n", reg);</div><div class='add'>+			dev_err(chip-&gt;card-&gt;dev, "Error: Reg_CSM %x.\n", reg);</div><div class='ctx'> 			return -EAGAIN; /* seems to be appropriate */</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "Xilinx/MicroBlaze access test successful\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "Xilinx/MicroBlaze access test successful\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize ethersound */</div><div class='del'>-static int __devinit lx_init_ethersound_config(struct lx6464es *chip)</div><div class='add'>+static int lx_init_ethersound_config(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 orig_conf_es = lx_dsp_reg_read(chip, eReg_CONFES);</div><div class='hunk'>@@ -661,7 +602,7 @@ static int __devinit lx_init_ethersound_config(struct lx6464es *chip)</div><div class='ctx'> 		(64 &lt;&lt; IOCR_OUTPUTS_OFFSET) |</div><div class='ctx'> 		(FREQ_RATIO_SINGLE_MODE &lt;&lt; FREQ_RATIO_OFFSET);</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_init_ethersound\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_init_ethersound\n");</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;freq_ratio = FREQ_RATIO_SINGLE_MODE;</div><div class='ctx'> </div><div class='hunk'>@@ -675,35 +616,35 @@ static int __devinit lx_init_ethersound_config(struct lx6464es *chip)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i != 1000; ++i) {</div><div class='ctx'> 		if (lx_dsp_reg_read(chip, eReg_CSES) &amp; 4) {</div><div class='del'>-			snd_printd(LXP "ethersound initialized after %dms\n",</div><div class='add'>+			dev_dbg(chip-&gt;card-&gt;dev, "ethersound initialized after %dms\n",</div><div class='ctx'> 				   i);</div><div class='ctx'> 			goto ethersound_initialized;</div><div class='ctx'> 		}</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='del'>-	snd_printk(KERN_WARNING LXP</div><div class='add'>+	dev_warn(chip-&gt;card-&gt;dev,</div><div class='ctx'> 		   "ethersound could not be initialized after %dms\n", i);</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'>  ethersound_initialized:</div><div class='del'>-	snd_printd(LXP "ethersound initialized\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "ethersound initialized\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit lx_init_get_version_features(struct lx6464es *chip)</div><div class='add'>+static int lx_init_get_version_features(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dsp_version;</div><div class='ctx'> </div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_init_get_version_features\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_init_get_version_features\n");</div><div class='ctx'> </div><div class='ctx'> 	err = lx_dsp_get_version(chip, &amp;dsp_version);</div><div class='ctx'> </div><div class='ctx'> 	if (err == 0) {</div><div class='ctx'> 		u32 freq;</div><div class='ctx'> </div><div class='del'>-		snd_printk(LXP "DSP version: V%02d.%02d #%d\n",</div><div class='add'>+		dev_info(chip-&gt;card-&gt;dev, "DSP version: V%02d.%02d #%d\n",</div><div class='ctx'> 			   (dsp_version&gt;&gt;16) &amp; 0xff, (dsp_version&gt;&gt;8) &amp; 0xff,</div><div class='ctx'> 			   dsp_version &amp; 0xff);</div><div class='ctx'> </div><div class='hunk'>@@ -718,9 +659,9 @@ static int __devinit lx_init_get_version_features(struct lx6464es *chip)</div><div class='ctx'> 		err = lx_dsp_get_clock_frequency(chip, &amp;freq);</div><div class='ctx'> 		if (err == 0)</div><div class='ctx'> 			chip-&gt;board_sample_rate = freq;</div><div class='del'>-		snd_printd(LXP "actual clock frequency %d\n", freq);</div><div class='add'>+		dev_dbg(chip-&gt;card-&gt;dev, "actual clock frequency %d\n", freq);</div><div class='ctx'> 	} else {</div><div class='del'>-		snd_printk(KERN_ERR LXP "DSP corrupted \n");</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "DSP corrupted \n");</div><div class='ctx'> 		err = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +673,7 @@ static int lx_set_granularity(struct lx6464es *chip, u32 gran)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 snapped_gran = MICROBLAZE_IBL_MIN;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_set_granularity\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_set_granularity\n");</div><div class='ctx'> </div><div class='ctx'> 	/* blocksize is a power of 2 */</div><div class='ctx'> 	while ((snapped_gran &lt; gran) &amp;&amp;</div><div class='hunk'>@@ -745,39 +686,38 @@ static int lx_set_granularity(struct lx6464es *chip, u32 gran)</div><div class='ctx'> </div><div class='ctx'> 	err = lx_dsp_set_granularity(chip, snapped_gran);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_WARNING LXP "could not set granularity\n");</div><div class='add'>+		dev_warn(chip-&gt;card-&gt;dev, "could not set granularity\n");</div><div class='ctx'> 		err = -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (snapped_gran != gran)</div><div class='del'>-		snd_printk(LXP "snapped blocksize to %d\n", snapped_gran);</div><div class='add'>+		dev_err(chip-&gt;card-&gt;dev, "snapped blocksize to %d\n", snapped_gran);</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "set blocksize on board %d\n", snapped_gran);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "set blocksize on board %d\n", snapped_gran);</div><div class='ctx'> 	chip-&gt;pcm_granularity = snapped_gran;</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* initialize and test the xilinx dsp chip */</div><div class='del'>-static int __devinit lx_init_dsp(struct lx6464es *chip)</div><div class='add'>+static int lx_init_dsp(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='del'>-	u8 mac_address[6];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;lx_init_dsp\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "-&gt;lx_init_dsp\n");</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "initialize board\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "initialize board\n");</div><div class='ctx'> 	err = lx_init_xilinx_reset(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "testing board\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "testing board\n");</div><div class='ctx'> 	err = lx_init_xilinx_test(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	snd_printd(LXP "initialize ethersound configuration\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "initialize ethersound configuration\n");</div><div class='ctx'> 	err = lx_init_ethersound_config(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -787,21 +727,22 @@ static int __devinit lx_init_dsp(struct lx6464es *chip)</div><div class='ctx'> 	/** \todo the mac address should be ready by not, but it isn't,</div><div class='ctx'> 	 *  so we wait for it */</div><div class='ctx'> 	for (i = 0; i != 1000; ++i) {</div><div class='del'>-		err = lx_dsp_get_mac(chip, mac_address);</div><div class='add'>+		err = lx_dsp_get_mac(chip);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		if (mac_address[0] || mac_address[1] || mac_address[2] ||</div><div class='del'>-		    mac_address[3] || mac_address[4] || mac_address[5])</div><div class='add'>+		if (chip-&gt;mac_address[0] || chip-&gt;mac_address[1] || chip-&gt;mac_address[2] ||</div><div class='add'>+		    chip-&gt;mac_address[3] || chip-&gt;mac_address[4] || chip-&gt;mac_address[5])</div><div class='ctx'> 			goto mac_ready;</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> mac_ready:</div><div class='del'>-	snd_printd(LXP "mac address ready read after: %dms\n", i);</div><div class='del'>-	snd_printk(LXP "mac address: %02X.%02X.%02X.%02X.%02X.%02X\n",</div><div class='del'>-		   mac_address[0], mac_address[1], mac_address[2],</div><div class='del'>-		   mac_address[3], mac_address[4], mac_address[5]);</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "mac address ready read after: %dms\n", i);</div><div class='add'>+	dev_info(chip-&gt;card-&gt;dev,</div><div class='add'>+		 "mac address: %02X.%02X.%02X.%02X.%02X.%02X\n",</div><div class='add'>+		   chip-&gt;mac_address[0], chip-&gt;mac_address[1], chip-&gt;mac_address[2],</div><div class='add'>+		   chip-&gt;mac_address[3], chip-&gt;mac_address[4], chip-&gt;mac_address[5]);</div><div class='ctx'> </div><div class='ctx'> 	err = lx_init_get_version_features(chip);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -814,10 +755,9 @@ mac_ready:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops lx_ops_playback = {</div><div class='add'>+static const struct snd_pcm_ops lx_ops_playback = {</div><div class='ctx'> 	.open      = lx_pcm_open,</div><div class='ctx'> 	.close     = lx_pcm_close,</div><div class='del'>-	.ioctl     = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.prepare   = lx_pcm_prepare,</div><div class='ctx'> 	.hw_params = lx_pcm_hw_params_playback,</div><div class='ctx'> 	.hw_free   = lx_pcm_hw_free,</div><div class='hunk'>@@ -825,10 +765,9 @@ static struct snd_pcm_ops lx_ops_playback = {</div><div class='ctx'> 	.pointer   = lx_pcm_stream_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct snd_pcm_ops lx_ops_capture = {</div><div class='add'>+static const struct snd_pcm_ops lx_ops_capture = {</div><div class='ctx'> 	.open      = lx_pcm_open,</div><div class='ctx'> 	.close     = lx_pcm_close,</div><div class='del'>-	.ioctl     = snd_pcm_lib_ioctl,</div><div class='ctx'> 	.prepare   = lx_pcm_prepare,</div><div class='ctx'> 	.hw_params = lx_pcm_hw_params_capture,</div><div class='ctx'> 	.hw_free   = lx_pcm_hw_free,</div><div class='hunk'>@@ -836,7 +775,7 @@ static struct snd_pcm_ops lx_ops_capture = {</div><div class='ctx'> 	.pointer   = lx_pcm_stream_pointer,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __devinit lx_pcm_create(struct lx6464es *chip)</div><div class='add'>+static int lx_pcm_create(struct lx6464es *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	struct snd_pcm *pcm;</div><div class='hunk'>@@ -852,6 +791,8 @@ static int __devinit lx_pcm_create(struct lx6464es *chip)</div><div class='ctx'> 	/* hardcoded device name &amp; channel count */</div><div class='ctx'> 	err = snd_pcm_new(chip-&gt;card, (char *)card_name, 0,</div><div class='ctx'> 			  1, 1, &amp;pcm);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;private_data = chip;</div><div class='ctx'> </div><div class='hunk'>@@ -859,13 +800,11 @@ static int __devinit lx_pcm_create(struct lx6464es *chip)</div><div class='ctx'> 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &amp;lx_ops_capture);</div><div class='ctx'> </div><div class='ctx'> 	pcm-&gt;info_flags = 0;</div><div class='del'>-	strcpy(pcm-&gt;name, card_name);</div><div class='add'>+	pcm-&gt;nonatomic = true;</div><div class='add'>+	strscpy(pcm-&gt;name, card_name);</div><div class='ctx'> </div><div class='del'>-	err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='del'>-						    snd_dma_pci_data(chip-&gt;pci),</div><div class='del'>-						    size, size);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,</div><div class='add'>+				       &amp;chip-&gt;pci-&gt;dev, size, size);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;pcm = pcm;</div><div class='ctx'> 	chip-&gt;capture_stream.is_capture = 1;</div><div class='hunk'>@@ -906,7 +845,7 @@ static int lx_control_playback_put(struct snd_kcontrol *kcontrol,</div><div class='ctx'> 	return changed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct snd_kcontrol_new lx_control_playback_switch __devinitdata = {</div><div class='add'>+static const struct snd_kcontrol_new lx_control_playback_switch = {</div><div class='ctx'> 	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,</div><div class='ctx'> 	.name = "PCM Playback Switch",</div><div class='ctx'> 	.index = 0,</div><div class='hunk'>@@ -953,98 +892,75 @@ static void lx_proc_levels_read(struct snd_info_entry *entry,</div><div class='ctx'> 	snd_iprintf(buffer, "\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit lx_proc_create(struct snd_card *card, struct lx6464es *chip)</div><div class='add'>+static int lx_proc_create(struct snd_card *card, struct lx6464es *chip)</div><div class='ctx'> {</div><div class='del'>-	struct snd_info_entry *entry;</div><div class='del'>-	int err = snd_card_proc_new(card, "levels", &amp;entry);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	snd_info_set_text_ops(entry, chip, lx_proc_levels_read);</div><div class='del'>-	return 0;</div><div class='add'>+	return snd_card_ro_proc_new(card, "levels", chip, lx_proc_levels_read);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int __devinit snd_lx6464es_create(struct snd_card *card,</div><div class='del'>-					 struct pci_dev *pci,</div><div class='del'>-					 struct lx6464es **rchip)</div><div class='add'>+static int snd_lx6464es_create(struct snd_card *card,</div><div class='add'>+			       struct pci_dev *pci)</div><div class='ctx'> {</div><div class='del'>-	struct lx6464es *chip;</div><div class='add'>+	struct lx6464es *chip = card-&gt;private_data;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	static struct snd_device_ops ops = {</div><div class='del'>-		.dev_free = snd_lx6464es_dev_free,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	snd_printdd("-&gt;snd_lx6464es_create\n");</div><div class='del'>-</div><div class='del'>-	*rchip = NULL;</div><div class='add'>+	dev_dbg(card-&gt;dev, "-&gt;snd_lx6464es_create\n");</div><div class='ctx'> </div><div class='ctx'> 	/* enable PCI device */</div><div class='del'>-	err = pci_enable_device(pci);</div><div class='add'>+	err = pcim_enable_device(pci);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pci);</div><div class='ctx'> </div><div class='ctx'> 	/* check if we can restrict PCI DMA transfers to 32 bits */</div><div class='del'>-	err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));</div><div class='add'>+	err = dma_set_mask(&amp;pci-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR "architecture does not support "</div><div class='del'>-			   "32bit PCI busmaster DMA\n");</div><div class='del'>-		pci_disable_device(pci);</div><div class='add'>+		dev_err(card-&gt;dev,</div><div class='add'>+			"architecture does not support 32bit PCI busmaster DMA\n");</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	chip = kzalloc(sizeof(*chip), GFP_KERNEL);</div><div class='del'>-	if (chip == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto alloc_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;card = card;</div><div class='ctx'> 	chip-&gt;pci = pci;</div><div class='ctx'> 	chip-&gt;irq = -1;</div><div class='ctx'> </div><div class='ctx'> 	/* initialize synchronization structs */</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;lock);</div><div class='del'>-	spin_lock_init(&amp;chip-&gt;msg_lock);</div><div class='add'>+	mutex_init(&amp;chip-&gt;lock);</div><div class='add'>+	mutex_init(&amp;chip-&gt;msg_lock);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;setup_mutex);</div><div class='del'>-	tasklet_init(&amp;chip-&gt;trigger_tasklet, lx_trigger_tasklet,</div><div class='del'>-		     (unsigned long)chip);</div><div class='del'>-	tasklet_init(&amp;chip-&gt;tasklet_capture, lx_tasklet_capture,</div><div class='del'>-		     (unsigned long)chip);</div><div class='del'>-	tasklet_init(&amp;chip-&gt;tasklet_playback, lx_tasklet_playback,</div><div class='del'>-		     (unsigned long)chip);</div><div class='ctx'> </div><div class='ctx'> 	/* request resources */</div><div class='del'>-	err = pci_request_regions(pci, card_name);</div><div class='add'>+	err = pcim_request_all_regions(pci, card_name);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto request_regions_failed;</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* plx port */</div><div class='ctx'> 	chip-&gt;port_plx = pci_resource_start(pci, 1);</div><div class='del'>-	chip-&gt;port_plx_remapped = ioport_map(chip-&gt;port_plx,</div><div class='del'>-					     pci_resource_len(pci, 1));</div><div class='add'>+	chip-&gt;port_plx_remapped = devm_ioport_map(&amp;pci-&gt;dev, chip-&gt;port_plx,</div><div class='add'>+						  pci_resource_len(pci, 1));</div><div class='add'>+	if (!chip-&gt;port_plx_remapped)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* dsp port */</div><div class='del'>-	chip-&gt;port_dsp_bar = pci_ioremap_bar(pci, 2);</div><div class='add'>+	chip-&gt;port_dsp_bar = pcim_iomap(pci, 2, 0);</div><div class='add'>+	if (!chip-&gt;port_dsp_bar)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(pci-&gt;irq, lx_interrupt, IRQF_SHARED,</div><div class='del'>-			  card_name, chip);</div><div class='add'>+	err = devm_request_threaded_irq(&amp;pci-&gt;dev, pci-&gt;irq, lx_interrupt,</div><div class='add'>+					lx_threaded_irq, IRQF_SHARED,</div><div class='add'>+					KBUILD_MODNAME, chip);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='del'>-		goto request_irq_failed;</div><div class='add'>+		dev_err(card-&gt;dev, "unable to grab IRQ %d\n", pci-&gt;irq);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;irq = pci-&gt;irq;</div><div class='del'>-</div><div class='del'>-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &amp;ops);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto device_new_failed;</div><div class='add'>+	card-&gt;sync_irq = chip-&gt;irq;</div><div class='add'>+	card-&gt;private_free = snd_lx6464es_free;</div><div class='ctx'> </div><div class='ctx'> 	err = lx_init_dsp(chip);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "error during DSP initialization\n");</div><div class='add'>+		dev_err(card-&gt;dev, "error during DSP initialization\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1061,35 +977,18 @@ static int __devinit snd_lx6464es_create(struct snd_card *card,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	snd_card_set_dev(card, &amp;pci-&gt;dev);</div><div class='del'>-</div><div class='del'>-	*rchip = chip;</div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-device_new_failed:</div><div class='del'>-	free_irq(pci-&gt;irq, chip);</div><div class='del'>-</div><div class='del'>-request_irq_failed:</div><div class='del'>-	pci_release_regions(pci);</div><div class='del'>-</div><div class='del'>-request_regions_failed:</div><div class='del'>-	kfree(chip);</div><div class='del'>-</div><div class='del'>-alloc_failed:</div><div class='del'>-	pci_disable_device(pci);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __devinit snd_lx6464es_probe(struct pci_dev *pci,</div><div class='del'>-					const struct pci_device_id *pci_id)</div><div class='add'>+static int snd_lx6464es_probe(struct pci_dev *pci,</div><div class='add'>+			      const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='ctx'> 	static int dev;</div><div class='ctx'> 	struct snd_card *card;</div><div class='ctx'> 	struct lx6464es *chip;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	snd_printdd("-&gt;snd_lx6464es_probe\n");</div><div class='add'>+	dev_dbg(&amp;pci-&gt;dev, "-&gt;snd_lx6464es_probe\n");</div><div class='ctx'> </div><div class='ctx'> 	if (dev &gt;= SNDRV_CARDS)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -1098,62 +997,48 @@ static int __devinit snd_lx6464es_probe(struct pci_dev *pci,</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &amp;card);</div><div class='add'>+	err = snd_devm_card_new(&amp;pci-&gt;dev, index[dev], id[dev], THIS_MODULE,</div><div class='add'>+				sizeof(*chip), &amp;card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='add'>+	chip = card-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	err = snd_lx6464es_create(card, pci, &amp;chip);</div><div class='add'>+	err = snd_lx6464es_create(card, pci);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		snd_printk(KERN_ERR LXP "error during snd_lx6464es_create\n");</div><div class='del'>-		goto out_free;</div><div class='add'>+		dev_err(card-&gt;dev, "error during snd_lx6464es_create\n");</div><div class='add'>+		goto error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strcpy(card-&gt;driver, "lx6464es");</div><div class='del'>-	strcpy(card-&gt;shortname, "Digigram LX6464ES");</div><div class='add'>+	strscpy(card-&gt;driver, "LX6464ES");</div><div class='add'>+	sprintf(card-&gt;id, "LX6464ES_%02X%02X%02X",</div><div class='add'>+		chip-&gt;mac_address[3], chip-&gt;mac_address[4], chip-&gt;mac_address[5]);</div><div class='add'>+</div><div class='add'>+	sprintf(card-&gt;shortname, "LX6464ES %02X.%02X.%02X.%02X.%02X.%02X",</div><div class='add'>+		chip-&gt;mac_address[0], chip-&gt;mac_address[1], chip-&gt;mac_address[2],</div><div class='add'>+		chip-&gt;mac_address[3], chip-&gt;mac_address[4], chip-&gt;mac_address[5]);</div><div class='add'>+</div><div class='ctx'> 	sprintf(card-&gt;longname, "%s at 0x%lx, 0x%p, irq %i",</div><div class='ctx'> 		card-&gt;shortname, chip-&gt;port_plx,</div><div class='ctx'> 		chip-&gt;port_dsp_bar, chip-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	err = snd_card_register(card);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out_free;</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	snd_printdd(LXP "initialization successful\n");</div><div class='add'>+	dev_dbg(chip-&gt;card-&gt;dev, "initialization successful\n");</div><div class='ctx'> 	pci_set_drvdata(pci, card);</div><div class='ctx'> 	dev++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_free:</div><div class='add'>+ error:</div><div class='ctx'> 	snd_card_free(card);</div><div class='ctx'> 	return err;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __devexit snd_lx6464es_remove(struct pci_dev *pci)</div><div class='del'>-{</div><div class='del'>-	snd_card_free(pci_get_drvdata(pci));</div><div class='del'>-	pci_set_drvdata(pci, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static struct pci_driver driver = {</div><div class='del'>-	.name =     "Digigram LX6464ES",</div><div class='add'>+static struct pci_driver lx6464es_driver = {</div><div class='add'>+	.name =     KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = snd_lx6464es_ids,</div><div class='ctx'> 	.probe =    snd_lx6464es_probe,</div><div class='del'>-	.remove = __devexit_p(snd_lx6464es_remove),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* module initialization */</div><div class='del'>-static int __init mod_init(void)</div><div class='del'>-{</div><div class='del'>-	return pci_register_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(mod_init);</div><div class='del'>-module_exit(mod_exit);</div><div class='add'>+module_pci_driver(lx6464es_driver);</div><div class='head'>diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h<br/>index 51afc048961d..1cfe10d23fa2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx6464es.h?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx6464es.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx6464es.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lx6464es/lx6464es.h</a></div><div class='hunk'>@@ -1,32 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='ctx'> /* -*- linux-c -*- *</div><div class='ctx'>  *</div><div class='ctx'>  * ALSA driver for the digigram lx6464es interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2009 Tim Blechmann &lt;tim@klingt.org&gt;</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef LX6464ES_H</div><div class='ctx'> #define LX6464ES_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;asm/atomic.h&gt;</div><div class='add'>+#include &lt;linux/atomic.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sound/core.h&gt;</div><div class='ctx'> #include &lt;sound/pcm.h&gt;</div><div class='hunk'>@@ -60,7 +44,7 @@ struct lx_stream {</div><div class='ctx'> 	snd_pcm_uframes_t          frame_pos;</div><div class='ctx'> 	enum lx_stream_status      status; /* free, open, running, draining</div><div class='ctx'> 					    * pause */</div><div class='del'>-	int                        is_capture:1;</div><div class='add'>+	unsigned int               is_capture:1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -69,14 +53,12 @@ struct lx6464es {</div><div class='ctx'> 	struct pci_dev         *pci;</div><div class='ctx'> 	int			irq;</div><div class='ctx'> </div><div class='del'>-	spinlock_t		lock;        /* interrupt spinlock */</div><div class='add'>+	u8			mac_address[6];</div><div class='add'>+</div><div class='add'>+	struct mutex		lock;        /* interrupt lock */</div><div class='ctx'> 	struct mutex            setup_mutex; /* mutex used in hw_params, open</div><div class='ctx'> 					      * and close */</div><div class='ctx'> </div><div class='del'>-	struct tasklet_struct   trigger_tasklet; /* trigger tasklet */</div><div class='del'>-	struct tasklet_struct   tasklet_capture;</div><div class='del'>-	struct tasklet_struct   tasklet_playback;</div><div class='del'>-</div><div class='ctx'> 	/* ports */</div><div class='ctx'> 	unsigned long		port_plx;	   /* io port (size=256) */</div><div class='ctx'> 	void __iomem           *port_plx_remapped; /* remapped plx port */</div><div class='hunk'>@@ -85,8 +67,9 @@ struct lx6464es {</div><div class='ctx'> 						    * size=8K) */</div><div class='ctx'> </div><div class='ctx'> 	/* messaging */</div><div class='del'>-	spinlock_t		msg_lock;          /* message spinlock */</div><div class='add'>+	struct mutex		msg_lock;          /* message lock */</div><div class='ctx'> 	struct lx_rmh           rmh;</div><div class='add'>+	u32			irqsrc;</div><div class='ctx'> </div><div class='ctx'> 	/* configuration */</div><div class='ctx'> 	uint			freq_ratio : 2;</div><div class='head'>diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c<br/>index 3086b751da4a..6f0843cfb3be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx_core.c?id=bbde7814cbc54d6b564d3f65b4b0e82eddef30a6'>sound/pci/lx6464es/lx_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/sound/pci/lx6464es/lx_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>sound/pci/lx6464es/lx_core.c</a></div><div class='hunk'>@@ -1,29 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* -*- linux-c -*- *</div><div class='ctx'>  *</div><div class='ctx'>  * ALSA driver for the digigram lx6464es interface</div><div class='ctx'>  * low-level interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2009 Tim Blechmann &lt;tim@klingt.org&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- * (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; see the file COPYING.  If not, write to</div><div class='del'>- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* #define RMH_DEBUG 1 */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='hunk'>@@ -78,10 +64,15 @@ unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port)